From 974ab3dd887985e3aa347f3c6521f819296396a0 Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Sat, 16 Feb 2013 14:42:43 +0000 Subject: Imported Upstream version 8.21 --- .mailmap | 1 + .prev-version | 2 +- .tarball-version | 2 +- .version | 2 +- .vg-suppressions | 2 +- AUTHORS | 4 +- ChangeLog | 4106 +++++++- ChangeLog-2005 | 2 +- ChangeLog-2006 | 2 +- ChangeLog-2007 | 2 +- ChangeLog-2008 | 2 +- GNUmakefile | 2 +- INSTALL | 2 +- Makefile.am | 44 +- Makefile.in | 8202 +++++++++++++++- NEWS | 303 +- README | 12 +- THANKS | 44 +- THANKS-to-translators | 2 + THANKS.in | 28 +- TODO | 16 +- aclocal.m4 | 359 +- bootstrap | 302 +- bootstrap.conf | 31 +- build-aux/ChangeLog-2007 | 2 +- build-aux/announce-gen | 53 +- build-aux/compile | 119 +- build-aux/config.guess | 45 +- build-aux/config.rpath | 2 +- build-aux/config.sub | 82 +- build-aux/cvsu | 512 - build-aux/depcomp | 476 +- build-aux/do-release-commit-and-tag | 128 +- build-aux/gen-lists-of-programs.sh | 186 + build-aux/gendocs.sh | 167 +- build-aux/git-version-gen | 23 +- build-aux/gitlog-to-changelog | 57 +- build-aux/gnu-web-doc-update | 173 +- build-aux/gnupload | 43 +- build-aux/mdate-sh | 2 +- build-aux/missing | 99 +- build-aux/prefix-gnulib-mk | 247 + build-aux/snippet/arg-nonnull.h | 2 +- build-aux/snippet/c++defs.h | 2 +- build-aux/snippet/unused-parameter.h | 2 +- build-aux/snippet/warn-on-use.h | 4 +- build-aux/test-driver | 127 - build-aux/texinfo.tex | 324 +- build-aux/update-copyright | 6 +- build-aux/useless-if-before-free | 2 +- build-aux/vc-list-files | 2 +- cfg.mk | 262 +- configure | 5073 +++++----- configure.ac | 181 +- dist-check.mk | 5 +- doc/ChangeLog-2007 | 2 +- doc/Makefile.am | 134 - doc/Makefile.in | 2241 ----- doc/coreutils.info | 2339 +++-- doc/coreutils.texi | 1746 ++-- doc/local.mk | 127 + doc/parse-datetime.texi | 100 +- doc/perm.texi | 14 +- doc/stamp-vti | 8 +- doc/version.texi | 8 +- gnulib-tests/Makefile.in | 3212 ++----- gnulib-tests/accept.c | 2 +- gnulib-tests/at-func.c | 33 +- gnulib-tests/bind.c | 2 +- gnulib-tests/connect.c | 2 +- gnulib-tests/glthread/thread.c | 5 +- gnulib-tests/glthread/thread.h | 11 +- gnulib-tests/glthread/yield.h | 2 +- gnulib-tests/gnulib.mk | 49 +- gnulib-tests/inet_pton.c | 2 +- gnulib-tests/infinity.h | 2 +- gnulib-tests/init.sh | 7 +- gnulib-tests/ioctl.c | 2 +- gnulib-tests/listen.c | 2 +- gnulib-tests/localename.c | 187 +- gnulib-tests/localename.h | 2 +- gnulib-tests/macros.h | 2 +- gnulib-tests/minus-zero.h | 8 +- gnulib-tests/nan.h | 2 +- gnulib-tests/nap.h | 108 +- gnulib-tests/perror.c | 2 +- gnulib-tests/pipe.c | 2 +- gnulib-tests/randomd.c | 2 +- gnulib-tests/randoml.c | 2 +- gnulib-tests/setlocale.c | 2 +- gnulib-tests/setsockopt.c | 2 +- gnulib-tests/signature.h | 2 +- gnulib-tests/sleep.c | 2 +- gnulib-tests/socket.c | 2 +- gnulib-tests/strerror_r.c | 2 +- gnulib-tests/symlinkat.c | 2 +- gnulib-tests/test-accept.c | 4 +- gnulib-tests/test-alignof.c | 2 +- gnulib-tests/test-alloca-opt.c | 4 +- gnulib-tests/test-areadlink-with-size.c | 2 +- gnulib-tests/test-areadlink.c | 2 +- gnulib-tests/test-areadlink.h | 2 +- gnulib-tests/test-areadlinkat.c | 2 +- gnulib-tests/test-argmatch.c | 2 +- gnulib-tests/test-argv-iter.c | 2 +- gnulib-tests/test-arpa_inet.c | 2 +- gnulib-tests/test-base64.c | 2 +- gnulib-tests/test-binary-io.c | 28 +- gnulib-tests/test-binary-io.sh | 8 +- gnulib-tests/test-bind.c | 4 +- gnulib-tests/test-bitrotate.c | 2 +- gnulib-tests/test-btowc.c | 2 +- gnulib-tests/test-c-ctype.c | 2 +- gnulib-tests/test-c-strcasecmp.c | 2 +- gnulib-tests/test-c-strncasecmp.c | 2 +- gnulib-tests/test-calloc-gnu.c | 2 +- gnulib-tests/test-canonicalize.c | 2 +- gnulib-tests/test-chdir.c | 2 +- gnulib-tests/test-chown.c | 2 +- gnulib-tests/test-chown.h | 2 +- gnulib-tests/test-cloexec.c | 2 +- gnulib-tests/test-close.c | 3 +- gnulib-tests/test-closein.c | 2 +- gnulib-tests/test-connect.c | 4 +- gnulib-tests/test-copy-acl.c | 2 +- gnulib-tests/test-copy-acl.sh | 2 +- gnulib-tests/test-ctype.c | 2 +- gnulib-tests/test-di-set.c | 2 +- gnulib-tests/test-dirent-safer.c | 2 +- gnulib-tests/test-dirent.c | 2 +- gnulib-tests/test-dirname.c | 2 +- gnulib-tests/test-dup-safer.c | 2 +- gnulib-tests/test-dup.c | 3 +- gnulib-tests/test-dup2.c | 3 +- gnulib-tests/test-environ.c | 2 +- gnulib-tests/test-errno.c | 4 +- gnulib-tests/test-exclude.c | 2 +- gnulib-tests/test-exclude1.sh | 2 +- gnulib-tests/test-exclude2.sh | 2 +- gnulib-tests/test-exclude3.sh | 2 +- gnulib-tests/test-exclude4.sh | 2 +- gnulib-tests/test-exclude5.sh | 2 +- gnulib-tests/test-exclude6.sh | 2 +- gnulib-tests/test-exclude7.sh | 2 +- gnulib-tests/test-exclude8.sh | 2 +- gnulib-tests/test-faccessat.c | 3 +- gnulib-tests/test-fadvise.c | 2 +- gnulib-tests/test-fchdir.c | 3 +- gnulib-tests/test-fchmodat.c | 4 +- gnulib-tests/test-fchownat.c | 3 +- gnulib-tests/test-fclose.c | 6 +- gnulib-tests/test-fcntl-h.c | 19 +- gnulib-tests/test-fcntl-safer.c | 2 +- gnulib-tests/test-fcntl.c | 2 +- gnulib-tests/test-fdatasync.c | 5 +- gnulib-tests/test-fdopen.c | 4 +- gnulib-tests/test-fdopendir.c | 3 +- gnulib-tests/test-fdutimensat.c | 2 +- gnulib-tests/test-fflush.c | 6 +- gnulib-tests/test-fflush2.c | 2 +- gnulib-tests/test-fgetc.c | 6 +- gnulib-tests/test-file-has-acl.c | 2 +- gnulib-tests/test-file-has-acl.sh | 2 +- gnulib-tests/test-filenamecat.c | 2 +- gnulib-tests/test-filevercmp.c | 2 +- gnulib-tests/test-float.c | 2 +- gnulib-tests/test-fnmatch.c | 2 +- gnulib-tests/test-fopen-safer.c | 2 +- gnulib-tests/test-fopen.c | 2 +- gnulib-tests/test-fopen.h | 2 +- gnulib-tests/test-fpending.c | 2 +- gnulib-tests/test-fprintf-posix.h | 2 +- gnulib-tests/test-fpurge.c | 2 +- gnulib-tests/test-fputc.c | 6 +- gnulib-tests/test-fread.c | 6 +- gnulib-tests/test-freadahead.c | 2 +- gnulib-tests/test-freading.c | 2 +- gnulib-tests/test-freadptr.c | 2 +- gnulib-tests/test-freadptr2.c | 2 +- gnulib-tests/test-freadseek.c | 2 +- gnulib-tests/test-freopen-safer.c | 2 +- gnulib-tests/test-freopen.c | 6 +- gnulib-tests/test-frexp.c | 2 +- gnulib-tests/test-frexp.h | 2 +- gnulib-tests/test-frexpl.c | 2 +- gnulib-tests/test-fseek.c | 2 +- gnulib-tests/test-fseeko.c | 2 +- gnulib-tests/test-fseeko3.c | 2 +- gnulib-tests/test-fseeko4.c | 6 +- gnulib-tests/test-fseterr.c | 2 +- gnulib-tests/test-fstat.c | 4 +- gnulib-tests/test-fstatat.c | 15 +- gnulib-tests/test-fsync.c | 5 +- gnulib-tests/test-ftell.c | 2 +- gnulib-tests/test-ftell3.c | 2 +- gnulib-tests/test-ftello.c | 2 +- gnulib-tests/test-ftello3.c | 2 +- gnulib-tests/test-ftello4.c | 6 +- gnulib-tests/test-ftruncate.c | 3 +- gnulib-tests/test-futimens.c | 2 +- gnulib-tests/test-futimens.h | 3 +- gnulib-tests/test-fwrite.c | 6 +- gnulib-tests/test-getaddrinfo.c | 2 +- gnulib-tests/test-getcwd-lgpl.c | 2 +- gnulib-tests/test-getcwd.c | 73 +- gnulib-tests/test-getdelim.c | 2 +- gnulib-tests/test-getdtablesize.c | 2 +- gnulib-tests/test-getgroups.c | 2 +- gnulib-tests/test-gethostname.c | 2 +- gnulib-tests/test-getline.c | 2 +- gnulib-tests/test-getloadavg.c | 2 +- gnulib-tests/test-getlogin.c | 10 +- gnulib-tests/test-getndelim2.c | 2 +- gnulib-tests/test-getopt.c | 2 +- gnulib-tests/test-getopt.h | 2 +- gnulib-tests/test-getopt_long.h | 2 +- gnulib-tests/test-gettimeofday.c | 2 +- gnulib-tests/test-hash.c | 2 +- gnulib-tests/test-i-ring.c | 2 +- gnulib-tests/test-iconv-h.c | 2 +- gnulib-tests/test-iconv.c | 2 +- gnulib-tests/test-ignore-value.c | 2 +- gnulib-tests/test-inet_ntop.c | 2 +- gnulib-tests/test-inet_pton.c | 2 +- gnulib-tests/test-init.sh | 2 +- gnulib-tests/test-ino-map.c | 2 +- gnulib-tests/test-intprops.c | 2 +- gnulib-tests/test-inttostr.c | 2 +- gnulib-tests/test-inttypes.c | 2 +- gnulib-tests/test-ioctl.c | 4 +- gnulib-tests/test-isatty.c | 7 +- gnulib-tests/test-isblank.c | 2 +- gnulib-tests/test-isnand-nolibm.c | 2 +- gnulib-tests/test-isnand.h | 2 +- gnulib-tests/test-isnanf-nolibm.c | 2 +- gnulib-tests/test-isnanf.h | 2 +- gnulib-tests/test-isnanl-nolibm.c | 2 +- gnulib-tests/test-isnanl.h | 2 +- gnulib-tests/test-iswblank.c | 2 +- gnulib-tests/test-langinfo.c | 2 +- gnulib-tests/test-lchown.c | 2 +- gnulib-tests/test-lchown.h | 2 +- gnulib-tests/test-link.c | 2 +- gnulib-tests/test-link.h | 2 +- gnulib-tests/test-linkat.c | 3 +- gnulib-tests/test-listen.c | 4 +- gnulib-tests/test-locale.c | 2 +- gnulib-tests/test-localeconv.c | 6 +- gnulib-tests/test-localename.c | 4 +- gnulib-tests/test-lock.c | 2 +- gnulib-tests/test-lseek.c | 3 +- gnulib-tests/test-lstat.c | 2 +- gnulib-tests/test-lstat.h | 2 +- gnulib-tests/test-lutimens.h | 2 +- gnulib-tests/test-malloc-gnu.c | 2 +- gnulib-tests/test-malloca.c | 4 +- gnulib-tests/test-math.c | 2 +- gnulib-tests/test-mbrtowc-w32.c | 2 +- gnulib-tests/test-mbrtowc.c | 2 +- gnulib-tests/test-mbsalign.c | 40 +- gnulib-tests/test-mbscasecmp.c | 2 +- gnulib-tests/test-mbsinit.c | 2 +- gnulib-tests/test-mbsrtowcs.c | 2 +- gnulib-tests/test-mbsstr1.c | 2 +- gnulib-tests/test-mbsstr2.c | 2 +- gnulib-tests/test-mbsstr3.c | 2 +- gnulib-tests/test-md5.c | 2 +- gnulib-tests/test-memcasecmp.c | 2 +- gnulib-tests/test-memchr.c | 2 +- gnulib-tests/test-memchr2.c | 2 +- gnulib-tests/test-memcoll.c | 2 +- gnulib-tests/test-memrchr.c | 2 +- gnulib-tests/test-mkdir.c | 2 +- gnulib-tests/test-mkdir.h | 2 +- gnulib-tests/test-mkfifo.c | 2 +- gnulib-tests/test-mkfifo.h | 2 +- gnulib-tests/test-mknod.c | 2 +- gnulib-tests/test-nanosleep.c | 2 +- gnulib-tests/test-netdb.c | 2 +- gnulib-tests/test-netinet_in.c | 2 +- gnulib-tests/test-nl_langinfo.c | 2 +- gnulib-tests/test-open.c | 2 +- gnulib-tests/test-open.h | 2 +- gnulib-tests/test-openat-safer.c | 2 +- gnulib-tests/test-openat.c | 3 +- gnulib-tests/test-parse-datetime.c | 12 +- gnulib-tests/test-pathmax.c | 2 +- gnulib-tests/test-perror.c | 2 +- gnulib-tests/test-perror2.c | 2 +- gnulib-tests/test-pipe.c | 2 +- gnulib-tests/test-pipe2.c | 2 +- gnulib-tests/test-posix_spawn1.c | 2 +- gnulib-tests/test-posix_spawn2.c | 2 +- .../test-posix_spawn_file_actions_addclose.c | 2 +- .../test-posix_spawn_file_actions_adddup2.c | 2 +- .../test-posix_spawn_file_actions_addopen.c | 2 +- gnulib-tests/test-posixtm.c | 30 +- gnulib-tests/test-printf-frexp.c | 2 +- gnulib-tests/test-printf-frexpl.c | 2 +- gnulib-tests/test-printf-posix.h | 2 +- gnulib-tests/test-priv-set.c | 2 +- gnulib-tests/test-quotearg-simple.c | 2 +- gnulib-tests/test-quotearg.h | 2 +- gnulib-tests/test-raise.c | 3 +- gnulib-tests/test-rand-isaac.c | 2 +- gnulib-tests/test-rawmemchr.c | 2 +- gnulib-tests/test-read-file.c | 2 +- gnulib-tests/test-read.c | 3 +- gnulib-tests/test-readlink.c | 2 +- gnulib-tests/test-readlink.h | 2 +- gnulib-tests/test-readlinkat.c | 3 +- gnulib-tests/test-readtokens.c | 2 +- gnulib-tests/test-realloc-gnu.c | 2 +- gnulib-tests/test-regex.c | 185 + gnulib-tests/test-remove.c | 2 +- gnulib-tests/test-rename.c | 2 +- gnulib-tests/test-rename.h | 2 +- gnulib-tests/test-rmdir.c | 2 +- gnulib-tests/test-rmdir.h | 2 +- gnulib-tests/test-sameacls.c | 6 +- gnulib-tests/test-sched.c | 2 +- gnulib-tests/test-select-fd.c | 2 +- gnulib-tests/test-select-stdin.c | 2 +- gnulib-tests/test-select.c | 2 +- gnulib-tests/test-select.h | 36 +- gnulib-tests/test-set-mode-acl.c | 2 +- gnulib-tests/test-set-mode-acl.sh | 2 +- gnulib-tests/test-setenv.c | 2 +- gnulib-tests/test-setlocale1.c | 2 +- gnulib-tests/test-setlocale2.c | 2 +- gnulib-tests/test-setsockopt.c | 4 +- gnulib-tests/test-sha1.c | 2 +- gnulib-tests/test-sigaction.c | 2 +- gnulib-tests/test-signal-h.c | 2 +- gnulib-tests/test-signbit.c | 2 +- gnulib-tests/test-sigprocmask.c | 12 +- gnulib-tests/test-sleep.c | 2 +- gnulib-tests/test-snprintf.c | 2 +- gnulib-tests/test-sockets.c | 2 +- gnulib-tests/test-spawn-pipe-child.c | 2 +- gnulib-tests/test-spawn-pipe-main.c | 2 +- gnulib-tests/test-spawn.c | 2 +- gnulib-tests/test-stat-time.c | 2 +- gnulib-tests/test-stat.c | 2 +- gnulib-tests/test-stat.h | 2 +- gnulib-tests/test-statat.c | 27 + gnulib-tests/test-stdalign.c | 2 +- gnulib-tests/test-stdbool.c | 2 +- gnulib-tests/test-stddef.c | 2 +- gnulib-tests/test-stdint.c | 2 +- gnulib-tests/test-stdio.c | 2 +- gnulib-tests/test-stdlib.c | 2 +- gnulib-tests/test-strchrnul.c | 2 +- gnulib-tests/test-strerror.c | 2 +- gnulib-tests/test-strerror_r.c | 2 +- gnulib-tests/test-strftime.c | 2 +- gnulib-tests/test-striconv.c | 2 +- gnulib-tests/test-string.c | 2 +- gnulib-tests/test-strings.c | 27 - gnulib-tests/test-strncat.c | 2 +- gnulib-tests/test-strnlen.c | 2 +- gnulib-tests/test-strsignal.c | 2 +- gnulib-tests/test-strtod.c | 36 +- gnulib-tests/test-strtoimax.c | 2 +- gnulib-tests/test-strtoll.c | 2 +- gnulib-tests/test-strtoull.c | 2 +- gnulib-tests/test-strtoumax.c | 2 +- gnulib-tests/test-symlink.c | 2 +- gnulib-tests/test-symlink.h | 2 +- gnulib-tests/test-symlinkat.c | 3 +- gnulib-tests/test-sys_ioctl.c | 2 +- gnulib-tests/test-sys_resource.c | 2 +- gnulib-tests/test-sys_select.c | 2 +- gnulib-tests/test-sys_socket.c | 2 +- gnulib-tests/test-sys_stat.c | 17 +- gnulib-tests/test-sys_time.c | 2 +- gnulib-tests/test-sys_types.c | 2 +- gnulib-tests/test-sys_uio.c | 2 +- gnulib-tests/test-sys_utsname.c | 2 +- gnulib-tests/test-sys_wait.c | 2 +- gnulib-tests/test-sys_wait.h | 2 +- gnulib-tests/test-termios.c | 2 +- gnulib-tests/test-thread_create.c | 2 +- gnulib-tests/test-thread_self.c | 2 +- gnulib-tests/test-time.c | 4 +- gnulib-tests/test-tls.c | 4 +- gnulib-tests/test-u64.c | 2 +- gnulib-tests/test-uname.c | 2 +- gnulib-tests/test-unistd.c | 2 +- gnulib-tests/test-unlink.c | 2 +- gnulib-tests/test-unlink.h | 2 +- gnulib-tests/test-unlinkat.c | 3 +- gnulib-tests/test-unsetenv.c | 2 +- gnulib-tests/test-update-copyright.sh | 8 +- gnulib-tests/test-userspec.c | 2 +- gnulib-tests/test-usleep.c | 2 +- gnulib-tests/test-utimens-common.h | 4 +- gnulib-tests/test-utimens.c | 2 +- gnulib-tests/test-utimens.h | 2 +- gnulib-tests/test-utimensat.c | 3 +- gnulib-tests/test-vasnprintf.c | 2 +- gnulib-tests/test-vasprintf-posix.c | 6 +- gnulib-tests/test-vasprintf.c | 2 +- gnulib-tests/test-vc-list-files-cvs.sh | 2 +- gnulib-tests/test-vc-list-files-git.sh | 2 +- gnulib-tests/test-verify.c | 2 +- gnulib-tests/test-version-etc.c | 2 +- gnulib-tests/test-version-etc.sh | 2 +- gnulib-tests/test-vfprintf-posix.c | 2 +- gnulib-tests/test-vprintf-posix.c | 2 +- gnulib-tests/test-wchar.c | 2 +- gnulib-tests/test-wcrtomb-w32.c | 2 +- gnulib-tests/test-wcrtomb.c | 2 +- gnulib-tests/test-wctype-h.c | 2 +- gnulib-tests/test-wcwidth.c | 2 +- gnulib-tests/test-write.c | 3 +- gnulib-tests/test-xalloc-die.c | 2 +- gnulib-tests/test-xalloc-die.sh | 2 +- gnulib-tests/test-xfprintf-posix.c | 2 +- gnulib-tests/test-xprintf-posix.c | 2 +- gnulib-tests/test-xstrtol.c | 2 +- gnulib-tests/test-xvasprintf.c | 2 +- gnulib-tests/test-yesno.c | 2 +- gnulib-tests/unistr/test-strncat.h | 2 +- gnulib-tests/unistr/test-u8-mbtoucr.c | 2 +- gnulib-tests/unistr/test-u8-uctomb.c | 2 +- gnulib-tests/uniwidth/test-uc_width.c | 2 +- gnulib-tests/uniwidth/test-uc_width2.c | 2 +- gnulib-tests/unlinkdir.c | 5 +- gnulib-tests/unlinkdir.h | 2 +- gnulib-tests/usleep.c | 2 +- gnulib-tests/w32sock.h | 2 +- gnulib-tests/wctob.c | 2 +- gnulib-tests/wctomb-impl.h | 2 +- gnulib-tests/wctomb.c | 2 +- gnulib-tests/zerosize-ptr.h | 2 +- init.cfg | 575 ++ lib/ChangeLog-2007 | 2 +- lib/Makefile.am | 37 - lib/Makefile.in | 4823 ---------- lib/acl-internal.h | 21 +- lib/acl.h | 2 +- lib/acl_entries.c | 8 +- lib/alignof.h | 2 +- lib/alloca.in.h | 9 +- lib/allocator.h | 2 +- lib/anytostr.c | 2 +- lib/areadlink-with-size.c | 2 +- lib/areadlink.c | 2 +- lib/areadlink.h | 2 +- lib/areadlinkat.c | 2 +- lib/argmatch.c | 2 +- lib/argmatch.h | 2 +- lib/argv-iter.c | 2 +- lib/argv-iter.h | 2 +- lib/arpa_inet.in.h | 2 +- lib/asnprintf.c | 2 +- lib/asprintf.c | 2 +- lib/at-func.c | 33 +- lib/at-func2.c | 2 +- lib/backupfile.c | 2 +- lib/backupfile.h | 2 +- lib/base64.c | 8 +- lib/base64.h | 10 +- lib/basename-lgpl.c | 2 +- lib/basename.c | 2 +- lib/binary-io.c | 3 + lib/binary-io.h | 50 +- lib/bitrotate.c | 3 + lib/bitrotate.h | 29 +- lib/btowc.c | 2 +- lib/buffer-lcm.c | 2 +- lib/c-ctype.c | 2 +- lib/c-ctype.h | 2 +- lib/c-strcase.h | 2 +- lib/c-strcasecmp.c | 2 +- lib/c-strcaseeq.h | 2 +- lib/c-strncasecmp.c | 2 +- lib/c-strtod.c | 4 +- lib/c-strtod.h | 2 +- lib/calloc.c | 2 +- lib/canon-host.c | 2 +- lib/canon-host.h | 2 +- lib/canonicalize.c | 77 +- lib/canonicalize.h | 2 +- lib/careadlinkat.c | 2 +- lib/careadlinkat.h | 2 +- lib/chdir-long.c | 10 +- lib/chdir-long.h | 2 +- lib/chmodat.c | 3 + lib/chown.c | 2 +- lib/chownat.c | 3 + lib/cloexec.c | 2 +- lib/cloexec.h | 2 +- lib/close-stream.c | 2 +- lib/close.c | 2 +- lib/closedir.c | 2 +- lib/closein.c | 2 +- lib/closein.h | 2 +- lib/closeout.c | 2 +- lib/closeout.h | 2 +- lib/config.charset | 4 +- lib/config.hin | 158 +- lib/copy-acl.c | 20 +- lib/creat-safer.c | 2 +- lib/ctype.in.h | 2 +- lib/cycle-check.c | 4 +- lib/cycle-check.h | 2 +- lib/di-set.c | 2 +- lib/diacrit.c | 2 +- lib/diacrit.h | 2 +- lib/dirchownmod.c | 2 +- lib/dirent--.h | 2 +- lib/dirent-private.h | 2 +- lib/dirent-safer.h | 2 +- lib/dirent.in.h | 2 +- lib/dirfd.c | 2 +- lib/dirname-lgpl.c | 2 +- lib/dirname.c | 2 +- lib/dirname.h | 2 +- lib/dosname.h | 2 +- lib/dtotimespec.c | 2 +- lib/dup-safer-flag.c | 2 +- lib/dup-safer.c | 2 +- lib/dup.c | 4 +- lib/dup2.c | 5 +- lib/errno.in.h | 55 +- lib/error.c | 6 +- lib/error.h | 2 +- lib/euidaccess.c | 11 +- lib/exclude.c | 2 +- lib/exclude.h | 2 +- lib/exitfail.c | 2 +- lib/exitfail.h | 2 +- lib/faccessat.c | 3 +- lib/fadvise.c | 2 +- lib/fadvise.h | 2 +- lib/fatal-signal.c | 6 +- lib/fatal-signal.h | 2 +- lib/fchdir.c | 2 +- lib/fchmodat.c | 2 +- lib/fchownat.c | 2 +- lib/fclose.c | 2 +- lib/fcntl--.h | 2 +- lib/fcntl-safer.h | 2 +- lib/fcntl.c | 2 +- lib/fcntl.in.h | 16 +- lib/fd-hook.c | 2 +- lib/fd-hook.h | 2 +- lib/fd-reopen.c | 2 +- lib/fd-reopen.h | 2 +- lib/fd-safer-flag.c | 2 +- lib/fd-safer.c | 2 +- lib/fdatasync.c | 2 +- lib/fdopen.c | 2 +- lib/fdopendir.c | 2 +- lib/fdutimensat.c | 2 +- lib/fflush.c | 34 +- lib/file-has-acl.c | 12 +- lib/file-set.c | 2 +- lib/file-type.c | 2 +- lib/file-type.h | 2 +- lib/fileblocks.c | 2 +- lib/filemode.c | 4 +- lib/filemode.h | 4 +- lib/filename.h | 2 +- lib/filenamecat-lgpl.c | 2 +- lib/filenamecat.c | 2 +- lib/filenamecat.h | 2 +- lib/filevercmp.c | 4 +- lib/filevercmp.h | 2 +- lib/float+.h | 2 +- lib/float.c | 2 +- lib/float.in.h | 2 +- lib/fnmatch.c | 2 +- lib/fnmatch.in.h | 2 +- lib/fnmatch_loop.c | 2 +- lib/fopen-safer.c | 2 +- lib/fopen.c | 4 +- lib/fpending.c | 2 +- lib/fpending.h | 6 +- lib/fprintftime.h | 2 +- lib/fpucw.h | 2 +- lib/fpurge.c | 10 +- lib/freadahead.c | 4 +- lib/freadahead.h | 21 +- lib/freading.c | 4 +- lib/freading.h | 4 +- lib/freadptr.c | 4 +- lib/freadptr.h | 21 +- lib/freadseek.c | 10 +- lib/freadseek.h | 2 +- lib/freopen-safer.c | 2 +- lib/freopen.c | 4 +- lib/frexp.c | 2 +- lib/frexpl.c | 2 +- lib/fseek.c | 2 +- lib/fseeko.c | 8 +- lib/fseterr.c | 4 +- lib/fseterr.h | 24 +- lib/fstat.c | 8 +- lib/fstatat.c | 6 +- lib/fsusage.c | 100 +- lib/fsusage.h | 2 +- lib/fsync.c | 2 +- lib/ftell.c | 2 +- lib/ftello.c | 2 +- lib/ftoastr.c | 2 +- lib/ftoastr.h | 2 +- lib/ftruncate.c | 4 +- lib/fts-cycle.c | 2 +- lib/fts.c | 19 +- lib/fts_.h | 12 +- lib/full-read.c | 2 +- lib/full-read.h | 2 +- lib/full-write.c | 2 +- lib/full-write.h | 2 +- lib/futimens.c | 2 +- lib/gai_strerror.c | 2 +- lib/getaddrinfo.c | 4 +- lib/getcwd-lgpl.c | 2 +- lib/getcwd.c | 8 +- lib/getdelim.c | 2 +- lib/getdtablesize.c | 4 +- lib/getfilecon.c | 4 +- lib/getgroups.c | 2 +- lib/gethostname.c | 2 +- lib/gethrxtime.c | 21 +- lib/gethrxtime.h | 29 +- lib/getline.c | 2 +- lib/getloadavg.c | 32 +- lib/getlogin.c | 2 +- lib/getndelim2.c | 2 +- lib/getndelim2.h | 2 +- lib/getopt.c | 2 +- lib/getopt.in.h | 4 +- lib/getopt1.c | 2 +- lib/getopt_int.h | 2 +- lib/getpagesize.c | 2 +- lib/getpass.c | 2 +- lib/getpass.h | 4 +- lib/gettext.h | 11 +- lib/gettime.c | 2 +- lib/gettimeofday.c | 2 +- lib/getugroups.c | 2 +- lib/getugroups.h | 2 +- lib/getusershell.c | 2 +- lib/glthread/lock.c | 8 +- lib/glthread/lock.h | 2 +- lib/glthread/threadlib.c | 2 +- lib/glthread/tls.c | 2 +- lib/glthread/tls.h | 2 +- lib/gnulib.mk | 2070 ++-- lib/group-member.c | 53 +- lib/hard-locale.c | 2 +- lib/hard-locale.h | 2 +- lib/hash-pjw.c | 2 +- lib/hash-pjw.h | 2 +- lib/hash-triple.c | 2 +- lib/hash.c | 2 +- lib/hash.h | 2 +- lib/heap.c | 2 +- lib/heap.h | 2 +- lib/human.c | 2 +- lib/human.h | 2 +- lib/i-ring.c | 2 +- lib/i-ring.h | 2 +- lib/iconv.c | 2 +- lib/iconv.in.h | 2 +- lib/iconv_close.c | 2 +- lib/iconv_open-aix.h | 68 +- lib/iconv_open-hpux.h | 92 +- lib/iconv_open-irix.h | 42 +- lib/iconv_open-osf.h | 80 +- lib/iconv_open-solaris.h | 30 +- lib/iconv_open.c | 2 +- lib/idcache.c | 2 +- lib/ignore-value.h | 12 +- lib/inet_ntop.c | 2 +- lib/ino-map.c | 2 +- lib/intprops.h | 2 +- lib/inttostr.h | 2 +- lib/inttypes.in.h | 2 +- lib/isapipe.c | 2 +- lib/isatty.c | 4 +- lib/isblank.c | 2 +- lib/isnan.c | 2 +- lib/isnand-nolibm.h | 2 +- lib/isnand.c | 2 +- lib/isnanf-nolibm.h | 2 +- lib/isnanf.c | 2 +- lib/isnanl-nolibm.h | 2 +- lib/isnanl.c | 2 +- lib/iswblank.c | 2 +- lib/itold.c | 2 +- lib/langinfo.in.h | 2 +- lib/lchown.c | 2 +- lib/linebuffer.c | 2 +- lib/linebuffer.h | 2 +- lib/link.c | 2 +- lib/linkat.c | 2 +- lib/local.mk | 5 + lib/localcharset.c | 11 +- lib/localcharset.h | 2 +- lib/locale.in.h | 23 +- lib/localeconv.c | 2 +- lib/long-options.c | 2 +- lib/long-options.h | 2 +- lib/lseek.c | 2 +- lib/lstat.c | 4 +- lib/malloc.c | 2 +- lib/malloca.c | 2 +- lib/malloca.h | 4 +- lib/math.c | 3 + lib/math.in.h | 15 +- lib/mbchar.c | 4 +- lib/mbchar.h | 17 +- lib/mbiter.c | 3 + lib/mbiter.h | 15 +- lib/mbrlen.c | 2 +- lib/mbrtowc.c | 2 +- lib/mbsalign.c | 65 +- lib/mbsalign.h | 33 +- lib/mbscasecmp.c | 2 +- lib/mbsinit.c | 2 +- lib/mbslen.c | 2 +- lib/mbsrtowcs-impl.h | 2 +- lib/mbsrtowcs-state.c | 4 +- lib/mbsrtowcs.c | 2 +- lib/mbsstr.c | 2 +- lib/mbswidth.c | 2 +- lib/mbswidth.h | 2 +- lib/mbtowc-impl.h | 2 +- lib/mbtowc.c | 2 +- lib/mbuiter.c | 3 + lib/mbuiter.h | 15 +- lib/md5.c | 10 +- lib/md5.h | 2 +- lib/memcasecmp.c | 2 +- lib/memcasecmp.h | 2 +- lib/memchr.c | 2 +- lib/memchr2.c | 2 +- lib/memchr2.h | 2 +- lib/memcmp2.c | 2 +- lib/memcmp2.h | 2 +- lib/memcoll.c | 4 +- lib/memcoll.h | 2 +- lib/mempcpy.c | 2 +- lib/memrchr.c | 2 +- lib/mgetgroups.c | 2 +- lib/mgetgroups.h | 2 +- lib/mkancesdirs.c | 2 +- lib/mkdir-p.c | 2 +- lib/mkdir-p.h | 2 +- lib/mkdir.c | 2 +- lib/mkfifo.c | 2 +- lib/mknod.c | 2 +- lib/mkstemp-safer.c | 2 +- lib/mkstemp.c | 2 +- lib/mktime.c | 395 +- lib/modechange.c | 2 +- lib/modechange.h | 2 +- lib/mountlist.c | 44 +- lib/mountlist.h | 2 +- lib/mpsort.c | 2 +- lib/msvc-inval.c | 2 +- lib/msvc-inval.h | 2 +- lib/msvc-nothrow.c | 2 +- lib/msvc-nothrow.h | 2 +- lib/nanosleep.c | 2 +- lib/netdb.in.h | 2 +- lib/netinet_in.in.h | 2 +- lib/nl_langinfo.c | 2 +- lib/nproc.c | 8 +- lib/nproc.h | 2 +- lib/obstack.c | 2 +- lib/obstack.h | 2 +- lib/open-safer.c | 2 +- lib/open.c | 4 +- lib/openat-die.c | 2 +- lib/openat-priv.h | 2 +- lib/openat-proc.c | 2 +- lib/openat-safer.c | 2 +- lib/openat.c | 4 +- lib/openat.h | 32 +- lib/opendir-safer.c | 2 +- lib/opendir.c | 2 +- lib/parse-datetime.c | 1703 ++-- lib/parse-datetime.h | 2 +- lib/parse-datetime.y | 10 +- lib/pathmax.h | 2 +- lib/physmem.c | 2 +- lib/physmem.h | 2 +- lib/pipe-safer.c | 2 +- lib/pipe2-safer.c | 2 +- lib/pipe2.c | 2 +- lib/posixtm.c | 2 +- lib/posixtm.h | 2 +- lib/posixver.c | 2 +- lib/printf-args.c | 2 +- lib/printf-args.h | 2 +- lib/printf-frexp.c | 2 +- lib/printf-frexp.h | 2 +- lib/printf-frexpl.c | 2 +- lib/printf-frexpl.h | 2 +- lib/printf-parse.c | 4 +- lib/printf-parse.h | 2 +- lib/priv-set.c | 5 +- lib/priv-set.h | 21 +- lib/progname.c | 2 +- lib/progname.h | 2 +- lib/propername.c | 2 +- lib/propername.h | 2 +- lib/pthread.c | 3 + lib/pthread.in.h | 54 +- lib/putenv.c | 2 +- lib/quote.h | 27 +- lib/quotearg.c | 24 +- lib/quotearg.h | 2 +- lib/raise.c | 4 +- lib/rand-isaac.c | 2 +- lib/rand-isaac.h | 2 +- lib/randint.c | 2 +- lib/randint.h | 2 +- lib/randperm.c | 2 +- lib/randread.c | 2 +- lib/randread.h | 2 +- lib/rawmemchr.c | 2 +- lib/read-file.c | 2 +- lib/read-file.h | 2 +- lib/read.c | 4 +- lib/readdir.c | 2 +- lib/readlink.c | 2 +- lib/readlinkat.c | 2 +- lib/readtokens.c | 2 +- lib/readtokens.h | 2 +- lib/readtokens0.c | 2 +- lib/readtokens0.h | 2 +- lib/readutmp.c | 8 +- lib/readutmp.h | 2 +- lib/realloc.c | 2 +- lib/ref-add.sin | 2 +- lib/ref-del.sin | 2 +- lib/regcomp.c | 93 +- lib/regex.c | 21 +- lib/regex.h | 23 +- lib/regex_internal.c | 31 +- lib/regex_internal.h | 70 +- lib/regexec.c | 53 +- lib/remove.c | 2 +- lib/rename.c | 2 +- lib/rewinddir.c | 2 +- lib/rmdir.c | 2 +- lib/root-dev-ino.c | 2 +- lib/root-dev-ino.h | 2 +- lib/root-uid.h | 30 + lib/rpmatch.c | 2 +- lib/safe-read.c | 2 +- lib/safe-read.h | 4 +- lib/safe-write.c | 2 +- lib/safe-write.h | 4 +- lib/same-inode.h | 2 +- lib/same.c | 2 +- lib/same.h | 2 +- lib/save-cwd.c | 2 +- lib/save-cwd.h | 2 +- lib/savedir.c | 2 +- lib/savedir.h | 2 +- lib/savewd.c | 6 +- lib/savewd.h | 13 +- lib/sched.in.h | 4 +- lib/se-context.c | 3 + lib/se-context.in.h | 29 +- lib/se-selinux.c | 3 + lib/se-selinux.in.h | 85 +- lib/select.c | 82 +- lib/selinux-at.c | 2 +- lib/selinux-at.h | 2 +- lib/set-mode-acl.c | 22 +- lib/setenv.c | 2 +- lib/settime.c | 2 +- lib/sha1.c | 10 +- lib/sha1.h | 2 +- lib/sha256.c | 10 +- lib/sha256.h | 2 +- lib/sha512.c | 12 +- lib/sha512.h | 2 +- lib/sig-handler.c | 3 + lib/sig-handler.h | 11 +- lib/sig2str.c | 2 +- lib/sig2str.h | 2 +- lib/sigaction.c | 2 +- lib/siglist.h | 2 +- lib/signal.in.h | 14 +- lib/signbitd.c | 2 +- lib/signbitf.c | 2 +- lib/signbitl.c | 2 +- lib/sigprocmask.c | 4 +- lib/size_max.h | 2 +- lib/snprintf.c | 2 +- lib/sockets.c | 2 +- lib/sockets.h | 2 +- lib/spawn-pipe.c | 12 +- lib/spawn-pipe.h | 2 +- lib/spawn.in.h | 2 +- lib/spawn_faction_addclose.c | 2 +- lib/spawn_faction_adddup2.c | 2 +- lib/spawn_faction_addopen.c | 2 +- lib/spawn_faction_destroy.c | 2 +- lib/spawn_faction_init.c | 2 +- lib/spawn_int.h | 2 +- lib/spawnattr_destroy.c | 2 +- lib/spawnattr_init.c | 2 +- lib/spawnattr_setflags.c | 2 +- lib/spawnattr_setsigmask.c | 2 +- lib/spawni.c | 2 +- lib/spawnp.c | 2 +- lib/stat-size.h | 2 +- lib/stat-time.c | 3 + lib/stat-time.h | 25 +- lib/stat.c | 5 +- lib/statat.c | 3 + lib/stdalign.in.h | 2 +- lib/stdarg.in.h | 2 +- lib/stdbool.in.h | 53 +- lib/stddef.in.h | 2 +- lib/stdint.in.h | 6 +- lib/stdio--.h | 2 +- lib/stdio-impl.h | 6 +- lib/stdio-safer.h | 2 +- lib/stdio.in.h | 23 +- lib/stdlib--.h | 2 +- lib/stdlib-safer.h | 2 +- lib/stdlib.in.h | 24 +- lib/stpcpy.c | 2 +- lib/stpncpy.c | 4 +- lib/str-kmp.h | 2 +- lib/str-two-way.h | 2 +- lib/strcasecmp.c | 62 - lib/strchrnul.c | 2 +- lib/strdup.c | 2 +- lib/streq.h | 2 +- lib/strerror-override.c | 23 +- lib/strerror-override.h | 8 +- lib/strerror.c | 2 +- lib/strftime.c | 16 +- lib/strftime.h | 2 +- lib/striconv.c | 2 +- lib/striconv.h | 2 +- lib/string.in.h | 2 +- lib/strings.in.h | 122 - lib/strintcmp.c | 2 +- lib/stripslash.c | 2 +- lib/strncasecmp.c | 62 - lib/strncat.c | 2 +- lib/strndup.c | 2 +- lib/strnlen.c | 2 +- lib/strnlen1.c | 2 +- lib/strnlen1.h | 2 +- lib/strnumcmp-in.h | 2 +- lib/strnumcmp.c | 2 +- lib/strpbrk.c | 2 +- lib/strsignal.c | 2 +- lib/strstr.c | 2 +- lib/strtod.c | 4 +- lib/strtoimax.c | 2 +- lib/strtol.c | 2 +- lib/strtoll.c | 2 +- lib/strtoul.c | 2 +- lib/strtoull.c | 2 +- lib/symlink.c | 2 +- lib/sys_ioctl.in.h | 2 +- lib/sys_resource.in.h | 2 +- lib/sys_select.in.h | 23 +- lib/sys_socket.c | 3 + lib/sys_socket.in.h | 11 +- lib/sys_stat.in.h | 8 +- lib/sys_time.in.h | 190 +- lib/sys_types.in.h | 2 +- lib/sys_uio.in.h | 2 +- lib/sys_utsname.in.h | 2 +- lib/sys_wait.in.h | 2 +- lib/tempname.c | 4 +- lib/tempname.h | 2 +- lib/termios.in.h | 2 +- lib/time.in.h | 2 +- lib/time_r.c | 2 +- lib/timespec.c | 3 + lib/timespec.h | 24 +- lib/trim.c | 2 +- lib/trim.h | 2 +- lib/u64.c | 3 + lib/u64.h | 38 +- lib/uname.c | 2 +- lib/unicodeio.c | 5 +- lib/unicodeio.h | 2 +- lib/unistd--.h | 2 +- lib/unistd-safer.h | 2 +- lib/unistd.c | 3 + lib/unistd.in.h | 36 +- lib/unistr.in.h | 2 +- lib/unistr/u8-mbtoucr.c | 2 +- lib/unistr/u8-uctomb-aux.c | 2 +- lib/unistr/u8-uctomb.c | 2 +- lib/unitypes.in.h | 2 +- lib/uniwidth.in.h | 2 +- lib/uniwidth/cjk.h | 2 +- lib/uniwidth/width.c | 2 +- lib/unlink.c | 2 +- lib/unlinkat.c | 2 +- lib/unlocked-io.h | 2 +- lib/unsetenv.c | 2 +- lib/userspec.c | 2 +- lib/utimecmp.c | 2 +- lib/utimecmp.h | 2 +- lib/utimens.c | 3 +- lib/utimens.h | 29 +- lib/utimensat.c | 2 +- lib/vasnprintf.c | 6 +- lib/vasnprintf.h | 2 +- lib/vasprintf.c | 2 +- lib/verify.h | 8 +- lib/verror.c | 2 +- lib/verror.h | 2 +- lib/version-etc-fsf.c | 2 +- lib/version-etc.c | 4 +- lib/version-etc.h | 2 +- lib/vfprintf.c | 2 +- lib/vprintf.c | 2 +- lib/w32sock.h | 2 +- lib/w32spawn.h | 11 +- lib/wait-process.c | 4 +- lib/wait-process.h | 2 +- lib/waitpid.c | 2 +- lib/wchar.in.h | 2 +- lib/wcrtomb.c | 2 +- lib/wcswidth-impl.h | 2 +- lib/wcswidth.c | 2 +- lib/wctype-h.c | 4 + lib/wctype.in.h | 40 +- lib/wcwidth.c | 2 +- lib/write-any-file.c | 5 +- lib/write.c | 4 +- lib/xalloc-die.c | 2 +- lib/xalloc-oversized.h | 4 +- lib/xalloc.h | 83 +- lib/xasprintf.c | 2 +- lib/xfreopen.c | 2 +- lib/xfts.c | 2 +- lib/xgetcwd.c | 2 +- lib/xgetcwd.h | 2 +- lib/xgetgroups.c | 2 +- lib/xgethostname.c | 2 +- lib/xmalloc.c | 8 +- lib/xmemcoll.c | 2 +- lib/xnanosleep.c | 2 +- lib/xprintf.c | 2 +- lib/xprintf.h | 2 +- lib/xreadlink.c | 2 +- lib/xreadlink.h | 2 +- lib/xsize.c | 3 + lib/xsize.h | 19 +- lib/xstriconv.c | 2 +- lib/xstriconv.h | 2 +- lib/xstrndup.c | 2 +- lib/xstrndup.h | 2 +- lib/xstrtod.c | 2 +- lib/xstrtod.h | 2 +- lib/xstrtol-error.c | 2 +- lib/xstrtol.c | 2 +- lib/xstrtol.h | 4 +- lib/xtime.c | 3 + lib/xtime.h | 45 +- lib/xvasprintf.c | 4 +- lib/xvasprintf.h | 2 +- lib/yesno.c | 2 +- lib/yesno.h | 2 +- m4/00gnulib.m4 | 2 +- m4/ChangeLog-2007 | 2 +- m4/acl.m4 | 9 +- m4/alloca.m4 | 2 +- m4/arpa_inet_h.m4 | 2 +- m4/assert.m4 | 2 +- m4/autobuild.m4 | 2 +- m4/backupfile.m4 | 2 +- m4/base64.m4 | 5 +- m4/bison.m4 | 2 +- m4/boottime.m4 | 2 +- m4/btowc.m4 | 2 +- m4/c-strtod.m4 | 10 +- m4/calloc.m4 | 2 +- m4/canon-host.m4 | 2 +- m4/canonicalize.m4 | 38 +- m4/chdir-long.m4 | 10 +- m4/check-decl.m4 | 2 +- m4/chown.m4 | 2 +- m4/clock_time.m4 | 2 +- m4/close-stream.m4 | 2 +- m4/close.m4 | 2 +- m4/closedir.m4 | 2 +- m4/closein.m4 | 2 +- m4/closeout.m4 | 2 +- m4/codeset.m4 | 2 +- m4/config-h.m4 | 2 +- m4/configmake.m4 | 2 +- m4/ctype.m4 | 2 +- m4/cu-progs.m4 | 106 + m4/cycle-check.m4 | 9 +- m4/d-ino.m4 | 2 +- m4/d-type.m4 | 2 +- m4/dirent-safer.m4 | 2 +- m4/dirent_h.m4 | 2 +- m4/dirfd.m4 | 2 +- m4/dirname.m4 | 2 +- m4/double-slash-root.m4 | 2 +- m4/dup.m4 | 8 +- m4/dup2.m4 | 7 +- m4/eealloc.m4 | 5 +- m4/environ.m4 | 2 +- m4/errno_h.m4 | 16 +- m4/error.m4 | 3 +- m4/euidaccess.m4 | 10 +- m4/exponentd.m4 | 2 +- m4/exponentf.m4 | 2 +- m4/exponentl.m4 | 2 +- m4/extensions.m4 | 6 +- m4/extern-inline.m4 | 62 + m4/faccessat.m4 | 6 +- m4/fatal-signal.m4 | 5 +- m4/fchdir.m4 | 2 +- m4/fchmodat.m4 | 2 +- m4/fchownat.m4 | 2 +- m4/fclose.m4 | 2 +- m4/fcntl-o.m4 | 15 +- m4/fcntl-safer.m4 | 2 +- m4/fcntl.m4 | 2 +- m4/fcntl_h.m4 | 2 +- m4/fd-reopen.m4 | 15 - m4/fdatasync.m4 | 6 +- m4/fdopen.m4 | 8 +- m4/fdopendir.m4 | 2 +- m4/fflush.m4 | 10 +- m4/fileblocks.m4 | 2 +- m4/filemode.m4 | 2 +- m4/filenamecat.m4 | 2 +- m4/flexmember.m4 | 2 +- m4/float_h.m4 | 2 +- m4/fnmatch.m4 | 2 +- m4/fopen.m4 | 9 +- m4/fpending.m4 | 2 +- m4/fpieee.m4 | 2 +- m4/fpurge.m4 | 2 +- m4/freadahead.m4 | 10 + m4/freading.m4 | 2 +- m4/freadptr.m4 | 10 + m4/freadseek.m4 | 10 + m4/freopen.m4 | 9 +- m4/frexp.m4 | 6 +- m4/frexpl.m4 | 16 +- m4/fseek.m4 | 2 +- m4/fseeko.m4 | 2 +- m4/fseterr.m4 | 10 + m4/fstat.m4 | 9 +- m4/fstatat.m4 | 2 +- m4/fstypename.m4 | 2 +- m4/fsusage.m4 | 50 +- m4/fsync.m4 | 2 +- m4/ftell.m4 | 2 +- m4/ftello.m4 | 2 +- m4/ftruncate.m4 | 5 +- m4/fts.m4 | 5 +- m4/futimens.m4 | 2 +- m4/getaddrinfo.m4 | 5 +- m4/getcwd-abort-bug.m4 | 64 +- m4/getcwd-path-max.m4 | 2 +- m4/getcwd.m4 | 2 +- m4/getdelim.m4 | 2 +- m4/getdtablesize.m4 | 8 +- m4/getgroups.m4 | 2 +- m4/gethostname.m4 | 2 +- m4/gethrxtime.m4 | 18 +- m4/getline.m4 | 2 +- m4/getloadavg.m4 | 8 +- m4/getlogin.m4 | 2 +- m4/getndelim2.m4 | 2 +- m4/getopt.m4 | 293 +- m4/getpagesize.m4 | 2 +- m4/getpass.m4 | 2 +- m4/gettext.m4 | 58 +- m4/gettime.m4 | 2 +- m4/gettimeofday.m4 | 2 +- m4/getugroups.m4 | 2 +- m4/getusershell.m4 | 2 +- m4/glibc21.m4 | 2 +- m4/gmp.m4 | 4 +- m4/gnu-make.m4 | 2 +- m4/gnulib-common.m4 | 15 +- m4/gnulib-comp.m4 | 2884 +++--- m4/group-member.m4 | 2 +- m4/hard-locale.m4 | 2 +- m4/host-os.m4 | 2 +- m4/hostent.m4 | 2 +- m4/human.m4 | 2 +- m4/i-ring.m4 | 2 +- m4/iconv.m4 | 2 +- m4/iconv_h.m4 | 2 +- m4/iconv_open.m4 | 2 +- m4/idcache.m4 | 2 +- m4/include-exclude-prog.m4 | 2 +- m4/include_next.m4 | 2 +- m4/inet_ntop.m4 | 2 +- m4/inet_pton.m4 | 2 +- m4/inline.m4 | 2 +- m4/intlmacosx.m4 | 14 +- m4/intmax_t.m4 | 2 +- m4/inttostr.m4 | 2 +- m4/inttypes-pri.m4 | 2 +- m4/inttypes.m4 | 2 +- m4/inttypes_h.m4 | 2 +- m4/ioctl.m4 | 2 +- m4/isapipe.m4 | 2 +- m4/isatty.m4 | 8 +- m4/isblank.m4 | 2 +- m4/isnand.m4 | 2 +- m4/isnanf.m4 | 2 +- m4/isnanl.m4 | 2 +- m4/iswblank.m4 | 2 +- m4/jm-macros.m4 | 4 +- m4/jm-winsz1.m4 | 2 +- m4/jm-winsz2.m4 | 2 +- m4/langinfo_h.m4 | 2 +- m4/largefile.m4 | 27 +- m4/lchmod.m4 | 2 +- m4/lchown.m4 | 2 +- m4/lcmessage.m4 | 2 +- m4/ldexp.m4 | 2 +- m4/ldexpl.m4 | 8 +- m4/lib-check.m4 | 60 - m4/lib-ignore.m4 | 2 +- m4/lib-ld.m4 | 60 +- m4/lib-link.m4 | 2 +- m4/lib-prefix.m4 | 2 +- m4/libunistring-base.m4 | 2 +- m4/link-follow.m4 | 6 +- m4/link.m4 | 2 +- m4/linkat.m4 | 2 +- m4/localcharset.m4 | 2 +- m4/locale-fr.m4 | 12 +- m4/locale-ja.m4 | 8 +- m4/locale-tr.m4 | 8 +- m4/locale-zh.m4 | 8 +- m4/locale_h.m4 | 6 +- m4/localeconv.m4 | 2 +- m4/localename.m4 | 2 +- m4/lock.m4 | 12 +- m4/longlong.m4 | 2 +- m4/ls-mntd-fs.m4 | 2 +- m4/lseek.m4 | 2 +- m4/lstat.m4 | 10 +- m4/malloc.m4 | 2 +- m4/malloca.m4 | 2 +- m4/manywarnings.m4 | 188 +- m4/math_h.m4 | 5 +- m4/mbchar.m4 | 5 +- m4/mbiter.m4 | 5 +- m4/mbrlen.m4 | 2 +- m4/mbrtowc.m4 | 2 +- m4/mbsinit.m4 | 2 +- m4/mbslen.m4 | 2 +- m4/mbsrtowcs.m4 | 2 +- m4/mbstate_t.m4 | 2 +- m4/mbswidth.m4 | 2 +- m4/mbtowc.m4 | 2 +- m4/md5.m4 | 5 +- m4/memcasecmp.m4 | 2 +- m4/memchr.m4 | 2 +- m4/memcoll.m4 | 9 +- m4/mempcpy.m4 | 2 +- m4/memrchr.m4 | 2 +- m4/mgetgroups.m4 | 2 +- m4/mkancesdirs.m4 | 2 +- m4/mkdir-p.m4 | 2 +- m4/mkdir.m4 | 2 +- m4/mkfifo.m4 | 2 +- m4/mknod.m4 | 11 +- m4/mkstemp.m4 | 2 +- m4/mktime.m4 | 34 +- m4/mmap-anon.m4 | 14 +- m4/mode_t.m4 | 2 +- m4/modechange.m4 | 2 +- m4/mountlist.m4 | 2 +- m4/mpsort.m4 | 2 +- m4/msvc-inval.m4 | 2 +- m4/msvc-nothrow.m4 | 2 +- m4/multiarch.m4 | 6 +- m4/nanosleep.m4 | 6 +- m4/netdb_h.m4 | 2 +- m4/netinet_in_h.m4 | 2 +- m4/nl_langinfo.m4 | 2 +- m4/nls.m4 | 2 +- m4/nocrash.m4 | 6 +- m4/non-recursive-gnulib-prefix-hack.m4 | 35 + m4/nproc.m4 | 2 +- m4/off_t.m4 | 2 +- m4/open.m4 | 5 +- m4/openat.m4 | 5 +- m4/opendir.m4 | 2 +- m4/parse-datetime.m4 | 4 +- m4/pathmax.m4 | 2 +- m4/perl.m4 | 2 +- m4/perror.m4 | 2 +- m4/physmem.m4 | 2 +- m4/pipe.m4 | 2 +- m4/pipe2.m4 | 2 +- m4/po.m4 | 29 +- m4/posix-shell.m4 | 2 +- m4/posix_spawn.m4 | 2 +- m4/posixtm.m4 | 2 +- m4/posixver.m4 | 2 +- m4/prereq.m4 | 6 +- m4/printf-frexp.m4 | 2 +- m4/printf-frexpl.m4 | 8 +- m4/printf.m4 | 31 +- m4/priv-set.m4 | 5 +- m4/progtest.m4 | 21 +- m4/pthread.m4 | 46 +- m4/putenv.m4 | 2 +- m4/quote.m4 | 2 +- m4/quotearg.m4 | 2 +- m4/raise.m4 | 8 +- m4/rawmemchr.m4 | 2 +- m4/read-file.m4 | 2 +- m4/read.m4 | 9 +- m4/readdir.m4 | 2 +- m4/readlink.m4 | 2 +- m4/readlinkat.m4 | 5 +- m4/readtokens.m4 | 2 +- m4/readutmp.m4 | 5 +- m4/realloc.m4 | 2 +- m4/regex.m4 | 85 +- m4/remove.m4 | 6 +- m4/rename.m4 | 2 +- m4/rewinddir.m4 | 2 +- m4/rmdir.m4 | 2 +- m4/root-dev-ino.m4 | 14 - m4/rpmatch.m4 | 2 +- m4/safe-read.m4 | 2 +- m4/safe-write.m4 | 2 +- m4/same.m4 | 2 +- m4/save-cwd.m4 | 2 +- m4/savedir.m4 | 2 +- m4/savewd.m4 | 5 +- m4/sched_h.m4 | 2 +- m4/select.m4 | 42 +- m4/selinux-context-h.m4 | 2 +- m4/selinux-selinux-h.m4 | 2 +- m4/servent.m4 | 2 +- m4/setenv.m4 | 2 +- m4/setlocale.m4 | 2 +- m4/settime.m4 | 2 +- m4/sha1.m4 | 5 +- m4/sha256.m4 | 5 +- m4/sha512.m4 | 5 +- m4/sig2str.m4 | 2 +- m4/sig_atomic_t.m4 | 2 +- m4/sigaction.m4 | 9 +- m4/signal_h.m4 | 2 +- m4/signalblocking.m4 | 8 +- m4/signbit.m4 | 6 +- m4/size_max.m4 | 2 +- m4/sleep.m4 | 2 +- m4/snprintf.m4 | 2 +- m4/socketlib.m4 | 2 +- m4/sockets.m4 | 2 +- m4/socklen.m4 | 2 +- m4/sockpfaf.m4 | 2 +- m4/spawn-pipe.m4 | 5 +- m4/spawn_h.m4 | 2 +- m4/ssize_t.m4 | 2 +- m4/st_dm_mode.m4 | 2 +- m4/stat-prog.m4 | 6 +- m4/stat-size.m4 | 2 +- m4/stat-time.m4 | 4 +- m4/stat.m4 | 10 +- m4/stdalign.m4 | 2 +- m4/stdarg.m4 | 2 +- m4/stdbool.m4 | 2 +- m4/stddef_h.m4 | 2 +- m4/stdint.m4 | 2 +- m4/stdint_h.m4 | 2 +- m4/stdio_h.m4 | 7 +- m4/stdlib_h.m4 | 3 +- m4/stpcpy.m4 | 2 +- m4/stpncpy.m4 | 2 +- m4/strcase.m4 | 45 - m4/strchrnul.m4 | 2 +- m4/strdup.m4 | 2 +- m4/strerror.m4 | 2 +- m4/strerror_r.m4 | 6 +- m4/strftime.m4 | 2 +- m4/string_h.m4 | 2 +- m4/strings_h.m4 | 52 - m4/strncat.m4 | 2 +- m4/strndup.m4 | 6 +- m4/strnlen.m4 | 2 +- m4/strnumcmp.m4 | 27 - m4/strpbrk.m4 | 2 +- m4/strsignal.m4 | 2 +- m4/strstr.m4 | 2 +- m4/strtod.m4 | 2 +- m4/strtoimax.m4 | 2 +- m4/strtoll.m4 | 2 +- m4/strtoull.m4 | 2 +- m4/strtoumax.m4 | 2 +- m4/symlink.m4 | 2 +- m4/symlinkat.m4 | 2 +- m4/sys_ioctl_h.m4 | 2 +- m4/sys_resource_h.m4 | 2 +- m4/sys_select_h.m4 | 2 +- m4/sys_socket_h.m4 | 5 +- m4/sys_stat_h.m4 | 7 +- m4/sys_time_h.m4 | 10 +- m4/sys_types_h.m4 | 2 +- m4/sys_uio_h.m4 | 2 +- m4/sys_utsname_h.m4 | 2 +- m4/sys_wait_h.m4 | 2 +- m4/tempname.m4 | 2 +- m4/termios_h.m4 | 2 +- m4/thread.m4 | 5 +- m4/threadlib.m4 | 56 +- m4/time_h.m4 | 6 +- m4/time_r.m4 | 4 +- m4/timer_time.m4 | 6 +- m4/timespec.m4 | 10 +- m4/tls.m4 | 2 +- m4/tm_gmtoff.m4 | 2 +- m4/tzset.m4 | 2 +- m4/uname.m4 | 2 +- m4/ungetc.m4 | 2 +- m4/unicodeio.m4 | 2 +- m4/unistd-safer.m4 | 2 +- m4/unistd_h.m4 | 5 +- m4/unlink-busy.m4 | 2 +- m4/unlink.m4 | 8 +- m4/unlinkat.m4 | 2 +- m4/unlinkdir.m4 | 2 +- m4/unlocked-io.m4 | 2 +- m4/uptime.m4 | 2 +- m4/userspec.m4 | 2 +- m4/usleep.m4 | 2 +- m4/utimbuf.m4 | 2 +- m4/utimecmp.m4 | 2 +- m4/utimens.m4 | 2 +- m4/utimensat.m4 | 2 +- m4/utimes.m4 | 2 +- m4/vasnprintf.m4 | 5 +- m4/vasprintf-posix.m4 | 2 +- m4/vasprintf.m4 | 2 +- m4/version-etc.m4 | 2 +- m4/vfprintf-posix.m4 | 2 +- m4/vprintf-posix.m4 | 2 +- m4/wait-process.m4 | 5 +- m4/waitpid.m4 | 2 +- m4/warnings.m4 | 49 +- m4/wchar_h.m4 | 2 +- m4/wchar_t.m4 | 2 +- m4/wcrtomb.m4 | 2 +- m4/wcswidth.m4 | 2 +- m4/wctob.m4 | 2 +- m4/wctomb.m4 | 2 +- m4/wctype_h.m4 | 6 +- m4/wcwidth.m4 | 6 +- m4/wint_t.m4 | 2 +- m4/write-any-file.m4 | 2 +- m4/write.m4 | 9 +- m4/xalloc.m4 | 21 +- m4/xattr.m4 | 2 +- m4/xfts.m4 | 14 - m4/xgetcwd.m4 | 2 +- m4/xnanosleep.m4 | 2 +- m4/xsize.m4 | 5 +- m4/xstrndup.m4 | 2 +- m4/xstrtod.m4 | 2 +- m4/xstrtol.m4 | 2 +- m4/xvasprintf.m4 | 11 +- m4/yesno.m4 | 2 +- m4/yield.m4 | 2 +- maint.mk | 295 +- man/Makefile.am | 220 - man/Makefile.in | 2086 ---- man/arch.1 | 47 - man/base64.1 | 62 - man/basename.1 | 73 - man/cat.1 | 86 - man/chcon.1 | 96 - man/chgrp.1 | 102 - man/chmod.1 | 177 - man/chmod.x | 2 +- man/chown.1 | 136 - man/chown.x | 2 +- man/chroot.1 | 58 - man/cksum.1 | 48 - man/comm.1 | 79 - man/cp.1 | 181 - man/csplit.1 | 85 - man/cut.1 | 94 - man/date.1 | 261 - man/dd.1 | 199 - man/df.1 | 123 - man/df.x | 2 +- man/dir.1 | 267 - man/dircolors.1 | 59 - man/dirname.1 | 61 - man/du.1 | 167 - man/du.x | 2 +- man/dummy-man | 72 + man/echo.1 | 99 - man/env.1 | 56 - man/expand.1 | 59 - man/expr.1 | 119 - man/factor.1 | 49 - man/false.1 | 52 - man/fmt.1 | 72 - man/fold.1 | 57 - man/groups.1 | 46 - man/head.1 | 69 - man/help2man | 2 +- man/hostid.1 | 45 - man/hostid.x | 2 + man/hostname.1 | 48 - man/id.1 | 69 - man/install.1 | 137 - man/join.1 | 103 - man/kill.1 | 73 - man/link.1 | 50 - man/ln.1 | 130 - man/local.mk | 196 + man/logname.1 | 45 - man/ls.1 | 267 - man/md5sum.1 | 77 - man/mkdir.1 | 62 - man/mkfifo.1 | 55 - man/mknod.1 | 73 - man/mktemp.1 | 78 - man/mv.1 | 109 - man/nice.1 | 56 - man/nice.x | 2 +- man/nl.1 | 109 - man/nohup.1 | 58 - man/nproc.1 | 52 - man/numfmt.x | 4 + man/od.1 | 155 - man/od.x | 7 + man/paste.1 | 55 - man/pathchk.1 | 54 - man/pinky.1 | 74 - man/pr.1 | 143 - man/printenv.1 | 53 - man/printf.1 | 111 - man/ptx.1 | 102 - man/pwd.1 | 57 - man/readlink.1 | 73 - man/readlink.x | 4 +- man/realpath.1 | 75 - man/rm.1 | 114 - man/rm.x | 2 +- man/rmdir.1 | 60 - man/runcon.1 | 77 - man/seq.1 | 69 - man/sha1sum.1 | 73 - man/sha224sum.1 | 73 - man/sha256sum.1 | 73 - man/sha384sum.1 | 73 - man/sha512sum.1 | 73 - man/shred.1 | 112 - man/shuf.1 | 73 - man/sleep.1 | 54 - man/sort.1 | 167 - man/sort.x | 2 + man/split.1 | 95 - man/stat.1 | 199 - man/stdbuf.1 | 79 - man/stdbuf.x | 2 +- man/stty.1 | 411 - man/su.1 | 65 - man/su.x | 4 - man/sum.1 | 53 - man/sync.1 | 47 - man/tac.1 | 59 - man/tail.1 | 106 - man/tee.1 | 53 - man/test.1 | 182 - man/timeout.1 | 81 - man/touch.1 | 96 - man/tr.1 | 147 - man/true.1 | 52 - man/truncate.1 | 74 - man/tsort.1 | 46 - man/tty.1 | 48 - man/uname.1 | 75 - man/unexpand.1 | 62 - man/uniq.1 | 88 - man/uniq.x | 2 +- man/unlink.1 | 50 - man/uptime.1 | 49 - man/users.1 | 46 - man/vdir.1 | 267 - man/wc.1 | 73 - man/who.1 | 96 - man/whoami.1 | 46 - man/yes.1 | 48 - old/fileutils/ChangeLog | 4 +- old/fileutils/ChangeLog-1997 | 2 +- old/fileutils/NEWS | 2 +- old/sh-utils/ChangeLog | 2 +- old/sh-utils/ChangeLog.0 | 2 +- old/sh-utils/NEWS | 2 +- old/textutils/ChangeLog | 6 +- old/textutils/NEWS | 2 +- po/ChangeLog-2007 | 2 +- po/LINGUAS | 2 + po/POTFILES.in | 4 +- po/af.gmo | Bin 32164 -> 30261 bytes po/af.po | 3116 +++--- po/be.gmo | Bin 73383 -> 67270 bytes po/be.po | 3145 +++--- po/bg.gmo | Bin 182118 -> 163954 bytes po/bg.po | 3350 ++++--- po/ca.gmo | Bin 298849 -> 321380 bytes po/ca.po | 3624 +++---- po/coreutils.pot | 2949 +++--- po/cs.gmo | Bin 341461 -> 354757 bytes po/cs.po | 3730 +++++--- po/da.gmo | Bin 253127 -> 284598 bytes po/da.po | 3932 ++++---- po/de.gmo | Bin 337094 -> 351726 bytes po/de.po | 4283 +++++---- po/el.gmo | Bin 27741 -> 27157 bytes po/el.po | 3236 ++++--- po/eo.gmo | Bin 118869 -> 164529 bytes po/eo.po | 3828 +++++--- po/es.gmo | Bin 273086 -> 245377 bytes po/es.po | 3402 ++++--- po/et.gmo | Bin 314545 -> 326789 bytes po/et.po | 3303 ++++--- po/eu.gmo | Bin 31381 -> 30098 bytes po/eu.po | 3197 ++++--- po/fi.gmo | Bin 134873 -> 120977 bytes po/fi.po | 3336 ++++--- po/fr.gmo | Bin 273720 -> 363494 bytes po/fr.po | 8710 +++++++++-------- po/ga.gmo | Bin 172003 -> 154255 bytes po/ga.po | 3360 ++++--- po/gl.gmo | Bin 39498 -> 35465 bytes po/gl.po | 3225 ++++--- po/hr.gmo | Bin 0 -> 16128 bytes po/hr.po | 9995 ++++++++++++++++++++ po/hu.gmo | Bin 293735 -> 262906 bytes po/hu.po | 3294 ++++--- po/ia.gmo | Bin 0 -> 7804 bytes po/ia.po | 9933 +++++++++++++++++++ po/id.gmo | Bin 228373 -> 203475 bytes po/id.po | 3410 ++++--- po/it.gmo | Bin 262220 -> 235850 bytes po/it.po | 3340 ++++--- po/ja.gmo | Bin 289089 -> 259112 bytes po/ja.po | 3345 ++++--- po/kk.gmo | Bin 1844 -> 1647 bytes po/kk.po | 2994 +++--- po/ko.gmo | Bin 34689 -> 30795 bytes po/ko.po | 3150 +++--- po/lg.gmo | Bin 343541 -> 305770 bytes po/lg.po | 3483 ++++--- po/lt.gmo | Bin 34302 -> 33250 bytes po/lt.po | 3055 +++--- po/ms.gmo | Bin 25810 -> 23626 bytes po/ms.po | 3122 +++--- po/nb.gmo | Bin 25461 -> 22253 bytes po/nb.po | 3107 +++--- po/nl.gmo | Bin 333055 -> 327523 bytes po/nl.po | 3476 ++++--- po/pl.gmo | Bin 338107 -> 352661 bytes po/pl.po | 3652 +++---- po/pt.gmo | Bin 164604 -> 147573 bytes po/pt.po | 3335 ++++--- po/pt_BR.gmo | Bin 174162 -> 185725 bytes po/pt_BR.po | 4374 ++++----- po/ro.gmo | Bin 56236 -> 52654 bytes po/ro.po | 3059 +++--- po/ru.gmo | Bin 434044 -> 450324 bytes po/ru.po | 3817 +++++--- po/sk.gmo | Bin 78408 -> 79510 bytes po/sk.po | 3508 ++++--- po/sl.gmo | Bin 328578 -> 295893 bytes po/sl.po | 3310 ++++--- po/sv.gmo | Bin 322223 -> 330401 bytes po/sv.po | 3463 ++++--- po/tr.gmo | Bin 115169 -> 103366 bytes po/tr.po | 3346 ++++--- po/uk.gmo | Bin 425102 -> 441910 bytes po/uk.po | 3768 +++++--- po/vi.gmo | Bin 360478 -> 324392 bytes po/vi.po | 6768 +++++++------ po/zh_CN.gmo | Bin 232608 -> 208176 bytes po/zh_CN.po | 3301 ++++--- po/zh_TW.gmo | Bin 61909 -> 54505 bytes po/zh_TW.po | 3229 ++++--- src/Makefile.am | 724 -- src/Makefile.in | 3547 ------- src/base64.c | 7 +- src/basename.c | 5 +- src/cat.c | 2 +- src/chcon.c | 10 +- src/chgrp.c | 2 +- src/chmod.c | 2 +- src/chown-core.c | 2 +- src/chown-core.h | 2 +- src/chown.c | 2 +- src/chroot.c | 2 +- src/cksum.c | 6 +- src/comm.c | 2 +- src/copy.c | 29 +- src/copy.h | 3 +- src/cp-hash.c | 2 +- src/cp.c | 22 +- src/csplit.c | 17 +- src/cu-progs.mk | 110 + src/cut.c | 104 +- src/date.c | 8 +- src/dcgen | 2 +- src/dd.c | 37 +- src/df.c | 915 +- src/dircolors.c | 2 +- src/dircolors.h | 4 +- src/dircolors.hin | 4 +- src/dirname.c | 2 +- src/du.c | 138 +- src/echo.c | 2 +- src/env.c | 8 +- src/expand.c | 9 +- src/expr.c | 2 +- src/extent-scan.c | 14 +- src/extent-scan.h | 2 +- src/extract-magic | 2 +- src/factor.c | 2598 ++++- src/find-mount-point.c | 2 +- src/find-mount-point.h | 2 +- src/fmt.c | 17 +- src/fold.c | 9 +- src/fs-is-local.h | 6 + src/fs.h | 8 +- src/getlimits.c | 2 +- src/group-list.c | 18 +- src/group-list.h | 2 +- src/groups.c | 2 +- src/head.c | 19 +- src/hostid.c | 2 +- src/hostname.c | 2 +- src/id.c | 44 +- src/install.c | 15 +- src/ioblksize.h | 2 +- src/join.c | 4 +- src/kill.c | 9 +- src/libstdbuf.c | 2 +- src/link.c | 2 +- src/ln.c | 20 +- src/local.mk | 526 + src/logname.c | 2 +- src/longlong.h | 2155 +++++ src/ls.c | 29 +- src/make-prime-list.c | 227 + src/md5sum.c | 222 +- src/mkdir.c | 9 +- src/mkfifo.c | 11 +- src/mknod.c | 11 +- src/mktemp.c | 5 +- src/mv.c | 16 +- src/nice.c | 14 +- src/nl.c | 20 +- src/nohup.c | 2 +- src/nproc.c | 9 +- src/numfmt.c | 1527 +++ src/od.c | 56 +- src/operand2sig.c | 2 +- src/operand2sig.h | 2 +- src/paste.c | 9 +- src/pathchk.c | 2 +- src/pinky.c | 23 +- src/pr.c | 37 +- src/primes.h | 4014 ++++++++ src/printenv.c | 2 +- src/printf.c | 2 +- src/prog-fprintf.c | 2 +- src/prog-fprintf.h | 2 +- src/ptx.c | 9 +- src/pwd.c | 2 +- src/readlink.c | 62 +- src/realpath.c | 2 +- src/relpath.c | 2 +- src/relpath.h | 2 +- src/remove.c | 97 +- src/remove.h | 5 +- src/rm.c | 11 +- src/rmdir.c | 2 +- src/runcon.c | 8 +- src/seq.c | 197 +- src/setuidgid.c | 13 +- src/shred.c | 21 +- src/shuf.c | 9 +- src/sleep.c | 2 +- src/sort.c | 142 +- src/split.c | 44 +- src/stat.c | 29 +- src/stdbuf.c | 9 +- src/stty.c | 28 +- src/su.c | 520 - src/sum.c | 2 +- src/sync.c | 2 +- src/system.h | 28 +- src/tac-pipe.c | 2 +- src/tac.c | 9 +- src/tail.c | 12 +- src/tee.c | 2 +- src/test.c | 2 +- src/timeout.c | 95 +- src/touch.c | 18 +- src/tr.c | 2 +- src/true.c | 2 +- src/truncate.c | 24 +- src/tsort.c | 2 +- src/tty.c | 2 +- src/uname.c | 2 +- src/unexpand.c | 9 +- src/uniq.c | 9 +- src/unlink.c | 2 +- src/uptime.c | 6 +- src/users.c | 2 +- src/wc.c | 2 +- src/wheel-gen.pl | 114 - src/wheel-size.h | 1 - src/wheel.h | 491 - src/who.c | 21 +- src/whoami.c | 2 +- src/yes.c | 2 +- tests/Coreutils.pm | 14 +- tests/CuSkip.pm | 2 +- tests/CuTmpdir.pm | 2 +- tests/GNUmakefile | 20 + tests/Makefile.am | 707 -- tests/Makefile.in | 6292 ------------ tests/check.mk | 95 - tests/chgrp/basic | 110 - tests/chgrp/basic.sh | 110 + tests/chgrp/default-no-deref | 33 - tests/chgrp/default-no-deref.sh | 33 + tests/chgrp/deref | 60 - tests/chgrp/deref.sh | 60 + tests/chgrp/no-x | 54 - tests/chgrp/no-x.sh | 54 + tests/chgrp/posix-H | 70 - tests/chgrp/posix-H.sh | 70 + tests/chgrp/recurse | 53 - tests/chgrp/recurse.sh | 53 + tests/chmod/c-option | 40 - tests/chmod/c-option.sh | 40 + tests/chmod/equal-x | 34 - tests/chmod/equal-x.sh | 34 + tests/chmod/equals | 46 - tests/chmod/equals.sh | 46 + tests/chmod/inaccessible | 28 - tests/chmod/inaccessible.sh | 28 + tests/chmod/no-x | 57 - tests/chmod/no-x.sh | 57 + tests/chmod/octal | 29 - tests/chmod/octal.sh | 29 + tests/chmod/setgid | 64 - tests/chmod/setgid.sh | 64 + tests/chmod/silent | 29 - tests/chmod/silent.sh | 29 + tests/chmod/thru-dangling | 31 - tests/chmod/thru-dangling.sh | 31 + tests/chmod/umask-x | 26 - tests/chmod/umask-x.sh | 26 + tests/chmod/usage | 86 - tests/chmod/usage.sh | 86 + tests/chown/basic | 59 - tests/chown/basic.sh | 59 + tests/chown/deref | 38 - tests/chown/deref.sh | 38 + tests/chown/preserve-root | 66 - tests/chown/preserve-root.sh | 66 + tests/chown/separator | 63 - tests/chown/separator.sh | 63 + tests/cp/abuse | 50 - tests/cp/abuse.sh | 50 + tests/cp/acl | 60 - tests/cp/acl.sh | 60 + tests/cp/attr-existing | 29 - tests/cp/attr-existing.sh | 29 + tests/cp/backup-1 | 37 - tests/cp/backup-1.sh | 37 + tests/cp/backup-dir | 32 - tests/cp/backup-dir.sh | 32 + tests/cp/backup-is-src | 36 - tests/cp/backup-is-src.sh | 36 + tests/cp/capability | 52 - tests/cp/capability.sh | 52 + tests/cp/cp-HL | 40 - tests/cp/cp-HL.sh | 40 + tests/cp/cp-a-selinux | 114 - tests/cp/cp-a-selinux.sh | 114 + tests/cp/cp-deref | 34 - tests/cp/cp-deref.sh | 34 + tests/cp/cp-i | 65 - tests/cp/cp-i.sh | 65 + tests/cp/cp-mv-backup | 92 - tests/cp/cp-mv-backup.sh | 92 + tests/cp/cp-mv-enotsup-xattr | 109 - tests/cp/cp-mv-enotsup-xattr.sh | 109 + tests/cp/cp-parents | 58 - tests/cp/cp-parents.sh | 58 + tests/cp/deref-slink | 28 - tests/cp/deref-slink.sh | 28 + tests/cp/dir-rm-dest | 30 - tests/cp/dir-rm-dest.sh | 30 + tests/cp/dir-slash | 35 - tests/cp/dir-slash.sh | 35 + tests/cp/dir-vs-file | 33 - tests/cp/dir-vs-file.sh | 33 + tests/cp/existing-perm-dir | 31 - tests/cp/existing-perm-dir.sh | 31 + tests/cp/existing-perm-race | 90 - tests/cp/existing-perm-race.sh | 90 + tests/cp/fail-perm | 58 - tests/cp/fail-perm.sh | 58 + tests/cp/fiemap-2 | 55 - tests/cp/fiemap-2.sh | 55 + tests/cp/fiemap-FMR.sh | 31 + tests/cp/fiemap-empty | 101 - tests/cp/fiemap-empty.sh | 101 + tests/cp/fiemap-perf | 48 - tests/cp/fiemap-perf.sh | 49 + tests/cp/file-perm-race | 56 - tests/cp/file-perm-race.sh | 56 + tests/cp/into-self | 57 - tests/cp/into-self.sh | 57 + tests/cp/link | 31 - tests/cp/link-heap | 36 - tests/cp/link-heap.sh | 37 + tests/cp/link-no-deref | 29 - tests/cp/link-no-deref.sh | 29 + tests/cp/link-preserve | 91 - tests/cp/link-preserve.sh | 91 + tests/cp/link-symlink | 41 - tests/cp/link-symlink.sh | 41 + tests/cp/link.sh | 31 + tests/cp/nfs-removal-race | 70 - tests/cp/nfs-removal-race.sh | 70 + tests/cp/no-deref-link1 | 39 - tests/cp/no-deref-link1.sh | 39 + tests/cp/no-deref-link2 | 39 - tests/cp/no-deref-link2.sh | 39 + tests/cp/no-deref-link3 | 36 - tests/cp/no-deref-link3.sh | 36 + tests/cp/parent-perm | 53 - tests/cp/parent-perm-race | 64 - tests/cp/parent-perm-race.sh | 64 + tests/cp/parent-perm.sh | 53 + tests/cp/perm | 77 - tests/cp/perm.sh | 77 + tests/cp/preserve-2 | 29 - tests/cp/preserve-2.sh | 29 + tests/cp/preserve-gid | 136 - tests/cp/preserve-gid.sh | 136 + tests/cp/preserve-link | 92 - tests/cp/preserve-link.sh | 92 + tests/cp/preserve-mode.sh | 54 + tests/cp/preserve-slink-time | 41 - tests/cp/preserve-slink-time.sh | 41 + tests/cp/proc-short-read | 40 - tests/cp/proc-short-read.sh | 40 + tests/cp/proc-zero-len | 40 - tests/cp/proc-zero-len.sh | 40 + tests/cp/r-vs-symlink | 41 - tests/cp/r-vs-symlink.sh | 41 + tests/cp/reflink-auto | 41 - tests/cp/reflink-auto.sh | 41 + tests/cp/reflink-perm | 45 - tests/cp/reflink-perm.sh | 45 + tests/cp/same-file | 220 - tests/cp/same-file.sh | 220 + tests/cp/slink-2-slink | 32 - tests/cp/slink-2-slink.sh | 32 + tests/cp/sparse | 40 - tests/cp/sparse-fiemap | 116 - tests/cp/sparse-fiemap.sh | 116 + tests/cp/sparse-to-pipe | 35 - tests/cp/sparse-to-pipe.sh | 35 + tests/cp/sparse.sh | 40 + tests/cp/special-bits | 50 - tests/cp/special-bits.sh | 50 + tests/cp/special-f | 35 - tests/cp/special-f.sh | 35 + tests/cp/src-base-dot | 32 - tests/cp/src-base-dot.sh | 32 + tests/cp/symlink-slash | 36 - tests/cp/symlink-slash.sh | 36 + tests/cp/thru-dangling | 41 - tests/cp/thru-dangling.sh | 41 + tests/dd/bytes | 56 - tests/dd/bytes.sh | 56 + tests/dd/direct | 35 - tests/dd/direct.sh | 35 + tests/dd/misc | 98 - tests/dd/misc.sh | 105 + tests/dd/nocache | 58 - tests/dd/nocache.sh | 58 + tests/dd/not-rewound | 31 - tests/dd/not-rewound.sh | 31 + tests/dd/reblock | 72 - tests/dd/reblock.sh | 72 + tests/dd/skip-seek | 78 - tests/dd/skip-seek-past-dev | 58 - tests/dd/skip-seek-past-dev.sh | 58 + tests/dd/skip-seek-past-file | 89 - tests/dd/skip-seek-past-file.sh | 89 + tests/dd/skip-seek.pl | 78 + tests/dd/skip-seek2 | 38 - tests/dd/skip-seek2.sh | 38 + tests/dd/sparse | 70 - tests/dd/sparse.sh | 70 + tests/dd/stderr | 43 - tests/dd/stderr.sh | 43 + tests/dd/unblock | 59 - tests/dd/unblock-sync | 35 - tests/dd/unblock-sync.sh | 35 + tests/dd/unblock.pl | 59 + tests/df/df-P.sh | 37 + tests/df/df-output.sh | 130 + tests/df/header.sh | 28 + tests/df/no-mtab-status.sh | 80 + tests/df/problematic-chars.sh | 44 + tests/df/skip-duplicates.sh | 87 + tests/df/skip-rootfs.sh | 48 + tests/df/total-unprocessed.sh | 42 + tests/df/total-verify | 64 - tests/df/total-verify.sh | 64 + tests/df/unreadable | 27 - tests/df/unreadable.sh | 27 + tests/du/2g | 69 - tests/du/2g.sh | 69 + tests/du/8gb | 53 - tests/du/8gb.sh | 53 + tests/du/basic | 89 - tests/du/basic.sh | 89 + tests/du/bigtime | 51 - tests/du/bigtime.sh | 51 + tests/du/bind-mount-dir-cycle.sh | 38 + tests/du/deref | 48 - tests/du/deref-args | 48 - tests/du/deref-args.sh | 48 + tests/du/deref.sh | 48 + tests/du/exclude | 58 - tests/du/exclude.sh | 58 + tests/du/fd-leak | 43 - tests/du/fd-leak.sh | 43 + tests/du/files0-from | 94 - tests/du/files0-from-dir | 39 - tests/du/files0-from-dir.sh | 39 + tests/du/files0-from.pl | 94 + tests/du/hard-link | 64 - tests/du/hard-link.sh | 64 + tests/du/inacc-dest | 56 - tests/du/inacc-dest.sh | 56 + tests/du/inacc-dir | 42 - tests/du/inacc-dir.sh | 42 + tests/du/inaccessible-cwd | 40 - tests/du/inaccessible-cwd.sh | 40 + tests/du/long-from-unreadable | 68 - tests/du/long-from-unreadable.sh | 68 + tests/du/long-sloop | 72 - tests/du/long-sloop.sh | 72 + tests/du/max-depth | 38 - tests/du/max-depth.sh | 38 + tests/du/move-dir-while-traversing | 96 - tests/du/move-dir-while-traversing.sh | 96 + tests/du/no-deref | 33 - tests/du/no-deref.sh | 33 + tests/du/no-x | 49 - tests/du/no-x.sh | 49 + tests/du/one-file-system | 57 - tests/du/one-file-system.sh | 57 + tests/du/restore-wd | 31 - tests/du/restore-wd.sh | 31 + tests/du/slash | 33 - tests/du/slash.sh | 33 + tests/du/slink | 46 - tests/du/threshold.sh | 360 + tests/du/trailing-slash | 47 - tests/du/trailing-slash.sh | 47 + tests/du/two-args | 40 - tests/du/two-args.sh | 40 + tests/envvar-check | 2 +- tests/factor/create-test.sh | 83 + tests/factor/run.sh | 32 + tests/fmt/base | 64 - tests/fmt/base.pl | 64 + tests/fmt/goal-option | 56 - tests/fmt/goal-option.sh | 56 + tests/fmt/long-line | 61 - tests/fmt/long-line.sh | 61 + tests/id/gnu-zero-uids | 29 - tests/id/gnu-zero-uids.sh | 29 + tests/id/no-context | 35 - tests/id/no-context.sh | 35 + tests/init.cfg | 533 -- tests/init.sh | 7 +- tests/install/basic-1 | 115 - tests/install/basic-1.sh | 115 + tests/install/create-leading | 35 - tests/install/create-leading.sh | 35 + tests/install/d-slashdot | 29 - tests/install/d-slashdot.sh | 29 + tests/install/install-C | 90 - tests/install/install-C-root | 76 - tests/install/install-C-root.sh | 76 + tests/install/install-C-selinux | 51 - tests/install/install-C-selinux.sh | 51 + tests/install/install-C.sh | 90 + tests/install/strip-program | 36 - tests/install/strip-program.sh | 36 + tests/install/trap | 33 - tests/install/trap.sh | 33 + tests/ln/backup-1 | 30 - tests/ln/backup-1.sh | 30 + tests/ln/hard-backup | 32 - tests/ln/hard-backup.sh | 32 + tests/ln/hard-to-sym | 77 - tests/ln/hard-to-sym.sh | 77 + tests/ln/misc | 124 - tests/ln/misc.sh | 124 + tests/ln/relative | 32 - tests/ln/relative.sh | 32 + tests/ln/sf-1 | 31 - tests/ln/sf-1.sh | 31 + tests/ln/slash-decorated-nonexistent-dest | 29 - tests/ln/slash-decorated-nonexistent-dest.sh | 29 + tests/ln/target-1 | 30 - tests/ln/target-1.sh | 30 + tests/local.mk | 819 ++ tests/ls/abmon-align | 49 - tests/ls/abmon-align.sh | 49 + tests/ls/block-size | 173 - tests/ls/block-size.sh | 173 + tests/ls/capability | 63 - tests/ls/capability.sh | 63 + tests/ls/color-clear-to-eol | 41 - tests/ls/color-clear-to-eol.sh | 41 + tests/ls/color-dtype-dir | 64 - tests/ls/color-dtype-dir.sh | 64 + tests/ls/color-norm | 84 - tests/ls/color-norm.sh | 84 + tests/ls/dangle | 62 - tests/ls/dangle.sh | 62 + tests/ls/dired | 35 - tests/ls/dired.sh | 35 + tests/ls/file-type | 65 - tests/ls/file-type.sh | 65 + tests/ls/follow-slink | 61 - tests/ls/follow-slink.sh | 61 + tests/ls/getxattr-speedup | 65 - tests/ls/getxattr-speedup.sh | 65 + tests/ls/infloop | 42 - tests/ls/infloop.sh | 42 + tests/ls/inode | 65 - tests/ls/inode.sh | 65 + tests/ls/m-option | 40 - tests/ls/m-option.sh | 40 + tests/ls/multihardlink | 80 - tests/ls/multihardlink.sh | 80 + tests/ls/nameless-uid | 40 - tests/ls/nameless-uid.sh | 40 + tests/ls/no-arg | 56 - tests/ls/no-arg.sh | 56 + tests/ls/no-cap | 32 - tests/ls/no-cap.sh | 32 + tests/ls/proc-selinux-segfault | 27 - tests/ls/proc-selinux-segfault.sh | 27 + tests/ls/readdir-mountpoint-inode | 70 - tests/ls/readdir-mountpoint-inode.sh | 70 + tests/ls/recursive | 62 - tests/ls/recursive.sh | 62 + tests/ls/root-rel-symlink-color.sh | 51 + tests/ls/rt-1 | 46 - tests/ls/rt-1.sh | 46 + tests/ls/slink-acl | 33 - tests/ls/slink-acl.sh | 33 + tests/ls/stat-dtype | 61 - tests/ls/stat-dtype.sh | 61 + tests/ls/stat-failed | 52 - tests/ls/stat-failed.sh | 52 + tests/ls/stat-free-color | 70 - tests/ls/stat-free-color.sh | 70 + tests/ls/stat-free-symlinks | 52 - tests/ls/stat-free-symlinks.sh | 52 + tests/ls/stat-vs-dirent | 60 - tests/ls/stat-vs-dirent.sh | 60 + tests/ls/symlink-slash | 30 - tests/ls/symlink-slash.sh | 30 + tests/ls/time-style-diag | 39 - tests/ls/time-style-diag.sh | 39 + tests/ls/x-option | 37 - tests/ls/x-option.sh | 37 + tests/misc/arch | 29 - tests/misc/arch.sh | 29 + tests/misc/base64 | 154 - tests/misc/base64.pl | 154 + tests/misc/basename | 83 - tests/misc/basename.pl | 92 + tests/misc/cat-buf | 44 - tests/misc/cat-buf.sh | 44 + tests/misc/cat-proc | 38 - tests/misc/cat-proc.sh | 38 + tests/misc/chcon | 77 - tests/misc/chcon-fail | 37 - tests/misc/chcon-fail.sh | 37 + tests/misc/chcon.sh | 77 + tests/misc/chroot-credentials | 52 - tests/misc/chroot-credentials.sh | 52 + tests/misc/chroot-fail | 43 - tests/misc/chroot-fail.sh | 43 + tests/misc/close-stdout | 65 - tests/misc/close-stdout.sh | 65 + tests/misc/comm | 152 - tests/misc/comm.pl | 152 + tests/misc/csplit | 103 - tests/misc/csplit-1000 | 29 - tests/misc/csplit-1000.sh | 29 + tests/misc/csplit-heap | 29 - tests/misc/csplit-heap.sh | 29 + tests/misc/csplit.sh | 103 + tests/misc/cut | 198 - tests/misc/cut-huge-to-eol-range.sh | 30 + tests/misc/cut.pl | 238 + tests/misc/date | 318 - tests/misc/date-next-dow | 78 - tests/misc/date-next-dow.pl | 78 + tests/misc/date-sec | 49 - tests/misc/date-sec.sh | 49 + tests/misc/date.pl | 323 + tests/misc/df | 28 - tests/misc/df-P | 37 - tests/misc/dircolors | 46 - tests/misc/dircolors.pl | 46 + tests/misc/dirname | 72 - tests/misc/dirname.pl | 72 + tests/misc/env | 152 - tests/misc/env-null | 61 - tests/misc/env-null.sh | 61 + tests/misc/env.sh | 152 + tests/misc/expand | 39 - tests/misc/expand.pl | 39 + tests/misc/expr | 198 - tests/misc/expr.pl | 198 + tests/misc/factor | 99 - tests/misc/factor.pl | 115 + tests/misc/false-status | 25 - tests/misc/false-status.sh | 25 + tests/misc/fold | 39 - tests/misc/fold.pl | 39 + tests/misc/groups-dash | 32 - tests/misc/groups-dash.sh | 32 + tests/misc/groups-version | 28 - tests/misc/groups-version.sh | 28 + tests/misc/head | 83 - tests/misc/head-c | 30 - tests/misc/head-c.sh | 30 + tests/misc/head-elide-tail | 107 - tests/misc/head-elide-tail.pl | 107 + tests/misc/head-pos | 32 - tests/misc/head-pos.sh | 44 + tests/misc/head.pl | 83 + tests/misc/help-version | 283 - tests/misc/help-version.sh | 281 + tests/misc/id-context | 32 - tests/misc/id-context.sh | 32 + tests/misc/id-groups | 23 - tests/misc/id-groups.sh | 23 + tests/misc/id-setgid | 34 - tests/misc/id-setgid.sh | 34 + tests/misc/invalid-opt | 103 - tests/misc/invalid-opt.pl | 102 + tests/misc/join | 311 - tests/misc/join.pl | 315 + tests/misc/ls-misc | 341 - tests/misc/ls-misc.pl | 356 + tests/misc/ls-time | 145 - tests/misc/ls-time.sh | 145 + tests/misc/md5sum | 143 - tests/misc/md5sum-bsd | 41 - tests/misc/md5sum-bsd.sh | 88 + tests/misc/md5sum-newline | 44 - tests/misc/md5sum-newline.pl | 44 + tests/misc/md5sum-parallel | 32 - tests/misc/md5sum-parallel.sh | 32 + tests/misc/md5sum.pl | 143 + tests/misc/mknod | 39 - tests/misc/mknod.sh | 39 + tests/misc/mktemp | 204 - tests/misc/mktemp.pl | 204 + tests/misc/nice | 94 - tests/misc/nice-fail | 38 - tests/misc/nice-fail.sh | 38 + tests/misc/nice.sh | 94 + tests/misc/nl | 43 - tests/misc/nl.sh | 43 + tests/misc/nohup | 121 - tests/misc/nohup.sh | 121 + tests/misc/nproc-avail | 27 - tests/misc/nproc-avail.sh | 27 + tests/misc/nproc-positive | 44 - tests/misc/nproc-positive.sh | 44 + tests/misc/numfmt.pl | 950 ++ tests/misc/od | 67 - tests/misc/od-N | 32 - tests/misc/od-N.sh | 32 + tests/misc/od-float | 58 - tests/misc/od-float.sh | 58 + tests/misc/od-multiple-t | 42 - tests/misc/od-multiple-t.sh | 42 + tests/misc/od-x8 | 43 - tests/misc/od-x8.sh | 43 + tests/misc/od.pl | 67 + tests/misc/paste | 65 - tests/misc/paste.pl | 65 + tests/misc/pathchk1 | 38 - tests/misc/pathchk1.sh | 38 + tests/misc/pr | 43 - tests/misc/printenv | 81 - tests/misc/printenv.sh | 81 + tests/misc/printf | 127 - tests/misc/printf-cov | 101 - tests/misc/printf-cov.pl | 101 + tests/misc/printf-hex | 29 - tests/misc/printf-hex.sh | 29 + tests/misc/printf-surprise | 91 - tests/misc/printf-surprise.sh | 94 + tests/misc/printf.sh | 127 + tests/misc/ptx | 44 - tests/misc/ptx-overrun | 35 - tests/misc/ptx-overrun.sh | 35 + tests/misc/ptx.pl | 44 + tests/misc/pwd-long | 124 - tests/misc/pwd-long.sh | 124 + tests/misc/pwd-option | 62 - tests/misc/pwd-option.sh | 62 + tests/misc/readlink-fp-loop | 68 - tests/misc/readlink-fp-loop.sh | 68 + tests/misc/readlink-root | 92 - tests/misc/readlink-root.sh | 92 + tests/misc/realpath | 111 - tests/misc/realpath.sh | 111 + tests/misc/runcon-no-reorder | 42 - tests/misc/runcon-no-reorder.sh | 42 + tests/misc/selinux | 59 - tests/misc/selinux.sh | 59 + tests/misc/seq | 128 - tests/misc/seq-long-double | 47 - tests/misc/seq-long-double.sh | 47 + tests/misc/seq.pl | 169 + tests/misc/sha1sum | 90 - tests/misc/sha1sum-vec | 534 -- tests/misc/sha1sum-vec.pl | 534 ++ tests/misc/sha1sum.pl | 90 + tests/misc/sha224sum | 49 - tests/misc/sha224sum.pl | 49 + tests/misc/sha256sum | 55 - tests/misc/sha256sum.pl | 55 + tests/misc/sha384sum | 55 - tests/misc/sha384sum.pl | 55 + tests/misc/sha512sum | 55 - tests/misc/sha512sum.pl | 55 + tests/misc/shred-exact | 36 - tests/misc/shred-exact.sh | 36 + tests/misc/shred-passes | 39 - tests/misc/shred-passes.sh | 39 + tests/misc/shred-remove | 36 - tests/misc/shred-remove.sh | 36 + tests/misc/shuf | 60 - tests/misc/shuf.sh | 60 + tests/misc/sort | 417 - tests/misc/sort-NaN-infloop | 28 - tests/misc/sort-NaN-infloop.sh | 28 + tests/misc/sort-benchmark-random | 53 - tests/misc/sort-benchmark-random.sh | 53 + tests/misc/sort-compress | 72 - tests/misc/sort-compress-hang | 53 - tests/misc/sort-compress-hang.sh | 53 + tests/misc/sort-compress-proc | 83 - tests/misc/sort-compress-proc.sh | 83 + tests/misc/sort-compress.sh | 72 + tests/misc/sort-continue | 47 - tests/misc/sort-continue.sh | 47 + tests/misc/sort-debug-keys | 330 - tests/misc/sort-debug-keys.sh | 330 + tests/misc/sort-debug-warn | 90 - tests/misc/sort-debug-warn.sh | 90 + tests/misc/sort-discrim | 89 - tests/misc/sort-discrim.sh | 89 + tests/misc/sort-exit-early.sh | 37 + tests/misc/sort-files0-from | 96 - tests/misc/sort-files0-from.pl | 96 + tests/misc/sort-float | 94 - tests/misc/sort-float.sh | 94 + tests/misc/sort-merge | 84 - tests/misc/sort-merge-fdlimit | 73 - tests/misc/sort-merge-fdlimit.sh | 73 + tests/misc/sort-merge.pl | 84 + tests/misc/sort-month | 34 - tests/misc/sort-month.sh | 34 + tests/misc/sort-rand | 52 - tests/misc/sort-rand.sh | 52 + tests/misc/sort-spinlock-abuse | 45 - tests/misc/sort-spinlock-abuse.sh | 45 + tests/misc/sort-stale-thread-mem | 52 - tests/misc/sort-stale-thread-mem.sh | 52 + tests/misc/sort-u-FMR.sh | 29 + tests/misc/sort-unique | 42 - tests/misc/sort-unique-segv | 48 - tests/misc/sort-unique-segv.sh | 48 + tests/misc/sort-unique.sh | 42 + tests/misc/sort-version | 106 - tests/misc/sort-version.sh | 106 + tests/misc/sort.pl | 432 + tests/misc/stat-birthtime | 51 - tests/misc/stat-birthtime.sh | 51 + tests/misc/stat-fmt | 30 - tests/misc/stat-fmt.sh | 30 + tests/misc/stat-hyphen | 30 - tests/misc/stat-hyphen.sh | 30 + tests/misc/stat-mount | 26 - tests/misc/stat-mount.sh | 26 + tests/misc/stat-nanoseconds | 46 - tests/misc/stat-nanoseconds.sh | 46 + tests/misc/stat-printf | 64 - tests/misc/stat-printf.pl | 64 + tests/misc/stat-slash | 44 - tests/misc/stat-slash.sh | 44 + tests/misc/stdbuf | 121 - tests/misc/stdbuf.sh | 121 + tests/misc/stty | 68 - tests/misc/stty-invalid | 44 - tests/misc/stty-invalid.sh | 44 + tests/misc/stty-pairs | 63 - tests/misc/stty-pairs.sh | 63 + tests/misc/stty-row-col | 87 - tests/misc/stty-row-col.sh | 87 + tests/misc/stty.sh | 68 + tests/misc/su-fail | 30 - tests/misc/sum | 61 - tests/misc/sum-sysv | 50 - tests/misc/sum-sysv.sh | 50 + tests/misc/sum.pl | 61 + tests/misc/tac | 84 - tests/misc/tac-2-nonseekable | 27 - tests/misc/tac-2-nonseekable.sh | 27 + tests/misc/tac-continue | 70 - tests/misc/tac-continue.sh | 70 + tests/misc/tac.pl | 84 + tests/misc/tail | 140 - tests/misc/tail.pl | 140 + tests/misc/tee | 34 - tests/misc/tee-dash | 24 - tests/misc/tee-dash.sh | 24 + tests/misc/tee.sh | 34 + tests/misc/test | 197 - tests/misc/test-diag | 39 - tests/misc/test-diag.pl | 39 + tests/misc/test.pl | 197 + tests/misc/timeout | 59 - tests/misc/timeout-blocked.pl | 48 + tests/misc/timeout-group | 97 - tests/misc/timeout-group.sh | 101 + tests/misc/timeout-parameters | 80 - tests/misc/timeout-parameters.sh | 80 + tests/misc/timeout.sh | 64 + tests/misc/tr | 174 - tests/misc/tr-case-class | 113 - tests/misc/tr-case-class.sh | 113 + tests/misc/tr.pl | 174 + tests/misc/truncate-dangling-symlink | 28 - tests/misc/truncate-dangling-symlink.sh | 28 + tests/misc/truncate-dir-fail | 25 - tests/misc/truncate-dir-fail.sh | 25 + tests/misc/truncate-fail-diag | 43 - tests/misc/truncate-fail-diag.sh | 43 + tests/misc/truncate-fifo | 27 - tests/misc/truncate-fifo.sh | 27 + tests/misc/truncate-no-create-missing | 26 - tests/misc/truncate-no-create-missing.sh | 26 + tests/misc/truncate-overflow | 39 - tests/misc/truncate-overflow.sh | 39 + tests/misc/truncate-owned-by-other | 36 - tests/misc/truncate-owned-by-other.sh | 36 + tests/misc/truncate-parameters | 54 - tests/misc/truncate-parameters.sh | 54 + tests/misc/truncate-relative | 35 - tests/misc/truncate-relative.sh | 35 + tests/misc/tsort | 66 - tests/misc/tsort.pl | 66 + tests/misc/tty-eof | 110 - tests/misc/tty-eof.pl | 110 + tests/misc/unexpand | 99 - tests/misc/unexpand.pl | 99 + tests/misc/uniq | 218 - tests/misc/uniq-perf | 25 - tests/misc/uniq-perf.sh | 25 + tests/misc/uniq.pl | 218 + tests/misc/wc | 50 - tests/misc/wc-files0 | 43 - tests/misc/wc-files0-from | 93 - tests/misc/wc-files0-from.pl | 93 + tests/misc/wc-files0.sh | 43 + tests/misc/wc-parallel | 32 - tests/misc/wc-parallel.sh | 32 + tests/misc/wc.pl | 50 + tests/misc/xattr | 130 - tests/misc/xattr.sh | 130 + tests/misc/xstrtol | 49 - tests/misc/xstrtol.pl | 49 + tests/mkdir/p-1 | 25 - tests/mkdir/p-1.sh | 25 + tests/mkdir/p-2 | 25 - tests/mkdir/p-2.sh | 25 + tests/mkdir/p-3 | 51 - tests/mkdir/p-3.sh | 51 + tests/mkdir/p-slashdot | 29 - tests/mkdir/p-slashdot.sh | 29 + tests/mkdir/p-thru-slink | 27 - tests/mkdir/p-thru-slink.sh | 27 + tests/mkdir/p-v | 32 - tests/mkdir/p-v.sh | 32 + tests/mkdir/parents | 51 - tests/mkdir/parents.sh | 51 + tests/mkdir/perm | 83 - tests/mkdir/perm.sh | 83 + tests/mkdir/selinux | 56 - tests/mkdir/selinux.sh | 56 + tests/mkdir/special-1 | 51 - tests/mkdir/special-1.sh | 51 + tests/mkdir/t-slash | 31 - tests/mkdir/t-slash.sh | 31 + tests/mkdir/writable-under-readonly | 52 - tests/mkdir/writable-under-readonly.sh | 52 + tests/mv/acl | 67 - tests/mv/acl.sh | 67 + tests/mv/atomic | 46 - tests/mv/atomic.sh | 46 + tests/mv/atomic2 | 45 - tests/mv/atomic2.sh | 45 + tests/mv/backup-dir | 34 - tests/mv/backup-dir.sh | 34 + tests/mv/backup-is-src | 46 - tests/mv/backup-is-src.sh | 46 + tests/mv/childproof | 83 - tests/mv/childproof.sh | 83 + tests/mv/diag | 48 - tests/mv/diag.sh | 48 + tests/mv/dir-file | 30 - tests/mv/dir-file.sh | 30 + tests/mv/dir2dir | 42 - tests/mv/dir2dir.sh | 42 + tests/mv/dup-source | 65 - tests/mv/dup-source.sh | 65 + tests/mv/force | 42 - tests/mv/force.sh | 42 + tests/mv/hard-2 | 77 - tests/mv/hard-2.sh | 77 + tests/mv/hard-3 | 69 - tests/mv/hard-3.sh | 69 + tests/mv/hard-4 | 38 - tests/mv/hard-4.sh | 38 + tests/mv/hard-link-1 | 41 - tests/mv/hard-link-1.sh | 41 + tests/mv/hard-verbose | 33 - tests/mv/hard-verbose.sh | 33 + tests/mv/i-1 | 44 - tests/mv/i-1.pl | 44 + tests/mv/i-2 | 52 - tests/mv/i-2.sh | 52 + tests/mv/i-3 | 69 - tests/mv/i-3.sh | 69 + tests/mv/i-4 | 49 - tests/mv/i-4.sh | 49 + tests/mv/i-5 | 29 - tests/mv/i-5.sh | 29 + tests/mv/i-link-no | 43 - tests/mv/i-link-no.sh | 43 + tests/mv/into-self | 53 - tests/mv/into-self-2 | 52 - tests/mv/into-self-2.sh | 52 + tests/mv/into-self-3 | 41 - tests/mv/into-self-3.sh | 41 + tests/mv/into-self-4 | 34 - tests/mv/into-self-4.sh | 34 + tests/mv/into-self.sh | 53 + tests/mv/leak-fd | 55 - tests/mv/leak-fd.sh | 55 + tests/mv/mv-n | 57 - tests/mv/mv-n.sh | 57 + tests/mv/mv-special-1 | 72 - tests/mv/mv-special-1.sh | 72 + tests/mv/no-target-dir | 49 - tests/mv/no-target-dir.sh | 49 + tests/mv/part-fail | 55 - tests/mv/part-fail.sh | 55 + tests/mv/part-hardlink | 43 - tests/mv/part-hardlink.sh | 43 + tests/mv/part-rename | 31 - tests/mv/part-rename.sh | 31 + tests/mv/part-symlink | 261 - tests/mv/part-symlink.sh | 261 + tests/mv/partition-perm | 37 - tests/mv/partition-perm.sh | 37 + tests/mv/perm-1 | 35 - tests/mv/perm-1.sh | 35 + tests/mv/sticky-to-xpart | 67 - tests/mv/sticky-to-xpart.sh | 67 + tests/mv/symlink-onto-hardlink | 41 - tests/mv/symlink-onto-hardlink-to-self | 56 - tests/mv/symlink-onto-hardlink-to-self.sh | 56 + tests/mv/symlink-onto-hardlink.sh | 41 + tests/mv/to-symlink | 43 - tests/mv/to-symlink.sh | 43 + tests/mv/trailing-slash | 65 - tests/mv/trailing-slash.sh | 65 + tests/mv/update | 54 - tests/mv/update.sh | 54 + tests/no-perl | 6 + tests/other-fs-tmpdir | 2 +- tests/pr/pr-tests | 460 - tests/pr/pr-tests.pl | 475 + tests/readlink/can-e | 104 - tests/readlink/can-e.sh | 104 + tests/readlink/can-f | 153 - tests/readlink/can-f.sh | 153 + tests/readlink/can-m | 141 - tests/readlink/can-m.sh | 141 + tests/readlink/multi.sh | 46 + tests/readlink/rl-1 | 43 - tests/readlink/rl-1.sh | 43 + tests/rm/cycle | 36 - tests/rm/cycle.sh | 36 + tests/rm/d-1.sh | 38 + tests/rm/d-2.sh | 37 + tests/rm/d-3.sh | 37 + tests/rm/dangling-symlink | 45 - tests/rm/dangling-symlink.sh | 45 + tests/rm/deep-1 | 53 - tests/rm/deep-1.sh | 53 + tests/rm/deep-2 | 49 - tests/rm/deep-2.sh | 49 + tests/rm/dir-no-w | 42 - tests/rm/dir-no-w.sh | 42 + tests/rm/dir-nonrecur | 34 - tests/rm/dir-nonrecur.sh | 34 + tests/rm/dot-rel | 29 - tests/rm/dot-rel.sh | 29 + tests/rm/empty-inacc | 38 - tests/rm/empty-inacc.sh | 38 + tests/rm/empty-name | 60 - tests/rm/empty-name.pl | 60 + tests/rm/ext3-perf | 83 - tests/rm/ext3-perf.sh | 83 + tests/rm/f-1 | 26 - tests/rm/f-1.sh | 26 + tests/rm/fail-2eperm | 55 - tests/rm/fail-2eperm.sh | 55 + tests/rm/fail-eacces | 54 - tests/rm/fail-eacces.sh | 54 + tests/rm/fail-eperm | 151 - tests/rm/fail-eperm.xpl | 151 + tests/rm/hash | 37 - tests/rm/hash.sh | 37 + tests/rm/i-1 | 40 - tests/rm/i-1.sh | 40 + tests/rm/i-never | 33 - tests/rm/i-never.sh | 33 + tests/rm/i-no-r | 34 - tests/rm/i-no-r.sh | 34 + tests/rm/ignorable | 30 - tests/rm/ignorable.sh | 30 + tests/rm/inaccessible | 49 - tests/rm/inaccessible.sh | 49 + tests/rm/interactive-always | 87 - tests/rm/interactive-always.sh | 87 + tests/rm/interactive-once | 107 - tests/rm/interactive-once.sh | 107 + tests/rm/ir-1 | 56 - tests/rm/ir-1.sh | 56 + tests/rm/isatty | 53 - tests/rm/isatty.sh | 53 + tests/rm/many-dir-entries-vs-OOM | 38 - tests/rm/many-dir-entries-vs-OOM.sh | 38 + tests/rm/no-give-up | 41 - tests/rm/no-give-up.sh | 41 + tests/rm/one-file-system | 48 - tests/rm/one-file-system.sh | 48 + tests/rm/one-file-system2 | 27 - tests/rm/one-file-system2.sh | 27 + tests/rm/r-1 | 40 - tests/rm/r-1.sh | 40 + tests/rm/r-2 | 45 - tests/rm/r-2.sh | 45 + tests/rm/r-3 | 48 - tests/rm/r-3.sh | 48 + tests/rm/r-4 | 36 - tests/rm/r-4.sh | 36 + tests/rm/read-only | 52 - tests/rm/read-only.sh | 52 + tests/rm/readdir-bug | 41 - tests/rm/readdir-bug.sh | 41 + tests/rm/rm1 | 48 - tests/rm/rm1.sh | 48 + tests/rm/rm2 | 55 - tests/rm/rm2.sh | 55 + tests/rm/rm3 | 73 - tests/rm/rm3.sh | 73 + tests/rm/rm4 | 31 - tests/rm/rm4.sh | 31 + tests/rm/rm5 | 52 - tests/rm/rm5.sh | 52 + tests/rm/sunos-1 | 29 - tests/rm/sunos-1.sh | 29 + tests/rm/unread2 | 35 - tests/rm/unread2.sh | 35 + tests/rm/unread3 | 43 - tests/rm/unread3.sh | 43 + tests/rm/unreadable | 50 - tests/rm/unreadable.pl | 50 + tests/rm/v-slash | 34 - tests/rm/v-slash.sh | 34 + tests/rmdir/fail-perm | 32 - tests/rmdir/fail-perm.sh | 32 + tests/rmdir/ignore | 32 - tests/rmdir/ignore.sh | 32 + tests/rmdir/t-slash | 29 - tests/rmdir/t-slash.sh | 29 + tests/sample-test | 6 +- tests/shell-or-perl | 121 - tests/split/additional-suffix | 44 - tests/split/additional-suffix.sh | 44 + tests/split/b-chunk | 50 - tests/split/b-chunk.sh | 50 + tests/split/fail | 81 - tests/split/fail.sh | 81 + tests/split/filter | 57 - tests/split/filter.sh | 57 + tests/split/guard-input.sh | 33 + tests/split/l-chunk | 141 - tests/split/l-chunk.sh | 141 + tests/split/lines | 42 - tests/split/lines.sh | 42 + tests/split/numeric | 65 - tests/split/numeric.sh | 65 + tests/split/r-chunk | 66 - tests/split/r-chunk.sh | 66 + tests/split/suffix-auto-length | 42 - tests/split/suffix-auto-length.sh | 42 + tests/split/suffix-length | 76 - tests/split/suffix-length.sh | 76 + tests/tail-2/F-vs-missing | 64 - tests/tail-2/F-vs-missing.sh | 64 + tests/tail-2/F-vs-rename | 75 - tests/tail-2/F-vs-rename.sh | 75 + tests/tail-2/append-only | 43 - tests/tail-2/append-only.sh | 43 + tests/tail-2/assert | 61 - tests/tail-2/assert-2 | 49 - tests/tail-2/assert-2.sh | 49 + tests/tail-2/assert.sh | 61 + tests/tail-2/big-4gb | 50 - tests/tail-2/big-4gb.sh | 50 + tests/tail-2/flush-initial | 40 - tests/tail-2/flush-initial.sh | 40 + tests/tail-2/follow-name | 36 - tests/tail-2/follow-name.sh | 36 + tests/tail-2/follow-stdin | 36 - tests/tail-2/follow-stdin.sh | 36 + tests/tail-2/infloop-1 | 45 - tests/tail-2/infloop-1.sh | 45 + tests/tail-2/inotify-hash-abuse | 63 - tests/tail-2/inotify-hash-abuse.sh | 63 + tests/tail-2/inotify-hash-abuse2 | 39 - tests/tail-2/inotify-hash-abuse2.sh | 39 + tests/tail-2/inotify-race | 69 - tests/tail-2/inotify-race.sh | 69 + tests/tail-2/inotify-rotate | 68 - tests/tail-2/inotify-rotate.sh | 70 + tests/tail-2/pid | 51 - tests/tail-2/pid.sh | 51 + tests/tail-2/pipe-f | 27 - tests/tail-2/pipe-f.sh | 27 + tests/tail-2/pipe-f2 | 43 - tests/tail-2/pipe-f2.sh | 43 + tests/tail-2/proc-ksyms | 28 - tests/tail-2/proc-ksyms.sh | 28 + tests/tail-2/start-middle | 33 - tests/tail-2/start-middle.sh | 33 + tests/tail-2/tail-n0f | 55 - tests/tail-2/tail-n0f.sh | 55 + tests/tail-2/wait | 80 - tests/tail-2/wait.sh | 80 + tests/touch/60-seconds | 33 - tests/touch/60-seconds.sh | 33 + tests/touch/dangling-symlink | 49 - tests/touch/dangling-symlink.sh | 49 + tests/touch/dir-1 | 9 - tests/touch/dir-1.sh | 9 + tests/touch/empty-file | 80 - tests/touch/empty-file.sh | 80 + tests/touch/fail-diag | 32 - tests/touch/fail-diag.sh | 32 + tests/touch/fifo | 27 - tests/touch/fifo.sh | 27 + tests/touch/no-create-missing | 39 - tests/touch/no-create-missing.sh | 39 + tests/touch/no-dereference | 84 - tests/touch/no-dereference.sh | 84 + tests/touch/no-rights | 40 - tests/touch/no-rights.sh | 40 + tests/touch/not-owner | 55 - tests/touch/not-owner.sh | 55 + tests/touch/now-owned-by-other | 35 - tests/touch/now-owned-by-other.sh | 35 + tests/touch/obsolescent | 41 - tests/touch/obsolescent.sh | 41 + tests/touch/read-only | 31 - tests/touch/read-only.sh | 31 + tests/touch/relative | 38 - tests/touch/relative.sh | 38 + tests/touch/trailing-slash | 66 - tests/touch/trailing-slash.sh | 66 + 2843 files changed, 180938 insertions(+), 145048 deletions(-) delete mode 100755 build-aux/cvsu create mode 100755 build-aux/gen-lists-of-programs.sh create mode 100755 build-aux/prefix-gnulib-mk delete mode 100755 build-aux/test-driver delete mode 100644 doc/Makefile.am delete mode 100644 doc/Makefile.in create mode 100644 doc/local.mk create mode 100644 gnulib-tests/test-regex.c create mode 100644 gnulib-tests/test-statat.c delete mode 100644 gnulib-tests/test-strings.c create mode 100644 init.cfg delete mode 100644 lib/Makefile.am delete mode 100644 lib/Makefile.in create mode 100644 lib/binary-io.c create mode 100644 lib/bitrotate.c create mode 100644 lib/chmodat.c create mode 100644 lib/chownat.c create mode 100644 lib/local.mk create mode 100644 lib/math.c create mode 100644 lib/mbiter.c create mode 100644 lib/mbuiter.c create mode 100644 lib/pthread.c create mode 100644 lib/root-uid.h create mode 100644 lib/se-context.c create mode 100644 lib/se-selinux.c create mode 100644 lib/sig-handler.c create mode 100644 lib/stat-time.c create mode 100644 lib/statat.c delete mode 100644 lib/strcasecmp.c delete mode 100644 lib/strings.in.h delete mode 100644 lib/strncasecmp.c create mode 100644 lib/sys_socket.c create mode 100644 lib/timespec.c create mode 100644 lib/u64.c create mode 100644 lib/unistd.c create mode 100644 lib/wctype-h.c create mode 100644 lib/xsize.c create mode 100644 lib/xtime.c create mode 100644 m4/cu-progs.m4 create mode 100644 m4/extern-inline.m4 delete mode 100644 m4/fd-reopen.m4 create mode 100644 m4/freadahead.m4 create mode 100644 m4/freadptr.m4 create mode 100644 m4/freadseek.m4 create mode 100644 m4/fseterr.m4 delete mode 100644 m4/lib-check.m4 create mode 100644 m4/non-recursive-gnulib-prefix-hack.m4 delete mode 100644 m4/root-dev-ino.m4 delete mode 100644 m4/strcase.m4 delete mode 100644 m4/strings_h.m4 delete mode 100644 m4/strnumcmp.m4 delete mode 100644 m4/xfts.m4 delete mode 100644 man/Makefile.am delete mode 100644 man/Makefile.in delete mode 100644 man/arch.1 delete mode 100644 man/base64.1 delete mode 100644 man/basename.1 delete mode 100644 man/cat.1 delete mode 100644 man/chcon.1 delete mode 100644 man/chgrp.1 delete mode 100644 man/chmod.1 delete mode 100644 man/chown.1 delete mode 100644 man/chroot.1 delete mode 100644 man/cksum.1 delete mode 100644 man/comm.1 delete mode 100644 man/cp.1 delete mode 100644 man/csplit.1 delete mode 100644 man/cut.1 delete mode 100644 man/date.1 delete mode 100644 man/dd.1 delete mode 100644 man/df.1 delete mode 100644 man/dir.1 delete mode 100644 man/dircolors.1 delete mode 100644 man/dirname.1 delete mode 100644 man/du.1 create mode 100755 man/dummy-man delete mode 100644 man/echo.1 delete mode 100644 man/env.1 delete mode 100644 man/expand.1 delete mode 100644 man/expr.1 delete mode 100644 man/factor.1 delete mode 100644 man/false.1 delete mode 100644 man/fmt.1 delete mode 100644 man/fold.1 delete mode 100644 man/groups.1 delete mode 100644 man/head.1 delete mode 100644 man/hostid.1 delete mode 100644 man/hostname.1 delete mode 100644 man/id.1 delete mode 100644 man/install.1 delete mode 100644 man/join.1 delete mode 100644 man/kill.1 delete mode 100644 man/link.1 delete mode 100644 man/ln.1 create mode 100644 man/local.mk delete mode 100644 man/logname.1 delete mode 100644 man/ls.1 delete mode 100644 man/md5sum.1 delete mode 100644 man/mkdir.1 delete mode 100644 man/mkfifo.1 delete mode 100644 man/mknod.1 delete mode 100644 man/mktemp.1 delete mode 100644 man/mv.1 delete mode 100644 man/nice.1 delete mode 100644 man/nl.1 delete mode 100644 man/nohup.1 delete mode 100644 man/nproc.1 create mode 100644 man/numfmt.x delete mode 100644 man/od.1 delete mode 100644 man/paste.1 delete mode 100644 man/pathchk.1 delete mode 100644 man/pinky.1 delete mode 100644 man/pr.1 delete mode 100644 man/printenv.1 delete mode 100644 man/printf.1 delete mode 100644 man/ptx.1 delete mode 100644 man/pwd.1 delete mode 100644 man/readlink.1 delete mode 100644 man/realpath.1 delete mode 100644 man/rm.1 delete mode 100644 man/rmdir.1 delete mode 100644 man/runcon.1 delete mode 100644 man/seq.1 delete mode 100644 man/sha1sum.1 delete mode 100644 man/sha224sum.1 delete mode 100644 man/sha256sum.1 delete mode 100644 man/sha384sum.1 delete mode 100644 man/sha512sum.1 delete mode 100644 man/shred.1 delete mode 100644 man/shuf.1 delete mode 100644 man/sleep.1 delete mode 100644 man/sort.1 delete mode 100644 man/split.1 delete mode 100644 man/stat.1 delete mode 100644 man/stdbuf.1 delete mode 100644 man/stty.1 delete mode 100644 man/su.1 delete mode 100644 man/su.x delete mode 100644 man/sum.1 delete mode 100644 man/sync.1 delete mode 100644 man/tac.1 delete mode 100644 man/tail.1 delete mode 100644 man/tee.1 delete mode 100644 man/test.1 delete mode 100644 man/timeout.1 delete mode 100644 man/touch.1 delete mode 100644 man/tr.1 delete mode 100644 man/true.1 delete mode 100644 man/truncate.1 delete mode 100644 man/tsort.1 delete mode 100644 man/tty.1 delete mode 100644 man/uname.1 delete mode 100644 man/unexpand.1 delete mode 100644 man/uniq.1 delete mode 100644 man/unlink.1 delete mode 100644 man/uptime.1 delete mode 100644 man/users.1 delete mode 100644 man/vdir.1 delete mode 100644 man/wc.1 delete mode 100644 man/who.1 delete mode 100644 man/whoami.1 delete mode 100644 man/yes.1 create mode 100644 po/hr.gmo create mode 100644 po/hr.po create mode 100644 po/ia.gmo create mode 100644 po/ia.po delete mode 100644 src/Makefile.am delete mode 100644 src/Makefile.in create mode 100644 src/cu-progs.mk create mode 100644 src/local.mk create mode 100644 src/longlong.h create mode 100644 src/make-prime-list.c create mode 100644 src/numfmt.c create mode 100644 src/primes.h delete mode 100644 src/su.c delete mode 100755 src/wheel-gen.pl delete mode 100644 src/wheel-size.h delete mode 100644 src/wheel.h create mode 100644 tests/GNUmakefile delete mode 100644 tests/Makefile.am delete mode 100644 tests/Makefile.in delete mode 100644 tests/check.mk delete mode 100755 tests/chgrp/basic create mode 100755 tests/chgrp/basic.sh delete mode 100755 tests/chgrp/default-no-deref create mode 100755 tests/chgrp/default-no-deref.sh delete mode 100755 tests/chgrp/deref create mode 100755 tests/chgrp/deref.sh delete mode 100755 tests/chgrp/no-x create mode 100755 tests/chgrp/no-x.sh delete mode 100755 tests/chgrp/posix-H create mode 100755 tests/chgrp/posix-H.sh delete mode 100755 tests/chgrp/recurse create mode 100755 tests/chgrp/recurse.sh delete mode 100755 tests/chmod/c-option create mode 100755 tests/chmod/c-option.sh delete mode 100755 tests/chmod/equal-x create mode 100755 tests/chmod/equal-x.sh delete mode 100755 tests/chmod/equals create mode 100755 tests/chmod/equals.sh delete mode 100755 tests/chmod/inaccessible create mode 100755 tests/chmod/inaccessible.sh delete mode 100755 tests/chmod/no-x create mode 100755 tests/chmod/no-x.sh delete mode 100755 tests/chmod/octal create mode 100755 tests/chmod/octal.sh delete mode 100755 tests/chmod/setgid create mode 100755 tests/chmod/setgid.sh delete mode 100755 tests/chmod/silent create mode 100755 tests/chmod/silent.sh delete mode 100755 tests/chmod/thru-dangling create mode 100755 tests/chmod/thru-dangling.sh delete mode 100755 tests/chmod/umask-x create mode 100755 tests/chmod/umask-x.sh delete mode 100755 tests/chmod/usage create mode 100755 tests/chmod/usage.sh delete mode 100755 tests/chown/basic create mode 100755 tests/chown/basic.sh delete mode 100755 tests/chown/deref create mode 100755 tests/chown/deref.sh delete mode 100755 tests/chown/preserve-root create mode 100755 tests/chown/preserve-root.sh delete mode 100755 tests/chown/separator create mode 100755 tests/chown/separator.sh delete mode 100755 tests/cp/abuse create mode 100755 tests/cp/abuse.sh delete mode 100755 tests/cp/acl create mode 100755 tests/cp/acl.sh delete mode 100755 tests/cp/attr-existing create mode 100755 tests/cp/attr-existing.sh delete mode 100755 tests/cp/backup-1 create mode 100755 tests/cp/backup-1.sh delete mode 100755 tests/cp/backup-dir create mode 100755 tests/cp/backup-dir.sh delete mode 100755 tests/cp/backup-is-src create mode 100755 tests/cp/backup-is-src.sh delete mode 100755 tests/cp/capability create mode 100755 tests/cp/capability.sh delete mode 100755 tests/cp/cp-HL create mode 100755 tests/cp/cp-HL.sh delete mode 100755 tests/cp/cp-a-selinux create mode 100755 tests/cp/cp-a-selinux.sh delete mode 100755 tests/cp/cp-deref create mode 100755 tests/cp/cp-deref.sh delete mode 100755 tests/cp/cp-i create mode 100755 tests/cp/cp-i.sh delete mode 100755 tests/cp/cp-mv-backup create mode 100755 tests/cp/cp-mv-backup.sh delete mode 100755 tests/cp/cp-mv-enotsup-xattr create mode 100755 tests/cp/cp-mv-enotsup-xattr.sh delete mode 100755 tests/cp/cp-parents create mode 100755 tests/cp/cp-parents.sh delete mode 100755 tests/cp/deref-slink create mode 100755 tests/cp/deref-slink.sh delete mode 100755 tests/cp/dir-rm-dest create mode 100755 tests/cp/dir-rm-dest.sh delete mode 100755 tests/cp/dir-slash create mode 100755 tests/cp/dir-slash.sh delete mode 100755 tests/cp/dir-vs-file create mode 100755 tests/cp/dir-vs-file.sh delete mode 100755 tests/cp/existing-perm-dir create mode 100755 tests/cp/existing-perm-dir.sh delete mode 100755 tests/cp/existing-perm-race create mode 100755 tests/cp/existing-perm-race.sh delete mode 100755 tests/cp/fail-perm create mode 100755 tests/cp/fail-perm.sh delete mode 100755 tests/cp/fiemap-2 create mode 100755 tests/cp/fiemap-2.sh create mode 100755 tests/cp/fiemap-FMR.sh delete mode 100755 tests/cp/fiemap-empty create mode 100755 tests/cp/fiemap-empty.sh delete mode 100755 tests/cp/fiemap-perf create mode 100755 tests/cp/fiemap-perf.sh delete mode 100755 tests/cp/file-perm-race create mode 100755 tests/cp/file-perm-race.sh delete mode 100755 tests/cp/into-self create mode 100755 tests/cp/into-self.sh delete mode 100755 tests/cp/link delete mode 100755 tests/cp/link-heap create mode 100755 tests/cp/link-heap.sh delete mode 100755 tests/cp/link-no-deref create mode 100755 tests/cp/link-no-deref.sh delete mode 100755 tests/cp/link-preserve create mode 100755 tests/cp/link-preserve.sh delete mode 100755 tests/cp/link-symlink create mode 100755 tests/cp/link-symlink.sh create mode 100755 tests/cp/link.sh delete mode 100755 tests/cp/nfs-removal-race create mode 100755 tests/cp/nfs-removal-race.sh delete mode 100755 tests/cp/no-deref-link1 create mode 100755 tests/cp/no-deref-link1.sh delete mode 100755 tests/cp/no-deref-link2 create mode 100755 tests/cp/no-deref-link2.sh delete mode 100755 tests/cp/no-deref-link3 create mode 100755 tests/cp/no-deref-link3.sh delete mode 100755 tests/cp/parent-perm delete mode 100755 tests/cp/parent-perm-race create mode 100755 tests/cp/parent-perm-race.sh create mode 100755 tests/cp/parent-perm.sh delete mode 100755 tests/cp/perm create mode 100755 tests/cp/perm.sh delete mode 100755 tests/cp/preserve-2 create mode 100755 tests/cp/preserve-2.sh delete mode 100755 tests/cp/preserve-gid create mode 100755 tests/cp/preserve-gid.sh delete mode 100755 tests/cp/preserve-link create mode 100755 tests/cp/preserve-link.sh create mode 100755 tests/cp/preserve-mode.sh delete mode 100755 tests/cp/preserve-slink-time create mode 100755 tests/cp/preserve-slink-time.sh delete mode 100755 tests/cp/proc-short-read create mode 100755 tests/cp/proc-short-read.sh delete mode 100755 tests/cp/proc-zero-len create mode 100755 tests/cp/proc-zero-len.sh delete mode 100755 tests/cp/r-vs-symlink create mode 100755 tests/cp/r-vs-symlink.sh delete mode 100755 tests/cp/reflink-auto create mode 100755 tests/cp/reflink-auto.sh delete mode 100755 tests/cp/reflink-perm create mode 100755 tests/cp/reflink-perm.sh delete mode 100755 tests/cp/same-file create mode 100755 tests/cp/same-file.sh delete mode 100755 tests/cp/slink-2-slink create mode 100755 tests/cp/slink-2-slink.sh delete mode 100755 tests/cp/sparse delete mode 100755 tests/cp/sparse-fiemap create mode 100755 tests/cp/sparse-fiemap.sh delete mode 100755 tests/cp/sparse-to-pipe create mode 100755 tests/cp/sparse-to-pipe.sh create mode 100755 tests/cp/sparse.sh delete mode 100755 tests/cp/special-bits create mode 100755 tests/cp/special-bits.sh delete mode 100755 tests/cp/special-f create mode 100755 tests/cp/special-f.sh delete mode 100755 tests/cp/src-base-dot create mode 100755 tests/cp/src-base-dot.sh delete mode 100755 tests/cp/symlink-slash create mode 100755 tests/cp/symlink-slash.sh delete mode 100755 tests/cp/thru-dangling create mode 100755 tests/cp/thru-dangling.sh delete mode 100755 tests/dd/bytes create mode 100755 tests/dd/bytes.sh delete mode 100755 tests/dd/direct create mode 100755 tests/dd/direct.sh delete mode 100755 tests/dd/misc create mode 100755 tests/dd/misc.sh delete mode 100755 tests/dd/nocache create mode 100755 tests/dd/nocache.sh delete mode 100755 tests/dd/not-rewound create mode 100755 tests/dd/not-rewound.sh delete mode 100755 tests/dd/reblock create mode 100755 tests/dd/reblock.sh delete mode 100755 tests/dd/skip-seek delete mode 100755 tests/dd/skip-seek-past-dev create mode 100755 tests/dd/skip-seek-past-dev.sh delete mode 100755 tests/dd/skip-seek-past-file create mode 100755 tests/dd/skip-seek-past-file.sh create mode 100755 tests/dd/skip-seek.pl delete mode 100755 tests/dd/skip-seek2 create mode 100755 tests/dd/skip-seek2.sh delete mode 100755 tests/dd/sparse create mode 100755 tests/dd/sparse.sh delete mode 100755 tests/dd/stderr create mode 100755 tests/dd/stderr.sh delete mode 100755 tests/dd/unblock delete mode 100755 tests/dd/unblock-sync create mode 100755 tests/dd/unblock-sync.sh create mode 100755 tests/dd/unblock.pl create mode 100755 tests/df/df-P.sh create mode 100644 tests/df/df-output.sh create mode 100755 tests/df/header.sh create mode 100755 tests/df/no-mtab-status.sh create mode 100755 tests/df/problematic-chars.sh create mode 100755 tests/df/skip-duplicates.sh create mode 100755 tests/df/skip-rootfs.sh create mode 100755 tests/df/total-unprocessed.sh delete mode 100755 tests/df/total-verify create mode 100755 tests/df/total-verify.sh delete mode 100755 tests/df/unreadable create mode 100755 tests/df/unreadable.sh delete mode 100755 tests/du/2g create mode 100755 tests/du/2g.sh delete mode 100755 tests/du/8gb create mode 100755 tests/du/8gb.sh delete mode 100755 tests/du/basic create mode 100755 tests/du/basic.sh delete mode 100755 tests/du/bigtime create mode 100755 tests/du/bigtime.sh create mode 100755 tests/du/bind-mount-dir-cycle.sh delete mode 100755 tests/du/deref delete mode 100755 tests/du/deref-args create mode 100755 tests/du/deref-args.sh create mode 100755 tests/du/deref.sh delete mode 100755 tests/du/exclude create mode 100755 tests/du/exclude.sh delete mode 100755 tests/du/fd-leak create mode 100755 tests/du/fd-leak.sh delete mode 100755 tests/du/files0-from delete mode 100755 tests/du/files0-from-dir create mode 100755 tests/du/files0-from-dir.sh create mode 100755 tests/du/files0-from.pl delete mode 100755 tests/du/hard-link create mode 100755 tests/du/hard-link.sh delete mode 100755 tests/du/inacc-dest create mode 100755 tests/du/inacc-dest.sh delete mode 100755 tests/du/inacc-dir create mode 100755 tests/du/inacc-dir.sh delete mode 100755 tests/du/inaccessible-cwd create mode 100755 tests/du/inaccessible-cwd.sh delete mode 100755 tests/du/long-from-unreadable create mode 100755 tests/du/long-from-unreadable.sh delete mode 100755 tests/du/long-sloop create mode 100755 tests/du/long-sloop.sh delete mode 100755 tests/du/max-depth create mode 100755 tests/du/max-depth.sh delete mode 100755 tests/du/move-dir-while-traversing create mode 100755 tests/du/move-dir-while-traversing.sh delete mode 100755 tests/du/no-deref create mode 100755 tests/du/no-deref.sh delete mode 100755 tests/du/no-x create mode 100755 tests/du/no-x.sh delete mode 100755 tests/du/one-file-system create mode 100755 tests/du/one-file-system.sh delete mode 100755 tests/du/restore-wd create mode 100755 tests/du/restore-wd.sh delete mode 100755 tests/du/slash create mode 100755 tests/du/slash.sh delete mode 100755 tests/du/slink create mode 100644 tests/du/threshold.sh delete mode 100755 tests/du/trailing-slash create mode 100755 tests/du/trailing-slash.sh delete mode 100755 tests/du/two-args create mode 100755 tests/du/two-args.sh create mode 100755 tests/factor/create-test.sh create mode 100644 tests/factor/run.sh delete mode 100755 tests/fmt/base create mode 100755 tests/fmt/base.pl delete mode 100755 tests/fmt/goal-option create mode 100755 tests/fmt/goal-option.sh delete mode 100755 tests/fmt/long-line create mode 100755 tests/fmt/long-line.sh delete mode 100755 tests/id/gnu-zero-uids create mode 100755 tests/id/gnu-zero-uids.sh delete mode 100755 tests/id/no-context create mode 100755 tests/id/no-context.sh delete mode 100644 tests/init.cfg delete mode 100755 tests/install/basic-1 create mode 100755 tests/install/basic-1.sh delete mode 100755 tests/install/create-leading create mode 100755 tests/install/create-leading.sh delete mode 100755 tests/install/d-slashdot create mode 100755 tests/install/d-slashdot.sh delete mode 100755 tests/install/install-C delete mode 100755 tests/install/install-C-root create mode 100755 tests/install/install-C-root.sh delete mode 100755 tests/install/install-C-selinux create mode 100755 tests/install/install-C-selinux.sh create mode 100755 tests/install/install-C.sh delete mode 100755 tests/install/strip-program create mode 100755 tests/install/strip-program.sh delete mode 100755 tests/install/trap create mode 100755 tests/install/trap.sh delete mode 100755 tests/ln/backup-1 create mode 100755 tests/ln/backup-1.sh delete mode 100755 tests/ln/hard-backup create mode 100755 tests/ln/hard-backup.sh delete mode 100755 tests/ln/hard-to-sym create mode 100755 tests/ln/hard-to-sym.sh delete mode 100755 tests/ln/misc create mode 100755 tests/ln/misc.sh delete mode 100755 tests/ln/relative create mode 100755 tests/ln/relative.sh delete mode 100755 tests/ln/sf-1 create mode 100755 tests/ln/sf-1.sh delete mode 100755 tests/ln/slash-decorated-nonexistent-dest create mode 100755 tests/ln/slash-decorated-nonexistent-dest.sh delete mode 100755 tests/ln/target-1 create mode 100755 tests/ln/target-1.sh create mode 100644 tests/local.mk delete mode 100755 tests/ls/abmon-align create mode 100755 tests/ls/abmon-align.sh delete mode 100755 tests/ls/block-size create mode 100755 tests/ls/block-size.sh delete mode 100755 tests/ls/capability create mode 100755 tests/ls/capability.sh delete mode 100755 tests/ls/color-clear-to-eol create mode 100755 tests/ls/color-clear-to-eol.sh delete mode 100755 tests/ls/color-dtype-dir create mode 100755 tests/ls/color-dtype-dir.sh delete mode 100755 tests/ls/color-norm create mode 100755 tests/ls/color-norm.sh delete mode 100755 tests/ls/dangle create mode 100755 tests/ls/dangle.sh delete mode 100755 tests/ls/dired create mode 100755 tests/ls/dired.sh delete mode 100755 tests/ls/file-type create mode 100755 tests/ls/file-type.sh delete mode 100755 tests/ls/follow-slink create mode 100755 tests/ls/follow-slink.sh delete mode 100755 tests/ls/getxattr-speedup create mode 100755 tests/ls/getxattr-speedup.sh delete mode 100755 tests/ls/infloop create mode 100755 tests/ls/infloop.sh delete mode 100755 tests/ls/inode create mode 100755 tests/ls/inode.sh delete mode 100755 tests/ls/m-option create mode 100755 tests/ls/m-option.sh delete mode 100755 tests/ls/multihardlink create mode 100755 tests/ls/multihardlink.sh delete mode 100755 tests/ls/nameless-uid create mode 100755 tests/ls/nameless-uid.sh delete mode 100755 tests/ls/no-arg create mode 100755 tests/ls/no-arg.sh delete mode 100755 tests/ls/no-cap create mode 100755 tests/ls/no-cap.sh delete mode 100755 tests/ls/proc-selinux-segfault create mode 100755 tests/ls/proc-selinux-segfault.sh delete mode 100755 tests/ls/readdir-mountpoint-inode create mode 100755 tests/ls/readdir-mountpoint-inode.sh delete mode 100755 tests/ls/recursive create mode 100755 tests/ls/recursive.sh create mode 100755 tests/ls/root-rel-symlink-color.sh delete mode 100755 tests/ls/rt-1 create mode 100755 tests/ls/rt-1.sh delete mode 100755 tests/ls/slink-acl create mode 100755 tests/ls/slink-acl.sh delete mode 100755 tests/ls/stat-dtype create mode 100755 tests/ls/stat-dtype.sh delete mode 100755 tests/ls/stat-failed create mode 100755 tests/ls/stat-failed.sh delete mode 100755 tests/ls/stat-free-color create mode 100755 tests/ls/stat-free-color.sh delete mode 100755 tests/ls/stat-free-symlinks create mode 100755 tests/ls/stat-free-symlinks.sh delete mode 100755 tests/ls/stat-vs-dirent create mode 100755 tests/ls/stat-vs-dirent.sh delete mode 100755 tests/ls/symlink-slash create mode 100755 tests/ls/symlink-slash.sh delete mode 100755 tests/ls/time-style-diag create mode 100755 tests/ls/time-style-diag.sh delete mode 100755 tests/ls/x-option create mode 100755 tests/ls/x-option.sh delete mode 100755 tests/misc/arch create mode 100755 tests/misc/arch.sh delete mode 100755 tests/misc/base64 create mode 100755 tests/misc/base64.pl delete mode 100755 tests/misc/basename create mode 100755 tests/misc/basename.pl delete mode 100755 tests/misc/cat-buf create mode 100755 tests/misc/cat-buf.sh delete mode 100755 tests/misc/cat-proc create mode 100755 tests/misc/cat-proc.sh delete mode 100755 tests/misc/chcon delete mode 100755 tests/misc/chcon-fail create mode 100755 tests/misc/chcon-fail.sh create mode 100755 tests/misc/chcon.sh delete mode 100755 tests/misc/chroot-credentials create mode 100755 tests/misc/chroot-credentials.sh delete mode 100755 tests/misc/chroot-fail create mode 100755 tests/misc/chroot-fail.sh delete mode 100755 tests/misc/close-stdout create mode 100755 tests/misc/close-stdout.sh delete mode 100755 tests/misc/comm create mode 100755 tests/misc/comm.pl delete mode 100755 tests/misc/csplit delete mode 100755 tests/misc/csplit-1000 create mode 100755 tests/misc/csplit-1000.sh delete mode 100755 tests/misc/csplit-heap create mode 100755 tests/misc/csplit-heap.sh create mode 100755 tests/misc/csplit.sh delete mode 100755 tests/misc/cut create mode 100755 tests/misc/cut-huge-to-eol-range.sh create mode 100755 tests/misc/cut.pl delete mode 100755 tests/misc/date delete mode 100755 tests/misc/date-next-dow create mode 100755 tests/misc/date-next-dow.pl delete mode 100755 tests/misc/date-sec create mode 100755 tests/misc/date-sec.sh create mode 100755 tests/misc/date.pl delete mode 100755 tests/misc/df delete mode 100755 tests/misc/df-P delete mode 100755 tests/misc/dircolors create mode 100755 tests/misc/dircolors.pl delete mode 100755 tests/misc/dirname create mode 100755 tests/misc/dirname.pl delete mode 100755 tests/misc/env delete mode 100755 tests/misc/env-null create mode 100755 tests/misc/env-null.sh create mode 100755 tests/misc/env.sh delete mode 100755 tests/misc/expand create mode 100755 tests/misc/expand.pl delete mode 100755 tests/misc/expr create mode 100755 tests/misc/expr.pl delete mode 100755 tests/misc/factor create mode 100755 tests/misc/factor.pl delete mode 100755 tests/misc/false-status create mode 100755 tests/misc/false-status.sh delete mode 100755 tests/misc/fold create mode 100755 tests/misc/fold.pl delete mode 100755 tests/misc/groups-dash create mode 100755 tests/misc/groups-dash.sh delete mode 100755 tests/misc/groups-version create mode 100755 tests/misc/groups-version.sh delete mode 100755 tests/misc/head delete mode 100755 tests/misc/head-c create mode 100755 tests/misc/head-c.sh delete mode 100755 tests/misc/head-elide-tail create mode 100755 tests/misc/head-elide-tail.pl delete mode 100755 tests/misc/head-pos create mode 100755 tests/misc/head-pos.sh create mode 100755 tests/misc/head.pl delete mode 100755 tests/misc/help-version create mode 100755 tests/misc/help-version.sh delete mode 100755 tests/misc/id-context create mode 100755 tests/misc/id-context.sh delete mode 100755 tests/misc/id-groups create mode 100755 tests/misc/id-groups.sh delete mode 100755 tests/misc/id-setgid create mode 100755 tests/misc/id-setgid.sh delete mode 100755 tests/misc/invalid-opt create mode 100755 tests/misc/invalid-opt.pl delete mode 100755 tests/misc/join create mode 100755 tests/misc/join.pl delete mode 100755 tests/misc/ls-misc create mode 100755 tests/misc/ls-misc.pl delete mode 100755 tests/misc/ls-time create mode 100755 tests/misc/ls-time.sh delete mode 100755 tests/misc/md5sum delete mode 100755 tests/misc/md5sum-bsd create mode 100755 tests/misc/md5sum-bsd.sh delete mode 100755 tests/misc/md5sum-newline create mode 100755 tests/misc/md5sum-newline.pl delete mode 100755 tests/misc/md5sum-parallel create mode 100755 tests/misc/md5sum-parallel.sh create mode 100755 tests/misc/md5sum.pl delete mode 100755 tests/misc/mknod create mode 100755 tests/misc/mknod.sh delete mode 100755 tests/misc/mktemp create mode 100755 tests/misc/mktemp.pl delete mode 100755 tests/misc/nice delete mode 100755 tests/misc/nice-fail create mode 100755 tests/misc/nice-fail.sh create mode 100755 tests/misc/nice.sh delete mode 100755 tests/misc/nl create mode 100755 tests/misc/nl.sh delete mode 100755 tests/misc/nohup create mode 100755 tests/misc/nohup.sh delete mode 100755 tests/misc/nproc-avail create mode 100755 tests/misc/nproc-avail.sh delete mode 100755 tests/misc/nproc-positive create mode 100755 tests/misc/nproc-positive.sh create mode 100644 tests/misc/numfmt.pl delete mode 100755 tests/misc/od delete mode 100755 tests/misc/od-N create mode 100755 tests/misc/od-N.sh delete mode 100755 tests/misc/od-float create mode 100755 tests/misc/od-float.sh delete mode 100755 tests/misc/od-multiple-t create mode 100755 tests/misc/od-multiple-t.sh delete mode 100755 tests/misc/od-x8 create mode 100755 tests/misc/od-x8.sh create mode 100755 tests/misc/od.pl delete mode 100755 tests/misc/paste create mode 100755 tests/misc/paste.pl delete mode 100755 tests/misc/pathchk1 create mode 100755 tests/misc/pathchk1.sh delete mode 100755 tests/misc/pr delete mode 100755 tests/misc/printenv create mode 100755 tests/misc/printenv.sh delete mode 100755 tests/misc/printf delete mode 100755 tests/misc/printf-cov create mode 100755 tests/misc/printf-cov.pl delete mode 100755 tests/misc/printf-hex create mode 100755 tests/misc/printf-hex.sh delete mode 100755 tests/misc/printf-surprise create mode 100755 tests/misc/printf-surprise.sh create mode 100755 tests/misc/printf.sh delete mode 100755 tests/misc/ptx delete mode 100755 tests/misc/ptx-overrun create mode 100755 tests/misc/ptx-overrun.sh create mode 100755 tests/misc/ptx.pl delete mode 100755 tests/misc/pwd-long create mode 100755 tests/misc/pwd-long.sh delete mode 100755 tests/misc/pwd-option create mode 100755 tests/misc/pwd-option.sh delete mode 100755 tests/misc/readlink-fp-loop create mode 100755 tests/misc/readlink-fp-loop.sh delete mode 100755 tests/misc/readlink-root create mode 100755 tests/misc/readlink-root.sh delete mode 100755 tests/misc/realpath create mode 100755 tests/misc/realpath.sh delete mode 100755 tests/misc/runcon-no-reorder create mode 100755 tests/misc/runcon-no-reorder.sh delete mode 100755 tests/misc/selinux create mode 100755 tests/misc/selinux.sh delete mode 100755 tests/misc/seq delete mode 100755 tests/misc/seq-long-double create mode 100755 tests/misc/seq-long-double.sh create mode 100755 tests/misc/seq.pl delete mode 100755 tests/misc/sha1sum delete mode 100755 tests/misc/sha1sum-vec create mode 100755 tests/misc/sha1sum-vec.pl create mode 100755 tests/misc/sha1sum.pl delete mode 100755 tests/misc/sha224sum create mode 100755 tests/misc/sha224sum.pl delete mode 100755 tests/misc/sha256sum create mode 100755 tests/misc/sha256sum.pl delete mode 100755 tests/misc/sha384sum create mode 100755 tests/misc/sha384sum.pl delete mode 100755 tests/misc/sha512sum create mode 100755 tests/misc/sha512sum.pl delete mode 100755 tests/misc/shred-exact create mode 100755 tests/misc/shred-exact.sh delete mode 100755 tests/misc/shred-passes create mode 100755 tests/misc/shred-passes.sh delete mode 100755 tests/misc/shred-remove create mode 100755 tests/misc/shred-remove.sh delete mode 100755 tests/misc/shuf create mode 100755 tests/misc/shuf.sh delete mode 100755 tests/misc/sort delete mode 100755 tests/misc/sort-NaN-infloop create mode 100755 tests/misc/sort-NaN-infloop.sh delete mode 100755 tests/misc/sort-benchmark-random create mode 100755 tests/misc/sort-benchmark-random.sh delete mode 100755 tests/misc/sort-compress delete mode 100755 tests/misc/sort-compress-hang create mode 100755 tests/misc/sort-compress-hang.sh delete mode 100755 tests/misc/sort-compress-proc create mode 100755 tests/misc/sort-compress-proc.sh create mode 100755 tests/misc/sort-compress.sh delete mode 100755 tests/misc/sort-continue create mode 100755 tests/misc/sort-continue.sh delete mode 100755 tests/misc/sort-debug-keys create mode 100755 tests/misc/sort-debug-keys.sh delete mode 100755 tests/misc/sort-debug-warn create mode 100755 tests/misc/sort-debug-warn.sh delete mode 100755 tests/misc/sort-discrim create mode 100755 tests/misc/sort-discrim.sh create mode 100755 tests/misc/sort-exit-early.sh delete mode 100755 tests/misc/sort-files0-from create mode 100755 tests/misc/sort-files0-from.pl delete mode 100755 tests/misc/sort-float create mode 100755 tests/misc/sort-float.sh delete mode 100755 tests/misc/sort-merge delete mode 100755 tests/misc/sort-merge-fdlimit create mode 100755 tests/misc/sort-merge-fdlimit.sh create mode 100755 tests/misc/sort-merge.pl delete mode 100755 tests/misc/sort-month create mode 100755 tests/misc/sort-month.sh delete mode 100755 tests/misc/sort-rand create mode 100755 tests/misc/sort-rand.sh delete mode 100755 tests/misc/sort-spinlock-abuse create mode 100755 tests/misc/sort-spinlock-abuse.sh delete mode 100755 tests/misc/sort-stale-thread-mem create mode 100755 tests/misc/sort-stale-thread-mem.sh create mode 100755 tests/misc/sort-u-FMR.sh delete mode 100755 tests/misc/sort-unique delete mode 100755 tests/misc/sort-unique-segv create mode 100755 tests/misc/sort-unique-segv.sh create mode 100755 tests/misc/sort-unique.sh delete mode 100755 tests/misc/sort-version create mode 100755 tests/misc/sort-version.sh create mode 100755 tests/misc/sort.pl delete mode 100755 tests/misc/stat-birthtime create mode 100755 tests/misc/stat-birthtime.sh delete mode 100755 tests/misc/stat-fmt create mode 100755 tests/misc/stat-fmt.sh delete mode 100755 tests/misc/stat-hyphen create mode 100755 tests/misc/stat-hyphen.sh delete mode 100755 tests/misc/stat-mount create mode 100755 tests/misc/stat-mount.sh delete mode 100755 tests/misc/stat-nanoseconds create mode 100755 tests/misc/stat-nanoseconds.sh delete mode 100755 tests/misc/stat-printf create mode 100755 tests/misc/stat-printf.pl delete mode 100755 tests/misc/stat-slash create mode 100755 tests/misc/stat-slash.sh delete mode 100755 tests/misc/stdbuf create mode 100755 tests/misc/stdbuf.sh delete mode 100755 tests/misc/stty delete mode 100755 tests/misc/stty-invalid create mode 100755 tests/misc/stty-invalid.sh delete mode 100755 tests/misc/stty-pairs create mode 100755 tests/misc/stty-pairs.sh delete mode 100755 tests/misc/stty-row-col create mode 100755 tests/misc/stty-row-col.sh create mode 100755 tests/misc/stty.sh delete mode 100755 tests/misc/su-fail delete mode 100755 tests/misc/sum delete mode 100755 tests/misc/sum-sysv create mode 100755 tests/misc/sum-sysv.sh create mode 100755 tests/misc/sum.pl delete mode 100755 tests/misc/tac delete mode 100755 tests/misc/tac-2-nonseekable create mode 100755 tests/misc/tac-2-nonseekable.sh delete mode 100755 tests/misc/tac-continue create mode 100755 tests/misc/tac-continue.sh create mode 100755 tests/misc/tac.pl delete mode 100755 tests/misc/tail create mode 100755 tests/misc/tail.pl delete mode 100755 tests/misc/tee delete mode 100755 tests/misc/tee-dash create mode 100755 tests/misc/tee-dash.sh create mode 100755 tests/misc/tee.sh delete mode 100755 tests/misc/test delete mode 100755 tests/misc/test-diag create mode 100755 tests/misc/test-diag.pl create mode 100755 tests/misc/test.pl delete mode 100755 tests/misc/timeout create mode 100755 tests/misc/timeout-blocked.pl delete mode 100755 tests/misc/timeout-group create mode 100755 tests/misc/timeout-group.sh delete mode 100755 tests/misc/timeout-parameters create mode 100755 tests/misc/timeout-parameters.sh create mode 100755 tests/misc/timeout.sh delete mode 100755 tests/misc/tr delete mode 100755 tests/misc/tr-case-class create mode 100755 tests/misc/tr-case-class.sh create mode 100755 tests/misc/tr.pl delete mode 100755 tests/misc/truncate-dangling-symlink create mode 100755 tests/misc/truncate-dangling-symlink.sh delete mode 100755 tests/misc/truncate-dir-fail create mode 100755 tests/misc/truncate-dir-fail.sh delete mode 100755 tests/misc/truncate-fail-diag create mode 100755 tests/misc/truncate-fail-diag.sh delete mode 100755 tests/misc/truncate-fifo create mode 100755 tests/misc/truncate-fifo.sh delete mode 100755 tests/misc/truncate-no-create-missing create mode 100755 tests/misc/truncate-no-create-missing.sh delete mode 100755 tests/misc/truncate-overflow create mode 100755 tests/misc/truncate-overflow.sh delete mode 100755 tests/misc/truncate-owned-by-other create mode 100755 tests/misc/truncate-owned-by-other.sh delete mode 100755 tests/misc/truncate-parameters create mode 100755 tests/misc/truncate-parameters.sh delete mode 100755 tests/misc/truncate-relative create mode 100755 tests/misc/truncate-relative.sh delete mode 100755 tests/misc/tsort create mode 100755 tests/misc/tsort.pl delete mode 100755 tests/misc/tty-eof create mode 100755 tests/misc/tty-eof.pl delete mode 100755 tests/misc/unexpand create mode 100755 tests/misc/unexpand.pl delete mode 100755 tests/misc/uniq delete mode 100755 tests/misc/uniq-perf create mode 100755 tests/misc/uniq-perf.sh create mode 100755 tests/misc/uniq.pl delete mode 100755 tests/misc/wc delete mode 100755 tests/misc/wc-files0 delete mode 100755 tests/misc/wc-files0-from create mode 100755 tests/misc/wc-files0-from.pl create mode 100755 tests/misc/wc-files0.sh delete mode 100755 tests/misc/wc-parallel create mode 100755 tests/misc/wc-parallel.sh create mode 100755 tests/misc/wc.pl delete mode 100755 tests/misc/xattr create mode 100755 tests/misc/xattr.sh delete mode 100755 tests/misc/xstrtol create mode 100755 tests/misc/xstrtol.pl delete mode 100755 tests/mkdir/p-1 create mode 100755 tests/mkdir/p-1.sh delete mode 100755 tests/mkdir/p-2 create mode 100755 tests/mkdir/p-2.sh delete mode 100755 tests/mkdir/p-3 create mode 100755 tests/mkdir/p-3.sh delete mode 100755 tests/mkdir/p-slashdot create mode 100755 tests/mkdir/p-slashdot.sh delete mode 100755 tests/mkdir/p-thru-slink create mode 100755 tests/mkdir/p-thru-slink.sh delete mode 100755 tests/mkdir/p-v create mode 100755 tests/mkdir/p-v.sh delete mode 100755 tests/mkdir/parents create mode 100755 tests/mkdir/parents.sh delete mode 100755 tests/mkdir/perm create mode 100755 tests/mkdir/perm.sh delete mode 100755 tests/mkdir/selinux create mode 100755 tests/mkdir/selinux.sh delete mode 100755 tests/mkdir/special-1 create mode 100755 tests/mkdir/special-1.sh delete mode 100755 tests/mkdir/t-slash create mode 100755 tests/mkdir/t-slash.sh delete mode 100755 tests/mkdir/writable-under-readonly create mode 100755 tests/mkdir/writable-under-readonly.sh delete mode 100755 tests/mv/acl create mode 100755 tests/mv/acl.sh delete mode 100755 tests/mv/atomic create mode 100755 tests/mv/atomic.sh delete mode 100755 tests/mv/atomic2 create mode 100755 tests/mv/atomic2.sh delete mode 100755 tests/mv/backup-dir create mode 100755 tests/mv/backup-dir.sh delete mode 100755 tests/mv/backup-is-src create mode 100755 tests/mv/backup-is-src.sh delete mode 100755 tests/mv/childproof create mode 100755 tests/mv/childproof.sh delete mode 100755 tests/mv/diag create mode 100755 tests/mv/diag.sh delete mode 100755 tests/mv/dir-file create mode 100755 tests/mv/dir-file.sh delete mode 100755 tests/mv/dir2dir create mode 100755 tests/mv/dir2dir.sh delete mode 100755 tests/mv/dup-source create mode 100755 tests/mv/dup-source.sh delete mode 100755 tests/mv/force create mode 100755 tests/mv/force.sh delete mode 100755 tests/mv/hard-2 create mode 100755 tests/mv/hard-2.sh delete mode 100755 tests/mv/hard-3 create mode 100755 tests/mv/hard-3.sh delete mode 100755 tests/mv/hard-4 create mode 100755 tests/mv/hard-4.sh delete mode 100755 tests/mv/hard-link-1 create mode 100755 tests/mv/hard-link-1.sh delete mode 100755 tests/mv/hard-verbose create mode 100755 tests/mv/hard-verbose.sh delete mode 100755 tests/mv/i-1 create mode 100755 tests/mv/i-1.pl delete mode 100755 tests/mv/i-2 create mode 100755 tests/mv/i-2.sh delete mode 100755 tests/mv/i-3 create mode 100755 tests/mv/i-3.sh delete mode 100755 tests/mv/i-4 create mode 100755 tests/mv/i-4.sh delete mode 100755 tests/mv/i-5 create mode 100755 tests/mv/i-5.sh delete mode 100755 tests/mv/i-link-no create mode 100755 tests/mv/i-link-no.sh delete mode 100755 tests/mv/into-self delete mode 100755 tests/mv/into-self-2 create mode 100755 tests/mv/into-self-2.sh delete mode 100755 tests/mv/into-self-3 create mode 100755 tests/mv/into-self-3.sh delete mode 100755 tests/mv/into-self-4 create mode 100755 tests/mv/into-self-4.sh create mode 100755 tests/mv/into-self.sh delete mode 100755 tests/mv/leak-fd create mode 100755 tests/mv/leak-fd.sh delete mode 100755 tests/mv/mv-n create mode 100755 tests/mv/mv-n.sh delete mode 100755 tests/mv/mv-special-1 create mode 100755 tests/mv/mv-special-1.sh delete mode 100755 tests/mv/no-target-dir create mode 100755 tests/mv/no-target-dir.sh delete mode 100755 tests/mv/part-fail create mode 100755 tests/mv/part-fail.sh delete mode 100755 tests/mv/part-hardlink create mode 100755 tests/mv/part-hardlink.sh delete mode 100755 tests/mv/part-rename create mode 100755 tests/mv/part-rename.sh delete mode 100755 tests/mv/part-symlink create mode 100755 tests/mv/part-symlink.sh delete mode 100755 tests/mv/partition-perm create mode 100755 tests/mv/partition-perm.sh delete mode 100755 tests/mv/perm-1 create mode 100755 tests/mv/perm-1.sh delete mode 100755 tests/mv/sticky-to-xpart create mode 100755 tests/mv/sticky-to-xpart.sh delete mode 100755 tests/mv/symlink-onto-hardlink delete mode 100755 tests/mv/symlink-onto-hardlink-to-self create mode 100755 tests/mv/symlink-onto-hardlink-to-self.sh create mode 100755 tests/mv/symlink-onto-hardlink.sh delete mode 100755 tests/mv/to-symlink create mode 100755 tests/mv/to-symlink.sh delete mode 100755 tests/mv/trailing-slash create mode 100755 tests/mv/trailing-slash.sh delete mode 100755 tests/mv/update create mode 100755 tests/mv/update.sh create mode 100644 tests/no-perl delete mode 100755 tests/pr/pr-tests create mode 100755 tests/pr/pr-tests.pl delete mode 100755 tests/readlink/can-e create mode 100755 tests/readlink/can-e.sh delete mode 100755 tests/readlink/can-f create mode 100755 tests/readlink/can-f.sh delete mode 100755 tests/readlink/can-m create mode 100755 tests/readlink/can-m.sh create mode 100755 tests/readlink/multi.sh delete mode 100755 tests/readlink/rl-1 create mode 100755 tests/readlink/rl-1.sh delete mode 100755 tests/rm/cycle create mode 100755 tests/rm/cycle.sh create mode 100755 tests/rm/d-1.sh create mode 100755 tests/rm/d-2.sh create mode 100755 tests/rm/d-3.sh delete mode 100755 tests/rm/dangling-symlink create mode 100755 tests/rm/dangling-symlink.sh delete mode 100755 tests/rm/deep-1 create mode 100755 tests/rm/deep-1.sh delete mode 100755 tests/rm/deep-2 create mode 100755 tests/rm/deep-2.sh delete mode 100755 tests/rm/dir-no-w create mode 100755 tests/rm/dir-no-w.sh delete mode 100755 tests/rm/dir-nonrecur create mode 100755 tests/rm/dir-nonrecur.sh delete mode 100755 tests/rm/dot-rel create mode 100755 tests/rm/dot-rel.sh delete mode 100755 tests/rm/empty-inacc create mode 100755 tests/rm/empty-inacc.sh delete mode 100755 tests/rm/empty-name create mode 100755 tests/rm/empty-name.pl delete mode 100755 tests/rm/ext3-perf create mode 100755 tests/rm/ext3-perf.sh delete mode 100755 tests/rm/f-1 create mode 100755 tests/rm/f-1.sh delete mode 100755 tests/rm/fail-2eperm create mode 100755 tests/rm/fail-2eperm.sh delete mode 100755 tests/rm/fail-eacces create mode 100755 tests/rm/fail-eacces.sh delete mode 100755 tests/rm/fail-eperm create mode 100755 tests/rm/fail-eperm.xpl delete mode 100755 tests/rm/hash create mode 100755 tests/rm/hash.sh delete mode 100755 tests/rm/i-1 create mode 100755 tests/rm/i-1.sh delete mode 100755 tests/rm/i-never create mode 100755 tests/rm/i-never.sh delete mode 100755 tests/rm/i-no-r create mode 100755 tests/rm/i-no-r.sh delete mode 100755 tests/rm/ignorable create mode 100755 tests/rm/ignorable.sh delete mode 100755 tests/rm/inaccessible create mode 100755 tests/rm/inaccessible.sh delete mode 100755 tests/rm/interactive-always create mode 100755 tests/rm/interactive-always.sh delete mode 100755 tests/rm/interactive-once create mode 100755 tests/rm/interactive-once.sh delete mode 100755 tests/rm/ir-1 create mode 100755 tests/rm/ir-1.sh delete mode 100755 tests/rm/isatty create mode 100755 tests/rm/isatty.sh delete mode 100755 tests/rm/many-dir-entries-vs-OOM create mode 100755 tests/rm/many-dir-entries-vs-OOM.sh delete mode 100755 tests/rm/no-give-up create mode 100755 tests/rm/no-give-up.sh delete mode 100755 tests/rm/one-file-system create mode 100755 tests/rm/one-file-system.sh delete mode 100755 tests/rm/one-file-system2 create mode 100755 tests/rm/one-file-system2.sh delete mode 100755 tests/rm/r-1 create mode 100755 tests/rm/r-1.sh delete mode 100755 tests/rm/r-2 create mode 100755 tests/rm/r-2.sh delete mode 100755 tests/rm/r-3 create mode 100755 tests/rm/r-3.sh delete mode 100755 tests/rm/r-4 create mode 100755 tests/rm/r-4.sh delete mode 100755 tests/rm/read-only create mode 100755 tests/rm/read-only.sh delete mode 100755 tests/rm/readdir-bug create mode 100755 tests/rm/readdir-bug.sh delete mode 100755 tests/rm/rm1 create mode 100755 tests/rm/rm1.sh delete mode 100755 tests/rm/rm2 create mode 100755 tests/rm/rm2.sh delete mode 100755 tests/rm/rm3 create mode 100755 tests/rm/rm3.sh delete mode 100755 tests/rm/rm4 create mode 100755 tests/rm/rm4.sh delete mode 100755 tests/rm/rm5 create mode 100755 tests/rm/rm5.sh delete mode 100755 tests/rm/sunos-1 create mode 100755 tests/rm/sunos-1.sh delete mode 100755 tests/rm/unread2 create mode 100755 tests/rm/unread2.sh delete mode 100755 tests/rm/unread3 create mode 100755 tests/rm/unread3.sh delete mode 100755 tests/rm/unreadable create mode 100755 tests/rm/unreadable.pl delete mode 100755 tests/rm/v-slash create mode 100755 tests/rm/v-slash.sh delete mode 100755 tests/rmdir/fail-perm create mode 100755 tests/rmdir/fail-perm.sh delete mode 100755 tests/rmdir/ignore create mode 100755 tests/rmdir/ignore.sh delete mode 100755 tests/rmdir/t-slash create mode 100755 tests/rmdir/t-slash.sh delete mode 100644 tests/shell-or-perl delete mode 100755 tests/split/additional-suffix create mode 100755 tests/split/additional-suffix.sh delete mode 100755 tests/split/b-chunk create mode 100755 tests/split/b-chunk.sh delete mode 100755 tests/split/fail create mode 100755 tests/split/fail.sh delete mode 100755 tests/split/filter create mode 100755 tests/split/filter.sh create mode 100755 tests/split/guard-input.sh delete mode 100755 tests/split/l-chunk create mode 100755 tests/split/l-chunk.sh delete mode 100755 tests/split/lines create mode 100755 tests/split/lines.sh delete mode 100755 tests/split/numeric create mode 100755 tests/split/numeric.sh delete mode 100755 tests/split/r-chunk create mode 100755 tests/split/r-chunk.sh delete mode 100755 tests/split/suffix-auto-length create mode 100755 tests/split/suffix-auto-length.sh delete mode 100755 tests/split/suffix-length create mode 100755 tests/split/suffix-length.sh delete mode 100755 tests/tail-2/F-vs-missing create mode 100755 tests/tail-2/F-vs-missing.sh delete mode 100755 tests/tail-2/F-vs-rename create mode 100755 tests/tail-2/F-vs-rename.sh delete mode 100755 tests/tail-2/append-only create mode 100755 tests/tail-2/append-only.sh delete mode 100755 tests/tail-2/assert delete mode 100755 tests/tail-2/assert-2 create mode 100755 tests/tail-2/assert-2.sh create mode 100755 tests/tail-2/assert.sh delete mode 100755 tests/tail-2/big-4gb create mode 100755 tests/tail-2/big-4gb.sh delete mode 100755 tests/tail-2/flush-initial create mode 100755 tests/tail-2/flush-initial.sh delete mode 100755 tests/tail-2/follow-name create mode 100755 tests/tail-2/follow-name.sh delete mode 100755 tests/tail-2/follow-stdin create mode 100755 tests/tail-2/follow-stdin.sh delete mode 100755 tests/tail-2/infloop-1 create mode 100755 tests/tail-2/infloop-1.sh delete mode 100755 tests/tail-2/inotify-hash-abuse create mode 100755 tests/tail-2/inotify-hash-abuse.sh delete mode 100755 tests/tail-2/inotify-hash-abuse2 create mode 100755 tests/tail-2/inotify-hash-abuse2.sh delete mode 100755 tests/tail-2/inotify-race create mode 100755 tests/tail-2/inotify-race.sh delete mode 100755 tests/tail-2/inotify-rotate create mode 100755 tests/tail-2/inotify-rotate.sh delete mode 100755 tests/tail-2/pid create mode 100755 tests/tail-2/pid.sh delete mode 100755 tests/tail-2/pipe-f create mode 100755 tests/tail-2/pipe-f.sh delete mode 100755 tests/tail-2/pipe-f2 create mode 100755 tests/tail-2/pipe-f2.sh delete mode 100755 tests/tail-2/proc-ksyms create mode 100755 tests/tail-2/proc-ksyms.sh delete mode 100755 tests/tail-2/start-middle create mode 100755 tests/tail-2/start-middle.sh delete mode 100755 tests/tail-2/tail-n0f create mode 100755 tests/tail-2/tail-n0f.sh delete mode 100755 tests/tail-2/wait create mode 100755 tests/tail-2/wait.sh delete mode 100755 tests/touch/60-seconds create mode 100755 tests/touch/60-seconds.sh delete mode 100755 tests/touch/dangling-symlink create mode 100755 tests/touch/dangling-symlink.sh delete mode 100755 tests/touch/dir-1 create mode 100755 tests/touch/dir-1.sh delete mode 100755 tests/touch/empty-file create mode 100755 tests/touch/empty-file.sh delete mode 100755 tests/touch/fail-diag create mode 100755 tests/touch/fail-diag.sh delete mode 100755 tests/touch/fifo create mode 100755 tests/touch/fifo.sh delete mode 100755 tests/touch/no-create-missing create mode 100755 tests/touch/no-create-missing.sh delete mode 100755 tests/touch/no-dereference create mode 100755 tests/touch/no-dereference.sh delete mode 100755 tests/touch/no-rights create mode 100755 tests/touch/no-rights.sh delete mode 100755 tests/touch/not-owner create mode 100755 tests/touch/not-owner.sh delete mode 100755 tests/touch/now-owned-by-other create mode 100755 tests/touch/now-owned-by-other.sh delete mode 100755 tests/touch/obsolescent create mode 100755 tests/touch/obsolescent.sh delete mode 100755 tests/touch/read-only create mode 100755 tests/touch/read-only.sh delete mode 100755 tests/touch/relative create mode 100755 tests/touch/relative.sh delete mode 100755 tests/touch/trailing-slash create mode 100755 tests/touch/trailing-slash.sh diff --git a/.mailmap b/.mailmap index 8b623176..dcabcb53 100644 --- a/.mailmap +++ b/.mailmap @@ -1,4 +1,5 @@ # Map git author names and email addresses to canonical/preferred form. + diff --git a/.prev-version b/.prev-version index 9fad72fc..e0b7b02e 100644 --- a/.prev-version +++ b/.prev-version @@ -1 +1 @@ -8.16 +8.20 diff --git a/.tarball-version b/.tarball-version index a5968523..671d7055 100644 --- a/.tarball-version +++ b/.tarball-version @@ -1 +1 @@ -8.17 +8.21 diff --git a/.version b/.version index a5968523..671d7055 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -8.17 +8.21 diff --git a/.vg-suppressions b/.vg-suppressions index d2191dc2..557927e4 100644 --- a/.vg-suppressions +++ b/.vg-suppressions @@ -1,6 +1,6 @@ # Suppress valgrind diagnostics we don't care about. -# Copyright (C) 2003-2012 Free Software Foundation, Inc. +# 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 diff --git a/AUTHORS b/AUTHORS index d1024a56..df21e90a 100644 --- a/AUTHORS +++ b/AUTHORS @@ -26,7 +26,7 @@ echo: Brian Fox, Chet Ramey env: Richard Mlynarik, David MacKenzie expand: David MacKenzie expr: Mike Parker, James Youngman, Paul Eggert -factor: Paul Rubin +factor: Paul Rubin, Torbjörn Granlund, Niels Möller false: Jim Meyering fmt: Ross Paterson fold: David MacKenzie @@ -52,6 +52,7 @@ nice: David MacKenzie nl: Scott Bartram, David MacKenzie nohup: Jim Meyering nproc: Giuseppe Scrivano +numfmt: Assaf Gordon od: Jim Meyering paste: David M. Ihnat, David MacKenzie pathchk: Paul Eggert, David MacKenzie, Jim Meyering @@ -80,7 +81,6 @@ split: Torbjörn Granlund, Richard M. Stallman stat: Michael Meskes stdbuf: Pádraig Brady stty: David MacKenzie -su: David MacKenzie sum: Kayvan Aghaiepour, David MacKenzie sync: Jim Meyering tac: Jay Lepreau, David MacKenzie diff --git a/ChangeLog b/ChangeLog index a56ddfec..205b3d4e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,3973 @@ +2013-02-14 Pádraig Brady + + version 8.21 + * NEWS: Record release date. + + tests: avoid non portable sed use of \t + * tests/du/threshold.sh: use `cut` rather than + sed to avoid using the non portable \t which + fails on sed on openbsd 5 at least. + Also remove a redundant call to `tr` and avoid + explicit setting of LANG=C which is done globally. + +2013-02-14 Pádraig Brady + + build: avoid link failure in devmsg() on older linkers + On linkers that don't remove unused functions, + there will be a reference to a missing dev_debug symbol + in the devmsg() function. So for now ... + + * src/system.h: ... move devmsg() from here ... + * src/numfmt.c: ... to here, and document future cleanup. + * src/factor.c: Likewise. + +2013-02-13 Assaf Gordon + + numfmt: fix strtol() return code handling + src/numfmt.c (parse_format_string): On some systems, strtol() returns + EINVAL if no conversion was performed. So only handle ERANGE here, + and handle other format errors directly. + +2013-02-11 Bernhard Voelker + + maint: avoid running check-root tests in gnulib + * tests/local.mk (check-root): Restrict to SUBDIRS=. as traversing + into gnulib-tests induces a false failure. + +2013-02-11 Pádraig Brady + + doc: improve the numfmt man page format + * src/numfmt.c (usage): Keep a single space between the "K = 1000", + so that it's not displayed on a separate line. Also place ',' + between each unit entry to improve readability. + +2013-02-10 Benno Schulenberg + + doc: standardize helptext of numfmt and slice into single options + * src/numfmt.c (usage): Correct synopsis and make command description + clearer. Start option descriptions with lowercase letter; use + semicolon instead of period where needed; indent continuation lines; + gettextize single options for ease of translation and maintenance; + sort options alphabetically. + * doc/coreutils.texi (numfmt invocation): Sort numfmt options + alphabetically. Enforce double-blank-after-period style. + + This addresses http://bugs.gnu.org/13681. + Improved-by: Bernhard Voelker + +2013-02-10 Pádraig Brady + + maint: consolidate developer debug messages + Both factor and numfmt recently introduced debug messages + for developers, enabled by --verbose and ---devdebug respectively. + There were a few issues though: + 1. They used different mechanisms to enable these messages. + 2. factor used --verbose which might be needed for something else + 3. They used different methods to output the messages, + and numfmt used error() which added an unwanted newline + 4. numfmt marked all these messages for translation and factor + marked a couple. We really don't need these translated. + So we fix the above issues here while renaming the enabling + option for both commands to ---debug (still undocumented). + + * src/factor.c (verbose): Rename to dev_debug and change from int to + bool as it's just a toggle flag. + (long_options): Rename --verbose to ---debug. + * src/system.h (devmsg): A new inline function to output a message + if enabled by a global dev_debug variable in the compilation unit. + * src/numfmt.c: Use devmsg() rather than error(). + Also remove the translation tags from these messages. + Also change debug flag to bool from int. + * tests/misc/numfmt.pl: Adjust for the ---devdebug to ---debug change. + * cfg.mk (sc_marked_devdiagnostics): Add a syntax check to ensure + translations are not added to devmsg calls. + + Reported by Göran Uddeborg in http://bugs.gnu.org/13665 + +2013-02-10 Pádraig Brady + + tests: tail-2/inotify-rotate: fix a false failure on NFS + * tests/tail-2/inotify-rotate.sh: Avoid a subshell with bash, + which in turn causes the `kill` to be ineffective to the tail + processes (as the SIGTERM is sent to the subshell which doesn't + propagate the signal on to its children). On NFS the test + cleanup will then fail as there will be .nfs files maintained + in the directory for the files still opened by the tail processes. + Reported by Bernhard Voelker. + + tests: skip numfmt grouping tests on some systems + * tests/misc/numfmt.pl: When the system locale grouping doesn't + match our expected format for grouping 1234 in the fr_FR locale, + reset the locale to 'C' so as to skip all locale tests. + +2013-02-07 Jim Meyering + + tests: avoid actual/expected mismatch due to changed diagnostic + * tests/cp/fail-perm.sh: Adjust expected diagnostic to match + just-changed cp diagnostic. + * tests/ln/hard-to-sym.sh: Likewise. + * .mailmap: Also map my new address. + +2013-02-07 Pádraig Brady + + 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 secure_getenv and subsequent patches + as these are reported to fail on FreeBSD at least. + +2013-02-06 Benno Schulenberg + + maint: improve error messages upon failed read, write, access, close + Note we use "failed to {access,close}" for those single operations, + and "error {read,writ}ing" for those partial operation failures. + + * src/copy.c: Improve error messages for failing read, write and close. + * src/cp.c: Improve error messages for failing access. + * src/dd.c: Improve error messages for failing read, write and open. + * src/head.c: Improve error message for failing close. + * src/install.c: Improve error messages for failing access. + * src/ln.c: Likewise. + * src/mv.c: Likewise. + * src/touch.c: Improve error message for failing close. + * src/truncate.c: Likewise. + +2013-02-05 Assaf Gordon + + doc: fix a numfmt help section typo + * src/numfmt.c (usage): Change erroneous "G" to "M". + +2013-02-05 Ondřej Vašík + + stty: add support for DTR/DSR hardware control flow + Originally requested in Red Hat bugzilla #445213. + + * src/stty.c (mode_info): Add support for DTR/DSR hardware flow control, + if available. + * doc/coreutils.texi: Document it. + * tests/misc/stty.sh: Add it to the list of serial options to avoid. + * NEWS: Mention the improvement. + +2013-02-05 Pádraig Brady + + numfmt: correct a printf format + Prompted by the continuous integration build failure at: + http://hydra.nixos.org/build/4010493 + + * src/numfmt.c (parse_format_string): Correct both sign and size of + a printf format, which only gives a warning on 32 bit builds. + +2013-02-04 Assaf Gordon + + numfmt: a new command to format numbers + * AUTHORS: Add my name. + * NEWS: Mention the new program. + * README: Reference the new program. + * src/numfmt.c: New file. + * src/.gitignore: Ignore the new binary. + * build-aux/gen-lists-of-programs.sh: Update. + * scripts/git-hooks/commit-msg: Allow numfmt: commit prefix. + * po/POTFILES.in: Add new c file. + * tests/misc/numfmt.pl: A new test file giving >93% coverage. + * tests/local.mk: Reference the new test. + * man/.gitignore: Ignore the new man page. + * man/local.mk: Reference the new man page. + * man/numfmt.x: A new template. + * doc/coreutils.texi: Document the new command. + +2013-02-04 Pádraig Brady + + cut: fix a segfault with disjoint open ended ranges + Fixes the issue introduced in unreleased commit v8.20-60-gec48bea. + + * src/cut.c (set_fields): Don't access the bit array if + we've an open ended range that's outside any finite range. + * tests/misc/cut.pl: Add tests for this case. + Reported by Marcel Böhme in http://bugs.gnu.org/13627 + +2013-02-01 Paul Eggert + + doc: say how to tac char-by-char + This fixes Bug#12115, reported by Reuben Thomas. + * doc/coreutils.texi (tac invocation): Document how to reverse a + file character by character. Break out MS-DOS into a separate + section, like 'cat' does. + +2013-01-28 Bernhard Voelker + + df: do not treat rootfs specially + Like any other pseudo file system, df should show rootfs only + when the -a option is specified, i.e. specifying -trootfs alone + is not sufficient. As the rootfs entry is now elided by the + general deduplication in filter_mount_list (commit v8.20-103-gbb116d3), + all other references to rootfs can be removed again. + + * src/df.c (show_rootfs): Remove global variable. + (ROOTFS): Remove constant. + (filter_mount_list): Remove case to handle rootfs specially. + (main): In the case for handling the -t option, remove setting + of the show_rootfs variable. + * tests/df/skip-rootfs.sh: Adapt the test case "df -t rootfs": + the rootfs file system must not be printed (because no -a). + * doc/coreutils.texi (df invocation): Correct the documentation + about eliding mount entries: it is not the first occurrence of + the the device which wins, but now rather the entry with the + shortest mount point name. Also adapt the description about + eliding pseudo file system types like rootfs. + * NEWS (Changes in behavior): Adapt entry. + +2013-01-27 Ondrej Oprala + Bernhard Voelker + + df: prefer fullpath entries when deduplicating + * src/df.c (struct devlist): Add a new element for storing + pointers to mount_entry structures. + (devlist_head, dev_examined): Remove. + (filter_mount_list): Add new function to filter out the rootfs + entry (unless -trootfs is specified), and duplicities. The + function favors entries with a '/' character in me_devname + or those with the shortest me_mountdir string, if multiple + entries fulfill the first condition. + Use struct devlist to build up a list of entries already known, + and finally rebuild the global mount_list. + (get_all_entries): Call the above new function unless the -a + option is specified. + (get_dev): Remove the code for skipping rootfs and duplicities. + * tests/df/skip-duplicates.sh: Add test cases. + +2013-01-26 Stephan Krempel + + timeout: ensure a blocked SIGALRM from the parent is unblocked + * src/timeout.c (unblock_signal): A new function to unblock a + specified signal, or warn if not possible. + (set_timeout): Ensure SIGALRM is unblocked before we setup the timer. + * tests/misc/timeout-blocked.pl: A new test for the issue. + * tests/local.mk: Reference the new test. + * NEWS: Mention the fix. + Fixes: http://bugs.gnu.org/13535 + +2013-01-26 Pádraig Brady + + seq: fix to always honor the step value + * src/seq.c (main): With 3 positive integer args we were + checking the end value was == "1", rather than the step value. + * tests/misc/seq.pl: Add tests for this case. + Reported by Marcel Böhme in http://bugs.gnu.org/13525 + + seq: fix misaligment with -w when no precision for start value + * src/seq.c (get_default_format): Also account for the case where '.' + is auto added to the start value, which is significant when the + number sequence narrows. + * tests/misc/seq.pl: Add two new tests for the failing cases. + * NEWS: Mention the fix. + Fixes http://bugs.gnu.org/13394 + + cut: fix -f to work with the -d$'\n' edge case + * src/cut.c (cut_fields): Handle the edge case where '\n' is + the delimiter, which could be used for example to suppress + the last line if it doesn't contain a '\n'. + * test/misc/cut.pl: Add tests for this edge case. + +2013-01-26 Pádraig Brady + + cut: with -f, process each line independently + Previously line N+1 was inspected before line N was fully output, + which causes output ordering issues at the terminal or delays + from intermittent sources like tail -f. + + * src/cut.c (cut_fields): Adjust so that we record the + previous output character so we can use that info to + determine wether to output a '\n' or not. + * tests/misc/cut.pl: Add tests to ensure existing + functionality isn't broken. + * NEWS: Mention the fix. + Fixes bug http://bugs.gnu.org/13498 + +2013-01-24 Paul Eggert + + build: update gnulib submodule to latest + * bootstrap.conf (gnulib_modules): Add statat. + The fstatat module was split in two, and we need both halves. + +2013-01-24 Pádraig Brady + + doc: fix an example in the od man page + * man/od.x: s/-w 16/-w16/ as -w takes an optional + parameter and so the space is significant. + +2013-01-23 Bernhard Voelker + + doc: fix order of du options in usage and texinfo manual + * src/du.c (usage): Bring options into alphabetical order. + * doc/coreutils.texi (du invocation): Likewise. + Furthermore, use the @itemx macro for the long options + --max-depth and --threshold instead of @item. + +2013-01-23 Bernhard Voelker + + maint: define usage note about mandatory args centrally + Each program with at least one long option which is marked as + 'required_argument' and which has also a short option for that + option, should print a note about mandatory arguments. + Define that well-known note centrally and use it rather than + literal printf/fputs, and add it where it was missing. + + * src/system.h (emit_mandatory_arg_note): Add new function. + + * src/cp.c (usage): Use it rather than literal printf/fputs. + * src/csplit.c, src/cut.c, src/date.c, src/df.c, src/du.c: + * src/expand.c, src/fmt.c, src/fold.c, src/head.c, src/install.c: + * src/kill.c, src/ln.c, src/ls.c, src/mkdir.c, src/mkfifo.c: + * src/mknod.c, src/mv.c, src/nl.c, src/od.c, src/paste.c: + * src/pr.c, src/ptx.c, src/shred.c, src/shuf.c, src/sort.c: + * src/split.c, src/stdbuf.c, src/tac.c, src/tail.c, src/timeout.c: + * src/touch.c, src/truncate.c, src/unexpand.c, src/uniq.c: + Likewise. + + * src/base64.c (usage): Add call of the above new function + because at least one long option has a required argument. + * src/basename.c, src/chcon.c, src/date.c, src/env.c: + * src/nice.c, src/runcon.c, src/seq.c, src/stat.c, src/stty.c: + Likewise. + +2013-01-21 Jakob Truelsen + Bernhard Voelker + + du: add -t SIZE, --threshold=SIZE option + * src/du.c (opt_threshold): Add variable to hold the value of + the --threshold option specified by the user. + (long_options): Add a required_argument entry for the new + --threshold option. + (usage): Add --threshold option. + (process_file): Elide printing the entry if its size does not + meet the value specified by the --threshold option. + (main): In the argument parsing loop, add a case for the new + -t option. Convert the given argument by permitting the + well-known suffixes for megabyte, gigabytes, etc. + Handle the special case "-0": give an error as this value is + not permitted. + * doc/coreutils.texi (du invocation): Add documentation for the + above new option. + * tests/du/threshold.sh: Add new test to exercise the new option. + * tests/local.mk (all_tests): Mention the above test. + +2013-01-20 Bernhard Voelker + + tests: remove test case du/slink + This test tried to ensure that not all symlinks (across all + file system types) have Zero size and refers to a change + in system.h from 2002-08-31 (commit SH-UTILS-2_0_15-55-g62808a7). + The test used to do this by working on symlinks to long file + names. This assumption is dependant on the underlying file + system, and in some environments like XEN does not even work + on file systems known to work otherwise. + + The test for dereferencing and no-dereferencing symlinks is + already covered by other tests (du/deref.sh, du/deref-args.sh, + and du/no-deref.sh). Therefore, remove it. + + * tests/du/slink.sh: Remove file. + * tests/local.mk (all_tests): Remove the above test. + + Discussed in: + http://lists.gnu.org/archive/html/coreutils/2013-01/msg00053.html + +2013-01-20 Bernhard Voelker + + maint: fix alphabetical order in .gitignore + Since commit v8.20-67-g0f525b6, .gitignore sometimes + showed up as changed because the entries "*.gcda" and + "*.gcno" had not been in alphabetical order. + + * .gitignore: Exchange the entries "*.gcda" and "*.gcno". + +2013-01-12 Benno Schulenberg + + uptime: gettextize an overlooked string, and normalize another + * src/uptime.c: Add calls to gettext() and select_plural(). + +2013-01-10 Benno Schulenberg + + doc: make a --help text fragment identical to three others + * src/ln.c (usage): Move a newline to the next text fragment, so + the preceding fragment about backup methods becomes the same as + the ones for cp, mv, and install. A bit easier for translators. + +2013-01-07 Pádraig Brady + + factor: apply a more general fix to enable correct assembly + In addition to the previous 64 bit guards we've placed in longlong.h + there are additional _LP64 guards required for mips with -mcpu >= 3, + to avoid a build failure (http://bugs.gnu.org/13353) and on sparc + with -mcpu >= v9 in 32 bit mode where for example, + `factor 2123123123123123123123` would go into an infinite loop. + + Since factor.c currently operates on uintmax_t, we restrict the use + of the assembly in longlong.h to when 'long' has the same width, to + provide a more general guard for this code. + + * src/factor.c: Restrict the use of longlong.h assembly code, + to when the width of intmax_t == long. + * src/longlong.h: Remove the previous _LP64 guards to avoid + divergence from GMP's longlong.h + * NEWS: Adjust the info on build and runtime fixes. + +2013-01-06 Paul Eggert + + doc: sync parse-datetime from gnulib + * doc/coreutils.texi (Top): Sync from gnulib parse-datetime.texi menu. + +2013-01-06 Karl Berry + + doc: avoid @sc in texinfo; it is unnecessary + * doc/coreutils.texi: avoid @sc and use explicit capitals. + * doc/local.mk (sc-use-small-caps-NUL): Remove, as no longer applicable. + +2013-01-04 Karl Berry + + doc: remove stale pr news in the manual + * coreutils.texi (pr invocation): remove list of ancient news + items; the main documentation already covers what is needed. + +2013-01-01 Jim Meyering + + 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. + + build: update gnulib submodule to latest + +2012-12-31 Jim Meyering + + maint: adjust NEWS entry wording + * NEWS: Adjust wording in a few entries. + +2012-12-27 Pádraig Brady + + doc: improve od --help and man page + * src/od.c: Redorder the information output by --help + to ease interpretation and so that appropriate sections + are generated by help2man. + * doc/coreutils.texi (od invocation): Fix an incorrect + reference to @var{n}, which should be @var{bytes}. + * man/od.x: Add an "Examples" section, and move the + default od format to there, and add a commonly required + format to generate hexdumps. + Reported by Akim Demaille in http://bugs.gnu.org/13280. + +2012-12-21 Mike Frysinger + + factor: disable x86_64 assembly code for x32 builds + The current x86_64 asm code does not work for x32 (__ILP32__) ABIs, + so disable it. Note simply deleting the q suffix is not enough. + + * src/longlong.h: Restrict x86_64 assembly to _LP64 targets, + which is consistent with other checks in longlong.h and + avoids this code on x32. + * NEWS: Mention the build fix. + +2012-12-21 Pádraig Brady + + tests: avoid false positive valgrind failures + * init.cfg (require_valgrind_): Check the `true` program, + which will check more valgrind failure cases as now + detailed in the function comments. + + dd: fix a printf format mismatch in an error message + * src/dd.c (dd_copy): To print an off_t portably we need + to use PRIdMAX and cast to intmax_t, otherwise there + could be a mismatch between say a 32 bit off_t + and uintmax_t. This was flagged by -Wformat on + a 64 bit host when compiling with CFLAGS=-m32. + +2012-12-21 Pádraig Brady + + seq: fix newline output when -s specified + This regression was introduced in commit v8.19-132-g3786fb6. + + * src/seq.c (seq_fast): Don't use puts() to output the first number, + and instead insert it into the buffer as for other numbers. + Also output the terminator unconditionally. + * tests/misc/seq.pl: Add some basic tests for the -s option. + * NEWS: Mention the fix. + * THANKS.in: Reported by Philipp Gortan. + +2012-12-20 Bernhard Voelker + + tests: add tests for basename's --zero option + The -z option has been introduced in commit v8.15-60-ga3eb71a, + i.e. in coreutils-8.16. Time to add some tests for it. + + * tests/misc/basename.pl: Add tests exercising the -z option. + In the foreach loop to append a newline to the end of each + expected 'OUT' string, skip the -z tests. + +2012-12-20 Assaf Gordon + + doc: tweak 'lcov' in HACKING + * HACKING: In the paragraph about creating coverage statistics, + use the correct -b (--base-directory) parameter. + +2012-12-19 Pádraig Brady + + maint: rewrap a long line noticed by make syntax-check + * configure.ac: Wrap the recently introduced long line. + + doc: clarify when dd iflag=fullblock is useful + * doc/coreutils.texi (dd invocation): Explain that iflag=fullblock + ensures that count= will count blocks rather than reads, and + reference that in both the count= and iflag=fullblock descriptions. + Suggested by John Reiser. + + tests: avoid a race in timeout-group.sh + * tests/misc/timeout-group.sh: The kernel might possibly delay + signal propagation to timeout.cmd long enough, that it exits + normally without running the signal handler (as sleep will + be in the same process group and so get the signal too). + So avoid this by explicitly checking that the signal handler + is called, which should always happen under normal circumstances. + Reported by Stefano Lattarini on linux-2.6.30-2-686 and bash-4.2.36. + + build: avoid --enable-gcc-warnings on GCC <= 4.5 + * configure.ac: Only enable warnings automatically when + on GCC >= 4.6 (and when building from a git checkout) + as that was the first GCC version to support fine-grained + control of warnings, allowing them to be adjusted around + certain code sections. gnulib relies on this for certain + warnings, so avoid auto enabling this option lest we trigger + build failures on now over two year old compilers. + Reported by Zartaj Majeed with GCC 4.5.3 on cygwin. + +2012-12-19 Zartaj Majeed + + build: fix cygwin build issues + * doc/local.mk (doc/constants.texi): Ensure the doc directory + is present which is needed when doing a non source dir build, + when the doc/constants.texi target is built before other doc targets. + * src/local.mk: Add $(EXEEXT) to the make-prime-list calls. + +2012-12-17 Pádraig Brady + + maint: consistently use @dots{} in coreutils.texi + * doc/coreutils.texi: s/\.\.\./@dots{}/ except in code and examples. + +2012-12-17 Pádraig Brady + + readlink: support multiple command line arguments + This allows efficient processing of multiple files, + while also increasing compatibility with BSD's readlink(1). + We also add the -z, --zero option to delimit output items + with the NUL character which disambiguates output in the + presence of '\n' characters. + + * src/readlink.c (usage): Add the --zero description, + and also adjust the description of --no-newline accordingly. + (main): Handle the -z option and iterate over multiple arguments. + Also as in commit v8.15-24-g9d46b25 we use fputs() and putchar() + rather than printf() for performance reasons. + * doc/coreutils.texi (readlink invocation): Document the + new --zero option, adjust the --no-newline description, and + tweak the general info to indicate multiple files are supported. + * tests/readlink/multi.sh: A new test for the new functionality. + * tests/local.mk: Reference the new test. + * man/readlink.x: Adjust the summary and also reference realpath. + * NEWS: Mention the improvement. + * THANKS.in: Suggested by Aaron Davies. + +2012-12-15 Assaf Gordon + + maint: update gitignore entries + * .gitignore: ignore GCC coverage data files. + +2012-12-14 Assaf Gordon + + doc: mention "git stash" in HACKING + * HACKING: In the paragraph about switching branches, mention + "git stash" as a way to continue while preserving uncommitted + changes. + +2012-12-14 Bernhard Voelker + + tail,stat: improve support for the ceph file system + Teach tail -f that it must use polling on ceph file systems, and + let stat -f --format=%T report the file system type name, "ceph". + Website: http://ceph.com/ + + * src/stat.c (human_fstype): Add a case: ceph, 0x00C36400, remote. + * NEWS (Improvements): Mention it. + * THANKS.in: Update. + Reported by Konrad Wróblewski in http://bugs.gnu.org/13172. + +2012-12-14 Bernhard Voelker + + maint: fix typos found by misspellings + * doc/coreutils.texi (df invocation): s/occurence/occurrence/. + * tests/df/skip-rootfs.sh: s/supressed/suppressed/ + +2012-12-09 Jim Meyering + + tests: add test case and note that last week's cut change is a bug fix + * tests/misc/cut-huge-to-eol-range.sh: New test, showing that + the change in v8.20-51-g7d03466 is a bug fix after all. + * tests/local.mk (all_tests): Add it. + * NEWS (Bug fixes): Mention it. + +2012-12-08 Bernhard Voelker + + cp: fix --no-preserve=mode to not exit 1 + cp --no-preserve=mode exited 1 unconditionally. Furthermore, + the tests which would have detected this error - namely + link-preserve.sh and reserve-mode.sh - failed to test + cp's exit code. + + * src/copy.c (copy_reg): In the case x->explicit_no_preserve_mode, + do only set return_val to false iff the previous set_acl () + failed. + * tests/cp/link-preserve.sh: Check cp's exit code. + * tests/cp/link-symlink.sh: Likewise. + * tests/cp/preserve-mode.sh: Likewise. + * NEWS: Mention the fix. + + Bug introduced in commit v8.19-145-g24ebca6. + + Reported by Florian Pritz in http://bugs.gnu.org/13119. + +2012-12-07 Ondrej Oprala + Bernhard Voelker. + + df: do not print duplicate entries and rootfs by default + * src/df.c (struct devlist): Add new struct for storing already- + examined device numbers. + (devlist_head): Add new store of the above type. + (show_rootfs): Add new global boolean to not skip rootfs. + (dev_examined): Add new function to check if the device has + already been traversed. + (get_dev): Filter out rootfs unless "-t rootfs" or the -a + option is specified. Filter out duplicate entries by calling + the above new dev_examined unless the -a option is specified. + (main): Set the show_rootfs variable appropriately when the -t + option is specified for rootfs. Free device list (guarded by + IF_LINT). + * tests/df/skip-duplicates.sh: Add test to exercise the skipping + of duplicate entries. + * tests/df/skip-rootfs.sh: Add test to exercise the skipping + of the rootfs pseudo file system. + * tests/local.mk: Add the above new tests. + * NEWS (Changes in behavior): Mention the changes. + * doc/coreutils.texi (df invocation): Document df's behavior about + skipping rootfs and duplicate entries. + +2012-12-06 Cojocaru Alexandru + + cut: avoid a redundant heap allocation + * src/cut.c (set_fields): Don't allocate memory for + `printable_field' if there are no finite ranges. + This is achieved by keeping max_range_endpoint as 0 when + there are no finite ranges. max_range_endpoint is then + used throughout the code to guard against allocation of, + and access to the bit array. + The extra allocation was introduced via commit v8.10-3-g2e636af. + +2012-12-06 Pádraig Brady + + maint: fix a referenced coreutils version in a test comment + * tests/misc/cut.pl: This particular bug existed up to v8.10. + +2012-12-06 Bernhard Voelker + + tests: fix regex to match "-" in ipcent field in df/total-verify.sh + The regular expression failed to match for file systems that + do not provide inode statistics, e.g. VFAT or CIFS (depending + on the underlying peer file system). + + * tests/df/total-verify.sh: Fix the regular expression to match + a dash in the ipcent field again. + + Reported by Assaf Gordon in http://bugs.gnu.org/13099. + Bug introduced in commit v8.20-18-gdae8d22. + +2012-12-06 Assaf Gordon + + maint: adjust HACKING instructions to run a single test + * HACKING: Adjust as per the recent changes introduced + when switching to non recursive make. + +2012-12-06 Pádraig Brady + + tests: cut.pl: adjust for changed diagnostic + * tests/misc/cut.pl: Since we now output the more + complete error message irrespective of running + in a multi-byte locale or not, adjust the test accordingly. + +2012-12-06 Cojocaru Alexandru + + cut: improve error reporting + * src/cut.c (main): Treat a NUL delimiter (-d '') consistently + with non NUL delimiters, and disallow such a delimiter option, + unless a field is also specified. + (set_fields): Provide a more accurate error message when + a given list is invalid. + * tests/misc/cut.pl: Add a test case. + +2012-12-06 Pádraig Brady + + maint: adjust instructions to run a single test + * README: Adjust as per the recent changes introduced + when switching to non recursive make. + +2012-12-05 Bernhard Voelker + + maint: remove now auto-added entry from THANKS.in + The syntax-check sc_THANKS_in_duplicates complained about + that excess entry. + + * THANKS.in (Colin Watson): Remove entry, now that it will be + automatically included in the generated THANKS file. + +2012-12-04 Pádraig Brady + + maint: remove a redundant odd sized alloc from factor.c + * src/factor.c (mp_factor_init): Init the pointers with NULL, + which xrealloc (or realloc) handles fine. + +2012-12-04 Colin Watson + + factor: fix infinite loop on 32 bit powerpc + Both Debian and Ubuntu builds of coreutils 8.20 hang while running the + test suite on powerpc, which is reproducible using 'factor 122'. + + This turns out to be somewhat related to http://bugs.gnu.org/12754, + but not quite the same. uintmax_t is 64 bits, but the cntlzw + instruction takes 32-bit operands, and the cntlzd option is only + available on 64-bit hardware. + + * src/longlong.h: Add an _LP64 check around the PPC64 code, + so that this falls back to the C implementations. + * NEWS: Mention the fix. + +2012-11-24 Jim Meyering + + cut: do not print extraneous delimiters in some unusual cases + When printing output delimiters, and when a to-EOL range subsumes + at least one other range, cut would mistakenly print delimiters for + the subsumed range. This bug was probably introduced via commit + v5.2.1-639-g847e066. + * src/cut.c (set_fields): Ignore any range that is subsumed by a + to-EOL range. Also, move two declarations down. + * tests/misc/cut.pl: Add tests to exercise this. + * NEWS (Bug fixes): Mention it. + Reported by Marcel Böhme in http://bugs.gnu.org/12966 + + cut: treat -b2-,3- like -b2-, not like -b3- + * src/cut.c (set_fields): When two right-open-ended ranges are + specified, don't blindly let the latter one take precedence over + the former. Instead, use the union of the ranges. + * tests/misc/cut.pl: Add tests to exercise this. + * NEWS (Bug fixes): Mention it. + Reported by Marcel Böhme in http://bugs.gnu.org/12966 + Thanks to Berhard Voelker for catching log and NEWS typos. + +2012-11-24 Bernhard Voelker + + doc: cp: clarify behavior of the --preserve=xattr option + * doc/coreutils.texi (cp invocation): Enhance documentation + of the --preserve=xattr option regarding the preservation + of ACLs, SELinux contexts and capabilities: the user may + notice this only when not specifying --preserve=mode + and --preserve=context, too, i.e., otherwise, these attributes + are preserved anyway. + +2012-11-24 Pádraig Brady + + doc: update info cross reference to bash + * doc/coreutils.texi (tee invocation): Reference + the bash manual rather than bashref, as the latter + is more likely to work on newer systems. + + tests: use sub-second timeouts to speed up a timeout test + * tests/misc/timeout.sh: Take advantage of recent support for + sub-second timeouts to decrease runtime from about 6s to 2s. + + doc: clarify that renice is needed to adjust niceness + * doc/coreutils.texi (nice invocation): Ensure there is no + ambiguity in the summary in relation to nice being able + to adjust the niceness of an existing process. + Reference the renice command. + * man/nice.x: Reference renice (1) + + tests: accept EEXIST from rm -d + * tests/rm/d-2.sh: EEXIST is a valid error on some systems. + Reported by Michael Felt on AIX 6.1 + + tests: don't rely on sed -i being available + * tests/df/df-output.sh: sed --in-place is not generally available. + Also add a couple of simplifications from Bernhard Voelker. + Removing all spaces, rather than just leading spaces, suffices. + Searching for ' --output' in unadjusted df --help, suffices. + + seq: ensure correct output width for scientific notation input + * src/seq.c (scan_arg): Calculate the width more accurately + for numbers specified using scientific notation. + * tests/misc/seq.pl: Add tests for cases that were mishandled. + * NEWS: Mention the fix. + * THANKS.in: Reported by Marcel Böhme. + Fixes http://bugs.gnu.org/12959 + +2012-11-22 Bernhard Voelker + + df: reorder default field list of --output option + As the inodes information is usually not so much of interest, + and some file systems including btrfs do not even provide it, + reading of the full df --output is easier when the block + statistic fields come just left of the last field, the mount + point. + + * src/df.c (all_args_string): Move the inodes fields before + the block fields. + (usage): Likewise. + * tests/df/df-output.sh: Likewise. + * doc/coreutils.texi (df invocation): Likewise. Additionally, + explicitly mention the default order of the --output option. + +2012-11-21 Paul Eggert + + install: fix security race + * NEWS: Document this. + +2012-11-20 Paul Eggert + + install: fix security race + * src/copy.c (copy_internal): Use DST_MODE_BITS, not SRC_MODE. + See Bernhard R. Link in and in + . + +2012-11-20 Bernhard Voelker + + nl: remove deprecated --page-increment option + The above option has been deprecated since coreutils-7.5 + by commit v7.4-129-g718b279. + + * src/nl.c (PAGE_INCREMENT_OPTION_DEPRECATED): Remove enum. + (longopts): Remove "page-increment" entry. + (main): Remove PAGE_INCREMENT_OPTION_DEPRECATED case. + * NEWS (Changes in behavior): Mention the change. + + Reported by Marcel Böhme in . + +2012-11-19 Bernhard Voelker + + doc: remove already implemented items from TODO + * TODO (renice): The renice program is part of util-linux for + years now. Remove entry. + (dd): The option status=none has been implemented in commit + v8.19-143-g7331ab5. Remove entry. + +2012-11-18 Bernhard Voelker + + cut: do not accept the invalid range 0- + The command "echo 12345 | cut -b 0-" prints an empty line while + it should fail with "fields and positions are numbered from 1". + + * src/cut.c (set_fields): Add a diagnostic for the invalid open + range which starts with Zero, i.e., the range 0-. + * tests/misc/cut.pl: Add tests to ensure the range 0- fails for + fields (-f) and for positions (-b, -c). + * NEWS: Mention the fix. + + Reported by Marcel Böhme in . + +2012-11-18 Daniel Schepler + + build: fix compilation failure on x32 + * src/factor.c [HAVE_ATTRIBUTE_MODE]: Fix typo in #if test: + s/HAVE_LONG_LONG/HAVE_LONG_LONG_INT/. Otherwise, factor.c would + elicit assembler errors on x32: it was incorrectly defining DItype + to long instead of long long. Patch and report in + http://bugs.debian.org/693337; Mike Stone notified upstream. + +2012-11-18 Jim Meyering + + maint: reenable accidentally-disabled cppi-check syntax-check rule + * cfg.mk (exclude_file_name_regexp--sc_preprocessor_indentation): Fix + typo that disabled the sc_preprocessor_indentation syntax-check rule + by exempting all files. s/__ll/_ll/ The typo was introduced in + commit v8.19-157-g759ebcb. + + maint: correct indentation of W_TYPE_SIZE-defining cpp directives + * src/factor.c: Indent cpp directives to reflect their nesting. + + maint: avoid i686-specific syntax-check failure + * cfg.mk (_gl_TS_unmarked_extern_vars): Define. + +2012-11-17 Paul Eggert + + doc: explain why dd is called "dd" + * doc/coreutils.texi (dd invocation): Mention JCL. + + factor: tidy up primes.h again + See Stefano Lattarini in . + * src/local.mk (BUILT_SOURCES): Put $(top_srcdir)/src/primes.h here + (MAINTAINERCLEANFILES): ... instead of here. + +2012-11-13 Paul Eggert + + factor: cleanup for primes.h + * .gitignore: Add src/primes.h back, since it's no longer + in the repository. + +2012-11-13 Jim Meyering + + maint: avoid unnecessary #include to fix syntax-check failure + * src/factor.c: Remove unneeded #inclusion of"verify.h". + It's already included via system.h. + +2012-11-13 Paul Eggert + + factor: improve primes.h change + This follows suggestions by Jim Meyering in + . + * src/make-prime-list.c (print_wide_uint): Change "nested" argument + to "nesting", and use it to avoid outputting lines that are too long. + * src/primes.h: Remove from git. This can be generated by a + maintainer. It's nicer to do so on a host with at least 128-bit + arithmetic. + +2012-11-12 Paul Eggert + + factor: maintainer builds primes.h, not builder + With this change, the maintainer builds primes.h and it is part of + the tarball. primes.h's contents are not architecture-specific. + * .gitignore: Remove /src/primes.h. + * src/factor.c: Include verify.h. + (W): New constant. Verify that uintmax_t lacks holes + and that W is no wider than the integers used to generate primes.h. + * src/local.mk (EXTRA_DIST): Add src/primes.h. + (BUILT_SOURCES, CLEANFILES): Remove src/primes.h. + ($(top_srcdir)/src/primes.h): Rename from src/primes.h. + Do not depend on src/make-prime-list. Instead, use sub-make to + build, so that we build primes.h only if it does not exist. + * src/make-prime-list.c: Include , for ULONG_MAX. + (wide_uint): Define to uintmax_t or unsigned __int128 if not #defined. + (struct prime, binvert, process_prime): Use it instead of uintmax_t. + (print_wide_uint): New function. This generates the proper pinv + value regardless of the width of uintmax_t on the target, so long + as the width doesn't exceed that of the width of wide_uint on the + maintainer host that generated src/primes.h. + (output_primes): Use it. Output WIDE_UINT_BITS, too. Let the + target compute its own lim, since its uintmax_t may be narrower + than ours. + (SZ): Remove. + * src/primes.h: New file, generated with 128-bit integers and usable + on any host where uintmax_t's width is no greater than 128 bits. + + factor: port to systems with rpl_malloc + * src/make-prime-list.c (malloc): Undef. This fixes a problem on + AIX 8.20 reported by Michael Felt in . + +2012-11-09 Bernhard Voelker + + tests: fix factor's tests to use coreutil's own sha1sum + The test used the shasum utility which seems to belong to the + perl package. On SLES-10.4, perl doesn't include this yet: + + + seq 0 10000000 + + factor + + shasum -c --status exp + ./tests/factor/t00.sh: line 30: shasum: command not found + + Exit 1 + + It is better to use our own stuff anyway. + + * tests/factor/run.sh: s/shasum/sha1sum/. Additionally, add + sha1sum to the print_ver_ call. + +2012-11-09 Benno Schulenberg + + doc: chcon: add descriptions for three undocumented options + These were missed in this related change v8.14-104-g44e20cd + + * src/chcon.c (usage): Mention the two --preserve-root options. + * doc/coreutils.texi (chcon invocation): Plus the --dereferece option. + +2012-11-09 Benno Schulenberg + + doc: with cp -n, option -f is not redundant but ignored + * src/cp.c (usage): Replace "redundant" with "ignored". + * doc/coreutils.texi (cp invocation): Likewise. + +2012-11-09 Paul Eggert + + df: port the new df test to POSIX sed, larger file systems + * tests/df/df-output.sh: For the test "df -B1K --output=size", + do not assume that the file system size fits in 9 bytes; it + might be larger than that, so omit leading space. Also, use + portable 'sed' commands: POSIX says sed commands inside { } should + all end in newline. + +2012-11-08 Bernhard Voelker + + df: add a test for the --output option + * tests/df/df-output.sh: Add a test case. + * tests/local.mk (all_tests): Mention the test. + * cfg.mk (sc_file_system): Exempt the test from this syntax-check. + + df: document the new --output option + * src/df.c (usage): Add a short description of --output and its + available field names for use in the optional argument. + * doc/coreutils.texi (df invocation): Add the new option with more + details and a few examples. + * NEWS (New features): Mention the new option. + (Changes in behvaior): Mention the new placeholder for fields + in the "total" line. + +2012-11-08 Bernhard Voelker + + df: add --output to select which fields to display + This supports changing the order of the fields displayed, + and also allows the simultaneous display of inode and block fields. + + src/df.c (get_dev): Factor out calling get_header to ... + (main): ... here. Call print_table only if file_systems_processed. + + src/df.c (Displayable fields): Rename DEV_FIELD to SOURCE_FIELD. + Rename TYPE_FIELD to FSTYPE_FIELD. Rename FREE_FIELD to AVAIL_FIELD. + Rename MNT_FIELD to TARGET_FIELD. + + * src/df.c (display_field_t): Turn loose enum definition of the + displayable fields into a typedef. Add the inode fields ITOTAL_FIELD, + IUSED_FIELD, IAVAIL_FIELD, IPCENT_FIELD. + (field_data_t): Define structure to hold the display field, the + caption, the width and the alignment for each field of the above + type. + (field_data): Add array the values of field data for each display + field. + (headers, alignments, widths): Remove arrays. + (columns): Add a pointer to the storage for the array of the actual + output columns, i.e., fields. + (ncolumns): Add counter for the current output columns. + (alloc_table_row): Allocate the dynamic ncolumns value of strings. + (print_table): Loop over ncolumns instead of constant NFIELDS. Rename + loop variable 'field' to 'col' to avoid ambiguity with the 'field' + element in the columns structure. Adjust the condition for printing + the last column by comparing with the column number instead of the + field name (TARGET_FIELD). Use the width and the alignment stored in + the columns data. + (alloc_field): Add new function to allocate a field in the columns + array. + (get_field_list): Add new function to fill the array of output columns + for each mode. + (get_header): Loop over ncolumns instead of constant NFIELDS. Rename + the loop variable 'field' to 'col' to avoid ambiguity with the 'field' + element in the columns structure. Remove the code for continuing the + loop if the current column is the file system type and print_type is not + active (which is now impossible). Store the cell in the columns store + along with the new width. + (get_dev): Loop over ncolumns instead of the constant NFIELDS. Rename + the loop variable 'field' to 'col' to avoid ambiguity with the 'field' + element in the columns structure; move the definition down to where it + is used first. Add cases for the inode fields ITOTAL_FIELD, + IUSED_FIELD, IAVAIL_FIELD and IPCENT_FIELD. Store the cell in the + columns store along with the new width. + (main): Use new get_field_list function to fill the list of output + columns. + + * src/df.c (print_table): Instead of fputs()ing directly, apply + ambsalign on the last field, too. Use the new MBA_NO_RIGHT_PAD flag + for this. + + * src/df.c (TOTAL_OPTION): Add new enum value. + (long_options): Use it for the "total" option instead of 'c'. + (main): Likewise. + + * src/df.c (get_dev): Remove condition to copy the fstype into the + FSTYPE_FIELD - based on whether print_type is non-Null. Since the + introduction of get_field_list(), there are only fields added to + the columns array which have to be added. + + * src/df.c (get_dev): Guard the summing up of the values for the + grand total: only do it if we have to print the total and if the + current invocation is not for processing it. + + * src/df.c (main): Pass a hyphen "-" for the mount point name + to get_dev. + (get_dev): As the mount_point is now always there, + remove the condition and the else case for the TARGET_FIELD. + Instead, simply copy the mount_point. + All cells are now always present. Therefore, add an assertion + statement if one was not. Furthermore, hide the problematic + characters unconditionally. + (print_table): Remove the skipping of empty cells. + * tests/df/total-verify.sh: Accommodate to the new "-" in the + target field of the summary line. + * NEWS: Mention the change in behavior. + + * src/df.c (field_type_t): Add new typedef of 3 enums to distinguish + between block, inode and other fields. + (field_data_t): Add field_type member of the above new type. + (field_data): Add default values for the above field_type, + indicating whether a field contains block values, inode values + or other, generic values. + (field_values_t): Add this struct to store the field values, used + by and factored out from get_dev to be able to define such a struct + for both the inode and the block values. + (get_field_values): Add this function to obtain the block values + and the inode values from the file system usage, used by and + factored out from get_dev. + (add_to_grand_total): Add this function to sum the values of the + current mount point up for the grand total, used by and factored + out from get_dev. + (get_dev): Move the definition of the variables fsu, buf, pct and + cell down to where they are used first to give them a better scope. + Factor out input_units, output_units, total, available, + negate_available, available_to_root, used and negate_used into the + above struct field_values_t. + Factor out the mapping of the fsu values to the above variables + into above function get_field_values. + Factor out the summing up of the grand total values into the + above function add_to_grand_total. + Define block_values and inode_values of the new type and call the + new get_field_values to fill them from the fsu values. + Call the above function add_to_grand_total for summing up the + values for the grand total. + Inside the loop over all fields, define a variable 'v' to point + to either the block_values or the inode_values, depending on the + current field's field_type. Change the code in the cases + TOTAL_FIELD/ITOTAL_FIELD, USED_FIELD/IUSED_FIELD, AVAIL_FIELD/ + IAVAIL_FIELD and PCENT_FIELD/IPCENT_FIELD to use the field values + where 'v' is pointing to, i.e., either the block_values or the + inode_values. + + * src/df.c (main): Remove setting of grand_fsu.fsu_blocks in the + inode_format case as this is no longer needed and would lead to + wrong results once when mixed block/inode fields will be used. + + * src/df.c (main): Cleanup the code at the end regarding + file_systems_processed to make the code clearer. + + * src/df.c (inode_format): Remove variable. + (main): Remove initialization of the above variable. + In getopts loop, directly set the header_mode to INODES_MODE + instead of using the above variable. Afterwards, remove the + mapping to INODES_MODE as it is already set. + + * src/df.c (posix_format): Move variable ... + (main): ... to here. + + * src/df.c (print_table): Enhance the comment about 2-line format + in cases where the SOURCE_FIELD exceeds 20 chars, as such + behavior has been removed long ago by commit v8.10-40-g99679ff. + + * src/df.c (Display modes): Add OUTPUT_MODE, remove unused NMODES. + (display_field_t): Remove unnecessary NFIELDS. + (field_data_t): Add member 'arg' for the field name in the --output + argument. Add member 'used' to remember if a field is already used + in the columns array. + (field_data): Add values for the above new members arg and used. + (all_args_string): Add variable which represents the argument for + the --output option which includes all fields. + (OUTPUT_OPTION): Add enum to identify the long --output option. + (long_options): Add optional-argument --output option. + (alloc_field): Assert that the field is not already used. + Mark the field as used. + (decode_output_arg): Add function to parse the comma-separated + field list passed to the --output option in order to add the + appropriate fields to the columns array. + (get_field_list): Add case for the new OUTPUT_MODE to add all + available fields to columns in the case the --output option + has been passed without any values. Use the comma-separated + field list form to pass to decode_output_arg to keep the field + header mapping for the OUTPUT_MODE only on one place. + (main): Define format string msg_mut_excl to be used in the + following checks whether the use of --output and the other + option is mutually exclusive. + In the getopt_long loop, add a check to the case for the -i option + to issue an error message when it is used together with --output; + Likewise for -T and -P. + Add a new case for OUTPUT_OPTION, together with similar checks as + above and eventually passing the optarg to decode_output_arg. + After the getopt_long loop, consider the OUTPUT_MODE case in order + not to run into -h or -P mode. + + * src/df.c (get_dev): Also xstrdup the dev_name, and free it + afterwards to silence a valgrind warning about definitely lost + memory. + (main): Free the columns store to silence valgrind, guarded by + the IF_LINT macro. + + * src/df.c (main): Pass "total" as the mount point to get_dev if + the SOURCE_FIELD is not among the columns to output. + * tests/df/df-output.sh: Change the test to ensure the content of + the target field of the grand total line: if the source field is + present, then the target should be "-", else the target field should + be "target". + * NEWS (Changes in behavior): Enhance the exiting NEWS entry. + * doc/coreutils.texi (df invocation): Document the content of the + source and target field in the grand total line. + + * src/df.c (main): Add another condition to the need_fs_type + parameter of read_file_system_list whether the FSTYPE_FIELD is + used or not. + + * src/df.c (get_header): Indicate the block size used, + in the "size" header, when using --output without -h. + * tests/df/df-output.sh: Adjust for, and add an extra test for, + the new behavior. + +2012-11-05 Bernhard Voelker + + maint: fix factor's test file name pattern in .gitignore + * .gitignore: Adapt the entry for the files generated during + the factor tests (see v8.20-9-g1cace4a). + +2012-11-04 Ángel González + + timeout: add --preserve-status to always propagate the exit status + It's useful for commands that support running for an indeterminite + amount of time, to not return a specific timeout exit status (124), + and instead let the command handle the timeout signal and return + a status for the work done so far. + + * doc/coreutils.texi (timeout invocation): Describe the new option. + * src/timeout.c (preserve_status): A new global boolean to + enable the --preserve-status behavior. + (usage): Describe the new option. + (main): Don't return EXIT_TIMEOUT of preserve_status is set. + * tests/misc/timeout.sh: Add a test for the new option. + +2012-11-04 Pádraig Brady + + maint: fix the error message from sc_check-I18N-AUTHORS + * cfk.mk (sc_check-I18N-AUTHORS): Fix the quoting so + you don't get a 'command not found' error. + + build: avoid build failure on some HPPA systems + * src/longlong.h: Restrict some HPPA assembly variants to PA RISC V2.0. + Note we also avoid this assembly for ilp32 runtimes, since even though + the assembly is accepted there, it's not safe as the context can get + clobbered between the 'add' and 'add,dc'. + This fixes a compile failure with newer HPPA systems with default + GCC CPU options. + Reported by John David Anglin + +2012-11-04 Pádraig Brady + + build: don't assume uintmax_t is 64 bits + This was not seen to be an issue in practise, + but to make the code more robust, don't assume + uintmax_t is 64 bits. + + * src/factor.c (W_TYPE_SIZE): Define based on integer limits. + * src/make-prime-list.c (output_primes): Define format width + based on integer limits. + +2012-11-04 Pádraig Brady + + build: don't rely on support for '%j' printf format + * src/factor.c (print_uintmaxes): Replace with PRIuMAX. + * src/join.c (check_order): Likewise. + * cfg.mk (sc_check-j-printf-format): Add a syntax-check rule + to flag new cases of this. + + build: don't rely on support for '%*j' printf format + * src/make-prime-list.c: Hardcode the uintmax_t width + to 16 hex digits (64 bit), to avoid this compile issue + on HPUS systems at least. + +2012-11-01 Bernhard Voelker + + tests: fix syntax error in setuidgid_has_perm_ + An invalid sed expression lead to the following error: + + sed -n 'ls/.* //p' + sed: -e expression #1, char 2: extra characters after command + Use "one" instead of "el". + Bug introduced in v8.19-111-g51a4b04. + + * init.cfg (setuidgid_has_perm_): s/ls/1s/. + * NEWS (Build-related): Mention the fix. + +2012-10-27 Bernhard Voelker + + tests: shorten factor's inordinately-long test file names + Besides what the subject says, this commit moves the test data + for the factor tests from tests/local.mk into the directory + tests/factor/ where it belongs. + + * tests/local.mk (EXTRA_DIST): Add new tests/factor/create-test.sh. + (p,q,t1,t2) Factor out the factor-related magic numbers. + (factor_tests): Rename the test names to t{00..36}.sh. Factor out + the triples of test data. + ($(factor_tests)): Add dependency to new + tests/factor/create-factor.sh. + Call that script to generate the test scripts. + * tests/factor/run.sh: Turn this script into a template, and + therefore remove it's executable permission bit. + Add template variables START, END and CKSUM, replacing the code + to split the test data from the test script's file name. + Use the new template variables in the call to seq and for + creating the exp file. + * tests/factor/create-test.sh: Add new script to create the + test scripts from the template tests/factor/run.sh. + Use test data and magic numbers factored out from the above + files. Let the script also change the __TEMPLATE__ line in + run.sh to make clear that the test scripts are generated. + * cfg.mk (sc_tests_list_consistency): Exempt the new test. + (exclude_file_name_regexp--sc_prohibit_test_backticks): + Likewise. + + Improved-by: Stefano Lattarini + Improved by: Jim Meyering + +2012-10-26 Stefano Lattarini + + build: man page generation: degrade gracefully when perl is lacking + Since commit v8.19-118-g57da212, our 'dist-hook' rule tweaked the + distributed Makefile.in to make each man page 'man/foo.1' depend + on the corresponding source 'src/foo.c' rather than the corresponding + program 'src/foo'. That was done to accommodate systems without + perl, which cannot run help2man to regenerate the manpage after + its corresponding program has been built. + + This seems a right and proper graceful degradation, in that the + man pages dependencies are still 100% correct in a git checkout, + while being more lax but "more portable" in a distribution tarball. + Alas, that is not the case in practice, as it turns out the tweaked + Makefile makes the building of man pages unreliable and potentially + incorrect! + + In fact, assume that instead of the correct a dependency: + + man/ls.1: src/ls + + we have the laxer one: + + man/ls.1: src/ls.c + + and think of what happens if a user modifies, say, 'src/ls.c', and then + runs "make -j4" to rebuild everything. The make process will see that + it has to rebuild the man page 'man/ls.1' (because its prerequisite + 'src/ls.c' has changed), but won't see that it has to rebuild 'src/ls' + *before* re-running 'help2man' to generate that man page; so, if + 'man/ls.1' is rebuilt before 'src/ls' (which can happen with concurrent + make), our user will get either a build error (if 'src/ls' did non + exist) or, worse, a man page with an up-to-date timestamp but an + out-of-date content. And what's even worse in all of this is that + this problem will be present also for users who have perl installed: + this is not a "graceful degradation" at all! + + In our situation, the best and simplest way to implement a graceful + degradation it to keep the correct dependencies for man pages (that + is, "man/ls.1: src/ls"), and if perl is not present, just generate + dummy man pages reporting that built-time issue and redirecting the + user back to either the info documentation or the '--help' output. + + As a consequence of this change, we also stop distributing man pages, + since they will now be generated unconditionally. + + * Makefile.am (do-not-require-help2man): Remove. + (dist-hook): Don't depend on it. + * man/local.mk: Remove an obsolete comment. + (EXTRA_DIST): Stop distributing generated man pages. + ($(EXTRA_MANS)): This no longer needs to depend on $(all_programs). + (MAINTAINERCLEANFILES): $(ALL_MANS) Do not list it here, and ... + (CLEANFILES): ... list it here, instead. + (.x.1): Instead of warning if perl is missing, but then trying to run + 'help2man' unconditionally, simply run ... + (run_help2man): ... the command referenced by this new variable, that + expands to a proper invocation of 'help2man' if perl is present, and + to an invocation of a shell script generating a dummy manpage if it + is not. + (EXTRA_DIST): Distribute that shell script. + * man/dummy-man: New shell script. + * NEWS (Build-related): Mention this. + Fixes coreutils http://bugs.gnu.org/12715. + +2012-10-25 Jim Meyering + + maint: tweak sc_check-I18N-AUTHORS + * cfg.mk (sc_check-I18N-AUTHORS): Remove unnecessary subshell; + add a self-explanatory diagnostic. + + maint: remove an obsolete test comment + * tests/du/bind-mount-dir-cycle.sh: Remove obsolete comment + spotted by Gilles Espinasse. + +2012-10-25 Pádraig Brady + + pr: fix -n to pad consistently and not crash + * src/pr.c: Replace the code to truncate the most significant + digits of line numbers, with much simpler string manipulation + that supports arbitrary widths. Before this, specifying a + width >= 32 to -n would result in a divide by zero error. + Also remove the inconsistent padding with zeros and spaces, which + would result in zero padding for widths 12 and 15. + * tests/pr/pr-tests.pl: Added a test to ensure no zero padding, + and also a test for the divide by zero case. + * NEWS: Mentioned the fix + Reported by Ondrej Oprala + + build: ensure factor links the iconv library + * src/local.mk (src_factor_LDADD): Append $(LIBICONV). + * crg.mk (sc_check-I18N-AUTHORS): A new syntax check rule + to ensure we add LIBICONV where appropriate. + * THANKS.in: Add the reporter. + Reported by Christian Jullien + Syntax check suggested by Jim Meyering + + maint: refactor tests/misc/pr.pl into tests/pr/pr-tests.pl + * tests/misc/pr.pl: Refactor this test into ... + * tests/pr/pr-tests.pl: ... here. + * tests/local.mk: Remove the reference to the removed test + Improved by Jim Meyering + +2012-10-24 Mike Frysinger + + build: do not redefine _FORTIFY_SOURCE + When _FORTIFY_SOURCE is defined by the compiler or via flags, as + it is on Gentoo, do not override it. Otherwise we get many + redefinition warnings. + + * configure.ac (FORTIFY_SOURCE): Check if _FORTIFY_SOURCE is defined. + This addresses http://bugs.gnu.org/12714 + +2012-10-23 Pádraig Brady + + 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.20 + * NEWS: Record release date. + +2012-10-23 Jim Meyering + + factor: add comments + * src/factor.c (is_square): Use active voice in comment, not passive. + (factor): Add function-describing comment. + (mp_factor): Likewise. + +2012-10-23 Pádraig Brady + + build: avoid warnings about unused variables and macros + src/factor.c (__GMP_DECLSPEC): Move back from longlong.h + to treat consistently with other stub macros. + (__GMP_GNUC_PREREQ): Reference to avoid -Wunused-macros warning. + (__GMP_DECLSPEC): Likewise. + (ASSERT): Likewise. + (__clz_tab): Likewise. + (factor_using_division): Mark a variable as unused. + (mulredc): Likewise. + (mulredc2): Likewise. + (divexact_21): Likewise. + + build: avoid compile warnings in factor.c on some systems + * src/factor.c (factor_using_pollard_rho2): On some systems + (like sparc) we need to promote all addmod2() parameters + to uintmax_t to avoid warnings. + + build: avoid build failure on some sparc systems + * src/longlong.h: Restrict some sparc assembly variants + to sparc V9. This was seen to be an issue with newer + sparc systems with default gcc CPU options. + + tests: correctly restrict factor test without GMP + * tests/misc/factor.pl: Correct the precedence and + regular expression in the command to check for GMP. + +2012-10-21 Jim Meyering + + doc: NEWS: the cp bug affects mv and install, too + * NEWS (Bug fixes): Note that the copy-induced corruption but affects + mv (sometimes) and install, too. Pointed out by Bernhard Voelker. + +2012-10-19 Benno Schulenberg + + doc: remove a stray parenthesis from 'cp --force' description + * doc/coreutils.texi (cp invocation): Remove Cheshire Cat. + +2012-10-17 Jim Meyering + + build: update gnulib submodule to latest + + cp: avoid data-corrupting free-memory-read + * src/extent-scan.c (extent_scan_read): Reset our last_ei + pointer whenever the parent buffer might have just been freed. + * tests/cp/fiemap-extent-FMR.sh: New test. + * tests/local.mk (all_tests): Add it. + * NEWS (Bug fixes): Mention it. + Reported by Mike Gerth in http://bugs.gnu.org/12656, and with + help from Alan Curry. Bug introduced in commit v8.10-60-g18f5a85. + +2012-10-13 Nikolas Kallis (tiny change) + + doc: improve HACKING guidelines + * HACKING: Add "cd coreutils" after the git clone command. + +2012-10-09 Pádraig Brady + + factor: fix integer validation and GMP fallback + In the recent factor rewrite, the GMP code + wasn't actually used; just an error was printed + on integer overflow. While fixing that it was noticed + that correct input validation wasn't done in all cases + when falling back to the GMP code. + + * src/factor.c (print_factors) Fallback to GMP on overflow. + (strto2uintmax): Scan the string for invalid characters, + so that case can be detected independently of overflow. + Return an error when an empty string is passed. + Also allow leading spaces and '+' in input numbers. + * tests/misc/factor.pl: Ensure the GMP code is exercised + when compiled in. Also add a test to verify leading + spaces and '+' are allowed. + +2012-10-08 Pádraig Brady + + build: support older GMP versions + The new factor code introduced usage of mpz_inits() and + mpz_clears(), which are only available since GMP >= 5, + and will result in a compile error when missing. + + * m4/gmp.m4 (cu_GMP): Define HAVE_DECL_MPZ_INITS appropriately. + * src/factor (mpz_inits): New function, defined where missing. + (mpz_clears): Likewise. + +2012-10-07 Jim Meyering + + maint: avoid warning from gcc's -Wunused-macros + On some systems, -Wunused-macros would warn about two macros: + src/factor.c:148:0: warning: macro "__clz_tab" is not used + src/factor.c:126:0: warning: macro "UHWtype" is not used + * src/factor.c: Add a use to placate gcc. + +2012-10-05 Jim Meyering + + build: avoid link failure when strerror is replaced + When building the new make-prime-list program on a system for which + strerror is defined to rpl_strerror, we'd get a link failure. + The problem is that we're including for some definitions, + but do not want the rpl_ ones, since this particular program must + not be linked against gnulib (aka libcoreutils.a). This did not + arise on Fedora 17 or 18, but did on Debian wheezy/sid. + * src/make-prime-list.c (strerror): #undef. + Build failure introduced by commit v8.19-152-gcf67e4c. + +2012-10-04 Jim Meyering + + factor: 25% speed-up, on output + * src/factor.c (print_factors_single): Use fputs and umaxtostr + rather than printf with "%ju". This reduced the time required + to compute and print the factors of the first 10^7 integers from + over 8 seconds to 5.75s. Run this command: + seq $((10**7)) | env time factor > /dev/null + +2012-10-04 Jim Meyering + + factor: merge with preexisting factor; integrate tests; avoid warnings + * src/factor.c: Renamed from factor-ng.c, with the following changes: + Adjust copyright header to be consistent with others. + Use xmalloc and xrealloc, to avoid segv upon OOM. + Switch back to using readtokens to handle input. + Diagnose invalid inputs. + s/fprintf+exit/error/ + (print_factors): Add comments. + (strto2uintmax): Return strtol_error, not int. + (read_item): Remove, no longer used. + (main): Use atexit(close_stdout) so that we don't ignore failed write. + * cfg.mk: Exempt src/longlong.h from several tests. + Exempt run.sh from the test-list-consistency test. + Exempt make-prime-list.c from numerous tests, since we won't + be making it conform: it must not link with libcoreutils.a. + Exempt factor-ng.c from the no-upper-case error message test. + * AUTHORS (factor): Add Torbjörn and Niels. + * tests/local.mk (factor_tests): Encode the 37 tests. + ($(factor_tests)): Rule to generate a test script for each test. + * tests/factor/run.sh: New script, marked as very expensive. + * .gitignore: Ignore new generated files. + * src/local.mk (src/primes.h): New rule. + (noinst_PROGRAMS): Add make-prime-list. + (noinst_HEADERS): Add longlong.h. + Remove all wheel-related rules and files. + * src/wheel-gen.pl: Remove file. + + maint: mark set-but-not-used variables with ATTRIBUTE_UNUSED + * src/factor-ng.c (redcify, prime_p, isqrt2): Mark them, so we + don't have to disable -Wunused-but-set-variable. + + maint: use __builtin_expect only if __GNUC__ + * src/factor-ng.c (LIKELY, UNLIKELY) [__GNUC__]: Add #ifdef guard. + + build: avoid warning about unused macro + * src/factor-ng.c (__GMP_DECLSPEC): Don't define here + * src/longlong.h (__GMP_DECLSPEC): Define if not already defined. + +2012-10-04 Niels Möller + Torbjörn Granlund + + factor: more improvements + * src/factor-ng.c: Import some improvements from + http://gmplib.org:8000/factoring + +2012-10-04 Torbjörn Granlund + Niels Möller + + factor: new much-improved implementation; not yet integrated + * src/factor-ng.c: New file, from nt-factor. + * src/longlong.h: New file. + * NEWS (Improvements): Mention the upcoming improvements. + +2012-10-04 Jim Meyering + + maint: make-prime-list: syntax conventions; be robust for large N + * src/make-prime-list.c: Insert spaces before parens. + (main): Abort if the 8-delta value ever exceeds 255. + + maint: make-prime-list: do not ignore write failure + Even though this is just a helper program that is run solely to create + primes.h, it should not ignore a write failure. Normally we would + simply call atexit (close_stdout), but we cannot do that from this + helper program, since it must be built before the generated header, + primes.h. If we were to make the linking of make-prime-list depend + on libcoreutils.a, that would add all lib/*.o files to the list + of dependents of $(BUILT_HEADERS). Then, since there is currently no + provision to ensure that a file like lib/stdio.h (another built header) + is built before the first lib/*.o file that also includes , + some lib/*.o files would be built before lib/stdio.h and some after. + The former would provoke link failures due to undefined rpl_* functions. + * src/make-prime-list.c: Include . + (fclose): Undef, so that a definition to rpl_fclose does not + cause a link failure. + (main): Per the above, in this exceptional case, we check for fclose + and ferror failure manually, and don't worry about the ferror-only + failure case in which errno may not be relevant. + + maint: make-prime-list: avoid -Wsuggest-attribute=const warning + * src/make-prime-list.c: Include . + (binvert): Add _GL_ATTRIBUTE_CONST. + +2012-10-04 Torbjörn Granlund + Niels Möller + + factor: prepare for the new factor program + * src/make-prime-list.c: New file, from nt-factor. + +2012-10-03 Jim Meyering + + build: remove redundant dependency: $(PROGRAMS): lib/libcoreutils.a + * src/local.mk: Remove the above dependency. + A soon-to-be-added new program, make-prime-list, must not depend + on that, since it is used to create a BUILT_SOURCES file. + That dependency is already handled via the ..._LD_ADD variables, + and so that redundant dependency has so far been harmless. + +2012-09-30 Jim Meyering + + du: avoid abort on systems for which ->me_type is not malloc'd + On some systems (notably, BSD-based, like at least OpenBSD 4.9), + the me_type member does not come from the heap. + * src/du.c (fill_mount_table): Free the ->me_type member only + when it was malloc'd, i.e., when ->me_type_malloced is nonzero. + Bug introduced via commit v8.19-2-gcf7e1b5. + Reported as http://bugs.gnu.org/12542. + +2012-09-29 Jim Meyering + + doc: same correction, but now in texinfo documentation + * doc/coreutils.texi (nice invocation): s/nicenesses/niceness values/ + +2012-09-28 Jim Meyering + + doc: correct an old bit of ugliness in nice --help output + * src/nice.c (usage): s/Nicenesses/Niceness values/ + +2012-09-28 Pádraig Brady + + doc: disambiguate the niceness explanation in nice --help + * src/nice.c (usage): Specify the entity (process) that + that relative terms are referring to. + * THANKS: Update. + Reported-by: David Diggles + +2012-09-28 Ondrej Oprala + + cp: fix the --no-preserve=mode option + The --no-preserve=mode option did not do what its name implies: + it would mistakenly preserve permission mode bits. + * NEWS: Mention the fix. + * TODO: Remove an entry. + * src/copy.c (copy_reg): Add a condition to properly + handle the --no-preserve=mode option for files + (copy_internal): Add a condition to properly handle the + --no-preserve=mode option for directories. + * src/copy.h (struct cp_options): Add a new boolean. + * src/cp.c (cp_option_init,decode_preserve_arg): Set the + new boolean value according to specified options. + * src/install.c (struct cp_options): Initialize the new boolean. + * src/mv.c (struct cp_options): Initialize the new boolean. + * tests/cp/preserve-mode.sh: Add a new test. + * tests/cp/link-preserve.sh (-a --no-preserve=mode): Adjust the + expected perms: now, --no-preserve=mode overrides the --preserve=mode + that is inherent in -a, as it should. + * tests/local.mk: Add the new test to the list. + +2012-09-24 Pádraig Brady + + timeout: handle signals more transparently + This was originally attempted in commit v8.12-117-g5a647a0, + but reverted before release because of the unreliability + of disabling core dumps using setrlimit() on Linux kernels. + This new version instead uses prctl() where available to + more reliably disable core dumps for the timeout process. + + * m4/jm-macros.m4: Define HAVE_SETRLIMIT and HAVE_PRCTL. + * src/timeout.c (disable_core_dumps): A new function + that disables coredumps using prctl or setrlimit if available. + (main): If the child exited with a signal and we can + disable core dumps, then raise that signal to the timeout + process itself, so that callers may also see the signal status. + Also print a message indicating when the monitored command + dumped core, as that information is lost in the signal + propagation through timeout. + +2012-09-24 Pozsár Balázs + + dd: new option, status=none to suppress output statistics + * src/dd.c (STATUS_NONE): A new bitmask combining all STATUS_ + options, thus used to suppress all informational output. + (struct symbol_value statuses): Expose the "none" option, + corresponding to the STATUS_NONE bitmask above. + (print_stats): Return early if STATUS_NONE is specified. + Also move the call to gethrxtime() down so that it's only + called when needed. + (usage): Describe the new options. + * doc/coreutils.texi (dd invocation): Likewise. + * NEWS: Mention the new feature. + * tests/dd/misc.sh: Ensure the new option works. + +2012-09-23 Jim Meyering + + tail,stat: improve support for vmhgfs + Teach tail -f that it must use polling on vmhgfs file systems, and + let stat -f --format=%T report the file system type name, "vmhgfs". + * src/stat.c (human_fstype): Add a case: vmhgfs, 0xbacbacbc, remote. + * NEWS (Improvements): Mention it. + * THANKS.in: Update. + Reported by Daniel Tschinder in http://bugs.gnu.org/12461. + +2012-09-20 Jim Meyering + + build: move non-recursive-gnulib-prefix-hack to gnulib; update + I've moved the non-recursive-gnulib-prefix-hack module to + gnulib, with two small improvements, so remove it from here + and update gnulib to the latest. + * gl/build-aux/prefix-gnulib-mk: Remove file. + * gl/m4/non-recursive-gnulib-prefix-hack.m4: Remove file. + * gl/modules/non-recursive-gnulib-prefix-hack: Remove file. + * gnulib: Update to latest. + +2012-09-19 Jim Meyering + + rm: be even more careful when using a replacement errno value + * src/remove.c (excise): The change in commit v8.19-107-gccbd3f3 made + the "rm -rf D" (for unreadable dir, D) diagnostic worse on Solaris 10: + -rm: cannot remove 'D': Permission denied + +rm: cannot remove 'D': File exists + That happened because unlinkat would fail with EEXIST there, given + an unreadable directory, which made the two tests, tests/rm/unread2 + and tests/rm/unreadable fail. Accommodate the EEXIST case, too. + + maint: fix a comment typo + * cfg.mk: Fix comment typo: s/recursive/non-recursive/ make + +2012-09-18 Jim Meyering + + tests: cp/link-heap: avoid new failure on rawhide + * tests/cp/link-heap.sh: Increase virtual memory limit by 2000KiB -- + from 20,000 to 22,000 KiB -- to avoid a new failure on rawhide. + + maint: make the tight-scope syntax-check rule work again + * cfg.mk: Configure a few variable to make the tight-scope rule work. + * gnulib: Update submodule to latest. + +2012-09-18 Benno Schulenberg + + dd: remove references to the word BLOCKS from help and texi docs + The renaming from BLOCKS to N was done in v8.15-38-g140eca1, + and documentation for N was added again in v8.17-26-g4f2e9d5 + without noticing that. Now, finally remove the word BLOCKS + from the documentation. + + * src/dd.c (usage): Remove the word BLOCKS. + * doc/coreutils.texi (dd invocation): Likewise. + + Improved by: Bernhard Voelker + +2012-09-18 Jim Meyering + + doc: NEWS: mention the conversion to non-recursive make + * NEWS (Build-related): Mention the non-recursive make improvement. + Improved by: Pádraig Brady + +2012-09-16 Pádraig Brady + + ls: fix coloring of dangling symlinks in default listing mode + When listing a directory containing dangling symlinks, + and not outputting a long format listing, and orphaned links + are set to no coloring in LS_COLORS, then the symlinks + would get no color rather than reverting to the standard + symlink color. The issue was introduced in v8.13-19-g84457c4 + + * src/ls.c (print_color_indicator): Use the standard method + to check if coloring is specified for orphaned symlinks. + The existing method would consider 'or=00' or 'or=0' as significant + in LS_COLORS. Even 'or=' was significant as in that case the + string='or=' and the length=0. Also apply the same change + for missing symlinks for consistency. + (gobble_file): Remove the simulation of linkok, which is only + tested in print_color_indicator() which now handles this directly + by keying on the LS_COLORS values correctly. + * tests/misc/ls-misc.pl: Add a test case. + * THANKS: Add the reporter. + * NEWS: Mention the fix. + Reported-by: David Matei + +2012-09-15 Jim Meyering + + doc: update seq description + * doc/coreutils.texi (seq invocation): Update an example and mention + that with the new constraints, seq can print arbitrarily large numbers. + +2012-09-14 Pádraig Brady + + seq: enable the fast integer printing code in more cases + * src/seq.c (main): Adjust the initial arbitrary precision + seq_fast enablement checks to be more maintainable, and + a little more general, by allowing single character + separators to use seq_fast. + Also check again after the number arguments are processed, + to see if we can still use seq_fast, which while not + allowing arbitarly large integers, it will handle + integers of the form 10E10 etc. + (seq_fast): Use a specified separator character, + rather than hardcoding '\n'. + +2012-09-14 Jim Meyering + + build: do not rely on automake's AM_TESTS_ENVIRONMENT + * tests/local.mk (TESTS_ENVIRONMENT): Rename from AM_TESTS_ENVIRONMENT, + since it is not honored in automake-1.11.3 after all. + This reverts commit v8.19-38-g34c9c8f. For now, I'll leave + the following commit that made bootstrap.conf require 1.11.2. + Prompted by a report of test failure from Pádraig Brady. + + build: don't prefix the RHS of "GPERF = ..." with "lib/" + * gl/build-aux/prefix-gnulib-mk (prefix_assignment): Exempt + the RHS of a "GPERF = ..." assignment from lib/ prefixing. + +2012-09-14 Jim Meyering + + seq: 70x faster for non-negative whole numbers and incr==1 + Handle non-negative whole numbers robustly and efficiently when + the increment is 1 and when no format-changing option is specified. + On the correctness front, for very large numbers, seq now works fine: + + $ b=1000000000000000000000000000 + $ src/seq ${b}09 ${b}11 + 100000000000000000000000000009 + 100000000000000000000000000010 + 100000000000000000000000000011 + + while the old one would infloop, printing garbage: + + $ seq ${b}09 ${b}11 | head -2 + 99999999999999999997315645440 + 99999999999999999997315645440 + + The new code is much more efficient, too: + Old vs new: 55.81s vs 0.82s + + $ env time --f=%e seq $((10**8)) > /dev/null + 55.81 + $ env time --f=%e src/seq $((10**8)) > /dev/null + 0.82 + + * seq.c (incr): New function, inspired by the one in cat.c. + (cmp, seq_fast): New functions, inspired by code in nt-factor + by Torbjörn Granlund and Niels Möller. + (trim_leading_zeros): New function, without which cmp would malfunction. + (all_digits_p): New function. + (main): Hoist the format_str-vs-equal_width check to precede first + treatment of operands, and insert code to call seq_fast when possible. + * NEWS (Bug fixes): Mention the correctness fix. + (Improvements): Mention the speed-up. + * tests/misc/seq.pl: Exercise the new code. + + Improved by: Bernhard Voelker. + http://thread.gmane.org/gmane.comp.gnu.coreutils.general/3340 + +2012-09-14 Jim Meyering + + tests: reenable "make -C tests ..." commands + The README-documented way to run individual tests was invalidated + by the conversion of tests/ to non-recursive make. Add a GNUmakefile + shim to reenable that usage. + * tests/GNUmakefile: New file, so that "make -C tests ..." works + like it did before the conversion of tests/ to non-recursive build. + Reported by Bernhard Voelker. + * Makefile.am (EXTRA_DIST): Add it. + * cfg.mk (sc_prohibit_tab_based_indentation): Also exempt any + GNUmakefile from this syntax-check. + +2012-09-12 Stefano Lattarini + + build: fixup: correctly recognize if perl is missing + * configure.ac: Here, by adding a missing '*' to the wildcard in + a 'case' construct over the contents of $PERL. Introduced in + commit v8.19-41-g00f5ba1. + +2012-09-12 Bernhard Voelker + + maint: mbsalign.h: fix typo from previous comment edit + * gl/lib/mbsalign.h: Fix comment typo. + +2012-09-11 Jim Meyering + + build: build lib/ using non-recursive make + * bootstrap.conf (gnulib_modules): Use the new module. + (bootstrap_post_import_hook): Invoke prefix-gnulib-mk. + * configure.ac (AC_CONFIG_FILES): Remove lib/Makefile. + * lib/Makefile.am: Renamed... + * lib/local.mk: ...to this. + * src/local.mk (CLEANFILES): Append, don't set. + (noinst_LIBRARIES): Likewise. + (AM_CPPFLAGS): Don't set this here. + * Makefile.am (AM_CPPFLAGS): Define here instead. + (noinst_LIBRARIES, CLEANFILES, MOSTLYCLEANDIRS, MOSTLYCLEANFILES): + Initialize here, so we can append to them from each included local.mk + (SUBDIRS): Remove "lib". + +2012-09-11 Jim Meyering + + build: handle @ALLOCA@-vs-non-recursive make problems + Here is a good reason to avoid alloca with non-recursive make. These: + + $ grep @ALLOCA lib/gnulib.mk + lib_libcoreutils_a_LIBADD += lib/@ALLOCA@ + lib_libcoreutils_a_DEPENDENCIES += lib/@ALLOCA@ + + would lead to this, when @ALLOCA@ expands to the empty string, + which is essentially "always", now: + + $ grep ' lib/$' Makefile + lib_libcoreutils_a_LIBADD = $(gl_LIBOBJS) lib/ + lib_libcoreutils_a_DEPENDENCIES = $(gl_LIBOBJS) lib/ + + Tell the prefix-adding script not to add a prefix when the word it's + prefixing is "@ALLOCA@". That is fine for most cases, but what about + when the expansion of @ALLOCA@ is nonempty? + + * build-aux/prefix-gnulib-mk (prefix_word): Exclude @ALLOCA@. + * gl/m4/non-recursive-gnulib-prefix-hack.m4: Prefix non-empty + $ALLOCA with "lib/". FIXME: I'm not sure this is required, + now that we... + Use AC_CONFIG_LIBOBJ_DIR([lib]). + Without using AC_CONFIG_LIBOBJ_DIR([lib]), automake (not autoconf) + would complain of failure to find aclocal.c, due to the use of + AC_LIBSOURCES(alloca.c). + +2012-09-11 Jim Meyering + + build: new module to convert lib/ to non-recursive make + * gl/modules/non-recursive-gnulib-prefix-hack: New module. + * gl/m4/non-recursive-gnulib-prefix-hack.m4: + (gl_NON_RECURSIVE_GNULIB_PREFIX_HACK): This is the snippet + that this module inserts near the end of configure. + * gl/build-aux/prefix-gnulib-mk: New script, from bison. + Changes from the code in bison: + (prefix_assignment): Split a long line. + (prefix): Add trailing slashes to avoid a single false match. + Prefix imaxtostr.c and the other *tostr.c file names manually. + Also, use $prefix in place of hard-coded "lib/". + +2012-09-11 Bernhard Voelker + + maint: gen-lists-of-programs.sh: fix typo from previous comment edit + * build-aux/gen-lists-of-programs.sh: Fix comment typo. + +2012-09-11 Pádraig Brady + + maint: add more control flags to mbsalign + * gl/lib/mbsalign.h: Add MBA_UNIBYTE_ONLY (to allow + faster processing). Also add MBA_NO_LEFT_PAD, MBA_NO_RIGHT_PAD + to give greater control of padding, useful with the first + or last fields on a line. + * gl/lib/mbsalign.c (mbsalign): Implement the new flags. + * gl/tests/test-mbsalign.c (main): Test combinations + of the new flags. + +2012-09-10 Jim Meyering + + maint: allow per-directory CFLAGS settings with non-recursive make + * src/local.mk (AM_CFLAGS): Don't use $(WARN_CFLAGS) here. + * cfg.mk (src_CFLAGS, lib_CFLAGS, gnulib-tests_CFLAGS): Define here + instead. + (AM_CFLAGS): Augment using the above. + * configure.ac: Note that the configure-time option, + --enable-gcc-warnings now functions only when using GNU make. + Well, currently it does still work in gnulib-tests, but that should + soon be fixed. + Improved-by: Stefano Lattarini + + maint: gen-lists-of-programs.sh: improve comments + * build-aux/gen-lists-of-programs.sh: Improve comments. + + build: do not require help2man at build-from-tarball time + But do retain full dependencies when building from a git clone. + We do this by converting the full dependency (of the .1 file on + the binary we run with --help) into a dependency on the .c file. + * Makefile.am (do-not-require-help2man): New rule. + (dist-hook): depend on it. + + build: fix a minor man-page generation dependency error + * man/local.mk (man/dir.1): Depend on src/dir, not src/ls. + + maint: move the last coreutils-specific files from lib/ to gl/ + Convert the few remaining coreutils-specific files in lib/ to + gnulib-style modules under gl/, removing their corresponding .m4 + files, since the information recorded in those files is better + stored in module-description file in gl/modules/. + * bootstrap.conf (gnulib_modules): Add new modules: + fd-reopen, buffer-lcm, xfts, strnumcmp. + * gl/lib/buffer-lcm.c: Renamed from the file in lib/. + * gl/lib/buffer-lcm.h: Likewise. + * gl/lib/fd-reopen.c: Likewise. + * gl/lib/fd-reopen.h: Likewise. + * gl/lib/strintcmp.c: Likewise. + * gl/lib/strnumcmp-in.h: Likewise. + * gl/lib/strnumcmp.c: Likewise. + * gl/lib/strnumcmp.h: Likewise. + * gl/lib/xfts.c: Likewise. + * gl/lib/xfts.h: Likewise. + * gl/modules/buffer-lcm: New module-description file. + * gl/modules/fd-reopen: Likewise. + * gl/modules/strnumcmp: Likewise. + * gl/modules/xfts: Likewise. + * m4/fd-reopen.m4: Remove, no longer needed. + * m4/strnumcmp.m4: Likewise. + * m4/xfts.m4: Likewise. + * m4/prereq.m4: Do not AC_REQUIRE the m4 functions from + our just-removed m4/*.m4 files. + + maint: move gl/m4/root-dev-ino.m4 contents into its module definition + We can get the same effect using the modules file. + * gl/m4/root-dev-ino.m4: Remove file. + * gl/modules/root-dev-ino (Depends-on): Add lstat. + (Files): Remove m4/root-dev-ino.m4. + (Makefile.am) [lib_SOURCES]: Add root-dev-ino.c and root-dev-ino.h. + (configure.ac): Remove reference to gl_ROOT_DEV_INO. + +2012-09-08 Jim Meyering + + maint: adjust ChangeLog to correct Author + * build-aux/git-log-fix: Add an entry to correct the Author: + of v8.19-111-g51a4b04. It should be Ondrej Oprala, not me. + +2012-09-07 Jim Meyering + + factor: NEWS and tests + * NEWS (Bug fixes): Mention it. + * tests/misc/factor.pl: Add five of Torbjörn's tests. + +2012-09-07 Torbjörn Granlund + + factor: don't ever declare composites to be prime + The multiple-precision factoring code (with HAVE_GMP) was copied from + a now-obsolete version of GMP that did not pass proper arguments to + the mpz_probab_prime_p function. It makes that code perform no more + than 3 Miller-Rabin tests only, which is not sufficient. + + A Miller-Rabin test will detect composites with at least a probability + of 3/4. For a uniform random composite, the probability will actually + be much higher. + + Or put another way, of the N-3 possible Miller-Rabin tests for checking + the composite N, there is no number N for which more than (N-3)/4 of the + tests will fail to detect the number as a composite. For most numbers N + the number of "false witnesses" will be much, much lower. + + Problem numbers are of the form N=pq, p,q prime and (p-1)/(q-1) = s, + where s is a small integer. (There are other problem forms too, + involving 3 or more prime factors.) When s = 2, we get the 3/4 factor. + + It is easy to find numbers of that form that cause coreutils' factor to + fail: + + 465658903 + 2242724851 + 6635692801 + 17709149503 + 17754345703 + 20889169003 + 42743470771 + 54890944111 + 72047131003 + 85862644003 + 98275842811 + 114654168091 + 117225546301 + ... + + There are 9008992 composites of the form with s=2 below 2^64. With 3 + Miller-Rabin tests, one would expect about 9008992/64 = 140766 to be + invalidly recognized as primes in that range. + + * src/factor.c (MR_REPS): Define to 25. + (factor_using_pollard_rho): Use MR_REPS, not 3. + (print_factors_multi): Likewise. + * THANKS.in: Remove my name, now that it will be automatically + included in the generated THANKS file. + +2012-09-07 Ondrej Oprala + + tests: improve checks for setuidgid-using root-only tests + * init.cfg (setuidgid_has_perm_): New function. + (require_root_): Use it. + Improved-by: Bernhard Voelker + * NEWS (Build-related): Mention the improvement. + +2012-09-06 Eric Blake + + build: default to --enable-gcc-warnings for git tree + Anyone developing on coreutils can be assumed to have a new enough + environment, such that enabling gcc warnings by default will be + useful. Tarballs still default to no warnings, and the defaults + can still be overridden with --disable-gcc-warnings. + + * configure.ac (gl_gcc_warnings): Set default based on environment. + Suggested by Bernhard Voelker. + +2012-09-06 Pádraig Brady + + nproc: disallow non option command line parameters + * src/nproc.c (main): Error if any non option parameters. + * NEWS: Mention the change in behavior. + +2012-09-06 Jim Meyering + + tail,stat: add support for VZFS + * src/stat.c (human_fstype): Add a case: vzfs, 0x565A4653 (local). + Reported by Jens Rosenboom in http://bugs.gnu.org/12356 + * NEWS (Improvement): Mention it. + +2012-09-05 Jim Meyering + + rm: be more careful when using a replacement errno value + * src/remove.c (excise): Tighten the test for when we defer to an + old errno value: instead of relying solely on an FTS_DNR (unreadable + directory) failure, also test current and replacement errno values. + This change would also have solved the problem addressed by commit + v8.19-106-g57dd067. For more info, see http://bugs.gnu.org/12339#113 + + rm: avoid bogus diagnostic for a slash-decorated symlink-to-dir + These commands would evoke an invalid diagnostic: + $ mkdir d && ln -s d s && env rm -r s/ + rm: cannot remove 's': Too many levels of symbolic links + remove.c was stripping trailing slashes from "s/" before passing + the name to "rm". But a trailing slash may change the semantics, + and thus should not be stripped. + * src/remove.c (rm_fts): Do not strip trailing slashes. + * tests/rm/v-slash.sh: Adapt to new expected output. + * gnulib: Update to latest, for an improved fts.c that merely + normalizes trailing slashes. + Reported by Paul Eggert in discussion of http://bugs.gnu.org/12339 + + tests: depend on the programs we're testing + * tests/local.mk ($(TEST_LOGS)): Depend on $(PROGRAMS), so that + tests are rerun when any program is rebuilt. Technically, we could + specify precisely which few programs are dependents of each test, + but that can come later, if deemed worth the trouble and maintenance + burden. Also, there is the issue of the primary program(s) being + tested (i.e., those itemized via print_ver_) versus those that are + tested incidentally: for example, nearly every test exercises "rm" + when its clean-up code removes files. + +2012-09-05 Stefano Lattarini + + maint: fix a spurious syntax-check failure + * cfg.mk (exclude_file_name_regexp--sc_file_system): Exempt + 'init.cfg', not 'tests/init.cfg'. + + tests: more resilient about tainted absolute srcdir path + * tests/init.cfg (stty_reversible_init_): Quote '$abs_top_srcdir' + properly. + (fiemap_capable_): Quote '$abs_srcdir' properly. + (require_dirent_d_type_): Likewise. + + maint: fix syntax checks 'sc_root_tests' + * cfg.mk: Don't work by trying to parse the (now gone) file + 'tests/Makefile.am'; rather, use the contents of the make variable, + $(all_root_tests), introduced few commits ago. + Fix a few unrelated cosmetic issues while at it. + + maint: avoid a spurious syntax-check error + * cfg.mk (exclude_file_name_regexp--sc_prohibit_test_backticks): Exempt + 'tests/local.mk' rather than 'tests/Makefile.am'. + +2012-09-05 Stefano Lattarini + + maint: vc_exe_in_TESTS should actually be a syntax check + Because it requires the presence of the '.git' directory, that is, + can be run only for maintainers working from checked-out sources. + + * tests/local.mk (vc_exe_in_TESTS): Rename and move ... + * cfg.mk (sc_tests_list_consistency): ... here, with minor adjustments. + +2012-09-05 Stefano Lattarini + + build: remove two now-useless convenience targets + * src/local.mk (built_programs.list, all_programs.list): These. + + tests: put test-suite.log back in 'tests/' + * tests/local.mk (TEST_SUITE_LOGS): Define to 'tests/test-suite.log'. + + build: don't use recursive make for tests/ subdirectory + * Makefile.am (SUBDIRS): Remove 'tests'. + (include): The '$(top_srcdir)/tests/local.mk' file. + (check-root): Remove this convenience target, it's no longer needed + now that the "real" check-root target once in 'tests/Makefile' will + land in the top-level makefile. + * configure.ac (AC_CONFIG_FILES): Remove 'tests/Makefile'. + * tests/Makefile.am: Rename ... + * tests/local.mk: ... like this, with a lot of adjustments. + * tests/init.cfg: Move ... + * init.cfg: ... here. This is necessary, for a limitation of the + gnulib-provided 'tests/init.sh', which unconditionally look for + 'init.cfg' in the $(srcdir) directory. + * tests/*/*.sh: Adjust: expect init.sh to be in '$srcdir/tests', + not in '$srcdir', and extend $PATH with './src', not with '../src'. + * tests/Coreutils.pm: Adjust similarly. + * tests/pr/pr-tests.pl ($pfx): Likewise. + +2012-09-05 Stefano Lattarini + + maint: list of names of built programs available in the Makefiles + This is just a preparatory refactoring in view of future changes. + + * configure.ac (AC_SUBST): New 'built_programs'. + * tests/Makefile.am (AM_TESTS_ENVIRONMENT): Simply define the exported + variable 'built_programs' to the expansion of the '$(built_programs)' + AC_SUBST'd make variable. + (.built-programs): Remove this now-unneeded convenience target. + (CLEANFILES, check_DATA): Delete, no longer needed. + +2012-09-05 Stefano Lattarini + + maint: remove anachronistic syntax-check + * cfg.mk (sc_no_exec_perl_coreutils): This. Our new testsuite + layout (perl tests having '.pl' suffix, shell tests having '.sh' + suffix) makes it basically impossible to run into the issue this + check guarded against. + + maint: remove duplicated declaration of the 'sc_check-AUTHORS' target + * cfg.mk: Here. + +2012-09-05 Stefano Lattarini + + tests: remove the unused 'root-hint' target + * tests/Makefile.am (root-hint): Here. The interested user can see + the reasons why some tests are skipped by looking at the messages + they display on the console; here's an excerpt: + + ... + PASS: misc/id-groups.sh + id-setgid.sh: skipped test: must be run as root + SKIP: misc/id-setgid.sh + PASS: misc/md5sum.pl + ... + PASS: df/total-verify.sh + 2g.sh: skipped test: very expensive: disabled by default + SKIP: du/2g.sh + ... + + Clear enough, and more specific and precise that a generic "some tests + might need to be run as root" message. And if that user is interested + in making those tests run anyway, he'll just take a look to the README + files to look for info. So there's no reason to pollute the stdout + with another "hint" that is subsumed by those messages, and that might + go unnoticed anyway. + + Moreover, and possibly more importantly, that hint wasn't being + displayed anyway, even before this change! That's because the + 'root-hint' target was listed as prerequisite for the 'check-recursive' + target, which however was not a dependency of the 'check' target in + 'tests/Makefile.am', because that file contains no $(SUBDIRS) + definition. + +2012-09-05 Stefano Lattarini + + tests: use suffix, not exec-bit, to tell which files are tests + * tests/Makefile.am (vc_exe_in_TESTS): Adjust to look, in the 'tests/' + subdirectory, for files that have one of the extensions listed in + $(TEST_EXTENSIONS), rather than for executable files. + + maint: make vc_exe_in_TESTS also work in VPATH builds + * tests/Makefile.am (vc_exe_in_TESTS): It is easy to adjust this + recipe to also work in VPATH setups, also thanks to modifications + done by previous changes. + + maint: remove useless dependency for vc_exe_in_TESTS + * tests/Makefile.am (vc_exe_in_TESTS): No need to depend on Makefile: + this target is .PHONY, so it is always run anyway. + + maint: avoid parsing of Makefile.am from vc_exe_in_TESTS + * tests/Makefile.am (TESTS): Rename ... + (all_tests): ... like this, so that we'll still be able to know the + complete list of our tests even if the user overrides TESTS from the + command line (which he's allowed to do by the test harness API). + (root_tests): Rename ... + (all_root_tests): ... like this, for similar reasons. + (TESTS, root_tests): Redefine their defaults to to $(all_tests) and + $(all_root_tests) respectively. + (vc_exe_in_TESTS): It can now safely use $(all_tests) to get the + complete list of test cases according to the Makefile, instead of + having to resort to "parsing" of Makefile.am. + (EXTRA_DIST): Use $(all_tests), not $(TESTS). + (v_, w_): Delete, no longer needed. + + build: use 'check-local' to extend the 'check' target + * tests/Makefile.am (check-local): Here, by making this depend + on 'vc_exe_in_TESTS' ... + (check): ... rather than making this depend on them. While the old + usage worked, it relied on an implementation detail rather than on + documented behavior. + * src/local.mk (check-local): Similarly, make this depend on + 'check-README' and 'check-duplicate-no-install' ... + (check): ... rather than on this. + +2012-09-02 Stefano Lattarini + + scripts: autotools-install: allow user-specified make program + * scripts/autotools-install: Honor $MAKE. This might be useful + on systems where the make implementation available in $PATH + by default is limited (Solaris) or broken (HP-UX). + + scripts: autotools-install: style and portability fixes + * scripts/autotools-install: Here. + +2012-09-02 Benno Schulenberg + + touch: line up long option in --help text + * src/touch.c (usage): Indent --time=... to line up with all of the + other long options. + +2012-09-02 Jim Meyering + + maint: disable sc_proper_name_utf8_requires_ICONV test + It would still pass, but would print many diagnostics like this: + Can't open src/Makefile.am: No such file or directory. + * cfg.mk (local-checks-to-skip): Temporarily disable a test. + This test will need to be adapted to work with a non-recursive + build set-up, in which there is no Makefile.am alongside each program. + Reported by Bernhard Voelker. + + maint: accommodate upcoming, expanded list of warnings from gnulib + * configure.ac: Disable a new gcc warning, -Wsuggest-attribute=format, + since it triggers on copy.c (which I'm not inclined to adjust) and + factor.c's use of vfprintf which would appear to require a change + to stdio.h. + +2012-09-01 Stefano Lattarini + + maint: fix build_programs definition not to use "make -C src ..." + * dist-check.mk (built_programs): There's no need to issue recursive + make calls in 'src/' to define this (in fact, that works no longer + now that 'src/Makefile.am' is gone). Simply define this to the sorted + contents of $(bin_PROGRAMS), with the 'src/' prefix and the $(EXEEXT) + suffix (if any) removed. Reported by Jim Meyering. + +2012-09-01 Jim Meyering + + build: restore handling of space-tainted build directory name + * man/local.mk: With commit v8.19-84-g08cf455, man page creation + would fail when using a build directory name containing e.g., + spaces. + + build: make each man/prog.1 depend on src/prog, not src/prog.c + * man/local.mk: Creating a prog.1 man page requires running + src/prog --help. + List the exceptions, e.g., install.1 depends on src/ginstall + and arch.1 depends on src/uname. + + maint: check-programs-vs-x: avoid a new syntax-check failure + * cfg.mk (check-programs-vs-x): The new variable, + $(all-progs-but-lbracket) contains libstdbuf.so, and it does + not have a corresponding .x file, so exempt it. + + maint: avoid distcheck failure by properly cleaning $(ALL_MANS) + * man/local.mk (distclean-local): Remove $(ALL_MANS) when doing + a VPATH build. If it's not done, generated manpages can be left + around in the build directory after a "make distclean", causing + failures in "make distcheck". + +2012-09-01 Stefano Lattarini + + maint: port manpages generation to VPATH builds + * man/local.mk (.x.1): Use '$(MKDIR_P)' rather than bare 'mkdir' + where appropriate. Reported by Jim Meyering. + +2012-09-01 Jim Meyering + + build: fix VPATH issues in C compilation + * src/local.mk (AM_CPPFLAGS): Add 'src' to the directories that + are searched for #include'd files. + +2012-09-01 Stefano Lattarini + + maint: simplify declaration of "libexec" programs + * configure.ac: No need to use 'gl_ADD_PROG' and an indirection + variable '$optional_pkglib_progs' to declare the 'libstdbuf.so' + "libexec" program; the decision to whether compile that program + is not up to the user, but it only and simply depends on whether + the 'stdbuf' "bin" program is to be built or not. + + build: $(mandeps): new, to factor out man pages dependencies + * man/local.mk (mandpep): Rename ... + (mandeps): ... like this. Make $(ALL_MANS) depend on its + content. List 'src/system.h' in here, instead of making + $(ALL_MANS) depend on it explicitly. + (man/*.1): No need to list $(mandep) among the dependencies + any longer. + + build: enhance man pages cleaning and dependencies + * man/local.mk: All of the manpages should depend on 'src/system.h', + and all of them should be cleaned by "make maintainer-clean", that + is, added to MAINTAINERCLEANFILES. Make it be so. + Some minor cosmetic tweakings and reorderings while at it. + + build: simplify: get rid of yet some more indirection variables + * configure.ac: Adjust and improve few comments. + (MAN): Rename ... + (man1_MANS): ... to this. + Ensure it isn't initialized in all Makefiles (which would lead + to spurious errors), by calling AM_SUBST_NOTMAKE on it. + Also call AM_SUBST_NOTMAKE on 'EXTRA_MANS', for consistency. + * man/local.mk (man1_MANS): Simply define to '@man1_MANS@'. + +2012-09-01 Stefano Lattarini + + build: rename dist_man1_MANS -> man1_MANS + And list $(man1_MANS) directly in $(EXTRA_DIST) instead. + This is similar to what is done for $(EXTRA_MANS), thus + improving consistency and readability. + + * man/local.mk (dist_man1_MANS): Rename ... + (man1_MANS): ... like this. + (EXTRA_DIST): Add its contents. + * cfg.mk (check-x-vs-1): Fix a botched comment. + +2012-09-01 Stefano Lattarini + + build: one less unneeded make variable + * man/local.mk (man_aux): This was used only once, so inline its + expansion at its sole point of use ... + (EXTRA_DIST): ... here. + +2012-09-01 Stefano Lattarini + + build: simplify and make more portable to non-GNU make + The AC_SUBST'd variable '$(NO_INSTALL_PROGS_DEFAULT)' is only used in + makefile expressions expanding the list of manual pages that are not + built by default (but might need to be when a distribution tarball + is created). Such expressions exploited a feature of make variable + expansion -- namely, $(VAR:%=dir/%.x) -- that, while seemingly quite + portable in practice, is not POSIX-conforming, and could break on + lesser vendor make implementations. So kill two birds with one stone, + by getting rid of the $(NO_INSTALL_PROGS_DEFAULT) intermediate variable + and improving makefile portability in the process. + + While at it, we also clean up some other minor naming inconsistency + and useless indirection. + + * configure.ac (NO_INSTALL_PROGS_DEFAULT): Don't define or AC_SUBST + anymore; instead ... + (EXTRA_MANS): ... define and AC_SUBST these. + * man/local.mk (extra_man_1): Rename ... + (EXTRA_MANS): ... like this, explicitly making clear it's AC_SUBST'd. + (extra_man_x): It's used only once, no need to define it; just inline + its only expansion where needed. + (EXTRA_DIST): Adjust. + (ALL_MANS): New, union of $(EXTRA_MANS) and $(dist_man1_MANS). + * cfg.mk (check-x-vs-1, sc_option_desc_uppercase): Rely on $(ALL_MANS) + rather than on $(NO_INSTALL_PROGS_DEFAULT) and $(dist_man1_MANS). + +2012-09-01 Stefano Lattarini + + build: simplify: get rid of some indirection variables + The code deciding which coreutils programs to build (depending on + defaults, system capabilities, and user requests) is overly complex + and rather confusing. Let's begin simplifying it by removing some + non-strictly-necessary indirection variables. + + * configure.ac: Adjust and improve few comments. + (OPTIONAL_BIN_PROGS, OPTIONAL_PKGLIB_PROGS): Rename ... + (bin_PROGRAMS, pkglibexec_PROGRAMS): ... like these, respectively. + Ensure they aren't initialized in all Makefiles (which would lead + to spurious errors), by calling AM_SUBST_NOTMAKE on them. + * src/local.mk: Adjust and improve few comments. + (bin_PROGRAMS, pkglibexec_PROGRAMS): Simply define + to the corresponding '@substitution@'. + +2012-09-01 Stefano Lattarini + + maint: update gitignore entries + * src/.gitignore: Here, adding the '.dirstamp' file generated + by the C compilation rules. + + maint: fix one stray reference to src/Makefile.am + * build-aux/gen-lists-of-programs.sh: In heading comments here. + +2012-09-01 Stefano Lattarini + + maint: fix and simplify maintainer checks + Some of them can be simplified after the previous changes, some + of them have been downright broken by them, and need fixing. + + * src/local.mk: Adjust some comments. + (EXTRA_DIST): Avoid SPACE-TAB sequences. + (src/dircolors.h, src/fs.h src/fs-is-local.h): Avoid 8-SPACES + indentation. + (_sc_check-AUTHORS): Move ... + * cfg.mk (sc_check-AUTHORS): ... here (superseding the old rule + with the same name, that was just a recursive invocation to it). + Adjust the paths of the invoked coreutils programs, to account + for the fact that this rule now runs in the top-level build dir, + not in the 'src/' subdir. Other minor cosmetic adjustments. + (ALL_RECURSIVE_TARGETS): Remove 'sc_option_desc_uppercase' and + 'sc_man_file_correlation', since they no longer entail any + recursive make invocation. + (sc_option_desc_uppercase): Remove dependency from $(all_programs): + it isn't actually needed. + (check-programs-vs-x): Likewise. Also, fix heading comments to + truly reflect what this check does. + (all-progs-but-lbracket): Strip the 'src/' prefix from each entry + in the list of programs; this avoids a spurious failure in the + 'check-programs-vs-x' recipe. + (.PHONY): No need to list targets 'sc_man_file_correlation' and + 'sc_option_desc_uppercase': they are automatically declared phony + by 'maint.mk', being recognized as syntax checks. + +2012-09-01 Stefano Lattarini + + maint: remove unused target 'install-root' + It was unneeded and broken since the removal of 'su' from GNU + coreutils, in commit v8.17-16-g928dd73 of 2012-06-06, "su: remove + program (util-linux is now the best source for it)". + + * Makefile.am (install-root): Remove. + (ALL_RECURSIVE_TARGETS): Update. + +2012-09-01 Stefano Lattarini + + maint: improve remake rules for maintainers + This is a follow up on today's commit v8.19-60-g4f2e62b". + + * Makefile.am ($(top_srcdir)/m4/cu-progs.m4, + $(srcdir)/src/cu-progs.mk): New, generate these files from the + 'build-aux/gen-lists-of-programs.sh', the same way it's done + from the bootstrap script. + * bootstrap.conf (bootstrap_post_import_hook): Add comment about + the necessity to keep those new rules synced with the commands + here. Enhance those commands so to that the generated files are + set read-only. + +2012-09-01 Stefano Lattarini + + build: fix generation of manpages for programs not built by default + * src/local.mk (dist-hook): Don't use this to ensure all the + programs, even the ones disabled by default or by the user, are + built (doing so is required to ensure the distributed manpages + are properly built). This would build those programs too late + anyway, causing errors like: + + $ make dist + make dist-xz am__post_remove_distdir='@:' + make[1]: Entering directory `~/src/coreutils' + GEN man/arch.1 + help2man: can't get '--help' info from man/arch.td/arch + make[1]: *** [man/arch.1] Error 127 + make[1]: Leaving directory `~/src/coreutils' + make: *** [dist] Error 2 + + Instead, ... + * man/local.mk (extra_man_x, extra_man_1): define these ... + ($(extra_man_1)): ... and make this depend on $(all_programs). + (EXTRA_DIST): Adjust. + Adjust some comments as well. + +2012-09-01 Stefano Lattarini + + build: don't use recursive make to build the 'src' subdirectory + * Makefile.am (SUBDIRS): Remove 'src'. Ensure '.' is listed before + 'tests' and 'gnulib-tests'. + (dist-hook): Adjust: we must now tweak the top-level Makefile.in + in $(distdir), not the one in the 'src/' subdir (which is gone). + (include): The '$(top_srcdir)/src/local.mk' file. + * build-aux/gen-lists-of-programs.sh: Adjust the generation of the + automake input fragment. + * tests/Makefile.am (.built-programs): Adjust. + * cfg.mk (all_programs): Remove this convenience rule; it's no + longer needed, now that we can rely directly on the contents of + $(all_programs). + (sc_option_desc_uppercase, check-programs-vs-x:): Adjust lists + of prerequisites accordingly. + (all-progs-but-lbracket): Simplify definition accordingly. + * configure.ac ($OPTIONAL_BIN_PROGS): Adjust definition. + ($OPTIONAL_PKGLIB_PROGS): Likewise. + ($NO_INSTALL_PROGS_DEFAULT): Tweak definition, for consistency. + (AC_CONFIG_FILES): Remove 'src/Makefile'. + * src/Makefile.am: Rename ... + * src/local.mk: ... like this, with a lot of adjustments. In + addition ... + (all_programs): ... remove this now-unneeded convenience target. + +2012-09-01 Stefano Lattarini + + build: refactor how lists of coreutils programs are defined + This is in preparation of future changes. Still, this patch + leaves the build system in a better shape; true, with more + indirections, but also with less convoluted and brittle hacks. + + Unfortunately, this commit also makes some rebuild rules + incomplete; that will son be fixed by follow-up patches. + + * build-aux/gen-lists-of-programs.sh: New, generates autoconf + and automake input fragments that define "lists" of all coreutils + programs, with further distinctions about how and when these + programs should be built (by default; if the system is capable + enough; only if the user asks for them explicitly). This is + useful to avoid duplicating the definitions of these lists among + several files (at least 'configure.ac' 'src/Makefile.am'); such + duplication had proved a source of inconsistencies and bugs in + the past. And the pre-existing way to avoid such duplication, + as implemented in 'configure.ac' before this patch, was overly + complex and brittle. + * Makefile.am (EXTRA_DIST): Distribute the new script. + * bootstrap.conf (bootstrap_post_import_hook): Run the new script + to generate 'm4/cu-progs.m4' and 'src/cu-progs.mk'. + * .gitignore: Ignore those files. + * configure.ac: Include 'm4/cu-progs.m4', and decidedly simplify + most of the program lists definition and processing accordingly. + * src/Makefile.am: Similarly include 'src/cu-progs.mk', containing + definition of variables $(default__progs), $(no_install__progs) + and $(build_if_possible__progs). Accordingly ... + (no_install__progs, build_if_possible__progs): ... remove. + (EXTRA_DIST): Adjust definition. + Adjust a comment. + +2012-09-01 Stefano Lattarini + + maint: add our 'bootstrap_post_import_hook' function + This is in preparation of future changes. + + * bootstrap.conf (bootstrap_post_import_hook): New, will be executed + by bootstrap after gnulib-tool but before the autotools. + Move creation of dummy ChangeLog into it. + +2012-08-31 Eric Blake + + build: work with new glibc when not optimizing + Starting with glibc 2.15, the system headers refuse to compile + unconditional use of FORTIFY_SOURCE if optimization is disabled + but -Werror is in effect. + + * configure.ac (FORTIFY_SOURCE): Make conditional. + +2012-08-31 Jim Meyering + + scripts: fix the Signed-off-by:-prohibiting hook to actually work + * scripts/git-hooks/commit-msg: Fix new test: we're searching a + multi-line buffer, so add the //m modifier. + +2012-08-31 Stefano Lattarini + + maint: make required gettext version consistent + * bootstrap.conf ($buildreq): Require gettext >= 0.18.1, consistently + with the call to AM_GNU_GETTEXT_VERSION in configure.ac. + +2012-08-31 Stefano Lattarini + + maint: get rid of obsolete script 'cvsu' + It was useful only back when coreutils used CVS as its version + control system. + + * build-aux/cvsu: Delete. + * Makefile.am (EXTRA_DIST): Remove it. + * cfg.mk: Remove the two exemptions for this removed file. + +2012-08-31 Stefano Lattarini + + build: don't use '$<' in non-suffix rules + * src/Makefile.am (fs-def): Here: it's not portable to some non-GNU + make implementations. + + maint: more uses of $(ASSORT) + * src/Makefile.am (fs-kernel-magic, fs-magic): Here, instead of + inlining its expansion "LC_ALL=C sort". + + maint: remove unused variable in src/Makefile.am + * src/Makefile.am (editpl): This. + +2012-08-31 Stefano Lattarini + + build: don't use foo_LDADD if there's no foo program + For example, instead of factoring out the extra linker flags needed + by 'cp', 'mv' ind 'install' into a '$(copy_LDADD)' variable, factor + them out in a '$(copy_ldadd)' variable. + + Partly a minor cleanup, partly a preparation for future changes. + + * src/Makefile.am (copy_LDADD): Rename ... + (copy_ldadd): ... like this. + (remove_LDADD): Rename ... + (remove_ldadd): ... like this. + All uses adjusted. Some comments updated. + +2012-08-31 Stefano Lattarini + + build: some refactorings in cfg.mk + Partly a minor cleanup, partly a preparation for future changes. + + * Makefile.am (all_programs): Rename ... + (all-progs-but-lbracket): ... like this, and re-define it to expand + at make time rather than only at recipe time (i.e., using $(shell ...) + instead of `...`). + (check-programs-vs-x): Adjust. + +2012-08-31 Stefano Lattarini + + build: move definition of 'all_programs' in cfg.mk + * Makefile.am: Move definition of target 'all_programs' from here ... + * cfg.mk: ... to here, which is the only file where it is used. + +2012-08-31 Jim Meyering + + build: reenable just-moved/broken syntax-check rule + * cfg.mk (sc_option_desc_uppercase): Now that this rule lives in cfg.mk, + we must search man/*.1, not "*.1". + Reported by Bernhard Voelker. + +2012-08-31 Stefano Lattarini + + maint: fixup: don't try to distribute a now-removed file + * tests/Makefile.am (EXTRA_DIST): Drop 'check.mk', which has been + removed (being merged into 'tests/Makefile.am') by recent changes. + +2012-08-31 Erik Auerswald + + doc: escape double quotes in autotools-install --help + * scripts/autotools-install: Fix --help so that we actually print + the double quotes around "make check", in two places. + +2012-08-31 Jim Meyering + + scripts: add autotools-install, for those stuck with outdated tools + * scripts/autotools-install: New script, so you can always build + from git-cloned sources, even when they require bleeding edge + m4, autoconf, automake, etc. + +2012-08-31 Bernhard Voelker + + build: fix syntax-check rules broken by test-added .sh/pl suffixes + * cfg.mk: We exempt a few test files that would otherwise trigger + false-positive matches in syntax-check rules. The recent change + that added a .sh or .pl suffix to each test script made it so + some of the exclusion regexps would no longer match. + Include the required \.sh suffix in each such regexp, too. + +2012-08-30 Stefano Lattarini + + tests: get rid of the 'shell-or-perl' auxiliary script + It's now easier and faster to simply run the perl ans shell test + scripts directly with the appropriate interpreter and options. + + * tests/shell-or-perl: Delete. + * tests/Makefile.am (EXTRA_DIST): Remove it. + (SH_LOG_COMPILER): Re-define to invoke the correct shell. + (PL_LOG_COMPILER): Re-define to invoke the correct perl + interpreter ... + (TESTSUITE_PERL_OPTIONS): ... with the correct options. + (XPL_LOG_COMPILER): Use those options instead of inlining + their expansion. + (LOG_COMPILER): Delete, no longer needed. + +2012-08-30 Stefano Lattarini + + tests: add .sh and .pl suffixes to shell and perl tests, respectively + Not only this shrinks the size of the generated Makefile (from > 6300 + lines to ~3000), but will allow further simplifications in future + changes. + + * tests/Makefile.am (TEST_EXTENSIONS): Add '.sh' and '.pl'. + (PL_LOG_COMPILER, SH_LOG_COMPILER): New, still defined simply to + $(LOG_COMPILER) for the time being. + (TESTS, root_tests): Adjust as described. + * All tests: Rename as described. + +2012-08-30 Stefano Lattarini + + tests: detect missing perl at configure runtime + * configure.ac (AM_CONDITIONAL): Set the conditional 'HAVE_PERL' to + true if the configure-time checks (as run by gl_PERL) have been able + to find a working perl. + * tests/no-perl: New script, report a diagnostic about "missing perl" + and exit with status 77. + * tests/Makefile.am (EXTRA_DIST): Distribute it. + (TESTSUITE_PERL): New, define to '$(PERL)' if a perl interpreter has + been found at configure time (i.e., if the 'HAVE_PERL' automake + conditional is true), and to '$(srcdir)/no-perl' otherwise. + (LOG_COMPILER): Use $(TESTSUITE_PERL) instead of $(PERL). + (XPL_LOG_COMPILER): Likewise. + * tests/shell-or-perl: Simplify: no need to actually check whether + perl is working. + + tests: avoid use of '-T' in shebang line to enable perl taint mode + * tests/rm/fail-eperm: Rename ... + * tests/rm/fail-eperm.xpl: ... like this + * tests/Makefile.am (TESTS): Adjust. + (TEST_EXTENSIONS): New, list '.xpl'. + (XPL_TEST_LOGS): New, run a perl test in tainted mode. + * tests/shell-or-perl: Simplify this script: we no longer need to + parse the shebang line and adjust the flags in the perl invocation + accordingly. + + build: require Automake >= 1.11.2 + Now that we use AM_TESTS_ENVIRONMENT, we must require + Automake >= 1.11.2. + * configure.ac (AM_INIT_AUTOMAKE): Bump version requirement to 1.11.2. + * bootstrap.conf ($buildreq): Likewise. + +2012-08-30 Stefano Lattarini + + tests: prefer AM_TESTS_ENVIRONMENT over TESTS_ENVIRONMENT + The latter should be reserved for user overrides. + + * tests/Makefile.am (TESTS_ENVIRONMENT): Rename ... + (AM_TESTS_ENVIRONMENT): ... like this. + +2012-08-30 Stefano Lattarini + + tests: merge tests/check.mk into tests/Makefile.am + The separation has become unnecessary after all the ancient + 'tests/*/Makefile.am' makefiles have been merged into the + "more-top-level" one 'tests/Makefile.am'. + + * tests/check.mk: Merge ... + * tests/Makefile.am: ... in here. Some comments tweaking while + at it. + +2012-08-30 Stefano Lattarini + + build: enable the 'subdir-objects' Automake option globally + This is not strictly required now (it will be once we make more + parts of the coreutils build system non-recursive), but enabling + it early helps to ensure that we don't unwittingly introduce any + incompatibility or subtle breakage later. + + * configure.ac (AM_INIT_AUTOMAKE): Add 'subdir-objects'. + +2012-08-30 Stefano Lattarini + + maint: update gitignore entries + * doc/.gitinore: Here, adding the '.dirstamp' file generated by + the Texinfo rules. + +2012-08-30 Jim Meyering + + build: factor out a little more re list of *.texi files + We may well want to switch from checking all *.texi to + checking only version-controlled .texi files, so encapsulate + this concept in one place. + + * doc/local.mk (doc_srcdir): Delete. Use this instead: + (texi_files): Define. All usages adjusted. + +2012-08-30 Stefano Lattarini + + maint: adjust syntax check 'sc_option_desc_uppercase' + * cfg.mk (sc_option_desc_uppercase): Here, by grafting the 'man/' + prefix to the manpages obtained from $(NO_INSTALL_PROGS_DEFAULT) + and listed as prerequisites for this rule. + + maint: adjust syntax check 'check-x-vs-1' + * cfg.mk (check-x-vs-1): Here, by stripping 'man/' prefix from + $(dist_man1_MANS) entries before comparing them with the list of + expected programs. + +2012-08-30 Stefano Lattarini + + maint: move man-related syntax checks in cfg.mk + This is more natural, now that the top-level Makefile has access to + all the variables and rules once defined only in 'man/Makefile.am' + + * man/local.mk (all_programs, sc_option_desc_uppercase, + sc_man_file_correlation check-x-vs-1, check-programs-vs-x): Move + from here ... + * cfg.mk: ... to here. Adjust some comments in the process. + +2012-08-30 Stefano Lattarini + + build: don't use recursive make to build the 'man' subdirectory + * Makefile.am: Include 'man/local.mk'. + (SUBDIRS): Remove 'man'. + * configure.ac ($MAN): Adjust so that each of its entries has a leading + 'man/' component. + (AC_CONFIG_FILES): Remove 'man/Makefile'. + * man/Makefile.am: Rename ... + * man/local.mk: ... like this. With further adjustments: each 'foo.1' + target renamed like 'man/foo.1', each '../src/foo.c' dependency as + 'src/foo.c', and each '$(srcdir)' usage as '$(srcdir)/man'. Also ... + (mandep): Adjust, removing the leading '../' component. + Several whitespace adjustments while at it. + (ASSORT): Remove, it's already defined in the top-level Makefile.am. + * cfg.mk (sc_option_desc_uppercase, sc_man_file_correlation): Remove + the associated recipes, they are now directly available from the + included 'man/local.mk'. Actually, the other changes in this commit + have made these recipes instable and not completely correct, but that + will be fixed in later changes. + +2012-08-30 Stefano Lattarini + + build: rework some recipes in man/Makefile.am, for future changes + This change is merely required to make future changes easier. + + In particular, since we are going to merge the contents of + 'man/Makefile.am' into the top-level Makefile, we need to avoid + conflicts with the rules and variables in 'dist-check.mk', and + to prepare for changes in the value of the '$*' variable as used + in the recipe of the '.x -> .1' suffix rule. + + * man/Makefile.am (t, mapped_name): Delete, inlining their use ... + (.1.x): ... in the recipe of this suffix rule. Other adjustments + to prepare to changes in the value of the '$*' automatic variable. + While at it, made more resilient about unlikely but possible failure. + Adjust and reorder few comments. + +2012-08-30 Stefano Lattarini + + build: provide convenience target 'all_programs' also at top-level + This will be mostly useful in future changes. + + * Makefile.am (all_programs): New, simply work by delegating to + the same-named target in the 'src/' subdirectory. + * cfg.mk (sc_option_desc_uppercase): Take advantage of it. + (sc_man_file_correlation): Likewise. + +2012-08-30 Stefano Lattarini + + build: make a rule less dependent on exact source tree layout + This is mostly a preparatory change in view of future ones. + + * man/Makefile.am (.x.1): Use '$(abs_top_builddir)/src' to access + the 'src' directory. + +2012-08-30 Stefano Lattarini + + build: rely on VPATH capabilities in man/Makefile + * man/Makefile.am: In all the 'foo.1' targets, no need to depend + explicitly on '$(srcdir)/foo.x': the '.x.1' suffix rule takes care + of that automatically. + + maint: typofix: s/it's/its/ + * man/Makefile.am: Here. + +2012-08-30 Stefano Lattarini + + build: rename common_dep -> mandep in man/Makefile + This is mostly a preparatory refactoring in view of future changes. + + * man/Makefile.am (common_dep): Rename ... + (mandep): ... like this. + All usages adjusted. + +2012-08-30 Stefano Lattarini + + build: fix a stray usage of uninitialized $(ME) + * man/Makefile.am (sc_option_desc_uppercase): Here. + + build: add an explanatory comment + * man/Makefile.am (EXTRA_DIST): Describe portability issues of the + idiom we now use. Reformat the definition a little while at it. + + maint: simplify definition of $MAN in configure.ac + * configure.ac: Here, by making less use of 'sed' and 'tr' munging, + and relying on a smarter and simpler shell loop instead. + + build: don't define $(SUFFIXES) explicitly + * man/Makefile.am (SUFFIXES): Remove definition: Automake is smart + enough to extract the list of suffixes from the '.x.1' suffix rule + automatically. + + build: don't use recursive make to build the 'doc' subdirectory + * doc/Makefile.am: Rename ... + * doc/local.mk: ... like this. With further adjustments ... + (info_TEXINFOS): Prepend 'doc/' to all '*.texi' files listed in + here. + (coreutils_TEXINFOS): Likewise, and rename ... + (doc_coreutils_TEXINFOS): ... like this. + (constants.texi): Rename ... + (doc/constants.texi): ... like this. Adjust the recipe to avoid + spurious errors. + (MAINTAINERCLEANFILES): Adjust, and extend with '+=' rather than + setting it with '='. + (ME): Delete. + (find_upper_case_var): Use '$@', not '$(ME)', in error messages. + * Makefile.am: Include 'doc/local.mk'. + (SUBDIRS): Remove 'doc'. + * configure.ac (AC_CONFIG_FILES): Remove 'doc/Makefile'. + + build: use 'check-local' to extend the 'check' target + * doc/Makefile.am (check-local): Here, by making this depend + on 'check-texinfo' ... + (check): ... rather than this. While the old usage worked, it + did so for an implementation detail rather than a documented + behaviour, so relying on that was riskier a "unclean". + +2012-08-30 Stefano Lattarini + + build: prefer '$(top_srcdir)/doc' over '$(srcdir)' in doc Makefile + This is just a preparatory refactoring that will become useful in + a future change (in which the doc/Makefile.am makefile will be merged + with the top-level one). + + * doc/Makefile.am (doc_srcdir): New, define to '$(top_srcdir)/doc'. + Use it throughout instead of "bare" '$(srcdir)'. + +2012-08-30 Stefano Lattarini + + build: add extra *.texi files to coreutils_TEXINFOS, not EXTRA_DIST + * doc/Makefile.am (coreutils_TEXINFO): List them here, instead of ... + (EXTRA_DIST): ... listing them here. This ensures the rebuild rules + will be more faithful. + ($(DVIS), $(INFO_DEPS)): No need to depend on $(EXTRA_DIST) now. + + maint: slightly improve .gitignore + * .gitignore: Ignore '.deps' only when it's a directory. + Ignore '*.trs' only if they are in a subdirectory of the + 'tests/' directory. + + build: don't abuse Automake internals (with its 'check-am' rule) + * tests/check.mk (check-am): Remove; obtain the same effect by moving + its dependency '.built-programs' ... + (check_DATA): ... to this variable. + +2012-08-30 Jim Meyering + + scripts: git commit message hook: prohibit use of "Signed-off-by:" + * scripts/git-hooks/commit-msg: Reject a commit log message that + contains "Signed-off-by:". + +2012-08-30 Stefano Lattarini + + tests: remove useless defn of REPLACE_GETCWD from TESTS_ENVIRONMENT + It's last use had been removed in commit v8.12-3-g3ed91fc of 2011-04-28, + "tests: remove useless test: misc/pwd-unreadable-parent". + + * tests/check.mk (TESTS_ENVIRONMENT): Adjust. + +2012-08-30 Nick Alcock + + tests: fix misc/sort-exit-early to skip if root + * tests/misc/sort-exit-early: skip_if_root_ as this test + requires an unwritable input and an unreadable output. + +2012-08-29 Jim Meyering + + tail,stat: improve support for ZFS + This change enables tail -f to use inotify and lets + stat -f --format=%T report the file system type name, "zfs". + * src/stat.c (human_fstype): Add a case: zfs, 0x2fc12fc1. + * NEWS (Improvements): Mention it. + * THANKS.in: Update. + Reported by Raimonds Miltins in http://bugs.gnu.org/12301. + +2012-08-26 Jim Meyering + + build: update gnulib submodule to latest + + maint: stop using @acronym{...} in texinfo sources + * doc/coreutils.texi: Remove all uses of @acronym{...}, + per recommendation by Karl Berry. + * doc/perm.texi: Likewise. + * cfg.mk (local-checks-to-skip): Remove exemption, enabling + the @acronym{-prohibiting syntax-check rule. + + tests: don't require @acronym{...} around POSIX + * doc/Makefile.am (check-texinfo): Remove POSIX-checking part. + +2012-08-26 Nguyễn Thái Ngọc Duy + + df: allow translators to reorder "1K-blocks" header + * src/df.c (get_header): Mark two "%s-%s" strings for translation + and give translators a hint what each is for. + +2012-08-24 Ondrej Oprala + + md5sum, sha*sum: add --tag to output a format indicating the algorithm + The format used is the BSD traditional format which looks like: + MD5 (/dev/null) = d41d8cd98f00b204e9800998ecf8427e + + * NEWS: Add new feature info. + * doc/coreutils.texi (md5sum invocation): Add detailed information + about the new --tag option. + * src/md5sum.c: Add the new --tag option for BSD-style output. + (bsd_split_3): Add ESCAPED_FILENAME parameter. + (print_filename): New function refactored from main(). + (filename_unescape): New function refactored from split_3(). + * tests/misc/md5sum-bsd: Add tests for the new feature. + +2012-08-23 Rob Day + + rm: fix the new --dir (-d) option to work with -i + * src/remove.c (prompt): Hoist the computation of is_empty, since we'll + need it slightly earlier. + Before, this function would arrange to fail with EISDIR when processing + a directory without --recursive (-r). Adjust the condition to exempt + an empty directory when --dir has been specified. + Improve comments. + * tests/rm/d-3: New file, to ensure that rm -d -i dir works. + * tests/Makefile.am (TESTS): Add it. + * NEWS (Bug fixes): Mention it. + * THANKS.in: Update. + Reported by Michael Price in http://bugs.gnu.org/12260 + +2012-08-22 Bernhard Voelker + + tests: correct print_ver_ arguments and add a rule to enforce this + We use print_ver_ to run "PROG --version" for each program under + test. Some tests have been derived from others, while the + argument(s) to print_ver_ have not been adapted. + Add a new cfg.mk rule to prohibit this. + + * cfg.mk (sc_prohibit_test_calls_print_ver_with_irrelevant_argument): + New rule, to prohibit a test script from calling print_env_ for a + program not actually used by that test. + * tests/chown/basic: s/\(print_ver_\) chgrp/\1 chown/ + * tests/cp/acl: s/\(print_ver_\) mv/\1 cp/ + * tests/cp/capability: s/\(print_ver_\) ls/\1 cp/ + * tests/cp/cp-parents: s/(print_ver_\) mv/\1 cp/ + * tests/du/bind-mount-dir-cycle: s/(print_ver_\) rm/\1 du/ + * tests/misc/wc-parallel: s/(print_ver_\) md5sum/\1 wc/ + +2012-08-21 Ondrej Oprala + + du: handle bind-mounted directory cycles gracefully + Before this change, a directory cycle induced by a bind mount + would be treated as a fatal error, i.e., probable disk corruption. + However, such cycles are relatively common, and can be detected + efficiently, so now du emits a descriptive warning and arranges + to exit nonzero. + + * NEWS (Bug fixes): Mention it. + * src/du.c: Include "mountlist.h". + (di_mnt): New global set. + (di_files): Rename global from di_set, now that there are two. + (fill_mount_table): New function. + (hash_ins): Add DI_SET parameter. + (process_file): Look up each dir dev/ino pair in the new set. + (main): Allocate, initialize, and free the new set. + * tests/du/bind-mount-dir-cycle: Add a test for the fix. + * tests/Makefile.am (TESTS): Add it. + * THANKS.in: Update. + This implements the proposal in http://bugs.gnu.org/11844. + Originally reported in http://bugs.debian.org/563254 by Alan Jenkins + and more recently as http://bugzilla.redhat.com/836557 + + Improved by: Jim Meyering + +2012-08-20 Jim Meyering + + 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.19 + * NEWS: Record release date. + +2012-08-19 Paul Eggert + + tests: port df/no-mtab-status to Solaris + * tests/df/no-mtab-status: Include in test program, so + that the getmntent hack compilation fails on Solaris, as it + should, since it's not compatible with Solaris. Reported by + Stefano Lattarini in . + +2012-08-19 Jim Meyering + + tests: avoid split/filter test failure on very low-mem system + * tests/split/filter: Use xz -1 when compressing, to minimize + memory usage. Otherwise, xz could fail due to insufficient + virtual memory on a system with very little free memory. + +2012-08-18 Jim Meyering + + tests: trigger the sort -u free-memory-read bug + * tests/misc/sort-u-FMR: New file. + * tests/Makefile.am (TESTS): Add it. + * tests/misc/sort: Add the test here, too. + * NEWS (Bug fixes): Mention it. + + tests: wrap the valgrind-requiring assertion in a function + * tests/init.cfg (require_valgrind_): New function... + * tests/misc/sort-stale-thread-mem: ...extracted from here. + +2012-08-18 Paul Eggert + + sort: simpler fix for sort -u data-loss bug, and for a FMR bug + This also fixes a free-memory-read (FMR) bug: when fillbuf's realloc + of buf->buf frees the buffer into which saved_line.text points, + the processing of that just-read longer line includes comparison + against the saved line in freed memory. + * src/sort.c (overlap): Remove. + (fillbuf): Do not try to copy saved lines, as that is too risky + in the presence of parallelism, reallocated buffers, etc. + (sort): Invalidate any saved line before sorting a new batch. + +2012-08-17 Jim Meyering + + sort: sort --unique (-u) could cause data loss + sort -u could omit one or more lines of expected output. + This bug arose because sort recorded the most recently printed line via + reference, and if you were unlucky, the storage for that line would be + reused (overwritten) as additional input was read into memory. If you + were doubly unlucky, the new value of the "saved" line would not only + match the very next line, but if that next line were also the first in + a series of identical, not-yet-printed lines, then the corrupted "saved" + line value would result in the omission of all matching lines. + + * src/sort.c (saved_line): New static/global, renamed and moved from... + (write_unique): ...here. Old name was "saved", which was too generic + for its new role as file-scoped global. + (fillbuf): With --unique, when we're about to read into a buffer that + overlaps the saved "preceding" line (saved_line), copy the line's .text + member to a realloc'd-as-needed temporary buffer and adjust the line's + key-defining members if they're set. + (overlap): New function. + * tests/misc/sort: New tests. + * NEWS (Bug fixes): Mention it. + * THANKS.in: Update. + Bug introduced via commit v8.5-89-g9face83. + Reported by Rasmus Borup Hansen in + http://thread.gmane.org/gmane.comp.gnu.coreutils.bugs/23173/focus=24647 + +2012-08-16 Jim Meyering + + tests: reverse args in Coreutils.pm-invoked diff, for consistency + * tests/Coreutils.pm (_compare_files): Reverse diff arguments so + that we invoke diff -c $expected $actual, which is consistent with + how init.sh-using tests invoke "compare exp out". + + maint: correct a stale comment in sort.c + * src/sort.c (fillbuf): Fix comment typo. x2nrealloc no longer + doubles the size of its input buffer. + + maint: fix comment grammar to placate make syntax-check + * src/remove.c (rm_fts): s/can not/cannot/ + +2012-08-14 Krzysztof Goj + + rm: new option --dir (-d) to remove empty directories + Add new option to rm (-d/--dir), which allows removal of + empty directories, while still safely disallowing removal + of non-empty ones. + + This improves compatibility with Mac OS X and BSD systems, + which honor the -d option. + + * src/remove.c (rm_fts): Remove empty directories when requested. + * src/remove.h (rm_options) [remove_empty_directories]: New member. + * src/rm.c (long_opts, usage, main): Update usage and option parsing. + (rm_option_init): Initialize the new member. + * src/mv.c (rm_option_init): Initialize the new member. + * tests/rm/d-1: New test case - successfully delete empty dir. + * tests/rm/d-2: New test case - refuse to delete nonempty dir. + * tests/Makefile.am (TESTS): Add them. + +2012-08-14 Bernhard Voelker + + df: fail when the mount list is required but cannot be read + * src/df.c (main): Add conditions to fail when the mount list cannot + be read: this includes the cases when a file name argument is given + and any of -a, -l, -t or -x is used. + * doc/coreutils.texi: Document the additional error conditions. + * tests/df/no-mtab-status: Add a new test. + * tests/Makefile.am: Reference the new test. + * NEWS: Mention the fix. + +2012-08-12 Jim Meyering + + 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.18 + * NEWS: Record release date. + +2012-08-08 Pádraig Brady + + tests: fix validation of local file systems + * tests/init.cfg (require_mount_list_): A new function + to ensure we can read the list of file systems. + (require_local_dir_): Call the above function, as otherwise + the check is invalid. + * tests/df/total-unprocessed: Ensure df can read the + list of mounted file systems so that --local can be honored. + +2012-08-06 Jim Meyering + + build: update gnulib submodule to latest + + tests: printf-surprise: avoid unwarranted failure on FreeBSD 9.0 + * tests/misc/printf-surprise: A VM size of 10,000KiB was too + little in which to run "env printf ..." on FreeBSD 9.0-p3. + Increase it to 15,000. + +2012-08-05 Jim Meyering + + build: avoid sort link failure on Solaris 10 + * src/Makefile.am (sort_LDADD): Sort uses euidaccess, which may require + whatever library configure deemed necessary to resolve the eaccess + function, but no one told sort to link with that library. + (sort_LDADD): Add $(LIB_EACCESS). + +2012-08-04 Bernhard Voelker + + df: fix exit code and error messages with --total + When the combination of the file system options with given files or + devices does not lead to output, "df --total" would exit successfully + although it should not. + + Examples: + $ df --total --type=xfs / # when / is not an XFS file system + $ df --total --local -t nfs DIR # nfs is remote per se ... + $ df --total -t qwerty /dev/sdb5 # typo in file system type + + Furthermore, "df --total" would not print the error message "no file + systems processed" when the file argument does not exist or is otherwise + not accessible. + + Example: + $ df --total __not_exist__ + + These 2 bugs are present since --total was added by commit + v6.12-166-gea2887b. + + * src/df.c (get_dev): Do not set file_systems_processed to true when + force_fsu is true, i.e. when the row for the "total" line is processed. + (main): Don't print totals unless we've processed a file system. + Also only print the "no FS processed" message if there was no + preceding diagnostic. + * tests/df/total-unprocessed: Add a new test. + * tests/Makefile.am: Reference the new test. + * NEWS: Mention the fix. + + Improved-by: Jim Meyering + +2012-08-04 Jim Meyering + + truncate: don't leak a file descriptor with --ref=PIPE + * src/truncate.c (main): For a user who makes the mistake of + using a non-seekable file as a reference for the desired length, + truncate would open that file, attempt to seek to its end, but + upon seek failure would neglect to close the file descriptor. + Close the file descriptor even when lseek fails. + In addition, ignore failure to close that reference FD, since as + long as the lseek succeeds, a close failure doesn't matter. + Coverity spotted the potential FD leak. + + Improved-by: Pádraig Brady. + +2012-08-04 Jim Meyering + + tests: avoid FP ulimit failure with valgrind-wrapped tools + * tests/init.cfg (require_ulimit_): Raise VM limit from 10MiB to + 20MiB, to accommodate overhead of a valgrind-wrapped date program. + Also declare this function's local variables "local". + +2012-08-04 Jim Meyering + + split: plug nominal leaks + * src/split.c (lines_rr) [IF_LINT]: Plug a harmless leak. + (main) [IF_LINT]: Free a usually-small (~70KB) buffer + just before exit, mainly to take this off the radar of + leak-detecting tools. + + Improved-by: Pádraig Brady. + +2012-08-03 Jim Meyering + + tail: avoid rare error-path FD leak + * src/tail.c (tail_forever): Close FD to avoid leak after a + failed fstat. + +2012-07-27 Jim Meyering + + maint: refresh stale local gnulib patch files + We carry local adjustments for a few gnulib modules via the + patches in gl/. Nearly all of those patches had become stale + due to evolution of the originals in gnulib. + + To refresh them, first make sure you have no local changes in gl/ + or in the gnulib submodule, then run "make refresh-gnulib-patches". + +2012-07-25 Jim Meyering + + tail: avoid misleading diagnostic upon fstat failure + * src/tail.c (check_fspec): Save fstat-induced errno *before* + calling close_fd, not after. Otherwise, the close could well + clobber the global errno, making tail print an invalid diagnostic. + This could happen only with tail -f, and even then, only when + a valid file descriptor were to provoke fstat failure. + +2012-07-23 Pádraig Brady + + tests: add a test for a previously fixed output format bug in join + Add a test and NEWS entry for a bug inadvertently fixed in + a refactoring in commit v8.9-32-gd4db0cb + + * tests/misc/join (v2-format): Add a new test. + * THANKS.in: Add the reporter. + * NEWS: Mention the old bug. + * cfg.mk (old_NEWS_hash): Update. + + Reported-by: Jean-Pierre Tosoni + +2012-07-22 Pádraig Brady + + doc: mention gethostid(3) in hostid(1) + * man/hostid.x: Add gethostid(3) to SEE ALSO section. + Addresses http://bugs.gnu.org/12023 + +2012-07-22 Erik Auerswald + + doc: mention uniq(1) in sort(1) man-page and vice versa + * man/sort.x: Add SEE ALSO section with entry uniq(1). + * man/uniq.x: Add sort(1) to SEE ALSO section. + +2012-07-21 Jim Meyering + + maint: stzncpy: restrict pointer parameters + * src/system.h (stzncpy): Add "restrict" attribute to each pointer + parameter and note in the comment that the buffers must not overlap. + +2012-07-20 Joachim Schmitz + + maint: rm: remove two more unused static inline functions + * src/remove.c (cache_stat_ok, is_nondir_lstat): Remove unused + functions. + +2012-07-20 Jim Meyering + + maint: adjust exemption to track renamed test script + * cfg.mk (exclude_file_name_regexp--sc_file_system): Sync this + exemption regexp to match renamed tests/df/df-P. This avoids + a "make syntax-check" failure. + +2012-07-20 Joachim Schmitz (tiny change) + + maint: rm: remove unused static-inlined functions + * src/remove.c (cache_statted, is_dir_lstat): Remove unused + static-inlined functions. + * THANKS.in: Remove my name from this list, now that (with this + commit) it is included automatically. + +2012-07-18 Andrew D Warshall + + tests: fiemap-perf: avoid a false failure on ext2 + * tests/cp/fiemap-perf: Skip the test on ext2 file systems, + as we do for ext3. Also skip the test if we can't create + a 1TiB file, which might not be supported on certain file systems. + +2012-07-16 Pádraig Brady + + maint: move two df tests from tests/misc to tests/df + * test/Makefile.am: Reference the moved tests. + +2012-07-16 Pádraig Brady + + df: don't output control characters in a mount point name + It's awkward to read and problematic for scripts when + control characters like '\n' are output. + + Note other fields are already handled with mbsalign, + which converts non printable chars to the replacement char. + A caveat to note with that, is the replacement char takes + a place in the field and so possibly truncates the field + if it was the widest field in the records. + + Note a more general replacement function, that + handles all printable, or non white space characters, + would require more sophisticated support for various + encodings, and the complexity vs benefit was not + deemed beneficial enough at present. + Perhaps in future a more general replacement function + could be shared between the various utilities. + + Note is unaffected in any field, + which could impact scripts processing the output. + However any of the number fields at least could have + spaces considering `LANG=fr_FR df -B\'1`, so it's + probably best to leave spaces, which also allows + scripts to handle mount points with spaces without change. + + * src/df.c (hide_problematic_chars): Replace control chars with '?'. + * tests/df/problematic-chars: Add a new root only test. + * tests/Makefile.am: Reference the new test. + * NEWS: Mention the fix. + +2012-07-15 Jim Meyering + + pinky,who: fix bug in latest change + * src/system.h (stzncpy): New function. + * src/pinky.c (print_entry): Use stzncpy, not stpncpy. + The latter does not NUL-terminate. I assumed that strncpy was + the only function with such a horrible API. Today I learned that + stpncpy also may not NUL-terminate its result. + The bugs were introduced in commit v8.17-48-gf79263d. + * src/who.c (print_user): Likewise. + Thanks to Erik Auerswald for spotting my error. + + build: update gnulib submodule to latest + + maint: remove unwarranted uses of strncpy + * src/pinky.c (print_entry): Remove unwarranted uses of strncpy. + Instead, use stpcpy and stpncpy. + * src/who.c (print_user): Likewise. + * cfg.mk: Remove strncpy exemptions. + + build: shred.c: avoid i686-specific gcc -Wstrict-overflow warning + * src/shred.c: Avoid gcc -Wstrict-overflow warning. + Addresses http://bugs.gnu.org/11927 + +2012-07-13 Bruno Haible + + doc: clarify meaning of '-parodd' in stty help + * src/stty.c (usage): Disambiguate explanation of -parodd. + * THANKS.in: Add reporter. + Reported by Michael Stummvoll + +2012-07-12 Pádraig Brady + + doc: mention the improved sort memory allocation + * NEWS: Mention the improvement. + +2012-07-12 Stefano Lattarini + + doc: fix errors and warnings with Texinfo 5 + Or rather, with the development version 4.13.90, which will eventually + become Texinfo 5.0. + + * doc/coreutils.texi: Use '@item' instead of '@itemx' in several places, + as Texinfo 5 refuses to process an '@itemx' that is not preceded by an + '@item'. Ensure that node extended names in menus and sectioning are + consistent, and that ordering and presence of nodes in menus and in the + actual text are consistent as well. + + Fixes http://bugs.gnu.org/11828 + +2012-07-11 Bernhard Voelker + + df: warn if soon-to-be-removed --megabyte option is used + * src/df.c (MEGABYTES_OPTION): Add enum and mark it for removal + in August 2013. + (long_options): Use MEGABYTES_OPTION for --megabytes option. + (main): Add a case for it and issue a deprecation warning if + the long form is used. Document the short -m option to + exist only for BSD compatibility. + +2012-07-11 Paul Eggert + + sort: by default, do not exceed 3/4 of physical memory + * src/sort.c (default_sort_size): Do not exceed 3/4 of total memory. + See Jeff Janes's bug report in + . + +2012-07-06 Pádraig Brady + + tests: sort-merge-fdlimit: reduce the limit by one + * tests/misc/sort-merge-fdlimit: As a consequence of commit + v8.17-34-g59daf05, we can reduce the descriptor limit by one. + +2012-07-06 Paul Eggert + + doc: document leap seconds better + * doc/coreutils.texi (touch invocation, Time conversion specifiers) + (Options for date, Examples of date): Index "leap seconds" and + improve their documentation a bit. + + doc: fix spacing + * doc/coreutils.texi: Use right amount of spacing after punctuation. + +2012-07-04 Jim Meyering + + date: fails to diagnose invalid input + date -d "$(printf '\xb0')" would print 00:00:00 with today's date + rather than diagnosing the invalid input. Now it reports this: + date: invalid date '\260' + * gnulib: Update submodule to latest for fixed parse-datetime.y. + * tests/misc/date [invalid-high-bit-set]: New test. + * NEWS (Bug fixes): Mention it. + * bootstrap, tests/init.sh: Also update to latest. + Reported by Peter Evans in http://bugs.gnu.org/11843 + +2012-07-03 Jim Meyering + + maint: add syntax-check rule to help avoid misuse of EXIT_FAILURE + * cfg.mk (sc_some_programs_must_avoid_exit_failure): New rule, + to help us avoid using EXIT_FAILURE in programs like sort, ls, nohup, + timeout, env, etc. that use different exit codes in many cases. + + maint: fix minor bugs in helper program, setuidgid + * src/setuidgid.c (main): Fix two error-before-usage calls not to exit. + Exit with status SETUIDGID_FAILURE (not EXIT_FAILURE) consistently. + +2012-07-03 Paul Eggert + + sort: fix exit-status typo + * src/sort.c (stream_open): EXIT_FAILURE -> SORT_FAILURE. + Suggested by Pádraig Brady in . + + sort: simplify -o handling to avoid fdopen, assert + * src/sort.c (outfd): Remove. All uses replaced by STDOUT_FILENO. + (stream_open): When writing, use stdout rather than fdopen. + (move_fd_or_die): Renamed from dup2_or_die, with the added functionality + of closing its first argument. All uses changed. + (avoid_trashing_input): Special case for !outfile no longer needed. + (check_output): Arrange for standard output to go to the file, + rather than storing the fd in outfd. + +2012-07-02 Pádraig Brady + + sort: avoid redundant processing with inaccessible inputs or output + * src/sort.c (check_inputs): A new function to verify all inputs + are accessible before further processing. + (check_output): A new function to open or create a specified + output file, before futher processing. + (stream_open): Adjust to truncating the previously opened + output file rather than opening directly. + (avoid_trashing_input): Optimize to stat the output file + descriptor, rather than the file name. + (main): Call the new functions to check accessibility of + inputs and output, before processing starts. + * tests/misc/sort: Adjust to the changed error message. + * tests/misc/sort-merge-fdlimit: Account for the earlier opened + file descriptor of the specified output file. + * tests/misc/sort-exit-early: A new test to exercise the improvements. + * tests/Makefile.am: Reference the new test. + * NEWS: Mention the improvement. + + Suggested-by: Bernhard Voelker + +2012-07-02 Pádraig Brady + + maint: sc_prohibit_fail_0: update a stale comment + * cfg.mk (sc_prohibit_fail_0): Following on from + commit v8.0-79-g71c2f88, update the comment to match. + + maint: avoid a -Wunsed-but-set warning on some systems + * src/stty.c (main): Mark speed_was_set as possibly unused, + as is the case when CIBAUD is undefined (on ppc64 GNU/Linux + for example). + Reported-by: Stefano Lattarini + +2012-06-30 Jim Meyering + + maint: avoid false-positive syntax-check failure due to fail=0 in .texi + * cfg.mk (exclude_file_name_regexp--sc_prohibit_fail_0): Exempt + all .texi files. + + stat,tail: recognize new file system type: aufs + * src/stat.c (human_fstype) [__linux__]: Add a 'case' for the new + remote file system type: aufs (0x61756673). + * NEWS (New features): Mention stat -f. + (Bug fixes): Mention it for tail -f. + Reported by Michael Mol in http://bugs.gnu.org/11823 + +2012-06-30 Jim Meyering + + doc: improve sample backup script + * doc/coreutils.texi (cp invocation): Make the backup script exit + with an accurate reflection of any failure. + Also, add --preserve=all. + + Improved-by: Bernhard Voelker + +2012-06-26 Pádraig Brady + + maint: avoid a static analysis warning in csplit + The Canalyze static code analyzer correctly surmised + that there is a use-after-free bug in free_buffer() + at the line "struct line *n = l->next", if that + function is called multiple times. + + This is not a runtime issue since a list of lines + will not be present in the !lines_found case. + + * src/csplit.c (free_buffer): Set list head to NULL so + that this function can be called multiple times. + (load_buffer): Remove a redundant call to free_buffer(). + + Reported-by: Xu Zhongxing + +2012-06-22 Bernhard Voelker + + doc: document multiplier for dd number options like count=N + * src/dd.c (usage): Add "N" to the description of multipliers. + * doc/coreutils.texi (dd invocation): Likewise. + +2012-06-22 Pádraig Brady + + split: ensure output doesn't overwrite input + * src/split.c (create): Check if output file is the + same inode as the input file. + * tests/split/guard-input: New test case. + * tests/Makefile.am: Reference new test case. + * NEWS: Mention the fix. + + Improved-by: Jim Meyering + Reported-by: François Pinard + +2012-06-22 Pádraig Brady + + maint: refactor common mode bits used to create files + * src/system.h (MODE_RW_UGO): The new refactored define (666). + * src/mkfifo.c: Use the new define. + * src/mknod.c: Likewise. + * src/split.c: Likewise. + * src/system.h: Likewise. + * src/touch.c: Likewise. + * src/truncate.c: Likewise. + + Suggested-by: Jim Meyering + +2012-06-22 Pádraig Brady + + maint: suppress echoing of sc_THANKS_in_duplicates implementation + * cfg.mk (sc_THANKS_in_duplicates): Suppress the echoing of these + commands run during `make syntax-check` + +2012-06-20 Bernhard Voelker + + maint: sort: style adjustment to help clarify size determination + * src/sort.c (default_sort_size): Move physmem code "down" to first use. + +2012-06-12 Jim Meyering + + stty: portability: accommodate CIL + * src/stty.c (main): Declare locals "mode" and "new_mode" to be static + to ensure that each is initialized to zero, *including* all padding. + While gcc clears padding of a local automatic initialized to "{ 0, }", + CIL does not, and the C99 standard is not clear on this issue. + Reported by Edward Schwartz. See http://bugs.gnu.org/11675 for details. + +2012-06-10 Sami Kerola + + maint: remove su testing artifact + * tests/misc/help-version: Remove expected su exit code. + +2012-06-10 Jim Meyering + + build: update gnulib to latest; correct comment grammar + * tests/misc/help-version: Fix comment grammar: + s/all these/all of these/ + * gl/lib/tempname.c.diff: Likewise. + + maint: migrate strncpy-prohibiting rule to gnulib + * cfg.mk (sc_prohibit_strncpy): Remove rule. + Now it's in gnulib. + + maint: prohibit use of strncpy + * cfg.mk (sc_prohibit_strncpy): New syntax-check rule. + Exempt pinky.c and who.c, at least for now. + +2012-06-06 Jim Meyering + + su: remove program (util-linux is now the best source for it) + * README: Omit "su" from list of programs. + * src/su.c: Remove file. + * src/Makefile.am: Remove su-related rules and variables. + * tests/misc/su-fail: Remove test. + * tests/Makefile.am (TESTS): Remove misc/su-fail. + * tests/misc/invalid-opt: Remove su-related code. + * src/.gitignore: Remove su. + * man/su.x: Remove file. + * man/Makefile.am (su.1): Remove rule. + * po/POTFILES.in: Remove su.c from the list. + * TODO: Remove ancient entry. + * NEWS (Changes in behavior): Mention it. + * doc/coreutils.texi: Remove su-related description. + * AUTHORS: Remove su. + * m4/lib-check.m4 (cu_LIB_CHECK): Remove file/macro. + * configure.ac: Remove su-related code and sole use of cu_LIB_CHECK. + * scripts/git-hooks/commit-msg: Remove su from this list, too. + + maint: detect a new type of duplicate in THANKS.in + * cfg.mk (sc_THANKS_in_duplicates): New rule. + +2012-06-05 Jim Meyering + + maint: mark new diagnostic for translation + * src/head.c (elide_tail_lines_seekable): Mark new diagnostic. + I will look at the results of "make syntax-check", I will look... + +2012-06-05 Jim Meyering + + head: with --lines=-N (-n-N) reset file pointer on seekable input + * src/head.c (elide_tail_lines_seekable): Reset file pointer + after printing up to an end-relative line-counted offset. + Anoop Sharma reported the problem and suggested the fix. + * tests/misc/head-pos: Add coverage via a very similar, existing test. + Also add coverage for a previously untested block of code. + * tests/misc/head-elide-tail ($READ_BUFSIZE): Update to 8192, to + match the value of BUFSIZ I see today on Fedora 17/x86_64 (unrelated + to this fix). + * NEWS (Bug fixes): Mention it. + + Improved-by: Pádraig Brady + +2012-06-01 Jim Meyering + + stat,tail: recognize new file system type: panfs + * src/stat.c (human_fstype) [__linux__]: Add a 'case' for the new + remote file system type: panfs (0xAAD7AAEA). + * NEWS (New features): Mention stat -f. + (Bug fixes): Mention it for tail -f. + Reported by Travis Gummels in http://bugzilla.redhat.com/827199 + +2012-05-31 Jim Meyering + + maint: fix typos in test comments and old ChangeLog files + Culprits identified and fixed automatically using these commands: + git ls-files|misspellings -f -|perl -nl \ + -e '/^(.*?)\[(\d+)\]: (\w+) -> "(.*?)"$/ or next;' \ + -e '($file,$n,$l,$r)=($1,$2,$3,$4); $q="'\''"; $r=~s/$q/$q\\$q$q/g;'\ + -e 'print "sed -i $q${n}s!$l!$r!$q $file"' | bash + using http://github.com/lyda/misspell-check + * old/fileutils/ChangeLog: Fix typos. + * old/textutils/ChangeLog: Likewise. + * tests/misc/truncate-fail-diag: Likewise. + +2012-05-28 Pádraig Brady + + cksum: line-buffer the printed checksums + This utility was inadvertently omitted from commit v8.0-34-g710fe41 + * src/cksum.c (main): Set stdout to line buffered mode, to ensure + parallel running instances don't intersperse their output. + * NEWS: Mention the fix. + * THANKS.in: Add Anoop. + Reported by Anoop Sharma. + +2012-05-21 Jim Meyering + + maint: remove comment that suggested to remove support for mktemp -V + * src/mktemp.c (main): Don't suggest to remove support for -V, an + undocumented alias for --version, since that would introduce a + gratuitous incompatibility with the original mktemp program. + +2012-05-21 Mike Frysinger + + dircolors: add st/st-256color terminal types + See http://st.suckless.org/ + * src/dircolors.hin: Add st and st-256color. + Reported-by: Jeroen Roovers , via + Mike Frysinger in http://bugs.gnu.org/11498 + +2012-05-20 Jim Meyering + + id,groups: use gidtostr/uidtostr to avoid casts + * src/id.c (gidtostr, uidtostr): Define macros. + (gidtostr_ptr, uidtostr_ptr): Define safer functions. + Use gidtostr and uidtostr to print GID and UID without + need/risk of casts. + * src/group-list.c: Likewise. + +2012-05-16 Jim Meyering + + tests: use $AWK, not awk + * tests/cp/sparse-fiemap: Don't hard-code "awk". Use $AWK. + * tests/init.cfg: Likewise. + * tests/misc/sort-rand: Likewise. + + maint: tell xgettext that fputs arg "93% of..." is not a C format string + * src/fmt.c (usage): Add a comment to tell + xgettext that the "% o" in fputs argument string of "...93% of..." + is not a C format string. Reported by Toomas Soome, Göran Uddeborg, + Petr Pisar, Primoz PETERLIN and Chusslove Illich via + http://bugs.gnu.org/11470 + + maint: add assertions to placate static analysis tools + A static analysis tool (http://labs.oracle.com/projects/parfait/) + produced some false positive diagnostics. Add assertions to help + it understand that the code is correct. + * src/stty.c: Include . + (display_changed): Add an assertion to placate parfait. + (display_all): Likewise. + * src/sort.c: Include . + (main): Add an assertion to placate parfait. + * src/fmt.c: Include . + (get_paragraph): Add an assertion to placate parfait. + +2012-05-16 Pádraig Brady + + stat: report the correct block size for file system usage + struct statfs has the f_frsize member since Linux 2.6, + so use that rather than f_bsize which can be different. + Note the related df change mentioned in NEWS is handled + in gnulib by using statvfs() rather than statfs() + on Linux > 2.6.36 (where statvfs doesn't hang) and the + same method as stat for Linux 2.6 kernels earlier than that. + stat(1) doesn't use statvfs() on GNU/Linux as the f_type + member isn't available there. + Note the change to not use statvfs() on GNU/Linux was introduced + in gnulib commit eda39b8 16-08-2003. + + * m4/stat-prog.m4 (cu_PREREQ_STAT_PROG): Check for the f_frsize + member in the statfs structure. + * src/stat.c: Use (struct statfs).f_frsize if available. + * NEWS (Bug fixes): Mention this stat fix, and the related df fix + coming in the next gnulib update. + * THANKS.in: Add Nikolaus. + + Reported and Tested by Nikolaus Rath + +2012-05-12 Jim Meyering + + ls: color each symlink-to-relative-name in / properly + In order for ls --color to color each symlink, it must form the name + of each referent and then stat it to see if the link is dangling, to + a directory, to a file, etc. When the symlink is to a relative name, + ls must concatenate the starting directory name and that relative name. + When, in addition, the starting directory was "/" or "/some-name", + the result was ill-formed, and the subsequent stat would usually fail, + making the caller color it as a dangling symlink. + * src/ls.c (make_link_name): Don't botch the case in which + dir_name(NAME) == "/" and LINKNAME is relative. + * tests/ls/root-rel-symlink-color: New file. Test for the above. + * tests/Makefile.am (TESTS): Add it. + * NEWS (Bug fixes): Mention it. + Reported by Mike Frysinger in http://bugs.gnu.org/11453 + Bug introduced by commit v8.16-23-gbcb9078. + 2012-05-10 Jim Meyering + 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.17 * NEWS: Record release date. @@ -247,7 +4215,7 @@ Originally reported by Brynnen Owen as http://bugs.gnu.org/7320. Raised again by Marc Mengel in http://bugzilla.redhat.com/816708. -2012-04-23 Stefano Lattarini +2012-04-22 Stefano Lattarini maint: sync up required autoconf version in bootstrap.conf * bootstrap.conf ($buildreq): Require autoconf 2.64, not 2.62. This is @@ -814,7 +4782,7 @@ * test/misc/basename: Add new options test cases. * NEWS (New features): Mention it. -2012-03-07 Pádraig Brady +2012-03-06 Pádraig Brady maint: refactor copy to use is_nul() * src/dd.c: Move is_nul() from here to ... @@ -1120,6 +5088,8 @@ maint: remove some redundant automake _SOURCES * src/Makefile.am: Remove auto generated entries. +2012-01-25 Pádraig Brady + maint: cleanup an extraneous version output in a test * test/misc/stdbuf: Fixup the minor copy & paste issue introduced in commit ff7f0ff8 @@ -1164,7 +5134,7 @@ * tests/rm/ir-1: Likewise. * tests/rm/r-1: Likewise. -2012-01-23 Paul Eggert +2012-01-22 Paul Eggert maint: quote 'like this' or "like this", not `like this' * doc/coreutils.texi (Formatting the file names): @@ -1787,7 +5757,7 @@ * tests/mkdir/writable-under-readonly: Likewise. * tests/rm/read-only: Likewise. -2011-11-30 Eric Blake +2011-11-29 Eric Blake build: simplify warnings based on last gnulib update We no longer need to exclude this warning. @@ -1795,7 +5765,7 @@ * configure.ac (WARN_CFLAGS): Gnulib dropped -Wunsuffixed-float-constants, as non-portable. -2011-11-30 Eric Blake +2011-11-29 Eric Blake build: update gnulib for syntax-check improvement Commit 5b3e538 proved useful enough to migrate to gnulib after @@ -3355,6 +7325,8 @@ allow premature termination of cleanup. Also, this ports better to platforms like NonStop, which don't ahve SA_RESETHAND. +2011-07-15 Paul Eggert + * src/dd.c: Remove obsolete comments re POSIX. 2011-07-15 Pádraig Brady @@ -3920,7 +7892,7 @@ * tests/split/r-chunk: Rename from tests/misc/split-rchunk. * tests/Makefile.am (TESTS): Reflect renaming. -2011-05-28 Pádraig Brady +2011-05-27 Pádraig Brady chown,chgrp: output the original ownership in -v messages * src/chown-core.c (describe_change): Output the @@ -3929,8 +7901,6 @@ owner or group are passed. * NEWS: Mention the change in behavior. -2011-05-27 Pádraig Brady - chown,chgrp: output the correct ownership in -v messages * src/chown_core.c (describe_change): Accept the ownership of the original file and output that when not changing. @@ -4014,12 +7984,14 @@ the main split process to exit with a non zero status (141). * test/split/filter: Add a test for this case. +2011-05-25 Pádraig Brady + split: fix an edge case where -n l/... creates an extra file * src/split.c (lines_bytes_chunk): Handle the edge case where the file is truncated as we read. * tests/misc/split-lchunk: Cleanup; no functional change. -2011-05-26 Bernhard Voelker +2011-05-25 Bernhard Voelker chmod: output the original mode in verbose mode * src/chmod.c (describe_change): Pass in the original mode, @@ -4609,6 +8581,8 @@ * NEWS: Adjust to match commit 1c3654cb, 2011-04-02, "copy: require fiemap sync also for 2.6.38 kernels" +2011-04-06 Pádraig Brady + copy: handle mergeable extents across fiemap scans * extent-scan.h (extent_scan_free): Init the pointer to NULL, and reset the count to 0, so that we can realloc the buffer. @@ -4853,7 +8827,7 @@ we remove their now-redundant name from THANKS.in. * THANKS.in: Remove a now-duplicate name. -2011-03-20 Pádraig Brady +2011-03-19 Pádraig Brady tests: fix the sparse-fiemap test * tests/filefrag-extent-compare: Merge adjacent extents in @@ -4926,7 +8900,7 @@ * .x-sc_unmarked_diagnostics: Likewise. * .x-sc_useless_cpp_parens: Likewise. -2011-03-14 Pádraig Brady +2011-03-13 Pádraig Brady maint: use wcswidth from gnulib * gl/lib/mbsalign.c (rpl_wcswidth): Remove this in favor @@ -5050,7 +9024,7 @@ since we don't test anything without it. In the loop, don't use skip_test_ as it exits the test completely. -2011-02-20 Gilles Espinasse +2011-02-19 Gilles Espinasse maint: replace spaces with tab in tests/Makefile.am * tests/Makefile.am: Replace spaces with tabs for consistency @@ -5238,7 +9212,7 @@ build: update gnulib submodule to latest -2011-02-01 Pádraig Brady +2011-01-31 Pádraig Brady cp: fix the buffer size used when writing zeros * src/copy.c (write_zeros): This bug caused 4 or 8 bytes to @@ -5482,7 +9456,7 @@ we will try to do FIEMAP-copy if the underlying file system supports it, and fall back to a normal copy if it fails. -2011-01-30 Pádraig Brady +2011-01-29 Pádraig Brady doc: add alternatives for field processing not supported by cut * doc/coreutils.texi (cut invocation): Remove the tr -s '[:blank:]' @@ -5491,7 +9465,7 @@ Also document a `join` hack, to achieve the same thing. Note the join options are ordered so as to be compatible with other systems. -2011-01-30 Pádraig Brady +2011-01-29 Pádraig Brady join: don't report disorder against an empty file This allows one to use join as a field extractor like: @@ -5504,14 +9478,14 @@ * doc/coreutils.texi (join invocation): Document the change. * NEWS: Likewise. -2011-01-30 Pádraig Brady +2011-01-29 Pádraig Brady join: ensure --header skips the order check with empty files * src/join.c: Skip the header even if one of the files is empty. * tests/misc/join: Add a test case. * NEWS: Mention the fix -2011-01-30 Pádraig Brady +2011-01-29 Pádraig Brady join: add -o 'auto' to output a constant number of fields per line Lines with a different number of fields than the first line, @@ -6186,7 +10160,7 @@ * NEWS (Bug reports): Mention this. Reported by DJ Lucas in http://debbugs.gnu.org/7489. -2010-12-09 Pádraig Brady +2010-12-08 Pádraig Brady split: fix a case where --elide-empty causes invalid chunking When -n l/N is used and long lines are present that both @@ -6981,6 +10955,8 @@ build: update gnulib to latest, for memmem/strstr fix +2010-10-05 Jim Meyering + maint: describe coreutils' policy on copyright year number ranges * README: Mention coreutils' long-standing policy on use of M-N ranges in copyright year lists. Requested by Richard Stallman. @@ -7167,6 +11143,8 @@ build: update gnulib submodule to latest +2010-09-20 Paul Eggert + sort: destroy spin locks portably * src/sort.c (sortlines, sort): Use pthread_spin_destroy when a spin lock is no longer used. This isn't needed on GNU/Linux or @@ -7229,7 +11207,7 @@ * bootstrap.conf (gnulib_modules): Add fdutimensat. * src/touch.c (touch): Use fdutimensat instead of gl_futimens. -2010-09-14 Dmitry V. Levin +2010-09-13 Dmitry V. Levin dircolors: add rxvt-unicode-256color terminal type rxvt-unicode introduced new terminal type: @@ -7345,7 +11323,7 @@ * NEWS: Mention the new feature * THANKS: Add the author -2010-08-27 Eric Blake +2010-08-26 Eric Blake maint: update to latest gnulib * gnulib: Update to latest, to avoid warnings with latest autoconf.git. @@ -7353,7 +11331,7 @@ maint: avoid a hung 'make syntax-check' in VPATH build * cfg.mk (sc_system_h_headers): Look for files in correct location. -2010-08-26 Pádraig Brady +2010-08-25 Pádraig Brady df: always print the device name for bind mounted files * src/df (show_point): Remove the optimization for comparing @@ -7392,7 +11370,7 @@ reference the SHA-2 based alternatives. Reported by Simon Josefsson -2010-08-14 Paul Eggert +2010-08-13 Paul Eggert * tests/misc/sort (use-nl): Fix comment to match the test case. @@ -7676,6 +11654,8 @@ checking for file descriptor exhaustion. Also try plain -R, since that implementation may change in the future too. +2010-07-23 Paul R. Eggert + randread: run 2x faster on 64-bit hosts, don't assume no padding bits * gl/lib/rand-isaac.c: Remove the I/O; this belongs elsewhere. Add support for ISAAC64. Port to hosts with padding bits. @@ -7793,7 +11773,7 @@ (main): If -R is given, call random_md5_state_init rather than going single-threaded. -2010-07-17 Paul R. Eggert +2010-07-16 Paul R. Eggert randread: don't require -lrt Programs like 'sort' were linking to -lrt in order to get @@ -7809,8 +11789,6 @@ * src/Makefile.am (mktemp_LDADD, shred_LDADD, shuf_LDADD, sort_LDADD): (tac_LDADD): Omit $(LIB_GETHRXTIME); no longer needed. -2010-07-16 Paul R. Eggert - sort: add a test case for the sort -u bug * tests/Makefile.am (TESTS): Add misc/sort-unique. * tests/misc/sort-unique: New file. @@ -8054,7 +12032,7 @@ * tests/tail-2/wait: Likewise. * test/dd/misc: Comment that delay is needed to trigger failure. -2010-07-05 Paul Eggert +2010-07-04 Paul Eggert doc: Add advice about ChangeLogs and synchronizing submodules * README-hacking: Update accordingly. @@ -8465,7 +12443,7 @@ * tests/Makefile.am (TESTS): Add du/max-depth. * tests/du/max-depth: New file. -2010-05-19 Pádraig Brady +2010-05-18 Pádraig Brady tests: fix sort-debug-keys when fr_FR.utf8 not available * tests/misc/sort-debug-keys: Correctly check for the absence @@ -8651,7 +12629,7 @@ * src/operand2sig.c: Likewise. * src/kill.c: Likewise. -2010-05-02 Paul Eggert +2010-05-01 Paul Eggert sort: use long doubles only when effective * src/sort.c (general_numcompare): Don't use long double if strtold @@ -8788,7 +12766,7 @@ * NEWS: Mention the fix. Reported by Santiago Rodríguez -2010-04-17 Pádraig Brady +2010-04-16 Pádraig Brady cp: preserve "capabilities" when also preserving file ownership * src/copy.c (copy_reg): Copy xattrs _after_ setting file ownership @@ -9124,7 +13102,7 @@ (merge): Likewise. * src/uptime.c (usage): Likewise. -2010-03-17 Pádraig Brady +2010-03-16 Pádraig Brady timeout: add the --kill-after option Based on a report from Kim Hansen who wanted to @@ -9174,6 +13152,8 @@ maint: drop *.lzma suport * .gitignore: Remove *.lzma lines. +2010-03-10 Eric Blake + maint: ignore *.xz files * .gitignore: Ignore *.xz created by 'make dist', now that we no longer produce *.lzma. @@ -9296,7 +13276,7 @@ * src/Makefile.am (sc_tight_scope): Don't annotate with "GEN". (sc_check-AUTHORS): Likewise. -2010-02-18 Moritz Orbach +2010-02-17 Moritz Orbach ls: fix a regression by honoring NORMAL attributes again Output the NORMAL attribute before non file name text. @@ -9343,6 +13323,8 @@ by using cleanup_() rather than using a timeout which may trigger a failure on very slow systems (< 20 iterations of the loop per second). +2010-02-15 Pádraig Brady + doc: fix inconsistent capitalization in --help output * src/base64.c (usage): Don't capitalize the first character in an --option description. @@ -9546,7 +13528,7 @@ from $(VC_LIST) starts with "$(srcdir)/". Fix that. * gnulib: Update to latest, to pull in a required maint.mk change. -2010-01-24 Pádraig Brady +2010-01-23 Pádraig Brady tests: make cp-mv-enotsup-xattr independent of the host file system * tests/cp-mv-enotsup-xattr: Create a file system from which to copy @@ -9558,8 +13540,6 @@ * doc/coreutils.texi: Add nproc to the System context command list in the overview menu. -2010-01-23 Pádraig Brady - maint: ensure test independence from config macro format * tests/cp/acl: Support USE_ACL not being defined. * tests/mv/acl: Likewise. Also fix typo in skip message. @@ -11012,7 +14992,7 @@ (main): Use it, rather than testing only errno == EPERM. * NEWS (Bug fixes): Mention it. -2009-10-26 Pádraig Brady +2009-10-25 Pádraig Brady timeout: don't orphan monitored programs if they ignore specified signals * src/timeout.c (install_signal_handlers): Handle any user @@ -11022,7 +15002,7 @@ timeout -sUSR1 1s dd if=/dev/zero of=/dev/null * NEWS: Mention the fix. -2009-10-24 Eric Blake +2009-10-23 Eric Blake tests: test recent status changes * tests/misc/nice: Enhance test. @@ -11069,8 +15049,6 @@ tests: accommodate BSD getopt * tests/misc/invalid-opt (err_subst): Support alternate spelling. -2009-10-23 Eric Blake - build: prohibit improper use of stat and lstat * cfg.mk (sc_prohibit_stat_macro_address): New rule. * src/ln.c (do_link): Adjust comment to avoid false positive. @@ -12284,6 +16262,8 @@ * tests/Makefile.am: Reference the new test. * NEWS: Mention the new feature. +2009-08-28 Pádraig Brady + stdbuf: fix a small typo in --help output * src/stdbuf.c (usage): s/then/the/ @@ -12719,7 +16699,7 @@ Prompted by a report from Joel E. Denny. Also, do not invoke localtime for each line we process. -2009-07-29 Pádraig Brady +2009-07-28 Pádraig Brady doc: fix the generated HTML index * doc/coreutils.texi: Move the "SELinux context" section @@ -12961,6 +16941,8 @@ * README-hacking: Fix a typo. Don't make building from a git-cloned tree sound so hard. +2009-06-19 Jim Meyering + build: update from gnulib (hash module updates; maint.mk tweak) * gnulib: Update submodule to latest. @@ -13163,7 +17145,7 @@ (my-distcheck): Use configure with --enable-gcc-warnings and remove use of $(warn_cflags). -2009-05-30 Eric Blake +2009-05-29 Eric Blake head, tail: make --help less ambiguous * src/head.c (usage): Use -n K, not -n N, to avoid confusion. @@ -13372,7 +17354,7 @@ Otherwise, running some in parallel would cause failures, e.g., for rm/ext3-perf and tail-2/assert-2. -2009-05-01 Eric Blake +2009-04-30 Eric Blake stdopen: remove unused code * m4/stdopen.m4: Delete now-unused file. @@ -14297,7 +18279,7 @@ policy: use git to help avoid trailing white space * HACKING (Avoid trailing white space): Describe how git can help. -2009-03-04 Andreas Schwab +2009-03-03 Andreas Schwab Update Andreas Schwab's email address * THANKS: Update Andreas Schwab's email address. @@ -14626,7 +18608,7 @@ from Brian M. Carlson in http://bugs.debian.org/514675 * man/id.x: Use a better one-liner, based on the one at top of id.c. -2009-02-15 Pádraig Brady +2009-02-14 Pádraig Brady seq: Fix equal width calculation when '.' added to last number Issue reported by Samuel Hapák. @@ -14917,7 +18899,7 @@ "General help..." links, like the new function does. Reported by Bob Proulx. -2009-01-23 Pádraig Brady +2009-01-22 Pádraig Brady doc: shred: Correct docs on default number of overwrites. * NEWS: Mention the change to the default number of passes. @@ -14929,8 +18911,6 @@ while still conveying that there are 25 internal patterns that may be useful. -2009-01-22 Pádraig Brady - shred: change default number of overwrites from 25 to 3 * src/shred.c: The concensus is that a default of 3 passes is appropriate for current drive technologies. @@ -16179,7 +20159,7 @@ * src/remove.c (compare_ino, dirent_count) [!HAVE_STRUCT_DIRENT_D_TYPE]: Mask declaration when unused. -2008-09-27 Jim Meyering +2008-09-26 Jim Meyering rm -r: avoid O(n^2) performance for a directory with very many entries This enhancement works around a problem that is specific to at least @@ -16193,7 +20173,7 @@ * tests/rm/ext3-perf: New file. Test for the performance fix. * NEWS: mention the new feature -2008-09-27 Jim Meyering +2008-09-26 Jim Meyering remove.c: don't use xmalloc; don't let obstack call exit on failure (obstack_chunk_alloc, obstack_chunk_free): Don't define. @@ -16211,7 +20191,7 @@ step1 -2008-09-27 Jim Meyering +2008-09-26 Jim Meyering * maint.mk (my-distcheck): remove duplicate c99-related test code @@ -17023,6 +21003,8 @@ mkfifo: correct misplaced -Z description in --help output * src/mkfifo.c (usage): Put it *after* the "Mandatory arguments..." line. +2008-06-27 Jim Meyering + uniq: remove redundant test * src/uniq.c (find_field): Remove redundant test in outer loop- termination expression. Also, add a "const" attribute. @@ -17201,7 +21183,7 @@ * src/od.c (charname): Likewise. * maint.mk (sc_redundant_const): Add rule to detect this. -2008-06-17 Bo Borgerson +2008-06-16 Bo Borgerson join: improve memory management * src/join.c (struct seq): Use a (struct line **) for `lines' rather than @@ -18437,15 +22419,13 @@ option items. (main): Remove unused 'q' from short options. -2008-05-06 Jim Meyering +2008-05-05 Jim Meyering help2man: fix perl 5.10 problem properly * man/help2man: Do pull LC_ALL via "use POSIX". Instead, limit the importing of gettext-related symbols to just those two we'll use: gettext and textdomain. -2008-05-05 Jim Meyering - help2man: avoid failure with Debian unstable's Perl 5.10.0 Avoid failure that produced this diagnostic: Constant subroutine main::LC_ALL redefined at /.../Exporter.pm @@ -18667,6 +22647,8 @@ tests: skip (don't fail) rm/one-file-system when mount --bind fails * tests/rm/one-file-system: Reported by Allen Hewes. +2008-04-20 Jim Meyering + tests: convert umask-check to a function * tests/test-lib.sh (working_umask_or_skip_): New function, from... * tests/umask-check: ...here. Remove file. @@ -18686,7 +22668,7 @@ * maint.mk (sc_root_tests): Adapt rule to new syntax used in tests/Makefile.am. -2008-04-21 Jim Meyering +2008-04-20 Jim Meyering Revamp test-related Makefiles. One side-effect of this change is that "make check" now works even if @@ -18757,7 +22739,7 @@ * src/dircolors.hin: Add .flv. Move .svgz to "image formats". -2008-04-19 Jim Meyering +2008-04-18 Jim Meyering md5sum -c: ignore a line with a NUL byte among checksum hex digits * src/md5sum.c (hex_digits): Require that all "digest_hex_bytes" @@ -18984,11 +22966,11 @@ "Operation not supported". * tests/mkdir/selinux: Accept both strings. Factor out duplication. +2008-03-28 Jim Meyering + Work around a recent glibc/getopt.c diagnostic change. * tests/misc/factor: Map new "-- '1'" to expected "-- 1". -2008-03-28 Jim Meyering - mknod, mkfifo: don't segfault when diagnosing invalid SELinux context Identical to the bug fixed by 72d052896a9092b811961a8f3e6ca5d151a59be5. * src/mkfifo.c (main): Use "scontext", not NULL optarg in diagnostic. @@ -19080,7 +23062,7 @@ * tests/mkdir/selinux: New file: test for today's fix. * tests/mkdir/Makefile.am (TESTS): Add selinux. -2008-03-26 Daniel Dunbar +2008-03-25 Daniel Dunbar mkdir -Z x d: don't segfault when diagnosing invalid context "x" (tiny change) * src/mkdir.c (main): Use "scontext", not NULL optarg in diagnostic. @@ -19163,10 +23145,10 @@ * src/seq.c (long_double_format): Add a comment. - * GNUmakefile: Update from gnulib. - 2008-03-20 Jim Meyering + * GNUmakefile: Update from gnulib. + Remove today's automake kludge, altogether. Fix properly. * man/Makefile.am: Use dist_man1_MANS instead of dist_man_MANS. Suggestion from Ralf Wildenhues. @@ -19745,12 +23727,10 @@ tests/touch/not-owner: Source test-lib.sh before using skip_test_. -2008-02-12 Jim Meyering +2008-02-11 Jim Meyering * tests/Makefile.am (EXTRA_DIST): Remove strace. -2008-02-11 Jim Meyering - tests: Migrate sourced strace file into a function, require_strace_. * tests/strace: Remove file. * tests/test-lib.sh (require_strace_): New function. diff --git a/ChangeLog-2005 b/ChangeLog-2005 index 6da4ad9d..1ab59fae 100644 --- a/ChangeLog-2005 +++ b/ChangeLog-2005 @@ -11609,7 +11609,7 @@ ----- - Copyright (C) 2002-2012 Free Software Foundation, Inc. + Copyright (C) 2002-2013 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 b430beb8..5ea1c200 100644 --- a/ChangeLog-2006 +++ b/ChangeLog-2006 @@ -4033,7 +4033,7 @@ ----- - Copyright (C) 2006-2012 Free Software Foundation, Inc. + Copyright (C) 2006-2013 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 76128ec5..33a75665 100644 --- a/ChangeLog-2007 +++ b/ChangeLog-2007 @@ -4015,7 +4015,7 @@ ----- - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 2007-2013 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 7770a92f..233e9fb3 100644 --- a/ChangeLog-2008 +++ b/ChangeLog-2008 @@ -372,7 +372,7 @@ ----- - Copyright (C) 2008-2012 Free Software Foundation, Inc. + Copyright (C) 2008-2013 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 58f2ead4..8759034e 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-2012 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2006-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 diff --git a/INSTALL b/INSTALL index 6e90e07d..007e9396 100644 --- a/INSTALL +++ b/INSTALL @@ -1,7 +1,7 @@ Installation Instructions ************************* -Copyright (C) 1994-1996, 1999-2002, 2004-2012 Free Software Foundation, +Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, diff --git a/Makefile.am b/Makefile.am index 72d93d54..36e715d5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ # Make coreutils. -*-Makefile-*- -# Copyright (C) 1990-2012 Free Software Foundation, Inc. +# Copyright (C) 1990-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 @@ -17,7 +17,7 @@ ALL_RECURSIVE_TARGETS = -SUBDIRS = lib src doc man po tests gnulib-tests +SUBDIRS = po . gnulib-tests changelog_etc = \ ChangeLog-2005 \ @@ -49,23 +49,30 @@ EXTRA_DIST = \ THANKStt.in \ bootstrap \ bootstrap.conf \ - build-aux/cvsu \ + build-aux/gen-lists-of-programs.sh \ cfg.mk \ dist-check.mk \ maint.mk \ + tests/GNUmakefile \ thanks-gen -ALL_RECURSIVE_TARGETS += install-root -install-root: - cd src && $(MAKE) $@ +gen_progs_lists = $(top_srcdir)/build-aux/gen-lists-of-programs.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 +# makes: it is with those directories that 'cu-progs.m4' and 'cu-progs.mk' +# appear in our dependencies. +$(top_srcdir)/m4/cu-progs.m4: $(gen_progs_lists) + $(AM_V_GEN)rm -f $@ $@-t \ + && $(SHELL) $(gen_progs_lists) --autoconf >$@-t \ + && chmod a-w $@-t && mv -f $@-t $@ +$(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 $@ ACLOCAL_AMFLAGS = -I m4 -# Some tests always need root privileges, others need them only sometimes. -ALL_RECURSIVE_TARGETS += check-root -check-root: - cd tests && $(MAKE) $@ SUBDIRS= - # Shortcut targets to make it easier to run (very) expensive tests. check-expensive: $(MAKE) check RUN_EXPENSIVE_TESTS=yes @@ -92,7 +99,7 @@ BUILT_SOURCES = .version # See the rm_subst comment for details. dist-hook: gen-ChangeLog $(AM_V_GEN)echo $(VERSION) > $(distdir)/.tarball-version - $(AM_V_at)perl -pi -e '$(rm_subst)' $(distdir)/src/Makefile.in + $(AM_V_at)perl -pi -e '$(rm_subst)' $(distdir)/Makefile.in gen_start_date = 2008-02-08 .PHONY: gen-ChangeLog @@ -169,3 +176,16 @@ check-git-hook-script-sync: done; \ rm -rf $$t; \ test $$fail = 0 + +noinst_LIBRARIES = +MOSTLYCLEANFILES = +CLEANFILES = +MOSTLYCLEANDIRS = + +AM_CPPFLAGS = -Ilib -I$(top_srcdir)/lib -Isrc -I$(top_srcdir)/src + +include $(top_srcdir)/lib/local.mk +include $(top_srcdir)/src/local.mk +include $(top_srcdir)/doc/local.mk +include $(top_srcdir)/man/local.mk +include $(top_srcdir)/tests/local.mk diff --git a/Makefile.in b/Makefile.in index 0d28ea92..d0caccc3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.12a from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. - +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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. @@ -16,7 +17,7 @@ # Make coreutils. -*-Makefile-*- -# Copyright (C) 1990-2012 Free Software Foundation, Inc. +# Copyright (C) 1990-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 @@ -30,6 +31,71 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . + +# Copyright (C) 2002-2013 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 +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This file is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this file. If not, see . +# +# As a special exception to the GNU General Public License, +# this file may be distributed as part of a program that +# contains a configuration script generated by Autoconf, under +# 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 + +# Make coreutils programs. -*-Makefile-*- +# This is included by the top-level Makefile.am. + +# Make coreutils documentation. -*-Makefile-*- +# This is included by the top-level Makefile.am. + +# Copyright (C) 1995-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 . + +# Make coreutils man pages. -*-Makefile-*- +# This is included by the top-level Makefile.am. + +# Copyright (C) 2002-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 . + + + VPATH = @srcdir@ am__make_dryrun = \ { \ @@ -56,7 +122,6 @@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : @@ -65,20 +130,26 @@ 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 +@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) subdir = . -DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ - $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) ABOUT-NLS \ - 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 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 \ @@ -105,27 +176,30 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/euidaccess.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/fd-reopen.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/freading.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/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/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 \ @@ -162,9 +236,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lchmod.m4 \ $(top_srcdir)/m4/lchown.m4 $(top_srcdir)/m4/lcmessage.m4 \ $(top_srcdir)/m4/ldexp.m4 $(top_srcdir)/m4/ldexpl.m4 \ - $(top_srcdir)/m4/lib-check.m4 $(top_srcdir)/m4/lib-ignore.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/lib-ignore.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ $(top_srcdir)/m4/libunistring-base.m4 \ $(top_srcdir)/m4/link-follow.m4 $(top_srcdir)/m4/link.m4 \ $(top_srcdir)/m4/linkat.m4 $(top_srcdir)/m4/localcharset.m4 \ @@ -195,14 +268,15 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/nanosleep.m4 $(top_srcdir)/m4/netdb_h.m4 \ $(top_srcdir)/m4/netinet_in_h.m4 \ $(top_srcdir)/m4/nl_langinfo.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/nproc.m4 \ - $(top_srcdir)/m4/off_t.m4 $(top_srcdir)/m4/open.m4 \ - $(top_srcdir)/m4/openat.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/nocrash.m4 \ + $(top_srcdir)/m4/non-recursive-gnulib-prefix-hack.m4 \ + $(top_srcdir)/m4/nproc.m4 $(top_srcdir)/m4/off_t.m4 \ + $(top_srcdir)/m4/open.m4 $(top_srcdir)/m4/openat.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/posixver.m4 $(top_srcdir)/m4/prereq.m4 \ $(top_srcdir)/m4/printf-frexp.m4 \ @@ -217,12 +291,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.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/root-dev-ino.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/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/selinux-context-h.m4 \ $(top_srcdir)/m4/selinux-selinux-h.m4 \ $(top_srcdir)/m4/servent.m4 $(top_srcdir)/m4/setenv.m4 \ @@ -244,18 +317,17 @@ 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/strcase.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/strings_h.m4 $(top_srcdir)/m4/strncat.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/strnumcmp.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/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 \ @@ -290,11 +362,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.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/xfts.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/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) @@ -304,14 +376,706 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/lib/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +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 = @ -SOURCES = -DIST_SOURCES = +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 \ + 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 \ + lib/filenamecat-lgpl.c lib/filevercmp.c lib/fopen-safer.c \ + lib/fprintftime.c lib/freading.c lib/freadseek.c \ + lib/freopen-safer.c lib/ftoastr.c lib/full-read.h \ + lib/full-read.c lib/full-write.h lib/full-write.c \ + lib/gethrxtime.c lib/xtime.c lib/getndelim2.c lib/gettext.h \ + lib/gettime.c lib/getugroups.c lib/hard-locale.c lib/hash.c \ + lib/hash-pjw.h lib/hash-pjw.c lib/hash-triple.c lib/heap.c \ + lib/heap.h lib/human.c lib/i-ring.c lib/idcache.c \ + lib/ino-map.c lib/ino-map.h lib/imaxtostr.c lib/inttostr.c \ + lib/offtostr.c lib/uinttostr.c lib/umaxtostr.c lib/ldtoastr.c \ + lib/linebuffer.h lib/linebuffer.c lib/localcharset.h \ + lib/localcharset.c lib/glthread/lock.h lib/glthread/lock.c \ + lib/long-options.c lib/malloca.c lib/math.c lib/mbchar.c \ + lib/mbiter.h lib/mbiter.c lib/mbsalign.c lib/mbsalign.h \ + lib/mbscasecmp.c lib/mbslen.c lib/mbsstr.c lib/mbswidth.h \ + lib/mbswidth.c lib/mbuiter.h lib/mbuiter.c lib/memcasecmp.c \ + lib/memchr2.h lib/memchr2.c lib/memcmp2.c lib/memcoll.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/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 \ + lib/root-dev-ino.c lib/root-dev-ino.h lib/safe-read.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/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 \ + lib/xgethostname.c lib/xmemcoll.h lib/xmemcoll.c \ + lib/xnanosleep.c lib/xprintf.h lib/xprintf.c lib/xreadlink.c \ + lib/xsize.h lib/xsize.c lib/xstriconv.h lib/xstriconv.c \ + lib/xstrndup.h lib/xstrndup.c lib/xstrtod.c lib/xstrtoimax.c \ + lib/xstrtol.c lib/xstrtoul.c lib/xstrtol-error.c \ + lib/xstrtold.c lib/xstrtoumax.c lib/xvasprintf.h \ + lib/xvasprintf.c lib/xasprintf.c lib/yesno.c +am__dirstamp = $(am__leading_dot)dirstamp +@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR_TRUE@am__objects_1 = lib/unistr/u8-mbtoucr.$(OBJEXT) +@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) \ + lib/buffer-lcm.$(OBJEXT) lib/c-ctype.$(OBJEXT) \ + lib/c-strcasecmp.$(OBJEXT) lib/c-strncasecmp.$(OBJEXT) \ + lib/c-strtod.$(OBJEXT) lib/c-strtold.$(OBJEXT) \ + lib/canon-host.$(OBJEXT) lib/canonicalize.$(OBJEXT) \ + lib/careadlinkat.$(OBJEXT) lib/cloexec.$(OBJEXT) \ + lib/close-stream.$(OBJEXT) lib/closein.$(OBJEXT) \ + lib/closeout.$(OBJEXT) lib/md5.$(OBJEXT) lib/sha1.$(OBJEXT) \ + lib/sha256.$(OBJEXT) lib/sha512.$(OBJEXT) \ + lib/cycle-check.$(OBJEXT) lib/di-set.$(OBJEXT) \ + lib/diacrit.$(OBJEXT) lib/opendir-safer.$(OBJEXT) \ + lib/dirname.$(OBJEXT) lib/basename.$(OBJEXT) \ + lib/dirname-lgpl.$(OBJEXT) lib/basename-lgpl.$(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/statat.$(OBJEXT) lib/mkstemp-safer.$(OBJEXT) \ + lib/strftime.$(OBJEXT) lib/striconv.$(OBJEXT) \ + lib/strnlen1.$(OBJEXT) lib/strintcmp.$(OBJEXT) \ + lib/strnumcmp.$(OBJEXT) lib/sys_socket.$(OBJEXT) \ + lib/tempname.$(OBJEXT) lib/glthread/threadlib.$(OBJEXT) \ + lib/timespec.$(OBJEXT) lib/glthread/tls.$(OBJEXT) \ + lib/trim.$(OBJEXT) lib/u64.$(OBJEXT) lib/unicodeio.$(OBJEXT) \ + lib/unistd.$(OBJEXT) lib/dup-safer.$(OBJEXT) \ + lib/fd-safer.$(OBJEXT) lib/pipe-safer.$(OBJEXT) \ + $(am__objects_1) $(am__objects_2) $(am__objects_3) \ + 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_libcoreutils_a_OBJECTS = $(am_lib_libcoreutils_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_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) \ + src/users$(EXEEXT) src/who$(EXEEXT) +am__EXEEXT_3 = src/[$(EXEEXT) src/base64$(EXEEXT) \ + src/basename$(EXEEXT) src/cat$(EXEEXT) src/chcon$(EXEEXT) \ + src/chgrp$(EXEEXT) src/chmod$(EXEEXT) src/chown$(EXEEXT) \ + src/cksum$(EXEEXT) src/comm$(EXEEXT) src/cp$(EXEEXT) \ + src/csplit$(EXEEXT) src/cut$(EXEEXT) src/date$(EXEEXT) \ + src/dd$(EXEEXT) src/dir$(EXEEXT) src/dircolors$(EXEEXT) \ + src/dirname$(EXEEXT) src/du$(EXEEXT) src/echo$(EXEEXT) \ + src/env$(EXEEXT) src/expand$(EXEEXT) src/expr$(EXEEXT) \ + src/factor$(EXEEXT) src/false$(EXEEXT) src/fmt$(EXEEXT) \ + src/fold$(EXEEXT) src/ginstall$(EXEEXT) src/groups$(EXEEXT) \ + src/head$(EXEEXT) src/id$(EXEEXT) src/join$(EXEEXT) \ + src/kill$(EXEEXT) src/link$(EXEEXT) src/ln$(EXEEXT) \ + src/logname$(EXEEXT) src/ls$(EXEEXT) src/md5sum$(EXEEXT) \ + src/mkdir$(EXEEXT) src/mkfifo$(EXEEXT) src/mknod$(EXEEXT) \ + src/mktemp$(EXEEXT) src/mv$(EXEEXT) src/nl$(EXEEXT) \ + src/nproc$(EXEEXT) src/nohup$(EXEEXT) src/numfmt$(EXEEXT) \ + src/od$(EXEEXT) src/paste$(EXEEXT) src/pathchk$(EXEEXT) \ + src/pr$(EXEEXT) src/printenv$(EXEEXT) src/printf$(EXEEXT) \ + src/ptx$(EXEEXT) src/pwd$(EXEEXT) src/readlink$(EXEEXT) \ + src/realpath$(EXEEXT) src/rm$(EXEEXT) src/rmdir$(EXEEXT) \ + src/runcon$(EXEEXT) src/seq$(EXEEXT) src/sha1sum$(EXEEXT) \ + src/sha224sum$(EXEEXT) src/sha256sum$(EXEEXT) \ + src/sha384sum$(EXEEXT) src/sha512sum$(EXEEXT) \ + src/shred$(EXEEXT) src/shuf$(EXEEXT) src/sleep$(EXEEXT) \ + src/sort$(EXEEXT) src/split$(EXEEXT) src/stat$(EXEEXT) \ + src/sum$(EXEEXT) src/sync$(EXEEXT) src/tac$(EXEEXT) \ + src/tail$(EXEEXT) src/tee$(EXEEXT) src/test$(EXEEXT) \ + src/timeout$(EXEEXT) src/touch$(EXEEXT) src/tr$(EXEEXT) \ + src/true$(EXEEXT) src/truncate$(EXEEXT) src/tsort$(EXEEXT) \ + src/tty$(EXEEXT) src/uname$(EXEEXT) src/unexpand$(EXEEXT) \ + src/uniq$(EXEEXT) src/unlink$(EXEEXT) src/vdir$(EXEEXT) \ + src/wc$(EXEEXT) src/whoami$(EXEEXT) src/yes$(EXEEXT) +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibexecdir)" \ + "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" +PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) $(pkglibexec_PROGRAMS) +am_src___OBJECTS = src/lbracket.$(OBJEXT) +src___OBJECTS = $(am_src___OBJECTS) +am__DEPENDENCIES_2 = src/libver.a lib/libcoreutils.a \ + $(am__DEPENDENCIES_1) lib/libcoreutils.a +am__DEPENDENCIES_3 = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) +src___DEPENDENCIES = $(am__DEPENDENCIES_3) +am_src_arch_OBJECTS = src/uname.$(OBJEXT) src/uname-arch.$(OBJEXT) +src_arch_OBJECTS = $(am_src_arch_OBJECTS) +src_arch_DEPENDENCIES = $(am__DEPENDENCIES_2) +src_base64_SOURCES = src/base64.c +src_base64_OBJECTS = src/base64.$(OBJEXT) +src_base64_DEPENDENCIES = $(am__DEPENDENCIES_2) +src_basename_SOURCES = src/basename.c +src_basename_OBJECTS = src/basename.$(OBJEXT) +src_basename_DEPENDENCIES = $(am__DEPENDENCIES_2) +src_cat_SOURCES = src/cat.c +src_cat_OBJECTS = src/cat.$(OBJEXT) +src_cat_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) +src_chcon_SOURCES = src/chcon.c +src_chcon_OBJECTS = src/chcon.$(OBJEXT) +src_chcon_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) +am_src_chgrp_OBJECTS = src/chgrp.$(OBJEXT) src/chown-core.$(OBJEXT) +src_chgrp_OBJECTS = $(am_src_chgrp_OBJECTS) +src_chgrp_DEPENDENCIES = $(am__DEPENDENCIES_2) +src_chmod_SOURCES = src/chmod.c +src_chmod_OBJECTS = src/chmod.$(OBJEXT) +src_chmod_DEPENDENCIES = $(am__DEPENDENCIES_2) +am_src_chown_OBJECTS = src/chown.$(OBJEXT) src/chown-core.$(OBJEXT) +src_chown_OBJECTS = $(am_src_chown_OBJECTS) +src_chown_DEPENDENCIES = $(am__DEPENDENCIES_2) +src_chroot_SOURCES = src/chroot.c +src_chroot_OBJECTS = src/chroot.$(OBJEXT) +src_chroot_DEPENDENCIES = $(am__DEPENDENCIES_2) +src_cksum_SOURCES = src/cksum.c +src_cksum_OBJECTS = src/cksum.$(OBJEXT) +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) \ + src/extent-scan.$(OBJEXT) +am_src_cp_OBJECTS = src/cp.$(OBJEXT) $(am__objects_4) +src_cp_OBJECTS = $(am_src_cp_OBJECTS) +am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) +src_cp_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_4) \ + $(am__DEPENDENCIES_1) +src_csplit_SOURCES = src/csplit.c +src_csplit_OBJECTS = src/csplit.$(OBJEXT) +src_csplit_DEPENDENCIES = $(am__DEPENDENCIES_2) +src_cut_SOURCES = src/cut.c +src_cut_OBJECTS = src/cut.$(OBJEXT) +src_cut_DEPENDENCIES = $(am__DEPENDENCIES_2) +src_date_SOURCES = src/date.c +src_date_OBJECTS = src/date.$(OBJEXT) +src_date_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) +src_dd_SOURCES = src/dd.c +src_dd_OBJECTS = src/dd.$(OBJEXT) +src_dd_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) +am_src_df_OBJECTS = src/df.$(OBJEXT) src/find-mount-point.$(OBJEXT) +src_df_OBJECTS = $(am_src_df_OBJECTS) +src_df_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) +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) +src_dir_DEPENDENCIES = $(am__DEPENDENCIES_5) +src_dircolors_SOURCES = src/dircolors.c +src_dircolors_OBJECTS = src/dircolors.$(OBJEXT) +src_dircolors_DEPENDENCIES = $(am__DEPENDENCIES_2) +src_dirname_SOURCES = src/dirname.c +src_dirname_OBJECTS = src/dirname.$(OBJEXT) +src_dirname_DEPENDENCIES = $(am__DEPENDENCIES_2) +src_du_SOURCES = src/du.c +src_du_OBJECTS = src/du.$(OBJEXT) +src_du_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) +src_echo_SOURCES = src/echo.c +src_echo_OBJECTS = src/echo.$(OBJEXT) +src_echo_DEPENDENCIES = $(am__DEPENDENCIES_2) +src_env_SOURCES = src/env.c +src_env_OBJECTS = src/env.$(OBJEXT) +src_env_DEPENDENCIES = $(am__DEPENDENCIES_2) +src_expand_SOURCES = src/expand.c +src_expand_OBJECTS = src/expand.$(OBJEXT) +src_expand_DEPENDENCIES = $(am__DEPENDENCIES_2) +src_expr_SOURCES = src/expr.c +src_expr_OBJECTS = src/expr.$(OBJEXT) +src_expr_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) +src_factor_SOURCES = src/factor.c +src_factor_OBJECTS = src/factor.$(OBJEXT) +src_factor_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) +src_false_SOURCES = src/false.c +src_false_OBJECTS = src/false.$(OBJEXT) +src_false_DEPENDENCIES = $(am__DEPENDENCIES_2) +src_fmt_SOURCES = src/fmt.c +src_fmt_OBJECTS = src/fmt.$(OBJEXT) +src_fmt_DEPENDENCIES = $(am__DEPENDENCIES_2) +src_fold_SOURCES = src/fold.c +src_fold_OBJECTS = src/fold.$(OBJEXT) +src_fold_DEPENDENCIES = $(am__DEPENDENCIES_2) +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) \ + src/src_ginstall-cp-hash.$(OBJEXT) \ + src/src_ginstall-extent-scan.$(OBJEXT) +am_src_ginstall_OBJECTS = src/src_ginstall-install.$(OBJEXT) \ + src/src_ginstall-prog-fprintf.$(OBJEXT) $(am__objects_5) +src_ginstall_OBJECTS = $(am_src_ginstall_OBJECTS) +src_ginstall_DEPENDENCIES = $(am__DEPENDENCIES_2) \ + $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) +am_src_groups_OBJECTS = src/groups.$(OBJEXT) src/group-list.$(OBJEXT) +src_groups_OBJECTS = $(am_src_groups_OBJECTS) +src_groups_DEPENDENCIES = $(am__DEPENDENCIES_2) +src_head_SOURCES = src/head.c +src_head_OBJECTS = src/head.$(OBJEXT) +src_head_DEPENDENCIES = $(am__DEPENDENCIES_2) +src_hostid_SOURCES = src/hostid.c +src_hostid_OBJECTS = src/hostid.$(OBJEXT) +src_hostid_DEPENDENCIES = $(am__DEPENDENCIES_2) +src_hostname_SOURCES = src/hostname.c +src_hostname_OBJECTS = src/hostname.$(OBJEXT) +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_join_SOURCES = src/join.c +src_join_OBJECTS = src/join.$(OBJEXT) +src_join_DEPENDENCIES = $(am__DEPENDENCIES_2) +am_src_kill_OBJECTS = src/kill.$(OBJEXT) src/operand2sig.$(OBJEXT) +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_LINK = $(CCLD) $(src_libstdbuf_so_CFLAGS) $(CFLAGS) \ + $(src_libstdbuf_so_LDFLAGS) $(LDFLAGS) -o $@ +src_link_SOURCES = src/link.c +src_link_OBJECTS = src/link.$(OBJEXT) +src_link_DEPENDENCIES = $(am__DEPENDENCIES_2) +am_src_ln_OBJECTS = src/ln.$(OBJEXT) src/relpath.$(OBJEXT) +src_ln_OBJECTS = $(am_src_ln_OBJECTS) +src_ln_DEPENDENCIES = $(am__DEPENDENCIES_2) +src_logname_SOURCES = src/logname.c +src_logname_OBJECTS = src/logname.$(OBJEXT) +src_logname_DEPENDENCIES = $(am__DEPENDENCIES_2) +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) +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_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_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) +src_mv_OBJECTS = $(am_src_mv_OBJECTS) +am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1) +src_mv_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_4) \ + $(am__DEPENDENCIES_6) +src_nice_SOURCES = src/nice.c +src_nice_OBJECTS = src/nice.$(OBJEXT) +src_nice_DEPENDENCIES = $(am__DEPENDENCIES_2) +src_nl_SOURCES = src/nl.c +src_nl_OBJECTS = src/nl.$(OBJEXT) +src_nl_DEPENDENCIES = $(am__DEPENDENCIES_2) +src_nohup_SOURCES = src/nohup.c +src_nohup_OBJECTS = src/nohup.$(OBJEXT) +src_nohup_DEPENDENCIES = $(am__DEPENDENCIES_2) +src_nproc_SOURCES = src/nproc.c +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_od_SOURCES = src/od.c +src_od_OBJECTS = src/od.$(OBJEXT) +src_od_DEPENDENCIES = $(am__DEPENDENCIES_2) +src_paste_SOURCES = src/paste.c +src_paste_OBJECTS = src/paste.$(OBJEXT) +src_paste_DEPENDENCIES = $(am__DEPENDENCIES_2) +src_pathchk_SOURCES = src/pathchk.c +src_pathchk_OBJECTS = src/pathchk.$(OBJEXT) +src_pathchk_DEPENDENCIES = $(am__DEPENDENCIES_2) +src_pinky_SOURCES = src/pinky.c +src_pinky_OBJECTS = src/pinky.$(OBJEXT) +src_pinky_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) +src_pr_SOURCES = src/pr.c +src_pr_OBJECTS = src/pr.$(OBJEXT) +src_pr_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) +src_printenv_SOURCES = src/printenv.c +src_printenv_OBJECTS = src/printenv.$(OBJEXT) +src_printenv_DEPENDENCIES = $(am__DEPENDENCIES_2) +src_printf_SOURCES = src/printf.c +src_printf_OBJECTS = src/printf.$(OBJEXT) +src_printf_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) +src_ptx_SOURCES = src/ptx.c +src_ptx_OBJECTS = src/ptx.$(OBJEXT) +src_ptx_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) +src_pwd_SOURCES = src/pwd.c +src_pwd_OBJECTS = src/pwd.$(OBJEXT) +src_pwd_DEPENDENCIES = $(am__DEPENDENCIES_2) +src_readlink_SOURCES = src/readlink.c +src_readlink_OBJECTS = src/readlink.$(OBJEXT) +src_readlink_DEPENDENCIES = $(am__DEPENDENCIES_2) +am_src_realpath_OBJECTS = src/realpath.$(OBJEXT) src/relpath.$(OBJEXT) +src_realpath_OBJECTS = $(am_src_realpath_OBJECTS) +src_realpath_DEPENDENCIES = $(am__DEPENDENCIES_2) \ + $(am__DEPENDENCIES_1) +am_src_rm_OBJECTS = src/rm.$(OBJEXT) src/remove.$(OBJEXT) +src_rm_OBJECTS = $(am_src_rm_OBJECTS) +src_rm_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_6) +am_src_rmdir_OBJECTS = src/rmdir.$(OBJEXT) src/prog-fprintf.$(OBJEXT) +src_rmdir_OBJECTS = $(am_src_rmdir_OBJECTS) +src_rmdir_DEPENDENCIES = $(am__DEPENDENCIES_2) +src_runcon_SOURCES = src/runcon.c +src_runcon_OBJECTS = src/runcon.$(OBJEXT) +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) +am_src_sha224sum_OBJECTS = src/src_sha224sum-md5sum.$(OBJEXT) +src_sha224sum_OBJECTS = $(am_src_sha224sum_OBJECTS) +src_sha224sum_DEPENDENCIES = $(am__DEPENDENCIES_2) +am_src_sha256sum_OBJECTS = src/src_sha256sum-md5sum.$(OBJEXT) +src_sha256sum_OBJECTS = $(am_src_sha256sum_OBJECTS) +src_sha256sum_DEPENDENCIES = $(am__DEPENDENCIES_2) +am_src_sha384sum_OBJECTS = src/src_sha384sum-md5sum.$(OBJEXT) +src_sha384sum_OBJECTS = $(am_src_sha384sum_OBJECTS) +src_sha384sum_DEPENDENCIES = $(am__DEPENDENCIES_2) +am_src_sha512sum_OBJECTS = src/src_sha512sum-md5sum.$(OBJEXT) +src_sha512sum_OBJECTS = $(am_src_sha512sum_OBJECTS) +src_sha512sum_DEPENDENCIES = $(am__DEPENDENCIES_2) +src_shred_SOURCES = src/shred.c +src_shred_OBJECTS = src/shred.$(OBJEXT) +src_shred_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) +src_shuf_SOURCES = src/shuf.c +src_shuf_OBJECTS = src/shuf.$(OBJEXT) +src_shuf_DEPENDENCIES = $(am__DEPENDENCIES_2) +src_sleep_SOURCES = src/sleep.c +src_sleep_OBJECTS = src/sleep.$(OBJEXT) +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) +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_stdbuf_SOURCES = src/stdbuf.c +src_stdbuf_OBJECTS = src/stdbuf.$(OBJEXT) +src_stdbuf_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) +src_stty_SOURCES = src/stty.c +src_stty_OBJECTS = src/stty.$(OBJEXT) +src_stty_DEPENDENCIES = $(am__DEPENDENCIES_2) +src_sum_SOURCES = src/sum.c +src_sum_OBJECTS = src/sum.$(OBJEXT) +src_sum_DEPENDENCIES = $(am__DEPENDENCIES_2) +src_sync_SOURCES = src/sync.c +src_sync_OBJECTS = src/sync.$(OBJEXT) +src_sync_DEPENDENCIES = $(am__DEPENDENCIES_2) +src_tac_SOURCES = src/tac.c +src_tac_OBJECTS = src/tac.$(OBJEXT) +src_tac_DEPENDENCIES = $(am__DEPENDENCIES_2) +src_tail_SOURCES = src/tail.c +src_tail_OBJECTS = src/tail.$(OBJEXT) +src_tail_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) +src_tee_SOURCES = src/tee.c +src_tee_OBJECTS = src/tee.$(OBJEXT) +src_tee_DEPENDENCIES = $(am__DEPENDENCIES_2) +src_test_SOURCES = src/test.c +src_test_OBJECTS = src/test.$(OBJEXT) +src_test_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) +am_src_timeout_OBJECTS = src/timeout.$(OBJEXT) \ + src/operand2sig.$(OBJEXT) +src_timeout_OBJECTS = $(am_src_timeout_OBJECTS) +src_timeout_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) +src_touch_SOURCES = src/touch.c +src_touch_OBJECTS = src/touch.$(OBJEXT) +src_touch_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) +src_tr_SOURCES = src/tr.c +src_tr_OBJECTS = src/tr.$(OBJEXT) +src_tr_DEPENDENCIES = $(am__DEPENDENCIES_2) +src_true_SOURCES = src/true.c +src_true_OBJECTS = src/true.$(OBJEXT) +src_true_DEPENDENCIES = $(am__DEPENDENCIES_2) +src_truncate_SOURCES = src/truncate.c +src_truncate_OBJECTS = src/truncate.$(OBJEXT) +src_truncate_DEPENDENCIES = $(am__DEPENDENCIES_2) \ + $(am__DEPENDENCIES_1) +src_tsort_SOURCES = src/tsort.c +src_tsort_OBJECTS = src/tsort.$(OBJEXT) +src_tsort_DEPENDENCIES = $(am__DEPENDENCIES_2) +src_tty_SOURCES = src/tty.c +src_tty_OBJECTS = src/tty.$(OBJEXT) +src_tty_DEPENDENCIES = $(am__DEPENDENCIES_2) +am_src_uname_OBJECTS = src/uname.$(OBJEXT) src/uname-uname.$(OBJEXT) +src_uname_OBJECTS = $(am_src_uname_OBJECTS) +src_uname_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) +src_unexpand_SOURCES = src/unexpand.c +src_unexpand_OBJECTS = src/unexpand.$(OBJEXT) +src_unexpand_DEPENDENCIES = $(am__DEPENDENCIES_2) +src_uniq_SOURCES = src/uniq.c +src_uniq_OBJECTS = src/uniq.$(OBJEXT) +src_uniq_DEPENDENCIES = $(am__DEPENDENCIES_2) +src_unlink_SOURCES = src/unlink.c +src_unlink_OBJECTS = src/unlink.$(OBJEXT) +src_unlink_DEPENDENCIES = $(am__DEPENDENCIES_2) +src_uptime_SOURCES = src/uptime.c +src_uptime_OBJECTS = src/uptime.$(OBJEXT) +src_uptime_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) +src_users_SOURCES = src/users.c +src_users_OBJECTS = src/users.$(OBJEXT) +src_users_DEPENDENCIES = $(am__DEPENDENCIES_2) +am_src_vdir_OBJECTS = src/ls.$(OBJEXT) src/ls-vdir.$(OBJEXT) +src_vdir_OBJECTS = $(am_src_vdir_OBJECTS) +src_vdir_DEPENDENCIES = $(am__DEPENDENCIES_5) +src_wc_SOURCES = src/wc.c +src_wc_OBJECTS = src/wc.$(OBJEXT) +src_wc_DEPENDENCIES = $(am__DEPENDENCIES_2) +src_who_SOURCES = src/who.c +src_who_OBJECTS = src/who.$(OBJEXT) +src_who_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) +src_whoami_SOURCES = src/whoami.c +src_whoami_OBJECTS = src/whoami.$(OBJEXT) +src_whoami_DEPENDENCIES = $(am__DEPENDENCIES_2) +src_yes_SOURCES = src/yes.c +src_yes_OBJECTS = src/yes.$(OBJEXT) +src_yes_DEPENDENCIES = $(am__DEPENDENCIES_2) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/lib +depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp +am__depfiles_maybe = depfiles +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 +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 " $@; +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 " $@; +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 " $@; +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) \ + $(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_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 +DIST_SOURCES = $(am__lib_libcoreutils_a_SOURCES_DIST) \ + $(EXTRA_lib_libcoreutils_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_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 +INFO_DEPS = $(srcdir)/doc/coreutils.info +TEXINFO_TEX = $(top_srcdir)/build-aux/texinfo.tex +am__TEXINFO_TEX_DIR = $(top_srcdir)/build-aux +DVIS = doc/coreutils.dvi +PDFS = doc/coreutils.pdf +PSS = doc/coreutils.ps +HTMLS = doc/coreutils.html +TEXINFOS = doc/coreutils.texi +TEXI2DVI = texi2dvi +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 \ @@ -324,14 +1088,145 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +man1dir = $(mandir)/man1 +NROFF = nroff +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 \ - cscope distdir dist dist-all distcheck + check recheck check-html recheck-html distdir dist dist-all \ + distcheck ETAGS = etags CTAGS = ctags -CSCOPE = cscope +# 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=''; \ +} +# 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; \ +}' +# 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 +# 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. +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +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 $$?; \ +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; \ +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 +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_COMPILE = $(SH_LOG_COMPILER) $(AM_SH_LOG_FLAGS) $(SH_LOG_FLAGS) +am__test_logs4 = $(am__test_logs3:.pl.log=.log) +PL_LOG_COMPILE = $(PL_LOG_COMPILER) $(AM_PL_LOG_FLAGS) $(PL_LOG_FLAGS) +TEST_LOGS = $(am__test_logs4:.xpl.log=.log) +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) @@ -342,7 +1237,6 @@ 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,'; \ @@ -370,12 +1264,16 @@ 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$$' distcleancheck_listfiles = find . -type f -print pkglibexecdir = @pkglibexecdir@ + +# Use 'ginstall' in the definition of PROGRAMS and in dependencies to avoid +# confusion with the 'install' target. The install rule transforms 'ginstall' +# to install before applying any user-specified name transformations. +transform = s/ginstall/install/; $(program_transform_name) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALLOCA_H = @ALLOCA_H@ @@ -397,7 +1295,6 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CONFIG_INCLUDE = @CONFIG_INCLUDE@ -CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -416,6 +1313,7 @@ EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ ERRNO_H = @ERRNO_H@ EXEEXT = @EXEEXT@ +EXTRA_MANS = @EXTRA_MANS@ FLOAT_H = @FLOAT_H@ FNMATCH_H = @FNMATCH_H@ GETADDRINFO_LIB = @GETADDRINFO_LIB@ @@ -486,7 +1384,6 @@ GNULIB_FDATASYNC = @GNULIB_FDATASYNC@ GNULIB_FDOPEN = @GNULIB_FDOPEN@ GNULIB_FDOPENDIR = @GNULIB_FDOPENDIR@ GNULIB_FFLUSH = @GNULIB_FFLUSH@ -GNULIB_FFS = @GNULIB_FFS@ GNULIB_FFSL = @GNULIB_FFSL@ GNULIB_FFSLL = @GNULIB_FFSLL@ GNULIB_FGETC = @GNULIB_FGETC@ @@ -918,7 +1815,6 @@ HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@ HAVE_DECL_SQRTL = @HAVE_DECL_SQRTL@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@ -HAVE_DECL_STRNCASECMP = @HAVE_DECL_STRNCASECMP@ HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@ HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ @@ -955,7 +1851,6 @@ HAVE_FCNTL = @HAVE_FCNTL@ HAVE_FDATASYNC = @HAVE_FDATASYNC@ HAVE_FDOPENDIR = @HAVE_FDOPENDIR@ HAVE_FEATURES_H = @HAVE_FEATURES_H@ -HAVE_FFS = @HAVE_FFS@ HAVE_FFSL = @HAVE_FFSL@ HAVE_FFSLL = @HAVE_FFSLL@ HAVE_FMA = @HAVE_FMA@ @@ -1100,10 +1995,8 @@ HAVE_SQRTL = @HAVE_SQRTL@ HAVE_STDINT_H = @HAVE_STDINT_H@ HAVE_STPCPY = @HAVE_STPCPY@ HAVE_STPNCPY = @HAVE_STPNCPY@ -HAVE_STRCASECMP = @HAVE_STRCASECMP@ HAVE_STRCASESTR = @HAVE_STRCASESTR@ HAVE_STRCHRNUL = @HAVE_STRCHRNUL@ -HAVE_STRINGS_H = @HAVE_STRINGS_H@ HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRPTIME = @HAVE_STRPTIME@ HAVE_STRSEP = @HAVE_STRSEP@ @@ -1201,10 +2094,9 @@ INET_NTOP_LIB = @INET_NTOP_LIB@ INET_PTON_LIB = @INET_PTON_LIB@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = $(cu_install_program) INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTALL_SU = @INSTALL_SU@ INT32_MAX_LT_INTMAX_MAX = @INT32_MAX_LT_INTMAX_MAX@ INT64_MAX_EQ_LONG_MAX = @INT64_MAX_EQ_LONG_MAX@ INTLLIBS = @INTLLIBS@ @@ -1228,7 +2120,6 @@ LIBUNISTRING_UNIWIDTH_H = @LIBUNISTRING_UNIWIDTH_H@ LIB_ACL = @LIB_ACL@ LIB_CAP = @LIB_CAP@ LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ -LIB_CRYPT = @LIB_CRYPT@ LIB_EACCESS = @LIB_EACCESS@ LIB_FDATASYNC = @LIB_FDATASYNC@ LIB_GETHRXTIME = @LIB_GETHRXTIME@ @@ -1284,7 +2175,6 @@ NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@ NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@ NEXT_AS_FIRST_DIRECTIVE_STDIO_H = @NEXT_AS_FIRST_DIRECTIVE_STDIO_H@ NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@ -NEXT_AS_FIRST_DIRECTIVE_STRINGS_H = @NEXT_AS_FIRST_DIRECTIVE_STRINGS_H@ NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_IOCTL_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_IOCTL_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_RESOURCE_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_RESOURCE_H@ @@ -1324,7 +2214,6 @@ NEXT_STDDEF_H = @NEXT_STDDEF_H@ NEXT_STDINT_H = @NEXT_STDINT_H@ NEXT_STDIO_H = @NEXT_STDIO_H@ NEXT_STDLIB_H = @NEXT_STDLIB_H@ -NEXT_STRINGS_H = @NEXT_STRINGS_H@ NEXT_STRING_H = @NEXT_STRING_H@ NEXT_SYS_IOCTL_H = @NEXT_SYS_IOCTL_H@ NEXT_SYS_RESOURCE_H = @NEXT_SYS_RESOURCE_H@ @@ -1341,10 +2230,7 @@ NEXT_TIME_H = @NEXT_TIME_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ NEXT_WCHAR_H = @NEXT_WCHAR_H@ NEXT_WCTYPE_H = @NEXT_WCTYPE_H@ -NO_INSTALL_PROGS_DEFAULT = @NO_INSTALL_PROGS_DEFAULT@ OBJEXT = @OBJEXT@ -OPTIONAL_BIN_PROGS = @OPTIONAL_BIN_PROGS@ -OPTIONAL_PKGLIB_PROGS = @OPTIONAL_PKGLIB_PROGS@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -1503,6 +2389,7 @@ REPLACE_PREAD = @REPLACE_PREAD@ REPLACE_PRINTF = @REPLACE_PRINTF@ REPLACE_PSELECT = @REPLACE_PSELECT@ REPLACE_PTHREAD_SIGMASK = @REPLACE_PTHREAD_SIGMASK@ +REPLACE_PTSNAME = @REPLACE_PTSNAME@ REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@ REPLACE_PUTENV = @REPLACE_PUTENV@ REPLACE_PWRITE = @REPLACE_PWRITE@ @@ -1626,6 +2513,9 @@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ + +# The user can tweak these lists at configure time. +bin_PROGRAMS = @bin_PROGRAMS@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -1633,6 +2523,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ builddir = @builddir@ +built_programs = @built_programs@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -1657,10 +2548,12 @@ libexecdir = @libexecdir@ lispdir = @lispdir@ localedir = @localedir@ localstatedir = @localstatedir@ +man1_MANS = @man1_MANS@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkglibexec_PROGRAMS = @pkglibexec_PROGRAMS@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ @@ -1672,10 +2565,8 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ - -# Some tests always need root privileges, others need them only sometimes. -ALL_RECURSIVE_TARGETS = install-root check-root distcheck-hook -SUBDIRS = lib src doc man po tests gnulib-tests +ALL_RECURSIVE_TARGETS = distcheck-hook check-root +SUBDIRS = po . gnulib-tests changelog_etc = \ ChangeLog-2005 \ ChangeLog-2006 \ @@ -1695,27 +2586,195 @@ changelog_etc = \ old/textutils/NEWS \ po/ChangeLog-2007 -EXTRA_DIST = \ - $(changelog_etc) \ - .mailmap \ - .prev-version \ - .version \ - .vg-suppressions \ - THANKS.in \ - THANKS-to-translators \ - THANKStt.in \ - bootstrap \ - bootstrap.conf \ - build-aux/cvsu \ - cfg.mk \ - dist-check.mk \ - maint.mk \ - thanks-gen +#if GNU_MAKE +# [nicer features that work only with GNU Make] +#else +# [fallback features that work in any 'make' implementation; see +# 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 \ + $(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 \ + lib/backupfile.h lib/btowc.c lib/c-strcaseeq.h lib/c-strtod.h \ + lib/c-strtod.c lib/c-strtod.h lib/calloc.c lib/calloc.c \ + lib/canon-host.h lib/canonicalize.h lib/careadlinkat.h \ + 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 \ + $(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 \ + lib/exclude.h lib/exitfail.h 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/fcntl.in.h \ + lib/fcntl--.h lib/fcntl-safer.h lib/fd-hook.h lib/fdatasync.c \ + lib/fdopen.c lib/fdopendir.c lib/utimens.h lib/fflush.c \ + lib/stdio-impl.h lib/file-set.h lib/file-type.h \ + lib/fileblocks.c lib/filemode.h lib/filename.h \ + lib/filenamecat.h lib/filevercmp.h lib/float.c lib/float.in.h \ + lib/itold.c lib/fnmatch.c lib/fnmatch.in.h lib/fnmatch_loop.c \ + lib/fopen.c lib/stdio--.h lib/stdio-safer.h lib/fpending.c \ + lib/fpending.h lib/fprintftime.h lib/fpucw.h lib/fpurge.c \ + lib/stdio-impl.h lib/freadahead.c lib/freadahead.h \ + lib/stdio-impl.h lib/freading.h lib/stdio-impl.h \ + lib/freadptr.c lib/freadptr.h lib/stdio-impl.h lib/freadseek.h \ + lib/stdio-impl.h lib/freopen.c lib/stdio--.h lib/stdio-safer.h \ + lib/frexp.c lib/frexp.c lib/frexpl.c lib/fseek.c lib/fseeko.c \ + lib/stdio-impl.h lib/fseterr.c lib/fseterr.h lib/stdio-impl.h \ + lib/fstat.c lib/at-func.c lib/fstatat.c lib/fsusage.c \ + lib/fsusage.h lib/fsync.c lib/ftell.c lib/ftello.c \ + lib/stdio-impl.h lib/ftoastr.h lib/ftruncate.c lib/fts-cycle.c \ + lib/fts.c lib/fts_.h lib/full-write.c lib/futimens.c \ + $(top_srcdir)/build-aux/gendocs.sh 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/w32sock.h lib/gethrxtime.h lib/xtime.h \ + lib/getline.c lib/getloadavg.c lib/getlogin.c lib/getndelim2.h \ + lib/getopt.c lib/getopt.in.h lib/getopt1.c lib/getopt_int.h \ + lib/getpagesize.c lib/getpass.c lib/getpass.h \ + lib/gettimeofday.c lib/getugroups.h lib/getusershell.c \ + $(top_srcdir)/build-aux/git-version-gen \ + $(top_srcdir)/build-aux/gitlog-to-changelog \ + $(top_srcdir)/build-aux/gnu-web-doc-update \ + $(top_srcdir)/GNUmakefile $(top_srcdir)/build-aux/gnupload \ + lib/group-member.c lib/hard-locale.h lib/hash.h \ + lib/hash-triple.h $(top_srcdir)/build-aux/config.rpath \ + lib/human.h lib/i-ring.h lib/iconv.in.h 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 lib/iconv.c \ + lib/iconv_close.c lib/iconv_open-aix.gperf \ + lib/iconv_open-hpux.gperf lib/iconv_open-irix.gperf \ + lib/iconv_open-osf.gperf lib/iconv_open-solaris.gperf \ + lib/iconv_open.c lib/idcache.h lib/ignore-value.h \ + lib/inet_ntop.c lib/intprops.h lib/anytostr.c lib/inttostr.h \ + lib/inttypes.in.h lib/isapipe.c lib/isapipe.h lib/isatty.c \ + lib/isblank.c lib/float+.h lib/isnan.c lib/isnand-nolibm.h \ + lib/isnand.c lib/float+.h lib/isnan.c lib/isnanf-nolibm.h \ + lib/isnanf.c lib/float+.h lib/isnan.c lib/isnanl-nolibm.h \ + lib/isnanl.c lib/iswblank.c lib/langinfo.in.h lib/lchown.c \ + lib/ftoastr.c lib/ftoastr.h lib/link.c lib/at-func2.c \ + lib/linkat.c lib/config.charset lib/ref-add.sin \ + lib/ref-del.sin lib/locale.in.h lib/localeconv.c \ + lib/long-options.h lib/lseek.c lib/lstat.c \ + $(top_srcdir)/maint.mk lib/malloc.c lib/malloc.c lib/malloca.h \ + lib/malloca.valgrind lib/math.in.h lib/mbchar.h lib/mbrlen.c \ + lib/mbrtowc.c lib/mbsinit.c lib/mbsrtowcs-impl.h \ + lib/mbsrtowcs-state.c lib/mbsrtowcs.c lib/str-kmp.h \ + lib/mbtowc-impl.h lib/mbtowc.c lib/memcasecmp.h lib/memchr.c \ + lib/memchr.valgrind lib/memchr2.valgrind lib/memcmp2.h \ + lib/memcoll.h lib/mempcpy.c lib/memrchr.c lib/mgetgroups.h \ + lib/mkancesdirs.h lib/mkdir.c lib/dirchownmod.h lib/mkdir-p.h \ + lib/mkfifo.c lib/mknod.c lib/mkstemp.c lib/mktime-internal.h \ + lib/mktime.c lib/modechange.h lib/mountlist.c lib/mountlist.h \ + lib/mpsort.h lib/msvc-inval.c lib/msvc-inval.h \ + lib/msvc-nothrow.c lib/msvc-nothrow.h lib/nanosleep.c \ + lib/netdb.in.h lib/netinet_in.in.h lib/nl_langinfo.c \ + $(top_srcdir)/build-aux/prefix-gnulib-mk lib/nproc.h \ + 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/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/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 \ + lib/regex.c lib/regex.h lib/regex_internal.c \ + lib/regex_internal.h lib/regexec.c lib/remove.c lib/rename.c \ + 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 \ + $(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/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 \ + lib/sys_wait.in.h lib/tempname.h lib/termios.in.h \ + $(top_srcdir)/build-aux/config.rpath lib/time.in.h \ + lib/time_r.c lib/timespec.h lib/trim.h lib/u64.h lib/uname.c \ + lib/unistd.in.h lib/unistd--.h lib/unistd-safer.h \ + lib/unistr.in.h lib/unitypes.in.h lib/localcharset.h \ + lib/uniwidth.in.h lib/uniwidth/cjk.h lib/unlink.c \ + lib/at-func.c lib/unlinkat.c lib/unlocked-io.h lib/unsetenv.c \ + $(top_srcdir)/build-aux/update-copyright \ + $(top_srcdir)/build-aux/useless-if-before-free lib/userspec.h \ + lib/utimecmp.h lib/utimens.h lib/at-func.c lib/utimensat.c \ + lib/asnprintf.c lib/float+.h lib/printf-args.c \ + 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) +gen_progs_lists = $(top_srcdir)/build-aux/gen-lists-of-programs.sh ACLOCAL_AMFLAGS = -I m4 # Just prior to distribution, ... -# transform the automake-generated rule that runs 'rm -f rm'. +# transform the automake-generated rule that runs 'rm -f rm > /dev/null 2>&1 || /bin/rm -f rm'. # On some systems, that command would fail with a diagnostic like # "rm: cannot unlink 'rm': Text file busy" when '.' appears so early # in the shell's search path that running 'rm' would run the 'rm' @@ -1724,10 +2783,52 @@ ACLOCAL_AMFLAGS = -I m4 rm_subst = \ s!(rm -f (rm\b|\$$\(bin_PROGRAMS\)$$))!$$1 > /dev/null 2>&1 || /bin/$$1! -BUILT_SOURCES = .version + +# The BUILT_SOURCES created by this Makefile snippet are not used via #include +# 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. + +# The BUILT_SOURCES created by this Makefile snippet are not used via #include +# 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. + +# The BUILT_SOURCES created by this Makefile snippet are not used via #include +# 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. + +# This file is built by maintainers. It's architecture-independent, +# and it needs to be built on a widest-known-int architecture, so it's +# built only if absent. It is not cleaned because we don't want to +# insist that maintainers must build on hosts that support the widest +# known ints (currently 128-bit). +BUILT_SOURCES = .version $(ALLOCA_H) lib/arpa/inet.h lib/configmake.h \ + lib/ctype.h lib/dirent.h $(ERRNO_H) lib/fcntl.h $(FLOAT_H) \ + $(FNMATCH_H) $(GETOPT_H) $(ICONV_H) 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 lib/inttypes.h \ + lib/langinfo.h lib/locale.h lib/math.h lib/netdb.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 gen_start_date = 2008-02-08 -DISTCLEANFILES = VERSION -MAINTAINERCLEANFILES = THANKS-to-translators +DISTCLEANFILES = VERSION src/version.c src/version.h +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 \ + lib/parse-datetime.c $(BUILT_SOURCES) doc/constants.texi # Sort in traditional ASCII order, regardless of the current locale; # otherwise we may get into trouble with distinct strings that the @@ -1736,13 +2837,1336 @@ 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 +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 \ + lib/errno.h-t lib/fcntl.h lib/fcntl.h-t lib/float.h \ + lib/float.h-t lib/fnmatch.h lib/fnmatch.h-t lib/getopt.h \ + lib/getopt.h-t lib/iconv.h lib/iconv.h-t \ + lib/iconv_open-aix.h-t lib/iconv_open-hpux.h-t \ + lib/iconv_open-irix.h-t lib/iconv_open-osf.h-t \ + lib/iconv_open-solaris.h-t lib/inttypes.h lib/inttypes.h-t \ + lib/langinfo.h lib/langinfo.h-t lib/locale.h lib/locale.h-t \ + lib/math.h lib/math.h-t lib/netdb.h lib/netdb.h-t \ + lib/netinet/in.h lib/netinet/in.h-t lib/parse-datetime.c-t \ + lib/pthread.h lib/pthread.h-t lib/sched.h lib/sched.h-t \ + lib/selinux/selinux.h lib/selinux/selinux.h-t \ + lib/selinux/context.h lib/selinux/context.h-t lib/signal.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 + +# 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 \ + 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 \ + 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 \ + lib/filenamecat-lgpl.c lib/filevercmp.c lib/fopen-safer.c \ + lib/fprintftime.c lib/freading.c lib/freadseek.c \ + lib/freopen-safer.c lib/ftoastr.c lib/full-read.h \ + lib/full-read.c lib/full-write.h lib/full-write.c \ + lib/gethrxtime.c lib/xtime.c lib/getndelim2.c lib/gettext.h \ + lib/gettime.c lib/getugroups.c lib/hard-locale.c lib/hash.c \ + lib/hash-pjw.h lib/hash-pjw.c lib/hash-triple.c lib/heap.c \ + lib/heap.h lib/human.c lib/i-ring.c lib/idcache.c \ + lib/ino-map.c lib/ino-map.h lib/imaxtostr.c lib/inttostr.c \ + lib/offtostr.c lib/uinttostr.c lib/umaxtostr.c lib/ldtoastr.c \ + lib/linebuffer.h lib/linebuffer.c lib/localcharset.h \ + lib/localcharset.c lib/glthread/lock.h lib/glthread/lock.c \ + lib/long-options.c lib/malloca.c lib/math.c lib/mbchar.c \ + lib/mbiter.h lib/mbiter.c lib/mbsalign.c lib/mbsalign.h \ + lib/mbscasecmp.c lib/mbslen.c lib/mbsstr.c lib/mbswidth.h \ + lib/mbswidth.c lib/mbuiter.h lib/mbuiter.c lib/memcasecmp.c \ + lib/memchr2.h lib/memchr2.c lib/memcmp2.c lib/memcoll.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/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 \ + lib/root-dev-ino.c lib/root-dev-ino.h lib/safe-read.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/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 \ + lib/xgethostname.c lib/xmemcoll.h lib/xmemcoll.c \ + lib/xnanosleep.c lib/xprintf.h lib/xprintf.c lib/xreadlink.c \ + lib/xsize.h lib/xsize.c lib/xstriconv.h lib/xstriconv.c \ + lib/xstrndup.h lib/xstrndup.c lib/xstrtod.c lib/xstrtoimax.c \ + lib/xstrtol.c lib/xstrtoul.c lib/xstrtol-error.c \ + lib/xstrtold.c lib/xstrtoumax.c lib/xvasprintf.h \ + 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 \ + 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/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 +GPERF = gperf +charset_alias = $(DESTDIR)$(libdir)/charset.alias +charset_tmp = $(DESTDIR)$(libdir)/charset.tmp + +# Because this Makefile snippet defines a variable used by other +# gnulib Makefile snippets, it must be present in all Makefile.am that +# need it. This is ensured by the applicability 'all' defined above. +_NORETURN_H = $(top_srcdir)/build-aux/snippet/_Noreturn.h +ARG_NONNULL_H = lib/arg-nonnull.h +CXXDEFS_H = lib/c++defs.h +UNUSED_PARAMETER_H = lib/unused-parameter.h +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 +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 +default__progs = src/[ src/base64 src/basename src/cat src/chcon \ + src/chgrp src/chmod src/chown src/cksum src/comm src/cp \ + src/csplit src/cut src/date src/dd src/dir src/dircolors \ + src/dirname src/du src/echo src/env src/expand src/expr \ + src/factor src/false src/fmt src/fold src/ginstall src/groups \ + src/head src/id src/join src/kill src/link src/ln src/logname \ + src/ls src/md5sum src/mkdir src/mkfifo src/mknod src/mktemp \ + src/mv src/nl src/nproc src/nohup src/numfmt src/od src/paste \ + src/pathchk src/pr src/printenv src/printf src/ptx src/pwd \ + src/readlink src/realpath src/rm src/rmdir src/runcon src/seq \ + src/sha1sum src/sha224sum src/sha256sum src/sha384sum \ + src/sha512sum src/shred src/shuf src/sleep src/sort src/split \ + src/stat src/sum src/sync src/tac src/tail src/tee src/test \ + src/timeout src/touch src/tr src/true src/truncate src/tsort \ + src/tty src/uname src/unexpand src/uniq src/unlink src/vdir \ + src/wc src/whoami src/yes +noinst_HEADERS = \ + src/chown-core.h \ + src/copy.h \ + src/cp-hash.h \ + src/dircolors.h \ + src/fiemap.h \ + src/find-mount-point.h \ + src/fs.h \ + src/fs-is-local.h \ + src/group-list.h \ + src/ioblksize.h \ + src/longlong.h \ + src/ls.h \ + src/operand2sig.h \ + src/prog-fprintf.h \ + src/remove.h \ + src/system.h \ + src/uname.h + +nodist_src_libver_a_SOURCES = src/version.c src/version.h + +# Tell the linker to omit references to unused shared libraries. +AM_LDFLAGS = $(IGNORE_UNUSED_LIBRARIES_CFLAGS) + +# Extra libraries needed by more than one program. Will be updated later. + +# for eaccess, euidaccess + +# for selinux use + +# for gettime, settime, utimecmp, utimens + +# for various ACL functions + +# for various xattr functions +copy_ldadd = $(LIB_EACCESS) $(LIB_SELINUX) $(LIB_CLOCK_GETTIME) \ + $(LIB_ACL) $(LIB_XATTR) +remove_ldadd = $(LIB_EACCESS) + +# Sometimes, the expansion of $(LIBINTL) includes -lc which may +# include modules defining variables like 'optind', so libcoreutils.a +# must precede $(LIBINTL) in order to ensure we use GNU getopt. +# But libcoreutils.a must also follow $(LIBINTL), since libintl uses +# replacement functions defined in libcoreutils.a. +LDADD = src/libver.a lib/libcoreutils.a $(LIBINTL) lib/libcoreutils.a + +# First, list all programs, to make listing per-program libraries easier. +# See [ below. +src_arch_LDADD = $(LDADD) +src_base64_LDADD = $(LDADD) +src_basename_LDADD = $(LDADD) + +# for print_unicode_char, proper_name_utf8 +src_cat_LDADD = $(LDADD) $(LIBICONV) +src_chcon_LDADD = $(LDADD) $(LIB_SELINUX) +src_chgrp_LDADD = $(LDADD) +src_chmod_LDADD = $(LDADD) +src_chown_LDADD = $(LDADD) +src_chroot_LDADD = $(LDADD) +src_cksum_LDADD = $(LDADD) +src_comm_LDADD = $(LDADD) +src_nproc_LDADD = $(LDADD) +src_cp_LDADD = $(LDADD) $(copy_ldadd) $(LIBICONV) +src_csplit_LDADD = $(LDADD) +src_cut_LDADD = $(LDADD) +src_date_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) + +# for gethrxtime + +# for fdatasync +src_dd_LDADD = $(LDADD) $(LIB_GETHRXTIME) $(LIB_FDATASYNC) +src_df_LDADD = $(LDADD) $(LIBICONV) +# See dir_LDADD below +src_dircolors_LDADD = $(LDADD) +src_dirname_LDADD = $(LDADD) +src_du_LDADD = $(LDADD) $(LIBICONV) +src_echo_LDADD = $(LDADD) +src_env_LDADD = $(LDADD) +src_expand_LDADD = $(LDADD) + +# for various GMP functions +src_expr_LDADD = $(LDADD) $(LIB_GMP) +src_factor_LDADD = $(LDADD) $(LIB_GMP) $(LIBICONV) +src_false_LDADD = $(LDADD) +src_fmt_LDADD = $(LDADD) +src_fold_LDADD = $(LDADD) +src_getlimits_LDADD = $(LDADD) $(LIBICONV) +src_ginstall_LDADD = $(LDADD) $(copy_ldadd) $(LIB_SELINUX) \ + $(LIB_CLOCK_GETTIME) +src_groups_LDADD = $(LDADD) +src_head_LDADD = $(LDADD) +src_hostid_LDADD = $(LDADD) + +# for gethostname, uname +src_hostname_LDADD = $(LDADD) $(GETHOSTNAME_LIB) +src_id_LDADD = $(LDADD) $(LIB_SELINUX) +src_join_LDADD = $(LDADD) + +# for strsignal +src_kill_LDADD = $(LDADD) $(LIBTHREAD) +src_link_LDADD = $(LDADD) +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) + +# 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) +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_od_LDADD = $(LDADD) +src_paste_LDADD = $(LDADD) +src_pathchk_LDADD = $(LDADD) + +# for canon_host +src_pinky_LDADD = $(LDADD) $(GETADDRINFO_LIB) +src_pr_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) +src_printenv_LDADD = $(LDADD) +src_printf_LDADD = $(LDADD) $(LIBICONV) +src_ptx_LDADD = $(LDADD) $(LIBICONV) +src_pwd_LDADD = $(LDADD) +src_readlink_LDADD = $(LDADD) +src_realpath_LDADD = $(LDADD) $(LIBICONV) +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_shred_LDADD = $(LDADD) $(LIB_FDATASYNC) +src_shuf_LDADD = $(LDADD) + +# for xnanosleep +src_sleep_LDADD = $(LDADD) $(LIB_NANOSLEEP) + +# for pthread +src_sort_LDADD = $(LDADD) $(LIB_EACCESS) $(LIB_NANOSLEEP) \ + $(LIB_PTHREAD) +src_split_LDADD = $(LDADD) $(LIBICONV) +src_stat_LDADD = $(LDADD) $(LIB_SELINUX) +src_stdbuf_LDADD = $(LDADD) $(LIBICONV) +src_stty_LDADD = $(LDADD) +src_sum_LDADD = $(LDADD) +src_sync_LDADD = $(LDADD) +src_tac_LDADD = $(LDADD) +src_tail_LDADD = $(LDADD) $(LIB_NANOSLEEP) +src_tee_LDADD = $(LDADD) +src_test_LDADD = $(LDADD) $(LIB_EACCESS) +src_timeout_LDADD = $(LDADD) $(LIB_TIMER_TIME) $(LIBICONV) +src_touch_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) +src_tr_LDADD = $(LDADD) +src_true_LDADD = $(LDADD) +src_truncate_LDADD = $(LDADD) $(LIBICONV) +src_tsort_LDADD = $(LDADD) +src_tty_LDADD = $(LDADD) +src_uname_LDADD = $(LDADD) $(GETHOSTNAME_LIB) +src_unexpand_LDADD = $(LDADD) +src_uniq_LDADD = $(LDADD) +src_unlink_LDADD = $(LDADD) + +# for getloadavg +src_uptime_LDADD = $(LDADD) $(GETLOADAVG_LIBS) +src_users_LDADD = $(LDADD) +# See vdir_LDADD below +src_wc_LDADD = $(LDADD) +src_who_LDADD = $(LDADD) $(GETADDRINFO_LIB) +src_whoami_LDADD = $(LDADD) +src_yes_LDADD = $(LDADD) + +# Synonyms. Recall that Automake transliterates '[' and '/' to '_'. +src___LDADD = $(src_test_LDADD) +src_dir_LDADD = $(src_ls_LDADD) +src_vdir_LDADD = $(src_ls_LDADD) + +# Get the release year from lib/version-etc.c. +RELEASE_YEAR = \ + `sed -n '/.*COPYRIGHT_YEAR = \([0-9][0-9][0-9][0-9]\) };/s//\1/p' \ + $(top_srcdir)/lib/version-etc.c` + +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) + +# This is for the '[' program. Automake transliterates '[' and '/' to '_'. +src___SOURCES = src/lbracket.c +src_cp_SOURCES = src/cp.c $(copy_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 +src_groups_SOURCES = src/groups.c src/group-list.c +src_ls_SOURCES = src/ls.c src/ls-ls.c +src_ln_SOURCES = src/ln.c src/relpath.c src/relpath.h +src_chown_SOURCES = src/chown.c src/chown-core.c +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_rm_SOURCES = src/rm.c src/remove.c +src_mkdir_SOURCES = src/mkdir.c src/prog-fprintf.c +src_rmdir_SOURCES = src/rmdir.c src/prog-fprintf.c +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 +src_arch_SOURCES = src/uname.c src/uname-arch.c +src_md5sum_CPPFLAGS = -DHASH_ALGO_MD5=1 $(AM_CPPFLAGS) +src_sha1sum_SOURCES = src/md5sum.c +src_sha1sum_CPPFLAGS = -DHASH_ALGO_SHA1=1 $(AM_CPPFLAGS) +src_sha224sum_SOURCES = src/md5sum.c +src_sha224sum_CPPFLAGS = -DHASH_ALGO_SHA224=1 $(AM_CPPFLAGS) +src_sha256sum_SOURCES = src/md5sum.c +src_sha256sum_CPPFLAGS = -DHASH_ALGO_SHA256=1 $(AM_CPPFLAGS) +src_sha384sum_SOURCES = src/md5sum.c +src_sha384sum_CPPFLAGS = -DHASH_ALGO_SHA384=1 $(AM_CPPFLAGS) +src_sha512sum_SOURCES = src/md5sum.c +src_sha512sum_CPPFLAGS = -DHASH_ALGO_SHA512=1 $(AM_CPPFLAGS) +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 = + +# 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) + +# false exits nonzero even with --help or --version. +# test doesn't support --help or --version. +# Tell automake to exempt then from that installcheck test. +AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = src/false src/test + +# Massage bits of the statfs man page and definitions from +# /usr/include/linux/magic.h to be in a form consistent with what's in fs.h. +fs_normalize_perl_subst = \ + -e 's/MINIX_SUPER_MAGIC\b/MINIX/;' \ + -e 's/MINIX_SUPER_MAGIC2\b/MINIX_30/;' \ + -e 's/MINIX2_SUPER_MAGIC\b/MINIX_V2/;' \ + -e 's/MINIX2_SUPER_MAGIC2\b/MINIX_V2_30/;' \ + -e 's/MINIX3_SUPER_MAGIC\b/MINIX_V3/;' \ + -e 's/CIFS_MAGIC_NUMBER/CIFS/;' \ + -e 's/(_SUPER)?_MAGIC//;' \ + -e 's/\s+0x(\S+)/" 0x" . uc $$1/e;' \ + -e 's/(\s+0x)(\X{3})\b/$${1}0$$2/;' \ + -e 's/(\s+0x)(\X{6})\b/$${1}00$$2/;' \ + -e 's/(\s+0x)(\X{7})\b/$${1}0$$2/;' \ + -e 's/^\s+//;' \ + -e 's/^\043define\s+//;' \ + -e 's/^_(XIAFS)/$$1/;' \ + -e 's/^USBDEVICE/USBDEVFS/;' \ + -e 's/NTFS_SB/NTFS/;' \ + -e 's/^/\043 define S_MAGIC_/;' \ + -e 's,\s*/\* .*? \*/,,;' + +all_programs = \ + $(bin_PROGRAMS) \ + $(bin_SCRIPTS) \ + $(EXTRA_PROGRAMS) + +pm = progs-makefile +pr = progs-readme +@CROSS_COMPILING_FALSE@cu_install_program = src/ginstall + +# Use the just-built 'ginstall', when not cross-compiling. +@CROSS_COMPILING_TRUE@cu_install_program = @INSTALL_PROGRAM@ +info_TEXINFOS = doc/coreutils.texi +doc_coreutils_TEXINFOS = \ + doc/perm.texi \ + doc/parse-datetime.texi \ + doc/constants.texi \ + doc/fdl.texi + + +# The following is necessary if the package name is 8 characters or longer. +# If the info documentation would be split into 10 or more separate files, +# then this is necessary even if the package name is 7 characters long. +# +# Tell makeinfo to put everything in a single info file: .info. +# Otherwise, it would also generate files with names like .info-[123], +# and those names all map to one 14-byte name (.info-) on some crufty +# old systems. +AM_MAKEINFOFLAGS = --no-split + +# Extended regular expressions to match word starts and ends. +_W = (^|[^A-Za-z0-9_]) +W_ = ([^A-Za-z0-9_]|$$) +syntax_checks = \ + sc-avoid-builtin \ + sc-avoid-io \ + sc-avoid-non-zero \ + sc-avoid-path \ + sc-avoid-timezone \ + sc-avoid-zeroes \ + sc-exponent-grouping \ + sc-lower-case-var + +texi_files = $(srcdir)/doc/*.texi + +# The quantity inside @var{...} should not contain upper case letters. +# The leading backslash exemption is to permit in-macro uses like +# @var{\varName\} where the upper case letter is part of a parameter name. +find_upper_case_var = \ + '/\@var{/ or next; \ + while (/\@var{(.+?)}/g) \ + { \ + $$v = $$1; \ + $$v =~ /[A-Z]/ && $$v !~ /^\\/ and (print "$$ARGV:$$.:$$_"), $$m = 1 \ + } \ + END {$$m and (warn "$@: do not use upper case in \@var{...}\n"), exit 1}' + +@HAVE_PERL_FALSE@run_help2man = $(SHELL) $(srcdir)/man/dummy-man +@HAVE_PERL_TRUE@run_help2man = $(PERL) -- $(srcdir)/man/help2man +ALL_MANS = $(man1_MANS) $(EXTRA_MANS) + +# Dependencies common to all man pages. Updated below. + +# Depend on this to get version number changes. + +# This is required so that changes to e.g., emit_bug_reporting_address +# provoke regeneration of all the manpages. +mandeps = .version $(top_srcdir)/src/system.h + +# Indirections required so that we'll still be able to know the +# complete list of our tests even if the user overrides TESTS +# from the command line (as permitted by the test harness API). +TESTS = $(all_tests) $(factor_tests) +root_tests = $(all_root_tests) +TEST_EXTENSIONS = .sh .pl .xpl +@HAVE_PERL_FALSE@TESTSUITE_PERL = $(SHELL) $(srcdir)/no-perl +@HAVE_PERL_TRUE@TESTSUITE_PERL = $(PERL) + +# Options passed to the perl invocations running the perl test scripts. +# '$f' is set by the Automake-generated test harness to the path of the +# current test script stripped of VPATH components, and is used by the +# CuTmpdir module to determine the name of the temporary files to be +# used. Note that $f is a shell variable, not a make macro, so the use +# of '$$f' below is correct, and not a typo. +TESTSUITE_PERL_OPTIONS = -w -I$(srcdir)/tests -MCoreutils -MCuSkip \ + -M"CuTmpdir qw($$f)" +SH_LOG_COMPILER = $(SHELL) +PL_LOG_COMPILER = $(TESTSUITE_PERL) $(TESTSUITE_PERL_OPTIONS) +# Perl scripts that must be run in tainted mode. +XPL_LOG_COMPILER = $(TESTSUITE_PERL) -T $(TESTSUITE_PERL_OPTIONS) + +# We don't want this to go in the top-level directory. +TEST_SUITE_LOG = tests/test-suite.log + +# Note that the first lines are statements. They ensure that environment +# variables that can perturb tests are unset or set to expected values. +# The rest are envvar settings that propagate build-related Makefile +# variables to test scripts. +TESTS_ENVIRONMENT = \ + . $(srcdir)/tests/lang-default; \ + tmp__=$${TMPDIR-/tmp}; \ + test -d "$$tmp__" && test -w "$$tmp__" || tmp__=.; \ + . $(srcdir)/tests/envvar-check; \ + TMPDIR=$$tmp__; export TMPDIR; \ + export \ + VERSION='$(VERSION)' \ + LOCALE_FR='$(LOCALE_FR)' \ + LOCALE_FR_UTF8='$(LOCALE_FR_UTF8)' \ + abs_top_builddir='$(abs_top_builddir)' \ + abs_top_srcdir='$(abs_top_srcdir)' \ + abs_srcdir='$(abs_srcdir)' \ + built_programs='$(built_programs)' \ + host_os=$(host_os) \ + host_triplet='$(host_triplet)' \ + srcdir='$(srcdir)' \ + top_srcdir='$(top_srcdir)' \ + CONFIG_HEADER='$(abs_top_builddir)/$(CONFIG_INCLUDE)' \ + CU_TEST_NAME=`basename '$(abs_srcdir)'`,`echo $$tst|sed 's,^\./,,;s,/,-,g'` \ + CC='$(CC)' \ + AWK='$(AWK)' \ + EGREP='$(EGREP)' \ + EXEEXT='$(EXEEXT)' \ + MAKE=$(MAKE) \ + PACKAGE_BUGREPORT='$(PACKAGE_BUGREPORT)' \ + PACKAGE_VERSION=$(PACKAGE_VERSION) \ + PERL='$(PERL)' \ + PREFERABLY_POSIX_SHELL='$(PREFERABLY_POSIX_SHELL)' \ + ; test -d /usr/xpg4/bin && PATH='/usr/xpg4/bin$(PATH_SEPARATOR)'"$$PATH"; \ + PATH='$(abs_top_builddir)/src$(PATH_SEPARATOR)'"$$PATH" \ + ; 9>&2 + + +# On failure, display the global testsuite log on stdout. +VERBOSE = yes +all_root_tests = \ + tests/chown/basic.sh \ + tests/cp/cp-a-selinux.sh \ + tests/cp/preserve-gid.sh \ + tests/cp/special-bits.sh \ + tests/cp/cp-mv-enotsup-xattr.sh \ + tests/cp/capability.sh \ + tests/cp/sparse-fiemap.sh \ + tests/dd/skip-seek-past-dev.sh \ + tests/df/problematic-chars.sh \ + tests/du/bind-mount-dir-cycle.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/mv/sticky-to-xpart.sh \ + tests/rm/fail-2eperm.sh \ + tests/rm/no-give-up.sh \ + tests/rm/one-file-system.sh \ + tests/rm/read-only.sh \ + tests/tail-2/append-only.sh \ + tests/touch/now-owned-by-other.sh + + +# Do not choose a name that is a shell keyword like 'if', or a +# commonly-used utility like 'cat' or 'test', as the name of a test. +# Otherwise, VPATH builds will fail on hosts like Solaris, since they +# will expand 'if test ...' to 'if .../test ...', and the '.../test' +# will execute the test script rather than the standard utility. + +# Notes on the ordering of these tests: +# Place early in the list tests of the tools that +# are most commonly used in test scripts themselves. +# E.g., nearly every test script uses rm and chmod. +# help-version comes early because it's a basic sanity test. +# Put seq early, since lots of other tests use it. +# Put tests that sleep early, but not all together, so in parallel builds +# they share time with tests that burn CPU, not with others that sleep. +# Put head-elide-tail early, because it's long-running. +all_tests = \ + tests/misc/help-version.sh \ + tests/tail-2/inotify-race.sh \ + tests/misc/invalid-opt.pl \ + tests/rm/ext3-perf.sh \ + tests/rm/cycle.sh \ + tests/cp/link-heap.sh \ + tests/misc/tty-eof.pl \ + tests/tail-2/inotify-hash-abuse.sh \ + tests/tail-2/inotify-hash-abuse2.sh \ + tests/tail-2/F-vs-missing.sh \ + tests/tail-2/F-vs-rename.sh \ + tests/tail-2/inotify-rotate.sh \ + tests/chmod/no-x.sh \ + tests/chgrp/basic.sh \ + tests/rm/dangling-symlink.sh \ + tests/misc/ls-time.sh \ + tests/rm/d-1.sh \ + tests/rm/d-2.sh \ + tests/rm/d-3.sh \ + tests/rm/deep-1.sh \ + tests/rm/deep-2.sh \ + tests/rm/dir-no-w.sh \ + tests/rm/dir-nonrecur.sh \ + tests/rm/dot-rel.sh \ + tests/rm/isatty.sh \ + tests/rm/empty-inacc.sh \ + tests/rm/empty-name.pl \ + tests/rm/f-1.sh \ + tests/rm/fail-eacces.sh \ + tests/rm/fail-eperm.xpl \ + tests/tail-2/assert.sh \ + tests/rm/hash.sh \ + tests/rm/i-1.sh \ + tests/rm/i-never.sh \ + tests/rm/i-no-r.sh \ + tests/tail-2/infloop-1.sh \ + tests/rm/ignorable.sh \ + tests/rm/inaccessible.sh \ + tests/rm/interactive-always.sh \ + tests/rm/interactive-once.sh \ + tests/rm/ir-1.sh \ + tests/rm/one-file-system2.sh \ + tests/rm/r-1.sh \ + tests/rm/r-2.sh \ + tests/rm/r-3.sh \ + tests/rm/r-4.sh \ + tests/rm/readdir-bug.sh \ + tests/rm/rm1.sh \ + tests/touch/empty-file.sh \ + tests/rm/rm2.sh \ + tests/rm/rm3.sh \ + tests/rm/rm4.sh \ + tests/rm/rm5.sh \ + tests/rm/sunos-1.sh \ + tests/rm/unread2.sh \ + tests/rm/unread3.sh \ + tests/rm/unreadable.pl \ + tests/rm/v-slash.sh \ + tests/rm/many-dir-entries-vs-OOM.sh \ + tests/chgrp/default-no-deref.sh \ + tests/chgrp/deref.sh \ + tests/chgrp/no-x.sh \ + tests/chgrp/posix-H.sh \ + tests/chgrp/recurse.sh \ + tests/fmt/base.pl \ + tests/fmt/long-line.sh \ + tests/fmt/goal-option.sh \ + tests/misc/env.sh \ + tests/misc/ptx.pl \ + tests/misc/test.pl \ + tests/misc/seq.pl \ + tests/misc/seq-long-double.sh \ + tests/misc/head.pl \ + tests/misc/head-elide-tail.pl \ + tests/tail-2/tail-n0f.sh \ + tests/misc/ls-misc.pl \ + tests/misc/date.pl \ + tests/misc/date-next-dow.pl \ + tests/misc/ptx-overrun.sh \ + tests/misc/xstrtol.pl \ + tests/tail-2/pid.sh \ + tests/misc/od.pl \ + tests/misc/od-float.sh \ + tests/misc/mktemp.pl \ + tests/misc/arch.sh \ + tests/misc/join.pl \ + tests/pr/pr-tests.pl \ + tests/misc/pwd-option.sh \ + tests/misc/chcon-fail.sh \ + tests/misc/cut.pl \ + tests/misc/cut-huge-to-eol-range.sh \ + tests/misc/wc.pl \ + tests/misc/wc-files0-from.pl \ + tests/misc/wc-files0.sh \ + tests/misc/wc-parallel.sh \ + tests/misc/cat-proc.sh \ + tests/misc/cat-buf.sh \ + tests/misc/base64.pl \ + tests/misc/basename.pl \ + tests/misc/close-stdout.sh \ + tests/misc/chroot-fail.sh \ + tests/misc/comm.pl \ + tests/misc/csplit.sh \ + tests/misc/csplit-1000.sh \ + tests/misc/csplit-heap.sh \ + tests/misc/date-sec.sh \ + tests/misc/dircolors.pl \ + tests/misc/dirname.pl \ + tests/misc/env-null.sh \ + tests/misc/expand.pl \ + tests/misc/expr.pl \ + tests/misc/factor.pl \ + tests/misc/false-status.sh \ + tests/misc/fold.pl \ + tests/misc/groups-dash.sh \ + 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/md5sum.pl \ + tests/misc/md5sum-bsd.sh \ + tests/misc/md5sum-newline.pl \ + tests/misc/md5sum-parallel.sh \ + tests/misc/mknod.sh \ + tests/misc/nice.sh \ + tests/misc/nice-fail.sh \ + tests/misc/nl.sh \ + tests/misc/nohup.sh \ + tests/misc/nproc-avail.sh \ + tests/misc/nproc-positive.sh \ + tests/misc/numfmt.pl \ + tests/misc/od-N.sh \ + tests/misc/od-multiple-t.sh \ + tests/misc/od-x8.sh \ + tests/misc/paste.pl \ + tests/misc/pathchk1.sh \ + tests/misc/printenv.sh \ + tests/misc/printf.sh \ + tests/misc/printf-cov.pl \ + tests/misc/printf-hex.sh \ + tests/misc/printf-surprise.sh \ + tests/misc/pwd-long.sh \ + tests/misc/readlink-fp-loop.sh \ + tests/misc/readlink-root.sh \ + tests/misc/realpath.sh \ + tests/misc/runcon-no-reorder.sh \ + tests/misc/sha1sum.pl \ + tests/misc/sha1sum-vec.pl \ + tests/misc/sha224sum.pl \ + tests/misc/sha256sum.pl \ + tests/misc/sha384sum.pl \ + tests/misc/sha512sum.pl \ + tests/misc/shred-exact.sh \ + tests/misc/shred-passes.sh \ + tests/misc/shred-remove.sh \ + tests/misc/shuf.sh \ + tests/misc/sort.pl \ + tests/misc/sort-benchmark-random.sh \ + tests/misc/sort-compress.sh \ + tests/misc/sort-compress-hang.sh \ + tests/misc/sort-compress-proc.sh \ + tests/misc/sort-continue.sh \ + tests/misc/sort-debug-keys.sh \ + tests/misc/sort-debug-warn.sh \ + tests/misc/sort-discrim.sh \ + tests/misc/sort-files0-from.pl \ + tests/misc/sort-float.sh \ + tests/misc/sort-merge.pl \ + tests/misc/sort-merge-fdlimit.sh \ + tests/misc/sort-month.sh \ + tests/misc/sort-exit-early.sh \ + tests/misc/sort-rand.sh \ + tests/misc/sort-spinlock-abuse.sh \ + tests/misc/sort-stale-thread-mem.sh \ + tests/misc/sort-unique.sh \ + tests/misc/sort-unique-segv.sh \ + tests/misc/sort-version.sh \ + tests/misc/sort-NaN-infloop.sh \ + tests/misc/sort-u-FMR.sh \ + tests/split/filter.sh \ + tests/split/suffix-auto-length.sh \ + tests/split/suffix-length.sh \ + tests/split/additional-suffix.sh \ + tests/split/b-chunk.sh \ + tests/split/fail.sh \ + tests/split/lines.sh \ + tests/split/l-chunk.sh \ + tests/split/r-chunk.sh \ + tests/split/numeric.sh \ + tests/split/guard-input.sh \ + tests/misc/stat-birthtime.sh \ + tests/misc/stat-fmt.sh \ + tests/misc/stat-hyphen.sh \ + tests/misc/stat-mount.sh \ + tests/misc/stat-nanoseconds.sh \ + tests/misc/stat-printf.pl \ + tests/misc/stat-slash.sh \ + tests/misc/stdbuf.sh \ + tests/misc/stty.sh \ + tests/misc/stty-invalid.sh \ + tests/misc/stty-pairs.sh \ + tests/misc/stty-row-col.sh \ + tests/misc/sum.pl \ + tests/misc/sum-sysv.sh \ + tests/misc/tac.pl \ + tests/misc/tac-continue.sh \ + tests/misc/tac-2-nonseekable.sh \ + tests/misc/tail.pl \ + tests/misc/tee.sh \ + tests/misc/tee-dash.sh \ + tests/misc/test-diag.pl \ + tests/misc/timeout.sh \ + tests/misc/timeout-blocked.pl \ + tests/misc/timeout-group.sh \ + tests/misc/timeout-parameters.sh \ + tests/misc/tr.pl \ + tests/misc/tr-case-class.sh \ + tests/misc/truncate-dangling-symlink.sh \ + tests/misc/truncate-dir-fail.sh \ + tests/misc/truncate-fail-diag.sh \ + tests/misc/truncate-fifo.sh \ + tests/misc/truncate-no-create-missing.sh \ + tests/misc/truncate-overflow.sh \ + tests/misc/truncate-parameters.sh \ + tests/misc/truncate-relative.sh \ + tests/misc/tsort.pl \ + tests/misc/unexpand.pl \ + tests/misc/uniq.pl \ + tests/misc/uniq-perf.sh \ + tests/misc/xattr.sh \ + tests/tail-2/wait.sh \ + tests/chmod/c-option.sh \ + tests/chmod/equal-x.sh \ + tests/chmod/equals.sh \ + tests/chmod/inaccessible.sh \ + tests/chmod/octal.sh \ + tests/chmod/setgid.sh \ + tests/chmod/silent.sh \ + tests/chmod/thru-dangling.sh \ + tests/chmod/umask-x.sh \ + tests/chmod/usage.sh \ + tests/chown/deref.sh \ + tests/chown/preserve-root.sh \ + tests/chown/separator.sh \ + tests/cp/abuse.sh \ + tests/cp/acl.sh \ + tests/cp/attr-existing.sh \ + tests/cp/backup-1.sh \ + tests/cp/backup-dir.sh \ + tests/cp/backup-is-src.sh \ + tests/cp/cp-HL.sh \ + tests/cp/cp-deref.sh \ + tests/cp/cp-i.sh \ + tests/cp/cp-mv-backup.sh \ + tests/cp/cp-parents.sh \ + tests/cp/deref-slink.sh \ + tests/cp/dir-rm-dest.sh \ + tests/cp/dir-slash.sh \ + tests/cp/dir-vs-file.sh \ + tests/cp/existing-perm-dir.sh \ + tests/cp/existing-perm-race.sh \ + tests/cp/fail-perm.sh \ + tests/cp/fiemap-empty.sh \ + tests/cp/fiemap-FMR.sh \ + tests/cp/fiemap-perf.sh \ + tests/cp/fiemap-2.sh \ + tests/cp/file-perm-race.sh \ + tests/cp/into-self.sh \ + tests/cp/link.sh \ + tests/cp/link-no-deref.sh \ + tests/cp/link-preserve.sh \ + tests/cp/link-symlink.sh \ + tests/cp/nfs-removal-race.sh \ + tests/cp/no-deref-link1.sh \ + tests/cp/no-deref-link2.sh \ + tests/cp/no-deref-link3.sh \ + tests/cp/parent-perm.sh \ + tests/cp/parent-perm-race.sh \ + tests/cp/perm.sh \ + tests/cp/preserve-2.sh \ + tests/cp/preserve-link.sh \ + tests/cp/preserve-mode.sh \ + tests/cp/preserve-slink-time.sh \ + tests/cp/proc-short-read.sh \ + tests/cp/proc-zero-len.sh \ + tests/cp/r-vs-symlink.sh \ + tests/cp/reflink-auto.sh \ + tests/cp/reflink-perm.sh \ + tests/cp/same-file.sh \ + tests/cp/slink-2-slink.sh \ + tests/cp/sparse.sh \ + tests/cp/sparse-to-pipe.sh \ + tests/cp/special-f.sh \ + tests/cp/src-base-dot.sh \ + tests/cp/symlink-slash.sh \ + tests/cp/thru-dangling.sh \ + tests/df/header.sh \ + tests/df/df-P.sh \ + tests/df/df-output.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/direct.sh \ + tests/dd/misc.sh \ + tests/dd/nocache.sh \ + tests/dd/not-rewound.sh \ + tests/dd/reblock.sh \ + tests/dd/skip-seek.pl \ + tests/dd/skip-seek2.sh \ + tests/dd/bytes.sh \ + tests/dd/skip-seek-past-file.sh \ + tests/dd/sparse.sh \ + tests/dd/stderr.sh \ + tests/dd/unblock.pl \ + tests/dd/unblock-sync.sh \ + tests/df/total-verify.sh \ + tests/du/2g.sh \ + tests/du/8gb.sh \ + tests/du/basic.sh \ + tests/du/bigtime.sh \ + tests/du/deref.sh \ + tests/du/deref-args.sh \ + tests/du/exclude.sh \ + tests/du/fd-leak.sh \ + tests/du/files0-from.pl \ + tests/du/files0-from-dir.sh \ + tests/du/hard-link.sh \ + tests/du/inacc-dest.sh \ + tests/du/inacc-dir.sh \ + tests/du/inaccessible-cwd.sh \ + tests/du/long-from-unreadable.sh \ + tests/du/long-sloop.sh \ + tests/du/max-depth.sh \ + tests/du/move-dir-while-traversing.sh \ + tests/du/no-deref.sh \ + tests/du/no-x.sh \ + tests/du/one-file-system.sh \ + tests/du/restore-wd.sh \ + tests/du/slash.sh \ + tests/du/threshold.sh \ + tests/du/trailing-slash.sh \ + tests/du/two-args.sh \ + tests/id/gnu-zero-uids.sh \ + tests/id/no-context.sh \ + tests/install/basic-1.sh \ + tests/install/create-leading.sh \ + tests/install/d-slashdot.sh \ + tests/install/install-C.sh \ + tests/install/install-C-selinux.sh \ + tests/install/strip-program.sh \ + tests/install/trap.sh \ + tests/ln/backup-1.sh \ + tests/ln/hard-backup.sh \ + tests/ln/hard-to-sym.sh \ + tests/ln/misc.sh \ + tests/ln/relative.sh \ + tests/ln/sf-1.sh \ + tests/ln/slash-decorated-nonexistent-dest.sh \ + tests/ln/target-1.sh \ + tests/ls/abmon-align.sh \ + tests/ls/block-size.sh \ + tests/ls/color-clear-to-eol.sh \ + tests/ls/color-dtype-dir.sh \ + tests/ls/color-norm.sh \ + tests/ls/dangle.sh \ + tests/ls/dired.sh \ + tests/ls/file-type.sh \ + tests/ls/follow-slink.sh \ + tests/ls/getxattr-speedup.sh \ + tests/ls/infloop.sh \ + tests/ls/inode.sh \ + tests/ls/m-option.sh \ + tests/ls/multihardlink.sh \ + tests/ls/no-arg.sh \ + tests/ls/no-cap.sh \ + tests/ls/proc-selinux-segfault.sh \ + tests/ls/readdir-mountpoint-inode.sh \ + tests/ls/recursive.sh \ + tests/ls/root-rel-symlink-color.sh \ + tests/ls/rt-1.sh \ + tests/ls/slink-acl.sh \ + tests/ls/stat-dtype.sh \ + tests/ls/stat-failed.sh \ + tests/ls/stat-free-color.sh \ + tests/ls/stat-free-symlinks.sh \ + tests/ls/stat-vs-dirent.sh \ + tests/ls/symlink-slash.sh \ + tests/ls/time-style-diag.sh \ + tests/ls/x-option.sh \ + tests/mkdir/p-1.sh \ + tests/mkdir/p-2.sh \ + tests/mkdir/p-3.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/special-1.sh \ + tests/mkdir/t-slash.sh \ + tests/mv/acl.sh \ + tests/mv/atomic.sh \ + tests/mv/atomic2.sh \ + tests/mv/backup-dir.sh \ + tests/mv/backup-is-src.sh \ + tests/mv/childproof.sh \ + tests/mv/diag.sh \ + tests/mv/dir-file.sh \ + tests/mv/dir2dir.sh \ + tests/mv/dup-source.sh \ + tests/mv/force.sh \ + tests/mv/hard-2.sh \ + tests/mv/hard-3.sh \ + tests/mv/hard-4.sh \ + tests/mv/hard-link-1.sh \ + tests/mv/hard-verbose.sh \ + tests/mv/i-1.pl \ + tests/mv/i-2.sh \ + tests/mv/i-3.sh \ + tests/mv/i-4.sh \ + tests/mv/i-5.sh \ + tests/mv/i-link-no.sh \ + tests/mv/into-self.sh \ + tests/mv/into-self-2.sh \ + tests/mv/into-self-3.sh \ + tests/mv/into-self-4.sh \ + tests/mv/leak-fd.sh \ + tests/mv/mv-n.sh \ + tests/mv/mv-special-1.sh \ + tests/mv/no-target-dir.sh \ + tests/mv/part-fail.sh \ + tests/mv/part-hardlink.sh \ + tests/mv/part-rename.sh \ + tests/mv/part-symlink.sh \ + tests/mv/partition-perm.sh \ + tests/mv/perm-1.sh \ + tests/mv/symlink-onto-hardlink.sh \ + tests/mv/symlink-onto-hardlink-to-self.sh \ + tests/mv/to-symlink.sh \ + tests/mv/trailing-slash.sh \ + tests/mv/update.sh \ + tests/readlink/can-e.sh \ + tests/readlink/can-f.sh \ + tests/readlink/can-m.sh \ + tests/readlink/multi.sh \ + tests/readlink/rl-1.sh \ + tests/rmdir/fail-perm.sh \ + tests/rmdir/ignore.sh \ + tests/rmdir/t-slash.sh \ + tests/tail-2/assert-2.sh \ + tests/tail-2/big-4gb.sh \ + tests/tail-2/flush-initial.sh \ + tests/tail-2/follow-name.sh \ + tests/tail-2/follow-stdin.sh \ + tests/tail-2/pipe-f.sh \ + tests/tail-2/pipe-f2.sh \ + tests/tail-2/proc-ksyms.sh \ + tests/tail-2/start-middle.sh \ + tests/touch/60-seconds.sh \ + tests/touch/dangling-symlink.sh \ + tests/touch/dir-1.sh \ + tests/touch/fail-diag.sh \ + tests/touch/fifo.sh \ + tests/touch/no-create-missing.sh \ + tests/touch/no-dereference.sh \ + tests/touch/no-rights.sh \ + tests/touch/not-owner.sh \ + tests/touch/obsolescent.sh \ + tests/touch/read-only.sh \ + tests/touch/relative.sh \ + tests/touch/trailing-slash.sh \ + $(all_root_tests) + + +# See tests/factor/create-test.sh. +tf = tests/factor +factor_tests = \ + $(tf)/t00.sh $(tf)/t01.sh $(tf)/t02.sh $(tf)/t03.sh $(tf)/t04.sh \ + $(tf)/t05.sh $(tf)/t06.sh $(tf)/t07.sh $(tf)/t08.sh $(tf)/t09.sh \ + $(tf)/t10.sh $(tf)/t11.sh $(tf)/t12.sh $(tf)/t13.sh $(tf)/t14.sh \ + $(tf)/t15.sh $(tf)/t16.sh $(tf)/t17.sh $(tf)/t18.sh $(tf)/t19.sh \ + $(tf)/t20.sh $(tf)/t21.sh $(tf)/t22.sh $(tf)/t23.sh $(tf)/t24.sh \ + $(tf)/t25.sh $(tf)/t26.sh $(tf)/t27.sh $(tf)/t28.sh $(tf)/t29.sh \ + $(tf)/t30.sh $(tf)/t31.sh $(tf)/t32.sh $(tf)/t33.sh $(tf)/t34.sh \ + $(tf)/t35.sh $(tf)/t36.sh + +pr_data = \ + tests/pr/0F \ + tests/pr/0FF \ + tests/pr/0FFnt \ + tests/pr/0FFt \ + tests/pr/0FnFnt \ + tests/pr/0FnFt \ + tests/pr/0Fnt \ + tests/pr/0Ft \ + tests/pr/2-S_f-t_notab \ + tests/pr/2-Sf-t_notab \ + tests/pr/2f-t_notab \ + tests/pr/2s_f-t_notab \ + tests/pr/2s_w60f-t_nota \ + tests/pr/2sf-t_notab \ + tests/pr/2sw60f-t_notab \ + tests/pr/2w60f-t_notab \ + tests/pr/3-0F \ + tests/pr/3-5l24f-t \ + tests/pr/3-FF \ + tests/pr/3a2l17-FF \ + tests/pr/3a3f-0F \ + tests/pr/3a3l15-t \ + tests/pr/3a3l15f-t \ + tests/pr/3b2l17-FF \ + tests/pr/3b3f-0F \ + tests/pr/3b3f-0FF \ + tests/pr/3b3f-FF \ + tests/pr/3b3l15-t \ + tests/pr/3b3l15f-t \ + tests/pr/3f-0F \ + tests/pr/3f-FF \ + tests/pr/3l24-t \ + tests/pr/3l24f-t \ + tests/pr/3ml24-FF \ + tests/pr/3ml24-t \ + tests/pr/3ml24-t-FF \ + tests/pr/3ml24f-t \ + tests/pr/4-7l24-FF \ + tests/pr/4l24-FF \ + tests/pr/FF \ + tests/pr/FFn \ + tests/pr/FFtn \ + tests/pr/FnFn \ + tests/pr/Ja3l24f-lm \ + tests/pr/Jb3l24f-lm \ + tests/pr/Jml24f-lm-lo \ + tests/pr/W-72l24f-ll \ + tests/pr/W20l24f-ll \ + tests/pr/W26l24f-ll \ + tests/pr/W27l24f-ll \ + tests/pr/W28l24f-ll \ + tests/pr/W35Ja3l24f-lm \ + tests/pr/W35Jb3l24f-lm \ + tests/pr/W35Jml24f-lmlo \ + tests/pr/W35a3l24f-lm \ + tests/pr/W35b3l24f-lm \ + tests/pr/W35ml24f-lm-lo \ + tests/pr/W72Jl24f-ll \ + tests/pr/a2l15-FF \ + tests/pr/a2l17-FF \ + tests/pr/a3-0F \ + tests/pr/a3f-0F \ + tests/pr/a3f-0FF \ + tests/pr/a3f-FF \ + tests/pr/a3l15-t \ + tests/pr/a3l15f-t \ + tests/pr/a3l24f-lm \ + tests/pr/b2l15-FF \ + tests/pr/b2l17-FF \ + tests/pr/b3-0F \ + tests/pr/b3f-0F \ + tests/pr/b3f-0FF \ + tests/pr/b3f-FF \ + tests/pr/b3l15-t \ + tests/pr/b3l15f-t \ + tests/pr/b3l24f-lm \ + tests/pr/l24-FF \ + tests/pr/l24-t \ + tests/pr/l24f-t \ + tests/pr/loli \ + tests/pr/ml20-FF-t \ + tests/pr/ml24-FF \ + tests/pr/ml24-t \ + tests/pr/ml24-t-FF \ + tests/pr/ml24f-0F \ + tests/pr/ml24f-lm-lo \ + tests/pr/ml24f-t \ + tests/pr/ml24f-t-0F \ + tests/pr/n+2-5l24f-0FF \ + tests/pr/n+2l24f-0FF \ + tests/pr/n+2l24f-bl \ + tests/pr/n+3-7l24-FF \ + tests/pr/n+3l24f-0FF \ + tests/pr/n+3l24f-bl \ + tests/pr/n+3ml20f-bl-FF \ + tests/pr/n+3ml24f-bl-tn \ + tests/pr/n+3ml24f-tn-bl \ + tests/pr/n+4-8a2l17-FF \ + tests/pr/n+4b2l17f-0FF \ + tests/pr/n+5-8b3l17f-FF \ + tests/pr/n+5a3l13f-0FF \ + tests/pr/n+6a2l17-FF \ + tests/pr/n+6b3l13f-FF \ + tests/pr/n+7l24-FF \ + tests/pr/n+8l20-FF \ + tests/pr/nJml24f-lmlmlo \ + tests/pr/nJml24f-lmlolm \ + tests/pr/nN1+3l24f-bl \ + tests/pr/nN15l24f-bl \ + tests/pr/nSml20-bl-FF \ + tests/pr/nSml20-t-t-FF \ + tests/pr/nSml20-t-tFFFF \ + tests/pr/nSml24-bl-FF \ + tests/pr/nSml24-t-t-FF \ + tests/pr/nSml24-t-tFFFF \ + tests/pr/nl24f-bl \ + tests/pr/o3Jml24f-lm-lo \ + tests/pr/o3a3Sl24f-tn \ + tests/pr/o3a3Snl24f-tn \ + tests/pr/o3a3l24f-tn \ + tests/pr/o3b3Sl24f-tn \ + tests/pr/o3b3Snl24f-tn \ + tests/pr/o3b3l24f-tn \ + tests/pr/o3mSl24f-bl-tn \ + tests/pr/o3mSnl24fbltn \ + tests/pr/o3ml24f-bl-tn \ + tests/pr/t-0FF \ + tests/pr/t-FF \ + tests/pr/t-bl \ + tests/pr/t-t \ + tests/pr/tFFn \ + tests/pr/tFFt \ + tests/pr/tFFt-bl \ + tests/pr/tFFt-ll \ + tests/pr/tFFt-lm \ + tests/pr/tFnFt \ + tests/pr/t_notab \ + tests/pr/t_tab \ + tests/pr/t_tab_ \ + tests/pr/ta3-0FF \ + tests/pr/ta3-FF \ + tests/pr/tb3-0FF \ + tests/pr/tb3-FF \ + tests/pr/tn \ + tests/pr/tn2e5o3-t_tab \ + tests/pr/tn2e8-t_tab \ + tests/pr/tn2e8o3-t_tab \ + tests/pr/tn_2e8-t_tab \ + tests/pr/tn_2e8S-t_tab \ + tests/pr/tne8-t_tab \ + tests/pr/tne8o3-t_tab \ + tests/pr/tt-0FF \ + tests/pr/tt-FF \ + tests/pr/tt-bl \ + tests/pr/tt-t \ + tests/pr/tta3-0FF \ + tests/pr/tta3-FF \ + tests/pr/ttb3-0FF \ + tests/pr/ttb3-FF \ + tests/pr/w72l24f-ll + 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 am--refresh: Makefile @: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(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)/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*) \ @@ -1765,6 +4189,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_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck @@ -1775,12 +4200,2865 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) $(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 + +lib/stamp-h1: $(top_srcdir)/lib/config.hin $(top_builddir)/config.status + @rm -f lib/stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status lib/config.h +$(top_srcdir)/lib/config.hin: $(am__configure_deps) + ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) + rm -f lib/stamp-h1 + touch $@ + +distclean-hdr: + -rm -f lib/config.h lib/stamp-h1 + +clean-noinstLIBRARIES: + -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) +lib/$(am__dirstamp): + @$(MKDIR_P) lib + @: > 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/$(DEPDIR)/$(am__dirstamp) +lib/allocator.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/areadlink.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/areadlink-with-size.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/areadlinkat.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/argmatch.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/argv-iter.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +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) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/c-ctype.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/c-strcasecmp.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/c-strncasecmp.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/c-strtod.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/c-strtold.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/canon-host.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/canonicalize.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/careadlinkat.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/cloexec.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/close-stream.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/closein.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/closeout.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/md5.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) +lib/sha1.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) +lib/sha256.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/sha512.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/cycle-check.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/di-set.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/diacrit.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/opendir-safer.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/dirname.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/basename.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/dirname-lgpl.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/basename-lgpl.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/stripslash.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/dtoastr.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/dtotimespec.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/exclude.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +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) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/creat-safer.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/open-safer.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/fd-hook.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/fd-reopen.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/fd-safer-flag.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/dup-safer-flag.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/fdutimensat.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/file-set.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/file-type.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/filemode.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/filenamecat.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/filenamecat-lgpl.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/filevercmp.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/fopen-safer.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/fprintftime.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/freading.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/freadseek.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/freopen-safer.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/ftoastr.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/full-read.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/full-write.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/gethrxtime.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/xtime.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) +lib/getndelim2.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/gettime.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/getugroups.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/hard-locale.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/hash.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) +lib/hash-pjw.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/hash-triple.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/heap.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) +lib/human.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) +lib/i-ring.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/idcache.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/ino-map.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/imaxtostr.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/inttostr.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/offtostr.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/uinttostr.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/umaxtostr.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/ldtoastr.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/linebuffer.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/localcharset.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/glthread/$(am__dirstamp): + @$(MKDIR_P) lib/glthread + @: > lib/glthread/$(am__dirstamp) +lib/glthread/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) lib/glthread/$(DEPDIR) + @: > lib/glthread/$(DEPDIR)/$(am__dirstamp) +lib/glthread/lock.$(OBJEXT): lib/glthread/$(am__dirstamp) \ + lib/glthread/$(DEPDIR)/$(am__dirstamp) +lib/long-options.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/malloca.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/math.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) +lib/mbchar.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/mbiter.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/mbsalign.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/mbscasecmp.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/mbslen.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/mbsstr.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/mbswidth.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/mbuiter.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/memcasecmp.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/memchr2.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/memcmp2.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/memcoll.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/mgetgroups.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/mkancesdirs.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/dirchownmod.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/mkdir-p.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/modechange.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/mpsort.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/nproc.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) +lib/openat-die.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/openat-safer.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +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) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/printf-frexp.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/printf-frexpl.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/priv-set.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/progname.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/propername.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/quotearg.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/randint.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/randperm.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/randread.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/rand-isaac.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/read-file.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/readtokens.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/readtokens0.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/root-dev-ino.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/safe-read.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/safe-write.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/same.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) +lib/save-cwd.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/savedir.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/savewd.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/se-context.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/se-selinux.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/settime.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +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) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/mkstemp-safer.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/strftime.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/striconv.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/strnlen1.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/strintcmp.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/strnumcmp.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/sys_socket.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/tempname.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/glthread/threadlib.$(OBJEXT): lib/glthread/$(am__dirstamp) \ + lib/glthread/$(DEPDIR)/$(am__dirstamp) +lib/timespec.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/glthread/tls.$(OBJEXT): lib/glthread/$(am__dirstamp) \ + lib/glthread/$(DEPDIR)/$(am__dirstamp) +lib/trim.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) +lib/u64.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) +lib/unicodeio.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/unistd.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/dup-safer.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/fd-safer.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/pipe-safer.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/unistr/$(am__dirstamp): + @$(MKDIR_P) lib/unistr + @: > lib/unistr/$(am__dirstamp) +lib/unistr/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) lib/unistr/$(DEPDIR) + @: > lib/unistr/$(DEPDIR)/$(am__dirstamp) +lib/unistr/u8-mbtoucr.$(OBJEXT): lib/unistr/$(am__dirstamp) \ + lib/unistr/$(DEPDIR)/$(am__dirstamp) +lib/unistr/u8-uctomb.$(OBJEXT): lib/unistr/$(am__dirstamp) \ + lib/unistr/$(DEPDIR)/$(am__dirstamp) +lib/unistr/u8-uctomb-aux.$(OBJEXT): lib/unistr/$(am__dirstamp) \ + lib/unistr/$(DEPDIR)/$(am__dirstamp) +lib/uniwidth/$(am__dirstamp): + @$(MKDIR_P) lib/uniwidth + @: > lib/uniwidth/$(am__dirstamp) +lib/uniwidth/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) lib/uniwidth/$(DEPDIR) + @: > lib/uniwidth/$(DEPDIR)/$(am__dirstamp) +lib/uniwidth/width.$(OBJEXT): lib/uniwidth/$(am__dirstamp) \ + lib/uniwidth/$(DEPDIR)/$(am__dirstamp) +lib/userspec.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/utimecmp.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/utimens.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/verror.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +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) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/xmalloc.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/xalloc-die.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/xfreopen.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/xfts.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) +lib/xgetcwd.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/xgetgroups.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/xgethostname.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/xmemcoll.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/xnanosleep.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/xprintf.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/xreadlink.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/xsize.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) +lib/xstriconv.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/xstrndup.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/xstrtod.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/xstrtoimax.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/xstrtol.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/xstrtoul.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/xstrtol-error.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/xstrtold.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/xstrtoumax.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/xvasprintf.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(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) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/openat-proc.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/btowc.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) +lib/calloc.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/chdir-long.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/chown.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) +lib/fchown-stub.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/close.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) +lib/closedir.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/dirfd.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) +lib/dup.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) +lib/dup2.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) +lib/error.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) +lib/euidaccess.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/faccessat.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/fchdir.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/fchmodat.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/fchownat.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/fclose.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/fcntl.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) +lib/fdatasync.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/fdopen.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/fdopendir.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/fflush.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/fileblocks.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/float.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) +lib/itold.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) +lib/fnmatch.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/fnmatch_loop.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/fopen.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) +lib/fpending.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/fpurge.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/freadahead.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/freadptr.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/freopen.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/frexp.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) +lib/frexpl.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/fseek.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) +lib/fseeko.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/fseterr.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/fstat.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) +lib/fstatat.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/fsusage.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/fsync.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) +lib/ftell.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) +lib/ftello.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/ftruncate.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/fts-cycle.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/fts.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) +lib/futimens.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/gai_strerror.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/getaddrinfo.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/getcwd.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/getcwd-lgpl.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/getdelim.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/getdtablesize.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/getgroups.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/gethostname.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/getline.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/getloadavg.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/getlogin.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/getopt.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/getopt1.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/getpagesize.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/getpass.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/gettimeofday.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/getusershell.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/group-member.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/iconv.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) +lib/iconv_close.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/iconv_open.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/inet_ntop.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/anytostr.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/isapipe.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/isatty.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/isblank.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/isnan.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) +lib/isnand.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/isnanf.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/isnanl.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/iswblank.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/lchown.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/link.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) +lib/at-func2.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/linkat.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/localeconv.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/lseek.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) +lib/lstat.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) +lib/malloc.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/mbrlen.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/mbrtowc.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/mbsinit.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/mbsrtowcs-state.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/mbsrtowcs.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/mbtowc.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/memchr.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/mempcpy.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/memrchr.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/mkdir.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) +lib/mkfifo.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/mknod.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) +lib/mkstemp.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/mktime.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/mountlist.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/msvc-inval.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/msvc-nothrow.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/nanosleep.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/nl_langinfo.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/obstack.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/open.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) +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/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/$(DEPDIR)/$(am__dirstamp) +lib/read.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) +lib/readdir.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/readlink.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/readlinkat.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/readutmp.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/realloc.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/regcomp.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/regex.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) +lib/regex_internal.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/regexec.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/remove.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/rename.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/rewinddir.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/rmdir.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) +lib/rpmatch.$(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) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/getfilecon.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/setenv.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/sig2str.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/sigaction.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/signbitd.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/signbitf.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/signbitl.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/sigprocmask.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/snprintf.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/stat.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) +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) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/strerror-override.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/strncat.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/strndup.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/strnlen.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/strpbrk.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/strsignal.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/strstr.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/strtod.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/strtoimax.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/strtol.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/strtoll.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/strtoul.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/strtoull.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/strtoumax.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/symlink.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/time_r.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/uname.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) +lib/unlink.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/unlinkat.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/unsetenv.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/utimensat.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/asnprintf.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/printf-args.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/printf-parse.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/vasnprintf.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/asprintf.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/vasprintf.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +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) \ + lib/$(DEPDIR)/$(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) + $(AM_V_at)$(RANLIB) lib/libcoreutils.a +src/$(am__dirstamp): + @$(MKDIR_P) src + @: > src/$(am__dirstamp) +src/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) src/$(DEPDIR) + @: > src/$(DEPDIR)/$(am__dirstamp) +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) + $(AM_V_at)$(RANLIB) src/libver.a +install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + 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; \ + done | \ + 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 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) + @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)/' `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(bindir)" && rm -f $$files + +clean-binPROGRAMS: + -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) > /dev/null 2>&1 || /bin/rm -f $(bin_PROGRAMS) + +clean-noinstPROGRAMS: + -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) +install-pkglibexecPROGRAMS: $(pkglibexec_PROGRAMS) + @$(NORMAL_INSTALL) + @list='$(pkglibexec_PROGRAMS)'; test -n "$(pkglibexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkglibexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkglibexecdir)" || exit 1; \ + 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; \ + done | \ + 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 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(pkglibexecdir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(pkglibexecdir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-pkglibexecPROGRAMS: + @$(NORMAL_UNINSTALL) + @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)/' `; \ + 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) +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/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/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) +src/src_ginstall-install.$(OBJEXT): src/$(am__dirstamp) \ + src/$(DEPDIR)/$(am__dirstamp) +src/src_ginstall-prog-fprintf.$(OBJEXT): src/$(am__dirstamp) \ + src/$(DEPDIR)/$(am__dirstamp) +src/src_ginstall-copy.$(OBJEXT): src/$(am__dirstamp) \ + src/$(DEPDIR)/$(am__dirstamp) +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/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) +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) + +distclean-compile: + -rm -f *.tab.c + +@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@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/anytostr.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/areadlink-with-size.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/areadlink.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/areadlinkat.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/argmatch.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/argv-iter.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/asnprintf.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/asprintf.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/at-func.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/at-func2.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/backupfile.Po@am__quote@ +@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@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/c-ctype.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/c-strcasecmp.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/c-strncasecmp.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/c-strtod.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/c-strtold.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/calloc.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/canon-host.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/canonicalize.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/careadlinkat.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/chdir-long.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/chmodat.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/chown.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/chownat.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/cloexec.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/close-stream.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/close.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/closedir.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/closein.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/closeout.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/copy-acl.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/creat-safer.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/cycle-check.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/di-set.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/diacrit.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/dirchownmod.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/dirfd.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/dirname-lgpl.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/dirname.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/dtoastr.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/dtotimespec.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/dup-safer-flag.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/dup-safer.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/dup.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/dup2.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/error.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/euidaccess.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/exclude.Po@am__quote@ +@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@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/fchownat.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/fclose.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/fcntl.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/fd-hook.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/fd-reopen.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/fd-safer-flag.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/fd-safer.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/fdatasync.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/fdopen.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/fdopendir.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/fdutimensat.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/fflush.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/file-has-acl.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/file-set.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/file-type.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/fileblocks.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/filemode.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/filenamecat-lgpl.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/filenamecat.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/filevercmp.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/float.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/fnmatch.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/fnmatch_loop.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/fopen-safer.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/fopen.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/fpending.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/fprintftime.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/fpurge.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/freadahead.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/freading.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/freadptr.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/freadseek.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/freopen-safer.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/freopen.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/frexp.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/frexpl.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/fseek.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/fseeko.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/fseterr.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/fstat.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/fstatat.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/fsusage.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/fsync.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/ftell.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/ftello.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/ftoastr.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/ftruncate.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/fts-cycle.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/fts.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/full-read.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/full-write.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/futimens.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/gai_strerror.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/getaddrinfo.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/getcwd-lgpl.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/getcwd.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/getdelim.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/getdtablesize.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/getfilecon.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/getgroups.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/gethostname.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/gethrxtime.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/getline.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/getloadavg.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/getlogin.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/getndelim2.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/getopt.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/getopt1.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/getpagesize.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/getpass.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/gettime.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/gettimeofday.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/getugroups.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/getusershell.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/group-member.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/hard-locale.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/hash-pjw.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/hash-triple.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/hash.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/heap.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/human.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/i-ring.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/iconv.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/iconv_close.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/iconv_open.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/idcache.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/imaxtostr.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/inet_ntop.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/ino-map.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/inttostr.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/isapipe.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/isatty.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/isblank.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/isnan.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/isnand.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/isnanf.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/isnanl.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/iswblank.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/itold.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lchown.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/ldtoastr.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/linebuffer.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/link.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/linkat.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/localcharset.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/localeconv.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/long-options.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lseek.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lstat.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/malloc.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/malloca.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/math.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/mbchar.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/mbiter.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/mbrlen.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/mbrtowc.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/mbsalign.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/mbscasecmp.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/mbsinit.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/mbslen.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/mbsrtowcs-state.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/mbsrtowcs.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/mbsstr.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/mbswidth.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/mbtowc.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/mbuiter.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/md5.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/memcasecmp.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/memchr.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/memchr2.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/memcmp2.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/memcoll.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/mempcpy.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/memrchr.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/mgetgroups.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/mkancesdirs.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/mkdir-p.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/mkdir.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/mkfifo.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/mknod.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/mkstemp-safer.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/mkstemp.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/mktime.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/modechange.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/mountlist.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/mpsort.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/msvc-inval.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/msvc-nothrow.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/nanosleep.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/nl_langinfo.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/nproc.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/obstack.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/offtostr.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/open-safer.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/open.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/openat-die.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/openat-proc.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/openat-safer.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/openat.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/opendir-safer.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/opendir.Po@am__quote@ +@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)/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@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/printf-frexp.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/printf-frexpl.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/printf-parse.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/priv-set.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/progname.Po@am__quote@ +@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)/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@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/readlink.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/readlinkat.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/readtokens.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/readtokens0.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/readutmp.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/realloc.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/regcomp.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/regex.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/regex_internal.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/regexec.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/remove.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/rename.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/rewinddir.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/rmdir.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/root-dev-ino.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/rpmatch.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/safe-read.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/safe-write.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/same.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/save-cwd.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/savedir.Po@am__quote@ +@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)/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)/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@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/sha256.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/sha512.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/sig-handler.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/sig2str.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/sigaction.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/signbitd.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/signbitf.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/signbitl.Po@am__quote@ +@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@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/strftime.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/striconv.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/strintcmp.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/stripslash.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/strncat.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/strndup.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/strnlen.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/strnlen1.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/strnumcmp.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/strpbrk.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/strsignal.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/strstr.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/strtod.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/strtoimax.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/strtol.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/strtoll.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/strtoul.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/strtoull.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/strtoumax.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/symlink.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/sys_socket.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/tempname.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/time_r.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/timespec.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/trim.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/u64.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/uinttostr.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/umaxtostr.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/uname.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/unicodeio.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/unistd.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/unlink.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/unlinkat.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/unsetenv.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/userspec.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/utimecmp.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/utimens.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/utimensat.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/vasnprintf.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/vasprintf.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/verror.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/version-etc-fsf.Po@am__quote@ +@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@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/wcwidth.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/write-any-file.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/write.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/xalloc-die.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/xasprintf.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/xfreopen.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/xfts.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/xgetcwd.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/xgetgroups.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/xgethostname.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/xmalloc.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/xmemcoll.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/xnanosleep.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/xprintf.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/xreadlink.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/xsize.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/xstriconv.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/xstrndup.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/xstrtod.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/xstrtoimax.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/xstrtol-error.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/xstrtol.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/xstrtold.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/xstrtoul.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/xstrtoumax.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/xtime.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/xvasprintf.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/yesno.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/glthread/$(DEPDIR)/lock.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/glthread/$(DEPDIR)/threadlib.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/glthread/$(DEPDIR)/tls.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/unistr/$(DEPDIR)/u8-mbtoucr.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/unistr/$(DEPDIR)/u8-uctomb-aux.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/unistr/$(DEPDIR)/u8-uctomb.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/uniwidth/$(DEPDIR)/width.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/base64.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/basename.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/cat.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/chcon.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/chgrp.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/chmod.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/chown-core.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/chown.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/chroot.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/cksum.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/comm.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/copy.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/cp-hash.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/cp.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/csplit.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/cut.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/date.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dd.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/df.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dircolors.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dirname.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/du.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/echo.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/env.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/expand.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/expr.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/extent-scan.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/factor.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/false.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/find-mount-point.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/fmt.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/fold.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/getlimits.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/group-list.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/groups.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/head.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/hostid.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/hostname.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/id.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/join.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/kill.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/lbracket.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/link.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ln.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/logname.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ls-dir.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ls-ls.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ls-vdir.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ls.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/make-prime-list.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/mkdir.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/mkfifo.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/mknod.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/mktemp.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/mv.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/nice.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/nl.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/nohup.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/nproc.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/numfmt.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/od.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/operand2sig.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/paste.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/pathchk.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/pinky.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/pr.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/printenv.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/printf.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/prog-fprintf.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ptx.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/pwd.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/readlink.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/realpath.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/relpath.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/remove.Po@am__quote@ +@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)/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_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_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@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_sha224sum-md5sum.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_sha256sum-md5sum.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_sha384sum-md5sum.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_sha512sum-md5sum.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/stat.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/stdbuf.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/stty.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/sum.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/sync.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/tac.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/tail.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/tee.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/test.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/timeout.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/touch.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/tr.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/true.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/truncate.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/tsort.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/tty.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/uname-arch.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/uname-uname.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/uname.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/unexpand.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/uniq.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/unlink.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/uptime.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/users.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/version.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/wc.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/who.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/whoami.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/yes.Po@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@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_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 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/install.c' object='src/src_ginstall-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_ginstall_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_ginstall-install.o `test -f 'src/install.c' || echo '$(srcdir)/'`src/install.c + +src/src_ginstall-install.obj: 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.obj -MD -MP -MF src/$(DEPDIR)/src_ginstall-install.Tpo -c -o src/src_ginstall-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_ginstall-install.Tpo src/$(DEPDIR)/src_ginstall-install.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/install.c' object='src/src_ginstall-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_ginstall_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_ginstall-install.obj `if test -f 'src/install.c'; then $(CYGPATH_W) 'src/install.c'; else $(CYGPATH_W) '$(srcdir)/src/install.c'; fi` + +src/src_ginstall-prog-fprintf.o: src/prog-fprintf.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_ginstall_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_ginstall-prog-fprintf.o -MD -MP -MF src/$(DEPDIR)/src_ginstall-prog-fprintf.Tpo -c -o src/src_ginstall-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_ginstall-prog-fprintf.Tpo src/$(DEPDIR)/src_ginstall-prog-fprintf.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/prog-fprintf.c' object='src/src_ginstall-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_ginstall_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_ginstall-prog-fprintf.o `test -f 'src/prog-fprintf.c' || echo '$(srcdir)/'`src/prog-fprintf.c + +src/src_ginstall-prog-fprintf.obj: src/prog-fprintf.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_ginstall_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_ginstall-prog-fprintf.obj -MD -MP -MF src/$(DEPDIR)/src_ginstall-prog-fprintf.Tpo -c -o src/src_ginstall-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_ginstall-prog-fprintf.Tpo src/$(DEPDIR)/src_ginstall-prog-fprintf.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/prog-fprintf.c' object='src/src_ginstall-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_ginstall_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_ginstall-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_ginstall-copy.o: src/copy.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_ginstall_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_ginstall-copy.o -MD -MP -MF src/$(DEPDIR)/src_ginstall-copy.Tpo -c -o src/src_ginstall-copy.o `test -f 'src/copy.c' || echo '$(srcdir)/'`src/copy.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_ginstall-copy.Tpo src/$(DEPDIR)/src_ginstall-copy.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/copy.c' object='src/src_ginstall-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_ginstall_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_ginstall-copy.o `test -f 'src/copy.c' || echo '$(srcdir)/'`src/copy.c + +src/src_ginstall-copy.obj: src/copy.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_ginstall_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_ginstall-copy.obj -MD -MP -MF src/$(DEPDIR)/src_ginstall-copy.Tpo -c -o src/src_ginstall-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_ginstall-copy.Tpo src/$(DEPDIR)/src_ginstall-copy.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/copy.c' object='src/src_ginstall-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_ginstall_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_ginstall-copy.obj `if test -f 'src/copy.c'; then $(CYGPATH_W) 'src/copy.c'; else $(CYGPATH_W) '$(srcdir)/src/copy.c'; fi` + +src/src_ginstall-cp-hash.o: src/cp-hash.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_ginstall_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_ginstall-cp-hash.o -MD -MP -MF src/$(DEPDIR)/src_ginstall-cp-hash.Tpo -c -o src/src_ginstall-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_ginstall-cp-hash.Tpo src/$(DEPDIR)/src_ginstall-cp-hash.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/cp-hash.c' object='src/src_ginstall-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_ginstall_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_ginstall-cp-hash.o `test -f 'src/cp-hash.c' || echo '$(srcdir)/'`src/cp-hash.c + +src/src_ginstall-cp-hash.obj: src/cp-hash.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_ginstall_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_ginstall-cp-hash.obj -MD -MP -MF src/$(DEPDIR)/src_ginstall-cp-hash.Tpo -c -o src/src_ginstall-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_ginstall-cp-hash.Tpo src/$(DEPDIR)/src_ginstall-cp-hash.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/cp-hash.c' object='src/src_ginstall-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_ginstall_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_ginstall-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_ginstall-extent-scan.o: src/extent-scan.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_ginstall_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_ginstall-extent-scan.o -MD -MP -MF src/$(DEPDIR)/src_ginstall-extent-scan.Tpo -c -o src/src_ginstall-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_ginstall-extent-scan.Tpo src/$(DEPDIR)/src_ginstall-extent-scan.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/extent-scan.c' object='src/src_ginstall-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_ginstall_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_ginstall-extent-scan.o `test -f 'src/extent-scan.c' || echo '$(srcdir)/'`src/extent-scan.c + +src/src_ginstall-extent-scan.obj: src/extent-scan.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_ginstall_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_ginstall-extent-scan.obj -MD -MP -MF src/$(DEPDIR)/src_ginstall-extent-scan.Tpo -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` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_ginstall-extent-scan.Tpo src/$(DEPDIR)/src_ginstall-extent-scan.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/extent-scan.c' object='src/src_ginstall-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_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_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 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/libstdbuf.c' object='src/src_libstdbuf_so-libstdbuf.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_libstdbuf_so_CFLAGS) $(CFLAGS) -c -o src/src_libstdbuf_so-libstdbuf.o `test -f 'src/libstdbuf.c' || echo '$(srcdir)/'`src/libstdbuf.c + +src/src_libstdbuf_so-libstdbuf.obj: 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.obj -MD -MP -MF src/$(DEPDIR)/src_libstdbuf_so-libstdbuf.Tpo -c -o src/src_libstdbuf_so-libstdbuf.obj `if test -f 'src/libstdbuf.c'; then $(CYGPATH_W) 'src/libstdbuf.c'; else $(CYGPATH_W) '$(srcdir)/src/libstdbuf.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libstdbuf_so-libstdbuf.Tpo src/$(DEPDIR)/src_libstdbuf_so-libstdbuf.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/libstdbuf.c' object='src/src_libstdbuf_so-libstdbuf.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_libstdbuf_so_CFLAGS) $(CFLAGS) -c -o src/src_libstdbuf_so-libstdbuf.obj `if test -f 'src/libstdbuf.c'; then $(CYGPATH_W) 'src/libstdbuf.c'; else $(CYGPATH_W) '$(srcdir)/src/libstdbuf.c'; fi` + +src/src_md5sum-md5sum.o: src/md5sum.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_md5sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_md5sum-md5sum.o -MD -MP -MF src/$(DEPDIR)/src_md5sum-md5sum.Tpo -c -o src/src_md5sum-md5sum.o `test -f 'src/md5sum.c' || echo '$(srcdir)/'`src/md5sum.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_md5sum-md5sum.Tpo src/$(DEPDIR)/src_md5sum-md5sum.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/md5sum.c' object='src/src_md5sum-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_md5sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_md5sum-md5sum.o `test -f 'src/md5sum.c' || echo '$(srcdir)/'`src/md5sum.c + +src/src_md5sum-md5sum.obj: src/md5sum.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_md5sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_md5sum-md5sum.obj -MD -MP -MF src/$(DEPDIR)/src_md5sum-md5sum.Tpo -c -o src/src_md5sum-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_md5sum-md5sum.Tpo src/$(DEPDIR)/src_md5sum-md5sum.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/md5sum.c' object='src/src_md5sum-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_md5sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_md5sum-md5sum.obj `if test -f 'src/md5sum.c'; then $(CYGPATH_W) 'src/md5sum.c'; else $(CYGPATH_W) '$(srcdir)/src/md5sum.c'; fi` + +src/src_sha1sum-md5sum.o: src/md5sum.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_sha1sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_sha1sum-md5sum.o -MD -MP -MF src/$(DEPDIR)/src_sha1sum-md5sum.Tpo -c -o src/src_sha1sum-md5sum.o `test -f 'src/md5sum.c' || echo '$(srcdir)/'`src/md5sum.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_sha1sum-md5sum.Tpo src/$(DEPDIR)/src_sha1sum-md5sum.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/md5sum.c' object='src/src_sha1sum-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_sha1sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_sha1sum-md5sum.o `test -f 'src/md5sum.c' || echo '$(srcdir)/'`src/md5sum.c + +src/src_sha1sum-md5sum.obj: src/md5sum.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_sha1sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_sha1sum-md5sum.obj -MD -MP -MF src/$(DEPDIR)/src_sha1sum-md5sum.Tpo -c -o src/src_sha1sum-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_sha1sum-md5sum.Tpo src/$(DEPDIR)/src_sha1sum-md5sum.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/md5sum.c' object='src/src_sha1sum-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_sha1sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_sha1sum-md5sum.obj `if test -f 'src/md5sum.c'; then $(CYGPATH_W) 'src/md5sum.c'; else $(CYGPATH_W) '$(srcdir)/src/md5sum.c'; fi` + +src/src_sha224sum-md5sum.o: src/md5sum.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_sha224sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_sha224sum-md5sum.o -MD -MP -MF src/$(DEPDIR)/src_sha224sum-md5sum.Tpo -c -o src/src_sha224sum-md5sum.o `test -f 'src/md5sum.c' || echo '$(srcdir)/'`src/md5sum.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_sha224sum-md5sum.Tpo src/$(DEPDIR)/src_sha224sum-md5sum.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/md5sum.c' object='src/src_sha224sum-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_sha224sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_sha224sum-md5sum.o `test -f 'src/md5sum.c' || echo '$(srcdir)/'`src/md5sum.c + +src/src_sha224sum-md5sum.obj: src/md5sum.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_sha224sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_sha224sum-md5sum.obj -MD -MP -MF src/$(DEPDIR)/src_sha224sum-md5sum.Tpo -c -o src/src_sha224sum-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_sha224sum-md5sum.Tpo src/$(DEPDIR)/src_sha224sum-md5sum.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/md5sum.c' object='src/src_sha224sum-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_sha224sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_sha224sum-md5sum.obj `if test -f 'src/md5sum.c'; then $(CYGPATH_W) 'src/md5sum.c'; else $(CYGPATH_W) '$(srcdir)/src/md5sum.c'; fi` + +src/src_sha256sum-md5sum.o: src/md5sum.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_sha256sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_sha256sum-md5sum.o -MD -MP -MF src/$(DEPDIR)/src_sha256sum-md5sum.Tpo -c -o src/src_sha256sum-md5sum.o `test -f 'src/md5sum.c' || echo '$(srcdir)/'`src/md5sum.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_sha256sum-md5sum.Tpo src/$(DEPDIR)/src_sha256sum-md5sum.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/md5sum.c' object='src/src_sha256sum-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_sha256sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_sha256sum-md5sum.o `test -f 'src/md5sum.c' || echo '$(srcdir)/'`src/md5sum.c + +src/src_sha256sum-md5sum.obj: src/md5sum.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_sha256sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_sha256sum-md5sum.obj -MD -MP -MF src/$(DEPDIR)/src_sha256sum-md5sum.Tpo -c -o src/src_sha256sum-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_sha256sum-md5sum.Tpo src/$(DEPDIR)/src_sha256sum-md5sum.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/md5sum.c' object='src/src_sha256sum-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_sha256sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_sha256sum-md5sum.obj `if test -f 'src/md5sum.c'; then $(CYGPATH_W) 'src/md5sum.c'; else $(CYGPATH_W) '$(srcdir)/src/md5sum.c'; fi` + +src/src_sha384sum-md5sum.o: src/md5sum.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_sha384sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_sha384sum-md5sum.o -MD -MP -MF src/$(DEPDIR)/src_sha384sum-md5sum.Tpo -c -o src/src_sha384sum-md5sum.o `test -f 'src/md5sum.c' || echo '$(srcdir)/'`src/md5sum.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_sha384sum-md5sum.Tpo src/$(DEPDIR)/src_sha384sum-md5sum.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/md5sum.c' object='src/src_sha384sum-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_sha384sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_sha384sum-md5sum.o `test -f 'src/md5sum.c' || echo '$(srcdir)/'`src/md5sum.c + +src/src_sha384sum-md5sum.obj: src/md5sum.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_sha384sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_sha384sum-md5sum.obj -MD -MP -MF src/$(DEPDIR)/src_sha384sum-md5sum.Tpo -c -o src/src_sha384sum-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_sha384sum-md5sum.Tpo src/$(DEPDIR)/src_sha384sum-md5sum.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/md5sum.c' object='src/src_sha384sum-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_sha384sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_sha384sum-md5sum.obj `if test -f 'src/md5sum.c'; then $(CYGPATH_W) 'src/md5sum.c'; else $(CYGPATH_W) '$(srcdir)/src/md5sum.c'; fi` + +src/src_sha512sum-md5sum.o: src/md5sum.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_sha512sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_sha512sum-md5sum.o -MD -MP -MF src/$(DEPDIR)/src_sha512sum-md5sum.Tpo -c -o src/src_sha512sum-md5sum.o `test -f 'src/md5sum.c' || echo '$(srcdir)/'`src/md5sum.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_sha512sum-md5sum.Tpo src/$(DEPDIR)/src_sha512sum-md5sum.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/md5sum.c' object='src/src_sha512sum-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_sha512sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_sha512sum-md5sum.o `test -f 'src/md5sum.c' || echo '$(srcdir)/'`src/md5sum.c + +src/src_sha512sum-md5sum.obj: src/md5sum.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_sha512sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_sha512sum-md5sum.obj -MD -MP -MF src/$(DEPDIR)/src_sha512sum-md5sum.Tpo -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` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_sha512sum-md5sum.Tpo src/$(DEPDIR)/src_sha512sum-md5sum.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/md5sum.c' object='src/src_sha512sum-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_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) +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__cwd=`pwd` && $(am__cd) $(srcdir) && \ + rm -rf $$backupdir && mkdir $$backupdir && \ + if ($(MAKEINFO) --version) >/dev/null 2>&1; then \ + for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \ + if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \ + done; \ + else :; fi && \ + cd "$$am__cwd"; \ + if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I doc -I $(srcdir)/doc \ + -o $@ $(srcdir)/doc/coreutils.texi; \ + then \ + rc=0; \ + $(am__cd) $(srcdir); \ + else \ + rc=$$?; \ + $(am__cd) $(srcdir) && \ + $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \ + fi; \ + 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" \ + MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I doc -I $(srcdir)/doc' \ + $(TEXI2DVI) -o $@ `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" \ + MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I doc -I $(srcdir)/doc' \ + $(TEXI2PDF) -o $@ `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 \ + -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; \ + else \ + if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \ + rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \ + 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) + @(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"; \ + echo "@set UPDATED-MONTH $$2 $$3"; \ + echo "@set EDITION $(VERSION)"; \ + echo "@set VERSION $(VERSION)") > vti.tmp + @cmp -s vti.tmp $(srcdir)/doc/version.texi \ + || (echo "Updating $(srcdir)/doc/version.texi"; \ + cp vti.tmp $(srcdir)/doc/version.texi) + -@rm -f vti.tmp + @cp $(srcdir)/doc/version.texi $@ + +mostlyclean-vti: + -rm -f vti.tmp + +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 $@ $< + +uninstall-dvi-am: + @$(NORMAL_UNINSTALL) + @list='$(DVIS)'; test -n "$(dvidir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(dvidir)/$$f'"; \ + rm -f "$(DESTDIR)$(dvidir)/$$f"; \ + done + +uninstall-html-am: + @$(NORMAL_UNINSTALL) + @list='$(HTMLS)'; test -n "$(htmldir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " rm -rf '$(DESTDIR)$(htmldir)/$$f'"; \ + rm -rf "$(DESTDIR)$(htmldir)/$$f"; \ + done + +uninstall-info-am: + @$(PRE_UNINSTALL) + @if test -d '$(DESTDIR)$(infodir)' && $(am__can_run_installinfo); then \ + list='$(INFO_DEPS)'; \ + for file in $$list; do \ + relfile=`echo "$$file" | sed 's|^.*/||'`; \ + echo " install-info --info-dir='$(DESTDIR)$(infodir)' --remove '$(DESTDIR)$(infodir)/$$relfile'"; \ + if install-info --info-dir="$(DESTDIR)$(infodir)" --remove "$(DESTDIR)$(infodir)/$$relfile"; \ + then :; else test ! -f "$(DESTDIR)$(infodir)/$$relfile" || exit 1; fi; \ + done; \ + else :; fi + @$(NORMAL_UNINSTALL) + @list='$(INFO_DEPS)'; \ + for file in $$list; do \ + relfile=`echo "$$file" | sed 's|^.*/||'`; \ + relfile_i=`echo "$$relfile" | sed 's|\.info$$||;s|$$|.i|'`; \ + (if test -d "$(DESTDIR)$(infodir)" && cd "$(DESTDIR)$(infodir)"; then \ + echo " cd '$(DESTDIR)$(infodir)' && rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]"; \ + rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]; \ + else :; fi); \ + done + +uninstall-pdf-am: + @$(NORMAL_UNINSTALL) + @list='$(PDFS)'; test -n "$(pdfdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(pdfdir)/$$f'"; \ + rm -f "$(DESTDIR)$(pdfdir)/$$f"; \ + done + +uninstall-ps-am: + @$(NORMAL_UNINSTALL) + @list='$(PSS)'; test -n "$(psdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(psdir)/$$f'"; \ + rm -f "$(DESTDIR)$(psdir)/$$f"; \ + done + +dist-info: $(INFO_DEPS) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + list='$(INFO_DEPS)'; \ + for base in $$list; do \ + case $$base in \ + $(srcdir)/*) base=`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \ + esac; \ + if test -f $$base; then d=.; else d=$(srcdir); fi; \ + base_i=`echo "$$base" | sed 's|\.info$$||;s|$$|.i|'`; \ + for file in $$d/$$base $$d/$$base-[0-9] $$d/$$base-[0-9][0-9] $$d/$$base_i[0-9] $$d/$$base_i[0-9][0-9]; do \ + if test -f $$file; then \ + relfile=`expr "$$file" : "$$d/\(.*\)"`; \ + test -f "$(distdir)/$$relfile" || \ + cp -p $$file "$(distdir)/$$relfile"; \ + else :; fi; \ + done; \ + 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 + +clean-aminfo: + -test -z "doc/coreutils.dvi doc/coreutils.pdf doc/coreutils.ps \ + doc/coreutils.html" \ + || rm -rf doc/coreutils.dvi doc/coreutils.pdf doc/coreutils.ps \ + doc/coreutils.html + +maintainer-clean-aminfo: + @list='$(INFO_DEPS)'; for i in $$list; do \ + i_i=`echo "$$i" | sed 's|\.info$$||;s|$$|.i|'`; \ + echo " rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]"; \ + rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]; \ + done +install-man1: $(man1_MANS) + @$(NORMAL_INSTALL) + @list1='$(man1_MANS)'; \ + list2=''; \ + test -n "$(man1dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.1[a-z]*$$/p'; \ + fi; \ + } | while read p; do \ + if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; echo "$$p"; \ + done | \ + sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ + -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \ + sed 'N;N;s,\n, ,g' | { \ + list=; while read file base inst; do \ + if test "$$base" = "$$inst"; then list="$$list $$file"; else \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \ + fi; \ + done; \ + for i in $$list; do echo "$$i"; done | $(am__base_list) | \ + while read files; do \ + test -z "$$files" || { \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \ + done; } + +uninstall-man1: + @$(NORMAL_UNINSTALL) + @list='$(man1_MANS)'; test -n "$(man1dir)" || exit 0; \ + files=`{ for i in $$list; do echo "$$i"; done; \ + } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ + -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ + 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. +# 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 \ @@ -1844,10 +7122,6 @@ ctags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -1911,34 +7185,162 @@ GTAGS: && $(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 +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -cscope.files: clean-cscope cscopelist-recursive cscopelist +$(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; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + echo "$$msg"; \ + 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; \ + 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 \ + col="$$grn"; \ + else \ + col="$$red"; \ + fi; \ + echo "$$msg" | $(am__text_box) "col=$$col" "std=$$std"; \ + $$exit || exit 1 -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ - 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"; \ +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; \ - done >> $(top_builddir)/cscope.files + 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: -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -rm -f cscope.out cscope.in.out cscope.po.out cscope.files +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; \ + fi; \ + done; \ + if test -z "$$R2H"; then \ + echo >&2 "cannot find rst2html, cannot create $@"; \ + exit 2; \ + 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 +.sh.log: + @p='$<'; $(am__check_pre) $(SH_LOG_COMPILE) "$$tst" $(am__check_post) +@am__EXEEXT_TRUE@.sh$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; $(am__check_pre) $(SH_LOG_COMPILE) "$$tst" $(am__check_post) +.pl.log: + @p='$<'; $(am__check_pre) $(PL_LOG_COMPILE) "$$tst" $(am__check_post) +@am__EXEEXT_TRUE@.pl$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; $(am__check_pre) $(PL_LOG_COMPILE) "$$tst" $(am__check_post) +.xpl.log: + @p='$<'; $(am__check_pre) $(XPL_LOG_COMPILE) "$$tst" $(am__check_post) +@am__EXEEXT_TRUE@.xpl$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; $(am__check_pre) $(XPL_LOG_COMPILE) "$$tst" $(am__check_post) 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'`; \ @@ -1997,7 +7399,7 @@ distdir: $(DISTFILES) done $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$(top_distdir)" distdir="$(distdir)" \ - dist-hook + dist-info dist-hook -test -n "$(am__skip_mode_fix)" \ || find "$(distdir)" -type d ! -perm -755 \ -exec chmod u+rwx,go+rx {} \; -o \ @@ -2007,35 +7409,39 @@ distdir: $(DISTFILES) || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__post_remove_distdir) + $(am__remove_distdir) dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 - $(am__post_remove_distdir) + $(am__remove_distdir) dist-lzip: distdir tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz - $(am__post_remove_distdir) + $(am__remove_distdir) + +dist-lzma: distdir + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma + $(am__remove_distdir) dist-xz: distdir tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz - $(am__post_remove_distdir) + $(am__remove_distdir) dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__post_remove_distdir) + $(am__remove_distdir) dist-shar: distdir shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__post_remove_distdir) + $(am__remove_distdir) dist-zip: distdir -rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) - $(am__post_remove_distdir) + $(am__remove_distdir) -dist dist-all: - $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_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) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another @@ -2046,6 +7452,8 @@ 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*) \ @@ -2057,7 +7465,7 @@ distcheck: dist *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) + chmod -R a-w $(distdir); chmod u+w $(distdir) mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) @@ -2092,7 +7500,7 @@ distcheck: dist && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ && cd "$$am__cwd" \ || exit 1 - $(am__post_remove_distdir) + $(am__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' @@ -2123,11 +7531,16 @@ distcleancheck: distclean $(distcleancheck_listfiles) ; \ exit 1; } >&2 check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-recursive -all-am: Makefile +all-am: Makefile $(INFO_DEPS) $(LIBRARIES) $(PROGRAMS) $(MANS) \ + $(HEADERS) all-local installdirs: installdirs-recursive installdirs-am: + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibexecdir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-recursive install-exec: install-exec-recursive @@ -2149,112 +7562,254 @@ install-strip: "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ fi 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_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -rm -f doc/$(am__dirstamp) + -rm -f lib/$(DEPDIR)/$(am__dirstamp) + -rm -f lib/$(am__dirstamp) + -rm -f lib/glthread/$(DEPDIR)/$(am__dirstamp) + -rm -f lib/glthread/$(am__dirstamp) + -rm -f lib/unistr/$(DEPDIR)/$(am__dirstamp) + -rm -f lib/unistr/$(am__dirstamp) + -rm -f lib/uniwidth/$(DEPDIR)/$(am__dirstamp) + -rm -f lib/uniwidth/$(am__dirstamp) + -rm -f src/$(DEPDIR)/$(am__dirstamp) + -rm -f src/$(am__dirstamp) -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." + -rm -f lib/parse-datetime.c -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) clean: clean-recursive -clean-am: clean-generic mostlyclean-am +clean-am: clean-aminfo clean-binPROGRAMS clean-generic \ + clean-noinstLIBRARIES clean-noinstPROGRAMS \ + clean-pkglibexecPROGRAMS mostlyclean-am distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -rf lib/$(DEPDIR) lib/glthread/$(DEPDIR) lib/unistr/$(DEPDIR) lib/uniwidth/$(DEPDIR) src/$(DEPDIR) -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-tags +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-hdr distclean-local distclean-tags dvi: dvi-recursive -dvi-am: +dvi-am: $(DVIS) html: html-recursive -html-am: +html-am: $(HTMLS) info: info-recursive -info-am: +info-am: $(INFO_DEPS) -install-data-am: +install-data-am: install-info-am install-man install-dvi: install-dvi-recursive -install-dvi-am: - -install-exec-am: +install-dvi-am: $(DVIS) + @$(NORMAL_INSTALL) + @list='$(DVIS)'; test -n "$(dvidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(dvidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(dvidir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dvidir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(dvidir)" || exit $$?; \ + done +install-exec-am: install-binPROGRAMS install-exec-local \ + install-pkglibexecPROGRAMS install-html: install-html-recursive -install-html-am: - +install-html-am: $(HTMLS) + @$(NORMAL_INSTALL) + @list='$(HTMLS)'; list2=; test -n "$(htmldir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(htmldir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \ + $(am__strip_dir) \ + d2=$$d$$p; \ + if test -d "$$d2"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \ + $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \ + echo " $(INSTALL_DATA) '$$d2'/* '$(DESTDIR)$(htmldir)/$$f'"; \ + $(INSTALL_DATA) "$$d2"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \ + else \ + list2="$$list2 $$d2"; \ + fi; \ + done; \ + test -z "$$list2" || { echo "$$list2" | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(htmldir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(htmldir)" || exit $$?; \ + done; } install-info: install-info-recursive -install-info-am: - -install-man: +install-info-am: $(INFO_DEPS) + @$(NORMAL_INSTALL) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(infodir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(infodir)" || exit 1; \ + fi; \ + for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + esac; \ + if test -f $$file; then d=.; else d=$(srcdir); fi; \ + file_i=`echo "$$file" | sed 's|\.info$$||;s|$$|.i|'`; \ + for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9] \ + $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \ + if test -f $$ifile; then \ + echo "$$ifile"; \ + else : ; fi; \ + done; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(infodir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(infodir)" || exit $$?; done + @$(POST_INSTALL) + @if $(am__can_run_installinfo); then \ + list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \ + for file in $$list; do \ + relfile=`echo "$$file" | sed 's|^.*/||'`; \ + echo " install-info --info-dir='$(DESTDIR)$(infodir)' '$(DESTDIR)$(infodir)/$$relfile'";\ + install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\ + done; \ + else : ; fi +install-man: install-man1 install-pdf: install-pdf-recursive -install-pdf-am: - +install-pdf-am: $(PDFS) + @$(NORMAL_INSTALL) + @list='$(PDFS)'; test -n "$(pdfdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pdfdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pdfdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pdfdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pdfdir)" || exit $$?; done install-ps: install-ps-recursive -install-ps-am: - +install-ps-am: $(PSS) + @$(NORMAL_INSTALL) + @list='$(PSS)'; test -n "$(psdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(psdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(psdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(psdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(psdir)" || exit $$?; done installcheck-am: maintainer-clean: maintainer-clean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -rf $(top_srcdir)/autom4te.cache + -rm -rf lib/$(DEPDIR) lib/glthread/$(DEPDIR) lib/unistr/$(DEPDIR) lib/uniwidth/$(DEPDIR) src/$(DEPDIR) -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic +maintainer-clean-am: distclean-am maintainer-clean-aminfo \ + maintainer-clean-generic maintainer-clean-vti mostlyclean: mostlyclean-recursive -mostlyclean-am: mostlyclean-generic +mostlyclean-am: am--mostlyclean-test-html mostlyclean-aminfo \ + mostlyclean-compile mostlyclean-generic mostlyclean-local \ + mostlyclean-vti pdf: pdf-recursive -pdf-am: +pdf-am: $(PDFS) ps: ps-recursive -ps-am: +ps-am: $(PSS) -uninstall-am: +uninstall-am: uninstall-binPROGRAMS uninstall-dvi-am uninstall-html-am \ + uninstall-info-am uninstall-local uninstall-man \ + uninstall-pdf-am uninstall-pkglibexecPROGRAMS uninstall-ps-am + +uninstall-man: uninstall-man1 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \ - cscopelist-recursive ctags-recursive install install-am \ - install-strip tags-recursive + 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 am--refresh check check-am clean clean-cscope \ - clean-generic cscope cscopelist cscopelist-recursive ctags \ - ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-hook \ - dist-lzip dist-shar dist-tarZ dist-xz dist-zip distcheck \ - distclean distclean-generic distclean-tags distcleancheck \ - distdir distuninstallcheck dvi dvi-am html html-am info \ - info-am install install-am 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-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am tags tags-recursive uninstall uninstall-am - -install-root: - cd src && $(MAKE) $@ -check-root: - cd tests && $(MAKE) $@ SUBDIRS= + 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 \ + 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-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 + + +# Keep these in sync with bootstrap.conf:bootstrap_post_import_hook(). +# Use '$(top_srcdir)/m4' and '$(srcdir)/src' for the benefit of non-GNU +# makes: it is with those directories that 'cu-progs.m4' and 'cu-progs.mk' +# appear in our dependencies. +$(top_srcdir)/m4/cu-progs.m4: $(gen_progs_lists) + $(AM_V_GEN)rm -f $@ $@-t \ + && $(SHELL) $(gen_progs_lists) --autoconf >$@-t \ + && chmod a-w $@-t && mv -f $@-t $@ +$(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 $@ # Shortcut targets to make it easier to run (very) expensive tests. check-expensive: @@ -2270,7 +7825,7 @@ check-very-expensive: # See the rm_subst comment for details. dist-hook: gen-ChangeLog $(AM_V_GEN)echo $(VERSION) > $(distdir)/.tarball-version - $(AM_V_at)perl -pi -e '$(rm_subst)' $(distdir)/src/Makefile.in + $(AM_V_at)perl -pi -e '$(rm_subst)' $(distdir)/Makefile.in .PHONY: gen-ChangeLog gen-ChangeLog: $(AM_V_GEN)if test -d .git; then \ @@ -2333,6 +7888,2247 @@ check-git-hook-script-sync: rm -rf $$t; \ test $$fail = 0 +# We need the following in order to create 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 +@GL_GENERATE_ALLOCA_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@GL_GENERATE_ALLOCA_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@GL_GENERATE_ALLOCA_H_TRUE@ cat $(top_srcdir)/lib/alloca.in.h; \ +@GL_GENERATE_ALLOCA_H_TRUE@ } > $@-t && \ +@GL_GENERATE_ALLOCA_H_TRUE@ mv -f $@-t $@ +@GL_GENERATE_ALLOCA_H_FALSE@lib/alloca.h: $(top_builddir)/config.status +@GL_GENERATE_ALLOCA_H_FALSE@ rm -f $@ + +# We need the following in order to create when the system +# doesn't have one. +lib/arpa/inet.h: lib/arpa_inet.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H) + $(AM_V_at)$(MKDIR_P) lib/arpa + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's|@''GUARD_PREFIX''@|GL|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|@''HAVE_FEATURES_H''@|$(HAVE_FEATURES_H)|g' \ + -e 's|@''NEXT_ARPA_INET_H''@|$(NEXT_ARPA_INET_H)|g' \ + -e 's|@''HAVE_ARPA_INET_H''@|$(HAVE_ARPA_INET_H)|g' \ + -e 's/@''GNULIB_INET_NTOP''@/$(GNULIB_INET_NTOP)/g' \ + -e 's/@''GNULIB_INET_PTON''@/$(GNULIB_INET_PTON)/g' \ + -e 's|@''HAVE_DECL_INET_NTOP''@|$(HAVE_DECL_INET_NTOP)|g' \ + -e 's|@''HAVE_DECL_INET_PTON''@|$(HAVE_DECL_INET_PTON)|g' \ + -e 's|@''REPLACE_INET_NTOP''@|$(REPLACE_INET_NTOP)|g' \ + -e 's|@''REPLACE_INET_PTON''@|$(REPLACE_INET_PTON)|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/arpa_inet.in.h; \ + } > $@-t && \ + mv $@-t $@ + +# Listed in the same order as the GNU makefile conventions, and +# provided by autoconf 2.59c+. +# The Automake-defined pkg* macros are appended, in the order +# listed in the Automake 1.10a+ documentation. +lib/configmake.h: Makefile + $(AM_V_GEN)rm -f $@-t && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + echo '#define PREFIX "$(prefix)"'; \ + echo '#define EXEC_PREFIX "$(exec_prefix)"'; \ + echo '#define BINDIR "$(bindir)"'; \ + echo '#define SBINDIR "$(sbindir)"'; \ + echo '#define LIBEXECDIR "$(libexecdir)"'; \ + echo '#define DATAROOTDIR "$(datarootdir)"'; \ + echo '#define DATADIR "$(datadir)"'; \ + echo '#define SYSCONFDIR "$(sysconfdir)"'; \ + echo '#define SHAREDSTATEDIR "$(sharedstatedir)"'; \ + echo '#define LOCALSTATEDIR "$(localstatedir)"'; \ + echo '#define INCLUDEDIR "$(includedir)"'; \ + echo '#define OLDINCLUDEDIR "$(oldincludedir)"'; \ + echo '#define DOCDIR "$(docdir)"'; \ + echo '#define INFODIR "$(infodir)"'; \ + echo '#define HTMLDIR "$(htmldir)"'; \ + echo '#define DVIDIR "$(dvidir)"'; \ + echo '#define PDFDIR "$(pdfdir)"'; \ + echo '#define PSDIR "$(psdir)"'; \ + echo '#define LIBDIR "$(libdir)"'; \ + echo '#define LISPDIR "$(lispdir)"'; \ + echo '#define LOCALEDIR "$(localedir)"'; \ + echo '#define MANDIR "$(mandir)"'; \ + echo '#define MANEXT "$(manext)"'; \ + echo '#define PKGDATADIR "$(pkgdatadir)"'; \ + echo '#define PKGINCLUDEDIR "$(pkgincludedir)"'; \ + echo '#define PKGLIBDIR "$(pkglibdir)"'; \ + echo '#define PKGLIBEXECDIR "$(pkglibexecdir)"'; \ + } | sed '/""/d' > $@-t && \ + mv -f $@-t $@ + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +lib/ctype.h: lib/ctype.in.h $(top_builddir)/config.status $(CXXDEFS_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|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_CTYPE_H''@|$(NEXT_CTYPE_H)|g' \ + -e 's/@''GNULIB_ISBLANK''@/$(GNULIB_ISBLANK)/g' \ + -e 's/@''HAVE_ISBLANK''@/$(HAVE_ISBLANK)/g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ + < $(top_srcdir)/lib/ctype.in.h; \ + } > $@-t && \ + mv $@-t $@ + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +lib/dirent.h: lib/dirent.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_DIRENT_H''@|$(HAVE_DIRENT_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_DIRENT_H''@|$(NEXT_DIRENT_H)|g' \ + -e 's/@''GNULIB_OPENDIR''@/$(GNULIB_OPENDIR)/g' \ + -e 's/@''GNULIB_READDIR''@/$(GNULIB_READDIR)/g' \ + -e 's/@''GNULIB_REWINDDIR''@/$(GNULIB_REWINDDIR)/g' \ + -e 's/@''GNULIB_CLOSEDIR''@/$(GNULIB_CLOSEDIR)/g' \ + -e 's/@''GNULIB_DIRFD''@/$(GNULIB_DIRFD)/g' \ + -e 's/@''GNULIB_FDOPENDIR''@/$(GNULIB_FDOPENDIR)/g' \ + -e 's/@''GNULIB_SCANDIR''@/$(GNULIB_SCANDIR)/g' \ + -e 's/@''GNULIB_ALPHASORT''@/$(GNULIB_ALPHASORT)/g' \ + -e 's/@''HAVE_OPENDIR''@/$(HAVE_OPENDIR)/g' \ + -e 's/@''HAVE_READDIR''@/$(HAVE_READDIR)/g' \ + -e 's/@''HAVE_REWINDDIR''@/$(HAVE_REWINDDIR)/g' \ + -e 's/@''HAVE_CLOSEDIR''@/$(HAVE_CLOSEDIR)/g' \ + -e 's|@''HAVE_DECL_DIRFD''@|$(HAVE_DECL_DIRFD)|g' \ + -e 's|@''HAVE_DECL_FDOPENDIR''@|$(HAVE_DECL_FDOPENDIR)|g' \ + -e 's|@''HAVE_FDOPENDIR''@|$(HAVE_FDOPENDIR)|g' \ + -e 's|@''HAVE_SCANDIR''@|$(HAVE_SCANDIR)|g' \ + -e 's|@''HAVE_ALPHASORT''@|$(HAVE_ALPHASORT)|g' \ + -e 's|@''REPLACE_OPENDIR''@|$(REPLACE_OPENDIR)|g' \ + -e 's|@''REPLACE_CLOSEDIR''@|$(REPLACE_CLOSEDIR)|g' \ + -e 's|@''REPLACE_DIRFD''@|$(REPLACE_DIRFD)|g' \ + -e 's|@''REPLACE_FDOPENDIR''@|$(REPLACE_FDOPENDIR)|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/dirent.in.h; \ + } > $@-t && \ + mv $@-t $@ + +# We need the following in order to create when the system +# doesn't have one that is POSIX compliant. +@GL_GENERATE_ERRNO_H_TRUE@lib/errno.h: lib/errno.in.h $(top_builddir)/config.status +@GL_GENERATE_ERRNO_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@GL_GENERATE_ERRNO_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ +@GL_GENERATE_ERRNO_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''NEXT_ERRNO_H''@|$(NEXT_ERRNO_H)|g' \ +@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''EMULTIHOP_HIDDEN''@|$(EMULTIHOP_HIDDEN)|g' \ +@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''EMULTIHOP_VALUE''@|$(EMULTIHOP_VALUE)|g' \ +@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''ENOLINK_HIDDEN''@|$(ENOLINK_HIDDEN)|g' \ +@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''ENOLINK_VALUE''@|$(ENOLINK_VALUE)|g' \ +@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''EOVERFLOW_HIDDEN''@|$(EOVERFLOW_HIDDEN)|g' \ +@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''EOVERFLOW_VALUE''@|$(EOVERFLOW_VALUE)|g' \ +@GL_GENERATE_ERRNO_H_TRUE@ < $(top_srcdir)/lib/errno.in.h; \ +@GL_GENERATE_ERRNO_H_TRUE@ } > $@-t && \ +@GL_GENERATE_ERRNO_H_TRUE@ mv $@-t $@ +@GL_GENERATE_ERRNO_H_FALSE@lib/errno.h: $(top_builddir)/config.status +@GL_GENERATE_ERRNO_H_FALSE@ rm -f $@ + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +lib/fcntl.h: lib/fcntl.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|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_FCNTL_H''@|$(NEXT_FCNTL_H)|g' \ + -e 's/@''GNULIB_FCNTL''@/$(GNULIB_FCNTL)/g' \ + -e 's/@''GNULIB_NONBLOCKING''@/$(GNULIB_NONBLOCKING)/g' \ + -e 's/@''GNULIB_OPEN''@/$(GNULIB_OPEN)/g' \ + -e 's/@''GNULIB_OPENAT''@/$(GNULIB_OPENAT)/g' \ + -e 's|@''HAVE_FCNTL''@|$(HAVE_FCNTL)|g' \ + -e 's|@''HAVE_OPENAT''@|$(HAVE_OPENAT)|g' \ + -e 's|@''REPLACE_FCNTL''@|$(REPLACE_FCNTL)|g' \ + -e 's|@''REPLACE_OPEN''@|$(REPLACE_OPEN)|g' \ + -e 's|@''REPLACE_OPENAT''@|$(REPLACE_OPENAT)|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/fcntl.in.h; \ + } > $@-t && \ + mv $@-t $@ + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +@GL_GENERATE_FLOAT_H_TRUE@lib/float.h: lib/float.in.h $(top_builddir)/config.status +@GL_GENERATE_FLOAT_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@GL_GENERATE_FLOAT_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ +@GL_GENERATE_FLOAT_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@GL_GENERATE_FLOAT_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@GL_GENERATE_FLOAT_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@GL_GENERATE_FLOAT_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@GL_GENERATE_FLOAT_H_TRUE@ -e 's|@''NEXT_FLOAT_H''@|$(NEXT_FLOAT_H)|g' \ +@GL_GENERATE_FLOAT_H_TRUE@ -e 's|@''REPLACE_ITOLD''@|$(REPLACE_ITOLD)|g' \ +@GL_GENERATE_FLOAT_H_TRUE@ < $(top_srcdir)/lib/float.in.h; \ +@GL_GENERATE_FLOAT_H_TRUE@ } > $@-t && \ +@GL_GENERATE_FLOAT_H_TRUE@ mv $@-t $@ +@GL_GENERATE_FLOAT_H_FALSE@lib/float.h: $(top_builddir)/config.status +@GL_GENERATE_FLOAT_H_FALSE@ rm -f $@ + +# We need the following in order to create when the system +# doesn't have one that supports the required API. +@GL_GENERATE_FNMATCH_H_TRUE@lib/fnmatch.h: lib/fnmatch.in.h $(top_builddir)/config.status $(ARG_NONNULL_H) +@GL_GENERATE_FNMATCH_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@GL_GENERATE_FNMATCH_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@GL_GENERATE_FNMATCH_H_TRUE@ sed -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ +@GL_GENERATE_FNMATCH_H_TRUE@ < $(top_srcdir)/lib/fnmatch.in.h; \ +@GL_GENERATE_FNMATCH_H_TRUE@ } > $@-t && \ +@GL_GENERATE_FNMATCH_H_TRUE@ mv -f $@-t $@ +@GL_GENERATE_FNMATCH_H_FALSE@lib/fnmatch.h: $(top_builddir)/config.status +@GL_GENERATE_FNMATCH_H_FALSE@ rm -f $@ + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +lib/getopt.h: lib/getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H) + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's|@''GUARD_PREFIX''@|GL|g' \ + -e 's|@''HAVE_GETOPT_H''@|$(HAVE_GETOPT_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_GETOPT_H''@|$(NEXT_GETOPT_H)|g' \ + -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ + < $(top_srcdir)/lib/getopt.in.h; \ + } > $@-t && \ + mv -f $@-t $@ + +distclean-local: clean-GNUmakefile +clean-GNUmakefile: + test '$(srcdir)' = . || rm -f $(top_builddir)/GNUmakefile + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +@GL_GENERATE_ICONV_H_TRUE@lib/iconv.h: lib/iconv.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) +@GL_GENERATE_ICONV_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@GL_GENERATE_ICONV_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ +@GL_GENERATE_ICONV_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@GL_GENERATE_ICONV_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@GL_GENERATE_ICONV_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@GL_GENERATE_ICONV_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@GL_GENERATE_ICONV_H_TRUE@ -e 's|@''NEXT_ICONV_H''@|$(NEXT_ICONV_H)|g' \ +@GL_GENERATE_ICONV_H_TRUE@ -e 's/@''GNULIB_ICONV''@/$(GNULIB_ICONV)/g' \ +@GL_GENERATE_ICONV_H_TRUE@ -e 's|@''ICONV_CONST''@|$(ICONV_CONST)|g' \ +@GL_GENERATE_ICONV_H_TRUE@ -e 's|@''REPLACE_ICONV''@|$(REPLACE_ICONV)|g' \ +@GL_GENERATE_ICONV_H_TRUE@ -e 's|@''REPLACE_ICONV_OPEN''@|$(REPLACE_ICONV_OPEN)|g' \ +@GL_GENERATE_ICONV_H_TRUE@ -e 's|@''REPLACE_ICONV_UTF''@|$(REPLACE_ICONV_UTF)|g' \ +@GL_GENERATE_ICONV_H_TRUE@ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ +@GL_GENERATE_ICONV_H_TRUE@ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ +@GL_GENERATE_ICONV_H_TRUE@ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ +@GL_GENERATE_ICONV_H_TRUE@ < $(top_srcdir)/lib/iconv.in.h; \ +@GL_GENERATE_ICONV_H_TRUE@ } > $@-t && \ +@GL_GENERATE_ICONV_H_TRUE@ mv $@-t $@ +@GL_GENERATE_ICONV_H_FALSE@lib/iconv.h: $(top_builddir)/config.status +@GL_GENERATE_ICONV_H_FALSE@ rm -f $@ + +lib/iconv_open-aix.h: lib/iconv_open-aix.gperf + $(GPERF) -m 10 $(top_srcdir)/lib/iconv_open-aix.gperf > $(top_srcdir)/lib/iconv_open-aix.h-t + mv $(top_srcdir)/lib/iconv_open-aix.h-t $(top_srcdir)/lib/iconv_open-aix.h +lib/iconv_open-hpux.h: lib/iconv_open-hpux.gperf + $(GPERF) -m 10 $(top_srcdir)/lib/iconv_open-hpux.gperf > $(top_srcdir)/lib/iconv_open-hpux.h-t + mv $(top_srcdir)/lib/iconv_open-hpux.h-t $(top_srcdir)/lib/iconv_open-hpux.h +lib/iconv_open-irix.h: lib/iconv_open-irix.gperf + $(GPERF) -m 10 $(top_srcdir)/lib/iconv_open-irix.gperf > $(top_srcdir)/lib/iconv_open-irix.h-t + mv $(top_srcdir)/lib/iconv_open-irix.h-t $(top_srcdir)/lib/iconv_open-irix.h +lib/iconv_open-osf.h: lib/iconv_open-osf.gperf + $(GPERF) -m 10 $(top_srcdir)/lib/iconv_open-osf.gperf > $(top_srcdir)/lib/iconv_open-osf.h-t + mv $(top_srcdir)/lib/iconv_open-osf.h-t $(top_srcdir)/lib/iconv_open-osf.h +lib/iconv_open-solaris.h: lib/iconv_open-solaris.gperf + $(GPERF) -m 10 $(top_srcdir)/lib/iconv_open-solaris.gperf > $(top_srcdir)/lib/iconv_open-solaris.h-t + mv $(top_srcdir)/lib/iconv_open-solaris.h-t $(top_srcdir)/lib/iconv_open-solaris.h + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +lib/inttypes.h: lib/inttypes.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H) + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_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_INTTYPES_H''@|$(NEXT_INTTYPES_H)|g' \ + -e 's/@''PRI_MACROS_BROKEN''@/$(PRI_MACROS_BROKEN)/g' \ + -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \ + -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \ + -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \ + -e 's/@''PRIPTR_PREFIX''@/$(PRIPTR_PREFIX)/g' \ + -e 's/@''GNULIB_IMAXABS''@/$(GNULIB_IMAXABS)/g' \ + -e 's/@''GNULIB_IMAXDIV''@/$(GNULIB_IMAXDIV)/g' \ + -e 's/@''GNULIB_STRTOIMAX''@/$(GNULIB_STRTOIMAX)/g' \ + -e 's/@''GNULIB_STRTOUMAX''@/$(GNULIB_STRTOUMAX)/g' \ + -e 's/@''HAVE_DECL_IMAXABS''@/$(HAVE_DECL_IMAXABS)/g' \ + -e 's/@''HAVE_DECL_IMAXDIV''@/$(HAVE_DECL_IMAXDIV)/g' \ + -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/@''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' \ + -e 's/@''UINT64_MAX_EQ_ULONG_MAX''@/$(UINT64_MAX_EQ_ULONG_MAX)/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/inttypes.in.h; \ + } > $@-t && \ + mv $@-t $@ + +# We need the following in order to create an empty placeholder for +# when the system doesn't have one. +lib/langinfo.h: lib/langinfo.in.h $(top_builddir)/config.status $(CXXDEFS_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_LANGINFO_H''@|$(HAVE_LANGINFO_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_LANGINFO_H''@|$(NEXT_LANGINFO_H)|g' \ + -e 's/@''GNULIB_NL_LANGINFO''@/$(GNULIB_NL_LANGINFO)/g' \ + -e 's|@''HAVE_LANGINFO_CODESET''@|$(HAVE_LANGINFO_CODESET)|g' \ + -e 's|@''HAVE_LANGINFO_T_FMT_AMPM''@|$(HAVE_LANGINFO_T_FMT_AMPM)|g' \ + -e 's|@''HAVE_LANGINFO_ERA''@|$(HAVE_LANGINFO_ERA)|g' \ + -e 's|@''HAVE_LANGINFO_YESEXPR''@|$(HAVE_LANGINFO_YESEXPR)|g' \ + -e 's|@''HAVE_NL_LANGINFO''@|$(HAVE_NL_LANGINFO)|g' \ + -e 's|@''REPLACE_NL_LANGINFO''@|$(REPLACE_NL_LANGINFO)|g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ + < $(top_srcdir)/lib/langinfo.in.h; \ + } > $@-t && \ + mv $@-t $@ + +# We need the following in order to install a simple file in $(libdir) +# which is shared with other installed packages. We use a list of referencing +# packages so that "make uninstall" will remove the file if and only if it +# is not used by another installed package. +# On systems with glibc-2.1 or newer, the file is redundant, therefore we +# avoid installing it. + +all-local: lib/charset.alias lib/ref-add.sed lib/ref-del.sed +install-exec-local: install-exec-localcharset +install-exec-localcharset: all-local + if test $(GLIBC21) = no; then \ + case '$(host_os)' in \ + darwin[56]*) \ + need_charset_alias=true ;; \ + darwin* | cygwin* | mingw* | pw32* | cegcc*) \ + need_charset_alias=false ;; \ + *) \ + need_charset_alias=true ;; \ + esac ; \ + else \ + need_charset_alias=false ; \ + fi ; \ + if $$need_charset_alias; then \ + $(mkinstalldirs) $(DESTDIR)$(libdir) ; \ + fi ; \ + if test -f $(charset_alias); then \ + sed -f lib/ref-add.sed $(charset_alias) > $(charset_tmp) ; \ + $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \ + rm -f $(charset_tmp) ; \ + else \ + if $$need_charset_alias; then \ + sed -f lib/ref-add.sed lib/charset.alias > $(charset_tmp) ; \ + $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \ + rm -f $(charset_tmp) ; \ + fi ; \ + fi + +uninstall-local: uninstall-localcharset +uninstall-localcharset: all-local + if test -f $(charset_alias); then \ + sed -f lib/ref-del.sed $(charset_alias) > $(charset_tmp); \ + if grep '^# Packages using this file: $$' $(charset_tmp) \ + > /dev/null; then \ + rm -f $(charset_alias); \ + else \ + $(INSTALL_DATA) $(charset_tmp) $(charset_alias); \ + fi; \ + rm -f $(charset_tmp); \ + fi + +lib/charset.alias: lib/config.charset + $(AM_V_GEN)rm -f $@-t $@ && \ + $(SHELL) $(top_srcdir)/lib/config.charset '$(host)' > $@-t && \ + mv $@-t $@ + +# SUFFIXES += .sed .sin +.sin.sed: + $(AM_V_GEN)rm -f $@-t $@ && \ + sed -e '/^#/d' -e 's/@''PACKAGE''@/$(PACKAGE)/g' $< > $@-t && \ + mv $@-t $@ + +# We need the following in order to create when the system +# doesn't have one that provides all definitions. +lib/locale.h: lib/locale.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|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_LOCALE_H''@|$(NEXT_LOCALE_H)|g' \ + -e 's/@''GNULIB_LOCALECONV''@/$(GNULIB_LOCALECONV)/g' \ + -e 's/@''GNULIB_SETLOCALE''@/$(GNULIB_SETLOCALE)/g' \ + -e 's/@''GNULIB_DUPLOCALE''@/$(GNULIB_DUPLOCALE)/g' \ + -e 's|@''HAVE_DUPLOCALE''@|$(HAVE_DUPLOCALE)|g' \ + -e 's|@''HAVE_XLOCALE_H''@|$(HAVE_XLOCALE_H)|g' \ + -e 's|@''REPLACE_LOCALECONV''@|$(REPLACE_LOCALECONV)|g' \ + -e 's|@''REPLACE_SETLOCALE''@|$(REPLACE_SETLOCALE)|g' \ + -e 's|@''REPLACE_DUPLOCALE''@|$(REPLACE_DUPLOCALE)|g' \ + -e 's|@''REPLACE_STRUCT_LCONV''@|$(REPLACE_STRUCT_LCONV)|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/locale.in.h; \ + } > $@-t && \ + mv $@-t $@ + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +lib/math.h: lib/math.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|@''INCLUDE_NEXT_AS_FIRST_DIRECTIVE''@|$(INCLUDE_NEXT_AS_FIRST_DIRECTIVE)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_AS_FIRST_DIRECTIVE_MATH_H''@|$(NEXT_AS_FIRST_DIRECTIVE_MATH_H)|g' \ + -e 's/@''GNULIB_ACOSF''@/$(GNULIB_ACOSF)/g' \ + -e 's/@''GNULIB_ACOSL''@/$(GNULIB_ACOSL)/g' \ + -e 's/@''GNULIB_ASINF''@/$(GNULIB_ASINF)/g' \ + -e 's/@''GNULIB_ASINL''@/$(GNULIB_ASINL)/g' \ + -e 's/@''GNULIB_ATANF''@/$(GNULIB_ATANF)/g' \ + -e 's/@''GNULIB_ATANL''@/$(GNULIB_ATANL)/g' \ + -e 's/@''GNULIB_ATAN2F''@/$(GNULIB_ATAN2F)/g' \ + -e 's/@''GNULIB_CBRT''@/$(GNULIB_CBRT)/g' \ + -e 's/@''GNULIB_CBRTF''@/$(GNULIB_CBRTF)/g' \ + -e 's/@''GNULIB_CBRTL''@/$(GNULIB_CBRTL)/g' \ + -e 's/@''GNULIB_CEIL''@/$(GNULIB_CEIL)/g' \ + -e 's/@''GNULIB_CEILF''@/$(GNULIB_CEILF)/g' \ + -e 's/@''GNULIB_CEILL''@/$(GNULIB_CEILL)/g' \ + -e 's/@''GNULIB_COPYSIGN''@/$(GNULIB_COPYSIGN)/g' \ + -e 's/@''GNULIB_COPYSIGNF''@/$(GNULIB_COPYSIGNF)/g' \ + -e 's/@''GNULIB_COPYSIGNL''@/$(GNULIB_COPYSIGNL)/g' \ + -e 's/@''GNULIB_COSF''@/$(GNULIB_COSF)/g' \ + -e 's/@''GNULIB_COSL''@/$(GNULIB_COSL)/g' \ + -e 's/@''GNULIB_COSHF''@/$(GNULIB_COSHF)/g' \ + -e 's/@''GNULIB_EXPF''@/$(GNULIB_EXPF)/g' \ + -e 's/@''GNULIB_EXPL''@/$(GNULIB_EXPL)/g' \ + -e 's/@''GNULIB_EXP2''@/$(GNULIB_EXP2)/g' \ + -e 's/@''GNULIB_EXP2F''@/$(GNULIB_EXP2F)/g' \ + -e 's/@''GNULIB_EXP2L''@/$(GNULIB_EXP2L)/g' \ + -e 's/@''GNULIB_EXPM1''@/$(GNULIB_EXPM1)/g' \ + -e 's/@''GNULIB_EXPM1F''@/$(GNULIB_EXPM1F)/g' \ + -e 's/@''GNULIB_EXPM1L''@/$(GNULIB_EXPM1L)/g' \ + -e 's/@''GNULIB_FABSF''@/$(GNULIB_FABSF)/g' \ + -e 's/@''GNULIB_FABSL''@/$(GNULIB_FABSL)/g' \ + -e 's/@''GNULIB_FLOOR''@/$(GNULIB_FLOOR)/g' \ + -e 's/@''GNULIB_FLOORF''@/$(GNULIB_FLOORF)/g' \ + -e 's/@''GNULIB_FLOORL''@/$(GNULIB_FLOORL)/g' \ + -e 's/@''GNULIB_FMA''@/$(GNULIB_FMA)/g' \ + -e 's/@''GNULIB_FMAF''@/$(GNULIB_FMAF)/g' \ + -e 's/@''GNULIB_FMAL''@/$(GNULIB_FMAL)/g' \ + -e 's/@''GNULIB_FMOD''@/$(GNULIB_FMOD)/g' \ + -e 's/@''GNULIB_FMODF''@/$(GNULIB_FMODF)/g' \ + -e 's/@''GNULIB_FMODL''@/$(GNULIB_FMODL)/g' \ + -e 's/@''GNULIB_FREXPF''@/$(GNULIB_FREXPF)/g' \ + -e 's/@''GNULIB_FREXP''@/$(GNULIB_FREXP)/g' \ + -e 's/@''GNULIB_FREXPL''@/$(GNULIB_FREXPL)/g' \ + -e 's/@''GNULIB_HYPOT''@/$(GNULIB_HYPOT)/g' \ + -e 's/@''GNULIB_HYPOTF''@/$(GNULIB_HYPOTF)/g' \ + -e 's/@''GNULIB_HYPOTL''@/$(GNULIB_HYPOTL)/g' \ + < $(top_srcdir)/lib/math.in.h | \ + sed -e 's/@''GNULIB_ILOGB''@/$(GNULIB_ILOGB)/g' \ + -e 's/@''GNULIB_ILOGBF''@/$(GNULIB_ILOGBF)/g' \ + -e 's/@''GNULIB_ILOGBL''@/$(GNULIB_ILOGBL)/g' \ + -e 's/@''GNULIB_ISFINITE''@/$(GNULIB_ISFINITE)/g' \ + -e 's/@''GNULIB_ISINF''@/$(GNULIB_ISINF)/g' \ + -e 's/@''GNULIB_ISNAN''@/$(GNULIB_ISNAN)/g' \ + -e 's/@''GNULIB_ISNANF''@/$(GNULIB_ISNANF)/g' \ + -e 's/@''GNULIB_ISNAND''@/$(GNULIB_ISNAND)/g' \ + -e 's/@''GNULIB_ISNANL''@/$(GNULIB_ISNANL)/g' \ + -e 's/@''GNULIB_LDEXPF''@/$(GNULIB_LDEXPF)/g' \ + -e 's/@''GNULIB_LDEXPL''@/$(GNULIB_LDEXPL)/g' \ + -e 's/@''GNULIB_LOG''@/$(GNULIB_LOG)/g' \ + -e 's/@''GNULIB_LOGF''@/$(GNULIB_LOGF)/g' \ + -e 's/@''GNULIB_LOGL''@/$(GNULIB_LOGL)/g' \ + -e 's/@''GNULIB_LOG10''@/$(GNULIB_LOG10)/g' \ + -e 's/@''GNULIB_LOG10F''@/$(GNULIB_LOG10F)/g' \ + -e 's/@''GNULIB_LOG10L''@/$(GNULIB_LOG10L)/g' \ + -e 's/@''GNULIB_LOG1P''@/$(GNULIB_LOG1P)/g' \ + -e 's/@''GNULIB_LOG1PF''@/$(GNULIB_LOG1PF)/g' \ + -e 's/@''GNULIB_LOG1PL''@/$(GNULIB_LOG1PL)/g' \ + -e 's/@''GNULIB_LOG2''@/$(GNULIB_LOG2)/g' \ + -e 's/@''GNULIB_LOG2F''@/$(GNULIB_LOG2F)/g' \ + -e 's/@''GNULIB_LOG2L''@/$(GNULIB_LOG2L)/g' \ + -e 's/@''GNULIB_LOGB''@/$(GNULIB_LOGB)/g' \ + -e 's/@''GNULIB_LOGBF''@/$(GNULIB_LOGBF)/g' \ + -e 's/@''GNULIB_LOGBL''@/$(GNULIB_LOGBL)/g' \ + -e 's/@''GNULIB_MODF''@/$(GNULIB_MODF)/g' \ + -e 's/@''GNULIB_MODFF''@/$(GNULIB_MODFF)/g' \ + -e 's/@''GNULIB_MODFL''@/$(GNULIB_MODFL)/g' \ + -e 's/@''GNULIB_POWF''@/$(GNULIB_POWF)/g' \ + -e 's/@''GNULIB_REMAINDER''@/$(GNULIB_REMAINDER)/g' \ + -e 's/@''GNULIB_REMAINDERF''@/$(GNULIB_REMAINDERF)/g' \ + -e 's/@''GNULIB_REMAINDERL''@/$(GNULIB_REMAINDERL)/g' \ + -e 's/@''GNULIB_RINT''@/$(GNULIB_RINT)/g' \ + -e 's/@''GNULIB_RINTF''@/$(GNULIB_RINTF)/g' \ + -e 's/@''GNULIB_RINTL''@/$(GNULIB_RINTL)/g' \ + -e 's/@''GNULIB_ROUND''@/$(GNULIB_ROUND)/g' \ + -e 's/@''GNULIB_ROUNDF''@/$(GNULIB_ROUNDF)/g' \ + -e 's/@''GNULIB_ROUNDL''@/$(GNULIB_ROUNDL)/g' \ + -e 's/@''GNULIB_SIGNBIT''@/$(GNULIB_SIGNBIT)/g' \ + -e 's/@''GNULIB_SINF''@/$(GNULIB_SINF)/g' \ + -e 's/@''GNULIB_SINL''@/$(GNULIB_SINL)/g' \ + -e 's/@''GNULIB_SINHF''@/$(GNULIB_SINHF)/g' \ + -e 's/@''GNULIB_SQRTF''@/$(GNULIB_SQRTF)/g' \ + -e 's/@''GNULIB_SQRTL''@/$(GNULIB_SQRTL)/g' \ + -e 's/@''GNULIB_TANF''@/$(GNULIB_TANF)/g' \ + -e 's/@''GNULIB_TANL''@/$(GNULIB_TANL)/g' \ + -e 's/@''GNULIB_TANHF''@/$(GNULIB_TANHF)/g' \ + -e 's/@''GNULIB_TRUNC''@/$(GNULIB_TRUNC)/g' \ + -e 's/@''GNULIB_TRUNCF''@/$(GNULIB_TRUNCF)/g' \ + -e 's/@''GNULIB_TRUNCL''@/$(GNULIB_TRUNCL)/g' \ + | \ + sed -e 's|@''HAVE_ACOSF''@|$(HAVE_ACOSF)|g' \ + -e 's|@''HAVE_ACOSL''@|$(HAVE_ACOSL)|g' \ + -e 's|@''HAVE_ASINF''@|$(HAVE_ASINF)|g' \ + -e 's|@''HAVE_ASINL''@|$(HAVE_ASINL)|g' \ + -e 's|@''HAVE_ATANF''@|$(HAVE_ATANF)|g' \ + -e 's|@''HAVE_ATANL''@|$(HAVE_ATANL)|g' \ + -e 's|@''HAVE_ATAN2F''@|$(HAVE_ATAN2F)|g' \ + -e 's|@''HAVE_CBRT''@|$(HAVE_CBRT)|g' \ + -e 's|@''HAVE_CBRTF''@|$(HAVE_CBRTF)|g' \ + -e 's|@''HAVE_CBRTL''@|$(HAVE_CBRTL)|g' \ + -e 's|@''HAVE_COPYSIGN''@|$(HAVE_COPYSIGN)|g' \ + -e 's|@''HAVE_COPYSIGNL''@|$(HAVE_COPYSIGNL)|g' \ + -e 's|@''HAVE_COSF''@|$(HAVE_COSF)|g' \ + -e 's|@''HAVE_COSL''@|$(HAVE_COSL)|g' \ + -e 's|@''HAVE_COSHF''@|$(HAVE_COSHF)|g' \ + -e 's|@''HAVE_EXPF''@|$(HAVE_EXPF)|g' \ + -e 's|@''HAVE_EXPL''@|$(HAVE_EXPL)|g' \ + -e 's|@''HAVE_EXPM1''@|$(HAVE_EXPM1)|g' \ + -e 's|@''HAVE_EXPM1F''@|$(HAVE_EXPM1F)|g' \ + -e 's|@''HAVE_FABSF''@|$(HAVE_FABSF)|g' \ + -e 's|@''HAVE_FABSL''@|$(HAVE_FABSL)|g' \ + -e 's|@''HAVE_FMA''@|$(HAVE_FMA)|g' \ + -e 's|@''HAVE_FMAF''@|$(HAVE_FMAF)|g' \ + -e 's|@''HAVE_FMAL''@|$(HAVE_FMAL)|g' \ + -e 's|@''HAVE_FMODF''@|$(HAVE_FMODF)|g' \ + -e 's|@''HAVE_FMODL''@|$(HAVE_FMODL)|g' \ + -e 's|@''HAVE_FREXPF''@|$(HAVE_FREXPF)|g' \ + -e 's|@''HAVE_HYPOTF''@|$(HAVE_HYPOTF)|g' \ + -e 's|@''HAVE_HYPOTL''@|$(HAVE_HYPOTL)|g' \ + -e 's|@''HAVE_ILOGB''@|$(HAVE_ILOGB)|g' \ + -e 's|@''HAVE_ILOGBF''@|$(HAVE_ILOGBF)|g' \ + -e 's|@''HAVE_ILOGBL''@|$(HAVE_ILOGBL)|g' \ + -e 's|@''HAVE_ISNANF''@|$(HAVE_ISNANF)|g' \ + -e 's|@''HAVE_ISNAND''@|$(HAVE_ISNAND)|g' \ + -e 's|@''HAVE_ISNANL''@|$(HAVE_ISNANL)|g' \ + -e 's|@''HAVE_LDEXPF''@|$(HAVE_LDEXPF)|g' \ + -e 's|@''HAVE_LOGF''@|$(HAVE_LOGF)|g' \ + -e 's|@''HAVE_LOGL''@|$(HAVE_LOGL)|g' \ + -e 's|@''HAVE_LOG10F''@|$(HAVE_LOG10F)|g' \ + -e 's|@''HAVE_LOG10L''@|$(HAVE_LOG10L)|g' \ + -e 's|@''HAVE_LOG1P''@|$(HAVE_LOG1P)|g' \ + -e 's|@''HAVE_LOG1PF''@|$(HAVE_LOG1PF)|g' \ + -e 's|@''HAVE_LOG1PL''@|$(HAVE_LOG1PL)|g' \ + -e 's|@''HAVE_LOGBF''@|$(HAVE_LOGBF)|g' \ + -e 's|@''HAVE_LOGBL''@|$(HAVE_LOGBL)|g' \ + -e 's|@''HAVE_MODFF''@|$(HAVE_MODFF)|g' \ + -e 's|@''HAVE_MODFL''@|$(HAVE_MODFL)|g' \ + -e 's|@''HAVE_POWF''@|$(HAVE_POWF)|g' \ + -e 's|@''HAVE_REMAINDER''@|$(HAVE_REMAINDER)|g' \ + -e 's|@''HAVE_REMAINDERF''@|$(HAVE_REMAINDERF)|g' \ + -e 's|@''HAVE_RINT''@|$(HAVE_RINT)|g' \ + -e 's|@''HAVE_RINTL''@|$(HAVE_RINTL)|g' \ + -e 's|@''HAVE_SINF''@|$(HAVE_SINF)|g' \ + -e 's|@''HAVE_SINL''@|$(HAVE_SINL)|g' \ + -e 's|@''HAVE_SINHF''@|$(HAVE_SINHF)|g' \ + -e 's|@''HAVE_SQRTF''@|$(HAVE_SQRTF)|g' \ + -e 's|@''HAVE_SQRTL''@|$(HAVE_SQRTL)|g' \ + -e 's|@''HAVE_TANF''@|$(HAVE_TANF)|g' \ + -e 's|@''HAVE_TANL''@|$(HAVE_TANL)|g' \ + -e 's|@''HAVE_TANHF''@|$(HAVE_TANHF)|g' \ + -e 's|@''HAVE_DECL_ACOSL''@|$(HAVE_DECL_ACOSL)|g' \ + -e 's|@''HAVE_DECL_ASINL''@|$(HAVE_DECL_ASINL)|g' \ + -e 's|@''HAVE_DECL_ATANL''@|$(HAVE_DECL_ATANL)|g' \ + -e 's|@''HAVE_DECL_CBRTF''@|$(HAVE_DECL_CBRTF)|g' \ + -e 's|@''HAVE_DECL_CBRTL''@|$(HAVE_DECL_CBRTL)|g' \ + -e 's|@''HAVE_DECL_CEILF''@|$(HAVE_DECL_CEILF)|g' \ + -e 's|@''HAVE_DECL_CEILL''@|$(HAVE_DECL_CEILL)|g' \ + -e 's|@''HAVE_DECL_COPYSIGNF''@|$(HAVE_DECL_COPYSIGNF)|g' \ + -e 's|@''HAVE_DECL_COSL''@|$(HAVE_DECL_COSL)|g' \ + -e 's|@''HAVE_DECL_EXPL''@|$(HAVE_DECL_EXPL)|g' \ + -e 's|@''HAVE_DECL_EXP2''@|$(HAVE_DECL_EXP2)|g' \ + -e 's|@''HAVE_DECL_EXP2F''@|$(HAVE_DECL_EXP2F)|g' \ + -e 's|@''HAVE_DECL_EXP2L''@|$(HAVE_DECL_EXP2L)|g' \ + -e 's|@''HAVE_DECL_EXPM1L''@|$(HAVE_DECL_EXPM1L)|g' \ + -e 's|@''HAVE_DECL_FLOORF''@|$(HAVE_DECL_FLOORF)|g' \ + -e 's|@''HAVE_DECL_FLOORL''@|$(HAVE_DECL_FLOORL)|g' \ + -e 's|@''HAVE_DECL_FREXPL''@|$(HAVE_DECL_FREXPL)|g' \ + -e 's|@''HAVE_DECL_LDEXPL''@|$(HAVE_DECL_LDEXPL)|g' \ + -e 's|@''HAVE_DECL_LOGL''@|$(HAVE_DECL_LOGL)|g' \ + -e 's|@''HAVE_DECL_LOG10L''@|$(HAVE_DECL_LOG10L)|g' \ + -e 's|@''HAVE_DECL_LOG2''@|$(HAVE_DECL_LOG2)|g' \ + -e 's|@''HAVE_DECL_LOG2F''@|$(HAVE_DECL_LOG2F)|g' \ + -e 's|@''HAVE_DECL_LOG2L''@|$(HAVE_DECL_LOG2L)|g' \ + -e 's|@''HAVE_DECL_LOGB''@|$(HAVE_DECL_LOGB)|g' \ + -e 's|@''HAVE_DECL_REMAINDER''@|$(HAVE_DECL_REMAINDER)|g' \ + -e 's|@''HAVE_DECL_REMAINDERL''@|$(HAVE_DECL_REMAINDERL)|g' \ + -e 's|@''HAVE_DECL_RINTF''@|$(HAVE_DECL_RINTF)|g' \ + -e 's|@''HAVE_DECL_ROUND''@|$(HAVE_DECL_ROUND)|g' \ + -e 's|@''HAVE_DECL_ROUNDF''@|$(HAVE_DECL_ROUNDF)|g' \ + -e 's|@''HAVE_DECL_ROUNDL''@|$(HAVE_DECL_ROUNDL)|g' \ + -e 's|@''HAVE_DECL_SINL''@|$(HAVE_DECL_SINL)|g' \ + -e 's|@''HAVE_DECL_SQRTL''@|$(HAVE_DECL_SQRTL)|g' \ + -e 's|@''HAVE_DECL_TANL''@|$(HAVE_DECL_TANL)|g' \ + -e 's|@''HAVE_DECL_TRUNC''@|$(HAVE_DECL_TRUNC)|g' \ + -e 's|@''HAVE_DECL_TRUNCF''@|$(HAVE_DECL_TRUNCF)|g' \ + -e 's|@''HAVE_DECL_TRUNCL''@|$(HAVE_DECL_TRUNCL)|g' \ + | \ + sed -e 's|@''REPLACE_CBRTF''@|$(REPLACE_CBRTF)|g' \ + -e 's|@''REPLACE_CBRTL''@|$(REPLACE_CBRTL)|g' \ + -e 's|@''REPLACE_CEIL''@|$(REPLACE_CEIL)|g' \ + -e 's|@''REPLACE_CEILF''@|$(REPLACE_CEILF)|g' \ + -e 's|@''REPLACE_CEILL''@|$(REPLACE_CEILL)|g' \ + -e 's|@''REPLACE_EXPM1''@|$(REPLACE_EXPM1)|g' \ + -e 's|@''REPLACE_EXPM1F''@|$(REPLACE_EXPM1F)|g' \ + -e 's|@''REPLACE_EXP2''@|$(REPLACE_EXP2)|g' \ + -e 's|@''REPLACE_EXP2L''@|$(REPLACE_EXP2L)|g' \ + -e 's|@''REPLACE_FABSL''@|$(REPLACE_FABSL)|g' \ + -e 's|@''REPLACE_FLOOR''@|$(REPLACE_FLOOR)|g' \ + -e 's|@''REPLACE_FLOORF''@|$(REPLACE_FLOORF)|g' \ + -e 's|@''REPLACE_FLOORL''@|$(REPLACE_FLOORL)|g' \ + -e 's|@''REPLACE_FMA''@|$(REPLACE_FMA)|g' \ + -e 's|@''REPLACE_FMAF''@|$(REPLACE_FMAF)|g' \ + -e 's|@''REPLACE_FMAL''@|$(REPLACE_FMAL)|g' \ + -e 's|@''REPLACE_FMOD''@|$(REPLACE_FMOD)|g' \ + -e 's|@''REPLACE_FMODF''@|$(REPLACE_FMODF)|g' \ + -e 's|@''REPLACE_FMODL''@|$(REPLACE_FMODL)|g' \ + -e 's|@''REPLACE_FREXPF''@|$(REPLACE_FREXPF)|g' \ + -e 's|@''REPLACE_FREXP''@|$(REPLACE_FREXP)|g' \ + -e 's|@''REPLACE_FREXPL''@|$(REPLACE_FREXPL)|g' \ + -e 's|@''REPLACE_HUGE_VAL''@|$(REPLACE_HUGE_VAL)|g' \ + -e 's|@''REPLACE_HYPOT''@|$(REPLACE_HYPOT)|g' \ + -e 's|@''REPLACE_HYPOTF''@|$(REPLACE_HYPOTF)|g' \ + -e 's|@''REPLACE_HYPOTL''@|$(REPLACE_HYPOTL)|g' \ + -e 's|@''REPLACE_ILOGB''@|$(REPLACE_ILOGB)|g' \ + -e 's|@''REPLACE_ILOGBF''@|$(REPLACE_ILOGBF)|g' \ + -e 's|@''REPLACE_ISFINITE''@|$(REPLACE_ISFINITE)|g' \ + -e 's|@''REPLACE_ISINF''@|$(REPLACE_ISINF)|g' \ + -e 's|@''REPLACE_ISNAN''@|$(REPLACE_ISNAN)|g' \ + -e 's|@''REPLACE_ITOLD''@|$(REPLACE_ITOLD)|g' \ + -e 's|@''REPLACE_LDEXPL''@|$(REPLACE_LDEXPL)|g' \ + -e 's|@''REPLACE_LOG''@|$(REPLACE_LOG)|g' \ + -e 's|@''REPLACE_LOGF''@|$(REPLACE_LOGF)|g' \ + -e 's|@''REPLACE_LOGL''@|$(REPLACE_LOGL)|g' \ + -e 's|@''REPLACE_LOG10''@|$(REPLACE_LOG10)|g' \ + -e 's|@''REPLACE_LOG10F''@|$(REPLACE_LOG10F)|g' \ + -e 's|@''REPLACE_LOG10L''@|$(REPLACE_LOG10L)|g' \ + -e 's|@''REPLACE_LOG1P''@|$(REPLACE_LOG1P)|g' \ + -e 's|@''REPLACE_LOG1PF''@|$(REPLACE_LOG1PF)|g' \ + -e 's|@''REPLACE_LOG1PL''@|$(REPLACE_LOG1PL)|g' \ + -e 's|@''REPLACE_LOG2''@|$(REPLACE_LOG2)|g' \ + -e 's|@''REPLACE_LOG2F''@|$(REPLACE_LOG2F)|g' \ + -e 's|@''REPLACE_LOG2L''@|$(REPLACE_LOG2L)|g' \ + -e 's|@''REPLACE_LOGB''@|$(REPLACE_LOGB)|g' \ + -e 's|@''REPLACE_LOGBF''@|$(REPLACE_LOGBF)|g' \ + -e 's|@''REPLACE_LOGBL''@|$(REPLACE_LOGBL)|g' \ + -e 's|@''REPLACE_MODF''@|$(REPLACE_MODF)|g' \ + -e 's|@''REPLACE_MODFF''@|$(REPLACE_MODFF)|g' \ + -e 's|@''REPLACE_MODFL''@|$(REPLACE_MODFL)|g' \ + -e 's|@''REPLACE_NAN''@|$(REPLACE_NAN)|g' \ + -e 's|@''REPLACE_REMAINDER''@|$(REPLACE_REMAINDER)|g' \ + -e 's|@''REPLACE_REMAINDERF''@|$(REPLACE_REMAINDERF)|g' \ + -e 's|@''REPLACE_REMAINDERL''@|$(REPLACE_REMAINDERL)|g' \ + -e 's|@''REPLACE_ROUND''@|$(REPLACE_ROUND)|g' \ + -e 's|@''REPLACE_ROUNDF''@|$(REPLACE_ROUNDF)|g' \ + -e 's|@''REPLACE_ROUNDL''@|$(REPLACE_ROUNDL)|g' \ + -e 's|@''REPLACE_SIGNBIT''@|$(REPLACE_SIGNBIT)|g' \ + -e 's|@''REPLACE_SIGNBIT_USING_GCC''@|$(REPLACE_SIGNBIT_USING_GCC)|g' \ + -e 's|@''REPLACE_SQRTL''@|$(REPLACE_SQRTL)|g' \ + -e 's|@''REPLACE_TRUNC''@|$(REPLACE_TRUNC)|g' \ + -e 's|@''REPLACE_TRUNCF''@|$(REPLACE_TRUNCF)|g' \ + -e 's|@''REPLACE_TRUNCL''@|$(REPLACE_TRUNCL)|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)'; \ + } > $@-t && \ + mv $@-t $@ + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +lib/netdb.h: lib/netdb.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|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_NETDB_H''@|$(NEXT_NETDB_H)|g' \ + -e 's|@''HAVE_NETDB_H''@|$(HAVE_NETDB_H)|g' \ + -e 's/@''GNULIB_GETADDRINFO''@/$(GNULIB_GETADDRINFO)/g' \ + -e 's|@''HAVE_STRUCT_ADDRINFO''@|$(HAVE_STRUCT_ADDRINFO)|g' \ + -e 's|@''HAVE_DECL_FREEADDRINFO''@|$(HAVE_DECL_FREEADDRINFO)|g' \ + -e 's|@''HAVE_DECL_GAI_STRERROR''@|$(HAVE_DECL_GAI_STRERROR)|g' \ + -e 's|@''HAVE_DECL_GETADDRINFO''@|$(HAVE_DECL_GETADDRINFO)|g' \ + -e 's|@''HAVE_DECL_GETNAMEINFO''@|$(HAVE_DECL_GETNAMEINFO)|g' \ + -e 's|@''REPLACE_GAI_STRERROR''@|$(REPLACE_GAI_STRERROR)|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/netdb.in.h; \ + } > $@-t && \ + mv $@-t $@ + +# We need the following in order to create when the system +# doesn't have one. +@GL_GENERATE_NETINET_IN_H_TRUE@lib/netinet/in.h: lib/netinet_in.in.h $(top_builddir)/config.status +@GL_GENERATE_NETINET_IN_H_TRUE@ $(AM_V_at)$(MKDIR_P) lib/netinet +@GL_GENERATE_NETINET_IN_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@GL_GENERATE_NETINET_IN_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@GL_GENERATE_NETINET_IN_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@GL_GENERATE_NETINET_IN_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@GL_GENERATE_NETINET_IN_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@GL_GENERATE_NETINET_IN_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@GL_GENERATE_NETINET_IN_H_TRUE@ -e 's|@''NEXT_NETINET_IN_H''@|$(NEXT_NETINET_IN_H)|g' \ +@GL_GENERATE_NETINET_IN_H_TRUE@ -e 's|@''HAVE_NETINET_IN_H''@|$(HAVE_NETINET_IN_H)|g' \ +@GL_GENERATE_NETINET_IN_H_TRUE@ < $(top_srcdir)/lib/netinet_in.in.h; \ +@GL_GENERATE_NETINET_IN_H_TRUE@ } > $@-t && \ +@GL_GENERATE_NETINET_IN_H_TRUE@ mv $@-t $@ +@GL_GENERATE_NETINET_IN_H_FALSE@lib/netinet/in.h: $(top_builddir)/config.status +@GL_GENERATE_NETINET_IN_H_FALSE@ rm -f $@ + +# This rule overrides the Automake generated .y.c rule, to ensure that the +# parse-datetime.c file gets generated in the source directory, not in the +# build directory. +lib/parse-datetime.c: lib/parse-datetime.y + $(AM_V_GEN)$(SHELL) $(YLWRAP) $(top_srcdir)/lib/parse-datetime.y \ + y.tab.c parse-datetime.c \ + y.tab.h parse-datetime.h \ + y.output parse-datetime.output \ + -- $(YACC) $(YFLAGS) $(AM_YFLAGS) && \ + mv parse-datetime.c parse-datetime.c-t && \ + mv parse-datetime.c-t $(top_srcdir)/lib/parse-datetime.c + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +@GL_GENERATE_PTHREAD_H_TRUE@lib/pthread.h: lib/pthread.in.h $(top_builddir)/config.status +@GL_GENERATE_PTHREAD_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@GL_GENERATE_PTHREAD_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@GL_GENERATE_PTHREAD_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@GL_GENERATE_PTHREAD_H_TRUE@ -e 's|@''HAVE_PTHREAD_H''@|$(HAVE_PTHREAD_H)|g' \ +@GL_GENERATE_PTHREAD_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@GL_GENERATE_PTHREAD_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@GL_GENERATE_PTHREAD_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@GL_GENERATE_PTHREAD_H_TRUE@ -e 's|@''NEXT_PTHREAD_H''@|$(NEXT_PTHREAD_H)|g' \ +@GL_GENERATE_PTHREAD_H_TRUE@ -e 's|@''HAVE_PTHREAD_T''@|$(HAVE_PTHREAD_T)|g' \ +@GL_GENERATE_PTHREAD_H_TRUE@ -e 's|@''HAVE_PTHREAD_SPINLOCK_T''@|$(HAVE_PTHREAD_SPINLOCK_T)|g' \ +@GL_GENERATE_PTHREAD_H_TRUE@ < $(top_srcdir)/lib/pthread.in.h; \ +@GL_GENERATE_PTHREAD_H_TRUE@ } > $@-t && \ +@GL_GENERATE_PTHREAD_H_TRUE@ mv $@-t $@ +@GL_GENERATE_PTHREAD_H_FALSE@lib/pthread.h: $(top_builddir)/config.status +@GL_GENERATE_PTHREAD_H_FALSE@ rm -f $@ + +# We need the following in order to create a replacement for when +# the system doesn't have one. +@GL_GENERATE_SCHED_H_TRUE@lib/sched.h: lib/sched.in.h $(top_builddir)/config.status +@GL_GENERATE_SCHED_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@GL_GENERATE_SCHED_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@GL_GENERATE_SCHED_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@GL_GENERATE_SCHED_H_TRUE@ -e 's|@''HAVE_SCHED_H''@|$(HAVE_SCHED_H)|g' \ +@GL_GENERATE_SCHED_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@GL_GENERATE_SCHED_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@GL_GENERATE_SCHED_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@GL_GENERATE_SCHED_H_TRUE@ -e 's|@''NEXT_SCHED_H''@|$(NEXT_SCHED_H)|g' \ +@GL_GENERATE_SCHED_H_TRUE@ -e 's|@''HAVE_STRUCT_SCHED_PARAM''@|$(HAVE_STRUCT_SCHED_PARAM)|g' \ +@GL_GENERATE_SCHED_H_TRUE@ < $(top_srcdir)/lib/sched.in.h; \ +@GL_GENERATE_SCHED_H_TRUE@ } > $@-t && \ +@GL_GENERATE_SCHED_H_TRUE@ mv $@-t $@ +@GL_GENERATE_SCHED_H_FALSE@lib/sched.h: $(top_builddir)/config.status +@GL_GENERATE_SCHED_H_FALSE@ rm -f $@ +lib/selinux/selinux.h: lib/se-selinux.in.h $(top_builddir)/config.status $(UNUSED_PARAMETER_H) + $(AM_V_at)$(MKDIR_P) lib/selinux + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ + sed -e 's|@''GUARD_PREFIX''@|GL|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_SELINUX_SELINUX_H''@|$(NEXT_SELINUX_SELINUX_H)|g' \ + -e '/definition of _GL_UNUSED_PARAMETER/r $(UNUSED_PARAMETER_H)' \ + < $(top_srcdir)/lib/se-selinux.in.h; \ + } > $@-t && \ + chmod a-x $@-t && \ + mv $@-t $@ +@GL_GENERATE_SELINUX_CONTEXT_H_TRUE@lib/selinux/context.h: lib/se-context.in.h $(top_builddir)/config.status $(UNUSED_PARAMETER_H) +@GL_GENERATE_SELINUX_CONTEXT_H_TRUE@ $(AM_V_at)$(MKDIR_P) lib/selinux +@GL_GENERATE_SELINUX_CONTEXT_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@GL_GENERATE_SELINUX_CONTEXT_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ +@GL_GENERATE_SELINUX_CONTEXT_H_TRUE@ sed -e '/definition of _GL_UNUSED_PARAMETER/r $(UNUSED_PARAMETER_H)' \ +@GL_GENERATE_SELINUX_CONTEXT_H_TRUE@ < $(top_srcdir)/lib/se-context.in.h; \ +@GL_GENERATE_SELINUX_CONTEXT_H_TRUE@ } > $@-t && \ +@GL_GENERATE_SELINUX_CONTEXT_H_TRUE@ chmod a-x $@-t && \ +@GL_GENERATE_SELINUX_CONTEXT_H_TRUE@ mv $@-t $@ +@GL_GENERATE_SELINUX_CONTEXT_H_FALSE@lib/selinux/context.h: $(top_builddir)/config.status +@GL_GENERATE_SELINUX_CONTEXT_H_FALSE@ rm -f $@ + +# We need the following in order to create when the system +# doesn't have a complete one. +lib/signal.h: lib/signal.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|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_SIGNAL_H''@|$(NEXT_SIGNAL_H)|g' \ + -e 's|@''GNULIB_PTHREAD_SIGMASK''@|$(GNULIB_PTHREAD_SIGMASK)|g' \ + -e 's|@''GNULIB_RAISE''@|$(GNULIB_RAISE)|g' \ + -e 's/@''GNULIB_SIGNAL_H_SIGPIPE''@/$(GNULIB_SIGNAL_H_SIGPIPE)/g' \ + -e 's/@''GNULIB_SIGPROCMASK''@/$(GNULIB_SIGPROCMASK)/g' \ + -e 's/@''GNULIB_SIGACTION''@/$(GNULIB_SIGACTION)/g' \ + -e 's|@''HAVE_POSIX_SIGNALBLOCKING''@|$(HAVE_POSIX_SIGNALBLOCKING)|g' \ + -e 's|@''HAVE_PTHREAD_SIGMASK''@|$(HAVE_PTHREAD_SIGMASK)|g' \ + -e 's|@''HAVE_RAISE''@|$(HAVE_RAISE)|g' \ + -e 's|@''HAVE_SIGSET_T''@|$(HAVE_SIGSET_T)|g' \ + -e 's|@''HAVE_SIGINFO_T''@|$(HAVE_SIGINFO_T)|g' \ + -e 's|@''HAVE_SIGACTION''@|$(HAVE_SIGACTION)|g' \ + -e 's|@''HAVE_STRUCT_SIGACTION_SA_SIGACTION''@|$(HAVE_STRUCT_SIGACTION_SA_SIGACTION)|g' \ + -e 's|@''HAVE_TYPE_VOLATILE_SIG_ATOMIC_T''@|$(HAVE_TYPE_VOLATILE_SIG_ATOMIC_T)|g' \ + -e 's|@''HAVE_SIGHANDLER_T''@|$(HAVE_SIGHANDLER_T)|g' \ + -e 's|@''REPLACE_PTHREAD_SIGMASK''@|$(REPLACE_PTHREAD_SIGMASK)|g' \ + -e 's|@''REPLACE_RAISE''@|$(REPLACE_RAISE)|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/signal.in.h; \ + } > $@-t && \ + 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. +lib/arg-nonnull.h: $(top_srcdir)/build-aux/snippet/arg-nonnull.h + $(AM_V_GEN)rm -f $@-t $@ && \ + sed -n -e '/GL_ARG_NONNULL/,$$p' \ + < $(top_srcdir)/build-aux/snippet/arg-nonnull.h \ + > $@-t && \ + mv $@-t $@ +# The c++defs.h that gets inserted into generated .h files is the same as +# build-aux/snippet/c++defs.h, except that it has the copyright header cut off. +lib/c++defs.h: $(top_srcdir)/build-aux/snippet/c++defs.h + $(AM_V_GEN)rm -f $@-t $@ && \ + sed -n -e '/_GL_CXXDEFS/,$$p' \ + < $(top_srcdir)/build-aux/snippet/c++defs.h \ + > $@-t && \ + mv $@-t $@ +# The unused-parameter.h that gets inserted into generated .h files is the same +# as build-aux/snippet/unused-parameter.h, except that it has the copyright +# header cut off. +lib/unused-parameter.h: $(top_srcdir)/build-aux/snippet/unused-parameter.h + $(AM_V_GEN)rm -f $@-t $@ && \ + sed -n -e '/GL_UNUSED_PARAMETER/,$$p' \ + < $(top_srcdir)/build-aux/snippet/unused-parameter.h \ + > $@-t && \ + mv $@-t $@ +# The warn-on-use.h that gets inserted into generated .h files is the same as +# build-aux/snippet/warn-on-use.h, except that it has the copyright header cut +# off. +lib/warn-on-use.h: $(top_srcdir)/build-aux/snippet/warn-on-use.h + $(AM_V_GEN)rm -f $@-t $@ && \ + sed -n -e '/^.ifndef/,$$p' \ + < $(top_srcdir)/build-aux/snippet/warn-on-use.h \ + > $@-t && \ + mv $@-t $@ + +# We need the following in order to create a replacement for 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 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 +@GL_GENERATE_STDALIGN_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@GL_GENERATE_STDALIGN_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@GL_GENERATE_STDALIGN_H_TRUE@ cat $(top_srcdir)/lib/stdalign.in.h; \ +@GL_GENERATE_STDALIGN_H_TRUE@ } > $@-t && \ +@GL_GENERATE_STDALIGN_H_TRUE@ mv $@-t $@ +@GL_GENERATE_STDALIGN_H_FALSE@lib/stdalign.h: $(top_builddir)/config.status +@GL_GENERATE_STDALIGN_H_FALSE@ rm -f $@ + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +@GL_GENERATE_STDARG_H_TRUE@lib/stdarg.h: lib/stdarg.in.h $(top_builddir)/config.status +@GL_GENERATE_STDARG_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@GL_GENERATE_STDARG_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ +@GL_GENERATE_STDARG_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@GL_GENERATE_STDARG_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@GL_GENERATE_STDARG_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@GL_GENERATE_STDARG_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@GL_GENERATE_STDARG_H_TRUE@ -e 's|@''NEXT_STDARG_H''@|$(NEXT_STDARG_H)|g' \ +@GL_GENERATE_STDARG_H_TRUE@ < $(top_srcdir)/lib/stdarg.in.h; \ +@GL_GENERATE_STDARG_H_TRUE@ } > $@-t && \ +@GL_GENERATE_STDARG_H_TRUE@ mv $@-t $@ +@GL_GENERATE_STDARG_H_FALSE@lib/stdarg.h: $(top_builddir)/config.status +@GL_GENERATE_STDARG_H_FALSE@ rm -f $@ + +# We need the following in order to create when the system +# doesn't have one that works. +@GL_GENERATE_STDBOOL_H_TRUE@lib/stdbool.h: lib/stdbool.in.h $(top_builddir)/config.status +@GL_GENERATE_STDBOOL_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@GL_GENERATE_STDBOOL_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@GL_GENERATE_STDBOOL_H_TRUE@ sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(top_srcdir)/lib/stdbool.in.h; \ +@GL_GENERATE_STDBOOL_H_TRUE@ } > $@-t && \ +@GL_GENERATE_STDBOOL_H_TRUE@ mv $@-t $@ +@GL_GENERATE_STDBOOL_H_FALSE@lib/stdbool.h: $(top_builddir)/config.status +@GL_GENERATE_STDBOOL_H_FALSE@ rm -f $@ + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +@GL_GENERATE_STDDEF_H_TRUE@lib/stddef.h: lib/stddef.in.h $(top_builddir)/config.status +@GL_GENERATE_STDDEF_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@GL_GENERATE_STDDEF_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ +@GL_GENERATE_STDDEF_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \ +@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \ +@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \ +@GL_GENERATE_STDDEF_H_TRUE@ < $(top_srcdir)/lib/stddef.in.h; \ +@GL_GENERATE_STDDEF_H_TRUE@ } > $@-t && \ +@GL_GENERATE_STDDEF_H_TRUE@ mv $@-t $@ +@GL_GENERATE_STDDEF_H_FALSE@lib/stddef.h: $(top_builddir)/config.status +@GL_GENERATE_STDDEF_H_FALSE@ rm -f $@ + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +@GL_GENERATE_STDINT_H_TRUE@lib/stdint.h: lib/stdint.in.h $(top_builddir)/config.status +@GL_GENERATE_STDINT_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@GL_GENERATE_STDINT_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@GL_GENERATE_STDINT_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \ +@GL_GENERATE_STDINT_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@GL_GENERATE_STDINT_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@GL_GENERATE_STDINT_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@GL_GENERATE_STDINT_H_TRUE@ -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \ +@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \ +@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \ +@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \ +@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SYS_BITYPES_H''@/$(HAVE_SYS_BITYPES_H)/g' \ +@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \ +@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \ +@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \ +@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \ +@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_PTRDIFF_T''@/$(BITSIZEOF_PTRDIFF_T)/g' \ +@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''PTRDIFF_T_SUFFIX''@/$(PTRDIFF_T_SUFFIX)/g' \ +@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_SIG_ATOMIC_T''@/$(BITSIZEOF_SIG_ATOMIC_T)/g' \ +@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SIGNED_SIG_ATOMIC_T''@/$(HAVE_SIGNED_SIG_ATOMIC_T)/g' \ +@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''SIG_ATOMIC_T_SUFFIX''@/$(SIG_ATOMIC_T_SUFFIX)/g' \ +@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_SIZE_T''@/$(BITSIZEOF_SIZE_T)/g' \ +@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''SIZE_T_SUFFIX''@/$(SIZE_T_SUFFIX)/g' \ +@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_WCHAR_T''@/$(BITSIZEOF_WCHAR_T)/g' \ +@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SIGNED_WCHAR_T''@/$(HAVE_SIGNED_WCHAR_T)/g' \ +@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''WCHAR_T_SUFFIX''@/$(WCHAR_T_SUFFIX)/g' \ +@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \ +@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \ +@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \ +@GL_GENERATE_STDINT_H_TRUE@ < $(top_srcdir)/lib/stdint.in.h; \ +@GL_GENERATE_STDINT_H_TRUE@ } > $@-t && \ +@GL_GENERATE_STDINT_H_TRUE@ mv $@-t $@ +@GL_GENERATE_STDINT_H_FALSE@lib/stdint.h: $(top_builddir)/config.status +@GL_GENERATE_STDINT_H_FALSE@ rm -f $@ + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +lib/stdio.h: lib/stdio.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|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_STDIO_H''@|$(NEXT_STDIO_H)|g' \ + -e 's/@''GNULIB_DPRINTF''@/$(GNULIB_DPRINTF)/g' \ + -e 's/@''GNULIB_FCLOSE''@/$(GNULIB_FCLOSE)/g' \ + -e 's/@''GNULIB_FDOPEN''@/$(GNULIB_FDOPEN)/g' \ + -e 's/@''GNULIB_FFLUSH''@/$(GNULIB_FFLUSH)/g' \ + -e 's/@''GNULIB_FGETC''@/$(GNULIB_FGETC)/g' \ + -e 's/@''GNULIB_FGETS''@/$(GNULIB_FGETS)/g' \ + -e 's/@''GNULIB_FOPEN''@/$(GNULIB_FOPEN)/g' \ + -e 's/@''GNULIB_FPRINTF''@/$(GNULIB_FPRINTF)/g' \ + -e 's/@''GNULIB_FPRINTF_POSIX''@/$(GNULIB_FPRINTF_POSIX)/g' \ + -e 's/@''GNULIB_FPURGE''@/$(GNULIB_FPURGE)/g' \ + -e 's/@''GNULIB_FPUTC''@/$(GNULIB_FPUTC)/g' \ + -e 's/@''GNULIB_FPUTS''@/$(GNULIB_FPUTS)/g' \ + -e 's/@''GNULIB_FREAD''@/$(GNULIB_FREAD)/g' \ + -e 's/@''GNULIB_FREOPEN''@/$(GNULIB_FREOPEN)/g' \ + -e 's/@''GNULIB_FSCANF''@/$(GNULIB_FSCANF)/g' \ + -e 's/@''GNULIB_FSEEK''@/$(GNULIB_FSEEK)/g' \ + -e 's/@''GNULIB_FSEEKO''@/$(GNULIB_FSEEKO)/g' \ + -e 's/@''GNULIB_FTELL''@/$(GNULIB_FTELL)/g' \ + -e 's/@''GNULIB_FTELLO''@/$(GNULIB_FTELLO)/g' \ + -e 's/@''GNULIB_FWRITE''@/$(GNULIB_FWRITE)/g' \ + -e 's/@''GNULIB_GETC''@/$(GNULIB_GETC)/g' \ + -e 's/@''GNULIB_GETCHAR''@/$(GNULIB_GETCHAR)/g' \ + -e 's/@''GNULIB_GETDELIM''@/$(GNULIB_GETDELIM)/g' \ + -e 's/@''GNULIB_GETLINE''@/$(GNULIB_GETLINE)/g' \ + -e 's/@''GNULIB_OBSTACK_PRINTF''@/$(GNULIB_OBSTACK_PRINTF)/g' \ + -e 's/@''GNULIB_OBSTACK_PRINTF_POSIX''@/$(GNULIB_OBSTACK_PRINTF_POSIX)/g' \ + -e 's/@''GNULIB_PCLOSE''@/$(GNULIB_PCLOSE)/g' \ + -e 's/@''GNULIB_PERROR''@/$(GNULIB_PERROR)/g' \ + -e 's/@''GNULIB_POPEN''@/$(GNULIB_POPEN)/g' \ + -e 's/@''GNULIB_PRINTF''@/$(GNULIB_PRINTF)/g' \ + -e 's/@''GNULIB_PRINTF_POSIX''@/$(GNULIB_PRINTF_POSIX)/g' \ + -e 's/@''GNULIB_PUTC''@/$(GNULIB_PUTC)/g' \ + -e 's/@''GNULIB_PUTCHAR''@/$(GNULIB_PUTCHAR)/g' \ + -e 's/@''GNULIB_PUTS''@/$(GNULIB_PUTS)/g' \ + -e 's/@''GNULIB_REMOVE''@/$(GNULIB_REMOVE)/g' \ + -e 's/@''GNULIB_RENAME''@/$(GNULIB_RENAME)/g' \ + -e 's/@''GNULIB_RENAMEAT''@/$(GNULIB_RENAMEAT)/g' \ + -e 's/@''GNULIB_SCANF''@/$(GNULIB_SCANF)/g' \ + -e 's/@''GNULIB_SNPRINTF''@/$(GNULIB_SNPRINTF)/g' \ + -e 's/@''GNULIB_SPRINTF_POSIX''@/$(GNULIB_SPRINTF_POSIX)/g' \ + -e 's/@''GNULIB_STDIO_H_NONBLOCKING''@/$(GNULIB_STDIO_H_NONBLOCKING)/g' \ + -e 's/@''GNULIB_STDIO_H_SIGPIPE''@/$(GNULIB_STDIO_H_SIGPIPE)/g' \ + -e 's/@''GNULIB_TMPFILE''@/$(GNULIB_TMPFILE)/g' \ + -e 's/@''GNULIB_VASPRINTF''@/$(GNULIB_VASPRINTF)/g' \ + -e 's/@''GNULIB_VDPRINTF''@/$(GNULIB_VDPRINTF)/g' \ + -e 's/@''GNULIB_VFPRINTF''@/$(GNULIB_VFPRINTF)/g' \ + -e 's/@''GNULIB_VFPRINTF_POSIX''@/$(GNULIB_VFPRINTF_POSIX)/g' \ + -e 's/@''GNULIB_VFSCANF''@/$(GNULIB_VFSCANF)/g' \ + -e 's/@''GNULIB_VSCANF''@/$(GNULIB_VSCANF)/g' \ + -e 's/@''GNULIB_VPRINTF''@/$(GNULIB_VPRINTF)/g' \ + -e 's/@''GNULIB_VPRINTF_POSIX''@/$(GNULIB_VPRINTF_POSIX)/g' \ + -e 's/@''GNULIB_VSNPRINTF''@/$(GNULIB_VSNPRINTF)/g' \ + -e 's/@''GNULIB_VSPRINTF_POSIX''@/$(GNULIB_VSPRINTF_POSIX)/g' \ + < $(top_srcdir)/lib/stdio.in.h | \ + sed -e 's|@''HAVE_DECL_FPURGE''@|$(HAVE_DECL_FPURGE)|g' \ + -e 's|@''HAVE_DECL_FSEEKO''@|$(HAVE_DECL_FSEEKO)|g' \ + -e 's|@''HAVE_DECL_FTELLO''@|$(HAVE_DECL_FTELLO)|g' \ + -e 's|@''HAVE_DECL_GETDELIM''@|$(HAVE_DECL_GETDELIM)|g' \ + -e 's|@''HAVE_DECL_GETLINE''@|$(HAVE_DECL_GETLINE)|g' \ + -e 's|@''HAVE_DECL_OBSTACK_PRINTF''@|$(HAVE_DECL_OBSTACK_PRINTF)|g' \ + -e 's|@''HAVE_DECL_SNPRINTF''@|$(HAVE_DECL_SNPRINTF)|g' \ + -e 's|@''HAVE_DECL_VSNPRINTF''@|$(HAVE_DECL_VSNPRINTF)|g' \ + -e 's|@''HAVE_DPRINTF''@|$(HAVE_DPRINTF)|g' \ + -e 's|@''HAVE_FSEEKO''@|$(HAVE_FSEEKO)|g' \ + -e 's|@''HAVE_FTELLO''@|$(HAVE_FTELLO)|g' \ + -e 's|@''HAVE_PCLOSE''@|$(HAVE_PCLOSE)|g' \ + -e 's|@''HAVE_POPEN''@|$(HAVE_POPEN)|g' \ + -e 's|@''HAVE_RENAMEAT''@|$(HAVE_RENAMEAT)|g' \ + -e 's|@''HAVE_VASPRINTF''@|$(HAVE_VASPRINTF)|g' \ + -e 's|@''HAVE_VDPRINTF''@|$(HAVE_VDPRINTF)|g' \ + -e 's|@''REPLACE_DPRINTF''@|$(REPLACE_DPRINTF)|g' \ + -e 's|@''REPLACE_FCLOSE''@|$(REPLACE_FCLOSE)|g' \ + -e 's|@''REPLACE_FDOPEN''@|$(REPLACE_FDOPEN)|g' \ + -e 's|@''REPLACE_FFLUSH''@|$(REPLACE_FFLUSH)|g' \ + -e 's|@''REPLACE_FOPEN''@|$(REPLACE_FOPEN)|g' \ + -e 's|@''REPLACE_FPRINTF''@|$(REPLACE_FPRINTF)|g' \ + -e 's|@''REPLACE_FPURGE''@|$(REPLACE_FPURGE)|g' \ + -e 's|@''REPLACE_FREOPEN''@|$(REPLACE_FREOPEN)|g' \ + -e 's|@''REPLACE_FSEEK''@|$(REPLACE_FSEEK)|g' \ + -e 's|@''REPLACE_FSEEKO''@|$(REPLACE_FSEEKO)|g' \ + -e 's|@''REPLACE_FTELL''@|$(REPLACE_FTELL)|g' \ + -e 's|@''REPLACE_FTELLO''@|$(REPLACE_FTELLO)|g' \ + -e 's|@''REPLACE_GETDELIM''@|$(REPLACE_GETDELIM)|g' \ + -e 's|@''REPLACE_GETLINE''@|$(REPLACE_GETLINE)|g' \ + -e 's|@''REPLACE_OBSTACK_PRINTF''@|$(REPLACE_OBSTACK_PRINTF)|g' \ + -e 's|@''REPLACE_PERROR''@|$(REPLACE_PERROR)|g' \ + -e 's|@''REPLACE_POPEN''@|$(REPLACE_POPEN)|g' \ + -e 's|@''REPLACE_PRINTF''@|$(REPLACE_PRINTF)|g' \ + -e 's|@''REPLACE_REMOVE''@|$(REPLACE_REMOVE)|g' \ + -e 's|@''REPLACE_RENAME''@|$(REPLACE_RENAME)|g' \ + -e 's|@''REPLACE_RENAMEAT''@|$(REPLACE_RENAMEAT)|g' \ + -e 's|@''REPLACE_SNPRINTF''@|$(REPLACE_SNPRINTF)|g' \ + -e 's|@''REPLACE_SPRINTF''@|$(REPLACE_SPRINTF)|g' \ + -e 's|@''REPLACE_STDIO_READ_FUNCS''@|$(REPLACE_STDIO_READ_FUNCS)|g' \ + -e 's|@''REPLACE_STDIO_WRITE_FUNCS''@|$(REPLACE_STDIO_WRITE_FUNCS)|g' \ + -e 's|@''REPLACE_TMPFILE''@|$(REPLACE_TMPFILE)|g' \ + -e 's|@''REPLACE_VASPRINTF''@|$(REPLACE_VASPRINTF)|g' \ + -e 's|@''REPLACE_VDPRINTF''@|$(REPLACE_VDPRINTF)|g' \ + -e 's|@''REPLACE_VFPRINTF''@|$(REPLACE_VFPRINTF)|g' \ + -e 's|@''REPLACE_VPRINTF''@|$(REPLACE_VPRINTF)|g' \ + -e 's|@''REPLACE_VSNPRINTF''@|$(REPLACE_VSNPRINTF)|g' \ + -e 's|@''REPLACE_VSPRINTF''@|$(REPLACE_VSPRINTF)|g' \ + -e 's|@''ASM_SYMBOL_PREFIX''@|$(ASM_SYMBOL_PREFIX)|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)'; \ + } > $@-t && \ + mv $@-t $@ + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +lib/stdlib.h: lib/stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ + $(_NORETURN_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|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \ + -e 's/@''GNULIB__EXIT''@/$(GNULIB__EXIT)/g' \ + -e 's/@''GNULIB_ATOLL''@/$(GNULIB_ATOLL)/g' \ + -e 's/@''GNULIB_CALLOC_POSIX''@/$(GNULIB_CALLOC_POSIX)/g' \ + -e 's/@''GNULIB_CANONICALIZE_FILE_NAME''@/$(GNULIB_CANONICALIZE_FILE_NAME)/g' \ + -e 's/@''GNULIB_GETLOADAVG''@/$(GNULIB_GETLOADAVG)/g' \ + -e 's/@''GNULIB_GETSUBOPT''@/$(GNULIB_GETSUBOPT)/g' \ + -e 's/@''GNULIB_GRANTPT''@/$(GNULIB_GRANTPT)/g' \ + -e 's/@''GNULIB_MALLOC_POSIX''@/$(GNULIB_MALLOC_POSIX)/g' \ + -e 's/@''GNULIB_MBTOWC''@/$(GNULIB_MBTOWC)/g' \ + -e 's/@''GNULIB_MKDTEMP''@/$(GNULIB_MKDTEMP)/g' \ + -e 's/@''GNULIB_MKOSTEMP''@/$(GNULIB_MKOSTEMP)/g' \ + -e 's/@''GNULIB_MKOSTEMPS''@/$(GNULIB_MKOSTEMPS)/g' \ + -e 's/@''GNULIB_MKSTEMP''@/$(GNULIB_MKSTEMP)/g' \ + -e 's/@''GNULIB_MKSTEMPS''@/$(GNULIB_MKSTEMPS)/g' \ + -e 's/@''GNULIB_POSIX_OPENPT''@/$(GNULIB_POSIX_OPENPT)/g' \ + -e 's/@''GNULIB_PTSNAME''@/$(GNULIB_PTSNAME)/g' \ + -e 's/@''GNULIB_PTSNAME_R''@/$(GNULIB_PTSNAME_R)/g' \ + -e 's/@''GNULIB_PUTENV''@/$(GNULIB_PUTENV)/g' \ + -e 's/@''GNULIB_RANDOM''@/$(GNULIB_RANDOM)/g' \ + -e 's/@''GNULIB_RANDOM_R''@/$(GNULIB_RANDOM_R)/g' \ + -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_SETENV''@/$(GNULIB_SETENV)/g' \ + -e 's/@''GNULIB_STRTOD''@/$(GNULIB_STRTOD)/g' \ + -e 's/@''GNULIB_STRTOLL''@/$(GNULIB_STRTOLL)/g' \ + -e 's/@''GNULIB_STRTOULL''@/$(GNULIB_STRTOULL)/g' \ + -e 's/@''GNULIB_SYSTEM_POSIX''@/$(GNULIB_SYSTEM_POSIX)/g' \ + -e 's/@''GNULIB_UNLOCKPT''@/$(GNULIB_UNLOCKPT)/g' \ + -e 's/@''GNULIB_UNSETENV''@/$(GNULIB_UNSETENV)/g' \ + -e 's/@''GNULIB_WCTOMB''@/$(GNULIB_WCTOMB)/g' \ + < $(top_srcdir)/lib/stdlib.in.h | \ + sed -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \ + -e 's|@''HAVE_ATOLL''@|$(HAVE_ATOLL)|g' \ + -e 's|@''HAVE_CANONICALIZE_FILE_NAME''@|$(HAVE_CANONICALIZE_FILE_NAME)|g' \ + -e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \ + -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \ + -e 's|@''HAVE_GRANTPT''@|$(HAVE_GRANTPT)|g' \ + -e 's|@''HAVE_MKDTEMP''@|$(HAVE_MKDTEMP)|g' \ + -e 's|@''HAVE_MKOSTEMP''@|$(HAVE_MKOSTEMP)|g' \ + -e 's|@''HAVE_MKOSTEMPS''@|$(HAVE_MKOSTEMPS)|g' \ + -e 's|@''HAVE_MKSTEMP''@|$(HAVE_MKSTEMP)|g' \ + -e 's|@''HAVE_MKSTEMPS''@|$(HAVE_MKSTEMPS)|g' \ + -e 's|@''HAVE_POSIX_OPENPT''@|$(HAVE_POSIX_OPENPT)|g' \ + -e 's|@''HAVE_PTSNAME''@|$(HAVE_PTSNAME)|g' \ + -e 's|@''HAVE_PTSNAME_R''@|$(HAVE_PTSNAME_R)|g' \ + -e 's|@''HAVE_RANDOM''@|$(HAVE_RANDOM)|g' \ + -e 's|@''HAVE_RANDOM_H''@|$(HAVE_RANDOM_H)|g' \ + -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_DECL_SETENV''@|$(HAVE_DECL_SETENV)|g' \ + -e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \ + -e 's|@''HAVE_STRTOLL''@|$(HAVE_STRTOLL)|g' \ + -e 's|@''HAVE_STRTOULL''@|$(HAVE_STRTOULL)|g' \ + -e 's|@''HAVE_STRUCT_RANDOM_DATA''@|$(HAVE_STRUCT_RANDOM_DATA)|g' \ + -e 's|@''HAVE_SYS_LOADAVG_H''@|$(HAVE_SYS_LOADAVG_H)|g' \ + -e 's|@''HAVE_UNLOCKPT''@|$(HAVE_UNLOCKPT)|g' \ + -e 's|@''HAVE_DECL_UNSETENV''@|$(HAVE_DECL_UNSETENV)|g' \ + -e 's|@''REPLACE_CALLOC''@|$(REPLACE_CALLOC)|g' \ + -e 's|@''REPLACE_CANONICALIZE_FILE_NAME''@|$(REPLACE_CANONICALIZE_FILE_NAME)|g' \ + -e 's|@''REPLACE_MALLOC''@|$(REPLACE_MALLOC)|g' \ + -e 's|@''REPLACE_MBTOWC''@|$(REPLACE_MBTOWC)|g' \ + -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \ + -e 's|@''REPLACE_PTSNAME''@|$(REPLACE_PTSNAME)|g' \ + -e 's|@''REPLACE_PTSNAME_R''@|$(REPLACE_PTSNAME_R)|g' \ + -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \ + -e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \ + -e 's|@''REPLACE_REALLOC''@|$(REPLACE_REALLOC)|g' \ + -e 's|@''REPLACE_REALPATH''@|$(REPLACE_REALPATH)|g' \ + -e 's|@''REPLACE_SETENV''@|$(REPLACE_SETENV)|g' \ + -e 's|@''REPLACE_STRTOD''@|$(REPLACE_STRTOD)|g' \ + -e 's|@''REPLACE_UNSETENV''@|$(REPLACE_UNSETENV)|g' \ + -e 's|@''REPLACE_WCTOMB''@|$(REPLACE_WCTOMB)|g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ + -e '/definition of _Noreturn/r $(_NORETURN_H)' \ + -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ + } > $@-t && \ + mv $@-t $@ + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +lib/string.h: lib/string.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|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_STRING_H''@|$(NEXT_STRING_H)|g' \ + -e 's/@''GNULIB_FFSL''@/$(GNULIB_FFSL)/g' \ + -e 's/@''GNULIB_FFSLL''@/$(GNULIB_FFSLL)/g' \ + -e 's/@''GNULIB_MBSLEN''@/$(GNULIB_MBSLEN)/g' \ + -e 's/@''GNULIB_MBSNLEN''@/$(GNULIB_MBSNLEN)/g' \ + -e 's/@''GNULIB_MBSCHR''@/$(GNULIB_MBSCHR)/g' \ + -e 's/@''GNULIB_MBSRCHR''@/$(GNULIB_MBSRCHR)/g' \ + -e 's/@''GNULIB_MBSSTR''@/$(GNULIB_MBSSTR)/g' \ + -e 's/@''GNULIB_MBSCASECMP''@/$(GNULIB_MBSCASECMP)/g' \ + -e 's/@''GNULIB_MBSNCASECMP''@/$(GNULIB_MBSNCASECMP)/g' \ + -e 's/@''GNULIB_MBSPCASECMP''@/$(GNULIB_MBSPCASECMP)/g' \ + -e 's/@''GNULIB_MBSCASESTR''@/$(GNULIB_MBSCASESTR)/g' \ + -e 's/@''GNULIB_MBSCSPN''@/$(GNULIB_MBSCSPN)/g' \ + -e 's/@''GNULIB_MBSPBRK''@/$(GNULIB_MBSPBRK)/g' \ + -e 's/@''GNULIB_MBSSPN''@/$(GNULIB_MBSSPN)/g' \ + -e 's/@''GNULIB_MBSSEP''@/$(GNULIB_MBSSEP)/g' \ + -e 's/@''GNULIB_MBSTOK_R''@/$(GNULIB_MBSTOK_R)/g' \ + -e 's/@''GNULIB_MEMCHR''@/$(GNULIB_MEMCHR)/g' \ + -e 's/@''GNULIB_MEMMEM''@/$(GNULIB_MEMMEM)/g' \ + -e 's/@''GNULIB_MEMPCPY''@/$(GNULIB_MEMPCPY)/g' \ + -e 's/@''GNULIB_MEMRCHR''@/$(GNULIB_MEMRCHR)/g' \ + -e 's/@''GNULIB_RAWMEMCHR''@/$(GNULIB_RAWMEMCHR)/g' \ + -e 's/@''GNULIB_STPCPY''@/$(GNULIB_STPCPY)/g' \ + -e 's/@''GNULIB_STPNCPY''@/$(GNULIB_STPNCPY)/g' \ + -e 's/@''GNULIB_STRCHRNUL''@/$(GNULIB_STRCHRNUL)/g' \ + -e 's/@''GNULIB_STRDUP''@/$(GNULIB_STRDUP)/g' \ + -e 's/@''GNULIB_STRNCAT''@/$(GNULIB_STRNCAT)/g' \ + -e 's/@''GNULIB_STRNDUP''@/$(GNULIB_STRNDUP)/g' \ + -e 's/@''GNULIB_STRNLEN''@/$(GNULIB_STRNLEN)/g' \ + -e 's/@''GNULIB_STRPBRK''@/$(GNULIB_STRPBRK)/g' \ + -e 's/@''GNULIB_STRSEP''@/$(GNULIB_STRSEP)/g' \ + -e 's/@''GNULIB_STRSTR''@/$(GNULIB_STRSTR)/g' \ + -e 's/@''GNULIB_STRCASESTR''@/$(GNULIB_STRCASESTR)/g' \ + -e 's/@''GNULIB_STRTOK_R''@/$(GNULIB_STRTOK_R)/g' \ + -e 's/@''GNULIB_STRERROR''@/$(GNULIB_STRERROR)/g' \ + -e 's/@''GNULIB_STRERROR_R''@/$(GNULIB_STRERROR_R)/g' \ + -e 's/@''GNULIB_STRSIGNAL''@/$(GNULIB_STRSIGNAL)/g' \ + -e 's/@''GNULIB_STRVERSCMP''@/$(GNULIB_STRVERSCMP)/g' \ + < $(top_srcdir)/lib/string.in.h | \ + sed -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \ + -e 's|@''HAVE_FFSLL''@|$(HAVE_FFSLL)|g' \ + -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \ + -e 's|@''HAVE_MEMCHR''@|$(HAVE_MEMCHR)|g' \ + -e 's|@''HAVE_DECL_MEMMEM''@|$(HAVE_DECL_MEMMEM)|g' \ + -e 's|@''HAVE_MEMPCPY''@|$(HAVE_MEMPCPY)|g' \ + -e 's|@''HAVE_DECL_MEMRCHR''@|$(HAVE_DECL_MEMRCHR)|g' \ + -e 's|@''HAVE_RAWMEMCHR''@|$(HAVE_RAWMEMCHR)|g' \ + -e 's|@''HAVE_STPCPY''@|$(HAVE_STPCPY)|g' \ + -e 's|@''HAVE_STPNCPY''@|$(HAVE_STPNCPY)|g' \ + -e 's|@''HAVE_STRCHRNUL''@|$(HAVE_STRCHRNUL)|g' \ + -e 's|@''HAVE_DECL_STRDUP''@|$(HAVE_DECL_STRDUP)|g' \ + -e 's|@''HAVE_DECL_STRNDUP''@|$(HAVE_DECL_STRNDUP)|g' \ + -e 's|@''HAVE_DECL_STRNLEN''@|$(HAVE_DECL_STRNLEN)|g' \ + -e 's|@''HAVE_STRPBRK''@|$(HAVE_STRPBRK)|g' \ + -e 's|@''HAVE_STRSEP''@|$(HAVE_STRSEP)|g' \ + -e 's|@''HAVE_STRCASESTR''@|$(HAVE_STRCASESTR)|g' \ + -e 's|@''HAVE_DECL_STRTOK_R''@|$(HAVE_DECL_STRTOK_R)|g' \ + -e 's|@''HAVE_DECL_STRERROR_R''@|$(HAVE_DECL_STRERROR_R)|g' \ + -e 's|@''HAVE_DECL_STRSIGNAL''@|$(HAVE_DECL_STRSIGNAL)|g' \ + -e 's|@''HAVE_STRVERSCMP''@|$(HAVE_STRVERSCMP)|g' \ + -e 's|@''REPLACE_STPNCPY''@|$(REPLACE_STPNCPY)|g' \ + -e 's|@''REPLACE_MEMCHR''@|$(REPLACE_MEMCHR)|g' \ + -e 's|@''REPLACE_MEMMEM''@|$(REPLACE_MEMMEM)|g' \ + -e 's|@''REPLACE_STRCASESTR''@|$(REPLACE_STRCASESTR)|g' \ + -e 's|@''REPLACE_STRCHRNUL''@|$(REPLACE_STRCHRNUL)|g' \ + -e 's|@''REPLACE_STRDUP''@|$(REPLACE_STRDUP)|g' \ + -e 's|@''REPLACE_STRSTR''@|$(REPLACE_STRSTR)|g' \ + -e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \ + -e 's|@''REPLACE_STRERROR_R''@|$(REPLACE_STRERROR_R)|g' \ + -e 's|@''REPLACE_STRNCAT''@|$(REPLACE_STRNCAT)|g' \ + -e 's|@''REPLACE_STRNDUP''@|$(REPLACE_STRNDUP)|g' \ + -e 's|@''REPLACE_STRNLEN''@|$(REPLACE_STRNLEN)|g' \ + -e 's|@''REPLACE_STRSIGNAL''@|$(REPLACE_STRSIGNAL)|g' \ + -e 's|@''REPLACE_STRTOK_R''@|$(REPLACE_STRTOK_R)|g' \ + -e 's|@''UNDEFINE_STRTOK_R''@|$(UNDEFINE_STRTOK_R)|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/string.in.h; \ + } > $@-t && \ + mv $@-t $@ + +# We need the following in order to create when the system +# does not have a complete one. +lib/sys/ioctl.h: lib/sys_ioctl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) + $(AM_V_at)$(MKDIR_P) lib/sys + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's|@''GUARD_PREFIX''@|GL|g' \ + -e 's|@''HAVE_SYS_IOCTL_H''@|$(HAVE_SYS_IOCTL_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_SYS_IOCTL_H''@|$(NEXT_SYS_IOCTL_H)|g' \ + -e 's/@''GNULIB_IOCTL''@/$(GNULIB_IOCTL)/g' \ + -e 's|@''SYS_IOCTL_H_HAVE_WINSOCK2_H''@|$(SYS_IOCTL_H_HAVE_WINSOCK2_H)|g' \ + -e 's|@''SYS_IOCTL_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''@|$(SYS_IOCTL_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS)|g' \ + -e 's|@''REPLACE_IOCTL''@|$(REPLACE_IOCTL)|g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ + < $(top_srcdir)/lib/sys_ioctl.in.h; \ + } > $@-t && \ + mv $@-t $@ + +# We need the following in order to create when the system +# doesn't have one. +lib/sys/resource.h: lib/sys_resource.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) + $(AM_V_at)$(MKDIR_P) lib/sys + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's|@''GUARD_PREFIX''@|GL|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_SYS_RESOURCE_H''@|$(NEXT_SYS_RESOURCE_H)|g' \ + -e 's|@''HAVE_SYS_RESOURCE_H''@|$(HAVE_SYS_RESOURCE_H)|g' \ + -e 's/@''GNULIB_GETRUSAGE''@/$(GNULIB_GETRUSAGE)/g' \ + -e 's/@''HAVE_GETRUSAGE''@/$(HAVE_GETRUSAGE)/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/sys_resource.in.h; \ + } > $@-t && \ + mv -f $@-t $@ + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +lib/sys/select.h: lib/sys_select.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) + $(AM_V_at)$(MKDIR_P) lib/sys + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's|@''GUARD_PREFIX''@|GL|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_SYS_SELECT_H''@|$(NEXT_SYS_SELECT_H)|g' \ + -e 's|@''HAVE_SYS_SELECT_H''@|$(HAVE_SYS_SELECT_H)|g' \ + -e 's/@''GNULIB_PSELECT''@/$(GNULIB_PSELECT)/g' \ + -e 's/@''GNULIB_SELECT''@/$(GNULIB_SELECT)/g' \ + -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \ + -e 's|@''HAVE_PSELECT''@|$(HAVE_PSELECT)|g' \ + -e 's|@''REPLACE_PSELECT''@|$(REPLACE_PSELECT)|g' \ + -e 's|@''REPLACE_SELECT''@|$(REPLACE_SELECT)|g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ + < $(top_srcdir)/lib/sys_select.in.h; \ + } > $@-t && \ + mv $@-t $@ + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +lib/sys/socket.h: lib/sys_socket.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H) + $(AM_V_at)$(MKDIR_P) lib/sys + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's|@''GUARD_PREFIX''@|GL|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_SYS_SOCKET_H''@|$(NEXT_SYS_SOCKET_H)|g' \ + -e 's|@''HAVE_SYS_SOCKET_H''@|$(HAVE_SYS_SOCKET_H)|g' \ + -e 's/@''GNULIB_CLOSE''@/$(GNULIB_CLOSE)/g' \ + -e 's/@''GNULIB_SOCKET''@/$(GNULIB_SOCKET)/g' \ + -e 's/@''GNULIB_CONNECT''@/$(GNULIB_CONNECT)/g' \ + -e 's/@''GNULIB_ACCEPT''@/$(GNULIB_ACCEPT)/g' \ + -e 's/@''GNULIB_BIND''@/$(GNULIB_BIND)/g' \ + -e 's/@''GNULIB_GETPEERNAME''@/$(GNULIB_GETPEERNAME)/g' \ + -e 's/@''GNULIB_GETSOCKNAME''@/$(GNULIB_GETSOCKNAME)/g' \ + -e 's/@''GNULIB_GETSOCKOPT''@/$(GNULIB_GETSOCKOPT)/g' \ + -e 's/@''GNULIB_LISTEN''@/$(GNULIB_LISTEN)/g' \ + -e 's/@''GNULIB_RECV''@/$(GNULIB_RECV)/g' \ + -e 's/@''GNULIB_SEND''@/$(GNULIB_SEND)/g' \ + -e 's/@''GNULIB_RECVFROM''@/$(GNULIB_RECVFROM)/g' \ + -e 's/@''GNULIB_SENDTO''@/$(GNULIB_SENDTO)/g' \ + -e 's/@''GNULIB_SETSOCKOPT''@/$(GNULIB_SETSOCKOPT)/g' \ + -e 's/@''GNULIB_SHUTDOWN''@/$(GNULIB_SHUTDOWN)/g' \ + -e 's/@''GNULIB_ACCEPT4''@/$(GNULIB_ACCEPT4)/g' \ + -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \ + -e 's|@''HAVE_WS2TCPIP_H''@|$(HAVE_WS2TCPIP_H)|g' \ + -e 's|@''HAVE_STRUCT_SOCKADDR_STORAGE''@|$(HAVE_STRUCT_SOCKADDR_STORAGE)|g' \ + -e 's|@''HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY''@|$(HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY)|g' \ + -e 's|@''HAVE_SA_FAMILY_T''@|$(HAVE_SA_FAMILY_T)|g' \ + -e 's|@''HAVE_ACCEPT4''@|$(HAVE_ACCEPT4)|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/sys_socket.in.h; \ + } > $@-t && \ + mv -f $@-t $@ + +# We need the following in order to create when the system +# has one that is incomplete. +lib/sys/stat.h: lib/sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) + $(AM_V_at)$(MKDIR_P) lib/sys + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's|@''GUARD_PREFIX''@|GL|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_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \ + -e 's|@''WINDOWS_64_BIT_ST_SIZE''@|$(WINDOWS_64_BIT_ST_SIZE)|g' \ + -e 's/@''GNULIB_FCHMODAT''@/$(GNULIB_FCHMODAT)/g' \ + -e 's/@''GNULIB_FSTAT''@/$(GNULIB_FSTAT)/g' \ + -e 's/@''GNULIB_FSTATAT''@/$(GNULIB_FSTATAT)/g' \ + -e 's/@''GNULIB_FUTIMENS''@/$(GNULIB_FUTIMENS)/g' \ + -e 's/@''GNULIB_LCHMOD''@/$(GNULIB_LCHMOD)/g' \ + -e 's/@''GNULIB_LSTAT''@/$(GNULIB_LSTAT)/g' \ + -e 's/@''GNULIB_MKDIRAT''@/$(GNULIB_MKDIRAT)/g' \ + -e 's/@''GNULIB_MKFIFO''@/$(GNULIB_MKFIFO)/g' \ + -e 's/@''GNULIB_MKFIFOAT''@/$(GNULIB_MKFIFOAT)/g' \ + -e 's/@''GNULIB_MKNOD''@/$(GNULIB_MKNOD)/g' \ + -e 's/@''GNULIB_MKNODAT''@/$(GNULIB_MKNODAT)/g' \ + -e 's/@''GNULIB_STAT''@/$(GNULIB_STAT)/g' \ + -e 's/@''GNULIB_UTIMENSAT''@/$(GNULIB_UTIMENSAT)/g' \ + -e 's|@''HAVE_FCHMODAT''@|$(HAVE_FCHMODAT)|g' \ + -e 's|@''HAVE_FSTATAT''@|$(HAVE_FSTATAT)|g' \ + -e 's|@''HAVE_FUTIMENS''@|$(HAVE_FUTIMENS)|g' \ + -e 's|@''HAVE_LCHMOD''@|$(HAVE_LCHMOD)|g' \ + -e 's|@''HAVE_LSTAT''@|$(HAVE_LSTAT)|g' \ + -e 's|@''HAVE_MKDIRAT''@|$(HAVE_MKDIRAT)|g' \ + -e 's|@''HAVE_MKFIFO''@|$(HAVE_MKFIFO)|g' \ + -e 's|@''HAVE_MKFIFOAT''@|$(HAVE_MKFIFOAT)|g' \ + -e 's|@''HAVE_MKNOD''@|$(HAVE_MKNOD)|g' \ + -e 's|@''HAVE_MKNODAT''@|$(HAVE_MKNODAT)|g' \ + -e 's|@''HAVE_UTIMENSAT''@|$(HAVE_UTIMENSAT)|g' \ + -e 's|@''REPLACE_FSTAT''@|$(REPLACE_FSTAT)|g' \ + -e 's|@''REPLACE_FSTATAT''@|$(REPLACE_FSTATAT)|g' \ + -e 's|@''REPLACE_FUTIMENS''@|$(REPLACE_FUTIMENS)|g' \ + -e 's|@''REPLACE_LSTAT''@|$(REPLACE_LSTAT)|g' \ + -e 's|@''REPLACE_MKDIR''@|$(REPLACE_MKDIR)|g' \ + -e 's|@''REPLACE_MKFIFO''@|$(REPLACE_MKFIFO)|g' \ + -e 's|@''REPLACE_MKNOD''@|$(REPLACE_MKNOD)|g' \ + -e 's|@''REPLACE_STAT''@|$(REPLACE_STAT)|g' \ + -e 's|@''REPLACE_UTIMENSAT''@|$(REPLACE_UTIMENSAT)|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/sys_stat.in.h; \ + } > $@-t && \ + mv $@-t $@ + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +lib/sys/time.h: lib/sys_time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) + $(AM_V_at)$(MKDIR_P) lib/sys + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's|@''GUARD_PREFIX''@|GL|g' \ + -e 's/@''HAVE_SYS_TIME_H''@/$(HAVE_SYS_TIME_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_SYS_TIME_H''@|$(NEXT_SYS_TIME_H)|g' \ + -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GNULIB_GETTIMEOFDAY)/g' \ + -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \ + -e 's/@''HAVE_GETTIMEOFDAY''@/$(HAVE_GETTIMEOFDAY)/g' \ + -e 's/@''HAVE_STRUCT_TIMEVAL''@/$(HAVE_STRUCT_TIMEVAL)/g' \ + -e 's/@''REPLACE_GETTIMEOFDAY''@/$(REPLACE_GETTIMEOFDAY)/g' \ + -e 's/@''REPLACE_STRUCT_TIMEVAL''@/$(REPLACE_STRUCT_TIMEVAL)/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/sys_time.in.h; \ + } > $@-t && \ + mv $@-t $@ + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +lib/sys/types.h: lib/sys_types.in.h $(top_builddir)/config.status + $(AM_V_at)$(MKDIR_P) lib/sys + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's|@''GUARD_PREFIX''@|GL|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_SYS_TYPES_H''@|$(NEXT_SYS_TYPES_H)|g' \ + -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \ + < $(top_srcdir)/lib/sys_types.in.h; \ + } > $@-t && \ + mv $@-t $@ + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +lib/sys/uio.h: lib/sys_uio.in.h $(top_builddir)/config.status + $(AM_V_at)$(MKDIR_P) lib/sys + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's|@''GUARD_PREFIX''@|GL|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_SYS_UIO_H''@|$(NEXT_SYS_UIO_H)|g' \ + -e 's|@''HAVE_SYS_UIO_H''@|$(HAVE_SYS_UIO_H)|g' \ + < $(top_srcdir)/lib/sys_uio.in.h; \ + } > $@-t && \ + mv -f $@-t $@ + +# We need the following in order to create when the system +# does not have one. +lib/sys/utsname.h: lib/sys_utsname.in.h $(top_builddir)/config.status $(WARN_ON_USE_H) $(ARG_NONNULL_H) + $(AM_V_at)$(MKDIR_P) lib/sys + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's|@''GUARD_PREFIX''@|GL|g' \ + -e 's/@''HAVE_SYS_UTSNAME_H''@/$(HAVE_SYS_UTSNAME_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_SYS_UTSNAME_H''@|$(NEXT_SYS_UTSNAME_H)|g' \ + -e 's/@''GNULIB_UNAME''@/$(GNULIB_UNAME)/g' \ + -e 's|@''HAVE_STRUCT_UTSNAME''@|$(HAVE_STRUCT_UTSNAME)|g' \ + -e 's|@''HAVE_UNAME''@|$(HAVE_UNAME)|g' \ + -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/sys_utsname.in.h; \ + } > $@-t && \ + mv $@-t $@ + +# We need the following in order to create when the system +# has one that is incomplete. +lib/sys/wait.h: lib/sys_wait.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) + $(AM_V_at)$(MKDIR_P) lib/sys + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's|@''GUARD_PREFIX''@|GL|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_SYS_WAIT_H''@|$(NEXT_SYS_WAIT_H)|g' \ + -e 's/@''GNULIB_WAITPID''@/$(GNULIB_WAITPID)/g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ + < $(top_srcdir)/lib/sys_wait.in.h; \ + } > $@-t && \ + mv $@-t $@ + +# We need the following in order to create when the system +# version does not have all declarations. +lib/termios.h: lib/termios.in.h $(top_builddir)/config.status $(CXXDEFS_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|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_TERMIOS_H''@|$(NEXT_TERMIOS_H)|g' \ + -e 's/@''GNULIB_TCGETSID''@/$(GNULIB_TCGETSID)/g' \ + -e 's|@''HAVE_DECL_TCGETSID''@|$(HAVE_DECL_TCGETSID)|g' \ + -e 's|@''HAVE_TERMIOS_H''@|$(HAVE_TERMIOS_H)|g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ + < $(top_srcdir)/lib/termios.in.h; \ + } > $@-t && \ + mv $@-t $@ + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +lib/time.h: lib/time.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|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -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_MKTIME''@/$(GNULIB_MKTIME)/g' \ + -e 's/@''GNULIB_NANOSLEEP''@/$(GNULIB_NANOSLEEP)/g' \ + -e 's/@''GNULIB_STRPTIME''@/$(GNULIB_STRPTIME)/g' \ + -e 's/@''GNULIB_TIMEGM''@/$(GNULIB_TIMEGM)/g' \ + -e 's/@''GNULIB_TIME_R''@/$(GNULIB_TIME_R)/g' \ + -e 's|@''HAVE_DECL_LOCALTIME_R''@|$(HAVE_DECL_LOCALTIME_R)|g' \ + -e 's|@''HAVE_NANOSLEEP''@|$(HAVE_NANOSLEEP)|g' \ + -e 's|@''HAVE_STRPTIME''@|$(HAVE_STRPTIME)|g' \ + -e 's|@''HAVE_TIMEGM''@|$(HAVE_TIMEGM)|g' \ + -e 's|@''REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \ + -e 's|@''REPLACE_MKTIME''@|$(REPLACE_MKTIME)|g' \ + -e 's|@''REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \ + -e 's|@''REPLACE_TIMEGM''@|$(REPLACE_TIMEGM)|g' \ + -e 's|@''PTHREAD_H_DEFINES_STRUCT_TIMESPEC''@|$(PTHREAD_H_DEFINES_STRUCT_TIMESPEC)|g' \ + -e 's|@''SYS_TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(SYS_TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \ + -e 's|@''TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(TIME_H_DEFINES_STRUCT_TIMESPEC)|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/time.in.h; \ + } > $@-t && \ + mv $@-t $@ + +# We need the following in order to create an empty placeholder for +# when the system doesn't have one. +lib/unistd.h: lib/unistd.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_UNISTD_H''@|$(HAVE_UNISTD_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_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \ + -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \ + -e 's/@''GNULIB_CHDIR''@/$(GNULIB_CHDIR)/g' \ + -e 's/@''GNULIB_CHOWN''@/$(GNULIB_CHOWN)/g' \ + -e 's/@''GNULIB_CLOSE''@/$(GNULIB_CLOSE)/g' \ + -e 's/@''GNULIB_DUP''@/$(GNULIB_DUP)/g' \ + -e 's/@''GNULIB_DUP2''@/$(GNULIB_DUP2)/g' \ + -e 's/@''GNULIB_DUP3''@/$(GNULIB_DUP3)/g' \ + -e 's/@''GNULIB_ENVIRON''@/$(GNULIB_ENVIRON)/g' \ + -e 's/@''GNULIB_EUIDACCESS''@/$(GNULIB_EUIDACCESS)/g' \ + -e 's/@''GNULIB_FACCESSAT''@/$(GNULIB_FACCESSAT)/g' \ + -e 's/@''GNULIB_FCHDIR''@/$(GNULIB_FCHDIR)/g' \ + -e 's/@''GNULIB_FCHOWNAT''@/$(GNULIB_FCHOWNAT)/g' \ + -e 's/@''GNULIB_FDATASYNC''@/$(GNULIB_FDATASYNC)/g' \ + -e 's/@''GNULIB_FSYNC''@/$(GNULIB_FSYNC)/g' \ + -e 's/@''GNULIB_FTRUNCATE''@/$(GNULIB_FTRUNCATE)/g' \ + -e 's/@''GNULIB_GETCWD''@/$(GNULIB_GETCWD)/g' \ + -e 's/@''GNULIB_GETDOMAINNAME''@/$(GNULIB_GETDOMAINNAME)/g' \ + -e 's/@''GNULIB_GETDTABLESIZE''@/$(GNULIB_GETDTABLESIZE)/g' \ + -e 's/@''GNULIB_GETGROUPS''@/$(GNULIB_GETGROUPS)/g' \ + -e 's/@''GNULIB_GETHOSTNAME''@/$(GNULIB_GETHOSTNAME)/g' \ + -e 's/@''GNULIB_GETLOGIN''@/$(GNULIB_GETLOGIN)/g' \ + -e 's/@''GNULIB_GETLOGIN_R''@/$(GNULIB_GETLOGIN_R)/g' \ + -e 's/@''GNULIB_GETPAGESIZE''@/$(GNULIB_GETPAGESIZE)/g' \ + -e 's/@''GNULIB_GETUSERSHELL''@/$(GNULIB_GETUSERSHELL)/g' \ + -e 's/@''GNULIB_GROUP_MEMBER''@/$(GNULIB_GROUP_MEMBER)/g' \ + -e 's/@''GNULIB_ISATTY''@/$(GNULIB_ISATTY)/g' \ + -e 's/@''GNULIB_LCHOWN''@/$(GNULIB_LCHOWN)/g' \ + -e 's/@''GNULIB_LINK''@/$(GNULIB_LINK)/g' \ + -e 's/@''GNULIB_LINKAT''@/$(GNULIB_LINKAT)/g' \ + -e 's/@''GNULIB_LSEEK''@/$(GNULIB_LSEEK)/g' \ + -e 's/@''GNULIB_PIPE''@/$(GNULIB_PIPE)/g' \ + -e 's/@''GNULIB_PIPE2''@/$(GNULIB_PIPE2)/g' \ + -e 's/@''GNULIB_PREAD''@/$(GNULIB_PREAD)/g' \ + -e 's/@''GNULIB_PWRITE''@/$(GNULIB_PWRITE)/g' \ + -e 's/@''GNULIB_READ''@/$(GNULIB_READ)/g' \ + -e 's/@''GNULIB_READLINK''@/$(GNULIB_READLINK)/g' \ + -e 's/@''GNULIB_READLINKAT''@/$(GNULIB_READLINKAT)/g' \ + -e 's/@''GNULIB_RMDIR''@/$(GNULIB_RMDIR)/g' \ + -e 's/@''GNULIB_SETHOSTNAME''@/$(GNULIB_SETHOSTNAME)/g' \ + -e 's/@''GNULIB_SLEEP''@/$(GNULIB_SLEEP)/g' \ + -e 's/@''GNULIB_SYMLINK''@/$(GNULIB_SYMLINK)/g' \ + -e 's/@''GNULIB_SYMLINKAT''@/$(GNULIB_SYMLINKAT)/g' \ + -e 's/@''GNULIB_TTYNAME_R''@/$(GNULIB_TTYNAME_R)/g' \ + -e 's/@''GNULIB_UNISTD_H_GETOPT''@/0$(GNULIB_GL_UNISTD_H_GETOPT)/g' \ + -e 's/@''GNULIB_UNISTD_H_NONBLOCKING''@/$(GNULIB_UNISTD_H_NONBLOCKING)/g' \ + -e 's/@''GNULIB_UNISTD_H_SIGPIPE''@/$(GNULIB_UNISTD_H_SIGPIPE)/g' \ + -e 's/@''GNULIB_UNLINK''@/$(GNULIB_UNLINK)/g' \ + -e 's/@''GNULIB_UNLINKAT''@/$(GNULIB_UNLINKAT)/g' \ + -e 's/@''GNULIB_USLEEP''@/$(GNULIB_USLEEP)/g' \ + -e 's/@''GNULIB_WRITE''@/$(GNULIB_WRITE)/g' \ + < $(top_srcdir)/lib/unistd.in.h | \ + sed -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \ + -e 's|@''HAVE_DUP2''@|$(HAVE_DUP2)|g' \ + -e 's|@''HAVE_DUP3''@|$(HAVE_DUP3)|g' \ + -e 's|@''HAVE_EUIDACCESS''@|$(HAVE_EUIDACCESS)|g' \ + -e 's|@''HAVE_FACCESSAT''@|$(HAVE_FACCESSAT)|g' \ + -e 's|@''HAVE_FCHDIR''@|$(HAVE_FCHDIR)|g' \ + -e 's|@''HAVE_FCHOWNAT''@|$(HAVE_FCHOWNAT)|g' \ + -e 's|@''HAVE_FDATASYNC''@|$(HAVE_FDATASYNC)|g' \ + -e 's|@''HAVE_FSYNC''@|$(HAVE_FSYNC)|g' \ + -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \ + -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \ + -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \ + -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \ + -e 's|@''HAVE_GETLOGIN''@|$(HAVE_GETLOGIN)|g' \ + -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \ + -e 's|@''HAVE_GROUP_MEMBER''@|$(HAVE_GROUP_MEMBER)|g' \ + -e 's|@''HAVE_LCHOWN''@|$(HAVE_LCHOWN)|g' \ + -e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \ + -e 's|@''HAVE_LINKAT''@|$(HAVE_LINKAT)|g' \ + -e 's|@''HAVE_PIPE''@|$(HAVE_PIPE)|g' \ + -e 's|@''HAVE_PIPE2''@|$(HAVE_PIPE2)|g' \ + -e 's|@''HAVE_PREAD''@|$(HAVE_PREAD)|g' \ + -e 's|@''HAVE_PWRITE''@|$(HAVE_PWRITE)|g' \ + -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \ + -e 's|@''HAVE_READLINKAT''@|$(HAVE_READLINKAT)|g' \ + -e 's|@''HAVE_SETHOSTNAME''@|$(HAVE_SETHOSTNAME)|g' \ + -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \ + -e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \ + -e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \ + -e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \ + -e 's|@''HAVE_USLEEP''@|$(HAVE_USLEEP)|g' \ + -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \ + -e 's|@''HAVE_DECL_FCHDIR''@|$(HAVE_DECL_FCHDIR)|g' \ + -e 's|@''HAVE_DECL_FDATASYNC''@|$(HAVE_DECL_FDATASYNC)|g' \ + -e 's|@''HAVE_DECL_GETDOMAINNAME''@|$(HAVE_DECL_GETDOMAINNAME)|g' \ + -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \ + -e 's|@''HAVE_DECL_GETPAGESIZE''@|$(HAVE_DECL_GETPAGESIZE)|g' \ + -e 's|@''HAVE_DECL_GETUSERSHELL''@|$(HAVE_DECL_GETUSERSHELL)|g' \ + -e 's|@''HAVE_DECL_SETHOSTNAME''@|$(HAVE_DECL_SETHOSTNAME)|g' \ + -e 's|@''HAVE_DECL_TTYNAME_R''@|$(HAVE_DECL_TTYNAME_R)|g' \ + -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \ + -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \ + | \ + sed -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \ + -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \ + -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \ + -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \ + -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \ + -e 's|@''REPLACE_FTRUNCATE''@|$(REPLACE_FTRUNCATE)|g' \ + -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \ + -e 's|@''REPLACE_GETDOMAINNAME''@|$(REPLACE_GETDOMAINNAME)|g' \ + -e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \ + -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \ + -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \ + -e 's|@''REPLACE_ISATTY''@|$(REPLACE_ISATTY)|g' \ + -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \ + -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \ + -e 's|@''REPLACE_LINKAT''@|$(REPLACE_LINKAT)|g' \ + -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \ + -e 's|@''REPLACE_PREAD''@|$(REPLACE_PREAD)|g' \ + -e 's|@''REPLACE_PWRITE''@|$(REPLACE_PWRITE)|g' \ + -e 's|@''REPLACE_READ''@|$(REPLACE_READ)|g' \ + -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \ + -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \ + -e 's|@''REPLACE_SLEEP''@|$(REPLACE_SLEEP)|g' \ + -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \ + -e 's|@''REPLACE_TTYNAME_R''@|$(REPLACE_TTYNAME_R)|g' \ + -e 's|@''REPLACE_UNLINK''@|$(REPLACE_UNLINK)|g' \ + -e 's|@''REPLACE_UNLINKAT''@|$(REPLACE_UNLINKAT)|g' \ + -e 's|@''REPLACE_USLEEP''@|$(REPLACE_USLEEP)|g' \ + -e 's|@''REPLACE_WRITE''@|$(REPLACE_WRITE)|g' \ + -e 's|@''UNISTD_H_HAVE_WINSOCK2_H''@|$(UNISTD_H_HAVE_WINSOCK2_H)|g' \ + -e 's|@''UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''@|$(UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS)|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)'; \ + } > $@-t && \ + mv $@-t $@ + +lib/unistr.h: lib/unistr.in.h + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + cat $(top_srcdir)/lib/unistr.in.h; \ + } > $@-t && \ + mv -f $@-t $@ + +lib/unitypes.h: lib/unitypes.in.h + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + cat $(top_srcdir)/lib/unitypes.in.h; \ + } > $@-t && \ + mv -f $@-t $@ + +lib/uniwidth.h: lib/uniwidth.in.h + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + cat $(top_srcdir)/lib/uniwidth.in.h; \ + } > $@-t && \ + mv -f $@-t $@ + +# We need the following in order to create when the system +# version does not work standalone. +lib/wchar.h: lib/wchar.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|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''HAVE_FEATURES_H''@|$(HAVE_FEATURES_H)|g' \ + -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \ + -e 's|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \ + -e 's/@''GNULIB_BTOWC''@/$(GNULIB_BTOWC)/g' \ + -e 's/@''GNULIB_WCTOB''@/$(GNULIB_WCTOB)/g' \ + -e 's/@''GNULIB_MBSINIT''@/$(GNULIB_MBSINIT)/g' \ + -e 's/@''GNULIB_MBRTOWC''@/$(GNULIB_MBRTOWC)/g' \ + -e 's/@''GNULIB_MBRLEN''@/$(GNULIB_MBRLEN)/g' \ + -e 's/@''GNULIB_MBSRTOWCS''@/$(GNULIB_MBSRTOWCS)/g' \ + -e 's/@''GNULIB_MBSNRTOWCS''@/$(GNULIB_MBSNRTOWCS)/g' \ + -e 's/@''GNULIB_WCRTOMB''@/$(GNULIB_WCRTOMB)/g' \ + -e 's/@''GNULIB_WCSRTOMBS''@/$(GNULIB_WCSRTOMBS)/g' \ + -e 's/@''GNULIB_WCSNRTOMBS''@/$(GNULIB_WCSNRTOMBS)/g' \ + -e 's/@''GNULIB_WCWIDTH''@/$(GNULIB_WCWIDTH)/g' \ + -e 's/@''GNULIB_WMEMCHR''@/$(GNULIB_WMEMCHR)/g' \ + -e 's/@''GNULIB_WMEMCMP''@/$(GNULIB_WMEMCMP)/g' \ + -e 's/@''GNULIB_WMEMCPY''@/$(GNULIB_WMEMCPY)/g' \ + -e 's/@''GNULIB_WMEMMOVE''@/$(GNULIB_WMEMMOVE)/g' \ + -e 's/@''GNULIB_WMEMSET''@/$(GNULIB_WMEMSET)/g' \ + -e 's/@''GNULIB_WCSLEN''@/$(GNULIB_WCSLEN)/g' \ + -e 's/@''GNULIB_WCSNLEN''@/$(GNULIB_WCSNLEN)/g' \ + -e 's/@''GNULIB_WCSCPY''@/$(GNULIB_WCSCPY)/g' \ + -e 's/@''GNULIB_WCPCPY''@/$(GNULIB_WCPCPY)/g' \ + -e 's/@''GNULIB_WCSNCPY''@/$(GNULIB_WCSNCPY)/g' \ + -e 's/@''GNULIB_WCPNCPY''@/$(GNULIB_WCPNCPY)/g' \ + -e 's/@''GNULIB_WCSCAT''@/$(GNULIB_WCSCAT)/g' \ + -e 's/@''GNULIB_WCSNCAT''@/$(GNULIB_WCSNCAT)/g' \ + -e 's/@''GNULIB_WCSCMP''@/$(GNULIB_WCSCMP)/g' \ + -e 's/@''GNULIB_WCSNCMP''@/$(GNULIB_WCSNCMP)/g' \ + -e 's/@''GNULIB_WCSCASECMP''@/$(GNULIB_WCSCASECMP)/g' \ + -e 's/@''GNULIB_WCSNCASECMP''@/$(GNULIB_WCSNCASECMP)/g' \ + -e 's/@''GNULIB_WCSCOLL''@/$(GNULIB_WCSCOLL)/g' \ + -e 's/@''GNULIB_WCSXFRM''@/$(GNULIB_WCSXFRM)/g' \ + -e 's/@''GNULIB_WCSDUP''@/$(GNULIB_WCSDUP)/g' \ + -e 's/@''GNULIB_WCSCHR''@/$(GNULIB_WCSCHR)/g' \ + -e 's/@''GNULIB_WCSRCHR''@/$(GNULIB_WCSRCHR)/g' \ + -e 's/@''GNULIB_WCSCSPN''@/$(GNULIB_WCSCSPN)/g' \ + -e 's/@''GNULIB_WCSSPN''@/$(GNULIB_WCSSPN)/g' \ + -e 's/@''GNULIB_WCSPBRK''@/$(GNULIB_WCSPBRK)/g' \ + -e 's/@''GNULIB_WCSSTR''@/$(GNULIB_WCSSTR)/g' \ + -e 's/@''GNULIB_WCSTOK''@/$(GNULIB_WCSTOK)/g' \ + -e 's/@''GNULIB_WCSWIDTH''@/$(GNULIB_WCSWIDTH)/g' \ + < $(top_srcdir)/lib/wchar.in.h | \ + sed -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \ + -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \ + -e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \ + -e 's|@''HAVE_MBRTOWC''@|$(HAVE_MBRTOWC)|g' \ + -e 's|@''HAVE_MBRLEN''@|$(HAVE_MBRLEN)|g' \ + -e 's|@''HAVE_MBSRTOWCS''@|$(HAVE_MBSRTOWCS)|g' \ + -e 's|@''HAVE_MBSNRTOWCS''@|$(HAVE_MBSNRTOWCS)|g' \ + -e 's|@''HAVE_WCRTOMB''@|$(HAVE_WCRTOMB)|g' \ + -e 's|@''HAVE_WCSRTOMBS''@|$(HAVE_WCSRTOMBS)|g' \ + -e 's|@''HAVE_WCSNRTOMBS''@|$(HAVE_WCSNRTOMBS)|g' \ + -e 's|@''HAVE_WMEMCHR''@|$(HAVE_WMEMCHR)|g' \ + -e 's|@''HAVE_WMEMCMP''@|$(HAVE_WMEMCMP)|g' \ + -e 's|@''HAVE_WMEMCPY''@|$(HAVE_WMEMCPY)|g' \ + -e 's|@''HAVE_WMEMMOVE''@|$(HAVE_WMEMMOVE)|g' \ + -e 's|@''HAVE_WMEMSET''@|$(HAVE_WMEMSET)|g' \ + -e 's|@''HAVE_WCSLEN''@|$(HAVE_WCSLEN)|g' \ + -e 's|@''HAVE_WCSNLEN''@|$(HAVE_WCSNLEN)|g' \ + -e 's|@''HAVE_WCSCPY''@|$(HAVE_WCSCPY)|g' \ + -e 's|@''HAVE_WCPCPY''@|$(HAVE_WCPCPY)|g' \ + -e 's|@''HAVE_WCSNCPY''@|$(HAVE_WCSNCPY)|g' \ + -e 's|@''HAVE_WCPNCPY''@|$(HAVE_WCPNCPY)|g' \ + -e 's|@''HAVE_WCSCAT''@|$(HAVE_WCSCAT)|g' \ + -e 's|@''HAVE_WCSNCAT''@|$(HAVE_WCSNCAT)|g' \ + -e 's|@''HAVE_WCSCMP''@|$(HAVE_WCSCMP)|g' \ + -e 's|@''HAVE_WCSNCMP''@|$(HAVE_WCSNCMP)|g' \ + -e 's|@''HAVE_WCSCASECMP''@|$(HAVE_WCSCASECMP)|g' \ + -e 's|@''HAVE_WCSNCASECMP''@|$(HAVE_WCSNCASECMP)|g' \ + -e 's|@''HAVE_WCSCOLL''@|$(HAVE_WCSCOLL)|g' \ + -e 's|@''HAVE_WCSXFRM''@|$(HAVE_WCSXFRM)|g' \ + -e 's|@''HAVE_WCSDUP''@|$(HAVE_WCSDUP)|g' \ + -e 's|@''HAVE_WCSCHR''@|$(HAVE_WCSCHR)|g' \ + -e 's|@''HAVE_WCSRCHR''@|$(HAVE_WCSRCHR)|g' \ + -e 's|@''HAVE_WCSCSPN''@|$(HAVE_WCSCSPN)|g' \ + -e 's|@''HAVE_WCSSPN''@|$(HAVE_WCSSPN)|g' \ + -e 's|@''HAVE_WCSPBRK''@|$(HAVE_WCSPBRK)|g' \ + -e 's|@''HAVE_WCSSTR''@|$(HAVE_WCSSTR)|g' \ + -e 's|@''HAVE_WCSTOK''@|$(HAVE_WCSTOK)|g' \ + -e 's|@''HAVE_WCSWIDTH''@|$(HAVE_WCSWIDTH)|g' \ + -e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \ + -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \ + | \ + sed -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \ + -e 's|@''REPLACE_BTOWC''@|$(REPLACE_BTOWC)|g' \ + -e 's|@''REPLACE_WCTOB''@|$(REPLACE_WCTOB)|g' \ + -e 's|@''REPLACE_MBSINIT''@|$(REPLACE_MBSINIT)|g' \ + -e 's|@''REPLACE_MBRTOWC''@|$(REPLACE_MBRTOWC)|g' \ + -e 's|@''REPLACE_MBRLEN''@|$(REPLACE_MBRLEN)|g' \ + -e 's|@''REPLACE_MBSRTOWCS''@|$(REPLACE_MBSRTOWCS)|g' \ + -e 's|@''REPLACE_MBSNRTOWCS''@|$(REPLACE_MBSNRTOWCS)|g' \ + -e 's|@''REPLACE_WCRTOMB''@|$(REPLACE_WCRTOMB)|g' \ + -e 's|@''REPLACE_WCSRTOMBS''@|$(REPLACE_WCSRTOMBS)|g' \ + -e 's|@''REPLACE_WCSNRTOMBS''@|$(REPLACE_WCSNRTOMBS)|g' \ + -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \ + -e 's|@''REPLACE_WCSWIDTH''@|$(REPLACE_WCSWIDTH)|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)'; \ + } > $@-t && \ + mv $@-t $@ + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +lib/wctype.h: lib/wctype.in.h $(top_builddir)/config.status $(CXXDEFS_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_WCTYPE_H''@/$(HAVE_WCTYPE_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_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \ + -e 's/@''GNULIB_ISWBLANK''@/$(GNULIB_ISWBLANK)/g' \ + -e 's/@''GNULIB_WCTYPE''@/$(GNULIB_WCTYPE)/g' \ + -e 's/@''GNULIB_ISWCTYPE''@/$(GNULIB_ISWCTYPE)/g' \ + -e 's/@''GNULIB_WCTRANS''@/$(GNULIB_WCTRANS)/g' \ + -e 's/@''GNULIB_TOWCTRANS''@/$(GNULIB_TOWCTRANS)/g' \ + -e 's/@''HAVE_ISWBLANK''@/$(HAVE_ISWBLANK)/g' \ + -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \ + -e 's/@''HAVE_WCTYPE_T''@/$(HAVE_WCTYPE_T)/g' \ + -e 's/@''HAVE_WCTRANS_T''@/$(HAVE_WCTRANS_T)/g' \ + -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \ + -e 's/@''REPLACE_ISWBLANK''@/$(REPLACE_ISWBLANK)/g' \ + -e 's/@''REPLACE_ISWCNTRL''@/$(REPLACE_ISWCNTRL)/g' \ + -e 's/@''REPLACE_TOWLOWER''@/$(REPLACE_TOWLOWER)/g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ + < $(top_srcdir)/lib/wctype.in.h; \ + } > $@-t && \ + mv $@-t $@ + +mostlyclean-local: mostlyclean-generic + @for dir in '' $(MOSTLYCLEANDIRS); do \ + if test -n "$$dir" && test -d $$dir; then \ + echo "rmdir $$dir"; rmdir $$dir; \ + fi; \ + done; \ + : + +# Allow "make distdir" to succeed before "make all" has run. +dist-hook: $(noinst_LIBRARIES) +.PHONY: dist-hook +src/dircolors.h: src/dcgen src/dircolors.hin + $(AM_V_GEN)rm -f $@ $@-t + $(AM_V_at)$(PERL) -w -- $(srcdir)/src/dcgen \ + $(srcdir)/src/dircolors.hin > $@-t + $(AM_V_at)chmod a-w $@-t + $(AM_V_at)mv $@-t $@ +$(top_srcdir)/src/primes.h: + $(MAKE) src/make-prime-list$(EXEEXT) + $(AM_V_GEN)rm -f $@ $@-t + $(AM_V_at)src/make-prime-list$(EXEEXT) 5000 > $@-t + $(AM_V_at)chmod a-w $@-t + $(AM_V_at)mv $@-t $@ + +# Compare fs.h with the list of file system names/magic-numbers in the +# Linux statfs man page. This target prints any new name/number pairs. +# 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 +src/fs-def: src/fs.h + grep '^# *define ' src/fs.h | $(ASSORT) > $@-t && mv $@-t $@ +src/fs-magic: Makefile + 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 \ + | perl -p \ + $(fs_normalize_perl_subst) \ + | grep -Ev 'S_MAGIC_EXT[34]|STACK_END' \ + | $(ASSORT) \ + > $@-t && mv $@-t $@ +src/fs-is-local.h: src/stat.c src/extract-magic + $(AM_V_GEN)rm -f $@ + $(AM_V_at)$(PERL) $(srcdir)/src/extract-magic \ + --local $(srcdir)/src/stat.c > $@t + $(AM_V_at)chmod a-w $@t + $(AM_V_at)mv $@t $@ +src/fs.h: src/stat.c src/extract-magic + $(AM_V_GEN)rm -f $@ + $(AM_V_at)$(PERL) $(srcdir)/src/extract-magic \ + $(srcdir)/src/stat.c > $@t + $(AM_V_at)chmod a-w $@t + $(AM_V_at)mv $@t $@ +src/version.c: Makefile + $(AM_V_GEN)rm -f $@ + $(AM_V_at)printf '#include \n' > $@t + $(AM_V_at)printf 'char const *Version = "$(PACKAGE_VERSION)";\n' >> $@t + $(AM_V_at)chmod a-w $@t + $(AM_V_at)mv $@t $@ +src/version.h: Makefile + $(AM_V_GEN)rm -f $@ + $(AM_V_at)printf 'extern char const *Version;\n' > $@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 +.PHONY: check-README +check-README: + $(AM_V_GEN)rm -rf $(pr) $(pm) + $(AM_V_at)echo $(all_programs) \ + | tr -s ' ' '\n' \ + | sed -e 's,$(EXEEXT)$$,,' \ + -e 's,^src/,,' \ + -e 's/^ginstall$$/install/' \ + | sed /libstdbuf/d \ + | $(ASSORT) -u > $(pm) && \ + sed -n '/^The programs .* are:/,/^[a-zA-Z]/p' $(top_srcdir)/README \ + | sed -n '/^ */s///p' | tr -s ' ' '\n' > $(pr) + $(AM_V_at)diff $(pm) $(pr) && rm -rf $(pr) $(pm) + +# Ensure that a by-default-not-installed program (listed in +# $(no_install__progs) is not also listed as another $(EXTRA_PROGRAMS) +# entry, because if that were to happen, it *would* be installed +# by default. +.PHONY: check-duplicate-no-install +check-duplicate-no-install: src/tr + $(AM_V_GEN)test -z "`echo '$(EXTRA_PROGRAMS)' | tr ' ' '\n' | uniq -d`" + +doc/constants.texi: $(top_srcdir)/src/tail.c $(top_srcdir)/src/shred.c + $(AM_V_GEN)LC_ALL=C; export LC_ALL; \ + $(MKDIR_P) doc && \ + { sed -n -e 's/^#define \(DEFAULT_MAX[_A-Z]*\) \(.*\)/@set \1 \2/p' \ + $(top_srcdir)/src/tail.c && \ + sed -n -e \ + 's/.*\(DEFAULT_PASSES\)[ =]* \([0-9]*\).*/@set SHRED_\1 \2/p'\ + $(top_srcdir)/src/shred.c; } > $@-t \ + && mv $@-t $@ + +.PHONY: $(syntax_checks) check-texinfo + +# List words/regexps here that should not appear in the texinfo documentation. +check-texinfo: $(syntax_checks) + $(AM_V_GEN)fail=0; \ + grep '@url{' $(texi_files) && fail=1; \ + grep '\$$@"' $(texi_files) && fail=1; \ + grep -n '[^[:punct:]]@footnote' $(texi_files) && fail=1; \ + grep -n filename $(texi_files) \ + | $(EGREP) -v 'setfilename|[{]filename[}]' \ + && fail=1; \ + exit $$fail + +sc-avoid-builtin: + $(AM_V_GEN)$(EGREP) -i '$(_W)builtins?$(W_)' $(texi_files) \ + && exit 1 || : + +sc-avoid-path: + $(AM_V_GEN)fail=0; \ + $(EGREP) -i '$(_W)path(name)?s?$(W_)' $(texi_files) \ + | $(EGREP) -v \ + 'PATH=|path search|search path|@vindex PATH$$|@env[{]PATH[}]' \ + && fail=1; \ + exit $$fail + +# Use "time zone", not "timezone". +sc-avoid-timezone: + $(AM_V_GEN)$(EGREP) timezone $(texi_files) && exit 1 || : + +# Check for insufficient exponent grouping, e.g., +# @math{2^64} should be @math{2^{64}}. +sc-exponent-grouping: + $(AM_V_GEN)$(EGREP) '\{.*\^[0-9][0-9]' $(texi_files) && exit 1 || : + +# Say I/O, not IO. +sc-avoid-io: + $(AM_V_GEN)$(EGREP) '$(_W)IO$(W_)' $(texi_files) && exit 1 || : + +# I prefer nonzero over non-zero. +sc-avoid-non-zero: + $(AM_V_GEN)$(EGREP) non-zero $(texi_files) && exit 1 || : + +# Use "zeros", not "zeroes" (nothing wrong with "zeroes"; just be consistent). +sc-avoid-zeroes: + $(AM_V_GEN)$(EGREP) -i '$(_W)zeroes$(W_)' $(texi_files) \ + && exit 1 || : +sc-lower-case-var: + $(AM_V_GEN)$(PERL) -e 1 || { echo $@: skipping test; exit 0; }; \ + $(PERL) -lne $(find_upper_case_var) $(texi_files) + +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 + +.x.1: + $(AM_V_GEN)name=`echo $@ | sed 's|.*/||; s|\.1$$||'` || exit 1; \ + case $$name in \ + install) prog='ginstall';; \ + test) prog='[';; \ + *) prog=$$name;; \ + esac; \ + rm -f $@ $@-t \ + && t=$*.td \ + && rm -rf $$t \ + && $(MKDIR_P) $$t \ + && (cd $$t && $(LN_S) '$(abs_top_builddir)/src/'$$prog $$name) \ + && $(run_help2man) \ + --source='$(PACKAGE_STRING)' \ + --include=$(srcdir)/man/$$name.x \ + --output=$$t/$$name.1 $$t/$$name \ + && sed 's|$*\.td/||g' $$t/$$name.1 > $@-t \ + && rm -rf $$t \ + && chmod -w $@-t \ + && mv $@-t $@ +.PHONY: check-root +check-root: + $(MAKE) check TESTS='$(root_tests)' SUBDIRS=. + +$(factor_tests): $(tf)/run.sh $(tf)/create-test.sh + $(AM_V_GEN)$(MKDIR_P) $(tf) + $(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 $@ + +$(TEST_LOGS): $(PROGRAMS) + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/NEWS b/NEWS index 6503f2fd..7122f410 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,302 @@ GNU coreutils NEWS -*- outline -*- +* Noteworthy changes in release 8.21 (2013-02-14) [stable] + +** New programs + + numfmt: reformat numbers + +** New features + + df now accepts the --output[=FIELD_LIST] option to define the list of columns + to include in the output, or all available columns if the FIELD_LIST is + omitted. Note this enables df to output both block and inode fields together. + + du now accepts the --threshold=SIZE option to restrict the output to entries + with such a minimum SIZE (or a maximum SIZE if it is negative). + du recognizes -t SIZE as equivalent, for compatibility with FreeBSD. + +** Bug fixes + + cp --no-preserve=mode now no longer exits non-zero. + [bug introduced in coreutils-8.20] + + cut with a range like "N-" no longer allocates N/8 bytes. That buffer + would never be used, and allocation failure could cause cut to fail. + [bug introduced in coreutils-8.10] + + cut no longer accepts the invalid range 0-, which made it print empty lines. + Instead, cut now fails and emits an appropriate diagnostic. + [This bug was present in "the beginning".] + + cut now handles overlapping to-EOL ranges properly. Before, it would + interpret "-b2-,3-" like "-b3-". Now it's treated like "-b2-". + [This bug was present in "the beginning".] + + cut no longer prints extraneous delimiters when a to-EOL range subsumes + another range. Before, "echo 123|cut --output-delim=: -b2-,3" would print + "2:3". Now it prints "23". [bug introduced in 5.3.0] + + cut -f no longer inspects input line N+1 before fully outputting line N, + which avoids delayed output for intermittent input. + [bug introduced in TEXTUTILS-1_8b] + + factor no longer loops infinitely on 32 bit powerpc or sparc systems. + [bug introduced in coreutils-8.20] + + install -m M SOURCE DEST no longer has a race condition where DEST's + permissions are temporarily derived from SOURCE instead of from M. + + pr -n no longer crashes when passed values >= 32. Also, line numbers are + consistently padded with spaces, rather than with zeros for certain widths. + [bug introduced in TEXTUTILS-1_22i] + + seq -w ensures that for numbers input in scientific notation, + the output numbers are properly aligned and of the correct width. + [This bug was present in "the beginning".] + + seq -w ensures correct alignment when the step value includes a precision + while the start value does not, and the number sequence narrows. + [This bug was present in "the beginning".] + + seq -s no longer prints an erroneous newline after the first number, and + outputs a newline after the last number rather than a trailing separator. + Also seq no longer ignores a specified step value when the end value is 1. + [bugs introduced in coreutils-8.20] + + timeout now ensures that blocking of ALRM signals is not inherited from + its parent, which would cause timeouts to be ignored. + [the bug dates back to the initial implementation] + +** Changes in behavior + + df --total now prints '-' into the target column (mount point) of the + summary line, accommodating the --output option where the target field + can be in any column. If there is no source column, then df prints + 'total' in the target column. + + df now properly outputs file system information with bind mounts present on + the system by skipping duplicate entries (identified by the device number). + Consequently, df also elides the early-boot pseudo file system type "rootfs". + + nl no longer supports the --page-increment option, which has been + deprecated since coreutils-7.5. Use --line-increment instead. + +** Improvements + + readlink now supports multiple arguments, and a complementary + -z, --zero option to delimit output items with the NUL character. + + stat and tail now know about CEPH. stat -f --format=%T now reports the file + system type, and tail -f uses polling for files on CEPH file systems. + + stty now supports configuring DTR/DSR hardware flow control where available. + +** Build-related + + Perl is now more of a prerequisite. It has long been required in order + to run (not skip) a significant percentage of the tests. Now, it is + also required in order to generate proper man pages, via help2man. The + generated man/*.1 man pages are no longer distributed. Building without + perl, you would create stub man pages. Thus, while perl is not an + official prerequisite (build and "make check" will still succeed), any + resulting man pages would be inferior. In addition, this fixes a bug + in distributed (not from clone) Makefile.in that could cause parallel + build failure when building from modified sources, as is common practice + for a patched distribution package. + + factor now builds on x86_64 with x32 ABI, 32 bit MIPS, and all HPPA systems, + by avoiding incompatible asm. [bug introduced in coreutils-8.20] + + A root-only test predicate would always fail. Its job was to determine + whether our dummy user, $NON_ROOT_USERNAME, was able to run binaries from + the build directory. As a result, all dependent tests were always skipped. + Now, those tests may be run once again. [bug introduced in coreutils-8.20] + + +* Noteworthy changes in release 8.20 (2012-10-23) [stable] + +** New features + + dd now accepts 'status=none' to suppress all informational output. + + md5sum now accepts the --tag option to print BSD-style output with GNU + file name escaping. This also affects sha1sum, sha224sum, sha256sum, + sha384sum and sha512sum. + +** Bug fixes + + cp could read from freed memory and could even make corrupt copies. + This could happen with a very fragmented and sparse input file, + on GNU/Linux file systems supporting fiemap extent scanning. + This bug also affects mv when it resorts to copying, and install. + [bug introduced in coreutils-8.11] + + cp --no-preserve=mode now no longer preserves the original file's + permissions but correctly sets mode specified by 0666 & ~umask + + du no longer emits a "disk-corrupted"-style diagnostic when it detects + a directory cycle that is due to a bind-mounted directory. Instead, + it detects this precise type of cycle, diagnoses it as such and + eventually exits nonzero. + + factor (when using gmp) would mistakenly declare some composite numbers + to be prime, e.g., 465658903, 2242724851, 6635692801 and many more. + The fix makes factor somewhat slower (~25%) for ranges of consecutive + numbers, and up to 8 times slower for some worst-case individual numbers. + [bug introduced in coreutils-7.0, with GNU MP support] + + ls now correctly colors dangling symlinks when listing their containing + directories, with orphaned symlink coloring disabled in LS_COLORS. + [bug introduced in coreutils-8.14] + + rm -i -d now prompts the user then removes an empty directory, rather + than ignoring the -d option and failing with an 'Is a directory' error. + [bug introduced in coreutils-8.19, with the addition of --dir (-d)] + + rm -r S/ (where S is a symlink-to-directory) no longer gives the invalid + "Too many levels of symbolic links" diagnostic. + [bug introduced in coreutils-8.6] + + seq now handles arbitrarily long non-negative whole numbers when the + increment is 1 and when no format-changing option is specified. + Before, this would infloop: + b=100000000000000000000; seq $b $b + [the bug dates back to the initial implementation] + +** Changes in behavior + + nproc now diagnoses with an error, non option command line parameters. + +** Improvements + + factor's core has been rewritten for speed and increased range. + It can now factor numbers up to 2^128, even without GMP support. + Its speed is from a few times better (for small numbers) to over + 10,000 times better (just below 2^64). The new code also runs a + deterministic primality test for each prime factor, not just a + probabilistic test. + + seq is now up to 70 times faster than it was in coreutils-8.19 and prior, + but only with non-negative whole numbers, an increment of 1, and no + format-changing options. + + stat and tail know about ZFS, VZFS and VMHGFS. stat -f --format=%T now + reports the file system type, and tail -f now uses inotify for files on + ZFS and VZFS file systems, rather than the default (for unknown file + system types) of issuing a warning and reverting to polling. tail -f + still uses polling for files on VMHGFS file systems. + +** Build-related + + root-only tests now check for permissions of our dummy user, + $NON_ROOT_USERNAME, before trying to run binaries from the build directory. + Before, we would get hard-to-diagnose reports of failing root-only tests. + Now, those tests are skipped with a useful diagnostic when the root tests + are run without following the instructions in README. + + We now build most directories using non-recursive make rules. I.e., + rather than running make in man/, lib/, src/, tests/, instead, the top + level Makefile.am includes a $dir/local.mk that describes how to build + the targets in the corresponding directory. Two directories remain + unconverted: po/, gnulib-tests/. One nice side-effect is that the more + accurate dependencies have eliminated a nagging occasional failure that + was seen when running parallel "make syntax-check". + + +* Noteworthy changes in release 8.19 (2012-08-20) [stable] + +** Bug fixes + + df now fails when the list of mounted file systems (/etc/mtab) cannot + be read, yet the file system type information is needed to process + certain options like -a, -l, -t and -x. + [This bug was present in "the beginning".] + + sort -u could fail to output one or more result lines. + For example, this command would fail to print "1": + (yes 7 | head -11; echo 1) | sort --p=1 -S32b -u + [bug introduced in coreutils-8.6] + + sort -u could read freed memory. + For example, this evokes a read from freed memory: + perl -le 'print "a\n"."0"x900'|valgrind sort --p=1 -S32b -u>/dev/null + [bug introduced in coreutils-8.6] + +** New features + + rm now accepts the --dir (-d) option which makes it remove empty directories. + Since removing empty directories is relatively safe, this option can be + used as a part of the alias rm='rm --dir'. This improves compatibility + with Mac OS X and BSD systems which also honor the -d option. + + +* Noteworthy changes in release 8.18 (2012-08-12) [stable] + +** Bug fixes + + cksum now prints checksums atomically so that concurrent + processes will not intersperse their output. + [the bug dates back to the initial implementation] + + date -d "$(printf '\xb0')" would print 00:00:00 with today's date + rather than diagnosing the invalid input. Now it reports this: + date: invalid date '\260' + [This bug was present in "the beginning".] + + df no longer outputs control characters present in the mount point name. + Such characters are replaced with '?', so for example, scripts consuming + lines output by df, can work reliably. + [This bug was present in "the beginning".] + + df --total now exits with an appropriate diagnostic and error code, when + file system --type options do not lead to a processed file system. + [This bug dates back to when --total was added in coreutils-7.0] + + head --lines=-N (-n-N) now resets the read pointer of a seekable input file. + This means that "head -n-3" no longer consumes all of its input, and lines + not output by head may be processed by other programs. For example, this + command now prints the final line, 2, while before it would print nothing: + seq 2 > k; (head -n-1 > /dev/null; cat) < k + [This bug was present in "the beginning".] + + ls --color would mis-color relative-named symlinks in / + [bug introduced in coreutils-8.17] + + split now ensures it doesn't overwrite the input file with generated output. + [the bug dates back to the initial implementation] + + stat and df now report the correct file system usage, + in all situations on GNU/Linux, by correctly determining the block size. + [df bug since coreutils-5.0.91, stat bug since the initial implementation] + + tail -f no longer tries to use inotify on AUFS or PanFS file systems + [you might say this was introduced in coreutils-7.5, along with inotify + support, but even now, its magic number isn't in the usual place.] + +** New features + + stat -f recognizes the new remote file system types: aufs, panfs. + +** Changes in behavior + + su: this program has been removed. We stopped installing "su" by + default with the release of coreutils-6.9.90 on 2007-12-01. Now, + that the util-linux package has the union of the Suse and Fedora + patches as well as enough support to build on the Hurd, we no longer + have any reason to include it here. + +** Improvements + + sort avoids redundant processing in the presence of inaccessible inputs, + or unwritable output. Sort now diagnoses certain errors at start-up, + rather than after potentially expensive processing. + + sort now allocates no more than 75% of physical memory by default, + to better share system resources, and thus operate more efficiently. + [The default max memory usage changed from 50% to 100% in coreutils-8.16] + + * Noteworthy changes in release 8.17 (2012-05-10) [stable] ** Bug fixes @@ -415,6 +712,10 @@ GNU coreutils NEWS -*- outline -*- join --header now skips the ordering check for the first line even if the other file is empty. [bug introduced in coreutils-8.5] + join -v2 now ensures the default output format prints the match field + at the start of the line when it is different to the match field for + the first file. [bug present in "the beginning".] + rm -f no longer fails for EINVAL or EILSEQ on file systems that reject file names invalid for that file system. @@ -3590,7 +3891,7 @@ packages, see ./old/*/NEWS. ======================================================================== -Copyright (C) 2001-2012 Free Software Foundation, Inc. +Copyright (C) 2001-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 diff --git a/README b/README index 3cc476ae..a7cbacff 100644 --- a/README +++ b/README @@ -11,9 +11,9 @@ The programs that can be built with this package are: 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 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 su sum sync tac tail tee test + 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 @@ -173,10 +173,10 @@ Reporting bugs: IMPORTANT: if you take the time to report a test failure, please be sure to include the output of running 'make check' in verbose mode for each failing test. For example, -if the test that fails is tests/misc/df, then you would +if the test that fails is tests/df/df-P.sh, then you would run this command: - (cd tests && make check TESTS=misc/df VERBOSE=yes) >> log 2>&1 + make check TESTS=tests/df/df-P.sh VERBOSE=yes SUBDIRS=. >> log 2>&1 For some tests, you can get even more detail by adding DEBUG=yes. Then include the contents of the file 'log' in your bug report. @@ -240,7 +240,7 @@ the address on the last line of --help output. ======================================================================== -Copyright (C) 1998-2012 Free Software Foundation, Inc. +Copyright (C) 1998-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 diff --git a/THANKS b/THANKS index fbd78cf7..ab08fd96 100644 --- a/THANKS +++ b/THANKS @@ -7,6 +7,7 @@ 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). 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 @@ -19,6 +20,7 @@ Akim Demaille demaille@inf.enst.fr Alain Magloire alain@qnx.com Alan Curry pacman-cu@kosh.dhis.org Alan Iwi iwi@atm.ox.ac.uk +Alan Jenkins alan-jenkins@tuffmail.co.uk Albert Chin-A-Young china@thewrittenword.com Albert Hopkins ahopkins@dynacare.com Alberto Accomazzi alberto@cfa0.harvard.edu @@ -48,12 +50,15 @@ 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 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 Antonio Rendas ajrendas@yahoo.com Ariel Faigon ariel@cthulhu.engr.sgi.com @@ -125,17 +130,20 @@ Chris Lesniewski ctl@mit.edu Chris Sylvain csylvain@umm.edu Christi Alice Scarborough christi@chiark.greenend.org.uk Christian Harkort christian.harkort@web.de +Christian Jullien eligis@orange.fr 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 Plumb colin@nyx.net -Colin Watson cjw44@riva.ucam.org +Colin Watson cjwatson@ubuntu.com Collin Rogowski collin@rogowski.de Cray-Cyber Project http://www.cray-cyber.org Cristian Cadar cristic@stanford.edu @@ -147,7 +155,9 @@ Dan Hipschman dsh@linux.ucla.edu Daniel Bergstrom noa@melody.se Daniel Dunbar daniel@zuster.org 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 @@ -158,6 +168,7 @@ Dave Beckett dajobe@dajobe.org David Alan Gilbert gilbertd@treblig.org David A. Wheeler dwheeler@dwheeler.com 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 @@ -167,6 +178,7 @@ David Godfrey dave@delta.demon.co.uk 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 Dawson Engler engler@stanford.edu Dean Gaudet dean-savannah@arctic.org Deepak Goel deego@gnufans.org @@ -189,6 +201,7 @@ Dragos Harabor dharabor@us.oracle.com Duncan Roe duncanr@optimation.com.au Ed Avis ed@membled.com Ed Santiago ed@edsantiago.com +Edward Schwartz edmcman@cmu.edu Edward Welbourne eddy@opera.com Edzer Pebesma Edzer.Pebesma@rivm.nl Egmont Koblinger egmont@uhulinux.hu @@ -284,6 +297,7 @@ Ivan Labath labath3@st.fmph.uniba.sk Ivan Sichmann Freitas ivansichfreitas@gmail.com Ivo Timmermans ivo@debian.org Jacky Fong jacky.fong@utoronto.ca +Jakob Truelsen jakob@scalgo.com James Antill jmanti%essex.ac.uk@seralph21.essex.ac.uk James Hunt jamesodhunt@hotmail.com James james@albion.glarp.com @@ -306,6 +320,7 @@ Jari Aalto jari.aalto@cante.net Jarkko Hietaniemi jhi@epsilon.hut.fi Jarod Wilson jwilson@redhat.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 @@ -387,8 +402,10 @@ Kevin Mudrick kmudrick@healthmarketscience.com Kim Hansen kim@i9.dk Kirk Kelsey kirk.kelsey@0x4b.net Kjetil Torgrim Homme kjetilho@ifi.uio.no +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 @@ -407,6 +424,7 @@ 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 @@ -481,10 +499,13 @@ 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 Michael Speer knomenet@gmail.com Michael Steffens michael.steffens@s.netic.de Michael Stone mstone@debian.org +Michael Stummvoll michael@stummi.org Michael Stutz stutz@dsl.org Michael van Elst mlelstv@dev.de.cw.net Michael Veksler mveksler@techunix.technion.ac.il @@ -510,13 +531,18 @@ Nao Nishijima nao.nishijima.xt@hitachi.com Neal H Walfield neal@cs.uml.edu Neil F. Brown neilb@suse.de Nelson H. F. Beebe beebe@math.utah.edu +Nguyễn Thái Ngọc Duy pclouds@gmail.com +Nick Alcock nick.alcock@oracle.com Nick Estes debian@nickstoys.com 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 +Niels Möller nisse@lysator.liu.se Niklas Edmundsson nikke@acc.umu.se Nikola Milutinovic Nikola.Milutinovic@ev.co.yu +Nikolas Kallis nik@nikolaskallis.com +Nikolaus Rath Nikolaus@rath.org Nima Nikzad nnikzad@ucla.edu Nix nix@esperi.org.uk Noah Friedman friedman@splode.com @@ -527,6 +553,7 @@ Olav Morkrid olav@funcom.com Ole Laursen olau@hardworking.dk 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 @@ -554,18 +581,21 @@ Per Starbäck starback@stp.lingfil.uu.se Peter Breitenlohner peb@mppmu.mpg.de Peter Dyballa peter_dyballa@web.de Peter Eriksson peter@ifm.liu.se +Peter Evans peter@ixp.jp Peter Fales psfales@alcatel-lucent.com Peter Horst peter@ointment.org Peter Moulder reiter@netspace.net.au Peter O'Gorman bug-coreutils@mlists.thewrittenword.com 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 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 +Philipp Gortan gortan@gmail.com Philipp Thomas pth@suse.de Philip Rowlands phr@doc.ic.ac.uk Phillip Jones mouse@datastacks.com @@ -574,12 +604,16 @@ Piergiorgio Sartor sartor@sony.de Pieter Bowman bowman@math.utah.edu Piotr Gackiewicz gacek@intertele.pl Piotr Kwapulinski kwap@univ.gda.pl +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 +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 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 Reuben Thomas rrt@sc3d.org @@ -594,6 +628,7 @@ Rick Sladkey jrs@world.std.com Rick Stanley rstanley@rsiny.com Rik Faith faith@cs.unc.edu Risto Kankkunen kankkune@lingsoft.fi +Rob Day robertkday@gmail.com Robert H. de Vries robert@and.nl Robert Lindgren robert@orcafat.com Robert Millan zeratul2@wanadoo.es @@ -635,6 +670,7 @@ 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 +Stephan Krempel krempel@par-tec.com Stephen Depooter sbdep@myrealbox.com Stephen Eglen eglen@pcg.wustl.edu Stephen Gildea gildea@stop.mail-abuse.org @@ -691,10 +727,12 @@ Ton Nijkes ton@murphy.nl Tony Kocurko akocurko@mun.ca 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 -Torbjorn Granlund tege@nada.kth.se +Torbjörn Granlund tg@gmplib.org Torbjorn Lindgren tl@funcom.no Torsten Landschoff torsten@pclab.ifg.uni-kiel.de +Travis Gummels tgummels@redhat.com Tristan Miller psychonaut@nothingisreal.com Tzvi Rotshtein tzvi.ro@gmail.com Ulrich Drepper drepper@gnu.org @@ -726,10 +764,12 @@ Wis Macomson wis.macomson@intel.com Wojciech Purczynski cliph@isec.pl Wolfram Kleff kleff@cs.uni-bonn.de Won-kyu Park wkpark@chem.skku.ac.kr +Xu Zhongxing xu_zhong_xing@163.com Yang Ren ryang@redhat.com Yanko Kaneti yaneti@declera.com 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 Марк Коренберг socketpair@gmail.com diff --git a/THANKS-to-translators b/THANKS-to-translators index 9703d477..99883b1d 100644 --- a/THANKS-to-translators +++ b/THANKS-to-translators @@ -18,7 +18,9 @@ http://translationproject.org/team/fi.html http://translationproject.org/team/fr.html http://translationproject.org/team/ga.html http://translationproject.org/team/gl.html +http://translationproject.org/team/hr.html http://translationproject.org/team/hu.html +http://translationproject.org/team/ia.html http://translationproject.org/team/id.html http://translationproject.org/team/it.html http://translationproject.org/team/ja.html diff --git a/THANKS.in b/THANKS.in index 5c7dde82..67b60b9f 100644 --- a/THANKS.in +++ b/THANKS.in @@ -14,6 +14,7 @@ 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 Davies aaron.davies@gmail.com Aaron Hawley ashawley@uvm.edu Achim Blumensath blume@corona.oche.de Adam Jimerson vendion@charter.net @@ -24,6 +25,7 @@ AIDA Shinra shinra@j10n.org Akim Demaille demaille@inf.enst.fr Alain Magloire alain@qnx.com Alan Iwi iwi@atm.ox.ac.uk +Alan Jenkins alan-jenkins@tuffmail.co.uk Albert Chin-A-Young china@thewrittenword.com Albert Hopkins ahopkins@dynacare.com Alberto Accomazzi alberto@cfa0.harvard.edu @@ -57,6 +59,7 @@ Andrew Tridgell tridge@samba.org Andrey Borzenkov arvidjaar@mail.ru Andries Brouwer Andries.Brouwer@cwi.nl Andy Longton alongton@metamark.com +Anoop Sharma sendtoanoop@gmail.com Anthony Thyssen anthony@griffith.edu.au Antonio Rendas ajrendas@yahoo.com Ariel Faigon ariel@cthulhu.engr.sgi.com @@ -116,15 +119,16 @@ 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 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 Chuck Hedrick hedrick@klinzhai.rutgers.edu +Chusslove Illich caslav.ilic@gmx.net Clark Morgan cmorgan@aracnet.com Clement Wang clem.wang@overture.com Colin Plumb colin@nyx.net -Colin Watson cjw44@riva.ucam.org Collin Rogowski collin@rogowski.de Cray-Cyber Project http://www.cray-cyber.org Cristian Cadar cristic@stanford.edu @@ -136,12 +140,14 @@ Dan Pascu dan@services.iiruc.ro Daniel Bergstrom noa@melody.se Daniel P. Berrangé berrange@redhat.com Daniel Stavrovski d@stavrovski.net +Daniel Tschinder daniel.tschinder@project-a.com Dániel Varga danielv@axelero.hu Danny Levinson danny.levinson@overture.com 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 Diggles david.diggles@dnrm.qld.gov.au David Dyck dcd@tc.fluke.COM David Eisner cradle@umd.edu David Flynn dav@chess.plus.com @@ -150,6 +156,7 @@ David Godfrey dave@delta.demon.co.uk 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 Davide Canova kc.canova@gmail.com Dawson Engler engler@stanford.edu Dean Gaudet dean-savannah@arctic.org @@ -170,6 +177,7 @@ Doug Coleman coleman@iarc1.ece.utexas.edu 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 @@ -272,6 +280,7 @@ Jari Aalto jari.aalto@cante.net Jarkko Hietaniemi jhi@epsilon.hut.fi Jarod Wilson jwilson@redhat.com Jean Charles Delepine delepine@u-picardie.fr +Jean-Pierre Tosoni jpt.7196@gmail.com Jeff Moore jbm@mordor.com Jeff Sheinberg jeff@bsrd.net Jens Elkner elkner@imsgroup.de @@ -286,7 +295,6 @@ Jesse Thilo jgt2@eecs.lehigh.edu Jie Xu xuj@iag.net Jim Blandy jimb@cyclic.com Jim Dennis jimd@starshine.org -Joachim Schmitz jojo@schmitz-digital.de Joakim Rosqvist dvljrt@cs.umu.se Jochen Hein jochen@jochen.org Joe Orton joe@manyfish.co.uk @@ -335,6 +343,7 @@ Keith Thompson kst@cts.com Ken Pizzini kenp@halcyon.com Kevin Mudrick kmudrick@healthmarketscience.com Kirk Kelsey kirk.kelsey@0x4b.net +Konrad Wróblewski coni@o2.pl Kristin E Thomas kristint@us.ibm.com Kjetil Torgrim Homme kjetilho@ifi.uio.no Kristoffer Rose kris@diku.dk @@ -359,6 +368,7 @@ Marc Haber mh+debian-bugs@zugschlus.de Marc Mengel mengel@fnal.gov Marc Lehman schmorp@schmorp.de 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 @@ -419,8 +429,11 @@ Michael J. Croghan mcroghan@usatoday.com Michael J. Daniel michael.j.daniel@comcast.net Michael McFarland sidlon@yahoo.com Michael McLagan mmclagan@invlogic.com +Michael Mol mikemol@gmail.com Michael Piefel piefel@informatik.hu-berlin.de +Michael Price mprice@atl.lmco.com Michael Steffens michael.steffens@s.netic.de +Michael Stummvoll michael@stummi.org Michael Stutz stutz@dsl.org Michael van Elst mlelstv@dev.de.cw.net Michael Veksler mveksler@techunix.technion.ac.il @@ -448,6 +461,7 @@ Nickolai Zeldovich nickolai@cs.stanford.edu Nicolas François nicolas.francois@centraliens.net Niklas Edmundsson nikke@acc.umu.se Nikola Milutinovic Nikola.Milutinovic@ev.co.yu +Nikolaus Rath Nikolaus@rath.org Nima Nikzad nnikzad@ucla.edu Noah Friedman friedman@splode.com Noel Cragg noel@red-bean.com @@ -478,10 +492,12 @@ Per Starbäck starback@stp.lingfil.uu.se Peter Breitenlohner peb@mppmu.mpg.de Peter Dyballa peter_dyballa@web.de Peter Eriksson peter@ifm.liu.se +Peter Evans peter@ixp.jp Peter Horst peter@ointment.org Peter Moulder reiter@netspace.net.au Peter Samuelson psamuels@sampo.creighton.edu Peter Seebach seebs@taniemarie.solon.com +Petr Pisar petr.pisar@atlas.cz Petr Uzel petr.uzel@suse.cz Petter Reinholdtsen pere@hungry.com Phelippe Neveu pneveu@pcigeomatics.com @@ -489,6 +505,7 @@ Phil Richards phil.richards@vf.vodafone.co.uk Philippe De Muyter phdm@macqel.be Philippe Schnoebelen Philippe.Schnoebelen@imag.fr Phillip Jones mouse@datastacks.com +Philipp Gortan gortan@gmail.com Philipp Thomas pth@suse.de Piergiorgio Sartor sartor@sony.de Pieter Bowman bowman@math.utah.edu @@ -496,9 +513,12 @@ Piotr Gackiewicz gacek@intertele.pl Piotr Kwapulinski kwap@univ.gda.pl Prashant TR tr@eth.net Priit Jõerüüt jemm4jemm@yahoo.com +Primoz PETERLIN primozz.peterlin@gmail.com +Raimonds Miltins raimonds@pro-9.com Rainer Orth ro@TechFak.Uni-Bielefeld.DE Ralf W. Stephan stephan@tmt.de 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 Richard A Downing richard.downing@bcs.org.uk @@ -593,10 +613,11 @@ Ton Nijkes ton@murphy.nl Tony Kocurko akocurko@mun.ca 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 -Torbjorn Granlund tege@nada.kth.se Torbjorn Lindgren tl@funcom.no Torsten Landschoff torsten@pclab.ifg.uni-kiel.de +Travis Gummels tgummels@redhat.com Tristan Miller psychonaut@nothingisreal.com Tzvi Rotshtein tzvi.ro@gmail.com Ulrich Drepper drepper@gnu.org @@ -628,6 +649,7 @@ Wis Macomson wis.macomson@intel.com Wojciech Purczynski cliph@isec.pl Wolfram Kleff kleff@cs.uni-bonn.de Won-kyu Park wkpark@chem.skku.ac.kr +Xu Zhongxing xu_zhong_xing@163.com Yang Ren ryang@redhat.com Yanko Kaneti yaneti@declera.com Yann Dirson dirson@debian.org diff --git a/TODO b/TODO index 8a8cf43f..e10da7ca 100644 --- a/TODO +++ b/TODO @@ -37,19 +37,12 @@ printf: consider adding some implementation of the "col" utility Suggested by Karl Berry. -renice: POSIX utility, needs implementing. - suggestion from Karl Berry (among others). - Bob Proulx is working on this. - doc/coreutils.texi: Address this comment: FIXME: mv's behavior in this case is system-dependent Better still: fix the code so it's *not* system-dependent. ls: add --format=FORMAT option that controls how each line is printed. -cp --no-preserve=X should not attempt to preserve attribute X - reported by Andreas Schwab - copy.c: Address the FIXME-maybe comment in copy_internal. And once that's done, add an exclusion so that 'cp --link' no longer incurs the overhead of saving src. dev/ino and dest. filename @@ -78,9 +71,6 @@ unexpand: [http://www.opengroup.org/onlinepubs/007908799/xcu/unexpand.html] printf 'x\t \t y\n'|unexpand -t 8,9 should print its input, unmodified. printf 'x\t \t y\n'|unexpand -t 5,8 should print "x\ty\n" -Let GNU su use the 'wheel' group if appropriate. - (there are a couple patches, already) - sort: Investigate better sorting algorithms; see Knuth vol. 3. We tried list merge sort, but it was about 50% slower than the @@ -125,10 +115,6 @@ Changes expected to go in, someday. an implicit --NO-dereference-command-line-symlink-to-dir meaning. Pointed out by Karl Berry. - dd: consider adding an option to suppress 'bytes/block read/written' - output to stderr. Suggested here: - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=165045 - Pending copyright papers: ------------------------ getpwnam from Bruce Korb @@ -168,7 +154,7 @@ pr's use of nstrftime can make it malloc a very large (up to SIZE_MAX) buffer ----- -Copyright (C) 2002-2012 Free Software Foundation, Inc. +Copyright (C) 2002-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 diff --git a/aclocal.m4 b/aclocal.m4 index cbee0cf6..7be751da 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,7 +1,8 @@ -# generated automatically by aclocal 1.12a -*- Autoconf -*- - -# Copyright (C) 1996-2012 Free Software Foundation, Inc. +# generated automatically by aclocal 1.11.6 -*- Autoconf -*- +# 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. @@ -13,19 +14,20 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69.1-2d4eb],, -[m4_warning([this file was generated for autoconf 2.69.1-2d4eb. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, +[m4_warning([this file was generated for autoconf 2.68. 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-2012 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 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 8 +# serial 1 # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- @@ -33,10 +35,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.]) # 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.12a' +[am__api_version='1.11' 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.12a], [], +m4_if([$1], [1.11.6], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -52,24 +54,24 @@ 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.12a])dnl +[AM_AUTOMAKE_VERSION([1.11.6])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-2012 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 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 2 +# 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 @@ -88,7 +90,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, @@ -114,21 +116,22 @@ am_aux_dir=`cd $ac_aux_dir && pwd` # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2012 Free Software Foundation, Inc. +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 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 10 +# serial 9 # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. AC_DEFUN([AM_CONDITIONAL], -[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_PREREQ(2.52)dnl + ifelse([$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 @@ -147,15 +150,16 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2012 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 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. -# serial 17 +# 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 @@ -165,7 +169,7 @@ fi])]) # _AM_DEPENDENCIES(NAME) # ---------------------- # See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". +# NAME is "CC", "CXX", "GCJ", or "OBJC". # 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 @@ -178,13 +182,12 @@ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl AC_REQUIRE([AM_MAKE_INCLUDE])dnl AC_REQUIRE([AM_DEP_TRACK])dnl -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=]) +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=]) AC_CACHE_CHECK([dependency style of $depcc], [am_cv_$1_dependencies_compiler_type], @@ -192,8 +195,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 @@ -233,16 +236,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 10 /bin/sh. - echo '/* dummy */' > sub/conftst$i.h + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch 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 @@ -251,8 +254,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 @@ -260,7 +263,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} @@ -308,7 +311,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 @@ -318,13 +321,9 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl # AM_DEP_TRACK # ------------ AC_DEFUN([AM_DEP_TRACK], -[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])]) +[AC_ARG_ENABLE(dependency-tracking, +[ --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors]) if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' @@ -339,19 +338,20 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2012 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2001, 2002, 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 7 +#serial 5 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{ - # Older Autoconf quotes --file arguments for eval, but not when files + # Autoconf 2.62 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 +364,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,19 +376,21 @@ 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 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'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`AS_DIRNAME(["$file"])` @@ -406,7 +408,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], @@ -416,13 +418,14 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2012 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005, 2006, 2008, 2009 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 20 +# 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. @@ -439,7 +442,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.65])dnl +[AC_PREREQ([2.62])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 @@ -468,36 +471,31 @@ AC_SUBST([CYGPATH_W]) # Define the identity of the package. dnl Distinguish between old-style and new-style calls. m4_ifval([$2], -[AC_DIAGNOSE([obsolete], -[$0: two- and three-arguments forms are deprecated. For more info, see: -http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_INIT_AUTOMAKE-invocation]) -m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +[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], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), - [ok:ok],, +m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, [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([AC_PROG_MKDIR_P])dnl +AC_REQUIRE([AM_PROG_MKDIR_P])dnl # We need awk for the "check" target. The system "awk" is bad on # some platforms. AC_REQUIRE([AC_PROG_AWK])dnl @@ -508,32 +506,28 @@ _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])], - [m4_define([AC_PROG_CC], - m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl + [_AM_DEPENDENCIES(CC)], + [define([AC_PROG_CC], + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES([CXX])], - [m4_define([AC_PROG_CXX], - m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl + [_AM_DEPENDENCIES(CXX)], + [define([AC_PROG_CXX], + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_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_DEPENDENCIES(OBJC)], + [define([AC_PROG_OBJC], + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl ]) -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 +_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_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 +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], @@ -561,13 +555,14 @@ 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-2012 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2008, 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 8 +# serial 1 # AM_PROG_INSTALL_SH # ------------------ @@ -582,9 +577,9 @@ 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-2012 Free Software Foundation, Inc. +# Copyright (C) 2003, 2005 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -607,13 +602,13 @@ AC_SUBST([am__leading_dot])]) # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2009 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 +# serial 4 # AM_MAKE_INCLUDE() # ----------------- @@ -632,7 +627,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 @@ -657,7 +652,8 @@ AC_MSG_RESULT([$_am_result]) rm -f confinc confmf ]) -# Copyright (C) 1999-2012 Free Software Foundation, Inc. +# 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, @@ -693,13 +689,14 @@ m4_define([AC_PROG_CC], # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2012 Free Software Foundation, Inc. +# Copyright (C) 1997, 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 7 +# serial 6 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -729,21 +726,22 @@ if eval "$MISSING --run true"; then am_missing_run="$MISSING --run " 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-2012 Free Software Foundation, Inc. +# 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 2 +# serial 1 # AM_PROG_MKDIR_P # --------------- -# Check for 'mkdir -p'. +# Check for `mkdir -p'. AC_DEFUN([AM_PROG_MKDIR_P], [AC_PREREQ([2.60])dnl AC_REQUIRE([AC_PROG_MKDIR_P])dnl @@ -763,13 +761,14 @@ esac # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 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 +# serial 5 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -780,7 +779,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) # ------------------------ @@ -796,18 +795,22 @@ AC_DEFUN([_AM_IF_OPTION], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2012 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 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 9 +# serial 5 # 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=' @@ -818,40 +821,32 @@ 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 ( - 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 + 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 + test "$[2]" = conftest.file ) then @@ -861,52 +856,31 @@ else AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi -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 -]) +AC_MSG_RESULT(yes)]) -# Copyright (C) 2009-2012 Free Software Foundation, Inc. +# Copyright (C) 2009, 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 3 +# 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], [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]);; +[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]);; 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} @@ -924,7 +898,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 @@ -941,37 +915,37 @@ AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 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 2 +# 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-2012 Free Software Foundation, Inc. +# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -992,18 +966,18 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2012 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2012 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 +# 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 @@ -1026,7 +1000,7 @@ AC_MSG_CHECKING([how to create a $1 tar archive]) _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 '-'. +# Solaris sh will not grok spaces in the rhs of `-'. for _am_tool in $_am_tools do case $_am_tool in @@ -1134,6 +1108,7 @@ m4_include([m4/exponentd.m4]) m4_include([m4/exponentf.m4]) 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]) @@ -1144,7 +1119,6 @@ m4_include([m4/fcntl-o.m4]) m4_include([m4/fcntl-safer.m4]) m4_include([m4/fcntl.m4]) m4_include([m4/fcntl_h.m4]) -m4_include([m4/fd-reopen.m4]) m4_include([m4/fdatasync.m4]) m4_include([m4/fdopen.m4]) m4_include([m4/fdopendir.m4]) @@ -1159,12 +1133,16 @@ m4_include([m4/fopen.m4]) m4_include([m4/fpending.m4]) m4_include([m4/fpieee.m4]) m4_include([m4/fpurge.m4]) +m4_include([m4/freadahead.m4]) m4_include([m4/freading.m4]) +m4_include([m4/freadptr.m4]) +m4_include([m4/freadseek.m4]) m4_include([m4/freopen.m4]) m4_include([m4/frexp.m4]) m4_include([m4/frexpl.m4]) m4_include([m4/fseek.m4]) m4_include([m4/fseeko.m4]) +m4_include([m4/fseterr.m4]) m4_include([m4/fstat.m4]) m4_include([m4/fstatat.m4]) m4_include([m4/fstypename.m4]) @@ -1240,7 +1218,6 @@ m4_include([m4/lchown.m4]) m4_include([m4/lcmessage.m4]) m4_include([m4/ldexp.m4]) m4_include([m4/ldexpl.m4]) -m4_include([m4/lib-check.m4]) m4_include([m4/lib-ignore.m4]) m4_include([m4/lib-ld.m4]) m4_include([m4/lib-link.m4]) @@ -1304,6 +1281,7 @@ m4_include([m4/netinet_in_h.m4]) m4_include([m4/nl_langinfo.m4]) m4_include([m4/nls.m4]) m4_include([m4/nocrash.m4]) +m4_include([m4/non-recursive-gnulib-prefix-hack.m4]) m4_include([m4/nproc.m4]) m4_include([m4/off_t.m4]) m4_include([m4/open.m4]) @@ -1346,7 +1324,6 @@ m4_include([m4/remove.m4]) m4_include([m4/rename.m4]) m4_include([m4/rewinddir.m4]) m4_include([m4/rmdir.m4]) -m4_include([m4/root-dev-ino.m4]) m4_include([m4/rpmatch.m4]) m4_include([m4/safe-read.m4]) m4_include([m4/safe-write.m4]) @@ -1396,18 +1373,15 @@ 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/strcase.m4]) m4_include([m4/strchrnul.m4]) m4_include([m4/strdup.m4]) m4_include([m4/strerror.m4]) m4_include([m4/strerror_r.m4]) m4_include([m4/strftime.m4]) m4_include([m4/string_h.m4]) -m4_include([m4/strings_h.m4]) m4_include([m4/strncat.m4]) m4_include([m4/strndup.m4]) m4_include([m4/strnlen.m4]) -m4_include([m4/strnumcmp.m4]) m4_include([m4/strpbrk.m4]) m4_include([m4/strsignal.m4]) m4_include([m4/strstr.m4]) @@ -1479,7 +1453,6 @@ m4_include([m4/write-any-file.m4]) m4_include([m4/write.m4]) m4_include([m4/xalloc.m4]) m4_include([m4/xattr.m4]) -m4_include([m4/xfts.m4]) m4_include([m4/xgetcwd.m4]) m4_include([m4/xnanosleep.m4]) m4_include([m4/xsize.m4]) diff --git a/bootstrap b/bootstrap index c496d29f..bee7765f 100755 --- a/bootstrap +++ b/bootstrap @@ -1,10 +1,10 @@ #! /bin/sh # Print a version string. -scriptversion=2012-04-26.13; # UTC +scriptversion=2013-01-20.16; # UTC # Bootstrap this package from checked-out sources. -# Copyright (C) 2003-2012 Free Software Foundation, Inc. +# 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 @@ -77,6 +77,33 @@ Running without arguments will suffice in most cases. EOF } +# warnf_ FORMAT-STRING ARG1... +warnf_ () +{ + warnf_format_=$1 + shift + nl=' +' + case $* in + *$nl*) me_=$(printf "$me"|tr "$nl|" '??') + printf "$warnf_format_" "$@" | sed "s|^|$me_: |" ;; + *) printf "$me: $warnf_format_" "$@" ;; + esac >&2 +} + +# warn_ WORD1... +warn_ () +{ + # If IFS does not start with ' ', set it and emit the warning in a subshell. + case $IFS in + ' '*) warnf_ '%s\n' "$*";; + *) (IFS=' '; warn_ "$@");; + esac +} + +# die WORD1... +die() { warn_ "$@"; exit 1; } + # Configuration. # Name of the Makefile.am @@ -130,7 +157,8 @@ extract_package_name=' p } ' -package=`sed -n "$extract_package_name" configure.ac` || exit +package=$(sed -n "$extract_package_name" configure.ac) \ + || die 'cannot find package name in configure.ac' gnulib_name=lib$package build_aux=build-aux @@ -186,6 +214,8 @@ use_git=true # 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. +# +# FIXME: code duplication, see also gnu-web-doc-update. find_tool () { find_tool_envvar=$1 @@ -203,19 +233,15 @@ find_tool () else find_tool_error_prefix="\$$find_tool_envvar: " fi - if test x"$find_tool_res" = x; then - echo >&2 "$me: one of these is required: $find_tool_names" - exit 1 - fi - ($find_tool_res --version /dev/null 2>&1 || { - echo >&2 "$me: ${find_tool_error_prefix}cannot run $find_tool_res --version" - exit 1 - } + test x"$find_tool_res" != x \ + || die "one of these is required: $find_tool_names" + ($find_tool_res --version /dev/null 2>&1 \ + || die "${find_tool_error_prefix}cannot run $find_tool_res --version" eval "$find_tool_envvar=\$find_tool_res" eval "export $find_tool_envvar" } -# Find sha1sum, named gsha1sum on MacPorts, and shasum on MacOS 10.6. +# 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. @@ -230,7 +256,6 @@ esac test -z "${gnulib_extra_files}" && \ gnulib_extra_files=" $build_aux/install-sh - $build_aux/missing $build_aux/mdate-sh $build_aux/texinfo.tex $build_aux/depcomp @@ -256,7 +281,7 @@ do usage exit;; --gnulib-srcdir=*) - GNULIB_SRCDIR=`expr "X$option" : 'X--gnulib-srcdir=\(.*\)'`;; + GNULIB_SRCDIR=${option#--gnulib-srcdir=};; --skip-po) SKIP_PO=t;; --force) @@ -270,51 +295,45 @@ do --no-git) use_git=false;; *) - echo >&2 "$0: $option: unknown option" - exit 1;; + die "$option: unknown option";; esac done -if $use_git || test -d "$GNULIB_SRCDIR"; then - : -else - echo "$0: Error: --no-git requires --gnulib-srcdir" >&2 - exit 1 -fi +$use_git || test -d "$GNULIB_SRCDIR" \ + || die "Error: --no-git requires --gnulib-srcdir" if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then - echo "$0: Bootstrapping from a non-checked-out distribution is risky." >&2 - exit 1 + die "Bootstrapping from a non-checked-out distribution is risky." fi -# Ensure that lines starting with ! sort last, per gitignore conventions -# for whitelisting exceptions after a more generic blacklist pattern. -sort_patterns() { - sort -u "$@" | sed '/^!/ { - H - d - } - $ { - P - x - s/^\n// - }' | sed '/^$/d' +# Strip blank and comment lines to leave significant entries. +gitignore_entries() { + sed '/^#/d; /^$/d' "$@" } -# If $STR is not already on a line by itself in $FILE, insert it, -# sorting the new contents of the file and replacing $FILE with the result. -insert_sorted_if_absent() { +# If $STR is not already on a line by itself in $FILE, insert it at the start. +# Entries are inserted at the start of the ignore list to ensure existing +# entries starting with ! are not overridden. Such entries support +# whitelisting exceptions after a more generic blacklist pattern. +insert_if_absent() { file=$1 str=$2 test -f $file || touch $file - echo "$str" | sort_patterns - $file | cmp - $file > /dev/null \ - || { echo "$str" | sort_patterns - $file > $file.bak \ - && mv $file.bak $file; } \ - || exit 1 + test -r $file || die "Error: failed to read ignore file: $file" + duplicate_entries=$(gitignore_entries $file | sort | uniq -d) + if [ "$duplicate_entries" ] ; then + 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) + if [ $linesold != $linesnew ] ; then + { echo "$str" | cat - $file > $file.bak && mv $file.bak $file; } \ + || die "insert_if_absent $file $str: failed" + fi } # Adjust $PATTERN for $VC_IGNORE_FILE and insert it with -# insert_sorted_if_absent. +# insert_if_absent. insert_vc_ignore() { vc_ignore_file="$1" pattern="$2" @@ -323,9 +342,9 @@ insert_vc_ignore() { # A .gitignore entry that does not start with '/' applies # recursively to subdirectories, so prepend '/' to every # .gitignore entry. - pattern=`echo "$pattern" | sed s,^,/,`;; + pattern=$(echo "$pattern" | sed s,^,/,);; esac - insert_sorted_if_absent "$vc_ignore_file" "$pattern" + insert_if_absent "$vc_ignore_file" "$pattern" } # Die if there is no AC_CONFIG_AUX_DIR($build_aux) line in configure.ac. @@ -334,11 +353,8 @@ grep '^[ ]*AC_CONFIG_AUX_DIR(\['"$build_aux"'\])' configure.ac \ >/dev/null && found_aux_dir=yes grep '^[ ]*AC_CONFIG_AUX_DIR('"$build_aux"')' configure.ac \ >/dev/null && found_aux_dir=yes -if test $found_aux_dir = no; then - echo "$0: expected line not found in configure.ac. Add the following:" >&2 - echo " AC_CONFIG_AUX_DIR([$build_aux])" >&2 - exit 1 -fi +test $found_aux_dir = yes \ + || die "configure.ac lacks 'AC_CONFIG_AUX_DIR([$build_aux])'; add it" # If $build_aux doesn't exist, create it now, otherwise some bits # below will malfunction. If creating it, also mark it as ignored. @@ -427,7 +443,7 @@ check_versions() { $use_git || continue fi # Honor $APP variables ($TAR, $AUTOCONF, etc.) - appvar=`echo $app | LC_ALL=C tr '[a-z]-' '[A-Z]_'` + appvar=$(echo $app | LC_ALL=C tr '[a-z]-' '[A-Z]_') test "$appvar" = TAR && appvar=AMTAR case $appvar in GZIP) ;; # Do not use $GZIP: it contains gzip options. @@ -442,9 +458,9 @@ check_versions() { # "GNU automake-ng") when asked their version. case $app in automake-ng|aclocal-ng) - app=`echo "$app" | sed 's/-ng$//'` + app=${app%-ng} ($app --version | grep '(GNU automake-ng)') >/dev/null 2>&1 || { - echo "$me: Error: '$app' not found or not from Automake-NG" >&2 + warn_ "Error: '$app' not found or not from Automake-NG" ret=1 continue } ;; @@ -454,20 +470,21 @@ check_versions() { # so we have to rely on $? rather than get_version. $app --version >/dev/null 2>&1 if [ 126 -le $? ]; then - echo "$me: Error: '$app' not found" >&2 + warn_ "Error: '$app' not found" ret=1 fi else # Require app to produce a new enough version string. inst_ver=$(get_version $app) if [ ! "$inst_ver" ]; then - echo "$me: Error: '$app' not found" >&2 + warn_ "Error: '$app' not found" ret=1 else latest_ver=$(sort_ver $req_ver $inst_ver | cut -d' ' -f2) if [ ! "$latest_ver" = "$inst_ver" ]; then - echo "$me: Error: '$app' version == $inst_ver is too old" >&2 - echo " '$app' version >= $req_ver is required" >&2 + warnf_ '%s\n' \ + "Error: '$app' version == $inst_ver is too old" \ + " '$app' version >= $req_ver is required" ret=1 fi fi @@ -512,10 +529,8 @@ esac # When we can deduce that gnulib-tool will require patch, # and when patch is not already listed as a prerequisite, add it, too. -if test ! -d "$local_gl_dir" \ - || find "$local_gl_dir" -name '*.diff' -exec false {} +; then - : -else +if test -d "$local_gl_dir" \ + && ! find "$local_gl_dir" -name '*.diff' -exec false {} +; then case $buildreq in *patch*) ;; *) buildreq="patch - @@ -526,11 +541,10 @@ fi if ! printf "$buildreq" | check_versions; then echo >&2 if test -f README-prereq; then - echo "$0: See README-prereq for how to get the prerequisite programs" >&2 + die "See README-prereq for how to get the prerequisite programs" else - echo "$0: Please install the prerequisite programs" >&2 + die "Please install the prerequisite programs" fi - exit 1 fi echo "$0: Bootstrapping from checked-out $package sources..." @@ -559,7 +573,7 @@ git_modules_config () { test -f .gitmodules && git config --file .gitmodules "$@" } -gnulib_path=`git_modules_config submodule.gnulib.path` +gnulib_path=$(git_modules_config submodule.gnulib.path) test -z "$gnulib_path" && gnulib_path=gnulib # Get gnulib files. @@ -632,10 +646,10 @@ download_po_files() { subdir=$1 domain=$2 echo "$me: getting translations into $subdir for $domain..." - cmd=`printf "$po_download_command_format" "$domain" "$subdir"` + cmd=$(printf "$po_download_command_format" "$domain" "$subdir") eval "$cmd" && return # Fallback to HTTP. - cmd=`printf "$po_download_command_format2" "$subdir" "$domain"` + cmd=$(printf "$po_download_command_format2" "$subdir" "$domain") eval "$cmd" } @@ -658,7 +672,7 @@ update_po_files() { && ls "$ref_po_dir"/*.po 2>/dev/null | sed 's|.*/||; s|\.po$||' > "$po_dir/LINGUAS" || return - langs=`cd $ref_po_dir && echo *.po|sed 's/\.po//g'` + langs=$(cd $ref_po_dir && echo *.po | sed 's/\.po//g') test "$langs" = '*' && langs=x for po in $langs; do case $po in x) continue;; esac @@ -695,18 +709,18 @@ symlink_to_dir() # If the destination directory doesn't exist, create it. # This is required at least for "lib/uniwidth/cjk.h". - dst_dir=`dirname "$dst"` + dst_dir=$(dirname "$dst") if ! test -d "$dst_dir"; then mkdir -p "$dst_dir" # If we've just created a directory like lib/uniwidth, # tell version control system(s) it's ignorable. # FIXME: for now, this does only one level - parent=`dirname "$dst_dir"` + parent=$(dirname "$dst_dir") for dot_ig in x $vc_ignore; do test $dot_ig = x && continue ig=$parent/$dot_ig - insert_vc_ignore $ig `echo "$dst_dir"|sed 's,.*/,,'` + insert_vc_ignore $ig "${dst_dir##*/}" done fi @@ -730,10 +744,10 @@ symlink_to_dir() # so that broken tools aren't confused into skipping needed builds. See # . test -h "$dst" && - src_ls=`ls -diL "$src" 2>/dev/null` && set $src_ls && src_i=$1 && - dst_ls=`ls -diL "$dst" 2>/dev/null` && set $dst_ls && dst_i=$1 && + src_ls=$(ls -diL "$src" 2>/dev/null) && set $src_ls && src_i=$1 && + dst_ls=$(ls -diL "$dst" 2>/dev/null) && set $dst_ls && dst_i=$1 && test "$src_i" = "$dst_i" && - both_ls=`ls -dt "$src" "$dst"` && + both_ls=$(ls -dt "$src" "$dst") && test "X$both_ls" = "X$dst$nl$src" || { dot_dots= case $src in @@ -741,11 +755,10 @@ symlink_to_dir() *) case /$dst/ in *//* | */../* | */./* | /*/*/*/*/*/) - echo >&2 "$me: invalid symlink calculation: $src -> $dst" - exit 1;; - /*/*/*/*/) dot_dots=../../../;; - /*/*/*/) dot_dots=../../;; - /*/*/) dot_dots=../;; + die "invalid symlink calculation: $src -> $dst";; + /*/*/*/*/) dot_dots=../../../;; + /*/*/*/) dot_dots=../../;; + /*/*/) dot_dots=../;; esac;; esac @@ -756,6 +769,22 @@ symlink_to_dir() } } +version_controlled_file() { + parent=$1 + file=$2 + if test -d .git; then + git rm -n "$file" > /dev/null 2>&1 + elif test -d .svn; then + svn log -r HEAD "$file" > /dev/null 2>&1 + elif test -d CVS; then + grep -F "/${file##*/}/" "$parent/CVS/Entries" 2>/dev/null | + grep '^/[^/]*/[0-9]' > /dev/null + else + warn_ "no version control for $file?" + false + 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. @@ -768,43 +797,54 @@ with_gettext=yes grep '^[ ]*AM_GNU_GETTEXT_VERSION(' configure.ac >/dev/null || \ with_gettext=no -if test $with_gettext = yes; then - # Released autopoint has the tendency to install macros that have been - # obsoleted in current gnulib, so run this before gnulib-tool. - echo "$0: $AUTOPOINT --force" - $AUTOPOINT --force || exit -fi +if test $with_gettext = yes || test $use_libtool = 1; then -# Autoreconf runs aclocal before libtoolize, which causes spurious -# warnings if the initial aclocal is confused by the libtoolized -# (or worse out-of-date) macro directory. -# libtoolize 1.9b added the --install option; but we support back -# to libtoolize 1.5.22, where the install action was default. -if test $use_libtool = 1; then - install= - case $($LIBTOOLIZE --help) in - *--install*) install=--install ;; - esac - echo "running: $LIBTOOLIZE $install --copy" - $LIBTOOLIZE $install --copy -fi + tempbase=.bootstrap$$ + trap "rm -f $tempbase.0 $tempbase.1" 1 2 13 15 -version_controlled_file() { - dir=$1 - file=$2 - found=no - if test -d CVS; then - grep -F "/$file/" $dir/CVS/Entries 2>/dev/null | - grep '^/[^/]*/[0-9]' > /dev/null && found=yes - elif test -d .git; then - git rm -n "$dir/$file" > /dev/null 2>&1 && found=yes - elif test -d .svn; then - svn log -r HEAD "$dir/$file" > /dev/null 2>&1 && found=yes - else - echo "$me: no version control for $dir/$file?" >&2 + > $tempbase.0 > $tempbase.1 && + find . ! -type d -print | sort > $tempbase.0 || exit + + if test $with_gettext = yes; then + # Released autopoint has the tendency to install macros that have been + # obsoleted in current gnulib, so run this before gnulib-tool. + echo "$0: $AUTOPOINT --force" + $AUTOPOINT --force || exit fi - test $found = yes -} + + # Autoreconf runs aclocal before libtoolize, which causes spurious + # warnings if the initial aclocal is confused by the libtoolized + # (or worse out-of-date) macro directory. + # libtoolize 1.9b added the --install option; but we support back + # to libtoolize 1.5.22, where the install action was default. + if test $use_libtool = 1; then + install= + case $($LIBTOOLIZE --help) in + *--install*) install=--install ;; + esac + echo "running: $LIBTOOLIZE $install --copy" + $LIBTOOLIZE $install --copy + fi + + find . ! -type d -print | sort >$tempbase.1 + old_IFS=$IFS + IFS=$nl + for file in $(comm -13 $tempbase.0 $tempbase.1); do + IFS=$old_IFS + parent=${file%/*} + version_controlled_file "$parent" "$file" || { + for dot_ig in x $vc_ignore; do + test $dot_ig = x && continue + ig=$parent/$dot_ig + insert_vc_ignore "$ig" "${file##*/}" + done + } + done + IFS=$old_IFS + + rm -f $tempbase.0 $tempbase.1 + trap - 1 2 13 15 +fi # Import from gnulib. @@ -830,11 +870,12 @@ echo "$0: $gnulib_tool $gnulib_tool_options --import ..." $gnulib_tool $gnulib_tool_options --import $gnulib_modules && for file in $gnulib_files; do - symlink_to_dir "$GNULIB_SRCDIR" $file || exit + symlink_to_dir "$GNULIB_SRCDIR" $file \ + || die "failed to symlink $file" done bootstrap_post_import_hook \ - || { echo >&2 "$me: bootstrap_post_import_hook failed"; exit 1; } + || die "bootstrap_post_import_hook failed" # Remove any dangling symlink matching "*.m4" or "*.[ch]" in some # gnulib-populated directories. Such .m4 files would cause aclocal to fail. @@ -848,30 +889,32 @@ find "$m4_base" "$source_base" \ -depth \( -name '*.m4' -o -name '*.[ch]' \) \ -type l -xtype l -delete > /dev/null 2>&1 +# Invoke autoreconf with --force --install to ensure upgrades of tools +# such as ylwrap. +AUTORECONFFLAGS="--verbose --install --force -I $m4_base $ACLOCAL_FLAGS" + # Some systems (RHEL 5) are using ancient autotools, for which the # --no-recursive option had not been invented. Detect that lack and # omit the option when it's not supported. FIXME in 2017: remove this # hack when RHEL 5 autotools are updated, or when they become irrelevant. -no_recursive= case $($AUTORECONF --help) in - *--no-recursive*) no_recursive=--no-recursive;; + *--no-recursive*) AUTORECONFFLAGS="$AUTORECONFFLAGS --no-recursive";; esac # Tell autoreconf not to invoke autopoint or libtoolize; they were run above. -echo "running: AUTOPOINT=true LIBTOOLIZE=true " \ - "$AUTORECONF --verbose --install $no_recursive -I $m4_base $ACLOCAL_FLAGS" -AUTOPOINT=true LIBTOOLIZE=true \ - $AUTORECONF --verbose --install $no_recursive -I $m4_base $ACLOCAL_FLAGS \ - || exit 1 +echo "running: AUTOPOINT=true LIBTOOLIZE=true $AUTORECONF $AUTORECONFFLAGS" +AUTOPOINT=true LIBTOOLIZE=true $AUTORECONF $AUTORECONFFLAGS \ + || die "autoreconf failed" # Get some extra files from gnulib, overriding existing files. for file in $gnulib_extra_files; do case $file in */INSTALL) dst=INSTALL;; - build-aux/*) dst=$build_aux/`expr "$file" : 'build-aux/\(.*\)'`;; + build-aux/*) dst=$build_aux/${file#build-aux/};; *) dst=$file;; esac - symlink_to_dir "$GNULIB_SRCDIR" $file $dst || exit + symlink_to_dir "$GNULIB_SRCDIR" $file $dst \ + || die "failed to symlink $file" done if test $with_gettext = yes; then @@ -887,7 +930,8 @@ if test $with_gettext = yes; then a\ '"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+} } - ' po/Makevars.template >po/Makevars || exit 1 + ' po/Makevars.template >po/Makevars \ + || die 'cannot generate po/Makevars' # If the 'gettext' module is in use, grab the latest Makefile.in.in. # If only the 'gettext-h' module is in use, assume autopoint already @@ -895,7 +939,8 @@ if test $with_gettext = yes; then case $gnulib_modules in *gettext-h*) ;; *gettext*) - cp $GNULIB_SRCDIR/build-aux/po/Makefile.in.in po/Makefile.in.in || exit 1 + cp $GNULIB_SRCDIR/build-aux/po/Makefile.in.in po/Makefile.in.in \ + || die "cannot create po/Makefile.in.in" ;; esac @@ -911,7 +956,8 @@ if test $with_gettext = yes; then a\ '"$XGETTEXT_OPTIONS_RUNTIME"' $${end_of_xgettext_options+} } - ' po/Makevars.template >runtime-po/Makevars || exit 1 + ' po/Makevars.template >runtime-po/Makevars \ + || die 'cannot generate runtime-po/Makevars' # Copy identical files from po to runtime-po. (cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po) diff --git a/bootstrap.conf b/bootstrap.conf index eab66061..bb6c1450 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -1,6 +1,6 @@ # Bootstrap configuration. -# Copyright (C) 2006-2012 Free Software Foundation, Inc. +# Copyright (C) 2006-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 @@ -36,6 +36,7 @@ gnulib_modules=" autobuild backupfile base64 + buffer-lcm c-strcase c-strtod c-strtold @@ -75,6 +76,7 @@ gnulib_modules=" fclose fcntl fcntl-safer + fd-reopen fdatasync fdl fdopen @@ -168,6 +170,7 @@ gnulib_modules=" mountlist mpsort netinet_in + non-recursive-gnulib-prefix-hack nproc obstack parse-datetime @@ -209,6 +212,7 @@ gnulib_modules=" sig2str sigaction ssize_t + statat stat-macros stat-size stat-time @@ -219,6 +223,7 @@ gnulib_modules=" strdup-posix strftime strncat + strnumcmp strpbrk strsignal strtod @@ -258,6 +263,7 @@ gnulib_modules=" write-any-file xalloc xfreopen + xfts xgetcwd xgetgroups xgethostname @@ -309,10 +315,10 @@ gnulib_tool_option_extras="--tests-base=gnulib-tests --with-tests --symlink\ # Build prerequisites buildreq="\ autoconf 2.64 -automake 1.11.1 +automake 1.11.2 autopoint - bison - -gettext 0.17 +gettext 0.18.1 git 1.4.4 gperf - gzip - @@ -324,8 +330,23 @@ tar - xz - " -# Automake requires that ChangeLog exist. -touch ChangeLog || exit 1 +bootstrap_post_import_hook () +{ + # Automake requires that ChangeLog exist. + touch ChangeLog || return 1 + # List of coreutils programs. See heading comments in the invoked + # script for more info. Keep this in sync with the rules in + (m4f=m4/cu-progs.m4 mkf=src/cu-progs.mk tmp=cu-progs.tmp \ + && rm -f $m4f $mkf $tmp-1 $tmp-2 \ + && build-aux/gen-lists-of-programs.sh --autoconf >$tmp-1 \ + && build-aux/gen-lists-of-programs.sh --automake >$tmp-2 \ + && chmod a-w $tmp-1 $tmp-2 \ + && mv -f $tmp-1 $m4f && mv -f $tmp-2 $mkf) + + # Massage lib/gnulib.mk before using it later in the bootstrapping process. + build-aux/prefix-gnulib-mk --lib-name=$gnulib_name lib/$gnulib_mk +} + bootstrap_epilogue() { diff --git a/build-aux/ChangeLog-2007 b/build-aux/ChangeLog-2007 index 3b3d11f5..31397140 100644 --- a/build-aux/ChangeLog-2007 +++ b/build-aux/ChangeLog-2007 @@ -234,7 +234,7 @@ ----- - Copyright (C) 2002-2012 Free Software Foundation, Inc. + Copyright (C) 2002-2013 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 8c6ed368..3a64ec65 100755 --- a/build-aux/announce-gen +++ b/build-aux/announce-gen @@ -3,13 +3,13 @@ eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}' if 0; # Generate a release announcement message. -my $VERSION = '2012-04-19 14:36'; # UTC +my $VERSION = '2012-06-08 06:53'; # UTC # The definition above must lie within the first 8 lines in order # for the Emacs time-stamp write hook (at end) to update it. # If you change this file with Emacs, please let the write hook # do its job. Otherwise, update this string manually. -# Copyright (C) 2002-2012 Free Software Foundation, Inc. +# Copyright (C) 2002-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 @@ -38,6 +38,7 @@ use POSIX qw(strftime); my %valid_release_types = map {$_ => 1} qw (alpha beta stable); my @archive_suffixes = ('tar.gz', 'tar.bz2', 'tar.lzma', 'tar.xz'); +my $srcdir = '.'; sub usage ($) { @@ -52,7 +53,7 @@ sub usage ($) my @types = sort keys %valid_release_types; print $STREAM < \$mail_headers, @@ -379,6 +391,7 @@ sub get_tool_versions ($$) 'gpg-key-id=s' => \$gpg_key_id, 'url-directory=s' => \@url_dir_list, 'news=s' => \@news_file, + 'srcdir=s' => \$srcdir, 'bootstrap-tools=s' => \$bootstrap_tools, 'gnulib-version=s' => \$gnulib_version, 'print-checksums!' => \$print_checksums_p, @@ -389,32 +402,32 @@ sub get_tool_versions ($$) ) or usage 1; my $fail = 0; - # Ensure that sure each required option is specified. + # Ensure that each required option is specified. $release_type - or (warn "$ME: release type not specified\n"), $fail = 1; + or (warn "release type not specified\n"), $fail = 1; $package_name - or (warn "$ME: package name not specified\n"), $fail = 1; + or (warn "package name not specified\n"), $fail = 1; $prev_version - or (warn "$ME: previous version string not specified\n"), $fail = 1; + or (warn "previous version string not specified\n"), $fail = 1; $curr_version - or (warn "$ME: current version string not specified\n"), $fail = 1; + or (warn "current version string not specified\n"), $fail = 1; $gpg_key_id - or (warn "$ME: GnuPG key ID not specified\n"), $fail = 1; + or (warn "GnuPG key ID not specified\n"), $fail = 1; @url_dir_list - or (warn "$ME: URL directory name(s) not specified\n"), $fail = 1; + or (warn "URL directory name(s) not specified\n"), $fail = 1; my @tool_list = split ',', $bootstrap_tools; grep (/^gnulib$/, @tool_list) ^ defined $gnulib_version - and (warn "$ME: when specifying gnulib as a tool, you must also specify\n" + 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} - or (warn "$ME: '$release_type': invalid release type\n"), $fail = 1; + or (warn "'$release_type': invalid release type\n"), $fail = 1; @ARGV - and (warn "$ME: too many arguments:\n", join ("\n", @ARGV), "\n"), + and (warn "too many arguments:\n", join ("\n", @ARGV), "\n"), $fail = 1; $fail and usage 1; diff --git a/build-aux/compile b/build-aux/compile index bac481cd..862a14e8 100755 --- a/build-aux/compile +++ b/build-aux/compile @@ -1,10 +1,10 @@ #! /bin/sh -# Wrapper for compilers which do not understand `-c -o'. +# Wrapper for compilers which do not understand '-c -o'. -scriptversion=2010-11-15.09; # UTC +scriptversion=2012-03-05.13; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free +# Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -40,7 +40,7 @@ file_conv= # func_file_conv build_file lazy # Convert a $build file to $host form and store it in $file -# Currently only supports Win32 hosts. If the determined conversion +# Currently only supports Windows hosts. If the determined conversion # type is listed in (the comma separated) LAZY, no conversion will # take place. func_file_conv () @@ -79,6 +79,48 @@ func_file_conv () esac } +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + # func_cl_wrapper cl arg... # Adjust compile command to suit cl func_cl_wrapper () @@ -94,7 +136,7 @@ func_cl_wrapper () else case $1 in -o) - # configure might choose to run compile as `compile cc -o foo foo.c'. + # configure might choose to run compile as 'compile cc -o foo foo.c'. eat=1 case $2 in *.o | *.[oO][bB][jJ]) @@ -109,43 +151,34 @@ func_cl_wrapper () ;; esac ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; -I*) func_file_conv "${1#-I}" mingw set x "$@" -I"$file" shift ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; -l*) - lib=${1#-l} - found=no - save_IFS=$IFS - IFS=';' - for dir in $lib_path $LIB - do - IFS=$save_IFS - if $shared && test -f "$dir/$lib.dll.lib"; then - found=yes - set x "$@" "$dir/$lib.dll.lib" - break - fi - if test -f "$dir/$lib.lib"; then - found=yes - set x "$@" "$dir/$lib.lib" - break - fi - done - IFS=$save_IFS - - test "$found" != yes && set x "$@" "$lib.lib" + func_cl_dashl "${1#-l}" + set x "$@" "$lib" shift ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; -L*) - func_file_conv "${1#-L}" - if test -z "$lib_path"; then - lib_path=$file - else - lib_path="$lib_path;$file" - fi - linker_opts="$linker_opts -LIBPATH:$file" + func_cl_dashL "${1#-L}" ;; -static) shared=false @@ -196,19 +229,19 @@ eat= case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + echo "$0: No command. Try '$0 --help' for more information." 1>&2 exit 1; ;; -h | --h*) cat <<\EOF Usage: compile [--help] [--version] PROGRAM [ARGS] -Wrapper for compilers which do not understand `-c -o'. -Remove `-o dest.o' from ARGS, run PROGRAM with the remaining +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining arguments, and rename the output as expected. If you are trying to build a whole package this is not the -right script to run: please start by reading the file `INSTALL'. +right script to run: please start by reading the file 'INSTALL'. Report bugs to . EOF @@ -233,8 +266,8 @@ do else case $1 in -o) - # configure might choose to run compile as `compile cc -o foo foo.c'. - # So we strip `-o arg' only if arg is an object. + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. eat=1 case $2 in *.o | *.obj) @@ -261,10 +294,10 @@ do done if test -z "$ofile" || test -z "$cfile"; then - # If no `-o' option was seen then we might have been invoked from a + # If no '-o' option was seen then we might have been invoked from a # pattern rule where we don't need one. That is ok -- this is a # normal compilation that the losing compiler can handle. If no - # `.c' file was seen then we are probably linking. That is also + # '.c' file was seen then we are probably linking. That is also # ok. exec "$@" fi @@ -273,7 +306,7 @@ fi cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` # Create the lock directory. -# Note: use `[/\\:.-]' here to ensure that we don't use the same name +# Note: use '[/\\:.-]' here to ensure that we don't use the same name # that we are using for the .o file. Also, base the name on the expected # object file name, since that is what matters with a parallel build. lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d diff --git a/build-aux/config.guess b/build-aux/config.guess index d622a44e..6ea34545 100755 --- a/build-aux/config.guess +++ b/build-aux/config.guess @@ -1,14 +1,12 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2012-02-10' +timestamp='2013-02-04' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# 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 @@ -22,19 +20,17 @@ timestamp='2012-02-10' # 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. - - -# Originally written by Per Bothner. Please send patches (context -# diff format) to and include a ChangeLog -# entry. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). # -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. +# Originally written by Per Bothner. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# +# Please send patches with a ChangeLog entry to config-patches@gnu.org. + me=`echo "$0" | sed -e 's,.*/,,'` @@ -54,9 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-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." @@ -200,6 +194,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} @@ -302,7 +300,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) + arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) @@ -801,6 +799,9 @@ EOF i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; @@ -1201,6 +1202,9 @@ EOF BePC:Haiku:*:*) # Haiku running on Intel PC compatible. echo i586-pc-haiku exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1256,7 +1260,7 @@ EOF NEO-?:NONSTOP_KERNEL:*:*) echo neo-tandem-nsk${UNAME_RELEASE} exit ;; - NSE-?:NONSTOP_KERNEL:*:*) + NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; NSR-?:NONSTOP_KERNEL:*:*) @@ -1330,9 +1334,6 @@ EOF exit ;; esac -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - eval $set_cc_for_build cat >$dummy.c <, 1996 # diff --git a/build-aux/config.sub b/build-aux/config.sub index 59bb593f..80211d0d 100755 --- a/build-aux/config.sub +++ b/build-aux/config.sub @@ -1,24 +1,18 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2012-04-18' +timestamp='2013-02-04' -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. -# -# This file is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 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. +# 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 . @@ -26,11 +20,12 @@ timestamp='2012-04-18' # 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. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches to . Submit a context -# diff and a properly formatted GNU ChangeLog entry. +# Please send patches with a ChangeLog entry to config-patches@gnu.org. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -73,9 +68,7 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-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." @@ -123,7 +116,7 @@ esac maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) @@ -156,7 +149,7 @@ case $os in -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze) + -apple | -axis | -knuth | -cray | -microblaze*) os= basic_machine=$1 ;; @@ -259,8 +252,10 @@ 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 | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ - | be32 | be64 \ + | arc \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | be32 | be64 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ @@ -273,7 +268,7 @@ case $basic_machine in | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -291,13 +286,14 @@ case $basic_machine in | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | moxie \ | mt \ | msp430 \ | nds32 | nds32le | nds32be \ - | nios | nios2 \ + | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ | open8 \ | or32 \ @@ -389,7 +385,8 @@ case $basic_machine in | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -407,12 +404,13 @@ case $basic_machine in | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \ | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ | orion-* \ @@ -788,9 +786,13 @@ case $basic_machine in basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze*) basic_machine=microblaze-xilinx ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; mingw32) basic_machine=i386-pc os=-mingw32 @@ -1019,7 +1021,11 @@ case $basic_machine in basic_machine=i586-unknown os=-pw32 ;; - rdos) + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) basic_machine=i386-pc os=-rdos ;; @@ -1346,21 +1352,21 @@ case $os in -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* \ + | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ + | -bitrig* | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-uclibc* \ + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1492,9 +1498,6 @@ case $os in -aros*) os=-aros ;; - -kaos*) - os=-kaos - ;; -zvmoe) os=-zvmoe ;; @@ -1543,6 +1546,9 @@ case $basic_machine in c4x-* | tic4x-*) os=-coff ;; + hexagon-*) + os=-elf + ;; tic54x-*) os=-coff ;; diff --git a/build-aux/cvsu b/build-aux/cvsu deleted file mode 100755 index 741f6b23..00000000 --- a/build-aux/cvsu +++ /dev/null @@ -1,512 +0,0 @@ -#! /usr/bin/perl -w - -# cvsu - do a quick check to see what files are out of date. -# -# Copyright (C) 2000-2005 Pavel Roskin -# Initially written by Tom Tromey -# Completely rewritten by Pavel Roskin -# -# This 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 . - - -require 5.004; -use Getopt::Long; -use File::Basename; -use Time::Local; -use strict; - -use vars qw($list_types %messages %options @batch_list $batch_cmd - $no_recurse $explain_type $find_mode $short_print - $no_cvsignore $nolinks $file $single_filename $curr_dir - @common_ignores $ignore_rx %entries %subdirs %removed); - -use constant SUBDIR_FOUND => 1; -use constant SUBDIR_CVS => 2; - -# This list comes from the CVS manual. -use constant STANDARD_IGNORES => - ('RCS', 'SCCS', 'CVS', 'CVS.adm', 'RCSLOG', 'cvslog.*', 'tags', - 'TAGS', '.make.state', '.nse_depinfo', '*~', '#*', '.#*', ',*', - "_\$*", "*\$", '*.old', '*.bak', '*.BAK', '*.orig', '*.rej', - '.del-*', '*.a', '*.olb', '*.o', '*.obj', '*.so', '*.exe', - '*.Z', '*.elc', '*.ln', 'core'); - -# 3-letter month names in POSIX locale, for fast date decoding -my %months = ( - "Jan" => 0, - "Feb" => 1, - "Mar" => 2, - "Apr" => 3, - "May" => 4, - "Jun" => 5, - "Jul" => 6, - "Aug" => 7, - "Sep" => 8, - "Oct" => 9, - "Nov" => 10, - "Dec" => 11 -); - -# print usage information and exit -sub usage () -{ - print "Usage:\n" . - " cvsu [OPTIONS] [FILE] ...\n" . - "Options:\n" . - " --local Disable recursion\n" . - " --explain Verbosely print status of files\n" . - " --find Emulate find - filenames only\n" . - " --short Don't print paths\n" . - " --ignore Don't read .cvsignore\n" . - " --messages List known file types and long messages\n" . - " --nolinks Disable recognizing hard and soft links\n" . - " --types=[^]LIST Print only file types [not] from LIST\n" . - " --batch=COMMAND Execute this command on files\n" . - " --help Print this usage information\n" . - " --version Print version number\n" . - "Abbreviations and short options are supported\n"; - exit 0; -} - -# print version information and exit -sub version () -{ - print "cvsu - CVS offline examiner, version 0.2.3\n"; - exit 0; -} - -# If types begin with '^', make inversion -sub adjust_types () -{ - if ($list_types =~ m{^\^(.*)$}) { - $list_types = ""; - foreach (keys %messages) { - $list_types .= $_ - if (index ($1, $_) < 0); - } - } -} - -# list known messages and exit -sub list_messages () -{ - my $default_mark; - print "Recognizable file types are:\n"; - foreach (sort keys %messages) { - if (index($list_types, $_) >= 0) { - $default_mark = "*"; - } else { - $default_mark = " "; - } - print " $default_mark $_ $messages{$_}\n"; - } - print "* indicates file types listed by default\n"; - exit 0; -} - -# Initialize @common_ignores -# Also read $HOME/.cvsignore and append it to @common_ignores -sub init_ignores () -{ - my $HOME = $ENV{"HOME"}; - - push @common_ignores, STANDARD_IGNORES; - - unless (defined($HOME)) { - return; - } - - my $home_cvsignore = "${HOME}/.cvsignore"; - - if (-f "$home_cvsignore") { - - unless (open (CVSIGNORE, "< $home_cvsignore")) { - error ("couldn't open $home_cvsignore: $!"); - } - - while () { - push (@common_ignores, split); - } - - close (CVSIGNORE); - } - - my $CVSIGNOREENV = $ENV{"CVSIGNORE"}; - - unless (defined($CVSIGNOREENV)) { - return; - } - - my @ignores_var = split (/ /, $CVSIGNOREENV); - push (@common_ignores, @ignores_var); - -} - -# Print message and exit (like "die", but without raising an exception). -# Newline is added at the end. -sub error ($) -{ - print STDERR "cvsu: ERROR: " . shift(@_) . "\n"; - exit 1; -} - -# execute commands from @exec_list with $exec_cmd -sub do_batch () -{ - my @cmd_list = split (' ', $batch_cmd); - system (@cmd_list, @batch_list); -} - -# print files status -# Parameter 1: status in one-letter representation -sub file_status ($) -{ - my $type = shift (@_); - my $item; - my $pathfile; - - return - if $ignore_rx ne '' && $type =~ /[?SLD]/ && $file =~ /$ignore_rx/; - - return - if (index($list_types, $type) < 0); - - $pathfile = $curr_dir . $file; - - if (defined($batch_cmd)) { - push (@batch_list, $pathfile); - # 1000 items in the command line might be too much for HP-UX - if ($#batch_list > 1000) { - do_batch(); - undef @batch_list; - } - } - - if ($short_print) { - $item = $file; - } else { - $item = $pathfile; - } - - if ($find_mode) { - print "$item\n"; - } else { - $type = $messages{$type} - if ($explain_type); - print "$type $item\n"; - } -} - -# load entries from CVS/Entries and CVS/Entries.Log -# Parameter 1: file name for CVS/Entries -# Return: list of entries in the format used in CVS/Entries -sub load_entries ($); -sub load_entries ($) -{ - my $entries_file = shift (@_); - my $entries_log_file = "$entries_file.Log"; - my %ent = (); - - unless (open (ENTRIES, "< $entries_file")) { - error ("couldn't open $entries_file: $!"); - } - while () { - chomp; - $ent{$_} = 1; - } - close (ENTRIES); - - if (open (ENTRIES, "< $entries_log_file")) { - while () { - chomp; - if ( m{^A (.+)} ) { - $ent{$1} = 1; - } elsif ( m{^R (.+)} ) { - delete $ent{$1}; - } else { - # Note: "cvs commit" helps even when you are offline - error ("$entries_log_file:$.: unrecognizable line, " . - "try \"cvs commit\""); - } - } - close (ENTRIES); - } - - return keys %ent; -} - -# process one directory -# Parameter 1: directory name -sub process_arg ($); -sub process_arg ($) -{ - my $arg = shift (@_); - my %found_files = (); - - # $file, $curr_dir, and $ignore_rx must be seen in file_status - local $file = ""; - local $ignore_rx = ""; - local $single_filename = 0; - - if ( $arg eq "" or -d $arg ) { - $curr_dir = $arg; - my $real_curr_dir = $curr_dir eq "" ? "." : $curr_dir; - - error ("$real_curr_dir is not a directory") - unless ( -d $real_curr_dir ); - - # Scan present files. - file_status ("."); - opendir (DIR, $real_curr_dir) || - error ("couldn't open directory $real_curr_dir: $!"); - foreach (readdir (DIR)) { - $found_files {$_} = 1; - } - closedir (DIR); - } else { - $single_filename = basename $arg; - $curr_dir = dirname $arg; - $found_files{$single_filename} = 1 if lstat $arg; - } - - $curr_dir .= "/" - unless ( $curr_dir eq "" || $curr_dir =~ m{/$} ); - - # Scan CVS/Entries. - my %entries = (); - my %subdirs = (); - my %removed = (); - - foreach ( load_entries ("${curr_dir}CVS/Entries") ) { - if ( m{^D/([^/]+)/} ) { - $subdirs{$1} = SUBDIR_FOUND if !$single_filename; - } elsif ( m{^/([^/]+)/([^/])[^/]*/([^/]*)/} ) { - if ( !$single_filename or $single_filename eq $1 ) { - $entries{$1} = $3; - $removed{$1} = 1 - if $2 eq '-'; - } - } elsif ( m{^D$} ) { - next; - } else { - error ("${curr_dir}CVS/Entries: unrecognizable line"); - } - } - - if ( $single_filename && !$entries{$single_filename} && - !$found_files{$single_filename} ) { - error ("nothing known about $arg"); - } - - # Scan .cvsignore if any - unless ($no_cvsignore) { - my (@ignore_list) = (); - - if (-f "${curr_dir}.cvsignore") { - open (CVSIGNORE, "< ${curr_dir}.cvsignore") - || error ("couldn't open ${curr_dir}.cvsignore: $!"); - while () { - push (@ignore_list, split); - } - close (CVSIGNORE); - } - - my ($iter); - foreach $iter (@ignore_list, @common_ignores) { - if ($iter eq '!') { - $ignore_rx = '' - } else { - if ($ignore_rx eq '') { - $ignore_rx = '^('; - } else { - $ignore_rx .= '|'; - } - $ignore_rx .= glob_to_rx ($iter); - } - } - $ignore_rx .= ')$' - if $ignore_rx ne ''; - } - - # File is missing - foreach $file (sort keys %entries) { - unless ($found_files{$file}) { - if ($removed{$file}) { - file_status("R"); - } else { - file_status("U"); - } - } - } - - foreach $file (sort keys %found_files) { - next if ($file eq '.' || $file eq '..'); - lstat ($curr_dir . $file) || - error ("lstat() failed on $curr_dir . $file"); - if (! $nolinks && -l _) { - file_status ("L"); - } elsif (-d _) { - if ($file eq 'CVS') { - file_status ("C"); - } elsif ($subdirs{$file}) { - $subdirs{$file} = SUBDIR_CVS; - } else { - file_status ("D"); # Unknown directory - } - } elsif (! (-f _) && ! (-l _)) { - file_status ("S"); # This must be something very special - } elsif (! $nolinks && (stat _) [3] > 1 ) { - file_status ("H"); # Hard link - } elsif (! $entries{$file}) { - file_status ("?"); - } elsif ($entries{$file} =~ /^Initial |^dummy /) { - file_status ("A"); - } elsif ($entries{$file} =~ /^Result of merge/) { - file_status ("G"); - } elsif ($entries{$file} !~ - /^(...) (...) (..) (..):(..):(..) (....)$/) { - error ("Invalid timestamp for $curr_dir$file: $entries{$file}"); - } else { - my $cvtime = timegm($6, $5, $4, $3, $months{$2}, $7 - 1900); - my $mtime = (stat _) [9]; - if ($cvtime == $mtime) { - file_status ("F"); - } elsif ($cvtime < $mtime) { - file_status ("M"); - } else { - file_status ("O"); - } - } - } - - # Now do directories. - unless ($no_recurse) { - my $save_curr_dir = $curr_dir; - foreach $file (sort keys %subdirs) { - if ($subdirs{$file} == SUBDIR_FOUND) { - $curr_dir = $save_curr_dir; - file_status ("X"); - } elsif ($subdirs{$file} == SUBDIR_CVS) { - process_arg ($save_curr_dir . $file) - } - } - } -} - -# Turn a glob into a regexp without recognizing square brackets. -sub glob_to_rx_simple ($) -{ - my ($expr) = @_; - # Quote all non-word characters, convert ? to . and * to .* - $expr =~ s/(\W)/\\$1/g; - $expr =~ s/\\\*/.*/g; - $expr =~ s/\\\?/./g; - return $expr; -} - -# Turn a glob into a regexp -sub glob_to_rx ($) -{ - my $result = ''; - my ($expr) = @_; - # Find parts in square brackets and copy them literally - # Text outside brackets is processed by glob_to_rx_simple() - while ($expr ne '') { - if ($expr =~ /^(.*?)(\[.*?\])(.*)/) { - $expr = $3; - $result .= glob_to_rx_simple ($1) . $2; - } else { - $result .= glob_to_rx_simple ($expr); - last; - } - } - return $result; -} - -sub Main () -{ - # types of files to be listed - $list_types = "^.FCL"; - - # long status messages - %messages = ( - "?" => "Unlisted file", - "." => "Known directory", - "F" => "Up-to-date file", - "C" => "CVS admin directory", - "M" => "Modified file", - "S" => "Special file", - "D" => "Unlisted directory", - "L" => "Symbolic link", - "H" => "Hard link", - "U" => "Lost file", - "X" => "Lost directory", - "A" => "Newly added", - "O" => "Older copy", - "G" => "Result of merge", - "R" => "Removed file" - ); - - undef @batch_list; # List of files for batch processing - undef $batch_cmd; # Command to be executed on files - $no_recurse = 0; # If this is set, do only local files - $explain_type = 0; # Verbosely print status of files - $find_mode = 0; # Don't print status at all - $short_print = 0; # Print only filenames without path - $no_cvsignore = 0; # Ignore .cvsignore - $nolinks = 0; # Do not test for soft- or hard-links - my $want_msg = 0; # List possible filetypes and exit - my $want_help = 0; # Print help and exit - my $want_ver = 0; # Print version and exit - - my %options = ( - "types=s" => \$list_types, - "batch=s" => \$batch_cmd, - "local" => \$no_recurse, - "explain" => \$explain_type, - "find" => \$find_mode, - "short" => \$short_print, - "ignore" => \$no_cvsignore, - "messages" => \$want_msg, - "nolinks" => \$nolinks, - "help" => \$want_help, - "version" => \$want_ver - ); - - GetOptions(%options); - - adjust_types(); - - list_messages() if $want_msg; - usage() if $want_help; - version() if $want_ver; - - unless ($no_cvsignore) { - init_ignores(); - } - - if ($#ARGV < 0) { - @ARGV = (""); - } - - foreach (@ARGV) { - process_arg ($_); - } - - if ($#batch_list >= 0) { - do_batch(); - } -} - -Main(); diff --git a/build-aux/depcomp b/build-aux/depcomp index debb6ffa..91d4bf83 100755 --- a/build-aux/depcomp +++ b/build-aux/depcomp @@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2012-03-27.16; # UTC +scriptversion=2012-10-18.11; # UTC -# Copyright (C) 1999-2012 Free Software Foundation, Inc. +# Copyright (C) 1999-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 @@ -27,9 +27,9 @@ scriptversion=2012-03-27.16; # UTC case $1 in '') - echo "$0: No command. Try '$0 --help' for more information." 1>&2 - exit 1; - ;; + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; -h | --h*) cat <<\EOF Usage: depcomp [--help] [--version] PROGRAM [ARGS] @@ -56,11 +56,65 @@ EOF ;; esac +# Get the directory component of the given path, and save it in the +# global variables '$dir'. Note that this directory component will +# be either empty or ending with a '/' character. This is deliberate. +set_dir_from () +{ + case $1 in + */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; + *) dir=;; + esac +} + +# Get the suffix-stripped basename of the given path, and save it the +# global variable '$base'. +set_base_from () +{ + base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` +} + +# If no dependency file was actually created by the compiler invocation, +# we still have to create a dummy depfile, to avoid errors with the +# Makefile "include basename.Plo" scheme. +make_dummy_depfile () +{ + echo "#dummy" > "$depfile" +} + +# Factor out some common post-processing of the generated depfile. +# Requires the auxiliary global variable '$tmpdepfile' to be set. +aix_post_process_depfile () +{ + # If the compiler actually managed to produce a dependency file, + # post-process it. + if test -f "$tmpdepfile"; then + # Each line is of the form 'foo.o: dependency.h'. + # Do two passes, one to just change these to + # $object: dependency.h + # and one to simply output + # dependency.h: + # which is needed to avoid the deleted-header problem. + { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" + sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" + } > "$depfile" + rm -f "$tmpdepfile" + else + make_dummy_depfile + fi +} + # A tabulation character. tab=' ' # A newline character. nl=' ' +# Character ranges might be problematic outside the C locale. +# These definitions help. +upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ +lower=abcdefghijklmnopqrstuvwxyz +digits=0123456789 +alpha=${upper}${lower} if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 @@ -74,6 +128,9 @@ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} rm -f "$tmpdepfile" +# Avoid interferences from the environment. +gccflag= dashmflag= + # Some modes work just like other modes, but use different flags. We # parameterize here, but still list the modes in the big case below, # to make depend.m4 easier to write. Note that we *cannot* use a case @@ -85,32 +142,32 @@ if test "$depmode" = hp; then fi if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout fi cygpath_u="cygpath -u -f -" if test "$depmode" = msvcmsys; then - # This is just like msvisualcpp but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvisualcpp + # This is just like msvisualcpp but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvisualcpp fi if test "$depmode" = msvc7msys; then - # This is just like msvc7 but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvc7 + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 fi if test "$depmode" = xlc; then - # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations. - gccflag=-qmakedep=gcc,-MF - depmode=gcc + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. + gccflag=-qmakedep=gcc,-MF + depmode=gcc fi case "$depmode" in @@ -133,8 +190,7 @@ gcc3) done "$@" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -142,13 +198,17 @@ gcc3) ;; gcc) +## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. +## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. +## (see the conditional assignment to $gccflag above). ## There are various ways to get dependency output from gcc. Here's ## why we pick this rather obscure method: ## - Don't want to use -MD because we'd like the dependencies to end ## up in a subdir. Having to rename by hand is ugly. ## (We might end up doing this anyway to support other compilers.) ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). +## -MM, not -M (despite what the docs say). Also, it might not be +## supported by the other compilers which use the 'gcc' depmode. ## - Using -M directly means running the compiler twice (even worse ## than renaming). if test -z "$gccflag"; then @@ -156,15 +216,14 @@ gcc) fi "$@" -Wp,"$gccflag$tmpdepfile" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. + # The second -e expression handles DOS-style file names with drive + # letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" ## This next piece of magic avoids the "deleted header file" problem. @@ -173,15 +232,15 @@ gcc) ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' "$nl" < "$tmpdepfile" | ## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as ## well. hp depmode also adds that space, but also prefixes the VPATH ## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ - | sed -e 's/$/ :/' >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -192,47 +251,6 @@ hp) exit 1 ;; -sgi) - if test "$libtool" = yes; then - "$@" "-Wp,-MDupdate,$tmpdepfile" - else - "$@" -MDupdate "$tmpdepfile" - fi - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - - if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files - echo "$object : \\" > "$depfile" - - # Clip off the initial element (the dependent). Don't try to be - # clever and replace this with sed code, as IRIX sed won't handle - # lines with more than a fixed number of characters (4096 in - # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like '#:fec' to the end of the - # dependency line. - tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr "$nl" ' ' >> "$depfile" - echo >> "$depfile" - - # The second pass generates a dummy entry for each header file. - tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - xlc) # This case exists only to let depend.m4 do its work. It works by # looking at the text of this script. This case will never be run, @@ -246,9 +264,8 @@ aix) # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.u tmpdepfile2=$base.u @@ -261,9 +278,7 @@ aix) "$@" -M fi stat=$? - - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi @@ -272,65 +287,113 @@ aix) do test -f "$tmpdepfile" && break done - if test -f "$tmpdepfile"; then - # Each line is of the form 'foo.o: dependent.h'. - # Do two passes, one to just change these to - # '$object: dependent.h' and one to simply 'dependent.h:'. - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + aix_post_process_depfile + ;; + +tcc) + # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26 + # FIXME: That version still under development at the moment of writing. + # Make that this statement remains true also for stable, released + # versions. + # It will wrap lines (doesn't matter whether long or short) with a + # trailing '\', as in: + # + # foo.o : \ + # foo.c \ + # foo.h \ + # + # It will put a trailing '\' even on the last line, and will use leading + # spaces rather than leading tabs (at least since its commit 0394caf7 + # "Emit spaces for -MD"). + "$@" -MD -MF "$tmpdepfile" + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat fi + rm -f "$depfile" + # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'. + # We have to change lines of the first kind to '$object: \'. + sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile" + # And for each line of the second kind, we have to emit a 'dep.h:' + # dummy dependency, to avoid the deleted-header problem. + sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; -icc) - # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'. - # However on - # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c - # ICC 7.0 will fill foo.d with something like - # foo.o: sub/foo.c - # foo.o: sub/foo.h - # which is wrong. We want - # sub/foo.o: sub/foo.c - # sub/foo.o: sub/foo.h - # sub/foo.c: - # sub/foo.h: - # ICC 7.1 will output +## The order of this option in the case statement is important, since the +## shell code in configure will try each of these formats in the order +## listed in this file. A plain '-MD' option would be understood by many +## compilers, so we must ensure this comes after the gcc and icc options. +pgcc) + # Portland's C compiler understands '-MD'. + # Will always output deps to 'file.d' where file is the root name of the + # source file under compilation, even if file resides in a subdirectory. + # The object file name does not affect the name of the '.d' file. + # pgcc 10.2 will output # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using '\': + # and will wrap long lines using '\' : # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... - # tcc 0.9.26 (FIXME still under development at the moment of writing) - # will emit a similar output, but also prepend the continuation lines - # with horizontal tabulation characters. - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else + set_dir_from "$object" + # Use the source, not the object, to determine the base name, since + # that's sadly what pgcc will do too. + set_base_from "$source" + tmpdepfile=$base.d + + # For projects that build the same source file twice into different object + # files, the pgcc approach of using the *source* file root name can cause + # problems in parallel builds. Use a locking strategy to avoid stomping on + # the same $tmpdepfile. + lockdir=$base.d-lock + trap " + echo '$0: caught signal, cleaning up...' >&2 + rmdir '$lockdir' + exit 1 + " 1 2 13 15 + numtries=100 + i=$numtries + while test $i -gt 0; do + # mkdir is a portable test-and-set. + if mkdir "$lockdir" 2>/dev/null; then + # This process acquired the lock. + "$@" -MD + stat=$? + # Release the lock. + rmdir "$lockdir" + break + else + # If the lock is being held by a different process, wait + # until the winning process is done or we timeout. + while test -d "$lockdir" && test $i -gt 0; do + sleep 1 + i=`expr $i - 1` + done + fi + i=`expr $i - 1` + done + trap - 1 2 13 15 + if test $i -le 0; then + echo "$0: failed to acquire lock after $numtries attempts" >&2 + echo "$0: check lockdir '$lockdir'" >&2 + exit 1 + fi + + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" - # Each line is of the form 'foo.o: dependent.h', - # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'. + # Each line is of the form `foo.o: dependent.h', + # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. # Do two passes, one to just change these to - # '$object: dependent.h' and one to simply 'dependent.h:'. - sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \ - < "$tmpdepfile" > "$depfile" - sed ' - s/[ '"$tab"'][ '"$tab"']*/ /g - s/^ *// - s/ *\\*$// - s/^[^:]*: *// - /^$/d - /:$/d - s/$/ :/ - ' < "$tmpdepfile" >> "$depfile" + # `$object: dependent.h' and one to simply `dependent.h:'. + sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" + # Some versions of the HPUX 10.20 sed can't process this invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -341,9 +404,8 @@ hp2) # 'foo.d', which lands next to the object file, wherever that # happens to be. # Much of this is similar to the tru64 case; see comments there. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.d tmpdepfile2=$dir.libs/$base.d @@ -354,8 +416,7 @@ hp2) "$@" +Maked fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" exit $stat fi @@ -365,76 +426,61 @@ hp2) test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" + sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile" # Add 'dependent.h:' lines. sed -ne '2,${ - s/^ *// - s/ \\*$// - s/$/:/ - p - }' "$tmpdepfile" >> "$depfile" + s/^ *// + s/ \\*$// + s/$/:/ + p + }' "$tmpdepfile" >> "$depfile" else - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" "$tmpdepfile2" ;; tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in 'foo.d' instead, so we check for that too. - # Subdirectories are respected. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - - if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mechanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d - "$@" -MD - fi - - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # dependencies in 'foo.d' instead, so we check for that too. + # Subdirectories are respected. + set_dir_from "$object" + set_base_from "$object" + + if test "$libtool" = yes; then + # Libtool generates 2 separate objects for the 2 libraries. These + # two compilations output dependencies in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is + # automatically cleaned when .libs/ is deleted, while ignoring + # the former would cause a distcleancheck panic. + tmpdepfile1=$dir$base.o.d # libtool 1.5 + tmpdepfile2=$dir.libs/$base.o.d # Likewise. + tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504 + "$@" -Wc,-MD + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + tmpdepfile3=$dir$base.d + "$@" -MD + fi + + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi + + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done + # Same post-processing that is required for AIX mode. + aix_post_process_depfile + ;; msvc7) if test "$libtool" = yes; then @@ -445,8 +491,7 @@ msvc7) "$@" $showIncludes > "$tmpdepfile" stat=$? grep -v '^Note: including file: ' "$tmpdepfile" - if test "$stat" = 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -523,13 +568,14 @@ dashmstdout) # in the target name. This is to cope with DOS-style filenames: # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile" + sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' "$nl" < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process this sed invocation + # correctly. Breaking it into two sed invocations is a workaround. + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -582,10 +628,12 @@ makedepend) # makedepend may prepend the VPATH from the source file name to the object. # No need to regex-escape $object, excess matching of '.' is harmless. sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process the last invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed '1,2d' "$tmpdepfile" \ + | tr ' ' "$nl" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" "$tmpdepfile".bak ;; @@ -621,10 +669,10 @@ cpp) esac done - "$@" -E | - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" + "$@" -E \ + | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" cat < "$tmpdepfile" >> "$depfile" @@ -656,15 +704,15 @@ msvisualcpp) shift ;; "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; + set fnord "$@" + shift + shift + ;; *) - set fnord "$@" "$arg" - shift - shift - ;; + set fnord "$@" "$arg" + shift + shift + ;; esac done "$@" -E 2>/dev/null | diff --git a/build-aux/do-release-commit-and-tag b/build-aux/do-release-commit-and-tag index e786e982..0bd8ce86 100755 --- a/build-aux/do-release-commit-and-tag +++ b/build-aux/do-release-commit-and-tag @@ -3,11 +3,11 @@ # controlled .prev-version file, automate the procedure by which we record # the date, release-type and version string in the NEWS file. That commit # will serve to identify the release, so apply a signed tag to it as well. -VERSION=2011-05-04.11 # UTC +VERSION=2012-08-01.09 # UTC # Note: this is a bash script (could be zsh or dash) -# Copyright (C) 2009-2012 Free Software Foundation, Inc. +# 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 @@ -24,31 +24,32 @@ VERSION=2011-05-04.11 # UTC # Written by Jim Meyering -ME=`basename "$0"` +ME=$(basename "$0") warn() { printf '%s: %s\n' "$ME" "$*" >&2; } die() { warn "$*"; exit 1; } -help_version() +help() { - case $1 in - --help) cat <. EOF - exit ;; + exit +} - --version) - year=`echo "$VERSION" | sed 's/[^0-9].*//'` - cat < This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. EOF - exit ;; + exit +} + +## ------ ## +## Main. ## +## ------ ## + +# Constants. +noteworthy='* Noteworthy changes in release' +noteworthy_stub="$noteworthy ?.? (????-??-??) [?]" - *) die "unrecognized option: $1";; +# Variables. +branch=$(git branch | sed -ne '/^\* /{s///;p;q;}') +builddir=. + +while test $# != 0 +do + # Handle --option=value by splitting apart and putting back on argv. + case $1 in + --*=*) + opt=$(echo "$1" | sed -e 's/=.*//') + val=$(echo "$1" | sed -e 's/[^=]*=//') + shift + set dummy "$opt" "$val" ${1+"$@"}; shift + ;; esac -} -branch=master -case $1 in - --branch) shift; branch=$1; shift ;; -esac + case $1 in + --help|--version) ${1#--};; + --branch) shift; branch=$1; shift ;; + -C|--builddir) shift; builddir=$1; shift ;; + --*) die "unrecognized option: $1";; + *) break;; + esac +done -case $# in - 1) help_version $1; exit 0;; - 2) ;; - *) warn "Usage: $ME [OPTION...] VERSION TYPE"; exit 1;; -esac +test $# = 2 \ + || die "Usage: $ME [OPTION...] VERSION TYPE" ver=$1 type=$2 + +## ---------------------- ## +## First, sanity checks. ## +## ---------------------- ## + # Verify that $ver looks like a version number, and... echo "$ver"|grep -E '^[0-9][0-9.]*[0-9]$' > /dev/null \ || die "invalid version: $ver" @@ -97,7 +127,7 @@ prev_ver=$(cat .prev-version) \ # Verify that $ver is sensible (> .prev-version). case $(printf "$prev_ver\n$ver\n"|sort -V -u|tr '\n' ':') in "$prev_ver:$ver:") ;; - *) die "invalid version: $ver";; + *) die "invalid version: $ver (<= $prev_ver)";; esac case $type in @@ -105,32 +135,36 @@ case $type in *) die "invalid release type: $type";; esac -# Extract package name from Makefile. -pkg=$(sed -n 's/^PACKAGE = \(.*\)/\1/p' Makefile) \ - || die 'failed to determine package name from Makefile' - -# simple check: no question marks on line 3 of NEWS -noteworthy='* Noteworthy changes in release' -test "$(sed -n 3p NEWS)" = "$noteworthy ?.? (????-??-??) [?]" \ - || die 'line 3 of NEWS looks fishy!' - -# No dirt allowed. +# No local modifications allowed. case $(git diff-index --name-only HEAD) in '') ;; *) die 'this tree is dirty; commit your changes first';; esac -# update NEWS to have today's date, plus desired version number and $type +# Ensure the current branch name is correct: +curr_br=$(git rev-parse --symbolic-full-name HEAD) +test "$curr_br" = refs/heads/$branch || die not on branch $branch + +# Extract package name from Makefile. +Makefile=$builddir/Makefile +pkg=$(sed -n 's/^PACKAGE = \(.*\)/\1/p' "$Makefile") \ + || die "failed to determine package name from $Makefile" + +# Check that line 3 of NEWS is the stub line about to be replaced. +test "$(sed -n 3p NEWS)" = "$noteworthy_stub" \ + || die "line 3 of NEWS must be exactly '$noteworthy_stub'" + +## --------------- ## +## Then, changes. ## +## --------------- ## + +# Update NEWS to have today's date, plus desired version number and $type. perl -MPOSIX -ni -e 'my $today = strftime "%F", localtime time;' \ -e 'my ($type, $ver) = qw('"$type $ver"');' \ -e 'my $pfx = "'"$noteworthy"'";' \ -e 'print $.==3 ? "$pfx $ver ($today) [$type]\n" : $_' \ NEWS || die 'failed to update NEWS' -# Ensure the current branch name is correct: -curr_br=$(git rev-parse --symbolic-full-name HEAD) -test "$curr_br" = refs/heads/$branch || die not on branch $branch - printf "version $ver\n\n* NEWS: Record release date.\n" \ | git commit -F - -a || die 'git commit failed' git tag -s -m "$pkg $ver" v$ver HEAD || die 'git tag failed' diff --git a/build-aux/gen-lists-of-programs.sh b/build-aux/gen-lists-of-programs.sh new file mode 100755 index 00000000..bf63ee30 --- /dev/null +++ b/build-aux/gen-lists-of-programs.sh @@ -0,0 +1,186 @@ +#!/bin/sh +# Generate lists of all coreutils programs, to be fed both to Autoconf +# and Automake, and with further distinctions about how and when these +# programs should be built. This is useful to avoid duplicating these +# list definitions among several files ('configure.ac' and +# 'src/local.mk' at least); such duplication had proved a source of +# inconsistencies and bugs in the past. + +set -u +set -e + +# These are the names of programs that are neither built nor installed +# by default. This list is *not* intended for programs like 'who', +# 'nice', 'chroot', etc., that are built only when certain requisite +# system features are detected. +# If you would like to install programs from this list anyway, say A and B, +# use "--enable-install-program=A,B" when invoking configure. +disabled_by_default_progs=' + arch + hostname +' + +# Programs that can be built only when certain requisite system +# features are detected at configure time. +build_if_possible_progs=' + chroot + df + hostid + libstdbuf.so + nice + pinky + stdbuf + stty + uptime + users + who +' + +# All the other programs, to be built by default, and that should +# be buildable without problems on any target system. +normal_progs=' + [ + base64 + basename + cat + chcon + chgrp + chmod + chown + cksum + comm + cp + csplit + cut + date + dd + dir + dircolors + dirname + du + echo + env + expand + expr + factor + false + fmt + fold + ginstall + groups + head + id + join + kill + link + ln + logname + ls + md5sum + mkdir + mkfifo + mknod + mktemp + mv + nl + nproc + nohup + numfmt + od + paste + pathchk + pr + printenv + printf + ptx + pwd + readlink + realpath + rm + rmdir + runcon + seq + sha1sum + sha224sum + sha256sum + sha384sum + sha512sum + shred + shuf + sleep + sort + split + stat + sum + sync + tac + tail + tee + test + timeout + touch + tr + true + truncate + tsort + tty + uname + unexpand + uniq + unlink + vdir + wc + whoami + yes +' + +me=`echo "$0" | sed 's,.*/,,'` +msg="Automatically generated by $me. DO NOT EDIT BY HAND!" + +case $#,$1 in + 1,--autoconf|1,--for-autoconf) + echo "dnl $msg" + for p in $normal_progs; do + test x"$p" = x"[" && p='@<:@' + echo "gl_ADD_PROG([optional_bin_progs], [$p])" + done + # Extra 'echo' to normalize whitespace. + echo "no_install_progs_default='`echo $disabled_by_default_progs`'" + sed 's/^ *//' <&2; exit 2 + ;; +esac + +exit 0 diff --git a/build-aux/gendocs.sh b/build-aux/gendocs.sh index c8abd55f..0c0bc4b0 100755 --- a/build-aux/gendocs.sh +++ b/build-aux/gendocs.sh @@ -2,10 +2,10 @@ # 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=2011-04-08.14 +scriptversion=2012-10-27.11 -# Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 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 @@ -30,6 +30,12 @@ scriptversion=2011-04-08.14 # # An up-to-date copy is also maintained in Gnulib (gnu.org/software/gnulib). +# TODO: +# - image importation was only implemented for HTML generated by +# makeinfo. But it should be simple enough to adjust. +# - images are not imported in the source tarball. All the needed +# formats (PDF, PNG, etc.) should be included. + prog=`basename "$0"` srcdir=`pwd` @@ -39,35 +45,37 @@ templateurl="http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/texinfo/texinfo/ : ${SETLANG="env LANG= LC_MESSAGES= LC_ALL= LANGUAGE="} : ${MAKEINFO="makeinfo"} : ${TEXI2DVI="texi2dvi -t @finalout"} -: ${DVIPS="dvips"} : ${DOCBOOK2HTML="docbook2html"} : ${DOCBOOK2PDF="docbook2pdf"} -: ${DOCBOOK2PS="docbook2ps"} : ${DOCBOOK2TXT="docbook2txt"} : ${GENDOCS_TEMPLATE_DIR="."} +: ${PERL='perl'} : ${TEXI2HTML="texi2html"} unset CDPATH unset use_texi2html version="gendocs.sh $scriptversion -Copyright 2010 Free Software Foundation, Inc. +Copyright 2012 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." usage="Usage: $prog [OPTION]... PACKAGE MANUAL-TITLE -Generate various output formats from PACKAGE.texinfo (or .texi or .txi) source. -See the GNU Maintainers document for a more extensive discussion: +Generate output in various formats from PACKAGE.texinfo (or .texi or +.txi) source. See the GNU Maintainers document for a more extensive +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 to DocBook too (xml, txt, html, pdf and ps). + --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. @@ -80,11 +88,11 @@ Typical sequence: wget \"$templateurl\" $prog --email BUGLIST MANUAL \"GNU MANUAL - One-line description\" -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. +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 use the --email ADDRESS option to specify your bug-reporting +Please do use the --email ADDRESS option to specify your bug-reporting address in the generated HTML pages. MANUAL-TITLE is included as part of the HTML of the overall @@ -102,11 +110,14 @@ If a manual's Texinfo sources are spread across several directories, first copy or symlink all Texinfo sources into a single directory. (Part of the script's work is to make a tar.gz of the sources.) -You can set the environment variables MAKEINFO, TEXI2DVI, TEXI2HTML, and -DVIPS to control the programs that get executed, and +As implied above, by default monolithic Info files are generated. +If you want split Info, or other Info options, use --info to override. + +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, DOCBOOK2PS, and DOCBOOK2TXT are also respected. +DOCBOOK2PDF, and DOCBOOK2TXT are also respected. By default, makeinfo and texi2dvi are run in the default (English) locale, since that's the language of most Texinfo manuals. If you @@ -116,16 +127,13 @@ SETLANG setting in the source. Email bug reports or enhancement requests to bug-texinfo@gnu.org. " -calcsize() -{ - size=`ls -ksl $1 | awk '{print $1}'` - echo $size -} - MANUAL_TITLE= PACKAGE= EMAIL=webmasters@gnu.org # please override with --email +commonarg= # Options passed to all the tools (-I dir). +dirs= # -I's directories. htmlarg= +infoarg=--no-split outdir=manual srcfile= @@ -136,8 +144,10 @@ while test $# -gt 0; do --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;; --texi2html) use_texi2html=1;; -*) echo "$0: Unknown option \`$1'." >&2 @@ -183,15 +193,64 @@ if test ! -r $GENDOCS_TEMPLATE_DIR/gendocs_template; then exit 1 fi +# Function to return size of $1 in something resembling kilobytes. +calcsize() +{ + size=`ls -ksl $1 | awk '{print $1}'` + echo $size +} + +# copy_images OUTDIR HTML-FILE... +# ------------------------------- +# Copy all the images needed by the HTML-FILEs into OUTDIR. Look +# for them in the -I directories. +copy_images() +{ + local odir + odir=$1 + shift + $PERL -n -e " +BEGIN { + \$me = '$prog'; + \$odir = '$odir'; + @dirs = qw($dirs); +} +" -e ' +/<img src="(.*?)"/g && ++$need{$1}; + +END { + #print "$me: @{[keys %need]}\n"; # for debugging, show images found. + FILE: for my $f (keys %need) { + for my $d (@dirs) { + if (-f "$d/$f") { + use File::Basename; + my $dest = dirname ("$odir/$f"); + # + use File::Path; + -d $dest || mkpath ($dest) + || die "$me: cannot mkdir $dest: $!\n"; + # + use File::Copy; + copy ("$d/$f", $dest) + || die "$me: cannot copy $d/$f to $dest: $!\n"; + next FILE; + } + } + die "$me: $ARGV: cannot find image $f\n"; + } +} +' -- "$@" || exit 1 +} + case $outdir in /*) abs_outdir=$outdir;; *) abs_outdir=$srcdir/$outdir;; esac -echo Generating output formats for $srcfile +echo "Generating output formats for $srcfile" -cmd="$SETLANG $MAKEINFO -o $PACKAGE.info \"$srcfile\"" -echo "Generating info files... ($cmd)" +cmd="$SETLANG $MAKEINFO -o $PACKAGE.info $commonarg $infoarg \"$srcfile\"" +echo "Generating info file(s)... ($cmd)" eval "$cmd" mkdir -p "$outdir/" tar czf "$outdir/$PACKAGE.info.tar.gz" $PACKAGE.info* @@ -199,29 +258,23 @@ 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} \"$srcfile\"" +cmd="$SETLANG $TEXI2DVI $commonarg \"$srcfile\"" echo "Generating dvi ... ($cmd)" eval "$cmd" -# now, before we compress dvi: -echo Generating postscript... -${DVIPS} $PACKAGE -o -gzip -f -9 $PACKAGE.ps -ps_gz_size=`calcsize $PACKAGE.ps.gz` -mv $PACKAGE.ps.gz "$outdir/" - # compress/finish dvi: gzip -f -9 $PACKAGE.dvi dvi_gz_size=`calcsize $PACKAGE.dvi.gz` mv $PACKAGE.dvi.gz "$outdir/" -cmd="$SETLANG ${TEXI2DVI} --pdf \"$srcfile\"" +cmd="$SETLANG $TEXI2DVI --pdf $commonarg \"$srcfile\"" echo "Generating pdf ... ($cmd)" eval "$cmd" pdf_size=`calcsize $PACKAGE.pdf` mv $PACKAGE.pdf "$outdir/" -cmd="$SETLANG $MAKEINFO -o $PACKAGE.txt --no-split --no-headers \"$srcfile\"" +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` @@ -231,7 +284,7 @@ mv $PACKAGE.txt "$outdir/" html_split() { - opt="--split=$1 $htmlarg --node-files" + opt="--split=$1 $commonarg $htmlarg --node-files" cmd="$SETLANG $TEXI2HTML --output $PACKAGE.html $opt \"$srcfile\"" echo "Generating html by $1... ($cmd)" eval "$cmd" @@ -249,7 +302,7 @@ html_split() } if test -z "$use_texi2html"; then - opt="--no-split --html -o $PACKAGE.html $htmlarg" + opt="--no-split --html -o $PACKAGE.html $commonarg $htmlarg" cmd="$SETLANG $MAKEINFO $opt \"$srcfile\"" echo "Generating monolithic html... ($cmd)" rm -rf $PACKAGE.html # in case a directory is left over @@ -257,23 +310,25 @@ if test -z "$use_texi2html"; then html_mono_size=`calcsize $PACKAGE.html` gzip -f -9 -c $PACKAGE.html >"$outdir/$PACKAGE.html.gz" html_mono_gz_size=`calcsize "$outdir/$PACKAGE.html.gz"` + copy_images "$outdir/" $PACKAGE.html mv $PACKAGE.html "$outdir/" - cmd="$SETLANG $MAKEINFO --html -o $PACKAGE.html $htmlarg \"$srcfile\"" + opt="--html -o $PACKAGE.html $commonarg $htmlarg" + cmd="$SETLANG $MAKEINFO $opt \"$srcfile\"" echo "Generating html by node... ($cmd)" 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" -- *.html + cd $split_html_dir || exit 1 + tar -czf "$abs_outdir/$PACKAGE.html_node.tar.gz" -- * ) - html_node_tgz_size=`calcsize "$outdir/${PACKAGE}.html_node.tar.gz"` - rm -f "$outdir"/html_node/*.html - mkdir -p "$outdir/html_node/" - mv ${split_html_dir}/*.html "$outdir/html_node/" - rmdir ${split_html_dir} + html_node_tgz_size=`calcsize "$outdir/$PACKAGE.html_node.tar.gz"` + rm -rf "$outdir/html_node/" + mv $split_html_dir "$outdir/html_node/" else - cmd="$SETLANG $TEXI2HTML --output $PACKAGE.html $htmlarg \"$srcfile\"" + opt="--output $PACKAGE.html $commonarg $htmlarg" + cmd="$SETLANG $TEXI2HTML $opt \"$srcfile\"" echo "Generating monolithic html... ($cmd)" rm -rf $PACKAGE.html # in case a directory is left over eval "$cmd" @@ -297,7 +352,8 @@ d=`dirname $srcfile` texi_tgz_size=`calcsize "$outdir/$PACKAGE.texi.tar.gz"` if test -n "$docbook"; then - cmd="$SETLANG $MAKEINFO -o - --docbook \"$srcfile\" > ${srcdir}/$PACKAGE-db.xml" + opt="-o - --docbook $commonarg" + cmd="$SETLANG $MAKEINFO $opt \"$srcfile\" >${srcdir}/$PACKAGE-db.xml" echo "Generating docbook XML... ($cmd)" eval "$cmd" docbook_xml_size=`calcsize $PACKAGE-db.xml` @@ -306,7 +362,8 @@ if test -n "$docbook"; then mv $PACKAGE-db.xml "$outdir/" split_html_db_dir=html_node_db - cmd="${DOCBOOK2HTML} -o $split_html_db_dir \"${outdir}/$PACKAGE-db.xml\"" + opt="$commonarg -o $split_html_db_dir" + cmd="$DOCBOOK2HTML $opt \"${outdir}/$PACKAGE-db.xml\"" echo "Generating docbook HTML... ($cmd)" eval "$cmd" ( @@ -319,20 +376,13 @@ if test -n "$docbook"; then mv ${split_html_db_dir}/*.html "$outdir/html_node_db/" rmdir ${split_html_db_dir} - cmd="${DOCBOOK2TXT} \"${outdir}/$PACKAGE-db.xml\"" + cmd="$DOCBOOK2TXT \"${outdir}/$PACKAGE-db.xml\"" echo "Generating docbook ASCII... ($cmd)" eval "$cmd" docbook_ascii_size=`calcsize $PACKAGE-db.txt` mv $PACKAGE-db.txt "$outdir/" - cmd="${DOCBOOK2PS} \"${outdir}/$PACKAGE-db.xml\"" - echo "Generating docbook PS... ($cmd)" - eval "$cmd" - gzip -f -9 -c $PACKAGE-db.ps >"$outdir/$PACKAGE-db.ps.gz" - docbook_ps_gz_size=`calcsize "$outdir/$PACKAGE-db.ps.gz"` - mv $PACKAGE-db.ps "$outdir/" - - cmd="${DOCBOOK2PDF} \"${outdir}/$PACKAGE-db.xml\"" + cmd="$DOCBOOK2PDF \"${outdir}/$PACKAGE-db.xml\"" echo "Generating docbook PDF... ($cmd)" eval "$cmd" docbook_pdf_size=`calcsize $PACKAGE-db.pdf` @@ -346,6 +396,7 @@ if test -z "$use_texi2html"; then else CONDS="/%%ENDIF.*%%/d;/%%IF *HTML_SECTION%%/d;/%%IF *HTML_CHAPTER%%/d" fi + curdate=`$SETLANG date '+%B %d, %Y'` sed \ -e "s!%%TITLE%%!$MANUAL_TITLE!g" \ @@ -360,13 +411,11 @@ sed \ -e "s!%%INFO_TGZ_SIZE%%!$info_tgz_size!g" \ -e "s!%%DVI_GZ_SIZE%%!$dvi_gz_size!g" \ -e "s!%%PDF_SIZE%%!$pdf_size!g" \ - -e "s!%%PS_GZ_SIZE%%!$ps_gz_size!g" \ -e "s!%%ASCII_SIZE%%!$ascii_size!g" \ -e "s!%%ASCII_GZ_SIZE%%!$ascii_gz_size!g" \ -e "s!%%TEXI_TGZ_SIZE%%!$texi_tgz_size!g" \ -e "s!%%DOCBOOK_HTML_NODE_TGZ_SIZE%%!$html_node_db_tgz_size!g" \ -e "s!%%DOCBOOK_ASCII_SIZE%%!$docbook_ascii_size!g" \ - -e "s!%%DOCBOOK_PS_GZ_SIZE%%!$docbook_ps_gz_size!g" \ -e "s!%%DOCBOOK_PDF_SIZE%%!$docbook_pdf_size!g" \ -e "s!%%DOCBOOK_XML_SIZE%%!$docbook_xml_size!g" \ -e "s!%%DOCBOOK_XML_GZ_SIZE%%!$docbook_xml_gz_size!g" \ diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen index 0fa90636..34682473 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-03-18.17; # UTC +scriptversion=2012-12-31.23; # UTC -# Copyright (C) 2007-2012 Free Software Foundation, Inc. +# Copyright (C) 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 @@ -86,6 +86,7 @@ Print a version string. Options: --prefix prefix of git tags (default 'v') + --fallback fallback version to use if \"git --version\" fails --help display this help and exit --version output version information and exit @@ -93,20 +94,22 @@ Options: Running without arguments will suffice in most cases." prefix=v +fallback= while test $# -gt 0; do case $1 in --help) echo "$usage"; exit 0;; --version) echo "$version"; exit 0;; --prefix) shift; prefix="$1";; + --fallback) shift; fallback="$1";; -*) echo "$0: Unknown option '$1'." >&2 echo "$0: Try '--help' for more information." >&2 exit 1;; *) - if test -z "$tarball_version_file"; then + if test "x$tarball_version_file" = x; then tarball_version_file="$1" - elif test -z "$tag_sed_script"; then + elif test "x$tag_sed_script" = x; then tag_sed_script="$1" else echo "$0: extra non-option argument '$1'." >&2 @@ -116,7 +119,7 @@ while test $# -gt 0; do shift done -if test -z "$tarball_version_file"; then +if test "x$tarball_version_file" = x; then echo "$usage" exit 1 fi @@ -140,11 +143,11 @@ then [0-9]*) ;; *) v= ;; esac - test -z "$v" \ + test "x$v" = x \ && echo "$0: WARNING: $tarball_version_file is missing or damaged" 1>&2 fi -if test -n "$v" +if test "x$v" != x then : # use $v # Otherwise, if there is at least one git commit involving the working @@ -184,8 +187,10 @@ then # Remove the "g" in git describe's output string, to save a byte. v=`echo "$v" | sed 's/-/./;s/\(.*\)-g/\1-/'`; v_from_git=1 -else +elif test "x$fallback" = x || git --version >/dev/null 2>&1; then v=UNKNOWN +else + v=$fallback fi v=`echo "$v" |sed "s/^$prefix//"` @@ -193,7 +198,7 @@ v=`echo "$v" |sed "s/^$prefix//"` # Test whether to append the "-dirty" suffix only if the version # string we're using came from git. I.e., skip the test if it's "UNKNOWN" # or if it came from .tarball-version. -if test -n "$v_from_git"; then +if test "x$v_from_git" != x; then # Don't declare a version "dirty" merely because a time stamp has changed. git update-index --refresh > /dev/null 2>&1 diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog index 38c6f3aa..e02d34c2 100755 --- a/build-aux/gitlog-to-changelog +++ b/build-aux/gitlog-to-changelog @@ -3,13 +3,13 @@ eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}' if 0; # Convert git log output to ChangeLog format. -my $VERSION = '2012-01-18 07:50'; # UTC +my $VERSION = '2012-07-29 06:11'; # UTC # The definition above must lie within the first 8 lines in order # for the Emacs time-stamp write hook (at end) to update it. # If you change this file with Emacs, please let the write hook # do its job. Otherwise, update this string manually. -# Copyright (C) 2008-2012 Free Software Foundation, Inc. +# 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 @@ -68,12 +68,17 @@ OPTIONS: header; the default is to cluster adjacent commit messages if their headers are the same and neither commit message contains multiple paragraphs. + --srcdir=DIR the root of the source tree, from which the .git/ + directory can be derived. --since=DATE convert only the logs since DATE; the default is to convert all log entries. --format=FMT set format string for commit subject and body; see 'man git-log' for the list of format metacharacters; the default is '%s%n%b%n' - + --strip-tab remove one additional leading TAB from commit message lines. + --strip-cherry-pick remove data inserted by "git cherry-pick"; + this includes the "cherry picked from commit ..." line, + and the possible final "Conflicts:" paragraph. --help display this help and exit --version output version information and exit @@ -189,12 +194,39 @@ sub parse_amend_file($) return $h; } +# git_dir_option $SRCDIR +# +# From $SRCDIR, the --git-dir option to pass to git (none if $SRCDIR +# is undef). Return as a list (0 or 1 element). +sub git_dir_option($) +{ + my ($srcdir) = @_; + my @res = (); + if (defined $srcdir) + { + my $qdir = shell_quote $srcdir; + my $cmd = "cd $qdir && git rev-parse --show-toplevel"; + my $qcmd = shell_quote $cmd; + my $git_dir = qx($cmd); + defined $git_dir + or die "$ME: cannot run $qcmd: $!\n"; + $? == 0 + or die "$ME: $qcmd had unexpected exit code or signal ($?)\n"; + chomp $git_dir; + push @res, "--git-dir=$git_dir/.git"; + } + @res; +} + { my $since_date; my $format_string = '%s%n%b%n'; my $amend_file; my $append_dot = 0; my $cluster = 1; + my $strip_tab = 0; + my $strip_cherry_pick = 0; + my $srcdir; GetOptions ( help => sub { usage 0 }, @@ -204,9 +236,11 @@ sub parse_amend_file($) 'amend=s' => \$amend_file, 'append-dot' => \$append_dot, 'cluster!' => \$cluster, + 'strip-tab' => \$strip_tab, + 'strip-cherry-pick' => \$strip_cherry_pick, + 'srcdir=s' => \$srcdir, ) or usage 1; - defined $since_date and unshift @ARGV, "--since=$since_date"; @@ -214,7 +248,9 @@ sub parse_amend_file($) # that makes a correction in the log or attribution of that commit. my $amend_code = defined $amend_file ? parse_amend_file $amend_file : {}; - my @cmd = (qw (git log --log-size), + my @cmd = ('git', + git_dir_option $srcdir, + qw(log --log-size), '--pretty=format:%H:%ct %an <%ae>%n%n'.$format_string, @ARGV); open PIPE, '-|', @cmd or die ("$ME: failed to run '". quoted_cmd (@cmd) ."': $!\n" @@ -263,6 +299,13 @@ sub parse_amend_file($) $rest = $_; } + # Remove lines inserted by "git cherry-pick". + if ($strip_cherry_pick) + { + $rest =~ s/^\s*Conflicts:\n.*//sm; + $rest =~ s/^\s*\(cherry picked from commit [\da-f]+\)\n//m; + } + my @line = split "\n", $rest; my $author_line = shift @line; defined $author_line @@ -347,6 +390,10 @@ sub parse_amend_file($) } } + # Remove one additional leading TAB from each line. + $strip_tab + and map { s/^\t// } @line; + # Prefix each non-empty line with a TAB. @line = map { length $_ ? "\t$_" : '' } @line; diff --git a/build-aux/gnu-web-doc-update b/build-aux/gnu-web-doc-update index 7a430498..268ecc06 100755 --- a/build-aux/gnu-web-doc-update +++ b/build-aux/gnu-web-doc-update @@ -1,15 +1,10 @@ #!/bin/sh # Run this after each non-alpha release, to update the web documentation at # http://www.gnu.org/software/$pkg/manual/ -# This script must be run from the top-level directory, -# assumes you're using git for revision control, -# and requires a .prev-version file as well as a Makefile, -# from which it extracts the version number and package name, respectively. -# Also, it assumes all documentation is in the doc/ sub-directory. -VERSION=2009-07-21.16; # UTC +VERSION=2012-12-16.14; # UTC -# Copyright (C) 2009-2012 Free Software Foundation, Inc. +# 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 @@ -24,63 +19,132 @@ VERSION=2009-07-21.16; # UTC # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# Requirements: everything required to bootstrap your package, -# plus these: git, cvs, cvsu, rsync, mktemp - -ME=`basename "$0"` +ME=$(basename "$0") warn() { printf '%s: %s\n' "$ME" "$*" >&2; } die() { warn "$*"; exit 1; } -help_version() +help() { - case $1 in - --help) cat <<EOF + cat <<EOF Usage: $ME -Run this script (no options or arguments) after each non-alpha release, -to update the web documentation at http://www.gnu.org/software/\$pkg/manual/ -Run it from your project's the top-level directory. +Run this script from top_srcdir (no arguments) after each non-alpha +release, to update the web documentation at +http://www.gnu.org/software/\$pkg/manual/ + +This script assumes you're using git for revision control, and +requires a .prev-version file as well as a Makefile, from which it +extracts the version number and package name, respectively. Also, it +assumes all documentation is in the doc/ sub-directory. Options: - --help print this help, then exit - --version print version number, then exit + -C, --builddir=DIR location of (configured) Makefile (default: .) + -n, --dry-run don't actually commit anything + --help print this help, then exit + --version print version number, then exit Report bugs and patches to <bug-gnulib@gnu.org>. EOF - exit ;; + exit +} - --version) - year=`echo "$VERSION" | sed 's/[^0-9].*//'` - cat <<EOF +version() +{ + year=$(echo "$VERSION" | sed 's/[^0-9].*//') + cat <<EOF $ME $VERSION Copyright (C) $year Free Software Foundation, Inc, License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. EOF - exit ;; + exit +} - *) die "unrecognized option: $1";; - esac +# 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. +# +# FIXME: code duplication, see also bootstrap. +find_tool () +{ + find_tool_envvar=$1 + shift + 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 + 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" + eval "$find_tool_envvar=\$find_tool_res" + eval "export $find_tool_envvar" } -case $# in - 0) ;; - 1) help_version $1 ;; - *) die "$ME: too many options" ;; -esac +## ------ ## +## Main. ## +## ------ ## + +# Requirements: everything required to bootstrap your package, plus +# these. +find_tool CVS cvs +find_tool GIT git +find_tool RSYNC rsync +find_tool XARGS gxargs xargs + +builddir=. +dryrun= +while test $# != 0 +do + # Handle --option=value by splitting apart and putting back on argv. + case $1 in + --*=*) + opt=$(echo "$1" | sed -e 's/=.*//') + val=$(echo "$1" | sed -e 's/[^=]*=//') + shift + set dummy "$opt" "$val" ${1+"$@"}; shift + ;; + esac + + case $1 in + --help|--version) ${1#--};; + -C|--builddir) shift; builddir=$1; shift ;; + -n|--dry-run) dryrun=echo; shift;; + --*) die "unrecognized option: $1";; + *) break;; + esac +done + +test $# = 0 \ + || die "too many arguments" prev=.prev-version -version=$(cat $prev) || die "$ME: no $prev file?" -pkg=$(sed -n 's/^PACKAGE = \(.*\)/\1/p' Makefile) || die "$ME: no Makefile?" +version=$(cat $prev) || die "no $prev file?" +pkg=$(sed -n 's/^PACKAGE = \(.*\)/\1/p' $builddir/Makefile) \ + || die "no Makefile?" tmp_branch=web-doc-$version-$$ +current_branch=$($GIT branch | sed -ne '/^\* /{s///;p;q;}') cleanup() { - __st=$?; - rm -rf "$tmp" - git checkout master - git branch -d $tmp_branch + __st=$? + $dryrun rm -rf "$tmp" + $GIT checkout "$current_branch" + $GIT submodule update --recursive + $GIT branch -d $tmp_branch exit $__st } trap cleanup 0 @@ -89,23 +153,36 @@ trap 'exit $?' 1 2 13 15 # We must build using sources for which --version reports the # just-released version number, not some string like 7.6.18-20761. # That version string propagates into all documentation. -git checkout -b $tmp_branch v$version -ok=0 -./bootstrap && ./configure && make && make web-manual && ok=1 -test $ok = 1 || exit 1 - -tmp=$(mktemp -d --tmpdir=. web-doc-update.XXXXXX) || exit 1 +set -e +$GIT checkout -b $tmp_branch v$version +$GIT submodule update --recursive +./bootstrap +srcdir=$(pwd) +cd "$builddir" + ./config.status --recheck + ./config.status + make + make web-manual +cd "$srcdir" +set +e + +tmp=$(mktemp -d web-doc-update.XXXXXX) || exit 1 ( cd $tmp \ - && cvs -d $USER@cvs.sv.gnu.org:/webcvs/$pkg co $pkg ) -rsync -avP doc/manual/ $tmp/$pkg/manual + && $CVS -d $USER@cvs.sv.gnu.org:/webcvs/$pkg co $pkg ) +$RSYNC -avP "$builddir"/doc/manual/ $tmp/$pkg/manual ( cd $tmp/$pkg/manual - # Add any new files: - cvsu --types='?'|sed s/..// | xargs --no-run-if-empty -- cvs add -ko + # Add all the files. This is simpler than trying to add only the + # new ones because of new directories: it would require iterating on + # adding the outer directories, and then their contents. + # + # find guarantees that we add outer directories first. + find . -name CVS -prune -o -print \ + | $XARGS --no-run-if-empty -- $dryrun $CVS add -ko - cvs ci -m $version + $dryrun $CVS ci -m $version ) # Local variables: diff --git a/build-aux/gnupload b/build-aux/gnupload index 40a59d33..782dd6fd 100755 --- a/build-aux/gnupload +++ b/build-aux/gnupload @@ -1,9 +1,9 @@ #!/bin/sh # Sign files and upload them. -scriptversion=2012-01-15.15; # UTC +scriptversion=2012-12-11.16; # UTC -# Copyright (C) 2004-2012 Free Software Foundation, Inc. +# Copyright (C) 2004-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 @@ -28,6 +28,7 @@ GPG='gpg --batch --no-tty' conffile=.gnuploadrc to= dry_run=false +replace= symlink_files= delete_files= delete_symlinks= @@ -53,8 +54,10 @@ Options: --to DEST specify one destination for FILES (multiple --to options are allowed) --user NAME sign with key NAME + --replace allow replacements of existing files --symlink-regex[=EXPR] use sed script EXPR to compute symbolic link names --dry-run do nothing, show what would have been done + (including the constructed directive file) --version output version information and exit If --symlink-regex is given without EXPR, then the link target name @@ -146,6 +149,9 @@ while test -n "$1"; do --delete) collect_var=delete_files ;; + --replace) + replace="replace: true" + ;; --rmsymlink) collect_var=delete_symlinks ;; @@ -236,6 +242,8 @@ fi # Make sure passphrase is not exported in the environment. unset passphrase +unset passphrase_fd_0 +GNUPGHOME=${GNUPGHOME:-$HOME/.gnupg} # Reset PATH to be sure that echo is a built-in. We will later use # 'echo $passphrase' to output the passphrase, so it is important that @@ -243,18 +251,21 @@ unset passphrase # listings with their arguments...). # Remember this script runs with 'set -e', so if echo is not built-in # it will exit now. -PATH=/empty echo -n "Enter GPG passphrase: " -stty -echo -read -r passphrase -stty echo -echo +if $dry_run || grep -q "^use-agent" $GNUPGHOME/gpg.conf; then :; else + PATH=/empty echo -n "Enter GPG passphrase: " + stty -echo + read -r passphrase + stty echo + echo + passphrase_fd_0="--passphrase-fd 0" +fi if test $# -ne 0; then for file do echo "Signing $file ..." rm -f $file.sig - echo "$passphrase" | $dbg $GPG --passphrase-fd 0 -ba -o $file.sig $file + echo "$passphrase" | $dbg $GPG $passphrase_fd_0 -ba -o $file.sig $file done fi @@ -270,7 +281,7 @@ filename: $3$stmt" fi cat >${2}.directive<<EOF -version: 1.1 +version: 1.2 directory: $1 comment: gnupload v. $scriptversion$stmt EOF @@ -312,12 +323,12 @@ upload () case $dest in alpha.gnu.org:*) mkdirective "$destdir" "$base" "$file" "$stmt" - echo "$passphrase" | $dbg $GPG --passphrase-fd 0 --clearsign $base.directive + echo "$passphrase" | $dbg $GPG $passphrase_fd_0 --clearsign $base.directive $dbg ncftpput ftp-upload.gnu.org /incoming/alpha $files $base.directive.asc ;; ftp.gnu.org:*) mkdirective "$destdir" "$base" "$file" "$stmt" - echo "$passphrase" | $dbg $GPG --passphrase-fd 0 --clearsign $base.directive + echo "$passphrase" | $dbg $GPG $passphrase_fd_0 --clearsign $base.directive $dbg ncftpput ftp-upload.gnu.org /incoming/ftp $files $base.directive.asc ;; savannah.gnu.org:*) @@ -336,7 +347,7 @@ upload () destdir_p1=`echo "$destdir" | sed 's,^[^/]*/,,'` destdir_topdir=`echo "$destdir" | sed 's,/.*,,'` mkdirective "$destdir_p1" "$base" "$file" "$stmt" - echo "$passphrase" | $dbg $GPG --passphrase-fd 0 --clearsign $base.directive + echo "$passphrase" | $dbg $GPG $passphrase_fd_0 --clearsign $base.directive for f in $files $base.directive.asc do echo put $f @@ -345,7 +356,7 @@ upload () /*) dest_host=`echo "$dest" | sed 's,:.*,,'` mkdirective "$destdir" "$base" "$file" "$stmt" - echo "$passphrase" | $dbg $GPG --passphrase-fd 0 --clearsign $base.directive + echo "$passphrase" | $dbg $GPG $passphrase_fd_0 --clearsign $base.directive $dbg cp $files $base.directive.asc $dest_host ;; *) @@ -393,6 +404,12 @@ do do echo "Uploading $file to $dest ..." stmt= + # + # allowing file replacement is all or nothing. + if test -n "$replace"; then stmt="$stmt +$replace" + fi + # files="$file $file.sig" destdir=`echo $dest | sed 's/[^:]*://'` if test -n "$symlink_expr"; then diff --git a/build-aux/mdate-sh b/build-aux/mdate-sh index 4614441d..b3719cf7 100755 --- a/build-aux/mdate-sh +++ b/build-aux/mdate-sh @@ -3,7 +3,7 @@ scriptversion=2010-08-21.06; # UTC -# Copyright (C) 1995-2012 Free Software Foundation, Inc. +# Copyright (C) 1995-2013 Free Software Foundation, Inc. # written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, June 1995 # # This program is free software; you can redistribute it and/or modify diff --git a/build-aux/missing b/build-aux/missing index 9a556482..86a8fc31 100755 --- a/build-aux/missing +++ b/build-aux/missing @@ -1,9 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2012-01-06.18; # UTC +scriptversion=2012-01-06.13; # UTC -# Copyright (C) 1996-2012 Free Software Foundation, Inc. +# 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. # This program is free software; you can redistribute it and/or modify @@ -25,7 +26,7 @@ scriptversion=2012-01-06.18; # 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 @@ -33,7 +34,7 @@ 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 +# In the cases where this matters, `missing' is being run in the # srcdir already. if test -f configure.ac; then configure_ac=configure.ac @@ -64,7 +65,7 @@ case $1 in echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an +Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an error status if there is no known handling for PROGRAM. Options: @@ -73,20 +74,20 @@ Options: --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' + 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 + 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 + 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] + yacc create \`y.tab.[ch]', if possible, from existing .[ch] -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 $? @@ -98,8 +99,8 @@ 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 ;; @@ -126,7 +127,7 @@ case $1 in 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 + # running `$TOOL --version' or `$TOOL --help' to check whether # $TOOL exists and not knowing $TOOL uses missing. exit 1 fi @@ -138,27 +139,27 @@ esac 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 +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 +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 +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" @@ -175,9 +176,9 @@ WARNING: '$1' is $msg. You should only need it if 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. +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/' | @@ -186,10 +187,10 @@ WARNING: '$1' is $msg. You should only need it if autom4te*) echo 1>&2 "\ -WARNING: '$1' is needed, but is $msg. +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 + You can get \`$1' as part of \`Autoconf' from any GNU archive site." file=`echo "$*" | sed -n "$sed_output"` @@ -209,10 +210,10 @@ WARNING: '$1' is needed, but is $msg. 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 +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." + \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h if test $# -ne 1; then eval LASTARG=\${$#} @@ -239,10 +240,10 @@ WARNING: '$1' $msg. You should only need it if 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 +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." + \`Flex' from any GNU archive site." rm -f lex.yy.c if test $# -ne 1; then eval LASTARG=\${$#} @@ -262,10 +263,10 @@ WARNING: '$1' is $msg. You should only need it if help2man*) echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if +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." + \`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"` @@ -280,12 +281,12 @@ WARNING: '$1' is $msg. You should only need it if 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 +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." + 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"` @@ -309,12 +310,12 @@ WARNING: '$1' is $msg. You should only need it if *) echo 1>&2 "\ -WARNING: '$1' is needed, and is $msg. +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, + 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." + some other package would contain this missing \`$1' program." exit 1 ;; esac diff --git a/build-aux/prefix-gnulib-mk b/build-aux/prefix-gnulib-mk new file mode 100755 index 00000000..7553f654 --- /dev/null +++ b/build-aux/prefix-gnulib-mk @@ -0,0 +1,247 @@ +eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}' + & eval 'exec perl -wS "$0" $argv:q' + if 0; + +use strict; +use IO::File; +use Getopt::Long; +use File::Basename; # for dirname + +my $VERSION = '2012-01-21 17:13'; # UTC +(my $ME = $0) =~ s|.*/||; + +my $prefix; +my $lib_name; + +sub usage ($) +{ + my ($exit_code) = @_; + my $STREAM = ($exit_code == 0 ? *STDOUT : *STDERR); + if ($exit_code != 0) + { + print $STREAM "Try '$ME --help' for more information.\n"; + } + else + { + print $STREAM <<EOF; +Usage: $ME --lib-name=NAME FILE + or: $ME [--help|--version] +Rewrite a gnulib-tool-generated FILE like lib/gnulib.mk to work with +automake's subdir-objects. + +OPTIONS: + +This option must be specified: + + --lib-name=NAME library name, often "lib\$project" + +The following are optional: + + --help display this help and exit + --version output version information and exit + +EOF + } + exit $exit_code; +} + +# contents ($FILE_NAME) +# --------------------- +sub contents ($) +{ + my ($file) = @_; + local $/; # Turn on slurp-mode. + my $f = new IO::File "< $file" or die "$file"; + my $contents = $f->getline or die "$file"; + $f->close; + return $contents; +} + +# prefix_word ($WORD) +# ------------------- +# Do not prefix special words such as variable dereferences. Also, +# "Makefile" is really "Makefile", since precisely there is no +# lib/Makefile. +sub prefix_word ($) +{ + local ($_) = @_; + $_ = $prefix . $_ + unless (/^-/ || m{^\$\(\w+\)} || $_ eq "Makefile" || $_ eq '\\' + || $_ eq '@ALLOCA@'); + return $_; +} + + +# prefix_words ($TEXT) +# -------------------- +sub prefix_words ($) +{ + local ($_) = @_; + s{(\S+)}{prefix_word($1)}gem; + return $_; +} + + +# prefix_assignment ($LHS-AND-ASSIGN-OP, $RHS) +# -------------------------------------------- +sub prefix_assignment ($$) +{ + my ($lhs_and_assign_op, $rhs) = @_; + my $res; + + # Some variables are initialized by gnulib.mk, and we don't want + # that. Change '=' to '+='. + if ($lhs_and_assign_op =~ /^GPERF =$/) + { + # Do not change the RHS, which specifies the GPERF program. + } + elsif ($lhs_and_assign_op =~ + /^(SUBDIRS|EXTRA_DIST|BUILT_SOURCES|SUFFIXES|MOSTLYCLEANFILES + |CLEANFILES|DISTCLEANFILES|MAINTAINERCLEANFILES|AM_CFLAGS + |AM_CPPFLAGS|AM_GNU_GETTEXT)\ =/x) + { + $lhs_and_assign_op =~ s/=/+=/; + } + # We don't want to inherit gnulib's AUTOMAKE_OPTIONS, comment them. + elsif ($lhs_and_assign_op =~ /^AUTOMAKE_OPTIONS =/) + { + $lhs_and_assign_op =~ s/^/# /; + } + elsif ($lhs_and_assign_op =~ /^SUFFIXES /) + { + # Elide any SUFFIXES assignment or concatenation. + $lhs_and_assign_op =~ s/^/# /; + } + # The words are (probably) paths to files in lib/: prefix them. + else + { + $rhs = prefix_words($rhs) + } + + # Variables which name depend on the location: libbison_a_SOURCES => + # lib_libbison_a_SOURCES. + $lhs_and_assign_op =~ s/($lib_name)/lib_$1/g; + + return $lhs_and_assign_op . $rhs; +} + +# prefix $CONTENTS +# ---------------- +# $CONTENTS is a Makefile content. Post-process it so that each file-name +# is prefixed with $prefix (e.g., "lib/"). +# +# Relies heavily on the regularity of the file generated by gnulib-tool. +sub prefix ($) +{ + # Work on $_. + local ($_) = @_; + + # Prefix all the occurrence of files in rules. If there is nothing + # after in the :, it's probably a phony target, or a suffix rule. + # Don't touch it. + s{^([-\w+/]+\.[-\w.]+ *: *\S.*)$} + {prefix_words($1)}gem; + + # Prefix files in variables. + s{^([\w.]+\s*\+?=)(.*)$} + {prefix_assignment($1, $2)}gem; + + # These three guys escape all the other regular rules. + # Require the leading white space to avoid inserting the prefix + # on a line like this: + # charset_alias = $(DESTDIR)$(libdir)/charset.alias + # With $(libdir), it would be erroneous. + s{(\s)(charset\.alias|ref-add\.sed|ref-del\.sed)}{$1$prefix$2}g; + # Unfortunately, as a result we sometimes have lib/lib. + s{($prefix){2}}{$1}g; + + # lib_libcoreutils_a_SOURCES += \ + # imaxtostr.c \ + # inttostr.c \ + # offtostr.c \ + # uinttostr.c \ + # umaxtostr.c + # The above are not handled since they're on continued lines, so + # deal with them manually: + s{^(\s*)((?:[ui]max|u?int|off)tostr\.c(:? \\)?)$}{$1$prefix$2}gm; + + # $(srcdir)/ is actually $(top_srcdir)/$prefix/. + # The trailing slash is required to avoid matching this rule: + # test '$(srcdir)' = . || rm -f $(top_builddir)/GNUmakefile + s{\$\(srcdir\)/}{\$(top_srcdir)/$prefix}g; + + # Sometimes, t-$@ is used instead of $@-t, which, of course, does + # not work when we have a $@ with a directory in it. + s{t-\$\@}{\$\@-t}g; + + # Some AC_SUBST patterns remain and would better be Make macros. + s{\@(MKDIR_P)\@}{\$($1)}g; + + # Adjust paths in mkdir. + s{(\$\(MKDIR_P\))\s*(\w+)}{$1 $prefix$2}g; + + return $_; +} + +# process ($IN) +# ------------- +sub process ($) +{ + my ($file) = @_; + my ($bak) = "$file.bak"; + rename ($file, $bak) or die; + my $contents = contents ($bak); + $contents = prefix ($contents); + my $out = new IO::File(">$file") or die; + print $out $contents; +} + +{ + GetOptions + ( + 'lib-name=s' => \$lib_name, + help => sub { usage 0 }, + version => sub { print "$ME version $VERSION\n"; exit }, + ) or usage 1; + + my $fail = 0; + defined $lib_name + or (warn "$ME: no library name; use --lib-name=NAME\n"), $fail = 1; + + # There must be exactly one argument. + @ARGV == 0 + and (warn "$ME: missing FILE argument\n"), $fail = 1; + 1 < @ARGV + and (warn "$ME: too many arguments:\n", join ("\n", @ARGV), "\n"), + $fail = 1; + $fail + and usage 1; + + my $file = $ARGV[0]; + $prefix = (dirname $file) . '/'; + warn "prefix=$prefix\n"; + + process $file; +} + +### Setup "GNU" style for perl-mode and cperl-mode. +## Local Variables: +## perl-indent-level: 2 +## perl-continued-statement-offset: 2 +## perl-continued-brace-offset: 0 +## perl-brace-offset: 0 +## perl-brace-imaginary-offset: 0 +## perl-label-offset: -2 +## cperl-indent-level: 2 +## cperl-brace-offset: 0 +## cperl-continued-brace-offset: 0 +## cperl-label-offset: -2 +## cperl-extra-newline-before-brace: t +## cperl-merge-trailing-else: nil +## cperl-continued-statement-offset: 2 +## eval: (add-hook 'write-file-hooks 'time-stamp) +## time-stamp-start: "my $VERSION = '" +## time-stamp-format: "%:y-%02m-%02d %02H:%02M" +## time-stamp-time-zone: "UTC" +## time-stamp-end: "'; # UTC" +## End: diff --git a/build-aux/snippet/arg-nonnull.h b/build-aux/snippet/arg-nonnull.h index 3a9dd266..8ea2a474 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-2012 Free Software Foundation, Inc. + 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 diff --git a/build-aux/snippet/c++defs.h b/build-aux/snippet/c++defs.h index 96da94b9..b35b933c 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-2012 Free Software Foundation, Inc. + Copyright (C) 2010-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 diff --git a/build-aux/snippet/unused-parameter.h b/build-aux/snippet/unused-parameter.h index 1c8d61f2..1347c278 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-2012 Free Software Foundation, Inc. + 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 diff --git a/build-aux/snippet/warn-on-use.h b/build-aux/snippet/warn-on-use.h index d4cb94f3..1736a1bd 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-2012 Free Software Foundation, Inc. + Copyright (C) 2010-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 @@ -55,7 +55,7 @@ rather than issue the nice warning, but the end result of informing the developer about their portability problem is still achieved): #if HAVE_RAW_DECL_ENVIRON - static inline char ***rpl_environ (void) { return &environ; } + static char ***rpl_environ (void) { return &environ; } _GL_WARN_ON_USE (rpl_environ, "environ is not always properly declared"); # undef environ # define environ (*rpl_environ ()) diff --git a/build-aux/test-driver b/build-aux/test-driver deleted file mode 100755 index b89107c0..00000000 --- a/build-aux/test-driver +++ /dev/null @@ -1,127 +0,0 @@ -#! /bin/sh -# test-driver - basic driver script for the `parallel-tests' mode. - -scriptversion=2011-08-17.14; # UTC - -# Copyright (C) 2011 Free Software Foundation, Inc. -# -# This 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 -The \`--test-name', \`--log-file' and \`--trs-file' options are mandatory. -END -} - -# TODO: better error handling in option parsing (in particular, ensure -# TODO: $log_file, $trs_file and $test_name are defined). -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'";; - esac - shift -done - -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 e4dca02c..85f184cc 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{2012-04-06.11} +\def\texinfoversion{2013-02-01.11} % % 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 Free Software Foundation, Inc. +% 2007, 2008, 2009, 2010, 2011, 2012, 2013 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 @@ -24,13 +24,14 @@ % % As a special exception, when this file is read by TeX when processing % a Texinfo source document, you may use the result without -% restriction. (This has been our intent since Texinfo was invented.) +% restriction. This Exception is an additional permission under section 7 +% of the GNU General Public License, version 3 ("GPLv3"). % % Please try the latest version of texinfo.tex before submitting bug % reports; you can get the latest version from: -% http://www.gnu.org/software/texinfo/ (the Texinfo home page), or -% ftp://tug.org/tex/texinfo.tex -% (and all CTAN mirrors, see http://www.ctan.org). +% http://ftp.gnu.org/gnu/texinfo/ (the Texinfo release area), or +% http://ftpmirror.gnu.org/texinfo/ (same, via a mirror), or +% http://www.gnu.org/software/texinfo/ (the Texinfo home page) % The texinfo.tex in any given distribution could well be out % of date, so if that's what you're using, please check. % @@ -594,7 +595,7 @@ \def\:{\spacefactor=1000 } % @* forces a line break. -\def\*{\hfil\break\hbox{}\ignorespaces} +\def\*{\unskip\hfil\break\hbox{}\ignorespaces} % @/ allows a line break. \let\/=\allowbreak @@ -1117,7 +1118,7 @@ where each line of input produces a line of output.} % #1 is a control sequence in which to do the replacements, % which we \xdef. \def\txiescapepdf#1{% - \ifx\pdfescapestring\relax + \ifx\pdfescapestring\thisisundefined % No primitive available; should we give a warning or log? % Many times it won't matter. \else @@ -1367,9 +1368,8 @@ output) for that.)} \def\skipspaces#1{\def\PP{#1}\def\D{|}% \ifx\PP\D\let\nextsp\relax \else\let\nextsp\skipspaces - \ifx\p\space\else\addtokens{\filename}{\PP}% - \advance\filenamelength by 1 - \fi + \addtokens{\filename}{\PP}% + \advance\filenamelength by 1 \fi \nextsp} \def\getfilename#1{% @@ -1475,9 +1475,6 @@ output) for that.)} \def\ttsl{\setfontstyle{ttsl}} -% Default leading. -\newdimen\textleading \textleading = 13.2pt - % Set the baselineskip to #1, and the lineskip and strut size % correspondingly. There is no deep meaning behind these magic numbers % used as factors; they just match (closely enough) what Knuth defined. @@ -1489,6 +1486,7 @@ output) for that.)} % can get a sort of poor man's double spacing by redefining this. \def\baselinefactor{1} % +\newdimen\textleading \def\setleading#1{% \dimen0 = #1\relax \normalbaselineskip = \baselinefactor\dimen0 @@ -1761,18 +1759,24 @@ end \fi\fi -% Set the font macro #1 to the font named #2, adding on the -% specified font prefix (normally `cm'). +% Set the font macro #1 to the font named \fontprefix#2. % #3 is the font's design size, #4 is a scale factor, #5 is the CMap -% encoding (currently only OT1, OT1IT and OT1TT are allowed, pass -% empty to omit). +% encoding (only OT1, OT1IT and OT1TT are allowed, or empty to omit). +% Example: +% #1 = \textrm +% #2 = \rmshape +% #3 = 10 +% #4 = \mainmagstep +% #5 = OT1 +% \def\setfont#1#2#3#4#5{% \font#1=\fontprefix#2#3 scaled #4 \csname cmap#5\endcsname#1% } % This is what gets called when #5 of \setfont is empty. \let\cmap\gobble -% emacs-page end of cmaps +% +% (end of cmaps) % Use cm as the default font prefix. % To specify the font prefix, you must define \fontprefix @@ -1782,7 +1786,7 @@ end \fi % Support font families that don't use the same naming scheme as CM. \def\rmshape{r} -\def\rmbshape{bx} %where the normal face is bold +\def\rmbshape{bx} % where the normal face is bold \def\bfshape{b} \def\bxshape{bx} \def\ttshape{tt} @@ -1797,8 +1801,7 @@ end \def\scshape{csc} \def\scbshape{csc} -% Definitions for a main text size of 11pt. This is the default in -% Texinfo. +% Definitions for a main text size of 11pt. (The default in Texinfo.) % \def\definetextfontsizexi{% % Text fonts (11.2pt, magstep1). @@ -1923,7 +1926,7 @@ end \textleading = 13.2pt % line spacing for 11pt CM \textfonts % reset the current fonts \rm -} % end of 11pt text font size definitions +} % end of 11pt text font size definitions, \definetextfontsizexi % Definitions to make the main text be 10pt Computer Modern, with @@ -2055,7 +2058,7 @@ end \textleading = 12pt % line spacing for 10pt CM \textfonts % reset the current fonts \rm -} % end of 10pt text font size definitions +} % end of 10pt text font size definitions, \definetextfontsizex % We provide the user-level command @@ -2270,8 +2273,6 @@ end \gdef\markupsetcodequoteleft{\let`\codequoteleft} \gdef\markupsetcodequoteright{\let'\codequoteright} - -\gdef\markupsetnoligaturesquoteleft{\let`\noligaturesquoteleft} } \let\markupsetuplqcode \markupsetcodequoteleft @@ -2280,6 +2281,9 @@ end \let\markupsetuplqexample \markupsetcodequoteleft \let\markupsetuprqexample \markupsetcodequoteright % +\let\markupsetuplqkbd \markupsetcodequoteleft +\let\markupsetuprqkbd \markupsetcodequoteright +% \let\markupsetuplqsamp \markupsetcodequoteleft \let\markupsetuprqsamp \markupsetcodequoteright % @@ -2289,8 +2293,6 @@ end \let\markupsetuplqverbatim \markupsetcodequoteleft \let\markupsetuprqverbatim \markupsetcodequoteright -\let\markupsetuplqkbd \markupsetnoligaturesquoteleft - % Allow an option to not use regular directed right quote/apostrophe % (char 0x27), but instead the undirected quote from cmtt (char 0x0d). % The undirected quote is ugly, so don't make it the default, but it @@ -2380,8 +2382,7 @@ end \aftersmartic } -% like \smartslanted except unconditionally uses \ttsl, and no ic. -% @var is set to this for defun arguments. +% Unconditional use \ttsl, and no ic. @var is set to this for defuns. \def\ttslanted#1{{\ttsl #1}} % @cite is like \smartslanted except unconditionally use \sl. We never want @@ -2446,34 +2447,12 @@ end % @samp. \def\samp#1{{\setupmarkupstyle{samp}\lq\tclose{#1}\rq\null}} -% definition of @key that produces a lozenge. Doesn't adjust to text size. -%\setfont\keyrm\rmshape{8}{1000}{OT1} -%\font\keysy=cmsy9 -%\def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{% -% \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{% -% \vbox{\hrule\kern-0.4pt -% \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}% -% \kern-0.4pt\hrule}% -% \kern-.06em\raise0.4pt\hbox{\angleright}}}} - -% definition of @key with no lozenge. If the current font is already -% monospace, don't change it; that way, we respect @kbdinputstyle. But -% if it isn't monospace, then use \tt. -% -\def\key#1{{\setupmarkupstyle{key}% - \nohyphenation - \ifmonospace\else\tt\fi - #1}\null} +% @indicateurl is \samp, that is, with quotes. +\let\indicateurl=\samp -% ctrl is no longer a Texinfo command. -\def\ctrl #1{{\tt \rawbackslash \hat}#1} - -% @file, @option are the same as @samp. -\let\file=\samp -\let\option=\samp - -% @code is a modification of @t, -% which makes spaces the same size as normal in the surrounding text. +% @code (and similar) prints in typewriter, but with spaces the same +% size as normal in the surrounding text, without hyphenation, etc. +% This is a subroutine for that. \def\tclose#1{% {% % Change normal interword space to be same as for the current font. @@ -2498,7 +2477,7 @@ end % We *must* turn on hyphenation at `-' and `_' in @code. % 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) @@ -2517,7 +2496,7 @@ end \let-\codedash \let_\codeunder \else - \let-\realdash + \let-\normaldash \let_\realunder \fi \codex @@ -2526,7 +2505,7 @@ end \def\codex #1{\tclose{#1}\endgroup} -\def\realdash{-} +\def\normaldash{-} \def\codedash{-\discretionary{}{}{}} \def\codeunder{% % this is all so @math{@code{var_name}+1} can work. In math mode, _ @@ -2541,9 +2520,9 @@ end } % An additional complication: the above will allow breaks after, e.g., -% each of the four underscores in __typeof__. This is undesirable in -% some manuals, especially if they don't have long identifiers in -% general. @allowcodebreaks provides a way to control this. +% each of the four underscores in __typeof__. This is bad. +% @allowcodebreaks provides a document-level way to turn breaking at - +% and _ on and off. % \newif\ifallowcodebreaks \allowcodebreakstrue @@ -2562,6 +2541,13 @@ end \fi\fi } +% For @command, @env, @file, @option quotes seem unnecessary, +% so use \code rather than \samp. +\let\command=\code +\let\env=\code +\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 @@ -2708,10 +2694,6 @@ end \let\email=\uref \fi -% @kbd is like @code, except that if the argument is just one @key command, -% then @kbd has no effect. -\def\kbd#1{{\setupmarkupstyle{kbd}\def\look{#1}\expandafter\kbdfoo\look??\par}} - % @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always), % `example' (@kbd uses ttsl only inside of @example and friends), % or `code' (@kbd uses normal tty font always). @@ -2735,16 +2717,36 @@ end % Default is `distinct'. \kbdinputstyle distinct +% @kbd is like @code, except that if the argument is just one @key command, +% then @kbd has no effect. +\def\kbd#1{{\def\look{#1}\expandafter\kbdsub\look??\par}} + \def\xkey{\key} -\def\kbdfoo#1#2#3\par{\def\one{#1}\def\three{#3}\def\threex{??}% -\ifx\one\xkey\ifx\threex\three \key{#2}% -\else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi -\else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi} +\def\kbdsub#1#2#3\par{% + \def\one{#1}\def\three{#3}\def\threex{??}% + \ifx\one\xkey\ifx\threex\three \key{#2}% + \else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi + \else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi +} -% For @indicateurl, @env, @command quotes seem unnecessary, so use \code. -\let\indicateurl=\code -\let\env=\code -\let\command=\code +% definition of @key that produces a lozenge. Doesn't adjust to text size. +%\setfont\keyrm\rmshape{8}{1000}{OT1} +%\font\keysy=cmsy9 +%\def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{% +% \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{% +% \vbox{\hrule\kern-0.4pt +% \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}% +% \kern-0.4pt\hrule}% +% \kern-.06em\raise0.4pt\hbox{\angleright}}}} + +% definition of @key with no lozenge. If the current font is already +% monospace, don't change it; that way, we respect @kbdinputstyle. But +% if it isn't monospace, then use \tt. +% +\def\key#1{{\setupmarkupstyle{key}% + \nohyphenation + \ifmonospace\else\tt\fi + #1}\null} % @clicksequence{File @click{} Open ...} \def\clicksequence#1{\begingroup #1\endgroup} @@ -2852,6 +2854,9 @@ end } } +% ctrl is no longer a Texinfo command, but leave this definition for fun. +\def\ctrl #1{{\tt \rawbackslash \hat}#1} + % @inlinefmt{FMTNAME,PROCESSED-TEXT} and @inlineraw{FMTNAME,RAW-TEXT}. % Ignore unless FMTNAME == tex; then it is like @iftex and @tex, % except specified as a normal braced arg, so no newlines to worry about. @@ -3142,12 +3147,17 @@ end % hopefully nobody will notice/care. \edef\ecsize{\csname\curfontsize ecsize\endcsname}% \edef\nominalsize{\csname\curfontsize nominalsize\endcsname}% - \ifx\curfontstyle\bfstylename - % bold: - \font\thisecfont = ecb\ifusingit{i}{x}\ecsize \space at \nominalsize + \ifmonospace + % typewriter: + \font\thisecfont = ectt\ecsize \space at \nominalsize \else - % regular: - \font\thisecfont = ec\ifusingit{ti}{rm}\ecsize \space at \nominalsize + \ifx\curfontstyle\bfstylename + % bold: + \font\thisecfont = ecb\ifusingit{i}{x}\ecsize \space at \nominalsize + \else + % regular: + \font\thisecfont = ec\ifusingit{ti}{rm}\ecsize \space at \nominalsize + \fi \fi \thisecfont } @@ -3260,6 +3270,20 @@ end \finishedtitlepagetrue } +% Settings used for typesetting titles: no hyphenation, no indentation, +% don't worry much about spacing, ragged right. This should be used +% inside a \vbox, and fonts need to be set appropriately first. Because +% it is always used for titles, nothing else, we call \rmisbold. \par +% should be specified before the end of the \vbox, since a vbox is a group. +% +\def\raggedtitlesettings{% + \rmisbold + \hyphenpenalty=10000 + \parindent=0pt + \tolerance=5000 + \ptexraggedright +} + % Macros to be used within @titlepage: \let\subtitlerm=\tenrm @@ -3267,7 +3291,7 @@ end \parseargdef\title{% \checkenv\titlepage - \leftline{\titlefonts\rmisbold #1} + \vbox{\titlefonts \raggedtitlesettings #1\par}% % print a rule at the page bottom also. \finishedtitlepagefalse \vskip4pt \hrule height 4pt width \hsize \vskip4pt @@ -4164,7 +4188,7 @@ end % ..., but we might end up with active ones in the argument if % we're called from @code, as @code{@value{foo-bar_}}, though. % So \let them to their normal equivalents. - \let-\realdash \let_\normalunderscore + \let-\normaldash \let_\normalunderscore } } @@ -4204,7 +4228,7 @@ end } \def\ifsetfail{\doignore{ifset}} -% @ifclear VAR ... @end ifclear reads the `...' iff VAR has never been +% @ifclear VAR ... @end executes the `...' iff VAR has never been % defined with @set, or has been undefined with @clear. % % The `\else' inside the `\doifset' parameter is a trick to reuse the @@ -4215,6 +4239,35 @@ end \def\ifclear{\parsearg{\doifset{\else \let\next=\ifclearfail}}} \def\ifclearfail{\doignore{ifclear}} +% @ifcommandisdefined CMD ... @end executes the `...' if CMD (written +% without the @) is in fact defined. We can only feasibly check at the +% TeX level, so something like `mathcode' is going to considered +% defined even though it is not a Texinfo command. +% +\makecond{ifcommanddefined} +\def\ifcommanddefined{\parsearg{\doifcmddefined{\let\next=\ifcmddefinedfail}}} +% +\def\doifcmddefined#1#2{{% + \makevalueexpandable + \let\next=\empty + \expandafter\ifx\csname #2\endcsname\relax + #1% If not defined, \let\next as above. + \fi + \expandafter + }\next +} +\def\ifcmddefinedfail{\doignore{ifcommanddefined}} + +% @ifcommandnotdefined CMD ... handled similar to @ifclear above. +\makecond{ifcommandnotdefined} +\def\ifcommandnotdefined{% + \parsearg{\doifcmddefined{\else \let\next=\ifcmdnotdefinedfail}}} +\def\ifcmdnotdefinedfail{\doignore{ifcommandnotdefined}} + +% Set the `txicommandconditionals' variable, so documents have a way to +% test if the @ifcommand...defined conditionals are available. +\set txicommandconditionals + % @dircategory CATEGORY -- specify a category of the dir file % which this file should belong to. Ignore this in TeX. \let\dircategory=\comment @@ -5541,14 +5594,6 @@ end % Define @majorheading, @heading and @subheading -% NOTE on use of \vbox for chapter headings, section headings, and such: -% 1) We use \vbox rather than the earlier \line to permit -% overlong headings to fold. -% 2) \hyphenpenalty is set to 10000 because hyphenation in a -% heading is obnoxious; this forbids it. -% 3) Likewise, headings look best if no \parindent is used, and -% if justification is not attempted. Hence \raggedright. - \def\majorheading{% {\advance\chapheadingskip by 10pt \chapbreak }% \parsearg\chapheadingzzz @@ -5556,10 +5601,8 @@ end \def\chapheading{\chapbreak \parsearg\chapheadingzzz} \def\chapheadingzzz#1{% - {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000 - \parindent=0pt\ptexraggedright - \rmisbold #1\hfill}}% - \bigskip \par\penalty 200\relax + \vbox{\chapfonts \raggedtitlesettings #1\par}% + \nobreak\bigskip \nobreak \suppressfirstparagraphindent } @@ -5718,8 +5761,7 @@ end % % Typeset the actual heading. \nobreak % Avoid page breaks at the interline glue. - \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \ptexraggedright - \hangindent=\wd0 \centerparametersmaybe + \vbox{\raggedtitlesettings \hangindent=\wd0 \centerparametersmaybe \unhbox0 #1\par}% }% \nobreak\bigskip % no page break after a chapter title @@ -5741,18 +5783,18 @@ end \def\setchapterstyle #1 {\csname CHAPF#1\endcsname} % \def\unnchfopen #1{% -\chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000 - \parindent=0pt\ptexraggedright - \rmisbold #1\hfill}}\bigskip \par\nobreak + \chapoddpage + \vbox{\chapfonts \raggedtitlesettings #1\par}% + \nobreak\bigskip\nobreak } \def\chfopen #1#2{\chapoddpage {\chapfonts \vbox to 3in{\vfil \hbox to\hsize{\hfil #2} \hbox to\hsize{\hfil #1} \vfil}}% \par\penalty 5000 % } \def\centerchfopen #1{% -\chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000 - \parindent=0pt - \hfill {\rmisbold #1}\hfill}}\bigskip \par\nobreak + \chapoddpage + \vbox{\chapfonts \raggedtitlesettings \hfill #1\hfill}% + \nobreak\bigskip \nobreak } \def\CHAPFopen{% \global\let\chapmacro=\chfopen @@ -6518,16 +6560,9 @@ end \makedispenvdef{quotation}{\quotationstart} % \def\quotationstart{% - {\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip - \parindent=0pt - % - % @cartouche defines \nonarrowing to inhibit narrowing at next level down. + \indentedblockstart % same as \indentedblock, but increase right margin too. \ifx\nonarrowing\relax - \advance\leftskip by \lispnarrowing \advance\rightskip by \lispnarrowing - \exdentamount = \lispnarrowing - \else - \let\nonarrowing = \relax \fi \parsearg\quotationlabel } @@ -6553,6 +6588,32 @@ end \fi } +% @indentedblock is like @quotation, but indents only on the left and +% has no optional argument. +% +\makedispenvdef{indentedblock}{\indentedblockstart} +% +\def\indentedblockstart{% + {\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip + \parindent=0pt + % + % @cartouche defines \nonarrowing to inhibit narrowing at next level down. + \ifx\nonarrowing\relax + \advance\leftskip by \lispnarrowing + \exdentamount = \lispnarrowing + \else + \let\nonarrowing = \relax + \fi +} + +% Keep a nonzero parskip for the environment, since we're doing normal filling. +% +\def\Eindentedblock{% + \par + {\parskip=0pt \afterenvbreak}% +} +\def\Esmallindentedblock{\Eindentedblock} + % LaTeX-like @verbatim...@end verbatim and @verb{<char>...<char>} % If we want to allow any <char> as delimiter, @@ -7031,7 +7092,10 @@ end \df \sl \hyphenchar\font=0 % % On the other hand, if an argument has two dashes (for instance), we - % want a way to get ttsl. Let's try @var for that. + % want a way to get ttsl. We used to recommend @var for that, so + % leave the code in, but it's strange for @var to lead to typewriter. + % Nowadays we recommend @code, since the difference between a ttsl hyphen + % and a tt hyphen is pretty tiny. @code also disables ?` !`. \def\var##1{{\setupmarkupstyle{var}\ttslanted{##1}}}% #1% \sl\hyphenchar\font=45 @@ -9929,22 +9993,26 @@ directory should work if nowhere else does.} @gdef@otherbackslash{@let\=@realbackslash} % Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of -% the literal character `\'. -% -@def@normalturnoffactive{% - @let"=@normaldoublequote - @let$=@normaldollar %$ font-lock fix - @let+=@normalplus - @let<=@normalless - @let>=@normalgreater - @let\=@normalbackslash - @let^=@normalcaret - @let_=@normalunderscore - @let|=@normalverticalbar - @let~=@normaltilde - @markupsetuplqdefault - @markupsetuprqdefault - @unsepspaces +% the literal character `\'. Also revert - to its normal character, in +% case the active - from code has slipped in. +% +{@catcode`- = @active + @gdef@normalturnoffactive{% + @let-=@normaldash + @let"=@normaldoublequote + @let$=@normaldollar %$ font-lock fix + @let+=@normalplus + @let<=@normalless + @let>=@normalgreater + @let\=@normalbackslash + @let^=@normalcaret + @let_=@normalunderscore + @let|=@normalverticalbar + @let~=@normaltilde + @markupsetuplqdefault + @markupsetuprqdefault + @unsepspaces + } } % Make _ and + \other characters, temporarily. diff --git a/build-aux/update-copyright b/build-aux/update-copyright index 082b749d..c72d0e67 100755 --- a/build-aux/update-copyright +++ b/build-aux/update-copyright @@ -3,9 +3,9 @@ eval '(exit $?0)' && eval 'exec perl -wS -0777 -pi "$0" ${1+"$@"}' if 0; # Update an FSF copyright year list to include the current year. -my $VERSION = '2012-02-05.21:39'; # UTC +my $VERSION = '2013-01-03.09:41'; # UTC -# Copyright (C) 2009-2012 Free Software Foundation, Inc. +# 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 @@ -192,7 +192,7 @@ if (defined $stmt_re) if ($final_year != $this_year) { # Update the year. - $stmt =~ s/$final_year_orig/$final_year, $this_year/; + $stmt =~ s/\b$final_year_orig\b/$final_year, $this_year/; } if ($final_year != $this_year || $ENV{'UPDATE_COPYRIGHT_FORCE'}) { diff --git a/build-aux/useless-if-before-free b/build-aux/useless-if-before-free index 2b646308..663347a3 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-2012 Free Software Foundation, Inc. +# 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 diff --git a/build-aux/vc-list-files b/build-aux/vc-list-files index d477da8e..7ec335fb 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-2012 Free Software Foundation, Inc. +# Copyright (C) 2006-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 diff --git a/cfg.mk b/cfg.mk index 3fce0ab1..77356ab1 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1,5 +1,5 @@ # Customize maint.mk -*- makefile -*- -# Copyright (C) 2003-2012 Free Software Foundation, Inc. +# 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 @@ -23,7 +23,7 @@ url_dir_list = http://ftp.gnu.org/gnu/$(PACKAGE) # Tests not to run as part of "make distcheck". local-checks-to-skip = \ - sc_texinfo_acronym + sc_proper_name_utf8_requires_ICONV # Tools used to bootstrap this package, used for "announcement". bootstrap-tools = autoconf,automake,gnulib,bison @@ -45,7 +45,7 @@ export VERBOSE = yes # 4914152 9e export XZ_OPT = -8e -old_NEWS_hash = d2ba572c2f1135b74e24ea3fb20e674e +old_NEWS_hash = b93e7e43dd35f32961c354e41211b86e # Add an exemption for sc_makefile_at_at_check. _makefile_at_at_check_exceptions = ' && !/^cu_install_program =/' @@ -95,21 +95,25 @@ sc_prohibit_jm_in_m4: # Ensure that each root-requiring test is run via the "check-root" rule. sc_root_tests: - @if test -d tests \ - && grep check-root tests/Makefile.am>/dev/null 2>&1; then \ - t1=sc-root.expected; t2=sc-root.actual; \ - grep -nl '^ *require_root_$$' \ - $$($(VC_LIST) tests) |sed s,tests/,, |sort > $$t1; \ - sed -n '/^root_tests =[ ]*\\$$/,/[^\]$$/p' \ - $(srcdir)/tests/Makefile.am \ - | sed 's/^ *//;/^root_tests =/d' \ - | tr -s '\012\\' ' ' | fmt -1 | sort > $$t2; \ - diff -u $$t1 $$t2 || diff=1 || diff=; \ + @t1=sc-root.expected; t2=sc-root.actual; \ + grep -nl '^ *require_root_$$' `$(VC_LIST) tests` | sort > $$t1; \ + for t in $(all_root_tests); do echo $$t; done | sort > $$t2; \ + st=0; diff -u $$t1 $$t2 || st=1; \ rm -f $$t1 $$t2; \ - test "$$diff" \ - && { echo 'tests/Makefile.am: missing check-root action'>&2; \ - exit 1; } || :; \ - fi + exit $$st + +# Ensure that all version-controlled test cases are listed in $(all_tests). +sc_tests_list_consistency: + @bs="\\"; \ + test_extensions_rx=`echo $(TEST_EXTENSIONS) \ + | sed -e "s/ /|/g" -e "s/$$bs./$$bs$$bs./g"`; \ + { \ + for t in $(all_tests); do echo $$t; done; \ + cd $(top_srcdir); \ + $(SHELL) build-aux/vc-list-files tests \ + | grep -Ev '^tests/(factor/(run|create-test)|init)\.sh$$' \ + | $(EGREP) "$$test_extensions_rx\$$"; \ + } | sort | uniq -u | grep . && exit 1; : # Create a list of regular expressions matching the names # of files included from system.h. Exclude a couple. @@ -146,9 +150,56 @@ sc_sun_os_names: { echo '$(ME): found misuse of Sun OS version numbers' 1>&2; \ exit 1; } || : -ALL_RECURSIVE_TARGETS += sc_check-AUTHORS -sc_check-AUTHORS: - @$(MAKE) -s -C src _sc_check-AUTHORS +# Ensure that the list of programs and author names is accurate. +# We need a UTF8 locale. If a lack of locale support or a missing +# translation inhibits printing of UTF-8 names, just skip this test. +au_dotdot = authors-dotdot +au_actual = authors-actual +sc_check-AUTHORS: $(all_programs) + @locale=en_US.UTF-8; \ + LC_ALL=$$locale ./src/cat --version \ + | grep ' Torbjorn ' > /dev/null \ + && { echo "$@: skipping this check"; exit 0; }; \ + rm -f $(au_actual) $(au_dotdot); \ + for i in `ls $(all_programs) \ + | sed -e 's,^src/,,' -e 's,$(EXEEXT)$$,,' \ + | sed /libstdbuf/d \ + | $(ASSORT) -u`; do \ + test "$$i" = '[' && continue; \ + exe=$$i; \ + if test "$$i" = install; then \ + exe=ginstall; \ + elif test "$$i" = test; then \ + exe='['; \ + fi; \ + LC_ALL=$$locale ./src/$$exe --version \ + | perl -0 -pi -e 's/,\n/, /gm' \ + | sed -n -e '/Written by /{ s//'"$$i"': /;' \ + -e 's/,* and /, /; s/\.$$//; p; }'; \ + done > $(au_actual) && \ + sed -n '/^[^ ][^ ]*:/p' $(srcdir)/AUTHORS > $(au_dotdot) \ + && diff $(au_actual) $(au_dotdot) \ + && rm -f $(au_actual) $(au_dotdot) + +# Each program with a non-ASCII author name must link with LIBICONV. +sc_check-I18N-AUTHORS: + @cd $(srcdir)/src && \ + for i in $$(git grep -l -w proper_name_utf8 *.c|sed 's/\.c//'); do \ + grep -E "^src_$${i}_LDADD"' .?= .*\$$\(LIBICONV\)' local.mk \ + > /dev/null \ + || { echo "$(ME): link rules for $$i do not include" \ + '$$(LIBICONV)' 1>&2; exit 1; }; \ + done + +# Ensure %j is not used for intmax_t as it's not universally supported. +# There are issues on HPUX for example. But note that %ju was used between +# coreutils 8.13 (2011-10) and 8.20 (2012-10) without any reported issue, +# and the particular issue this check is associated with was for %*jx. +# So we may be able to relax this restriction soon. +sc_prohibit-j-printf-format: + @cd $(srcdir)/src && GIT_PAGER= git grep -n '%[0*]*j[udx]' *.c \ + && { echo '$(ME): Use PRI*MAX instead of %j' 1>&2; exit 1; } \ + || : # Look for lines longer than 80 characters, except omit: # - program-generated long lines in diff headers, @@ -157,7 +208,7 @@ sc_check-AUTHORS: LINE_LEN_MAX = 80 FILTER_LONG_LINES = \ /^[^:]*\.diff:[^:]*:@@ / d; \ - \|^[^:]*tests/misc/sha[0-9]*sum[-:]| d; \ + \|^[^:]*tests/misc/sha[0-9]*sum.*\.pl[-:]| d; \ \|^[^:]*tests/pr/|{ \|^[^:]*tests/pr/pr-tests:| !d; }; sc_long_lines: @files=$$($(VC_LIST_EXCEPT)) \ @@ -167,20 +218,49 @@ sc_long_lines: sed -e "s|^|$$file:|" -e '$(FILTER_LONG_LINES)'; \ done | grep . && { msg="$$halt" $(_sc_say_and_exit) } || : -# Option descriptions should not start with a capital letter +# Option descriptions should not start with a capital letter. # One could grep source directly as follows: # grep -E " {2,6}-.*[^.] [A-Z][a-z]" $$($(VC_LIST_EXCEPT) | grep '\.c$$') # but that would miss descriptions not on the same line as the -option. -ALL_RECURSIVE_TARGETS += sc_option_desc_uppercase -sc_option_desc_uppercase: - @$(MAKE) -s -C src all_programs - @$(MAKE) -s -C man $@ - -# Ensure all man/*.[1x] files are present -ALL_RECURSIVE_TARGETS += sc_man_file_correlation -sc_man_file_correlation: - @$(MAKE) -s -C src all_programs - @$(MAKE) -s -C man $@ +sc_option_desc_uppercase: $(ALL_MANS) + @grep '^\\fB\\-' -A1 man/*.1 | LC_ALL=C grep '\.1.[A-Z][a-z]' \ + && { echo 1>&2 '$@: found initial capitals in --help'; exit 1; } || : + +# Ensure all man/*.[1x] files are present. +sc_man_file_correlation: check-x-vs-1 check-programs-vs-x + +# Ensure that for each .x file in the 'man/' subdirectory, there is a +# corresponding .1 file in the definition of $(EXTRA_MANS). +# But since that expansion usually lacks programs like arch and hostname, +# add them here manually. +.PHONY: check-x-vs-1 +check-x-vs-1: + @PATH=./src$(PATH_SEPARATOR)$$PATH; export PATH; \ + t=$@-t; \ + (cd $(srcdir)/man && ls -1 *.x) \ + | sed 's/\.x$$//' | $(ASSORT) > $$t; \ + (echo $(patsubst man/%,%,$(ALL_MANS)) \ + | tr -s ' ' '\n' | sed 's/\.1$$//') \ + | $(ASSORT) -u | diff - $$t || { rm $$t; exit 1; }; \ + rm $$t + +# Writing a portable rule to generate a manpage like '[.1' would be +# a nightmare, so filter that out. +all-progs-but-lbracket = $(filter-out [,$(patsubst src/%,%,$(all_programs))) + +# Ensure that for each coreutils program there is a corresponding +# '.x' file in the 'man/' subdirectory. +.PHONY: check-programs-vs-x +check-programs-vs-x: + @status=0; \ + for p in dummy $(all-progs-but-lbracket); do \ + case $$p in *.so) continue;; esac; \ + test $$p = dummy && continue; \ + test $$p = ginstall && p=install || : ; \ + test -f $(srcdir)/man/$$p.x \ + || { echo missing $$p.x 1>&2; status=1; }; \ + done; \ + exit $$status # Ensure that the end of each release's section is marked by two empty lines. sc_NEWS_two_empty_lines: @@ -189,17 +269,6 @@ sc_NEWS_two_empty_lines: || { echo '$(ME): use two empty lines to separate NEWS sections' \ 1>&2; exit 1; } || : -# Perl-based tests used to exec perl from a #!/bin/sh script. -# Now they all start with #!/usr/bin/perl and the portability -# infrastructure is in tests/Makefile.am. Make sure no old-style -# script sneaks back in. -sc_no_exec_perl_coreutils: - @if test -f $(srcdir)/tests/Coreutils.pm; then \ - grep '^exec *\$$PERL.*MCoreutils' $$($(VC_LIST) tests) && \ - { echo 1>&2 '$(ME): found anachronistic Perl-based tests'; \ - exit 1; } || :; \ - fi - # With split lines, don't leave an operator at end of line. # Instead, put it on the following line, where it is more apparent. # Don't bother checking for "*" at end of line, since it provokes @@ -263,9 +332,7 @@ sc_prohibit_emacs__indent_tabs_mode__setting: halt='use of emacs indent-tabs-mode: setting' \ $(_sc_search_regexp) -# Ensure that each file that contains fail=1 also contains fail=0. -# Otherwise, setting file=1 in the environment would make tests fail -# unexpectedly. +# Ensure that tests don't include a redundant fail=0. sc_prohibit_fail_0: @prohibit='\<fail=0\>' \ halt='fail=0 initialization' \ @@ -321,6 +388,34 @@ sc_prohibit_test_backticks: halt='use $$(...), not `...` 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. +sc_some_programs_must_avoid_exit_failure: + @grep -nw EXIT_FAILURE \ + $$(git grep -El '[^T]_FAILURE|EXIT_CANCELED' src) \ + | grep -vE '= EXIT_FAILURE|exit \(.* \?' | grep . \ + && { echo '$(ME): do not use EXIT_FAILURE in the above' \ + 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: + @git grep -w print_ver_ tests \ + | sed 's#:print_ver_##' \ + | { fail=0; \ + while read file name; do \ + for i in $$name; do \ + case "$$i" in install) i=ginstall;; esac; \ + grep -w "$$i" $$file|grep -vw print_ver_|grep -q . \ + || { fail=1; \ + echo "*** Test: $$file, offending: $$i." 1>&2; };\ + done; \ + done; \ + test $$fail = 0 || exit 1; \ + } || { echo "$(ME): the above test(s) call print_ver_ for" \ + "program(s) they don't use" 1>&2; exit 1; } + # Exempt the contents of any usage function from the following. _continued_string_col_1 = \ s/^usage .*?\n}//ms;/\\\n\w/ and print ("$$ARGV\n"),$$e=1;END{$$e||=0;exit $$e} @@ -413,6 +508,26 @@ sc_preprocessor_indentation: echo '$(ME): skipping test $@: cppi not installed' 1>&2; \ fi +# THANKS.in is a list of name/email pairs for people who are mentioned in +# commit logs (and generated ChangeLog), but who are not also listed as an +# author of a commit. Name/email pairs of commit authors are automatically +# extracted from the repository. As a very minor factorization, when +# someone who was initially listed only in THANKS.in later authors a commit, +# this rule detects that their pair may now be removed from THANKS.in. +sc_THANKS_in_duplicates: + @{ git log --pretty=format:%aN | sort -u; \ + cut -b-36 THANKS.in | sed '/^$$/d;s/ *$$//'; } \ + | sort | uniq -d | grep . \ + && { echo '$(ME): remove the above names from THANKS.in' \ + 1>&2; exit 1; } || : + +# Look for developer diagnostics that are marked for translation. +# This won't find any for which devmsg's format string is on a separate line. +sc_marked_devdiagnostics: + @prohibit='\<devmsg *\(.*_\(' \ + halt='found marked developer diagnostic(s)' \ + $(_sc_search_regexp) + # Override the default Cc: used in generating an announcement. announcement_Cc_ = $(translation_project_), \ coreutils@gnu.org, coreutils-announce@gnu.org @@ -426,13 +541,12 @@ update-copyright-env = \ # List syntax-check exemptions. exclude_file_name_regexp--sc_space_tab = \ - ^(tests/pr/|tests/misc/nl$$|gl/.*\.diff$$) -exclude_file_name_regexp--sc_bindtextdomain = ^(gl/.*|lib/euidaccess-stat)\.c$$ -exclude_file_name_regexp--sc_unmarked_diagnostics = ^build-aux/cvsu$$ -exclude_file_name_regexp--sc_error_message_uppercase = ^build-aux/cvsu$$ + ^(tests/pr/|tests/misc/nl\.sh$$|gl/.*\.diff$$) +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_system_h_headers = \ - ^src/((system|copy)\.h|libstdbuf\.c)$$ + ^src/((system|copy)\.h|libstdbuf\.c|make-prime-list\.c)$$ _src = (false|lbracket|ls-(dir|ls|vdir)|tac-pipe|uname-(arch|uname)) exclude_file_name_regexp--sc_require_config_h_first = \ @@ -444,31 +558,61 @@ exclude_file_name_regexp--sc_po_check = ^gl/ 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/ -exclude_file_name_regexp--sc_program_name = ^(gl/.*|lib/euidaccess-stat)\.c$$ +exclude_file_name_regexp--sc_program_name = \ + ^(gl/.*|lib/euidaccess-stat|src/make-prime-list)\.c$$ exclude_file_name_regexp--sc_file_system = \ - NEWS|^(tests/init\.cfg|src/df\.c|tests/misc/df-P)$$ + NEWS|^(init\.cfg|src/df\.c|tests/df/df-P\.sh|tests/df/df-output\.sh)$$ exclude_file_name_regexp--sc_prohibit_always_true_header_tests = \ ^m4/stat-prog\.m4$$ exclude_file_name_regexp--sc_prohibit_fail_0 = \ - (^scripts/git-hooks/commit-msg|^tests/init\.sh|Makefile\.am|\.mk)$$ + (^.*/git-hooks/commit-msg|^tests/init\.sh|Makefile\.am|\.mk|.*\.texi)$$ exclude_file_name_regexp--sc_prohibit_atoi_atof = ^lib/euidaccess-stat\.c$$ -tbi_1 = ^tests/pr/|(^gl/lib/reg.*\.c\.diff|Makefile(\.am)?|\.mk|^man/help2man)$$ +# longlong.h is maintained elsewhere. +_ll = ^src/longlong\.h$$ +exclude_file_name_regexp--sc_useless_cpp_parens = $(_ll) +exclude_file_name_regexp--sc_long_lines = $(_ll) +exclude_file_name_regexp--sc_space_before_open_paren = $(_ll) + +tbi_1 = ^tests/pr/|(^gl/lib/reg.*\.c\.diff|\.mk|^man/help2man)$$ tbi_2 = ^scripts/git-hooks/(pre-commit|pre-applypatch|applypatch-msg)$$ +tbi_3 = (GNU)?[Mm]akefile(\.am)?$$|$(_ll) exclude_file_name_regexp--sc_prohibit_tab_based_indentation = \ - $(tbi_1)|$(tbi_2) + $(tbi_1)|$(tbi_2)|$(tbi_3) exclude_file_name_regexp--sc_preprocessor_indentation = \ - ^(gl/lib/rand-isaac\.[ch]|gl/tests/test-rand-isaac\.c)$$ + ^(gl/lib/rand-isaac\.[ch]|gl/tests/test-rand-isaac\.c)$$|$(_ll) exclude_file_name_regexp--sc_prohibit_stat_st_blocks = \ - ^(src/system\.h|tests/du/2g)$$ + ^(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)$$ exclude_file_name_regexp--sc_prohibit_test_backticks = \ - ^tests/(init\.sh|check\.mk|misc/stdbuf)$$ + ^tests/(local\.mk|(init|misc/stdbuf|factor/create-test)\.sh)$$ # Exempt test.c, since it's nominally shared, and relatively static. exclude_file_name_regexp--sc_prohibit_operator_at_end_of_line = \ ^src/(ptx|test|head)\.c$$ + +exclude_file_name_regexp--sc_error_message_uppercase = ^src/factor\.c$$ +exclude_file_name_regexp--sc_prohibit_atoi_atof = ^src/make-prime-list\.c$$ + +# Augment AM_CFLAGS to include our per-directory options: +AM_CFLAGS += $($(@D)_CFLAGS) + +src_CFLAGS = $(WARN_CFLAGS) +lib_CFLAGS = $(GNULIB_WARN_CFLAGS) +gnulib-tests_CFLAGS = $(GNULIB_TEST_WARN_CFLAGS) + +# Configuration to make the tight-scope syntax-check rule work with +# non-recursive make. +export _gl_TS_headers = $(srcdir)/cfg.mk +_gl_TS_dir = . +_gl_TS_obj_files = src/*.$(OBJEXT) +_gl_TS_other_headers = src/*.h + +# Tell the tight_scope rule about an exceptional "extern" variable. +# Normally, the rule would detect its declaration, but that uses a +# different name, __clz_tab. +_gl_TS_unmarked_extern_vars = factor_clz_tab diff --git a/configure b/configure index f3156fe0..3147a8a7 100755 --- a/configure +++ b/configure @@ -1,11 +1,13 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69.1-2d4eb for GNU coreutils 8.17. +# Generated by GNU Autoconf 2.68 for GNU coreutils 8.21. # # Report bugs to <bug-coreutils@gnu.org>. # # -# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -134,31 +136,6 @@ 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 @@ -192,8 +169,7 @@ 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 / || exit 1" +test x\$exitcode = x0 || 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'\" && @@ -238,25 +214,21 @@ IFS=$as_save_IFS if test "x$CONFIG_SHELL" != x; then : - 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 + # 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+"$@"} fi if test x$as_have_required = xno; then : @@ -359,14 +331,6 @@ $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 @@ -488,10 +452,6 @@ 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). @@ -526,16 +486,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 -pR'. + # In both cases, we have to default to `cp -p'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -pR' + as_ln_s='cp -p' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -pR' + as_ln_s='cp -p' fi else - as_ln_s='cp -pR' + as_ln_s='cp -p' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -547,8 +507,28 @@ else as_mkdir_p=false fi -as_test_x='test -x' -as_executable_p=as_fn_executable_p +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 # 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'" @@ -580,8 +560,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='GNU coreutils' PACKAGE_TARNAME='coreutils' -PACKAGE_VERSION='8.17' -PACKAGE_STRING='GNU coreutils 8.17' +PACKAGE_VERSION='8.21' +PACKAGE_STRING='GNU coreutils 8.21' PACKAGE_BUGREPORT='bug-coreutils@gnu.org' PACKAGE_URL='http://www.gnu.org/software/coreutils/' @@ -629,6 +609,7 @@ gl_fnmatch_required=POSIX gl_getopt_required=POSIX gl_getopt_required=POSIX gt_needs= +ac_config_libobj_dir=lib ac_subst_vars='gltests_LTLIBOBJS gltests_LIBOBJS gl_LTLIBOBJS @@ -637,6 +618,7 @@ CONFIG_INCLUDE am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS +LIBOBJS POSUB INTLLIBS XGETTEXT_EXTRA_OPTIONS @@ -649,23 +631,23 @@ GMSGFMT MSGFMT GETTEXT_MACRO_VERSION USE_NLS -mkdir_p -CONFIG_STATUS_DEPENDENCIES CROSS_COMPILING_FALSE CROSS_COMPILING_TRUE -NO_INSTALL_PROGS_DEFAULT -OPTIONAL_PKGLIB_PROGS -OPTIONAL_BIN_PROGS -INSTALL_SU +built_programs +EXTRA_MANS +man1_MANS +pkglibexec_PROGRAMS +bin_PROGRAMS LIB_GMP -LIB_CRYPT GNULIB_TEST_WARN_CFLAGS GNULIB_WARN_CFLAGS +WARN_CFLAGS WERROR_CFLAGS +HAVE_PERL_FALSE +HAVE_PERL_TRUE SEQ_LIBM LIB_CAP LIB_XATTR -LIBOBJS MAN HELP2MAN LIBTESTS_LIBDEPS @@ -681,7 +663,6 @@ LOCALE_TR_UTF8 gltests_WITNESS NEXT_AS_FIRST_DIRECTIVE_WCHAR_H NEXT_WCHAR_H -WARN_CFLAGS LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_FALSE LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE LIBUNISTRING_UNIWIDTH_H @@ -725,15 +706,8 @@ GNULIB_GETRUSAGE NEXT_AS_FIRST_DIRECTIVE_SYS_IOCTL_H NEXT_SYS_IOCTL_H HAVE_SYS_IOCTL_H -HAVE_STRINGS_H -NEXT_AS_FIRST_DIRECTIVE_STRINGS_H -NEXT_STRINGS_H NEXT_AS_FIRST_DIRECTIVE_STRING_H NEXT_STRING_H -HAVE_DECL_STRNCASECMP -HAVE_STRCASECMP -HAVE_FFS -GNULIB_FFS NEXT_AS_FIRST_DIRECTIVE_STDLIB_H NEXT_STDLIB_H NEXT_AS_FIRST_DIRECTIVE_STDIO_H @@ -1696,6 +1670,7 @@ REPLACE_REALLOC REPLACE_RANDOM_R REPLACE_PUTENV REPLACE_PTSNAME_R +REPLACE_PTSNAME REPLACE_MKSTEMP REPLACE_MBTOWC REPLACE_MALLOC @@ -1916,6 +1891,7 @@ AMTAR am__leading_dot SET_MAKE AWK +mkdir_p MKDIR_P INSTALL_STRIP_PROGRAM STRIP @@ -2465,6 +2441,8 @@ 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 @@ -2550,7 +2528,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.17 to adapt to many kinds of systems. +\`configure' configures GNU coreutils 8.21 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2620,7 +2598,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNU coreutils 8.17:";; + short | recursive ) echo "Configuration of GNU coreutils 8.21:";; esac cat <<\_ACEOF @@ -2628,12 +2606,10 @@ 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") - --enable-dependency-tracking - do not reject slow dependency extractors - --disable-dependency-tracking - speeds up one-time build + --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 --disable-largefile omit support for large files --enable-threads={posix|solaris|pth|windows} specify multithreading API @@ -2643,19 +2619,20 @@ Optional Features: --disable-rpath do not hardcode runtime library paths --disable-xattr do not support extended attributes --disable-libcap disable libcap support - --enable-gcc-warnings turn on lots of GCC warnings (for developers) + --enable-gcc-warnings turn on many GCC warnings (for developers; best with + GNU make) --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,su) + (comma-separated, default: arch,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-gnu-ld assume the C compiler uses GNU ld default=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 --with-libpth-prefix[=DIR] search for libpth in DIR/include and DIR/lib @@ -2765,10 +2742,10 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GNU coreutils configure 8.17 -generated by GNU Autoconf 2.69.1-2d4eb +GNU coreutils configure 8.21 +generated by GNU Autoconf 2.68 -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -3045,7 +3022,7 @@ $as_echo "$ac_try_echo"; } >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - test -x conftest$ac_exeext + $as_test_x conftest$ac_exeext }; then : ac_retval=0 else @@ -3248,8 +3225,7 @@ int main () { static int test_array [1 - 2 * !(($2) >= 0)]; -test_array [0] = 0; -return test_array [0]; +test_array [0] = 0 ; return 0; @@ -3265,8 +3241,7 @@ int main () { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -test_array [0] = 0; -return test_array [0]; +test_array [0] = 0 ; return 0; @@ -3292,8 +3267,7 @@ int main () { static int test_array [1 - 2 * !(($2) < 0)]; -test_array [0] = 0; -return test_array [0]; +test_array [0] = 0 ; return 0; @@ -3309,8 +3283,7 @@ int main () { static int test_array [1 - 2 * !(($2) >= $ac_mid)]; -test_array [0] = 0; -return test_array [0]; +test_array [0] = 0 ; return 0; @@ -3344,8 +3317,7 @@ int main () { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -test_array [0] = 0; -return test_array [0]; +test_array [0] = 0 ; return 0; @@ -3474,8 +3446,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.17, which was -generated by GNU Autoconf 2.69.1-2d4eb. Invocation command line was +It was created by GNU coreutils $as_me 8.21, which was +generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3771,8 +3743,6 @@ 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 " faccessat" -as_fn_append ac_header_list " libgen.h" -as_fn_append ac_func_list " access" as_fn_append ac_func_list " posix_fadvise" as_fn_append ac_func_list " fchmodat" as_fn_append ac_func_list " lchmod" @@ -3791,8 +3761,12 @@ 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" as_fn_append ac_header_list " sys/vfs.h" @@ -3807,8 +3781,8 @@ 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 " nanouptime" as_fn_append ac_func_list " microuptime" +as_fn_append ac_func_list " nanouptime" as_fn_append ac_func_list " getlogin" as_fn_append ac_func_list " flockfile" as_fn_append ac_func_list " funlockfile" @@ -3876,7 +3850,6 @@ as_fn_append ac_func_list " strdup" as_fn_append ac_func_list " strerror_r" as_fn_append ac_func_list " __xpg_strerror_r" as_fn_append ac_func_list " tzset" -as_fn_append ac_header_list " strings.h" as_fn_append ac_func_list " strndup" as_fn_append ac_func_list " strtoimax" as_fn_append ac_func_list " strtoumax" @@ -3913,6 +3886,7 @@ as_fn_append ac_header_list " syslog.h" as_fn_append ac_header_list " pwd.h" as_fn_append ac_func_list " directio" as_fn_append ac_func_list " setrlimit" +as_fn_append ac_func_list " prctl" as_fn_append ac_func_list " endgrent" as_fn_append ac_func_list " endpwent" as_fn_append ac_func_list " iswspace" @@ -4030,7 +4004,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.12a' +am__api_version='1.11' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -4069,7 +4043,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 as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$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. @@ -4127,6 +4101,9 @@ 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=' @@ -4137,40 +4114,32 @@ 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 ( - 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 + 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 + test "$2" = conftest.file ) then @@ -4182,16 +4151,6 @@ 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. @@ -4218,8 +4177,8 @@ if eval "$MISSING --run true"; then am_missing_run="$MISSING --run " 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 @@ -4231,10 +4190,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. @@ -4253,7 +4212,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -4293,7 +4252,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -4344,7 +4303,7 @@ do test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue + { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$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) '* | \ @@ -4373,6 +4332,11 @@ 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 @@ -4392,7 +4356,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -4456,45 +4420,6 @@ 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." @@ -4517,7 +4442,7 @@ fi # Define the identity of the package. PACKAGE='coreutils' - VERSION='8.17' + VERSION='8.21' cat >>confdefs.h <<_ACEOF @@ -4562,10 +4487,10 @@ 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 @@ -4621,7 +4546,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 @@ -4687,7 +4612,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -4727,7 +4652,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -4780,7 +4705,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -4821,7 +4746,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -4879,7 +4804,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -4923,7 +4848,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -5369,7 +5294,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdarg.h> #include <stdio.h> -struct stat; +#include <sys/types.h> +#include <sys/stat.h> /* 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); @@ -5465,8 +5391,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 @@ -5501,16 +5427,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 10 /bin/sh. - echo '/* dummy */' > sub/conftst$i.h + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch 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 @@ -5519,8 +5445,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 @@ -5528,7 +5454,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} @@ -5732,7 +5658,7 @@ main () return 0; } _ACEOF -for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99 +for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99 do CC="$ac_save_CC $ac_arg" if ac_fn_c_try_compile "$LINENO"; then : @@ -5772,7 +5698,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdarg.h> #include <stdio.h> -struct stat; +#include <sys/types.h> +#include <sys/stat.h> /* 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); @@ -6155,7 +6082,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" - as_fn_executable_p "$ac_path_GREP" || continue + { test -f "$ac_path_GREP" && $as_test_x "$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 @@ -6221,7 +6148,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" - as_fn_executable_p "$ac_path_EGREP" || continue + { test -f "$ac_path_EGREP" && $as_test_x "$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 @@ -6328,7 +6255,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -6368,7 +6295,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -6466,7 +6393,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -6506,7 +6433,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -6573,7 +6500,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -6613,7 +6540,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -7044,9 +6971,9 @@ else if test "$GCC" != yes; then ac_save_CC=$CC while :; do - # IRIX 6.2 and later do not support large files by default, - # so use the C compiler's -n32 option if that helps. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + # IRIX 6.2 and later do not support large files by default, + # so use the C compiler's -n32 option if that helps. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> /* Check that off_t can represent 2**63 - 1 correctly. @@ -7055,8 +6982,8 @@ else incorrectly reject 9223372036854775807. */ #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; int main () { @@ -7065,16 +6992,16 @@ main () return 0; } _ACEOF - if ac_fn_c_try_compile "$LINENO"; then : + if ac_fn_c_try_compile "$LINENO"; then : break fi rm -f core conftest.err conftest.$ac_objext - CC="$CC -n32" - if ac_fn_c_try_compile "$LINENO"; then : + CC="$CC -n32" + if ac_fn_c_try_compile "$LINENO"; then : ac_cv_sys_largefile_CC=' -n32'; break fi rm -f core conftest.err conftest.$ac_objext - break + break done CC=$ac_save_CC rm -f conftest.$ac_ext @@ -7101,8 +7028,8 @@ else incorrectly reject 9223372036854775807. */ #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; int main () { @@ -7125,8 +7052,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext incorrectly reject 9223372036854775807. */ #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; int main () { @@ -7170,8 +7097,8 @@ else incorrectly reject 9223372036854775807. */ #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; int main () { @@ -7194,8 +7121,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext incorrectly reject 9223372036854775807. */ #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; int main () { @@ -7226,6 +7153,8 @@ rm -rf conftest* fi +$as_echo "#define _DARWIN_USE_64_BIT_INODE 1" >>confdefs.h + fi @@ -7349,6 +7278,7 @@ $as_echo "$as_me: autobuild timestamp... $date" >&6;} # Code from module bitrotate-tests: # Code from module btowc: # Code from module btowc-tests: + # Code from module buffer-lcm: # Code from module c-ctype: # Code from module c-ctype-tests: # Code from module c-strcase: @@ -7425,6 +7355,7 @@ $as_echo "$as_me: autobuild timestamp... $date" >&6;} # Code from module exitfail: # Code from module extensions: + # Code from module extern-inline: # Code from module faccessat: # Code from module faccessat-tests: # Code from module fadvise: @@ -7445,6 +7376,7 @@ $as_echo "$as_me: autobuild timestamp... $date" >&6;} # Code from module fcntl-safer-tests: # Code from module fcntl-tests: # Code from module fd-hook: + # Code from module fd-reopen: # Code from module fd-safer-flag: # Code from module fdatasync: # Code from module fdatasync-tests: @@ -7562,6 +7494,7 @@ $as_echo "$as_me: autobuild timestamp... $date" >&6;} # Code from module getopt-posix-tests: # Code from module getpagesize: # Code from module getpass-gnu: + # Code from module gettext: # Code from module gettext-h: # Code from module gettime: # Code from module gettimeofday: @@ -7723,6 +7656,7 @@ $as_echo "$as_me: autobuild timestamp... $date" >&6;} # Code from module nl_langinfo: # Code from module nl_langinfo-tests: # Code from module nocrash: + # Code from module non-recursive-gnulib-prefix-hack: # Code from module nproc: # Code from module obstack: # Code from module open: @@ -7807,6 +7741,7 @@ $as_echo "$as_me: autobuild timestamp... $date" >&6;} # Code from module realloc-gnu-tests: # Code from module realloc-posix: # Code from module regex: + # Code from module regex-tests: # Code from module remove: # Code from module remove-tests: # Code from module rename: @@ -7815,6 +7750,7 @@ $as_echo "$as_me: autobuild timestamp... $date" >&6;} # Code from module rmdir: # Code from module rmdir-tests: # Code from module root-dev-ino: + # Code from module root-uid: # Code from module rpmatch: # Code from module safe-read: # Code from module safe-write: @@ -7872,6 +7808,8 @@ $as_echo "$as_me: autobuild timestamp... $date" >&6;} # Code from module stat-tests: # Code from module stat-time: # Code from module stat-time-tests: + # Code from module statat: + # Code from module statat-tests: # Code from module stdalign: # Code from module stdalign-tests: # Code from module stdarg: @@ -7891,7 +7829,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 strcase: # Code from module strchrnul: # Code from module strchrnul-tests: # Code from module strdup-posix: @@ -7907,14 +7844,13 @@ $as_echo "$as_me: autobuild timestamp... $date" >&6;} # Code from module striconv-tests: # Code from module string: # Code from module string-tests: - # Code from module strings: - # Code from module strings-tests: # Code from module strncat: # Code from module strncat-tests: # Code from module strndup: # Code from module strnlen: # Code from module strnlen-tests: # Code from module strnlen1: + # Code from module strnumcmp: # Code from module strpbrk: # Code from module strsignal: # Code from module strsignal-tests: @@ -8055,6 +7991,7 @@ $as_echo "$as_me: autobuild timestamp... $date" >&6;} # Code from module xalloc-die-tests: # Code from module xalloc-oversized: # Code from module xfreopen: + # Code from module xfts: # Code from module xgetcwd: # Code from module xgetgroups: # Code from module xgethostname: @@ -8089,48 +8026,6 @@ $as_echo "$as_me: autobuild timestamp... $date" >&6;} LIBC_FATAL_STDERR_=1 export LIBC_FATAL_STDERR_ -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 -$as_echo_n "checking for inline... " >&6; } -if ${ac_cv_c_inline+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_c_inline=no -for ac_kw in inline __inline__ __inline; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifndef __cplusplus -typedef int foo_t; -static $ac_kw foo_t static_foo () {return 0; } -$ac_kw foo_t foo () {return 0; } -#endif - -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_c_inline=$ac_kw -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - test "$ac_cv_c_inline" != no && break -done - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 -$as_echo "$ac_cv_c_inline" >&6; } - -case $ac_cv_c_inline in - inline | yes) ;; - *) - case $ac_cv_c_inline in - no) ac_val=;; - *) ac_val=$ac_cv_c_inline;; - esac - cat >>confdefs.h <<_ACEOF -#ifndef __cplusplus -#define inline $ac_val -#endif -_ACEOF - ;; -esac - ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" if test "x$ac_cv_type_size_t" = xyes; then : @@ -8244,8 +8139,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 @@ -8887,7 +8782,7 @@ int main () { if (setlocale (LC_ALL, "") == NULL) return 1; #endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". - On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, @@ -8946,7 +8841,7 @@ _ACEOF ;; *) # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the # configure script would override the LC_ALL setting. Likewise for # LC_CTYPE, which is also set at the beginning of the configure script. # Test for the usual locale name. @@ -9096,6 +8991,7 @@ $as_echo "#define HAVE_C99_STRTOLD 1" >>confdefs.h REPLACE_MALLOC=0; REPLACE_MBTOWC=0; REPLACE_MKSTEMP=0; + REPLACE_PTSNAME=0; REPLACE_PTSNAME_R=0; REPLACE_PUTENV=0; REPLACE_RANDOM_R=0; @@ -9193,10 +9089,10 @@ else mkdir conftest.d if test "$cross_compiling" = yes; then : case "$host_os" in - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_realpath_works="guessing yes" ;; - # If we don't know, assume the worst. - *) gl_cv_func_realpath_works="guessing no" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_realpath_works="guessing yes" ;; + # If we don't know, assume the worst. + *) gl_cv_func_realpath_works="guessing no" ;; esac else @@ -9207,7 +9103,7 @@ else #include <stdlib.h> #if defined __MACH__ && defined __APPLE__ -/* Avoid a crash on MacOS X. */ +/* Avoid a crash on Mac OS X. */ #include <mach/mach.h> #include <mach/mach_error.h> #include <mach/thread_status.h> @@ -10161,6 +10057,9 @@ else /* end confdefs.h. */ #include <errno.h> +#if !defined ETXTBSY +booboo +#endif #if !defined ENOMSG booboo #endif @@ -10200,6 +10099,15 @@ booboo #if !defined ECANCELED booboo #endif +#if !defined EOWNERDEAD +booboo +#endif +#if !defined ENOTRECOVERABLE +booboo +#endif +#if !defined EILSEQ +booboo +#endif _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | @@ -10606,19 +10514,6 @@ fi - - -ac_fn_c_check_decl "$LINENO" "setregid" "ac_cv_have_decl_setregid" "$ac_includes_default" -if test "x$ac_cv_have_decl_setregid" = xyes; then : - ac_have_decl=1 -else - ac_have_decl=0 -fi - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_SETREGID $ac_have_decl -_ACEOF - { $as_echo "$as_me:${as_lineno-$LINENO}: checking type of array argument to getgroups" >&5 $as_echo_n "checking type of array argument to getgroups... " >&6; } if ${ac_cv_type_getgroups+:} false; then : @@ -10687,113 +10582,6 @@ _ACEOF - ac_fn_c_check_func "$LINENO" "getgroups" "ac_cv_func_getgroups" -if test "x$ac_cv_func_getgroups" = xyes; then : - -fi - - - # If we don't yet have getgroups, see if it's in -lbsd. - # This is reported to be necessary on an ITOS 3000WS running SEIUX 3.1. - ac_save_LIBS=$LIBS - if test $ac_cv_func_getgroups = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getgroups in -lbsd" >&5 -$as_echo_n "checking for getgroups in -lbsd... " >&6; } -if ${ac_cv_lib_bsd_getgroups+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lbsd $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 getgroups (); -int -main () -{ -return getgroups (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_bsd_getgroups=yes -else - ac_cv_lib_bsd_getgroups=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_bsd_getgroups" >&5 -$as_echo "$ac_cv_lib_bsd_getgroups" >&6; } -if test "x$ac_cv_lib_bsd_getgroups" = xyes; then : - GETGROUPS_LIB=-lbsd -fi - - fi - - # Run the program to test the functionality of the system-supplied - # getgroups function only if there is such a function. - if test $ac_cv_func_getgroups = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working getgroups" >&5 -$as_echo_n "checking for working getgroups... " >&6; } -if ${ac_cv_func_getgroups_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*) ac_cv_func_getgroups_works="guessing yes" ;; - # If we don't know, assume the worst. - *) ac_cv_func_getgroups_works="guessing no" ;; - esac - -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -/* On Ultrix 4.3, getgroups (0, 0) always fails. */ - return getgroups (0, 0) == -1; - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_func_getgroups_works=yes -else - ac_cv_func_getgroups_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: $ac_cv_func_getgroups_works" >&5 -$as_echo "$ac_cv_func_getgroups_works" >&6; } - else - ac_cv_func_getgroups_works=no - fi - case "$ac_cv_func_getgroups_works" in - *yes) - -$as_echo "#define HAVE_GETGROUPS 1" >>confdefs.h - - ;; - esac - LIBS=$ac_save_LIBS - @@ -11028,7 +10816,18 @@ main () #if HAVE_SYMLINK { static char const sym[] = "conftest.sym"; - if (symlink (".", sym) != 0) + if (symlink ("/dev/null", sym) != 0) + result |= 2; + else + { + int fd = open (sym, O_WRONLY | O_NOFOLLOW | O_CREAT, 0); + if (fd >= 0) + { + close (fd); + result |= 4; + } + } + if (unlink (sym) != 0 || symlink (".", sym) != 0) result |= 2; else { @@ -11300,6 +11099,12 @@ $as_echo "#define mbstate_t int" >>confdefs.h + + + + + + @@ -11951,6 +11756,8 @@ $as_echo "$gl_cv_func_fflush_stdin" >&6; } fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5 $as_echo_n "checking whether stat file-mode macros are broken... " >&6; } if ${ac_cv_header_stat_broken+:} false; then : @@ -12009,8 +11816,6 @@ fi - - if test $gl_cv_have_include_next = yes; then gl_cv_next_sys_stat_h='<'sys/stat.h'>' else @@ -12390,7 +12195,6 @@ done - case "$host_os" in osf*) @@ -13532,7 +13336,6 @@ $as_echo "#define HAVE_LONG_LONG_INT 1" >>confdefs.h - : @@ -13711,57 +13514,124 @@ done fi - if test -z "$gl_replace_getopt"; then + if test -z "$gl_replace_getopt"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getopt is POSIX compatible" >&5 $as_echo_n "checking whether getopt is POSIX compatible... " >&6; } if ${gl_cv_func_getopt_posix+:} false; then : $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + if test $cross_compiling = no; 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. */ + #include <unistd.h> +#include <stdlib.h> +#include <string.h> + int main () { -int *p = &optreset; return optreset; - ; + static char program[] = "program"; + static char a[] = "-a"; + static char foo[] = "foo"; + static char bar[] = "bar"; + char *argv[] = { program, a, foo, bar, NULL }; + int c; + + c = getopt (4, argv, "ab"); + if (!(c == 'a')) + return 1; + c = getopt (4, argv, "ab"); + if (!(c == -1)) + return 2; + if (!(optind == 2)) + return 3; return 0; } + _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - gl_optind_min=1 +if ac_fn_c_try_run "$LINENO"; then : + gl_cv_func_getopt_posix=maybe +else + gl_cv_func_getopt_posix=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + if test $gl_cv_func_getopt_posix = maybe; 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. */ -#include <getopt.h> + +#include <unistd.h> +#include <stdlib.h> +#include <string.h> + int main () { -return !getopt_clip; - ; + static char program[] = "program"; + static char donald[] = "donald"; + static char p[] = "-p"; + static char billy[] = "billy"; + static char duck[] = "duck"; + static char a[] = "-a"; + static char bar[] = "bar"; + char *argv[] = { program, donald, p, billy, duck, a, bar, NULL }; + int c; + + c = getopt (7, argv, "+abp:q:"); + if (!(c == -1)) + return 4; + if (!(strcmp (argv[0], "program") == 0)) + return 5; + if (!(strcmp (argv[1], "donald") == 0)) + return 6; + if (!(strcmp (argv[2], "-p") == 0)) + return 7; + if (!(strcmp (argv[3], "billy") == 0)) + return 8; + if (!(strcmp (argv[4], "duck") == 0)) + return 9; + if (!(strcmp (argv[5], "-a") == 0)) + return 10; + if (!(strcmp (argv[6], "bar") == 0)) + return 11; + if (!(optind == 1)) + return 12; return 0; } + _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - gl_optind_min=1 +if ac_fn_c_try_run "$LINENO"; then : + gl_cv_func_getopt_posix=maybe else - gl_optind_min=0 + gl_cv_func_getopt_posix=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - - gl_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -DOPTIND_MIN=$gl_optind_min" - if test "$cross_compiling" = yes; then : - case "$host_os" in - mingw*) gl_cv_func_getopt_posix="guessing no";; - darwin* | aix*) gl_cv_func_getopt_posix="guessing no";; - *) gl_cv_func_getopt_posix="guessing yes";; - esac + fi + if test $gl_cv_func_getopt_posix = maybe; 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. */ @@ -13773,78 +13643,17 @@ else int main () { - { - static char program[] = "program"; - static char a[] = "-a"; - static char foo[] = "foo"; - static char bar[] = "bar"; - char *argv[] = { program, a, foo, bar, NULL }; - int c; - - optind = OPTIND_MIN; - opterr = 0; - - c = getopt (4, argv, "ab"); - if (!(c == 'a')) - return 1; - c = getopt (4, argv, "ab"); - if (!(c == -1)) - return 2; - if (!(optind == 2)) - return 3; - } - /* Some internal state exists at this point. */ - { - static char program[] = "program"; - static char donald[] = "donald"; - static char p[] = "-p"; - static char billy[] = "billy"; - static char duck[] = "duck"; - static char a[] = "-a"; - static char bar[] = "bar"; - char *argv[] = { program, donald, p, billy, duck, a, bar, NULL }; - int c; - - optind = OPTIND_MIN; - opterr = 0; - - c = getopt (7, argv, "+abp:q:"); - if (!(c == -1)) - return 4; - if (!(strcmp (argv[0], "program") == 0)) - return 5; - if (!(strcmp (argv[1], "donald") == 0)) - return 6; - if (!(strcmp (argv[2], "-p") == 0)) - return 7; - if (!(strcmp (argv[3], "billy") == 0)) - return 8; - if (!(strcmp (argv[4], "duck") == 0)) - return 9; - if (!(strcmp (argv[5], "-a") == 0)) - return 10; - if (!(strcmp (argv[6], "bar") == 0)) - return 11; - if (!(optind == 1)) - return 12; - } - /* Detect MacOS 10.5, AIX 7.1 bug. */ - { - static char program[] = "program"; - static char ab[] = "-ab"; - char *argv[3] = { program, ab, NULL }; - optind = OPTIND_MIN; - opterr = 0; - if (getopt (2, argv, "ab:") != 'a') - return 13; - if (getopt (2, argv, "ab:") != '?') - return 14; - if (optopt != 'b') - return 15; - if (optind != 2) - return 16; - } - + static char program[] = "program"; + static char ab[] = "-ab"; + char *argv[3] = { program, ab, NULL }; + if (getopt (2, argv, "ab:") != 'a') + return 13; + if (getopt (2, argv, "ab:") != '?') + return 14; + if (optopt != 'b') + return 15; + if (optind != 2) + return 16; return 0; } @@ -13858,7 +13667,13 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi - CPPFLAGS=$gl_save_CPPFLAGS + fi + else + case "$host_os" in + darwin* | aix* | mingw*) gl_cv_func_getopt_posix="guessing no";; + *) gl_cv_func_getopt_posix="guessing yes";; + esac + fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getopt_posix" >&5 @@ -13889,11 +13704,7 @@ else POSIXLY_CORRECT=1 export POSIXLY_CORRECT if test "$cross_compiling" = yes; then : - case $host_os:$ac_cv_have_decl_optreset in - *-gnu*:* | mingw*:*) gl_cv_func_getopt_gnu=no;; - *:yes) gl_cv_func_getopt_gnu=no;; - *) gl_cv_func_getopt_gnu=yes;; - esac + gl_cv_func_getopt_gnu="guessing no" else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13904,7 +13715,7 @@ else #include <stdlib.h> #if defined __MACH__ && defined __APPLE__ -/* Avoid a crash on MacOS X. */ +/* Avoid a crash on Mac OS X. */ #include <mach/mach.h> #include <mach/mach_error.h> #include <mach/thread_status.h> @@ -14024,7 +13835,7 @@ main () nocrash_init(); /* This code succeeds on glibc 2.8, OpenBSD 4.0, Cygwin, mingw, - and fails on MacOS X 10.5, AIX 5.2, HP-UX 11, IRIX 6.5, + and fails on Mac OS X 10.5, AIX 5.2, HP-UX 11, IRIX 6.5, OSF/1 5.1, Solaris 10. */ { static char conftest[] = "conftest"; @@ -14035,7 +13846,7 @@ main () result |= 1; } /* This code succeeds on glibc 2.8, mingw, - and fails on MacOS X 10.5, OpenBSD 4.0, AIX 5.2, HP-UX 11, + and fails on Mac OS X 10.5, OpenBSD 4.0, AIX 5.2, HP-UX 11, IRIX 6.5, OSF/1 5.1, Solaris 10, Cygwin 1.5.x. */ { static char program[] = "program"; @@ -14064,7 +13875,7 @@ main () if (getopt (3, argv, "-p") != 1) result |= 16; else if (getopt (3, argv, "-p") != 'p') - result |= 32; + result |= 16; } /* This code fails on glibc 2.11. */ { @@ -14074,9 +13885,9 @@ main () char *argv[] = { program, b, a, NULL }; optind = opterr = 0; if (getopt (3, argv, "+:a:b") != 'b') - result |= 64; + result |= 32; else if (getopt (3, argv, "+:a:b") != ':') - result |= 64; + result |= 32; } /* This code dumps core on glibc 2.14. */ { @@ -14086,7 +13897,7 @@ main () char *argv[] = { program, w, dummy, NULL }; optind = opterr = 1; if (getopt (3, argv, "W;") != 'W') - result |= 128; + result |= 64; } return result; @@ -14112,24 +13923,83 @@ fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getopt_gnu" >&5 $as_echo "$gl_cv_func_getopt_gnu" >&6; } - if test "$gl_cv_func_getopt_gnu" = "no"; then + if test "$gl_cv_func_getopt_gnu" != yes; then gl_replace_getopt=yes - fi - fi + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working GNU getopt_long function" >&5 +$as_echo_n "checking for working GNU getopt_long function... " >&6; } +if ${gl_cv_func_getopt_long_gnu+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + case "$host_os" in + openbsd*) gl_cv_func_getopt_long_gnu="guessing no";; + *) gl_cv_func_getopt_long_gnu="guessing yes";; + esac + +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <getopt.h> + #include <stddef.h> + #include <string.h> +int +main () +{ +static const struct option long_options[] = + { + { "xtremely-",no_argument, NULL, 1003 }, + { "xtra", no_argument, NULL, 1001 }, + { "xtreme", no_argument, NULL, 1002 }, + { "xtremely", no_argument, NULL, 1003 }, + { NULL, 0, NULL, 0 } + }; + /* This code fails on OpenBSD 5.0. */ + { + static char program[] = "program"; + static char xtremel[] = "--xtremel"; + char *argv[] = { program, xtremel, NULL }; + int option_index; + optind = 1; opterr = 0; + if (getopt_long (2, argv, "", long_options, &option_index) != 1003) + return 1; + } + return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + gl_cv_func_getopt_long_gnu=yes +else + gl_cv_func_getopt_long_gnu=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_getopt_long_gnu" >&5 +$as_echo "$gl_cv_func_getopt_long_gnu" >&6; } + case "$gl_cv_func_getopt_long_gnu" in + *yes) ;; + *) gl_replace_getopt=yes ;; + esac + fi + fi - REPLACE_GETOPT=0 - if test -n "$gl_replace_getopt"; then : - REPLACE_GETOPT=1 -fi + REPLACE_GETOPT=0 + if test -n "$gl_replace_getopt"; then + REPLACE_GETOPT=1 + fi if test $REPLACE_GETOPT = 1; then @@ -14226,9 +14096,7 @@ cat >>confdefs.h <<_ACEOF #define HAVE_DECL_PUTC_UNLOCKED $ac_have_decl _ACEOF - - - +: @@ -14389,8 +14257,8 @@ $as_echo "$gl_cv_sys_struct_timeval" >&6; } if test $gl_cv_sys_struct_timeval != yes; then HAVE_STRUCT_TIMEVAL=0 else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for correct struct timeval.tv_sec member" >&5 -$as_echo_n "checking for correct struct timeval.tv_sec member... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wide-enough struct timeval.tv_sec member" >&5 +$as_echo_n "checking for wide-enough struct timeval.tv_sec member... " >&6; } if ${gl_cv_sys_struct_timeval_tv_sec+:} false; then : $as_echo_n "(cached) " >&6 else @@ -14408,7 +14276,9 @@ int main () { static struct timeval x; - typedef int verify_tv_sec_type[sizeof (x.tv_sec) == sizeof (time_t) ? 1 : -1]; + typedef int verify_tv_sec_type[ + sizeof (time_t) <= sizeof x.tv_sec ? 1 : -1 + ]; ; return 0; @@ -14455,6 +14325,7 @@ $as_echo "$gl_cv_sys_struct_timeval_tv_sec" >&6; } prefix="$acl_save_prefix" + # Check whether --with-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then : withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes @@ -14474,11 +14345,12 @@ if test "${PATH_SEPARATOR+set}" != set; then || PATH_SEPARATOR=';' } fi + ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5 -$as_echo_n "checking for ld used by GCC... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 +$as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -14488,11 +14360,11 @@ $as_echo_n "checking for ld used by GCC... " >&6; } esac case $ac_prog in # Accept absolute paths. - [\\/]* | [A-Za-z]:[\\/]*) + [\\/]* | ?:[\\/]*) re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the path of ld - ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do + # Canonicalize the pathname of ld + ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'` + while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` done test -z "$LD" && LD="$ac_prog" @@ -14517,23 +14389,26 @@ if ${acl_cv_path_LD+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" + acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do + IFS="$acl_save_ifs" test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then acl_cv_path_LD="$ac_dir/$ac_prog" # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. + # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in + case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in *GNU* | *'with BFD'*) - test "$with_gnu_ld" != no && break ;; + test "$with_gnu_ld" != no && break + ;; *) - test "$with_gnu_ld" != yes && break ;; + test "$with_gnu_ld" != yes && break + ;; esac fi done - IFS="$ac_save_ifs" + IFS="$acl_save_ifs" else acl_cv_path_LD="$LD" # Let the user override the test with a path. fi @@ -14553,12 +14428,14 @@ $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } if ${acl_cv_prog_gnu_ld+:} false; then : $as_echo_n "(cached) " >&6 else - # I'd rather use --version here, but apparently some GNU ld's only accept -v. + # I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 </dev/null` in *GNU* | *'with BFD'*) - acl_cv_prog_gnu_ld=yes ;; + acl_cv_prog_gnu_ld=yes + ;; *) - acl_cv_prog_gnu_ld=no ;; + acl_cv_prog_gnu_ld=no + ;; esac fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5 @@ -15453,6 +15330,48 @@ _ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 +$as_echo_n "checking for inline... " >&6; } +if ${ac_cv_c_inline+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_c_inline=no +for ac_kw in inline __inline__ __inline; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifndef __cplusplus +typedef int foo_t; +static $ac_kw foo_t static_foo () {return 0; } +$ac_kw foo_t foo () {return 0; } +#endif + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_inline=$ac_kw +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + test "$ac_cv_c_inline" != no && break +done + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 +$as_echo "$ac_cv_c_inline" >&6; } + +case $ac_cv_c_inline in + inline | yes) ;; + *) + case $ac_cv_c_inline in + no) ac_val=;; + *) ac_val=$ac_cv_c_inline;; + esac + cat >>confdefs.h <<_ACEOF +#ifndef __cplusplus +#define inline $ac_val +#endif +_ACEOF + ;; +esac + ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default" if test "x$ac_cv_type_off_t" = xyes; then : @@ -16919,8 +16838,6 @@ $as_echo "#define HAVE_WINT_T 1" >>confdefs.h - - if test $gt_cv_c_wint_t = yes; then HAVE_WINT_T=1 else @@ -18467,7 +18384,7 @@ int main () if (setlocale (LC_ALL, "") == NULL) return 1; #endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". - On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, @@ -18523,7 +18440,7 @@ _ACEOF ;; *) # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the # configure script would override the LC_ALL setting. Likewise for # LC_CTYPE, which is also set at the beginning of the configure script. # Test for the AIX locale name. @@ -18607,7 +18524,7 @@ int main () if (setlocale (LC_ALL, "") == NULL) return 1; #endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". - On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, @@ -18672,7 +18589,7 @@ _ACEOF ;; *) # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the # configure script would override the LC_ALL setting. Likewise for # LC_CTYPE, which is also set at the beginning of the configure script. # Test for the locale name without encoding suffix. @@ -18740,7 +18657,7 @@ int main () { if (setlocale (LC_ALL, "") == NULL) return 1; # endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". - On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, @@ -18799,7 +18716,7 @@ _ACEOF ;; *) # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the # configure script would override the LC_ALL setting. Likewise for # LC_CTYPE, which is also set at the beginning of the configure script. # Test for the usual locale name. @@ -19503,12 +19420,12 @@ $as_echo_n "checking for MAP_ANONYMOUS... " >&6; } #include <sys/mman.h> #ifdef MAP_ANONYMOUS - I cant identify this map + I cannot identify this map #endif _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "I cant identify this map" >/dev/null 2>&1; then : + $EGREP "I cannot identify this map" >/dev/null 2>&1; then : gl_have_mmap_anonymous=yes fi rm -f conftest* @@ -19519,12 +19436,12 @@ rm -f conftest* #include <sys/mman.h> #ifdef MAP_ANON - I cant identify this map + I cannot identify this map #endif _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "I cant identify this map" >/dev/null 2>&1; then : + $EGREP "I cannot identify this map" >/dev/null 2>&1; then : $as_echo "#define MAP_ANONYMOUS MAP_ANON" >>confdefs.h @@ -20123,6 +20040,69 @@ $as_echo "$gl_cv_func_select_supports0" >&6; } case "$gl_cv_func_select_supports0" in *yes) ;; *) REPLACE_SELECT=1 ;; + esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether select detects invalid fds" >&5 +$as_echo_n "checking whether select detects invalid fds... " >&6; } +if ${gl_cv_func_select_detects_ebadf+:} 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_select_detects_ebadf="guessing yes" ;; + # If we don't know, assume the worst. + *) gl_cv_func_select_detects_ebadf="guessing no" ;; + esac + +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <sys/types.h> +#include <sys/time.h> +#if HAVE_SYS_SELECT_H +# include <sys/select.h> +#endif +#include <unistd.h> +#include <errno.h> + +int +main () +{ + + fd_set set; + dup2(0, 16); + FD_ZERO(&set); + FD_SET(16, &set); + close(16); + struct timeval timeout; + timeout.tv_sec = 0; + timeout.tv_usec = 5; + return select (17, &set, NULL, NULL, &timeout) != -1 || errno != EBADF; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + gl_cv_func_select_detects_ebadf=yes +else + gl_cv_func_select_detects_ebadf=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_select_detects_ebadf" >&5 +$as_echo "$gl_cv_func_select_detects_ebadf" >&6; } + case $gl_cv_func_select_detects_ebadf in + *yes) ;; + *) REPLACE_SELECT=1 ;; esac fi @@ -21135,127 +21115,6 @@ $as_echo "#define UNLINK_PARENT_BUG 1" >>confdefs.h ;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5 -$as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; } -if ${ac_cv_func_lstat_dereferences_slashed_symlink+:} false; then : - $as_echo_n "(cached) " >&6 -else - rm -f conftest.sym conftest.file -echo >conftest.file -if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then - if test "$cross_compiling" = yes; then : - case "$host_os" in # (( - # Guess yes on glibc systems. - *-gnu*) ac_cv_func_lstat_dereferences_slashed_symlink=yes ;; - # If we don't know, assume the worst. - *) ac_cv_func_lstat_dereferences_slashed_symlink=no ;; - esac -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -struct stat sbuf; - /* Linux will dereference the symlink and fail, as required by POSIX. - That is better in the sense that it means we will not - have to compile and use the lstat wrapper. */ - return lstat ("conftest.sym/", &sbuf) == 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_func_lstat_dereferences_slashed_symlink=yes -else - ac_cv_func_lstat_dereferences_slashed_symlink=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -else - # If the `ln -s' command failed, then we probably don't even - # have an lstat function. - ac_cv_func_lstat_dereferences_slashed_symlink=no -fi -rm -f conftest.sym conftest.file - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5 -$as_echo "$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; } - -test $ac_cv_func_lstat_dereferences_slashed_symlink = yes && - -cat >>confdefs.h <<_ACEOF -#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1 -_ACEOF - - -if test "x$ac_cv_func_lstat_dereferences_slashed_symlink" = xno; then - - - - - - - - - gl_LIBOBJS="$gl_LIBOBJS lstat.$ac_objext" - -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat accepts an empty string" >&5 -$as_echo_n "checking whether lstat accepts an empty string... " >&6; } -if ${ac_cv_func_lstat_empty_string_bug+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - ac_cv_func_lstat_empty_string_bug=yes -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -struct stat sbuf; - return lstat ("", &sbuf) == 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_func_lstat_empty_string_bug=no -else - ac_cv_func_lstat_empty_string_bug=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: $ac_cv_func_lstat_empty_string_bug" >&5 -$as_echo "$ac_cv_func_lstat_empty_string_bug" >&6; } -if test $ac_cv_func_lstat_empty_string_bug = yes; then - - - - - - - - - gl_LIBOBJS="$gl_LIBOBJS lstat.$ac_objext" - - -cat >>confdefs.h <<_ACEOF -#define HAVE_LSTAT_EMPTY_STRING_BUG 1 -_ACEOF - -fi - @@ -21427,7 +21286,7 @@ else # Guess yes on FreeBSD >= 5. freebsd[1-4]*) gl_cv_func_snprintf_retval_c99="guessing no";; freebsd* | kfreebsd*) gl_cv_func_snprintf_retval_c99="guessing yes";; - # Guess yes on MacOS X >= 10.3. + # Guess yes on Mac OS X >= 10.3. darwin[1-6].*) gl_cv_func_snprintf_retval_c99="guessing no";; darwin*) gl_cv_func_snprintf_retval_c99="guessing yes";; # Guess yes on OpenBSD >= 3.9. @@ -21524,12 +21383,6 @@ _ACEOF - GNULIB_FFS=0; - HAVE_FFS=1; - HAVE_STRCASECMP=1; - HAVE_DECL_STRNCASECMP=1; - - ac_fn_c_check_decl "$LINENO" "strdup" "ac_cv_have_decl_strdup" "$ac_includes_default" if test "x$ac_cv_have_decl_strdup" = xyes; then : @@ -21853,94 +21706,6 @@ $as_echo "$gl_cv_next_string_h" >&6; } - - - - - - - - if test $gl_cv_have_include_next = yes; then - gl_cv_next_strings_h='<'strings.h'>' - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <strings.h>" >&5 -$as_echo_n "checking absolute name of <strings.h>... " >&6; } -if ${gl_cv_next_strings_h+:} false; then : - $as_echo_n "(cached) " >&6 -else - - if test $ac_cv_header_strings_h = yes; then - - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <strings.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 'strings.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_strings_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"`'"' - else - gl_cv_next_strings_h='<'strings.h'>' - fi - - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_strings_h" >&5 -$as_echo "$gl_cv_next_strings_h" >&6; } - fi - NEXT_STRINGS_H=$gl_cv_next_strings_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='<'strings.h'>' - else - # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' - gl_next_as_first_directive=$gl_cv_next_strings_h - fi - NEXT_AS_FIRST_DIRECTIVE_STRINGS_H=$gl_next_as_first_directive - - - - - if test $ac_cv_header_strings_h = yes; then - HAVE_STRINGS_H=1 - else - HAVE_STRINGS_H=0 - 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. @@ -21962,12 +21727,12 @@ $as_echo_n "checking for MAP_ANONYMOUS... " >&6; } #include <sys/mman.h> #ifdef MAP_ANONYMOUS - I cant identify this map + I cannot identify this map #endif _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "I cant identify this map" >/dev/null 2>&1; then : + $EGREP "I cannot identify this map" >/dev/null 2>&1; then : gl_have_mmap_anonymous=yes fi rm -f conftest* @@ -21978,12 +21743,12 @@ rm -f conftest* #include <sys/mman.h> #ifdef MAP_ANON - I cant identify this map + I cannot identify this map #endif _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "I cant identify this map" >/dev/null 2>&1; then : + $EGREP "I cannot identify this map" >/dev/null 2>&1; then : $as_echo "#define MAP_ANONYMOUS MAP_ANON" >>confdefs.h @@ -22422,17 +22187,6 @@ $as_echo "$gl_cv_next_time_h" >&6; } -ac_fn_c_check_decl "$LINENO" "localtime_r" "ac_cv_have_decl_localtime_r" "$ac_includes_default" -if test "x$ac_cv_have_decl_localtime_r" = xyes; then : - ac_have_decl=1 -else - ac_have_decl=0 -fi - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_LOCALTIME_R $ac_have_decl -_ACEOF - @@ -22896,7 +22650,6 @@ _ACEOF - for ac_func in snprintf strnlen wcslen wcsnlen mbrtowc wcrtomb do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -22949,7 +22702,7 @@ else # Guess yes on FreeBSD >= 5. freebsd[1-4]*) gl_cv_func_printf_sizes_c99="guessing no";; freebsd* | kfreebsd*) gl_cv_func_printf_sizes_c99="guessing yes";; - # Guess yes on MacOS X >= 10.3. + # Guess yes on Mac OS X >= 10.3. darwin[1-6].*) gl_cv_func_printf_sizes_c99="guessing no";; darwin*) gl_cv_func_printf_sizes_c99="guessing yes";; # Guess yes on OpenBSD >= 3.9. @@ -23091,7 +22844,7 @@ else # Guess yes on FreeBSD >= 6. freebsd[1-5]*) gl_cv_func_printf_infinite="guessing no";; freebsd* | kfreebsd*) gl_cv_func_printf_infinite="guessing yes";; - # Guess yes on MacOS X >= 10.3. + # Guess yes on Mac OS X >= 10.3. darwin[1-6].*) gl_cv_func_printf_infinite="guessing no";; darwin*) gl_cv_func_printf_infinite="guessing yes";; # Guess yes on HP-UX >= 11. @@ -23238,7 +22991,7 @@ else #include <stdlib.h> #if defined __MACH__ && defined __APPLE__ -/* Avoid a crash on MacOS X. */ +/* Avoid a crash on Mac OS X. */ #include <mach/mach.h> #include <mach/mach_error.h> #include <mach/thread_status.h> @@ -23602,14 +23355,14 @@ int main () if (sprintf (buf, "%010a %d", 1.0 / zero, 33, 44, 55) < 0 || buf[0] == '0') result |= 8; - /* This catches a MacOS X 10.3.9 (Darwin 7.9) bug. */ + /* This catches a Mac OS X 10.3.9 (Darwin 7.9) bug. */ if (sprintf (buf, "%.1a", 1.999) < 0 || (strcmp (buf, "0x1.0p+1") != 0 && strcmp (buf, "0x2.0p+0") != 0 && strcmp (buf, "0x4.0p-1") != 0 && strcmp (buf, "0x8.0p-2") != 0)) result |= 16; - /* This catches the same MacOS X 10.3.9 (Darwin 7.9) bug and also a + /* This catches the same Mac OS X 10.3.9 (Darwin 7.9) bug and also a glibc 2.4 bug <http://sourceware.org/bugzilla/show_bug.cgi?id=2908>. */ if (sprintf (buf, "%.1La", 1.999L) < 0 || (strcmp (buf, "0x1.0p+1") != 0 @@ -23650,7 +23403,7 @@ else # Guess yes on FreeBSD >= 6. freebsd[1-5]*) gl_cv_func_printf_directive_f="guessing no";; freebsd* | kfreebsd*) gl_cv_func_printf_directive_f="guessing yes";; - # Guess yes on MacOS X >= 10.3. + # Guess yes on Mac OS X >= 10.3. darwin[1-6].*) gl_cv_func_printf_directive_f="guessing no";; darwin*) gl_cv_func_printf_directive_f="guessing yes";; # Guess yes on Solaris >= 2.10. @@ -24073,7 +23826,7 @@ else #include <stdlib.h> #if defined __MACH__ && defined __APPLE__ -/* Avoid a crash on MacOS X. */ +/* Avoid a crash on Mac OS X. */ #include <mach/mach.h> #include <mach/mach_error.h> #include <mach/thread_status.h> @@ -24234,8 +23987,9 @@ _ACEOF ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s conftest$ac_exeext; then - (./conftest + (./conftest 2>&5 result=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $result" >&5 if test $result != 0 && test $result != 77; then result=1; fi exit $result ) >/dev/null 2>/dev/null @@ -24744,7 +24498,6 @@ fi LIB_ACL= use_acl=0 - if test "x$enable_acl" != "xno"; then for ac_header in sys/acl.h do : @@ -25375,8 +25128,6 @@ $as_echo "$enable_assert" >&6; } - - if test $ac_cv_func_btowc = no; then HAVE_BTOWC=0 else @@ -25497,7 +25248,7 @@ $as_echo "$gl_cv_func_btowc_eof" >&6; } esac fi -if test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1; then + if test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1; then @@ -25511,7 +25262,7 @@ if test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1; then : -fi + fi @@ -25542,9 +25293,6 @@ done - : - - for ac_func in strtold_l @@ -25560,9 +25308,6 @@ done - : - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible calloc" >&5 @@ -25623,7 +25368,7 @@ $as_echo "#define HAVE_CALLOC_GNU 1" >>confdefs.h esac -if test $REPLACE_CALLOC = 1; then + if test $REPLACE_CALLOC = 1; then @@ -25634,7 +25379,7 @@ if test $REPLACE_CALLOC = 1; then gl_LIBOBJS="$gl_LIBOBJS calloc.$ac_objext" -fi + fi cat >>confdefs.h <<_ACEOF @@ -25653,7 +25398,7 @@ $as_echo "#define HAVE_CALLOC_POSIX 1" >>confdefs.h REPLACE_CALLOC=1 fi -if test $REPLACE_CALLOC = 1; then + if test $REPLACE_CALLOC = 1; then @@ -25664,7 +25409,7 @@ if test $REPLACE_CALLOC = 1; then gl_LIBOBJS="$gl_LIBOBJS calloc.$ac_objext" -fi + fi @@ -25690,8 +25435,11 @@ $as_echo "#define GNULIB_TEST_CALLOC_POSIX 1" >>confdefs.h if test $ac_cv_func_canonicalize_file_name = no; then HAVE_CANONICALIZE_FILE_NAME=0 - elif test "$gl_cv_func_realpath_works" != yes; then - REPLACE_CANONICALIZE_FILE_NAME=1 + else + case "$gl_cv_func_realpath_works" in + *yes) ;; + *) REPLACE_CANONICALIZE_FILE_NAME=1 ;; + esac fi @@ -25783,7 +25531,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_arbitrary_file_name_length_limit" >&5 $as_echo "$gl_cv_have_arbitrary_file_name_length_limit" >&6; } -if test $gl_cv_have_arbitrary_file_name_length_limit = yes; then + if test $gl_cv_have_arbitrary_file_name_length_limit = yes; then @@ -25794,13 +25542,10 @@ if test $gl_cv_have_arbitrary_file_name_length_limit = yes; then gl_LIBOBJS="$gl_LIBOBJS chdir-long.$ac_objext" + : + fi - - : - -fi - -if test $HAVE_CHOWN = 0 || test $REPLACE_CHOWN = 1; then + if test $HAVE_CHOWN = 0 || test $REPLACE_CHOWN = 1; then @@ -25811,8 +25556,8 @@ if test $HAVE_CHOWN = 0 || test $REPLACE_CHOWN = 1; then gl_LIBOBJS="$gl_LIBOBJS chown.$ac_objext" -fi -if test $REPLACE_CHOWN = 1 && test $ac_cv_func_fchown = no; then + fi + if test $REPLACE_CHOWN = 1 && test $ac_cv_func_fchown = no; then @@ -25823,7 +25568,7 @@ if test $REPLACE_CHOWN = 1 && test $ac_cv_func_fchown = no; then gl_LIBOBJS="$gl_LIBOBJS fchown-stub.$ac_objext" -fi + fi @@ -25980,7 +25725,7 @@ done fi -if test $REPLACE_CLOSE = 1; then + if test $REPLACE_CLOSE = 1; then @@ -25991,7 +25736,7 @@ if test $REPLACE_CLOSE = 1; then gl_LIBOBJS="$gl_LIBOBJS close.$ac_objext" -fi + fi @@ -26049,7 +25794,7 @@ done fi -if test $HAVE_CLOSEDIR = 0 || test $REPLACE_CLOSEDIR = 1; then + if test $HAVE_CLOSEDIR = 0 || test $REPLACE_CLOSEDIR = 1; then @@ -26060,7 +25805,7 @@ if test $HAVE_CLOSEDIR = 0 || test $REPLACE_CLOSEDIR = 1; then gl_LIBOBJS="$gl_LIBOBJS closedir.$ac_objext" -fi + fi @@ -26122,12 +25867,10 @@ $as_echo "#define GNULIB_TEST_CLOSEDIR 1" >>confdefs.h - : - : @@ -26147,8 +25890,6 @@ $as_echo "#define GNULIB_TEST_CLOSEDIR 1" >>confdefs.h - - if test $gl_cv_have_include_next = yes; then gl_cv_next_ctype_h='<'ctype.h'>' else @@ -26211,10 +25952,8 @@ $as_echo "$gl_cv_next_ctype_h" >&6; } - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for d_ino member in directory struct" >&5 + : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for d_ino member in directory struct" >&5 $as_echo_n "checking for d_ino member in directory struct... " >&6; } if ${gl_cv_struct_dirent_d_ino+:} false; then : $as_echo_n "(cached) " >&6 @@ -26276,7 +26015,7 @@ $as_echo "#define D_INO_IN_DIRENT 1" >>confdefs.h esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for d_type member in directory struct" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for d_type member in directory struct" >&5 $as_echo_n "checking for d_type member in directory struct... " >&6; } if ${gl_cv_struct_dirent_d_type+:} false; then : $as_echo_n "(cached) " >&6 @@ -26477,7 +26216,7 @@ $as_echo "$gl_cv_func_dirfd_macro" >&6; } fi fi -if test $ac_cv_func_dirfd = no && test $gl_cv_func_dirfd_macro = no; then + if test $ac_cv_func_dirfd = no && test $gl_cv_func_dirfd_macro = no; then @@ -26537,7 +26276,7 @@ _ACEOF fi -fi + fi @@ -26626,7 +26365,7 @@ $as_echo "#define DOUBLE_SLASH_IS_DISTINCT_ROOT 1" >>confdefs.h fi -if test $REPLACE_DUP = 1; then + if test $REPLACE_DUP = 1; then @@ -26637,10 +26376,8 @@ if test $REPLACE_DUP = 1; then gl_LIBOBJS="$gl_LIBOBJS dup.$ac_objext" - - - -fi + : + fi @@ -26712,6 +26449,9 @@ int result = 0; /* Many gnulib modules require POSIX conformance of EBADF. */ if (dup2 (2, 1000000) == -1 && errno != EBADF) result |= 16; + /* Flush out a cygwin core dump. */ + if (dup2 (2, -1) != -1 || errno != EBADF) + result |= 32; return result; ; @@ -26754,7 +26494,7 @@ $as_echo "$gl_cv_func_dup2_works" >&6; } fi -if test $HAVE_DUP2 = 0 || test $REPLACE_DUP2 = 1; then + if test $HAVE_DUP2 = 0 || test $REPLACE_DUP2 = 1; then @@ -26766,7 +26506,7 @@ if test $HAVE_DUP2 = 0 || test $REPLACE_DUP2 = 1; then gl_LIBOBJS="$gl_LIBOBJS dup2.$ac_objext" -fi + fi @@ -26827,7 +26567,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5 $as_echo "$ac_cv_lib_error_at_line" >&6; } -if test $ac_cv_lib_error_at_line = no; then + if test $ac_cv_lib_error_at_line = no; then @@ -26840,10 +26580,9 @@ if test $ac_cv_lib_error_at_line = no; then - : -fi + fi XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS --flag=error:3:c-format" @@ -26872,7 +26611,7 @@ done HAVE_EUIDACCESS=0 fi -if test $HAVE_EUIDACCESS = 0; then + if test $HAVE_EUIDACCESS = 0; then @@ -26885,8 +26624,125 @@ if test $HAVE_EUIDACCESS = 0; then + for ac_header in libgen.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "libgen.h" "ac_cv_header_libgen_h" "$ac_includes_default" +if test "x$ac_cv_header_libgen_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBGEN_H 1 +_ACEOF + +fi + +done + + + ac_fn_c_check_func "$LINENO" "getgroups" "ac_cv_func_getgroups" +if test "x$ac_cv_func_getgroups" = xyes; then : + +fi + + + # If we don't yet have getgroups, see if it's in -lbsd. + # This is reported to be necessary on an ITOS 3000WS running SEIUX 3.1. + ac_save_LIBS=$LIBS + if test $ac_cv_func_getgroups = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getgroups in -lbsd" >&5 +$as_echo_n "checking for getgroups in -lbsd... " >&6; } +if ${ac_cv_lib_bsd_getgroups+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lbsd $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 getgroups (); +int +main () +{ +return getgroups (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_bsd_getgroups=yes +else + ac_cv_lib_bsd_getgroups=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_bsd_getgroups" >&5 +$as_echo "$ac_cv_lib_bsd_getgroups" >&6; } +if test "x$ac_cv_lib_bsd_getgroups" = xyes; then : + GETGROUPS_LIB=-lbsd +fi + + fi + + # Run the program to test the functionality of the system-supplied + # getgroups function only if there is such a function. + if test $ac_cv_func_getgroups = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working getgroups" >&5 +$as_echo_n "checking for working getgroups... " >&6; } +if ${ac_cv_func_getgroups_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*) ac_cv_func_getgroups_works="guessing yes" ;; + # If we don't know, assume the worst. + *) ac_cv_func_getgroups_works="guessing no" ;; + esac + +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +/* On Ultrix 4.3, getgroups (0, 0) always fails. */ + return getgroups (0, 0) == -1; + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_func_getgroups_works=yes +else + ac_cv_func_getgroups_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: $ac_cv_func_getgroups_works" >&5 +$as_echo "$ac_cv_func_getgroups_works" >&6; } + else + ac_cv_func_getgroups_works=no + fi + case "$ac_cv_func_getgroups_works" in + *yes) +$as_echo "#define HAVE_GETGROUPS 1" >>confdefs.h + ;; + esac + LIBS=$ac_save_LIBS # Solaris 9 and 10 need -lgen to get the eaccess function. @@ -26966,7 +26822,7 @@ done LIBS=$gl_saved_libs -fi + fi @@ -26988,11 +26844,12 @@ $as_echo "#define GNULIB_TEST_EUIDACCESS 1" >>confdefs.h + if test $ac_cv_func_faccessat = no; then HAVE_FACCESSAT=0 fi -if test $HAVE_FACCESSAT = 0; then + if test $HAVE_FACCESSAT = 0; then @@ -27004,9 +26861,19 @@ if test $HAVE_FACCESSAT = 0; then gl_LIBOBJS="$gl_LIBOBJS faccessat.$ac_objext" - + for ac_func in access +do : + ac_fn_c_check_func "$LINENO" "access" "ac_cv_func_access" +if test "x$ac_cv_func_access" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_ACCESS 1 +_ACEOF fi +done + + + fi cat >>confdefs.h <<_ACEOF @@ -27033,10 +26900,7 @@ $as_echo "#define GNULIB_TEST_FACCESSAT 1" >>confdefs.h - - - - + : @@ -27134,7 +26998,7 @@ $as_echo "#define GNULIB_TEST_FCHDIR 1" >>confdefs.h HAVE_FCHMODAT=0 fi -if test $HAVE_FCHMODAT = 0; then + if test $HAVE_FCHMODAT = 0; then @@ -27145,7 +27009,7 @@ if test $HAVE_FCHMODAT = 0; then gl_LIBOBJS="$gl_LIBOBJS fchmodat.$ac_objext" -fi + fi cat >>confdefs.h <<_ACEOF @@ -27293,7 +27157,7 @@ else fi -if test $HAVE_FCHOWNAT = 0 || test $REPLACE_FCHOWNAT = 1; then + if test $HAVE_FCHOWNAT = 0 || test $REPLACE_FCHOWNAT = 1; then @@ -27304,7 +27168,7 @@ if test $HAVE_FCHOWNAT = 0 || test $REPLACE_FCHOWNAT = 1; then gl_LIBOBJS="$gl_LIBOBJS fchownat.$ac_objext" -fi + fi cat >>confdefs.h <<_ACEOF @@ -27417,7 +27281,7 @@ $as_echo "$gl_cv_func_fflush_stdin" >&6; } REPLACE_FCLOSE=1 fi -if test $REPLACE_FCLOSE = 1; then + if test $REPLACE_FCLOSE = 1; then @@ -27428,7 +27292,7 @@ if test $REPLACE_FCLOSE = 1; then gl_LIBOBJS="$gl_LIBOBJS fclose.$ac_objext" -fi + fi @@ -27603,7 +27467,7 @@ $as_echo "$gl_cv_func_fcntl_f_dupfd_cloexec" >&6; } fi -if test $HAVE_FCNTL = 0 || test $REPLACE_FCNTL = 1; then + if test $HAVE_FCNTL = 0 || test $REPLACE_FCNTL = 1; then @@ -27614,7 +27478,7 @@ if test $HAVE_FCNTL = 0 || test $REPLACE_FCNTL = 1; then gl_LIBOBJS="$gl_LIBOBJS fcntl.$ac_objext" -fi + fi @@ -27809,7 +27673,7 @@ fi LIBS=$gl_saved_libs fi -if test $HAVE_FDATASYNC = 0; then + if test $HAVE_FDATASYNC = 0; then @@ -27820,7 +27684,7 @@ if test $HAVE_FDATASYNC = 0; then gl_LIBOBJS="$gl_LIBOBJS fdatasync.$ac_objext" -fi + fi @@ -27866,10 +27730,8 @@ main (void) FILE *fp; errno = 0; fp = fdopen (-1, "r"); - if (fp != NULL) + if (fp == NULL && errno == 0) return 1; - if (errno == 0) - return 2; return 0; } _ACEOF @@ -27891,7 +27753,7 @@ $as_echo "$gl_cv_func_fdopen_works" >&6; } esac fi -if test $REPLACE_FDOPEN = 1; then + if test $REPLACE_FDOPEN = 1; then @@ -27903,7 +27765,7 @@ if test $REPLACE_FDOPEN = 1; then gl_LIBOBJS="$gl_LIBOBJS fdopen.$ac_objext" -fi + fi @@ -28008,7 +27870,7 @@ $as_echo "$gl_cv_func_fdopendir_works" >&6; } esac fi -if test $HAVE_FDOPENDIR = 0 || test $REPLACE_FDOPENDIR = 1; then + if test $HAVE_FDOPENDIR = 0 || test $REPLACE_FDOPENDIR = 1; then @@ -28019,7 +27881,7 @@ if test $HAVE_FDOPENDIR = 0 || test $REPLACE_FDOPENDIR = 1; then gl_LIBOBJS="$gl_LIBOBJS fdopendir.$ac_objext" -fi + fi @@ -28134,7 +27996,7 @@ $as_echo "$gl_cv_func_fflush_stdin" >&6; } REPLACE_FFLUSH=1 fi -if test $REPLACE_FFLUSH = 1; then + if test $REPLACE_FFLUSH = 1; then @@ -28145,11 +28007,8 @@ if test $REPLACE_FFLUSH = 1; then gl_LIBOBJS="$gl_LIBOBJS fflush.$ac_objext" - - - : - -fi + : + fi cat >>confdefs.h <<_ACEOF @@ -28191,7 +28050,7 @@ fi -if test $ac_cv_member_struct_stat_st_blocks = no; then + if test $ac_cv_member_struct_stat_st_blocks = no; then @@ -28206,7 +28065,7 @@ if test $ac_cv_member_struct_stat_st_blocks = no; then : -fi + fi @@ -28225,7 +28084,6 @@ _ACEOF - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for flexible array member" >&5 $as_echo_n "checking for flexible array member... " >&6; } if ${ac_cv_c_flexmember+:} false; then : @@ -28459,7 +28317,7 @@ fi -if test $REPLACE_FLOAT_LDBL = 1; then + if test $REPLACE_FLOAT_LDBL = 1; then @@ -28470,8 +28328,8 @@ if test $REPLACE_FLOAT_LDBL = 1; then gl_LIBOBJS="$gl_LIBOBJS float.$ac_objext" -fi -if test $REPLACE_ITOLD = 1; then + fi + if test $REPLACE_ITOLD = 1; then @@ -28482,7 +28340,7 @@ if test $REPLACE_ITOLD = 1; then gl_LIBOBJS="$gl_LIBOBJS itold.$ac_objext" -fi + fi @@ -28624,7 +28482,7 @@ else fi -if test -n "$FNMATCH_H"; then + if test -n "$FNMATCH_H"; then @@ -28657,13 +28515,13 @@ _ACEOF -fi + fi -if test -n "$FNMATCH_H"; then + if test -n "$FNMATCH_H"; then @@ -28696,7 +28554,7 @@ _ACEOF -fi + fi @@ -28757,7 +28615,7 @@ $as_echo "#define FOPEN_TRAILING_SLASH_BUG 1" >>confdefs.h ;; esac -if test $REPLACE_FOPEN = 1; then + if test $REPLACE_FOPEN = 1; then @@ -28768,10 +28626,8 @@ if test $REPLACE_FOPEN = 1; then gl_LIBOBJS="$gl_LIBOBJS fopen.$ac_objext" - - - -fi + : + fi @@ -28816,7 +28672,7 @@ cat >>confdefs.h <<_ACEOF _ACEOF -if test $ac_cv_func___fpending = no; then + if test $ac_cv_func___fpending = no; then @@ -28907,7 +28763,7 @@ cat >>confdefs.h <<_ACEOF _ACEOF -fi + fi @@ -28984,7 +28840,7 @@ $as_echo "$gl_cv_func_fpurge_works" >&6; } HAVE_DECL_FPURGE=0 fi -if test $HAVE_FPURGE = 0 || test $REPLACE_FPURGE = 1; then + if test $HAVE_FPURGE = 0 || test $REPLACE_FPURGE = 1; then @@ -28995,7 +28851,7 @@ if test $HAVE_FPURGE = 0 || test $REPLACE_FPURGE = 1; then gl_LIBOBJS="$gl_LIBOBJS fpurge.$ac_objext" -fi + fi @@ -29014,6 +28870,38 @@ $as_echo "#define GNULIB_TEST_FPURGE 1" >>confdefs.h + if test $ac_cv_func___freadahead = no; then + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS freadahead.$ac_objext" + + fi + + + + + + + if test $ac_cv_func___freadptr = no; then + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS freadptr.$ac_objext" + + fi + + @@ -29024,7 +28912,7 @@ $as_echo "#define GNULIB_TEST_FPURGE 1" >>confdefs.h ;; esac -if test $REPLACE_FREOPEN = 1; then + if test $REPLACE_FREOPEN = 1; then @@ -29035,10 +28923,8 @@ if test $REPLACE_FREOPEN = 1; then gl_LIBOBJS="$gl_LIBOBJS freopen.$ac_objext" - - - -fi + : + fi @@ -29093,7 +28979,7 @@ else /* HP cc on HP-UX 10.20 has a bug with the constant expression -0.0. ICC 10.0 has a bug when optimizing the expression -zero. The expression -DBL_MIN * DBL_MIN does not work when cross-compiling - to PowerPC on MacOS X 10.5. */ + to PowerPC on Mac OS X 10.5. */ #if defined __hpux || defined __sgi || defined __ICC static double compute_minus_zero (void) @@ -29174,7 +29060,7 @@ $as_echo "#define HAVE_FREXP_IN_LIBC 1" >>confdefs.h fi -if test $gl_func_frexp_no_libm != yes; then + if test $gl_func_frexp_no_libm != yes; then @@ -29185,7 +29071,7 @@ if test $gl_func_frexp_no_libm != yes; then gl_LIBOBJS="$gl_LIBOBJS frexp.$ac_objext" -fi + fi @@ -29303,7 +29189,7 @@ int main() if (exp != 5) result |= 1; } - /* Test on finite numbers that fails on MacOS X 10.4, because its frexpl + /* Test on finite numbers that fails on Mac OS X 10.4, because its frexpl function returns an invalid (incorrectly normalized) value: it returns y = { 0x3fe028f5, 0xc28f5c28, 0x3c9eb851, 0xeb851eb8 } but the correct result is @@ -29342,7 +29228,7 @@ int main() int exp; long double y = frexpl (x, &exp); /* On machines with IEEE854 arithmetic: x = 1.68105e-4932, - exp = -16382, y = 0.5. On MacOS X 10.5: exp = -16384, y = 0.5. */ + exp = -16382, y = 0.5. On Mac OS X 10.5: exp = -16384, y = 0.5. */ if (exp != LDBL_MIN_EXP - 1) result |= 8; } @@ -29387,7 +29273,7 @@ $as_echo "#define HAVE_FREXPL_IN_LIBC 1" >>confdefs.h fi fi -if test $HAVE_DECL_FREXPL = 0 || test $gl_func_frexpl_no_libm = no; then + if test $HAVE_DECL_FREXPL = 0 || test $gl_func_frexpl_no_libm = no; then @@ -29398,7 +29284,7 @@ if test $HAVE_DECL_FREXPL = 0 || test $gl_func_frexpl_no_libm = no; then gl_LIBOBJS="$gl_LIBOBJS frexpl.$ac_objext" -fi + fi @@ -29421,7 +29307,7 @@ $as_echo "#define GNULIB_TEST_FREXPL 1" >>confdefs.h REPLACE_FSEEK=1 fi -if test $REPLACE_FSEEK = 1; then + if test $REPLACE_FSEEK = 1; then @@ -29432,7 +29318,7 @@ if test $REPLACE_FSEEK = 1; then gl_LIBOBJS="$gl_LIBOBJS fseek.$ac_objext" -fi + fi @@ -29586,7 +29472,7 @@ $as_echo "$gl_cv_func_fflush_stdin" >&6; } fi -if test $HAVE_FSEEKO = 0 || test $REPLACE_FSEEKO = 1; then + if test $HAVE_FSEEKO = 0 || test $REPLACE_FSEEKO = 1; then @@ -29610,7 +29496,7 @@ fi done -fi + fi @@ -29629,6 +29515,21 @@ $as_echo "#define GNULIB_TEST_FSEEKO 1" >>confdefs.h + if test $ac_cv_func___fseterr = no; then + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS fseterr.$ac_objext" + + fi + + + if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then REPLACE_FSTAT=1 @@ -29657,7 +29558,7 @@ $as_echo "#define GNULIB_TEST_FSEEKO 1" >>confdefs.h fi -if test $REPLACE_FSTAT = 1; then + if test $REPLACE_FSTAT = 1; then @@ -29668,10 +29569,8 @@ if test $REPLACE_FSTAT = 1; then gl_LIBOBJS="$gl_LIBOBJS fstat.$ac_objext" - - - -fi + : + fi @@ -29749,7 +29648,7 @@ $as_echo "#define HAVE_WORKING_FSTATAT_ZERO_FLAG 1" >>confdefs.h esac fi -if test $HAVE_FSTATAT = 0 || test $REPLACE_FSTATAT = 1; then + if test $HAVE_FSTATAT = 0 || test $REPLACE_FSTATAT = 1; then @@ -29760,13 +29659,7 @@ if test $HAVE_FSTATAT = 0 || test $REPLACE_FSTATAT = 1; then gl_LIBOBJS="$gl_LIBOBJS fstatat.$ac_objext" -fi - - -cat >>confdefs.h <<_ACEOF -#define GNULIB_FSTATAT 1 -_ACEOF - + fi @@ -29825,14 +29718,6 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> -#if (defined __GLIBC__ || defined __UCLIBC__) && defined __linux__ -Do not use statvfs on systems with GNU libc on Linux, because that function -stats all preceding entries in /proc/mounts, and that makes df hang if even -one of the corresponding file systems is hard-mounted, but not available. -statvfs in GNU libc on Hurd, BeOS, Haiku operates differently: it only makes -a system call. -#endif - #ifdef __osf__ "Do not use Tru64's statvfs implementation" #endif @@ -29843,7 +29728,7 @@ struct statvfs fsd; #if defined __APPLE__ && defined __MACH__ #include <limits.h> -/* On MacOS X >= 10.5, f_blocks in 'struct statvfs' is a 32-bit quantity; +/* On Mac OS X >= 10.5, f_blocks in 'struct statvfs' is a 32-bit quantity; that commonly limits file systems to 4 TiB. Whereas f_blocks in 'struct statfs' is a 64-bit type, thanks to the large-file support that was enabled above. In this case, don't use statvfs(); use statfs() @@ -29920,6 +29805,56 @@ $as_echo "#define STAT_STATVFS 1" >>confdefs.h fi fi +# Check for this unconditionally so we have a +# good fallback on glibc/Linux > 2.6 < 2.6.36 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for two-argument statfs with statfs.f_frsize member" >&5 +$as_echo_n "checking for two-argument statfs with statfs.f_frsize member... " >&6; } +if ${fu_cv_sys_stat_statfs2_frsize+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + fu_cv_sys_stat_statfs2_frsize=no +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif +#ifdef HAVE_SYS_MOUNT_H +#include <sys/mount.h> +#endif +#ifdef HAVE_SYS_VFS_H +#include <sys/vfs.h> +#endif + int + main () + { + struct statfs fsd; + fsd.f_frsize = 0; + return statfs (".", &fsd) != 0; + } +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + fu_cv_sys_stat_statfs2_frsize=yes +else + fu_cv_sys_stat_statfs2_frsize=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: $fu_cv_sys_stat_statfs2_frsize" >&5 +$as_echo "$fu_cv_sys_stat_statfs2_frsize" >&6; } +if test $fu_cv_sys_stat_statfs2_frsize = yes; then + ac_fsusage_space=yes + +$as_echo "#define STAT_STATFS2_FRSIZE 1" >>confdefs.h + +fi + if test $ac_fsusage_space = no; then # DEC Alpha running OSF/1 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 3-argument statfs function (DEC OSF/1)" >&5 @@ -29966,7 +29901,7 @@ $as_echo "#define STAT_STATFS3_OSF1 1" >>confdefs.h fi if test $ac_fsusage_space = no; then - # glibc/Linux, MacOS X, FreeBSD < 5.0, NetBSD < 3.0, OpenBSD < 4.4. + # glibc/Linux, Mac OS X, FreeBSD < 5.0, NetBSD < 3.0, OpenBSD < 4.4. # (glibc/{Hurd,kFreeBSD}, FreeBSD >= 5.0, NetBSD >= 3.0, # OpenBSD >= 4.4, AIX, HP-UX, OSF/1, Cygwin already handled above.) # (On IRIX you need to include <sys/statfs.h>, not only <sys/mount.h> and @@ -30196,7 +30131,7 @@ fi -if test $gl_cv_fs_space = yes; then + if test $gl_cv_fs_space = yes; then @@ -30261,7 +30196,7 @@ $as_echo "#define STATFS_TRUNCATES_BLOCK_COUNTS 1" >>confdefs.h $as_echo "$fu_cv_sys_truncating_statfs" >&6; } -fi + fi @@ -30269,7 +30204,7 @@ fi HAVE_FSYNC=0 fi -if test $HAVE_FSYNC = 0; then + if test $HAVE_FSYNC = 0; then @@ -30280,8 +30215,8 @@ if test $HAVE_FSYNC = 0; then gl_LIBOBJS="$gl_LIBOBJS fsync.$ac_objext" - : -fi + : + fi @@ -30304,7 +30239,7 @@ $as_echo "#define GNULIB_TEST_FSYNC 1" >>confdefs.h REPLACE_FTELL=1 fi -if test $REPLACE_FTELL = 1; then + if test $REPLACE_FTELL = 1; then @@ -30315,7 +30250,7 @@ if test $REPLACE_FTELL = 1; then gl_LIBOBJS="$gl_LIBOBJS ftell.$ac_objext" -fi + fi @@ -30484,7 +30419,7 @@ $as_echo "#define FTELLO_BROKEN_AFTER_SWITCHING_FROM_READ_TO_WRITE 1" >>confdefs fi fi -if test $HAVE_FTELLO = 0 || test $REPLACE_FTELLO = 1; then + if test $HAVE_FTELLO = 0 || test $REPLACE_FTELLO = 1; then @@ -30508,7 +30443,7 @@ fi done -fi + fi @@ -30542,7 +30477,7 @@ $as_echo "#define GNULIB_TEST_FTELLO 1" >>confdefs.h HAVE_FTRUNCATE=0 fi -if test $HAVE_FTRUNCATE = 0 || test $REPLACE_FTRUNCATE = 1; then + if test $HAVE_FTRUNCATE = 0 || test $REPLACE_FTRUNCATE = 1; then @@ -30554,7 +30489,6 @@ if test $HAVE_FTRUNCATE = 0 || test $REPLACE_FTRUNCATE = 1; then gl_LIBOBJS="$gl_LIBOBJS ftruncate.$ac_objext" - for ac_func in chsize do : ac_fn_c_check_func "$LINENO" "chsize" "ac_cv_func_chsize" @@ -30567,7 +30501,7 @@ fi done -fi + fi @@ -30590,7 +30524,6 @@ $as_echo "#define GNULIB_TEST_FTRUNCATE 1" >>confdefs.h - case $ac_cv_func_openat+$gl_cv_func_lstat_dereferences_slashed_symlink in yes+*yes) ;; @@ -30716,7 +30649,7 @@ $as_echo "$gl_cv_func_futimens_works" >&6; } fi fi -if test $HAVE_FUTIMENS = 0 || test $REPLACE_FUTIMENS = 1; then + if test $HAVE_FUTIMENS = 0 || test $REPLACE_FUTIMENS = 1; then @@ -30727,7 +30660,7 @@ if test $HAVE_FUTIMENS = 0 || test $REPLACE_FUTIMENS = 1; then gl_LIBOBJS="$gl_LIBOBJS futimens.$ac_objext" -fi + fi @@ -30991,7 +30924,6 @@ $as_echo "$gl_cv_func_gai_strerror_posix_signature" >&6; } - ac_fn_c_check_member "$LINENO" "struct sockaddr" "sa_len" "ac_cv_member_struct_sockaddr_sa_len" " #include <sys/types.h> #include <sys/socket.h> @@ -31142,7 +31074,7 @@ fi -if test $HAVE_GETADDRINFO = 0; then + if test $HAVE_GETADDRINFO = 0; then @@ -31153,8 +31085,8 @@ if test $HAVE_GETADDRINFO = 0; then gl_LIBOBJS="$gl_LIBOBJS getaddrinfo.$ac_objext" -fi -if test $HAVE_DECL_GAI_STRERROR = 0 || test $REPLACE_GAI_STRERROR = 1; then + fi + if test $HAVE_DECL_GAI_STRERROR = 0 || test $REPLACE_GAI_STRERROR = 1; then @@ -31165,7 +31097,7 @@ if test $HAVE_DECL_GAI_STRERROR = 0 || test $REPLACE_GAI_STRERROR = 1; then gl_LIBOBJS="$gl_LIBOBJS gai_strerror.$ac_objext" -fi + fi @@ -31494,16 +31426,18 @@ else int main () { - char const *dir_name = "confdir-14B---"; char *cwd; size_t initial_cwd_len; int fail = 0; - size_t desired_depth; - size_t d; /* The bug is triggered when PATH_MAX < getpagesize (), so skip this relatively expensive and invasive test if that's not true. */ - if (getpagesize () <= PATH_MAX) +#ifdef PATH_MAX + int bug_possible = PATH_MAX < getpagesize (); +#else + int bug_possible = 0; +#endif + if (! bug_possible) return 0; cwd = getcwd (NULL, 0); @@ -31512,35 +31446,43 @@ main () initial_cwd_len = strlen (cwd); free (cwd); - desired_depth = ((TARGET_LEN - 1 - initial_cwd_len) - / (1 + strlen (dir_name))); - for (d = 0; d < desired_depth; d++) + + if (1) { - if (mkdir (dir_name, S_IRWXU) < 0 || chdir (dir_name) < 0) + static char const dir_name[] = "confdir-14B---"; + size_t desired_depth = ((TARGET_LEN - 1 - initial_cwd_len) + / sizeof dir_name); + size_t d; + for (d = 0; d < desired_depth; d++) { - fail = 3; /* Unable to construct deep hierarchy. */ - break; + if (mkdir (dir_name, S_IRWXU) < 0 || chdir (dir_name) < 0) + { + if (! (errno == ERANGE || errno == ENAMETOOLONG + || errno == ENOENT)) + fail = 3; /* Unable to construct deep hierarchy. */ + break; + } } - } - /* If libc has the bug in question, this invocation of getcwd - results in a failed assertion. */ - cwd = getcwd (NULL, 0); - if (cwd == NULL) - fail = 4; /* getcwd failed: it refuses to return a string longer - than PATH_MAX. */ - free (cwd); + /* If libc has the bug in question, this invocation of getcwd + results in a failed assertion. */ + cwd = getcwd (NULL, 0); + if (cwd == NULL) + fail = 4; /* getcwd didn't assert, but it failed for a long name + where the answer could have been learned. */ + free (cwd); - /* Call rmdir first, in case the above chdir failed. */ - rmdir (dir_name); - while (0 < d--) - { - if (chdir ("..") < 0) + /* Call rmdir first, in case the above chdir failed. */ + rmdir (dir_name); + while (0 < d--) { - fail = 5; - break; + if (chdir ("..") < 0) + { + fail = 5; + break; + } + rmdir (dir_name); } - rmdir (dir_name); } return fail; @@ -31596,7 +31538,7 @@ $as_echo "#define HAVE_PARTLY_WORKING_GETCWD 1" >>confdefs.h REPLACE_GETCWD=1 fi -if test $REPLACE_GETCWD = 1; then + if test $REPLACE_GETCWD = 1; then @@ -31612,7 +31554,7 @@ if test $REPLACE_GETCWD = 1; then : -fi + fi cat >>confdefs.h <<_ACEOF @@ -31647,7 +31589,7 @@ $as_echo "#define GNULIB_TEST_GETCWD 1" >>confdefs.h ;; esac -if test $REPLACE_GETCWD = 1; then + if test $REPLACE_GETCWD = 1; then @@ -31658,7 +31600,7 @@ if test $REPLACE_GETCWD = 1; then gl_LIBOBJS="$gl_LIBOBJS getcwd-lgpl.$ac_objext" -fi + fi @@ -31769,7 +31711,7 @@ $as_echo "$gl_cv_func_working_getdelim" >&6; } HAVE_DECL_GETDELIM=0 fi -if test $HAVE_GETDELIM = 0 || test $REPLACE_GETDELIM = 1; then + if test $HAVE_GETDELIM = 0 || test $REPLACE_GETDELIM = 1; then @@ -31805,7 +31747,7 @@ cat >>confdefs.h <<_ACEOF _ACEOF -fi + fi @@ -31828,7 +31770,7 @@ $as_echo "#define GNULIB_TEST_GETDELIM 1" >>confdefs.h HAVE_GETDTABLESIZE=0 fi -if test $HAVE_GETDTABLESIZE = 0; then + if test $HAVE_GETDTABLESIZE = 0; then @@ -31839,10 +31781,8 @@ if test $HAVE_GETDTABLESIZE = 0; then gl_LIBOBJS="$gl_LIBOBJS getdtablesize.$ac_objext" - - - -fi + : + fi @@ -32031,7 +31971,7 @@ $as_echo "$gl_cv_func_getgroups_works" >&6; } fi test -n "$GETGROUPS_LIB" && LIBS="$GETGROUPS_LIB $LIBS" -if test $HAVE_GETGROUPS = 0 || test $REPLACE_GETGROUPS = 1; then + if test $HAVE_GETGROUPS = 0 || test $REPLACE_GETGROUPS = 1; then @@ -32042,7 +31982,7 @@ if test $HAVE_GETGROUPS = 0 || test $REPLACE_GETGROUPS = 1; then gl_LIBOBJS="$gl_LIBOBJS getgroups.$ac_objext" -fi + fi @@ -32210,7 +32150,7 @@ _ACEOF fi -if test $HAVE_GETHOSTNAME = 0; then + if test $HAVE_GETHOSTNAME = 0; then @@ -32236,7 +32176,7 @@ done fi -fi + fi @@ -32274,7 +32214,9 @@ _ACEOF - if test $ac_cv_func_nanouptime != yes; then + if test $ac_cv_func_nanouptime != yes \ + && { test $ac_cv_have_decl_gethrtime = no \ + || test $gl_cv_arithmetic_hrtime_t = no; }; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether CLOCK_MONOTONIC or CLOCK_REALTIME is defined" >&5 $as_echo_n "checking whether CLOCK_MONOTONIC or CLOCK_REALTIME is defined... " >&6; } if ${gl_cv_have_clock_gettime_macro+:} false; then : @@ -32307,22 +32249,6 @@ $as_echo "$gl_cv_have_clock_gettime_macro" >&6; } fi -if test $ac_cv_have_decl_gethrtime = no || test $gl_cv_arithmetic_hrtime_t = no; then - - - - - - - - - gl_LIBOBJS="$gl_LIBOBJS gethrxtime.$ac_objext" - - - - : - -fi @@ -32423,7 +32349,7 @@ $as_echo "$am_cv_func_working_getline" >&6; } ;; esac -if test $REPLACE_GETLINE = 1; then + if test $REPLACE_GETLINE = 1; then @@ -32437,7 +32363,7 @@ if test $REPLACE_GETLINE = 1; then : -fi + fi @@ -32460,7 +32386,7 @@ $as_echo "#define GNULIB_TEST_GETLINE 1" >>confdefs.h gl_save_LIBS=$LIBS -# getloadvg is present in libc on glibc >= 2.2, MacOS X, FreeBSD >= 2.0, +# getloadvg is present in libc on glibc >= 2.2, Mac OS X, FreeBSD >= 2.0, # NetBSD >= 0.9, OpenBSD >= 2.0, Solaris >= 7. HAVE_GETLOADAVG=1 ac_fn_c_check_func "$LINENO" "getloadavg" "ac_cv_func_getloadavg" @@ -32848,7 +32774,7 @@ else fi -if test $HAVE_GETLOADAVG = 0; then + if test $HAVE_GETLOADAVG = 0; then @@ -32862,6 +32788,8 @@ if test $HAVE_GETLOADAVG = 0; then # Figure out what our getloadavg.c needs. + + # On HPUX9, an unprivileged user can get load averages this way. if test $gl_func_getloadavg_done = no; then for ac_func in pstat_getdynamic @@ -32974,7 +32902,7 @@ fi done -fi + fi @@ -32997,7 +32925,7 @@ $as_echo "#define GNULIB_TEST_GETLOADAVG 1" >>confdefs.h HAVE_GETLOGIN=0 fi -if test $HAVE_GETLOGIN = 0; then + if test $HAVE_GETLOGIN = 0; then @@ -33008,7 +32936,7 @@ if test $HAVE_GETLOGIN = 0; then gl_LIBOBJS="$gl_LIBOBJS getlogin.$ac_objext" -fi + fi @@ -33036,7 +32964,7 @@ $as_echo "#define GNULIB_TEST_GETLOGIN 1" >>confdefs.h -if test $REPLACE_GETOPT = 1; then + if test $REPLACE_GETOPT = 1; then @@ -33060,8 +32988,8 @@ if test $REPLACE_GETOPT = 1; then - GNULIB_GL_UNISTD_H_GETOPT=1 -fi + GNULIB_GL_UNISTD_H_GETOPT=1 + fi @@ -33072,15 +33000,11 @@ $as_echo "#define GNULIB_TEST_GETOPT_GNU 1" >>confdefs.h - REPLACE_GETOPT=0 - - - if test -n "$gl_replace_getopt"; then : + REPLACE_GETOPT=0 + if test -n "$gl_replace_getopt"; then REPLACE_GETOPT=1 - -fi - + fi if test $REPLACE_GETOPT = 1; then @@ -33092,7 +33016,7 @@ $as_echo "#define __GETOPT_PREFIX rpl_" >>confdefs.h fi -if test $REPLACE_GETOPT = 1; then + if test $REPLACE_GETOPT = 1; then @@ -33116,8 +33040,8 @@ if test $REPLACE_GETOPT = 1; then - GNULIB_GL_UNISTD_H_GETOPT=1 -fi + GNULIB_GL_UNISTD_H_GETOPT=1 + fi @@ -33179,7 +33103,7 @@ else fi -if test $REPLACE_GETPAGESIZE = 1; then + if test $REPLACE_GETPAGESIZE = 1; then @@ -33190,7 +33114,7 @@ if test $REPLACE_GETPAGESIZE = 1; then gl_LIBOBJS="$gl_LIBOBJS getpagesize.$ac_objext" -fi + fi @@ -33218,7 +33142,7 @@ $as_echo "#define getpass gnu_getpass" >>confdefs.h fi -if test $REPLACE_GETPASS = 1; then + if test $REPLACE_GETPASS = 1; then @@ -33254,7 +33178,7 @@ _ACEOF : -fi + fi @@ -33494,7 +33418,7 @@ cat >>confdefs.h <<_ACEOF _ACEOF -if test $HAVE_GETTIMEOFDAY = 0 || test $REPLACE_GETTIMEOFDAY = 1; then + if test $HAVE_GETTIMEOFDAY = 0 || test $REPLACE_GETTIMEOFDAY = 1; then @@ -33530,7 +33454,7 @@ fi done -fi + fi @@ -33576,7 +33500,7 @@ _ACEOF HAVE_DECL_GETUSERSHELL=0 fi -if test $HAVE_GETUSERSHELL = 0; then + if test $HAVE_GETUSERSHELL = 0; then @@ -33587,7 +33511,7 @@ if test $HAVE_GETUSERSHELL = 0; then gl_LIBOBJS="$gl_LIBOBJS getusershell.$ac_objext" -fi + fi @@ -33613,13 +33537,13 @@ else fi -# Autoconf 2.61a.99 and earlier don't support linking a file only -# in VPATH builds. But since GNUmakefile is for maintainer use -# only, it does not matter if we skip the link with older autoconf. -# Automake 1.10.1 and earlier try to remove GNUmakefile in non-VPATH -# builds, so use a shell variable to bypass this. -GNUmakefile=GNUmakefile -ac_config_links="$ac_config_links $GNUmakefile:$GNUmakefile" + # Autoconf 2.61a.99 and earlier don't support linking a file only + # in VPATH builds. But since GNUmakefile is for maintainer use + # only, it does not matter if we skip the link with older autoconf. + # Automake 1.10.1 and earlier try to remove GNUmakefile in non-VPATH + # builds, so use a shell variable to bypass this. + GNUmakefile=GNUmakefile + ac_config_links="$ac_config_links $GNUmakefile:$GNUmakefile" @@ -33636,7 +33560,7 @@ else fi -if test $HAVE_GROUP_MEMBER = 0; then + if test $HAVE_GROUP_MEMBER = 0; then @@ -33650,7 +33574,7 @@ if test $HAVE_GROUP_MEMBER = 0; then -fi + fi @@ -34026,7 +33950,7 @@ fi fi -if test $REPLACE_ICONV_OPEN = 1; then + if test $REPLACE_ICONV_OPEN = 1; then @@ -34037,8 +33961,8 @@ if test $REPLACE_ICONV_OPEN = 1; then gl_LIBOBJS="$gl_LIBOBJS iconv_open.$ac_objext" -fi -if test $REPLACE_ICONV = 1; then + fi + if test $REPLACE_ICONV = 1; then @@ -34059,7 +33983,7 @@ if test $REPLACE_ICONV = 1; then gl_LIBOBJS="$gl_LIBOBJS iconv_close.$ac_objext" -fi + fi : @@ -34070,7 +33994,6 @@ fi - HAVE_INET_NTOP=1 INET_NTOP_LIB= @@ -34224,7 +34147,7 @@ _ACEOF fi -if test $HAVE_INET_NTOP = 0 || test $REPLACE_INET_NTOP = 1; then + if test $HAVE_INET_NTOP = 0 || test $REPLACE_INET_NTOP = 1; then @@ -34238,7 +34161,7 @@ if test $HAVE_INET_NTOP = 0 || test $REPLACE_INET_NTOP = 1; then -fi + fi @@ -34571,7 +34494,7 @@ done HAVE_ISAPIPE=0 fi -if test $HAVE_ISAPIPE = 0; then + if test $HAVE_ISAPIPE = 0; then @@ -34671,14 +34594,14 @@ _ACEOF ;; esac -fi + fi case $host_os in mingw*) REPLACE_ISATTY=1 ;; esac -if test $REPLACE_ISATTY = 1; then + if test $REPLACE_ISATTY = 1; then @@ -34689,10 +34612,8 @@ if test $REPLACE_ISATTY = 1; then gl_LIBOBJS="$gl_LIBOBJS isatty.$ac_objext" - - - -fi + : + fi @@ -34717,7 +34638,7 @@ $as_echo "#define GNULIB_TEST_ISATTY 1" >>confdefs.h HAVE_ISBLANK=0 fi -if test $HAVE_ISBLANK = 0; then + if test $HAVE_ISBLANK = 0; then @@ -34728,7 +34649,7 @@ if test $HAVE_ISBLANK = 0; then gl_LIBOBJS="$gl_LIBOBJS isblank.$ac_objext" -fi + fi @@ -34785,7 +34706,7 @@ $as_echo "#define HAVE_ISNAND_IN_LIBC 1" >>confdefs.h fi -if test $gl_func_isnand_no_libm != yes; then + if test $gl_func_isnand_no_libm != yes; then @@ -34799,7 +34720,7 @@ if test $gl_func_isnand_no_libm != yes; then -fi + fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether isnan(float) can be used without linking with libm" >&5 @@ -34940,7 +34861,7 @@ $as_echo "#define HAVE_ISNANF_IN_LIBC 1" >>confdefs.h gl_func_isnanf_no_libm=no fi -if test $gl_func_isnanf_no_libm != yes; then + if test $gl_func_isnanf_no_libm != yes; then @@ -35062,7 +34983,7 @@ _ACEOF esac -fi + fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether isnan(long double) can be used without linking with libm" >&5 @@ -35271,7 +35192,7 @@ $as_echo "#define HAVE_ISNANL_IN_LIBC 1" >>confdefs.h fi -if test $gl_func_isnanl_no_libm != yes; then + if test $gl_func_isnanl_no_libm != yes; then @@ -35398,7 +35319,7 @@ _ACEOF -fi + fi @@ -35441,10 +35362,10 @@ _ACEOF fi -if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then - : -else - if test $HAVE_ISWBLANK = 0 || test $REPLACE_ISWBLANK = 1; then + if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then + : + else + if test $HAVE_ISWBLANK = 0 || test $REPLACE_ISWBLANK = 1; then @@ -35455,8 +35376,8 @@ else gl_LIBOBJS="$gl_LIBOBJS iswblank.$ac_objext" + fi fi -fi @@ -35752,7 +35673,7 @@ done esac fi -if test $HAVE_LCHOWN = 0 || test $REPLACE_LCHOWN = 1; then + if test $HAVE_LCHOWN = 0 || test $REPLACE_LCHOWN = 1; then @@ -35763,7 +35684,7 @@ if test $HAVE_LCHOWN = 0 || test $REPLACE_LCHOWN = 1; then gl_LIBOBJS="$gl_LIBOBJS lchown.$ac_objext" -fi + fi @@ -35907,7 +35828,7 @@ $as_echo "$gl_cv_func_link_works" >&6; } esac fi -if test $HAVE_LINK = 0 || test $REPLACE_LINK = 1; then + if test $HAVE_LINK = 0 || test $REPLACE_LINK = 1; then @@ -35918,7 +35839,7 @@ if test $HAVE_LINK = 0 || test $REPLACE_LINK = 1; then gl_LIBOBJS="$gl_LIBOBJS link.$ac_objext" -fi + fi @@ -36178,7 +36099,7 @@ _ACEOF fi fi -if test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1; then + if test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1; then @@ -36189,8 +36110,8 @@ if test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1; then gl_LIBOBJS="$gl_LIBOBJS linkat.$ac_objext" -fi -if test $HAVE_LINKAT = 0; then + fi + if test $HAVE_LINKAT = 0; then @@ -36201,7 +36122,7 @@ if test $HAVE_LINKAT = 0; then gl_LIBOBJS="$gl_LIBOBJS at-func2.$ac_objext" -fi + fi @@ -36225,7 +36146,7 @@ $as_echo "#define GNULIB_TEST_LINKAT 1" >>confdefs.h -LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\"" + LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\"" @@ -36423,7 +36344,7 @@ $as_echo "$gl_cv_next_locale_h" >&6; } REPLACE_LOCALECONV=1 fi -if test $REPLACE_LOCALECONV = 1; then + if test $REPLACE_LOCALECONV = 1; then @@ -36447,7 +36368,7 @@ _ACEOF fi -fi + fi @@ -36466,7 +36387,7 @@ $as_echo "#define GNULIB_TEST_LOCALECONV 1" >>confdefs.h if test "$gl_threads_api" = posix; then - # OSF/1 4.0 and MacOS X 10.1 lack the pthread_rwlock_t type and the + # OSF/1 4.0 and Mac OS X 10.1 lack the pthread_rwlock_t type and the # pthread_rwlock_* functions. ac_fn_c_check_type "$LINENO" "pthread_rwlock_t" "ac_cv_type_pthread_rwlock_t" "#include <pthread.h> " @@ -36503,9 +36424,7 @@ $as_echo "#define HAVE_PTHREAD_MUTEX_RECURSIVE 1" >>confdefs.h fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - - - + : @@ -36595,7 +36514,7 @@ $as_echo "#define LSEEK_PIPE_BROKEN 1" >>confdefs.h REPLACE_LSEEK=1 fi -if test $REPLACE_LSEEK = 1; then + if test $REPLACE_LSEEK = 1; then @@ -36606,7 +36525,7 @@ if test $REPLACE_LSEEK = 1; then gl_LIBOBJS="$gl_LIBOBJS lseek.$ac_objext" -fi + fi @@ -36636,7 +36555,7 @@ $as_echo "#define GNULIB_TEST_LSEEK 1" >>confdefs.h HAVE_LSTAT=0 fi -if test $REPLACE_LSTAT = 1; then + if test $REPLACE_LSTAT = 1; then @@ -36647,11 +36566,8 @@ if test $REPLACE_LSTAT = 1; then gl_LIBOBJS="$gl_LIBOBJS lstat.$ac_objext" - - - : - -fi + : + fi @@ -36741,7 +36657,7 @@ else fi -if test $REPLACE_MALLOC = 1; then + if test $REPLACE_MALLOC = 1; then @@ -36752,7 +36668,7 @@ if test $REPLACE_MALLOC = 1; then gl_LIBOBJS="$gl_LIBOBJS malloc.$ac_objext" -fi + fi cat >>confdefs.h <<_ACEOF @@ -36771,7 +36687,7 @@ $as_echo "#define HAVE_MALLOC_POSIX 1" >>confdefs.h REPLACE_MALLOC=1 fi -if test $REPLACE_MALLOC = 1; then + if test $REPLACE_MALLOC = 1; then @@ -36782,7 +36698,7 @@ if test $REPLACE_MALLOC = 1; then gl_LIBOBJS="$gl_LIBOBJS malloc.$ac_objext" -fi + fi @@ -36879,7 +36795,6 @@ $as_echo "$gl_cv_next_math_h" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NAN macro works" >&5 $as_echo_n "checking whether NAN macro works... " >&6; } if ${gl_cv_header_math_nan_works+:} false; then : @@ -36953,8 +36868,6 @@ $as_echo "$gl_cv_header_math_huge_val_works" >&6; } - - : @@ -36995,7 +36908,7 @@ _ACEOF fi fi -if test $HAVE_MBRLEN = 0 || test $REPLACE_MBRLEN = 1; then + if test $HAVE_MBRLEN = 0 || test $REPLACE_MBRLEN = 1; then @@ -37009,7 +36922,7 @@ if test $HAVE_MBRLEN = 0 || test $REPLACE_MBRLEN = 1; then : -fi + fi @@ -37588,7 +37501,7 @@ $as_echo "#define MBRTOWC_NUL_RETVAL_BUG 1" >>confdefs.h fi fi -if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then + if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then @@ -37602,7 +37515,7 @@ if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then : -fi + fi @@ -37826,7 +37739,7 @@ _ACEOF fi fi -if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then + if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then @@ -37840,7 +37753,7 @@ if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then : -fi + fi @@ -38186,7 +38099,7 @@ $as_echo "$gl_cv_func_mbsrtowcs_works" >&6; } fi fi -if test $HAVE_MBSRTOWCS = 0 || test $REPLACE_MBSRTOWCS = 1; then + if test $HAVE_MBSRTOWCS = 0 || test $REPLACE_MBSRTOWCS = 1; then @@ -38210,7 +38123,7 @@ if test $HAVE_MBSRTOWCS = 0 || test $REPLACE_MBSRTOWCS = 1; then : -fi + fi @@ -38346,7 +38259,7 @@ $as_echo "#define mbstate_t int" >>confdefs.h REPLACE_MBTOWC=1 fi -if test $REPLACE_MBTOWC = 1; then + if test $REPLACE_MBTOWC = 1; then @@ -38360,7 +38273,7 @@ if test $REPLACE_MBTOWC = 1; then : -fi + fi @@ -38378,14 +38291,13 @@ $as_echo "#define GNULIB_TEST_MBTOWC 1" >>confdefs.h - : : -if test $HAVE_MEMCHR = 0 || test $REPLACE_MEMCHR = 1; then + if test $HAVE_MEMCHR = 0 || test $REPLACE_MEMCHR = 1; then @@ -38410,7 +38322,7 @@ fi done -fi + fi @@ -38426,9 +38338,7 @@ $as_echo "#define GNULIB_TEST_MEMCHR 1" >>confdefs.h - - - + : @@ -38450,7 +38360,7 @@ done HAVE_MEMPCPY=0 fi -if test $HAVE_MEMPCPY = 0; then + if test $HAVE_MEMPCPY = 0; then @@ -38464,7 +38374,7 @@ if test $HAVE_MEMPCPY = 0; then : -fi + fi @@ -38501,7 +38411,7 @@ fi done -if test $ac_cv_func_memrchr = no; then + if test $ac_cv_func_memrchr = no; then @@ -38512,8 +38422,8 @@ if test $ac_cv_func_memrchr = no; then gl_LIBOBJS="$gl_LIBOBJS memrchr.$ac_objext" - : -fi + : + fi @@ -38642,7 +38552,7 @@ $as_echo "#define FUNC_MKDIR_DOT_BUG 1" >>confdefs.h ;; esac -if test $REPLACE_MKDIR = 1; then + if test $REPLACE_MKDIR = 1; then @@ -38653,7 +38563,7 @@ if test $REPLACE_MKDIR = 1; then gl_LIBOBJS="$gl_LIBOBJS mkdir.$ac_objext" -fi + fi @@ -38726,7 +38636,7 @@ $as_echo "#define MKFIFO_TRAILING_SLASH_BUG 1" >>confdefs.h esac fi -if test $HAVE_MKFIFO = 0 || test $REPLACE_MKFIFO = 1; then + if test $HAVE_MKFIFO = 0 || test $REPLACE_MKFIFO = 1; then @@ -38737,7 +38647,7 @@ if test $HAVE_MKFIFO = 0 || test $REPLACE_MKFIFO = 1; then gl_LIBOBJS="$gl_LIBOBJS mkfifo.$ac_objext" -fi + fi @@ -38780,12 +38690,19 @@ else #include <sys/stat.h> #include <unistd.h> + /* Copied from root-uid.h. FIXME: Just use root-uid.h. */ + #ifdef __TANDEM + # define ROOT_UID 65535 + #else + # define ROOT_UID 0 + #endif + int main () { /* Indeterminate for super-user, assume no. Why are you running configure as root, anyway? */ - if (!geteuid ()) return 99; + if (geteuid () == ROOT_UID) return 99; if (mknod ("conftest.fifo", S_IFIFO | 0600, 0)) return 2; ; return 0; @@ -38824,7 +38741,7 @@ $as_echo "#define MKNOD_FIFO_BUG 1" >>confdefs.h fi fi -if test $HAVE_MKNOD = 0 || test $REPLACE_MKNOD = 1; then + if test $HAVE_MKNOD = 0 || test $REPLACE_MKNOD = 1; then @@ -38835,7 +38752,7 @@ if test $HAVE_MKNOD = 0 || test $REPLACE_MKNOD = 1; then gl_LIBOBJS="$gl_LIBOBJS mknod.$ac_objext" -fi + fi @@ -38933,7 +38850,7 @@ $as_echo "$gl_cv_func_working_mkstemp" >&6; } HAVE_MKSTEMP=0 fi -if test $HAVE_MKSTEMP = 0 || test $REPLACE_MKSTEMP = 1; then + if test $HAVE_MKSTEMP = 0 || test $REPLACE_MKSTEMP = 1; then @@ -38946,7 +38863,7 @@ if test $HAVE_MKSTEMP = 0 || test $REPLACE_MKSTEMP = 1; then -fi + fi @@ -38969,7 +38886,7 @@ $as_echo "#define GNULIB_TEST_MKSTEMP 1" >>confdefs.h if test $APPLE_UNIVERSAL_BUILD = 1; then - # A universal build on Apple MacOS X platforms. + # A universal build on Apple Mac OS X platforms. # The test result would be 'yes' in 32-bit mode and 'no' in 64-bit mode. # But we need a configuration result that is valid in both modes. gl_cv_func_working_mktime=no @@ -39151,20 +39068,23 @@ main () if (tz_strings[i]) putenv (tz_strings[i]); - for (t = 0; t <= time_t_max - delta; t += delta) + for (t = 0; t <= time_t_max - delta && (result & 1) == 0; t += delta) if (! mktime_test (t)) result |= 1; - if (! (mktime_test ((time_t) 1) - && mktime_test ((time_t) (60 * 60)) - && mktime_test ((time_t) (60 * 60 * 24)))) + if ((result & 2) == 0 + && ! (mktime_test ((time_t) 1) + && mktime_test ((time_t) (60 * 60)) + && mktime_test ((time_t) (60 * 60 * 24)))) result |= 2; - for (j = 1; ; j <<= 1) - if (! bigtime_test (j)) - result |= 4; - else if (INT_MAX / 2 < j) - break; - if (! bigtime_test (INT_MAX)) + for (j = 1; (result & 4) == 0; j <<= 1) + { + if (! bigtime_test (j)) + result |= 4; + if (INT_MAX / 2 < j) + break; + } + if ((result & 8) == 0 && ! bigtime_test (INT_MAX)) result |= 8; } if (! irix_6_4_bug ()) @@ -39196,7 +39116,7 @@ $as_echo "$gl_cv_func_working_mktime" >&6; } REPLACE_MKTIME=0 fi -if test $REPLACE_MKTIME = 1; then + if test $REPLACE_MKTIME = 1; then @@ -39207,10 +39127,8 @@ if test $REPLACE_MKTIME = 1; then gl_LIBOBJS="$gl_LIBOBJS mktime.$ac_objext" - - - -fi + : + fi @@ -39874,7 +39792,7 @@ fi -if test $gl_cv_list_mounted_fs = yes; then + if test $gl_cv_list_mounted_fs = yes; then @@ -39916,7 +39834,7 @@ fi -fi + fi @@ -39932,7 +39850,7 @@ $as_echo "#define HAVE_MSVC_INVALID_PARAMETER_HANDLER 1" >>confdefs.h fi -if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then + if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then @@ -39943,11 +39861,11 @@ if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then gl_LIBOBJS="$gl_LIBOBJS msvc-inval.$ac_objext" -fi + fi -if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then + if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then @@ -39958,7 +39876,7 @@ if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then gl_LIBOBJS="$gl_LIBOBJS msvc-nothrow.$ac_objext" -fi + fi @@ -40035,7 +39953,7 @@ fi if test $APPLE_UNIVERSAL_BUILD = 1; then - # A universal build on Apple MacOS X platforms. + # A universal build on Apple Mac OS X platforms. # The test result would be 'no (mishandles large arguments)' in 64-bit # mode but 'yes' in 32-bit mode. But we need a configuration result that # is valid in both modes. @@ -40153,7 +40071,7 @@ $as_echo "#define HAVE_BUG_BIG_NANOSLEEP 1" >>confdefs.h fi LIBS=$nanosleep_save_libs -if test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1; then + if test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1; then @@ -40166,11 +40084,9 @@ if test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1; then + : - - - -fi + fi @@ -40476,7 +40392,7 @@ $as_echo "#define REPLACE_NL_LANGINFO 1" >>confdefs.h HAVE_NL_LANGINFO=0 fi -if test $HAVE_NL_LANGINFO = 0 || test $REPLACE_NL_LANGINFO = 1; then + if test $HAVE_NL_LANGINFO = 0 || test $REPLACE_NL_LANGINFO = 1; then @@ -40487,7 +40403,7 @@ if test $HAVE_NL_LANGINFO = 0 || test $REPLACE_NL_LANGINFO = 1; then gl_LIBOBJS="$gl_LIBOBJS nl_langinfo.$ac_objext" -fi + fi @@ -40507,6 +40423,7 @@ $as_echo "#define GNULIB_TEST_NL_LANGINFO 1" >>confdefs.h + for ac_header in sys/pstat.h sys/sysmp.h sys/param.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -40735,7 +40652,7 @@ $as_echo "#define OPEN_TRAILING_SLASH_BUG 1" >>confdefs.h -if test $REPLACE_OPEN = 1; then + if test $REPLACE_OPEN = 1; then @@ -40748,10 +40665,9 @@ if test $REPLACE_OPEN = 1; then - : -fi + fi @@ -40785,7 +40701,7 @@ $as_echo "#define GNULIB_TEST_OPEN 1" >>confdefs.h ;; esac -if test $HAVE_OPENAT = 0 || test $REPLACE_OPENAT = 1; then + if test $HAVE_OPENAT = 0 || test $REPLACE_OPENAT = 1; then @@ -40798,10 +40714,9 @@ if test $HAVE_OPENAT = 0 || test $REPLACE_OPENAT = 1; then - : -fi + fi cat >>confdefs.h <<_ACEOF @@ -40865,7 +40780,7 @@ done fi -if test $HAVE_OPENDIR = 0 || test $REPLACE_OPENDIR = 1; then + if test $HAVE_OPENDIR = 0 || test $REPLACE_OPENDIR = 1; then @@ -40876,7 +40791,7 @@ if test $HAVE_OPENDIR = 0 || test $REPLACE_OPENDIR = 1; then gl_LIBOBJS="$gl_LIBOBJS opendir.$ac_objext" -fi + fi @@ -41224,7 +41139,7 @@ $as_echo "$gl_cv_func_posix_spawn_file_actions_addclose_works" >&6; } esac fi -if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE = 1; then + if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE = 1; then @@ -41235,7 +41150,7 @@ if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE gl_LIBOBJS="$gl_LIBOBJS spawn_faction_addclose.$ac_objext" -fi + fi @@ -41306,7 +41221,7 @@ $as_echo "$gl_cv_func_posix_spawn_file_actions_adddup2_works" >&6; } esac fi -if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = 1; then + if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = 1; then @@ -41317,7 +41232,7 @@ if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 gl_LIBOBJS="$gl_LIBOBJS spawn_faction_adddup2.$ac_objext" -fi + fi @@ -41390,7 +41305,7 @@ $as_echo "$gl_cv_func_posix_spawn_file_actions_addopen_works" >&6; } esac fi -if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = 1; then + if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = 1; then @@ -41401,7 +41316,7 @@ if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN gl_LIBOBJS="$gl_LIBOBJS spawn_faction_addopen.$ac_objext" -fi + fi @@ -41420,7 +41335,7 @@ $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 + if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then @@ -41431,7 +41346,7 @@ if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then gl_LIBOBJS="$gl_LIBOBJS spawn_faction_destroy.$ac_objext" -fi + fi @@ -41450,7 +41365,7 @@ $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 + if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then @@ -41461,7 +41376,7 @@ if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then gl_LIBOBJS="$gl_LIBOBJS spawn_faction_init.$ac_objext" -fi + fi @@ -41480,7 +41395,7 @@ $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 + if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then @@ -41491,7 +41406,7 @@ if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then gl_LIBOBJS="$gl_LIBOBJS spawnattr_destroy.$ac_objext" -fi + fi @@ -41510,7 +41425,7 @@ $as_echo "#define GNULIB_TEST_POSIX_SPAWNATTR_DESTROY 1" >>confdefs.h -if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then + if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then @@ -41521,7 +41436,7 @@ if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then gl_LIBOBJS="$gl_LIBOBJS spawnattr_init.$ac_objext" -fi + fi @@ -41540,7 +41455,7 @@ $as_echo "#define GNULIB_TEST_POSIX_SPAWNATTR_INIT 1" >>confdefs.h -if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then + if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then @@ -41551,7 +41466,7 @@ if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then gl_LIBOBJS="$gl_LIBOBJS spawnattr_setflags.$ac_objext" -fi + fi @@ -41570,7 +41485,7 @@ $as_echo "#define GNULIB_TEST_POSIX_SPAWNATTR_SETFLAGS 1" >>confdefs.h -if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then + if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then @@ -41581,7 +41496,7 @@ if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then gl_LIBOBJS="$gl_LIBOBJS spawnattr_setsigmask.$ac_objext" -fi + fi @@ -41600,7 +41515,7 @@ $as_echo "#define GNULIB_TEST_POSIX_SPAWNATTR_SETSIGMASK 1" >>confdefs.h -if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then + if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then @@ -41647,7 +41562,7 @@ fi done -fi + fi @@ -41700,7 +41615,7 @@ else /* HP cc on HP-UX 10.20 has a bug with the constant expression -0.0. ICC 10.0 has a bug when optimizing the expression -zero. The expression -DBL_MIN * DBL_MIN does not work when cross-compiling - to PowerPC on MacOS X 10.5. */ + to PowerPC on Mac OS X 10.5. */ #if defined __hpux || defined __sgi || defined __ICC static double compute_minus_zero (void) @@ -41906,7 +41821,7 @@ int main() if (exp != 5) result |= 1; } - /* Test on finite numbers that fails on MacOS X 10.4, because its frexpl + /* Test on finite numbers that fails on Mac OS X 10.4, because its frexpl function returns an invalid (incorrectly normalized) value: it returns y = { 0x3fe028f5, 0xc28f5c28, 0x3c9eb851, 0xeb851eb8 } but the correct result is @@ -41945,7 +41860,7 @@ int main() int exp; long double y = frexpl (x, &exp); /* On machines with IEEE854 arithmetic: x = 1.68105e-4932, - exp = -16382, y = 0.5. On MacOS X 10.5: exp = -16384, y = 0.5. */ + exp = -16382, y = 0.5. On Mac OS X 10.5: exp = -16384, y = 0.5. */ if (exp != LDBL_MIN_EXP - 1) result |= 8; } @@ -42105,7 +42020,6 @@ fi - for ac_func in getppriv do : ac_fn_c_check_func "$LINENO" "getppriv" "ac_cv_func_getppriv" @@ -42119,7 +42033,7 @@ done -ac_fn_c_check_decl "$LINENO" "program_invocation_name" "ac_cv_have_decl_program_invocation_name" "#include <errno.h> + ac_fn_c_check_decl "$LINENO" "program_invocation_name" "ac_cv_have_decl_program_invocation_name" "#include <errno.h> " if test "x$ac_cv_have_decl_program_invocation_name" = xyes; then : ac_have_decl=1 @@ -42131,7 +42045,7 @@ cat >>confdefs.h <<_ACEOF #define HAVE_DECL_PROGRAM_INVOCATION_NAME $ac_have_decl _ACEOF -ac_fn_c_check_decl "$LINENO" "program_invocation_short_name" "ac_cv_have_decl_program_invocation_short_name" "#include <errno.h> + ac_fn_c_check_decl "$LINENO" "program_invocation_short_name" "ac_cv_have_decl_program_invocation_short_name" "#include <errno.h> " if test "x$ac_cv_have_decl_program_invocation_short_name" = xyes; then : ac_have_decl=1 @@ -42271,6 +42185,16 @@ fi test $ac_cv_type_pthread_t != yes || test $ac_cv_type_pthread_spinlock_t != yes; then PTHREAD_H='pthread.h' + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS pthread.$ac_objext" + else PTHREAD_H= fi @@ -42286,55 +42210,48 @@ fi LIB_PTHREAD= if test $ac_cv_header_pthread_h = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_join" >&5 -$as_echo_n "checking for library containing pthread_join... " >&6; } -if ${gl_cv_search_pthread_join+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_create and pthread_join" >&5 +$as_echo_n "checking for library containing pthread_create and pthread_join... " >&6; } +if ${gl_cv_lib_pthread+:} false; then : $as_echo_n "(cached) " >&6 else - gl_saved_libs="$LIBS" - gl_cv_search_pthread_join= - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <pthread.h> -int -main () -{ -pthread_join (pthread_self (), (void **) 0); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - gl_cv_search_pthread_join="none required" -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test -z "$gl_cv_search_pthread_join"; then - LIBS="-lpthread $gl_saved_libs" + gl_saved_libs=$LIBS + gl_cv_lib_pthread= + for gl_lib_prefix in '' '-lpthread'; do + LIBS="$gl_lib_prefix $gl_saved_libs" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <pthread.h> + void *noop (void *p) { return p; } int main () { -pthread_join (pthread_self (), (void **) 0); +pthread_t pt; + void *arg = 0; + pthread_create (&pt, 0, noop, arg); + pthread_join (pthread_self (), &arg); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - gl_cv_search_pthread_join="-lpthread" + if test -z "$gl_lib_prefix"; then + gl_cv_lib_pthread="none required" + else + gl_cv_lib_pthread=$gl_lib_prefix + fi fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - fi + test -n "$gl_cv_lib_pthread" && break + done LIBS="$gl_saved_libs" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_search_pthread_join" >&5 -$as_echo "$gl_cv_search_pthread_join" >&6; } - if test "$gl_cv_search_pthread_join" != "none required"; then - LIB_PTHREAD="$gl_cv_search_pthread_join" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_lib_pthread" >&5 +$as_echo "$gl_cv_lib_pthread" >&6; } + if test "$gl_cv_lib_pthread" != "none required"; then + LIB_PTHREAD="$gl_cv_lib_pthread" fi fi @@ -42343,7 +42260,6 @@ $as_echo "$gl_cv_search_pthread_join" >&6; } - { $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 : @@ -42403,7 +42319,7 @@ $as_echo "$gl_cv_func_svid_putenv" >&6; } ;; esac -if test $REPLACE_PUTENV = 1; then + if test $REPLACE_PUTENV = 1; then @@ -42414,7 +42330,7 @@ if test $REPLACE_PUTENV = 1; then gl_LIBOBJS="$gl_LIBOBJS putenv.$ac_objext" -fi + fi @@ -42478,7 +42394,7 @@ fi fi -if test $HAVE_RAISE = 0 || test $REPLACE_RAISE = 1; then + if test $HAVE_RAISE = 0 || test $REPLACE_RAISE = 1; then @@ -42489,10 +42405,8 @@ if test $HAVE_RAISE = 0 || test $REPLACE_RAISE = 1; then gl_LIBOBJS="$gl_LIBOBJS raise.$ac_objext" - - - -fi + : + fi @@ -42527,7 +42441,7 @@ done HAVE_RAWMEMCHR=0 fi -if test $HAVE_RAWMEMCHR = 0; then + if test $HAVE_RAWMEMCHR = 0; then @@ -42538,8 +42452,8 @@ if test $HAVE_RAWMEMCHR = 0; then gl_LIBOBJS="$gl_LIBOBJS rawmemchr.$ac_objext" - : -fi + : + fi @@ -42563,7 +42477,7 @@ $as_echo "#define GNULIB_TEST_RAWMEMCHR 1" >>confdefs.h fi -if test $REPLACE_READ = 1; then + if test $REPLACE_READ = 1; then @@ -42574,10 +42488,8 @@ if test $REPLACE_READ = 1; then gl_LIBOBJS="$gl_LIBOBJS read.$ac_objext" - - - -fi + : + fi @@ -42593,7 +42505,7 @@ $as_echo "#define GNULIB_TEST_READ 1" >>confdefs.h -: + : @@ -42612,7 +42524,7 @@ done HAVE_READDIR=0 fi -if test $HAVE_READDIR = 0; then + if test $HAVE_READDIR = 0; then @@ -42623,7 +42535,7 @@ if test $HAVE_READDIR = 0; then gl_LIBOBJS="$gl_LIBOBJS readdir.$ac_objext" -fi + fi @@ -42730,7 +42642,7 @@ $as_echo "#define READLINK_TRAILING_SLASH_BUG 1" >>confdefs.h esac fi -if test $HAVE_READLINK = 0 || test $REPLACE_READLINK = 1; then + if test $HAVE_READLINK = 0 || test $REPLACE_READLINK = 1; then @@ -42744,7 +42656,7 @@ if test $HAVE_READLINK = 0 || test $REPLACE_READLINK = 1; then : -fi + fi @@ -42764,12 +42676,11 @@ $as_echo "#define GNULIB_TEST_READLINK 1" >>confdefs.h - if test $ac_cv_func_readlinkat = no; then HAVE_READLINKAT=0 fi -if test $HAVE_READLINKAT = 0; then + if test $HAVE_READLINKAT = 0; then @@ -42780,7 +42691,7 @@ if test $HAVE_READLINKAT = 0; then gl_LIBOBJS="$gl_LIBOBJS readlinkat.$ac_objext" -fi + fi @@ -42805,7 +42716,6 @@ $as_echo "#define GNULIB_TEST_READLINKAT 1" >>confdefs.h if test $ac_cv_header_utmp_h = yes || test $ac_cv_header_utmpx_h = yes; then - ac_fn_c_check_decl "$LINENO" "getutent" "ac_cv_have_decl_getutent" " /* <sys/types.h> is a prerequisite of <utmp.h> on FreeBSD 8.0, OpenBSD 4.6. */ #include <sys/types.h> @@ -43062,7 +42972,7 @@ fi fi -if test $ac_cv_header_utmp_h = yes || test $ac_cv_header_utmpx_h = yes; then + if test $ac_cv_header_utmp_h = yes || test $ac_cv_header_utmpx_h = yes; then @@ -43073,7 +42983,7 @@ if test $ac_cv_header_utmp_h = yes || test $ac_cv_header_utmpx_h = yes; then gl_LIBOBJS="$gl_LIBOBJS readutmp.$ac_objext" -fi + fi @@ -43147,7 +43057,7 @@ else fi -if test $REPLACE_REALLOC = 1; then + if test $REPLACE_REALLOC = 1; then @@ -43158,7 +43068,7 @@ if test $REPLACE_REALLOC = 1; then gl_LIBOBJS="$gl_LIBOBJS realloc.$ac_objext" -fi + fi cat >>confdefs.h <<_ACEOF @@ -43177,7 +43087,7 @@ $as_echo "#define HAVE_REALLOC_POSIX 1" >>confdefs.h REPLACE_REALLOC=1 fi -if test $REPLACE_REALLOC = 1; then + if test $REPLACE_REALLOC = 1; then @@ -43188,7 +43098,7 @@ if test $REPLACE_REALLOC = 1; then gl_LIBOBJS="$gl_LIBOBJS realloc.$ac_objext" -fi + fi @@ -43220,6 +43130,7 @@ fi # 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. + { $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 : @@ -43230,10 +43141,15 @@ else else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_includes_default - #include <locale.h> - #include <limits.h> - #include <regex.h> +#include <regex.h> + + #include <locale.h> + #include <limits.h> + #include <string.h> + #if HAVE_ALARM + # include <unistd.h> + # include <signal.h> + #endif int main () @@ -43245,26 +43161,54 @@ int result = 0; const char *s; struct re_registers regs; - /* http://sourceware.org/ml/libc-hacker/2006-09/msg00008.html - This test needs valgrind to catch the bug on Debian - GNU/Linux 3.1 x86, but it might catch the bug better - on other platforms and it shouldn't hurt to try the - test here. */ +#if HAVE_ALARM + /* Some builds of glibc go into an infinite loop on this test. */ + signal (SIGALRM, SIG_DFL); + alarm (2); +#endif if (setlocale (LC_ALL, "en_US.UTF-8")) { - static char const pat[] = "insert into"; - static char const data[] = - "\xFF\0\x12\xA2\xAA\xC4\xB1,K\x12\xC4\xB1*\xACK"; - re_set_syntax (RE_SYNTAX_GREP | RE_HAT_LISTS_NOT_NEWLINE - | RE_ICASE); - memset (®ex, 0, sizeof regex); - s = re_compile_pattern (pat, sizeof pat - 1, ®ex); - if (s) - result |= 1; - else if (re_search (®ex, data, sizeof data - 1, - 0, sizeof data - 1, ®s) - != -1) - result |= 1; + { + /* http://sourceware.org/ml/libc-hacker/2006-09/msg00008.html + This test needs valgrind to catch the bug on Debian + GNU/Linux 3.1 x86, but it might catch the bug better + on other platforms and it shouldn't hurt to try the + test here. */ + static char const pat[] = "insert into"; + static char const data[] = + "\xFF\0\x12\xA2\xAA\xC4\xB1,K\x12\xC4\xB1*\xACK"; + re_set_syntax (RE_SYNTAX_GREP | RE_HAT_LISTS_NOT_NEWLINE + | RE_ICASE); + memset (®ex, 0, sizeof regex); + s = re_compile_pattern (pat, sizeof pat - 1, ®ex); + if (s) + result |= 1; + else if (re_search (®ex, data, sizeof data - 1, + 0, sizeof data - 1, ®s) + != -1) + 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 (®ex, 0, sizeof regex); + s = re_compile_pattern (pat, sizeof pat - 1, ®ex); + if (s) + result |= 1; + else if (re_search (®ex, data, sizeof data - 1, + 0, sizeof data - 1, 0) + != 21) + result |= 1; + } + if (! setlocale (LC_ALL, "C")) return 1; } @@ -43442,7 +43386,7 @@ $as_echo "#define regfree rpl_regfree" >>confdefs.h fi -if test $ac_use_included_regex = yes; then + if test $ac_use_included_regex = yes; then @@ -43458,6 +43402,7 @@ if test $ac_use_included_regex = yes; then + for ac_header in libintl.h do : ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default" @@ -43484,12 +43429,12 @@ cat >>confdefs.h <<_ACEOF _ACEOF -fi + fi - if { case "$gl_cv_func_rmdir_works:$gl_cv_func_unlink_works" in + if { case "$gl_cv_func_rmdir_works:$gl_cv_func_unlink_honors_slashes" in *yes:*yes) false;; *) true;; esac @@ -43538,7 +43483,7 @@ $as_echo "$gl_cv_func_remove_dir_works" >&6; } esac fi -if test $REPLACE_REMOVE = 1; then + if test $REPLACE_REMOVE = 1; then @@ -43549,7 +43494,7 @@ if test $REPLACE_REMOVE = 1; then gl_LIBOBJS="$gl_LIBOBJS remove.$ac_objext" -fi + fi @@ -43843,7 +43788,7 @@ $as_echo "#define RENAME_DEST_EXISTS_BUG 1" >>confdefs.h ;; esac -if test $REPLACE_RENAME = 1; then + if test $REPLACE_RENAME = 1; then @@ -43854,7 +43799,7 @@ if test $REPLACE_RENAME = 1; then gl_LIBOBJS="$gl_LIBOBJS rename.$ac_objext" -fi + fi @@ -43888,7 +43833,7 @@ done HAVE_REWINDDIR=0 fi -if test $HAVE_REWINDDIR = 0; then + if test $HAVE_REWINDDIR = 0; then @@ -43899,7 +43844,7 @@ if test $HAVE_REWINDDIR = 0; then gl_LIBOBJS="$gl_LIBOBJS rewinddir.$ac_objext" -fi + fi @@ -43980,7 +43925,7 @@ $as_echo "$gl_cv_func_rmdir_works" >&6; } ;; esac -if test $REPLACE_RMDIR = 1; then + if test $REPLACE_RMDIR = 1; then @@ -43991,7 +43936,7 @@ if test $REPLACE_RMDIR = 1; then gl_LIBOBJS="$gl_LIBOBJS rmdir.$ac_objext" -fi + fi @@ -44011,21 +43956,6 @@ $as_echo "#define GNULIB_TEST_RMDIR 1" >>confdefs.h - - - - - - gl_LIBOBJS="$gl_LIBOBJS root-dev-ino.$ac_objext" - - - - : - - - - - for ac_func in rpmatch do : ac_fn_c_check_func "$LINENO" "rpmatch" "ac_cv_func_rpmatch" @@ -44041,7 +43971,7 @@ done HAVE_RPMATCH=0 fi -if test $HAVE_RPMATCH = 0; then + if test $HAVE_RPMATCH = 0; then @@ -44086,7 +44016,7 @@ $as_echo "#define HAVE_LANGINFO_YESEXPR 1" >>confdefs.h fi -fi + fi @@ -44120,7 +44050,7 @@ $as_echo "#define GNULIB_TEST_RPMATCH 1" >>confdefs.h : - + : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -44304,6 +44234,69 @@ $as_echo "$gl_cv_func_select_supports0" >&6; } case "$gl_cv_func_select_supports0" in *yes) ;; *) REPLACE_SELECT=1 ;; + esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether select detects invalid fds" >&5 +$as_echo_n "checking whether select detects invalid fds... " >&6; } +if ${gl_cv_func_select_detects_ebadf+:} 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_select_detects_ebadf="guessing yes" ;; + # If we don't know, assume the worst. + *) gl_cv_func_select_detects_ebadf="guessing no" ;; + esac + +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <sys/types.h> +#include <sys/time.h> +#if HAVE_SYS_SELECT_H +# include <sys/select.h> +#endif +#include <unistd.h> +#include <errno.h> + +int +main () +{ + + fd_set set; + dup2(0, 16); + FD_ZERO(&set); + FD_SET(16, &set); + close(16); + struct timeval timeout; + timeout.tv_sec = 0; + timeout.tv_usec = 5; + return select (17, &set, NULL, NULL, &timeout) != -1 || errno != EBADF; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + gl_cv_func_select_detects_ebadf=yes +else + gl_cv_func_select_detects_ebadf=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_select_detects_ebadf" >&5 +$as_echo "$gl_cv_func_select_detects_ebadf" >&6; } + case $gl_cv_func_select_detects_ebadf in + *yes) ;; + *) REPLACE_SELECT=1 ;; esac fi @@ -44335,7 +44328,7 @@ rm -f core conftest.err conftest.$ac_objext \ fi -if test $REPLACE_SELECT = 1; then + if test $REPLACE_SELECT = 1; then @@ -44346,7 +44339,7 @@ if test $REPLACE_SELECT = 1; then gl_LIBOBJS="$gl_LIBOBJS select.$ac_objext" -fi + fi @@ -44362,7 +44355,7 @@ $as_echo "#define GNULIB_TEST_SELECT 1" >>confdefs.h -for ac_header in selinux/flask.h + for ac_header in selinux/flask.h do : ac_fn_c_check_header_mongrel "$LINENO" "selinux/flask.h" "ac_cv_header_selinux_flask_h" "$ac_includes_default" if test "x$ac_cv_header_selinux_flask_h" = xyes; then : @@ -44534,8 +44527,7 @@ else fi - -if test "$with_selinux" != no && test "$ac_cv_header_selinux_selinux_h" = yes; then + if test "$with_selinux" != no && test "$ac_cv_header_selinux_selinux_h" = yes; then @@ -44546,7 +44538,7 @@ if test "$with_selinux" != no && test "$ac_cv_header_selinux_selinux_h" = yes; t gl_LIBOBJS="$gl_LIBOBJS getfilecon.$ac_objext" -fi + fi SERVENT_LIB= gl_saved_libs="$LIBS" @@ -44733,7 +44725,7 @@ $as_echo "$gl_cv_func_setenv_works" >&6; } esac fi -if test $HAVE_SETENV = 0 || test $REPLACE_SETENV = 1; then + if test $HAVE_SETENV = 0 || test $REPLACE_SETENV = 1; then @@ -44744,7 +44736,7 @@ if test $HAVE_SETENV = 0 || test $REPLACE_SETENV = 1; then gl_LIBOBJS="$gl_LIBOBJS setenv.$ac_objext" -fi + fi @@ -44778,7 +44770,7 @@ fi done -if test $ac_cv_func_sig2str = no; then + if test $ac_cv_func_sig2str = no; then @@ -44792,7 +44784,7 @@ if test $ac_cv_func_sig2str = no; then : -fi + fi @@ -44815,7 +44807,7 @@ fi HAVE_SIGACTION=0 fi -if test $HAVE_SIGACTION = 0; then + if test $HAVE_SIGACTION = 0; then @@ -44849,7 +44841,7 @@ fi HAVE_SIGINFO_T=0 fi -fi + fi @@ -45017,7 +45009,7 @@ double m0d = -p0d; /* On HP-UX 10.20, negating 0.0L does not yield -0.0L. So we use another constant expression instead. But that expression does not work on other platforms, such as when - cross-compiling to PowerPC on MacOS X 10.5. */ + cross-compiling to PowerPC on Mac OS X 10.5. */ long double p0l = 0.0L; #if defined __hpux || defined __sgi long double m0l = -LDBL_MIN * LDBL_MIN; @@ -45132,7 +45124,7 @@ double m0d = -p0d; /* On HP-UX 10.20, negating 0.0L does not yield -0.0L. So we use another constant expression instead. But that expression does not work on other platforms, such as when - cross-compiling to PowerPC on MacOS X 10.5. */ + cross-compiling to PowerPC on Mac OS X 10.5. */ long double p0l = 0.0L; #if defined __hpux || defined __sgi long double m0l = -LDBL_MIN * LDBL_MIN; @@ -45678,7 +45670,7 @@ $as_echo "#define HAVE_COPYSIGNL_IN_LIBC 1" >>confdefs.h ;; esac -if test $REPLACE_SIGNBIT = 1; then + if test $REPLACE_SIGNBIT = 1; then @@ -45709,7 +45701,7 @@ if test $REPLACE_SIGNBIT = 1; then gl_LIBOBJS="$gl_LIBOBJS signbitl.$ac_objext" -fi + fi @@ -45739,7 +45731,7 @@ fi HAVE_POSIX_SIGNALBLOCKING=0 fi -if test $HAVE_POSIX_SIGNALBLOCKING = 0; then + if test $HAVE_POSIX_SIGNALBLOCKING = 0; then @@ -45750,10 +45742,8 @@ if test $HAVE_POSIX_SIGNALBLOCKING = 0; then gl_LIBOBJS="$gl_LIBOBJS sigprocmask.$ac_objext" - - - -fi + : + fi @@ -46231,7 +46221,7 @@ $as_echo "$gl_cv_lib_socket" >&6; } : - ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" " + ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" " /* <sys/types.h> is not needed according to POSIX, but the <sys/socket.h> in i386-unknown-freebsd4.10 and powerpc-apple-darwin5.5 required it. */ @@ -46425,7 +46415,6 @@ 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 : @@ -46562,7 +46551,7 @@ $as_echo "#define REPLACE_FUNC_STAT_FILE 1" >>confdefs.h ;; esac -if test $REPLACE_STAT = 1; then + if test $REPLACE_STAT = 1; then @@ -46573,11 +46562,8 @@ if test $REPLACE_STAT = 1; then gl_LIBOBJS="$gl_LIBOBJS stat.$ac_objext" - - - : - -fi + : + fi @@ -46602,7 +46588,6 @@ $as_echo "#define GNULIB_TEST_STAT 1" >>confdefs.h - ac_fn_c_check_member "$LINENO" "struct stat" "st_atim.tv_nsec" "ac_cv_member_struct_stat_st_atim_tv_nsec" "#include <sys/types.h> #include <sys/stat.h> " @@ -46698,7 +46683,6 @@ fi - ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtimespec.tv_nsec" "ac_cv_member_struct_stat_st_birthtimespec_tv_nsec" "#include <sys/types.h> #include <sys/stat.h> " @@ -46739,6 +46723,12 @@ fi + +cat >>confdefs.h <<_ACEOF +#define GNULIB_STATAT 1 +_ACEOF + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working stdalign.h" >&5 $as_echo_n "checking for working stdalign.h... " >&6; } if ${gl_cv_header_working_stdalign_h+:} false; then : @@ -47139,7 +47129,6 @@ $as_echo "$gl_cv_next_stddef_h" >&6; } - if test $gl_cv_have_include_next = yes; then gl_cv_next_stdio_h='<'stdio.h'>' else @@ -47201,7 +47190,21 @@ $as_echo "$gl_cv_next_stdio_h" >&6; } GNULIB_FSCANF=1 + + +cat >>confdefs.h <<_ACEOF +#define GNULIB_FSCANF 1 +_ACEOF + + GNULIB_SCANF=1 + + +cat >>confdefs.h <<_ACEOF +#define GNULIB_SCANF 1 +_ACEOF + + GNULIB_FGETC=1 GNULIB_GETC=1 GNULIB_GETCHAR=1 @@ -47317,7 +47320,7 @@ done HAVE_STPCPY=0 fi -if test $HAVE_STPCPY = 0; then + if test $HAVE_STPCPY = 0; then @@ -47331,7 +47334,7 @@ if test $HAVE_STPCPY = 0; then : -fi + fi @@ -47451,7 +47454,7 @@ $as_echo "#define HAVE_STPNCPY 1" >>confdefs.h HAVE_STPNCPY=0 fi -if test $HAVE_STPNCPY = 0 || test $REPLACE_STPNCPY = 1; then + if test $HAVE_STPNCPY = 0 || test $REPLACE_STPNCPY = 1; then @@ -47465,7 +47468,7 @@ if test $HAVE_STPNCPY = 0 || test $REPLACE_STPNCPY = 1; then : -fi + fi @@ -47484,88 +47487,6 @@ $as_echo "#define GNULIB_TEST_STPNCPY 1" >>confdefs.h - for ac_func in strcasecmp -do : - ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp" -if test "x$ac_cv_func_strcasecmp" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_STRCASECMP 1 -_ACEOF - -fi -done - - if test $ac_cv_func_strcasecmp = no; then - HAVE_STRCASECMP=0 - fi - - - - for ac_func in strncasecmp -do : - ac_fn_c_check_func "$LINENO" "strncasecmp" "ac_cv_func_strncasecmp" -if test "x$ac_cv_func_strncasecmp" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_STRNCASECMP 1 -_ACEOF - -fi -done - - if test $ac_cv_func_strncasecmp = yes; then - HAVE_STRNCASECMP=1 - else - HAVE_STRNCASECMP=0 - fi - ac_fn_c_check_decl "$LINENO" "strncasecmp" "ac_cv_have_decl_strncasecmp" "$ac_includes_default" -if test "x$ac_cv_have_decl_strncasecmp" = xyes; then : - ac_have_decl=1 -else - ac_have_decl=0 -fi - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_STRNCASECMP $ac_have_decl -_ACEOF - - if test $ac_cv_have_decl_strncasecmp = no; then - HAVE_DECL_STRNCASECMP=0 - fi - - -if test $HAVE_STRCASECMP = 0; then - - - - - - - - - gl_LIBOBJS="$gl_LIBOBJS strcasecmp.$ac_objext" - - - : - -fi -if test $HAVE_STRNCASECMP = 0; then - - - - - - - - - gl_LIBOBJS="$gl_LIBOBJS strncasecmp.$ac_objext" - - - : - -fi - - - for ac_func in strchrnul do : @@ -47644,7 +47565,7 @@ $as_echo "$gl_cv_func_strchrnul_works" >&6; } esac fi -if test $HAVE_STRCHRNUL = 0 || test $REPLACE_STRCHRNUL = 1; then + if test $HAVE_STRCHRNUL = 0 || test $REPLACE_STRCHRNUL = 1; then @@ -47655,8 +47576,8 @@ if test $HAVE_STRCHRNUL = 0 || test $REPLACE_STRCHRNUL = 1; then gl_LIBOBJS="$gl_LIBOBJS strchrnul.$ac_objext" - : -fi + : + fi @@ -47686,7 +47607,7 @@ $as_echo "#define GNULIB_TEST_STRCHRNUL 1" >>confdefs.h HAVE_DECL_STRDUP=0 fi -if test $ac_cv_func_strdup = no || test $REPLACE_STRDUP = 1; then + if test $ac_cv_func_strdup = no || test $REPLACE_STRDUP = 1; then @@ -47697,8 +47618,8 @@ if test $ac_cv_func_strdup = no || test $REPLACE_STRDUP = 1; then gl_LIBOBJS="$gl_LIBOBJS strdup.$ac_objext" - : -fi + : + fi @@ -47776,7 +47697,7 @@ $as_echo "$gl_cv_func_working_strerror" >&6; } REPLACE_STRERROR=1 fi -if test $REPLACE_STRERROR = 1; then + if test $REPLACE_STRERROR = 1; then @@ -47787,7 +47708,7 @@ if test $REPLACE_STRERROR = 1; then gl_LIBOBJS="$gl_LIBOBJS strerror.$ac_objext" -fi + fi cat >>confdefs.h <<_ACEOF @@ -47812,7 +47733,7 @@ $as_echo "#define GNULIB_TEST_STRERROR 1" >>confdefs.h -if test -n "$ERRNO_H" || test $REPLACE_STRERROR_0 = 1; then + if test -n "$ERRNO_H" || test $REPLACE_STRERROR_0 = 1; then @@ -47850,7 +47771,7 @@ done fi -fi + fi # This defines (or not) HAVE_TZNAME and HAVE_TM_ZONE. @@ -47865,18 +47786,15 @@ $as_echo "#define my_strftime nstrftime" >>confdefs.h -if test $gl_cond_libtool = false; then - gl_ltlibdeps="$gl_ltlibdeps $LTLIBICONV" - gl_libdeps="$gl_libdeps $LIBICONV" -fi - - - + if test $gl_cond_libtool = false; then + gl_ltlibdeps="$gl_ltlibdeps $LTLIBICONV" + gl_libdeps="$gl_libdeps $LIBICONV" + fi -if test $REPLACE_STRNCAT = 1; then + if test $REPLACE_STRNCAT = 1; then @@ -47890,7 +47808,7 @@ if test $REPLACE_STRNCAT = 1; then : -fi + fi @@ -47941,7 +47859,7 @@ int main () { -#ifndef HAVE_DECL_STRNDUP +#if !HAVE_DECL_STRNDUP extern #ifdef __cplusplus "C" @@ -47976,7 +47894,7 @@ $as_echo "$gl_cv_func_strndup_works" >&6; } HAVE_STRNDUP=0 fi -if test $HAVE_STRNDUP = 0 || test $REPLACE_STRNDUP = 1; then + if test $HAVE_STRNDUP = 0 || test $REPLACE_STRNDUP = 1; then @@ -47987,7 +47905,7 @@ if test $HAVE_STRNDUP = 0 || test $REPLACE_STRNDUP = 1; then gl_LIBOBJS="$gl_LIBOBJS strndup.$ac_objext" -fi + fi @@ -48071,7 +47989,7 @@ test $ac_cv_func_strnlen_working = no && : fi fi -if test $HAVE_DECL_STRNLEN = 0 || test $REPLACE_STRNLEN = 1; then + if test $HAVE_DECL_STRNLEN = 0 || test $REPLACE_STRNLEN = 1; then @@ -48082,8 +48000,8 @@ if test $HAVE_DECL_STRNLEN = 0 || test $REPLACE_STRNLEN = 1; then gl_LIBOBJS="$gl_LIBOBJS strnlen.$ac_objext" - : -fi + : + fi @@ -48116,7 +48034,7 @@ done HAVE_STRPBRK=0 fi -if test $HAVE_STRPBRK = 0; then + if test $HAVE_STRPBRK = 0; then @@ -48127,8 +48045,8 @@ if test $HAVE_STRPBRK = 0; then gl_LIBOBJS="$gl_LIBOBJS strpbrk.$ac_objext" - : -fi + : + fi @@ -48217,7 +48135,7 @@ $as_echo "$gl_cv_func_working_strsignal" >&6; } HAVE_STRSIGNAL=0 fi -if test $HAVE_STRSIGNAL = 0 || test $REPLACE_STRSIGNAL = 1; then + if test $HAVE_STRSIGNAL = 0 || test $REPLACE_STRSIGNAL = 1; then @@ -48244,7 +48162,7 @@ cat >>confdefs.h <<_ACEOF _ACEOF -fi + fi @@ -48339,7 +48257,7 @@ $as_echo "$gl_cv_func_strstr_works_always" >&6; } esac fi -if test $REPLACE_STRSTR = 1; then + if test $REPLACE_STRSTR = 1; then @@ -48350,7 +48268,7 @@ if test $REPLACE_STRSTR = 1; then gl_LIBOBJS="$gl_LIBOBJS strstr.$ac_objext" -fi + fi @@ -48505,7 +48423,7 @@ $as_echo "$gl_cv_func_strtod_works" >&6; } esac fi -if test $HAVE_STRTOD = 0 || test $REPLACE_STRTOD = 1; then + if test $HAVE_STRTOD = 0 || test $REPLACE_STRTOD = 1; then @@ -48524,7 +48442,7 @@ $as_echo "#define HAVE_LDEXP_IN_LIBC 1" >>confdefs.h fi -fi + fi @@ -48625,7 +48543,7 @@ $as_echo "$gl_cv_func_strtoimax" >&6; } HAVE_STRTOIMAX=0 fi -if test $HAVE_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1; then + if test $HAVE_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1; then @@ -48650,7 +48568,7 @@ _ACEOF -fi + fi @@ -48681,7 +48599,7 @@ done fi fi -if test $HAVE_STRTOLL = 0; then + if test $HAVE_STRTOLL = 0; then @@ -48695,7 +48613,7 @@ if test $HAVE_STRTOLL = 0; then : -fi + fi @@ -48731,7 +48649,7 @@ done fi fi -if test $HAVE_STRTOULL = 0; then + if test $HAVE_STRTOULL = 0; then @@ -48745,7 +48663,7 @@ if test $HAVE_STRTOULL = 0; then : -fi + fi @@ -48770,7 +48688,7 @@ $as_echo "#define GNULIB_TEST_STRTOULL 1" >>confdefs.h HAVE_DECL_STRTOUMAX=0 fi -if test $ac_cv_func_strtoumax = no; then + if test $ac_cv_func_strtoumax = no; then @@ -48795,7 +48713,7 @@ _ACEOF -fi + fi @@ -48867,7 +48785,7 @@ $as_echo "$gl_cv_func_symlink_works" >&6; } esac fi -if test $HAVE_SYMLINK = 0 || test $REPLACE_SYMLINK = 1; then + if test $HAVE_SYMLINK = 0 || test $REPLACE_SYMLINK = 1; then @@ -48878,7 +48796,7 @@ if test $HAVE_SYMLINK = 0 || test $REPLACE_SYMLINK = 1; then gl_LIBOBJS="$gl_LIBOBJS symlink.$ac_objext" -fi + fi @@ -49294,7 +49212,6 @@ done - case "$host_os" in osf*) @@ -49584,8 +49501,6 @@ done - - if test $gl_cv_have_include_next = yes; then @@ -50138,6 +50053,17 @@ $as_echo "$gl_cv_next_termios_h" >&6; } + ac_fn_c_check_decl "$LINENO" "localtime_r" "ac_cv_have_decl_localtime_r" "#include <time.h> +" +if test "x$ac_cv_have_decl_localtime_r" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_LOCALTIME_R $ac_have_decl +_ACEOF if test $ac_cv_have_decl_localtime_r = no; then HAVE_DECL_LOCALTIME_R=0 @@ -50189,7 +50115,7 @@ $as_echo "$gl_cv_time_r_posix" >&6; } HAVE_LOCALTIME_R=0 fi -if test $HAVE_LOCALTIME_R = 0 || test $REPLACE_LOCALTIME_R = 1; then + if test $HAVE_LOCALTIME_R = 0 || test $REPLACE_LOCALTIME_R = 1; then @@ -50203,7 +50129,7 @@ if test $HAVE_LOCALTIME_R = 0 || test $REPLACE_LOCALTIME_R = 1; then : -fi + fi @@ -50298,7 +50224,7 @@ fi _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | $EGREP "Thread" >/dev/null 2>&1; then : - LIB_TIMER_TIME="$LIBMULTITHREAD $LIB_TIMER_TIME" + LIB_TIMER_TIME="$LIB_TIMER_TIME $LIBMULTITHREAD" fi rm -f conftest* @@ -50315,10 +50241,7 @@ done LIBS=$gl_saved_libs - - - - + : @@ -50340,7 +50263,7 @@ done HAVE_UNAME=0 fi -if test $HAVE_UNAME = 0; then + if test $HAVE_UNAME = 0; then @@ -50354,7 +50277,7 @@ if test $HAVE_UNAME = 0; then : -fi + fi @@ -50380,7 +50303,6 @@ fi - if test $gl_cv_have_include_next = yes; then gl_cv_next_unistd_h='<'unistd.h'>' else @@ -50799,7 +50721,7 @@ $as_echo "#define UNLINK_PARENT_BUG 1" >>confdefs.h ;; esac -if test $REPLACE_UNLINK = 1; then + if test $REPLACE_UNLINK = 1; then @@ -50810,7 +50732,7 @@ if test $REPLACE_UNLINK = 1; then gl_LIBOBJS="$gl_LIBOBJS unlink.$ac_objext" -fi + fi @@ -50826,7 +50748,7 @@ $as_echo "#define GNULIB_TEST_UNLINK 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a running program can be unlinked" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a running program can be unlinked" >&5 $as_echo_n "checking whether a running program can be unlinked... " >&6; } if ${gl_cv_func_unlink_busy_text+:} false; then : $as_echo_n "(cached) " >&6 @@ -50893,7 +50815,7 @@ $as_echo "$gl_cv_func_unlink_busy_text" >&6; } esac fi -if test $HAVE_UNLINKAT = 0 || test $REPLACE_UNLINKAT = 1; then + if test $HAVE_UNLINKAT = 0 || test $REPLACE_UNLINKAT = 1; then @@ -50904,7 +50826,7 @@ if test $HAVE_UNLINKAT = 0 || test $REPLACE_UNLINKAT = 1; then gl_LIBOBJS="$gl_LIBOBJS unlinkat.$ac_objext" -fi + fi @@ -51068,7 +50990,7 @@ $as_echo "$gl_cv_func_unsetenv_works" >&6; } esac fi -if test $HAVE_UNSETENV = 0 || test $REPLACE_UNSETENV = 1; then + if test $HAVE_UNSETENV = 0 || test $REPLACE_UNSETENV = 1; then @@ -51083,7 +51005,7 @@ if test $HAVE_UNSETENV = 0 || test $REPLACE_UNSETENV = 1; then -fi + fi @@ -51286,7 +51208,7 @@ $as_echo "$gl_cv_func_utimensat_works" >&6; } fi fi -if test $HAVE_UTIMENSAT = 0 || test $REPLACE_UTIMENSAT = 1; then + if test $HAVE_UTIMENSAT = 0 || test $REPLACE_UTIMENSAT = 1; then @@ -51297,7 +51219,7 @@ if test $HAVE_UTIMENSAT = 0 || test $REPLACE_UTIMENSAT = 1; then gl_LIBOBJS="$gl_LIBOBJS utimensat.$ac_objext" -fi + fi @@ -52247,7 +52169,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" @@ -52267,7 +52188,7 @@ done mingw*) HAVE_WAITPID=0 ;; esac -if test $HAVE_WAITPID = 0; then + if test $HAVE_WAITPID = 0; then @@ -52278,7 +52199,7 @@ if test $HAVE_WAITPID = 0; then gl_LIBOBJS="$gl_LIBOBJS waitpid.$ac_objext" -fi + fi @@ -52306,7 +52227,6 @@ $as_echo "#define GNULIB_TEST_WAITPID 1" >>confdefs.h - if test $gl_cv_have_include_next = yes; then gl_cv_next_wchar_h='<'wchar.h'>' else @@ -52658,7 +52578,7 @@ $as_echo "$gl_cv_func_wcrtomb_retval" >&6; } fi fi -if test $HAVE_WCRTOMB = 0 || test $REPLACE_WCRTOMB = 1; then + if test $HAVE_WCRTOMB = 0 || test $REPLACE_WCRTOMB = 1; then @@ -52672,7 +52592,7 @@ if test $HAVE_WCRTOMB = 0 || test $REPLACE_WCRTOMB = 1; then : -fi + fi @@ -52700,7 +52620,7 @@ $as_echo "#define GNULIB_TEST_WCRTOMB 1" >>confdefs.h fi fi -if test $HAVE_WCSWIDTH = 0 || test $REPLACE_WCSWIDTH = 1; then + if test $HAVE_WCSWIDTH = 0 || test $REPLACE_WCSWIDTH = 1; then @@ -52711,7 +52631,7 @@ if test $HAVE_WCSWIDTH = 0 || test $REPLACE_WCSWIDTH = 1; then gl_LIBOBJS="$gl_LIBOBJS wcswidth.$ac_objext" -fi + fi @@ -52740,8 +52660,6 @@ $as_echo "#define GNULIB_TEST_WCSWIDTH 1" >>confdefs.h - - if test $gt_cv_c_wint_t = yes; then HAVE_WINT_T=1 else @@ -53148,7 +53066,7 @@ $as_echo "$gl_cv_func_wcwidth_works" >&6; } HAVE_WCWIDTH=0 fi -if test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1; then + if test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1; then @@ -53159,7 +53077,7 @@ if test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1; then gl_LIBOBJS="$gl_LIBOBJS wcwidth.$ac_objext" -fi + fi @@ -53302,7 +53220,7 @@ $as_echo "#define WINSIZE_IN_PTEM 1" >>confdefs.h -if test $REPLACE_WRITE = 1; then + if test $REPLACE_WRITE = 1; then @@ -53313,10 +53231,8 @@ if test $REPLACE_WRITE = 1; then gl_LIBOBJS="$gl_LIBOBJS write.$ac_objext" - - - -fi + : + fi @@ -53335,16 +53251,8 @@ $as_echo "#define GNULIB_TEST_WRITE 1" >>confdefs.h - - - - : - - : - - : @@ -53375,7 +53283,6 @@ _ACEOF - for ac_header in stdint.h do : ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default" @@ -53403,9 +53310,7 @@ done : - - - + : XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS --flag=xasprintf:1:c-format" @@ -53440,7 +53345,7 @@ done gl_module_indicator_condition=$gltests_WITNESS -if test "$ac_cv_header_winsock2_h" = yes; then + if test "$ac_cv_header_winsock2_h" = yes; then @@ -53451,7 +53356,7 @@ if test "$ac_cv_header_winsock2_h" = yes; then gltests_LIBOBJS="$gltests_LIBOBJS accept.$ac_objext" -fi + fi @@ -53475,7 +53380,7 @@ $as_echo "#define GNULIB_TEST_ACCEPT 1" >>confdefs.h -if test "$ac_cv_header_winsock2_h" = yes; then + if test "$ac_cv_header_winsock2_h" = yes; then @@ -53486,7 +53391,7 @@ if test "$ac_cv_header_winsock2_h" = yes; then gltests_LIBOBJS="$gltests_LIBOBJS bind.$ac_objext" -fi + fi @@ -53543,7 +53448,7 @@ int main () { if (setlocale (LC_ALL, "") == NULL) return 1; #endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". - On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, @@ -53602,7 +53507,7 @@ _ACEOF ;; *) # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the # configure script would override the LC_ALL setting. Likewise for # LC_CTYPE, which is also set at the beginning of the configure script. # Test for the usual locale name. @@ -53681,7 +53586,7 @@ int main () { if (setlocale (LC_ALL, "") == NULL) return 1; # endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". - On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, @@ -53740,7 +53645,7 @@ _ACEOF ;; *) # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the # configure script would override the LC_ALL setting. Likewise for # LC_CTYPE, which is also set at the beginning of the configure script. # Test for the usual locale name. @@ -53806,7 +53711,7 @@ int main () { if (setlocale (LC_ALL, "") == NULL) return 1; #endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". - On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, @@ -53865,7 +53770,7 @@ _ACEOF ;; *) # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the # configure script would override the LC_ALL setting. Likewise for # LC_CTYPE, which is also set at the beginning of the configure script. # Test for the usual locale name. @@ -53946,7 +53851,7 @@ int main () { if (setlocale (LC_ALL, "") == NULL) return 1; #endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". - On MacOS X 10.3.5 (Darwin 7.5) in the tr_TR locale, nl_langinfo(CODESET) + On Mac OS X 10.3.5 (Darwin 7.5) in the tr_TR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, @@ -54003,7 +53908,7 @@ _ACEOF ;; *) # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the # configure script would override the LC_ALL setting. Likewise for # LC_CTYPE, which is also set at the beginning of the configure script. # Test for the usual locale name. @@ -54038,7 +53943,7 @@ $as_echo "$gt_cv_locale_tr_utf8" >&6; } -if test "$ac_cv_header_winsock2_h" = yes; then + if test "$ac_cv_header_winsock2_h" = yes; then @@ -54049,7 +53954,7 @@ if test "$ac_cv_header_winsock2_h" = yes; then gltests_LIBOBJS="$gltests_LIBOBJS connect.$ac_objext" -fi + fi @@ -54077,8 +53982,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 "$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 : $as_echo_n "(cached) " >&6 @@ -54462,7 +54366,7 @@ _ACEOF fi -if test $HAVE_INET_PTON = 0 || test $REPLACE_INET_NTOP = 1; then + if test $HAVE_INET_PTON = 0 || test $REPLACE_INET_NTOP = 1; then @@ -54476,7 +54380,7 @@ if test $HAVE_INET_PTON = 0 || test $REPLACE_INET_NTOP = 1; then -fi + fi @@ -54493,7 +54397,7 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 + { $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 : $as_echo_n "(cached) " >&6 @@ -54772,7 +54676,7 @@ $as_echo "$gl_cv_func_ioctl_posix_signature" >&6; } fi fi -if test $HAVE_IOCTL = 0 || test $REPLACE_IOCTL = 1; then + if test $HAVE_IOCTL = 0 || test $REPLACE_IOCTL = 1; then @@ -54783,7 +54687,7 @@ if test $HAVE_IOCTL = 0 || test $REPLACE_IOCTL = 1; then gltests_LIBOBJS="$gltests_LIBOBJS ioctl.$ac_objext" -fi + fi @@ -55376,7 +55280,7 @@ _ACEOF -if test "$ac_cv_header_winsock2_h" = yes; then + if test "$ac_cv_header_winsock2_h" = yes; then @@ -55387,7 +55291,7 @@ if test "$ac_cv_header_winsock2_h" = yes; then gltests_LIBOBJS="$gltests_LIBOBJS listen.$ac_objext" -fi + fi @@ -55462,7 +55366,7 @@ int main () { if (setlocale (LC_ALL, "") == NULL) return 1; #endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". - On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, @@ -55521,7 +55425,7 @@ _ACEOF ;; *) # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the # configure script would override the LC_ALL setting. Likewise for # LC_CTYPE, which is also set at the beginning of the configure script. # Test for the usual locale name. @@ -55600,7 +55504,7 @@ int main () { if (setlocale (LC_ALL, "") == NULL) return 1; # endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". - On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, @@ -55659,7 +55563,7 @@ _ACEOF ;; *) # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the # configure script would override the LC_ALL setting. Likewise for # LC_CTYPE, which is also set at the beginning of the configure script. # Test for the usual locale name. @@ -55727,7 +55631,7 @@ int main () if (setlocale (LC_ALL, "") == NULL) return 1; #endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". - On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, @@ -55783,7 +55687,7 @@ _ACEOF ;; *) # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the # configure script would override the LC_ALL setting. Likewise for # LC_CTYPE, which is also set at the beginning of the configure script. # Test for the AIX locale name. @@ -55867,7 +55771,7 @@ int main () if (setlocale (LC_ALL, "") == NULL) return 1; #endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". - On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, @@ -55932,7 +55836,7 @@ _ACEOF ;; *) # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the # configure script would override the LC_ALL setting. Likewise for # LC_CTYPE, which is also set at the beginning of the configure script. # Test for the locale name without encoding suffix. @@ -56002,7 +55906,7 @@ int main () { if (setlocale (LC_ALL, "") == NULL) return 1; #endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". - On MacOS X 10.3.5 (Darwin 7.5) in the tr_TR locale, nl_langinfo(CODESET) + On Mac OS X 10.3.5 (Darwin 7.5) in the tr_TR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, @@ -56059,7 +55963,7 @@ _ACEOF ;; *) # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the # configure script would override the LC_ALL setting. Likewise for # LC_CTYPE, which is also set at the beginning of the configure script. # Test for the usual locale name. @@ -56130,7 +56034,7 @@ int main () { if (setlocale (LC_ALL, "") == NULL) return 1; # endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". - On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, @@ -56189,7 +56093,7 @@ _ACEOF ;; *) # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the # configure script would override the LC_ALL setting. Likewise for # LC_CTYPE, which is also set at the beginning of the configure script. # Test for the usual locale name. @@ -56255,7 +56159,7 @@ int main () { if (setlocale (LC_ALL, "") == NULL) return 1; #endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". - On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, @@ -56314,7 +56218,7 @@ _ACEOF ;; *) # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the # configure script would override the LC_ALL setting. Likewise for # LC_CTYPE, which is also set at the beginning of the configure script. # Test for the usual locale name. @@ -56393,7 +56297,7 @@ int main () { if (setlocale (LC_ALL, "") == NULL) return 1; # endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". - On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, @@ -56452,7 +56356,7 @@ _ACEOF ;; *) # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the # configure script would override the LC_ALL setting. Likewise for # LC_CTYPE, which is also set at the beginning of the configure script. # Test for the usual locale name. @@ -56520,7 +56424,7 @@ int main () if (setlocale (LC_ALL, "") == NULL) return 1; #endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". - On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, @@ -56576,7 +56480,7 @@ _ACEOF ;; *) # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the # configure script would override the LC_ALL setting. Likewise for # LC_CTYPE, which is also set at the beginning of the configure script. # Test for the AIX locale name. @@ -56660,7 +56564,7 @@ int main () if (setlocale (LC_ALL, "") == NULL) return 1; #endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". - On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, @@ -56725,7 +56629,7 @@ _ACEOF ;; *) # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the # configure script would override the LC_ALL setting. Likewise for # LC_CTYPE, which is also set at the beginning of the configure script. # Test for the locale name without encoding suffix. @@ -56793,7 +56697,7 @@ int main () { if (setlocale (LC_ALL, "") == NULL) return 1; # endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". - On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, @@ -56852,7 +56756,7 @@ _ACEOF ;; *) # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the # configure script would override the LC_ALL setting. Likewise for # LC_CTYPE, which is also set at the beginning of the configure script. # Test for the usual locale name. @@ -56921,7 +56825,7 @@ int main () if (setlocale (LC_ALL, "") == NULL) return 1; #endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". - On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, @@ -56986,7 +56890,7 @@ _ACEOF ;; *) # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the # configure script would override the LC_ALL setting. Likewise for # LC_CTYPE, which is also set at the beginning of the configure script. # Test for the locale name without encoding suffix. @@ -57040,12 +56944,12 @@ $as_echo_n "checking for MAP_ANONYMOUS... " >&6; } #include <sys/mman.h> #ifdef MAP_ANONYMOUS - I cant identify this map + I cannot identify this map #endif _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "I cant identify this map" >/dev/null 2>&1; then : + $EGREP "I cannot identify this map" >/dev/null 2>&1; then : gl_have_mmap_anonymous=yes fi rm -f conftest* @@ -57056,12 +56960,12 @@ rm -f conftest* #include <sys/mman.h> #ifdef MAP_ANON - I cant identify this map + I cannot identify this map #endif _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "I cant identify this map" >/dev/null 2>&1; then : + $EGREP "I cannot identify this map" >/dev/null 2>&1; then : $as_echo "#define MAP_ANONYMOUS MAP_ANON" >>confdefs.h @@ -57105,12 +57009,12 @@ $as_echo_n "checking for MAP_ANONYMOUS... " >&6; } #include <sys/mman.h> #ifdef MAP_ANONYMOUS - I cant identify this map + I cannot identify this map #endif _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "I cant identify this map" >/dev/null 2>&1; then : + $EGREP "I cannot identify this map" >/dev/null 2>&1; then : gl_have_mmap_anonymous=yes fi rm -f conftest* @@ -57121,12 +57025,12 @@ rm -f conftest* #include <sys/mman.h> #ifdef MAP_ANON - I cant identify this map + I cannot identify this map #endif _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "I cant identify this map" >/dev/null 2>&1; then : + $EGREP "I cannot identify this map" >/dev/null 2>&1; then : $as_echo "#define MAP_ANONYMOUS MAP_ANON" >>confdefs.h @@ -57170,12 +57074,12 @@ $as_echo_n "checking for MAP_ANONYMOUS... " >&6; } #include <sys/mman.h> #ifdef MAP_ANONYMOUS - I cant identify this map + I cannot identify this map #endif _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "I cant identify this map" >/dev/null 2>&1; then : + $EGREP "I cannot identify this map" >/dev/null 2>&1; then : gl_have_mmap_anonymous=yes fi rm -f conftest* @@ -57186,12 +57090,12 @@ rm -f conftest* #include <sys/mman.h> #ifdef MAP_ANON - I cant identify this map + I cannot identify this map #endif _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "I cant identify this map" >/dev/null 2>&1; then : + $EGREP "I cannot identify this map" >/dev/null 2>&1; then : $as_echo "#define MAP_ANONYMOUS MAP_ANON" >>confdefs.h @@ -57235,12 +57139,12 @@ $as_echo_n "checking for MAP_ANONYMOUS... " >&6; } #include <sys/mman.h> #ifdef MAP_ANONYMOUS - I cant identify this map + I cannot identify this map #endif _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "I cant identify this map" >/dev/null 2>&1; then : + $EGREP "I cannot identify this map" >/dev/null 2>&1; then : gl_have_mmap_anonymous=yes fi rm -f conftest* @@ -57251,12 +57155,12 @@ rm -f conftest* #include <sys/mman.h> #ifdef MAP_ANON - I cant identify this map + I cannot identify this map #endif _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "I cant identify this map" >/dev/null 2>&1; then : + $EGREP "I cannot identify this map" >/dev/null 2>&1; then : $as_echo "#define MAP_ANONYMOUS MAP_ANON" >>confdefs.h @@ -57312,7 +57216,7 @@ int main () { if (setlocale (LC_ALL, "") == NULL) return 1; #endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". - On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, @@ -57371,7 +57275,7 @@ _ACEOF ;; *) # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the # configure script would override the LC_ALL setting. Likewise for # LC_CTYPE, which is also set at the beginning of the configure script. # Test for the usual locale name. @@ -57450,7 +57354,7 @@ int main () { if (setlocale (LC_ALL, "") == NULL) return 1; # endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". - On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, @@ -57509,7 +57413,7 @@ _ACEOF ;; *) # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the # configure script would override the LC_ALL setting. Likewise for # LC_CTYPE, which is also set at the beginning of the configure script. # Test for the usual locale name. @@ -57609,7 +57513,7 @@ $as_echo "$gl_cv_func_perror_works" >&6; } ;; esac -if test $REPLACE_PERROR = 1; then + if test $REPLACE_PERROR = 1; then @@ -57620,7 +57524,7 @@ if test $REPLACE_PERROR = 1; then gltests_LIBOBJS="$gltests_LIBOBJS perror.$ac_objext" -fi + fi @@ -57650,7 +57554,7 @@ $as_echo "#define GNULIB_TEST_PERROR 1" >>confdefs.h HAVE_PIPE=0 fi -if test $HAVE_PIPE = 0; then + if test $HAVE_PIPE = 0; then @@ -57661,7 +57565,7 @@ if test $HAVE_PIPE = 0; then gltests_LIBOBJS="$gltests_LIBOBJS pipe.$ac_objext" -fi + fi @@ -57683,13 +57587,13 @@ $as_echo "#define GNULIB_TEST_PIPE 1" >>confdefs.h -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ [ -#if defined _MSC_VER || defined __MINGW32__ - notposix -#endif - ] + #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 : @@ -57699,7 +57603,7 @@ else fi rm -f conftest* - if test $posix_spawn_ported = yes; then + if test $posix_spawn_ported = yes; then POSIX_SPAWN_PORTED_TRUE= POSIX_SPAWN_PORTED_FALSE='#' else @@ -57731,12 +57635,12 @@ $as_echo_n "checking for MAP_ANONYMOUS... " >&6; } #include <sys/mman.h> #ifdef MAP_ANONYMOUS - I cant identify this map + I cannot identify this map #endif _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "I cant identify this map" >/dev/null 2>&1; then : + $EGREP "I cannot identify this map" >/dev/null 2>&1; then : gl_have_mmap_anonymous=yes fi rm -f conftest* @@ -57747,12 +57651,12 @@ rm -f conftest* #include <sys/mman.h> #ifdef MAP_ANON - I cant identify this map + I cannot identify this map #endif _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "I cant identify this map" >/dev/null 2>&1; then : + $EGREP "I cannot identify this map" >/dev/null 2>&1; then : $as_echo "#define MAP_ANONYMOUS MAP_ANON" >>confdefs.h @@ -57785,7 +57689,7 @@ $as_echo "#define HAVE_MAP_ANONYMOUS 1" >>confdefs.h ;; esac -if test $REPLACE_SETLOCALE = 1; then + if test $REPLACE_SETLOCALE = 1; then @@ -57799,7 +57703,7 @@ if test $REPLACE_SETLOCALE = 1; then : -fi + fi @@ -57856,7 +57760,7 @@ int main () { if (setlocale (LC_ALL, "") == NULL) return 1; #endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". - On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, @@ -57915,7 +57819,7 @@ _ACEOF ;; *) # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the # configure script would override the LC_ALL setting. Likewise for # LC_CTYPE, which is also set at the beginning of the configure script. # Test for the usual locale name. @@ -57994,7 +57898,7 @@ int main () { if (setlocale (LC_ALL, "") == NULL) return 1; # endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". - On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, @@ -58053,7 +57957,7 @@ _ACEOF ;; *) # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the # configure script would override the LC_ALL setting. Likewise for # LC_CTYPE, which is also set at the beginning of the configure script. # Test for the usual locale name. @@ -58121,7 +58025,7 @@ int main () if (setlocale (LC_ALL, "") == NULL) return 1; #endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". - On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, @@ -58177,7 +58081,7 @@ _ACEOF ;; *) # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the # configure script would override the LC_ALL setting. Likewise for # LC_CTYPE, which is also set at the beginning of the configure script. # Test for the AIX locale name. @@ -58261,7 +58165,7 @@ int main () if (setlocale (LC_ALL, "") == NULL) return 1; #endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". - On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, @@ -58326,7 +58230,7 @@ _ACEOF ;; *) # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the # configure script would override the LC_ALL setting. Likewise for # LC_CTYPE, which is also set at the beginning of the configure script. # Test for the locale name without encoding suffix. @@ -58357,7 +58261,7 @@ $as_echo "$gt_cv_locale_zh_CN" >&6; } -if test "$ac_cv_header_winsock2_h" = yes; then + if test "$ac_cv_header_winsock2_h" = yes; then @@ -58368,7 +58272,7 @@ if test "$ac_cv_header_winsock2_h" = yes; then gltests_LIBOBJS="$gltests_LIBOBJS setsockopt.$ac_objext" -fi + fi @@ -58479,7 +58383,7 @@ $as_echo "$gl_cv_func_sleep_works" >&6; } esac fi -if test $HAVE_SLEEP = 0 || test $REPLACE_SLEEP = 1; then + if test $HAVE_SLEEP = 0 || test $REPLACE_SLEEP = 1; then @@ -58490,7 +58394,7 @@ if test $HAVE_SLEEP = 0 || test $REPLACE_SLEEP = 1; then gltests_LIBOBJS="$gltests_LIBOBJS sleep.$ac_objext" -fi + fi @@ -58514,7 +58418,7 @@ $as_echo "#define GNULIB_TEST_SLEEP 1" >>confdefs.h -if test "$ac_cv_header_winsock2_h" = yes; then + if test "$ac_cv_header_winsock2_h" = yes; then @@ -58525,16 +58429,16 @@ if test "$ac_cv_header_winsock2_h" = yes; then gltests_LIBOBJS="$gltests_LIBOBJS socket.$ac_objext" -fi -# When this module is used, sockets may actually occur as file descriptors, -# hence it is worth warning if the modules 'close' and 'ioctl' are not used. + fi + # When this module is used, sockets may actually occur as file descriptors, + # hence it is worth warning if the modules 'close' and 'ioctl' are not used. -if test "$ac_cv_header_winsock2_h" = yes; then - UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS=1 - SYS_IOCTL_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS=1 -fi + if test "$ac_cv_header_winsock2_h" = yes; then + UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS=1 + SYS_IOCTL_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS=1 + fi @@ -58557,78 +58461,6 @@ $as_echo "#define GNULIB_TEST_SOCKET 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wchar_t" >&5 -$as_echo_n "checking for wchar_t... " >&6; } -if ${gt_cv_c_wchar_t+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <stddef.h> - wchar_t foo = (wchar_t)'\0'; -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - gt_cv_c_wchar_t=yes -else - gt_cv_c_wchar_t=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wchar_t" >&5 -$as_echo "$gt_cv_c_wchar_t" >&6; } - if test $gt_cv_c_wchar_t = yes; then - -$as_echo "#define HAVE_WCHAR_T 1" >>confdefs.h - - fi - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wint_t" >&5 -$as_echo_n "checking for wint_t... " >&6; } -if ${gt_cv_c_wint_t+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before - <wchar.h>. - BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be included - before <wchar.h>. */ -#include <stddef.h> -#include <stdio.h> -#include <time.h> -#include <wchar.h> - wint_t foo = (wchar_t)'\0'; -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - gt_cv_c_wint_t=yes -else - gt_cv_c_wint_t=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wint_t" >&5 -$as_echo "$gt_cv_c_wint_t" >&6; } - if test $gt_cv_c_wint_t = yes; then - -$as_echo "#define HAVE_WINT_T 1" >>confdefs.h - - fi @@ -58655,7 +58487,7 @@ $as_echo "#define HAVE_WINT_T 1" >>confdefs.h fi fi -if test $HAVE_DECL_STRERROR_R = 0 || test $REPLACE_STRERROR_R = 1; then + if test $HAVE_DECL_STRERROR_R = 0 || test $REPLACE_STRERROR_R = 1; then @@ -58671,7 +58503,7 @@ if test $HAVE_DECL_STRERROR_R = 0 || test $REPLACE_STRERROR_R = 1; then -fi + fi @@ -58717,12 +58549,12 @@ $as_echo_n "checking for MAP_ANONYMOUS... " >&6; } #include <sys/mman.h> #ifdef MAP_ANONYMOUS - I cant identify this map + I cannot identify this map #endif _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "I cant identify this map" >/dev/null 2>&1; then : + $EGREP "I cannot identify this map" >/dev/null 2>&1; then : gl_have_mmap_anonymous=yes fi rm -f conftest* @@ -58733,12 +58565,12 @@ rm -f conftest* #include <sys/mman.h> #ifdef MAP_ANON - I cant identify this map + I cannot identify this map #endif _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "I cant identify this map" >/dev/null 2>&1; then : + $EGREP "I cannot identify this map" >/dev/null 2>&1; then : $as_echo "#define MAP_ANONYMOUS MAP_ANON" >>confdefs.h @@ -58782,12 +58614,12 @@ $as_echo_n "checking for MAP_ANONYMOUS... " >&6; } #include <sys/mman.h> #ifdef MAP_ANONYMOUS - I cant identify this map + I cannot identify this map #endif _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "I cant identify this map" >/dev/null 2>&1; then : + $EGREP "I cannot identify this map" >/dev/null 2>&1; then : gl_have_mmap_anonymous=yes fi rm -f conftest* @@ -58798,12 +58630,12 @@ rm -f conftest* #include <sys/mman.h> #ifdef MAP_ANON - I cant identify this map + I cannot identify this map #endif _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "I cant identify this map" >/dev/null 2>&1; then : + $EGREP "I cannot identify this map" >/dev/null 2>&1; then : $as_echo "#define MAP_ANONYMOUS MAP_ANON" >>confdefs.h @@ -58832,7 +58664,7 @@ $as_echo "#define HAVE_MAP_ANONYMOUS 1" >>confdefs.h HAVE_SYMLINKAT=0 fi -if test $HAVE_SYMLINKAT = 0; then + if test $HAVE_SYMLINKAT = 0; then @@ -58843,7 +58675,7 @@ if test $HAVE_SYMLINKAT = 0; then gltests_LIBOBJS="$gltests_LIBOBJS symlinkat.$ac_objext" -fi + fi @@ -58869,7 +58701,6 @@ $as_echo "#define GNULIB_TEST_SYMLINKAT 1" >>confdefs.h - if test $gl_threads_api = posix; then gl_save_LIBS="$LIBS" LIBS="$LIBS $LIBMULTITHREAD" @@ -58909,7 +58740,7 @@ $as_echo "#define UNLINK_CANNOT_UNLINK_DIR 1" >>confdefs.h ;; esac -abs_aux_dir=`cd "$ac_aux_dir"; pwd` + abs_aux_dir=`cd "$ac_aux_dir"; pwd` @@ -58974,7 +58805,7 @@ $as_echo "$gl_cv_func_usleep_works" >&6; } esac fi -if test $HAVE_USLEEP = 0 || test $REPLACE_USLEEP = 1; then + if test $HAVE_USLEEP = 0 || test $REPLACE_USLEEP = 1; then @@ -58985,7 +58816,7 @@ if test $HAVE_USLEEP = 0 || test $REPLACE_USLEEP = 1; then gltests_LIBOBJS="$gltests_LIBOBJS usleep.$ac_objext" -fi + fi @@ -59008,9 +58839,7 @@ $as_echo "#define GNULIB_TEST_USLEEP 1" >>confdefs.h - - -abs_aux_dir=`cd "$ac_aux_dir"; pwd` + abs_aux_dir=`cd "$ac_aux_dir"; pwd` @@ -59047,7 +58876,7 @@ int main () { if (setlocale (LC_ALL, "") == NULL) return 1; #endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". - On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, @@ -59106,7 +58935,7 @@ _ACEOF ;; *) # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the # configure script would override the LC_ALL setting. Likewise for # LC_CTYPE, which is also set at the beginning of the configure script. # Test for the usual locale name. @@ -59185,7 +59014,7 @@ int main () { if (setlocale (LC_ALL, "") == NULL) return 1; # endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". - On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, @@ -59244,7 +59073,7 @@ _ACEOF ;; *) # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the # configure script would override the LC_ALL setting. Likewise for # LC_CTYPE, which is also set at the beginning of the configure script. # Test for the usual locale name. @@ -59312,7 +59141,7 @@ int main () if (setlocale (LC_ALL, "") == NULL) return 1; #endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". - On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, @@ -59368,7 +59197,7 @@ _ACEOF ;; *) # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the # configure script would override the LC_ALL setting. Likewise for # LC_CTYPE, which is also set at the beginning of the configure script. # Test for the AIX locale name. @@ -59452,7 +59281,7 @@ int main () if (setlocale (LC_ALL, "") == NULL) return 1; #endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". - On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, @@ -59517,7 +59346,7 @@ _ACEOF ;; *) # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the # configure script would override the LC_ALL setting. Likewise for # LC_CTYPE, which is also set at the beginning of the configure script. # Test for the locale name without encoding suffix. @@ -59692,7 +59521,7 @@ _ACEOF fi fi -if test $HAVE_WCTOB = 0 || test $REPLACE_WCTOB = 1; then + if test $HAVE_WCTOB = 0 || test $REPLACE_WCTOB = 1; then @@ -59706,7 +59535,7 @@ if test $HAVE_WCTOB = 0 || test $REPLACE_WCTOB = 1; then : -fi + fi @@ -59735,7 +59564,7 @@ $as_echo "#define GNULIB_TEST_WCTOB 1" >>confdefs.h REPLACE_WCTOMB=1 fi -if test $REPLACE_WCTOMB = 1; then + if test $REPLACE_WCTOMB = 1; then @@ -59749,7 +59578,7 @@ if test $REPLACE_WCTOMB = 1; then : -fi + fi @@ -60173,17 +60002,19 @@ _ACEOF + ac_fn_c_check_decl "$LINENO" "setregid" "ac_cv_have_decl_setregid" "$ac_includes_default" +if test "x$ac_cv_have_decl_setregid" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi -$as_echo "#define PREFER_NONREENTRANT_EUIDACCESS 1" >>confdefs.h - - +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_SETREGID $ac_have_decl +_ACEOF - case " $LIBOBJS " in - *" fd-reopen.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS fd-reopen.$ac_objext" - ;; -esac +$as_echo "#define PREFER_NONREENTRANT_EUIDACCESS 1" >>confdefs.h @@ -60303,81 +60134,6 @@ _ACEOF - - case " $LIBOBJS " in - *" xfts.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS xfts.$ac_objext" - ;; -esac - - - : - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 -$as_echo_n "checking for inline... " >&6; } -if ${ac_cv_c_inline+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_c_inline=no -for ac_kw in inline __inline__ __inline; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifndef __cplusplus -typedef int foo_t; -static $ac_kw foo_t static_foo () {return 0; } -$ac_kw foo_t foo () {return 0; } -#endif - -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_c_inline=$ac_kw -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - test "$ac_cv_c_inline" != no && break -done - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 -$as_echo "$ac_cv_c_inline" >&6; } - -case $ac_cv_c_inline in - inline | yes) ;; - *) - case $ac_cv_c_inline in - no) ac_val=;; - *) ac_val=$ac_cv_c_inline;; - esac - cat >>confdefs.h <<_ACEOF -#ifndef __cplusplus -#define inline $ac_val -#endif -_ACEOF - ;; -esac - - - - case " $LIBOBJS " in - *" strintcmp.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS strintcmp.$ac_objext" - ;; -esac - - - - - - - case " $LIBOBJS " in - *" strnumcmp.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS strnumcmp.$ac_objext" - ;; -esac - - - - - # gnulib settings. @@ -60420,8 +60176,6 @@ esac - - @@ -60712,6 +60466,16 @@ cat >>confdefs.h <<_ACEOF _ACEOF +fi +ac_fn_c_check_member "$LINENO" "struct statfs" "f_frsize" "ac_cv_member_struct_statfs_f_frsize" "$statfs_includes +" +if test "x$ac_cv_member_struct_statfs_f_frsize" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_STATFS_F_FRSIZE 1 +_ACEOF + + fi if test $ac_cv_header_OS_h != yes; then @@ -60967,6 +60731,26 @@ _ACEOF fi +# The test suite needs to know if we have a working perl. +# FIXME: this is suboptimal. Ideally, we would be able to call gl_PERL +# with an ACTION-IF-NOT-FOUND argument ... +cu_have_perl=yes +case $PERL in *"/missing "*) cu_have_perl=no;; esac + if test $cu_have_perl = yes; then + HAVE_PERL_TRUE= + HAVE_PERL_FALSE='#' +else + HAVE_PERL_TRUE='#' + HAVE_PERL_FALSE= +fi + + +# gl_GCC_VERSION_IFELSE([major], [minor], [run-if-found], [run-if-not-found]) +# ------------------------------------------------ +# If $CPP is gcc-MAJOR.MINOR or newer, then run RUN-IF-FOUND. +# Otherwise, run RUN-IF-NOT-FOUND. + + # Check whether --enable-gcc-warnings was given. if test "${enable_gcc_warnings+set}" = set; then : enableval=$enable_gcc_warnings; case $enableval in @@ -60975,15 +60759,38 @@ if test "${enable_gcc_warnings+set}" = set; then : esac gl_gcc_warnings=$enableval else - gl_gcc_warnings=no + # GCC provides fine-grained control over diagnostics which + # is used in gnulib for example to suppress warnings from + # certain sections of code. So if this is available and + # we're running from a git repo, then auto enable the warnings. + gl_gcc_warnings=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#if (4) < __GNUC__ || ((4) == __GNUC__ && (6) <= __GNUC_MINOR__) +/* ok */ +#else +# error "your version of gcc is older than 4.6" +#endif + +int +main () +{ + + ; + return 0; +}, + +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + test -d "$srcdir"/.git && gl_gcc_warnings=yes fi +rm -f conftest.err conftest.i conftest.$ac_ext -# gl_GCC_VERSION_IFELSE([major], [minor], [run-if-found], [run-if-not-found]) -# ------------------------------------------------ -# If $CPP is gcc-MAJOR.MINOR or newer, then run RUN-IF-FOUND. -# Otherwise, run RUN-IF-NOT-FOUND. + +fi if test "$gl_gcc_warnings" = yes; then @@ -60994,7 +60801,7 @@ if ${gl_cv_warn_c__Werror+:} false; then : else gl_save_compiler_FLAGS="$CFLAGS" - CFLAGS="$CFLAGS -Werror" + as_fn_append CFLAGS " -Werror" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -61023,6 +60830,7 @@ fi + nw= # This, $nw, is the list of warnings we disable. nw="$nw -Wdeclaration-after-statement" # too useful to forbid @@ -61051,6 +60859,7 @@ fi nw="$nw -Wmissing-format-attribute" # copy.c nw="$nw -Wunsafe-loop-optimizations" # a few src/*.c nw="$nw -Winline" # system.h's readdir_ignoring_dot_and_dotdot + nw="$nw -Wsuggest-attribute=format" # warns about copy.c and factor.c # Using -Wstrict-overflow is a pain, but the alternative is worse. # For an example, see the code that provoked this report: @@ -61130,109 +60939,168 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_nomfi_needed" >&5 $as_echo "$gl_cv_cc_nomfi_needed" >&6; } fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wuninitialized is supported" >&5 +$as_echo_n "checking whether -Wuninitialized is supported... " >&6; } + if ${gl_cv_cc_uninitialized_supported+:} false; then : + $as_echo_n "(cached) " >&6 +else + + gl_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Werror -Wuninitialized" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_cc_uninitialized_supported=yes +else + gl_cv_cc_uninitialized_supported=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS="$gl_save_CFLAGS" +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_uninitialized_supported" >&5 +$as_echo "$gl_cv_cc_uninitialized_supported" >&6; } + fi + # List all gcc warning categories. gl_manywarn_set= for gl_manywarn_item in \ - -Wall \ -W \ - -Wformat-y2k \ - -Wformat-nonliteral \ - -Wformat-security \ - -Winit-self \ - -Wmissing-include-dirs \ - -Wswitch-default \ - -Wswitch-enum \ - -Wunused \ - -Wunknown-pragmas \ - -Wstrict-aliasing \ - -Wstrict-overflow \ - -Wsystem-headers \ - -Wfloat-equal \ - -Wtraditional \ - -Wtraditional-conversion \ - -Wdeclaration-after-statement \ - -Wundef \ - -Wshadow \ - -Wunsafe-loop-optimizations \ - -Wpointer-arith \ + -Wabi \ + -Waddress \ + -Wall \ + -Warray-bounds \ + -Wattributes \ -Wbad-function-cast \ - -Wc++-compat \ - -Wcast-qual \ - -Wcast-align \ - -Wwrite-strings \ - -Wconversion \ - -Wsign-conversion \ - -Wlogical-op \ - -Waggregate-return \ - -Wstrict-prototypes \ - -Wold-style-definition \ - -Wmissing-prototypes \ - -Wmissing-declarations \ - -Wmissing-noreturn \ - -Wmissing-format-attribute \ - -Wpacked \ - -Wpadded \ - -Wredundant-decls \ - -Wnested-externs \ - -Wunreachable-code \ - -Winline \ - -Winvalid-pch \ - -Wlong-long \ - -Wvla \ - -Wvolatile-register-var \ - -Wdisabled-optimization \ - -Wstack-protector \ - -Woverlength-strings \ -Wbuiltin-macro-redefined \ - -Wmudflap \ - -Wpacked-bitfield-compat \ - -Wsync-nand \ - ; do - gl_manywarn_set="$gl_manywarn_set $gl_manywarn_item" - done - # The following are not documented in the manual but are included in - # output from gcc --help=warnings. - for gl_manywarn_item in \ - -Wattributes \ + -Wcast-align \ + -Wchar-subscripts \ + -Wclobbered \ + -Wcomment \ + -Wcomments \ -Wcoverage-mismatch \ - -Wmultichar \ - -Wunused-macros \ - ; do - gl_manywarn_set="$gl_manywarn_set $gl_manywarn_item" - done - # More warnings from gcc 4.6.2 --help=warnings. - for gl_manywarn_item in \ - -Wabi \ -Wcpp \ -Wdeprecated \ -Wdeprecated-declarations \ + -Wdisabled-optimization \ -Wdiv-by-zero \ -Wdouble-promotion \ + -Wempty-body \ -Wendif-labels \ + -Wenum-compare \ -Wextra \ -Wformat-contains-nul \ -Wformat-extra-args \ + -Wformat-nonliteral \ + -Wformat-security \ + -Wformat-y2k \ -Wformat-zero-length \ -Wformat=2 \ + -Wfree-nonheap-object \ + -Wignored-qualifiers \ + -Wimplicit \ + -Wimplicit-function-declaration \ + -Wimplicit-int \ + -Winit-self \ + -Winline \ + -Wint-to-pointer-cast \ + -Winvalid-memory-model \ + -Winvalid-pch \ + -Wjump-misses-init \ + -Wlogical-op \ + -Wmain \ + -Wmaybe-uninitialized \ + -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 \ + -Wnonnull \ -Wnormalized=nfc \ + -Wold-style-declaration \ + -Wold-style-definition \ -Woverflow \ + -Woverlength-strings \ + -Woverride-init \ + -Wpacked \ + -Wpacked-bitfield-compat \ + -Wparentheses \ + -Wpointer-arith \ + -Wpointer-sign \ -Wpointer-to-int-cast \ -Wpragmas \ + -Wreturn-type \ + -Wsequence-point \ + -Wshadow \ + -Wsizeof-pointer-memaccess \ + -Wstack-protector \ + -Wstrict-aliasing \ + -Wstrict-overflow \ + -Wstrict-prototypes \ -Wsuggest-attribute=const \ + -Wsuggest-attribute=format \ -Wsuggest-attribute=noreturn \ -Wsuggest-attribute=pure \ + -Wswitch \ + -Wswitch-default \ + -Wsync-nand \ + -Wsystem-headers \ -Wtrampolines \ + -Wtrigraphs \ + -Wtype-limits \ + -Wuninitialized \ + -Wunknown-pragmas \ + -Wunreachable-code \ + -Wunsafe-loop-optimizations \ + -Wunused \ + -Wunused-but-set-parameter \ + -Wunused-but-set-variable \ + -Wunused-function \ + -Wunused-label \ + -Wunused-local-typedefs \ + -Wunused-macros \ + -Wunused-parameter \ + -Wunused-result \ + -Wunused-value \ + -Wunused-variable \ + -Wvarargs \ + -Wvariadic-macros \ + -Wvector-operation-performance \ + -Wvla \ + -Wvolatile-register-var \ + -Wwrite-strings \ + \ ; do gl_manywarn_set="$gl_manywarn_set $gl_manywarn_item" done - # Disable the missing-field-initializers warning if needed + # Disable specific options as needed. if test "$gl_cv_cc_nomfi_needed" = yes; then gl_manywarn_set="$gl_manywarn_set -Wno-missing-field-initializers" fi + if test "$gl_cv_cc_uninitialized_supported" = no; then + gl_manywarn_set="$gl_manywarn_set -Wno-uninitialized" + fi + ws=$gl_manywarn_set @@ -61259,7 +61127,7 @@ if eval \${$as_gl_Warn+:} false; then : else gl_save_compiler_FLAGS="$CFLAGS" - CFLAGS="$CFLAGS $w" + as_fn_append CFLAGS " $w" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -61287,6 +61155,7 @@ if eval test \"x\$"$as_gl_Warn"\" = x"yes"; then : as_fn_append WARN_CFLAGS " $w" fi + done { $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; } @@ -61295,7 +61164,7 @@ if ${gl_cv_warn_c__Wno_sign_compare+:} false; then : else gl_save_compiler_FLAGS="$CFLAGS" - CFLAGS="$CFLAGS -Wno-sign-compare" + as_fn_append CFLAGS " -Wno-sign-compare" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -61321,6 +61190,7 @@ $as_echo "$gl_cv_warn_c__Wno_sign_compare" >&6; } if test "x$gl_cv_warn_c__Wno_sign_compare" = xyes; then : as_fn_append WARN_CFLAGS " -Wno-sign-compare" fi + # Too many warnings for now { $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; } @@ -61329,7 +61199,7 @@ if ${gl_cv_warn_c__Wno_unused_parameter+:} false; then : else gl_save_compiler_FLAGS="$CFLAGS" - CFLAGS="$CFLAGS -Wno-unused-parameter" + as_fn_append CFLAGS " -Wno-unused-parameter" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -61355,15 +61225,17 @@ $as_echo "$gl_cv_warn_c__Wno_unused_parameter" >&6; } if test "x$gl_cv_warn_c__Wno_unused_parameter" = xyes; then : as_fn_append WARN_CFLAGS " -Wno-unused-parameter" fi + # Too many warnings for now - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wsuggest-attribute=const" >&5 + 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 ${gl_cv_warn_c__Wsuggest_attribute_const+:} false; then : +if eval \${$as_gl_Warn+:} false; then : $as_echo_n "(cached) " >&6 else gl_save_compiler_FLAGS="$CFLAGS" - CFLAGS="$CFLAGS -Wsuggest-attribute=const" + as_fn_append CFLAGS " -Wsuggest-attribute=const" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -61376,28 +61248,31 @@ main () } _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - gl_cv_warn_c__Wsuggest_attribute_const=yes + eval "$as_gl_Warn=yes" else - gl_cv_warn_c__Wsuggest_attribute_const=no + eval "$as_gl_Warn=no" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS="$gl_save_compiler_FLAGS" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__Wsuggest_attribute_const" >&5 -$as_echo "$gl_cv_warn_c__Wsuggest_attribute_const" >&6; } -if test "x$gl_cv_warn_c__Wsuggest_attribute_const" = xyes; then : +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" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wsuggest-attribute=noreturn" >&5 + + 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 ${gl_cv_warn_c__Wsuggest_attribute_noreturn+:} false; then : +if eval \${$as_gl_Warn+:} false; then : $as_echo_n "(cached) " >&6 else gl_save_compiler_FLAGS="$CFLAGS" - CFLAGS="$CFLAGS -Wsuggest-attribute=noreturn" + as_fn_append CFLAGS " -Wsuggest-attribute=noreturn" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -61410,20 +61285,22 @@ main () } _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - gl_cv_warn_c__Wsuggest_attribute_noreturn=yes + eval "$as_gl_Warn=yes" else - gl_cv_warn_c__Wsuggest_attribute_noreturn=no + eval "$as_gl_Warn=no" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS="$gl_save_compiler_FLAGS" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__Wsuggest_attribute_noreturn" >&5 -$as_echo "$gl_cv_warn_c__Wsuggest_attribute_noreturn" >&6; } -if test "x$gl_cv_warn_c__Wsuggest_attribute_noreturn" = xyes; then : +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 + { $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 : @@ -61431,7 +61308,7 @@ if ${gl_cv_warn_c__Wno_format_nonliteral+:} false; then : else gl_save_compiler_FLAGS="$CFLAGS" - CFLAGS="$CFLAGS -Wno-format-nonliteral" + as_fn_append CFLAGS " -Wno-format-nonliteral" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -61459,6 +61336,7 @@ if test "x$gl_cv_warn_c__Wno_format_nonliteral" = xyes; then : fi + # 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. @@ -61483,14 +61361,15 @@ main () _ACEOF if ac_fn_c_try_cpp "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wsuggest-attribute=pure" >&5 + 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 ${gl_cv_warn_c__Wsuggest_attribute_pure+:} false; then : +if eval \${$as_gl_Warn+:} false; then : $as_echo_n "(cached) " >&6 else gl_save_compiler_FLAGS="$CFLAGS" - CFLAGS="$CFLAGS -Wsuggest-attribute=pure" + as_fn_append CFLAGS " -Wsuggest-attribute=pure" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -61503,20 +61382,22 @@ main () } _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - gl_cv_warn_c__Wsuggest_attribute_pure=yes + eval "$as_gl_Warn=yes" else - gl_cv_warn_c__Wsuggest_attribute_pure=no + eval "$as_gl_Warn=no" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS="$gl_save_compiler_FLAGS" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__Wsuggest_attribute_pure" >&5 -$as_echo "$gl_cv_warn_c__Wsuggest_attribute_pure" >&6; } -if test "x$gl_cv_warn_c__Wsuggest_attribute_pure" = xyes; then : +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 + fi rm -f conftest.err conftest.i conftest.$ac_ext @@ -61531,7 +61412,7 @@ if ${gl_cv_warn_c__Wno_logical_op+:} false; then : else gl_save_compiler_FLAGS="$CFLAGS" - CFLAGS="$CFLAGS -Wno-logical-op" + as_fn_append CFLAGS " -Wno-logical-op" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -61559,6 +61440,7 @@ if test "x$gl_cv_warn_c__Wno_logical_op" = xyes; then : fi + { $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 : @@ -61566,7 +61448,7 @@ if ${gl_cv_warn_c__fdiagnostics_show_option+:} false; then : else gl_save_compiler_FLAGS="$CFLAGS" - CFLAGS="$CFLAGS -fdiagnostics-show-option" + as_fn_append CFLAGS " -fdiagnostics-show-option" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -61593,6 +61475,7 @@ if test "x$gl_cv_warn_c__fdiagnostics_show_option" = xyes; then : as_fn_append WARN_CFLAGS " -fdiagnostics-show-option" fi + { $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 : @@ -61600,7 +61483,7 @@ if ${gl_cv_warn_c__funit_at_a_time+:} false; then : else gl_save_compiler_FLAGS="$CFLAGS" - CFLAGS="$CFLAGS -funit-at-a-time" + as_fn_append CFLAGS " -funit-at-a-time" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -61631,10 +61514,9 @@ fi -$as_echo "#define lint 1" >>confdefs.h +$as_echo "#define lint 1" >>confdefs.h -$as_echo "#define _FORTIFY_SOURCE 2" >>confdefs.h $as_echo "#define GNULIB_PORTCHECK 1" >>confdefs.h @@ -62768,315 +62650,6 @@ _ACEOF - - # Check for libypsec.a on Dolphin M88K machines. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lypsec" >&5 -$as_echo_n "checking for main in -lypsec... " >&6; } -if ${ac_cv_lib_ypsec_main+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lypsec $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -int -main () -{ -return main (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_ypsec_main=yes -else - ac_cv_lib_ypsec_main=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_ypsec_main" >&5 -$as_echo "$ac_cv_lib_ypsec_main" >&6; } -if test "x$ac_cv_lib_ypsec_main" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBYPSEC 1 -_ACEOF - - LIBS="-lypsec $LIBS" - -fi - - - # m88k running dgux 5.4 needs this - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lldgc" >&5 -$as_echo_n "checking for main in -lldgc... " >&6; } -if ${ac_cv_lib_ldgc_main+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lldgc $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -int -main () -{ -return main (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_ldgc_main=yes -else - ac_cv_lib_ldgc_main=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_ldgc_main" >&5 -$as_echo "$ac_cv_lib_ldgc_main" >&6; } -if test "x$ac_cv_lib_ldgc_main" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBLDGC 1 -_ACEOF - - LIBS="-lldgc $LIBS" - -fi - - - # The -lsun library is required for YP support on Irix-4.0.5 systems. - # m88k/svr3 DolphinOS systems using YP need -lypsec for id. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing yp_match" >&5 -$as_echo_n "checking for library containing yp_match... " >&6; } -if ${ac_cv_search_yp_match+:} 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 yp_match (); -int -main () -{ -return yp_match (); - ; - return 0; -} -_ACEOF -for ac_lib in '' sun ypsec; 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_yp_match=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if ${ac_cv_search_yp_match+:} false; then : - break -fi -done -if ${ac_cv_search_yp_match+:} false; then : - -else - ac_cv_search_yp_match=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_yp_match" >&5 -$as_echo "$ac_cv_search_yp_match" >&6; } -ac_res=$ac_cv_search_yp_match -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - -fi - - - # SysV needs -lsec, older versions of Linux need -lshadow for - # shadow passwords. UnixWare 7 needs -lgen. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getspnam" >&5 -$as_echo_n "checking for library containing getspnam... " >&6; } -if ${ac_cv_search_getspnam+:} 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 getspnam (); -int -main () -{ -return getspnam (); - ; - return 0; -} -_ACEOF -for ac_lib in '' shadow sec gen; 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_getspnam=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if ${ac_cv_search_getspnam+:} false; then : - break -fi -done -if ${ac_cv_search_getspnam+:} false; then : - -else - ac_cv_search_getspnam=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getspnam" >&5 -$as_echo "$ac_cv_search_getspnam" >&6; } -ac_res=$ac_cv_search_getspnam -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - -fi - - - for ac_header in shadow.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "shadow.h" "ac_cv_header_shadow_h" "$ac_includes_default" -if test "x$ac_cv_header_shadow_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SHADOW_H 1 -_ACEOF - -fi - -done - - - # Requirements for su.c. - shadow_includes="\ -$ac_includes_default -#if HAVE_SHADOW_H -# include <shadow.h> -#endif -" - ac_fn_c_check_member "$LINENO" "struct spwd" "sp_pwdp" "ac_cv_member_struct_spwd_sp_pwdp" "$shadow_includes -" -if test "x$ac_cv_member_struct_spwd_sp_pwdp" = xyes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_SPWD_SP_PWDP 1 -_ACEOF - - -fi - - for ac_func in getspnam -do : - ac_fn_c_check_func "$LINENO" "getspnam" "ac_cv_func_getspnam" -if test "x$ac_cv_func_getspnam" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_GETSPNAM 1 -_ACEOF - -fi -done - - - # SCO-ODT-3.0 is reported to need -lufc for crypt. - # NetBSD needs -lcrypt for crypt. - LIB_CRYPT= - cu_saved_libs="$LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing crypt" >&5 -$as_echo_n "checking for library containing crypt... " >&6; } -if ${ac_cv_search_crypt+:} 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 crypt (); -int -main () -{ -return crypt (); - ; - return 0; -} -_ACEOF -for ac_lib in '' ufc crypt; 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_crypt=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if ${ac_cv_search_crypt+:} false; then : - break -fi -done -if ${ac_cv_search_crypt+:} false; then : - -else - ac_cv_search_crypt=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_crypt" >&5 -$as_echo "$ac_cv_search_crypt" >&6; } -ac_res=$ac_cv_search_crypt -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - test "$ac_cv_search_crypt" = "none required" || - LIB_CRYPT="$ac_cv_search_crypt" -fi - - LIBS="$cu_saved_libs" - - - LIB_GMP= @@ -63150,6 +62723,19 @@ if test "$ac_res" != no; then : $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> +" +if test "x$ac_cv_have_decl_mpz_inits" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +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 @@ -63204,61 +62790,671 @@ if test "$elf_sys" = "yes" && \ fi ############################################################################ -mk="$srcdir/src/Makefile.am" -# Extract all literal names from the definition of $(EXTRA_PROGRAMS) -# in $mk but don't expand the variable references. -# Append each literal name to $optional_bin_progs. -v=EXTRA_PROGRAMS -for gl_i in `sed -n '/^'$v' =/,/[^\]$/p' $mk \ - | sed 's/^ *//;/^\$.*/d;/^'$v' =/d' \ - | tr -s '\\015\\012\\\\' ' '`; do - { + +{ if test -z "$optional_bin_progs"; then - optional_bin_progs=$gl_i + optional_bin_progs=[ else - optional_bin_progs="$optional_bin_progs $gl_i" + optional_bin_progs="$optional_bin_progs [" fi } -done - -# As above, extract literal names from the definition of $(no_install__progs) -# in $mk but don't expand the variable references. -v=no_install__progs -t=`sed -n '/^'$v' =/,/[^\]$/p' $mk \ - | sed 's/^ *//;/^\$.*/d;/^'$v' =/d' \ - | tr -s '\\015\\012\\\\' ' '` -# Remove any trailing space. -no_install_progs_default=`echo "$t"|sed 's/ $//'` - -# Unfortunately, due to the way autoconf's AS_HELP_STRING works, the list -# of default-not-installed programs, "arch hostname su", must appear in two -# places: in this file below, and in $mk. Using "$no_install_progs_default" -# below cannot work. And we can't substitute the names into $mk because -# automake needs the literals, too. -# The compromise is to ensure that the space-separated list extracted -# above matches the literal 2nd argument below. -c="$srcdir/configure.ac" -re='^g''l_INCLUDE_EXCLUDE_PROG(.* \[\(.*\)\])' -t=`sed -n '/'"$re"'/{s/'"$re"'/\1/;s/,/ /gp -}' $c` -case $t in - $no_install_progs_default) ;; - *) as_fn_error 1 "internal error: g'l_INCLUDE_EXCLUDE_PROG's 2nd arg, $t, - does not match the list of default-not-installed programs - ($no_install_progs_default) also recorded in $mk" "$LINENO" 5 ;; -esac - -# Given the name of a variable containing a space-separated list of -# install-by-default programs and the actual list do-not-install-by-default -# programs, modify the former variable to reflect any "do-install" and -# "don't-install" requests. -# I.e., add any program name specified via --enable-install-program=..., and -# remove any program name specified via --enable-no-install-program=... -# Note how the second argument below is a literal, with "," separators. -# That is required due to the way the macro works, and since the -# corresponding ./configure option argument is comma-separated on input. -{ - gl_no_install_progs_default=`echo 'arch,hostname,su'|sed 's/,/ /g'` +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=base64 + else + optional_bin_progs="$optional_bin_progs base64" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=basename + else + optional_bin_progs="$optional_bin_progs basename" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=cat + else + optional_bin_progs="$optional_bin_progs cat" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=chcon + else + optional_bin_progs="$optional_bin_progs chcon" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=chgrp + else + optional_bin_progs="$optional_bin_progs chgrp" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=chmod + else + optional_bin_progs="$optional_bin_progs chmod" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=chown + else + optional_bin_progs="$optional_bin_progs chown" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=cksum + else + optional_bin_progs="$optional_bin_progs cksum" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=comm + else + optional_bin_progs="$optional_bin_progs comm" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=cp + else + optional_bin_progs="$optional_bin_progs cp" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=csplit + else + optional_bin_progs="$optional_bin_progs csplit" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=cut + else + optional_bin_progs="$optional_bin_progs cut" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=date + else + optional_bin_progs="$optional_bin_progs date" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=dd + else + optional_bin_progs="$optional_bin_progs dd" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=dir + else + optional_bin_progs="$optional_bin_progs dir" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=dircolors + else + optional_bin_progs="$optional_bin_progs dircolors" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=dirname + else + optional_bin_progs="$optional_bin_progs dirname" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=du + else + optional_bin_progs="$optional_bin_progs du" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=echo + else + optional_bin_progs="$optional_bin_progs echo" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=env + else + optional_bin_progs="$optional_bin_progs env" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=expand + else + optional_bin_progs="$optional_bin_progs expand" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=expr + else + optional_bin_progs="$optional_bin_progs expr" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=factor + else + optional_bin_progs="$optional_bin_progs factor" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=false + else + optional_bin_progs="$optional_bin_progs false" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=fmt + else + optional_bin_progs="$optional_bin_progs fmt" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=fold + else + optional_bin_progs="$optional_bin_progs fold" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=ginstall + else + optional_bin_progs="$optional_bin_progs ginstall" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=groups + else + optional_bin_progs="$optional_bin_progs groups" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=head + else + optional_bin_progs="$optional_bin_progs head" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=id + else + optional_bin_progs="$optional_bin_progs id" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=join + else + optional_bin_progs="$optional_bin_progs join" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=kill + else + optional_bin_progs="$optional_bin_progs kill" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=link + else + optional_bin_progs="$optional_bin_progs link" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=ln + else + optional_bin_progs="$optional_bin_progs ln" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=logname + else + optional_bin_progs="$optional_bin_progs logname" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=ls + else + optional_bin_progs="$optional_bin_progs ls" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=md5sum + else + optional_bin_progs="$optional_bin_progs md5sum" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=mkdir + else + optional_bin_progs="$optional_bin_progs mkdir" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=mkfifo + else + optional_bin_progs="$optional_bin_progs mkfifo" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=mknod + else + optional_bin_progs="$optional_bin_progs mknod" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=mktemp + else + optional_bin_progs="$optional_bin_progs mktemp" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=mv + else + optional_bin_progs="$optional_bin_progs mv" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=nl + else + optional_bin_progs="$optional_bin_progs nl" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=nproc + else + optional_bin_progs="$optional_bin_progs nproc" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=nohup + else + optional_bin_progs="$optional_bin_progs nohup" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=numfmt + else + optional_bin_progs="$optional_bin_progs numfmt" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=od + else + optional_bin_progs="$optional_bin_progs od" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=paste + else + optional_bin_progs="$optional_bin_progs paste" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=pathchk + else + optional_bin_progs="$optional_bin_progs pathchk" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=pr + else + optional_bin_progs="$optional_bin_progs pr" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=printenv + else + optional_bin_progs="$optional_bin_progs printenv" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=printf + else + optional_bin_progs="$optional_bin_progs printf" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=ptx + else + optional_bin_progs="$optional_bin_progs ptx" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=pwd + else + optional_bin_progs="$optional_bin_progs pwd" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=readlink + else + optional_bin_progs="$optional_bin_progs readlink" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=realpath + else + optional_bin_progs="$optional_bin_progs realpath" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=rm + else + optional_bin_progs="$optional_bin_progs rm" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=rmdir + else + optional_bin_progs="$optional_bin_progs rmdir" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=runcon + else + optional_bin_progs="$optional_bin_progs runcon" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=seq + else + optional_bin_progs="$optional_bin_progs seq" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=sha1sum + else + optional_bin_progs="$optional_bin_progs sha1sum" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=sha224sum + else + optional_bin_progs="$optional_bin_progs sha224sum" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=sha256sum + else + optional_bin_progs="$optional_bin_progs sha256sum" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=sha384sum + else + optional_bin_progs="$optional_bin_progs sha384sum" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=sha512sum + else + optional_bin_progs="$optional_bin_progs sha512sum" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=shred + else + optional_bin_progs="$optional_bin_progs shred" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=shuf + else + optional_bin_progs="$optional_bin_progs shuf" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=sleep + else + optional_bin_progs="$optional_bin_progs sleep" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=sort + else + optional_bin_progs="$optional_bin_progs sort" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=split + else + optional_bin_progs="$optional_bin_progs split" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=stat + else + optional_bin_progs="$optional_bin_progs stat" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=sum + else + optional_bin_progs="$optional_bin_progs sum" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=sync + else + optional_bin_progs="$optional_bin_progs sync" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=tac + else + optional_bin_progs="$optional_bin_progs tac" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=tail + else + optional_bin_progs="$optional_bin_progs tail" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=tee + else + optional_bin_progs="$optional_bin_progs tee" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=test + else + optional_bin_progs="$optional_bin_progs test" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=timeout + else + optional_bin_progs="$optional_bin_progs timeout" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=touch + else + optional_bin_progs="$optional_bin_progs touch" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=tr + else + optional_bin_progs="$optional_bin_progs tr" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=true + else + optional_bin_progs="$optional_bin_progs true" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=truncate + else + optional_bin_progs="$optional_bin_progs truncate" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=tsort + else + optional_bin_progs="$optional_bin_progs tsort" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=tty + else + optional_bin_progs="$optional_bin_progs tty" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=uname + else + optional_bin_progs="$optional_bin_progs uname" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=unexpand + else + optional_bin_progs="$optional_bin_progs unexpand" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=uniq + else + optional_bin_progs="$optional_bin_progs uniq" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=unlink + else + optional_bin_progs="$optional_bin_progs unlink" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=vdir + else + optional_bin_progs="$optional_bin_progs vdir" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=wc + else + optional_bin_progs="$optional_bin_progs wc" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=whoami + else + optional_bin_progs="$optional_bin_progs whoami" + fi +} +{ + if test -z "$optional_bin_progs"; then + optional_bin_progs=yes + else + optional_bin_progs="$optional_bin_progs yes" + fi +} +no_install_progs_default='arch 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 +# to reflect any "do-install" and "don't-install" requests. +# That is, add any program specified via --enable-install-program, +# and remove any program specified via --enable-no-install-program. +# Note how the second argument below is a literal, with "," +# separators. That is required due to the way the macro works, +# and since the corresponding ./configure option argument is +# comma-separated on input. +{ + gl_no_install_progs_default=`echo 'arch,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 @@ -63332,43 +63528,47 @@ $as_echo "$as_me: WARNING: '$gl_i' is not an optionally-installable program" >&2 done } -# Now that we know which programs will actually be built up, figure out + +# Now that we know which programs will actually be built, determine # which optional helper progs should be compiled. -optional_pkglib_progs= case " $optional_bin_progs " in - *' stdbuf '*) { - if test -z "$optional_pkglib_progs"; then - optional_pkglib_progs=libstdbuf.so - else - optional_pkglib_progs="$optional_pkglib_progs libstdbuf.so" - fi -} ;; + *' stdbuf '*) pkglibexec_PROGRAMS='src/libstdbuf.so';; + *) pkglibexec_PROGRAMS='';; esac -# Set INSTALL_SU if su installation has been requested via -# --enable-install-program=su. +man1_MANS=` + for p in $optional_bin_progs; do + # Change "ginstall.1" to "install.1". + test $p = ginstall && p=install + # Ignore the "[" program, since writing a portable make rule to + # generate its manpage is not practical. + test x$p = x'[' && continue + echo "man/$p.1" + done` -case " $optional_bin_progs " in - *' su '*) INSTALL_SU=yes ;; - *) INSTALL_SU=no ;; -esac +# Not installed by "make install", but must be built when creating +# a distribution tarball. +EXTRA_MANS=`for p in $no_install_progs_default; do echo man/$p.1; done` + +# 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 +# this case, only for $(bin_PROGRAMS). +bin_PROGRAMS=` + for p in $optional_bin_progs; do echo src/"$p"'$(EXEEXT)'; done` + +# Normalize whitespace. +man1_MANS=`echo $man1_MANS` +EXTRA_MANS=`echo $EXTRA_MANS` +bin_PROGRAMS=`echo $bin_PROGRAMS` +pkglibexec_PROGS=`echo $pkglibexec_PROGRAMS` -MAN=`echo "$optional_bin_progs "|sed 's/ /.1 /g;s/ $//'|tr -d '\\015\\012'` -# Change "ginstall.1" to "install.1" in $MAN. -MAN=`for m in $MAN; do test $m = ginstall.1 && m=install.1; echo $m; done \ - | tr '\015\012' ' '; echo` -# Remove [.1, since writing a portable rule for it in man/Makefile.am -# is not practical. The sed LHS below uses the autoconf quadrigraph -# representing '['. -MAN=`echo "$MAN"|sed 's/\[\.1//'` -OPTIONAL_BIN_PROGS=`echo "$optional_bin_progs "|sed 's/ /\$(EXEEXT) /g;s/ $//'` -OPTIONAL_PKGLIB_PROGS=`echo "$optional_pkglib_progs " | sed 's/ $//'` -NO_INSTALL_PROGS_DEFAULT=$no_install_progs_default +built_programs=$optional_bin_progs if test "$cross_compiling" = yes; then @@ -63380,20 +63580,10 @@ else fi -# Arrange to rerun configure whenever the file, src/Makefile.am, -# containing the list of program names changes. -CONFIG_STATUS_DEPENDENCIES='$(top_srcdir)/src/Makefile.am' - ############################################################################ # As long as "grep 'PRI[diouxX]' po/*.pot" reports matches in # translatable strings, we must use need-formatstring-macros here. -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 $as_echo_n "checking whether NLS is requested... " >&6; } @@ -63418,15 +63608,14 @@ $as_echo "$USE_NLS" >&6; } # Prepare PATH_SEPARATOR. # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh + # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which + # contains only /bin. Note that ksh looks also at the FPATH variable, + # so we have to set that as well for the test. + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + || PATH_SEPARATOR=';' + } fi # Find out how to test for executable files. Don't use a zero-byte file, @@ -63502,7 +63691,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -63541,15 +63730,14 @@ fi # Prepare PATH_SEPARATOR. # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh + # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which + # contains only /bin. Note that ksh looks also at the FPATH variable, + # so we have to set that as well for the test. + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + || PATH_SEPARATOR=';' + } fi # Find out how to test for executable files. Don't use a zero-byte file, @@ -63619,15 +63807,14 @@ fi # Prepare PATH_SEPARATOR. # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh + # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which + # contains only /bin. Note that ksh looks also at the FPATH variable, + # so we have to set that as well for the test. + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + || PATH_SEPARATOR=';' + } fi # Find out how to test for executable files. Don't use a zero-byte file, @@ -63835,15 +64022,19 @@ if eval \${$gt_func_gnugettext_libc+:} false; then : else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + #include <libintl.h> $gt_revision_test_code extern int _nl_msg_cat_cntr; extern int *_nl_domain_bindings; + int main () { + bindtextdomain ("", ""); return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings + ; return 0; } @@ -64584,6 +64775,7 @@ else LIBS="$LIBS $LIBINTL" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + #include <libintl.h> $gt_revision_test_code extern int _nl_msg_cat_cntr; @@ -64592,11 +64784,14 @@ extern "C" #endif const char *_nl_expand_alias (const char *); + int main () { + bindtextdomain ("", ""); return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") + ; return 0; } @@ -64612,6 +64807,7 @@ rm -f core conftest.err conftest.$ac_objext \ LIBS="$LIBS $LIBICONV" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + #include <libintl.h> $gt_revision_test_code extern int _nl_msg_cat_cntr; @@ -64620,19 +64816,22 @@ extern "C" #endif const char *_nl_expand_alias (const char *); + int main () { + bindtextdomain ("", ""); return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") + ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : LIBINTL="$LIBINTL $LIBICONV" - LTLIBINTL="$LTLIBINTL $LTLIBICONV" - eval "$gt_func_gnugettext_libintl=yes" + LTLIBINTL="$LTLIBINTL $LTLIBICONV" + eval "$gt_func_gnugettext_libintl=yes" fi rm -f core conftest.err conftest.$ac_objext \ @@ -64788,7 +64987,7 @@ int main () { if (setlocale (LC_ALL, "") == NULL) return 1; #endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". - On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, @@ -64847,7 +65046,7 @@ _ACEOF ;; *) # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the # configure script would override the LC_ALL setting. Likewise for # LC_CTYPE, which is also set at the beginning of the configure script. # Test for the usual locale name. @@ -64889,7 +65088,7 @@ $as_echo "$gt_cv_locale_fr" >&6; } -ac_config_files="$ac_config_files Makefile doc/Makefile lib/Makefile man/Makefile po/Makefile.in src/Makefile tests/Makefile gnulib-tests/Makefile" +ac_config_files="$ac_config_files Makefile po/Makefile.in gnulib-tests/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -65000,14 +65199,6 @@ 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='#' @@ -65077,6 +65268,34 @@ if test -z "${GL_GENERATE_NETINET_IN_H_TRUE}" && test -z "${GL_GENERATE_NETINET_ as_fn_error $? "conditional \"GL_GENERATE_NETINET_IN_H\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi + + + + # Tell AC_LIBSOURCES where to find source files like alloca.c. + + + # This hack originated in bison. It is required when using non-recursive + # automake rules to build from gnulib-provided lib/ sources. Hence, LIB_DIR + # is usually simply "lib". Those rules use the list of names like "fchdir.o" + # and "strstr.o" in gl_LIBOBJS. With non-recursive make, we must prefix each + # such file name with the "lib/" prefix. See also build-aux/prefix-gnulib-mk. + gl_LIBOBJS=`echo "$gl_LIBOBJS" | sed -e 's, , lib/,g'` + + # Listing the names of the variables to prefix is error-prone. + # Rather, adjust each AC_SUBST'd variable whose name ends in '_H' + # and whose value ends in '.h'. + for ac_var in $ac_subst_vars + do + eval "ac_val=\$$ac_var" + case $ac_var:$ac_val in + (*_H:*.h) eval "$ac_var=lib/\$$ac_var";; + 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. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -65160,6 +65379,10 @@ fi gltests_LTLIBOBJS=$gltests_ltlibobjs +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 "${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 @@ -65462,16 +65685,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 -pR'. + # In both cases, we have to default to `cp -p'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -pR' + as_ln_s='cp -p' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -pR' + as_ln_s='cp -p' fi else - as_ln_s='cp -pR' + as_ln_s='cp -p' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -65531,16 +65754,28 @@ else as_mkdir_p=false fi - -# 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 +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 # 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'" @@ -65561,8 +65796,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.17, which was -generated by GNU Autoconf 2.69.1-2d4eb. Invocation command line was +This file was extended by GNU coreutils $as_me 8.21, which was +generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -65633,11 +65868,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.17 -configured by $0, generated by GNU Autoconf 2.69.1-2d4eb, +GNU coreutils config.status 8.21 +configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -65728,7 +65963,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' @@ -65775,12 +66010,7 @@ do "$GNUmakefile") CONFIG_LINKS="$CONFIG_LINKS $GNUmakefile:$GNUmakefile" ;; "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; - "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; - "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; - "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; - "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; "gnulib-tests/Makefile") CONFIG_FILES="$CONFIG_FILES gnulib-tests/Makefile" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; @@ -66410,7 +66640,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} case $ac_file$ac_mode in "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Older Autoconf quotes --file arguments for eval, but not when files + # Autoconf 2.62 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 @@ -66423,7 +66653,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. @@ -66457,19 +66687,21 @@ $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 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'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`$as_dirname -- "$file" || @@ -66528,7 +66760,8 @@ $as_echo X"$file" | if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then rm -f "$ac_dir/POTFILES" test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" - cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" + gt_tab=`printf '\t'` + cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" POMAKEFILEDEPS="POTFILES.in" # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend # on $ac_dir but don't depend on user-specified configuration @@ -66539,12 +66772,12 @@ $as_echo X"$file" | test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" fi ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` - # Hide the ALL_LINGUAS assigment from automake < 1.5. + # Hide the ALL_LINGUAS assignment from automake < 1.5. eval 'ALL_LINGUAS''=$ALL_LINGUAS_' POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" else # The set of available languages was given in configure.in. - # Hide the ALL_LINGUAS assigment from automake < 1.5. + # Hide the ALL_LINGUAS assignment from automake < 1.5. eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' fi # Compute POFILES diff --git a/configure.ac b/configure.ac index 5a4860e7..3f0c58b9 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-2012 Free Software Foundation, Inc. +# Copyright (C) 1991-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 @@ -32,7 +32,8 @@ AC_CONFIG_SRCDIR([src/ls.c]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([lib/config.h:lib/config.hin]) -AM_INIT_AUTOMAKE([1.11.1 no-dist-gzip dist-xz color-tests parallel-tests]) +AM_INIT_AUTOMAKE([1.11.2 no-dist-gzip dist-xz color-tests parallel-tests + subdir-objects]) AM_SILENT_RULES([yes]) # make --enable-silent-rules the default. dnl POSIXCHECK is worthwhile for maintainers, but adds several seconds @@ -59,16 +60,12 @@ gl_EARLY gl_INIT coreutils_MACROS -AC_ARG_ENABLE([gcc-warnings], - [AS_HELP_STRING([--enable-gcc-warnings], - [turn on lots of GCC warnings (for developers)])], - [case $enableval in - yes|no) ;; - *) AC_MSG_ERROR([bad value $enableval for gcc-warnings option]) ;; - esac - gl_gcc_warnings=$enableval], - [gl_gcc_warnings=no] -) +# The test suite needs to know if we have a working perl. +# FIXME: this is suboptimal. Ideally, we would be able to call gl_PERL +# with an ACTION-IF-NOT-FOUND argument ... +cu_have_perl=yes +case $PERL in *"/missing "*) cu_have_perl=no;; esac +AM_CONDITIONAL([HAVE_PERL], [test $cu_have_perl = yes]) # gl_GCC_VERSION_IFELSE([major], [minor], [run-if-found], [run-if-not-found]) # ------------------------------------------------ @@ -88,6 +85,24 @@ AC_DEFUN([gl_GCC_VERSION_IFELSE], ] ) +AC_ARG_ENABLE([gcc-warnings], + [AS_HELP_STRING([--enable-gcc-warnings], + [turn on many GCC warnings (for developers; best with GNU make)])], + [case $enableval in + yes|no) ;; + *) AC_MSG_ERROR([bad value $enableval for gcc-warnings option]) ;; + esac + gl_gcc_warnings=$enableval], + [ + # GCC provides fine-grained control over diagnostics which + # is used in gnulib for example to suppress warnings from + # certain sections of code. So if this is available and + # 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])] +) + if test "$gl_gcc_warnings" = yes; then gl_WARN_ADD([-Werror], [WERROR_CFLAGS]) AC_SUBST([WERROR_CFLAGS]) @@ -120,6 +135,7 @@ if test "$gl_gcc_warnings" = yes; then nw="$nw -Wmissing-format-attribute" # copy.c nw="$nw -Wunsafe-loop-optimizations" # a few src/*.c nw="$nw -Winline" # system.h's readdir_ignoring_dot_and_dotdot + nw="$nw -Wsuggest-attribute=format" # warns about copy.c and factor.c # Using -Wstrict-overflow is a pain, but the alternative is worse. # For an example, see the code that provoked this report: @@ -154,8 +170,13 @@ if test "$gl_gcc_warnings" = yes; then AC_SUBST([WARN_CFLAGS]) AC_DEFINE([lint], [1], [Define to 1 if the compiler is checking for lint.]) - AC_DEFINE([_FORTIFY_SOURCE], [2], - [enable compile-time and run-time bounds-checking, and some warnings]) + AH_VERBATIM([FORTIFY_SOURCE], + [/* Enable compile-time and run-time bounds-checking, and some warnings, + without upsetting glibc 2.15+. */ + #if !defined _FORTIFY_SOURCE && defined __OPTIMIZE__ && __OPTIMIZE__ + # define _FORTIFY_SOURCE 2 + #endif + ]) AC_DEFINE([GNULIB_PORTCHECK], [1], [enable some gnulib portability checks]) # We use a slightly smaller set of warning options for lib/. @@ -380,7 +401,6 @@ AC_CHECK_DECLS([strsignal, sys_siglist, _sys_siglist, __sys_siglist], , , [AC_INCLUDES_DEFAULT #include <signal.h>]) -cu_LIB_CHECK cu_GMP # Build df only if there's a point to it. @@ -400,95 +420,59 @@ if test "$elf_sys" = "yes" && \ fi ############################################################################ -mk="$srcdir/src/Makefile.am" -# Extract all literal names from the definition of $(EXTRA_PROGRAMS) -# in $mk but don't expand the variable references. -# Append each literal name to $optional_bin_progs. -v=EXTRA_PROGRAMS -for gl_i in `sed -n '/^'$v' =/,/[[^\]]$/p' $mk \ - | sed 's/^ *//;/^\$.*/d;/^'$v' =/d' \ - | tr -s '\\015\\012\\\\' ' '`; do - gl_ADD_PROG([optional_bin_progs], $gl_i) -done - -# As above, extract literal names from the definition of $(no_install__progs) -# in $mk but don't expand the variable references. -v=no_install__progs -t=`sed -n '/^'$v' =/,/[[^\]]$/p' $mk \ - | sed 's/^ *//;/^\$.*/d;/^'$v' =/d' \ - | tr -s '\\015\\012\\\\' ' '` -# Remove any trailing space. -no_install_progs_default=`echo "$t"|sed 's/ $//'` - -# Unfortunately, due to the way autoconf's AS_HELP_STRING works, the list -# of default-not-installed programs, "arch hostname su", must appear in two -# places: in this file below, and in $mk. Using "$no_install_progs_default" -# below cannot work. And we can't substitute the names into $mk because -# automake needs the literals, too. -# The compromise is to ensure that the space-separated list extracted -# above matches the literal 2nd argument below. -c="$srcdir/configure.ac" -re='^g''l_INCLUDE_EXCLUDE_PROG(.* [\[\(.*\)\]])' -t=`sed -n '/'"$re"'/{s/'"$re"'/\1/;s/,/ /gp -}' $c` -case $t in - $no_install_progs_default) ;; - *) AC_MSG_ERROR([[internal error: g'l_INCLUDE_EXCLUDE_PROG's 2nd arg, $t, - does not match the list of default-not-installed programs - ($no_install_progs_default) also recorded in $mk]], - 1) ;; -esac -# Given the name of a variable containing a space-separated list of -# install-by-default programs and the actual list do-not-install-by-default -# programs, modify the former variable to reflect any "do-install" and -# "don't-install" requests. -# I.e., add any program name specified via --enable-install-program=..., and -# remove any program name specified via --enable-no-install-program=... -# Note how the second argument below is a literal, with "," 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,su]) - -# Now that we know which programs will actually be built up, figure out -# which optional helper progs should be compiled. -optional_pkglib_progs= -case " $optional_bin_progs " in - *' stdbuf '*) gl_ADD_PROG([optional_pkglib_progs], [libstdbuf.so]) ;; -esac +dnl Autogenerated by the 'gen-lists-of-programs.sh' auxiliary script. +dnl Issue proper calls to the macros gl_INCLUDE_EXCLUDE_PROG and +dnl gl_ADD_PROG (updating $optional_bin_progs), and generate the list +dnl of coreutils programs to be built only upon explicit user request, +dnl saving that list in the $no_install_progs_default shell variable. +m4_include([m4/cu-progs.m4]) -# Set INSTALL_SU if su installation has been requested via -# --enable-install-program=su. -AC_SUBST([INSTALL_SU]) +# Now that we know which programs will actually be built, determine +# which optional helper progs should be compiled. case " $optional_bin_progs " in - *' su '*) INSTALL_SU=yes ;; - *) INSTALL_SU=no ;; + *' stdbuf '*) pkglibexec_PROGRAMS='src/libstdbuf.so';; + *) pkglibexec_PROGRAMS='';; esac -MAN=`echo "$optional_bin_progs "|sed 's/ /.1 /g;s/ $//'|tr -d '\\015\\012'` - -# Change "ginstall.1" to "install.1" in $MAN. -MAN=`for m in $MAN; do test $m = ginstall.1 && m=install.1; echo $m; done \ - | tr '\015\012' ' '; echo` - -# Remove [.1, since writing a portable rule for it in man/Makefile.am -# is not practical. The sed LHS below uses the autoconf quadrigraph -# representing '['. -MAN=`echo "$MAN"|sed 's/\@<:@\.1//'` - -OPTIONAL_BIN_PROGS=`echo "$optional_bin_progs "|sed 's/ /\$(EXEEXT) /g;s/ $//'` -AC_SUBST([OPTIONAL_BIN_PROGS]) -OPTIONAL_PKGLIB_PROGS=`echo "$optional_pkglib_progs " | sed 's/ $//'` -AC_SUBST([OPTIONAL_PKGLIB_PROGS]) -NO_INSTALL_PROGS_DEFAULT=$no_install_progs_default -AC_SUBST([NO_INSTALL_PROGS_DEFAULT]) +man1_MANS=` + for p in $optional_bin_progs; do + # Change "ginstall.1" to "install.1". + test $p = ginstall && p=install + # Ignore the "[" program, since writing a portable make rule to + # generate its manpage is not practical. + dnl Use the autoconf-provided quadrigraph to represent "[", + dnl otherwise we will incur in dreadful quoting issues. + test x$p = x'@<:@' && continue + echo "man/$p.1" + done` + +# Not installed by "make install", but must be built when creating +# a distribution tarball. +EXTRA_MANS=`for p in $no_install_progs_default; do echo man/$p.1; done` + +# 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 +# this case, only for $(bin_PROGRAMS). +bin_PROGRAMS=` + for p in $optional_bin_progs; do echo src/"$p"'$(EXEEXT)'; done` + +# Normalize whitespace. +man1_MANS=`echo $man1_MANS` +EXTRA_MANS=`echo $EXTRA_MANS` +bin_PROGRAMS=`echo $bin_PROGRAMS` +pkglibexec_PROGS=`echo $pkglibexec_PROGRAMS` + +AC_SUBST([bin_PROGRAMS]) AM_SUBST_NOTMAKE([bin_PROGRAMS]) +AC_SUBST([pkglibexec_PROGRAMS]) AM_SUBST_NOTMAKE([pkglibexec_PROGRAMS]) +AC_SUBST([man1_MANS]) AM_SUBST_NOTMAKE([man1_MANS]) +AC_SUBST([EXTRA_MANS]) AM_SUBST_NOTMAKE([EXTRA_MANS]) + +AC_SUBST([built_programs], [$optional_bin_progs]) AM_CONDITIONAL([CROSS_COMPILING], [test "$cross_compiling" = yes]) -# Arrange to rerun configure whenever the file, src/Makefile.am, -# containing the list of program names changes. -CONFIG_STATUS_DEPENDENCIES='$(top_srcdir)/src/Makefile.am' -AC_SUBST([CONFIG_STATUS_DEPENDENCIES]) ############################################################################ # As long as "grep 'PRI[diouxX]' po/*.pot" reports matches in @@ -501,12 +485,7 @@ gt_LOCALE_FR AC_CONFIG_FILES( Makefile - doc/Makefile - lib/Makefile - man/Makefile po/Makefile.in - src/Makefile - tests/Makefile gnulib-tests/Makefile ) AC_OUTPUT diff --git a/dist-check.mk b/dist-check.mk index 6706ea03..533b7f92 100644 --- a/dist-check.mk +++ b/dist-check.mk @@ -9,10 +9,7 @@ tmpdir = $(abs_top_builddir)/tests/torture t=$(tmpdir)/$(PACKAGE)/test pfx=$(t)/i -built_programs = \ - $$(echo 'spy:;@echo $$(bin_PROGRAMS)' \ - | MAKEFLAGS= $(MAKE) -s -C src -f Makefile -f - spy \ - | fmt -1 | sed 's,$(EXEEXT)$$,,' | sort -u) +built_programs := $(sort $(patsubst src/%$(EXEEXT),%,$(bin_PROGRAMS))) # More than once, tainted build and source directory names would # have caused at least one "make check" test to apply "chmod 700" diff --git a/doc/ChangeLog-2007 b/doc/ChangeLog-2007 index b36e9380..81130762 100644 --- a/doc/ChangeLog-2007 +++ b/doc/ChangeLog-2007 @@ -2002,7 +2002,7 @@ ----- - Copyright (C) 2001-2012 Free Software Foundation, Inc. + Copyright (C) 2001-2013 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice diff --git a/doc/Makefile.am b/doc/Makefile.am deleted file mode 100644 index 0de9213f..00000000 --- a/doc/Makefile.am +++ /dev/null @@ -1,134 +0,0 @@ -# Make coreutils documentation. -*-Makefile-*- - -# Copyright (C) 1995-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 -# 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/>. - -info_TEXINFOS = coreutils.texi - -EXTRA_DIST = perm.texi parse-datetime.texi constants.texi fdl.texi - -# The following is necessary if the package name is 8 characters or longer. -# If the info documentation would be split into 10 or more separate files, -# then this is necessary even if the package name is 7 characters long. -# -# Tell makeinfo to put everything in a single info file: <package>.info. -# Otherwise, it would also generate files with names like <package>.info-[123], -# and those names all map to one 14-byte name (<package>.info-) on some crufty -# old systems. -AM_MAKEINFOFLAGS = --no-split - -constants.texi: $(top_srcdir)/src/tail.c $(top_srcdir)/src/shred.c - $(AM_V_GEN)LC_ALL=C; export LC_ALL; \ - { sed -n -e 's/^#define \(DEFAULT_MAX[_A-Z]*\) \(.*\)/@set \1 \2/p' \ - $(top_srcdir)/src/tail.c && \ - sed -n -e \ - 's/.*\(DEFAULT_PASSES\)[ =]* \([0-9]*\).*/@set SHRED_\1 \2/p'\ - $(top_srcdir)/src/shred.c; } > t-$@ \ - && mv t-$@ $@ - -MAINTAINERCLEANFILES = constants.texi - -$(DVIS): $(EXTRA_DIST) -$(INFO_DEPS): $(EXTRA_DIST) - -# Extended regular expressions to match word starts and ends. -_W = (^|[^A-Za-z0-9_]) -W_ = ([^A-Za-z0-9_]|$$) - -syntax_checks = \ - sc-avoid-builtin \ - sc-avoid-io \ - sc-avoid-non-zero \ - sc-avoid-path \ - sc-avoid-timezone \ - sc-avoid-zeroes \ - sc-exponent-grouping \ - sc-lower-case-var \ - sc-use-small-caps-NUL - -.PHONY: $(syntax_checks) check-texinfo - -# List words/regexps here that should not appear in the texinfo documentation. -BAD_POSIX_PERL = /\bPOSIX\b/ && !/\@acronym{POSIX}/ && !/^\* / || /{posix}/ -check-texinfo: $(syntax_checks) - $(AM_V_GEN)fail=0; \ - grep '@url{' $(srcdir)/*.texi && fail=1; \ - grep '\$$@"' $(srcdir)/*.texi && fail=1; \ - grep -n '[^[:punct:]]@footnote' $(srcdir)/*.texi && fail=1; \ - grep -n filename $(srcdir)/*.texi \ - | $(EGREP) -v 'setfilename|[{]filename[}]' \ - && fail=1; \ - $(PERL) -e 1 2> /dev/null && { $(PERL) -ne \ - '$(BAD_POSIX_PERL) and print,exit 1' \ - $(srcdir)/*.texi 2> /dev/null || fail=1; }; \ - exit $$fail - -sc-avoid-builtin: - $(AM_V_GEN)$(EGREP) -i '$(_W)builtins?$(W_)' $(srcdir)/*.texi \ - && exit 1 || : - -sc-avoid-path: - $(AM_V_GEN)fail=0; \ - $(EGREP) -i '$(_W)path(name)?s?$(W_)' $(srcdir)/*.texi \ - | $(EGREP) -v \ - 'PATH=|path search|search path|@vindex PATH$$|@env[{]PATH[}]' \ - && fail=1; \ - exit $$fail - -# Use "time zone", not "timezone". -sc-avoid-timezone: - $(AM_V_GEN)$(EGREP) timezone $(srcdir)/*.texi && exit 1 || : - -# Check for insufficient exponent grouping, e.g., -# @math{2^64} should be @math{2^{64}}. -sc-exponent-grouping: - $(AM_V_GEN)$(EGREP) '\{.*\^[0-9][0-9]' $(srcdir)/*.texi && exit 1 || : - -# E.g., use @sc{nul}, not NUL. -sc-use-small-caps-NUL: - $(AM_V_GEN)$(EGREP) '$(_W)NUL$(W_)' $(srcdir)/*.texi && exit 1 || : - -# Say I/O, not IO. -sc-avoid-io: - $(AM_V_GEN)$(EGREP) '$(_W)IO$(W_)' $(srcdir)/*.texi && exit 1 || : - -# I prefer nonzero over non-zero. -sc-avoid-non-zero: - $(AM_V_GEN)$(EGREP) non-zero $(srcdir)/*.texi && exit 1 || : - -# Use "zeros", not "zeroes" (nothing wrong with "zeroes"; just be consistent). -sc-avoid-zeroes: - $(AM_V_GEN)$(EGREP) -i '$(_W)zeroes$(W_)' $(srcdir)/*.texi \ - && exit 1 || : - -# ME = $(subdir)/$(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)) -ME = doc/Makefile - -# The quantity inside @var{...} should not contain upper case letters. -# The leading backslash exemption is to permit in-macro uses like -# @var{\varName\} where the upper case letter is part of a parameter name. -find_upper_case_var = \ - '/\@var{/ or next; \ - while (/\@var{(.+?)}/g) \ - { \ - $$v = $$1; \ - $$v =~ /[A-Z]/ && $$v !~ /^\\/ and (print "$$ARGV:$$.:$$_"), $$m = 1 \ - } \ - END {$$m and (warn "$(ME): do not use upper case in \@var{...}\n"), exit 1}' -sc-lower-case-var: - $(AM_V_GEN)$(PERL) -e 1 || { echo $@: skipping test; exit 0; }; \ - $(PERL) -lne $(find_upper_case_var) $(srcdir)/*.texi - -check: check-texinfo diff --git a/doc/Makefile.in b/doc/Makefile.in deleted file mode 100644 index ebb712af..00000000 --- a/doc/Makefile.in +++ /dev/null @@ -1,2241 +0,0 @@ -# Makefile.in generated by automake 1.12a from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2012 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. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# Make coreutils documentation. -*-Makefile-*- - -# Copyright (C) 1995-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 -# 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/>. -VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ - 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;; \ - esac; \ - test $$am__dry = yes; \ - } -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = doc -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/build-aux/mdate-sh $(srcdir)/version.texi \ - $(srcdir)/stamp-vti $(top_srcdir)/build-aux/texinfo.tex -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/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 \ - $(top_srcdir)/m4/close-stream.m4 $(top_srcdir)/m4/close.m4 \ - $(top_srcdir)/m4/closedir.m4 $(top_srcdir)/m4/closein.m4 \ - $(top_srcdir)/m4/closeout.m4 $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/config-h.m4 $(top_srcdir)/m4/configmake.m4 \ - $(top_srcdir)/m4/ctype.m4 $(top_srcdir)/m4/cycle-check.m4 \ - $(top_srcdir)/m4/d-ino.m4 $(top_srcdir)/m4/d-type.m4 \ - $(top_srcdir)/m4/dirent-safer.m4 $(top_srcdir)/m4/dirent_h.m4 \ - $(top_srcdir)/m4/dirfd.m4 $(top_srcdir)/m4/dirname.m4 \ - $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup.m4 \ - $(top_srcdir)/m4/dup2.m4 $(top_srcdir)/m4/eealloc.m4 \ - $(top_srcdir)/m4/environ.m4 $(top_srcdir)/m4/errno_h.m4 \ - $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/euidaccess.m4 \ - $(top_srcdir)/m4/exponentd.m4 $(top_srcdir)/m4/exponentf.m4 \ - $(top_srcdir)/m4/exponentl.m4 $(top_srcdir)/m4/extensions.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/fd-reopen.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/freading.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/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 \ - $(top_srcdir)/m4/getgroups.m4 $(top_srcdir)/m4/gethostname.m4 \ - $(top_srcdir)/m4/gethrxtime.m4 $(top_srcdir)/m4/getline.m4 \ - $(top_srcdir)/m4/getloadavg.m4 $(top_srcdir)/m4/getlogin.m4 \ - $(top_srcdir)/m4/getndelim2.m4 $(top_srcdir)/m4/getopt.m4 \ - $(top_srcdir)/m4/getpagesize.m4 $(top_srcdir)/m4/getpass.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/gmp.m4 $(top_srcdir)/m4/gnu-make.m4 \ - $(top_srcdir)/m4/gnulib-common.m4 \ - $(top_srcdir)/m4/gnulib-comp.m4 \ - $(top_srcdir)/m4/group-member.m4 \ - $(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/host-os.m4 \ - $(top_srcdir)/m4/hostent.m4 $(top_srcdir)/m4/human.m4 \ - $(top_srcdir)/m4/i-ring.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/iconv_h.m4 $(top_srcdir)/m4/iconv_open.m4 \ - $(top_srcdir)/m4/idcache.m4 \ - $(top_srcdir)/m4/include-exclude-prog.m4 \ - $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inet_ntop.m4 \ - $(top_srcdir)/m4/inet_pton.m4 $(top_srcdir)/m4/inline.m4 \ - $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intmax_t.m4 \ - $(top_srcdir)/m4/inttostr.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ - $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ - $(top_srcdir)/m4/ioctl.m4 $(top_srcdir)/m4/isapipe.m4 \ - $(top_srcdir)/m4/isatty.m4 $(top_srcdir)/m4/isblank.m4 \ - $(top_srcdir)/m4/isnand.m4 $(top_srcdir)/m4/isnanf.m4 \ - $(top_srcdir)/m4/isnanl.m4 $(top_srcdir)/m4/iswblank.m4 \ - $(top_srcdir)/m4/jm-macros.m4 $(top_srcdir)/m4/jm-winsz1.m4 \ - $(top_srcdir)/m4/jm-winsz2.m4 $(top_srcdir)/m4/langinfo_h.m4 \ - $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lchmod.m4 \ - $(top_srcdir)/m4/lchown.m4 $(top_srcdir)/m4/lcmessage.m4 \ - $(top_srcdir)/m4/ldexp.m4 $(top_srcdir)/m4/ldexpl.m4 \ - $(top_srcdir)/m4/lib-check.m4 $(top_srcdir)/m4/lib-ignore.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/libunistring-base.m4 \ - $(top_srcdir)/m4/link-follow.m4 $(top_srcdir)/m4/link.m4 \ - $(top_srcdir)/m4/linkat.m4 $(top_srcdir)/m4/localcharset.m4 \ - $(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \ - $(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \ - $(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localeconv.m4 \ - $(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \ - $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/ls-mntd-fs.m4 \ - $(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \ - $(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \ - $(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/math_h.m4 \ - $(top_srcdir)/m4/mbchar.m4 $(top_srcdir)/m4/mbiter.m4 \ - $(top_srcdir)/m4/mbrlen.m4 $(top_srcdir)/m4/mbrtowc.m4 \ - $(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbslen.m4 \ - $(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbswidth.m4 $(top_srcdir)/m4/mbtowc.m4 \ - $(top_srcdir)/m4/md5.m4 $(top_srcdir)/m4/memcasecmp.m4 \ - $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/memcoll.m4 \ - $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \ - $(top_srcdir)/m4/mgetgroups.m4 $(top_srcdir)/m4/mkancesdirs.m4 \ - $(top_srcdir)/m4/mkdir-p.m4 $(top_srcdir)/m4/mkdir.m4 \ - $(top_srcdir)/m4/mkfifo.m4 $(top_srcdir)/m4/mknod.m4 \ - $(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mktime.m4 \ - $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \ - $(top_srcdir)/m4/modechange.m4 $(top_srcdir)/m4/mountlist.m4 \ - $(top_srcdir)/m4/mpsort.m4 $(top_srcdir)/m4/msvc-inval.m4 \ - $(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \ - $(top_srcdir)/m4/nanosleep.m4 $(top_srcdir)/m4/netdb_h.m4 \ - $(top_srcdir)/m4/netinet_in_h.m4 \ - $(top_srcdir)/m4/nl_langinfo.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/nproc.m4 \ - $(top_srcdir)/m4/off_t.m4 $(top_srcdir)/m4/open.m4 \ - $(top_srcdir)/m4/openat.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/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/root-dev-ino.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/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/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/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 \ - $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stdbool.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/strcase.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/strings_h.m4 $(top_srcdir)/m4/strncat.m4 \ - $(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \ - $(top_srcdir)/m4/strnumcmp.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 \ - $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \ - $(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/sys_uio_h.m4 \ - $(top_srcdir)/m4/sys_utsname_h.m4 \ - $(top_srcdir)/m4/sys_wait_h.m4 $(top_srcdir)/m4/tempname.m4 \ - $(top_srcdir)/m4/termios_h.m4 $(top_srcdir)/m4/thread.m4 \ - $(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/time_h.m4 \ - $(top_srcdir)/m4/time_r.m4 $(top_srcdir)/m4/timer_time.m4 \ - $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tls.m4 \ - $(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/tzset.m4 \ - $(top_srcdir)/m4/uname.m4 $(top_srcdir)/m4/ungetc.m4 \ - $(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \ - $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink-busy.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/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/xfts.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)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/lib/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -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_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -SOURCES = -DIST_SOURCES = -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_MAKEINFO = $(am__v_MAKEINFO_@AM_V@) -am__v_MAKEINFO_ = $(am__v_MAKEINFO_@AM_DEFAULT_V@) -am__v_MAKEINFO_0 = @echo " MAKEINFO" $@; -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_TEXI2DVI = $(am__v_TEXI2DVI_@AM_V@) -am__v_TEXI2DVI_ = $(am__v_TEXI2DVI_@AM_DEFAULT_V@) -am__v_TEXI2DVI_0 = @echo " TEXI2DVI" $@; -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_texinfo = $(am__v_texinfo_@AM_V@) -am__v_texinfo_ = $(am__v_texinfo_@AM_DEFAULT_V@) -am__v_texinfo_0 = -q -AM_V_texidevnull = $(am__v_texidevnull_@AM_V@) -am__v_texidevnull_ = $(am__v_texidevnull_@AM_DEFAULT_V@) -am__v_texidevnull_0 = > /dev/null -INFO_DEPS = $(srcdir)/coreutils.info -TEXINFO_TEX = $(top_srcdir)/build-aux/texinfo.tex -am__TEXINFO_TEX_DIR = $(top_srcdir)/build-aux -DVIS = coreutils.dvi -PDFS = coreutils.pdf -PSS = coreutils.ps -HTMLS = coreutils.html -TEXINFOS = coreutils.texi -TEXI2DVI = texi2dvi -TEXI2PDF = $(TEXI2DVI) --pdf --batch -MAKEINFOHTML = $(MAKEINFO) --html -AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS) -DVIPS = dvips -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -am__installdirs = "$(DESTDIR)$(infodir)" -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -pkglibexecdir = @pkglibexecdir@ -ACLOCAL = @ACLOCAL@ -ALLOCA = @ALLOCA@ -ALLOCA_H = @ALLOCA_H@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ -AR = @AR@ -ARFLAGS = @ARFLAGS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BITSIZEOF_PTRDIFF_T = @BITSIZEOF_PTRDIFF_T@ -BITSIZEOF_SIG_ATOMIC_T = @BITSIZEOF_SIG_ATOMIC_T@ -BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@ -BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@ -BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CONFIG_INCLUDE = @CONFIG_INCLUDE@ -CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFAULT_POSIX2_VERSION = @DEFAULT_POSIX2_VERSION@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EMULTIHOP_HIDDEN = @EMULTIHOP_HIDDEN@ -EMULTIHOP_VALUE = @EMULTIHOP_VALUE@ -ENOLINK_HIDDEN = @ENOLINK_HIDDEN@ -ENOLINK_VALUE = @ENOLINK_VALUE@ -EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ -EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ -ERRNO_H = @ERRNO_H@ -EXEEXT = @EXEEXT@ -FLOAT_H = @FLOAT_H@ -FNMATCH_H = @FNMATCH_H@ -GETADDRINFO_LIB = @GETADDRINFO_LIB@ -GETHOSTNAME_LIB = @GETHOSTNAME_LIB@ -GETLOADAVG_LIBS = @GETLOADAVG_LIBS@ -GETOPT_H = @GETOPT_H@ -GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ -GLIBC21 = @GLIBC21@ -GMSGFMT = @GMSGFMT@ -GMSGFMT_015 = @GMSGFMT_015@ -GNULIB_ACCEPT = @GNULIB_ACCEPT@ -GNULIB_ACCEPT4 = @GNULIB_ACCEPT4@ -GNULIB_ACOSF = @GNULIB_ACOSF@ -GNULIB_ACOSL = @GNULIB_ACOSL@ -GNULIB_ALPHASORT = @GNULIB_ALPHASORT@ -GNULIB_ASINF = @GNULIB_ASINF@ -GNULIB_ASINL = @GNULIB_ASINL@ -GNULIB_ATAN2F = @GNULIB_ATAN2F@ -GNULIB_ATANF = @GNULIB_ATANF@ -GNULIB_ATANL = @GNULIB_ATANL@ -GNULIB_ATOLL = @GNULIB_ATOLL@ -GNULIB_BIND = @GNULIB_BIND@ -GNULIB_BTOWC = @GNULIB_BTOWC@ -GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@ -GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@ -GNULIB_CBRT = @GNULIB_CBRT@ -GNULIB_CBRTF = @GNULIB_CBRTF@ -GNULIB_CBRTL = @GNULIB_CBRTL@ -GNULIB_CEIL = @GNULIB_CEIL@ -GNULIB_CEILF = @GNULIB_CEILF@ -GNULIB_CEILL = @GNULIB_CEILL@ -GNULIB_CHDIR = @GNULIB_CHDIR@ -GNULIB_CHOWN = @GNULIB_CHOWN@ -GNULIB_CLOSE = @GNULIB_CLOSE@ -GNULIB_CLOSEDIR = @GNULIB_CLOSEDIR@ -GNULIB_CONNECT = @GNULIB_CONNECT@ -GNULIB_COPYSIGN = @GNULIB_COPYSIGN@ -GNULIB_COPYSIGNF = @GNULIB_COPYSIGNF@ -GNULIB_COPYSIGNL = @GNULIB_COPYSIGNL@ -GNULIB_COSF = @GNULIB_COSF@ -GNULIB_COSHF = @GNULIB_COSHF@ -GNULIB_COSL = @GNULIB_COSL@ -GNULIB_DIRFD = @GNULIB_DIRFD@ -GNULIB_DPRINTF = @GNULIB_DPRINTF@ -GNULIB_DUP = @GNULIB_DUP@ -GNULIB_DUP2 = @GNULIB_DUP2@ -GNULIB_DUP3 = @GNULIB_DUP3@ -GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@ -GNULIB_ENVIRON = @GNULIB_ENVIRON@ -GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@ -GNULIB_EXP2 = @GNULIB_EXP2@ -GNULIB_EXP2F = @GNULIB_EXP2F@ -GNULIB_EXP2L = @GNULIB_EXP2L@ -GNULIB_EXPF = @GNULIB_EXPF@ -GNULIB_EXPL = @GNULIB_EXPL@ -GNULIB_EXPM1 = @GNULIB_EXPM1@ -GNULIB_EXPM1F = @GNULIB_EXPM1F@ -GNULIB_EXPM1L = @GNULIB_EXPM1L@ -GNULIB_FABSF = @GNULIB_FABSF@ -GNULIB_FABSL = @GNULIB_FABSL@ -GNULIB_FACCESSAT = @GNULIB_FACCESSAT@ -GNULIB_FCHDIR = @GNULIB_FCHDIR@ -GNULIB_FCHMODAT = @GNULIB_FCHMODAT@ -GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@ -GNULIB_FCLOSE = @GNULIB_FCLOSE@ -GNULIB_FCNTL = @GNULIB_FCNTL@ -GNULIB_FDATASYNC = @GNULIB_FDATASYNC@ -GNULIB_FDOPEN = @GNULIB_FDOPEN@ -GNULIB_FDOPENDIR = @GNULIB_FDOPENDIR@ -GNULIB_FFLUSH = @GNULIB_FFLUSH@ -GNULIB_FFS = @GNULIB_FFS@ -GNULIB_FFSL = @GNULIB_FFSL@ -GNULIB_FFSLL = @GNULIB_FFSLL@ -GNULIB_FGETC = @GNULIB_FGETC@ -GNULIB_FGETS = @GNULIB_FGETS@ -GNULIB_FLOOR = @GNULIB_FLOOR@ -GNULIB_FLOORF = @GNULIB_FLOORF@ -GNULIB_FLOORL = @GNULIB_FLOORL@ -GNULIB_FMA = @GNULIB_FMA@ -GNULIB_FMAF = @GNULIB_FMAF@ -GNULIB_FMAL = @GNULIB_FMAL@ -GNULIB_FMOD = @GNULIB_FMOD@ -GNULIB_FMODF = @GNULIB_FMODF@ -GNULIB_FMODL = @GNULIB_FMODL@ -GNULIB_FOPEN = @GNULIB_FOPEN@ -GNULIB_FPRINTF = @GNULIB_FPRINTF@ -GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@ -GNULIB_FPURGE = @GNULIB_FPURGE@ -GNULIB_FPUTC = @GNULIB_FPUTC@ -GNULIB_FPUTS = @GNULIB_FPUTS@ -GNULIB_FREAD = @GNULIB_FREAD@ -GNULIB_FREOPEN = @GNULIB_FREOPEN@ -GNULIB_FREXP = @GNULIB_FREXP@ -GNULIB_FREXPF = @GNULIB_FREXPF@ -GNULIB_FREXPL = @GNULIB_FREXPL@ -GNULIB_FSCANF = @GNULIB_FSCANF@ -GNULIB_FSEEK = @GNULIB_FSEEK@ -GNULIB_FSEEKO = @GNULIB_FSEEKO@ -GNULIB_FSTAT = @GNULIB_FSTAT@ -GNULIB_FSTATAT = @GNULIB_FSTATAT@ -GNULIB_FSYNC = @GNULIB_FSYNC@ -GNULIB_FTELL = @GNULIB_FTELL@ -GNULIB_FTELLO = @GNULIB_FTELLO@ -GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@ -GNULIB_FUTIMENS = @GNULIB_FUTIMENS@ -GNULIB_FWRITE = @GNULIB_FWRITE@ -GNULIB_GETADDRINFO = @GNULIB_GETADDRINFO@ -GNULIB_GETC = @GNULIB_GETC@ -GNULIB_GETCHAR = @GNULIB_GETCHAR@ -GNULIB_GETCWD = @GNULIB_GETCWD@ -GNULIB_GETDELIM = @GNULIB_GETDELIM@ -GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@ -GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@ -GNULIB_GETGROUPS = @GNULIB_GETGROUPS@ -GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@ -GNULIB_GETLINE = @GNULIB_GETLINE@ -GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@ -GNULIB_GETLOGIN = @GNULIB_GETLOGIN@ -GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ -GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ -GNULIB_GETPEERNAME = @GNULIB_GETPEERNAME@ -GNULIB_GETRUSAGE = @GNULIB_GETRUSAGE@ -GNULIB_GETSOCKNAME = @GNULIB_GETSOCKNAME@ -GNULIB_GETSOCKOPT = @GNULIB_GETSOCKOPT@ -GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@ -GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ -GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ -GNULIB_GL_UNISTD_H_GETOPT = @GNULIB_GL_UNISTD_H_GETOPT@ -GNULIB_GRANTPT = @GNULIB_GRANTPT@ -GNULIB_GROUP_MEMBER = @GNULIB_GROUP_MEMBER@ -GNULIB_HYPOT = @GNULIB_HYPOT@ -GNULIB_HYPOTF = @GNULIB_HYPOTF@ -GNULIB_HYPOTL = @GNULIB_HYPOTL@ -GNULIB_ICONV = @GNULIB_ICONV@ -GNULIB_ILOGB = @GNULIB_ILOGB@ -GNULIB_ILOGBF = @GNULIB_ILOGBF@ -GNULIB_ILOGBL = @GNULIB_ILOGBL@ -GNULIB_IMAXABS = @GNULIB_IMAXABS@ -GNULIB_IMAXDIV = @GNULIB_IMAXDIV@ -GNULIB_INET_NTOP = @GNULIB_INET_NTOP@ -GNULIB_INET_PTON = @GNULIB_INET_PTON@ -GNULIB_IOCTL = @GNULIB_IOCTL@ -GNULIB_ISATTY = @GNULIB_ISATTY@ -GNULIB_ISBLANK = @GNULIB_ISBLANK@ -GNULIB_ISFINITE = @GNULIB_ISFINITE@ -GNULIB_ISINF = @GNULIB_ISINF@ -GNULIB_ISNAN = @GNULIB_ISNAN@ -GNULIB_ISNAND = @GNULIB_ISNAND@ -GNULIB_ISNANF = @GNULIB_ISNANF@ -GNULIB_ISNANL = @GNULIB_ISNANL@ -GNULIB_ISWBLANK = @GNULIB_ISWBLANK@ -GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@ -GNULIB_LCHMOD = @GNULIB_LCHMOD@ -GNULIB_LCHOWN = @GNULIB_LCHOWN@ -GNULIB_LDEXPF = @GNULIB_LDEXPF@ -GNULIB_LDEXPL = @GNULIB_LDEXPL@ -GNULIB_LINK = @GNULIB_LINK@ -GNULIB_LINKAT = @GNULIB_LINKAT@ -GNULIB_LISTEN = @GNULIB_LISTEN@ -GNULIB_LOCALECONV = @GNULIB_LOCALECONV@ -GNULIB_LOG = @GNULIB_LOG@ -GNULIB_LOG10 = @GNULIB_LOG10@ -GNULIB_LOG10F = @GNULIB_LOG10F@ -GNULIB_LOG10L = @GNULIB_LOG10L@ -GNULIB_LOG1P = @GNULIB_LOG1P@ -GNULIB_LOG1PF = @GNULIB_LOG1PF@ -GNULIB_LOG1PL = @GNULIB_LOG1PL@ -GNULIB_LOG2 = @GNULIB_LOG2@ -GNULIB_LOG2F = @GNULIB_LOG2F@ -GNULIB_LOG2L = @GNULIB_LOG2L@ -GNULIB_LOGB = @GNULIB_LOGB@ -GNULIB_LOGBF = @GNULIB_LOGBF@ -GNULIB_LOGBL = @GNULIB_LOGBL@ -GNULIB_LOGF = @GNULIB_LOGF@ -GNULIB_LOGL = @GNULIB_LOGL@ -GNULIB_LSEEK = @GNULIB_LSEEK@ -GNULIB_LSTAT = @GNULIB_LSTAT@ -GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ -GNULIB_MBRLEN = @GNULIB_MBRLEN@ -GNULIB_MBRTOWC = @GNULIB_MBRTOWC@ -GNULIB_MBSCASECMP = @GNULIB_MBSCASECMP@ -GNULIB_MBSCASESTR = @GNULIB_MBSCASESTR@ -GNULIB_MBSCHR = @GNULIB_MBSCHR@ -GNULIB_MBSCSPN = @GNULIB_MBSCSPN@ -GNULIB_MBSINIT = @GNULIB_MBSINIT@ -GNULIB_MBSLEN = @GNULIB_MBSLEN@ -GNULIB_MBSNCASECMP = @GNULIB_MBSNCASECMP@ -GNULIB_MBSNLEN = @GNULIB_MBSNLEN@ -GNULIB_MBSNRTOWCS = @GNULIB_MBSNRTOWCS@ -GNULIB_MBSPBRK = @GNULIB_MBSPBRK@ -GNULIB_MBSPCASECMP = @GNULIB_MBSPCASECMP@ -GNULIB_MBSRCHR = @GNULIB_MBSRCHR@ -GNULIB_MBSRTOWCS = @GNULIB_MBSRTOWCS@ -GNULIB_MBSSEP = @GNULIB_MBSSEP@ -GNULIB_MBSSPN = @GNULIB_MBSSPN@ -GNULIB_MBSSTR = @GNULIB_MBSSTR@ -GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@ -GNULIB_MBTOWC = @GNULIB_MBTOWC@ -GNULIB_MEMCHR = @GNULIB_MEMCHR@ -GNULIB_MEMMEM = @GNULIB_MEMMEM@ -GNULIB_MEMPCPY = @GNULIB_MEMPCPY@ -GNULIB_MEMRCHR = @GNULIB_MEMRCHR@ -GNULIB_MKDIRAT = @GNULIB_MKDIRAT@ -GNULIB_MKDTEMP = @GNULIB_MKDTEMP@ -GNULIB_MKFIFO = @GNULIB_MKFIFO@ -GNULIB_MKFIFOAT = @GNULIB_MKFIFOAT@ -GNULIB_MKNOD = @GNULIB_MKNOD@ -GNULIB_MKNODAT = @GNULIB_MKNODAT@ -GNULIB_MKOSTEMP = @GNULIB_MKOSTEMP@ -GNULIB_MKOSTEMPS = @GNULIB_MKOSTEMPS@ -GNULIB_MKSTEMP = @GNULIB_MKSTEMP@ -GNULIB_MKSTEMPS = @GNULIB_MKSTEMPS@ -GNULIB_MKTIME = @GNULIB_MKTIME@ -GNULIB_MODF = @GNULIB_MODF@ -GNULIB_MODFF = @GNULIB_MODFF@ -GNULIB_MODFL = @GNULIB_MODFL@ -GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@ -GNULIB_NL_LANGINFO = @GNULIB_NL_LANGINFO@ -GNULIB_NONBLOCKING = @GNULIB_NONBLOCKING@ -GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@ -GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ -GNULIB_OPEN = @GNULIB_OPEN@ -GNULIB_OPENAT = @GNULIB_OPENAT@ -GNULIB_OPENDIR = @GNULIB_OPENDIR@ -GNULIB_PCLOSE = @GNULIB_PCLOSE@ -GNULIB_PERROR = @GNULIB_PERROR@ -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@ -GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@ -GNULIB_PSELECT = @GNULIB_PSELECT@ -GNULIB_PTHREAD_SIGMASK = @GNULIB_PTHREAD_SIGMASK@ -GNULIB_PTSNAME = @GNULIB_PTSNAME@ -GNULIB_PTSNAME_R = @GNULIB_PTSNAME_R@ -GNULIB_PUTC = @GNULIB_PUTC@ -GNULIB_PUTCHAR = @GNULIB_PUTCHAR@ -GNULIB_PUTENV = @GNULIB_PUTENV@ -GNULIB_PUTS = @GNULIB_PUTS@ -GNULIB_PWRITE = @GNULIB_PWRITE@ -GNULIB_RAISE = @GNULIB_RAISE@ -GNULIB_RANDOM = @GNULIB_RANDOM@ -GNULIB_RANDOM_R = @GNULIB_RANDOM_R@ -GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ -GNULIB_READ = @GNULIB_READ@ -GNULIB_READDIR = @GNULIB_READDIR@ -GNULIB_READLINK = @GNULIB_READLINK@ -GNULIB_READLINKAT = @GNULIB_READLINKAT@ -GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@ -GNULIB_REALPATH = @GNULIB_REALPATH@ -GNULIB_RECV = @GNULIB_RECV@ -GNULIB_RECVFROM = @GNULIB_RECVFROM@ -GNULIB_REMAINDER = @GNULIB_REMAINDER@ -GNULIB_REMAINDERF = @GNULIB_REMAINDERF@ -GNULIB_REMAINDERL = @GNULIB_REMAINDERL@ -GNULIB_REMOVE = @GNULIB_REMOVE@ -GNULIB_RENAME = @GNULIB_RENAME@ -GNULIB_RENAMEAT = @GNULIB_RENAMEAT@ -GNULIB_REWINDDIR = @GNULIB_REWINDDIR@ -GNULIB_RINT = @GNULIB_RINT@ -GNULIB_RINTF = @GNULIB_RINTF@ -GNULIB_RINTL = @GNULIB_RINTL@ -GNULIB_RMDIR = @GNULIB_RMDIR@ -GNULIB_ROUND = @GNULIB_ROUND@ -GNULIB_ROUNDF = @GNULIB_ROUNDF@ -GNULIB_ROUNDL = @GNULIB_ROUNDL@ -GNULIB_RPMATCH = @GNULIB_RPMATCH@ -GNULIB_SCANDIR = @GNULIB_SCANDIR@ -GNULIB_SCANF = @GNULIB_SCANF@ -GNULIB_SELECT = @GNULIB_SELECT@ -GNULIB_SEND = @GNULIB_SEND@ -GNULIB_SENDTO = @GNULIB_SENDTO@ -GNULIB_SETENV = @GNULIB_SETENV@ -GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@ -GNULIB_SETLOCALE = @GNULIB_SETLOCALE@ -GNULIB_SETSOCKOPT = @GNULIB_SETSOCKOPT@ -GNULIB_SHUTDOWN = @GNULIB_SHUTDOWN@ -GNULIB_SIGACTION = @GNULIB_SIGACTION@ -GNULIB_SIGNAL_H_SIGPIPE = @GNULIB_SIGNAL_H_SIGPIPE@ -GNULIB_SIGNBIT = @GNULIB_SIGNBIT@ -GNULIB_SIGPROCMASK = @GNULIB_SIGPROCMASK@ -GNULIB_SINF = @GNULIB_SINF@ -GNULIB_SINHF = @GNULIB_SINHF@ -GNULIB_SINL = @GNULIB_SINL@ -GNULIB_SLEEP = @GNULIB_SLEEP@ -GNULIB_SNPRINTF = @GNULIB_SNPRINTF@ -GNULIB_SOCKET = @GNULIB_SOCKET@ -GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@ -GNULIB_SQRTF = @GNULIB_SQRTF@ -GNULIB_SQRTL = @GNULIB_SQRTL@ -GNULIB_STAT = @GNULIB_STAT@ -GNULIB_STDIO_H_NONBLOCKING = @GNULIB_STDIO_H_NONBLOCKING@ -GNULIB_STDIO_H_SIGPIPE = @GNULIB_STDIO_H_SIGPIPE@ -GNULIB_STPCPY = @GNULIB_STPCPY@ -GNULIB_STPNCPY = @GNULIB_STPNCPY@ -GNULIB_STRCASESTR = @GNULIB_STRCASESTR@ -GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@ -GNULIB_STRDUP = @GNULIB_STRDUP@ -GNULIB_STRERROR = @GNULIB_STRERROR@ -GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ -GNULIB_STRNCAT = @GNULIB_STRNCAT@ -GNULIB_STRNDUP = @GNULIB_STRNDUP@ -GNULIB_STRNLEN = @GNULIB_STRNLEN@ -GNULIB_STRPBRK = @GNULIB_STRPBRK@ -GNULIB_STRPTIME = @GNULIB_STRPTIME@ -GNULIB_STRSEP = @GNULIB_STRSEP@ -GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@ -GNULIB_STRSTR = @GNULIB_STRSTR@ -GNULIB_STRTOD = @GNULIB_STRTOD@ -GNULIB_STRTOIMAX = @GNULIB_STRTOIMAX@ -GNULIB_STRTOK_R = @GNULIB_STRTOK_R@ -GNULIB_STRTOLL = @GNULIB_STRTOLL@ -GNULIB_STRTOULL = @GNULIB_STRTOULL@ -GNULIB_STRTOUMAX = @GNULIB_STRTOUMAX@ -GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@ -GNULIB_SYMLINK = @GNULIB_SYMLINK@ -GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@ -GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@ -GNULIB_TANF = @GNULIB_TANF@ -GNULIB_TANHF = @GNULIB_TANHF@ -GNULIB_TANL = @GNULIB_TANL@ -GNULIB_TCGETSID = @GNULIB_TCGETSID@ -GNULIB_TEST_WARN_CFLAGS = @GNULIB_TEST_WARN_CFLAGS@ -GNULIB_TIMEGM = @GNULIB_TIMEGM@ -GNULIB_TIME_R = @GNULIB_TIME_R@ -GNULIB_TMPFILE = @GNULIB_TMPFILE@ -GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@ -GNULIB_TRUNC = @GNULIB_TRUNC@ -GNULIB_TRUNCF = @GNULIB_TRUNCF@ -GNULIB_TRUNCL = @GNULIB_TRUNCL@ -GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@ -GNULIB_UNAME = @GNULIB_UNAME@ -GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@ -GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ -GNULIB_UNLINK = @GNULIB_UNLINK@ -GNULIB_UNLINKAT = @GNULIB_UNLINKAT@ -GNULIB_UNLOCKPT = @GNULIB_UNLOCKPT@ -GNULIB_UNSETENV = @GNULIB_UNSETENV@ -GNULIB_USLEEP = @GNULIB_USLEEP@ -GNULIB_UTIMENSAT = @GNULIB_UTIMENSAT@ -GNULIB_VASPRINTF = @GNULIB_VASPRINTF@ -GNULIB_VDPRINTF = @GNULIB_VDPRINTF@ -GNULIB_VFPRINTF = @GNULIB_VFPRINTF@ -GNULIB_VFPRINTF_POSIX = @GNULIB_VFPRINTF_POSIX@ -GNULIB_VFSCANF = @GNULIB_VFSCANF@ -GNULIB_VPRINTF = @GNULIB_VPRINTF@ -GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@ -GNULIB_VSCANF = @GNULIB_VSCANF@ -GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@ -GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@ -GNULIB_WAITPID = @GNULIB_WAITPID@ -GNULIB_WARN_CFLAGS = @GNULIB_WARN_CFLAGS@ -GNULIB_WCPCPY = @GNULIB_WCPCPY@ -GNULIB_WCPNCPY = @GNULIB_WCPNCPY@ -GNULIB_WCRTOMB = @GNULIB_WCRTOMB@ -GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@ -GNULIB_WCSCAT = @GNULIB_WCSCAT@ -GNULIB_WCSCHR = @GNULIB_WCSCHR@ -GNULIB_WCSCMP = @GNULIB_WCSCMP@ -GNULIB_WCSCOLL = @GNULIB_WCSCOLL@ -GNULIB_WCSCPY = @GNULIB_WCSCPY@ -GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ -GNULIB_WCSDUP = @GNULIB_WCSDUP@ -GNULIB_WCSLEN = @GNULIB_WCSLEN@ -GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ -GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ -GNULIB_WCSNCMP = @GNULIB_WCSNCMP@ -GNULIB_WCSNCPY = @GNULIB_WCSNCPY@ -GNULIB_WCSNLEN = @GNULIB_WCSNLEN@ -GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@ -GNULIB_WCSPBRK = @GNULIB_WCSPBRK@ -GNULIB_WCSRCHR = @GNULIB_WCSRCHR@ -GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@ -GNULIB_WCSSPN = @GNULIB_WCSSPN@ -GNULIB_WCSSTR = @GNULIB_WCSSTR@ -GNULIB_WCSTOK = @GNULIB_WCSTOK@ -GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@ -GNULIB_WCSXFRM = @GNULIB_WCSXFRM@ -GNULIB_WCTOB = @GNULIB_WCTOB@ -GNULIB_WCTOMB = @GNULIB_WCTOMB@ -GNULIB_WCTRANS = @GNULIB_WCTRANS@ -GNULIB_WCTYPE = @GNULIB_WCTYPE@ -GNULIB_WCWIDTH = @GNULIB_WCWIDTH@ -GNULIB_WMEMCHR = @GNULIB_WMEMCHR@ -GNULIB_WMEMCMP = @GNULIB_WMEMCMP@ -GNULIB_WMEMCPY = @GNULIB_WMEMCPY@ -GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@ -GNULIB_WMEMSET = @GNULIB_WMEMSET@ -GNULIB_WRITE = @GNULIB_WRITE@ -GNULIB__EXIT = @GNULIB__EXIT@ -GREP = @GREP@ -HAVE_ACCEPT4 = @HAVE_ACCEPT4@ -HAVE_ACOSF = @HAVE_ACOSF@ -HAVE_ACOSL = @HAVE_ACOSL@ -HAVE_ALPHASORT = @HAVE_ALPHASORT@ -HAVE_ARPA_INET_H = @HAVE_ARPA_INET_H@ -HAVE_ASINF = @HAVE_ASINF@ -HAVE_ASINL = @HAVE_ASINL@ -HAVE_ATAN2F = @HAVE_ATAN2F@ -HAVE_ATANF = @HAVE_ATANF@ -HAVE_ATANL = @HAVE_ATANL@ -HAVE_ATOLL = @HAVE_ATOLL@ -HAVE_BTOWC = @HAVE_BTOWC@ -HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ -HAVE_CBRT = @HAVE_CBRT@ -HAVE_CBRTF = @HAVE_CBRTF@ -HAVE_CBRTL = @HAVE_CBRTL@ -HAVE_CHOWN = @HAVE_CHOWN@ -HAVE_CLOSEDIR = @HAVE_CLOSEDIR@ -HAVE_COPYSIGN = @HAVE_COPYSIGN@ -HAVE_COPYSIGNL = @HAVE_COPYSIGNL@ -HAVE_COSF = @HAVE_COSF@ -HAVE_COSHF = @HAVE_COSHF@ -HAVE_COSL = @HAVE_COSL@ -HAVE_DECL_ACOSL = @HAVE_DECL_ACOSL@ -HAVE_DECL_ASINL = @HAVE_DECL_ASINL@ -HAVE_DECL_ATANL = @HAVE_DECL_ATANL@ -HAVE_DECL_CBRTF = @HAVE_DECL_CBRTF@ -HAVE_DECL_CBRTL = @HAVE_DECL_CBRTL@ -HAVE_DECL_CEILF = @HAVE_DECL_CEILF@ -HAVE_DECL_CEILL = @HAVE_DECL_CEILL@ -HAVE_DECL_COPYSIGNF = @HAVE_DECL_COPYSIGNF@ -HAVE_DECL_COSL = @HAVE_DECL_COSL@ -HAVE_DECL_DIRFD = @HAVE_DECL_DIRFD@ -HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ -HAVE_DECL_EXP2 = @HAVE_DECL_EXP2@ -HAVE_DECL_EXP2F = @HAVE_DECL_EXP2F@ -HAVE_DECL_EXP2L = @HAVE_DECL_EXP2L@ -HAVE_DECL_EXPL = @HAVE_DECL_EXPL@ -HAVE_DECL_EXPM1L = @HAVE_DECL_EXPM1L@ -HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ -HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@ -HAVE_DECL_FDOPENDIR = @HAVE_DECL_FDOPENDIR@ -HAVE_DECL_FLOORF = @HAVE_DECL_FLOORF@ -HAVE_DECL_FLOORL = @HAVE_DECL_FLOORL@ -HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@ -HAVE_DECL_FREEADDRINFO = @HAVE_DECL_FREEADDRINFO@ -HAVE_DECL_FREXPL = @HAVE_DECL_FREXPL@ -HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@ -HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@ -HAVE_DECL_GAI_STRERROR = @HAVE_DECL_GAI_STRERROR@ -HAVE_DECL_GETADDRINFO = @HAVE_DECL_GETADDRINFO@ -HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@ -HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ -HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ -HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@ -HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ -HAVE_DECL_GETNAMEINFO = @HAVE_DECL_GETNAMEINFO@ -HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ -HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ -HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ -HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ -HAVE_DECL_INET_NTOP = @HAVE_DECL_INET_NTOP@ -HAVE_DECL_INET_PTON = @HAVE_DECL_INET_PTON@ -HAVE_DECL_LDEXPL = @HAVE_DECL_LDEXPL@ -HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@ -HAVE_DECL_LOG10L = @HAVE_DECL_LOG10L@ -HAVE_DECL_LOG2 = @HAVE_DECL_LOG2@ -HAVE_DECL_LOG2F = @HAVE_DECL_LOG2F@ -HAVE_DECL_LOG2L = @HAVE_DECL_LOG2L@ -HAVE_DECL_LOGB = @HAVE_DECL_LOGB@ -HAVE_DECL_LOGL = @HAVE_DECL_LOGL@ -HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ -HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ -HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ -HAVE_DECL_REMAINDER = @HAVE_DECL_REMAINDER@ -HAVE_DECL_REMAINDERL = @HAVE_DECL_REMAINDERL@ -HAVE_DECL_RINTF = @HAVE_DECL_RINTF@ -HAVE_DECL_ROUND = @HAVE_DECL_ROUND@ -HAVE_DECL_ROUNDF = @HAVE_DECL_ROUNDF@ -HAVE_DECL_ROUNDL = @HAVE_DECL_ROUNDL@ -HAVE_DECL_SETENV = @HAVE_DECL_SETENV@ -HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@ -HAVE_DECL_SINL = @HAVE_DECL_SINL@ -HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@ -HAVE_DECL_SQRTL = @HAVE_DECL_SQRTL@ -HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ -HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@ -HAVE_DECL_STRNCASECMP = @HAVE_DECL_STRNCASECMP@ -HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@ -HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@ -HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ -HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ -HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ -HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ -HAVE_DECL_TANL = @HAVE_DECL_TANL@ -HAVE_DECL_TCGETSID = @HAVE_DECL_TCGETSID@ -HAVE_DECL_TRUNC = @HAVE_DECL_TRUNC@ -HAVE_DECL_TRUNCF = @HAVE_DECL_TRUNCF@ -HAVE_DECL_TRUNCL = @HAVE_DECL_TRUNCL@ -HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ -HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ -HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ -HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ -HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ -HAVE_DIRENT_H = @HAVE_DIRENT_H@ -HAVE_DPRINTF = @HAVE_DPRINTF@ -HAVE_DUP2 = @HAVE_DUP2@ -HAVE_DUP3 = @HAVE_DUP3@ -HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ -HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ -HAVE_EXPF = @HAVE_EXPF@ -HAVE_EXPL = @HAVE_EXPL@ -HAVE_EXPM1 = @HAVE_EXPM1@ -HAVE_EXPM1F = @HAVE_EXPM1F@ -HAVE_FABSF = @HAVE_FABSF@ -HAVE_FABSL = @HAVE_FABSL@ -HAVE_FACCESSAT = @HAVE_FACCESSAT@ -HAVE_FCHDIR = @HAVE_FCHDIR@ -HAVE_FCHMODAT = @HAVE_FCHMODAT@ -HAVE_FCHOWNAT = @HAVE_FCHOWNAT@ -HAVE_FCNTL = @HAVE_FCNTL@ -HAVE_FDATASYNC = @HAVE_FDATASYNC@ -HAVE_FDOPENDIR = @HAVE_FDOPENDIR@ -HAVE_FEATURES_H = @HAVE_FEATURES_H@ -HAVE_FFS = @HAVE_FFS@ -HAVE_FFSL = @HAVE_FFSL@ -HAVE_FFSLL = @HAVE_FFSLL@ -HAVE_FMA = @HAVE_FMA@ -HAVE_FMAF = @HAVE_FMAF@ -HAVE_FMAL = @HAVE_FMAL@ -HAVE_FMODF = @HAVE_FMODF@ -HAVE_FMODL = @HAVE_FMODL@ -HAVE_FREXPF = @HAVE_FREXPF@ -HAVE_FSEEKO = @HAVE_FSEEKO@ -HAVE_FSTATAT = @HAVE_FSTATAT@ -HAVE_FSYNC = @HAVE_FSYNC@ -HAVE_FTELLO = @HAVE_FTELLO@ -HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ -HAVE_FUTIMENS = @HAVE_FUTIMENS@ -HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ -HAVE_GETGROUPS = @HAVE_GETGROUPS@ -HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@ -HAVE_GETLOGIN = @HAVE_GETLOGIN@ -HAVE_GETOPT_H = @HAVE_GETOPT_H@ -HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ -HAVE_GETRUSAGE = @HAVE_GETRUSAGE@ -HAVE_GETSUBOPT = @HAVE_GETSUBOPT@ -HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@ -HAVE_GRANTPT = @HAVE_GRANTPT@ -HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@ -HAVE_HYPOTF = @HAVE_HYPOTF@ -HAVE_HYPOTL = @HAVE_HYPOTL@ -HAVE_ILOGB = @HAVE_ILOGB@ -HAVE_ILOGBF = @HAVE_ILOGBF@ -HAVE_ILOGBL = @HAVE_ILOGBL@ -HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ -HAVE_ISBLANK = @HAVE_ISBLANK@ -HAVE_ISNAND = @HAVE_ISNAND@ -HAVE_ISNANF = @HAVE_ISNANF@ -HAVE_ISNANL = @HAVE_ISNANL@ -HAVE_ISWBLANK = @HAVE_ISWBLANK@ -HAVE_ISWCNTRL = @HAVE_ISWCNTRL@ -HAVE_LANGINFO_CODESET = @HAVE_LANGINFO_CODESET@ -HAVE_LANGINFO_ERA = @HAVE_LANGINFO_ERA@ -HAVE_LANGINFO_H = @HAVE_LANGINFO_H@ -HAVE_LANGINFO_T_FMT_AMPM = @HAVE_LANGINFO_T_FMT_AMPM@ -HAVE_LANGINFO_YESEXPR = @HAVE_LANGINFO_YESEXPR@ -HAVE_LCHMOD = @HAVE_LCHMOD@ -HAVE_LCHOWN = @HAVE_LCHOWN@ -HAVE_LDEXPF = @HAVE_LDEXPF@ -HAVE_LINK = @HAVE_LINK@ -HAVE_LINKAT = @HAVE_LINKAT@ -HAVE_LOG10F = @HAVE_LOG10F@ -HAVE_LOG10L = @HAVE_LOG10L@ -HAVE_LOG1P = @HAVE_LOG1P@ -HAVE_LOG1PF = @HAVE_LOG1PF@ -HAVE_LOG1PL = @HAVE_LOG1PL@ -HAVE_LOGBF = @HAVE_LOGBF@ -HAVE_LOGBL = @HAVE_LOGBL@ -HAVE_LOGF = @HAVE_LOGF@ -HAVE_LOGL = @HAVE_LOGL@ -HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ -HAVE_LSTAT = @HAVE_LSTAT@ -HAVE_MBRLEN = @HAVE_MBRLEN@ -HAVE_MBRTOWC = @HAVE_MBRTOWC@ -HAVE_MBSINIT = @HAVE_MBSINIT@ -HAVE_MBSLEN = @HAVE_MBSLEN@ -HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ -HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ -HAVE_MEMCHR = @HAVE_MEMCHR@ -HAVE_MEMPCPY = @HAVE_MEMPCPY@ -HAVE_MKDIRAT = @HAVE_MKDIRAT@ -HAVE_MKDTEMP = @HAVE_MKDTEMP@ -HAVE_MKFIFO = @HAVE_MKFIFO@ -HAVE_MKFIFOAT = @HAVE_MKFIFOAT@ -HAVE_MKNOD = @HAVE_MKNOD@ -HAVE_MKNODAT = @HAVE_MKNODAT@ -HAVE_MKOSTEMP = @HAVE_MKOSTEMP@ -HAVE_MKOSTEMPS = @HAVE_MKOSTEMPS@ -HAVE_MKSTEMP = @HAVE_MKSTEMP@ -HAVE_MKSTEMPS = @HAVE_MKSTEMPS@ -HAVE_MODFF = @HAVE_MODFF@ -HAVE_MODFL = @HAVE_MODFL@ -HAVE_MSVC_INVALID_PARAMETER_HANDLER = @HAVE_MSVC_INVALID_PARAMETER_HANDLER@ -HAVE_NANOSLEEP = @HAVE_NANOSLEEP@ -HAVE_NETDB_H = @HAVE_NETDB_H@ -HAVE_NETINET_IN_H = @HAVE_NETINET_IN_H@ -HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@ -HAVE_OPENAT = @HAVE_OPENAT@ -HAVE_OPENDIR = @HAVE_OPENDIR@ -HAVE_OS_H = @HAVE_OS_H@ -HAVE_PCLOSE = @HAVE_PCLOSE@ -HAVE_PIPE = @HAVE_PIPE@ -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@ -HAVE_PTHREAD_H = @HAVE_PTHREAD_H@ -HAVE_PTHREAD_SIGMASK = @HAVE_PTHREAD_SIGMASK@ -HAVE_PTHREAD_SPINLOCK_T = @HAVE_PTHREAD_SPINLOCK_T@ -HAVE_PTHREAD_T = @HAVE_PTHREAD_T@ -HAVE_PTSNAME = @HAVE_PTSNAME@ -HAVE_PTSNAME_R = @HAVE_PTSNAME_R@ -HAVE_PWRITE = @HAVE_PWRITE@ -HAVE_RAISE = @HAVE_RAISE@ -HAVE_RANDOM = @HAVE_RANDOM@ -HAVE_RANDOM_H = @HAVE_RANDOM_H@ -HAVE_RANDOM_R = @HAVE_RANDOM_R@ -HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@ -HAVE_READDIR = @HAVE_READDIR@ -HAVE_READLINK = @HAVE_READLINK@ -HAVE_READLINKAT = @HAVE_READLINKAT@ -HAVE_REALPATH = @HAVE_REALPATH@ -HAVE_REMAINDER = @HAVE_REMAINDER@ -HAVE_REMAINDERF = @HAVE_REMAINDERF@ -HAVE_RENAMEAT = @HAVE_RENAMEAT@ -HAVE_REWINDDIR = @HAVE_REWINDDIR@ -HAVE_RINT = @HAVE_RINT@ -HAVE_RINTL = @HAVE_RINTL@ -HAVE_RPMATCH = @HAVE_RPMATCH@ -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_SETENV = @HAVE_SETENV@ -HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@ -HAVE_SIGACTION = @HAVE_SIGACTION@ -HAVE_SIGHANDLER_T = @HAVE_SIGHANDLER_T@ -HAVE_SIGINFO_T = @HAVE_SIGINFO_T@ -HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ -HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@ -HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@ -HAVE_SIGSET_T = @HAVE_SIGSET_T@ -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@ -HAVE_STPCPY = @HAVE_STPCPY@ -HAVE_STPNCPY = @HAVE_STPNCPY@ -HAVE_STRCASECMP = @HAVE_STRCASECMP@ -HAVE_STRCASESTR = @HAVE_STRCASESTR@ -HAVE_STRCHRNUL = @HAVE_STRCHRNUL@ -HAVE_STRINGS_H = @HAVE_STRINGS_H@ -HAVE_STRPBRK = @HAVE_STRPBRK@ -HAVE_STRPTIME = @HAVE_STRPTIME@ -HAVE_STRSEP = @HAVE_STRSEP@ -HAVE_STRTOD = @HAVE_STRTOD@ -HAVE_STRTOLL = @HAVE_STRTOLL@ -HAVE_STRTOULL = @HAVE_STRTOULL@ -HAVE_STRUCT_ADDRINFO = @HAVE_STRUCT_ADDRINFO@ -HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@ -HAVE_STRUCT_SCHED_PARAM = @HAVE_STRUCT_SCHED_PARAM@ -HAVE_STRUCT_SIGACTION_SA_SIGACTION = @HAVE_STRUCT_SIGACTION_SA_SIGACTION@ -HAVE_STRUCT_SOCKADDR_STORAGE = @HAVE_STRUCT_SOCKADDR_STORAGE@ -HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY = @HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY@ -HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@ -HAVE_STRUCT_UTSNAME = @HAVE_STRUCT_UTSNAME@ -HAVE_STRVERSCMP = @HAVE_STRVERSCMP@ -HAVE_SYMLINK = @HAVE_SYMLINK@ -HAVE_SYMLINKAT = @HAVE_SYMLINKAT@ -HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@ -HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@ -HAVE_SYS_IOCTL_H = @HAVE_SYS_IOCTL_H@ -HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@ -HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ -HAVE_SYS_RESOURCE_H = @HAVE_SYS_RESOURCE_H@ -HAVE_SYS_SELECT_H = @HAVE_SYS_SELECT_H@ -HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ -HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ -HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ -HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ -HAVE_SYS_UTSNAME_H = @HAVE_SYS_UTSNAME_H@ -HAVE_TANF = @HAVE_TANF@ -HAVE_TANHF = @HAVE_TANHF@ -HAVE_TANL = @HAVE_TANL@ -HAVE_TERMIOS_H = @HAVE_TERMIOS_H@ -HAVE_TIMEGM = @HAVE_TIMEGM@ -HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ -HAVE_UNAME = @HAVE_UNAME@ -HAVE_UNISTD_H = @HAVE_UNISTD_H@ -HAVE_UNLINKAT = @HAVE_UNLINKAT@ -HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ -HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ -HAVE_USLEEP = @HAVE_USLEEP@ -HAVE_UTIMENSAT = @HAVE_UTIMENSAT@ -HAVE_VASPRINTF = @HAVE_VASPRINTF@ -HAVE_VDPRINTF = @HAVE_VDPRINTF@ -HAVE_WCHAR_H = @HAVE_WCHAR_H@ -HAVE_WCHAR_T = @HAVE_WCHAR_T@ -HAVE_WCPCPY = @HAVE_WCPCPY@ -HAVE_WCPNCPY = @HAVE_WCPNCPY@ -HAVE_WCRTOMB = @HAVE_WCRTOMB@ -HAVE_WCSCASECMP = @HAVE_WCSCASECMP@ -HAVE_WCSCAT = @HAVE_WCSCAT@ -HAVE_WCSCHR = @HAVE_WCSCHR@ -HAVE_WCSCMP = @HAVE_WCSCMP@ -HAVE_WCSCOLL = @HAVE_WCSCOLL@ -HAVE_WCSCPY = @HAVE_WCSCPY@ -HAVE_WCSCSPN = @HAVE_WCSCSPN@ -HAVE_WCSDUP = @HAVE_WCSDUP@ -HAVE_WCSLEN = @HAVE_WCSLEN@ -HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@ -HAVE_WCSNCAT = @HAVE_WCSNCAT@ -HAVE_WCSNCMP = @HAVE_WCSNCMP@ -HAVE_WCSNCPY = @HAVE_WCSNCPY@ -HAVE_WCSNLEN = @HAVE_WCSNLEN@ -HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@ -HAVE_WCSPBRK = @HAVE_WCSPBRK@ -HAVE_WCSRCHR = @HAVE_WCSRCHR@ -HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@ -HAVE_WCSSPN = @HAVE_WCSSPN@ -HAVE_WCSSTR = @HAVE_WCSSTR@ -HAVE_WCSTOK = @HAVE_WCSTOK@ -HAVE_WCSWIDTH = @HAVE_WCSWIDTH@ -HAVE_WCSXFRM = @HAVE_WCSXFRM@ -HAVE_WCTRANS_T = @HAVE_WCTRANS_T@ -HAVE_WCTYPE_H = @HAVE_WCTYPE_H@ -HAVE_WCTYPE_T = @HAVE_WCTYPE_T@ -HAVE_WINSOCK2_H = @HAVE_WINSOCK2_H@ -HAVE_WINT_T = @HAVE_WINT_T@ -HAVE_WMEMCHR = @HAVE_WMEMCHR@ -HAVE_WMEMCMP = @HAVE_WMEMCMP@ -HAVE_WMEMCPY = @HAVE_WMEMCPY@ -HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ -HAVE_WMEMSET = @HAVE_WMEMSET@ -HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@ -HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ -HAVE__BOOL = @HAVE__BOOL@ -HAVE__EXIT = @HAVE__EXIT@ -HELP2MAN = @HELP2MAN@ -HOSTENT_LIB = @HOSTENT_LIB@ -ICONV_CONST = @ICONV_CONST@ -ICONV_H = @ICONV_H@ -IGNORE_UNUSED_LIBRARIES_CFLAGS = @IGNORE_UNUSED_LIBRARIES_CFLAGS@ -INCLUDE_NEXT = @INCLUDE_NEXT@ -INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@ -INET_NTOP_LIB = @INET_NTOP_LIB@ -INET_PTON_LIB = @INET_PTON_LIB@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTALL_SU = @INSTALL_SU@ -INT32_MAX_LT_INTMAX_MAX = @INT32_MAX_LT_INTMAX_MAX@ -INT64_MAX_EQ_LONG_MAX = @INT64_MAX_EQ_LONG_MAX@ -INTLLIBS = @INTLLIBS@ -INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ -LDFLAGS = @LDFLAGS@ -LIBCOREUTILS_LIBDEPS = @LIBCOREUTILS_LIBDEPS@ -LIBCOREUTILS_LTLIBDEPS = @LIBCOREUTILS_LTLIBDEPS@ -LIBICONV = @LIBICONV@ -LIBINTL = @LIBINTL@ -LIBMULTITHREAD = @LIBMULTITHREAD@ -LIBOBJS = @LIBOBJS@ -LIBPTH = @LIBPTH@ -LIBPTH_PREFIX = @LIBPTH_PREFIX@ -LIBS = @LIBS@ -LIBSOCKET = @LIBSOCKET@ -LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@ -LIBTHREAD = @LIBTHREAD@ -LIBUNISTRING_UNISTR_H = @LIBUNISTRING_UNISTR_H@ -LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@ -LIBUNISTRING_UNIWIDTH_H = @LIBUNISTRING_UNIWIDTH_H@ -LIB_ACL = @LIB_ACL@ -LIB_CAP = @LIB_CAP@ -LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ -LIB_CRYPT = @LIB_CRYPT@ -LIB_EACCESS = @LIB_EACCESS@ -LIB_FDATASYNC = @LIB_FDATASYNC@ -LIB_GETHRXTIME = @LIB_GETHRXTIME@ -LIB_GMP = @LIB_GMP@ -LIB_NANOSLEEP = @LIB_NANOSLEEP@ -LIB_PTHREAD = @LIB_PTHREAD@ -LIB_SELECT = @LIB_SELECT@ -LIB_SELINUX = @LIB_SELINUX@ -LIB_TIMER_TIME = @LIB_TIMER_TIME@ -LIB_XATTR = @LIB_XATTR@ -LN_S = @LN_S@ -LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@ -LOCALE_FR = @LOCALE_FR@ -LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@ -LOCALE_JA = @LOCALE_JA@ -LOCALE_TR_UTF8 = @LOCALE_TR_UTF8@ -LOCALE_ZH_CN = @LOCALE_ZH_CN@ -LTLIBICONV = @LTLIBICONV@ -LTLIBINTL = @LTLIBINTL@ -LTLIBMULTITHREAD = @LTLIBMULTITHREAD@ -LTLIBOBJS = @LTLIBOBJS@ -LTLIBPTH = @LTLIBPTH@ -LTLIBTHREAD = @LTLIBTHREAD@ -MAKEINFO = @MAKEINFO@ -MAN = @MAN@ -MKDIR_P = @MKDIR_P@ -MSGFMT = @MSGFMT@ -MSGFMT_015 = @MSGFMT_015@ -MSGMERGE = @MSGMERGE@ -NETINET_IN_H = @NETINET_IN_H@ -NEXT_ARPA_INET_H = @NEXT_ARPA_INET_H@ -NEXT_AS_FIRST_DIRECTIVE_ARPA_INET_H = @NEXT_AS_FIRST_DIRECTIVE_ARPA_INET_H@ -NEXT_AS_FIRST_DIRECTIVE_CTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_CTYPE_H@ -NEXT_AS_FIRST_DIRECTIVE_DIRENT_H = @NEXT_AS_FIRST_DIRECTIVE_DIRENT_H@ -NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@ -NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@ -NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@ -NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ -NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@ -NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@ -NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@ -NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@ -NEXT_AS_FIRST_DIRECTIVE_MATH_H = @NEXT_AS_FIRST_DIRECTIVE_MATH_H@ -NEXT_AS_FIRST_DIRECTIVE_NETDB_H = @NEXT_AS_FIRST_DIRECTIVE_NETDB_H@ -NEXT_AS_FIRST_DIRECTIVE_NETINET_IN_H = @NEXT_AS_FIRST_DIRECTIVE_NETINET_IN_H@ -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@ -NEXT_AS_FIRST_DIRECTIVE_STDIO_H = @NEXT_AS_FIRST_DIRECTIVE_STDIO_H@ -NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@ -NEXT_AS_FIRST_DIRECTIVE_STRINGS_H = @NEXT_AS_FIRST_DIRECTIVE_STRINGS_H@ -NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_IOCTL_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_IOCTL_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_RESOURCE_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_RESOURCE_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_UTSNAME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UTSNAME_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H@ -NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H = @NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H@ -NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ -NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ -NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@ -NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@ -NEXT_CTYPE_H = @NEXT_CTYPE_H@ -NEXT_DIRENT_H = @NEXT_DIRENT_H@ -NEXT_ERRNO_H = @NEXT_ERRNO_H@ -NEXT_FCNTL_H = @NEXT_FCNTL_H@ -NEXT_FLOAT_H = @NEXT_FLOAT_H@ -NEXT_GETOPT_H = @NEXT_GETOPT_H@ -NEXT_ICONV_H = @NEXT_ICONV_H@ -NEXT_INTTYPES_H = @NEXT_INTTYPES_H@ -NEXT_LANGINFO_H = @NEXT_LANGINFO_H@ -NEXT_LOCALE_H = @NEXT_LOCALE_H@ -NEXT_MATH_H = @NEXT_MATH_H@ -NEXT_NETDB_H = @NEXT_NETDB_H@ -NEXT_NETINET_IN_H = @NEXT_NETINET_IN_H@ -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@ -NEXT_STDIO_H = @NEXT_STDIO_H@ -NEXT_STDLIB_H = @NEXT_STDLIB_H@ -NEXT_STRINGS_H = @NEXT_STRINGS_H@ -NEXT_STRING_H = @NEXT_STRING_H@ -NEXT_SYS_IOCTL_H = @NEXT_SYS_IOCTL_H@ -NEXT_SYS_RESOURCE_H = @NEXT_SYS_RESOURCE_H@ -NEXT_SYS_SELECT_H = @NEXT_SYS_SELECT_H@ -NEXT_SYS_SOCKET_H = @NEXT_SYS_SOCKET_H@ -NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ -NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@ -NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ -NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ -NEXT_SYS_UTSNAME_H = @NEXT_SYS_UTSNAME_H@ -NEXT_SYS_WAIT_H = @NEXT_SYS_WAIT_H@ -NEXT_TERMIOS_H = @NEXT_TERMIOS_H@ -NEXT_TIME_H = @NEXT_TIME_H@ -NEXT_UNISTD_H = @NEXT_UNISTD_H@ -NEXT_WCHAR_H = @NEXT_WCHAR_H@ -NEXT_WCTYPE_H = @NEXT_WCTYPE_H@ -NO_INSTALL_PROGS_DEFAULT = @NO_INSTALL_PROGS_DEFAULT@ -OBJEXT = @OBJEXT@ -OPTIONAL_BIN_PROGS = @OPTIONAL_BIN_PROGS@ -OPTIONAL_PKGLIB_PROGS = @OPTIONAL_PKGLIB_PROGS@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL = @PERL@ -POSIX_SHELL = @POSIX_SHELL@ -POSUB = @POSUB@ -PRAGMA_COLUMNS = @PRAGMA_COLUMNS@ -PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ -PREFERABLY_POSIX_SHELL = @PREFERABLY_POSIX_SHELL@ -PRIPTR_PREFIX = @PRIPTR_PREFIX@ -PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ -PTHREAD_H = @PTHREAD_H@ -PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ -PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ -RANLIB = @RANLIB@ -REPLACE_BTOWC = @REPLACE_BTOWC@ -REPLACE_CALLOC = @REPLACE_CALLOC@ -REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ -REPLACE_CBRTF = @REPLACE_CBRTF@ -REPLACE_CBRTL = @REPLACE_CBRTL@ -REPLACE_CEIL = @REPLACE_CEIL@ -REPLACE_CEILF = @REPLACE_CEILF@ -REPLACE_CEILL = @REPLACE_CEILL@ -REPLACE_CHOWN = @REPLACE_CHOWN@ -REPLACE_CLOSE = @REPLACE_CLOSE@ -REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@ -REPLACE_DIRFD = @REPLACE_DIRFD@ -REPLACE_DPRINTF = @REPLACE_DPRINTF@ -REPLACE_DUP = @REPLACE_DUP@ -REPLACE_DUP2 = @REPLACE_DUP2@ -REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@ -REPLACE_EXP2 = @REPLACE_EXP2@ -REPLACE_EXP2L = @REPLACE_EXP2L@ -REPLACE_EXPM1 = @REPLACE_EXPM1@ -REPLACE_EXPM1F = @REPLACE_EXPM1F@ -REPLACE_FABSL = @REPLACE_FABSL@ -REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ -REPLACE_FCLOSE = @REPLACE_FCLOSE@ -REPLACE_FCNTL = @REPLACE_FCNTL@ -REPLACE_FDOPEN = @REPLACE_FDOPEN@ -REPLACE_FDOPENDIR = @REPLACE_FDOPENDIR@ -REPLACE_FFLUSH = @REPLACE_FFLUSH@ -REPLACE_FLOOR = @REPLACE_FLOOR@ -REPLACE_FLOORF = @REPLACE_FLOORF@ -REPLACE_FLOORL = @REPLACE_FLOORL@ -REPLACE_FMA = @REPLACE_FMA@ -REPLACE_FMAF = @REPLACE_FMAF@ -REPLACE_FMAL = @REPLACE_FMAL@ -REPLACE_FMOD = @REPLACE_FMOD@ -REPLACE_FMODF = @REPLACE_FMODF@ -REPLACE_FMODL = @REPLACE_FMODL@ -REPLACE_FOPEN = @REPLACE_FOPEN@ -REPLACE_FPRINTF = @REPLACE_FPRINTF@ -REPLACE_FPURGE = @REPLACE_FPURGE@ -REPLACE_FREOPEN = @REPLACE_FREOPEN@ -REPLACE_FREXP = @REPLACE_FREXP@ -REPLACE_FREXPF = @REPLACE_FREXPF@ -REPLACE_FREXPL = @REPLACE_FREXPL@ -REPLACE_FSEEK = @REPLACE_FSEEK@ -REPLACE_FSEEKO = @REPLACE_FSEEKO@ -REPLACE_FSTAT = @REPLACE_FSTAT@ -REPLACE_FSTATAT = @REPLACE_FSTATAT@ -REPLACE_FTELL = @REPLACE_FTELL@ -REPLACE_FTELLO = @REPLACE_FTELLO@ -REPLACE_FTRUNCATE = @REPLACE_FTRUNCATE@ -REPLACE_FUTIMENS = @REPLACE_FUTIMENS@ -REPLACE_GAI_STRERROR = @REPLACE_GAI_STRERROR@ -REPLACE_GETCWD = @REPLACE_GETCWD@ -REPLACE_GETDELIM = @REPLACE_GETDELIM@ -REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ -REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ -REPLACE_GETLINE = @REPLACE_GETLINE@ -REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ -REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ -REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ -REPLACE_HUGE_VAL = @REPLACE_HUGE_VAL@ -REPLACE_HYPOT = @REPLACE_HYPOT@ -REPLACE_HYPOTF = @REPLACE_HYPOTF@ -REPLACE_HYPOTL = @REPLACE_HYPOTL@ -REPLACE_ICONV = @REPLACE_ICONV@ -REPLACE_ICONV_OPEN = @REPLACE_ICONV_OPEN@ -REPLACE_ICONV_UTF = @REPLACE_ICONV_UTF@ -REPLACE_ILOGB = @REPLACE_ILOGB@ -REPLACE_ILOGBF = @REPLACE_ILOGBF@ -REPLACE_INET_NTOP = @REPLACE_INET_NTOP@ -REPLACE_INET_PTON = @REPLACE_INET_PTON@ -REPLACE_IOCTL = @REPLACE_IOCTL@ -REPLACE_ISATTY = @REPLACE_ISATTY@ -REPLACE_ISFINITE = @REPLACE_ISFINITE@ -REPLACE_ISINF = @REPLACE_ISINF@ -REPLACE_ISNAN = @REPLACE_ISNAN@ -REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ -REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ -REPLACE_ITOLD = @REPLACE_ITOLD@ -REPLACE_LCHOWN = @REPLACE_LCHOWN@ -REPLACE_LDEXPL = @REPLACE_LDEXPL@ -REPLACE_LINK = @REPLACE_LINK@ -REPLACE_LINKAT = @REPLACE_LINKAT@ -REPLACE_LOCALECONV = @REPLACE_LOCALECONV@ -REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@ -REPLACE_LOG = @REPLACE_LOG@ -REPLACE_LOG10 = @REPLACE_LOG10@ -REPLACE_LOG10F = @REPLACE_LOG10F@ -REPLACE_LOG10L = @REPLACE_LOG10L@ -REPLACE_LOG1P = @REPLACE_LOG1P@ -REPLACE_LOG1PF = @REPLACE_LOG1PF@ -REPLACE_LOG1PL = @REPLACE_LOG1PL@ -REPLACE_LOG2 = @REPLACE_LOG2@ -REPLACE_LOG2F = @REPLACE_LOG2F@ -REPLACE_LOG2L = @REPLACE_LOG2L@ -REPLACE_LOGB = @REPLACE_LOGB@ -REPLACE_LOGBF = @REPLACE_LOGBF@ -REPLACE_LOGBL = @REPLACE_LOGBL@ -REPLACE_LOGF = @REPLACE_LOGF@ -REPLACE_LOGL = @REPLACE_LOGL@ -REPLACE_LSEEK = @REPLACE_LSEEK@ -REPLACE_LSTAT = @REPLACE_LSTAT@ -REPLACE_MALLOC = @REPLACE_MALLOC@ -REPLACE_MBRLEN = @REPLACE_MBRLEN@ -REPLACE_MBRTOWC = @REPLACE_MBRTOWC@ -REPLACE_MBSINIT = @REPLACE_MBSINIT@ -REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@ -REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@ -REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@ -REPLACE_MBTOWC = @REPLACE_MBTOWC@ -REPLACE_MEMCHR = @REPLACE_MEMCHR@ -REPLACE_MEMMEM = @REPLACE_MEMMEM@ -REPLACE_MKDIR = @REPLACE_MKDIR@ -REPLACE_MKFIFO = @REPLACE_MKFIFO@ -REPLACE_MKNOD = @REPLACE_MKNOD@ -REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ -REPLACE_MKTIME = @REPLACE_MKTIME@ -REPLACE_MODF = @REPLACE_MODF@ -REPLACE_MODFF = @REPLACE_MODFF@ -REPLACE_MODFL = @REPLACE_MODFL@ -REPLACE_NAN = @REPLACE_NAN@ -REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@ -REPLACE_NL_LANGINFO = @REPLACE_NL_LANGINFO@ -REPLACE_NULL = @REPLACE_NULL@ -REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@ -REPLACE_OPEN = @REPLACE_OPEN@ -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@ -REPLACE_PTHREAD_SIGMASK = @REPLACE_PTHREAD_SIGMASK@ -REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@ -REPLACE_PUTENV = @REPLACE_PUTENV@ -REPLACE_PWRITE = @REPLACE_PWRITE@ -REPLACE_RAISE = @REPLACE_RAISE@ -REPLACE_RANDOM_R = @REPLACE_RANDOM_R@ -REPLACE_READ = @REPLACE_READ@ -REPLACE_READLINK = @REPLACE_READLINK@ -REPLACE_REALLOC = @REPLACE_REALLOC@ -REPLACE_REALPATH = @REPLACE_REALPATH@ -REPLACE_REMAINDER = @REPLACE_REMAINDER@ -REPLACE_REMAINDERF = @REPLACE_REMAINDERF@ -REPLACE_REMAINDERL = @REPLACE_REMAINDERL@ -REPLACE_REMOVE = @REPLACE_REMOVE@ -REPLACE_RENAME = @REPLACE_RENAME@ -REPLACE_RENAMEAT = @REPLACE_RENAMEAT@ -REPLACE_RMDIR = @REPLACE_RMDIR@ -REPLACE_ROUND = @REPLACE_ROUND@ -REPLACE_ROUNDF = @REPLACE_ROUNDF@ -REPLACE_ROUNDL = @REPLACE_ROUNDL@ -REPLACE_SELECT = @REPLACE_SELECT@ -REPLACE_SETENV = @REPLACE_SETENV@ -REPLACE_SETLOCALE = @REPLACE_SETLOCALE@ -REPLACE_SIGNBIT = @REPLACE_SIGNBIT@ -REPLACE_SIGNBIT_USING_GCC = @REPLACE_SIGNBIT_USING_GCC@ -REPLACE_SLEEP = @REPLACE_SLEEP@ -REPLACE_SNPRINTF = @REPLACE_SNPRINTF@ -REPLACE_SPRINTF = @REPLACE_SPRINTF@ -REPLACE_SQRTL = @REPLACE_SQRTL@ -REPLACE_STAT = @REPLACE_STAT@ -REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@ -REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@ -REPLACE_STPNCPY = @REPLACE_STPNCPY@ -REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ -REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ -REPLACE_STRDUP = @REPLACE_STRDUP@ -REPLACE_STRERROR = @REPLACE_STRERROR@ -REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ -REPLACE_STRNCAT = @REPLACE_STRNCAT@ -REPLACE_STRNDUP = @REPLACE_STRNDUP@ -REPLACE_STRNLEN = @REPLACE_STRNLEN@ -REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@ -REPLACE_STRSTR = @REPLACE_STRSTR@ -REPLACE_STRTOD = @REPLACE_STRTOD@ -REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@ -REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ -REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@ -REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ -REPLACE_SYMLINK = @REPLACE_SYMLINK@ -REPLACE_TIMEGM = @REPLACE_TIMEGM@ -REPLACE_TMPFILE = @REPLACE_TMPFILE@ -REPLACE_TOWLOWER = @REPLACE_TOWLOWER@ -REPLACE_TRUNC = @REPLACE_TRUNC@ -REPLACE_TRUNCF = @REPLACE_TRUNCF@ -REPLACE_TRUNCL = @REPLACE_TRUNCL@ -REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@ -REPLACE_UNLINK = @REPLACE_UNLINK@ -REPLACE_UNLINKAT = @REPLACE_UNLINKAT@ -REPLACE_UNSETENV = @REPLACE_UNSETENV@ -REPLACE_USLEEP = @REPLACE_USLEEP@ -REPLACE_UTIMENSAT = @REPLACE_UTIMENSAT@ -REPLACE_VASPRINTF = @REPLACE_VASPRINTF@ -REPLACE_VDPRINTF = @REPLACE_VDPRINTF@ -REPLACE_VFPRINTF = @REPLACE_VFPRINTF@ -REPLACE_VPRINTF = @REPLACE_VPRINTF@ -REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@ -REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ -REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ -REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ -REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ -REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ -REPLACE_WCTOB = @REPLACE_WCTOB@ -REPLACE_WCTOMB = @REPLACE_WCTOMB@ -REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ -REPLACE_WRITE = @REPLACE_WRITE@ -SCHED_H = @SCHED_H@ -SELINUX_CONTEXT_H = @SELINUX_CONTEXT_H@ -SEQ_LIBM = @SEQ_LIBM@ -SERVENT_LIB = @SERVENT_LIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ -SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ -STDALIGN_H = @STDALIGN_H@ -STDARG_H = @STDARG_H@ -STDBOOL_H = @STDBOOL_H@ -STDDEF_H = @STDDEF_H@ -STDINT_H = @STDINT_H@ -STRIP = @STRIP@ -SYS_IOCTL_H_HAVE_WINSOCK2_H = @SYS_IOCTL_H_HAVE_WINSOCK2_H@ -SYS_IOCTL_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @SYS_IOCTL_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ -SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ -TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ -UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@ -UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@ -UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ -UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ -UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ -USE_ACL = @USE_ACL@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WARN_CFLAGS = @WARN_CFLAGS@ -WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ -WERROR_CFLAGS = @WERROR_CFLAGS@ -WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@ -WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@ -WINT_T_SUFFIX = @WINT_T_SUFFIX@ -XGETTEXT = @XGETTEXT@ -XGETTEXT_015 = @XGETTEXT_015@ -XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ -YACC = @YACC@ -YFLAGS = @YFLAGS@ -YIELD_LIB = @YIELD_LIB@ -abs_aux_dir = @abs_aux_dir@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -gl_LIBOBJS = @gl_LIBOBJS@ -gl_LTLIBOBJS = @gl_LTLIBOBJS@ -gltests_LIBOBJS = @gltests_LIBOBJS@ -gltests_LTLIBOBJS = @gltests_LTLIBOBJS@ -gltests_WITNESS = @gltests_WITNESS@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -lispdir = @lispdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -info_TEXINFOS = coreutils.texi -EXTRA_DIST = perm.texi parse-datetime.texi constants.texi fdl.texi - -# The following is necessary if the package name is 8 characters or longer. -# If the info documentation would be split into 10 or more separate files, -# then this is necessary even if the package name is 7 characters long. -# -# Tell makeinfo to put everything in a single info file: <package>.info. -# Otherwise, it would also generate files with names like <package>.info-[123], -# and those names all map to one 14-byte name (<package>.info-) on some crufty -# old systems. -AM_MAKEINFOFLAGS = --no-split -MAINTAINERCLEANFILES = constants.texi - -# Extended regular expressions to match word starts and ends. -_W = (^|[^A-Za-z0-9_]) -W_ = ([^A-Za-z0-9_]|$$) -syntax_checks = \ - sc-avoid-builtin \ - sc-avoid-io \ - sc-avoid-non-zero \ - sc-avoid-path \ - sc-avoid-timezone \ - sc-avoid-zeroes \ - sc-exponent-grouping \ - sc-lower-case-var \ - sc-use-small-caps-NUL - - -# List words/regexps here that should not appear in the texinfo documentation. -BAD_POSIX_PERL = /\bPOSIX\b/ && !/\@acronym{POSIX}/ && !/^\* / || /{posix}/ - -# ME = $(subdir)/$(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)) -ME = doc/Makefile - -# The quantity inside @var{...} should not contain upper case letters. -# The leading backslash exemption is to permit in-macro uses like -# @var{\varName\} where the upper case letter is part of a parameter name. -find_upper_case_var = \ - '/\@var{/ or next; \ - while (/\@var{(.+?)}/g) \ - { \ - $$v = $$1; \ - $$v =~ /[A-Z]/ && $$v !~ /^\\/ and (print "$$ARGV:$$.:$$_"), $$m = 1 \ - } \ - END {$$m and (warn "$(ME): do not use upper case in \@var{...}\n"), exit 1}' - -all: all-am - -.SUFFIXES: -.SUFFIXES: .dvi .html .info .pdf .ps .texi -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -.texi.info: - $(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 \ - for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \ - if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \ - done; \ - else :; fi && \ - cd "$$am__cwd"; \ - if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ - -o $@ $<; \ - then \ - rc=0; \ - $(am__cd) $(srcdir); \ - else \ - rc=$$?; \ - $(am__cd) $(srcdir) && \ - $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \ - fi; \ - rm -rf $$backupdir; exit $$rc - -.texi.dvi: - $(AM_V_TEXI2DVI)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ - MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ - $(TEXI2DVI) $(AM_V_texinfo) --clean $< $(AM_V_texidevnull) - -.texi.pdf: - $(AM_V_TEXI2PDF)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ - MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ - $(TEXI2PDF) $(AM_V_texinfo) --clean $< $(AM_V_texidevnull) - -.texi.html: - $(AM_V_MAKEINFO)rm -rf $(@:.html=.htp) - $(AM_V_at)if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ - -o $(@:.html=.htp) $<; \ - then \ - rm -rf $@; \ - if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \ - mv $(@:.html=) $@; else mv $(@:.html=.htp) $@; fi; \ - else \ - if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \ - rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \ - exit 1; \ - fi -$(srcdir)/coreutils.info: coreutils.texi $(srcdir)/version.texi -coreutils.dvi: coreutils.texi $(srcdir)/version.texi -coreutils.pdf: coreutils.texi $(srcdir)/version.texi -coreutils.html: coreutils.texi $(srcdir)/version.texi -$(srcdir)/version.texi: $(srcdir)/stamp-vti -$(srcdir)/stamp-vti: coreutils.texi $(top_srcdir)/configure - @(dir=.; test -f ./coreutils.texi || dir=$(srcdir); \ - set `$(SHELL) $(top_srcdir)/build-aux/mdate-sh $$dir/coreutils.texi`; \ - echo "@set UPDATED $$1 $$2 $$3"; \ - echo "@set UPDATED-MONTH $$2 $$3"; \ - echo "@set EDITION $(VERSION)"; \ - echo "@set VERSION $(VERSION)") > vti.tmp - @cmp -s vti.tmp $(srcdir)/version.texi \ - || (echo "Updating $(srcdir)/version.texi"; \ - cp vti.tmp $(srcdir)/version.texi) - -@rm -f vti.tmp - @cp $(srcdir)/version.texi $@ - -mostlyclean-vti: - -rm -f vti.tmp - -maintainer-clean-vti: - -rm -f $(srcdir)/stamp-vti $(srcdir)/version.texi -.dvi.ps: - $(AM_V_DVIPS)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ - $(DVIPS) $(AM_V_texinfo) -o $@ $< - -uninstall-dvi-am: - @$(NORMAL_UNINSTALL) - @list='$(DVIS)'; test -n "$(dvidir)" || list=; \ - for p in $$list; do \ - $(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(dvidir)/$$f'"; \ - rm -f "$(DESTDIR)$(dvidir)/$$f"; \ - done - -uninstall-html-am: - @$(NORMAL_UNINSTALL) - @list='$(HTMLS)'; test -n "$(htmldir)" || list=; \ - for p in $$list; do \ - $(am__strip_dir) \ - echo " rm -rf '$(DESTDIR)$(htmldir)/$$f'"; \ - rm -rf "$(DESTDIR)$(htmldir)/$$f"; \ - done - -uninstall-info-am: - @$(PRE_UNINSTALL) - @if test -d '$(DESTDIR)$(infodir)' && $(am__can_run_installinfo); then \ - list='$(INFO_DEPS)'; \ - for file in $$list; do \ - relfile=`echo "$$file" | sed 's|^.*/||'`; \ - echo " install-info --info-dir='$(DESTDIR)$(infodir)' --remove '$(DESTDIR)$(infodir)/$$relfile'"; \ - if install-info --info-dir="$(DESTDIR)$(infodir)" --remove "$(DESTDIR)$(infodir)/$$relfile"; \ - then :; else test ! -f "$(DESTDIR)$(infodir)/$$relfile" || exit 1; fi; \ - done; \ - else :; fi - @$(NORMAL_UNINSTALL) - @list='$(INFO_DEPS)'; \ - for file in $$list; do \ - relfile=`echo "$$file" | sed 's|^.*/||'`; \ - relfile_i=`echo "$$relfile" | sed 's|\.info$$||;s|$$|.i|'`; \ - (if test -d "$(DESTDIR)$(infodir)" && cd "$(DESTDIR)$(infodir)"; then \ - echo " cd '$(DESTDIR)$(infodir)' && rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]"; \ - rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]; \ - else :; fi); \ - done - -uninstall-pdf-am: - @$(NORMAL_UNINSTALL) - @list='$(PDFS)'; test -n "$(pdfdir)" || list=; \ - for p in $$list; do \ - $(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(pdfdir)/$$f'"; \ - rm -f "$(DESTDIR)$(pdfdir)/$$f"; \ - done - -uninstall-ps-am: - @$(NORMAL_UNINSTALL) - @list='$(PSS)'; test -n "$(psdir)" || list=; \ - for p in $$list; do \ - $(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(psdir)/$$f'"; \ - rm -f "$(DESTDIR)$(psdir)/$$f"; \ - done - -dist-info: $(INFO_DEPS) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - list='$(INFO_DEPS)'; \ - for base in $$list; do \ - case $$base in \ - $(srcdir)/*) base=`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \ - esac; \ - if test -f $$base; then d=.; else d=$(srcdir); fi; \ - base_i=`echo "$$base" | sed 's|\.info$$||;s|$$|.i|'`; \ - for file in $$d/$$base $$d/$$base-[0-9] $$d/$$base-[0-9][0-9] $$d/$$base_i[0-9] $$d/$$base_i[0-9][0-9]; do \ - if test -f $$file; then \ - relfile=`expr "$$file" : "$$d/\(.*\)"`; \ - test -f "$(distdir)/$$relfile" || \ - cp -p $$file "$(distdir)/$$relfile"; \ - else :; fi; \ - done; \ - 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 - -clean-aminfo: - -test -z "coreutils.dvi coreutils.pdf coreutils.ps coreutils.html" \ - || rm -rf coreutils.dvi coreutils.pdf coreutils.ps coreutils.html - -maintainer-clean-aminfo: - @list='$(INFO_DEPS)'; for i in $$list; do \ - i_i=`echo "$$i" | sed 's|\.info$$||;s|$$|.i|'`; \ - echo " rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]"; \ - rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]; \ - done -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - -cscope cscopelist: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" distdir="$(distdir)" \ - dist-info -check-am: all-am -check: check-am -all-am: Makefile $(INFO_DEPS) -installdirs: - for dir in "$(DESTDIR)$(infodir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) -clean: clean-am - -clean-am: clean-aminfo clean-generic mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: $(DVIS) - -html: html-am - -html-am: $(HTMLS) - -info: info-am - -info-am: $(INFO_DEPS) - -install-data-am: install-info-am - -install-dvi: install-dvi-am - -install-dvi-am: $(DVIS) - @$(NORMAL_INSTALL) - @list='$(DVIS)'; test -n "$(dvidir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(dvidir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(dvidir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dvidir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(dvidir)" || exit $$?; \ - done -install-exec-am: - -install-html: install-html-am - -install-html-am: $(HTMLS) - @$(NORMAL_INSTALL) - @list='$(HTMLS)'; list2=; test -n "$(htmldir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(htmldir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \ - $(am__strip_dir) \ - d2=$$d$$p; \ - if test -d "$$d2"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \ - $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \ - echo " $(INSTALL_DATA) '$$d2'/* '$(DESTDIR)$(htmldir)/$$f'"; \ - $(INSTALL_DATA) "$$d2"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \ - else \ - list2="$$list2 $$d2"; \ - fi; \ - done; \ - test -z "$$list2" || { echo "$$list2" | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(htmldir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(htmldir)" || exit $$?; \ - done; } -install-info: install-info-am - -install-info-am: $(INFO_DEPS) - @$(NORMAL_INSTALL) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(infodir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(infodir)" || exit 1; \ - fi; \ - for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - esac; \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ - file_i=`echo "$$file" | sed 's|\.info$$||;s|$$|.i|'`; \ - for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9] \ - $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \ - if test -f $$ifile; then \ - echo "$$ifile"; \ - else : ; fi; \ - done; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(infodir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(infodir)" || exit $$?; done - @$(POST_INSTALL) - @if $(am__can_run_installinfo); then \ - list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \ - for file in $$list; do \ - relfile=`echo "$$file" | sed 's|^.*/||'`; \ - echo " install-info --info-dir='$(DESTDIR)$(infodir)' '$(DESTDIR)$(infodir)/$$relfile'";\ - install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\ - done; \ - else : ; fi -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: $(PDFS) - @$(NORMAL_INSTALL) - @list='$(PDFS)'; test -n "$(pdfdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(pdfdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(pdfdir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pdfdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(pdfdir)" || exit $$?; done -install-ps: install-ps-am - -install-ps-am: $(PSS) - @$(NORMAL_INSTALL) - @list='$(PSS)'; test -n "$(psdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(psdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(psdir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(psdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(psdir)" || exit $$?; done -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-aminfo \ - maintainer-clean-generic maintainer-clean-vti - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-aminfo mostlyclean-generic mostlyclean-vti - -pdf: pdf-am - -pdf-am: $(PDFS) - -ps: ps-am - -ps-am: $(PSS) - -uninstall-am: uninstall-dvi-am uninstall-html-am uninstall-info-am \ - uninstall-pdf-am uninstall-ps-am - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-aminfo clean-generic \ - dist-info distclean distclean-generic distdir dvi dvi-am html \ - html-am info info-am install install-am 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-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-aminfo maintainer-clean-generic \ - maintainer-clean-vti mostlyclean mostlyclean-aminfo \ - mostlyclean-generic mostlyclean-vti pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-dvi-am uninstall-html-am \ - uninstall-info-am uninstall-pdf-am uninstall-ps-am - - -constants.texi: $(top_srcdir)/src/tail.c $(top_srcdir)/src/shred.c - $(AM_V_GEN)LC_ALL=C; export LC_ALL; \ - { sed -n -e 's/^#define \(DEFAULT_MAX[_A-Z]*\) \(.*\)/@set \1 \2/p' \ - $(top_srcdir)/src/tail.c && \ - sed -n -e \ - 's/.*\(DEFAULT_PASSES\)[ =]* \([0-9]*\).*/@set SHRED_\1 \2/p'\ - $(top_srcdir)/src/shred.c; } > t-$@ \ - && mv t-$@ $@ - -$(DVIS): $(EXTRA_DIST) -$(INFO_DEPS): $(EXTRA_DIST) - -.PHONY: $(syntax_checks) check-texinfo -check-texinfo: $(syntax_checks) - $(AM_V_GEN)fail=0; \ - grep '@url{' $(srcdir)/*.texi && fail=1; \ - grep '\$$@"' $(srcdir)/*.texi && fail=1; \ - grep -n '[^[:punct:]]@footnote' $(srcdir)/*.texi && fail=1; \ - grep -n filename $(srcdir)/*.texi \ - | $(EGREP) -v 'setfilename|[{]filename[}]' \ - && fail=1; \ - $(PERL) -e 1 2> /dev/null && { $(PERL) -ne \ - '$(BAD_POSIX_PERL) and print,exit 1' \ - $(srcdir)/*.texi 2> /dev/null || fail=1; }; \ - exit $$fail - -sc-avoid-builtin: - $(AM_V_GEN)$(EGREP) -i '$(_W)builtins?$(W_)' $(srcdir)/*.texi \ - && exit 1 || : - -sc-avoid-path: - $(AM_V_GEN)fail=0; \ - $(EGREP) -i '$(_W)path(name)?s?$(W_)' $(srcdir)/*.texi \ - | $(EGREP) -v \ - 'PATH=|path search|search path|@vindex PATH$$|@env[{]PATH[}]' \ - && fail=1; \ - exit $$fail - -# Use "time zone", not "timezone". -sc-avoid-timezone: - $(AM_V_GEN)$(EGREP) timezone $(srcdir)/*.texi && exit 1 || : - -# Check for insufficient exponent grouping, e.g., -# @math{2^64} should be @math{2^{64}}. -sc-exponent-grouping: - $(AM_V_GEN)$(EGREP) '\{.*\^[0-9][0-9]' $(srcdir)/*.texi && exit 1 || : - -# E.g., use @sc{nul}, not NUL. -sc-use-small-caps-NUL: - $(AM_V_GEN)$(EGREP) '$(_W)NUL$(W_)' $(srcdir)/*.texi && exit 1 || : - -# Say I/O, not IO. -sc-avoid-io: - $(AM_V_GEN)$(EGREP) '$(_W)IO$(W_)' $(srcdir)/*.texi && exit 1 || : - -# I prefer nonzero over non-zero. -sc-avoid-non-zero: - $(AM_V_GEN)$(EGREP) non-zero $(srcdir)/*.texi && exit 1 || : - -# Use "zeros", not "zeroes" (nothing wrong with "zeroes"; just be consistent). -sc-avoid-zeroes: - $(AM_V_GEN)$(EGREP) -i '$(_W)zeroes$(W_)' $(srcdir)/*.texi \ - && exit 1 || : -sc-lower-case-var: - $(AM_V_GEN)$(PERL) -e 1 || { echo $@: skipping test; exit 0; }; \ - $(PERL) -lne $(find_upper_case_var) $(srcdir)/*.texi - -check: check-texinfo - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/doc/coreutils.info b/doc/coreutils.info index 0ee5f7d8..27bba641 100644 --- a/doc/coreutils.info +++ b/doc/coreutils.info @@ -1,5 +1,5 @@ -This is coreutils.info, produced by makeinfo version 4.13 from -coreutils.texi. +This is doc/coreutils.info, produced by makeinfo version 4.13 from +./doc/coreutils.texi. INFO-DIR-SECTION Basics START-INFO-DIR-ENTRY @@ -17,8 +17,8 @@ START-INFO-DIR-ENTRY * cat: (coreutils)cat invocation. Concatenate and write files. * chcon: (coreutils)chcon invocation. Change SELinux CTX of files. * chgrp: (coreutils)chgrp invocation. Change file groups. -* chmod: (coreutils)chmod invocation. Change file permissions. -* chown: (coreutils)chown invocation. Change file owners/groups. +* chmod: (coreutils)chmod invocation. Change access permissions. +* chown: (coreutils)chown invocation. Change file owners and groups. * 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. @@ -62,6 +62,7 @@ START-INFO-DIR-ENTRY * nl: (coreutils)nl invocation. Number lines and write files. * nohup: (coreutils)nohup invocation. Immunize to hangups. * nproc: (coreutils)nproc invocation. Print the number of processors. +* numfmt: (coreutils)numfmt invocation. Reformat numbers. * od: (coreutils)od invocation. Dump files in octal, etc. * paste: (coreutils)paste invocation. Merge lines of files. * pathchk: (coreutils)pathchk invocation. Check file name portability. @@ -86,7 +87,6 @@ START-INFO-DIR-ENTRY * stat: (coreutils)stat invocation. Report file(system) status. * stdbuf: (coreutils)stdbuf invocation. Modify stdio buffering. * stty: (coreutils)stty invocation. Print/change terminal settings. -* su: (coreutils)su invocation. Modify user and group ID. * sum: (coreutils)sum invocation. Print traditional checksum. * sync: (coreutils)sync invocation. Synchronize memory and disk. * tac: (coreutils)tac invocation. Reverse files. @@ -113,10 +113,10 @@ START-INFO-DIR-ENTRY * yes: (coreutils)yes invocation. Print a string indefinitely. END-INFO-DIR-ENTRY - This manual documents version 8.17 of the GNU core utilities, + This manual documents version 8.21 of the GNU core utilities, including the standard programs for text and file manipulation. - Copyright (C) 1994-2012 Free Software Foundation, Inc. + 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, @@ -131,10 +131,10 @@ File: coreutils.info, Node: Top, Next: Introduction, Up: (dir) GNU Coreutils ************* -This manual documents version 8.17 of the GNU core utilities, including +This manual documents version 8.21 of the GNU core utilities, including the standard programs for text and file manipulation. - Copyright (C) 1994-2012 Free Software Foundation, Inc. + 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, @@ -167,7 +167,7 @@ the standard programs for text and file manipulation. * User information:: id logname whoami groups users who * System context:: date arch nproc uname hostname hostid uptime * SELinux context:: chcon runcon -* Modified command invocation:: chroot env nice nohup stdbuf su timeout +* Modified command invocation:: chroot env nice nohup stdbuf timeout * Process control:: kill * Delaying:: sleep * Numeric operations:: factor seq @@ -205,9 +205,12 @@ Output of entire files Formatting file contents * fmt invocation:: Reformat paragraph text +* numfmt invocation:: Reformat numbers * 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 @@ -409,7 +412,6 @@ Modified command invocation * nice invocation:: Run a command with modified niceness * nohup invocation:: Run a command immune to hangups * stdbuf invocation:: Run a command with modified I/O buffering -* su invocation:: Run a command with substitute user and group ID * timeout invocation:: Run a command with a time limit Process control @@ -437,13 +439,14 @@ 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, GMT +* 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 * Pure numbers in date strings:: 19931219, 1440 * Seconds since the Epoch:: @1078100502 * Specifying time zone rules:: TZ="America/New_York", TZ="UTC0" -* Authors of parse_datetime:: Bellovin, Eggert, Salz, Berets, et al +* Authors of parse_datetime:: Bellovin, Eggert, Salz, Berets, et al. Opening the software toolbox @@ -577,8 +580,8 @@ 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', `printenv', `sort', `stdbuf', `su', `test', `timeout', -`tty'. +`nice', `nohup', `numfmt', `printenv', `sort', `stdbuf', `test', +`timeout', `tty'.  File: coreutils.info, Node: Backup options, Next: Block size, Prev: Exit status, Up: Common options @@ -815,7 +818,7 @@ File: coreutils.info, Node: Signal specifications, Next: Disambiguating names 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. The following signal names and numbers are +letters is ignored. The following signal names and numbers are supported on all POSIX compliant systems: `HUP' @@ -1124,7 +1127,7 @@ 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-option', is safer for most purposes. +the `--preserve-root' option, is safer for most purposes. The commands `chgrp', `chmod' and `chown' can also operate destructively on entire hierarchies, so they too support these options. @@ -1317,19 +1320,24 @@ options::. `-r' `--regex' - Treat the separator string as a regular expression. Users of `tac' - on MS-DOS/MS-Windows should note that, since `tac' reads files in - binary mode, each line of a text file might end with a CR/LF pair - instead of the Unix-style LF. + Treat the separator string as a regular expression. `-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. + An exit status of zero indicates success, and a nonzero value indicates failure. + Example: + + # Reverse a file character by character. + tac -r -s 'x\|[^x]' +  File: coreutils.info, Node: nl invocation, Next: od invocation, Prev: tac invocation, Up: Output of entire files @@ -1539,7 +1547,7 @@ options::. zero byte (ASCII NUL). Prefixes and suffixes on BYTES are interpreted as for the `-j' option. - If N is omitted with `--strings', the default is 3. + If BYTES is omitted with `--strings', the default is 3. `-t TYPE' `--format=TYPE' @@ -1733,11 +1741,12 @@ These commands reformat the contents of files. * Menu: * fmt invocation:: Reformat paragraph text. +* numfmt invocation:: Reformat numbers. * pr invocation:: Paginate or columnate files for printing. * fold invocation:: Wrap input lines to fit in specified width.  -File: coreutils.info, Node: fmt invocation, Next: pr invocation, Up: Formatting file contents +File: coreutils.info, Node: fmt invocation, Next: numfmt invocation, Up: Formatting file contents 4.1 `fmt': Reformat paragraph text ================================== @@ -1816,9 +1825,292 @@ options::. indicates failure.  -File: coreutils.info, Node: pr invocation, Next: fold invocation, Prev: fmt invocation, Up: Formatting file contents +File: coreutils.info, Node: numfmt invocation, Next: pr invocation, Prev: fmt invocation, Up: Formatting file contents + +4.2 `numfmt': Reformat numbers +============================== + +`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'). + + numfmt [OPTION]... [NUMBER] + + `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 +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. + +4.2.1 General options +--------------------- + +The program accepts the following options. Also see *note Common +options::. + +`--debug' + Print (to standard error) warning messages about possible + erroneous usage. + +`-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' + Convert the number in input field N (default: 1). + +`--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 + trigger an error. + +`--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' + locale. + +`--header[=N]' + Print the first N (default: 1) lines without any conversion. + +`--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', + exit with status 0, even in the presence of conversion errors, and + with a MODE of `ignore' do not even print diagnostics. + +`--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). + +`--round=METHOD' + When converting number representations, round the number according + 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 + input numbers. + +`--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. + +`--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'). + + +4.2.2 Possible 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 + accepted, and any trailing characters following the number will + trigger an error. For output numbers, all digits of the numbers + will be printed. + +SI + Auto-scale numbers according to the _International System of Units + (SI)_ standard. For input numbers, accept one of the following + 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) + +IEC + Auto-scale numbers according to the _International Electronical + Commission (IEC)_ standard. For input numbers, accept one of the + 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) + + 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. + +IEC-I + Auto-scale numbers according to the _International Electronical + Commission (IEC)_ standard. For input numbers, accept one of the + 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) + + 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. + +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 + _IEC_ values. + + +4.2.3 Examples of using `numfmt' +-------------------------------- + +Converting a single number from/to _human_ representation: + $ nunfmt --to=si 500000 + 500K + + $ numfmt --to=iec 500000 + 489K + + $ numfmt --to=iec-i 500000 + 489Ki + + $ numfmt --from=si 1M + 1000000 + + $ numfmt --from=iec 1M + 1048576 + + # with '--from=auto', M=Mega, Mi=Mebi + $ numfmt --from=auto 1M + 1000000 + $ 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 +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 +human-readable format): + + # Third field (file size) will be shown in SI representation + $ ls -log | numfmt --field 3 --header --to=si | head -n4 + -rw-r--r-- 1 94K Aug 23 2011 ABOUT-NLS + -rw-r--r-- 1 3.7K Jan 7 16:15 AUTHORS + -rw-r--r-- 1 36K Jun 1 2011 COPYING + -rw-r--r-- 1 0 Jan 7 15:15 ChangeLog + + # Second field (size) will be shown in IEC representation + $ df --block-size=1 | numfmt --field 2 --header --to=iec | head -n4 + File system 1B-blocks Used Available Use% Mounted on + rootfs 132G 104741408 26554036 80% / + tmpfs 794M 7580 804960 1% /run/shm + /dev/sdb1 694G 651424756 46074696 94% /home + + Output can be tweaked using `--padding' or `--format': + + # Pad to 10 characters, right-aligned + $ du -s * | numfmt --to=si --padding=10 + 2.5K config.log + 108 config.status + 1.7K configure + 20 configure.ac + + # Pad to 10 characters, left-aligned + $ du -s * | numfmt --to=si --padding=-10 + 2.5K config.log + 108 config.status + 1.7K configure + 20 configure.ac + + # Pad to 10 characters, left-aligned, using 'format' + $ du -s * | numfmt --to=si --format="%10f" + 2.5K config.log + 108 config.status + 1.7K configure + 20 configure.ac + + # Pad to 10 characters, left-aligned, using 'format' + $ du -s * | numfmt --to=si --padding="%-10f" + 2.5K config.log + 108 config.status + 1.7K configure + 20 configure.ac + + 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 + 2147483648 + + $ LC_ALL=en_US.utf8 numfmt --from=iec --grouping 2G + 2,147,483,648 + + $ LC_ALL=ta_IN numfmt --from=iec --grouping 2G + 2,14,74,83,648 + + $ LC_ALL=C ./src/numfmt --from=iec --format="==%'15f==" 2G + == 2147483648== + + $ LC_ALL=en_US.utf8 ./src/numfmt --from=iec --format="==%'15f==" 2G + == 2,147,483,648== + + $ LC_ALL=en_US.utf8 ./src/numfmt --from=iec --format="==%'-15f==" 2G + ==2,147,483,648 == + + $ LC_ALL=ta_IN ./src/numfmt --from=iec --format="==%'15f==" 2G + == 2,14,74,83,648== + + +File: coreutils.info, Node: pr invocation, Next: fold invocation, Prev: numfmt invocation, Up: Formatting file contents -4.2 `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 @@ -1849,25 +2141,6 @@ 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 following changes were made in version 1.22i and apply to later -versions of `pr': - Brian - * Some small LETTER OPTIONS (`-s', `-w') have been redefined for - better POSIX compliance. The output of some further cases has - been adapted to other Unix systems. These changes are not - compatible with earlier versions of the program. - - * Some NEW CAPITAL LETTER options (`-J', `-S', `-W') have been - introduced to turn off unexpected interferences of small letter - options. The `-N' option and the second argument LAST_PAGE of - `+FIRST_PAGE' offer more flexibility. The detailed handling of - form feeds set in the input files requires the `-T' option. - - * Capital letter options override small letter ones. - - * Some of the option-arguments (compare `-s', `-e', `-i', `-n') - cannot be specified as separate arguments from the preceding - option letter (already stated in the POSIX specification). - The program accepts the following options. Also see *note Common options::. @@ -2091,7 +2364,7 @@ indicates failure.  File: coreutils.info, Node: fold invocation, Prev: pr invocation, Up: Formatting file contents -4.3 `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 @@ -2532,7 +2805,7 @@ options::. specify `-a' to allow suffixes beyond `99'. `--additional-suffix=SUFFIX' - Append an additional SUFFIX to output file names. SUFFIX must not + Append an additional SUFFIX to output file names. SUFFIX must not contain slash. `-e' @@ -3012,6 +3285,15 @@ options::. consistent with the associated MD5 checksums, exit successfully. Otherwise exit with a status code indicating there was a failure. +`--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 + supporting that would unnecessarily complicate the output format, + while providing little benefit. + `-t' `--text' Treat each input file as text, by reading it in text mode and @@ -3019,7 +3301,7 @@ options::. 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. + terminal. This mode is never defaulted to if `--tag' is used. `-w' `--warn' @@ -3183,7 +3465,7 @@ scripts should specify global options first. 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' @@ -3460,7 +3742,7 @@ scripts should specify global options first. `-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 + 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 @@ -3600,7 +3882,7 @@ syntax, it can use a test like `if sort -k 1 </dev/null >/dev/null 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' ' @@ -3676,7 +3958,7 @@ modes: `-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 + 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 @@ -3838,7 +4120,7 @@ options::. `-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 + 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 @@ -4305,9 +4587,9 @@ differences between this program and System V `ptx'. * 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 characters, - a few control characters are rejected, and the tilde `~' is also - rejected. + disabled. However, System V `ptx' does not accept 8-bit + characters, a few control characters are rejected, and the tilde + `~' is also rejected. * Input line length is only limited by available memory, even if GNU extensions are disabled. However, System V `ptx' processes only @@ -4726,10 +5008,10 @@ options::. `-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' - Treat the first line of each input file as a header line. The + 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 printed according to the specified format. The header lines will @@ -6290,9 +6572,11 @@ options::. #!/bin/sh # Usage: backup FILE... # Create a GNU-style backup of each listed FILE. + fail=0 for i; do - cp --backup --force -- "$i" "$i" + cp --backup --force --preserve=all -- "$i" "$i" || fail=1 done + exit $fail `--copy-contents' If copying recursively, copy the contents of any special files @@ -6317,7 +6601,7 @@ options::. `--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 + `--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 @@ -6327,8 +6611,8 @@ options::. This option is independent of the `--interactive' or `-i' option: neither cancels the effect of the other. - This option is redundant if the `--no-clobber' or `-n' option is - used. + This option is ignored when the `--no-clobber' or `-n' option is + also used. `-H' If a command line argument specifies a symbolic link, then copy the @@ -6339,7 +6623,7 @@ options::. `-i' `--interactive' When copying a file other than a directory, prompt whether to - overwrite an existing destination file. The `-i' option overrides + overwrite an existing destination file. The `-i' option overrides a previous `-n' option. `-l' @@ -6355,8 +6639,8 @@ options::. `-n' `--no-clobber' - Do not overwrite an existing file. The `-n' option overrides a - previous `-i' option. This option is mutually exclusive with `-b' + 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' @@ -6417,8 +6701,9 @@ options::. Preserve extended attributes of the file, or fail with full diagnostics. If `cp' is built without xattr support, ignore this option. If SELinux context, ACLs or Capabilities are - implemented using xattrs, they are preserved by this option - as well. + 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 @@ -6467,10 +6752,10 @@ options::. `--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: @@ -6597,7 +6882,8 @@ conversions on it. Synopses: dd OPTION The only options are `--help' and `--version'. *Note Common -options::. `dd' accepts the following operands. +options::. `dd' accepts the following operands, whose syntax was +inspired by the DD (data definition) statement of OS/360 JCL. `if=FILE' Read from FILE instead of standard input. @@ -6641,11 +6927,25 @@ options::. `dd' accepts the following operands. 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. + 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 + identify which information to suppress. + + `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. -`status=noxfer' - Do not print the overall transfer rate and volume statistics that - normally make up the third status line when `dd' exits. `conv=CONVERSION[,CONVERSION]...' Convert the file as specified by the CONVERSION argument(s). (No @@ -6841,7 +7141,11 @@ options::. `dd' accepts the following operands. 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'. + 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 @@ -6870,9 +7174,9 @@ options::. `dd' accepts the following operands. affected file descriptors, even after `dd' exits. - The numeric-valued strings above (BYTES and BLOCKS) 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::). + 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::). Any block size you specify via `bs=', `ibs=', `obs=', `cbs=' should not be too large--values larger than a few megabytes are generally @@ -7208,6 +7512,10 @@ the contents are truly unrecoverable, consider using `shred'. The program accepts the following options. Also see *note Common options::. +`-d' +`--dir' + Remove the listed directories if they are empty. + `-f' `--force' Ignore nonexistent files and missing operands, and never prompt @@ -7339,7 +7647,7 @@ this assumption. Exceptions include: * 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 @@ -7356,7 +7664,7 @@ this assumption. Exceptions include: 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' +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 @@ -7397,7 +7705,7 @@ options::. `-NUMBER' `-n NUMBER' `--iterations=NUMBER' - By default, `shred' uses 3 passes of overwrite. You can reduce + 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. @@ -7923,18 +8231,18 @@ File: coreutils.info, Node: readlink invocation, Next: rmdir invocation, Prev `readlink' may work in one of two supported modes: `Readlink mode' - `readlink' outputs the value of the given symbolic link. If + `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 file which - contains no `.', `..' components nor any repeated separators (`/') + `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. @@ -7962,7 +8270,8 @@ options::. `-n' `--no-newline' - Do not output the trailing newline. + Do not print the output delimiter, when a single FILE is specified. + Print a warning if specified along with multiple FILEs. `-s' `-q' @@ -7974,6 +8283,10 @@ options::. `--verbose' Report error messages. +`-z' +`--zero' + Separate output items with NUL characters. + The `readlink' utility first appeared in OpenBSD 2.1. @@ -8066,13 +8379,13 @@ timestamps, and other information. Collectively, we call these a file's * Menu: +* chown invocation:: Change file owners and groups. * chgrp invocation:: Change file groups. * chmod invocation:: Change access permissions. -* chown invocation:: Change file owners and groups. * touch invocation:: Change file timestamps.  -File: coreutils.info, Node: chown invocation, Next: touch invocation, Prev: chmod invocation, Up: Changing file attributes +File: coreutils.info, Node: chown invocation, Next: chgrp invocation, Up: Changing file attributes 13.1 `chown': Change file owner and group ========================================= @@ -8242,7 +8555,7 @@ indicates failure. chown -hR root /u  -File: coreutils.info, Node: chgrp invocation, Next: chmod invocation, Up: Changing file attributes +File: coreutils.info, Node: chgrp invocation, Next: chmod invocation, Prev: chown invocation, Up: Changing file attributes 13.2 `chgrp': Change group ownership ==================================== @@ -8336,7 +8649,7 @@ indicates failure. chgrp -hR staff /u  -File: coreutils.info, Node: chmod invocation, Next: chown invocation, Prev: chgrp invocation, Up: Changing file attributes +File: coreutils.info, Node: chmod invocation, Next: touch invocation, Prev: chgrp invocation, Up: Changing file attributes 13.3 `chmod': Change access permissions ======================================= @@ -8411,7 +8724,7 @@ options::. indicates failure.  -File: coreutils.info, Node: touch invocation, Prev: chown invocation, Up: Changing file attributes +File: coreutils.info, Node: touch invocation, Prev: chmod invocation, Up: Changing file attributes 13.4 `touch': Change file timestamps ==================================== @@ -8544,8 +8857,8 @@ 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. Note that SS may be - `60', to accommodate leap seconds. + 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. @@ -8601,6 +8914,17 @@ on the file system containing each argument FILE. 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 +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. + + With the same logic, `df' elides a mount entry of a dummy pseude +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 @@ -8628,6 +8952,11 @@ options::. 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. + `-h' `--human-readable' Append a size letter to each size, such as `M' for mebibytes. @@ -8660,6 +8989,68 @@ options::. disks, but on some systems (notably SunOS) the results may be slightly out of date. This is the default. +`--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. + + FIELD_LIST is a comma-separated list of columns to be included in + `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' + The source of the mount point, usually a device. + + `fstype' + File system type. + + `itotal' + Total number of inodes. + + `iused' + Number of used inodes. + + `iavail' + Number of available inodes. + + `ipcent' + Percentage of IUSED divided by ITOTAL. + + `size' + Total number of blocks. + + `used' + Number of used blocks. + + `avail' + Number of available blocks. + + `pcent' + Percentage of USED divided by SIZE. + + `target' + The mount point. + + The fields for block and inodes statistics are affected by the + scaling options like `-h' as usual. + + The definition of the FIELD_LIST can even be splitted among several + `--output' uses. + + #!/bin/sh + # Print the TARGET (i.e., the mount point) along with their percentage + # statistic regarding the blocks and the inodes. + df --out=target --output=pcent,ipcent + + # Print all available fields. + df --o + `-P' `--portability' Use the POSIX output format. This is like the default format @@ -8740,6 +9131,11 @@ 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. +  File: coreutils.info, Node: du invocation, Next: stat invocation, Prev: df invocation, Up: Disk usage @@ -8764,6 +9160,13 @@ counted, and changing the argument order may change the numbers that 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. + `-a' `--all' Show counts for all files, not just directories. @@ -8784,15 +9187,15 @@ options::. has an apparent size of 2 GiB, yet on most modern systems, it actually uses almost no disk space. -`-b' -`--bytes' - Equivalent to `--apparent-size --block-size=1'. - `-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'. + `-c' `--total' Print a grand total of all arguments after all arguments have been @@ -8806,6 +9209,12 @@ options::. 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 + 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'. + `--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 @@ -8819,6 +9228,9 @@ options::. 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. @@ -8826,25 +9238,22 @@ options::. This option is equivalent to `--block-size=human-readable'. Use the `--si' option if you prefer powers of 1000. -`-H' - Equivalent to `--dereference-args' (`-D'). - `-k' Print sizes in 1024-byte blocks, overriding the default block size (*note Block size::). This option is equivalent to `--block-size=1K'. -`-l' -`--count-links' - Count the size of all files, even if they have appeared already - (as a hard 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). + `-m' Print sizes in 1,048,576-byte blocks, overriding the default block size (*note Block size::). This option is equivalent to @@ -8855,19 +9264,14 @@ options::. For each symbolic links encountered by `du', consider the disk space used by the symbolic link. -`-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'. - -`-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. +`-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 @@ -8880,14 +9284,34 @@ options::. `--summarize' Display only a total for each argument. -`-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. +`-t SIZE' +`--threshold=SIZE' + Exclude entries based on a given SIZE (*note Block 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 + 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 + 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 + based on its apparent size. + + 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: + + du -a -t -500 --apparent-size `--time' Show time of the most recent modification of any file in the @@ -8941,21 +9365,21 @@ options::. begins with `posix-' the `posix-' is ignored; and if `TIME_STYLE' is `locale' it is ignored. -`-x' -`--one-file-system' - Skip directories that are on different file systems from the one - that the argument being processed is on. +`-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'. -`-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. +`-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 @@ -9186,7 +9610,7 @@ File: coreutils.info, Node: truncate invocation, Prev: sync invocation, Up: D ==================================================== `truncate' shrinks or extends the size of each FILE to the specified -size. Synopsis: +size. Synopsis: truncate OPTION... FILE... @@ -10061,7 +10485,7 @@ file named `dvd.sha1'. Note, however, that this example relies on a feature of modern shells called "process substitution" (the `>(command)' syntax, above; *Note -Process Substitution: (bashref)Process Substitution.), so it works with +Process Substitution: (bash)Process Substitution.), so it works with `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'. @@ -10689,6 +11113,9 @@ Control settings: `crtscts' Enable RTS/CTS 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 @@ -10740,7 +11167,7 @@ These settings control operations on data received from the terminal. `iuclc' Translate uppercase characters to lowercase. Non-POSIX. May be - negated. Note ilcuc is not implemented, as one would not be able + negated. Note ilcuc is not implemented, as one would not be able to issue almost any (lowercase) Unix command, after invoking it. `ixany' @@ -10764,7 +11191,7 @@ These settings control operations on data sent to the terminal. `olcuc' Translate lowercase characters to uppercase. Non-POSIX. May be - negated. (Note ouclc is not currently implemented.) + negated. (Note ouclc is not currently implemented.) `ocrnl' Translate carriage return to newline. Non-POSIX. May be negated. @@ -11094,7 +11521,7 @@ 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 + than a newline. This option enables other programs to parse the output of `printenv' even when that output would contain data with embedded newlines. @@ -11792,7 +12219,7 @@ options::. 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., + 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)" @@ -11890,7 +12317,8 @@ options::. 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. + 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 @@ -11996,6 +12424,31 @@ 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 + 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. + + Here is how the two kinds of systems handle the leap second at + 2012-06-30 23:59:60 UTC: + + # Typical systems ignore leap seconds: + date --date='2012-06-30 23:59:59 +0000' +%s + 1341100799 + date --date='2012-06-30 23:59:60 +0000' +%s + date: invalid date '2012-06-30 23:59:60 +0000' + date --date='2012-07-01 00:00:00 +0000' +%s + 1341100800 + + # Atypical systems count leap seconds: + date --date='2012-06-30 23:59:59 +0000' +%s + 1341100823 + date --date='2012-06-30 23:59:60 +0000' +%s + 1341100824 + 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 @@ -12227,9 +12680,14 @@ RFILE. The program accepts the following options. Also see *note Common options::. +`--dereference' + Do not affect symbolic links but what they refer to; this is the + default. + `-h' `--no-dereference' - Affect symbolic links instead of any referenced file. + Affect the symbolic links themselves instead of any referenced + file. `--reference=RFILE' Use RFILE's security context rather than specifying a CONTEXT @@ -12239,6 +12697,15 @@ options::. `--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 / + specially::. + +`--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 @@ -12345,7 +12812,6 @@ user, etc. * nice invocation:: Modify niceness. * nohup invocation:: Immunize to hangups. * stdbuf invocation:: Modify buffering of standard streams. -* su invocation:: Modify user and group ID. * timeout invocation:: Run with time limit.  @@ -12505,7 +12971,7 @@ 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 + than a newline. This option enables other programs to parse the output of `env' even when that output would contain data with embedded newlines. @@ -12535,8 +13001,9 @@ File: coreutils.info, Node: nice invocation, Next: nohup invocation, Prev: en 23.3 `nice': Run a command with modified niceness ================================================= -`nice' prints or modifies a process's "niceness", a parameter that -affects whether the process is scheduled favorably. Synopsis: +`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]...] @@ -12548,8 +13015,8 @@ By default, its niceness is incremented by 10. 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 nicenesses; conversely, other systems may enforce more -restrictive limits. An attempt to set the niceness outside the +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. @@ -12571,6 +13038,9 @@ 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. + The program accepts the following option. Also see *note Common options::. Options must precede operands. @@ -12689,7 +13159,7 @@ options::. Options must precede operands. instead of 125.  -File: coreutils.info, Node: stdbuf invocation, Next: su invocation, Prev: nohup invocation, Up: Modified command invocation +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 =============================================================== @@ -12763,118 +13233,9 @@ options::. the exit status of COMMAND otherwise  -File: coreutils.info, Node: su invocation, Next: timeout invocation, Prev: stdbuf invocation, Up: Modified command invocation - -23.6 `su': Run a command with substitute user and group ID -========================================================== - -`su' allows one user to temporarily become another user. It runs a -command (often an interactive shell) with the real and effective user -ID, group ID, and supplemental groups of a given USER. Synopsis: - - su [OPTION]... [USER [ARG]...] - - If no USER is given, the default is `root', the super-user. The -shell to use is taken from USER's `passwd' entry, or `/bin/sh' if none -is specified there. If USER has a password, `su' prompts for the -password unless run by a user with effective user ID of zero (the -super-user). - - By default, `su' does not change the current directory. It sets the -environment variables `HOME' and `SHELL' from the password entry for -USER, and if USER is not the super-user, sets `USER' and `LOGNAME' to -USER. By default, the shell is not a login shell. - - Any additional ARGs are passed as additional arguments to the shell. - - GNU `su' does not treat `/bin/sh' or any other shells specially -(e.g., by setting `argv[0]' to `-su', passing `-c' only to certain -shells, etc.). - - `su' can optionally be compiled to use `syslog' to report failed, -and optionally successful, `su' attempts. (If the system supports -`syslog'.) However, GNU `su' does not check if the user is a member of -the `wheel' group; see below. - - The program accepts the following options. Also see *note Common -options::. - -`-c COMMAND' -`--command=COMMAND' - Pass COMMAND, a single command line to run, to the shell with a - `-c' option instead of starting an interactive shell. - -`-f' -`--fast' - Pass the `-f' option to the shell. This probably only makes sense - if the shell run is `csh' or `tcsh', for which the `-f' option - prevents reading the startup file (`.cshrc'). With Bourne-like - shells, the `-f' option disables file name pattern expansion - (globbing), which is not likely to be useful. - -`-' -`-l' -`--login' - Make the shell a login shell. This means the following. Unset all - environment variables except `TERM', `HOME', and `SHELL' (which - are set as described above), and `USER' and `LOGNAME' (which are - set, even for the super-user, as described above), and set `PATH' - to a compiled-in default value. Change to USER's home directory. - Prepend `-' to the shell's name, intended to make it read its - login startup file(s). - -`-m' -`-p' -`--preserve-environment' - Do not change the environment variables `HOME', `USER', `LOGNAME', - or `SHELL'. Run the shell given in the environment variable - `SHELL' instead of the shell from USER's passwd entry, unless the - user running `su' is not the super-user and USER's shell is - restricted. A "restricted shell" is one that is not listed in the - file `/etc/shells', or in a compiled-in list if that file does not - exist. Parts of what this option does can be overridden by - `--login' and `--shell'. - -`-s SHELL' -`--shell=SHELL' - Run SHELL instead of the shell from USER's passwd entry, unless - the user running `su' is not the super-user and USER's shell is - restricted (see `-m' just above). - - - Exit status: - - 125 if `su' itself fails - 126 if subshell is found but cannot be invoked - 127 if subshell cannot be found - the exit status of the subshell otherwise +File: coreutils.info, Node: timeout invocation, Prev: stdbuf invocation, Up: Modified command invocation -23.6.1 Why GNU `su' does not support the `wheel' group ------------------------------------------------------- - -(This section is by Richard Stallman.) - - Sometimes a few of the users try to hold total power over all the -rest. For example, in 1984, a few users at the MIT AI lab decided to -seize power by changing the operator password on the Twenex system and -keeping it secret from everyone else. (I was able to thwart this coup -and give power back to the users by patching the kernel, but I wouldn't -know how to do that in Unix.) - - However, occasionally the rulers do tell someone. Under the usual -`su' mechanism, once someone learns the root password who sympathizes -with the ordinary users, he or she can tell the rest. The "wheel -group" feature would make this impossible, and thus cement the power of -the rulers. - - I'm on the side of the masses, not that of the rulers. If you are -used to supporting the bosses and sysadmins in whatever they do, you -might find this idea strange at first. - - -File: coreutils.info, Node: timeout invocation, Prev: su invocation, Up: Modified command invocation - -23.7 `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 @@ -12888,6 +13249,12 @@ built-in utilities::). The program accepts the following options. Also see *note Common options::. Options must precede operands. +`--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. + `--foreground' Don't create a separate background program group, so that the managed COMMAND can use the foreground TTY normally. This is @@ -12912,8 +13279,8 @@ options::. Options must precede operands. `-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) @@ -13210,10 +13577,14 @@ 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: - $ seq 18446744073709551616 1 18446744073709551618 - 18446744073709551616 - 18446744073709551616 - 18446744073709551618 + $ seq 50000000000000000000 2 50000000000000000004 + 50000000000000000000 + 50000000000000000000 + 50000000000000000004 + + However, note that when limited to non-negative whole numbers, an +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. @@ -13806,7 +14177,7 @@ First, a quote: 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 @@ -13818,8 +14189,8 @@ arguments to the various programs. The C interface (via the * General date syntax:: Common rules. * Calendar date items:: 19 Dec 1994. * Time of day items:: 9:20pm. -* Time zone items:: EST, PDT, GMT. -* Combined date and time of day items:: 1972-09-24T20:02:00,000000-0500 +* 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. * Pure numbers in date strings:: 19931219, 1440. @@ -14037,16 +14408,21 @@ File: coreutils.info, Node: Combined date and time of day items, Next: Day of 28.5 Combined date and time of day items ======================================== -A "combined date and time of day item" specifies the time on a specific -day of the year. This type is needed for formats that cannot be -represented by individual calendar date (*note Calendar date items::) -and time of day (*note Time of day items::) items due to ambiguity. +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. - # ISO 8601 extended date and time of day format - 1972-09-24T20:02:00,000000-0500 + In this format, the time of day should use 24-hour notation. +Fractional seconds are allowed, with either comma or period preceding +the fraction. ISO 8601 fractional minutes and hours are not supported. +Typically, hosts support nanosecond timestamp resolution; excess +precision is silently discarded. - The ISO 8601 extended date and time of day format is an ISO 8601 -date, a `T' character separator, followed by an ISO 8601 time of day. + Here are some examples: + + 2012-09-24T20:02:00.052-0500 + 2012-12-31T23:59:59,999999999+1100 + 1970-01-01 00:00Z  File: coreutils.info, Node: Day of week items, Next: Relative items in date strings, Prev: Combined date and time of day items, Up: Date input formats @@ -15305,30 +15681,29 @@ Index * *: Numeric expressions. (line 16) * + <1>: Numeric expressions. (line 12) * +: String expressions. (line 53) -* +PAGE_RANGE: pr invocation. (line 58) -* - <1>: su invocation. (line 53) -* - <2>: env invocation. (line 96) +* +PAGE_RANGE: pr invocation. (line 39) +* - <1>: env invocation. (line 96) * -: Numeric expressions. (line 12) -* - and Unix rm: rm invocation. (line 110) -* -, removing files beginning with: rm invocation. (line 98) +* - and Unix rm: rm invocation. (line 114) +* -, removing files beginning with: rm invocation. (line 102) * --: Common options. (line 44) -* --across: pr invocation. (line 82) +* --across: pr invocation. (line 63) * --additional-suffix: split invocation. (line 121) * --address-radix: od invocation. (line 36) -* --adjustment: nice invocation. (line 47) +* --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 26) -* --all <6>: df invocation. (line 32) +* --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-repeated: uniq invocation. (line 69) * --almost-all: Which files are listed. (line 17) -* --apparent-size: du invocation. (line 29) +* --apparent-size: du invocation. (line 36) * --append: tee invocation. (line 25) * --archive: cp invocation. (line 65) * --attributes-only: cp invocation. (line 74) @@ -15342,8 +15717,8 @@ Index * --batch-size: sort invocation. (line 259) * --before: tac invocation. (line 21) * --binary: md5sum invocation. (line 37) -* --block-size <1>: du invocation. (line 50) -* --block-size <2>: df invocation. (line 38) +* --block-size <1>: du invocation. (line 53) +* --block-size <2>: df invocation. (line 49) * --block-size: Block size. (line 137) * --block-size=SIZE: Block size. (line 12) * --body-numbering: nl invocation. (line 47) @@ -15351,7 +15726,7 @@ Index * --bourne-shell: dircolors invocation. (line 34) * --buffer-size: sort invocation. (line 309) -* --bytes <1>: du invocation. (line 46) +* --bytes <1>: du invocation. (line 58) * --bytes <2>: cut invocation. (line 26) * --bytes <3>: wc invocation. (line 43) * --bytes <4>: split invocation. (line 40) @@ -15376,8 +15751,7 @@ Index (line 48) * --color: General output formatting. (line 21) -* --columns: pr invocation. (line 68) -* --command: su invocation. (line 39) +* --columns: pr invocation. (line 49) * --compare: install invocation. (line 47) * --complement: cut invocation. (line 83) * --compute: runcon invocation. (line 27) @@ -15390,30 +15764,34 @@ Index (line 268) * --count <1>: who invocation. (line 70) * --count: uniq invocation. (line 55) -* --count-links: du invocation. (line 96) +* --count-links: du invocation. (line 115) * --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) +* --debug: numfmt invocation. (line 29) * --decode: base64 invocation. (line 30) -* --delimiter: cut invocation. (line 63) +* --delimiter <1>: cut invocation. (line 63) +* --delimiter: numfmt invocation. (line 34) * --delimiters: paste invocation. (line 43) -* --dereference <1>: stat invocation. (line 22) -* --dereference <2>: du invocation. (line 101) -* --dereference <3>: chgrp invocation. (line 30) -* --dereference <4>: chown invocation. (line 103) -* --dereference <5>: cp invocation. (line 149) +* --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) * --dereference: Which files are listed. (line 84) -* --dereference-args: du invocation. (line 61) +* --dereference-args: du invocation. (line 68) * --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) +* --dir: rm invocation. (line 35) * --directory <1>: mktemp invocation. (line 86) * --directory <2>: ln invocation. (line 90) * --directory <3>: install invocation. (line 62) @@ -15421,7 +15799,7 @@ Index (line 28) * --dired: What information is listed. (line 16) -* --double-space: pr invocation. (line 94) +* --double-space: pr invocation. (line 75) * --dry-run: mktemp invocation. (line 98) * --echo: shuf invocation. (line 19) * --elide-empty-files <1>: csplit invocation. (line 90) @@ -15430,11 +15808,11 @@ Index * --escape: Formatting the file names. (line 11) * --exact: shred invocation. (line 134) -* --exclude-from=FILE: du invocation. (line 213) -* --exclude-type: df invocation. (line 144) -* --exclude=PATTERN: du invocation. (line 207) -* --expand-tabs: pr invocation. (line 118) -* --fast: su invocation. (line 44) +* --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) +* --field: numfmt invocation. (line 38) * --field-separator: sort invocation. (line 325) * --fields: cut invocation. (line 44) * --file <1>: Options for date. (line 26) @@ -15442,28 +15820,31 @@ Index * --file-system: stat invocation. (line 28) * --file-type: General output formatting. (line 59) -* --files0-from=FILE <1>: du invocation. (line 67) +* --files0-from=FILE <1>: du invocation. (line 80) * --files0-from=FILE <2>: sort invocation. (line 221) * --files0-from=FILE: wc invocation. (line 62) * --filter: split invocation. (line 60) -* --first-line-number: pr invocation. (line 194) +* --first-line-number: pr invocation. (line 175) * --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 35) +* --force <3>: rm invocation. (line 39) * --force <4>: mv invocation. (line 63) -* --force: cp invocation. (line 116) -* --foreground: timeout invocation. (line 18) -* --form-feed: pr invocation. (line 126) +* --force: cp invocation. (line 118) +* --foreground: timeout invocation. (line 24) +* --form-feed: pr invocation. (line 107) * --format <1>: General output formatting. (line 10) * --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=FORMAT: stat invocation. (line 34) -* --from: chown invocation. (line 80) +* --from <1>: chown invocation. (line 80) +* --from: numfmt invocation. (line 48) +* --from-unit: numfmt invocation. (line 53) * --full-time: What information is listed. (line 100) * --general-numeric-sort: sort invocation. (line 105) @@ -15472,13 +15853,16 @@ Index * --group: install invocation. (line 68) * --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) * --hardware-platform: uname invocation. (line 35) * --head-count: shuf invocation. (line 32) * --header <1>: join invocation. (line 90) -* --header: pr invocation. (line 131) +* --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) * --hide-control-chars: Formatting the file names. @@ -15486,8 +15870,8 @@ Index * --hide=PATTERN: Which files are listed. (line 57) * --human-numeric-sort: sort invocation. (line 130) -* --human-readable <1>: du invocation. (line 81) -* --human-readable <2>: df invocation. (line 48) +* --human-readable <1>: du invocation. (line 97) +* --human-readable <2>: df invocation. (line 64) * --human-readable <3>: What information is listed. (line 116) * --human-readable: Block size. (line 137) @@ -15505,24 +15889,25 @@ Index * --ignore-nonprinting: sort invocation. (line 145) * --ignore=PATTERN: Which files are listed. (line 70) -* --indent: pr invocation. (line 200) +* --indent: pr invocation. (line 181) * --indicator-style: General output formatting. (line 48) * --initial: expand invocation. (line 34) * --inode: What information is listed. (line 123) -* --inodes: df invocation. (line 58) +* --inodes: df invocation. (line 74) * --input: stdbuf invocation. (line 26) * --input-range: shuf invocation. (line 23) * --interactive <1>: ln invocation. (line 100) -* --interactive <2>: rm invocation. (line 50) +* --interactive <2>: rm invocation. (line 54) * --interactive <3>: mv invocation. (line 69) -* --interactive: cp invocation. (line 139) +* --interactive: cp invocation. (line 141) +* --invalid: numfmt invocation. (line 68) * --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 144) +* --join-lines: pr invocation. (line 125) * --keep-files: csplit invocation. (line 86) * --kernel-name: uname invocation. (line 65) * --kernel-release: uname invocation. (line 61) @@ -15530,30 +15915,29 @@ Index * --key: sort invocation. (line 234) * --kibibytes: General output formatting. (line 85) -* --kill-after: timeout invocation. (line 33) -* --length: pr invocation. (line 153) +* --kill-after: timeout invocation. (line 39) +* --length: pr invocation. (line 134) * --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) * --lines: head invocation. (line 39) -* --link: cp invocation. (line 145) +* --link: cp invocation. (line 147) * --literal: Formatting the file names. (line 17) -* --local: df invocation. (line 69) +* --local: df invocation. (line 85) * --logical <1>: pwd invocation. (line 15) * --logical <2>: realpath invocation. (line 30) * --logical: ln invocation. (line 104) -* --login <1>: su invocation. (line 53) * --login: who invocation. (line 52) * --lookup: who invocation. (line 57) * --machine: uname invocation. (line 41) -* --max-depth=DEPTH: du invocation. (line 118) +* --max-depth=DEPTH: du invocation. (line 75) * --max-line-length: wc invocation. (line 59) * --max-unchanged-stats: tail invocation. (line 140) * --merge <1>: sort invocation. (line 32) -* --merge: pr invocation. (line 160) +* --merge: pr invocation. (line 141) * --mesg: who invocation. (line 95) * --message: who invocation. (line 95) * --mode <1>: mknod invocation. (line 48) @@ -15564,40 +15948,41 @@ Index * --multiple: basename invocation. (line 32) * --name: id invocation. (line 34) * --no-clobber <1>: mv invocation. (line 76) -* --no-clobber: cp invocation. (line 156) +* --no-clobber: cp invocation. (line 158) * --no-create <1>: truncate invocation. (line 22) * --no-create: touch invocation. (line 82) -* --no-dereference <1>: chcon invocation. (line 22) -* --no-dereference <2>: du invocation. (line 112) +* --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 162) -* --no-file-warnings: pr invocation. (line 207) +* --no-dereference: cp invocation. (line 164) +* --no-file-warnings: pr invocation. (line 188) * --no-group: What information is listed. (line 110) * --no-newline: readlink invocation. (line 48) -* --no-preserve-root <1>: chmod invocation. (line 54) -* --no-preserve-root <2>: chgrp invocation. (line 48) -* --no-preserve-root <3>: chown invocation. (line 121) -* --no-preserve-root: rm invocation. (line 84) +* --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 73) +* --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 353) +* --no-target-directory <4>: cp invocation. (line 356) * --no-target-directory: Target directory. (line 15) * --nodename: uname invocation. (line 46) * --null <1>: env invocation. (line 83) * --null <2>: printenv invocation. (line 19) -* --null: du invocation. (line 124) +* --null: du invocation. (line 26) * --number <1>: split invocation. (line 77) * --number: cat invocation. (line 31) * --number-format: nl invocation. (line 95) -* --number-lines: pr invocation. (line 173) +* --number-lines: pr invocation. (line 154) * --number-nonblank: cat invocation. (line 20) * --number-separator: nl invocation. (line 112) * --number-width: nl invocation. (line 122) @@ -15605,44 +15990,47 @@ Index * --numeric-suffixes: split invocation. (line 114) * --numeric-uid-gid: What information is listed. (line 234) -* --omit-header: pr invocation. (line 230) -* --omit-pagination: pr invocation. (line 241) -* --one-file-system <1>: du invocation. (line 203) -* --one-file-system <2>: rm invocation. (line 63) -* --one-file-system: cp invocation. (line 376) +* --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) * --operating-system: uname invocation. (line 57) * --output <1>: stdbuf invocation. (line 30) -* --output <2>: shuf invocation. (line 37) +* --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 137) +* --output-tabs: pr invocation. (line 118) * --owner: install invocation. (line 86) -* --page_width: pr invocation. (line 259) -* --pages=PAGE_RANGE: pr invocation. (line 58) +* --padding: numfmt invocation. (line 76) +* --page_width: pr invocation. (line 240) +* --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 241) +* --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 80) +* --portability: df invocation. (line 158) * --prefix: csplit invocation. (line 62) -* --preserve: cp invocation. (line 169) +* --preserve: cp invocation. (line 171) * --preserve-context: install invocation. (line 91) -* --preserve-environment: su invocation. (line 64) -* --preserve-root <1>: chmod invocation. (line 49) -* --preserve-root <2>: chgrp invocation. (line 43) -* --preserve-root <3>: chown invocation. (line 116) -* --preserve-root: rm invocation. (line 79) +* --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) +* --preserve-status: timeout invocation. (line 18) * --preserve-timestamps: install invocation. (line 98) * --print-database: dircolors invocation. (line 45) -* --print-type: df invocation. (line 119) +* --print-type: df invocation. (line 197) * --printf=FORMAT: stat invocation. (line 43) * --process: who invocation. (line 66) * --processor: uname invocation. (line 50) @@ -15652,7 +16040,7 @@ Index * --quiet <4>: chmod invocation. (line 45) * --quiet <5>: chgrp invocation. (line 26) * --quiet <6>: chown invocation. (line 76) -* --quiet <7>: readlink invocation. (line 54) +* --quiet <7>: readlink invocation. (line 55) * --quiet <8>: md5sum invocation. (line 68) * --quiet <9>: csplit invocation. (line 101) * --quiet <10>: tail invocation. (line 160) @@ -15666,31 +16054,31 @@ Index * --random-source <2>: shuf invocation. (line 43) * --random-source: sort invocation. (line 298) * --range <1>: runcon invocation. (line 43) -* --range: chcon invocation. (line 63) +* --range: chcon invocation. (line 77) * --read-bytes: od invocation. (line 71) * --real: id invocation. (line 39) -* --recursive <1>: chcon invocation. (line 30) +* --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 91) -* --recursive <6>: cp invocation. (line 254) +* --recursive <5>: rm invocation. (line 95) +* --recursive <6>: cp invocation. (line 257) * --recursive: Which files are listed. (line 91) -* --reference <1>: chcon invocation. (line 25) +* --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 267) +* --reflink[=WHEN]: cp invocation. (line 270) * --regex: tac invocation. (line 26) * --relative: ln invocation. (line 138) * --relative-base: realpath invocation. (line 61) * --relative-to: realpath invocation. (line 56) * --remove: shred invocation. (line 123) -* --remove-destination: cp invocation. (line 293) +* --remove-destination: cp invocation. (line 296) * --repeated: uniq invocation. (line 63) * --retry: tail invocation. (line 104) * --reverse <1>: Sorting the output. (line 27) @@ -15699,38 +16087,43 @@ Index * --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 55) +* --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) * --save: stty invocation. (line 41) * --section-delimiter: nl invocation. (line 68) -* --sep-string: pr invocation. (line 221) -* --separate-dirs: du invocation. (line 142) -* --separator <1>: pr invocation. (line 212) -* --separator: tac invocation. (line 33) +* --sep-string: pr invocation. (line 202) +* --separate-dirs: du invocation. (line 130) +* --separator <1>: pr invocation. (line 193) +* --separator: tac invocation. (line 30) * --serial: paste invocation. (line 34) * --set: Options for date. (line 107) * --sh: dircolors invocation. (line 34) -* --shell: su invocation. (line 75) * --show-all: cat invocation. (line 16) * --show-control-chars <1>: Formatting the file names. (line 78) -* --show-control-chars: pr invocation. (line 88) +* --show-control-chars: pr invocation. (line 69) * --show-ends: cat invocation. (line 27) -* --show-nonprinting <1>: pr invocation. (line 246) +* --show-nonprinting <1>: pr invocation. (line 227) * --show-nonprinting: cat invocation. (line 51) * --show-tabs: cat invocation. (line 44) -* --si <1>: du invocation. (line 130) -* --si <2>: df invocation. (line 99) +* --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 40) +* --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 54) +* --silent <5>: readlink invocation. (line 55) * --silent <6>: csplit invocation. (line 101) * --silent <7>: tail invocation. (line 160) * --silent: head invocation. (line 46) @@ -15745,60 +16138,65 @@ Index * --sort <1>: Sorting the output. (line 32) * --sort: sort invocation. (line 105) * --spaces: fold invocation. (line 29) -* --sparse=WHEN: cp invocation. (line 297) +* --sparse=WHEN: cp invocation. (line 300) * --split-only: fmt invocation. (line 47) * --squeeze-blank: cat invocation. (line 36) * --stable: sort invocation. (line 303) * --starting-line-number: nl invocation. (line 117) * --status: md5sum invocation. (line 76) -* --strict: md5sum invocation. (line 100) +* --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 331) +* --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 344) +* --suffix <6>: cp invocation. (line 347) * --suffix <7>: csplit invocation. (line 66) +* --suffix <8>: numfmt invocation. (line 88) * --suffix: Backup options. (line 50) * --suffix-length: split invocation. (line 106) -* --summarize: du invocation. (line 138) +* --summarize: du invocation. (line 146) * --symbolic: ln invocation. (line 150) -* --symbolic-link: cp invocation. (line 336) -* --sync: df invocation. (line 106) +* --symbolic-link: cp invocation. (line 339) +* --sync: df invocation. (line 184) * --sysv: sum invocation. (line 31) * --tabs <1>: unexpand invocation. (line 24) * --tabs: expand invocation. (line 22) * --tabsize: General output formatting. (line 111) +* --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 349) +* --target-directory <4>: cp invocation. (line 352) * --target-directory: Target directory. (line 31) * --temporary-directory: sort invocation. (line 345) * --terse: stat invocation. (line 54) -* --text: md5sum invocation. (line 86) +* --text: md5sum invocation. (line 95) +* --threshold: du invocation. (line 150) * --time <1>: who invocation. (line 83) -* --time <2>: du invocation. (line 150) +* --time <2>: du invocation. (line 178) * --time <3>: touch invocation. (line 78) * --time: Sorting the output. (line 13) -* --time-style <1>: du invocation. (line 165) +* --time-style <1>: du invocation. (line 193) * --time-style: Formatting file timestamps. (line 26) * --tmpdir: mktemp invocation. (line 106) -* --total <1>: du invocation. (line 55) -* --total: df invocation. (line 42) +* --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 59) -* --type: df invocation. (line 113) +* --type <2>: chcon invocation. (line 73) +* --type: df invocation. (line 191) * --unbuffered: split invocation. (line 134) * --uniform-spacing: fmt invocation. (line 53) * --unique <1>: uniq invocation. (line 101) @@ -15806,35 +16204,35 @@ Index * --universal: Options for date. (line 113) * --unset: env invocation. (line 90) * --update <1>: mv invocation. (line 82) -* --update: cp invocation. (line 358) +* --update: cp invocation. (line 361) * --user <1>: runcon invocation. (line 31) -* --user <2>: chcon invocation. (line 51) +* --user <2>: chcon invocation. (line 65) * --user: id invocation. (line 44) * --userspec: chroot invocation. (line 24) * --utc: Options for date. (line 113) -* --verbose <1>: chcon invocation. (line 47) +* --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 58) +* --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 95) +* --verbose <10>: rm invocation. (line 99) * --verbose <11>: mv invocation. (line 92) * --verbose <12>: install invocation. (line 129) -* --verbose <13>: cp invocation. (line 372) +* --verbose <13>: cp invocation. (line 375) * --verbose <14>: split invocation. (line 138) * --verbose <15>: tail invocation. (line 164) * --verbose: head invocation. (line 50) * --version: Common options. (line 41) * --version-sort: sort invocation. (line 179) -* --warn: md5sum invocation. (line 95) +* --warn: md5sum invocation. (line 104) * --width <1>: General output formatting. (line 123) * --width <2>: fold invocation. (line 35) -* --width <3>: pr invocation. (line 250) +* --width <3>: pr invocation. (line 231) * --width <4>: fmt invocation. (line 59) * --width: od invocation. (line 162) * --words: wc invocation. (line 51) @@ -15843,13 +16241,14 @@ Index * --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 123) +* -0: du invocation. (line 25) * -1 <1>: General output formatting. (line 10) * -1 <2>: join invocation. (line 105) @@ -15864,8 +16263,8 @@ Index * -a <5>: tee invocation. (line 25) * -a <6>: Connectives for test. (line 12) -* -a <7>: du invocation. (line 26) -* -a <8>: df invocation. (line 32) +* -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. @@ -15875,15 +16274,15 @@ Index * -a <2>: unexpand invocation. (line 37) * -a <3>: join invocation. (line 75) * -a <4>: split invocation. (line 106) -* -a <5>: pr invocation. (line 82) +* -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: File type tests. (line 10) -* -B: du invocation. (line 50) -* -b: du invocation. (line 46) -* -B: df invocation. (line 38) +* -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) @@ -15905,16 +16304,15 @@ Index * -b <9>: tac invocation. (line 21) * -b <10>: cat invocation. (line 20) * -b: Backup options. (line 13) -* -c <1>: su invocation. (line 39) -* -c <2>: runcon invocation. (line 27) -* -c <3>: File type tests. (line 13) -* -c <4>: truncate invocation. (line 22) -* -c <5>: stat invocation. (line 34) -* -c <6>: du invocation. (line 55) -* -c <7>: touch invocation. (line 82) -* -c <8>: chmod invocation. (line 39) -* -c <9>: chgrp invocation. (line 20) -* -c <10>: chown invocation. (line 70) +* -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. @@ -15930,20 +16328,21 @@ Index * -C: split invocation. (line 54) * -c <1>: tail invocation. (line 32) * -c <2>: head invocation. (line 24) -* -c <3>: pr invocation. (line 88) +* -c <3>: pr invocation. (line 69) * -c <4>: fmt invocation. (line 34) * -c: od invocation. (line 181) -* -COLUMN: pr invocation. (line 68) +* -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 61) +* -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 109) +* -d: cp invocation. (line 111) * -D: What information is listed. (line 16) * -d <1>: Which files are listed. @@ -15954,11 +16353,12 @@ Index * -d <1>: uniq invocation. (line 63) * -d <2>: sort invocation. (line 87) * -d <3>: split invocation. (line 114) -* -d <4>: pr invocation. (line 94) -* -d <5>: base64 invocation. (line 30) -* -d <6>: od invocation. (line 185) +* -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 118) +* -d DEPTH: du invocation. (line 75) * -e <1>: stdbuf invocation. (line 34) * -e <2>: realpath invocation. (line 17) * -e: File characteristic tests. @@ -15968,13 +16368,12 @@ Index * -e <2>: readlink invocation. (line 36) * -e <3>: join invocation. (line 86) * -e <4>: split invocation. (line 126) -* -e: pr invocation. (line 118) +* -e: pr invocation. (line 99) * -E: cat invocation. (line 27) * -e: cat invocation. (line 23) * -ef: File characteristic tests. (line 23) * -eq: Numeric tests. (line 16) -* -f <1>: su invocation. (line 44) * -f: Options for date. (line 26) * -F: stty invocation. (line 31) * -f <1>: File type tests. (line 19) @@ -15987,9 +16386,9 @@ Index * -f: ln invocation. (line 96) * -F: ln invocation. (line 90) * -f <1>: shred invocation. (line 101) -* -f <2>: rm invocation. (line 35) +* -f <2>: rm invocation. (line 39) * -f <3>: mv invocation. (line 63) -* -f: cp invocation. (line 116) +* -f: cp invocation. (line 118) * -F: General output formatting. (line 48) * -f <1>: Sorting the output. (line 20) @@ -15999,8 +16398,8 @@ Index * -f: csplit invocation. (line 62) * -F: tail invocation. (line 99) * -f <1>: tail invocation. (line 48) -* -f: pr invocation. (line 126) -* -F: pr invocation. (line 126) +* -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) @@ -16020,26 +16419,26 @@ Index * -g: fmt invocation. (line 64) * -ge: Numeric tests. (line 16) * -gt: Numeric tests. (line 16) -* -H: chcon invocation. (line 33) -* -h: chcon invocation. (line 22) +* -H: chcon invocation. (line 47) +* -h: chcon invocation. (line 26) * -H: who invocation. (line 48) -* -h: File type tests. (line 23) -* -H: du invocation. (line 87) -* -h: du invocation. (line 81) -* -H: df invocation. (line 54) -* -h <1>: df 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 132) +* -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 131) +* -h <2>: pr invocation. (line 112) * -h: nl invocation. (line 79) * -H: Traversing symlinks. (line 18) * -h: Block size. (line 137) @@ -16047,12 +16446,12 @@ Index * -i <2>: env invocation. (line 96) * -i <3>: uname invocation. (line 35) * -i <4>: tee invocation. (line 30) -* -i <5>: df invocation. (line 58) +* -i <5>: df invocation. (line 74) * -i: ln invocation. (line 100) -* -I: rm invocation. (line 44) -* -i <1>: rm invocation. (line 39) +* -I: rm invocation. (line 48) +* -i <1>: rm invocation. (line 43) * -i <2>: mv invocation. (line 69) -* -i <3>: cp invocation. (line 139) +* -i <3>: cp invocation. (line 141) * -i: What information is listed. (line 123) * -I: Which files are listed. @@ -16062,40 +16461,39 @@ Index * -i <3>: uniq invocation. (line 59) * -i <4>: shuf invocation. (line 23) * -i <5>: sort invocation. (line 145) -* -i <6>: pr invocation. (line 137) +* -i <6>: pr invocation. (line 118) * -i <7>: base64 invocation. (line 36) * -i <8>: od invocation. (line 191) * -i: nl invocation. (line 83) * -I[TIMESPEC]: Options for date. (line 34) -* -J: pr invocation. (line 144) +* -J: pr invocation. (line 125) * -j: od invocation. (line 55) -* -k <1>: timeout invocation. (line 33) +* -k <1>: timeout invocation. (line 39) * -k <2>: Access permission tests. (line 12) -* -k <3>: du invocation. (line 90) -* -k <4>: df invocation. (line 63) +* -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>: su invocation. (line 53) -* -l <2>: runcon invocation. (line 43) -* -l: chcon invocation. (line 63) -* -L: chcon invocation. (line 38) +* -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 <4>: stat invocation. (line 22) -* -L: du invocation. (line 101) -* -l <1>: du invocation. (line 96) -* -l: df invocation. (line 69) +* -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 149) -* -l <1>: cp invocation. (line 145) +* -L: cp invocation. (line 151) +* -l <1>: cp invocation. (line 147) * -l: What information is listed. (line 131) * -L <1>: Which files are listed. @@ -16103,30 +16501,29 @@ Index * -L: wc invocation. (line 59) * -l <1>: wc invocation. (line 55) * -l <2>: split invocation. (line 33) -* -l <3>: pr invocation. (line 153) +* -l <3>: pr invocation. (line 134) * -l <4>: od invocation. (line 194) * -l: nl invocation. (line 87) * -L: Traversing symlinks. (line 22) * -le: Numeric tests. (line 16) * -lt: Numeric tests. (line 16) -* -m <1>: su invocation. (line 64) -* -m <2>: uname invocation. (line 41) -* -m <3>: who invocation. (line 62) -* -m <4>: realpath invocation. (line 25) -* -m <5>: du invocation. (line 106) -* -m <6>: touch invocation. (line 115) -* -m <7>: readlink invocation. (line 43) -* -m <8>: mknod invocation. (line 48) -* -m <9>: mkfifo invocation. (line 21) -* -m <10>: mkdir invocation. (line 19) -* -m <11>: install invocation. (line 74) +* -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 160) -* -n <1>: nice 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) @@ -16134,7 +16531,7 @@ Index * -n <6>: readlink invocation. (line 48) * -n <7>: ln invocation. (line 110) * -n <8>: mv invocation. (line 76) -* -n: cp invocation. (line 156) +* -n: cp invocation. (line 158) * -N: Formatting the file names. (line 17) * -n <1>: What information is listed. @@ -16146,8 +16543,8 @@ Index * -n <6>: split invocation. (line 77) * -n <7>: tail invocation. (line 152) * -n: head invocation. (line 39) -* -N: pr invocation. (line 194) -* -n: pr invocation. (line 173) +* -N: pr invocation. (line 175) +* -n: pr invocation. (line 154) * -N: od invocation. (line 71) * -n <1>: nl invocation. (line 95) * -n: cat invocation. (line 31) @@ -16167,12 +16564,11 @@ Index (line 238) * -o <4>: shuf invocation. (line 37) * -o <5>: sort invocation. (line 285) -* -o <6>: pr invocation. (line 200) +* -o <6>: pr invocation. (line 181) * -o: od invocation. (line 197) * -ot: File characteristic tests. (line 19) -* -p: su invocation. (line 64) -* -P: chcon invocation. (line 42) +* -P: chcon invocation. (line 56) * -p <1>: uname invocation. (line 50) * -p: who invocation. (line 66) * -P <1>: pwd invocation. (line 22) @@ -16181,16 +16577,16 @@ Index * -P: pathchk invocation. (line 42) * -p <1>: pathchk invocation. (line 29) * -p: File type tests. (line 28) -* -P <1>: du invocation. (line 112) -* -P <2>: df invocation. (line 80) +* -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 169) -* -P: cp invocation. (line 162) +* -p: cp invocation. (line 171) +* -P: cp invocation. (line 164) * -p <1>: dircolors invocation. (line 45) * -p <2>: General output formatting. @@ -16200,7 +16596,7 @@ Index * -q <1>: who invocation. (line 70) * -q <2>: realpath invocation. (line 41) * -q <3>: mktemp invocation. (line 93) -* -q: readlink invocation. (line 54) +* -q: readlink invocation. (line 55) * -Q: Formatting the file names. (line 30) * -q <1>: Formatting the file names. @@ -16209,8 +16605,8 @@ Index * -q <3>: tail invocation. (line 160) * -q: head invocation. (line 46) * -r <1>: runcon invocation. (line 35) -* -r: chcon invocation. (line 55) -* -R: chcon invocation. (line 30) +* -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) @@ -16224,40 +16620,39 @@ Index * -R <2>: chgrp invocation. (line 66) * -R: chown invocation. (line 140) * -r: ln invocation. (line 138) -* -R: rm invocation. (line 91) -* -r <1>: rm invocation. (line 91) -* -r: cp invocation. (line 254) -* -R: cp invocation. (line 254) +* -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 207) +* -r <3>: pr invocation. (line 188) * -r: tac invocation. (line 26) -* -s <1>: timeout invocation. (line 40) -* -s <2>: su invocation. (line 75) -* -s <3>: uname invocation. (line 65) -* -s <4>: Options for date. (line 107) -* -s <5>: who invocation. (line 79) -* -s <6>: tty invocation. (line 18) -* -s <7>: realpath invocation. (line 46) -* -s <8>: basename invocation. (line 38) +* -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: truncate invocation. (line 34) -* -S: du invocation. (line 142) -* -s <1>: du invocation. (line 138) -* -s: readlink invocation. (line 54) +* -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 344) -* -s: cp invocation. (line 336) +* -S: cp invocation. (line 347) +* -s: cp invocation. (line 339) * -S: Sorting the output. (line 32) * -s <1>: What information is listed. (line 244) @@ -16269,34 +16664,34 @@ Index * -s <2>: sum invocation. (line 31) * -s <3>: csplit invocation. (line 101) * -s: fold invocation. (line 29) -* -S: pr invocation. (line 221) -* -s <1>: pr invocation. (line 212) +* -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 33) +* -s <2>: tac invocation. (line 30) * -s: cat invocation. (line 36) * -S: Backup options. (line 50) * -s BYTES: shred invocation. (line 117) -* -su: su invocation. (line 25) * -t <1>: runcon invocation. (line 39) -* -t: chcon invocation. (line 59) +* -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: stat invocation. (line 54) -* -T: df invocation. (line 119) -* -t: df invocation. (line 113) +* -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 353) -* -t: cp invocation. (line 349) +* -T: cp invocation. (line 356) +* -t: cp invocation. (line 352) * -T: General output formatting. (line 111) * -t <1>: Sorting the output. (line 36) @@ -16304,16 +16699,16 @@ Index * -t: expand invocation. (line 22) * -T: sort invocation. (line 345) * -t <1>: sort invocation. (line 325) -* -t: md5sum invocation. (line 86) -* -T: pr invocation. (line 241) -* -t <1>: pr invocation. (line 230) +* -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 51) +* -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) @@ -16322,7 +16717,7 @@ Index (line 18) * -u <9>: shred invocation. (line 123) * -u <10>: mv invocation. (line 82) -* -u: cp invocation. (line 358) +* -u: cp invocation. (line 361) * -U: Sorting the output. (line 49) * -u <1>: Sorting the output. (line 42) * -u <2>: uniq invocation. (line 101) @@ -16330,25 +16725,25 @@ Index * -u <4>: split invocation. (line 134) * -u <5>: fmt invocation. (line 53) * -u: cat invocation. (line 47) -* -v <1>: chcon 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 58) +* -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 95) +* -v <11>: rm invocation. (line 99) * -v <12>: mv invocation. (line 92) * -v <13>: install invocation. (line 129) -* -v <14>: cp invocation. (line 372) +* -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 246) +* -v <3>: pr invocation. (line 227) * -v <4>: od invocation. (line 155) * -v <5>: nl invocation. (line 117) * -v: cat invocation. (line 51) @@ -16358,11 +16753,11 @@ Index * -w <3>: General output formatting. (line 123) * -w <4>: uniq invocation. (line 106) -* -w <5>: md5sum invocation. (line 95) +* -w <5>: md5sum invocation. (line 104) * -w <6>: wc invocation. (line 51) * -w: fold invocation. (line 35) -* -W: pr invocation. (line 259) -* -w <1>: pr invocation. (line 250) +* -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) @@ -16370,20 +16765,21 @@ Index * -WIDTH: fmt invocation. (line 59) * -x <1>: Access permission tests. (line 24) -* -x <2>: du invocation. (line 203) -* -x <3>: df invocation. (line 144) +* -x <2>: du invocation. (line 242) +* -x <3>: df invocation. (line 222) * -x <4>: shred invocation. (line 134) -* -x <5>: cp invocation. (line 376) +* -x <5>: cp invocation. (line 379) * -x: General output formatting. (line 107) * -X: Sorting the output. (line 63) * -x: od invocation. (line 203) -* -X FILE: du invocation. (line 213) +* -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: String tests. (line 15) +* -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) @@ -16395,18 +16791,14 @@ Index * -z <2>: shuf invocation. (line 48) * -z <3>: sort invocation. (line 375) * -z: csplit invocation. (line 90) -* .cshrc: su invocation. (line 44) * /: Numeric expressions. (line 16) -* /bin/sh: su invocation. (line 12) -* /etc/passwd: su invocation. (line 12) -* /etc/shells: su invocation. (line 64) * 128-bit checksum: md5sum invocation. (line 6) * 16-bit checksum: sum invocation. (line 6) * 160-bit checksum: sha1sum invocation. (line 6) * 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 131) +* 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) @@ -16435,12 +16827,12 @@ Index * access permission tests: Access permission tests. (line 6) * access permissions, changing: chmod invocation. (line 6) -* access time: dd invocation. (line 230) +* access time: dd invocation. (line 245) * 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 161) -* across columns: pr invocation. (line 82) +* access time, show the most recent: du invocation. (line 189) +* across columns: pr invocation. (line 63) * across, listing files: General output formatting. (line 107) * adding permissions: Setting Permissions. (line 38) @@ -16450,17 +16842,17 @@ Index * 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 79) +* alternate ebcdic, converting to: dd invocation. (line 94) * always color option: General output formatting. (line 27) -* always interactive option: rm invocation. (line 57) +* always interactive option: rm invocation. (line 61) * am i: who invocation. (line 21) * am in date strings: Time of day items. (line 22) * and operator <1>: Relations for expr. (line 17) * and operator: Connectives for test. (line 12) -* append: dd invocation. (line 170) -* appending to the output file: dd invocation. (line 170) +* append: dd invocation. (line 185) +* appending to the output file: dd invocation. (line 185) * appropriate privileges <1>: nice invocation. (line 6) * appropriate privileges <2>: hostname invocation. (line 6) * appropriate privileges <3>: Setting the time. (line 6) @@ -16470,17 +16862,17 @@ Index * 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 71) +* ascii, converting to: dd invocation. (line 86) * 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 161) +* atime, show the most recent: du invocation. (line 189) * attributes, file: Changing file attributes. (line 6) * authors of parse_datetime: Authors of parse_datetime. (line 6) * auto color option: General output formatting. (line 25) -* automounter file systems: df invocation. (line 32) +* automounter file systems: df invocation. (line 43) * 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) @@ -16514,20 +16906,20 @@ Index * Berry, K. <1>: Authors of parse_datetime. (line 19) * Berry, K.: Introduction. (line 19) -* binary: dd invocation. (line 247) -* binary I/O: dd invocation. (line 247) +* binary: dd invocation. (line 262) +* binary I/O: dd invocation. (line 262) * binary input files: md5sum invocation. (line 37) * bind mount <1>: stat invocation. (line 150) -* bind mount: rm invocation. (line 67) +* 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 88) -* block size <1>: dd invocation. (line 33) +* block (space-padding): dd invocation. (line 103) +* block size <1>: dd invocation. (line 34) * block size: Block size. (line 6) -* block size of conversion: dd invocation. (line 40) -* block size of input: dd invocation. (line 25) -* block size of output: dd invocation. (line 29) +* 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) @@ -16539,7 +16931,8 @@ Index * breaks, cause interrupts: Input. (line 12) * breaks, ignoring: Input. (line 9) * brkint: Input. (line 12) -* bs: dd invocation. (line 33) +* 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) @@ -16550,7 +16943,7 @@ Index * built-in shell commands, conflicts with <2>: kill invocation. (line 13) * built-in shell commands, conflicts with <3>: nice invocation. - (line 37) + (line 38) * built-in shell commands, conflicts with <4>: pwd invocation. (line 30) * built-in shell commands, conflicts with <5>: test invocation. @@ -16563,7 +16956,7 @@ Index (line 15) * built-in shell commands, conflicts with: mknod invocation. (line 20) * byte count: wc invocation. (line 6) -* byte-swapping: dd invocation. (line 120) +* byte-swapping: dd invocation. (line 135) * c for character special file: mknod invocation. (line 34) * C shell syntax for color setup: dircolors invocation. (line 40) @@ -16578,9 +16971,10 @@ Index * case, ignored in dates: General date syntax. (line 66) * cat: cat invocation. (line 6) * cbreak: Combination. (line 52) -* cbs: dd invocation. (line 40) -* CD-ROM file system type: df invocation. (line 135) -* cdfs file system type: df invocation. (line 135) +* 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) * change or print terminal settings: stty invocation. (line 6) * change SELinux context: chcon invocation. (line 6) * changed files, verbosely describing: chgrp invocation. (line 20) @@ -16616,13 +17010,13 @@ Index * chmod: chmod invocation. (line 6) * chown: chown invocation. (line 6) * chroot: chroot invocation. (line 6) -* cio: dd invocation. (line 178) +* cio: dd invocation. (line 193) * cksum: cksum invocation. (line 6) * clocal: Control. (line 33) * clock skew <1>: touch invocation. (line 17) * clock skew: Formatting file timestamps. (line 12) -* clone: cp invocation. (line 267) +* clone: cp invocation. (line 270) * cntrl: Character sets. (line 101) * color database, printing: dircolors invocation. (line 45) @@ -16664,13 +17058,13 @@ Index * comparing sorted files: comm invocation. (line 6) * comparison operators: Relations for expr. (line 22) * concatenate and write files: cat invocation. (line 6) -* concurrent I/O: dd invocation. (line 178) +* concurrent I/O: dd invocation. (line 193) * 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 37) +* 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) @@ -16684,9 +17078,9 @@ Index * context, system: System context. (line 6) * control characters, using ^C: Local. (line 51) * control settings: Control. (line 6) -* controlling terminal: dd invocation. (line 235) -* conv: dd invocation. (line 65) -* conversion block size: dd invocation. (line 40) +* controlling terminal: dd invocation. (line 250) +* conv: dd invocation. (line 80) +* conversion block size: dd invocation. (line 41) * conversion specifiers, date: Date conversion specifiers. (line 6) * conversion specifiers, literal: Literal conversion specifiers. @@ -16697,16 +17091,16 @@ Index * 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 267) -* copying directories recursively: cp invocation. (line 96) +* copy on write: cp invocation. (line 270) +* copying directories recursively: cp invocation. (line 98) * 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 55) -* count_bytes: dd invocation. (line 261) -* COW: cp invocation. (line 267) +* count: dd invocation. (line 56) +* count_bytes: dd invocation. (line 280) +* COW: cp invocation. (line 270) * cp: cp invocation. (line 6) * crashes and corruption: sync invocation. (line 11) * CRC checksum: cksum invocation. (line 6) @@ -16715,8 +17109,8 @@ Index * 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 138) -* creating output file, requiring: dd invocation. (line 134) +* creating output file, avoiding: dd invocation. (line 153) +* creating output file, requiring: dd invocation. (line 149) * crN: Output. (line 45) * crown margin: fmt invocation. (line 34) * crt: Combination. (line 75) @@ -16729,7 +17123,7 @@ Index * csplit: csplit invocation. (line 6) * cstopb: Control. (line 27) * ctime, printing or sorting by: Sorting the output. (line 13) -* ctime, show the most recent: du invocation. (line 156) +* ctime, show the most recent: du invocation. (line 184) * ctlecho: Local. (line 51) * current working directory, printing: pwd invocation. (line 6) * cut: cut invocation. (line 6) @@ -16739,7 +17133,7 @@ Index (line 45) * date: date invocation. (line 6) * date and time of day format, ISO 8601: Combined date and time of day items. - (line 14) + (line 6) * date conversion specifiers: Date conversion specifiers. (line 6) * date format, ISO 8601: Calendar date items. (line 30) @@ -16761,34 +17155,35 @@ Index * 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 349) +* destination directory <4>: cp invocation. (line 352) * destination directory: Target directory. (line 15) * destinations, multiple output: tee invocation. (line 6) -* device file, disk: df invocation. (line 19) +* device file, disk: df invocation. (line 30) * df: df invocation. (line 6) * DF_BLOCK_SIZE: Block size. (line 12) -* diagnostic: chcon invocation. (line 47) +* diagnostic: chcon invocation. (line 61) * dictionary order: sort invocation. (line 87) * differing lines: comm invocation. (line 18) * digit: Character sets. (line 104) * dir: dir invocation. (line 6) * dircolors: dircolors invocation. (line 6) -* direct: dd invocation. (line 184) -* direct I/O: dd invocation. (line 184) +* direct: dd invocation. (line 199) +* direct I/O: dd invocation. (line 199) * directories, copying: cp invocation. (line 6) -* directories, copying recursively: cp invocation. (line 96) +* directories, copying recursively: cp invocation. (line 98) * directories, creating: mkdir invocation. (line 6) * directories, creating with given attributes: install invocation. (line 62) -* directories, removing (recursively): rm invocation. (line 91) +* directories, removing: rm invocation. (line 35) +* directories, removing (recursively): rm invocation. (line 95) * directories, removing empty: rmdir invocation. (line 6) -* directory: dd invocation. (line 192) +* directory: dd invocation. (line 207) * directory check: File type tests. (line 16) * directory components, printing: dirname invocation. (line 6) * directory deletion, ignoring failures: rmdir invocation. (line 17) * directory deletion, reporting: rmdir invocation. (line 31) -* directory I/O: dd invocation. (line 192) +* directory I/O: dd invocation. (line 207) * directory listing: ls invocation. (line 6) * directory listing, brief: dir invocation. (line 6) * directory listing, recursive: Which files are listed. @@ -16803,14 +17198,14 @@ Index * disabling special characters: Characters. (line 13) * disambiguating group names and IDs: Disambiguating names and IDs. (line 6) -* discarding file cache: dd invocation. (line 208) +* discarding file cache: dd invocation. (line 223) * disk allocation: What information is listed. (line 244) -* disk device file: df invocation. (line 19) +* 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 139) +* diskette file system: df invocation. (line 217) * displacement of dates: Relative items in date strings. (line 6) * displaying text: echo invocation. (line 6) @@ -16818,14 +17213,15 @@ 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 139) -* double spacing: pr invocation. (line 94) -* down columns: pr invocation. (line 68) +* DOS file system: df invocation. (line 217) +* double spacing: pr invocation. (line 75) +* down columns: pr invocation. (line 49) * dsusp: Characters. (line 53) -* dsync: dd invocation. (line 197) +* dsync: dd invocation. (line 212) +* DTR/DSR flow control: Control. (line 39) * du: du invocation. (line 6) * DU_BLOCK_SIZE: Block size. (line 12) -* ebcdic, converting to: dd invocation. (line 75) +* ebcdic, converting to: dd invocation. (line 90) * echo <1>: Local. (line 18) * echo: echo invocation. (line 6) * echoctl: Local. (line 51) @@ -16836,7 +17232,7 @@ 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 131) +* efs file system type: df invocation. (line 209) * Eggert, Paul: Authors of parse_datetime. (line 6) * eight-bit characters <1>: Combination. (line 55) @@ -16849,7 +17245,6 @@ Index (line 6) * env: env invocation. (line 6) * environment variables, printing: printenv invocation. (line 6) -* environment, preserving: su invocation. (line 64) * environment, printing: env invocation. (line 45) * environment, running a program in a modified: env invocation. (line 6) @@ -16874,8 +17269,8 @@ Index * 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 134) -* excluding files from du: du invocation. (line 207) +* excl: dd invocation. (line 149) +* excluding files from du: du invocation. (line 231) * executable file check: Access permission tests. (line 24) * executables and file type, marking: General output formatting. @@ -16892,7 +17287,7 @@ Index * 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 56) +* 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) @@ -16900,9 +17295,8 @@ Index * 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 su: su invocation. (line 80) * exit status of test: test invocation. (line 41) -* exit status of timeout: timeout invocation. (line 53) +* exit status of timeout: timeout invocation. (line 59) * exit status of true: true invocation. (line 6) * exit status of tty: tty invocation. (line 21) * expand: expand invocation. (line 6) @@ -16917,8 +17311,7 @@ Index * factor: factor invocation. (line 6) * failure exit status: false invocation. (line 6) * false: false invocation. (line 6) -* fascism: su invocation. (line 87) -* fdatasync: dd invocation. (line 150) +* fdatasync: dd invocation. (line 165) * ffN: Output. (line 63) * field separator character: sort invocation. (line 325) * fields, padding numeric: Padding and other flags. @@ -16929,13 +17322,12 @@ Index * file characteristic tests: File characteristic tests. (line 6) * file contents, dumping unambiguously: od invocation. (line 6) -* file information, preserving: cp invocation. (line 237) +* file information, preserving: cp invocation. (line 240) * file information, preserving, extended attributes, xattr: cp invocation. - (line 169) + (line 171) * file mode bits, numeric: Numeric Modes. (line 6) * file name manipulation: File name manipulation. (line 6) -* file name pattern expansion, disabled: su invocation. (line 44) * file names, canonicalization: realpath invocation. (line 6) * file names, checking validity and portability: pathchk invocation. (line 6) @@ -16944,22 +17336,22 @@ Index (line 6) * file offset radix: od invocation. (line 36) * file ownership, changing: chown invocation. (line 6) -* file sizes: du invocation. (line 50) +* file sizes: du invocation. (line 53) * 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 38) +* file system sizes: df invocation. (line 49) * file system space, retrieving current data more slowly: df invocation. - (line 106) + (line 184) * file system space, retrieving old data more quickly: df invocation. - (line 73) + (line 89) * file system status: stat invocation. (line 6) * file system types, limiting output to certain: df invocation. - (line 69) -* file system types, printing: df invocation. (line 119) + (line 85) +* file system types, printing: df invocation. (line 197) * file systems: stat invocation. (line 28) * file systems and hard links: ln invocation. (line 6) -* file systems, omitting copying to different: cp invocation. (line 376) +* file systems, omitting copying to different: cp invocation. (line 379) * file timestamp resolution: touch invocation. (line 26) * file timestamps, changing: touch invocation. (line 6) * file type and executables, marking: General output formatting. @@ -16970,7 +17362,7 @@ Index * 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 98) +* files beginning with -, removing: rm invocation. (line 102) * files, copying: cp invocation. (line 6) * files, creating: truncate invocation. (line 11) * fingerprint, 128-bit: md5sum invocation. (line 6) @@ -16982,7 +17374,7 @@ Index * first in date strings: General date syntax. (line 28) * first part of files, outputting: head invocation. (line 6) * fixed-length records, converting to variable-length: dd invocation. - (line 40) + (line 41) * floating point: Floating point. (line 6) * flow control, hardware: Control. (line 36) * flow control, software: Input. (line 45) @@ -16996,22 +17388,21 @@ Index (line 6) * formatting of numbers in seq: seq invocation. (line 24) * formatting times <1>: date invocation. (line 20) -* formatting times: pr invocation. (line 98) +* formatting times: pr invocation. (line 79) * fortnight in date strings: Relative items in date strings. (line 15) -* fsync: dd invocation. (line 154) -* fullblock: dd invocation. (line 255) +* fsync: dd invocation. (line 169) +* fullblock: dd invocation. (line 270) * 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) * giving away permissions: Umask and Protection. (line 12) -* globbing, disabled: su invocation. (line 44) * GMT: Options for date. (line 113) * grand total of disk size, usage and available space: df invocation. - (line 42) -* grand total of disk space: du invocation. (line 55) + (line 53) +* grand total of disk space: du invocation. (line 62) * graph: Character sets. (line 107) * Greenwich Mean Time: Options for date. (line 113) * group IDs, disambiguating: Disambiguating names and IDs. @@ -17023,7 +17414,6 @@ Index (line 68) * group ownership, changing <1>: chgrp invocation. (line 6) * group ownership, changing: chown invocation. (line 6) -* group wheel, not supported: su invocation. (line 87) * group, permissions for: Setting Permissions. (line 26) * groups: groups invocation. (line 6) * growing files: tail invocation. (line 48) @@ -17031,13 +17421,13 @@ Index * hard link check: File characteristic tests. (line 23) * hard link, defined: ln invocation. (line 32) -* hard links: dd invocation. (line 244) +* 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 96) +* hard links, counting in du: du invocation. (line 115) * hard links, creating <1>: ln invocation. (line 6) * hard links, creating: link invocation. (line 6) -* hard links, preserving: cp invocation. (line 109) +* hard links, preserving: cp invocation. (line 111) * hardware class: uname invocation. (line 41) * hardware flow control: Control. (line 36) * hardware platform: uname invocation. (line 35) @@ -17048,10 +17438,9 @@ Index * headers, numbering: nl invocation. (line 17) * help, online: Common options. (line 37) * hex dump of files: od invocation. (line 6) -* High Sierra file system: df invocation. (line 135) -* holes, copying files with: cp invocation. (line 297) +* High Sierra file system: df invocation. (line 213) +* holes, copying files with: cp invocation. (line 300) * holes, creating files with: truncate invocation. (line 13) -* HOME: su invocation. (line 18) * horizontal, listing files: General output formatting. (line 107) * host processor type: uname invocation. (line 50) @@ -17060,35 +17449,35 @@ Index * hostname: uname invocation. (line 46) * hour in date strings: Relative items in date strings. (line 15) -* hsfs file system type: df invocation. (line 135) +* hsfs file system type: df invocation. (line 213) * human numeric sort: sort invocation. (line 130) -* human-readable output <1>: du invocation. (line 81) -* human-readable output <2>: df invocation. (line 48) +* human-readable output <1>: du invocation. (line 97) +* human-readable output <2>: df invocation. (line 64) * human-readable output <3>: What information is listed. (line 116) * human-readable output: Block size. (line 43) * hup[cl]: Control. (line 23) * hurd, author, printing: What information is listed. (line 10) -* ibs: dd invocation. (line 25) +* ibs: dd invocation. (line 26) * icanon: Local. (line 11) * icrnl: Input. (line 34) * id: id invocation. (line 6) * idle time: who invocation. (line 86) * IEEE floating point: Floating point. (line 6) * iexten: Local. (line 15) -* if: dd invocation. (line 17) -* iflag: dd invocation. (line 159) +* if: dd invocation. (line 18) +* iflag: dd invocation. (line 174) * ignbrk: Input. (line 9) * igncr: Input. (line 31) -* ignore file systems: df invocation. (line 32) +* ignore file systems: df invocation. (line 43) * Ignore garbage in base64 stream: base64 invocation. (line 36) * ignoring case: sort invocation. (line 94) * 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 200) +* indenting lines: pr invocation. (line 181) * index: String expressions. (line 45) * information, about current users: who invocation. (line 6) * initial part of files, outputting: head invocation. (line 6) @@ -17096,22 +17485,22 @@ Index * inlcr: Input. (line 28) * inode number, printing: What information is listed. (line 123) -* inode usage: df invocation. (line 58) +* inode usage: df invocation. (line 74) * inode, and hard links: ln invocation. (line 32) * inodes, written buffered: sync invocation. (line 6) * inpck: Input. (line 22) -* input block size: dd invocation. (line 25) +* 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 118) +* input tabs: pr invocation. (line 99) * install: install invocation. (line 6) * intr: Characters. (line 20) * 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 14) + (line 6) * ISO 8601 date format: Calendar date items. (line 30) * ISO/IEC 10646: printf invocation. (line 70) * ispeed: Special. (line 16) @@ -17128,8 +17517,8 @@ Index * 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 90) -* kibibytes for file system sizes: df invocation. (line 63) +* 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) @@ -17138,7 +17527,7 @@ Index * 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 150) +* last modified dates, displaying in du: du invocation. (line 178) * last part of files, outputting: tail invocation. (line 6) * LC_ALL <1>: ls invocation. (line 17) * LC_ALL: sort invocation. (line 49) @@ -17155,22 +17544,31 @@ Index * 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 170) +* LC_TIME <2>: du invocation. (line 198) * LC_TIME <3>: Formatting file timestamps. (line 30) * LC_TIME <4>: sort invocation. (line 152) -* LC_TIME: pr invocation. (line 105) +* LC_TIME: pr invocation. (line 86) * LCASE: Combination. (line 71) * lcase: Combination. (line 71) -* lcase, converting to: dd invocation. (line 99) +* 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) * leading directory components, stripping: basename invocation. (line 6) -* left margin: pr invocation. (line 200) +* 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) * length: String expressions. (line 50) -* limiting output of du: du invocation. (line 118) +* limiting output of du: du invocation. (line 75) * line: Special. (line 37) * line buffered: stdbuf invocation. (line 6) * line count: wc invocation. (line 6) @@ -17182,14 +17580,14 @@ Index * 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 131) +* Linux file system types: df invocation. (line 209) * 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 131) +* local file system types: df invocation. (line 209) * local settings: Local. (line 6) * logging out and continuing to run: nohup invocation. (line 6) * logical and operator <1>: Relations for expr. (line 17) @@ -17204,10 +17602,7 @@ Index * logical pages, numbering on: nl invocation. (line 12) * login name, printing: logname invocation. (line 6) * login sessions, printing users with: users invocation. (line 6) -* login shell: su invocation. (line 18) -* login shell, creating: su invocation. (line 53) * login time: who invocation. (line 11) -* LOGNAME: su invocation. (line 18) * logname: logname invocation. (line 6) * long ls format: What information is listed. (line 131) @@ -17234,7 +17629,7 @@ Index * MD5: md5sum invocation. (line 6) * md5sum: md5sum invocation. (line 6) * mebibyte, definition of: Block size. (line 93) -* mebibytes for file sizes: du invocation. (line 106) +* mebibytes for file sizes: du invocation. (line 119) * megabyte, definition of: Block size. (line 89) * merging files: paste invocation. (line 6) * merging files in parallel: pr invocation. (line 6) @@ -17254,7 +17649,6 @@ Index * minute in date strings: Relative items in date strings. (line 15) * minutes, time zone correction by: Time of day items. (line 30) -* MIT AI lab: su invocation. (line 92) * mkdir: mkdir invocation. (line 6) * mkfifo: mkfifo invocation. (line 6) * mknod: mknod invocation. (line 6) @@ -17275,12 +17669,12 @@ Index * 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 139) +* MS-DOS file system: df invocation. (line 217) * mtime, changing: touch invocation. (line 115) * 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 287) +* multipliers after numbers: dd invocation. (line 306) * multithreaded sort: sort invocation. (line 353) * mv: mv invocation. (line 6) * name follow option: tail invocation. (line 48) @@ -17288,8 +17682,8 @@ Index * named pipe check: File type tests. (line 28) * named pipes, creating: mkfifo invocation. (line 6) * network node name: uname invocation. (line 46) -* never interactive option: rm invocation. (line 52) -* newer files, copying only: cp invocation. (line 358) +* never interactive option: rm invocation. (line 56) +* newer files, copying only: cp invocation. (line 361) * newer files, moving only: mv invocation. (line 82) * newer-than file check: File characteristic tests. (line 15) @@ -17300,8 +17694,8 @@ Index * 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 126) -* NFS mounts from BSD to HP-UX <1>: du invocation. (line 218) +* NFS file system type: df invocation. (line 204) +* NFS mounts from BSD to HP-UX <1>: du invocation. (line 246) * NFS mounts from BSD to HP-UX: What information is listed. (line 252) * nice: nice invocation. (line 6) @@ -17309,26 +17703,27 @@ Index * nl <1>: Combination. (line 18) * nl: nl invocation. (line 6) * nlN: Output. (line 39) -* no dereference: chcon invocation. (line 22) +* no dereference: chcon invocation. (line 26) * no-op: true invocation. (line 6) -* noatime: dd invocation. (line 230) -* nocache: dd invocation. (line 208) -* nocreat: dd invocation. (line 138) -* noctty: dd invocation. (line 235) +* noatime: dd invocation. (line 245) +* nocache: dd invocation. (line 223) +* nocreat: dd invocation. (line 153) +* noctty: dd invocation. (line 250) * node name: uname invocation. (line 46) -* noerror: dd invocation. (line 147) +* noerror: dd invocation. (line 162) * noflsh: Local. (line 32) -* nofollow: dd invocation. (line 241) +* nofollow: dd invocation. (line 256) * nohup: nohup invocation. (line 6) * nohup.out: nohup invocation. (line 6) -* nolinks: dd invocation. (line 244) -* non-directories, copying as special files: cp invocation. (line 96) +* nolinks: dd invocation. (line 259) +* non-directories, copying as special files: cp invocation. (line 98) * non-directory suffix, stripping: dirname invocation. (line 6) -* nonblock: dd invocation. (line 227) -* nonblocking I/O: dd invocation. (line 227) +* nonblock: dd invocation. (line 242) +* nonblocking I/O: dd invocation. (line 242) * 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) * nonempty file check: File characteristic tests. (line 12) @@ -17336,9 +17731,10 @@ Index * nonzero-length string check: String tests. (line 19) * noon in date strings: Time of day items. (line 22) * not-equal string check: String tests. (line 28) -* notrunc: dd invocation. (line 144) +* notrunc: dd invocation. (line 159) * 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) * numbered backup method: Backup options. (line 35) @@ -17356,24 +17752,25 @@ Index (line 234) * numeric user and group IDs: What information is listed. (line 234) -* obs: dd invocation. (line 29) +* numfmt: numfmt invocation. (line 6) +* obs: dd invocation. (line 30) * ocrnl: Output. (line 16) * octal dump of files: od invocation. (line 6) * octal numbers for file modes: Numeric Modes. (line 6) * od: od invocation. (line 6) * odd parity: Control. (line 13) * oddp: Combination. (line 14) -* of: dd invocation. (line 20) +* of: dd invocation. (line 21) * ofdel: Output. (line 34) * ofill: Output. (line 30) -* oflag: dd invocation. (line 163) +* oflag: dd invocation. (line 178) * olcuc: Output. (line 12) * older-than file check: File characteristic tests. (line 19) -* once interactive option: rm invocation. (line 54) -* one file system, restricting du to: du invocation. (line 203) -* one file system, restricting rm to: rm invocation. (line 63) -* one-line output format: df invocation. (line 80) +* 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) * onlcr: Output. (line 19) * onlret: Output. (line 27) * onocr: Output. (line 23) @@ -17391,21 +17788,21 @@ Index * ordinal numbers: General date syntax. (line 28) * ospeed: Special. (line 19) * other permissions: Setting Permissions. (line 29) -* output block size: dd invocation. (line 29) +* 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 format: stat invocation. (line 34) -* output format, portable: df invocation. (line 80) +* 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 124) +* output NUL-byte-terminated lines: du invocation. (line 26) * 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 137) +* output tabs: pr invocation. (line 118) * overwriting of input, allowed <1>: shuf invocation. (line 37) * overwriting of input, allowed: sort invocation. (line 285) * owned by effective group ID check: Access permission tests. @@ -17422,7 +17819,7 @@ Index (line 6) * paragraphs, reformatting: fmt invocation. (line 6) * parenb: Control. (line 9) -* parent directories and cp: cp invocation. (line 241) +* parent directories and cp: cp invocation. (line 244) * parent directories, creating: mkdir invocation. (line 34) * parent directories, creating missing: install invocation. (line 62) * parent directories, removing: rmdir invocation. (line 22) @@ -17437,15 +17834,13 @@ Index * parts of files, output of: Output of parts of files. (line 6) * pass8: Combination. (line 55) -* passwd entry, and su shell: su invocation. (line 12) * paste: paste invocation. (line 6) * Paterson, R.: Introduction. (line 19) -* PATH <1>: su invocation. (line 53) * PATH: env invocation. (line 23) * pathchk: pathchk invocation. (line 6) * pattern matching: String expressions. (line 11) -* PC file system: df invocation. (line 139) -* pcfs: df invocation. (line 139) +* PC file system: df invocation. (line 217) +* pcfs: df invocation. (line 217) * pebibyte, definition of: Block size. (line 114) * permission tests: Access permission tests. (line 6) @@ -17468,15 +17863,15 @@ Index * platform, hardware: uname invocation. (line 35) * pm in date strings: Time of day items. (line 22) * portable file names, checking for: pathchk invocation. (line 6) -* portable output format: df invocation. (line 80) +* portable output format: df invocation. (line 158) * POSIX: Introduction. (line 11) -* POSIX output format: df invocation. (line 80) +* 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 328) +* POSIXLY_CORRECT <4>: dd invocation. (line 347) * POSIXLY_CORRECT <5>: sort invocation. (line 293) -* POSIXLY_CORRECT <6>: pr invocation. (line 105) +* POSIXLY_CORRECT <6>: pr invocation. (line 86) * POSIXLY_CORRECT <7>: Standards conformance. (line 6) * POSIXLY_CORRECT: Common options. (line 11) @@ -17535,12 +17930,12 @@ Index * random sources: Random sources. (line 6) * ranges: Character sets. (line 51) * raw: Combination. (line 43) -* read errors, ignoring: dd invocation. (line 147) +* read errors, ignoring: dd invocation. (line 162) * 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 297) +* read system call, and holes: cp invocation. (line 300) * readable file check: Access permission tests. (line 15) * readlink: readlink invocation. (line 6) @@ -17552,9 +17947,9 @@ Index * 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 96) +* recursively copying directories: cp invocation. (line 98) * redirection: Redirection. (line 6) -* reference file: chcon invocation. (line 25) +* reference file: chcon invocation. (line 30) * reformatting paragraph text: fmt invocation. (line 6) * regular expression matching: String expressions. (line 11) * regular file check: File type tests. (line 19) @@ -17575,7 +17970,6 @@ Index * repeated lines, outputting: uniq invocation. (line 63) * repeated output of a string: yes invocation. (line 6) * restricted deletion flag: Mode Structure. (line 56) -* restricted shell: su invocation. (line 64) * return, ignoring: Input. (line 31) * return, translating to newline <1>: Output. (line 16) * return, translating to newline: Input. (line 34) @@ -17586,7 +17980,7 @@ Index * 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 84) +* 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. @@ -17594,7 +17988,7 @@ Index * root directory, allow recursive modification: chown invocation. (line 121) * root directory, disallow recursive destruction: rm invocation. - (line 79) + (line 83) * root directory, disallow recursive modification <1>: chmod invocation. (line 49) * root directory, disallow recursive modification <2>: chgrp invocation. @@ -17603,7 +17997,6 @@ Index (line 116) * root directory, running a program in a specified: chroot invocation. (line 6) -* root, becoming: su invocation. (line 6) * rows: Special. (line 22) * rprnt: Characters. (line 56) * RTS/CTS flow control: Control. (line 36) @@ -17632,8 +18025,8 @@ Index * security context <5>: install invocation. (line 91) * security context: What information is listed. (line 268) -* seek: dd invocation. (line 50) -* seek_bytes: dd invocation. (line 273) +* 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) @@ -17671,7 +18064,6 @@ Index * sha256sum: sha2 utilities. (line 6) * sha384sum: sha2 utilities. (line 6) * sha512sum: sha2 utilities. (line 6) -* SHELL: su invocation. (line 18) * SHELL environment variable, and color <1>: dircolors invocation. (line 23) * SHELL environment variable, and color: General output formatting. @@ -17680,8 +18072,8 @@ Index * shred: shred invocation. (line 6) * shuf: shuf invocation. (line 6) * shuffling files: shuf invocation. (line 6) -* SI output <1>: du invocation. (line 130) -* SI output <2>: df invocation. (line 99) +* 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) @@ -17697,8 +18089,8 @@ Index * size of files, reporting: What information is listed. (line 244) * size of files, sorting files by: Sorting the output. (line 32) -* skip: dd invocation. (line 45) -* skip_bytes: dd invocation. (line 267) +* skip: dd invocation. (line 46) +* skip_bytes: dd invocation. (line 286) * sleep: sleep invocation. (line 6) * socket check: File type tests. (line 31) * software flow control: Input. (line 45) @@ -17711,8 +18103,8 @@ Index * sorting files: sort invocation. (line 6) * sorting ls output: Sorting the output. (line 6) * space: Character sets. (line 119) -* sparse: dd invocation. (line 107) -* sparse files, copying: cp invocation. (line 297) +* sparse: dd invocation. (line 122) +* sparse files, copying: cp invocation. (line 300) * sparse files, creating: truncate invocation. (line 13) * special characters: Characters. (line 6) * special file types: Special file types. (line 6) @@ -17731,9 +18123,9 @@ Index * standard streams, buffering: stdbuf invocation. (line 6) * start: Characters. (line 44) * stat: stat invocation. (line 6) -* status: dd invocation. (line 61) +* 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 156) +* status time, show the most recent: du invocation. (line 184) * stdbuf: stdbuf invocation. (line 6) * sticky: Mode Structure. (line 56) * sticky bit check: Access permission tests. @@ -17749,10 +18141,8 @@ Index * 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 331) +* stripping trailing slashes: cp invocation. (line 334) * stty: stty invocation. (line 6) -* su: su invocation. (line 6) -* substitute user and group IDs: su invocation. (line 6) * substr: String expressions. (line 40) * subtracting permissions: Setting Permissions. (line 42) * subtraction: Numeric expressions. (line 12) @@ -17760,11 +18150,10 @@ Index * suffix, stripping from file names: basename invocation. (line 6) * sum: sum invocation. (line 6) * summarizing files: Summarizing files. (line 6) -* super-user, becoming: su invocation. (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 120) +* 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) @@ -17775,7 +18164,7 @@ Index * symbolic link to directory, controlling traversal of: Traversing symlinks. (line 6) * symbolic link to directory, never traverse <1>: chcon invocation. - (line 42) + (line 56) * symbolic link to directory, never traverse <2>: chgrp invocation. (line 79) * symbolic link to directory, never traverse <3>: chown invocation. @@ -17783,7 +18172,7 @@ Index * symbolic link to directory, never traverse: Traversing symlinks. (line 26) * symbolic link to directory, traverse each that is encountered <1>: chcon invocation. - (line 38) + (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. @@ -17791,7 +18180,7 @@ Index * 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 33) + (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. @@ -17805,26 +18194,25 @@ Index * symbolic links, changing owner <1>: chgrp invocation. (line 30) * symbolic links, changing owner: chown invocation. (line 80) * symbolic links, changing time: touch invocation. (line 100) -* symbolic links, copying: cp invocation. (line 109) -* symbolic links, copying with: cp invocation. (line 336) +* symbolic links, copying: cp invocation. (line 111) +* symbolic links, copying with: cp invocation. (line 339) * symbolic links, dereferencing: Which files are listed. (line 36) -* symbolic links, dereferencing in du: du invocation. (line 101) +* symbolic links, dereferencing in du: du invocation. (line 109) * symbolic links, dereferencing in stat: stat invocation. (line 22) -* symbolic links, following: dd invocation. (line 241) +* symbolic links, following: dd invocation. (line 256) * 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 205) -* sync (padding with ASCII NULs): dd invocation. (line 125) +* sync: dd invocation. (line 220) +* sync (padding with ASCII NULs): dd invocation. (line 140) * synchronize disk and memory: sync invocation. (line 6) -* synchronized data and metadata I/O: dd invocation. (line 205) +* synchronized data and metadata I/O: dd invocation. (line 220) * synchronized data and metadata writes, before finishing: dd invocation. - (line 154) -* synchronized data reads: dd invocation. (line 197) -* synchronized data writes, before finishing: dd invocation. (line 150) -* syslog: su invocation. (line 29) + (line 169) +* synchronized data reads: dd invocation. (line 212) +* synchronized data writes, before finishing: dd invocation. (line 165) * system context: System context. (line 6) * system information, printing <1>: uname invocation. (line 6) * system information, printing <2>: nproc invocation. (line 6) @@ -17842,7 +18230,7 @@ Index * 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 349) +* target directory <4>: cp invocation. (line 352) * target directory: Target directory. (line 6) * tebibyte, definition of: Block size. (line 107) * tee: tee invocation. (line 6) @@ -17850,7 +18238,6 @@ Index * temporary directory: sort invocation. (line 345) * temporary files and directories: mktemp invocation. (line 6) * terabyte, definition of: Block size. (line 103) -* TERM: su invocation. (line 53) * terminal check: File type tests. (line 34) * terminal file name, printing: tty invocation. (line 6) * terminal lines, currently used: who invocation. (line 11) @@ -17859,10 +18246,10 @@ Index (line 25) * terse output: stat invocation. (line 54) * test: test invocation. (line 6) -* text: dd invocation. (line 251) -* text I/O: dd invocation. (line 251) +* text: dd invocation. (line 266) +* text I/O: dd invocation. (line 266) * text image, saving in swap space: Mode Structure. (line 56) -* text input files: md5sum invocation. (line 86) +* text input files: md5sum invocation. (line 95) * text utilities: Top. (line 18) * text, displaying: echo invocation. (line 6) * text, reformatting: fmt invocation. (line 6) @@ -17873,20 +18260,20 @@ Index * time conversion specifiers: Time conversion specifiers. (line 6) * time formats <1>: date invocation. (line 20) -* time formats: pr invocation. (line 98) +* 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 165) +* time style <1>: du invocation. (line 193) * time style: Formatting file timestamps. (line 26) * time units <1>: sleep invocation. (line 11) -* time units: timeout invocation. (line 44) +* time units: timeout invocation. (line 50) * time zone correction: Time of day items. (line 30) * 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 193) +* TIME_STYLE <1>: du invocation. (line 221) * TIME_STYLE: Formatting file timestamps. (line 106) * timeout: timeout invocation. (line 6) @@ -17908,11 +18295,10 @@ Index * translating characters: Translating. (line 6) * true: true invocation. (line 6) * truncate: truncate invocation. (line 6) -* truncating output file, avoiding: dd invocation. (line 144) +* truncating output file, avoiding: dd invocation. (line 159) * truncating, file sizes: truncate invocation. (line 6) * tsort: tsort invocation. (line 6) * tty: tty invocation. (line 6) -* Twenex: su invocation. (line 92) * two-way parity: Control. (line 9) * type size: od invocation. (line 122) * TZ <1>: Specifying time zone rules. @@ -17924,14 +18310,14 @@ Index * TZ <6>: touch invocation. (line 65) * TZ <7>: Formatting file timestamps. (line 18) -* TZ: pr invocation. (line 111) +* TZ: pr invocation. (line 92) * u, and disabling special characters: Characters. (line 13) -* ucase, converting to: dd invocation. (line 102) -* ufs file system type: df invocation. (line 131) +* ucase, converting to: dd invocation. (line 117) +* ufs file system type: df invocation. (line 209) * umask and modes: Umask and Protection. (line 6) * uname: uname invocation. (line 6) -* unblock: dd invocation. (line 93) +* unblock: dd invocation. (line 108) * unexpand: unexpand invocation. (line 6) * Unicode: printf invocation. (line 70) * uniq: uniq invocation. (line 6) @@ -17946,9 +18332,7 @@ Index * 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 156) -* USER: su invocation. (line 18) -* user ID, switching: su invocation. (line 6) +* use time, show the most recent: du invocation. (line 184) * user IDs, disambiguating: Disambiguating names and IDs. (line 6) * user information, commands for: User information. (line 6) @@ -17963,7 +18347,7 @@ Index * utmp: logname invocation. (line 6) * valid file names, checking for: pathchk invocation. (line 6) * variable-length records, converting to fixed-length: dd invocation. - (line 40) + (line 41) * vdir: vdir invocation. (line 6) * verbose ls format: What information is listed. (line 131) @@ -17985,7 +18369,6 @@ Index * week in date strings: Relative items in date strings. (line 15) * werase: Characters. (line 59) -* wheel group, not supported: su invocation. (line 87) * who: who invocation. (line 6) * who am i: who invocation. (line 21) * whoami: whoami invocation. (line 6) @@ -18019,226 +18402,226 @@ Index  Tag Table: -Node: Top8392 -Node: Introduction22287 -Node: Common options23846 -Node: Exit status27122 -Node: Backup options27873 -Node: Block size29797 -Node: Floating point34651 -Node: Signal specifications36061 -Node: Disambiguating names and IDs38115 -Ref: Disambiguating names and IDs-Footnote-139684 -Node: Random sources39754 -Node: Target directory41371 -Node: Trailing slashes44856 -Node: Traversing symlinks45877 -Node: Treating / specially46950 -Node: Special built-in utilities48497 -Node: Standards conformance49632 -Node: Output of entire files51188 -Node: cat invocation51789 -Node: tac invocation53596 -Node: nl invocation54858 -Node: od invocation58737 -Node: base64 invocation65608 -Node: Formatting file contents66987 -Node: fmt invocation67438 -Node: pr invocation70314 -Node: fold invocation82756 -Node: Output of parts of files84216 -Node: head invocation84713 -Node: tail invocation86898 -Node: split invocation96198 -Node: csplit invocation103118 -Node: Summarizing files107923 -Node: wc invocation108571 -Node: sum invocation111645 -Node: cksum invocation113050 -Node: md5sum invocation114190 -Node: sha1sum invocation119291 -Node: sha2 utilities120071 -Node: Operating on sorted files120695 -Node: sort invocation121282 -Ref: sort invocation-Footnote-1145210 -Node: shuf invocation145762 -Node: uniq invocation148341 -Node: comm invocation153033 -Node: ptx invocation155454 -Node: General options in ptx158254 -Node: Charset selection in ptx158835 -Node: Input processing in ptx159737 -Node: Output formatting in ptx165153 -Node: Compatibility in ptx171719 -Node: tsort invocation174952 -Node: tsort background178111 -Node: Operating on fields179759 -Node: cut invocation180121 -Node: paste invocation184078 -Node: join invocation185392 -Node: Operating on characters191743 -Node: tr invocation192165 -Node: Character sets193883 -Node: Translating198401 -Node: Squeezing200492 -Node: expand invocation203559 -Node: unexpand invocation205041 -Node: Directory listing206859 -Node: ls invocation207345 -Ref: ls invocation-Footnote-1209441 -Node: Which files are listed209663 -Node: What information is listed213403 -Node: Sorting the output222650 -Node: Details about version sort224960 -Node: General output formatting226728 -Node: Formatting file timestamps231718 -Node: Formatting the file names237044 -Node: dir invocation239960 -Node: vdir invocation240371 -Node: dircolors invocation240749 -Node: Basic operations242448 -Node: cp invocation243068 -Node: dd invocation259224 -Node: install invocation272015 -Node: mv invocation277290 -Node: rm invocation281852 -Node: shred invocation286178 -Node: Special file types294211 -Node: link invocation295717 -Node: ln invocation296936 -Node: mkdir invocation304991 -Node: mkfifo invocation307362 -Node: mknod invocation308482 -Node: readlink invocation310614 -Node: rmdir invocation312573 -Node: unlink invocation313847 -Node: Changing file attributes314806 -Node: chown invocation315620 -Node: chgrp invocation321806 -Node: chmod invocation324856 -Node: touch invocation327611 -Node: Disk usage335003 -Node: df invocation335664 -Node: du invocation341606 -Node: stat invocation350138 -Node: sync invocation355651 -Node: truncate invocation356606 -Node: Printing text358376 -Node: echo invocation358750 -Node: printf invocation361336 -Node: yes invocation366807 -Node: Conditions367419 -Node: false invocation368010 -Node: true invocation369045 -Node: test invocation370324 -Node: File type tests372369 -Node: Access permission tests373251 -Node: File characteristic tests374136 -Node: String tests374901 -Node: Numeric tests375640 -Node: Connectives for test376446 -Node: expr invocation376799 -Node: String expressions379240 -Node: Numeric expressions381824 -Node: Relations for expr382521 -Node: Examples of expr383715 -Node: Redirection384440 -Node: tee invocation384898 -Node: File name manipulation389688 -Node: basename invocation390263 -Node: dirname invocation392241 -Node: pathchk invocation393836 -Node: mktemp invocation395600 -Node: realpath invocation401248 -Node: Working context404053 -Node: pwd invocation404697 -Node: stty invocation406043 -Node: Control408803 -Node: Input409563 -Node: Output411236 -Node: Local412556 -Node: Combination414138 -Node: Characters416359 -Node: Special417913 -Node: printenv invocation419570 -Node: tty invocation420580 -Node: User information421286 -Node: id invocation421921 -Node: logname invocation423844 -Node: whoami invocation424471 -Node: groups invocation424958 -Node: users invocation426163 -Node: who invocation427110 -Node: System context430046 -Node: date invocation430711 -Node: Time conversion specifiers432428 -Node: Date conversion specifiers434851 -Node: Literal conversion specifiers437887 -Node: Padding and other flags438245 -Node: Setting the time440436 -Node: Options for date441557 -Node: Examples of date445745 -Ref: %s-examples447163 -Node: arch invocation449348 -Node: nproc invocation449797 -Node: uname invocation450907 -Node: hostname invocation453484 -Node: hostid invocation454097 -Node: uptime invocation454808 -Node: SELinux context455931 -Node: chcon invocation456306 -Node: runcon invocation458128 -Node: Modified command invocation459594 -Node: chroot invocation460344 -Ref: chroot invocation-Footnote-1462912 -Node: env invocation463214 -Node: nice invocation467458 -Node: nohup invocation471174 -Node: stdbuf invocation473457 -Node: su invocation475979 -Node: timeout invocation480480 -Node: Process control482723 -Node: kill invocation482946 -Node: Delaying486016 -Node: sleep invocation486213 -Node: Numeric operations487314 -Node: factor invocation487646 -Node: seq invocation489404 -Node: File permissions493025 -Node: Mode Structure493717 -Node: Symbolic Modes497412 -Node: Setting Permissions498510 -Node: Copying Permissions501123 -Node: Changing Special Mode Bits501942 -Node: Conditional Executability503764 -Node: Multiple Changes504308 -Node: Umask and Protection505975 -Node: Numeric Modes507080 -Node: Operator Numeric Modes509206 -Node: Directory Setuid and Setgid510222 -Node: Date input formats513049 -Node: General date syntax515480 -Node: Calendar date items518471 -Node: Time of day items520476 -Node: Time zone items522680 -Node: Combined date and time of day items523940 -Node: Day of week items524672 -Node: Relative items in date strings525689 -Node: Pure numbers in date strings528499 -Node: Seconds since the Epoch529488 -Node: Specifying time zone rules531117 -Node: Authors of parse_datetime533497 -Ref: Authors of get_date533684 -Node: Opening the software toolbox534647 -Node: Toolbox introduction535414 -Node: I/O redirection538137 -Node: The who command540971 -Node: The cut command541868 -Node: The sort command542931 -Node: The uniq command543635 -Node: Putting the tools together544325 -Ref: Putting the tools together-Footnote-1556277 -Node: GNU Free Documentation License556351 -Node: Concept index581544 +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  End Tag Table diff --git a/doc/coreutils.texi b/doc/coreutils.texi index 767267bf..2c16dc48 100644 --- a/doc/coreutils.texi +++ b/doc/coreutils.texi @@ -1,7 +1,7 @@ \input texinfo @c %**start of header @setfilename coreutils.info -@settitle @sc{gnu} Coreutils +@settitle GNU Coreutils @c %**end of header @@ -40,8 +40,8 @@ * cat: (coreutils)cat invocation. Concatenate and write files. * chcon: (coreutils)chcon invocation. Change SELinux CTX of files. * chgrp: (coreutils)chgrp invocation. Change file groups. -* chmod: (coreutils)chmod invocation. Change file permissions. -* chown: (coreutils)chown invocation. Change file owners/groups. +* chmod: (coreutils)chmod invocation. Change access permissions. +* chown: (coreutils)chown invocation. Change file owners and groups. * 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. @@ -85,6 +85,7 @@ * nl: (coreutils)nl invocation. Number lines and write files. * nohup: (coreutils)nohup invocation. Immunize to hangups. * nproc: (coreutils)nproc invocation. Print the number of processors. +* numfmt: (coreutils)numfmt invocation. Reformat numbers. * od: (coreutils)od invocation. Dump files in octal, etc. * paste: (coreutils)paste invocation. Merge lines of files. * pathchk: (coreutils)pathchk invocation. Check file name portability. @@ -109,7 +110,6 @@ * stat: (coreutils)stat invocation. Report file(system) status. * stdbuf: (coreutils)stdbuf invocation. Modify stdio buffering. * stty: (coreutils)stty invocation. Print/change terminal settings. -* su: (coreutils)su invocation. Modify user and group ID. * sum: (coreutils)sum invocation. Print traditional checksum. * sync: (coreutils)sync invocation. Synchronize memory and disk. * tac: (coreutils)tac invocation. Reverse files. @@ -137,10 +137,10 @@ @end direntry @copying -This manual documents version @value{VERSION} of the @sc{gnu} core +This manual documents version @value{VERSION} of the GNU core utilities, including the standard programs for text and file manipulation. -Copyright @copyright{} 1994-2012 Free Software Foundation, Inc. +Copyright @copyright{} 1994-2013 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document @@ -153,7 +153,7 @@ Free Documentation License''. @end copying @titlepage -@title @sc{gnu} @code{Coreutils} +@title GNU @code{Coreutils} @subtitle Core GNU utilities @subtitle for version @value{VERSION}, @value{UPDATED} @author David MacKenzie et al. @@ -200,7 +200,7 @@ Free Documentation License''. * User information:: id logname whoami groups users who * System context:: date arch nproc uname hostname hostid uptime * SELinux context:: chcon runcon -* Modified command invocation:: chroot env nice nohup stdbuf su timeout +* Modified command invocation:: chroot env nice nohup stdbuf timeout * Process control:: kill * Delaying:: sleep * Numeric operations:: factor seq @@ -239,9 +239,12 @@ Output of entire files Formatting file contents * fmt invocation:: Reformat paragraph text +* numfmt invocation:: Reformat numbers * 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 @@ -273,7 +276,7 @@ Operating on sorted files * 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 @acronym{GNU} extensions to @command{ptx} +* Compatibility in ptx:: The GNU extensions to @command{ptx} Operating on fields @@ -443,7 +446,6 @@ Modified command invocation * nice invocation:: Run a command with modified niceness * nohup invocation:: Run a command immune to hangups * stdbuf invocation:: Run a command with modified I/O buffering -* su invocation:: Run a command with substitute user and group ID * timeout invocation:: Run a command with a time limit Process control @@ -471,13 +473,14 @@ Date input formats * General date syntax:: Common rules * Calendar date items:: 19 Dec 1994 * Time of day items:: 9:20pm -* Time zone items:: @sc{est}, @sc{pdt}, @sc{gmt} +* Time zone items:: EST, PDT, UTC, @dots{} +* 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 * Pure numbers in date strings:: 19931219, 1440 * Seconds since the Epoch:: @@1078100502 * Specifying time zone rules:: TZ="America/New_York", TZ="UTC0" -* Authors of parse_datetime:: Bellovin, Eggert, Salz, Berets, et al +* Authors of parse_datetime:: Bellovin, Eggert, Salz, Berets, et al. Opening the software toolbox @@ -502,12 +505,12 @@ Copying This Manual This manual is a work in progress: many sections make no attempt to explain basic concepts in a way suitable for novices. Thus, if you are interested, -please get involved in improving this manual. The entire @sc{gnu} community +please get involved in improving this manual. The entire GNU community will benefit. -@cindex @acronym{POSIX} -The @sc{gnu} utilities documented here are mostly compatible with the -@acronym{POSIX} standard. +@cindex POSIX +The GNU utilities documented here are mostly compatible with the +POSIX standard. @cindex bugs, reporting Please report bugs to @email{bug-coreutils@@gnu.org}. Remember to include the version number, machine architecture, input files, and @@ -585,15 +588,15 @@ symbolic link to a directory. @xref{Target directory}. @opindex -0 @itemx --null @opindex --null -@cindex output @sc{nul}-byte-terminated lines -Output a zero byte (@acronym{ASCII} @sc{nul}) at the end of each line, -rather than a newline. This option enables other programs to parse the +@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. @end macro @macro optSi -@itemx --si +@item --si @opindex --si @cindex SI output Append an SI-style abbreviation to each size, such as @samp{M} for @@ -617,7 +620,7 @@ Use the @option{--si} option if you prefer powers of 1000. @end macro @macro optStripTrailingSlashes -@itemx @w{@kbd{--strip-trailing-slashes}} +@item @w{@kbd{--strip-trailing-slashes}} @opindex --strip-trailing-slashes @cindex stripping trailing slashes Remove any trailing slashes from each @var{source} argument. @@ -669,7 +672,7 @@ and so on for @samp{T}, @samp{P}, @samp{E}, @samp{Z}, and @samp{Y}. Certain options are available in all of these programs. Rather than writing identical descriptions for each of the programs, they are -described here. (In fact, every @sc{gnu} program accepts (or should accept) +described here. (In fact, every GNU program accepts (or should accept) these options.) @vindex POSIXLY_CORRECT @@ -741,7 +744,7 @@ name. * Traversing symlinks:: -H, -L, or -P, in some programs. * Treating / specially:: --preserve-root and --no-preserve-root. * Special built-in utilities:: @command{break}, @command{:}, @dots{} -* Standards conformance:: Conformance to the @acronym{POSIX} standard. +* Standards conformance:: Conformance to the POSIX standard. @end menu @@ -757,7 +760,7 @@ Nearly every command invocation yields an integral @dfn{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 -@samp{1}, though it may differ on unusual platforms as @acronym{POSIX} +@samp{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 @@ -765,8 +768,8 @@ other exit status values and a few associate different meanings with the values @samp{0} and @samp{1}. Here are some of the exceptions: @command{chroot}, @command{env}, @command{expr}, @command{nice}, -@command{nohup}, @command{printenv}, @command{sort}, @command{stdbuf}, -@command{su}, @command{test}, @command{timeout}, @command{tty}. +@command{nohup}, @command{numfmt}, @command{printenv}, @command{sort}, +@command{stdbuf}, @command{test}, @command{timeout}, @command{tty}. @node Backup options @@ -774,7 +777,7 @@ Here are some of the exceptions: @cindex backup options -Some @sc{gnu} programs (at least @command{cp}, @command{install}, +Some GNU programs (at least @command{cp}, @command{install}, @command{ln}, and @command{mv}) optionally make backups of files before writing new versions. These options control the details of these backups. The options are also @@ -848,7 +851,7 @@ set, the default is @samp{~}, just as in Emacs. @cindex block size -Some @sc{gnu} programs (at least @command{df}, @command{du}, and +Some GNU programs (at least @command{df}, @command{du}, and @command{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. @@ -949,7 +952,7 @@ kilobyte: @math{10^3 = 1000}. @cindex kibibyte, definition of kibibyte: @math{2^{10} = 1024}. @samp{K} is special: the SI prefix is @samp{k} and the ISO/IEC 80000-13 prefix is @samp{Ki}, but tradition and -@acronym{POSIX} use @samp{k} to mean @samp{KiB}. +POSIX use @samp{k} to mean @samp{KiB}. @item MB @cindex megabyte, definition of megabyte: @math{10^6 = 1,000,000}. @@ -1048,8 +1051,8 @@ floating point numbers such as @code{-0x.ep-3}, which stands for A @var{signal} may be a signal name like @samp{HUP}, or a signal number like @samp{1}, or an exit status of a process terminated by the signal. A signal name can be given in canonical form or prefixed by -@samp{SIG}. The case of the letters is ignored. The following signal names -and numbers are supported on all @acronym{POSIX} compliant systems: +@samp{SIG}@. The case of the letters is ignored. The following signal names +and numbers are supported on all POSIX compliant systems: @table @samp @item HUP @@ -1070,7 +1073,7 @@ and numbers are supported on all @acronym{POSIX} compliant systems: @noindent Other supported signal names have system-dependent corresponding -numbers. All systems conforming to @acronym{POSIX} 1003.1-2001 also +numbers. All systems conforming to POSIX 1003.1-2001 also support the following signals: @table @samp @@ -1105,7 +1108,7 @@ User-defined signal 2. @end table @noindent -@acronym{POSIX} 1003.1-2001 systems that support the @acronym{XSI} extension +POSIX 1003.1-2001 systems that support the XSI extension also support the following signals: @table @samp @@ -1126,7 +1129,7 @@ File size limit exceeded. @end table @noindent -@acronym{POSIX} 1003.1-2001 systems that support the @acronym{XRT} extension +POSIX 1003.1-2001 systems that support the XRT extension also support at least eight real-time signals called @samp{RTMIN}, @samp{RTMIN+1}, @dots{}, @samp{RTMAX-1}, @samp{RTMAX}. @@ -1143,10 +1146,10 @@ Since the @var{owner} and @var{group} arguments to @command{chown} and 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? -@acronym{POSIX} requires that @command{chown} and @command{chgrp} +Should the command interpret it as a user name or as an ID@? +POSIX requires that @command{chown} and @command{chgrp} first attempt to resolve the specified string as a name, and -only once that fails, then try to interpret it as an ID. +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 @samp{42} is a user name that maps to some other user ID, say 1000. @@ -1272,7 +1275,7 @@ ls | xargs mv -t ../d -- @end smallexample However, this doesn't move files whose names begin with @samp{.}. -If you use the @sc{gnu} @command{find} program, you can move those +If you use the GNU @command{find} program, you can move those files too, with this command: @example @@ -1284,7 +1287,7 @@ 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 -@sc{gnu} @command{find} and @sc{gnu} @command{xargs}: +GNU @command{find} and GNU @command{xargs}: @example find . -mindepth 1 -maxdepth 1 -print0 \ @@ -1304,7 +1307,7 @@ options cannot be combined. @cindex trailing slashes -Some @sc{gnu} programs (at least @command{cp} and @command{mv}) allow you to +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 this behavior. @@ -1318,7 +1321,7 @@ option, @command{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 @emph{directory} and not the symbolic link. Although it may seem surprising that such behavior -be the default, it is required by @acronym{POSIX} and is consistent with +be the default, it is required by POSIX and is consistent with other parts of that standard. @node Traversing symlinks @@ -1382,11 +1385,11 @@ For example, if a user with appropriate privileges mistakenly runs @samp{rm -rf / tmp/junk}, that may remove all files on the entire system. Since there are so few legitimate uses for such a command, -@sc{gnu} @command{rm} normally declines to operate on any directory +GNU @command{rm} normally declines to operate on any directory that resolves to @file{/}. If you really want to try to remove all the files on your system, you can use the @option{--no-preserve-root} option, but the default behavior, specified by the -@option{--preserve-option}, is safer for most purposes. +@option{--preserve-root} option, is safer for most purposes. The commands @command{chgrp}, @command{chmod} and @command{chown} can also operate destructively on entire hierarchies, so they too @@ -1394,7 +1397,7 @@ support these options. Although, unlike @command{rm}, they don't actually unlink files, these commands are arguably more dangerous when operating recursively on @file{/}, since they often work much more quickly, and hence damage more files before an alert user can -interrupt them. Tradition and @acronym{POSIX} require these commands +interrupt them. Tradition and POSIX require these commands to operate recursively on @file{/}, so they default to @option{--no-preserve-root}, but using the @option{--preserve-root} option makes them safer for most purposes. For convenience you can @@ -1416,7 +1419,7 @@ well-defined behavior: it may generate an error message instead of exiting. Here is a list of the special built-in utilities that are standardized -by @acronym{POSIX} 1003.1-2004. +by POSIX 1003.1-2004. @quotation @t{.@: : break continue eval exec exit export readonly @@ -1436,31 +1439,31 @@ generates an error message instead of suspending. @section Standards conformance @vindex POSIXLY_CORRECT -In a few cases, the @sc{gnu} utilities' default behavior is -incompatible with the @acronym{POSIX} standard. To suppress these +In a few cases, the GNU utilities' default behavior is +incompatible with the POSIX standard. To suppress these incompatibilities, define the @env{POSIXLY_CORRECT} environment -variable. Unless you are checking for @acronym{POSIX} conformance, you +variable. Unless you are checking for POSIX conformance, you probably do not need to define @env{POSIXLY_CORRECT}. -Newer versions of @acronym{POSIX} are occasionally incompatible with older -versions. For example, older versions of @acronym{POSIX} required the +Newer versions of POSIX are occasionally incompatible with older +versions. For example, older versions of POSIX required the command @samp{sort +1} to sort based on the second and succeeding -fields in each input line, but starting with @acronym{POSIX} 1003.1-2001 +fields in each input line, but starting with POSIX 1003.1-2001 the same command is required to sort the file named @file{+1}, and you must instead use the command @samp{sort -k 2} to get the field-based sort. @vindex _POSIX2_VERSION -The @sc{gnu} utilities normally conform to the version of @acronym{POSIX} +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 @acronym{POSIX}, define the @env{_POSIX2_VERSION} +different version of POSIX, define the @env{_POSIX2_VERSION} environment variable to a value of the form @var{yyyymm} specifying the year and month the standard was adopted. Three values are currently supported for @env{_POSIX2_VERSION}: @samp{199209} stands for -@acronym{POSIX} 1003.2-1992, @samp{200112} stands for @acronym{POSIX} -1003.1-2001, and @samp{200809} stands for @acronym{POSIX} 1003.1-2008. +POSIX 1003.2-1992, @samp{200112} stands for POSIX +1003.1-2001, and @samp{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 @acronym{POSIX} and uses @samp{sort +1} +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. @@ -1548,7 +1551,7 @@ Display TAB characters as @samp{^I}. @item -u @opindex -u -Ignored; for @acronym{POSIX} compatibility. +Ignored; for POSIX compatibility. @item -v @itemx --show-nonprinting @@ -1614,10 +1617,7 @@ precedes in the file. @itemx --regex @opindex -r @opindex --regex -Treat the separator string as a regular expression. Users of @command{tac} -on MS-DOS/MS-Windows should note that, since @command{tac} reads files in -binary mode, each line of a text file might end with a CR/LF pair -instead of the Unix-style LF. +Treat the separator string as a regular expression. @item -s @var{separator} @itemx --separator=@var{separator} @@ -1627,8 +1627,18 @@ Use @var{separator} as the record separator, instead of newline. @end table +On systems like MS-DOS that distinguish between text and binary files, +@command{tac} reads and writes in binary mode. + @exitstatus +Example: + +@example +# Reverse a file character by character. +tac -r -s 'x\|[^x]' +@end example + @node nl invocation @section @command{nl}: Number lines and write files @@ -1881,12 +1891,12 @@ Output at most @var{bytes} bytes of the input. Prefixes and suffixes on @opindex --strings @cindex string constants, outputting Instead of the normal output, output only @dfn{string constants}: at -least @var{bytes} consecutive @acronym{ASCII} graphic characters, -followed by a zero byte (@acronym{ASCII} @sc{nul}). +least @var{bytes} consecutive ASCII graphic characters, +followed by a zero byte (ASCII NUL). Prefixes and suffixes on @var{bytes} are interpreted as for the @option{-j} option. -If @var{n} is omitted with @option{--strings}, the default is 3. +If @var{bytes} is omitted with @option{--strings}, the default is 3. @item -t @var{type} @itemx --format=@var{type} @@ -1900,14 +1910,14 @@ 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 @acronym{ASCII} character representation of the printable characters +of the ASCII 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 -@acronym{ASCII} character or backslash escape, +ASCII character or backslash escape, @item d signed decimal @item f @@ -1980,7 +1990,7 @@ omitted, the default is 32. @end table The next several options are shorthands for format specifications. -@sc{gnu} @command{od} accepts any combination of shorthands and format +GNU @command{od} accepts any combination of shorthands and format specification options. These options accumulate. @table @samp @@ -1995,7 +2005,7 @@ Output as octal bytes. Equivalent to @samp{-t o1}. @item -c @opindex -c -Output as @acronym{ASCII} characters or backslash escapes. Equivalent to +Output as ASCII characters or backslash escapes. Equivalent to @samp{-t c}. @item -d @@ -2055,7 +2065,7 @@ address. @command{base64} transforms data read from a file, or standard input, into (or from) base64 encoded form. The base64 encoded form uses -printable @acronym{ASCII} characters to represent binary data. +printable ASCII characters to represent binary data. Synopses: @smallexample @@ -2116,6 +2126,7 @@ These commands reformat the contents of files. @menu * fmt invocation:: Reformat paragraph text. +* numfmt invocation:: Reformat numbers. * pr invocation:: Paginate or columnate files for printing. * fold invocation:: Wrap input lines to fit in specified width. @end menu @@ -2206,7 +2217,7 @@ between sentences to two spaces. Fill output lines up to @var{width} characters (default 75 or @var{goal} plus 10, if @var{goal} is provided). -@itemx -g @var{goal} +@item -g @var{goal} @itemx --goal=@var{goal} @opindex -g @opindex --goal @@ -2225,6 +2236,325 @@ leaving the code unchanged. @exitstatus +@node numfmt invocation +@section @command{numfmt}: Reformat numbers + +@pindex numfmt + +@command{numfmt} reads numbers in various representations and reformats them +as requested. The most common usage is converting numbers to/from @emph{human} +representation (e.g. @samp{4G} @expansion{} @samp{4,000,000,000}). + +@example +numfmt [@var{option}]@dots{} [@var{number}] +@end example + +@command{numfmt} converts each @var{number} on the command-line according to the +specified options (see below). If no @var{number}s are given, it reads numbers +from standard input. @command{numfmt} can optionally extract numbers from +specific columns, maintaining proper line padding and alignment. + +@exitstatus + +See @option{--invalid} for additional information regarding exit status. + +@subsection General options + +The program accepts the following options. Also see @ref{Common options}. + +@table @samp + +@item --debug +@opindex --debug +Print (to standard error) warning messages about possible erroneous usage. + +@item -d @var{d} +@itemx --delimiter=@var{d} +@opindex -d +@opindex --delimiter +Use the character @var{d} as input field separator (default: whitespace). +@emph{Note}: Using non-default delimiter turns off automatic padding. + +@item --field=@var{n} +@opindex --field +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 +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}. + +@item --from=@var{unit} +@opindex --from +Auto-scales input numbers according to @var{unit}. See UNITS below. +The default is no scaling, meaning suffixes (e.g. @samp{M}, @samp{G}) will +trigger an error. + +@item --from-unit=@var{n} +@opindex --from-unit +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 @samp{10} +represents 10 units of 512 bytes, use @samp{--from=unit=512}). + +@item --grouping +@opindex --grouping +Group digits in output numbers according to the current locale's grouping rules +(e.g @emph{Thousands Separator} character, commonly @samp{.} (dot) or @samp{,} +comma). This option has no effect in @samp{POSIX/C} locale. + +@item --header[=@var{n}] +@opindex --header +@opindex --header=N +Print the first @var{n} (default: 1) lines without any conversion. + +@item --invalid=@var{mode} +@opindex --invalid +The default action on input errors is to exit immediately with status code 2. +@option{--invalid=@samp{abort}} explicitly specifies this default mode. +With a @var{mode} of @samp{fail}, print a warning for @emph{each} conversion +error, and exit with status 2. With a @var{mode} of @samp{warn}, exit with +status 0, even in the presence of conversion errors, and with a @var{mode} of +@samp{ignore} do not even print diagnostics. + +@item --padding=@var{n} +@opindex --padding +Pad the output numbers to @var{n} characters, by adding spaces. If @var{n} is +a positive number, numbers will be right-aligned. If @var{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). + +@item --round=@var{method} +@opindex --round +@opindex --round=up +@opindex --round=down +@opindex --round=from-zero +@opindex --round=towards-zero +@opindex --round=nearest +When converting number representations, round the number according to +@var{method}, which can be @samp{up}, @samp{down}, +@samp{from-zero} (the default), @samp{towards-zero}, @samp{nearest}. + +@item --suffix=@var{suffix} +@opindex --suffix +Add @samp{SUFFIX} to the output numbers, and accept optional @samp{SUFFIX} in +input numbers. + +@item --to=@var{unit} +@opindex --to +Auto-scales output numbers according to @var{unit}. See @emph{Units} below. +The default is no scaling, meaning all the digits of the number are printed. + +@item --to-unit=@var{n} +@opindex --to-unit +Specify the output unit size (instead of the default 1). Use this option when +the output numbers represent other units (e.g. to represent @samp{4,000,000} +bytes in blocks of 1KB, use @samp{--to=si --to=units=1000}). + +@end table + +@subsection Possible @var{unit}s: + +The following are the possible @var{unit} options with @option{--from=UNITS} and +@option{--to=UNITS}: + +@table @var + +@item none +No scaling is performed. For input numbers, no suffixes are accepted, and any +trailing characters following the number will trigger an error. For output +numbers, all digits of the numbers will be printed. + +@item si +Auto-scale numbers according to the @emph{International System of Units (SI)} +standard. +For input numbers, accept one of the following suffixes. +For output numbers, values larger than 1000 will be rounded, and printed with +one of the following suffixes: + +@example +@samp{K} => @math{1000^1 = 10^3} (Kilo) +@samp{M} => @math{1000^2 = 10^6} (Mega) +@samp{G} => @math{1000^3 = 10^9} (Giga) +@samp{T} => @math{1000^4 = 10^{12}} (Tera) +@samp{P} => @math{1000^5 = 10^{15}} (Peta) +@samp{E} => @math{1000^6 = 10^{18}} (Exa) +@samp{Z} => @math{1000^7 = 10^{21}} (Zetta) +@samp{Y} => @math{1000^8 = 10^{24}} (Yotta) +@end example + +@item iec +Auto-scale numbers according to the @emph{International Electronical +Commission (IEC)} standard. +For input numbers, accept one of the following suffixes. +For output numbers, values larger than 1024 will be rounded, and printed with +one of the following suffixes: + +@example +@samp{K} => @math{1024^1 = 2^{10}} (Kibi) +@samp{M} => @math{1024^2 = 2^{20}} (Mebi) +@samp{G} => @math{1024^3 = 2^{30}} (Gibi) +@samp{T} => @math{1024^4 = 2^{40}} (Tebi) +@samp{P} => @math{1024^5 = 2^{50}} (Pebi) +@samp{E} => @math{1024^6 = 2^{60}} (Exbi) +@samp{Z} => @math{1024^7 = 2^{70}} (Zebi) +@samp{Y} => @math{1024^8 = 2^{80}} (Yobi) +@end example + +The @option{iec} option uses a single letter suffix (e.g. @samp{G}), which is +not fully standard, as the @emph{iec} standard recommends a two-letter symbol +(e.g @samp{Gi}) - but in practice, this method common. Compare with +the @option{iec-i} option. + +@item iec-i +Auto-scale numbers according to the @emph{International Electronical +Commission (IEC)} standard. +For input numbers, accept one of the following suffixes. +For output numbers, values larger than 1024 will be rounded, and printed with +one of the following suffixes: + +@example +@samp{Ki} => @math{1024^1 = 2^{10}} (Kibi) +@samp{Mi} => @math{1024^2 = 2^{20}} (Mebi) +@samp{Gi} => @math{1024^3 = 2^{30}} (Gibi) +@samp{Ti} => @math{1024^4 = 2^{40}} (Tebi) +@samp{Pi} => @math{1024^5 = 2^{50}} (Pebi) +@samp{Ei} => @math{1024^6 = 2^{60}} (Exbi) +@samp{Zi} => @math{1024^7 = 2^{70}} (Zebi) +@samp{Yi} => @math{1024^8 = 2^{80}} (Yobi) +@end example + +The @option{iec-i} option uses a two-letter suffix symbol (e.g. @samp{Gi}), +as the @emph{iec} standard recommends, but this is not always common in +practice. Compare with the @option{iec} option. + +@item auto +@samp{auto} can only be used with @option{--from}. With this method, numbers +with @samp{K},@samp{M},@samp{G},@samp{T},@samp{P},@samp{E},@samp{Z},@samp{Y} +suffixes are interpreted as @emph{SI} values, and numbers with @samp{Ki}, +@samp{Mi},@samp{Gi},@samp{Ti},@samp{Pi},@samp{Ei},@samp{Zi},@samp{Yi} suffixes +are interpreted as @emph{IEC} values. + +@end table + +@subsection Examples of using @command{numfmt} + +Converting a single number from/to @emph{human} representation: +@example +$ nunfmt --to=si 500000 +500K + +$ numfmt --to=iec 500000 +489K + +$ numfmt --to=iec-i 500000 +489Ki + +$ numfmt --from=si 1M +1000000 + +$ numfmt --from=iec 1M +1048576 + +# with '--from=auto', M=Mega, Mi=Mebi +$ numfmt --from=auto 1M +1000000 +$ numfmt --from=auto 1Mi +1048576 +@end example + +Converting from @samp{SI} to @samp{IEC} scales (e.g. when a harddisk capacity is +advertised as @samp{1TB}, while checking the drive's capacity gives lower +values): + +@example +$ numfmt --from=si --to=iec 1T +932G +@end example + + +Converting a single field from an input file / piped input (these contrived +examples are for demonstration purposes only, as both @command{ls} and +@command{df} support the @option{--human-readable} option to +output sizes in human-readable format): + +@example +# Third field (file size) will be shown in SI representation +$ ls -log | numfmt --field 3 --header --to=si | head -n4 +-rw-r--r-- 1 94K Aug 23 2011 ABOUT-NLS +-rw-r--r-- 1 3.7K Jan 7 16:15 AUTHORS +-rw-r--r-- 1 36K Jun 1 2011 COPYING +-rw-r--r-- 1 0 Jan 7 15:15 ChangeLog + +# Second field (size) will be shown in IEC representation +$ df --block-size=1 | numfmt --field 2 --header --to=iec | head -n4 +File system 1B-blocks Used Available Use% Mounted on +rootfs 132G 104741408 26554036 80% / +tmpfs 794M 7580 804960 1% /run/shm +/dev/sdb1 694G 651424756 46074696 94% /home +@end example + + +Output can be tweaked using @option{--padding} or @option{--format}: + +@example +# Pad to 10 characters, right-aligned +$ du -s * | numfmt --to=si --padding=10 + 2.5K config.log + 108 config.status + 1.7K configure + 20 configure.ac + +# Pad to 10 characters, left-aligned +$ du -s * | numfmt --to=si --padding=-10 +2.5K config.log +108 config.status +1.7K configure +20 configure.ac + +# Pad to 10 characters, left-aligned, using 'format' +$ du -s * | numfmt --to=si --format="%10f" + 2.5K config.log + 108 config.status + 1.7K configure + 20 configure.ac + +# Pad to 10 characters, left-aligned, using 'format' +$ du -s * | numfmt --to=si --padding="%-10f" +2.5K config.log +108 config.status +1.7K configure +20 configure.ac +@end example + +With locales that support grouping digits, using @option{--grouping} or +@option{--format} enables grouping. In @samp{POSIX} locale, grouping is +silently ignored: + +@example +$ LC_ALL=C numfmt --from=iec --grouping 2G +2147483648 + +$ LC_ALL=en_US.utf8 numfmt --from=iec --grouping 2G +2,147,483,648 + +$ LC_ALL=ta_IN numfmt --from=iec --grouping 2G +2,14,74,83,648 + +$ LC_ALL=C ./src/numfmt --from=iec --format="==%'15f==" 2G +== 2147483648== + +$ LC_ALL=en_US.utf8 ./src/numfmt --from=iec --format="==%'15f==" 2G +== 2,147,483,648== + +$ LC_ALL=en_US.utf8 ./src/numfmt --from=iec --format="==%'-15f==" 2G +==2,147,483,648 == + +$ LC_ALL=ta_IN ./src/numfmt --from=iec --format="==%'15f==" 2G +== 2,14,74,83,648== +@end example @node pr invocation @section @command{pr}: Paginate or columnate files for printing @@ -2269,36 +2599,6 @@ For single column output no line truncation occurs by default. Use @option{-W} option to truncate lines in that case. -The following changes were made in version 1.22i and apply to later -versions of @command{pr}: -@c FIXME: this whole section here sounds very awkward to me. I -@c made a few small changes, but really it all needs to be redone. - Brian -@c OK, I fixed another sentence or two, but some of it I just don't understand. -@ - Brian -@itemize @bullet - -@item -Some small @var{letter options} (@option{-s}, @option{-w}) have been -redefined for better @acronym{POSIX} compliance. The output of some further -cases has been adapted to other Unix systems. These changes are not -compatible with earlier versions of the program. - -@item -Some @var{new capital letter} options (@option{-J}, @option{-S}, @option{-W}) -have been introduced to turn off unexpected interferences of small letter -options. The @option{-N} option and the second argument @var{last_page} -of @samp{+FIRST_PAGE} offer more flexibility. The detailed handling of -form feeds set in the input files requires the @option{-T} option. - -@item -Capital letter options override small letter ones. - -@item -Some of the option-arguments (compare @option{-s}, @option{-e}, -@option{-i}, @option{-n}) cannot be specified as separate arguments from the -preceding option letter (already stated in the @acronym{POSIX} specification). -@end itemize - The program accepts the following options. Also see @ref{Common options}. @table @samp @@ -2377,7 +2677,7 @@ e.g., @option{--date-format="Monday morning"}. The default date format is @samp{%Y-%m-%d %H:%M} (for example, @samp{2001-12-04 23:59}); but if the @env{POSIXLY_CORRECT} environment variable is set -and the @env{LC_TIME} locale category specifies the @acronym{POSIX} +and the @env{LC_TIME} locale category specifies the POSIX locale, the default is @samp{%b %e %H:%M %Y} (for example, @samp{Dec@ @ 4 23:59 2001}. @@ -2434,7 +2734,7 @@ Merge lines of full length. Used together with the column options no column alignment used; may be used with @option{--sep-string[=@var{string}]}. @option{-J} has been introduced (together with @option{-W} and @option{--sep-string}) -to disentangle the old (@acronym{POSIX}-compliant) options @option{-w} and +to disentangle the old (POSIX-compliant) options @option{-w} and @option{-s} along with the three column options. @@ -2480,11 +2780,11 @@ 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 @var{margin} specified by @option{-o} option. With multicolumn output priority is given to -@samp{equal width of output columns} (a @acronym{POSIX} specification). +@samp{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 @var{margin}. That means a fixed number of spaces is always printed in the place of the -@var{number-separator} TAB. The tabification depends upon the output +@var{number-separator} TAB@. The tabification depends upon the output position. @item -N @var{line_number} @@ -2521,7 +2821,7 @@ Separate columns by a single character @var{char}. The default for character} with @option{-w}. Without @option{-s} the default separator @samp{space} is set. @option{-s[char]} turns off line truncation of all three column options (@option{-COLUMN}|@option{-a -COLUMN}|@option{-m}) unless -@option{-w} is set. This is a @acronym{POSIX}-compliant formulation. +@option{-w} is set. This is a POSIX-compliant formulation. @item -S[@var{string}] @@ -2571,7 +2871,7 @@ 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. Lines of full length are merged, regardless of the column options set. No @var{page_width} setting is possible with single column output. -A @acronym{POSIX}-compliant formulation. +A POSIX-compliant formulation. @item -W @var{page_width} @itemx --page_width=@var{page_width} @@ -2585,7 +2885,7 @@ alignment is always used. The separator options @option{-S} or @option{-s} don't affect 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 +most frequent tasks). That's equivalent to @option{-W 72 -J}@. The header line is never truncated. @end table @@ -2704,7 +3004,7 @@ However, if @var{k} starts with a @samp{-}, print all but the last @var{k} bytes of each file. @multiplierSuffixes{k} -@itemx -n @var{k} +@item -n @var{k} @itemx --lines=@var{k} @opindex -n @opindex --lines @@ -2768,13 +3068,13 @@ one-line header consisting of: before the output for each @var{file}. @cindex BSD @command{tail} -@sc{gnu} @command{tail} can output any amount of data (some other versions of +GNU @command{tail} can output any amount of data (some other versions of @command{tail} cannot). It also has no @option{-r} option (print in reverse), since reversing a file is really a different job from printing the end of a file; BSD @command{tail} (which is the one with @option{-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 @sc{gnu} @command{tac} command. +the GNU @command{tac} command. The program accepts the following options. Also see @ref{Common options}. @@ -2854,7 +3154,7 @@ This option is the same as @option{--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. -@itemx --retry +@item --retry @opindex --retry This option is useful mainly when following by name (i.e., with @option{--follow=name}). @@ -2862,7 +3162,7 @@ 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. -@itemx --sleep-interval=@var{number} +@item --sleep-interval=@var{number} @opindex --sleep-interval 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 @@ -2875,7 +3175,7 @@ is usually ignored. However, if you also specify @option{--pid=@var{p}}, @command{tail} checks whether process @var{p} is alive at least every @var{number} seconds. -@itemx --pid=@var{pid} +@item --pid=@var{pid} @opindex --pid When following by name or by descriptor, you may specify the process ID, @var{pid}, of the sole writer of all @var{file} arguments. Then, shortly @@ -2898,7 +3198,7 @@ terminate until long after the real writer has terminated. Note that @option{--pid} cannot be supported on some systems; @command{tail} will print a warning if this is the case. -@itemx --max-unchanged-stats=@var{n} +@item --max-unchanged-stats=@var{n} @opindex --max-unchanged-stats When tailing a file by name, if there have been @var{n} (default n=@value{DEFAULT_MAX_N_UNCHANGED_STATS_BETWEEN_OPENS}) consecutive @@ -2911,7 +3211,7 @@ 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. -@itemx -n @var{k} +@item -n @var{k} @itemx --lines=@var{k} @opindex -n @opindex --lines @@ -2963,7 +3263,7 @@ can use a test like @samp{if tail -c +1 </dev/null >/dev/null 2>&1; then @dots{}} 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 @acronym{POSIX} +beware usages whose behaviors differ depending on the POSIX version. For example, avoid @samp{tail - main.c}, since it might be interpreted as either @samp{tail main.c} or as @samp{tail -- - main.c}; avoid @samp{tail -c 4}, since it might mean either @samp{tail @@ -3036,7 +3336,7 @@ possible without exceeding @var{size} bytes. Individual lines longer than @var{size} bytes are broken into multiple files. @var{size} has the same format as for the @option{--bytes} option. -@itemx --filter=@var{command} +@item --filter=@var{command} @opindex --filter With this option, rather than simply writing to each output file, write through a pipe to the specified shell @var{command} for each output file. @@ -3110,9 +3410,9 @@ Note specifying a @var{from} value also disables the default auto suffix length expansion described above, and so you may also want to specify @option{-a} to allow suffixes beyond @samp{99}. -@itemx --additional-suffix=@var{suffix} +@item --additional-suffix=@var{suffix} @opindex --additional-suffix -Append an additional @var{suffix} to output file names. @var{suffix} +Append an additional @var{suffix} to output file names. @var{suffix} must not contain slash. @item -e @@ -3129,10 +3429,10 @@ even when this option is specified. @itemx --unbuffered @opindex -u @opindex --unbuffered -Immediately copy input to output in @option{--number r/...} mode, +Immediately copy input to output in @option{--number r/@dots{}} mode, which is a much slower mode of operation. -@itemx --verbose +@item --verbose @opindex --verbose Write a diagnostic just before each output file is opened. @@ -3430,7 +3730,7 @@ 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 @acronym{GNU} extension, if only one count is printed, +However, as a GNU extension, if only one count is printed, it is guaranteed to be printed without leading spaces. By default, @command{wc} prints three counts: the newline, words, and byte @@ -3485,24 +3785,24 @@ Print only the newline counts. Print only the maximum line lengths. @macro filesZeroFromOption{cmd,withTotalOption,subListOutput} -@itemx --files0-from=@var{file} +@item --files0-from=@var{file} @opindex --files0-from=@var{file} @c This is commented out to avoid a texi2dvi failure. @c texi2dvi (GNU Texinfo 4.11) 1.104 @c @cindex including files from @command{\cmd\} Disallow processing files named on the command line, and instead process those named in file @var{file}; each name being terminated by a zero byte -(@acronym{ASCII} @sc{nul}). +(ASCII NUL). This is useful \withTotalOption\ when the list of file names is so long that it may exceed a command line length limitation. In such cases, running @command{\cmd\} via @command{xargs} is undesirable because it splits the list into pieces and makes @command{\cmd\} print \subListOutput\ for each sublist rather than for the entire list. -One way to produce a list of @acronym{ASCII} @sc{nul} terminated file -names is with @sc{gnu} +One way to produce a list of ASCII NUL terminated file +names is with GNU @command{find}, using its @option{-print0} predicate. -If @var{file} is @samp{-} then the @acronym{ASCII} @sc{nul} terminated +If @var{file} is @samp{-} then the ASCII NUL terminated file names are read from standard input. @end macro @filesZeroFromOption{wc,,a total} @@ -3540,7 +3840,7 @@ is given, file names are also printed (by default). (With the @option{--sysv} option, corresponding file names are printed when there is at least one file argument.) -By default, @sc{gnu} @command{sum} computes checksums using an algorithm +By default, GNU @command{sum} computes checksums using an algorithm compatible with BSD @command{sum} and prints file sizes in units of 1024-byte blocks. @@ -3595,7 +3895,7 @@ by comparing the @command{cksum} output for the received files with the @command{cksum} output for the original files (typically given in the distribution). -The CRC algorithm is specified by the @acronym{POSIX} standard. It is not +The CRC algorithm is specified by the POSIX standard. It is not compatible with the BSD or System V @command{sum} algorithms (see the previous section); it is more robust. @@ -3656,7 +3956,7 @@ The program accepts the following options. Also see @ref{Common options}. @cindex binary input files Treat each input file as binary, by reading it in binary mode and outputting a @samp{*} flag. This is the inverse of @option{--text}. -On systems like @acronym{GNU} that do not distinguish between binary +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 @@ -3686,7 +3986,7 @@ an MD5 checksum inconsistent with the associated file, or if no valid line is found, @command{md5sum} exits with nonzero status. Otherwise, it exits successfully. -@itemx --quiet +@item --quiet @opindex --quiet @cindex verifying MD5 checksums This option is useful only when verifying checksums. @@ -3695,7 +3995,7 @@ 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. -@itemx --status +@item --status @opindex --status @cindex verifying MD5 checksums This option is useful only when verifying checksums. @@ -3707,6 +4007,17 @@ 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. +@item --tag +@opindex --tag +@cindex BSD output +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 @samp{\} +at the start of the line, being used. +The @option{--tag} option implies binary mode, and is disallowed with +@option{--text} mode as supporting that would unnecessarily complicate +the output format, while providing little benefit. + @item -t @itemx --text @opindex -t @@ -3714,10 +4025,10 @@ indicating there was a failure. @cindex text input files Treat each input file as text, by reading it in text mode and outputting a @samp{ } flag. This is the inverse of @option{--binary}. -This option is the default on systems like @acronym{GNU} that do not +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. +terminal. This mode is never defaulted to if @option{--tag} is used. @item -w @itemx --warn @@ -3728,7 +4039,7 @@ 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. -@itemx --strict +@item --strict @opindex --strict @cindex verifying MD5 checksums When verifying checksums, @@ -3891,19 +4202,19 @@ in their original relative order. The @option{--unique} @vindex LC_COLLATE Unless otherwise specified, all comparisons use the character collating sequence specified by the @env{LC_COLLATE} locale.@footnote{If you -use a non-@acronym{POSIX} locale (e.g., by setting @env{LC_ALL} +use a non-POSIX locale (e.g., by setting @env{LC_ALL} to @samp{en_US}), then @command{sort} may produce output that is sorted differently than you're accustomed to. In that case, set the @env{LC_ALL} -environment variable to @samp{C}. Note that setting only @env{LC_COLLATE} +environment variable to @samp{C}@. Note that setting only @env{LC_COLLATE} has two problems. First, it is ineffective if @env{LC_ALL} is also set. Second, it has undefined behavior if @env{LC_CTYPE} (or @env{LANG}, if @env{LC_CTYPE} is unset) is set to an incompatible value. For example, you get undefined behavior if @env{LC_CTYPE} is @code{ja_JP.PCK} but @env{LC_COLLATE} is @code{en_US.UTF-8}.} -@sc{gnu} @command{sort} (as specified for all @sc{gnu} utilities) has no +GNU @command{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, @sc{gnu} +In addition, if the final byte of an input file is not a newline, GNU @command{sort} silently supplies one. A line's trailing newline is not part of the line for comparison purposes. @@ -3926,7 +4237,7 @@ The following options affect the ordering of output lines. They may 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-@acronym{POSIX} +not specify any special options of their own. In pre-POSIX versions of @command{sort}, global options affect only later key fields, so portable shell scripts should specify global options first. @@ -3954,7 +4265,7 @@ positions specified in keys with the @option{-k} option. @vindex LC_CTYPE Sort in @dfn{phone directory} order: ignore all characters except letters, digits and blanks when sorting. -By default letters and digits are those of @acronym{ASCII} and a blank +By default letters and digits are those of ASCII and a blank is a space or a tab, but the @env{LC_CTYPE} locale can change this. @item -f @@ -3968,8 +4279,8 @@ Fold lowercase characters into the equivalent uppercase characters when comparing so that, for example, @samp{b} and @samp{B} sort as equal. The @env{LC_CTYPE} locale determines character types. When used with @option{--unique} those lower case equivalent lines are -thrown away. (There is currently no way to throw away the upper case -equivalent instead. (Any @option{--reverse} given would only affect +thrown away. (There is currently no way to throw away the upper case +equivalent instead. (Any @option{--reverse} given would only affect the final result, after the throwing away.)) @item -g @@ -4012,17 +4323,17 @@ converting to floating point. @cindex human numeric sort @vindex LC_NUMERIC Sort numerically, first by numeric sign (negative, zero, or positive); -then by @acronym{SI} suffix (either empty, or @samp{k} or @samp{K}, or +then by SI suffix (either empty, or @samp{k} or @samp{K}, or one of @samp{MGTPEZY}, in that order; @pxref{Block size}); and finally by numeric value. For example, @samp{1023M} sorts before @samp{1G} -because @samp{M} (mega) precedes @samp{G} (giga) as an @acronym{SI} +because @samp{M} (mega) precedes @samp{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 @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 @acronym{SI} suffix must immediately follow the number. +option; the SI suffix must immediately follow the number. @item -i @itemx --ignore-nonprinting @@ -4046,7 +4357,7 @@ This option has no effect if the stronger @option{--dictionary-order} @vindex LC_TIME 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 @samp{JAN} < @samp{FEB} < @dots{} < @samp{DEC}. +compared in the order @samp{JAN} < @samp{FEB} < @dots{} < @samp{DEC}@. Invalid names compare low to valid names. The @env{LC_TIME} locale category determines the month spellings. By default a blank is a space or a tab, but the @env{LC_CTYPE} locale @@ -4173,7 +4484,7 @@ a temporary file, which is then used as an input in a subsequent merge. A large value of @var{nmerge} may improve merge performance and decrease temporary storage utilization at the expense of increased memory usage -and I/O. Conversely a small value of @var{nmerge} may reduce memory +and I/O@. Conversely a small value of @var{nmerge} may reduce memory requirements and I/O at the expense of temporary storage consumption and merge performance. @@ -4197,7 +4508,7 @@ silently uses a smaller value. Write output to @var{output-file} instead of standard output. Normally, @command{sort} reads all input before opening @var{output-file}, so you can safely sort a file in place by using -commands like @code{sort -o F F} and @code{cat F | sort -o F}. +commands like @code{sort -o F F} and @code{cat F | sort -o F}@. However, @command{sort} with @option{--merge} (@option{-m}) can open the output file before reading all input, so a command like @code{cat F | sort -m -o F - G} is not safe as @command{sort} might start @@ -4205,7 +4516,7 @@ writing @file{F} before @command{cat} is done reading it. @vindex POSIXLY_CORRECT On newer systems, @option{-o} cannot appear after an input file if -@env{POSIXLY_CORRECT} is set, e.g., @samp{sort F -o F}. Portable +@env{POSIXLY_CORRECT} is set, e.g., @samp{sort F -o F}@. Portable scripts should specify @option{-o @var{output-file}} before any input files. @@ -4237,7 +4548,7 @@ Use a main-memory sort buffer of the given @var{size}. By default, @var{size} to be interpreted as a percentage of physical memory. Appending @samp{K} multiplies @var{size} by 1024 (the default), @samp{M} by 1,048,576, @samp{G} by 1,073,741,824, and so on for -@samp{T}, @samp{P}, @samp{E}, @samp{Z}, and @samp{Y}. Appending +@samp{T}, @samp{P}, @samp{E}, @samp{Z}, and @samp{Y}@. Appending @samp{b} causes @var{size} to be interpreted as a byte count, with no multiplication. @@ -4267,7 +4578,7 @@ However, fields that extend to the end of the line, as @option{-k 2}, or fields consisting of a range, as @option{-k 2,3}, retain the field separators present between the endpoints of the range. -To specify @acronym{ASCII} @sc{nul} as the field separator, +To specify ASCII NUL as the field separator, use the two-character string @samp{\0}, e.g., @samp{sort -t '\0'}. @item -T @var{tempdir} @@ -4316,9 +4627,9 @@ uniq} inspects the entire line. @xref{uniq invocation}. @opindex -z @opindex --zero-terminated @cindex process zero-terminated items -Delimit items with a zero byte rather than a newline (@acronym{ASCII} @sc{lf}). -I.E. treat input as items separated by @acronym{ASCII} @sc{nul} -and terminate output items with @acronym{ASCII} @sc{nul}. +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 @@ -4331,9 +4642,9 @@ or other special characters). Historical (BSD and System V) implementations of @command{sort} have differed in their interpretation of some options, particularly @option{-b}, @option{-f}, and @option{-n}. -@sc{gnu} sort follows the @acronym{POSIX} +GNU sort follows the POSIX behavior, which is usually (but not always!) like the System V behavior. -According to @acronym{POSIX}, @option{-n} no longer implies @option{-b}. For +According to POSIX, @option{-n} no longer implies @option{-b}. For consistency, @option{-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 @option{-b}. @@ -4508,7 +4819,7 @@ by the sort operation. @c @end example @item -Use the common @acronym{DSU, Decorate Sort Undecorate} idiom to +Use the common DSU, Decorate Sort Undecorate idiom to sort lines according to their length. @example @@ -4768,12 +5079,12 @@ This is equivalent to @option{--all-repeated} (@option{-D}). @item prepend Output a newline before each group of repeated lines. With @option{--zero-terminated} (@option{-z}), use a zero -byte (@acronym{ASCII} @sc{nul}) instead of a newline. +byte (ASCII NUL) instead of a newline. @item separate Separate groups of repeated lines with a single newline. With @option{--zero-terminated} (@option{-z}), use a zero -byte (@acronym{ASCII} @sc{nul}) instead of a newline. +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. @@ -4784,7 +5095,7 @@ two or more consecutive blank lines, then the output is ambiguous. To avoid that, filter the input through @samp{tr -s '\n'} to replace each sequence of consecutive newlines with a single newline. -This is a @sc{gnu} extension. +This is a GNU extension. @c FIXME: give an example showing *how* it's useful @item -u @@ -4906,15 +5217,15 @@ ptx -G [@var{option} @dots{}] [@var{input} [@var{output}]] @end example The @option{-G} (or its equivalent: @option{--traditional}) option disables -all @sc{gnu} extensions and reverts to traditional mode, thus introducing some +all GNU extensions and reverts to traditional mode, thus introducing some limitations and changing several of the program's default option values. -When @option{-G} is not specified, @sc{gnu} extensions are always enabled. -@sc{gnu} extensions to @command{ptx} are documented wherever appropriate in this +When @option{-G} is not specified, GNU extensions are always enabled. +GNU extensions to @command{ptx} are documented wherever appropriate in this document. @xref{Compatibility in ptx}, for the full list. Individual options are explained in the following sections. -When @sc{gnu} extensions are enabled, there may be zero, one or several +When GNU extensions are enabled, there may be zero, one or several @var{file}s after the options. If there is no @var{file}, the program reads the standard input. If there is one or several @var{file}s, they give the name of input files which are all read in turn, as if all the @@ -4924,7 +5235,7 @@ 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 @sc{gnu} extensions are @emph{not} enabled, that is, when the program +When GNU extensions are @emph{not} enabled, that is, when the program operates in traditional mode, there may be zero, one or two parameters besides the options. If there are no parameters, the program reads the standard input and outputs the permuted index to the standard output. @@ -4934,7 +5245,7 @@ respectively the name of the @var{input} file to read and the name of the @var{output} file to produce. @emph{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 @command{ptx} -compatibility; @sc{gnu} Standards normally discourage output parameters not +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 @@ -4958,7 +5269,7 @@ convention more than once per program invocation. @item -G @itemx --traditional -As already explained, this option disables all @sc{gnu} extensions to +As already explained, this option disables all GNU extensions to @command{ptx} and switches to traditional mode. @item --help @@ -4979,10 +5290,10 @@ processing. @c FIXME: People don't necessarily know what an IBM-PC was these days. As it is set up now, the program assumes that the input file is coded -using 8-bit @acronym{ISO} 8859-1 code, also known as Latin-1 character set, +using 8-bit ISO 8859-1 code, also known as Latin-1 character set, @emph{unless} it is compiled for MS-DOS, in which case it uses the -character set of the IBM-PC@. (@sc{gnu} @command{ptx} is not known to work on -smaller MS-DOS machines anymore.) Compared to 7-bit @acronym{ASCII}, the set +character set of the IBM-PC@. (GNU @command{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, @@ -5014,9 +5325,9 @@ is not part of the Break file is a word constituent. If both options @option{-b} and @option{-W} are specified, then @option{-W} has precedence and @option{-b} is ignored. -When @sc{gnu} extensions are enabled, the only way to avoid newline as a +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 with no -newline at all, not even at the end of the file. When @sc{gnu} extensions +newline at all, not even at the end of the file. When GNU extensions are disabled, spaces, tabs and newlines are always considered as break characters even if not included in the Break file. @@ -5055,7 +5366,7 @@ Using this option changes the default value for option @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 @emph{when} the context ends exactly at the newline. If option -@option{-r} is used with @option{-S} default value, or when @sc{gnu} extensions +@option{-r} is used with @option{-S} default value, or when GNU extensions are disabled, this condition is always met and references are completely excluded from the output contexts. @@ -5066,15 +5377,15 @@ 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 @sc{gnu} extensions are enabled and if @option{-r} option is not +default, when GNU extensions are enabled and if @option{-r} option is not used, end of sentences are used. In this case, this @var{regex} is -imported from @sc{gnu} Emacs: +imported from GNU Emacs: @example [.?!][]\"')@}]*\\($\\|\t\\| \\)[ \t\n]* @end example -Whenever @sc{gnu} extensions are disabled or if @option{-r} option is used, end +Whenever GNU extensions are disabled or if @option{-r} option is used, end of lines are used; in this case, the default @var{regexp} is just: @example @@ -5106,8 +5417,8 @@ corresponding characters by @command{ptx} itself. @itemx --word-regexp=@var{regexp} This option selects which regular expression will describe each keyword. -By default, if @sc{gnu} extensions are enabled, a word is a sequence of -letters; the @var{regexp} used is @samp{\w+}. When @sc{gnu} extensions are +By default, if GNU extensions are enabled, a word is a sequence of +letters; the @var{regexp} used is @samp{\w+}. When GNU extensions are disabled, a word is by default anything which ends with a space, a tab or a newline; the @var{regexp} used is @samp{[^ \t\n]+}. @@ -5127,14 +5438,14 @@ the corresponding characters by @command{ptx} itself. Output format is mainly controlled by the @option{-O} and @option{-T} options described in the table below. When neither @option{-O} nor @option{-T} are -selected, and if @sc{gnu} extensions are enabled, the program chooses an +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 @option{-A} and are output before the left context, that is, if option @option{-R} is @emph{not} selected, then -a colon is added after the reference; this nicely interfaces with @sc{gnu} +a colon is added after the reference; this nicely interfaces with GNU Emacs @code{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 @@ -5157,7 +5468,7 @@ output line. 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 @option{-R}. If this option is not +depending on the value of option @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, when references are @@ -5187,7 +5498,7 @@ context. For any other output format, option @option{-R} is ignored, with one exception: with @option{-R} the width of references is @emph{not} taken into account in total output width given by @option{-w}. -This option is automatically selected whenever @sc{gnu} extensions are +This option is automatically selected whenever GNU extensions are disabled. @item -F @var{string} @@ -5196,14 +5507,14 @@ disabled. This option will request that any truncation in the output be reported using the string @var{string}. Most output fields theoretically extend towards the beginning or the end of the current line, or current -sentence, as selected with option @option{-S}. But there is a maximum +sentence, as selected with option @option{-S}@. But there is a maximum allowed output line width, changeable through option @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 @option{-F /}. -@var{string} may have more than one character, as in @option{-F ...}. +@var{string} may have more than one character, as in @option{-F @dots{}}. Also, in the particular case when @var{string} is empty (@option{-F ""}), truncation flagging is disabled, and no truncation marks are appended in this case. @@ -5230,7 +5541,7 @@ processing. Each output line will look like: @end smallexample so it will be possible to write a @samp{.xx} roff macro to take care of -the output typesetting. This is the default output format when @sc{gnu} +the output typesetting. This is the default output format when GNU extensions are disabled. Option @option{-M} can be used to change @samp{xx} to another macro name. @@ -5267,7 +5578,7 @@ Circumflex and tilde diacritical marks produce the sequence @code{^\@{ @}} and @code{~\@{ @}} 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 tab, -and all other characters which are not part of @acronym{ASCII}, are merely +and all other characters which are not part of ASCII, are merely changed to exactly one space, with no special attempt to compress consecutive spaces. Let me know how to improve this special character processing for @TeX{}. @@ -5276,13 +5587,13 @@ processing for @TeX{}. @node Compatibility in ptx -@subsection The @sc{gnu} extensions to @command{ptx} +@subsection The GNU extensions to @command{ptx} This version of @command{ptx} contains a few features which do not exist in System V @command{ptx}. These extra features are suppressed by using the @option{-G} command line option, unless overridden by other command line -options. Some @sc{gnu} extensions cannot be recovered by overriding, so the -simple rule is to avoid @option{-G} if you care about @sc{gnu} extensions. +options. Some GNU extensions cannot be recovered by overriding, so the +simple rule is to avoid @option{-G} if you care about GNU extensions. Here are the differences between this program and System V @command{ptx}. @itemize @bullet @@ -5295,8 +5606,8 @@ or, if a second @var{file} parameter is given on the command, to that @var{file}. Having output parameters not introduced by options is a dangerous -practice which @sc{gnu} avoids as far as possible. So, for using @command{ptx} -portably between @sc{gnu} and System V, you should always use it with a +practice which GNU avoids as far as possible. So, for using @command{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 @option{-G} option to @command{ptx} calls in products using @command{ptx}, if the configurator finds @@ -5305,9 +5616,9 @@ that the installed @command{ptx} accepts @option{-G}. @item The only options available in System V @command{ptx} are options @option{-b}, @option{-f}, @option{-g}, @option{-i}, @option{-o}, @option{-r}, @option{-t} and -@option{-w}. All other options are @sc{gnu} extensions and are not repeated in +@option{-w}. All other options are GNU extensions and are not repeated in this enumeration. Moreover, some options have a slightly different -meaning when @sc{gnu} extensions are enabled, as explained below. +meaning when GNU extensions are enabled, as explained below. @item By default, concordance output is not formatted for @command{troff} or @@ -5316,29 +5627,30 @@ or @command{nroff} output may still be selected through option @option{-O}. @item Unless @option{-R} option is used, the maximum reference width is -subtracted from the total output line width. With @sc{gnu} extensions +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. @item -All 256 bytes, even @acronym{ASCII} @sc{nul} bytes, are always read and -processed from input file with no adverse effect, even if @sc{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. +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. @item -Input line length is only limited by available memory, even if @sc{gnu} +Input line length is only limited by available memory, even if GNU extensions are disabled. However, System V @command{ptx} processes only the first 200 characters in each line. @item The break (non-word) characters default to be every character except all -letters of the underlying character set, diacriticized or not. When @sc{gnu} +letters of the underlying character set, diacriticized or not. When GNU extensions are disabled, the break characters default to space, tab and newline only. @item -The program makes better use of output line width. If @sc{gnu} extensions +The program makes better use of output line width. If GNU extensions are disabled, the program rather tries to imitate System V @command{ptx}, but still, there are some slight disposition glitches this program does not completely reproduce. @@ -5626,7 +5938,7 @@ ranges of selected bytes. @item --complement @opindex --complement -This option is a @acronym{GNU} extension. +This option is a GNU extension. Select for printing the complement of the bytes, characters or fields selected with the @option{-b}, @option{-c} or @option{-f} options. In other words, do @emph{not} print the bytes, characters or fields @@ -5742,7 +6054,7 @@ do so consistently between @command{join} and @command{sort}. If @samp{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 @acronym{GNU} extension is +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 equal. For example: @@ -5794,12 +6106,12 @@ Do not check that both input files are in sorted order. This is the default. @item -e @var{string} @opindex -e Replace those output fields that are missing in the input with @var{string}. -I.E. missing fields specified with the @option{-12jo} options. +I.e., missing fields specified with the @option{-12jo} options. @item --header @opindex --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 @option{-o} is used to +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 @option{-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 @option{--check-order} is specified. Also if the header lines from each file @@ -5844,7 +6156,7 @@ to the join field. However, when printing unpairable lines (using either of the @option{-a} or @option{-v} options), there is no way to specify the join field using @var{m.n} in @var{field-list} if there are unpairable lines in both files. -To give @command{join} that functionality, @acronym{POSIX} invented the @samp{0} +To give @command{join} that functionality, POSIX invented the @samp{0} field specification notation. The elements in @var{field-list} @@ -5862,7 +6174,7 @@ Treat as significant each occurrence of @var{char} in the input file. Use @samp{sort -t @var{char}}, without the @option{-b} option of @samp{sort}, to produce this ordering. If @samp{join -t ''} is specified, the whole line is considered, matching the default operation of sort. -If @samp{-t '\0'} is specified then the @acronym{ASCII} @sc{nul} +If @samp{-t '\0'} is specified then the ASCII NUL character is used to delimit the fields. @item -v @var{file-number} @@ -5995,7 +6307,7 @@ from @var{m} through @var{n}, in ascending order. @var{m} should collate before @var{n}; if it doesn't, an error results. As an example, @samp{0-9} is the same as @samp{0123456789}. -@sc{gnu} @command{tr} does not support the System V syntax that uses square +GNU @command{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 @@ -6003,10 +6315,10 @@ behave unexpectedly. For example, @samp{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 @acronym{EBCDIC} hosts using the @samp{A-Z} +portable. For example, on EBCDIC hosts using the @samp{A-Z} range will not do what most would expect because @samp{A} through @samp{Z} -are not contiguous as they are in @acronym{ASCII}. -If you can rely on a @acronym{POSIX} compliant version of @command{tr}, then +are not contiguous as they are in ASCII@. +If you can rely on a POSIX compliant version of @command{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. @@ -6083,7 +6395,7 @@ The syntax @samp{[=@var{c}=]} expands to all of the characters that are equivalent to @var{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 @sc{gnu} @command{tr}; +contents. Therefore, they are not fully implemented in GNU @command{tr}; each character's equivalence class consists only of that character, which is of no particular use. @@ -6126,14 +6438,14 @@ typically have the same length. If @var{set1} is shorter than @var{set2}, the extra characters at the end of @var{set2} are ignored. On the other hand, making @var{set1} longer than @var{set2} is not -portable; @acronym{POSIX} says that the result is undefined. In this situation, +portable; POSIX says that the result is undefined. In this situation, BSD @command{tr} pads @var{set2} to the length of @var{set1} by repeating the last character of @var{set2} as many times as necessary. System V @command{tr} truncates @var{set1} to the length of @var{set2}. -By default, @sc{gnu} @command{tr} handles this case like BSD @command{tr}. +By default, GNU @command{tr} handles this case like BSD @command{tr}. When the @option{--truncate-set1} (@option{-t}) option is given, -@sc{gnu} @command{tr} handles this case like the System V @command{tr} +GNU @command{tr} handles this case like the System V @command{tr} instead. This option is ignored for operations other than translation. Acting like System V @command{tr} in this case breaks the relatively common @@ -6151,7 +6463,7 @@ newlines. @noindent 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 @acronym{POSIX} compliant @command{tr}, here is a better +Assuming a POSIX compliant @command{tr}, here is a better way to write it: @example @@ -6329,7 +6641,7 @@ characters) on each line to spaces. @command{unexpand} writes the contents of each given @var{file}, or standard input if none are given or for a @var{file} of @samp{-}, to standard output, converting blanks at the beginning of each line into -as many tab characters as needed. In the default @acronym{POSIX} +as many tab characters as needed. In the default POSIX locale, a @dfn{blank} is a space or a tab; other locales may specify additional blank characters. Synopsis: @@ -6408,7 +6720,7 @@ directory, acting as if it had been invoked with a single argument of @samp{.}. @vindex LC_ALL By default, the output is sorted alphabetically, according to the locale -settings in effect.@footnote{If you use a non-@acronym{POSIX} +settings in effect.@footnote{If you use a non-POSIX locale (e.g., by setting @env{LC_ALL} to @samp{en_US}), then @command{ls} may produce output that is sorted differently than you're accustomed to. In that case, set the @env{LC_ALL} environment variable to @samp{C}.} @@ -6501,7 +6813,7 @@ command line unless the @option{--dereference-command-line} (@option{-H}), If a command line argument specifies a symbolic link, show information for the file the link references rather than for the link itself. -@itemx --dereference-command-line-symlink-to-dir +@item --dereference-command-line-symlink-to-dir @opindex --dereference-command-line-symlink-to-dir @cindex symbolic links, dereferencing Do not dereference symbolic links, with one exception: @@ -6689,7 +7001,7 @@ $ ls -blog --dired 'a b' If you use a quoting style that adds quote marks (e.g., @option{--quoting-style=c}), then the offsets include the quote marks. So beware that the user may select the quoting style via the environment -variable @env{QUOTING_STYLE}. Hence, applications using @option{--dired} +variable @env{QUOTING_STYLE}@. Hence, applications using @option{--dired} should either specify an explicit @option{--quoting-style=literal} option (aka @option{-N} or @option{--literal}) on the command line, or else be prepared to parse the escaped names. @@ -6709,7 +7021,7 @@ Produce long format directory listings, but don't display owner information. @opindex -G @opindex --no-group Inhibit display of group information in a long format directory listing. -(This is the default in some non-@sc{gnu} versions of @command{ls}, so we +(This is the default in some non-GNU versions of @command{ls}, so we provide this option for compatibility.) @optHumanReadable @@ -6891,7 +7203,7 @@ to the left of the size column. @cindex sorting @command{ls} output These options change the order in which @command{ls} sorts the information it outputs. By default, sorting is done by character code -(e.g., @acronym{ASCII} order). +(e.g., ASCII order). @table @samp @@ -7023,7 +7335,7 @@ which has some caveats worth noting. @itemize @bullet @item @env{LC_COLLATE} is ignored, which means @samp{ls -v} and @samp{sort -V} will sort non-numeric prefixes as if the @env{LC_COLLATE} locale category -was set to @samp{C}. +was set to @samp{C}@. @item Some suffixes will not be matched by the regular expression mentioned above. Consequently these examples may not sort as you expect: @@ -7062,7 +7374,7 @@ output is not a terminal. List files in columns, sorted vertically. This is the default for @command{ls} if standard output is a terminal. It is always the default for the @command{dir} program. -@sc{gnu} @command{ls} uses variable width columns to display as many files as +GNU @command{ls} uses variable width columns to display as many files as possible in the fewest lines. @item --color [=@var{when}] @@ -7203,7 +7515,7 @@ Assume that each tab stop is @var{cols} columns wide. The default is 8. @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-@acronym{ASCII} byte. If you use such a terminal emulator, use the +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 @command{ls} to align using spaces, not tabs. @@ -7266,25 +7578,25 @@ files; if you want output columns to line up, you may need to insert spaces in one of the two formats. @item full-iso -List timestamps in full using @acronym{ISO} 8601 date, time, and time zone +List timestamps in full using ISO 8601 date, time, and time zone format with nanosecond precision, e.g., @samp{2002-03-30 23:45:56.477817180 -0700}. This style is equivalent to @samp{+%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 @command{make}'s behavior, since @acronym{GNU} @command{make} +explain @command{make}'s behavior, since GNU @command{make} uses the full timestamp to determine whether a file is out of date. @item long-iso -List @acronym{ISO} 8601 date and time in minutes, e.g., +List ISO 8601 date and time in minutes, e.g., @samp{2002-03-30 23:45}. These timestamps are shorter than @samp{full-iso} timestamps, and are usually good enough for everyday work. This style is equivalent to @samp{+%Y-%m-%d %H:%M}. @item iso -List @acronym{ISO} 8601 dates for non-recent timestamps (e.g., -@samp{2002-03-30@ }), and @acronym{ISO} 8601 month, day, hour, and +List ISO 8601 dates for non-recent timestamps (e.g., +@samp{2002-03-30@ }), and ISO 8601 month, day, hour, and minute for recent timestamps (e.g., @samp{03-30 23:45}). These timestamps are uglier than @samp{long-iso} timestamps, but they carry nearly the same information in a smaller space and their brevity helps @@ -7308,7 +7620,7 @@ are harder for programs to parse because locale conventions vary so widely, but they are easier for many people to read. The @env{LC_TIME} locale category specifies the timestamp format. The -default @acronym{POSIX} locale uses timestamps like @samp{Mar 30@ +default POSIX locale uses timestamps like @samp{Mar 30@ @ 2002} and @samp{Mar 30 23:45}; in this locale, the following two @command{ls} invocations are equivalent: @@ -7327,21 +7639,21 @@ and might generate timestamps like @samp{30. M@"ar 2002@ } and @item posix-@var{style} @vindex LC_TIME -List @acronym{POSIX}-locale timestamps if the @env{LC_TIME} locale -category is @acronym{POSIX}, @var{style} timestamps otherwise. For +List POSIX-locale timestamps if the @env{LC_TIME} locale +category is POSIX, @var{style} timestamps otherwise. For example, the @samp{posix-long-iso} style lists timestamps like @samp{Mar 30@ @ 2002} and @samp{Mar 30 23:45} when in -the @acronym{POSIX} locale, and like @samp{2002-03-30 23:45} otherwise. +the POSIX locale, and like @samp{2002-03-30 23:45} otherwise. @end table @end table @vindex TIME_STYLE You can specify the default value of the @option{--time-style} option with the environment variable @env{TIME_STYLE}; if @env{TIME_STYLE} is not set -the default style is @samp{locale}. @acronym{GNU} Emacs 21.3 and +the default style is @samp{locale}. GNU Emacs 21.3 and later use the @option{--dired} option and therefore can parse any date format, but if you are using Emacs 21.1 or 21.2 and specify a -non-@acronym{POSIX} locale you may need to set +non-POSIX locale you may need to set @samp{TIME_STYLE="posix-long-iso"}. To avoid certain denial-of-service attacks, timestamps that would be @@ -7407,7 +7719,7 @@ Output strings as-is; this is the same as the @option{-N} or @item shell Quote strings for the shell if they contain shell metacharacters or would cause ambiguous output. -The quoting is suitable for @acronym{POSIX}-compatible shells like +The quoting is suitable for POSIX-compatible shells like @command{bash}, but it does not always work for incompatible shells like @command{csh}. @item shell-always @@ -7433,7 +7745,7 @@ this"} in the default C locale. This looks nicer on many displays. @end table You can specify the default value of the @option{--quoting-style} option -with the environment variable @env{QUOTING_STYLE}. If that environment +with the environment variable @env{QUOTING_STYLE}@. If that environment variable is not set, the default value is @samp{literal}, but this default may change to @samp{shell} in a future version of this package. @@ -7618,7 +7930,7 @@ link only when it refers to an existing regular file. However, when copying to a dangling symbolic link, @command{cp} refuses by default, and fails with a diagnostic, since the operation is inherently dangerous. This behavior is contrary to historical -practice and to @acronym{POSIX}. +practice and to POSIX@. Set @env{POSIXLY_CORRECT} to make @command{cp} attempt to create the target of a dangling destination symlink, in spite of the possible risk. Also, when an option like @@ -7654,7 +7966,7 @@ Try to preserve SELinux security context and extended attributes (xattr), but ignore any failure to do that and print no corresponding diagnostic. Equivalent to @option{-dR --preserve=all} with the reduced diagnostics. -@itemx --attributes-only +@item --attributes-only @opindex --attributes-only Copy only the specified attributes of the source file to the destination. If the destination already exists, do not alter its contents. @@ -7676,10 +7988,12 @@ combination of options is this tiny Bourne shell script: @example #!/bin/sh # Usage: backup FILE... -# Create a @sc{gnu}-style backup of each listed FILE. +# Create a GNU-style backup of each listed FILE. +fail=0 for i; do - cp --backup --force -- "$i" "$i" + cp --backup --force --preserve=all -- "$i" "$i" || fail=1 done +exit $fail @end example @item --copy-contents @@ -7712,7 +8026,7 @@ Equivalent to @option{--no-dereference --preserve=links}. @opindex -f @opindex --force When copying without this option and an existing destination file cannot -be opened for writing, the copy fails. However, with @option{--force}), +be opened for writing, the copy fails. However, with @option{--force}, when a destination file cannot be opened, @command{cp} then removes it and tries to open it again. Contrast this behavior with that enabled by @option{--link} and @option{--symbolic-link}, whereby the destination file @@ -7722,8 +8036,8 @@ description of @option{--remove-destination}. This option is independent of the @option{--interactive} or @option{-i} option: neither cancels the effect of the other. -This option is redundant if the @option{--no-clobber} or @option{-n} option is -used. +This option is ignored when the @option{--no-clobber} or @option{-n} option +is also used. @item -H @opindex -H @@ -7737,7 +8051,7 @@ via recursive traversal. @opindex -i @opindex --interactive When copying a file other than a directory, prompt whether to -overwrite an existing destination file. The @option{-i} option overrides +overwrite an existing destination file. The @option{-i} option overrides a previous @option{-n} option. @item -l @@ -7759,8 +8073,8 @@ a regular file in the destination tree. @itemx --no-clobber @opindex -n @opindex --no-clobber -Do not overwrite an existing file. The @option{-n} option overrides a previous -@option{-i} option. This option is mutually exclusive with @option{-b} or +Do not overwrite an existing file. The @option{-n} option overrides a previous +@option{-i} option. This option is mutually exclusive with @option{-b} or @option{--backup} option. @item -P @@ -7782,21 +8096,21 @@ If specified, the @var{attribute_list} must be a comma-separated list of one or more of the following strings: @table @samp -@itemx mode +@item mode Preserve the file mode bits and access control lists. -@itemx ownership +@item 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. -@itemx timestamps +@item 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 @code{utimensat} function, which makes it possible even for symbolic links. -@itemx links +@item links Preserve in the destination files any links between corresponding source files. Note that with @option{-L} or @option{-H}, this option can convert @@ -7820,14 +8134,15 @@ $ mkdir b c; (cd b; : > a; ln -s a b); cp -aL b c; ls -i1 c/b 74163295 b @end smallexample -@itemx context +@item context Preserve SELinux security context of the file, or fail with full diagnostics. -@itemx xattr +@item xattr Preserve extended attributes of the file, or fail with full diagnostics. If @command{cp} is built without xattr support, ignore this option. If SELinux context, ACLs or Capabilities are implemented using xattrs, -they are preserved by this option as well. -@itemx all +they are preserved implicitly by this option as well, i.e., even without +specifying @option{--preserve=mode} or @option{--preserve=context}. +@item 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 @@ -7843,12 +8158,12 @@ 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}. -@itemx @w{@kbd{--no-preserve}=@var{attribute_list}} +@item @w{@kbd{--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}. -@itemx --parents +@item --parents @opindex --parents @cindex parent directories and @command{cp} Form the name of each destination file by appending to the target @@ -7881,10 +8196,10 @@ links in the source; see the @option{--archive} (@option{-a}), @option{-d}, creating a destination file of the same type as the source; see the @option{--copy-contents} option. It is not portable to use @option{-r} to copy symbolic links or special files. On some -non-@sc{gnu} systems, @option{-r} implies the equivalent of +non-GNU systems, @option{-r} implies the equivalent of @option{-L} and @option{--copy-contents} for historical reasons. Also, it is not portable to use @option{-R} to copy symbolic links -unless you also specify @option{-P}, as @acronym{POSIX} allows +unless you also specify @option{-P}, as POSIX allows implementations that dereference symbolic links by default. @item --reflink[=@var{when}] @@ -7893,7 +8208,7 @@ implementations that dereference symbolic links by default. @cindex clone @cindex copy on write Perform a lightweight, copy-on-write (COW) copy, if supported by the -file system. Once it has succeeded, beware that the source and destination +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. @@ -8033,7 +8348,9 @@ dd @var{option} @end example The only options are @option{--help} and @option{--version}. -@xref{Common options}. @command{dd} accepts the following operands. +@xref{Common options}. @command{dd} accepts the following operands, +whose syntax was inspired by the DD (data definition) statement of +OS/360 JCL. @table @samp @@ -8102,11 +8419,31 @@ Copy @var{n} @samp{ibs}-byte blocks from the input file, instead of everything until the end of the file. if @samp{iflag=count_bytes} is specified, @var{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, @samp{iflag=fullblock} +will ensure that @samp{count=} corresponds to complete input blocks +rather than the traditional POSIX specified behavior of counting +input read operations. -@item status=noxfer +@item status=@var{which} @opindex status -Do not print the overall transfer rate and volume statistics -that normally make up the third status line when @command{dd} exits. +Transfer information is normally output to stderr upon +receipt of the @samp{INFO} signal or when @command{dd} exits. +Specifying @var{which} will identify which information to suppress. + +@table @samp + +@item noxfer +@opindex noxfer @r{dd status=} +Do not print the transfer rate and volume statistics +that normally make up the last status line. + +@item none +@opindex none @r{dd status=} +Do not print any informational messages to stderr. +Error messages are output as normal. + +@end table @item conv=@var{conversion}[,@var{conversion}]@dots{} @opindex conv @@ -8119,19 +8456,19 @@ Conversions: @item ascii @opindex ascii@r{, converting to} -Convert @acronym{EBCDIC} to @acronym{ASCII}, -using the conversion table specified by @acronym{POSIX}. +Convert EBCDIC to ASCII, +using the conversion table specified by POSIX@. This provides a 1:1 translation for all 256 bytes. @item ebcdic @opindex ebcdic@r{, converting to} -Convert @acronym{ASCII} to @acronym{EBCDIC}. +Convert ASCII to EBCDIC@. This is the inverse of the @samp{ascii} conversion. @item ibm @opindex alternate ebcdic@r{, converting to} -Convert @acronym{ASCII} to alternate @acronym{EBCDIC}, -using the alternate conversion table specified by @acronym{POSIX}. +Convert ASCII to alternate EBCDIC, +using the alternate conversion table specified by POSIX@. This is not a 1:1 translation, but reflects common historical practice for @samp{~}, @samp{[}, and @samp{]}. @@ -8162,27 +8499,27 @@ The @samp{lcase} and @samp{ucase} conversions are mutually exclusive. @item sparse @opindex sparse -Try to seek rather than write @sc{nul} output blocks. +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 @samp{conv=notrunc} or @samp{oflag=append}. With @samp{conv=notrunc}, existing data in the output file -corresponding to @sc{nul} blocks from the input, will be untouched. +corresponding to NUL blocks from the input, will be untouched. With @samp{oflag=append} the seeks performed will be ineffective. Similarly, when the output is a device rather than a file, -@sc{nul} input blocks are not copied, and therefore this option +NUL input blocks are not copied, and therefore this option is most useful with virtual or pre zeroed devices. @item swab @opindex swab @r{(byte-swapping)} @cindex byte-swapping -Swap every pair of input bytes. @sc{gnu} @command{dd}, unlike others, works +Swap every pair of input bytes. GNU @command{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). @item sync -@opindex sync @r{(padding with @acronym{ASCII} @sc{nul}s)} +@opindex sync @r{(padding with ASCII NULs)} Pad every input block to size of @samp{ibs} with trailing zero bytes. When used with @samp{block} or @samp{unblock}, pad with spaces instead of zero bytes. @@ -8259,7 +8596,7 @@ output file to be truncated before being appended to. @opindex cio @cindex concurrent I/O Use concurrent I/O mode for data. This mode performs direct I/O -and drops the @acronym{POSIX} requirement to serialize all I/O to the same file. +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. @@ -8335,7 +8672,7 @@ idea to test it on your files before relying on it. @cindex controlling terminal Do not assign the file to be a controlling terminal for @command{dd}. This has no effect when the file is not a terminal. -On many hosts (e.g., @acronym{GNU}/Linux hosts), this option has no effect +On many hosts (e.g., GNU/Linux hosts), this option has no effect at all. @item nofollow @@ -8351,13 +8688,13 @@ Fail if the file has multiple hard links. @item binary @opindex binary @cindex binary I/O -Use binary I/O. This option has an effect only on nonstandard +Use binary I/O@. This option has an effect only on nonstandard platforms that distinguish binary from text I/O. @item text @opindex text @cindex text I/O -Use text I/O. Like @samp{binary}, this option has no effect on +Use text I/O@. Like @samp{binary}, this option has no effect on standard platforms. @item fullblock @@ -8367,6 +8704,10 @@ may return early if a full block is not available. When that happens, continue calling @code{read} to fill the remainder of the block. This flag can be used only with @code{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 @samp{count=} argument is +interpreted as a block count rather than a count of read operations. @item count_bytes @opindex count_bytes @@ -8401,8 +8742,8 @@ affected file descriptors, even after @command{dd} exits. @end table @cindex multipliers after numbers -The numeric-valued strings above (@var{bytes} and @var{blocks}) can be -followed by a multiplier: @samp{b}=512, @samp{c}=1, +The numeric-valued strings above (@var{n} and @var{bytes}) +can be followed by a multiplier: @samp{b}=512, @samp{c}=1, @samp{w}=2, @samp{x@var{m}}=@var{m}, or any of the standard block size suffixes like @samp{k}=1024 (@pxref{Block size}). @@ -8606,7 +8947,7 @@ to when they were last installed. @cindex stripping symbol table information Strip the symbol tables from installed binary executables. -@itemx --strip-program=@var{program} +@item --strip-program=@var{program} @opindex --strip-program @cindex symbol table information, stripping, program Program used to strip binaries. @@ -8695,7 +9036,7 @@ when it might be a symlink to a directory. Otherwise, @command{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 -@code{errno=ENOTDIR}. +@code{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. @xref{Trailing slashes}. @@ -8806,6 +9147,13 @@ The program accepts the following options. Also see @ref{Common options}. @table @samp +@item -d +@itemx --dir +@opindex -d +@opindex --dir +@cindex directories, removing +Remove the listed directories if they are empty. + @item -f @itemx --force @opindex -f @@ -8827,7 +9175,7 @@ files are named or if a recursive removal is requested. Ignore any previous @option{--force} (@option{-f}) option. Equivalent to @option{--interactive=once}. -@itemx --interactive [=@var{when}] +@item --interactive [=@var{when}] @opindex --interactive Specify when to issue an interactive prompt. @var{when} may be omitted, or one of: @@ -8846,7 +9194,7 @@ removal is requested. Equivalent to @option{-I}. @option{--interactive} with no @var{when} is equivalent to @option{--interactive=always}. -@itemx --one-file-system +@item --one-file-system @opindex --one-file-system @cindex one file system, restricting @command{rm} to When removing a hierarchy recursively, skip any directory that is on a @@ -8865,7 +9213,7 @@ warn about and skip directories on other file systems. Of course, this will not save your @file{/home} if it and your chroot happen to be on the same file system. -@itemx --preserve-root +@item --preserve-root @opindex --preserve-root @cindex root directory, disallow recursive destruction Fail upon any attempt to remove the root directory, @file{/}, @@ -8873,7 +9221,7 @@ when used with the @option{--recursive} option. This is the default behavior. @xref{Treating / specially}. -@itemx --no-preserve-root +@item --no-preserve-root @opindex --no-preserve-root @cindex root directory, allow recursive destruction Do not treat @file{/} specially when removing recursively. @@ -8901,7 +9249,7 @@ Print the name of each file before removing it. @cindex files beginning with @samp{-}, removing @cindex @samp{-}, removing files beginning with One common question is how to remove files whose names begin with a -@samp{-}. @sc{gnu} @command{rm}, like every program that uses the @code{getopt} +@samp{-}. GNU @command{rm}, like every program that uses the @code{getopt} function to parse its arguments, lets you use the @samp{--} option to indicate that all following arguments are non-options. To remove a file called @file{-f} in the current directory, you could type either: @@ -8963,7 +9311,7 @@ floppies, the patterns are designed for best effect on hard drives. For more details, see the source code and Peter Gutmann's paper @uref{http://www.cs.auckland.ac.nz/~pgut001/pubs/secure_del.html, @cite{Secure Deletion of Data from Magnetic and Solid-State Memory}}, -from the proceedings of the Sixth @acronym{USENIX} Security Symposium (San Jose, +from the proceedings of the Sixth USENIX Security Symposium (San Jose, California, July 22--25, 1996). @strong{Please note} that @command{shred} relies on a very important assumption: @@ -8976,7 +9324,7 @@ assumption. Exceptions include: @item Log-structured or journaled file systems, such as those supplied with AIX and Solaris, and JFS, ReiserFS, XFS, Ext3 (in @code{data=journal} mode), -BFS, NTFS, etc.@: when they are configured to journal @emph{data}. +BFS, NTFS, etc., when they are configured to journal @emph{data}. @item File systems that write redundant data and carry on even if some writes @@ -8995,7 +9343,7 @@ Compressed file systems. In the particular case of ext3 file systems, the above disclaimer applies (and @command{shred} is thus of limited effectiveness) only in @code{data=journal} -mode, which journals file data in addition to just metadata. In both +mode, which journals file data in addition to just metadata. In both the @code{data=ordered} (default) and @code{data=writeback} modes, @command{shred} works as usual. Ext3 journaling modes can be changed by adding the @code{data=something} option to the mount options for a @@ -9048,8 +9396,8 @@ Override file permissions if necessary to allow overwriting. @opindex --iterations=@var{number} @cindex iterations, selecting the number of By default, @command{shred} uses @value{SHRED_DEFAULT_PASSES} 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 +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. @item --random-source=@var{file} @@ -9217,10 +9565,10 @@ must specify a nonexistent entry in an existing directory. @command{link} simply calls @code{link (@var{filename}, @var{linkname})} to create the link. -On a @acronym{GNU} system, this command acts like @samp{ln --directory +On a GNU system, this command acts like @samp{ln --directory --no-target-directory @var{filename} @var{linkname}}. However, the @option{--directory} and @option{--no-target-directory} options are -not specified by @acronym{POSIX}, and the @command{link} command is +not specified by POSIX, and the @command{link} command is more portable in practice. If @var{filename} is a symbolic link, it is unspecified whether @@ -9287,7 +9635,7 @@ 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 links cannot cross file system boundaries. (These -restrictions are not mandated by @acronym{POSIX}, however.) +restrictions are not mandated by POSIX, however.) @cindex dereferencing symbolic links @cindex symbolic link, defined @@ -9508,7 +9856,7 @@ in @command{chmod} and uses @samp{a=rwx} (read, write and execute allowed for everyone) for the point of the departure. @xref{File permissions}. Normally the directory has the desired file mode bits at the moment it -is created. As a @acronym{GNU} extension, @var{mode} may also mention +is created. As a GNU extension, @var{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. @xref{Directory Setuid and Setgid}, for how the @@ -9700,20 +10048,20 @@ Set the default SELinux security context to be used for created files. @item Readlink mode -@command{readlink} outputs the value of the given symbolic link. +@command{readlink} outputs the value of the given symbolic links. If @command{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. @item Canonicalize mode -@command{readlink} outputs the absolute name of the given file which contains +@command{readlink} outputs the absolute name of the given files which contain no @file{.}, @file{..} components nor any repeated separators (@file{/}) or symbolic links. @end table @example -readlink [@var{option}] @var{file} +readlink [@var{option}]@dots{} @var{file}@dots{} @end example By default, @command{readlink} operates in readlink mode. @@ -9752,7 +10100,8 @@ as a directory. @itemx --no-newline @opindex -n @opindex --no-newline -Do not output the trailing newline. +Do not print the output delimiter, when a single @var{file} is specified. +Print a warning if specified along with multiple @var{file}s. @item -s @itemx -q @@ -9770,6 +10119,12 @@ Suppress most error messages. @opindex --verbose Report error messages. +@item -z +@itemx --zero +@opindex -z +@opindex --zero +Separate output items with NUL characters. + @end table The @command{readlink} utility first appeared in OpenBSD 2.1. @@ -9878,9 +10233,9 @@ timestamps, and other information. Collectively, we call these a file's These commands change file attributes. @menu +* chown invocation:: Change file owners and groups. * chgrp invocation:: Change file groups. * chmod invocation:: Change access permissions. -* chown invocation:: Change file owners and groups. * touch invocation:: Change file timestamps. @end menu @@ -9944,8 +10299,8 @@ or group ID, then you may specify it with a leading @samp{+}. @xref{Disambiguating names and IDs}. Some older scripts may still use @samp{.} in place of the @samp{:} separator. -@acronym{POSIX} 1003.1-2001 (@pxref{Standards conformance}) does not -require support for that, but for backward compatibility @acronym{GNU} +POSIX 1003.1-2001 (@pxref{Standards conformance}) does not +require support for that, but for backward compatibility GNU @command{chown} supports @samp{.} so long as no ambiguity results. New scripts should avoid the use of @samp{.} because it is not portable, and because it has undesirable results if the entire @@ -9985,7 +10340,7 @@ actually changes. Do not print error messages about files whose ownership cannot be changed. -@itemx @w{@kbd{--from}=@var{old-owner}} +@item @w{@kbd{--from}=@var{old-owner}} @opindex --from @cindex symbolic links, changing owner Change a @var{file}'s ownership only if it has current attributes specified @@ -10039,14 +10394,14 @@ is a symbolic link. By default, no diagnostic is issued for symbolic links encountered during a recursive traversal, but see @option{--verbose}. -@itemx --preserve-root +@item --preserve-root @opindex --preserve-root @cindex root directory, disallow recursive modification Fail upon any attempt to recursively change the root directory, @file{/}. Without @option{--recursive}, this option has no effect. @xref{Treating / specially}. -@itemx --no-preserve-root +@item --no-preserve-root @opindex --no-preserve-root @cindex root directory, allow recursive modification Cancel the effect of any preceding @option{--preserve-root} option. @@ -10166,14 +10521,14 @@ is a symbolic link. By default, no diagnostic is issued for symbolic links encountered during a recursive traversal, but see @option{--verbose}. -@itemx --preserve-root +@item --preserve-root @opindex --preserve-root @cindex root directory, disallow recursive modification Fail upon any attempt to recursively change the root directory, @file{/}. Without @option{--recursive}, this option has no effect. @xref{Treating / specially}. -@itemx --no-preserve-root +@item --no-preserve-root @opindex --no-preserve-root @cindex root directory, allow recursive modification Cancel the effect of any preceding @option{--preserve-root} option. @@ -10288,14 +10643,14 @@ actually changes. Do not print error messages about files whose permissions cannot be changed. -@itemx --preserve-root +@item --preserve-root @opindex --preserve-root @cindex root directory, disallow recursive modification Fail upon any attempt to recursively change the root directory, @file{/}. Without @option{--recursive}, this option has no effect. @xref{Treating / specially}. -@itemx --no-preserve-root +@item --no-preserve-root @opindex --no-preserve-root @cindex root directory, allow recursive modification Cancel the effect of any preceding @option{--preserve-root} option. @@ -10409,7 +10764,7 @@ environment variable, or by the system default rules if @env{TZ} is not set. @xref{TZ Variable,, Specifying the Time Zone with @env{TZ}, libc, The GNU C Library Reference Manual}. You can avoid ambiguities during -daylight saving transitions by using @sc{utc} time stamps. +daylight saving transitions by using UTC time stamps. The program accepts the following options. Also see @ref{Common options}. @@ -10442,7 +10797,7 @@ time zones, @samp{am} and @samp{pm}, @samp{yesterday}, etc. For example, @option{--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 @acronym{UTC}. @xref{Date input formats}. +minutes east of UTC@. @xref{Date input formats}. File systems that do not support high-resolution time stamps silently ignore any excess precision here. @@ -10462,7 +10817,7 @@ the link refers to. When using this option, empty files are not created, but option @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 @acronym{POSIX} 2008. Also, on some +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 @option{-r}, a @@ -10492,13 +10847,15 @@ If @var{file} is a symbolic link, the reference timestamp is taken from the target of the symlink, unless @option{-h} was also in effect. @item -t [[@var{cc}]@var{yy}]@var{mmddhhmm}[.@var{ss}] +@cindex leap seconds 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 @var{cc} is 20 for years in the range 0 @dots{} 68, and 19 for years in 69 @dots{} 99. If no digits of the year are specified, the argument is interpreted as a date in the current year. -Note that @var{ss} may be @samp{60}, to accommodate leap seconds. +On the atypical systems that support leap seconds, @var{ss} may be +@samp{60}. @end table @@ -10561,12 +10918,22 @@ Normally the disk space is printed in units of 1024 bytes, but this can be overridden (@pxref{Block size}). Non-integer quantities are rounded up to the next higher unit. +For bind mounts and without arguments, @command{df} only outputs the statistics +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 +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). @sc{gnu} @command{df} does not attempt to determine the +file system). 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 @@ -10594,13 +10961,19 @@ pseudo-file-systems, such as automounter entries. Scale sizes by @var{size} before printing them (@pxref{Block size}). For example, @option{-BG} prints sizes in units of 1,073,741,824 bytes. -@itemx --total +@item --total @opindex --total @cindex grand total of disk size, usage and available space 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, @command{df} prints @samp{"total"} into the +@var{source} column, and @samp{"-"} into the @var{target} column. +If there is no @var{source} column (see @option{--output}), then +@command{df} prints @samp{"total"} into the @var{target} column, +if present. + @optHumanReadable @item -H @@ -10639,15 +11012,76 @@ This may make @command{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. +@item --output +@itemx @w{@kbd{--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 +conforms to the order of the field descriptions below. + +The use of the @option{--output} together with each of the options @option{-i}, +@option{-P}, and @option{-T} is mutually exclusive. + +FIELD_LIST is a comma-separated list of columns to be included in @command{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 @var{field_list} are: +@table @samp +@item source +The source of the mount point, usually a device. +@item fstype +File system type. + +@item itotal +Total number of inodes. +@item iused +Number of used inodes. +@item iavail +Number of available inodes. +@item ipcent +Percentage of @var{iused} divided by @var{itotal}. + +@item size +Total number of blocks. +@item used +Number of used blocks. +@item avail +Number of available blocks. +@item pcent +Percentage of @var{used} divided by @var{size}. + +@item target +The mount point. +@end table + +The fields for block and inodes statistics are affected by the scaling +options like @option{-h} as usual. + +The definition of the @var{field_list} can even be splitted among several +@option{--output} uses. + +@example +#!/bin/sh +# Print the TARGET (i.e., the mount point) along with their percentage +# statistic regarding the blocks and the inodes. +df --out=target --output=pcent,ipcent + +# Print all available fields. +df --o +@end example + + @item -P @itemx --portability @opindex -P @opindex --portability @cindex one-line output format -@cindex @acronym{POSIX} output format +@cindex POSIX output format @cindex portable output format @cindex output format, portable -Use the @acronym{POSIX} output format. This is like the default format except +Use the POSIX output format. This is like the default format except for the following: @enumerate @@ -10658,7 +11092,7 @@ that if the mount device name is more than 20 characters long (e.g., for some network mounts), the columns are misaligned. @item -The labels in the header output line are changed to conform to @acronym{POSIX}. +The labels in the header output line are changed to conform to POSIX. @item The default block size and output format are unaffected by the @@ -10700,8 +11134,8 @@ the common names (this list is certainly not exhaustive): @table @samp @item nfs -@cindex @acronym{NFS} file system type -An @acronym{NFS} file system, i.e., one mounted over a network from another +@cindex NFS file system type +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. @@ -10751,6 +11185,11 @@ inspect the exit status of a command like @samp{df -t ext3 -t reiserfs @var{dir}} to test whether @var{dir} is on a file system of type @samp{ext3} or @samp{reiserfs}. +Since the list of file systems (@var{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 @option{-a}, @option{-l}, @option{-t} +or @option{-x} is used together with a file name argument. + @node du invocation @section @command{du}: Estimate file space usage @@ -10780,13 +11219,15 @@ The program accepts the following options. Also see @ref{Common options}. @table @samp +@optNull{du} + @item -a @itemx --all @opindex -a @opindex --all Show counts for all files, not just directories. -@itemx --apparent-size +@item --apparent-size @opindex --apparent-size Print apparent sizes, rather than disk usage. The apparent size of a file is the number of bytes reported by @code{wc -c} on regular files, @@ -10805,12 +11246,6 @@ 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. -@item -b -@itemx --bytes -@opindex -b -@opindex --bytes -Equivalent to @code{--apparent-size --block-size=1}. - @item -B @var{size} @itemx --block-size=@var{size} @opindex -B @@ -10819,6 +11254,12 @@ Equivalent to @code{--apparent-size --block-size=1}. Scale sizes by @var{size} before printing them (@pxref{Block size}). For example, @option{-BG} prints sizes in units of 1,073,741,824 bytes. +@item -b +@itemx --bytes +@opindex -b +@opindex --bytes +Equivalent to @code{--apparent-size --block-size=1}. + @item -c @itemx --total @opindex -c @@ -10837,15 +11278,24 @@ Does not affect other symbolic links. This is helpful for finding out the disk usage of directories, such as @file{/usr/tmp}, which are often symbolic links. +@item -d @var{depth} +@itemx --max-depth=@var{depth} +@opindex -d @var{depth} +@opindex --max-depth=@var{depth} +@cindex limiting output of @command{du} +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 @code{du --max-depth=0} is equivalent to @code{du -s}. + @c --files0-from=FILE @filesZeroFromOption{du,, with the @option{--total} (@option{-c}) option} -@optHumanReadable - @item -H @opindex -H Equivalent to @option{--dereference-args} (@option{-D}). +@optHumanReadable + @item -k @opindex -k @cindex kibibytes for file sizes @@ -10853,14 +11303,6 @@ Print sizes in 1024-byte blocks, overriding the default block size (@pxref{Block size}). This option is equivalent to @option{--block-size=1K}. -@item -l -@itemx --count-links -@opindex -l -@opindex --count-links -@cindex hard links, counting in @command{du} -Count the size of all files, even if they have appeared already (as a -hard link). - @item -L @itemx --dereference @opindex -L @@ -10870,6 +11312,14 @@ 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). +@item -l +@itemx --count-links +@opindex -l +@opindex --count-links +@cindex hard links, counting in @command{du} +Count the size of all files, even if they have appeared already (as a +hard link). + @item -m @opindex -m @cindex mebibytes for file sizes @@ -10885,25 +11335,6 @@ This option is equivalent to @option{--block-size=1M}. For each symbolic links encountered by @command{du}, consider the disk space used by the symbolic link. -@item -d @var{depth} -@item --max-depth=@var{depth} -@opindex -d @var{depth} -@opindex --max-depth=@var{depth} -@cindex limiting output of @command{du} -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 @code{du --max-depth=0} is equivalent to @code{du -s}. - -@optNull{du} - -@optSi - -@item -s -@itemx --summarize -@opindex -s -@opindex --summarize -Display only a total for each argument. - @item -S @itemx --separate-dirs @opindex -S @@ -10915,13 +11346,56 @@ 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}. -@itemx --time +@optSi + +@item -s +@itemx --summarize +@opindex -s +@opindex --summarize +Display only a total for each argument. + +@item -t @var{size} +@itemx --threshold=@var{size} +@opindex -t +@opindex --threshold +Exclude entries based on a given @var{size} (@pxref{Block size}). + +If @var{size} is positive, then @command{du} will only print entries with a size +greater than or equal to that. + +If @var{size} is negative, then @command{du} will only print entries with a size +smaller than or equal to that. + +Although GNU @command{find} can be used to find files of a certain size, +@command{du}'s @option{--threshold} option can be used to also filter +directories based on a given size. + +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. + +Here's how you would use @option{--threshold} to find directories with a size +greater than or equal to 200 megabytes: + +@example +du --threshold=200MB +@end example + +Here's how you would use @option{--threshold} to find directories and files - +note the @option{-a} - with an apparent size smaller than or equal to 500 bytes: + +@example +du -a -t -500 --apparent-size +@end example + + +@item --time @opindex --time @cindex last modified dates, displaying in @command{du} Show time of the most recent modification of any file in the directory, or any of its subdirectories. -@itemx --time=ctime +@item --time=ctime @itemx --time=status @itemx --time=use @opindex --time @@ -10931,7 +11405,7 @@ or any of its subdirectories. Show the most recent status change time (the @samp{ctime} in the inode) of any file in the directory, instead of the modification time. -@itemx --time=atime +@item --time=atime @itemx --time=access @opindex --time @opindex atime@r{, show the most recent} @@ -10957,19 +11431,19 @@ with @command{date}, @var{format}'s interpretation is affected by the @env{LC_TIME} locale category. @item full-iso -List timestamps in full using @acronym{ISO} 8601 date, time, and time zone +List timestamps in full using ISO 8601 date, time, and time zone format with nanosecond precision, e.g., @samp{2002-03-30 23:45:56.477817180 -0700}. This style is equivalent to @samp{+%Y-%m-%d %H:%M:%S.%N %z}. @item long-iso -List @acronym{ISO} 8601 date and time in minutes, e.g., +List ISO 8601 date and time in minutes, e.g., @samp{2002-03-30 23:45}. These timestamps are shorter than @samp{full-iso} timestamps, and are usually good enough for everyday work. This style is equivalent to @samp{+%Y-%m-%d %H:%M}. @item iso -List @acronym{ISO} 8601 dates for timestamps, e.g., @samp{2002-03-30}. +List ISO 8601 dates for timestamps, e.g., @samp{2002-03-30}. This style is equivalent to @samp{+%Y-%m-%d}. @end table @@ -10982,21 +11456,6 @@ the newline and any later characters are ignored; if @env{TIME_STYLE} begins with @samp{posix-} the @samp{posix-} is ignored; and if @env{TIME_STYLE} is @samp{locale} it is ignored. -@item -x -@itemx --one-file-system -@opindex -x -@opindex --one-file-system -@cindex one file system, restricting @command{du} to -Skip directories that are on different file systems from the one that -the argument being processed is on. - -@item --exclude=@var{pattern} -@opindex --exclude=@var{pattern} -@cindex excluding files from @command{du} -When recursing, skip subdirectories or files matching @var{pattern}. -For example, @code{du --exclude='*.o'} excludes files whose names -end in @samp{.o}. - @item -X @var{file} @itemx --exclude-from=@var{file} @opindex -X @var{file} @@ -11006,6 +11465,21 @@ Like @option{--exclude}, except take the patterns to exclude from @var{file}, one per line. If @var{file} is @samp{-}, take the patterns from standard input. +@item --exclude=@var{pattern} +@opindex --exclude=@var{pattern} +@cindex excluding files from @command{du} +When recursing, skip subdirectories or files matching @var{pattern}. +For example, @code{du --exclude='*.o'} excludes files whose names +end in @samp{.o}. + +@item -x +@itemx --one-file-system +@opindex -x +@opindex --one-file-system +@cindex one file system, restricting @command{du} to +Skip directories that are on different file systems from the one that +the argument being processed is on. + @end table @cindex NFS mounts from BSD to HP-UX @@ -11074,7 +11548,7 @@ $ stat --format=%d:%i / /usr 2057:2 @end example -@itemx --printf=@var{format} +@item --printf=@var{format} @opindex --printf=@var{format} @cindex output format Use @var{format} rather than the default format. @@ -11139,7 +11613,7 @@ precision preceded by a period to specify the number of digits to print after the decimal point. For example, @samp{%.3X} outputs the last access time to millisecond precision. If a period is given but no precision, @command{stat} uses 9 digits, so @samp{%.X} is equivalent to -@samp{%.9X}. When discarding excess precision, time stamps are truncated +@samp{%.9X}@. When discarding excess precision, time stamps are truncated toward minus infinity. @example @@ -11236,7 +11710,7 @@ Any arguments are ignored, except for a lone @option{--help} or @cindex truncating, file sizes @command{truncate} shrinks or extends the size of each @var{file} to the -specified size. Synopsis: +specified size. Synopsis: @example truncate @var{option}@dots{} @var{file}@dots{} @@ -11395,7 +11869,7 @@ option-like arguments instead of treating them as options. For example, @code{echo -ne hello} outputs @samp{-ne hello} instead of plain @samp{hello}. -@acronym{POSIX} does not require support for any options, and says +POSIX does not require support for any options, and says that the behavior of @command{echo} is implementation-defined if any @var{string} contains a backslash or if the first argument is @option{-n}. Portable programs can use the @command{printf} command @@ -11471,8 +11945,8 @@ then its value is the numeric value of the immediately following character. Any remaining characters are silently ignored if the @env{POSIXLY_CORRECT} environment variable is set; otherwise, a warning is printed. For example, @samp{printf "%d" "'a"} outputs -@samp{97} on hosts that use the @acronym{ASCII} character set, since -@samp{a} has the numeric value 97 in @acronym{ASCII}. +@samp{97} on hosts that use the ASCII character set, since +@samp{a} has the numeric value 97 in ASCII. @end itemize @@ -11500,15 +11974,15 @@ For example, @samp{printf '\400'} is equivalent to @samp{printf '\0'}. @cindex ISO/IEC 10646 @vindex LC_CTYPE @command{printf} interprets two character syntaxes introduced in -@acronym{ISO} C 99: -@samp{\u} for 16-bit Unicode (@acronym{ISO}/@acronym{IEC} 10646) +ISO C 99: +@samp{\u} for 16-bit Unicode (ISO/IEC 10646) characters, specified as four hexadecimal digits @var{hhhh}, and @samp{\U} for 32-bit Unicode characters, specified as eight hexadecimal digits @var{hhhhhhhh}. @command{printf} outputs the Unicode characters according to the @env{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 (@`). +U+0000@dots{}U+009F, U+D800@dots{}U+DFFF cannot be specified by this syntax, +except for U+0024 ($), U+0040 (@@), and U+0060 (@`). The processing of @samp{\u} and @samp{\U} requires a full-featured @code{iconv} facility. It is activated on systems with glibc 2.2 (or newer), @@ -11528,7 +12002,7 @@ $ env printf '\u20AC 14.95' @noindent will be output correctly in all locales supporting the Euro symbol -(@acronym{ISO}-8859-15, UTF-8, and others). Similarly, a Chinese string +(ISO-8859-15, UTF-8, and others). Similarly, a Chinese string @example $ env printf '\u4e2d\u6587' @@ -11542,7 +12016,7 @@ invoked via @command{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 -values of each character one by one. @acronym{ASCII} characters mixed with \u +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. Here is how to convert a piece of text into a shell script which will output @@ -11624,7 +12098,7 @@ exits unsuccessfully, even when invoked with Portable programs should not assume that the exit status of @command{false} is 1, as it is greater than 1 on some -non-@acronym{GNU} hosts. +non-GNU hosts. @node true invocation @@ -12018,7 +12492,7 @@ e.g., spaces. However, regardless of whether it is quoted, a string operand should not be a parenthesis or any of @command{expr}'s operators like @code{+}, so you cannot safely pass an arbitrary string @code{$str} to expr merely by quoting it to the shell. One way to -work around this is to use the @sc{gnu} extension @code{+}, +work around this is to use the GNU extension @code{+}, (e.g., @code{+ "$str" = foo}); a more portable way is to use @code{@w{" $str"}} and to adjust the rest of the expression to take the leading space into account (e.g., @code{@w{" $str" = " foo"}}). @@ -12100,7 +12574,7 @@ expression operators. In the regular expression, @code{\+}, @code{\?}, and @code{\|} are operators which respectively match one or more, zero or one, or separate alternatives. SunOS and other @command{expr}'s treat these as regular -characters. (@acronym{POSIX} allows either behavior.) +characters. (POSIX allows either behavior.) @xref{Top, , Regular Expression Library, regex, Regex}, for details of regular expression syntax. Some examples are in @ref{Examples of expr}. @@ -12132,7 +12606,7 @@ or an operator like @code{/}. This makes it possible to test @code{expr length + "$x"} or @code{expr + "$x" : '.*/\(.\)'} and have it do the right thing even if the value of @var{$x} happens to be (for example) @code{/} or @code{index}. -This operator is a @acronym{GNU} extension. Portable shell scripts should use +This operator is a GNU extension. Portable shell scripts should use @code{@w{" $token"} : @w{' \(.*\)'}} instead of @code{+ "$token"}. @end table @@ -12351,7 +12825,7 @@ checksum in a file named @file{dvd.sha1}. Note, however, that this example relies on a feature of modern shells called @dfn{process substitution} (the @samp{>(command)} syntax, above; -@xref{Process Substitution,,Process Substitution, bashref, +@xref{Process Substitution,,Process Substitution, bash, The Bash Reference Manual}.), so it works with @command{zsh}, @command{bash}, and @command{ksh}, but not with @command{/bin/sh}. So if you write code like this @@ -12461,7 +12935,7 @@ This section describes commands that manipulate file names. @example basename @var{name} [@var{suffix}] -basename @var{option}... @var{name}... +basename @var{option}@dots{} @var{name}@dots{} @end example If @var{suffix} is specified and is identical to the end of @var{name}, @@ -12479,8 +12953,8 @@ for everything except file names containing a trailing newline. @end macro @basenameAndDirname -@acronym{POSIX} allows the implementation to define the results if -@var{name} is empty or @samp{//}. In the former case, @acronym{GNU} +POSIX allows the implementation to define the results if +@var{name} is empty or @samp{//}. In the former case, GNU @command{basename} returns the empty string. In the latter case, the result is @samp{//} on platforms where @var{//} is distinct from @var{/}, and @samp{/} on platforms where there is no difference. @@ -12509,7 +12983,7 @@ This option implies the @option{-a} option. @itemx --zero @opindex -z @opindex --zero -Separate output items with @sc{nul} characters. +Separate output items with NUL characters. @end table @@ -12546,7 +13020,7 @@ also removed. If the string contains no slash, @command{dirname} prints @samp{.} (meaning the current directory). Synopsis: @example -dirname [@var{option}] @var{name}... +dirname [@var{option}] @var{name}@dots{} @end example @var{name} need not be a file name, but if it is, this operation @@ -12555,8 +13029,8 @@ including the case when the final component is itself a directory. @basenameAndDirname -@acronym{POSIX} allows the implementation to define the results if -@var{name} is @samp{//}. With @acronym{GNU} @command{dirname}, the +POSIX allows the implementation to define the results if +@var{name} is @samp{//}. With GNU @command{dirname}, the result is @samp{//} on platforms where @var{//} is distinct from @var{/}, and @samp{/} on platforms where there is no difference. @@ -12568,7 +13042,7 @@ The program accepts the following option. Also see @ref{Common options}. @itemx --zero @opindex -z @opindex --zero -Separate output items with @sc{nul} characters. +Separate output items with NUL characters. @end table @@ -12636,13 +13110,13 @@ print an error message if any of these conditions is true: A file name is empty. @item -A file name contains a character outside the @acronym{POSIX} portable file +A file name contains a character outside the POSIX portable file name character set, namely, the ASCII letters and digits, @samp{.}, @samp{_}, @samp{-}, and @samp{/}. @item The length of a file name or one of its components exceeds the -@acronym{POSIX} minimum limits for portability. +POSIX minimum limits for portability. @end enumerate @item -P @@ -12652,7 +13126,7 @@ that begins with @samp{-}. @item --portability @opindex --portability -Print an error message if a file name is not portable to all @acronym{POSIX} +Print an error message if a file name is not portable to all POSIX hosts. This option is equivalent to @samp{-p -P}. @end table @@ -12916,16 +13390,16 @@ only on the file name, and does not touch any actual file. @itemx --zero @opindex -z @opindex --zero -Separate output items with @sc{nul} characters. +Separate output items with NUL characters. -@itemx --relative-to=@var{file} +@item --relative-to=@var{file} @opindex --relative-to @cindex relpath Print the resolved file names relative to the specified file. Note this option honors the @option{-m} and @option{-e} options pertaining to file existence. -@itemx --relative-base=@var{base} +@item --relative-base=@var{base} @opindex --relative-base This option is valid when used with @option{--relative-to}, and will restrict the output of @option{--relative-to} so that relative names are output, @@ -13064,8 +13538,8 @@ be used in combination with any line settings. @opindex --file Set the line opened by the file name specified in @var{device} instead of the tty line connected to standard input. This option is necessary -because opening a @acronym{POSIX} tty requires use of the -@code{O_NONDELAY} flag to prevent a @acronym{POSIX} tty from blocking +because opening a POSIX tty requires use of the +@code{O_NONDELAY} flag to prevent a POSIX tty from blocking until the carrier detect line is high if the @code{clocal} flag is not set. Hence, it is not always possible to allow the shell to open the device in the traditional manner. @@ -13087,9 +13561,9 @@ description. The descriptions themselves refer to the positive case, that is, when @emph{not} negated (unless stated otherwise, of course). -Some settings are not available on all @acronym{POSIX} systems, since they use +Some settings are not available on all POSIX systems, since they use extensions. Such arguments are marked below with -``Non-@acronym{POSIX}'' in their description. On non-@acronym{POSIX} +``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 try it and see. @@ -13160,7 +13634,14 @@ Disable modem control signals. May be negated. @cindex hardware flow control @cindex flow control, hardware @cindex RTS/CTS flow control -Enable RTS/CTS flow control. Non-@acronym{POSIX}. May be negated. +Enable RTS/CTS flow control. Non-POSIX@. May be negated. + +@item cdtrdsr +@opindex cdtrdsr +@cindex hardware flow control +@cindex flow control, hardware +@cindex DTR/DSR flow control +Enable DTR/DSR flow control. Non-POSIX@. May be negated. @end table @@ -13240,20 +13721,20 @@ empty again. May be negated. @item iuclc @opindex iuclc @cindex uppercase, translating to lowercase -Translate uppercase characters to lowercase. Non-@acronym{POSIX}. May be -negated. Note ilcuc is not implemented, as one would not be able to issue +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. @item ixany @opindex ixany Allow any character to restart output (only the start character -if negated). Non-@acronym{POSIX}. May be negated. +if negated). Non-POSIX@. May be negated. @item imaxbel @opindex imaxbel @cindex beeping at input buffer full Enable beeping and not flushing input buffer if a character arrives -when the input buffer is full. Non-@acronym{POSIX}. May be negated. +when the input buffer is full. Non-POSIX@. May be negated. @end table @@ -13271,76 +13752,76 @@ Postprocess output. May be negated. @item olcuc @opindex olcuc @cindex lowercase, translating to output -Translate lowercase characters to uppercase. Non-@acronym{POSIX}. May be -negated. (Note ouclc is not currently implemented.) +Translate lowercase characters to uppercase. Non-POSIX@. May be +negated. (Note ouclc is not currently implemented.) @item ocrnl @opindex ocrnl @cindex return, translating to newline -Translate carriage return to newline. Non-@acronym{POSIX}. May be negated. +Translate carriage return to newline. Non-POSIX@. May be negated. @item onlcr @opindex onlcr @cindex newline, translating to crlf -Translate newline to carriage return-newline. Non-@acronym{POSIX}. May be +Translate newline to carriage return-newline. Non-POSIX@. May be negated. @item onocr @opindex onocr -Do not print carriage returns in the first column. Non-@acronym{POSIX}. +Do not print carriage returns in the first column. Non-POSIX@. May be negated. @item onlret @opindex onlret -Newline performs a carriage return. Non-@acronym{POSIX}. May be negated. +Newline performs a carriage return. Non-POSIX@. May be negated. @item ofill @opindex ofill @cindex pad instead of timing for delaying Use fill (padding) characters instead of timing for delays. -Non-@acronym{POSIX}. +Non-POSIX@. May be negated. @item ofdel @opindex ofdel @cindex pad character -Use @acronym{ASCII} @sc{del} characters for fill instead of -@acronym{ASCII} @sc{nul} characters. Non-@acronym{POSIX}. +Use ASCII DEL characters for fill instead of +ASCII NUL characters. Non-POSIX@. May be negated. @item nl1 @itemx nl0 @opindex nl@var{n} -Newline delay style. Non-@acronym{POSIX}. +Newline delay style. Non-POSIX. @item cr3 @itemx cr2 @itemx cr1 @itemx cr0 @opindex cr@var{n} -Carriage return delay style. Non-@acronym{POSIX}. +Carriage return delay style. Non-POSIX. @item tab3 @itemx tab2 @itemx tab1 @itemx tab0 @opindex tab@var{n} -Horizontal tab delay style. Non-@acronym{POSIX}. +Horizontal tab delay style. Non-POSIX. @item bs1 @itemx bs0 @opindex bs@var{n} -Backspace delay style. Non-@acronym{POSIX}. +Backspace delay style. Non-POSIX. @item vt1 @itemx vt0 @opindex vt@var{n} -Vertical tab delay style. Non-@acronym{POSIX}. +Vertical tab delay style. Non-POSIX. @item ff1 @itemx ff0 @opindex ff@var{n} -Form feed delay style. Non-@acronym{POSIX}. +Form feed delay style. Non-POSIX. @end table @@ -13362,7 +13843,7 @@ special characters. May be negated. @item iexten @opindex iexten -Enable non-@acronym{POSIX} special characters. May be negated. +Enable non-POSIX special characters. May be negated. @item echo @opindex echo @@ -13396,12 +13877,12 @@ characters. May be negated. @cindex case translation Enable input and output of uppercase characters by preceding their lowercase equivalents with @samp{\}, when @code{icanon} is set. -Non-@acronym{POSIX}. May be negated. +Non-POSIX@. May be negated. @item tostop @opindex tostop @cindex background jobs, stopping at terminal write -Stop background jobs that try to write to the terminal. Non-@acronym{POSIX}. +Stop background jobs that try to write to the terminal. Non-POSIX@. May be negated. @item echoprt @@ -13409,7 +13890,7 @@ May be negated. @opindex echoprt @opindex prterase Echo erased characters backward, between @samp{\} and @samp{/}. -Non-@acronym{POSIX}. May be negated. +Non-POSIX@. May be negated. @item echoctl @itemx ctlecho @@ -13418,7 +13899,7 @@ Non-@acronym{POSIX}. May be negated. @cindex control characters, using @samp{^@var{c}} @cindex hat notation for control characters Echo control characters in hat notation (@samp{^@var{c}}) instead -of literally. Non-@acronym{POSIX}. May be negated. +of literally. Non-POSIX@. May be negated. @item echoke @itemx crtkill @@ -13427,7 +13908,7 @@ of literally. Non-@acronym{POSIX}. May be negated. Echo the @code{kill} special character by erasing each character on the line as indicated by the @code{echoprt} and @code{echoe} settings, instead of by the @code{echoctl} and @code{echok} settings. -Non-@acronym{POSIX}. +Non-POSIX@. May be negated. @end table @@ -13515,18 +13996,18 @@ If negated, same as @code{parenb istrip opost cs7}. @item decctlq @opindex decctlq -Same as @option{-ixany}. Non-@acronym{POSIX}. May be negated. +Same as @option{-ixany}. Non-POSIX@. May be negated. @item tabs @opindex tabs -Same as @code{tab0}. Non-@acronym{POSIX}. May be negated. If negated, same +Same as @code{tab0}. Non-POSIX@. May be negated. If negated, same as @code{tab3}. @item lcase @itemx LCASE @opindex lcase @opindex LCASE -Same as @code{xcase iuclc olcuc}. Non-@acronym{POSIX}. May be negated. +Same as @code{xcase iuclc olcuc}. Non-POSIX@. May be negated. (Used for terminals with uppercase characters only.) @item crt @@ -13588,11 +14069,11 @@ End the line. @item eol2 @opindex eol2 -Alternate character to end the line. Non-@acronym{POSIX}. +Alternate character to end the line. Non-POSIX. @item swtch @opindex swtch -Switch to a different shell layer. Non-@acronym{POSIX}. +Switch to a different shell layer. Non-POSIX. @item start @opindex start @@ -13608,20 +14089,20 @@ Send a terminal stop signal. @item dsusp @opindex dsusp -Send a terminal stop signal after flushing the input. Non-@acronym{POSIX}. +Send a terminal stop signal after flushing the input. Non-POSIX. @item rprnt @opindex rprnt -Redraw the current line. Non-@acronym{POSIX}. +Redraw the current line. Non-POSIX. @item werase @opindex werase -Erase the last word typed. Non-@acronym{POSIX}. +Erase the last word typed. Non-POSIX. @item lnext @opindex lnext Enter the next character typed literally, even if it is a special -character. Non-@acronym{POSIX}. +character. Non-POSIX. @end table @@ -13652,13 +14133,13 @@ Set the output speed to @var{n}. @item rows @var{n} @opindex rows Tell the tty kernel driver that the terminal has @var{n} rows. -Non-@acronym{POSIX}. +Non-POSIX. @item cols @var{n} @itemx columns @var{n} @opindex cols @opindex columns -Tell the kernel that the terminal has @var{n} columns. Non-@acronym{POSIX}. +Tell the kernel that the terminal has @var{n} columns. Non-POSIX. @item size @opindex size @@ -13668,11 +14149,11 @@ 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 @env{LINES} and @env{COLUMNS} instead; however, GNU @command{stty} does not know anything about them.) -Non-@acronym{POSIX}. +Non-POSIX. @item line @var{n} @opindex line -Use line discipline @var{n}. Non-@acronym{POSIX}. +Use line discipline @var{n}. Non-POSIX. @item speed @opindex speed @@ -13853,7 +14334,7 @@ Print the user or group name instead of the ID number. Requires @itemx --real @opindex -r @opindex --real -Print the real, instead of effective, user or group ID. Requires +Print the real, instead of effective, user or group ID@. Requires @option{-u}, @option{-g}, or @option{-G}. @item -u @@ -13915,7 +14396,7 @@ options}. @cindex printing the effective user ID @command{whoami} prints the user name associated with the current -effective user ID. It is equivalent to the command @samp{id -un}. +effective user ID@. It is equivalent to the command @samp{id -un}. The only options are @option{--help} and @option{--version}. @xref{Common options}. @@ -14059,7 +14540,7 @@ Print a line of column headings. List only the entries that correspond to processes via which the system is waiting for a user to login. The user name is always @samp{LOGIN}. -@itemx --lookup +@item --lookup @opindex --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 @@ -14098,7 +14579,7 @@ Ignored; for compatibility with other versions of @command{who}. @opindex --time Print last system clock change. -@itemx -u +@item -u @opindex -u @cindex idle time After the login time, print the number of hours and minutes that the @@ -14217,23 +14698,23 @@ hour (@samp{00}@dots{}@samp{23}) @item %I hour (@samp{01}@dots{}@samp{12}) @item %k -hour, space padded (@samp{ 0}@dots{}@samp{23}); equivalent to @samp{%_H}. -This is a @acronym{GNU} extension. +hour, space padded (@samp{ 0}@dots{}@samp{23}); equivalent to @samp{%_H}@. +This is a GNU extension. @item %l -hour, space padded (@samp{ 1}@dots{}@samp{12}); equivalent to @samp{%_I}. -This is a @acronym{GNU} extension. +hour, space padded (@samp{ 1}@dots{}@samp{12}); equivalent to @samp{%_I}@. +This is a GNU extension. @item %M minute (@samp{00}@dots{}@samp{59}) @item %N nanoseconds (@samp{000000000}@dots{}@samp{999999999}). -This is a @acronym{GNU} extension. +This is a GNU extension. @item %p locale's equivalent of either @samp{AM} or @samp{PM}; blank in many locales. Noon is treated as @samp{PM} and midnight as @samp{AM}. @item %P like @samp{%p}, except lower case. -This is a @acronym{GNU} extension. +This is a GNU extension. @item %r locale's 12-hour clock time (e.g., @samp{11:11:04 PM}) @item %R @@ -14242,11 +14723,13 @@ locale's 12-hour clock time (e.g., @samp{11:11:04 PM}) @cindex epoch, seconds since @cindex seconds since the epoch @cindex beginning of time -seconds since the epoch, i.e., since 1970-01-01 00:00:00 UTC. +@cindex leap seconds +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. @xref{%s-examples}, for examples. -This is a @acronym{GNU} extension. +This is a GNU extension. @item %S +@cindex leap seconds second (@samp{00}@dots{}@samp{60}). This may be @samp{60} if leap seconds are supported. @item %T @@ -14254,7 +14737,7 @@ This may be @samp{60} if leap seconds are supported. @item %X locale's time representation (e.g., @samp{23:13:48}) @item %z -@w{@acronym{RFC} 2822/@acronym{ISO} 8601} style numeric time zone +@w{RFC 2822/ISO 8601} style numeric time zone (e.g., @samp{-0600} or @samp{+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 @@ -14262,20 +14745,20 @@ by the @env{TZ} environment variable. The time (and optionally, the time zone rules) can be overridden by the @option{--date} option. @item %:z -@w{@acronym{RFC} 3339/@acronym{ISO} 8601} style numeric time zone with +@w{RFC 3339/ISO 8601} style numeric time zone with @samp{:} (e.g., @samp{-06:00} or @samp{+05:30}), or nothing if no time zone is determinable. -This is a @acronym{GNU} extension. +This is a GNU extension. @item %::z Numeric time zone to the nearest second with @samp{:} (e.g., @samp{-06:00:00} or @samp{+05:30:00}), or nothing if no time zone is determinable. -This is a @acronym{GNU} extension. +This is a GNU extension. @item %:::z Numeric time zone with @samp{:} using the minimum necessary precision (e.g., @samp{-06}, @samp{+05:30}, or @samp{-04:56:02}), or nothing if no time zone is determinable. -This is a @acronym{GNU} extension. +This is a GNU extension. @item %Z alphabetic time zone abbreviation (e.g., @samp{EDT}), or nothing if no time zone is determinable. See @samp{%z} for how it is determined. @@ -14313,19 +14796,19 @@ date; same as @samp{%m/%d/%y} @item %e day of month, space padded; same as @samp{%_d} @item %F -full date in @acronym{ISO} 8601 format; same as @samp{%Y-%m-%d}. +full date in ISO 8601 format; same as @samp{%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@dots{}9999. @item %g -year corresponding to the @acronym{ISO} week number, but without the century +year corresponding to the ISO week number, but without the century (range @samp{00} through @samp{99}). This has the same format and value -as @samp{%y}, except that if the @acronym{ISO} week number (see +as @samp{%y}, except that if the ISO week number (see @samp{%V}) belongs to the previous or next year, that year is used instead. @item %G -year corresponding to the @acronym{ISO} week number. This has the -same format and value as @samp{%Y}, except that if the @acronym{ISO} +year corresponding to the ISO week number. This has the +same format and value as @samp{%Y}, except that if the ISO week number (see @samp{%V}) belongs to the previous or next year, that year is used instead. @@ -14345,12 +14828,12 @@ week number of year, with Sunday as the first day of the week (@samp{00}@dots{}@samp{53}). Days in a new year preceding the first Sunday are in week zero. @item %V -@acronym{ISO} week number, that is, the +ISO week number, that is, the week number of year, with Monday as the first day of the week (@samp{01}@dots{}@samp{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 @acronym{ISO} 8601 +the previous year, and the next week is week 1. (See the ISO 8601 standard.) @item %w day of week (@samp{0}@dots{}@samp{6}) with 0 corresponding to Sunday @@ -14400,7 +14883,7 @@ 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 @acronym{GNU} extension, @command{date} recognizes any of the +As a GNU extension, @command{date} recognizes any of the following optional flags after the @samp{%}: @table @samp @@ -14432,7 +14915,7 @@ date +%_d/%_m -d "Feb 1" @result{} 1/ 2 @end example -As a @acronym{GNU} extension, you can specify the field width +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 @@ -14526,8 +15009,8 @@ format. It can contain month names, time zones, @samp{am} and @samp{pm}, @samp{yesterday}, etc. For example, @option{--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 @acronym{UTC}.@* -Note: input currently must be in locale independent format. E.g., the +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: @example date -d "$(LC_TIME=C date)" @@ -14548,7 +15031,7 @@ be considerable. @itemx --iso-8601[=@var{timespec}] @opindex -I[@var{timespec}] @opindex --iso-8601[=@var{timespec}] -Display the date using the @acronym{ISO} 8601 format, @samp{%Y-%m-%d}. +Display the date using the ISO 8601 format, @samp{%Y-%m-%d}. The argument @var{timespec} specifies the number of additional terms of the time to include. It can be one of the following: @@ -14595,7 +15078,7 @@ Fri, 09 Sep 2005 13:51:39 -0700 This format conforms to @uref{ftp://ftp.rfc-editor.org/in-notes/rfc2822.txt, Internet -@acronym{RFCs} 2822} and +RFCs 2822} and @uref{ftp://ftp.rfc-editor.org/in-notes/rfc822.txt, 822}, the current and previous standards for Internet email. @@ -14603,10 +15086,10 @@ current and previous standards for Internet email. @opindex --rfc-3339=@var{timespec} Display the date using a format specified by @uref{ftp://ftp.rfc-editor.org/in-notes/rfc3339.txt, Internet -@acronym{RFC} 3339}. This is a subset of the @acronym{ISO} 8601 +RFC 3339}. This is a subset of the ISO 8601 format, except that it also permits applications to use a space rather than a @samp{T} to separate dates from times. Unlike the other -standard formats, @acronym{RFC} 3339 format is always suitable as +standard formats, RFC 3339 format is always suitable as input for the @option{--date} (@option{-d}) and @option{--file} (@option{-f}) options, regardless of the current locale. @@ -14622,7 +15105,7 @@ This is equivalent to the format @samp{%Y-%m-%d}. Print the full-date and full-time separated by a space, e.g., @samp{2005-09-14 00:56:06+05:30}. The output ends with a numeric time-offset; here the @samp{+05:30} means that local time is five -hours and thirty minutes east of @acronym{UTC}. This is equivalent to +hours and thirty minutes east of UTC@. This is equivalent to the format @samp{%Y-%m-%d %H:%M:%S%:z}. @item ns @@ -14649,12 +15132,15 @@ See also @ref{Setting the time}. @cindex UTC @cindex Greenwich Mean Time @cindex GMT +@cindex leap seconds @vindex TZ -Use Coordinated Universal Time (@acronym{UTC}) by operating as if the +Use Coordinated Universal Time (UTC) by operating as if the @env{TZ} environment variable were set to the string @samp{UTC0}. Coordinated -Universal Time is often called ``Greenwich Mean Time'' (@sc{gmt}) for +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. @end table @@ -14702,7 +15188,7 @@ for example @samp{date -d 1may '+%B %d'} will print @samp{May 01}. @item To print a date without the leading zero for one-digit days -of the month, you can use the (@acronym{GNU} extension) +of the month, you can use the (GNU extension) @samp{-} flag to suppress the padding altogether: @@ -14712,7 +15198,7 @@ date -d 1may '+%B %-d @item To print the current date and time in the format required by many -non-@acronym{GNU} versions of @command{date} when setting the system clock: +non-GNU versions of @command{date} when setting the system clock: @example date +%m%d%H%M%Y.%S @@ -14726,7 +15212,7 @@ date --set='+2 minutes' @end example @item -To print the date in @acronym{RFC} 2822 format, +To print the date in RFC 2822 format, use @samp{date --rfc-2822}. Here is some example output: @example @@ -14805,6 +15291,36 @@ date -u -d '1970-01-01 946684800 seconds' +"%Y-%m-%d %T %z" 2000-01-01 00:00:00 +0000 @end smallexample +@item +@cindex leap seconds +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. + +Here is how the two kinds of systems handle the leap second at +2012-06-30 23:59:60 UTC: + +@example +# Typical systems ignore leap seconds: +date --date='2012-06-30 23:59:59 +0000' +%s +1341100799 +date --date='2012-06-30 23:59:60 +0000' +%s +date: invalid date '2012-06-30 23:59:60 +0000' +date --date='2012-07-01 00:00:00 +0000' +%s +1341100800 +@end example + +@example +# Atypical systems count leap seconds: +date --date='2012-06-30 23:59:59 +0000' +%s +1341100823 +date --date='2012-06-30 23:59:60 +0000' +%s +1341100824 +date --date='2012-07-01 00:00:00 +0000' +%s +1341100825 +@end example + @end itemize @@ -14973,9 +15489,9 @@ Print the kernel release. @cindex kernel name @cindex name of kernel Print the kernel name. -@acronym{POSIX} 1003.1-2001 (@pxref{Standards conformance}) calls this +POSIX 1003.1-2001 (@pxref{Standards conformance}) calls this ``the implementation of the operating system'', because the -@acronym{POSIX} specification itself has no notion of ``kernel''. +POSIX specification itself has no notion of ``kernel''. The kernel name might be the same as the operating system name printed by the @option{-o} or @option{--operating-system} option, but it might differ. Some operating systems (e.g., FreeBSD, HP-UX) have the same @@ -15114,12 +15630,16 @@ The program accepts the following options. Also see @ref{Common options}. @table @samp +@item --dereference +@opindex --dereference +Do not affect symbolic links but what they refer to; this is the default. + @item -h @itemx --no-dereference @opindex -h @opindex --no-dereference @cindex no dereference -Affect symbolic links instead of any referenced file. +Affect the symbolic links themselves instead of any referenced file. @item --reference=@var{rfile} @opindex --reference @@ -15132,6 +15652,18 @@ Use @var{rfile}'s security context rather than specifying a @var{context} value. @opindex --recursive Operate on files and directories recursively. +@item --preserve-root +@opindex --preserve-root +Refuse to operate recursively on the root directory, @file{/}, +when used together with the @option{--recursive} option. +@xref{Treating / specially}. + +@item --no-preserve-root +@opindex --no-preserve-root +Do not treat the root directory, @file{/}, specially when operating +recursively; this is the default. +@xref{Treating / specially}. + @choptH @xref{Traversing symlinks}. @@ -15266,7 +15798,6 @@ user, etc. * nice invocation:: Modify niceness. * nohup invocation:: Immunize to hangups. * stdbuf invocation:: Modify buffering of standard streams. -* su invocation:: Modify user and group ID. * timeout invocation:: Run with time limit. @end menu @@ -15305,14 +15836,14 @@ Options must precede operands. @table @samp -@itemx --userspec=@var{user}[:@var{group}] +@item --userspec=@var{user}[:@var{group}] @opindex --userspec 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}. -@itemx --groups=@var{groups} +@item --groups=@var{groups} @opindex --groups Use this option to specify the supplementary @var{groups} to be used by the new process. @@ -15383,9 +15914,9 @@ 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 @samp{=} and @acronym{ASCII} @sc{nul}. +characters other than @samp{=} and ASCII NUL. However, it is wise to limit yourself to names that -consist solely of underscores, digits, and @acronym{ASCII} letters, +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. @@ -15517,8 +16048,9 @@ the exit status of @var{command} otherwise @cindex scheduling, affecting @cindex appropriate privileges -@command{nice} prints or modifies a process's @dfn{niceness}, -a parameter that affects whether the process is scheduled favorably. +@command{nice} prints a process's @dfn{niceness}, or runs +a command with modified niceness. @dfn{niceness} affects how +favorably the process is scheduled in the system. Synopsis: @example @@ -15533,7 +16065,7 @@ Niceness values range at least from @minus{}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 nicenesses; conversely, other systems may +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. @@ -15542,10 +16074,10 @@ 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, @acronym{POSIX} defines the behavior of @command{nice} in +terminology, POSIX defines the behavior of @command{nice} in terms of a @dfn{nice value}, which is the nonnegative difference between a niceness and the minimum niceness. Though @command{nice} -conforms to @acronym{POSIX}, its documentation and diagnostics use the +conforms to POSIX, its documentation and diagnostics use the term ``niceness'' for compatibility with historical practice. @var{command} must not be a special built-in utility (@pxref{Special @@ -15553,6 +16085,9 @@ built-in utilities}). @mayConflictWithShellBuiltIn{nice} +Note to change the @dfn{niceness} of an existing process, +one needs to use the @command{renice} command. + The program accepts the following option. Also see @ref{Common options}. Options must precede operands. @@ -15651,8 +16186,8 @@ nohup @var{command} [@var{arg}]@dots{} If standard input is a terminal, it is redirected from @file{/dev/null} so that terminal sessions do not mistakenly consider -the terminal to be used by the command. This is a @acronym{GNU} -extension; programs intended to be portable to non-@acronym{GNU} hosts +the terminal to be used by the command. This is a GNU +extension; programs intended to be portable to non-GNU hosts should use @samp{nohup @var{command} [@var{arg}]@dots{} </dev/null} instead. @@ -15794,163 +16329,6 @@ the exit status of @var{command} otherwise @end display -@node su invocation -@section @command{su}: Run a command with substitute user and group ID - -@pindex su -@cindex substitute user and group IDs -@cindex user ID, switching -@cindex super-user, becoming -@cindex root, becoming - -@command{su} allows one user to temporarily become another user. It runs a -command (often an interactive shell) with the real and effective user -ID, group ID, and supplemental groups of a given @var{user}. Synopsis: - -@example -su [@var{option}]@dots{} [@var{user} [@var{arg}]@dots{}] -@end example - -@cindex passwd entry, and @command{su} shell -@flindex /bin/sh -@flindex /etc/passwd -If no @var{user} is given, the default is @code{root}, the super-user. -The shell to use is taken from @var{user}'s @code{passwd} entry, or -@file{/bin/sh} if none is specified there. If @var{user} has a -password, @command{su} prompts for the password unless run by a user with -effective user ID of zero (the super-user). - -@vindex HOME -@vindex SHELL -@vindex USER -@vindex LOGNAME -@cindex login shell -By default, @command{su} does not change the current directory. -It sets the environment variables @env{HOME} and @env{SHELL} -from the password entry for @var{user}, and if @var{user} is not -the super-user, sets @env{USER} and @env{LOGNAME} to @var{user}. -By default, the shell is not a login shell. - -Any additional @var{arg}s are passed as additional arguments to the -shell. - -@cindex @option{-su} -GNU @command{su} does not treat @file{/bin/sh} or any other shells specially -(e.g., by setting @code{argv[0]} to @option{-su}, passing @option{-c} only -to certain shells, etc.). - -@findex syslog -@command{su} can optionally be compiled to use @code{syslog} to report -failed, and optionally successful, @command{su} attempts. (If the system -supports @code{syslog}.) However, GNU @command{su} does not check if the -user is a member of the @code{wheel} group; see below. - -The program accepts the following options. Also see @ref{Common options}. - -@table @samp -@item -c @var{command} -@itemx --command=@var{command} -@opindex -c -@opindex --command -Pass @var{command}, a single command line to run, to the shell with -a @option{-c} option instead of starting an interactive shell. - -@item -f -@itemx --fast -@opindex -f -@opindex --fast -@flindex .cshrc -@cindex file name pattern expansion, disabled -@cindex globbing, disabled -Pass the @option{-f} option to the shell. This probably only makes sense -if the shell run is @command{csh} or @command{tcsh}, for which the @option{-f} -option prevents reading the startup file (@file{.cshrc}). With -Bourne-like shells, the @option{-f} option disables file name pattern -expansion (globbing), which is not likely to be useful. - -@item - -@itemx -l -@itemx --login -@opindex - -@opindex -l -@opindex --login -@c other variables already indexed above -@vindex TERM -@vindex PATH -@cindex login shell, creating -Make the shell a login shell. This means the following. Unset all -environment variables except @env{TERM}, @env{HOME}, and @env{SHELL} -(which are set as described above), and @env{USER} and @env{LOGNAME} -(which are set, even for the super-user, as described above), and set -@env{PATH} to a compiled-in default value. Change to @var{user}'s home -directory. Prepend @samp{-} to the shell's name, intended to make it -read its login startup file(s). - -@item -m -@itemx -p -@itemx --preserve-environment -@opindex -m -@opindex -p -@opindex --preserve-environment -@cindex environment, preserving -@flindex /etc/shells -@cindex restricted shell -Do not change the environment variables @env{HOME}, @env{USER}, -@env{LOGNAME}, or @env{SHELL}. Run the shell given in the environment -variable @env{SHELL} instead of the shell from @var{user}'s passwd -entry, unless the user running @command{su} is not the super-user and -@var{user}'s shell is restricted. A @dfn{restricted shell} is one that -is not listed in the file @file{/etc/shells}, or in a compiled-in list -if that file does not exist. Parts of what this option does can be -overridden by @option{--login} and @option{--shell}. - -@item -s @var{shell} -@itemx --shell=@var{shell} -@opindex -s -@opindex --shell -Run @var{shell} instead of the shell from @var{user}'s passwd entry, -unless the user running @command{su} is not the super-user and @var{user}'s -shell is restricted (see @option{-m} just above). - -@end table - -@cindex exit status of @command{su} -Exit status: - -@display -125 if @command{su} itself fails -126 if subshell is found but cannot be invoked -127 if subshell cannot be found -the exit status of the subshell otherwise -@end display - -@cindex wheel group, not supported -@cindex group wheel, not supported -@cindex fascism -@subsection Why GNU @command{su} does not support the @samp{wheel} group - -(This section is by Richard Stallman.) - -@cindex Twenex -@cindex MIT AI lab -Sometimes a few of the users try to hold total power over all the -rest. For example, in 1984, a few users at the MIT AI lab decided to -seize power by changing the operator password on the Twenex system and -keeping it secret from everyone else. (I was able to thwart this coup -and give power back to the users by patching the kernel, but I -wouldn't know how to do that in Unix.) - -However, occasionally the rulers do tell someone. Under the usual -@command{su} mechanism, once someone learns the root password who -sympathizes with the ordinary users, he or she can tell the rest. The -``wheel group'' feature would make this impossible, and thus cement the -power of the rulers. - -I'm on the side of the masses, not that of the rulers. If you are -used to supporting the bosses and sysadmins in whatever they do, you -might find this idea strange at first. - - @node timeout invocation @section @command{timeout}: Run a command with a time limit @@ -15972,7 +16350,13 @@ The program accepts the following options. Also see @ref{Common options}. Options must precede operands. @table @samp -@itemx --foreground +@item --preserve-status +@opindex --preserve-status +Return the exit status of the managed @var{command} on timeout, rather than +a specific exit status indicating a timeout. This is useful if the +managed @var{command} supports running for an indeterminite amount of time. + +@item --foreground @opindex --foreground Don't create a separate background program group, so that the managed @var{command} can use the foreground TTY normally. @@ -16003,8 +16387,8 @@ the @var{command}. @opindex -s @opindex --signal Send this @var{signal} to @var{command} on timeout, rather than the -default @samp{TERM} signal. @var{signal} may be a name like @samp{HUP} -or a number. @xref{Signal specifications}. +default @samp{TERM} signal. @var{signal} may be a name like @samp{HUP} +or a number. @xref{Signal specifications}. @end table @cindex time units @@ -16062,7 +16446,7 @@ kill [-l | --list | -t | --table] [@var{signal}]@dots{} The first form of the @command{kill} command sends a signal to all @var{pid} arguments. The default signal to send if none is specified -is @samp{TERM}. The special signal number @samp{0} does not denote a +is @samp{TERM}@. The special signal number @samp{0} does not denote a valid signal, but can be used to test whether the @var{pid} arguments specify processes to which a signal could be sent. @@ -16080,7 +16464,7 @@ is sent. If a negative @var{pid} argument is desired as the first one, it should be preceded by @option{--}. However, as a common extension to -@acronym{POSIX}, @option{--} is not required with @samp{kill +POSIX, @option{--} is not required with @samp{kill -@var{signal} -@var{pid}}. The following commands are equivalent: @example @@ -16110,7 +16494,7 @@ The @command{kill} command also supports the @option{--help} and A @var{signal} may be a signal name like @samp{HUP}, or a signal number like @samp{1}, or an exit status of a process terminated by the signal. A signal name can be given in canonical form or prefixed by -@samp{SIG}. The case of the letters is ignored, except for the +@samp{SIG}@. The case of the letters is ignored, except for the @option{-@var{signal}} option which must use upper case to avoid ambiguity with lower case option letters. @xref{Signal specifications}, for a list of supported @@ -16277,7 +16661,7 @@ Options must precede operands. Print all numbers using @var{format}. @var{format} must contain exactly one of the @samp{printf}-style floating point conversion specifications @samp{%a}, @samp{%e}, -@samp{%f}, @samp{%g}, @samp{%A}, @samp{%E}, @samp{%F}, @samp{%G}. +@samp{%f}, @samp{%g}, @samp{%A}, @samp{%E}, @samp{%F}, @samp{%G}@. The @samp{%} may be followed by zero or more flags taken from the set @samp{-+#0 '}, then an optional width containing one or more digits, then an optional precision consisting of a @samp{.} followed by zero @@ -16346,12 +16730,16 @@ case is that @command{seq} works with integers through @math{2^{64}}, and larger integers may not be numerically correct: @example -$ seq 18446744073709551616 1 18446744073709551618 -18446744073709551616 -18446744073709551616 -18446744073709551618 +$ seq 50000000000000000000 2 50000000000000000004 +50000000000000000000 +50000000000000000000 +50000000000000000004 @end example +However, note that when limited to non-negative whole numbers, +an increment of 1 and no format-specifying option, seq can print +arbitrarily large numbers. + Be careful when using @command{seq} with outlandish values: otherwise you may see surprising results, as @command{seq} uses floating point internally. For example, on the x86 platform, where the internal @@ -16379,7 +16767,7 @@ outputs 1.0000000000000000007 twice and skips 1.0000000000000000008. An earlier version of this chapter appeared in @uref{http://www.linuxjournal.com/article.php?sid=2762, the -@cite{What's GNU?} column of the June 1994 @cite{Linux Journal}}. +@cite{What's GNU@?} column of the June 1994 @cite{Linux Journal}}. It was written by Arnold Robbins. @menu @@ -16489,7 +16877,7 @@ redirected standard output of your program away from your screen. For filter programs to work together, the format of the data has to 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 @acronym{ASCII} @sc{lf} (Line Feed) character, +lines delimited by the ASCII LF (Line Feed) character, conventionally called a ``newline'' in the Unix literature. (This is @code{'\n'} if you're a C programmer.) This is the format used by all the traditional filtering programs. (Many earlier operating systems @@ -16757,7 +17145,7 @@ $ tr '[:upper:]' '[:lower:]' < whats.gnu | tr -cd '[:alnum:]_ \n' | ... The second @command{tr} command operates on the complement of the listed characters, which are all the letters, the digits, the underscore, and the blank. The @samp{\n} represents the newline character; it has to -be left alone. (The @acronym{ASCII} tab character should also be included for +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 space. diff --git a/doc/local.mk b/doc/local.mk new file mode 100644 index 00000000..3941a1f1 --- /dev/null +++ b/doc/local.mk @@ -0,0 +1,127 @@ +# Make coreutils documentation. -*-Makefile-*- +# This is included by the top-level Makefile.am. + +# Copyright (C) 1995-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/>. + +info_TEXINFOS = doc/coreutils.texi + +doc_coreutils_TEXINFOS = \ + doc/perm.texi \ + doc/parse-datetime.texi \ + doc/constants.texi \ + doc/fdl.texi + +# The following is necessary if the package name is 8 characters or longer. +# If the info documentation would be split into 10 or more separate files, +# then this is necessary even if the package name is 7 characters long. +# +# Tell makeinfo to put everything in a single info file: <package>.info. +# Otherwise, it would also generate files with names like <package>.info-[123], +# and those names all map to one 14-byte name (<package>.info-) on some crufty +# old systems. +AM_MAKEINFOFLAGS = --no-split + +doc/constants.texi: $(top_srcdir)/src/tail.c $(top_srcdir)/src/shred.c + $(AM_V_GEN)LC_ALL=C; export LC_ALL; \ + $(MKDIR_P) doc && \ + { sed -n -e 's/^#define \(DEFAULT_MAX[_A-Z]*\) \(.*\)/@set \1 \2/p' \ + $(top_srcdir)/src/tail.c && \ + sed -n -e \ + 's/.*\(DEFAULT_PASSES\)[ =]* \([0-9]*\).*/@set SHRED_\1 \2/p'\ + $(top_srcdir)/src/shred.c; } > $@-t \ + && mv $@-t $@ + +MAINTAINERCLEANFILES += doc/constants.texi + +# Extended regular expressions to match word starts and ends. +_W = (^|[^A-Za-z0-9_]) +W_ = ([^A-Za-z0-9_]|$$) + +syntax_checks = \ + sc-avoid-builtin \ + sc-avoid-io \ + sc-avoid-non-zero \ + sc-avoid-path \ + sc-avoid-timezone \ + sc-avoid-zeroes \ + sc-exponent-grouping \ + sc-lower-case-var + +texi_files = $(srcdir)/doc/*.texi + +.PHONY: $(syntax_checks) check-texinfo + +# List words/regexps here that should not appear in the texinfo documentation. +check-texinfo: $(syntax_checks) + $(AM_V_GEN)fail=0; \ + grep '@url{' $(texi_files) && fail=1; \ + grep '\$$@"' $(texi_files) && fail=1; \ + grep -n '[^[:punct:]]@footnote' $(texi_files) && fail=1; \ + grep -n filename $(texi_files) \ + | $(EGREP) -v 'setfilename|[{]filename[}]' \ + && fail=1; \ + exit $$fail + +sc-avoid-builtin: + $(AM_V_GEN)$(EGREP) -i '$(_W)builtins?$(W_)' $(texi_files) \ + && exit 1 || : + +sc-avoid-path: + $(AM_V_GEN)fail=0; \ + $(EGREP) -i '$(_W)path(name)?s?$(W_)' $(texi_files) \ + | $(EGREP) -v \ + 'PATH=|path search|search path|@vindex PATH$$|@env[{]PATH[}]' \ + && fail=1; \ + exit $$fail + +# Use "time zone", not "timezone". +sc-avoid-timezone: + $(AM_V_GEN)$(EGREP) timezone $(texi_files) && exit 1 || : + +# Check for insufficient exponent grouping, e.g., +# @math{2^64} should be @math{2^{64}}. +sc-exponent-grouping: + $(AM_V_GEN)$(EGREP) '\{.*\^[0-9][0-9]' $(texi_files) && exit 1 || : + +# Say I/O, not IO. +sc-avoid-io: + $(AM_V_GEN)$(EGREP) '$(_W)IO$(W_)' $(texi_files) && exit 1 || : + +# I prefer nonzero over non-zero. +sc-avoid-non-zero: + $(AM_V_GEN)$(EGREP) non-zero $(texi_files) && exit 1 || : + +# Use "zeros", not "zeroes" (nothing wrong with "zeroes"; just be consistent). +sc-avoid-zeroes: + $(AM_V_GEN)$(EGREP) -i '$(_W)zeroes$(W_)' $(texi_files) \ + && exit 1 || : + +# The quantity inside @var{...} should not contain upper case letters. +# The leading backslash exemption is to permit in-macro uses like +# @var{\varName\} where the upper case letter is part of a parameter name. +find_upper_case_var = \ + '/\@var{/ or next; \ + while (/\@var{(.+?)}/g) \ + { \ + $$v = $$1; \ + $$v =~ /[A-Z]/ && $$v !~ /^\\/ and (print "$$ARGV:$$.:$$_"), $$m = 1 \ + } \ + END {$$m and (warn "$@: do not use upper case in \@var{...}\n"), exit 1}' +sc-lower-case-var: + $(AM_V_GEN)$(PERL) -e 1 || { echo $@: skipping test; exit 0; }; \ + $(PERL) -lne $(find_upper_case_var) $(texi_files) + +check-local: check-texinfo diff --git a/doc/parse-datetime.texi b/doc/parse-datetime.texi index d4ffd4ac..6b3e973e 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-2012 Free Software Foundation, Inc. +@c Copyright (C) 1994-2006, 2009-2013 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 @@ -38,10 +38,10 @@ 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. @dots{} ---- Robert Grudin, @cite{Time and the Art of Living}. +---Robert Grudin, @cite{Time and the Art of Living}. @end quotation -This section describes the textual date representations that @sc{gnu} +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 @code{parse_datetime} function) is not described here. @@ -50,8 +50,8 @@ arguments to the various programs. The C interface (via the * General date syntax:: Common rules. * Calendar date items:: 19 Dec 1994. * Time of day items:: 9:20pm. -* Time zone items:: @sc{est}, @sc{pdt}, @sc{gmt}. -* Combined date and time of day items:: 1972-09-24T20:02:00,000000-0500 +* Time zone items:: EST, PDT, UTC, @dots{} +* 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. * Pure numbers in date strings:: 19931219, 1440. @@ -117,10 +117,10 @@ abbreviations like @samp{AM}, @samp{DST}, @samp{EST}, @samp{first}, The output of the @command{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 @samp{IST}. When using +standard meaning for time zone items like @samp{IST}@. When using @command{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 @samp{UTC} and @samp{Z}. Here are some +use time zone items other than @samp{UTC} and @samp{Z}@. Here are some ways to do this: @example @@ -145,6 +145,7 @@ 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. +@cindex leap seconds Invalid dates like @samp{2005-02-29} or times like @samp{24:00} are rejected. In the typical case of a host that does not support leap seconds, a time like @samp{23:59:60} is rejected even if it @@ -161,7 +162,7 @@ specified differently, depending on whether the month is specified numerically or literally. All these strings specify the same calendar date: @example -1972-09-24 # @sc{iso} 8601. +1972-09-24 # ISO 8601. 72-9-24 # Assume 19xx for 69 through 99, # 20xx for 00 through 68. 72-09-24 # Leading zeros are ignored. @@ -184,9 +185,9 @@ sep 24 Here are the rules. -@cindex @sc{iso} 8601 date format -@cindex date format, @sc{iso} 8601 -For numeric months, the @sc{iso} 8601 format +@cindex ISO 8601 date format +@cindex date format, ISO 8601 +For numeric months, the ISO 8601 format @samp{@var{year}-@var{month}-@var{day}} is allowed, where @var{year} is any positive number, @var{month} is a number between 01 and 12, and @var{day} is a number between 01 and 31. A leading zero must be present @@ -234,9 +235,10 @@ day. Here are some examples, all of which represent the same time: 20:02:00.000000 20:02 8:02pm -20:02-0500 # In @sc{est} (U.S. Eastern Standard Time). +20:02-0500 # In EST (U.S. Eastern Standard Time). @end example +@cindex leap seconds More generally, the time of day may be given as @samp{@var{hour}:@var{minute}:@var{second}}, where @var{hour} is a number between 0 and 23, @var{minute} is a number between 0 and @@ -272,10 +274,10 @@ the one- or two-digit correction is interpreted as a number of hours. You can also separate @var{hh} from @var{mm} with a colon. When a time zone correction is given this way, it forces interpretation of the time relative to -Coordinated Universal Time (@sc{utc}), overriding any previous +Coordinated Universal Time (UTC), overriding any previous specification for the time zone or the local time zone. For example, @samp{+0530} and @samp{+05:30} both stand for the time zone 5.5 hours -ahead of @sc{utc} (e.g., India). +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. @@ -317,24 +319,27 @@ time stamps are interpreted using the rules of the default time zone @section Combined date and time of day items @cindex combined date and time of day item +@cindex ISO 8601 date and time of day format +@cindex date and time of day format, ISO 8601 -A @dfn{combined date and time of day item} specifies the time on a -specific day of the year. This type is needed for formats that cannot -be represented by individual calendar date (@pxref{Calendar date items}) -and time of day (@pxref{Time of day items}) items due to ambiguity. +The ISO 8601 date and time of day extended format consists of an ISO +8601 date, a @samp{T} character separator, and an ISO 8601 time of +day. This format is also recognized if the @samp{T} is replaced by a +space. -@example -# ISO 8601 extended date and time of day format -1972-09-24T20:02:00,000000-0500 -@end example - -@cindex @sc{iso} 8601 date and time of day format -@cindex date and time of day format, @sc{iso} 8601 +In this format, the time of day should use 24-hour notation. +Fractional seconds are allowed, with either comma or period preceding +the fraction. ISO 8601 fractional minutes and hours are not +supported. Typically, hosts support nanosecond timestamp resolution; +excess precision is silently discarded. -The @sc{iso} 8601 extended date and time of day format is an @sc{iso} -8601 date, a @samp{T} character separator, followed by an @sc{iso} 8601 time -of day. +Here are some examples: +@example +2012-09-24T20:02:00.052-0500 +2012-12-31T23:59:59,999999999+1100 +1970-01-01 00:00Z +@end example @node Day of week items @section Day of week items @@ -480,28 +485,29 @@ 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. -@cindex beginning of time, for @acronym{POSIX} -@cindex epoch, for @acronym{POSIX} +@cindex beginning of time, for POSIX +@cindex epoch, for POSIX Internally, computer times are represented as a count of seconds since -an epoch---a well-defined point of time. On @acronym{GNU} and -@acronym{POSIX} systems, the epoch is 1970-01-01 00:00:00 @sc{utc}, so +an epoch---a well-defined point of time. On GNU and +POSIX systems, the epoch is 1970-01-01 00:00:00 UTC, so @samp{@@0} represents this time, @samp{@@1} represents 1970-01-01 -00:00:01 @sc{utc}, and so forth. @acronym{GNU} and most other -@acronym{POSIX}-compliant systems support such times as an extension -to @acronym{POSIX}, using negative counts, so that @samp{@@-1} -represents 1969-12-31 23:59:59 @sc{utc}. +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 @samp{@@-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 @sc{utc}. More modern systems use 64-bit counts +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. +@cindex leap seconds On most hosts, these counts ignore the presence of leap seconds. For example, on most hosts @samp{@@915148799} represents 1998-12-31 -23:59:59 @sc{utc}, @samp{@@915148800} represents 1999-01-01 00:00:00 -@sc{utc}, and there is no way to represent the intervening leap second -1998-12-31 23:59:60 @sc{utc}. +23:59:59 UTC, @samp{@@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. @node Specifying time zone rules @section Specifying time zone rules @@ -516,7 +522,7 @@ two quote characters (@samp{"}) must be present in the date, and any quotes or backslashes within @var{rule} must be escaped by a backslash. -For example, with the @acronym{GNU} @command{date} command you can +For example, with the GNU @command{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 @samp{TZ="Europe/Paris"} as shown in the following shell transcript: @@ -540,16 +546,16 @@ A @env{TZ} value is a rule that typically names a location in the @uref{http://www.twinsun.com/tz/tz-link.htm, @samp{tz} database}. A recent catalog of location names appears in the @uref{http://twiki.org/cgi-bin/xtra/tzdate, TWiki Date and Time -Gateway}. A few non-@acronym{GNU} hosts require a colon before a +Gateway}. A few non-GNU hosts require a colon before a location name in a @env{TZ} setting, e.g., @samp{TZ=":America/New_York"}. The @samp{tz} database includes a wide variety of locations ranging from @samp{Arctic/Longyearbyen} to @samp{Antarctica/South_Pole}, but if you are at sea and have your own private time zone, or if you are -using a non-@acronym{GNU} host that does not support the @samp{tz} -database, you may need to use a @acronym{POSIX} rule instead. Simple -@acronym{POSIX} rules like @samp{UTC0} specify a time zone without +using a non-GNU host that does not support the @samp{tz} +database, you may need to use a POSIX rule instead. Simple +POSIX rules like @samp{UTC0} specify a time zone without daylight saving time; other rules can specify simple daylight saving regimes. @xref{TZ Variable,, Specifying the Time Zone with @code{TZ}, libc, The GNU C Library}. @@ -573,7 +579,7 @@ implemented by Steven M. Bellovin at Chapel Hill. The code was later tweaked by a couple of people on Usenet, then completely overhauled by Rich $alz (@email{rsalz@@bbn.com}) and Jim Berets (@email{jberets@@bbn.com}) in August, 1990. Various -revisions for the @sc{gnu} system were made by David MacKenzie, Jim Meyering, +revisions for the GNU system were made by David MacKenzie, Jim Meyering, Paul Eggert and others, including renaming it to @code{get_date} to avoid a conflict with the alternative Posix function @code{getdate}, and a later rename to @code{parse_datetime}. The Posix function @@ -585,4 +591,4 @@ file, and lacks the thread-safety of @code{parse_datetime}. @cindex Berry, K. This chapter was originally produced by Fran@,{c}ois Pinard (@email{pinard@@iro.umontreal.ca}) from the @file{parse_datetime.y} source code, -and then edited by K.@: Berry (@email{kb@@cs.umb.edu}). +and then edited by K. Berry (@email{kb@@cs.umb.edu}). diff --git a/doc/perm.texi b/doc/perm.texi index 6c466f2b..3a2f8d4e 100644 --- a/doc/perm.texi +++ b/doc/perm.texi @@ -1,6 +1,6 @@ @c File mode bits -@c Copyright (C) 1994-2012 Free Software Foundation, Inc. +@c Copyright (C) 1994-2013 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 @@ -112,7 +112,7 @@ specific to the file system. For example: @table @asis @item ext2 -On @acronym{GNU} and @acronym{GNU}/Linux the file attributes specific to +On GNU and GNU/Linux the file attributes specific to the ext2 file system are set using @command{chattr}. @item FFS @@ -345,7 +345,7 @@ the mode: +t @end example -The combination @samp{o+s} has no effect. On @acronym{GNU} systems +The combination @samp{o+s} has no effect. On GNU systems the combinations @samp{u+t} and @samp{g+t} have no effect, and @samp{o+t} acts like plain @samp{+t}. @@ -563,7 +563,7 @@ The commands @samp{chmod =755 @var{dir}} and @samp{chmod 755 setuid and setgid bits, whereas the latter preserves them. @xref{Directory Setuid and Setgid}. -Operator numeric modes are a @acronym{GNU} extension. +Operator numeric modes are a GNU extension. @node Directory Setuid and Setgid @section Directories and the Set-User-ID and Set-Group-ID Bits @@ -630,10 +630,10 @@ chmod =755 D chmod 00755 D @end example -This behavior is a @acronym{GNU} extension. Portable scripts should +This behavior is a GNU extension. Portable scripts should not rely on requests to set or clear these bits on directories, as -@acronym{POSIX} allows implementations to ignore these requests. -The @acronym{GNU} behavior with numeric modes of four or fewer digits +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 five or more digits is for scripts portable to systems that do not preserve the bits. diff --git a/doc/stamp-vti b/doc/stamp-vti index 4e82ae25..1d9a98c8 100644 --- a/doc/stamp-vti +++ b/doc/stamp-vti @@ -1,4 +1,4 @@ -@set UPDATED 10 May 2012 -@set UPDATED-MONTH May 2012 -@set EDITION 8.17 -@set VERSION 8.17 +@set UPDATED 11 February 2013 +@set UPDATED-MONTH February 2013 +@set EDITION 8.21 +@set VERSION 8.21 diff --git a/doc/version.texi b/doc/version.texi index 4e82ae25..1d9a98c8 100644 --- a/doc/version.texi +++ b/doc/version.texi @@ -1,4 +1,4 @@ -@set UPDATED 10 May 2012 -@set UPDATED-MONTH May 2012 -@set EDITION 8.17 -@set VERSION 8.17 +@set UPDATED 11 February 2013 +@set UPDATED-MONTH February 2013 +@set EDITION 8.21 +@set VERSION 8.21 diff --git a/gnulib-tests/Makefile.in b/gnulib-tests/Makefile.in index d1849e87..1e3f9e99 100644 --- a/gnulib-tests/Makefile.in +++ b/gnulib-tests/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.12a from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. - +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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. @@ -14,7 +15,7 @@ @SET_MAKE@ -# Copyright (C) 2002-2012 Free Software Foundation, Inc. +# Copyright (C) 2002-2013 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 @@ -73,9 +74,8 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/gnulib.mk $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/build-aux/depcomp \ - $(noinst_HEADERS) $(top_srcdir)/build-aux/test-driver +DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/gnulib.mk 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 \ @@ -165,21 +165,21 @@ TESTS = test-accept$(EXEEXT) test-file-has-acl.sh \ test-read-file$(EXEEXT) test-read$(EXEEXT) \ test-readlink$(EXEEXT) test-readlinkat$(EXEEXT) \ test-readtokens.sh test-realloc-gnu$(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-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-stdalign$(EXEEXT) test-stdbool$(EXEEXT) \ - test-stddef$(EXEEXT) test-stdint$(EXEEXT) test-stdio$(EXEEXT) \ - test-stdlib$(EXEEXT) test-strchrnul$(EXEEXT) \ - test-strerror$(EXEEXT) test-strerror_r$(EXEEXT) \ - test-strftime$(EXEEXT) test-striconv$(EXEEXT) \ - test-string$(EXEEXT) test-strings$(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-strerror_r$(EXEEXT) test-strftime$(EXEEXT) \ + test-striconv$(EXEEXT) test-string$(EXEEXT) \ test-strncat$(EXEEXT) test-strnlen$(EXEEXT) \ test-strsignal$(EXEEXT) test-strtod$(EXEEXT) \ test-strtoimax$(EXEEXT) test-strtoll$(EXEEXT) \ @@ -300,8 +300,8 @@ check_PROGRAMS = test-accept$(EXEEXT) test-file-has-acl$(EXEEXT) \ test-read-file$(EXEEXT) test-read$(EXEEXT) \ test-readlink$(EXEEXT) test-readlinkat$(EXEEXT) \ test-readtokens$(EXEEXT) test-realloc-gnu$(EXEEXT) \ - test-remove$(EXEEXT) test-rename$(EXEEXT) test-rmdir$(EXEEXT) \ - test-sched$(EXEEXT) test-select$(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) \ @@ -311,12 +311,12 @@ check_PROGRAMS = test-accept$(EXEEXT) test-file-has-acl$(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-stdalign$(EXEEXT) test-stdbool$(EXEEXT) \ - test-stddef$(EXEEXT) test-stdint$(EXEEXT) test-stdio$(EXEEXT) \ - test-stdlib$(EXEEXT) test-strchrnul$(EXEEXT) \ - test-strerror$(EXEEXT) test-strerror_r$(EXEEXT) \ - test-strftime$(EXEEXT) test-striconv$(EXEEXT) \ - test-string$(EXEEXT) test-strings$(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-strerror_r$(EXEEXT) test-strftime$(EXEEXT) \ + test-striconv$(EXEEXT) test-string$(EXEEXT) \ test-strncat$(EXEEXT) test-strnlen$(EXEEXT) \ test-strsignal$(EXEEXT) test-strtod$(EXEEXT) \ test-strtoimax$(EXEEXT) test-strtoll$(EXEEXT) \ @@ -383,27 +383,30 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/euidaccess.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/fd-reopen.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/freading.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/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/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 \ @@ -440,9 +443,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lchmod.m4 \ $(top_srcdir)/m4/lchown.m4 $(top_srcdir)/m4/lcmessage.m4 \ $(top_srcdir)/m4/ldexp.m4 $(top_srcdir)/m4/ldexpl.m4 \ - $(top_srcdir)/m4/lib-check.m4 $(top_srcdir)/m4/lib-ignore.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/lib-ignore.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ $(top_srcdir)/m4/libunistring-base.m4 \ $(top_srcdir)/m4/link-follow.m4 $(top_srcdir)/m4/link.m4 \ $(top_srcdir)/m4/linkat.m4 $(top_srcdir)/m4/localcharset.m4 \ @@ -473,14 +475,15 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/nanosleep.m4 $(top_srcdir)/m4/netdb_h.m4 \ $(top_srcdir)/m4/netinet_in_h.m4 \ $(top_srcdir)/m4/nl_langinfo.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/nproc.m4 \ - $(top_srcdir)/m4/off_t.m4 $(top_srcdir)/m4/open.m4 \ - $(top_srcdir)/m4/openat.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/nocrash.m4 \ + $(top_srcdir)/m4/non-recursive-gnulib-prefix-hack.m4 \ + $(top_srcdir)/m4/nproc.m4 $(top_srcdir)/m4/off_t.m4 \ + $(top_srcdir)/m4/open.m4 $(top_srcdir)/m4/openat.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/posixver.m4 $(top_srcdir)/m4/prereq.m4 \ $(top_srcdir)/m4/printf-frexp.m4 \ @@ -495,12 +498,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.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/root-dev-ino.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/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/selinux-context-h.m4 \ $(top_srcdir)/m4/selinux-selinux-h.m4 \ $(top_srcdir)/m4/servent.m4 $(top_srcdir)/m4/setenv.m4 \ @@ -522,18 +524,17 @@ 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/strcase.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/strings_h.m4 $(top_srcdir)/m4/strncat.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/strnumcmp.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/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 \ @@ -568,11 +569,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.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/xfts.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/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) @@ -583,7 +584,7 @@ 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_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 = @ @@ -593,9 +594,11 @@ am__dirstamp = $(am__leading_dot)dirstamp am_libtests_a_OBJECTS = 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 = $(noinst_PROGRAMS) +PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) $(pkglibexec_PROGRAMS) test_accept_SOURCES = test-accept.c test_accept_OBJECTS = test-accept.$(OBJEXT) am__DEPENDENCIES_2 = libtests.a ../lib/libcoreutils.a libtests.a \ @@ -1445,14 +1448,15 @@ test_readlinkat_OBJECTS = test-readlinkat.$(OBJEXT) test_readlinkat_DEPENDENCIES = $(am__DEPENDENCIES_2) test_readtokens_SOURCES = test-readtokens.c test_readtokens_OBJECTS = test-readtokens.$(OBJEXT) -test_readtokens_LDADD = $(LDADD) -test_readtokens_DEPENDENCIES = libtests.a ../lib/libcoreutils.a \ - libtests.a $(am__DEPENDENCIES_1) +test_readtokens_DEPENDENCIES = $(am__DEPENDENCIES_2) test_realloc_gnu_SOURCES = test-realloc-gnu.c test_realloc_gnu_OBJECTS = test-realloc-gnu.$(OBJEXT) test_realloc_gnu_LDADD = $(LDADD) 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_remove_SOURCES = test-remove.c test_remove_OBJECTS = test-remove.$(OBJEXT) test_remove_LDADD = $(LDADD) @@ -1563,6 +1567,9 @@ 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_statat_SOURCES = test-statat.c +test_statat_OBJECTS = test-statat.$(OBJEXT) +test_statat_DEPENDENCIES = $(am__DEPENDENCIES_2) test_stdalign_SOURCES = test-stdalign.c test_stdalign_OBJECTS = test-stdalign.$(OBJEXT) test_stdalign_LDADD = $(LDADD) @@ -1621,11 +1628,6 @@ test_string_OBJECTS = test-string.$(OBJEXT) test_string_LDADD = $(LDADD) test_string_DEPENDENCIES = libtests.a ../lib/libcoreutils.a libtests.a \ $(am__DEPENDENCIES_1) -test_strings_SOURCES = test-strings.c -test_strings_OBJECTS = test-strings.$(OBJEXT) -test_strings_LDADD = $(LDADD) -test_strings_DEPENDENCIES = libtests.a ../lib/libcoreutils.a \ - libtests.a $(am__DEPENDENCIES_1) test_strncat_SOURCES = test-strncat.c test_strncat_OBJECTS = test-strncat.$(OBJEXT) test_strncat_LDADD = $(LDADD) @@ -1901,15 +1903,15 @@ 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 " $@; 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_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; 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 \ @@ -1966,19 +1968,19 @@ SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \ 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-remove.c test-rename.c test-rmdir.c test-sameacls.c \ - test-sched.c test-select.c test-select-fd.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-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-strings.c \ - test-strncat.c test-strnlen.c test-strsignal.c test-strtod.c \ - test-strtoimax.c test-strtoll.c test-strtoull.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 \ @@ -2053,19 +2055,19 @@ DIST_SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \ 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-remove.c test-rename.c test-rmdir.c test-sameacls.c \ - test-sched.c test-select.c test-select-fd.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-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-strings.c \ - test-strncat.c test-strnlen.c test-strsignal.c test-strtod.c \ - test-strtoimax.c test-strtoll.c test-strtoull.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 \ @@ -2096,36 +2098,6 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac -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 distdir -ETAGS = etags -CTAGS = ctags -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; \ -} am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -2153,160 +2125,116 @@ am__uninstall_files_from_dir = { \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -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"); \ +man1dir = $(mandir)/man1 +NROFF = nroff +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 +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=''; \ +} +# 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; \ }' -# 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. 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). +# 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. am__check_pre = \ $(am__sh_e_setup); \ $(am__vpath_adj_setup) $(am__vpath_adj) \ -$(am__tty_colors); \ srcdir=$(srcdir); export srcdir; \ -case "$@" in \ - */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ - *) am__odir=.;; \ -esac; \ -test "x$$am__odir" = x"." || test -d "$$am__odir" \ - || $(MKDIR_P) "$$am__odir" || exit $$?; \ +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 $$?; \ if test -f "./$$f"; then dir=./; \ elif test -f "$$f"; then dir=; \ else dir="$(srcdir)/"; fi; \ -tst=$$dir$$f; log='$@'; \ -if test -n '$(DISABLE_HARD_ERRORS)'; then \ - am__enable_hard_errors=no; \ -else \ - am__enable_hard_errors=yes; \ -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; \ case " $(XFAIL_TESTS) " in \ *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ - 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.test' and 'test-trs-basic.test'. -am__set_TESTS_bases = \ - bases='$(TEST_LOGS)'; \ - bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ - bases=`echo $$bases` + 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 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 = \ @@ -2356,7 +2284,6 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CONFIG_INCLUDE = @CONFIG_INCLUDE@ -CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -2445,7 +2372,6 @@ GNULIB_FDATASYNC = @GNULIB_FDATASYNC@ GNULIB_FDOPEN = @GNULIB_FDOPEN@ GNULIB_FDOPENDIR = @GNULIB_FDOPENDIR@ GNULIB_FFLUSH = @GNULIB_FFLUSH@ -GNULIB_FFS = @GNULIB_FFS@ GNULIB_FFSL = @GNULIB_FFSL@ GNULIB_FFSLL = @GNULIB_FFSLL@ GNULIB_FGETC = @GNULIB_FGETC@ @@ -2877,7 +2803,6 @@ HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@ HAVE_DECL_SQRTL = @HAVE_DECL_SQRTL@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@ -HAVE_DECL_STRNCASECMP = @HAVE_DECL_STRNCASECMP@ HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@ HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ @@ -2914,7 +2839,6 @@ HAVE_FCNTL = @HAVE_FCNTL@ HAVE_FDATASYNC = @HAVE_FDATASYNC@ HAVE_FDOPENDIR = @HAVE_FDOPENDIR@ HAVE_FEATURES_H = @HAVE_FEATURES_H@ -HAVE_FFS = @HAVE_FFS@ HAVE_FFSL = @HAVE_FFSL@ HAVE_FFSLL = @HAVE_FFSLL@ HAVE_FMA = @HAVE_FMA@ @@ -3059,10 +2983,8 @@ HAVE_SQRTL = @HAVE_SQRTL@ HAVE_STDINT_H = @HAVE_STDINT_H@ HAVE_STPCPY = @HAVE_STPCPY@ HAVE_STPNCPY = @HAVE_STPNCPY@ -HAVE_STRCASECMP = @HAVE_STRCASECMP@ HAVE_STRCASESTR = @HAVE_STRCASESTR@ HAVE_STRCHRNUL = @HAVE_STRCHRNUL@ -HAVE_STRINGS_H = @HAVE_STRINGS_H@ HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRPTIME = @HAVE_STRPTIME@ HAVE_STRSEP = @HAVE_STRSEP@ @@ -3163,7 +3085,6 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTALL_SU = @INSTALL_SU@ INT32_MAX_LT_INTMAX_MAX = @INT32_MAX_LT_INTMAX_MAX@ INT64_MAX_EQ_LONG_MAX = @INT64_MAX_EQ_LONG_MAX@ INTLLIBS = @INTLLIBS@ @@ -3187,7 +3108,6 @@ LIBUNISTRING_UNIWIDTH_H = @LIBUNISTRING_UNIWIDTH_H@ LIB_ACL = @LIB_ACL@ LIB_CAP = @LIB_CAP@ LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ -LIB_CRYPT = @LIB_CRYPT@ LIB_EACCESS = @LIB_EACCESS@ LIB_FDATASYNC = @LIB_FDATASYNC@ LIB_GETHRXTIME = @LIB_GETHRXTIME@ @@ -3243,7 +3163,6 @@ NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@ NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@ NEXT_AS_FIRST_DIRECTIVE_STDIO_H = @NEXT_AS_FIRST_DIRECTIVE_STDIO_H@ NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@ -NEXT_AS_FIRST_DIRECTIVE_STRINGS_H = @NEXT_AS_FIRST_DIRECTIVE_STRINGS_H@ NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_IOCTL_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_IOCTL_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_RESOURCE_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_RESOURCE_H@ @@ -3283,7 +3202,6 @@ NEXT_STDDEF_H = @NEXT_STDDEF_H@ NEXT_STDINT_H = @NEXT_STDINT_H@ NEXT_STDIO_H = @NEXT_STDIO_H@ NEXT_STDLIB_H = @NEXT_STDLIB_H@ -NEXT_STRINGS_H = @NEXT_STRINGS_H@ NEXT_STRING_H = @NEXT_STRING_H@ NEXT_SYS_IOCTL_H = @NEXT_SYS_IOCTL_H@ NEXT_SYS_RESOURCE_H = @NEXT_SYS_RESOURCE_H@ @@ -3300,10 +3218,7 @@ NEXT_TIME_H = @NEXT_TIME_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ NEXT_WCHAR_H = @NEXT_WCHAR_H@ NEXT_WCTYPE_H = @NEXT_WCTYPE_H@ -NO_INSTALL_PROGS_DEFAULT = @NO_INSTALL_PROGS_DEFAULT@ OBJEXT = @OBJEXT@ -OPTIONAL_BIN_PROGS = @OPTIONAL_BIN_PROGS@ -OPTIONAL_PKGLIB_PROGS = @OPTIONAL_PKGLIB_PROGS@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -3462,6 +3377,7 @@ REPLACE_PREAD = @REPLACE_PREAD@ REPLACE_PRINTF = @REPLACE_PRINTF@ REPLACE_PSELECT = @REPLACE_PSELECT@ REPLACE_PTHREAD_SIGMASK = @REPLACE_PTHREAD_SIGMASK@ +REPLACE_PTSNAME = @REPLACE_PTSNAME@ REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@ REPLACE_PUTENV = @REPLACE_PUTENV@ REPLACE_PWRITE = @REPLACE_PWRITE@ @@ -3592,6 +3508,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ builddir = @builddir@ +built_programs = @built_programs@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -3725,7 +3642,8 @@ EXTRA_DIST = accept.c w32sock.h test-accept.c signature.h macros.h \ test-gethostname.c test-getline.c signature.h macros.h \ test-getloadavg.c signature.h test-getlogin.c signature.h \ macros.h test-getndelim2.c macros.h macros.h signature.h \ - test-getopt.c test-getopt.h test-getopt_long.h signature.h \ + test-getopt.c test-getopt.h test-getopt_long.h \ + $(top_srcdir)/build-aux/config.rpath signature.h \ test-gettimeofday.c test-hash.c macros.h test-i-ring.c \ macros.h test-iconv-h.c test-iconv.c signature.h macros.h \ test-ignore-value.c test-inet_ntop.c signature.h macros.h \ @@ -3785,18 +3703,19 @@ EXTRA_DIST = accept.c w32sock.h test-accept.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 \ macros.h test-readtokens.c test-readtokens.sh \ - test-realloc-gnu.c test-remove.c signature.h macros.h \ - test-rename.h test-rename.c signature.h macros.h test-rmdir.h \ - test-rmdir.c signature.h macros.h test-sched.c macros.h \ - signature.h test-select.c test-select.h test-select-fd.c \ - test-select-in.sh test-select-out.sh test-select-stdin.c \ - test-setenv.c signature.h macros.h setlocale.c \ - test-setlocale1.sh test-setlocale1.c test-setlocale2.sh \ - test-setlocale2.c signature.h macros.h setsockopt.c w32sock.h \ - test-setsockopt.c signature.h macros.h test-sigaction.c \ - signature.h macros.h test-signal-h.c test-signbit.c \ - minus-zero.h infinity.h macros.h test-sigprocmask.c \ - signature.h macros.h sleep.c test-sleep.c signature.h macros.h \ + test-realloc-gnu.c test-regex.c macros.h test-remove.c \ + signature.h macros.h test-rename.h test-rename.c signature.h \ + macros.h test-rmdir.h test-rmdir.c signature.h macros.h \ + test-sched.c macros.h signature.h test-select.c test-select.h \ + test-select-fd.c test-select-in.sh test-select-out.sh \ + test-select-stdin.c test-setenv.c signature.h macros.h \ + setlocale.c test-setlocale1.sh test-setlocale1.c \ + test-setlocale2.sh test-setlocale2.c signature.h macros.h \ + setsockopt.c w32sock.h test-setsockopt.c signature.h macros.h \ + test-sigaction.c signature.h macros.h test-signal-h.c \ + test-signbit.c minus-zero.h infinity.h macros.h \ + test-sigprocmask.c signature.h macros.h sleep.c test-sleep.c \ + signature.h macros.h \ $(top_srcdir)/build-aux/snippet/_Noreturn.h \ $(top_srcdir)/build-aux/snippet/arg-nonnull.h \ $(top_srcdir)/build-aux/snippet/c++defs.h \ @@ -3806,12 +3725,12 @@ EXTRA_DIST = accept.c w32sock.h test-accept.c signature.h macros.h \ 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-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-strings.c test-strncat.c \ + 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 \ @@ -3889,12 +3808,18 @@ 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 @@ -3932,7 +3857,7 @@ 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) +test_futimens_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) @LIBINTL@ test_getaddrinfo_LDADD = $(LDADD) @GETADDRINFO_LIB@ @LIBINTL@ test_getcwd_lgpl_LDADD = $(LDADD) $(LIBINTL) test_getcwd_LDADD = $(LDADD) @LIBINTL@ @@ -3954,6 +3879,8 @@ 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_rename_LDADD = $(LDADD) @LIBINTL@ test_select_LDADD = $(LDADD) @LIB_SELECT@ @LIBSOCKET@ $(INET_PTON_LIB) test_select_fd_LDADD = $(LDADD) @LIB_SELECT@ @@ -3975,6 +3902,7 @@ test_spawn_pipe_main_LDADD = $(LDADD) @LIBINTL@ # Therefore don't link it against any libraries other than -lc. test_spawn_pipe_child_LDADD = test_stat_LDADD = $(LDADD) $(LIBINTL) +test_statat_LDADD = $(LDADD) @LIBINTL@ test_striconv_LDADD = $(LDADD) @LIBICONV@ test_strsignal_LDADD = $(LDADD) @LIBINTL@ $(LIBTHREAD) test_symlinkat_LDADD = $(LDADD) @LIBINTL@ @@ -3992,7 +3920,7 @@ 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) +test_utimens_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) @LIBINTL@ test_utimensat_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) @LIBINTL@ test_version_etc_LDADD = $(LDADD) @LIBINTL@ test_xalloc_die_LDADD = $(LDADD) @LIBINTL@ @@ -4029,7 +3957,7 @@ all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: -.SUFFIXES: .c .log .o .obj .test .test$(EXEEXT) .trs +.SUFFIXES: .c .html .log .o .obj .test .test$(EXEEXT) $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/gnulib.mk $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -4079,12 +4007,92 @@ libtests.a: $(libtests_a_OBJECTS) $(libtests_a_DEPENDENCIES) $(EXTRA_libtests_a_ $(AM_V_at)-rm -f libtests.a $(AM_V_AR)$(libtests_a_AR) libtests.a $(libtests_a_OBJECTS) $(libtests_a_LIBADD) $(AM_V_at)$(RANLIB) libtests.a +install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + 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; \ + done | \ + 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 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) + @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)/' `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(bindir)" && rm -f $$files + +clean-binPROGRAMS: + -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) clean-checkPROGRAMS: -test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS) clean-noinstPROGRAMS: -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) +install-pkglibexecPROGRAMS: $(pkglibexec_PROGRAMS) + @$(NORMAL_INSTALL) + @list='$(pkglibexec_PROGRAMS)'; test -n "$(pkglibexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkglibexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkglibexecdir)" || exit 1; \ + 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; \ + done | \ + 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 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(pkglibexecdir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(pkglibexecdir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-pkglibexecPROGRAMS: + @$(NORMAL_UNINSTALL) + @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)/' `; \ + 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) @@ -4637,6 +4645,9 @@ test-readtokens$(EXEEXT): $(test_readtokens_OBJECTS) $(test_readtokens_DEPENDENC 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) @@ -4715,6 +4726,9 @@ test-stat$(EXEEXT): $(test_stat_OBJECTS) $(test_stat_DEPENDENCIES) $(EXTRA_test_ 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) @@ -4751,9 +4765,6 @@ test-striconv$(EXEEXT): $(test_striconv_OBJECTS) $(test_striconv_DEPENDENCIES) $ 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-strings$(EXEEXT): $(test_strings_OBJECTS) $(test_strings_DEPENDENCIES) $(EXTRA_test_strings_DEPENDENCIES) - @rm -f test-strings$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_strings_OBJECTS) $(test_strings_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) @@ -5170,6 +5181,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-readlinkat.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-readtokens.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-realloc-gnu.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-regex.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-remove.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-rename.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-rmdir.Po@am__quote@ @@ -5196,6 +5208,7 @@ distclean-compile: @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@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-stdalign.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-stdbool.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-stddef.Po@am__quote@ @@ -5208,7 +5221,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-strftime.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-striconv.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-string.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-strings.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-strncat.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-strnlen.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-strsignal.Po@am__quote@ @@ -5334,13 +5346,54 @@ test_xvasprintf-test-xvasprintf.obj: test-xvasprintf.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test-xvasprintf.c' object='test_xvasprintf-test-xvasprintf.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) $(test_xvasprintf_CFLAGS) $(CFLAGS) -c -o test_xvasprintf-test-xvasprintf.obj `if test -f 'test-xvasprintf.c'; then $(CYGPATH_W) 'test-xvasprintf.c'; else $(CYGPATH_W) '$(srcdir)/test-xvasprintf.c'; fi` +install-man1: $(man1_MANS) + @$(NORMAL_INSTALL) + @list1='$(man1_MANS)'; \ + list2=''; \ + test -n "$(man1dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.1[a-z]*$$/p'; \ + fi; \ + } | while read p; do \ + if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; echo "$$p"; \ + done | \ + sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ + -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \ + sed 'N;N;s,\n, ,g' | { \ + list=; while read file base inst; do \ + if test "$$base" = "$$inst"; then list="$$list $$file"; else \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \ + fi; \ + done; \ + for i in $$list; do echo "$$i"; done | $(am__base_list) | \ + while read files; do \ + test -z "$$files" || { \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \ + done; } + +uninstall-man1: + @$(NORMAL_UNINSTALL) + @list='$(man1_MANS)'; test -n "$(man1dir)" || exit 0; \ + files=`{ for i in $$list; do echo "$$i"; done; \ + } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ + -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ + 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. +# 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 \ @@ -5404,10 +5457,6 @@ ctags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -5471,2389 +5520,788 @@ GTAGS: && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ - 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) $< - $(TEST_SUITE_LOG): $(TEST_LOGS) - @$(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"; \ - }; \ + @$(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; \ { \ echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ $(am__rst_title); \ - create_testsuite_report --no-color; \ + echo "$$msg"; \ echo; \ echo ".. contents:: :depth: 2"; \ echo; \ - for b in $$bases; do echo $$b; done \ - | $(am__create_global_log); \ - } >$(TEST_SUITE_LOG).tmp || exit 1; \ + 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; \ mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ - if $$success; then \ + 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 \ col="$$grn"; \ else \ col="$$red"; \ - test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ - fi; \ - 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; \ - echo "$$col$$br$$std"; \ fi; \ - $$success || exit 1 + 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 - @if test $@ != recheck; then \ - list='$(RECHECK_LOGS:.log=.trs)'; \ - test -z "$$list" || rm -f $$list; \ + list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list; \ fi @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) - @$(am__set_TESTS_bases); \ - if test $@ = recheck; then \ - bases=`for i in $$bases; do echo $$i; done \ - | $(am__list_recheck_tests)` || exit 1; \ - fi; \ - 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`; \ - if test $@ != recheck || $(am__make_dryrun); then :; else \ - test -z "$$log_list" || rm -f $$log_list; \ - test -z "$$trs_list" || rm -f $$trs_list; \ + @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="$$log_list" -recheck: all $(check_LIBRARIES) $(check_PROGRAMS) + $(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; \ + fi; \ + done; \ + if test -z "$$R2H"; then \ + echo >&2 "cannot find rst2html, cannot create $@"; \ + exit 2; \ + 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 test-accept.log: test-accept$(EXEEXT) - @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) + @p='test-accept$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-file-has-acl.sh.log: test-file-has-acl.sh - @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) + @p='test-file-has-acl.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-file-has-acl-1.sh.log: test-file-has-acl-1.sh - @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) + @p='test-file-has-acl-1.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-file-has-acl-2.sh.log: test-file-has-acl-2.sh - @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) + @p='test-file-has-acl-2.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-set-mode-acl.sh.log: test-set-mode-acl.sh - @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) + @p='test-set-mode-acl.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-set-mode-acl-1.sh.log: test-set-mode-acl-1.sh - @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) + @p='test-set-mode-acl-1.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-set-mode-acl-2.sh.log: test-set-mode-acl-2.sh - @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) + @p='test-set-mode-acl-2.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-copy-acl.sh.log: test-copy-acl.sh - @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) + @p='test-copy-acl.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-copy-acl-1.sh.log: test-copy-acl-1.sh - @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) + @p='test-copy-acl-1.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-copy-acl-2.sh.log: test-copy-acl-2.sh - @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) + @p='test-copy-acl-2.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-alignof.log: test-alignof$(EXEEXT) - @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) + @p='test-alignof$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-alloca-opt.log: test-alloca-opt$(EXEEXT) - @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) + @p='test-alloca-opt$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-areadlink.log: test-areadlink$(EXEEXT) - @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) + @p='test-areadlink$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-areadlink-with-size.log: test-areadlink-with-size$(EXEEXT) - @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) + @p='test-areadlink-with-size$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-areadlinkat.log: test-areadlinkat$(EXEEXT) - @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) + @p='test-areadlinkat$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-argmatch.log: test-argmatch$(EXEEXT) - @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) + @p='test-argmatch$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-argv-iter.log: test-argv-iter$(EXEEXT) - @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) + @p='test-argv-iter$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-arpa_inet.log: test-arpa_inet$(EXEEXT) - @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) + @p='test-arpa_inet$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-base64.log: test-base64$(EXEEXT) - @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) + @p='test-base64$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-binary-io.sh.log: test-binary-io.sh - @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) + @p='test-binary-io.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-bind.log: test-bind$(EXEEXT) - @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) + @p='test-bind$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-bitrotate.log: test-bitrotate$(EXEEXT) - @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) + @p='test-bitrotate$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-btowc1.sh.log: test-btowc1.sh - @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) + @p='test-btowc1.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-btowc2.sh.log: test-btowc2.sh - @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) + @p='test-btowc2.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-c-ctype.log: test-c-ctype$(EXEEXT) - @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) + @p='test-c-ctype$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-c-strcase.sh.log: test-c-strcase.sh - @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) + @p='test-c-strcase.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-calloc-gnu.log: test-calloc-gnu$(EXEEXT) - @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) + @p='test-calloc-gnu$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-canonicalize.log: test-canonicalize$(EXEEXT) - @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) + @p='test-canonicalize$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-chdir.log: test-chdir$(EXEEXT) - @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) + @p='test-chdir$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-chown.log: test-chown$(EXEEXT) - @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) + @p='test-chown$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-cloexec.log: test-cloexec$(EXEEXT) - @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) + @p='test-cloexec$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-close.log: test-close$(EXEEXT) - @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) + @p='test-close$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-closein.sh.log: test-closein.sh - @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) + @p='test-closein.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-connect.log: test-connect$(EXEEXT) - @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) + @p='test-connect$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-md5.log: test-md5$(EXEEXT) - @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) + @p='test-md5$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-sha1.log: test-sha1$(EXEEXT) - @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) + @p='test-sha1$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-ctype.log: test-ctype$(EXEEXT) - @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) + @p='test-ctype$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-di-set.log: test-di-set$(EXEEXT) - @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) + @p='test-di-set$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-dirent-safer.log: test-dirent-safer$(EXEEXT) - @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) + @p='test-dirent-safer$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-dirent.log: test-dirent$(EXEEXT) - @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) + @p='test-dirent$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-dirname.log: test-dirname$(EXEEXT) - @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) + @p='test-dirname$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-dup.log: test-dup$(EXEEXT) - @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) + @p='test-dup$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-dup2.log: test-dup2$(EXEEXT) - @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) + @p='test-dup2$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-environ.log: test-environ$(EXEEXT) - @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) + @p='test-environ$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-errno.log: test-errno$(EXEEXT) - @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) + @p='test-errno$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-exclude1.sh.log: test-exclude1.sh - @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) + @p='test-exclude1.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-exclude2.sh.log: test-exclude2.sh - @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) + @p='test-exclude2.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-exclude3.sh.log: test-exclude3.sh - @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) + @p='test-exclude3.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-exclude4.sh.log: test-exclude4.sh - @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) + @p='test-exclude4.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-exclude5.sh.log: test-exclude5.sh - @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) + @p='test-exclude5.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-exclude6.sh.log: test-exclude6.sh - @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) + @p='test-exclude6.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-exclude7.sh.log: test-exclude7.sh - @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) + @p='test-exclude7.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-exclude8.sh.log: test-exclude8.sh - @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) + @p='test-exclude8.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-faccessat.log: test-faccessat$(EXEEXT) - @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) + @p='test-faccessat$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-fadvise.log: test-fadvise$(EXEEXT) - @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) + @p='test-fadvise$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-fchdir.log: test-fchdir$(EXEEXT) - @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) + @p='test-fchdir$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-fchmodat.log: test-fchmodat$(EXEEXT) - @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) + @p='test-fchmodat$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-fchownat.log: test-fchownat$(EXEEXT) - @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) + @p='test-fchownat$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-fclose.log: test-fclose$(EXEEXT) - @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) + @p='test-fclose$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-fcntl-h.log: test-fcntl-h$(EXEEXT) - @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) + @p='test-fcntl-h$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-fcntl-safer.log: test-fcntl-safer$(EXEEXT) - @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) + @p='test-fcntl-safer$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-fcntl.log: test-fcntl$(EXEEXT) - @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) + @p='test-fcntl$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-fdatasync.log: test-fdatasync$(EXEEXT) - @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) + @p='test-fdatasync$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-fdopen.log: test-fdopen$(EXEEXT) - @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) + @p='test-fdopen$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-fdopendir.log: test-fdopendir$(EXEEXT) - @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) + @p='test-fdopendir$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-fdutimensat.log: test-fdutimensat$(EXEEXT) - @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) + @p='test-fdutimensat$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-fflush.log: test-fflush$(EXEEXT) - @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) + @p='test-fflush$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-fflush2.sh.log: test-fflush2.sh - @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) + @p='test-fflush2.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-fgetc.log: test-fgetc$(EXEEXT) - @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) + @p='test-fgetc$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-filenamecat.log: test-filenamecat$(EXEEXT) - @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) + @p='test-filenamecat$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-filevercmp.log: test-filevercmp$(EXEEXT) - @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) + @p='test-filevercmp$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-float.log: test-float$(EXEEXT) - @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) + @p='test-float$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-fnmatch.log: test-fnmatch$(EXEEXT) - @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) + @p='test-fnmatch$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-fopen-safer.log: test-fopen-safer$(EXEEXT) - @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) + @p='test-fopen-safer$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-fopen.log: test-fopen$(EXEEXT) - @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) + @p='test-fopen$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-fpending.sh.log: test-fpending.sh - @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) + @p='test-fpending.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-fpurge.log: test-fpurge$(EXEEXT) - @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) + @p='test-fpurge$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-fputc.log: test-fputc$(EXEEXT) - @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) + @p='test-fputc$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-fread.log: test-fread$(EXEEXT) - @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) + @p='test-fread$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-freadahead.sh.log: test-freadahead.sh - @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) + @p='test-freadahead.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-freading.log: test-freading$(EXEEXT) - @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) + @p='test-freading$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-freadptr.sh.log: test-freadptr.sh - @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) + @p='test-freadptr.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-freadptr2.sh.log: test-freadptr2.sh - @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) + @p='test-freadptr2.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-freadseek.sh.log: test-freadseek.sh - @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) + @p='test-freadseek.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-freopen-safer.log: test-freopen-safer$(EXEEXT) - @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) + @p='test-freopen-safer$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-freopen.log: test-freopen$(EXEEXT) - @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) + @p='test-freopen$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-frexp-nolibm.log: test-frexp-nolibm$(EXEEXT) - @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) + @p='test-frexp-nolibm$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-frexpl-nolibm.log: test-frexpl-nolibm$(EXEEXT) - @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) + @p='test-frexpl-nolibm$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-fseek.sh.log: test-fseek.sh - @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) + @p='test-fseek.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-fseek2.sh.log: test-fseek2.sh - @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) + @p='test-fseek2.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-fseeko.sh.log: test-fseeko.sh - @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) + @p='test-fseeko.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-fseeko2.sh.log: test-fseeko2.sh - @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) + @p='test-fseeko2.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-fseeko3.sh.log: test-fseeko3.sh - @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) + @p='test-fseeko3.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-fseeko4.sh.log: test-fseeko4.sh - @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) + @p='test-fseeko4.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-fseterr.log: test-fseterr$(EXEEXT) - @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) + @p='test-fseterr$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-fstat.log: test-fstat$(EXEEXT) - @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) + @p='test-fstat$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-fstatat.log: test-fstatat$(EXEEXT) - @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) + @p='test-fstatat$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-fsync.log: test-fsync$(EXEEXT) - @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) + @p='test-fsync$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-ftell.sh.log: test-ftell.sh - @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) + @p='test-ftell.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-ftell2.sh.log: test-ftell2.sh - @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) + @p='test-ftell2.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-ftell3.log: test-ftell3$(EXEEXT) - @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) + @p='test-ftell3$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-ftello.sh.log: test-ftello.sh - @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) + @p='test-ftello.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-ftello2.sh.log: test-ftello2.sh - @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) + @p='test-ftello2.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-ftello3.log: test-ftello3$(EXEEXT) - @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) + @p='test-ftello3$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-ftello4.sh.log: test-ftello4.sh - @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) + @p='test-ftello4.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-ftruncate.sh.log: test-ftruncate.sh - @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) + @p='test-ftruncate.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-futimens.log: test-futimens$(EXEEXT) - @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) + @p='test-futimens$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-fwrite.log: test-fwrite$(EXEEXT) - @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) + @p='test-fwrite$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-getaddrinfo.log: test-getaddrinfo$(EXEEXT) - @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) + @p='test-getaddrinfo$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-getcwd-lgpl.log: test-getcwd-lgpl$(EXEEXT) - @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) + @p='test-getcwd-lgpl$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-getcwd.sh.log: test-getcwd.sh - @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) + @p='test-getcwd.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-getdelim.log: test-getdelim$(EXEEXT) - @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) + @p='test-getdelim$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-getdtablesize.log: test-getdtablesize$(EXEEXT) - @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) + @p='test-getdtablesize$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-getgroups.log: test-getgroups$(EXEEXT) - @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) + @p='test-getgroups$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-gethostname.log: test-gethostname$(EXEEXT) - @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) + @p='test-gethostname$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-getline.log: test-getline$(EXEEXT) - @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) + @p='test-getline$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-getloadavg.log: test-getloadavg$(EXEEXT) - @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) + @p='test-getloadavg$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-getlogin.log: test-getlogin$(EXEEXT) - @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) + @p='test-getlogin$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-getndelim2.log: test-getndelim2$(EXEEXT) - @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) + @p='test-getndelim2$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-getopt.log: test-getopt$(EXEEXT) - @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) + @p='test-getopt$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-gettimeofday.log: test-gettimeofday$(EXEEXT) - @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) + @p='test-gettimeofday$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-hash.log: test-hash$(EXEEXT) - @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) + @p='test-hash$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-i-ring.log: test-i-ring$(EXEEXT) - @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) + @p='test-i-ring$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-iconv-h.log: test-iconv-h$(EXEEXT) - @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) + @p='test-iconv-h$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-iconv.log: test-iconv$(EXEEXT) - @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) + @p='test-iconv$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-ignore-value.log: test-ignore-value$(EXEEXT) - @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) + @p='test-ignore-value$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-inet_ntop.log: test-inet_ntop$(EXEEXT) - @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) + @p='test-inet_ntop$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-inet_pton.log: test-inet_pton$(EXEEXT) - @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) + @p='test-inet_pton$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-ino-map.log: test-ino-map$(EXEEXT) - @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) + @p='test-ino-map$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-intprops.log: test-intprops$(EXEEXT) - @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) + @p='test-intprops$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-inttostr.log: test-inttostr$(EXEEXT) - @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) + @p='test-inttostr$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-inttypes.log: test-inttypes$(EXEEXT) - @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) + @p='test-inttypes$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-ioctl.log: test-ioctl$(EXEEXT) - @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) + @p='test-ioctl$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-isatty.log: test-isatty$(EXEEXT) - @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) + @p='test-isatty$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-isblank.log: test-isblank$(EXEEXT) - @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) + @p='test-isblank$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-isnand-nolibm.log: test-isnand-nolibm$(EXEEXT) - @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) + @p='test-isnand-nolibm$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-isnanf-nolibm.log: test-isnanf-nolibm$(EXEEXT) - @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) + @p='test-isnanf-nolibm$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-isnanl-nolibm.log: test-isnanl-nolibm$(EXEEXT) - @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) + @p='test-isnanl-nolibm$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-iswblank.log: test-iswblank$(EXEEXT) - @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) + @p='test-iswblank$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-langinfo.log: test-langinfo$(EXEEXT) - @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) + @p='test-langinfo$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-lchown.log: test-lchown$(EXEEXT) - @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) + @p='test-lchown$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-link.log: test-link$(EXEEXT) - @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) + @p='test-link$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-linkat.log: test-linkat$(EXEEXT) - @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) + @p='test-linkat$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-listen.log: test-listen$(EXEEXT) - @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) + @p='test-listen$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-locale.log: test-locale$(EXEEXT) - @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) + @p='test-locale$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-localeconv.log: test-localeconv$(EXEEXT) - @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) + @p='test-localeconv$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-localename.log: test-localename$(EXEEXT) - @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) + @p='test-localename$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-lock.log: test-lock$(EXEEXT) - @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) + @p='test-lock$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-lseek.sh.log: test-lseek.sh - @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) + @p='test-lseek.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-lstat.log: test-lstat$(EXEEXT) - @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) + @p='test-lstat$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-malloc-gnu.log: test-malloc-gnu$(EXEEXT) - @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) + @p='test-malloc-gnu$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-malloca.log: test-malloca$(EXEEXT) - @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) + @p='test-malloca$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-math.log: test-math$(EXEEXT) - @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) + @p='test-math$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-mbrtowc1.sh.log: test-mbrtowc1.sh - @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) + @p='test-mbrtowc1.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-mbrtowc2.sh.log: test-mbrtowc2.sh - @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) + @p='test-mbrtowc2.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-mbrtowc3.sh.log: test-mbrtowc3.sh - @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) + @p='test-mbrtowc3.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-mbrtowc4.sh.log: test-mbrtowc4.sh - @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) + @p='test-mbrtowc4.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-mbrtowc-w32-1.sh.log: test-mbrtowc-w32-1.sh - @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) + @p='test-mbrtowc-w32-1.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-mbrtowc-w32-2.sh.log: test-mbrtowc-w32-2.sh - @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) + @p='test-mbrtowc-w32-2.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-mbrtowc-w32-3.sh.log: test-mbrtowc-w32-3.sh - @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) + @p='test-mbrtowc-w32-3.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-mbrtowc-w32-4.sh.log: test-mbrtowc-w32-4.sh - @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) + @p='test-mbrtowc-w32-4.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-mbrtowc-w32-5.sh.log: test-mbrtowc-w32-5.sh - @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) + @p='test-mbrtowc-w32-5.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-mbsalign.log: test-mbsalign$(EXEEXT) - @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) + @p='test-mbsalign$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-mbscasecmp.sh.log: test-mbscasecmp.sh - @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) + @p='test-mbscasecmp.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-mbsinit.sh.log: test-mbsinit.sh - @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) + @p='test-mbsinit.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-mbsrtowcs1.sh.log: test-mbsrtowcs1.sh - @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) + @p='test-mbsrtowcs1.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-mbsrtowcs2.sh.log: test-mbsrtowcs2.sh - @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) + @p='test-mbsrtowcs2.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-mbsrtowcs3.sh.log: test-mbsrtowcs3.sh - @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) + @p='test-mbsrtowcs3.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-mbsrtowcs4.sh.log: test-mbsrtowcs4.sh - @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) + @p='test-mbsrtowcs4.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-mbsstr1.log: test-mbsstr1$(EXEEXT) - @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) + @p='test-mbsstr1$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-mbsstr2.sh.log: test-mbsstr2.sh - @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) + @p='test-mbsstr2.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-mbsstr3.sh.log: test-mbsstr3.sh - @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) + @p='test-mbsstr3.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-memcasecmp.log: test-memcasecmp$(EXEEXT) - @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) + @p='test-memcasecmp$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-memchr.log: test-memchr$(EXEEXT) - @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) + @p='test-memchr$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-memchr2.log: test-memchr2$(EXEEXT) - @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) + @p='test-memchr2$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-memcoll.log: test-memcoll$(EXEEXT) - @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) + @p='test-memcoll$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-memrchr.log: test-memrchr$(EXEEXT) - @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) + @p='test-memrchr$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-mkdir.log: test-mkdir$(EXEEXT) - @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) + @p='test-mkdir$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-mkfifo.log: test-mkfifo$(EXEEXT) - @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) + @p='test-mkfifo$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-mknod.log: test-mknod$(EXEEXT) - @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) + @p='test-mknod$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-nanosleep.log: test-nanosleep$(EXEEXT) - @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) + @p='test-nanosleep$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-netdb.log: test-netdb$(EXEEXT) - @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) + @p='test-netdb$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-netinet_in.log: test-netinet_in$(EXEEXT) - @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) + @p='test-netinet_in$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-nl_langinfo.sh.log: test-nl_langinfo.sh - @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) + @p='test-nl_langinfo.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-open.log: test-open$(EXEEXT) - @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) + @p='test-open$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-openat-safer.log: test-openat-safer$(EXEEXT) - @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) + @p='test-openat-safer$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-openat.log: test-openat$(EXEEXT) - @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) + @p='test-openat$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-parse-datetime.log: test-parse-datetime$(EXEEXT) - @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) + @p='test-parse-datetime$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-pathmax.log: test-pathmax$(EXEEXT) - @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) + @p='test-pathmax$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-perror.sh.log: test-perror.sh - @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) + @p='test-perror.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-perror2.log: test-perror2$(EXEEXT) - @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) + @p='test-perror2$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-pipe.log: test-pipe$(EXEEXT) - @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) + @p='test-pipe$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-pipe2.log: test-pipe2$(EXEEXT) - @p='test-pipe2$(EXEEXT)'; \ - b='test-pipe2'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) + @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)'; \ - b='test-posix_spawn_file_actions_addclose'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) + @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)'; \ - b='test-posix_spawn_file_actions_adddup2'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) + @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)'; \ - b='test-posix_spawn_file_actions_addopen'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) + @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)'; \ - b='test-posix_spawn1'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) + @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)'; \ - b='test-posix_spawn2'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) + @p='test-posix_spawn2$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-posixtm.log: test-posixtm$(EXEEXT) - @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) + @p='test-posixtm$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-printf-frexp.log: test-printf-frexp$(EXEEXT) - @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) + @p='test-printf-frexp$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-printf-frexpl.log: test-printf-frexpl$(EXEEXT) - @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) + @p='test-printf-frexpl$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-priv-set.log: test-priv-set$(EXEEXT) - @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) + @p='test-priv-set$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-quotearg-simple.log: test-quotearg-simple$(EXEEXT) - @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) + @p='test-quotearg-simple$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-raise.log: test-raise$(EXEEXT) - @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) + @p='test-raise$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-rand-isaac.log: test-rand-isaac$(EXEEXT) - @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) + @p='test-rand-isaac$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-rawmemchr.log: test-rawmemchr$(EXEEXT) - @p='test-rawmemchr$(EXEEXT)'; \ - b='test-rawmemchr'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) + @p='test-rawmemchr$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-read-file.log: test-read-file$(EXEEXT) - @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) + @p='test-read-file$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-read.log: test-read$(EXEEXT) - @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) + @p='test-read$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-readlink.log: test-readlink$(EXEEXT) - @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) + @p='test-readlink$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-readlinkat.log: test-readlinkat$(EXEEXT) - @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) + @p='test-readlinkat$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-readtokens.sh.log: test-readtokens.sh - @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) + @p='test-readtokens.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-realloc-gnu.log: test-realloc-gnu$(EXEEXT) - @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) + @p='test-realloc-gnu$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +test-regex.log: test-regex$(EXEEXT) + @p='test-regex$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-remove.log: test-remove$(EXEEXT) - @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) + @p='test-remove$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-rename.log: test-rename$(EXEEXT) - @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) + @p='test-rename$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-rmdir.log: test-rmdir$(EXEEXT) - @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) + @p='test-rmdir$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-sched.log: test-sched$(EXEEXT) - @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) + @p='test-sched$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-select.log: test-select$(EXEEXT) - @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) + @p='test-select$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-select-in.sh.log: test-select-in.sh - @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) + @p='test-select-in.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-select-out.sh.log: test-select-out.sh - @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) + @p='test-select-out.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-setenv.log: test-setenv$(EXEEXT) - @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) + @p='test-setenv$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-setlocale1.sh.log: test-setlocale1.sh - @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) + @p='test-setlocale1.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-setlocale2.sh.log: test-setlocale2.sh - @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) + @p='test-setlocale2.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-setsockopt.log: test-setsockopt$(EXEEXT) - @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) + @p='test-setsockopt$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-sigaction.log: test-sigaction$(EXEEXT) - @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) + @p='test-sigaction$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-signal-h.log: test-signal-h$(EXEEXT) - @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) + @p='test-signal-h$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-signbit.log: test-signbit$(EXEEXT) - @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) + @p='test-signbit$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-sigprocmask.log: test-sigprocmask$(EXEEXT) - @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) + @p='test-sigprocmask$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-sleep.log: test-sleep$(EXEEXT) - @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) + @p='test-sleep$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-snprintf.log: test-snprintf$(EXEEXT) - @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) + @p='test-snprintf$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-sockets.log: test-sockets$(EXEEXT) - @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) + @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'; \ - b='test-spawn-pipe.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) + @p='test-spawn-pipe.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-spawn.log: test-spawn$(EXEEXT) - @p='test-spawn$(EXEEXT)'; \ - b='test-spawn'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) + @p='test-spawn$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-stat.log: test-stat$(EXEEXT) - @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) + @p='test-stat$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-stat-time.log: test-stat-time$(EXEEXT) - @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) + @p='test-stat-time$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +test-statat.log: test-statat$(EXEEXT) + @p='test-statat$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-stdalign.log: test-stdalign$(EXEEXT) - @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) + @p='test-stdalign$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-stdbool.log: test-stdbool$(EXEEXT) - @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) + @p='test-stdbool$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-stddef.log: test-stddef$(EXEEXT) - @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) + @p='test-stddef$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-stdint.log: test-stdint$(EXEEXT) - @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) + @p='test-stdint$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-stdio.log: test-stdio$(EXEEXT) - @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) + @p='test-stdio$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-stdlib.log: test-stdlib$(EXEEXT) - @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) + @p='test-stdlib$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-strchrnul.log: test-strchrnul$(EXEEXT) - @p='test-strchrnul$(EXEEXT)'; \ - b='test-strchrnul'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) + @p='test-strchrnul$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-strerror.log: test-strerror$(EXEEXT) - @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) + @p='test-strerror$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-strerror_r.log: test-strerror_r$(EXEEXT) - @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) + @p='test-strerror_r$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-strftime.log: test-strftime$(EXEEXT) - @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) + @p='test-strftime$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-striconv.log: test-striconv$(EXEEXT) - @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) + @p='test-striconv$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-string.log: test-string$(EXEEXT) - @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-strings.log: test-strings$(EXEEXT) - @p='test-strings$(EXEEXT)'; \ - b='test-strings'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) + @p='test-string$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-strncat.log: test-strncat$(EXEEXT) - @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) + @p='test-strncat$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-strnlen.log: test-strnlen$(EXEEXT) - @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) + @p='test-strnlen$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-strsignal.log: test-strsignal$(EXEEXT) - @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) + @p='test-strsignal$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-strtod.log: test-strtod$(EXEEXT) - @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) + @p='test-strtod$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-strtoimax.log: test-strtoimax$(EXEEXT) - @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) + @p='test-strtoimax$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-strtoll.log: test-strtoll$(EXEEXT) - @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) + @p='test-strtoll$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-strtoull.log: test-strtoull$(EXEEXT) - @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) + @p='test-strtoull$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-strtoumax.log: test-strtoumax$(EXEEXT) - @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) + @p='test-strtoumax$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-symlink.log: test-symlink$(EXEEXT) - @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) + @p='test-symlink$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-symlinkat.log: test-symlinkat$(EXEEXT) - @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) + @p='test-symlinkat$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-sys_ioctl.log: test-sys_ioctl$(EXEEXT) - @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) + @p='test-sys_ioctl$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-sys_resource.log: test-sys_resource$(EXEEXT) - @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) + @p='test-sys_resource$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-sys_select.log: test-sys_select$(EXEEXT) - @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) + @p='test-sys_select$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-sys_socket.log: test-sys_socket$(EXEEXT) - @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) + @p='test-sys_socket$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-sys_stat.log: test-sys_stat$(EXEEXT) - @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) + @p='test-sys_stat$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-sys_time.log: test-sys_time$(EXEEXT) - @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) + @p='test-sys_time$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-sys_types.log: test-sys_types$(EXEEXT) - @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) + @p='test-sys_types$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-sys_uio.log: test-sys_uio$(EXEEXT) - @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) + @p='test-sys_uio$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-sys_utsname.log: test-sys_utsname$(EXEEXT) - @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) + @p='test-sys_utsname$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-sys_wait.log: test-sys_wait$(EXEEXT) - @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) + @p='test-sys_wait$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-termios.log: test-termios$(EXEEXT) - @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) + @p='test-termios$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-init.sh.log: test-init.sh - @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) + @p='test-init.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-thread_self.log: test-thread_self$(EXEEXT) - @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) + @p='test-thread_self$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-thread_create.log: test-thread_create$(EXEEXT) - @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) + @p='test-thread_create$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-time.log: test-time$(EXEEXT) - @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) + @p='test-time$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-tls.log: test-tls$(EXEEXT) - @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) + @p='test-tls$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-u64.log: test-u64$(EXEEXT) - @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) + @p='test-u64$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-uname.log: test-uname$(EXEEXT) - @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) + @p='test-uname$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-dup-safer.log: test-dup-safer$(EXEEXT) - @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) + @p='test-dup-safer$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-unistd.log: test-unistd$(EXEEXT) - @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) + @p='test-unistd$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-u8-mbtoucr.log: test-u8-mbtoucr$(EXEEXT) - @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) + @p='test-u8-mbtoucr$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-u8-uctomb.log: test-u8-uctomb$(EXEEXT) - @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) + @p='test-u8-uctomb$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-uc_width.log: test-uc_width$(EXEEXT) - @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) + @p='test-uc_width$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) uniwidth/test-uc_width2.sh.log: uniwidth/test-uc_width2.sh - @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) + @p='uniwidth/test-uc_width2.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-unlink.log: test-unlink$(EXEEXT) - @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) + @p='test-unlink$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-unlinkat.log: test-unlinkat$(EXEEXT) - @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) + @p='test-unlinkat$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-unsetenv.log: test-unsetenv$(EXEEXT) - @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) + @p='test-unsetenv$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-update-copyright.sh.log: test-update-copyright.sh - @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) + @p='test-update-copyright.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-userspec.log: test-userspec$(EXEEXT) - @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) + @p='test-userspec$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-usleep.log: test-usleep$(EXEEXT) - @p='test-usleep$(EXEEXT)'; \ - b='test-usleep'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) + @p='test-usleep$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-utimens.log: test-utimens$(EXEEXT) - @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) + @p='test-utimens$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-utimensat.log: test-utimensat$(EXEEXT) - @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) + @p='test-utimensat$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-vasnprintf.log: test-vasnprintf$(EXEEXT) - @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) + @p='test-vasnprintf$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-vasprintf-posix.log: test-vasprintf-posix$(EXEEXT) - @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) + @p='test-vasprintf-posix$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-vasprintf.log: test-vasprintf$(EXEEXT) - @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) + @p='test-vasprintf$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-vc-list-files-git.sh.log: test-vc-list-files-git.sh - @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) + @p='test-vc-list-files-git.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-vc-list-files-cvs.sh.log: test-vc-list-files-cvs.sh - @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) + @p='test-vc-list-files-cvs.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-verify.log: test-verify$(EXEEXT) - @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) + @p='test-verify$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-verify.sh.log: test-verify.sh - @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) + @p='test-verify.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-version-etc.sh.log: test-version-etc.sh - @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) + @p='test-version-etc.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-vfprintf-posix.sh.log: test-vfprintf-posix.sh - @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) + @p='test-vfprintf-posix.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-vprintf-posix.sh.log: test-vprintf-posix.sh - @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) + @p='test-vprintf-posix.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-wchar.log: test-wchar$(EXEEXT) - @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) + @p='test-wchar$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-wcrtomb.sh.log: test-wcrtomb.sh - @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) + @p='test-wcrtomb.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-wcrtomb-w32-1.sh.log: test-wcrtomb-w32-1.sh - @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) + @p='test-wcrtomb-w32-1.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-wcrtomb-w32-2.sh.log: test-wcrtomb-w32-2.sh - @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) + @p='test-wcrtomb-w32-2.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-wcrtomb-w32-3.sh.log: test-wcrtomb-w32-3.sh - @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) + @p='test-wcrtomb-w32-3.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-wcrtomb-w32-4.sh.log: test-wcrtomb-w32-4.sh - @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) + @p='test-wcrtomb-w32-4.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-wcrtomb-w32-5.sh.log: test-wcrtomb-w32-5.sh - @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) + @p='test-wcrtomb-w32-5.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-wctype-h.log: test-wctype-h$(EXEEXT) - @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) + @p='test-wctype-h$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-wcwidth.log: test-wcwidth$(EXEEXT) - @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) + @p='test-wcwidth$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-write.log: test-write$(EXEEXT) - @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) + @p='test-write$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-xalloc-die.sh.log: test-xalloc-die.sh - @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) + @p='test-xalloc-die.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-xprintf-posix.sh.log: test-xprintf-posix.sh - @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) + @p='test-xprintf-posix.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-xstrtoimax.sh.log: test-xstrtoimax.sh - @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) + @p='test-xstrtoimax.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-xstrtol.sh.log: test-xstrtol.sh - @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) + @p='test-xstrtol.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-xstrtoumax.sh.log: test-xstrtoumax.sh - @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) + @p='test-xstrtoumax.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-xvasprintf.log: test-xvasprintf$(EXEEXT) - @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) + @p='test-xvasprintf$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) test-yesno.sh.log: test-yesno.sh - @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) + @p='test-yesno.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) .test.log: - @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) + @p='$<'; $(am__check_pre) $(TEST_LOG_COMPILE) "$$tst" $(am__check_post) @am__EXEEXT_TRUE@.test$(EXEEXT).log: -@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) +@am__EXEEXT_TRUE@ @p='$<'; $(am__check_pre) $(TEST_LOG_COMPILE) "$$tst" $(am__check_post) 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)'; \ @@ -7913,9 +6361,12 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-TESTS check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-recursive -all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(HEADERS) +all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(MANS) $(HEADERS) installdirs: installdirs-recursive installdirs-am: + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibexecdir)" "$(DESTDIR)$(man1dir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-recursive install-exec: install-exec-recursive @@ -7939,7 +6390,7 @@ install-strip: mostlyclean-generic: -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) - -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_LOGS_TMP)" || rm -f $(TEST_LOGS_TMP) -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: @@ -7963,9 +6414,9 @@ maintainer-clean-generic: -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) clean: clean-recursive -clean-am: clean-checkLIBRARIES clean-checkPROGRAMS clean-generic \ - clean-local clean-noinstLIBRARIES clean-noinstPROGRAMS \ - mostlyclean-am +clean-am: clean-binPROGRAMS clean-checkLIBRARIES clean-checkPROGRAMS \ + clean-generic clean-local clean-noinstLIBRARIES \ + clean-noinstPROGRAMS clean-pkglibexecPROGRAMS mostlyclean-am distclean: distclean-recursive -rm -rf ./$(DEPDIR) glthread/$(DEPDIR) unistr/$(DEPDIR) uniwidth/$(DEPDIR) @@ -7985,13 +6436,13 @@ info: info-recursive info-am: -install-data-am: +install-data-am: install-man install-dvi: install-dvi-recursive install-dvi-am: -install-exec-am: +install-exec-am: install-binPROGRAMS install-pkglibexecPROGRAMS install-html: install-html-recursive @@ -8001,7 +6452,7 @@ install-info: install-info-recursive install-info-am: -install-man: +install-man: install-man1 install-pdf: install-pdf-recursive @@ -8020,8 +6471,8 @@ maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-recursive -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-local +mostlyclean-am: am--mostlyclean-test-html mostlyclean-compile \ + mostlyclean-generic mostlyclean-local pdf: pdf-recursive @@ -8031,28 +6482,35 @@ ps: ps-recursive ps-am: -uninstall-am: +uninstall-am: uninstall-binPROGRAMS uninstall-man \ + uninstall-pkglibexecPROGRAMS + +uninstall-man: uninstall-man1 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \ - check-am cscopelist-recursive ctags-recursive install \ - install-am install-strip tags-recursive + 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 check check-TESTS check-am clean \ + all all-am am--mostlyclean-test-html check check-TESTS \ + check-am check-html clean clean-binPROGRAMS \ clean-checkLIBRARIES clean-checkPROGRAMS clean-generic \ clean-local clean-noinstLIBRARIES clean-noinstPROGRAMS \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-compile distclean-generic distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ + 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-pdf install-pdf-am install-ps install-ps-am \ + 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 tags \ - tags-recursive uninstall uninstall-am + 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 @POSIX_SPAWN_PORTED_TRUE@test-posix_spawn1.sh: test-posix_spawn1.in.sh @POSIX_SPAWN_PORTED_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ diff --git a/gnulib-tests/accept.c b/gnulib-tests/accept.c index 8775aaee..bf27403d 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/at-func.c b/gnulib-tests/at-func.c index b25bc4d8..03c56788 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 @@ -17,9 +17,17 @@ /* written by Jim Meyering */ #include "dosname.h" /* solely for definition of IS_ABSOLUTE_FILE_NAME */ -#include "openat.h" -#include "openat-priv.h" -#include "save-cwd.h" + +#ifdef GNULIB_SUPPORT_ONLY_AT_FDCWD +# include <errno.h> +# ifndef ENOTSUP +# define ENOTSUP EINVAL +# endif +#else +# include "openat.h" +# include "openat-priv.h" +# include "save-cwd.h" +#endif #ifdef AT_FUNC_USE_F1_COND # define CALL_FUNC(F) \ @@ -61,17 +69,22 @@ FUNC_RESULT AT_FUNC_NAME (int fd, char const *file AT_FUNC_POST_FILE_PARAM_DECLS) { + VALIDATE_FLAG (flag); + + if (fd == AT_FDCWD || IS_ABSOLUTE_FILE_NAME (file)) + return CALL_FUNC (file); + +#ifdef GNULIB_SUPPORT_ONLY_AT_FDCWD + errno = ENOTSUP; + return FUNC_FAIL; +#else + { /* Be careful to choose names unlikely to conflict with AT_FUNC_POST_FILE_PARAM_DECLS. */ struct saved_cwd saved_cwd; int saved_errno; FUNC_RESULT err; - VALIDATE_FLAG (flag); - - if (fd == AT_FDCWD || IS_ABSOLUTE_FILE_NAME (file)) - return CALL_FUNC (file); - { char proc_buf[OPENAT_BUFFER_SIZE]; char *proc_file = openat_proc_name (proc_buf, fd, file); @@ -125,6 +138,8 @@ AT_FUNC_NAME (int fd, char const *file AT_FUNC_POST_FILE_PARAM_DECLS) if (saved_errno) errno = saved_errno; return err; + } +#endif } #undef CALL_FUNC #undef FUNC_RESULT diff --git a/gnulib-tests/bind.c b/gnulib-tests/bind.c index 0045c9dc..e6edb855 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/connect.c b/gnulib-tests/connect.c index 939b399a..04cd5a26 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/glthread/thread.c b/gnulib-tests/glthread/thread.c index d55b4e2d..fdec8697 100644 --- a/gnulib-tests/glthread/thread.c +++ b/gnulib-tests/glthread/thread.c @@ -1,5 +1,5 @@ /* Creating and controlling threads. - Copyright (C) 2005-2012 Free Software Foundation, Inc. + Copyright (C) 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 @@ -21,6 +21,7 @@ #include <config.h> /* Specification. */ +# define _GLTHREAD_THREAD_INLINE _GL_EXTERN_INLINE #include "glthread/thread.h" #include <stdlib.h> @@ -85,7 +86,7 @@ struct gl_thread_struct }; /* Return a real HANDLE object for the current thread. */ -static inline HANDLE +static HANDLE get_current_thread_handle (void) { HANDLE this_handle; diff --git a/gnulib-tests/glthread/thread.h b/gnulib-tests/glthread/thread.h index 6653aa28..0d661096 100644 --- a/gnulib-tests/glthread/thread.h +++ b/gnulib-tests/glthread/thread.h @@ -1,5 +1,5 @@ /* Creating and controlling threads. - Copyright (C) 2005-2012 Free Software Foundation, Inc. + Copyright (C) 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 @@ -74,6 +74,11 @@ #include <errno.h> #include <stdlib.h> +_GL_INLINE_HEADER_BEGIN +#ifndef _GLTHREAD_THREAD_INLINE +# define _GLTHREAD_THREAD_INLINE _GL_INLINE +#endif + /* ========================================================================= */ #if USE_POSIX_THREADS @@ -360,7 +365,7 @@ typedef int gl_thread_t; extern "C" { #endif -static inline gl_thread_t +_GLTHREAD_THREAD_INLINE gl_thread_t gl_thread_create (void *(*func) (void *arg), void *arg) { gl_thread_t thread; @@ -397,4 +402,6 @@ gl_thread_create (void *(*func) (void *arg), void *arg) } #endif +_GL_INLINE_HEADER_END + #endif /* _GLTHREAD_THREAD_H */ diff --git a/gnulib-tests/glthread/yield.h b/gnulib-tests/glthread/yield.h index 63c45be2..12cb03b0 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/gnulib.mk b/gnulib-tests/gnulib.mk index 745741ea..457772ff 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-2012 Free Software Foundation, Inc. +# Copyright (C) 2002-2013 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 @@ -780,7 +780,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) +test_futimens_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) @LIBINTL@ EXTRA_DIST += nap.h test-futimens.h test-utimens-common.h test-futimens.c signature.h macros.h ## end gnulib module futimens-tests @@ -898,6 +898,22 @@ EXTRA_DIST += macros.h signature.h test-getopt.c test-getopt.h test-getopt_long. ## end gnulib module getopt-posix-tests +## 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 +# -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 + +EXTRA_DIST += $(top_srcdir)/build-aux/config.rpath + +## end gnulib module gettext + ## begin gnulib module gettimeofday-tests TESTS += test-gettimeofday @@ -1615,6 +1631,7 @@ EXTRA_DIST += test-readlink.h test-readlinkat.c signature.h macros.h TESTS += test-readtokens.sh check_PROGRAMS += test-readtokens +test_readtokens_LDADD = $(LDADD) @LIBINTL@ EXTRA_DIST += macros.h test-readtokens.c test-readtokens.sh ## end gnulib module readtokens-tests @@ -1627,6 +1644,15 @@ EXTRA_DIST += test-realloc-gnu.c ## end gnulib module realloc-gnu-tests +## begin gnulib module regex-tests + +TESTS += test-regex +check_PROGRAMS += test-regex +test_regex_LDADD = $(LDADD) @LIBINTL@ +EXTRA_DIST += test-regex.c macros.h + +## end gnulib module regex-tests + ## begin gnulib module remove-tests TESTS += test-remove @@ -1941,6 +1967,15 @@ EXTRA_DIST += test-stat-time.c macros.h ## end gnulib module stat-time-tests +## begin gnulib module statat-tests + +TESTS += test-statat +check_PROGRAMS += test-statat +test_statat_LDADD = $(LDADD) @LIBINTL@ +EXTRA_DIST += test-statat.c + +## end gnulib module statat-tests + ## begin gnulib module stdalign-tests TESTS += test-stdalign @@ -2048,14 +2083,6 @@ EXTRA_DIST += test-string.c ## end gnulib module string-tests -## begin gnulib module strings-tests - -TESTS += test-strings -check_PROGRAMS += test-strings -EXTRA_DIST += test-strings.c - -## end gnulib module strings-tests - ## begin gnulib module strncat-tests TESTS += test-strncat @@ -2413,7 +2440,7 @@ EXTRA_DIST += test-usleep.c signature.h macros.h TESTS += test-utimens check_PROGRAMS += test-utimens -test_utimens_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) +test_utimens_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) @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 diff --git a/gnulib-tests/inet_pton.c b/gnulib-tests/inet_pton.c index 40963650..78ebf1a1 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-2012 Free Software Foundation, Inc. + Copyright (C) 2006, 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 diff --git a/gnulib-tests/infinity.h b/gnulib-tests/infinity.h index 631473ec..91112899 100644 --- a/gnulib-tests/infinity.h +++ b/gnulib-tests/infinity.h @@ -1,5 +1,5 @@ /* Macros for infinity. - Copyright (C) 2011-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/init.sh b/gnulib-tests/init.sh index f525a7ca..bd2048e2 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-2012 Free Software Foundation, Inc. +# 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 @@ -411,8 +411,7 @@ path_prepend_ () case $path_dir_ in '') fail_ "invalid path dir: '$1'";; /*) abs_path_dir_=$path_dir_;; - *) abs_path_dir_=`cd "$initial_cwd_/$path_dir_" && echo "$PWD"` \ - || fail_ "invalid path dir: $path_dir_";; + *) abs_path_dir_=$initial_cwd_/$path_dir_;; esac case $abs_path_dir_ in *:*) fail_ "invalid path dir: '$abs_path_dir_'";; @@ -448,7 +447,7 @@ setup_ () pfx_=`testdir_prefix_` test_dir_=`mktempd_ "$initial_cwd_" "$pfx_-$ME_.XXXX"` \ || fail_ "failed to create temporary directory in $initial_cwd_" - cd "$test_dir_" + cd "$test_dir_" || fail_ "failed to cd to temporary directory" # As autoconf-generated configure scripts do, ensure that IFS # is defined initially, so that saving and restoring $IFS works. diff --git a/gnulib-tests/ioctl.c b/gnulib-tests/ioctl.c index 4a2fd398..cd259112 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/listen.c b/gnulib-tests/listen.c index a1b2ab7f..0ca83462 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/localename.c b/gnulib-tests/localename.c index 869dbf28..47cb7cae 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-2012 Free Software Foundation, Inc. + Copyright (C) 1995-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 @@ -16,7 +16,7 @@ /* Written by Ulrich Drepper <drepper@gnu.org>, 1995. */ /* Native Windows code written by Tor Lillqvist <tml@iki.fi>. */ -/* MacOS X code written by Bruno Haible <bruno@clisp.org>. */ +/* Mac OS X code written by Bruno Haible <bruno@clisp.org>. */ #include <config.h> @@ -34,7 +34,7 @@ #include <string.h> #if HAVE_USELOCALE -/* MacOS X 10.5 defines the locale_t type in <xlocale.h>. */ +/* Mac OS X 10.5 defines the locale_t type in <xlocale.h>. */ # if defined __APPLE__ && defined __MACH__ # include <xlocale.h> # endif @@ -1128,11 +1128,11 @@ #if HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE -/* MacOS X 10.2 or newer */ +/* Mac OS X 10.2 or newer */ -/* Canonicalize a MacOS X locale name to a Unix locale name. +/* Canonicalize a Mac OS X locale name to a Unix locale name. NAME is a sufficiently large buffer. - On input, it contains the MacOS X locale name. + On input, it contains the Mac OS X locale name. On output, it contains the Unix locale name. */ # if !defined IN_LIBINTL static @@ -1145,9 +1145,9 @@ gl_locale_name_canonicalize (char *name) http://lists.apple.com/archives/carbon-dev/2005/Mar/msg00293.html */ /* Convert legacy (NeXTstep inherited) English names to Unix (ISO 639 and - ISO 3166) names. Prior to MacOS X 10.3, there is no API for doing this. + ISO 3166) names. Prior to Mac OS X 10.3, there is no API for doing this. Therefore we do it ourselves, using a table based on the results of the - MacOS X 10.3.8 function + Mac OS X 10.3.8 function CFLocaleCreateCanonicalLocaleIdentifierFromString(). */ typedef struct { const char legacy[21+1]; const char unixy[5+1]; } legacy_entry; @@ -1290,26 +1290,26 @@ gl_locale_name_canonicalize (char *name) typedef struct { const char langtag[7+1]; const char unixy[12+1]; } langtag_entry; static const langtag_entry langtag_table[] = { - /* MacOS X has "az-Arab", "az-Cyrl", "az-Latn". + /* Mac OS X has "az-Arab", "az-Cyrl", "az-Latn". The default script for az on Unix is Latin. */ { "az-Latn", "az" }, - /* MacOS X has "ga-dots". Does not yet exist on Unix. */ + /* Mac OS X has "ga-dots". Does not yet exist on Unix. */ { "ga-dots", "ga" }, - /* MacOS X has "kk-Cyrl". Does not yet exist on Unix. */ - /* MacOS X has "mn-Cyrl", "mn-Mong". + /* Mac OS X has "kk-Cyrl". Does not yet exist on Unix. */ + /* Mac OS X has "mn-Cyrl", "mn-Mong". The default script for mn on Unix is Cyrillic. */ { "mn-Cyrl", "mn" }, - /* MacOS X has "ms-Arab", "ms-Latn". + /* Mac OS X has "ms-Arab", "ms-Latn". The default script for ms on Unix is Latin. */ { "ms-Latn", "ms" }, - /* MacOS X has "tg-Cyrl". + /* Mac OS X has "tg-Cyrl". The default script for tg on Unix is Cyrillic. */ { "tg-Cyrl", "tg" }, - /* MacOS X has "tk-Cyrl". Does not yet exist on Unix. */ - /* MacOS X has "tt-Cyrl". + /* Mac OS X has "tk-Cyrl". Does not yet exist on Unix. */ + /* Mac OS X has "tt-Cyrl". The default script for tt on Unix is Cyrillic. */ { "tt-Cyrl", "tt" }, - /* MacOS X has "zh-Hans", "zh-Hant". + /* Mac OS X has "zh-Hans", "zh-Hant". Country codes are used to distinguish these on Unix. */ { "zh-Hans", "zh_CN" }, { "zh-Hant", "zh_TW" } @@ -2505,7 +2505,7 @@ gl_locale_name_from_win32_LCID (LCID lcid) #endif -#if HAVE_USELOCALE /* glibc or MacOS X */ +#if HAVE_USELOCALE /* glibc or Mac OS X */ /* Simple hash set of strings. We don't want to drag in lots of hash table code here. */ @@ -2616,133 +2616,34 @@ gl_locale_name_thread_unsafe (int category, const char *categoryname) nl_langinfo (_NL_LOCALE_NAME (category)). */ name = thread_locale->__names[category]; return name; -# endif -# if defined __APPLE__ && defined __MACH__ /* MacOS X */ - /* The locale name is found deep in an undocumented data structure. - Since it's stored in a buffer of size 32 and newlocale() rejects - locale names of length > 31, we can assume that it is NUL terminated - in this buffer. But we need to make a copy of the locale name, of - indefinite extent. */ - struct _xlocale_part1_v0 /* used in MacOS X 10.5 */ - { - int32_t __refcount; - void (*__free_extra)(void *); - __darwin_mbstate_t __mbs[10]; - int64_t __magic; - }; - struct _xlocale_part1_v1 /* used in MacOS X >= 10.6.0 */ - { - int32_t __refcount; - void (*__free_extra)(void *); - __darwin_mbstate_t __mbs[10]; - /*pthread_lock_t*/ int __lock; - int64_t __magic; - }; - struct _xlocale_part2 - { - int64_t __magic; - unsigned char __collate_load_error; - unsigned char __collate_substitute_nontrivial; - unsigned char _messages_using_locale; - unsigned char _monetary_using_locale; - unsigned char _numeric_using_locale; - unsigned char _time_using_locale; - unsigned char __mlocale_changed; - unsigned char __nlocale_changed; - unsigned char __numeric_fp_cvt; - struct __xlocale_st_collate *__lc_collate; - struct __xlocale_st_runelocale *__lc_ctype; - struct __xlocale_st_messages *__lc_messages; - struct __xlocale_st_monetary *__lc_monetary; - struct __xlocale_st_numeric *__lc_numeric; - struct _xlocale *__lc_numeric_loc; - struct __xlocale_st_time *__lc_time; - /* more */ - }; - struct __xlocale_st_collate - { - int32_t __refcount; - void (*__free_extra)(void *); - char __encoding[32]; - /* more */ - }; - struct __xlocale_st_runelocale - { - int32_t __refcount; - void (*__free_extra)(void *); - char __ctype_encoding[32]; - /* more */ - }; - struct __xlocale_st_messages - { - int32_t __refcount; - void (*__free_extra)(void *); - char *_messages_locale_buf; - /* more */ - }; - struct __xlocale_st_monetary - { - int32_t __refcount; - void (*__free_extra)(void *); - char *_monetary_locale_buf; - /* more */ - }; - struct __xlocale_st_numeric { - int32_t __refcount; - void (*__free_extra)(void *); - char *_numeric_locale_buf; - /* more */ - }; - struct __xlocale_st_time { - int32_t __refcount; - void (*__free_extra)(void *); - char *_time_locale_buf; - /* more */ - }; - struct _xlocale_part2 *tlp; - if (((struct _xlocale_part1_v0 *) thread_locale)->__magic - == 0x786C6F63616C6530LL) - /* MacOS X 10.5 */ - tlp = - (struct _xlocale_part2 *) - &((struct _xlocale_part1_v0 *) thread_locale)->__magic; - else if (((struct _xlocale_part1_v1 *) thread_locale)->__magic - == 0x786C6F63616C6530LL) - /* MacOS X >= 10.6.0 */ - tlp = - (struct _xlocale_part2 *) - &((struct _xlocale_part1_v1 *) thread_locale)->__magic; - else - /* Unsupported version of MacOS X: The internals of 'struct _xlocale' - have changed again. */ - return ""; +# elif defined __FreeBSD__ || (defined __APPLE__ && defined __MACH__) + /* FreeBSD, Mac OS X */ + int mask; + switch (category) { case LC_CTYPE: - return tlp->__lc_ctype->__ctype_encoding; + mask = LC_CTYPE_MASK; + break; case LC_NUMERIC: - return tlp->_numeric_using_locale - ? tlp->__lc_numeric->_numeric_locale_buf - : "C"; + mask = LC_NUMERIC_MASK; + break; case LC_TIME: - return tlp->_time_using_locale - ? tlp->__lc_time->_time_locale_buf - : "C"; + mask = LC_TIME_MASK; + break; case LC_COLLATE: - return !tlp->__collate_load_error - ? tlp->__lc_collate->__encoding - : "C"; + mask = LC_COLLATE_MASK; + break; case LC_MONETARY: - return tlp->_monetary_using_locale - ? tlp->__lc_monetary->_monetary_locale_buf - : "C"; + mask = LC_MONETARY_MASK; + break; case LC_MESSAGES: - return tlp->_messages_using_locale - ? tlp->__lc_messages->_messages_locale_buf - : "C"; + mask = LC_MESSAGES_MASK; + break; default: /* We shouldn't get here. */ return ""; } + return querylocale (mask, thread_locale); # endif } } @@ -2784,8 +2685,8 @@ gl_locale_name_posix (int category, const char *categoryname) /* On other systems we ignore what setlocale reports and instead look at the environment variables directly. This is necessary 1. on systems which have a facility for customizing the default locale - (MacOS X, native Windows, Cygwin) and where the system's setlocale() - function ignores this default locale (MacOS X, Cygwin), in two cases: + (Mac OS X, native Windows, Cygwin) and where the system's setlocale() + function ignores this default locale (Mac OS X, Cygwin), in two cases: a. when the user missed to use the setlocale() override from libintl (for example by not including <libintl.h>), b. when setlocale supports only the "C" locale, such as on Cygwin @@ -2820,7 +2721,7 @@ gl_locale_name_environ (int category, const char *categoryname) if (retval != NULL && retval[0] != '\0') { #if HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE - /* MacOS X 10.2 or newer. + /* Mac OS X 10.2 or newer. Ignore invalid LANG value set by the Terminal application. */ if (strcmp (retval, "UTF-8") != 0) #endif @@ -2847,10 +2748,10 @@ gl_locale_name_default (void) locale, customizing it for each location. POSIX:2001 does not require such a facility. - The systems with such a facility are MacOS X and Windows: They provide a + The systems with such a facility are Mac OS X and Windows: They provide a GUI that allows the user to choose a locale. - - On MacOS X, by default, none of LC_* or LANG are set. Starting with - MacOS X 10.4 or 10.5, LANG is set for processes launched by the + - On Mac OS X, by default, none of LC_* or LANG are set. Starting with + Mac OS X 10.4 or 10.5, LANG is set for processes launched by the 'Terminal' application (but sometimes to an incorrect value "UTF-8"). When no environment variable is set, setlocale (LC_ALL, "") uses the "C" locale. @@ -2880,7 +2781,7 @@ gl_locale_name_default (void) codeset. */ # if HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE - /* MacOS X 10.2 or newer */ + /* Mac OS X 10.2 or newer */ { /* Cache the locale name, since CoreFoundation calls are expensive. */ static const char *cached_localename; @@ -2888,7 +2789,7 @@ gl_locale_name_default (void) if (cached_localename == NULL) { char namebuf[256]; -# if HAVE_CFLOCALECOPYCURRENT /* MacOS X 10.3 or newer */ +# if HAVE_CFLOCALECOPYCURRENT /* Mac OS X 10.3 or newer */ CFLocaleRef locale = CFLocaleCopyCurrent (); CFStringRef name = CFLocaleGetIdentifier (locale); @@ -2899,7 +2800,7 @@ gl_locale_name_default (void) cached_localename = strdup (namebuf); } CFRelease (locale); -# elif HAVE_CFPREFERENCESCOPYAPPVALUE /* MacOS X 10.2 or newer */ +# elif HAVE_CFPREFERENCESCOPYAPPVALUE /* Mac OS X 10.2 or newer */ CFTypeRef value = CFPreferencesCopyAppValue (CFSTR ("AppleLocale"), kCFPreferencesCurrentApplication); diff --git a/gnulib-tests/localename.h b/gnulib-tests/localename.h index 330932dd..e70eee60 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-2012 Free Software Foundation, Inc. + Copyright (C) 2007, 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 diff --git a/gnulib-tests/macros.h b/gnulib-tests/macros.h index 478004c1..60ba894d 100644 --- a/gnulib-tests/macros.h +++ b/gnulib-tests/macros.h @@ -1,5 +1,5 @@ /* Common macros used by gnulib tests. - Copyright (C) 2006-2012 Free Software Foundation, Inc. + Copyright (C) 2006-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 diff --git a/gnulib-tests/minus-zero.h b/gnulib-tests/minus-zero.h index 491cef38..5882cbf7 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-2012 Free Software Foundation, Inc. + Copyright (C) 2010-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 @@ -24,7 +24,7 @@ /* HP cc on HP-UX 10.20 has a bug with the constant expression -0.0f. ICC 10.0 has a bug when optimizing the expression -zero. The expression -FLT_MIN * FLT_MIN does not work when cross-compiling - to PowerPC on MacOS X 10.5. */ + to PowerPC on Mac OS X 10.5. */ #if defined __hpux || defined __sgi || defined __ICC static float compute_minus_zerof (void) @@ -42,7 +42,7 @@ float minus_zerof = -0.0f; /* HP cc on HP-UX 10.20 has a bug with the constant expression -0.0. ICC 10.0 has a bug when optimizing the expression -zero. The expression -DBL_MIN * DBL_MIN does not work when cross-compiling - to PowerPC on MacOS X 10.5. */ + to PowerPC on Mac OS X 10.5. */ #if defined __hpux || defined __sgi || defined __ICC static double compute_minus_zerod (void) @@ -61,7 +61,7 @@ double minus_zerod = -0.0; IRIX cc can't put -0.0L into .data, but can compute at runtime. ICC 10.0 has a bug when optimizing the expression -zero. The expression -LDBL_MIN * LDBL_MIN does not work when cross-compiling - to PowerPC on MacOS X 10.5. */ + to PowerPC on Mac OS X 10.5. */ #if defined __hpux || defined __sgi || defined __ICC static long double compute_minus_zerol (void) diff --git a/gnulib-tests/nan.h b/gnulib-tests/nan.h index 2f75da15..e95ceb96 100644 --- a/gnulib-tests/nan.h +++ b/gnulib-tests/nan.h @@ -1,5 +1,5 @@ /* Macros for not-a-number. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/nap.h b/gnulib-tests/nap.h index 6dfb0a07..342a70ce 100644 --- a/gnulib-tests/nap.h +++ b/gnulib-tests/nap.h @@ -1,5 +1,5 @@ /* Assist in file system timestamp tests. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 @@ -19,48 +19,84 @@ #ifndef GLTEST_NAP_H # define GLTEST_NAP_H +static int +lt_mtime (struct stat const *a, struct stat const *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); + + return as < bs || (as == bs && ans < bns); +} + +static void +get_mtime (int fd, struct stat *st, int do_write) +{ + if (do_write) + ASSERT (write (fd, "\n", 1) == 1); + ASSERT (fstat (fd, st) == 0); +} + +/* 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) +{ + 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); +} + +static int +guess_delay (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; +} + /* 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. */ static void nap (void) { - static long delay; + static int 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 (close (creat (BASE "tmp", 0600)) == 0); - ASSERT (stat (BASE "tmp", &st1) == 0); - ASSERT (unlink (BASE "tmp") == 0); - delay = 20000; - usleep (delay); - ASSERT (close (creat (BASE "tmp", 0600)) == 0); - ASSERT (stat (BASE "tmp", &st2) == 0); - ASSERT (unlink (BASE "tmp") == 0); - if (st1.st_mtime != st2.st_mtime) - { - /* Seconds differ, give it one more shot. */ - st1 = st2; - usleep (delay); - ASSERT (close (creat (BASE "tmp", 0600)) == 0); - ASSERT (stat (BASE "tmp", &st2) == 0); - ASSERT (unlink (BASE "tmp") == 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; - } + delay = guess_delay (); usleep (delay); } diff --git a/gnulib-tests/perror.c b/gnulib-tests/perror.c index 4853d1b1..ae532018 100644 --- a/gnulib-tests/perror.c +++ b/gnulib-tests/perror.c @@ -1,5 +1,5 @@ /* Print a message describing error code. - Copyright (C) 2008-2012 Free Software Foundation, Inc. + Copyright (C) 2008-2013 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/pipe.c b/gnulib-tests/pipe.c index 6fcf1f2c..a67cd3fd 100644 --- a/gnulib-tests/pipe.c +++ b/gnulib-tests/pipe.c @@ -1,5 +1,5 @@ /* Create a pipe. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/randomd.c b/gnulib-tests/randomd.c index 0bef8b6f..a3097efb 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 Free Software Foundation, Inc. + Copyright (C) 2012-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 diff --git a/gnulib-tests/randoml.c b/gnulib-tests/randoml.c index b48d49cb..4e854dda 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 Free Software Foundation, Inc. + Copyright (C) 2012-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 diff --git a/gnulib-tests/setlocale.c b/gnulib-tests/setlocale.c index 8a47cdef..c729fa6f 100644 --- a/gnulib-tests/setlocale.c +++ b/gnulib-tests/setlocale.c @@ -1,5 +1,5 @@ /* Set the current locale. - Copyright (C) 2009, 2011-2012 Free Software Foundation, Inc. + Copyright (C) 2009, 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 diff --git a/gnulib-tests/setsockopt.c b/gnulib-tests/setsockopt.c index 9f414d58..7865aaff 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/signature.h b/gnulib-tests/signature.h index d9d8b471..45a8e02b 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/sleep.c b/gnulib-tests/sleep.c index 9a4b9400..4c97d7df 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-2012 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2013 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 c668df07..dcbd07af 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/strerror_r.c b/gnulib-tests/strerror_r.c index 76f6fc64..e86d272a 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-2012 Free Software Foundation, Inc. + Copyright (C) 2010-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 diff --git a/gnulib-tests/symlinkat.c b/gnulib-tests/symlinkat.c index da098ac9..336b0a2a 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-accept.c b/gnulib-tests/test-accept.c index 265ef649..2af98afa 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-2012 Free Software Foundation, Inc. + 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 @@ -23,6 +23,7 @@ SIGNATURE_CHECK (accept, int, (int, struct sockaddr *, socklen_t *)); #include <errno.h> #include <netinet/in.h> +#include <unistd.h> #include "sockets.h" #include "macros.h" @@ -45,6 +46,7 @@ main (void) struct sockaddr_in addr; socklen_t addrlen = sizeof (addr); + close (99); errno = 0; ASSERT (accept (99, (struct sockaddr *) &addr, &addrlen) == -1); ASSERT (errno == EBADF); diff --git a/gnulib-tests/test-alignof.c b/gnulib-tests/test-alignof.c index 52db6fce..d988881b 100644 --- a/gnulib-tests/test-alignof.c +++ b/gnulib-tests/test-alignof.c @@ -1,5 +1,5 @@ /* Test of <alignof.h>. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-alloca-opt.c b/gnulib-tests/test-alloca-opt.c index 4e814c6f..d94e1d1d 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-2012 Free Software Foundation, Inc. + Copyright (C) 2005, 2007, 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 @@ -44,7 +44,7 @@ main () { /* Try various values. n = 0 gave a crash on Alpha with gcc-2.5.8. - Some versions of MacOS X have a stack size limit of 512 KB. */ + Some versions of Mac OS X have a stack size limit of 512 KB. */ func (34); func (134); func (399); diff --git a/gnulib-tests/test-areadlink-with-size.c b/gnulib-tests/test-areadlink-with-size.c index c64d5580..60b67415 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-areadlink.c b/gnulib-tests/test-areadlink.c index 90fa7a0e..23576802 100644 --- a/gnulib-tests/test-areadlink.c +++ b/gnulib-tests/test-areadlink.c @@ -1,5 +1,5 @@ /* Tests of areadlink. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-areadlink.h b/gnulib-tests/test-areadlink.h index a084d2e7..ccc7187e 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-areadlinkat.c b/gnulib-tests/test-areadlinkat.c index f5bb572e..47bbae53 100644 --- a/gnulib-tests/test-areadlinkat.c +++ b/gnulib-tests/test-areadlinkat.c @@ -1,5 +1,5 @@ /* Tests of areadlinkat. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-argmatch.c b/gnulib-tests/test-argmatch.c index fb058b5a..9e24dc19 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-2012 Free Software Foundation, Inc. + Copyright (C) 1990, 1998-1999, 2001-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 diff --git a/gnulib-tests/test-argv-iter.c b/gnulib-tests/test-argv-iter.c index b5b57bf6..19680cf4 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-arpa_inet.c b/gnulib-tests/test-arpa_inet.c index bda67095..37f2ec3f 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-2012 Free Software Foundation, Inc. + Copyright (C) 2007, 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 diff --git a/gnulib-tests/test-base64.c b/gnulib-tests/test-base64.c index 9a533c52..9debff06 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-2012 Free Software Foundation, Inc. + Copyright (C) 2004, 2008-2013 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 c695454e..b258d51a 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-2012 Free Software Foundation, Inc. + Copyright (C) 2005, 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 @@ -30,26 +30,40 @@ #include "macros.h" int -main () +main (int argc, char *argv[]) { /* Test the O_BINARY macro. */ { int fd = - open ("t-bin-out2.tmp", O_CREAT | O_TRUNC | O_RDWR | O_BINARY, 0600); + open ("t-bin-out0.tmp", O_CREAT | O_TRUNC | O_RDWR | O_BINARY, 0600); if (write (fd, "Hello\n", 6) < 0) exit (1); close (fd); } { struct stat statbuf; - if (stat ("t-bin-out2.tmp", &statbuf) < 0) + if (stat ("t-bin-out0.tmp", &statbuf) < 0) exit (1); ASSERT (statbuf.st_size == 6); } - /* Test the SET_BINARY macro. */ - SET_BINARY (1); - fputs ("Hello\n", stdout); + switch (argv[1][0]) + { + case '1': + /* Test the set_binary_mode() function. */ + set_binary_mode (1, O_BINARY); + fputs ("Hello\n", stdout); + break; + + case '2': + /* Test the SET_BINARY macro. */ + SET_BINARY (1); + fputs ("Hello\n", stdout); + break; + + default: + break; + } return 0; } diff --git a/gnulib-tests/test-binary-io.sh b/gnulib-tests/test-binary-io.sh index 272edef1..c4dd6e92 100755 --- a/gnulib-tests/test-binary-io.sh +++ b/gnulib-tests/test-binary-io.sh @@ -3,9 +3,11 @@ tmpfiles="" trap 'rm -fr $tmpfiles' 1 2 3 15 -tmpfiles="$tmpfiles t-bin-out1.tmp t-bin-out2.tmp" -./test-binary-io${EXEEXT} > t-bin-out1.tmp || exit 1 -cmp t-bin-out1.tmp t-bin-out2.tmp > /dev/null || exit 1 +tmpfiles="$tmpfiles t-bin-out0.tmp t-bin-out1.tmp t-bin-out2.tmp" +./test-binary-io${EXEEXT} 1 > t-bin-out1.tmp || exit 1 +cmp t-bin-out0.tmp t-bin-out1.tmp > /dev/null || exit 1 +./test-binary-io${EXEEXT} 2 > t-bin-out2.tmp || exit 1 +cmp t-bin-out0.tmp t-bin-out2.tmp > /dev/null || exit 1 rm -fr $tmpfiles diff --git a/gnulib-tests/test-bind.c b/gnulib-tests/test-bind.c index e97be2a2..fe854104 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-2012 Free Software Foundation, Inc. + 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 @@ -24,6 +24,7 @@ SIGNATURE_CHECK (bind, int, (int, const struct sockaddr *, socklen_t)); #include <errno.h> #include <netinet/in.h> #include <arpa/inet.h> +#include <unistd.h> #include "sockets.h" #include "macros.h" @@ -46,6 +47,7 @@ main (void) ASSERT (errno == EBADF); } { + close (99); errno = 0; ASSERT (bind (99, (const struct sockaddr *) &addr, sizeof (addr)) == -1); ASSERT (errno == EBADF); diff --git a/gnulib-tests/test-bitrotate.c b/gnulib-tests/test-bitrotate.c index bebb3639..380f08d8 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-btowc.c b/gnulib-tests/test-btowc.c index 845fe069..7779469e 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-c-ctype.c b/gnulib-tests/test-c-ctype.c index a9cb6552..c0aa662f 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-2012 Free Software Foundation, Inc. + Copyright (C) 2005, 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 diff --git a/gnulib-tests/test-c-strcasecmp.c b/gnulib-tests/test-c-strcasecmp.c index 1eb59588..26d9ca45 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-c-strncasecmp.c b/gnulib-tests/test-c-strncasecmp.c index 479528b3..075f15e7 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-calloc-gnu.c b/gnulib-tests/test-calloc-gnu.c index 05063e54..ccd956c8 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-2012 Free Software Foundation, Inc. + Copyright (C) 2010-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 diff --git a/gnulib-tests/test-canonicalize.c b/gnulib-tests/test-canonicalize.c index 9f93ed1e..6794cf51 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-chdir.c b/gnulib-tests/test-chdir.c index f010676a..40fd31ff 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-chown.c b/gnulib-tests/test-chown.c index 9ba69f5c..d7962460 100644 --- a/gnulib-tests/test-chown.c +++ b/gnulib-tests/test-chown.c @@ -1,5 +1,5 @@ /* Tests of chown. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-chown.h b/gnulib-tests/test-chown.h index edaa8f70..1f66d4cf 100644 --- a/gnulib-tests/test-chown.h +++ b/gnulib-tests/test-chown.h @@ -1,5 +1,5 @@ /* Tests of chown. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-cloexec.c b/gnulib-tests/test-cloexec.c index af14e9c7..504a95b9 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-close.c b/gnulib-tests/test-close.c index 83f71c06..974ed1b6 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-2012 Free Software Foundation, Inc. + 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 @@ -35,6 +35,7 @@ main (void) ASSERT (errno == EBADF); } { + close (99); errno = 0; ASSERT (close (99) == -1); ASSERT (errno == EBADF); diff --git a/gnulib-tests/test-closein.c b/gnulib-tests/test-closein.c index f279d7c9..5f9d8ef4 100644 --- a/gnulib-tests/test-closein.c +++ b/gnulib-tests/test-closein.c @@ -1,5 +1,5 @@ /* Test of closein module. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-connect.c b/gnulib-tests/test-connect.c index 9ef89239..a1cd5f17 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-2012 Free Software Foundation, Inc. + 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 @@ -24,6 +24,7 @@ SIGNATURE_CHECK (connect, int, (int, const struct sockaddr *, socklen_t)); #include <errno.h> #include <netinet/in.h> #include <arpa/inet.h> +#include <unistd.h> #include "sockets.h" #include "macros.h" @@ -47,6 +48,7 @@ main (void) ASSERT (errno == EBADF); } { + close (99); errno = 0; ASSERT (connect (99, (const struct sockaddr *) &addr, sizeof (addr)) == -1); diff --git a/gnulib-tests/test-copy-acl.c b/gnulib-tests/test-copy-acl.c index 355c3c47..f7e29993 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-copy-acl.sh b/gnulib-tests/test-copy-acl.sh index 50112c17..147bf564 100755 --- a/gnulib-tests/test-copy-acl.sh +++ b/gnulib-tests/test-copy-acl.sh @@ -111,7 +111,7 @@ cd "$builddir" || acl_flavor=aix else if (fsaclctl -v >/dev/null) 2>/dev/null; then - # MacOS X. + # Mac OS X. acl_flavor=macosx else if test -f /sbin/chacl; then diff --git a/gnulib-tests/test-ctype.c b/gnulib-tests/test-ctype.c index d6cdff96..a41449c1 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-di-set.c b/gnulib-tests/test-di-set.c index 121e4085..b064978d 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-2012 Free Software Foundation, Inc. + Copyright (C) 2010-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 diff --git a/gnulib-tests/test-dirent-safer.c b/gnulib-tests/test-dirent-safer.c index 8d5de126..7d5f4f51 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-dirent.c b/gnulib-tests/test-dirent.c index 24e17592..34ef5d94 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-dirname.c b/gnulib-tests/test-dirname.c index 5fcaee6d..a017bce9 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-2012 Free Software Foundation, Inc. + Copyright (C) 2005-2007, 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 diff --git a/gnulib-tests/test-dup-safer.c b/gnulib-tests/test-dup-safer.c index 8f427556..d7567e01 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-dup.c b/gnulib-tests/test-dup.c index 6ada484a..b2cf9357 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-2012 Free Software Foundation, Inc. + 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 @@ -35,6 +35,7 @@ main (void) ASSERT (errno == EBADF); } { + close (99); errno = 0; ASSERT (dup (99) == -1); ASSERT (errno == EBADF); diff --git a/gnulib-tests/test-dup2.c b/gnulib-tests/test-dup2.c index 5043c0c5..9600c850 100644 --- a/gnulib-tests/test-dup2.c +++ b/gnulib-tests/test-dup2.c @@ -1,5 +1,5 @@ /* Test duplicating file descriptors. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 @@ -122,6 +122,7 @@ main (void) errno = 0; ASSERT (dup2 (-1, fd) == -1); ASSERT (errno == EBADF); + close (99); errno = 0; ASSERT (dup2 (99, fd) == -1); ASSERT (errno == EBADF); diff --git a/gnulib-tests/test-environ.c b/gnulib-tests/test-environ.c index 972ed06d..cb3d9f60 100644 --- a/gnulib-tests/test-environ.c +++ b/gnulib-tests/test-environ.c @@ -1,5 +1,5 @@ /* Test of environ variable. - Copyright (C) 2008-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-errno.c b/gnulib-tests/test-errno.c index d9a030f4..29eb510d 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-2012 Free Software Foundation, Inc. + 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 @@ -98,6 +98,8 @@ int e115 = EINPROGRESS; int e116 = ESTALE; int e122 = EDQUOT; int e125 = ECANCELED; +int e130 = EOWNERDEAD; +int e131 = ENOTRECOVERABLE; /* Don't verify that these errno values are all different, except for possibly EWOULDBLOCK == EAGAIN. Even Linux/x86 does not pass this check: it has diff --git a/gnulib-tests/test-exclude.c b/gnulib-tests/test-exclude.c index c13d91ed..bad28373 100644 --- a/gnulib-tests/test-exclude.c +++ b/gnulib-tests/test-exclude.c @@ -1,5 +1,5 @@ /* Test suite for exclude. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + Copyright (C) 2009-2013 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 3d167ece..df626990 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-2012 Free Software Foundation, Inc. +# Copyright (C) 2009-2013 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 e7c8c0d1..bc35be83 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-2012 Free Software Foundation, Inc. +# Copyright (C) 2009-2013 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 5d4034fe..497c58fe 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-2012 Free Software Foundation, Inc. +# Copyright (C) 2009-2013 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 f8650b1e..f450dbb1 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-2012 Free Software Foundation, Inc. +# Copyright (C) 2009-2013 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 cfe22287..1dac96b7 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-2012 Free Software Foundation, Inc. +# Copyright (C) 2009-2013 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 8035ed0d..c0b1cbad 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-2012 Free Software Foundation, Inc. +# Copyright (C) 2009-2013 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 2293eafb..cb1e0cb7 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-2012 Free Software Foundation, Inc. +# Copyright (C) 2009-2013 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 758bc07c..9cbdbac7 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-2012 Free Software Foundation, Inc. +# Copyright (C) 2010-2013 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 7e65af34..6a4641fa 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-2012 Free Software Foundation, Inc. + 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 @@ -36,6 +36,7 @@ main (void) ASSERT (errno == EBADF); } { + close (99); errno = 0; ASSERT (faccessat (99, "foo", F_OK, 0) == -1); ASSERT (errno == EBADF); diff --git a/gnulib-tests/test-fadvise.c b/gnulib-tests/test-fadvise.c index e2b19f68..05860b0a 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-2012 Free Software Foundation, Inc. + Copyright (C) 2010-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 diff --git a/gnulib-tests/test-fchdir.c b/gnulib-tests/test-fchdir.c index b66667fc..7ffc71ba 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-2012 Free Software Foundation, Inc. + 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 @@ -51,6 +51,7 @@ main (void) ASSERT (errno == EBADF); } { + close (99); errno = 0; ASSERT (fchdir (99) == -1); ASSERT (errno == EBADF); diff --git a/gnulib-tests/test-fchmodat.c b/gnulib-tests/test-fchmodat.c index e24f033a..082f2b48 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-2012 Free Software Foundation, Inc. + 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 @@ -22,6 +22,7 @@ SIGNATURE_CHECK (fchmodat, int, (int, const char *, mode_t, int)); #include <errno.h> +#include <unistd.h> #include "macros.h" @@ -35,6 +36,7 @@ main (void) ASSERT (errno == EBADF); } { + close (99); errno = 0; ASSERT (fchmodat (99, "foo", 0600, 0) == -1); ASSERT (errno == EBADF); diff --git a/gnulib-tests/test-fchownat.c b/gnulib-tests/test-fchownat.c index 935c8ca1..c10651be 100644 --- a/gnulib-tests/test-fchownat.c +++ b/gnulib-tests/test-fchownat.c @@ -1,5 +1,5 @@ /* Tests of fchownat. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 @@ -76,6 +76,7 @@ main (int argc _GL_UNUSED, char *argv[]) ASSERT (errno == EBADF); } { + close (99); errno = 0; ASSERT (fchownat (99, "foo", getuid (), getgid (), 0) == -1); ASSERT (errno == EBADF); diff --git a/gnulib-tests/test-fclose.c b/gnulib-tests/test-fclose.c index 4885159b..3fbecf12 100644 --- a/gnulib-tests/test-fclose.c +++ b/gnulib-tests/test-fclose.c @@ -1,5 +1,5 @@ /* Test of fclose module. - Copyright (C) 2011-2012 Free Software Foundation, Inc. + 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 @@ -96,7 +96,9 @@ main (int argc, char **argv) } } { - FILE *fp = fdopen (99, "r"); + FILE *fp; + close (99); + fp = fdopen (99, "r"); if (fp != NULL) { errno = 0; diff --git a/gnulib-tests/test-fcntl-h.c b/gnulib-tests/test-fcntl-h.c index 00c5468d..e30ff19b 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-2012 Free Software Foundation, Inc. + Copyright (C) 2007, 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 @@ -21,9 +21,9 @@ #include <fcntl.h> /* Check that the various O_* macros are defined. */ -int o = O_DIRECT | O_DIRECTORY | O_DSYNC | O_NDELAY | O_NOATIME | O_NONBLOCK - | O_NOCTTY | O_NOFOLLOW | O_NOLINKS | O_RSYNC | O_SYNC | O_TTY_INIT - | O_BINARY | O_TEXT; +int o = (O_DIRECT | O_DIRECTORY | O_DSYNC | O_IGNORE_CTTY | O_NDELAY | O_NOATIME + | O_NONBLOCK | O_NOCTTY | O_NOFOLLOW | O_NOLINK | O_NOLINKS | O_NOTRANS + | O_RSYNC | O_SYNC | O_TTY_INIT | O_BINARY | O_TEXT); /* Check that the various SEEK_* macros are defined. */ int sk[] = { SEEK_CUR, SEEK_END, SEEK_SET }; @@ -61,7 +61,7 @@ main (void) #if O_SEARCH && O_EXEC != O_SEARCH && O_SEARCH != O_RDONLY case O_SEARCH: #endif - i = O_ACCMODE == (O_RDONLY | O_WRONLY | O_RDWR | O_EXEC | O_SEARCH); + i = ! (~O_ACCMODE & (O_RDONLY | O_WRONLY | O_RDWR | O_EXEC | O_SEARCH)); break; /* Everyone should have these */ @@ -84,6 +84,9 @@ main (void) #if O_DSYNC case O_DSYNC: #endif +#if O_IGNORE_CTTY + case O_IGNORE_CTTY: +#endif #if O_NOATIME case O_NOATIME: #endif @@ -96,9 +99,15 @@ main (void) #if O_NOFOLLOW case O_NOFOLLOW: #endif +#if O_NOLINK + case O_NOLINK: +#endif #if O_NOLINKS case O_NOLINKS: #endif +#if O_NOTRANS + case O_NOTRANS: +#endif #if O_RSYNC && O_RSYNC != O_DSYNC case O_RSYNC: #endif diff --git a/gnulib-tests/test-fcntl-safer.c b/gnulib-tests/test-fcntl-safer.c index 50d54d2a..c5f48f1e 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-fcntl.c b/gnulib-tests/test-fcntl.c index 78688abf..67d1b41d 100644 --- a/gnulib-tests/test-fcntl.c +++ b/gnulib-tests/test-fcntl.c @@ -1,5 +1,5 @@ /* Test of fcntl(2). - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-fdatasync.c b/gnulib-tests/test-fdatasync.c index 2c348d7a..697701a2 100644 --- a/gnulib-tests/test-fdatasync.c +++ b/gnulib-tests/test-fdatasync.c @@ -1,5 +1,5 @@ /* Test of fdatasync() function. - Copyright (C) 2008-2012 Free Software Foundation, Inc. + 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 @@ -38,7 +38,7 @@ main (void) if (fdatasync (fd) != 0) { ASSERT (errno == EINVAL /* POSIX */ - || errno == ENOTSUP /* seen on MacOS X 10.5 */ + || errno == ENOTSUP /* seen on Mac OS X 10.5 */ || errno == EBADF /* seen on AIX 7.1 */ || errno == EIO /* seen on mingw */ ); @@ -51,6 +51,7 @@ main (void) ASSERT (errno == EBADF); } { + close (99); errno = 0; ASSERT (fdatasync (99) == -1); ASSERT (errno == EBADF); diff --git a/gnulib-tests/test-fdopen.c b/gnulib-tests/test-fdopen.c index 8e2f7bfe..671c5e3d 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-2012 Free Software Foundation, Inc. + 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 @@ -22,6 +22,7 @@ SIGNATURE_CHECK (fdopen, FILE *, (int, const char *)); #include <errno.h> +#include <unistd.h> #include "macros.h" @@ -42,6 +43,7 @@ main (void) { FILE *fp; + close (99); errno = 0; fp = fdopen (99, "r"); if (fp == NULL) diff --git a/gnulib-tests/test-fdopendir.c b/gnulib-tests/test-fdopendir.c index 69a991a5..a9e2a931 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-2012 Free Software Foundation, Inc. + 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 @@ -54,6 +54,7 @@ main (int argc _GL_UNUSED, char *argv[]) ASSERT (errno == EBADF); } { + close (99); errno = 0; ASSERT (fdopendir (99) == NULL); ASSERT (errno == EBADF); diff --git a/gnulib-tests/test-fdutimensat.c b/gnulib-tests/test-fdutimensat.c index 96d1954e..a50954d4 100644 --- a/gnulib-tests/test-fdutimensat.c +++ b/gnulib-tests/test-fdutimensat.c @@ -1,5 +1,5 @@ /* Tests of fdutimensat. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-fflush.c b/gnulib-tests/test-fflush.c index 05313ebd..1c61140b 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-2012 Free Software Foundation, Inc. + Copyright (C) 2007, 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 @@ -172,7 +172,9 @@ main (void) } } { - FILE *fp = fdopen (99, "w"); + FILE *fp; + close (99); + fp = fdopen (99, "w"); if (fp != NULL) { fputc ('x', fp); diff --git a/gnulib-tests/test-fflush2.c b/gnulib-tests/test-fflush2.c index 3159d9cc..90684b20 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-fgetc.c b/gnulib-tests/test-fgetc.c index f7ebbc6a..b4a617aa 100644 --- a/gnulib-tests/test-fgetc.c +++ b/gnulib-tests/test-fgetc.c @@ -1,5 +1,5 @@ /* Test of fgetc() function. - Copyright (C) 2011-2012 Free Software Foundation, Inc. + 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 @@ -77,7 +77,9 @@ main (int argc, char **argv) } } { - FILE *fp = fdopen (99, "r"); + FILE *fp; + close (99); + fp = fdopen (99, "r"); if (fp != NULL) { errno = 0; diff --git a/gnulib-tests/test-file-has-acl.c b/gnulib-tests/test-file-has-acl.c index 7afd3bb2..a9bfd50c 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-file-has-acl.sh b/gnulib-tests/test-file-has-acl.sh index aa608a1e..26610c1e 100755 --- a/gnulib-tests/test-file-has-acl.sh +++ b/gnulib-tests/test-file-has-acl.sh @@ -111,7 +111,7 @@ cd "$builddir" || acl_flavor=aix else if (fsaclctl -v >/dev/null) 2>/dev/null; then - # MacOS X. + # Mac OS X. acl_flavor=macosx else if test -f /sbin/chacl; then diff --git a/gnulib-tests/test-filenamecat.c b/gnulib-tests/test-filenamecat.c index cbe6b6fe..2d29cd43 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-2012 Free Software Foundation, Inc. + Copyright (C) 1996-2007, 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 diff --git a/gnulib-tests/test-filevercmp.c b/gnulib-tests/test-filevercmp.c index 8b1159d2..0b348765 100644 --- a/gnulib-tests/test-filevercmp.c +++ b/gnulib-tests/test-filevercmp.c @@ -1,5 +1,5 @@ /* Test of filevercmp() function. - Copyright (C) 2008-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-float.c b/gnulib-tests/test-float.c index f3691be5..7d3142fb 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-fnmatch.c b/gnulib-tests/test-fnmatch.c index 9dd06933..71304a49 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-fopen-safer.c b/gnulib-tests/test-fopen-safer.c index 9f1b68c0..4174ed08 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-fopen.c b/gnulib-tests/test-fopen.c index 9c3b75ee..6488e85e 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-fopen.h b/gnulib-tests/test-fopen.h index aa31ee92..e1e7e17c 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-fpending.c b/gnulib-tests/test-fpending.c index f4a231c9..ca835d2f 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-2012 Free Software Foundation, Inc. + Copyright (C) 2004, 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 diff --git a/gnulib-tests/test-fprintf-posix.h b/gnulib-tests/test-fprintf-posix.h index 561c69fd..a5b72c78 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-fpurge.c b/gnulib-tests/test-fpurge.c index 578e74a2..da8ddf09 100644 --- a/gnulib-tests/test-fpurge.c +++ b/gnulib-tests/test-fpurge.c @@ -1,5 +1,5 @@ /* Test of fpurge() function. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-fputc.c b/gnulib-tests/test-fputc.c index fd92ae8a..e05f641e 100644 --- a/gnulib-tests/test-fputc.c +++ b/gnulib-tests/test-fputc.c @@ -1,5 +1,5 @@ /* Test of fputc() function. - Copyright (C) 2011-2012 Free Software Foundation, Inc. + 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 @@ -70,7 +70,9 @@ main (int argc, char **argv) } } { - FILE *fp = fdopen (99, "w"); + FILE *fp; + close (99); + fp = fdopen (99, "w"); if (fp != NULL) { setvbuf (fp, NULL, _IONBF, 0); diff --git a/gnulib-tests/test-fread.c b/gnulib-tests/test-fread.c index 792299bc..a807e0a8 100644 --- a/gnulib-tests/test-fread.c +++ b/gnulib-tests/test-fread.c @@ -1,5 +1,5 @@ /* Test of fread() function. - Copyright (C) 2011-2012 Free Software Foundation, Inc. + 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 @@ -79,7 +79,9 @@ main (int argc, char **argv) } } { - FILE *fp = fdopen (99, "r"); + FILE *fp; + close (99); + fp = fdopen (99, "r"); if (fp != NULL) { char buf[1]; diff --git a/gnulib-tests/test-freadahead.c b/gnulib-tests/test-freadahead.c index 2cf1d73a..121990db 100644 --- a/gnulib-tests/test-freadahead.c +++ b/gnulib-tests/test-freadahead.c @@ -1,5 +1,5 @@ /* Test of freadahead() function. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-freading.c b/gnulib-tests/test-freading.c index af4a03b7..ee1556cc 100644 --- a/gnulib-tests/test-freading.c +++ b/gnulib-tests/test-freading.c @@ -1,5 +1,5 @@ /* Test of freading() function. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-freadptr.c b/gnulib-tests/test-freadptr.c index 03fa7eac..8d496bce 100644 --- a/gnulib-tests/test-freadptr.c +++ b/gnulib-tests/test-freadptr.c @@ -1,5 +1,5 @@ /* Test of freadptr() function. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-freadptr2.c b/gnulib-tests/test-freadptr2.c index 0ddb2cc4..0b0e2384 100644 --- a/gnulib-tests/test-freadptr2.c +++ b/gnulib-tests/test-freadptr2.c @@ -1,5 +1,5 @@ /* Test of freadptr() function. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-freadseek.c b/gnulib-tests/test-freadseek.c index a9346df4..92fd32ca 100644 --- a/gnulib-tests/test-freadseek.c +++ b/gnulib-tests/test-freadseek.c @@ -1,5 +1,5 @@ /* Test of freadseek() function. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-freopen-safer.c b/gnulib-tests/test-freopen-safer.c index 030f112c..5d658f78 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-freopen.c b/gnulib-tests/test-freopen.c index 747d315f..4b54d8d5 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 @@ -62,7 +62,9 @@ main () } } { - FILE *fp = fdopen (99, "w+"); + FILE *fp; + close (99); + fp = fdopen (99, "w+"); if (fp != NULL) { errno = 0; diff --git a/gnulib-tests/test-frexp.c b/gnulib-tests/test-frexp.c index 2b6a9fbf..6e3e0009 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-frexp.h b/gnulib-tests/test-frexp.h index 71001df4..e50be148 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 Free Software Foundation, Inc. + Copyright (C) 2012-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 diff --git a/gnulib-tests/test-frexpl.c b/gnulib-tests/test-frexpl.c index c5e07b25..5a5eae52 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-fseek.c b/gnulib-tests/test-fseek.c index 1dc03c53..1b47a8f7 100644 --- a/gnulib-tests/test-fseek.c +++ b/gnulib-tests/test-fseek.c @@ -1,5 +1,5 @@ /* Test of fseek() function. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-fseeko.c b/gnulib-tests/test-fseeko.c index d2b348e1..cadbc65f 100644 --- a/gnulib-tests/test-fseeko.c +++ b/gnulib-tests/test-fseeko.c @@ -1,5 +1,5 @@ /* Test of fseeko() function. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-fseeko3.c b/gnulib-tests/test-fseeko3.c index ffeb50f8..bd0b13a8 100644 --- a/gnulib-tests/test-fseeko3.c +++ b/gnulib-tests/test-fseeko3.c @@ -1,5 +1,5 @@ /* Test of fseeko() function. - Copyright (C) 2011-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-fseeko4.c b/gnulib-tests/test-fseeko4.c index 3642d3cb..8d6d58a4 100644 --- a/gnulib-tests/test-fseeko4.c +++ b/gnulib-tests/test-fseeko4.c @@ -1,5 +1,5 @@ /* Test of fseeko() function. - Copyright (C) 2011-2012 Free Software Foundation, Inc. + 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 @@ -57,7 +57,9 @@ main (int argc, char **argv) } } { - FILE *fp = fdopen (99, "w"); + FILE *fp; + close (99); + fp = fdopen (99, "w"); if (fp != NULL) { errno = 0; diff --git a/gnulib-tests/test-fseterr.c b/gnulib-tests/test-fseterr.c index 611b0e42..7390b466 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-2012 Free Software Foundation, Inc. + Copyright (C) 2007, 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 diff --git a/gnulib-tests/test-fstat.c b/gnulib-tests/test-fstat.c index 7f3c3c46..8ce15277 100644 --- a/gnulib-tests/test-fstat.c +++ b/gnulib-tests/test-fstat.c @@ -1,5 +1,5 @@ /* Tests of fstat() function. - Copyright (C) 2011-2012 Free Software Foundation, Inc. + 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 @@ -22,6 +22,7 @@ SIGNATURE_CHECK (fstat, int, (int, struct stat *)); #include <errno.h> +#include <unistd.h> #include "macros.h" @@ -39,6 +40,7 @@ main (int argc, char *argv[]) { struct stat statbuf; + close (99); errno = 0; ASSERT (fstat (99, &statbuf) == -1); ASSERT (errno == EBADF); diff --git a/gnulib-tests/test-fstatat.c b/gnulib-tests/test-fstatat.c index a128c876..9fdbe2e6 100644 --- a/gnulib-tests/test-fstatat.c +++ b/gnulib-tests/test-fstatat.c @@ -1,5 +1,5 @@ /* Tests of fstatat. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 @@ -36,7 +36,9 @@ SIGNATURE_CHECK (fstatat, int, (int, char const *, struct stat *, int)); #include "ignore-value.h" #include "macros.h" -#define BASE "test-fstatat.t" +#ifndef BASE +# define BASE "test-fstatat.t" +#endif #include "test-lstat.h" #include "test-stat.h" @@ -47,14 +49,22 @@ static int dfd = AT_FDCWD; static int do_stat (char const *name, struct stat *st) { +#ifdef TEST_STATAT return statat (dfd, name, st); +#else + return fstatat (dfd, name, st, 0); +#endif } /* Wrapper around fstatat to test lstat behavior. */ static int do_lstat (char const *name, struct stat *st) { +#ifdef TEST_STATAT return lstatat (dfd, name, st); +#else + return fstatat (dfd, name, st, AT_SYMLINK_NOFOLLOW); +#endif } int @@ -78,6 +88,7 @@ main (int argc _GL_UNUSED, char *argv[]) { struct stat statbuf; + close (99); errno = 0; ASSERT (fstatat (99, "foo", &statbuf, 0) == -1); ASSERT (errno == EBADF); diff --git a/gnulib-tests/test-fsync.c b/gnulib-tests/test-fsync.c index 725c666b..d21d3615 100644 --- a/gnulib-tests/test-fsync.c +++ b/gnulib-tests/test-fsync.c @@ -1,5 +1,5 @@ /* Test of fsync() function. - Copyright (C) 2008-2012 Free Software Foundation, Inc. + 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 @@ -38,7 +38,7 @@ main (void) if (fsync (fd) != 0) { ASSERT (errno == EINVAL /* POSIX */ - || errno == ENOTSUP /* seen on MacOS X 10.5 */ + || errno == ENOTSUP /* seen on Mac OS X 10.5 */ || errno == EBADF /* seen on AIX 7.1 */ || errno == EIO /* seen on mingw */ ); @@ -51,6 +51,7 @@ main (void) ASSERT (errno == EBADF); } { + close (99); errno = 0; ASSERT (fsync (99) == -1); ASSERT (errno == EBADF); diff --git a/gnulib-tests/test-ftell.c b/gnulib-tests/test-ftell.c index 08c76aa9..d30c4920 100644 --- a/gnulib-tests/test-ftell.c +++ b/gnulib-tests/test-ftell.c @@ -1,5 +1,5 @@ /* Test of ftell() function. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-ftell3.c b/gnulib-tests/test-ftell3.c index 9d225a37..17968e35 100644 --- a/gnulib-tests/test-ftell3.c +++ b/gnulib-tests/test-ftell3.c @@ -1,5 +1,5 @@ /* Test of ftell() function. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-ftello.c b/gnulib-tests/test-ftello.c index 5df97cf4..e5a2b25a 100644 --- a/gnulib-tests/test-ftello.c +++ b/gnulib-tests/test-ftello.c @@ -1,5 +1,5 @@ /* Test of ftello() function. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-ftello3.c b/gnulib-tests/test-ftello3.c index 6908adde..a7714300 100644 --- a/gnulib-tests/test-ftello3.c +++ b/gnulib-tests/test-ftello3.c @@ -1,5 +1,5 @@ /* Test of ftello() function. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-ftello4.c b/gnulib-tests/test-ftello4.c index 7c46d0c2..b8cd679a 100644 --- a/gnulib-tests/test-ftello4.c +++ b/gnulib-tests/test-ftello4.c @@ -1,5 +1,5 @@ /* Test of ftello() function. - Copyright (C) 2011-2012 Free Software Foundation, Inc. + 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 @@ -54,7 +54,9 @@ main (int argc, char **argv) } } { - FILE *fp = fdopen (99, "w"); + FILE *fp; + close (99); + fp = fdopen (99, "w"); if (fp != NULL) { errno = 0; diff --git a/gnulib-tests/test-ftruncate.c b/gnulib-tests/test-ftruncate.c index 9a85314a..8b795a87 100644 --- a/gnulib-tests/test-ftruncate.c +++ b/gnulib-tests/test-ftruncate.c @@ -1,5 +1,5 @@ /* Test truncating a file. - Copyright (C) 2011-2012 Free Software Foundation, Inc. + 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 @@ -38,6 +38,7 @@ main (int argc, char *argv[]) ASSERT (errno == EBADF); } { + close (99); errno = 0; ASSERT (ftruncate (99, 0) == -1); ASSERT (errno == EBADF); diff --git a/gnulib-tests/test-futimens.c b/gnulib-tests/test-futimens.c index 3c1f7da6..adaaa083 100644 --- a/gnulib-tests/test-futimens.c +++ b/gnulib-tests/test-futimens.c @@ -1,5 +1,5 @@ /* Tests of futimens. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-futimens.h b/gnulib-tests/test-futimens.h index 55e3db57..96eca517 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-2012 Free Software Foundation, Inc. + 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 @@ -83,6 +83,7 @@ test_futimens (int (*func) (int, struct timespec const *), ASSERT (errno == EBADF); } { + close (99); errno = 0; ASSERT (func (99, NULL) == -1); ASSERT (errno == EBADF); diff --git a/gnulib-tests/test-fwrite.c b/gnulib-tests/test-fwrite.c index 1f3a66d1..ef72338d 100644 --- a/gnulib-tests/test-fwrite.c +++ b/gnulib-tests/test-fwrite.c @@ -1,5 +1,5 @@ /* Test of fwrite() function. - Copyright (C) 2011-2012 Free Software Foundation, Inc. + 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 @@ -72,7 +72,9 @@ main (int argc, char **argv) } } { - FILE *fp = fdopen (99, "w"); + FILE *fp; + close (99); + fp = fdopen (99, "w"); if (fp != NULL) { char buf[5] = "world"; diff --git a/gnulib-tests/test-getaddrinfo.c b/gnulib-tests/test-getaddrinfo.c index 51231960..1b9892f4 100644 --- a/gnulib-tests/test-getaddrinfo.c +++ b/gnulib-tests/test-getaddrinfo.c @@ -1,6 +1,6 @@ /* Test the getaddrinfo module. - Copyright (C) 2006-2012 Free Software Foundation, Inc. + Copyright (C) 2006-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 diff --git a/gnulib-tests/test-getcwd-lgpl.c b/gnulib-tests/test-getcwd-lgpl.c index 3010760b..e3e7b7a7 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-getcwd.c b/gnulib-tests/test-getcwd.c index 648b1853..810b4766 100644 --- a/gnulib-tests/test-getcwd.c +++ b/gnulib-tests/test-getcwd.c @@ -1,5 +1,5 @@ /* Test of getcwd() function. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 @@ -38,23 +38,29 @@ trigger a bug in glibc's getcwd implementation before 2.4.90-10. */ #define TARGET_LEN (5 * 1024) +#if defined HAVE_OPENAT || (defined GNULIB_OPENAT && defined HAVE_FDOPENDIR) +# define HAVE_OPENAT_SUPPORT 1 +#else +# define HAVE_OPENAT_SUPPORT 0 +#endif + /* Keep this test in sync with m4/getcwd-abort-bug.m4. */ static int test_abort_bug (void) { - char const *dir_name = "confdir-14B---"; char *cwd; size_t initial_cwd_len; int fail = 0; - size_t desired_depth; - size_t d; -#ifdef PATH_MAX /* The bug is triggered when PATH_MAX < getpagesize (), so skip this relatively expensive and invasive test if that's not true. */ - if (getpagesize () <= PATH_MAX) - return 0; +#ifdef PATH_MAX + int bug_possible = PATH_MAX < getpagesize (); +#else + int bug_possible = 0; #endif + if (! bug_possible) + return 0; cwd = getcwd (NULL, 0); if (cwd == NULL) @@ -62,36 +68,43 @@ test_abort_bug (void) initial_cwd_len = strlen (cwd); free (cwd); - desired_depth = ((TARGET_LEN - 1 - initial_cwd_len) - / (1 + strlen (dir_name))); - for (d = 0; d < desired_depth; d++) + + if (HAVE_OPENAT_SUPPORT) { - if (mkdir (dir_name, S_IRWXU) < 0 || chdir (dir_name) < 0) + static char const dir_name[] = "confdir-14B---"; + size_t desired_depth = ((TARGET_LEN - 1 - initial_cwd_len) + / sizeof dir_name); + size_t d; + for (d = 0; d < desired_depth; d++) { - if (! (errno == ERANGE || errno == ENAMETOOLONG || errno == ENOENT)) - fail = 3; /* Unable to construct deep hierarchy. */ - break; + if (mkdir (dir_name, S_IRWXU) < 0 || chdir (dir_name) < 0) + { + if (! (errno == ERANGE || errno == ENAMETOOLONG + || errno == ENOENT)) + fail = 3; /* Unable to construct deep hierarchy. */ + break; + } } - } - /* If libc has the bug in question, this invocation of getcwd - results in a failed assertion. */ - cwd = getcwd (NULL, 0); - if (cwd == NULL) - fail = 4; /* getcwd didn't assert, but it failed for a long name - where the answer could have been learned. */ - free (cwd); + /* If libc has the bug in question, this invocation of getcwd + results in a failed assertion. */ + cwd = getcwd (NULL, 0); + if (cwd == NULL) + fail = 4; /* getcwd didn't assert, but it failed for a long name + where the answer could have been learned. */ + free (cwd); - /* Call rmdir first, in case the above chdir failed. */ - rmdir (dir_name); - while (0 < d--) - { - if (chdir ("..") < 0) + /* Call rmdir first, in case the above chdir failed. */ + rmdir (dir_name); + while (0 < d--) { - fail = 5; - break; + if (chdir ("..") < 0) + { + fail = 5; + break; + } + rmdir (dir_name); } - rmdir (dir_name); } return fail; diff --git a/gnulib-tests/test-getdelim.c b/gnulib-tests/test-getdelim.c index daea6465..6e959186 100644 --- a/gnulib-tests/test-getdelim.c +++ b/gnulib-tests/test-getdelim.c @@ -1,5 +1,5 @@ /* Test of getdelim() function. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-getdtablesize.c b/gnulib-tests/test-getdtablesize.c index fcf220b2..7046481b 100644 --- a/gnulib-tests/test-getdtablesize.c +++ b/gnulib-tests/test-getdtablesize.c @@ -1,5 +1,5 @@ /* Test of getdtablesize() function. - Copyright (C) 2008-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-getgroups.c b/gnulib-tests/test-getgroups.c index dddd38df..f197cd90 100644 --- a/gnulib-tests/test-getgroups.c +++ b/gnulib-tests/test-getgroups.c @@ -1,5 +1,5 @@ /* Tests of getgroups. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-gethostname.c b/gnulib-tests/test-gethostname.c index 2dd40bbb..b4b3bf08 100644 --- a/gnulib-tests/test-gethostname.c +++ b/gnulib-tests/test-gethostname.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008-2012 Free Software Foundation, Inc. + * Copyright (C) 2008-2013 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 ede1b854..134e320a 100644 --- a/gnulib-tests/test-getline.c +++ b/gnulib-tests/test-getline.c @@ -1,5 +1,5 @@ /* Test of getline() function. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-getloadavg.c b/gnulib-tests/test-getloadavg.c index 39a83754..c27eb2d7 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-getlogin.c b/gnulib-tests/test-getlogin.c index 449ceaa2..54e48e9d 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-2012 Free Software Foundation, Inc. + Copyright (C) 2010-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 @@ -39,9 +39,17 @@ main (void) buf = getlogin (); if (buf == NULL) { + if (errno == ENOENT) + { + /* This can happen on GNU/Linux. */ + fprintf (stderr, "Skipping test: no entry in utmp file.\n"); + return 77; + } + /* getlogin() fails when stdin is not connected to a tty. */ ASSERT (errno == ENOTTY || errno == EINVAL /* seen on Linux/SPARC */ + || errno == ENXIO ); #if !defined __hpux /* On HP-UX 11.11 it fails anyway. */ ASSERT (! isatty (0)); diff --git a/gnulib-tests/test-getndelim2.c b/gnulib-tests/test-getndelim2.c index bfecc40d..8baf1ae5 100644 --- a/gnulib-tests/test-getndelim2.c +++ b/gnulib-tests/test-getndelim2.c @@ -1,5 +1,5 @@ /* Test of getndelim2() function. - Copyright (C) 2008-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-getopt.c b/gnulib-tests/test-getopt.c index e08a834c..7caf0273 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-getopt.h b/gnulib-tests/test-getopt.h index 978b753c..450cf0d3 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-getopt_long.h b/gnulib-tests/test-getopt_long.h index 9d55c653..345a796a 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-gettimeofday.c b/gnulib-tests/test-gettimeofday.c index 4a9d2640..2c608769 100644 --- a/gnulib-tests/test-gettimeofday.c +++ b/gnulib-tests/test-gettimeofday.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005, 2007, 2009-2012 Free Software Foundation, Inc. + * Copyright (C) 2005, 2007, 2009-2013 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 f64cfdd4..57c094cc 100644 --- a/gnulib-tests/test-hash.c +++ b/gnulib-tests/test-hash.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2012 Free Software Foundation, Inc. + * Copyright (C) 2009-2013 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 7b7946b2..a971e550 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-2012 Free Software Foundation, Inc. + Copyright (C) 2006-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 diff --git a/gnulib-tests/test-iconv-h.c b/gnulib-tests/test-iconv-h.c index bc2bfb8f..7132b330 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-iconv.c b/gnulib-tests/test-iconv.c index 333af2a9..a39ca588 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-ignore-value.c b/gnulib-tests/test-ignore-value.c index f036134c..cb4cf145 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-inet_ntop.c b/gnulib-tests/test-inet_ntop.c index 34de5f60..1a916e5e 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-inet_pton.c b/gnulib-tests/test-inet_pton.c index 844908c7..e8e1fb26 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-init.sh b/gnulib-tests/test-init.sh index a2825cc7..6eb6b439 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-2012 Free Software Foundation, Inc. +# Copyright (C) 2011-2013 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 26ab4c62..7fea57fb 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-2012 Free Software Foundation, Inc. + Copyright (C) 2010-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 diff --git a/gnulib-tests/test-intprops.c b/gnulib-tests/test-intprops.c index aeb11681..8b91a790 100644 --- a/gnulib-tests/test-intprops.c +++ b/gnulib-tests/test-intprops.c @@ -1,5 +1,5 @@ /* Test intprops.h. - Copyright (C) 2011-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-inttostr.c b/gnulib-tests/test-inttostr.c index 3039ec32..8f21a1c3 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-2012 Free Software Foundation, Inc. + Copyright (C) 2010-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 diff --git a/gnulib-tests/test-inttypes.c b/gnulib-tests/test-inttypes.c index 698d3dc8..db1a97e4 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-2012 Free Software Foundation, Inc. + Copyright (C) 2006-2007, 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 diff --git a/gnulib-tests/test-ioctl.c b/gnulib-tests/test-ioctl.c index c3aadce8..489bccc3 100644 --- a/gnulib-tests/test-ioctl.c +++ b/gnulib-tests/test-ioctl.c @@ -1,5 +1,5 @@ /* Test of ioctl() function. - Copyright (C) 2011-2012 Free Software Foundation, Inc. + 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 @@ -23,6 +23,7 @@ SIGNATURE_CHECK (ioctl, int, (int, int, ...)); #include <errno.h> +#include <unistd.h> #include "macros.h" @@ -39,6 +40,7 @@ main (void) } { int value; + close (99); errno = 0; ASSERT (ioctl (99, FIONREAD, &value) == -1); ASSERT (errno == EBADF); diff --git a/gnulib-tests/test-isatty.c b/gnulib-tests/test-isatty.c index 263e05ed..8441ff8a 100644 --- a/gnulib-tests/test-isatty.c +++ b/gnulib-tests/test-isatty.c @@ -1,5 +1,5 @@ /* Test isatty() function. - Copyright (C) 2011-2012 Free Software Foundation, Inc. + 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 @@ -45,14 +45,15 @@ main (void) errno = 0; ASSERT (isatty (-1) == 0); ASSERT (errno == EBADF - || errno == 0 /* seen on Solaris 10 */ + || errno == 0 /* seen on IRIX 6.5, Solaris 10 */ ); } { + close (99); errno = 0; ASSERT (isatty (99) == 0); ASSERT (errno == EBADF - || errno == 0 /* seen on Solaris 10 */ + || errno == 0 /* seen on IRIX 6.5, Solaris 10 */ ); } diff --git a/gnulib-tests/test-isblank.c b/gnulib-tests/test-isblank.c index 878ee42d..21c9a43a 100644 --- a/gnulib-tests/test-isblank.c +++ b/gnulib-tests/test-isblank.c @@ -1,5 +1,5 @@ /* Test of isblank() function. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-isnand-nolibm.c b/gnulib-tests/test-isnand-nolibm.c index aa058b03..2d57d079 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-isnand.h b/gnulib-tests/test-isnand.h index 52d35bf4..7ea72e98 100644 --- a/gnulib-tests/test-isnand.h +++ b/gnulib-tests/test-isnand.h @@ -1,5 +1,5 @@ /* Test of isnand() substitute. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-isnanf-nolibm.c b/gnulib-tests/test-isnanf-nolibm.c index cef99250..924dccb3 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-isnanf.h b/gnulib-tests/test-isnanf.h index 10adf302..60499b57 100644 --- a/gnulib-tests/test-isnanf.h +++ b/gnulib-tests/test-isnanf.h @@ -1,5 +1,5 @@ /* Test of isnanf() substitute. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-isnanl-nolibm.c b/gnulib-tests/test-isnanl-nolibm.c index 96159f82..8f44de2f 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-2012 Free Software Foundation, Inc. + Copyright (C) 2007, 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 diff --git a/gnulib-tests/test-isnanl.h b/gnulib-tests/test-isnanl.h index 8a9e684f..06e6a7ce 100644 --- a/gnulib-tests/test-isnanl.h +++ b/gnulib-tests/test-isnanl.h @@ -1,5 +1,5 @@ /* Test of isnanl() substitute. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-iswblank.c b/gnulib-tests/test-iswblank.c index 10b890f6..58054257 100644 --- a/gnulib-tests/test-iswblank.c +++ b/gnulib-tests/test-iswblank.c @@ -1,5 +1,5 @@ /* Test of iswblank() function. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-langinfo.c b/gnulib-tests/test-langinfo.c index 02b46370..44e931ec 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-lchown.c b/gnulib-tests/test-lchown.c index 2f678738..416edeb3 100644 --- a/gnulib-tests/test-lchown.c +++ b/gnulib-tests/test-lchown.c @@ -1,5 +1,5 @@ /* Tests of lchown. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-lchown.h b/gnulib-tests/test-lchown.h index 197e30bf..d4e66e7a 100644 --- a/gnulib-tests/test-lchown.h +++ b/gnulib-tests/test-lchown.h @@ -1,5 +1,5 @@ /* Tests of lchown. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-link.c b/gnulib-tests/test-link.c index 4cc3cc43..934dddb4 100644 --- a/gnulib-tests/test-link.c +++ b/gnulib-tests/test-link.c @@ -1,5 +1,5 @@ /* Test of link() function. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-link.h b/gnulib-tests/test-link.h index 45a75c70..d546d564 100644 --- a/gnulib-tests/test-link.h +++ b/gnulib-tests/test-link.h @@ -1,5 +1,5 @@ /* Test of link() function. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-linkat.c b/gnulib-tests/test-linkat.c index 9a8c2a77..6d55f103 100644 --- a/gnulib-tests/test-linkat.c +++ b/gnulib-tests/test-linkat.c @@ -1,5 +1,5 @@ /* Tests of linkat. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 @@ -102,6 +102,7 @@ main (void) ASSERT (errno == EBADF); } { + close (99); errno = 0; ASSERT (linkat (99, "foo", AT_FDCWD, "bar", 0) == -1); ASSERT (errno == EBADF); diff --git a/gnulib-tests/test-listen.c b/gnulib-tests/test-listen.c index b81558a5..206923fa 100644 --- a/gnulib-tests/test-listen.c +++ b/gnulib-tests/test-listen.c @@ -1,5 +1,5 @@ /* Test listen() function. - Copyright (C) 2011-2012 Free Software Foundation, Inc. + 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 @@ -22,6 +22,7 @@ SIGNATURE_CHECK (listen, int, (int, int)); #include <errno.h> +#include <unistd.h> #include "sockets.h" #include "macros.h" @@ -38,6 +39,7 @@ main (void) ASSERT (errno == EBADF); } { + close (99); errno = 0; ASSERT (listen (99 ,1) == -1); ASSERT (errno == EBADF); diff --git a/gnulib-tests/test-locale.c b/gnulib-tests/test-locale.c index e884ea10..3fb7b851 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-2012 Free Software Foundation, Inc. + Copyright (C) 2007, 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 diff --git a/gnulib-tests/test-localeconv.c b/gnulib-tests/test-localeconv.c index 9125800f..da3344f2 100644 --- a/gnulib-tests/test-localeconv.c +++ b/gnulib-tests/test-localeconv.c @@ -1,5 +1,5 @@ /* Test of localeconv() function. - Copyright (C) 2012 Free Software Foundation, Inc. + Copyright (C) 2012-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 @@ -37,13 +37,13 @@ main () ASSERT (STREQ (l->decimal_point, ".")); ASSERT (STREQ (l->thousands_sep, "")); -#if !defined __FreeBSD__ +#if !(defined __FreeBSD__ || defined __sun) ASSERT (STREQ (l->grouping, "")); #endif ASSERT (STREQ (l->mon_decimal_point, "")); ASSERT (STREQ (l->mon_thousands_sep, "")); -#if !defined __FreeBSD__ +#if !(defined __FreeBSD__ || defined __sun) ASSERT (STREQ (l->mon_grouping, "")); #endif ASSERT (STREQ (l->positive_sign, "")); diff --git a/gnulib-tests/test-localename.c b/gnulib-tests/test-localename.c index f04c3017..deb59b13 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 @@ -715,7 +715,7 @@ test_locale_name_default (void) ASSERT (name != NULL); - /* Only MacOS X and Windows have a facility for the user to set the default + /* Only Mac OS X and Windows have a facility for the user to set the default locale. */ #if !((defined __APPLE__ && defined __MACH__) || (defined _WIN32 || defined __WIN32__ || defined __CYGWIN__)) ASSERT (strcmp (name, "C") == 0); diff --git a/gnulib-tests/test-lock.c b/gnulib-tests/test-lock.c index 5cada7d9..57392dbb 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-2012 Free Software Foundation, Inc. + Copyright (C) 2005, 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 diff --git a/gnulib-tests/test-lseek.c b/gnulib-tests/test-lseek.c index 114b06e4..67d33413 100644 --- a/gnulib-tests/test-lseek.c +++ b/gnulib-tests/test-lseek.c @@ -1,5 +1,5 @@ /* Test of lseek() function. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 @@ -95,6 +95,7 @@ main (int argc, char **argv) ASSERT (lseek (-1, (off_t)0, SEEK_CUR) == -1); ASSERT (errno == EBADF); + close (99); errno = 0; ASSERT (lseek (99, (off_t)0, SEEK_CUR) == -1); ASSERT (errno == EBADF); diff --git a/gnulib-tests/test-lstat.c b/gnulib-tests/test-lstat.c index 459bf887..d520193f 100644 --- a/gnulib-tests/test-lstat.c +++ b/gnulib-tests/test-lstat.c @@ -1,5 +1,5 @@ /* Test of lstat() function. - Copyright (C) 2008-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-lstat.h b/gnulib-tests/test-lstat.h index 4a814946..b8f1767a 100644 --- a/gnulib-tests/test-lstat.h +++ b/gnulib-tests/test-lstat.h @@ -1,5 +1,5 @@ /* Test of lstat() function. - Copyright (C) 2008-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-lutimens.h b/gnulib-tests/test-lutimens.h index acff2d8f..9e597b6b 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-malloc-gnu.c b/gnulib-tests/test-malloc-gnu.c index 16b3a0a3..ca0eafa4 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-2012 Free Software Foundation, Inc. + Copyright (C) 2010-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 diff --git a/gnulib-tests/test-malloca.c b/gnulib-tests/test-malloca.c index d7732c32..7d5e62e8 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-2012 Free Software Foundation, Inc. + Copyright (C) 2005, 2007, 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 @@ -45,7 +45,7 @@ main () { /* Try various values. n = 0 gave a crash on Alpha with gcc-2.5.8. - Some versions of MacOS X have a stack size limit of 512 KB. */ + Some versions of Mac OS X have a stack size limit of 512 KB. */ func (34); func (134); func (399); diff --git a/gnulib-tests/test-math.c b/gnulib-tests/test-math.c index 1375e76a..f7d944cb 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-mbrtowc-w32.c b/gnulib-tests/test-mbrtowc-w32.c index 50006c0b..2125bdf5 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-mbrtowc.c b/gnulib-tests/test-mbrtowc.c index 02b78415..4d2d5cb1 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-mbsalign.c b/gnulib-tests/test-mbsalign.c index 86aa8773..d3e92daa 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-2012 Free Software Foundation, Inc. + Copyright (C) 2010-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 @@ -38,6 +38,35 @@ main (void) width = 4; n = mbsalign ("es", dest, sizeof dest, &width, MBS_ALIGN_CENTER, 0); ASSERT (*dest == ' ' && *(dest + n - 1) == ' '); + ASSERT (n == 4); + + /* Test center alignment, with no trailing padding. */ + width = 4; + n = mbsalign ("es", dest, sizeof dest, &width, MBS_ALIGN_CENTER, + MBA_NO_RIGHT_PAD); + ASSERT (n == 3); + ASSERT (*dest == ' ' && *(dest + n - 1) == 's'); + + /* Test left alignment, with no trailing padding. (truncate only). */ + width = 4; + n = mbsalign ("es", dest, sizeof dest, &width, MBS_ALIGN_LEFT, + MBA_NO_RIGHT_PAD); + ASSERT (n == 2); + ASSERT (*dest == 'e' && *(dest + n - 1) == 's'); + + /* Test center alignment, with no padding. (truncate only). */ + width = 4; + n = mbsalign ("es", dest, sizeof dest, &width, MBS_ALIGN_CENTER, + MBA_NO_LEFT_PAD | MBA_NO_RIGHT_PAD); + ASSERT (n == 2); + ASSERT (*dest == 'e' && *(dest + n - 1) == 's'); + + /* Test center alignment, with no left padding. (may be useful for RTL?) */ + width = 4; + n = mbsalign ("es", dest, sizeof dest, &width, MBS_ALIGN_CENTER, + MBA_NO_LEFT_PAD); + ASSERT (n == 3); + ASSERT (*dest == 'e' && *(dest + n - 1) == ' '); if (setlocale (LC_ALL, "en_US.UTF8")) { @@ -55,16 +84,19 @@ main (void) /* Test multibyte center alignment. */ width = 4; n = mbsalign ("és", dest, sizeof dest, &width, MBS_ALIGN_CENTER, 0); + ASSERT (n == 5); ASSERT (*dest == ' ' && *(dest + n - 1) == ' '); /* Test multibyte left alignment. */ width = 4; n = mbsalign ("és", dest, sizeof dest, &width, MBS_ALIGN_LEFT, 0); + ASSERT (n == 5); ASSERT (*(dest + n - 1) == ' ' && *(dest + n - 2) == ' '); /* Test multibyte right alignment. */ width = 4; n = mbsalign ("és", dest, sizeof dest, &width, MBS_ALIGN_RIGHT, 0); + ASSERT (n == 5); ASSERT (*(dest) == ' ' && *(dest + 1) == ' '); /* multibyte multicell truncation. */ @@ -94,6 +126,12 @@ main (void) n = mbsalign ("t\tés" /* 6 including NUL */ , dest, sizeof dest, &width, MBS_ALIGN_LEFT, 0); ASSERT (n == 7); + + /* Test forced unibyte truncation. */ + width = 4; + n = mbsalign ("t\tés", dest, sizeof dest, &width, MBS_ALIGN_LEFT, + MBA_UNIBYTE_ONLY); + ASSERT (n == 4); } return 0; diff --git a/gnulib-tests/test-mbscasecmp.c b/gnulib-tests/test-mbscasecmp.c index bcd0cc3f..d2d65d95 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-mbsinit.c b/gnulib-tests/test-mbsinit.c index dae75699..931f059a 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-mbsrtowcs.c b/gnulib-tests/test-mbsrtowcs.c index f93677e3..d48a30bc 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-mbsstr1.c b/gnulib-tests/test-mbsstr1.c index df25cec8..61d00327 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-mbsstr2.c b/gnulib-tests/test-mbsstr2.c index 229f5139..caccb422 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-mbsstr3.c b/gnulib-tests/test-mbsstr3.c index 5ada9a03..f5cfdde0 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-md5.c b/gnulib-tests/test-md5.c index bd71c6e8..970af0cf 100644 --- a/gnulib-tests/test-md5.c +++ b/gnulib-tests/test-md5.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005, 2009-2012 Free Software Foundation, Inc. + * Copyright (C) 2005, 2009-2013 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 b031bc0c..90ecb0b8 100644 --- a/gnulib-tests/test-memcasecmp.c +++ b/gnulib-tests/test-memcasecmp.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008-2012 Free Software Foundation, Inc. + * Copyright (C) 2008-2013 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 1298c272..0ca45895 100644 --- a/gnulib-tests/test-memchr.c +++ b/gnulib-tests/test-memchr.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008-2012 Free Software Foundation, Inc. + * 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 diff --git a/gnulib-tests/test-memchr2.c b/gnulib-tests/test-memchr2.c index c27fc1b0..d0f8125c 100644 --- a/gnulib-tests/test-memchr2.c +++ b/gnulib-tests/test-memchr2.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008-2012 Free Software Foundation, Inc. + * Copyright (C) 2008-2013 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 3dc0ec94..9ec2bf4e 100644 --- a/gnulib-tests/test-memcoll.c +++ b/gnulib-tests/test-memcoll.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008-2012 Free Software Foundation, Inc. + * Copyright (C) 2008-2013 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 42edac53..426228e0 100644 --- a/gnulib-tests/test-memrchr.c +++ b/gnulib-tests/test-memrchr.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008-2012 Free Software Foundation, Inc. + * 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 diff --git a/gnulib-tests/test-mkdir.c b/gnulib-tests/test-mkdir.c index 2828be2f..ea97aa0a 100644 --- a/gnulib-tests/test-mkdir.c +++ b/gnulib-tests/test-mkdir.c @@ -1,5 +1,5 @@ /* Tests of mkdir. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-mkdir.h b/gnulib-tests/test-mkdir.h index 81c0af56..1c5ba7de 100644 --- a/gnulib-tests/test-mkdir.h +++ b/gnulib-tests/test-mkdir.h @@ -1,5 +1,5 @@ /* Test of mkdir() function. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-mkfifo.c b/gnulib-tests/test-mkfifo.c index e605dbe9..d101b95d 100644 --- a/gnulib-tests/test-mkfifo.c +++ b/gnulib-tests/test-mkfifo.c @@ -1,5 +1,5 @@ /* Tests of mkfifo. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-mkfifo.h b/gnulib-tests/test-mkfifo.h index cefd0c40..5adbf08f 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-mknod.c b/gnulib-tests/test-mknod.c index ed97b45a..24ffae98 100644 --- a/gnulib-tests/test-mknod.c +++ b/gnulib-tests/test-mknod.c @@ -1,5 +1,5 @@ /* Tests of mknod. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-nanosleep.c b/gnulib-tests/test-nanosleep.c index ed53ee7d..0b62ae6b 100644 --- a/gnulib-tests/test-nanosleep.c +++ b/gnulib-tests/test-nanosleep.c @@ -1,5 +1,5 @@ /* Test of nanosleep() function. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-netdb.c b/gnulib-tests/test-netdb.c index 2312f3f9..ce5bbd06 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-2012 Free Software Foundation, Inc. + Copyright (C) 2007-2008, 2010-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 diff --git a/gnulib-tests/test-netinet_in.c b/gnulib-tests/test-netinet_in.c index d318e472..65fbf23c 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-2012 Free Software Foundation, Inc. + Copyright (C) 2007, 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 diff --git a/gnulib-tests/test-nl_langinfo.c b/gnulib-tests/test-nl_langinfo.c index d3384f43..d31e54f9 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-open.c b/gnulib-tests/test-open.c index b9ec9bfa..f04144f5 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-open.h b/gnulib-tests/test-open.h index cab1d27d..babb2390 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-openat-safer.c b/gnulib-tests/test-openat-safer.c index b7b8cb19..86edcfd0 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-openat.c b/gnulib-tests/test-openat.c index a563ed60..1ef07b5b 100644 --- a/gnulib-tests/test-openat.c +++ b/gnulib-tests/test-openat.c @@ -1,5 +1,5 @@ /* Test that openat works. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 @@ -72,6 +72,7 @@ main (int argc _GL_UNUSED, char *argv[]) ASSERT (errno == EBADF); } { + close (99); errno = 0; ASSERT (openat (99, "foo", O_RDONLY) == -1); ASSERT (errno == EBADF); diff --git a/gnulib-tests/test-parse-datetime.c b/gnulib-tests/test-parse-datetime.c index 4c0370d2..7eba9ad7 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-2012 Free Software Foundation, Inc. + 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 @@ -123,6 +123,12 @@ main (int argc _GL_UNUSED, char **argv) set_program_name (argv[0]); + /* Set the time zone to US Eastern time with the 2012 rules. This + should disable any leap second support. Otherwise, there will be + a problem with glibc on sites that default to leap seconds; see + <http://bugs.gnu.org/12206>. */ + setenv ("TZ", "EST5EDT,M3.2.0,M11.1.0", 1); + gmtoff = gmt_offset (ref_time); @@ -409,5 +415,9 @@ main (int argc _GL_UNUSED, char **argv) ASSERT (result.tv_sec == 24 * 3600 && result.tv_nsec == now.tv_nsec); + /* Exercise a sign-extension bug. Before July 2012, an input + starting with a high-bit-set byte would be treated like "0". */ + ASSERT ( ! parse_datetime (&result, "\xb0", &now)); + return 0; } diff --git a/gnulib-tests/test-pathmax.c b/gnulib-tests/test-pathmax.c index c6d0ccc5..81a03502 100644 --- a/gnulib-tests/test-pathmax.c +++ b/gnulib-tests/test-pathmax.c @@ -1,5 +1,5 @@ /* Test of "pathmax.h". - Copyright (C) 2011-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-perror.c b/gnulib-tests/test-perror.c index 31e1af70..ec262995 100644 --- a/gnulib-tests/test-perror.c +++ b/gnulib-tests/test-perror.c @@ -1,5 +1,5 @@ /* Test of perror() function. - Copyright (C) 2008-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-perror2.c b/gnulib-tests/test-perror2.c index eae077c6..197870d4 100644 --- a/gnulib-tests/test-perror2.c +++ b/gnulib-tests/test-perror2.c @@ -1,5 +1,5 @@ /* Test of perror() function. - Copyright (C) 2011-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-pipe.c b/gnulib-tests/test-pipe.c index 7ffeb621..93b4866e 100644 --- a/gnulib-tests/test-pipe.c +++ b/gnulib-tests/test-pipe.c @@ -1,5 +1,5 @@ /* Test of pipe. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-pipe2.c b/gnulib-tests/test-pipe2.c index 9ce58549..fd164c6e 100644 --- a/gnulib-tests/test-pipe2.c +++ b/gnulib-tests/test-pipe2.c @@ -1,5 +1,5 @@ /* Test of pipe2. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-posix_spawn1.c b/gnulib-tests/test-posix_spawn1.c index 5152d5c8..b944e14f 100644 --- a/gnulib-tests/test-posix_spawn1.c +++ b/gnulib-tests/test-posix_spawn1.c @@ -1,5 +1,5 @@ /* Test of posix_spawn() function. - Copyright (C) 2008-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-posix_spawn2.c b/gnulib-tests/test-posix_spawn2.c index e66c9f25..ce61c1c0 100644 --- a/gnulib-tests/test-posix_spawn2.c +++ b/gnulib-tests/test-posix_spawn2.c @@ -1,5 +1,5 @@ /* Test of posix_spawn() function. - Copyright (C) 2008-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-posix_spawn_file_actions_addclose.c b/gnulib-tests/test-posix_spawn_file_actions_addclose.c index 923f536a..ae149246 100644 --- a/gnulib-tests/test-posix_spawn_file_actions_addclose.c +++ b/gnulib-tests/test-posix_spawn_file_actions_addclose.c @@ -1,5 +1,5 @@ /* Test posix_spawn_file_actions_addclose() function. - Copyright (C) 2011-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-posix_spawn_file_actions_adddup2.c b/gnulib-tests/test-posix_spawn_file_actions_adddup2.c index 28d05e59..f6173043 100644 --- a/gnulib-tests/test-posix_spawn_file_actions_adddup2.c +++ b/gnulib-tests/test-posix_spawn_file_actions_adddup2.c @@ -1,5 +1,5 @@ /* Test posix_spawn_file_actions_adddup2() function. - Copyright (C) 2011-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-posix_spawn_file_actions_addopen.c b/gnulib-tests/test-posix_spawn_file_actions_addopen.c index 2afafe49..d2920f13 100644 --- a/gnulib-tests/test-posix_spawn_file_actions_addopen.c +++ b/gnulib-tests/test-posix_spawn_file_actions_addopen.c @@ -1,5 +1,5 @@ /* Test posix_spawn_file_actions_addopen() function. - Copyright (C) 2011-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-posixtm.c b/gnulib-tests/test-posixtm.c index 8400c39f..8b1eae7f 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-2012 Free Software Foundation, Inc. + 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 @@ -34,7 +34,7 @@ struct posixtm_test char const *in; unsigned int syntax_bits; bool valid; - int64_t t_expected; + int_least64_t t_expected; }; /* Test mainly with syntax_bits == 13 @@ -49,12 +49,17 @@ static struct posixtm_test const T[] = /* These two tests fail on 64-bit Solaris up through at least Solaris 10, which is off by one day for time stamps before 0001-01-01 00:00:00 UTC. */ - { "000001010000.00", 13, 1, -62167219200}, /* Sat Jan 1 00:00:00 0 */ - { "000012312359.59", 13, 1, -62135596801}, /* Fri Dec 31 23:59:59 0 */ - - { "000101010000.00", 13, 1, -62135596800}, /* Sat Jan 1 00:00:00 1 */ - { "190112132045.51", 13, 1, -2147483649}, /* Fri Dec 13 20:45:51 1901 */ - { "190112132045.52", 13, 1, -2147483648}, /* Fri Dec 13 20:45:52 1901 */ + { "000001010000.00", 13, 1, + - INT64_C (62167219200)},/* Sat Jan 1 00:00:00 0 */ + { "000012312359.59", 13, 1, + - INT64_C (62135596801)},/* Fri Dec 31 23:59:59 0 */ + + { "000101010000.00", 13, 1, + - INT64_C (62135596800)},/* Sat Jan 1 00:00:00 1 */ + { "190112132045.51", 13, 1, + - INT64_C (2147483649)},/* Fri Dec 13 20:45:51 1901 */ + { "190112132045.52", 13, 1, + - INT64_C (2147483648)},/* Fri Dec 13 20:45:52 1901 */ { "190112132045.53", 13, 1, -2147483647}, /* Fri Dec 13 20:45:53 1901 */ { "190112132046.52", 13, 1, -2147483588}, /* Fri Dec 13 20:46:52 1901 */ { "190112132145.52", 13, 1, -2147480048}, /* Fri Dec 13 21:45:52 1901 */ @@ -77,15 +82,18 @@ static struct posixtm_test const T[] = { "197013010000.00", 13, 0, 0}, /* -- */ { "203801190314.06", 13, 1, 2147483646}, /* Tue Jan 19 03:14:06 2038 */ { "203801190314.07", 13, 1, 2147483647}, /* Tue Jan 19 03:14:07 2038 */ - { "203801190314.08", 13, 1, 2147483648}, /* Tue Jan 19 03:14:08 2038 */ - { "999912312359.59", 13, 1, 253402300799}, /* Fri Dec 31 23:59:59 9999 */ + { "203801190314.08", 13, 1, + INT64_C ( 2147483648)},/* Tue Jan 19 03:14:08 2038 */ + { "999912312359.59", 13, 1, + INT64_C (253402300799)},/* Fri Dec 31 23:59:59 9999 */ { "1112131415", 13, 1, 1323785700}, /* Tue Dec 13 14:15:00 2011 */ { "1112131415.16", 13, 1, 1323785716}, /* Tue Dec 13 14:15:16 2011 */ { "201112131415.16", 13, 1, 1323785716}, /* Tue Dec 13 14:15:16 2011 */ { "191112131415.16", 13, 1, -1831974284}, /* Wed Dec 13 14:15:16 1911 */ { "203712131415.16", 13, 1, 2144326516}, /* Sun Dec 13 14:15:16 2037 */ { "3712131415.16", 13, 1, 2144326516}, /* Sun Dec 13 14:15:16 2037 */ - { "6812131415.16", 13, 1, 3122633716}, /* Thu Dec 13 14:15:16 2068 */ + { "6812131415.16", 13, 1, + INT64_C ( 3122633716)},/* Thu Dec 13 14:15:16 2068 */ { "6912131415.16", 13, 1, -1590284}, /* Sat Dec 13 14:15:16 1969 */ { "7012131415.16", 13, 1, 29945716}, /* Sun Dec 13 14:15:16 1970 */ { "1213141599", 2, 1, 945094500}, /* Mon Dec 13 14:15:00 1999 */ diff --git a/gnulib-tests/test-printf-frexp.c b/gnulib-tests/test-printf-frexp.c index d144a526..5ecf1985 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-printf-frexpl.c b/gnulib-tests/test-printf-frexpl.c index ac777818..0aa3d18b 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-printf-posix.h b/gnulib-tests/test-printf-posix.h index 53ef9059..eca40051 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-priv-set.c b/gnulib-tests/test-priv-set.c index e1469411..b474878e 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-quotearg-simple.c b/gnulib-tests/test-quotearg-simple.c index 34d85134..e7aa8fb6 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-quotearg.h b/gnulib-tests/test-quotearg.h index bed0caec..02e0c133 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-raise.c b/gnulib-tests/test-raise.c index 9ec07810..3c58b6b1 100644 --- a/gnulib-tests/test-raise.c +++ b/gnulib-tests/test-raise.c @@ -1,5 +1,5 @@ /* Test raising a signal. - Copyright (C) 2011-2012 Free Software Foundation, Inc. + 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 @@ -39,7 +39,6 @@ main (void) { /* Test behaviour for invalid argument. */ ASSERT (raise (-1) != 0); - ASSERT (raise (199) != 0); /* Test behaviour for SIGINT. */ ASSERT (signal (SIGINT, handler) != SIG_ERR); diff --git a/gnulib-tests/test-rand-isaac.c b/gnulib-tests/test-rand-isaac.c index a5cee95e..a2788bc2 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-2012 Free Software Foundation, Inc. + Copyright (C) 2010-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 diff --git a/gnulib-tests/test-rawmemchr.c b/gnulib-tests/test-rawmemchr.c index 9e31500e..e31104a9 100644 --- a/gnulib-tests/test-rawmemchr.c +++ b/gnulib-tests/test-rawmemchr.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008-2012 Free Software Foundation, Inc. + * 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 diff --git a/gnulib-tests/test-read-file.c b/gnulib-tests/test-read-file.c index aec3c4b0..63cd89eb 100644 --- a/gnulib-tests/test-read-file.c +++ b/gnulib-tests/test-read-file.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2007, 2010-2012 Free Software Foundation, Inc. + * Copyright (C) 2006-2007, 2010-2013 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 fb553c5d..74b5b4df 100644 --- a/gnulib-tests/test-read.c +++ b/gnulib-tests/test-read.c @@ -1,5 +1,5 @@ /* Test the read() function. - Copyright (C) 2011-2012 Free Software Foundation, Inc. + 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 @@ -60,6 +60,7 @@ main (void) } { char byte; + close (99); errno = 0; ASSERT (read (99, &byte, 1) == -1); ASSERT (errno == EBADF); diff --git a/gnulib-tests/test-readlink.c b/gnulib-tests/test-readlink.c index d755182f..e59ebe40 100644 --- a/gnulib-tests/test-readlink.c +++ b/gnulib-tests/test-readlink.c @@ -1,5 +1,5 @@ /* Tests of readlink. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-readlink.h b/gnulib-tests/test-readlink.h index 284152ad..d19f9b33 100644 --- a/gnulib-tests/test-readlink.h +++ b/gnulib-tests/test-readlink.h @@ -1,5 +1,5 @@ /* Tests of readlink. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-readlinkat.c b/gnulib-tests/test-readlinkat.c index 1500c28d..c2ce6ef7 100644 --- a/gnulib-tests/test-readlinkat.c +++ b/gnulib-tests/test-readlinkat.c @@ -1,5 +1,5 @@ /* Tests of readlinkat. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 @@ -66,6 +66,7 @@ main (void) ASSERT (errno == EBADF); } { + close (99); errno = 0; ASSERT (readlinkat (99, "foo", buf, sizeof buf) == -1); ASSERT (errno == EBADF); diff --git a/gnulib-tests/test-readtokens.c b/gnulib-tests/test-readtokens.c index 309dd9cb..44193d59 100644 --- a/gnulib-tests/test-readtokens.c +++ b/gnulib-tests/test-readtokens.c @@ -1,5 +1,5 @@ /* Test the readtokens module. - Copyright (C) 2012 Free Software Foundation, Inc. + Copyright (C) 2012-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 diff --git a/gnulib-tests/test-realloc-gnu.c b/gnulib-tests/test-realloc-gnu.c index 2ffd759b..b8597bec 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-2012 Free Software Foundation, Inc. + Copyright (C) 2010-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 diff --git a/gnulib-tests/test-regex.c b/gnulib-tests/test-regex.c new file mode 100644 index 00000000..2488cee2 --- /dev/null +++ b/gnulib-tests/test-regex.c @@ -0,0 +1,185 @@ +/* Test regular expressions + Copyright 1996-2001, 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/>. */ + +#include <config.h> + +#include "regex.h" + +#include <locale.h> +#include <limits.h> +#include <string.h> +#if HAVE_ALARM +# include <unistd.h> +# include <signal.h> +#endif + +int +main (void) +{ + int result = 0; + static struct re_pattern_buffer regex; + unsigned char folded_chars[UCHAR_MAX + 1]; + int i; + const char *s; + struct re_registers regs; + +#if HAVE_ALARM + /* Some builds of glibc go into an infinite loop on this test. */ + int alarm_value = 2; + signal (SIGALRM, SIG_DFL); + alarm (alarm_value); +#endif + if (setlocale (LC_ALL, "en_US.UTF-8")) + { + { + /* http://sourceware.org/ml/libc-hacker/2006-09/msg00008.html + This test needs valgrind to catch the bug on Debian + GNU/Linux 3.1 x86, but it might catch the bug better + on other platforms and it shouldn't hurt to try the + test here. */ + static char const pat[] = "insert into"; + static char const data[] = + "\xFF\0\x12\xA2\xAA\xC4\xB1,K\x12\xC4\xB1*\xACK"; + re_set_syntax (RE_SYNTAX_GREP | RE_HAT_LISTS_NOT_NEWLINE + | RE_ICASE); + memset (®ex, 0, sizeof regex); + s = re_compile_pattern (pat, sizeof pat - 1, ®ex); + if (s) + result |= 1; + else if (re_search (®ex, data, sizeof data - 1, + 0, sizeof data - 1, ®s) + != -1) + 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 (®ex, 0, sizeof regex); + s = re_compile_pattern (pat, sizeof pat - 1, ®ex); + if (s) + result |= 1; + else if (re_search (®ex, data, sizeof data - 1, + 0, sizeof data - 1, 0) + != 21) + result |= 1; + } + + if (! setlocale (LC_ALL, "C")) + return 1; + } + + /* This test is from glibc bug 3957, reported by Andrew Mackey. */ + re_set_syntax (RE_SYNTAX_EGREP | RE_HAT_LISTS_NOT_NEWLINE); + memset (®ex, 0, sizeof regex); + s = re_compile_pattern ("a[^x]b", 6, ®ex); + if (s) + result |= 2; + /* This should fail, but succeeds for glibc-2.5. */ + else if (re_search (®ex, "a\nb", 3, 0, 3, ®s) != -1) + result |= 2; + + /* This regular expression is from Spencer ere test number 75 + in grep-2.3. */ + re_set_syntax (RE_SYNTAX_POSIX_EGREP); + memset (®ex, 0, sizeof regex); + for (i = 0; i <= UCHAR_MAX; i++) + folded_chars[i] = i; + regex.translate = folded_chars; + s = re_compile_pattern ("a[[:@:>@:]]b\n", 11, ®ex); + /* This should fail with _Invalid character class name_ error. */ + if (!s) + result |= 4; + + /* Ensure that [b-a] is diagnosed as invalid, when + using RE_NO_EMPTY_RANGES. */ + re_set_syntax (RE_SYNTAX_POSIX_EGREP | RE_NO_EMPTY_RANGES); + memset (®ex, 0, sizeof regex); + s = re_compile_pattern ("a[b-a]", 6, ®ex); + if (s == 0) + result |= 8; + + /* This should succeed, but does not for glibc-2.1.3. */ + memset (®ex, 0, sizeof regex); + s = re_compile_pattern ("{1", 2, ®ex); + if (s) + result |= 8; + + /* The following example is derived from a problem report + against gawk from Jorge Stolfi <stolfi@ic.unicamp.br>. */ + memset (®ex, 0, sizeof regex); + s = re_compile_pattern ("[an\371]*n", 7, ®ex); + if (s) + result |= 8; + /* This should match, but does not for glibc-2.2.1. */ + else if (re_match (®ex, "an", 2, 0, ®s) != 2) + result |= 8; + + memset (®ex, 0, sizeof regex); + s = re_compile_pattern ("x", 1, ®ex); + if (s) + result |= 8; + /* glibc-2.2.93 does not work with a negative RANGE argument. */ + else if (re_search (®ex, "wxy", 3, 2, -2, ®s) != 1) + result |= 8; + + /* The version of regex.c in older versions of gnulib + ignored RE_ICASE. Detect that problem too. */ + re_set_syntax (RE_SYNTAX_EMACS | RE_ICASE); + memset (®ex, 0, sizeof regex); + s = re_compile_pattern ("x", 1, ®ex); + if (s) + result |= 16; + else if (re_search (®ex, "WXY", 3, 0, 3, ®s) < 0) + result |= 16; + + /* Catch a bug reported by Vin Shelton in + http://lists.gnu.org/archive/html/bug-coreutils/2007-06/msg00089.html + */ + re_set_syntax (RE_SYNTAX_POSIX_BASIC + & ~RE_CONTEXT_INVALID_DUP + & ~RE_NO_EMPTY_RANGES); + memset (®ex, 0, sizeof regex); + s = re_compile_pattern ("[[:alnum:]_-]\\\\+$", 16, ®ex); + if (s) + result |= 32; + + /* REG_STARTEND was added to glibc on 2004-01-15. + Reject older versions. */ + if (! REG_STARTEND) + result |= 64; + +#if 0 + /* It would be nice to reject hosts whose regoff_t values are too + narrow (including glibc on hosts with 64-bit ptrdiff_t and + 32-bit int), but we should wait until glibc implements this + feature. Otherwise, support for equivalence classes and + multibyte collation symbols would always be broken except + when compiling --without-included-regex. */ + if (sizeof (regoff_t) < sizeof (ptrdiff_t) + || sizeof (regoff_t) < sizeof (ssize_t)) + result |= 64; +#endif + + return result; +} diff --git a/gnulib-tests/test-remove.c b/gnulib-tests/test-remove.c index 7751ccaa..48641321 100644 --- a/gnulib-tests/test-remove.c +++ b/gnulib-tests/test-remove.c @@ -1,5 +1,5 @@ /* Tests of remove. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-rename.c b/gnulib-tests/test-rename.c index 868dcd84..132c788d 100644 --- a/gnulib-tests/test-rename.c +++ b/gnulib-tests/test-rename.c @@ -1,5 +1,5 @@ /* Test of rename() function. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-rename.h b/gnulib-tests/test-rename.h index 2b173c54..7e024e0a 100644 --- a/gnulib-tests/test-rename.h +++ b/gnulib-tests/test-rename.h @@ -1,5 +1,5 @@ /* Test of rename() function. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-rmdir.c b/gnulib-tests/test-rmdir.c index 3531de96..8a24a688 100644 --- a/gnulib-tests/test-rmdir.c +++ b/gnulib-tests/test-rmdir.c @@ -1,5 +1,5 @@ /* Tests of rmdir. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-rmdir.h b/gnulib-tests/test-rmdir.h index b2411a2d..f2987801 100644 --- a/gnulib-tests/test-rmdir.h +++ b/gnulib-tests/test-rmdir.h @@ -1,5 +1,5 @@ /* Tests of rmdir. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-sameacls.c b/gnulib-tests/test-sameacls.c index 1cc9e26e..cb187fb7 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-2012 Free Software Foundation, Inc. + 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 @@ -115,11 +115,11 @@ main (int argc, char *argv[]) } } { -#if HAVE_ACL_GET_FILE /* Linux, FreeBSD, MacOS X, IRIX, Tru64 */ +#if HAVE_ACL_GET_FILE /* Linux, FreeBSD, Mac OS X, IRIX, Tru64 */ static const int types[] = { ACL_TYPE_ACCESS -# if HAVE_ACL_TYPE_EXTENDED /* MacOS X */ +# if HAVE_ACL_TYPE_EXTENDED /* Mac OS X */ , ACL_TYPE_EXTENDED # endif }; diff --git a/gnulib-tests/test-sched.c b/gnulib-tests/test-sched.c index cd341193..5a64120d 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-select-fd.c b/gnulib-tests/test-select-fd.c index 32df4b78..fffc1268 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-select-stdin.c b/gnulib-tests/test-select-stdin.c index 75dd855d..77c20ccd 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-select.c b/gnulib-tests/test-select.c index f6e193ed..ccf95d54 100644 --- a/gnulib-tests/test-select.c +++ b/gnulib-tests/test-select.c @@ -1,5 +1,5 @@ /* Test of select() substitute. - Copyright (C) 2008-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-select.h b/gnulib-tests/test-select.h index 9fe998c1..75c8fb1a 100644 --- a/gnulib-tests/test-select.h +++ b/gnulib-tests/test-select.h @@ -1,5 +1,5 @@ /* Test of select() substitute. - Copyright (C) 2008-2012 Free Software Foundation, Inc. + 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 @@ -84,6 +84,9 @@ open_server_socket (void) s = socket (AF_INET, SOCK_STREAM, 0); + x = 1; + setsockopt (s, SOL_SOCKET, SO_REUSEPORT, &x, sizeof (x)); + memset (&ia, 0, sizeof (ia)); ia.sin_family = AF_INET; inet_pton (AF_INET, "127.0.0.1", &ia.sin_addr); @@ -94,9 +97,6 @@ open_server_socket (void) exit (77); } - x = 1; - setsockopt (s, SOL_SOCKET, SO_REUSEPORT, &x, sizeof (x)); - if (listen (s, 1) < 0) { perror ("listen"); @@ -227,6 +227,29 @@ test_tty (select_fn my_select) #endif +static int +do_select_bad_nfd_nowait (int nfd, select_fn my_select) +{ + struct timeval tv0; + tv0.tv_sec = 0; + tv0.tv_usec = 0; + errno = 0; + return my_select (nfd, NULL, NULL, NULL, &tv0); +} + +static void +test_bad_nfd (select_fn my_select) +{ + if (do_select_bad_nfd_nowait (-1, my_select) != -1 || errno != EINVAL) + failed ("invalid errno after negative nfds"); + /* Can't test FD_SETSIZE + 1 for EINVAL, since some systems allow + dynamically larger set size by redefining FD_SETSIZE anywhere up + to the actual maximum fd. */ + /* if (do_select_bad_nfd_nowait (FD_SETSIZE + 1, my_select) != -1 */ + /* || errno != EINVAL) */ + /* failed ("invalid errno after bogus nfds"); */ +} + /* Test select(2) on invalid file descriptors. */ static int @@ -243,6 +266,7 @@ do_select_bad_fd (int fd, int ev, struct timeval *timeout, select_fn my_select) FD_SET (fd, &wfds); if (ev & SEL_EXC) FD_SET (fd, &xfds); + errno = 0; return my_select (fd + 1, &rfds, &wfds, &xfds, timeout); /* In this case, when fd is invalid, on some platforms, the bit for fd is left alone in the fd_set, whereas on other platforms it is cleared. @@ -265,7 +289,7 @@ test_bad_fd (select_fn my_select) #if !(defined __osf__ || defined WINDOWS_NATIVE) int fd; - /* On Linux, MacOS X, *BSD, values of fd like 99 or 399 are discarded + /* On Linux, Mac OS X, *BSD, values of fd like 99 or 399 are discarded by the kernel early and therefore do *not* lead to EBADF, as required by POSIX. */ # if defined __linux__ || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __OpenBSD__ || defined __NetBSD__ @@ -273,6 +297,7 @@ test_bad_fd (select_fn my_select) # else fd = 99; # endif + close (fd); if (do_select_bad_fd_nowait (fd, SEL_IN, my_select) == 0 || errno != EBADF) failed ("invalid fd among rfds"); @@ -426,6 +451,7 @@ test_function (select_fn my_select) test (test_tty, "TTY", my_select); #endif + result += test (test_bad_nfd, my_select, "Invalid nfd test"); result += test (test_bad_fd, my_select, "Invalid fd test"); result += test (test_connect_first, my_select, "Unconnected socket test"); result += test (test_socket_pair, my_select, "Connected sockets test"); diff --git a/gnulib-tests/test-set-mode-acl.c b/gnulib-tests/test-set-mode-acl.c index c2ae704a..49a93b26 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-set-mode-acl.sh b/gnulib-tests/test-set-mode-acl.sh index 28d7e110..f0b1641a 100755 --- a/gnulib-tests/test-set-mode-acl.sh +++ b/gnulib-tests/test-set-mode-acl.sh @@ -111,7 +111,7 @@ cd "$builddir" || acl_flavor=aix else if (fsaclctl -v >/dev/null) 2>/dev/null; then - # MacOS X. + # Mac OS X. acl_flavor=macosx else if test -f /sbin/chacl; then diff --git a/gnulib-tests/test-setenv.c b/gnulib-tests/test-setenv.c index 4752a11f..0a53ac46 100644 --- a/gnulib-tests/test-setenv.c +++ b/gnulib-tests/test-setenv.c @@ -1,5 +1,5 @@ /* Tests of setenv. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-setlocale1.c b/gnulib-tests/test-setlocale1.c index 08f9224f..b20c037f 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-setlocale2.c b/gnulib-tests/test-setlocale2.c index 74166477..cad9e2fe 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-setsockopt.c b/gnulib-tests/test-setsockopt.c index c14d217a..323b8e78 100644 --- a/gnulib-tests/test-setsockopt.c +++ b/gnulib-tests/test-setsockopt.c @@ -1,5 +1,5 @@ /* Test setsockopt() function. - Copyright (C) 2011-2012 Free Software Foundation, Inc. + 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 @@ -22,6 +22,7 @@ SIGNATURE_CHECK (setsockopt, int, (int, int, int, const void *, socklen_t)); #include <errno.h> +#include <unistd.h> #include "sockets.h" #include "macros.h" @@ -43,6 +44,7 @@ main (void) { int value = 1; + close (99); errno = 0; ASSERT (setsockopt (99, SOL_SOCKET, SO_REUSEADDR, &value, sizeof (value)) == -1); diff --git a/gnulib-tests/test-sha1.c b/gnulib-tests/test-sha1.c index 97f50bae..dd8b8d95 100644 --- a/gnulib-tests/test-sha1.c +++ b/gnulib-tests/test-sha1.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005, 2008-2012 Free Software Foundation, Inc. + * Copyright (C) 2005, 2008-2013 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 b08f00c0..2b5ba531 100644 --- a/gnulib-tests/test-sigaction.c +++ b/gnulib-tests/test-sigaction.c @@ -1,5 +1,5 @@ /* Test of sigaction() function. - Copyright (C) 2008-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-signal-h.c b/gnulib-tests/test-signal-h.c index 95290175..93c0b716 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-signbit.c b/gnulib-tests/test-signbit.c index d9ff91df..e8ea097c 100644 --- a/gnulib-tests/test-signbit.c +++ b/gnulib-tests/test-signbit.c @@ -1,5 +1,5 @@ /* Test of signbit() substitute. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-sigprocmask.c b/gnulib-tests/test-sigprocmask.c index 55d11b0c..6aaf74da 100644 --- a/gnulib-tests/test-sigprocmask.c +++ b/gnulib-tests/test-sigprocmask.c @@ -1,5 +1,5 @@ /* Test of sigprocmask. - Copyright (C) 2011-2012 Free Software Foundation, Inc. + 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 @@ -44,9 +44,15 @@ int main (int argc, char *argv[]) { sigset_t set; - int pid = getpid (); + pid_t pid = getpid (); char command[80]; + if (sizeof (int) < sizeof pid && 0x7fffffff < pid) + { + fputs ("Skipping test: pid too large\n", stderr); + return 77; + } + signal (SIGINT, sigint_handler); sigemptyset (&set); @@ -60,7 +66,7 @@ main (int argc, char *argv[]) ASSERT (sigprocmask (SIG_BLOCK, &set, NULL) == 0); /* Request a SIGINT signal from outside. */ - sprintf (command, "sh -c 'sleep 1; kill -%d %d' &", SIGINT, pid); + sprintf (command, "sh -c 'sleep 1; kill -%d %d' &", SIGINT, (int) pid); ASSERT (system (command) == 0); /* Wait. */ diff --git a/gnulib-tests/test-sleep.c b/gnulib-tests/test-sleep.c index a0a2e777..d232cd0a 100644 --- a/gnulib-tests/test-sleep.c +++ b/gnulib-tests/test-sleep.c @@ -1,5 +1,5 @@ /* Test of sleep() function. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-snprintf.c b/gnulib-tests/test-snprintf.c index bd66449c..80573576 100644 --- a/gnulib-tests/test-snprintf.c +++ b/gnulib-tests/test-snprintf.c @@ -1,5 +1,5 @@ /* Test of snprintf() function. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-sockets.c b/gnulib-tests/test-sockets.c index f43e011c..4e26f068 100644 --- a/gnulib-tests/test-sockets.c +++ b/gnulib-tests/test-sockets.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008-2012 Free Software Foundation, Inc. + * Copyright (C) 2008-2013 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 index 7c176804..25314595 100644 --- a/gnulib-tests/test-spawn-pipe-child.c +++ b/gnulib-tests/test-spawn-pipe-child.c @@ -1,5 +1,5 @@ /* Child program invoked by test-spawn-pipe-main. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-spawn-pipe-main.c b/gnulib-tests/test-spawn-pipe-main.c index c0e51725..c07c3d29 100644 --- a/gnulib-tests/test-spawn-pipe-main.c +++ b/gnulib-tests/test-spawn-pipe-main.c @@ -1,5 +1,5 @@ /* Test of create_pipe_bidi/wait_subprocess. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-spawn.c b/gnulib-tests/test-spawn.c index 5816692d..cfa9dc62 100644 --- a/gnulib-tests/test-spawn.c +++ b/gnulib-tests/test-spawn.c @@ -1,5 +1,5 @@ /* Test of <spawn.h> substitute. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-stat-time.c b/gnulib-tests/test-stat-time.c index 34520a10..2b4f0f13 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-stat.c b/gnulib-tests/test-stat.c index db9adf9b..b59dbf44 100644 --- a/gnulib-tests/test-stat.c +++ b/gnulib-tests/test-stat.c @@ -1,5 +1,5 @@ /* Tests of stat. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-stat.h b/gnulib-tests/test-stat.h index 2c9afc01..5409e058 100644 --- a/gnulib-tests/test-stat.h +++ b/gnulib-tests/test-stat.h @@ -1,5 +1,5 @@ /* Tests of stat. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-statat.c b/gnulib-tests/test-statat.c new file mode 100644 index 00000000..4adb3ab7 --- /dev/null +++ b/gnulib-tests/test-statat.c @@ -0,0 +1,27 @@ +/* Tests of statat and lstatat. + 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/>. */ + +#include <config.h> + +#include "openat.h" + +#include "signature.h" +SIGNATURE_CHECK (statat, int, (int, char const *, struct stat *)); +SIGNATURE_CHECK (lstatat, int, (int, char const *, struct stat *)); + +#define BASE "test-statat.t" +#define TEST_STATAT +#include "test-fstatat.c" diff --git a/gnulib-tests/test-stdalign.c b/gnulib-tests/test-stdalign.c index d4c1d2e8..373bf984 100644 --- a/gnulib-tests/test-stdalign.c +++ b/gnulib-tests/test-stdalign.c @@ -1,5 +1,5 @@ /* Test of <stdalign.h>. - Copyright 2009-2012 Free Software Foundation, Inc. + Copyright 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 diff --git a/gnulib-tests/test-stdbool.c b/gnulib-tests/test-stdbool.c index c22ca1f8..3c13ca2c 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-2012 Free Software Foundation, Inc. + Copyright (C) 2002-2007, 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 diff --git a/gnulib-tests/test-stddef.c b/gnulib-tests/test-stddef.c index d7237b3e..f42b4e05 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-stdint.c b/gnulib-tests/test-stdint.c index 23b2b28e..1c559b05 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-2012 Free Software Foundation, Inc. + Copyright (C) 2006-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 diff --git a/gnulib-tests/test-stdio.c b/gnulib-tests/test-stdio.c index 7bd67c20..89c65489 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-2012 Free Software Foundation, Inc. + Copyright (C) 2007, 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 diff --git a/gnulib-tests/test-stdlib.c b/gnulib-tests/test-stdlib.c index 7eeb410d..6d38156c 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-2012 Free Software Foundation, Inc. + Copyright (C) 2007, 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 diff --git a/gnulib-tests/test-strchrnul.c b/gnulib-tests/test-strchrnul.c index f1d09283..ac3b3dd8 100644 --- a/gnulib-tests/test-strchrnul.c +++ b/gnulib-tests/test-strchrnul.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008-2012 Free Software Foundation, Inc. + * 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 diff --git a/gnulib-tests/test-strerror.c b/gnulib-tests/test-strerror.c index 33dd901c..6d5db0f5 100644 --- a/gnulib-tests/test-strerror.c +++ b/gnulib-tests/test-strerror.c @@ -1,5 +1,5 @@ /* Test of strerror() function. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-strerror_r.c b/gnulib-tests/test-strerror_r.c index e164f0a5..ec43aef9 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-strftime.c b/gnulib-tests/test-strftime.c index 44ffa42f..28bdaa96 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-striconv.c b/gnulib-tests/test-striconv.c index cd8d8ef3..c77dc6c3 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-string.c b/gnulib-tests/test-string.c index 56e59741..76922d16 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-2012 Free Software Foundation, Inc. + Copyright (C) 2007, 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 diff --git a/gnulib-tests/test-strings.c b/gnulib-tests/test-strings.c deleted file mode 100644 index 1805e16f..00000000 --- a/gnulib-tests/test-strings.c +++ /dev/null @@ -1,27 +0,0 @@ -/* Test of <strings.h> substitute. - Copyright (C) 2007, 2009-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 - 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>, 2007. */ - -#include <config.h> - -#include <strings.h> - -int -main () -{ - return 0; -} diff --git a/gnulib-tests/test-strncat.c b/gnulib-tests/test-strncat.c index 8bf5b7ef..efa9c4f3 100644 --- a/gnulib-tests/test-strncat.c +++ b/gnulib-tests/test-strncat.c @@ -1,5 +1,5 @@ /* Test of strncat() function. - Copyright (C) 2010-2012 Free Software Foundation, Inc. + Copyright (C) 2010-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 diff --git a/gnulib-tests/test-strnlen.c b/gnulib-tests/test-strnlen.c index cbc18835..33de9355 100644 --- a/gnulib-tests/test-strnlen.c +++ b/gnulib-tests/test-strnlen.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2012 Free Software Foundation, Inc. + * Copyright (C) 2010-2013 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 1f2a9855..8d68228d 100644 --- a/gnulib-tests/test-strsignal.c +++ b/gnulib-tests/test-strsignal.c @@ -1,5 +1,5 @@ /* Test of strsignal() function. - Copyright (C) 2008-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-strtod.c b/gnulib-tests/test-strtod.c index b8d6e5f4..f23bf6b8 100644 --- a/gnulib-tests/test-strtod.c +++ b/gnulib-tests/test-strtod.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008-2012 Free Software Foundation, Inc. + * Copyright (C) 2008-2013 Free Software Foundation, Inc. * Written by Eric Blake * * This program is free software: you can redistribute it and/or modify @@ -383,7 +383,7 @@ main (void) result = strtod (input, &ptr); ASSERT (result == 0.0); ASSERT (!signbit (result)); - ASSERT (ptr == input + 1); /* glibc-2.3.6, MacOS X 10.3, FreeBSD 6.2, AIX 7.1 */ + ASSERT (ptr == input + 1); /* glibc-2.3.6, Mac OS X 10.3, FreeBSD 6.2, AIX 7.1 */ ASSERT (errno == 0); } { @@ -404,8 +404,8 @@ main (void) errno = 0; result = strtod (input, &ptr); ASSERT (result == 0.0); - ASSERT (!!signbit (result) == !!signbit (minus_zerod)); /* MacOS X 10.3, FreeBSD 6.2, IRIX 6.5, OSF/1 4.0 */ - ASSERT (ptr == input + 2); /* glibc-2.3.6, MacOS X 10.3, FreeBSD 6.2, AIX 7.1 */ + ASSERT (!!signbit (result) == !!signbit (minus_zerod)); /* Mac OS X 10.3, FreeBSD 6.2, IRIX 6.5, OSF/1 4.0 */ + ASSERT (ptr == input + 2); /* glibc-2.3.6, Mac OS X 10.3, FreeBSD 6.2, AIX 7.1 */ ASSERT (errno == 0); } { @@ -416,7 +416,7 @@ main (void) result = strtod (input, &ptr); ASSERT (result == 0.0); ASSERT (!signbit (result)); - ASSERT (ptr == input + 1); /* glibc-2.3.6, MacOS X 10.3, FreeBSD 6.2, AIX 7.1 */ + ASSERT (ptr == input + 1); /* glibc-2.3.6, Mac OS X 10.3, FreeBSD 6.2, AIX 7.1 */ ASSERT (errno == 0); } { @@ -427,7 +427,7 @@ main (void) result = strtod (input, &ptr); ASSERT (result == 0.0); ASSERT (!signbit (result)); - ASSERT (ptr == input + 1); /* glibc-2.3.6, MacOS X 10.3, FreeBSD 6.2, AIX 7.1 */ + ASSERT (ptr == input + 1); /* glibc-2.3.6, Mac OS X 10.3, FreeBSD 6.2, AIX 7.1 */ ASSERT (errno == 0); } { @@ -438,7 +438,7 @@ main (void) result = strtod (input, &ptr); ASSERT (result == 0.0); ASSERT (!signbit (result)); - ASSERT (ptr == input + 1); /* glibc-2.3.6, MacOS X 10.3, FreeBSD 6.2, AIX 7.1 */ + ASSERT (ptr == input + 1); /* glibc-2.3.6, Mac OS X 10.3, FreeBSD 6.2, AIX 7.1 */ ASSERT (errno == 0); } { @@ -449,7 +449,7 @@ main (void) result = strtod (input, &ptr); ASSERT (result == 0.0); ASSERT (!signbit (result)); - ASSERT (ptr == input + 1); /* glibc-2.3.6, MacOS X 10.3, FreeBSD 6.2, AIX 7.1 */ + ASSERT (ptr == input + 1); /* glibc-2.3.6, Mac OS X 10.3, FreeBSD 6.2, AIX 7.1 */ ASSERT (errno == 0); } { @@ -460,7 +460,7 @@ main (void) result = strtod (input, &ptr); ASSERT (result == 0.0); ASSERT (!signbit (result)); - ASSERT (ptr == input + 1); /* glibc-2.3.6, MacOS X 10.3, FreeBSD 6.2, AIX 7.1 */ + ASSERT (ptr == input + 1); /* glibc-2.3.6, Mac OS X 10.3, FreeBSD 6.2, AIX 7.1 */ ASSERT (errno == 0); } { @@ -471,7 +471,7 @@ main (void) result = strtod (input, &ptr); ASSERT (result == 0.0); ASSERT (!signbit (result)); - ASSERT (ptr == input + 1); /* glibc-2.3.6, MacOS X 10.3, FreeBSD 6.2, AIX 7.1 */ + ASSERT (ptr == input + 1); /* glibc-2.3.6, Mac OS X 10.3, FreeBSD 6.2, AIX 7.1 */ ASSERT (errno == 0); } { @@ -482,7 +482,7 @@ main (void) result = strtod (input, &ptr); ASSERT (result == 0.0); ASSERT (!signbit (result)); - ASSERT (ptr == input + 1); /* glibc-2.3.6, MacOS X 10.3, FreeBSD 6.2, AIX 7.1 */ + ASSERT (ptr == input + 1); /* glibc-2.3.6, Mac OS X 10.3, FreeBSD 6.2, AIX 7.1 */ ASSERT (errno == 0); } { @@ -703,8 +703,8 @@ main (void) worrying about. */ ASSERT (!!signbit (result1) != !!signbit (result2)); /* glibc-2.3.6, IRIX 6.5, OSF/1 5.1, mingw */ # endif - ASSERT (ptr1 == input + 6); /* glibc-2.3.6, MacOS X 10.3, FreeBSD 6.2, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */ - ASSERT (ptr2 == input + 6); /* glibc-2.3.6, MacOS X 10.3, FreeBSD 6.2, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */ + ASSERT (ptr1 == input + 6); /* glibc-2.3.6, Mac OS X 10.3, FreeBSD 6.2, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */ + ASSERT (ptr2 == input + 6); /* glibc-2.3.6, Mac OS X 10.3, FreeBSD 6.2, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */ ASSERT (errno == 0); #else ASSERT (result1 == 0.0); @@ -724,7 +724,7 @@ main (void) result = strtod (input, &ptr); #if 1 /* All known CPUs support NaNs. */ ASSERT (isnand (result)); /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */ - ASSERT (ptr == input + 6); /* glibc-2.3.6, MacOS X 10.3, FreeBSD 6.2, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */ + ASSERT (ptr == input + 6); /* glibc-2.3.6, Mac OS X 10.3, FreeBSD 6.2, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */ ASSERT (errno == 0); #else ASSERT (result == 0.0); @@ -920,9 +920,9 @@ main (void) input[m] = '\0'; errno = 0; result = strtod (input, &ptr); - ASSERT (result == 1.0); /* MacOS X 10.3, FreeBSD 6.2, NetBSD 3.0, OpenBSD 4.0, IRIX 6.5, OSF/1 5.1, mingw */ + ASSERT (result == 1.0); /* Mac OS X 10.3, FreeBSD 6.2, NetBSD 3.0, OpenBSD 4.0, IRIX 6.5, OSF/1 5.1, mingw */ ASSERT (ptr == input + m); /* OSF/1 5.1 */ - ASSERT (errno == 0); /* MacOS X 10.3, FreeBSD 6.2, NetBSD 3.0, OpenBSD 4.0, IRIX 6.5, OSF/1 5.1, mingw */ + ASSERT (errno == 0); /* Mac OS X 10.3, FreeBSD 6.2, NetBSD 3.0, OpenBSD 4.0, IRIX 6.5, OSF/1 5.1, mingw */ } free (input); } @@ -946,9 +946,9 @@ main (void) input[m] = '\0'; errno = 0; result = strtod (input, &ptr); - ASSERT (result == 1.0); /* MacOS X 10.3, FreeBSD 6.2, NetBSD 3.0, OpenBSD 4.0, IRIX 6.5, OSF/1 5.1, mingw */ + ASSERT (result == 1.0); /* Mac OS X 10.3, FreeBSD 6.2, NetBSD 3.0, OpenBSD 4.0, IRIX 6.5, OSF/1 5.1, mingw */ ASSERT (ptr == input + m); - ASSERT (errno == 0); /* MacOS X 10.3, FreeBSD 6.2, NetBSD 3.0, OpenBSD 4.0, IRIX 6.5, OSF/1 5.1, mingw */ + ASSERT (errno == 0); /* Mac OS X 10.3, FreeBSD 6.2, NetBSD 3.0, OpenBSD 4.0, IRIX 6.5, OSF/1 5.1, mingw */ } free (input); } diff --git a/gnulib-tests/test-strtoimax.c b/gnulib-tests/test-strtoimax.c index d3b84cf8..6a05352e 100644 --- a/gnulib-tests/test-strtoimax.c +++ b/gnulib-tests/test-strtoimax.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2012 Free Software Foundation, Inc. + * 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 diff --git a/gnulib-tests/test-strtoll.c b/gnulib-tests/test-strtoll.c index 04350cef..b4809201 100644 --- a/gnulib-tests/test-strtoll.c +++ b/gnulib-tests/test-strtoll.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2012 Free Software Foundation, Inc. + * 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 diff --git a/gnulib-tests/test-strtoull.c b/gnulib-tests/test-strtoull.c index 3fcc3e73..e69be3d5 100644 --- a/gnulib-tests/test-strtoull.c +++ b/gnulib-tests/test-strtoull.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2012 Free Software Foundation, Inc. + * 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 diff --git a/gnulib-tests/test-strtoumax.c b/gnulib-tests/test-strtoumax.c index 2577b0ca..fbacb728 100644 --- a/gnulib-tests/test-strtoumax.c +++ b/gnulib-tests/test-strtoumax.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2012 Free Software Foundation, Inc. + * 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 diff --git a/gnulib-tests/test-symlink.c b/gnulib-tests/test-symlink.c index b3caac92..9966516e 100644 --- a/gnulib-tests/test-symlink.c +++ b/gnulib-tests/test-symlink.c @@ -1,5 +1,5 @@ /* Tests of symlink. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-symlink.h b/gnulib-tests/test-symlink.h index a7c40794..56cdc840 100644 --- a/gnulib-tests/test-symlink.h +++ b/gnulib-tests/test-symlink.h @@ -1,5 +1,5 @@ /* Tests of symlink. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-symlinkat.c b/gnulib-tests/test-symlinkat.c index 49eebee9..11d38351 100644 --- a/gnulib-tests/test-symlinkat.c +++ b/gnulib-tests/test-symlinkat.c @@ -1,5 +1,5 @@ /* Tests of symlinkat. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 @@ -67,6 +67,7 @@ main (void) ); } { + close (99); errno = 0; ASSERT (symlinkat ("foo", 99, "bar") == -1); ASSERT (errno == EBADF diff --git a/gnulib-tests/test-sys_ioctl.c b/gnulib-tests/test-sys_ioctl.c index 725cabf1..605ebb09 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-sys_resource.c b/gnulib-tests/test-sys_resource.c index 0ff297bc..890d6371 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 Free Software Foundation, Inc. + Copyright (C) 2012-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 diff --git a/gnulib-tests/test-sys_select.c b/gnulib-tests/test-sys_select.c index 78f66edd..cd84c010 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-sys_socket.c b/gnulib-tests/test-sys_socket.c index 271815d1..0ac8a332 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-2012 Free Software Foundation, Inc. + Copyright (C) 2007, 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 diff --git a/gnulib-tests/test-sys_stat.c b/gnulib-tests/test-sys_stat.c index 0702e04f..1ce35817 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 @@ -49,6 +49,7 @@ int a[] = S_ISSOCK (S_IFREG), S_ISDOOR (S_IFREG), S_ISMPB (S_IFREG), + S_ISMPX (S_IFREG), S_ISNAM (S_IFREG), S_ISNWK (S_IFREG), S_ISPORT (S_IFREG), @@ -190,6 +191,20 @@ verify (!S_ISMPB (S_IFLNK)); verify (!S_ISMPB (S_IFSOCK)); #endif +#ifdef S_IFBLK +verify (!S_ISMPX (S_IFBLK)); +#endif +verify (!S_ISMPX (S_IFCHR)); +verify (!S_ISMPX (S_IFDIR)); +verify (!S_ISMPX (S_IFIFO)); +verify (!S_ISMPX (S_IFREG)); +#ifdef S_IFLNK +verify (!S_ISMPX (S_IFLNK)); +#endif +#ifdef S_IFSOCK +verify (!S_ISMPX (S_IFSOCK)); +#endif + #ifdef S_IFBLK verify (!S_ISNAM (S_IFBLK)); #endif diff --git a/gnulib-tests/test-sys_time.c b/gnulib-tests/test-sys_time.c index 44e21a27..1389b520 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-2012 Free Software Foundation, Inc. + Copyright (C) 2007, 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 diff --git a/gnulib-tests/test-sys_types.c b/gnulib-tests/test-sys_types.c index c2af992b..1045de7c 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-sys_uio.c b/gnulib-tests/test-sys_uio.c index ffb46ce1..df36faf1 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-sys_utsname.c b/gnulib-tests/test-sys_utsname.c index 1fa9e17b..835029dd 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-sys_wait.c b/gnulib-tests/test-sys_wait.c index 3ed2e2e6..4dd21305 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-sys_wait.h b/gnulib-tests/test-sys_wait.h index d3726df0..d78b19e0 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-2012 Free Software Foundation, Inc. + Copyright (C) 2010-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 diff --git a/gnulib-tests/test-termios.c b/gnulib-tests/test-termios.c index 5c9d263d..b2a74ee9 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-2012 Free Software Foundation, Inc. + Copyright (C) 2010-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 diff --git a/gnulib-tests/test-thread_create.c b/gnulib-tests/test-thread_create.c index 0f86771e..b47bb1b8 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-thread_self.c b/gnulib-tests/test-thread_self.c index 707f7fe0..27db4b2f 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-time.c b/gnulib-tests/test-time.c index acf3d2df..c0601367 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-2012 Free Software Foundation, Inc. + Copyright (C) 2007, 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 @@ -26,7 +26,7 @@ struct timespec t1; #if 0 /* POSIX:2008 does not require pid_t in <time.h> unconditionally, and indeed - it's missing on MacOS X 10.5, FreeBSD 6.4, OpenBSD 4.9, mingw. */ + it's missing on Mac OS X 10.5, FreeBSD 6.4, OpenBSD 4.9, mingw. */ pid_t t2; #endif diff --git a/gnulib-tests/test-tls.c b/gnulib-tests/test-tls.c index 84085d75..8f7d516a 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-2012 Free Software Foundation, Inc. + Copyright (C) 2005, 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 @@ -66,7 +66,7 @@ # define yield() #endif -static inline void +static void perhaps_yield (void) { /* Call yield () only with a certain probability, otherwise with GNU Pth diff --git a/gnulib-tests/test-u64.c b/gnulib-tests/test-u64.c index 8be841df..7e425cb0 100644 --- a/gnulib-tests/test-u64.c +++ b/gnulib-tests/test-u64.c @@ -1,5 +1,5 @@ /* Test of <u64.h> - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-uname.c b/gnulib-tests/test-uname.c index 5e86e8b1..0aa02f03 100644 --- a/gnulib-tests/test-uname.c +++ b/gnulib-tests/test-uname.c @@ -1,5 +1,5 @@ /* Test of system information. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-unistd.c b/gnulib-tests/test-unistd.c index e53fd7a0..5470985a 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-2012 Free Software Foundation, Inc. + Copyright (C) 2007, 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 diff --git a/gnulib-tests/test-unlink.c b/gnulib-tests/test-unlink.c index 39a77bca..90de10cf 100644 --- a/gnulib-tests/test-unlink.c +++ b/gnulib-tests/test-unlink.c @@ -1,5 +1,5 @@ /* Tests of unlink. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-unlink.h b/gnulib-tests/test-unlink.h index 3118618d..31288db4 100644 --- a/gnulib-tests/test-unlink.h +++ b/gnulib-tests/test-unlink.h @@ -1,5 +1,5 @@ /* Tests of unlink. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-unlinkat.c b/gnulib-tests/test-unlinkat.c index 94c280c2..430d1891 100644 --- a/gnulib-tests/test-unlinkat.c +++ b/gnulib-tests/test-unlinkat.c @@ -1,5 +1,5 @@ /* Tests of unlinkat. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 @@ -75,6 +75,7 @@ main (int argc _GL_UNUSED, char *argv[]) ASSERT (errno == EBADF); } { + close (99); errno = 0; ASSERT (unlinkat (99, "foo", 0) == -1); ASSERT (errno == EBADF); diff --git a/gnulib-tests/test-unsetenv.c b/gnulib-tests/test-unsetenv.c index 926526d4..c369e2af 100644 --- a/gnulib-tests/test-unsetenv.c +++ b/gnulib-tests/test-unsetenv.c @@ -1,5 +1,5 @@ /* Tests of unsetenv. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-update-copyright.sh b/gnulib-tests/test-update-copyright.sh index 80b8c5a8..60cb3726 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-2012 Free Software Foundation, Inc. +# Copyright (C) 2009-2013 Free Software Foundation, Inc. # This file is part of the GNUlib Library. # # This program is free software: you can redistribute it and/or modify @@ -505,6 +505,9 @@ cat > $TMP.extra-text-space <<EOF /* Copyright 1987, 1988, 1991, 1992 Free Software Foundation, Inc. *** * End of comments. */ EOF +cat > $TMP.two-digit-final-is-substr-of-first <<EOF + /* Copyright 1991, 99 Free Software Foundation, Inc. */ +EOF UPDATE_COPYRIGHT_YEAR=2010 \ update-copyright $TMP.* 1> $TMP-stdout 2> $TMP-stderr compare /dev/null $TMP-stdout || exit 1 @@ -536,6 +539,9 @@ compare - $TMP.extra-text-space <<EOF || exit 1 Inc. *** * End of comments. */ EOF +compare - $TMP.two-digit-final-is-substr-of-first <<EOF || exit 1 + /* Copyright 1991, 1999, 2010 Free Software Foundation, Inc. */ +EOF rm $TMP* exit 0 diff --git a/gnulib-tests/test-userspec.c b/gnulib-tests/test-userspec.c index dd8c41e2..5b026648 100644 --- a/gnulib-tests/test-userspec.c +++ b/gnulib-tests/test-userspec.c @@ -1,5 +1,5 @@ /* Test userspec.c - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-usleep.c b/gnulib-tests/test-usleep.c index 1e4cac1c..097c1725 100644 --- a/gnulib-tests/test-usleep.c +++ b/gnulib-tests/test-usleep.c @@ -1,5 +1,5 @@ /* Test of usleep() function. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-utimens-common.h b/gnulib-tests/test-utimens-common.h index d1fb0f41..5bd46796 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-2012 Free Software Foundation, Inc. + 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 @@ -59,7 +59,7 @@ enum { /* Compare two st_ctime values. Return -1, 0 or 1, respectively when A's st_ctime is smaller than, equal to or greater than B's. */ -static inline int +static int ctime_compare (struct stat const *a, struct stat const *b) { if (a->st_ctime < b->st_ctime) diff --git a/gnulib-tests/test-utimens.c b/gnulib-tests/test-utimens.c index 29b0de1a..9120ec98 100644 --- a/gnulib-tests/test-utimens.c +++ b/gnulib-tests/test-utimens.c @@ -1,5 +1,5 @@ /* Tests of utimens. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-utimens.h b/gnulib-tests/test-utimens.h index 84ac533b..ad898757 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-utimensat.c b/gnulib-tests/test-utimensat.c index f1f5ae6d..439bf250 100644 --- a/gnulib-tests/test-utimensat.c +++ b/gnulib-tests/test-utimensat.c @@ -1,5 +1,5 @@ /* Tests of utimensat. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 @@ -76,6 +76,7 @@ main (void) ASSERT (errno == EBADF); } { + close (99); errno = 0; ASSERT (utimensat (99, "foo", NULL, 0) == -1); ASSERT (errno == EBADF); diff --git a/gnulib-tests/test-vasnprintf.c b/gnulib-tests/test-vasnprintf.c index 4e548b1e..f29b05ae 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-vasprintf-posix.c b/gnulib-tests/test-vasprintf-posix.c index d7a3b151..503d3269 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 @@ -306,7 +306,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) } { /* Rounding can turn a ...FFF into a ...000. - This shows a MacOS X 10.3.9 (Darwin 7.9) bug. */ + This shows a Mac OS X 10.3.9 (Darwin 7.9) bug. */ char *result; int retval = my_asprintf (&result, "%.1a %d", 1.999, 33, 44, 55); @@ -721,7 +721,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) } { /* Rounding can turn a ...FFF into a ...000. - This shows a MacOS X 10.3.9 (Darwin 7.9) bug and a + This shows a Mac OS X 10.3.9 (Darwin 7.9) bug and a glibc 2.4 bug <http://sourceware.org/bugzilla/show_bug.cgi?id=2908>. */ char *result; int retval = diff --git a/gnulib-tests/test-vasprintf.c b/gnulib-tests/test-vasprintf.c index 4d7635b1..459b92d2 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-vc-list-files-cvs.sh b/gnulib-tests/test-vc-list-files-cvs.sh index 68b0a0f9..1dbc532a 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-2012 Free Software Foundation, Inc. +# Copyright (C) 2008-2013 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 1ea6d896..8cbd00b6 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-2012 Free Software Foundation, Inc. +# Copyright (C) 2008-2013 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 5ab9c586..1056b4e4 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-2012 Free Software Foundation, Inc. + Copyright (C) 2005, 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 diff --git a/gnulib-tests/test-version-etc.c b/gnulib-tests/test-version-etc.c index 36ced60b..66027f31 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-2012 Free Software Foundation, Inc. + Copyright (C) 2009-2013 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 945383be..466c9592 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-2012 Free Software Foundation, Inc. +# Copyright (C) 2009-2013 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 706ee704..53f951c0 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-vprintf-posix.c b/gnulib-tests/test-vprintf-posix.c index f64bf831..3593b1db 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-wchar.c b/gnulib-tests/test-wchar.c index 0d720057..92ae8f22 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-wcrtomb-w32.c b/gnulib-tests/test-wcrtomb-w32.c index 9342f787..494bbd13 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-wcrtomb.c b/gnulib-tests/test-wcrtomb.c index 99e427d6..c0769735 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-wctype-h.c b/gnulib-tests/test-wctype-h.c index 467f05b0..5ab5d0c2 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-wcwidth.c b/gnulib-tests/test-wcwidth.c index bb9ec03b..6d85665e 100644 --- a/gnulib-tests/test-wcwidth.c +++ b/gnulib-tests/test-wcwidth.c @@ -1,5 +1,5 @@ /* Test of wcwidth() function. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-write.c b/gnulib-tests/test-write.c index 944b477b..90e9a222 100644 --- a/gnulib-tests/test-write.c +++ b/gnulib-tests/test-write.c @@ -1,5 +1,5 @@ /* Test the write() function. - Copyright (C) 2011-2012 Free Software Foundation, Inc. + 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 @@ -66,6 +66,7 @@ main (void) } { char byte = 'x'; + close (99); errno = 0; ASSERT (write (99, &byte, 1) == -1); ASSERT (errno == EBADF); diff --git a/gnulib-tests/test-xalloc-die.c b/gnulib-tests/test-xalloc-die.c index 7b5aa693..e6376f85 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/test-xalloc-die.sh b/gnulib-tests/test-xalloc-die.sh index 233fd96a..920d222f 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-2012 Free Software Foundation, Inc. +# Copyright (C) 2009-2013 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 f4b46e3b..dcf8a92a 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-xprintf-posix.c b/gnulib-tests/test-xprintf-posix.c index 710a19f1..594b7794 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-xstrtol.c b/gnulib-tests/test-xstrtol.c index 1983d9b4..c07e2952 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-2012 Free Software Foundation, Inc. + Copyright (C) 1995-1996, 1998-2001, 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 diff --git a/gnulib-tests/test-xvasprintf.c b/gnulib-tests/test-xvasprintf.c index 4a90059a..0a2f1b82 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/test-yesno.c b/gnulib-tests/test-yesno.c index 352c8973..f77d6333 100644 --- a/gnulib-tests/test-yesno.c +++ b/gnulib-tests/test-yesno.c @@ -1,5 +1,5 @@ /* Test of yesno module. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/unistr/test-strncat.h b/gnulib-tests/unistr/test-strncat.h index 8415b199..3d28436c 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-2012 Free Software Foundation, Inc. + Copyright (C) 2010-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 diff --git a/gnulib-tests/unistr/test-u8-mbtoucr.c b/gnulib-tests/unistr/test-u8-mbtoucr.c index 9e38885e..763d9319 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-2012 Free Software Foundation, Inc. + Copyright (C) 2010-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 diff --git a/gnulib-tests/unistr/test-u8-uctomb.c b/gnulib-tests/unistr/test-u8-uctomb.c index 988808e4..b0ecb30e 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-2012 Free Software Foundation, Inc. + Copyright (C) 2010-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 diff --git a/gnulib-tests/uniwidth/test-uc_width.c b/gnulib-tests/uniwidth/test-uc_width.c index 9da153b0..43d9d10b 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/uniwidth/test-uc_width2.c b/gnulib-tests/uniwidth/test-uc_width2.c index 172f4729..623f32ca 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/gnulib-tests/unlinkdir.c b/gnulib-tests/unlinkdir.c index f991a2fc..dc1937a0 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-2012 Free Software Foundation, Inc. + 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 @@ -21,6 +21,7 @@ #include "unlinkdir.h" #include "priv-set.h" +#include "root-uid.h" #include <unistd.h> #if ! UNLINK_CANNOT_UNLINK_DIR @@ -43,7 +44,7 @@ cannot_unlink_dir (void) cannot = (priv_set_ismember (PRIV_SYS_LINKDIR) == 0); # else /* In traditional Unix, only root can unlink directories. */ - cannot = (geteuid () != 0); + cannot = (geteuid () != ROOT_UID); # endif initialized = true; } diff --git a/gnulib-tests/unlinkdir.h b/gnulib-tests/unlinkdir.h index 2e2897d2..9f461e97 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-2012 Free Software Foundation, Inc. + Copyright (C) 2005, 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 diff --git a/gnulib-tests/usleep.c b/gnulib-tests/usleep.c index ea640bfa..008cc1f0 100644 --- a/gnulib-tests/usleep.c +++ b/gnulib-tests/usleep.c @@ -1,5 +1,5 @@ /* Pausing execution of the current thread. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/w32sock.h b/gnulib-tests/w32sock.h index ef0b5937..44f3a1a0 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-2012 Free Software Foundation, Inc. + 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 diff --git a/gnulib-tests/wctob.c b/gnulib-tests/wctob.c index 0885c1b1..508f896b 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-2012 Free Software Foundation, Inc. + Copyright (C) 2008, 2010-2013 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 68264cfb..60dc3b90 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-2012 Free Software Foundation, Inc. + Copyright (C) 2011-2013 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 736a7c70..37611084 100644 --- a/gnulib-tests/wctomb.c +++ b/gnulib-tests/wctomb.c @@ -1,5 +1,5 @@ /* Convert wide character to multibyte character. - Copyright (C) 2011-2012 Free Software Foundation, Inc. + Copyright (C) 2011-2013 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 9c060e79..f0e61556 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-2012 Free Software Foundation, Inc. + 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 diff --git a/init.cfg b/init.cfg new file mode 100644 index 00000000..afee9307 --- /dev/null +++ b/init.cfg @@ -0,0 +1,575 @@ +# This file is sourced by init.sh, *before* its initialization. + +# Copyright (C) 2010-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/>. + +# This goes hand in hand with the "exec 9>&2;" in tests/Makefile.am's +# TESTS_ENVIRONMENT definition. +stderr_fileno_=9 + +# Having an unsearchable directory in PATH causes execve to fail with EACCES +# when applied to an unresolvable program name, contrary to the desired ENOENT. +# Avoid the problem by rewriting PATH to exclude unsearchable directories. +# Also, if PATH lacks /sbin and/or /usr/sbin, append it/them. +sanitize_path_() +{ + # FIXME: remove double quotes around $IFS when all tests use init.sh. + # They constitute a work-around for a bug in FreeBSD 8.1's /bin/sh. + local saved_IFS="$IFS" + IFS=: + set -- $PATH + IFS=$saved_IFS + + local d d1 + local colon= + local new_path= + for d in "$@"; do + test -z "$d" && d1=. || d1=$d + if ls -d "$d1/." > /dev/null 2>&1; then + new_path="$new_path$colon$d" + colon=':' + fi + done + + for d in /sbin /usr/sbin ; do + case ":$new_path:" in + *:$d:*) ;; + *) new_path="$new_path:$d" ;; + esac + done + + PATH=$new_path + export PATH +} + +getlimits_() +{ + eval $(getlimits) + test "$INT_MAX" || fatal_ "running getlimits" +} + +require_acl_() +{ + getfacl --version < /dev/null > /dev/null 2>&1 \ + && setfacl --version < /dev/null > /dev/null 2>&1 \ + || skip_ "This test requires getfacl and setfacl." + + id -u bin > /dev/null 2>&1 \ + || skip_ "This test requires a local user named bin." +} + +is_local_dir_() +{ + test $# = 1 || framework_failure_ + df --local "$1" >/dev/null 2>&1 +} + +require_mount_list_() +{ + local mount_list_fail='cannot read table of mounted file systems' + df 2>&1 | grep -F "$mount_list_fail" >/dev/null && + skip_ "$mount_list_fail" +} + +require_local_dir_() +{ + require_mount_list_ + is_local_dir_ . || + skip_ "This test must be run on a local file system." +} + +# Skip this test if we're not in SELinux "enforcing" mode. +require_selinux_enforcing_() +{ + test "$(getenforce)" = Enforcing \ + || skip_ "This test is useful only with SELinux in Enforcing mode." +} + +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' + + _skip=yes + grep '^#define HAVE_OPENAT' "$CONFIG_HEADER" > /dev/null && _skip=no + test -d /proc/self/fd && _skip=no + if test $_skip = yes; then + skip_ 'this system lacks openat support' + fi +} + +require_ulimit_() +{ + local ulimit_works=yes + # Expect to be able to exec a program in 10MiB of virtual memory, + # (10MiB is usually plenty, but valgrind-wrapped date requires 19000KiB, + # so allow more in that case) + # but not in 20KiB. I chose "date". It must not be a shell built-in + # function, so you can't use echo, printf, true, etc. + # Of course, in coreutils, I could use $top_builddir/src/true, + # but this should be able to work for other projects, too. + local vm + case $(printenv LD_PRELOAD) in */valgrind/*) vm=22000;; *) vm=10000;; esac + + ( ulimit -v $vm; date ) > /dev/null 2>&1 || ulimit_works=no + ( ulimit -v 20; date ) > /dev/null 2>&1 && ulimit_works=no + + test $ulimit_works = no \ + && skip_ "this shell lacks ulimit support" +} + +require_readable_root_() +{ + test -r / || skip_ "/ is not readable" +} + +# Skip the current test if strace is not available or doesn't work +# with the named syscall. Usage: require_strace_ unlink +require_strace_() +{ + test $# = 1 || framework_failure_ + + strace -V < /dev/null > /dev/null 2>&1 || + skip_ 'no strace program' + + strace -qe "$1" echo > /dev/null 2>&1 || + skip_ 'strace -qe "'"$1"'" does not work' + + # On some linux/sparc64 systems, strace works fine on 32-bit executables, + # but prints only one line of output for every 64-bit executable. + strace -o log-help ls --help >/dev/null || framework_failure_ + n_lines_help=$(wc -l < log-help) + rm -f log-help + if test $n_lines_help = 0 || test $n_lines_help = 1; then + skip_ 'strace produces no more than one line of output' + fi +} + +# Skip the current test if valgrind doesn't work, +# which could happen if not installed, +# or hasn't support for the built architecture, +# or hasn't appropriate error suppressions installed etc. +require_valgrind_() +{ + valgrind --error-exitcode=1 true 2>/dev/null || + skip_ "requires a working valgrind" +} + +require_setfacl_() +{ + setfacl -m user::rwx . \ + || skip_ "setfacl does not work on the current file system" +} + +# Require a controlling input 'terminal'. +require_controlling_input_terminal_() +{ + tty -s || have_input_tty=no + test -t 0 || have_input_tty=no + if test "$have_input_tty" = no; then + skip_ 'requires controlling input terminal +This test must have a controlling input "terminal", so it may not be +run via "batch", "at", or "ssh". On some systems, it may not even be +run in the background.' + fi +} + +require_built_() +{ + skip_=no + for i in "$@"; do + case " $built_programs " in + *" $i "*) ;; + *) echo "$i: not built" 1>&2; skip_=yes ;; + esac + done + + test $skip_ = yes && skip_ "required program(s) not built" +} + +require_file_system_bytes_free_() +{ + local req=$1 + local expr=$(stat -f --printf "$req / %S <= %a" .) + $AWK "BEGIN{ exit !($expr) }" \ + || skip_ "this test needs at least $req bytes of free space" +} + +uid_is_privileged_() +{ + # Make sure id -u succeeds. + my_uid=$(id -u) \ + || { echo "$0: cannot run 'id -u'" 1>&2; return 1; } + + # Make sure it gives valid output. + case $my_uid in + 0) ;; + *[!0-9]*) + echo "$0: invalid output ('$my_uid') from 'id -u'" 1>&2 + return 1 ;; + *) return 1 ;; + esac +} + +get_process_status_() +{ + sed -n '/^State:[ ]*\([[:alpha:]]\).*/s//\1/p' /proc/$1/status +} + +# Convert an ls-style permission string, like drwxr----x and -rw-r-x-wx +# to the equivalent chmod --mode (-m) argument, (=,u=rwx,g=r,o=x and +# =,u=rw,g=rx,o=wx). Ignore ACLs. +rwx_to_mode_() +{ + case $# in + 1) rwx=$1;; + *) echo "$0: wrong number of arguments" 1>&2 + echo "Usage: $0 ls-style-mode-string" 1>&2 + return;; + esac + + case $rwx in + [ld-][rwx-][rwx-][rwxsS-][rwx-][rwx-][rwxsS-][rwx-][rwx-][rwxtT-]) ;; + [ld-][rwx-][rwx-][rwxsS-][rwx-][rwx-][rwxsS-][rwx-][rwx-][rwxtT-][+.]) ;; + *) echo "$0: invalid mode string: $rwx" 1>&2; return;; + esac + + # Perform these conversions: + # S s + # s xs + # T t + # t xt + # The 'T' and 't' ones are only valid for 'other'. + s='s/S/@/;s/s/x@/;s/@/s/' + t='s/T/@/;s/t/x@/;s/@/t/' + + u=$(echo $rwx|sed 's/^.\(...\).*/,u=\1/;s/-//g;s/^,u=$//;'$s) + g=$(echo $rwx|sed 's/^....\(...\).*/,g=\1/;s/-//g;s/^,g=$//;'$s) + o=$(echo $rwx|sed 's/^.......\(...\).*/,o=\1/;s/-//g;s/^,o=$//;'$s';'$t) + echo "=$u$g$o" +} + +# Set the global variable stty_reversible_ to a space-separated list of the +# reversible settings from stty.c. stty_reversible_ also starts and ends +# with a space. +stty_reversible_init_() +{ + # Pad start with one space for the first option to match in query function. + stty_reversible_=' '$(perl -lne '/^ *{"(.*?)",.*\bREV\b/ and print $1' \ + "$abs_top_srcdir"/src/stty.c | tr '\n' ' ') + # Ensure that there are at least 62, i.e., so we're alerted if + # reformatting the source empties the list. + test 62 -le $(echo "$stty_reversible_"|wc -w) \ + || framework_failure_ "too few reversible settings" +} + +# Test whether $1 is one of stty's reversible options. +stty_reversible_query_() +{ + case $stty_reversible_ in + '') + framework_failure_ "stty_reversible_init_() not called?";; + *" $1 "*) + return 0;; + *) + return 1;; + esac +} + +skip_if_() +{ + case $1 in + root) skip_ must be run as root ;; + non-root) skip_ must be run as non-root ;; + *) ;; # FIXME? + 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 + skip_ 'very expensive: disabled by default +This test is very expensive, so it is disabled by default. +To run it anyway, rerun make check with the RUN_VERY_EXPENSIVE_TESTS +environment variable set to yes. E.g., + + env RUN_VERY_EXPENSIVE_TESTS=yes make check + +or use the shortcut target of the toplevel Makefile, + + make check-very-expensive +' + fi +} + +expensive_() +{ + if test "$RUN_EXPENSIVE_TESTS" != yes; then + skip_ 'expensive: disabled by default +This test is relatively expensive, so it is disabled by default. +To run it anyway, rerun make check with the RUN_EXPENSIVE_TESTS +environment variable set to yes. E.g., + + env RUN_EXPENSIVE_TESTS=yes make check + +or use the shortcut target of the toplevel Makefile, + + make check-expensive +' + fi +} + +# Test whether we can run our just-built rm setuidgid-to-root, +# i.e., that $NON_ROOT_USERNAME has access to the build directory. +setuidgid_has_perm_() +{ + local rm_version=$( + setuidgid $NON_ROOT_USERNAME env PATH="$PATH" rm --version | + sed -n '1s/.* //p' + ) + case ":$rm_version:" in + :$PACKAGE_VERSION:) ;; + *) return 1;; + esac +} + +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)} + + # When the current test invokes setuidgid, call setuidgid_has_perm_ + # to check for a common problem. + grep '^[ ]*setuidgid' "../$0" \ + && { setuidgid_has_perm_ \ + || skip_ "user $NON_ROOT_USERNAME lacks execute permissions"; } +} + +skip_if_root_() { uid_is_privileged_ && skip_ "must be run as non-root"; } + +# Set 'groups' to a space-separated list of at least two groups +# of which the user is a member. +require_membership_in_two_groups_() +{ + test $# = 0 || framework_failure_ + + groups=${COREUTILS_GROUPS-$( (id -G || /usr/xpg4/bin/id -G) 2>/dev/null)} + case "$groups" in + *' '*) ;; + *) skip_ 'requires membership in two groups +this test requires that you be a member of more than one group, +but running 'id -G'\'' either failed or found just one. If you really +are a member of at least two groups, then rerun this test with +COREUTILS_GROUPS set in your environment to the space-separated list +of group names or numbers. E.g., + + env COREUTILS_GROUPS='\''users cdrom'\'' make check + +' + ;; + esac +} + +# Is /proc/$PID/status supported? +require_proc_pid_status_() +{ + sleep 2 & + local pid=$! + sleep .5 + grep '^State:[ ]*[S]' /proc/$pid/status > /dev/null 2>&1 || + skip_ "/proc/$pid/status: missing or 'different'" + kill $pid +} + +# Return nonzero if the specified path is on a file system for +# which FIEMAP support exists. Note some file systems (like ext3 and btrfs) +# only support FIEMAP for files, not directories. +fiemap_capable_() +{ + if ! python < /dev/null; then + warn_ 'fiemap_capable_: python missing: assuming not fiemap capable' + return 1 + fi + python "$abs_srcdir"/tests/fiemap-capable "$@" +} + +# Skip the current test if "." lacks d_type support. +require_dirent_d_type_() +{ + python < /dev/null \ + || skip_ python missing: assuming no d_type support + + # Manually exclude xfs, since the test would mistakenly report + # that it has d_type support: d_type == DT_DIR for "." and "..", + # but DT_UNKNOWN for all other types. + df -x xfs . > /dev/null 2>&1 \ + || skip_ requires d_type support + + python "$abs_srcdir"/tests/d_type-check \ + || skip_ requires d_type support +} + +# Skip the current test if we lack Perl. +require_perl_() +{ + : ${PERL=perl} + $PERL -e 'use warnings' > /dev/null 2>&1 \ + || skip_ 'configure did not find a usable version of Perl' +} + +# Does the current (working-dir) file system support sparse files? +require_sparse_support_() +{ + test $# = 0 || framework_failure_ + # Test whether we can create a sparse file. + # For example, on Darwin6.5 with a file system of type hfs, it's not possible. + # NTFS requires 128K before a hole appears in a sparse file. + t=sparse.$$ + dd bs=1 seek=128K of=$t < /dev/null 2> /dev/null + set x $(du -sk $t) + kb_size=$2 + rm -f $t + if test $kb_size -ge 128; then + skip_ 'this file system does not support sparse files' + fi +} + +mkfifo_or_skip_() +{ + test $# = 1 || framework_failure_ + if ! mkfifo "$1"; then + # Make an exception of this case -- usually we interpret framework-creation + # failure as a test failure. However, in this case, when running on a SunOS + # system using a disk NFS mounted from OpenBSD, the above fails like this: + # mkfifo: cannot make fifo 'fifo-10558': Not owner + skip_ 'unable to create a fifo' + fi +} + +# Disable the current test if the working directory seems to have +# the setgid bit set. +skip_if_setgid_() +{ + setgid_tmpdir=setgid-$$ + (umask 77; mkdir $setgid_tmpdir) + perms=$(stat --printf %A $setgid_tmpdir) + rmdir $setgid_tmpdir + case $perms in + drwx------);; + drwxr-xr-x);; # Windows98 + DJGPP 2.03 + *) skip_ 'this directory has the setgid bit set';; + esac +} + +skip_if_mcstransd_is_running_() +{ + test $# = 0 || framework_failure_ + + # When mcstransd is running, you'll see only the 3-component + # version of file-system context strings. Detect that, + # and if it's running, skip this test. + __ctx=$(stat --printf='%C\n' .) || framework_failure_ + case $__ctx in + *:*:*:*) ;; # four components is ok + *) # anything else probably means mcstransd is running + skip_ "unexpected context '$__ctx'; turn off mcstransd" ;; + esac +} + +# Skip the current test if umask doesn't work as usual. +# This test should be run in the temporary directory that ends +# up being removed via the trap commands. +working_umask_or_skip_() +{ + umask 022 + touch file1 file2 + chmod 644 file2 + perms=$(ls -l file1 file2 | sed 's/ .*//' | uniq) + rm -f file1 file2 + + case $perms in + *' + '*) skip_ 'your build directory has unusual umask semantics' + esac +} + +# Retry a function requiring a sufficient delay to _pass_ +# using a truncated exponential backoff method. +# Example: retry_delay_ dd_reblock_1 .1 6 +# This example will call the dd_reblock_1 function with +# an initial delay of .1 second and call it at most 6 times +# with a max delay of 3.2s (doubled each time), or a total of 6.3s +# 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. +retry_delay_() +{ + local test_func=$1 + local init_delay=$2 + local max_n_tries=$3 + + local attempt=1 + local num_sleeps=$attempt + local time_fail + 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 + attempt=$(expr $attempt + 1) + num_sleeps=$(expr $num_sleeps '*' 2) + done + test "$time_fail" = 0 +} + +# Call this with a list of programs under test immediately after +# sourcing init.sh. +print_ver_() +{ + if test "$VERBOSE" = yes; then + local i + for i in $*; do + env $i --version + done + fi +} + +# Are we running on GNU/Hurd? +require_gnu_() +{ + test "$(uname)" = GNU \ + || skip_ 'not running on GNU/Hurd' +} + +sanitize_path_ diff --git a/lib/ChangeLog-2007 b/lib/ChangeLog-2007 index c9f3c30f..b872b2a0 100644 --- a/lib/ChangeLog-2007 +++ b/lib/ChangeLog-2007 @@ -8746,7 +8746,7 @@ ----- - Copyright (C) 2000-2012 Free Software Foundation, Inc. + Copyright (C) 2000-2013 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice diff --git a/lib/Makefile.am b/lib/Makefile.am deleted file mode 100644 index 885f9b2d..00000000 --- a/lib/Makefile.am +++ /dev/null @@ -1,37 +0,0 @@ -## Makefile for gnulib/lib -*-Makefile-*- - -# Copyright (C) 1995-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 -## 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/>. - -AM_CFLAGS = -AM_CPPFLAGS = -BUILT_SOURCES = -CLEANFILES = -EXTRA_DIST = -MAINTAINERCLEANFILES = -MOSTLYCLEANDIRS = -MOSTLYCLEANFILES = -SUFFIXES = -noinst_LIBRARIES = - -include gnulib.mk - -AM_CFLAGS += $(GNULIB_WARN_CFLAGS) $(WERROR_CFLAGS) - -libcoreutils_a_SOURCES += \ - buffer-lcm.c buffer-lcm.h - -libcoreutils_a_LIBADD += $(LIBOBJS) -libcoreutils_a_DEPENDENCIES += $(LIBOBJS) diff --git a/lib/Makefile.in b/lib/Makefile.in deleted file mode 100644 index 8892aa5f..00000000 --- a/lib/Makefile.in +++ /dev/null @@ -1,4823 +0,0 @@ -# Makefile.in generated by automake 1.12a from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2012 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. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# Copyright (C) 1995-2012 Free Software Foundation, Inc. - -# Copyright (C) 2002-2012 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 -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This file is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this file. If not, see <http://www.gnu.org/licenses/>. -# -# As a special exception to the GNU General Public License, -# this file may be distributed as part of a program that -# contains a configuration script generated by Autoconf, under -# 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 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 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 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 stdbool stdlib-safer stpcpy stpncpy strdup-posix strftime strncat 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 xgetcwd xgetgroups xgethostname xmemcoll xnanosleep xprintf xprintf-posix xreadlink xstrtod xstrtoimax xstrtol xstrtold xstrtoumax yesno - -VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ - 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;; \ - esac; \ - test $$am__dry = yes; \ - } -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -DIST_COMMON = $(srcdir)/gnulib.mk $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(srcdir)/config.hin alloca.c \ - fd-reopen.h strintcmp.c fd-reopen.c strnumcmp-in.h xfts.h \ - strnumcmp.c strnumcmp.h xfts.c parse-datetime.c \ - $(top_srcdir)/build-aux/depcomp $(top_srcdir)/build-aux/ylwrap -@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR_TRUE@am__append_1 = unistr/u8-mbtoucr.c -@LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE@am__append_2 = unistr/u8-uctomb.c unistr/u8-uctomb-aux.c -@LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE@am__append_3 = uniwidth/width.c -subdir = lib -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/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 \ - $(top_srcdir)/m4/close-stream.m4 $(top_srcdir)/m4/close.m4 \ - $(top_srcdir)/m4/closedir.m4 $(top_srcdir)/m4/closein.m4 \ - $(top_srcdir)/m4/closeout.m4 $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/config-h.m4 $(top_srcdir)/m4/configmake.m4 \ - $(top_srcdir)/m4/ctype.m4 $(top_srcdir)/m4/cycle-check.m4 \ - $(top_srcdir)/m4/d-ino.m4 $(top_srcdir)/m4/d-type.m4 \ - $(top_srcdir)/m4/dirent-safer.m4 $(top_srcdir)/m4/dirent_h.m4 \ - $(top_srcdir)/m4/dirfd.m4 $(top_srcdir)/m4/dirname.m4 \ - $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup.m4 \ - $(top_srcdir)/m4/dup2.m4 $(top_srcdir)/m4/eealloc.m4 \ - $(top_srcdir)/m4/environ.m4 $(top_srcdir)/m4/errno_h.m4 \ - $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/euidaccess.m4 \ - $(top_srcdir)/m4/exponentd.m4 $(top_srcdir)/m4/exponentf.m4 \ - $(top_srcdir)/m4/exponentl.m4 $(top_srcdir)/m4/extensions.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/fd-reopen.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/freading.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/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 \ - $(top_srcdir)/m4/getgroups.m4 $(top_srcdir)/m4/gethostname.m4 \ - $(top_srcdir)/m4/gethrxtime.m4 $(top_srcdir)/m4/getline.m4 \ - $(top_srcdir)/m4/getloadavg.m4 $(top_srcdir)/m4/getlogin.m4 \ - $(top_srcdir)/m4/getndelim2.m4 $(top_srcdir)/m4/getopt.m4 \ - $(top_srcdir)/m4/getpagesize.m4 $(top_srcdir)/m4/getpass.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/gmp.m4 $(top_srcdir)/m4/gnu-make.m4 \ - $(top_srcdir)/m4/gnulib-common.m4 \ - $(top_srcdir)/m4/gnulib-comp.m4 \ - $(top_srcdir)/m4/group-member.m4 \ - $(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/host-os.m4 \ - $(top_srcdir)/m4/hostent.m4 $(top_srcdir)/m4/human.m4 \ - $(top_srcdir)/m4/i-ring.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/iconv_h.m4 $(top_srcdir)/m4/iconv_open.m4 \ - $(top_srcdir)/m4/idcache.m4 \ - $(top_srcdir)/m4/include-exclude-prog.m4 \ - $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inet_ntop.m4 \ - $(top_srcdir)/m4/inet_pton.m4 $(top_srcdir)/m4/inline.m4 \ - $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intmax_t.m4 \ - $(top_srcdir)/m4/inttostr.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ - $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ - $(top_srcdir)/m4/ioctl.m4 $(top_srcdir)/m4/isapipe.m4 \ - $(top_srcdir)/m4/isatty.m4 $(top_srcdir)/m4/isblank.m4 \ - $(top_srcdir)/m4/isnand.m4 $(top_srcdir)/m4/isnanf.m4 \ - $(top_srcdir)/m4/isnanl.m4 $(top_srcdir)/m4/iswblank.m4 \ - $(top_srcdir)/m4/jm-macros.m4 $(top_srcdir)/m4/jm-winsz1.m4 \ - $(top_srcdir)/m4/jm-winsz2.m4 $(top_srcdir)/m4/langinfo_h.m4 \ - $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lchmod.m4 \ - $(top_srcdir)/m4/lchown.m4 $(top_srcdir)/m4/lcmessage.m4 \ - $(top_srcdir)/m4/ldexp.m4 $(top_srcdir)/m4/ldexpl.m4 \ - $(top_srcdir)/m4/lib-check.m4 $(top_srcdir)/m4/lib-ignore.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/libunistring-base.m4 \ - $(top_srcdir)/m4/link-follow.m4 $(top_srcdir)/m4/link.m4 \ - $(top_srcdir)/m4/linkat.m4 $(top_srcdir)/m4/localcharset.m4 \ - $(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \ - $(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \ - $(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localeconv.m4 \ - $(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \ - $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/ls-mntd-fs.m4 \ - $(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \ - $(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \ - $(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/math_h.m4 \ - $(top_srcdir)/m4/mbchar.m4 $(top_srcdir)/m4/mbiter.m4 \ - $(top_srcdir)/m4/mbrlen.m4 $(top_srcdir)/m4/mbrtowc.m4 \ - $(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbslen.m4 \ - $(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbswidth.m4 $(top_srcdir)/m4/mbtowc.m4 \ - $(top_srcdir)/m4/md5.m4 $(top_srcdir)/m4/memcasecmp.m4 \ - $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/memcoll.m4 \ - $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \ - $(top_srcdir)/m4/mgetgroups.m4 $(top_srcdir)/m4/mkancesdirs.m4 \ - $(top_srcdir)/m4/mkdir-p.m4 $(top_srcdir)/m4/mkdir.m4 \ - $(top_srcdir)/m4/mkfifo.m4 $(top_srcdir)/m4/mknod.m4 \ - $(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mktime.m4 \ - $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \ - $(top_srcdir)/m4/modechange.m4 $(top_srcdir)/m4/mountlist.m4 \ - $(top_srcdir)/m4/mpsort.m4 $(top_srcdir)/m4/msvc-inval.m4 \ - $(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \ - $(top_srcdir)/m4/nanosleep.m4 $(top_srcdir)/m4/netdb_h.m4 \ - $(top_srcdir)/m4/netinet_in_h.m4 \ - $(top_srcdir)/m4/nl_langinfo.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/nproc.m4 \ - $(top_srcdir)/m4/off_t.m4 $(top_srcdir)/m4/open.m4 \ - $(top_srcdir)/m4/openat.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/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/root-dev-ino.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/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/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/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 \ - $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stdbool.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/strcase.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/strings_h.m4 $(top_srcdir)/m4/strncat.m4 \ - $(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \ - $(top_srcdir)/m4/strnumcmp.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 \ - $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \ - $(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/sys_uio_h.m4 \ - $(top_srcdir)/m4/sys_utsname_h.m4 \ - $(top_srcdir)/m4/sys_wait_h.m4 $(top_srcdir)/m4/tempname.m4 \ - $(top_srcdir)/m4/termios_h.m4 $(top_srcdir)/m4/thread.m4 \ - $(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/time_h.m4 \ - $(top_srcdir)/m4/time_r.m4 $(top_srcdir)/m4/timer_time.m4 \ - $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tls.m4 \ - $(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/tzset.m4 \ - $(top_srcdir)/m4/uname.m4 $(top_srcdir)/m4/ungetc.m4 \ - $(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \ - $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink-busy.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/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/xfts.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)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = -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 = @ -libcoreutils_a_AR = $(AR) $(ARFLAGS) -am__DEPENDENCIES_1 = -am__libcoreutils_a_SOURCES_DIST = set-mode-acl.c copy-acl.c \ - file-has-acl.c allocator.c areadlink.c areadlink-with-size.c \ - areadlinkat.c argmatch.c argv-iter.c argv-iter.h backupfile.c \ - base64.h base64.c binary-io.h bitrotate.h c-ctype.h c-ctype.c \ - c-strcase.h c-strcasecmp.c c-strncasecmp.c c-strtod.c \ - c-strtold.c canon-host.c canonicalize.c careadlinkat.c \ - cloexec.c close-stream.c closein.c closeout.c md5.c sha1.c \ - sha256.c sha512.c cycle-check.c di-set.c di-set.h diacrit.h \ - diacrit.c opendir-safer.c dirname.c basename.c dirname-lgpl.c \ - basename-lgpl.c stripslash.c dtoastr.c dtotimespec.c exclude.c \ - exitfail.c fadvise.c fadvise.h fatal-signal.h fatal-signal.c \ - creat-safer.c open-safer.c fd-hook.c fd-safer-flag.c \ - dup-safer-flag.c fdutimensat.c file-set.c file-type.c \ - filemode.c filenamecat.c filenamecat-lgpl.c filevercmp.c \ - fopen-safer.c fprintftime.c freadahead.c freading.c freadptr.c \ - freadseek.c freopen-safer.c fseterr.c ftoastr.c full-read.h \ - full-read.c full-write.h full-write.c getndelim2.c gettext.h \ - gettime.c getugroups.c hard-locale.c hash.c hash-pjw.h \ - hash-pjw.c hash-triple.c heap.c heap.h human.c i-ring.c \ - idcache.c ino-map.c ino-map.h imaxtostr.c inttostr.c \ - offtostr.c uinttostr.c umaxtostr.c ldtoastr.c linebuffer.h \ - linebuffer.c localcharset.h localcharset.c glthread/lock.h \ - glthread/lock.c long-options.c malloca.c mbchar.c mbiter.h \ - mbsalign.c mbsalign.h mbscasecmp.c mbslen.c mbsstr.c \ - mbswidth.h mbswidth.c mbuiter.h memcasecmp.c memchr2.h \ - memchr2.c memcmp2.c memcoll.c mgetgroups.c mkancesdirs.c \ - dirchownmod.c mkdir-p.c modechange.c mpsort.c nproc.c \ - openat-die.c openat-safer.c parse-datetime.y physmem.c pipe2.c \ - pipe2-safer.c posixtm.c posixver.c printf-frexp.c \ - printf-frexpl.c priv-set.c progname.h progname.c propername.h \ - propername.c quotearg.c randint.c randint.h randperm.c \ - randperm.h randread.c randread.h rand-isaac.c rand-isaac.h \ - read-file.c readtokens.c readtokens0.h readtokens0.c \ - safe-read.c safe-write.c same.c save-cwd.c savedir.c savewd.h \ - savewd.c se-context.in.h se-selinux.in.h settime.c size_max.h \ - sockets.h sockets.c spawn-pipe.h spawn-pipe.c w32spawn.h \ - mkstemp-safer.c strftime.c striconv.h striconv.c strnlen1.h \ - strnlen1.c tempname.c glthread/threadlib.c glthread/tls.h \ - glthread/tls.c trim.c unicodeio.h unicodeio.c dup-safer.c \ - fd-safer.c pipe-safer.c unistr/u8-mbtoucr.c unistr/u8-uctomb.c \ - unistr/u8-uctomb-aux.c uniwidth/width.c userspec.c utimecmp.c \ - utimens.c verror.h verror.c version-etc.h version-etc.c \ - version-etc-fsf.c wait-process.h wait-process.c \ - write-any-file.c xmalloc.c xalloc-die.c xfreopen.c xfreopen.h \ - xgetcwd.c xgetgroups.c xgethostname.h xgethostname.c \ - xmemcoll.h xmemcoll.c xnanosleep.c xprintf.h xprintf.c \ - xreadlink.c xsize.h xstriconv.h xstriconv.c xstrndup.h \ - xstrndup.c xstrtod.c xstrtoimax.c xstrtol.c xstrtoul.c \ - xstrtol-error.c xstrtold.c xstrtoumax.c xvasprintf.h \ - xvasprintf.c xasprintf.c yesno.c buffer-lcm.c buffer-lcm.h -@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR_TRUE@am__objects_1 = u8-mbtoucr.$(OBJEXT) -@LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE@am__objects_2 = u8-uctomb.$(OBJEXT) \ -@LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE@ u8-uctomb-aux.$(OBJEXT) -@LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE@am__objects_3 = \ -@LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE@ width.$(OBJEXT) -am_libcoreutils_a_OBJECTS = set-mode-acl.$(OBJEXT) copy-acl.$(OBJEXT) \ - file-has-acl.$(OBJEXT) allocator.$(OBJEXT) areadlink.$(OBJEXT) \ - areadlink-with-size.$(OBJEXT) areadlinkat.$(OBJEXT) \ - argmatch.$(OBJEXT) argv-iter.$(OBJEXT) backupfile.$(OBJEXT) \ - base64.$(OBJEXT) c-ctype.$(OBJEXT) c-strcasecmp.$(OBJEXT) \ - c-strncasecmp.$(OBJEXT) c-strtod.$(OBJEXT) c-strtold.$(OBJEXT) \ - canon-host.$(OBJEXT) canonicalize.$(OBJEXT) \ - careadlinkat.$(OBJEXT) cloexec.$(OBJEXT) \ - close-stream.$(OBJEXT) closein.$(OBJEXT) closeout.$(OBJEXT) \ - md5.$(OBJEXT) sha1.$(OBJEXT) sha256.$(OBJEXT) sha512.$(OBJEXT) \ - cycle-check.$(OBJEXT) di-set.$(OBJEXT) diacrit.$(OBJEXT) \ - opendir-safer.$(OBJEXT) dirname.$(OBJEXT) basename.$(OBJEXT) \ - dirname-lgpl.$(OBJEXT) basename-lgpl.$(OBJEXT) \ - stripslash.$(OBJEXT) dtoastr.$(OBJEXT) dtotimespec.$(OBJEXT) \ - exclude.$(OBJEXT) exitfail.$(OBJEXT) fadvise.$(OBJEXT) \ - fatal-signal.$(OBJEXT) creat-safer.$(OBJEXT) \ - open-safer.$(OBJEXT) fd-hook.$(OBJEXT) fd-safer-flag.$(OBJEXT) \ - dup-safer-flag.$(OBJEXT) fdutimensat.$(OBJEXT) \ - file-set.$(OBJEXT) file-type.$(OBJEXT) filemode.$(OBJEXT) \ - filenamecat.$(OBJEXT) filenamecat-lgpl.$(OBJEXT) \ - filevercmp.$(OBJEXT) fopen-safer.$(OBJEXT) \ - fprintftime.$(OBJEXT) freadahead.$(OBJEXT) freading.$(OBJEXT) \ - freadptr.$(OBJEXT) freadseek.$(OBJEXT) freopen-safer.$(OBJEXT) \ - fseterr.$(OBJEXT) ftoastr.$(OBJEXT) full-read.$(OBJEXT) \ - full-write.$(OBJEXT) getndelim2.$(OBJEXT) gettime.$(OBJEXT) \ - getugroups.$(OBJEXT) hard-locale.$(OBJEXT) hash.$(OBJEXT) \ - hash-pjw.$(OBJEXT) hash-triple.$(OBJEXT) heap.$(OBJEXT) \ - human.$(OBJEXT) i-ring.$(OBJEXT) idcache.$(OBJEXT) \ - ino-map.$(OBJEXT) imaxtostr.$(OBJEXT) inttostr.$(OBJEXT) \ - offtostr.$(OBJEXT) uinttostr.$(OBJEXT) umaxtostr.$(OBJEXT) \ - ldtoastr.$(OBJEXT) linebuffer.$(OBJEXT) localcharset.$(OBJEXT) \ - lock.$(OBJEXT) long-options.$(OBJEXT) malloca.$(OBJEXT) \ - mbchar.$(OBJEXT) mbsalign.$(OBJEXT) mbscasecmp.$(OBJEXT) \ - mbslen.$(OBJEXT) mbsstr.$(OBJEXT) mbswidth.$(OBJEXT) \ - memcasecmp.$(OBJEXT) memchr2.$(OBJEXT) memcmp2.$(OBJEXT) \ - memcoll.$(OBJEXT) mgetgroups.$(OBJEXT) mkancesdirs.$(OBJEXT) \ - dirchownmod.$(OBJEXT) mkdir-p.$(OBJEXT) modechange.$(OBJEXT) \ - mpsort.$(OBJEXT) nproc.$(OBJEXT) openat-die.$(OBJEXT) \ - openat-safer.$(OBJEXT) parse-datetime.$(OBJEXT) \ - physmem.$(OBJEXT) pipe2.$(OBJEXT) pipe2-safer.$(OBJEXT) \ - posixtm.$(OBJEXT) posixver.$(OBJEXT) printf-frexp.$(OBJEXT) \ - printf-frexpl.$(OBJEXT) priv-set.$(OBJEXT) progname.$(OBJEXT) \ - propername.$(OBJEXT) quotearg.$(OBJEXT) randint.$(OBJEXT) \ - randperm.$(OBJEXT) randread.$(OBJEXT) rand-isaac.$(OBJEXT) \ - read-file.$(OBJEXT) readtokens.$(OBJEXT) readtokens0.$(OBJEXT) \ - safe-read.$(OBJEXT) safe-write.$(OBJEXT) same.$(OBJEXT) \ - save-cwd.$(OBJEXT) savedir.$(OBJEXT) savewd.$(OBJEXT) \ - settime.$(OBJEXT) sockets.$(OBJEXT) spawn-pipe.$(OBJEXT) \ - mkstemp-safer.$(OBJEXT) strftime.$(OBJEXT) striconv.$(OBJEXT) \ - strnlen1.$(OBJEXT) tempname.$(OBJEXT) threadlib.$(OBJEXT) \ - tls.$(OBJEXT) trim.$(OBJEXT) unicodeio.$(OBJEXT) \ - dup-safer.$(OBJEXT) fd-safer.$(OBJEXT) pipe-safer.$(OBJEXT) \ - $(am__objects_1) $(am__objects_2) $(am__objects_3) \ - userspec.$(OBJEXT) utimecmp.$(OBJEXT) utimens.$(OBJEXT) \ - verror.$(OBJEXT) version-etc.$(OBJEXT) \ - version-etc-fsf.$(OBJEXT) wait-process.$(OBJEXT) \ - write-any-file.$(OBJEXT) xmalloc.$(OBJEXT) \ - xalloc-die.$(OBJEXT) xfreopen.$(OBJEXT) xgetcwd.$(OBJEXT) \ - xgetgroups.$(OBJEXT) xgethostname.$(OBJEXT) xmemcoll.$(OBJEXT) \ - xnanosleep.$(OBJEXT) xprintf.$(OBJEXT) xreadlink.$(OBJEXT) \ - xstriconv.$(OBJEXT) xstrndup.$(OBJEXT) xstrtod.$(OBJEXT) \ - xstrtoimax.$(OBJEXT) xstrtol.$(OBJEXT) xstrtoul.$(OBJEXT) \ - xstrtol-error.$(OBJEXT) xstrtold.$(OBJEXT) \ - xstrtoumax.$(OBJEXT) xvasprintf.$(OBJEXT) xasprintf.$(OBJEXT) \ - yesno.$(OBJEXT) buffer-lcm.$(OBJEXT) -libcoreutils_a_OBJECTS = $(am_libcoreutils_a_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp -am__depfiles_maybe = depfiles -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 -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 " $@; -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__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 " $@; -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 = $(libcoreutils_a_SOURCES) $(EXTRA_libcoreutils_a_SOURCES) -DIST_SOURCES = $(am__libcoreutils_a_SOURCES_DIST) \ - $(EXTRA_libcoreutils_a_SOURCES) -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -pkglibexecdir = @pkglibexecdir@ -ACLOCAL = @ACLOCAL@ -ALLOCA = @ALLOCA@ -ALLOCA_H = @ALLOCA_H@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ -AR = @AR@ -ARFLAGS = @ARFLAGS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BITSIZEOF_PTRDIFF_T = @BITSIZEOF_PTRDIFF_T@ -BITSIZEOF_SIG_ATOMIC_T = @BITSIZEOF_SIG_ATOMIC_T@ -BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@ -BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@ -BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CONFIG_INCLUDE = @CONFIG_INCLUDE@ -CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFAULT_POSIX2_VERSION = @DEFAULT_POSIX2_VERSION@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EMULTIHOP_HIDDEN = @EMULTIHOP_HIDDEN@ -EMULTIHOP_VALUE = @EMULTIHOP_VALUE@ -ENOLINK_HIDDEN = @ENOLINK_HIDDEN@ -ENOLINK_VALUE = @ENOLINK_VALUE@ -EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ -EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ -ERRNO_H = @ERRNO_H@ -EXEEXT = @EXEEXT@ -FLOAT_H = @FLOAT_H@ -FNMATCH_H = @FNMATCH_H@ -GETADDRINFO_LIB = @GETADDRINFO_LIB@ -GETHOSTNAME_LIB = @GETHOSTNAME_LIB@ -GETLOADAVG_LIBS = @GETLOADAVG_LIBS@ -GETOPT_H = @GETOPT_H@ -GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ -GLIBC21 = @GLIBC21@ -GMSGFMT = @GMSGFMT@ -GMSGFMT_015 = @GMSGFMT_015@ -GNULIB_ACCEPT = @GNULIB_ACCEPT@ -GNULIB_ACCEPT4 = @GNULIB_ACCEPT4@ -GNULIB_ACOSF = @GNULIB_ACOSF@ -GNULIB_ACOSL = @GNULIB_ACOSL@ -GNULIB_ALPHASORT = @GNULIB_ALPHASORT@ -GNULIB_ASINF = @GNULIB_ASINF@ -GNULIB_ASINL = @GNULIB_ASINL@ -GNULIB_ATAN2F = @GNULIB_ATAN2F@ -GNULIB_ATANF = @GNULIB_ATANF@ -GNULIB_ATANL = @GNULIB_ATANL@ -GNULIB_ATOLL = @GNULIB_ATOLL@ -GNULIB_BIND = @GNULIB_BIND@ -GNULIB_BTOWC = @GNULIB_BTOWC@ -GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@ -GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@ -GNULIB_CBRT = @GNULIB_CBRT@ -GNULIB_CBRTF = @GNULIB_CBRTF@ -GNULIB_CBRTL = @GNULIB_CBRTL@ -GNULIB_CEIL = @GNULIB_CEIL@ -GNULIB_CEILF = @GNULIB_CEILF@ -GNULIB_CEILL = @GNULIB_CEILL@ -GNULIB_CHDIR = @GNULIB_CHDIR@ -GNULIB_CHOWN = @GNULIB_CHOWN@ -GNULIB_CLOSE = @GNULIB_CLOSE@ -GNULIB_CLOSEDIR = @GNULIB_CLOSEDIR@ -GNULIB_CONNECT = @GNULIB_CONNECT@ -GNULIB_COPYSIGN = @GNULIB_COPYSIGN@ -GNULIB_COPYSIGNF = @GNULIB_COPYSIGNF@ -GNULIB_COPYSIGNL = @GNULIB_COPYSIGNL@ -GNULIB_COSF = @GNULIB_COSF@ -GNULIB_COSHF = @GNULIB_COSHF@ -GNULIB_COSL = @GNULIB_COSL@ -GNULIB_DIRFD = @GNULIB_DIRFD@ -GNULIB_DPRINTF = @GNULIB_DPRINTF@ -GNULIB_DUP = @GNULIB_DUP@ -GNULIB_DUP2 = @GNULIB_DUP2@ -GNULIB_DUP3 = @GNULIB_DUP3@ -GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@ -GNULIB_ENVIRON = @GNULIB_ENVIRON@ -GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@ -GNULIB_EXP2 = @GNULIB_EXP2@ -GNULIB_EXP2F = @GNULIB_EXP2F@ -GNULIB_EXP2L = @GNULIB_EXP2L@ -GNULIB_EXPF = @GNULIB_EXPF@ -GNULIB_EXPL = @GNULIB_EXPL@ -GNULIB_EXPM1 = @GNULIB_EXPM1@ -GNULIB_EXPM1F = @GNULIB_EXPM1F@ -GNULIB_EXPM1L = @GNULIB_EXPM1L@ -GNULIB_FABSF = @GNULIB_FABSF@ -GNULIB_FABSL = @GNULIB_FABSL@ -GNULIB_FACCESSAT = @GNULIB_FACCESSAT@ -GNULIB_FCHDIR = @GNULIB_FCHDIR@ -GNULIB_FCHMODAT = @GNULIB_FCHMODAT@ -GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@ -GNULIB_FCLOSE = @GNULIB_FCLOSE@ -GNULIB_FCNTL = @GNULIB_FCNTL@ -GNULIB_FDATASYNC = @GNULIB_FDATASYNC@ -GNULIB_FDOPEN = @GNULIB_FDOPEN@ -GNULIB_FDOPENDIR = @GNULIB_FDOPENDIR@ -GNULIB_FFLUSH = @GNULIB_FFLUSH@ -GNULIB_FFS = @GNULIB_FFS@ -GNULIB_FFSL = @GNULIB_FFSL@ -GNULIB_FFSLL = @GNULIB_FFSLL@ -GNULIB_FGETC = @GNULIB_FGETC@ -GNULIB_FGETS = @GNULIB_FGETS@ -GNULIB_FLOOR = @GNULIB_FLOOR@ -GNULIB_FLOORF = @GNULIB_FLOORF@ -GNULIB_FLOORL = @GNULIB_FLOORL@ -GNULIB_FMA = @GNULIB_FMA@ -GNULIB_FMAF = @GNULIB_FMAF@ -GNULIB_FMAL = @GNULIB_FMAL@ -GNULIB_FMOD = @GNULIB_FMOD@ -GNULIB_FMODF = @GNULIB_FMODF@ -GNULIB_FMODL = @GNULIB_FMODL@ -GNULIB_FOPEN = @GNULIB_FOPEN@ -GNULIB_FPRINTF = @GNULIB_FPRINTF@ -GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@ -GNULIB_FPURGE = @GNULIB_FPURGE@ -GNULIB_FPUTC = @GNULIB_FPUTC@ -GNULIB_FPUTS = @GNULIB_FPUTS@ -GNULIB_FREAD = @GNULIB_FREAD@ -GNULIB_FREOPEN = @GNULIB_FREOPEN@ -GNULIB_FREXP = @GNULIB_FREXP@ -GNULIB_FREXPF = @GNULIB_FREXPF@ -GNULIB_FREXPL = @GNULIB_FREXPL@ -GNULIB_FSCANF = @GNULIB_FSCANF@ -GNULIB_FSEEK = @GNULIB_FSEEK@ -GNULIB_FSEEKO = @GNULIB_FSEEKO@ -GNULIB_FSTAT = @GNULIB_FSTAT@ -GNULIB_FSTATAT = @GNULIB_FSTATAT@ -GNULIB_FSYNC = @GNULIB_FSYNC@ -GNULIB_FTELL = @GNULIB_FTELL@ -GNULIB_FTELLO = @GNULIB_FTELLO@ -GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@ -GNULIB_FUTIMENS = @GNULIB_FUTIMENS@ -GNULIB_FWRITE = @GNULIB_FWRITE@ -GNULIB_GETADDRINFO = @GNULIB_GETADDRINFO@ -GNULIB_GETC = @GNULIB_GETC@ -GNULIB_GETCHAR = @GNULIB_GETCHAR@ -GNULIB_GETCWD = @GNULIB_GETCWD@ -GNULIB_GETDELIM = @GNULIB_GETDELIM@ -GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@ -GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@ -GNULIB_GETGROUPS = @GNULIB_GETGROUPS@ -GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@ -GNULIB_GETLINE = @GNULIB_GETLINE@ -GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@ -GNULIB_GETLOGIN = @GNULIB_GETLOGIN@ -GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ -GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ -GNULIB_GETPEERNAME = @GNULIB_GETPEERNAME@ -GNULIB_GETRUSAGE = @GNULIB_GETRUSAGE@ -GNULIB_GETSOCKNAME = @GNULIB_GETSOCKNAME@ -GNULIB_GETSOCKOPT = @GNULIB_GETSOCKOPT@ -GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@ -GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ -GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ -GNULIB_GL_UNISTD_H_GETOPT = @GNULIB_GL_UNISTD_H_GETOPT@ -GNULIB_GRANTPT = @GNULIB_GRANTPT@ -GNULIB_GROUP_MEMBER = @GNULIB_GROUP_MEMBER@ -GNULIB_HYPOT = @GNULIB_HYPOT@ -GNULIB_HYPOTF = @GNULIB_HYPOTF@ -GNULIB_HYPOTL = @GNULIB_HYPOTL@ -GNULIB_ICONV = @GNULIB_ICONV@ -GNULIB_ILOGB = @GNULIB_ILOGB@ -GNULIB_ILOGBF = @GNULIB_ILOGBF@ -GNULIB_ILOGBL = @GNULIB_ILOGBL@ -GNULIB_IMAXABS = @GNULIB_IMAXABS@ -GNULIB_IMAXDIV = @GNULIB_IMAXDIV@ -GNULIB_INET_NTOP = @GNULIB_INET_NTOP@ -GNULIB_INET_PTON = @GNULIB_INET_PTON@ -GNULIB_IOCTL = @GNULIB_IOCTL@ -GNULIB_ISATTY = @GNULIB_ISATTY@ -GNULIB_ISBLANK = @GNULIB_ISBLANK@ -GNULIB_ISFINITE = @GNULIB_ISFINITE@ -GNULIB_ISINF = @GNULIB_ISINF@ -GNULIB_ISNAN = @GNULIB_ISNAN@ -GNULIB_ISNAND = @GNULIB_ISNAND@ -GNULIB_ISNANF = @GNULIB_ISNANF@ -GNULIB_ISNANL = @GNULIB_ISNANL@ -GNULIB_ISWBLANK = @GNULIB_ISWBLANK@ -GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@ -GNULIB_LCHMOD = @GNULIB_LCHMOD@ -GNULIB_LCHOWN = @GNULIB_LCHOWN@ -GNULIB_LDEXPF = @GNULIB_LDEXPF@ -GNULIB_LDEXPL = @GNULIB_LDEXPL@ -GNULIB_LINK = @GNULIB_LINK@ -GNULIB_LINKAT = @GNULIB_LINKAT@ -GNULIB_LISTEN = @GNULIB_LISTEN@ -GNULIB_LOCALECONV = @GNULIB_LOCALECONV@ -GNULIB_LOG = @GNULIB_LOG@ -GNULIB_LOG10 = @GNULIB_LOG10@ -GNULIB_LOG10F = @GNULIB_LOG10F@ -GNULIB_LOG10L = @GNULIB_LOG10L@ -GNULIB_LOG1P = @GNULIB_LOG1P@ -GNULIB_LOG1PF = @GNULIB_LOG1PF@ -GNULIB_LOG1PL = @GNULIB_LOG1PL@ -GNULIB_LOG2 = @GNULIB_LOG2@ -GNULIB_LOG2F = @GNULIB_LOG2F@ -GNULIB_LOG2L = @GNULIB_LOG2L@ -GNULIB_LOGB = @GNULIB_LOGB@ -GNULIB_LOGBF = @GNULIB_LOGBF@ -GNULIB_LOGBL = @GNULIB_LOGBL@ -GNULIB_LOGF = @GNULIB_LOGF@ -GNULIB_LOGL = @GNULIB_LOGL@ -GNULIB_LSEEK = @GNULIB_LSEEK@ -GNULIB_LSTAT = @GNULIB_LSTAT@ -GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ -GNULIB_MBRLEN = @GNULIB_MBRLEN@ -GNULIB_MBRTOWC = @GNULIB_MBRTOWC@ -GNULIB_MBSCASECMP = @GNULIB_MBSCASECMP@ -GNULIB_MBSCASESTR = @GNULIB_MBSCASESTR@ -GNULIB_MBSCHR = @GNULIB_MBSCHR@ -GNULIB_MBSCSPN = @GNULIB_MBSCSPN@ -GNULIB_MBSINIT = @GNULIB_MBSINIT@ -GNULIB_MBSLEN = @GNULIB_MBSLEN@ -GNULIB_MBSNCASECMP = @GNULIB_MBSNCASECMP@ -GNULIB_MBSNLEN = @GNULIB_MBSNLEN@ -GNULIB_MBSNRTOWCS = @GNULIB_MBSNRTOWCS@ -GNULIB_MBSPBRK = @GNULIB_MBSPBRK@ -GNULIB_MBSPCASECMP = @GNULIB_MBSPCASECMP@ -GNULIB_MBSRCHR = @GNULIB_MBSRCHR@ -GNULIB_MBSRTOWCS = @GNULIB_MBSRTOWCS@ -GNULIB_MBSSEP = @GNULIB_MBSSEP@ -GNULIB_MBSSPN = @GNULIB_MBSSPN@ -GNULIB_MBSSTR = @GNULIB_MBSSTR@ -GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@ -GNULIB_MBTOWC = @GNULIB_MBTOWC@ -GNULIB_MEMCHR = @GNULIB_MEMCHR@ -GNULIB_MEMMEM = @GNULIB_MEMMEM@ -GNULIB_MEMPCPY = @GNULIB_MEMPCPY@ -GNULIB_MEMRCHR = @GNULIB_MEMRCHR@ -GNULIB_MKDIRAT = @GNULIB_MKDIRAT@ -GNULIB_MKDTEMP = @GNULIB_MKDTEMP@ -GNULIB_MKFIFO = @GNULIB_MKFIFO@ -GNULIB_MKFIFOAT = @GNULIB_MKFIFOAT@ -GNULIB_MKNOD = @GNULIB_MKNOD@ -GNULIB_MKNODAT = @GNULIB_MKNODAT@ -GNULIB_MKOSTEMP = @GNULIB_MKOSTEMP@ -GNULIB_MKOSTEMPS = @GNULIB_MKOSTEMPS@ -GNULIB_MKSTEMP = @GNULIB_MKSTEMP@ -GNULIB_MKSTEMPS = @GNULIB_MKSTEMPS@ -GNULIB_MKTIME = @GNULIB_MKTIME@ -GNULIB_MODF = @GNULIB_MODF@ -GNULIB_MODFF = @GNULIB_MODFF@ -GNULIB_MODFL = @GNULIB_MODFL@ -GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@ -GNULIB_NL_LANGINFO = @GNULIB_NL_LANGINFO@ -GNULIB_NONBLOCKING = @GNULIB_NONBLOCKING@ -GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@ -GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ -GNULIB_OPEN = @GNULIB_OPEN@ -GNULIB_OPENAT = @GNULIB_OPENAT@ -GNULIB_OPENDIR = @GNULIB_OPENDIR@ -GNULIB_PCLOSE = @GNULIB_PCLOSE@ -GNULIB_PERROR = @GNULIB_PERROR@ -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@ -GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@ -GNULIB_PSELECT = @GNULIB_PSELECT@ -GNULIB_PTHREAD_SIGMASK = @GNULIB_PTHREAD_SIGMASK@ -GNULIB_PTSNAME = @GNULIB_PTSNAME@ -GNULIB_PTSNAME_R = @GNULIB_PTSNAME_R@ -GNULIB_PUTC = @GNULIB_PUTC@ -GNULIB_PUTCHAR = @GNULIB_PUTCHAR@ -GNULIB_PUTENV = @GNULIB_PUTENV@ -GNULIB_PUTS = @GNULIB_PUTS@ -GNULIB_PWRITE = @GNULIB_PWRITE@ -GNULIB_RAISE = @GNULIB_RAISE@ -GNULIB_RANDOM = @GNULIB_RANDOM@ -GNULIB_RANDOM_R = @GNULIB_RANDOM_R@ -GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ -GNULIB_READ = @GNULIB_READ@ -GNULIB_READDIR = @GNULIB_READDIR@ -GNULIB_READLINK = @GNULIB_READLINK@ -GNULIB_READLINKAT = @GNULIB_READLINKAT@ -GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@ -GNULIB_REALPATH = @GNULIB_REALPATH@ -GNULIB_RECV = @GNULIB_RECV@ -GNULIB_RECVFROM = @GNULIB_RECVFROM@ -GNULIB_REMAINDER = @GNULIB_REMAINDER@ -GNULIB_REMAINDERF = @GNULIB_REMAINDERF@ -GNULIB_REMAINDERL = @GNULIB_REMAINDERL@ -GNULIB_REMOVE = @GNULIB_REMOVE@ -GNULIB_RENAME = @GNULIB_RENAME@ -GNULIB_RENAMEAT = @GNULIB_RENAMEAT@ -GNULIB_REWINDDIR = @GNULIB_REWINDDIR@ -GNULIB_RINT = @GNULIB_RINT@ -GNULIB_RINTF = @GNULIB_RINTF@ -GNULIB_RINTL = @GNULIB_RINTL@ -GNULIB_RMDIR = @GNULIB_RMDIR@ -GNULIB_ROUND = @GNULIB_ROUND@ -GNULIB_ROUNDF = @GNULIB_ROUNDF@ -GNULIB_ROUNDL = @GNULIB_ROUNDL@ -GNULIB_RPMATCH = @GNULIB_RPMATCH@ -GNULIB_SCANDIR = @GNULIB_SCANDIR@ -GNULIB_SCANF = @GNULIB_SCANF@ -GNULIB_SELECT = @GNULIB_SELECT@ -GNULIB_SEND = @GNULIB_SEND@ -GNULIB_SENDTO = @GNULIB_SENDTO@ -GNULIB_SETENV = @GNULIB_SETENV@ -GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@ -GNULIB_SETLOCALE = @GNULIB_SETLOCALE@ -GNULIB_SETSOCKOPT = @GNULIB_SETSOCKOPT@ -GNULIB_SHUTDOWN = @GNULIB_SHUTDOWN@ -GNULIB_SIGACTION = @GNULIB_SIGACTION@ -GNULIB_SIGNAL_H_SIGPIPE = @GNULIB_SIGNAL_H_SIGPIPE@ -GNULIB_SIGNBIT = @GNULIB_SIGNBIT@ -GNULIB_SIGPROCMASK = @GNULIB_SIGPROCMASK@ -GNULIB_SINF = @GNULIB_SINF@ -GNULIB_SINHF = @GNULIB_SINHF@ -GNULIB_SINL = @GNULIB_SINL@ -GNULIB_SLEEP = @GNULIB_SLEEP@ -GNULIB_SNPRINTF = @GNULIB_SNPRINTF@ -GNULIB_SOCKET = @GNULIB_SOCKET@ -GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@ -GNULIB_SQRTF = @GNULIB_SQRTF@ -GNULIB_SQRTL = @GNULIB_SQRTL@ -GNULIB_STAT = @GNULIB_STAT@ -GNULIB_STDIO_H_NONBLOCKING = @GNULIB_STDIO_H_NONBLOCKING@ -GNULIB_STDIO_H_SIGPIPE = @GNULIB_STDIO_H_SIGPIPE@ -GNULIB_STPCPY = @GNULIB_STPCPY@ -GNULIB_STPNCPY = @GNULIB_STPNCPY@ -GNULIB_STRCASESTR = @GNULIB_STRCASESTR@ -GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@ -GNULIB_STRDUP = @GNULIB_STRDUP@ -GNULIB_STRERROR = @GNULIB_STRERROR@ -GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ -GNULIB_STRNCAT = @GNULIB_STRNCAT@ -GNULIB_STRNDUP = @GNULIB_STRNDUP@ -GNULIB_STRNLEN = @GNULIB_STRNLEN@ -GNULIB_STRPBRK = @GNULIB_STRPBRK@ -GNULIB_STRPTIME = @GNULIB_STRPTIME@ -GNULIB_STRSEP = @GNULIB_STRSEP@ -GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@ -GNULIB_STRSTR = @GNULIB_STRSTR@ -GNULIB_STRTOD = @GNULIB_STRTOD@ -GNULIB_STRTOIMAX = @GNULIB_STRTOIMAX@ -GNULIB_STRTOK_R = @GNULIB_STRTOK_R@ -GNULIB_STRTOLL = @GNULIB_STRTOLL@ -GNULIB_STRTOULL = @GNULIB_STRTOULL@ -GNULIB_STRTOUMAX = @GNULIB_STRTOUMAX@ -GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@ -GNULIB_SYMLINK = @GNULIB_SYMLINK@ -GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@ -GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@ -GNULIB_TANF = @GNULIB_TANF@ -GNULIB_TANHF = @GNULIB_TANHF@ -GNULIB_TANL = @GNULIB_TANL@ -GNULIB_TCGETSID = @GNULIB_TCGETSID@ -GNULIB_TEST_WARN_CFLAGS = @GNULIB_TEST_WARN_CFLAGS@ -GNULIB_TIMEGM = @GNULIB_TIMEGM@ -GNULIB_TIME_R = @GNULIB_TIME_R@ -GNULIB_TMPFILE = @GNULIB_TMPFILE@ -GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@ -GNULIB_TRUNC = @GNULIB_TRUNC@ -GNULIB_TRUNCF = @GNULIB_TRUNCF@ -GNULIB_TRUNCL = @GNULIB_TRUNCL@ -GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@ -GNULIB_UNAME = @GNULIB_UNAME@ -GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@ -GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ -GNULIB_UNLINK = @GNULIB_UNLINK@ -GNULIB_UNLINKAT = @GNULIB_UNLINKAT@ -GNULIB_UNLOCKPT = @GNULIB_UNLOCKPT@ -GNULIB_UNSETENV = @GNULIB_UNSETENV@ -GNULIB_USLEEP = @GNULIB_USLEEP@ -GNULIB_UTIMENSAT = @GNULIB_UTIMENSAT@ -GNULIB_VASPRINTF = @GNULIB_VASPRINTF@ -GNULIB_VDPRINTF = @GNULIB_VDPRINTF@ -GNULIB_VFPRINTF = @GNULIB_VFPRINTF@ -GNULIB_VFPRINTF_POSIX = @GNULIB_VFPRINTF_POSIX@ -GNULIB_VFSCANF = @GNULIB_VFSCANF@ -GNULIB_VPRINTF = @GNULIB_VPRINTF@ -GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@ -GNULIB_VSCANF = @GNULIB_VSCANF@ -GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@ -GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@ -GNULIB_WAITPID = @GNULIB_WAITPID@ -GNULIB_WARN_CFLAGS = @GNULIB_WARN_CFLAGS@ -GNULIB_WCPCPY = @GNULIB_WCPCPY@ -GNULIB_WCPNCPY = @GNULIB_WCPNCPY@ -GNULIB_WCRTOMB = @GNULIB_WCRTOMB@ -GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@ -GNULIB_WCSCAT = @GNULIB_WCSCAT@ -GNULIB_WCSCHR = @GNULIB_WCSCHR@ -GNULIB_WCSCMP = @GNULIB_WCSCMP@ -GNULIB_WCSCOLL = @GNULIB_WCSCOLL@ -GNULIB_WCSCPY = @GNULIB_WCSCPY@ -GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ -GNULIB_WCSDUP = @GNULIB_WCSDUP@ -GNULIB_WCSLEN = @GNULIB_WCSLEN@ -GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ -GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ -GNULIB_WCSNCMP = @GNULIB_WCSNCMP@ -GNULIB_WCSNCPY = @GNULIB_WCSNCPY@ -GNULIB_WCSNLEN = @GNULIB_WCSNLEN@ -GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@ -GNULIB_WCSPBRK = @GNULIB_WCSPBRK@ -GNULIB_WCSRCHR = @GNULIB_WCSRCHR@ -GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@ -GNULIB_WCSSPN = @GNULIB_WCSSPN@ -GNULIB_WCSSTR = @GNULIB_WCSSTR@ -GNULIB_WCSTOK = @GNULIB_WCSTOK@ -GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@ -GNULIB_WCSXFRM = @GNULIB_WCSXFRM@ -GNULIB_WCTOB = @GNULIB_WCTOB@ -GNULIB_WCTOMB = @GNULIB_WCTOMB@ -GNULIB_WCTRANS = @GNULIB_WCTRANS@ -GNULIB_WCTYPE = @GNULIB_WCTYPE@ -GNULIB_WCWIDTH = @GNULIB_WCWIDTH@ -GNULIB_WMEMCHR = @GNULIB_WMEMCHR@ -GNULIB_WMEMCMP = @GNULIB_WMEMCMP@ -GNULIB_WMEMCPY = @GNULIB_WMEMCPY@ -GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@ -GNULIB_WMEMSET = @GNULIB_WMEMSET@ -GNULIB_WRITE = @GNULIB_WRITE@ -GNULIB__EXIT = @GNULIB__EXIT@ -GREP = @GREP@ -HAVE_ACCEPT4 = @HAVE_ACCEPT4@ -HAVE_ACOSF = @HAVE_ACOSF@ -HAVE_ACOSL = @HAVE_ACOSL@ -HAVE_ALPHASORT = @HAVE_ALPHASORT@ -HAVE_ARPA_INET_H = @HAVE_ARPA_INET_H@ -HAVE_ASINF = @HAVE_ASINF@ -HAVE_ASINL = @HAVE_ASINL@ -HAVE_ATAN2F = @HAVE_ATAN2F@ -HAVE_ATANF = @HAVE_ATANF@ -HAVE_ATANL = @HAVE_ATANL@ -HAVE_ATOLL = @HAVE_ATOLL@ -HAVE_BTOWC = @HAVE_BTOWC@ -HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ -HAVE_CBRT = @HAVE_CBRT@ -HAVE_CBRTF = @HAVE_CBRTF@ -HAVE_CBRTL = @HAVE_CBRTL@ -HAVE_CHOWN = @HAVE_CHOWN@ -HAVE_CLOSEDIR = @HAVE_CLOSEDIR@ -HAVE_COPYSIGN = @HAVE_COPYSIGN@ -HAVE_COPYSIGNL = @HAVE_COPYSIGNL@ -HAVE_COSF = @HAVE_COSF@ -HAVE_COSHF = @HAVE_COSHF@ -HAVE_COSL = @HAVE_COSL@ -HAVE_DECL_ACOSL = @HAVE_DECL_ACOSL@ -HAVE_DECL_ASINL = @HAVE_DECL_ASINL@ -HAVE_DECL_ATANL = @HAVE_DECL_ATANL@ -HAVE_DECL_CBRTF = @HAVE_DECL_CBRTF@ -HAVE_DECL_CBRTL = @HAVE_DECL_CBRTL@ -HAVE_DECL_CEILF = @HAVE_DECL_CEILF@ -HAVE_DECL_CEILL = @HAVE_DECL_CEILL@ -HAVE_DECL_COPYSIGNF = @HAVE_DECL_COPYSIGNF@ -HAVE_DECL_COSL = @HAVE_DECL_COSL@ -HAVE_DECL_DIRFD = @HAVE_DECL_DIRFD@ -HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ -HAVE_DECL_EXP2 = @HAVE_DECL_EXP2@ -HAVE_DECL_EXP2F = @HAVE_DECL_EXP2F@ -HAVE_DECL_EXP2L = @HAVE_DECL_EXP2L@ -HAVE_DECL_EXPL = @HAVE_DECL_EXPL@ -HAVE_DECL_EXPM1L = @HAVE_DECL_EXPM1L@ -HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ -HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@ -HAVE_DECL_FDOPENDIR = @HAVE_DECL_FDOPENDIR@ -HAVE_DECL_FLOORF = @HAVE_DECL_FLOORF@ -HAVE_DECL_FLOORL = @HAVE_DECL_FLOORL@ -HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@ -HAVE_DECL_FREEADDRINFO = @HAVE_DECL_FREEADDRINFO@ -HAVE_DECL_FREXPL = @HAVE_DECL_FREXPL@ -HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@ -HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@ -HAVE_DECL_GAI_STRERROR = @HAVE_DECL_GAI_STRERROR@ -HAVE_DECL_GETADDRINFO = @HAVE_DECL_GETADDRINFO@ -HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@ -HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ -HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ -HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@ -HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ -HAVE_DECL_GETNAMEINFO = @HAVE_DECL_GETNAMEINFO@ -HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ -HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ -HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ -HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ -HAVE_DECL_INET_NTOP = @HAVE_DECL_INET_NTOP@ -HAVE_DECL_INET_PTON = @HAVE_DECL_INET_PTON@ -HAVE_DECL_LDEXPL = @HAVE_DECL_LDEXPL@ -HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@ -HAVE_DECL_LOG10L = @HAVE_DECL_LOG10L@ -HAVE_DECL_LOG2 = @HAVE_DECL_LOG2@ -HAVE_DECL_LOG2F = @HAVE_DECL_LOG2F@ -HAVE_DECL_LOG2L = @HAVE_DECL_LOG2L@ -HAVE_DECL_LOGB = @HAVE_DECL_LOGB@ -HAVE_DECL_LOGL = @HAVE_DECL_LOGL@ -HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ -HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ -HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ -HAVE_DECL_REMAINDER = @HAVE_DECL_REMAINDER@ -HAVE_DECL_REMAINDERL = @HAVE_DECL_REMAINDERL@ -HAVE_DECL_RINTF = @HAVE_DECL_RINTF@ -HAVE_DECL_ROUND = @HAVE_DECL_ROUND@ -HAVE_DECL_ROUNDF = @HAVE_DECL_ROUNDF@ -HAVE_DECL_ROUNDL = @HAVE_DECL_ROUNDL@ -HAVE_DECL_SETENV = @HAVE_DECL_SETENV@ -HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@ -HAVE_DECL_SINL = @HAVE_DECL_SINL@ -HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@ -HAVE_DECL_SQRTL = @HAVE_DECL_SQRTL@ -HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ -HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@ -HAVE_DECL_STRNCASECMP = @HAVE_DECL_STRNCASECMP@ -HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@ -HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@ -HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ -HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ -HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ -HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ -HAVE_DECL_TANL = @HAVE_DECL_TANL@ -HAVE_DECL_TCGETSID = @HAVE_DECL_TCGETSID@ -HAVE_DECL_TRUNC = @HAVE_DECL_TRUNC@ -HAVE_DECL_TRUNCF = @HAVE_DECL_TRUNCF@ -HAVE_DECL_TRUNCL = @HAVE_DECL_TRUNCL@ -HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ -HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ -HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ -HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ -HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ -HAVE_DIRENT_H = @HAVE_DIRENT_H@ -HAVE_DPRINTF = @HAVE_DPRINTF@ -HAVE_DUP2 = @HAVE_DUP2@ -HAVE_DUP3 = @HAVE_DUP3@ -HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ -HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ -HAVE_EXPF = @HAVE_EXPF@ -HAVE_EXPL = @HAVE_EXPL@ -HAVE_EXPM1 = @HAVE_EXPM1@ -HAVE_EXPM1F = @HAVE_EXPM1F@ -HAVE_FABSF = @HAVE_FABSF@ -HAVE_FABSL = @HAVE_FABSL@ -HAVE_FACCESSAT = @HAVE_FACCESSAT@ -HAVE_FCHDIR = @HAVE_FCHDIR@ -HAVE_FCHMODAT = @HAVE_FCHMODAT@ -HAVE_FCHOWNAT = @HAVE_FCHOWNAT@ -HAVE_FCNTL = @HAVE_FCNTL@ -HAVE_FDATASYNC = @HAVE_FDATASYNC@ -HAVE_FDOPENDIR = @HAVE_FDOPENDIR@ -HAVE_FEATURES_H = @HAVE_FEATURES_H@ -HAVE_FFS = @HAVE_FFS@ -HAVE_FFSL = @HAVE_FFSL@ -HAVE_FFSLL = @HAVE_FFSLL@ -HAVE_FMA = @HAVE_FMA@ -HAVE_FMAF = @HAVE_FMAF@ -HAVE_FMAL = @HAVE_FMAL@ -HAVE_FMODF = @HAVE_FMODF@ -HAVE_FMODL = @HAVE_FMODL@ -HAVE_FREXPF = @HAVE_FREXPF@ -HAVE_FSEEKO = @HAVE_FSEEKO@ -HAVE_FSTATAT = @HAVE_FSTATAT@ -HAVE_FSYNC = @HAVE_FSYNC@ -HAVE_FTELLO = @HAVE_FTELLO@ -HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ -HAVE_FUTIMENS = @HAVE_FUTIMENS@ -HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ -HAVE_GETGROUPS = @HAVE_GETGROUPS@ -HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@ -HAVE_GETLOGIN = @HAVE_GETLOGIN@ -HAVE_GETOPT_H = @HAVE_GETOPT_H@ -HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ -HAVE_GETRUSAGE = @HAVE_GETRUSAGE@ -HAVE_GETSUBOPT = @HAVE_GETSUBOPT@ -HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@ -HAVE_GRANTPT = @HAVE_GRANTPT@ -HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@ -HAVE_HYPOTF = @HAVE_HYPOTF@ -HAVE_HYPOTL = @HAVE_HYPOTL@ -HAVE_ILOGB = @HAVE_ILOGB@ -HAVE_ILOGBF = @HAVE_ILOGBF@ -HAVE_ILOGBL = @HAVE_ILOGBL@ -HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ -HAVE_ISBLANK = @HAVE_ISBLANK@ -HAVE_ISNAND = @HAVE_ISNAND@ -HAVE_ISNANF = @HAVE_ISNANF@ -HAVE_ISNANL = @HAVE_ISNANL@ -HAVE_ISWBLANK = @HAVE_ISWBLANK@ -HAVE_ISWCNTRL = @HAVE_ISWCNTRL@ -HAVE_LANGINFO_CODESET = @HAVE_LANGINFO_CODESET@ -HAVE_LANGINFO_ERA = @HAVE_LANGINFO_ERA@ -HAVE_LANGINFO_H = @HAVE_LANGINFO_H@ -HAVE_LANGINFO_T_FMT_AMPM = @HAVE_LANGINFO_T_FMT_AMPM@ -HAVE_LANGINFO_YESEXPR = @HAVE_LANGINFO_YESEXPR@ -HAVE_LCHMOD = @HAVE_LCHMOD@ -HAVE_LCHOWN = @HAVE_LCHOWN@ -HAVE_LDEXPF = @HAVE_LDEXPF@ -HAVE_LINK = @HAVE_LINK@ -HAVE_LINKAT = @HAVE_LINKAT@ -HAVE_LOG10F = @HAVE_LOG10F@ -HAVE_LOG10L = @HAVE_LOG10L@ -HAVE_LOG1P = @HAVE_LOG1P@ -HAVE_LOG1PF = @HAVE_LOG1PF@ -HAVE_LOG1PL = @HAVE_LOG1PL@ -HAVE_LOGBF = @HAVE_LOGBF@ -HAVE_LOGBL = @HAVE_LOGBL@ -HAVE_LOGF = @HAVE_LOGF@ -HAVE_LOGL = @HAVE_LOGL@ -HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ -HAVE_LSTAT = @HAVE_LSTAT@ -HAVE_MBRLEN = @HAVE_MBRLEN@ -HAVE_MBRTOWC = @HAVE_MBRTOWC@ -HAVE_MBSINIT = @HAVE_MBSINIT@ -HAVE_MBSLEN = @HAVE_MBSLEN@ -HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ -HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ -HAVE_MEMCHR = @HAVE_MEMCHR@ -HAVE_MEMPCPY = @HAVE_MEMPCPY@ -HAVE_MKDIRAT = @HAVE_MKDIRAT@ -HAVE_MKDTEMP = @HAVE_MKDTEMP@ -HAVE_MKFIFO = @HAVE_MKFIFO@ -HAVE_MKFIFOAT = @HAVE_MKFIFOAT@ -HAVE_MKNOD = @HAVE_MKNOD@ -HAVE_MKNODAT = @HAVE_MKNODAT@ -HAVE_MKOSTEMP = @HAVE_MKOSTEMP@ -HAVE_MKOSTEMPS = @HAVE_MKOSTEMPS@ -HAVE_MKSTEMP = @HAVE_MKSTEMP@ -HAVE_MKSTEMPS = @HAVE_MKSTEMPS@ -HAVE_MODFF = @HAVE_MODFF@ -HAVE_MODFL = @HAVE_MODFL@ -HAVE_MSVC_INVALID_PARAMETER_HANDLER = @HAVE_MSVC_INVALID_PARAMETER_HANDLER@ -HAVE_NANOSLEEP = @HAVE_NANOSLEEP@ -HAVE_NETDB_H = @HAVE_NETDB_H@ -HAVE_NETINET_IN_H = @HAVE_NETINET_IN_H@ -HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@ -HAVE_OPENAT = @HAVE_OPENAT@ -HAVE_OPENDIR = @HAVE_OPENDIR@ -HAVE_OS_H = @HAVE_OS_H@ -HAVE_PCLOSE = @HAVE_PCLOSE@ -HAVE_PIPE = @HAVE_PIPE@ -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@ -HAVE_PTHREAD_H = @HAVE_PTHREAD_H@ -HAVE_PTHREAD_SIGMASK = @HAVE_PTHREAD_SIGMASK@ -HAVE_PTHREAD_SPINLOCK_T = @HAVE_PTHREAD_SPINLOCK_T@ -HAVE_PTHREAD_T = @HAVE_PTHREAD_T@ -HAVE_PTSNAME = @HAVE_PTSNAME@ -HAVE_PTSNAME_R = @HAVE_PTSNAME_R@ -HAVE_PWRITE = @HAVE_PWRITE@ -HAVE_RAISE = @HAVE_RAISE@ -HAVE_RANDOM = @HAVE_RANDOM@ -HAVE_RANDOM_H = @HAVE_RANDOM_H@ -HAVE_RANDOM_R = @HAVE_RANDOM_R@ -HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@ -HAVE_READDIR = @HAVE_READDIR@ -HAVE_READLINK = @HAVE_READLINK@ -HAVE_READLINKAT = @HAVE_READLINKAT@ -HAVE_REALPATH = @HAVE_REALPATH@ -HAVE_REMAINDER = @HAVE_REMAINDER@ -HAVE_REMAINDERF = @HAVE_REMAINDERF@ -HAVE_RENAMEAT = @HAVE_RENAMEAT@ -HAVE_REWINDDIR = @HAVE_REWINDDIR@ -HAVE_RINT = @HAVE_RINT@ -HAVE_RINTL = @HAVE_RINTL@ -HAVE_RPMATCH = @HAVE_RPMATCH@ -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_SETENV = @HAVE_SETENV@ -HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@ -HAVE_SIGACTION = @HAVE_SIGACTION@ -HAVE_SIGHANDLER_T = @HAVE_SIGHANDLER_T@ -HAVE_SIGINFO_T = @HAVE_SIGINFO_T@ -HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ -HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@ -HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@ -HAVE_SIGSET_T = @HAVE_SIGSET_T@ -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@ -HAVE_STPCPY = @HAVE_STPCPY@ -HAVE_STPNCPY = @HAVE_STPNCPY@ -HAVE_STRCASECMP = @HAVE_STRCASECMP@ -HAVE_STRCASESTR = @HAVE_STRCASESTR@ -HAVE_STRCHRNUL = @HAVE_STRCHRNUL@ -HAVE_STRINGS_H = @HAVE_STRINGS_H@ -HAVE_STRPBRK = @HAVE_STRPBRK@ -HAVE_STRPTIME = @HAVE_STRPTIME@ -HAVE_STRSEP = @HAVE_STRSEP@ -HAVE_STRTOD = @HAVE_STRTOD@ -HAVE_STRTOLL = @HAVE_STRTOLL@ -HAVE_STRTOULL = @HAVE_STRTOULL@ -HAVE_STRUCT_ADDRINFO = @HAVE_STRUCT_ADDRINFO@ -HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@ -HAVE_STRUCT_SCHED_PARAM = @HAVE_STRUCT_SCHED_PARAM@ -HAVE_STRUCT_SIGACTION_SA_SIGACTION = @HAVE_STRUCT_SIGACTION_SA_SIGACTION@ -HAVE_STRUCT_SOCKADDR_STORAGE = @HAVE_STRUCT_SOCKADDR_STORAGE@ -HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY = @HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY@ -HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@ -HAVE_STRUCT_UTSNAME = @HAVE_STRUCT_UTSNAME@ -HAVE_STRVERSCMP = @HAVE_STRVERSCMP@ -HAVE_SYMLINK = @HAVE_SYMLINK@ -HAVE_SYMLINKAT = @HAVE_SYMLINKAT@ -HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@ -HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@ -HAVE_SYS_IOCTL_H = @HAVE_SYS_IOCTL_H@ -HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@ -HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ -HAVE_SYS_RESOURCE_H = @HAVE_SYS_RESOURCE_H@ -HAVE_SYS_SELECT_H = @HAVE_SYS_SELECT_H@ -HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ -HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ -HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ -HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ -HAVE_SYS_UTSNAME_H = @HAVE_SYS_UTSNAME_H@ -HAVE_TANF = @HAVE_TANF@ -HAVE_TANHF = @HAVE_TANHF@ -HAVE_TANL = @HAVE_TANL@ -HAVE_TERMIOS_H = @HAVE_TERMIOS_H@ -HAVE_TIMEGM = @HAVE_TIMEGM@ -HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ -HAVE_UNAME = @HAVE_UNAME@ -HAVE_UNISTD_H = @HAVE_UNISTD_H@ -HAVE_UNLINKAT = @HAVE_UNLINKAT@ -HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ -HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ -HAVE_USLEEP = @HAVE_USLEEP@ -HAVE_UTIMENSAT = @HAVE_UTIMENSAT@ -HAVE_VASPRINTF = @HAVE_VASPRINTF@ -HAVE_VDPRINTF = @HAVE_VDPRINTF@ -HAVE_WCHAR_H = @HAVE_WCHAR_H@ -HAVE_WCHAR_T = @HAVE_WCHAR_T@ -HAVE_WCPCPY = @HAVE_WCPCPY@ -HAVE_WCPNCPY = @HAVE_WCPNCPY@ -HAVE_WCRTOMB = @HAVE_WCRTOMB@ -HAVE_WCSCASECMP = @HAVE_WCSCASECMP@ -HAVE_WCSCAT = @HAVE_WCSCAT@ -HAVE_WCSCHR = @HAVE_WCSCHR@ -HAVE_WCSCMP = @HAVE_WCSCMP@ -HAVE_WCSCOLL = @HAVE_WCSCOLL@ -HAVE_WCSCPY = @HAVE_WCSCPY@ -HAVE_WCSCSPN = @HAVE_WCSCSPN@ -HAVE_WCSDUP = @HAVE_WCSDUP@ -HAVE_WCSLEN = @HAVE_WCSLEN@ -HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@ -HAVE_WCSNCAT = @HAVE_WCSNCAT@ -HAVE_WCSNCMP = @HAVE_WCSNCMP@ -HAVE_WCSNCPY = @HAVE_WCSNCPY@ -HAVE_WCSNLEN = @HAVE_WCSNLEN@ -HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@ -HAVE_WCSPBRK = @HAVE_WCSPBRK@ -HAVE_WCSRCHR = @HAVE_WCSRCHR@ -HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@ -HAVE_WCSSPN = @HAVE_WCSSPN@ -HAVE_WCSSTR = @HAVE_WCSSTR@ -HAVE_WCSTOK = @HAVE_WCSTOK@ -HAVE_WCSWIDTH = @HAVE_WCSWIDTH@ -HAVE_WCSXFRM = @HAVE_WCSXFRM@ -HAVE_WCTRANS_T = @HAVE_WCTRANS_T@ -HAVE_WCTYPE_H = @HAVE_WCTYPE_H@ -HAVE_WCTYPE_T = @HAVE_WCTYPE_T@ -HAVE_WINSOCK2_H = @HAVE_WINSOCK2_H@ -HAVE_WINT_T = @HAVE_WINT_T@ -HAVE_WMEMCHR = @HAVE_WMEMCHR@ -HAVE_WMEMCMP = @HAVE_WMEMCMP@ -HAVE_WMEMCPY = @HAVE_WMEMCPY@ -HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ -HAVE_WMEMSET = @HAVE_WMEMSET@ -HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@ -HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ -HAVE__BOOL = @HAVE__BOOL@ -HAVE__EXIT = @HAVE__EXIT@ -HELP2MAN = @HELP2MAN@ -HOSTENT_LIB = @HOSTENT_LIB@ -ICONV_CONST = @ICONV_CONST@ -ICONV_H = @ICONV_H@ -IGNORE_UNUSED_LIBRARIES_CFLAGS = @IGNORE_UNUSED_LIBRARIES_CFLAGS@ -INCLUDE_NEXT = @INCLUDE_NEXT@ -INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@ -INET_NTOP_LIB = @INET_NTOP_LIB@ -INET_PTON_LIB = @INET_PTON_LIB@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTALL_SU = @INSTALL_SU@ -INT32_MAX_LT_INTMAX_MAX = @INT32_MAX_LT_INTMAX_MAX@ -INT64_MAX_EQ_LONG_MAX = @INT64_MAX_EQ_LONG_MAX@ -INTLLIBS = @INTLLIBS@ -INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ -LDFLAGS = @LDFLAGS@ -LIBCOREUTILS_LIBDEPS = @LIBCOREUTILS_LIBDEPS@ -LIBCOREUTILS_LTLIBDEPS = @LIBCOREUTILS_LTLIBDEPS@ -LIBICONV = @LIBICONV@ -LIBINTL = @LIBINTL@ -LIBMULTITHREAD = @LIBMULTITHREAD@ -LIBOBJS = @LIBOBJS@ -LIBPTH = @LIBPTH@ -LIBPTH_PREFIX = @LIBPTH_PREFIX@ -LIBS = @LIBS@ -LIBSOCKET = @LIBSOCKET@ -LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@ -LIBTHREAD = @LIBTHREAD@ -LIBUNISTRING_UNISTR_H = @LIBUNISTRING_UNISTR_H@ -LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@ -LIBUNISTRING_UNIWIDTH_H = @LIBUNISTRING_UNIWIDTH_H@ -LIB_ACL = @LIB_ACL@ -LIB_CAP = @LIB_CAP@ -LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ -LIB_CRYPT = @LIB_CRYPT@ -LIB_EACCESS = @LIB_EACCESS@ -LIB_FDATASYNC = @LIB_FDATASYNC@ -LIB_GETHRXTIME = @LIB_GETHRXTIME@ -LIB_GMP = @LIB_GMP@ -LIB_NANOSLEEP = @LIB_NANOSLEEP@ -LIB_PTHREAD = @LIB_PTHREAD@ -LIB_SELECT = @LIB_SELECT@ -LIB_SELINUX = @LIB_SELINUX@ -LIB_TIMER_TIME = @LIB_TIMER_TIME@ -LIB_XATTR = @LIB_XATTR@ -LN_S = @LN_S@ -LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@ -LOCALE_FR = @LOCALE_FR@ -LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@ -LOCALE_JA = @LOCALE_JA@ -LOCALE_TR_UTF8 = @LOCALE_TR_UTF8@ -LOCALE_ZH_CN = @LOCALE_ZH_CN@ -LTLIBICONV = @LTLIBICONV@ -LTLIBINTL = @LTLIBINTL@ -LTLIBMULTITHREAD = @LTLIBMULTITHREAD@ -LTLIBOBJS = @LTLIBOBJS@ -LTLIBPTH = @LTLIBPTH@ -LTLIBTHREAD = @LTLIBTHREAD@ -MAKEINFO = @MAKEINFO@ -MAN = @MAN@ -MKDIR_P = @MKDIR_P@ -MSGFMT = @MSGFMT@ -MSGFMT_015 = @MSGFMT_015@ -MSGMERGE = @MSGMERGE@ -NETINET_IN_H = @NETINET_IN_H@ -NEXT_ARPA_INET_H = @NEXT_ARPA_INET_H@ -NEXT_AS_FIRST_DIRECTIVE_ARPA_INET_H = @NEXT_AS_FIRST_DIRECTIVE_ARPA_INET_H@ -NEXT_AS_FIRST_DIRECTIVE_CTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_CTYPE_H@ -NEXT_AS_FIRST_DIRECTIVE_DIRENT_H = @NEXT_AS_FIRST_DIRECTIVE_DIRENT_H@ -NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@ -NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@ -NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@ -NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ -NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@ -NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@ -NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@ -NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@ -NEXT_AS_FIRST_DIRECTIVE_MATH_H = @NEXT_AS_FIRST_DIRECTIVE_MATH_H@ -NEXT_AS_FIRST_DIRECTIVE_NETDB_H = @NEXT_AS_FIRST_DIRECTIVE_NETDB_H@ -NEXT_AS_FIRST_DIRECTIVE_NETINET_IN_H = @NEXT_AS_FIRST_DIRECTIVE_NETINET_IN_H@ -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@ -NEXT_AS_FIRST_DIRECTIVE_STDIO_H = @NEXT_AS_FIRST_DIRECTIVE_STDIO_H@ -NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@ -NEXT_AS_FIRST_DIRECTIVE_STRINGS_H = @NEXT_AS_FIRST_DIRECTIVE_STRINGS_H@ -NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_IOCTL_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_IOCTL_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_RESOURCE_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_RESOURCE_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_UTSNAME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UTSNAME_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H@ -NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H = @NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H@ -NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ -NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ -NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@ -NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@ -NEXT_CTYPE_H = @NEXT_CTYPE_H@ -NEXT_DIRENT_H = @NEXT_DIRENT_H@ -NEXT_ERRNO_H = @NEXT_ERRNO_H@ -NEXT_FCNTL_H = @NEXT_FCNTL_H@ -NEXT_FLOAT_H = @NEXT_FLOAT_H@ -NEXT_GETOPT_H = @NEXT_GETOPT_H@ -NEXT_ICONV_H = @NEXT_ICONV_H@ -NEXT_INTTYPES_H = @NEXT_INTTYPES_H@ -NEXT_LANGINFO_H = @NEXT_LANGINFO_H@ -NEXT_LOCALE_H = @NEXT_LOCALE_H@ -NEXT_MATH_H = @NEXT_MATH_H@ -NEXT_NETDB_H = @NEXT_NETDB_H@ -NEXT_NETINET_IN_H = @NEXT_NETINET_IN_H@ -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@ -NEXT_STDIO_H = @NEXT_STDIO_H@ -NEXT_STDLIB_H = @NEXT_STDLIB_H@ -NEXT_STRINGS_H = @NEXT_STRINGS_H@ -NEXT_STRING_H = @NEXT_STRING_H@ -NEXT_SYS_IOCTL_H = @NEXT_SYS_IOCTL_H@ -NEXT_SYS_RESOURCE_H = @NEXT_SYS_RESOURCE_H@ -NEXT_SYS_SELECT_H = @NEXT_SYS_SELECT_H@ -NEXT_SYS_SOCKET_H = @NEXT_SYS_SOCKET_H@ -NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ -NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@ -NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ -NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ -NEXT_SYS_UTSNAME_H = @NEXT_SYS_UTSNAME_H@ -NEXT_SYS_WAIT_H = @NEXT_SYS_WAIT_H@ -NEXT_TERMIOS_H = @NEXT_TERMIOS_H@ -NEXT_TIME_H = @NEXT_TIME_H@ -NEXT_UNISTD_H = @NEXT_UNISTD_H@ -NEXT_WCHAR_H = @NEXT_WCHAR_H@ -NEXT_WCTYPE_H = @NEXT_WCTYPE_H@ -NO_INSTALL_PROGS_DEFAULT = @NO_INSTALL_PROGS_DEFAULT@ -OBJEXT = @OBJEXT@ -OPTIONAL_BIN_PROGS = @OPTIONAL_BIN_PROGS@ -OPTIONAL_PKGLIB_PROGS = @OPTIONAL_PKGLIB_PROGS@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL = @PERL@ -POSIX_SHELL = @POSIX_SHELL@ -POSUB = @POSUB@ -PRAGMA_COLUMNS = @PRAGMA_COLUMNS@ -PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ -PREFERABLY_POSIX_SHELL = @PREFERABLY_POSIX_SHELL@ -PRIPTR_PREFIX = @PRIPTR_PREFIX@ -PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ -PTHREAD_H = @PTHREAD_H@ -PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ -PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ -RANLIB = @RANLIB@ -REPLACE_BTOWC = @REPLACE_BTOWC@ -REPLACE_CALLOC = @REPLACE_CALLOC@ -REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ -REPLACE_CBRTF = @REPLACE_CBRTF@ -REPLACE_CBRTL = @REPLACE_CBRTL@ -REPLACE_CEIL = @REPLACE_CEIL@ -REPLACE_CEILF = @REPLACE_CEILF@ -REPLACE_CEILL = @REPLACE_CEILL@ -REPLACE_CHOWN = @REPLACE_CHOWN@ -REPLACE_CLOSE = @REPLACE_CLOSE@ -REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@ -REPLACE_DIRFD = @REPLACE_DIRFD@ -REPLACE_DPRINTF = @REPLACE_DPRINTF@ -REPLACE_DUP = @REPLACE_DUP@ -REPLACE_DUP2 = @REPLACE_DUP2@ -REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@ -REPLACE_EXP2 = @REPLACE_EXP2@ -REPLACE_EXP2L = @REPLACE_EXP2L@ -REPLACE_EXPM1 = @REPLACE_EXPM1@ -REPLACE_EXPM1F = @REPLACE_EXPM1F@ -REPLACE_FABSL = @REPLACE_FABSL@ -REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ -REPLACE_FCLOSE = @REPLACE_FCLOSE@ -REPLACE_FCNTL = @REPLACE_FCNTL@ -REPLACE_FDOPEN = @REPLACE_FDOPEN@ -REPLACE_FDOPENDIR = @REPLACE_FDOPENDIR@ -REPLACE_FFLUSH = @REPLACE_FFLUSH@ -REPLACE_FLOOR = @REPLACE_FLOOR@ -REPLACE_FLOORF = @REPLACE_FLOORF@ -REPLACE_FLOORL = @REPLACE_FLOORL@ -REPLACE_FMA = @REPLACE_FMA@ -REPLACE_FMAF = @REPLACE_FMAF@ -REPLACE_FMAL = @REPLACE_FMAL@ -REPLACE_FMOD = @REPLACE_FMOD@ -REPLACE_FMODF = @REPLACE_FMODF@ -REPLACE_FMODL = @REPLACE_FMODL@ -REPLACE_FOPEN = @REPLACE_FOPEN@ -REPLACE_FPRINTF = @REPLACE_FPRINTF@ -REPLACE_FPURGE = @REPLACE_FPURGE@ -REPLACE_FREOPEN = @REPLACE_FREOPEN@ -REPLACE_FREXP = @REPLACE_FREXP@ -REPLACE_FREXPF = @REPLACE_FREXPF@ -REPLACE_FREXPL = @REPLACE_FREXPL@ -REPLACE_FSEEK = @REPLACE_FSEEK@ -REPLACE_FSEEKO = @REPLACE_FSEEKO@ -REPLACE_FSTAT = @REPLACE_FSTAT@ -REPLACE_FSTATAT = @REPLACE_FSTATAT@ -REPLACE_FTELL = @REPLACE_FTELL@ -REPLACE_FTELLO = @REPLACE_FTELLO@ -REPLACE_FTRUNCATE = @REPLACE_FTRUNCATE@ -REPLACE_FUTIMENS = @REPLACE_FUTIMENS@ -REPLACE_GAI_STRERROR = @REPLACE_GAI_STRERROR@ -REPLACE_GETCWD = @REPLACE_GETCWD@ -REPLACE_GETDELIM = @REPLACE_GETDELIM@ -REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ -REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ -REPLACE_GETLINE = @REPLACE_GETLINE@ -REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ -REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ -REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ -REPLACE_HUGE_VAL = @REPLACE_HUGE_VAL@ -REPLACE_HYPOT = @REPLACE_HYPOT@ -REPLACE_HYPOTF = @REPLACE_HYPOTF@ -REPLACE_HYPOTL = @REPLACE_HYPOTL@ -REPLACE_ICONV = @REPLACE_ICONV@ -REPLACE_ICONV_OPEN = @REPLACE_ICONV_OPEN@ -REPLACE_ICONV_UTF = @REPLACE_ICONV_UTF@ -REPLACE_ILOGB = @REPLACE_ILOGB@ -REPLACE_ILOGBF = @REPLACE_ILOGBF@ -REPLACE_INET_NTOP = @REPLACE_INET_NTOP@ -REPLACE_INET_PTON = @REPLACE_INET_PTON@ -REPLACE_IOCTL = @REPLACE_IOCTL@ -REPLACE_ISATTY = @REPLACE_ISATTY@ -REPLACE_ISFINITE = @REPLACE_ISFINITE@ -REPLACE_ISINF = @REPLACE_ISINF@ -REPLACE_ISNAN = @REPLACE_ISNAN@ -REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ -REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ -REPLACE_ITOLD = @REPLACE_ITOLD@ -REPLACE_LCHOWN = @REPLACE_LCHOWN@ -REPLACE_LDEXPL = @REPLACE_LDEXPL@ -REPLACE_LINK = @REPLACE_LINK@ -REPLACE_LINKAT = @REPLACE_LINKAT@ -REPLACE_LOCALECONV = @REPLACE_LOCALECONV@ -REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@ -REPLACE_LOG = @REPLACE_LOG@ -REPLACE_LOG10 = @REPLACE_LOG10@ -REPLACE_LOG10F = @REPLACE_LOG10F@ -REPLACE_LOG10L = @REPLACE_LOG10L@ -REPLACE_LOG1P = @REPLACE_LOG1P@ -REPLACE_LOG1PF = @REPLACE_LOG1PF@ -REPLACE_LOG1PL = @REPLACE_LOG1PL@ -REPLACE_LOG2 = @REPLACE_LOG2@ -REPLACE_LOG2F = @REPLACE_LOG2F@ -REPLACE_LOG2L = @REPLACE_LOG2L@ -REPLACE_LOGB = @REPLACE_LOGB@ -REPLACE_LOGBF = @REPLACE_LOGBF@ -REPLACE_LOGBL = @REPLACE_LOGBL@ -REPLACE_LOGF = @REPLACE_LOGF@ -REPLACE_LOGL = @REPLACE_LOGL@ -REPLACE_LSEEK = @REPLACE_LSEEK@ -REPLACE_LSTAT = @REPLACE_LSTAT@ -REPLACE_MALLOC = @REPLACE_MALLOC@ -REPLACE_MBRLEN = @REPLACE_MBRLEN@ -REPLACE_MBRTOWC = @REPLACE_MBRTOWC@ -REPLACE_MBSINIT = @REPLACE_MBSINIT@ -REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@ -REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@ -REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@ -REPLACE_MBTOWC = @REPLACE_MBTOWC@ -REPLACE_MEMCHR = @REPLACE_MEMCHR@ -REPLACE_MEMMEM = @REPLACE_MEMMEM@ -REPLACE_MKDIR = @REPLACE_MKDIR@ -REPLACE_MKFIFO = @REPLACE_MKFIFO@ -REPLACE_MKNOD = @REPLACE_MKNOD@ -REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ -REPLACE_MKTIME = @REPLACE_MKTIME@ -REPLACE_MODF = @REPLACE_MODF@ -REPLACE_MODFF = @REPLACE_MODFF@ -REPLACE_MODFL = @REPLACE_MODFL@ -REPLACE_NAN = @REPLACE_NAN@ -REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@ -REPLACE_NL_LANGINFO = @REPLACE_NL_LANGINFO@ -REPLACE_NULL = @REPLACE_NULL@ -REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@ -REPLACE_OPEN = @REPLACE_OPEN@ -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@ -REPLACE_PTHREAD_SIGMASK = @REPLACE_PTHREAD_SIGMASK@ -REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@ -REPLACE_PUTENV = @REPLACE_PUTENV@ -REPLACE_PWRITE = @REPLACE_PWRITE@ -REPLACE_RAISE = @REPLACE_RAISE@ -REPLACE_RANDOM_R = @REPLACE_RANDOM_R@ -REPLACE_READ = @REPLACE_READ@ -REPLACE_READLINK = @REPLACE_READLINK@ -REPLACE_REALLOC = @REPLACE_REALLOC@ -REPLACE_REALPATH = @REPLACE_REALPATH@ -REPLACE_REMAINDER = @REPLACE_REMAINDER@ -REPLACE_REMAINDERF = @REPLACE_REMAINDERF@ -REPLACE_REMAINDERL = @REPLACE_REMAINDERL@ -REPLACE_REMOVE = @REPLACE_REMOVE@ -REPLACE_RENAME = @REPLACE_RENAME@ -REPLACE_RENAMEAT = @REPLACE_RENAMEAT@ -REPLACE_RMDIR = @REPLACE_RMDIR@ -REPLACE_ROUND = @REPLACE_ROUND@ -REPLACE_ROUNDF = @REPLACE_ROUNDF@ -REPLACE_ROUNDL = @REPLACE_ROUNDL@ -REPLACE_SELECT = @REPLACE_SELECT@ -REPLACE_SETENV = @REPLACE_SETENV@ -REPLACE_SETLOCALE = @REPLACE_SETLOCALE@ -REPLACE_SIGNBIT = @REPLACE_SIGNBIT@ -REPLACE_SIGNBIT_USING_GCC = @REPLACE_SIGNBIT_USING_GCC@ -REPLACE_SLEEP = @REPLACE_SLEEP@ -REPLACE_SNPRINTF = @REPLACE_SNPRINTF@ -REPLACE_SPRINTF = @REPLACE_SPRINTF@ -REPLACE_SQRTL = @REPLACE_SQRTL@ -REPLACE_STAT = @REPLACE_STAT@ -REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@ -REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@ -REPLACE_STPNCPY = @REPLACE_STPNCPY@ -REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ -REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ -REPLACE_STRDUP = @REPLACE_STRDUP@ -REPLACE_STRERROR = @REPLACE_STRERROR@ -REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ -REPLACE_STRNCAT = @REPLACE_STRNCAT@ -REPLACE_STRNDUP = @REPLACE_STRNDUP@ -REPLACE_STRNLEN = @REPLACE_STRNLEN@ -REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@ -REPLACE_STRSTR = @REPLACE_STRSTR@ -REPLACE_STRTOD = @REPLACE_STRTOD@ -REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@ -REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ -REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@ -REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ -REPLACE_SYMLINK = @REPLACE_SYMLINK@ -REPLACE_TIMEGM = @REPLACE_TIMEGM@ -REPLACE_TMPFILE = @REPLACE_TMPFILE@ -REPLACE_TOWLOWER = @REPLACE_TOWLOWER@ -REPLACE_TRUNC = @REPLACE_TRUNC@ -REPLACE_TRUNCF = @REPLACE_TRUNCF@ -REPLACE_TRUNCL = @REPLACE_TRUNCL@ -REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@ -REPLACE_UNLINK = @REPLACE_UNLINK@ -REPLACE_UNLINKAT = @REPLACE_UNLINKAT@ -REPLACE_UNSETENV = @REPLACE_UNSETENV@ -REPLACE_USLEEP = @REPLACE_USLEEP@ -REPLACE_UTIMENSAT = @REPLACE_UTIMENSAT@ -REPLACE_VASPRINTF = @REPLACE_VASPRINTF@ -REPLACE_VDPRINTF = @REPLACE_VDPRINTF@ -REPLACE_VFPRINTF = @REPLACE_VFPRINTF@ -REPLACE_VPRINTF = @REPLACE_VPRINTF@ -REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@ -REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ -REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ -REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ -REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ -REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ -REPLACE_WCTOB = @REPLACE_WCTOB@ -REPLACE_WCTOMB = @REPLACE_WCTOMB@ -REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ -REPLACE_WRITE = @REPLACE_WRITE@ -SCHED_H = @SCHED_H@ -SELINUX_CONTEXT_H = @SELINUX_CONTEXT_H@ -SEQ_LIBM = @SEQ_LIBM@ -SERVENT_LIB = @SERVENT_LIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ -SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ -STDALIGN_H = @STDALIGN_H@ -STDARG_H = @STDARG_H@ -STDBOOL_H = @STDBOOL_H@ -STDDEF_H = @STDDEF_H@ -STDINT_H = @STDINT_H@ -STRIP = @STRIP@ -SYS_IOCTL_H_HAVE_WINSOCK2_H = @SYS_IOCTL_H_HAVE_WINSOCK2_H@ -SYS_IOCTL_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @SYS_IOCTL_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ -SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ -TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ -UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@ -UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@ -UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ -UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ -UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ -USE_ACL = @USE_ACL@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WARN_CFLAGS = @WARN_CFLAGS@ -WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ -WERROR_CFLAGS = @WERROR_CFLAGS@ -WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@ -WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@ -WINT_T_SUFFIX = @WINT_T_SUFFIX@ -XGETTEXT = @XGETTEXT@ -XGETTEXT_015 = @XGETTEXT_015@ -XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ -YACC = @YACC@ -YFLAGS = @YFLAGS@ -YIELD_LIB = @YIELD_LIB@ -abs_aux_dir = @abs_aux_dir@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -gl_LIBOBJS = @gl_LIBOBJS@ -gl_LTLIBOBJS = @gl_LTLIBOBJS@ -gltests_LIBOBJS = @gltests_LIBOBJS@ -gltests_LTLIBOBJS = @gltests_LTLIBOBJS@ -gltests_WITNESS = @gltests_WITNESS@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -lispdir = @lispdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -AM_CFLAGS = $(GNULIB_WARN_CFLAGS) $(WERROR_CFLAGS) -AM_CPPFLAGS = - -# The BUILT_SOURCES created by this Makefile snippet are not used via #include -# 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. - -# The BUILT_SOURCES created by this Makefile snippet are not used via #include -# 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. - -# The BUILT_SOURCES created by this Makefile snippet are not used via #include -# 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 = $(ALLOCA_H) arpa/inet.h configmake.h ctype.h dirent.h \ - $(ERRNO_H) fcntl.h $(FLOAT_H) $(FNMATCH_H) $(GETOPT_H) \ - $(ICONV_H) iconv_open-aix.h iconv_open-hpux.h \ - iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h \ - inttypes.h langinfo.h locale.h math.h netdb.h $(NETINET_IN_H) \ - parse-datetime.c $(PTHREAD_H) $(SCHED_H) selinux/selinux.h \ - $(SELINUX_CONTEXT_H) signal.h arg-nonnull.h c++defs.h \ - unused-parameter.h warn-on-use.h spawn.h $(STDALIGN_H) \ - $(STDARG_H) $(STDBOOL_H) $(STDDEF_H) $(STDINT_H) stdio.h \ - stdlib.h string.h strings.h sys/ioctl.h sys/resource.h \ - sys/select.h sys/socket.h sys/stat.h sys/time.h sys/types.h \ - sys/uio.h sys/utsname.h sys/wait.h termios.h time.h unistd.h \ - $(LIBUNISTRING_UNISTR_H) $(LIBUNISTRING_UNITYPES_H) \ - $(LIBUNISTRING_UNIWIDTH_H) wchar.h wctype.h -CLEANFILES = configmake.h configmake.h-t charset.alias ref-add.sed \ - ref-del.sed - -#if GNU_MAKE -# [nicer features that work only with GNU Make] -#else -# [fallback features that work in any 'make' implementation; see -# 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 $(srcdir)/$@.in >$@-t -# chmod a+x $@-t -# mv $@-t $@ -#EXTRA_DIST += script.in -#MOSTLYCLEANFILES += script script-t -EXTRA_DIST = acl-internal.h acl.h acl_entries.c alignof.h alloca.c \ - alloca.in.h allocator.h $(top_srcdir)/build-aux/announce-gen \ - areadlink.h areadlink.h areadlink.h at-func.c argmatch.h \ - arpa_inet.in.h openat-priv.h openat-proc.c backupfile.h \ - btowc.c c-strcaseeq.h c-strtod.h c-strtod.c c-strtod.h \ - calloc.c calloc.c canon-host.h canonicalize.h careadlinkat.h \ - chdir-long.c chdir-long.h chown.c fchown-stub.c cloexec.h \ - close.c close-stream.h closedir.c dirent-private.h closein.h \ - closeout.h md5.h sha1.h sha256.h sha512.h ctype.in.h \ - cycle-check.h dev-ino.h dirent.in.h dirent--.h dirent-safer.h \ - dirfd.c stripslash.c dirname.h \ - $(top_srcdir)/build-aux/do-release-commit-and-tag dosname.h \ - ftoastr.c ftoastr.h dup.c dup2.c errno.in.h error.c error.h \ - euidaccess.c exclude.h exitfail.h at-func.c faccessat.c \ - openat-priv.h fchdir.c at-func.c fchmodat.c openat-priv.h \ - at-func.c fchownat.c openat-priv.h fclose.c fcntl.c fcntl.in.h \ - fcntl--.h fcntl-safer.h fd-hook.h fdatasync.c fdopen.c \ - fdopendir.c utimens.h fflush.c stdio-impl.h file-set.h \ - file-type.h fileblocks.c filemode.h filename.h filenamecat.h \ - filevercmp.h float.c float.in.h itold.c fnmatch.c fnmatch.in.h \ - fnmatch_loop.c fopen.c stdio--.h stdio-safer.h fpending.c \ - fpending.h fprintftime.h fpucw.h fpurge.c stdio-impl.h \ - freadahead.h stdio-impl.h freading.h stdio-impl.h freadptr.h \ - stdio-impl.h freadseek.h stdio-impl.h freopen.c stdio--.h \ - stdio-safer.h frexp.c frexp.c frexpl.c fseek.c fseeko.c \ - stdio-impl.h fseterr.h stdio-impl.h fstat.c at-func.c \ - fstatat.c openat-priv.h fsusage.c fsusage.h fsync.c ftell.c \ - ftello.c stdio-impl.h ftoastr.h ftruncate.c fts-cycle.c fts.c \ - fts_.h full-write.c futimens.c \ - $(top_srcdir)/build-aux/gendocs.sh gai_strerror.c \ - getaddrinfo.c getcwd.c getcwd-lgpl.c getdelim.c \ - getdtablesize.c getgroups.c gethostname.c w32sock.h \ - gethrxtime.c gethrxtime.h xtime.h getline.c getloadavg.c \ - getlogin.c getndelim2.h getopt.c getopt.in.h getopt1.c \ - getopt_int.h getpagesize.c getpass.c getpass.h gettimeofday.c \ - getugroups.h getusershell.c \ - $(top_srcdir)/build-aux/git-version-gen \ - $(top_srcdir)/build-aux/gitlog-to-changelog \ - $(top_srcdir)/build-aux/gnu-web-doc-update \ - $(top_srcdir)/GNUmakefile $(top_srcdir)/build-aux/gnupload \ - group-member.c hard-locale.h hash.h hash-triple.h \ - $(top_srcdir)/build-aux/config.rpath human.h i-ring.h \ - iconv.in.h iconv_open-aix.h iconv_open-hpux.h \ - iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h \ - iconv.c iconv_close.c iconv_open-aix.gperf \ - iconv_open-hpux.gperf iconv_open-irix.gperf \ - iconv_open-osf.gperf iconv_open-solaris.gperf iconv_open.c \ - idcache.h ignore-value.h inet_ntop.c intprops.h anytostr.c \ - inttostr.h inttypes.in.h isapipe.c isapipe.h isatty.c \ - isblank.c float+.h isnan.c isnand-nolibm.h isnand.c float+.h \ - isnan.c isnanf-nolibm.h isnanf.c float+.h isnan.c \ - isnanl-nolibm.h isnanl.c iswblank.c langinfo.in.h lchown.c \ - ftoastr.c ftoastr.h link.c at-func2.c linkat.c config.charset \ - ref-add.sin ref-del.sin locale.in.h localeconv.c \ - long-options.h lseek.c lstat.c $(top_srcdir)/maint.mk malloc.c \ - malloc.c malloca.h malloca.valgrind math.in.h mbchar.h \ - mbrlen.c mbrtowc.c mbsinit.c mbsrtowcs-impl.h \ - mbsrtowcs-state.c mbsrtowcs.c str-kmp.h mbtowc-impl.h mbtowc.c \ - memcasecmp.h memchr.c memchr.valgrind memchr2.valgrind \ - memcmp2.h memcoll.h mempcpy.c memrchr.c mgetgroups.h \ - mkancesdirs.h mkdir.c dirchownmod.h mkdir-p.h mkfifo.c mknod.c \ - mkstemp.c mktime-internal.h mktime.c modechange.h mountlist.c \ - mountlist.h mpsort.h msvc-inval.c msvc-inval.h msvc-nothrow.c \ - msvc-nothrow.h nanosleep.c netdb.in.h netinet_in.in.h \ - nl_langinfo.c nproc.h obstack.c obstack.h open.c openat-priv.h \ - openat.c openat.h fcntl--.h fcntl-safer.h dirent-private.h \ - opendir.c parse-datetime.c parse-datetime.h pathmax.h \ - physmem.h pipe.h spawn_int.h spawni.c spawn_faction_addclose.c \ - spawn_int.h spawn_faction_adddup2.c spawn_int.h \ - spawn_faction_addopen.c spawn_int.h spawn_faction_destroy.c \ - spawn_faction_init.c spawn_int.h spawnattr_destroy.c \ - spawnattr_init.c spawnattr_setflags.c spawnattr_setsigmask.c \ - spawnp.c posixtm.h posixver.h printf-frexp.h printf-frexp.c \ - printf-frexpl.h priv-set.h pthread.in.h putenv.c quote.h \ - quote.h quotearg.h raise.c rawmemchr.c rawmemchr.valgrind \ - read.c read-file.h dirent-private.h readdir.c readlink.c \ - at-func.c readlinkat.c readtokens.h readutmp.c readutmp.h \ - realloc.c realloc.c regcomp.c regex.c regex.h regex_internal.c \ - regex_internal.h regexec.c remove.c rename.c dirent-private.h \ - rewinddir.c rmdir.c root-dev-ino.c root-dev-ino.h rpmatch.c \ - safe-read.h safe-read.c safe-write.h same.h same-inode.h \ - save-cwd.h savedir.h sched.in.h select.c at-func.c \ - selinux-at.c selinux-at.h getfilecon.c setenv.c sig2str.c \ - sig2str.h sig-handler.h sigaction.c signal.in.h float+.h \ - signbitd.c signbitf.c signbitl.c 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 snprintf.c \ - w32sock.h spawn.in.h stat.c stat-macros.h stat-size.h \ - stat-time.h stdalign.in.h stdarg.in.h stdbool.in.h stddef.in.h \ - stdint.in.h stdio.in.h stdlib.in.h stdlib--.h stdlib-safer.h \ - stpcpy.c stpncpy.c strcasecmp.c strncasecmp.c strchrnul.c \ - strchrnul.valgrind strdup.c streq.h strerror.c \ - strerror-override.c strerror-override.h strftime.h string.in.h \ - strings.in.h strncat.c strndup.c strnlen.c strpbrk.c siglist.h \ - strsignal.c str-two-way.h strstr.c strtod.c strtoimax.c \ - strtol.c strtoll.c strtol.c strtoul.c strtoull.c strtoimax.c \ - strtoumax.c symlink.c sys_ioctl.in.h sys_resource.in.h \ - sys_select.in.h sys_socket.in.h sys_stat.in.h sys_time.in.h \ - sys_types.in.h sys_uio.in.h sys_utsname.in.h sys_wait.in.h \ - tempname.h termios.in.h $(top_srcdir)/build-aux/config.rpath \ - time.in.h time_r.c timespec.h trim.h u64.h uname.c unistd.in.h \ - unistd--.h unistd-safer.h unistr.in.h unitypes.in.h \ - localcharset.h uniwidth.in.h uniwidth/cjk.h unlink.c at-func.c \ - openat-priv.h unlinkat.c unlocked-io.h unsetenv.c \ - $(top_srcdir)/build-aux/update-copyright \ - $(top_srcdir)/build-aux/useless-if-before-free userspec.h \ - utimecmp.h utimens.h at-func.c utimensat.c asnprintf.c \ - float+.h printf-args.c printf-args.h printf-parse.c \ - printf-parse.h vasnprintf.c vasnprintf.h asprintf.c \ - vasprintf.c $(top_srcdir)/build-aux/vc-list-files verify.h \ - vfprintf.c vprintf.c waitpid.c wchar.in.h wcrtomb.c \ - wcswidth-impl.h wcswidth.c wctype.in.h wcwidth.c write.c \ - write-any-file.h xalloc.h xalloc-oversized.h xgetcwd.h \ - xnanosleep.h xreadlink.h xstrtod.h xstrtol.h xstrtod.c \ - xstrtod.h xalloc.h yesno.h -MAINTAINERCLEANFILES = iconv_open-aix.h iconv_open-hpux.h \ - iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h \ - parse-datetime.c -MOSTLYCLEANDIRS = arpa netinet selinux sys sys sys sys sys sys sys sys -MOSTLYCLEANFILES = core *.stackdump alloca.h alloca.h-t arpa/inet.h \ - arpa/inet.h-t ctype.h ctype.h-t dirent.h dirent.h-t errno.h \ - errno.h-t fcntl.h fcntl.h-t float.h float.h-t fnmatch.h \ - fnmatch.h-t getopt.h getopt.h-t iconv.h iconv.h-t \ - iconv_open-aix.h-t iconv_open-hpux.h-t iconv_open-irix.h-t \ - iconv_open-osf.h-t iconv_open-solaris.h-t inttypes.h \ - inttypes.h-t langinfo.h langinfo.h-t locale.h locale.h-t \ - math.h math.h-t netdb.h netdb.h-t netinet/in.h netinet/in.h-t \ - parse-datetime.c-t pthread.h pthread.h-t sched.h sched.h-t \ - selinux/selinux.h selinux/selinux.h-t selinux/context.h \ - selinux/context.h-t signal.h signal.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 spawn.h \ - spawn.h-t stdalign.h stdalign.h-t stdarg.h stdarg.h-t \ - stdbool.h stdbool.h-t stddef.h stddef.h-t stdint.h stdint.h-t \ - stdio.h stdio.h-t stdlib.h stdlib.h-t string.h string.h-t \ - strings.h strings.h-t sys/ioctl.h sys/ioctl.h-t sys/resource.h \ - sys/resource.h-t sys/select.h sys/select.h-t sys/socket.h \ - sys/socket.h-t sys/stat.h sys/stat.h-t sys/time.h sys/time.h-t \ - sys/types.h sys/types.h-t sys/uio.h sys/uio.h-t sys/utsname.h \ - sys/utsname.h-t sys/wait.h sys/wait.h-t termios.h termios.h-t \ - time.h time.h-t unistd.h unistd.h-t unistr.h unistr.h-t \ - unitypes.h unitypes.h-t uniwidth.h uniwidth.h-t wchar.h \ - wchar.h-t wctype.h wctype.h-t -SUFFIXES = .sed .sin -noinst_LIBRARIES = libcoreutils.a -libcoreutils_a_SOURCES = set-mode-acl.c copy-acl.c file-has-acl.c \ - allocator.c areadlink.c areadlink-with-size.c areadlinkat.c \ - argmatch.c argv-iter.c argv-iter.h backupfile.c base64.h \ - base64.c binary-io.h bitrotate.h c-ctype.h c-ctype.c \ - c-strcase.h c-strcasecmp.c c-strncasecmp.c c-strtod.c \ - c-strtold.c canon-host.c canonicalize.c careadlinkat.c \ - cloexec.c close-stream.c closein.c closeout.c md5.c sha1.c \ - sha256.c sha512.c cycle-check.c di-set.c di-set.h diacrit.h \ - diacrit.c opendir-safer.c dirname.c basename.c dirname-lgpl.c \ - basename-lgpl.c stripslash.c dtoastr.c dtotimespec.c exclude.c \ - exitfail.c fadvise.c fadvise.h fatal-signal.h fatal-signal.c \ - creat-safer.c open-safer.c fd-hook.c fd-safer-flag.c \ - dup-safer-flag.c fdutimensat.c file-set.c file-type.c \ - filemode.c filenamecat.c filenamecat-lgpl.c filevercmp.c \ - fopen-safer.c fprintftime.c freadahead.c freading.c freadptr.c \ - freadseek.c freopen-safer.c fseterr.c ftoastr.c full-read.h \ - full-read.c full-write.h full-write.c getndelim2.c gettext.h \ - gettime.c getugroups.c hard-locale.c hash.c hash-pjw.h \ - hash-pjw.c hash-triple.c heap.c heap.h human.c i-ring.c \ - idcache.c ino-map.c ino-map.h imaxtostr.c inttostr.c \ - offtostr.c uinttostr.c umaxtostr.c ldtoastr.c linebuffer.h \ - linebuffer.c localcharset.h localcharset.c glthread/lock.h \ - glthread/lock.c long-options.c malloca.c mbchar.c mbiter.h \ - mbsalign.c mbsalign.h mbscasecmp.c mbslen.c mbsstr.c \ - mbswidth.h mbswidth.c mbuiter.h memcasecmp.c memchr2.h \ - memchr2.c memcmp2.c memcoll.c mgetgroups.c mkancesdirs.c \ - dirchownmod.c mkdir-p.c modechange.c mpsort.c nproc.c \ - openat-die.c openat-safer.c parse-datetime.y physmem.c pipe2.c \ - pipe2-safer.c posixtm.c posixver.c printf-frexp.c \ - printf-frexpl.c priv-set.c progname.h progname.c propername.h \ - propername.c quotearg.c randint.c randint.h randperm.c \ - randperm.h randread.c randread.h rand-isaac.c rand-isaac.h \ - read-file.c readtokens.c readtokens0.h readtokens0.c \ - safe-read.c safe-write.c same.c save-cwd.c savedir.c savewd.h \ - savewd.c se-context.in.h se-selinux.in.h settime.c size_max.h \ - sockets.h sockets.c spawn-pipe.h spawn-pipe.c w32spawn.h \ - mkstemp-safer.c strftime.c striconv.h striconv.c strnlen1.h \ - strnlen1.c tempname.c glthread/threadlib.c glthread/tls.h \ - glthread/tls.c trim.c unicodeio.h unicodeio.c dup-safer.c \ - fd-safer.c pipe-safer.c $(am__append_1) $(am__append_2) \ - $(am__append_3) userspec.c utimecmp.c utimens.c verror.h \ - verror.c version-etc.h version-etc.c version-etc-fsf.c \ - wait-process.h wait-process.c write-any-file.c xmalloc.c \ - xalloc-die.c xfreopen.c xfreopen.h xgetcwd.c xgetgroups.c \ - xgethostname.h xgethostname.c xmemcoll.h xmemcoll.c \ - xnanosleep.c xprintf.h xprintf.c xreadlink.c xsize.h \ - xstriconv.h xstriconv.c xstrndup.h xstrndup.c xstrtod.c \ - xstrtoimax.c xstrtol.c xstrtoul.c xstrtol-error.c xstrtold.c \ - xstrtoumax.c xvasprintf.h xvasprintf.c xasprintf.c yesno.c \ - buffer-lcm.c buffer-lcm.h -libcoreutils_a_LIBADD = $(gl_LIBOBJS) @ALLOCA@ $(LIBOBJS) -libcoreutils_a_DEPENDENCIES = $(gl_LIBOBJS) @ALLOCA@ $(LIBOBJS) -EXTRA_libcoreutils_a_SOURCES = acl_entries.c alloca.c at-func.c \ - openat-proc.c btowc.c c-strtod.c calloc.c calloc.c \ - chdir-long.c chown.c fchown-stub.c close.c closedir.c dirfd.c \ - stripslash.c ftoastr.c dup.c dup2.c error.c euidaccess.c \ - at-func.c faccessat.c fchdir.c at-func.c fchmodat.c at-func.c \ - fchownat.c fclose.c fcntl.c fdatasync.c fdopen.c fdopendir.c \ - fflush.c fileblocks.c float.c itold.c fnmatch.c fnmatch_loop.c \ - fopen.c fpending.c fpurge.c freopen.c frexp.c frexp.c frexpl.c \ - fseek.c fseeko.c fstat.c at-func.c fstatat.c fsusage.c fsync.c \ - ftell.c ftello.c ftruncate.c fts-cycle.c fts.c full-write.c \ - futimens.c gai_strerror.c getaddrinfo.c getcwd.c getcwd-lgpl.c \ - getdelim.c getdtablesize.c getgroups.c gethostname.c \ - gethrxtime.c getline.c getloadavg.c getlogin.c getopt.c \ - getopt1.c getpagesize.c getpass.c gettimeofday.c \ - getusershell.c group-member.c iconv.c iconv_close.c \ - iconv_open.c inet_ntop.c anytostr.c isapipe.c isatty.c \ - isblank.c isnan.c isnand.c isnan.c isnanf.c isnan.c isnanl.c \ - iswblank.c lchown.c ftoastr.c link.c at-func2.c linkat.c \ - localeconv.c lseek.c lstat.c malloc.c malloc.c mbrlen.c \ - mbrtowc.c mbsinit.c mbsrtowcs-state.c mbsrtowcs.c mbtowc.c \ - memchr.c mempcpy.c memrchr.c mkdir.c mkfifo.c mknod.c \ - mkstemp.c mktime.c mountlist.c msvc-inval.c msvc-nothrow.c \ - nanosleep.c nl_langinfo.c obstack.c open.c openat.c opendir.c \ - spawni.c spawn_faction_addclose.c spawn_faction_adddup2.c \ - spawn_faction_addopen.c spawn_faction_destroy.c \ - spawn_faction_init.c spawnattr_destroy.c spawnattr_init.c \ - spawnattr_setflags.c spawnattr_setsigmask.c spawnp.c \ - printf-frexp.c putenv.c raise.c rawmemchr.c read.c readdir.c \ - readlink.c at-func.c readlinkat.c readutmp.c realloc.c \ - realloc.c regcomp.c regex.c regex_internal.c regexec.c \ - remove.c rename.c rewinddir.c rmdir.c root-dev-ino.c rpmatch.c \ - safe-read.c select.c at-func.c selinux-at.c getfilecon.c \ - setenv.c sig2str.c sigaction.c signbitd.c signbitf.c \ - signbitl.c sigprocmask.c snprintf.c stat.c stpcpy.c stpncpy.c \ - strcasecmp.c strncasecmp.c strchrnul.c strdup.c strerror.c \ - strerror-override.c strncat.c strndup.c strnlen.c strpbrk.c \ - strsignal.c strstr.c strtod.c strtoimax.c strtol.c strtoll.c \ - strtol.c strtoul.c strtoull.c strtoimax.c strtoumax.c \ - symlink.c time_r.c uname.c unlink.c at-func.c unlinkat.c \ - unsetenv.c at-func.c utimensat.c asnprintf.c printf-args.c \ - printf-parse.c vasnprintf.c asprintf.c vasprintf.c vfprintf.c \ - vprintf.c waitpid.c wcrtomb.c wcswidth.c wcwidth.c write.c \ - xstrtod.c -GPERF = gperf -charset_alias = $(DESTDIR)$(libdir)/charset.alias -charset_tmp = $(DESTDIR)$(libdir)/charset.tmp - -# Because this Makefile snippet defines a variable used by other -# gnulib Makefile snippets, it must be present in all Makefile.am that -# need it. This is ensured by the applicability 'all' defined above. -_NORETURN_H = $(top_srcdir)/build-aux/snippet/_Noreturn.h -ARG_NONNULL_H = arg-nonnull.h -CXXDEFS_H = c++defs.h -UNUSED_PARAMETER_H = unused-parameter.h -WARN_ON_USE_H = warn-on-use.h -all: $(BUILT_SOURCES) config.h - $(MAKE) $(AM_MAKEFLAGS) all-am - -.SUFFIXES: -.SUFFIXES: .sed .sin .c .o .obj .y -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/gnulib.mk $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu lib/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; -$(srcdir)/gnulib.mk: - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -config.h: stamp-h1 - @if test ! -f $@; then rm -f stamp-h1; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi - -stamp-h1: $(srcdir)/config.hin $(top_builddir)/config.status - @rm -f stamp-h1 - cd $(top_builddir) && $(SHELL) ./config.status lib/config.h -$(srcdir)/config.hin: $(am__configure_deps) - ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) - rm -f stamp-h1 - touch $@ - -distclean-hdr: - -rm -f config.h stamp-h1 - -clean-noinstLIBRARIES: - -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -libcoreutils.a: $(libcoreutils_a_OBJECTS) $(libcoreutils_a_DEPENDENCIES) $(EXTRA_libcoreutils_a_DEPENDENCIES) - $(AM_V_at)-rm -f libcoreutils.a - $(AM_V_AR)$(libcoreutils_a_AR) libcoreutils.a $(libcoreutils_a_OBJECTS) $(libcoreutils_a_LIBADD) - $(AM_V_at)$(RANLIB) libcoreutils.a - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/alloca.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/fd-reopen.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strintcmp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strnumcmp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/xfts.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acl_entries.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alloca.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/allocator.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/anytostr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/areadlink-with-size.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/areadlink.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/areadlinkat.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/argmatch.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/argv-iter.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asnprintf.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asprintf.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/at-func.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/at-func2.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/backupfile.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/base64.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basename-lgpl.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basename.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/btowc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/buffer-lcm.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/c-ctype.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/c-strcasecmp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/c-strncasecmp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/c-strtod.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/c-strtold.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/calloc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/canon-host.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/canonicalize.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/careadlinkat.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chdir-long.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chown.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cloexec.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/close-stream.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/close.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/closedir.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/closein.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/closeout.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/copy-acl.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/creat-safer.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cycle-check.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/di-set.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/diacrit.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dirchownmod.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dirfd.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dirname-lgpl.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dirname.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dtoastr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dtotimespec.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dup-safer-flag.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dup-safer.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dup.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dup2.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/error.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/euidaccess.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exclude.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exitfail.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/faccessat.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fadvise.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fatal-signal.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fchdir.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fchmodat.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fchown-stub.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fchownat.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fclose.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcntl.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fd-hook.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fd-safer-flag.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fd-safer.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fdatasync.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fdopen.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fdopendir.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fdutimensat.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fflush.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file-has-acl.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file-set.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file-type.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fileblocks.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filemode.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filenamecat-lgpl.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filenamecat.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filevercmp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/float.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fnmatch.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fnmatch_loop.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fopen-safer.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fopen.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fpending.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fprintftime.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fpurge.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/freadahead.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/freading.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/freadptr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/freadseek.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/freopen-safer.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/freopen.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/frexp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/frexpl.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fseek.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fseeko.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fseterr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fstat.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fstatat.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fsusage.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fsync.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftell.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftello.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftoastr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftruncate.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fts-cycle.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fts.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/full-read.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/full-write.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/futimens.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gai_strerror.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getaddrinfo.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getcwd-lgpl.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getcwd.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getdelim.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getdtablesize.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getfilecon.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getgroups.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gethostname.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gethrxtime.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getline.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getloadavg.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getlogin.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getndelim2.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getpagesize.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getpass.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gettime.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gettimeofday.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getugroups.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getusershell.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/group-member.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hard-locale.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hash-pjw.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hash-triple.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hash.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/heap.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/human.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i-ring.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iconv.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iconv_close.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iconv_open.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/idcache.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imaxtostr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inet_ntop.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ino-map.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inttostr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/isapipe.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/isatty.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/isblank.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/isnan.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/isnand.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/isnanf.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/isnanl.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iswblank.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/itold.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lchown.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ldtoastr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linebuffer.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/link.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linkat.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localcharset.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localeconv.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lock.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/long-options.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lseek.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lstat.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/malloc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/malloca.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbchar.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbrlen.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbrtowc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbsalign.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbscasecmp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbsinit.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbslen.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbsrtowcs-state.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbsrtowcs.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbsstr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbswidth.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbtowc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memcasecmp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memchr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memchr2.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memcmp2.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memcoll.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mempcpy.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memrchr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mgetgroups.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkancesdirs.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkdir-p.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkdir.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkfifo.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mknod.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkstemp-safer.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkstemp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mktime.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/modechange.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mountlist.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpsort.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msvc-inval.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msvc-nothrow.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nanosleep.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nl_langinfo.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nproc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/obstack.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/offtostr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/open-safer.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/open.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openat-die.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openat-proc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openat-safer.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openat.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opendir-safer.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opendir.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse-datetime.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/physmem.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pipe-safer.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pipe2-safer.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pipe2.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/posixtm.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/posixver.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printf-args.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printf-frexp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printf-frexpl.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printf-parse.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/priv-set.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/progname.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/propername.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/putenv.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quotearg.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/raise.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rand-isaac.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/randint.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/randperm.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/randread.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rawmemchr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/read-file.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/read.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readdir.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readlink.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readlinkat.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readtokens.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readtokens0.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readutmp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/realloc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regcomp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regex.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regex_internal.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regexec.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remove.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rename.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rewinddir.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rmdir.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/root-dev-ino.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpmatch.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/safe-read.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/safe-write.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/same.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/save-cwd.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/savedir.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/savewd.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/select.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/selinux-at.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/set-mode-acl.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/setenv.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/settime.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha1.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha256.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha512.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sig2str.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sigaction.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signbitd.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signbitf.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signbitl.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sigprocmask.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/snprintf.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sockets.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spawn-pipe.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spawn_faction_addclose.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spawn_faction_adddup2.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spawn_faction_addopen.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spawn_faction_destroy.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spawn_faction_init.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spawnattr_destroy.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spawnattr_init.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spawnattr_setflags.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spawnattr_setsigmask.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spawni.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spawnp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stat.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stpcpy.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stpncpy.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strcasecmp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strchrnul.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strdup.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strerror-override.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strerror.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strftime.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/striconv.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stripslash.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strncasecmp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strncat.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strndup.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strnlen.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strnlen1.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strpbrk.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strsignal.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strstr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strtod.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strtoimax.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strtol.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strtoll.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strtoul.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strtoull.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strtoumax.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/symlink.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tempname.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/threadlib.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/time_r.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tls.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trim.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/u8-mbtoucr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/u8-uctomb-aux.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/u8-uctomb.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uinttostr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/umaxtostr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uname.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unicodeio.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unlink.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unlinkat.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unsetenv.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/userspec.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utimecmp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utimens.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utimensat.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vasnprintf.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vasprintf.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/verror.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version-etc-fsf.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version-etc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vfprintf.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vprintf.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wait-process.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/waitpid.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wcrtomb.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wcswidth.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wcwidth.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/width.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/write-any-file.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/write.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xalloc-die.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xasprintf.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfreopen.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xgetcwd.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xgetgroups.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xgethostname.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmalloc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmemcoll.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xnanosleep.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xprintf.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xreadlink.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xstriconv.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xstrndup.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xstrtod.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xstrtoimax.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xstrtol-error.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xstrtol.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xstrtold.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xstrtoul.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xstrtoumax.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xvasprintf.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yesno.Po@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< - -.c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` - -lock.o: glthread/lock.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lock.o -MD -MP -MF $(DEPDIR)/lock.Tpo -c -o lock.o `test -f 'glthread/lock.c' || echo '$(srcdir)/'`glthread/lock.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lock.Tpo $(DEPDIR)/lock.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='glthread/lock.c' object='lock.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) $(AM_CFLAGS) $(CFLAGS) -c -o lock.o `test -f 'glthread/lock.c' || echo '$(srcdir)/'`glthread/lock.c - -lock.obj: glthread/lock.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lock.obj -MD -MP -MF $(DEPDIR)/lock.Tpo -c -o lock.obj `if test -f 'glthread/lock.c'; then $(CYGPATH_W) 'glthread/lock.c'; else $(CYGPATH_W) '$(srcdir)/glthread/lock.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lock.Tpo $(DEPDIR)/lock.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='glthread/lock.c' object='lock.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) $(AM_CFLAGS) $(CFLAGS) -c -o lock.obj `if test -f 'glthread/lock.c'; then $(CYGPATH_W) 'glthread/lock.c'; else $(CYGPATH_W) '$(srcdir)/glthread/lock.c'; fi` - -threadlib.o: glthread/threadlib.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT threadlib.o -MD -MP -MF $(DEPDIR)/threadlib.Tpo -c -o threadlib.o `test -f 'glthread/threadlib.c' || echo '$(srcdir)/'`glthread/threadlib.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/threadlib.Tpo $(DEPDIR)/threadlib.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='glthread/threadlib.c' object='threadlib.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) $(AM_CFLAGS) $(CFLAGS) -c -o threadlib.o `test -f 'glthread/threadlib.c' || echo '$(srcdir)/'`glthread/threadlib.c - -threadlib.obj: glthread/threadlib.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT threadlib.obj -MD -MP -MF $(DEPDIR)/threadlib.Tpo -c -o threadlib.obj `if test -f 'glthread/threadlib.c'; then $(CYGPATH_W) 'glthread/threadlib.c'; else $(CYGPATH_W) '$(srcdir)/glthread/threadlib.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/threadlib.Tpo $(DEPDIR)/threadlib.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='glthread/threadlib.c' object='threadlib.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) $(AM_CFLAGS) $(CFLAGS) -c -o threadlib.obj `if test -f 'glthread/threadlib.c'; then $(CYGPATH_W) 'glthread/threadlib.c'; else $(CYGPATH_W) '$(srcdir)/glthread/threadlib.c'; fi` - -tls.o: glthread/tls.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tls.o -MD -MP -MF $(DEPDIR)/tls.Tpo -c -o tls.o `test -f 'glthread/tls.c' || echo '$(srcdir)/'`glthread/tls.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/tls.Tpo $(DEPDIR)/tls.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='glthread/tls.c' object='tls.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) $(AM_CFLAGS) $(CFLAGS) -c -o tls.o `test -f 'glthread/tls.c' || echo '$(srcdir)/'`glthread/tls.c - -tls.obj: glthread/tls.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tls.obj -MD -MP -MF $(DEPDIR)/tls.Tpo -c -o tls.obj `if test -f 'glthread/tls.c'; then $(CYGPATH_W) 'glthread/tls.c'; else $(CYGPATH_W) '$(srcdir)/glthread/tls.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/tls.Tpo $(DEPDIR)/tls.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='glthread/tls.c' object='tls.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) $(AM_CFLAGS) $(CFLAGS) -c -o tls.obj `if test -f 'glthread/tls.c'; then $(CYGPATH_W) 'glthread/tls.c'; else $(CYGPATH_W) '$(srcdir)/glthread/tls.c'; fi` - -u8-mbtoucr.o: unistr/u8-mbtoucr.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT u8-mbtoucr.o -MD -MP -MF $(DEPDIR)/u8-mbtoucr.Tpo -c -o u8-mbtoucr.o `test -f 'unistr/u8-mbtoucr.c' || echo '$(srcdir)/'`unistr/u8-mbtoucr.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/u8-mbtoucr.Tpo $(DEPDIR)/u8-mbtoucr.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unistr/u8-mbtoucr.c' object='u8-mbtoucr.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) $(AM_CFLAGS) $(CFLAGS) -c -o u8-mbtoucr.o `test -f 'unistr/u8-mbtoucr.c' || echo '$(srcdir)/'`unistr/u8-mbtoucr.c - -u8-mbtoucr.obj: unistr/u8-mbtoucr.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT u8-mbtoucr.obj -MD -MP -MF $(DEPDIR)/u8-mbtoucr.Tpo -c -o u8-mbtoucr.obj `if test -f 'unistr/u8-mbtoucr.c'; then $(CYGPATH_W) 'unistr/u8-mbtoucr.c'; else $(CYGPATH_W) '$(srcdir)/unistr/u8-mbtoucr.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/u8-mbtoucr.Tpo $(DEPDIR)/u8-mbtoucr.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unistr/u8-mbtoucr.c' object='u8-mbtoucr.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) $(AM_CFLAGS) $(CFLAGS) -c -o u8-mbtoucr.obj `if test -f 'unistr/u8-mbtoucr.c'; then $(CYGPATH_W) 'unistr/u8-mbtoucr.c'; else $(CYGPATH_W) '$(srcdir)/unistr/u8-mbtoucr.c'; fi` - -u8-uctomb.o: unistr/u8-uctomb.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT u8-uctomb.o -MD -MP -MF $(DEPDIR)/u8-uctomb.Tpo -c -o u8-uctomb.o `test -f 'unistr/u8-uctomb.c' || echo '$(srcdir)/'`unistr/u8-uctomb.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/u8-uctomb.Tpo $(DEPDIR)/u8-uctomb.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unistr/u8-uctomb.c' object='u8-uctomb.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) $(AM_CFLAGS) $(CFLAGS) -c -o u8-uctomb.o `test -f 'unistr/u8-uctomb.c' || echo '$(srcdir)/'`unistr/u8-uctomb.c - -u8-uctomb.obj: unistr/u8-uctomb.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT u8-uctomb.obj -MD -MP -MF $(DEPDIR)/u8-uctomb.Tpo -c -o u8-uctomb.obj `if test -f 'unistr/u8-uctomb.c'; then $(CYGPATH_W) 'unistr/u8-uctomb.c'; else $(CYGPATH_W) '$(srcdir)/unistr/u8-uctomb.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/u8-uctomb.Tpo $(DEPDIR)/u8-uctomb.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unistr/u8-uctomb.c' object='u8-uctomb.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) $(AM_CFLAGS) $(CFLAGS) -c -o u8-uctomb.obj `if test -f 'unistr/u8-uctomb.c'; then $(CYGPATH_W) 'unistr/u8-uctomb.c'; else $(CYGPATH_W) '$(srcdir)/unistr/u8-uctomb.c'; fi` - -u8-uctomb-aux.o: unistr/u8-uctomb-aux.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT u8-uctomb-aux.o -MD -MP -MF $(DEPDIR)/u8-uctomb-aux.Tpo -c -o u8-uctomb-aux.o `test -f 'unistr/u8-uctomb-aux.c' || echo '$(srcdir)/'`unistr/u8-uctomb-aux.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/u8-uctomb-aux.Tpo $(DEPDIR)/u8-uctomb-aux.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unistr/u8-uctomb-aux.c' object='u8-uctomb-aux.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) $(AM_CFLAGS) $(CFLAGS) -c -o u8-uctomb-aux.o `test -f 'unistr/u8-uctomb-aux.c' || echo '$(srcdir)/'`unistr/u8-uctomb-aux.c - -u8-uctomb-aux.obj: unistr/u8-uctomb-aux.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT u8-uctomb-aux.obj -MD -MP -MF $(DEPDIR)/u8-uctomb-aux.Tpo -c -o u8-uctomb-aux.obj `if test -f 'unistr/u8-uctomb-aux.c'; then $(CYGPATH_W) 'unistr/u8-uctomb-aux.c'; else $(CYGPATH_W) '$(srcdir)/unistr/u8-uctomb-aux.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/u8-uctomb-aux.Tpo $(DEPDIR)/u8-uctomb-aux.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unistr/u8-uctomb-aux.c' object='u8-uctomb-aux.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) $(AM_CFLAGS) $(CFLAGS) -c -o u8-uctomb-aux.obj `if test -f 'unistr/u8-uctomb-aux.c'; then $(CYGPATH_W) 'unistr/u8-uctomb-aux.c'; else $(CYGPATH_W) '$(srcdir)/unistr/u8-uctomb-aux.c'; fi` - -width.o: uniwidth/width.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT width.o -MD -MP -MF $(DEPDIR)/width.Tpo -c -o width.o `test -f 'uniwidth/width.c' || echo '$(srcdir)/'`uniwidth/width.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/width.Tpo $(DEPDIR)/width.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='uniwidth/width.c' object='width.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) $(AM_CFLAGS) $(CFLAGS) -c -o width.o `test -f 'uniwidth/width.c' || echo '$(srcdir)/'`uniwidth/width.c - -width.obj: uniwidth/width.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT width.obj -MD -MP -MF $(DEPDIR)/width.Tpo -c -o width.obj `if test -f 'uniwidth/width.c'; then $(CYGPATH_W) 'uniwidth/width.c'; else $(CYGPATH_W) '$(srcdir)/uniwidth/width.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/width.Tpo $(DEPDIR)/width.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='uniwidth/width.c' object='width.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) $(AM_CFLAGS) $(CFLAGS) -c -o width.obj `if test -f 'uniwidth/width.c'; then $(CYGPATH_W) 'uniwidth/width.c'; else $(CYGPATH_W) '$(srcdir)/uniwidth/width.c'; fi` - -.y.c: - $(AM_V_YACC)$(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h `echo $@ | $(am__yacc_c2h)` y.output $*.output -- $(YACCCOMPILE) - -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: $(HEADERS) $(SOURCES) config.hin $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) config.hin $(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; }; }'`; \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) config.hin $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) config.hin $(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; }; }'`; \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" - -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ - 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 - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am -all-am: Makefile $(LIBRARIES) config.h all-local -installdirs: -install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) - -clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." - -rm -f parse-datetime.c - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) -clean: clean-am - -clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am - -distclean: distclean-am - -rm -rf $(DEPDIR) ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-hdr distclean-local distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: install-exec-local - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf $(DEPDIR) ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-local - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-local - -.MAKE: all check install install-am install-strip - -.PHONY: CTAGS GTAGS all all-am all-local check check-am clean \ - clean-generic clean-noinstLIBRARIES cscopelist ctags distclean \ - distclean-compile distclean-generic distclean-hdr \ - distclean-local distclean-tags distdir dvi dvi-am html html-am \ - info info-am install install-am 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-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-local pdf pdf-am ps ps-am tags \ - uninstall uninstall-am uninstall-local - - -# 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@alloca.h: alloca.in.h $(top_builddir)/config.status -@GL_GENERATE_ALLOCA_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ -@GL_GENERATE_ALLOCA_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ -@GL_GENERATE_ALLOCA_H_TRUE@ cat $(srcdir)/alloca.in.h; \ -@GL_GENERATE_ALLOCA_H_TRUE@ } > $@-t && \ -@GL_GENERATE_ALLOCA_H_TRUE@ mv -f $@-t $@ -@GL_GENERATE_ALLOCA_H_FALSE@alloca.h: $(top_builddir)/config.status -@GL_GENERATE_ALLOCA_H_FALSE@ rm -f $@ - -# We need the following in order to create <arpa/inet.h> when the system -# doesn't have one. -arpa/inet.h: arpa_inet.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H) - $(AM_V_at)$(MKDIR_P) arpa - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's|@''GUARD_PREFIX''@|GL|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|@''HAVE_FEATURES_H''@|$(HAVE_FEATURES_H)|g' \ - -e 's|@''NEXT_ARPA_INET_H''@|$(NEXT_ARPA_INET_H)|g' \ - -e 's|@''HAVE_ARPA_INET_H''@|$(HAVE_ARPA_INET_H)|g' \ - -e 's/@''GNULIB_INET_NTOP''@/$(GNULIB_INET_NTOP)/g' \ - -e 's/@''GNULIB_INET_PTON''@/$(GNULIB_INET_PTON)/g' \ - -e 's|@''HAVE_DECL_INET_NTOP''@|$(HAVE_DECL_INET_NTOP)|g' \ - -e 's|@''HAVE_DECL_INET_PTON''@|$(HAVE_DECL_INET_PTON)|g' \ - -e 's|@''REPLACE_INET_NTOP''@|$(REPLACE_INET_NTOP)|g' \ - -e 's|@''REPLACE_INET_PTON''@|$(REPLACE_INET_PTON)|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)' \ - < $(srcdir)/arpa_inet.in.h; \ - } > $@-t && \ - mv $@-t $@ - -# Listed in the same order as the GNU makefile conventions, and -# provided by autoconf 2.59c+. -# The Automake-defined pkg* macros are appended, in the order -# listed in the Automake 1.10a+ documentation. -configmake.h: Makefile - $(AM_V_GEN)rm -f $@-t && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - echo '#define PREFIX "$(prefix)"'; \ - echo '#define EXEC_PREFIX "$(exec_prefix)"'; \ - echo '#define BINDIR "$(bindir)"'; \ - echo '#define SBINDIR "$(sbindir)"'; \ - echo '#define LIBEXECDIR "$(libexecdir)"'; \ - echo '#define DATAROOTDIR "$(datarootdir)"'; \ - echo '#define DATADIR "$(datadir)"'; \ - echo '#define SYSCONFDIR "$(sysconfdir)"'; \ - echo '#define SHAREDSTATEDIR "$(sharedstatedir)"'; \ - echo '#define LOCALSTATEDIR "$(localstatedir)"'; \ - echo '#define INCLUDEDIR "$(includedir)"'; \ - echo '#define OLDINCLUDEDIR "$(oldincludedir)"'; \ - echo '#define DOCDIR "$(docdir)"'; \ - echo '#define INFODIR "$(infodir)"'; \ - echo '#define HTMLDIR "$(htmldir)"'; \ - echo '#define DVIDIR "$(dvidir)"'; \ - echo '#define PDFDIR "$(pdfdir)"'; \ - echo '#define PSDIR "$(psdir)"'; \ - echo '#define LIBDIR "$(libdir)"'; \ - echo '#define LISPDIR "$(lispdir)"'; \ - echo '#define LOCALEDIR "$(localedir)"'; \ - echo '#define MANDIR "$(mandir)"'; \ - echo '#define MANEXT "$(manext)"'; \ - echo '#define PKGDATADIR "$(pkgdatadir)"'; \ - echo '#define PKGINCLUDEDIR "$(pkgincludedir)"'; \ - echo '#define PKGLIBDIR "$(pkglibdir)"'; \ - echo '#define PKGLIBEXECDIR "$(pkglibexecdir)"'; \ - } | sed '/""/d' > $@-t && \ - mv -f $@-t $@ - -# We need the following in order to create <ctype.h> when the system -# doesn't have one that works with the given compiler. -ctype.h: ctype.in.h $(top_builddir)/config.status $(CXXDEFS_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|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_CTYPE_H''@|$(NEXT_CTYPE_H)|g' \ - -e 's/@''GNULIB_ISBLANK''@/$(GNULIB_ISBLANK)/g' \ - -e 's/@''HAVE_ISBLANK''@/$(HAVE_ISBLANK)/g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - < $(srcdir)/ctype.in.h; \ - } > $@-t && \ - mv $@-t $@ - -# We need the following in order to create <dirent.h> when the system -# doesn't have one that works with the given compiler. -dirent.h: dirent.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_DIRENT_H''@|$(HAVE_DIRENT_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_DIRENT_H''@|$(NEXT_DIRENT_H)|g' \ - -e 's/@''GNULIB_OPENDIR''@/$(GNULIB_OPENDIR)/g' \ - -e 's/@''GNULIB_READDIR''@/$(GNULIB_READDIR)/g' \ - -e 's/@''GNULIB_REWINDDIR''@/$(GNULIB_REWINDDIR)/g' \ - -e 's/@''GNULIB_CLOSEDIR''@/$(GNULIB_CLOSEDIR)/g' \ - -e 's/@''GNULIB_DIRFD''@/$(GNULIB_DIRFD)/g' \ - -e 's/@''GNULIB_FDOPENDIR''@/$(GNULIB_FDOPENDIR)/g' \ - -e 's/@''GNULIB_SCANDIR''@/$(GNULIB_SCANDIR)/g' \ - -e 's/@''GNULIB_ALPHASORT''@/$(GNULIB_ALPHASORT)/g' \ - -e 's/@''HAVE_OPENDIR''@/$(HAVE_OPENDIR)/g' \ - -e 's/@''HAVE_READDIR''@/$(HAVE_READDIR)/g' \ - -e 's/@''HAVE_REWINDDIR''@/$(HAVE_REWINDDIR)/g' \ - -e 's/@''HAVE_CLOSEDIR''@/$(HAVE_CLOSEDIR)/g' \ - -e 's|@''HAVE_DECL_DIRFD''@|$(HAVE_DECL_DIRFD)|g' \ - -e 's|@''HAVE_DECL_FDOPENDIR''@|$(HAVE_DECL_FDOPENDIR)|g' \ - -e 's|@''HAVE_FDOPENDIR''@|$(HAVE_FDOPENDIR)|g' \ - -e 's|@''HAVE_SCANDIR''@|$(HAVE_SCANDIR)|g' \ - -e 's|@''HAVE_ALPHASORT''@|$(HAVE_ALPHASORT)|g' \ - -e 's|@''REPLACE_OPENDIR''@|$(REPLACE_OPENDIR)|g' \ - -e 's|@''REPLACE_CLOSEDIR''@|$(REPLACE_CLOSEDIR)|g' \ - -e 's|@''REPLACE_DIRFD''@|$(REPLACE_DIRFD)|g' \ - -e 's|@''REPLACE_FDOPENDIR''@|$(REPLACE_FDOPENDIR)|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)' \ - < $(srcdir)/dirent.in.h; \ - } > $@-t && \ - mv $@-t $@ - -# We need the following in order to create <errno.h> when the system -# doesn't have one that is POSIX compliant. -@GL_GENERATE_ERRNO_H_TRUE@errno.h: errno.in.h $(top_builddir)/config.status -@GL_GENERATE_ERRNO_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ -@GL_GENERATE_ERRNO_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ -@GL_GENERATE_ERRNO_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ -@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''NEXT_ERRNO_H''@|$(NEXT_ERRNO_H)|g' \ -@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''EMULTIHOP_HIDDEN''@|$(EMULTIHOP_HIDDEN)|g' \ -@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''EMULTIHOP_VALUE''@|$(EMULTIHOP_VALUE)|g' \ -@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''ENOLINK_HIDDEN''@|$(ENOLINK_HIDDEN)|g' \ -@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''ENOLINK_VALUE''@|$(ENOLINK_VALUE)|g' \ -@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''EOVERFLOW_HIDDEN''@|$(EOVERFLOW_HIDDEN)|g' \ -@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''EOVERFLOW_VALUE''@|$(EOVERFLOW_VALUE)|g' \ -@GL_GENERATE_ERRNO_H_TRUE@ < $(srcdir)/errno.in.h; \ -@GL_GENERATE_ERRNO_H_TRUE@ } > $@-t && \ -@GL_GENERATE_ERRNO_H_TRUE@ mv $@-t $@ -@GL_GENERATE_ERRNO_H_FALSE@errno.h: $(top_builddir)/config.status -@GL_GENERATE_ERRNO_H_FALSE@ rm -f $@ - -# We need the following in order to create <fcntl.h> when the system -# doesn't have one that works with the given compiler. -fcntl.h: fcntl.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|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_FCNTL_H''@|$(NEXT_FCNTL_H)|g' \ - -e 's/@''GNULIB_FCNTL''@/$(GNULIB_FCNTL)/g' \ - -e 's/@''GNULIB_NONBLOCKING''@/$(GNULIB_NONBLOCKING)/g' \ - -e 's/@''GNULIB_OPEN''@/$(GNULIB_OPEN)/g' \ - -e 's/@''GNULIB_OPENAT''@/$(GNULIB_OPENAT)/g' \ - -e 's|@''HAVE_FCNTL''@|$(HAVE_FCNTL)|g' \ - -e 's|@''HAVE_OPENAT''@|$(HAVE_OPENAT)|g' \ - -e 's|@''REPLACE_FCNTL''@|$(REPLACE_FCNTL)|g' \ - -e 's|@''REPLACE_OPEN''@|$(REPLACE_OPEN)|g' \ - -e 's|@''REPLACE_OPENAT''@|$(REPLACE_OPENAT)|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)' \ - < $(srcdir)/fcntl.in.h; \ - } > $@-t && \ - mv $@-t $@ - -# We need the following in order to create <float.h> when the system -# doesn't have one that works with the given compiler. -@GL_GENERATE_FLOAT_H_TRUE@float.h: float.in.h $(top_builddir)/config.status -@GL_GENERATE_FLOAT_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ -@GL_GENERATE_FLOAT_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ -@GL_GENERATE_FLOAT_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ -@GL_GENERATE_FLOAT_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -@GL_GENERATE_FLOAT_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -@GL_GENERATE_FLOAT_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -@GL_GENERATE_FLOAT_H_TRUE@ -e 's|@''NEXT_FLOAT_H''@|$(NEXT_FLOAT_H)|g' \ -@GL_GENERATE_FLOAT_H_TRUE@ -e 's|@''REPLACE_ITOLD''@|$(REPLACE_ITOLD)|g' \ -@GL_GENERATE_FLOAT_H_TRUE@ < $(srcdir)/float.in.h; \ -@GL_GENERATE_FLOAT_H_TRUE@ } > $@-t && \ -@GL_GENERATE_FLOAT_H_TRUE@ mv $@-t $@ -@GL_GENERATE_FLOAT_H_FALSE@float.h: $(top_builddir)/config.status -@GL_GENERATE_FLOAT_H_FALSE@ rm -f $@ - -# We need the following in order to create <fnmatch.h> when the system -# doesn't have one that supports the required API. -@GL_GENERATE_FNMATCH_H_TRUE@fnmatch.h: fnmatch.in.h $(top_builddir)/config.status $(ARG_NONNULL_H) -@GL_GENERATE_FNMATCH_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ -@GL_GENERATE_FNMATCH_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ -@GL_GENERATE_FNMATCH_H_TRUE@ sed -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ -@GL_GENERATE_FNMATCH_H_TRUE@ < $(srcdir)/fnmatch.in.h; \ -@GL_GENERATE_FNMATCH_H_TRUE@ } > $@-t && \ -@GL_GENERATE_FNMATCH_H_TRUE@ mv -f $@-t $@ -@GL_GENERATE_FNMATCH_H_FALSE@fnmatch.h: $(top_builddir)/config.status -@GL_GENERATE_FNMATCH_H_FALSE@ rm -f $@ - -# We need the following in order to create <getopt.h> when the system -# doesn't have one that works with the given compiler. -getopt.h: getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H) - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's|@''GUARD_PREFIX''@|GL|g' \ - -e 's|@''HAVE_GETOPT_H''@|$(HAVE_GETOPT_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_GETOPT_H''@|$(NEXT_GETOPT_H)|g' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - < $(srcdir)/getopt.in.h; \ - } > $@-t && \ - mv -f $@-t $@ - -distclean-local: clean-GNUmakefile -clean-GNUmakefile: - test x'$(VPATH)' != x && rm -f $(top_builddir)/GNUmakefile || : - -# We need the following in order to create <iconv.h> when the system -# doesn't have one that works with the given compiler. -@GL_GENERATE_ICONV_H_TRUE@iconv.h: iconv.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -@GL_GENERATE_ICONV_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ -@GL_GENERATE_ICONV_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ -@GL_GENERATE_ICONV_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ -@GL_GENERATE_ICONV_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -@GL_GENERATE_ICONV_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -@GL_GENERATE_ICONV_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -@GL_GENERATE_ICONV_H_TRUE@ -e 's|@''NEXT_ICONV_H''@|$(NEXT_ICONV_H)|g' \ -@GL_GENERATE_ICONV_H_TRUE@ -e 's/@''GNULIB_ICONV''@/$(GNULIB_ICONV)/g' \ -@GL_GENERATE_ICONV_H_TRUE@ -e 's|@''ICONV_CONST''@|$(ICONV_CONST)|g' \ -@GL_GENERATE_ICONV_H_TRUE@ -e 's|@''REPLACE_ICONV''@|$(REPLACE_ICONV)|g' \ -@GL_GENERATE_ICONV_H_TRUE@ -e 's|@''REPLACE_ICONV_OPEN''@|$(REPLACE_ICONV_OPEN)|g' \ -@GL_GENERATE_ICONV_H_TRUE@ -e 's|@''REPLACE_ICONV_UTF''@|$(REPLACE_ICONV_UTF)|g' \ -@GL_GENERATE_ICONV_H_TRUE@ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -@GL_GENERATE_ICONV_H_TRUE@ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ -@GL_GENERATE_ICONV_H_TRUE@ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ -@GL_GENERATE_ICONV_H_TRUE@ < $(srcdir)/iconv.in.h; \ -@GL_GENERATE_ICONV_H_TRUE@ } > $@-t && \ -@GL_GENERATE_ICONV_H_TRUE@ mv $@-t $@ -@GL_GENERATE_ICONV_H_FALSE@iconv.h: $(top_builddir)/config.status -@GL_GENERATE_ICONV_H_FALSE@ rm -f $@ - -iconv_open-aix.h: iconv_open-aix.gperf - $(GPERF) -m 10 $(srcdir)/iconv_open-aix.gperf > $(srcdir)/iconv_open-aix.h-t - mv $(srcdir)/iconv_open-aix.h-t $(srcdir)/iconv_open-aix.h -iconv_open-hpux.h: iconv_open-hpux.gperf - $(GPERF) -m 10 $(srcdir)/iconv_open-hpux.gperf > $(srcdir)/iconv_open-hpux.h-t - mv $(srcdir)/iconv_open-hpux.h-t $(srcdir)/iconv_open-hpux.h -iconv_open-irix.h: iconv_open-irix.gperf - $(GPERF) -m 10 $(srcdir)/iconv_open-irix.gperf > $(srcdir)/iconv_open-irix.h-t - mv $(srcdir)/iconv_open-irix.h-t $(srcdir)/iconv_open-irix.h -iconv_open-osf.h: iconv_open-osf.gperf - $(GPERF) -m 10 $(srcdir)/iconv_open-osf.gperf > $(srcdir)/iconv_open-osf.h-t - mv $(srcdir)/iconv_open-osf.h-t $(srcdir)/iconv_open-osf.h -iconv_open-solaris.h: iconv_open-solaris.gperf - $(GPERF) -m 10 $(srcdir)/iconv_open-solaris.gperf > $(srcdir)/iconv_open-solaris.h-t - mv $(srcdir)/iconv_open-solaris.h-t $(srcdir)/iconv_open-solaris.h - -# We need the following in order to create <inttypes.h> when the system -# doesn't have one that works with the given compiler. -inttypes.h: inttypes.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H) - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_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_INTTYPES_H''@|$(NEXT_INTTYPES_H)|g' \ - -e 's/@''PRI_MACROS_BROKEN''@/$(PRI_MACROS_BROKEN)/g' \ - -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \ - -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \ - -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \ - -e 's/@''PRIPTR_PREFIX''@/$(PRIPTR_PREFIX)/g' \ - -e 's/@''GNULIB_IMAXABS''@/$(GNULIB_IMAXABS)/g' \ - -e 's/@''GNULIB_IMAXDIV''@/$(GNULIB_IMAXDIV)/g' \ - -e 's/@''GNULIB_STRTOIMAX''@/$(GNULIB_STRTOIMAX)/g' \ - -e 's/@''GNULIB_STRTOUMAX''@/$(GNULIB_STRTOUMAX)/g' \ - -e 's/@''HAVE_DECL_IMAXABS''@/$(HAVE_DECL_IMAXABS)/g' \ - -e 's/@''HAVE_DECL_IMAXDIV''@/$(HAVE_DECL_IMAXDIV)/g' \ - -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/@''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' \ - -e 's/@''UINT64_MAX_EQ_ULONG_MAX''@/$(UINT64_MAX_EQ_ULONG_MAX)/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)' \ - < $(srcdir)/inttypes.in.h; \ - } > $@-t && \ - mv $@-t $@ - -# We need the following in order to create an empty placeholder for -# <langinfo.h> when the system doesn't have one. -langinfo.h: langinfo.in.h $(top_builddir)/config.status $(CXXDEFS_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_LANGINFO_H''@|$(HAVE_LANGINFO_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_LANGINFO_H''@|$(NEXT_LANGINFO_H)|g' \ - -e 's/@''GNULIB_NL_LANGINFO''@/$(GNULIB_NL_LANGINFO)/g' \ - -e 's|@''HAVE_LANGINFO_CODESET''@|$(HAVE_LANGINFO_CODESET)|g' \ - -e 's|@''HAVE_LANGINFO_T_FMT_AMPM''@|$(HAVE_LANGINFO_T_FMT_AMPM)|g' \ - -e 's|@''HAVE_LANGINFO_ERA''@|$(HAVE_LANGINFO_ERA)|g' \ - -e 's|@''HAVE_LANGINFO_YESEXPR''@|$(HAVE_LANGINFO_YESEXPR)|g' \ - -e 's|@''HAVE_NL_LANGINFO''@|$(HAVE_NL_LANGINFO)|g' \ - -e 's|@''REPLACE_NL_LANGINFO''@|$(REPLACE_NL_LANGINFO)|g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - < $(srcdir)/langinfo.in.h; \ - } > $@-t && \ - mv $@-t $@ - -# We need the following in order to install a simple file in $(libdir) -# which is shared with other installed packages. We use a list of referencing -# packages so that "make uninstall" will remove the file if and only if it -# is not used by another installed package. -# On systems with glibc-2.1 or newer, the file is redundant, therefore we -# avoid installing it. - -all-local: charset.alias ref-add.sed ref-del.sed -install-exec-local: install-exec-localcharset -install-exec-localcharset: all-local - if test $(GLIBC21) = no; then \ - case '$(host_os)' in \ - darwin[56]*) \ - need_charset_alias=true ;; \ - darwin* | cygwin* | mingw* | pw32* | cegcc*) \ - need_charset_alias=false ;; \ - *) \ - need_charset_alias=true ;; \ - esac ; \ - else \ - need_charset_alias=false ; \ - fi ; \ - if $$need_charset_alias; then \ - $(mkinstalldirs) $(DESTDIR)$(libdir) ; \ - fi ; \ - if test -f $(charset_alias); then \ - sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \ - $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \ - rm -f $(charset_tmp) ; \ - else \ - if $$need_charset_alias; then \ - sed -f ref-add.sed charset.alias > $(charset_tmp) ; \ - $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \ - rm -f $(charset_tmp) ; \ - fi ; \ - fi - -uninstall-local: uninstall-localcharset -uninstall-localcharset: all-local - if test -f $(charset_alias); then \ - sed -f ref-del.sed $(charset_alias) > $(charset_tmp); \ - if grep '^# Packages using this file: $$' $(charset_tmp) \ - > /dev/null; then \ - rm -f $(charset_alias); \ - else \ - $(INSTALL_DATA) $(charset_tmp) $(charset_alias); \ - fi; \ - rm -f $(charset_tmp); \ - fi - -charset.alias: config.charset - $(AM_V_GEN)rm -f t-$@ $@ && \ - $(SHELL) $(srcdir)/config.charset '$(host)' > t-$@ && \ - mv t-$@ $@ -.sin.sed: - $(AM_V_GEN)rm -f t-$@ $@ && \ - sed -e '/^#/d' -e 's/@''PACKAGE''@/$(PACKAGE)/g' $< > t-$@ && \ - mv t-$@ $@ - -# We need the following in order to create <locale.h> when the system -# doesn't have one that provides all definitions. -locale.h: locale.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|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_LOCALE_H''@|$(NEXT_LOCALE_H)|g' \ - -e 's/@''GNULIB_LOCALECONV''@/$(GNULIB_LOCALECONV)/g' \ - -e 's/@''GNULIB_SETLOCALE''@/$(GNULIB_SETLOCALE)/g' \ - -e 's/@''GNULIB_DUPLOCALE''@/$(GNULIB_DUPLOCALE)/g' \ - -e 's|@''HAVE_DUPLOCALE''@|$(HAVE_DUPLOCALE)|g' \ - -e 's|@''HAVE_XLOCALE_H''@|$(HAVE_XLOCALE_H)|g' \ - -e 's|@''REPLACE_LOCALECONV''@|$(REPLACE_LOCALECONV)|g' \ - -e 's|@''REPLACE_SETLOCALE''@|$(REPLACE_SETLOCALE)|g' \ - -e 's|@''REPLACE_DUPLOCALE''@|$(REPLACE_DUPLOCALE)|g' \ - -e 's|@''REPLACE_STRUCT_LCONV''@|$(REPLACE_STRUCT_LCONV)|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)' \ - < $(srcdir)/locale.in.h; \ - } > $@-t && \ - mv $@-t $@ - -# We need the following in order to create <math.h> when the system -# doesn't have one that works with the given compiler. -math.h: math.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|@''INCLUDE_NEXT_AS_FIRST_DIRECTIVE''@|$(INCLUDE_NEXT_AS_FIRST_DIRECTIVE)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_AS_FIRST_DIRECTIVE_MATH_H''@|$(NEXT_AS_FIRST_DIRECTIVE_MATH_H)|g' \ - -e 's/@''GNULIB_ACOSF''@/$(GNULIB_ACOSF)/g' \ - -e 's/@''GNULIB_ACOSL''@/$(GNULIB_ACOSL)/g' \ - -e 's/@''GNULIB_ASINF''@/$(GNULIB_ASINF)/g' \ - -e 's/@''GNULIB_ASINL''@/$(GNULIB_ASINL)/g' \ - -e 's/@''GNULIB_ATANF''@/$(GNULIB_ATANF)/g' \ - -e 's/@''GNULIB_ATANL''@/$(GNULIB_ATANL)/g' \ - -e 's/@''GNULIB_ATAN2F''@/$(GNULIB_ATAN2F)/g' \ - -e 's/@''GNULIB_CBRT''@/$(GNULIB_CBRT)/g' \ - -e 's/@''GNULIB_CBRTF''@/$(GNULIB_CBRTF)/g' \ - -e 's/@''GNULIB_CBRTL''@/$(GNULIB_CBRTL)/g' \ - -e 's/@''GNULIB_CEIL''@/$(GNULIB_CEIL)/g' \ - -e 's/@''GNULIB_CEILF''@/$(GNULIB_CEILF)/g' \ - -e 's/@''GNULIB_CEILL''@/$(GNULIB_CEILL)/g' \ - -e 's/@''GNULIB_COPYSIGN''@/$(GNULIB_COPYSIGN)/g' \ - -e 's/@''GNULIB_COPYSIGNF''@/$(GNULIB_COPYSIGNF)/g' \ - -e 's/@''GNULIB_COPYSIGNL''@/$(GNULIB_COPYSIGNL)/g' \ - -e 's/@''GNULIB_COSF''@/$(GNULIB_COSF)/g' \ - -e 's/@''GNULIB_COSL''@/$(GNULIB_COSL)/g' \ - -e 's/@''GNULIB_COSHF''@/$(GNULIB_COSHF)/g' \ - -e 's/@''GNULIB_EXPF''@/$(GNULIB_EXPF)/g' \ - -e 's/@''GNULIB_EXPL''@/$(GNULIB_EXPL)/g' \ - -e 's/@''GNULIB_EXP2''@/$(GNULIB_EXP2)/g' \ - -e 's/@''GNULIB_EXP2F''@/$(GNULIB_EXP2F)/g' \ - -e 's/@''GNULIB_EXP2L''@/$(GNULIB_EXP2L)/g' \ - -e 's/@''GNULIB_EXPM1''@/$(GNULIB_EXPM1)/g' \ - -e 's/@''GNULIB_EXPM1F''@/$(GNULIB_EXPM1F)/g' \ - -e 's/@''GNULIB_EXPM1L''@/$(GNULIB_EXPM1L)/g' \ - -e 's/@''GNULIB_FABSF''@/$(GNULIB_FABSF)/g' \ - -e 's/@''GNULIB_FABSL''@/$(GNULIB_FABSL)/g' \ - -e 's/@''GNULIB_FLOOR''@/$(GNULIB_FLOOR)/g' \ - -e 's/@''GNULIB_FLOORF''@/$(GNULIB_FLOORF)/g' \ - -e 's/@''GNULIB_FLOORL''@/$(GNULIB_FLOORL)/g' \ - -e 's/@''GNULIB_FMA''@/$(GNULIB_FMA)/g' \ - -e 's/@''GNULIB_FMAF''@/$(GNULIB_FMAF)/g' \ - -e 's/@''GNULIB_FMAL''@/$(GNULIB_FMAL)/g' \ - -e 's/@''GNULIB_FMOD''@/$(GNULIB_FMOD)/g' \ - -e 's/@''GNULIB_FMODF''@/$(GNULIB_FMODF)/g' \ - -e 's/@''GNULIB_FMODL''@/$(GNULIB_FMODL)/g' \ - -e 's/@''GNULIB_FREXPF''@/$(GNULIB_FREXPF)/g' \ - -e 's/@''GNULIB_FREXP''@/$(GNULIB_FREXP)/g' \ - -e 's/@''GNULIB_FREXPL''@/$(GNULIB_FREXPL)/g' \ - -e 's/@''GNULIB_HYPOT''@/$(GNULIB_HYPOT)/g' \ - -e 's/@''GNULIB_HYPOTF''@/$(GNULIB_HYPOTF)/g' \ - -e 's/@''GNULIB_HYPOTL''@/$(GNULIB_HYPOTL)/g' \ - < $(srcdir)/math.in.h | \ - sed -e 's/@''GNULIB_ILOGB''@/$(GNULIB_ILOGB)/g' \ - -e 's/@''GNULIB_ILOGBF''@/$(GNULIB_ILOGBF)/g' \ - -e 's/@''GNULIB_ILOGBL''@/$(GNULIB_ILOGBL)/g' \ - -e 's/@''GNULIB_ISFINITE''@/$(GNULIB_ISFINITE)/g' \ - -e 's/@''GNULIB_ISINF''@/$(GNULIB_ISINF)/g' \ - -e 's/@''GNULIB_ISNAN''@/$(GNULIB_ISNAN)/g' \ - -e 's/@''GNULIB_ISNANF''@/$(GNULIB_ISNANF)/g' \ - -e 's/@''GNULIB_ISNAND''@/$(GNULIB_ISNAND)/g' \ - -e 's/@''GNULIB_ISNANL''@/$(GNULIB_ISNANL)/g' \ - -e 's/@''GNULIB_LDEXPF''@/$(GNULIB_LDEXPF)/g' \ - -e 's/@''GNULIB_LDEXPL''@/$(GNULIB_LDEXPL)/g' \ - -e 's/@''GNULIB_LOG''@/$(GNULIB_LOG)/g' \ - -e 's/@''GNULIB_LOGF''@/$(GNULIB_LOGF)/g' \ - -e 's/@''GNULIB_LOGL''@/$(GNULIB_LOGL)/g' \ - -e 's/@''GNULIB_LOG10''@/$(GNULIB_LOG10)/g' \ - -e 's/@''GNULIB_LOG10F''@/$(GNULIB_LOG10F)/g' \ - -e 's/@''GNULIB_LOG10L''@/$(GNULIB_LOG10L)/g' \ - -e 's/@''GNULIB_LOG1P''@/$(GNULIB_LOG1P)/g' \ - -e 's/@''GNULIB_LOG1PF''@/$(GNULIB_LOG1PF)/g' \ - -e 's/@''GNULIB_LOG1PL''@/$(GNULIB_LOG1PL)/g' \ - -e 's/@''GNULIB_LOG2''@/$(GNULIB_LOG2)/g' \ - -e 's/@''GNULIB_LOG2F''@/$(GNULIB_LOG2F)/g' \ - -e 's/@''GNULIB_LOG2L''@/$(GNULIB_LOG2L)/g' \ - -e 's/@''GNULIB_LOGB''@/$(GNULIB_LOGB)/g' \ - -e 's/@''GNULIB_LOGBF''@/$(GNULIB_LOGBF)/g' \ - -e 's/@''GNULIB_LOGBL''@/$(GNULIB_LOGBL)/g' \ - -e 's/@''GNULIB_MODF''@/$(GNULIB_MODF)/g' \ - -e 's/@''GNULIB_MODFF''@/$(GNULIB_MODFF)/g' \ - -e 's/@''GNULIB_MODFL''@/$(GNULIB_MODFL)/g' \ - -e 's/@''GNULIB_POWF''@/$(GNULIB_POWF)/g' \ - -e 's/@''GNULIB_REMAINDER''@/$(GNULIB_REMAINDER)/g' \ - -e 's/@''GNULIB_REMAINDERF''@/$(GNULIB_REMAINDERF)/g' \ - -e 's/@''GNULIB_REMAINDERL''@/$(GNULIB_REMAINDERL)/g' \ - -e 's/@''GNULIB_RINT''@/$(GNULIB_RINT)/g' \ - -e 's/@''GNULIB_RINTF''@/$(GNULIB_RINTF)/g' \ - -e 's/@''GNULIB_RINTL''@/$(GNULIB_RINTL)/g' \ - -e 's/@''GNULIB_ROUND''@/$(GNULIB_ROUND)/g' \ - -e 's/@''GNULIB_ROUNDF''@/$(GNULIB_ROUNDF)/g' \ - -e 's/@''GNULIB_ROUNDL''@/$(GNULIB_ROUNDL)/g' \ - -e 's/@''GNULIB_SIGNBIT''@/$(GNULIB_SIGNBIT)/g' \ - -e 's/@''GNULIB_SINF''@/$(GNULIB_SINF)/g' \ - -e 's/@''GNULIB_SINL''@/$(GNULIB_SINL)/g' \ - -e 's/@''GNULIB_SINHF''@/$(GNULIB_SINHF)/g' \ - -e 's/@''GNULIB_SQRTF''@/$(GNULIB_SQRTF)/g' \ - -e 's/@''GNULIB_SQRTL''@/$(GNULIB_SQRTL)/g' \ - -e 's/@''GNULIB_TANF''@/$(GNULIB_TANF)/g' \ - -e 's/@''GNULIB_TANL''@/$(GNULIB_TANL)/g' \ - -e 's/@''GNULIB_TANHF''@/$(GNULIB_TANHF)/g' \ - -e 's/@''GNULIB_TRUNC''@/$(GNULIB_TRUNC)/g' \ - -e 's/@''GNULIB_TRUNCF''@/$(GNULIB_TRUNCF)/g' \ - -e 's/@''GNULIB_TRUNCL''@/$(GNULIB_TRUNCL)/g' \ - | \ - sed -e 's|@''HAVE_ACOSF''@|$(HAVE_ACOSF)|g' \ - -e 's|@''HAVE_ACOSL''@|$(HAVE_ACOSL)|g' \ - -e 's|@''HAVE_ASINF''@|$(HAVE_ASINF)|g' \ - -e 's|@''HAVE_ASINL''@|$(HAVE_ASINL)|g' \ - -e 's|@''HAVE_ATANF''@|$(HAVE_ATANF)|g' \ - -e 's|@''HAVE_ATANL''@|$(HAVE_ATANL)|g' \ - -e 's|@''HAVE_ATAN2F''@|$(HAVE_ATAN2F)|g' \ - -e 's|@''HAVE_CBRT''@|$(HAVE_CBRT)|g' \ - -e 's|@''HAVE_CBRTF''@|$(HAVE_CBRTF)|g' \ - -e 's|@''HAVE_CBRTL''@|$(HAVE_CBRTL)|g' \ - -e 's|@''HAVE_COPYSIGN''@|$(HAVE_COPYSIGN)|g' \ - -e 's|@''HAVE_COPYSIGNL''@|$(HAVE_COPYSIGNL)|g' \ - -e 's|@''HAVE_COSF''@|$(HAVE_COSF)|g' \ - -e 's|@''HAVE_COSL''@|$(HAVE_COSL)|g' \ - -e 's|@''HAVE_COSHF''@|$(HAVE_COSHF)|g' \ - -e 's|@''HAVE_EXPF''@|$(HAVE_EXPF)|g' \ - -e 's|@''HAVE_EXPL''@|$(HAVE_EXPL)|g' \ - -e 's|@''HAVE_EXPM1''@|$(HAVE_EXPM1)|g' \ - -e 's|@''HAVE_EXPM1F''@|$(HAVE_EXPM1F)|g' \ - -e 's|@''HAVE_FABSF''@|$(HAVE_FABSF)|g' \ - -e 's|@''HAVE_FABSL''@|$(HAVE_FABSL)|g' \ - -e 's|@''HAVE_FMA''@|$(HAVE_FMA)|g' \ - -e 's|@''HAVE_FMAF''@|$(HAVE_FMAF)|g' \ - -e 's|@''HAVE_FMAL''@|$(HAVE_FMAL)|g' \ - -e 's|@''HAVE_FMODF''@|$(HAVE_FMODF)|g' \ - -e 's|@''HAVE_FMODL''@|$(HAVE_FMODL)|g' \ - -e 's|@''HAVE_FREXPF''@|$(HAVE_FREXPF)|g' \ - -e 's|@''HAVE_HYPOTF''@|$(HAVE_HYPOTF)|g' \ - -e 's|@''HAVE_HYPOTL''@|$(HAVE_HYPOTL)|g' \ - -e 's|@''HAVE_ILOGB''@|$(HAVE_ILOGB)|g' \ - -e 's|@''HAVE_ILOGBF''@|$(HAVE_ILOGBF)|g' \ - -e 's|@''HAVE_ILOGBL''@|$(HAVE_ILOGBL)|g' \ - -e 's|@''HAVE_ISNANF''@|$(HAVE_ISNANF)|g' \ - -e 's|@''HAVE_ISNAND''@|$(HAVE_ISNAND)|g' \ - -e 's|@''HAVE_ISNANL''@|$(HAVE_ISNANL)|g' \ - -e 's|@''HAVE_LDEXPF''@|$(HAVE_LDEXPF)|g' \ - -e 's|@''HAVE_LOGF''@|$(HAVE_LOGF)|g' \ - -e 's|@''HAVE_LOGL''@|$(HAVE_LOGL)|g' \ - -e 's|@''HAVE_LOG10F''@|$(HAVE_LOG10F)|g' \ - -e 's|@''HAVE_LOG10L''@|$(HAVE_LOG10L)|g' \ - -e 's|@''HAVE_LOG1P''@|$(HAVE_LOG1P)|g' \ - -e 's|@''HAVE_LOG1PF''@|$(HAVE_LOG1PF)|g' \ - -e 's|@''HAVE_LOG1PL''@|$(HAVE_LOG1PL)|g' \ - -e 's|@''HAVE_LOGBF''@|$(HAVE_LOGBF)|g' \ - -e 's|@''HAVE_LOGBL''@|$(HAVE_LOGBL)|g' \ - -e 's|@''HAVE_MODFF''@|$(HAVE_MODFF)|g' \ - -e 's|@''HAVE_MODFL''@|$(HAVE_MODFL)|g' \ - -e 's|@''HAVE_POWF''@|$(HAVE_POWF)|g' \ - -e 's|@''HAVE_REMAINDER''@|$(HAVE_REMAINDER)|g' \ - -e 's|@''HAVE_REMAINDERF''@|$(HAVE_REMAINDERF)|g' \ - -e 's|@''HAVE_RINT''@|$(HAVE_RINT)|g' \ - -e 's|@''HAVE_RINTL''@|$(HAVE_RINTL)|g' \ - -e 's|@''HAVE_SINF''@|$(HAVE_SINF)|g' \ - -e 's|@''HAVE_SINL''@|$(HAVE_SINL)|g' \ - -e 's|@''HAVE_SINHF''@|$(HAVE_SINHF)|g' \ - -e 's|@''HAVE_SQRTF''@|$(HAVE_SQRTF)|g' \ - -e 's|@''HAVE_SQRTL''@|$(HAVE_SQRTL)|g' \ - -e 's|@''HAVE_TANF''@|$(HAVE_TANF)|g' \ - -e 's|@''HAVE_TANL''@|$(HAVE_TANL)|g' \ - -e 's|@''HAVE_TANHF''@|$(HAVE_TANHF)|g' \ - -e 's|@''HAVE_DECL_ACOSL''@|$(HAVE_DECL_ACOSL)|g' \ - -e 's|@''HAVE_DECL_ASINL''@|$(HAVE_DECL_ASINL)|g' \ - -e 's|@''HAVE_DECL_ATANL''@|$(HAVE_DECL_ATANL)|g' \ - -e 's|@''HAVE_DECL_CBRTF''@|$(HAVE_DECL_CBRTF)|g' \ - -e 's|@''HAVE_DECL_CBRTL''@|$(HAVE_DECL_CBRTL)|g' \ - -e 's|@''HAVE_DECL_CEILF''@|$(HAVE_DECL_CEILF)|g' \ - -e 's|@''HAVE_DECL_CEILL''@|$(HAVE_DECL_CEILL)|g' \ - -e 's|@''HAVE_DECL_COPYSIGNF''@|$(HAVE_DECL_COPYSIGNF)|g' \ - -e 's|@''HAVE_DECL_COSL''@|$(HAVE_DECL_COSL)|g' \ - -e 's|@''HAVE_DECL_EXPL''@|$(HAVE_DECL_EXPL)|g' \ - -e 's|@''HAVE_DECL_EXP2''@|$(HAVE_DECL_EXP2)|g' \ - -e 's|@''HAVE_DECL_EXP2F''@|$(HAVE_DECL_EXP2F)|g' \ - -e 's|@''HAVE_DECL_EXP2L''@|$(HAVE_DECL_EXP2L)|g' \ - -e 's|@''HAVE_DECL_EXPM1L''@|$(HAVE_DECL_EXPM1L)|g' \ - -e 's|@''HAVE_DECL_FLOORF''@|$(HAVE_DECL_FLOORF)|g' \ - -e 's|@''HAVE_DECL_FLOORL''@|$(HAVE_DECL_FLOORL)|g' \ - -e 's|@''HAVE_DECL_FREXPL''@|$(HAVE_DECL_FREXPL)|g' \ - -e 's|@''HAVE_DECL_LDEXPL''@|$(HAVE_DECL_LDEXPL)|g' \ - -e 's|@''HAVE_DECL_LOGL''@|$(HAVE_DECL_LOGL)|g' \ - -e 's|@''HAVE_DECL_LOG10L''@|$(HAVE_DECL_LOG10L)|g' \ - -e 's|@''HAVE_DECL_LOG2''@|$(HAVE_DECL_LOG2)|g' \ - -e 's|@''HAVE_DECL_LOG2F''@|$(HAVE_DECL_LOG2F)|g' \ - -e 's|@''HAVE_DECL_LOG2L''@|$(HAVE_DECL_LOG2L)|g' \ - -e 's|@''HAVE_DECL_LOGB''@|$(HAVE_DECL_LOGB)|g' \ - -e 's|@''HAVE_DECL_REMAINDER''@|$(HAVE_DECL_REMAINDER)|g' \ - -e 's|@''HAVE_DECL_REMAINDERL''@|$(HAVE_DECL_REMAINDERL)|g' \ - -e 's|@''HAVE_DECL_RINTF''@|$(HAVE_DECL_RINTF)|g' \ - -e 's|@''HAVE_DECL_ROUND''@|$(HAVE_DECL_ROUND)|g' \ - -e 's|@''HAVE_DECL_ROUNDF''@|$(HAVE_DECL_ROUNDF)|g' \ - -e 's|@''HAVE_DECL_ROUNDL''@|$(HAVE_DECL_ROUNDL)|g' \ - -e 's|@''HAVE_DECL_SINL''@|$(HAVE_DECL_SINL)|g' \ - -e 's|@''HAVE_DECL_SQRTL''@|$(HAVE_DECL_SQRTL)|g' \ - -e 's|@''HAVE_DECL_TANL''@|$(HAVE_DECL_TANL)|g' \ - -e 's|@''HAVE_DECL_TRUNC''@|$(HAVE_DECL_TRUNC)|g' \ - -e 's|@''HAVE_DECL_TRUNCF''@|$(HAVE_DECL_TRUNCF)|g' \ - -e 's|@''HAVE_DECL_TRUNCL''@|$(HAVE_DECL_TRUNCL)|g' \ - | \ - sed -e 's|@''REPLACE_CBRTF''@|$(REPLACE_CBRTF)|g' \ - -e 's|@''REPLACE_CBRTL''@|$(REPLACE_CBRTL)|g' \ - -e 's|@''REPLACE_CEIL''@|$(REPLACE_CEIL)|g' \ - -e 's|@''REPLACE_CEILF''@|$(REPLACE_CEILF)|g' \ - -e 's|@''REPLACE_CEILL''@|$(REPLACE_CEILL)|g' \ - -e 's|@''REPLACE_EXPM1''@|$(REPLACE_EXPM1)|g' \ - -e 's|@''REPLACE_EXPM1F''@|$(REPLACE_EXPM1F)|g' \ - -e 's|@''REPLACE_EXP2''@|$(REPLACE_EXP2)|g' \ - -e 's|@''REPLACE_EXP2L''@|$(REPLACE_EXP2L)|g' \ - -e 's|@''REPLACE_FABSL''@|$(REPLACE_FABSL)|g' \ - -e 's|@''REPLACE_FLOOR''@|$(REPLACE_FLOOR)|g' \ - -e 's|@''REPLACE_FLOORF''@|$(REPLACE_FLOORF)|g' \ - -e 's|@''REPLACE_FLOORL''@|$(REPLACE_FLOORL)|g' \ - -e 's|@''REPLACE_FMA''@|$(REPLACE_FMA)|g' \ - -e 's|@''REPLACE_FMAF''@|$(REPLACE_FMAF)|g' \ - -e 's|@''REPLACE_FMAL''@|$(REPLACE_FMAL)|g' \ - -e 's|@''REPLACE_FMOD''@|$(REPLACE_FMOD)|g' \ - -e 's|@''REPLACE_FMODF''@|$(REPLACE_FMODF)|g' \ - -e 's|@''REPLACE_FMODL''@|$(REPLACE_FMODL)|g' \ - -e 's|@''REPLACE_FREXPF''@|$(REPLACE_FREXPF)|g' \ - -e 's|@''REPLACE_FREXP''@|$(REPLACE_FREXP)|g' \ - -e 's|@''REPLACE_FREXPL''@|$(REPLACE_FREXPL)|g' \ - -e 's|@''REPLACE_HUGE_VAL''@|$(REPLACE_HUGE_VAL)|g' \ - -e 's|@''REPLACE_HYPOT''@|$(REPLACE_HYPOT)|g' \ - -e 's|@''REPLACE_HYPOTF''@|$(REPLACE_HYPOTF)|g' \ - -e 's|@''REPLACE_HYPOTL''@|$(REPLACE_HYPOTL)|g' \ - -e 's|@''REPLACE_ILOGB''@|$(REPLACE_ILOGB)|g' \ - -e 's|@''REPLACE_ILOGBF''@|$(REPLACE_ILOGBF)|g' \ - -e 's|@''REPLACE_ISFINITE''@|$(REPLACE_ISFINITE)|g' \ - -e 's|@''REPLACE_ISINF''@|$(REPLACE_ISINF)|g' \ - -e 's|@''REPLACE_ISNAN''@|$(REPLACE_ISNAN)|g' \ - -e 's|@''REPLACE_ITOLD''@|$(REPLACE_ITOLD)|g' \ - -e 's|@''REPLACE_LDEXPL''@|$(REPLACE_LDEXPL)|g' \ - -e 's|@''REPLACE_LOG''@|$(REPLACE_LOG)|g' \ - -e 's|@''REPLACE_LOGF''@|$(REPLACE_LOGF)|g' \ - -e 's|@''REPLACE_LOGL''@|$(REPLACE_LOGL)|g' \ - -e 's|@''REPLACE_LOG10''@|$(REPLACE_LOG10)|g' \ - -e 's|@''REPLACE_LOG10F''@|$(REPLACE_LOG10F)|g' \ - -e 's|@''REPLACE_LOG10L''@|$(REPLACE_LOG10L)|g' \ - -e 's|@''REPLACE_LOG1P''@|$(REPLACE_LOG1P)|g' \ - -e 's|@''REPLACE_LOG1PF''@|$(REPLACE_LOG1PF)|g' \ - -e 's|@''REPLACE_LOG1PL''@|$(REPLACE_LOG1PL)|g' \ - -e 's|@''REPLACE_LOG2''@|$(REPLACE_LOG2)|g' \ - -e 's|@''REPLACE_LOG2F''@|$(REPLACE_LOG2F)|g' \ - -e 's|@''REPLACE_LOG2L''@|$(REPLACE_LOG2L)|g' \ - -e 's|@''REPLACE_LOGB''@|$(REPLACE_LOGB)|g' \ - -e 's|@''REPLACE_LOGBF''@|$(REPLACE_LOGBF)|g' \ - -e 's|@''REPLACE_LOGBL''@|$(REPLACE_LOGBL)|g' \ - -e 's|@''REPLACE_MODF''@|$(REPLACE_MODF)|g' \ - -e 's|@''REPLACE_MODFF''@|$(REPLACE_MODFF)|g' \ - -e 's|@''REPLACE_MODFL''@|$(REPLACE_MODFL)|g' \ - -e 's|@''REPLACE_NAN''@|$(REPLACE_NAN)|g' \ - -e 's|@''REPLACE_REMAINDER''@|$(REPLACE_REMAINDER)|g' \ - -e 's|@''REPLACE_REMAINDERF''@|$(REPLACE_REMAINDERF)|g' \ - -e 's|@''REPLACE_REMAINDERL''@|$(REPLACE_REMAINDERL)|g' \ - -e 's|@''REPLACE_ROUND''@|$(REPLACE_ROUND)|g' \ - -e 's|@''REPLACE_ROUNDF''@|$(REPLACE_ROUNDF)|g' \ - -e 's|@''REPLACE_ROUNDL''@|$(REPLACE_ROUNDL)|g' \ - -e 's|@''REPLACE_SIGNBIT''@|$(REPLACE_SIGNBIT)|g' \ - -e 's|@''REPLACE_SIGNBIT_USING_GCC''@|$(REPLACE_SIGNBIT_USING_GCC)|g' \ - -e 's|@''REPLACE_SQRTL''@|$(REPLACE_SQRTL)|g' \ - -e 's|@''REPLACE_TRUNC''@|$(REPLACE_TRUNC)|g' \ - -e 's|@''REPLACE_TRUNCF''@|$(REPLACE_TRUNCF)|g' \ - -e 's|@''REPLACE_TRUNCL''@|$(REPLACE_TRUNCL)|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)'; \ - } > $@-t && \ - mv $@-t $@ - -# We need the following in order to create <netdb.h> when the system -# doesn't have one that works with the given compiler. -netdb.h: netdb.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|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_NETDB_H''@|$(NEXT_NETDB_H)|g' \ - -e 's|@''HAVE_NETDB_H''@|$(HAVE_NETDB_H)|g' \ - -e 's/@''GNULIB_GETADDRINFO''@/$(GNULIB_GETADDRINFO)/g' \ - -e 's|@''HAVE_STRUCT_ADDRINFO''@|$(HAVE_STRUCT_ADDRINFO)|g' \ - -e 's|@''HAVE_DECL_FREEADDRINFO''@|$(HAVE_DECL_FREEADDRINFO)|g' \ - -e 's|@''HAVE_DECL_GAI_STRERROR''@|$(HAVE_DECL_GAI_STRERROR)|g' \ - -e 's|@''HAVE_DECL_GETADDRINFO''@|$(HAVE_DECL_GETADDRINFO)|g' \ - -e 's|@''HAVE_DECL_GETNAMEINFO''@|$(HAVE_DECL_GETNAMEINFO)|g' \ - -e 's|@''REPLACE_GAI_STRERROR''@|$(REPLACE_GAI_STRERROR)|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)' \ - < $(srcdir)/netdb.in.h; \ - } > $@-t && \ - mv $@-t $@ - -# We need the following in order to create <netinet/in.h> when the system -# doesn't have one. -@GL_GENERATE_NETINET_IN_H_TRUE@netinet/in.h: netinet_in.in.h $(top_builddir)/config.status -@GL_GENERATE_NETINET_IN_H_TRUE@ $(AM_V_at)$(MKDIR_P) netinet -@GL_GENERATE_NETINET_IN_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ -@GL_GENERATE_NETINET_IN_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ -@GL_GENERATE_NETINET_IN_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ -@GL_GENERATE_NETINET_IN_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -@GL_GENERATE_NETINET_IN_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -@GL_GENERATE_NETINET_IN_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -@GL_GENERATE_NETINET_IN_H_TRUE@ -e 's|@''NEXT_NETINET_IN_H''@|$(NEXT_NETINET_IN_H)|g' \ -@GL_GENERATE_NETINET_IN_H_TRUE@ -e 's|@''HAVE_NETINET_IN_H''@|$(HAVE_NETINET_IN_H)|g' \ -@GL_GENERATE_NETINET_IN_H_TRUE@ < $(srcdir)/netinet_in.in.h; \ -@GL_GENERATE_NETINET_IN_H_TRUE@ } > $@-t && \ -@GL_GENERATE_NETINET_IN_H_TRUE@ mv $@-t $@ -@GL_GENERATE_NETINET_IN_H_FALSE@netinet/in.h: $(top_builddir)/config.status -@GL_GENERATE_NETINET_IN_H_FALSE@ rm -f $@ - -# This rule overrides the Automake generated .y.c rule, to ensure that the -# parse-datetime.c file gets generated in the source directory, not in the -# build directory. -parse-datetime.c: parse-datetime.y - $(AM_V_GEN)$(SHELL) $(YLWRAP) $(srcdir)/parse-datetime.y \ - y.tab.c parse-datetime.c \ - y.tab.h parse-datetime.h \ - y.output parse-datetime.output \ - -- $(YACC) $(YFLAGS) $(AM_YFLAGS) && \ - mv parse-datetime.c parse-datetime.c-t && \ - mv parse-datetime.c-t $(srcdir)/parse-datetime.c - -# We need the following in order to create <pthread.h> when the system -# doesn't have one that works with the given compiler. -@GL_GENERATE_PTHREAD_H_TRUE@pthread.h: pthread.in.h $(top_builddir)/config.status -@GL_GENERATE_PTHREAD_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ -@GL_GENERATE_PTHREAD_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ -@GL_GENERATE_PTHREAD_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ -@GL_GENERATE_PTHREAD_H_TRUE@ -e 's|@''HAVE_PTHREAD_H''@|$(HAVE_PTHREAD_H)|g' \ -@GL_GENERATE_PTHREAD_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -@GL_GENERATE_PTHREAD_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -@GL_GENERATE_PTHREAD_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -@GL_GENERATE_PTHREAD_H_TRUE@ -e 's|@''NEXT_PTHREAD_H''@|$(NEXT_PTHREAD_H)|g' \ -@GL_GENERATE_PTHREAD_H_TRUE@ -e 's|@''HAVE_PTHREAD_T''@|$(HAVE_PTHREAD_T)|g' \ -@GL_GENERATE_PTHREAD_H_TRUE@ -e 's|@''HAVE_PTHREAD_SPINLOCK_T''@|$(HAVE_PTHREAD_SPINLOCK_T)|g' \ -@GL_GENERATE_PTHREAD_H_TRUE@ < $(srcdir)/pthread.in.h; \ -@GL_GENERATE_PTHREAD_H_TRUE@ } > $@-t && \ -@GL_GENERATE_PTHREAD_H_TRUE@ mv $@-t $@ -@GL_GENERATE_PTHREAD_H_FALSE@pthread.h: $(top_builddir)/config.status -@GL_GENERATE_PTHREAD_H_FALSE@ rm -f $@ - -# We need the following in order to create a replacement for <sched.h> when -# the system doesn't have one. -@GL_GENERATE_SCHED_H_TRUE@sched.h: sched.in.h $(top_builddir)/config.status -@GL_GENERATE_SCHED_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ -@GL_GENERATE_SCHED_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ -@GL_GENERATE_SCHED_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ -@GL_GENERATE_SCHED_H_TRUE@ -e 's|@''HAVE_SCHED_H''@|$(HAVE_SCHED_H)|g' \ -@GL_GENERATE_SCHED_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -@GL_GENERATE_SCHED_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -@GL_GENERATE_SCHED_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -@GL_GENERATE_SCHED_H_TRUE@ -e 's|@''NEXT_SCHED_H''@|$(NEXT_SCHED_H)|g' \ -@GL_GENERATE_SCHED_H_TRUE@ -e 's|@''HAVE_STRUCT_SCHED_PARAM''@|$(HAVE_STRUCT_SCHED_PARAM)|g' \ -@GL_GENERATE_SCHED_H_TRUE@ < $(srcdir)/sched.in.h; \ -@GL_GENERATE_SCHED_H_TRUE@ } > $@-t && \ -@GL_GENERATE_SCHED_H_TRUE@ mv $@-t $@ -@GL_GENERATE_SCHED_H_FALSE@sched.h: $(top_builddir)/config.status -@GL_GENERATE_SCHED_H_FALSE@ rm -f $@ -selinux/selinux.h: se-selinux.in.h $(top_builddir)/config.status $(UNUSED_PARAMETER_H) - $(AM_V_at)$(MKDIR_P) selinux - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ - sed -e 's|@''GUARD_PREFIX''@|GL|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_SELINUX_SELINUX_H''@|$(NEXT_SELINUX_SELINUX_H)|g' \ - -e '/definition of _GL_UNUSED_PARAMETER/r $(UNUSED_PARAMETER_H)' \ - < $(srcdir)/se-selinux.in.h; \ - } > $@-t && \ - chmod a-x $@-t && \ - mv $@-t $@ -@GL_GENERATE_SELINUX_CONTEXT_H_TRUE@selinux/context.h: se-context.in.h $(top_builddir)/config.status $(UNUSED_PARAMETER_H) -@GL_GENERATE_SELINUX_CONTEXT_H_TRUE@ $(AM_V_at)$(MKDIR_P) selinux -@GL_GENERATE_SELINUX_CONTEXT_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ -@GL_GENERATE_SELINUX_CONTEXT_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ -@GL_GENERATE_SELINUX_CONTEXT_H_TRUE@ sed -e '/definition of _GL_UNUSED_PARAMETER/r $(UNUSED_PARAMETER_H)' \ -@GL_GENERATE_SELINUX_CONTEXT_H_TRUE@ < $(srcdir)/se-context.in.h; \ -@GL_GENERATE_SELINUX_CONTEXT_H_TRUE@ } > $@-t && \ -@GL_GENERATE_SELINUX_CONTEXT_H_TRUE@ chmod a-x $@-t && \ -@GL_GENERATE_SELINUX_CONTEXT_H_TRUE@ mv $@-t $@ -@GL_GENERATE_SELINUX_CONTEXT_H_FALSE@selinux/context.h: $(top_builddir)/config.status -@GL_GENERATE_SELINUX_CONTEXT_H_FALSE@ rm -f $@ - -# We need the following in order to create <signal.h> when the system -# doesn't have a complete one. -signal.h: signal.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|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_SIGNAL_H''@|$(NEXT_SIGNAL_H)|g' \ - -e 's|@''GNULIB_PTHREAD_SIGMASK''@|$(GNULIB_PTHREAD_SIGMASK)|g' \ - -e 's|@''GNULIB_RAISE''@|$(GNULIB_RAISE)|g' \ - -e 's/@''GNULIB_SIGNAL_H_SIGPIPE''@/$(GNULIB_SIGNAL_H_SIGPIPE)/g' \ - -e 's/@''GNULIB_SIGPROCMASK''@/$(GNULIB_SIGPROCMASK)/g' \ - -e 's/@''GNULIB_SIGACTION''@/$(GNULIB_SIGACTION)/g' \ - -e 's|@''HAVE_POSIX_SIGNALBLOCKING''@|$(HAVE_POSIX_SIGNALBLOCKING)|g' \ - -e 's|@''HAVE_PTHREAD_SIGMASK''@|$(HAVE_PTHREAD_SIGMASK)|g' \ - -e 's|@''HAVE_RAISE''@|$(HAVE_RAISE)|g' \ - -e 's|@''HAVE_SIGSET_T''@|$(HAVE_SIGSET_T)|g' \ - -e 's|@''HAVE_SIGINFO_T''@|$(HAVE_SIGINFO_T)|g' \ - -e 's|@''HAVE_SIGACTION''@|$(HAVE_SIGACTION)|g' \ - -e 's|@''HAVE_STRUCT_SIGACTION_SA_SIGACTION''@|$(HAVE_STRUCT_SIGACTION_SA_SIGACTION)|g' \ - -e 's|@''HAVE_TYPE_VOLATILE_SIG_ATOMIC_T''@|$(HAVE_TYPE_VOLATILE_SIG_ATOMIC_T)|g' \ - -e 's|@''HAVE_SIGHANDLER_T''@|$(HAVE_SIGHANDLER_T)|g' \ - -e 's|@''REPLACE_PTHREAD_SIGMASK''@|$(REPLACE_PTHREAD_SIGMASK)|g' \ - -e 's|@''REPLACE_RAISE''@|$(REPLACE_RAISE)|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)' \ - < $(srcdir)/signal.in.h; \ - } > $@-t && \ - 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. -arg-nonnull.h: $(top_srcdir)/build-aux/snippet/arg-nonnull.h - $(AM_V_GEN)rm -f $@-t $@ && \ - sed -n -e '/GL_ARG_NONNULL/,$$p' \ - < $(top_srcdir)/build-aux/snippet/arg-nonnull.h \ - > $@-t && \ - mv $@-t $@ -# The c++defs.h that gets inserted into generated .h files is the same as -# build-aux/snippet/c++defs.h, except that it has the copyright header cut off. -c++defs.h: $(top_srcdir)/build-aux/snippet/c++defs.h - $(AM_V_GEN)rm -f $@-t $@ && \ - sed -n -e '/_GL_CXXDEFS/,$$p' \ - < $(top_srcdir)/build-aux/snippet/c++defs.h \ - > $@-t && \ - mv $@-t $@ -# The unused-parameter.h that gets inserted into generated .h files is the same -# as build-aux/snippet/unused-parameter.h, except that it has the copyright -# header cut off. -unused-parameter.h: $(top_srcdir)/build-aux/snippet/unused-parameter.h - $(AM_V_GEN)rm -f $@-t $@ && \ - sed -n -e '/GL_UNUSED_PARAMETER/,$$p' \ - < $(top_srcdir)/build-aux/snippet/unused-parameter.h \ - > $@-t && \ - mv $@-t $@ -# The warn-on-use.h that gets inserted into generated .h files is the same as -# build-aux/snippet/warn-on-use.h, except that it has the copyright header cut -# off. -warn-on-use.h: $(top_srcdir)/build-aux/snippet/warn-on-use.h - $(AM_V_GEN)rm -f $@-t $@ && \ - sed -n -e '/^.ifndef/,$$p' \ - < $(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. -spawn.h: 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)' \ - < $(srcdir)/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@stdalign.h: stdalign.in.h $(top_builddir)/config.status -@GL_GENERATE_STDALIGN_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ -@GL_GENERATE_STDALIGN_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ -@GL_GENERATE_STDALIGN_H_TRUE@ cat $(srcdir)/stdalign.in.h; \ -@GL_GENERATE_STDALIGN_H_TRUE@ } > $@-t && \ -@GL_GENERATE_STDALIGN_H_TRUE@ mv $@-t $@ -@GL_GENERATE_STDALIGN_H_FALSE@stdalign.h: $(top_builddir)/config.status -@GL_GENERATE_STDALIGN_H_FALSE@ rm -f $@ - -# We need the following in order to create <stdarg.h> when the system -# doesn't have one that works with the given compiler. -@GL_GENERATE_STDARG_H_TRUE@stdarg.h: stdarg.in.h $(top_builddir)/config.status -@GL_GENERATE_STDARG_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ -@GL_GENERATE_STDARG_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ -@GL_GENERATE_STDARG_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ -@GL_GENERATE_STDARG_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -@GL_GENERATE_STDARG_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -@GL_GENERATE_STDARG_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -@GL_GENERATE_STDARG_H_TRUE@ -e 's|@''NEXT_STDARG_H''@|$(NEXT_STDARG_H)|g' \ -@GL_GENERATE_STDARG_H_TRUE@ < $(srcdir)/stdarg.in.h; \ -@GL_GENERATE_STDARG_H_TRUE@ } > $@-t && \ -@GL_GENERATE_STDARG_H_TRUE@ mv $@-t $@ -@GL_GENERATE_STDARG_H_FALSE@stdarg.h: $(top_builddir)/config.status -@GL_GENERATE_STDARG_H_FALSE@ rm -f $@ - -# We need the following in order to create <stdbool.h> when the system -# doesn't have one that works. -@GL_GENERATE_STDBOOL_H_TRUE@stdbool.h: stdbool.in.h $(top_builddir)/config.status -@GL_GENERATE_STDBOOL_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ -@GL_GENERATE_STDBOOL_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ -@GL_GENERATE_STDBOOL_H_TRUE@ sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool.in.h; \ -@GL_GENERATE_STDBOOL_H_TRUE@ } > $@-t && \ -@GL_GENERATE_STDBOOL_H_TRUE@ mv $@-t $@ -@GL_GENERATE_STDBOOL_H_FALSE@stdbool.h: $(top_builddir)/config.status -@GL_GENERATE_STDBOOL_H_FALSE@ rm -f $@ - -# We need the following in order to create <stddef.h> when the system -# doesn't have one that works with the given compiler. -@GL_GENERATE_STDDEF_H_TRUE@stddef.h: stddef.in.h $(top_builddir)/config.status -@GL_GENERATE_STDDEF_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ -@GL_GENERATE_STDDEF_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ -@GL_GENERATE_STDDEF_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ -@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \ -@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \ -@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \ -@GL_GENERATE_STDDEF_H_TRUE@ < $(srcdir)/stddef.in.h; \ -@GL_GENERATE_STDDEF_H_TRUE@ } > $@-t && \ -@GL_GENERATE_STDDEF_H_TRUE@ mv $@-t $@ -@GL_GENERATE_STDDEF_H_FALSE@stddef.h: $(top_builddir)/config.status -@GL_GENERATE_STDDEF_H_FALSE@ rm -f $@ - -# We need the following in order to create <stdint.h> when the system -# doesn't have one that works with the given compiler. -@GL_GENERATE_STDINT_H_TRUE@stdint.h: stdint.in.h $(top_builddir)/config.status -@GL_GENERATE_STDINT_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ -@GL_GENERATE_STDINT_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ -@GL_GENERATE_STDINT_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SYS_BITYPES_H''@/$(HAVE_SYS_BITYPES_H)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_PTRDIFF_T''@/$(BITSIZEOF_PTRDIFF_T)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''PTRDIFF_T_SUFFIX''@/$(PTRDIFF_T_SUFFIX)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_SIG_ATOMIC_T''@/$(BITSIZEOF_SIG_ATOMIC_T)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SIGNED_SIG_ATOMIC_T''@/$(HAVE_SIGNED_SIG_ATOMIC_T)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''SIG_ATOMIC_T_SUFFIX''@/$(SIG_ATOMIC_T_SUFFIX)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_SIZE_T''@/$(BITSIZEOF_SIZE_T)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''SIZE_T_SUFFIX''@/$(SIZE_T_SUFFIX)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_WCHAR_T''@/$(BITSIZEOF_WCHAR_T)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SIGNED_WCHAR_T''@/$(HAVE_SIGNED_WCHAR_T)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''WCHAR_T_SUFFIX''@/$(WCHAR_T_SUFFIX)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ < $(srcdir)/stdint.in.h; \ -@GL_GENERATE_STDINT_H_TRUE@ } > $@-t && \ -@GL_GENERATE_STDINT_H_TRUE@ mv $@-t $@ -@GL_GENERATE_STDINT_H_FALSE@stdint.h: $(top_builddir)/config.status -@GL_GENERATE_STDINT_H_FALSE@ rm -f $@ - -# We need the following in order to create <stdio.h> when the system -# doesn't have one that works with the given compiler. -stdio.h: stdio.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|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_STDIO_H''@|$(NEXT_STDIO_H)|g' \ - -e 's/@''GNULIB_DPRINTF''@/$(GNULIB_DPRINTF)/g' \ - -e 's/@''GNULIB_FCLOSE''@/$(GNULIB_FCLOSE)/g' \ - -e 's/@''GNULIB_FDOPEN''@/$(GNULIB_FDOPEN)/g' \ - -e 's/@''GNULIB_FFLUSH''@/$(GNULIB_FFLUSH)/g' \ - -e 's/@''GNULIB_FGETC''@/$(GNULIB_FGETC)/g' \ - -e 's/@''GNULIB_FGETS''@/$(GNULIB_FGETS)/g' \ - -e 's/@''GNULIB_FOPEN''@/$(GNULIB_FOPEN)/g' \ - -e 's/@''GNULIB_FPRINTF''@/$(GNULIB_FPRINTF)/g' \ - -e 's/@''GNULIB_FPRINTF_POSIX''@/$(GNULIB_FPRINTF_POSIX)/g' \ - -e 's/@''GNULIB_FPURGE''@/$(GNULIB_FPURGE)/g' \ - -e 's/@''GNULIB_FPUTC''@/$(GNULIB_FPUTC)/g' \ - -e 's/@''GNULIB_FPUTS''@/$(GNULIB_FPUTS)/g' \ - -e 's/@''GNULIB_FREAD''@/$(GNULIB_FREAD)/g' \ - -e 's/@''GNULIB_FREOPEN''@/$(GNULIB_FREOPEN)/g' \ - -e 's/@''GNULIB_FSCANF''@/$(GNULIB_FSCANF)/g' \ - -e 's/@''GNULIB_FSEEK''@/$(GNULIB_FSEEK)/g' \ - -e 's/@''GNULIB_FSEEKO''@/$(GNULIB_FSEEKO)/g' \ - -e 's/@''GNULIB_FTELL''@/$(GNULIB_FTELL)/g' \ - -e 's/@''GNULIB_FTELLO''@/$(GNULIB_FTELLO)/g' \ - -e 's/@''GNULIB_FWRITE''@/$(GNULIB_FWRITE)/g' \ - -e 's/@''GNULIB_GETC''@/$(GNULIB_GETC)/g' \ - -e 's/@''GNULIB_GETCHAR''@/$(GNULIB_GETCHAR)/g' \ - -e 's/@''GNULIB_GETDELIM''@/$(GNULIB_GETDELIM)/g' \ - -e 's/@''GNULIB_GETLINE''@/$(GNULIB_GETLINE)/g' \ - -e 's/@''GNULIB_OBSTACK_PRINTF''@/$(GNULIB_OBSTACK_PRINTF)/g' \ - -e 's/@''GNULIB_OBSTACK_PRINTF_POSIX''@/$(GNULIB_OBSTACK_PRINTF_POSIX)/g' \ - -e 's/@''GNULIB_PCLOSE''@/$(GNULIB_PCLOSE)/g' \ - -e 's/@''GNULIB_PERROR''@/$(GNULIB_PERROR)/g' \ - -e 's/@''GNULIB_POPEN''@/$(GNULIB_POPEN)/g' \ - -e 's/@''GNULIB_PRINTF''@/$(GNULIB_PRINTF)/g' \ - -e 's/@''GNULIB_PRINTF_POSIX''@/$(GNULIB_PRINTF_POSIX)/g' \ - -e 's/@''GNULIB_PUTC''@/$(GNULIB_PUTC)/g' \ - -e 's/@''GNULIB_PUTCHAR''@/$(GNULIB_PUTCHAR)/g' \ - -e 's/@''GNULIB_PUTS''@/$(GNULIB_PUTS)/g' \ - -e 's/@''GNULIB_REMOVE''@/$(GNULIB_REMOVE)/g' \ - -e 's/@''GNULIB_RENAME''@/$(GNULIB_RENAME)/g' \ - -e 's/@''GNULIB_RENAMEAT''@/$(GNULIB_RENAMEAT)/g' \ - -e 's/@''GNULIB_SCANF''@/$(GNULIB_SCANF)/g' \ - -e 's/@''GNULIB_SNPRINTF''@/$(GNULIB_SNPRINTF)/g' \ - -e 's/@''GNULIB_SPRINTF_POSIX''@/$(GNULIB_SPRINTF_POSIX)/g' \ - -e 's/@''GNULIB_STDIO_H_NONBLOCKING''@/$(GNULIB_STDIO_H_NONBLOCKING)/g' \ - -e 's/@''GNULIB_STDIO_H_SIGPIPE''@/$(GNULIB_STDIO_H_SIGPIPE)/g' \ - -e 's/@''GNULIB_TMPFILE''@/$(GNULIB_TMPFILE)/g' \ - -e 's/@''GNULIB_VASPRINTF''@/$(GNULIB_VASPRINTF)/g' \ - -e 's/@''GNULIB_VDPRINTF''@/$(GNULIB_VDPRINTF)/g' \ - -e 's/@''GNULIB_VFPRINTF''@/$(GNULIB_VFPRINTF)/g' \ - -e 's/@''GNULIB_VFPRINTF_POSIX''@/$(GNULIB_VFPRINTF_POSIX)/g' \ - -e 's/@''GNULIB_VFSCANF''@/$(GNULIB_VFSCANF)/g' \ - -e 's/@''GNULIB_VSCANF''@/$(GNULIB_VSCANF)/g' \ - -e 's/@''GNULIB_VPRINTF''@/$(GNULIB_VPRINTF)/g' \ - -e 's/@''GNULIB_VPRINTF_POSIX''@/$(GNULIB_VPRINTF_POSIX)/g' \ - -e 's/@''GNULIB_VSNPRINTF''@/$(GNULIB_VSNPRINTF)/g' \ - -e 's/@''GNULIB_VSPRINTF_POSIX''@/$(GNULIB_VSPRINTF_POSIX)/g' \ - < $(srcdir)/stdio.in.h | \ - sed -e 's|@''HAVE_DECL_FPURGE''@|$(HAVE_DECL_FPURGE)|g' \ - -e 's|@''HAVE_DECL_FSEEKO''@|$(HAVE_DECL_FSEEKO)|g' \ - -e 's|@''HAVE_DECL_FTELLO''@|$(HAVE_DECL_FTELLO)|g' \ - -e 's|@''HAVE_DECL_GETDELIM''@|$(HAVE_DECL_GETDELIM)|g' \ - -e 's|@''HAVE_DECL_GETLINE''@|$(HAVE_DECL_GETLINE)|g' \ - -e 's|@''HAVE_DECL_OBSTACK_PRINTF''@|$(HAVE_DECL_OBSTACK_PRINTF)|g' \ - -e 's|@''HAVE_DECL_SNPRINTF''@|$(HAVE_DECL_SNPRINTF)|g' \ - -e 's|@''HAVE_DECL_VSNPRINTF''@|$(HAVE_DECL_VSNPRINTF)|g' \ - -e 's|@''HAVE_DPRINTF''@|$(HAVE_DPRINTF)|g' \ - -e 's|@''HAVE_FSEEKO''@|$(HAVE_FSEEKO)|g' \ - -e 's|@''HAVE_FTELLO''@|$(HAVE_FTELLO)|g' \ - -e 's|@''HAVE_PCLOSE''@|$(HAVE_PCLOSE)|g' \ - -e 's|@''HAVE_POPEN''@|$(HAVE_POPEN)|g' \ - -e 's|@''HAVE_RENAMEAT''@|$(HAVE_RENAMEAT)|g' \ - -e 's|@''HAVE_VASPRINTF''@|$(HAVE_VASPRINTF)|g' \ - -e 's|@''HAVE_VDPRINTF''@|$(HAVE_VDPRINTF)|g' \ - -e 's|@''REPLACE_DPRINTF''@|$(REPLACE_DPRINTF)|g' \ - -e 's|@''REPLACE_FCLOSE''@|$(REPLACE_FCLOSE)|g' \ - -e 's|@''REPLACE_FDOPEN''@|$(REPLACE_FDOPEN)|g' \ - -e 's|@''REPLACE_FFLUSH''@|$(REPLACE_FFLUSH)|g' \ - -e 's|@''REPLACE_FOPEN''@|$(REPLACE_FOPEN)|g' \ - -e 's|@''REPLACE_FPRINTF''@|$(REPLACE_FPRINTF)|g' \ - -e 's|@''REPLACE_FPURGE''@|$(REPLACE_FPURGE)|g' \ - -e 's|@''REPLACE_FREOPEN''@|$(REPLACE_FREOPEN)|g' \ - -e 's|@''REPLACE_FSEEK''@|$(REPLACE_FSEEK)|g' \ - -e 's|@''REPLACE_FSEEKO''@|$(REPLACE_FSEEKO)|g' \ - -e 's|@''REPLACE_FTELL''@|$(REPLACE_FTELL)|g' \ - -e 's|@''REPLACE_FTELLO''@|$(REPLACE_FTELLO)|g' \ - -e 's|@''REPLACE_GETDELIM''@|$(REPLACE_GETDELIM)|g' \ - -e 's|@''REPLACE_GETLINE''@|$(REPLACE_GETLINE)|g' \ - -e 's|@''REPLACE_OBSTACK_PRINTF''@|$(REPLACE_OBSTACK_PRINTF)|g' \ - -e 's|@''REPLACE_PERROR''@|$(REPLACE_PERROR)|g' \ - -e 's|@''REPLACE_POPEN''@|$(REPLACE_POPEN)|g' \ - -e 's|@''REPLACE_PRINTF''@|$(REPLACE_PRINTF)|g' \ - -e 's|@''REPLACE_REMOVE''@|$(REPLACE_REMOVE)|g' \ - -e 's|@''REPLACE_RENAME''@|$(REPLACE_RENAME)|g' \ - -e 's|@''REPLACE_RENAMEAT''@|$(REPLACE_RENAMEAT)|g' \ - -e 's|@''REPLACE_SNPRINTF''@|$(REPLACE_SNPRINTF)|g' \ - -e 's|@''REPLACE_SPRINTF''@|$(REPLACE_SPRINTF)|g' \ - -e 's|@''REPLACE_STDIO_READ_FUNCS''@|$(REPLACE_STDIO_READ_FUNCS)|g' \ - -e 's|@''REPLACE_STDIO_WRITE_FUNCS''@|$(REPLACE_STDIO_WRITE_FUNCS)|g' \ - -e 's|@''REPLACE_TMPFILE''@|$(REPLACE_TMPFILE)|g' \ - -e 's|@''REPLACE_VASPRINTF''@|$(REPLACE_VASPRINTF)|g' \ - -e 's|@''REPLACE_VDPRINTF''@|$(REPLACE_VDPRINTF)|g' \ - -e 's|@''REPLACE_VFPRINTF''@|$(REPLACE_VFPRINTF)|g' \ - -e 's|@''REPLACE_VPRINTF''@|$(REPLACE_VPRINTF)|g' \ - -e 's|@''REPLACE_VSNPRINTF''@|$(REPLACE_VSNPRINTF)|g' \ - -e 's|@''REPLACE_VSPRINTF''@|$(REPLACE_VSPRINTF)|g' \ - -e 's|@''ASM_SYMBOL_PREFIX''@|$(ASM_SYMBOL_PREFIX)|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)'; \ - } > $@-t && \ - mv $@-t $@ - -# We need the following in order to create <stdlib.h> when the system -# doesn't have one that works with the given compiler. -stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ - $(_NORETURN_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|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \ - -e 's/@''GNULIB__EXIT''@/$(GNULIB__EXIT)/g' \ - -e 's/@''GNULIB_ATOLL''@/$(GNULIB_ATOLL)/g' \ - -e 's/@''GNULIB_CALLOC_POSIX''@/$(GNULIB_CALLOC_POSIX)/g' \ - -e 's/@''GNULIB_CANONICALIZE_FILE_NAME''@/$(GNULIB_CANONICALIZE_FILE_NAME)/g' \ - -e 's/@''GNULIB_GETLOADAVG''@/$(GNULIB_GETLOADAVG)/g' \ - -e 's/@''GNULIB_GETSUBOPT''@/$(GNULIB_GETSUBOPT)/g' \ - -e 's/@''GNULIB_GRANTPT''@/$(GNULIB_GRANTPT)/g' \ - -e 's/@''GNULIB_MALLOC_POSIX''@/$(GNULIB_MALLOC_POSIX)/g' \ - -e 's/@''GNULIB_MBTOWC''@/$(GNULIB_MBTOWC)/g' \ - -e 's/@''GNULIB_MKDTEMP''@/$(GNULIB_MKDTEMP)/g' \ - -e 's/@''GNULIB_MKOSTEMP''@/$(GNULIB_MKOSTEMP)/g' \ - -e 's/@''GNULIB_MKOSTEMPS''@/$(GNULIB_MKOSTEMPS)/g' \ - -e 's/@''GNULIB_MKSTEMP''@/$(GNULIB_MKSTEMP)/g' \ - -e 's/@''GNULIB_MKSTEMPS''@/$(GNULIB_MKSTEMPS)/g' \ - -e 's/@''GNULIB_POSIX_OPENPT''@/$(GNULIB_POSIX_OPENPT)/g' \ - -e 's/@''GNULIB_PTSNAME''@/$(GNULIB_PTSNAME)/g' \ - -e 's/@''GNULIB_PTSNAME_R''@/$(GNULIB_PTSNAME_R)/g' \ - -e 's/@''GNULIB_PUTENV''@/$(GNULIB_PUTENV)/g' \ - -e 's/@''GNULIB_RANDOM''@/$(GNULIB_RANDOM)/g' \ - -e 's/@''GNULIB_RANDOM_R''@/$(GNULIB_RANDOM_R)/g' \ - -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_SETENV''@/$(GNULIB_SETENV)/g' \ - -e 's/@''GNULIB_STRTOD''@/$(GNULIB_STRTOD)/g' \ - -e 's/@''GNULIB_STRTOLL''@/$(GNULIB_STRTOLL)/g' \ - -e 's/@''GNULIB_STRTOULL''@/$(GNULIB_STRTOULL)/g' \ - -e 's/@''GNULIB_SYSTEM_POSIX''@/$(GNULIB_SYSTEM_POSIX)/g' \ - -e 's/@''GNULIB_UNLOCKPT''@/$(GNULIB_UNLOCKPT)/g' \ - -e 's/@''GNULIB_UNSETENV''@/$(GNULIB_UNSETENV)/g' \ - -e 's/@''GNULIB_WCTOMB''@/$(GNULIB_WCTOMB)/g' \ - < $(srcdir)/stdlib.in.h | \ - sed -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \ - -e 's|@''HAVE_ATOLL''@|$(HAVE_ATOLL)|g' \ - -e 's|@''HAVE_CANONICALIZE_FILE_NAME''@|$(HAVE_CANONICALIZE_FILE_NAME)|g' \ - -e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \ - -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \ - -e 's|@''HAVE_GRANTPT''@|$(HAVE_GRANTPT)|g' \ - -e 's|@''HAVE_MKDTEMP''@|$(HAVE_MKDTEMP)|g' \ - -e 's|@''HAVE_MKOSTEMP''@|$(HAVE_MKOSTEMP)|g' \ - -e 's|@''HAVE_MKOSTEMPS''@|$(HAVE_MKOSTEMPS)|g' \ - -e 's|@''HAVE_MKSTEMP''@|$(HAVE_MKSTEMP)|g' \ - -e 's|@''HAVE_MKSTEMPS''@|$(HAVE_MKSTEMPS)|g' \ - -e 's|@''HAVE_POSIX_OPENPT''@|$(HAVE_POSIX_OPENPT)|g' \ - -e 's|@''HAVE_PTSNAME''@|$(HAVE_PTSNAME)|g' \ - -e 's|@''HAVE_PTSNAME_R''@|$(HAVE_PTSNAME_R)|g' \ - -e 's|@''HAVE_RANDOM''@|$(HAVE_RANDOM)|g' \ - -e 's|@''HAVE_RANDOM_H''@|$(HAVE_RANDOM_H)|g' \ - -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_DECL_SETENV''@|$(HAVE_DECL_SETENV)|g' \ - -e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \ - -e 's|@''HAVE_STRTOLL''@|$(HAVE_STRTOLL)|g' \ - -e 's|@''HAVE_STRTOULL''@|$(HAVE_STRTOULL)|g' \ - -e 's|@''HAVE_STRUCT_RANDOM_DATA''@|$(HAVE_STRUCT_RANDOM_DATA)|g' \ - -e 's|@''HAVE_SYS_LOADAVG_H''@|$(HAVE_SYS_LOADAVG_H)|g' \ - -e 's|@''HAVE_UNLOCKPT''@|$(HAVE_UNLOCKPT)|g' \ - -e 's|@''HAVE_DECL_UNSETENV''@|$(HAVE_DECL_UNSETENV)|g' \ - -e 's|@''REPLACE_CALLOC''@|$(REPLACE_CALLOC)|g' \ - -e 's|@''REPLACE_CANONICALIZE_FILE_NAME''@|$(REPLACE_CANONICALIZE_FILE_NAME)|g' \ - -e 's|@''REPLACE_MALLOC''@|$(REPLACE_MALLOC)|g' \ - -e 's|@''REPLACE_MBTOWC''@|$(REPLACE_MBTOWC)|g' \ - -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \ - -e 's|@''REPLACE_PTSNAME_R''@|$(REPLACE_PTSNAME_R)|g' \ - -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \ - -e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \ - -e 's|@''REPLACE_REALLOC''@|$(REPLACE_REALLOC)|g' \ - -e 's|@''REPLACE_REALPATH''@|$(REPLACE_REALPATH)|g' \ - -e 's|@''REPLACE_SETENV''@|$(REPLACE_SETENV)|g' \ - -e 's|@''REPLACE_STRTOD''@|$(REPLACE_STRTOD)|g' \ - -e 's|@''REPLACE_UNSETENV''@|$(REPLACE_UNSETENV)|g' \ - -e 's|@''REPLACE_WCTOMB''@|$(REPLACE_WCTOMB)|g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - -e '/definition of _Noreturn/r $(_NORETURN_H)' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ - } > $@-t && \ - mv $@-t $@ - -# We need the following in order to create <string.h> when the system -# doesn't have one that works with the given compiler. -string.h: string.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|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_STRING_H''@|$(NEXT_STRING_H)|g' \ - -e 's/@''GNULIB_FFSL''@/$(GNULIB_FFSL)/g' \ - -e 's/@''GNULIB_FFSLL''@/$(GNULIB_FFSLL)/g' \ - -e 's/@''GNULIB_MBSLEN''@/$(GNULIB_MBSLEN)/g' \ - -e 's/@''GNULIB_MBSNLEN''@/$(GNULIB_MBSNLEN)/g' \ - -e 's/@''GNULIB_MBSCHR''@/$(GNULIB_MBSCHR)/g' \ - -e 's/@''GNULIB_MBSRCHR''@/$(GNULIB_MBSRCHR)/g' \ - -e 's/@''GNULIB_MBSSTR''@/$(GNULIB_MBSSTR)/g' \ - -e 's/@''GNULIB_MBSCASECMP''@/$(GNULIB_MBSCASECMP)/g' \ - -e 's/@''GNULIB_MBSNCASECMP''@/$(GNULIB_MBSNCASECMP)/g' \ - -e 's/@''GNULIB_MBSPCASECMP''@/$(GNULIB_MBSPCASECMP)/g' \ - -e 's/@''GNULIB_MBSCASESTR''@/$(GNULIB_MBSCASESTR)/g' \ - -e 's/@''GNULIB_MBSCSPN''@/$(GNULIB_MBSCSPN)/g' \ - -e 's/@''GNULIB_MBSPBRK''@/$(GNULIB_MBSPBRK)/g' \ - -e 's/@''GNULIB_MBSSPN''@/$(GNULIB_MBSSPN)/g' \ - -e 's/@''GNULIB_MBSSEP''@/$(GNULIB_MBSSEP)/g' \ - -e 's/@''GNULIB_MBSTOK_R''@/$(GNULIB_MBSTOK_R)/g' \ - -e 's/@''GNULIB_MEMCHR''@/$(GNULIB_MEMCHR)/g' \ - -e 's/@''GNULIB_MEMMEM''@/$(GNULIB_MEMMEM)/g' \ - -e 's/@''GNULIB_MEMPCPY''@/$(GNULIB_MEMPCPY)/g' \ - -e 's/@''GNULIB_MEMRCHR''@/$(GNULIB_MEMRCHR)/g' \ - -e 's/@''GNULIB_RAWMEMCHR''@/$(GNULIB_RAWMEMCHR)/g' \ - -e 's/@''GNULIB_STPCPY''@/$(GNULIB_STPCPY)/g' \ - -e 's/@''GNULIB_STPNCPY''@/$(GNULIB_STPNCPY)/g' \ - -e 's/@''GNULIB_STRCHRNUL''@/$(GNULIB_STRCHRNUL)/g' \ - -e 's/@''GNULIB_STRDUP''@/$(GNULIB_STRDUP)/g' \ - -e 's/@''GNULIB_STRNCAT''@/$(GNULIB_STRNCAT)/g' \ - -e 's/@''GNULIB_STRNDUP''@/$(GNULIB_STRNDUP)/g' \ - -e 's/@''GNULIB_STRNLEN''@/$(GNULIB_STRNLEN)/g' \ - -e 's/@''GNULIB_STRPBRK''@/$(GNULIB_STRPBRK)/g' \ - -e 's/@''GNULIB_STRSEP''@/$(GNULIB_STRSEP)/g' \ - -e 's/@''GNULIB_STRSTR''@/$(GNULIB_STRSTR)/g' \ - -e 's/@''GNULIB_STRCASESTR''@/$(GNULIB_STRCASESTR)/g' \ - -e 's/@''GNULIB_STRTOK_R''@/$(GNULIB_STRTOK_R)/g' \ - -e 's/@''GNULIB_STRERROR''@/$(GNULIB_STRERROR)/g' \ - -e 's/@''GNULIB_STRERROR_R''@/$(GNULIB_STRERROR_R)/g' \ - -e 's/@''GNULIB_STRSIGNAL''@/$(GNULIB_STRSIGNAL)/g' \ - -e 's/@''GNULIB_STRVERSCMP''@/$(GNULIB_STRVERSCMP)/g' \ - < $(srcdir)/string.in.h | \ - sed -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \ - -e 's|@''HAVE_FFSLL''@|$(HAVE_FFSLL)|g' \ - -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \ - -e 's|@''HAVE_MEMCHR''@|$(HAVE_MEMCHR)|g' \ - -e 's|@''HAVE_DECL_MEMMEM''@|$(HAVE_DECL_MEMMEM)|g' \ - -e 's|@''HAVE_MEMPCPY''@|$(HAVE_MEMPCPY)|g' \ - -e 's|@''HAVE_DECL_MEMRCHR''@|$(HAVE_DECL_MEMRCHR)|g' \ - -e 's|@''HAVE_RAWMEMCHR''@|$(HAVE_RAWMEMCHR)|g' \ - -e 's|@''HAVE_STPCPY''@|$(HAVE_STPCPY)|g' \ - -e 's|@''HAVE_STPNCPY''@|$(HAVE_STPNCPY)|g' \ - -e 's|@''HAVE_STRCHRNUL''@|$(HAVE_STRCHRNUL)|g' \ - -e 's|@''HAVE_DECL_STRDUP''@|$(HAVE_DECL_STRDUP)|g' \ - -e 's|@''HAVE_DECL_STRNDUP''@|$(HAVE_DECL_STRNDUP)|g' \ - -e 's|@''HAVE_DECL_STRNLEN''@|$(HAVE_DECL_STRNLEN)|g' \ - -e 's|@''HAVE_STRPBRK''@|$(HAVE_STRPBRK)|g' \ - -e 's|@''HAVE_STRSEP''@|$(HAVE_STRSEP)|g' \ - -e 's|@''HAVE_STRCASESTR''@|$(HAVE_STRCASESTR)|g' \ - -e 's|@''HAVE_DECL_STRTOK_R''@|$(HAVE_DECL_STRTOK_R)|g' \ - -e 's|@''HAVE_DECL_STRERROR_R''@|$(HAVE_DECL_STRERROR_R)|g' \ - -e 's|@''HAVE_DECL_STRSIGNAL''@|$(HAVE_DECL_STRSIGNAL)|g' \ - -e 's|@''HAVE_STRVERSCMP''@|$(HAVE_STRVERSCMP)|g' \ - -e 's|@''REPLACE_STPNCPY''@|$(REPLACE_STPNCPY)|g' \ - -e 's|@''REPLACE_MEMCHR''@|$(REPLACE_MEMCHR)|g' \ - -e 's|@''REPLACE_MEMMEM''@|$(REPLACE_MEMMEM)|g' \ - -e 's|@''REPLACE_STRCASESTR''@|$(REPLACE_STRCASESTR)|g' \ - -e 's|@''REPLACE_STRCHRNUL''@|$(REPLACE_STRCHRNUL)|g' \ - -e 's|@''REPLACE_STRDUP''@|$(REPLACE_STRDUP)|g' \ - -e 's|@''REPLACE_STRSTR''@|$(REPLACE_STRSTR)|g' \ - -e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \ - -e 's|@''REPLACE_STRERROR_R''@|$(REPLACE_STRERROR_R)|g' \ - -e 's|@''REPLACE_STRNCAT''@|$(REPLACE_STRNCAT)|g' \ - -e 's|@''REPLACE_STRNDUP''@|$(REPLACE_STRNDUP)|g' \ - -e 's|@''REPLACE_STRNLEN''@|$(REPLACE_STRNLEN)|g' \ - -e 's|@''REPLACE_STRSIGNAL''@|$(REPLACE_STRSIGNAL)|g' \ - -e 's|@''REPLACE_STRTOK_R''@|$(REPLACE_STRTOK_R)|g' \ - -e 's|@''UNDEFINE_STRTOK_R''@|$(UNDEFINE_STRTOK_R)|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)'; \ - < $(srcdir)/string.in.h; \ - } > $@-t && \ - mv $@-t $@ - -# We need the following in order to create <strings.h> when the system -# doesn't have one that works with the given compiler. -strings.h: strings.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H) - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ - sed -e 's|@''GUARD_PREFIX''@|GL|g' \ - -e 's|@''HAVE_STRINGS_H''@|$(HAVE_STRINGS_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_STRINGS_H''@|$(NEXT_STRINGS_H)|g' \ - -e 's|@''GNULIB_FFS''@|$(GNULIB_FFS)|g' \ - -e 's|@''HAVE_FFS''@|$(HAVE_FFS)|g' \ - -e 's|@''HAVE_STRCASECMP''@|$(HAVE_STRCASECMP)|g' \ - -e 's|@''HAVE_DECL_STRNCASECMP''@|$(HAVE_DECL_STRNCASECMP)|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)' \ - < $(srcdir)/strings.in.h; \ - } > $@-t && \ - mv $@-t $@ - -# We need the following in order to create <sys/ioctl.h> when the system -# does not have a complete one. -sys/ioctl.h: sys_ioctl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) - $(AM_V_at)$(MKDIR_P) sys - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's|@''GUARD_PREFIX''@|GL|g' \ - -e 's|@''HAVE_SYS_IOCTL_H''@|$(HAVE_SYS_IOCTL_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_SYS_IOCTL_H''@|$(NEXT_SYS_IOCTL_H)|g' \ - -e 's/@''GNULIB_IOCTL''@/$(GNULIB_IOCTL)/g' \ - -e 's|@''SYS_IOCTL_H_HAVE_WINSOCK2_H''@|$(SYS_IOCTL_H_HAVE_WINSOCK2_H)|g' \ - -e 's|@''SYS_IOCTL_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''@|$(SYS_IOCTL_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS)|g' \ - -e 's|@''REPLACE_IOCTL''@|$(REPLACE_IOCTL)|g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - < $(srcdir)/sys_ioctl.in.h; \ - } > $@-t && \ - mv $@-t $@ - -# We need the following in order to create <sys/resource.h> when the system -# doesn't have one. -sys/resource.h: sys_resource.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_at)$(MKDIR_P) sys - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's|@''GUARD_PREFIX''@|GL|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_SYS_RESOURCE_H''@|$(NEXT_SYS_RESOURCE_H)|g' \ - -e 's|@''HAVE_SYS_RESOURCE_H''@|$(HAVE_SYS_RESOURCE_H)|g' \ - -e 's/@''GNULIB_GETRUSAGE''@/$(GNULIB_GETRUSAGE)/g' \ - -e 's/@''HAVE_GETRUSAGE''@/$(HAVE_GETRUSAGE)/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)' \ - < $(srcdir)/sys_resource.in.h; \ - } > $@-t && \ - mv -f $@-t $@ - -# We need the following in order to create <sys/select.h> when the system -# doesn't have one that works with the given compiler. -sys/select.h: sys_select.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) - $(AM_V_at)$(MKDIR_P) sys - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's|@''GUARD_PREFIX''@|GL|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_SYS_SELECT_H''@|$(NEXT_SYS_SELECT_H)|g' \ - -e 's|@''HAVE_SYS_SELECT_H''@|$(HAVE_SYS_SELECT_H)|g' \ - -e 's/@''GNULIB_PSELECT''@/$(GNULIB_PSELECT)/g' \ - -e 's/@''GNULIB_SELECT''@/$(GNULIB_SELECT)/g' \ - -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \ - -e 's|@''HAVE_PSELECT''@|$(HAVE_PSELECT)|g' \ - -e 's|@''REPLACE_PSELECT''@|$(REPLACE_PSELECT)|g' \ - -e 's|@''REPLACE_SELECT''@|$(REPLACE_SELECT)|g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - < $(srcdir)/sys_select.in.h; \ - } > $@-t && \ - mv $@-t $@ - -# We need the following in order to create <sys/socket.h> when the system -# doesn't have one that works with the given compiler. -sys/socket.h: sys_socket.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H) - $(AM_V_at)$(MKDIR_P) sys - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's|@''GUARD_PREFIX''@|GL|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_SYS_SOCKET_H''@|$(NEXT_SYS_SOCKET_H)|g' \ - -e 's|@''HAVE_SYS_SOCKET_H''@|$(HAVE_SYS_SOCKET_H)|g' \ - -e 's/@''GNULIB_CLOSE''@/$(GNULIB_CLOSE)/g' \ - -e 's/@''GNULIB_SOCKET''@/$(GNULIB_SOCKET)/g' \ - -e 's/@''GNULIB_CONNECT''@/$(GNULIB_CONNECT)/g' \ - -e 's/@''GNULIB_ACCEPT''@/$(GNULIB_ACCEPT)/g' \ - -e 's/@''GNULIB_BIND''@/$(GNULIB_BIND)/g' \ - -e 's/@''GNULIB_GETPEERNAME''@/$(GNULIB_GETPEERNAME)/g' \ - -e 's/@''GNULIB_GETSOCKNAME''@/$(GNULIB_GETSOCKNAME)/g' \ - -e 's/@''GNULIB_GETSOCKOPT''@/$(GNULIB_GETSOCKOPT)/g' \ - -e 's/@''GNULIB_LISTEN''@/$(GNULIB_LISTEN)/g' \ - -e 's/@''GNULIB_RECV''@/$(GNULIB_RECV)/g' \ - -e 's/@''GNULIB_SEND''@/$(GNULIB_SEND)/g' \ - -e 's/@''GNULIB_RECVFROM''@/$(GNULIB_RECVFROM)/g' \ - -e 's/@''GNULIB_SENDTO''@/$(GNULIB_SENDTO)/g' \ - -e 's/@''GNULIB_SETSOCKOPT''@/$(GNULIB_SETSOCKOPT)/g' \ - -e 's/@''GNULIB_SHUTDOWN''@/$(GNULIB_SHUTDOWN)/g' \ - -e 's/@''GNULIB_ACCEPT4''@/$(GNULIB_ACCEPT4)/g' \ - -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \ - -e 's|@''HAVE_WS2TCPIP_H''@|$(HAVE_WS2TCPIP_H)|g' \ - -e 's|@''HAVE_STRUCT_SOCKADDR_STORAGE''@|$(HAVE_STRUCT_SOCKADDR_STORAGE)|g' \ - -e 's|@''HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY''@|$(HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY)|g' \ - -e 's|@''HAVE_SA_FAMILY_T''@|$(HAVE_SA_FAMILY_T)|g' \ - -e 's|@''HAVE_ACCEPT4''@|$(HAVE_ACCEPT4)|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)' \ - < $(srcdir)/sys_socket.in.h; \ - } > $@-t && \ - mv -f $@-t $@ - -# We need the following in order to create <sys/stat.h> when the system -# has one that is incomplete. -sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_at)$(MKDIR_P) sys - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's|@''GUARD_PREFIX''@|GL|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_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \ - -e 's|@''WINDOWS_64_BIT_ST_SIZE''@|$(WINDOWS_64_BIT_ST_SIZE)|g' \ - -e 's/@''GNULIB_FCHMODAT''@/$(GNULIB_FCHMODAT)/g' \ - -e 's/@''GNULIB_FSTAT''@/$(GNULIB_FSTAT)/g' \ - -e 's/@''GNULIB_FSTATAT''@/$(GNULIB_FSTATAT)/g' \ - -e 's/@''GNULIB_FUTIMENS''@/$(GNULIB_FUTIMENS)/g' \ - -e 's/@''GNULIB_LCHMOD''@/$(GNULIB_LCHMOD)/g' \ - -e 's/@''GNULIB_LSTAT''@/$(GNULIB_LSTAT)/g' \ - -e 's/@''GNULIB_MKDIRAT''@/$(GNULIB_MKDIRAT)/g' \ - -e 's/@''GNULIB_MKFIFO''@/$(GNULIB_MKFIFO)/g' \ - -e 's/@''GNULIB_MKFIFOAT''@/$(GNULIB_MKFIFOAT)/g' \ - -e 's/@''GNULIB_MKNOD''@/$(GNULIB_MKNOD)/g' \ - -e 's/@''GNULIB_MKNODAT''@/$(GNULIB_MKNODAT)/g' \ - -e 's/@''GNULIB_STAT''@/$(GNULIB_STAT)/g' \ - -e 's/@''GNULIB_UTIMENSAT''@/$(GNULIB_UTIMENSAT)/g' \ - -e 's|@''HAVE_FCHMODAT''@|$(HAVE_FCHMODAT)|g' \ - -e 's|@''HAVE_FSTATAT''@|$(HAVE_FSTATAT)|g' \ - -e 's|@''HAVE_FUTIMENS''@|$(HAVE_FUTIMENS)|g' \ - -e 's|@''HAVE_LCHMOD''@|$(HAVE_LCHMOD)|g' \ - -e 's|@''HAVE_LSTAT''@|$(HAVE_LSTAT)|g' \ - -e 's|@''HAVE_MKDIRAT''@|$(HAVE_MKDIRAT)|g' \ - -e 's|@''HAVE_MKFIFO''@|$(HAVE_MKFIFO)|g' \ - -e 's|@''HAVE_MKFIFOAT''@|$(HAVE_MKFIFOAT)|g' \ - -e 's|@''HAVE_MKNOD''@|$(HAVE_MKNOD)|g' \ - -e 's|@''HAVE_MKNODAT''@|$(HAVE_MKNODAT)|g' \ - -e 's|@''HAVE_UTIMENSAT''@|$(HAVE_UTIMENSAT)|g' \ - -e 's|@''REPLACE_FSTAT''@|$(REPLACE_FSTAT)|g' \ - -e 's|@''REPLACE_FSTATAT''@|$(REPLACE_FSTATAT)|g' \ - -e 's|@''REPLACE_FUTIMENS''@|$(REPLACE_FUTIMENS)|g' \ - -e 's|@''REPLACE_LSTAT''@|$(REPLACE_LSTAT)|g' \ - -e 's|@''REPLACE_MKDIR''@|$(REPLACE_MKDIR)|g' \ - -e 's|@''REPLACE_MKFIFO''@|$(REPLACE_MKFIFO)|g' \ - -e 's|@''REPLACE_MKNOD''@|$(REPLACE_MKNOD)|g' \ - -e 's|@''REPLACE_STAT''@|$(REPLACE_STAT)|g' \ - -e 's|@''REPLACE_UTIMENSAT''@|$(REPLACE_UTIMENSAT)|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)' \ - < $(srcdir)/sys_stat.in.h; \ - } > $@-t && \ - mv $@-t $@ - -# We need the following in order to create <sys/time.h> when the system -# doesn't have one that works with the given compiler. -sys/time.h: sys_time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_at)$(MKDIR_P) sys - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's|@''GUARD_PREFIX''@|GL|g' \ - -e 's/@''HAVE_SYS_TIME_H''@/$(HAVE_SYS_TIME_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_SYS_TIME_H''@|$(NEXT_SYS_TIME_H)|g' \ - -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GNULIB_GETTIMEOFDAY)/g' \ - -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \ - -e 's/@''HAVE_GETTIMEOFDAY''@/$(HAVE_GETTIMEOFDAY)/g' \ - -e 's/@''HAVE_STRUCT_TIMEVAL''@/$(HAVE_STRUCT_TIMEVAL)/g' \ - -e 's/@''REPLACE_GETTIMEOFDAY''@/$(REPLACE_GETTIMEOFDAY)/g' \ - -e 's/@''REPLACE_STRUCT_TIMEVAL''@/$(REPLACE_STRUCT_TIMEVAL)/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)' \ - < $(srcdir)/sys_time.in.h; \ - } > $@-t && \ - mv $@-t $@ - -# We need the following in order to create <sys/types.h> when the system -# doesn't have one that works with the given compiler. -sys/types.h: sys_types.in.h $(top_builddir)/config.status - $(AM_V_at)$(MKDIR_P) sys - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's|@''GUARD_PREFIX''@|GL|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_SYS_TYPES_H''@|$(NEXT_SYS_TYPES_H)|g' \ - -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \ - < $(srcdir)/sys_types.in.h; \ - } > $@-t && \ - mv $@-t $@ - -# We need the following in order to create <sys/uio.h> when the system -# doesn't have one that works with the given compiler. -sys/uio.h: sys_uio.in.h $(top_builddir)/config.status - $(AM_V_at)$(MKDIR_P) sys - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's|@''GUARD_PREFIX''@|GL|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_SYS_UIO_H''@|$(NEXT_SYS_UIO_H)|g' \ - -e 's|@''HAVE_SYS_UIO_H''@|$(HAVE_SYS_UIO_H)|g' \ - < $(srcdir)/sys_uio.in.h; \ - } > $@-t && \ - mv -f $@-t $@ - -# We need the following in order to create <sys/utsname.h> when the system -# does not have one. -sys/utsname.h: sys_utsname.in.h $(top_builddir)/config.status $(WARN_ON_USE_H) $(ARG_NONNULL_H) - $(AM_V_at)$(MKDIR_P) sys - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's|@''GUARD_PREFIX''@|GL|g' \ - -e 's/@''HAVE_SYS_UTSNAME_H''@/$(HAVE_SYS_UTSNAME_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_SYS_UTSNAME_H''@|$(NEXT_SYS_UTSNAME_H)|g' \ - -e 's/@''GNULIB_UNAME''@/$(GNULIB_UNAME)/g' \ - -e 's|@''HAVE_STRUCT_UTSNAME''@|$(HAVE_STRUCT_UTSNAME)|g' \ - -e 's|@''HAVE_UNAME''@|$(HAVE_UNAME)|g' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - < $(srcdir)/sys_utsname.in.h; \ - } > $@-t && \ - mv $@-t $@ - -# We need the following in order to create <sys/wait.h> when the system -# has one that is incomplete. -sys/wait.h: sys_wait.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) - $(AM_V_at)$(MKDIR_P) sys - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's|@''GUARD_PREFIX''@|GL|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_SYS_WAIT_H''@|$(NEXT_SYS_WAIT_H)|g' \ - -e 's/@''GNULIB_WAITPID''@/$(GNULIB_WAITPID)/g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - < $(srcdir)/sys_wait.in.h; \ - } > $@-t && \ - mv $@-t $@ - -# We need the following in order to create <termios.h> when the system -# version does not have all declarations. -termios.h: termios.in.h $(top_builddir)/config.status $(CXXDEFS_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|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_TERMIOS_H''@|$(NEXT_TERMIOS_H)|g' \ - -e 's/@''GNULIB_TCGETSID''@/$(GNULIB_TCGETSID)/g' \ - -e 's|@''HAVE_DECL_TCGETSID''@|$(HAVE_DECL_TCGETSID)|g' \ - -e 's|@''HAVE_TERMIOS_H''@|$(HAVE_TERMIOS_H)|g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - < $(srcdir)/termios.in.h; \ - } > $@-t && \ - mv $@-t $@ - -# We need the following in order to create <time.h> when the system -# doesn't have one that works with the given compiler. -time.h: time.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|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -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_MKTIME''@/$(GNULIB_MKTIME)/g' \ - -e 's/@''GNULIB_NANOSLEEP''@/$(GNULIB_NANOSLEEP)/g' \ - -e 's/@''GNULIB_STRPTIME''@/$(GNULIB_STRPTIME)/g' \ - -e 's/@''GNULIB_TIMEGM''@/$(GNULIB_TIMEGM)/g' \ - -e 's/@''GNULIB_TIME_R''@/$(GNULIB_TIME_R)/g' \ - -e 's|@''HAVE_DECL_LOCALTIME_R''@|$(HAVE_DECL_LOCALTIME_R)|g' \ - -e 's|@''HAVE_NANOSLEEP''@|$(HAVE_NANOSLEEP)|g' \ - -e 's|@''HAVE_STRPTIME''@|$(HAVE_STRPTIME)|g' \ - -e 's|@''HAVE_TIMEGM''@|$(HAVE_TIMEGM)|g' \ - -e 's|@''REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \ - -e 's|@''REPLACE_MKTIME''@|$(REPLACE_MKTIME)|g' \ - -e 's|@''REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \ - -e 's|@''REPLACE_TIMEGM''@|$(REPLACE_TIMEGM)|g' \ - -e 's|@''PTHREAD_H_DEFINES_STRUCT_TIMESPEC''@|$(PTHREAD_H_DEFINES_STRUCT_TIMESPEC)|g' \ - -e 's|@''SYS_TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(SYS_TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \ - -e 's|@''TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(TIME_H_DEFINES_STRUCT_TIMESPEC)|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)' \ - < $(srcdir)/time.in.h; \ - } > $@-t && \ - mv $@-t $@ - -# We need the following in order to create an empty placeholder for -# <unistd.h> when the system doesn't have one. -unistd.h: unistd.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_UNISTD_H''@|$(HAVE_UNISTD_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_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \ - -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \ - -e 's/@''GNULIB_CHDIR''@/$(GNULIB_CHDIR)/g' \ - -e 's/@''GNULIB_CHOWN''@/$(GNULIB_CHOWN)/g' \ - -e 's/@''GNULIB_CLOSE''@/$(GNULIB_CLOSE)/g' \ - -e 's/@''GNULIB_DUP''@/$(GNULIB_DUP)/g' \ - -e 's/@''GNULIB_DUP2''@/$(GNULIB_DUP2)/g' \ - -e 's/@''GNULIB_DUP3''@/$(GNULIB_DUP3)/g' \ - -e 's/@''GNULIB_ENVIRON''@/$(GNULIB_ENVIRON)/g' \ - -e 's/@''GNULIB_EUIDACCESS''@/$(GNULIB_EUIDACCESS)/g' \ - -e 's/@''GNULIB_FACCESSAT''@/$(GNULIB_FACCESSAT)/g' \ - -e 's/@''GNULIB_FCHDIR''@/$(GNULIB_FCHDIR)/g' \ - -e 's/@''GNULIB_FCHOWNAT''@/$(GNULIB_FCHOWNAT)/g' \ - -e 's/@''GNULIB_FDATASYNC''@/$(GNULIB_FDATASYNC)/g' \ - -e 's/@''GNULIB_FSYNC''@/$(GNULIB_FSYNC)/g' \ - -e 's/@''GNULIB_FTRUNCATE''@/$(GNULIB_FTRUNCATE)/g' \ - -e 's/@''GNULIB_GETCWD''@/$(GNULIB_GETCWD)/g' \ - -e 's/@''GNULIB_GETDOMAINNAME''@/$(GNULIB_GETDOMAINNAME)/g' \ - -e 's/@''GNULIB_GETDTABLESIZE''@/$(GNULIB_GETDTABLESIZE)/g' \ - -e 's/@''GNULIB_GETGROUPS''@/$(GNULIB_GETGROUPS)/g' \ - -e 's/@''GNULIB_GETHOSTNAME''@/$(GNULIB_GETHOSTNAME)/g' \ - -e 's/@''GNULIB_GETLOGIN''@/$(GNULIB_GETLOGIN)/g' \ - -e 's/@''GNULIB_GETLOGIN_R''@/$(GNULIB_GETLOGIN_R)/g' \ - -e 's/@''GNULIB_GETPAGESIZE''@/$(GNULIB_GETPAGESIZE)/g' \ - -e 's/@''GNULIB_GETUSERSHELL''@/$(GNULIB_GETUSERSHELL)/g' \ - -e 's/@''GNULIB_GROUP_MEMBER''@/$(GNULIB_GROUP_MEMBER)/g' \ - -e 's/@''GNULIB_ISATTY''@/$(GNULIB_ISATTY)/g' \ - -e 's/@''GNULIB_LCHOWN''@/$(GNULIB_LCHOWN)/g' \ - -e 's/@''GNULIB_LINK''@/$(GNULIB_LINK)/g' \ - -e 's/@''GNULIB_LINKAT''@/$(GNULIB_LINKAT)/g' \ - -e 's/@''GNULIB_LSEEK''@/$(GNULIB_LSEEK)/g' \ - -e 's/@''GNULIB_PIPE''@/$(GNULIB_PIPE)/g' \ - -e 's/@''GNULIB_PIPE2''@/$(GNULIB_PIPE2)/g' \ - -e 's/@''GNULIB_PREAD''@/$(GNULIB_PREAD)/g' \ - -e 's/@''GNULIB_PWRITE''@/$(GNULIB_PWRITE)/g' \ - -e 's/@''GNULIB_READ''@/$(GNULIB_READ)/g' \ - -e 's/@''GNULIB_READLINK''@/$(GNULIB_READLINK)/g' \ - -e 's/@''GNULIB_READLINKAT''@/$(GNULIB_READLINKAT)/g' \ - -e 's/@''GNULIB_RMDIR''@/$(GNULIB_RMDIR)/g' \ - -e 's/@''GNULIB_SETHOSTNAME''@/$(GNULIB_SETHOSTNAME)/g' \ - -e 's/@''GNULIB_SLEEP''@/$(GNULIB_SLEEP)/g' \ - -e 's/@''GNULIB_SYMLINK''@/$(GNULIB_SYMLINK)/g' \ - -e 's/@''GNULIB_SYMLINKAT''@/$(GNULIB_SYMLINKAT)/g' \ - -e 's/@''GNULIB_TTYNAME_R''@/$(GNULIB_TTYNAME_R)/g' \ - -e 's/@''GNULIB_UNISTD_H_GETOPT''@/0$(GNULIB_GL_UNISTD_H_GETOPT)/g' \ - -e 's/@''GNULIB_UNISTD_H_NONBLOCKING''@/$(GNULIB_UNISTD_H_NONBLOCKING)/g' \ - -e 's/@''GNULIB_UNISTD_H_SIGPIPE''@/$(GNULIB_UNISTD_H_SIGPIPE)/g' \ - -e 's/@''GNULIB_UNLINK''@/$(GNULIB_UNLINK)/g' \ - -e 's/@''GNULIB_UNLINKAT''@/$(GNULIB_UNLINKAT)/g' \ - -e 's/@''GNULIB_USLEEP''@/$(GNULIB_USLEEP)/g' \ - -e 's/@''GNULIB_WRITE''@/$(GNULIB_WRITE)/g' \ - < $(srcdir)/unistd.in.h | \ - sed -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \ - -e 's|@''HAVE_DUP2''@|$(HAVE_DUP2)|g' \ - -e 's|@''HAVE_DUP3''@|$(HAVE_DUP3)|g' \ - -e 's|@''HAVE_EUIDACCESS''@|$(HAVE_EUIDACCESS)|g' \ - -e 's|@''HAVE_FACCESSAT''@|$(HAVE_FACCESSAT)|g' \ - -e 's|@''HAVE_FCHDIR''@|$(HAVE_FCHDIR)|g' \ - -e 's|@''HAVE_FCHOWNAT''@|$(HAVE_FCHOWNAT)|g' \ - -e 's|@''HAVE_FDATASYNC''@|$(HAVE_FDATASYNC)|g' \ - -e 's|@''HAVE_FSYNC''@|$(HAVE_FSYNC)|g' \ - -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \ - -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \ - -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \ - -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \ - -e 's|@''HAVE_GETLOGIN''@|$(HAVE_GETLOGIN)|g' \ - -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \ - -e 's|@''HAVE_GROUP_MEMBER''@|$(HAVE_GROUP_MEMBER)|g' \ - -e 's|@''HAVE_LCHOWN''@|$(HAVE_LCHOWN)|g' \ - -e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \ - -e 's|@''HAVE_LINKAT''@|$(HAVE_LINKAT)|g' \ - -e 's|@''HAVE_PIPE''@|$(HAVE_PIPE)|g' \ - -e 's|@''HAVE_PIPE2''@|$(HAVE_PIPE2)|g' \ - -e 's|@''HAVE_PREAD''@|$(HAVE_PREAD)|g' \ - -e 's|@''HAVE_PWRITE''@|$(HAVE_PWRITE)|g' \ - -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \ - -e 's|@''HAVE_READLINKAT''@|$(HAVE_READLINKAT)|g' \ - -e 's|@''HAVE_SETHOSTNAME''@|$(HAVE_SETHOSTNAME)|g' \ - -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \ - -e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \ - -e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \ - -e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \ - -e 's|@''HAVE_USLEEP''@|$(HAVE_USLEEP)|g' \ - -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \ - -e 's|@''HAVE_DECL_FCHDIR''@|$(HAVE_DECL_FCHDIR)|g' \ - -e 's|@''HAVE_DECL_FDATASYNC''@|$(HAVE_DECL_FDATASYNC)|g' \ - -e 's|@''HAVE_DECL_GETDOMAINNAME''@|$(HAVE_DECL_GETDOMAINNAME)|g' \ - -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \ - -e 's|@''HAVE_DECL_GETPAGESIZE''@|$(HAVE_DECL_GETPAGESIZE)|g' \ - -e 's|@''HAVE_DECL_GETUSERSHELL''@|$(HAVE_DECL_GETUSERSHELL)|g' \ - -e 's|@''HAVE_DECL_SETHOSTNAME''@|$(HAVE_DECL_SETHOSTNAME)|g' \ - -e 's|@''HAVE_DECL_TTYNAME_R''@|$(HAVE_DECL_TTYNAME_R)|g' \ - -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \ - -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \ - | \ - sed -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \ - -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \ - -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \ - -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \ - -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \ - -e 's|@''REPLACE_FTRUNCATE''@|$(REPLACE_FTRUNCATE)|g' \ - -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \ - -e 's|@''REPLACE_GETDOMAINNAME''@|$(REPLACE_GETDOMAINNAME)|g' \ - -e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \ - -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \ - -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \ - -e 's|@''REPLACE_ISATTY''@|$(REPLACE_ISATTY)|g' \ - -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \ - -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \ - -e 's|@''REPLACE_LINKAT''@|$(REPLACE_LINKAT)|g' \ - -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \ - -e 's|@''REPLACE_PREAD''@|$(REPLACE_PREAD)|g' \ - -e 's|@''REPLACE_PWRITE''@|$(REPLACE_PWRITE)|g' \ - -e 's|@''REPLACE_READ''@|$(REPLACE_READ)|g' \ - -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \ - -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \ - -e 's|@''REPLACE_SLEEP''@|$(REPLACE_SLEEP)|g' \ - -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \ - -e 's|@''REPLACE_TTYNAME_R''@|$(REPLACE_TTYNAME_R)|g' \ - -e 's|@''REPLACE_UNLINK''@|$(REPLACE_UNLINK)|g' \ - -e 's|@''REPLACE_UNLINKAT''@|$(REPLACE_UNLINKAT)|g' \ - -e 's|@''REPLACE_USLEEP''@|$(REPLACE_USLEEP)|g' \ - -e 's|@''REPLACE_WRITE''@|$(REPLACE_WRITE)|g' \ - -e 's|@''UNISTD_H_HAVE_WINSOCK2_H''@|$(UNISTD_H_HAVE_WINSOCK2_H)|g' \ - -e 's|@''UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''@|$(UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS)|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)'; \ - } > $@-t && \ - mv $@-t $@ - -unistr.h: unistr.in.h - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - cat $(srcdir)/unistr.in.h; \ - } > $@-t && \ - mv -f $@-t $@ - -unitypes.h: unitypes.in.h - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - cat $(srcdir)/unitypes.in.h; \ - } > $@-t && \ - mv -f $@-t $@ - -uniwidth.h: uniwidth.in.h - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - cat $(srcdir)/uniwidth.in.h; \ - } > $@-t && \ - mv -f $@-t $@ - -# We need the following in order to create <wchar.h> when the system -# version does not work standalone. -wchar.h: wchar.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|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''HAVE_FEATURES_H''@|$(HAVE_FEATURES_H)|g' \ - -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \ - -e 's|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \ - -e 's/@''GNULIB_BTOWC''@/$(GNULIB_BTOWC)/g' \ - -e 's/@''GNULIB_WCTOB''@/$(GNULIB_WCTOB)/g' \ - -e 's/@''GNULIB_MBSINIT''@/$(GNULIB_MBSINIT)/g' \ - -e 's/@''GNULIB_MBRTOWC''@/$(GNULIB_MBRTOWC)/g' \ - -e 's/@''GNULIB_MBRLEN''@/$(GNULIB_MBRLEN)/g' \ - -e 's/@''GNULIB_MBSRTOWCS''@/$(GNULIB_MBSRTOWCS)/g' \ - -e 's/@''GNULIB_MBSNRTOWCS''@/$(GNULIB_MBSNRTOWCS)/g' \ - -e 's/@''GNULIB_WCRTOMB''@/$(GNULIB_WCRTOMB)/g' \ - -e 's/@''GNULIB_WCSRTOMBS''@/$(GNULIB_WCSRTOMBS)/g' \ - -e 's/@''GNULIB_WCSNRTOMBS''@/$(GNULIB_WCSNRTOMBS)/g' \ - -e 's/@''GNULIB_WCWIDTH''@/$(GNULIB_WCWIDTH)/g' \ - -e 's/@''GNULIB_WMEMCHR''@/$(GNULIB_WMEMCHR)/g' \ - -e 's/@''GNULIB_WMEMCMP''@/$(GNULIB_WMEMCMP)/g' \ - -e 's/@''GNULIB_WMEMCPY''@/$(GNULIB_WMEMCPY)/g' \ - -e 's/@''GNULIB_WMEMMOVE''@/$(GNULIB_WMEMMOVE)/g' \ - -e 's/@''GNULIB_WMEMSET''@/$(GNULIB_WMEMSET)/g' \ - -e 's/@''GNULIB_WCSLEN''@/$(GNULIB_WCSLEN)/g' \ - -e 's/@''GNULIB_WCSNLEN''@/$(GNULIB_WCSNLEN)/g' \ - -e 's/@''GNULIB_WCSCPY''@/$(GNULIB_WCSCPY)/g' \ - -e 's/@''GNULIB_WCPCPY''@/$(GNULIB_WCPCPY)/g' \ - -e 's/@''GNULIB_WCSNCPY''@/$(GNULIB_WCSNCPY)/g' \ - -e 's/@''GNULIB_WCPNCPY''@/$(GNULIB_WCPNCPY)/g' \ - -e 's/@''GNULIB_WCSCAT''@/$(GNULIB_WCSCAT)/g' \ - -e 's/@''GNULIB_WCSNCAT''@/$(GNULIB_WCSNCAT)/g' \ - -e 's/@''GNULIB_WCSCMP''@/$(GNULIB_WCSCMP)/g' \ - -e 's/@''GNULIB_WCSNCMP''@/$(GNULIB_WCSNCMP)/g' \ - -e 's/@''GNULIB_WCSCASECMP''@/$(GNULIB_WCSCASECMP)/g' \ - -e 's/@''GNULIB_WCSNCASECMP''@/$(GNULIB_WCSNCASECMP)/g' \ - -e 's/@''GNULIB_WCSCOLL''@/$(GNULIB_WCSCOLL)/g' \ - -e 's/@''GNULIB_WCSXFRM''@/$(GNULIB_WCSXFRM)/g' \ - -e 's/@''GNULIB_WCSDUP''@/$(GNULIB_WCSDUP)/g' \ - -e 's/@''GNULIB_WCSCHR''@/$(GNULIB_WCSCHR)/g' \ - -e 's/@''GNULIB_WCSRCHR''@/$(GNULIB_WCSRCHR)/g' \ - -e 's/@''GNULIB_WCSCSPN''@/$(GNULIB_WCSCSPN)/g' \ - -e 's/@''GNULIB_WCSSPN''@/$(GNULIB_WCSSPN)/g' \ - -e 's/@''GNULIB_WCSPBRK''@/$(GNULIB_WCSPBRK)/g' \ - -e 's/@''GNULIB_WCSSTR''@/$(GNULIB_WCSSTR)/g' \ - -e 's/@''GNULIB_WCSTOK''@/$(GNULIB_WCSTOK)/g' \ - -e 's/@''GNULIB_WCSWIDTH''@/$(GNULIB_WCSWIDTH)/g' \ - < $(srcdir)/wchar.in.h | \ - sed -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \ - -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \ - -e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \ - -e 's|@''HAVE_MBRTOWC''@|$(HAVE_MBRTOWC)|g' \ - -e 's|@''HAVE_MBRLEN''@|$(HAVE_MBRLEN)|g' \ - -e 's|@''HAVE_MBSRTOWCS''@|$(HAVE_MBSRTOWCS)|g' \ - -e 's|@''HAVE_MBSNRTOWCS''@|$(HAVE_MBSNRTOWCS)|g' \ - -e 's|@''HAVE_WCRTOMB''@|$(HAVE_WCRTOMB)|g' \ - -e 's|@''HAVE_WCSRTOMBS''@|$(HAVE_WCSRTOMBS)|g' \ - -e 's|@''HAVE_WCSNRTOMBS''@|$(HAVE_WCSNRTOMBS)|g' \ - -e 's|@''HAVE_WMEMCHR''@|$(HAVE_WMEMCHR)|g' \ - -e 's|@''HAVE_WMEMCMP''@|$(HAVE_WMEMCMP)|g' \ - -e 's|@''HAVE_WMEMCPY''@|$(HAVE_WMEMCPY)|g' \ - -e 's|@''HAVE_WMEMMOVE''@|$(HAVE_WMEMMOVE)|g' \ - -e 's|@''HAVE_WMEMSET''@|$(HAVE_WMEMSET)|g' \ - -e 's|@''HAVE_WCSLEN''@|$(HAVE_WCSLEN)|g' \ - -e 's|@''HAVE_WCSNLEN''@|$(HAVE_WCSNLEN)|g' \ - -e 's|@''HAVE_WCSCPY''@|$(HAVE_WCSCPY)|g' \ - -e 's|@''HAVE_WCPCPY''@|$(HAVE_WCPCPY)|g' \ - -e 's|@''HAVE_WCSNCPY''@|$(HAVE_WCSNCPY)|g' \ - -e 's|@''HAVE_WCPNCPY''@|$(HAVE_WCPNCPY)|g' \ - -e 's|@''HAVE_WCSCAT''@|$(HAVE_WCSCAT)|g' \ - -e 's|@''HAVE_WCSNCAT''@|$(HAVE_WCSNCAT)|g' \ - -e 's|@''HAVE_WCSCMP''@|$(HAVE_WCSCMP)|g' \ - -e 's|@''HAVE_WCSNCMP''@|$(HAVE_WCSNCMP)|g' \ - -e 's|@''HAVE_WCSCASECMP''@|$(HAVE_WCSCASECMP)|g' \ - -e 's|@''HAVE_WCSNCASECMP''@|$(HAVE_WCSNCASECMP)|g' \ - -e 's|@''HAVE_WCSCOLL''@|$(HAVE_WCSCOLL)|g' \ - -e 's|@''HAVE_WCSXFRM''@|$(HAVE_WCSXFRM)|g' \ - -e 's|@''HAVE_WCSDUP''@|$(HAVE_WCSDUP)|g' \ - -e 's|@''HAVE_WCSCHR''@|$(HAVE_WCSCHR)|g' \ - -e 's|@''HAVE_WCSRCHR''@|$(HAVE_WCSRCHR)|g' \ - -e 's|@''HAVE_WCSCSPN''@|$(HAVE_WCSCSPN)|g' \ - -e 's|@''HAVE_WCSSPN''@|$(HAVE_WCSSPN)|g' \ - -e 's|@''HAVE_WCSPBRK''@|$(HAVE_WCSPBRK)|g' \ - -e 's|@''HAVE_WCSSTR''@|$(HAVE_WCSSTR)|g' \ - -e 's|@''HAVE_WCSTOK''@|$(HAVE_WCSTOK)|g' \ - -e 's|@''HAVE_WCSWIDTH''@|$(HAVE_WCSWIDTH)|g' \ - -e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \ - -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \ - | \ - sed -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \ - -e 's|@''REPLACE_BTOWC''@|$(REPLACE_BTOWC)|g' \ - -e 's|@''REPLACE_WCTOB''@|$(REPLACE_WCTOB)|g' \ - -e 's|@''REPLACE_MBSINIT''@|$(REPLACE_MBSINIT)|g' \ - -e 's|@''REPLACE_MBRTOWC''@|$(REPLACE_MBRTOWC)|g' \ - -e 's|@''REPLACE_MBRLEN''@|$(REPLACE_MBRLEN)|g' \ - -e 's|@''REPLACE_MBSRTOWCS''@|$(REPLACE_MBSRTOWCS)|g' \ - -e 's|@''REPLACE_MBSNRTOWCS''@|$(REPLACE_MBSNRTOWCS)|g' \ - -e 's|@''REPLACE_WCRTOMB''@|$(REPLACE_WCRTOMB)|g' \ - -e 's|@''REPLACE_WCSRTOMBS''@|$(REPLACE_WCSRTOMBS)|g' \ - -e 's|@''REPLACE_WCSNRTOMBS''@|$(REPLACE_WCSNRTOMBS)|g' \ - -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \ - -e 's|@''REPLACE_WCSWIDTH''@|$(REPLACE_WCSWIDTH)|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)'; \ - } > $@-t && \ - mv $@-t $@ - -# We need the following in order to create <wctype.h> when the system -# doesn't have one that works with the given compiler. -wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_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_WCTYPE_H''@/$(HAVE_WCTYPE_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_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \ - -e 's/@''GNULIB_ISWBLANK''@/$(GNULIB_ISWBLANK)/g' \ - -e 's/@''GNULIB_WCTYPE''@/$(GNULIB_WCTYPE)/g' \ - -e 's/@''GNULIB_ISWCTYPE''@/$(GNULIB_ISWCTYPE)/g' \ - -e 's/@''GNULIB_WCTRANS''@/$(GNULIB_WCTRANS)/g' \ - -e 's/@''GNULIB_TOWCTRANS''@/$(GNULIB_TOWCTRANS)/g' \ - -e 's/@''HAVE_ISWBLANK''@/$(HAVE_ISWBLANK)/g' \ - -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \ - -e 's/@''HAVE_WCTYPE_T''@/$(HAVE_WCTYPE_T)/g' \ - -e 's/@''HAVE_WCTRANS_T''@/$(HAVE_WCTRANS_T)/g' \ - -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \ - -e 's/@''REPLACE_ISWBLANK''@/$(REPLACE_ISWBLANK)/g' \ - -e 's/@''REPLACE_ISWCNTRL''@/$(REPLACE_ISWCNTRL)/g' \ - -e 's/@''REPLACE_TOWLOWER''@/$(REPLACE_TOWLOWER)/g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - < $(srcdir)/wctype.in.h; \ - } > $@-t && \ - mv $@-t $@ - -mostlyclean-local: mostlyclean-generic - @for dir in '' $(MOSTLYCLEANDIRS); do \ - if test -n "$$dir" && test -d $$dir; then \ - echo "rmdir $$dir"; rmdir $$dir; \ - fi; \ - done; \ - : - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/lib/acl-internal.h b/lib/acl-internal.h index 8c412193..37c6ebfd 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-2012 Free Software Foundation, Inc. + Copyright (C) 2002-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 @@ -71,7 +71,7 @@ extern int aclsort (int, int, struct acl *); /* 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__ /* MacOS X */ +#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 */ @@ -82,11 +82,16 @@ extern int aclsort (int, int, struct acl *); ((Err) == ENOTSUP || (Err) == ENOSYS || (Err) == EINVAL || (Err) == EBUSY) #endif +_GL_INLINE_HEADER_BEGIN +#ifndef ACL_INTERNAL_INLINE +# define ACL_INTERNAL_INLINE _GL_INLINE +#endif + #if USE_ACL # if HAVE_ACL_GET_FILE /* POSIX 1003.1e (draft 17 -- abandoned) specific version. */ -/* Linux, FreeBSD, MacOS X, IRIX, Tru64 */ +/* Linux, FreeBSD, Mac OS X, IRIX, Tru64 */ # ifndef MIN_ACL_ENTRIES # define MIN_ACL_ENTRIES 4 @@ -97,7 +102,7 @@ extern int aclsort (int, int, struct acl *); /* Most platforms have a 1-argument acl_get_fd, only OSF/1 has a 2-argument macro(!). */ # if HAVE_ACL_FREE_TEXT /* OSF/1 */ -static inline acl_t +ACL_INTERNAL_INLINE acl_t rpl_acl_get_fd (int fd) { return acl_get_fd (fd, ACL_TYPE_ACCESS); @@ -116,7 +121,7 @@ rpl_acl_get_fd (int fd) /* Most platforms have a 2-argument acl_set_fd, only OSF/1 has a 3-argument macro(!). */ # if HAVE_ACL_FREE_TEXT /* OSF/1 */ -static inline int +ACL_INTERNAL_INLINE int rpl_acl_set_fd (int fd, acl_t acl) { return acl_set_fd (fd, ACL_TYPE_ACCESS, acl); @@ -149,7 +154,7 @@ rpl_acl_set_fd (int fd, acl_t acl) /* Set to 1 if a file's mode is implicit by the ACL. Set to 0 if a file's mode is stored independently from the ACL. */ -# if (HAVE_ACL_COPY_EXT_NATIVE && HAVE_ACL_CREATE_ENTRY_NP) || defined __sgi /* MacOS X, IRIX */ +# if (HAVE_ACL_COPY_EXT_NATIVE && HAVE_ACL_CREATE_ENTRY_NP) || defined __sgi /* Mac OS X, IRIX */ # define MODE_INSIDE_ACL 0 # else # define MODE_INSIDE_ACL 1 @@ -163,7 +168,7 @@ rpl_acl_set_fd (int fd, acl_t acl) extern int acl_entries (acl_t); # endif -# if HAVE_ACL_TYPE_EXTENDED /* MacOS X */ +# if HAVE_ACL_TYPE_EXTENDED /* Mac OS X */ /* ACL is an ACL, from a file, stored as type ACL_TYPE_EXTENDED. Return 1 if the given ACL is non-trivial. Return 0 if it is trivial. */ @@ -263,3 +268,5 @@ extern int acl_nontrivial (int count, struct acl *entries); # endif #endif + +_GL_INLINE_HEADER_END diff --git a/lib/acl.h b/lib/acl.h index dc36b0d2..9471f994 100644 --- a/lib/acl.h +++ b/lib/acl.h @@ -1,6 +1,6 @@ /* acl.c - access control lists - Copyright (C) 2002, 2008-2012 Free Software Foundation, Inc. + Copyright (C) 2002, 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 diff --git a/lib/acl_entries.c b/lib/acl_entries.c index 269f5745..7ca7b9d5 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-2012 Free Software Foundation, Inc. + Copyright (C) 2002-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 @@ -22,7 +22,7 @@ #include "acl-internal.h" /* This file assumes POSIX-draft like ACLs - (Linux, FreeBSD, MacOS X, IRIX, Tru64). */ + (Linux, FreeBSD, Mac OS X, IRIX, Tru64). */ /* Return the number of entries in ACL. Return -1 and set errno upon failure to determine it. */ @@ -34,8 +34,8 @@ acl_entries (acl_t acl) if (acl != NULL) { -#if HAVE_ACL_FIRST_ENTRY /* Linux, FreeBSD, MacOS X */ -# if HAVE_ACL_TYPE_EXTENDED /* MacOS X */ +#if HAVE_ACL_FIRST_ENTRY /* Linux, FreeBSD, Mac OS X */ +# if HAVE_ACL_TYPE_EXTENDED /* Mac OS X */ /* acl_get_entry returns 0 when it successfully fetches an entry, and -1/EINVAL at the end. */ acl_entry_t ace; diff --git a/lib/alignof.h b/lib/alignof.h index c90e73b6..013d5141 100644 --- a/lib/alignof.h +++ b/lib/alignof.h @@ -1,5 +1,5 @@ /* Determine alignment of types. - Copyright (C) 2003-2004, 2006, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 2003-2004, 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 diff --git a/lib/alloca.in.h b/lib/alloca.in.h index e94eb68c..72d28ee3 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-2012 Free Software Foundation, + Copyright (C) 1995, 1999, 2001-2004, 2006-2013 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it @@ -44,6 +44,13 @@ # define alloca _alloca # elif defined __DECC && defined __VMS # define alloca __ALLOCA +# elif defined __TANDEM && defined _TNS_E_TARGET +# ifdef __cplusplus +extern "C" +# endif +void *_alloca (unsigned short); +# pragma intrinsic (_alloca) +# define alloca _alloca # else # include <stddef.h> # ifdef __cplusplus diff --git a/lib/allocator.h b/lib/allocator.h index 81c4aa20..b71fbbbb 100644 --- a/lib/allocator.h +++ b/lib/allocator.h @@ -1,6 +1,6 @@ /* Memory allocators such as malloc+free. - Copyright (C) 2011-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/anytostr.c b/lib/anytostr.c index 5582eb1b..1d2fca49 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-2012 Free Software Foundation, Inc. + Copyright (C) 2001, 2006, 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 diff --git a/lib/areadlink-with-size.c b/lib/areadlink-with-size.c index a291a41b..29e0ef7a 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-2012 Free Software Foundation, Inc. + Copyright (C) 2001, 2003-2007, 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 diff --git a/lib/areadlink.c b/lib/areadlink.c index 1edcad36..fe65cc67 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-2012 Free Software Foundation, Inc. + Copyright (C) 2001, 2003-2007, 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 diff --git a/lib/areadlink.h b/lib/areadlink.h index 7e04377e..5870ce59 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-2012 Free Software Foundation, + Copyright (C) 2001, 2003-2004, 2007, 2009-2013 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 4e514c1c..7676831b 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-2012 Free Software Foundation, Inc. + Copyright (C) 2001, 2003-2007, 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 diff --git a/lib/argmatch.c b/lib/argmatch.c index a7133642..9125e2af 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-2012 Free Software + Copyright (C) 1990, 1998-1999, 2001-2007, 2009-2013 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 7e88696a..2e0275cf 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-2012 Free Software + Copyright (C) 1990, 1998-1999, 2001-2002, 2004-2005, 2009-2013 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/argv-iter.c b/lib/argv-iter.c index 7fa93b81..a17d8689 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-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/argv-iter.h b/lib/argv-iter.h index 31f32cba..82237f54 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-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/arpa_inet.in.h b/lib/arpa_inet.in.h index 0b8f1f11..ba89e977 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-2012 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 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 diff --git a/lib/asnprintf.c b/lib/asnprintf.c index f6f70c92..76e228d8 100644 --- a/lib/asnprintf.c +++ b/lib/asnprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 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 diff --git a/lib/asprintf.c b/lib/asprintf.c index 1722436c..713dae13 100644 --- a/lib/asprintf.c +++ b/lib/asprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006-2007, 2009-2012 Free Software Foundation, + Copyright (C) 1999, 2002, 2006-2007, 2009-2013 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 b25bc4d8..03c56788 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 @@ -17,9 +17,17 @@ /* written by Jim Meyering */ #include "dosname.h" /* solely for definition of IS_ABSOLUTE_FILE_NAME */ -#include "openat.h" -#include "openat-priv.h" -#include "save-cwd.h" + +#ifdef GNULIB_SUPPORT_ONLY_AT_FDCWD +# include <errno.h> +# ifndef ENOTSUP +# define ENOTSUP EINVAL +# endif +#else +# include "openat.h" +# include "openat-priv.h" +# include "save-cwd.h" +#endif #ifdef AT_FUNC_USE_F1_COND # define CALL_FUNC(F) \ @@ -61,17 +69,22 @@ FUNC_RESULT AT_FUNC_NAME (int fd, char const *file AT_FUNC_POST_FILE_PARAM_DECLS) { + VALIDATE_FLAG (flag); + + if (fd == AT_FDCWD || IS_ABSOLUTE_FILE_NAME (file)) + return CALL_FUNC (file); + +#ifdef GNULIB_SUPPORT_ONLY_AT_FDCWD + errno = ENOTSUP; + return FUNC_FAIL; +#else + { /* Be careful to choose names unlikely to conflict with AT_FUNC_POST_FILE_PARAM_DECLS. */ struct saved_cwd saved_cwd; int saved_errno; FUNC_RESULT err; - VALIDATE_FLAG (flag); - - if (fd == AT_FDCWD || IS_ABSOLUTE_FILE_NAME (file)) - return CALL_FUNC (file); - { char proc_buf[OPENAT_BUFFER_SIZE]; char *proc_file = openat_proc_name (proc_buf, fd, file); @@ -125,6 +138,8 @@ AT_FUNC_NAME (int fd, char const *file AT_FUNC_POST_FILE_PARAM_DECLS) if (saved_errno) errno = saved_errno; return err; + } +#endif } #undef CALL_FUNC #undef FUNC_RESULT diff --git a/lib/at-func2.c b/lib/at-func2.c index 58d5cfa8..bbbddc0b 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/lib/backupfile.c b/lib/backupfile.c index c11e62d1..83e0649f 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-2012 Free Software Foundation, Inc. + Copyright (C) 1990-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 diff --git a/lib/backupfile.h b/lib/backupfile.h index cd6d0059..43b51d42 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-2012 Free Software + Copyright (C) 1990-1992, 1997-1999, 2003-2004, 2009-2013 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 351c5fd7..8da969c0 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-2012 Free Software Foundation, Inc. + Copyright (C) 1999-2001, 2004-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 @@ -53,7 +53,7 @@ #include <string.h> /* C89 compliant way to cast 'char' to 'unsigned char'. */ -static inline unsigned char +static unsigned char to_uchar (char ch) { return ch; @@ -314,7 +314,7 @@ base64_decode_ctx_init (struct base64_decode_context *ctx) and return CTX->buf. In either case, advance *IN to point to the byte after the last one processed, and set *N_NON_NEWLINE to the number of verified non-newline bytes accessible through the returned pointer. */ -static inline char * +static char * get_4 (struct base64_decode_context *ctx, char const *restrict *in, char const *restrict in_end, size_t *n_non_newline) @@ -368,7 +368,7 @@ get_4 (struct base64_decode_context *ctx, as many bytes as possible are written to *OUT. On return, advance *OUT to point to the byte after the last one written, and decrement *OUTLEN to reflect the number of bytes remaining in *OUT. */ -static inline bool +static bool decode_4 (char const *restrict in, size_t inlen, char *restrict *outp, size_t *outleft) { diff --git a/lib/base64.h b/lib/base64.h index dc6f2a4f..343150cb 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-2012 Free Software Foundation, Inc. + Copyright (C) 2004-2006, 2009-2013 Free Software Foundation, Inc. Written by Simon Josefsson. This program is free software; you can redistribute it and/or modify @@ -24,6 +24,10 @@ /* Get bool. */ # include <stdbool.h> +# ifdef __cplusplus +extern "C" { +# endif + /* This uses that the expression (n+(k-1))/k means the smallest integer >= n/k, i.e., the ceiling of n/k. */ # define BASE64_LENGTH(inlen) ((((inlen) + 2) / 3) * 4) @@ -57,4 +61,8 @@ extern bool base64_decode_alloc_ctx (struct base64_decode_context *ctx, #define base64_decode_alloc(in, inlen, out, outlen) \ base64_decode_alloc_ctx (NULL, in, inlen, out, outlen) +# ifdef __cplusplus +} +# endif + #endif /* BASE64_H */ diff --git a/lib/basename-lgpl.c b/lib/basename-lgpl.c index 43ef8c21..9307e831 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-2012 Free Software + Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2013 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 5f18ffda..d73fd41a 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-2012 Free Software + Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2013 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/binary-io.c b/lib/binary-io.c new file mode 100644 index 00000000..8bbdb44d --- /dev/null +++ b/lib/binary-io.c @@ -0,0 +1,3 @@ +#include <config.h> +#define BINARY_IO_INLINE _GL_EXTERN_INLINE +#include "binary-io.h" diff --git a/lib/binary-io.h b/lib/binary-io.h index 824ad5b7..317fe3d3 100644 --- a/lib/binary-io.h +++ b/lib/binary-io.h @@ -1,5 +1,5 @@ /* Binary mode I/O. - Copyright (C) 2001, 2003, 2005, 2008-2012 Free Software Foundation, Inc. + Copyright (C) 2001, 2003, 2005, 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 @@ -25,28 +25,48 @@ so we include it here first. */ #include <stdio.h> -/* SET_BINARY (fd); - changes the file descriptor fd to perform binary I/O. */ +_GL_INLINE_HEADER_BEGIN +#ifndef BINARY_IO_INLINE +# define BINARY_IO_INLINE _GL_INLINE +#endif + +/* set_binary_mode (fd, mode) + sets the binary/text I/O mode of file descriptor fd to the given mode + (must be O_BINARY or O_TEXT) and returns the previous mode. */ #if O_BINARY # if defined __EMX__ || defined __DJGPP__ || defined __CYGWIN__ # include <io.h> /* declares setmode() */ +# define set_binary_mode setmode # else -# define setmode _setmode +# define set_binary_mode _setmode # undef fileno # define fileno _fileno # endif -# ifdef __DJGPP__ -# include <unistd.h> /* declares isatty() */ - /* Avoid putting stdin/stdout in binary mode if it is connected to - the console, because that would make it impossible for the user - to interrupt the program through Ctrl-C or Ctrl-Break. */ -# define SET_BINARY(fd) ((void) (!isatty (fd) ? (setmode (fd, O_BINARY), 0) : 0)) -# else -# define SET_BINARY(fd) ((void) setmode (fd, O_BINARY)) -# endif #else - /* On reasonable systems, binary I/O is the default. */ -# define SET_BINARY(fd) /* do nothing */ ((void) 0) + /* On reasonable systems, binary I/O is the only choice. */ + /* Use a function rather than a macro, to avoid gcc warnings + "warning: statement with no effect". */ +BINARY_IO_INLINE int +set_binary_mode (int fd, int mode) +{ + (void) fd; + (void) mode; + return O_BINARY; +} #endif +/* SET_BINARY (fd); + changes the file descriptor fd to perform binary I/O. */ +#ifdef __DJGPP__ +# include <unistd.h> /* declares isatty() */ + /* Avoid putting stdin/stdout in binary mode if it is connected to + the console, because that would make it impossible for the user + to interrupt the program through Ctrl-C or Ctrl-Break. */ +# define SET_BINARY(fd) ((void) (!isatty (fd) ? (set_binary_mode (fd, O_BINARY), 0) : 0)) +#else +# define SET_BINARY(fd) ((void) set_binary_mode (fd, O_BINARY)) +#endif + +_GL_INLINE_HEADER_END + #endif /* _BINARY_H */ diff --git a/lib/bitrotate.c b/lib/bitrotate.c new file mode 100644 index 00000000..a8f60288 --- /dev/null +++ b/lib/bitrotate.c @@ -0,0 +1,3 @@ +#include <config.h> +#define BITROTATE_INLINE _GL_EXTERN_INLINE +#include "bitrotate.h" diff --git a/lib/bitrotate.h b/lib/bitrotate.h index 5fb8f9be..9e10a45f 100644 --- a/lib/bitrotate.h +++ b/lib/bitrotate.h @@ -1,5 +1,5 @@ /* bitrotate.h - Rotate bits in integers - Copyright (C) 2008-2012 Free Software Foundation, Inc. + 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 @@ -23,11 +23,16 @@ #include <stdint.h> #include <sys/types.h> +_GL_INLINE_HEADER_BEGIN +#ifndef BITROTATE_INLINE +# define BITROTATE_INLINE _GL_INLINE +#endif + #ifdef UINT64_MAX /* Given an unsigned 64-bit argument X, return the value corresponding to rotating the bits N steps to the left. N must be between 1 and 63 inclusive. */ -static inline uint64_t +BITROTATE_INLINE uint64_t rotl64 (uint64_t x, int n) { return ((x << n) | (x >> (64 - n))) & UINT64_MAX; @@ -36,7 +41,7 @@ rotl64 (uint64_t x, int n) /* Given an unsigned 64-bit argument X, return the value corresponding to rotating the bits N steps to the right. N must be between 1 to 63 inclusive.*/ -static inline uint64_t +BITROTATE_INLINE uint64_t rotr64 (uint64_t x, int n) { return ((x >> n) | (x << (64 - n))) & UINT64_MAX; @@ -46,7 +51,7 @@ rotr64 (uint64_t x, int n) /* Given an unsigned 32-bit argument X, return the value corresponding to rotating the bits N steps to the left. N must be between 1 and 31 inclusive. */ -static inline uint32_t +BITROTATE_INLINE uint32_t rotl32 (uint32_t x, int n) { return ((x << n) | (x >> (32 - n))) & UINT32_MAX; @@ -55,7 +60,7 @@ rotl32 (uint32_t x, int n) /* Given an unsigned 32-bit argument X, return the value corresponding to rotating the bits N steps to the right. N must be between 1 to 31 inclusive.*/ -static inline uint32_t +BITROTATE_INLINE uint32_t rotr32 (uint32_t x, int n) { return ((x >> n) | (x << (32 - n))) & UINT32_MAX; @@ -64,7 +69,7 @@ rotr32 (uint32_t x, int n) /* Given a size_t argument X, return the value corresponding to rotating the bits N steps to the left. N must be between 1 and (CHAR_BIT * sizeof (size_t) - 1) inclusive. */ -static inline size_t +BITROTATE_INLINE size_t rotl_sz (size_t x, int n) { return ((x << n) | (x >> ((CHAR_BIT * sizeof x) - n))) & SIZE_MAX; @@ -73,7 +78,7 @@ rotl_sz (size_t x, int n) /* Given a size_t argument X, return the value corresponding to rotating the bits N steps to the right. N must be between 1 to (CHAR_BIT * sizeof (size_t) - 1) inclusive. */ -static inline size_t +BITROTATE_INLINE size_t rotr_sz (size_t x, int n) { return ((x >> n) | (x << ((CHAR_BIT * sizeof x) - n))) & SIZE_MAX; @@ -84,7 +89,7 @@ rotr_sz (size_t x, int n) 15 inclusive, but on most relevant targets N can also be 0 and 16 because 'int' is at least 32 bits and the arguments must widen before shifting. */ -static inline uint16_t +BITROTATE_INLINE uint16_t rotl16 (uint16_t x, int n) { return ((x << n) | (x >> (16 - n))) & UINT16_MAX; @@ -95,7 +100,7 @@ rotl16 (uint16_t x, int n) inclusive, but on most relevant targets N can also be 0 and 16 because 'int' is at least 32 bits and the arguments must widen before shifting. */ -static inline uint16_t +BITROTATE_INLINE uint16_t rotr16 (uint16_t x, int n) { return ((x >> n) | (x << (16 - n))) & UINT16_MAX; @@ -106,7 +111,7 @@ rotr16 (uint16_t x, int n) inclusive, but on most relevant targets N can also be 0 and 8 because 'int' is at least 32 bits and the arguments must widen before shifting. */ -static inline uint8_t +BITROTATE_INLINE uint8_t rotl8 (uint8_t x, int n) { return ((x << n) | (x >> (8 - n))) & UINT8_MAX; @@ -117,10 +122,12 @@ rotl8 (uint8_t x, int n) inclusive, but on most relevant targets N can also be 0 and 8 because 'int' is at least 32 bits and the arguments must widen before shifting. */ -static inline uint8_t +BITROTATE_INLINE uint8_t rotr8 (uint8_t x, int n) { return ((x >> n) | (x << (8 - n))) & UINT8_MAX; } +_GL_INLINE_HEADER_END + #endif /* _GL_BITROTATE_H */ diff --git a/lib/btowc.c b/lib/btowc.c index cec9eca5..6c7cbec9 100644 --- a/lib/btowc.c +++ b/lib/btowc.c @@ -1,5 +1,5 @@ /* Convert unibyte character to wide character. - Copyright (C) 2008, 2010-2012 Free Software Foundation, Inc. + Copyright (C) 2008, 2010-2013 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 1d22dac7..5843452a 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-2012 Free Software Foundation, Inc. + Copyright (C) 2002-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 diff --git a/lib/c-ctype.c b/lib/c-ctype.c index 952d7a85..752d2e32 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-2012 Free Software Foundation, Inc. + Copyright 2000-2003, 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 diff --git a/lib/c-ctype.h b/lib/c-ctype.h index 0b31309e..3a66440a 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-2012 Free Software Foundation, Inc. + Copyright (C) 2000-2003, 2006, 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 diff --git a/lib/c-strcase.h b/lib/c-strcase.h index fdef2385..49e1bb03 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-2012 Free Software + Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2013 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 d8332caf..ef85f0e6 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-2012 Free Software Foundation, Inc. + Copyright (C) 1998-1999, 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 diff --git a/lib/c-strcaseeq.h b/lib/c-strcaseeq.h index 5c4bdffe..afdea26b 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-2012 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2007, 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 diff --git a/lib/c-strncasecmp.c b/lib/c-strncasecmp.c index 47fb5fdb..04404b00 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-2012 Free Software Foundation, Inc. + Copyright (C) 1998-1999, 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 diff --git a/lib/c-strtod.c b/lib/c-strtod.c index a5973d47..2705a2b5 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-2012 Free Software Foundation, Inc. + Copyright (C) 2003-2004, 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 @@ -52,7 +52,7 @@ static volatile locale_t c_locale_cache; /* Return the C locale object, or (locale_t) 0 with errno set if it cannot be created. */ -static inline locale_t +static locale_t c_locale (void) { if (!c_locale_cache) diff --git a/lib/c-strtod.h b/lib/c-strtod.h index e3b8dc4b..140f3469 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-2012 Free Software Foundation, Inc. + Copyright (C) 2003-2004, 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 diff --git a/lib/calloc.c b/lib/calloc.c index 93da14dd..475d0aea 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-2012 Free Software Foundation, Inc. + Copyright (C) 2004-2007, 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 diff --git a/lib/canon-host.c b/lib/canon-host.c index 9280c388..d6106890 100644 --- a/lib/canon-host.c +++ b/lib/canon-host.c @@ -1,6 +1,6 @@ /* Host name canonicalization - Copyright (C) 2005-2012 Free Software Foundation, Inc. + Copyright (C) 2005-2013 Free Software Foundation, Inc. Written by Derek Price <derek@ximbiot.com>. diff --git a/lib/canon-host.h b/lib/canon-host.h index cf1b9ebd..c26db6bf 100644 --- a/lib/canon-host.h +++ b/lib/canon-host.h @@ -1,6 +1,6 @@ /* Host name canonicalization - Copyright (C) 2005, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 2005, 2009-2013 Free Software Foundation, Inc. Written by Derek Price <derek@ximbiot.com> diff --git a/lib/canonicalize.c b/lib/canonicalize.c index 583c1a4a..6a39a022 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-2012 Free Software Foundation, Inc. + Copyright (C) 1996-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 @@ -30,6 +30,7 @@ #include "pathmax.h" #include "xalloc.h" #include "xgetcwd.h" +#include "dosname.h" #define MULTIPLE_BITS_SET(i) (((i) & ((i) - 1)) != 0) @@ -43,6 +44,12 @@ # define DOUBLE_SLASH_IS_DISTINCT_ROOT 0 #endif +#if ISSLASH ('\\') +# define SLASHES "/\\" +#else +# define SLASHES "/" +#endif + #if !((HAVE_CANONICALIZE_FILE_NAME && FUNC_REALPATH_WORKS) \ || GNULIB_CANONICALIZE_LGPL) /* Return the canonical absolute name of file NAME. A canonical name @@ -99,9 +106,10 @@ canonicalize_filename_mode (const char *name, canonicalize_mode_t can_mode) Hash_table *ht = NULL; int saved_errno; int can_flags = can_mode & ~CAN_MODE_MASK; - can_mode &= CAN_MODE_MASK; bool logical = can_flags & CAN_NOLINKS; - /* Perhaps in future we might support CAN_NOALLOC with CAN_NOLINKS. */ + size_t prefix_len; + + can_mode &= CAN_MODE_MASK; if (MULTIPLE_BITS_SET (can_mode)) { @@ -121,7 +129,11 @@ canonicalize_filename_mode (const char *name, canonicalize_mode_t can_mode) return NULL; } - if (name[0] != '/') + /* This is always zero for Posix hosts, but can be 2 for MS-Windows + and MS-DOS X:/foo/bar file names. */ + prefix_len = FILE_SYSTEM_PREFIX_LEN (name); + + if (!IS_ABSOLUTE_FILE_NAME (name)) { rname = xgetcwd (); if (!rname) @@ -138,29 +150,37 @@ canonicalize_filename_mode (const char *name, canonicalize_mode_t can_mode) { rname_limit = dest; } + start = name; + prefix_len = FILE_SYSTEM_PREFIX_LEN (rname); } else { rname = xmalloc (PATH_MAX); rname_limit = rname + PATH_MAX; - rname[0] = '/'; - dest = rname + 1; + dest = rname; + if (prefix_len) + { + memcpy (rname, name, prefix_len); + dest += prefix_len; + } + *dest++ = '/'; if (DOUBLE_SLASH_IS_DISTINCT_ROOT) { - if (name[1] == '/' && name[2] != '/') + if (ISSLASH (name[1]) && !ISSLASH (name[2]) && !prefix_len) *dest++ = '/'; *dest = '\0'; } + start = name + prefix_len; } - for (start = name; *start; start = end) + for ( ; *start; start = end) { /* Skip sequence of multiple file name separators. */ - while (*start == '/') + while (ISSLASH (*start)) ++start; /* Find end of component. */ - for (end = start; *end && *end != '/'; ++end) + for (end = start; *end && !ISSLASH (*end); ++end) /* Nothing. */; if (end - start == 0) @@ -170,17 +190,18 @@ canonicalize_filename_mode (const char *name, canonicalize_mode_t can_mode) else if (end - start == 2 && start[0] == '.' && start[1] == '.') { /* Back up to previous component, ignore if at root already. */ - if (dest > rname + 1) - while ((--dest)[-1] != '/'); + if (dest > rname + prefix_len + 1) + for (--dest; dest > rname && !ISSLASH (dest[-1]); --dest) + continue; if (DOUBLE_SLASH_IS_DISTINCT_ROOT && dest == rname + 1 - && *dest == '/' && dest[1] != '/') + && !prefix_len && ISSLASH (*dest) && !ISSLASH (dest[1])) dest++; } else { struct stat st; - if (dest[-1] != '/') + if (!ISSLASH (dest[-1])) *dest++ = '/'; if (dest + (end - start) >= rname_limit) @@ -216,7 +237,7 @@ canonicalize_filename_mode (const char *name, canonicalize_mode_t can_mode) goto error; if (can_mode == CAN_ALL_BUT_LAST) { - if (end[strspn (end, "/")] || saved_errno != ENOENT) + if (end[strspn (end, SLASHES)] || saved_errno != ENOENT) goto error; continue; } @@ -268,24 +289,32 @@ canonicalize_filename_mode (const char *name, canonicalize_mode_t can_mode) memmove (&extra_buf[n], end, len + 1); name = end = memcpy (extra_buf, buf, n); - if (buf[0] == '/') + if (IS_ABSOLUTE_FILE_NAME (buf)) { - dest = rname + 1; /* It's an absolute symlink */ + size_t pfxlen = FILE_SYSTEM_PREFIX_LEN (buf); + + if (pfxlen) + memcpy (rname, buf, pfxlen); + dest = rname + pfxlen; + *dest++ = '/'; /* It's an absolute symlink */ if (DOUBLE_SLASH_IS_DISTINCT_ROOT) { - if (buf[1] == '/' && buf[2] != '/') + if (ISSLASH (buf[1]) && !ISSLASH (buf[2]) && !pfxlen) *dest++ = '/'; *dest = '\0'; } + /* Install the new prefix to be in effect hereafter. */ + prefix_len = pfxlen; } else { /* Back up to previous component, ignore if at root already: */ - if (dest > rname + 1) - while ((--dest)[-1] != '/'); + if (dest > rname + prefix_len + 1) + for (--dest; dest > rname && !ISSLASH (dest[-1]); --dest) + continue; if (DOUBLE_SLASH_IS_DISTINCT_ROOT && dest == rname + 1 - && *dest == '/' && dest[1] != '/') + && ISSLASH (*dest) && !ISSLASH (dest[1]) && !prefix_len) dest++; } @@ -301,10 +330,10 @@ canonicalize_filename_mode (const char *name, canonicalize_mode_t can_mode) } } } - if (dest > rname + 1 && dest[-1] == '/') + if (dest > rname + prefix_len + 1 && ISSLASH (dest[-1])) --dest; - if (DOUBLE_SLASH_IS_DISTINCT_ROOT && dest == rname + 1 - && *dest == '/' && dest[1] != '/') + if (DOUBLE_SLASH_IS_DISTINCT_ROOT && dest == rname + 1 && !prefix_len + && ISSLASH (*dest) && !ISSLASH (dest[1])) dest++; *dest = '\0'; if (rname_limit != dest + 1) diff --git a/lib/canonicalize.h b/lib/canonicalize.h index 9d83ed69..41ff311d 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-2012 Free Software Foundation, Inc. + Copyright (C) 1996-2007, 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 diff --git a/lib/careadlinkat.c b/lib/careadlinkat.c index cd4aa846..1a759be7 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-2012 Free Software Foundation, + Copyright (C) 2001, 2003-2004, 2007, 2009-2013 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/careadlinkat.h b/lib/careadlinkat.h index c21d3f45..5cdb813f 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-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/chdir-long.c b/lib/chdir-long.c index 599d1415..9c018250 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-2012 Free Software Foundation, Inc. + Copyright (C) 2004-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 @@ -42,19 +42,19 @@ struct cd_buf int fd; }; -static inline void +static void cdb_init (struct cd_buf *cdb) { cdb->fd = AT_FDCWD; } -static inline int +static int cdb_fchdir (struct cd_buf const *cdb) { return fchdir (cdb->fd); } -static inline void +static void cdb_free (struct cd_buf const *cdb) { if (0 <= cdb->fd) @@ -83,7 +83,7 @@ cdb_advance_fd (struct cd_buf *cdb, char const *dir) } /* Return a pointer to the first non-slash in S. */ -static inline char * _GL_ATTRIBUTE_PURE +static char * _GL_ATTRIBUTE_PURE find_non_slash (char const *s) { size_t n_slash = strspn (s, "/"); diff --git a/lib/chdir-long.h b/lib/chdir-long.h index 51db5a80..26f7706a 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-2012 Free Software Foundation, Inc. + Copyright (C) 2004-2005, 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 diff --git a/lib/chmodat.c b/lib/chmodat.c new file mode 100644 index 00000000..3c696899 --- /dev/null +++ b/lib/chmodat.c @@ -0,0 +1,3 @@ +#include <config.h> +#define FCHMODAT_INLINE _GL_EXTERN_INLINE +#include "openat.h" diff --git a/lib/chown.c b/lib/chown.c index 6f0f7b90..b2121985 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-2012 Free Software Foundation, Inc. + Copyright (C) 1997, 2004-2007, 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 diff --git a/lib/chownat.c b/lib/chownat.c new file mode 100644 index 00000000..3937f9c4 --- /dev/null +++ b/lib/chownat.c @@ -0,0 +1,3 @@ +#include <config.h> +#define FCHOWNAT_INLINE _GL_EXTERN_INLINE +#include "openat.h" diff --git a/lib/cloexec.c b/lib/cloexec.c index 7919e867..e3e42d28 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-2012 Free Software Foundation, Inc. + Copyright (C) 1991, 2004-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 diff --git a/lib/cloexec.h b/lib/cloexec.h index 92e9f81e..0c5935ba 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-2012 Free Software Foundation, Inc. + Copyright (C) 2004, 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 diff --git a/lib/close-stream.c b/lib/close-stream.c index 04fa5ece..d6a86928 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-2012 Free Software Foundation, Inc. + Copyright (C) 1998-2002, 2004, 2006-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 diff --git a/lib/close.c b/lib/close.c index 4b7accbc..f620e54b 100644 --- a/lib/close.c +++ b/lib/close.c @@ -1,5 +1,5 @@ /* close replacement. - Copyright (C) 2008-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/closedir.c b/lib/closedir.c index df31e86b..fa8e2106 100644 --- a/lib/closedir.c +++ b/lib/closedir.c @@ -1,5 +1,5 @@ /* Stop reading the entries of a directory. - Copyright (C) 2006-2012 Free Software Foundation, Inc. + Copyright (C) 2006-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 diff --git a/lib/closein.c b/lib/closein.c index 65f2cb9e..20d5035e 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-2012 Free Software Foundation, Inc. + Copyright (C) 2007, 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 diff --git a/lib/closein.h b/lib/closein.h index d838af9d..84bbeefc 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-2012 Free Software Foundation, Inc. + Copyright (C) 2007, 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 diff --git a/lib/closeout.c b/lib/closeout.c index eea40247..d4d3edca 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-2012 Free Software Foundation, + Copyright (C) 1998-2002, 2004, 2006, 2008-2013 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 5310b286..131fe864 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-2012 Free Software + Copyright (C) 1998, 2000, 2003-2004, 2006, 2008-2013 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 89b3017b..a991419c 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-2012 Free Software Foundation, Inc. +# Copyright (C) 2000-2004, 2006-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 @@ -29,7 +29,7 @@ # The current list of GNU canonical charset names is as follows. # # name MIME? used by which systems -# (darwin = MacOS X, woe32 = native Windows) +# (darwin = Mac OS X, woe32 = native Windows) # # ASCII, ANSI_X3.4-1968 glibc solaris freebsd netbsd darwin cygwin # ISO-8859-1 Y glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin diff --git a/lib/config.hin b/lib/config.hin index 22bcf6c4..e59c4149 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 @@ -133,6 +133,13 @@ /* Define to 1 if fopen() fails to recognize a trailing slash. */ #undef FOPEN_TRAILING_SLASH_BUG +/* Enable compile-time and run-time bounds-checking, and some warnings, + without upsetting glibc 2.15+. */ + #if !defined _FORTIFY_SOURCE && defined __OPTIMIZE__ && __OPTIMIZE__ + # define _FORTIFY_SOURCE 2 + #endif + + /* Define to 1 if the system's ftello function has the Solaris bug. */ #undef FTELLO_BROKEN_AFTER_SWITCHING_FROM_READ_TO_WRITE @@ -237,8 +244,8 @@ #undef GNULIB_FREOPEN_SAFER /* Define to a C preprocessor expression that evaluates to 1 or 0, depending - whether the gnulib module fstatat shall be considered present. */ -#undef GNULIB_FSTATAT + whether the gnulib module fscanf shall be considered present. */ +#undef GNULIB_FSCANF /* Define to a C preprocessor expression that evaluates to 1 or 0, depending whether the gnulib module getcwd shall be considered present. */ @@ -267,10 +274,18 @@ whether the gnulib module realloc-gnu shall be considered present. */ #undef GNULIB_REALLOC_GNU +/* Define to a C preprocessor expression that evaluates to 1 or 0, depending + whether the gnulib module scanf shall be considered present. */ +#undef GNULIB_SCANF + /* Define to a C preprocessor expression that evaluates to 1 or 0, depending whether the gnulib module snprintf shall be considered present. */ #undef GNULIB_SNPRINTF +/* Define to a C preprocessor expression that evaluates to 1 or 0, depending + whether the gnulib module statat shall be considered present. */ +#undef GNULIB_STATAT + /* Define to a C preprocessor expression that evaluates to 1 or 0, depending whether the gnulib module strerror shall be considered present. */ #undef GNULIB_STRERROR @@ -900,11 +915,11 @@ /* Define to 1 if you have the `catgets' function. */ #undef HAVE_CATGETS -/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the +/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework. */ #undef HAVE_CFLOCALECOPYCURRENT -/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework. */ #undef HAVE_CFPREFERENCESCOPYAPPVALUE @@ -1163,6 +1178,10 @@ don't. */ #undef HAVE_DECL_MEMRCHR +/* Define to 1 if you have the declaration of `mpz_inits', and to 0 if you + don't. */ +#undef HAVE_DECL_MPZ_INITS + /* Define to 1 if you have the declaration of `program_invocation_name', and to 0 if you don't. */ #undef HAVE_DECL_PROGRAM_INVOCATION_NAME @@ -1211,10 +1230,6 @@ don't. */ #undef HAVE_DECL_STRMODE -/* Define to 1 if you have the declaration of `strncasecmp', and to 0 if you - don't. */ -#undef HAVE_DECL_STRNCASECMP - /* Define to 1 if you have the declaration of `strndup', and to 0 if you don't. */ #undef HAVE_DECL_STRNDUP @@ -1467,9 +1482,6 @@ /* Define to 1 if you have the `getservbyname' function. */ #undef HAVE_GETSERVBYNAME -/* Define to 1 if you have the `getspnam' function. */ -#undef HAVE_GETSPNAM - /* Define to 1 if you have the `getsysinfo' function. */ #undef HAVE_GETSYSINFO @@ -1605,18 +1617,12 @@ /* Define to 1 if you have the `kstat' library (-lkstat). */ #undef HAVE_LIBKSTAT -/* Define to 1 if you have the `ldgc' library (-lldgc). */ -#undef HAVE_LIBLDGC - /* Define to 1 if you have the `os' library (-los). */ #undef HAVE_LIBOS /* Define to 1 if you have the `perfstat' library (-lperfstat). */ #undef HAVE_LIBPERFSTAT -/* Define to 1 if you have the `ypsec' library (-lypsec). */ -#undef HAVE_LIBYPSEC - /* Define to 1 if you have the `link' function. */ #undef HAVE_LINK @@ -1638,10 +1644,6 @@ /* Define to 1 if you have the `lstat' function. */ #undef HAVE_LSTAT -/* Define to 1 if `lstat' has the bug that it succeeds when given the - zero-length file name argument. */ -#undef HAVE_LSTAT_EMPTY_STRING_BUG - /* Define to 1 if you have the `lutimes' function. */ #undef HAVE_LUTIMES @@ -1794,6 +1796,9 @@ /* 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 + /* Define to 1 if you have the <priv.h> header file. */ #undef HAVE_PRIV_H @@ -1921,9 +1926,6 @@ /* Define to 1 if you have the `settimeofday' function. */ #undef HAVE_SETTIMEOFDAY -/* Define to 1 if you have the <shadow.h> header file. */ -#undef HAVE_SHADOW_H - /* Define to 1 if you have the `shutdown' function. */ #undef HAVE_SHUTDOWN @@ -1999,9 +2001,6 @@ /* Define if you have the stpncpy() function and it works. */ #undef HAVE_STPNCPY -/* Define to 1 if you have the `strcasecmp' function. */ -#undef HAVE_STRCASECMP - /* Define to 1 if you have the `strchrnul' function. */ #undef HAVE_STRCHRNUL @@ -2017,9 +2016,6 @@ /* Define to 1 if you have the <string.h> header file. */ #undef HAVE_STRING_H -/* Define to 1 if you have the `strncasecmp' function. */ -#undef HAVE_STRNCASECMP - /* Define to 1 if you have the `strndup' function. */ #undef HAVE_STRNDUP @@ -2084,8 +2080,8 @@ /* Define to 1 if `ss_family' is a member of `struct sockaddr_storage'. */ #undef HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY -/* Define to 1 if `sp_pwdp' is a member of `struct spwd'. */ -#undef HAVE_STRUCT_SPWD_SP_PWDP +/* Define to 1 if `f_frsize' is a member of `struct statfs'. */ +#undef HAVE_STRUCT_STATFS_F_FRSIZE /* Define to 1 if `f_fstypename' is a member of `struct statfs'. */ #undef HAVE_STRUCT_STATFS_F_FSTYPENAME @@ -2529,9 +2525,21 @@ /* Define to 1 if you have the `__fpurge' function. */ #undef HAVE___FPURGE +/* Define to 1 if you have the `__freadahead' function. */ +#undef HAVE___FREADAHEAD + /* Define to 1 if you have the `__freading' function. */ #undef HAVE___FREADING +/* Define to 1 if you have the `__freadptr' function. */ +#undef HAVE___FREADPTR + +/* Define to 1 if you have the `__freadptrinc' function. */ +#undef HAVE___FREADPTRINC + +/* Define to 1 if you have the `__fseterr' function. */ +#undef HAVE___FSETERR + /* Define to 1 if you have the `__fsetlocking' function. */ #undef HAVE___FSETLOCKING @@ -2579,7 +2587,7 @@ /* Define to 1 if lseek does not detect pipes. */ #undef LSEEK_PIPE_BROKEN -/* Define to 1 if `lstat' dereferences a symlink specified with a trailing +/* Define to 1 if 'lstat' dereferences a symlink specified with a trailing slash. */ #undef LSTAT_FOLLOWS_SLASHED_SYMLINK @@ -2853,9 +2861,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 @@ -2875,6 +2883,10 @@ (4.3BSD, SunOS 4, HP-UX, AIX PS/2) */ #undef STAT_STATFS2_BSIZE +/* Define if statfs takes 2 args and struct statfs has a field named f_frsize. + (glibc/Linux > 2.6) */ +#undef STAT_STATFS2_FRSIZE + /* Define if statfs takes 2 args and struct statfs has a field named f_fsize. (4.4BSD, NetBSD) */ #undef STAT_STATFS2_FSIZE @@ -3012,17 +3024,12 @@ # endif #endif -/* Enable large inode numbers on Mac OS X 10.5. */ -#ifndef _DARWIN_USE_64_BIT_INODE -# define _DARWIN_USE_64_BIT_INODE 1 -#endif +/* Enable large inode numbers on Mac OS X 10.5. */ +#undef _DARWIN_USE_64_BIT_INODE /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS -/* enable compile-time and run-time bounds-checking, and some warnings */ -#undef _FORTIFY_SOURCE - /* Define to 1 if Gnulib overrides 'struct stat' on Windows so that struct stat.st_size becomes 64-bit. */ #undef _GL_WINDOWS_64_BIT_ST_SIZE @@ -3040,7 +3047,8 @@ #undef _MINIX /* The _Noreturn keyword of C11. */ -#if !defined _Noreturn && __STDC_VERSION__ < 201112 +#if ! (defined _Noreturn \ + || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__)) # if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \ || 0x5110 <= __SUNPRO_C) # define _Noreturn __attribute__ ((__noreturn__)) @@ -3077,7 +3085,7 @@ #ifndef _ALL_SOURCE # undef _ALL_SOURCE #endif -/* Enable general extensions on MacOS X. */ +/* Enable general extensions on Mac OS X. */ #ifndef _DARWIN_C_SOURCE # undef _DARWIN_C_SOURCE #endif @@ -3103,6 +3111,58 @@ 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. + + Suppress the use of extern inline on Apple's platforms, + as Libc-825.25 (2012-09-19) is incompatible with it; see + <http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html>. + Perhaps Apple will fix this some day. */ +#if ((__GNUC__ \ + ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \ + : 199901L <= __STDC_VERSION__) \ + && !defined __APPLE__) +# define _GL_INLINE inline +# define _GL_EXTERN_INLINE extern inline +#elif 2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __APPLE__ +# if __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 +#else +# define _GL_INLINE static _GL_UNUSED +# define _GL_EXTERN_INLINE static _GL_UNUSED +#endif + +#if 4 < __GNUC__ + (6 <= __GNUC_MINOR__) +# if defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ +# define _GL_INLINE_HEADER_CONST_PRAGMA +# else +# define _GL_INLINE_HEADER_CONST_PRAGMA \ + _Pragma ("GCC diagnostic ignored \"-Wsuggest-attribute=const\"") +# endif +# define _GL_INLINE_HEADER_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \ + _Pragma ("GCC diagnostic ignored \"-Wmissing-declarations\"") \ + _GL_INLINE_HEADER_CONST_PRAGMA +# define _GL_INLINE_HEADER_END \ + _Pragma ("GCC diagnostic pop") +#else +# define _GL_INLINE_HEADER_BEGIN +# define _GL_INLINE_HEADER_END +#endif + /* Always use our fgetfilecon wrapper. */ #undef fgetfilecon @@ -3139,7 +3199,7 @@ /* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of earlier versions), but does not display it by setting __GNUC_STDC_INLINE__. - __APPLE__ && __MACH__ test for MacOS X. + __APPLE__ && __MACH__ test for Mac OS X. __APPLE_CC__ tests for the Apple compiler and its version. __STDC_VERSION__ tests for the C99 mode. */ #if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__ diff --git a/lib/copy-acl.c b/lib/copy-acl.c index 7369106c..58ff54ae 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-2012 Free Software Foundation, Inc. + Copyright (C) 2002-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 @@ -44,7 +44,7 @@ qcopy_acl (const char *src_name, int source_desc, const char *dst_name, { #if USE_ACL && HAVE_ACL_GET_FILE /* POSIX 1003.1e (draft 17 -- abandoned) specific version. */ - /* Linux, FreeBSD, MacOS X, IRIX, Tru64 */ + /* Linux, FreeBSD, Mac OS X, IRIX, Tru64 */ # if !HAVE_ACL_TYPE_EXTENDED /* Linux, FreeBSD, IRIX, Tru64 */ @@ -116,19 +116,19 @@ qcopy_acl (const char *src_name, int source_desc, const char *dst_name, return 0; # else /* HAVE_ACL_TYPE_EXTENDED */ - /* MacOS X */ + /* Mac OS X */ - /* On MacOS X, acl_get_file (name, ACL_TYPE_ACCESS) - and acl_get_file (name, ACL_TYPE_DEFAULT) + /* 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, ...)) + 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) + 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): + acl_set_file (name, ACL_TYPE_EXTENDED, acl): Each of these calls sets the file's ACL. */ acl_t acl; diff --git a/lib/creat-safer.c b/lib/creat-safer.c index f0f9a22c..93f794dd 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-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/ctype.in.h b/lib/ctype.in.h index 8102aa61..21eeac61 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-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/cycle-check.c b/lib/cycle-check.c index 011cae95..d475225c 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-2012 Free Software Foundation, Inc. + Copyright (C) 2003-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 @@ -33,7 +33,7 @@ /* Return true if I is a power of 2, or is zero. */ -static inline bool +static bool is_zero_or_power_of_two (uintmax_t i) { return (i & (i - 1)) == 0; diff --git a/lib/cycle-check.h b/lib/cycle-check.h index 88864768..46a1a442 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-2012 Free Software Foundation, Inc. + Copyright (C) 2003-2004, 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 diff --git a/lib/di-set.c b/lib/di-set.c index cea3cea1..b757d49e 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-2012 Free Software Foundation, Inc. + Copyright 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 diff --git a/lib/diacrit.c b/lib/diacrit.c index c7533afe..8b7672b1 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-2012 Free Software Foundation, + Copyright (C) 1990-1993, 2000, 2006, 2009-2013 Free Software Foundation, Inc. François Pinard <pinard@iro.umontreal.ca>, 1988. diff --git a/lib/diacrit.h b/lib/diacrit.h index 322f16a8..995514a2 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-2012 Free Software Foundation, Inc. + Copyright (C) 1990-1993, 2009-2013 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 ec1e2d8c..2de182bc 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-2012 Free Software Foundation, Inc. + Copyright (C) 2006-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 diff --git a/lib/dirent--.h b/lib/dirent--.h index 1b757938..91067363 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-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/dirent-private.h b/lib/dirent-private.h index b60203c4..441071ca 100644 --- a/lib/dirent-private.h +++ b/lib/dirent-private.h @@ -1,5 +1,5 @@ /* Private details of the DIR type. - Copyright (C) 2011-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/dirent-safer.h b/lib/dirent-safer.h index 861ea93a..853ea5dd 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-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/dirent.in.h b/lib/dirent.in.h index cdbc5fd4..fad3797b 100644 --- a/lib/dirent.in.h +++ b/lib/dirent.in.h @@ -1,5 +1,5 @@ /* A GNU-like <dirent.h>. - Copyright (C) 2006-2012 Free Software Foundation, Inc. + Copyright (C) 2006-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 diff --git a/lib/dirfd.c b/lib/dirfd.c index 2f4d424f..8272e132 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-2012 Free Software Foundation, Inc. + Copyright (C) 2001, 2006, 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 diff --git a/lib/dirname-lgpl.c b/lib/dirname-lgpl.c index 2895cbcb..82f66301 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-2012 Free Software + Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2013 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 627c164c..1fb65888 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-2012 Free Software + Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2013 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 51a685c3..4ad03120 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-2012 Free Software Foundation, + Copyright (C) 1998, 2001, 2003-2006, 2009-2013 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 0468ce4d..ba63ce4b 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-2012 Free Software Foundation, Inc. + Copyright (C) 2000-2001, 2004-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 diff --git a/lib/dtotimespec.c b/lib/dtotimespec.c index f30fa075..ecce2e5b 100644 --- a/lib/dtotimespec.c +++ b/lib/dtotimespec.c @@ -1,6 +1,6 @@ /* Convert double to timespec. - Copyright (C) 2011-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/dup-safer-flag.c b/lib/dup-safer-flag.c index e4d1b211..8a09821d 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-2012 Free Software Foundation, Inc. + Copyright (C) 2001, 2004-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 diff --git a/lib/dup-safer.c b/lib/dup-safer.c index 0f5d3be3..c2031078 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-2012 Free Software Foundation, Inc. + Copyright (C) 2001, 2004-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 diff --git a/lib/dup.c b/lib/dup.c index 0a0b69ed..564d93ce 100644 --- a/lib/dup.c +++ b/lib/dup.c @@ -1,6 +1,6 @@ /* Duplicate an open file descriptor. - Copyright (C) 2011-2012 Free Software Foundation, Inc. + 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 @@ -27,7 +27,7 @@ #undef dup #if HAVE_MSVC_INVALID_PARAMETER_HANDLER -static inline int +static int dup_nothrow (int fd) { int result; diff --git a/lib/dup2.c b/lib/dup2.c index f6d0f1c7..9219eb38 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-2012 Free Software Foundation, Inc. + Copyright (C) 1999, 2004-2007, 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 @@ -95,7 +95,10 @@ rpl_dup2 (int fd, int desired_fd) # ifdef F_GETFL /* 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 Haiku, dup2 (fd, fd) mistakenly clears FD_CLOEXEC. */ + if (desired_fd < 0) + fd = desired_fd; if (fd == desired_fd) return fcntl (fd, F_GETFL) == -1 ? -1 : fd; # endif diff --git a/lib/errno.in.h b/lib/errno.in.h index 2f426121..49b35464 100644 --- a/lib/errno.in.h +++ b/lib/errno.in.h @@ -1,6 +1,6 @@ /* A POSIX-like <errno.h>. - Copyright (C) 2008-2012 Free Software Foundation, Inc. + 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 @@ -84,6 +84,16 @@ # define GNULIB_defined_ECANCELED 1 # endif +# ifndef EOWNERDEAD +# define EOWNERDEAD 133 +# define GNULIB_defined_EOWNERDEAD 1 +# endif + +# ifndef ENOTRECOVERABLE +# define ENOTRECOVERABLE 127 +# define GNULIB_defined_ENOTRECOVERABLE 1 +# endif + # ifndef EINPROGRESS # define EINPROGRESS 112 # define EALREADY 103 @@ -108,15 +118,17 @@ # define ELOOP 114 # define EHOSTUNREACH 110 # define EWOULDBLOCK 140 +# define GNULIB_defined_ESOCK 1 +# endif + +# ifndef ETXTBSY # define ETXTBSY 139 # define ENODATA 120 /* not required by POSIX */ # define ENOSR 124 /* not required by POSIX */ # define ENOSTR 125 /* not required by POSIX */ -# define ENOTRECOVERABLE 127 /* not required by POSIX */ -# define EOWNERDEAD 133 /* not required by POSIX */ # define ETIME 137 /* not required by POSIX */ # define EOTHER 131 /* not required by POSIX */ -# define GNULIB_defined_ESOCK 1 +# define GNULIB_defined_ESTREAMS 1 # endif /* These are intentionally the same values as the WSA* error numbers, defined @@ -227,6 +239,41 @@ # define GNULIB_defined_ECANCELED 1 # endif +/* On many platforms, the macros EOWNERDEAD and ENOTRECOVERABLE are not + defined. */ + +# ifndef EOWNERDEAD +# if defined __sun + /* Use the same values as defined for Solaris >= 8, for + interoperability. */ +# define EOWNERDEAD 58 +# define ENOTRECOVERABLE 59 +# elif (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ + /* We have a conflict here: pthreads-win32 defines these values + differently than MSVC 10. It's hairy to decide which one to use. */ +# if defined __MINGW32__ && !defined USE_WINDOWS_THREADS + /* Use the same values as defined by pthreads-win32, for + interoperability. */ +# define EOWNERDEAD 43 +# define ENOTRECOVERABLE 44 +# else + /* Use the same values as defined by MSVC 10, for + interoperability. */ +# define EOWNERDEAD 133 +# define ENOTRECOVERABLE 127 +# endif +# else +# define EOWNERDEAD 2013 +# define ENOTRECOVERABLE 2014 +# endif +# define GNULIB_defined_EOWNERDEAD 1 +# define GNULIB_defined_ENOTRECOVERABLE 1 +# endif + +# ifndef EILSEQ +# define EILSEQ 2015 +# define GNULIB_defined_EILSEQ 1 +# endif #endif /* _@GUARD_PREFIX@_ERRNO_H */ #endif /* _@GUARD_PREFIX@_ERRNO_H */ diff --git a/lib/error.c b/lib/error.c index dc8c65fa..865b2934 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-2012 Free Software Foundation, Inc. + Copyright (C) 1990-1998, 2000-2007, 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 @@ -121,7 +121,7 @@ extern char *program_name; #if !_LIBC /* Return non-zero if FD is open. */ -static inline int +static int is_open (int fd) { # if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ @@ -139,7 +139,7 @@ is_open (int fd) } #endif -static inline void +static void flush_stdout (void) { #if !_LIBC diff --git a/lib/error.h b/lib/error.h index 9c2cb8bc..afcb0e10 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-2012 Free Software Foundation, + Copyright (C) 1995-1997, 2003, 2006, 2008-2013 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/lib/euidaccess.c b/lib/euidaccess.c index 44e0ea11..f73438e6 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-2012 Free + Copyright (C) 1990-1991, 1995, 1998, 2000, 2003-2006, 2008-2013 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -30,6 +30,8 @@ #include <sys/stat.h> #include <unistd.h> +#include "root-uid.h" + #if HAVE_LIBGEN_H # include <libgen.h> #endif @@ -82,7 +84,7 @@ euidaccess (const char *file, int mode) return accessx (file, mode, ACC_SELF); #elif HAVE_EACCESS /* FreeBSD */ return eaccess (file, mode); -#else /* MacOS X, NetBSD, OpenBSD, HP-UX, Solaris, Cygwin, mingw, BeOS */ +#else /* Mac OS X, NetBSD, OpenBSD, HP-UX, Solaris, Cygwin, mingw, BeOS */ uid_t uid = getuid (); gid_t gid = getgid (); @@ -140,8 +142,9 @@ euidaccess (const char *file, int mode) /* The super-user can read and write any file, and execute any file that anyone can execute. */ - if (euid == 0 && ((mode & X_OK) == 0 - || (stats.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))) + if (euid == ROOT_UID + && ((mode & X_OK) == 0 + || (stats.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))) return 0; /* Convert the mode to traditional form, clearing any bogus bits. */ diff --git a/lib/exclude.c b/lib/exclude.c index 08a48292..a7dd9b36 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-2012 Free Software + Copyright (C) 1992-1994, 1997, 1999-2007, 2009-2013 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/exclude.h b/lib/exclude.h index 50e8a631..f76b1539 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-2012 Free + Copyright (C) 1992-1994, 1997, 1999, 2001-2003, 2005-2006, 2009-2013 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/exitfail.c b/lib/exitfail.c index fdd674c1..b0b4ebe4 100644 --- a/lib/exitfail.c +++ b/lib/exitfail.c @@ -1,6 +1,6 @@ /* Failure exit status - Copyright (C) 2002-2003, 2005-2007, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2005-2007, 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 diff --git a/lib/exitfail.h b/lib/exitfail.h index 074f2121..e54333bd 100644 --- a/lib/exitfail.h +++ b/lib/exitfail.h @@ -1,6 +1,6 @@ /* Failure exit status - Copyright (C) 2002, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 2002, 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 diff --git a/lib/faccessat.c b/lib/faccessat.c index 81fad547..f3c3f673 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-2012 Free Software Foundation, Inc. + 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 @@ -19,6 +19,7 @@ #include <config.h> #include <unistd.h> +#include <fcntl.h> #ifndef HAVE_ACCESS /* Mingw lacks access, but it also lacks real vs. effective ids, so diff --git a/lib/fadvise.c b/lib/fadvise.c index d724fe78..8d3af995 100644 --- a/lib/fadvise.c +++ b/lib/fadvise.c @@ -1,5 +1,5 @@ /* Declare an access pattern hint for files. - Copyright (C) 2010-2012 Free Software Foundation, Inc. + Copyright (C) 2010-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 diff --git a/lib/fadvise.h b/lib/fadvise.h index fa8471b0..cd5046b3 100644 --- a/lib/fadvise.h +++ b/lib/fadvise.h @@ -1,5 +1,5 @@ /* Declare an access pattern hint for files. - Copyright (C) 2010-2012 Free Software Foundation, Inc. + Copyright (C) 2010-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 diff --git a/lib/fatal-signal.c b/lib/fatal-signal.c index 54ef8c6e..8f7cb8ea 100644 --- a/lib/fatal-signal.c +++ b/lib/fatal-signal.c @@ -1,5 +1,5 @@ /* Emergency actions in case of a fatal signal. - Copyright (C) 2003-2004, 2006-2012 Free Software Foundation, Inc. + 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 @@ -131,7 +131,7 @@ static struct sigaction saved_sigactions[64]; /* Uninstall the handlers. */ -static inline void +static void uninstall_handlers (void) { size_t i; @@ -176,7 +176,7 @@ fatal_signal_handler (int sig) /* Install the handlers. */ -static inline void +static void install_handlers (void) { size_t i; diff --git a/lib/fatal-signal.h b/lib/fatal-signal.h index f6628d65..f5df78a0 100644 --- a/lib/fatal-signal.h +++ b/lib/fatal-signal.h @@ -1,5 +1,5 @@ /* Emergency actions in case of a fatal signal. - Copyright (C) 2003-2004, 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/fchdir.c b/lib/fchdir.c index 2e07553e..36a8e358 100644 --- a/lib/fchdir.c +++ b/lib/fchdir.c @@ -1,5 +1,5 @@ /* fchdir replacement. - Copyright (C) 2006-2012 Free Software Foundation, Inc. + Copyright (C) 2006-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 diff --git a/lib/fchmodat.c b/lib/fchmodat.c index ce848fd4..34e956cc 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/lib/fchownat.c b/lib/fchownat.c index 4f6a44d0..3e355792 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-2012 Free Software Foundation, Inc. + Copyright (C) 2006-2007, 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 diff --git a/lib/fclose.c b/lib/fclose.c index e9986ca5..90ed653a 100644 --- a/lib/fclose.c +++ b/lib/fclose.c @@ -1,5 +1,5 @@ /* fclose replacement. - Copyright (C) 2008-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/fcntl--.h b/lib/fcntl--.h index 8fde6c11..3fcd5fec 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-2012 Free Software Foundation, Inc. + Copyright (C) 2005, 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 diff --git a/lib/fcntl-safer.h b/lib/fcntl-safer.h index 440a2ffd..a98a6330 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-2012 Free Software Foundation, Inc. + Copyright (C) 2005, 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 diff --git a/lib/fcntl.c b/lib/fcntl.c index 3dfb6b73..735fa66f 100644 --- a/lib/fcntl.c +++ b/lib/fcntl.c @@ -1,6 +1,6 @@ /* Provide file descriptor control. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/fcntl.in.h b/lib/fcntl.in.h index 76e12f78..1e45a65a 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-2012 Free Software Foundation, Inc. + Copyright (C) 2006-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 @@ -216,6 +216,10 @@ _GL_WARN_ON_USE (openat, "openat is not portable - " # define O_EXEC O_RDONLY /* This is often close enough in older systems. */ #endif +#ifndef O_IGNORE_CTTY +# define O_IGNORE_CTTY 0 +#endif + #ifndef O_NDELAY # define O_NDELAY 0 #endif @@ -249,10 +253,18 @@ _GL_WARN_ON_USE (openat, "openat is not portable - " # define O_NOFOLLOW 0 #endif +#ifndef O_NOLINK +# define O_NOLINK 0 +#endif + #ifndef O_NOLINKS # define O_NOLINKS 0 #endif +#ifndef O_NOTRANS +# define O_NOTRANS 0 +#endif + #ifndef O_RSYNC # define O_RSYNC 0 #endif @@ -269,7 +281,7 @@ _GL_WARN_ON_USE (openat, "openat is not portable - " # define O_TTY_INIT 0 #endif -#if O_ACCMODE != (O_RDONLY | O_WRONLY | O_RDWR | O_EXEC | O_SEARCH) +#if ~O_ACCMODE & (O_RDONLY | O_WRONLY | O_RDWR | O_EXEC | O_SEARCH) # undef O_ACCMODE # define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR | O_EXEC | O_SEARCH) #endif diff --git a/lib/fd-hook.c b/lib/fd-hook.c index 8f4ffe2a..e158a52a 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-2012 Free Software Foundation, Inc. + Copyright (C) 2009-2013 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 721e9ad9..d15b5771 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-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/fd-reopen.c b/lib/fd-reopen.c index fd4b92be..d18827c5 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/lib/fd-reopen.h b/lib/fd-reopen.h index b80f0986..28db198e 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/lib/fd-safer-flag.c b/lib/fd-safer-flag.c index b090edf7..8bc14bda 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-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/fd-safer.c b/lib/fd-safer.c index 052837bd..8ded8886 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-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/fdatasync.c b/lib/fdatasync.c index 1c5f392d..8f9bf15a 100644 --- a/lib/fdatasync.c +++ b/lib/fdatasync.c @@ -1,6 +1,6 @@ /* Emulate fdatasync on platforms that lack it. - Copyright (C) 2011-2012 Free Software Foundation, Inc. + Copyright (C) 2011-2013 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 6595b16d..c717f713 100644 --- a/lib/fdopen.c +++ b/lib/fdopen.c @@ -1,5 +1,5 @@ /* Open a stream with a given file descriptor. - Copyright (C) 2011-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/fdopendir.c b/lib/fdopendir.c index 4ae7d053..63e06b92 100644 --- a/lib/fdopendir.c +++ b/lib/fdopendir.c @@ -1,5 +1,5 @@ /* provide a replacement fdopendir function - Copyright (C) 2004-2012 Free Software Foundation, Inc. + Copyright (C) 2004-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 diff --git a/lib/fdutimensat.c b/lib/fdutimensat.c index 51f0baa4..63c79e9e 100644 --- a/lib/fdutimensat.c +++ b/lib/fdutimensat.c @@ -1,6 +1,6 @@ /* Set file access and modification times. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/fflush.c b/lib/fflush.c index fa6f389f..8ac5dea3 100644 --- a/lib/fflush.c +++ b/lib/fflush.c @@ -1,5 +1,5 @@ /* fflush.c -- allow flushing input streams - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 @@ -36,7 +36,7 @@ #if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */ -static inline void +static void clear_ungetc_buffer_preserving_position (FILE *fp) { if (fp->_flags & _IO_IN_BACKUP) @@ -47,10 +47,10 @@ clear_ungetc_buffer_preserving_position (FILE *fp) #else /* Clear the stream's ungetc buffer. May modify the value of ftello (fp). */ -static inline void +static void clear_ungetc_buffer (FILE *fp) { -# if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */ +# if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ if (HASUB (fp)) { fp_->_p += fp_->_r; @@ -71,9 +71,11 @@ clear_ungetc_buffer (FILE *fp) #endif -#if (defined __sferror || defined __DragonFly__) && defined __SNPT /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */ +#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) -static inline int +# if (defined __sferror || defined __DragonFly__) && defined __SNPT /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ + +static int disable_seek_optimization (FILE *fp) { int saved_flags = fp_->_flags & (__SOPT | __SNPT); @@ -81,23 +83,23 @@ disable_seek_optimization (FILE *fp) return saved_flags; } -static inline void +static void restore_seek_optimization (FILE *fp, int saved_flags) { fp_->_flags = (fp_->_flags & ~(__SOPT | __SNPT)) | saved_flags; } -#endif +# else -static inline void +static void update_fpos_cache (FILE *fp _GL_UNUSED_PARAMETER, off_t pos _GL_UNUSED_PARAMETER) { -#if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */ -# if defined __CYGWIN__ +# if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ +# if defined __CYGWIN__ /* fp_->_offset is typed as an integer. */ fp_->_offset = pos; -# else +# else /* fp_->_offset is an fpos_t. */ /* Use a union, since on NetBSD, the compilation flags determine whether fpos_t is typedef'd to off_t or a struct containing a @@ -109,10 +111,12 @@ update_fpos_cache (FILE *fp _GL_UNUSED_PARAMETER, } u; u.o = pos; fp_->_offset = u.f; -# endif +# endif fp_->_flags |= __SOFF; -#endif +# endif } +# endif +#endif /* Flush all pending data on STREAM according to POSIX rules. Both output and seekable input streams are supported. */ @@ -191,7 +195,7 @@ rpl_fflush (FILE *stream) return result; } -# if (defined __sferror || defined __DragonFly__) && defined __SNPT /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */ +# if (defined __sferror || defined __DragonFly__) && defined __SNPT /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ { /* Disable seek optimization for the next fseeko call. This tells the diff --git a/lib/file-has-acl.c b/lib/file-has-acl.c index 6b17678a..2fedcc63 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-2012 Free Software Foundation, Inc. + Copyright (C) 2002-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 @@ -32,7 +32,7 @@ #if USE_ACL && HAVE_ACL_GET_FILE -# if HAVE_ACL_TYPE_EXTENDED /* MacOS X */ +# if HAVE_ACL_TYPE_EXTENDED /* Mac OS X */ /* ACL is an ACL, from a file, stored as type ACL_TYPE_EXTENDED. Return 1 if the given ACL is non-trivial. @@ -489,7 +489,7 @@ file_has_acl (char const *name, struct stat const *sb) # if HAVE_ACL_GET_FILE /* POSIX 1003.1e (draft 17 -- abandoned) specific version. */ - /* Linux, FreeBSD, MacOS X, IRIX, Tru64 */ + /* Linux, FreeBSD, Mac OS X, IRIX, Tru64 */ int ret; if (HAVE_ACL_EXTENDED_FILE) /* Linux */ @@ -499,10 +499,10 @@ file_has_acl (char const *name, struct stat const *sb) ACL_TYPE_DEFAULT. */ ret = acl_extended_file (name); } - else /* FreeBSD, MacOS X, IRIX, Tru64 */ + else /* FreeBSD, Mac OS X, IRIX, Tru64 */ { -# if HAVE_ACL_TYPE_EXTENDED /* MacOS X */ - /* On MacOS X, acl_get_file (name, ACL_TYPE_ACCESS) +# if 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. There is no point in making these two useless calls. The real ACL is retrieved through diff --git a/lib/file-set.c b/lib/file-set.c index dd12baf1..4103e67f 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-2012 Free Software Foundation, Inc. + Copyright (C) 2007, 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 diff --git a/lib/file-type.c b/lib/file-type.c index 32718c54..0d542692 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-2012 Free Software + Copyright (C) 1993-1994, 2001-2002, 2004-2006, 2009-2013 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/file-type.h b/lib/file-type.h index b5cef5b5..9c6ac264 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-2012 Free Software + Copyright (C) 1993-1994, 2001-2002, 2004-2005, 2009-2013 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 d9edae17..53c66803 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-2012 Free Software + Copyright (C) 1990, 1997-1999, 2004-2006, 2009-2013 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 ed8c6c98..9e8735a5 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-2012 Free + Copyright (C) 1985, 1990, 1993, 1998-2000, 2004, 2006, 2009-2013 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -78,7 +78,7 @@ ftypelet (mode_t bits) return 'C'; if (S_ISDOOR (bits)) return 'D'; - if (S_ISMPB (bits) || S_ISMPC (bits)) + if (S_ISMPB (bits) || S_ISMPC (bits) || S_ISMPX (bits)) return 'm'; if (S_ISNWK (bits)) return 'n'; diff --git a/lib/filemode.h b/lib/filemode.h index 9ebef478..a235cb0c 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-2012 Free Software Foundation, + Copyright (C) 1998-1999, 2003, 2006, 2009-2013 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -23,7 +23,7 @@ /* Get the declaration of strmode. */ # if HAVE_DECL_STRMODE -# include <string.h> /* MacOS X, FreeBSD, OpenBSD */ +# include <string.h> /* Mac OS X, FreeBSD, OpenBSD */ # include <unistd.h> /* NetBSD */ # endif diff --git a/lib/filename.h b/lib/filename.h index 7b89d0d0..b82a0ac3 100644 --- a/lib/filename.h +++ b/lib/filename.h @@ -1,5 +1,5 @@ /* Basic filename support macros. - Copyright (C) 2001-2004, 2007-2012 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 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 diff --git a/lib/filenamecat-lgpl.c b/lib/filenamecat-lgpl.c index c7c46172..60c4988b 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-2012 Free Software Foundation, Inc. + Copyright (C) 1996-2007, 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 diff --git a/lib/filenamecat.c b/lib/filenamecat.c index 001efb54..8809b571 100644 --- a/lib/filenamecat.c +++ b/lib/filenamecat.c @@ -1,6 +1,6 @@ /* Concatenate two arbitrary file names. - Copyright (C) 1996-2007, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 1996-2007, 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 diff --git a/lib/filenamecat.h b/lib/filenamecat.h index e7b2e306..1476e14c 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-2012 Free Software + Copyright (C) 1996-1997, 2003, 2005, 2007, 2009-2013 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 bc1cc07d..7dcff8f9 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-2012 Free Software Foundation, Inc. + 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 @@ -57,7 +57,7 @@ match_suffix (const char **str) } /* verrevcmp helper function */ -static inline int +static int order (unsigned char c) { if (c_isdigit (c)) diff --git a/lib/filevercmp.h b/lib/filevercmp.h index 59976149..34f73ab8 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-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/float+.h b/lib/float+.h index 75e56a12..32fb790b 100644 --- a/lib/float+.h +++ b/lib/float+.h @@ -1,5 +1,5 @@ /* Supplemental information about the floating-point formats. - Copyright (C) 2007, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2013 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 ea318665..366945fa 100644 --- a/lib/float.c +++ b/lib/float.c @@ -1,5 +1,5 @@ /* Auxiliary definitions for <float.h>. - Copyright (C) 2011-2012 Free Software Foundation, Inc. + Copyright (C) 2011-2013 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 b4205103..84e1950f 100644 --- a/lib/float.in.h +++ b/lib/float.in.h @@ -1,6 +1,6 @@ /* A correct <float.h>. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/lib/fnmatch.c b/lib/fnmatch.c index 842182bf..6a09e1a9 100644 --- a/lib/fnmatch.c +++ b/lib/fnmatch.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-1993, 1996-2007, 2009-2012 Free Software Foundation, Inc. +/* Copyright (C) 1991-1993, 1996-2007, 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 diff --git a/lib/fnmatch.in.h b/lib/fnmatch.in.h index b0a3c95b..d39ce2f1 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-2012 Free +/* Copyright (C) 1991-1993, 1996-1999, 2001-2003, 2005, 2007, 2009-2013 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 048079e1..f57cd63f 100644 --- a/lib/fnmatch_loop.c +++ b/lib/fnmatch_loop.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-1993, 1996-2006, 2009-2012 Free Software Foundation, Inc. +/* Copyright (C) 1991-1993, 1996-2006, 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 diff --git a/lib/fopen-safer.c b/lib/fopen-safer.c index 38b00933..917920d9 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-2012 Free Software Foundation, Inc. + Copyright (C) 2001, 2004-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 diff --git a/lib/fopen.c b/lib/fopen.c index c17c73f2..f9d6763d 100644 --- a/lib/fopen.c +++ b/lib/fopen.c @@ -1,5 +1,5 @@ /* Open a stream to a file. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 @@ -26,7 +26,7 @@ #include <stdio.h> #undef __need_FILE -static inline FILE * +static FILE * orig_fopen (const char *filename, const char *mode) { return fopen (filename, mode); diff --git a/lib/fpending.c b/lib/fpending.c index 2591d534..e917f4f1 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-2012 Free Software Foundation, + Copyright (C) 2000, 2004, 2006-2007, 2009-2013 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 5b5d71c0..bf40d373 100644 --- a/lib/fpending.h +++ b/lib/fpending.h @@ -1,6 +1,6 @@ /* Declare __fpending. - Copyright (C) 2000, 2003, 2005-2006, 2009-2012 Free Software Foundation, + Copyright (C) 2000, 2003, 2005-2006, 2009-2013 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -21,10 +21,6 @@ #include <stddef.h> #include <stdio.h> -#ifndef HAVE_DECL___FPENDING -"this configure-time declaration test was not run" -#endif - #if HAVE_DECL___FPENDING # if HAVE_STDIO_EXT_H # include <stdio_ext.h> diff --git a/lib/fprintftime.h b/lib/fprintftime.h index 75f7ebaa..56b7c4a1 100644 --- a/lib/fprintftime.h +++ b/lib/fprintftime.h @@ -1,6 +1,6 @@ /* Generate time strings directly to the output. */ -/* Copyright (C) 2005, 2009-2012 Free Software Foundation, Inc. +/* Copyright (C) 2005, 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 diff --git a/lib/fpucw.h b/lib/fpucw.h index 23e4c814..0b7f5284 100644 --- a/lib/fpucw.h +++ b/lib/fpucw.h @@ -1,5 +1,5 @@ /* Manipulating the FPU control word. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 2007-2013 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 24c28d84..e00187dd 100644 --- a/lib/fpurge.c +++ b/lib/fpurge.c @@ -1,5 +1,5 @@ /* Flushing buffers of a FILE stream. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 @@ -29,13 +29,13 @@ int fpurge (FILE *fp) { -#if HAVE___FPURGE /* glibc >= 2.2, Haiku, Solaris >= 7 */ +#if HAVE___FPURGE /* glibc >= 2.2, Haiku, Solaris >= 7, musl libc */ __fpurge (fp); /* The __fpurge function does not have a return value. */ return 0; -#elif HAVE_FPURGE /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin 1.7 */ +#elif HAVE_FPURGE /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin 1.7 */ /* Call the system's fpurge function. */ # undef fpurge @@ -43,7 +43,7 @@ fpurge (FILE *fp) extern int fpurge (FILE *); # endif int result = fpurge (fp); -# if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */ +# if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ if (result == 0) /* Correct the invariants that fpurge broke. <stdio.h> on BSD systems says: @@ -71,7 +71,7 @@ fpurge (FILE *fp) fp->_IO_save_base = NULL; } return 0; -# elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */ +# elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ fp_->_p = fp_->_bf._base; fp_->_r = 0; fp_->_w = ((fp_->_flags & (__SLBF | __SNBF | __SRD)) == 0 /* fully buffered and not currently reading? */ diff --git a/lib/freadahead.c b/lib/freadahead.c index 2ba8b344..f2dae46b 100644 --- a/lib/freadahead.c +++ b/lib/freadahead.c @@ -1,5 +1,5 @@ /* Retrieve information about a FILE stream. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 @@ -31,7 +31,7 @@ freadahead (FILE *fp) return (fp->_IO_read_end - fp->_IO_read_ptr) + (fp->_flags & _IO_IN_BACKUP ? fp->_IO_save_end - fp->_IO_save_base : 0); -#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */ +#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ if ((fp_->_flags & __SWR) != 0 || fp_->_r < 0) return 0; # if defined __DragonFly__ diff --git a/lib/freadahead.h b/lib/freadahead.h index d8746024..c691f89c 100644 --- a/lib/freadahead.h +++ b/lib/freadahead.h @@ -1,5 +1,5 @@ /* Retrieve information about a FILE stream. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 @@ -17,10 +17,6 @@ #include <stddef.h> #include <stdio.h> -#ifdef __cplusplus -extern "C" { -#endif - /* Assuming the stream STREAM is open for reading: Return the number of bytes waiting in the input buffer of STREAM. This includes both the bytes that have been read from the underlying input @@ -31,8 +27,21 @@ extern "C" { STREAM must not be wide-character oriented. */ +#if HAVE___FREADAHEAD /* musl libc */ + +# include <stdio_ext.h> +# define freadahead(stream) __freadahead (stream) + +#else + +# ifdef __cplusplus +extern "C" { +# endif + extern size_t freadahead (FILE *stream) _GL_ATTRIBUTE_PURE; -#ifdef __cplusplus +# ifdef __cplusplus } +# endif + #endif diff --git a/lib/freading.c b/lib/freading.c index e235e949..8012a7a3 100644 --- a/lib/freading.c +++ b/lib/freading.c @@ -1,5 +1,5 @@ /* Retrieve information about a FILE stream. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 @@ -35,7 +35,7 @@ freading (FILE *fp) return ((fp->_flags & _IO_NO_WRITES) != 0 || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0 && fp->_IO_read_base != NULL)); -# elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */ +# elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ return (fp_->_flags & __SRD) != 0; # elif defined __EMX__ /* emx+gcc */ return (fp->_flags & _IOREAD) != 0; diff --git a/lib/freading.h b/lib/freading.h index 9668d202..88ea789e 100644 --- a/lib/freading.h +++ b/lib/freading.h @@ -1,5 +1,5 @@ /* Retrieve information about a FILE stream. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 @@ -33,7 +33,7 @@ STREAM must not be wide-character oriented. */ #if HAVE___FREADING && (!defined __GLIBC__ || defined __UCLIBC__ || __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) -/* Solaris >= 7, not glibc >= 2.2, but glibc >= 2.7 */ +/* Solaris >= 7, not glibc >= 2.2, but glibc >= 2.7, or musl libc */ # include <stdio_ext.h> # define freading(stream) (__freading (stream) != 0) diff --git a/lib/freadptr.c b/lib/freadptr.c index 27c2285a..9f11f965 100644 --- a/lib/freadptr.c +++ b/lib/freadptr.c @@ -1,5 +1,5 @@ /* Retrieve information about a FILE stream. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 @@ -37,7 +37,7 @@ freadptr (FILE *fp, size_t *sizep) return NULL; *sizep = size; return (const char *) fp->_IO_read_ptr; -#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */ +#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ if ((fp_->_flags & __SWR) != 0 || fp_->_r < 0) return NULL; size = fp_->_r; diff --git a/lib/freadptr.h b/lib/freadptr.h index 464bedb7..785ec99b 100644 --- a/lib/freadptr.h +++ b/lib/freadptr.h @@ -1,5 +1,5 @@ /* Retrieve information about a FILE stream. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 @@ -17,10 +17,6 @@ #include <stddef.h> #include <stdio.h> -#ifdef __cplusplus -extern "C" { -#endif - /* Assuming the stream STREAM is open for reading: Return a pointer to the input buffer of STREAM, or NULL. If the returned pointer is non-NULL, *SIZEP is set to the (positive) size @@ -32,8 +28,21 @@ extern "C" { STREAM must not be wide-character oriented. */ +#if HAVE___FREADPTR /* musl libc */ + +# include <stdio_ext.h> +# define freadptr(stream,sizep) __freadptr (stream, sizep) + +#else + +# ifdef __cplusplus +extern "C" { +# endif + extern const char * freadptr (FILE *stream, size_t *sizep); -#ifdef __cplusplus +# ifdef __cplusplus } +# endif + #endif diff --git a/lib/freadseek.c b/lib/freadseek.c index 4145173e..ea28d878 100644 --- a/lib/freadseek.c +++ b/lib/freadseek.c @@ -1,5 +1,5 @@ /* Skipping input from a FILE stream. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 @@ -30,13 +30,15 @@ /* Increment the in-memory pointer. INCREMENT must be at most the buffer size returned by freadptr(). This is very cheap (no system calls). */ -static inline void +static void freadptrinc (FILE *fp, size_t increment) { /* Keep this code in sync with freadptr! */ -#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ +#if HAVE___FREADPTRINC /* musl libc */ + __freadptrinc (fp, increment); +#elif defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ fp->_IO_read_ptr += increment; -#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */ +#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ fp_->_p += increment; fp_->_r -= increment; #elif defined __EMX__ /* emx+gcc */ diff --git a/lib/freadseek.h b/lib/freadseek.h index f42f6f9b..8e6a5a38 100644 --- a/lib/freadseek.h +++ b/lib/freadseek.h @@ -1,5 +1,5 @@ /* Skipping input from a FILE stream. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/lib/freopen-safer.c b/lib/freopen-safer.c index 00e57ef6..9fe403bd 100644 --- a/lib/freopen-safer.c +++ b/lib/freopen-safer.c @@ -1,6 +1,6 @@ /* Invoke freopen, but avoid some glitches. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/freopen.c b/lib/freopen.c index c31e30c7..b5812611 100644 --- a/lib/freopen.c +++ b/lib/freopen.c @@ -1,5 +1,5 @@ /* Open a stream to a file. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 @@ -26,7 +26,7 @@ #include <stdio.h> #undef __need_FILE -static inline FILE * +static FILE * orig_freopen (const char *filename, const char *mode, FILE *stream) { return freopen (filename, mode, stream); diff --git a/lib/frexp.c b/lib/frexp.c index 4f5d0c03..d847fa38 100644 --- a/lib/frexp.c +++ b/lib/frexp.c @@ -1,5 +1,5 @@ /* Split a double into fraction and mantissa. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/lib/frexpl.c b/lib/frexpl.c index b74ceeb5..5ec2780e 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-2012 Free Software Foundation, Inc. + Copyright (C) 2007, 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 diff --git a/lib/fseek.c b/lib/fseek.c index 20f5e2c9..4708287c 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-2012 Free Software Foundation, Inc. + Copyright (C) 2007, 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 diff --git a/lib/fseeko.c b/lib/fseeko.c index c372a5c1..42cd6428 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 @@ -51,7 +51,7 @@ fseeko (FILE *fp, off_t offset, int whence) if (fp->_IO_read_end == fp->_IO_read_ptr && fp->_IO_write_ptr == fp->_IO_write_base && fp->_IO_save_base == NULL) -#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */ +#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ # if defined __SL64 && defined __SCLE /* Cygwin */ if ((fp->_flags & __SL64) == 0) { @@ -109,7 +109,7 @@ fseeko (FILE *fp, off_t offset, int whence) off_t pos = lseek (fileno (fp), offset, whence); if (pos == -1) { -#if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */ +#if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ fp_->_flags &= ~__SOFF; #endif return -1; @@ -118,7 +118,7 @@ fseeko (FILE *fp, off_t offset, int whence) #if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ fp->_flags &= ~_IO_EOF_SEEN; fp->_offset = pos; -#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */ +#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ # if defined __CYGWIN__ /* fp_->_offset is typed as an integer. */ fp_->_offset = pos; diff --git a/lib/fseterr.c b/lib/fseterr.c index 78791af3..0fca65f5 100644 --- a/lib/fseterr.c +++ b/lib/fseterr.c @@ -1,5 +1,5 @@ /* Set the error indicator of a stream. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 @@ -31,7 +31,7 @@ fseterr (FILE *fp) fast macros. */ #if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ fp->_flags |= _IO_ERR_SEEN; -#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */ +#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ fp_->_flags |= __SERR; #elif defined __EMX__ /* emx+gcc */ fp->_flags |= _IOERR; diff --git a/lib/fseterr.h b/lib/fseterr.h index b3930c5a..630fa864 100644 --- a/lib/fseterr.h +++ b/lib/fseterr.h @@ -1,5 +1,5 @@ /* Set the error indicator of a stream. - Copyright (C) 2007, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 2007, 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 @@ -19,19 +19,27 @@ #include <stdio.h> -#ifdef __cplusplus -extern "C" { -#endif - - /* Set the error indicator of the stream FP. The "error indicator" is set when an I/O operation on the stream fails, and is cleared (together with the "end-of-file" indicator) by clearerr (FP). */ -extern void fseterr (FILE *fp); +#if HAVE___FSETERR /* musl libc */ + +# include <stdio_ext.h> +# define fseterr(fp) __fseterr (fp) -#ifdef __cplusplus +#else + +# ifdef __cplusplus +extern "C" { +# endif + +extern void fseterr (FILE *fp); + +# ifdef __cplusplus } +# endif + #endif #endif /* _FSETERR_H */ diff --git a/lib/fstat.c b/lib/fstat.c index ac2b1eff..dc802f50 100644 --- a/lib/fstat.c +++ b/lib/fstat.c @@ -1,5 +1,5 @@ /* fstat() replacement. - Copyright (C) 2011-2012 Free Software Foundation, Inc. + 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 @@ -24,12 +24,14 @@ #include <sys/types.h> #include <sys/stat.h> #if _GL_WINDOWS_64_BIT_ST_SIZE +# undef stat /* avoid warning on mingw64 with _FILE_OFFSET_BITS=64 */ # define stat _stati64 +# undef fstat /* avoid warning on mingw64 with _FILE_OFFSET_BITS=64 */ # define fstat _fstati64 #endif #undef __need_system_sys_stat_h -static inline int +static int orig_fstat (int fd, struct stat *buf) { return fstat (fd, buf); @@ -49,7 +51,7 @@ orig_fstat (int fd, struct stat *buf) #endif #if HAVE_MSVC_INVALID_PARAMETER_HANDLER -static inline int +static int fstat_nothrow (int fd, struct stat *buf) { int result; diff --git a/lib/fstatat.c b/lib/fstatat.c index 9b701c4d..845c171f 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 @@ -29,7 +29,7 @@ #undef __need_system_sys_stat_h #if HAVE_FSTATAT -static inline int +static int orig_fstatat (int fd, char const *filename, struct stat *buf, int flags) { return fstatat (fd, filename, buf, flags); @@ -97,7 +97,7 @@ rpl_fstatat (int fd, char const *file, struct stat *st, int flag) because the preprocessor sees a use of a macro that requires two arguments but is only given one. Hence, we need an inline forwarder to get past the preprocessor. */ -static inline int +static int stat_func (char const *name, struct stat *st) { return stat (name, st); diff --git a/lib/fsusage.c b/lib/fsusage.c index 099b0aab..0657555f 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-2012 Free Software + Copyright (C) 1991-1992, 1996, 1998-1999, 2002-2006, 2009-2013 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -31,15 +31,15 @@ # include <fcntl.h> # include <unistd.h> # include <sys/stat.h> -# if HAVE_SYS_PARAM_H -# include <sys/param.h> -# endif -# if HAVE_SYS_MOUNT_H -# include <sys/mount.h> -# endif -# if HAVE_SYS_VFS_H -# include <sys/vfs.h> -# endif +#if HAVE_SYS_PARAM_H +# include <sys/param.h> +#endif +#if HAVE_SYS_MOUNT_H +# include <sys/mount.h> +#endif +#if HAVE_SYS_VFS_H +# include <sys/vfs.h> +#endif # if HAVE_SYS_FS_S5PARAM_H /* Fujitsu UXP/V */ # include <sys/fs/s5param.h> # endif @@ -84,6 +84,35 @@ otherwise, use PROPAGATE_ALL_ONES. */ #define PROPAGATE_TOP_BIT(x) ((x) | ~ (EXTRACT_TOP_BIT (x) - 1)) +#ifdef STAT_STATVFS +/* Return true if statvfs works. This is false for statvfs on systems + with GNU libc on Linux kernels before 2.6.36, which stats all + preceding entries in /proc/mounts; that makes df hang if even one + of the corresponding file systems is hard-mounted but not available. */ +# if ! (__linux__ && (__GLIBC__ || __UCLIBC__)) +/* The FRSIZE fallback is not required in this case. */ +# undef STAT_STATFS2_FRSIZE +static int statvfs_works (void) { return 1; } +# else +# include <string.h> /* for strverscmp */ +# include <sys/utsname.h> +# include <sys/statfs.h> +# define STAT_STATFS2_BSIZE 1 + +static int +statvfs_works (void) +{ + static int statvfs_works_cache = -1; + struct utsname name; + if (statvfs_works_cache < 0) + statvfs_works_cache = (uname (&name) == 0 + && 0 <= strverscmp (name.release, "2.6.36")); + return statvfs_works_cache; +} +# endif +#endif + + /* Fill in the fields of FSP with information about space usage for the file system on which FILE resides. DISK is the device on which FILE is mounted, for space-getting @@ -94,19 +123,32 @@ int get_fs_usage (char const *file, char const *disk, struct fs_usage *fsp) { -#if defined STAT_STATVFS /* POSIX, except glibc/Linux */ - - struct statvfs fsd; +#ifdef STAT_STATVFS /* POSIX, except pre-2.6.36 glibc/Linux */ - if (statvfs (file, &fsd) < 0) - return -1; + if (statvfs_works ()) + { + struct statvfs vfsd; + + if (statvfs (file, &vfsd) < 0) + return -1; + + /* f_frsize isn't guaranteed to be supported. */ + fsp->fsu_blocksize = (vfsd.f_frsize + ? PROPAGATE_ALL_ONES (vfsd.f_frsize) + : PROPAGATE_ALL_ONES (vfsd.f_bsize)); + + fsp->fsu_blocks = PROPAGATE_ALL_ONES (vfsd.f_blocks); + fsp->fsu_bfree = PROPAGATE_ALL_ONES (vfsd.f_bfree); + fsp->fsu_bavail = PROPAGATE_TOP_BIT (vfsd.f_bavail); + fsp->fsu_bavail_top_bit_set = EXTRACT_TOP_BIT (vfsd.f_bavail) != 0; + fsp->fsu_files = PROPAGATE_ALL_ONES (vfsd.f_files); + fsp->fsu_ffree = PROPAGATE_ALL_ONES (vfsd.f_ffree); + return 0; + } - /* f_frsize isn't guaranteed to be supported. */ - fsp->fsu_blocksize = (fsd.f_frsize - ? PROPAGATE_ALL_ONES (fsd.f_frsize) - : PROPAGATE_ALL_ONES (fsd.f_bsize)); +#endif -#elif defined STAT_STATVFS64 /* AIX */ +#if defined STAT_STATVFS64 /* AIX */ struct statvfs64 fsd; @@ -177,8 +219,17 @@ get_fs_usage (char const *file, char const *disk, struct fs_usage *fsp) fsp->fsu_blocksize = PROPAGATE_ALL_ONES (fsd.f_fsize); -#elif defined STAT_STATFS2_BSIZE /* glibc/Linux, 4.3BSD, SunOS 4, \ - MacOS X < 10.4, FreeBSD < 5.0, \ +#elif defined STAT_STATFS2_FRSIZE /* 2.6 < glibc/Linux < 2.6.36 */ + + struct statfs fsd; + + if (statfs (file, &fsd) < 0) + return -1; + + fsp->fsu_blocksize = PROPAGATE_ALL_ONES (fsd.f_frsize); + +#elif defined STAT_STATFS2_BSIZE /* glibc/Linux < 2.6, 4.3BSD, SunOS 4, \ + Mac OS X < 10.4, FreeBSD < 5.0, \ NetBSD < 3.0, OpenBSD < 4.4 */ struct statfs fsd; @@ -235,8 +286,9 @@ get_fs_usage (char const *file, char const *disk, struct fs_usage *fsp) #endif -#if (defined STAT_STATVFS || defined STAT_STATVFS64 \ - || (!defined STAT_STATFS2_FS_DATA && !defined STAT_READ_FILSYS)) +#if (defined STAT_STATVFS64 || defined STAT_STATFS3_OSF1 \ + || defined STAT_STATFS2_FRSIZE || defined STAT_STATFS2_BSIZE \ + || defined STAT_STATFS2_FSIZE || defined STAT_STATFS4) fsp->fsu_blocks = PROPAGATE_ALL_ONES (fsd.f_blocks); fsp->fsu_bfree = PROPAGATE_ALL_ONES (fsd.f_bfree); diff --git a/lib/fsusage.h b/lib/fsusage.h index 17eaa07f..7810fc01 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-2012 Free Software + Copyright (C) 1991-1992, 1997, 2003-2006, 2009-2013 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 0ee55add..8a1a9750 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-2012 Free Software Foundation, Inc. + Copyright (C) 2008-2013 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 817e9ff0..4ad13c9f 100644 --- a/lib/ftell.c +++ b/lib/ftell.c @@ -1,5 +1,5 @@ /* An ftell() function that works around platform bugs. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/lib/ftello.c b/lib/ftello.c index 1f581c5a..3a2a0f20 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-2012 Free Software Foundation, Inc. + Copyright (C) 2007, 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 diff --git a/lib/ftoastr.c b/lib/ftoastr.c index ebeed3e1..518074f8 100644 --- a/lib/ftoastr.c +++ b/lib/ftoastr.c @@ -1,6 +1,6 @@ /* floating point to accurate string - Copyright (C) 2010-2012 Free Software Foundation, Inc. + Copyright (C) 2010-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 diff --git a/lib/ftoastr.h b/lib/ftoastr.h index 89869a22..5aa0930d 100644 --- a/lib/ftoastr.h +++ b/lib/ftoastr.h @@ -1,6 +1,6 @@ /* floating point to accurate string - Copyright (C) 2010-2012 Free Software Foundation, Inc. + Copyright (C) 2010-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 diff --git a/lib/ftruncate.c b/lib/ftruncate.c index e243adda..db7f7ddf 100644 --- a/lib/ftruncate.c +++ b/lib/ftruncate.c @@ -1,5 +1,5 @@ /* ftruncate emulations for native Windows. - Copyright (C) 1992-2012 Free Software Foundation, Inc. + Copyright (C) 1992-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 @@ -157,7 +157,7 @@ ftruncate (int fd, off_t length) # if HAVE_MSVC_INVALID_PARAMETER_HANDLER # include "msvc-inval.h" -static inline int +static int chsize_nothrow (int fd, long length) { int result; diff --git a/lib/fts-cycle.c b/lib/fts-cycle.c index bdb090fa..b07266a7 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-2012 Free Software Foundation, Inc. + Copyright (C) 2003-2006, 2009-2013 Free Software Foundation, Inc. Written by Jim Meyering. diff --git a/lib/fts.c b/lib/fts.c index 42c80677..74968b36 100644 --- a/lib/fts.c +++ b/lib/fts.c @@ -1,6 +1,6 @@ /* Traverse a file hierarchy. - Copyright (C) 2004-2012 Free Software Foundation, Inc. + Copyright (C) 2004-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 @@ -290,7 +290,7 @@ fts_set_stat_required (FTSENT *p, bool required) /* file-descriptor-relative opendir. */ /* FIXME: if others need this function, move it into lib/openat.c */ -static inline DIR * +static DIR * internal_function opendirat (int fd, char const *dir, int extra_flags, int *pdir_fd) { @@ -360,7 +360,7 @@ restore_initial_cwd (FTS *sp) descriptor. Return -1 and set errno on failure. It doesn't matter whether the file descriptor has read or write access. */ -static inline int +static int internal_function diropen (FTS const *sp, char const *dir) { @@ -487,6 +487,17 @@ fts_open (char * const *argv, for (root = NULL, nitems = 0; *argv != NULL; ++argv, ++nitems) { /* *Do* allow zero-length file names. */ size_t len = strlen(*argv); + + if ( ! (options & FTS_VERBATIM)) + { + /* If there are two or more trailing slashes, trim all but one, + but don't change "//" to "/", and do map "///" to "/". */ + char const *v = *argv; + if (2 < len && v[len - 1] == '/') + while (1 < len && v[len - 2] == '/') + --len; + } + if ((p = fts_alloc(sp, *argv, len)) == NULL) goto mem3; p->fts_level = FTS_ROOTLEVEL; @@ -1894,7 +1905,7 @@ fts_alloc (FTS *sp, const char *name, register size_t namelen) return (NULL); /* Copy the name and guarantee NUL termination. */ - memmove(p->fts_name, name, namelen); + memcpy(p->fts_name, name, namelen); p->fts_name[namelen] = '\0'; p->fts_namelen = namelen; diff --git a/lib/fts_.h b/lib/fts_.h index 52940397..e217c73f 100644 --- a/lib/fts_.h +++ b/lib/fts_.h @@ -1,6 +1,6 @@ /* Traverse a file hierarchy. - Copyright (C) 2004-2012 Free Software Foundation, Inc. + Copyright (C) 2004-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 @@ -145,10 +145,14 @@ typedef struct { # define FTS_NOATIME 0x0800 /* use O_NOATIME during traversal */ -# define FTS_OPTIONMASK 0x0fff /* valid user option mask */ + /* Use this flag to disable stripping of trailing slashes + from input path names during fts_open initialization. */ +# define FTS_VERBATIM 0x1000 -# define FTS_NAMEONLY 0x1000 /* (private) child names only */ -# define FTS_STOP 0x2000 /* (private) unrecoverable error */ +# define FTS_OPTIONMASK 0x1fff /* valid user option mask */ + +# define FTS_NAMEONLY 0x2000 /* (private) child names only */ +# define FTS_STOP 0x4000 /* (private) unrecoverable error */ int fts_options; /* fts_open options, global flags */ /* Map a directory's device number to a boolean. The boolean is diff --git a/lib/full-read.c b/lib/full-read.c index 9cc18d59..a0dc82c2 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-2012 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 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 diff --git a/lib/full-read.h b/lib/full-read.h index 76d0ff97..66c8c5c1 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-2012 Free Software Foundation, Inc. + Copyright (C) 2002, 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 diff --git a/lib/full-write.c b/lib/full-write.c index 78dafd25..beb5bf95 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-2012 Free Software Foundation, Inc. + Copyright (C) 1993-1994, 1997-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 diff --git a/lib/full-write.h b/lib/full-write.h index 893dd49c..67462b14 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-2012 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 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 diff --git a/lib/futimens.c b/lib/futimens.c index e3b2302e..4ea05f70 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-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/gai_strerror.c b/lib/gai_strerror.c index 5bb1c045..1e371d27 100644 --- a/lib/gai_strerror.c +++ b/lib/gai_strerror.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 2001-2002, 2004-2006, 2008-2012 Free Software +/* Copyright (C) 1997, 2001-2002, 2004-2006, 2008-2013 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 069f2a95..4d4d4c55 100644 --- a/lib/getaddrinfo.c +++ b/lib/getaddrinfo.c @@ -1,5 +1,5 @@ /* Get address information (partial implementation). - Copyright (C) 1997, 2001-2002, 2004-2012 Free Software Foundation, Inc. + Copyright (C) 1997, 2001-2002, 2004-2013 Free Software Foundation, Inc. Contributed by Simon Josefsson <simon@josefsson.org>. This program is free software; you can redistribute it and/or modify @@ -109,7 +109,7 @@ use_win32_p (void) } #endif -static inline bool +static bool validate_family (int family) { /* FIXME: Support more families. */ diff --git a/lib/getcwd-lgpl.c b/lib/getcwd-lgpl.c index f1e821b6..d550f35c 100644 --- a/lib/getcwd-lgpl.c +++ b/lib/getcwd-lgpl.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2011-2012 Free Software Foundation, Inc. +/* Copyright (C) 2011-2013 Free Software Foundation, Inc. This file is part of gnulib. This program is free software: you can redistribute it and/or modify diff --git a/lib/getcwd.c b/lib/getcwd.c index 6b4894cb..4b781389 100644 --- a/lib/getcwd.c +++ b/lib/getcwd.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-1999, 2004-2012 Free Software Foundation, Inc. +/* Copyright (C) 1991-1999, 2004-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 @@ -28,9 +28,9 @@ #include <fcntl.h> /* For AT_FDCWD on Solaris 9. */ /* If this host provides the openat function or if we're using the - gnulib replacement function, then enable code below to make getcwd - more efficient and robust. */ -#if defined HAVE_OPENAT || defined GNULIB_OPENAT + gnulib replacement function with a native fdopendir, then enable + code below to make getcwd more efficient and robust. */ +#if defined HAVE_OPENAT || (defined GNULIB_OPENAT && defined HAVE_FDOPENDIR) # define HAVE_OPENAT_SUPPORT 1 #else # define HAVE_OPENAT_SUPPORT 0 diff --git a/lib/getdelim.c b/lib/getdelim.c index b7af0a2e..966bf764 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-2012 Free Software + Copyright (C) 1994, 1996-1998, 2001, 2003, 2005-2013 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or diff --git a/lib/getdtablesize.c b/lib/getdtablesize.c index 70ba0751..9947405a 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-2012 Free Software Foundation, Inc. + Copyright (C) 2008-2013 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2008. This program is free software: you can redistribute it and/or modify @@ -27,7 +27,7 @@ #include "msvc-inval.h" #if HAVE_MSVC_INVALID_PARAMETER_HANDLER -static inline int +static int _setmaxstdio_nothrow (int newmax) { int result; diff --git a/lib/getfilecon.c b/lib/getfilecon.c index bc8288f5..29e16ec9 100644 --- a/lib/getfilecon.c +++ b/lib/getfilecon.c @@ -1,5 +1,5 @@ /* wrap getfilecon, lgetfilecon, and fgetfilecon - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 @@ -45,7 +45,7 @@ int fgetfilecon (int fd, security_context_t *con); "unlabeled" context. Map both failures to a return value of -1, and set errno to ENOTSUP in the first case, and ENODATA in the latter. */ -static inline int +static int map_to_failure (int ret, security_context_t *con) { if (ret == 0) diff --git a/lib/getgroups.c b/lib/getgroups.c index f9d36236..9856adc1 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-2012 Free Software Foundation, Inc. + Copyright (C) 1996, 1999, 2003, 2006-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 diff --git a/lib/gethostname.c b/lib/gethostname.c index b96a4621..22015732 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-2012 Free Software Foundation, Inc. + Copyright (C) 1992, 2003, 2006, 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 diff --git a/lib/gethrxtime.c b/lib/gethrxtime.c index 6e0263d6..10d2ab98 100644 --- a/lib/gethrxtime.c +++ b/lib/gethrxtime.c @@ -1,6 +1,6 @@ /* gethrxtime -- get high resolution real time - Copyright (C) 2005-2007, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 2005-2007, 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 @@ -19,8 +19,11 @@ #include <config.h> +#define GETHRXTIME_INLINE _GL_EXTERN_INLINE #include "gethrxtime.h" +#if ! (HAVE_ARITHMETIC_HRTIME_T && HAVE_DECL_GETHRTIME) + #include <sys/time.h> #include "timespec.h" @@ -32,30 +35,30 @@ xtime_t gethrxtime (void) { -#if HAVE_NANOUPTIME +# if HAVE_NANOUPTIME { struct timespec ts; nanouptime (&ts); return xtime_make (ts.tv_sec, ts.tv_nsec); } -#else +# else -# if defined CLOCK_MONOTONIC && HAVE_CLOCK_GETTIME +# if defined CLOCK_MONOTONIC && HAVE_CLOCK_GETTIME { struct timespec ts; if (clock_gettime (CLOCK_MONOTONIC, &ts) == 0) return xtime_make (ts.tv_sec, ts.tv_nsec); } -# endif +# endif -# if HAVE_MICROUPTIME +# if HAVE_MICROUPTIME { struct timeval tv; microuptime (&tv); return xtime_make (tv.tv_sec, 1000 * tv.tv_usec); } -# else +# else /* No monotonically increasing clocks are available; fall back on a clock that might jump backwards, since it's the best we can do. */ { @@ -63,6 +66,8 @@ gethrxtime (void) gettime (&ts); return xtime_make (ts.tv_sec, ts.tv_nsec); } +# endif # endif -#endif } + +#endif diff --git a/lib/gethrxtime.h b/lib/gethrxtime.h index f09ef39c..10df6712 100644 --- a/lib/gethrxtime.h +++ b/lib/gethrxtime.h @@ -1,6 +1,6 @@ /* gethrxtime -- get high resolution real time - Copyright (C) 2005, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 2005, 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 @@ -18,20 +18,35 @@ /* Written by Paul Eggert. */ #ifndef GETHRXTIME_H_ -# define GETHRXTIME_H_ 1 +#define GETHRXTIME_H_ 1 -# include "xtime.h" +#include "xtime.h" + +_GL_INLINE_HEADER_BEGIN +#ifndef GETHRXTIME_INLINE +# define GETHRXTIME_INLINE _GL_INLINE +#endif + +#ifdef __cplusplus +extern "C" { +#endif /* Get the current time, as a count of the number of nanoseconds since an arbitrary epoch (e.g., the system boot time). Prefer a high-resolution clock that is not subject to resetting or drifting. */ -# if HAVE_ARITHMETIC_HRTIME_T && HAVE_DECL_GETHRTIME -# include <time.h> -static inline xtime_t gethrxtime (void) { return gethrtime (); } +#if HAVE_ARITHMETIC_HRTIME_T && HAVE_DECL_GETHRTIME +# include <time.h> +GETHRXTIME_INLINE xtime_t gethrxtime (void) { return gethrtime (); } # else xtime_t gethrxtime (void); -# endif +#endif + +_GL_INLINE_HEADER_END + +#ifdef __cplusplus +} +#endif #endif diff --git a/lib/getline.c b/lib/getline.c index f4227478..1aa07b9c 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-2012 Free Software Foundation, Inc. + Copyright (C) 2005-2007, 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 diff --git a/lib/getloadavg.c b/lib/getloadavg.c index d79ad136..6e228191 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-2012 Free Software + Copyright (C) 1985-1989, 1991-1995, 1997, 1999-2000, 2003-2013 Free Software Foundation, Inc. NOTE: The canonical source of this file is maintained with gnulib. @@ -28,7 +28,7 @@ macro that comes with autoconf 2.13 or newer. If that isn't an option, then just put AC_CHECK_FUNCS(pstat_getdynamic) in your - configure.in file. + configure.ac file. HAVE_LIBPERFSTAT Define this if your system has the perfstat_cpu_total function in libperfstat (AIX). FIXUP_KERNEL_SYMBOL_ADDR() Adjust address in returned struct nlist. @@ -80,45 +80,23 @@ We also #define LDAV_PRIVILEGED if a program will require special installation to be able to call getloadavg. */ -/* "configure" defines CONFIGURING_GETLOADAVG to sidestep problems - with partially-configured source directories. */ - -#ifndef CONFIGURING_GETLOADAVG -# include <config.h> -# include <stdbool.h> -#endif +#include <config.h> /* Specification. */ #include <stdlib.h> #include <errno.h> +#include <stdbool.h> #include <stdio.h> # include <sys/types.h> -/* Both the Emacs and non-Emacs sections want this. Some - configuration files' definitions for the LOAD_AVE_CVT macro (like - sparc.h's) use macros like FSCALE, defined here. */ -# if defined (unix) || defined (__unix) +# if HAVE_SYS_PARAM_H # include <sys/param.h> # endif # include "intprops.h" -/* The existing Emacs configuration files define a macro called - LOAD_AVE_CVT, which accepts a value of type LOAD_AVE_TYPE, and - returns the load average multiplied by 100. What we actually want - is a macro called LDAV_CVT, which returns the load average as an - unmultiplied double. - - For backwards compatibility, we'll define LDAV_CVT in terms of - LOAD_AVE_CVT, but future machine config files should just define - LDAV_CVT directly. */ - -# if !defined (LDAV_CVT) && defined (LOAD_AVE_CVT) -# define LDAV_CVT(n) (LOAD_AVE_CVT (n) / 100.0) -# endif - # if !defined (BSD) && defined (ultrix) /* Ultrix behaves like BSD on Vaxen. */ # define BSD diff --git a/lib/getlogin.c b/lib/getlogin.c index 3f17ff97..c02b0b9c 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-2012 Free Software Foundation, Inc. + Copyright (C) 2010-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 diff --git a/lib/getndelim2.c b/lib/getndelim2.c index a306a2f6..a5e8a666 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-2012 Free + Copyright (C) 1993, 1996-1998, 2000, 2003-2004, 2006, 2008-2013 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 b60a6c5a..774fc90c 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-2012 Free Software Foundation, Inc. + Copyright (C) 2003-2004, 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 diff --git a/lib/getopt.c b/lib/getopt.c index 4342a341..ef0f4cee 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-2012 Free Software + Copyright (C) 1987-1996, 1998-2004, 2006, 2008-2013 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 06b6dfc5..d9c7d814 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-2012 Free Software + Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2007, 2009-2013 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -49,7 +49,9 @@ linkers. */ #if defined __GETOPT_PREFIX && !defined __need_getopt # if !@HAVE_GETOPT_H@ +# define __need_system_stdlib_h # include <stdlib.h> +# undef __need_system_stdlib_h # include <stdio.h> # include <unistd.h> # endif diff --git a/lib/getopt1.c b/lib/getopt1.c index fb2a8f5a..55a6b4ea 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-2012 Free Software + Copyright (C) 1987-1994, 1996-1998, 2004, 2006, 2009-2013 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 2da020c9..a6e4b9ea 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-2012 Free Software + Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2004, 2009-2013 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/lib/getpagesize.c b/lib/getpagesize.c index 02c00fbe..274c591a 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-2012 Free Software Foundation, Inc. + Copyright (C) 2007, 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 diff --git a/lib/getpass.c b/lib/getpass.c index 41f3669c..3c9c4d8a 100644 --- a/lib/getpass.c +++ b/lib/getpass.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992-2001, 2003-2007, 2009-2012 Free Software Foundation, Inc. +/* Copyright (C) 1992-2001, 2003-2007, 2009-2013 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/lib/getpass.h b/lib/getpass.h index 4eabf9dc..9b59abb1 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-2012 Free Software Foundation, Inc. + Copyright (C) 2004, 2009-2013 Free Software Foundation, Inc. Contributed by Simon Josefsson <jas@extundo.com>, 2004. This program is free software; you can redistribute it and/or modify @@ -21,7 +21,7 @@ /* Get getpass declaration, if available. */ # include <unistd.h> -# if defined HAVE_DECL_GETPASS && !HAVE_DECL_GETPASS +# if !HAVE_DECL_GETPASS /* Read a password of arbitrary length from /dev/tty or stdin. */ char *getpass (const char *prompt); diff --git a/lib/gettext.h b/lib/gettext.h index 75875cdb..d0215715 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-2012 Free Software + Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2013 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -183,9 +183,12 @@ npgettext_aux (const char *domain, #include <string.h> -#define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS \ - (((__GNUC__ >= 3 || __GNUG__ >= 2) && !defined __STRICT_ANSI__) \ - /* || __STDC_VERSION__ >= 199901L */ ) +#if (((__GNUC__ >= 3 || __GNUG__ >= 2) && !defined __STRICT_ANSI__) \ + /* || __STDC_VERSION__ >= 199901L */ ) +# define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 1 +#else +# define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 0 +#endif #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS #include <stdlib.h> diff --git a/lib/gettime.c b/lib/gettime.c index 8075bfaf..0a642dd2 100644 --- a/lib/gettime.c +++ b/lib/gettime.c @@ -1,6 +1,6 @@ /* gettime -- get the system clock - Copyright (C) 2002, 2004-2007, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 2002, 2004-2007, 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 diff --git a/lib/gettimeofday.c b/lib/gettimeofday.c index 5d350609..ad65c6da 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-2012 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2005-2007, 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 diff --git a/lib/getugroups.c b/lib/getugroups.c index 99cdf231..725f0246 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-2012 Free Software Foundation, Inc. + Copyright (C) 1990-1991, 1998-2000, 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 diff --git a/lib/getugroups.h b/lib/getugroups.h index 0f4abfcb..90cc55fe 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-2012 Free Software Foundation, Inc. + Copyright (C) 2007, 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 diff --git a/lib/getusershell.c b/lib/getusershell.c index 30d90825..f938dcaa 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-2012 Free Software + Copyright (C) 1991, 1997, 2000-2001, 2003-2006, 2008-2013 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/glthread/lock.c b/lib/glthread/lock.c index 9a391ea6..f62aa301 100644 --- a/lib/glthread/lock.c +++ b/lib/glthread/lock.c @@ -1,5 +1,5 @@ /* Locking in multithreaded situations. - Copyright (C) 2005-2012 Free Software Foundation, Inc. + Copyright (C) 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 @@ -682,7 +682,7 @@ glthread_lock_destroy_func (gl_lock_t *lock) /* In this file, the waitqueues are implemented as circular arrays. */ #define gl_waitqueue_t gl_carray_waitqueue_t -static inline void +static void gl_waitqueue_init (gl_waitqueue_t *wq) { wq->array = NULL; @@ -743,7 +743,7 @@ gl_waitqueue_add (gl_waitqueue_t *wq) } /* Notifies the first thread from a wait queue and dequeues it. */ -static inline void +static void gl_waitqueue_notify_first (gl_waitqueue_t *wq) { SetEvent (wq->array[wq->offset + 0]); @@ -754,7 +754,7 @@ gl_waitqueue_notify_first (gl_waitqueue_t *wq) } /* Notifies all threads from a wait queue and dequeues them all. */ -static inline void +static void gl_waitqueue_notify_all (gl_waitqueue_t *wq) { unsigned int i; diff --git a/lib/glthread/lock.h b/lib/glthread/lock.h index 6782d498..d20bbdef 100644 --- a/lib/glthread/lock.h +++ b/lib/glthread/lock.h @@ -1,5 +1,5 @@ /* Locking in multithreaded situations. - Copyright (C) 2005-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/lib/glthread/threadlib.c b/lib/glthread/threadlib.c index 946268e9..b4476573 100644 --- a/lib/glthread/threadlib.c +++ b/lib/glthread/threadlib.c @@ -1,5 +1,5 @@ /* Multithreading primitives. - Copyright (C) 2005-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/lib/glthread/tls.c b/lib/glthread/tls.c index 661d011e..bcd285c2 100644 --- a/lib/glthread/tls.c +++ b/lib/glthread/tls.c @@ -1,5 +1,5 @@ /* Thread-local storage in multithreaded situations. - Copyright (C) 2005-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/lib/glthread/tls.h b/lib/glthread/tls.h index 0330eb35..2afe0b43 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-2012 Free Software Foundation, Inc. + Copyright (C) 2005, 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 diff --git a/lib/gnulib.mk b/lib/gnulib.mk index b3d1d79c..6d6a0d72 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-2012 Free Software Foundation, Inc. +# Copyright (C) 2002-2013 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,43 +21,43 @@ # 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 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 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 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 stdbool stdlib-safer stpcpy stpncpy strdup-posix strftime strncat 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 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-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 -MOSTLYCLEANFILES += core *.stackdump +MOSTLYCLEANFILES += lib/core lib/*.stackdump -noinst_LIBRARIES += libcoreutils.a +noinst_LIBRARIES += lib/libcoreutils.a -libcoreutils_a_SOURCES = -libcoreutils_a_LIBADD = $(gl_LIBOBJS) -libcoreutils_a_DEPENDENCIES = $(gl_LIBOBJS) -EXTRA_libcoreutils_a_SOURCES = +lib_libcoreutils_a_SOURCES = +lib_libcoreutils_a_LIBADD = $(gl_LIBOBJS) +lib_libcoreutils_a_DEPENDENCIES = $(gl_LIBOBJS) +EXTRA_lib_libcoreutils_a_SOURCES = ## begin gnulib module acl -libcoreutils_a_SOURCES += set-mode-acl.c copy-acl.c file-has-acl.c +lib_libcoreutils_a_SOURCES += lib/set-mode-acl.c lib/copy-acl.c lib/file-has-acl.c -EXTRA_DIST += acl-internal.h acl.h acl_entries.c +EXTRA_DIST += lib/acl-internal.h lib/acl.h lib/acl_entries.c -EXTRA_libcoreutils_a_SOURCES += acl_entries.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/acl_entries.c ## end gnulib module acl ## begin gnulib module alignof -EXTRA_DIST += alignof.h +EXTRA_DIST += lib/alignof.h ## end gnulib module alignof ## begin gnulib module alloca -libcoreutils_a_LIBADD += @ALLOCA@ -libcoreutils_a_DEPENDENCIES += @ALLOCA@ -EXTRA_DIST += alloca.c +lib_libcoreutils_a_LIBADD += @ALLOCA@ +lib_libcoreutils_a_DEPENDENCIES += @ALLOCA@ +EXTRA_DIST += lib/alloca.c -EXTRA_libcoreutils_a_SOURCES += alloca.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/alloca.c ## end gnulib module alloca @@ -68,27 +68,27 @@ BUILT_SOURCES += $(ALLOCA_H) # We need the following in order to create <alloca.h> when the system # doesn't have one that works with the given compiler. if GL_GENERATE_ALLOCA_H -alloca.h: alloca.in.h $(top_builddir)/config.status +lib/alloca.h: lib/alloca.in.h $(top_builddir)/config.status $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - cat $(srcdir)/alloca.in.h; \ + cat $(top_srcdir)/lib/alloca.in.h; \ } > $@-t && \ mv -f $@-t $@ else -alloca.h: $(top_builddir)/config.status +lib/alloca.h: $(top_builddir)/config.status rm -f $@ endif -MOSTLYCLEANFILES += alloca.h alloca.h-t +MOSTLYCLEANFILES += lib/alloca.h lib/alloca.h-t -EXTRA_DIST += alloca.in.h +EXTRA_DIST += lib/alloca.in.h ## end gnulib module alloca-opt ## begin gnulib module allocator -libcoreutils_a_SOURCES += allocator.c +lib_libcoreutils_a_SOURCES += lib/allocator.c -EXTRA_DIST += allocator.h +EXTRA_DIST += lib/allocator.h ## end gnulib module allocator @@ -101,52 +101,52 @@ EXTRA_DIST += $(top_srcdir)/build-aux/announce-gen ## begin gnulib module areadlink -libcoreutils_a_SOURCES += areadlink.c +lib_libcoreutils_a_SOURCES += lib/areadlink.c -EXTRA_DIST += areadlink.h +EXTRA_DIST += lib/areadlink.h ## end gnulib module areadlink ## begin gnulib module areadlink-with-size -libcoreutils_a_SOURCES += areadlink-with-size.c +lib_libcoreutils_a_SOURCES += lib/areadlink-with-size.c -EXTRA_DIST += areadlink.h +EXTRA_DIST += lib/areadlink.h ## end gnulib module areadlink-with-size ## begin gnulib module areadlinkat -libcoreutils_a_SOURCES += areadlinkat.c +lib_libcoreutils_a_SOURCES += lib/areadlinkat.c -EXTRA_DIST += areadlink.h at-func.c +EXTRA_DIST += lib/areadlink.h lib/at-func.c -EXTRA_libcoreutils_a_SOURCES += at-func.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/at-func.c ## end gnulib module areadlinkat ## begin gnulib module argmatch -libcoreutils_a_SOURCES += argmatch.c +lib_libcoreutils_a_SOURCES += lib/argmatch.c -EXTRA_DIST += argmatch.h +EXTRA_DIST += lib/argmatch.h ## end gnulib module argmatch ## begin gnulib module argv-iter -libcoreutils_a_SOURCES += argv-iter.c argv-iter.h +lib_libcoreutils_a_SOURCES += lib/argv-iter.c lib/argv-iter.h ## end gnulib module argv-iter ## begin gnulib module arpa_inet -BUILT_SOURCES += arpa/inet.h +BUILT_SOURCES += lib/arpa/inet.h # We need the following in order to create <arpa/inet.h> when the system # doesn't have one. -arpa/inet.h: arpa_inet.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H) - $(AM_V_at)$(MKDIR_P) arpa +lib/arpa/inet.h: lib/arpa_inet.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H) + $(AM_V_at)$(MKDIR_P) lib/arpa $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ @@ -165,204 +165,210 @@ arpa/inet.h: arpa_inet.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON -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)' \ - < $(srcdir)/arpa_inet.in.h; \ + < $(top_srcdir)/lib/arpa_inet.in.h; \ } > $@-t && \ mv $@-t $@ -MOSTLYCLEANFILES += arpa/inet.h arpa/inet.h-t -MOSTLYCLEANDIRS += arpa +MOSTLYCLEANFILES += lib/arpa/inet.h lib/arpa/inet.h-t +MOSTLYCLEANDIRS += lib/arpa -EXTRA_DIST += arpa_inet.in.h +EXTRA_DIST += lib/arpa_inet.in.h ## end gnulib module arpa_inet ## begin gnulib module at-internal -EXTRA_DIST += openat-priv.h openat-proc.c +EXTRA_DIST += lib/openat-priv.h lib/openat-proc.c -EXTRA_libcoreutils_a_SOURCES += openat-proc.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/openat-proc.c ## end gnulib module at-internal ## begin gnulib module backupfile -libcoreutils_a_SOURCES += backupfile.c +lib_libcoreutils_a_SOURCES += lib/backupfile.c -EXTRA_DIST += backupfile.h +EXTRA_DIST += lib/backupfile.h ## end gnulib module backupfile ## begin gnulib module base64 -libcoreutils_a_SOURCES += base64.h base64.c +lib_libcoreutils_a_SOURCES += lib/base64.h lib/base64.c ## end gnulib module base64 ## begin gnulib module binary-io -libcoreutils_a_SOURCES += binary-io.h +lib_libcoreutils_a_SOURCES += lib/binary-io.h lib/binary-io.c ## end gnulib module binary-io ## begin gnulib module bitrotate -libcoreutils_a_SOURCES += bitrotate.h +lib_libcoreutils_a_SOURCES += lib/bitrotate.h lib/bitrotate.c ## end gnulib module bitrotate ## begin gnulib module btowc -EXTRA_DIST += btowc.c +EXTRA_DIST += lib/btowc.c -EXTRA_libcoreutils_a_SOURCES += btowc.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/btowc.c ## end gnulib module btowc +## begin gnulib module buffer-lcm + +lib_libcoreutils_a_SOURCES += lib/buffer-lcm.c lib/buffer-lcm.h + +## end gnulib module buffer-lcm + ## begin gnulib module c-ctype -libcoreutils_a_SOURCES += c-ctype.h c-ctype.c +lib_libcoreutils_a_SOURCES += lib/c-ctype.h lib/c-ctype.c ## end gnulib module c-ctype ## begin gnulib module c-strcase -libcoreutils_a_SOURCES += c-strcase.h c-strcasecmp.c c-strncasecmp.c +lib_libcoreutils_a_SOURCES += lib/c-strcase.h lib/c-strcasecmp.c lib/c-strncasecmp.c ## end gnulib module c-strcase ## begin gnulib module c-strcaseeq -EXTRA_DIST += c-strcaseeq.h +EXTRA_DIST += lib/c-strcaseeq.h ## end gnulib module c-strcaseeq ## begin gnulib module c-strtod -libcoreutils_a_SOURCES += c-strtod.c +lib_libcoreutils_a_SOURCES += lib/c-strtod.c -EXTRA_DIST += c-strtod.h +EXTRA_DIST += lib/c-strtod.h ## end gnulib module c-strtod ## begin gnulib module c-strtold -libcoreutils_a_SOURCES += c-strtold.c +lib_libcoreutils_a_SOURCES += lib/c-strtold.c -EXTRA_DIST += c-strtod.c c-strtod.h +EXTRA_DIST += lib/c-strtod.c lib/c-strtod.h -EXTRA_libcoreutils_a_SOURCES += c-strtod.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/c-strtod.c ## end gnulib module c-strtold ## begin gnulib module calloc-gnu -EXTRA_DIST += calloc.c +EXTRA_DIST += lib/calloc.c -EXTRA_libcoreutils_a_SOURCES += calloc.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/calloc.c ## end gnulib module calloc-gnu ## begin gnulib module calloc-posix -EXTRA_DIST += calloc.c +EXTRA_DIST += lib/calloc.c -EXTRA_libcoreutils_a_SOURCES += calloc.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/calloc.c ## end gnulib module calloc-posix ## begin gnulib module canon-host -libcoreutils_a_SOURCES += canon-host.c +lib_libcoreutils_a_SOURCES += lib/canon-host.c -EXTRA_DIST += canon-host.h +EXTRA_DIST += lib/canon-host.h ## end gnulib module canon-host ## begin gnulib module canonicalize -libcoreutils_a_SOURCES += canonicalize.c +lib_libcoreutils_a_SOURCES += lib/canonicalize.c -EXTRA_DIST += canonicalize.h +EXTRA_DIST += lib/canonicalize.h ## end gnulib module canonicalize ## begin gnulib module careadlinkat -libcoreutils_a_SOURCES += careadlinkat.c +lib_libcoreutils_a_SOURCES += lib/careadlinkat.c -EXTRA_DIST += careadlinkat.h +EXTRA_DIST += lib/careadlinkat.h ## end gnulib module careadlinkat ## begin gnulib module chdir-long -EXTRA_DIST += chdir-long.c chdir-long.h +EXTRA_DIST += lib/chdir-long.c lib/chdir-long.h -EXTRA_libcoreutils_a_SOURCES += chdir-long.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/chdir-long.c ## end gnulib module chdir-long ## begin gnulib module chown -EXTRA_DIST += chown.c fchown-stub.c +EXTRA_DIST += lib/chown.c lib/fchown-stub.c -EXTRA_libcoreutils_a_SOURCES += chown.c fchown-stub.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/chown.c lib/fchown-stub.c ## end gnulib module chown ## begin gnulib module cloexec -libcoreutils_a_SOURCES += cloexec.c +lib_libcoreutils_a_SOURCES += lib/cloexec.c -EXTRA_DIST += cloexec.h +EXTRA_DIST += lib/cloexec.h ## end gnulib module cloexec ## begin gnulib module close -EXTRA_DIST += close.c +EXTRA_DIST += lib/close.c -EXTRA_libcoreutils_a_SOURCES += close.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/close.c ## end gnulib module close ## begin gnulib module close-stream -libcoreutils_a_SOURCES += close-stream.c +lib_libcoreutils_a_SOURCES += lib/close-stream.c -EXTRA_DIST += close-stream.h +EXTRA_DIST += lib/close-stream.h ## end gnulib module close-stream ## begin gnulib module closedir -EXTRA_DIST += closedir.c dirent-private.h +EXTRA_DIST += lib/closedir.c lib/dirent-private.h -EXTRA_libcoreutils_a_SOURCES += closedir.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/closedir.c ## end gnulib module closedir ## begin gnulib module closein -libcoreutils_a_SOURCES += closein.c +lib_libcoreutils_a_SOURCES += lib/closein.c -EXTRA_DIST += closein.h +EXTRA_DIST += lib/closein.h ## end gnulib module closein ## begin gnulib module closeout -libcoreutils_a_SOURCES += closeout.c +lib_libcoreutils_a_SOURCES += lib/closeout.c -EXTRA_DIST += closeout.h +EXTRA_DIST += lib/closeout.h ## end gnulib module closeout @@ -372,7 +378,7 @@ EXTRA_DIST += closeout.h # provided by autoconf 2.59c+. # The Automake-defined pkg* macros are appended, in the order # listed in the Automake 1.10a+ documentation. -configmake.h: Makefile +lib/configmake.h: Makefile $(AM_V_GEN)rm -f $@-t && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ echo '#define PREFIX "$(prefix)"'; \ @@ -405,50 +411,50 @@ configmake.h: Makefile } | sed '/""/d' > $@-t && \ mv -f $@-t $@ -BUILT_SOURCES += configmake.h -CLEANFILES += configmake.h configmake.h-t +BUILT_SOURCES += lib/configmake.h +CLEANFILES += lib/configmake.h lib/configmake.h-t ## end gnulib module configmake ## begin gnulib module crypto/md5 -libcoreutils_a_SOURCES += md5.c +lib_libcoreutils_a_SOURCES += lib/md5.c -EXTRA_DIST += md5.h +EXTRA_DIST += lib/md5.h ## end gnulib module crypto/md5 ## begin gnulib module crypto/sha1 -libcoreutils_a_SOURCES += sha1.c +lib_libcoreutils_a_SOURCES += lib/sha1.c -EXTRA_DIST += sha1.h +EXTRA_DIST += lib/sha1.h ## end gnulib module crypto/sha1 ## begin gnulib module crypto/sha256 -libcoreutils_a_SOURCES += sha256.c +lib_libcoreutils_a_SOURCES += lib/sha256.c -EXTRA_DIST += sha256.h +EXTRA_DIST += lib/sha256.h ## end gnulib module crypto/sha256 ## begin gnulib module crypto/sha512 -libcoreutils_a_SOURCES += sha512.c +lib_libcoreutils_a_SOURCES += lib/sha512.c -EXTRA_DIST += sha512.h +EXTRA_DIST += lib/sha512.h ## end gnulib module crypto/sha512 ## begin gnulib module ctype -BUILT_SOURCES += ctype.h +BUILT_SOURCES += lib/ctype.h # We need the following in order to create <ctype.h> when the system # doesn't have one that works with the given compiler. -ctype.h: ctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) +lib/ctype.h: lib/ctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ @@ -460,49 +466,49 @@ ctype.h: ctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) -e 's/@''HAVE_ISBLANK''@/$(HAVE_ISBLANK)/g' \ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - < $(srcdir)/ctype.in.h; \ + < $(top_srcdir)/lib/ctype.in.h; \ } > $@-t && \ mv $@-t $@ -MOSTLYCLEANFILES += ctype.h ctype.h-t +MOSTLYCLEANFILES += lib/ctype.h lib/ctype.h-t -EXTRA_DIST += ctype.in.h +EXTRA_DIST += lib/ctype.in.h ## end gnulib module ctype ## begin gnulib module cycle-check -libcoreutils_a_SOURCES += cycle-check.c +lib_libcoreutils_a_SOURCES += lib/cycle-check.c -EXTRA_DIST += cycle-check.h +EXTRA_DIST += lib/cycle-check.h ## end gnulib module cycle-check ## begin gnulib module dev-ino -EXTRA_DIST += dev-ino.h +EXTRA_DIST += lib/dev-ino.h ## end gnulib module dev-ino ## begin gnulib module di-set -libcoreutils_a_SOURCES += di-set.c di-set.h +lib_libcoreutils_a_SOURCES += lib/di-set.c lib/di-set.h ## end gnulib module di-set ## begin gnulib module diacrit -libcoreutils_a_SOURCES += diacrit.h diacrit.c +lib_libcoreutils_a_SOURCES += lib/diacrit.h lib/diacrit.c ## end gnulib module diacrit ## begin gnulib module dirent -BUILT_SOURCES += dirent.h +BUILT_SOURCES += lib/dirent.h # We need the following in order to create <dirent.h> when the system # doesn't have one that works with the given compiler. -dirent.h: dirent.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) +lib/dirent.h: lib/dirent.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' \ @@ -535,47 +541,47 @@ dirent.h: dirent.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -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)' \ - < $(srcdir)/dirent.in.h; \ + < $(top_srcdir)/lib/dirent.in.h; \ } > $@-t && \ mv $@-t $@ -MOSTLYCLEANFILES += dirent.h dirent.h-t +MOSTLYCLEANFILES += lib/dirent.h lib/dirent.h-t -EXTRA_DIST += dirent.in.h +EXTRA_DIST += lib/dirent.in.h ## end gnulib module dirent ## begin gnulib module dirent-safer -libcoreutils_a_SOURCES += opendir-safer.c +lib_libcoreutils_a_SOURCES += lib/opendir-safer.c -EXTRA_DIST += dirent--.h dirent-safer.h +EXTRA_DIST += lib/dirent--.h lib/dirent-safer.h ## end gnulib module dirent-safer ## begin gnulib module dirfd -EXTRA_DIST += dirfd.c +EXTRA_DIST += lib/dirfd.c -EXTRA_libcoreutils_a_SOURCES += dirfd.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/dirfd.c ## end gnulib module dirfd ## begin gnulib module dirname -libcoreutils_a_SOURCES += dirname.c basename.c +lib_libcoreutils_a_SOURCES += lib/dirname.c lib/basename.c -EXTRA_DIST += stripslash.c +EXTRA_DIST += lib/stripslash.c -EXTRA_libcoreutils_a_SOURCES += stripslash.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/stripslash.c ## end gnulib module dirname ## begin gnulib module dirname-lgpl -libcoreutils_a_SOURCES += dirname-lgpl.c basename-lgpl.c stripslash.c +lib_libcoreutils_a_SOURCES += lib/dirname-lgpl.c lib/basename-lgpl.c lib/stripslash.c -EXTRA_DIST += dirname.h +EXTRA_DIST += lib/dirname.h ## end gnulib module dirname-lgpl @@ -589,41 +595,41 @@ EXTRA_DIST += $(top_srcdir)/build-aux/do-release-commit-and-tag ## begin gnulib module dosname -EXTRA_DIST += dosname.h +EXTRA_DIST += lib/dosname.h ## end gnulib module dosname ## begin gnulib module dtoastr -libcoreutils_a_SOURCES += dtoastr.c +lib_libcoreutils_a_SOURCES += lib/dtoastr.c -EXTRA_DIST += ftoastr.c ftoastr.h +EXTRA_DIST += lib/ftoastr.c lib/ftoastr.h -EXTRA_libcoreutils_a_SOURCES += ftoastr.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/ftoastr.c ## end gnulib module dtoastr ## begin gnulib module dtotimespec -libcoreutils_a_SOURCES += dtotimespec.c +lib_libcoreutils_a_SOURCES += lib/dtotimespec.c ## end gnulib module dtotimespec ## begin gnulib module dup -EXTRA_DIST += dup.c +EXTRA_DIST += lib/dup.c -EXTRA_libcoreutils_a_SOURCES += dup.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/dup.c ## end gnulib module dup ## begin gnulib module dup2 -EXTRA_DIST += dup2.c +EXTRA_DIST += lib/dup2.c -EXTRA_libcoreutils_a_SOURCES += dup2.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/dup2.c ## end gnulib module dup2 @@ -634,7 +640,7 @@ BUILT_SOURCES += $(ERRNO_H) # We need the following in order to create <errno.h> when the system # doesn't have one that is POSIX compliant. if GL_GENERATE_ERRNO_H -errno.h: errno.in.h $(top_builddir)/config.status +lib/errno.h: lib/errno.in.h $(top_builddir)/config.status $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ @@ -648,126 +654,128 @@ errno.h: errno.in.h $(top_builddir)/config.status -e 's|@''ENOLINK_VALUE''@|$(ENOLINK_VALUE)|g' \ -e 's|@''EOVERFLOW_HIDDEN''@|$(EOVERFLOW_HIDDEN)|g' \ -e 's|@''EOVERFLOW_VALUE''@|$(EOVERFLOW_VALUE)|g' \ - < $(srcdir)/errno.in.h; \ + < $(top_srcdir)/lib/errno.in.h; \ } > $@-t && \ mv $@-t $@ else -errno.h: $(top_builddir)/config.status +lib/errno.h: $(top_builddir)/config.status rm -f $@ endif -MOSTLYCLEANFILES += errno.h errno.h-t +MOSTLYCLEANFILES += lib/errno.h lib/errno.h-t -EXTRA_DIST += errno.in.h +EXTRA_DIST += lib/errno.in.h ## end gnulib module errno ## begin gnulib module error -EXTRA_DIST += error.c error.h +EXTRA_DIST += lib/error.c lib/error.h -EXTRA_libcoreutils_a_SOURCES += error.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/error.c ## end gnulib module error ## begin gnulib module euidaccess -EXTRA_DIST += euidaccess.c +EXTRA_DIST += lib/euidaccess.c -EXTRA_libcoreutils_a_SOURCES += euidaccess.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/euidaccess.c ## end gnulib module euidaccess ## begin gnulib module exclude -libcoreutils_a_SOURCES += exclude.c +lib_libcoreutils_a_SOURCES += lib/exclude.c -EXTRA_DIST += exclude.h +EXTRA_DIST += lib/exclude.h ## end gnulib module exclude ## begin gnulib module exitfail -libcoreutils_a_SOURCES += exitfail.c +lib_libcoreutils_a_SOURCES += lib/exitfail.c -EXTRA_DIST += exitfail.h +EXTRA_DIST += lib/exitfail.h ## end gnulib module exitfail ## begin gnulib module faccessat -EXTRA_DIST += at-func.c faccessat.c openat-priv.h +EXTRA_DIST += lib/at-func.c lib/faccessat.c -EXTRA_libcoreutils_a_SOURCES += at-func.c faccessat.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/at-func.c lib/faccessat.c ## end gnulib module faccessat ## begin gnulib module fadvise -libcoreutils_a_SOURCES += fadvise.c fadvise.h +lib_libcoreutils_a_SOURCES += lib/fadvise.c lib/fadvise.h ## end gnulib module fadvise ## begin gnulib module fatal-signal -libcoreutils_a_SOURCES += fatal-signal.h fatal-signal.c +lib_libcoreutils_a_SOURCES += lib/fatal-signal.h lib/fatal-signal.c ## end gnulib module fatal-signal ## begin gnulib module fchdir -EXTRA_DIST += fchdir.c +EXTRA_DIST += lib/fchdir.c -EXTRA_libcoreutils_a_SOURCES += fchdir.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/fchdir.c ## end gnulib module fchdir ## begin gnulib module fchmodat +lib_libcoreutils_a_SOURCES += lib/chmodat.c -EXTRA_DIST += at-func.c fchmodat.c openat-priv.h +EXTRA_DIST += lib/at-func.c lib/fchmodat.c -EXTRA_libcoreutils_a_SOURCES += at-func.c fchmodat.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/at-func.c lib/fchmodat.c ## end gnulib module fchmodat ## begin gnulib module fchownat +lib_libcoreutils_a_SOURCES += lib/chownat.c -EXTRA_DIST += at-func.c fchownat.c openat-priv.h +EXTRA_DIST += lib/at-func.c lib/fchownat.c -EXTRA_libcoreutils_a_SOURCES += at-func.c fchownat.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/at-func.c lib/fchownat.c ## end gnulib module fchownat ## begin gnulib module fclose -EXTRA_DIST += fclose.c +EXTRA_DIST += lib/fclose.c -EXTRA_libcoreutils_a_SOURCES += fclose.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/fclose.c ## end gnulib module fclose ## begin gnulib module fcntl -EXTRA_DIST += fcntl.c +EXTRA_DIST += lib/fcntl.c -EXTRA_libcoreutils_a_SOURCES += fcntl.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/fcntl.c ## end gnulib module fcntl ## begin gnulib module fcntl-h -BUILT_SOURCES += fcntl.h +BUILT_SOURCES += lib/fcntl.h # We need the following in order to create <fcntl.h> when the system # doesn't have one that works with the given compiler. -fcntl.h: fcntl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) +lib/fcntl.h: lib/fcntl.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' \ @@ -787,140 +795,146 @@ fcntl.h: fcntl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -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)' \ - < $(srcdir)/fcntl.in.h; \ + < $(top_srcdir)/lib/fcntl.in.h; \ } > $@-t && \ mv $@-t $@ -MOSTLYCLEANFILES += fcntl.h fcntl.h-t +MOSTLYCLEANFILES += lib/fcntl.h lib/fcntl.h-t -EXTRA_DIST += fcntl.in.h +EXTRA_DIST += lib/fcntl.in.h ## end gnulib module fcntl-h ## begin gnulib module fcntl-safer -libcoreutils_a_SOURCES += creat-safer.c open-safer.c +lib_libcoreutils_a_SOURCES += lib/creat-safer.c lib/open-safer.c -EXTRA_DIST += fcntl--.h fcntl-safer.h +EXTRA_DIST += lib/fcntl--.h lib/fcntl-safer.h ## end gnulib module fcntl-safer ## begin gnulib module fd-hook -libcoreutils_a_SOURCES += fd-hook.c +lib_libcoreutils_a_SOURCES += lib/fd-hook.c -EXTRA_DIST += fd-hook.h +EXTRA_DIST += lib/fd-hook.h ## end gnulib module fd-hook +## begin gnulib module fd-reopen + +lib_libcoreutils_a_SOURCES += lib/fd-reopen.c lib/fd-reopen.h + +## end gnulib module fd-reopen + ## begin gnulib module fd-safer-flag -libcoreutils_a_SOURCES += fd-safer-flag.c dup-safer-flag.c +lib_libcoreutils_a_SOURCES += lib/fd-safer-flag.c lib/dup-safer-flag.c ## end gnulib module fd-safer-flag ## begin gnulib module fdatasync -EXTRA_DIST += fdatasync.c +EXTRA_DIST += lib/fdatasync.c -EXTRA_libcoreutils_a_SOURCES += fdatasync.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/fdatasync.c ## end gnulib module fdatasync ## begin gnulib module fdopen -EXTRA_DIST += fdopen.c +EXTRA_DIST += lib/fdopen.c -EXTRA_libcoreutils_a_SOURCES += fdopen.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/fdopen.c ## end gnulib module fdopen ## begin gnulib module fdopendir -EXTRA_DIST += fdopendir.c +EXTRA_DIST += lib/fdopendir.c -EXTRA_libcoreutils_a_SOURCES += fdopendir.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/fdopendir.c ## end gnulib module fdopendir ## begin gnulib module fdutimensat -libcoreutils_a_SOURCES += fdutimensat.c +lib_libcoreutils_a_SOURCES += lib/fdutimensat.c -EXTRA_DIST += utimens.h +EXTRA_DIST += lib/utimens.h ## end gnulib module fdutimensat ## begin gnulib module fflush -EXTRA_DIST += fflush.c stdio-impl.h +EXTRA_DIST += lib/fflush.c lib/stdio-impl.h -EXTRA_libcoreutils_a_SOURCES += fflush.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/fflush.c ## end gnulib module fflush ## begin gnulib module file-set -libcoreutils_a_SOURCES += file-set.c +lib_libcoreutils_a_SOURCES += lib/file-set.c -EXTRA_DIST += file-set.h +EXTRA_DIST += lib/file-set.h ## end gnulib module file-set ## begin gnulib module file-type -libcoreutils_a_SOURCES += file-type.c +lib_libcoreutils_a_SOURCES += lib/file-type.c -EXTRA_DIST += file-type.h +EXTRA_DIST += lib/file-type.h ## end gnulib module file-type ## begin gnulib module fileblocks -EXTRA_DIST += fileblocks.c +EXTRA_DIST += lib/fileblocks.c -EXTRA_libcoreutils_a_SOURCES += fileblocks.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/fileblocks.c ## end gnulib module fileblocks ## begin gnulib module filemode -libcoreutils_a_SOURCES += filemode.c +lib_libcoreutils_a_SOURCES += lib/filemode.c -EXTRA_DIST += filemode.h +EXTRA_DIST += lib/filemode.h ## end gnulib module filemode ## begin gnulib module filename -EXTRA_DIST += filename.h +EXTRA_DIST += lib/filename.h ## end gnulib module filename ## begin gnulib module filenamecat -libcoreutils_a_SOURCES += filenamecat.c +lib_libcoreutils_a_SOURCES += lib/filenamecat.c ## end gnulib module filenamecat ## begin gnulib module filenamecat-lgpl -libcoreutils_a_SOURCES += filenamecat-lgpl.c +lib_libcoreutils_a_SOURCES += lib/filenamecat-lgpl.c -EXTRA_DIST += filenamecat.h +EXTRA_DIST += lib/filenamecat.h ## end gnulib module filenamecat-lgpl ## begin gnulib module filevercmp -libcoreutils_a_SOURCES += filevercmp.c +lib_libcoreutils_a_SOURCES += lib/filevercmp.c -EXTRA_DIST += filevercmp.h +EXTRA_DIST += lib/filevercmp.h ## end gnulib module filevercmp @@ -931,7 +945,7 @@ BUILT_SOURCES += $(FLOAT_H) # We need the following in order to create <float.h> when the system # doesn't have one that works with the given compiler. if GL_GENERATE_FLOAT_H -float.h: float.in.h $(top_builddir)/config.status +lib/float.h: lib/float.in.h $(top_builddir)/config.status $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ @@ -940,18 +954,18 @@ float.h: float.in.h $(top_builddir)/config.status -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_FLOAT_H''@|$(NEXT_FLOAT_H)|g' \ -e 's|@''REPLACE_ITOLD''@|$(REPLACE_ITOLD)|g' \ - < $(srcdir)/float.in.h; \ + < $(top_srcdir)/lib/float.in.h; \ } > $@-t && \ mv $@-t $@ else -float.h: $(top_builddir)/config.status +lib/float.h: $(top_builddir)/config.status rm -f $@ endif -MOSTLYCLEANFILES += float.h float.h-t +MOSTLYCLEANFILES += lib/float.h lib/float.h-t -EXTRA_DIST += float.c float.in.h itold.c +EXTRA_DIST += lib/float.c lib/float.in.h lib/itold.c -EXTRA_libcoreutils_a_SOURCES += float.c itold.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/float.c lib/itold.c ## end gnulib module float @@ -962,270 +976,273 @@ BUILT_SOURCES += $(FNMATCH_H) # We need the following in order to create <fnmatch.h> when the system # doesn't have one that supports the required API. if GL_GENERATE_FNMATCH_H -fnmatch.h: fnmatch.in.h $(top_builddir)/config.status $(ARG_NONNULL_H) +lib/fnmatch.h: lib/fnmatch.in.h $(top_builddir)/config.status $(ARG_NONNULL_H) $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - < $(srcdir)/fnmatch.in.h; \ + < $(top_srcdir)/lib/fnmatch.in.h; \ } > $@-t && \ mv -f $@-t $@ else -fnmatch.h: $(top_builddir)/config.status +lib/fnmatch.h: $(top_builddir)/config.status rm -f $@ endif -MOSTLYCLEANFILES += fnmatch.h fnmatch.h-t +MOSTLYCLEANFILES += lib/fnmatch.h lib/fnmatch.h-t -EXTRA_DIST += fnmatch.c fnmatch.in.h fnmatch_loop.c +EXTRA_DIST += lib/fnmatch.c lib/fnmatch.in.h lib/fnmatch_loop.c -EXTRA_libcoreutils_a_SOURCES += fnmatch.c fnmatch_loop.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/fnmatch.c lib/fnmatch_loop.c ## end gnulib module fnmatch ## begin gnulib module fopen -EXTRA_DIST += fopen.c +EXTRA_DIST += lib/fopen.c -EXTRA_libcoreutils_a_SOURCES += fopen.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/fopen.c ## end gnulib module fopen ## begin gnulib module fopen-safer -libcoreutils_a_SOURCES += fopen-safer.c +lib_libcoreutils_a_SOURCES += lib/fopen-safer.c -EXTRA_DIST += stdio--.h stdio-safer.h +EXTRA_DIST += lib/stdio--.h lib/stdio-safer.h ## end gnulib module fopen-safer ## begin gnulib module fpending -EXTRA_DIST += fpending.c fpending.h +EXTRA_DIST += lib/fpending.c lib/fpending.h -EXTRA_libcoreutils_a_SOURCES += fpending.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/fpending.c ## end gnulib module fpending ## begin gnulib module fprintftime -libcoreutils_a_SOURCES += fprintftime.c +lib_libcoreutils_a_SOURCES += lib/fprintftime.c -EXTRA_DIST += fprintftime.h +EXTRA_DIST += lib/fprintftime.h ## end gnulib module fprintftime ## begin gnulib module fpucw -EXTRA_DIST += fpucw.h +EXTRA_DIST += lib/fpucw.h ## end gnulib module fpucw ## begin gnulib module fpurge -EXTRA_DIST += fpurge.c stdio-impl.h +EXTRA_DIST += lib/fpurge.c lib/stdio-impl.h -EXTRA_libcoreutils_a_SOURCES += fpurge.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/fpurge.c ## end gnulib module fpurge ## begin gnulib module freadahead -libcoreutils_a_SOURCES += freadahead.c -EXTRA_DIST += freadahead.h stdio-impl.h +EXTRA_DIST += lib/freadahead.c lib/freadahead.h lib/stdio-impl.h + +EXTRA_lib_libcoreutils_a_SOURCES += lib/freadahead.c ## end gnulib module freadahead ## begin gnulib module freading -libcoreutils_a_SOURCES += freading.c +lib_libcoreutils_a_SOURCES += lib/freading.c -EXTRA_DIST += freading.h stdio-impl.h +EXTRA_DIST += lib/freading.h lib/stdio-impl.h ## end gnulib module freading ## begin gnulib module freadptr -libcoreutils_a_SOURCES += freadptr.c -EXTRA_DIST += freadptr.h stdio-impl.h +EXTRA_DIST += lib/freadptr.c lib/freadptr.h lib/stdio-impl.h + +EXTRA_lib_libcoreutils_a_SOURCES += lib/freadptr.c ## end gnulib module freadptr ## begin gnulib module freadseek -libcoreutils_a_SOURCES += freadseek.c +lib_libcoreutils_a_SOURCES += lib/freadseek.c -EXTRA_DIST += freadseek.h stdio-impl.h +EXTRA_DIST += lib/freadseek.h lib/stdio-impl.h ## end gnulib module freadseek ## begin gnulib module freopen -EXTRA_DIST += freopen.c +EXTRA_DIST += lib/freopen.c -EXTRA_libcoreutils_a_SOURCES += freopen.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/freopen.c ## end gnulib module freopen ## begin gnulib module freopen-safer -libcoreutils_a_SOURCES += freopen-safer.c +lib_libcoreutils_a_SOURCES += lib/freopen-safer.c -EXTRA_DIST += stdio--.h stdio-safer.h +EXTRA_DIST += lib/stdio--.h lib/stdio-safer.h ## end gnulib module freopen-safer ## begin gnulib module frexp-nolibm -EXTRA_DIST += frexp.c +EXTRA_DIST += lib/frexp.c -EXTRA_libcoreutils_a_SOURCES += frexp.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/frexp.c ## end gnulib module frexp-nolibm ## begin gnulib module frexpl-nolibm -EXTRA_DIST += frexp.c frexpl.c +EXTRA_DIST += lib/frexp.c lib/frexpl.c -EXTRA_libcoreutils_a_SOURCES += frexp.c frexpl.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/frexp.c lib/frexpl.c ## end gnulib module frexpl-nolibm ## begin gnulib module fseek -EXTRA_DIST += fseek.c +EXTRA_DIST += lib/fseek.c -EXTRA_libcoreutils_a_SOURCES += fseek.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/fseek.c ## end gnulib module fseek ## begin gnulib module fseeko -EXTRA_DIST += fseeko.c stdio-impl.h +EXTRA_DIST += lib/fseeko.c lib/stdio-impl.h -EXTRA_libcoreutils_a_SOURCES += fseeko.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/fseeko.c ## end gnulib module fseeko ## begin gnulib module fseterr -libcoreutils_a_SOURCES += fseterr.c -EXTRA_DIST += fseterr.h stdio-impl.h +EXTRA_DIST += lib/fseterr.c lib/fseterr.h lib/stdio-impl.h + +EXTRA_lib_libcoreutils_a_SOURCES += lib/fseterr.c ## end gnulib module fseterr ## begin gnulib module fstat -EXTRA_DIST += fstat.c +EXTRA_DIST += lib/fstat.c -EXTRA_libcoreutils_a_SOURCES += fstat.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/fstat.c ## end gnulib module fstat ## begin gnulib module fstatat -EXTRA_DIST += at-func.c fstatat.c openat-priv.h +EXTRA_DIST += lib/at-func.c lib/fstatat.c -EXTRA_libcoreutils_a_SOURCES += at-func.c fstatat.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/at-func.c lib/fstatat.c ## end gnulib module fstatat ## begin gnulib module fsusage -EXTRA_DIST += fsusage.c fsusage.h +EXTRA_DIST += lib/fsusage.c lib/fsusage.h -EXTRA_libcoreutils_a_SOURCES += fsusage.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/fsusage.c ## end gnulib module fsusage ## begin gnulib module fsync -EXTRA_DIST += fsync.c +EXTRA_DIST += lib/fsync.c -EXTRA_libcoreutils_a_SOURCES += fsync.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/fsync.c ## end gnulib module fsync ## begin gnulib module ftell -EXTRA_DIST += ftell.c +EXTRA_DIST += lib/ftell.c -EXTRA_libcoreutils_a_SOURCES += ftell.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/ftell.c ## end gnulib module ftell ## begin gnulib module ftello -EXTRA_DIST += ftello.c stdio-impl.h +EXTRA_DIST += lib/ftello.c lib/stdio-impl.h -EXTRA_libcoreutils_a_SOURCES += ftello.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/ftello.c ## end gnulib module ftello ## begin gnulib module ftoastr -libcoreutils_a_SOURCES += ftoastr.c +lib_libcoreutils_a_SOURCES += lib/ftoastr.c -EXTRA_DIST += ftoastr.h +EXTRA_DIST += lib/ftoastr.h ## end gnulib module ftoastr ## begin gnulib module ftruncate -EXTRA_DIST += ftruncate.c +EXTRA_DIST += lib/ftruncate.c -EXTRA_libcoreutils_a_SOURCES += ftruncate.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/ftruncate.c ## end gnulib module ftruncate ## begin gnulib module fts -EXTRA_DIST += fts-cycle.c fts.c fts_.h +EXTRA_DIST += lib/fts-cycle.c lib/fts.c lib/fts_.h -EXTRA_libcoreutils_a_SOURCES += fts-cycle.c fts.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/fts-cycle.c lib/fts.c ## end gnulib module fts ## begin gnulib module full-read -libcoreutils_a_SOURCES += full-read.h full-read.c +lib_libcoreutils_a_SOURCES += lib/full-read.h lib/full-read.c -EXTRA_DIST += full-write.c +EXTRA_DIST += lib/full-write.c -EXTRA_libcoreutils_a_SOURCES += full-write.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/full-write.c ## end gnulib module full-read ## begin gnulib module full-write -libcoreutils_a_SOURCES += full-write.h full-write.c +lib_libcoreutils_a_SOURCES += lib/full-write.h lib/full-write.c ## end gnulib module full-write ## begin gnulib module futimens -EXTRA_DIST += futimens.c +EXTRA_DIST += lib/futimens.c -EXTRA_libcoreutils_a_SOURCES += futimens.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/futimens.c ## end gnulib module futimens @@ -1239,107 +1256,106 @@ EXTRA_DIST += $(top_srcdir)/build-aux/gendocs.sh ## begin gnulib module getaddrinfo -EXTRA_DIST += gai_strerror.c getaddrinfo.c +EXTRA_DIST += lib/gai_strerror.c lib/getaddrinfo.c -EXTRA_libcoreutils_a_SOURCES += gai_strerror.c getaddrinfo.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/gai_strerror.c lib/getaddrinfo.c ## end gnulib module getaddrinfo ## begin gnulib module getcwd -EXTRA_DIST += getcwd.c +EXTRA_DIST += lib/getcwd.c -EXTRA_libcoreutils_a_SOURCES += getcwd.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/getcwd.c ## end gnulib module getcwd ## begin gnulib module getcwd-lgpl -EXTRA_DIST += getcwd-lgpl.c +EXTRA_DIST += lib/getcwd-lgpl.c -EXTRA_libcoreutils_a_SOURCES += getcwd-lgpl.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/getcwd-lgpl.c ## end gnulib module getcwd-lgpl ## begin gnulib module getdelim -EXTRA_DIST += getdelim.c +EXTRA_DIST += lib/getdelim.c -EXTRA_libcoreutils_a_SOURCES += getdelim.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/getdelim.c ## end gnulib module getdelim ## begin gnulib module getdtablesize -EXTRA_DIST += getdtablesize.c +EXTRA_DIST += lib/getdtablesize.c -EXTRA_libcoreutils_a_SOURCES += getdtablesize.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/getdtablesize.c ## end gnulib module getdtablesize ## begin gnulib module getgroups -EXTRA_DIST += getgroups.c +EXTRA_DIST += lib/getgroups.c -EXTRA_libcoreutils_a_SOURCES += getgroups.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/getgroups.c ## end gnulib module getgroups ## begin gnulib module gethostname -EXTRA_DIST += gethostname.c w32sock.h +EXTRA_DIST += lib/gethostname.c lib/w32sock.h -EXTRA_libcoreutils_a_SOURCES += gethostname.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/gethostname.c ## end gnulib module gethostname ## begin gnulib module gethrxtime +lib_libcoreutils_a_SOURCES += lib/gethrxtime.c lib/xtime.c -EXTRA_DIST += gethrxtime.c gethrxtime.h xtime.h - -EXTRA_libcoreutils_a_SOURCES += gethrxtime.c +EXTRA_DIST += lib/gethrxtime.h lib/xtime.h ## end gnulib module gethrxtime ## begin gnulib module getline -EXTRA_DIST += getline.c +EXTRA_DIST += lib/getline.c -EXTRA_libcoreutils_a_SOURCES += getline.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/getline.c ## end gnulib module getline ## begin gnulib module getloadavg -EXTRA_DIST += getloadavg.c +EXTRA_DIST += lib/getloadavg.c -EXTRA_libcoreutils_a_SOURCES += getloadavg.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/getloadavg.c ## end gnulib module getloadavg ## begin gnulib module getlogin -EXTRA_DIST += getlogin.c +EXTRA_DIST += lib/getlogin.c -EXTRA_libcoreutils_a_SOURCES += getlogin.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/getlogin.c ## end gnulib module getlogin ## begin gnulib module getndelim2 -libcoreutils_a_SOURCES += getndelim2.c +lib_libcoreutils_a_SOURCES += lib/getndelim2.c -EXTRA_DIST += getndelim2.h +EXTRA_DIST += lib/getndelim2.h ## end gnulib module getndelim2 @@ -1349,7 +1365,7 @@ BUILT_SOURCES += $(GETOPT_H) # We need the following in order to create <getopt.h> when the system # doesn't have one that works with the given compiler. -getopt.h: getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H) +lib/getopt.h: lib/getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H) $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ @@ -1359,70 +1375,70 @@ getopt.h: getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H) -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_GETOPT_H''@|$(NEXT_GETOPT_H)|g' \ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - < $(srcdir)/getopt.in.h; \ + < $(top_srcdir)/lib/getopt.in.h; \ } > $@-t && \ mv -f $@-t $@ -MOSTLYCLEANFILES += getopt.h getopt.h-t +MOSTLYCLEANFILES += lib/getopt.h lib/getopt.h-t -EXTRA_DIST += getopt.c getopt.in.h getopt1.c getopt_int.h +EXTRA_DIST += lib/getopt.c lib/getopt.in.h lib/getopt1.c lib/getopt_int.h -EXTRA_libcoreutils_a_SOURCES += getopt.c getopt1.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/getopt.c lib/getopt1.c ## end gnulib module getopt-posix ## begin gnulib module getpagesize -EXTRA_DIST += getpagesize.c +EXTRA_DIST += lib/getpagesize.c -EXTRA_libcoreutils_a_SOURCES += getpagesize.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/getpagesize.c ## end gnulib module getpagesize ## begin gnulib module getpass-gnu -EXTRA_DIST += getpass.c getpass.h +EXTRA_DIST += lib/getpass.c lib/getpass.h -EXTRA_libcoreutils_a_SOURCES += getpass.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/getpass.c ## end gnulib module getpass-gnu ## begin gnulib module gettext-h -libcoreutils_a_SOURCES += gettext.h +lib_libcoreutils_a_SOURCES += lib/gettext.h ## end gnulib module gettext-h ## begin gnulib module gettime -libcoreutils_a_SOURCES += gettime.c +lib_libcoreutils_a_SOURCES += lib/gettime.c ## end gnulib module gettime ## begin gnulib module gettimeofday -EXTRA_DIST += gettimeofday.c +EXTRA_DIST += lib/gettimeofday.c -EXTRA_libcoreutils_a_SOURCES += gettimeofday.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/gettimeofday.c ## end gnulib module gettimeofday ## begin gnulib module getugroups -libcoreutils_a_SOURCES += getugroups.c +lib_libcoreutils_a_SOURCES += lib/getugroups.c -EXTRA_DIST += getugroups.h +EXTRA_DIST += lib/getugroups.h ## end gnulib module getugroups ## begin gnulib module getusershell -EXTRA_DIST += getusershell.c +EXTRA_DIST += lib/getusershell.c -EXTRA_libcoreutils_a_SOURCES += getusershell.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/getusershell.c ## end gnulib module getusershell @@ -1464,7 +1480,7 @@ EXTRA_DIST += $(top_srcdir)/build-aux/gnu-web-doc-update distclean-local: clean-GNUmakefile clean-GNUmakefile: - test x'$(VPATH)' != x && rm -f $(top_builddir)/GNUmakefile || : + test '$(srcdir)' = . || rm -f $(top_builddir)/GNUmakefile EXTRA_DIST += $(top_srcdir)/GNUmakefile @@ -1486,39 +1502,39 @@ GPERF = gperf ## begin gnulib module group-member -EXTRA_DIST += group-member.c +EXTRA_DIST += lib/group-member.c -EXTRA_libcoreutils_a_SOURCES += group-member.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/group-member.c ## end gnulib module group-member ## begin gnulib module hard-locale -libcoreutils_a_SOURCES += hard-locale.c +lib_libcoreutils_a_SOURCES += lib/hard-locale.c -EXTRA_DIST += hard-locale.h +EXTRA_DIST += lib/hard-locale.h ## end gnulib module hard-locale ## begin gnulib module hash -libcoreutils_a_SOURCES += hash.c +lib_libcoreutils_a_SOURCES += lib/hash.c -EXTRA_DIST += hash.h +EXTRA_DIST += lib/hash.h ## end gnulib module hash ## begin gnulib module hash-pjw -libcoreutils_a_SOURCES += hash-pjw.h hash-pjw.c +lib_libcoreutils_a_SOURCES += lib/hash-pjw.h lib/hash-pjw.c ## end gnulib module hash-pjw ## begin gnulib module hash-triple -libcoreutils_a_SOURCES += hash-triple.c +lib_libcoreutils_a_SOURCES += lib/hash-triple.c -EXTRA_DIST += hash-triple.h +EXTRA_DIST += lib/hash-triple.h ## end gnulib module hash-triple @@ -1531,23 +1547,23 @@ EXTRA_DIST += $(top_srcdir)/build-aux/config.rpath ## begin gnulib module heap -libcoreutils_a_SOURCES += heap.c heap.h +lib_libcoreutils_a_SOURCES += lib/heap.c lib/heap.h ## end gnulib module heap ## begin gnulib module human -libcoreutils_a_SOURCES += human.c +lib_libcoreutils_a_SOURCES += lib/human.c -EXTRA_DIST += human.h +EXTRA_DIST += lib/human.h ## end gnulib module human ## begin gnulib module i-ring -libcoreutils_a_SOURCES += i-ring.c +lib_libcoreutils_a_SOURCES += lib/i-ring.c -EXTRA_DIST += i-ring.h +EXTRA_DIST += lib/i-ring.h ## end gnulib module i-ring @@ -1558,7 +1574,7 @@ BUILT_SOURCES += $(ICONV_H) # We need the following in order to create <iconv.h> when the system # doesn't have one that works with the given compiler. if GL_GENERATE_ICONV_H -iconv.h: iconv.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) +lib/iconv.h: lib/iconv.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' \ @@ -1574,106 +1590,106 @@ iconv.h: iconv.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -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)' \ - < $(srcdir)/iconv.in.h; \ + < $(top_srcdir)/lib/iconv.in.h; \ } > $@-t && \ mv $@-t $@ else -iconv.h: $(top_builddir)/config.status +lib/iconv.h: $(top_builddir)/config.status rm -f $@ endif -MOSTLYCLEANFILES += iconv.h iconv.h-t +MOSTLYCLEANFILES += lib/iconv.h lib/iconv.h-t -EXTRA_DIST += iconv.in.h +EXTRA_DIST += lib/iconv.in.h ## end gnulib module iconv-h ## begin gnulib module iconv_open -iconv_open-aix.h: iconv_open-aix.gperf - $(GPERF) -m 10 $(srcdir)/iconv_open-aix.gperf > $(srcdir)/iconv_open-aix.h-t - mv $(srcdir)/iconv_open-aix.h-t $(srcdir)/iconv_open-aix.h -iconv_open-hpux.h: iconv_open-hpux.gperf - $(GPERF) -m 10 $(srcdir)/iconv_open-hpux.gperf > $(srcdir)/iconv_open-hpux.h-t - mv $(srcdir)/iconv_open-hpux.h-t $(srcdir)/iconv_open-hpux.h -iconv_open-irix.h: iconv_open-irix.gperf - $(GPERF) -m 10 $(srcdir)/iconv_open-irix.gperf > $(srcdir)/iconv_open-irix.h-t - mv $(srcdir)/iconv_open-irix.h-t $(srcdir)/iconv_open-irix.h -iconv_open-osf.h: iconv_open-osf.gperf - $(GPERF) -m 10 $(srcdir)/iconv_open-osf.gperf > $(srcdir)/iconv_open-osf.h-t - mv $(srcdir)/iconv_open-osf.h-t $(srcdir)/iconv_open-osf.h -iconv_open-solaris.h: iconv_open-solaris.gperf - $(GPERF) -m 10 $(srcdir)/iconv_open-solaris.gperf > $(srcdir)/iconv_open-solaris.h-t - mv $(srcdir)/iconv_open-solaris.h-t $(srcdir)/iconv_open-solaris.h -BUILT_SOURCES += iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h -MOSTLYCLEANFILES += iconv_open-aix.h-t iconv_open-hpux.h-t iconv_open-irix.h-t iconv_open-osf.h-t iconv_open-solaris.h-t -MAINTAINERCLEANFILES += iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h -EXTRA_DIST += iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h - -EXTRA_DIST += iconv.c iconv_close.c iconv_open-aix.gperf iconv_open-hpux.gperf iconv_open-irix.gperf iconv_open-osf.gperf iconv_open-solaris.gperf iconv_open.c - -EXTRA_libcoreutils_a_SOURCES += iconv.c iconv_close.c iconv_open.c +lib/iconv_open-aix.h: lib/iconv_open-aix.gperf + $(GPERF) -m 10 $(top_srcdir)/lib/iconv_open-aix.gperf > $(top_srcdir)/lib/iconv_open-aix.h-t + mv $(top_srcdir)/lib/iconv_open-aix.h-t $(top_srcdir)/lib/iconv_open-aix.h +lib/iconv_open-hpux.h: lib/iconv_open-hpux.gperf + $(GPERF) -m 10 $(top_srcdir)/lib/iconv_open-hpux.gperf > $(top_srcdir)/lib/iconv_open-hpux.h-t + mv $(top_srcdir)/lib/iconv_open-hpux.h-t $(top_srcdir)/lib/iconv_open-hpux.h +lib/iconv_open-irix.h: lib/iconv_open-irix.gperf + $(GPERF) -m 10 $(top_srcdir)/lib/iconv_open-irix.gperf > $(top_srcdir)/lib/iconv_open-irix.h-t + mv $(top_srcdir)/lib/iconv_open-irix.h-t $(top_srcdir)/lib/iconv_open-irix.h +lib/iconv_open-osf.h: lib/iconv_open-osf.gperf + $(GPERF) -m 10 $(top_srcdir)/lib/iconv_open-osf.gperf > $(top_srcdir)/lib/iconv_open-osf.h-t + mv $(top_srcdir)/lib/iconv_open-osf.h-t $(top_srcdir)/lib/iconv_open-osf.h +lib/iconv_open-solaris.h: lib/iconv_open-solaris.gperf + $(GPERF) -m 10 $(top_srcdir)/lib/iconv_open-solaris.gperf > $(top_srcdir)/lib/iconv_open-solaris.h-t + mv $(top_srcdir)/lib/iconv_open-solaris.h-t $(top_srcdir)/lib/iconv_open-solaris.h +BUILT_SOURCES += 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 +MOSTLYCLEANFILES += lib/iconv_open-aix.h-t lib/iconv_open-hpux.h-t lib/iconv_open-irix.h-t lib/iconv_open-osf.h-t lib/iconv_open-solaris.h-t +MAINTAINERCLEANFILES += 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 +EXTRA_DIST += 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 + +EXTRA_DIST += lib/iconv.c lib/iconv_close.c lib/iconv_open-aix.gperf lib/iconv_open-hpux.gperf lib/iconv_open-irix.gperf lib/iconv_open-osf.gperf lib/iconv_open-solaris.gperf lib/iconv_open.c + +EXTRA_lib_libcoreutils_a_SOURCES += lib/iconv.c lib/iconv_close.c lib/iconv_open.c ## end gnulib module iconv_open ## begin gnulib module idcache -libcoreutils_a_SOURCES += idcache.c +lib_libcoreutils_a_SOURCES += lib/idcache.c -EXTRA_DIST += idcache.h +EXTRA_DIST += lib/idcache.h ## end gnulib module idcache ## begin gnulib module ignore-value -EXTRA_DIST += ignore-value.h +EXTRA_DIST += lib/ignore-value.h ## end gnulib module ignore-value ## begin gnulib module inet_ntop -EXTRA_DIST += inet_ntop.c +EXTRA_DIST += lib/inet_ntop.c -EXTRA_libcoreutils_a_SOURCES += inet_ntop.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/inet_ntop.c ## end gnulib module inet_ntop ## begin gnulib module ino-map -libcoreutils_a_SOURCES += ino-map.c ino-map.h +lib_libcoreutils_a_SOURCES += lib/ino-map.c lib/ino-map.h ## end gnulib module ino-map ## begin gnulib module intprops -EXTRA_DIST += intprops.h +EXTRA_DIST += lib/intprops.h ## end gnulib module intprops ## begin gnulib module inttostr -libcoreutils_a_SOURCES += \ - imaxtostr.c \ - inttostr.c \ - offtostr.c \ - uinttostr.c \ - umaxtostr.c +lib_libcoreutils_a_SOURCES += \ + lib/imaxtostr.c \ + lib/inttostr.c \ + lib/offtostr.c \ + lib/uinttostr.c \ + lib/umaxtostr.c -EXTRA_DIST += anytostr.c inttostr.h +EXTRA_DIST += lib/anytostr.c lib/inttostr.h -EXTRA_libcoreutils_a_SOURCES += anytostr.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/anytostr.c ## end gnulib module inttostr ## begin gnulib module inttypes-incomplete -BUILT_SOURCES += inttypes.h +BUILT_SOURCES += lib/inttypes.h # We need the following in order to create <inttypes.h> when the system # doesn't have one that works with the given compiler. -inttypes.h: inttypes.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H) +lib/inttypes.h: lib/inttypes.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H) $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \ @@ -1702,85 +1718,85 @@ inttypes.h: inttypes.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_U -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)' \ - < $(srcdir)/inttypes.in.h; \ + < $(top_srcdir)/lib/inttypes.in.h; \ } > $@-t && \ mv $@-t $@ -MOSTLYCLEANFILES += inttypes.h inttypes.h-t +MOSTLYCLEANFILES += lib/inttypes.h lib/inttypes.h-t -EXTRA_DIST += inttypes.in.h +EXTRA_DIST += lib/inttypes.in.h ## end gnulib module inttypes-incomplete ## begin gnulib module isapipe -EXTRA_DIST += isapipe.c isapipe.h +EXTRA_DIST += lib/isapipe.c lib/isapipe.h -EXTRA_libcoreutils_a_SOURCES += isapipe.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/isapipe.c ## end gnulib module isapipe ## begin gnulib module isatty -EXTRA_DIST += isatty.c +EXTRA_DIST += lib/isatty.c -EXTRA_libcoreutils_a_SOURCES += isatty.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/isatty.c ## end gnulib module isatty ## begin gnulib module isblank -EXTRA_DIST += isblank.c +EXTRA_DIST += lib/isblank.c -EXTRA_libcoreutils_a_SOURCES += isblank.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/isblank.c ## end gnulib module isblank ## begin gnulib module isnand-nolibm -EXTRA_DIST += float+.h isnan.c isnand-nolibm.h isnand.c +EXTRA_DIST += lib/float+.h lib/isnan.c lib/isnand-nolibm.h lib/isnand.c -EXTRA_libcoreutils_a_SOURCES += isnan.c isnand.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/isnan.c lib/isnand.c ## end gnulib module isnand-nolibm ## begin gnulib module isnanf-nolibm -EXTRA_DIST += float+.h isnan.c isnanf-nolibm.h isnanf.c +EXTRA_DIST += lib/float+.h lib/isnan.c lib/isnanf-nolibm.h lib/isnanf.c -EXTRA_libcoreutils_a_SOURCES += isnan.c isnanf.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/isnan.c lib/isnanf.c ## end gnulib module isnanf-nolibm ## begin gnulib module isnanl-nolibm -EXTRA_DIST += float+.h isnan.c isnanl-nolibm.h isnanl.c +EXTRA_DIST += lib/float+.h lib/isnan.c lib/isnanl-nolibm.h lib/isnanl.c -EXTRA_libcoreutils_a_SOURCES += isnan.c isnanl.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/isnan.c lib/isnanl.c ## end gnulib module isnanl-nolibm ## begin gnulib module iswblank -EXTRA_DIST += iswblank.c +EXTRA_DIST += lib/iswblank.c -EXTRA_libcoreutils_a_SOURCES += iswblank.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/iswblank.c ## end gnulib module iswblank ## begin gnulib module langinfo -BUILT_SOURCES += langinfo.h +BUILT_SOURCES += lib/langinfo.h # We need the following in order to create an empty placeholder for # <langinfo.h> when the system doesn't have one. -langinfo.h: langinfo.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) +lib/langinfo.h: lib/langinfo.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ @@ -1798,61 +1814,61 @@ langinfo.h: langinfo.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_U -e 's|@''REPLACE_NL_LANGINFO''@|$(REPLACE_NL_LANGINFO)|g' \ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - < $(srcdir)/langinfo.in.h; \ + < $(top_srcdir)/lib/langinfo.in.h; \ } > $@-t && \ mv $@-t $@ -MOSTLYCLEANFILES += langinfo.h langinfo.h-t +MOSTLYCLEANFILES += lib/langinfo.h lib/langinfo.h-t -EXTRA_DIST += langinfo.in.h +EXTRA_DIST += lib/langinfo.in.h ## end gnulib module langinfo ## begin gnulib module lchown -EXTRA_DIST += lchown.c +EXTRA_DIST += lib/lchown.c -EXTRA_libcoreutils_a_SOURCES += lchown.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/lchown.c ## end gnulib module lchown ## begin gnulib module ldtoastr -libcoreutils_a_SOURCES += ldtoastr.c +lib_libcoreutils_a_SOURCES += lib/ldtoastr.c -EXTRA_DIST += ftoastr.c ftoastr.h +EXTRA_DIST += lib/ftoastr.c lib/ftoastr.h -EXTRA_libcoreutils_a_SOURCES += ftoastr.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/ftoastr.c ## end gnulib module ldtoastr ## begin gnulib module linebuffer -libcoreutils_a_SOURCES += linebuffer.h linebuffer.c +lib_libcoreutils_a_SOURCES += lib/linebuffer.h lib/linebuffer.c ## end gnulib module linebuffer ## begin gnulib module link -EXTRA_DIST += link.c +EXTRA_DIST += lib/link.c -EXTRA_libcoreutils_a_SOURCES += link.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/link.c ## end gnulib module link ## begin gnulib module linkat -EXTRA_DIST += at-func2.c linkat.c +EXTRA_DIST += lib/at-func2.c lib/linkat.c -EXTRA_libcoreutils_a_SOURCES += at-func2.c linkat.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/at-func2.c lib/linkat.c ## end gnulib module linkat ## begin gnulib module localcharset -libcoreutils_a_SOURCES += localcharset.h localcharset.c +lib_libcoreutils_a_SOURCES += lib/localcharset.h lib/localcharset.c # We need the following in order to install a simple file in $(libdir) # which is shared with other installed packages. We use a list of referencing @@ -1861,7 +1877,7 @@ libcoreutils_a_SOURCES += localcharset.h localcharset.c # On systems with glibc-2.1 or newer, the file is redundant, therefore we # avoid installing it. -all-local: charset.alias ref-add.sed ref-del.sed +all-local: lib/charset.alias lib/ref-add.sed lib/ref-del.sed charset_alias = $(DESTDIR)$(libdir)/charset.alias charset_tmp = $(DESTDIR)$(libdir)/charset.tmp @@ -1883,12 +1899,12 @@ install-exec-localcharset: all-local $(mkinstalldirs) $(DESTDIR)$(libdir) ; \ fi ; \ if test -f $(charset_alias); then \ - sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \ + sed -f lib/ref-add.sed $(charset_alias) > $(charset_tmp) ; \ $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \ rm -f $(charset_tmp) ; \ else \ if $$need_charset_alias; then \ - sed -f ref-add.sed charset.alias > $(charset_tmp) ; \ + sed -f lib/ref-add.sed lib/charset.alias > $(charset_tmp) ; \ $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \ rm -f $(charset_tmp) ; \ fi ; \ @@ -1897,7 +1913,7 @@ install-exec-localcharset: all-local uninstall-local: uninstall-localcharset uninstall-localcharset: all-local if test -f $(charset_alias); then \ - sed -f ref-del.sed $(charset_alias) > $(charset_tmp); \ + sed -f lib/ref-del.sed $(charset_alias) > $(charset_tmp); \ if grep '^# Packages using this file: $$' $(charset_tmp) \ > /dev/null; then \ rm -f $(charset_alias); \ @@ -1907,30 +1923,30 @@ uninstall-localcharset: all-local rm -f $(charset_tmp); \ fi -charset.alias: config.charset - $(AM_V_GEN)rm -f t-$@ $@ && \ - $(SHELL) $(srcdir)/config.charset '$(host)' > t-$@ && \ - mv t-$@ $@ +lib/charset.alias: lib/config.charset + $(AM_V_GEN)rm -f $@-t $@ && \ + $(SHELL) $(top_srcdir)/lib/config.charset '$(host)' > $@-t && \ + mv $@-t $@ -SUFFIXES += .sed .sin +# SUFFIXES += .sed .sin .sin.sed: - $(AM_V_GEN)rm -f t-$@ $@ && \ - sed -e '/^#/d' -e 's/@''PACKAGE''@/$(PACKAGE)/g' $< > t-$@ && \ - mv t-$@ $@ + $(AM_V_GEN)rm -f $@-t $@ && \ + sed -e '/^#/d' -e 's/@''PACKAGE''@/$(PACKAGE)/g' $< > $@-t && \ + mv $@-t $@ -CLEANFILES += charset.alias ref-add.sed ref-del.sed +CLEANFILES += lib/charset.alias lib/ref-add.sed lib/ref-del.sed -EXTRA_DIST += config.charset ref-add.sin ref-del.sin +EXTRA_DIST += lib/config.charset lib/ref-add.sin lib/ref-del.sin ## end gnulib module localcharset ## begin gnulib module locale -BUILT_SOURCES += locale.h +BUILT_SOURCES += lib/locale.h # We need the following in order to create <locale.h> when the system # doesn't have one that provides all definitions. -locale.h: locale.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) +lib/locale.h: lib/locale.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' \ @@ -1950,53 +1966,53 @@ locale.h: locale.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -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)' \ - < $(srcdir)/locale.in.h; \ + < $(top_srcdir)/lib/locale.in.h; \ } > $@-t && \ mv $@-t $@ -MOSTLYCLEANFILES += locale.h locale.h-t +MOSTLYCLEANFILES += lib/locale.h lib/locale.h-t -EXTRA_DIST += locale.in.h +EXTRA_DIST += lib/locale.in.h ## end gnulib module locale ## begin gnulib module localeconv -EXTRA_DIST += localeconv.c +EXTRA_DIST += lib/localeconv.c -EXTRA_libcoreutils_a_SOURCES += localeconv.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/localeconv.c ## end gnulib module localeconv ## begin gnulib module lock -libcoreutils_a_SOURCES += glthread/lock.h glthread/lock.c +lib_libcoreutils_a_SOURCES += lib/glthread/lock.h lib/glthread/lock.c ## end gnulib module lock ## begin gnulib module long-options -libcoreutils_a_SOURCES += long-options.c +lib_libcoreutils_a_SOURCES += lib/long-options.c -EXTRA_DIST += long-options.h +EXTRA_DIST += lib/long-options.h ## end gnulib module long-options ## begin gnulib module lseek -EXTRA_DIST += lseek.c +EXTRA_DIST += lib/lseek.c -EXTRA_libcoreutils_a_SOURCES += lseek.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/lseek.c ## end gnulib module lseek ## begin gnulib module lstat -EXTRA_DIST += lstat.c +EXTRA_DIST += lib/lstat.c -EXTRA_libcoreutils_a_SOURCES += lstat.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/lstat.c ## end gnulib module lstat @@ -2009,36 +2025,37 @@ EXTRA_DIST += $(top_srcdir)/maint.mk ## begin gnulib module malloc-gnu -EXTRA_DIST += malloc.c +EXTRA_DIST += lib/malloc.c -EXTRA_libcoreutils_a_SOURCES += malloc.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/malloc.c ## end gnulib module malloc-gnu ## begin gnulib module malloc-posix -EXTRA_DIST += malloc.c +EXTRA_DIST += lib/malloc.c -EXTRA_libcoreutils_a_SOURCES += malloc.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/malloc.c ## end gnulib module malloc-posix ## begin gnulib module malloca -libcoreutils_a_SOURCES += malloca.c +lib_libcoreutils_a_SOURCES += lib/malloca.c -EXTRA_DIST += malloca.h malloca.valgrind +EXTRA_DIST += lib/malloca.h lib/malloca.valgrind ## end gnulib module malloca ## begin gnulib module math -BUILT_SOURCES += math.h +BUILT_SOURCES += lib/math.h +lib_libcoreutils_a_SOURCES += lib/math.c # We need the following in order to create <math.h> when the system # doesn't have one that works with the given compiler. -math.h: math.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) +lib/math.h: lib/math.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' \ @@ -2090,7 +2107,7 @@ math.h: math.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $( -e 's/@''GNULIB_HYPOT''@/$(GNULIB_HYPOT)/g' \ -e 's/@''GNULIB_HYPOTF''@/$(GNULIB_HYPOTF)/g' \ -e 's/@''GNULIB_HYPOTL''@/$(GNULIB_HYPOTL)/g' \ - < $(srcdir)/math.in.h | \ + < $(top_srcdir)/lib/math.in.h | \ sed -e 's/@''GNULIB_ILOGB''@/$(GNULIB_ILOGB)/g' \ -e 's/@''GNULIB_ILOGBF''@/$(GNULIB_ILOGBF)/g' \ -e 's/@''GNULIB_ILOGBL''@/$(GNULIB_ILOGBL)/g' \ @@ -2309,296 +2326,296 @@ math.h: math.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $( -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ } > $@-t && \ mv $@-t $@ -MOSTLYCLEANFILES += math.h math.h-t +MOSTLYCLEANFILES += lib/math.h lib/math.h-t -EXTRA_DIST += math.in.h +EXTRA_DIST += lib/math.in.h ## end gnulib module math ## begin gnulib module mbchar -libcoreutils_a_SOURCES += mbchar.c +lib_libcoreutils_a_SOURCES += lib/mbchar.c -EXTRA_DIST += mbchar.h +EXTRA_DIST += lib/mbchar.h ## end gnulib module mbchar ## begin gnulib module mbiter -libcoreutils_a_SOURCES += mbiter.h +lib_libcoreutils_a_SOURCES += lib/mbiter.h lib/mbiter.c ## end gnulib module mbiter ## begin gnulib module mbrlen -EXTRA_DIST += mbrlen.c +EXTRA_DIST += lib/mbrlen.c -EXTRA_libcoreutils_a_SOURCES += mbrlen.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/mbrlen.c ## end gnulib module mbrlen ## begin gnulib module mbrtowc -EXTRA_DIST += mbrtowc.c +EXTRA_DIST += lib/mbrtowc.c -EXTRA_libcoreutils_a_SOURCES += mbrtowc.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/mbrtowc.c ## end gnulib module mbrtowc ## begin gnulib module mbsalign -libcoreutils_a_SOURCES += mbsalign.c mbsalign.h +lib_libcoreutils_a_SOURCES += lib/mbsalign.c lib/mbsalign.h ## end gnulib module mbsalign ## begin gnulib module mbscasecmp -libcoreutils_a_SOURCES += mbscasecmp.c +lib_libcoreutils_a_SOURCES += lib/mbscasecmp.c ## end gnulib module mbscasecmp ## begin gnulib module mbsinit -EXTRA_DIST += mbsinit.c +EXTRA_DIST += lib/mbsinit.c -EXTRA_libcoreutils_a_SOURCES += mbsinit.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/mbsinit.c ## end gnulib module mbsinit ## begin gnulib module mbslen -libcoreutils_a_SOURCES += mbslen.c +lib_libcoreutils_a_SOURCES += lib/mbslen.c ## end gnulib module mbslen ## begin gnulib module mbsrtowcs -EXTRA_DIST += mbsrtowcs-impl.h mbsrtowcs-state.c mbsrtowcs.c +EXTRA_DIST += lib/mbsrtowcs-impl.h lib/mbsrtowcs-state.c lib/mbsrtowcs.c -EXTRA_libcoreutils_a_SOURCES += mbsrtowcs-state.c mbsrtowcs.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/mbsrtowcs-state.c lib/mbsrtowcs.c ## end gnulib module mbsrtowcs ## begin gnulib module mbsstr -libcoreutils_a_SOURCES += mbsstr.c +lib_libcoreutils_a_SOURCES += lib/mbsstr.c -EXTRA_DIST += str-kmp.h +EXTRA_DIST += lib/str-kmp.h ## end gnulib module mbsstr ## begin gnulib module mbswidth -libcoreutils_a_SOURCES += mbswidth.h mbswidth.c +lib_libcoreutils_a_SOURCES += lib/mbswidth.h lib/mbswidth.c ## end gnulib module mbswidth ## begin gnulib module mbtowc -EXTRA_DIST += mbtowc-impl.h mbtowc.c +EXTRA_DIST += lib/mbtowc-impl.h lib/mbtowc.c -EXTRA_libcoreutils_a_SOURCES += mbtowc.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/mbtowc.c ## end gnulib module mbtowc ## begin gnulib module mbuiter -libcoreutils_a_SOURCES += mbuiter.h +lib_libcoreutils_a_SOURCES += lib/mbuiter.h lib/mbuiter.c ## end gnulib module mbuiter ## begin gnulib module memcasecmp -libcoreutils_a_SOURCES += memcasecmp.c +lib_libcoreutils_a_SOURCES += lib/memcasecmp.c -EXTRA_DIST += memcasecmp.h +EXTRA_DIST += lib/memcasecmp.h ## end gnulib module memcasecmp ## begin gnulib module memchr -EXTRA_DIST += memchr.c memchr.valgrind +EXTRA_DIST += lib/memchr.c lib/memchr.valgrind -EXTRA_libcoreutils_a_SOURCES += memchr.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/memchr.c ## end gnulib module memchr ## begin gnulib module memchr2 -libcoreutils_a_SOURCES += memchr2.h memchr2.c +lib_libcoreutils_a_SOURCES += lib/memchr2.h lib/memchr2.c -EXTRA_DIST += memchr2.valgrind +EXTRA_DIST += lib/memchr2.valgrind ## end gnulib module memchr2 ## begin gnulib module memcmp2 -libcoreutils_a_SOURCES += memcmp2.c +lib_libcoreutils_a_SOURCES += lib/memcmp2.c -EXTRA_DIST += memcmp2.h +EXTRA_DIST += lib/memcmp2.h ## end gnulib module memcmp2 ## begin gnulib module memcoll -libcoreutils_a_SOURCES += memcoll.c +lib_libcoreutils_a_SOURCES += lib/memcoll.c -EXTRA_DIST += memcoll.h +EXTRA_DIST += lib/memcoll.h ## end gnulib module memcoll ## begin gnulib module mempcpy -EXTRA_DIST += mempcpy.c +EXTRA_DIST += lib/mempcpy.c -EXTRA_libcoreutils_a_SOURCES += mempcpy.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/mempcpy.c ## end gnulib module mempcpy ## begin gnulib module memrchr -EXTRA_DIST += memrchr.c +EXTRA_DIST += lib/memrchr.c -EXTRA_libcoreutils_a_SOURCES += memrchr.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/memrchr.c ## end gnulib module memrchr ## begin gnulib module mgetgroups -libcoreutils_a_SOURCES += mgetgroups.c +lib_libcoreutils_a_SOURCES += lib/mgetgroups.c -EXTRA_DIST += mgetgroups.h +EXTRA_DIST += lib/mgetgroups.h ## end gnulib module mgetgroups ## begin gnulib module mkancesdirs -libcoreutils_a_SOURCES += mkancesdirs.c +lib_libcoreutils_a_SOURCES += lib/mkancesdirs.c -EXTRA_DIST += mkancesdirs.h +EXTRA_DIST += lib/mkancesdirs.h ## end gnulib module mkancesdirs ## begin gnulib module mkdir -EXTRA_DIST += mkdir.c +EXTRA_DIST += lib/mkdir.c -EXTRA_libcoreutils_a_SOURCES += mkdir.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/mkdir.c ## end gnulib module mkdir ## begin gnulib module mkdir-p -libcoreutils_a_SOURCES += dirchownmod.c mkdir-p.c +lib_libcoreutils_a_SOURCES += lib/dirchownmod.c lib/mkdir-p.c -EXTRA_DIST += dirchownmod.h mkdir-p.h +EXTRA_DIST += lib/dirchownmod.h lib/mkdir-p.h ## end gnulib module mkdir-p ## begin gnulib module mkfifo -EXTRA_DIST += mkfifo.c +EXTRA_DIST += lib/mkfifo.c -EXTRA_libcoreutils_a_SOURCES += mkfifo.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/mkfifo.c ## end gnulib module mkfifo ## begin gnulib module mknod -EXTRA_DIST += mknod.c +EXTRA_DIST += lib/mknod.c -EXTRA_libcoreutils_a_SOURCES += mknod.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/mknod.c ## end gnulib module mknod ## begin gnulib module mkstemp -EXTRA_DIST += mkstemp.c +EXTRA_DIST += lib/mkstemp.c -EXTRA_libcoreutils_a_SOURCES += mkstemp.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/mkstemp.c ## end gnulib module mkstemp ## begin gnulib module mktime -EXTRA_DIST += mktime-internal.h mktime.c +EXTRA_DIST += lib/mktime-internal.h lib/mktime.c -EXTRA_libcoreutils_a_SOURCES += mktime.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/mktime.c ## end gnulib module mktime ## begin gnulib module modechange -libcoreutils_a_SOURCES += modechange.c +lib_libcoreutils_a_SOURCES += lib/modechange.c -EXTRA_DIST += modechange.h +EXTRA_DIST += lib/modechange.h ## end gnulib module modechange ## begin gnulib module mountlist -EXTRA_DIST += mountlist.c mountlist.h +EXTRA_DIST += lib/mountlist.c lib/mountlist.h -EXTRA_libcoreutils_a_SOURCES += mountlist.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/mountlist.c ## end gnulib module mountlist ## begin gnulib module mpsort -libcoreutils_a_SOURCES += mpsort.c +lib_libcoreutils_a_SOURCES += lib/mpsort.c -EXTRA_DIST += mpsort.h +EXTRA_DIST += lib/mpsort.h ## end gnulib module mpsort ## begin gnulib module msvc-inval -EXTRA_DIST += msvc-inval.c msvc-inval.h +EXTRA_DIST += lib/msvc-inval.c lib/msvc-inval.h -EXTRA_libcoreutils_a_SOURCES += msvc-inval.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/msvc-inval.c ## end gnulib module msvc-inval ## begin gnulib module msvc-nothrow -EXTRA_DIST += msvc-nothrow.c msvc-nothrow.h +EXTRA_DIST += lib/msvc-nothrow.c lib/msvc-nothrow.h -EXTRA_libcoreutils_a_SOURCES += msvc-nothrow.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/msvc-nothrow.c ## end gnulib module msvc-nothrow ## begin gnulib module nanosleep -EXTRA_DIST += nanosleep.c +EXTRA_DIST += lib/nanosleep.c -EXTRA_libcoreutils_a_SOURCES += nanosleep.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/nanosleep.c ## end gnulib module nanosleep ## begin gnulib module netdb -BUILT_SOURCES += netdb.h +BUILT_SOURCES += lib/netdb.h # We need the following in order to create <netdb.h> when the system # doesn't have one that works with the given compiler. -netdb.h: netdb.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) +lib/netdb.h: lib/netdb.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' \ @@ -2617,12 +2634,12 @@ netdb.h: netdb.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -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)' \ - < $(srcdir)/netdb.in.h; \ + < $(top_srcdir)/lib/netdb.in.h; \ } > $@-t && \ mv $@-t $@ -MOSTLYCLEANFILES += netdb.h netdb.h-t +MOSTLYCLEANFILES += lib/netdb.h lib/netdb.h-t -EXTRA_DIST += netdb.in.h +EXTRA_DIST += lib/netdb.in.h ## end gnulib module netdb @@ -2633,8 +2650,8 @@ BUILT_SOURCES += $(NETINET_IN_H) # We need the following in order to create <netinet/in.h> when the system # doesn't have one. if GL_GENERATE_NETINET_IN_H -netinet/in.h: netinet_in.in.h $(top_builddir)/config.status - $(AM_V_at)$(MKDIR_P) netinet +lib/netinet/in.h: lib/netinet_in.in.h $(top_builddir)/config.status + $(AM_V_at)$(MKDIR_P) lib/netinet $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ @@ -2643,91 +2660,98 @@ netinet/in.h: netinet_in.in.h $(top_builddir)/config.status -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_NETINET_IN_H''@|$(NEXT_NETINET_IN_H)|g' \ -e 's|@''HAVE_NETINET_IN_H''@|$(HAVE_NETINET_IN_H)|g' \ - < $(srcdir)/netinet_in.in.h; \ + < $(top_srcdir)/lib/netinet_in.in.h; \ } > $@-t && \ mv $@-t $@ else -netinet/in.h: $(top_builddir)/config.status +lib/netinet/in.h: $(top_builddir)/config.status rm -f $@ endif -MOSTLYCLEANFILES += netinet/in.h netinet/in.h-t -MOSTLYCLEANDIRS += netinet +MOSTLYCLEANFILES += lib/netinet/in.h lib/netinet/in.h-t +MOSTLYCLEANDIRS += lib/netinet -EXTRA_DIST += netinet_in.in.h +EXTRA_DIST += lib/netinet_in.in.h ## end gnulib module netinet_in ## begin gnulib module nl_langinfo -EXTRA_DIST += nl_langinfo.c +EXTRA_DIST += lib/nl_langinfo.c -EXTRA_libcoreutils_a_SOURCES += nl_langinfo.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/nl_langinfo.c ## end gnulib module nl_langinfo +## begin gnulib module non-recursive-gnulib-prefix-hack + + +EXTRA_DIST += $(top_srcdir)/build-aux/prefix-gnulib-mk + +## end gnulib module non-recursive-gnulib-prefix-hack + ## begin gnulib module nproc -libcoreutils_a_SOURCES += nproc.c +lib_libcoreutils_a_SOURCES += lib/nproc.c -EXTRA_DIST += nproc.h +EXTRA_DIST += lib/nproc.h ## end gnulib module nproc ## begin gnulib module obstack -EXTRA_DIST += obstack.c obstack.h +EXTRA_DIST += lib/obstack.c lib/obstack.h -EXTRA_libcoreutils_a_SOURCES += obstack.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/obstack.c ## end gnulib module obstack ## begin gnulib module open -EXTRA_DIST += open.c +EXTRA_DIST += lib/open.c -EXTRA_libcoreutils_a_SOURCES += open.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/open.c ## end gnulib module open ## begin gnulib module openat -EXTRA_DIST += openat-priv.h openat.c +EXTRA_DIST += lib/openat.c -EXTRA_libcoreutils_a_SOURCES += openat.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/openat.c ## end gnulib module openat ## begin gnulib module openat-die -libcoreutils_a_SOURCES += openat-die.c +lib_libcoreutils_a_SOURCES += lib/openat-die.c ## end gnulib module openat-die ## begin gnulib module openat-h -EXTRA_DIST += openat.h +EXTRA_DIST += lib/openat.h ## end gnulib module openat-h ## begin gnulib module openat-safer -libcoreutils_a_SOURCES += openat-safer.c +lib_libcoreutils_a_SOURCES += lib/openat-safer.c -EXTRA_DIST += fcntl--.h fcntl-safer.h +EXTRA_DIST += lib/fcntl--.h lib/fcntl-safer.h ## end gnulib module openat-safer ## begin gnulib module opendir -EXTRA_DIST += dirent-private.h opendir.c +EXTRA_DIST += lib/dirent-private.h lib/opendir.c -EXTRA_libcoreutils_a_SOURCES += opendir.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/opendir.c ## end gnulib module opendir @@ -2736,55 +2760,55 @@ EXTRA_libcoreutils_a_SOURCES += opendir.c # This rule overrides the Automake generated .y.c rule, to ensure that the # parse-datetime.c file gets generated in the source directory, not in the # build directory. -parse-datetime.c: parse-datetime.y - $(AM_V_GEN)$(SHELL) $(YLWRAP) $(srcdir)/parse-datetime.y \ +lib/parse-datetime.c: lib/parse-datetime.y + $(AM_V_GEN)$(SHELL) $(YLWRAP) $(top_srcdir)/lib/parse-datetime.y \ y.tab.c parse-datetime.c \ y.tab.h parse-datetime.h \ y.output parse-datetime.output \ -- $(YACC) $(YFLAGS) $(AM_YFLAGS) && \ mv parse-datetime.c parse-datetime.c-t && \ - mv parse-datetime.c-t $(srcdir)/parse-datetime.c -libcoreutils_a_SOURCES += parse-datetime.y -BUILT_SOURCES += parse-datetime.c -MOSTLYCLEANFILES += parse-datetime.c-t -MAINTAINERCLEANFILES += parse-datetime.c -EXTRA_DIST += parse-datetime.c + mv parse-datetime.c-t $(top_srcdir)/lib/parse-datetime.c +lib_libcoreutils_a_SOURCES += lib/parse-datetime.y +BUILT_SOURCES += lib/parse-datetime.c +MOSTLYCLEANFILES += lib/parse-datetime.c-t +MAINTAINERCLEANFILES += lib/parse-datetime.c +EXTRA_DIST += lib/parse-datetime.c -EXTRA_DIST += parse-datetime.h +EXTRA_DIST += lib/parse-datetime.h ## end gnulib module parse-datetime ## begin gnulib module pathmax -EXTRA_DIST += pathmax.h +EXTRA_DIST += lib/pathmax.h ## end gnulib module pathmax ## begin gnulib module physmem -libcoreutils_a_SOURCES += physmem.c +lib_libcoreutils_a_SOURCES += lib/physmem.c -EXTRA_DIST += physmem.h +EXTRA_DIST += lib/physmem.h ## end gnulib module physmem ## begin gnulib module pipe -EXTRA_DIST += pipe.h +EXTRA_DIST += lib/pipe.h ## end gnulib module pipe ## begin gnulib module pipe2 -libcoreutils_a_SOURCES += pipe2.c +lib_libcoreutils_a_SOURCES += lib/pipe2.c ## end gnulib module pipe2 ## begin gnulib module pipe2-safer -libcoreutils_a_SOURCES += pipe2-safer.c +lib_libcoreutils_a_SOURCES += lib/pipe2-safer.c ## end gnulib module pipe2-safer @@ -2795,7 +2819,7 @@ libcoreutils_a_SOURCES += pipe2-safer.c # rm -f $@-t $@ # sed -e 's#@''PREFERABLY_POSIX_SHELL''@#$(PREFERABLY_POSIX_SHELL)#g' \ # -e 's#@''POSIX_SHELL''@#$(POSIX_SHELL)#g' \ -# -e $(srcdir)/$@.in >$@-t +# -e $(top_srcdir)/lib/$@.in >$@-t # chmod a+x $@-t # mv $@-t $@ #EXTRA_DIST += script.in @@ -2806,153 +2830,153 @@ libcoreutils_a_SOURCES += pipe2-safer.c ## begin gnulib module posix_spawn-internal -EXTRA_DIST += spawn_int.h spawni.c +EXTRA_DIST += lib/spawn_int.h lib/spawni.c -EXTRA_libcoreutils_a_SOURCES += 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 += spawn_faction_addclose.c spawn_int.h +EXTRA_DIST += lib/spawn_faction_addclose.c lib/spawn_int.h -EXTRA_libcoreutils_a_SOURCES += spawn_faction_addclose.c +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 += spawn_faction_adddup2.c spawn_int.h +EXTRA_DIST += lib/spawn_faction_adddup2.c lib/spawn_int.h -EXTRA_libcoreutils_a_SOURCES += spawn_faction_adddup2.c +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 += spawn_faction_addopen.c spawn_int.h +EXTRA_DIST += lib/spawn_faction_addopen.c lib/spawn_int.h -EXTRA_libcoreutils_a_SOURCES += spawn_faction_addopen.c +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 += spawn_faction_destroy.c +EXTRA_DIST += lib/spawn_faction_destroy.c -EXTRA_libcoreutils_a_SOURCES += 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 += spawn_faction_init.c spawn_int.h +EXTRA_DIST += lib/spawn_faction_init.c lib/spawn_int.h -EXTRA_libcoreutils_a_SOURCES += spawn_faction_init.c +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 += spawnattr_destroy.c +EXTRA_DIST += lib/spawnattr_destroy.c -EXTRA_libcoreutils_a_SOURCES += 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 += spawnattr_init.c +EXTRA_DIST += lib/spawnattr_init.c -EXTRA_libcoreutils_a_SOURCES += 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 += spawnattr_setflags.c +EXTRA_DIST += lib/spawnattr_setflags.c -EXTRA_libcoreutils_a_SOURCES += 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 += spawnattr_setsigmask.c +EXTRA_DIST += lib/spawnattr_setsigmask.c -EXTRA_libcoreutils_a_SOURCES += 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 += spawnp.c +EXTRA_DIST += lib/spawnp.c -EXTRA_libcoreutils_a_SOURCES += spawnp.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/spawnp.c ## end gnulib module posix_spawnp ## begin gnulib module posixtm -libcoreutils_a_SOURCES += posixtm.c +lib_libcoreutils_a_SOURCES += lib/posixtm.c -EXTRA_DIST += posixtm.h +EXTRA_DIST += lib/posixtm.h ## end gnulib module posixtm ## begin gnulib module posixver -libcoreutils_a_SOURCES += posixver.c +lib_libcoreutils_a_SOURCES += lib/posixver.c -EXTRA_DIST += posixver.h +EXTRA_DIST += lib/posixver.h ## end gnulib module posixver ## begin gnulib module printf-frexp -libcoreutils_a_SOURCES += printf-frexp.c +lib_libcoreutils_a_SOURCES += lib/printf-frexp.c -EXTRA_DIST += printf-frexp.h +EXTRA_DIST += lib/printf-frexp.h ## end gnulib module printf-frexp ## begin gnulib module printf-frexpl -libcoreutils_a_SOURCES += printf-frexpl.c +lib_libcoreutils_a_SOURCES += lib/printf-frexpl.c -EXTRA_DIST += printf-frexp.c printf-frexpl.h +EXTRA_DIST += lib/printf-frexp.c lib/printf-frexpl.h -EXTRA_libcoreutils_a_SOURCES += printf-frexp.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/printf-frexp.c ## end gnulib module printf-frexpl ## begin gnulib module priv-set -libcoreutils_a_SOURCES += priv-set.c +lib_libcoreutils_a_SOURCES += lib/priv-set.c -EXTRA_DIST += priv-set.h +EXTRA_DIST += lib/priv-set.h ## end gnulib module priv-set ## begin gnulib module progname -libcoreutils_a_SOURCES += progname.h progname.c +lib_libcoreutils_a_SOURCES += lib/progname.h lib/progname.c ## end gnulib module progname ## begin gnulib module propername -libcoreutils_a_SOURCES += propername.h propername.c +lib_libcoreutils_a_SOURCES += lib/propername.h lib/propername.c ## end gnulib module propername @@ -2963,7 +2987,7 @@ BUILT_SOURCES += $(PTHREAD_H) # We need the following in order to create <pthread.h> when the system # doesn't have one that works with the given compiler. if GL_GENERATE_PTHREAD_H -pthread.h: pthread.in.h $(top_builddir)/config.status +lib/pthread.h: lib/pthread.in.h $(top_builddir)/config.status $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ @@ -2974,279 +2998,285 @@ pthread.h: pthread.in.h $(top_builddir)/config.status -e 's|@''NEXT_PTHREAD_H''@|$(NEXT_PTHREAD_H)|g' \ -e 's|@''HAVE_PTHREAD_T''@|$(HAVE_PTHREAD_T)|g' \ -e 's|@''HAVE_PTHREAD_SPINLOCK_T''@|$(HAVE_PTHREAD_SPINLOCK_T)|g' \ - < $(srcdir)/pthread.in.h; \ + < $(top_srcdir)/lib/pthread.in.h; \ } > $@-t && \ mv $@-t $@ else -pthread.h: $(top_builddir)/config.status +lib/pthread.h: $(top_builddir)/config.status rm -f $@ endif -MOSTLYCLEANFILES += pthread.h pthread.h-t +MOSTLYCLEANFILES += lib/pthread.h lib/pthread.h-t -EXTRA_DIST += pthread.in.h +EXTRA_DIST += lib/pthread.c lib/pthread.in.h + +EXTRA_lib_libcoreutils_a_SOURCES += lib/pthread.c ## end gnulib module pthread ## begin gnulib module putenv -EXTRA_DIST += putenv.c +EXTRA_DIST += lib/putenv.c -EXTRA_libcoreutils_a_SOURCES += putenv.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/putenv.c ## end gnulib module putenv ## begin gnulib module quote -EXTRA_DIST += quote.h +EXTRA_DIST += lib/quote.h ## end gnulib module quote ## begin gnulib module quotearg -libcoreutils_a_SOURCES += quotearg.c +lib_libcoreutils_a_SOURCES += lib/quotearg.c -EXTRA_DIST += quote.h quotearg.h +EXTRA_DIST += lib/quote.h lib/quotearg.h ## end gnulib module quotearg ## begin gnulib module raise -EXTRA_DIST += raise.c +EXTRA_DIST += lib/raise.c -EXTRA_libcoreutils_a_SOURCES += raise.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/raise.c ## end gnulib module raise ## begin gnulib module randint -libcoreutils_a_SOURCES += randint.c randint.h +lib_libcoreutils_a_SOURCES += lib/randint.c lib/randint.h ## end gnulib module randint ## begin gnulib module randperm -libcoreutils_a_SOURCES += randperm.c randperm.h +lib_libcoreutils_a_SOURCES += lib/randperm.c lib/randperm.h ## end gnulib module randperm ## begin gnulib module randread -libcoreutils_a_SOURCES += randread.c randread.h rand-isaac.c rand-isaac.h +lib_libcoreutils_a_SOURCES += lib/randread.c lib/randread.h lib/rand-isaac.c lib/rand-isaac.h ## end gnulib module randread ## begin gnulib module rawmemchr -EXTRA_DIST += rawmemchr.c rawmemchr.valgrind +EXTRA_DIST += lib/rawmemchr.c lib/rawmemchr.valgrind -EXTRA_libcoreutils_a_SOURCES += rawmemchr.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/rawmemchr.c ## end gnulib module rawmemchr ## begin gnulib module read -EXTRA_DIST += read.c +EXTRA_DIST += lib/read.c -EXTRA_libcoreutils_a_SOURCES += read.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/read.c ## end gnulib module read ## begin gnulib module read-file -libcoreutils_a_SOURCES += read-file.c +lib_libcoreutils_a_SOURCES += lib/read-file.c -EXTRA_DIST += read-file.h +EXTRA_DIST += lib/read-file.h ## end gnulib module read-file ## begin gnulib module readdir -EXTRA_DIST += dirent-private.h readdir.c +EXTRA_DIST += lib/dirent-private.h lib/readdir.c -EXTRA_libcoreutils_a_SOURCES += readdir.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/readdir.c ## end gnulib module readdir ## begin gnulib module readlink -EXTRA_DIST += readlink.c +EXTRA_DIST += lib/readlink.c -EXTRA_libcoreutils_a_SOURCES += readlink.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/readlink.c ## end gnulib module readlink ## begin gnulib module readlinkat -EXTRA_DIST += at-func.c readlinkat.c +EXTRA_DIST += lib/at-func.c lib/readlinkat.c -EXTRA_libcoreutils_a_SOURCES += at-func.c readlinkat.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/at-func.c lib/readlinkat.c ## end gnulib module readlinkat ## begin gnulib module readtokens -libcoreutils_a_SOURCES += readtokens.c +lib_libcoreutils_a_SOURCES += lib/readtokens.c -EXTRA_DIST += readtokens.h +EXTRA_DIST += lib/readtokens.h ## end gnulib module readtokens ## begin gnulib module readtokens0 -libcoreutils_a_SOURCES += readtokens0.h readtokens0.c +lib_libcoreutils_a_SOURCES += lib/readtokens0.h lib/readtokens0.c ## end gnulib module readtokens0 ## begin gnulib module readutmp -EXTRA_DIST += readutmp.c readutmp.h +EXTRA_DIST += lib/readutmp.c lib/readutmp.h -EXTRA_libcoreutils_a_SOURCES += readutmp.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/readutmp.c ## end gnulib module readutmp ## begin gnulib module realloc-gnu -EXTRA_DIST += realloc.c +EXTRA_DIST += lib/realloc.c -EXTRA_libcoreutils_a_SOURCES += realloc.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/realloc.c ## end gnulib module realloc-gnu ## begin gnulib module realloc-posix -EXTRA_DIST += realloc.c +EXTRA_DIST += lib/realloc.c -EXTRA_libcoreutils_a_SOURCES += realloc.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/realloc.c ## end gnulib module realloc-posix ## begin gnulib module regex -EXTRA_DIST += regcomp.c regex.c regex.h regex_internal.c regex_internal.h regexec.c +EXTRA_DIST += lib/regcomp.c lib/regex.c lib/regex.h lib/regex_internal.c lib/regex_internal.h lib/regexec.c -EXTRA_libcoreutils_a_SOURCES += regcomp.c regex.c regex_internal.c regexec.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/regcomp.c lib/regex.c lib/regex_internal.c lib/regexec.c ## end gnulib module regex ## begin gnulib module remove -EXTRA_DIST += remove.c +EXTRA_DIST += lib/remove.c -EXTRA_libcoreutils_a_SOURCES += remove.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/remove.c ## end gnulib module remove ## begin gnulib module rename -EXTRA_DIST += rename.c +EXTRA_DIST += lib/rename.c -EXTRA_libcoreutils_a_SOURCES += rename.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/rename.c ## end gnulib module rename ## begin gnulib module rewinddir -EXTRA_DIST += dirent-private.h rewinddir.c +EXTRA_DIST += lib/dirent-private.h lib/rewinddir.c -EXTRA_libcoreutils_a_SOURCES += rewinddir.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/rewinddir.c ## end gnulib module rewinddir ## begin gnulib module rmdir -EXTRA_DIST += rmdir.c +EXTRA_DIST += lib/rmdir.c -EXTRA_libcoreutils_a_SOURCES += rmdir.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/rmdir.c ## end gnulib module rmdir ## begin gnulib module root-dev-ino +lib_libcoreutils_a_SOURCES += lib/root-dev-ino.c lib/root-dev-ino.h -EXTRA_DIST += root-dev-ino.c root-dev-ino.h +## end gnulib module root-dev-ino -EXTRA_libcoreutils_a_SOURCES += root-dev-ino.c +## begin gnulib module root-uid -## end gnulib module root-dev-ino + +EXTRA_DIST += lib/root-uid.h + +## end gnulib module root-uid ## begin gnulib module rpmatch -EXTRA_DIST += rpmatch.c +EXTRA_DIST += lib/rpmatch.c -EXTRA_libcoreutils_a_SOURCES += rpmatch.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/rpmatch.c ## end gnulib module rpmatch ## begin gnulib module safe-read -libcoreutils_a_SOURCES += safe-read.c +lib_libcoreutils_a_SOURCES += lib/safe-read.c -EXTRA_DIST += safe-read.h +EXTRA_DIST += lib/safe-read.h ## end gnulib module safe-read ## begin gnulib module safe-write -libcoreutils_a_SOURCES += safe-write.c +lib_libcoreutils_a_SOURCES += lib/safe-write.c -EXTRA_DIST += safe-read.c safe-write.h +EXTRA_DIST += lib/safe-read.c lib/safe-write.h -EXTRA_libcoreutils_a_SOURCES += safe-read.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/safe-read.c ## end gnulib module safe-write ## begin gnulib module same -libcoreutils_a_SOURCES += same.c +lib_libcoreutils_a_SOURCES += lib/same.c -EXTRA_DIST += same.h +EXTRA_DIST += lib/same.h ## end gnulib module same ## begin gnulib module same-inode -EXTRA_DIST += same-inode.h +EXTRA_DIST += lib/same-inode.h ## end gnulib module same-inode ## begin gnulib module save-cwd -libcoreutils_a_SOURCES += save-cwd.c +lib_libcoreutils_a_SOURCES += lib/save-cwd.c -EXTRA_DIST += save-cwd.h +EXTRA_DIST += lib/save-cwd.h ## end gnulib module save-cwd ## begin gnulib module savedir -libcoreutils_a_SOURCES += savedir.c +lib_libcoreutils_a_SOURCES += lib/savedir.c -EXTRA_DIST += savedir.h +EXTRA_DIST += lib/savedir.h ## end gnulib module savedir ## begin gnulib module savewd -libcoreutils_a_SOURCES += savewd.h savewd.c +lib_libcoreutils_a_SOURCES += lib/savewd.h lib/savewd.c ## end gnulib module savewd @@ -3257,7 +3287,7 @@ BUILT_SOURCES += $(SCHED_H) # We need the following in order to create a replacement for <sched.h> when # the system doesn't have one. if GL_GENERATE_SCHED_H -sched.h: sched.in.h $(top_builddir)/config.status +lib/sched.h: lib/sched.in.h $(top_builddir)/config.status $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ @@ -3267,44 +3297,44 @@ sched.h: sched.in.h $(top_builddir)/config.status -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_SCHED_H''@|$(NEXT_SCHED_H)|g' \ -e 's|@''HAVE_STRUCT_SCHED_PARAM''@|$(HAVE_STRUCT_SCHED_PARAM)|g' \ - < $(srcdir)/sched.in.h; \ + < $(top_srcdir)/lib/sched.in.h; \ } > $@-t && \ mv $@-t $@ else -sched.h: $(top_builddir)/config.status +lib/sched.h: $(top_builddir)/config.status rm -f $@ endif -MOSTLYCLEANFILES += sched.h sched.h-t +MOSTLYCLEANFILES += lib/sched.h lib/sched.h-t -EXTRA_DIST += sched.in.h +EXTRA_DIST += lib/sched.in.h ## end gnulib module sched ## begin gnulib module select -EXTRA_DIST += select.c +EXTRA_DIST += lib/select.c -EXTRA_libcoreutils_a_SOURCES += select.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/select.c ## end gnulib module select ## begin gnulib module selinux-at -EXTRA_DIST += at-func.c selinux-at.c selinux-at.h +EXTRA_DIST += lib/at-func.c lib/selinux-at.c lib/selinux-at.h -EXTRA_libcoreutils_a_SOURCES += at-func.c selinux-at.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/at-func.c lib/selinux-at.c ## end gnulib module selinux-at ## begin gnulib module selinux-h -libcoreutils_a_SOURCES += se-context.in.h se-selinux.in.h +lib_libcoreutils_a_SOURCES += lib/se-context.in.h lib/se-selinux.in.h lib/se-context.c lib/se-selinux.c -BUILT_SOURCES += selinux/selinux.h -selinux/selinux.h: se-selinux.in.h $(top_builddir)/config.status $(UNUSED_PARAMETER_H) - $(AM_V_at)$(MKDIR_P) selinux +BUILT_SOURCES += lib/selinux/selinux.h +lib/selinux/selinux.h: lib/se-selinux.in.h $(top_builddir)/config.status $(UNUSED_PARAMETER_H) + $(AM_V_at)$(MKDIR_P) lib/selinux $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ @@ -3313,76 +3343,77 @@ selinux/selinux.h: se-selinux.in.h $(top_builddir)/config.status $(UNUSED_PARAME -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_SELINUX_SELINUX_H''@|$(NEXT_SELINUX_SELINUX_H)|g' \ -e '/definition of _GL_UNUSED_PARAMETER/r $(UNUSED_PARAMETER_H)' \ - < $(srcdir)/se-selinux.in.h; \ + < $(top_srcdir)/lib/se-selinux.in.h; \ } > $@-t && \ chmod a-x $@-t && \ mv $@-t $@ -MOSTLYCLEANFILES += selinux/selinux.h selinux/selinux.h-t +MOSTLYCLEANFILES += lib/selinux/selinux.h lib/selinux/selinux.h-t BUILT_SOURCES += $(SELINUX_CONTEXT_H) if GL_GENERATE_SELINUX_CONTEXT_H -selinux/context.h: se-context.in.h $(top_builddir)/config.status $(UNUSED_PARAMETER_H) - $(AM_V_at)$(MKDIR_P) selinux +lib/selinux/context.h: lib/se-context.in.h $(top_builddir)/config.status $(UNUSED_PARAMETER_H) + $(AM_V_at)$(MKDIR_P) lib/selinux $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ sed -e '/definition of _GL_UNUSED_PARAMETER/r $(UNUSED_PARAMETER_H)' \ - < $(srcdir)/se-context.in.h; \ + < $(top_srcdir)/lib/se-context.in.h; \ } > $@-t && \ chmod a-x $@-t && \ mv $@-t $@ else -selinux/context.h: $(top_builddir)/config.status +lib/selinux/context.h: $(top_builddir)/config.status rm -f $@ endif -MOSTLYCLEANFILES += selinux/context.h selinux/context.h-t -MOSTLYCLEANDIRS += selinux +MOSTLYCLEANFILES += lib/selinux/context.h lib/selinux/context.h-t +MOSTLYCLEANDIRS += lib/selinux -EXTRA_DIST += getfilecon.c +EXTRA_DIST += lib/getfilecon.c -EXTRA_libcoreutils_a_SOURCES += getfilecon.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/getfilecon.c ## end gnulib module selinux-h ## begin gnulib module setenv -EXTRA_DIST += setenv.c +EXTRA_DIST += lib/setenv.c -EXTRA_libcoreutils_a_SOURCES += setenv.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/setenv.c ## end gnulib module setenv ## begin gnulib module settime -libcoreutils_a_SOURCES += settime.c +lib_libcoreutils_a_SOURCES += lib/settime.c ## end gnulib module settime ## begin gnulib module sig2str -EXTRA_DIST += sig2str.c sig2str.h +EXTRA_DIST += lib/sig2str.c lib/sig2str.h -EXTRA_libcoreutils_a_SOURCES += sig2str.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/sig2str.c ## end gnulib module sig2str ## begin gnulib module sigaction +lib_libcoreutils_a_SOURCES += lib/sig-handler.c -EXTRA_DIST += sig-handler.h sigaction.c +EXTRA_DIST += lib/sig-handler.h lib/sigaction.c -EXTRA_libcoreutils_a_SOURCES += sigaction.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/sigaction.c ## end gnulib module sigaction ## begin gnulib module signal-h -BUILT_SOURCES += signal.h +BUILT_SOURCES += lib/signal.h # We need the following in order to create <signal.h> when the system # doesn't have a complete one. -signal.h: signal.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) +lib/signal.h: lib/signal.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' \ @@ -3409,36 +3440,36 @@ signal.h: signal.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -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)' \ - < $(srcdir)/signal.in.h; \ + < $(top_srcdir)/lib/signal.in.h; \ } > $@-t && \ mv $@-t $@ -MOSTLYCLEANFILES += signal.h signal.h-t +MOSTLYCLEANFILES += lib/signal.h lib/signal.h-t -EXTRA_DIST += signal.in.h +EXTRA_DIST += lib/signal.in.h ## end gnulib module signal-h ## begin gnulib module signbit -EXTRA_DIST += float+.h signbitd.c signbitf.c signbitl.c +EXTRA_DIST += lib/float+.h lib/signbitd.c lib/signbitf.c lib/signbitl.c -EXTRA_libcoreutils_a_SOURCES += signbitd.c signbitf.c signbitl.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/signbitd.c lib/signbitf.c lib/signbitl.c ## end gnulib module signbit ## begin gnulib module sigprocmask -EXTRA_DIST += sigprocmask.c +EXTRA_DIST += lib/sigprocmask.c -EXTRA_libcoreutils_a_SOURCES += sigprocmask.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/sigprocmask.c ## end gnulib module sigprocmask ## begin gnulib module size_max -libcoreutils_a_SOURCES += size_max.h +lib_libcoreutils_a_SOURCES += lib/size_max.h ## end gnulib module size_max @@ -3461,19 +3492,19 @@ EXTRA_DIST += $(top_srcdir)/build-aux/snippet/_Noreturn.h # present in all Makefile.am that need it. This is ensured by the applicability # 'all' defined above. -BUILT_SOURCES += arg-nonnull.h +BUILT_SOURCES += lib/arg-nonnull.h # 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. -arg-nonnull.h: $(top_srcdir)/build-aux/snippet/arg-nonnull.h +lib/arg-nonnull.h: $(top_srcdir)/build-aux/snippet/arg-nonnull.h $(AM_V_GEN)rm -f $@-t $@ && \ sed -n -e '/GL_ARG_NONNULL/,$$p' \ < $(top_srcdir)/build-aux/snippet/arg-nonnull.h \ > $@-t && \ mv $@-t $@ -MOSTLYCLEANFILES += arg-nonnull.h arg-nonnull.h-t +MOSTLYCLEANFILES += lib/arg-nonnull.h lib/arg-nonnull.h-t -ARG_NONNULL_H=arg-nonnull.h +ARG_NONNULL_H=lib/arg-nonnull.h EXTRA_DIST += $(top_srcdir)/build-aux/snippet/arg-nonnull.h @@ -3486,18 +3517,18 @@ EXTRA_DIST += $(top_srcdir)/build-aux/snippet/arg-nonnull.h # present in all Makefile.am that need it. This is ensured by the applicability # 'all' defined above. -BUILT_SOURCES += c++defs.h +BUILT_SOURCES += lib/c++defs.h # The c++defs.h that gets inserted into generated .h files is the same as # build-aux/snippet/c++defs.h, except that it has the copyright header cut off. -c++defs.h: $(top_srcdir)/build-aux/snippet/c++defs.h +lib/c++defs.h: $(top_srcdir)/build-aux/snippet/c++defs.h $(AM_V_GEN)rm -f $@-t $@ && \ sed -n -e '/_GL_CXXDEFS/,$$p' \ < $(top_srcdir)/build-aux/snippet/c++defs.h \ > $@-t && \ mv $@-t $@ -MOSTLYCLEANFILES += c++defs.h c++defs.h-t +MOSTLYCLEANFILES += lib/c++defs.h lib/c++defs.h-t -CXXDEFS_H=c++defs.h +CXXDEFS_H=lib/c++defs.h EXTRA_DIST += $(top_srcdir)/build-aux/snippet/c++defs.h @@ -3510,19 +3541,19 @@ EXTRA_DIST += $(top_srcdir)/build-aux/snippet/c++defs.h # present in all Makefile.am that need it. This is ensured by the applicability # 'all' defined above. -BUILT_SOURCES += unused-parameter.h +BUILT_SOURCES += lib/unused-parameter.h # The unused-parameter.h that gets inserted into generated .h files is the same # as build-aux/snippet/unused-parameter.h, except that it has the copyright # header cut off. -unused-parameter.h: $(top_srcdir)/build-aux/snippet/unused-parameter.h +lib/unused-parameter.h: $(top_srcdir)/build-aux/snippet/unused-parameter.h $(AM_V_GEN)rm -f $@-t $@ && \ sed -n -e '/GL_UNUSED_PARAMETER/,$$p' \ < $(top_srcdir)/build-aux/snippet/unused-parameter.h \ > $@-t && \ mv $@-t $@ -MOSTLYCLEANFILES += unused-parameter.h unused-parameter.h-t +MOSTLYCLEANFILES += lib/unused-parameter.h lib/unused-parameter.h-t -UNUSED_PARAMETER_H=unused-parameter.h +UNUSED_PARAMETER_H=lib/unused-parameter.h EXTRA_DIST += $(top_srcdir)/build-aux/snippet/unused-parameter.h @@ -3530,19 +3561,19 @@ EXTRA_DIST += $(top_srcdir)/build-aux/snippet/unused-parameter.h ## begin gnulib module snippet/warn-on-use -BUILT_SOURCES += warn-on-use.h +BUILT_SOURCES += lib/warn-on-use.h # The warn-on-use.h that gets inserted into generated .h files is the same as # build-aux/snippet/warn-on-use.h, except that it has the copyright header cut # off. -warn-on-use.h: $(top_srcdir)/build-aux/snippet/warn-on-use.h +lib/warn-on-use.h: $(top_srcdir)/build-aux/snippet/warn-on-use.h $(AM_V_GEN)rm -f $@-t $@ && \ sed -n -e '/^.ifndef/,$$p' \ < $(top_srcdir)/build-aux/snippet/warn-on-use.h \ > $@-t && \ mv $@-t $@ -MOSTLYCLEANFILES += warn-on-use.h warn-on-use.h-t +MOSTLYCLEANFILES += lib/warn-on-use.h lib/warn-on-use.h-t -WARN_ON_USE_H=warn-on-use.h +WARN_ON_USE_H=lib/warn-on-use.h EXTRA_DIST += $(top_srcdir)/build-aux/snippet/warn-on-use.h @@ -3551,27 +3582,27 @@ EXTRA_DIST += $(top_srcdir)/build-aux/snippet/warn-on-use.h ## begin gnulib module snprintf -EXTRA_DIST += snprintf.c +EXTRA_DIST += lib/snprintf.c -EXTRA_libcoreutils_a_SOURCES += snprintf.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/snprintf.c ## end gnulib module snprintf ## begin gnulib module sockets -libcoreutils_a_SOURCES += sockets.h sockets.c +lib_libcoreutils_a_SOURCES += lib/sockets.h lib/sockets.c -EXTRA_DIST += w32sock.h +EXTRA_DIST += lib/w32sock.h ## end gnulib module sockets ## begin gnulib module spawn -BUILT_SOURCES += spawn.h +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. -spawn.h: spawn.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) +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' \ @@ -3611,51 +3642,58 @@ spawn.h: spawn.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -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)' \ - < $(srcdir)/spawn.in.h; \ + < $(top_srcdir)/lib/spawn.in.h; \ } > $@-t && \ mv $@-t $@ -MOSTLYCLEANFILES += spawn.h spawn.h-t +MOSTLYCLEANFILES += lib/spawn.h lib/spawn.h-t -EXTRA_DIST += spawn.in.h +EXTRA_DIST += lib/spawn.in.h ## end gnulib module spawn ## begin gnulib module spawn-pipe -libcoreutils_a_SOURCES += spawn-pipe.h spawn-pipe.c w32spawn.h +lib_libcoreutils_a_SOURCES += lib/spawn-pipe.h lib/spawn-pipe.c lib/w32spawn.h ## end gnulib module spawn-pipe ## begin gnulib module stat -EXTRA_DIST += stat.c +EXTRA_DIST += lib/stat.c -EXTRA_libcoreutils_a_SOURCES += stat.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/stat.c ## end gnulib module stat ## begin gnulib module stat-macros -EXTRA_DIST += stat-macros.h +EXTRA_DIST += lib/stat-macros.h ## end gnulib module stat-macros ## begin gnulib module stat-size -EXTRA_DIST += stat-size.h +EXTRA_DIST += lib/stat-size.h ## end gnulib module stat-size ## begin gnulib module stat-time +lib_libcoreutils_a_SOURCES += lib/stat-time.c -EXTRA_DIST += stat-time.h +EXTRA_DIST += lib/stat-time.h ## end gnulib module stat-time +## begin gnulib module statat + +lib_libcoreutils_a_SOURCES += lib/statat.c + +## end gnulib module statat + ## begin gnulib module stdalign BUILT_SOURCES += $(STDALIGN_H) @@ -3663,19 +3701,19 @@ BUILT_SOURCES += $(STDALIGN_H) # We need the following in order to create <stdalign.h> when the system # doesn't have one that works. if GL_GENERATE_STDALIGN_H -stdalign.h: stdalign.in.h $(top_builddir)/config.status +lib/stdalign.h: lib/stdalign.in.h $(top_builddir)/config.status $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - cat $(srcdir)/stdalign.in.h; \ + cat $(top_srcdir)/lib/stdalign.in.h; \ } > $@-t && \ mv $@-t $@ else -stdalign.h: $(top_builddir)/config.status +lib/stdalign.h: $(top_builddir)/config.status rm -f $@ endif -MOSTLYCLEANFILES += stdalign.h stdalign.h-t +MOSTLYCLEANFILES += lib/stdalign.h lib/stdalign.h-t -EXTRA_DIST += stdalign.in.h +EXTRA_DIST += lib/stdalign.in.h ## end gnulib module stdalign @@ -3686,7 +3724,7 @@ BUILT_SOURCES += $(STDARG_H) # We need the following in order to create <stdarg.h> when the system # doesn't have one that works with the given compiler. if GL_GENERATE_STDARG_H -stdarg.h: stdarg.in.h $(top_builddir)/config.status +lib/stdarg.h: lib/stdarg.in.h $(top_builddir)/config.status $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ @@ -3694,16 +3732,16 @@ stdarg.h: stdarg.in.h $(top_builddir)/config.status -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_STDARG_H''@|$(NEXT_STDARG_H)|g' \ - < $(srcdir)/stdarg.in.h; \ + < $(top_srcdir)/lib/stdarg.in.h; \ } > $@-t && \ mv $@-t $@ else -stdarg.h: $(top_builddir)/config.status +lib/stdarg.h: $(top_builddir)/config.status rm -f $@ endif -MOSTLYCLEANFILES += stdarg.h stdarg.h-t +MOSTLYCLEANFILES += lib/stdarg.h lib/stdarg.h-t -EXTRA_DIST += stdarg.in.h +EXTRA_DIST += lib/stdarg.in.h ## end gnulib module stdarg @@ -3714,19 +3752,19 @@ BUILT_SOURCES += $(STDBOOL_H) # We need the following in order to create <stdbool.h> when the system # doesn't have one that works. if GL_GENERATE_STDBOOL_H -stdbool.h: stdbool.in.h $(top_builddir)/config.status +lib/stdbool.h: lib/stdbool.in.h $(top_builddir)/config.status $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool.in.h; \ + sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(top_srcdir)/lib/stdbool.in.h; \ } > $@-t && \ mv $@-t $@ else -stdbool.h: $(top_builddir)/config.status +lib/stdbool.h: $(top_builddir)/config.status rm -f $@ endif -MOSTLYCLEANFILES += stdbool.h stdbool.h-t +MOSTLYCLEANFILES += lib/stdbool.h lib/stdbool.h-t -EXTRA_DIST += stdbool.in.h +EXTRA_DIST += lib/stdbool.in.h ## end gnulib module stdbool @@ -3737,7 +3775,7 @@ BUILT_SOURCES += $(STDDEF_H) # We need the following in order to create <stddef.h> when the system # doesn't have one that works with the given compiler. if GL_GENERATE_STDDEF_H -stddef.h: stddef.in.h $(top_builddir)/config.status +lib/stddef.h: lib/stddef.in.h $(top_builddir)/config.status $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ @@ -3747,16 +3785,16 @@ stddef.h: stddef.in.h $(top_builddir)/config.status -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \ -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \ -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \ - < $(srcdir)/stddef.in.h; \ + < $(top_srcdir)/lib/stddef.in.h; \ } > $@-t && \ mv $@-t $@ else -stddef.h: $(top_builddir)/config.status +lib/stddef.h: $(top_builddir)/config.status rm -f $@ endif -MOSTLYCLEANFILES += stddef.h stddef.h-t +MOSTLYCLEANFILES += lib/stddef.h lib/stddef.h-t -EXTRA_DIST += stddef.in.h +EXTRA_DIST += lib/stddef.in.h ## end gnulib module stddef @@ -3767,7 +3805,7 @@ BUILT_SOURCES += $(STDINT_H) # We need the following in order to create <stdint.h> when the system # doesn't have one that works with the given compiler. if GL_GENERATE_STDINT_H -stdint.h: stdint.in.h $(top_builddir)/config.status +lib/stdint.h: lib/stdint.in.h $(top_builddir)/config.status $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ @@ -3797,26 +3835,26 @@ stdint.h: stdint.in.h $(top_builddir)/config.status -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \ -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \ -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \ - < $(srcdir)/stdint.in.h; \ + < $(top_srcdir)/lib/stdint.in.h; \ } > $@-t && \ mv $@-t $@ else -stdint.h: $(top_builddir)/config.status +lib/stdint.h: $(top_builddir)/config.status rm -f $@ endif -MOSTLYCLEANFILES += stdint.h stdint.h-t +MOSTLYCLEANFILES += lib/stdint.h lib/stdint.h-t -EXTRA_DIST += stdint.in.h +EXTRA_DIST += lib/stdint.in.h ## end gnulib module stdint ## begin gnulib module stdio -BUILT_SOURCES += stdio.h +BUILT_SOURCES += lib/stdio.h # We need the following in order to create <stdio.h> when the system # doesn't have one that works with the given compiler. -stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) +lib/stdio.h: lib/stdio.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' \ @@ -3877,7 +3915,7 @@ stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's/@''GNULIB_VPRINTF_POSIX''@/$(GNULIB_VPRINTF_POSIX)/g' \ -e 's/@''GNULIB_VSNPRINTF''@/$(GNULIB_VSNPRINTF)/g' \ -e 's/@''GNULIB_VSPRINTF_POSIX''@/$(GNULIB_VSPRINTF_POSIX)/g' \ - < $(srcdir)/stdio.in.h | \ + < $(top_srcdir)/lib/stdio.in.h | \ sed -e 's|@''HAVE_DECL_FPURGE''@|$(HAVE_DECL_FPURGE)|g' \ -e 's|@''HAVE_DECL_FSEEKO''@|$(HAVE_DECL_FSEEKO)|g' \ -e 's|@''HAVE_DECL_FTELLO''@|$(HAVE_DECL_FTELLO)|g' \ @@ -3932,19 +3970,19 @@ stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ } > $@-t && \ mv $@-t $@ -MOSTLYCLEANFILES += stdio.h stdio.h-t +MOSTLYCLEANFILES += lib/stdio.h lib/stdio.h-t -EXTRA_DIST += stdio.in.h +EXTRA_DIST += lib/stdio.in.h ## end gnulib module stdio ## begin gnulib module stdlib -BUILT_SOURCES += stdlib.h +BUILT_SOURCES += lib/stdlib.h # We need the following in order to create <stdlib.h> when the system # doesn't have one that works with the given compiler. -stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ +lib/stdlib.h: lib/stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ $(_NORETURN_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ @@ -3984,7 +4022,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e 's/@''GNULIB_UNLOCKPT''@/$(GNULIB_UNLOCKPT)/g' \ -e 's/@''GNULIB_UNSETENV''@/$(GNULIB_UNSETENV)/g' \ -e 's/@''GNULIB_WCTOMB''@/$(GNULIB_WCTOMB)/g' \ - < $(srcdir)/stdlib.in.h | \ + < $(top_srcdir)/lib/stdlib.in.h | \ sed -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \ -e 's|@''HAVE_ATOLL''@|$(HAVE_ATOLL)|g' \ -e 's|@''HAVE_CANONICALIZE_FILE_NAME''@|$(HAVE_CANONICALIZE_FILE_NAME)|g' \ @@ -4017,6 +4055,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e 's|@''REPLACE_MALLOC''@|$(REPLACE_MALLOC)|g' \ -e 's|@''REPLACE_MBTOWC''@|$(REPLACE_MBTOWC)|g' \ -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \ + -e 's|@''REPLACE_PTSNAME''@|$(REPLACE_PTSNAME)|g' \ -e 's|@''REPLACE_PTSNAME_R''@|$(REPLACE_PTSNAME_R)|g' \ -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \ -e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \ @@ -4032,101 +4071,92 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ } > $@-t && \ mv $@-t $@ -MOSTLYCLEANFILES += stdlib.h stdlib.h-t +MOSTLYCLEANFILES += lib/stdlib.h lib/stdlib.h-t -EXTRA_DIST += stdlib.in.h +EXTRA_DIST += lib/stdlib.in.h ## end gnulib module stdlib ## begin gnulib module stdlib-safer -libcoreutils_a_SOURCES += mkstemp-safer.c +lib_libcoreutils_a_SOURCES += lib/mkstemp-safer.c -EXTRA_DIST += stdlib--.h stdlib-safer.h +EXTRA_DIST += lib/stdlib--.h lib/stdlib-safer.h ## end gnulib module stdlib-safer ## begin gnulib module stpcpy -EXTRA_DIST += stpcpy.c +EXTRA_DIST += lib/stpcpy.c -EXTRA_libcoreutils_a_SOURCES += stpcpy.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/stpcpy.c ## end gnulib module stpcpy ## begin gnulib module stpncpy -EXTRA_DIST += stpncpy.c +EXTRA_DIST += lib/stpncpy.c -EXTRA_libcoreutils_a_SOURCES += stpncpy.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/stpncpy.c ## end gnulib module stpncpy -## begin gnulib module strcase - - -EXTRA_DIST += strcasecmp.c strncasecmp.c - -EXTRA_libcoreutils_a_SOURCES += strcasecmp.c strncasecmp.c - -## end gnulib module strcase - ## begin gnulib module strchrnul -EXTRA_DIST += strchrnul.c strchrnul.valgrind +EXTRA_DIST += lib/strchrnul.c lib/strchrnul.valgrind -EXTRA_libcoreutils_a_SOURCES += strchrnul.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/strchrnul.c ## end gnulib module strchrnul ## begin gnulib module strdup-posix -EXTRA_DIST += strdup.c +EXTRA_DIST += lib/strdup.c -EXTRA_libcoreutils_a_SOURCES += strdup.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/strdup.c ## end gnulib module strdup-posix ## begin gnulib module streq -EXTRA_DIST += streq.h +EXTRA_DIST += lib/streq.h ## end gnulib module streq ## begin gnulib module strerror -EXTRA_DIST += strerror.c +EXTRA_DIST += lib/strerror.c -EXTRA_libcoreutils_a_SOURCES += strerror.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/strerror.c ## end gnulib module strerror ## begin gnulib module strerror-override -EXTRA_DIST += strerror-override.c strerror-override.h +EXTRA_DIST += lib/strerror-override.c lib/strerror-override.h -EXTRA_libcoreutils_a_SOURCES += strerror-override.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/strerror-override.c ## end gnulib module strerror-override ## begin gnulib module strftime -libcoreutils_a_SOURCES += strftime.c +lib_libcoreutils_a_SOURCES += lib/strftime.c -EXTRA_DIST += strftime.h +EXTRA_DIST += lib/strftime.h ## end gnulib module strftime ## begin gnulib module striconv -libcoreutils_a_SOURCES += striconv.h striconv.c +lib_libcoreutils_a_SOURCES += lib/striconv.h lib/striconv.c if GL_COND_LIBTOOL endif @@ -4134,11 +4164,11 @@ endif ## begin gnulib module string -BUILT_SOURCES += string.h +BUILT_SOURCES += lib/string.h # We need the following in order to create <string.h> when the system # doesn't have one that works with the given compiler. -string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) +lib/string.h: lib/string.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' \ @@ -4183,7 +4213,7 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's/@''GNULIB_STRERROR_R''@/$(GNULIB_STRERROR_R)/g' \ -e 's/@''GNULIB_STRSIGNAL''@/$(GNULIB_STRSIGNAL)/g' \ -e 's/@''GNULIB_STRVERSCMP''@/$(GNULIB_STRVERSCMP)/g' \ - < $(srcdir)/string.in.h | \ + < $(top_srcdir)/lib/string.in.h | \ sed -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \ -e 's|@''HAVE_FFSLL''@|$(HAVE_FFSLL)|g' \ -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \ @@ -4223,168 +4253,145 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -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)'; \ - < $(srcdir)/string.in.h; \ + < $(top_srcdir)/lib/string.in.h; \ } > $@-t && \ mv $@-t $@ -MOSTLYCLEANFILES += string.h string.h-t +MOSTLYCLEANFILES += lib/string.h lib/string.h-t -EXTRA_DIST += string.in.h +EXTRA_DIST += lib/string.in.h ## end gnulib module string -## begin gnulib module strings - -BUILT_SOURCES += strings.h - -# We need the following in order to create <strings.h> when the system -# doesn't have one that works with the given compiler. -strings.h: strings.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H) - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ - sed -e 's|@''GUARD_PREFIX''@|GL|g' \ - -e 's|@''HAVE_STRINGS_H''@|$(HAVE_STRINGS_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_STRINGS_H''@|$(NEXT_STRINGS_H)|g' \ - -e 's|@''GNULIB_FFS''@|$(GNULIB_FFS)|g' \ - -e 's|@''HAVE_FFS''@|$(HAVE_FFS)|g' \ - -e 's|@''HAVE_STRCASECMP''@|$(HAVE_STRCASECMP)|g' \ - -e 's|@''HAVE_DECL_STRNCASECMP''@|$(HAVE_DECL_STRNCASECMP)|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)' \ - < $(srcdir)/strings.in.h; \ - } > $@-t && \ - mv $@-t $@ -MOSTLYCLEANFILES += strings.h strings.h-t - -EXTRA_DIST += strings.in.h - -## end gnulib module strings - ## begin gnulib module strncat -EXTRA_DIST += strncat.c +EXTRA_DIST += lib/strncat.c -EXTRA_libcoreutils_a_SOURCES += strncat.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/strncat.c ## end gnulib module strncat ## begin gnulib module strndup -EXTRA_DIST += strndup.c +EXTRA_DIST += lib/strndup.c -EXTRA_libcoreutils_a_SOURCES += strndup.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/strndup.c ## end gnulib module strndup ## begin gnulib module strnlen -EXTRA_DIST += strnlen.c +EXTRA_DIST += lib/strnlen.c -EXTRA_libcoreutils_a_SOURCES += strnlen.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/strnlen.c ## end gnulib module strnlen ## begin gnulib module strnlen1 -libcoreutils_a_SOURCES += strnlen1.h strnlen1.c +lib_libcoreutils_a_SOURCES += lib/strnlen1.h lib/strnlen1.c ## end gnulib module strnlen1 +## begin gnulib module strnumcmp + +lib_libcoreutils_a_SOURCES += lib/strintcmp.c lib/strnumcmp.c lib/strnumcmp.h + +EXTRA_DIST += lib/strnumcmp-in.h + +## end gnulib module strnumcmp + ## begin gnulib module strpbrk -EXTRA_DIST += strpbrk.c +EXTRA_DIST += lib/strpbrk.c -EXTRA_libcoreutils_a_SOURCES += strpbrk.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/strpbrk.c ## end gnulib module strpbrk ## begin gnulib module strsignal -EXTRA_DIST += siglist.h strsignal.c +EXTRA_DIST += lib/siglist.h lib/strsignal.c -EXTRA_libcoreutils_a_SOURCES += strsignal.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/strsignal.c ## end gnulib module strsignal ## begin gnulib module strstr-simple -EXTRA_DIST += str-two-way.h strstr.c +EXTRA_DIST += lib/str-two-way.h lib/strstr.c -EXTRA_libcoreutils_a_SOURCES += strstr.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/strstr.c ## end gnulib module strstr-simple ## begin gnulib module strtod -EXTRA_DIST += strtod.c +EXTRA_DIST += lib/strtod.c -EXTRA_libcoreutils_a_SOURCES += strtod.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/strtod.c ## end gnulib module strtod ## begin gnulib module strtoimax -EXTRA_DIST += strtoimax.c +EXTRA_DIST += lib/strtoimax.c -EXTRA_libcoreutils_a_SOURCES += strtoimax.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/strtoimax.c ## end gnulib module strtoimax ## begin gnulib module strtoll -EXTRA_DIST += strtol.c strtoll.c +EXTRA_DIST += lib/strtol.c lib/strtoll.c -EXTRA_libcoreutils_a_SOURCES += strtol.c strtoll.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/strtol.c lib/strtoll.c ## end gnulib module strtoll ## begin gnulib module strtoull -EXTRA_DIST += strtol.c strtoul.c strtoull.c +EXTRA_DIST += lib/strtol.c lib/strtoul.c lib/strtoull.c -EXTRA_libcoreutils_a_SOURCES += strtol.c strtoul.c strtoull.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/strtol.c lib/strtoul.c lib/strtoull.c ## end gnulib module strtoull ## begin gnulib module strtoumax -EXTRA_DIST += strtoimax.c strtoumax.c +EXTRA_DIST += lib/strtoimax.c lib/strtoumax.c -EXTRA_libcoreutils_a_SOURCES += strtoimax.c strtoumax.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/strtoimax.c lib/strtoumax.c ## end gnulib module strtoumax ## begin gnulib module symlink -EXTRA_DIST += symlink.c +EXTRA_DIST += lib/symlink.c -EXTRA_libcoreutils_a_SOURCES += symlink.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/symlink.c ## end gnulib module symlink ## begin gnulib module sys_ioctl -BUILT_SOURCES += sys/ioctl.h +BUILT_SOURCES += lib/sys/ioctl.h # We need the following in order to create <sys/ioctl.h> when the system # does not have a complete one. -sys/ioctl.h: sys_ioctl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) - $(AM_V_at)$(MKDIR_P) sys +lib/sys/ioctl.h: lib/sys_ioctl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) + $(AM_V_at)$(MKDIR_P) lib/sys $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ @@ -4399,24 +4406,24 @@ sys/ioctl.h: sys_ioctl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON -e 's|@''REPLACE_IOCTL''@|$(REPLACE_IOCTL)|g' \ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - < $(srcdir)/sys_ioctl.in.h; \ + < $(top_srcdir)/lib/sys_ioctl.in.h; \ } > $@-t && \ mv $@-t $@ -MOSTLYCLEANFILES += sys/ioctl.h sys/ioctl.h-t -MOSTLYCLEANDIRS += sys +MOSTLYCLEANFILES += lib/sys/ioctl.h lib/sys/ioctl.h-t +MOSTLYCLEANDIRS += lib/sys -EXTRA_DIST += sys_ioctl.in.h +EXTRA_DIST += lib/sys_ioctl.in.h ## end gnulib module sys_ioctl ## begin gnulib module sys_resource -BUILT_SOURCES += sys/resource.h +BUILT_SOURCES += lib/sys/resource.h # We need the following in order to create <sys/resource.h> when the system # doesn't have one. -sys/resource.h: sys_resource.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_at)$(MKDIR_P) sys +lib/sys/resource.h: lib/sys_resource.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) + $(AM_V_at)$(MKDIR_P) lib/sys $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ @@ -4430,24 +4437,24 @@ sys/resource.h: sys_resource.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(A -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)' \ - < $(srcdir)/sys_resource.in.h; \ + < $(top_srcdir)/lib/sys_resource.in.h; \ } > $@-t && \ mv -f $@-t $@ -MOSTLYCLEANFILES += sys/resource.h sys/resource.h-t -MOSTLYCLEANDIRS += sys +MOSTLYCLEANFILES += lib/sys/resource.h lib/sys/resource.h-t +MOSTLYCLEANDIRS += lib/sys -EXTRA_DIST += sys_resource.in.h +EXTRA_DIST += lib/sys_resource.in.h ## end gnulib module sys_resource ## begin gnulib module sys_select -BUILT_SOURCES += sys/select.h +BUILT_SOURCES += lib/sys/select.h # We need the following in order to create <sys/select.h> when the system # doesn't have one that works with the given compiler. -sys/select.h: sys_select.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) - $(AM_V_at)$(MKDIR_P) sys +lib/sys/select.h: lib/sys_select.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) + $(AM_V_at)$(MKDIR_P) lib/sys $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ @@ -4464,24 +4471,25 @@ sys/select.h: sys_select.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ -e 's|@''REPLACE_SELECT''@|$(REPLACE_SELECT)|g' \ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - < $(srcdir)/sys_select.in.h; \ + < $(top_srcdir)/lib/sys_select.in.h; \ } > $@-t && \ mv $@-t $@ -MOSTLYCLEANFILES += sys/select.h sys/select.h-t -MOSTLYCLEANDIRS += sys +MOSTLYCLEANFILES += lib/sys/select.h lib/sys/select.h-t +MOSTLYCLEANDIRS += lib/sys -EXTRA_DIST += sys_select.in.h +EXTRA_DIST += lib/sys_select.in.h ## end gnulib module sys_select ## begin gnulib module sys_socket -BUILT_SOURCES += sys/socket.h +BUILT_SOURCES += lib/sys/socket.h +lib_libcoreutils_a_SOURCES += lib/sys_socket.c # We need the following in order to create <sys/socket.h> when the system # doesn't have one that works with the given compiler. -sys/socket.h: sys_socket.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H) - $(AM_V_at)$(MKDIR_P) sys +lib/sys/socket.h: lib/sys_socket.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H) + $(AM_V_at)$(MKDIR_P) lib/sys $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ @@ -4515,24 +4523,24 @@ sys/socket.h: sys_socket.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ -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)' \ - < $(srcdir)/sys_socket.in.h; \ + < $(top_srcdir)/lib/sys_socket.in.h; \ } > $@-t && \ mv -f $@-t $@ -MOSTLYCLEANFILES += sys/socket.h sys/socket.h-t -MOSTLYCLEANDIRS += sys +MOSTLYCLEANFILES += lib/sys/socket.h lib/sys/socket.h-t +MOSTLYCLEANDIRS += lib/sys -EXTRA_DIST += sys_socket.in.h +EXTRA_DIST += lib/sys_socket.in.h ## end gnulib module sys_socket ## begin gnulib module sys_stat -BUILT_SOURCES += sys/stat.h +BUILT_SOURCES += lib/sys/stat.h # We need the following in order to create <sys/stat.h> when the system # has one that is incomplete. -sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_at)$(MKDIR_P) sys +lib/sys/stat.h: lib/sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) + $(AM_V_at)$(MKDIR_P) lib/sys $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ @@ -4577,24 +4585,24 @@ sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU -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)' \ - < $(srcdir)/sys_stat.in.h; \ + < $(top_srcdir)/lib/sys_stat.in.h; \ } > $@-t && \ mv $@-t $@ -MOSTLYCLEANFILES += sys/stat.h sys/stat.h-t -MOSTLYCLEANDIRS += sys +MOSTLYCLEANFILES += lib/sys/stat.h lib/sys/stat.h-t +MOSTLYCLEANDIRS += lib/sys -EXTRA_DIST += sys_stat.in.h +EXTRA_DIST += lib/sys_stat.in.h ## end gnulib module sys_stat ## begin gnulib module sys_time -BUILT_SOURCES += sys/time.h +BUILT_SOURCES += lib/sys/time.h # We need the following in order to create <sys/time.h> when the system # doesn't have one that works with the given compiler. -sys/time.h: sys_time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_at)$(MKDIR_P) sys +lib/sys/time.h: lib/sys_time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) + $(AM_V_at)$(MKDIR_P) lib/sys $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ @@ -4612,23 +4620,23 @@ sys/time.h: sys_time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU -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)' \ - < $(srcdir)/sys_time.in.h; \ + < $(top_srcdir)/lib/sys_time.in.h; \ } > $@-t && \ mv $@-t $@ -MOSTLYCLEANFILES += sys/time.h sys/time.h-t +MOSTLYCLEANFILES += lib/sys/time.h lib/sys/time.h-t -EXTRA_DIST += sys_time.in.h +EXTRA_DIST += lib/sys_time.in.h ## end gnulib module sys_time ## begin gnulib module sys_types -BUILT_SOURCES += sys/types.h +BUILT_SOURCES += lib/sys/types.h # We need the following in order to create <sys/types.h> when the system # doesn't have one that works with the given compiler. -sys/types.h: sys_types.in.h $(top_builddir)/config.status - $(AM_V_at)$(MKDIR_P) sys +lib/sys/types.h: lib/sys_types.in.h $(top_builddir)/config.status + $(AM_V_at)$(MKDIR_P) lib/sys $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ @@ -4637,23 +4645,23 @@ sys/types.h: sys_types.in.h $(top_builddir)/config.status -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_SYS_TYPES_H''@|$(NEXT_SYS_TYPES_H)|g' \ -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \ - < $(srcdir)/sys_types.in.h; \ + < $(top_srcdir)/lib/sys_types.in.h; \ } > $@-t && \ mv $@-t $@ -MOSTLYCLEANFILES += sys/types.h sys/types.h-t +MOSTLYCLEANFILES += lib/sys/types.h lib/sys/types.h-t -EXTRA_DIST += sys_types.in.h +EXTRA_DIST += lib/sys_types.in.h ## end gnulib module sys_types ## begin gnulib module sys_uio -BUILT_SOURCES += sys/uio.h +BUILT_SOURCES += lib/sys/uio.h # We need the following in order to create <sys/uio.h> when the system # doesn't have one that works with the given compiler. -sys/uio.h: sys_uio.in.h $(top_builddir)/config.status - $(AM_V_at)$(MKDIR_P) sys +lib/sys/uio.h: lib/sys_uio.in.h $(top_builddir)/config.status + $(AM_V_at)$(MKDIR_P) lib/sys $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ @@ -4662,24 +4670,24 @@ sys/uio.h: sys_uio.in.h $(top_builddir)/config.status -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_SYS_UIO_H''@|$(NEXT_SYS_UIO_H)|g' \ -e 's|@''HAVE_SYS_UIO_H''@|$(HAVE_SYS_UIO_H)|g' \ - < $(srcdir)/sys_uio.in.h; \ + < $(top_srcdir)/lib/sys_uio.in.h; \ } > $@-t && \ mv -f $@-t $@ -MOSTLYCLEANFILES += sys/uio.h sys/uio.h-t -MOSTLYCLEANDIRS += sys +MOSTLYCLEANFILES += lib/sys/uio.h lib/sys/uio.h-t +MOSTLYCLEANDIRS += lib/sys -EXTRA_DIST += sys_uio.in.h +EXTRA_DIST += lib/sys_uio.in.h ## end gnulib module sys_uio ## begin gnulib module sys_utsname -BUILT_SOURCES += sys/utsname.h +BUILT_SOURCES += lib/sys/utsname.h # We need the following in order to create <sys/utsname.h> when the system # does not have one. -sys/utsname.h: sys_utsname.in.h $(top_builddir)/config.status $(WARN_ON_USE_H) $(ARG_NONNULL_H) - $(AM_V_at)$(MKDIR_P) sys +lib/sys/utsname.h: lib/sys_utsname.in.h $(top_builddir)/config.status $(WARN_ON_USE_H) $(ARG_NONNULL_H) + $(AM_V_at)$(MKDIR_P) lib/sys $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ @@ -4693,24 +4701,24 @@ sys/utsname.h: sys_utsname.in.h $(top_builddir)/config.status $(WARN_ON_USE_H) $ -e 's|@''HAVE_UNAME''@|$(HAVE_UNAME)|g' \ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - < $(srcdir)/sys_utsname.in.h; \ + < $(top_srcdir)/lib/sys_utsname.in.h; \ } > $@-t && \ mv $@-t $@ -MOSTLYCLEANFILES += sys/utsname.h sys/utsname.h-t -MOSTLYCLEANDIRS += sys +MOSTLYCLEANFILES += lib/sys/utsname.h lib/sys/utsname.h-t +MOSTLYCLEANDIRS += lib/sys -EXTRA_DIST += sys_utsname.in.h +EXTRA_DIST += lib/sys_utsname.in.h ## end gnulib module sys_utsname ## begin gnulib module sys_wait -BUILT_SOURCES += sys/wait.h +BUILT_SOURCES += lib/sys/wait.h # We need the following in order to create <sys/wait.h> when the system # has one that is incomplete. -sys/wait.h: sys_wait.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) - $(AM_V_at)$(MKDIR_P) sys +lib/sys/wait.h: lib/sys_wait.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) + $(AM_V_at)$(MKDIR_P) lib/sys $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ @@ -4721,31 +4729,31 @@ sys/wait.h: sys_wait.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_U -e 's/@''GNULIB_WAITPID''@/$(GNULIB_WAITPID)/g' \ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - < $(srcdir)/sys_wait.in.h; \ + < $(top_srcdir)/lib/sys_wait.in.h; \ } > $@-t && \ mv $@-t $@ -MOSTLYCLEANFILES += sys/wait.h sys/wait.h-t -MOSTLYCLEANDIRS += sys +MOSTLYCLEANFILES += lib/sys/wait.h lib/sys/wait.h-t +MOSTLYCLEANDIRS += lib/sys -EXTRA_DIST += sys_wait.in.h +EXTRA_DIST += lib/sys_wait.in.h ## end gnulib module sys_wait ## begin gnulib module tempname -libcoreutils_a_SOURCES += tempname.c +lib_libcoreutils_a_SOURCES += lib/tempname.c -EXTRA_DIST += tempname.h +EXTRA_DIST += lib/tempname.h ## end gnulib module tempname ## begin gnulib module termios -BUILT_SOURCES += termios.h +BUILT_SOURCES += lib/termios.h # We need the following in order to create <termios.h> when the system # version does not have all declarations. -termios.h: termios.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) +lib/termios.h: lib/termios.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ @@ -4758,18 +4766,18 @@ termios.h: termios.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE -e 's|@''HAVE_TERMIOS_H''@|$(HAVE_TERMIOS_H)|g' \ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - < $(srcdir)/termios.in.h; \ + < $(top_srcdir)/lib/termios.in.h; \ } > $@-t && \ mv $@-t $@ -MOSTLYCLEANFILES += termios.h termios.h-t +MOSTLYCLEANFILES += lib/termios.h lib/termios.h-t -EXTRA_DIST += termios.in.h +EXTRA_DIST += lib/termios.in.h ## end gnulib module termios ## begin gnulib module threadlib -libcoreutils_a_SOURCES += glthread/threadlib.c +lib_libcoreutils_a_SOURCES += lib/glthread/threadlib.c EXTRA_DIST += $(top_srcdir)/build-aux/config.rpath @@ -4777,11 +4785,11 @@ EXTRA_DIST += $(top_srcdir)/build-aux/config.rpath ## begin gnulib module time -BUILT_SOURCES += time.h +BUILT_SOURCES += lib/time.h # We need the following in order to create <time.h> when the system # doesn't have one that works with the given compiler. -time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) +lib/time.h: lib/time.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' \ @@ -4808,74 +4816,77 @@ time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $( -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)' \ - < $(srcdir)/time.in.h; \ + < $(top_srcdir)/lib/time.in.h; \ } > $@-t && \ mv $@-t $@ -MOSTLYCLEANFILES += time.h time.h-t +MOSTLYCLEANFILES += lib/time.h lib/time.h-t -EXTRA_DIST += time.in.h +EXTRA_DIST += lib/time.in.h ## end gnulib module time ## begin gnulib module time_r -EXTRA_DIST += time_r.c +EXTRA_DIST += lib/time_r.c -EXTRA_libcoreutils_a_SOURCES += time_r.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/time_r.c ## end gnulib module time_r ## begin gnulib module timespec +lib_libcoreutils_a_SOURCES += lib/timespec.c -EXTRA_DIST += timespec.h +EXTRA_DIST += lib/timespec.h ## end gnulib module timespec ## begin gnulib module tls -libcoreutils_a_SOURCES += glthread/tls.h glthread/tls.c +lib_libcoreutils_a_SOURCES += lib/glthread/tls.h lib/glthread/tls.c ## end gnulib module tls ## begin gnulib module trim -libcoreutils_a_SOURCES += trim.c +lib_libcoreutils_a_SOURCES += lib/trim.c -EXTRA_DIST += trim.h +EXTRA_DIST += lib/trim.h ## end gnulib module trim ## begin gnulib module u64 +lib_libcoreutils_a_SOURCES += lib/u64.c -EXTRA_DIST += u64.h +EXTRA_DIST += lib/u64.h ## end gnulib module u64 ## begin gnulib module uname -EXTRA_DIST += uname.c +EXTRA_DIST += lib/uname.c -EXTRA_libcoreutils_a_SOURCES += uname.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/uname.c ## end gnulib module uname ## begin gnulib module unicodeio -libcoreutils_a_SOURCES += unicodeio.h unicodeio.c +lib_libcoreutils_a_SOURCES += lib/unicodeio.h lib/unicodeio.c ## end gnulib module unicodeio ## begin gnulib module unistd -BUILT_SOURCES += unistd.h +BUILT_SOURCES += lib/unistd.h +lib_libcoreutils_a_SOURCES += lib/unistd.c # We need the following in order to create an empty placeholder for # <unistd.h> when the system doesn't have one. -unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) +lib/unistd.h: lib/unistd.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' \ @@ -4934,7 +4945,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's/@''GNULIB_UNLINKAT''@/$(GNULIB_UNLINKAT)/g' \ -e 's/@''GNULIB_USLEEP''@/$(GNULIB_USLEEP)/g' \ -e 's/@''GNULIB_WRITE''@/$(GNULIB_WRITE)/g' \ - < $(srcdir)/unistd.in.h | \ + < $(top_srcdir)/lib/unistd.in.h | \ sed -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \ -e 's|@''HAVE_DUP2''@|$(HAVE_DUP2)|g' \ -e 's|@''HAVE_DUP3''@|$(HAVE_DUP3)|g' \ @@ -5013,17 +5024,17 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ } > $@-t && \ mv $@-t $@ -MOSTLYCLEANFILES += unistd.h unistd.h-t +MOSTLYCLEANFILES += lib/unistd.h lib/unistd.h-t -EXTRA_DIST += unistd.in.h +EXTRA_DIST += lib/unistd.in.h ## end gnulib module unistd ## begin gnulib module unistd-safer -libcoreutils_a_SOURCES += dup-safer.c fd-safer.c pipe-safer.c +lib_libcoreutils_a_SOURCES += lib/dup-safer.c lib/fd-safer.c lib/pipe-safer.c -EXTRA_DIST += unistd--.h unistd-safer.h +EXTRA_DIST += lib/unistd--.h lib/unistd-safer.h ## end gnulib module unistd-safer @@ -5031,22 +5042,22 @@ EXTRA_DIST += unistd--.h unistd-safer.h BUILT_SOURCES += $(LIBUNISTRING_UNISTR_H) -unistr.h: unistr.in.h +lib/unistr.h: lib/unistr.in.h $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - cat $(srcdir)/unistr.in.h; \ + cat $(top_srcdir)/lib/unistr.in.h; \ } > $@-t && \ mv -f $@-t $@ -MOSTLYCLEANFILES += unistr.h unistr.h-t +MOSTLYCLEANFILES += lib/unistr.h lib/unistr.h-t -EXTRA_DIST += unistr.in.h +EXTRA_DIST += lib/unistr.in.h ## end gnulib module unistr/base ## begin gnulib module unistr/u8-mbtoucr if LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR -libcoreutils_a_SOURCES += unistr/u8-mbtoucr.c +lib_libcoreutils_a_SOURCES += lib/unistr/u8-mbtoucr.c endif ## end gnulib module unistr/u8-mbtoucr @@ -5054,7 +5065,7 @@ endif ## begin gnulib module unistr/u8-uctomb if LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB -libcoreutils_a_SOURCES += unistr/u8-uctomb.c unistr/u8-uctomb-aux.c +lib_libcoreutils_a_SOURCES += lib/unistr/u8-uctomb.c lib/unistr/u8-uctomb-aux.c endif ## end gnulib module unistr/u8-uctomb @@ -5063,15 +5074,15 @@ endif BUILT_SOURCES += $(LIBUNISTRING_UNITYPES_H) -unitypes.h: unitypes.in.h +lib/unitypes.h: lib/unitypes.in.h $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - cat $(srcdir)/unitypes.in.h; \ + cat $(top_srcdir)/lib/unitypes.in.h; \ } > $@-t && \ mv -f $@-t $@ -MOSTLYCLEANFILES += unitypes.h unitypes.h-t +MOSTLYCLEANFILES += lib/unitypes.h lib/unitypes.h-t -EXTRA_DIST += unitypes.in.h +EXTRA_DIST += lib/unitypes.in.h ## end gnulib module unitypes @@ -5079,59 +5090,59 @@ EXTRA_DIST += unitypes.in.h BUILT_SOURCES += $(LIBUNISTRING_UNIWIDTH_H) -uniwidth.h: uniwidth.in.h +lib/uniwidth.h: lib/uniwidth.in.h $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - cat $(srcdir)/uniwidth.in.h; \ + cat $(top_srcdir)/lib/uniwidth.in.h; \ } > $@-t && \ mv -f $@-t $@ -MOSTLYCLEANFILES += uniwidth.h uniwidth.h-t +MOSTLYCLEANFILES += lib/uniwidth.h lib/uniwidth.h-t -EXTRA_DIST += localcharset.h uniwidth.in.h +EXTRA_DIST += lib/localcharset.h lib/uniwidth.in.h ## end gnulib module uniwidth/base ## begin gnulib module uniwidth/width if LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH -libcoreutils_a_SOURCES += uniwidth/width.c +lib_libcoreutils_a_SOURCES += lib/uniwidth/width.c endif -EXTRA_DIST += uniwidth/cjk.h +EXTRA_DIST += lib/uniwidth/cjk.h ## end gnulib module uniwidth/width ## begin gnulib module unlink -EXTRA_DIST += unlink.c +EXTRA_DIST += lib/unlink.c -EXTRA_libcoreutils_a_SOURCES += unlink.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/unlink.c ## end gnulib module unlink ## begin gnulib module unlinkat -EXTRA_DIST += at-func.c openat-priv.h unlinkat.c +EXTRA_DIST += lib/at-func.c lib/unlinkat.c -EXTRA_libcoreutils_a_SOURCES += at-func.c unlinkat.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/at-func.c lib/unlinkat.c ## end gnulib module unlinkat ## begin gnulib module unlocked-io -EXTRA_DIST += unlocked-io.h +EXTRA_DIST += lib/unlocked-io.h ## end gnulib module unlocked-io ## begin gnulib module unsetenv -EXTRA_DIST += unsetenv.c +EXTRA_DIST += lib/unsetenv.c -EXTRA_libcoreutils_a_SOURCES += unsetenv.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/unsetenv.c ## end gnulib module unsetenv @@ -5151,52 +5162,52 @@ EXTRA_DIST += $(top_srcdir)/build-aux/useless-if-before-free ## begin gnulib module userspec -libcoreutils_a_SOURCES += userspec.c +lib_libcoreutils_a_SOURCES += lib/userspec.c -EXTRA_DIST += userspec.h +EXTRA_DIST += lib/userspec.h ## end gnulib module userspec ## begin gnulib module utimecmp -libcoreutils_a_SOURCES += utimecmp.c +lib_libcoreutils_a_SOURCES += lib/utimecmp.c -EXTRA_DIST += utimecmp.h +EXTRA_DIST += lib/utimecmp.h ## end gnulib module utimecmp ## begin gnulib module utimens -libcoreutils_a_SOURCES += utimens.c +lib_libcoreutils_a_SOURCES += lib/utimens.c -EXTRA_DIST += utimens.h +EXTRA_DIST += lib/utimens.h ## end gnulib module utimens ## begin gnulib module utimensat -EXTRA_DIST += at-func.c utimensat.c +EXTRA_DIST += lib/at-func.c lib/utimensat.c -EXTRA_libcoreutils_a_SOURCES += at-func.c utimensat.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/at-func.c lib/utimensat.c ## end gnulib module utimensat ## begin gnulib module vasnprintf -EXTRA_DIST += asnprintf.c float+.h printf-args.c printf-args.h printf-parse.c printf-parse.h vasnprintf.c vasnprintf.h +EXTRA_DIST += lib/asnprintf.c lib/float+.h lib/printf-args.c lib/printf-args.h lib/printf-parse.c lib/printf-parse.h lib/vasnprintf.c lib/vasnprintf.h -EXTRA_libcoreutils_a_SOURCES += asnprintf.c printf-args.c printf-parse.c vasnprintf.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/asnprintf.c lib/printf-args.c lib/printf-parse.c lib/vasnprintf.c ## end gnulib module vasnprintf ## begin gnulib module vasprintf -EXTRA_DIST += asprintf.c vasprintf.c +EXTRA_DIST += lib/asprintf.c lib/vasprintf.c -EXTRA_libcoreutils_a_SOURCES += asprintf.c vasprintf.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/asprintf.c lib/vasprintf.c ## end gnulib module vasprintf @@ -5210,68 +5221,68 @@ EXTRA_DIST += $(top_srcdir)/build-aux/vc-list-files ## begin gnulib module verify -EXTRA_DIST += verify.h +EXTRA_DIST += lib/verify.h ## end gnulib module verify ## begin gnulib module verror -libcoreutils_a_SOURCES += verror.h verror.c +lib_libcoreutils_a_SOURCES += lib/verror.h lib/verror.c ## end gnulib module verror ## begin gnulib module version-etc -libcoreutils_a_SOURCES += version-etc.h version-etc.c +lib_libcoreutils_a_SOURCES += lib/version-etc.h lib/version-etc.c ## end gnulib module version-etc ## begin gnulib module version-etc-fsf -libcoreutils_a_SOURCES += version-etc-fsf.c +lib_libcoreutils_a_SOURCES += lib/version-etc-fsf.c ## end gnulib module version-etc-fsf ## begin gnulib module vfprintf-posix -EXTRA_DIST += vfprintf.c +EXTRA_DIST += lib/vfprintf.c -EXTRA_libcoreutils_a_SOURCES += vfprintf.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/vfprintf.c ## end gnulib module vfprintf-posix ## begin gnulib module vprintf-posix -EXTRA_DIST += vprintf.c +EXTRA_DIST += lib/vprintf.c -EXTRA_libcoreutils_a_SOURCES += vprintf.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/vprintf.c ## end gnulib module vprintf-posix ## begin gnulib module wait-process -libcoreutils_a_SOURCES += wait-process.h wait-process.c +lib_libcoreutils_a_SOURCES += lib/wait-process.h lib/wait-process.c ## end gnulib module wait-process ## begin gnulib module waitpid -EXTRA_DIST += waitpid.c +EXTRA_DIST += lib/waitpid.c -EXTRA_libcoreutils_a_SOURCES += waitpid.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/waitpid.c ## end gnulib module waitpid ## begin gnulib module wchar -BUILT_SOURCES += wchar.h +BUILT_SOURCES += lib/wchar.h # We need the following in order to create <wchar.h> when the system # version does not work standalone. -wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) +lib/wchar.h: lib/wchar.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' \ @@ -5320,7 +5331,7 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's/@''GNULIB_WCSSTR''@/$(GNULIB_WCSSTR)/g' \ -e 's/@''GNULIB_WCSTOK''@/$(GNULIB_WCSTOK)/g' \ -e 's/@''GNULIB_WCSWIDTH''@/$(GNULIB_WCSWIDTH)/g' \ - < $(srcdir)/wchar.in.h | \ + < $(top_srcdir)/lib/wchar.in.h | \ sed -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \ -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \ -e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \ @@ -5380,37 +5391,38 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ } > $@-t && \ mv $@-t $@ -MOSTLYCLEANFILES += wchar.h wchar.h-t +MOSTLYCLEANFILES += lib/wchar.h lib/wchar.h-t -EXTRA_DIST += wchar.in.h +EXTRA_DIST += lib/wchar.in.h ## end gnulib module wchar ## begin gnulib module wcrtomb -EXTRA_DIST += wcrtomb.c +EXTRA_DIST += lib/wcrtomb.c -EXTRA_libcoreutils_a_SOURCES += wcrtomb.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/wcrtomb.c ## end gnulib module wcrtomb ## begin gnulib module wcswidth -EXTRA_DIST += wcswidth-impl.h wcswidth.c +EXTRA_DIST += lib/wcswidth-impl.h lib/wcswidth.c -EXTRA_libcoreutils_a_SOURCES += wcswidth.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/wcswidth.c ## end gnulib module wcswidth ## begin gnulib module wctype-h -BUILT_SOURCES += wctype.h +BUILT_SOURCES += lib/wctype.h +lib_libcoreutils_a_SOURCES += lib/wctype-h.c # We need the following in order to create <wctype.h> when the system # doesn't have one that works with the given compiler. -wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) +lib/wctype.h: lib/wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ @@ -5434,185 +5446,191 @@ wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H -e 's/@''REPLACE_TOWLOWER''@/$(REPLACE_TOWLOWER)/g' \ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - < $(srcdir)/wctype.in.h; \ + < $(top_srcdir)/lib/wctype.in.h; \ } > $@-t && \ mv $@-t $@ -MOSTLYCLEANFILES += wctype.h wctype.h-t +MOSTLYCLEANFILES += lib/wctype.h lib/wctype.h-t -EXTRA_DIST += wctype.in.h +EXTRA_DIST += lib/wctype.in.h ## end gnulib module wctype-h ## begin gnulib module wcwidth -EXTRA_DIST += wcwidth.c +EXTRA_DIST += lib/wcwidth.c -EXTRA_libcoreutils_a_SOURCES += wcwidth.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/wcwidth.c ## end gnulib module wcwidth ## begin gnulib module write -EXTRA_DIST += write.c +EXTRA_DIST += lib/write.c -EXTRA_libcoreutils_a_SOURCES += write.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/write.c ## end gnulib module write ## begin gnulib module write-any-file -libcoreutils_a_SOURCES += write-any-file.c +lib_libcoreutils_a_SOURCES += lib/write-any-file.c -EXTRA_DIST += write-any-file.h +EXTRA_DIST += lib/write-any-file.h ## end gnulib module write-any-file ## begin gnulib module xalloc -libcoreutils_a_SOURCES += xmalloc.c +lib_libcoreutils_a_SOURCES += lib/xmalloc.c -EXTRA_DIST += xalloc.h +EXTRA_DIST += lib/xalloc.h ## end gnulib module xalloc ## begin gnulib module xalloc-die -libcoreutils_a_SOURCES += xalloc-die.c +lib_libcoreutils_a_SOURCES += lib/xalloc-die.c ## end gnulib module xalloc-die ## begin gnulib module xalloc-oversized -EXTRA_DIST += xalloc-oversized.h +EXTRA_DIST += lib/xalloc-oversized.h ## end gnulib module xalloc-oversized ## begin gnulib module xfreopen -libcoreutils_a_SOURCES += xfreopen.c xfreopen.h +lib_libcoreutils_a_SOURCES += lib/xfreopen.c lib/xfreopen.h ## end gnulib module xfreopen +## begin gnulib module xfts + +lib_libcoreutils_a_SOURCES += lib/xfts.c lib/xfts.h + +## end gnulib module xfts + ## begin gnulib module xgetcwd -libcoreutils_a_SOURCES += xgetcwd.c +lib_libcoreutils_a_SOURCES += lib/xgetcwd.c -EXTRA_DIST += xgetcwd.h +EXTRA_DIST += lib/xgetcwd.h ## end gnulib module xgetcwd ## begin gnulib module xgetgroups -libcoreutils_a_SOURCES += xgetgroups.c +lib_libcoreutils_a_SOURCES += lib/xgetgroups.c ## end gnulib module xgetgroups ## begin gnulib module xgethostname -libcoreutils_a_SOURCES += xgethostname.h xgethostname.c +lib_libcoreutils_a_SOURCES += lib/xgethostname.h lib/xgethostname.c ## end gnulib module xgethostname ## begin gnulib module xmemcoll -libcoreutils_a_SOURCES += xmemcoll.h xmemcoll.c +lib_libcoreutils_a_SOURCES += lib/xmemcoll.h lib/xmemcoll.c ## end gnulib module xmemcoll ## begin gnulib module xnanosleep -libcoreutils_a_SOURCES += xnanosleep.c +lib_libcoreutils_a_SOURCES += lib/xnanosleep.c -EXTRA_DIST += xnanosleep.h +EXTRA_DIST += lib/xnanosleep.h ## end gnulib module xnanosleep ## begin gnulib module xprintf -libcoreutils_a_SOURCES += xprintf.h xprintf.c +lib_libcoreutils_a_SOURCES += lib/xprintf.h lib/xprintf.c ## end gnulib module xprintf ## begin gnulib module xreadlink -libcoreutils_a_SOURCES += xreadlink.c +lib_libcoreutils_a_SOURCES += lib/xreadlink.c -EXTRA_DIST += xreadlink.h +EXTRA_DIST += lib/xreadlink.h ## end gnulib module xreadlink ## begin gnulib module xsize -libcoreutils_a_SOURCES += xsize.h +lib_libcoreutils_a_SOURCES += lib/xsize.h lib/xsize.c ## end gnulib module xsize ## begin gnulib module xstriconv -libcoreutils_a_SOURCES += xstriconv.h xstriconv.c +lib_libcoreutils_a_SOURCES += lib/xstriconv.h lib/xstriconv.c ## end gnulib module xstriconv ## begin gnulib module xstrndup -libcoreutils_a_SOURCES += xstrndup.h xstrndup.c +lib_libcoreutils_a_SOURCES += lib/xstrndup.h lib/xstrndup.c ## end gnulib module xstrndup ## begin gnulib module xstrtod -libcoreutils_a_SOURCES += xstrtod.c +lib_libcoreutils_a_SOURCES += lib/xstrtod.c -EXTRA_DIST += xstrtod.h +EXTRA_DIST += lib/xstrtod.h ## end gnulib module xstrtod ## begin gnulib module xstrtoimax -libcoreutils_a_SOURCES += xstrtoimax.c +lib_libcoreutils_a_SOURCES += lib/xstrtoimax.c ## end gnulib module xstrtoimax ## begin gnulib module xstrtol -libcoreutils_a_SOURCES += xstrtol.c xstrtoul.c xstrtol-error.c +lib_libcoreutils_a_SOURCES += lib/xstrtol.c lib/xstrtoul.c lib/xstrtol-error.c -EXTRA_DIST += xstrtol.h +EXTRA_DIST += lib/xstrtol.h ## end gnulib module xstrtol ## begin gnulib module xstrtold -libcoreutils_a_SOURCES += xstrtold.c +lib_libcoreutils_a_SOURCES += lib/xstrtold.c -EXTRA_DIST += xstrtod.c xstrtod.h +EXTRA_DIST += lib/xstrtod.c lib/xstrtod.h -EXTRA_libcoreutils_a_SOURCES += xstrtod.c +EXTRA_lib_libcoreutils_a_SOURCES += lib/xstrtod.c ## end gnulib module xstrtold ## begin gnulib module xstrtoumax -libcoreutils_a_SOURCES += xstrtoumax.c +lib_libcoreutils_a_SOURCES += lib/xstrtoumax.c ## end gnulib module xstrtoumax ## begin gnulib module xvasprintf -libcoreutils_a_SOURCES += xvasprintf.h xvasprintf.c xasprintf.c +lib_libcoreutils_a_SOURCES += lib/xvasprintf.h lib/xvasprintf.c lib/xasprintf.c -EXTRA_DIST += xalloc.h +EXTRA_DIST += lib/xalloc.h ## end gnulib module xvasprintf ## begin gnulib module yesno -libcoreutils_a_SOURCES += yesno.c +lib_libcoreutils_a_SOURCES += lib/yesno.c -EXTRA_DIST += yesno.h +EXTRA_DIST += lib/yesno.h ## end gnulib module yesno diff --git a/lib/group-member.c b/lib/group-member.c index 3d79b3cd..da015842 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-2012 Free Software + Copyright (C) 1994, 1997-1998, 2003, 2005-2006, 2009-2013 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -21,52 +21,49 @@ /* Specification. */ #include <unistd.h> -#include <stdbool.h> #include <stdio.h> #include <sys/types.h> #include <stdlib.h> -#include "xalloc.h" +#include "xalloc-oversized.h" + +/* Most processes have no more than this many groups, and for these + processes we can avoid using malloc. */ +enum { GROUPBUF_SIZE = 100 }; struct group_info { - int n_groups; gid_t *group; + gid_t groupbuf[GROUPBUF_SIZE]; }; static void free_group_info (struct group_info const *g) { - free (g->group); + if (g->group != g->groupbuf) + free (g->group); } -static bool +static int get_group_info (struct group_info *gi) { - int n_groups; - int n_group_slots = getgroups (0, NULL); - gid_t *group; - - if (n_group_slots < 0) - return false; + int n_groups = getgroups (GROUPBUF_SIZE, gi->groupbuf); + gi->group = gi->groupbuf; - /* Avoid xnmalloc, as it goes awry when SIZE_MAX < n_group_slots. */ - if (xalloc_oversized (n_group_slots, sizeof *group)) - xalloc_die (); - group = xmalloc (n_group_slots * sizeof *group); - n_groups = getgroups (n_group_slots, group); - - /* In case of error, the user loses. */ if (n_groups < 0) { - free (group); - return false; + int n_group_slots = getgroups (0, NULL); + if (0 <= n_group_slots + && ! xalloc_oversized (n_group_slots, sizeof *gi->group)) + { + gi->group = malloc (n_group_slots * sizeof *gi->group); + if (gi->group) + n_groups = getgroups (n_group_slots, gi->group); + } } - gi->n_groups = n_groups; - gi->group = group; - - return true; + /* In case of error, the user loses. */ + return n_groups; } /* Return non-zero if GID is one that we have in our groups list. @@ -80,13 +77,11 @@ group_member (gid_t gid) int i; int found; struct group_info gi; - - if (! get_group_info (&gi)) - return 0; + int n_groups = get_group_info (&gi); /* Search through the list looking for GID. */ found = 0; - for (i = 0; i < gi.n_groups; i++) + for (i = 0; i < n_groups; i++) { if (gid == gi.group[i]) { diff --git a/lib/hard-locale.c b/lib/hard-locale.c index 14e41b49..d55658df 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-2012 Free Software + Copyright (C) 1997-1999, 2002-2004, 2006-2007, 2009-2013 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 b081e1cd..1d43607f 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-2012 Free Software Foundation, Inc. + Copyright (C) 1999, 2003-2004, 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 diff --git a/lib/hash-pjw.c b/lib/hash-pjw.c index 09665981..e967a762 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-2012 Free Software Foundation, Inc. + Copyright (C) 2001, 2003, 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 diff --git a/lib/hash-pjw.h b/lib/hash-pjw.h index 6404916e..f6dcab85 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-2012 Free Software Foundation, Inc. + Copyright (C) 2001, 2003, 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 diff --git a/lib/hash-triple.c b/lib/hash-triple.c index 6dd35664..12359347 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-2012 Free Software Foundation, Inc. + Copyright (C) 2007, 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 diff --git a/lib/hash.c b/lib/hash.c index 19330576..685928ec 100644 --- a/lib/hash.c +++ b/lib/hash.c @@ -1,6 +1,6 @@ /* hash - hashing table processing. - Copyright (C) 1998-2004, 2006-2007, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 1998-2004, 2006-2007, 2009-2013 Free Software Foundation, Inc. Written by Jim Meyering, 1992. diff --git a/lib/hash.h b/lib/hash.h index 06e303bf..bcd0d1d9 100644 --- a/lib/hash.h +++ b/lib/hash.h @@ -1,5 +1,5 @@ /* hash - hashing table processing. - Copyright (C) 1998-1999, 2001, 2003, 2009-2012 Free Software Foundation, + Copyright (C) 1998-1999, 2001, 2003, 2009-2013 Free Software Foundation, Inc. Written by Jim Meyering <meyering@ascend.com>, 1998. diff --git a/lib/heap.c b/lib/heap.c index ebae1122..af9ca1e7 100644 --- a/lib/heap.c +++ b/lib/heap.c @@ -1,6 +1,6 @@ /* Barebones heap implementation supporting only insert and pop. - Copyright (C) 2010-2012 Free Software Foundation, Inc. + Copyright (C) 2010-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 diff --git a/lib/heap.h b/lib/heap.h index ff69b7a2..f59a1e42 100644 --- a/lib/heap.h +++ b/lib/heap.h @@ -1,6 +1,6 @@ /* Barebones heap implementation supporting only insert and pop. - Copyright (C) 2010-2012 Free Software Foundation, Inc. + Copyright (C) 2010-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 diff --git a/lib/human.c b/lib/human.c index b866c69c..613dc656 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-2012 Free Software Foundation, Inc. + Copyright (C) 1996-2007, 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 diff --git a/lib/human.h b/lib/human.h index 94c769e7..7ac30d55 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-2012 Free Software Foundation, Inc. + Copyright (C) 1996-2007, 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 diff --git a/lib/i-ring.c b/lib/i-ring.c index 8bd2c541..ccab71a0 100644 --- a/lib/i-ring.c +++ b/lib/i-ring.c @@ -1,5 +1,5 @@ /* a simple ring buffer - Copyright (C) 2006, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/lib/i-ring.h b/lib/i-ring.h index 9757c84d..1aac214b 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/lib/iconv.c b/lib/iconv.c index 66966ddf..6fb2f243 100644 --- a/lib/iconv.c +++ b/lib/iconv.c @@ -1,5 +1,5 @@ /* Character set conversion. - Copyright (C) 1999-2001, 2007, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 1999-2001, 2007, 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 diff --git a/lib/iconv.in.h b/lib/iconv.in.h index 1ee42398..a88173d1 100644 --- a/lib/iconv.in.h +++ b/lib/iconv.in.h @@ -1,6 +1,6 @@ /* A GNU-like <iconv.h>. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/lib/iconv_close.c b/lib/iconv_close.c index c02f76c6..6f019a0b 100644 --- a/lib/iconv_close.c +++ b/lib/iconv_close.c @@ -1,5 +1,5 @@ /* Character set conversion. - Copyright (C) 2007, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 2007, 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 diff --git a/lib/iconv_open-aix.h b/lib/iconv_open-aix.h index 129e0308..5318d882 100644 --- a/lib/iconv_open-aix.h +++ b/lib/iconv_open-aix.h @@ -1,5 +1,5 @@ /* ANSI-C code produced by gperf version 3.0.4 */ -/* Command-line: gperf -m 10 ./iconv_open-aix.gperf */ +/* Command-line: gperf -m 10 ./lib/iconv_open-aix.gperf */ /* Computed positions: -k'4,$' */ #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ @@ -29,7 +29,7 @@ #error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>." #endif -#line 1 "./iconv_open-aix.gperf" +#line 1 "./lib/iconv_open-aix.gperf" struct mapping { int standard_name; const char vendor_name[10 + 1]; }; #define TOTAL_KEYWORDS 32 @@ -156,74 +156,74 @@ static const struct stringpool_t stringpool_contents = static const struct mapping mappings[] = { {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, -#line 43 "./iconv_open-aix.gperf" +#line 43 "./lib/iconv_open-aix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str6, "IBM-eucTW"}, -#line 42 "./iconv_open-aix.gperf" +#line 42 "./lib/iconv_open-aix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str7, "IBM-eucKR"}, -#line 25 "./iconv_open-aix.gperf" +#line 25 "./lib/iconv_open-aix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str8, "IBM-852"}, -#line 41 "./iconv_open-aix.gperf" +#line 41 "./lib/iconv_open-aix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str9, "IBM-eucJP"}, -#line 14 "./iconv_open-aix.gperf" +#line 14 "./lib/iconv_open-aix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str10, "ISO8859-2"}, -#line 27 "./iconv_open-aix.gperf" +#line 27 "./lib/iconv_open-aix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str11, "IBM-857"}, -#line 24 "./iconv_open-aix.gperf" +#line 24 "./lib/iconv_open-aix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str12, "IBM-850"}, -#line 19 "./iconv_open-aix.gperf" +#line 19 "./lib/iconv_open-aix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str13, "ISO8859-7"}, -#line 33 "./iconv_open-aix.gperf" +#line 33 "./lib/iconv_open-aix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str14, "IBM-932"}, -#line 40 "./iconv_open-aix.gperf" +#line 40 "./lib/iconv_open-aix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str15, "IBM-eucCN"}, -#line 44 "./iconv_open-aix.gperf" +#line 44 "./lib/iconv_open-aix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str16, "big5"}, -#line 23 "./iconv_open-aix.gperf" +#line 23 "./lib/iconv_open-aix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str17, "IBM-437"}, {-1}, -#line 17 "./iconv_open-aix.gperf" +#line 17 "./lib/iconv_open-aix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str19, "ISO8859-5"}, -#line 22 "./iconv_open-aix.gperf" +#line 22 "./lib/iconv_open-aix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str20, "ISO8859-15"}, -#line 15 "./iconv_open-aix.gperf" +#line 15 "./lib/iconv_open-aix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str21, "ISO8859-3"}, -#line 31 "./iconv_open-aix.gperf" +#line 31 "./lib/iconv_open-aix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str22, "IBM-921"}, -#line 35 "./iconv_open-aix.gperf" +#line 35 "./lib/iconv_open-aix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str23, "IBM-1046"}, -#line 20 "./iconv_open-aix.gperf" +#line 20 "./lib/iconv_open-aix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str24, "ISO8859-8"}, -#line 26 "./iconv_open-aix.gperf" +#line 26 "./lib/iconv_open-aix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str25, "IBM-856"}, -#line 37 "./iconv_open-aix.gperf" +#line 37 "./lib/iconv_open-aix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str26, "IBM-1125"}, -#line 18 "./iconv_open-aix.gperf" +#line 18 "./lib/iconv_open-aix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str27, "ISO8859-6"}, -#line 29 "./iconv_open-aix.gperf" +#line 29 "./lib/iconv_open-aix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str28, "IBM-865"}, -#line 32 "./iconv_open-aix.gperf" +#line 32 "./lib/iconv_open-aix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str29, "IBM-922"}, -#line 39 "./iconv_open-aix.gperf" +#line 39 "./lib/iconv_open-aix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str30, "IBM-1252"}, -#line 21 "./iconv_open-aix.gperf" +#line 21 "./lib/iconv_open-aix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str31, "ISO8859-9"}, {-1}, -#line 34 "./iconv_open-aix.gperf" +#line 34 "./lib/iconv_open-aix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str33, "IBM-943"}, -#line 16 "./iconv_open-aix.gperf" +#line 16 "./lib/iconv_open-aix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str34, "ISO8859-4"}, -#line 13 "./iconv_open-aix.gperf" +#line 13 "./lib/iconv_open-aix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str35, "ISO8859-1"}, {-1}, {-1}, -#line 38 "./iconv_open-aix.gperf" +#line 38 "./lib/iconv_open-aix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str38, "IBM-1129"}, {-1}, -#line 30 "./iconv_open-aix.gperf" +#line 30 "./lib/iconv_open-aix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str40, "IBM-869"}, -#line 36 "./iconv_open-aix.gperf" +#line 36 "./lib/iconv_open-aix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str41, "IBM-1124"}, {-1}, {-1}, -#line 28 "./iconv_open-aix.gperf" +#line 28 "./lib/iconv_open-aix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str44, "IBM-861"} }; diff --git a/lib/iconv_open-hpux.h b/lib/iconv_open-hpux.h index 3bcff76a..49e295a5 100644 --- a/lib/iconv_open-hpux.h +++ b/lib/iconv_open-hpux.h @@ -1,5 +1,5 @@ /* ANSI-C code produced by gperf version 3.0.4 */ -/* Command-line: gperf -m 10 ./iconv_open-hpux.gperf */ +/* Command-line: gperf -m 10 ./lib/iconv_open-hpux.gperf */ /* Computed positions: -k'4,$' */ #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ @@ -29,7 +29,7 @@ #error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>." #endif -#line 1 "./iconv_open-hpux.gperf" +#line 1 "./lib/iconv_open-hpux.gperf" struct mapping { int standard_name; const char vendor_name[9 + 1]; }; #define TOTAL_KEYWORDS 44 @@ -180,93 +180,93 @@ static const struct stringpool_t stringpool_contents = static const struct mapping mappings[] = { {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, -#line 40 "./iconv_open-hpux.gperf" +#line 40 "./lib/iconv_open-hpux.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str6, "cp1256"}, -#line 34 "./iconv_open-hpux.gperf" +#line 34 "./lib/iconv_open-hpux.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str7, "cp1250"}, -#line 35 "./iconv_open-hpux.gperf" +#line 35 "./lib/iconv_open-hpux.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str8, "cp1251"}, -#line 23 "./iconv_open-hpux.gperf" +#line 23 "./lib/iconv_open-hpux.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str9, "cp850"}, -#line 49 "./iconv_open-hpux.gperf" +#line 49 "./lib/iconv_open-hpux.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str10, "tis620"}, -#line 38 "./iconv_open-hpux.gperf" +#line 38 "./lib/iconv_open-hpux.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str11, "cp1254"}, -#line 16 "./iconv_open-hpux.gperf" +#line 16 "./lib/iconv_open-hpux.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str12, "iso88596"}, -#line 53 "./iconv_open-hpux.gperf" +#line 53 "./lib/iconv_open-hpux.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str13, "eucTW"}, -#line 13 "./iconv_open-hpux.gperf" +#line 13 "./lib/iconv_open-hpux.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str14, "iso88591"}, -#line 19 "./iconv_open-hpux.gperf" +#line 19 "./lib/iconv_open-hpux.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str15, "iso88599"}, -#line 39 "./iconv_open-hpux.gperf" +#line 39 "./lib/iconv_open-hpux.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str16, "cp1255"}, -#line 54 "./iconv_open-hpux.gperf" +#line 54 "./lib/iconv_open-hpux.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str17, "big5"}, -#line 25 "./iconv_open-hpux.gperf" +#line 25 "./lib/iconv_open-hpux.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str18, "cp855"}, -#line 41 "./iconv_open-hpux.gperf" +#line 41 "./lib/iconv_open-hpux.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str19, "cp1257"}, -#line 52 "./iconv_open-hpux.gperf" +#line 52 "./lib/iconv_open-hpux.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str20, "eucKR"}, -#line 26 "./iconv_open-hpux.gperf" +#line 26 "./lib/iconv_open-hpux.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str21, "cp857"}, -#line 15 "./iconv_open-hpux.gperf" +#line 15 "./lib/iconv_open-hpux.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str22, "iso88595"}, -#line 20 "./iconv_open-hpux.gperf" +#line 20 "./lib/iconv_open-hpux.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str23, "iso885915"}, -#line 31 "./iconv_open-hpux.gperf" +#line 31 "./lib/iconv_open-hpux.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str24, "cp866"}, -#line 17 "./iconv_open-hpux.gperf" +#line 17 "./lib/iconv_open-hpux.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str25, "iso88597"}, -#line 27 "./iconv_open-hpux.gperf" +#line 27 "./lib/iconv_open-hpux.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str26, "cp861"}, -#line 32 "./iconv_open-hpux.gperf" +#line 32 "./lib/iconv_open-hpux.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str27, "cp869"}, -#line 33 "./iconv_open-hpux.gperf" +#line 33 "./lib/iconv_open-hpux.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str28, "cp874"}, -#line 29 "./iconv_open-hpux.gperf" +#line 29 "./lib/iconv_open-hpux.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str29, "cp864"}, -#line 36 "./iconv_open-hpux.gperf" +#line 36 "./lib/iconv_open-hpux.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str30, "cp1252"}, -#line 21 "./iconv_open-hpux.gperf" +#line 21 "./lib/iconv_open-hpux.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str31, "cp437"}, -#line 24 "./iconv_open-hpux.gperf" +#line 24 "./lib/iconv_open-hpux.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str32, "cp852"}, -#line 22 "./iconv_open-hpux.gperf" +#line 22 "./lib/iconv_open-hpux.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str33, "cp775"}, -#line 30 "./iconv_open-hpux.gperf" +#line 30 "./lib/iconv_open-hpux.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str34, "cp865"}, -#line 51 "./iconv_open-hpux.gperf" +#line 51 "./lib/iconv_open-hpux.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str35, "eucJP"}, -#line 14 "./iconv_open-hpux.gperf" +#line 14 "./lib/iconv_open-hpux.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str36, "iso88592"}, -#line 55 "./iconv_open-hpux.gperf" +#line 55 "./lib/iconv_open-hpux.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str37, "sjis"}, -#line 42 "./iconv_open-hpux.gperf" +#line 42 "./lib/iconv_open-hpux.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str38, "cp1258"}, -#line 56 "./iconv_open-hpux.gperf" +#line 56 "./lib/iconv_open-hpux.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str39, "utf8"}, -#line 48 "./iconv_open-hpux.gperf" +#line 48 "./lib/iconv_open-hpux.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str40, "kana8"}, -#line 43 "./iconv_open-hpux.gperf" +#line 43 "./lib/iconv_open-hpux.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str41, "roman8"}, -#line 46 "./iconv_open-hpux.gperf" +#line 46 "./lib/iconv_open-hpux.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str42, "hebrew8"}, -#line 50 "./iconv_open-hpux.gperf" +#line 50 "./lib/iconv_open-hpux.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str43, "hp15CN"}, -#line 18 "./iconv_open-hpux.gperf" +#line 18 "./lib/iconv_open-hpux.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str44, "iso88598"}, -#line 47 "./iconv_open-hpux.gperf" +#line 47 "./lib/iconv_open-hpux.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str45, "turkish8"}, -#line 45 "./iconv_open-hpux.gperf" +#line 45 "./lib/iconv_open-hpux.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str46, "greek8"}, -#line 44 "./iconv_open-hpux.gperf" +#line 44 "./lib/iconv_open-hpux.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str47, "arabic8"}, -#line 28 "./iconv_open-hpux.gperf" +#line 28 "./lib/iconv_open-hpux.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str48, "cp862"}, -#line 37 "./iconv_open-hpux.gperf" +#line 37 "./lib/iconv_open-hpux.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str49, "cp1253"} }; diff --git a/lib/iconv_open-irix.h b/lib/iconv_open-irix.h index 74ceb8f5..9b78379d 100644 --- a/lib/iconv_open-irix.h +++ b/lib/iconv_open-irix.h @@ -1,5 +1,5 @@ /* ANSI-C code produced by gperf version 3.0.4 */ -/* Command-line: gperf -m 10 ./iconv_open-irix.gperf */ +/* Command-line: gperf -m 10 ./lib/iconv_open-irix.gperf */ /* Computed positions: -k'1,$' */ #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ @@ -29,7 +29,7 @@ #error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>." #endif -#line 1 "./iconv_open-irix.gperf" +#line 1 "./lib/iconv_open-irix.gperf" struct mapping { int standard_name; const char vendor_name[10 + 1]; }; #define TOTAL_KEYWORDS 19 @@ -130,43 +130,43 @@ static const struct stringpool_t stringpool_contents = static const struct mapping mappings[] = { {-1}, {-1}, {-1}, {-1}, {-1}, -#line 24 "./iconv_open-irix.gperf" +#line 24 "./lib/iconv_open-irix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str5, "DOS855"}, -#line 29 "./iconv_open-irix.gperf" +#line 29 "./lib/iconv_open-irix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str6, "eucTW"}, -#line 28 "./iconv_open-irix.gperf" +#line 28 "./lib/iconv_open-irix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str7, "eucKR"}, -#line 25 "./iconv_open-irix.gperf" +#line 25 "./lib/iconv_open-irix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str8, "WIN1251"}, -#line 30 "./iconv_open-irix.gperf" +#line 30 "./lib/iconv_open-irix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str9, "sjis"}, -#line 17 "./iconv_open-irix.gperf" +#line 17 "./lib/iconv_open-irix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str10, "ISO8859-5"}, -#line 22 "./iconv_open-irix.gperf" +#line 22 "./lib/iconv_open-irix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str11, "ISO8859-15"}, -#line 13 "./iconv_open-irix.gperf" +#line 13 "./lib/iconv_open-irix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str12, "ISO8859-1"}, -#line 27 "./iconv_open-irix.gperf" +#line 27 "./lib/iconv_open-irix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str13, "eucJP"}, -#line 23 "./iconv_open-irix.gperf" +#line 23 "./lib/iconv_open-irix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str14, "KOI8"}, -#line 14 "./iconv_open-irix.gperf" +#line 14 "./lib/iconv_open-irix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str15, "ISO8859-2"}, -#line 26 "./iconv_open-irix.gperf" +#line 26 "./lib/iconv_open-irix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str16, "eucCN"}, -#line 21 "./iconv_open-irix.gperf" +#line 21 "./lib/iconv_open-irix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str17, "ISO8859-9"}, -#line 20 "./iconv_open-irix.gperf" +#line 20 "./lib/iconv_open-irix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str18, "ISO8859-8"}, -#line 19 "./iconv_open-irix.gperf" +#line 19 "./lib/iconv_open-irix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str19, "ISO8859-7"}, -#line 18 "./iconv_open-irix.gperf" +#line 18 "./lib/iconv_open-irix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str20, "ISO8859-6"}, -#line 16 "./iconv_open-irix.gperf" +#line 16 "./lib/iconv_open-irix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str21, "ISO8859-4"}, -#line 15 "./iconv_open-irix.gperf" +#line 15 "./lib/iconv_open-irix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str22, "ISO8859-3"}, -#line 31 "./iconv_open-irix.gperf" +#line 31 "./lib/iconv_open-irix.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str23, "TIS620"} }; diff --git a/lib/iconv_open-osf.h b/lib/iconv_open-osf.h index 4d357649..955fe72c 100644 --- a/lib/iconv_open-osf.h +++ b/lib/iconv_open-osf.h @@ -1,5 +1,5 @@ /* ANSI-C code produced by gperf version 3.0.4 */ -/* Command-line: gperf -m 10 ./iconv_open-osf.gperf */ +/* Command-line: gperf -m 10 ./lib/iconv_open-osf.gperf */ /* Computed positions: -k'4,$' */ #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ @@ -29,7 +29,7 @@ #error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>." #endif -#line 1 "./iconv_open-osf.gperf" +#line 1 "./lib/iconv_open-osf.gperf" struct mapping { int standard_name; const char vendor_name[10 + 1]; }; #define TOTAL_KEYWORDS 38 @@ -168,84 +168,84 @@ static const struct stringpool_t stringpool_contents = static const struct mapping mappings[] = { {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, -#line 41 "./iconv_open-osf.gperf" +#line 41 "./lib/iconv_open-osf.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str6, "cp1255"}, -#line 24 "./iconv_open-osf.gperf" +#line 24 "./lib/iconv_open-osf.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str7, "cp775"}, -#line 36 "./iconv_open-osf.gperf" +#line 36 "./lib/iconv_open-osf.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str8, "cp1250"}, -#line 47 "./iconv_open-osf.gperf" +#line 47 "./lib/iconv_open-osf.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str9, "eucTW"}, -#line 46 "./iconv_open-osf.gperf" +#line 46 "./lib/iconv_open-osf.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str10, "eucKR"}, -#line 50 "./iconv_open-osf.gperf" +#line 50 "./lib/iconv_open-osf.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str11, "TACTIS"}, -#line 17 "./iconv_open-osf.gperf" +#line 17 "./lib/iconv_open-osf.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str12, "ISO8859-5"}, -#line 22 "./iconv_open-osf.gperf" +#line 22 "./lib/iconv_open-osf.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str13, "ISO8859-15"}, -#line 48 "./iconv_open-osf.gperf" +#line 48 "./lib/iconv_open-osf.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str14, "big5"}, -#line 27 "./iconv_open-osf.gperf" +#line 27 "./lib/iconv_open-osf.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str15, "cp855"}, -#line 44 "./iconv_open-osf.gperf" +#line 44 "./lib/iconv_open-osf.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str16, "cp1258"}, -#line 25 "./iconv_open-osf.gperf" +#line 25 "./lib/iconv_open-osf.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str17, "cp850"}, -#line 31 "./iconv_open-osf.gperf" +#line 31 "./lib/iconv_open-osf.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str18, "cp865"}, -#line 45 "./iconv_open-osf.gperf" +#line 45 "./lib/iconv_open-osf.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str19, "eucJP"}, -#line 43 "./iconv_open-osf.gperf" +#line 43 "./lib/iconv_open-osf.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str20, "cp1257"}, -#line 42 "./iconv_open-osf.gperf" +#line 42 "./lib/iconv_open-osf.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str21, "cp1256"}, -#line 20 "./iconv_open-osf.gperf" +#line 20 "./lib/iconv_open-osf.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str22, "ISO8859-8"}, -#line 49 "./iconv_open-osf.gperf" +#line 49 "./lib/iconv_open-osf.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str23, "SJIS"}, {-1}, -#line 21 "./iconv_open-osf.gperf" +#line 21 "./lib/iconv_open-osf.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str25, "ISO8859-9"}, -#line 19 "./iconv_open-osf.gperf" +#line 19 "./lib/iconv_open-osf.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str26, "ISO8859-7"}, -#line 18 "./iconv_open-osf.gperf" +#line 18 "./lib/iconv_open-osf.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str27, "ISO8859-6"}, {-1}, -#line 28 "./iconv_open-osf.gperf" +#line 28 "./lib/iconv_open-osf.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str29, "cp857"}, -#line 38 "./iconv_open-osf.gperf" +#line 38 "./lib/iconv_open-osf.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str30, "cp1252"}, -#line 33 "./iconv_open-osf.gperf" +#line 33 "./lib/iconv_open-osf.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str31, "cp869"}, -#line 35 "./iconv_open-osf.gperf" +#line 35 "./lib/iconv_open-osf.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str32, "KSC5601"}, -#line 32 "./iconv_open-osf.gperf" +#line 32 "./lib/iconv_open-osf.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str33, "cp866"}, -#line 23 "./iconv_open-osf.gperf" +#line 23 "./lib/iconv_open-osf.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str34, "cp437"}, -#line 37 "./iconv_open-osf.gperf" +#line 37 "./lib/iconv_open-osf.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str35, "cp1251"}, -#line 14 "./iconv_open-osf.gperf" +#line 14 "./lib/iconv_open-osf.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str36, "ISO8859-2"}, -#line 40 "./iconv_open-osf.gperf" +#line 40 "./lib/iconv_open-osf.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str37, "cp1254"}, -#line 34 "./iconv_open-osf.gperf" +#line 34 "./lib/iconv_open-osf.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str38, "cp874"}, -#line 26 "./iconv_open-osf.gperf" +#line 26 "./lib/iconv_open-osf.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str39, "cp852"}, -#line 39 "./iconv_open-osf.gperf" +#line 39 "./lib/iconv_open-osf.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str40, "cp1253"}, -#line 13 "./iconv_open-osf.gperf" +#line 13 "./lib/iconv_open-osf.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str41, "ISO8859-1"}, -#line 30 "./iconv_open-osf.gperf" +#line 30 "./lib/iconv_open-osf.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str42, "cp862"}, -#line 16 "./iconv_open-osf.gperf" +#line 16 "./lib/iconv_open-osf.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str43, "ISO8859-4"}, {-1}, {-1}, -#line 15 "./iconv_open-osf.gperf" +#line 15 "./lib/iconv_open-osf.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str46, "ISO8859-3"}, -#line 29 "./iconv_open-osf.gperf" +#line 29 "./lib/iconv_open-osf.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str47, "cp861"} }; diff --git a/lib/iconv_open-solaris.h b/lib/iconv_open-solaris.h index 630cde16..dfd5a5d6 100644 --- a/lib/iconv_open-solaris.h +++ b/lib/iconv_open-solaris.h @@ -1,5 +1,5 @@ /* ANSI-C code produced by gperf version 3.0.4 */ -/* Command-line: gperf -m 10 ./iconv_open-solaris.gperf */ +/* Command-line: gperf -m 10 ./lib/iconv_open-solaris.gperf */ /* Computed positions: -k'10' */ #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ @@ -29,7 +29,7 @@ #error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>." #endif -#line 1 "./iconv_open-solaris.gperf" +#line 1 "./lib/iconv_open-solaris.gperf" struct mapping { int standard_name; const char vendor_name[10 + 1]; }; #define TOTAL_KEYWORDS 13 @@ -132,32 +132,32 @@ static const struct stringpool_t stringpool_contents = static const struct mapping mappings[] = { {-1}, {-1}, {-1}, {-1}, {-1}, -#line 19 "./iconv_open-solaris.gperf" +#line 19 "./lib/iconv_open-solaris.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str5, "646"}, -#line 30 "./iconv_open-solaris.gperf" +#line 30 "./lib/iconv_open-solaris.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str6, "ansi-1251"}, -#line 18 "./iconv_open-solaris.gperf" +#line 18 "./lib/iconv_open-solaris.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str7}, {-1}, {-1}, -#line 20 "./iconv_open-solaris.gperf" +#line 20 "./lib/iconv_open-solaris.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str10, "ISO8859-1"}, -#line 29 "./iconv_open-solaris.gperf" +#line 29 "./lib/iconv_open-solaris.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str11, "ISO8859-15"}, -#line 28 "./iconv_open-solaris.gperf" +#line 28 "./lib/iconv_open-solaris.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str12, "ISO8859-9"}, -#line 27 "./iconv_open-solaris.gperf" +#line 27 "./lib/iconv_open-solaris.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str13, "ISO8859-8"}, -#line 26 "./iconv_open-solaris.gperf" +#line 26 "./lib/iconv_open-solaris.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str14, "ISO8859-7"}, -#line 25 "./iconv_open-solaris.gperf" +#line 25 "./lib/iconv_open-solaris.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str15, "ISO8859-6"}, -#line 24 "./iconv_open-solaris.gperf" +#line 24 "./lib/iconv_open-solaris.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str16, "ISO8859-5"}, -#line 23 "./iconv_open-solaris.gperf" +#line 23 "./lib/iconv_open-solaris.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str17, "ISO8859-4"}, -#line 22 "./iconv_open-solaris.gperf" +#line 22 "./lib/iconv_open-solaris.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str18, "ISO8859-3"}, -#line 21 "./iconv_open-solaris.gperf" +#line 21 "./lib/iconv_open-solaris.gperf" {(int)(long)&((struct stringpool_t *)0)->stringpool_str19, "ISO8859-2"} }; diff --git a/lib/iconv_open.c b/lib/iconv_open.c index 76536176..9a38e7e8 100644 --- a/lib/iconv_open.c +++ b/lib/iconv_open.c @@ -1,5 +1,5 @@ /* Character set conversion. - Copyright (C) 2007, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 2007, 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 diff --git a/lib/idcache.c b/lib/idcache.c index 8c1315f2..8b9db5ee 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-2012 Free + Copyright (C) 1985, 1988-1990, 1997-1998, 2003, 2005-2007, 2009-2013 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 52919de8..63ecde85 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-2012 Free Software Foundation, Inc. + 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 @@ -35,16 +35,6 @@ #ifndef _GL_IGNORE_VALUE_H # define _GL_IGNORE_VALUE_H -# ifndef _GL_ATTRIBUTE_DEPRECATED -/* The __attribute__((__deprecated__)) feature - is available in gcc versions 3.1 and newer. */ -# if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 1) -# define _GL_ATTRIBUTE_DEPRECATED /* empty */ -# else -# define _GL_ATTRIBUTE_DEPRECATED __attribute__ ((__deprecated__)) -# endif -# endif - /* 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. */ diff --git a/lib/inet_ntop.c b/lib/inet_ntop.c index b437e975..fdfd21dc 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-2012 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 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 diff --git a/lib/ino-map.c b/lib/ino-map.c index 8d53cc5c..a6271607 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-2012 Free Software Foundation, Inc. + Copyright 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 diff --git a/lib/intprops.h b/lib/intprops.h index 2485c78d..b473052d 100644 --- a/lib/intprops.h +++ b/lib/intprops.h @@ -1,6 +1,6 @@ /* intprops.h -- properties of integer types - Copyright (C) 2001-2005, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 2001-2005, 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 diff --git a/lib/inttostr.h b/lib/inttostr.h index ff5f9795..4605145a 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-2012 Free Software Foundation, Inc. + Copyright (C) 2001-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 diff --git a/lib/inttypes.in.h b/lib/inttypes.in.h index b9da2b5b..1893f556 100644 --- a/lib/inttypes.in.h +++ b/lib/inttypes.in.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2006-2012 Free Software Foundation, Inc. +/* Copyright (C) 2006-2013 Free Software Foundation, Inc. Written by Paul Eggert, Bruno Haible, Derek Price. This file is part of gnulib. diff --git a/lib/isapipe.c b/lib/isapipe.c index 82df3ea8..8b2d09e5 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-2012 Free Software Foundation, Inc. + Copyright (C) 2006, 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 diff --git a/lib/isatty.c b/lib/isatty.c index 2ecdd549..36fbc36e 100644 --- a/lib/isatty.c +++ b/lib/isatty.c @@ -1,5 +1,5 @@ /* isatty() replacement. - Copyright (C) 2012 Free Software Foundation, Inc. + Copyright (C) 2012-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 @@ -37,7 +37,7 @@ #define IsConsoleHandle(h) (((intptr_t) (h) & 3) == 3) #if HAVE_MSVC_INVALID_PARAMETER_HANDLER -static inline int +static int _isatty_nothrow (int fd) { int result; diff --git a/lib/isblank.c b/lib/isblank.c index 63ff34f0..c130af40 100644 --- a/lib/isblank.c +++ b/lib/isblank.c @@ -1,6 +1,6 @@ /* Test whether a character is a blank. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/isnan.c b/lib/isnan.c index a5a7d92c..d95e4bac 100644 --- a/lib/isnan.c +++ b/lib/isnan.c @@ -1,5 +1,5 @@ /* Test for NaN that does not need libm. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/lib/isnand-nolibm.h b/lib/isnand-nolibm.h index 56fb2709..8a84ff81 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/lib/isnand.c b/lib/isnand.c index ef815f3c..cbad17b5 100644 --- a/lib/isnand.c +++ b/lib/isnand.c @@ -1,5 +1,5 @@ /* Test for NaN that does not need libm. - Copyright (C) 2008-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/isnanf-nolibm.h b/lib/isnanf-nolibm.h index 9d550e09..dc43863a 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/lib/isnanf.c b/lib/isnanf.c index 0816704b..946cb69c 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-2012 Free Software Foundation, Inc. + Copyright (C) 2007, 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 diff --git a/lib/isnanl-nolibm.h b/lib/isnanl-nolibm.h index 58d963db..18eb8037 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/lib/isnanl.c b/lib/isnanl.c index 597ac2a8..9d9d84b9 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-2012 Free Software Foundation, Inc. + Copyright (C) 2007, 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 diff --git a/lib/iswblank.c b/lib/iswblank.c index f18de993..613ef638 100644 --- a/lib/iswblank.c +++ b/lib/iswblank.c @@ -1,5 +1,5 @@ /* Test wide character for being blank. - Copyright (C) 2008-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/itold.c b/lib/itold.c index 95ff7e17..9aabc7e4 100644 --- a/lib/itold.c +++ b/lib/itold.c @@ -1,5 +1,5 @@ /* Replacement for 'int' to 'long double' conversion routine. - Copyright (C) 2011-2012 Free Software Foundation, Inc. + Copyright (C) 2011-2013 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 605c9f70..5388ce62 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-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/lchown.c b/lib/lchown.c index 17e72ffe..ff48c183 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-2012 Free Software + Copyright (C) 1998-1999, 2002, 2004, 2006-2007, 2009-2013 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 b5109e68..c725b8ce 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-2012 + Copyright (C) 1986, 1991, 1998-1999, 2001, 2003-2004, 2006-2007, 2009-2013 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 9f3e1f47..12030b50 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-2012 Free + Copyright (C) 1986, 1991, 1998-1999, 2002-2003, 2007, 2009-2013 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 ee10fe8a..ce3cc449 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-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/linkat.c b/lib/linkat.c index 3fd81dab..f358b2db 100644 --- a/lib/linkat.c +++ b/lib/linkat.c @@ -1,5 +1,5 @@ /* Create a hard link relative to open directories. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/local.mk b/lib/local.mk new file mode 100644 index 00000000..decbad62 --- /dev/null +++ b/lib/local.mk @@ -0,0 +1,5 @@ +include lib/gnulib.mk + +# Allow "make distdir" to succeed before "make all" has run. +dist-hook: $(noinst_LIBRARIES) +.PHONY: dist-hook diff --git a/lib/localcharset.c b/lib/localcharset.c index 113205de..953cc1e7 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-2012 Free Software Foundation, Inc. + Copyright (C) 2000-2006, 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 @@ -29,7 +29,7 @@ #include <stdlib.h> #if defined __APPLE__ && defined __MACH__ && HAVE_LANGINFO_CODESET -# define DARWIN7 /* Darwin 7 or newer, i.e. MacOS X 10.3 or newer */ +# define DARWIN7 /* Darwin 7 or newer, i.e. Mac OS X 10.3 or newer */ #endif #if defined _WIN32 || defined __WIN32__ @@ -542,5 +542,12 @@ locale_charset (void) if (codeset[0] == '\0') codeset = "ASCII"; +#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) + codeset = "ASCII"; +#endif + return codeset; } diff --git a/lib/localcharset.h b/lib/localcharset.h index 39dc5939..c2098298 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-2012 Free Software Foundation, Inc. + Copyright (C) 2000-2003, 2009-2013 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 7747902c..264161a6 100644 --- a/lib/locale.in.h +++ b/lib/locale.in.h @@ -1,5 +1,5 @@ /* A POSIX <locale.h>. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 @@ -14,23 +14,37 @@ 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@_LOCALE_H - #if __GNUC__ >= 3 @PRAGMA_SYSTEM_HEADER@ #endif @PRAGMA_COLUMNS@ +#ifdef _GL_ALREADY_INCLUDING_LOCALE_H + +/* Special invocation conventions to handle Solaris header files + (through Solaris 10) when combined with gettext's libintl.h. */ + +#@INCLUDE_NEXT@ @NEXT_LOCALE_H@ + +#else +/* Normal invocation convention. */ + +#ifndef _@GUARD_PREFIX@_LOCALE_H + +#define _GL_ALREADY_INCLUDING_LOCALE_H + /* The include_next requires a split double-inclusion guard. */ #@INCLUDE_NEXT@ @NEXT_LOCALE_H@ +#undef _GL_ALREADY_INCLUDING_LOCALE_H + #ifndef _@GUARD_PREFIX@_LOCALE_H #define _@GUARD_PREFIX@_LOCALE_H /* NetBSD 5.0 mis-defines NULL. */ #include <stddef.h> -/* MacOS X 10.5 defines the locale_t type in <xlocale.h>. */ +/* Mac OS X 10.5 defines the locale_t type in <xlocale.h>. */ #if @HAVE_XLOCALE_H@ # include <xlocale.h> #endif @@ -198,4 +212,5 @@ _GL_WARN_ON_USE (duplocale, "duplocale is buggy on some glibc systems - " #endif #endif /* _@GUARD_PREFIX@_LOCALE_H */ +#endif /* ! _GL_ALREADY_INCLUDING_LOCALE_H */ #endif /* _@GUARD_PREFIX@_LOCALE_H */ diff --git a/lib/localeconv.c b/lib/localeconv.c index 2c91b374..7c7c77cf 100644 --- a/lib/localeconv.c +++ b/lib/localeconv.c @@ -1,5 +1,5 @@ /* Query locale dependent information for formatting numbers. - Copyright (C) 2012 Free Software Foundation, Inc. + Copyright (C) 2012-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 diff --git a/lib/long-options.c b/lib/long-options.c index 450947d8..723cad5d 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-2012 Free Software + Copyright (C) 1993-1994, 1998-2000, 2002-2006, 2009-2013 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 2c62c143..e0e70853 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-2012 Free Software + Copyright (C) 1993-1994, 1998-1999, 2003, 2009-2013 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 794c2304..fa7440d1 100644 --- a/lib/lseek.c +++ b/lib/lseek.c @@ -1,5 +1,5 @@ /* An lseek() function that detects pipes. - Copyright (C) 2007, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 2007, 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 diff --git a/lib/lstat.c b/lib/lstat.c index db119a10..1a613a89 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-2012 Free Software Foundation, Inc. + Copyright (C) 1997-2006, 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 @@ -35,7 +35,7 @@ typedef int dummy; # include <sys/stat.h> # undef __need_system_sys_stat_h -static inline int +static int orig_lstat (const char *filename, struct stat *buf) { return lstat (filename, buf); diff --git a/lib/malloc.c b/lib/malloc.c index e0d5c89d..908735d2 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-2012 Free Software Foundation, Inc. + Copyright (C) 1997-1998, 2006-2007, 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 diff --git a/lib/malloca.c b/lib/malloca.c index 1f7533a7..3cd2f6d9 100644 --- a/lib/malloca.c +++ b/lib/malloca.c @@ -1,5 +1,5 @@ /* Safe automatic memory allocation. - Copyright (C) 2003, 2006-2007, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 2003, 2006-2007, 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 diff --git a/lib/malloca.h b/lib/malloca.h index 0cedf5f6..906d47a2 100644 --- a/lib/malloca.h +++ b/lib/malloca.h @@ -1,5 +1,5 @@ /* Safe automatic memory allocation. - Copyright (C) 2003-2007, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 2003-2007, 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 @@ -42,7 +42,7 @@ extern "C" { and a page size can be as small as 4096 bytes. So we cannot safely allocate anything larger than 4096 bytes. Also care for the possibility of a few compiler-allocated temporary stack slots. - This must be a macro, not an inline function. */ + This must be a macro, not a function. */ # define safe_alloca(N) ((N) < 4032 ? alloca (N) : NULL) #else # define safe_alloca(N) ((void) (N), NULL) diff --git a/lib/math.c b/lib/math.c new file mode 100644 index 00000000..ddb2ded5 --- /dev/null +++ b/lib/math.c @@ -0,0 +1,3 @@ +#include <config.h> +#define _GL_MATH_INLINE _GL_EXTERN_INLINE +#include "math.h" diff --git a/lib/math.in.h b/lib/math.in.h index 0625777a..7189819b 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-2012 Free Software Foundation, Inc. + Copyright (C) 2002-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 @@ -28,6 +28,10 @@ #ifndef _@GUARD_PREFIX@_MATH_H #define _@GUARD_PREFIX@_MATH_H +_GL_INLINE_HEADER_BEGIN +#ifndef _GL_MATH_INLINE +# define _GL_MATH_INLINE _GL_INLINE +#endif /* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ @@ -78,17 +82,17 @@ func (long double l) \ classification macros with an argument of real-floating (that is, one of float, double, or long double). */ #define _GL_WARN_REAL_FLOATING_DECL(func) \ -static inline int \ +_GL_MATH_INLINE int \ rpl_ ## func ## f (float f) \ { \ return func (f); \ } \ -static inline int \ +_GL_MATH_INLINE int \ rpl_ ## func ## d (double d) \ { \ return func (d); \ } \ -static inline int \ +_GL_MATH_INLINE int \ rpl_ ## func ## l (long double l) \ { \ return func (l); \ @@ -124,7 +128,7 @@ static void (*_gl_math_fix_itold) (long double *, int) = _Qp_itoq; /* The Compaq (ex-DEC) C 6.4 compiler and the Microsoft MSVC 9 compiler choke on the expression 0.0 / 0.0. */ # if defined __DECC || defined _MSC_VER -static float +_GL_MATH_INLINE float _NaN () { static float zero = 0.0f; @@ -2265,6 +2269,7 @@ _GL_WARN_REAL_FLOATING_DECL (signbit); # endif #endif +_GL_INLINE_HEADER_END #endif /* _@GUARD_PREFIX@_MATH_H */ #endif /* _@GUARD_PREFIX@_MATH_H */ diff --git a/lib/mbchar.c b/lib/mbchar.c index 10709510..7482c31f 100644 --- a/lib/mbchar.c +++ b/lib/mbchar.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001, 2006, 2009-2012 Free Software Foundation, Inc. +/* Copyright (C) 2001, 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 @@ -16,6 +16,8 @@ #include <config.h> +#define MBCHAR_INLINE _GL_EXTERN_INLINE + #include <limits.h> #include "mbchar.h" diff --git a/lib/mbchar.h b/lib/mbchar.h index ccbcb827..327c9575 100644 --- a/lib/mbchar.h +++ b/lib/mbchar.h @@ -1,5 +1,5 @@ /* Multibyte character data type. - Copyright (C) 2001, 2005-2007, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 2001, 2005-2007, 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 @@ -156,6 +156,11 @@ #include <wchar.h> #include <wctype.h> +_GL_INLINE_HEADER_BEGIN +#ifndef MBCHAR_INLINE +# define MBCHAR_INLINE _GL_INLINE +#endif + #define MBCHAR_BUF_SIZE 24 struct mbchar @@ -235,7 +240,7 @@ typedef struct mbchar mbchar_t; /* Unprintable characters appear as a small box of width 1. */ #define MB_UNPRINTABLE_WIDTH 1 -static inline int +MBCHAR_INLINE int mb_width_aux (wint_t wc) { int w = wcwidth (wc); @@ -256,7 +261,7 @@ mb_width_aux (wint_t wc) (mbc)->wc = (mbc)->buf[0] = (sc)) /* Copying a character. */ -static inline void +MBCHAR_INLINE void mb_copy (mbchar_t *new_mbc, const mbchar_t *old_mbc) { if (old_mbc->ptr == &old_mbc->buf[0]) @@ -304,7 +309,7 @@ mb_copy (mbchar_t *new_mbc, const mbchar_t *old_mbc) extern const unsigned int is_basic_table[]; -static inline bool +MBCHAR_INLINE bool is_basic (char c) { return (is_basic_table [(unsigned char) c >> 5] >> ((unsigned char) c & 31)) @@ -313,7 +318,7 @@ is_basic (char c) #else -static inline bool +MBCHAR_INLINE bool is_basic (char c) { switch (c) @@ -347,4 +352,6 @@ is_basic (char c) #endif +_GL_INLINE_HEADER_END + #endif /* _MBCHAR_H */ diff --git a/lib/mbiter.c b/lib/mbiter.c new file mode 100644 index 00000000..22a1ff8d --- /dev/null +++ b/lib/mbiter.c @@ -0,0 +1,3 @@ +#include <config.h> +#define MBITER_INLINE _GL_EXTERN_INLINE +#include "mbiter.h" diff --git a/lib/mbiter.h b/lib/mbiter.h index 5419a67a..24504c3f 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-2012 Free Software Foundation, Inc. + Copyright (C) 2001, 2005, 2007, 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 @@ -97,6 +97,11 @@ #include "mbchar.h" +_GL_INLINE_HEADER_BEGIN +#ifndef MBITER_INLINE +# define MBITER_INLINE _GL_INLINE +#endif + struct mbiter_multi { const char *limit; /* pointer to end of string */ @@ -112,7 +117,7 @@ struct mbiter_multi */ }; -static inline void +MBITER_INLINE void mbiter_multi_next (struct mbiter_multi *iter) { if (iter->next_done) @@ -172,14 +177,14 @@ mbiter_multi_next (struct mbiter_multi *iter) iter->next_done = true; } -static inline void +MBITER_INLINE void mbiter_multi_reloc (struct mbiter_multi *iter, ptrdiff_t ptrdiff) { iter->cur.ptr += ptrdiff; iter->limit += ptrdiff; } -static inline void +MBITER_INLINE void mbiter_multi_copy (struct mbiter_multi *new_iter, const struct mbiter_multi *old_iter) { new_iter->limit = old_iter->limit; @@ -212,4 +217,6 @@ typedef struct mbiter_multi mbi_iterator_t; /* Copying an iterator. */ #define mbi_copy mbiter_multi_copy +_GL_INLINE_HEADER_END + #endif /* _MBITER_H */ diff --git a/lib/mbrlen.c b/lib/mbrlen.c index f52e7604..7b124242 100644 --- a/lib/mbrlen.c +++ b/lib/mbrlen.c @@ -1,5 +1,5 @@ /* Recognize multibyte character. - Copyright (C) 1999-2000, 2008-2012 Free Software Foundation, Inc. + Copyright (C) 1999-2000, 2008-2013 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 e3f354be..5ee44aea 100644 --- a/lib/mbrtowc.c +++ b/lib/mbrtowc.c @@ -1,5 +1,5 @@ /* Convert multibyte character to wide character. - Copyright (C) 1999-2002, 2005-2012 Free Software Foundation, Inc. + Copyright (C) 1999-2002, 2005-2013 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/mbsalign.c b/lib/mbsalign.c index e45456bf..816ada0a 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-2012 Free Software Foundation, Inc. + 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 @@ -126,7 +126,7 @@ mbsalign (const char *src, char *dest, size_t dest_size, /* In multi-byte locales convert to wide characters to allow easy truncation. Also determine number of screen columns used. */ - if (MB_CUR_MAX > 1) + if (!(flags & MBA_UNIBYTE_ONLY) && MB_CUR_MAX > 1) { size_t src_chars = mbstowcs (NULL, src, 0); if (src_chars == SIZE_MAX) @@ -191,37 +191,46 @@ mbsalign_unibyte: /* indicate to caller how many cells needed (not including padding). */ *width = n_cols; - /* indicate to caller how many bytes needed (not including NUL). */ - ret = n_used_bytes + (n_spaces * 1); + { + size_t start_spaces, end_spaces; - /* Write as much NUL terminated output to DEST as possible. */ - if (dest_size != 0) - { - size_t start_spaces, end_spaces, space_left; - char *dest_end = dest + dest_size - 1; + switch (align) + { + case MBS_ALIGN_LEFT: + start_spaces = 0; + end_spaces = n_spaces; + break; + case MBS_ALIGN_RIGHT: + start_spaces = n_spaces; + end_spaces = 0; + break; + case MBS_ALIGN_CENTER: + default: + start_spaces = n_spaces / 2 + n_spaces % 2; + end_spaces = n_spaces / 2; + break; + } + + if (flags & MBA_NO_LEFT_PAD) + start_spaces = 0; + if (flags & MBA_NO_RIGHT_PAD) + end_spaces = 0; - switch (align) + /* Write as much NUL terminated output to DEST as possible. */ + if (dest_size != 0) { - case MBS_ALIGN_LEFT: - start_spaces = 0; - end_spaces = n_spaces; - break; - case MBS_ALIGN_RIGHT: - start_spaces = n_spaces; - end_spaces = 0; - break; - case MBS_ALIGN_CENTER: - default: - start_spaces = n_spaces / 2 + n_spaces % 2; - end_spaces = n_spaces / 2; - break; + size_t space_left; + char *dest_end = dest + dest_size - 1; + + dest = mbs_align_pad (dest, dest_end, start_spaces); + space_left = dest_end - dest; + dest = mempcpy (dest, str_to_print, MIN (n_used_bytes, space_left)); + mbs_align_pad (dest, dest_end, end_spaces); } - dest = mbs_align_pad (dest, dest_end, start_spaces); - space_left = dest_end - dest; - dest = mempcpy (dest, str_to_print, MIN (n_used_bytes, space_left)); - mbs_align_pad (dest, dest_end, end_spaces); - } + /* indicate to caller how many bytes needed (not including NUL). */ + ret = n_used_bytes + ((start_spaces + end_spaces) * 1); + } mbsalign_cleanup: diff --git a/lib/mbsalign.h b/lib/mbsalign.h index e9340f92..72a6d69a 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-2012 Free Software Foundation, Inc. + 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 @@ -21,20 +21,33 @@ typedef enum { MBS_ALIGN_LEFT, MBS_ALIGN_RIGHT, MBS_ALIGN_CENTER } mbs_align_t; enum { /* Use unibyte mode for invalid multibyte strings or when heap memory is exhausted. */ - MBA_UNIBYTE_FALLBACK = 0x0001 + MBA_UNIBYTE_FALLBACK = 0x0001, + + /* As an optimization, don't do multibyte processing + when we know no multibyte characters are present. */ + MBA_UNIBYTE_ONLY = 0x0002, + + /* Don't add leading padding. */ + MBA_NO_LEFT_PAD = 0x0004, + + /* Don't add trailing padding. */ + MBA_NO_RIGHT_PAD = 0x0008 #if 0 /* Other possible options. */ - /* Skip invalid multibyte chars rather than failing */ - MBA_IGNORE_INVALID = 0x0002, + /* Skip invalid multibyte chars rather than failing. */ + MBA_IGNORE_INVALID + + /* Align multibyte strings using "figure space" (\u2007). */ + MBA_USE_FIGURE_SPACE - /* Align multibyte strings using "figure space" (\u2007) */ - MBA_USE_FIGURE_SPACE = 0x0004, + /* Don't truncate. */ + MBA_NO_TRUNCATE - /* Don't add any padding */ - MBA_TRUNCATE_ONLY = 0x0008, + /* Ensure no leading whitespace. */ + MBA_LSTRIP - /* Don't truncate */ - MBA_PAD_ONLY = 0x0010, + /* Ensure no trailing whitespace. */ + MBA_RSTRIP #endif }; diff --git a/lib/mbscasecmp.c b/lib/mbscasecmp.c index 863bf0ad..97ef1dab 100644 --- a/lib/mbscasecmp.c +++ b/lib/mbscasecmp.c @@ -1,5 +1,5 @@ /* Case-insensitive string comparison function. - Copyright (C) 1998-1999, 2005-2012 Free Software Foundation, Inc. + Copyright (C) 1998-1999, 2005-2013 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 638142e8..26fbb7fa 100644 --- a/lib/mbsinit.c +++ b/lib/mbsinit.c @@ -1,5 +1,5 @@ /* Test for initial conversion state. - Copyright (C) 2008-2012 Free Software Foundation, Inc. + Copyright (C) 2008-2013 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 a829ff54..85e938bc 100644 --- a/lib/mbslen.c +++ b/lib/mbslen.c @@ -1,5 +1,5 @@ /* Counting the multibyte characters in a string. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 2007-2013 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 019bc336..b50e9739 100644 --- a/lib/mbsrtowcs-impl.h +++ b/lib/mbsrtowcs-impl.h @@ -1,5 +1,5 @@ /* Convert string to wide string. - Copyright (C) 2008-2012 Free Software Foundation, Inc. + Copyright (C) 2008-2013 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 bf246eb4..5a0b8882 100644 --- a/lib/mbsrtowcs-state.c +++ b/lib/mbsrtowcs-state.c @@ -1,5 +1,5 @@ /* Convert string to wide string. - Copyright (C) 2008-2012 Free Software Foundation, Inc. + Copyright (C) 2008-2013 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,7 +22,7 @@ /* Internal state used by the functions mbsrtowcs() and mbsnrtowcs(). */ mbstate_t _gl_mbsrtowcs_state /* The state must initially be in the "initial state"; so, zero-initialize it. - On most systems, putting it into BSS is sufficient. Not so on MacOS X 10.3, + On most systems, putting it into BSS is sufficient. Not so on Mac OS X 10.3, see <http://lists.gnu.org/archive/html/bug-gnulib/2009-01/msg00329.html>. When it needs an initializer, use 0 or {0} as initializer? 0 only works when mbstate_t is a scalar type (such as when gnulib defines it, or on diff --git a/lib/mbsrtowcs.c b/lib/mbsrtowcs.c index e3ec8767..116ff493 100644 --- a/lib/mbsrtowcs.c +++ b/lib/mbsrtowcs.c @@ -1,5 +1,5 @@ /* Convert string to wide string. - Copyright (C) 2008-2012 Free Software Foundation, Inc. + Copyright (C) 2008-2013 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 464fb7d6..f84e689e 100644 --- a/lib/mbsstr.c +++ b/lib/mbsstr.c @@ -1,5 +1,5 @@ /* Searching in a string. - Copyright (C) 2005-2012 Free Software Foundation, Inc. + Copyright (C) 2005-2013 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/mbswidth.c b/lib/mbswidth.c index d81b5c8d..7c2dfce8 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-2012 Free Software Foundation, Inc. + Copyright (C) 2000-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 diff --git a/lib/mbswidth.h b/lib/mbswidth.h index 690a5a78..e9c0b039 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-2012 Free Software Foundation, Inc. + Copyright (C) 2000-2004, 2007, 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 diff --git a/lib/mbtowc-impl.h b/lib/mbtowc-impl.h index bb75ed29..767ab397 100644 --- a/lib/mbtowc-impl.h +++ b/lib/mbtowc-impl.h @@ -1,5 +1,5 @@ /* Convert multibyte character to wide character. - Copyright (C) 2011-2012 Free Software Foundation, Inc. + Copyright (C) 2011-2013 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 97eab4e9..632f2e1d 100644 --- a/lib/mbtowc.c +++ b/lib/mbtowc.c @@ -1,5 +1,5 @@ /* Convert multibyte character to wide character. - Copyright (C) 2011-2012 Free Software Foundation, Inc. + Copyright (C) 2011-2013 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.c b/lib/mbuiter.c new file mode 100644 index 00000000..9167580d --- /dev/null +++ b/lib/mbuiter.c @@ -0,0 +1,3 @@ +#include <config.h> +#define MBUITER_INLINE _GL_EXTERN_INLINE +#include "mbuiter.h" diff --git a/lib/mbuiter.h b/lib/mbuiter.h index 44b61737..c5f5fcee 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-2012 Free Software Foundation, Inc. + Copyright (C) 2001, 2005, 2007, 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 @@ -106,6 +106,11 @@ #include "mbchar.h" #include "strnlen1.h" +_GL_INLINE_HEADER_BEGIN +#ifndef MBUITER_INLINE +# define MBUITER_INLINE _GL_INLINE +#endif + struct mbuiter_multi { bool in_shift; /* true if next byte may not be interpreted as ASCII */ @@ -120,7 +125,7 @@ struct mbuiter_multi */ }; -static inline void +MBUITER_INLINE void mbuiter_multi_next (struct mbuiter_multi *iter) { if (iter->next_done) @@ -181,13 +186,13 @@ mbuiter_multi_next (struct mbuiter_multi *iter) iter->next_done = true; } -static inline void +MBUITER_INLINE void mbuiter_multi_reloc (struct mbuiter_multi *iter, ptrdiff_t ptrdiff) { iter->cur.ptr += ptrdiff; } -static inline void +MBUITER_INLINE void mbuiter_multi_copy (struct mbuiter_multi *new_iter, const struct mbuiter_multi *old_iter) { if ((new_iter->in_shift = old_iter->in_shift)) @@ -219,4 +224,6 @@ typedef struct mbuiter_multi mbui_iterator_t; /* Copying an iterator. */ #define mbui_copy mbuiter_multi_copy +_GL_INLINE_HEADER_END + #endif /* _MBUITER_H */ diff --git a/lib/md5.c b/lib/md5.c index 5056bf50..f41b5beb 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-2012 Free Software + Copyright (C) 1995-1997, 1999-2001, 2005-2006, 2008-2013 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -83,7 +83,7 @@ md5_init_ctx (struct md5_ctx *ctx) /* Copy the 4 byte value from v into the memory location pointed to by *cp, If your architecture allows unaligned access this is equivalent to * (uint32_t *) cp = v */ -static inline void +static void set_uint32 (char *cp, uint32_t v) { memcpy (cp, &v, sizeof v); @@ -312,13 +312,13 @@ md5_process_block (const void *buffer, size_t len, struct md5_ctx *ctx) uint32_t B = ctx->B; uint32_t C = ctx->C; uint32_t D = ctx->D; + uint32_t lolen = len; /* First increment the byte count. RFC 1321 specifies the possible length of the file up to 2^64 bits. Here we only compute the number of bytes. Do a double word increment. */ - ctx->total[0] += len; - if (ctx->total[0] < len) - ++ctx->total[1]; + ctx->total[0] += lolen; + ctx->total[1] += (len >> 31 >> 1) + (ctx->total[0] < lolen); /* Process all bytes in the buffer with 64 bytes in each round of the loop. */ diff --git a/lib/md5.h b/lib/md5.h index 75d6bce5..634a7470 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-2012 Free Software + Copyright (C) 1995-1997, 1999-2001, 2004-2006, 2008-2013 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/lib/memcasecmp.c b/lib/memcasecmp.c index 6f94df5c..e85add4e 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-2012 Free Software + Copyright (C) 1996-1997, 2000, 2003, 2006, 2009-2013 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 6e0af912..27ae3f7e 100644 --- a/lib/memcasecmp.h +++ b/lib/memcasecmp.h @@ -1,6 +1,6 @@ /* Case-insensitive buffer comparator. - Copyright (C) 1996, 1998, 2003, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 1996, 1998, 2003, 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 diff --git a/lib/memchr.c b/lib/memchr.c index b8fb0efb..3db38a94 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-2012 +/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2013 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 b8816a59..3912e027 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-2012 +/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2013 Free Software Foundation, Inc. Based on strlen implementation by Torbjorn Granlund (tege@sics.se), diff --git a/lib/memchr2.h b/lib/memchr2.h index 3cce9f55..cc04889f 100644 --- a/lib/memchr2.h +++ b/lib/memchr2.h @@ -1,5 +1,5 @@ /* Scan memory for the first of two bytes. - Copyright (C) 2008-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/memcmp2.c b/lib/memcmp2.c index e10a709d..8afb3199 100644 --- a/lib/memcmp2.c +++ b/lib/memcmp2.c @@ -1,5 +1,5 @@ /* Compare two memory areas with possibly different lengths. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/memcmp2.h b/lib/memcmp2.h index 7fa386e7..619c7425 100644 --- a/lib/memcmp2.h +++ b/lib/memcmp2.h @@ -1,5 +1,5 @@ /* Compare two memory areas with possibly different lengths. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/memcoll.c b/lib/memcoll.c index eb244638..1f5c2e3a 100644 --- a/lib/memcoll.c +++ b/lib/memcoll.c @@ -1,6 +1,6 @@ /* Locale-specific memory comparison. - Copyright (C) 1999, 2002-2004, 2006, 2009-2012 Free Software Foundation, + Copyright (C) 1999, 2002-2004, 2006, 2009-2013 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -31,7 +31,7 @@ nonzero sizes, and the last byte in each block must be a null byte. Set errno to an error number if there is an error, and to zero otherwise. */ -static inline int +static int strcoll_loop (char const *s1, size_t s1size, char const *s2, size_t s2size) { int diff; diff --git a/lib/memcoll.h b/lib/memcoll.h index 9705ac1c..1aaca474 100644 --- a/lib/memcoll.h +++ b/lib/memcoll.h @@ -1,6 +1,6 @@ /* Locale-specific memory comparison. - Copyright (C) 1999, 2003, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 1999, 2003, 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 diff --git a/lib/mempcpy.c b/lib/mempcpy.c index a97fe422..5582368e 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-2012 Free Software Foundation, Inc. + Copyright (C) 2003, 2007, 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 diff --git a/lib/memrchr.c b/lib/memrchr.c index 8f2edeb3..5a023e06 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-2012 Free Software + Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2013 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 ebe9daca..2d82f45c 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/lib/mgetgroups.h b/lib/mgetgroups.h index 604321c2..b8a99c6a 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-2012 Free Software Foundation, Inc. + Copyright (C) 2007, 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 diff --git a/lib/mkancesdirs.c b/lib/mkancesdirs.c index ff396250..0c60a93c 100644 --- a/lib/mkancesdirs.c +++ b/lib/mkancesdirs.c @@ -1,6 +1,6 @@ /* Make a file's ancestor directories. - Copyright (C) 2006, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/lib/mkdir-p.c b/lib/mkdir-p.c index 58ee45bf..a66f7964 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-2012 Free Software + Copyright (C) 1990, 1997-2000, 2002-2007, 2009-2013 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/mkdir-p.h b/lib/mkdir-p.h index bd0750ee..6e83a63d 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-2012 Free Software + Copyright (C) 1994-1997, 2000, 2003-2006, 2009-2013 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 85dd2a6c..67f29d45 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-2012 Free Software Foundation, Inc. + Copyright (C) 2001, 2003, 2006, 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 diff --git a/lib/mkfifo.c b/lib/mkfifo.c index 9e0cce24..45d16cd4 100644 --- a/lib/mkfifo.c +++ b/lib/mkfifo.c @@ -1,5 +1,5 @@ /* Create a named fifo. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/mknod.c b/lib/mknod.c index 1c8f1fac..71e9d345 100644 --- a/lib/mknod.c +++ b/lib/mknod.c @@ -1,5 +1,5 @@ /* Create a device inode. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/mkstemp-safer.c b/lib/mkstemp-safer.c index 5619d1c0..6431f824 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-2012 Free Software Foundation, Inc. + Copyright (C) 2005-2007, 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 diff --git a/lib/mkstemp.c b/lib/mkstemp.c index 20486378..7a9af6c8 100644 --- a/lib/mkstemp.c +++ b/lib/mkstemp.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998-1999, 2001, 2005-2007, 2009-2012 Free Software +/* Copyright (C) 1998-1999, 2001, 2005-2007, 2009-2013 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 3a769450..e660a23c 100644 --- a/lib/mktime.c +++ b/lib/mktime.c @@ -1,20 +1,21 @@ /* Convert a 'struct tm' to a time_t value. - Copyright (C) 1993-1999, 2002-2007, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 1993-2013 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Paul Eggert <eggert@twinsun.com>. - This 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. + 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/>. */ /* Define this to have a standalone program to test this implementation of mktime. */ @@ -35,7 +36,7 @@ #include <limits.h> -#include <string.h> /* For the real memcpy prototype. */ +#include <string.h> /* For the real memcpy prototype. */ #if DEBUG # include <stdio.h> @@ -52,12 +53,14 @@ Define WRAPV to 1 if the assumption is valid and if #pragma GCC optimize ("wrapv") - does not trigger GCC bug <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=51793>. + does not trigger GCC bug 51793 + <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=51793>. Otherwise, define it to 0; this forces the use of slower code that, while not guaranteed by the C Standard, works on all production platforms that we know about. */ #ifndef WRAPV -# if ((__GNUC__ == 4 && 4 <= __GNUC_MINOR__) || 4 < __GNUC__) && defined __GLIBC__ +# if (((__GNUC__ == 4 && 4 <= __GNUC_MINOR__) || 4 < __GNUC__) \ + && defined __GLIBC__) # pragma GCC optimize ("wrapv") # define WRAPV 1 # else @@ -113,12 +116,12 @@ verify (long_int_is_wide_enough, INT_MAX == INT_MAX * (long_int) 2 / 2); your host. */ #define TYPE_MINIMUM(t) \ ((t) (! TYPE_SIGNED (t) \ - ? (t) 0 \ - : ~ TYPE_MAXIMUM (t))) + ? (t) 0 \ + : ~ TYPE_MAXIMUM (t))) #define TYPE_MAXIMUM(t) \ ((t) (! TYPE_SIGNED (t) \ - ? (t) -1 \ - : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1))) + ? (t) -1 \ + : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1))) #ifndef TIME_T_MIN # define TIME_T_MIN TYPE_MINIMUM (time_t) @@ -130,16 +133,16 @@ verify (long_int_is_wide_enough, INT_MAX == INT_MAX * (long_int) 2 / 2); verify (time_t_is_integer, TYPE_IS_INTEGER (time_t)); verify (twos_complement_arithmetic, - (TYPE_TWOS_COMPLEMENT (int) - && TYPE_TWOS_COMPLEMENT (long_int) - && TYPE_TWOS_COMPLEMENT (time_t))); + (TYPE_TWOS_COMPLEMENT (int) + && TYPE_TWOS_COMPLEMENT (long_int) + && TYPE_TWOS_COMPLEMENT (time_t))); #define EPOCH_YEAR 1970 #define TM_YEAR_BASE 1900 verify (base_year_is_a_multiple_of_100, TM_YEAR_BASE % 100 == 0); /* Return 1 if YEAR + TM_YEAR_BASE is a leap year. */ -static inline int +static int leapyear (long_int year) { /* Don't add YEAR to TM_YEAR_BASE, as that might overflow. @@ -147,7 +150,7 @@ leapyear (long_int year) return ((year & 3) == 0 && (year % 100 != 0 - || ((year / 100) & 3) == (- (TM_YEAR_BASE / 100) & 3))); + || ((year / 100) & 3) == (- (TM_YEAR_BASE / 100) & 3))); } /* How many days come before each month (0-12). */ @@ -179,7 +182,7 @@ const unsigned short int __mon_yday[2][13] = static int isdst_differ (int a, int b) { - return (!a != !b) & (0 <= a) & (0 <= b); + return (!a != !b) && (0 <= a) && (0 <= b); } /* Return an integer value measuring (YEAR1-YDAY1 HOUR1:MIN1:SEC1) - @@ -193,9 +196,9 @@ isdst_differ (int a, int b) The result may overflow. It is the caller's responsibility to detect overflow. */ -static inline time_t +static time_t ydhms_diff (long_int year1, long_int yday1, int hour1, int min1, int sec1, - int year0, int yday0, int hour0, int min0, int sec0) + int year0, int yday0, int hour0, int min0, int sec0) { verify (C99_integer_division, -1 / 2 == 0); @@ -276,15 +279,15 @@ time_t_int_add_ok (time_t a, int b) yield a value equal to *T. */ static time_t guess_time_tm (long_int year, long_int yday, int hour, int min, int sec, - const time_t *t, const struct tm *tp) + const time_t *t, const struct tm *tp) { if (tp) { time_t d = ydhms_diff (year, yday, hour, min, sec, - tp->tm_year, tp->tm_yday, - tp->tm_hour, tp->tm_min, tp->tm_sec); + tp->tm_year, tp->tm_yday, + tp->tm_hour, tp->tm_min, tp->tm_sec); if (time_t_add_ok (*t, d)) - return *t + d; + return *t + d; } /* Overflow occurred one way or another. Return the nearest result @@ -293,8 +296,8 @@ guess_time_tm (long_int year, long_int yday, int hour, int min, int sec, match; and don't oscillate between two values, as that would confuse the spring-forward gap detector. */ return (*t < TIME_T_MIDPOINT - ? (*t <= TIME_T_MIN + 1 ? *t + 1 : TIME_T_MIN) - : (TIME_T_MAX - 1 <= *t ? *t - 1 : TIME_T_MAX)); + ? (*t <= TIME_T_MIN + 1 ? *t + 1 : TIME_T_MIN) + : (TIME_T_MAX - 1 <= *t ? *t - 1 : TIME_T_MAX)); } /* Use CONVERT to convert *T to a broken down time in *TP. @@ -302,7 +305,7 @@ guess_time_tm (long_int year, long_int yday, int hour, int min, int sec, it is the nearest in-range value and then convert that. */ static struct tm * ranged_convert (struct tm *(*convert) (const time_t *, struct tm *), - time_t *t, struct tm *tp) + time_t *t, struct tm *tp) { struct tm *r = convert (t, tp); @@ -312,25 +315,25 @@ ranged_convert (struct tm *(*convert) (const time_t *, struct tm *), time_t ok = 0; /* BAD is a known unconvertible time_t, and OK is a known good one. - Use binary search to narrow the range between BAD and OK until - they differ by 1. */ + Use binary search to narrow the range between BAD and OK until + they differ by 1. */ while (bad != ok + (bad < 0 ? -1 : 1)) - { - time_t mid = *t = time_t_avg (ok, bad); - r = convert (t, tp); - if (r) - ok = mid; - else - bad = mid; - } + { + time_t mid = *t = time_t_avg (ok, bad); + r = convert (t, tp); + if (r) + ok = mid; + else + bad = mid; + } if (!r && ok) - { - /* The last conversion attempt failed; - revert to the most recent successful attempt. */ - *t = ok; - r = convert (t, tp); - } + { + /* The last conversion attempt failed; + revert to the most recent successful attempt. */ + *t = ok; + r = convert (t, tp); + } } return r; @@ -345,8 +348,8 @@ ranged_convert (struct tm *(*convert) (const time_t *, struct tm *), This function is external because it is used also by timegm.c. */ time_t __mktime_internal (struct tm *tp, - struct tm *(*convert) (const time_t *, struct tm *), - time_t *offset) + struct tm *(*convert) (const time_t *, struct tm *), + time_t *offset) { time_t t, gt, t0, t1, t2; struct tm tm; @@ -385,8 +388,8 @@ __mktime_internal (struct tm *tp, /* Calculate day of year from year, month, and day of month. The result need not be in range. */ int mon_yday = ((__mon_yday[leapyear (year)] - [mon_remainder + 12 * negative_mon_remainder]) - - 1); + [mon_remainder + 12 * negative_mon_remainder]) + - 1); long_int lmday = mday; long_int yday = mon_yday + lmday; @@ -397,33 +400,33 @@ __mktime_internal (struct tm *tp, if (LEAP_SECONDS_POSSIBLE) { /* Handle out-of-range seconds specially, - since ydhms_tm_diff assumes every minute has 60 seconds. */ + since ydhms_tm_diff assumes every minute has 60 seconds. */ if (sec < 0) - sec = 0; + sec = 0; if (59 < sec) - sec = 59; + sec = 59; } /* Invert CONVERT by probing. First assume the same offset as last time. */ t0 = ydhms_diff (year, yday, hour, min, sec, - EPOCH_YEAR - TM_YEAR_BASE, 0, 0, 0, - guessed_offset); + EPOCH_YEAR - TM_YEAR_BASE, 0, 0, 0, - guessed_offset); if (TIME_T_MAX / INT_MAX / 366 / 24 / 60 / 60 < 3) { /* time_t isn't large enough to rule out overflows, so check - for major overflows. A gross check suffices, since if t0 - has overflowed, it is off by a multiple of TIME_T_MAX - - TIME_T_MIN + 1. So ignore any component of the difference - that is bounded by a small value. */ + for major overflows. A gross check suffices, since if t0 + has overflowed, it is off by a multiple of TIME_T_MAX - + TIME_T_MIN + 1. So ignore any component of the difference + that is bounded by a small value. */ /* Approximate log base 2 of the number of time units per - biennium. A biennium is 2 years; use this unit instead of - years to avoid integer overflow. For example, 2 average - Gregorian years are 2 * 365.2425 * 24 * 60 * 60 seconds, - which is 63113904 seconds, and rint (log2 (63113904)) is - 26. */ + biennium. A biennium is 2 years; use this unit instead of + years to avoid integer overflow. For example, 2 average + Gregorian years are 2 * 365.2425 * 24 * 60 * 60 seconds, + which is 63113904 seconds, and rint (log2 (63113904)) is + 26. */ int ALOG2_SECONDS_PER_BIENNIUM = 26; int ALOG2_MINUTES_PER_BIENNIUM = 20; int ALOG2_HOURS_PER_BIENNIUM = 14; @@ -431,64 +434,64 @@ __mktime_internal (struct tm *tp, int LOG2_YEARS_PER_BIENNIUM = 1; int approx_requested_biennia = - (SHR (year_requested, LOG2_YEARS_PER_BIENNIUM) - - SHR (EPOCH_YEAR - TM_YEAR_BASE, LOG2_YEARS_PER_BIENNIUM) - + SHR (mday, ALOG2_DAYS_PER_BIENNIUM) - + SHR (hour, ALOG2_HOURS_PER_BIENNIUM) - + SHR (min, ALOG2_MINUTES_PER_BIENNIUM) - + (LEAP_SECONDS_POSSIBLE - ? 0 - : SHR (sec, ALOG2_SECONDS_PER_BIENNIUM))); + (SHR (year_requested, LOG2_YEARS_PER_BIENNIUM) + - SHR (EPOCH_YEAR - TM_YEAR_BASE, LOG2_YEARS_PER_BIENNIUM) + + SHR (mday, ALOG2_DAYS_PER_BIENNIUM) + + SHR (hour, ALOG2_HOURS_PER_BIENNIUM) + + SHR (min, ALOG2_MINUTES_PER_BIENNIUM) + + (LEAP_SECONDS_POSSIBLE + ? 0 + : SHR (sec, ALOG2_SECONDS_PER_BIENNIUM))); int approx_biennia = SHR (t0, ALOG2_SECONDS_PER_BIENNIUM); int diff = approx_biennia - approx_requested_biennia; - int abs_diff = diff < 0 ? -1 - diff : diff; + int approx_abs_diff = diff < 0 ? -1 - diff : diff; /* IRIX 4.0.5 cc miscalculates TIME_T_MIN / 3: it erroneously - gives a positive value of 715827882. Setting a variable - first then doing math on it seems to work. - (ghazi@caip.rutgers.edu) */ + gives a positive value of 715827882. Setting a variable + first then doing math on it seems to work. + (ghazi@caip.rutgers.edu) */ time_t time_t_max = TIME_T_MAX; time_t time_t_min = TIME_T_MIN; time_t overflow_threshold = - (time_t_max / 3 - time_t_min / 3) >> ALOG2_SECONDS_PER_BIENNIUM; - - if (overflow_threshold < abs_diff) - { - /* Overflow occurred. Try repairing it; this might work if - the time zone offset is enough to undo the overflow. */ - time_t repaired_t0 = -1 - t0; - approx_biennia = SHR (repaired_t0, ALOG2_SECONDS_PER_BIENNIUM); - diff = approx_biennia - approx_requested_biennia; - abs_diff = diff < 0 ? -1 - diff : diff; - if (overflow_threshold < abs_diff) - return -1; - guessed_offset += repaired_t0 - t0; - t0 = repaired_t0; - } + (time_t_max / 3 - time_t_min / 3) >> ALOG2_SECONDS_PER_BIENNIUM; + + if (overflow_threshold < approx_abs_diff) + { + /* Overflow occurred. Try repairing it; this might work if + the time zone offset is enough to undo the overflow. */ + time_t repaired_t0 = -1 - t0; + approx_biennia = SHR (repaired_t0, ALOG2_SECONDS_PER_BIENNIUM); + diff = approx_biennia - approx_requested_biennia; + approx_abs_diff = diff < 0 ? -1 - diff : diff; + if (overflow_threshold < approx_abs_diff) + return -1; + guessed_offset += repaired_t0 - t0; + t0 = repaired_t0; + } } /* Repeatedly use the error to improve the guess. */ for (t = t1 = t2 = t0, dst2 = 0; (gt = guess_time_tm (year, yday, hour, min, sec, &t, - ranged_convert (convert, &t, &tm)), - t != gt); + ranged_convert (convert, &t, &tm)), + t != gt); t1 = t2, t2 = t, t = gt, dst2 = tm.tm_isdst != 0) if (t == t1 && t != t2 - && (tm.tm_isdst < 0 - || (isdst < 0 - ? dst2 <= (tm.tm_isdst != 0) - : (isdst != 0) != (tm.tm_isdst != 0)))) + && (tm.tm_isdst < 0 + || (isdst < 0 + ? dst2 <= (tm.tm_isdst != 0) + : (isdst != 0) != (tm.tm_isdst != 0)))) /* We can't possibly find a match, as we are oscillating - between two values. The requested time probably falls - within a spring-forward gap of size GT - T. Follow the common - practice in this case, which is to return a time that is GT - T - away from the requested time, preferring a time whose - tm_isdst differs from the requested value. (If no tm_isdst - was requested and only one of the two values has a nonzero - tm_isdst, prefer that value.) In practice, this is more - useful than returning -1. */ + between two values. The requested time probably falls + within a spring-forward gap of size GT - T. Follow the common + practice in this case, which is to return a time that is GT - T + away from the requested time, preferring a time whose + tm_isdst differs from the requested value. (If no tm_isdst + was requested and only one of the two values has a nonzero + tm_isdst, prefer that value.) In practice, this is more + useful than returning -1. */ goto offset_found; else if (--remaining_probes == 0) return -1; @@ -498,50 +501,50 @@ __mktime_internal (struct tm *tp, if (isdst_differ (isdst, tm.tm_isdst)) { /* tm.tm_isdst has the wrong value. Look for a neighboring - time with the right value, and use its UTC offset. + time with the right value, and use its UTC offset. - Heuristic: probe the adjacent timestamps in both directions, - looking for the desired isdst. This should work for all real - time zone histories in the tz database. */ + Heuristic: probe the adjacent timestamps in both directions, + looking for the desired isdst. This should work for all real + time zone histories in the tz database. */ /* Distance between probes when looking for a DST boundary. In - tzdata2003a, the shortest period of DST is 601200 seconds - (e.g., America/Recife starting 2000-10-08 01:00), and the - shortest period of non-DST surrounded by DST is 694800 - seconds (Africa/Tunis starting 1943-04-17 01:00). Use the - minimum of these two values, so we don't miss these short - periods when probing. */ + tzdata2003a, the shortest period of DST is 601200 seconds + (e.g., America/Recife starting 2000-10-08 01:00), and the + shortest period of non-DST surrounded by DST is 694800 + seconds (Africa/Tunis starting 1943-04-17 01:00). Use the + minimum of these two values, so we don't miss these short + periods when probing. */ int stride = 601200; /* The longest period of DST in tzdata2003a is 536454000 seconds - (e.g., America/Jujuy starting 1946-10-01 01:00). The longest - period of non-DST is much longer, but it makes no real sense - to search for more than a year of non-DST, so use the DST - max. */ + (e.g., America/Jujuy starting 1946-10-01 01:00). The longest + period of non-DST is much longer, but it makes no real sense + to search for more than a year of non-DST, so use the DST + max. */ int duration_max = 536454000; /* Search in both directions, so the maximum distance is half - the duration; add the stride to avoid off-by-1 problems. */ + the duration; add the stride to avoid off-by-1 problems. */ int delta_bound = duration_max / 2 + stride; int delta, direction; for (delta = stride; delta < delta_bound; delta += stride) - for (direction = -1; direction <= 1; direction += 2) - if (time_t_int_add_ok (t, delta * direction)) - { - time_t ot = t + delta * direction; - struct tm otm; - ranged_convert (convert, &ot, &otm); - if (! isdst_differ (isdst, otm.tm_isdst)) - { - /* We found the desired tm_isdst. - Extrapolate back to the desired time. */ - t = guess_time_tm (year, yday, hour, min, sec, &ot, &otm); - ranged_convert (convert, &t, &tm); - goto offset_found; - } - } + for (direction = -1; direction <= 1; direction += 2) + if (time_t_int_add_ok (t, delta * direction)) + { + time_t ot = t + delta * direction; + struct tm otm; + ranged_convert (convert, &ot, &otm); + if (! isdst_differ (isdst, otm.tm_isdst)) + { + /* We found the desired tm_isdst. + Extrapolate back to the desired time. */ + t = guess_time_tm (year, yday, hour, min, sec, &ot, &otm); + ranged_convert (convert, &t, &tm); + goto offset_found; + } + } } offset_found: @@ -550,16 +553,16 @@ __mktime_internal (struct tm *tp, if (LEAP_SECONDS_POSSIBLE && sec_requested != tm.tm_sec) { /* Adjust time to reflect the tm_sec requested, not the normalized value. - Also, repair any damage from a false match due to a leap second. */ + Also, repair any damage from a false match due to a leap second. */ int sec_adjustment = (sec == 0 && tm.tm_sec == 60) - sec; if (! time_t_int_add_ok (t, sec_requested)) - return -1; + return -1; t1 = t + sec_requested; if (! time_t_int_add_ok (t1, sec_adjustment)) - return -1; + return -1; t2 = t1 + sec_adjustment; if (! convert (&t2, &tm)) - return -1; + return -1; t = t2; } @@ -603,13 +606,13 @@ static int not_equal_tm (const struct tm *a, const struct tm *b) { return ((a->tm_sec ^ b->tm_sec) - | (a->tm_min ^ b->tm_min) - | (a->tm_hour ^ b->tm_hour) - | (a->tm_mday ^ b->tm_mday) - | (a->tm_mon ^ b->tm_mon) - | (a->tm_year ^ b->tm_year) - | (a->tm_yday ^ b->tm_yday) - | isdst_differ (a->tm_isdst, b->tm_isdst)); + | (a->tm_min ^ b->tm_min) + | (a->tm_hour ^ b->tm_hour) + | (a->tm_mday ^ b->tm_mday) + | (a->tm_mon ^ b->tm_mon) + | (a->tm_year ^ b->tm_year) + | (a->tm_yday ^ b->tm_yday) + | isdst_differ (a->tm_isdst, b->tm_isdst)); } static void @@ -617,9 +620,9 @@ print_tm (const struct tm *tp) { if (tp) printf ("%04d-%02d-%02d %02d:%02d:%02d yday %03d wday %d isdst %d", - tp->tm_year + TM_YEAR_BASE, tp->tm_mon + 1, tp->tm_mday, - tp->tm_hour, tp->tm_min, tp->tm_sec, - tp->tm_yday, tp->tm_wday, tp->tm_isdst); + tp->tm_year + TM_YEAR_BASE, tp->tm_mon + 1, tp->tm_mday, + tp->tm_hour, tp->tm_min, tp->tm_sec, + tp->tm_yday, tp->tm_wday, tp->tm_isdst); else printf ("0"); } @@ -651,11 +654,11 @@ main (int argc, char **argv) if ((argc == 3 || argc == 4) && (sscanf (argv[1], "%d-%d-%d%c", - &tm.tm_year, &tm.tm_mon, &tm.tm_mday, &trailer) - == 3) + &tm.tm_year, &tm.tm_mon, &tm.tm_mday, &trailer) + == 3) && (sscanf (argv[2], "%d:%d:%d%c", - &tm.tm_hour, &tm.tm_min, &tm.tm_sec, &trailer) - == 3)) + &tm.tm_hour, &tm.tm_min, &tm.tm_sec, &trailer) + == 3)) { tm.tm_year -= TM_YEAR_BASE; tm.tm_mon--; @@ -664,10 +667,10 @@ main (int argc, char **argv) tl = mktime (&tmk); lt = localtime (&tl); if (lt) - { - tml = *lt; - lt = &tml; - } + { + tml = *lt; + lt = &tml; + } printf ("mktime returns %ld == ", (long int) tl); print_tm (&tmk); printf ("\n"); @@ -680,51 +683,51 @@ main (int argc, char **argv) time_t to = atol (argv[3]); if (argc == 4) - for (tl = from; by < 0 ? to <= tl : tl <= to; tl = tl1) - { - lt = localtime (&tl); - if (lt) - { - tmk = tml = *lt; - tk = mktime (&tmk); - status |= check_result (tk, tmk, tl, &tml); - } - else - { - printf ("localtime (%ld) yields 0\n", (long int) tl); - status = 1; - } - tl1 = tl + by; - if ((tl1 < tl) != (by < 0)) - break; - } + for (tl = from; by < 0 ? to <= tl : tl <= to; tl = tl1) + { + lt = localtime (&tl); + if (lt) + { + tmk = tml = *lt; + tk = mktime (&tmk); + status |= check_result (tk, tmk, tl, &tml); + } + else + { + printf ("localtime (%ld) yields 0\n", (long int) tl); + status = 1; + } + tl1 = tl + by; + if ((tl1 < tl) != (by < 0)) + break; + } else - for (tl = from; by < 0 ? to <= tl : tl <= to; tl = tl1) - { - /* Null benchmark. */ - lt = localtime (&tl); - if (lt) - { - tmk = tml = *lt; - tk = tl; - status |= check_result (tk, tmk, tl, &tml); - } - else - { - printf ("localtime (%ld) yields 0\n", (long int) tl); - status = 1; - } - tl1 = tl + by; - if ((tl1 < tl) != (by < 0)) - break; - } + for (tl = from; by < 0 ? to <= tl : tl <= to; tl = tl1) + { + /* Null benchmark. */ + lt = localtime (&tl); + if (lt) + { + tmk = tml = *lt; + tk = tl; + status |= check_result (tk, tmk, tl, &tml); + } + else + { + printf ("localtime (%ld) yields 0\n", (long int) tl); + status = 1; + } + tl1 = tl + by; + if ((tl1 < tl) != (by < 0)) + break; + } } else printf ("Usage:\ \t%s YYYY-MM-DD HH:MM:SS [ISDST] # Test given time.\n\ \t%s FROM BY TO # Test values FROM, FROM+BY, ..., TO.\n\ \t%s FROM BY TO - # Do not test those values (for benchmark).\n", - argv[0], argv[0], argv[0]); + argv[0], argv[0], argv[0]); return status; } diff --git a/lib/modechange.c b/lib/modechange.c index a84c34a0..7cca3d1b 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-2012 Free Software + Copyright (C) 1989-1990, 1997-1999, 2001, 2003-2006, 2009-2013 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/modechange.h b/lib/modechange.h index 813c6b40..fc4c944c 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-2012 Free Software + Copyright (C) 1989-1990, 1997, 2003-2006, 2009-2013 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 67154b88..8fb7e9ab 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-2012 Free Software Foundation, Inc. + Copyright (C) 1991-1992, 1997-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 @@ -149,16 +149,36 @@ #undef opendir #undef closedir -#ifndef ME_DUMMY -# define ME_DUMMY(Fs_name, Fs_type) \ - (strcmp (Fs_type, "autofs") == 0 \ - || strcmp (Fs_type, "none") == 0 \ - || strcmp (Fs_type, "proc") == 0 \ - || strcmp (Fs_type, "subfs") == 0 \ - /* for NetBSD 3.0 */ \ - || strcmp (Fs_type, "kernfs") == 0 \ - /* for Irix 6.5 */ \ - || strcmp (Fs_type, "ignore") == 0) +#define ME_DUMMY_0(Fs_name, Fs_type) \ + (strcmp (Fs_type, "autofs") == 0 \ + || strcmp (Fs_type, "proc") == 0 \ + || strcmp (Fs_type, "subfs") == 0 \ + /* for Linux 2.6/3.x */ \ + || strcmp (Fs_type, "debugfs") == 0 \ + || strcmp (Fs_type, "devpts") == 0 \ + || strcmp (Fs_type, "fusectl") == 0 \ + || strcmp (Fs_type, "mqueue") == 0 \ + || strcmp (Fs_type, "rpc_pipefs") == 0 \ + || strcmp (Fs_type, "sysfs") == 0 \ + /* FreeBSD, Linux 2.4 */ \ + || strcmp (Fs_type, "devfs") == 0 \ + /* for NetBSD 3.0 */ \ + || strcmp (Fs_type, "kernfs") == 0 \ + /* for Irix 6.5 */ \ + || strcmp (Fs_type, "ignore") == 0) + +/* Historically, we have marked as "dummy" any file system of type "none", + but now that programs like du need to know about bind-mounted directories, + we grant an exception to any with "bind" in its list of mount options. + I.e., those are *not* dummy entries. */ +#ifdef MOUNTED_GETMNTENT1 +# define ME_DUMMY(Fs_name, Fs_type, Fs_ent) \ + (ME_DUMMY_0 (Fs_name, Fs_type) \ + || (strcmp (Fs_type, "none") == 0 \ + && !hasmntopt (Fs_ent, "bind"))) +#else +# define ME_DUMMY(Fs_name, Fs_type) \ + (ME_DUMMY_0 (Fs_name, Fs_type) || strcmp (Fs_type, "none") == 0) #endif #ifdef __CYGWIN__ @@ -419,7 +439,7 @@ read_file_system_list (bool need_fs_type) me->me_mountdir = xstrdup (mnt->mnt_dir); me->me_type = xstrdup (mnt->mnt_type); me->me_type_malloced = 1; - me->me_dummy = ME_DUMMY (me->me_devname, me->me_type); + me->me_dummy = ME_DUMMY (me->me_devname, me->me_type, mnt); me->me_remote = ME_REMOTE (me->me_devname, me->me_type); me->me_dev = dev_from_mount_options (mnt->mnt_opts); diff --git a/lib/mountlist.h b/lib/mountlist.h index e6668736..ffdcc02b 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-2012 Free Software + Copyright (C) 1991-1992, 1998, 2000-2005, 2009-2013 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/mpsort.c b/lib/mpsort.c index 867a1ce6..8300fb39 100644 --- a/lib/mpsort.c +++ b/lib/mpsort.c @@ -1,6 +1,6 @@ /* Sort a vector of pointers to data. - Copyright (C) 2007, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 2007, 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 diff --git a/lib/msvc-inval.c b/lib/msvc-inval.c index ba76a7ea..72a6b6ee 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-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/msvc-inval.h b/lib/msvc-inval.h index eb6930b1..dcb0353d 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-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/msvc-nothrow.c b/lib/msvc-nothrow.c index e5cf181a..8d65472a 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-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/msvc-nothrow.h b/lib/msvc-nothrow.h index 2b71945b..5f521813 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-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/nanosleep.c b/lib/nanosleep.c index c9f48574..9b5b3c11 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-2012 Free Software Foundation, Inc. + Copyright (C) 1999-2000, 2002, 2004-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 diff --git a/lib/netdb.in.h b/lib/netdb.in.h index e4366f84..0da1800a 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-2012 Free Software Foundation, Inc. + Copyright (C) 2008-2013 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 99b49367..b456c4f9 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/lib/nl_langinfo.c b/lib/nl_langinfo.c index c73c7698..771c9533 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/lib/nproc.c b/lib/nproc.c index 69e3a6ec..edede216 100644 --- a/lib/nproc.c +++ b/lib/nproc.c @@ -1,6 +1,6 @@ /* Detect the number of processors. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 @@ -256,7 +256,7 @@ num_processors (enum nproc_query query) } #if defined _SC_NPROCESSORS_ONLN - { /* This works on glibc, MacOS X 10.5, FreeBSD, AIX, OSF/1, Solaris, + { /* This works on glibc, Mac OS X 10.5, FreeBSD, AIX, OSF/1, Solaris, Cygwin, Haiku. */ long int nprocs = sysconf (_SC_NPROCESSORS_ONLN); if (nprocs > 0) @@ -267,7 +267,7 @@ num_processors (enum nproc_query query) else /* query == NPROC_ALL */ { #if defined _SC_NPROCESSORS_CONF - { /* This works on glibc, MacOS X 10.5, FreeBSD, AIX, OSF/1, Solaris, + { /* This works on glibc, Mac OS X 10.5, FreeBSD, AIX, OSF/1, Solaris, Cygwin, Haiku. */ long int nprocs = sysconf (_SC_NPROCESSORS_CONF); @@ -332,7 +332,7 @@ num_processors (enum nproc_query query) NPROC_CURRENT and NPROC_ALL. */ #if HAVE_SYSCTL && defined HW_NCPU - { /* This works on MacOS X, FreeBSD, NetBSD, OpenBSD. */ + { /* This works on Mac OS X, FreeBSD, NetBSD, OpenBSD. */ int nprocs; size_t len = sizeof (nprocs); static int mib[2] = { CTL_HW, HW_NCPU }; diff --git a/lib/nproc.h b/lib/nproc.h index d3a33eb7..a612ca47 100644 --- a/lib/nproc.h +++ b/lib/nproc.h @@ -1,6 +1,6 @@ /* Detect the number of processors. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/obstack.c b/lib/obstack.c index fc50f1e4..d915449d 100644 --- a/lib/obstack.c +++ b/lib/obstack.c @@ -1,6 +1,6 @@ /* obstack.c - subroutines used implicitly by object stack macros - Copyright (C) 1988-1994, 1996-2006, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 1988-1994, 1996-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 diff --git a/lib/obstack.h b/lib/obstack.h index 6a44b44b..159cfa2e 100644 --- a/lib/obstack.h +++ b/lib/obstack.h @@ -1,5 +1,5 @@ /* obstack.h - object stack macros - Copyright (C) 1988-1994, 1996-1999, 2003-2006, 2009-2012 Free Software + Copyright (C) 1988-1994, 1996-1999, 2003-2006, 2009-2013 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/lib/open-safer.c b/lib/open-safer.c index 17f7600f..badeffad 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-2012 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 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 diff --git a/lib/open.c b/lib/open.c index 27801b91..a0c43ead 100644 --- a/lib/open.c +++ b/lib/open.c @@ -1,5 +1,5 @@ /* Open a descriptor to a file. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 @@ -27,7 +27,7 @@ #include <sys/types.h> #undef __need_system_fcntl_h -static inline int +static int orig_open (const char *filename, int flags, mode_t mode) { return open (filename, flags, mode); diff --git a/lib/openat-die.c b/lib/openat-die.c index a5f17d8a..4f18d51f 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-2012 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 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 diff --git a/lib/openat-priv.h b/lib/openat-priv.h index fd0adc18..829cf7d0 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-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/openat-proc.c b/lib/openat-proc.c index 186cda08..d7a68e26 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/lib/openat-safer.c b/lib/openat-safer.c index f6ed93f6..a95600ed 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-2012 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 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 diff --git a/lib/openat.c b/lib/openat.c index ac2496e9..fd1ff911 100644 --- a/lib/openat.c +++ b/lib/openat.c @@ -1,5 +1,5 @@ /* provide a replacement openat function - Copyright (C) 2004-2012 Free Software Foundation, Inc. + Copyright (C) 2004-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 @@ -28,7 +28,7 @@ #undef __need_system_fcntl_h #if HAVE_OPENAT -static inline int +static int orig_openat (int fd, char const *filename, int flags, mode_t mode) { return openat (fd, filename, flags, mode); diff --git a/lib/openat.h b/lib/openat.h index d646250b..eb90990d 100644 --- a/lib/openat.h +++ b/lib/openat.h @@ -1,5 +1,5 @@ /* provide a replacement openat function - Copyright (C) 2004-2006, 2008-2012 Free Software Foundation, Inc. + Copyright (C) 2004-2006, 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 @@ -26,6 +26,8 @@ #include <unistd.h> #include <stdbool.h> +_GL_INLINE_HEADER_BEGIN + #if !HAVE_OPENAT int openat_permissive (int fd, char const *file, int flags, mode_t mode, @@ -49,13 +51,17 @@ _Noreturn void openat_save_fail (int); #if GNULIB_FCHOWNAT -static inline int +# ifndef FCHOWNAT_INLINE +# define FCHOWNAT_INLINE _GL_INLINE +# endif + +FCHOWNAT_INLINE int chownat (int fd, char const *file, uid_t owner, gid_t group) { return fchownat (fd, file, owner, group, 0); } -static inline int +FCHOWNAT_INLINE int lchownat (int fd, char const *file, uid_t owner, gid_t group) { return fchownat (fd, file, owner, group, AT_SYMLINK_NOFOLLOW); @@ -65,13 +71,17 @@ lchownat (int fd, char const *file, uid_t owner, gid_t group) #if GNULIB_FCHMODAT -static inline int +# ifndef FCHMODAT_INLINE +# define FCHMODAT_INLINE _GL_INLINE +# endif + +FCHMODAT_INLINE int chmodat (int fd, char const *file, mode_t mode) { return fchmodat (fd, file, mode, 0); } -static inline int +FCHMODAT_INLINE int lchmodat (int fd, char const *file, mode_t mode) { return fchmodat (fd, file, mode, AT_SYMLINK_NOFOLLOW); @@ -79,15 +89,19 @@ lchmodat (int fd, char const *file, mode_t mode) #endif -#if GNULIB_FSTATAT +#if GNULIB_STATAT -static inline int +# ifndef STATAT_INLINE +# define STATAT_INLINE _GL_INLINE +# endif + +STATAT_INLINE int statat (int fd, char const *name, struct stat *st) { return fstatat (fd, name, st, 0); } -static inline int +STATAT_INLINE int lstatat (int fd, char const *name, struct stat *st) { return fstatat (fd, name, st, AT_SYMLINK_NOFOLLOW); @@ -101,4 +115,6 @@ lstatat (int fd, char const *name, struct stat *st) wrappers are not provided for accessat or euidaccessat, so as to avoid dragging in -lgen on some platforms. */ +_GL_INLINE_HEADER_END + #endif /* _GL_HEADER_OPENAT */ diff --git a/lib/opendir-safer.c b/lib/opendir-safer.c index 43207165..0052ce1d 100644 --- a/lib/opendir-safer.c +++ b/lib/opendir-safer.c @@ -1,6 +1,6 @@ /* Invoke opendir, but avoid some glitches. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/opendir.c b/lib/opendir.c index 50e25e30..de0ea5a2 100644 --- a/lib/opendir.c +++ b/lib/opendir.c @@ -1,5 +1,5 @@ /* Start reading the entries of a directory. - Copyright (C) 2006-2012 Free Software Foundation, Inc. + Copyright (C) 2006-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 diff --git a/lib/parse-datetime.c b/lib/parse-datetime.c index 8790e8d1..5c21d0ba 100644 --- a/lib/parse-datetime.c +++ b/lib/parse-datetime.c @@ -1,19 +1,20 @@ -/* A Bison parser, made by GNU Bison 2.5.821-45d4c. */ - -/* Bison implementation for Yacc-like parsers in C - - Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc. +/* A Bison parser, made by GNU Bison 2.4.3. */ +/* Skeleton implementation for Bison's Yacc-like parsers in C + + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006, + 2009, 2010 Free Software Foundation, Inc. + This 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/>. */ @@ -26,7 +27,7 @@ special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception. - + This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ @@ -44,7 +45,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.5.821-45d4c" +#define YYBISON_VERSION "2.4.3" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -64,12 +65,13 @@ /* Copy the first part of user declarations. */ -/* Line 269 of yacc.c */ + +/* Line 189 of yacc.c */ #line 1 "parse-datetime.y" /* Parse a string into an internal time stamp. - Copyright (C) 1999-2000, 2002-2012 Free Software Foundation, Inc. + Copyright (C) 1999-2000, 2002-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 @@ -181,6 +183,11 @@ typedef long int long_time_t; typedef time_t long_time_t; #endif +/* Convert a possibly-signed character to an unsigned character. This is + a bit safer than casting to unsigned char, since it catches some type + errors that the cast doesn't. */ +static unsigned char to_uchar (char ch) { return ch; } + /* Lots of this code assumes time_t and time_t-like values fit into long_time_t. */ verify (TYPE_MINIMUM (long_time_t) <= TYPE_MINIMUM (time_t) @@ -346,16 +353,9 @@ set_hhmmss (parser_control *pc, long int hour, long int minutes, } -/* Line 269 of yacc.c */ -#line 351 "parse-datetime.c" -# ifndef YY_NULL -# if defined __cplusplus && 201103L <= __cplusplus -# define YY_NULL nullptr -# else -# define YY_NULL 0 -# endif -# endif +/* Line 189 of yacc.c */ +#line 359 "parse-datetime.c" /* Enabling traces. */ #ifndef YYDEBUG @@ -432,8 +432,9 @@ set_hhmmss (parser_control *pc, long int hour, long int minutes, #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE { -/* Line 296 of yacc.c */ -#line 292 "parse-datetime.y" + +/* Line 214 of yacc.c */ +#line 297 "parse-datetime.y" long int intval; textint textintval; @@ -441,8 +442,9 @@ typedef union YYSTYPE relative_time rel; -/* Line 296 of yacc.c */ -#line 446 "parse-datetime.c" + +/* Line 214 of yacc.c */ +#line 448 "parse-datetime.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -452,8 +454,9 @@ typedef union YYSTYPE /* Copy the second part of user declarations. */ -/* Line 346 of yacc.c */ -#line 457 "parse-datetime.c" + +/* Line 264 of yacc.c */ +#line 460 "parse-datetime.c" #ifdef short # undef short @@ -556,12 +559,11 @@ YYID (yyi) # define alloca _alloca # else # define YYSTACK_ALLOC alloca -# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ +# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) # include <stdlib.h> /* INFRINGES ON USER NAME SPACE */ - /* Use EXIT_SUCCESS as a witness for stdlib.h. */ -# ifndef EXIT_SUCCESS -# define EXIT_SUCCESS 0 +# ifndef _STDLIB_H +# define _STDLIB_H 1 # endif # endif # endif @@ -584,24 +586,24 @@ YYID (yyi) # ifndef YYSTACK_ALLOC_MAXIMUM # define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM # endif -# if (defined __cplusplus && ! defined EXIT_SUCCESS \ +# if (defined __cplusplus && ! defined _STDLIB_H \ && ! ((defined YYMALLOC || defined malloc) \ - && (defined YYFREE || defined free))) + && (defined YYFREE || defined free))) # include <stdlib.h> /* INFRINGES ON USER NAME SPACE */ -# ifndef EXIT_SUCCESS -# define EXIT_SUCCESS 0 +# ifndef _STDLIB_H +# define _STDLIB_H 1 # endif # endif # ifndef YYMALLOC # define YYMALLOC malloc -# if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ +# if ! defined malloc && ! defined _STDLIB_H && (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 EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ +# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) void free (void *); /* INFRINGES ON USER NAME SPACE */ # endif @@ -612,7 +614,7 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */ #if (! defined yyoverflow \ && (! defined __cplusplus \ - || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) + || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) /* A type that is properly aligned for any stack member. */ union yyalloc @@ -630,46 +632,42 @@ union yyalloc ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \ + YYSTACK_GAP_MAXIMUM) -# define YYCOPY_NEEDED 1 +/* 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 /* Relocate STACK from its old location to the new one. The local variables YYSIZE and YYSTACKSIZE give the old and new number of elements in the stack, and YYPTR gives the new location of the stack. Advance YYPTR to a properly aligned location for the next stack. */ -# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ - do \ - { \ - YYSIZE_T yynewbytes; \ - YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ - Stack = &yyptr->Stack_alloc; \ - yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ - yyptr += yynewbytes / sizeof (*yyptr); \ - } \ +# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ + do \ + { \ + YYSIZE_T yynewbytes; \ + YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ + Stack = &yyptr->Stack_alloc; \ + yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ + yyptr += yynewbytes / sizeof (*yyptr); \ + } \ while (YYID (0)) #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. */ @@ -681,19 +679,17 @@ union yyalloc #define YYNNTS 26 /* YYNRULES -- Number of rules. */ #define YYNRULES 91 -/* YYNSTATES -- Number of states. */ +/* YYNRULES -- Number of states. */ #define YYNSTATES 114 -/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned - by yylex, with out-of-bounds checking. */ +/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 #define YYMAXUTOK 277 -#define YYTRANSLATE(YYX) \ +#define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) -/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM - as returned by yylex, without out-of-bounds checking. */ +/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ static const yytype_uint8 yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -727,19 +723,66 @@ static const yytype_uint8 yytranslate[] = }; #if YYDEBUG - /* YYRLINEYYN -- Source line where rule number YYN was defined. */ +/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in + YYRHS. */ +static const yytype_uint8 yyprhs[] = +{ + 0, 0, 3, 5, 7, 10, 11, 14, 16, 18, + 20, 22, 24, 26, 28, 30, 32, 34, 38, 41, + 46, 53, 55, 58, 63, 70, 71, 73, 76, 78, + 81, 83, 85, 88, 91, 95, 97, 100, 102, 105, + 108, 111, 115, 121, 125, 129, 132, 137, 140, 144, + 146, 150, 153, 155, 157, 160, 163, 165, 168, 171, + 173, 176, 179, 181, 184, 187, 189, 192, 195, 197, + 200, 203, 206, 209, 211, 213, 216, 219, 222, 225, + 228, 231, 233, 235, 237, 239, 241, 243, 245, 247, + 250, 251 +}; + +/* YYRHS -- A `-1'-separated list of the rules' RHS. */ +static const yytype_int8 yyrhs[] = +{ + 29, 0, -1, 30, -1, 31, -1, 23, 48, -1, + -1, 31, 32, -1, 33, -1, 35, -1, 39, -1, + 40, -1, 42, -1, 41, -1, 44, -1, 51, -1, + 52, -1, 34, -1, 43, 24, 36, -1, 20, 15, + -1, 20, 25, 20, 15, -1, 20, 25, 20, 25, + 50, 15, -1, 36, -1, 20, 38, -1, 20, 25, + 20, 37, -1, 20, 25, 20, 25, 50, 37, -1, + -1, 38, -1, 19, 53, -1, 14, -1, 14, 4, + -1, 18, -1, 24, -1, 18, 46, -1, 24, 46, + -1, 18, 19, 53, -1, 13, -1, 18, 4, -1, + 12, -1, 12, 26, -1, 17, 12, -1, 20, 12, + -1, 20, 27, 20, -1, 20, 27, 20, 27, 20, + -1, 20, 16, 19, -1, 16, 19, 19, -1, 16, + 20, -1, 16, 20, 26, 20, -1, 20, 16, -1, + 20, 16, 20, -1, 43, -1, 20, 19, 19, -1, + 45, 3, -1, 45, -1, 47, -1, 17, 5, -1, + 20, 5, -1, 5, -1, 17, 6, -1, 20, 6, + -1, 6, -1, 17, 10, -1, 20, 10, -1, 10, + -1, 17, 7, -1, 20, 7, -1, 7, -1, 17, + 8, -1, 20, 8, -1, 8, -1, 17, 9, -1, + 20, 9, -1, 21, 9, -1, 22, 9, -1, 9, + -1, 46, -1, 19, 5, -1, 19, 6, -1, 19, + 10, -1, 19, 7, -1, 19, 8, -1, 19, 9, + -1, 11, -1, 49, -1, 50, -1, 21, -1, 19, + -1, 22, -1, 20, -1, 20, -1, 20, 46, -1, + -1, 25, 20, -1 +}; + +/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 319, 319, 320, 324, 331, 333, 337, 339, 341, - 343, 345, 347, 349, 350, 351, 355, 359, 363, 368, - 373, 378, 382, 387, 392, 399, 401, 405, 413, 418, - 428, 430, 432, 435, 438, 440, 442, 447, 452, 457, - 462, 470, 475, 495, 503, 511, 516, 522, 527, 533, - 537, 547, 549, 551, 556, 558, 560, 562, 564, 566, - 568, 570, 572, 574, 576, 578, 580, 582, 584, 586, - 588, 590, 592, 594, 596, 600, 602, 604, 606, 608, - 610, 615, 619, 619, 622, 623, 628, 629, 634, 639, - 650, 651 + 0, 324, 324, 325, 329, 336, 338, 342, 344, 346, + 348, 350, 352, 354, 355, 356, 360, 364, 368, 373, + 378, 383, 387, 392, 397, 404, 406, 410, 418, 423, + 433, 435, 437, 440, 443, 445, 447, 452, 457, 462, + 467, 475, 480, 500, 508, 516, 521, 527, 532, 538, + 542, 552, 554, 556, 561, 563, 565, 567, 569, 571, + 573, 575, 577, 579, 581, 583, 585, 587, 589, 591, + 593, 595, 597, 599, 601, 605, 607, 609, 611, 613, + 615, 620, 624, 624, 627, 628, 633, 634, 639, 644, + 655, 656 }; #endif @@ -757,13 +800,13 @@ 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", YY_NULL + "hybrid", "o_colon_minutes", 0 }; #endif # ifdef YYPRINT -/* YYTOKNUM[NUM] -- (External) token number corresponding to the - (internal) symbol number NUM (which must be that of a token). */ +/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to + token YYLEX-NUM. */ static const yytype_uint16 yytoknum[] = { 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, @@ -772,37 +815,39 @@ static const yytype_uint16 yytoknum[] = }; # endif -#define YYPACT_NINF -93 - -#define yypact_value_is_default(yystate) \ - ((yystate) == (-93)) - -#define YYTABLE_NINF -1 - -#define yytable_value_is_error(yytable_value) \ - YYID (0) +/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ +static const yytype_uint8 yyr1[] = +{ + 0, 28, 29, 29, 30, 31, 31, 32, 32, 32, + 32, 32, 32, 32, 32, 32, 33, 34, 35, 35, + 35, 35, 36, 36, 36, 37, 37, 38, 39, 39, + 40, 40, 40, 40, 40, 40, 40, 41, 41, 41, + 41, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 43, 44, 44, 44, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 46, 46, 46, 46, 46, + 46, 47, 48, 48, 49, 49, 50, 50, 51, 52, + 53, 53 +}; - /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing - STATE-NUM. */ -static const yytype_int8 yypact[] = +/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ +static const yytype_uint8 yyr2[] = { - 38, 27, 77, -93, 46, -93, -93, -93, -93, -93, - -93, -93, -93, -93, -93, -93, -93, -93, -93, -93, - 62, -93, 82, -3, 66, 3, 74, -4, 83, 84, - 75, -93, -93, -93, -93, -93, -93, -93, -93, -93, - 71, -93, 93, -93, -93, -93, -93, -93, -93, 78, - 72, -93, -93, -93, -93, -93, -93, -93, -93, 25, - -93, -93, -93, -93, -93, -93, -93, -93, -93, -93, - -93, -93, -93, -93, -93, 21, 19, 79, 80, -93, - -93, -93, -93, -93, 81, -93, -93, 85, 86, -93, - -93, -93, -93, -93, -6, 76, 17, -93, -93, -93, - -93, 87, 69, -93, -93, 88, 89, -1, -93, 18, - -93, -93, 69, 91 + 0, 2, 1, 1, 2, 0, 2, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 3, 2, 4, + 6, 1, 2, 4, 6, 0, 1, 2, 1, 2, + 1, 1, 2, 2, 3, 1, 2, 1, 2, 2, + 2, 3, 5, 3, 3, 2, 4, 2, 3, 1, + 3, 2, 1, 1, 2, 2, 1, 2, 2, 1, + 2, 2, 1, 2, 2, 1, 2, 2, 1, 2, + 2, 2, 2, 1, 1, 2, 2, 2, 2, 2, + 2, 1, 1, 1, 1, 1, 1, 1, 1, 2, + 0, 2 }; - /* YYDEFACT[S] -- default reduction number in state S. Performed when - YYTABLE does not specify something else to do. Zero means the default - is an error. */ +/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state + STATE-NUM when YYTABLE doesn't specify something else to do. Zero + means the default is an error. */ static const yytype_uint8 yydefact[] = { 5, 0, 0, 2, 3, 85, 87, 84, 86, 4, @@ -819,15 +864,7 @@ static const yytype_uint8 yydefact[] = 20, 24, 0, 25 }; - /* YYPGOTO[NTERM-NUM]. */ -static const yytype_int8 yypgoto[] = -{ - -93, -93, -93, -93, -93, -93, -93, -93, 20, -68, - -27, -93, -93, -93, -93, -93, -93, -93, 60, -93, - -93, -93, -92, -93, -93, 43 -}; - - /* YYDEFGOTO[NTERM-NUM]. */ +/* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int8 yydefgoto[] = { -1, 2, 3, 4, 31, 32, 33, 34, 35, 103, @@ -835,9 +872,38 @@ static const yytype_int8 yydefgoto[] = 9, 10, 11, 45, 46, 93 }; - /* 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 YYTABLE_NINF, syntax error. */ +/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing + STATE-NUM. */ +#define YYPACT_NINF -93 +static const yytype_int8 yypact[] = +{ + 38, 27, 77, -93, 46, -93, -93, -93, -93, -93, + -93, -93, -93, -93, -93, -93, -93, -93, -93, -93, + 62, -93, 82, -3, 66, 3, 74, -4, 83, 84, + 75, -93, -93, -93, -93, -93, -93, -93, -93, -93, + 71, -93, 93, -93, -93, -93, -93, -93, -93, 78, + 72, -93, -93, -93, -93, -93, -93, -93, -93, 25, + -93, -93, -93, -93, -93, -93, -93, -93, -93, -93, + -93, -93, -93, -93, -93, 21, 19, 79, 80, -93, + -93, -93, -93, -93, 81, -93, -93, 85, 86, -93, + -93, -93, -93, -93, -6, 76, 17, -93, -93, -93, + -93, 87, 69, -93, -93, 88, 89, -1, -93, 18, + -93, -93, 69, 91 +}; + +/* YYPGOTO[NTERM-NUM]. */ +static const yytype_int8 yypgoto[] = +{ + -93, -93, -93, -93, -93, -93, -93, -93, 20, -68, + -27, -93, -93, -93, -93, -93, -93, -93, 60, -93, + -93, -93, -92, -93, -93, 43 +}; + +/* 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. */ +#define YYTABLE_NINF -1 static const yytype_uint8 yytable[] = { 79, 67, 68, 69, 70, 71, 72, 58, 73, 100, @@ -870,8 +936,8 @@ static const yytype_int8 yycheck[] = 19, -1, 25 }; - /* STOS_[STATE-NUM] -- The (internal number of the) accessing - symbol of state STATE-NUM. */ +/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing + symbol of state STATE-NUM. */ static const yytype_uint8 yystos[] = { 0, 23, 29, 30, 31, 19, 20, 21, 22, 48, @@ -888,45 +954,14 @@ static const yytype_uint8 yystos[] = 15, 37, 25, 50 }; - /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ -static const yytype_uint8 yyr1[] = -{ - 0, 28, 29, 29, 30, 31, 31, 32, 32, 32, - 32, 32, 32, 32, 32, 32, 33, 34, 35, 35, - 35, 35, 36, 36, 36, 37, 37, 38, 39, 39, - 40, 40, 40, 40, 40, 40, 40, 41, 41, 41, - 41, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 43, 44, 44, 44, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 46, 46, 46, 46, 46, - 46, 47, 48, 48, 49, 49, 50, 50, 51, 52, - 53, 53 -}; - - /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ -static const yytype_uint8 yyr2[] = -{ - 0, 2, 1, 1, 2, 0, 2, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 3, 2, 4, - 6, 1, 2, 4, 6, 0, 1, 2, 1, 2, - 1, 1, 2, 2, 3, 1, 2, 1, 2, 2, - 2, 3, 5, 3, 3, 2, 4, 2, 3, 1, - 3, 2, 1, 1, 2, 2, 1, 2, 2, 1, - 2, 2, 1, 2, 2, 1, 2, 2, 1, 2, - 2, 2, 2, 1, 1, 2, 2, 2, 2, 2, - 2, 1, 1, 1, 1, 1, 1, 1, 1, 2, - 0, 2 -}; - - -#define yyerrok (yyerrstatus = 0) -#define yyclearin (yychar = YYEMPTY) -#define YYEMPTY (-2) -#define YYEOF 0 +#define yyerrok (yyerrstatus = 0) +#define yyclearin (yychar = YYEMPTY) +#define YYEMPTY (-2) +#define YYEOF 0 -#define YYACCEPT goto yyacceptlab -#define YYABORT goto yyabortlab -#define YYERROR goto yyerrorlab +#define YYACCEPT goto yyacceptlab +#define YYABORT goto yyabortlab +#define YYERROR goto yyerrorlab /* Like YYERROR except do call yyerror. This remains here temporarily @@ -936,7 +971,7 @@ static const yytype_uint8 yyr2[] = in Bison 2.4.2's NEWS entry, where a plan to phase it out is discussed. */ -#define YYFAIL goto yyerrlab +#define YYFAIL goto yyerrlab #if defined YYFAIL /* This is here to suppress warnings from the GCC cpp's -Wunused-macros. Normally we don't worry about that warning, but @@ -946,26 +981,26 @@ static const yytype_uint8 yyr2[] = #define YYRECOVERING() (!!yyerrstatus) -#define YYBACKUP(Token, Value) \ -do \ - if (yychar == YYEMPTY) \ - { \ - yychar = (Token); \ - yylval = (Value); \ - YYPOPSTACK (yylen); \ - yystate = *yyssp; \ - goto yybackup; \ - } \ - else \ - { \ +#define YYBACKUP(Token, Value) \ +do \ + if (yychar == YYEMPTY && yylen == 1) \ + { \ + yychar = (Token); \ + yylval = (Value); \ + yytoken = YYTRANSLATE (yychar); \ + YYPOPSTACK (1); \ + goto yybackup; \ + } \ + else \ + { \ yyerror (pc, YY_("syntax error: cannot back up")); \ - YYERROR; \ - } \ + YYERROR; \ + } \ while (YYID (0)) -#define YYTERROR 1 -#define YYERRCODE 256 +#define YYTERROR 1 +#define YYERRCODE 256 /* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. @@ -974,30 +1009,39 @@ while (YYID (0)) #define YYRHSLOC(Rhs, K) ((Rhs)[K]) #ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Rhs, N) \ - do \ +# 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; \ - } \ + { \ + (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 -/* This macro is provided for backward compatibility. */ +/* 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. */ #ifndef YY_LOCATION_PRINT -# define YY_LOCATION_PRINT(File, Loc) ((void) 0) +# 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 #endif @@ -1017,21 +1061,21 @@ while (YYID (0)) # define YYFPRINTF fprintf # endif -# define YYDPRINTF(Args) \ -do { \ - if (yydebug) \ - YYFPRINTF Args; \ +# define YYDPRINTF(Args) \ +do { \ + if (yydebug) \ + YYFPRINTF Args; \ } while (YYID (0)) -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ -do { \ - if (yydebug) \ - { \ - YYFPRINTF (stderr, "%s ", Title); \ - yy_symbol_print (stderr, \ - Type, Value, pc); \ - YYFPRINTF (stderr, "\n"); \ - } \ +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ +do { \ + if (yydebug) \ + { \ + YYFPRINTF (stderr, "%s ", Title); \ + yy_symbol_print (stderr, \ + Type, Value, pc); \ + YYFPRINTF (stderr, "\n"); \ + } \ } while (YYID (0)) @@ -1053,18 +1097,19 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, pc) parser_control *pc; #endif { - YYUSE(yyoutput); - YYUSE (pc); if (!yyvaluep) return; + YYUSE (pc); # ifdef YYPRINT if (yytype < YYNTOKENS) YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); +# else + YYUSE (yyoutput); # endif switch (yytype) { default: - break; + break; } } @@ -1120,10 +1165,10 @@ yy_stack_print (yybottom, yytop) YYFPRINTF (stderr, "\n"); } -# define YY_STACK_PRINT(Bottom, Top) \ -do { \ - if (yydebug) \ - yy_stack_print ((Bottom), (Top)); \ +# define YY_STACK_PRINT(Bottom, Top) \ +do { \ + if (yydebug) \ + yy_stack_print ((Bottom), (Top)); \ } while (YYID (0)) @@ -1134,37 +1179,35 @@ do { \ #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) static void -yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule, parser_control *pc) +yy_reduce_print (YYSTYPE *yyvsp, int yyrule, parser_control *pc) #else static void -yy_reduce_print (yyssp, yyvsp, yyrule, pc) - yytype_int16 *yyssp; +yy_reduce_print (yyvsp, yyrule, pc) YYSTYPE *yyvsp; int yyrule; parser_control *pc; #endif { - unsigned long int yylno = yyrline[yyrule]; int yynrhs = yyr2[yyrule]; int yyi; + unsigned long int yylno = yyrline[yyrule]; YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", - yyrule - 1, yylno); + yyrule - 1, yylno); /* The symbols being reduced. */ for (yyi = 0; yyi < yynrhs; yyi++) { YYFPRINTF (stderr, " $%d = ", yyi + 1); - yy_symbol_print (stderr, - yystos[yyssp[yyi + 1 - yynrhs]], - &(yyvsp[(yyi + 1) - (yynrhs)]) - , pc); + yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], + &(yyvsp[(yyi + 1) - (yynrhs)]) + , pc); YYFPRINTF (stderr, "\n"); } } -# define YY_REDUCE_PRINT(Rule) \ -do { \ - if (yydebug) \ - yy_reduce_print (yyssp, yyvsp, Rule, pc); \ +# define YY_REDUCE_PRINT(Rule) \ +do { \ + if (yydebug) \ + yy_reduce_print (yyvsp, Rule, pc); \ } while (YYID (0)) /* Nonzero means print parse trace. It is left uninitialized so that @@ -1179,7 +1222,7 @@ int yydebug; /* YYINITDEPTH -- initial size of the parser's stacks. */ -#ifndef YYINITDEPTH +#ifndef YYINITDEPTH # define YYINITDEPTH 200 #endif @@ -1194,6 +1237,7 @@ int yydebug; # define YYMAXDEPTH 10000 #endif + #if YYERROR_VERBOSE @@ -1265,27 +1309,27 @@ yytnamerr (char *yyres, const char *yystr) char const *yyp = yystr; for (;;) - switch (*++yyp) - { - case '\'': - case ',': - goto do_not_strip_quotes; - - case '\\': - if (*++yyp != '\\') - goto do_not_strip_quotes; - /* Fall through. */ - default: - if (yyres) - yyres[yyn] = *yyp; - yyn++; - break; - - case '"': - if (yyres) - yyres[yyn] = '\0'; - return yyn; - } + switch (*++yyp) + { + case '\'': + case ',': + goto do_not_strip_quotes; + + case '\\': + if (*++yyp != '\\') + goto do_not_strip_quotes; + /* Fall through. */ + default: + if (yyres) + yyres[yyn] = *yyp; + yyn++; + break; + + case '"': + if (yyres) + yyres[yyn] = '\0'; + return yyn; + } do_not_strip_quotes: ; } @@ -1296,142 +1340,115 @@ yytnamerr (char *yyres, const char *yystr) } # endif -/* 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. - - 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) +/* 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) { - YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]); - YYSIZE_T yysize = yysize0; - YYSIZE_T yysize1; - 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 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]; - yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]); - if (! (yysize <= yysize1 - && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) - return 2; - yysize = yysize1; - } - } - } + int yyn = yypact[yystate]; - 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_ - } - - yysize1 = yysize + yystrlen (yyformat); - if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) - return 2; - yysize = yysize1; - - if (*yymsg_alloc < yysize) + if (! (YYPACT_NINF < yyn && yyn <= YYLAST)) + return 0; + else { - *yymsg_alloc = 2 * yysize; - if (! (yysize <= *yymsg_alloc - && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM)) - *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM; - return 1; + 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; + } + + yyf = YY_(yyformat); + yysize1 = yysize + yystrlen (yyf); + yysize_overflow |= (yysize1 < yysize); + yysize = yysize1; + + if (yysize_overflow) + return YYSIZE_MAXIMUM; + + 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; } - - /* 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. | @@ -1451,31 +1468,30 @@ yydestruct (yymsg, yytype, yyvaluep, pc) parser_control *pc; #endif { - YYUSE(yyvaluep); + YYUSE (yyvaluep); YYUSE (pc); + if (!yymsg) yymsg = "Deleting"; YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); switch (yytype) { + default: - break; + break; } } - /* Prevent warnings from -Wmissing-prototypes. */ #ifdef YYPARSE_PARAM -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +#if defined __STDC__ || defined __cplusplus int yyparse (void *YYPARSE_PARAM); #else int yyparse (); #endif #else /* ! YYPARSE_PARAM */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +#if defined __STDC__ || defined __cplusplus int yyparse (parser_control *pc); #else int yyparse (); @@ -1483,9 +1499,12 @@ int yyparse (); #endif /* ! YYPARSE_PARAM */ -/*----------. -| yyparse. | -`----------*/ + + + +/*-------------------------. +| yyparse or yypush_parse. | +`-------------------------*/ #ifdef YYPARSE_PARAM #if (defined __STDC__ || defined __C99__FUNC__ \ @@ -1601,23 +1620,23 @@ YYSTYPE yylval; #ifdef yyoverflow { - /* Give user a chance to reallocate the stack. Use copies of - these so that the &'s don't force the real ones into - memory. */ - YYSTYPE *yyvs1 = yyvs; - yytype_int16 *yyss1 = yyss; - - /* Each stack pointer address is followed by the size of the - data in use in that stack, in bytes. This used to be a - conditional around just the two extra args, but that might - be undefined if yyoverflow is a macro. */ - yyoverflow (YY_("memory exhausted"), - &yyss1, yysize * sizeof (*yyssp), - &yyvs1, yysize * sizeof (*yyvsp), - &yystacksize); - - yyss = yyss1; - yyvs = yyvs1; + /* Give user a chance to reallocate the stack. Use copies of + these so that the &'s don't force the real ones into + memory. */ + YYSTYPE *yyvs1 = yyvs; + yytype_int16 *yyss1 = yyss; + + /* Each stack pointer address is followed by the size of the + data in use in that stack, in bytes. This used to be a + conditional around just the two extra args, but that might + be undefined if yyoverflow is a macro. */ + yyoverflow (YY_("memory exhausted"), + &yyss1, yysize * sizeof (*yyssp), + &yyvs1, yysize * sizeof (*yyvsp), + &yystacksize); + + yyss = yyss1; + yyvs = yyvs1; } #else /* no yyoverflow */ # ifndef YYSTACK_RELOCATE @@ -1625,22 +1644,22 @@ YYSTYPE yylval; # else /* Extend the stack our own way. */ if (YYMAXDEPTH <= yystacksize) - goto yyexhaustedlab; + goto yyexhaustedlab; yystacksize *= 2; if (YYMAXDEPTH < yystacksize) - yystacksize = YYMAXDEPTH; + yystacksize = YYMAXDEPTH; { - yytype_int16 *yyss1 = yyss; - union yyalloc *yyptr = - (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); - if (! yyptr) - goto yyexhaustedlab; - YYSTACK_RELOCATE (yyss_alloc, yyss); - YYSTACK_RELOCATE (yyvs_alloc, yyvs); + yytype_int16 *yyss1 = yyss; + union yyalloc *yyptr = + (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); + if (! yyptr) + goto yyexhaustedlab; + YYSTACK_RELOCATE (yyss_alloc, yyss); + YYSTACK_RELOCATE (yyvs_alloc, yyvs); # undef YYSTACK_RELOCATE - if (yyss1 != yyssa) - YYSTACK_FREE (yyss1); + if (yyss1 != yyssa) + YYSTACK_FREE (yyss1); } # endif #endif /* no yyoverflow */ @@ -1649,10 +1668,10 @@ YYSTYPE yylval; yyvsp = yyvs + yysize - 1; YYDPRINTF ((stderr, "Stack size increased to %lu\n", - (unsigned long int) yystacksize)); + (unsigned long int) yystacksize)); if (yyss + yystacksize - 1 <= yyssp) - YYABORT; + YYABORT; } YYDPRINTF ((stderr, "Entering state %d\n", yystate)); @@ -1672,7 +1691,7 @@ yybackup: /* First try to decide what to do without reference to lookahead token. */ yyn = yypact[yystate]; - if (yypact_value_is_default (yyn)) + if (yyn == YYPACT_NINF) goto yydefault; /* Not known => get a lookahead token if don't already have one. */ @@ -1703,8 +1722,8 @@ yybackup: yyn = yytable[yyn]; if (yyn <= 0) { - if (yytable_value_is_error (yyn)) - goto yyerrlab; + if (yyn == 0 || yyn == YYTABLE_NINF) + goto yyerrlab; yyn = -yyn; goto yyreduce; } @@ -1758,698 +1777,616 @@ yyreduce: switch (yyn) { case 4: -/* Line 1744 of yacc.c */ -#line 325 "parse-datetime.y" + +/* Line 1464 of yacc.c */ +#line 330 "parse-datetime.y" { - pc->seconds = (yyvsp[0].timespec); + pc->seconds = (yyvsp[(2) - (2)].timespec); pc->timespec_seen = true; } -/* Line 1744 of yacc.c */ -#line 1769 "parse-datetime.c" break; case 7: -/* Line 1744 of yacc.c */ -#line 338 "parse-datetime.y" + +/* Line 1464 of yacc.c */ +#line 343 "parse-datetime.y" { pc->times_seen++; pc->dates_seen++; } -/* Line 1744 of yacc.c */ -#line 1777 "parse-datetime.c" break; case 8: -/* Line 1744 of yacc.c */ -#line 340 "parse-datetime.y" + +/* Line 1464 of yacc.c */ +#line 345 "parse-datetime.y" { pc->times_seen++; } -/* Line 1744 of yacc.c */ -#line 1785 "parse-datetime.c" break; case 9: -/* Line 1744 of yacc.c */ -#line 342 "parse-datetime.y" + +/* Line 1464 of yacc.c */ +#line 347 "parse-datetime.y" { pc->local_zones_seen++; } -/* Line 1744 of yacc.c */ -#line 1793 "parse-datetime.c" break; case 10: -/* Line 1744 of yacc.c */ -#line 344 "parse-datetime.y" + +/* Line 1464 of yacc.c */ +#line 349 "parse-datetime.y" { pc->zones_seen++; } -/* Line 1744 of yacc.c */ -#line 1801 "parse-datetime.c" break; case 11: -/* Line 1744 of yacc.c */ -#line 346 "parse-datetime.y" + +/* Line 1464 of yacc.c */ +#line 351 "parse-datetime.y" { pc->dates_seen++; } -/* Line 1744 of yacc.c */ -#line 1809 "parse-datetime.c" break; case 12: -/* Line 1744 of yacc.c */ -#line 348 "parse-datetime.y" + +/* Line 1464 of yacc.c */ +#line 353 "parse-datetime.y" { pc->days_seen++; } -/* Line 1744 of yacc.c */ -#line 1817 "parse-datetime.c" break; case 18: -/* Line 1744 of yacc.c */ -#line 364 "parse-datetime.y" + +/* Line 1464 of yacc.c */ +#line 369 "parse-datetime.y" { - set_hhmmss (pc, (yyvsp[-1].textintval).value, 0, 0, 0); - pc->meridian = (yyvsp[0].intval); + set_hhmmss (pc, (yyvsp[(1) - (2)].textintval).value, 0, 0, 0); + pc->meridian = (yyvsp[(2) - (2)].intval); } -/* Line 1744 of yacc.c */ -#line 1828 "parse-datetime.c" break; case 19: -/* Line 1744 of yacc.c */ -#line 369 "parse-datetime.y" + +/* Line 1464 of yacc.c */ +#line 374 "parse-datetime.y" { - set_hhmmss (pc, (yyvsp[-3].textintval).value, (yyvsp[-1].textintval).value, 0, 0); - pc->meridian = (yyvsp[0].intval); + set_hhmmss (pc, (yyvsp[(1) - (4)].textintval).value, (yyvsp[(3) - (4)].textintval).value, 0, 0); + pc->meridian = (yyvsp[(4) - (4)].intval); } -/* Line 1744 of yacc.c */ -#line 1839 "parse-datetime.c" break; case 20: -/* Line 1744 of yacc.c */ -#line 374 "parse-datetime.y" + +/* Line 1464 of yacc.c */ +#line 379 "parse-datetime.y" { - set_hhmmss (pc, (yyvsp[-5].textintval).value, (yyvsp[-3].textintval).value, (yyvsp[-1].timespec).tv_sec, (yyvsp[-1].timespec).tv_nsec); - pc->meridian = (yyvsp[0].intval); + 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); } -/* Line 1744 of yacc.c */ -#line 1850 "parse-datetime.c" break; case 22: -/* Line 1744 of yacc.c */ -#line 383 "parse-datetime.y" + +/* Line 1464 of yacc.c */ +#line 388 "parse-datetime.y" { - set_hhmmss (pc, (yyvsp[-1].textintval).value, 0, 0, 0); + set_hhmmss (pc, (yyvsp[(1) - (2)].textintval).value, 0, 0, 0); pc->meridian = MER24; } -/* Line 1744 of yacc.c */ -#line 1861 "parse-datetime.c" break; case 23: -/* Line 1744 of yacc.c */ -#line 388 "parse-datetime.y" + +/* Line 1464 of yacc.c */ +#line 393 "parse-datetime.y" { - set_hhmmss (pc, (yyvsp[-3].textintval).value, (yyvsp[-1].textintval).value, 0, 0); + set_hhmmss (pc, (yyvsp[(1) - (4)].textintval).value, (yyvsp[(3) - (4)].textintval).value, 0, 0); pc->meridian = MER24; } -/* Line 1744 of yacc.c */ -#line 1872 "parse-datetime.c" break; case 24: -/* Line 1744 of yacc.c */ -#line 393 "parse-datetime.y" + +/* Line 1464 of yacc.c */ +#line 398 "parse-datetime.y" { - set_hhmmss (pc, (yyvsp[-5].textintval).value, (yyvsp[-3].textintval).value, (yyvsp[-1].timespec).tv_sec, (yyvsp[-1].timespec).tv_nsec); + 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; } -/* Line 1744 of yacc.c */ -#line 1883 "parse-datetime.c" break; case 27: -/* Line 1744 of yacc.c */ -#line 406 "parse-datetime.y" + +/* Line 1464 of yacc.c */ +#line 411 "parse-datetime.y" { pc->zones_seen++; - pc->time_zone = time_zone_hhmm (pc, (yyvsp[-1].textintval), (yyvsp[0].intval)); + pc->time_zone = time_zone_hhmm (pc, (yyvsp[(1) - (2)].textintval), (yyvsp[(2) - (2)].intval)); } -/* Line 1744 of yacc.c */ -#line 1894 "parse-datetime.c" break; case 28: -/* Line 1744 of yacc.c */ -#line 414 "parse-datetime.y" + +/* Line 1464 of yacc.c */ +#line 419 "parse-datetime.y" { - pc->local_isdst = (yyvsp[0].intval); - pc->dsts_seen += (0 < (yyvsp[0].intval)); + pc->local_isdst = (yyvsp[(1) - (1)].intval); + pc->dsts_seen += (0 < (yyvsp[(1) - (1)].intval)); } -/* Line 1744 of yacc.c */ -#line 1905 "parse-datetime.c" break; case 29: -/* Line 1744 of yacc.c */ -#line 419 "parse-datetime.y" + +/* Line 1464 of yacc.c */ +#line 424 "parse-datetime.y" { pc->local_isdst = 1; - pc->dsts_seen += (0 < (yyvsp[-1].intval)) + 1; + pc->dsts_seen += (0 < (yyvsp[(1) - (2)].intval)) + 1; } -/* Line 1744 of yacc.c */ -#line 1916 "parse-datetime.c" break; case 30: -/* Line 1744 of yacc.c */ -#line 429 "parse-datetime.y" - { pc->time_zone = (yyvsp[0].intval); } -/* Line 1744 of yacc.c */ -#line 1924 "parse-datetime.c" + +/* Line 1464 of yacc.c */ +#line 434 "parse-datetime.y" + { pc->time_zone = (yyvsp[(1) - (1)].intval); } break; case 31: -/* Line 1744 of yacc.c */ -#line 431 "parse-datetime.y" + +/* Line 1464 of yacc.c */ +#line 436 "parse-datetime.y" { pc->time_zone = HOUR(7); } -/* Line 1744 of yacc.c */ -#line 1932 "parse-datetime.c" break; case 32: -/* Line 1744 of yacc.c */ -#line 433 "parse-datetime.y" - { pc->time_zone = (yyvsp[-1].intval); - apply_relative_time (pc, (yyvsp[0].rel), 1); } -/* Line 1744 of yacc.c */ -#line 1941 "parse-datetime.c" + +/* Line 1464 of yacc.c */ +#line 438 "parse-datetime.y" + { pc->time_zone = (yyvsp[(1) - (2)].intval); + apply_relative_time (pc, (yyvsp[(2) - (2)].rel), 1); } break; case 33: -/* Line 1744 of yacc.c */ -#line 436 "parse-datetime.y" + +/* Line 1464 of yacc.c */ +#line 441 "parse-datetime.y" { pc->time_zone = HOUR(7); - apply_relative_time (pc, (yyvsp[0].rel), 1); } -/* Line 1744 of yacc.c */ -#line 1950 "parse-datetime.c" + apply_relative_time (pc, (yyvsp[(2) - (2)].rel), 1); } break; case 34: -/* Line 1744 of yacc.c */ -#line 439 "parse-datetime.y" - { pc->time_zone = (yyvsp[-2].intval) + time_zone_hhmm (pc, (yyvsp[-1].textintval), (yyvsp[0].intval)); } -/* Line 1744 of yacc.c */ -#line 1958 "parse-datetime.c" + +/* Line 1464 of yacc.c */ +#line 444 "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 1744 of yacc.c */ -#line 441 "parse-datetime.y" - { pc->time_zone = (yyvsp[0].intval) + 60; } -/* Line 1744 of yacc.c */ -#line 1966 "parse-datetime.c" + +/* Line 1464 of yacc.c */ +#line 446 "parse-datetime.y" + { pc->time_zone = (yyvsp[(1) - (1)].intval) + 60; } break; case 36: -/* Line 1744 of yacc.c */ -#line 443 "parse-datetime.y" - { pc->time_zone = (yyvsp[-1].intval) + 60; } -/* Line 1744 of yacc.c */ -#line 1974 "parse-datetime.c" + +/* Line 1464 of yacc.c */ +#line 448 "parse-datetime.y" + { pc->time_zone = (yyvsp[(1) - (2)].intval) + 60; } break; case 37: -/* Line 1744 of yacc.c */ -#line 448 "parse-datetime.y" + +/* Line 1464 of yacc.c */ +#line 453 "parse-datetime.y" { pc->day_ordinal = 0; - pc->day_number = (yyvsp[0].intval); + pc->day_number = (yyvsp[(1) - (1)].intval); } -/* Line 1744 of yacc.c */ -#line 1985 "parse-datetime.c" break; case 38: -/* Line 1744 of yacc.c */ -#line 453 "parse-datetime.y" + +/* Line 1464 of yacc.c */ +#line 458 "parse-datetime.y" { pc->day_ordinal = 0; - pc->day_number = (yyvsp[-1].intval); + pc->day_number = (yyvsp[(1) - (2)].intval); } -/* Line 1744 of yacc.c */ -#line 1996 "parse-datetime.c" break; case 39: -/* Line 1744 of yacc.c */ -#line 458 "parse-datetime.y" + +/* Line 1464 of yacc.c */ +#line 463 "parse-datetime.y" { - pc->day_ordinal = (yyvsp[-1].intval); - pc->day_number = (yyvsp[0].intval); + pc->day_ordinal = (yyvsp[(1) - (2)].intval); + pc->day_number = (yyvsp[(2) - (2)].intval); } -/* Line 1744 of yacc.c */ -#line 2007 "parse-datetime.c" break; case 40: -/* Line 1744 of yacc.c */ -#line 463 "parse-datetime.y" + +/* Line 1464 of yacc.c */ +#line 468 "parse-datetime.y" { - pc->day_ordinal = (yyvsp[-1].textintval).value; - pc->day_number = (yyvsp[0].intval); + pc->day_ordinal = (yyvsp[(1) - (2)].textintval).value; + pc->day_number = (yyvsp[(2) - (2)].intval); } -/* Line 1744 of yacc.c */ -#line 2018 "parse-datetime.c" break; case 41: -/* Line 1744 of yacc.c */ -#line 471 "parse-datetime.y" + +/* Line 1464 of yacc.c */ +#line 476 "parse-datetime.y" { - pc->month = (yyvsp[-2].textintval).value; - pc->day = (yyvsp[0].textintval).value; + pc->month = (yyvsp[(1) - (3)].textintval).value; + pc->day = (yyvsp[(3) - (3)].textintval).value; } -/* Line 1744 of yacc.c */ -#line 2029 "parse-datetime.c" break; case 42: -/* Line 1744 of yacc.c */ -#line 476 "parse-datetime.y" + +/* Line 1464 of yacc.c */ +#line 481 "parse-datetime.y" { /* Interpret as YYYY/MM/DD if the first value has 4 or more digits, otherwise as MM/DD/YY. The goal in recognizing YYYY/MM/DD is solely to support legacy machine-generated dates like those in an RCS log listing. If you want portability, use the ISO 8601 format. */ - if (4 <= (yyvsp[-4].textintval).digits) + if (4 <= (yyvsp[(1) - (5)].textintval).digits) { - pc->year = (yyvsp[-4].textintval); - pc->month = (yyvsp[-2].textintval).value; - pc->day = (yyvsp[0].textintval).value; + pc->year = (yyvsp[(1) - (5)].textintval); + pc->month = (yyvsp[(3) - (5)].textintval).value; + pc->day = (yyvsp[(5) - (5)].textintval).value; } else { - pc->month = (yyvsp[-4].textintval).value; - pc->day = (yyvsp[-2].textintval).value; - pc->year = (yyvsp[0].textintval); + pc->month = (yyvsp[(1) - (5)].textintval).value; + pc->day = (yyvsp[(3) - (5)].textintval).value; + pc->year = (yyvsp[(5) - (5)].textintval); } } -/* Line 1744 of yacc.c */ -#line 2055 "parse-datetime.c" break; case 43: -/* Line 1744 of yacc.c */ -#line 496 "parse-datetime.y" + +/* Line 1464 of yacc.c */ +#line 501 "parse-datetime.y" { /* e.g. 17-JUN-1992. */ - pc->day = (yyvsp[-2].textintval).value; - pc->month = (yyvsp[-1].intval); - pc->year.value = -(yyvsp[0].textintval).value; - pc->year.digits = (yyvsp[0].textintval).digits; + pc->day = (yyvsp[(1) - (3)].textintval).value; + pc->month = (yyvsp[(2) - (3)].intval); + pc->year.value = -(yyvsp[(3) - (3)].textintval).value; + pc->year.digits = (yyvsp[(3) - (3)].textintval).digits; } -/* Line 1744 of yacc.c */ -#line 2069 "parse-datetime.c" break; case 44: -/* Line 1744 of yacc.c */ -#line 504 "parse-datetime.y" + +/* Line 1464 of yacc.c */ +#line 509 "parse-datetime.y" { /* e.g. JUN-17-1992. */ - pc->month = (yyvsp[-2].intval); - pc->day = -(yyvsp[-1].textintval).value; - pc->year.value = -(yyvsp[0].textintval).value; - pc->year.digits = (yyvsp[0].textintval).digits; + pc->month = (yyvsp[(1) - (3)].intval); + pc->day = -(yyvsp[(2) - (3)].textintval).value; + pc->year.value = -(yyvsp[(3) - (3)].textintval).value; + pc->year.digits = (yyvsp[(3) - (3)].textintval).digits; } -/* Line 1744 of yacc.c */ -#line 2083 "parse-datetime.c" break; case 45: -/* Line 1744 of yacc.c */ -#line 512 "parse-datetime.y" + +/* Line 1464 of yacc.c */ +#line 517 "parse-datetime.y" { - pc->month = (yyvsp[-1].intval); - pc->day = (yyvsp[0].textintval).value; + pc->month = (yyvsp[(1) - (2)].intval); + pc->day = (yyvsp[(2) - (2)].textintval).value; } -/* Line 1744 of yacc.c */ -#line 2094 "parse-datetime.c" break; case 46: -/* Line 1744 of yacc.c */ -#line 517 "parse-datetime.y" + +/* Line 1464 of yacc.c */ +#line 522 "parse-datetime.y" { - pc->month = (yyvsp[-3].intval); - pc->day = (yyvsp[-2].textintval).value; - pc->year = (yyvsp[0].textintval); + pc->month = (yyvsp[(1) - (4)].intval); + pc->day = (yyvsp[(2) - (4)].textintval).value; + pc->year = (yyvsp[(4) - (4)].textintval); } -/* Line 1744 of yacc.c */ -#line 2106 "parse-datetime.c" break; case 47: -/* Line 1744 of yacc.c */ -#line 523 "parse-datetime.y" + +/* Line 1464 of yacc.c */ +#line 528 "parse-datetime.y" { - pc->day = (yyvsp[-1].textintval).value; - pc->month = (yyvsp[0].intval); + pc->day = (yyvsp[(1) - (2)].textintval).value; + pc->month = (yyvsp[(2) - (2)].intval); } -/* Line 1744 of yacc.c */ -#line 2117 "parse-datetime.c" break; case 48: -/* Line 1744 of yacc.c */ -#line 528 "parse-datetime.y" + +/* Line 1464 of yacc.c */ +#line 533 "parse-datetime.y" { - pc->day = (yyvsp[-2].textintval).value; - pc->month = (yyvsp[-1].intval); - pc->year = (yyvsp[0].textintval); + pc->day = (yyvsp[(1) - (3)].textintval).value; + pc->month = (yyvsp[(2) - (3)].intval); + pc->year = (yyvsp[(3) - (3)].textintval); } -/* Line 1744 of yacc.c */ -#line 2129 "parse-datetime.c" break; case 50: -/* Line 1744 of yacc.c */ -#line 538 "parse-datetime.y" + +/* Line 1464 of yacc.c */ +#line 543 "parse-datetime.y" { /* ISO 8601 format. YYYY-MM-DD. */ - pc->year = (yyvsp[-2].textintval); - pc->month = -(yyvsp[-1].textintval).value; - pc->day = -(yyvsp[0].textintval).value; + pc->year = (yyvsp[(1) - (3)].textintval); + pc->month = -(yyvsp[(2) - (3)].textintval).value; + pc->day = -(yyvsp[(3) - (3)].textintval).value; } -/* Line 1744 of yacc.c */ -#line 2142 "parse-datetime.c" break; case 51: -/* Line 1744 of yacc.c */ -#line 548 "parse-datetime.y" - { apply_relative_time (pc, (yyvsp[-1].rel), (yyvsp[0].intval)); } -/* Line 1744 of yacc.c */ -#line 2150 "parse-datetime.c" + +/* Line 1464 of yacc.c */ +#line 553 "parse-datetime.y" + { apply_relative_time (pc, (yyvsp[(1) - (2)].rel), (yyvsp[(2) - (2)].intval)); } break; case 52: -/* Line 1744 of yacc.c */ -#line 550 "parse-datetime.y" - { apply_relative_time (pc, (yyvsp[0].rel), 1); } -/* Line 1744 of yacc.c */ -#line 2158 "parse-datetime.c" + +/* Line 1464 of yacc.c */ +#line 555 "parse-datetime.y" + { apply_relative_time (pc, (yyvsp[(1) - (1)].rel), 1); } break; case 53: -/* Line 1744 of yacc.c */ -#line 552 "parse-datetime.y" - { apply_relative_time (pc, (yyvsp[0].rel), 1); } -/* Line 1744 of yacc.c */ -#line 2166 "parse-datetime.c" + +/* Line 1464 of yacc.c */ +#line 557 "parse-datetime.y" + { apply_relative_time (pc, (yyvsp[(1) - (1)].rel), 1); } break; case 54: -/* Line 1744 of yacc.c */ -#line 557 "parse-datetime.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year = (yyvsp[-1].intval); } -/* Line 1744 of yacc.c */ -#line 2174 "parse-datetime.c" + +/* Line 1464 of yacc.c */ +#line 562 "parse-datetime.y" + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year = (yyvsp[(1) - (2)].intval); } break; case 55: -/* Line 1744 of yacc.c */ -#line 559 "parse-datetime.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year = (yyvsp[-1].textintval).value; } -/* Line 1744 of yacc.c */ -#line 2182 "parse-datetime.c" + +/* Line 1464 of yacc.c */ +#line 564 "parse-datetime.y" + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year = (yyvsp[(1) - (2)].textintval).value; } break; case 56: -/* Line 1744 of yacc.c */ -#line 561 "parse-datetime.y" + +/* Line 1464 of yacc.c */ +#line 566 "parse-datetime.y" { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year = 1; } -/* Line 1744 of yacc.c */ -#line 2190 "parse-datetime.c" break; case 57: -/* Line 1744 of yacc.c */ -#line 563 "parse-datetime.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month = (yyvsp[-1].intval); } -/* Line 1744 of yacc.c */ -#line 2198 "parse-datetime.c" + +/* Line 1464 of yacc.c */ +#line 568 "parse-datetime.y" + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month = (yyvsp[(1) - (2)].intval); } break; case 58: -/* Line 1744 of yacc.c */ -#line 565 "parse-datetime.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month = (yyvsp[-1].textintval).value; } -/* Line 1744 of yacc.c */ -#line 2206 "parse-datetime.c" + +/* Line 1464 of yacc.c */ +#line 570 "parse-datetime.y" + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month = (yyvsp[(1) - (2)].textintval).value; } break; case 59: -/* Line 1744 of yacc.c */ -#line 567 "parse-datetime.y" + +/* Line 1464 of yacc.c */ +#line 572 "parse-datetime.y" { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month = 1; } -/* Line 1744 of yacc.c */ -#line 2214 "parse-datetime.c" break; case 60: -/* Line 1744 of yacc.c */ -#line 569 "parse-datetime.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[-1].intval) * (yyvsp[0].intval); } -/* Line 1744 of yacc.c */ -#line 2222 "parse-datetime.c" + +/* Line 1464 of yacc.c */ +#line 574 "parse-datetime.y" + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[(1) - (2)].intval) * (yyvsp[(2) - (2)].intval); } break; case 61: -/* Line 1744 of yacc.c */ -#line 571 "parse-datetime.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[-1].textintval).value * (yyvsp[0].intval); } -/* Line 1744 of yacc.c */ -#line 2230 "parse-datetime.c" + +/* Line 1464 of yacc.c */ +#line 576 "parse-datetime.y" + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[(1) - (2)].textintval).value * (yyvsp[(2) - (2)].intval); } break; case 62: -/* Line 1744 of yacc.c */ -#line 573 "parse-datetime.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[0].intval); } -/* Line 1744 of yacc.c */ -#line 2238 "parse-datetime.c" + +/* Line 1464 of yacc.c */ +#line 578 "parse-datetime.y" + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[(1) - (1)].intval); } break; case 63: -/* Line 1744 of yacc.c */ -#line 575 "parse-datetime.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour = (yyvsp[-1].intval); } -/* Line 1744 of yacc.c */ -#line 2246 "parse-datetime.c" + +/* Line 1464 of yacc.c */ +#line 580 "parse-datetime.y" + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour = (yyvsp[(1) - (2)].intval); } break; case 64: -/* Line 1744 of yacc.c */ -#line 577 "parse-datetime.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour = (yyvsp[-1].textintval).value; } -/* Line 1744 of yacc.c */ -#line 2254 "parse-datetime.c" + +/* Line 1464 of yacc.c */ +#line 582 "parse-datetime.y" + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour = (yyvsp[(1) - (2)].textintval).value; } break; case 65: -/* Line 1744 of yacc.c */ -#line 579 "parse-datetime.y" + +/* Line 1464 of yacc.c */ +#line 584 "parse-datetime.y" { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour = 1; } -/* Line 1744 of yacc.c */ -#line 2262 "parse-datetime.c" break; case 66: -/* Line 1744 of yacc.c */ -#line 581 "parse-datetime.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes = (yyvsp[-1].intval); } -/* Line 1744 of yacc.c */ -#line 2270 "parse-datetime.c" + +/* Line 1464 of yacc.c */ +#line 586 "parse-datetime.y" + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes = (yyvsp[(1) - (2)].intval); } break; case 67: -/* Line 1744 of yacc.c */ -#line 583 "parse-datetime.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes = (yyvsp[-1].textintval).value; } -/* Line 1744 of yacc.c */ -#line 2278 "parse-datetime.c" + +/* Line 1464 of yacc.c */ +#line 588 "parse-datetime.y" + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes = (yyvsp[(1) - (2)].textintval).value; } break; case 68: -/* Line 1744 of yacc.c */ -#line 585 "parse-datetime.y" + +/* Line 1464 of yacc.c */ +#line 590 "parse-datetime.y" { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes = 1; } -/* Line 1744 of yacc.c */ -#line 2286 "parse-datetime.c" break; case 69: -/* Line 1744 of yacc.c */ -#line 587 "parse-datetime.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = (yyvsp[-1].intval); } -/* Line 1744 of yacc.c */ -#line 2294 "parse-datetime.c" + +/* Line 1464 of yacc.c */ +#line 592 "parse-datetime.y" + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = (yyvsp[(1) - (2)].intval); } break; case 70: -/* Line 1744 of yacc.c */ -#line 589 "parse-datetime.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = (yyvsp[-1].textintval).value; } -/* Line 1744 of yacc.c */ -#line 2302 "parse-datetime.c" + +/* Line 1464 of yacc.c */ +#line 594 "parse-datetime.y" + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = (yyvsp[(1) - (2)].textintval).value; } break; case 71: -/* Line 1744 of yacc.c */ -#line 591 "parse-datetime.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = (yyvsp[-1].timespec).tv_sec; (yyval.rel).ns = (yyvsp[-1].timespec).tv_nsec; } -/* Line 1744 of yacc.c */ -#line 2310 "parse-datetime.c" + +/* Line 1464 of yacc.c */ +#line 596 "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 1744 of yacc.c */ -#line 593 "parse-datetime.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = (yyvsp[-1].timespec).tv_sec; (yyval.rel).ns = (yyvsp[-1].timespec).tv_nsec; } -/* Line 1744 of yacc.c */ -#line 2318 "parse-datetime.c" + +/* Line 1464 of yacc.c */ +#line 598 "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 1744 of yacc.c */ -#line 595 "parse-datetime.y" + +/* Line 1464 of yacc.c */ +#line 600 "parse-datetime.y" { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = 1; } -/* Line 1744 of yacc.c */ -#line 2326 "parse-datetime.c" break; case 75: -/* Line 1744 of yacc.c */ -#line 601 "parse-datetime.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year = (yyvsp[-1].textintval).value; } -/* Line 1744 of yacc.c */ -#line 2334 "parse-datetime.c" + +/* Line 1464 of yacc.c */ +#line 606 "parse-datetime.y" + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year = (yyvsp[(1) - (2)].textintval).value; } break; case 76: -/* Line 1744 of yacc.c */ -#line 603 "parse-datetime.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month = (yyvsp[-1].textintval).value; } -/* Line 1744 of yacc.c */ -#line 2342 "parse-datetime.c" + +/* Line 1464 of yacc.c */ +#line 608 "parse-datetime.y" + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month = (yyvsp[(1) - (2)].textintval).value; } break; case 77: -/* Line 1744 of yacc.c */ -#line 605 "parse-datetime.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[-1].textintval).value * (yyvsp[0].intval); } -/* Line 1744 of yacc.c */ -#line 2350 "parse-datetime.c" + +/* Line 1464 of yacc.c */ +#line 610 "parse-datetime.y" + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[(1) - (2)].textintval).value * (yyvsp[(2) - (2)].intval); } break; case 78: -/* Line 1744 of yacc.c */ -#line 607 "parse-datetime.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour = (yyvsp[-1].textintval).value; } -/* Line 1744 of yacc.c */ -#line 2358 "parse-datetime.c" + +/* Line 1464 of yacc.c */ +#line 612 "parse-datetime.y" + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour = (yyvsp[(1) - (2)].textintval).value; } break; case 79: -/* Line 1744 of yacc.c */ -#line 609 "parse-datetime.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes = (yyvsp[-1].textintval).value; } -/* Line 1744 of yacc.c */ -#line 2366 "parse-datetime.c" + +/* Line 1464 of yacc.c */ +#line 614 "parse-datetime.y" + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes = (yyvsp[(1) - (2)].textintval).value; } break; case 80: -/* Line 1744 of yacc.c */ -#line 611 "parse-datetime.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = (yyvsp[-1].textintval).value; } -/* Line 1744 of yacc.c */ -#line 2374 "parse-datetime.c" + +/* Line 1464 of yacc.c */ +#line 616 "parse-datetime.y" + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = (yyvsp[(1) - (2)].textintval).value; } break; case 81: -/* Line 1744 of yacc.c */ -#line 616 "parse-datetime.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[0].intval); } -/* Line 1744 of yacc.c */ -#line 2382 "parse-datetime.c" + +/* Line 1464 of yacc.c */ +#line 621 "parse-datetime.y" + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[(1) - (1)].intval); } break; case 85: -/* Line 1744 of yacc.c */ -#line 624 "parse-datetime.y" - { (yyval.timespec).tv_sec = (yyvsp[0].textintval).value; (yyval.timespec).tv_nsec = 0; } -/* Line 1744 of yacc.c */ -#line 2390 "parse-datetime.c" + +/* Line 1464 of yacc.c */ +#line 629 "parse-datetime.y" + { (yyval.timespec).tv_sec = (yyvsp[(1) - (1)].textintval).value; (yyval.timespec).tv_nsec = 0; } break; case 87: -/* Line 1744 of yacc.c */ -#line 630 "parse-datetime.y" - { (yyval.timespec).tv_sec = (yyvsp[0].textintval).value; (yyval.timespec).tv_nsec = 0; } -/* Line 1744 of yacc.c */ -#line 2398 "parse-datetime.c" + +/* Line 1464 of yacc.c */ +#line 635 "parse-datetime.y" + { (yyval.timespec).tv_sec = (yyvsp[(1) - (1)].textintval).value; (yyval.timespec).tv_nsec = 0; } break; case 88: -/* Line 1744 of yacc.c */ -#line 635 "parse-datetime.y" - { digits_to_date_time (pc, (yyvsp[0].textintval)); } -/* Line 1744 of yacc.c */ -#line 2406 "parse-datetime.c" + +/* Line 1464 of yacc.c */ +#line 640 "parse-datetime.y" + { digits_to_date_time (pc, (yyvsp[(1) - (1)].textintval)); } break; case 89: -/* Line 1744 of yacc.c */ -#line 640 "parse-datetime.y" + +/* Line 1464 of yacc.c */ +#line 645 "parse-datetime.y" { /* Hybrid all-digit and relative offset, so that we accept e.g., "YYYYMMDD +N days" as well as "YYYYMMDD N days". */ - digits_to_date_time (pc, (yyvsp[-1].textintval)); - apply_relative_time (pc, (yyvsp[0].rel), 1); + digits_to_date_time (pc, (yyvsp[(1) - (2)].textintval)); + apply_relative_time (pc, (yyvsp[(2) - (2)].rel), 1); } -/* Line 1744 of yacc.c */ -#line 2419 "parse-datetime.c" break; case 90: -/* Line 1744 of yacc.c */ -#line 650 "parse-datetime.y" + +/* Line 1464 of yacc.c */ +#line 655 "parse-datetime.y" { (yyval.intval) = -1; } -/* Line 1744 of yacc.c */ -#line 2427 "parse-datetime.c" break; case 91: -/* Line 1744 of yacc.c */ -#line 652 "parse-datetime.y" - { (yyval.intval) = (yyvsp[0].textintval).value; } -/* Line 1744 of yacc.c */ -#line 2435 "parse-datetime.c" + +/* Line 1464 of yacc.c */ +#line 657 "parse-datetime.y" + { (yyval.intval) = (yyvsp[(2) - (2)].textintval).value; } break; -/* Line 1744 of yacc.c */ -#line 2440 "parse-datetime.c" + +/* Line 1464 of yacc.c */ +#line 2388 "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); @@ -2477,10 +2414,6 @@ 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) { @@ -2488,36 +2421,37 @@ yyerrlab: #if ! YYERROR_VERBOSE yyerror (pc, YY_("syntax error")); #else -# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \ - yyssp, yytoken) { - 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; + 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; + } } -# undef YYSYNTAX_ERROR #endif } @@ -2526,20 +2460,20 @@ yyerrlab: if (yyerrstatus == 3) { /* If just tried and failed to reuse lookahead token after an - error, discard it. */ + error, discard it. */ if (yychar <= YYEOF) - { - /* Return failure if at end of input. */ - if (yychar == YYEOF) - YYABORT; - } + { + /* Return failure if at end of input. */ + if (yychar == YYEOF) + YYABORT; + } else - { - yydestruct ("Error: discarding", - yytoken, &yylval, pc); - yychar = YYEMPTY; - } + { + yydestruct ("Error: discarding", + yytoken, &yylval, pc); + yychar = YYEMPTY; + } } /* Else will try to reuse lookahead token after shifting the error @@ -2571,29 +2505,29 @@ yyerrorlab: | yyerrlab1 -- common code for both syntax error and YYERROR. | `-------------------------------------------------------------*/ yyerrlab1: - yyerrstatus = 3; /* Each real token shifted decrements this. */ + yyerrstatus = 3; /* Each real token shifted decrements this. */ for (;;) { yyn = yypact[yystate]; - if (!yypact_value_is_default (yyn)) - { - yyn += YYTERROR; - if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) - { - yyn = yytable[yyn]; - if (0 < yyn) - break; - } - } + if (yyn != YYPACT_NINF) + { + yyn += YYTERROR; + if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) + { + yyn = yytable[yyn]; + if (0 < yyn) + break; + } + } /* Pop the current state because it cannot handle the error token. */ if (yyssp == yyss) - YYABORT; + YYABORT; yydestruct ("Error: popping", - yystos[yystate], yyvsp, pc); + yystos[yystate], yyvsp, pc); YYPOPSTACK (1); yystate = *yyssp; YY_STACK_PRINT (yyss, yyssp); @@ -2623,7 +2557,7 @@ yyabortlab: yyresult = 1; goto yyreturn; -#if !defined yyoverflow || YYERROR_VERBOSE +#if !defined(yyoverflow) || YYERROR_VERBOSE /*-------------------------------------------------. | yyexhaustedlab -- memory exhaustion comes here. | `-------------------------------------------------*/ @@ -2635,13 +2569,8 @@ yyexhaustedlab: yyreturn: if (yychar != YYEMPTY) - { - /* 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); - } + yydestruct ("Cleanup: discarding lookahead", + yytoken, &yylval, pc); /* Do not reclaim the symbols of the rule which action triggered this YYABORT or YYACCEPT. */ YYPOPSTACK (yylen); @@ -2649,7 +2578,7 @@ yyreturn: while (yyssp != yyss) { yydestruct ("Cleanup: popping", - yystos[*yyssp], yyvsp, pc); + yystos[*yyssp], yyvsp, pc); YYPOPSTACK (1); } #ifndef yyoverflow @@ -2664,8 +2593,10 @@ yyreturn: return YYID (yyresult); } -/* Line 2004 of yacc.c */ -#line 655 "parse-datetime.y" + + +/* Line 1684 of yacc.c */ +#line 660 "parse-datetime.y" static table const meridian_table[] = @@ -3185,7 +3116,8 @@ yylex (YYSTYPE *lvalp, parser_control *pc) } if (c != '(') - return *pc->input++; + return to_uchar (*pc->input++); + count = 0; do { @@ -3629,3 +3561,4 @@ main (int ac, char **av) return 0; } #endif /* TEST */ + diff --git a/lib/parse-datetime.h b/lib/parse-datetime.h index 1f21efd6..80e35919 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-2012 Free Software + Copyright (C) 1995, 1997-1998, 2003-2004, 2007, 2009-2013 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 67669f63..77d95b70 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-2012 Free Software Foundation, Inc. + Copyright (C) 1999-2000, 2002-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 @@ -113,6 +113,11 @@ typedef long int long_time_t; typedef time_t long_time_t; #endif +/* Convert a possibly-signed character to an unsigned character. This is + a bit safer than casting to unsigned char, since it catches some type + errors that the cast doesn't. */ +static unsigned char to_uchar (char ch) { return ch; } + /* Lots of this code assumes time_t and time_t-like values fit into long_time_t. */ verify (TYPE_MINIMUM (long_time_t) <= TYPE_MINIMUM (time_t) @@ -1171,7 +1176,8 @@ yylex (YYSTYPE *lvalp, parser_control *pc) } if (c != '(') - return *pc->input++; + return to_uchar (*pc->input++); + count = 0; do { diff --git a/lib/pathmax.h b/lib/pathmax.h index 03db7cb5..a9ddc33d 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-2012 Free Software + Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2013 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 74e9d0df..26299361 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-2012 Free Software + Copyright (C) 2000-2001, 2003, 2005-2006, 2009-2013 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/physmem.h b/lib/physmem.h index 970fec57..1b2706dd 100644 --- a/lib/physmem.h +++ b/lib/physmem.h @@ -1,6 +1,6 @@ /* Calculate the size of physical memory. - Copyright (C) 2000, 2003, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 2000, 2003, 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 diff --git a/lib/pipe-safer.c b/lib/pipe-safer.c index d6dce5ff..f2e0ad6f 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-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/pipe2-safer.c b/lib/pipe2-safer.c index 981a0ff4..e831d0c6 100644 --- a/lib/pipe2-safer.c +++ b/lib/pipe2-safer.c @@ -1,5 +1,5 @@ /* Invoke pipe2, but avoid some glitches. - Copyright (C) 2005-2006, 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/pipe2.c b/lib/pipe2.c index 6203fe5f..5925cf9e 100644 --- a/lib/pipe2.c +++ b/lib/pipe2.c @@ -1,5 +1,5 @@ /* Create a pipe, with specific opening flags. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/posixtm.c b/lib/posixtm.c index 552474b9..31b5563a 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-2012 Free Software Foundation, Inc. + Copyright (C) 1989-1991, 1998, 2000-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 diff --git a/lib/posixtm.h b/lib/posixtm.h index a4c5f18f..8a4383bb 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-2012 Free Software Foundation, Inc. + Copyright (C) 1998, 2003, 2005, 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 diff --git a/lib/posixver.c b/lib/posixver.c index c9c45661..f3193e07 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-2012 Free Software Foundation, Inc. + Copyright (C) 2002-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 diff --git a/lib/printf-args.c b/lib/printf-args.c index 47b20dc2..c27e6bc6 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-2012 Free Software + Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2013 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 aa811aff..2a9c2a3f 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-2012 Free Software + Copyright (C) 1999, 2002-2003, 2006-2007, 2011-2013 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 eb47205a..1a7b0c43 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-2012 Free Software Foundation, Inc. + Copyright (C) 2007, 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 diff --git a/lib/printf-frexp.h b/lib/printf-frexp.h index 985d7d29..3976b736 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-2012 Free Software Foundation, Inc. + Copyright (C) 2007, 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 diff --git a/lib/printf-frexpl.c b/lib/printf-frexpl.c index 568d2ffc..26987a7b 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-2012 Free Software Foundation, Inc. + Copyright (C) 2007, 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 diff --git a/lib/printf-frexpl.h b/lib/printf-frexpl.h index 341ddedc..3768b091 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-2012 Free Software Foundation, Inc. + Copyright (C) 2007, 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 diff --git a/lib/printf-parse.c b/lib/printf-parse.c index 308a1755..23cacc1d 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-2012 Free Software Foundation, Inc. + Copyright (C) 1999-2000, 2002-2003, 2006-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 @@ -401,7 +401,7 @@ PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a) cp++; } #if defined __APPLE__ && defined __MACH__ - /* On MacOS X 10.3, PRIdMAX is defined as "qd". + /* On Mac OS X 10.3, PRIdMAX is defined as "qd". We cannot change it to "lld" because PRIdMAX must also be understood by the system's printf routines. */ else if (*cp == 'q') diff --git a/lib/printf-parse.h b/lib/printf-parse.h index 577099a5..d8474bee 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-2012 Free Software + Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2013 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 f7f6cb99..ad78b92d 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-2012 Free Software Foundation, Inc. + 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 @@ -18,6 +18,9 @@ Written by David Bartley. */ #include <config.h> + +#define PRIV_SET_INLINE _GL_EXTERN_INLINE + #include "priv-set.h" #if HAVE_GETPPRIV && HAVE_PRIV_H diff --git a/lib/priv-set.h b/lib/priv-set.h index 707a5bf3..6f62cce0 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-2012 Free Software Foundation, Inc. + 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 @@ -17,6 +17,11 @@ Written by David Bartley. */ +_GL_INLINE_HEADER_BEGIN +#ifndef PRIV_SET_INLINE +# define PRIV_SET_INLINE _GL_INLINE +#endif + #if HAVE_GETPPRIV && HAVE_PRIV_H # include <priv.h> @@ -25,26 +30,32 @@ int priv_set_ismember (const char *priv); int priv_set_remove (const char *priv); int priv_set_restore (const char *priv); -static inline int priv_set_remove_linkdir (void) +PRIV_SET_INLINE int +priv_set_remove_linkdir (void) { return priv_set_remove (PRIV_SYS_LINKDIR); } -static inline int priv_set_restore_linkdir (void) +PRIV_SET_INLINE int +priv_set_restore_linkdir (void) { return priv_set_restore (PRIV_SYS_LINKDIR); } #else -static inline int priv_set_remove_linkdir (void) +PRIV_SET_INLINE int +priv_set_remove_linkdir (void) { return -1; } -static inline int priv_set_restore_linkdir (void) +PRIV_SET_INLINE int +priv_set_restore_linkdir (void) { return -1; } #endif + +_GL_INLINE_HEADER_END diff --git a/lib/progname.c b/lib/progname.c index bdd4dd74..0c195e52 100644 --- a/lib/progname.c +++ b/lib/progname.c @@ -1,5 +1,5 @@ /* Program name management. - Copyright (C) 2001-2003, 2005-2012 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2005-2013 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 a75a02e6..b4f3c277 100644 --- a/lib/progname.h +++ b/lib/progname.h @@ -1,5 +1,5 @@ /* Program name management. - Copyright (C) 2001-2004, 2006, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2006, 2009-2013 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 79c6b08e..8cc83080 100644 --- a/lib/propername.c +++ b/lib/propername.c @@ -1,5 +1,5 @@ /* Localization of proper names. - Copyright (C) 2006-2012 Free Software Foundation, Inc. + Copyright (C) 2006-2013 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 0ce1923f..59dfade4 100644 --- a/lib/propername.h +++ b/lib/propername.h @@ -1,5 +1,5 @@ /* Localization of proper names. - Copyright (C) 2006, 2008-2012 Free Software Foundation, Inc. + Copyright (C) 2006, 2008-2013 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.c b/lib/pthread.c new file mode 100644 index 00000000..a7de6376 --- /dev/null +++ b/lib/pthread.c @@ -0,0 +1,3 @@ +#include <config.h> +#define _GL_PTHREAD_INLINE _GL_EXTERN_INLINE +#include "pthread.h" diff --git a/lib/pthread.in.h b/lib/pthread.in.h index 47824847..aea5e60f 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-2012 Free Software Foundation, Inc. + 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 @@ -32,12 +32,20 @@ #ifndef _@GUARD_PREFIX@_PTHREAD_H_ #define _@GUARD_PREFIX@_PTHREAD_H_ -#include <errno.h> +#define __need_system_stdlib_h #include <stdlib.h> +#undef __need_system_stdlib_h + +#include <errno.h> #include <sched.h> #include <sys/types.h> #include <time.h> +_GL_INLINE_HEADER_BEGIN +#ifndef _GL_PTHREAD_INLINE +# define _GL_PTHREAD_INLINE _GL_INLINE +#endif + #if ! @HAVE_PTHREAD_T@ # if !GNULIB_defined_pthread_types typedef int pthread_t; @@ -110,14 +118,14 @@ know what to do, so that they elicit a compile-time error for now. */ -static inline int +_GL_PTHREAD_INLINE int pthread_cond_destroy (pthread_cond_t *cond) { /* COND is never seriously used. */ return 0; } -static inline int +_GL_PTHREAD_INLINE int pthread_cond_init (pthread_cond_t *restrict cond, pthread_condattr_t const *restrict attr) { @@ -125,14 +133,14 @@ pthread_cond_init (pthread_cond_t *restrict cond, return 0; } -static inline int +_GL_PTHREAD_INLINE int pthread_cond_signal (pthread_cond_t *cond) { /* No threads can currently be blocked on COND. */ return 0; } -static inline int +_GL_PTHREAD_INLINE int pthread_cond_wait (pthread_cond_t *restrict cond, pthread_mutex_t *restrict mutex) { @@ -141,7 +149,7 @@ pthread_cond_wait (pthread_cond_t *restrict cond, return 0; } -static inline int +_GL_PTHREAD_INLINE int pthread_create (pthread_t *restrict thread, pthread_attr_t const *restrict attr, void * (*start_routine) (void*), void *restrict arg) @@ -150,14 +158,14 @@ pthread_create (pthread_t *restrict thread, return EAGAIN; } -static inline void +_GL_PTHREAD_INLINE void pthread_exit (void *value) { /* There is just one thread, so the process exits. */ exit (0); } -static inline int +_GL_PTHREAD_INLINE int pthread_join (pthread_t thread, void **pvalue) { /* Properly-written applications never come here. */ @@ -165,32 +173,32 @@ pthread_join (pthread_t thread, void **pvalue) return 0; } -static inline int +_GL_PTHREAD_INLINE int pthread_mutexattr_destroy (pthread_mutexattr_t *attr) { return 0; } -static inline int +_GL_PTHREAD_INLINE int pthread_mutexattr_init (pthread_mutexattr_t *attr) { return 0; } -static inline int +_GL_PTHREAD_INLINE int pthread_mutexattr_settype (pthread_mutexattr_t *attr, int attr_type) { return 0; } -static inline int +_GL_PTHREAD_INLINE int pthread_mutex_destroy (pthread_mutex_t *mutex) { /* MUTEX is never seriously used. */ return 0; } -static inline int +_GL_PTHREAD_INLINE int pthread_mutex_init (pthread_mutex_t *restrict mutex, pthread_mutexattr_t const *restrict attr) { @@ -198,7 +206,7 @@ pthread_mutex_init (pthread_mutex_t *restrict mutex, return 0; } -static inline int +_GL_PTHREAD_INLINE int pthread_mutex_lock (pthread_mutex_t *mutex) { /* There is only one thread, so it always gets the lock. This @@ -206,13 +214,13 @@ pthread_mutex_lock (pthread_mutex_t *mutex) return 0; } -static inline int +_GL_PTHREAD_INLINE int pthread_mutex_trylock (pthread_mutex_t *mutex) { return pthread_mutex_lock (mutex); } -static inline int +_GL_PTHREAD_INLINE int pthread_mutex_unlock (pthread_mutex_t *mutex) { /* There is only one thread, so it always unlocks successfully. @@ -234,31 +242,31 @@ pthread_mutex_unlock (pthread_mutex_t *mutex) typedef pthread_mutex_t pthread_spinlock_t; -static inline int +_GL_PTHREAD_INLINE int pthread_spin_init (pthread_spinlock_t *lock, int pshared) { return pthread_mutex_init (lock, NULL); } -static inline int +_GL_PTHREAD_INLINE int pthread_spin_destroy (pthread_spinlock_t *lock) { return pthread_mutex_destroy (lock); } -static inline int +_GL_PTHREAD_INLINE int pthread_spin_lock (pthread_spinlock_t *lock) { return pthread_mutex_lock (lock); } -static inline int +_GL_PTHREAD_INLINE int pthread_spin_trylock (pthread_spinlock_t *lock) { return pthread_mutex_trylock (lock); } -static inline int +_GL_PTHREAD_INLINE int pthread_spin_unlock (pthread_spinlock_t *lock) { return pthread_mutex_unlock (lock); @@ -269,5 +277,7 @@ pthread_spin_unlock (pthread_spinlock_t *lock) #endif +_GL_INLINE_HEADER_END + #endif /* _@GUARD_PREFIX@_PTHREAD_H_ */ #endif /* _@GUARD_PREFIX@_PTHREAD_H_ */ diff --git a/lib/putenv.c b/lib/putenv.c index 3c0f7ead..5f0fedaf 100644 --- a/lib/putenv.c +++ b/lib/putenv.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1994, 1997-1998, 2000, 2003-2012 Free Software +/* Copyright (C) 1991, 1994, 1997-1998, 2000, 2003-2013 Free Software Foundation, Inc. NOTE: The canonical source of this file is maintained with the GNU C diff --git a/lib/quote.h b/lib/quote.h index b30b166d..16797967 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-2012 Free Software Foundation, Inc. + Copyright (C) 1998-2001, 2003, 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 @@ -18,16 +18,29 @@ #ifndef QUOTE_H_ # define QUOTE_H_ 1 +# include <stddef.h> + /* The quoting options used by quote_n and quote. Its type is incomplete, so it's useful only in expressions like '"e_quoting_options'. */ extern struct quoting_options quote_quoting_options; -/* Return an unambiguous printable representation of NAME, - allocated in slot N, suitable for diagnostics. */ -char const *quote_n (int n, char const *name); +/* Return an unambiguous printable representation of ARG (of size + ARGSIZE), allocated in slot N, suitable for diagnostics. If + ARGSIZE is SIZE_MAX, use the string length of the argument for + ARGSIZE. */ +char const *quote_n_mem (int n, char const *arg, size_t argsize); + +/* Return an unambiguous printable representation of ARG (of size + ARGSIZE), suitable for diagnostics. If ARGSIZE is SIZE_MAX, use + the string length of the argument for ARGSIZE. */ +char const *quote_mem (char const *arg, size_t argsize); + +/* Return an unambiguous printable representation of ARG, allocated in + slot N, suitable for diagnostics. */ +char const *quote_n (int n, char const *arg); -/* Return an unambiguous printable representation of NAME, - suitable for diagnostics. */ -char const *quote (char const *name); +/* Return an unambiguous printable representation of ARG, suitable for + diagnostics. */ +char const *quote (char const *arg); #endif /* !QUOTE_H_ */ diff --git a/lib/quotearg.c b/lib/quotearg.c index 1ea583d9..57a83822 100644 --- a/lib/quotearg.c +++ b/lib/quotearg.c @@ -1,6 +1,6 @@ /* quotearg.c - quote arguments for output - Copyright (C) 1998-2002, 2004-2012 Free Software Foundation, Inc. + Copyright (C) 1998-2002, 2004-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 @@ -929,7 +929,7 @@ quotearg_custom_mem (char const *left_quote, char const *right_quote, } -/* The quoting option used by quote_n and quote. */ +/* The quoting option used by the functions of quote.h. */ struct quoting_options quote_quoting_options = { locale_quoting_style, @@ -939,13 +939,25 @@ struct quoting_options quote_quoting_options = }; char const * -quote_n (int n, char const *name) +quote_n_mem (int n, char const *arg, size_t argsize) { - return quotearg_n_options (n, name, SIZE_MAX, "e_quoting_options); + return quotearg_n_options (n, arg, argsize, "e_quoting_options); } char const * -quote (char const *name) +quote_mem (char const *arg, size_t argsize) { - return quote_n (0, name); + return quote_n_mem (0, arg, argsize); +} + +char const * +quote_n (int n, char const *arg) +{ + return quote_n_mem (n, arg, SIZE_MAX); +} + +char const * +quote (char const *arg) +{ + return quote_n (0, arg); } diff --git a/lib/quotearg.h b/lib/quotearg.h index e6b08ab2..58ee3f60 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-2012 Free Software Foundation, + Copyright (C) 1998-2002, 2004, 2006, 2008-2013 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 7f32b091..5b546d2b 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-2012 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 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 @@ -32,7 +32,7 @@ # undef raise # if HAVE_MSVC_INVALID_PARAMETER_HANDLER -static inline int +static int raise_nothrow (int sig) { int result; diff --git a/lib/rand-isaac.c b/lib/rand-isaac.c index 262929a7..defd2177 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-2012 Free Software Foundation, Inc. + Copyright (C) 1999-2013 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/rand-isaac.h b/lib/rand-isaac.h index 9b6c314b..8e45c703 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-2012 Free Software Foundation, Inc. + Copyright (C) 1999-2013 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 615a90e2..2ae76584 100644 --- a/lib/randint.c +++ b/lib/randint.c @@ -1,6 +1,6 @@ /* Generate random integers. - Copyright (C) 2006-2012 Free Software Foundation, Inc. + Copyright (C) 2006-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 diff --git a/lib/randint.h b/lib/randint.h index 14c0e847..fc13270b 100644 --- a/lib/randint.h +++ b/lib/randint.h @@ -1,6 +1,6 @@ /* Generate random integers. - Copyright (C) 2006-2012 Free Software Foundation, Inc. + Copyright (C) 2006-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 diff --git a/lib/randperm.c b/lib/randperm.c index a87f73da..ffa8faa1 100644 --- a/lib/randperm.c +++ b/lib/randperm.c @@ -1,6 +1,6 @@ /* Generate random permutations. - Copyright (C) 2006-2012 Free Software Foundation, Inc. + Copyright (C) 2006-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 diff --git a/lib/randread.c b/lib/randread.c index 4cb33649..dfba6118 100644 --- a/lib/randread.c +++ b/lib/randread.c @@ -1,6 +1,6 @@ /* Generate buffers of random data. - Copyright (C) 2006-2012 Free Software Foundation, Inc. + Copyright (C) 2006-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 diff --git a/lib/randread.h b/lib/randread.h index f891cd50..72ce8581 100644 --- a/lib/randread.h +++ b/lib/randread.h @@ -1,6 +1,6 @@ /* Generate buffers of random data. - Copyright (C) 2006-2012 Free Software Foundation, Inc. + Copyright (C) 2006-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 diff --git a/lib/rawmemchr.c b/lib/rawmemchr.c index c94a0e10..a0298ce6 100644 --- a/lib/rawmemchr.c +++ b/lib/rawmemchr.c @@ -1,5 +1,5 @@ /* Searching in a string. - Copyright (C) 2008-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/read-file.c b/lib/read-file.c index 0d5ab8b6..bcc5a92f 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-2012 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2013 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 a1142b8c..507135f2 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-2012 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2013 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 d130e311..0fe0306f 100644 --- a/lib/read.c +++ b/lib/read.c @@ -1,5 +1,5 @@ /* POSIX compatible read() function. - Copyright (C) 2008-2012 Free Software Foundation, Inc. + Copyright (C) 2008-2013 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2011. This program is free software: you can redistribute it and/or modify @@ -34,7 +34,7 @@ # undef read # if HAVE_MSVC_INVALID_PARAMETER_HANDLER -static inline ssize_t +static ssize_t read_nothrow (int fd, void *buf, size_t count) { ssize_t result; diff --git a/lib/readdir.c b/lib/readdir.c index 28aff9cc..3db00806 100644 --- a/lib/readdir.c +++ b/lib/readdir.c @@ -1,5 +1,5 @@ /* Read the next entry of a directory. - Copyright (C) 2011-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/readlink.c b/lib/readlink.c index baac1322..f83a1e01 100644 --- a/lib/readlink.c +++ b/lib/readlink.c @@ -1,5 +1,5 @@ /* Stub for readlink(). - Copyright (C) 2003-2007, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 2003-2007, 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 diff --git a/lib/readlinkat.c b/lib/readlinkat.c index 86366920..504e6ebb 100644 --- a/lib/readlinkat.c +++ b/lib/readlinkat.c @@ -1,5 +1,5 @@ /* Read a symlink relative to an open directory. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/readtokens.c b/lib/readtokens.c index 2846a949..b2464bfa 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-2012 Free Software + Copyright (C) 1990-1991, 1999-2004, 2006, 2009-2013 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 902e64ab..4f5048b1 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-2012 Free Software + Copyright (C) 1990-1991, 1999, 2001-2004, 2009-2013 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 1d8dde7c..b20cb39f 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-2012 Free Software Foundation, Inc. + Copyright (C) 2004, 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 diff --git a/lib/readtokens0.h b/lib/readtokens0.h index e9e16997..d8852618 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-2012 Free Software Foundation, Inc. + Copyright (C) 2004, 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 diff --git a/lib/readutmp.c b/lib/readutmp.c index f89dd68f..ec6e2759 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-2012 Free Software Foundation, Inc. + Copyright (C) 1992-2001, 2003-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 @@ -61,7 +61,7 @@ extract_trimmed_name (const STRUCT_UTMP *ut) /* Is the utmp entry U desired by the user who asked for OPTIONS? */ -static inline bool +static bool desirable_utmp_entry (STRUCT_UTMP const *u, int options) { bool user_proc = IS_USER_PROCESS (u); @@ -69,8 +69,8 @@ desirable_utmp_entry (STRUCT_UTMP const *u, int options) return false; if ((options & READ_UTMP_CHECK_PIDS) && user_proc - && (UT_PID (u) <= 0 - || (kill (UT_PID (u), 0) < 0 && errno == ESRCH))) + && 0 < UT_PID (u) + && (kill (UT_PID (u), 0) < 0 && errno == ESRCH)) return false; return true; } diff --git a/lib/readutmp.h b/lib/readutmp.h index 33c7446e..bfbcca1b 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-2012 Free Software Foundation, Inc. + Copyright (C) 1992-2007, 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 diff --git a/lib/realloc.c b/lib/realloc.c index 99556ccf..b51010a6 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-2012 Free Software + Copyright (C) 1997, 2003-2004, 2006-2007, 2009-2013 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 4ec043f8..112bcdc6 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-2012 Free Software Foundation, Inc. +# Copyright (C) 2000, 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 diff --git a/lib/ref-del.sin b/lib/ref-del.sin index eb038811..6f738684 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-2012 Free Software Foundation, Inc. +# Copyright (C) 2000, 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 diff --git a/lib/regcomp.c b/lib/regcomp.c index 1334f472..62dcbed7 100644 --- a/lib/regcomp.c +++ b/lib/regcomp.c @@ -1,20 +1,21 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002-2012 Free Software Foundation, Inc. + Copyright (C) 2002-2013 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. - This 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. + 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/>. */ static reg_errcode_t re_compile_internal (regex_t *preg, const char * pattern, size_t length, reg_syntax_t syntax); @@ -93,20 +94,20 @@ static reg_errcode_t build_charclass (RE_TRANSLATE_TYPE trans, bitset_t sbcset, re_charset_t *mbcset, Idx *char_class_alloc, - const unsigned char *class_name, + const char *class_name, reg_syntax_t syntax); #else /* not RE_ENABLE_I18N */ static reg_errcode_t build_equiv_class (bitset_t sbcset, const unsigned char *name); static reg_errcode_t build_charclass (RE_TRANSLATE_TYPE trans, bitset_t sbcset, - const unsigned char *class_name, + const char *class_name, reg_syntax_t syntax); #endif /* not RE_ENABLE_I18N */ static bin_tree_t *build_charclass_op (re_dfa_t *dfa, RE_TRANSLATE_TYPE trans, - const unsigned char *class_name, - const unsigned char *extra, + const char *class_name, + const char *extra, bool non_match, reg_errcode_t *err); static bin_tree_t *create_tree (re_dfa_t *dfa, bin_tree_t *left, bin_tree_t *right, @@ -899,8 +900,10 @@ init_dfa (re_dfa_t *dfa, size_t pat_len) != 0); #else codeset_name = nl_langinfo (CODESET); - if (strcasecmp (codeset_name, "UTF-8") == 0 - || strcasecmp (codeset_name, "UTF8") == 0) + if ((codeset_name[0] == 'U' || codeset_name[0] == 'u') + && (codeset_name[1] == 'T' || codeset_name[1] == 't') + && (codeset_name[2] == 'F' || codeset_name[2] == 'f') + && strcmp (codeset_name + 3 + (codeset_name[3] == '-'), "8") == 0) dfa->is_utf8 = 1; /* We check exhaustively in the loop below if this charset is a @@ -950,24 +953,28 @@ static void internal_function init_word_char (re_dfa_t *dfa) { - dfa->word_ops_used = 1; int i = 0; int j; int ch = 0; + dfa->word_ops_used = 1; if (BE (dfa->map_notascii == 0, 1)) { + bitset_word_t bits0 = 0x00000000; + bitset_word_t bits1 = 0x03ff0000; + bitset_word_t bits2 = 0x87fffffe; + bitset_word_t bits3 = 0x07fffffe; if (BITSET_WORD_BITS == 64) { - dfa->word_char[0] = UINT64_C (0x03ff000000000000); - dfa->word_char[1] = UINT64_C (0x07fffffe87fffffe); + dfa->word_char[0] = bits1 << 31 << 1 | bits0; + dfa->word_char[1] = bits3 << 31 << 1 | bits2; i = 2; } else if (BITSET_WORD_BITS == 32) { - dfa->word_char[0] = UINT32_C (0x00000000); - dfa->word_char[1] = UINT32_C (0x03ff0000); - dfa->word_char[2] = UINT32_C (0x87fffffe); - dfa->word_char[3] = UINT32_C (0x07fffffe); + dfa->word_char[0] = bits0; + dfa->word_char[1] = bits1; + dfa->word_char[2] = bits2; + dfa->word_char[3] = bits3; i = 4; } else @@ -2415,8 +2422,8 @@ parse_expression (re_string_t *regexp, regex_t *preg, re_token_t *token, case OP_WORD: case OP_NOTWORD: tree = build_charclass_op (dfa, regexp->trans, - (const unsigned char *) "alnum", - (const unsigned char *) "_", + "alnum", + "_", token->type == OP_NOTWORD, err); if (BE (*err != REG_NOERROR && tree == NULL, 0)) return NULL; @@ -2424,8 +2431,8 @@ parse_expression (re_string_t *regexp, regex_t *preg, re_token_t *token, case OP_SPACE: case OP_NOTSPACE: tree = build_charclass_op (dfa, regexp->trans, - (const unsigned char *) "space", - (const unsigned char *) "", + "space", + "", token->type == OP_NOTSPACE, err); if (BE (*err != REG_NOERROR && tree == NULL, 0)) return NULL; @@ -2617,7 +2624,10 @@ parse_dup_op (bin_tree_t *elem, re_string_t *regexp, re_dfa_t *dfa, old_tree = NULL; if (elem->token.type == SUBEXP) - postorder (elem, mark_opt_subexp, (void *) (long) elem->token.opr.idx); + { + uintptr_t subidx = elem->token.opr.idx; + postorder (elem, mark_opt_subexp, (void *) subidx); + } tree = create_tree (dfa, elem, NULL, (end == REG_MISSING ? OP_DUP_ASTERISK : OP_ALT)); @@ -2702,7 +2712,6 @@ build_range_exp (const reg_syntax_t syntax, wchar_t wc; wint_t start_wc; wint_t end_wc; - wchar_t cmp_buf[6] = {L'\0', L'\0', L'\0', L'\0', L'\0', L'\0'}; start_ch = ((start_elem->type == SB_CHAR) ? start_elem->opr.ch : ((start_elem->type == COLL_SYM) ? start_elem->opr.name[0] @@ -2716,11 +2725,7 @@ build_range_exp (const reg_syntax_t syntax, ? __btowc (end_ch) : end_elem->opr.wch); if (start_wc == WEOF || end_wc == WEOF) return REG_ECOLLATE; - cmp_buf[0] = start_wc; - cmp_buf[4] = end_wc; - - if (BE ((syntax & RE_NO_EMPTY_RANGES) - && wcscoll (cmp_buf, cmp_buf + 4) > 0, 0)) + else if (BE ((syntax & RE_NO_EMPTY_RANGES) && start_wc > end_wc, 0)) return REG_ERANGE; /* Got valid collation sequence values, add them as a new entry. @@ -2761,9 +2766,7 @@ build_range_exp (const reg_syntax_t syntax, /* Build the table for single byte characters. */ for (wc = 0; wc < SBC_MAX; ++wc) { - cmp_buf[2] = wc; - if (wcscoll (cmp_buf, cmp_buf + 2) <= 0 - && wcscoll (cmp_buf + 2, cmp_buf + 4) <= 0) + if (start_wc <= wc && wc <= end_wc) bitset_set (sbcset, wc); } } @@ -2962,6 +2965,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token, 0)) return REG_ERANGE; + /* FIXME: Implement rational ranges here, too. */ start_collseq = lookup_collation_sequence_value (start_elem); end_collseq = lookup_collation_sequence_value (end_elem); /* Check start/end collation sequence values. */ @@ -3289,7 +3293,8 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token, #ifdef RE_ENABLE_I18N mbcset, &char_class_alloc, #endif /* RE_ENABLE_I18N */ - start_elem.opr.name, syntax); + (const char *) start_elem.opr.name, + syntax); if (BE (*err != REG_NOERROR, 0)) goto parse_bracket_exp_free_return; break; @@ -3572,14 +3577,14 @@ static reg_errcode_t #ifdef RE_ENABLE_I18N build_charclass (RE_TRANSLATE_TYPE trans, bitset_t sbcset, re_charset_t *mbcset, Idx *char_class_alloc, - const unsigned char *class_name, reg_syntax_t syntax) + const char *class_name, reg_syntax_t syntax) #else /* not RE_ENABLE_I18N */ build_charclass (RE_TRANSLATE_TYPE trans, bitset_t sbcset, - const unsigned char *class_name, reg_syntax_t syntax) + const char *class_name, reg_syntax_t syntax) #endif /* not RE_ENABLE_I18N */ { int i; - const char *name = (const char *) class_name; + const char *name = class_name; /* In case of REG_ICASE "upper" and "lower" match the both of upper and lower cases. */ @@ -3653,8 +3658,8 @@ build_charclass (RE_TRANSLATE_TYPE trans, bitset_t sbcset, static bin_tree_t * build_charclass_op (re_dfa_t *dfa, RE_TRANSLATE_TYPE trans, - const unsigned char *class_name, - const unsigned char *extra, bool non_match, + const char *class_name, + const char *extra, bool non_match, reg_errcode_t *err) { re_bitset_ptr_t sbcset; @@ -3857,7 +3862,7 @@ create_token_tree (re_dfa_t *dfa, bin_tree_t *left, bin_tree_t *right, static reg_errcode_t mark_opt_subexp (void *extra, bin_tree_t *node) { - Idx idx = (Idx) (long) extra; + Idx idx = (uintptr_t) extra; if (node->token.type == SUBEXP && node->token.opr.idx == idx) node->token.opt_subexp = 1; diff --git a/lib/regex.c b/lib/regex.c index 7b440493..df90e10d 100644 --- a/lib/regex.c +++ b/lib/regex.c @@ -1,20 +1,21 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002-2003, 2005-2006, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 2002-2013 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. - This 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. + 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/>. */ #ifndef _LIBC # include <config.h> diff --git a/lib/regex.h b/lib/regex.h index 211b5fcb..854c6eda 100644 --- a/lib/regex.h +++ b/lib/regex.h @@ -1,21 +1,22 @@ /* Definitions for data structures and routines for the regular expression library. - Copyright (C) 1985, 1989-1993, 1995-1998, 2000-2003, 2005-2012 - Free Software Foundation, Inc. + Copyright (C) 1985, 1989-1993, 1995-1998, 2000-2003, 2005-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, 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/>. */ #ifndef _REGEX_H #define _REGEX_H 1 diff --git a/lib/regex_internal.c b/lib/regex_internal.c index 95372973..d8bdbd3f 100644 --- a/lib/regex_internal.c +++ b/lib/regex_internal.c @@ -1,20 +1,21 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002-2012 Free Software Foundation, Inc. + Copyright (C) 2002-2013 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. - This 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. + 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/>. */ #include "verify.h" #include "intprops.h" @@ -975,7 +976,7 @@ re_node_set_alloc (re_node_set *set, Idx size) set->alloc = size; set->nelem = 0; set->elems = re_malloc (Idx, size); - if (BE (set->elems == NULL, 0)) + if (BE (set->elems == NULL, 0) && (MALLOC_0_IS_NONNULL || size != 0)) return REG_ESPACE; return REG_NOERROR; } @@ -1447,11 +1448,9 @@ re_dfa_add_node (re_dfa_t *dfa, re_token_t token) dfa->nodes[dfa->nodes_len] = token; dfa->nodes[dfa->nodes_len].constraint = 0; #ifdef RE_ENABLE_I18N - { - int type = token.type; dfa->nodes[dfa->nodes_len].accept_mb = - (type == OP_PERIOD && dfa->mb_cur_max > 1) || type == COMPLEX_BRACKET; - } + ((token.type == OP_PERIOD && dfa->mb_cur_max > 1) + || token.type == COMPLEX_BRACKET); #endif dfa->nexts[dfa->nodes_len] = REG_MISSING; re_node_set_init_empty (dfa->edests + dfa->nodes_len); @@ -1459,7 +1458,7 @@ re_dfa_add_node (re_dfa_t *dfa, re_token_t token) return dfa->nodes_len++; } -static inline re_hashval_t +static re_hashval_t internal_function calc_state_hash (const re_node_set *nodes, unsigned int context) { diff --git a/lib/regex_internal.h b/lib/regex_internal.h index aa35ed90..8e720218 100644 --- a/lib/regex_internal.h +++ b/lib/regex_internal.h @@ -1,20 +1,21 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002-2012 Free Software Foundation, Inc. + Copyright (C) 2002-2013 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. - This 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. + 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/>. */ #ifndef _REGEX_INTERNAL_H #define _REGEX_INTERNAL_H 1 @@ -26,9 +27,6 @@ #include <string.h> #include <langinfo.h> -#ifndef _LIBC -# include "localcharset.h" -#endif #include <locale.h> #include <wchar.h> #include <wctype.h> @@ -37,7 +35,6 @@ #if defined _LIBC # include <bits/libc-lock.h> #else -# define __libc_lock_define(CLASS,NAME) # define __libc_lock_init(NAME) do { } while (0) # define __libc_lock_lock(NAME) do { } while (0) # define __libc_lock_unlock(NAME) do { } while (0) @@ -63,7 +60,7 @@ # ifdef _LIBC # undef gettext # define gettext(msgid) \ - INTUSE(__dcgettext) (_libc_intl_domainname, msgid, LC_MESSAGES) + __dcgettext (_libc_intl_domainname, msgid, LC_MESSAGES) # endif #else # define gettext(msgid) (msgid) @@ -83,9 +80,6 @@ # define BE(expr, val) __builtin_expect (expr, val) #else # define BE(expr, val) (expr) -# ifdef _LIBC -# define inline -# endif #endif /* Number of ASCII characters. */ @@ -102,6 +96,8 @@ /* Rename to standard API for using out of glibc. */ #ifndef _LIBC +# undef __wctype +# undef __iswctype # define __wctype wctype # define __iswctype iswctype # define __btowc btowc @@ -449,7 +445,9 @@ static unsigned int re_string_context_at (const re_string_t *input, Idx idx, #define re_string_skip_bytes(pstr,idx) ((pstr)->cur_idx += (idx)) #define re_string_set_index(pstr,idx) ((pstr)->cur_idx = (idx)) -#include <alloca.h> +#if defined _LIBC || HAVE_ALLOCA +# include <alloca.h> +#endif #ifndef _LIBC # if HAVE_ALLOCA @@ -466,6 +464,12 @@ static unsigned int re_string_context_at (const re_string_t *input, Idx idx, # endif #endif +#ifdef _LIBC +# define MALLOC_0_IS_NONNULL 1 +#elif !defined MALLOC_0_IS_NONNULL +# define MALLOC_0_IS_NONNULL 0 +#endif + #ifndef MAX # define MAX(a,b) ((a) < (b) ? (b) : (a)) #endif @@ -696,7 +700,9 @@ struct re_dfa_t #ifdef DEBUG char* re_str; #endif +#ifdef _LIBC __libc_lock_define (, lock) +#endif }; #define re_node_set_init_empty(set) memset (set, '\0', sizeof (re_node_set)) @@ -727,33 +733,33 @@ typedef struct } bracket_elem_t; -/* Inline functions for bitset_t operation. */ +/* Functions for bitset_t operation. */ -static inline void +static void bitset_set (bitset_t set, Idx i) { set[i / BITSET_WORD_BITS] |= (bitset_word_t) 1 << i % BITSET_WORD_BITS; } -static inline void +static void bitset_clear (bitset_t set, Idx i) { set[i / BITSET_WORD_BITS] &= ~ ((bitset_word_t) 1 << i % BITSET_WORD_BITS); } -static inline bool +static bool bitset_contain (const bitset_t set, Idx i) { return (set[i / BITSET_WORD_BITS] >> i % BITSET_WORD_BITS) & 1; } -static inline void +static void bitset_empty (bitset_t set) { memset (set, '\0', sizeof (bitset_t)); } -static inline void +static void bitset_set_all (bitset_t set) { memset (set, -1, sizeof (bitset_word_t) * (SBC_MAX / BITSET_WORD_BITS)); @@ -762,13 +768,13 @@ bitset_set_all (bitset_t set) ((bitset_word_t) 1 << SBC_MAX % BITSET_WORD_BITS) - 1; } -static inline void +static void bitset_copy (bitset_t dest, const bitset_t src) { memcpy (dest, src, sizeof (bitset_t)); } -static inline void +static void bitset_not (bitset_t set) { int bitset_i; @@ -780,7 +786,7 @@ bitset_not (bitset_t set) & ~set[BITSET_WORDS - 1]); } -static inline void +static void bitset_merge (bitset_t dest, const bitset_t src) { int bitset_i; @@ -788,7 +794,7 @@ bitset_merge (bitset_t dest, const bitset_t src) dest[bitset_i] |= src[bitset_i]; } -static inline void +static void bitset_mask (bitset_t dest, const bitset_t src) { int bitset_i; @@ -797,8 +803,8 @@ bitset_mask (bitset_t dest, const bitset_t src) } #ifdef RE_ENABLE_I18N -/* Inline functions for re_string. */ -static inline int +/* Functions for re_string. */ +static int internal_function __attribute ((pure)) re_string_char_size_at (const re_string_t *pstr, Idx idx) { @@ -811,7 +817,7 @@ re_string_char_size_at (const re_string_t *pstr, Idx idx) return byte_idx; } -static inline wint_t +static wint_t internal_function __attribute ((pure)) re_string_wchar_at (const re_string_t *pstr, Idx idx) { diff --git a/lib/regexec.c b/lib/regexec.c index 5461bf6d..6be6d7e4 100644 --- a/lib/regexec.c +++ b/lib/regexec.c @@ -1,20 +1,21 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002-2012 Free Software Foundation, Inc. + Copyright (C) 2002-2013 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. - This 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. + 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/>. */ #include "verify.h" #include "intprops.h" @@ -200,7 +201,7 @@ static Idx group_nodes_into_DFAstates (const re_dfa_t *dfa, static bool check_node_accept (const re_match_context_t *mctx, const re_token_t *node, Idx idx) internal_function; -static reg_errcode_t extend_buffers (re_match_context_t *mctx) +static reg_errcode_t extend_buffers (re_match_context_t *mctx, int min_len) internal_function; /* Entry point for POSIX code. */ @@ -481,7 +482,7 @@ re_search_stub (struct re_pattern_buffer *bufp, rval = 0; - /* I hope we needn't fill ther regs with -1's when no match was found. */ + /* I hope we needn't fill their regs with -1's when no match was found. */ if (result != REG_NOERROR) rval = result == REG_NOMATCH ? -1 : -2; else if (regs != NULL) @@ -743,7 +744,7 @@ re_search_internal (const regex_t *preg, mctx.input.tip_context = (eflags & REG_NOTBOL) ? CONTEXT_BEGBUF : CONTEXT_NEWLINE | CONTEXT_BEGBUF; - /* Check incrementally whether of not the input string match. */ + /* Check incrementally whether the input string matches. */ incr = (last_start < start) ? -1 : 1; left_lim = (last_start < start) ? last_start : start; right_lim = (last_start < start) ? start : last_start; @@ -1183,7 +1184,7 @@ check_matching (re_match_context_t *mctx, bool fl_longest_match, || (BE (next_char_idx >= mctx->input.valid_len, 0) && mctx->input.valid_len < mctx->input.len)) { - err = extend_buffers (mctx); + err = extend_buffers (mctx, next_char_idx + 1); if (BE (err != REG_NOERROR, 0)) { assert (err == REG_ESPACE); @@ -1763,7 +1764,7 @@ clean_state_log_if_needed (re_match_context_t *mctx, Idx next_state_log_idx) && mctx->input.valid_len < mctx->input.len)) { reg_errcode_t err; - err = extend_buffers (mctx); + err = extend_buffers (mctx, next_state_log_idx + 1); if (BE (err != REG_NOERROR, 0)) return err; } @@ -2820,7 +2821,7 @@ get_subexp (re_match_context_t *mctx, Idx bkref_node, Idx bkref_str_idx) if (bkref_str_off >= mctx->input.len) break; - err = extend_buffers (mctx); + err = extend_buffers (mctx, bkref_str_off + 1); if (BE (err != REG_NOERROR, 0)) return err; @@ -3943,6 +3944,7 @@ check_node_accept_bytes (const re_dfa_t *dfa, Idx node_idx, in_collseq = find_collation_sequence_value (pin, elem_len); } /* match with range expression? */ + /* FIXME: Implement rational ranges here, too. */ for (i = 0; i < cset->nranges; ++i) if (cset->range_starts[i] <= in_collseq && in_collseq <= cset->range_ends[i]) @@ -3994,18 +3996,9 @@ check_node_accept_bytes (const re_dfa_t *dfa, Idx node_idx, # endif /* _LIBC */ { /* match with range expression? */ -#if __GNUC__ >= 2 && ! (__STDC_VERSION__ < 199901L && defined __STRICT_ANSI__) - wchar_t cmp_buf[] = {L'\0', L'\0', wc, L'\0', L'\0', L'\0'}; -#else - wchar_t cmp_buf[] = {L'\0', L'\0', L'\0', L'\0', L'\0', L'\0'}; - cmp_buf[2] = wc; -#endif for (i = 0; i < cset->nranges; ++i) { - cmp_buf[0] = cset->range_starts[i]; - cmp_buf[4] = cset->range_ends[i]; - if (wcscoll (cmp_buf, cmp_buf + 2) <= 0 - && wcscoll (cmp_buf + 2, cmp_buf + 4) <= 0) + if (cset->range_starts[i] <= wc && wc <= cset->range_ends[i]) { match_len = char_len; goto check_node_accept_bytes_match; @@ -4143,7 +4136,7 @@ check_node_accept (const re_match_context_t *mctx, const re_token_t *node, static reg_errcode_t internal_function __attribute_warn_unused_result__ -extend_buffers (re_match_context_t *mctx) +extend_buffers (re_match_context_t *mctx, int min_len) { reg_errcode_t ret; re_string_t *pstr = &mctx->input; @@ -4153,8 +4146,10 @@ extend_buffers (re_match_context_t *mctx) <= pstr->bufs_len, 0)) return REG_ESPACE; - /* Double the lengths of the buffers. */ - ret = re_string_realloc_buffers (pstr, MIN (pstr->len, pstr->bufs_len * 2)); + /* Double the lengths of the buffers, but allocate at least MIN_LEN. */ + ret = re_string_realloc_buffers (pstr, + MAX (min_len, + MIN (pstr->len, pstr->bufs_len * 2))); if (BE (ret != REG_NOERROR, 0)) return ret; diff --git a/lib/remove.c b/lib/remove.c index 6ce5a872..020fdab8 100644 --- a/lib/remove.c +++ b/lib/remove.c @@ -1,5 +1,5 @@ /* Remove a file or directory. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/rename.c b/lib/rename.c index 4ebfc313..3e463ea8 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-2012 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 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 diff --git a/lib/rewinddir.c b/lib/rewinddir.c index 38414175..d842f8ce 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-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/rmdir.c b/lib/rmdir.c index 50170645..a8d907eb 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-2012 Free Software + Copyright (C) 1988, 1990, 1999, 2003-2006, 2009-2013 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 2901d6dd..96e3a624 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-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/root-dev-ino.h b/lib/root-dev-ino.h index 7ca1df68..1a0f8ff4 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-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/root-uid.h b/lib/root-uid.h new file mode 100644 index 00000000..c75d8889 --- /dev/null +++ b/lib/root-uid.h @@ -0,0 +1,30 @@ +/* The user ID that always has appropriate privileges in the POSIX sense. + + Copyright 2012-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 Paul Eggert. */ + +#ifndef ROOT_UID_H_ +#define ROOT_UID_H_ + +/* The user ID that always has appropriate privileges in the POSIX sense. */ +#ifdef __TANDEM +# define ROOT_UID 65535 +#else +# define ROOT_UID 0 +#endif + +#endif diff --git a/lib/rpmatch.c b/lib/rpmatch.c index f065036b..cf125238 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-2012 Free Software + Copyright (C) 1996, 1998, 2000, 2002-2003, 2006-2013 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/safe-read.c b/lib/safe-read.c index 25a4e2f3..6a48c0cc 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-2012 Free Software + Copyright (C) 1993-1994, 1998, 2002-2006, 2009-2013 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 09468147..992b7a6a 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-2012 Free Software Foundation, Inc. + Copyright (C) 2002, 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 @@ -17,7 +17,7 @@ /* Some system calls may be interrupted and fail with errno = EINTR in the following situations: - The process is stopped and restarted (signal SIGSTOP and SIGCONT, user - types Ctrl-Z) on some platforms: MacOS X. + types Ctrl-Z) on some platforms: Mac OS X. - The process receives a signal for which a signal handler was installed with sigaction() with an sa_flags field that does not contain SA_RESTART. diff --git a/lib/safe-write.c b/lib/safe-write.c index 37d18703..fed363ce 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-2012 Free Software Foundation, Inc. + Copyright (C) 2002, 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 diff --git a/lib/safe-write.h b/lib/safe-write.h index 5c4ef381..30f6e799 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-2012 Free Software Foundation, Inc. + Copyright (C) 2002, 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 @@ -17,7 +17,7 @@ /* Some system calls may be interrupted and fail with errno = EINTR in the following situations: - The process is stopped and restarted (signal SIGSTOP and SIGCONT, user - types Ctrl-Z) on some platforms: MacOS X. + types Ctrl-Z) on some platforms: Mac OS X. - The process receives a signal for which a signal handler was installed with sigaction() with an sa_flags field that does not contain SA_RESTART. diff --git a/lib/same-inode.h b/lib/same-inode.h index 8c3900d0..3843b070 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/lib/same.c b/lib/same.c index 604278f0..5457f218 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-2012 Free Software Foundation, Inc. + Copyright (C) 1997-2000, 2002-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 diff --git a/lib/same.h b/lib/same.h index 126aae81..9a686060 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-2012 Free Software Foundation, Inc. + Copyright (C) 1997-2000, 2003-2004, 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 diff --git a/lib/save-cwd.c b/lib/save-cwd.c index 592d274e..9ae37b08 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-2012 Free Software + Copyright (C) 1995, 1997-1998, 2003-2006, 2009-2013 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 0c875da2..614b035e 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-2012 Free Software Foundation, + Copyright (C) 1995, 1997-1998, 2003, 2009-2013 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 95dc6c67..6d5ed7f4 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-2012 Free Software + Copyright (C) 1990, 1997-2001, 2003-2006, 2009-2013 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/savedir.h b/lib/savedir.h index aeb392c3..eedb0c45 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-2012 Free Software + Copyright (C) 1997, 1999, 2001, 2003, 2005, 2009-2013 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/savewd.c b/lib/savewd.c index c5aec365..728bc8a7 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-2012 Free Software Foundation, Inc. + Copyright (C) 2006-2007, 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 @@ -19,6 +19,8 @@ #include <config.h> +#define SAVEWD_INLINE _GL_EXTERN_INLINE + #include "savewd.h" #include <assert.h> @@ -254,7 +256,7 @@ savewd_finish (struct savewd *wd) This is why savewd_chdir is broken out into another function; savewd_chdir's callers _can_ inspect the file system to decide whether to call savewd_chdir. */ -static inline bool +static bool savewd_delegating (struct savewd const *wd) { return wd->state == FORKING_STATE && 0 < wd->val.child; diff --git a/lib/savewd.h b/lib/savewd.h index 06cc6c10..61912bc9 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 @@ -23,6 +23,11 @@ #include <stdbool.h> #include <sys/types.h> +_GL_INLINE_HEADER_BEGIN +#ifndef SAVEWD_INLINE +# define SAVEWD_INLINE _GL_INLINE +#endif + /* A saved working directory. The member names and constants defined by this structure are private to the savewd module. */ struct savewd @@ -67,7 +72,7 @@ struct savewd }; /* Initialize a saved working directory object. */ -static inline void +SAVEWD_INLINE void savewd_init (struct savewd *wd) { wd->state = INITIAL_STATE; @@ -117,7 +122,7 @@ int savewd_chdir (struct savewd *wd, char const *dir, int options, int savewd_restore (struct savewd *wd, int status); /* Return WD's error number, or 0 if WD is not in an error state. */ -static inline int +SAVEWD_INLINE int savewd_errno (struct savewd const *wd) { return (wd->state == ERROR_STATE ? wd->val.errnum : 0); @@ -145,4 +150,6 @@ int savewd_process_files (int n_files, char **file, int (*act) (char *, struct savewd *, void *), void *options); +_GL_INLINE_HEADER_END + #endif diff --git a/lib/sched.in.h b/lib/sched.in.h index bca67636..731e800f 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-2012 Free Software Foundation, Inc. + 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 @@ -32,7 +32,7 @@ /* Get pid_t. This is needed on glibc 2.11 (see glibc bug <http://sourceware.org/bugzilla/show_bug.cgi?id=13198>) - and MacOS X 10.5. */ + and Mac OS X 10.5. */ #include <sys/types.h> #if !@HAVE_STRUCT_SCHED_PARAM@ diff --git a/lib/se-context.c b/lib/se-context.c new file mode 100644 index 00000000..2e5aa131 --- /dev/null +++ b/lib/se-context.c @@ -0,0 +1,3 @@ +#include <config.h> +#define SE_CONTEXT_INLINE _GL_EXTERN_INLINE +#include <selinux/context.h> diff --git a/lib/se-context.in.h b/lib/se-context.in.h index cb7419a5..a692f5a0 100644 --- a/lib/se-context.in.h +++ b/lib/se-context.in.h @@ -3,26 +3,33 @@ # include <errno.h> +_GL_INLINE_HEADER_BEGIN +#ifndef SE_CONTEXT_INLINE +# define SE_CONTEXT_INLINE _GL_INLINE +#endif + /* The definition of _GL_UNUSED_PARAMETER is copied here. */ typedef int context_t; -static inline context_t context_new (char const *s _GL_UNUSED_PARAMETER) +SE_CONTEXT_INLINE context_t context_new (char const *s _GL_UNUSED_PARAMETER) { errno = ENOTSUP; return 0; } -static inline char *context_str (context_t con _GL_UNUSED_PARAMETER) +SE_CONTEXT_INLINE char *context_str (context_t con _GL_UNUSED_PARAMETER) { errno = ENOTSUP; return (void *) 0; } -static inline void context_free (context_t c _GL_UNUSED_PARAMETER) {} +SE_CONTEXT_INLINE void context_free (context_t c _GL_UNUSED_PARAMETER) {} -static inline int context_user_set (context_t sc _GL_UNUSED_PARAMETER, - char const *s _GL_UNUSED_PARAMETER) +SE_CONTEXT_INLINE int context_user_set (context_t sc _GL_UNUSED_PARAMETER, + char const *s _GL_UNUSED_PARAMETER) { errno = ENOTSUP; return -1; } -static inline int context_role_set (context_t sc _GL_UNUSED_PARAMETER, - char const *s _GL_UNUSED_PARAMETER) +SE_CONTEXT_INLINE int context_role_set (context_t sc _GL_UNUSED_PARAMETER, + char const *s _GL_UNUSED_PARAMETER) { errno = ENOTSUP; return -1; } -static inline int context_range_set (context_t sc _GL_UNUSED_PARAMETER, - char const *s _GL_UNUSED_PARAMETER) +SE_CONTEXT_INLINE int context_range_set (context_t sc _GL_UNUSED_PARAMETER, + char const *s _GL_UNUSED_PARAMETER) { errno = ENOTSUP; return -1; } -static inline int context_type_set (context_t sc _GL_UNUSED_PARAMETER, - char const *s _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; } +_GL_INLINE_HEADER_END + #endif diff --git a/lib/se-selinux.c b/lib/se-selinux.c new file mode 100644 index 00000000..ee4e57fc --- /dev/null +++ b/lib/se-selinux.c @@ -0,0 +1,3 @@ +#include <config.h> +#define SE_SELINUX_INLINE _GL_EXTERN_INLINE +#include <selinux/selinux.h> diff --git a/lib/se-selinux.in.h b/lib/se-selinux.in.h index 9e8d8d21..7f54f1e9 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-2012 Free Software Foundation, Inc. + 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 @@ -31,6 +31,11 @@ # include <sys/types.h> # include <errno.h> +_GL_INLINE_HEADER_BEGIN +# ifndef SE_SELINUX_INLINE +# define SE_SELINUX_INLINE _GL_INLINE +# endif + /* The definition of _GL_UNUSED_PARAMETER is copied here. */ # if !GNULIB_defined_security_types @@ -39,59 +44,71 @@ typedef unsigned short security_class_t; # define security_context_t char* # define is_selinux_enabled() 0 -static inline int getcon (security_context_t *con _GL_UNUSED_PARAMETER) +SE_SELINUX_INLINE int +getcon (security_context_t *con _GL_UNUSED_PARAMETER) { errno = ENOTSUP; return -1; } -static inline void freecon (security_context_t con _GL_UNUSED_PARAMETER) {} +SE_SELINUX_INLINE void +freecon (security_context_t con _GL_UNUSED_PARAMETER) {} - -static inline int getfscreatecon (security_context_t *con _GL_UNUSED_PARAMETER) +SE_SELINUX_INLINE int +getfscreatecon (security_context_t *con _GL_UNUSED_PARAMETER) { errno = ENOTSUP; return -1; } -static inline int setfscreatecon (security_context_t con _GL_UNUSED_PARAMETER) +SE_SELINUX_INLINE int +setfscreatecon (security_context_t con _GL_UNUSED_PARAMETER) { errno = ENOTSUP; return -1; } -static inline int matchpathcon (char const *file _GL_UNUSED_PARAMETER, - mode_t m _GL_UNUSED_PARAMETER, - security_context_t *con _GL_UNUSED_PARAMETER) +SE_SELINUX_INLINE int +matchpathcon (char const *file _GL_UNUSED_PARAMETER, + mode_t m _GL_UNUSED_PARAMETER, + security_context_t *con _GL_UNUSED_PARAMETER) { errno = ENOTSUP; return -1; } -static inline int getfilecon (char const *file _GL_UNUSED_PARAMETER, - security_context_t *con _GL_UNUSED_PARAMETER) +SE_SELINUX_INLINE int +getfilecon (char const *file _GL_UNUSED_PARAMETER, + security_context_t *con _GL_UNUSED_PARAMETER) { errno = ENOTSUP; return -1; } -static inline int lgetfilecon (char const *file _GL_UNUSED_PARAMETER, - security_context_t *con _GL_UNUSED_PARAMETER) +SE_SELINUX_INLINE int +lgetfilecon (char const *file _GL_UNUSED_PARAMETER, + security_context_t *con _GL_UNUSED_PARAMETER) { errno = ENOTSUP; return -1; } -static inline int fgetfilecon (int fd, - security_context_t *con _GL_UNUSED_PARAMETER) +SE_SELINUX_INLINE int +fgetfilecon (int fd, security_context_t *con _GL_UNUSED_PARAMETER) { errno = ENOTSUP; return -1; } -static inline int setfilecon (char const *file _GL_UNUSED_PARAMETER, - security_context_t con _GL_UNUSED_PARAMETER) +SE_SELINUX_INLINE int +setfilecon (char const *file _GL_UNUSED_PARAMETER, + security_context_t con _GL_UNUSED_PARAMETER) { errno = ENOTSUP; return -1; } -static inline int lsetfilecon (char const *file _GL_UNUSED_PARAMETER, - security_context_t con _GL_UNUSED_PARAMETER) +SE_SELINUX_INLINE int +lsetfilecon (char const *file _GL_UNUSED_PARAMETER, + security_context_t con _GL_UNUSED_PARAMETER) { errno = ENOTSUP; return -1; } -static inline int fsetfilecon (int fd _GL_UNUSED_PARAMETER, - security_context_t con _GL_UNUSED_PARAMETER) +SE_SELINUX_INLINE int +fsetfilecon (int fd _GL_UNUSED_PARAMETER, + security_context_t con _GL_UNUSED_PARAMETER) { errno = ENOTSUP; return -1; } -static inline int security_check_context - (security_context_t con _GL_UNUSED_PARAMETER) +SE_SELINUX_INLINE int +security_check_context (security_context_t con _GL_UNUSED_PARAMETER) { errno = ENOTSUP; return -1; } -static inline int security_check_context_raw - (security_context_t con _GL_UNUSED_PARAMETER) +SE_SELINUX_INLINE int +security_check_context_raw (security_context_t con _GL_UNUSED_PARAMETER) { errno = ENOTSUP; return -1; } -static inline int setexeccon (security_context_t con _GL_UNUSED_PARAMETER) +SE_SELINUX_INLINE int +setexeccon (security_context_t con _GL_UNUSED_PARAMETER) { errno = ENOTSUP; return -1; } -static inline int security_compute_create - (security_context_t scon _GL_UNUSED_PARAMETER, - security_context_t tcon _GL_UNUSED_PARAMETER, - security_class_t tclass _GL_UNUSED_PARAMETER, - security_context_t *newcon _GL_UNUSED_PARAMETER) +SE_SELINUX_INLINE int +security_compute_create (security_context_t scon _GL_UNUSED_PARAMETER, + security_context_t tcon _GL_UNUSED_PARAMETER, + security_class_t tclass _GL_UNUSED_PARAMETER, + security_context_t *newcon _GL_UNUSED_PARAMETER) { errno = ENOTSUP; return -1; } -static inline int matchpathcon_init_prefix - (char const *path _GL_UNUSED_PARAMETER, - char const *prefix _GL_UNUSED_PARAMETER) +SE_SELINUX_INLINE int +matchpathcon_init_prefix (char const *path _GL_UNUSED_PARAMETER, + char const *prefix _GL_UNUSED_PARAMETER) { errno = ENOTSUP; return -1; } # define GNULIB_defined_security_types 1 # endif +_GL_INLINE_HEADER_BEGIN + # endif #endif /* _@GUARD_PREFIX@_SELINUX_SELINUX_H */ diff --git a/lib/select.c b/lib/select.c index d1360f0d..c02558e1 100644 --- a/lib/select.c +++ b/lib/select.c @@ -1,7 +1,7 @@ /* Emulation for select(2) Contributed by Paolo Bonzini. - Copyright 2008-2012 Free Software Foundation, Inc. + Copyright 2008-2013 Free Software Foundation, Inc. This file is part of gnulib. @@ -385,6 +385,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; + +restart: if (wait_timeout == 0 || nsock == 0) rc = 0; else @@ -427,13 +431,44 @@ rpl_select (int nfds, fd_set *rfds, fd_set *wfds, fd_set *xfds, if (rc == 0 && nsock > 0) rc = select (0, &handle_rfds, &handle_wfds, &handle_xfds, &tv0); + if (nhandles > 1) + { + /* Count results that are not counted in the return value of select. */ + nhandles = 1; + for (i = 0; i < nfds; i++) + { + if ((anyfds_in[i / CHAR_BIT] & (1 << (i & (CHAR_BIT - 1)))) == 0) + continue; + + h = (HANDLE) _get_osfhandle (i); + if (h == handle_array[nhandles]) + { + /* Not a socket. */ + nhandles++; + windows_poll_handle (h, i, &rbits, &wbits, &xbits); + if (rbits.out[i / CHAR_BIT] & (1 << (i & (CHAR_BIT - 1))) + || wbits.out[i / CHAR_BIT] & (1 << (i & (CHAR_BIT - 1))) + || xbits.out[i / CHAR_BIT] & (1 << (i & (CHAR_BIT - 1)))) + rc++; + } + } + + if (rc == 0 && wait_timeout == INFINITE) + { + /* Sleep 1 millisecond to avoid busy wait and retry with the + original fd_sets. */ + memcpy (&handle_rfds, rfds, sizeof (fd_set)); + memcpy (&handle_wfds, wfds, sizeof (fd_set)); + memcpy (&handle_xfds, xfds, sizeof (fd_set)); + SleepEx (1, TRUE); + goto restart; + } + } + /* Now fill in the results. */ FD_ZERO (rfds); FD_ZERO (wfds); FD_ZERO (xfds); - - /* Place a sentinel at the end of the array. */ - handle_array[nhandles] = NULL; nhandles = 1; for (i = 0; i < nfds; i++) { @@ -443,8 +478,7 @@ rpl_select (int nfds, fd_set *rfds, fd_set *wfds, fd_set *xfds, h = (HANDLE) _get_osfhandle (i); if (h != handle_array[nhandles]) { - /* Perform handle->descriptor mapping. Don't update rc, as these - results are counted in the return value of Winsock's select. */ + /* Perform handle->descriptor mapping. */ WSAEventSelect ((SOCKET) h, NULL, 0); if (FD_ISSET (h, &handle_rfds)) FD_SET (i, rfds); @@ -457,22 +491,12 @@ rpl_select (int nfds, fd_set *rfds, fd_set *wfds, fd_set *xfds, { /* Not a socket. */ nhandles++; - windows_poll_handle (h, i, &rbits, &wbits, &xbits); if (rbits.out[i / CHAR_BIT] & (1 << (i & (CHAR_BIT - 1)))) - { - rc++; - FD_SET (i, rfds); - } + FD_SET (i, rfds); if (wbits.out[i / CHAR_BIT] & (1 << (i & (CHAR_BIT - 1)))) - { - rc++; - FD_SET (i, wfds); - } + FD_SET (i, wfds); if (xbits.out[i / CHAR_BIT] & (1 << (i & (CHAR_BIT - 1)))) - { - rc++; - FD_SET (i, xfds); - } + FD_SET (i, xfds); } } @@ -482,6 +506,9 @@ rpl_select (int nfds, fd_set *rfds, fd_set *wfds, fd_set *xfds, #else /* ! Native Windows. */ #include <sys/select.h> +#include <stddef.h> /* NULL */ +#include <errno.h> +#include <unistd.h> #undef select @@ -489,6 +516,23 @@ int rpl_select (int nfds, fd_set *rfds, fd_set *wfds, fd_set *xfds, struct timeval *timeout) { + int i; + + /* FreeBSD 8.2 has a bug: it does not always detect invalid fds. */ + if (nfds < 0 || nfds > FD_SETSIZE) + { + errno = EINVAL; + return -1; + } + for (i = 0; i < nfds; i++) + { + if (((rfds && FD_ISSET (i, rfds)) + || (wfds && FD_ISSET (i, wfds)) + || (xfds && FD_ISSET (i, xfds))) + && dup2 (i, i) != i) + return -1; + } + /* Interix 3.5 has a bug: it does not support nfds == 0. */ if (nfds == 0) { diff --git a/lib/selinux-at.c b/lib/selinux-at.c index f1c89d5f..386763f7 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-2012 Free Software Foundation, Inc. + Copyright (C) 2007, 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 diff --git a/lib/selinux-at.h b/lib/selinux-at.h index 87b0503d..a01ffeb6 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-2012 Free Software Foundation, Inc. + Copyright (C) 2007, 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 diff --git a/lib/set-mode-acl.c b/lib/set-mode-acl.c index 25a1eeee..35fe2a81 100644 --- a/lib/set-mode-acl.c +++ b/lib/set-mode-acl.c @@ -1,6 +1,6 @@ /* set-mode-acl.c - set access control list equivalent to a mode - Copyright (C) 2002-2003, 2005-2012 Free Software Foundation, Inc. + Copyright (C) 2002-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 @@ -19,6 +19,8 @@ #include <config.h> +#define ACL_INTERNAL_INLINE _GL_EXTERN_INLINE + #include "acl.h" #include "acl-internal.h" @@ -56,7 +58,7 @@ qset_acl (char const *name, int desc, mode_t mode) #if USE_ACL # if HAVE_ACL_GET_FILE /* POSIX 1003.1e draft 17 (abandoned) specific version. */ - /* Linux, FreeBSD, MacOS X, IRIX, Tru64 */ + /* Linux, FreeBSD, Mac OS X, IRIX, Tru64 */ # if !HAVE_ACL_TYPE_EXTENDED /* Linux, FreeBSD, IRIX, Tru64 */ @@ -141,19 +143,19 @@ qset_acl (char const *name, int desc, mode_t mode) return 0; # else /* HAVE_ACL_TYPE_EXTENDED */ - /* MacOS X */ + /* Mac OS X */ - /* On MacOS X, acl_get_file (name, ACL_TYPE_ACCESS) - and acl_get_file (name, ACL_TYPE_DEFAULT) + /* 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, ...)) + 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) + 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): + acl_set_file (name, ACL_TYPE_EXTENDED, acl): Each of these calls sets the file's ACL. */ acl_t acl; diff --git a/lib/setenv.c b/lib/setenv.c index 8201be2e..d7851a8b 100644 --- a/lib/setenv.c +++ b/lib/setenv.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992, 1995-2003, 2005-2012 Free Software Foundation, Inc. +/* Copyright (C) 1992, 1995-2003, 2005-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 diff --git a/lib/settime.c b/lib/settime.c index 04f241d0..a61333f2 100644 --- a/lib/settime.c +++ b/lib/settime.c @@ -1,6 +1,6 @@ /* settime -- set the system clock - Copyright (C) 2002, 2004-2007, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 2002, 2004-2007, 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 diff --git a/lib/sha1.c b/lib/sha1.c index e68eb746..778389af 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-2012 Free Software Foundation, Inc. + Copyright (C) 2000-2001, 2003-2006, 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 @@ -70,7 +70,7 @@ sha1_init_ctx (struct sha1_ctx *ctx) /* Copy the 4 byte value from v into the memory location pointed to by *cp, If your architecture allows unaligned access this is equivalent to * (uint32_t *) cp = v */ -static inline void +static void set_uint32 (char *cp, uint32_t v) { memcpy (cp, &v, sizeof v); @@ -305,13 +305,13 @@ sha1_process_block (const void *buffer, size_t len, struct sha1_ctx *ctx) uint32_t c = ctx->C; uint32_t d = ctx->D; uint32_t e = ctx->E; + uint32_t lolen = len; /* First increment the byte count. RFC 1321 specifies the possible length of the file up to 2^64 bits. Here we only compute the number of bytes. Do a double word increment. */ - ctx->total[0] += len; - if (ctx->total[0] < len) - ++ctx->total[1]; + ctx->total[0] += lolen; + ctx->total[1] += (len >> 31 >> 1) + (ctx->total[0] < lolen); #define rol(x, n) (((x) << (n)) | ((uint32_t) (x) >> (32 - (n)))) diff --git a/lib/sha1.h b/lib/sha1.h index 0d9ced02..ddd386f9 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-2012 Free Software + Copyright (C) 2000-2001, 2003, 2005-2006, 2008-2013 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it diff --git a/lib/sha256.c b/lib/sha256.c index c1482d3c..4b2cee37 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-2012 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 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 @@ -90,7 +90,7 @@ sha224_init_ctx (struct sha256_ctx *ctx) /* Copy the value from v into the memory location pointed to by *cp, If your architecture allows unaligned access this is equivalent to * (uint32_t *) cp = v */ -static inline void +static void set_uint32 (char *cp, uint32_t v) { memcpy (cp, &v, sizeof v); @@ -454,13 +454,13 @@ sha256_process_block (const void *buffer, size_t len, struct sha256_ctx *ctx) uint32_t f = ctx->state[5]; uint32_t g = ctx->state[6]; uint32_t h = ctx->state[7]; + uint32_t lolen = len; /* First increment the byte count. FIPS PUB 180-2 specifies the possible length of the file up to 2^64 bits. Here we only compute the number of bytes. Do a double word increment. */ - ctx->total[0] += len; - if (ctx->total[0] < len) - ++ctx->total[1]; + ctx->total[0] += lolen; + ctx->total[1] += (len >> 31 >> 1) + (ctx->total[0] < lolen); #define rol(x, n) (((x) << (n)) | ((x) >> (32 - (n)))) #define S0(x) (rol(x,25)^rol(x,14)^(x>>3)) diff --git a/lib/sha256.h b/lib/sha256.h index d69b83fc..7e625228 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-2012 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 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 diff --git a/lib/sha512.c b/lib/sha512.c index 0c0779c3..79f11257 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-2012 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 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 @@ -97,7 +97,7 @@ sha384_init_ctx (struct sha512_ctx *ctx) /* Copy the value from V into the memory location pointed to by *CP, If your architecture allows unaligned access, this is equivalent to * (__typeof__ (v) *) cp = v */ -static inline void +static void set_uint64 (char *cp, u64 v) { memcpy (cp, &v, sizeof v); @@ -485,13 +485,15 @@ sha512_process_block (const void *buffer, size_t len, struct sha512_ctx *ctx) u64 f = ctx->state[5]; u64 g = ctx->state[6]; u64 h = ctx->state[7]; + u64 lolen = u64size (len); /* First increment the byte count. FIPS PUB 180-2 specifies the possible length of the file up to 2^128 bits. Here we only compute the number of bytes. Do a double word increment. */ - ctx->total[0] = u64plus (ctx->total[0], u64lo (len)); - if (u64lt (ctx->total[0], u64lo (len))) - ctx->total[1] = u64plus (ctx->total[1], u64lo (1)); + ctx->total[0] = u64plus (ctx->total[0], lolen); + ctx->total[1] = u64plus (ctx->total[1], + u64plus (u64size (len >> 31 >> 31 >> 2), + u64lo (u64lt (ctx->total[0], lolen)))); #define S0(x) u64xor (u64rol(x, 63), u64xor (u64rol (x, 56), u64shr (x, 7))) #define S1(x) u64xor (u64rol (x, 45), u64xor (u64rol (x, 3), u64shr (x, 6))) diff --git a/lib/sha512.h b/lib/sha512.h index ddf91d6c..2e78a5f9 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-2012 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 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 diff --git a/lib/sig-handler.c b/lib/sig-handler.c new file mode 100644 index 00000000..52c36217 --- /dev/null +++ b/lib/sig-handler.c @@ -0,0 +1,3 @@ +#include <config.h> +#define SIG_HANDLER_INLINE _GL_EXTERN_INLINE +#include "sig-handler.h" diff --git a/lib/sig-handler.h b/lib/sig-handler.h index 386135f7..ca9f979c 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-2012 Free Software Foundation, Inc. + 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 @@ -20,13 +20,18 @@ #include <signal.h> +_GL_INLINE_HEADER_BEGIN +#ifndef SIG_HANDLER_INLINE +# define SIG_HANDLER_INLINE _GL_INLINE +#endif + /* Convenience type when working with signal handlers. */ typedef void (*sa_handler_t) (int); /* Return the handler of a signal, as a sa_handler_t value regardless of its true type. The resulting function can be compared to special values like SIG_IGN but it is not portable to call it. */ -static inline sa_handler_t +SIG_HANDLER_INLINE sa_handler_t get_handler (struct sigaction const *a) { #ifdef SA_SIGINFO @@ -41,4 +46,6 @@ get_handler (struct sigaction const *a) return a->sa_handler; } +_GL_INLINE_HEADER_END + #endif /* _GL_SIG_HANDLER_H */ diff --git a/lib/sig2str.c b/lib/sig2str.c index 2f5b21cc..8b36e2fa 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-2012 Free Software Foundation, Inc. + Copyright (C) 2002, 2004, 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 diff --git a/lib/sig2str.h b/lib/sig2str.h index 75eff7d7..d16be98c 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-2012 Free Software Foundation, Inc. + Copyright (C) 2002, 2005, 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 diff --git a/lib/sigaction.c b/lib/sigaction.c index 659c4ec5..97eb76d9 100644 --- a/lib/sigaction.c +++ b/lib/sigaction.c @@ -1,5 +1,5 @@ /* POSIX compatible signal blocking. - Copyright (C) 2008-2012 Free Software Foundation, Inc. + Copyright (C) 2008-2013 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 8af14783..7817c95b 100644 --- a/lib/siglist.h +++ b/lib/siglist.h @@ -1,5 +1,5 @@ /* Canonical list of all signal names. - Copyright (C) 1996-1999, 2008-2012 Free Software Foundation, Inc. + Copyright (C) 1996-1999, 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 diff --git a/lib/signal.in.h b/lib/signal.in.h index e0f0554b..54849504 100644 --- a/lib/signal.in.h +++ b/lib/signal.in.h @@ -1,6 +1,6 @@ /* A GNU-like <signal.h>. - Copyright (C) 2006-2012 Free Software Foundation, Inc. + Copyright (C) 2006-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 @@ -55,7 +55,7 @@ #ifndef _@GUARD_PREFIX@_SIGNAL_H #define _@GUARD_PREFIX@_SIGNAL_H -/* MacOS X 10.3, FreeBSD 6.4, OpenBSD 3.8, OSF/1 4.0, Solaris 2.6 declare +/* Mac OS X 10.3, FreeBSD 6.4, OpenBSD 3.8, OSF/1 4.0, Solaris 2.6 declare pthread_sigmask in <pthread.h>, not in <signal.h>. But avoid namespace pollution on glibc systems.*/ #if (@GNULIB_PTHREAD_SIGMASK@ || defined GNULIB_POSIXCHECK) \ @@ -197,7 +197,7 @@ typedef int verify_NSIG_constraint[NSIG <= 32 ? 1 : -1]; /* Test whether a given signal is contained in a signal set. */ # if @HAVE_POSIX_SIGNALBLOCKING@ -/* This function is defined as a macro on MacOS X. */ +/* This function is defined as a macro on Mac OS X. */ # if defined __cplusplus && defined GNULIB_NAMESPACE # undef sigismember # endif @@ -210,7 +210,7 @@ _GL_CXXALIASWARN (sigismember); /* Initialize a signal set to the empty set. */ # if @HAVE_POSIX_SIGNALBLOCKING@ -/* This function is defined as a macro on MacOS X. */ +/* This function is defined as a macro on Mac OS X. */ # if defined __cplusplus && defined GNULIB_NAMESPACE # undef sigemptyset # endif @@ -222,7 +222,7 @@ _GL_CXXALIASWARN (sigemptyset); /* Add a signal to a signal set. */ # if @HAVE_POSIX_SIGNALBLOCKING@ -/* This function is defined as a macro on MacOS X. */ +/* This function is defined as a macro on Mac OS X. */ # if defined __cplusplus && defined GNULIB_NAMESPACE # undef sigaddset # endif @@ -235,7 +235,7 @@ _GL_CXXALIASWARN (sigaddset); /* Remove a signal from a signal set. */ # if @HAVE_POSIX_SIGNALBLOCKING@ -/* This function is defined as a macro on MacOS X. */ +/* This function is defined as a macro on Mac OS X. */ # if defined __cplusplus && defined GNULIB_NAMESPACE # undef sigdelset # endif @@ -248,7 +248,7 @@ _GL_CXXALIASWARN (sigdelset); /* Fill a signal set with all possible signals. */ # if @HAVE_POSIX_SIGNALBLOCKING@ -/* This function is defined as a macro on MacOS X. */ +/* This function is defined as a macro on Mac OS X. */ # if defined __cplusplus && defined GNULIB_NAMESPACE # undef sigfillset # endif diff --git a/lib/signbitd.c b/lib/signbitd.c index 7629ff50..7a434f8e 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/lib/signbitf.c b/lib/signbitf.c index f99f9920..f133be57 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-2012 Free Software Foundation, Inc. + Copyright (C) 2007, 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 diff --git a/lib/signbitl.c b/lib/signbitl.c index 35afcf1a..9e1e900e 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-2012 Free Software Foundation, Inc. + Copyright (C) 2007, 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 diff --git a/lib/sigprocmask.c b/lib/sigprocmask.c index be53d540..8de3777d 100644 --- a/lib/sigprocmask.c +++ b/lib/sigprocmask.c @@ -1,5 +1,5 @@ /* POSIX compatible signal blocking. - Copyright (C) 2006-2012 Free Software Foundation, Inc. + Copyright (C) 2006-2013 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2006. This program is free software: you can redistribute it and/or modify @@ -63,7 +63,7 @@ typedef void (*handler_t) (int); #if HAVE_MSVC_INVALID_PARAMETER_HANDLER -static inline handler_t +static handler_t signal_nothrow (int sig, handler_t handler) { handler_t result; diff --git a/lib/size_max.h b/lib/size_max.h index 96424419..5f331240 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-2012 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2013 Free Software Foundation, Inc. Written by Simon Josefsson. This program is free software; you can redistribute it and/or modify diff --git a/lib/snprintf.c b/lib/snprintf.c index 39084427..9c4ab3f2 100644 --- a/lib/snprintf.c +++ b/lib/snprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 2004, 2006-2012 Free Software Foundation, Inc. + Copyright (C) 2004, 2006-2013 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 3daec454..ae961482 100644 --- a/lib/sockets.c +++ b/lib/sockets.c @@ -1,6 +1,6 @@ /* sockets.c --- wrappers for Windows socket functions - Copyright (C) 2008-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/sockets.h b/lib/sockets.h index 2efa4136..1570ad84 100644 --- a/lib/sockets.h +++ b/lib/sockets.h @@ -1,6 +1,6 @@ /* sockets.h - wrappers for Windows socket functions - Copyright (C) 2008-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/spawn-pipe.c b/lib/spawn-pipe.c index fc7834d0..35567d4d 100644 --- a/lib/spawn-pipe.c +++ b/lib/spawn-pipe.c @@ -1,5 +1,5 @@ /* Creation of subprocesses, communicating via pipes. - Copyright (C) 2001-2004, 2006-2012 Free Software Foundation, Inc. + 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 @@ -60,7 +60,7 @@ 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 inline int +static int nonintr_close (int fd) { int retval; @@ -73,7 +73,8 @@ nonintr_close (int fd) } #define close nonintr_close -static inline int +#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +static int nonintr_open (const char *pathname, int oflag, mode_t mode) { int retval; @@ -84,8 +85,9 @@ nonintr_open (const char *pathname, int oflag, mode_t mode) return retval; } -#undef open /* avoid warning on VMS */ -#define open nonintr_open +# undef open /* avoid warning on VMS */ +# define open nonintr_open +#endif #endif diff --git a/lib/spawn-pipe.h b/lib/spawn-pipe.h index ea8ae8f0..ea8284f2 100644 --- a/lib/spawn-pipe.h +++ b/lib/spawn-pipe.h @@ -1,5 +1,5 @@ /* Creation of subprocesses, communicating via pipes. - Copyright (C) 2001-2003, 2006, 2008-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/spawn.in.h b/lib/spawn.in.h index 0f25d176..bca29981 100644 --- a/lib/spawn.in.h +++ b/lib/spawn.in.h @@ -1,5 +1,5 @@ /* Definitions for POSIX spawn interface. - Copyright (C) 2000, 2003-2004, 2008-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/spawn_faction_addclose.c b/lib/spawn_faction_addclose.c index 8326bbb0..86a9aba2 100644 --- a/lib/spawn_faction_addclose.c +++ b/lib/spawn_faction_addclose.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2009-2012 Free Software Foundation, Inc. +/* 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 diff --git a/lib/spawn_faction_adddup2.c b/lib/spawn_faction_adddup2.c index 08daa52d..56ff1ecc 100644 --- a/lib/spawn_faction_adddup2.c +++ b/lib/spawn_faction_adddup2.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2009-2012 Free Software Foundation, Inc. +/* 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 diff --git a/lib/spawn_faction_addopen.c b/lib/spawn_faction_addopen.c index d13fc2c5..8aaeca6a 100644 --- a/lib/spawn_faction_addopen.c +++ b/lib/spawn_faction_addopen.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2009-2012 Free Software Foundation, Inc. +/* 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 diff --git a/lib/spawn_faction_destroy.c b/lib/spawn_faction_destroy.c index 774d3d9f..942733dc 100644 --- a/lib/spawn_faction_destroy.c +++ b/lib/spawn_faction_destroy.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2009-2012 Free Software Foundation, Inc. +/* 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 diff --git a/lib/spawn_faction_init.c b/lib/spawn_faction_init.c index 373c7daf..cf1d0a6a 100644 --- a/lib/spawn_faction_init.c +++ b/lib/spawn_faction_init.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2009-2012 Free Software Foundation, Inc. +/* 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 diff --git a/lib/spawn_int.h b/lib/spawn_int.h index f85c6f78..f22a659f 100644 --- a/lib/spawn_int.h +++ b/lib/spawn_int.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2008-2012 Free Software Foundation, Inc. +/* 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 diff --git a/lib/spawnattr_destroy.c b/lib/spawnattr_destroy.c index 6025ee40..ec6c7cf0 100644 --- a/lib/spawnattr_destroy.c +++ b/lib/spawnattr_destroy.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2009-2012 Free Software Foundation, Inc. +/* 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 diff --git a/lib/spawnattr_init.c b/lib/spawnattr_init.c index 7451b4e8..b050fb4a 100644 --- a/lib/spawnattr_init.c +++ b/lib/spawnattr_init.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2009-2012 Free Software Foundation, Inc. +/* 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 diff --git a/lib/spawnattr_setflags.c b/lib/spawnattr_setflags.c index 0def40aa..babbb195 100644 --- a/lib/spawnattr_setflags.c +++ b/lib/spawnattr_setflags.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2004, 2009-2012 Free Software Foundation, Inc. +/* 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 diff --git a/lib/spawnattr_setsigmask.c b/lib/spawnattr_setsigmask.c index 7f8e61c8..8aa6da94 100644 --- a/lib/spawnattr_setsigmask.c +++ b/lib/spawnattr_setsigmask.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2009-2012 Free Software Foundation, Inc. +/* 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 diff --git a/lib/spawni.c b/lib/spawni.c index 649a4b9b..17b903f3 100644 --- a/lib/spawni.c +++ b/lib/spawni.c @@ -1,5 +1,5 @@ /* Guts of POSIX spawn interface. Generic POSIX.1 version. - Copyright (C) 2000-2006, 2008-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/spawnp.c b/lib/spawnp.c index 25493ebb..8bc5f99a 100644 --- a/lib/spawnp.c +++ b/lib/spawnp.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2009-2012 Free Software Foundation, Inc. +/* 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 diff --git a/lib/stat-size.h b/lib/stat-size.h index 0784f78f..049b8b91 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-2012 Free Software Foundation, Inc. + Copyright (C) 1989, 1991-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 diff --git a/lib/stat-time.c b/lib/stat-time.c new file mode 100644 index 00000000..81b83ddb --- /dev/null +++ b/lib/stat-time.c @@ -0,0 +1,3 @@ +#include <config.h> +#define _GL_STAT_TIME_INLINE _GL_EXTERN_INLINE +#include "stat-time.h" diff --git a/lib/stat-time.h b/lib/stat-time.h index 30c2acda..2d3b5cd6 100644 --- a/lib/stat-time.h +++ b/lib/stat-time.h @@ -1,6 +1,6 @@ /* stat-related time functions. - Copyright (C) 2005, 2007, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 2005, 2007, 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 @@ -23,6 +23,11 @@ #include <sys/stat.h> #include <time.h> +_GL_INLINE_HEADER_BEGIN +#ifndef _GL_STAT_TIME_INLINE +# define _GL_STAT_TIME_INLINE _GL_INLINE +#endif + /* STAT_TIMESPEC (ST, ST_XTIM) is the ST_XTIM member for *ST of type struct timespec, if available. If not, then STAT_TIMESPEC_NS (ST, ST_XTIM) is the nanosecond component of the ST_XTIM member for *ST, @@ -46,7 +51,7 @@ #endif /* Return the nanosecond component of *ST's access time. */ -static inline long int +_GL_STAT_TIME_INLINE long int get_stat_atime_ns (struct stat const *st) { # if defined STAT_TIMESPEC @@ -59,7 +64,7 @@ get_stat_atime_ns (struct stat const *st) } /* Return the nanosecond component of *ST's status change time. */ -static inline long int +_GL_STAT_TIME_INLINE long int get_stat_ctime_ns (struct stat const *st) { # if defined STAT_TIMESPEC @@ -72,7 +77,7 @@ get_stat_ctime_ns (struct stat const *st) } /* Return the nanosecond component of *ST's data modification time. */ -static inline long int +_GL_STAT_TIME_INLINE long int get_stat_mtime_ns (struct stat const *st) { # if defined STAT_TIMESPEC @@ -85,7 +90,7 @@ get_stat_mtime_ns (struct stat const *st) } /* Return the nanosecond component of *ST's birth time. */ -static inline long int +_GL_STAT_TIME_INLINE long int get_stat_birthtime_ns (struct stat const *st) { # if defined HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC @@ -100,7 +105,7 @@ get_stat_birthtime_ns (struct stat const *st) } /* Return *ST's access time. */ -static inline struct timespec +_GL_STAT_TIME_INLINE struct timespec get_stat_atime (struct stat const *st) { #ifdef STAT_TIMESPEC @@ -114,7 +119,7 @@ get_stat_atime (struct stat const *st) } /* Return *ST's status change time. */ -static inline struct timespec +_GL_STAT_TIME_INLINE struct timespec get_stat_ctime (struct stat const *st) { #ifdef STAT_TIMESPEC @@ -128,7 +133,7 @@ get_stat_ctime (struct stat const *st) } /* Return *ST's data modification time. */ -static inline struct timespec +_GL_STAT_TIME_INLINE struct timespec get_stat_mtime (struct stat const *st) { #ifdef STAT_TIMESPEC @@ -143,7 +148,7 @@ get_stat_mtime (struct stat const *st) /* Return *ST's birth time, if available; otherwise return a value with tv_sec and tv_nsec both equal to -1. */ -static inline struct timespec +_GL_STAT_TIME_INLINE struct timespec get_stat_birthtime (struct stat const *st) { struct timespec t; @@ -186,4 +191,6 @@ get_stat_birthtime (struct stat const *st) return t; } +_GL_INLINE_HEADER_END + #endif diff --git a/lib/stat.c b/lib/stat.c index 1fc633ee..f888130d 100644 --- a/lib/stat.c +++ b/lib/stat.c @@ -1,5 +1,5 @@ /* Work around platform bugs in stat. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 @@ -29,6 +29,7 @@ #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ # if _GL_WINDOWS_64_BIT_ST_SIZE +# undef stat /* avoid warning on mingw64 with _FILE_OFFSET_BITS=64 */ # define stat _stati64 # define REPLACE_FUNC_STAT_DIR 1 # undef REPLACE_FUNC_STAT_FILE @@ -41,7 +42,7 @@ # endif #endif -static inline int +static int orig_stat (const char *filename, struct stat *buf) { return stat (filename, buf); diff --git a/lib/statat.c b/lib/statat.c new file mode 100644 index 00000000..8cdb17e4 --- /dev/null +++ b/lib/statat.c @@ -0,0 +1,3 @@ +#include <config.h> +#define STATAT_INLINE _GL_EXTERN_INLINE +#include "openat.h" diff --git a/lib/stdalign.in.h b/lib/stdalign.in.h index 8fba6943..c3a67321 100644 --- a/lib/stdalign.in.h +++ b/lib/stdalign.in.h @@ -1,6 +1,6 @@ /* A substitute for ISO C11 <stdalign.h>. - Copyright 2011-2012 Free Software Foundation, Inc. + Copyright 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 diff --git a/lib/stdarg.in.h b/lib/stdarg.in.h index 53104a61..7484842d 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-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/stdbool.in.h b/lib/stdbool.in.h index ed1f9aa4..7c157727 100644 --- a/lib/stdbool.in.h +++ b/lib/stdbool.in.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2003, 2006-2012 Free Software Foundation, Inc. +/* Copyright (C) 2001-2003, 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 @@ -66,24 +66,19 @@ # undef true #endif -/* For the sake of symbolic names in gdb, we define true and false as - enum constants, not only as macros. - It is tempting to write - typedef enum { false = 0, true = 1 } _Bool; - so that gdb prints values of type 'bool' symbolically. But if we do - this, values of type '_Bool' may promote to 'int' or 'unsigned int' - (see ISO C 99 6.7.2.2.(4)); however, '_Bool' must promote to 'int' - (see ISO C 99 6.3.1.1.(2)). So we add a negative value to the - enum; this ensures that '_Bool' promotes to 'int'. */ -#if defined __cplusplus || (defined __BEOS__ && !defined __HAIKU__) +#ifdef __cplusplus +# define _Bool bool +# define bool bool +#else +# if defined __BEOS__ && !defined __HAIKU__ /* A compiler known to have 'bool'. */ /* If the compiler already has both 'bool' and '_Bool', we can assume they are the same types. */ -# if !@HAVE__BOOL@ +# if !@HAVE__BOOL@ typedef bool _Bool; -# endif -#else -# if !defined __GNUC__ +# endif +# else +# if !defined __GNUC__ /* If @HAVE__BOOL@: Some HP-UX cc and AIX IBM C compiler versions have compiler bugs when the built-in _Bool type is used. See @@ -103,19 +98,35 @@ typedef bool _Bool; "Invalid enumerator. (badenum)" with HP-UX cc on Tru64. The only benefit of the enum, debuggability, is not important with these compilers. So use 'signed char' and no enum. */ -# define _Bool signed char -# else +# define _Bool signed char +# else /* With this compiler, trust the _Bool type if the compiler has it. */ -# if !@HAVE__BOOL@ +# if !@HAVE__BOOL@ + /* For the sake of symbolic names in gdb, define true and false as + enum constants, not only as macros. + It is tempting to write + typedef enum { false = 0, true = 1 } _Bool; + so that gdb prints values of type 'bool' symbolically. But then + values of type '_Bool' might promote to 'int' or 'unsigned int' + (see ISO C 99 6.7.2.2.(4)); however, '_Bool' must promote to 'int' + (see ISO C 99 6.3.1.1.(2)). So add a negative value to the + enum; this ensures that '_Bool' promotes to 'int'. */ typedef enum { _Bool_must_promote_to_int = -1, false = 0, true = 1 } _Bool; +# endif # endif # endif +# define bool _Bool #endif -#define bool _Bool /* The other macros must be usable in preprocessor directives. */ -#define false 0 -#define true 1 +#ifdef __cplusplus +# define false false +# define true true +#else +# define false 0 +# define true 1 +#endif + #define __bool_true_false_are_defined 1 #endif /* _GL_STDBOOL_H */ diff --git a/lib/stddef.in.h b/lib/stddef.in.h index 17fcaea2..40f0536a 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-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/stdint.in.h b/lib/stdint.in.h index 59c00d59..2db8b2e3 100644 --- a/lib/stdint.in.h +++ b/lib/stdint.in.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2002, 2004-2012 Free Software Foundation, Inc. +/* Copyright (C) 2001-2002, 2004-2013 Free Software Foundation, Inc. Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood. This file is part of gnulib. @@ -39,7 +39,7 @@ 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 _SSIZE_T_DEFINED_ + && defined _SYS_TYPES_H_ && !defined __need_size_t # @INCLUDE_NEXT@ @NEXT_STDINT_H@ #else @@ -83,7 +83,7 @@ /* <sys/types.h> defines some of the stdint.h types as well, on glibc, IRIX 6.5, and OpenBSD 3.8 (via <machine/types.h>). AIX 5.2 <sys/types.h> isn't needed and causes troubles. - MacOS X 10.4.6 <sys/types.h> includes <stdint.h> (which is us), but + Mac OS X 10.4.6 <sys/types.h> includes <stdint.h> (which is us), but relies on the system <stdint.h> definitions, so include <sys/types.h> after @NEXT_STDINT_H@. */ #if @HAVE_SYS_TYPES_H@ && ! defined _AIX diff --git a/lib/stdio--.h b/lib/stdio--.h index 307fbdee..fe6d83ed 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-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/stdio-impl.h b/lib/stdio-impl.h index 49357953..e00600a1 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-2012 Free Software Foundation, Inc. + Copyright (C) 2007-2008, 2010-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 @@ -28,7 +28,7 @@ #include <errno.h> /* For detecting Plan9. */ -#if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */ +#if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ # if defined __DragonFly__ /* DragonFly */ /* See <http://www.dragonflybsd.org/cvsweb/src/lib/libc/stdio/priv_stdio.h?rev=HEAD&content-type=text/x-cvsweb-markup>. */ @@ -66,7 +66,7 @@ /* More fields, not relevant here. */ }; # define fp_ub ((struct __sfileext *) fp->_ext._base)->_ub -# else /* FreeBSD, NetBSD <= 1.5Z, DragonFly, MacOS X, Cygwin */ +# else /* FreeBSD, NetBSD <= 1.5Z, DragonFly, Mac OS X, Cygwin */ # define fp_ub fp_->_ub # endif diff --git a/lib/stdio-safer.h b/lib/stdio-safer.h index ac8a4506..7b67ae05 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-2012 Free Software Foundation, Inc. + Copyright (C) 2001, 2003, 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 diff --git a/lib/stdio.in.h b/lib/stdio.in.h index b1b543de..d6af99ca 100644 --- a/lib/stdio.in.h +++ b/lib/stdio.in.h @@ -1,6 +1,6 @@ /* A GNU-like <stdio.h>. - Copyright (C) 2004, 2007-2012 Free Software Foundation, Inc. + Copyright (C) 2004, 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 @@ -575,21 +575,17 @@ _GL_CXXALIAS_RPL (fwrite, size_t, _GL_CXXALIAS_SYS (fwrite, size_t, (const void *ptr, size_t s, size_t n, FILE *stream)); -/* Work around glibc bug 11959 +/* Work around bug 11959 when fortifying glibc 2.4 through 2.15 <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, so it's not - needed for C++. */ -# if !defined __cplusplus && 0 < __USE_FORTIFY_LEVEL -static inline size_t _GL_ARG_NONNULL ((1, 4)) -rpl_fwrite (const void *ptr, size_t s, size_t n, FILE *stream) -{ - size_t r = fwrite (ptr, s, n, stream); - (void) r; - return r; -} + This affects only function declaration attributes under certain + versions of gcc, 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 rpl_fwrite +# define fwrite(a, b, c, d) ({size_t __r = fwrite (a, b, c, d); __r; }) # endif # endif _GL_CXXALIASWARN (fwrite); @@ -1333,7 +1329,6 @@ _GL_WARN_ON_USE (vsprintf, "vsprintf is not always POSIX compliant - " "POSIX compliance"); #endif - #endif /* _@GUARD_PREFIX@_STDIO_H */ #endif /* _@GUARD_PREFIX@_STDIO_H */ #endif diff --git a/lib/stdlib--.h b/lib/stdlib--.h index 3fbd9d0a..ac02ece9 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-2012 Free Software Foundation, Inc. + Copyright (C) 2005-2007, 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 diff --git a/lib/stdlib-safer.h b/lib/stdlib-safer.h index dbd8b686..1e314937 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-2012 Free Software Foundation, Inc. + Copyright (C) 2005, 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 diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h index b546133c..422ad714 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-2012 Free Software Foundation, Inc. + Copyright (C) 1995, 2001-2004, 2006-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 @@ -20,8 +20,9 @@ #endif @PRAGMA_COLUMNS@ -#if defined __need_malloc_and_calloc -/* Special invocation convention inside glibc header files. */ +#if defined __need_system_stdlib_h || defined __need_malloc_and_calloc +/* Special invocation conventions inside some gnulib header files, + and inside some glibc header files, respectively. */ #@INCLUDE_NEXT@ @NEXT_STDLIB_H@ @@ -87,8 +88,8 @@ struct random_data #endif #if (@GNULIB_MKSTEMP@ || @GNULIB_MKSTEMPS@ || @GNULIB_GETSUBOPT@ || defined GNULIB_POSIXCHECK) && ! defined __GLIBC__ && !((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) -/* On MacOS X 10.3, only <unistd.h> declares mkstemp. */ -/* On MacOS X 10.5, only <unistd.h> declares mkstemps. */ +/* On Mac OS X 10.3, only <unistd.h> declares mkstemp. */ +/* On Mac OS X 10.5, only <unistd.h> declares mkstemps. */ /* On Cygwin 1.7.1, only <unistd.h> declares getsubopt. */ /* But avoid namespace pollution on glibc systems and native Windows. */ # include <unistd.h> @@ -457,10 +458,19 @@ _GL_WARN_ON_USE (posix_openpt, "posix_openpt is not portable - " #if @GNULIB_PTSNAME@ /* Return the pathname of the pseudo-terminal slave associated with the master FD is open on, or NULL on errors. */ -# if !@HAVE_PTSNAME@ +# if @REPLACE_PTSNAME@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef ptsname +# define ptsname rpl_ptsname +# endif +_GL_FUNCDECL_RPL (ptsname, char *, (int fd)); +_GL_CXXALIAS_RPL (ptsname, char *, (int fd)); +# else +# if !@HAVE_PTSNAME@ _GL_FUNCDECL_SYS (ptsname, char *, (int fd)); -# endif +# endif _GL_CXXALIAS_SYS (ptsname, char *, (int fd)); +# endif _GL_CXXALIASWARN (ptsname); #elif defined GNULIB_POSIXCHECK # undef ptsname diff --git a/lib/stpcpy.c b/lib/stpcpy.c index e857abef..8d7dfb07 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-2012 Free Software + Copyright (C) 1992, 1995, 1997-1998, 2006, 2009-2013 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 ef9babd4..8b14fb95 100644 --- a/lib/stpncpy.c +++ b/lib/stpncpy.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1995-1997, 2002-2003, 2005-2007, 2009-2012 Free Software +/* Copyright (C) 1993, 1995-1997, 2002-2003, 2005-2007, 2009-2013 Free Software * Foundation, Inc. NOTE: The canonical source of this file is maintained with the GNU C Library. @@ -31,7 +31,7 @@ /* Copy no more than N bytes of SRC to DST, returning a pointer past the last non-NUL byte written into DST. */ char * -__stpncpy (char *dest, const char *src, size_t n) +(__stpncpy) (char *dest, const char *src, size_t n) { char c; char *s = dest; diff --git a/lib/str-kmp.h b/lib/str-kmp.h index 3395173a..16d83a14 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-2012 Free Software Foundation, Inc. + Copyright (C) 2005-2013 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 af8f77b5..707145db 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-2012 Free Software Foundation, Inc. + Copyright (C) 2008-2013 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/strcasecmp.c b/lib/strcasecmp.c deleted file mode 100644 index 77ca2887..00000000 --- a/lib/strcasecmp.c +++ /dev/null @@ -1,62 +0,0 @@ -/* Case-insensitive string comparison function. - Copyright (C) 1998-1999, 2005-2007, 2009-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 - 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 <string.h> - -#include <ctype.h> -#include <limits.h> - -#define TOLOWER(Ch) (isupper (Ch) ? tolower (Ch) : (Ch)) - -/* Compare strings S1 and S2, ignoring case, returning less than, equal to or - greater than zero if S1 is lexicographically less than, equal to or greater - than S2. - Note: This function does not work with multibyte strings! */ - -int -strcasecmp (const char *s1, const char *s2) -{ - const unsigned char *p1 = (const unsigned char *) s1; - const unsigned char *p2 = (const unsigned char *) s2; - unsigned char c1, c2; - - if (p1 == p2) - return 0; - - do - { - c1 = TOLOWER (*p1); - c2 = TOLOWER (*p2); - - if (c1 == '\0') - break; - - ++p1; - ++p2; - } - while (c1 == c2); - - if (UCHAR_MAX <= INT_MAX) - return c1 - c2; - else - /* On machines where 'char' and 'int' are types of the same size, the - difference of two 'unsigned char' values - including the sign bit - - doesn't fit in an 'int'. */ - return (c1 > c2 ? 1 : c1 < c2 ? -1 : 0); -} diff --git a/lib/strchrnul.c b/lib/strchrnul.c index 1be4249e..f6b07227 100644 --- a/lib/strchrnul.c +++ b/lib/strchrnul.c @@ -1,5 +1,5 @@ /* Searching in a string. - Copyright (C) 2003, 2007-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/strdup.c b/lib/strdup.c index a3f8c863..5826ab02 100644 --- a/lib/strdup.c +++ b/lib/strdup.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1996-1998, 2002-2004, 2006-2007, 2009-2012 Free Software +/* Copyright (C) 1991, 1996-1998, 2002-2004, 2006-2007, 2009-2013 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/lib/streq.h b/lib/streq.h index b312f7f9..12c1867c 100644 --- a/lib/streq.h +++ b/lib/streq.h @@ -1,5 +1,5 @@ /* Optimized string comparison. - Copyright (C) 2001-2002, 2007, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2007, 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 diff --git a/lib/strerror-override.c b/lib/strerror-override.c index 9ca65234..d0ed2fb8 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-2012 Free Software Foundation, Inc. + Copyright (C) 2010-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 @@ -89,6 +89,8 @@ strerror_override (int errnum) return "No route to host"; case EWOULDBLOCK: return "Operation would block"; +#endif +#if GNULIB_defined_ESTREAMS /* native Windows platforms with older <errno.h> */ case ETXTBSY: return "Text file busy"; case ENODATA: @@ -97,10 +99,6 @@ strerror_override (int errnum) return "Out of streams resources"; case ENOSTR: return "Device not a stream"; - case ENOTRECOVERABLE: - return "State not recoverable"; - case EOWNERDEAD: - return "Owner died"; case ETIME: return "Timer expired"; case EOTHER: @@ -283,6 +281,21 @@ strerror_override (int errnum) return "Operation canceled"; #endif +#if GNULIB_defined_EOWNERDEAD + case EOWNERDEAD: + return "Owner died"; +#endif + +#if GNULIB_defined_ENOTRECOVERABLE + case ENOTRECOVERABLE: + return "State not recoverable"; +#endif + +#if GNULIB_defined_EILSEQ + case EILSEQ: + return "Invalid or incomplete multibyte or wide character"; +#endif + default: return NULL; } diff --git a/lib/strerror-override.h b/lib/strerror-override.h index 09526ea9..3b8f24b9 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-2012 Free Software Foundation, Inc. + Copyright (C) 2010-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 @@ -30,6 +30,7 @@ describing the error. Otherwise return NULL. */ # if REPLACE_STRERROR_0 \ || GNULIB_defined_ESOCK \ + || GNULIB_defined_ESTREAMS \ || GNULIB_defined_EWINSOCK \ || GNULIB_defined_ENOMSG \ || GNULIB_defined_EIDRM \ @@ -43,7 +44,10 @@ || GNULIB_defined_ECONNABORTED \ || GNULIB_defined_ESTALE \ || GNULIB_defined_EDQUOT \ - || GNULIB_defined_ECANCELED + || GNULIB_defined_ECANCELED \ + || GNULIB_defined_EOWNERDEAD \ + || GNULIB_defined_ENOTRECOVERABLE \ + || GNULIB_defined_EILSEQ extern const char *strerror_override (int errnum); # else # define strerror_override(ignored) NULL diff --git a/lib/strerror.c b/lib/strerror.c index 587bd21a..80a2f2ee 100644 --- a/lib/strerror.c +++ b/lib/strerror.c @@ -1,6 +1,6 @@ /* strerror.c --- POSIX compatible system error routine - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/lib/strftime.c b/lib/strftime.c index c7b8eb5e..91d5d85c 100644 --- a/lib/strftime.c +++ b/lib/strftime.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-2001, 2003-2007, 2009-2012 Free Software Foundation, Inc. +/* Copyright (C) 1991-2001, 2003-2007, 2009-2013 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. @@ -26,7 +26,6 @@ #else # include <config.h> # if FPRINTFTIME -# include "ignore-value.h" # include "fprintftime.h" # else # include "strftime.h" @@ -210,13 +209,12 @@ extern char *tzname[]; fwrite_uppcase (p, (s), _n); \ else \ { \ - /* We are ignoring the value of fwrite here, in spite of the \ - fact that technically, that may not be valid: the fwrite \ - specification in POSIX 2008 defers to that of fputc, which \ - is intended to be consistent with the one from ISO C, \ - which permits failure due to ENOMEM *without* setting the \ - stream's error indicator. */ \ - ignore_value (fwrite ((s), _n, 1, p)); \ + /* Ignore the value of fwrite. The caller can determine whether \ + an error occurred by inspecting ferror (P). All known fwrite \ + implementations set the stream's error indicator when they \ + fail due to ENOMEM etc., even though C11 and POSIX.1-2008 do \ + not require this. */ \ + fwrite (s, _n, 1, p); \ } \ } \ while (0) \ diff --git a/lib/strftime.h b/lib/strftime.h index d3b4cb28..a47e6d1e 100644 --- a/lib/strftime.h +++ b/lib/strftime.h @@ -1,6 +1,6 @@ /* declarations for strftime.c - Copyright (C) 2002, 2004, 2008-2012 Free Software Foundation, Inc. + Copyright (C) 2002, 2004, 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 diff --git a/lib/striconv.c b/lib/striconv.c index 4458d0c3..ba90eddb 100644 --- a/lib/striconv.c +++ b/lib/striconv.c @@ -1,5 +1,5 @@ /* Charset conversion. - Copyright (C) 2001-2007, 2010-2012 Free Software Foundation, Inc. + Copyright (C) 2001-2007, 2010-2013 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 fc3aa696..88eaf9dd 100644 --- a/lib/striconv.h +++ b/lib/striconv.h @@ -1,5 +1,5 @@ /* Charset conversion. - Copyright (C) 2001-2004, 2006-2007, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2006-2007, 2009-2013 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 f8d7520e..d7a6c9c9 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-2012 Free Software Foundation, Inc. + Copyright (C) 1995-1996, 2001-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 diff --git a/lib/strings.in.h b/lib/strings.in.h deleted file mode 100644 index 7ed88e9a..00000000 --- a/lib/strings.in.h +++ /dev/null @@ -1,122 +0,0 @@ -/* A substitute <strings.h>. - - Copyright (C) 2007-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 - 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/>. */ - -#ifndef _@GUARD_PREFIX@_STRINGS_H - -#if __GNUC__ >= 3 -@PRAGMA_SYSTEM_HEADER@ -#endif -@PRAGMA_COLUMNS@ - -/* Minix 3.1.8 has a bug: <sys/types.h> must be included before <strings.h>. - But avoid namespace pollution on glibc systems. */ -#if defined __minix && !defined __GLIBC__ -# include <sys/types.h> -#endif - -/* The include_next requires a split double-inclusion guard. */ -#if @HAVE_STRINGS_H@ -# @INCLUDE_NEXT@ @NEXT_STRINGS_H@ -#endif - -#ifndef _@GUARD_PREFIX@_STRINGS_H -#define _@GUARD_PREFIX@_STRINGS_H - -#if ! @HAVE_DECL_STRNCASECMP@ -/* Get size_t. */ -# include <stddef.h> -#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. */ - -#ifdef __cplusplus -extern "C" { -#endif - - - /* Find the index of the least-significant set bit. */ -#if @GNULIB_FFS@ -# if !@HAVE_FFS@ -_GL_FUNCDECL_SYS (ffs, int, (int i)); -# endif -_GL_CXXALIAS_SYS (ffs, int, (int i)); -_GL_CXXALIASWARN (ffs); -#elif defined GNULIB_POSIXCHECK -# undef ffs -# if HAVE_RAW_DECL_FFS -_GL_WARN_ON_USE (ffs, "ffs is not portable - use the ffs module"); -# endif -#endif - -/* Compare strings S1 and S2, ignoring case, returning less than, equal to or - greater than zero if S1 is lexicographically less than, equal to or greater - than S2. - Note: This function does not work in multibyte locales. */ -#if ! @HAVE_STRCASECMP@ -extern int strcasecmp (char const *s1, char const *s2) - _GL_ARG_NONNULL ((1, 2)); -#endif -#if defined GNULIB_POSIXCHECK -/* strcasecmp() does not work with multibyte strings: - POSIX says that it operates on "strings", and "string" in POSIX is defined - as a sequence of bytes, not of characters. */ -# undef strcasecmp -# if HAVE_RAW_DECL_STRCASECMP -_GL_WARN_ON_USE (strcasecmp, "strcasecmp cannot work correctly on character " - "strings in multibyte locales - " - "use mbscasecmp if you care about " - "internationalization, or use c_strcasecmp , " - "gnulib module c-strcase) if you want a locale " - "independent function"); -# endif -#endif - -/* Compare no more than N bytes of strings S1 and S2, ignoring case, - returning less than, equal to or greater than zero if S1 is - lexicographically less than, equal to or greater than S2. - Note: This function cannot work correctly in multibyte locales. */ -#if ! @HAVE_DECL_STRNCASECMP@ -extern int strncasecmp (char const *s1, char const *s2, size_t n) - _GL_ARG_NONNULL ((1, 2)); -#endif -#if defined GNULIB_POSIXCHECK -/* strncasecmp() does not work with multibyte strings: - POSIX says that it operates on "strings", and "string" in POSIX is defined - as a sequence of bytes, not of characters. */ -# undef strncasecmp -# if HAVE_RAW_DECL_STRNCASECMP -_GL_WARN_ON_USE (strncasecmp, "strncasecmp cannot work correctly on character " - "strings in multibyte locales - " - "use mbsncasecmp or mbspcasecmp if you care about " - "internationalization, or use c_strncasecmp , " - "gnulib module c-strcase) if you want a locale " - "independent function"); -# endif -#endif - - -#ifdef __cplusplus -} -#endif - -#endif /* _@GUARD_PREFIX@_STRING_H */ -#endif /* _@GUARD_PREFIX@_STRING_H */ diff --git a/lib/strintcmp.c b/lib/strintcmp.c index 6e4901e2..23398c3e 100644 --- a/lib/strintcmp.c +++ b/lib/strintcmp.c @@ -1,6 +1,6 @@ /* Compare integer strings. - Copyright (C) 2005-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/lib/stripslash.c b/lib/stripslash.c index ef458c63..0e452a95 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-2012 Free Software Foundation, + Copyright (C) 1990, 2001, 2003-2006, 2009-2013 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/strncasecmp.c b/lib/strncasecmp.c deleted file mode 100644 index bf413b41..00000000 --- a/lib/strncasecmp.c +++ /dev/null @@ -1,62 +0,0 @@ -/* strncasecmp.c -- case insensitive string comparator - Copyright (C) 1998-1999, 2005-2007, 2009-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 - 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 <string.h> - -#include <ctype.h> -#include <limits.h> - -#define TOLOWER(Ch) (isupper (Ch) ? tolower (Ch) : (Ch)) - -/* Compare no more than N bytes of strings S1 and S2, ignoring case, - returning less than, equal to or greater than zero if S1 is - lexicographically less than, equal to or greater than S2. - Note: This function cannot work correctly in multibyte locales. */ - -int -strncasecmp (const char *s1, const char *s2, size_t n) -{ - register const unsigned char *p1 = (const unsigned char *) s1; - register const unsigned char *p2 = (const unsigned char *) s2; - unsigned char c1, c2; - - if (p1 == p2 || n == 0) - return 0; - - do - { - c1 = TOLOWER (*p1); - c2 = TOLOWER (*p2); - - if (--n == 0 || c1 == '\0') - break; - - ++p1; - ++p2; - } - while (c1 == c2); - - if (UCHAR_MAX <= INT_MAX) - return c1 - c2; - else - /* On machines where 'char' and 'int' are types of the same size, the - difference of two 'unsigned char' values - including the sign bit - - doesn't fit in an 'int'. */ - return (c1 > c2 ? 1 : c1 < c2 ? -1 : 0); -} diff --git a/lib/strncat.c b/lib/strncat.c index 83f44e8f..7fb9f25f 100644 --- a/lib/strncat.c +++ b/lib/strncat.c @@ -1,5 +1,5 @@ /* Concatenate strings. - Copyright (C) 1999, 2002, 2006, 2010-2012 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2006, 2010-2013 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 40538711..e60268b8 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-2012 Free Software + Copyright (C) 1996-1998, 2001-2003, 2005-2007, 2009-2013 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 d36180dc..57fdfe77 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-2012 Free Software Foundation, Inc. + Copyright (C) 2005-2007, 2009-2013 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 52dc5078..0c22d21e 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-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/strnlen1.h b/lib/strnlen1.h index 4c4f0c08..7c65e316 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-2012 Free Software Foundation, Inc. + Copyright (C) 2005, 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 diff --git a/lib/strnumcmp-in.h b/lib/strnumcmp-in.h index 95ab55fd..37580332 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-2012 Free Software Foundation, Inc. + Copyright (C) 1988-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 diff --git a/lib/strnumcmp.c b/lib/strnumcmp.c index 115ab598..314eef79 100644 --- a/lib/strnumcmp.c +++ b/lib/strnumcmp.c @@ -1,6 +1,6 @@ /* Compare numeric strings. - Copyright (C) 2005-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/lib/strpbrk.c b/lib/strpbrk.c index 6de23ab4..0f77bcdc 100644 --- a/lib/strpbrk.c +++ b/lib/strpbrk.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1994, 2000, 2002-2003, 2006, 2009-2012 Free Software +/* Copyright (C) 1991, 1994, 2000, 2002-2003, 2006, 2009-2013 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 22b9065b..12cd881f 100644 --- a/lib/strsignal.c +++ b/lib/strsignal.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1994-2002, 2005, 2008-2012 Free Software Foundation, +/* Copyright (C) 1991, 1994-2002, 2005, 2008-2013 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/lib/strstr.c b/lib/strstr.c index 94d62529..b91acec7 100644 --- a/lib/strstr.c +++ b/lib/strstr.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-1994, 1996-1998, 2000, 2004, 2007-2012 Free Software +/* Copyright (C) 1991-1994, 1996-1998, 2000, 2004, 2007-2013 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/lib/strtod.c b/lib/strtod.c index 24f69af4..5c43b4f5 100644 --- a/lib/strtod.c +++ b/lib/strtod.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-1992, 1997, 1999, 2003, 2006, 2008-2012 Free Software +/* Copyright (C) 1991-1992, 1997, 1999, 2003, 2006, 2008-2013 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -193,7 +193,7 @@ static double underlying_strtod (const char *, char **); /* HP cc on HP-UX 10.20 has a bug with the constant expression -0.0. ICC 10.0 has a bug when optimizing the expression -zero. The expression -DBL_MIN * DBL_MIN does not work when cross-compiling - to PowerPC on MacOS X 10.5. */ + to PowerPC on Mac OS X 10.5. */ #if defined __hpux || defined __sgi || defined __ICC static double compute_minus_zero (void) diff --git a/lib/strtoimax.c b/lib/strtoimax.c index 4f5fdbb5..c9bd2ad3 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-2012 Free Software Foundation, + Copyright (C) 1999, 2001-2004, 2006, 2009-2013 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/strtol.c b/lib/strtol.c index bf992a8c..379eda8c 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-2012 Free Software + Copyright (C) 1991-1992, 1994-1999, 2003, 2005-2007, 2009-2013 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 fdfceb01..bb424002 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-2012 Free Software Foundation, + Copyright (C) 1995-1997, 1999, 2001, 2009-2013 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/lib/strtoul.c b/lib/strtoul.c index e99da41e..a0ca376c 100644 --- a/lib/strtoul.c +++ b/lib/strtoul.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1997, 2009-2012 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1997, 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 diff --git a/lib/strtoull.c b/lib/strtoull.c index 33c2c5d9..494cc2f2 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-2012 Free Software Foundation, Inc. + Copyright (C) 1995-1997, 1999, 2009-2013 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 642ca66b..d3c9f21b 100644 --- a/lib/symlink.c +++ b/lib/symlink.c @@ -1,5 +1,5 @@ /* Stub for symlink(). - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/sys_ioctl.in.h b/lib/sys_ioctl.in.h index ab04d558..62024ab0 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-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/sys_resource.in.h b/lib/sys_resource.in.h index ef41f0e4..af546fb4 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 Free Software Foundation, Inc. + Copyright (C) 2012-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 diff --git a/lib/sys_select.in.h b/lib/sys_select.in.h index 214d75d7..521ccef3 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 @@ -19,14 +19,25 @@ # endif @PRAGMA_COLUMNS@ -/* On OSF/1, <sys/types.h> and <sys/time.h> include <sys/select.h>. +/* On OSF/1 and Solaris 2.6, <sys/types.h> and <sys/time.h> + both include <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 _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TYPES_H) && defined _OSF_SOURCE +#if (@HAVE_SYS_SELECT_H@ \ + && ((defined __osf__ && defined _SYS_TYPES_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) # 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 _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H) && defined _OSF_SOURCE +#elif (@HAVE_SYS_SELECT_H@ \ + && ((defined __osf__ && defined _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) # define _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H # @INCLUDE_NEXT@ @NEXT_SYS_SELECT_H@ @@ -63,7 +74,7 @@ /* On OSF/1 4.0, <sys/select.h> provides only a forward declaration of 'struct timeval', and no definition of this type. - Also, MacOS X, AIX, HP-UX, IRIX, Solaris, Interix declare select() + Also, Mac OS X, AIX, HP-UX, IRIX, Solaris, Interix declare select() in <sys/time.h>. But avoid namespace pollution on glibc systems. */ # ifndef __GLIBC__ @@ -130,7 +141,7 @@ /* Re-define FD_ISSET to avoid a WSA call while we are not using network sockets. */ -static inline int +static int rpl_fd_isset (SOCKET fd, fd_set * set) { u_int i; diff --git a/lib/sys_socket.c b/lib/sys_socket.c new file mode 100644 index 00000000..3f017f8f --- /dev/null +++ b/lib/sys_socket.c @@ -0,0 +1,3 @@ +#include <config.h> +#define _GL_SYS_SOCKET_INLINE _GL_EXTERN_INLINE +#include "sys/socket.h" diff --git a/lib/sys_socket.in.h b/lib/sys_socket.in.h index f2eda0c3..b4cf0c39 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-2012 Free Software Foundation, Inc. + Copyright (C) 2005-2013 Free Software Foundation, Inc. Written by Simon Josefsson. This program is free software; you can redistribute it and/or modify @@ -63,6 +63,11 @@ #ifndef _@GUARD_PREFIX@_SYS_SOCKET_H #define _@GUARD_PREFIX@_SYS_SOCKET_H +_GL_INLINE_HEADER_BEGIN +#ifndef _GL_SYS_SOCKET_INLINE +# define _GL_SYS_SOCKET_INLINE _GL_INLINE +#endif + /* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ /* The definition of _GL_ARG_NONNULL is copied here. */ @@ -201,7 +206,7 @@ struct msghdr { /* Re-define FD_ISSET to avoid a WSA call while we are not using network sockets. */ -static inline int +_GL_SYS_SOCKET_INLINE int rpl_fd_isset (SOCKET fd, fd_set * set) { u_int i; @@ -677,6 +682,8 @@ _GL_WARN_ON_USE (accept4, "accept4 is unportable - " # endif #endif +_GL_INLINE_HEADER_END + #endif /* _@GUARD_PREFIX@_SYS_SOCKET_H */ #endif /* _@GUARD_PREFIX@_SYS_SOCKET_H */ #endif diff --git a/lib/sys_stat.in.h b/lib/sys_stat.in.h index 2efc1e92..acc36947 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 @@ -150,6 +150,10 @@ # endif #endif +#ifndef S_ISMPX /* AIX */ +# define S_ISMPX(m) 0 +#endif + #ifndef S_ISNAM /* Xenix */ # ifdef S_IFNAM # define S_ISNAM(m) (((m) & S_IFMT) == S_IFNAM) @@ -497,7 +501,7 @@ _GL_CXXALIAS_RPL (mkdir, int, (char const *name, mode_t mode)); # if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ # if !GNULIB_defined_rpl_mkdir -static inline int +static int rpl_mkdir (char const *name, mode_t mode) { return _mkdir (name); diff --git a/lib/sys_time.in.h b/lib/sys_time.in.h index d915cee4..656c3f13 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 @@ -17,37 +17,34 @@ /* Written by Paul Eggert. */ +#ifndef _@GUARD_PREFIX@_SYS_TIME_H + #if __GNUC__ >= 3 @PRAGMA_SYSTEM_HEADER@ #endif @PRAGMA_COLUMNS@ -#if defined _@GUARD_PREFIX@_SYS_TIME_H - -/* Simply delegate to the system's header, without adding anything. */ -# if @HAVE_SYS_TIME_H@ -# @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@ -# endif - -#else +/* The include_next requires a split double-inclusion guard. */ +#if @HAVE_SYS_TIME_H@ +# @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@ +#endif -# define _@GUARD_PREFIX@_SYS_TIME_H +#ifndef _@GUARD_PREFIX@_SYS_TIME_H +#define _@GUARD_PREFIX@_SYS_TIME_H -# if @HAVE_SYS_TIME_H@ -# @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@ -# else -# include <time.h> -# endif +#if ! @HAVE_SYS_TIME_H@ +# include <time.h> +#endif /* On native Windows with MSVC, get the 'struct timeval' type. Also, on native Windows with a 64-bit time_t, where we are overriding the 'struct timeval' type, get all declarations of system functions whose signature contains 'struct timeval'. */ -# if (defined _MSC_VER || @REPLACE_STRUCT_TIMEVAL@) && @HAVE_WINSOCK2_H@ && !defined _GL_INCLUDING_WINSOCK2_H -# define _GL_INCLUDING_WINSOCK2_H -# include <winsock2.h> -# undef _GL_INCLUDING_WINSOCK2_H -# endif +#if (defined _MSC_VER || @REPLACE_STRUCT_TIMEVAL@) && @HAVE_WINSOCK2_H@ && !defined _GL_INCLUDING_WINSOCK2_H +# define _GL_INCLUDING_WINSOCK2_H +# include <winsock2.h> +# undef _GL_INCLUDING_WINSOCK2_H +#endif /* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ @@ -55,112 +52,112 @@ /* The definition of _GL_WARN_ON_USE is copied here. */ -# ifdef __cplusplus +#ifdef __cplusplus extern "C" { -# endif +#endif -# if !@HAVE_STRUCT_TIMEVAL@ || @REPLACE_STRUCT_TIMEVAL@ +#if !@HAVE_STRUCT_TIMEVAL@ || @REPLACE_STRUCT_TIMEVAL@ -# if @REPLACE_STRUCT_TIMEVAL@ -# define timeval rpl_timeval -# endif +# if @REPLACE_STRUCT_TIMEVAL@ +# define timeval rpl_timeval +# endif -# if !GNULIB_defined_struct_timeval +# if !GNULIB_defined_struct_timeval struct timeval { time_t tv_sec; long int tv_usec; }; -# define GNULIB_defined_struct_timeval 1 -# endif - +# define GNULIB_defined_struct_timeval 1 # endif -# ifdef __cplusplus +#endif + +#ifdef __cplusplus } -# endif +#endif -# if @GNULIB_GETTIMEOFDAY@ -# if @REPLACE_GETTIMEOFDAY@ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef gettimeofday -# define gettimeofday rpl_gettimeofday -# endif +#if @GNULIB_GETTIMEOFDAY@ +# if @REPLACE_GETTIMEOFDAY@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef gettimeofday +# define gettimeofday rpl_gettimeofday +# endif _GL_FUNCDECL_RPL (gettimeofday, int, (struct timeval *restrict, void *restrict) _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (gettimeofday, int, (struct timeval *restrict, void *restrict)); -# else -# if !@HAVE_GETTIMEOFDAY@ +# else +# if !@HAVE_GETTIMEOFDAY@ _GL_FUNCDECL_SYS (gettimeofday, int, (struct timeval *restrict, void *restrict) _GL_ARG_NONNULL ((1))); -# endif +# endif /* Need to cast, because on glibc systems, by default, the second argument is struct timezone *. */ _GL_CXXALIAS_SYS_CAST (gettimeofday, int, (struct timeval *restrict, void *restrict)); -# endif +# endif _GL_CXXALIASWARN (gettimeofday); -# elif defined GNULIB_POSIXCHECK -# undef gettimeofday -# if HAVE_RAW_DECL_GETTIMEOFDAY +#elif defined GNULIB_POSIXCHECK +# undef gettimeofday +# if HAVE_RAW_DECL_GETTIMEOFDAY _GL_WARN_ON_USE (gettimeofday, "gettimeofday is unportable - " "use gnulib module gettimeofday for portability"); -# endif # endif +#endif /* Hide some function declarations from <winsock2.h>. */ -# if defined _MSC_VER && @HAVE_WINSOCK2_H@ -# if !defined _@GUARD_PREFIX@_UNISTD_H -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef close -# define close close_used_without_including_unistd_h -# else +#if defined _MSC_VER && @HAVE_WINSOCK2_H@ +# if !defined _@GUARD_PREFIX@_UNISTD_H +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef close +# define close close_used_without_including_unistd_h +# else _GL_WARN_ON_USE (close, "close() used without including <unistd.h>"); -# endif -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef gethostname -# define gethostname gethostname_used_without_including_unistd_h -# else +# endif +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef gethostname +# define gethostname gethostname_used_without_including_unistd_h +# else _GL_WARN_ON_USE (gethostname, "gethostname() used without including <unistd.h>"); -# endif # endif -# if !defined _@GUARD_PREFIX@_SYS_SOCKET_H -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef socket -# define socket socket_used_without_including_sys_socket_h -# undef connect -# define connect connect_used_without_including_sys_socket_h -# undef accept -# define accept accept_used_without_including_sys_socket_h -# undef bind -# define bind bind_used_without_including_sys_socket_h -# undef getpeername -# define getpeername getpeername_used_without_including_sys_socket_h -# undef getsockname -# define getsockname getsockname_used_without_including_sys_socket_h -# undef getsockopt -# define getsockopt getsockopt_used_without_including_sys_socket_h -# undef listen -# define listen listen_used_without_including_sys_socket_h -# undef recv -# define recv recv_used_without_including_sys_socket_h -# undef send -# define send send_used_without_including_sys_socket_h -# undef recvfrom -# define recvfrom recvfrom_used_without_including_sys_socket_h -# undef sendto -# define sendto sendto_used_without_including_sys_socket_h -# undef setsockopt -# define setsockopt setsockopt_used_without_including_sys_socket_h -# undef shutdown -# define shutdown shutdown_used_without_including_sys_socket_h -# else +# endif +# if !defined _@GUARD_PREFIX@_SYS_SOCKET_H +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef socket +# define socket socket_used_without_including_sys_socket_h +# undef connect +# define connect connect_used_without_including_sys_socket_h +# undef accept +# define accept accept_used_without_including_sys_socket_h +# undef bind +# define bind bind_used_without_including_sys_socket_h +# undef getpeername +# define getpeername getpeername_used_without_including_sys_socket_h +# undef getsockname +# define getsockname getsockname_used_without_including_sys_socket_h +# undef getsockopt +# define getsockopt getsockopt_used_without_including_sys_socket_h +# undef listen +# define listen listen_used_without_including_sys_socket_h +# undef recv +# define recv recv_used_without_including_sys_socket_h +# undef send +# define send send_used_without_including_sys_socket_h +# undef recvfrom +# define recvfrom recvfrom_used_without_including_sys_socket_h +# undef sendto +# define sendto sendto_used_without_including_sys_socket_h +# undef setsockopt +# define setsockopt setsockopt_used_without_including_sys_socket_h +# undef shutdown +# define shutdown shutdown_used_without_including_sys_socket_h +# else _GL_WARN_ON_USE (socket, "socket() used without including <sys/socket.h>"); _GL_WARN_ON_USE (connect, @@ -189,17 +186,18 @@ _GL_WARN_ON_USE (gettimeofday, "gettimeofday is unportable - " "setsockopt() used without including <sys/socket.h>"); _GL_WARN_ON_USE (shutdown, "shutdown() used without including <sys/socket.h>"); -# endif # endif -# if !defined _@GUARD_PREFIX@_SYS_SELECT_H -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef select -# define select select_used_without_including_sys_select_h -# else +# endif +# if !defined _@GUARD_PREFIX@_SYS_SELECT_H +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef select +# define select select_used_without_including_sys_select_h +# else _GL_WARN_ON_USE (select, "select() used without including <sys/select.h>"); -# endif # endif # endif +#endif #endif /* _@GUARD_PREFIX@_SYS_TIME_H */ +#endif /* _@GUARD_PREFIX@_SYS_TIME_H */ diff --git a/lib/sys_types.in.h b/lib/sys_types.in.h index 8139d98f..d7da3562 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-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/sys_uio.in.h b/lib/sys_uio.in.h index 910bb00b..fef19dc3 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-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/sys_utsname.in.h b/lib/sys_utsname.in.h index 817028be..d468ba9c 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-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/sys_wait.in.h b/lib/sys_wait.in.h index 9264ebb2..bd97d61f 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-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/tempname.c b/lib/tempname.c index 4e319d2c..bdb4f21a 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-2012 Free Software Foundation, Inc. + Copyright (C) 1991-2003, 2005-2007, 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 @@ -216,7 +216,7 @@ gen_tempname_len (char *tmpl, int suffixlen, int flags, int kind, /* A lower bound on the number of temporary files to attempt to generate. The maximum total number of temporary file names that can exist for a given template is 62**6. It should never be - necessary to try all these combinations. Instead if a reasonable + necessary to try all of these combinations. Instead if a reasonable number of names is tried (we define reasonable as 62**3) fail to give the system administrator the chance to remove the problems. This value requires that X_SUFFIX_LEN be at least 3. */ diff --git a/lib/tempname.h b/lib/tempname.h index 7ced9a9b..1709e99d 100644 --- a/lib/tempname.h +++ b/lib/tempname.h @@ -1,6 +1,6 @@ /* Create a temporary file or directory. - Copyright (C) 2006, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/lib/termios.in.h b/lib/termios.in.h index d2f235be..1a5d7e52 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-2012 Free Software Foundation, Inc. + Copyright (C) 2010-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 diff --git a/lib/time.in.h b/lib/time.in.h index 04cde057..8ced7947 100644 --- a/lib/time.in.h +++ b/lib/time.in.h @@ -1,6 +1,6 @@ /* A more-standard <time.h>. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/lib/time_r.c b/lib/time_r.c index 74366a0f..98662998 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-2012 Free Software Foundation, Inc. + Copyright (C) 2003, 2006-2007, 2010-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 diff --git a/lib/timespec.c b/lib/timespec.c new file mode 100644 index 00000000..2b6098ed --- /dev/null +++ b/lib/timespec.c @@ -0,0 +1,3 @@ +#include <config.h> +#define _GL_TIMESPEC_INLINE _GL_EXTERN_INLINE +#include "timespec.h" diff --git a/lib/timespec.h b/lib/timespec.h index 388ddb83..d665e6cc 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-2012 Free Software + Copyright (C) 2000, 2002, 2004-2005, 2007, 2009-2013 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -21,6 +21,11 @@ # include <time.h> +_GL_INLINE_HEADER_BEGIN +#ifndef _GL_TIMESPEC_INLINE +# define _GL_TIMESPEC_INLINE _GL_INLINE +#endif + /* Return negative, zero, positive if A < B, A == B, A > B, respectively. For each time stamp T, this code assumes that either: @@ -49,7 +54,7 @@ The (int) cast avoids a gcc -Wconversion warning. */ -static inline int +_GL_TIMESPEC_INLINE int timespec_cmp (struct timespec a, struct timespec b) { return (a.tv_sec < b.tv_sec ? -1 @@ -59,18 +64,21 @@ timespec_cmp (struct timespec a, struct timespec b) /* Return -1, 0, 1, depending on the sign of A. A.tv_nsec must be nonnegative. */ -static inline int +_GL_TIMESPEC_INLINE int timespec_sign (struct timespec a) { return a.tv_sec < 0 ? -1 : a.tv_sec || a.tv_nsec; } -struct timespec timespec_add (struct timespec, struct timespec); -struct timespec timespec_sub (struct timespec, struct timespec); -struct timespec dtotimespec (double); +struct timespec timespec_add (struct timespec, struct timespec) + _GL_ATTRIBUTE_CONST; +struct timespec timespec_sub (struct timespec, struct timespec) + _GL_ATTRIBUTE_CONST; +struct timespec dtotimespec (double) + _GL_ATTRIBUTE_CONST; /* Return an approximation to A, of type 'double'. */ -static inline double +_GL_TIMESPEC_INLINE double timespectod (struct timespec a) { return a.tv_sec + a.tv_nsec / 1e9; @@ -79,4 +87,6 @@ timespectod (struct timespec a) void gettime (struct timespec *); int settime (struct timespec const *); +_GL_INLINE_HEADER_END + #endif diff --git a/lib/trim.c b/lib/trim.c index 7f31380d..9581f511 100644 --- a/lib/trim.c +++ b/lib/trim.c @@ -1,5 +1,5 @@ /* Removes leading and/or trailing whitespaces - Copyright (C) 2006-2012 Free Software Foundation, Inc. + Copyright (C) 2006-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 diff --git a/lib/trim.h b/lib/trim.h index bfe0c3f2..ab0caa1b 100644 --- a/lib/trim.h +++ b/lib/trim.h @@ -1,5 +1,5 @@ /* Removes leading and/or trailing whitespaces - Copyright (C) 2006, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/lib/u64.c b/lib/u64.c new file mode 100644 index 00000000..04cf7a29 --- /dev/null +++ b/lib/u64.c @@ -0,0 +1,3 @@ +#include <config.h> +#define _GL_U64_INLINE _GL_EXTERN_INLINE +#include "u64.h" diff --git a/lib/u64.h b/lib/u64.h index dadd6d74..d8009ad3 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 @@ -19,6 +19,11 @@ #include <stdint.h> +_GL_INLINE_HEADER_BEGIN +#ifndef _GL_U64_INLINE +# define _GL_U64_INLINE _GL_INLINE +#endif + /* Return X rotated left by N bits, where 0 < N < 64. */ #define u64rol(x, n) u64or (u64shl (x, n), u64shr (x, 64 - n)) @@ -30,6 +35,7 @@ typedef uint64_t u64; # define u64hilo(hi, lo) ((u64) (((u64) (hi) << 32) + (lo))) # define u64init(hi, lo) u64hilo (hi, lo) # define u64lo(x) ((u64) (x)) +# define u64size(x) u64lo (x) # define u64lt(x, y) ((x) < (y)) # define u64and(x, y) ((x) & (y)) # define u64or(x, y) ((x) | (y)) @@ -53,7 +59,7 @@ typedef struct { uint32_t lo, hi; } u64; /* Given the high and low-order 32-bit quantities HI and LO, return a u64 value representing (HI << 32) + LO. */ -static inline u64 +_GL_U64_INLINE u64 u64hilo (uint32_t hi, uint32_t lo) { u64 r; @@ -63,7 +69,7 @@ u64hilo (uint32_t hi, uint32_t lo) } /* Return a u64 value representing LO. */ -static inline u64 +_GL_U64_INLINE u64 u64lo (uint32_t lo) { u64 r; @@ -72,15 +78,25 @@ u64lo (uint32_t lo) return r; } +/* Return a u64 value representing SIZE. */ +_GL_U64_INLINE u64 +u64size (size_t size) +{ + u64 r; + r.hi = size >> 31 >> 1; + r.lo = size; + return r; +} + /* Return X < Y. */ -static inline int +_GL_U64_INLINE int u64lt (u64 x, u64 y) { return x.hi < y.hi || (x.hi == y.hi && x.lo < y.lo); } /* Return X & Y. */ -static inline u64 +_GL_U64_INLINE u64 u64and (u64 x, u64 y) { u64 r; @@ -90,7 +106,7 @@ u64and (u64 x, u64 y) } /* Return X | Y. */ -static inline u64 +_GL_U64_INLINE u64 u64or (u64 x, u64 y) { u64 r; @@ -100,7 +116,7 @@ u64or (u64 x, u64 y) } /* Return X ^ Y. */ -static inline u64 +_GL_U64_INLINE u64 u64xor (u64 x, u64 y) { u64 r; @@ -110,7 +126,7 @@ u64xor (u64 x, u64 y) } /* Return X + Y. */ -static inline u64 +_GL_U64_INLINE u64 u64plus (u64 x, u64 y) { u64 r; @@ -120,7 +136,7 @@ u64plus (u64 x, u64 y) } /* Return X << N. */ -static inline u64 +_GL_U64_INLINE u64 u64shl (u64 x, int n) { u64 r; @@ -138,7 +154,7 @@ u64shl (u64 x, int n) } /* Return X >> N. */ -static inline u64 +_GL_U64_INLINE u64 u64shr (u64 x, int n) { u64 r; @@ -156,3 +172,5 @@ u64shr (u64 x, int n) } #endif + +_GL_INLINE_HEADER_END diff --git a/lib/uname.c b/lib/uname.c index 660ae9ff..e6b29a47 100644 --- a/lib/uname.c +++ b/lib/uname.c @@ -1,5 +1,5 @@ /* uname replacement. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/unicodeio.c b/lib/unicodeio.c index 837c48dd..62aee248 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-2012 Free Software Foundation, Inc. + Copyright (C) 2000-2003, 2006, 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 @@ -38,7 +38,6 @@ #include "localcharset.h" #include "unistr.h" -#include "ignore-value.h" /* When we pass a Unicode character to iconv(), we must pass it in a suitable encoding. The standardized Unicode encodings are @@ -169,7 +168,7 @@ fwrite_success_callback (const char *buf, size_t buflen, void *callback_arg) conditions (STREAM is an open stream and not wide-character oriented) when fwrite() returns a value != buflen it also sets STREAM's error indicator. */ - ignore_value (fwrite (buf, 1, buflen, stream)); + fwrite (buf, 1, buflen, stream); return 0; } diff --git a/lib/unicodeio.h b/lib/unicodeio.h index 607e4c04..eee7e284 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-2012 Free Software Foundation, Inc. + Copyright (C) 2000-2003, 2005, 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 diff --git a/lib/unistd--.h b/lib/unistd--.h index 78b9e4ac..ac2de1cf 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-2012 Free Software Foundation, Inc. + Copyright (C) 2005, 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 diff --git a/lib/unistd-safer.h b/lib/unistd-safer.h index 684bf79f..5c2b55ae 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-2012 Free Software Foundation, Inc. + Copyright (C) 2001, 2003, 2005, 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 diff --git a/lib/unistd.c b/lib/unistd.c new file mode 100644 index 00000000..6c6a8e26 --- /dev/null +++ b/lib/unistd.c @@ -0,0 +1,3 @@ +#include <config.h> +#define _GL_UNISTD_INLINE _GL_EXTERN_INLINE +#include "unistd.h" diff --git a/lib/unistd.in.h b/lib/unistd.in.h index 9115486c..a870fe7b 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-2012 Free Software Foundation, Inc. + 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 @@ -14,29 +14,13 @@ 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@_UNISTD_H + #if __GNUC__ >= 3 @PRAGMA_SYSTEM_HEADER@ #endif @PRAGMA_COLUMNS@ -/* Special invocation convention: - - On mingw, several headers, including <winsock2.h>, include <unistd.h>, - but we need to ensure that both the system <unistd.h> and <winsock2.h> - are completely included before we replace gethostname. */ -#if @GNULIB_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@ \ - && !defined _GL_WINSOCK2_H_WITNESS && defined _WINSOCK2_H -/* <unistd.h> is being indirectly included for the first time from - <winsock2.h>; avoid declaring any overrides. */ -# if @HAVE_UNISTD_H@ -# @INCLUDE_NEXT@ @NEXT_UNISTD_H@ -# else -# error unexpected; report this to bug-gnulib@gnu.org -# endif -# define _GL_WINSOCK2_H_WITNESS - -/* Normal invocation. */ -#elif !defined _@GUARD_PREFIX@_UNISTD_H - /* The include_next requires a split double-inclusion guard. */ #if @HAVE_UNISTD_H@ # @INCLUDE_NEXT@ @NEXT_UNISTD_H@ @@ -79,7 +63,9 @@ /* Solaris declares getcwd not only in <unistd.h> but also in <stdlib.h>. */ /* But avoid namespace pollution on glibc systems. */ #ifndef __GLIBC__ +# define __need_system_stdlib_h # include <stdlib.h> +# undef __need_system_stdlib_h #endif /* Native Windows platforms declare chdir, getcwd, rmdir in @@ -127,6 +113,11 @@ # include <getopt.h> #endif +_GL_INLINE_HEADER_BEGIN +#ifndef _GL_UNISTD_INLINE +# define _GL_UNISTD_INLINE _GL_INLINE +#endif + /* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ /* The definition of _GL_ARG_NONNULL is copied here. */ @@ -404,7 +395,7 @@ extern char **environ; # endif #elif defined GNULIB_POSIXCHECK # if HAVE_RAW_DECL_ENVIRON -static inline char *** +_GL_UNISTD_INLINE char *** rpl_environ (void) { return &environ; @@ -862,7 +853,7 @@ _GL_CXXALIAS_RPL (getpagesize, int, (void)); # define getpagesize() _gl_getpagesize () # else # if !GNULIB_defined_getpagesize_function -static inline int +_GL_UNISTD_INLINE int getpagesize () { return _gl_getpagesize (); @@ -1318,7 +1309,7 @@ _GL_WARN_ON_USE (rmdir, "rmdir is unportable - " _GL_FUNCDECL_SYS (sethostname, int, (const char *name, size_t len) _GL_ARG_NONNULL ((1))); # endif -/* Need to cast, because on Solaris 11 2011-10, MacOS X 10.5, IRIX 6.5 +/* Need to cast, because on Solaris 11 2011-10, Mac OS X 10.5, IRIX 6.5 and FreeBSD 6.4 the second parameter is int. On Solaris 11 2011-10, the first parameter is not const. */ _GL_CXXALIAS_SYS_CAST (sethostname, int, (const char *name, size_t len)); @@ -1530,6 +1521,7 @@ _GL_CXXALIAS_SYS_CAST (write, ssize_t, (int fd, const void *buf, size_t count)); _GL_CXXALIASWARN (write); #endif +_GL_INLINE_HEADER_END #endif /* _@GUARD_PREFIX@_UNISTD_H */ #endif /* _@GUARD_PREFIX@_UNISTD_H */ diff --git a/lib/unistr.in.h b/lib/unistr.in.h index 5cda3f5a..980b4bbf 100644 --- a/lib/unistr.in.h +++ b/lib/unistr.in.h @@ -1,5 +1,5 @@ /* Elementary Unicode string functions. - Copyright (C) 2001-2002, 2005-2012 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 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 diff --git a/lib/unistr/u8-mbtoucr.c b/lib/unistr/u8-mbtoucr.c index 8bc59d7c..72cab8dc 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-2012 Free Software Foundation, Inc. + Copyright (C) 1999-2002, 2006-2007, 2009-2013 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 5ee212b7..47c2e882 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-2012 Free Software Foundation, Inc. + Copyright (C) 2002, 2006-2007, 2009-2013 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 e56e4a23..1932a2b4 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-2012 Free Software Foundation, Inc. + Copyright (C) 2002, 2005-2006, 2009-2013 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 e642b7a3..06eef05c 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-2012 Free Software Foundation, Inc. + Copyright (C) 2002, 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 diff --git a/lib/uniwidth.in.h b/lib/uniwidth.in.h index b90ce198..8931cc9b 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-2012 Free Software Foundation, + Copyright (C) 2001-2002, 2005, 2007, 2009-2013 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 d75c94f1..11b14dfe 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-2012 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2005-2007, 2009-2013 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 b6e2c334..173d0872 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-2012 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2006-2013 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 efaa1a6a..fdd5565f 100644 --- a/lib/unlink.c +++ b/lib/unlink.c @@ -1,6 +1,6 @@ /* Work around unlink bugs. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/unlinkat.c b/lib/unlinkat.c index 1c1807f4..67263721 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-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/unlocked-io.h b/lib/unlocked-io.h index 65bfbc4a..df3e1391 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-2012 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 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 diff --git a/lib/unsetenv.c b/lib/unsetenv.c index ddbe9a4d..eea21129 100644 --- a/lib/unsetenv.c +++ b/lib/unsetenv.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992, 1995-2002, 2005-2012 Free Software Foundation, Inc. +/* Copyright (C) 1992, 1995-2002, 2005-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 diff --git a/lib/userspec.c b/lib/userspec.c index d4554f8d..d760996c 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-2012 Free Software + Copyright (C) 1989-1992, 1997-1998, 2000, 2002-2013 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/utimecmp.c b/lib/utimecmp.c index e859b297..dc622ad1 100644 --- a/lib/utimecmp.c +++ b/lib/utimecmp.c @@ -1,6 +1,6 @@ /* utimecmp.c -- compare file time stamps - Copyright (C) 2004-2007, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 2004-2007, 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 diff --git a/lib/utimecmp.h b/lib/utimecmp.h index 4e9cb9bb..1bc90186 100644 --- a/lib/utimecmp.h +++ b/lib/utimecmp.h @@ -1,6 +1,6 @@ /* utimecmp.h -- compare file time stamps - Copyright (C) 2004, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 2004, 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 diff --git a/lib/utimens.c b/lib/utimens.c index c126b955..87123605 100644 --- a/lib/utimens.c +++ b/lib/utimens.c @@ -1,6 +1,6 @@ /* Set file access and modification times. - Copyright (C) 2003-2012 Free Software Foundation, Inc. + 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 @@ -21,6 +21,7 @@ #include <config.h> +#define _GL_UTIMENS_INLINE _GL_EXTERN_INLINE #include "utimens.h" #include <assert.h> diff --git a/lib/utimens.h b/lib/utimens.h index 8c47cf93..82a72a7a 100644 --- a/lib/utimens.h +++ b/lib/utimens.h @@ -1,3 +1,22 @@ +/* Set file access and modification times. + + Copyright 2012-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 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 <time.h> int fdutimens (int, char const *, struct timespec const [2]); int utimens (char const *, struct timespec const [2]); @@ -7,13 +26,21 @@ int lutimens (char const *, struct timespec const [2]); # include <fcntl.h> # include <sys/stat.h> +_GL_INLINE_HEADER_BEGIN +#ifndef _GL_UTIMENS_INLINE +# define _GL_UTIMENS_INLINE _GL_INLINE +#endif + int fdutimensat (int fd, int dir, char const *name, struct timespec const [2], int atflag); /* Using this function makes application code slightly more readable. */ -static inline int +_GL_UTIMENS_INLINE int lutimensat (int dir, char const *file, struct timespec const times[2]) { return utimensat (dir, file, times, AT_SYMLINK_NOFOLLOW); } + +_GL_INLINE_HEADER_END + #endif diff --git a/lib/utimensat.c b/lib/utimensat.c index caeeb5f0..01104002 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-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c index 0ebddf10..8fdab32e 100644 --- a/lib/vasnprintf.c +++ b/lib/vasnprintf.c @@ -1,5 +1,5 @@ /* vsprintf with automatic memory allocation. - Copyright (C) 1999, 2002-2012 Free Software Foundation, Inc. + Copyright (C) 1999, 2002-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 @@ -275,7 +275,7 @@ decimal_point_char (void) { const char *point; /* Determine it in a multithread-safe way. We know nl_langinfo is - multithread-safe on glibc systems and MacOS X systems, but is not required + multithread-safe on glibc systems and Mac OS X systems, but is not required to be multithread-safe by POSIX. sprintf(), however, is multithread-safe. localeconv() is rarely multithread-safe. */ # if HAVE_NL_LANGINFO && (__GLIBC__ || defined __UCLIBC__ || (defined __APPLE__ && defined __MACH__)) @@ -1530,7 +1530,7 @@ is_borderline (const char *digits, size_t precision) /* Returns the number of TCHAR_T units needed as temporary space for the result of sprintf or SNPRINTF of a single conversion directive. */ -static inline size_t +static size_t MAX_ROOM_NEEDED (const arguments *ap, size_t arg_index, FCHAR_T conversion, arg_type type, int flags, size_t width, int has_precision, size_t precision, int pad_ourselves) diff --git a/lib/vasnprintf.h b/lib/vasnprintf.h index dd869146..7658f505 100644 --- a/lib/vasnprintf.h +++ b/lib/vasnprintf.h @@ -1,5 +1,5 @@ /* vsprintf with automatic memory allocation. - Copyright (C) 2002-2004, 2007-2012 Free Software Foundation, Inc. + Copyright (C) 2002-2004, 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 diff --git a/lib/vasprintf.c b/lib/vasprintf.c index 16fc9d5b..d0d4a11b 100644 --- a/lib/vasprintf.c +++ b/lib/vasprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006-2012 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2006-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 diff --git a/lib/verify.h b/lib/verify.h index cef14ad1..cb8e90b5 100644 --- a/lib/verify.h +++ b/lib/verify.h @@ -1,6 +1,6 @@ /* Compile-time assert-like macros. - Copyright (C) 2005-2006, 2009-2012 Free Software Foundation, Inc. + 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 @@ -125,7 +125,7 @@ extern int (*dummy (void)) [sizeof (struct {...})]; * GCC warns about duplicate declarations of the dummy function if - -Wredundant_decls is used. GCC 4.3 and later have a builtin + -Wredundant-decls is used. GCC 4.3 and later have a builtin __COUNTER__ macro that can let us generate unique identifiers for each dummy function, to suppress this warning. @@ -133,6 +133,10 @@ which do not support _Static_assert, also do not warn about the last declaration mentioned above. + * GCC warns if -Wnested-externs is enabled and verify() is used + within a function body; but inside a function, you can always + arrange to use verify_expr() instead. + * In C++, any struct definition inside sizeof is invalid. Use a template type to work around the problem. */ diff --git a/lib/verror.c b/lib/verror.c index 2d060923..5f899c1b 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-2012 Free Software Foundation, Inc. + Copyright (C) 2006-2007, 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 diff --git a/lib/verror.h b/lib/verror.h index d8112139..7e7284ad 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-2012 Free Software Foundation, Inc. + Copyright (C) 2006-2007, 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 diff --git a/lib/version-etc-fsf.c b/lib/version-etc-fsf.c index c452f40d..e1c69da9 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-2012 Free Software Foundation, Inc. + Copyright (C) 1999-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 diff --git a/lib/version-etc.c b/lib/version-etc.c index ae1e44d6..b7d23ab5 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-2012 Free Software Foundation, Inc. + Copyright (C) 1999-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 @@ -38,7 +38,7 @@ # define PACKAGE PACKAGE_TARNAME #endif -enum { COPYRIGHT_YEAR = 2012 }; +enum { COPYRIGHT_YEAR = 2013 }; /* The three functions below display the --version information the standard way. diff --git a/lib/version-etc.h b/lib/version-etc.h index 5548c023..6c3d0843 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-2012 Free Software Foundation, Inc. + Copyright (C) 1999, 2003, 2005, 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 diff --git a/lib/vfprintf.c b/lib/vfprintf.c index 41177913..635e36eb 100644 --- a/lib/vfprintf.c +++ b/lib/vfprintf.c @@ -1,5 +1,5 @@ /* Formatted output to a stream. - Copyright (C) 2004, 2006-2012 Free Software Foundation, Inc. + Copyright (C) 2004, 2006-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 diff --git a/lib/vprintf.c b/lib/vprintf.c index df95f3f2..0c507582 100644 --- a/lib/vprintf.c +++ b/lib/vprintf.c @@ -1,5 +1,5 @@ /* Formatted output to a stream. - Copyright (C) 2007, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 2007, 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 diff --git a/lib/w32sock.h b/lib/w32sock.h index ef0b5937..44f3a1a0 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-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/w32spawn.h b/lib/w32spawn.h index 4cdb8434..3b5c08af 100644 --- a/lib/w32spawn.h +++ b/lib/w32spawn.h @@ -1,5 +1,5 @@ /* Auxiliary functions for the creation of subprocesses. Native Windows API. - Copyright (C) 2001, 2003-2012 Free Software Foundation, Inc. + 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 @@ -115,8 +115,15 @@ undup_safer_noinherit (int tempfd, int origfd) \" -> " \\\" -> \" \\\\\" -> \\" + - '*', '?' 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_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) diff --git a/lib/wait-process.c b/lib/wait-process.c index ed47ad7f..17a2430f 100644 --- a/lib/wait-process.c +++ b/lib/wait-process.c @@ -1,5 +1,5 @@ /* Waiting for a subprocess to finish. - Copyright (C) 2001-2003, 2005-2012 Free Software Foundation, Inc. + 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 @@ -171,7 +171,7 @@ register_slave_subprocess (pid_t child) } /* Unregister a child from the list of slave subprocesses. */ -static inline void +static void unregister_slave_subprocess (pid_t child) { /* The easiest way to remove an entry from a list that can be used by diff --git a/lib/wait-process.h b/lib/wait-process.h index bd204319..6d8f0d2b 100644 --- a/lib/wait-process.h +++ b/lib/wait-process.h @@ -1,5 +1,5 @@ /* Waiting for a subprocess to finish. - Copyright (C) 2001-2003, 2006, 2008-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/waitpid.c b/lib/waitpid.c index 9249d4c2..d28a70b3 100644 --- a/lib/waitpid.c +++ b/lib/waitpid.c @@ -1,5 +1,5 @@ /* Wait for process state change. - Copyright (C) 2001-2003, 2005-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/wchar.in.h b/lib/wchar.in.h index f9bc30c0..b6e43627 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/lib/wcrtomb.c b/lib/wcrtomb.c index 9e6494ee..da42809b 100644 --- a/lib/wcrtomb.c +++ b/lib/wcrtomb.c @@ -1,5 +1,5 @@ /* Convert wide character to multibyte character. - Copyright (C) 2008-2012 Free Software Foundation, Inc. + Copyright (C) 2008-2013 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 787a9db8..63476342 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-2012 Free Software Foundation, Inc. + Copyright (C) 1999, 2011-2013 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 c9d8fe53..383d5e1f 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-2012 Free Software Foundation, Inc. + Copyright (C) 2011-2013 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-h.c b/lib/wctype-h.c new file mode 100644 index 00000000..bb5f847e --- /dev/null +++ b/lib/wctype-h.c @@ -0,0 +1,4 @@ +/* Normally this would be wctype.c, but that name's already taken. */ +#include <config.h> +#define _GL_WCTYPE_INLINE _GL_EXTERN_INLINE +#include "wctype.h" diff --git a/lib/wctype.in.h b/lib/wctype.in.h index aa018b17..0cd02d5a 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-2012 Free Software Foundation, Inc. + Copyright (C) 2006-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 @@ -54,6 +54,11 @@ #ifndef _@GUARD_PREFIX@_WCTYPE_H #define _@GUARD_PREFIX@_WCTYPE_H +_GL_INLINE_HEADER_BEGIN +#ifndef _GL_WCTYPE_INLINE +# define _GL_WCTYPE_INLINE _GL_INLINE +#endif + /* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ /* The definition of _GL_WARN_ON_USE is copied here. */ @@ -148,7 +153,7 @@ typedef unsigned int rpl_wint_t; # endif # endif -static inline int +_GL_WCTYPE_INLINE int # if @REPLACE_ISWCNTRL@ rpl_iswalnum # else @@ -160,7 +165,7 @@ iswalnum || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z')); } -static inline int +_GL_WCTYPE_INLINE int # if @REPLACE_ISWCNTRL@ rpl_iswalpha # else @@ -171,7 +176,7 @@ iswalpha return (wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z'; } -static inline int +_GL_WCTYPE_INLINE int # if @REPLACE_ISWCNTRL@ rpl_iswblank # else @@ -182,7 +187,7 @@ iswblank return wc == ' ' || wc == '\t'; } -static inline int +_GL_WCTYPE_INLINE int # if @REPLACE_ISWCNTRL@ rpl_iswcntrl # else @@ -193,7 +198,7 @@ iswcntrl return (wc & ~0x1f) == 0 || wc == 0x7f; } -static inline int +_GL_WCTYPE_INLINE int # if @REPLACE_ISWCNTRL@ rpl_iswdigit # else @@ -204,7 +209,7 @@ iswdigit return wc >= '0' && wc <= '9'; } -static inline int +_GL_WCTYPE_INLINE int # if @REPLACE_ISWCNTRL@ rpl_iswgraph # else @@ -215,7 +220,7 @@ iswgraph return wc >= '!' && wc <= '~'; } -static inline int +_GL_WCTYPE_INLINE int # if @REPLACE_ISWCNTRL@ rpl_iswlower # else @@ -226,7 +231,7 @@ iswlower return wc >= 'a' && wc <= 'z'; } -static inline int +_GL_WCTYPE_INLINE int # if @REPLACE_ISWCNTRL@ rpl_iswprint # else @@ -237,7 +242,7 @@ iswprint return wc >= ' ' && wc <= '~'; } -static inline int +_GL_WCTYPE_INLINE int # if @REPLACE_ISWCNTRL@ rpl_iswpunct # else @@ -250,7 +255,7 @@ iswpunct || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z'))); } -static inline int +_GL_WCTYPE_INLINE int # if @REPLACE_ISWCNTRL@ rpl_iswspace # else @@ -262,7 +267,7 @@ iswspace || wc == '\n' || wc == '\v' || wc == '\f' || wc == '\r'); } -static inline int +_GL_WCTYPE_INLINE int # if @REPLACE_ISWCNTRL@ rpl_iswupper # else @@ -273,7 +278,7 @@ iswupper return wc >= 'A' && wc <= 'Z'; } -static inline int +_GL_WCTYPE_INLINE int # if @REPLACE_ISWCNTRL@ rpl_iswxdigit # else @@ -285,7 +290,7 @@ iswxdigit || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'F')); } -static inline wint_t +_GL_WCTYPE_INLINE wint_t # if @REPLACE_TOWLOWER@ rpl_towlower # else @@ -296,7 +301,7 @@ towlower return (wc >= 'A' && wc <= 'Z' ? wc - 'A' + 'a' : wc); } -static inline wint_t +_GL_WCTYPE_INLINE wint_t # if @REPLACE_TOWLOWER@ rpl_towupper # else @@ -336,7 +341,7 @@ _GL_FUNCDECL_SYS (iswblank, int, (wint_t wc)); result register. We need to fix this by adding a zero-extend from wchar_t to wint_t after the call. */ -static inline wint_t +_GL_WCTYPE_INLINE wint_t rpl_towlower (wint_t wc) { return (wint_t) (wchar_t) towlower (wc); @@ -345,7 +350,7 @@ rpl_towlower (wint_t wc) # define towlower rpl_towlower # endif -static inline wint_t +_GL_WCTYPE_INLINE wint_t rpl_towupper (wint_t wc) { return (wint_t) (wchar_t) towupper (wc); @@ -493,6 +498,7 @@ _GL_WARN_ON_USE (towctrans, "towctrans is unportable - " # endif #endif +_GL_INLINE_HEADER_END #endif /* _@GUARD_PREFIX@_WCTYPE_H */ #endif /* _@GUARD_PREFIX@_WCTYPE_H */ diff --git a/lib/wcwidth.c b/lib/wcwidth.c index 44503b04..253fcaa6 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-2012 Free Software Foundation, Inc. + Copyright (C) 2006-2007, 2010-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 diff --git a/lib/write-any-file.c b/lib/write-any-file.c index 742c2570..f6d2747c 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-2012 Free Software Foundation, Inc. + Copyright (C) 2007, 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 @@ -21,6 +21,7 @@ #include "write-any-file.h" #include "priv-set.h" +#include "root-uid.h" #include <unistd.h> @@ -40,7 +41,7 @@ can_write_any_file (void) can = (priv_set_ismember (PRIV_FILE_DAC_WRITE) == 1); #else /* In traditional Unix, only root can unlink directories. */ - can = (geteuid () == 0); + can = (geteuid () == ROOT_UID); #endif can_write = can; initialized = true; diff --git a/lib/write.c b/lib/write.c index 0155309b..2d204219 100644 --- a/lib/write.c +++ b/lib/write.c @@ -1,5 +1,5 @@ /* POSIX compatible write() function. - Copyright (C) 2008-2012 Free Software Foundation, Inc. + Copyright (C) 2008-2013 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2008. This program is free software: you can redistribute it and/or modify @@ -40,7 +40,7 @@ # undef write # if HAVE_MSVC_INVALID_PARAMETER_HANDLER -static inline ssize_t +static ssize_t write_nothrow (int fd, const void *buf, size_t count) { ssize_t result; diff --git a/lib/xalloc-die.c b/lib/xalloc-die.c index e85d6dfb..daa403b9 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-2012 Free Software + Copyright (C) 1997-2000, 2002-2004, 2006, 2009-2013 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 67797559..a971c78a 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-2012 Free Software Foundation, Inc. + Copyright (C) 1990-2000, 2003-2004, 2006-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 @@ -22,7 +22,7 @@ /* Return 1 if an array of N objects, each of size S, cannot exist due to size arithmetic overflow. S must be positive and N must be - nonnegative. This is a macro, not an inline function, so that it + nonnegative. This is a macro, not a function, so that it works correctly even when SIZE_MAX < N. By gnulib convention, SIZE_MAX represents overflow in size diff --git a/lib/xalloc.h b/lib/xalloc.h index 6f5b87ee..da7c4b6b 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-2012 Free Software Foundation, Inc. + Copyright (C) 1990-2000, 2003-2004, 2006-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 @@ -16,28 +16,33 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #ifndef XALLOC_H_ -# define XALLOC_H_ +#define XALLOC_H_ -# include <stddef.h> +#include <stddef.h> -# include "xalloc-oversized.h" +#include "xalloc-oversized.h" -# ifdef __cplusplus +_GL_INLINE_HEADER_BEGIN +#ifndef XALLOC_INLINE +# define XALLOC_INLINE _GL_INLINE +#endif + +#ifdef __cplusplus extern "C" { -# endif +#endif -# if __GNUC__ >= 3 -# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) -# else -# define _GL_ATTRIBUTE_MALLOC -# endif +#if __GNUC__ >= 3 +# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) +#else +# define _GL_ATTRIBUTE_MALLOC +#endif -# if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) -# define _GL_ATTRIBUTE_ALLOC_SIZE(args) __attribute__ ((__alloc_size__ args)) -# else -# define _GL_ATTRIBUTE_ALLOC_SIZE(args) -# endif +#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) +# define _GL_ATTRIBUTE_ALLOC_SIZE(args) __attribute__ ((__alloc_size__ args)) +#else +# define _GL_ATTRIBUTE_ALLOC_SIZE(args) +#endif /* This function is always triggered when memory is exhausted. It must be defined by the application, either explicitly @@ -67,45 +72,31 @@ char *xstrdup (char const *str) /* Allocate an object of type T dynamically, with error checking. */ /* extern t *XMALLOC (typename t); */ -# define XMALLOC(t) ((t *) xmalloc (sizeof (t))) +#define XMALLOC(t) ((t *) xmalloc (sizeof (t))) /* Allocate memory for N elements of type T, with error checking. */ /* extern t *XNMALLOC (size_t n, typename t); */ -# define XNMALLOC(n, t) \ - ((t *) (sizeof (t) == 1 ? xmalloc (n) : xnmalloc (n, sizeof (t)))) +#define XNMALLOC(n, t) \ + ((t *) (sizeof (t) == 1 ? xmalloc (n) : xnmalloc (n, sizeof (t)))) /* Allocate an object of type T dynamically, with error checking, and zero it. */ /* extern t *XZALLOC (typename t); */ -# define XZALLOC(t) ((t *) xzalloc (sizeof (t))) +#define XZALLOC(t) ((t *) xzalloc (sizeof (t))) /* Allocate memory for N elements of type T, with error checking, and zero it. */ /* extern t *XCALLOC (size_t n, typename t); */ -# define XCALLOC(n, t) \ - ((t *) (sizeof (t) == 1 ? xzalloc (n) : xcalloc (n, sizeof (t)))) - - -# if HAVE_INLINE -# define static_inline static inline -# else -void *xnmalloc (size_t n, size_t s) - _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_ALLOC_SIZE ((1, 2)); -void *xnrealloc (void *p, size_t n, size_t s) - _GL_ATTRIBUTE_ALLOC_SIZE ((2, 3)); -void *x2nrealloc (void *p, size_t *pn, size_t s); -char *xcharalloc (size_t n) - _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_ALLOC_SIZE ((1)); -# endif +#define XCALLOC(n, t) \ + ((t *) (sizeof (t) == 1 ? xzalloc (n) : xcalloc (n, sizeof (t)))) -# ifdef static_inline /* Allocate an array of N objects, each with S bytes of memory, dynamically, with error checking. S must be nonzero. */ -static_inline void *xnmalloc (size_t n, size_t s) +XALLOC_INLINE void *xnmalloc (size_t n, size_t s) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_ALLOC_SIZE ((1, 2)); -static_inline void * +XALLOC_INLINE void * xnmalloc (size_t n, size_t s) { if (xalloc_oversized (n, s)) @@ -116,9 +107,9 @@ xnmalloc (size_t n, size_t s) /* Change the size of an allocated block of memory P to an array of N objects each of S bytes, with error checking. S must be nonzero. */ -static_inline void *xnrealloc (void *p, size_t n, size_t s) +XALLOC_INLINE void *xnrealloc (void *p, size_t n, size_t s) _GL_ATTRIBUTE_ALLOC_SIZE ((2, 3)); -static_inline void * +XALLOC_INLINE void * xnrealloc (void *p, size_t n, size_t s) { if (xalloc_oversized (n, s)) @@ -181,7 +172,7 @@ xnrealloc (void *p, size_t n, size_t s) */ -static_inline void * +XALLOC_INLINE void * x2nrealloc (void *p, size_t *pn, size_t s) { size_t n = *pn; @@ -218,17 +209,15 @@ x2nrealloc (void *p, size_t *pn, size_t s) /* Return a pointer to a new buffer of N bytes. This is like xmalloc, except it returns char *. */ -static_inline char *xcharalloc (size_t n) +XALLOC_INLINE char *xcharalloc (size_t n) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_ALLOC_SIZE ((1)); -static_inline char * +XALLOC_INLINE char * xcharalloc (size_t n) { return XNMALLOC (n, char); } -# endif - -# ifdef __cplusplus +#ifdef __cplusplus } /* C++ does not allow conversions from void * to other pointer types @@ -265,7 +254,7 @@ xmemdup (T const *p, size_t s) return (T *) xmemdup ((void const *) p, s); } -# endif +#endif #endif /* !XALLOC_H_ */ diff --git a/lib/xasprintf.c b/lib/xasprintf.c index b4414054..1808b701 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-2012 Free Software Foundation, + Copyright (C) 1999, 2002-2004, 2006, 2009-2013 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 d20d9ada..c7acbd17 100644 --- a/lib/xfreopen.c +++ b/lib/xfreopen.c @@ -1,5 +1,5 @@ /* a wrapper for frepoen - Copyright (C) 2008-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/xfts.c b/lib/xfts.c index b19200e2..e982cc08 100644 --- a/lib/xfts.c +++ b/lib/xfts.c @@ -1,6 +1,6 @@ /* xfts.c -- a wrapper for fts_open - Copyright (C) 2003-2012 Free Software Foundation, Inc. + 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 diff --git a/lib/xgetcwd.c b/lib/xgetcwd.c index b8546bf1..d4e7a783 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-2012 Free Software + Copyright (C) 2001, 2003-2004, 2006-2007, 2009-2013 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 989eb5f4..fa15bc60 100644 --- a/lib/xgetcwd.h +++ b/lib/xgetcwd.h @@ -1,5 +1,5 @@ /* prototype for xgetcwd - Copyright (C) 1995, 2001, 2003, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 1995, 2001, 2003, 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 diff --git a/lib/xgetgroups.c b/lib/xgetgroups.c index 5f1d554e..98080db0 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/lib/xgethostname.c b/lib/xgethostname.c index d5e61666..5d5a07c7 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-2012 Free Software + Copyright (C) 1992, 1996, 2000-2001, 2003-2006, 2009-2013 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 3b5f86cd..57e34b7c 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-2012 Free Software Foundation, Inc. + Copyright (C) 1990-2000, 2002-2006, 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 @@ -17,11 +17,9 @@ #include <config.h> -#if ! HAVE_INLINE -# define static_inline -#endif +#define XALLOC_INLINE _GL_EXTERN_INLINE + #include "xalloc.h" -#undef static_inline #include <stdlib.h> #include <string.h> diff --git a/lib/xmemcoll.c b/lib/xmemcoll.c index 08267420..59d9555b 100644 --- a/lib/xmemcoll.c +++ b/lib/xmemcoll.c @@ -1,6 +1,6 @@ /* Locale-specific memory comparison. - Copyright (C) 2002-2004, 2006, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 2002-2004, 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 diff --git a/lib/xnanosleep.c b/lib/xnanosleep.c index abad1320..d9b97a18 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-2012 Free Software Foundation, Inc. + Copyright (C) 2002-2007, 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 diff --git a/lib/xprintf.c b/lib/xprintf.c index bfd9ae0d..e24b4f18 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-2012 Free Software Foundation, Inc. + Copyright (C) 2007, 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 diff --git a/lib/xprintf.h b/lib/xprintf.h index 8a76b1ac..62986a8c 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-2012 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/lib/xreadlink.c b/lib/xreadlink.c index ab11f116..cdf9f632 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-2012 Free Software Foundation, Inc. + Copyright (C) 2001, 2003-2007, 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 diff --git a/lib/xreadlink.h b/lib/xreadlink.h index 17c6415e..da62be61 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-2012 Free Software Foundation, + Copyright (C) 2001, 2003-2004, 2007, 2009-2013 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/xsize.c b/lib/xsize.c new file mode 100644 index 00000000..4b4914c2 --- /dev/null +++ b/lib/xsize.c @@ -0,0 +1,3 @@ +#include <config.h> +#define XSIZE_INLINE _GL_EXTERN_INLINE +#include "xsize.h" diff --git a/lib/xsize.h b/lib/xsize.h index 515327e9..2922f353 100644 --- a/lib/xsize.h +++ b/lib/xsize.h @@ -1,6 +1,6 @@ /* xsize.h -- Checked size_t computations. - Copyright (C) 2003, 2008-2012 Free Software Foundation, Inc. + Copyright (C) 2003, 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 @@ -27,6 +27,11 @@ # include <stdint.h> #endif +_GL_INLINE_HEADER_BEGIN +#ifndef XSIZE_INLINE +# define XSIZE_INLINE _GL_INLINE +#endif + /* The size of memory objects is often computed through expressions of type size_t. Example: void* p = malloc (header_size + n * element_size). @@ -48,7 +53,7 @@ ((N) <= SIZE_MAX ? (size_t) (N) : SIZE_MAX) /* Sum of two sizes, with overflow check. */ -static inline size_t +XSIZE_INLINE size_t #if __GNUC__ >= 3 __attribute__ ((__pure__)) #endif @@ -59,7 +64,7 @@ xsum (size_t size1, size_t size2) } /* Sum of three sizes, with overflow check. */ -static inline size_t +XSIZE_INLINE size_t #if __GNUC__ >= 3 __attribute__ ((__pure__)) #endif @@ -69,7 +74,7 @@ xsum3 (size_t size1, size_t size2, size_t size3) } /* Sum of four sizes, with overflow check. */ -static inline size_t +XSIZE_INLINE size_t #if __GNUC__ >= 3 __attribute__ ((__pure__)) #endif @@ -79,7 +84,7 @@ xsum4 (size_t size1, size_t size2, size_t size3, size_t size4) } /* Maximum of two sizes, with overflow check. */ -static inline size_t +XSIZE_INLINE size_t #if __GNUC__ >= 3 __attribute__ ((__pure__)) #endif @@ -92,7 +97,7 @@ xmax (size_t size1, size_t size2) /* Multiplication of a count with an element size, with overflow check. The count must be >= 0 and the element size must be > 0. - This is a macro, not an inline function, so that it works correctly even + This is a macro, not a function, so that it works correctly even when N is of a wider type and N > SIZE_MAX. */ #define xtimes(N, ELSIZE) \ ((N) <= SIZE_MAX / (ELSIZE) ? (size_t) (N) * (ELSIZE) : SIZE_MAX) @@ -104,4 +109,6 @@ xmax (size_t size1, size_t size2) #define size_in_bounds_p(SIZE) \ ((SIZE) != SIZE_MAX) +_GL_INLINE_HEADER_END + #endif /* _XSIZE_H */ diff --git a/lib/xstriconv.c b/lib/xstriconv.c index 23d6fc61..fb8aad24 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-2012 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2006, 2009-2013 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 f176f4eb..2b239e74 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-2012 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2006-2007, 2009-2013 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 40ffdfe9..eae92d03 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-2012 Free Software Foundation, Inc. + Copyright (C) 2003, 2006-2007, 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 diff --git a/lib/xstrndup.h b/lib/xstrndup.h index 765e9cb9..59673b04 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-2012 Free Software Foundation, Inc. + Copyright (C) 2003, 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 diff --git a/lib/xstrtod.c b/lib/xstrtod.c index 0ee7a7f7..a36a6135 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-2012 Free Software + Copyright (C) 1996, 1999-2000, 2003-2006, 2009-2013 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 32f80b1e..8a4543d0 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-2012 Free Software + Copyright (C) 1996, 1998, 2003-2004, 2006, 2009-2013 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 ce96ef6c..688cef72 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-2012 Free Software + Copyright (C) 1995-1996, 1998-1999, 2001-2004, 2006-2013 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 7c4fbd87..6f78572a 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-2012 Free Software + Copyright (C) 1995-1996, 1998-2001, 2003-2007, 2009-2013 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/xstrtol.h b/lib/xstrtol.h index 516ac565..5354c872 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-2012 Free Software + Copyright (C) 1995-1996, 1998-1999, 2001-2004, 2006-2013 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -66,7 +66,7 @@ _DECLARE_XSTRTOL (xstrtoull, unsigned long long int) After reporting an error, exit with a failure status. */ -void _Noreturn xstrtol_fatal (enum strtol_error, +_Noreturn void xstrtol_fatal (enum strtol_error, int, char, struct option const *, char const *); diff --git a/lib/xtime.c b/lib/xtime.c new file mode 100644 index 00000000..e608f69f --- /dev/null +++ b/lib/xtime.c @@ -0,0 +1,3 @@ +#include <config.h> +#define XTIME_INLINE _GL_EXTERN_INLINE +#include "xtime.h" diff --git a/lib/xtime.h b/lib/xtime.h index adab518b..c38e9dc3 100644 --- a/lib/xtime.h +++ b/lib/xtime.h @@ -1,6 +1,6 @@ /* xtime -- extended-resolution integer time stamps - Copyright (C) 2005-2006, 2009-2012 Free Software Foundation, Inc. + 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 @@ -18,28 +18,37 @@ /* Written by Paul Eggert. */ #ifndef XTIME_H_ -# define XTIME_H_ 1 +#define XTIME_H_ 1 + +_GL_INLINE_HEADER_BEGIN +#ifndef XTIME_INLINE +# define XTIME_INLINE _GL_INLINE +#endif /* xtime_t is a signed type used for time stamps. It is an integer type that is a count of nanoseconds -- except for obsolescent hosts without sufficiently-wide integers, where it is a count of seconds. */ -# if HAVE_LONG_LONG_INT +#if HAVE_LONG_LONG_INT typedef long long int xtime_t; -# define XTIME_PRECISION 1000000000 -# else -# include <limits.h> +# define XTIME_PRECISION 1000000000 +#else +# include <limits.h> typedef long int xtime_t; -# if LONG_MAX >> 31 >> 31 == 0 -# define XTIME_PRECISION 1 -# else -# define XTIME_PRECISION 1000000000 -# endif +# if LONG_MAX >> 31 >> 31 == 0 +# define XTIME_PRECISION 1 +# else +# define XTIME_PRECISION 1000000000 # endif +#endif + +#ifdef __cplusplus +extern "C" { +#endif /* Return an extended time value that contains S seconds and NS nanoseconds, without any overflow checking. */ -static inline xtime_t +XTIME_INLINE xtime_t xtime_make (xtime_t s, long int ns) { if (XTIME_PRECISION == 1) @@ -49,14 +58,14 @@ xtime_make (xtime_t s, long int ns) } /* Return the number of seconds in T, which must be nonnegative. */ -static inline xtime_t +XTIME_INLINE xtime_t xtime_nonnegative_sec (xtime_t t) { return t / XTIME_PRECISION; } /* Return the number of seconds in T. */ -static inline xtime_t +XTIME_INLINE xtime_t xtime_sec (xtime_t t) { return (XTIME_PRECISION == 1 @@ -67,14 +76,14 @@ xtime_sec (xtime_t t) } /* Return the number of nanoseconds in T, which must be nonnegative. */ -static inline long int +XTIME_INLINE long int xtime_nonnegative_nsec (xtime_t t) { return t % XTIME_PRECISION; } /* Return the number of nanoseconds in T. */ -static inline long int +XTIME_INLINE long int xtime_nsec (xtime_t t) { long int ns = t % XTIME_PRECISION; @@ -83,4 +92,8 @@ xtime_nsec (xtime_t t) return ns; } +#ifdef __cplusplus +} +#endif + #endif diff --git a/lib/xvasprintf.c b/lib/xvasprintf.c index 7aaafd8c..702b5e6b 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-2012 Free Software Foundation, Inc. + Copyright (C) 1999, 2002-2004, 2006-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 @@ -29,7 +29,7 @@ /* Checked size_t computations. */ #include "xsize.h" -static inline char * +static char * xstrcat (size_t argcount, va_list args) { char *result; diff --git a/lib/xvasprintf.h b/lib/xvasprintf.h index 868d31fb..1208fa19 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-2012 Free Software Foundation, Inc. + Copyright (C) 2002-2004, 2006-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 diff --git a/lib/yesno.c b/lib/yesno.c index f379cf87..37976791 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-2012 Free Software Foundation, Inc. + Copyright (C) 1990, 1998, 2001, 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 diff --git a/lib/yesno.h b/lib/yesno.h index af9639c4..470b9db6 100644 --- a/lib/yesno.h +++ b/lib/yesno.h @@ -1,5 +1,5 @@ /* declare yesno - Copyright (C) 2004, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 2004, 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 diff --git a/m4/00gnulib.m4 b/m4/00gnulib.m4 index d978cb89..d4ad759f 100644 --- a/m4/00gnulib.m4 +++ b/m4/00gnulib.m4 @@ -1,5 +1,5 @@ # 00gnulib.m4 serial 2 -dnl Copyright (C) 2009-2012 Free Software Foundation, Inc. +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. diff --git a/m4/ChangeLog-2007 b/m4/ChangeLog-2007 index ce06988b..821f1626 100644 --- a/m4/ChangeLog-2007 +++ b/m4/ChangeLog-2007 @@ -5004,7 +5004,7 @@ ----- - Copyright (C) 1997-2012 Free Software Foundation, Inc. + Copyright (C) 1997-2013 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice diff --git a/m4/acl.m4 b/m4/acl.m4 index 3ce4d180..5b1fb65e 100644 --- a/m4/acl.m4 +++ b/m4/acl.m4 @@ -1,7 +1,7 @@ # acl.m4 - check for access control list (ACL) primitives -# serial 13 +# serial 15 -# Copyright (C) 2002, 2004-2012 Free Software Foundation, Inc. +# Copyright (C) 2002, 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. @@ -16,14 +16,13 @@ AC_DEFUN([gl_FUNC_ACL], LIB_ACL= use_acl=0 - AC_REQUIRE([AC_C_INLINE]) if test "x$enable_acl" != "xno"; then dnl On all platforms, the ACL related API is declared in <sys/acl.h>. AC_CHECK_HEADERS([sys/acl.h]) if test $ac_cv_header_sys_acl_h = yes; then ac_save_LIBS=$LIBS - dnl Test for POSIX-draft-like API (Linux, FreeBSD, MacOS X, IRIX, Tru64). + dnl Test for POSIX-draft-like API (Linux, FreeBSD, Mac OS X, IRIX, Tru64). dnl -lacl is needed on Linux, -lpacl is needed on OSF/1. if test $use_acl = 0; then AC_SEARCH_LIBS([acl_get_file], [acl pacl], @@ -55,7 +54,7 @@ int type = ACL_FIRST_ENTRY;]])], AC_DEFINE([HAVE_ACL_FIRST_ENTRY], [1], [Define to 1 if the constant ACL_FIRST_ENTRY exists.]) fi - dnl On MacOS X, other types of ACLs are supported. + dnl On Mac OS X, other types of ACLs are supported. AC_CACHE_CHECK([for ACL_TYPE_EXTENDED], [gl_cv_acl_ACL_TYPE_EXTENDED], [AC_COMPILE_IFELSE([AC_LANG_PROGRAM( diff --git a/m4/alloca.m4 b/m4/alloca.m4 index 656924be..270abd0c 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-2012 Free Software Foundation, +dnl Copyright (C) 2002-2004, 2006-2007, 2009-2013 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 36915d12..ea69af57 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-2012 Free Software Foundation, Inc. +dnl Copyright (C) 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. diff --git a/m4/assert.m4 b/m4/assert.m4 index b748e5ec..013fade0 100644 --- a/m4/assert.m4 +++ b/m4/assert.m4 @@ -1,6 +1,6 @@ #serial 7 -# Copyright (C) 1998-1999, 2001, 2004, 2008-2012 Free Software Foundation, Inc. +# Copyright (C) 1998-1999, 2001, 2004, 2008-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. diff --git a/m4/autobuild.m4 b/m4/autobuild.m4 index 284dc602..3147b5b0 100644 --- a/m4/autobuild.m4 +++ b/m4/autobuild.m4 @@ -1,5 +1,5 @@ # autobuild.m4 serial 7 -dnl Copyright (C) 2004, 2006-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2004, 2006-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. diff --git a/m4/backupfile.m4 b/m4/backupfile.m4 index 639ca82d..019665a6 100644 --- a/m4/backupfile.m4 +++ b/m4/backupfile.m4 @@ -1,5 +1,5 @@ # backupfile.m4 serial 14 -dnl Copyright (C) 2002-2006, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 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. diff --git a/m4/base64.m4 b/m4/base64.m4 index fa0c1928..fc19893e 100644 --- a/m4/base64.m4 +++ b/m4/base64.m4 @@ -1,5 +1,5 @@ -# base64.m4 serial 3 -dnl Copyright (C) 2004, 2006, 2009-2012 Free Software Foundation, Inc. +# base64.m4 serial 4 +dnl Copyright (C) 2004, 2006, 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. @@ -11,6 +11,5 @@ AC_DEFUN([gl_FUNC_BASE64], # Prerequisites of lib/base64.c. AC_DEFUN([gl_PREREQ_BASE64], [ - AC_REQUIRE([AC_C_INLINE]) AC_REQUIRE([AC_C_RESTRICT]) ]) diff --git a/m4/bison.m4 b/m4/bison.m4 index 2c4afbe1..3b1297ab 100644 --- a/m4/bison.m4 +++ b/m4/bison.m4 @@ -1,6 +1,6 @@ # serial 7 -# Copyright (C) 2002, 2005, 2009-2012 Free Software Foundation, Inc. +# Copyright (C) 2002, 2005, 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. diff --git a/m4/boottime.m4 b/m4/boottime.m4 index 4d6058b1..fc0e6c3c 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-2012 Free Software Foundation, Inc. +# Copyright (C) 1996-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 diff --git a/m4/btowc.m4 b/m4/btowc.m4 index e565321c..978a06e9 100644 --- a/m4/btowc.m4 +++ b/m4/btowc.m4 @@ -1,5 +1,5 @@ # btowc.m4 serial 10 -dnl Copyright (C) 2008-2012 Free Software Foundation, Inc. +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. diff --git a/m4/c-strtod.m4 b/m4/c-strtod.m4 index c002e5fc..318487f3 100644 --- a/m4/c-strtod.m4 +++ b/m4/c-strtod.m4 @@ -1,6 +1,6 @@ -# c-strtod.m4 serial 14 +# c-strtod.m4 serial 15 -# Copyright (C) 2004-2006, 2009-2012 Free Software Foundation, Inc. +# Copyright (C) 2004-2006, 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. @@ -38,9 +38,6 @@ AC_DEFUN([gl_C_STRTOD], [ AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) AC_CHECK_FUNCS([strtod_l]) - - AC_REQUIRE([AC_C_INLINE]) - : ]) dnl Prerequisites of lib/c-strtold.c. @@ -49,7 +46,4 @@ AC_DEFUN([gl_C_STRTOLD], AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) AC_REQUIRE([gl_C99_STRTOLD]) AC_CHECK_FUNCS([strtold_l]) - - AC_REQUIRE([AC_C_INLINE]) - : ]) diff --git a/m4/calloc.m4 b/m4/calloc.m4 index 00c5fe43..c1ede8db 100644 --- a/m4/calloc.m4 +++ b/m4/calloc.m4 @@ -1,6 +1,6 @@ # calloc.m4 serial 15 -# Copyright (C) 2004-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. diff --git a/m4/canon-host.m4 b/m4/canon-host.m4 index 852559f3..7e7c6fc1 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-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002-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. diff --git a/m4/canonicalize.m4 b/m4/canonicalize.m4 index 69b3f4ca..cef31244 100644 --- a/m4/canonicalize.m4 +++ b/m4/canonicalize.m4 @@ -1,6 +1,6 @@ -# canonicalize.m4 serial 24 +# canonicalize.m4 serial 26 -dnl Copyright (C) 2003-2007, 2009-2012 Free Software Foundation, Inc. +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, @@ -16,8 +16,11 @@ AC_DEFUN([gl_FUNC_CANONICALIZE_FILENAME_MODE], AC_REQUIRE([gl_FUNC_REALPATH_WORKS]) if test $ac_cv_func_canonicalize_file_name = no; then HAVE_CANONICALIZE_FILE_NAME=0 - elif test "$gl_cv_func_realpath_works" != yes; then - REPLACE_CANONICALIZE_FILE_NAME=1 + else + case "$gl_cv_func_realpath_works" in + *yes) ;; + *) REPLACE_CANONICALIZE_FILE_NAME=1 ;; + esac fi ]) @@ -30,12 +33,21 @@ AC_DEFUN([gl_CANONICALIZE_LGPL], HAVE_CANONICALIZE_FILE_NAME=0 if test $ac_cv_func_realpath = no; then HAVE_REALPATH=0 - elif test "$gl_cv_func_realpath_works" != yes; then - REPLACE_REALPATH=1 + else + case "$gl_cv_func_realpath_works" in + *yes) ;; + *) REPLACE_REALPATH=1 ;; + esac fi - elif test "$gl_cv_func_realpath_works" != yes; then - REPLACE_CANONICALIZE_FILE_NAME=1 - REPLACE_REALPATH=1 + else + case "$gl_cv_func_realpath_works" in + *yes) + ;; + *) + REPLACE_CANONICALIZE_FILE_NAME=1 + REPLACE_REALPATH=1 + ;; + esac fi ]) @@ -94,10 +106,10 @@ AC_DEFUN([gl_FUNC_REALPATH_WORKS], [gl_cv_func_realpath_works=yes], [gl_cv_func_realpath_works=no], [case "$host_os" in - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_realpath_works="guessing yes" ;; - # If we don't know, assume the worst. - *) gl_cv_func_realpath_works="guessing no" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_realpath_works="guessing yes" ;; + # If we don't know, assume the worst. + *) gl_cv_func_realpath_works="guessing no" ;; esac ]) rm -rf conftest.a conftest.d diff --git a/m4/chdir-long.m4 b/m4/chdir-long.m4 index 6180891b..9c498a62 100644 --- a/m4/chdir-long.m4 +++ b/m4/chdir-long.m4 @@ -1,4 +1,4 @@ -#serial 14 +#serial 15 # Use Gnulib's robust chdir function. # It can handle arbitrarily long directory names, which means @@ -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-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2004-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. @@ -27,8 +27,4 @@ have_arbitrary_file_name_length_limit gl_cv_have_arbitrary_file_name_length_limit=no)]) ]) -AC_DEFUN([gl_PREREQ_CHDIR_LONG], -[ - AC_REQUIRE([AC_C_INLINE]) - : -]) +AC_DEFUN([gl_PREREQ_CHDIR_LONG], [:]) diff --git a/m4/check-decl.m4 b/m4/check-decl.m4 index 50c6f539..79f63b50 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-2012 Free Software Foundation, Inc. +dnl Copyright (C) 1997-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, diff --git a/m4/chown.m4 b/m4/chown.m4 index b35092a2..e5c084db 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-2012 Free Software +dnl Copyright (C) 1997-2001, 2003-2005, 2007, 2009-2013 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 0bec0ef8..6597fb63 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-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 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. diff --git a/m4/close-stream.m4 b/m4/close-stream.m4 index be0c8a22..0a80c37a 100644 --- a/m4/close-stream.m4 +++ b/m4/close-stream.m4 @@ -1,5 +1,5 @@ #serial 4 -dnl Copyright (C) 2006-2007, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2006-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. diff --git a/m4/close.m4 b/m4/close.m4 index 379e70d8..bccd9819 100644 --- a/m4/close.m4 +++ b/m4/close.m4 @@ -1,5 +1,5 @@ # close.m4 serial 8 -dnl Copyright (C) 2008-2012 Free Software Foundation, Inc. +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. diff --git a/m4/closedir.m4 b/m4/closedir.m4 index 8a2fba4b..bb8708b6 100644 --- a/m4/closedir.m4 +++ b/m4/closedir.m4 @@ -1,5 +1,5 @@ # closedir.m4 serial 2 -dnl Copyright (C) 2011-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2011-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. diff --git a/m4/closein.m4 b/m4/closein.m4 index 459e908f..ca03c76b 100644 --- a/m4/closein.m4 +++ b/m4/closein.m4 @@ -1,5 +1,5 @@ # closein.m4 serial 2 -dnl Copyright (C) 2007, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 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. diff --git a/m4/closeout.m4 b/m4/closeout.m4 index 71395c1a..759feaae 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-2012 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2013 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 cf53d241..c2761be2 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-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2000-2002, 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. diff --git a/m4/config-h.m4 b/m4/config-h.m4 index b61e22f5..9158d669 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-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 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. diff --git a/m4/configmake.m4 b/m4/configmake.m4 index 8c82371e..823ffc0d 100644 --- a/m4/configmake.m4 +++ b/m4/configmake.m4 @@ -1,5 +1,5 @@ # configmake.m4 serial 1 -dnl Copyright (C) 2010-2012 Free Software Foundation, Inc. +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. diff --git a/m4/ctype.m4 b/m4/ctype.m4 index c1a4f225..100bd3a7 100644 --- a/m4/ctype.m4 +++ b/m4/ctype.m4 @@ -1,5 +1,5 @@ # ctype_h.m4 serial 6 -dnl Copyright (C) 2009-2012 Free Software Foundation, Inc. +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. diff --git a/m4/cu-progs.m4 b/m4/cu-progs.m4 new file mode 100644 index 00000000..404996d7 --- /dev/null +++ b/m4/cu-progs.m4 @@ -0,0 +1,106 @@ +dnl Automatically generated by gen-lists-of-programs.sh. DO NOT EDIT BY HAND! +gl_ADD_PROG([optional_bin_progs], [@<:@]) +gl_ADD_PROG([optional_bin_progs], [base64]) +gl_ADD_PROG([optional_bin_progs], [basename]) +gl_ADD_PROG([optional_bin_progs], [cat]) +gl_ADD_PROG([optional_bin_progs], [chcon]) +gl_ADD_PROG([optional_bin_progs], [chgrp]) +gl_ADD_PROG([optional_bin_progs], [chmod]) +gl_ADD_PROG([optional_bin_progs], [chown]) +gl_ADD_PROG([optional_bin_progs], [cksum]) +gl_ADD_PROG([optional_bin_progs], [comm]) +gl_ADD_PROG([optional_bin_progs], [cp]) +gl_ADD_PROG([optional_bin_progs], [csplit]) +gl_ADD_PROG([optional_bin_progs], [cut]) +gl_ADD_PROG([optional_bin_progs], [date]) +gl_ADD_PROG([optional_bin_progs], [dd]) +gl_ADD_PROG([optional_bin_progs], [dir]) +gl_ADD_PROG([optional_bin_progs], [dircolors]) +gl_ADD_PROG([optional_bin_progs], [dirname]) +gl_ADD_PROG([optional_bin_progs], [du]) +gl_ADD_PROG([optional_bin_progs], [echo]) +gl_ADD_PROG([optional_bin_progs], [env]) +gl_ADD_PROG([optional_bin_progs], [expand]) +gl_ADD_PROG([optional_bin_progs], [expr]) +gl_ADD_PROG([optional_bin_progs], [factor]) +gl_ADD_PROG([optional_bin_progs], [false]) +gl_ADD_PROG([optional_bin_progs], [fmt]) +gl_ADD_PROG([optional_bin_progs], [fold]) +gl_ADD_PROG([optional_bin_progs], [ginstall]) +gl_ADD_PROG([optional_bin_progs], [groups]) +gl_ADD_PROG([optional_bin_progs], [head]) +gl_ADD_PROG([optional_bin_progs], [id]) +gl_ADD_PROG([optional_bin_progs], [join]) +gl_ADD_PROG([optional_bin_progs], [kill]) +gl_ADD_PROG([optional_bin_progs], [link]) +gl_ADD_PROG([optional_bin_progs], [ln]) +gl_ADD_PROG([optional_bin_progs], [logname]) +gl_ADD_PROG([optional_bin_progs], [ls]) +gl_ADD_PROG([optional_bin_progs], [md5sum]) +gl_ADD_PROG([optional_bin_progs], [mkdir]) +gl_ADD_PROG([optional_bin_progs], [mkfifo]) +gl_ADD_PROG([optional_bin_progs], [mknod]) +gl_ADD_PROG([optional_bin_progs], [mktemp]) +gl_ADD_PROG([optional_bin_progs], [mv]) +gl_ADD_PROG([optional_bin_progs], [nl]) +gl_ADD_PROG([optional_bin_progs], [nproc]) +gl_ADD_PROG([optional_bin_progs], [nohup]) +gl_ADD_PROG([optional_bin_progs], [numfmt]) +gl_ADD_PROG([optional_bin_progs], [od]) +gl_ADD_PROG([optional_bin_progs], [paste]) +gl_ADD_PROG([optional_bin_progs], [pathchk]) +gl_ADD_PROG([optional_bin_progs], [pr]) +gl_ADD_PROG([optional_bin_progs], [printenv]) +gl_ADD_PROG([optional_bin_progs], [printf]) +gl_ADD_PROG([optional_bin_progs], [ptx]) +gl_ADD_PROG([optional_bin_progs], [pwd]) +gl_ADD_PROG([optional_bin_progs], [readlink]) +gl_ADD_PROG([optional_bin_progs], [realpath]) +gl_ADD_PROG([optional_bin_progs], [rm]) +gl_ADD_PROG([optional_bin_progs], [rmdir]) +gl_ADD_PROG([optional_bin_progs], [runcon]) +gl_ADD_PROG([optional_bin_progs], [seq]) +gl_ADD_PROG([optional_bin_progs], [sha1sum]) +gl_ADD_PROG([optional_bin_progs], [sha224sum]) +gl_ADD_PROG([optional_bin_progs], [sha256sum]) +gl_ADD_PROG([optional_bin_progs], [sha384sum]) +gl_ADD_PROG([optional_bin_progs], [sha512sum]) +gl_ADD_PROG([optional_bin_progs], [shred]) +gl_ADD_PROG([optional_bin_progs], [shuf]) +gl_ADD_PROG([optional_bin_progs], [sleep]) +gl_ADD_PROG([optional_bin_progs], [sort]) +gl_ADD_PROG([optional_bin_progs], [split]) +gl_ADD_PROG([optional_bin_progs], [stat]) +gl_ADD_PROG([optional_bin_progs], [sum]) +gl_ADD_PROG([optional_bin_progs], [sync]) +gl_ADD_PROG([optional_bin_progs], [tac]) +gl_ADD_PROG([optional_bin_progs], [tail]) +gl_ADD_PROG([optional_bin_progs], [tee]) +gl_ADD_PROG([optional_bin_progs], [test]) +gl_ADD_PROG([optional_bin_progs], [timeout]) +gl_ADD_PROG([optional_bin_progs], [touch]) +gl_ADD_PROG([optional_bin_progs], [tr]) +gl_ADD_PROG([optional_bin_progs], [true]) +gl_ADD_PROG([optional_bin_progs], [truncate]) +gl_ADD_PROG([optional_bin_progs], [tsort]) +gl_ADD_PROG([optional_bin_progs], [tty]) +gl_ADD_PROG([optional_bin_progs], [uname]) +gl_ADD_PROG([optional_bin_progs], [unexpand]) +gl_ADD_PROG([optional_bin_progs], [uniq]) +gl_ADD_PROG([optional_bin_progs], [unlink]) +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' +# 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 +# to reflect any "do-install" and "don't-install" requests. +# That is, add any program specified via --enable-install-program, +# and remove any program specified via --enable-no-install-program. +# Note how the second argument below is a literal, with "," +# 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]) diff --git a/m4/cycle-check.m4 b/m4/cycle-check.m4 index 34c5bcb5..04ed9be3 100644 --- a/m4/cycle-check.m4 +++ b/m4/cycle-check.m4 @@ -1,10 +1,7 @@ -#serial 6 -dnl Copyright (C) 2005-2007, 2009-2012 Free Software Foundation, Inc. +#serial 7 +dnl Copyright (C) 2005-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_CYCLE_CHECK], -[ - AC_REQUIRE([AC_C_INLINE]) -]) +AC_DEFUN([gl_CYCLE_CHECK], [:]) diff --git a/m4/d-ino.m4 b/m4/d-ino.m4 index 16d46aad..aab82c2d 100644 --- a/m4/d-ino.m4 +++ b/m4/d-ino.m4 @@ -5,7 +5,7 @@ dnl dnl Check whether struct dirent has a member named d_ino. dnl -# Copyright (C) 1997, 1999-2001, 2003-2004, 2006-2007, 2009-2012 Free Software +# Copyright (C) 1997, 1999-2001, 2003-2004, 2006-2007, 2009-2013 Free Software # Foundation, Inc. # This file is free software; the Free Software Foundation diff --git a/m4/d-type.m4 b/m4/d-type.m4 index 34b68726..ee399c26 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-2012 Free Software Foundation, Inc. +# Copyright (C) 1997, 1999-2004, 2006, 2009-2013 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 98012474..708d7b19 100644 --- a/m4/dirent-safer.m4 +++ b/m4/dirent-safer.m4 @@ -1,5 +1,5 @@ #serial 2 -dnl Copyright (C) 2009-2012 Free Software Foundation, Inc. +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. diff --git a/m4/dirent_h.m4 b/m4/dirent_h.m4 index f6c0fa7b..54c16634 100644 --- a/m4/dirent_h.m4 +++ b/m4/dirent_h.m4 @@ -1,5 +1,5 @@ # dirent_h.m4 serial 16 -dnl Copyright (C) 2008-2012 Free Software Foundation, Inc. +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. diff --git a/m4/dirfd.m4 b/m4/dirfd.m4 index fc475d78..39bc7897 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-2012 Free Software Foundation, Inc. +# Copyright (C) 2001-2006, 2008-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. diff --git a/m4/dirname.m4 b/m4/dirname.m4 index 65639ec8..5897a2a8 100644 --- a/m4/dirname.m4 +++ b/m4/dirname.m4 @@ -1,5 +1,5 @@ #serial 10 -*- autoconf -*- -dnl Copyright (C) 2002-2006, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 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. diff --git a/m4/double-slash-root.m4 b/m4/double-slash-root.m4 index 1e037513..bd6f8671 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-2012 Free Software Foundation, Inc. +dnl Copyright (C) 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. diff --git a/m4/dup.m4 b/m4/dup.m4 index bec5880a..5105b6e4 100644 --- a/m4/dup.m4 +++ b/m4/dup.m4 @@ -1,5 +1,5 @@ -# dup.m4 serial 2 -dnl Copyright (C) 2011-2012 Free Software Foundation, Inc. +# dup.m4 serial 3 +dnl Copyright (C) 2011-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. @@ -22,6 +22,4 @@ AC_DEFUN([gl_FUNC_DUP], ]) # Prerequisites of lib/dup.c. -AC_DEFUN([gl_PREREQ_DUP], [ - AC_REQUIRE([AC_C_INLINE]) -]) +AC_DEFUN([gl_PREREQ_DUP], [:]) diff --git a/m4/dup2.m4 b/m4/dup2.m4 index fc86e808..269cfdc1 100644 --- a/m4/dup2.m4 +++ b/m4/dup2.m4 @@ -1,5 +1,5 @@ -#serial 18 -dnl Copyright (C) 2002, 2005, 2007, 2009-2012 Free Software Foundation, Inc. +#serial 19 +dnl Copyright (C) 2002, 2005, 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. @@ -39,6 +39,9 @@ AC_DEFUN([gl_FUNC_DUP2], /* Many gnulib modules require POSIX conformance of EBADF. */ if (dup2 (2, 1000000) == -1 && errno != EBADF) result |= 16; + /* Flush out a cygwin core dump. */ + if (dup2 (2, -1) != -1 || errno != EBADF) + result |= 32; return result; ]) ], diff --git a/m4/eealloc.m4 b/m4/eealloc.m4 index 75f17e2f..c640ec12 100644 --- a/m4/eealloc.m4 +++ b/m4/eealloc.m4 @@ -1,5 +1,5 @@ -# eealloc.m4 serial 2 -dnl Copyright (C) 2003, 2009-2012 Free Software Foundation, Inc. +# eealloc.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. @@ -8,7 +8,6 @@ AC_DEFUN([gl_EEALLOC], [ AC_REQUIRE([gl_EEMALLOC]) AC_REQUIRE([gl_EEREALLOC]) - AC_REQUIRE([AC_C_INLINE]) ]) AC_DEFUN([gl_EEMALLOC], diff --git a/m4/environ.m4 b/m4/environ.m4 index 8eb57c9d..593a33ed 100644 --- a/m4/environ.m4 +++ b/m4/environ.m4 @@ -1,5 +1,5 @@ # environ.m4 serial 6 -dnl Copyright (C) 2001-2004, 2006-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2004, 2006-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. diff --git a/m4/errno_h.m4 b/m4/errno_h.m4 index 4f0bb835..c813ea58 100644 --- a/m4/errno_h.m4 +++ b/m4/errno_h.m4 @@ -1,5 +1,5 @@ -# errno_h.m4 serial 10 -dnl Copyright (C) 2004, 2006, 2008-2012 Free Software Foundation, Inc. +# errno_h.m4 serial 12 +dnl Copyright (C) 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. @@ -10,6 +10,9 @@ AC_DEFUN_ONCE([gl_HEADER_ERRNO_H], AC_CACHE_CHECK([for complete errno.h], [gl_cv_header_errno_h_complete], [ AC_EGREP_CPP([booboo],[ #include <errno.h> +#if !defined ETXTBSY +booboo +#endif #if !defined ENOMSG booboo #endif @@ -48,6 +51,15 @@ booboo #endif #if !defined ECANCELED booboo +#endif +#if !defined EOWNERDEAD +booboo +#endif +#if !defined ENOTRECOVERABLE +booboo +#endif +#if !defined EILSEQ +booboo #endif ], [gl_cv_header_errno_h_complete=no], diff --git a/m4/error.m4 b/m4/error.m4 index 5d9c70a4..29e6fdc9 100644 --- a/m4/error.m4 +++ b/m4/error.m4 @@ -1,6 +1,6 @@ #serial 14 -# Copyright (C) 1996-1998, 2001-2004, 2009-2012 Free Software Foundation, Inc. +# Copyright (C) 1996-1998, 2001-2004, 2009-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -23,6 +23,5 @@ AC_DEFUN([gl_ERROR], AC_DEFUN([gl_PREREQ_ERROR], [ AC_REQUIRE([AC_FUNC_STRERROR_R]) - AC_REQUIRE([AC_C_INLINE]) : ]) diff --git a/m4/euidaccess.m4 b/m4/euidaccess.m4 index 841da01c..12e5efcb 100644 --- a/m4/euidaccess.m4 +++ b/m4/euidaccess.m4 @@ -1,5 +1,5 @@ -# euidaccess.m4 serial 14 -dnl Copyright (C) 2002-2012 Free Software Foundation, Inc. +# euidaccess.m4 serial 15 +dnl Copyright (C) 2002-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. @@ -7,6 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_NONREENTRANT_EUIDACCESS], [ AC_REQUIRE([gl_FUNC_EUIDACCESS]) + AC_CHECK_DECLS([setregid]) AC_DEFINE([PREFER_NONREENTRANT_EUIDACCESS], [1], [Define this if you prefer euidaccess to return the correct result even if this would make it nonreentrant. Define this only if your @@ -33,9 +34,8 @@ AC_DEFUN([gl_PREREQ_EUIDACCESS], [ dnl Prefer POSIX faccessat over non-standard euidaccess. AC_CHECK_FUNCS_ONCE([faccessat]) dnl Try various other non-standard fallbacks. - AC_CHECK_HEADERS_ONCE([libgen.h]) - AC_CHECK_DECLS_ONCE([setregid]) - AC_REQUIRE([AC_FUNC_GETGROUPS]) + AC_CHECK_HEADERS([libgen.h]) + AC_FUNC_GETGROUPS # Solaris 9 and 10 need -lgen to get the eaccess function. # Save and restore LIBS so -lgen isn't added to it. Otherwise, *all* diff --git a/m4/exponentd.m4 b/m4/exponentd.m4 index 0ae4ccfa..09df468c 100644 --- a/m4/exponentd.m4 +++ b/m4/exponentd.m4 @@ -1,5 +1,5 @@ # exponentd.m4 serial 3 -dnl Copyright (C) 2007-2008, 2010-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2008, 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. diff --git a/m4/exponentf.m4 b/m4/exponentf.m4 index 94d11679..55a04e63 100644 --- a/m4/exponentf.m4 +++ b/m4/exponentf.m4 @@ -1,5 +1,5 @@ # exponentf.m4 serial 2 -dnl Copyright (C) 2007-2008, 2010-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2008, 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. diff --git a/m4/exponentl.m4 b/m4/exponentl.m4 index a7cd13bc..f877cf14 100644 --- a/m4/exponentl.m4 +++ b/m4/exponentl.m4 @@ -1,5 +1,5 @@ # exponentl.m4 serial 3 -dnl Copyright (C) 2007-2012 Free Software Foundation, Inc. +dnl Copyright (C) 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. diff --git a/m4/extensions.m4 b/m4/extensions.m4 index 0bfaef6f..617323b2 100644 --- a/m4/extensions.m4 +++ b/m4/extensions.m4 @@ -1,7 +1,7 @@ -# serial 11 -*- Autoconf -*- +# serial 12 -*- Autoconf -*- # Enable extensions on systems that normally disable them. -# Copyright (C) 2003, 2006-2012 Free Software Foundation, Inc. +# Copyright (C) 2003, 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. @@ -67,7 +67,7 @@ AC_BEFORE([$0], [AC_RUN_IFELSE])dnl #ifndef _ALL_SOURCE # undef _ALL_SOURCE #endif -/* Enable general extensions on MacOS X. */ +/* Enable general extensions on Mac OS X. */ #ifndef _DARWIN_C_SOURCE # undef _DARWIN_C_SOURCE #endif diff --git a/m4/extern-inline.m4 b/m4/extern-inline.m4 new file mode 100644 index 00000000..5880d4f4 --- /dev/null +++ b/m4/extern-inline.m4 @@ -0,0 +1,62 @@ +dnl 'extern inline' a la ISO C99. + +dnl Copyright 2012-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_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. + + Suppress the use of extern inline on Apple's platforms, + as Libc-825.25 (2012-09-19) is incompatible with it; see + <http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html>. + Perhaps Apple will fix this some day. */ +#if ((__GNUC__ \ + ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \ + : 199901L <= __STDC_VERSION__) \ + && !defined __APPLE__) +# define _GL_INLINE inline +# define _GL_EXTERN_INLINE extern inline +#elif 2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __APPLE__ +# if __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 +#else +# define _GL_INLINE static _GL_UNUSED +# define _GL_EXTERN_INLINE static _GL_UNUSED +#endif + +#if 4 < __GNUC__ + (6 <= __GNUC_MINOR__) +# if defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ +# define _GL_INLINE_HEADER_CONST_PRAGMA +# else +# define _GL_INLINE_HEADER_CONST_PRAGMA \ + _Pragma ("GCC diagnostic ignored \"-Wsuggest-attribute=const\"") +# endif +# define _GL_INLINE_HEADER_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \ + _Pragma ("GCC diagnostic ignored \"-Wmissing-declarations\"") \ + _GL_INLINE_HEADER_CONST_PRAGMA +# define _GL_INLINE_HEADER_END \ + _Pragma ("GCC diagnostic pop") +#else +# define _GL_INLINE_HEADER_BEGIN +# define _GL_INLINE_HEADER_END +#endif]) +]) diff --git a/m4/faccessat.m4 b/m4/faccessat.m4 index 274eeded..fb28bffa 100644 --- a/m4/faccessat.m4 +++ b/m4/faccessat.m4 @@ -1,7 +1,7 @@ -# serial 5 +# serial 6 # See if we need to provide faccessat replacement. -dnl Copyright (C) 2009-2012 Free Software Foundation, Inc. +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. @@ -24,5 +24,5 @@ AC_DEFUN([gl_FUNC_FACCESSAT], # Prerequisites of lib/faccessat.m4. AC_DEFUN([gl_PREREQ_FACCESSAT], [ - AC_CHECK_FUNCS_ONCE([access]) + AC_CHECK_FUNCS([access]) ]) diff --git a/m4/fatal-signal.m4 b/m4/fatal-signal.m4 index 9ca5aaf4..ae8b65c5 100644 --- a/m4/fatal-signal.m4 +++ b/m4/fatal-signal.m4 @@ -1,12 +1,11 @@ -# fatal-signal.m4 serial 8 -dnl Copyright (C) 2003-2004, 2006, 2008-2012 Free Software Foundation, Inc. +# 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([AC_C_INLINE]) 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 8af494c5..c248fdce 100644 --- a/m4/fchdir.m4 +++ b/m4/fchdir.m4 @@ -1,5 +1,5 @@ # fchdir.m4 serial 21 -dnl Copyright (C) 2006-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2006-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. diff --git a/m4/fchmodat.m4 b/m4/fchmodat.m4 index e95d9689..dc9c4e79 100644 --- a/m4/fchmodat.m4 +++ b/m4/fchmodat.m4 @@ -1,5 +1,5 @@ # fchmodat.m4 serial 1 -dnl Copyright (C) 2004-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2004-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. diff --git a/m4/fchownat.m4 b/m4/fchownat.m4 index 02b88269..9c862d35 100644 --- a/m4/fchownat.m4 +++ b/m4/fchownat.m4 @@ -1,5 +1,5 @@ # fchownat.m4 serial 1 -dnl Copyright (C) 2004-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2004-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. diff --git a/m4/fclose.m4 b/m4/fclose.m4 index daad94fb..2cc2e129 100644 --- a/m4/fclose.m4 +++ b/m4/fclose.m4 @@ -1,5 +1,5 @@ # fclose.m4 serial 5 -dnl Copyright (C) 2008-2012 Free Software Foundation, Inc. +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. diff --git a/m4/fcntl-o.m4 b/m4/fcntl-o.m4 index 9862741f..87cc4bd2 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-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 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. @@ -50,7 +50,18 @@ AC_DEFUN([gl_FCNTL_O_FLAGS], #if HAVE_SYMLINK { static char const sym[] = "conftest.sym"; - if (symlink (".", sym) != 0) + if (symlink ("/dev/null", sym) != 0) + result |= 2; + else + { + int fd = open (sym, O_WRONLY | O_NOFOLLOW | O_CREAT, 0); + if (fd >= 0) + { + close (fd); + result |= 4; + } + } + if (unlink (sym) != 0 || symlink (".", sym) != 0) result |= 2; else { diff --git a/m4/fcntl-safer.m4 b/m4/fcntl-safer.m4 index c8cf480c..ecc7e46d 100644 --- a/m4/fcntl-safer.m4 +++ b/m4/fcntl-safer.m4 @@ -1,5 +1,5 @@ #serial 9 -dnl Copyright (C) 2005-2007, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2005-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. diff --git a/m4/fcntl.m4 b/m4/fcntl.m4 index 0631bd6f..5481cae4 100644 --- a/m4/fcntl.m4 +++ b/m4/fcntl.m4 @@ -1,5 +1,5 @@ # fcntl.m4 serial 5 -dnl Copyright (C) 2009-2012 Free Software Foundation, Inc. +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. diff --git a/m4/fcntl_h.m4 b/m4/fcntl_h.m4 index cac28aeb..3cff1fd6 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-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2006-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. diff --git a/m4/fd-reopen.m4 b/m4/fd-reopen.m4 deleted file mode 100644 index ae7390c8..00000000 --- a/m4/fd-reopen.m4 +++ /dev/null @@ -1,15 +0,0 @@ -# Invoke open, but return either a desired file descriptor or -1. - -dnl Copyright (C) 2005-2012 Free Software Foundation, Inc. - -dnl This file is free software; the Free 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 Paul Eggert. - -AC_DEFUN([gl_FD_REOPEN], -[ - AC_LIBSOURCES([fd-reopen.c, fd-reopen.h]) - AC_LIBOBJ([fd-reopen]) -]) diff --git a/m4/fdatasync.m4 b/m4/fdatasync.m4 index e7908451..551c0d9f 100644 --- a/m4/fdatasync.m4 +++ b/m4/fdatasync.m4 @@ -1,5 +1,5 @@ -# fdatasync.m4 serial 3 -dnl Copyright (C) 2008-2012 Free Software Foundation, Inc. +# fdatasync.m4 serial 4 +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. @@ -15,7 +15,7 @@ AC_DEFUN([gl_FUNC_FDATASYNC], if test $ac_cv_have_decl_fdatasync = no; then HAVE_DECL_FDATASYNC=0 - dnl MacOS X 10.7 has fdatasync but does not declare it. + dnl Mac OS X 10.7 has fdatasync but does not declare it. AC_CHECK_FUNCS([fdatasync]) if test $ac_cv_func_fdatasync = no; then HAVE_FDATASYNC=0 diff --git a/m4/fdopen.m4 b/m4/fdopen.m4 index 9ca9d2ac..74d1649f 100644 --- a/m4/fdopen.m4 +++ b/m4/fdopen.m4 @@ -1,5 +1,5 @@ -# fdopen.m4 serial 2 -dnl Copyright (C) 2011-2012 Free Software Foundation, Inc. +# fdopen.m4 serial 3 +dnl Copyright (C) 2011-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. @@ -25,10 +25,8 @@ main (void) FILE *fp; errno = 0; fp = fdopen (-1, "r"); - if (fp != NULL) + if (fp == NULL && errno == 0) return 1; - if (errno == 0) - return 2; return 0; }]])], [gl_cv_func_fdopen_works=yes], diff --git a/m4/fdopendir.m4 b/m4/fdopendir.m4 index f4db17ba..b7be7832 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-2012 Free Software Foundation, Inc. +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. diff --git a/m4/fflush.m4 b/m4/fflush.m4 index 13455d18..6df51736 100644 --- a/m4/fflush.m4 +++ b/m4/fflush.m4 @@ -1,6 +1,6 @@ -# fflush.m4 serial 13 +# fflush.m4 serial 14 -# Copyright (C) 2007-2012 Free Software Foundation, Inc. +# Copyright (C) 2007-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. @@ -79,8 +79,4 @@ AC_DEFUN([gl_FUNC_FFLUSH_STDIN], ]) # Prerequisites of lib/fflush.c. -AC_DEFUN([gl_PREREQ_FFLUSH], -[ - AC_REQUIRE([AC_C_INLINE]) - : -]) +AC_DEFUN([gl_PREREQ_FFLUSH], [:]) diff --git a/m4/fileblocks.m4 b/m4/fileblocks.m4 index 6cff3476..d1abd30a 100644 --- a/m4/fileblocks.m4 +++ b/m4/fileblocks.m4 @@ -1,5 +1,5 @@ # fileblocks.m4 serial 6 -dnl Copyright (C) 2002, 2005-2006, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2005-2006, 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. diff --git a/m4/filemode.m4 b/m4/filemode.m4 index 1aa6cdd5..d7a0104c 100644 --- a/m4/filemode.m4 +++ b/m4/filemode.m4 @@ -1,5 +1,5 @@ # filemode.m4 serial 8 -dnl Copyright (C) 2002, 2005-2006, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2005-2006, 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. diff --git a/m4/filenamecat.m4 b/m4/filenamecat.m4 index b552f12e..40946e82 100644 --- a/m4/filenamecat.m4 +++ b/m4/filenamecat.m4 @@ -1,5 +1,5 @@ # filenamecat.m4 serial 11 -dnl Copyright (C) 2002-2006, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 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. diff --git a/m4/flexmember.m4 b/m4/flexmember.m4 index 7103b6be..155b8484 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-2012 Free Software Foundation, Inc. +# Copyright (C) 2006, 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. diff --git a/m4/float_h.m4 b/m4/float_h.m4 index 51c9c7b3..397f2d1f 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-2012 Free Software Foundation, Inc. +dnl Copyright (C) 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. diff --git a/m4/fnmatch.m4 b/m4/fnmatch.m4 index e46b6e52..fa0ba4d2 100644 --- a/m4/fnmatch.m4 +++ b/m4/fnmatch.m4 @@ -1,6 +1,6 @@ # Check for fnmatch - serial 9. -# Copyright (C) 2000-2007, 2009-2012 Free Software Foundation, Inc. +# Copyright (C) 2000-2007, 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. diff --git a/m4/fopen.m4 b/m4/fopen.m4 index a1cb1848..3337cc99 100644 --- a/m4/fopen.m4 +++ b/m4/fopen.m4 @@ -1,5 +1,5 @@ -# fopen.m4 serial 8 -dnl Copyright (C) 2007-2012 Free Software Foundation, Inc. +# fopen.m4 serial 9 +dnl Copyright (C) 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. @@ -55,7 +55,4 @@ changequote([,])dnl ]) # Prerequisites of lib/fopen.c. -AC_DEFUN([gl_PREREQ_FOPEN], -[ - AC_REQUIRE([AC_C_INLINE]) -]) +AC_DEFUN([gl_PREREQ_FOPEN], [:]) diff --git a/m4/fpending.m4 b/m4/fpending.m4 index 33a5c94c..8f585624 100644 --- a/m4/fpending.m4 +++ b/m4/fpending.m4 @@ -1,6 +1,6 @@ # serial 19 -# Copyright (C) 2000-2001, 2004-2012 Free Software Foundation, Inc. +# Copyright (C) 2000-2001, 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. diff --git a/m4/fpieee.m4 b/m4/fpieee.m4 index 82fd7783..97941bb4 100644 --- a/m4/fpieee.m4 +++ b/m4/fpieee.m4 @@ -1,5 +1,5 @@ # fpieee.m4 serial 2 -dnl Copyright (C) 2007, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 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. diff --git a/m4/fpurge.m4 b/m4/fpurge.m4 index 2049fe4e..2059a56e 100644 --- a/m4/fpurge.m4 +++ b/m4/fpurge.m4 @@ -1,5 +1,5 @@ # fpurge.m4 serial 7 -dnl Copyright (C) 2007, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 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. diff --git a/m4/freadahead.m4 b/m4/freadahead.m4 new file mode 100644 index 00000000..0f2d47c4 --- /dev/null +++ b/m4/freadahead.m4 @@ -0,0 +1,10 @@ +# freadahead.m4 serial 1 +dnl Copyright (C) 2012-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_FREADAHEAD], +[ + AC_CHECK_FUNCS_ONCE([__freadahead]) +]) diff --git a/m4/freading.m4 b/m4/freading.m4 index 216adc9e..1e1f6f24 100644 --- a/m4/freading.m4 +++ b/m4/freading.m4 @@ -1,5 +1,5 @@ # freading.m4 serial 1 -dnl Copyright (C) 2007, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 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. diff --git a/m4/freadptr.m4 b/m4/freadptr.m4 new file mode 100644 index 00000000..13c3a9c7 --- /dev/null +++ b/m4/freadptr.m4 @@ -0,0 +1,10 @@ +# freadptr.m4 serial 1 +dnl Copyright (C) 2012-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_FREADPTR], +[ + AC_CHECK_FUNCS_ONCE([__freadptr]) +]) diff --git a/m4/freadseek.m4 b/m4/freadseek.m4 new file mode 100644 index 00000000..d5a728cf --- /dev/null +++ b/m4/freadseek.m4 @@ -0,0 +1,10 @@ +# freadseek.m4 serial 2 +dnl Copyright (C) 2012-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_FREADSEEK], +[ + AC_CHECK_FUNCS_ONCE([__freadptrinc]) +]) diff --git a/m4/freopen.m4 b/m4/freopen.m4 index 8b22b806..46171560 100644 --- a/m4/freopen.m4 +++ b/m4/freopen.m4 @@ -1,5 +1,5 @@ -# freopen.m4 serial 3 -dnl Copyright (C) 2007-2012 Free Software Foundation, Inc. +# freopen.m4 serial 4 +dnl Copyright (C) 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. @@ -16,7 +16,4 @@ AC_DEFUN([gl_FUNC_FREOPEN], ]) # Prerequisites of lib/freopen.c. -AC_DEFUN([gl_PREREQ_FREOPEN], -[ - AC_REQUIRE([AC_C_INLINE]) -]) +AC_DEFUN([gl_PREREQ_FREOPEN], [:]) diff --git a/m4/frexp.m4 b/m4/frexp.m4 index 4162195e..39097923 100644 --- a/m4/frexp.m4 +++ b/m4/frexp.m4 @@ -1,5 +1,5 @@ -# frexp.m4 serial 13 -dnl Copyright (C) 2007-2012 Free Software Foundation, Inc. +# frexp.m4 serial 14 +dnl Copyright (C) 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. @@ -107,7 +107,7 @@ AC_DEFUN([gl_FUNC_FREXP_WORKS], /* HP cc on HP-UX 10.20 has a bug with the constant expression -0.0. ICC 10.0 has a bug when optimizing the expression -zero. The expression -DBL_MIN * DBL_MIN does not work when cross-compiling - to PowerPC on MacOS X 10.5. */ + to PowerPC on Mac OS X 10.5. */ #if defined __hpux || defined __sgi || defined __ICC static double compute_minus_zero (void) diff --git a/m4/frexpl.m4 b/m4/frexpl.m4 index 9df87ab8..3b64c522 100644 --- a/m4/frexpl.m4 +++ b/m4/frexpl.m4 @@ -1,5 +1,5 @@ -# frexpl.m4 serial 19 -dnl Copyright (C) 2007-2012 Free Software Foundation, Inc. +# frexpl.m4 serial 20 +dnl Copyright (C) 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. @@ -13,7 +13,7 @@ AC_DEFUN([gl_FUNC_FREXPL], AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) dnl Check whether it's declared. - dnl MacOS X 10.3 has frexpl() in libc but doesn't declare it in <math.h>. + dnl Mac OS X 10.3 has frexpl() in libc but doesn't declare it in <math.h>. AC_CHECK_DECL([frexpl], , [HAVE_DECL_FREXPL=0], [[#include <math.h>]]) FREXPL_LIBM= @@ -73,7 +73,7 @@ AC_DEFUN([gl_FUNC_FREXPL_NO_LIBM], AC_REQUIRE([gl_MATH_H_DEFAULTS]) AC_REQUIRE([gl_LONG_DOUBLE_VS_DOUBLE]) dnl Check whether it's declared. - dnl MacOS X 10.3 has frexpl() in libc but doesn't declare it in <math.h>. + dnl Mac OS X 10.3 has frexpl() in libc but doesn't declare it in <math.h>. AC_CHECK_DECL([frexpl], , [HAVE_DECL_FREXPL=0], [[#include <math.h>]]) if test $HAVE_DECL_FREXPL = 1; then gl_CHECK_FREXPL_NO_LIBM @@ -113,8 +113,8 @@ AC_DEFUN([gl_CHECK_FREXPL_NO_LIBM], ]) dnl Test whether frexpl() works on finite numbers (this fails on -dnl MacOS X 10.4/PowerPC, on AIX 5.1, and on BeOS), on denormalized numbers -dnl (this fails on MacOS X 10.5/i386), and also on infinite numbers (this +dnl Mac OS X 10.4/PowerPC, on AIX 5.1, and on BeOS), on denormalized numbers +dnl (this fails on Mac OS X 10.5/i386), and also on infinite numbers (this dnl fails e.g. on IRIX 6.5 and mingw). AC_DEFUN([gl_FUNC_FREXPL_WORKS], [ @@ -162,7 +162,7 @@ int main() if (exp != 5) result |= 1; } - /* Test on finite numbers that fails on MacOS X 10.4, because its frexpl + /* Test on finite numbers that fails on Mac OS X 10.4, because its frexpl function returns an invalid (incorrectly normalized) value: it returns y = { 0x3fe028f5, 0xc28f5c28, 0x3c9eb851, 0xeb851eb8 } but the correct result is @@ -201,7 +201,7 @@ int main() int exp; long double y = frexpl (x, &exp); /* On machines with IEEE854 arithmetic: x = 1.68105e-4932, - exp = -16382, y = 0.5. On MacOS X 10.5: exp = -16384, y = 0.5. */ + exp = -16382, y = 0.5. On Mac OS X 10.5: exp = -16384, y = 0.5. */ if (exp != LDBL_MIN_EXP - 1) result |= 8; } diff --git a/m4/fseek.m4 b/m4/fseek.m4 index d9cd70a9..74f66564 100644 --- a/m4/fseek.m4 +++ b/m4/fseek.m4 @@ -1,5 +1,5 @@ # fseek.m4 serial 4 -dnl Copyright (C) 2007, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 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. diff --git a/m4/fseeko.m4 b/m4/fseeko.m4 index 1bb88c76..e0f2dfbe 100644 --- a/m4/fseeko.m4 +++ b/m4/fseeko.m4 @@ -1,5 +1,5 @@ # fseeko.m4 serial 16 -dnl Copyright (C) 2007-2012 Free Software Foundation, Inc. +dnl Copyright (C) 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. diff --git a/m4/fseterr.m4 b/m4/fseterr.m4 new file mode 100644 index 00000000..b8e044b5 --- /dev/null +++ b/m4/fseterr.m4 @@ -0,0 +1,10 @@ +# fseterr.m4 serial 1 +dnl Copyright (C) 2012-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_FSETERR], +[ + AC_CHECK_FUNCS_ONCE([__fseterr]) +]) diff --git a/m4/fstat.m4 b/m4/fstat.m4 index 3ab3297b..b2cf2ad2 100644 --- a/m4/fstat.m4 +++ b/m4/fstat.m4 @@ -1,5 +1,5 @@ -# fstat.m4 serial 3 -dnl Copyright (C) 2011-2012 Free Software Foundation, Inc. +# fstat.m4 serial 4 +dnl Copyright (C) 2011-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. @@ -33,7 +33,4 @@ AC_DEFUN([gl_FUNC_FSTAT], ]) # Prerequisites of lib/fstat.c. -AC_DEFUN([gl_PREREQ_FSTAT], -[ - AC_REQUIRE([AC_C_INLINE]) -]) +AC_DEFUN([gl_PREREQ_FSTAT], [:]) diff --git a/m4/fstatat.m4 b/m4/fstatat.m4 index f84e198f..adbc7e57 100644 --- a/m4/fstatat.m4 +++ b/m4/fstatat.m4 @@ -1,5 +1,5 @@ # fstatat.m4 serial 3 -dnl Copyright (C) 2004-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2004-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. diff --git a/m4/fstypename.m4 b/m4/fstypename.m4 index 34044d09..c72ecb80 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-2012 Free Software +# Copyright (C) 1998-1999, 2001, 2004, 2006, 2009-2013 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 519743fb..6277bfa5 100644 --- a/m4/fsusage.m4 +++ b/m4/fsusage.m4 @@ -1,7 +1,7 @@ -# serial 29 +# serial 30 # Obtaining file system usage information. -# Copyright (C) 1997-1998, 2000-2001, 2003-2012 Free Software Foundation, Inc. +# Copyright (C) 1997-1998, 2000-2001, 2003-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -33,7 +33,7 @@ dnl Enable large-file support. This has the effect of changing the size dnl of field f_blocks in 'struct statvfs' from 32 bit to 64 bit on dnl glibc/Hurd, HP-UX 11, Solaris (32-bit mode). It also changes the size dnl of field f_blocks in 'struct statfs' from 32 bit to 64 bit on -dnl MacOS X >= 10.5 (32-bit mode). +dnl Mac OS X >= 10.5 (32-bit mode). AC_REQUIRE([AC_SYS_LARGEFILE]) AC_MSG_NOTICE([checking how to get file system space usage]) @@ -50,14 +50,6 @@ if test $ac_fsusage_space = no; then # OpenBSD >= 4.4, AIX, HP-UX, IRIX, Solaris, Cygwin, Interix, BeOS. AC_CACHE_CHECK([for statvfs function (SVR4)], [fu_cv_sys_stat_statvfs], [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h> -#if (defined __GLIBC__ || defined __UCLIBC__) && defined __linux__ -Do not use statvfs on systems with GNU libc on Linux, because that function -stats all preceding entries in /proc/mounts, and that makes df hang if even -one of the corresponding file systems is hard-mounted, but not available. -statvfs in GNU libc on Hurd, BeOS, Haiku operates differently: it only makes -a system call. -#endif - #ifdef __osf__ "Do not use Tru64's statvfs implementation" #endif @@ -68,7 +60,7 @@ struct statvfs fsd; #if defined __APPLE__ && defined __MACH__ #include <limits.h> -/* On MacOS X >= 10.5, f_blocks in 'struct statvfs' is a 32-bit quantity; +/* On Mac OS X >= 10.5, f_blocks in 'struct statvfs' is a 32-bit quantity; that commonly limits file systems to 4 TiB. Whereas f_blocks in 'struct statfs' is a 64-bit type, thanks to the large-file support that was enabled above. In this case, don't use statvfs(); use statfs() @@ -110,6 +102,38 @@ int check_f_blocks_size[sizeof fsd.f_blocks * CHAR_BIT <= 32 ? -1 : 1]; fi fi +# Check for this unconditionally so we have a +# good fallback on glibc/Linux > 2.6 < 2.6.36 +AC_MSG_CHECKING([for two-argument statfs with statfs.f_frsize member]) +AC_CACHE_VAL([fu_cv_sys_stat_statfs2_frsize], +[AC_RUN_IFELSE([AC_LANG_SOURCE([[ +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif +#ifdef HAVE_SYS_MOUNT_H +#include <sys/mount.h> +#endif +#ifdef HAVE_SYS_VFS_H +#include <sys/vfs.h> +#endif + int + main () + { + struct statfs fsd; + fsd.f_frsize = 0; + return statfs (".", &fsd) != 0; + }]])], + [fu_cv_sys_stat_statfs2_frsize=yes], + [fu_cv_sys_stat_statfs2_frsize=no], + [fu_cv_sys_stat_statfs2_frsize=no])]) +AC_MSG_RESULT([$fu_cv_sys_stat_statfs2_frsize]) +if test $fu_cv_sys_stat_statfs2_frsize = yes; then + ac_fsusage_space=yes + AC_DEFINE([STAT_STATFS2_FRSIZE], [1], +[ Define if statfs takes 2 args and struct statfs has a field named f_frsize. + (glibc/Linux > 2.6)]) +fi + if test $ac_fsusage_space = no; then # DEC Alpha running OSF/1 AC_MSG_CHECKING([for 3-argument statfs function (DEC OSF/1)]) @@ -137,7 +161,7 @@ if test $ac_fsusage_space = no; then fi if test $ac_fsusage_space = no; then - # glibc/Linux, MacOS X, FreeBSD < 5.0, NetBSD < 3.0, OpenBSD < 4.4. + # glibc/Linux, Mac OS X, FreeBSD < 5.0, NetBSD < 3.0, OpenBSD < 4.4. # (glibc/{Hurd,kFreeBSD}, FreeBSD >= 5.0, NetBSD >= 3.0, # OpenBSD >= 4.4, AIX, HP-UX, OSF/1, Cygwin already handled above.) # (On IRIX you need to include <sys/statfs.h>, not only <sys/mount.h> and diff --git a/m4/fsync.m4 b/m4/fsync.m4 index 8cd47b48..43f51528 100644 --- a/m4/fsync.m4 +++ b/m4/fsync.m4 @@ -1,5 +1,5 @@ # fsync.m4 serial 2 -dnl Copyright (C) 2008-2012 Free Software Foundation, Inc. +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. diff --git a/m4/ftell.m4 b/m4/ftell.m4 index ed8d0146..5acd7529 100644 --- a/m4/ftell.m4 +++ b/m4/ftell.m4 @@ -1,5 +1,5 @@ # ftell.m4 serial 3 -dnl Copyright (C) 2007, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 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. diff --git a/m4/ftello.m4 b/m4/ftello.m4 index ab7b548e..678039ed 100644 --- a/m4/ftello.m4 +++ b/m4/ftello.m4 @@ -1,5 +1,5 @@ # ftello.m4 serial 11 -dnl Copyright (C) 2007-2012 Free Software Foundation, Inc. +dnl Copyright (C) 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. diff --git a/m4/ftruncate.m4 b/m4/ftruncate.m4 index 969eb041..4f2dafba 100644 --- a/m4/ftruncate.m4 +++ b/m4/ftruncate.m4 @@ -1,8 +1,8 @@ -# serial 19 +# serial 20 # See if we need to emulate a missing ftruncate function using chsize. -# Copyright (C) 2000-2001, 2003-2007, 2009-2012 Free Software Foundation, Inc. +# Copyright (C) 2000-2001, 2003-2007, 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. @@ -36,6 +36,5 @@ AC_DEFUN([gl_FUNC_FTRUNCATE], # Prerequisites of lib/ftruncate.c. AC_DEFUN([gl_PREREQ_FTRUNCATE], [ - AC_REQUIRE([AC_C_INLINE]) AC_CHECK_FUNCS([chsize]) ]) diff --git a/m4/fts.m4 b/m4/fts.m4 index 5c92b3b0..582697b6 100644 --- a/m4/fts.m4 +++ b/m4/fts.m4 @@ -1,5 +1,5 @@ -#serial 19 -dnl Copyright (C) 2005-2012 Free Software Foundation, Inc. +#serial 20 +dnl Copyright (C) 2005-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. @@ -12,7 +12,6 @@ AC_DEFUN([gl_FUNC_FTS], AC_DEFUN([gl_FUNC_FTS_CORE], [ dnl Prerequisites of lib/fts.c. - AC_REQUIRE([AC_C_INLINE]) gl_FUNC_OPENAT AC_CHECK_FUNCS_ONCE([fstatfs]) diff --git a/m4/futimens.m4 b/m4/futimens.m4 index 27b3b290..a159207a 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-2012 Free Software Foundation, Inc. +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. diff --git a/m4/getaddrinfo.m4 b/m4/getaddrinfo.m4 index 9cd3e675..1d631f8c 100644 --- a/m4/getaddrinfo.m4 +++ b/m4/getaddrinfo.m4 @@ -1,5 +1,5 @@ -# getaddrinfo.m4 serial 29 -dnl Copyright (C) 2004-2012 Free Software Foundation, Inc. +# getaddrinfo.m4 serial 30 +dnl Copyright (C) 2004-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. @@ -134,7 +134,6 @@ AC_DEFUN([gl_PREREQ_GETADDRINFO], [ AC_REQUIRE([AC_C_RESTRICT]) AC_REQUIRE([gl_SOCKET_FAMILIES]) AC_REQUIRE([gl_HEADER_SYS_SOCKET]) - AC_REQUIRE([AC_C_INLINE]) AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) dnl Including sys/socket.h is wrong for Windows, but Windows does not diff --git a/m4/getcwd-abort-bug.m4 b/m4/getcwd-abort-bug.m4 index 4146754c..9b3b5636 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-2012 Free Software Foundation, Inc. +# Copyright (C) 2006, 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. @@ -58,16 +58,18 @@ AC_DEFUN([gl_FUNC_GETCWD_ABORT_BUG], int main () { - char const *dir_name = "confdir-14B---"; char *cwd; size_t initial_cwd_len; int fail = 0; - size_t desired_depth; - size_t d; /* The bug is triggered when PATH_MAX < getpagesize (), so skip this relatively expensive and invasive test if that's not true. */ - if (getpagesize () <= PATH_MAX) +#ifdef PATH_MAX + int bug_possible = PATH_MAX < getpagesize (); +#else + int bug_possible = 0; +#endif + if (! bug_possible) return 0; cwd = getcwd (NULL, 0); @@ -76,35 +78,43 @@ main () initial_cwd_len = strlen (cwd); free (cwd); - desired_depth = ((TARGET_LEN - 1 - initial_cwd_len) - / (1 + strlen (dir_name))); - for (d = 0; d < desired_depth; d++) + + if (1) { - if (mkdir (dir_name, S_IRWXU) < 0 || chdir (dir_name) < 0) + static char const dir_name[] = "confdir-14B---"; + size_t desired_depth = ((TARGET_LEN - 1 - initial_cwd_len) + / sizeof dir_name); + size_t d; + for (d = 0; d < desired_depth; d++) { - fail = 3; /* Unable to construct deep hierarchy. */ - break; + if (mkdir (dir_name, S_IRWXU) < 0 || chdir (dir_name) < 0) + { + if (! (errno == ERANGE || errno == ENAMETOOLONG + || errno == ENOENT)) + fail = 3; /* Unable to construct deep hierarchy. */ + break; + } } - } - /* If libc has the bug in question, this invocation of getcwd - results in a failed assertion. */ - cwd = getcwd (NULL, 0); - if (cwd == NULL) - fail = 4; /* getcwd failed: it refuses to return a string longer - than PATH_MAX. */ - free (cwd); + /* If libc has the bug in question, this invocation of getcwd + results in a failed assertion. */ + cwd = getcwd (NULL, 0); + if (cwd == NULL) + fail = 4; /* getcwd didn't assert, but it failed for a long name + where the answer could have been learned. */ + free (cwd); - /* Call rmdir first, in case the above chdir failed. */ - rmdir (dir_name); - while (0 < d--) - { - if (chdir ("..") < 0) + /* Call rmdir first, in case the above chdir failed. */ + rmdir (dir_name); + while (0 < d--) { - fail = 5; - break; + if (chdir ("..") < 0) + { + fail = 5; + break; + } + rmdir (dir_name); } - rmdir (dir_name); } return fail; diff --git a/m4/getcwd-path-max.m4 b/m4/getcwd-path-max.m4 index 68975617..d30e1b32 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-2012 Free Software Foundation, Inc. +# Copyright (C) 2003-2007, 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. diff --git a/m4/getcwd.m4 b/m4/getcwd.m4 index 50b96c66..93b3b86b 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-2012 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003-2007, 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. diff --git a/m4/getdelim.m4 b/m4/getdelim.m4 index a6f48721..36f66a10 100644 --- a/m4/getdelim.m4 +++ b/m4/getdelim.m4 @@ -1,6 +1,6 @@ # getdelim.m4 serial 10 -dnl Copyright (C) 2005-2007, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2007, 2009-2013 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 81488ba5..8f04b3b8 100644 --- a/m4/getdtablesize.m4 +++ b/m4/getdtablesize.m4 @@ -1,5 +1,5 @@ -# getdtablesize.m4 serial 3 -dnl Copyright (C) 2008-2012 Free Software Foundation, Inc. +# getdtablesize.m4 serial 4 +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. @@ -14,6 +14,4 @@ AC_DEFUN([gl_FUNC_GETDTABLESIZE], ]) # Prerequisites of lib/getdtablesize.c. -AC_DEFUN([gl_PREREQ_GETDTABLESIZE], [ - AC_REQUIRE([AC_C_INLINE]) -]) +AC_DEFUN([gl_PREREQ_GETDTABLESIZE], [:]) diff --git a/m4/getgroups.m4 b/m4/getgroups.m4 index 17473af4..01b9b280 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-2012 Free Software Foundation, Inc. +# Copyright (C) 1996-1997, 1999-2004, 2008-2013 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 9593a850..7413f9e3 100644 --- a/m4/gethostname.m4 +++ b/m4/gethostname.m4 @@ -1,5 +1,5 @@ # gethostname.m4 serial 13 -dnl Copyright (C) 2002, 2008-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 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. diff --git a/m4/gethrxtime.m4 b/m4/gethrxtime.m4 index 6a54ee0f..25230e77 100644 --- a/m4/gethrxtime.m4 +++ b/m4/gethrxtime.m4 @@ -1,5 +1,5 @@ -# gethrxtime.m4 serial 11 -dnl Copyright (C) 2005-2006, 2008-2012 Free Software Foundation, Inc. +# gethrxtime.m4 serial 12 +dnl Copyright (C) 2005-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. @@ -18,8 +18,10 @@ AC_DEFUN([gl_GETHRXTIME], dnl Find libraries needed to link lib/gethrxtime.c. AC_REQUIRE([gl_CLOCK_TIME]) AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) - AC_CHECK_FUNCS_ONCE([nanouptime]) - if test $ac_cv_func_nanouptime != yes; then + AC_CHECK_FUNCS_ONCE([microuptime nanouptime]) + if test $ac_cv_func_nanouptime != yes \ + && { test $ac_cv_have_decl_gethrtime = no \ + || test $gl_cv_arithmetic_hrtime_t = no; }; then AC_CACHE_CHECK([whether CLOCK_MONOTONIC or CLOCK_REALTIME is defined], [gl_cv_have_clock_gettime_macro], [AC_EGREP_CPP([have_clock_gettime_macro], @@ -60,14 +62,6 @@ AC_DEFUN([gl_ARITHMETIC_HRTIME_T], # Prerequisites of lib/xtime.h. AC_DEFUN([gl_XTIME], [ - AC_REQUIRE([AC_C_INLINE]) AC_REQUIRE([AC_TYPE_LONG_LONG_INT]) : ]) - -# Prerequisites of lib/gethrxtime.c. -AC_DEFUN([gl_PREREQ_GETHRXTIME], -[ - AC_CHECK_FUNCS_ONCE([microuptime]) - : -]) diff --git a/m4/getline.m4 b/m4/getline.m4 index 72fbc9d4..342bc990 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-2012 Free Software Foundation, +dnl Copyright (C) 1998-2003, 2005-2007, 2009-2013 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 ad09c80d..611372aa 100644 --- a/m4/getloadavg.m4 +++ b/m4/getloadavg.m4 @@ -1,13 +1,13 @@ # Check for getloadavg. -# Copyright (C) 1992-1996, 1999-2000, 2002-2003, 2006, 2008-2012 Free Software +# Copyright (C) 1992-1996, 1999-2000, 2002-2003, 2006, 2008-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 +#serial 6 # Autoconf defines AC_FUNC_GETLOADAVG, but that is obsolescent. # New applications should use gl_GETLOADAVG instead. @@ -22,7 +22,7 @@ AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) gl_save_LIBS=$LIBS -# getloadvg is present in libc on glibc >= 2.2, MacOS X, FreeBSD >= 2.0, +# getloadvg is present in libc on glibc >= 2.2, Mac OS X, FreeBSD >= 2.0, # NetBSD >= 0.9, OpenBSD >= 2.0, Solaris >= 7. HAVE_GETLOADAVG=1 AC_CHECK_FUNC([getloadavg], [], @@ -105,6 +105,8 @@ AC_DEFUN([gl_PREREQ_GETLOADAVG], [ # Figure out what our getloadavg.c needs. +AC_CHECK_HEADERS_ONCE([sys/param.h]) + # On HPUX9, an unprivileged user can get load averages this way. if test $gl_func_getloadavg_done = no; then AC_CHECK_FUNCS([pstat_getdynamic], [gl_func_getloadavg_done=yes]) diff --git a/m4/getlogin.m4 b/m4/getlogin.m4 index afe7a6f4..9b3f3cda 100644 --- a/m4/getlogin.m4 +++ b/m4/getlogin.m4 @@ -1,5 +1,5 @@ # getlogin.m4 serial 3 -dnl Copyright (C) 2010-2012 Free Software Foundation, Inc. +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. diff --git a/m4/getndelim2.m4 b/m4/getndelim2.m4 index b14eb7eb..910cfaab 100644 --- a/m4/getndelim2.m4 +++ b/m4/getndelim2.m4 @@ -1,5 +1,5 @@ # getndelim2.m4 serial 8 -dnl Copyright (C) 2003, 2006, 2008-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 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. diff --git a/m4/getopt.m4 b/m4/getopt.m4 index 2aea8959..50f45091 100644 --- a/m4/getopt.m4 +++ b/m4/getopt.m4 @@ -1,5 +1,5 @@ -# getopt.m4 serial 39 -dnl Copyright (C) 2002-2006, 2008-2012 Free Software Foundation, Inc. +# getopt.m4 serial 44 +dnl Copyright (C) 2002-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. @@ -9,18 +9,17 @@ AC_DEFUN([gl_FUNC_GETOPT_POSIX], [ m4_divert_text([DEFAULTS], [gl_getopt_required=POSIX]) AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) + AC_REQUIRE([gl_GETOPT_CHECK_HEADERS]) dnl Other modules can request the gnulib implementation of the getopt dnl functions unconditionally, by defining gl_REPLACE_GETOPT_ALWAYS. dnl argp.m4 does this. m4_ifdef([gl_REPLACE_GETOPT_ALWAYS], [ - gl_GETOPT_IFELSE([], []) REPLACE_GETOPT=1 ], [ REPLACE_GETOPT=0 - gl_GETOPT_IFELSE([ + if test -n "$gl_replace_getopt"; then REPLACE_GETOPT=1 - ], - []) + fi ]) if test $REPLACE_GETOPT = 1; then dnl Arrange for getopt.h to be created. @@ -38,13 +37,6 @@ AC_DEFUN([gl_FUNC_GETOPT_GNU], AC_REQUIRE([gl_FUNC_GETOPT_POSIX]) ]) -# emacs' configure.in uses this. -AC_DEFUN([gl_GETOPT_IFELSE], -[ - AC_REQUIRE([gl_GETOPT_CHECK_HEADERS]) - AS_IF([test -n "$gl_replace_getopt"], [$1], [$2]) -]) - # Determine whether to replace the entire getopt facility. AC_DEFUN([gl_GETOPT_CHECK_HEADERS], [ @@ -74,11 +66,6 @@ AC_DEFUN([gl_GETOPT_CHECK_HEADERS], AC_CHECK_FUNCS([getopt_long_only], [], [gl_replace_getopt=yes]) fi - dnl mingw's getopt (in libmingwex.a) does weird things when the options - dnl strings starts with '+' and it's not the first call. Some internal state - dnl is left over from earlier calls, and neither setting optind = 0 nor - dnl setting optreset = 1 get rid of this internal state. - dnl POSIX is silent on optind vs. optreset, so we allow either behavior. dnl POSIX 2008 does not specify leading '+' behavior, but see dnl http://austingroupbugs.net/view.php?id=191 for a recommendation on dnl the next version of POSIX. For now, we only guarantee leading '+' @@ -87,30 +74,16 @@ AC_DEFUN([gl_GETOPT_CHECK_HEADERS], AC_CACHE_CHECK([whether getopt is POSIX compatible], [gl_cv_func_getopt_posix], [ - dnl BSD getopt_long uses an incompatible method to reset option - dnl processing. Existence of the optreset variable, in and of - dnl itself, is not a reason to replace getopt, but knowledge - dnl of the variable is needed to determine how to reset and - dnl whether a reset reparses the environment. Solaris - dnl supports neither optreset nor optind=0, but keeps no state - dnl that needs a reset beyond setting optind=1; detect Solaris - dnl by getopt_clip. - AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[#include <unistd.h>]], - [[int *p = &optreset; return optreset;]])], - [gl_optind_min=1], - [AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[#include <getopt.h>]], - [[return !getopt_clip;]])], - [gl_optind_min=1], - [gl_optind_min=0])]) - - dnl This test fails on mingw and succeeds on many other platforms. - gl_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -DOPTIND_MIN=$gl_optind_min" - AC_RUN_IFELSE([AC_LANG_SOURCE([[ + dnl Merging these three different test programs into a single one + dnl would require a reset mechanism. On BSD systems, it can be done + dnl through 'optreset'; on some others (glibc), it can be done by + dnl setting 'optind' to 0; on others again (HP-UX, IRIX, OSF/1, + dnl Solaris 9, musl libc), there is no such mechanism. + if test $cross_compiling = no; then + dnl Sanity check. Succeeds everywhere (except on MSVC, + dnl which lacks <unistd.h> and getopt() entirely). + AC_RUN_IFELSE( + [AC_LANG_SOURCE([[ #include <unistd.h> #include <stdlib.h> #include <string.h> @@ -118,89 +91,107 @@ AC_DEFUN([gl_GETOPT_CHECK_HEADERS], int main () { - { - static char program[] = "program"; - static char a[] = "-a"; - static char foo[] = "foo"; - static char bar[] = "bar"; - char *argv[] = { program, a, foo, bar, NULL }; - int c; + static char program[] = "program"; + static char a[] = "-a"; + static char foo[] = "foo"; + static char bar[] = "bar"; + char *argv[] = { program, a, foo, bar, NULL }; + int c; - optind = OPTIND_MIN; - opterr = 0; - - c = getopt (4, argv, "ab"); - if (!(c == 'a')) - return 1; - c = getopt (4, argv, "ab"); - if (!(c == -1)) - return 2; - if (!(optind == 2)) - return 3; - } - /* Some internal state exists at this point. */ - { - static char program[] = "program"; - static char donald[] = "donald"; - static char p[] = "-p"; - static char billy[] = "billy"; - static char duck[] = "duck"; - static char a[] = "-a"; - static char bar[] = "bar"; - char *argv[] = { program, donald, p, billy, duck, a, bar, NULL }; - int c; + c = getopt (4, argv, "ab"); + if (!(c == 'a')) + return 1; + c = getopt (4, argv, "ab"); + if (!(c == -1)) + return 2; + if (!(optind == 2)) + return 3; + return 0; +} +]])], + [gl_cv_func_getopt_posix=maybe], + [gl_cv_func_getopt_posix=no]) + if test $gl_cv_func_getopt_posix = maybe; then + dnl Sanity check with '+'. Succeeds everywhere (except on MSVC, + dnl which lacks <unistd.h> and getopt() entirely). + AC_RUN_IFELSE( + [AC_LANG_SOURCE([[ +#include <unistd.h> +#include <stdlib.h> +#include <string.h> - optind = OPTIND_MIN; - opterr = 0; +int +main () +{ + static char program[] = "program"; + static char donald[] = "donald"; + static char p[] = "-p"; + static char billy[] = "billy"; + static char duck[] = "duck"; + static char a[] = "-a"; + static char bar[] = "bar"; + char *argv[] = { program, donald, p, billy, duck, a, bar, NULL }; + int c; - c = getopt (7, argv, "+abp:q:"); - if (!(c == -1)) - return 4; - if (!(strcmp (argv[0], "program") == 0)) - return 5; - if (!(strcmp (argv[1], "donald") == 0)) - return 6; - if (!(strcmp (argv[2], "-p") == 0)) - return 7; - if (!(strcmp (argv[3], "billy") == 0)) - return 8; - if (!(strcmp (argv[4], "duck") == 0)) - return 9; - if (!(strcmp (argv[5], "-a") == 0)) - return 10; - if (!(strcmp (argv[6], "bar") == 0)) - return 11; - if (!(optind == 1)) - return 12; - } - /* Detect MacOS 10.5, AIX 7.1 bug. */ - { - static char program[] = "program"; - static char ab[] = "-ab"; - char *argv[3] = { program, ab, NULL }; - optind = OPTIND_MIN; - opterr = 0; - if (getopt (2, argv, "ab:") != 'a') - return 13; - if (getopt (2, argv, "ab:") != '?') - return 14; - if (optopt != 'b') - return 15; - if (optind != 2) - return 16; - } + c = getopt (7, argv, "+abp:q:"); + if (!(c == -1)) + return 4; + if (!(strcmp (argv[0], "program") == 0)) + return 5; + if (!(strcmp (argv[1], "donald") == 0)) + return 6; + if (!(strcmp (argv[2], "-p") == 0)) + return 7; + if (!(strcmp (argv[3], "billy") == 0)) + return 8; + if (!(strcmp (argv[4], "duck") == 0)) + return 9; + if (!(strcmp (argv[5], "-a") == 0)) + return 10; + if (!(strcmp (argv[6], "bar") == 0)) + return 11; + if (!(optind == 1)) + return 12; + return 0; +} +]])], + [gl_cv_func_getopt_posix=maybe], + [gl_cv_func_getopt_posix=no]) + fi + if test $gl_cv_func_getopt_posix = maybe; then + dnl Detect Mac OS X 10.5, AIX 7.1, mingw bug. + AC_RUN_IFELSE( + [AC_LANG_SOURCE([[ +#include <unistd.h> +#include <stdlib.h> +#include <string.h> +int +main () +{ + static char program[] = "program"; + static char ab[] = "-ab"; + char *argv[3] = { program, ab, NULL }; + if (getopt (2, argv, "ab:") != 'a') + return 13; + if (getopt (2, argv, "ab:") != '?') + return 14; + if (optopt != 'b') + return 15; + if (optind != 2) + return 16; return 0; } ]])], - [gl_cv_func_getopt_posix=yes], [gl_cv_func_getopt_posix=no], - [case "$host_os" in - mingw*) gl_cv_func_getopt_posix="guessing no";; - darwin* | aix*) gl_cv_func_getopt_posix="guessing no";; - *) gl_cv_func_getopt_posix="guessing yes";; - esac - ]) - CPPFLAGS=$gl_save_CPPFLAGS + [gl_cv_func_getopt_posix=yes], + [gl_cv_func_getopt_posix=no]) + fi + else + case "$host_os" in + darwin* | aix* | mingw*) gl_cv_func_getopt_posix="guessing no";; + *) gl_cv_func_getopt_posix="guessing yes";; + esac + fi ]) case "$gl_cv_func_getopt_posix" in *no) gl_replace_getopt=yes ;; @@ -236,7 +227,7 @@ dnl is ambiguous with environment values that contain newlines. nocrash_init(); /* This code succeeds on glibc 2.8, OpenBSD 4.0, Cygwin, mingw, - and fails on MacOS X 10.5, AIX 5.2, HP-UX 11, IRIX 6.5, + and fails on Mac OS X 10.5, AIX 5.2, HP-UX 11, IRIX 6.5, OSF/1 5.1, Solaris 10. */ { static char conftest[] = "conftest"; @@ -247,7 +238,7 @@ dnl is ambiguous with environment values that contain newlines. result |= 1; } /* This code succeeds on glibc 2.8, mingw, - and fails on MacOS X 10.5, OpenBSD 4.0, AIX 5.2, HP-UX 11, + and fails on Mac OS X 10.5, OpenBSD 4.0, AIX 5.2, HP-UX 11, IRIX 6.5, OSF/1 5.1, Solaris 10, Cygwin 1.5.x. */ { static char program[] = "program"; @@ -276,7 +267,7 @@ dnl is ambiguous with environment values that contain newlines. if (getopt (3, argv, "-p") != 1) result |= 16; else if (getopt (3, argv, "-p") != 'p') - result |= 32; + result |= 16; } /* This code fails on glibc 2.11. */ { @@ -286,9 +277,9 @@ dnl is ambiguous with environment values that contain newlines. char *argv[] = { program, b, a, NULL }; optind = opterr = 0; if (getopt (3, argv, "+:a:b") != 'b') - result |= 64; + result |= 32; else if (getopt (3, argv, "+:a:b") != ':') - result |= 64; + result |= 32; } /* This code dumps core on glibc 2.14. */ { @@ -298,18 +289,14 @@ dnl is ambiguous with environment values that contain newlines. char *argv[] = { program, w, dummy, NULL }; optind = opterr = 1; if (getopt (3, argv, "W;") != 'W') - result |= 128; + result |= 64; } return result; ]])], [gl_cv_func_getopt_gnu=yes], [gl_cv_func_getopt_gnu=no], - [dnl Cross compiling. Guess based on host and declarations. - case $host_os:$ac_cv_have_decl_optreset in - *-gnu*:* | mingw*:*) gl_cv_func_getopt_gnu=no;; - *:yes) gl_cv_func_getopt_gnu=no;; - *) gl_cv_func_getopt_gnu=yes;; - esac + [dnl Cross compiling. Assume the worst, even on glibc platforms. + gl_cv_func_getopt_gnu="guessing no" ]) case $gl_had_POSIXLY_CORRECT in exported) ;; @@ -317,13 +304,54 @@ dnl is ambiguous with environment values that contain newlines. *) AS_UNSET([POSIXLY_CORRECT]) ;; esac ]) - if test "$gl_cv_func_getopt_gnu" = "no"; then + if test "$gl_cv_func_getopt_gnu" != yes; then gl_replace_getopt=yes + else + AC_CACHE_CHECK([for working GNU getopt_long function], + [gl_cv_func_getopt_long_gnu], + [AC_RUN_IFELSE( + [AC_LANG_PROGRAM( + [[#include <getopt.h> + #include <stddef.h> + #include <string.h> + ]], + [[static const struct option long_options[] = + { + { "xtremely-",no_argument, NULL, 1003 }, + { "xtra", no_argument, NULL, 1001 }, + { "xtreme", no_argument, NULL, 1002 }, + { "xtremely", no_argument, NULL, 1003 }, + { NULL, 0, NULL, 0 } + }; + /* This code fails on OpenBSD 5.0. */ + { + static char program[] = "program"; + static char xtremel[] = "--xtremel"; + char *argv[] = { program, xtremel, NULL }; + int option_index; + optind = 1; opterr = 0; + if (getopt_long (2, argv, "", long_options, &option_index) != 1003) + return 1; + } + return 0; + ]])], + [gl_cv_func_getopt_long_gnu=yes], + [gl_cv_func_getopt_long_gnu=no], + [dnl Cross compiling. Guess no on OpenBSD, yes otherwise. + case "$host_os" in + openbsd*) gl_cv_func_getopt_long_gnu="guessing no";; + *) gl_cv_func_getopt_long_gnu="guessing yes";; + esac + ]) + ]) + case "$gl_cv_func_getopt_long_gnu" in + *yes) ;; + *) gl_replace_getopt=yes ;; + esac fi fi ]) -# emacs' configure.in uses this. AC_DEFUN([gl_GETOPT_SUBSTITUTE_HEADER], [ GETOPT_H=getopt.h @@ -334,7 +362,6 @@ AC_DEFUN([gl_GETOPT_SUBSTITUTE_HEADER], ]) # Prerequisites of lib/getopt*. -# emacs' configure.in uses this. AC_DEFUN([gl_PREREQ_GETOPT], [ AC_CHECK_DECLS_ONCE([getenv]) diff --git a/m4/getpagesize.m4 b/m4/getpagesize.m4 index 156133ae..06e893d7 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-2012 Free Software Foundation, +dnl Copyright (C) 2002, 2004-2005, 2007, 2009-2013 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 2a7e1600..e35dea4d 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-2012 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2013 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 f84e6a5d..8d1f0665 100644 --- a/m4/gettext.m4 +++ b/m4/gettext.m4 @@ -1,5 +1,5 @@ -# gettext.m4 serial 63 (gettext-0.18) -dnl Copyright (C) 1995-2010 Free Software Foundation, Inc. +# gettext.m4 serial 66 (gettext-0.18.2) +dnl Copyright (C) 1995-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. @@ -35,7 +35,7 @@ dnl will be ignored. If NEEDSYMBOL is specified and is dnl 'need-formatstring-macros', then GNU gettext implementations that don't dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored. dnl INTLDIR is used to find the intl libraries. If empty, -dnl the value `$(top_builddir)/intl/' is used. +dnl the value '$(top_builddir)/intl/' is used. dnl dnl The result of the configuration is one of three cases: dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled @@ -97,7 +97,7 @@ AC_DEFUN([AM_GNU_GETTEXT], AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) ]) - dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation. + dnl Sometimes, on Mac OS X, libintl requires linking with CoreFoundation. gt_INTL_MACOSX dnl Set USE_NLS. @@ -157,12 +157,18 @@ changequote([,])dnl fi AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc], - [AC_TRY_LINK([#include <libintl.h> + [AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include <libintl.h> $gt_revision_test_code extern int _nl_msg_cat_cntr; -extern int *_nl_domain_bindings;], - [bindtextdomain ("", ""); -return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings], +extern int *_nl_domain_bindings; + ]], + [[ +bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings + ]])], [eval "$gt_func_gnugettext_libc=yes"], [eval "$gt_func_gnugettext_libc=no"])]) @@ -183,35 +189,47 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_b gt_save_LIBS="$LIBS" LIBS="$LIBS $LIBINTL" dnl Now see whether libintl exists and does not depend on libiconv. - AC_TRY_LINK([#include <libintl.h> + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include <libintl.h> $gt_revision_test_code extern int _nl_msg_cat_cntr; extern #ifdef __cplusplus "C" #endif -const char *_nl_expand_alias (const char *);], - [bindtextdomain ("", ""); -return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")], +const char *_nl_expand_alias (const char *); + ]], + [[ +bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") + ]])], [eval "$gt_func_gnugettext_libintl=yes"], [eval "$gt_func_gnugettext_libintl=no"]) dnl Now see whether libintl exists and depends on libiconv. if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then LIBS="$LIBS $LIBICONV" - AC_TRY_LINK([#include <libintl.h> + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include <libintl.h> $gt_revision_test_code extern int _nl_msg_cat_cntr; extern #ifdef __cplusplus "C" #endif -const char *_nl_expand_alias (const char *);], - [bindtextdomain ("", ""); -return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")], - [LIBINTL="$LIBINTL $LIBICONV" - LTLIBINTL="$LTLIBINTL $LTLIBICONV" - eval "$gt_func_gnugettext_libintl=yes" - ]) +const char *_nl_expand_alias (const char *); + ]], + [[ +bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") + ]])], + [LIBINTL="$LIBINTL $LIBICONV" + LTLIBINTL="$LTLIBINTL $LTLIBICONV" + eval "$gt_func_gnugettext_libintl=yes" + ]) fi CPPFLAGS="$gt_save_CPPFLAGS" LIBS="$gt_save_LIBS"]) diff --git a/m4/gettime.m4 b/m4/gettime.m4 index 7d03d125..dc100de5 100644 --- a/m4/gettime.m4 +++ b/m4/gettime.m4 @@ -1,5 +1,5 @@ # gettime.m4 serial 8 -dnl Copyright (C) 2002, 2004-2006, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2004-2006, 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. diff --git a/m4/gettimeofday.m4 b/m4/gettimeofday.m4 index eda97027..3c05e59f 100644 --- a/m4/gettimeofday.m4 +++ b/m4/gettimeofday.m4 @@ -1,6 +1,6 @@ # serial 20 -# Copyright (C) 2001-2003, 2005, 2007, 2009-2012 Free Software Foundation, Inc. +# Copyright (C) 2001-2003, 2005, 2007, 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. diff --git a/m4/getugroups.m4 b/m4/getugroups.m4 index 699f3d22..edd7b91d 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-2012 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2013 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 f64eac2d..8aee912b 100644 --- a/m4/getusershell.m4 +++ b/m4/getusershell.m4 @@ -1,5 +1,5 @@ # getusershell.m4 serial 7 -dnl Copyright (C) 2002-2003, 2006, 2008-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2003, 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. diff --git a/m4/glibc21.m4 b/m4/glibc21.m4 index c938fb1a..613fb2a4 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-2012 Free Software Foundation, +dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2013 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 e337e161..25920903 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-2012 Free Software Foundation, Inc. +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, @@ -30,6 +30,8 @@ AC_DEFUN([cu_GMP], 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.])]) diff --git a/m4/gnu-make.m4 b/m4/gnu-make.m4 index e796f3c8..68d15bc8 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-2012 Free Software Foundation, Inc. +# Copyright (C) 2007, 2009-2013 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 ab3c43d7..0ae5a9ec 100644 --- a/m4/gnulib-common.m4 +++ b/m4/gnulib-common.m4 @@ -1,5 +1,5 @@ -# gnulib-common.m4 serial 32 -dnl Copyright (C) 2007-2012 Free Software Foundation, Inc. +# gnulib-common.m4 serial 33 +dnl Copyright (C) 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. @@ -14,7 +14,8 @@ AC_DEFUN([gl_COMMON], [ AC_DEFUN([gl_COMMON_BODY], [ AH_VERBATIM([_Noreturn], [/* The _Noreturn keyword of C11. */ -#if !defined _Noreturn && __STDC_VERSION__ < 201112 +#if ! (defined _Noreturn \ + || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__)) # if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \ || 0x5110 <= __SUNPRO_C) # define _Noreturn __attribute__ ((__noreturn__)) @@ -29,7 +30,7 @@ AC_DEFUN([gl_COMMON_BODY], [ [/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of earlier versions), but does not display it by setting __GNUC_STDC_INLINE__. - __APPLE__ && __MACH__ test for MacOS X. + __APPLE__ && __MACH__ test for Mac OS X. __APPLE_CC__ tests for the Apple compiler and its version. __STDC_VERSION__ tests for the C99 mode. */ #if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__ @@ -293,6 +294,8 @@ Amsterdam # for interoperability with automake-1.9.6 from autoconf-2.62. # Remove this macro when we can assume autoconf >= 2.62 or # autoconf >= 2.60 && automake >= 1.10. +# AC_AUTOCONF_VERSION was introduced in 2.62, so use that as the witness. +m4_ifndef([AC_AUTOCONF_VERSION],[ m4_ifdef([AC_PROG_MKDIR_P], [ dnl For automake-1.9.6 && autoconf < 2.62: Ensure MKDIR_P is AC_SUBSTed. m4_define([AC_PROG_MKDIR_P], @@ -303,13 +306,15 @@ m4_ifdef([AC_PROG_MKDIR_P], [ [AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake MKDIR_P='$(mkdir_p)' AC_SUBST([MKDIR_P])])]) +]) # AC_C_RESTRICT # This definition overrides the AC_C_RESTRICT macro from autoconf 2.60..2.61, # so that mixed use of GNU C and GNU C++ and mixed use of Sun C and Sun C++ # works. # This definition can be removed once autoconf >= 2.62 can be assumed. -m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.62]),[-1],[ +# AC_AUTOCONF_VERSION was introduced in 2.62, so use that as the witness. +m4_ifndef([AC_AUTOCONF_VERSION],[ AC_DEFUN([AC_C_RESTRICT], [AC_CACHE_CHECK([for C/C++ restrict keyword], [ac_cv_c_restrict], [ac_cv_c_restrict=no diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 index 91f798b9..ea3cea15 100644 --- a/m4/gnulib-comp.m4 +++ b/m4/gnulib-comp.m4 @@ -1,5 +1,5 @@ # DO NOT EDIT! GENERATED AUTOMATICALLY! -# Copyright (C) 2002-2012 Free Software Foundation, Inc. +# Copyright (C) 2002-2013 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 @@ -77,6 +77,7 @@ AC_DEFUN([gl_EARLY], # Code from module bitrotate-tests: # Code from module btowc: # Code from module btowc-tests: + # Code from module buffer-lcm: # Code from module c-ctype: # Code from module c-ctype-tests: # Code from module c-strcase: @@ -153,6 +154,7 @@ AC_DEFUN([gl_EARLY], # Code from module exitfail: # Code from module extensions: AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) + # Code from module extern-inline: # Code from module faccessat: # Code from module faccessat-tests: # Code from module fadvise: @@ -173,6 +175,7 @@ AC_DEFUN([gl_EARLY], # Code from module fcntl-safer-tests: # Code from module fcntl-tests: # Code from module fd-hook: + # Code from module fd-reopen: # Code from module fd-safer-flag: # Code from module fdatasync: # Code from module fdatasync-tests: @@ -290,6 +293,7 @@ AC_DEFUN([gl_EARLY], # Code from module getopt-posix-tests: # Code from module getpagesize: # Code from module getpass-gnu: + # Code from module gettext: # Code from module gettext-h: # Code from module gettime: # Code from module gettimeofday: @@ -451,6 +455,7 @@ AC_DEFUN([gl_EARLY], # Code from module nl_langinfo: # Code from module nl_langinfo-tests: # Code from module nocrash: + # Code from module non-recursive-gnulib-prefix-hack: # Code from module nproc: # Code from module obstack: # Code from module open: @@ -535,6 +540,7 @@ AC_DEFUN([gl_EARLY], # Code from module realloc-gnu-tests: # Code from module realloc-posix: # Code from module regex: + # Code from module regex-tests: # Code from module remove: # Code from module remove-tests: # Code from module rename: @@ -543,6 +549,7 @@ AC_DEFUN([gl_EARLY], # Code from module rmdir: # Code from module rmdir-tests: # Code from module root-dev-ino: + # Code from module root-uid: # Code from module rpmatch: # Code from module safe-read: # Code from module safe-write: @@ -600,6 +607,8 @@ AC_DEFUN([gl_EARLY], # Code from module stat-tests: # Code from module stat-time: # Code from module stat-time-tests: + # Code from module statat: + # Code from module statat-tests: # Code from module stdalign: # Code from module stdalign-tests: # Code from module stdarg: @@ -621,7 +630,6 @@ AC_DEFUN([gl_EARLY], # Code from module stdlib-tests: # Code from module stpcpy: # Code from module stpncpy: - # Code from module strcase: # Code from module strchrnul: # Code from module strchrnul-tests: # Code from module strdup-posix: @@ -637,14 +645,13 @@ AC_DEFUN([gl_EARLY], # Code from module striconv-tests: # Code from module string: # Code from module string-tests: - # Code from module strings: - # Code from module strings-tests: # Code from module strncat: # Code from module strncat-tests: # Code from module strndup: # Code from module strnlen: # Code from module strnlen-tests: # Code from module strnlen1: + # Code from module strnumcmp: # Code from module strpbrk: # Code from module strsignal: # Code from module strsignal-tests: @@ -783,6 +790,7 @@ AC_DEFUN([gl_EARLY], # Code from module xalloc-die-tests: # Code from module xalloc-oversized: # Code from module xfreopen: + # Code from module xfts: # Code from module xgetcwd: # Code from module xgetgroups: # Code from module xgethostname: @@ -826,1220 +834,1213 @@ 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 -AC_PROG_MKDIR_P -gl_ASSERT -AC_LIBOBJ([openat-proc]) -gl_BACKUPFILE -gl_FUNC_BASE64 -AC_REQUIRE([AC_C_INLINE]) -gl_FUNC_BTOWC -if test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1; then - AC_LIBOBJ([btowc]) - gl_PREREQ_BTOWC -fi -gl_WCHAR_MODULE_INDICATOR([btowc]) -gl_C_STRTOD -gl_C_STRTOLD -gl_FUNC_CALLOC_GNU -if test $REPLACE_CALLOC = 1; then - AC_LIBOBJ([calloc]) -fi -gl_MODULE_INDICATOR([calloc-gnu]) -gl_FUNC_CALLOC_POSIX -if test $REPLACE_CALLOC = 1; then - AC_LIBOBJ([calloc]) -fi -gl_STDLIB_MODULE_INDICATOR([calloc-posix]) -gl_PREREQ_CANON_HOST -gl_FUNC_CANONICALIZE_FILENAME_MODE -gl_MODULE_INDICATOR([canonicalize]) -gl_MODULE_INDICATOR_FOR_TESTS([canonicalize]) -gl_STDLIB_MODULE_INDICATOR([canonicalize_file_name]) -AC_CHECK_FUNCS_ONCE([readlinkat]) -gl_UNISTD_MODULE_INDICATOR([chdir]) -gl_FUNC_CHDIR_LONG -if test $gl_cv_have_arbitrary_file_name_length_limit = yes; then - AC_LIBOBJ([chdir-long]) - gl_PREREQ_CHDIR_LONG -fi -gl_FUNC_CHOWN -if test $HAVE_CHOWN = 0 || test $REPLACE_CHOWN = 1; then - AC_LIBOBJ([chown]) -fi -if test $REPLACE_CHOWN = 1 && test $ac_cv_func_fchown = no; then - AC_LIBOBJ([fchown-stub]) -fi -gl_UNISTD_MODULE_INDICATOR([chown]) -gl_CLOCK_TIME -gl_MODULE_INDICATOR_FOR_TESTS([cloexec]) -gl_FUNC_CLOSE -if test $REPLACE_CLOSE = 1; then - AC_LIBOBJ([close]) -fi -gl_UNISTD_MODULE_INDICATOR([close]) -gl_CLOSE_STREAM -gl_MODULE_INDICATOR([close-stream]) -gl_FUNC_CLOSEDIR -if test $HAVE_CLOSEDIR = 0 || test $REPLACE_CLOSEDIR = 1; then - AC_LIBOBJ([closedir]) -fi -gl_DIRENT_MODULE_INDICATOR([closedir]) -gl_CLOSEIN -gl_CLOSEOUT -gl_CONFIG_H -gl_CONFIGMAKE_PREP -gl_MD5 -gl_SHA1 -gl_SHA256 -gl_SHA512 -gl_CTYPE_H -gl_CYCLE_CHECK -gl_CHECK_TYPE_STRUCT_DIRENT_D_INO -gl_CHECK_TYPE_STRUCT_DIRENT_D_TYPE -gl_DIRENT_H -gl_DIRENT_SAFER -gl_MODULE_INDICATOR([dirent-safer]) -gl_FUNC_DIRFD -if test $ac_cv_func_dirfd = no && test $gl_cv_func_dirfd_macro = no; then - AC_LIBOBJ([dirfd]) - gl_PREREQ_DIRFD -fi -gl_DIRENT_MODULE_INDICATOR([dirfd]) -gl_DIRNAME -gl_MODULE_INDICATOR([dirname]) -gl_DIRNAME_LGPL -gl_DOUBLE_SLASH_ROOT -AC_REQUIRE([gl_C99_STRTOLD]) -gl_FUNC_DUP -if test $REPLACE_DUP = 1; then - AC_LIBOBJ([dup]) - gl_PREREQ_DUP -fi -gl_UNISTD_MODULE_INDICATOR([dup]) -gl_FUNC_DUP2 -if test $HAVE_DUP2 = 0 || test $REPLACE_DUP2 = 1; then - AC_LIBOBJ([dup2]) - gl_PREREQ_DUP2 -fi -gl_UNISTD_MODULE_INDICATOR([dup2]) -gl_ENVIRON -gl_UNISTD_MODULE_INDICATOR([environ]) -gl_HEADER_ERRNO_H -gl_ERROR -if test $ac_cv_lib_error_at_line = no; then - AC_LIBOBJ([error]) - gl_PREREQ_ERROR -fi -m4_ifdef([AM_XGETTEXT_OPTION], - [AM_][XGETTEXT_OPTION([--flag=error:3:c-format]) - AM_][XGETTEXT_OPTION([--flag=error_at_line:5:c-format])]) -gl_FUNC_EUIDACCESS -if test $HAVE_EUIDACCESS = 0; then - AC_LIBOBJ([euidaccess]) - gl_PREREQ_EUIDACCESS -fi -gl_UNISTD_MODULE_INDICATOR([euidaccess]) -gl_FUNC_FACCESSAT -if test $HAVE_FACCESSAT = 0; then - AC_LIBOBJ([faccessat]) - gl_PREREQ_FACCESSAT -fi -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 -if test $HAVE_FCHMODAT = 0; then - AC_LIBOBJ([fchmodat]) -fi -AC_REQUIRE([AC_C_INLINE]) dnl because 'inline' is used in lib/openat.h -gl_MODULE_INDICATOR([fchmodat]) dnl for lib/openat.h -gl_SYS_STAT_MODULE_INDICATOR([fchmodat]) -gl_FUNC_FCHOWNAT -if test $HAVE_FCHOWNAT = 0 || test $REPLACE_FCHOWNAT = 1; then - AC_LIBOBJ([fchownat]) -fi -AC_REQUIRE([AC_C_INLINE]) dnl because 'inline' is used in lib/openat.h -gl_MODULE_INDICATOR([fchownat]) dnl for lib/openat.h -gl_UNISTD_MODULE_INDICATOR([fchownat]) -gl_FUNC_FCLOSE -if test $REPLACE_FCLOSE = 1; then - AC_LIBOBJ([fclose]) -fi -gl_STDIO_MODULE_INDICATOR([fclose]) -gl_FUNC_FCNTL -if test $HAVE_FCNTL = 0 || test $REPLACE_FCNTL = 1; then - AC_LIBOBJ([fcntl]) -fi -gl_FCNTL_MODULE_INDICATOR([fcntl]) -gl_FCNTL_H -gl_FCNTL_SAFER -gl_MODULE_INDICATOR([fcntl-safer]) -gl_MODULE_INDICATOR([fd-safer-flag]) -gl_FUNC_FDATASYNC -if test $HAVE_FDATASYNC = 0; then - AC_LIBOBJ([fdatasync]) -fi -gl_UNISTD_MODULE_INDICATOR([fdatasync]) -gl_FUNC_FDOPEN -if test $REPLACE_FDOPEN = 1; then - AC_LIBOBJ([fdopen]) - gl_PREREQ_FDOPEN -fi -gl_STDIO_MODULE_INDICATOR([fdopen]) -gl_FUNC_FDOPENDIR -if test $HAVE_FDOPENDIR = 0 || test $REPLACE_FDOPENDIR = 1; then - AC_LIBOBJ([fdopendir]) -fi -gl_DIRENT_MODULE_INDICATOR([fdopendir]) -gl_MODULE_INDICATOR([fdopendir]) -AC_REQUIRE([AC_C_INLINE]) dnl because 'inline' is used in lib/utimens.h -gl_MODULE_INDICATOR([fdutimensat]) -gl_FUNC_FFLUSH -if test $REPLACE_FFLUSH = 1; then - AC_LIBOBJ([fflush]) - gl_PREREQ_FFLUSH -fi -gl_MODULE_INDICATOR([fflush]) -gl_STDIO_MODULE_INDICATOR([fflush]) -gl_FILEBLOCKS -if test $ac_cv_member_struct_stat_st_blocks = no; then - AC_LIBOBJ([fileblocks]) - gl_PREREQ_FILEBLOCKS -fi -gl_FILEMODE -gl_FILE_NAME_CONCAT -gl_MODULE_INDICATOR([filenamecat]) -gl_FILE_NAME_CONCAT_LGPL -AC_REQUIRE([AC_C_INLINE]) -AC_C_FLEXIBLE_ARRAY_MEMBER -gl_FLOAT_H -if test $REPLACE_FLOAT_LDBL = 1; then - AC_LIBOBJ([float]) -fi -if test $REPLACE_ITOLD = 1; then - AC_LIBOBJ([itold]) -fi -gl_FUNC_FNMATCH_POSIX -if test -n "$FNMATCH_H"; then - AC_LIBOBJ([fnmatch]) - gl_PREREQ_FNMATCH -fi -gl_FUNC_FNMATCH_GNU -if test -n "$FNMATCH_H"; then - AC_LIBOBJ([fnmatch]) - gl_PREREQ_FNMATCH -fi -gl_FUNC_FOPEN -if test $REPLACE_FOPEN = 1; then - AC_LIBOBJ([fopen]) - gl_PREREQ_FOPEN -fi -gl_STDIO_MODULE_INDICATOR([fopen]) -gl_MODULE_INDICATOR([fopen-safer]) -gl_FUNC_FPENDING -if test $ac_cv_func___fpending = no; then - AC_LIBOBJ([fpending]) - gl_PREREQ_FPENDING -fi -gl_FUNC_FPURGE -if test $HAVE_FPURGE = 0 || test $REPLACE_FPURGE = 1; then - AC_LIBOBJ([fpurge]) -fi -gl_STDIO_MODULE_INDICATOR([fpurge]) -gl_FUNC_FREADING -AC_REQUIRE([AC_C_INLINE]) -gl_FUNC_FREOPEN -if test $REPLACE_FREOPEN = 1; then - AC_LIBOBJ([freopen]) - gl_PREREQ_FREOPEN -fi -gl_STDIO_MODULE_INDICATOR([freopen]) -gl_MODULE_INDICATOR([freopen-safer]) -gl_FUNC_FREXP_NO_LIBM -if test $gl_func_frexp_no_libm != yes; then - AC_LIBOBJ([frexp]) -fi -gl_MATH_MODULE_INDICATOR([frexp]) -gl_FUNC_FREXPL_NO_LIBM -if test $HAVE_DECL_FREXPL = 0 || test $gl_func_frexpl_no_libm = no; then - AC_LIBOBJ([frexpl]) -fi -gl_MATH_MODULE_INDICATOR([frexpl]) -gl_FUNC_FSEEK -if test $REPLACE_FSEEK = 1; then - AC_LIBOBJ([fseek]) -fi -gl_STDIO_MODULE_INDICATOR([fseek]) -gl_FUNC_FSEEKO -if test $HAVE_FSEEKO = 0 || test $REPLACE_FSEEKO = 1; then - AC_LIBOBJ([fseeko]) - gl_PREREQ_FSEEKO -fi -gl_STDIO_MODULE_INDICATOR([fseeko]) -gl_FUNC_FSTAT -if test $REPLACE_FSTAT = 1; then - AC_LIBOBJ([fstat]) - gl_PREREQ_FSTAT -fi -gl_SYS_STAT_MODULE_INDICATOR([fstat]) -gl_FUNC_FSTATAT -if test $HAVE_FSTATAT = 0 || test $REPLACE_FSTATAT = 1; then - AC_LIBOBJ([fstatat]) -fi -AC_REQUIRE([AC_C_INLINE]) dnl because 'inline' is used in lib/openat.h -gl_MODULE_INDICATOR([fstatat]) dnl for lib/openat.h -gl_SYS_STAT_MODULE_INDICATOR([fstatat]) -gl_FSUSAGE -if test $gl_cv_fs_space = yes; then - AC_LIBOBJ([fsusage]) - gl_PREREQ_FSUSAGE_EXTRA -fi -gl_FUNC_FSYNC -if test $HAVE_FSYNC = 0; then - AC_LIBOBJ([fsync]) - gl_PREREQ_FSYNC -fi -gl_UNISTD_MODULE_INDICATOR([fsync]) -gl_FUNC_FTELL -if test $REPLACE_FTELL = 1; then - AC_LIBOBJ([ftell]) -fi -gl_STDIO_MODULE_INDICATOR([ftell]) -gl_FUNC_FTELLO -if test $HAVE_FTELLO = 0 || test $REPLACE_FTELLO = 1; then - AC_LIBOBJ([ftello]) - gl_PREREQ_FTELLO -fi -gl_STDIO_MODULE_INDICATOR([ftello]) -AC_CHECK_FUNCS_ONCE([strtof]) -AC_REQUIRE([gl_C99_STRTOLD]) -gl_FUNC_FTRUNCATE -if test $HAVE_FTRUNCATE = 0 || test $REPLACE_FTRUNCATE = 1; then - AC_LIBOBJ([ftruncate]) - gl_PREREQ_FTRUNCATE -fi -gl_UNISTD_MODULE_INDICATOR([ftruncate]) -gl_FUNC_FTS -dnl Use this version of fts unconditionally, since the GNU libc and -dnl NetBSD versions have bugs and/or unnecessary limitations. -AC_LIBOBJ([fts]) -gl_FUNC_FUTIMENS -if test $HAVE_FUTIMENS = 0 || test $REPLACE_FUTIMENS = 1; then - AC_LIBOBJ([futimens]) -fi -gl_SYS_STAT_MODULE_INDICATOR([futimens]) -gl_GETADDRINFO -if test $HAVE_GETADDRINFO = 0; then - AC_LIBOBJ([getaddrinfo]) -fi -if test $HAVE_DECL_GAI_STRERROR = 0 || test $REPLACE_GAI_STRERROR = 1; then - AC_LIBOBJ([gai_strerror]) -fi -gl_NETDB_MODULE_INDICATOR([getaddrinfo]) -gl_FUNC_GETCWD -if test $REPLACE_GETCWD = 1; then - AC_LIBOBJ([getcwd]) - gl_PREREQ_GETCWD -fi -gl_MODULE_INDICATOR([getcwd]) -gl_UNISTD_MODULE_INDICATOR([getcwd]) -gl_FUNC_GETCWD_LGPL -if test $REPLACE_GETCWD = 1; then - AC_LIBOBJ([getcwd-lgpl]) -fi -gl_UNISTD_MODULE_INDICATOR([getcwd]) -gl_FUNC_GETDELIM -if test $HAVE_GETDELIM = 0 || test $REPLACE_GETDELIM = 1; then - AC_LIBOBJ([getdelim]) - gl_PREREQ_GETDELIM -fi -gl_STDIO_MODULE_INDICATOR([getdelim]) -gl_FUNC_GETDTABLESIZE -if test $HAVE_GETDTABLESIZE = 0; then - AC_LIBOBJ([getdtablesize]) - gl_PREREQ_GETDTABLESIZE -fi -gl_UNISTD_MODULE_INDICATOR([getdtablesize]) -gl_FUNC_GETGROUPS -if test $HAVE_GETGROUPS = 0 || test $REPLACE_GETGROUPS = 1; then - AC_LIBOBJ([getgroups]) -fi -gl_UNISTD_MODULE_INDICATOR([getgroups]) -gl_FUNC_GETHOSTNAME -if test $HAVE_GETHOSTNAME = 0; then - AC_LIBOBJ([gethostname]) - gl_PREREQ_GETHOSTNAME -fi -gl_UNISTD_MODULE_INDICATOR([gethostname]) -gl_GETHRXTIME -if test $ac_cv_have_decl_gethrtime = no || test $gl_cv_arithmetic_hrtime_t = no; then - AC_LIBOBJ([gethrxtime]) - gl_PREREQ_GETHRXTIME -fi -gl_FUNC_GETLINE -if test $REPLACE_GETLINE = 1; then - AC_LIBOBJ([getline]) - gl_PREREQ_GETLINE -fi -gl_STDIO_MODULE_INDICATOR([getline]) -gl_GETLOADAVG -if test $HAVE_GETLOADAVG = 0; then - AC_LIBOBJ([getloadavg]) - gl_PREREQ_GETLOADAVG -fi -gl_STDLIB_MODULE_INDICATOR([getloadavg]) -gl_FUNC_GETLOGIN -if test $HAVE_GETLOGIN = 0; then - AC_LIBOBJ([getlogin]) -fi -gl_UNISTD_MODULE_INDICATOR([getlogin]) -gl_GETNDELIM2 -gl_FUNC_GETOPT_GNU -if test $REPLACE_GETOPT = 1; then - AC_LIBOBJ([getopt]) - AC_LIBOBJ([getopt1]) - gl_PREREQ_GETOPT - dnl Arrange for unistd.h to include getopt.h. - GNULIB_GL_UNISTD_H_GETOPT=1 -fi -AC_SUBST([GNULIB_GL_UNISTD_H_GETOPT]) -gl_MODULE_INDICATOR_FOR_TESTS([getopt-gnu]) -gl_FUNC_GETOPT_POSIX -if test $REPLACE_GETOPT = 1; then - AC_LIBOBJ([getopt]) - AC_LIBOBJ([getopt1]) - gl_PREREQ_GETOPT - dnl Arrange for unistd.h to include getopt.h. - GNULIB_GL_UNISTD_H_GETOPT=1 -fi -AC_SUBST([GNULIB_GL_UNISTD_H_GETOPT]) -gl_FUNC_GETPAGESIZE -if test $REPLACE_GETPAGESIZE = 1; then - AC_LIBOBJ([getpagesize]) -fi -gl_UNISTD_MODULE_INDICATOR([getpagesize]) -gl_FUNC_GETPASS_GNU -if test $REPLACE_GETPASS = 1; then - AC_LIBOBJ([getpass]) - gl_PREREQ_GETPASS -fi -AC_SUBST([LIBINTL]) -AC_SUBST([LTLIBINTL]) -gl_GETTIME -gl_FUNC_GETTIMEOFDAY -if test $HAVE_GETTIMEOFDAY = 0 || test $REPLACE_GETTIMEOFDAY = 1; then - AC_LIBOBJ([gettimeofday]) - gl_PREREQ_GETTIMEOFDAY -fi -gl_SYS_TIME_MODULE_INDICATOR([gettimeofday]) -gl_GETUGROUPS -gl_FUNC_GETUSERSHELL -if test $HAVE_GETUSERSHELL = 0; then - AC_LIBOBJ([getusershell]) -fi -gl_UNISTD_MODULE_INDICATOR([getusershell]) -gl_GNU_MAKE -# Autoconf 2.61a.99 and earlier don't support linking a file only -# in VPATH builds. But since GNUmakefile is for maintainer use -# only, it does not matter if we skip the link with older autoconf. -# Automake 1.10.1 and earlier try to remove GNUmakefile in non-VPATH -# builds, so use a shell variable to bypass this. -GNUmakefile=GNUmakefile -m4_if(m4_version_compare([2.61a.100], - m4_defn([m4_PACKAGE_VERSION])), [1], [], - [AC_CONFIG_LINKS([$GNUmakefile:$GNUmakefile], [], - [GNUmakefile=$GNUmakefile])]) -gl_FUNC_GROUP_MEMBER -if test $HAVE_GROUP_MEMBER = 0; then - AC_LIBOBJ([group-member]) - gl_PREREQ_GROUP_MEMBER -fi -gl_UNISTD_MODULE_INDICATOR([group-member]) -gl_HARD_LOCALE -gl_HOST_OS -gl_HOSTENT -gl_HUMAN -gl_I_RING -AM_ICONV -m4_ifdef([gl_ICONV_MODULE_INDICATOR], - [gl_ICONV_MODULE_INDICATOR([iconv])]) -gl_ICONV_H -gl_FUNC_ICONV_OPEN -if test $REPLACE_ICONV_OPEN = 1; then - AC_LIBOBJ([iconv_open]) -fi -if test $REPLACE_ICONV = 1; then - AC_LIBOBJ([iconv]) - AC_LIBOBJ([iconv_close]) -fi -gl_IDCACHE -AC_REQUIRE([AC_C_INLINE]) -gl_FUNC_INET_NTOP -if test $HAVE_INET_NTOP = 0 || test $REPLACE_INET_NTOP = 1; then - AC_LIBOBJ([inet_ntop]) - gl_PREREQ_INET_NTOP -fi -gl_ARPA_INET_MODULE_INDICATOR([inet_ntop]) -gl_INLINE -gl_INTTOSTR -gl_INTTYPES_H -gl_INTTYPES_INCOMPLETE -gl_ISAPIPE -if test $HAVE_ISAPIPE = 0; then - AC_LIBOBJ([isapipe]) - gl_PREREQ_ISAPIPE -fi -gl_FUNC_ISATTY -if test $REPLACE_ISATTY = 1; then - AC_LIBOBJ([isatty]) - gl_PREREQ_ISATTY -fi -gl_UNISTD_MODULE_INDICATOR([isatty]) -gl_FUNC_ISBLANK -if test $HAVE_ISBLANK = 0; then - AC_LIBOBJ([isblank]) -fi -gl_CTYPE_MODULE_INDICATOR([isblank]) -gl_FUNC_ISNAND_NO_LIBM -if test $gl_func_isnand_no_libm != yes; then - AC_LIBOBJ([isnand]) - gl_PREREQ_ISNAND -fi -gl_FUNC_ISNANF_NO_LIBM -if test $gl_func_isnanf_no_libm != yes; then - AC_LIBOBJ([isnanf]) - gl_PREREQ_ISNANF -fi -gl_FUNC_ISNANL_NO_LIBM -if test $gl_func_isnanl_no_libm != yes; then - AC_LIBOBJ([isnanl]) - gl_PREREQ_ISNANL -fi -gl_FUNC_ISWBLANK -if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then - : -else - if test $HAVE_ISWBLANK = 0 || test $REPLACE_ISWBLANK = 1; then - AC_LIBOBJ([iswblank]) - fi -fi -gl_WCTYPE_MODULE_INDICATOR([iswblank]) -gl_LANGINFO_H -AC_REQUIRE([gl_LARGEFILE]) -gl_FUNC_LCHMOD -gl_SYS_STAT_MODULE_INDICATOR([lchmod]) -gl_FUNC_LCHOWN -if test $HAVE_LCHOWN = 0 || test $REPLACE_LCHOWN = 1; then - AC_LIBOBJ([lchown]) -fi -gl_UNISTD_MODULE_INDICATOR([lchown]) -AC_REQUIRE([gl_C99_STRTOLD]) -gl_IGNORE_UNUSED_LIBRARIES -gl_FUNC_LINK -if test $HAVE_LINK = 0 || test $REPLACE_LINK = 1; then - AC_LIBOBJ([link]) -fi -gl_UNISTD_MODULE_INDICATOR([link]) -gl_FUNC_LINK_FOLLOWS_SYMLINK -gl_FUNC_LINKAT -if test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1; then - AC_LIBOBJ([linkat]) -fi -if test $HAVE_LINKAT = 0; then - AC_LIBOBJ([at-func2]) -fi -gl_UNISTD_MODULE_INDICATOR([linkat]) -gl_LOCALCHARSET -LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\"" -AC_SUBST([LOCALCHARSET_TESTS_ENVIRONMENT]) -gl_LOCALE_H -gl_FUNC_LOCALECONV -if test $REPLACE_LOCALECONV = 1; then - AC_LIBOBJ([localeconv]) - gl_PREREQ_LOCALECONV -fi -gl_LOCALE_MODULE_INDICATOR([localeconv]) -gl_LOCK -gl_FUNC_LSEEK -if test $REPLACE_LSEEK = 1; then - AC_LIBOBJ([lseek]) -fi -gl_UNISTD_MODULE_INDICATOR([lseek]) -gl_FUNC_LSTAT -if test $REPLACE_LSTAT = 1; then - AC_LIBOBJ([lstat]) - gl_PREREQ_LSTAT -fi -gl_SYS_STAT_MODULE_INDICATOR([lstat]) -AC_CONFIG_COMMANDS_PRE([m4_ifdef([AH_HEADER], - [AC_SUBST([CONFIG_INCLUDE], m4_defn([AH_HEADER]))])]) -gl_FUNC_MALLOC_GNU -if test $REPLACE_MALLOC = 1; then - AC_LIBOBJ([malloc]) -fi -gl_MODULE_INDICATOR([malloc-gnu]) -gl_FUNC_MALLOC_POSIX -if test $REPLACE_MALLOC = 1; then - AC_LIBOBJ([malloc]) -fi -gl_STDLIB_MODULE_INDICATOR([malloc-posix]) -gl_MALLOCA -gl_MATH_H -gl_MBCHAR -gl_MBITER -gl_FUNC_MBRLEN -if test $HAVE_MBRLEN = 0 || test $REPLACE_MBRLEN = 1; then - AC_LIBOBJ([mbrlen]) - gl_PREREQ_MBRLEN -fi -gl_WCHAR_MODULE_INDICATOR([mbrlen]) -gl_FUNC_MBRTOWC -if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then - AC_LIBOBJ([mbrtowc]) - gl_PREREQ_MBRTOWC -fi -gl_WCHAR_MODULE_INDICATOR([mbrtowc]) -gl_STRING_MODULE_INDICATOR([mbscasecmp]) -gl_FUNC_MBSINIT -if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then - AC_LIBOBJ([mbsinit]) - gl_PREREQ_MBSINIT -fi -gl_WCHAR_MODULE_INDICATOR([mbsinit]) -gl_FUNC_MBSLEN -gl_STRING_MODULE_INDICATOR([mbslen]) -gl_FUNC_MBSRTOWCS -if test $HAVE_MBSRTOWCS = 0 || test $REPLACE_MBSRTOWCS = 1; then - AC_LIBOBJ([mbsrtowcs]) - AC_LIBOBJ([mbsrtowcs-state]) - gl_PREREQ_MBSRTOWCS -fi -gl_WCHAR_MODULE_INDICATOR([mbsrtowcs]) -gl_STRING_MODULE_INDICATOR([mbsstr]) -gl_MBSWIDTH -gl_FUNC_MBTOWC -if test $REPLACE_MBTOWC = 1; then - AC_LIBOBJ([mbtowc]) - gl_PREREQ_MBTOWC -fi -gl_STDLIB_MODULE_INDICATOR([mbtowc]) -gl_MBITER -gl_MEMCASECMP -gl_FUNC_MEMCHR -if test $HAVE_MEMCHR = 0 || test $REPLACE_MEMCHR = 1; then - AC_LIBOBJ([memchr]) - gl_PREREQ_MEMCHR -fi -gl_STRING_MODULE_INDICATOR([memchr]) -gl_MEMCOLL -gl_FUNC_MEMPCPY -if test $HAVE_MEMPCPY = 0; then - AC_LIBOBJ([mempcpy]) - gl_PREREQ_MEMPCPY -fi -gl_STRING_MODULE_INDICATOR([mempcpy]) -gl_FUNC_MEMRCHR -if test $ac_cv_func_memrchr = no; then - AC_LIBOBJ([memrchr]) - gl_PREREQ_MEMRCHR -fi -gl_STRING_MODULE_INDICATOR([memrchr]) -gl_MGETGROUPS -gl_MKANCESDIRS -gl_FUNC_MKDIR -if test $REPLACE_MKDIR = 1; then - AC_LIBOBJ([mkdir]) -fi -gl_MKDIR_PARENTS -gl_FUNC_MKFIFO -if test $HAVE_MKFIFO = 0 || test $REPLACE_MKFIFO = 1; then - AC_LIBOBJ([mkfifo]) -fi -gl_UNISTD_MODULE_INDICATOR([mkfifo]) -gl_FUNC_MKNOD -if test $HAVE_MKNOD = 0 || test $REPLACE_MKNOD = 1; then - AC_LIBOBJ([mknod]) -fi -gl_UNISTD_MODULE_INDICATOR([mknod]) -gl_FUNC_MKSTEMP -if test $HAVE_MKSTEMP = 0 || test $REPLACE_MKSTEMP = 1; then - AC_LIBOBJ([mkstemp]) - gl_PREREQ_MKSTEMP -fi -gl_STDLIB_MODULE_INDICATOR([mkstemp]) -gl_FUNC_MKTIME -if test $REPLACE_MKTIME = 1; then - AC_LIBOBJ([mktime]) - gl_PREREQ_MKTIME -fi -gl_TIME_MODULE_INDICATOR([mktime]) -gl_MODECHANGE -gl_MOUNTLIST -if test $gl_cv_list_mounted_fs = yes; then - AC_LIBOBJ([mountlist]) - gl_PREREQ_MOUNTLIST_EXTRA -fi -gl_MPSORT -gl_MSVC_INVAL -if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then - AC_LIBOBJ([msvc-inval]) -fi -gl_MSVC_NOTHROW -if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then - AC_LIBOBJ([msvc-nothrow]) -fi -gl_MULTIARCH -gl_FUNC_NANOSLEEP -if test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1; then - AC_LIBOBJ([nanosleep]) - gl_PREREQ_NANOSLEEP -fi -gl_TIME_MODULE_INDICATOR([nanosleep]) -gl_HEADER_NETDB -gl_HEADER_NETINET_IN -AC_PROG_MKDIR_P -gl_FUNC_NL_LANGINFO -if test $HAVE_NL_LANGINFO = 0 || test $REPLACE_NL_LANGINFO = 1; then - AC_LIBOBJ([nl_langinfo]) -fi -gl_LANGINFO_MODULE_INDICATOR([nl_langinfo]) -gl_NPROC -AC_FUNC_OBSTACK -dnl Note: AC_FUNC_OBSTACK does AC_LIBSOURCES([obstack.h, obstack.c]). -gl_FUNC_OPEN -if test $REPLACE_OPEN = 1; then - AC_LIBOBJ([open]) - gl_PREREQ_OPEN -fi -gl_FCNTL_MODULE_INDICATOR([open]) -gl_FUNC_OPENAT -if test $HAVE_OPENAT = 0 || test $REPLACE_OPENAT = 1; then - AC_LIBOBJ([openat]) - gl_PREREQ_OPENAT -fi -gl_MODULE_INDICATOR([openat]) dnl for lib/getcwd.c -gl_FCNTL_MODULE_INDICATOR([openat]) -gl_OPENAT_SAFER -gl_MODULE_INDICATOR([openat-safer]) -gl_FUNC_OPENDIR -if test $HAVE_OPENDIR = 0 || test $REPLACE_OPENDIR = 1; then - AC_LIBOBJ([opendir]) -fi -gl_DIRENT_MODULE_INDICATOR([opendir]) -gl_PARSE_DATETIME -gl_PATHMAX -gl_PERL -gl_PHYSMEM -gl_FUNC_PIPE2 -gl_UNISTD_MODULE_INDICATOR([pipe2]) -gl_MODULE_INDICATOR([pipe2-safer]) -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 -gl_FUNC_PRINTF_FREXPL -m4_divert_text([INIT_PREPARE], [gl_printf_safe=yes]) -gl_PRIV_SET -AC_CHECK_DECLS([program_invocation_name], [], [], [#include <errno.h>]) -AC_CHECK_DECLS([program_invocation_short_name], [], [], [#include <errno.h>]) -m4_ifdef([AM_XGETTEXT_OPTION], - [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_FUNC_PUTENV -if test $REPLACE_PUTENV = 1; then - AC_LIBOBJ([putenv]) -fi -gl_STDLIB_MODULE_INDICATOR([putenv]) -gl_QUOTE -gl_QUOTEARG -gl_FUNC_RAISE -if test $HAVE_RAISE = 0 || test $REPLACE_RAISE = 1; then - AC_LIBOBJ([raise]) - 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]) - gl_PREREQ_READ -fi -gl_UNISTD_MODULE_INDICATOR([read]) -gl_PREREQ_READ_FILE -gl_FUNC_READDIR -if test $HAVE_READDIR = 0; then - AC_LIBOBJ([readdir]) -fi -gl_DIRENT_MODULE_INDICATOR([readdir]) -gl_FUNC_READLINK -if test $HAVE_READLINK = 0 || test $REPLACE_READLINK = 1; then - AC_LIBOBJ([readlink]) - gl_PREREQ_READLINK -fi -gl_UNISTD_MODULE_INDICATOR([readlink]) -gl_FUNC_READLINKAT -if test $HAVE_READLINKAT = 0; then - AC_LIBOBJ([readlinkat]) -fi -gl_UNISTD_MODULE_INDICATOR([readlinkat]) -gl_READTOKENS -gl_READUTMP -if test $ac_cv_header_utmp_h = yes || test $ac_cv_header_utmpx_h = yes; then - AC_LIBOBJ([readutmp]) -fi -gl_FUNC_REALLOC_GNU -if test $REPLACE_REALLOC = 1; then - AC_LIBOBJ([realloc]) -fi -gl_MODULE_INDICATOR([realloc-gnu]) -gl_FUNC_REALLOC_POSIX -if test $REPLACE_REALLOC = 1; then - AC_LIBOBJ([realloc]) -fi -gl_STDLIB_MODULE_INDICATOR([realloc-posix]) -gl_REGEX -if test $ac_use_included_regex = yes; then - AC_LIBOBJ([regex]) - gl_PREREQ_REGEX -fi -gl_FUNC_REMOVE -if test $REPLACE_REMOVE = 1; then - AC_LIBOBJ([remove]) -fi -gl_STDIO_MODULE_INDICATOR([remove]) -gl_FUNC_RENAME -if test $REPLACE_RENAME = 1; then - AC_LIBOBJ([rename]) -fi -gl_STDIO_MODULE_INDICATOR([rename]) -gl_FUNC_REWINDDIR -if test $HAVE_REWINDDIR = 0; then - AC_LIBOBJ([rewinddir]) -fi -gl_DIRENT_MODULE_INDICATOR([rewinddir]) -gl_FUNC_RMDIR -if test $REPLACE_RMDIR = 1; then - AC_LIBOBJ([rmdir]) -fi -gl_UNISTD_MODULE_INDICATOR([rmdir]) -gl_ROOT_DEV_INO -gl_FUNC_RPMATCH -if test $HAVE_RPMATCH = 0; then - AC_LIBOBJ([rpmatch]) - gl_PREREQ_RPMATCH -fi -gl_STDLIB_MODULE_INDICATOR([rpmatch]) -gl_PREREQ_SAFE_READ -gl_PREREQ_SAFE_WRITE -gl_SAME -gl_SAVE_CWD -gl_SAVEDIR -gl_SAVEWD -gl_SCHED_H -gl_FUNC_SELECT -if test $REPLACE_SELECT = 1; then - AC_LIBOBJ([select]) -fi -gl_SYS_SELECT_MODULE_INDICATOR([select]) -AC_CHECK_HEADERS([selinux/flask.h]) -AC_LIBOBJ([selinux-at]) -gl_HEADERS_SELINUX_SELINUX_H -gl_HEADERS_SELINUX_CONTEXT_H -AC_REQUIRE([AC_C_INLINE]) -if test "$with_selinux" != no && test "$ac_cv_header_selinux_selinux_h" = yes; then - AC_LIBOBJ([getfilecon]) -fi -gl_SERVENT -gl_FUNC_SETENV -if test $HAVE_SETENV = 0 || test $REPLACE_SETENV = 1; then - AC_LIBOBJ([setenv]) -fi -gl_STDLIB_MODULE_INDICATOR([setenv]) -gl_SETTIME -gl_FUNC_SIG2STR -if test $ac_cv_func_sig2str = no; then - AC_LIBOBJ([sig2str]) - gl_PREREQ_SIG2STR -fi -gl_SIGACTION -if test $HAVE_SIGACTION = 0; then - AC_LIBOBJ([sigaction]) - gl_PREREQ_SIGACTION -fi -gl_SIGNAL_MODULE_INDICATOR([sigaction]) -gl_SIGNAL_H -gl_SIGNBIT -if test $REPLACE_SIGNBIT = 1; then - AC_LIBOBJ([signbitf]) - AC_LIBOBJ([signbitd]) - AC_LIBOBJ([signbitl]) -fi -gl_MATH_MODULE_INDICATOR([signbit]) -gl_SIGNALBLOCKING -if test $HAVE_POSIX_SIGNALBLOCKING = 0; then - AC_LIBOBJ([sigprocmask]) - gl_PREREQ_SIGPROCMASK -fi -gl_SIGNAL_MODULE_INDICATOR([sigprocmask]) -gl_SIZE_MAX -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 - AC_LIBOBJ([stat]) - gl_PREREQ_STAT -fi -gl_SYS_STAT_MODULE_INDICATOR([stat]) -gl_STAT_SIZE -gl_STAT_TIME -gl_STAT_BIRTHTIME -gl_STDALIGN_H -gl_STDARG_H -AM_STDBOOL_H -gl_STDDEF_H -gl_STDINT_H -gl_STDIO_H -gl_STDLIB_H -gl_FUNC_STPCPY -if test $HAVE_STPCPY = 0; then - AC_LIBOBJ([stpcpy]) - gl_PREREQ_STPCPY -fi -gl_STRING_MODULE_INDICATOR([stpcpy]) -gl_FUNC_STPNCPY -if test $HAVE_STPNCPY = 0 || test $REPLACE_STPNCPY = 1; then - AC_LIBOBJ([stpncpy]) - gl_PREREQ_STPNCPY -fi -gl_STRING_MODULE_INDICATOR([stpncpy]) -gl_STRCASE -if test $HAVE_STRCASECMP = 0; then - AC_LIBOBJ([strcasecmp]) - gl_PREREQ_STRCASECMP -fi -if test $HAVE_STRNCASECMP = 0; then - AC_LIBOBJ([strncasecmp]) - gl_PREREQ_STRNCASECMP -fi -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]) - gl_PREREQ_STRDUP -fi -gl_STRING_MODULE_INDICATOR([strdup]) -gl_FUNC_STRERROR -if test $REPLACE_STRERROR = 1; then - AC_LIBOBJ([strerror]) -fi -gl_MODULE_INDICATOR([strerror]) -gl_STRING_MODULE_INDICATOR([strerror]) -AC_REQUIRE([gl_HEADER_ERRNO_H]) -AC_REQUIRE([gl_FUNC_STRERROR_0]) -if test -n "$ERRNO_H" || test $REPLACE_STRERROR_0 = 1; then - AC_LIBOBJ([strerror-override]) - gl_PREREQ_SYS_H_WINSOCK2 -fi -gl_FUNC_GNU_STRFTIME -if test $gl_cond_libtool = false; then - gl_ltlibdeps="$gl_ltlibdeps $LTLIBICONV" - gl_libdeps="$gl_libdeps $LIBICONV" -fi -gl_HEADER_STRING_H -gl_HEADER_STRINGS_H -gl_FUNC_STRNCAT -if test $REPLACE_STRNCAT = 1; then - AC_LIBOBJ([strncat]) - gl_PREREQ_STRNCAT -fi -gl_STRING_MODULE_INDICATOR([strncat]) -gl_FUNC_STRNDUP -if test $HAVE_STRNDUP = 0 || test $REPLACE_STRNDUP = 1; then - AC_LIBOBJ([strndup]) -fi -gl_STRING_MODULE_INDICATOR([strndup]) -gl_FUNC_STRNLEN -if test $HAVE_DECL_STRNLEN = 0 || test $REPLACE_STRNLEN = 1; then - AC_LIBOBJ([strnlen]) - gl_PREREQ_STRNLEN -fi -gl_STRING_MODULE_INDICATOR([strnlen]) -gl_FUNC_STRPBRK -if test $HAVE_STRPBRK = 0; then - AC_LIBOBJ([strpbrk]) - gl_PREREQ_STRPBRK -fi -gl_STRING_MODULE_INDICATOR([strpbrk]) -gl_FUNC_STRSIGNAL -if test $HAVE_STRSIGNAL = 0 || test $REPLACE_STRSIGNAL = 1; then - AC_LIBOBJ([strsignal]) - gl_PREREQ_STRSIGNAL -fi -gl_STRING_MODULE_INDICATOR([strsignal]) -gl_FUNC_STRSTR_SIMPLE -if test $REPLACE_STRSTR = 1; then - AC_LIBOBJ([strstr]) -fi -gl_STRING_MODULE_INDICATOR([strstr]) -gl_FUNC_STRTOD -if test $HAVE_STRTOD = 0 || test $REPLACE_STRTOD = 1; then - AC_LIBOBJ([strtod]) - gl_PREREQ_STRTOD -fi -gl_STDLIB_MODULE_INDICATOR([strtod]) -gl_FUNC_STRTOIMAX -if test $HAVE_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1; then - AC_LIBOBJ([strtoimax]) - gl_PREREQ_STRTOIMAX -fi -gl_INTTYPES_MODULE_INDICATOR([strtoimax]) -gl_FUNC_STRTOLL -if test $HAVE_STRTOLL = 0; then - AC_LIBOBJ([strtoll]) - gl_PREREQ_STRTOLL -fi -gl_STDLIB_MODULE_INDICATOR([strtoll]) -gl_FUNC_STRTOULL -if test $HAVE_STRTOULL = 0; then - AC_LIBOBJ([strtoull]) - gl_PREREQ_STRTOULL -fi -gl_STDLIB_MODULE_INDICATOR([strtoull]) -gl_FUNC_STRTOUMAX -if test $ac_cv_func_strtoumax = no; then - AC_LIBOBJ([strtoumax]) - gl_PREREQ_STRTOUMAX -fi -gl_INTTYPES_MODULE_INDICATOR([strtoumax]) -gl_FUNC_SYMLINK -if test $HAVE_SYMLINK = 0 || test $REPLACE_SYMLINK = 1; then - AC_LIBOBJ([symlink]) -fi -gl_UNISTD_MODULE_INDICATOR([symlink]) -gl_SYS_IOCTL_H -AC_PROG_MKDIR_P -gl_HEADER_SYS_RESOURCE -AC_PROG_MKDIR_P -gl_HEADER_SYS_SELECT -AC_PROG_MKDIR_P -gl_HEADER_SYS_SOCKET -AC_PROG_MKDIR_P -gl_HEADER_SYS_STAT_H -AC_PROG_MKDIR_P -gl_HEADER_SYS_TIME_H -AC_PROG_MKDIR_P -gl_SYS_TYPES_H -AC_PROG_MKDIR_P -gl_HEADER_SYS_UIO -AC_PROG_MKDIR_P -gl_SYS_UTSNAME_H -AC_PROG_MKDIR_P -gl_SYS_WAIT_H -AC_PROG_MKDIR_P -gl_FUNC_GEN_TEMPNAME -gl_TERMIOS_H -gl_THREADLIB -gl_HEADER_TIME_H -gl_TIME_R -if test $HAVE_LOCALTIME_R = 0 || test $REPLACE_LOCALTIME_R = 1; then - AC_LIBOBJ([time_r]) - gl_PREREQ_TIME_R -fi -gl_TIME_MODULE_INDICATOR([time_r]) -gl_TIMER_TIME -gl_TIMESPEC -gl_TLS -gl_FUNC_TZSET -AC_REQUIRE([AC_C_INLINE]) -gl_FUNC_UNAME -if test $HAVE_UNAME = 0; then - AC_LIBOBJ([uname]) - gl_PREREQ_UNAME -fi -gl_SYS_UTSNAME_MODULE_INDICATOR([uname]) -gl_UNICODEIO -gl_UNISTD_H -gl_UNISTD_SAFER -gl_LIBUNISTRING_LIBHEADER([0.9.2], [unistr.h]) -gl_MODULE_INDICATOR([unistr/u8-mbtoucr]) -gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-mbtoucr]) -gl_MODULE_INDICATOR([unistr/u8-uctomb]) -gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-uctomb]) -gl_LIBUNISTRING_LIBHEADER([0.9], [unitypes.h]) -gl_LIBUNISTRING_LIBHEADER([0.9], [uniwidth.h]) -gl_LIBUNISTRING_MODULE([0.9.4], [uniwidth/width]) -gl_FUNC_UNLINK -if test $REPLACE_UNLINK = 1; then - AC_LIBOBJ([unlink]) -fi -gl_UNISTD_MODULE_INDICATOR([unlink]) -gl_FUNC_UNLINK_BUSY_TEXT -gl_FUNC_UNLINKAT -if test $HAVE_UNLINKAT = 0 || test $REPLACE_UNLINKAT = 1; then - AC_LIBOBJ([unlinkat]) -fi -gl_UNISTD_MODULE_INDICATOR([unlinkat]) -gl_FUNC_GLIBC_UNLOCKED_IO -gl_FUNC_UNSETENV -if test $HAVE_UNSETENV = 0 || test $REPLACE_UNSETENV = 1; then - AC_LIBOBJ([unsetenv]) - gl_PREREQ_UNSETENV -fi -gl_STDLIB_MODULE_INDICATOR([unsetenv]) -gl_SYS_PROC_UPTIME -gl_USERSPEC -gl_UTIMECMP -gl_UTIMENS -gl_FUNC_UTIMENSAT -if test $HAVE_UTIMENSAT = 0 || test $REPLACE_UTIMENSAT = 1; then - AC_LIBOBJ([utimensat]) -fi -gl_SYS_STAT_MODULE_INDICATOR([utimensat]) -gl_FUNC_VASNPRINTF -gl_FUNC_VASPRINTF -gl_STDIO_MODULE_INDICATOR([vasprintf]) -m4_ifdef([AM_XGETTEXT_OPTION], - [AM_][XGETTEXT_OPTION([--flag=asprintf:2:c-format]) - AM_][XGETTEXT_OPTION([--flag=vasprintf:2:c-format])]) -gl_FUNC_VASPRINTF_POSIX -m4_ifdef([AM_XGETTEXT_OPTION], - [AM_][XGETTEXT_OPTION([--flag=verror:3:c-format]) - AM_][XGETTEXT_OPTION([--flag=verror_at_line:5:c-format])]) -gl_VERSION_ETC -gl_FUNC_VFPRINTF_POSIX -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]) -AC_SUBST([WARN_CFLAGS]) -gl_WCHAR_H -gl_FUNC_WCRTOMB -if test $HAVE_WCRTOMB = 0 || test $REPLACE_WCRTOMB = 1; then - AC_LIBOBJ([wcrtomb]) - gl_PREREQ_WCRTOMB -fi -gl_WCHAR_MODULE_INDICATOR([wcrtomb]) -gl_FUNC_WCSWIDTH -if test $HAVE_WCSWIDTH = 0 || test $REPLACE_WCSWIDTH = 1; then - AC_LIBOBJ([wcswidth]) -fi -gl_WCHAR_MODULE_INDICATOR([wcswidth]) -gl_WCTYPE_H -gl_FUNC_WCWIDTH -if test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1; then - AC_LIBOBJ([wcwidth]) -fi -gl_WCHAR_MODULE_INDICATOR([wcwidth]) -gl_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL -gl_HEADER_TIOCGWINSZ_IN_TERMIOS_H -gl_WINSIZE_IN_PTEM -gl_FUNC_WRITE -if test $REPLACE_WRITE = 1; then - AC_LIBOBJ([write]) - gl_PREREQ_WRITE -fi -gl_UNISTD_MODULE_INDICATOR([write]) -gl_WRITE_ANY_FILE -gl_XALLOC -gl_XGETCWD -gl_MODULE_INDICATOR([xgetgroups]) -gl_XNANOSLEEP -m4_ifdef([AM_XGETTEXT_OPTION], - [AM_][XGETTEXT_OPTION([--flag=xprintf:1:c-format]) - AM_][XGETTEXT_OPTION([--flag=xvprintf:1:c-format]) - AM_][XGETTEXT_OPTION([--flag=xfprintf:2:c-format]) - AM_][XGETTEXT_OPTION([--flag=xvfprintf:2:c-format])]) -gl_XSIZE -gl_XSTRNDUP -gl_XSTRTOD -gl_XSTRTOL -gl_XSTRTOLD -gl_XVASPRINTF -m4_ifdef([AM_XGETTEXT_OPTION], - [AM_][XGETTEXT_OPTION([--flag=xasprintf:1:c-format])]) -gl_YESNO + gl_FUNC_ACL + gl_FUNC_ALLOCA + gl_MODULE_INDICATOR([areadlinkat]) + gl_HEADER_ARPA_INET + AC_PROG_MKDIR_P + gl_ASSERT + AC_LIBOBJ([openat-proc]) + gl_BACKUPFILE + gl_FUNC_BASE64 + gl_FUNC_BTOWC + if test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1; then + AC_LIBOBJ([btowc]) + gl_PREREQ_BTOWC + fi + gl_WCHAR_MODULE_INDICATOR([btowc]) + gl_C_STRTOD + gl_C_STRTOLD + gl_FUNC_CALLOC_GNU + if test $REPLACE_CALLOC = 1; then + AC_LIBOBJ([calloc]) + fi + gl_MODULE_INDICATOR([calloc-gnu]) + gl_FUNC_CALLOC_POSIX + if test $REPLACE_CALLOC = 1; then + AC_LIBOBJ([calloc]) + fi + gl_STDLIB_MODULE_INDICATOR([calloc-posix]) + gl_PREREQ_CANON_HOST + gl_FUNC_CANONICALIZE_FILENAME_MODE + gl_MODULE_INDICATOR([canonicalize]) + gl_MODULE_INDICATOR_FOR_TESTS([canonicalize]) + gl_STDLIB_MODULE_INDICATOR([canonicalize_file_name]) + AC_CHECK_FUNCS_ONCE([readlinkat]) + gl_UNISTD_MODULE_INDICATOR([chdir]) + gl_FUNC_CHDIR_LONG + if test $gl_cv_have_arbitrary_file_name_length_limit = yes; then + AC_LIBOBJ([chdir-long]) + gl_PREREQ_CHDIR_LONG + fi + gl_FUNC_CHOWN + if test $HAVE_CHOWN = 0 || test $REPLACE_CHOWN = 1; then + AC_LIBOBJ([chown]) + fi + if test $REPLACE_CHOWN = 1 && test $ac_cv_func_fchown = no; then + AC_LIBOBJ([fchown-stub]) + fi + gl_UNISTD_MODULE_INDICATOR([chown]) + gl_CLOCK_TIME + gl_MODULE_INDICATOR_FOR_TESTS([cloexec]) + gl_FUNC_CLOSE + if test $REPLACE_CLOSE = 1; then + AC_LIBOBJ([close]) + fi + gl_UNISTD_MODULE_INDICATOR([close]) + gl_CLOSE_STREAM + gl_MODULE_INDICATOR([close-stream]) + gl_FUNC_CLOSEDIR + if test $HAVE_CLOSEDIR = 0 || test $REPLACE_CLOSEDIR = 1; then + AC_LIBOBJ([closedir]) + fi + gl_DIRENT_MODULE_INDICATOR([closedir]) + gl_CLOSEIN + gl_CLOSEOUT + gl_CONFIG_H + gl_CONFIGMAKE_PREP + gl_MD5 + gl_SHA1 + gl_SHA256 + gl_SHA512 + gl_CTYPE_H + gl_CYCLE_CHECK + gl_CHECK_TYPE_STRUCT_DIRENT_D_INO + gl_CHECK_TYPE_STRUCT_DIRENT_D_TYPE + gl_DIRENT_H + gl_DIRENT_SAFER + gl_MODULE_INDICATOR([dirent-safer]) + gl_FUNC_DIRFD + if test $ac_cv_func_dirfd = no && test $gl_cv_func_dirfd_macro = no; then + AC_LIBOBJ([dirfd]) + gl_PREREQ_DIRFD + fi + gl_DIRENT_MODULE_INDICATOR([dirfd]) + gl_DIRNAME + gl_MODULE_INDICATOR([dirname]) + gl_DIRNAME_LGPL + gl_DOUBLE_SLASH_ROOT + AC_REQUIRE([gl_C99_STRTOLD]) + gl_FUNC_DUP + if test $REPLACE_DUP = 1; then + AC_LIBOBJ([dup]) + gl_PREREQ_DUP + fi + gl_UNISTD_MODULE_INDICATOR([dup]) + gl_FUNC_DUP2 + if test $HAVE_DUP2 = 0 || test $REPLACE_DUP2 = 1; then + AC_LIBOBJ([dup2]) + gl_PREREQ_DUP2 + fi + gl_UNISTD_MODULE_INDICATOR([dup2]) + gl_ENVIRON + gl_UNISTD_MODULE_INDICATOR([environ]) + gl_HEADER_ERRNO_H + gl_ERROR + if test $ac_cv_lib_error_at_line = no; then + AC_LIBOBJ([error]) + gl_PREREQ_ERROR + fi + m4_ifdef([AM_XGETTEXT_OPTION], + [AM_][XGETTEXT_OPTION([--flag=error:3:c-format]) + AM_][XGETTEXT_OPTION([--flag=error_at_line:5:c-format])]) + gl_FUNC_EUIDACCESS + if test $HAVE_EUIDACCESS = 0; then + AC_LIBOBJ([euidaccess]) + gl_PREREQ_EUIDACCESS + fi + gl_UNISTD_MODULE_INDICATOR([euidaccess]) + AC_REQUIRE([gl_EXTERN_INLINE]) + gl_FUNC_FACCESSAT + if test $HAVE_FACCESSAT = 0; then + AC_LIBOBJ([faccessat]) + gl_PREREQ_FACCESSAT + fi + 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 + if test $HAVE_FCHMODAT = 0; then + AC_LIBOBJ([fchmodat]) + fi + gl_MODULE_INDICATOR([fchmodat]) dnl for lib/openat.h + gl_SYS_STAT_MODULE_INDICATOR([fchmodat]) + gl_FUNC_FCHOWNAT + if test $HAVE_FCHOWNAT = 0 || test $REPLACE_FCHOWNAT = 1; then + AC_LIBOBJ([fchownat]) + fi + gl_MODULE_INDICATOR([fchownat]) dnl for lib/openat.h + gl_UNISTD_MODULE_INDICATOR([fchownat]) + gl_FUNC_FCLOSE + if test $REPLACE_FCLOSE = 1; then + AC_LIBOBJ([fclose]) + fi + gl_STDIO_MODULE_INDICATOR([fclose]) + gl_FUNC_FCNTL + if test $HAVE_FCNTL = 0 || test $REPLACE_FCNTL = 1; then + AC_LIBOBJ([fcntl]) + fi + gl_FCNTL_MODULE_INDICATOR([fcntl]) + gl_FCNTL_H + gl_FCNTL_SAFER + gl_MODULE_INDICATOR([fcntl-safer]) + gl_MODULE_INDICATOR([fd-safer-flag]) + gl_FUNC_FDATASYNC + if test $HAVE_FDATASYNC = 0; then + AC_LIBOBJ([fdatasync]) + fi + gl_UNISTD_MODULE_INDICATOR([fdatasync]) + gl_FUNC_FDOPEN + if test $REPLACE_FDOPEN = 1; then + AC_LIBOBJ([fdopen]) + gl_PREREQ_FDOPEN + fi + gl_STDIO_MODULE_INDICATOR([fdopen]) + gl_FUNC_FDOPENDIR + if test $HAVE_FDOPENDIR = 0 || test $REPLACE_FDOPENDIR = 1; then + AC_LIBOBJ([fdopendir]) + fi + gl_DIRENT_MODULE_INDICATOR([fdopendir]) + gl_MODULE_INDICATOR([fdopendir]) + gl_MODULE_INDICATOR([fdutimensat]) + gl_FUNC_FFLUSH + if test $REPLACE_FFLUSH = 1; then + AC_LIBOBJ([fflush]) + gl_PREREQ_FFLUSH + fi + gl_MODULE_INDICATOR([fflush]) + gl_STDIO_MODULE_INDICATOR([fflush]) + gl_FILEBLOCKS + if test $ac_cv_member_struct_stat_st_blocks = no; then + AC_LIBOBJ([fileblocks]) + gl_PREREQ_FILEBLOCKS + fi + gl_FILEMODE + gl_FILE_NAME_CONCAT + gl_MODULE_INDICATOR([filenamecat]) + gl_FILE_NAME_CONCAT_LGPL + AC_C_FLEXIBLE_ARRAY_MEMBER + gl_FLOAT_H + if test $REPLACE_FLOAT_LDBL = 1; then + AC_LIBOBJ([float]) + fi + if test $REPLACE_ITOLD = 1; then + AC_LIBOBJ([itold]) + fi + gl_FUNC_FNMATCH_POSIX + if test -n "$FNMATCH_H"; then + AC_LIBOBJ([fnmatch]) + gl_PREREQ_FNMATCH + fi + gl_FUNC_FNMATCH_GNU + if test -n "$FNMATCH_H"; then + AC_LIBOBJ([fnmatch]) + gl_PREREQ_FNMATCH + fi + gl_FUNC_FOPEN + if test $REPLACE_FOPEN = 1; then + AC_LIBOBJ([fopen]) + gl_PREREQ_FOPEN + fi + gl_STDIO_MODULE_INDICATOR([fopen]) + gl_MODULE_INDICATOR([fopen-safer]) + gl_FUNC_FPENDING + if test $ac_cv_func___fpending = no; then + AC_LIBOBJ([fpending]) + gl_PREREQ_FPENDING + fi + gl_FUNC_FPURGE + if test $HAVE_FPURGE = 0 || test $REPLACE_FPURGE = 1; then + AC_LIBOBJ([fpurge]) + fi + gl_STDIO_MODULE_INDICATOR([fpurge]) + gl_FUNC_FREADAHEAD + if test $ac_cv_func___freadahead = no; then + AC_LIBOBJ([freadahead]) + fi + gl_FUNC_FREADING + gl_FUNC_FREADPTR + if test $ac_cv_func___freadptr = no; then + AC_LIBOBJ([freadptr]) + fi + gl_FUNC_FREADSEEK + gl_FUNC_FREOPEN + if test $REPLACE_FREOPEN = 1; then + AC_LIBOBJ([freopen]) + gl_PREREQ_FREOPEN + fi + gl_STDIO_MODULE_INDICATOR([freopen]) + gl_MODULE_INDICATOR([freopen-safer]) + gl_FUNC_FREXP_NO_LIBM + if test $gl_func_frexp_no_libm != yes; then + AC_LIBOBJ([frexp]) + fi + gl_MATH_MODULE_INDICATOR([frexp]) + gl_FUNC_FREXPL_NO_LIBM + if test $HAVE_DECL_FREXPL = 0 || test $gl_func_frexpl_no_libm = no; then + AC_LIBOBJ([frexpl]) + fi + gl_MATH_MODULE_INDICATOR([frexpl]) + gl_FUNC_FSEEK + if test $REPLACE_FSEEK = 1; then + AC_LIBOBJ([fseek]) + fi + gl_STDIO_MODULE_INDICATOR([fseek]) + gl_FUNC_FSEEKO + if test $HAVE_FSEEKO = 0 || test $REPLACE_FSEEKO = 1; then + AC_LIBOBJ([fseeko]) + gl_PREREQ_FSEEKO + fi + gl_STDIO_MODULE_INDICATOR([fseeko]) + gl_FUNC_FSETERR + if test $ac_cv_func___fseterr = no; then + AC_LIBOBJ([fseterr]) + fi + gl_FUNC_FSTAT + if test $REPLACE_FSTAT = 1; then + AC_LIBOBJ([fstat]) + gl_PREREQ_FSTAT + fi + gl_SYS_STAT_MODULE_INDICATOR([fstat]) + gl_FUNC_FSTATAT + if test $HAVE_FSTATAT = 0 || test $REPLACE_FSTATAT = 1; then + AC_LIBOBJ([fstatat]) + fi + gl_SYS_STAT_MODULE_INDICATOR([fstatat]) + gl_FSUSAGE + if test $gl_cv_fs_space = yes; then + AC_LIBOBJ([fsusage]) + gl_PREREQ_FSUSAGE_EXTRA + fi + gl_FUNC_FSYNC + if test $HAVE_FSYNC = 0; then + AC_LIBOBJ([fsync]) + gl_PREREQ_FSYNC + fi + gl_UNISTD_MODULE_INDICATOR([fsync]) + gl_FUNC_FTELL + if test $REPLACE_FTELL = 1; then + AC_LIBOBJ([ftell]) + fi + gl_STDIO_MODULE_INDICATOR([ftell]) + gl_FUNC_FTELLO + if test $HAVE_FTELLO = 0 || test $REPLACE_FTELLO = 1; then + AC_LIBOBJ([ftello]) + gl_PREREQ_FTELLO + fi + gl_STDIO_MODULE_INDICATOR([ftello]) + AC_CHECK_FUNCS_ONCE([strtof]) + AC_REQUIRE([gl_C99_STRTOLD]) + gl_FUNC_FTRUNCATE + if test $HAVE_FTRUNCATE = 0 || test $REPLACE_FTRUNCATE = 1; then + AC_LIBOBJ([ftruncate]) + gl_PREREQ_FTRUNCATE + fi + gl_UNISTD_MODULE_INDICATOR([ftruncate]) + gl_FUNC_FTS + dnl Use this version of fts unconditionally, since the GNU libc and + dnl NetBSD versions have bugs and/or unnecessary limitations. + AC_LIBOBJ([fts]) + gl_FUNC_FUTIMENS + if test $HAVE_FUTIMENS = 0 || test $REPLACE_FUTIMENS = 1; then + AC_LIBOBJ([futimens]) + fi + gl_SYS_STAT_MODULE_INDICATOR([futimens]) + gl_GETADDRINFO + if test $HAVE_GETADDRINFO = 0; then + AC_LIBOBJ([getaddrinfo]) + fi + if test $HAVE_DECL_GAI_STRERROR = 0 || test $REPLACE_GAI_STRERROR = 1; then + AC_LIBOBJ([gai_strerror]) + fi + gl_NETDB_MODULE_INDICATOR([getaddrinfo]) + gl_FUNC_GETCWD + if test $REPLACE_GETCWD = 1; then + AC_LIBOBJ([getcwd]) + gl_PREREQ_GETCWD + fi + gl_MODULE_INDICATOR([getcwd]) + gl_UNISTD_MODULE_INDICATOR([getcwd]) + gl_FUNC_GETCWD_LGPL + if test $REPLACE_GETCWD = 1; then + AC_LIBOBJ([getcwd-lgpl]) + fi + gl_UNISTD_MODULE_INDICATOR([getcwd]) + gl_FUNC_GETDELIM + if test $HAVE_GETDELIM = 0 || test $REPLACE_GETDELIM = 1; then + AC_LIBOBJ([getdelim]) + gl_PREREQ_GETDELIM + fi + gl_STDIO_MODULE_INDICATOR([getdelim]) + gl_FUNC_GETDTABLESIZE + if test $HAVE_GETDTABLESIZE = 0; then + AC_LIBOBJ([getdtablesize]) + gl_PREREQ_GETDTABLESIZE + fi + gl_UNISTD_MODULE_INDICATOR([getdtablesize]) + gl_FUNC_GETGROUPS + if test $HAVE_GETGROUPS = 0 || test $REPLACE_GETGROUPS = 1; then + AC_LIBOBJ([getgroups]) + fi + gl_UNISTD_MODULE_INDICATOR([getgroups]) + gl_FUNC_GETHOSTNAME + if test $HAVE_GETHOSTNAME = 0; then + AC_LIBOBJ([gethostname]) + gl_PREREQ_GETHOSTNAME + fi + gl_UNISTD_MODULE_INDICATOR([gethostname]) + gl_GETHRXTIME + gl_FUNC_GETLINE + if test $REPLACE_GETLINE = 1; then + AC_LIBOBJ([getline]) + gl_PREREQ_GETLINE + fi + gl_STDIO_MODULE_INDICATOR([getline]) + gl_GETLOADAVG + if test $HAVE_GETLOADAVG = 0; then + AC_LIBOBJ([getloadavg]) + gl_PREREQ_GETLOADAVG + fi + gl_STDLIB_MODULE_INDICATOR([getloadavg]) + gl_FUNC_GETLOGIN + if test $HAVE_GETLOGIN = 0; then + AC_LIBOBJ([getlogin]) + fi + gl_UNISTD_MODULE_INDICATOR([getlogin]) + gl_GETNDELIM2 + gl_FUNC_GETOPT_GNU + if test $REPLACE_GETOPT = 1; then + AC_LIBOBJ([getopt]) + AC_LIBOBJ([getopt1]) + gl_PREREQ_GETOPT + dnl Arrange for unistd.h to include getopt.h. + GNULIB_GL_UNISTD_H_GETOPT=1 + fi + AC_SUBST([GNULIB_GL_UNISTD_H_GETOPT]) + gl_MODULE_INDICATOR_FOR_TESTS([getopt-gnu]) + gl_FUNC_GETOPT_POSIX + if test $REPLACE_GETOPT = 1; then + AC_LIBOBJ([getopt]) + AC_LIBOBJ([getopt1]) + gl_PREREQ_GETOPT + dnl Arrange for unistd.h to include getopt.h. + GNULIB_GL_UNISTD_H_GETOPT=1 + fi + AC_SUBST([GNULIB_GL_UNISTD_H_GETOPT]) + gl_FUNC_GETPAGESIZE + if test $REPLACE_GETPAGESIZE = 1; then + AC_LIBOBJ([getpagesize]) + fi + gl_UNISTD_MODULE_INDICATOR([getpagesize]) + gl_FUNC_GETPASS_GNU + if test $REPLACE_GETPASS = 1; then + AC_LIBOBJ([getpass]) + gl_PREREQ_GETPASS + fi + AC_SUBST([LIBINTL]) + AC_SUBST([LTLIBINTL]) + gl_GETTIME + gl_FUNC_GETTIMEOFDAY + if test $HAVE_GETTIMEOFDAY = 0 || test $REPLACE_GETTIMEOFDAY = 1; then + AC_LIBOBJ([gettimeofday]) + gl_PREREQ_GETTIMEOFDAY + fi + gl_SYS_TIME_MODULE_INDICATOR([gettimeofday]) + gl_GETUGROUPS + gl_FUNC_GETUSERSHELL + if test $HAVE_GETUSERSHELL = 0; then + AC_LIBOBJ([getusershell]) + fi + gl_UNISTD_MODULE_INDICATOR([getusershell]) + gl_GNU_MAKE + # Autoconf 2.61a.99 and earlier don't support linking a file only + # in VPATH builds. But since GNUmakefile is for maintainer use + # only, it does not matter if we skip the link with older autoconf. + # Automake 1.10.1 and earlier try to remove GNUmakefile in non-VPATH + # builds, so use a shell variable to bypass this. + GNUmakefile=GNUmakefile + m4_if(m4_version_compare([2.61a.100], + m4_defn([m4_PACKAGE_VERSION])), [1], [], + [AC_CONFIG_LINKS([$GNUmakefile:$GNUmakefile], [], + [GNUmakefile=$GNUmakefile])]) + gl_FUNC_GROUP_MEMBER + if test $HAVE_GROUP_MEMBER = 0; then + AC_LIBOBJ([group-member]) + gl_PREREQ_GROUP_MEMBER + fi + gl_UNISTD_MODULE_INDICATOR([group-member]) + gl_HARD_LOCALE + gl_HOST_OS + gl_HOSTENT + gl_HUMAN + gl_I_RING + AM_ICONV + m4_ifdef([gl_ICONV_MODULE_INDICATOR], + [gl_ICONV_MODULE_INDICATOR([iconv])]) + gl_ICONV_H + gl_FUNC_ICONV_OPEN + if test $REPLACE_ICONV_OPEN = 1; then + AC_LIBOBJ([iconv_open]) + fi + if test $REPLACE_ICONV = 1; then + AC_LIBOBJ([iconv]) + AC_LIBOBJ([iconv_close]) + fi + gl_IDCACHE + gl_FUNC_INET_NTOP + if test $HAVE_INET_NTOP = 0 || test $REPLACE_INET_NTOP = 1; then + AC_LIBOBJ([inet_ntop]) + gl_PREREQ_INET_NTOP + fi + gl_ARPA_INET_MODULE_INDICATOR([inet_ntop]) + gl_INLINE + gl_INTTOSTR + gl_INTTYPES_H + gl_INTTYPES_INCOMPLETE + gl_ISAPIPE + if test $HAVE_ISAPIPE = 0; then + AC_LIBOBJ([isapipe]) + gl_PREREQ_ISAPIPE + fi + gl_FUNC_ISATTY + if test $REPLACE_ISATTY = 1; then + AC_LIBOBJ([isatty]) + gl_PREREQ_ISATTY + fi + gl_UNISTD_MODULE_INDICATOR([isatty]) + gl_FUNC_ISBLANK + if test $HAVE_ISBLANK = 0; then + AC_LIBOBJ([isblank]) + fi + gl_CTYPE_MODULE_INDICATOR([isblank]) + gl_FUNC_ISNAND_NO_LIBM + if test $gl_func_isnand_no_libm != yes; then + AC_LIBOBJ([isnand]) + gl_PREREQ_ISNAND + fi + gl_FUNC_ISNANF_NO_LIBM + if test $gl_func_isnanf_no_libm != yes; then + AC_LIBOBJ([isnanf]) + gl_PREREQ_ISNANF + fi + gl_FUNC_ISNANL_NO_LIBM + if test $gl_func_isnanl_no_libm != yes; then + AC_LIBOBJ([isnanl]) + gl_PREREQ_ISNANL + fi + gl_FUNC_ISWBLANK + if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then + : + else + if test $HAVE_ISWBLANK = 0 || test $REPLACE_ISWBLANK = 1; then + AC_LIBOBJ([iswblank]) + fi + fi + gl_WCTYPE_MODULE_INDICATOR([iswblank]) + gl_LANGINFO_H + AC_REQUIRE([gl_LARGEFILE]) + gl_FUNC_LCHMOD + gl_SYS_STAT_MODULE_INDICATOR([lchmod]) + gl_FUNC_LCHOWN + if test $HAVE_LCHOWN = 0 || test $REPLACE_LCHOWN = 1; then + AC_LIBOBJ([lchown]) + fi + gl_UNISTD_MODULE_INDICATOR([lchown]) + AC_REQUIRE([gl_C99_STRTOLD]) + gl_IGNORE_UNUSED_LIBRARIES + gl_FUNC_LINK + if test $HAVE_LINK = 0 || test $REPLACE_LINK = 1; then + AC_LIBOBJ([link]) + fi + gl_UNISTD_MODULE_INDICATOR([link]) + gl_FUNC_LINK_FOLLOWS_SYMLINK + gl_FUNC_LINKAT + if test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1; then + AC_LIBOBJ([linkat]) + fi + if test $HAVE_LINKAT = 0; then + AC_LIBOBJ([at-func2]) + fi + gl_UNISTD_MODULE_INDICATOR([linkat]) + gl_LOCALCHARSET + LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\"" + AC_SUBST([LOCALCHARSET_TESTS_ENVIRONMENT]) + gl_LOCALE_H + gl_FUNC_LOCALECONV + if test $REPLACE_LOCALECONV = 1; then + AC_LIBOBJ([localeconv]) + gl_PREREQ_LOCALECONV + fi + gl_LOCALE_MODULE_INDICATOR([localeconv]) + gl_LOCK + gl_FUNC_LSEEK + if test $REPLACE_LSEEK = 1; then + AC_LIBOBJ([lseek]) + fi + gl_UNISTD_MODULE_INDICATOR([lseek]) + gl_FUNC_LSTAT + if test $REPLACE_LSTAT = 1; then + AC_LIBOBJ([lstat]) + gl_PREREQ_LSTAT + fi + gl_SYS_STAT_MODULE_INDICATOR([lstat]) + AC_CONFIG_COMMANDS_PRE([m4_ifdef([AH_HEADER], + [AC_SUBST([CONFIG_INCLUDE], m4_defn([AH_HEADER]))])]) + gl_FUNC_MALLOC_GNU + if test $REPLACE_MALLOC = 1; then + AC_LIBOBJ([malloc]) + fi + gl_MODULE_INDICATOR([malloc-gnu]) + gl_FUNC_MALLOC_POSIX + if test $REPLACE_MALLOC = 1; then + AC_LIBOBJ([malloc]) + fi + gl_STDLIB_MODULE_INDICATOR([malloc-posix]) + gl_MALLOCA + gl_MATH_H + gl_MBCHAR + gl_MBITER + gl_FUNC_MBRLEN + if test $HAVE_MBRLEN = 0 || test $REPLACE_MBRLEN = 1; then + AC_LIBOBJ([mbrlen]) + gl_PREREQ_MBRLEN + fi + gl_WCHAR_MODULE_INDICATOR([mbrlen]) + gl_FUNC_MBRTOWC + if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then + AC_LIBOBJ([mbrtowc]) + gl_PREREQ_MBRTOWC + fi + gl_WCHAR_MODULE_INDICATOR([mbrtowc]) + gl_STRING_MODULE_INDICATOR([mbscasecmp]) + gl_FUNC_MBSINIT + if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then + AC_LIBOBJ([mbsinit]) + gl_PREREQ_MBSINIT + fi + gl_WCHAR_MODULE_INDICATOR([mbsinit]) + gl_FUNC_MBSLEN + gl_STRING_MODULE_INDICATOR([mbslen]) + gl_FUNC_MBSRTOWCS + if test $HAVE_MBSRTOWCS = 0 || test $REPLACE_MBSRTOWCS = 1; then + AC_LIBOBJ([mbsrtowcs]) + AC_LIBOBJ([mbsrtowcs-state]) + gl_PREREQ_MBSRTOWCS + fi + gl_WCHAR_MODULE_INDICATOR([mbsrtowcs]) + gl_STRING_MODULE_INDICATOR([mbsstr]) + gl_MBSWIDTH + gl_FUNC_MBTOWC + if test $REPLACE_MBTOWC = 1; then + AC_LIBOBJ([mbtowc]) + gl_PREREQ_MBTOWC + fi + gl_STDLIB_MODULE_INDICATOR([mbtowc]) + gl_MBITER + gl_MEMCASECMP + gl_FUNC_MEMCHR + if test $HAVE_MEMCHR = 0 || test $REPLACE_MEMCHR = 1; then + AC_LIBOBJ([memchr]) + gl_PREREQ_MEMCHR + fi + gl_STRING_MODULE_INDICATOR([memchr]) + gl_MEMCOLL + gl_FUNC_MEMPCPY + if test $HAVE_MEMPCPY = 0; then + AC_LIBOBJ([mempcpy]) + gl_PREREQ_MEMPCPY + fi + gl_STRING_MODULE_INDICATOR([mempcpy]) + gl_FUNC_MEMRCHR + if test $ac_cv_func_memrchr = no; then + AC_LIBOBJ([memrchr]) + gl_PREREQ_MEMRCHR + fi + gl_STRING_MODULE_INDICATOR([memrchr]) + gl_MGETGROUPS + gl_MKANCESDIRS + gl_FUNC_MKDIR + if test $REPLACE_MKDIR = 1; then + AC_LIBOBJ([mkdir]) + fi + gl_MKDIR_PARENTS + gl_FUNC_MKFIFO + if test $HAVE_MKFIFO = 0 || test $REPLACE_MKFIFO = 1; then + AC_LIBOBJ([mkfifo]) + fi + gl_UNISTD_MODULE_INDICATOR([mkfifo]) + gl_FUNC_MKNOD + if test $HAVE_MKNOD = 0 || test $REPLACE_MKNOD = 1; then + AC_LIBOBJ([mknod]) + fi + gl_UNISTD_MODULE_INDICATOR([mknod]) + gl_FUNC_MKSTEMP + if test $HAVE_MKSTEMP = 0 || test $REPLACE_MKSTEMP = 1; then + AC_LIBOBJ([mkstemp]) + gl_PREREQ_MKSTEMP + fi + gl_STDLIB_MODULE_INDICATOR([mkstemp]) + gl_FUNC_MKTIME + if test $REPLACE_MKTIME = 1; then + AC_LIBOBJ([mktime]) + gl_PREREQ_MKTIME + fi + gl_TIME_MODULE_INDICATOR([mktime]) + gl_MODECHANGE + gl_MOUNTLIST + if test $gl_cv_list_mounted_fs = yes; then + AC_LIBOBJ([mountlist]) + gl_PREREQ_MOUNTLIST_EXTRA + fi + gl_MPSORT + gl_MSVC_INVAL + if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then + AC_LIBOBJ([msvc-inval]) + fi + gl_MSVC_NOTHROW + if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then + AC_LIBOBJ([msvc-nothrow]) + fi + gl_MULTIARCH + gl_FUNC_NANOSLEEP + if test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1; then + AC_LIBOBJ([nanosleep]) + gl_PREREQ_NANOSLEEP + fi + gl_TIME_MODULE_INDICATOR([nanosleep]) + gl_HEADER_NETDB + gl_HEADER_NETINET_IN + AC_PROG_MKDIR_P + gl_FUNC_NL_LANGINFO + if test $HAVE_NL_LANGINFO = 0 || test $REPLACE_NL_LANGINFO = 1; then + AC_LIBOBJ([nl_langinfo]) + fi + gl_LANGINFO_MODULE_INDICATOR([nl_langinfo]) + dnl Run our hack near the end, just before config.status creation. + dnl It must happen late, i.e., after gl_LIBOBJS has been finalized. + AC_CONFIG_COMMANDS_PRE([ + gl_NON_RECURSIVE_GNULIB_PREFIX_HACK([lib]) + ]) + gl_NPROC + AC_FUNC_OBSTACK + dnl Note: AC_FUNC_OBSTACK does AC_LIBSOURCES([obstack.h, obstack.c]). + gl_FUNC_OPEN + if test $REPLACE_OPEN = 1; then + AC_LIBOBJ([open]) + gl_PREREQ_OPEN + fi + gl_FCNTL_MODULE_INDICATOR([open]) + gl_FUNC_OPENAT + if test $HAVE_OPENAT = 0 || test $REPLACE_OPENAT = 1; then + AC_LIBOBJ([openat]) + gl_PREREQ_OPENAT + fi + gl_MODULE_INDICATOR([openat]) dnl for lib/getcwd.c + gl_FCNTL_MODULE_INDICATOR([openat]) + gl_OPENAT_SAFER + gl_MODULE_INDICATOR([openat-safer]) + gl_FUNC_OPENDIR + if test $HAVE_OPENDIR = 0 || test $REPLACE_OPENDIR = 1; then + AC_LIBOBJ([opendir]) + fi + gl_DIRENT_MODULE_INDICATOR([opendir]) + gl_PARSE_DATETIME + gl_PATHMAX + gl_PERL + gl_PHYSMEM + gl_FUNC_PIPE2 + gl_UNISTD_MODULE_INDICATOR([pipe2]) + gl_MODULE_INDICATOR([pipe2-safer]) + 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 + gl_FUNC_PRINTF_FREXPL + m4_divert_text([INIT_PREPARE], [gl_printf_safe=yes]) + gl_PRIV_SET + AC_CHECK_DECLS([program_invocation_name], [], [], [#include <errno.h>]) + AC_CHECK_DECLS([program_invocation_short_name], [], [], [#include <errno.h>]) + m4_ifdef([AM_XGETTEXT_OPTION], + [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_FUNC_PUTENV + if test $REPLACE_PUTENV = 1; then + AC_LIBOBJ([putenv]) + fi + gl_STDLIB_MODULE_INDICATOR([putenv]) + gl_QUOTE + gl_QUOTEARG + gl_FUNC_RAISE + if test $HAVE_RAISE = 0 || test $REPLACE_RAISE = 1; then + AC_LIBOBJ([raise]) + 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]) + gl_PREREQ_READ + fi + gl_UNISTD_MODULE_INDICATOR([read]) + gl_PREREQ_READ_FILE + gl_FUNC_READDIR + if test $HAVE_READDIR = 0; then + AC_LIBOBJ([readdir]) + fi + gl_DIRENT_MODULE_INDICATOR([readdir]) + gl_FUNC_READLINK + if test $HAVE_READLINK = 0 || test $REPLACE_READLINK = 1; then + AC_LIBOBJ([readlink]) + gl_PREREQ_READLINK + fi + gl_UNISTD_MODULE_INDICATOR([readlink]) + gl_FUNC_READLINKAT + if test $HAVE_READLINKAT = 0; then + AC_LIBOBJ([readlinkat]) + fi + gl_UNISTD_MODULE_INDICATOR([readlinkat]) + gl_READTOKENS + gl_READUTMP + if test $ac_cv_header_utmp_h = yes || test $ac_cv_header_utmpx_h = yes; then + AC_LIBOBJ([readutmp]) + fi + gl_FUNC_REALLOC_GNU + if test $REPLACE_REALLOC = 1; then + AC_LIBOBJ([realloc]) + fi + gl_MODULE_INDICATOR([realloc-gnu]) + gl_FUNC_REALLOC_POSIX + if test $REPLACE_REALLOC = 1; then + AC_LIBOBJ([realloc]) + fi + gl_STDLIB_MODULE_INDICATOR([realloc-posix]) + gl_REGEX + if test $ac_use_included_regex = yes; then + AC_LIBOBJ([regex]) + gl_PREREQ_REGEX + fi + gl_FUNC_REMOVE + if test $REPLACE_REMOVE = 1; then + AC_LIBOBJ([remove]) + fi + gl_STDIO_MODULE_INDICATOR([remove]) + gl_FUNC_RENAME + if test $REPLACE_RENAME = 1; then + AC_LIBOBJ([rename]) + fi + gl_STDIO_MODULE_INDICATOR([rename]) + gl_FUNC_REWINDDIR + if test $HAVE_REWINDDIR = 0; then + AC_LIBOBJ([rewinddir]) + fi + gl_DIRENT_MODULE_INDICATOR([rewinddir]) + gl_FUNC_RMDIR + if test $REPLACE_RMDIR = 1; then + AC_LIBOBJ([rmdir]) + fi + gl_UNISTD_MODULE_INDICATOR([rmdir]) + gl_FUNC_RPMATCH + if test $HAVE_RPMATCH = 0; then + AC_LIBOBJ([rpmatch]) + gl_PREREQ_RPMATCH + fi + gl_STDLIB_MODULE_INDICATOR([rpmatch]) + gl_PREREQ_SAFE_READ + gl_PREREQ_SAFE_WRITE + gl_SAME + gl_SAVE_CWD + gl_SAVEDIR + gl_SAVEWD + gl_SCHED_H + gl_FUNC_SELECT + if test $REPLACE_SELECT = 1; then + AC_LIBOBJ([select]) + fi + gl_SYS_SELECT_MODULE_INDICATOR([select]) + AC_CHECK_HEADERS([selinux/flask.h]) + AC_LIBOBJ([selinux-at]) + gl_HEADERS_SELINUX_SELINUX_H + gl_HEADERS_SELINUX_CONTEXT_H + if test "$with_selinux" != no && test "$ac_cv_header_selinux_selinux_h" = yes; then + AC_LIBOBJ([getfilecon]) + fi + gl_SERVENT + gl_FUNC_SETENV + if test $HAVE_SETENV = 0 || test $REPLACE_SETENV = 1; then + AC_LIBOBJ([setenv]) + fi + gl_STDLIB_MODULE_INDICATOR([setenv]) + gl_SETTIME + gl_FUNC_SIG2STR + if test $ac_cv_func_sig2str = no; then + AC_LIBOBJ([sig2str]) + gl_PREREQ_SIG2STR + fi + gl_SIGACTION + if test $HAVE_SIGACTION = 0; then + AC_LIBOBJ([sigaction]) + gl_PREREQ_SIGACTION + fi + gl_SIGNAL_MODULE_INDICATOR([sigaction]) + gl_SIGNAL_H + gl_SIGNBIT + if test $REPLACE_SIGNBIT = 1; then + AC_LIBOBJ([signbitf]) + AC_LIBOBJ([signbitd]) + AC_LIBOBJ([signbitl]) + fi + gl_MATH_MODULE_INDICATOR([signbit]) + gl_SIGNALBLOCKING + if test $HAVE_POSIX_SIGNALBLOCKING = 0; then + AC_LIBOBJ([sigprocmask]) + gl_PREREQ_SIGPROCMASK + fi + gl_SIGNAL_MODULE_INDICATOR([sigprocmask]) + gl_SIZE_MAX + 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 + AC_LIBOBJ([stat]) + gl_PREREQ_STAT + fi + gl_SYS_STAT_MODULE_INDICATOR([stat]) + gl_STAT_SIZE + gl_STAT_TIME + gl_STAT_BIRTHTIME + gl_MODULE_INDICATOR([statat]) dnl for lib/openat.h + gl_STDALIGN_H + gl_STDARG_H + AM_STDBOOL_H + gl_STDDEF_H + gl_STDINT_H + gl_STDIO_H + gl_STDLIB_H + gl_FUNC_STPCPY + if test $HAVE_STPCPY = 0; then + AC_LIBOBJ([stpcpy]) + gl_PREREQ_STPCPY + fi + gl_STRING_MODULE_INDICATOR([stpcpy]) + gl_FUNC_STPNCPY + if test $HAVE_STPNCPY = 0 || test $REPLACE_STPNCPY = 1; then + AC_LIBOBJ([stpncpy]) + 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]) + gl_PREREQ_STRDUP + fi + gl_STRING_MODULE_INDICATOR([strdup]) + gl_FUNC_STRERROR + if test $REPLACE_STRERROR = 1; then + AC_LIBOBJ([strerror]) + fi + gl_MODULE_INDICATOR([strerror]) + gl_STRING_MODULE_INDICATOR([strerror]) + AC_REQUIRE([gl_HEADER_ERRNO_H]) + AC_REQUIRE([gl_FUNC_STRERROR_0]) + if test -n "$ERRNO_H" || test $REPLACE_STRERROR_0 = 1; then + AC_LIBOBJ([strerror-override]) + gl_PREREQ_SYS_H_WINSOCK2 + fi + gl_FUNC_GNU_STRFTIME + if test $gl_cond_libtool = false; then + gl_ltlibdeps="$gl_ltlibdeps $LTLIBICONV" + gl_libdeps="$gl_libdeps $LIBICONV" + fi + gl_HEADER_STRING_H + gl_FUNC_STRNCAT + if test $REPLACE_STRNCAT = 1; then + AC_LIBOBJ([strncat]) + gl_PREREQ_STRNCAT + fi + gl_STRING_MODULE_INDICATOR([strncat]) + gl_FUNC_STRNDUP + if test $HAVE_STRNDUP = 0 || test $REPLACE_STRNDUP = 1; then + AC_LIBOBJ([strndup]) + fi + gl_STRING_MODULE_INDICATOR([strndup]) + gl_FUNC_STRNLEN + if test $HAVE_DECL_STRNLEN = 0 || test $REPLACE_STRNLEN = 1; then + AC_LIBOBJ([strnlen]) + gl_PREREQ_STRNLEN + fi + gl_STRING_MODULE_INDICATOR([strnlen]) + gl_FUNC_STRPBRK + if test $HAVE_STRPBRK = 0; then + AC_LIBOBJ([strpbrk]) + gl_PREREQ_STRPBRK + fi + gl_STRING_MODULE_INDICATOR([strpbrk]) + gl_FUNC_STRSIGNAL + if test $HAVE_STRSIGNAL = 0 || test $REPLACE_STRSIGNAL = 1; then + AC_LIBOBJ([strsignal]) + gl_PREREQ_STRSIGNAL + fi + gl_STRING_MODULE_INDICATOR([strsignal]) + gl_FUNC_STRSTR_SIMPLE + if test $REPLACE_STRSTR = 1; then + AC_LIBOBJ([strstr]) + fi + gl_STRING_MODULE_INDICATOR([strstr]) + gl_FUNC_STRTOD + if test $HAVE_STRTOD = 0 || test $REPLACE_STRTOD = 1; then + AC_LIBOBJ([strtod]) + gl_PREREQ_STRTOD + fi + gl_STDLIB_MODULE_INDICATOR([strtod]) + gl_FUNC_STRTOIMAX + if test $HAVE_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1; then + AC_LIBOBJ([strtoimax]) + gl_PREREQ_STRTOIMAX + fi + gl_INTTYPES_MODULE_INDICATOR([strtoimax]) + gl_FUNC_STRTOLL + if test $HAVE_STRTOLL = 0; then + AC_LIBOBJ([strtoll]) + gl_PREREQ_STRTOLL + fi + gl_STDLIB_MODULE_INDICATOR([strtoll]) + gl_FUNC_STRTOULL + if test $HAVE_STRTOULL = 0; then + AC_LIBOBJ([strtoull]) + gl_PREREQ_STRTOULL + fi + gl_STDLIB_MODULE_INDICATOR([strtoull]) + gl_FUNC_STRTOUMAX + if test $ac_cv_func_strtoumax = no; then + AC_LIBOBJ([strtoumax]) + gl_PREREQ_STRTOUMAX + fi + gl_INTTYPES_MODULE_INDICATOR([strtoumax]) + gl_FUNC_SYMLINK + if test $HAVE_SYMLINK = 0 || test $REPLACE_SYMLINK = 1; then + AC_LIBOBJ([symlink]) + fi + gl_UNISTD_MODULE_INDICATOR([symlink]) + gl_SYS_IOCTL_H + AC_PROG_MKDIR_P + gl_HEADER_SYS_RESOURCE + AC_PROG_MKDIR_P + gl_HEADER_SYS_SELECT + AC_PROG_MKDIR_P + gl_HEADER_SYS_SOCKET + AC_PROG_MKDIR_P + gl_HEADER_SYS_STAT_H + AC_PROG_MKDIR_P + gl_HEADER_SYS_TIME_H + AC_PROG_MKDIR_P + gl_SYS_TYPES_H + AC_PROG_MKDIR_P + gl_HEADER_SYS_UIO + AC_PROG_MKDIR_P + gl_SYS_UTSNAME_H + AC_PROG_MKDIR_P + gl_SYS_WAIT_H + AC_PROG_MKDIR_P + gl_FUNC_GEN_TEMPNAME + gl_TERMIOS_H + gl_THREADLIB + gl_HEADER_TIME_H + gl_TIME_R + if test $HAVE_LOCALTIME_R = 0 || test $REPLACE_LOCALTIME_R = 1; then + AC_LIBOBJ([time_r]) + gl_PREREQ_TIME_R + fi + gl_TIME_MODULE_INDICATOR([time_r]) + gl_TIMER_TIME + gl_TIMESPEC + gl_TLS + gl_FUNC_TZSET + gl_FUNC_UNAME + if test $HAVE_UNAME = 0; then + AC_LIBOBJ([uname]) + gl_PREREQ_UNAME + fi + gl_SYS_UTSNAME_MODULE_INDICATOR([uname]) + gl_UNICODEIO + gl_UNISTD_H + gl_UNISTD_SAFER + gl_LIBUNISTRING_LIBHEADER([0.9.2], [unistr.h]) + gl_MODULE_INDICATOR([unistr/u8-mbtoucr]) + gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-mbtoucr]) + gl_MODULE_INDICATOR([unistr/u8-uctomb]) + gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-uctomb]) + gl_LIBUNISTRING_LIBHEADER([0.9], [unitypes.h]) + gl_LIBUNISTRING_LIBHEADER([0.9], [uniwidth.h]) + gl_LIBUNISTRING_MODULE([0.9.4], [uniwidth/width]) + gl_FUNC_UNLINK + if test $REPLACE_UNLINK = 1; then + AC_LIBOBJ([unlink]) + fi + gl_UNISTD_MODULE_INDICATOR([unlink]) + gl_FUNC_UNLINK_BUSY_TEXT + gl_FUNC_UNLINKAT + if test $HAVE_UNLINKAT = 0 || test $REPLACE_UNLINKAT = 1; then + AC_LIBOBJ([unlinkat]) + fi + gl_UNISTD_MODULE_INDICATOR([unlinkat]) + gl_FUNC_GLIBC_UNLOCKED_IO + gl_FUNC_UNSETENV + if test $HAVE_UNSETENV = 0 || test $REPLACE_UNSETENV = 1; then + AC_LIBOBJ([unsetenv]) + gl_PREREQ_UNSETENV + fi + gl_STDLIB_MODULE_INDICATOR([unsetenv]) + gl_SYS_PROC_UPTIME + gl_USERSPEC + gl_UTIMECMP + gl_UTIMENS + gl_FUNC_UTIMENSAT + if test $HAVE_UTIMENSAT = 0 || test $REPLACE_UTIMENSAT = 1; then + AC_LIBOBJ([utimensat]) + fi + gl_SYS_STAT_MODULE_INDICATOR([utimensat]) + gl_FUNC_VASNPRINTF + gl_FUNC_VASPRINTF + gl_STDIO_MODULE_INDICATOR([vasprintf]) + m4_ifdef([AM_XGETTEXT_OPTION], + [AM_][XGETTEXT_OPTION([--flag=asprintf:2:c-format]) + AM_][XGETTEXT_OPTION([--flag=vasprintf:2:c-format])]) + gl_FUNC_VASPRINTF_POSIX + m4_ifdef([AM_XGETTEXT_OPTION], + [AM_][XGETTEXT_OPTION([--flag=verror:3:c-format]) + AM_][XGETTEXT_OPTION([--flag=verror_at_line:5:c-format])]) + gl_VERSION_ETC + gl_FUNC_VFPRINTF_POSIX + 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 + AC_LIBOBJ([wcrtomb]) + gl_PREREQ_WCRTOMB + fi + gl_WCHAR_MODULE_INDICATOR([wcrtomb]) + gl_FUNC_WCSWIDTH + if test $HAVE_WCSWIDTH = 0 || test $REPLACE_WCSWIDTH = 1; then + AC_LIBOBJ([wcswidth]) + fi + gl_WCHAR_MODULE_INDICATOR([wcswidth]) + gl_WCTYPE_H + gl_FUNC_WCWIDTH + if test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1; then + AC_LIBOBJ([wcwidth]) + fi + gl_WCHAR_MODULE_INDICATOR([wcwidth]) + gl_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL + gl_HEADER_TIOCGWINSZ_IN_TERMIOS_H + gl_WINSIZE_IN_PTEM + gl_FUNC_WRITE + if test $REPLACE_WRITE = 1; then + AC_LIBOBJ([write]) + gl_PREREQ_WRITE + fi + gl_UNISTD_MODULE_INDICATOR([write]) + gl_WRITE_ANY_FILE + gl_XALLOC + gl_XGETCWD + gl_MODULE_INDICATOR([xgetgroups]) + gl_XNANOSLEEP + m4_ifdef([AM_XGETTEXT_OPTION], + [AM_][XGETTEXT_OPTION([--flag=xprintf:1:c-format]) + AM_][XGETTEXT_OPTION([--flag=xvprintf:1:c-format]) + AM_][XGETTEXT_OPTION([--flag=xfprintf:2:c-format]) + AM_][XGETTEXT_OPTION([--flag=xvfprintf:2:c-format])]) + gl_XSIZE + gl_XSTRNDUP + gl_XSTRTOD + gl_XSTRTOL + gl_XSTRTOLD + gl_XVASPRINTF + m4_ifdef([AM_XGETTEXT_OPTION], + [AM_][XGETTEXT_OPTION([--flag=xasprintf:1:c-format])]) + gl_YESNO # End of code from modules m4_ifval(gl_LIBSOURCES_LIST, [ m4_syscmd([test ! -d ]m4_defn([gl_LIBSOURCES_DIR])[ || @@ -2086,201 +2087,199 @@ changequote([, ])dnl AC_SUBST([gltests_WITNESS]) gl_module_indicator_condition=$gltests_WITNESS m4_pushdef([gl_MODULE_INDICATOR_CONDITION], [$gl_module_indicator_condition]) -AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([accept]) -fi -gl_SYS_SOCKET_MODULE_INDICATOR([accept]) -AC_CHECK_DECLS_ONCE([alarm]) -AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([bind]) -fi -gl_SYS_SOCKET_MODULE_INDICATOR([bind]) -gt_LOCALE_FR -gt_LOCALE_FR_UTF8 -gt_LOCALE_FR -gt_LOCALE_TR_UTF8 -AC_CHECK_FUNCS_ONCE([getegid]) -AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([connect]) -fi -gl_SYS_SOCKET_MODULE_INDICATOR([connect]) -AC_CHECK_FUNCS_ONCE([getegid]) -AC_REQUIRE([AC_C_INLINE]) -gl_FUNC_UNGETC_WORKS -gl_FUNC_UNGETC_WORKS -gl_FUNC_UNGETC_WORKS -gl_FUNC_UNGETC_WORKS -AC_REQUIRE([AC_C_INLINE]) -AC_C_BIGENDIAN -gl_FUNC_INET_PTON -if test $HAVE_INET_PTON = 0 || test $REPLACE_INET_NTOP = 1; then - AC_LIBOBJ([inet_pton]) - gl_PREREQ_INET_PTON -fi -gl_ARPA_INET_MODULE_INDICATOR([inet_pton]) -AC_C_BIGENDIAN -gl_FUNC_IOCTL -if test $HAVE_IOCTL = 0 || test $REPLACE_IOCTL = 1; then - AC_LIBOBJ([ioctl]) -fi -gl_SYS_IOCTL_MODULE_INDICATOR([ioctl]) -gl_DOUBLE_EXPONENT_LOCATION -gl_FLOAT_EXPONENT_LOCATION -gl_LONG_DOUBLE_EXPONENT_LOCATION -AC_REQUIRE([gl_LONG_DOUBLE_VS_DOUBLE]) -AC_CHECK_FUNCS_ONCE([getegid]) -AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([listen]) -fi -gl_SYS_SOCKET_MODULE_INDICATOR([listen]) -AC_CHECK_FUNCS_ONCE([newlocale]) -gl_LOCALENAME -AC_CHECK_FUNCS_ONCE([newlocale]) -gt_LOCALE_FR -gt_LOCALE_FR_UTF8 -gt_LOCALE_JA -gt_LOCALE_ZH_CN -gt_LOCALE_TR_UTF8 -gt_LOCALE_FR_UTF8 -gt_LOCALE_FR -gt_LOCALE_FR_UTF8 -gt_LOCALE_JA -gt_LOCALE_ZH_CN -gt_LOCALE_FR_UTF8 -gt_LOCALE_ZH_CN -gl_FUNC_MMAP_ANON -AC_CHECK_HEADERS_ONCE([sys/mman.h]) -AC_CHECK_FUNCS_ONCE([mprotect]) -dnl Check for prerequisites for memory fence checks. -gl_FUNC_MMAP_ANON -AC_CHECK_HEADERS_ONCE([sys/mman.h]) -AC_CHECK_FUNCS_ONCE([mprotect]) -gl_FUNC_MMAP_ANON -AC_CHECK_HEADERS_ONCE([sys/mman.h]) -AC_CHECK_FUNCS_ONCE([mprotect]) -gl_FUNC_MMAP_ANON -AC_CHECK_HEADERS_ONCE([sys/mman.h]) -AC_CHECK_FUNCS_ONCE([mprotect]) -AC_CHECK_DECLS_ONCE([alarm]) -gt_LOCALE_FR -gt_LOCALE_FR_UTF8 -gl_FUNC_PERROR -if test $REPLACE_PERROR = 1; then - 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. -gl_FUNC_MMAP_ANON -AC_CHECK_HEADERS_ONCE([sys/mman.h]) -AC_CHECK_FUNCS_ONCE([mprotect]) -AC_CHECK_HEADERS_ONCE([sys/wait.h]) -gl_FUNC_SETLOCALE -if test $REPLACE_SETLOCALE = 1; then - AC_LIBOBJ([setlocale]) - gl_PREREQ_SETLOCALE -fi -gl_LOCALE_MODULE_INDICATOR([setlocale]) -gt_LOCALE_FR -gt_LOCALE_FR_UTF8 -gt_LOCALE_JA -gt_LOCALE_ZH_CN -AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([setsockopt]) -fi -gl_SYS_SOCKET_MODULE_INDICATOR([setsockopt]) -AC_REQUIRE([gl_FLOAT_EXPONENT_LOCATION]) -AC_REQUIRE([gl_DOUBLE_EXPONENT_LOCATION]) -AC_REQUIRE([gl_LONG_DOUBLE_EXPONENT_LOCATION]) -gl_FUNC_SLEEP -if test $HAVE_SLEEP = 0 || test $REPLACE_SLEEP = 1; then - AC_LIBOBJ([sleep]) -fi -gl_UNISTD_MODULE_INDICATOR([sleep]) -AC_CHECK_DECLS_ONCE([alarm]) -AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([socket]) -fi -# When this module is used, sockets may actually occur as file descriptors, -# hence it is worth warning if the modules 'close' and 'ioctl' are not used. -m4_ifdef([gl_UNISTD_H_DEFAULTS], [AC_REQUIRE([gl_UNISTD_H_DEFAULTS])]) -m4_ifdef([gl_SYS_IOCTL_H_DEFAULTS], [AC_REQUIRE([gl_SYS_IOCTL_H_DEFAULTS])]) -AC_REQUIRE([gl_PREREQ_SYS_H_WINSOCK2]) -if test "$ac_cv_header_winsock2_h" = yes; then - UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS=1 - SYS_IOCTL_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS=1 -fi -gl_SYS_SOCKET_MODULE_INDICATOR([socket]) -gt_TYPE_WCHAR_T -gt_TYPE_WINT_T -gl_FUNC_STRERROR_R -if test $HAVE_DECL_STRERROR_R = 0 || test $REPLACE_STRERROR_R = 1; then - AC_LIBOBJ([strerror_r]) - gl_PREREQ_STRERROR_R -fi -gl_STRING_MODULE_INDICATOR([strerror_r]) -gl_FUNC_MMAP_ANON -AC_CHECK_HEADERS_ONCE([sys/mman.h]) -AC_CHECK_FUNCS_ONCE([mprotect]) -dnl Check for prerequisites for memory fence checks. -gl_FUNC_MMAP_ANON -AC_CHECK_HEADERS_ONCE([sys/mman.h]) -AC_CHECK_FUNCS_ONCE([mprotect]) -gl_FUNC_SYMLINKAT -if test $HAVE_SYMLINKAT = 0; then - AC_LIBOBJ([symlinkat]) -fi -gl_UNISTD_MODULE_INDICATOR([symlinkat]) -AC_CHECK_FUNCS_ONCE([shutdown]) -gl_THREAD -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([AC_C_INLINE]) -AC_REQUIRE([AC_C_INLINE]) -AC_REQUIRE([gl_LONG_DOUBLE_VS_DOUBLE]) -abs_aux_dir=`cd "$ac_aux_dir"; pwd` -AC_SUBST([abs_aux_dir]) -gt_LOCALE_FR -gt_LOCALE_FR_UTF8 -gt_LOCALE_JA -gt_LOCALE_ZH_CN -gl_FUNC_WCTOB -if test $HAVE_WCTOB = 0 || test $REPLACE_WCTOB = 1; then - AC_LIBOBJ([wctob]) - gl_PREREQ_WCTOB -fi -gl_WCHAR_MODULE_INDICATOR([wctob]) -gl_FUNC_WCTOMB -if test $REPLACE_WCTOMB = 1; then - AC_LIBOBJ([wctomb]) - gl_PREREQ_WCTOMB -fi -gl_STDLIB_MODULE_INDICATOR([wctomb]) -gl_YIELD + AC_REQUIRE([gl_HEADER_SYS_SOCKET]) + if test "$ac_cv_header_winsock2_h" = yes; then + AC_LIBOBJ([accept]) + fi + gl_SYS_SOCKET_MODULE_INDICATOR([accept]) + AC_CHECK_DECLS_ONCE([alarm]) + AC_REQUIRE([gl_HEADER_SYS_SOCKET]) + if test "$ac_cv_header_winsock2_h" = yes; then + AC_LIBOBJ([bind]) + fi + gl_SYS_SOCKET_MODULE_INDICATOR([bind]) + gt_LOCALE_FR + gt_LOCALE_FR_UTF8 + gt_LOCALE_FR + gt_LOCALE_TR_UTF8 + AC_CHECK_FUNCS_ONCE([getegid]) + AC_REQUIRE([gl_HEADER_SYS_SOCKET]) + if test "$ac_cv_header_winsock2_h" = yes; then + AC_LIBOBJ([connect]) + fi + gl_SYS_SOCKET_MODULE_INDICATOR([connect]) + AC_CHECK_FUNCS_ONCE([getegid]) + gl_FUNC_UNGETC_WORKS + gl_FUNC_UNGETC_WORKS + gl_FUNC_UNGETC_WORKS + gl_FUNC_UNGETC_WORKS + dnl you must add AM_GNU_GETTEXT([external]) or similar to configure.ac. + AM_GNU_GETTEXT_VERSION([0.18.1]) + AC_C_BIGENDIAN + gl_FUNC_INET_PTON + if test $HAVE_INET_PTON = 0 || test $REPLACE_INET_NTOP = 1; then + AC_LIBOBJ([inet_pton]) + gl_PREREQ_INET_PTON + fi + gl_ARPA_INET_MODULE_INDICATOR([inet_pton]) + AC_C_BIGENDIAN + gl_FUNC_IOCTL + if test $HAVE_IOCTL = 0 || test $REPLACE_IOCTL = 1; then + AC_LIBOBJ([ioctl]) + fi + gl_SYS_IOCTL_MODULE_INDICATOR([ioctl]) + gl_DOUBLE_EXPONENT_LOCATION + gl_FLOAT_EXPONENT_LOCATION + gl_LONG_DOUBLE_EXPONENT_LOCATION + AC_REQUIRE([gl_LONG_DOUBLE_VS_DOUBLE]) + AC_CHECK_FUNCS_ONCE([getegid]) + AC_REQUIRE([gl_HEADER_SYS_SOCKET]) + if test "$ac_cv_header_winsock2_h" = yes; then + AC_LIBOBJ([listen]) + fi + gl_SYS_SOCKET_MODULE_INDICATOR([listen]) + AC_CHECK_FUNCS_ONCE([newlocale]) + gl_LOCALENAME + AC_CHECK_FUNCS_ONCE([newlocale]) + gt_LOCALE_FR + gt_LOCALE_FR_UTF8 + gt_LOCALE_JA + gt_LOCALE_ZH_CN + gt_LOCALE_TR_UTF8 + gt_LOCALE_FR_UTF8 + gt_LOCALE_FR + gt_LOCALE_FR_UTF8 + gt_LOCALE_JA + gt_LOCALE_ZH_CN + gt_LOCALE_FR_UTF8 + gt_LOCALE_ZH_CN + gl_FUNC_MMAP_ANON + AC_CHECK_HEADERS_ONCE([sys/mman.h]) + AC_CHECK_FUNCS_ONCE([mprotect]) + dnl Check for prerequisites for memory fence checks. + gl_FUNC_MMAP_ANON + AC_CHECK_HEADERS_ONCE([sys/mman.h]) + AC_CHECK_FUNCS_ONCE([mprotect]) + gl_FUNC_MMAP_ANON + AC_CHECK_HEADERS_ONCE([sys/mman.h]) + AC_CHECK_FUNCS_ONCE([mprotect]) + gl_FUNC_MMAP_ANON + AC_CHECK_HEADERS_ONCE([sys/mman.h]) + AC_CHECK_FUNCS_ONCE([mprotect]) + AC_CHECK_DECLS_ONCE([alarm]) + gt_LOCALE_FR + gt_LOCALE_FR_UTF8 + gl_FUNC_PERROR + if test $REPLACE_PERROR = 1; then + 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. + gl_FUNC_MMAP_ANON + AC_CHECK_HEADERS_ONCE([sys/mman.h]) + AC_CHECK_FUNCS_ONCE([mprotect]) + AC_CHECK_HEADERS_ONCE([sys/wait.h]) + gl_FUNC_SETLOCALE + if test $REPLACE_SETLOCALE = 1; then + AC_LIBOBJ([setlocale]) + gl_PREREQ_SETLOCALE + fi + gl_LOCALE_MODULE_INDICATOR([setlocale]) + gt_LOCALE_FR + gt_LOCALE_FR_UTF8 + gt_LOCALE_JA + gt_LOCALE_ZH_CN + AC_REQUIRE([gl_HEADER_SYS_SOCKET]) + if test "$ac_cv_header_winsock2_h" = yes; then + AC_LIBOBJ([setsockopt]) + fi + gl_SYS_SOCKET_MODULE_INDICATOR([setsockopt]) + AC_REQUIRE([gl_FLOAT_EXPONENT_LOCATION]) + AC_REQUIRE([gl_DOUBLE_EXPONENT_LOCATION]) + AC_REQUIRE([gl_LONG_DOUBLE_EXPONENT_LOCATION]) + gl_FUNC_SLEEP + if test $HAVE_SLEEP = 0 || test $REPLACE_SLEEP = 1; then + AC_LIBOBJ([sleep]) + fi + gl_UNISTD_MODULE_INDICATOR([sleep]) + AC_CHECK_DECLS_ONCE([alarm]) + AC_REQUIRE([gl_HEADER_SYS_SOCKET]) + if test "$ac_cv_header_winsock2_h" = yes; then + AC_LIBOBJ([socket]) + fi + # When this module is used, sockets may actually occur as file descriptors, + # hence it is worth warning if the modules 'close' and 'ioctl' are not used. + m4_ifdef([gl_UNISTD_H_DEFAULTS], [AC_REQUIRE([gl_UNISTD_H_DEFAULTS])]) + m4_ifdef([gl_SYS_IOCTL_H_DEFAULTS], [AC_REQUIRE([gl_SYS_IOCTL_H_DEFAULTS])]) + AC_REQUIRE([gl_PREREQ_SYS_H_WINSOCK2]) + if test "$ac_cv_header_winsock2_h" = yes; then + UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS=1 + SYS_IOCTL_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS=1 + fi + gl_SYS_SOCKET_MODULE_INDICATOR([socket]) + AC_REQUIRE([gt_TYPE_WCHAR_T]) + AC_REQUIRE([gt_TYPE_WINT_T]) + gl_FUNC_STRERROR_R + if test $HAVE_DECL_STRERROR_R = 0 || test $REPLACE_STRERROR_R = 1; then + AC_LIBOBJ([strerror_r]) + gl_PREREQ_STRERROR_R + fi + gl_STRING_MODULE_INDICATOR([strerror_r]) + gl_FUNC_MMAP_ANON + AC_CHECK_HEADERS_ONCE([sys/mman.h]) + AC_CHECK_FUNCS_ONCE([mprotect]) + dnl Check for prerequisites for memory fence checks. + gl_FUNC_MMAP_ANON + AC_CHECK_HEADERS_ONCE([sys/mman.h]) + AC_CHECK_FUNCS_ONCE([mprotect]) + gl_FUNC_SYMLINKAT + if test $HAVE_SYMLINKAT = 0; then + AC_LIBOBJ([symlinkat]) + fi + gl_UNISTD_MODULE_INDICATOR([symlinkat]) + AC_CHECK_FUNCS_ONCE([shutdown]) + gl_THREAD + 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]) + gt_LOCALE_FR + gt_LOCALE_FR_UTF8 + gt_LOCALE_JA + gt_LOCALE_ZH_CN + gl_FUNC_WCTOB + if test $HAVE_WCTOB = 0 || test $REPLACE_WCTOB = 1; then + AC_LIBOBJ([wctob]) + gl_PREREQ_WCTOB + fi + gl_WCHAR_MODULE_INDICATOR([wctob]) + gl_FUNC_WCTOMB + if test $REPLACE_WCTOMB = 1; then + AC_LIBOBJ([wctomb]) + gl_PREREQ_WCTOMB + fi + gl_STDLIB_MODULE_INDICATOR([wctomb]) + gl_YIELD m4_popdef([gl_MODULE_INDICATOR_CONDITION]) m4_ifval(gltests_LIBSOURCES_LIST, [ m4_syscmd([test ! -d ]m4_defn([gltests_LIBSOURCES_DIR])[ || @@ -2385,6 +2384,7 @@ AC_DEFUN([gl_FILE_LIST], [ build-aux/gitlog-to-changelog build-aux/gnu-web-doc-update build-aux/gnupload + build-aux/prefix-gnulib-mk build-aux/snippet/_Noreturn.h build-aux/snippet/arg-nonnull.h build-aux/snippet/c++defs.h @@ -2424,9 +2424,13 @@ 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 + lib/buffer-lcm.c + lib/buffer-lcm.h lib/c-ctype.c lib/c-ctype.h lib/c-strcase.h @@ -2445,7 +2449,9 @@ AC_DEFUN([gl_FILE_LIST], [ lib/careadlinkat.h lib/chdir-long.c lib/chdir-long.h + lib/chmodat.c lib/chown.c + lib/chownat.c lib/cloexec.c lib/cloexec.h lib/close-stream.c @@ -2508,6 +2514,8 @@ AC_DEFUN([gl_FILE_LIST], [ lib/fcntl.in.h lib/fd-hook.c lib/fd-hook.h + lib/fd-reopen.c + lib/fd-reopen.h lib/fd-safer-flag.c lib/fd-safer.c lib/fdatasync.c @@ -2678,9 +2686,11 @@ AC_DEFUN([gl_FILE_LIST], [ lib/malloca.c lib/malloca.h lib/malloca.valgrind + lib/math.c lib/math.in.h lib/mbchar.c lib/mbchar.h + lib/mbiter.c lib/mbiter.h lib/mbrlen.c lib/mbrtowc.c @@ -2697,6 +2707,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/mbswidth.h lib/mbtowc-impl.h lib/mbtowc.c + lib/mbuiter.c lib/mbuiter.h lib/md5.c lib/md5.h @@ -2782,6 +2793,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/progname.h lib/propername.c lib/propername.h + lib/pthread.c lib/pthread.in.h lib/putenv.c lib/quote.h @@ -2825,6 +2837,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/rmdir.c lib/root-dev-ino.c lib/root-dev-ino.h + lib/root-uid.h lib/rpmatch.c lib/safe-read.c lib/safe-read.h @@ -2840,7 +2853,9 @@ AC_DEFUN([gl_FILE_LIST], [ lib/savewd.c lib/savewd.h lib/sched.in.h + lib/se-context.c lib/se-context.in.h + lib/se-selinux.c lib/se-selinux.in.h lib/select.c lib/selinux-at.c @@ -2854,6 +2869,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/sha256.h lib/sha512.c lib/sha512.h + lib/sig-handler.c lib/sig-handler.h lib/sig2str.c lib/sig2str.h @@ -2885,8 +2901,10 @@ AC_DEFUN([gl_FILE_LIST], [ lib/spawnp.c lib/stat-macros.h lib/stat-size.h + lib/stat-time.c lib/stat-time.h lib/stat.c + lib/statat.c lib/stdalign.in.h lib/stdarg.in.h lib/stdbool.in.h @@ -2903,7 +2921,6 @@ AC_DEFUN([gl_FILE_LIST], [ lib/stpncpy.c lib/str-kmp.h lib/str-two-way.h - lib/strcasecmp.c lib/strchrnul.c lib/strchrnul.valgrind lib/strdup.c @@ -2916,14 +2933,16 @@ AC_DEFUN([gl_FILE_LIST], [ lib/striconv.c lib/striconv.h lib/string.in.h - lib/strings.in.h + lib/strintcmp.c lib/stripslash.c - lib/strncasecmp.c lib/strncat.c lib/strndup.c lib/strnlen.c lib/strnlen1.c lib/strnlen1.h + lib/strnumcmp-in.h + lib/strnumcmp.c + lib/strnumcmp.h lib/strpbrk.c lib/strsignal.c lib/strstr.c @@ -2938,6 +2957,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/sys_ioctl.in.h lib/sys_resource.in.h lib/sys_select.in.h + lib/sys_socket.c lib/sys_socket.in.h lib/sys_stat.in.h lib/sys_time.in.h @@ -2950,9 +2970,11 @@ AC_DEFUN([gl_FILE_LIST], [ lib/termios.in.h lib/time.in.h lib/time_r.c + lib/timespec.c lib/timespec.h lib/trim.c lib/trim.h + lib/u64.c lib/u64.h lib/uinttostr.c lib/umaxtostr.c @@ -2961,6 +2983,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/unicodeio.h lib/unistd--.h lib/unistd-safer.h + lib/unistd.c lib/unistd.in.h lib/unistr.in.h lib/unistr/u8-mbtoucr.c @@ -3001,6 +3024,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/wcrtomb.c lib/wcswidth-impl.h lib/wcswidth.c + lib/wctype-h.c lib/wctype.in.h lib/wcwidth.c lib/write-any-file.c @@ -3012,6 +3036,8 @@ AC_DEFUN([gl_FILE_LIST], [ lib/xasprintf.c lib/xfreopen.c lib/xfreopen.h + lib/xfts.c + lib/xfts.h lib/xgetcwd.c lib/xgetcwd.h lib/xgetgroups.c @@ -3026,6 +3052,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/xprintf.h lib/xreadlink.c lib/xreadlink.h + lib/xsize.c lib/xsize.h lib/xstriconv.c lib/xstriconv.h @@ -3040,6 +3067,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/xstrtold.c lib/xstrtoul.c lib/xstrtoumax.c + lib/xtime.c lib/xtime.h lib/xvasprintf.c lib/xvasprintf.h @@ -3090,6 +3118,7 @@ AC_DEFUN([gl_FILE_LIST], [ m4/exponentf.m4 m4/exponentl.m4 m4/extensions.m4 + m4/extern-inline.m4 m4/faccessat.m4 m4/fatal-signal.m4 m4/fchdir.m4 @@ -3114,12 +3143,16 @@ AC_DEFUN([gl_FILE_LIST], [ m4/fpending.m4 m4/fpieee.m4 m4/fpurge.m4 + m4/freadahead.m4 m4/freading.m4 + m4/freadptr.m4 + m4/freadseek.m4 m4/freopen.m4 m4/frexp.m4 m4/frexpl.m4 m4/fseek.m4 m4/fseeko.m4 + m4/fseterr.m4 m4/fstat.m4 m4/fstatat.m4 m4/fstypename.m4 @@ -3146,10 +3179,12 @@ AC_DEFUN([gl_FILE_LIST], [ m4/getopt.m4 m4/getpagesize.m4 m4/getpass.m4 + m4/gettext.m4 m4/gettime.m4 m4/gettimeofday.m4 m4/getugroups.m4 m4/getusershell.m4 + m4/glibc2.m4 m4/glibc21.m4 m4/gnu-make.m4 m4/gnulib-common.m4 @@ -3167,7 +3202,11 @@ AC_DEFUN([gl_FILE_LIST], [ m4/inet_ntop.m4 m4/inet_pton.m4 m4/inline.m4 + m4/intdiv0.m4 + m4/intl.m4 + m4/intldir.m4 m4/intlmacosx.m4 + m4/intmax.m4 m4/intmax_t.m4 m4/inttostr.m4 m4/inttypes-pri.m4 @@ -3251,7 +3290,9 @@ AC_DEFUN([gl_FILE_LIST], [ m4/netdb_h.m4 m4/netinet_in_h.m4 m4/nl_langinfo.m4 + m4/nls.m4 m4/nocrash.m4 + m4/non-recursive-gnulib-prefix-hack.m4 m4/nproc.m4 m4/off_t.m4 m4/open.m4 @@ -3264,14 +3305,17 @@ AC_DEFUN([gl_FILE_LIST], [ 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 m4/printf-frexpl.m4 + m4/printf-posix.m4 m4/printf.m4 m4/priv-set.m4 + m4/progtest.m4 m4/pthread.m4 m4/putenv.m4 m4/quote.m4 @@ -3291,7 +3335,6 @@ AC_DEFUN([gl_FILE_LIST], [ m4/rename.m4 m4/rewinddir.m4 m4/rmdir.m4 - m4/root-dev-ino.m4 m4/rpmatch.m4 m4/safe-read.m4 m4/safe-write.m4 @@ -3340,14 +3383,12 @@ AC_DEFUN([gl_FILE_LIST], [ m4/stdlib_h.m4 m4/stpcpy.m4 m4/stpncpy.m4 - m4/strcase.m4 m4/strchrnul.m4 m4/strdup.m4 m4/strerror.m4 m4/strerror_r.m4 m4/strftime.m4 m4/string_h.m4 - m4/strings_h.m4 m4/strncat.m4 m4/strndup.m4 m4/strnlen.m4 @@ -3382,6 +3423,7 @@ AC_DEFUN([gl_FILE_LIST], [ m4/tls.m4 m4/tm_gmtoff.m4 m4/tzset.m4 + m4/uintmax_t.m4 m4/uname.m4 m4/ungetc.m4 m4/unicodeio.m4 @@ -3405,6 +3447,7 @@ AC_DEFUN([gl_FILE_LIST], [ m4/vasprintf.m4 m4/version-etc.m4 m4/vfprintf-posix.m4 + m4/visibility.m4 m4/vprintf-posix.m4 m4/wait-process.m4 m4/waitpid.m4 @@ -3708,6 +3751,7 @@ AC_DEFUN([gl_FILE_LIST], [ tests/test-readtokens.c tests/test-readtokens.sh tests/test-realloc-gnu.c + tests/test-regex.c tests/test-remove.c tests/test-rename.c tests/test-rename.h @@ -3746,6 +3790,7 @@ AC_DEFUN([gl_FILE_LIST], [ tests/test-stat-time.c tests/test-stat.c tests/test-stat.h + tests/test-statat.c tests/test-stdalign.c tests/test-stdbool.c tests/test-stddef.c @@ -3758,7 +3803,6 @@ AC_DEFUN([gl_FILE_LIST], [ tests/test-strftime.c tests/test-striconv.c tests/test-string.c - tests/test-strings.c tests/test-strncat.c tests/test-strnlen.c tests/test-strsignal.c diff --git a/m4/group-member.m4 b/m4/group-member.m4 index c393b5b1..eb8dc62c 100644 --- a/m4/group-member.m4 +++ b/m4/group-member.m4 @@ -1,6 +1,6 @@ # serial 14 -# Copyright (C) 1999-2001, 2003-2007, 2009-2012 Free Software Foundation, Inc. +# Copyright (C) 1999-2001, 2003-2007, 2009-2013 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 b999d08e..6dac16bb 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-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 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. diff --git a/m4/host-os.m4 b/m4/host-os.m4 index f76f907c..771a0967 100644 --- a/m4/host-os.m4 +++ b/m4/host-os.m4 @@ -1,6 +1,6 @@ # serial 9 -# Copyright (C) 2001, 2003-2004, 2006, 2009-2012 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003-2004, 2006, 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. diff --git a/m4/hostent.m4 b/m4/hostent.m4 index 51347755..72be876b 100644 --- a/m4/hostent.m4 +++ b/m4/hostent.m4 @@ -1,5 +1,5 @@ # hostent.m4 serial 2 -dnl Copyright (C) 2008, 2010-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2008, 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. diff --git a/m4/human.m4 b/m4/human.m4 index 7129255c..f1529057 100644 --- a/m4/human.m4 +++ b/m4/human.m4 @@ -1,5 +1,5 @@ #serial 11 -dnl Copyright (C) 2002-2006, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 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. diff --git a/m4/i-ring.m4 b/m4/i-ring.m4 index 3453b9e9..9f7b3463 100644 --- a/m4/i-ring.m4 +++ b/m4/i-ring.m4 @@ -1,5 +1,5 @@ # serial 2 -dnl Copyright (C) 2006, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 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. diff --git a/m4/iconv.m4 b/m4/iconv.m4 index 6a47236c..a5036465 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-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2000-2002, 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. diff --git a/m4/iconv_h.m4 b/m4/iconv_h.m4 index aa86cf8f..f0519d9c 100644 --- a/m4/iconv_h.m4 +++ b/m4/iconv_h.m4 @@ -1,5 +1,5 @@ # iconv_h.m4 serial 8 -dnl Copyright (C) 2007-2012 Free Software Foundation, Inc. +dnl Copyright (C) 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. diff --git a/m4/iconv_open.m4 b/m4/iconv_open.m4 index 07f48491..1dcf4149 100644 --- a/m4/iconv_open.m4 +++ b/m4/iconv_open.m4 @@ -1,5 +1,5 @@ # iconv_open.m4 serial 14 -dnl Copyright (C) 2007-2012 Free Software Foundation, Inc. +dnl Copyright (C) 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. diff --git a/m4/idcache.m4 b/m4/idcache.m4 index 522b51e9..90e71bce 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-2012 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2013 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 74f9713f..52a8acd8 100644 --- a/m4/include-exclude-prog.m4 +++ b/m4/include-exclude-prog.m4 @@ -1,5 +1,5 @@ #serial 2 -dnl Copyright (C) 2007-2012 Free Software Foundation, Inc. +dnl Copyright (C) 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. diff --git a/m4/include_next.m4 b/m4/include_next.m4 index a60a2614..108d9456 100644 --- a/m4/include_next.m4 +++ b/m4/include_next.m4 @@ -1,5 +1,5 @@ # include_next.m4 serial 23 -dnl Copyright (C) 2006-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2006-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. diff --git a/m4/inet_ntop.m4 b/m4/inet_ntop.m4 index 1ebd9603..476f063f 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-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2005-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. diff --git a/m4/inet_pton.m4 b/m4/inet_pton.m4 index e7b44e28..e86db827 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-2012 Free Software Foundation, Inc. +dnl Copyright (C) 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. diff --git a/m4/inline.m4 b/m4/inline.m4 index 6fa99724..3a50621e 100644 --- a/m4/inline.m4 +++ b/m4/inline.m4 @@ -1,5 +1,5 @@ # inline.m4 serial 4 -dnl Copyright (C) 2006, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 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. diff --git a/m4/intlmacosx.m4 b/m4/intlmacosx.m4 index dc2ddfed..ab97d39f 100644 --- a/m4/intlmacosx.m4 +++ b/m4/intlmacosx.m4 @@ -1,5 +1,5 @@ -# intlmacosx.m4 serial 4 (gettext-0.18.2) -dnl Copyright (C) 2004-2012 Free Software Foundation, Inc. +# intlmacosx.m4 serial 5 (gettext-0.18.2) +dnl Copyright (C) 2004-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. @@ -13,11 +13,11 @@ dnl by the GNU Library General Public License, and the rest of the GNU dnl gettext package package is covered by the GNU General Public License. dnl They are *not* in the public domain. -dnl Checks for special options needed on MacOS X. +dnl Checks for special options needed on Mac OS X. dnl Defines INTL_MACOSX_LIBS. AC_DEFUN([gt_INTL_MACOSX], [ - dnl Check for API introduced in MacOS X 10.2. + dnl Check for API introduced in Mac OS X 10.2. AC_CACHE_CHECK([for CFPreferencesCopyAppValue], [gt_cv_func_CFPreferencesCopyAppValue], [gt_save_LIBS="$LIBS" @@ -31,9 +31,9 @@ AC_DEFUN([gt_INTL_MACOSX], LIBS="$gt_save_LIBS"]) if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1], - [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) + [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) fi - dnl Check for API introduced in MacOS X 10.3. + dnl Check for API introduced in Mac OS X 10.3. AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent], [gt_save_LIBS="$LIBS" LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" @@ -46,7 +46,7 @@ AC_DEFUN([gt_INTL_MACOSX], LIBS="$gt_save_LIBS"]) if test $gt_cv_func_CFLocaleCopyCurrent = yes; then AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1], - [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) + [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) fi INTL_MACOSX_LIBS= if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then diff --git a/m4/intmax_t.m4 b/m4/intmax_t.m4 index c1a4a75d..6ea70531 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-2012 Free Software Foundation, +dnl Copyright (C) 1997-2004, 2006-2007, 2009-2013 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 850451fd..1a0ce74d 100644 --- a/m4/inttostr.m4 +++ b/m4/inttostr.m4 @@ -1,5 +1,5 @@ #serial 8 -dnl Copyright (C) 2004-2006, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2004-2006, 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. diff --git a/m4/inttypes-pri.m4 b/m4/inttypes-pri.m4 index 977206fa..e5a1e057 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-2012 Free Software Foundation, Inc. +dnl Copyright (C) 1997-2002, 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. diff --git a/m4/inttypes.m4 b/m4/inttypes.m4 index eec4f41d..3b483d39 100644 --- a/m4/inttypes.m4 +++ b/m4/inttypes.m4 @@ -1,5 +1,5 @@ # inttypes.m4 serial 26 -dnl Copyright (C) 2006-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2006-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. diff --git a/m4/inttypes_h.m4 b/m4/inttypes_h.m4 index 91c7bca6..5f05ac58 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-2012 Free Software Foundation, Inc. +dnl Copyright (C) 1997-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. diff --git a/m4/ioctl.m4 b/m4/ioctl.m4 index ec0b7289..1463af42 100644 --- a/m4/ioctl.m4 +++ b/m4/ioctl.m4 @@ -1,5 +1,5 @@ # ioctl.m4 serial 4 -dnl Copyright (C) 2008-2012 Free Software Foundation, Inc. +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. diff --git a/m4/isapipe.m4 b/m4/isapipe.m4 index 33d33922..2c94aef9 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-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 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, diff --git a/m4/isatty.m4 b/m4/isatty.m4 index 6f81d18e..cac82311 100644 --- a/m4/isatty.m4 +++ b/m4/isatty.m4 @@ -1,5 +1,5 @@ -# isatty.m4 serial 2 -dnl Copyright (C) 2012 Free Software Foundation, Inc. +# isatty.m4 serial 3 +dnl Copyright (C) 2012-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. @@ -16,6 +16,4 @@ AC_DEFUN([gl_FUNC_ISATTY], ]) # Prerequisites of lib/isatty.c. -AC_DEFUN([gl_PREREQ_ISATTY], [ - AC_REQUIRE([AC_C_INLINE]) -]) +AC_DEFUN([gl_PREREQ_ISATTY], [:]) diff --git a/m4/isblank.m4 b/m4/isblank.m4 index 98e926dc..9d98cf34 100644 --- a/m4/isblank.m4 +++ b/m4/isblank.m4 @@ -1,5 +1,5 @@ # isblank.m4 serial 3 -dnl Copyright (C) 2009-2012 Free Software Foundation, Inc. +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. diff --git a/m4/isnand.m4 b/m4/isnand.m4 index 54b64a45..ee05e0f9 100644 --- a/m4/isnand.m4 +++ b/m4/isnand.m4 @@ -1,5 +1,5 @@ # isnand.m4 serial 11 -dnl Copyright (C) 2007-2012 Free Software Foundation, Inc. +dnl Copyright (C) 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. diff --git a/m4/isnanf.m4 b/m4/isnanf.m4 index 97f638a9..f01886a6 100644 --- a/m4/isnanf.m4 +++ b/m4/isnanf.m4 @@ -1,5 +1,5 @@ # isnanf.m4 serial 14 -dnl Copyright (C) 2007-2012 Free Software Foundation, Inc. +dnl Copyright (C) 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. diff --git a/m4/isnanl.m4 b/m4/isnanl.m4 index 81469ab8..ed5bbf8b 100644 --- a/m4/isnanl.m4 +++ b/m4/isnanl.m4 @@ -1,5 +1,5 @@ # isnanl.m4 serial 17 -dnl Copyright (C) 2007-2012 Free Software Foundation, Inc. +dnl Copyright (C) 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. diff --git a/m4/iswblank.m4 b/m4/iswblank.m4 index 8e63a034..b7364970 100644 --- a/m4/iswblank.m4 +++ b/m4/iswblank.m4 @@ -1,5 +1,5 @@ # iswblank.m4 serial 4 -dnl Copyright (C) 2011-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2011-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. diff --git a/m4/jm-macros.m4 b/m4/jm-macros.m4 index 016172f0..3f95def8 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-2012 Free Software Foundation, Inc. +# Copyright (C) 1998-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 @@ -64,7 +64,7 @@ AC_DEFUN([coreutils_MACROS], # Used by sort.c. AC_CHECK_FUNCS_ONCE([nl_langinfo]) # Used by timeout.c - AC_CHECK_FUNCS_ONCE([setrlimit]) + AC_CHECK_FUNCS_ONCE([setrlimit prctl]) # Used by tail.c. AC_CHECK_FUNCS([inotify_init], diff --git a/m4/jm-winsz1.m4 b/m4/jm-winsz1.m4 index 67b0e6cd..2d99cab3 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-2012 Free Software +# Copyright (C) 1996, 1999, 2001-2002, 2004, 2006, 2009-2013 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 433be072..626ab133 100644 --- a/m4/jm-winsz2.m4 +++ b/m4/jm-winsz2.m4 @@ -1,6 +1,6 @@ # serial 7 -# Copyright (C) 1996, 1999, 2001, 2004, 2009-2012 Free Software Foundation, +# Copyright (C) 1996, 1999, 2001, 2004, 2009-2013 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 b93fe706..73bef8bc 100644 --- a/m4/langinfo_h.m4 +++ b/m4/langinfo_h.m4 @@ -1,5 +1,5 @@ # langinfo_h.m4 serial 7 -dnl Copyright (C) 2009-2012 Free Software Foundation, Inc. +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. diff --git a/m4/largefile.m4 b/m4/largefile.m4 index a159f4ab..1e605e3d 100644 --- a/m4/largefile.m4 +++ b/m4/largefile.m4 @@ -1,13 +1,14 @@ # Enable large files on systems where this is not the default. -# Copyright 1992-1996, 1998-2012 Free Software Foundation, Inc. +# Copyright 1992-1996, 1998-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. -# The following implementation works around a problem in autoconf <= 2.68; -# AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5. -m4_version_prereq([2.69], [] ,[ +# The following implementation works around a problem in autoconf <= 2.69; +# AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5, +# or configures them incorrectly in some cases. +m4_version_prereq([2.70], [] ,[ # _AC_SYS_LARGEFILE_TEST_INCLUDES # ------------------------------- @@ -25,9 +26,9 @@ m4_define([_AC_SYS_LARGEFILE_TEST_INCLUDES], # _AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, -# CACHE-VAR, -# DESCRIPTION, -# PROLOGUE, [FUNCTION-BODY]) +# CACHE-VAR, +# DESCRIPTION, +# PROLOGUE, [FUNCTION-BODY]) # -------------------------------------------------------- m4_define([_AC_SYS_LARGEFILE_MACRO_VALUE], [AC_CACHE_CHECK([for $1 value needed for large files], [$3], @@ -93,15 +94,11 @@ if test "$enable_largefile" != no; then [_AC_SYS_LARGEFILE_TEST_INCLUDES]) fi - AH_VERBATIM([_DARWIN_USE_64_BIT_INODE], -[/* Enable large inode numbers on Mac OS X. */ -#ifndef _DARWIN_USE_64_BIT_INODE -# define _DARWIN_USE_64_BIT_INODE 1 -#endif]) + AC_DEFINE([_DARWIN_USE_64_BIT_INODE], [1], + [Enable large inode numbers on Mac OS X 10.5.]) fi ])# AC_SYS_LARGEFILE - -])# m4_version_prereq 2.69 +])# m4_version_prereq 2.70 # Enable large files on systems where this is implemented by Gnulib, not by the # system headers. @@ -136,7 +133,7 @@ AC_DEFUN([gl_LARGEFILE], *) dnl Nothing to do on gnulib's side. dnl A 64-bit off_t is - dnl - already the default on MacOS X, FreeBSD, NetBSD, OpenBSD, IRIX, + dnl - already the default on Mac OS X, FreeBSD, NetBSD, OpenBSD, IRIX, dnl OSF/1, Cygwin, dnl - enabled by _FILE_OFFSET_BITS=64 (ensured by AC_SYS_LARGEFILE) on dnl glibc, HP-UX, Solaris, diff --git a/m4/lchmod.m4 b/m4/lchmod.m4 index 7f76c56e..d2603708 100644 --- a/m4/lchmod.m4 +++ b/m4/lchmod.m4 @@ -1,6 +1,6 @@ #serial 3 -dnl Copyright (C) 2005-2006, 2008-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2005-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. diff --git a/m4/lchown.m4 b/m4/lchown.m4 index 4a247f41..9401d9f4 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-2012 Free Software Foundation, +dnl Copyright (C) 1998, 2001, 2003-2007, 2009-2013 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 4ed0eb6e..d62a175f 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-2012 Free Software Foundation, +dnl Copyright (C) 1995-2002, 2004-2005, 2008-2013 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 6d26b564..7a75b1be 100644 --- a/m4/ldexp.m4 +++ b/m4/ldexp.m4 @@ -1,5 +1,5 @@ # ldexp.m4 serial 1 -dnl Copyright (C) 2010-2012 Free Software Foundation, Inc. +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. diff --git a/m4/ldexpl.m4 b/m4/ldexpl.m4 index 11f20ca2..12237114 100644 --- a/m4/ldexpl.m4 +++ b/m4/ldexpl.m4 @@ -1,5 +1,5 @@ -# ldexpl.m4 serial 15 -dnl Copyright (C) 2007-2012 Free Software Foundation, Inc. +# ldexpl.m4 serial 16 +dnl Copyright (C) 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. @@ -14,7 +14,7 @@ AC_DEFUN([gl_FUNC_LDEXPL], AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) dnl Check whether it's declared. - dnl MacOS X 10.3 has ldexpl() in libc but doesn't declare it in <math.h>. + dnl Mac OS X 10.3 has ldexpl() in libc but doesn't declare it in <math.h>. AC_CHECK_DECL([ldexpl], , [HAVE_DECL_LDEXPL=0], [[#include <math.h>]]) LDEXPL_LIBM= @@ -87,7 +87,7 @@ AC_DEFUN([gl_CHECK_LDEXPL_NO_LIBM], ]) dnl Test whether ldexpl() works on finite numbers (this fails on AIX 5.1 -dnl and MacOS X 10.4/PowerPC). +dnl and Mac OS X 10.4/PowerPC). AC_DEFUN([gl_FUNC_LDEXPL_WORKS], [ AC_REQUIRE([AC_PROG_CC]) diff --git a/m4/lib-check.m4 b/m4/lib-check.m4 deleted file mode 100644 index a33c6231..00000000 --- a/m4/lib-check.m4 +++ /dev/null @@ -1,60 +0,0 @@ -#serial 11 - -dnl Misc lib-related macros for coreutils. - -# Copyright (C) 1993-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 -# 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. - -AC_DEFUN([cu_LIB_CHECK], -[ - - # Check for libypsec.a on Dolphin M88K machines. - AC_CHECK_LIB([ypsec], [main]) - - # m88k running dgux 5.4 needs this - AC_CHECK_LIB([ldgc], [main]) - - # The -lsun library is required for YP support on Irix-4.0.5 systems. - # m88k/svr3 DolphinOS systems using YP need -lypsec for id. - AC_SEARCH_LIBS([yp_match], [sun ypsec]) - - # SysV needs -lsec, older versions of Linux need -lshadow for - # shadow passwords. UnixWare 7 needs -lgen. - AC_SEARCH_LIBS([getspnam], [shadow sec gen]) - - AC_CHECK_HEADERS([shadow.h]) - - # Requirements for su.c. - shadow_includes="\ -$ac_includes_default -#if HAVE_SHADOW_H -# include <shadow.h> -#endif -" - AC_CHECK_MEMBERS([struct spwd.sp_pwdp],,,[$shadow_includes]) - AC_CHECK_FUNCS([getspnam]) - - # SCO-ODT-3.0 is reported to need -lufc for crypt. - # NetBSD needs -lcrypt for crypt. - LIB_CRYPT= - cu_saved_libs="$LIBS" - AC_SEARCH_LIBS([crypt], [ufc crypt], - [test "$ac_cv_search_crypt" = "none required" || - LIB_CRYPT="$ac_cv_search_crypt"]) - LIBS="$cu_saved_libs" - AC_SUBST([LIB_CRYPT]) -]) diff --git a/m4/lib-ignore.m4 b/m4/lib-ignore.m4 index 292c4691..0a642da6 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-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 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. diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4 index 4e1374d9..c145e478 100644 --- a/m4/lib-ld.m4 +++ b/m4/lib-ld.m4 @@ -1,33 +1,39 @@ -# lib-ld.m4 serial 5 (gettext-0.18.2) -dnl Copyright (C) 1996-2003, 2009-2012 Free Software Foundation, Inc. +# lib-ld.m4 serial 6 +dnl Copyright (C) 1996-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. dnl Subroutines of libtool.m4, -dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision -dnl with libtool.m4. +dnl with replacements s/_*LT_PATH/AC_LIB_PROG/ and s/lt_/acl_/ to avoid +dnl collision with libtool.m4. -dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. +dnl From libtool-2.4. Sets the variable with_gnu_ld to yes or no. AC_DEFUN([AC_LIB_PROG_LD_GNU], [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld], -[# I'd rather use --version here, but apparently some GNU ld's only accept -v. +[# I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 </dev/null` in *GNU* | *'with BFD'*) - acl_cv_prog_gnu_ld=yes ;; + acl_cv_prog_gnu_ld=yes + ;; *) - acl_cv_prog_gnu_ld=no ;; + acl_cv_prog_gnu_ld=no + ;; esac]) with_gnu_ld=$acl_cv_prog_gnu_ld ]) -dnl From libtool-1.4. Sets the variable LD. +dnl From libtool-2.4. Sets the variable LD. AC_DEFUN([AC_LIB_PROG_LD], -[AC_ARG_WITH([gnu-ld], -[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], -test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) -AC_REQUIRE([AC_PROG_CC])dnl +[AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl + +AC_ARG_WITH([gnu-ld], + [AS_HELP_STRING([--with-gnu-ld], + [assume the C compiler uses GNU ld [default=no]])], + [test "$withval" = no || with_gnu_ld=yes], + [with_gnu_ld=no])dnl + # Prepare PATH_SEPARATOR. # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then @@ -40,10 +46,11 @@ if test "${PATH_SEPARATOR+set}" != set; then || PATH_SEPARATOR=';' } fi + ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - AC_MSG_CHECKING([for ld used by GCC]) + AC_MSG_CHECKING([for ld used by $CC]) case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -53,11 +60,11 @@ if test "$GCC" = yes; then esac case $ac_prog in # Accept absolute paths. - [[\\/]* | [A-Za-z]:[\\/]*)] - [re_direlt='/[^/][^/]*/\.\./'] - # Canonicalize the path of ld - ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do + [[\\/]]* | ?:[[\\/]]*) + re_direlt='/[[^/]][[^/]]*/\.\./' + # Canonicalize the pathname of ld + ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'` + while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` done test -z "$LD" && LD="$ac_prog" @@ -78,23 +85,26 @@ else fi AC_CACHE_VAL([acl_cv_path_LD], [if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" + acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do + IFS="$acl_save_ifs" test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then acl_cv_path_LD="$ac_dir/$ac_prog" # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. + # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in + case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in *GNU* | *'with BFD'*) - test "$with_gnu_ld" != no && break ;; + test "$with_gnu_ld" != no && break + ;; *) - test "$with_gnu_ld" != yes && break ;; + test "$with_gnu_ld" != yes && break + ;; esac fi done - IFS="$ac_save_ifs" + IFS="$acl_save_ifs" else acl_cv_path_LD="$LD" # Let the user override the test with a path. fi]) diff --git a/m4/lib-link.m4 b/m4/lib-link.m4 index d11b4b43..073f0405 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-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2001-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. diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4 index 007aa053..60908e8f 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-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2005, 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. diff --git a/m4/libunistring-base.m4 b/m4/libunistring-base.m4 index d91c42b9..d105c721 100644 --- a/m4/libunistring-base.m4 +++ b/m4/libunistring-base.m4 @@ -1,5 +1,5 @@ # libunistring-base.m4 serial 5 -dnl Copyright (C) 2010-2012 Free Software Foundation, Inc. +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. diff --git a/m4/link-follow.m4 b/m4/link-follow.m4 index 309e4274..35c4fced 100644 --- a/m4/link-follow.m4 +++ b/m4/link-follow.m4 @@ -1,8 +1,8 @@ -# serial 18 +# serial 19 dnl Run a program to determine whether link(2) follows symlinks. dnl Set LINK_FOLLOWS_SYMLINKS accordingly. -# Copyright (C) 1999-2001, 2004-2006, 2009-2012 Free Software Foundation, Inc. +# Copyright (C) 1999-2001, 2004-2006, 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. @@ -83,7 +83,7 @@ AC_DEFUN([gl_FUNC_LINK_FOLLOWS_SYMLINK], [gl_cv_func_link_follows_symlink=no], dnl GNU behavior [gl_cv_func_link_follows_symlink=yes], dnl Followed link/compile failed [dnl We're cross compiling. - dnl The past results are "yes" on MacOS X, FreeBSD, NetBSD, + dnl The past results are "yes" on Mac OS X, FreeBSD, NetBSD, dnl OpenBSD, Minix, AIX, HP-UX, OSF/1, and "no" on Linux, Cygwin. case "$host_os" in # On glibc/Linux we know the result. diff --git a/m4/link.m4 b/m4/link.m4 index 0f3d4fc8..7cc0ceb9 100644 --- a/m4/link.m4 +++ b/m4/link.m4 @@ -1,5 +1,5 @@ # link.m4 serial 8 -dnl Copyright (C) 2009-2012 Free Software Foundation, Inc. +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. diff --git a/m4/linkat.m4 b/m4/linkat.m4 index b0b7d7bd..b561ddad 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-2012 Free Software Foundation, Inc. +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. diff --git a/m4/localcharset.m4 b/m4/localcharset.m4 index 8010379b..2e93e581 100644 --- a/m4/localcharset.m4 +++ b/m4/localcharset.m4 @@ -1,5 +1,5 @@ # localcharset.m4 serial 7 -dnl Copyright (C) 2002, 2004, 2006, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2004, 2006, 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. diff --git a/m4/locale-fr.m4 b/m4/locale-fr.m4 index 04d801f2..ef199e39 100644 --- a/m4/locale-fr.m4 +++ b/m4/locale-fr.m4 @@ -1,5 +1,5 @@ -# locale-fr.m4 serial 16 -dnl Copyright (C) 2003, 2005-2012 Free Software Foundation, Inc. +# locale-fr.m4 serial 17 +dnl Copyright (C) 2003, 2005-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. @@ -37,7 +37,7 @@ int main () { if (setlocale (LC_ALL, "") == NULL) return 1; #endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". - On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, @@ -92,7 +92,7 @@ changequote([,])dnl ;; *) # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the # configure script would override the LC_ALL setting. Likewise for # LC_CTYPE, which is also set at the beginning of the configure script. # Test for the usual locale name. @@ -165,7 +165,7 @@ int main () { if (setlocale (LC_ALL, "") == NULL) return 1; # endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". - On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, @@ -220,7 +220,7 @@ changequote([,])dnl ;; *) # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the # configure script would override the LC_ALL setting. Likewise for # LC_CTYPE, which is also set at the beginning of the configure script. # Test for the usual locale name. diff --git a/m4/locale-ja.m4 b/m4/locale-ja.m4 index 201ac4e7..132a3e77 100644 --- a/m4/locale-ja.m4 +++ b/m4/locale-ja.m4 @@ -1,5 +1,5 @@ -# locale-ja.m4 serial 11 -dnl Copyright (C) 2003, 2005-2012 Free Software Foundation, Inc. +# locale-ja.m4 serial 12 +dnl Copyright (C) 2003, 2005-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. @@ -39,7 +39,7 @@ int main () if (setlocale (LC_ALL, "") == NULL) return 1; #endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". - On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, @@ -91,7 +91,7 @@ changequote([,])dnl ;; *) # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the # configure script would override the LC_ALL setting. Likewise for # LC_CTYPE, which is also set at the beginning of the configure script. # Test for the AIX locale name. diff --git a/m4/locale-tr.m4 b/m4/locale-tr.m4 index 26b2ba26..aeb56156 100644 --- a/m4/locale-tr.m4 +++ b/m4/locale-tr.m4 @@ -1,5 +1,5 @@ -# locale-tr.m4 serial 9 -dnl Copyright (C) 2003, 2005-2012 Free Software Foundation, Inc. +# locale-tr.m4 serial 10 +dnl Copyright (C) 2003, 2005-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. @@ -42,7 +42,7 @@ int main () { if (setlocale (LC_ALL, "") == NULL) return 1; #endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". - On MacOS X 10.3.5 (Darwin 7.5) in the tr_TR locale, nl_langinfo(CODESET) + On Mac OS X 10.3.5 (Darwin 7.5) in the tr_TR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, @@ -95,7 +95,7 @@ changequote([,])dnl ;; *) # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the # configure script would override the LC_ALL setting. Likewise for # LC_CTYPE, which is also set at the beginning of the configure script. # Test for the usual locale name. diff --git a/m4/locale-zh.m4 b/m4/locale-zh.m4 index 0cf5adac..4eed73f4 100644 --- a/m4/locale-zh.m4 +++ b/m4/locale-zh.m4 @@ -1,5 +1,5 @@ -# locale-zh.m4 serial 11 -dnl Copyright (C) 2003, 2005-2012 Free Software Foundation, Inc. +# locale-zh.m4 serial 12 +dnl Copyright (C) 2003, 2005-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. @@ -40,7 +40,7 @@ int main () if (setlocale (LC_ALL, "") == NULL) return 1; #endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". - On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, @@ -101,7 +101,7 @@ changequote([,])dnl ;; *) # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the # configure script would override the LC_ALL setting. Likewise for # LC_CTYPE, which is also set at the beginning of the configure script. # Test for the locale name without encoding suffix. diff --git a/m4/locale_h.m4 b/m4/locale_h.m4 index fb72e4e5..8bd12e80 100644 --- a/m4/locale_h.m4 +++ b/m4/locale_h.m4 @@ -1,5 +1,5 @@ -# locale_h.m4 serial 18 -dnl Copyright (C) 2007, 2009-2012 Free Software Foundation, Inc. +# locale_h.m4 serial 19 +dnl Copyright (C) 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. @@ -42,7 +42,7 @@ AC_DEFUN([gl_LOCALE_H], if test $ac_cv_header_xlocale_h = yes; then HAVE_XLOCALE_H=1 dnl Check whether use of locale_t requires inclusion of <xlocale.h>, - dnl e.g. on MacOS X 10.5. If <locale.h> does not define locale_t by + dnl e.g. on Mac OS X 10.5. If <locale.h> does not define locale_t by dnl itself, we assume that <xlocale.h> will do so. AC_CACHE_CHECK([whether locale.h defines locale_t], [gl_cv_header_locale_has_locale_t], diff --git a/m4/localeconv.m4 b/m4/localeconv.m4 index 5fae06d8..b8bb5964 100644 --- a/m4/localeconv.m4 +++ b/m4/localeconv.m4 @@ -1,5 +1,5 @@ # localeconv.m4 serial 1 -dnl Copyright (C) 2012 Free Software Foundation, Inc. +dnl Copyright (C) 2012-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. diff --git a/m4/localename.m4 b/m4/localename.m4 index 2ba295eb..361ed73e 100644 --- a/m4/localename.m4 +++ b/m4/localename.m4 @@ -1,5 +1,5 @@ # localename.m4 serial 2 -dnl Copyright (C) 2007, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 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. diff --git a/m4/lock.m4 b/m4/lock.m4 index c0a62060..d3fc1eff 100644 --- a/m4/lock.m4 +++ b/m4/lock.m4 @@ -1,5 +1,5 @@ -# lock.m4 serial 11 (gettext-0.18.2) -dnl Copyright (C) 2005-2012 Free Software Foundation, Inc. +# lock.m4 serial 13 (gettext-0.18.2) +dnl Copyright (C) 2005-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. @@ -10,7 +10,7 @@ AC_DEFUN([gl_LOCK], [ AC_REQUIRE([gl_THREADLIB]) if test "$gl_threads_api" = posix; then - # OSF/1 4.0 and MacOS X 10.1 lack the pthread_rwlock_t type and the + # OSF/1 4.0 and Mac OS X 10.1 lack the pthread_rwlock_t type and the # pthread_rwlock_* functions. AC_CHECK_TYPE([pthread_rwlock_t], [AC_DEFINE([HAVE_PTHREAD_RWLOCK], [1], @@ -35,7 +35,5 @@ return !x; gl_PREREQ_LOCK ]) -# Prerequisites of lib/lock.c. -AC_DEFUN([gl_PREREQ_LOCK], [ - AC_REQUIRE([AC_C_INLINE]) -]) +# Prerequisites of lib/glthread/lock.c. +AC_DEFUN([gl_PREREQ_LOCK], [:]) diff --git a/m4/longlong.m4 b/m4/longlong.m4 index b9c65c75..3af6ab5a 100644 --- a/m4/longlong.m4 +++ b/m4/longlong.m4 @@ -1,5 +1,5 @@ # longlong.m4 serial 17 -dnl Copyright (C) 1999-2007, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 1999-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. diff --git a/m4/ls-mntd-fs.m4 b/m4/ls-mntd-fs.m4 index 51954dad..fb116c8b 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-2012 Free Software Foundation, Inc. +# Copyright (C) 1998-2004, 2006, 2009-2013 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/lseek.m4 b/m4/lseek.m4 index bdda7f65..df9302af 100644 --- a/m4/lseek.m4 +++ b/m4/lseek.m4 @@ -1,5 +1,5 @@ # lseek.m4 serial 10 -dnl Copyright (C) 2007, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 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. diff --git a/m4/lstat.m4 b/m4/lstat.m4 index b7335bda..5f4db64a 100644 --- a/m4/lstat.m4 +++ b/m4/lstat.m4 @@ -1,6 +1,6 @@ -# serial 25 +# serial 26 -# Copyright (C) 1997-2001, 2003-2012 Free Software Foundation, Inc. +# Copyright (C) 1997-2001, 2003-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -27,11 +27,7 @@ AC_DEFUN([gl_FUNC_LSTAT], ]) # Prerequisites of lib/lstat.c. -AC_DEFUN([gl_PREREQ_LSTAT], -[ - AC_REQUIRE([AC_C_INLINE]) - : -]) +AC_DEFUN([gl_PREREQ_LSTAT], [:]) AC_DEFUN([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK], [ diff --git a/m4/malloc.m4 b/m4/malloc.m4 index 8fa48e93..4b24a0b1 100644 --- a/m4/malloc.m4 +++ b/m4/malloc.m4 @@ -1,5 +1,5 @@ # malloc.m4 serial 14 -dnl Copyright (C) 2007, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 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. diff --git a/m4/malloca.m4 b/m4/malloca.m4 index 7841979f..791ce10d 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-2012 Free Software Foundation, +dnl Copyright (C) 2003-2004, 2006-2007, 2009-2013 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 fd0e3722..45a30afd 100644 --- a/m4/manywarnings.m4 +++ b/m4/manywarnings.m4 @@ -1,5 +1,5 @@ -# manywarnings.m4 serial 3 -dnl Copyright (C) 2008-2012 Free Software Foundation, Inc. +# manywarnings.m4 serial 5 +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. @@ -35,14 +35,12 @@ AC_DEFUN([gl_MANYWARN_COMPLEMENT], # make sure your gcc understands it. AC_DEFUN([gl_MANYWARN_ALL_GCC], [ - dnl First, check if -Wno-missing-field-initializers is needed. - dnl -Wmissing-field-initializers is implied by -W, but that issues - dnl warnings with GCC version before 4.7, for the common idiom - dnl of initializing types on the stack to zero, using { 0, } + dnl First, check for some issues that only occur when combining multiple + dnl gcc warning categories. AC_REQUIRE([AC_PROG_CC]) if test -n "$GCC"; then - dnl First, check -W -Werror -Wno-missing-field-initializers is supported + dnl Check if -W -Werror -Wno-missing-field-initializers is supported dnl with the current $CC $CFLAGS $CPPFLAGS. AC_MSG_CHECKING([whether -Wno-missing-field-initializers is supported]) AC_CACHE_VAL([gl_cv_cc_nomfi_supported], [ @@ -77,108 +75,150 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC], ]) AC_MSG_RESULT([$gl_cv_cc_nomfi_needed]) fi + + dnl Next, check if -Werror -Wuninitialized is useful with the + dnl user's choice of $CFLAGS; some versions of gcc warn that it + dnl has no effect if -O is not also used + AC_MSG_CHECKING([whether -Wuninitialized is supported]) + AC_CACHE_VAL([gl_cv_cc_uninitialized_supported], [ + gl_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Werror -Wuninitialized" + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[]], [[]])], + [gl_cv_cc_uninitialized_supported=yes], + [gl_cv_cc_uninitialized_supported=no]) + CFLAGS="$gl_save_CFLAGS"]) + AC_MSG_RESULT([$gl_cv_cc_uninitialized_supported]) + fi + # List all gcc warning categories. gl_manywarn_set= for gl_manywarn_item in \ - -Wall \ -W \ - -Wformat-y2k \ - -Wformat-nonliteral \ - -Wformat-security \ - -Winit-self \ - -Wmissing-include-dirs \ - -Wswitch-default \ - -Wswitch-enum \ - -Wunused \ - -Wunknown-pragmas \ - -Wstrict-aliasing \ - -Wstrict-overflow \ - -Wsystem-headers \ - -Wfloat-equal \ - -Wtraditional \ - -Wtraditional-conversion \ - -Wdeclaration-after-statement \ - -Wundef \ - -Wshadow \ - -Wunsafe-loop-optimizations \ - -Wpointer-arith \ + -Wabi \ + -Waddress \ + -Wall \ + -Warray-bounds \ + -Wattributes \ -Wbad-function-cast \ - -Wc++-compat \ - -Wcast-qual \ - -Wcast-align \ - -Wwrite-strings \ - -Wconversion \ - -Wsign-conversion \ - -Wlogical-op \ - -Waggregate-return \ - -Wstrict-prototypes \ - -Wold-style-definition \ - -Wmissing-prototypes \ - -Wmissing-declarations \ - -Wmissing-noreturn \ - -Wmissing-format-attribute \ - -Wpacked \ - -Wpadded \ - -Wredundant-decls \ - -Wnested-externs \ - -Wunreachable-code \ - -Winline \ - -Winvalid-pch \ - -Wlong-long \ - -Wvla \ - -Wvolatile-register-var \ - -Wdisabled-optimization \ - -Wstack-protector \ - -Woverlength-strings \ -Wbuiltin-macro-redefined \ - -Wmudflap \ - -Wpacked-bitfield-compat \ - -Wsync-nand \ - ; do - gl_manywarn_set="$gl_manywarn_set $gl_manywarn_item" - done - # The following are not documented in the manual but are included in - # output from gcc --help=warnings. - for gl_manywarn_item in \ - -Wattributes \ + -Wcast-align \ + -Wchar-subscripts \ + -Wclobbered \ + -Wcomment \ + -Wcomments \ -Wcoverage-mismatch \ - -Wmultichar \ - -Wunused-macros \ - ; do - gl_manywarn_set="$gl_manywarn_set $gl_manywarn_item" - done - # More warnings from gcc 4.6.2 --help=warnings. - for gl_manywarn_item in \ - -Wabi \ -Wcpp \ -Wdeprecated \ -Wdeprecated-declarations \ + -Wdisabled-optimization \ -Wdiv-by-zero \ -Wdouble-promotion \ + -Wempty-body \ -Wendif-labels \ + -Wenum-compare \ -Wextra \ -Wformat-contains-nul \ -Wformat-extra-args \ + -Wformat-nonliteral \ + -Wformat-security \ + -Wformat-y2k \ -Wformat-zero-length \ -Wformat=2 \ + -Wfree-nonheap-object \ + -Wignored-qualifiers \ + -Wimplicit \ + -Wimplicit-function-declaration \ + -Wimplicit-int \ + -Winit-self \ + -Winline \ + -Wint-to-pointer-cast \ + -Winvalid-memory-model \ + -Winvalid-pch \ + -Wjump-misses-init \ + -Wlogical-op \ + -Wmain \ + -Wmaybe-uninitialized \ + -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 \ + -Wnonnull \ -Wnormalized=nfc \ + -Wold-style-declaration \ + -Wold-style-definition \ -Woverflow \ + -Woverlength-strings \ + -Woverride-init \ + -Wpacked \ + -Wpacked-bitfield-compat \ + -Wparentheses \ + -Wpointer-arith \ + -Wpointer-sign \ -Wpointer-to-int-cast \ -Wpragmas \ + -Wreturn-type \ + -Wsequence-point \ + -Wshadow \ + -Wsizeof-pointer-memaccess \ + -Wstack-protector \ + -Wstrict-aliasing \ + -Wstrict-overflow \ + -Wstrict-prototypes \ -Wsuggest-attribute=const \ + -Wsuggest-attribute=format \ -Wsuggest-attribute=noreturn \ -Wsuggest-attribute=pure \ + -Wswitch \ + -Wswitch-default \ + -Wsync-nand \ + -Wsystem-headers \ -Wtrampolines \ + -Wtrigraphs \ + -Wtype-limits \ + -Wuninitialized \ + -Wunknown-pragmas \ + -Wunreachable-code \ + -Wunsafe-loop-optimizations \ + -Wunused \ + -Wunused-but-set-parameter \ + -Wunused-but-set-variable \ + -Wunused-function \ + -Wunused-label \ + -Wunused-local-typedefs \ + -Wunused-macros \ + -Wunused-parameter \ + -Wunused-result \ + -Wunused-value \ + -Wunused-variable \ + -Wvarargs \ + -Wvariadic-macros \ + -Wvector-operation-performance \ + -Wvla \ + -Wvolatile-register-var \ + -Wwrite-strings \ + \ ; do gl_manywarn_set="$gl_manywarn_set $gl_manywarn_item" done - # Disable the missing-field-initializers warning if needed + # Disable specific options as needed. if test "$gl_cv_cc_nomfi_needed" = yes; then gl_manywarn_set="$gl_manywarn_set -Wno-missing-field-initializers" fi + if test "$gl_cv_cc_uninitialized_supported" = no; then + gl_manywarn_set="$gl_manywarn_set -Wno-uninitialized" + fi + $1=$gl_manywarn_set ]) diff --git a/m4/math_h.m4 b/m4/math_h.m4 index 90d248ae..bf0845fd 100644 --- a/m4/math_h.m4 +++ b/m4/math_h.m4 @@ -1,5 +1,5 @@ -# math_h.m4 serial 113 -dnl Copyright (C) 2007-2012 Free Software Foundation, Inc. +# math_h.m4 serial 114 +dnl Copyright (C) 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. @@ -8,7 +8,6 @@ AC_DEFUN([gl_MATH_H], [ AC_REQUIRE([gl_MATH_H_DEFAULTS]) gl_CHECK_NEXT_HEADERS([math.h]) - AC_REQUIRE([AC_C_INLINE]) AC_CACHE_CHECK([whether NAN macro works], [gl_cv_header_math_nan_works], [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <math.h>]], diff --git a/m4/mbchar.m4 b/m4/mbchar.m4 index 77af4b4a..b18ecef1 100644 --- a/m4/mbchar.m4 +++ b/m4/mbchar.m4 @@ -1,5 +1,5 @@ -# mbchar.m4 serial 8 -dnl Copyright (C) 2005-2007, 2009-2012 Free Software Foundation, Inc. +# mbchar.m4 serial 9 +dnl Copyright (C) 2005-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. @@ -10,5 +10,4 @@ dnl From Bruno Haible. AC_DEFUN([gl_MBCHAR], [ AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) - AC_REQUIRE([AC_C_INLINE]) ]) diff --git a/m4/mbiter.m4 b/m4/mbiter.m4 index 42e05b82..9b5fceda 100644 --- a/m4/mbiter.m4 +++ b/m4/mbiter.m4 @@ -1,5 +1,5 @@ -# mbiter.m4 serial 6 -dnl Copyright (C) 2005, 2008-2012 Free Software Foundation, Inc. +# mbiter.m4 serial 7 +dnl Copyright (C) 2005, 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. @@ -9,7 +9,6 @@ dnl From Bruno Haible. AC_DEFUN([gl_MBITER], [ - AC_REQUIRE([AC_C_INLINE]) AC_REQUIRE([AC_TYPE_MBSTATE_T]) : ]) diff --git a/m4/mbrlen.m4 b/m4/mbrlen.m4 index 8bf07569..5e7a8b03 100644 --- a/m4/mbrlen.m4 +++ b/m4/mbrlen.m4 @@ -1,5 +1,5 @@ # mbrlen.m4 serial 8 -dnl Copyright (C) 2008, 2010-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2008, 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. diff --git a/m4/mbrtowc.m4 b/m4/mbrtowc.m4 index 8f829c8e..4c9f3886 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-2012 Free Software Foundation, +dnl Copyright (C) 2001-2002, 2004-2005, 2008-2013 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/mbsinit.m4 b/m4/mbsinit.m4 index da56c3d1..2e6d0921 100644 --- a/m4/mbsinit.m4 +++ b/m4/mbsinit.m4 @@ -1,5 +1,5 @@ # mbsinit.m4 serial 8 -dnl Copyright (C) 2008, 2010-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2008, 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. diff --git a/m4/mbslen.m4 b/m4/mbslen.m4 index 515d8079..b51b39f2 100644 --- a/m4/mbslen.m4 +++ b/m4/mbslen.m4 @@ -1,5 +1,5 @@ # mbslen.m4 serial 2 -dnl Copyright (C) 2010-2012 Free Software Foundation, Inc. +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. diff --git a/m4/mbsrtowcs.m4 b/m4/mbsrtowcs.m4 index a95f6064..c4934c28 100644 --- a/m4/mbsrtowcs.m4 +++ b/m4/mbsrtowcs.m4 @@ -1,5 +1,5 @@ # mbsrtowcs.m4 serial 13 -dnl Copyright (C) 2008-2012 Free Software Foundation, Inc. +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. diff --git a/m4/mbstate_t.m4 b/m4/mbstate_t.m4 index 61a8190c..ed001179 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-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2000-2002, 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. diff --git a/m4/mbswidth.m4 b/m4/mbswidth.m4 index e5d04572..39760fcd 100644 --- a/m4/mbswidth.m4 +++ b/m4/mbswidth.m4 @@ -1,5 +1,5 @@ # mbswidth.m4 serial 18 -dnl Copyright (C) 2000-2002, 2004, 2006-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2000-2002, 2004, 2006-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. diff --git a/m4/mbtowc.m4 b/m4/mbtowc.m4 index fec0d258..e4794619 100644 --- a/m4/mbtowc.m4 +++ b/m4/mbtowc.m4 @@ -1,5 +1,5 @@ # mbtowc.m4 serial 2 -dnl Copyright (C) 2011-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2011-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. diff --git a/m4/md5.m4 b/m4/md5.m4 index e22f7bdb..0ad6f504 100644 --- a/m4/md5.m4 +++ b/m4/md5.m4 @@ -1,5 +1,5 @@ -# md5.m4 serial 12 -dnl Copyright (C) 2002-2006, 2008-2012 Free Software Foundation, Inc. +# md5.m4 serial 13 +dnl Copyright (C) 2002-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. @@ -8,6 +8,5 @@ AC_DEFUN([gl_MD5], [ dnl Prerequisites of lib/md5.c. AC_REQUIRE([gl_BIGENDIAN]) - AC_REQUIRE([AC_C_INLINE]) : ]) diff --git a/m4/memcasecmp.m4 b/m4/memcasecmp.m4 index 46f29c86..d1118ea7 100644 --- a/m4/memcasecmp.m4 +++ b/m4/memcasecmp.m4 @@ -1,5 +1,5 @@ #serial 6 -dnl Copyright (C) 2005-2006, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2006, 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. diff --git a/m4/memchr.m4 b/m4/memchr.m4 index 00402945..2d8abe75 100644 --- a/m4/memchr.m4 +++ b/m4/memchr.m4 @@ -1,5 +1,5 @@ # memchr.m4 serial 12 -dnl Copyright (C) 2002-2004, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2004, 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. diff --git a/m4/memcoll.m4 b/m4/memcoll.m4 index 64098720..ae6ce464 100644 --- a/m4/memcoll.m4 +++ b/m4/memcoll.m4 @@ -1,11 +1,8 @@ -# memcoll.m4 serial 9 -dnl Copyright (C) 2002-2003, 2005-2006, 2009-2012 Free Software Foundation, +# memcoll.m4 serial 10 +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2013 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, dnl with or without modifications, as long as this notice is preserved. -AC_DEFUN([gl_MEMCOLL], -[ - AC_REQUIRE([AC_C_INLINE]) -]) +AC_DEFUN([gl_MEMCOLL], [:]) diff --git a/m4/mempcpy.m4 b/m4/mempcpy.m4 index c926941d..a48f2d10 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-2012 Free Software Foundation, +dnl Copyright (C) 2003-2004, 2006-2007, 2009-2013 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 3bcaf668..5920f574 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-2012 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2007, 2009-2013 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 7d881cb3..f6e4c402 100644 --- a/m4/mgetgroups.m4 +++ b/m4/mgetgroups.m4 @@ -1,5 +1,5 @@ #serial 5 -dnl Copyright (C) 2007-2012 Free Software Foundation, Inc. +dnl Copyright (C) 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. diff --git a/m4/mkancesdirs.m4 b/m4/mkancesdirs.m4 index 54de955f..cfcc3d9d 100644 --- a/m4/mkancesdirs.m4 +++ b/m4/mkancesdirs.m4 @@ -1,5 +1,5 @@ # Make a file's ancestor directories. -dnl Copyright (C) 2006, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 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. diff --git a/m4/mkdir-p.m4 b/m4/mkdir-p.m4 index 1ef59408..80f5fcee 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-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 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. diff --git a/m4/mkdir.m4 b/m4/mkdir.m4 index e4132509..bcbce18d 100644 --- a/m4/mkdir.m4 +++ b/m4/mkdir.m4 @@ -1,6 +1,6 @@ # serial 11 -# Copyright (C) 2001, 2003-2004, 2006, 2008-2012 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003-2004, 2006, 2008-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. diff --git a/m4/mkfifo.m4 b/m4/mkfifo.m4 index e39d6285..e571c64e 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-2012 Free Software Foundation, Inc. +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. diff --git a/m4/mknod.m4 b/m4/mknod.m4 index 79cf6fd5..478ee559 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-2012 Free Software Foundation, Inc. +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. @@ -25,9 +25,16 @@ AC_DEFUN([gl_FUNC_MKNOD], [AC_LANG_PROGRAM( [[#include <sys/stat.h> #include <unistd.h> + + /* Copied from root-uid.h. FIXME: Just use root-uid.h. */ + #ifdef __TANDEM + # define ROOT_UID 65535 + #else + # define ROOT_UID 0 + #endif ]], [[/* Indeterminate for super-user, assume no. Why are you running configure as root, anyway? */ - if (!geteuid ()) return 99; + if (geteuid () == ROOT_UID) return 99; if (mknod ("conftest.fifo", S_IFIFO | 0600, 0)) return 2;]])], [gl_cv_func_mknod_works=yes], [if test $? = 99 && test x"$FORCE_UNSAFE_CONFIGURE" = x; then diff --git a/m4/mkstemp.m4 b/m4/mkstemp.m4 index cee05728..ac6c7cdd 100644 --- a/m4/mkstemp.m4 +++ b/m4/mkstemp.m4 @@ -1,6 +1,6 @@ #serial 23 -# Copyright (C) 2001, 2003-2007, 2009-2012 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003-2007, 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. diff --git a/m4/mktime.m4 b/m4/mktime.m4 index 5e05dfa6..d3d376a4 100644 --- a/m4/mktime.m4 +++ b/m4/mktime.m4 @@ -1,5 +1,5 @@ -# serial 21 -dnl Copyright (C) 2002-2003, 2005-2007, 2009-2012 Free Software Foundation, +# serial 24 +dnl Copyright (C) 2002-2003, 2005-2007, 2009-2013 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, @@ -17,7 +17,7 @@ AC_DEFUN([gl_FUNC_MKTIME], AC_CHECK_FUNCS_ONCE([alarm]) AC_REQUIRE([gl_MULTIARCH]) if test $APPLE_UNIVERSAL_BUILD = 1; then - # A universal build on Apple MacOS X platforms. + # A universal build on Apple Mac OS X platforms. # The test result would be 'yes' in 32-bit mode and 'no' in 64-bit mode. # But we need a configuration result that is valid in both modes. gl_cv_func_working_mktime=no @@ -192,20 +192,23 @@ main () if (tz_strings[i]) putenv (tz_strings[i]); - for (t = 0; t <= time_t_max - delta; t += delta) + for (t = 0; t <= time_t_max - delta && (result & 1) == 0; t += delta) if (! mktime_test (t)) result |= 1; - if (! (mktime_test ((time_t) 1) - && mktime_test ((time_t) (60 * 60)) - && mktime_test ((time_t) (60 * 60 * 24)))) + if ((result & 2) == 0 + && ! (mktime_test ((time_t) 1) + && mktime_test ((time_t) (60 * 60)) + && mktime_test ((time_t) (60 * 60 * 24)))) result |= 2; - for (j = 1; ; j <<= 1) - if (! bigtime_test (j)) - result |= 4; - else if (INT_MAX / 2 < j) - break; - if (! bigtime_test (INT_MAX)) + for (j = 1; (result & 4) == 0; j <<= 1) + { + if (! bigtime_test (j)) + result |= 4; + if (INT_MAX / 2 < j) + break; + } + if ((result & 8) == 0 && ! bigtime_test (INT_MAX)) result |= 8; } if (! irix_6_4_bug ()) @@ -244,7 +247,4 @@ AC_DEFUN([gl_FUNC_MKTIME_INTERNAL], [ ]) # Prerequisites of lib/mktime.c. -AC_DEFUN([gl_PREREQ_MKTIME], -[ - AC_REQUIRE([AC_C_INLINE]) -]) +AC_DEFUN([gl_PREREQ_MKTIME], [:]) diff --git a/m4/mmap-anon.m4 b/m4/mmap-anon.m4 index 4613cbe5..9b60ddfa 100644 --- a/m4/mmap-anon.m4 +++ b/m4/mmap-anon.m4 @@ -1,5 +1,5 @@ -# mmap-anon.m4 serial 9 -dnl Copyright (C) 2005, 2007, 2009-2012 Free Software Foundation, Inc. +# mmap-anon.m4 serial 10 +dnl Copyright (C) 2005, 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. @@ -9,7 +9,7 @@ dnl with or without modifications, as long as this notice is preserved. # - On Linux, AIX, OSF/1, Solaris, Cygwin, Interix, Haiku, both MAP_ANONYMOUS # and MAP_ANON exist and have the same value. # - On HP-UX, only MAP_ANONYMOUS exists. -# - On MacOS X, FreeBSD, NetBSD, OpenBSD, only MAP_ANON exists. +# - On Mac OS X, FreeBSD, NetBSD, OpenBSD, only MAP_ANON exists. # - On IRIX, neither exists, and a file descriptor opened to /dev/zero must be # used. @@ -27,18 +27,18 @@ AC_DEFUN([gl_FUNC_MMAP_ANON], gl_have_mmap_anonymous=no if test $gl_have_mmap = yes; then AC_MSG_CHECKING([for MAP_ANONYMOUS]) - AC_EGREP_CPP([I cant identify this map], [ + AC_EGREP_CPP([I cannot identify this map], [ #include <sys/mman.h> #ifdef MAP_ANONYMOUS - I cant identify this map + I cannot identify this map #endif ], [gl_have_mmap_anonymous=yes]) if test $gl_have_mmap_anonymous != yes; then - AC_EGREP_CPP([I cant identify this map], [ + AC_EGREP_CPP([I cannot identify this map], [ #include <sys/mman.h> #ifdef MAP_ANON - I cant identify this map + I cannot identify this map #endif ], [AC_DEFINE([MAP_ANONYMOUS], [MAP_ANON], diff --git a/m4/mode_t.m4 b/m4/mode_t.m4 index 40f612a6..d5b66d45 100644 --- a/m4/mode_t.m4 +++ b/m4/mode_t.m4 @@ -1,5 +1,5 @@ # mode_t.m4 serial 2 -dnl Copyright (C) 2009-2012 Free Software Foundation, Inc. +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. diff --git a/m4/modechange.m4 b/m4/modechange.m4 index a59d88d7..949afb3d 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-2012 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2013 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 7104bb94..cd137c91 100644 --- a/m4/mountlist.m4 +++ b/m4/mountlist.m4 @@ -1,5 +1,5 @@ # serial 11 -dnl Copyright (C) 2002-2006, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 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. diff --git a/m4/mpsort.m4 b/m4/mpsort.m4 index 21ab2925..554c2e2a 100644 --- a/m4/mpsort.m4 +++ b/m4/mpsort.m4 @@ -1,6 +1,6 @@ # Sort a vector of pointers to data. -# Copyright (C) 2007, 2009-2012 Free Software Foundation, Inc. +# Copyright (C) 2007, 2009-2013 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 8db46175..9a6a47a7 100644 --- a/m4/msvc-inval.m4 +++ b/m4/msvc-inval.m4 @@ -1,5 +1,5 @@ # msvc-inval.m4 serial 1 -dnl Copyright (C) 2011-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2011-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. diff --git a/m4/msvc-nothrow.m4 b/m4/msvc-nothrow.m4 index 01250507..a39618a4 100644 --- a/m4/msvc-nothrow.m4 +++ b/m4/msvc-nothrow.m4 @@ -1,5 +1,5 @@ # msvc-nothrow.m4 serial 1 -dnl Copyright (C) 2011-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2011-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. diff --git a/m4/multiarch.m4 b/m4/multiarch.m4 index b424dce6..552ec7e7 100644 --- a/m4/multiarch.m4 +++ b/m4/multiarch.m4 @@ -1,12 +1,12 @@ -# multiarch.m4 serial 6 -dnl Copyright (C) 2008-2012 Free Software Foundation, Inc. +# multiarch.m4 serial 7 +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. # Determine whether the compiler is or may be producing universal binaries. # -# On MacOS X 10.5 and later systems, the user can create libraries and +# On Mac OS X 10.5 and later systems, the user can create libraries and # executables that work on multiple system types--known as "fat" or # "universal" binaries--by specifying multiple '-arch' options to the # compiler but only a single '-arch' option to the preprocessor. Like diff --git a/m4/nanosleep.m4 b/m4/nanosleep.m4 index 48a9a546..9bdd2727 100644 --- a/m4/nanosleep.m4 +++ b/m4/nanosleep.m4 @@ -1,11 +1,11 @@ -# serial 35 +# serial 36 dnl From Jim Meyering. dnl Check for the nanosleep function. dnl If not found, use the supplied replacement. dnl -# Copyright (C) 1999-2001, 2003-2012 Free Software Foundation, Inc. +# Copyright (C) 1999-2001, 2003-2013 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -36,7 +36,7 @@ AC_DEFUN([gl_FUNC_NANOSLEEP], AC_REQUIRE([gl_MULTIARCH]) if test $APPLE_UNIVERSAL_BUILD = 1; then - # A universal build on Apple MacOS X platforms. + # A universal build on Apple Mac OS X platforms. # The test result would be 'no (mishandles large arguments)' in 64-bit # mode but 'yes' in 32-bit mode. But we need a configuration result that # is valid in both modes. diff --git a/m4/netdb_h.m4 b/m4/netdb_h.m4 index e0f3ee86..2c69f999 100644 --- a/m4/netdb_h.m4 +++ b/m4/netdb_h.m4 @@ -1,5 +1,5 @@ # netdb_h.m4 serial 11 -dnl Copyright (C) 2008-2012 Free Software Foundation, Inc. +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. diff --git a/m4/netinet_in_h.m4 b/m4/netinet_in_h.m4 index e1813886..21971b29 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-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2006-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. diff --git a/m4/nl_langinfo.m4 b/m4/nl_langinfo.m4 index 80fe60d5..25e21015 100644 --- a/m4/nl_langinfo.m4 +++ b/m4/nl_langinfo.m4 @@ -1,5 +1,5 @@ # nl_langinfo.m4 serial 5 -dnl Copyright (C) 2009-2012 Free Software Foundation, Inc. +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. diff --git a/m4/nls.m4 b/m4/nls.m4 index 003704c4..8f8a147b 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-2010 Free Software Foundation, +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 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 08ef8254..105b884f 100644 --- a/m4/nocrash.m4 +++ b/m4/nocrash.m4 @@ -1,5 +1,5 @@ -# nocrash.m4 serial 3 -dnl Copyright (C) 2005, 2009-2012 Free Software Foundation, Inc. +# nocrash.m4 serial 4 +dnl Copyright (C) 2005, 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. @@ -18,7 +18,7 @@ dnl int main() { nocrash_init(); ... } AC_DEFUN([GL_NOCRASH],[[ #include <stdlib.h> #if defined __MACH__ && defined __APPLE__ -/* Avoid a crash on MacOS X. */ +/* Avoid a crash on Mac OS X. */ #include <mach/mach.h> #include <mach/mach_error.h> #include <mach/thread_status.h> diff --git a/m4/non-recursive-gnulib-prefix-hack.m4 b/m4/non-recursive-gnulib-prefix-hack.m4 new file mode 100644 index 00000000..3153e0f5 --- /dev/null +++ b/m4/non-recursive-gnulib-prefix-hack.m4 @@ -0,0 +1,35 @@ +dnl Copyright (C) 2012-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 gl_NON_RECURSIVE_GNULIB_PREFIX_HACK LIB_DIR +dnl Adjust configure-set $gl_LIBOBJS and each AC_SUBST'd *_H variable +dnl with a value ending in ".h" to reflect that these files are located +dnl in the directory specified by LIB_DIR. +AC_DEFUN([gl_NON_RECURSIVE_GNULIB_PREFIX_HACK], +[ + # Tell AC_LIBSOURCES where to find source files like alloca.c. + AC_CONFIG_LIBOBJ_DIR([lib]) + + # This hack originated in bison. It is required when using non-recursive + # automake rules to build from gnulib-provided lib/ sources. Hence, LIB_DIR + # is usually simply "lib". Those rules use the list of names like "fchdir.o" + # and "strstr.o" in gl_LIBOBJS. With non-recursive make, we must prefix each + # such file name with the "lib/" prefix. See also build-aux/prefix-gnulib-mk. + gl_LIBOBJS=`echo "$gl_LIBOBJS" | sed -e 's, , $1/,g'` + + # Listing the names of the variables to prefix is error-prone. + # Rather, adjust each AC_SUBST'd variable whose name ends in '_H' + # and whose value ends in '.h'. + for ac_var in $ac_subst_vars + do + eval "ac_val=\$$ac_var" + case $ac_var:$ac_val in + (*_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 a94b97f3..0261938d 100644 --- a/m4/nproc.m4 +++ b/m4/nproc.m4 @@ -1,5 +1,5 @@ # nproc.m4 serial 4 -dnl Copyright (C) 2009-2012 Free Software Foundation, Inc. +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. diff --git a/m4/off_t.m4 b/m4/off_t.m4 index dfca2dfd..d355d013 100644 --- a/m4/off_t.m4 +++ b/m4/off_t.m4 @@ -1,5 +1,5 @@ # off_t.m4 serial 1 -dnl Copyright (C) 2012 Free Software Foundation, Inc. +dnl Copyright (C) 2012-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. diff --git a/m4/open.m4 b/m4/open.m4 index c85971dc..a6cb1019 100644 --- a/m4/open.m4 +++ b/m4/open.m4 @@ -1,5 +1,5 @@ -# open.m4 serial 13 -dnl Copyright (C) 2007-2012 Free Software Foundation, Inc. +# open.m4 serial 14 +dnl Copyright (C) 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. @@ -86,7 +86,6 @@ changequote([,])dnl # Prerequisites of lib/open.c. AC_DEFUN([gl_PREREQ_OPEN], [ - AC_REQUIRE([AC_C_INLINE]) AC_REQUIRE([gl_PROMOTED_TYPE_MODE_T]) : ]) diff --git a/m4/openat.m4 b/m4/openat.m4 index 0040040b..3bf96174 100644 --- a/m4/openat.m4 +++ b/m4/openat.m4 @@ -1,7 +1,7 @@ -# serial 44 +# serial 45 # See if we need to use our replacement for Solaris' openat et al functions. -dnl Copyright (C) 2004-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2004-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. @@ -31,7 +31,6 @@ AC_DEFUN([gl_FUNC_OPENAT], # Prerequisites of lib/openat.c. AC_DEFUN([gl_PREREQ_OPENAT], [ - AC_REQUIRE([AC_C_INLINE]) AC_REQUIRE([gl_PROMOTED_TYPE_MODE_T]) : ]) diff --git a/m4/opendir.m4 b/m4/opendir.m4 index 08da440b..d4116805 100644 --- a/m4/opendir.m4 +++ b/m4/opendir.m4 @@ -1,5 +1,5 @@ # opendir.m4 serial 2 -dnl Copyright (C) 2011-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2011-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. diff --git a/m4/parse-datetime.m4 b/m4/parse-datetime.m4 index 8efefbe8..62ce16a5 100644 --- a/m4/parse-datetime.m4 +++ b/m4/parse-datetime.m4 @@ -1,5 +1,5 @@ -# parse-datetime.m4 serial 19 -dnl Copyright (C) 2002-2006, 2008-2012 Free Software Foundation, Inc. +# parse-datetime.m4 serial 21 +dnl Copyright (C) 2002-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. diff --git a/m4/pathmax.m4 b/m4/pathmax.m4 index 01178612..e11bf57a 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-2012 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2013 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 88b5e433..fdb5a1fd 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-2012 Free Software Foundation, +# Copyright (C) 1998-2001, 2003-2004, 2007, 2009-2013 Free Software Foundation, # Inc. # # This file is free software; the Free Software Foundation diff --git a/m4/perror.m4 b/m4/perror.m4 index 369a824e..42549ba2 100644 --- a/m4/perror.m4 +++ b/m4/perror.m4 @@ -1,5 +1,5 @@ # perror.m4 serial 6 -dnl Copyright (C) 2008-2012 Free Software Foundation, Inc. +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. diff --git a/m4/physmem.m4 b/m4/physmem.m4 index eb52f553..445a007b 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-2012 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2008-2013 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/pipe.m4 b/m4/pipe.m4 index 37aef116..58312833 100644 --- a/m4/pipe.m4 +++ b/m4/pipe.m4 @@ -1,5 +1,5 @@ # pipe.m4 serial 2 -dnl Copyright (C) 2010-2012 Free Software Foundation, Inc. +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. diff --git a/m4/pipe2.m4 b/m4/pipe2.m4 index 00ad82b3..6ccee105 100644 --- a/m4/pipe2.m4 +++ b/m4/pipe2.m4 @@ -1,5 +1,5 @@ # pipe2.m4 serial 2 -dnl Copyright (C) 2009-2012 Free Software Foundation, Inc. +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. diff --git a/m4/po.m4 b/m4/po.m4 index 47f36a41..5fde6f29 100644 --- a/m4/po.m4 +++ b/m4/po.m4 @@ -1,5 +1,5 @@ -# po.m4 serial 17 (gettext-0.18) -dnl Copyright (C) 1995-2010 Free Software Foundation, Inc. +# po.m4 serial 17c +dnl Copyright (C) 1995-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. @@ -24,7 +24,7 @@ AC_DEFUN([AM_PO_SUBDIRS], [ AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AC_PROG_INSTALL])dnl - AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake + AC_REQUIRE([AC_PROG_MKDIR_P])dnl AC_REQUIRE([AM_NLS])dnl dnl Release version of the gettext macros. This is used to ensure that @@ -118,7 +118,8 @@ changequote([,])dnl if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then rm -f "$ac_dir/POTFILES" test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" - cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" + gt_tab=`printf '\t'` + cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" POMAKEFILEDEPS="POTFILES.in" # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend # on $ac_dir but don't depend on user-specified configuration @@ -129,12 +130,12 @@ changequote([,])dnl test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" fi ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` - # Hide the ALL_LINGUAS assigment from automake < 1.5. + # Hide the ALL_LINGUAS assignment from automake < 1.5. eval 'ALL_LINGUAS''=$ALL_LINGUAS_' POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" else # The set of available languages was given in configure.in. - # Hide the ALL_LINGUAS assigment from automake < 1.5. + # Hide the ALL_LINGUAS assignment from automake < 1.5. eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' fi # Compute POFILES @@ -254,6 +255,7 @@ EOT fi # A sed script that extracts the value of VARIABLE from a Makefile. + tab=`printf '\t'` sed_x_variable=' # Test if the hold space is empty. x @@ -261,9 +263,9 @@ s/P/P/ x ta # Yes it was empty. Look if we have the expected variable definition. -/^[ ]*VARIABLE[ ]*=/{ +/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=/{ # Seen the first line of the variable definition. - s/^[ ]*VARIABLE[ ]*=// + s/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=// ba } bd @@ -315,7 +317,7 @@ changequote([,])dnl sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'` ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"` fi - # Hide the ALL_LINGUAS assigment from automake < 1.5. + # Hide the ALL_LINGUAS assignment from automake < 1.5. eval 'ALL_LINGUAS''=$ALL_LINGUAS_' # Compute POFILES # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) @@ -405,14 +407,15 @@ changequote([,])dnl fi sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp" + tab=`printf '\t'` if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then # Add dependencies that cannot be formulated as a simple suffix rule. for lang in $ALL_LINGUAS; do frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` cat >> "$ac_file.tmp" <<EOF $frobbedlang.msg: $lang.po - @echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \ - \$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; } +${tab}@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \ +${tab}\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; } EOF done fi @@ -422,8 +425,8 @@ EOF frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'` cat >> "$ac_file.tmp" <<EOF $frobbedlang/\$(DOMAIN).resources.dll: $lang.po - @echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \ - \$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; } +${tab}@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \ +${tab}\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; } EOF done fi diff --git a/m4/posix-shell.m4 b/m4/posix-shell.m4 index 1dd2f7b5..5992e6f8 100644 --- a/m4/posix-shell.m4 +++ b/m4/posix-shell.m4 @@ -1,6 +1,6 @@ # Find a POSIX-conforming shell. -# Copyright (C) 2007-2012 Free Software Foundation, Inc. +# Copyright (C) 2007-2013 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 index 57928ebc..69eaf633 100644 --- a/m4/posix_spawn.m4 +++ b/m4/posix_spawn.m4 @@ -1,5 +1,5 @@ # posix_spawn.m4 serial 11 -dnl Copyright (C) 2008-2012 Free Software Foundation, Inc. +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. diff --git a/m4/posixtm.m4 b/m4/posixtm.m4 index f1c77225..9dac1382 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-2012 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2007, 2009-2013 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 2a8b2e94..d3e0ca0b 100644 --- a/m4/posixver.m4 +++ b/m4/posixver.m4 @@ -1,5 +1,5 @@ # posixver.m4 serial 12 -dnl Copyright (C) 2002-2006, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 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. diff --git a/m4/prereq.m4 b/m4/prereq.m4 index f458f9dc..eca2bd65 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-2012 Free Software Foundation, Inc. +# Copyright (C) 1998-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 @@ -36,9 +36,5 @@ AC_DEFUN([gl_PREREQ], # Invoke macros of modules that may migrate into gnulib. # There's no need to list gnulib modules here, since gnulib-tool # handles that; see ../bootstrap.conf. - AC_REQUIRE([gl_FD_REOPEN]) AC_REQUIRE([gl_FUNC_XATTR]) - AC_REQUIRE([gl_FUNC_XFTS]) - AC_REQUIRE([gl_STRINTCMP]) - AC_REQUIRE([gl_STRNUMCMP]) ]) diff --git a/m4/printf-frexp.m4 b/m4/printf-frexp.m4 index de5d641f..8b373b19 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-2012 Free Software Foundation, Inc. +dnl Copyright (C) 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. diff --git a/m4/printf-frexpl.m4 b/m4/printf-frexpl.m4 index 55dd6bc1..f1ce4c8a 100644 --- a/m4/printf-frexpl.m4 +++ b/m4/printf-frexpl.m4 @@ -1,5 +1,5 @@ -# printf-frexpl.m4 serial 9 -dnl Copyright (C) 2007, 2009-2012 Free Software Foundation, Inc. +# printf-frexpl.m4 serial 10 +dnl Copyright (C) 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. @@ -28,7 +28,7 @@ AC_DEFUN([gl_FUNC_PRINTF_FREXPL], AC_DEFINE([HAVE_FREXPL_IN_LIBC], [1], [Define if the frexpl function is available in libc.]) dnl Also check whether it's declared. - dnl MacOS X 10.3 has frexpl() in libc but doesn't declare it in <math.h>. + dnl Mac OS X 10.3 has frexpl() in libc but doesn't declare it in <math.h>. AC_CHECK_DECL([frexpl], , [HAVE_DECL_FREXPL=0], [[#include <math.h>]]) fi @@ -40,7 +40,7 @@ AC_DEFUN([gl_FUNC_PRINTF_FREXPL], AC_DEFINE([HAVE_LDEXPL_IN_LIBC], [1], [Define if the ldexpl function is available in libc.]) dnl Also check whether it's declared. - dnl MacOS X 10.3 has ldexpl() in libc but doesn't declare it in <math.h>. + dnl Mac OS X 10.3 has ldexpl() in libc but doesn't declare it in <math.h>. AC_CHECK_DECL([ldexpl], , [HAVE_DECL_LDEXPL=0], [[#include <math.h>]]) ;; esac diff --git a/m4/printf.m4 b/m4/printf.m4 index d75aca07..ef44f785 100644 --- a/m4/printf.m4 +++ b/m4/printf.m4 @@ -1,5 +1,5 @@ -# printf.m4 serial 48 -dnl Copyright (C) 2003, 2007-2012 Free Software Foundation, Inc. +# printf.m4 serial 50 +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. @@ -63,7 +63,7 @@ changequote(,)dnl # Guess yes on FreeBSD >= 5. freebsd[1-4]*) gl_cv_func_printf_sizes_c99="guessing no";; freebsd* | kfreebsd*) gl_cv_func_printf_sizes_c99="guessing yes";; - # Guess yes on MacOS X >= 10.3. + # Guess yes on Mac OS X >= 10.3. darwin[1-6].*) gl_cv_func_printf_sizes_c99="guessing no";; darwin*) gl_cv_func_printf_sizes_c99="guessing yes";; # Guess yes on OpenBSD >= 3.9. @@ -222,7 +222,7 @@ changequote(,)dnl # Guess yes on FreeBSD >= 6. freebsd[1-5]*) gl_cv_func_printf_infinite="guessing no";; freebsd* | kfreebsd*) gl_cv_func_printf_infinite="guessing yes";; - # Guess yes on MacOS X >= 10.3. + # Guess yes on Mac OS X >= 10.3. darwin[1-6].*) gl_cv_func_printf_infinite="guessing no";; darwin*) gl_cv_func_printf_infinite="guessing yes";; # Guess yes on HP-UX >= 11. @@ -507,14 +507,14 @@ int main () if (sprintf (buf, "%010a %d", 1.0 / zero, 33, 44, 55) < 0 || buf[0] == '0') result |= 8; - /* This catches a MacOS X 10.3.9 (Darwin 7.9) bug. */ + /* This catches a Mac OS X 10.3.9 (Darwin 7.9) bug. */ if (sprintf (buf, "%.1a", 1.999) < 0 || (strcmp (buf, "0x1.0p+1") != 0 && strcmp (buf, "0x2.0p+0") != 0 && strcmp (buf, "0x4.0p-1") != 0 && strcmp (buf, "0x8.0p-2") != 0)) result |= 16; - /* This catches the same MacOS X 10.3.9 (Darwin 7.9) bug and also a + /* This catches the same Mac OS X 10.3.9 (Darwin 7.9) bug and also a glibc 2.4 bug <http://sourceware.org/bugzilla/show_bug.cgi?id=2908>. */ if (sprintf (buf, "%.1La", 1.999L) < 0 || (strcmp (buf, "0x1.0p+1") != 0 @@ -590,7 +590,7 @@ changequote(,)dnl # Guess yes on FreeBSD >= 6. freebsd[1-5]*) gl_cv_func_printf_directive_f="guessing no";; freebsd* | kfreebsd*) gl_cv_func_printf_directive_f="guessing yes";; - # Guess yes on MacOS X >= 10.3. + # Guess yes on Mac OS X >= 10.3. darwin[1-6].*) gl_cv_func_printf_directive_f="guessing no";; darwin*) gl_cv_func_printf_directive_f="guessing yes";; # Guess yes on Solaris >= 2.10. @@ -1028,8 +1028,9 @@ int main() changequote([,])dnl ])]) if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then - (./conftest + (./conftest 2>&AS_MESSAGE_LOG_FD result=$? + _AS_ECHO_LOG([\$? = $result]) if test $result != 0 && test $result != 77; then result=1; fi exit $result ) >/dev/null 2>/dev/null @@ -1043,7 +1044,7 @@ changequote([,])dnl fi rm -fr conftest* else - dnl A universal build on Apple MacOS X platforms. + dnl A universal build on Apple Mac OS X platforms. dnl The result would be 'no' in 32-bit mode and 'yes' in 64-bit mode. dnl But we need a configuration result that is valid in both modes. gl_cv_func_printf_enomem="guessing no" @@ -1137,7 +1138,7 @@ changequote(,)dnl # Guess yes on FreeBSD >= 5. freebsd[1-4]*) gl_cv_func_snprintf_truncation_c99="guessing no";; freebsd* | kfreebsd*) gl_cv_func_snprintf_truncation_c99="guessing yes";; - # Guess yes on MacOS X >= 10.3. + # Guess yes on Mac OS X >= 10.3. darwin[1-6].*) gl_cv_func_snprintf_truncation_c99="guessing no";; darwin*) gl_cv_func_snprintf_truncation_c99="guessing yes";; # Guess yes on OpenBSD >= 3.9. @@ -1236,7 +1237,7 @@ changequote(,)dnl # Guess yes on FreeBSD >= 5. freebsd[1-4]*) gl_cv_func_snprintf_retval_c99="guessing no";; freebsd* | kfreebsd*) gl_cv_func_snprintf_retval_c99="guessing yes";; - # Guess yes on MacOS X >= 10.3. + # Guess yes on Mac OS X >= 10.3. darwin[1-6].*) gl_cv_func_snprintf_retval_c99="guessing no";; darwin*) gl_cv_func_snprintf_retval_c99="guessing yes";; # Guess yes on OpenBSD >= 3.9. @@ -1317,7 +1318,7 @@ changequote(,)dnl # Guess yes on FreeBSD >= 5. freebsd[1-4]*) gl_cv_func_snprintf_directive_n="guessing no";; freebsd* | kfreebsd*) gl_cv_func_snprintf_directive_n="guessing yes";; - # Guess yes on MacOS X >= 10.3. + # Guess yes on Mac OS X >= 10.3. darwin[1-6].*) gl_cv_func_snprintf_directive_n="guessing no";; darwin*) gl_cv_func_snprintf_directive_n="guessing yes";; # Guess yes on Solaris >= 2.6. @@ -1459,7 +1460,7 @@ changequote(,)dnl # Guess yes on FreeBSD >= 5. freebsd[1-4]*) gl_cv_func_vsnprintf_zerosize_c99="guessing no";; freebsd* | kfreebsd*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; - # Guess yes on MacOS X >= 10.3. + # Guess yes on Mac OS X >= 10.3. darwin[1-6].*) gl_cv_func_vsnprintf_zerosize_c99="guessing no";; darwin*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; # Guess yes on Cygwin. @@ -1539,8 +1540,8 @@ dnl 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 dnl glibc 2.5 . . . . . . . . . . . . . . . . . . . . dnl glibc 2.3.6 . . . . # . . . . . . . . . . . . . . . dnl FreeBSD 5.4, 6.1 . . . . # . . . . . . # . # . . . . . . -dnl MacOS X 10.5.8 . . . # # . . . . . . # . . . . . . . . -dnl MacOS X 10.3.9 . . . . # . . . . . . # . # . . . . . . +dnl Mac OS X 10.5.8 . . . # # . . . . . . # . . . . . . . . +dnl Mac OS X 10.3.9 . . . . # . . . . . . # . # . . . . . . dnl OpenBSD 3.9, 4.0 . . # # # # . # . # . # . # . . . . . . dnl Cygwin 1.7.0 (2009) . . . # . . . ? . . . . . ? . . . . . . dnl Cygwin 1.5.25 (2008) . . . # # . . # . . . . . # . . . . . . diff --git a/m4/priv-set.m4 b/m4/priv-set.m4 index 538757b7..41a0aaf4 100644 --- a/m4/priv-set.m4 +++ b/m4/priv-set.m4 @@ -1,6 +1,6 @@ -# serial 7 +# serial 8 -# Copyright (C) 2009-2012 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, @@ -10,7 +10,6 @@ AC_DEFUN([gl_PRIV_SET], [ - AC_REQUIRE([AC_C_INLINE]) AC_CHECK_FUNCS([getppriv]) AC_CHECK_HEADERS_ONCE([priv.h]) ]) diff --git a/m4/progtest.m4 b/m4/progtest.m4 index 2d804ac9..7b391232 100644 --- a/m4/progtest.m4 +++ b/m4/progtest.m4 @@ -1,5 +1,5 @@ -# progtest.m4 serial 6 (gettext-0.18) -dnl Copyright (C) 1996-2003, 2005, 2008-2010 Free Software Foundation, Inc. +# progtest.m4 serial 7 (gettext-0.18.2) +dnl Copyright (C) 1996-2003, 2005, 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. @@ -27,15 +27,14 @@ AC_DEFUN([AM_PATH_PROG_WITH_TEST], # Prepare PATH_SEPARATOR. # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh + # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which + # contains only /bin. Note that ksh looks also at the FPATH variable, + # so we have to set that as well for the test. + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + || PATH_SEPARATOR=';' + } fi # Find out how to test for executable files. Don't use a zero-byte file, diff --git a/m4/pthread.m4 b/m4/pthread.m4 index 42a2a69c..4e5aac59 100644 --- a/m4/pthread.m4 +++ b/m4/pthread.m4 @@ -1,5 +1,5 @@ -# pthread.m4 serial 3 -dnl Copyright (C) 2009-2012 Free Software Foundation, Inc. +# pthread.m4 serial 7 +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. @@ -30,6 +30,7 @@ AC_DEFUN([gl_PTHREAD_CHECK], test $ac_cv_type_pthread_t != yes || test $ac_cv_type_pthread_spinlock_t != yes; then PTHREAD_H='pthread.h' + AC_LIBOBJ([pthread]) else PTHREAD_H= fi @@ -41,32 +42,37 @@ AC_DEFUN([gl_PTHREAD_CHECK], dnl We cannot use AC_SEARCH_LIBS here, because on OSF/1 5.1 pthread_join dnl is defined as a macro which expands to __phread_join, and libpthread dnl contains a definition for __phread_join but none for pthread_join. - AC_CACHE_CHECK([for library containing pthread_join], - [gl_cv_search_pthread_join], - [gl_saved_libs="$LIBS" - gl_cv_search_pthread_join= - AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[#include <pthread.h>]], - [[pthread_join (pthread_self (), (void **) 0);]])], - [gl_cv_search_pthread_join="none required"]) - if test -z "$gl_cv_search_pthread_join"; then - LIBS="-lpthread $gl_saved_libs" + dnl Also, FreeBSD 9 puts pthread_create in libpthread and pthread_join + dnl in libc, whereas on IRIX 6.5 the reverse is true; so check for both. + AC_CACHE_CHECK([for library containing pthread_create and pthread_join], + [gl_cv_lib_pthread], + [gl_saved_libs=$LIBS + gl_cv_lib_pthread= + for gl_lib_prefix in '' '-lpthread'; do + LIBS="$gl_lib_prefix $gl_saved_libs" AC_LINK_IFELSE( [AC_LANG_PROGRAM( - [[#include <pthread.h>]], - [[pthread_join (pthread_self (), (void **) 0);]])], - [gl_cv_search_pthread_join="-lpthread"]) - fi + [[#include <pthread.h> + void *noop (void *p) { return p; }]], + [[pthread_t pt; + void *arg = 0; + pthread_create (&pt, 0, noop, arg); + pthread_join (pthread_self (), &arg);]])], + [if test -z "$gl_lib_prefix"; then + gl_cv_lib_pthread="none required" + else + gl_cv_lib_pthread=$gl_lib_prefix + fi]) + test -n "$gl_cv_lib_pthread" && break + done LIBS="$gl_saved_libs" ]) - if test "$gl_cv_search_pthread_join" != "none required"; then - LIB_PTHREAD="$gl_cv_search_pthread_join" + if test "$gl_cv_lib_pthread" != "none required"; then + LIB_PTHREAD="$gl_cv_lib_pthread" fi fi AC_SUBST([LIB_PTHREAD]) - AC_REQUIRE([AC_C_INLINE]) AC_REQUIRE([AC_C_RESTRICT]) ]) diff --git a/m4/putenv.m4 b/m4/putenv.m4 index b971b120..9de53527 100644 --- a/m4/putenv.m4 +++ b/m4/putenv.m4 @@ -1,5 +1,5 @@ # putenv.m4 serial 19 -dnl Copyright (C) 2002-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002-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. diff --git a/m4/quote.m4 b/m4/quote.m4 index 7b055847..ac49236e 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-2012 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2013 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 09c36bb2..bc0ef0c9 100644 --- a/m4/quotearg.m4 +++ b/m4/quotearg.m4 @@ -1,5 +1,5 @@ # quotearg.m4 serial 9 -dnl Copyright (C) 2002, 2004-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2004-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. diff --git a/m4/raise.m4 b/m4/raise.m4 index 18eb8b91..7df3317d 100644 --- a/m4/raise.m4 +++ b/m4/raise.m4 @@ -1,5 +1,5 @@ -# raise.m4 serial 2 -dnl Copyright (C) 2011-2012 Free Software Foundation, Inc. +# raise.m4 serial 3 +dnl Copyright (C) 2011-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. @@ -31,6 +31,4 @@ AC_DEFUN([gl_FUNC_RAISE], ]) # Prerequisites of lib/raise.c. -AC_DEFUN([gl_PREREQ_RAISE], [ - AC_REQUIRE([AC_C_INLINE]) -]) +AC_DEFUN([gl_PREREQ_RAISE], [:]) diff --git a/m4/rawmemchr.m4 b/m4/rawmemchr.m4 index 19301644..8c500547 100644 --- a/m4/rawmemchr.m4 +++ b/m4/rawmemchr.m4 @@ -1,5 +1,5 @@ # rawmemchr.m4 serial 2 -dnl Copyright (C) 2003, 2007-2012 Free Software Foundation, Inc. +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. diff --git a/m4/read-file.m4 b/m4/read-file.m4 index 36652472..491bba8e 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-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 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. diff --git a/m4/read.m4 b/m4/read.m4 index 69aeb096..81f0f3a9 100644 --- a/m4/read.m4 +++ b/m4/read.m4 @@ -1,5 +1,5 @@ -# read.m4 serial 3 -dnl Copyright (C) 2011-2012 Free Software Foundation, Inc. +# read.m4 serial 4 +dnl Copyright (C) 2011-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. @@ -23,7 +23,4 @@ AC_DEFUN([gl_FUNC_READ], ]) # Prerequisites of lib/read.c. -AC_DEFUN([gl_PREREQ_READ], -[ - AC_REQUIRE([AC_C_INLINE]) -]) +AC_DEFUN([gl_PREREQ_READ], [:]) diff --git a/m4/readdir.m4 b/m4/readdir.m4 index 437ec08c..4269bb48 100644 --- a/m4/readdir.m4 +++ b/m4/readdir.m4 @@ -1,5 +1,5 @@ # readdir.m4 serial 1 -dnl Copyright (C) 2011-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2011-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. diff --git a/m4/readlink.m4 b/m4/readlink.m4 index ccf5141d..96e50425 100644 --- a/m4/readlink.m4 +++ b/m4/readlink.m4 @@ -1,5 +1,5 @@ # readlink.m4 serial 12 -dnl Copyright (C) 2003, 2007, 2009-2012 Free Software Foundation, Inc. +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. diff --git a/m4/readlinkat.m4 b/m4/readlinkat.m4 index 455ab7ef..b2ff40dc 100644 --- a/m4/readlinkat.m4 +++ b/m4/readlinkat.m4 @@ -1,7 +1,7 @@ -# serial 2 +# serial 3 # See if we need to provide readlinkat replacement. -dnl Copyright (C) 2009-2012 Free Software Foundation, Inc. +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. @@ -10,7 +10,6 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_READLINKAT], [ - AC_REQUIRE([gl_FUNC_OPENAT]) AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) AC_CHECK_FUNCS_ONCE([readlinkat]) diff --git a/m4/readtokens.m4 b/m4/readtokens.m4 index 18226c15..aaa8212e 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-2012 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2013 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 82328233..a22efcef 100644 --- a/m4/readutmp.m4 +++ b/m4/readutmp.m4 @@ -1,5 +1,5 @@ -# readutmp.m4 serial 19 -dnl Copyright (C) 2002-2012 Free Software Foundation, Inc. +# readutmp.m4 serial 20 +dnl Copyright (C) 2002-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. @@ -12,7 +12,6 @@ AC_DEFUN([gl_READUTMP], AC_CHECK_HEADERS_ONCE([utmp.h utmpx.h]) if test $ac_cv_header_utmp_h = yes || test $ac_cv_header_utmpx_h = yes; then dnl Prerequisites of lib/readutmp.h and lib/readutmp.c. - AC_REQUIRE([AC_C_INLINE]) AC_CHECK_FUNCS_ONCE([utmpname utmpxname]) AC_CHECK_DECLS([getutent],,,[[ /* <sys/types.h> is a prerequisite of <utmp.h> on FreeBSD 8.0, OpenBSD 4.6. */ diff --git a/m4/realloc.m4 b/m4/realloc.m4 index 954c2f0e..d477fb47 100644 --- a/m4/realloc.m4 +++ b/m4/realloc.m4 @@ -1,5 +1,5 @@ # realloc.m4 serial 13 -dnl Copyright (C) 2007, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 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. diff --git a/m4/regex.m4 b/m4/regex.m4 index 41be5e8d..ae89e311 100644 --- a/m4/regex.m4 +++ b/m4/regex.m4 @@ -1,6 +1,6 @@ -# serial 61 +# serial 63 -# Copyright (C) 1996-2001, 2003-2012 Free Software Foundation, Inc. +# Copyright (C) 1996-2001, 2003-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -27,15 +27,21 @@ 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_CACHE_CHECK([for working re_compile_pattern], [gl_cv_func_re_compile_pattern_working], [AC_RUN_IFELSE( [AC_LANG_PROGRAM( - [AC_INCLUDES_DEFAULT[ - #include <locale.h> - #include <limits.h> - #include <regex.h> - ]], + [[#include <regex.h> + + #include <locale.h> + #include <limits.h> + #include <string.h> + #if HAVE_ALARM + # include <unistd.h> + # include <signal.h> + #endif + ]], [[int result = 0; static struct re_pattern_buffer regex; unsigned char folded_chars[UCHAR_MAX + 1]; @@ -43,26 +49,54 @@ AC_DEFUN([gl_REGEX], const char *s; struct re_registers regs; - /* http://sourceware.org/ml/libc-hacker/2006-09/msg00008.html - This test needs valgrind to catch the bug on Debian - GNU/Linux 3.1 x86, but it might catch the bug better - on other platforms and it shouldn't hurt to try the - test here. */ +#if HAVE_ALARM + /* Some builds of glibc go into an infinite loop on this test. */ + signal (SIGALRM, SIG_DFL); + alarm (2); +#endif if (setlocale (LC_ALL, "en_US.UTF-8")) { - static char const pat[] = "insert into"; - static char const data[] = - "\xFF\0\x12\xA2\xAA\xC4\xB1,K\x12\xC4\xB1*\xACK"; - re_set_syntax (RE_SYNTAX_GREP | RE_HAT_LISTS_NOT_NEWLINE - | RE_ICASE); - memset (®ex, 0, sizeof regex); - s = re_compile_pattern (pat, sizeof pat - 1, ®ex); - if (s) - result |= 1; - else if (re_search (®ex, data, sizeof data - 1, - 0, sizeof data - 1, ®s) - != -1) - result |= 1; + { + /* http://sourceware.org/ml/libc-hacker/2006-09/msg00008.html + This test needs valgrind to catch the bug on Debian + GNU/Linux 3.1 x86, but it might catch the bug better + on other platforms and it shouldn't hurt to try the + test here. */ + static char const pat[] = "insert into"; + static char const data[] = + "\xFF\0\x12\xA2\xAA\xC4\xB1,K\x12\xC4\xB1*\xACK"; + re_set_syntax (RE_SYNTAX_GREP | RE_HAT_LISTS_NOT_NEWLINE + | RE_ICASE); + memset (®ex, 0, sizeof regex); + s = re_compile_pattern (pat, sizeof pat - 1, ®ex); + if (s) + result |= 1; + else if (re_search (®ex, data, sizeof data - 1, + 0, sizeof data - 1, ®s) + != -1) + 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 (®ex, 0, sizeof regex); + s = re_compile_pattern (pat, sizeof pat - 1, ®ex); + if (s) + result |= 1; + else if (re_search (®ex, data, sizeof data - 1, + 0, sizeof data - 1, 0) + != 21) + result |= 1; + } + if (! setlocale (LC_ALL, "C")) return 1; } @@ -220,6 +254,7 @@ AC_DEFUN([gl_PREREQ_REGEX], AC_REQUIRE([AC_C_INLINE]) AC_REQUIRE([AC_C_RESTRICT]) AC_REQUIRE([AC_TYPE_MBSTATE_T]) + AC_REQUIRE([gl_EEMALLOC]) AC_CHECK_HEADERS([libintl.h]) AC_CHECK_FUNCS_ONCE([isblank iswctype wcscoll]) AC_CHECK_DECLS([isblank], [], [], [[#include <ctype.h>]]) diff --git a/m4/remove.m4 b/m4/remove.m4 index 809efb3c..e693f640 100644 --- a/m4/remove.m4 +++ b/m4/remove.m4 @@ -1,5 +1,5 @@ -# remove.m4 serial 4 -dnl Copyright (C) 2009-2012 Free Software Foundation, Inc. +# remove.m4 serial 5 +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. @@ -10,7 +10,7 @@ AC_DEFUN([gl_FUNC_REMOVE], AC_REQUIRE([gl_STDIO_H_DEFAULTS]) AC_REQUIRE([gl_FUNC_RMDIR]) AC_REQUIRE([gl_FUNC_UNLINK]) - if { case "$gl_cv_func_rmdir_works:$gl_cv_func_unlink_works" in + if { case "$gl_cv_func_rmdir_works:$gl_cv_func_unlink_honors_slashes" in *yes:*yes) false;; *) true;; esac diff --git a/m4/rename.m4 b/m4/rename.m4 index 378b5ecf..66430aa8 100644 --- a/m4/rename.m4 +++ b/m4/rename.m4 @@ -1,6 +1,6 @@ # serial 26 -# Copyright (C) 2001, 2003, 2005-2006, 2009-2012 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005-2006, 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. diff --git a/m4/rewinddir.m4 b/m4/rewinddir.m4 index 57463988..ee9d9b9b 100644 --- a/m4/rewinddir.m4 +++ b/m4/rewinddir.m4 @@ -1,5 +1,5 @@ # rewinddir.m4 serial 1 -dnl Copyright (C) 2011-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2011-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. diff --git a/m4/rmdir.m4 b/m4/rmdir.m4 index 34ca8763..f6a02dd2 100644 --- a/m4/rmdir.m4 +++ b/m4/rmdir.m4 @@ -1,5 +1,5 @@ # rmdir.m4 serial 13 -dnl Copyright (C) 2002, 2005, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2005, 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. diff --git a/m4/root-dev-ino.m4 b/m4/root-dev-ino.m4 deleted file mode 100644 index 4a794049..00000000 --- a/m4/root-dev-ino.m4 +++ /dev/null @@ -1,14 +0,0 @@ -#serial 3 -dnl Copyright (C) 2005-2012 Free Software Foundation, Inc. -dnl This file is free software; the Free 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_ROOT_DEV_INO], -[ - AC_LIBOBJ([root-dev-ino]) - - dnl Prerequisites - AC_REQUIRE([AC_FUNC_LSTAT]) - : -]) diff --git a/m4/rpmatch.m4 b/m4/rpmatch.m4 index 36eb82a0..4edc4665 100644 --- a/m4/rpmatch.m4 +++ b/m4/rpmatch.m4 @@ -1,5 +1,5 @@ # rpmatch.m4 serial 10 -dnl Copyright (C) 2002-2003, 2007-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002-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. diff --git a/m4/safe-read.m4 b/m4/safe-read.m4 index c82acdb9..be5207a5 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-2012 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2013 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 c1eff6e2..bc2a33f8 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-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2005-2006, 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. diff --git a/m4/same.m4 b/m4/same.m4 index 9a16f86a..cdc5025b 100644 --- a/m4/same.m4 +++ b/m4/same.m4 @@ -1,5 +1,5 @@ #serial 9 -dnl Copyright (C) 2002-2003, 2005-2006, 2009-2012 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2013 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 30963402..74e1f562 100644 --- a/m4/save-cwd.m4 +++ b/m4/save-cwd.m4 @@ -1,5 +1,5 @@ # serial 10 -dnl Copyright (C) 2002-2006, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 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. diff --git a/m4/savedir.m4 b/m4/savedir.m4 index 486a1dd2..96fe9285 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-2012 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2013 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 5a38eafc..9ea30051 100644 --- a/m4/savewd.m4 +++ b/m4/savewd.m4 @@ -1,9 +1,8 @@ # Save and restore the working directory, possibly using a child process. -dnl Copyright (C) 2004, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2004, 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_SAVEWD], - [AC_REQUIRE([AC_C_INLINE])]) +AC_DEFUN([gl_SAVEWD], [:]) diff --git a/m4/sched_h.m4 b/m4/sched_h.m4 index 53461463..931358fd 100644 --- a/m4/sched_h.m4 +++ b/m4/sched_h.m4 @@ -1,5 +1,5 @@ # sched_h.m4 serial 6 -dnl Copyright (C) 2008-2012 Free Software Foundation, Inc. +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. diff --git a/m4/select.m4 b/m4/select.m4 index 037b3d3c..d025355f 100644 --- a/m4/select.m4 +++ b/m4/select.m4 @@ -1,5 +1,5 @@ -# select.m4 serial 6 -dnl Copyright (C) 2009-2012 Free Software Foundation, Inc. +# select.m4 serial 7 +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. @@ -46,6 +46,44 @@ changequote([,])dnl *yes) ;; *) REPLACE_SELECT=1 ;; esac + + dnl On FreeBSD 8.2, select() doesn't always reject bad fds. + AC_CACHE_CHECK([whether select detects invalid fds], + [gl_cv_func_select_detects_ebadf], + [ + AC_RUN_IFELSE([AC_LANG_PROGRAM([[ +#include <sys/types.h> +#include <sys/time.h> +#if HAVE_SYS_SELECT_H +# include <sys/select.h> +#endif +#include <unistd.h> +#include <errno.h> +]],[[ + fd_set set; + dup2(0, 16); + FD_ZERO(&set); + FD_SET(16, &set); + close(16); + struct timeval timeout; + timeout.tv_sec = 0; + timeout.tv_usec = 5; + return select (17, &set, NULL, NULL, &timeout) != -1 || errno != EBADF; +]])], [gl_cv_func_select_detects_ebadf=yes], + [gl_cv_func_select_detects_ebadf=no], + [ + case "$host_os" in + # Guess yes on glibc systems. + *-gnu*) gl_cv_func_select_detects_ebadf="guessing yes" ;; + # If we don't know, assume the worst. + *) gl_cv_func_select_detects_ebadf="guessing no" ;; + esac + ]) + ]) + case $gl_cv_func_select_detects_ebadf in + *yes) ;; + *) REPLACE_SELECT=1 ;; + esac fi dnl Determine the needed libraries. diff --git a/m4/selinux-context-h.m4 b/m4/selinux-context-h.m4 index 7ad67bba..c85255b7 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-2012 Free Software Foundation, Inc. +# Copyright (C) 2006-2007, 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. diff --git a/m4/selinux-selinux-h.m4 b/m4/selinux-selinux-h.m4 index ed5215bb..17cccffb 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-2012 Free Software Foundation, Inc. +# Copyright (C) 2006-2007, 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. diff --git a/m4/servent.m4 b/m4/servent.m4 index 21da957f..01c037a8 100644 --- a/m4/servent.m4 +++ b/m4/servent.m4 @@ -1,5 +1,5 @@ # servent.m4 serial 2 -dnl Copyright (C) 2008, 2010-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2008, 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. diff --git a/m4/setenv.m4 b/m4/setenv.m4 index e1931e7e..cb5351a0 100644 --- a/m4/setenv.m4 +++ b/m4/setenv.m4 @@ -1,5 +1,5 @@ # setenv.m4 serial 26 -dnl Copyright (C) 2001-2004, 2006-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2004, 2006-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. diff --git a/m4/setlocale.m4 b/m4/setlocale.m4 index c605241a..1133e65c 100644 --- a/m4/setlocale.m4 +++ b/m4/setlocale.m4 @@ -1,5 +1,5 @@ # setlocale.m4 serial 4 -dnl Copyright (C) 2011-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2011-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. diff --git a/m4/settime.m4 b/m4/settime.m4 index da66f708..0c80c35d 100644 --- a/m4/settime.m4 +++ b/m4/settime.m4 @@ -1,5 +1,5 @@ # settime.m4 serial 7 -dnl Copyright (C) 2002, 2004-2006, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2004-2006, 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. diff --git a/m4/sha1.m4 b/m4/sha1.m4 index 76198258..21c775e3 100644 --- a/m4/sha1.m4 +++ b/m4/sha1.m4 @@ -1,5 +1,5 @@ -# sha1.m4 serial 10 -dnl Copyright (C) 2002-2006, 2008-2012 Free Software Foundation, Inc. +# sha1.m4 serial 11 +dnl Copyright (C) 2002-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. @@ -8,6 +8,5 @@ AC_DEFUN([gl_SHA1], [ dnl Prerequisites of lib/sha1.c. AC_REQUIRE([gl_BIGENDIAN]) - AC_REQUIRE([AC_C_INLINE]) : ]) diff --git a/m4/sha256.m4 b/m4/sha256.m4 index 78cc95ed..7eede32f 100644 --- a/m4/sha256.m4 +++ b/m4/sha256.m4 @@ -1,5 +1,5 @@ -# sha256.m4 serial 5 -dnl Copyright (C) 2005, 2008-2012 Free Software Foundation, Inc. +# sha256.m4 serial 6 +dnl Copyright (C) 2005, 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. @@ -8,5 +8,4 @@ AC_DEFUN([gl_SHA256], [ dnl Prerequisites of lib/sha256.c. AC_REQUIRE([gl_BIGENDIAN]) - AC_REQUIRE([AC_C_INLINE]) ]) diff --git a/m4/sha512.m4 b/m4/sha512.m4 index 937ea8d5..46c08958 100644 --- a/m4/sha512.m4 +++ b/m4/sha512.m4 @@ -1,5 +1,5 @@ -# sha512.m4 serial 6 -dnl Copyright (C) 2005-2006, 2008-2012 Free Software Foundation, Inc. +# sha512.m4 serial 7 +dnl Copyright (C) 2005-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. @@ -8,5 +8,4 @@ AC_DEFUN([gl_SHA512], [ dnl Prerequisites of lib/sha512.c. AC_REQUIRE([gl_BIGENDIAN]) - AC_REQUIRE([AC_C_INLINE]) ]) diff --git a/m4/sig2str.m4 b/m4/sig2str.m4 index 43650b04..de738437 100644 --- a/m4/sig2str.m4 +++ b/m4/sig2str.m4 @@ -1,5 +1,5 @@ # serial 7 -dnl Copyright (C) 2002, 2005-2006, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2005-2006, 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. diff --git a/m4/sig_atomic_t.m4 b/m4/sig_atomic_t.m4 index acda3568..f2dfd591 100644 --- a/m4/sig_atomic_t.m4 +++ b/m4/sig_atomic_t.m4 @@ -1,5 +1,5 @@ # sig_atomic_t.m4 serial 3 -dnl Copyright (C) 2003, 2009-2012 Free Software Foundation, Inc. +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. diff --git a/m4/sigaction.m4 b/m4/sigaction.m4 index 171d3a42..116b0688 100644 --- a/m4/sigaction.m4 +++ b/m4/sigaction.m4 @@ -1,5 +1,5 @@ -# sigaction.m4 serial 6 -dnl Copyright (C) 2008-2012 Free Software Foundation, Inc. +# sigaction.m4 serial 7 +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. @@ -37,7 +37,4 @@ AC_DEFUN([gl_PREREQ_SIGACTION], ]) # Prerequisites of lib/sig-handler.h. -AC_DEFUN([gl_PREREQ_SIG_HANDLER_H], -[ - AC_REQUIRE([AC_C_INLINE]) -]) +AC_DEFUN([gl_PREREQ_SIG_HANDLER_H], [:]) diff --git a/m4/signal_h.m4 b/m4/signal_h.m4 index ed4d7306..3de9f27a 100644 --- a/m4/signal_h.m4 +++ b/m4/signal_h.m4 @@ -1,5 +1,5 @@ # signal_h.m4 serial 18 -dnl Copyright (C) 2007-2012 Free Software Foundation, Inc. +dnl Copyright (C) 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. diff --git a/m4/signalblocking.m4 b/m4/signalblocking.m4 index ab8035ef..a00e704f 100644 --- a/m4/signalblocking.m4 +++ b/m4/signalblocking.m4 @@ -1,5 +1,5 @@ -# signalblocking.m4 serial 13 -dnl Copyright (C) 2001-2002, 2006-2012 Free Software Foundation, Inc. +# signalblocking.m4 serial 14 +dnl Copyright (C) 2001-2002, 2006-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. @@ -22,6 +22,4 @@ AC_DEFUN([gl_SIGNALBLOCKING], ]) # Prerequisites of lib/sigprocmask.c. -AC_DEFUN([gl_PREREQ_SIGPROCMASK], [ - AC_REQUIRE([AC_C_INLINE]) -]) +AC_DEFUN([gl_PREREQ_SIGPROCMASK], [:]) diff --git a/m4/signbit.m4 b/m4/signbit.m4 index e9877f68..d58caaf0 100644 --- a/m4/signbit.m4 +++ b/m4/signbit.m4 @@ -1,5 +1,5 @@ -# signbit.m4 serial 12 -dnl Copyright (C) 2007-2012 Free Software Foundation, Inc. +# signbit.m4 serial 13 +dnl Copyright (C) 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. @@ -170,7 +170,7 @@ double m0d = -p0d; /* On HP-UX 10.20, negating 0.0L does not yield -0.0L. So we use another constant expression instead. But that expression does not work on other platforms, such as when - cross-compiling to PowerPC on MacOS X 10.5. */ + cross-compiling to PowerPC on Mac OS X 10.5. */ long double p0l = 0.0L; #if defined __hpux || defined __sgi long double m0l = -LDBL_MIN * LDBL_MIN; diff --git a/m4/size_max.m4 b/m4/size_max.m4 index 5a8162bc..4b247abc 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-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2005-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. diff --git a/m4/sleep.m4 b/m4/sleep.m4 index 49197faf..a27baa6d 100644 --- a/m4/sleep.m4 +++ b/m4/sleep.m4 @@ -1,5 +1,5 @@ # sleep.m4 serial 7 -dnl Copyright (C) 2007-2012 Free Software Foundation, Inc. +dnl Copyright (C) 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. diff --git a/m4/snprintf.m4 b/m4/snprintf.m4 index de94eddf..3698e844 100644 --- a/m4/snprintf.m4 +++ b/m4/snprintf.m4 @@ -1,5 +1,5 @@ # snprintf.m4 serial 6 -dnl Copyright (C) 2002-2004, 2007-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2004, 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. diff --git a/m4/socketlib.m4 b/m4/socketlib.m4 index 92a1af22..b08a72f6 100644 --- a/m4/socketlib.m4 +++ b/m4/socketlib.m4 @@ -1,5 +1,5 @@ # socketlib.m4 serial 1 -dnl Copyright (C) 2008-2012 Free Software Foundation, Inc. +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. diff --git a/m4/sockets.m4 b/m4/sockets.m4 index e3738d90..b407391c 100644 --- a/m4/sockets.m4 +++ b/m4/sockets.m4 @@ -1,5 +1,5 @@ # sockets.m4 serial 7 -dnl Copyright (C) 2008-2012 Free Software Foundation, Inc. +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. diff --git a/m4/socklen.m4 b/m4/socklen.m4 index a4ab43b3..e3efd6ef 100644 --- a/m4/socklen.m4 +++ b/m4/socklen.m4 @@ -1,5 +1,5 @@ # socklen.m4 serial 10 -dnl Copyright (C) 2005-2007, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2005-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. diff --git a/m4/sockpfaf.m4 b/m4/sockpfaf.m4 index 5f97c3e3..89557b18 100644 --- a/m4/sockpfaf.m4 +++ b/m4/sockpfaf.m4 @@ -1,5 +1,5 @@ # sockpfaf.m4 serial 8 -dnl Copyright (C) 2004, 2006, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2004, 2006, 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. diff --git a/m4/spawn-pipe.m4 b/m4/spawn-pipe.m4 index 564132a9..d2729358 100644 --- a/m4/spawn-pipe.m4 +++ b/m4/spawn-pipe.m4 @@ -1,5 +1,5 @@ -# spawn-pipe.m4 serial 1 -dnl Copyright (C) 2004, 2008-2012 Free Software Foundation, Inc. +# 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. @@ -7,6 +7,5 @@ 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_C_INLINE]) AC_REQUIRE([AC_TYPE_MODE_T]) ]) diff --git a/m4/spawn_h.m4 b/m4/spawn_h.m4 index 26fec8e1..ba08c5d8 100644 --- a/m4/spawn_h.m4 +++ b/m4/spawn_h.m4 @@ -1,5 +1,5 @@ # spawn_h.m4 serial 16 -dnl Copyright (C) 2008-2012 Free Software Foundation, Inc. +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. diff --git a/m4/ssize_t.m4 b/m4/ssize_t.m4 index 209d64c8..63381343 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-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2003, 2006, 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. diff --git a/m4/st_dm_mode.m4 b/m4/st_dm_mode.m4 index b87cec00..d47159f1 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-2012 Free Software Foundation, Inc. +# Copyright (C) 1998-1999, 2001, 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. diff --git a/m4/stat-prog.m4 b/m4/stat-prog.m4 index 30bacb45..a12d9a01 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-2012 Free Software Foundation, Inc. +# Copyright (C) 2002-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 @@ -72,8 +72,8 @@ AC_INCLUDES_DEFAULT [AC_DEFINE([STRUCT_STATVFS_F_FSID_IS_INTEGER], [1], [Define to 1 if the f_fsid member of struct statvfs is an integer.])]) else - AC_CHECK_MEMBERS([struct statfs.f_namelen, struct statfs.f_type],,, - [$statfs_includes]) + AC_CHECK_MEMBERS([struct statfs.f_namelen, struct statfs.f_type, + struct statfs.f_frsize],,, [$statfs_includes]) if test $ac_cv_header_OS_h != yes; then AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( diff --git a/m4/stat-size.m4 b/m4/stat-size.m4 index 634dba5d..d5b550cf 100644 --- a/m4/stat-size.m4 +++ b/m4/stat-size.m4 @@ -1,6 +1,6 @@ #serial 1 -# Copyright (C) 2011-2012 Free Software Foundation, Inc. +# Copyright (C) 2011-2013 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 2dbb1f3c..d777f742 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-2012 Free Software +# Copyright (C) 1998-1999, 2001, 2003, 2005-2007, 2009-2013 Free Software # Foundation, Inc. # This file is free software; the Free Software Foundation @@ -19,7 +19,6 @@ dnl From Paul Eggert. AC_DEFUN([gl_STAT_TIME], [ - AC_REQUIRE([AC_C_INLINE]) AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) AC_CHECK_HEADERS_ONCE([sys/time.h]) @@ -70,7 +69,6 @@ AC_DEFUN([gl_STAT_TIME], # AC_DEFUN([gl_STAT_BIRTHTIME], [ - AC_REQUIRE([AC_C_INLINE]) AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) AC_CHECK_HEADERS_ONCE([sys/time.h]) AC_CHECK_MEMBERS([struct stat.st_birthtimespec.tv_nsec], [], diff --git a/m4/stat.m4 b/m4/stat.m4 index a8b79f5b..2456297a 100644 --- a/m4/stat.m4 +++ b/m4/stat.m4 @@ -1,6 +1,6 @@ -# serial 10 +# serial 11 -# Copyright (C) 2009-2012 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, @@ -68,8 +68,4 @@ AC_DEFUN([gl_FUNC_STAT], ]) # Prerequisites of lib/stat.c. -AC_DEFUN([gl_PREREQ_STAT], -[ - AC_REQUIRE([AC_C_INLINE]) - : -]) +AC_DEFUN([gl_PREREQ_STAT], [:]) diff --git a/m4/stdalign.m4 b/m4/stdalign.m4 index 6659c9c3..3d7993db 100644 --- a/m4/stdalign.m4 +++ b/m4/stdalign.m4 @@ -1,6 +1,6 @@ # Check for stdalign.h that conforms to C11. -dnl Copyright 2011-2012 Free Software Foundation, Inc. +dnl Copyright 2011-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. diff --git a/m4/stdarg.m4 b/m4/stdarg.m4 index 5c313cb8..c087f61e 100644 --- a/m4/stdarg.m4 +++ b/m4/stdarg.m4 @@ -1,5 +1,5 @@ # stdarg.m4 serial 6 -dnl Copyright (C) 2006, 2008-2012 Free Software Foundation, Inc. +dnl Copyright (C) 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. diff --git a/m4/stdbool.m4 b/m4/stdbool.m4 index eabfa645..80d5559a 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-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 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. diff --git a/m4/stddef_h.m4 b/m4/stddef_h.m4 index cc116096..5da8ab1e 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-2012 Free Software Foundation, Inc. +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. diff --git a/m4/stdint.m4 b/m4/stdint.m4 index 28d342ea..27cdcdb9 100644 --- a/m4/stdint.m4 +++ b/m4/stdint.m4 @@ -1,5 +1,5 @@ # stdint.m4 serial 43 -dnl Copyright (C) 2001-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2001-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. diff --git a/m4/stdint_h.m4 b/m4/stdint_h.m4 index 581de960..511ab4e9 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-2012 Free Software Foundation, Inc. +dnl Copyright (C) 1997-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. diff --git a/m4/stdio_h.m4 b/m4/stdio_h.m4 index b03393b9..ebade067 100644 --- a/m4/stdio_h.m4 +++ b/m4/stdio_h.m4 @@ -1,5 +1,5 @@ -# stdio_h.m4 serial 41 -dnl Copyright (C) 2007-2012 Free Software Foundation, Inc. +# stdio_h.m4 serial 43 +dnl Copyright (C) 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. @@ -7,13 +7,14 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_STDIO_H], [ AC_REQUIRE([gl_STDIO_H_DEFAULTS]) - AC_REQUIRE([AC_C_INLINE]) gl_NEXT_HEADERS([stdio.h]) dnl No need to create extra modules for these functions. Everyone who uses dnl <stdio.h> likely needs them. GNULIB_FSCANF=1 + gl_MODULE_INDICATOR([fscanf]) GNULIB_SCANF=1 + gl_MODULE_INDICATOR([scanf]) GNULIB_FGETC=1 GNULIB_GETC=1 GNULIB_GETCHAR=1 diff --git a/m4/stdlib_h.m4 b/m4/stdlib_h.m4 index ab43728a..79103bc7 100644 --- a/m4/stdlib_h.m4 +++ b/m4/stdlib_h.m4 @@ -1,5 +1,5 @@ # stdlib_h.m4 serial 41 -dnl Copyright (C) 2007-2012 Free Software Foundation, Inc. +dnl Copyright (C) 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. @@ -102,6 +102,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS], REPLACE_MALLOC=0; AC_SUBST([REPLACE_MALLOC]) REPLACE_MBTOWC=0; AC_SUBST([REPLACE_MBTOWC]) REPLACE_MKSTEMP=0; AC_SUBST([REPLACE_MKSTEMP]) + REPLACE_PTSNAME=0; AC_SUBST([REPLACE_PTSNAME]) REPLACE_PTSNAME_R=0; AC_SUBST([REPLACE_PTSNAME_R]) REPLACE_PUTENV=0; AC_SUBST([REPLACE_PUTENV]) REPLACE_RANDOM_R=0; AC_SUBST([REPLACE_RANDOM_R]) diff --git a/m4/stpcpy.m4 b/m4/stpcpy.m4 index 8e954578..41fcb0e5 100644 --- a/m4/stpcpy.m4 +++ b/m4/stpcpy.m4 @@ -1,5 +1,5 @@ # stpcpy.m4 serial 8 -dnl Copyright (C) 2002, 2007, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 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. diff --git a/m4/stpncpy.m4 b/m4/stpncpy.m4 index 90ae53b4..09f09f64 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-2012 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2007, 2009-2013 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/strcase.m4 b/m4/strcase.m4 deleted file mode 100644 index 717fa9c3..00000000 --- a/m4/strcase.m4 +++ /dev/null @@ -1,45 +0,0 @@ -# strcase.m4 serial 11 -dnl Copyright (C) 2002, 2005-2012 Free Software Foundation, Inc. -dnl This file is free software; the Free 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_STRCASE], -[ - gl_FUNC_STRCASECMP - gl_FUNC_STRNCASECMP -]) - -AC_DEFUN([gl_FUNC_STRCASECMP], -[ - AC_REQUIRE([gl_HEADER_STRINGS_H_DEFAULTS]) - AC_CHECK_FUNCS([strcasecmp]) - if test $ac_cv_func_strcasecmp = no; then - HAVE_STRCASECMP=0 - fi -]) - -AC_DEFUN([gl_FUNC_STRNCASECMP], -[ - AC_REQUIRE([gl_HEADER_STRINGS_H_DEFAULTS]) - AC_CHECK_FUNCS([strncasecmp]) - if test $ac_cv_func_strncasecmp = yes; then - HAVE_STRNCASECMP=1 - else - HAVE_STRNCASECMP=0 - fi - AC_CHECK_DECLS([strncasecmp]) - if test $ac_cv_have_decl_strncasecmp = no; then - HAVE_DECL_STRNCASECMP=0 - fi -]) - -# Prerequisites of lib/strcasecmp.c. -AC_DEFUN([gl_PREREQ_STRCASECMP], [ - : -]) - -# Prerequisites of lib/strncasecmp.c. -AC_DEFUN([gl_PREREQ_STRNCASECMP], [ - : -]) diff --git a/m4/strchrnul.m4 b/m4/strchrnul.m4 index d3dfb9af..b59eda9d 100644 --- a/m4/strchrnul.m4 +++ b/m4/strchrnul.m4 @@ -1,5 +1,5 @@ # strchrnul.m4 serial 9 -dnl Copyright (C) 2003, 2007, 2009-2012 Free Software Foundation, Inc. +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. diff --git a/m4/strdup.m4 b/m4/strdup.m4 index db0c8c1d..efe2d571 100644 --- a/m4/strdup.m4 +++ b/m4/strdup.m4 @@ -1,6 +1,6 @@ # strdup.m4 serial 13 -dnl Copyright (C) 2002-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002-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, diff --git a/m4/strerror.m4 b/m4/strerror.m4 index 1c96e526..3989844b 100644 --- a/m4/strerror.m4 +++ b/m4/strerror.m4 @@ -1,5 +1,5 @@ # strerror.m4 serial 17 -dnl Copyright (C) 2002, 2007-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 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. diff --git a/m4/strerror_r.m4 b/m4/strerror_r.m4 index 5bdf0abe..341f9836 100644 --- a/m4/strerror_r.m4 +++ b/m4/strerror_r.m4 @@ -1,5 +1,5 @@ -# strerror_r.m4 serial 14 -dnl Copyright (C) 2002, 2007-2012 Free Software Foundation, Inc. +# strerror_r.m4 serial 15 +dnl Copyright (C) 2002, 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. @@ -76,7 +76,7 @@ AC_DEFUN([gl_FUNC_STRERROR_R_WORKS], dnl HP-UX 11.31 strerror_r always fails when the buffer length argument dnl is less than 80. dnl FreeBSD 8.s strerror_r claims failure on 0 - dnl MacOS X 10.5 strerror_r treats 0 like -1 + dnl Mac OS X 10.5 strerror_r treats 0 like -1 dnl Solaris 10 strerror_r corrupts errno on failure AC_CACHE_CHECK([whether strerror_r works], [gl_cv_func_strerror_r_works], diff --git a/m4/strftime.m4 b/m4/strftime.m4 index 42043019..b31f4956 100644 --- a/m4/strftime.m4 +++ b/m4/strftime.m4 @@ -1,6 +1,6 @@ # serial 33 -# Copyright (C) 1996-1997, 1999-2007, 2009-2012 Free Software Foundation, Inc. +# Copyright (C) 1996-1997, 1999-2007, 2009-2013 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 5677e092..cc5fbbb3 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-2012 Free Software Foundation, Inc. +# Copyright (C) 2007-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. diff --git a/m4/strings_h.m4 b/m4/strings_h.m4 deleted file mode 100644 index a057e1c8..00000000 --- a/m4/strings_h.m4 +++ /dev/null @@ -1,52 +0,0 @@ -# Configure a replacement for <strings.h>. -# serial 6 - -# Copyright (C) 2007, 2009-2012 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. - -AC_DEFUN([gl_HEADER_STRINGS_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_HEADER_STRINGS_H_BODY]) -]) - -AC_DEFUN([gl_HEADER_STRINGS_H_BODY], -[ - AC_REQUIRE([gl_HEADER_STRINGS_H_DEFAULTS]) - - gl_CHECK_NEXT_HEADERS([strings.h]) - if test $ac_cv_header_strings_h = yes; then - HAVE_STRINGS_H=1 - else - HAVE_STRINGS_H=0 - fi - AC_SUBST([HAVE_STRINGS_H]) - - 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([[ - /* Minix 3.1.8 has a bug: <sys/types.h> must be included before - <strings.h>. */ - #include <sys/types.h> - #include <strings.h> - ]], [ffs strcasecmp strncasecmp]) -]) - -AC_DEFUN([gl_STRINGS_MODULE_INDICATOR], -[ - dnl Use AC_REQUIRE here, so that the default settings are expanded once only. - AC_REQUIRE([gl_HEADER_STRINGS_H_DEFAULTS]) - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) -]) - -AC_DEFUN([gl_HEADER_STRINGS_H_DEFAULTS], -[ - GNULIB_FFS=0; AC_SUBST([GNULIB_FFS]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_FFS=1; AC_SUBST([HAVE_FFS]) - HAVE_STRCASECMP=1; AC_SUBST([HAVE_STRCASECMP]) - HAVE_DECL_STRNCASECMP=1; AC_SUBST([HAVE_DECL_STRNCASECMP]) -]) diff --git a/m4/strncat.m4 b/m4/strncat.m4 index fde4ec9d..8198b4cc 100644 --- a/m4/strncat.m4 +++ b/m4/strncat.m4 @@ -1,5 +1,5 @@ # strncat.m4 serial 2 -dnl Copyright (C) 2002-2004, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2004, 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. diff --git a/m4/strndup.m4 b/m4/strndup.m4 index bdde5fe1..a1f82743 100644 --- a/m4/strndup.m4 +++ b/m4/strndup.m4 @@ -1,5 +1,5 @@ -# strndup.m4 serial 20 -dnl Copyright (C) 2002-2003, 2005-2012 Free Software Foundation, Inc. +# strndup.m4 serial 21 +dnl Copyright (C) 2002-2003, 2005-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. @@ -24,7 +24,7 @@ AC_DEFUN([gl_FUNC_STRNDUP], [AC_RUN_IFELSE([ AC_LANG_PROGRAM([[#include <string.h> #include <stdlib.h>]], [[ -#ifndef HAVE_DECL_STRNDUP +#if !HAVE_DECL_STRNDUP extern #ifdef __cplusplus "C" diff --git a/m4/strnlen.m4 b/m4/strnlen.m4 index d97e3075..eae82b77 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-2012 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2007, 2009-2013 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/strnumcmp.m4 b/m4/strnumcmp.m4 deleted file mode 100644 index 437e18c9..00000000 --- a/m4/strnumcmp.m4 +++ /dev/null @@ -1,27 +0,0 @@ -# Compare numeric strings. - -dnl Copyright (C) 2005-2012 Free Software Foundation, Inc. - -dnl This file is free software; the Free 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 Paul Eggert. - -AC_DEFUN([gl_STRINTCMP], -[ - AC_LIBSOURCES([strintcmp.c, strnumcmp.h, strnumcmp-in.h]) - AC_LIBOBJ([strintcmp]) - - dnl Prerequisites of lib/strintcmp.c. - AC_REQUIRE([AC_INLINE]) -]) - -AC_DEFUN([gl_STRNUMCMP], -[ - AC_LIBSOURCES([strnumcmp.c, strnumcmp.h, strnumcmp-in.h]) - AC_LIBOBJ([strnumcmp]) - - dnl Prerequisites of lib/strnumcmp.c. - AC_REQUIRE([AC_INLINE]) -]) diff --git a/m4/strpbrk.m4 b/m4/strpbrk.m4 index 3a5f4c34..85488bab 100644 --- a/m4/strpbrk.m4 +++ b/m4/strpbrk.m4 @@ -1,5 +1,5 @@ # strpbrk.m4 serial 6 -dnl Copyright (C) 2002-2003, 2007, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002-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. diff --git a/m4/strsignal.m4 b/m4/strsignal.m4 index 5e15e744..8f6ea2e9 100644 --- a/m4/strsignal.m4 +++ b/m4/strsignal.m4 @@ -1,5 +1,5 @@ # strsignal.m4 serial 8 -dnl Copyright (C) 2008-2012 Free Software Foundation, Inc. +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. diff --git a/m4/strstr.m4 b/m4/strstr.m4 index b8f94bf7..c486bdb0 100644 --- a/m4/strstr.m4 +++ b/m4/strstr.m4 @@ -1,5 +1,5 @@ # strstr.m4 serial 16 -dnl Copyright (C) 2008-2012 Free Software Foundation, Inc. +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. diff --git a/m4/strtod.m4 b/m4/strtod.m4 index ac372844..06ba60f9 100644 --- a/m4/strtod.m4 +++ b/m4/strtod.m4 @@ -1,5 +1,5 @@ # strtod.m4 serial 22 -dnl Copyright (C) 2002-2003, 2006-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2003, 2006-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. diff --git a/m4/strtoimax.m4 b/m4/strtoimax.m4 index 58a31899..bee93b21 100644 --- a/m4/strtoimax.m4 +++ b/m4/strtoimax.m4 @@ -1,5 +1,5 @@ # strtoimax.m4 serial 13 -dnl Copyright (C) 2002-2004, 2006, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2004, 2006, 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. diff --git a/m4/strtoll.m4 b/m4/strtoll.m4 index 5854bcb5..0cf4eb50 100644 --- a/m4/strtoll.m4 +++ b/m4/strtoll.m4 @@ -1,5 +1,5 @@ # strtoll.m4 serial 7 -dnl Copyright (C) 2002, 2004, 2006, 2008-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 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. diff --git a/m4/strtoull.m4 b/m4/strtoull.m4 index 7c659f57..ad386da6 100644 --- a/m4/strtoull.m4 +++ b/m4/strtoull.m4 @@ -1,5 +1,5 @@ # strtoull.m4 serial 7 -dnl Copyright (C) 2002, 2004, 2006, 2008-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 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. diff --git a/m4/strtoumax.m4 b/m4/strtoumax.m4 index 5b2285c6..6a6aeb5d 100644 --- a/m4/strtoumax.m4 +++ b/m4/strtoumax.m4 @@ -1,5 +1,5 @@ # strtoumax.m4 serial 11 -dnl Copyright (C) 2002-2004, 2006, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2004, 2006, 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. diff --git a/m4/symlink.m4 b/m4/symlink.m4 index cfd90ec2..82ede2a4 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-2012 Free Software Foundation, Inc. +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. diff --git a/m4/symlinkat.m4 b/m4/symlinkat.m4 index 5b2713e7..779295ff 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-2012 Free Software Foundation, Inc. +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. diff --git a/m4/sys_ioctl_h.m4 b/m4/sys_ioctl_h.m4 index 94a26693..8705a4cd 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-2012 Free Software Foundation, Inc. +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. diff --git a/m4/sys_resource_h.m4 b/m4/sys_resource_h.m4 index 97286e4e..7bb5b61f 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 Free Software Foundation, Inc. +dnl Copyright (C) 2012-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. diff --git a/m4/sys_select_h.m4 b/m4/sys_select_h.m4 index eaf056a7..49623285 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-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2006-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. diff --git a/m4/sys_socket_h.m4 b/m4/sys_socket_h.m4 index 8d4e7e1e..94863776 100644 --- a/m4/sys_socket_h.m4 +++ b/m4/sys_socket_h.m4 @@ -1,5 +1,5 @@ -# sys_socket_h.m4 serial 22 -dnl Copyright (C) 2005-2012 Free Software Foundation, Inc. +# sys_socket_h.m4 serial 23 +dnl Copyright (C) 2005-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. @@ -10,7 +10,6 @@ AC_DEFUN([gl_HEADER_SYS_SOCKET], [ AC_REQUIRE([gl_SYS_SOCKET_H_DEFAULTS]) AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([AC_C_INLINE]) dnl On OSF/1, the functions recv(), send(), recvfrom(), sendto() have dnl old-style declarations (with return type 'int' instead of 'ssize_t') diff --git a/m4/sys_stat_h.m4 b/m4/sys_stat_h.m4 index f45dee1d..6dd3d99b 100644 --- a/m4/sys_stat_h.m4 +++ b/m4/sys_stat_h.m4 @@ -1,5 +1,5 @@ -# sys_stat_h.m4 serial 27 -*- Autoconf -*- -dnl Copyright (C) 2006-2012 Free Software Foundation, Inc. +# sys_stat_h.m4 serial 28 -*- Autoconf -*- +dnl Copyright (C) 2006-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. @@ -11,9 +11,6 @@ AC_DEFUN([gl_HEADER_SYS_STAT_H], [ AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) - dnl For the mkdir substitute. - AC_REQUIRE([AC_C_INLINE]) - dnl Check for broken stat macros. AC_REQUIRE([AC_HEADER_STAT]) diff --git a/m4/sys_time_h.m4 b/m4/sys_time_h.m4 index 26eaf8ea..0ac71ac5 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-2012 Free Software Foundation, Inc. +# Copyright (C) 2007, 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. @@ -52,7 +52,9 @@ AC_DEFUN([gl_HEADER_SYS_TIME_H_BODY], dnl (in <sys/time.h> and <winsock2.h> for mingw64, in <winsock2.h> only dnl for MSVC) with a tv_sec field of type 'long' (32-bit!), which is dnl smaller than the 'time_t' type mandated by POSIX. - AC_CACHE_CHECK([for correct struct timeval.tv_sec member], + dnl On OpenBSD 5.1 amd64, tv_sec is 64 bits and time_t 32 bits, but + dnl that is good enough. + AC_CACHE_CHECK([for wide-enough struct timeval.tv_sec member], [gl_cv_sys_struct_timeval_tv_sec], [AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( @@ -65,7 +67,9 @@ AC_DEFUN([gl_HEADER_SYS_TIME_H_BODY], #endif ]], [[static struct timeval x; - typedef int verify_tv_sec_type[sizeof (x.tv_sec) == sizeof (time_t) ? 1 : -1]; + typedef int verify_tv_sec_type[ + sizeof (time_t) <= sizeof x.tv_sec ? 1 : -1 + ]; ]])], [gl_cv_sys_struct_timeval_tv_sec=yes], [gl_cv_sys_struct_timeval_tv_sec=no]) diff --git a/m4/sys_types_h.m4 b/m4/sys_types_h.m4 index f11eef2f..6132727f 100644 --- a/m4/sys_types_h.m4 +++ b/m4/sys_types_h.m4 @@ -1,5 +1,5 @@ # sys_types_h.m4 serial 4 -dnl Copyright (C) 2011-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2011-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. diff --git a/m4/sys_uio_h.m4 b/m4/sys_uio_h.m4 index ddf844b7..c75cbbd0 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-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2011-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. diff --git a/m4/sys_utsname_h.m4 b/m4/sys_utsname_h.m4 index e86d3c2c..1ad7a435 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-2012 Free Software Foundation, Inc. +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. diff --git a/m4/sys_wait_h.m4 b/m4/sys_wait_h.m4 index c0bba864..a6c59d6f 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-2012 Free Software Foundation, Inc. +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. diff --git a/m4/tempname.m4 b/m4/tempname.m4 index 20ad78bc..a6e42dce 100644 --- a/m4/tempname.m4 +++ b/m4/tempname.m4 @@ -1,6 +1,6 @@ #serial 5 -# Copyright (C) 2006-2007, 2009-2012 Free Software Foundation, Inc. +# Copyright (C) 2006-2007, 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. diff --git a/m4/termios_h.m4 b/m4/termios_h.m4 index 285d554f..d712be3c 100644 --- a/m4/termios_h.m4 +++ b/m4/termios_h.m4 @@ -1,5 +1,5 @@ # termios_h.m4 serial 4 -dnl Copyright (C) 2010-2012 Free Software Foundation, Inc. +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. diff --git a/m4/thread.m4 b/m4/thread.m4 index cd66c3e9..86da5c57 100644 --- a/m4/thread.m4 +++ b/m4/thread.m4 @@ -1,5 +1,5 @@ -# thread.m4 serial 2 -dnl Copyright (C) 2008-2012 Free Software Foundation, Inc. +# thread.m4 serial 3 +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. @@ -7,7 +7,6 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_THREAD], [ AC_REQUIRE([gl_THREADLIB]) - AC_REQUIRE([AC_C_INLINE]) if test $gl_threads_api = posix; then gl_save_LIBS="$LIBS" diff --git a/m4/threadlib.m4 b/m4/threadlib.m4 index 9cedb670..26bdeb58 100644 --- a/m4/threadlib.m4 +++ b/m4/threadlib.m4 @@ -1,5 +1,5 @@ -# threadlib.m4 serial 9 (gettext-0.18.2) -dnl Copyright (C) 2005-2012 Free Software Foundation, Inc. +# threadlib.m4 serial 10 (gettext-0.18.2) +dnl Copyright (C) 2005-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. @@ -319,50 +319,50 @@ AC_DEFUN([gl_DISABLE_THREADS], [ dnl Survey of platforms: dnl -dnl Platform Available Compiler Supports test-lock -dnl flavours option weak result -dnl --------------- --------- --------- -------- --------- -dnl Linux 2.4/glibc posix -lpthread Y OK +dnl Platform Available Compiler Supports test-lock +dnl flavours option weak result +dnl --------------- --------- --------- -------- --------- +dnl Linux 2.4/glibc posix -lpthread Y OK dnl -dnl GNU Hurd/glibc posix +dnl GNU Hurd/glibc posix dnl -dnl FreeBSD 5.3 posix -lc_r Y -dnl posix -lkse ? Y -dnl posix -lpthread ? Y -dnl posix -lthr Y +dnl FreeBSD 5.3 posix -lc_r Y +dnl posix -lkse ? Y +dnl posix -lpthread ? Y +dnl posix -lthr Y dnl -dnl FreeBSD 5.2 posix -lc_r Y -dnl posix -lkse Y -dnl posix -lthr Y +dnl FreeBSD 5.2 posix -lc_r Y +dnl posix -lkse Y +dnl posix -lthr Y dnl -dnl FreeBSD 4.0,4.10 posix -lc_r Y OK +dnl FreeBSD 4.0,4.10 posix -lc_r Y OK dnl -dnl NetBSD 1.6 -- +dnl NetBSD 1.6 -- dnl -dnl OpenBSD 3.4 posix -lpthread Y OK +dnl OpenBSD 3.4 posix -lpthread Y OK dnl -dnl MacOS X 10.[123] posix -lpthread Y OK +dnl Mac OS X 10.[123] posix -lpthread Y OK dnl -dnl Solaris 7,8,9 posix -lpthread Y Sol 7,8: 0.0; Sol 9: OK -dnl solaris -lthread Y Sol 7,8: 0.0; Sol 9: OK +dnl Solaris 7,8,9 posix -lpthread Y Sol 7,8: 0.0; Sol 9: OK +dnl solaris -lthread Y Sol 7,8: 0.0; Sol 9: OK dnl -dnl HP-UX 11 posix -lpthread N (cc) OK +dnl HP-UX 11 posix -lpthread N (cc) OK dnl Y (gcc) dnl -dnl IRIX 6.5 posix -lpthread Y 0.5 +dnl IRIX 6.5 posix -lpthread Y 0.5 dnl -dnl AIX 4.3,5.1 posix -lpthread N AIX 4: 0.5; AIX 5: OK +dnl AIX 4.3,5.1 posix -lpthread N AIX 4: 0.5; AIX 5: OK dnl -dnl OSF/1 4.0,5.1 posix -pthread (cc) N OK +dnl OSF/1 4.0,5.1 posix -pthread (cc) N OK dnl -lpthread (gcc) Y dnl -dnl Cygwin posix -lpthread Y OK +dnl Cygwin posix -lpthread Y OK dnl -dnl Any of the above pth -lpth 0.0 +dnl Any of the above pth -lpth 0.0 dnl -dnl Mingw windows N OK +dnl Mingw windows N OK dnl -dnl BeOS 5 -- +dnl BeOS 5 -- dnl dnl The test-lock result shows what happens if in test-lock.c EXPLICIT_YIELD is dnl turned off: diff --git a/m4/time_h.m4 b/m4/time_h.m4 index b88da764..3b839005 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-2012 Free Software Foundation, Inc. +# Copyright (C) 2000-2001, 2003-2007, 2009-2013 Free Software Foundation, Inc. -# serial 6 +# serial 7 # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -25,7 +25,7 @@ AC_DEFUN([gl_HEADER_TIME_H_BODY], AC_REQUIRE([gl_CHECK_TYPE_STRUCT_TIMESPEC]) ]) -dnl Define HAVE_STRUCT_TIMESPEC if 'struct timespec' is declared +dnl Check whether 'struct timespec' is declared dnl in time.h, sys/time.h, or pthread.h. AC_DEFUN([gl_CHECK_TYPE_STRUCT_TIMESPEC], diff --git a/m4/time_r.m4 b/m4/time_r.m4 index c3579fb3..c388a831 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-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2006-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. @@ -17,7 +17,7 @@ AC_DEFUN([gl_TIME_R], dnl Some systems don't declare localtime_r() and gmtime_r() if _REENTRANT is dnl not defined. - AC_CHECK_DECLS_ONCE([localtime_r]) + AC_CHECK_DECLS([localtime_r], [], [], [[#include <time.h>]]) if test $ac_cv_have_decl_localtime_r = no; then HAVE_DECL_LOCALTIME_R=0 fi diff --git a/m4/timer_time.m4 b/m4/timer_time.m4 index d6e0efeb..ea018f9a 100644 --- a/m4/timer_time.m4 +++ b/m4/timer_time.m4 @@ -1,5 +1,5 @@ -# timer_time.m4 serial 1 -dnl Copyright (C) 2011-2012 Free Software Foundation, Inc. +# timer_time.m4 serial 2 +dnl Copyright (C) 2011-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. @@ -33,7 +33,7 @@ AC_DEFUN([gl_TIMER_TIME], #endif #endif ], - [LIB_TIMER_TIME="$LIBMULTITHREAD $LIB_TIMER_TIME"]) + [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 597b9c2d..399404b5 100644 --- a/m4/timespec.m4 +++ b/m4/timespec.m4 @@ -1,6 +1,6 @@ -#serial 14 +#serial 15 -# Copyright (C) 2000-2001, 2003-2007, 2009-2012 Free Software Foundation, Inc. +# Copyright (C) 2000-2001, 2003-2007, 2009-2013 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -8,8 +8,4 @@ dnl From Jim Meyering -AC_DEFUN([gl_TIMESPEC], -[ - dnl Prerequisites of lib/timespec.h. - AC_REQUIRE([AC_C_INLINE]) -]) +AC_DEFUN([gl_TIMESPEC], [:]) diff --git a/m4/tls.m4 b/m4/tls.m4 index b0e89401..8ef1913b 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-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2005, 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. diff --git a/m4/tm_gmtoff.m4 b/m4/tm_gmtoff.m4 index c12e6cef..55e7ea32 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-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 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. diff --git a/m4/tzset.m4 b/m4/tzset.m4 index 54b11bd7..54af5e06 100644 --- a/m4/tzset.m4 +++ b/m4/tzset.m4 @@ -1,6 +1,6 @@ # serial 7 -# Copyright (C) 2003, 2007, 2009-2012 Free Software Foundation, Inc. +# Copyright (C) 2003, 2007, 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. diff --git a/m4/uname.m4 b/m4/uname.m4 index 663f4d8d..e8f1c817 100644 --- a/m4/uname.m4 +++ b/m4/uname.m4 @@ -1,5 +1,5 @@ # uname.m4 serial 11 -dnl Copyright (C) 2009-2012 Free Software Foundation, Inc. +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. diff --git a/m4/ungetc.m4 b/m4/ungetc.m4 index 9bc1ce76..4e3577a8 100644 --- a/m4/ungetc.m4 +++ b/m4/ungetc.m4 @@ -1,5 +1,5 @@ # ungetc.m4 serial 3 -dnl Copyright (C) 2009-2012 Free Software Foundation, Inc. +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. diff --git a/m4/unicodeio.m4 b/m4/unicodeio.m4 index e9b9bee9..b71770af 100644 --- a/m4/unicodeio.m4 +++ b/m4/unicodeio.m4 @@ -1,5 +1,5 @@ # unicodeio.m4 serial 2 -dnl Copyright (C) 2002-2003, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002-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. diff --git a/m4/unistd-safer.m4 b/m4/unistd-safer.m4 index 62e295bc..e65c3c92 100644 --- a/m4/unistd-safer.m4 +++ b/m4/unistd-safer.m4 @@ -1,5 +1,5 @@ #serial 9 -dnl Copyright (C) 2002, 2005-2006, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2005-2006, 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. diff --git a/m4/unistd_h.m4 b/m4/unistd_h.m4 index 7e7651b9..32dcfa58 100644 --- a/m4/unistd_h.m4 +++ b/m4/unistd_h.m4 @@ -1,5 +1,5 @@ -# unistd_h.m4 serial 65 -dnl Copyright (C) 2006-2012 Free Software Foundation, Inc. +# unistd_h.m4 serial 66 +dnl Copyright (C) 2006-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. @@ -11,7 +11,6 @@ AC_DEFUN([gl_UNISTD_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_UNISTD_H_DEFAULTS]) - AC_REQUIRE([AC_C_INLINE]) gl_CHECK_NEXT_HEADERS([unistd.h]) if test $ac_cv_header_unistd_h = yes; then diff --git a/m4/unlink-busy.m4 b/m4/unlink-busy.m4 index 8ba9489c..72fe72ff 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-2012 Free Software Foundation, Inc. +# Copyright (C) 2000-2001, 2004, 2007, 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. diff --git a/m4/unlink.m4 b/m4/unlink.m4 index cb0d5459..b6b99d17 100644 --- a/m4/unlink.m4 +++ b/m4/unlink.m4 @@ -1,5 +1,5 @@ -# unlink.m4 serial 10 -dnl Copyright (C) 2009-2012 Free Software Foundation, Inc. +# unlink.m4 serial 11 +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. @@ -56,14 +56,14 @@ AC_DEFUN([gl_FUNC_UNLINK], ;; esac - dnl Detect MacOS X 10.5.6 bug: On read-write HFS mounts, unlink("..") or + dnl Detect Mac OS X 10.5.6 bug: On read-write HFS mounts, unlink("..") or dnl unlink("../..") succeeds without doing anything. AC_CACHE_CHECK([whether unlink of a parent directory fails as it should], [gl_cv_func_unlink_parent_fails], [case "$host_os" in darwin*) dnl Try to unlink a subdirectory of /tmp, because /tmp is usually on a - dnl HFS mount on MacOS X. Use a subdirectory, owned by the current + dnl HFS mount on Mac OS X. Use a subdirectory, owned by the current dnl user, because otherwise unlink() may fail due to permissions dnl reasons, and because when running as root we don't want to risk dnl destroying the entire /tmp. diff --git a/m4/unlinkat.m4 b/m4/unlinkat.m4 index fc10d590..32cfbc11 100644 --- a/m4/unlinkat.m4 +++ b/m4/unlinkat.m4 @@ -1,5 +1,5 @@ # unlinkat.m4 serial 2 -dnl Copyright (C) 2004-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2004-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. diff --git a/m4/unlinkdir.m4 b/m4/unlinkdir.m4 index 48cf33c4..b555fc96 100644 --- a/m4/unlinkdir.m4 +++ b/m4/unlinkdir.m4 @@ -1,6 +1,6 @@ # serial 7 -# Copyright (C) 2005-2007, 2009-2012 Free Software Foundation, Inc. +# Copyright (C) 2005-2007, 2009-2013 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 c44adaee..f1462068 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-2012 Free Software Foundation, Inc. +# Copyright (C) 1998-2006, 2009-2013 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 b05638b9..0b125c63 100644 --- a/m4/uptime.m4 +++ b/m4/uptime.m4 @@ -1,6 +1,6 @@ # serial 8 -# Copyright (C) 1996, 1999-2001, 2004, 2009-2012 Free Software Foundation, Inc. +# Copyright (C) 1996, 1999-2001, 2004, 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. diff --git a/m4/userspec.m4 b/m4/userspec.m4 index a218a0cf..abf6bad0 100644 --- a/m4/userspec.m4 +++ b/m4/userspec.m4 @@ -1,5 +1,5 @@ # serial 11 -dnl Copyright (C) 2002-2006, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 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. diff --git a/m4/usleep.m4 b/m4/usleep.m4 index f64daf78..e430672d 100644 --- a/m4/usleep.m4 +++ b/m4/usleep.m4 @@ -1,5 +1,5 @@ # usleep.m4 serial 3 -dnl Copyright (C) 2009-2012 Free Software Foundation, Inc. +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. diff --git a/m4/utimbuf.m4 b/m4/utimbuf.m4 index 25eb85b3..3c9df414 100644 --- a/m4/utimbuf.m4 +++ b/m4/utimbuf.m4 @@ -1,6 +1,6 @@ # serial 9 -# Copyright (C) 1998-2001, 2003-2004, 2007, 2009-2012 Free Software Foundation, +# Copyright (C) 1998-2001, 2003-2004, 2007, 2009-2013 Free Software Foundation, # Inc. # # This file is free software; the Free Software Foundation diff --git a/m4/utimecmp.m4 b/m4/utimecmp.m4 index c6093040..4a85e01f 100644 --- a/m4/utimecmp.m4 +++ b/m4/utimecmp.m4 @@ -1,5 +1,5 @@ #serial 4 -dnl Copyright (C) 2004-2007, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2004-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. diff --git a/m4/utimens.m4 b/m4/utimens.m4 index 6a8b6ab7..10fe2a68 100644 --- a/m4/utimens.m4 +++ b/m4/utimens.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 2003-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2003-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. diff --git a/m4/utimensat.m4 b/m4/utimensat.m4 index d1bafcc4..396b8357 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-2012 Free Software Foundation, Inc. +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. diff --git a/m4/utimes.m4 b/m4/utimes.m4 index 417103a7..f8b19285 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-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2003-2005, 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. diff --git a/m4/vasnprintf.m4 b/m4/vasnprintf.m4 index 0ce11da1..d730e435 100644 --- a/m4/vasnprintf.m4 +++ b/m4/vasnprintf.m4 @@ -1,5 +1,5 @@ -# vasnprintf.m4 serial 35 -dnl Copyright (C) 2002-2004, 2006-2012 Free Software Foundation, Inc. +# vasnprintf.m4 serial 36 +dnl Copyright (C) 2002-2004, 2006-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. @@ -55,7 +55,6 @@ AC_DEFUN([gl_PREREQ_PRINTF_PARSE], # Prerequisites of lib/vasnprintf.c. AC_DEFUN_ONCE([gl_PREREQ_VASNPRINTF], [ - AC_REQUIRE([AC_C_INLINE]) AC_REQUIRE([AC_FUNC_ALLOCA]) AC_REQUIRE([AC_TYPE_LONG_LONG_INT]) AC_REQUIRE([gt_TYPE_WCHAR_T]) diff --git a/m4/vasprintf-posix.m4 b/m4/vasprintf-posix.m4 index 90159e2f..c2b0901b 100644 --- a/m4/vasprintf-posix.m4 +++ b/m4/vasprintf-posix.m4 @@ -1,5 +1,5 @@ # vasprintf-posix.m4 serial 13 -dnl Copyright (C) 2007-2012 Free Software Foundation, Inc. +dnl Copyright (C) 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. diff --git a/m4/vasprintf.m4 b/m4/vasprintf.m4 index 205ceea6..c214ff11 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-2012 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2006-2007, 2009-2013 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 4c6c6786..5dbef8e5 100644 --- a/m4/version-etc.m4 +++ b/m4/version-etc.m4 @@ -1,5 +1,5 @@ # version-etc.m4 serial 1 -# Copyright (C) 2009-2012 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. diff --git a/m4/vfprintf-posix.m4 b/m4/vfprintf-posix.m4 index 441bd57c..47a4645b 100644 --- a/m4/vfprintf-posix.m4 +++ b/m4/vfprintf-posix.m4 @@ -1,5 +1,5 @@ # vfprintf-posix.m4 serial 14 -dnl Copyright (C) 2007-2012 Free Software Foundation, Inc. +dnl Copyright (C) 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. diff --git a/m4/vprintf-posix.m4 b/m4/vprintf-posix.m4 index 0320352d..8a4eb19c 100644 --- a/m4/vprintf-posix.m4 +++ b/m4/vprintf-posix.m4 @@ -1,5 +1,5 @@ # vprintf-posix.m4 serial 3 -dnl Copyright (C) 2007-2012 Free Software Foundation, Inc. +dnl Copyright (C) 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. diff --git a/m4/wait-process.m4 b/m4/wait-process.m4 index 86c817c8..693bebf8 100644 --- a/m4/wait-process.m4 +++ b/m4/wait-process.m4 @@ -1,5 +1,5 @@ -# wait-process.m4 serial 5 -dnl Copyright (C) 2003, 2008-2012 Free Software Foundation, Inc. +# 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. @@ -7,7 +7,6 @@ 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([AC_C_INLINE]) AC_REQUIRE([gt_TYPE_SIG_ATOMIC_T]) AC_CHECK_FUNCS([waitid]) ]) diff --git a/m4/waitpid.m4 b/m4/waitpid.m4 index 42a83bb2..26ce890e 100644 --- a/m4/waitpid.m4 +++ b/m4/waitpid.m4 @@ -1,5 +1,5 @@ # waitpid.m4 serial 2 -dnl Copyright (C) 2010-2012 Free Software Foundation, Inc. +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. diff --git a/m4/warnings.m4 b/m4/warnings.m4 index c14c4801..4b2ac385 100644 --- a/m4/warnings.m4 +++ b/m4/warnings.m4 @@ -1,5 +1,5 @@ -# warnings.m4 serial 6 -dnl Copyright (C) 2008-2012 Free Software Foundation, Inc. +# warnings.m4 serial 7 +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. @@ -15,28 +15,47 @@ m4_ifdef([AS_VAR_APPEND], [AS_VAR_SET([$1], [AS_VAR_GET([$1])$2])])]) -# gl_WARN_ADD(PARAMETER, [VARIABLE = WARN_CFLAGS]) -# ------------------------------------------------ -# Adds parameter to WARN_CFLAGS if the compiler supports it. For example, -# gl_WARN_ADD([-Wparentheses]). +# gl_COMPILER_OPTION_IF(OPTION, [IF-SUPPORTED], [IF-NOT-SUPPORTED], +# [PROGRAM = AC_LANG_PROGRAM()]) +# ----------------------------------------------------------------- +# Check if the compiler supports OPTION when compiling PROGRAM. # -# If VARIABLE is a variable name, AC_SUBST it. -AC_DEFUN([gl_WARN_ADD], -dnl FIXME: gl_Warn must be used unquoted until we can assume -dnl autoconf 2.64 or newer. +# FIXME: gl_Warn must be used unquoted until we can assume Autoconf +# 2.64 or newer. +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 AC_CACHE_CHECK([whether _AC_LANG compiler handles $1], m4_defn([gl_Warn]), [ gl_save_compiler_FLAGS="$gl_Flags" - gl_Flags="$gl_Flags $1" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], + 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_Flags="$gl_save_compiler_FLAGS" ]) -AS_VAR_IF(gl_Warn, [yes], - [gl_AS_VAR_APPEND(m4_if([$2], [], [[WARN_CFLAGS]], [[$2]]), [" $1"])]) +AS_VAR_IF(gl_Warn, [yes], [$2], [$3]) AS_VAR_POPDEF([gl_Flags])dnl AS_VAR_POPDEF([gl_Warn])dnl -m4_ifval([$2], [AS_LITERAL_IF([$2], [AC_SUBST([$2])], [])])dnl ]) + + +# gl_WARN_ADD(OPTION, [VARIABLE = WARN_CFLAGS], +# [PROGRAM = AC_LANG_PROGRAM()]) +# --------------------------------------------- +# Adds parameter to WARN_CFLAGS if the compiler supports it when +# compiling PROGRAM. For example, gl_WARN_ADD([-Wparentheses]). +# +# If VARIABLE is a variable name, AC_SUBST it. +AC_DEFUN([gl_WARN_ADD], +[gl_COMPILER_OPTION_IF([$1], + [gl_AS_VAR_APPEND(m4_if([$2], [], [[WARN_CFLAGS]], [[$2]]), [" $1"])], + [], + [$3]) +m4_ifval([$2], + [AS_LITERAL_IF([$2], [AC_SUBST([$2])])], + [AC_SUBST([WARN_CFLAGS])])dnl +]) + +# Local Variables: +# mode: autoconf +# End: diff --git a/m4/wchar_h.m4 b/m4/wchar_h.m4 index c7a8b2d7..bedb15a4 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-2012 Free Software Foundation, Inc. +dnl Copyright (C) 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. diff --git a/m4/wchar_t.m4 b/m4/wchar_t.m4 index 534735d8..e1e1e699 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-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002-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. diff --git a/m4/wcrtomb.m4 b/m4/wcrtomb.m4 index 00d7302e..f56b5bae 100644 --- a/m4/wcrtomb.m4 +++ b/m4/wcrtomb.m4 @@ -1,5 +1,5 @@ # wcrtomb.m4 serial 11 -dnl Copyright (C) 2008-2012 Free Software Foundation, Inc. +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. diff --git a/m4/wcswidth.m4 b/m4/wcswidth.m4 index 8e2925a7..c61e5e3b 100644 --- a/m4/wcswidth.m4 +++ b/m4/wcswidth.m4 @@ -1,5 +1,5 @@ # wcswidth.m4 serial 2 -dnl Copyright (C) 2011-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2011-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. diff --git a/m4/wctob.m4 b/m4/wctob.m4 index 786c881d..edc0d79f 100644 --- a/m4/wctob.m4 +++ b/m4/wctob.m4 @@ -1,5 +1,5 @@ # wctob.m4 serial 10 -dnl Copyright (C) 2008-2012 Free Software Foundation, Inc. +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. diff --git a/m4/wctomb.m4 b/m4/wctomb.m4 index 88fd6be8..7deba922 100644 --- a/m4/wctomb.m4 +++ b/m4/wctomb.m4 @@ -1,5 +1,5 @@ # wctomb.m4 serial 2 -dnl Copyright (C) 2011-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2011-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. diff --git a/m4/wctype_h.m4 b/m4/wctype_h.m4 index 4b19f643..82ada0ee 100644 --- a/m4/wctype_h.m4 +++ b/m4/wctype_h.m4 @@ -1,8 +1,8 @@ -# wctype_h.m4 serial 17 +# wctype_h.m4 serial 18 dnl A placeholder for ISO C99 <wctype.h>, for platforms that lack it. -dnl Copyright (C) 2006-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2006-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. @@ -22,8 +22,6 @@ AC_DEFUN([gl_WCTYPE_H], fi AC_SUBST([HAVE_ISWCNTRL]) - AC_REQUIRE([AC_C_INLINE]) - AC_REQUIRE([gt_TYPE_WINT_T]) if test $gt_cv_c_wint_t = yes; then HAVE_WINT_T=1 diff --git a/m4/wcwidth.m4 b/m4/wcwidth.m4 index 196c940e..740f81ee 100644 --- a/m4/wcwidth.m4 +++ b/m4/wcwidth.m4 @@ -1,5 +1,5 @@ -# wcwidth.m4 serial 22 -dnl Copyright (C) 2006-2012 Free Software Foundation, Inc. +# wcwidth.m4 serial 23 +dnl Copyright (C) 2006-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. @@ -36,7 +36,7 @@ AC_DEFUN([gl_FUNC_WCWIDTH], if test $ac_cv_func_wcwidth = yes; then HAVE_WCWIDTH=1 - dnl On MacOS X 10.3, wcwidth(0x0301) (COMBINING ACUTE ACCENT) returns 1. + dnl On Mac OS X 10.3, wcwidth(0x0301) (COMBINING ACUTE ACCENT) returns 1. dnl On OpenBSD 5.0, wcwidth(0x05B0) (HEBREW POINT SHEVA) returns 1. dnl On OSF/1 5.1, wcwidth(0x200B) (ZERO WIDTH SPACE) returns 1. dnl This leads to bugs in 'ls' (coreutils). diff --git a/m4/wint_t.m4 b/m4/wint_t.m4 index 3260cce3..d7cd3db9 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-2012 Free Software Foundation, Inc. +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. diff --git a/m4/write-any-file.m4 b/m4/write-any-file.m4 index 5f06927e..7327d404 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-2012 Free Software Foundation, Inc. +# Copyright (C) 2007, 2009-2013 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 a6b12298..a79b2cc9 100644 --- a/m4/write.m4 +++ b/m4/write.m4 @@ -1,5 +1,5 @@ -# write.m4 serial 4 -dnl Copyright (C) 2008-2012 Free Software Foundation, Inc. +# write.m4 serial 5 +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. @@ -29,7 +29,4 @@ AC_DEFUN([gl_FUNC_WRITE], ]) # Prerequisites of lib/write.c. -AC_DEFUN([gl_PREREQ_WRITE], -[ - AC_REQUIRE([AC_C_INLINE]) -]) +AC_DEFUN([gl_PREREQ_WRITE], [:]) diff --git a/m4/xalloc.m4 b/m4/xalloc.m4 index f47b649b..64ca7014 100644 --- a/m4/xalloc.m4 +++ b/m4/xalloc.m4 @@ -1,22 +1,7 @@ -# xalloc.m4 serial 17 -dnl Copyright (C) 2002-2006, 2009-2012 Free Software Foundation, Inc. +# xalloc.m4 serial 18 +dnl Copyright (C) 2002-2006, 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_XALLOC], -[ - gl_PREREQ_XALLOC - gl_PREREQ_XMALLOC -]) - -# Prerequisites of lib/xalloc.h. -AC_DEFUN([gl_PREREQ_XALLOC], [ - AC_REQUIRE([gl_INLINE]) - : -]) - -# Prerequisites of lib/xmalloc.c. -AC_DEFUN([gl_PREREQ_XMALLOC], [ - : -]) +AC_DEFUN([gl_XALLOC], [:]) diff --git a/m4/xattr.m4 b/m4/xattr.m4 index 83149f27..a40e4512 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-2012 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. diff --git a/m4/xfts.m4 b/m4/xfts.m4 deleted file mode 100644 index ce556925..00000000 --- a/m4/xfts.m4 +++ /dev/null @@ -1,14 +0,0 @@ -#serial 1 -dnl Copyright (C) 2005-2012 Free Software Foundation, Inc. -dnl This file is free software; the Free 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_XFTS], -[ - AC_LIBSOURCES([xfts.c, xfts.h]) - AC_LIBOBJ([xfts]) - - dnl Prerequisites of lib/xfts.c. - : -]) diff --git a/m4/xgetcwd.m4 b/m4/xgetcwd.m4 index fa2c87e3..c972029d 100644 --- a/m4/xgetcwd.m4 +++ b/m4/xgetcwd.m4 @@ -1,5 +1,5 @@ #serial 8 -dnl Copyright (C) 2002-2006, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 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. diff --git a/m4/xnanosleep.m4 b/m4/xnanosleep.m4 index 916485e9..7a706d97 100644 --- a/m4/xnanosleep.m4 +++ b/m4/xnanosleep.m4 @@ -1,5 +1,5 @@ #serial 5 -dnl Copyright (C) 2005-2006, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2006, 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. diff --git a/m4/xsize.m4 b/m4/xsize.m4 index b3b7feeb..8ea9f2cd 100644 --- a/m4/xsize.m4 +++ b/m4/xsize.m4 @@ -1,5 +1,5 @@ -# xsize.m4 serial 4 -dnl Copyright (C) 2003-2004, 2008-2012 Free Software Foundation, Inc. +# xsize.m4 serial 5 +dnl Copyright (C) 2003-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. @@ -8,6 +8,5 @@ AC_DEFUN([gl_XSIZE], [ dnl Prerequisites of lib/xsize.h. AC_REQUIRE([gl_SIZE_MAX]) - AC_REQUIRE([AC_C_INLINE]) AC_CHECK_HEADERS([stdint.h]) ]) diff --git a/m4/xstrndup.m4 b/m4/xstrndup.m4 index 1642ca51..4a9330bb 100644 --- a/m4/xstrndup.m4 +++ b/m4/xstrndup.m4 @@ -1,5 +1,5 @@ # xstrndup.m4 serial 2 -dnl Copyright (C) 2003, 2009-2012 Free Software Foundation, Inc. +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. diff --git a/m4/xstrtod.m4 b/m4/xstrtod.m4 index f871f6c8..b7267da5 100644 --- a/m4/xstrtod.m4 +++ b/m4/xstrtod.m4 @@ -1,5 +1,5 @@ #serial 8 -dnl Copyright (C) 2002-2003, 2005-2006, 2009-2012 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2013 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 76f8f96e..d52ee112 100644 --- a/m4/xstrtol.m4 +++ b/m4/xstrtol.m4 @@ -1,5 +1,5 @@ #serial 11 -dnl Copyright (C) 2002-2007, 2009-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2002-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. diff --git a/m4/xvasprintf.m4 b/m4/xvasprintf.m4 index 0e19debd..772dcc86 100644 --- a/m4/xvasprintf.m4 +++ b/m4/xvasprintf.m4 @@ -1,11 +1,8 @@ -# xvasprintf.m4 serial 1 -dnl Copyright (C) 2006, 2009-2012 Free Software Foundation, Inc. +# xvasprintf.m4 serial 2 +dnl Copyright (C) 2006, 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_XVASPRINTF], -[ - dnl Prerequisites of lib/xvasprintf.c. - AC_REQUIRE([AC_C_INLINE]) -]) +dnl Prerequisites of lib/xvasprintf.c. +AC_DEFUN([gl_XVASPRINTF], [:]) diff --git a/m4/yesno.m4 b/m4/yesno.m4 index 00749c46..e89584a5 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-2012 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2013 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 94e69c47..8197766d 100644 --- a/m4/yield.m4 +++ b/m4/yield.m4 @@ -1,5 +1,5 @@ # yield.m4 serial 2 -dnl Copyright (C) 2005-2012 Free Software Foundation, Inc. +dnl Copyright (C) 2005-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. diff --git a/maint.mk b/maint.mk index 1c7af036..2b454a15 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-2012 Free Software Foundation, Inc. +## Copyright (C) 2001-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 @@ -28,6 +28,28 @@ ifneq ($(build_aux),) set $$(_build-aux) relative to $$(srcdir) instead of $$(build_aux)") endif +# Helper variables. +_empty = +_sp = $(_empty) $(_empty) + +# _equal,S1,S2 +# ------------ +# If S1 == S2, return S1, otherwise the empty string. +_equal = $(and $(findstring $(1),$(2)),$(findstring $(2),$(1))) + +# member-check,VARIABLE,VALID-VALUES +# ---------------------------------- +# Check that $(VARIABLE) is in the space-separated list of VALID-VALUES, and +# return it. Die otherwise. +member-check = \ + $(strip \ + $(if $($(1)), \ + $(if $(findstring $(_sp),$($(1))), \ + $(error invalid $(1): '$($(1))', expected $(2)), \ + $(or $(findstring $(_sp)$($(1))$(_sp),$(_sp)$(2)$(_sp)), \ + $(error invalid $(1): '$($(1))', expected $(2)))), \ + $(error $(1) undefined))) + # Do not save the original name or timestamp in the .tar.gz file. # Use --rsyncable if available. gzip_rsyncable := \ @@ -52,16 +74,16 @@ _dot_escaped_srcdir = $(subst .,\.,$(srcdir)) # Post-process $(VC_LIST) output, prepending $(srcdir)/, but only # when $(srcdir) is not ".". ifeq ($(srcdir),.) -_prepend_srcdir_prefix = + _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, # (i.e., with no $(srcdir) prefix), this definition is careful to # remove any $(srcdir) prefix, and to restore what it removes. _sc_excl = \ - $(if $(exclude_file_name_regexp--$@),$(exclude_file_name_regexp--$@),^$$) + $(or $(exclude_file_name_regexp--$@),^$$) VC_LIST_EXCEPT = \ $(VC_LIST) | sed 's|^$(_dot_escaped_srcdir)/||' \ | if test -f $(srcdir)/.x-$@; then grep -vEf $(srcdir)/.x-$@; \ @@ -78,32 +100,41 @@ VERSION_REGEXP = $(subst .,\.,$(VERSION)) PREV_VERSION_REGEXP = $(subst .,\.,$(PREV_VERSION)) ifeq ($(VC),$(GIT)) -this-vc-tag = v$(VERSION) -this-vc-tag-regexp = v$(VERSION_REGEXP) + this-vc-tag = v$(VERSION) + this-vc-tag-regexp = v$(VERSION_REGEXP) else -tag-package = $(shell echo "$(PACKAGE)" | tr '[:lower:]' '[:upper:]') -tag-this-version = $(subst .,_,$(VERSION)) -this-vc-tag = $(tag-package)-$(tag-this-version) -this-vc-tag-regexp = $(this-vc-tag) + tag-package = $(shell echo "$(PACKAGE)" | tr '[:lower:]' '[:upper:]') + tag-this-version = $(subst .,_,$(VERSION)) + this-vc-tag = $(tag-package)-$(tag-this-version) + this-vc-tag-regexp = $(this-vc-tag) endif my_distdir = $(PACKAGE)-$(VERSION) # Old releases are stored here. release_archive_dir ?= ../release +# If RELEASE_TYPE is undefined, but RELEASE is, use its second word. +# But overwrite VERSION. +ifdef RELEASE + VERSION := $(word 1, $(RELEASE)) + RELEASE_TYPE ?= $(word 2, $(RELEASE)) +endif + +# Validate and return $(RELEASE_TYPE), or die. +RELEASE_TYPES = alpha beta stable +release-type = $(call member-check,RELEASE_TYPE,$(RELEASE_TYPES)) + # Override gnu_rel_host and url_dir_list in cfg.mk if these are not right. # Use alpha.gnu.org for alpha and beta releases. # Use ftp.gnu.org for stable releases. gnu_ftp_host-alpha = alpha.gnu.org gnu_ftp_host-beta = alpha.gnu.org gnu_ftp_host-stable = ftp.gnu.org -gnu_rel_host ?= $(gnu_ftp_host-$(RELEASE_TYPE)) +gnu_rel_host ?= $(gnu_ftp_host-$(release-type)) -ifeq ($(gnu_rel_host),ftp.gnu.org) -url_dir_list ?= http://ftpmirror.gnu.org/$(PACKAGE) -else -url_dir_list ?= ftp://$(gnu_rel_host)/gnu/$(PACKAGE) -endif +url_dir_list ?= $(if $(call _equal,$(gnu_rel_host),ftp.gnu.org), \ + http://ftpmirror.gnu.org/$(PACKAGE), \ + ftp://$(gnu_rel_host)/gnu/$(PACKAGE)) # Override this in cfg.mk if you are using a different format in your # NEWS file. @@ -124,7 +155,7 @@ export LC_ALL = C ## Sanity checks. ## ## --------------- ## -_cfg_mk := $(shell test -f $(srcdir)/cfg.mk && echo '$(srcdir)/cfg.mk') +_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' \ @@ -132,9 +163,9 @@ syntax-check-rules := $(sort $(shell sed -n 's/^\(sc_[a-zA-Z0-9_-]*\):.*/\1/p' \ .PHONY: $(syntax-check-rules) ifeq ($(shell $(VC_LIST) >/dev/null 2>&1; echo $$?),0) -local-checks-available += $(syntax-check-rules) + local-checks-available += $(syntax-check-rules) else -local-checks-available += no-vc-detected + local-checks-available += no-vc-detected no-vc-detected: @echo "No version control files detected; skipping syntax check" endif @@ -187,9 +218,11 @@ syntax-check: $(local-check) # # in_vc_files | in_files # -# grep-E-style regexp denoting the files to check. If no files -# are specified the default are all the files that are under -# version control. +# grep-E-style regexp selecting the files to check. For in_vc_files, +# the regexp is used to select matching files from the list of all +# version-controlled files; for in_files, it's from the names printed +# by "find $(srcdir)". When neither is specified, use all files that +# are under version control. # # containing | non_containing # @@ -261,7 +294,7 @@ define _sc_search_regexp : Filter by file name; \ if test -n "$$in_files"; then \ files=$$(find $(srcdir) | grep -E "$$in_files" \ - | grep -Ev '$(exclude_file_name_regexp--$@)'); \ + | grep -Ev '$(_sc_excl)'); \ else \ files=$$($(VC_LIST_EXCEPT)); \ if test -n "$$in_vc_files"; then \ @@ -328,8 +361,16 @@ sc_prohibit_atoi_atof: sp_ = strcmp *\(.+\) sc_prohibit_strcmp: @prohibit='! *strcmp *\(|\<$(sp_) *[!=]=|[!=]= *$(sp_)' \ - exclude=':# *define STRN?EQ\(' \ - halt='$(ME): replace strcmp calls above with STREQ/STRNEQ' \ + exclude='# *define STRN?EQ\(' \ + halt='replace strcmp calls above with STREQ/STRNEQ' \ + $(_sc_search_regexp) + +# Really. You don't want to use this function. +# It may fail to NUL-terminate the destination, +# and always NUL-pads out to the specified length. +sc_prohibit_strncpy: + @prohibit='\<strncpy *\(' \ + halt='do not use strncpy, period' \ $(_sc_search_regexp) # Pass EXIT_*, not number, to usage, exit, and error (when exiting) @@ -343,8 +384,9 @@ sc_prohibit_strcmp: # | xargs --no-run-if-empty \ # perl -pi -e 's/(^|[^.])\b(exit ?)\(0\)/$1$2(EXIT_SUCCESS)/' sc_prohibit_magic_number_exit: - @prohibit='(^|[^.])\<(usage|exit) ?\([0-9]|\<error ?\([1-9][0-9]*,' \ - halt='use EXIT_* values rather than magic number' \ + @prohibit='(^|[^.])\<(usage|exit|error) ?\(-?[0-9]+[,)]' \ + exclude='exit \(77\)|error ?\(((0|77),|[^,]*)' \ + halt='use EXIT_* values rather than magic number' \ $(_sc_search_regexp) # Using EXIT_SUCCESS as the first argument to error is misleading, @@ -559,8 +601,6 @@ sc_prohibit_c_ctype_without_use: @h='c-ctype.h' re='\<c_($(ctype_re)) *\(' \ $(_sc_header_without_use) -_empty = -_sp = $(_empty) $(_empty) # The following list was generated by running: # man signal.h|col -b|perl -ne '/bsd_signal.*;/.../sigwaitinfo.*;/ and print' \ # | perl -lne '/^\s+(?:int|void).*?(\w+).*/ and print $1' | fmt @@ -713,6 +753,7 @@ sc_require_test_exit_idiom: sc_trailing_blank: @prohibit='[ ]$$' \ halt='found trailing blank(s)' \ + exclude='^Binary file .* matches$$' \ $(_sc_search_regexp) # Match lines like the following, but where there is only one space @@ -733,7 +774,7 @@ _gl_translatable_diag_func_re ?= error sc_unmarked_diagnostics: @prohibit='\<$(_gl_translatable_diag_func_re) *\([^"]*"[^"]*[a-z]{3}' \ exclude='(_|ngettext ?)\(' \ - halt='$(ME): found unmarked diagnostic(s)' \ + halt='found unmarked diagnostic(s)' \ $(_sc_search_regexp) # Avoid useless parentheses like those in this example: @@ -767,6 +808,11 @@ sc_prohibit_always_true_header_tests: ' with the corresponding gnulib module, they are always true') \ $(_sc_search_regexp) +sc_prohibit_defined_have_decl_tests: + @prohibit='#[ ]*if(n?def|.*\<defined)\>[ (]+HAVE_DECL_' \ + halt='HAVE_DECL macros are always defined' \ + $(_sc_search_regexp) + # ================================================================== gl_other_headers_ ?= \ intprops.h \ @@ -1004,7 +1050,7 @@ sc_redundant_const: sc_const_long_option: @prohibit='^ *static.*struct option ' \ exclude='const struct option|struct option const' \ - halt='$(ME): add "const" to the above declarations' \ + halt='add "const" to the above declarations' \ $(_sc_search_regexp) NEWS_hash = \ @@ -1051,7 +1097,7 @@ sc_makefile_at_at_check: && { echo '$(ME): use $$(...), not @...@' 1>&2; exit 1; } || : news-check: NEWS - if sed -n $(news-check-lines-spec)p $(srcdir)/NEWS \ + $(AM_V_GEN)if sed -n $(news-check-lines-spec)p $< \ | grep -E $(news-check-regexp) >/dev/null; then \ :; \ else \ @@ -1075,9 +1121,11 @@ fix_po_file_diag = \ 'you have changed the set of files with translatable diagnostics;\n\ apply the above patch\n' -# Verify that all source files using _() are listed in po/POTFILES.in. +# Verify that all source files using _() (more specifically, files that +# match $(_gl_translatable_string_re)) are listed in po/POTFILES.in. po_file ?= $(srcdir)/po/POTFILES.in generated_files ?= $(srcdir)/lib/*.[ch] +_gl_translatable_string_re ?= \b(N?_|gettext *)\([^)"]*("|$$) sc_po_check: @if test -f $(po_file); then \ grep -E -v '^(#|$$)' $(po_file) \ @@ -1097,7 +1145,7 @@ sc_po_check: esac; \ files="$$files $$file"; \ done; \ - grep -E -l '\b(N?_|gettext *)\([^)"]*("|$$)' $$files \ + grep -E -l '$(_gl_translatable_string_re)' $$files \ | 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; }; \ @@ -1107,7 +1155,7 @@ sc_po_check: # Sometimes it is useful to change the PATH environment variable # in Makefiles. When doing so, it's better not to use the Unix-centric # path separator of ':', but rather the automake-provided '$(PATH_SEPARATOR)'. -msg = '$(ME): Do not use ":" above; use $$(PATH_SEPARATOR) instead' +msg = 'Do not use ":" above; use $$(PATH_SEPARATOR) instead' sc_makefile_path_separator_check: @prohibit='PATH[=].*:' \ in_vc_files='akefile|\.mk$$' \ @@ -1118,7 +1166,7 @@ sc_makefile_path_separator_check: # i.e., when pkg-M.N.tar.xz already exists (either in "." or in ../release) # and is read-only. writable-files: - if test -d $(release_archive_dir); then \ + $(AM_V_GEN)if test -d $(release_archive_dir); then \ for file in $(DIST_ARCHIVES); do \ for p in ./ $(release_archive_dir)/; do \ test -e $$p$$file || continue; \ @@ -1200,22 +1248,31 @@ sc_Wundef_boolean: # not be constant, or might overflow a stack. In general, use PATH_MAX as # a limit, not an array or alloca size. sc_prohibit_path_max_allocation: - @prohibit='(\balloca *\([^)]*|\[[^]]*)PATH_MAX' \ + @prohibit='(\balloca *\([^)]*|\[[^]]*)\bPATH_MAX' \ halt='Avoid stack allocations of size PATH_MAX' \ $(_sc_search_regexp) sc_vulnerable_makefile_CVE-2009-4029: @prohibit='perm -777 -exec chmod a\+rwx|chmod 777 \$$\(distdir\)' \ - in_files=$$(find $(srcdir) -name Makefile.in) \ + in_files='(^|/)Makefile\.in$$' \ halt=$$(printf '%s\n' \ 'the above files are vulnerable; beware of running' \ ' "make dist*" rules, and upgrade to fixed automake' \ ' see http://bugzilla.redhat.com/542609 for details') \ $(_sc_search_regexp) +sc_vulnerable_makefile_CVE-2012-3386: + @prohibit='chmod a\+w \$$\(distdir\)' \ + in_files='(^|/)Makefile\.in$$' \ + halt=$$(printf '%s\n' \ + 'the above files are vulnerable; beware of running' \ + ' "make distcheck", and upgrade to fixed automake' \ + ' see http://bugzilla.redhat.com/CVE-2012-3386 for details') \ + $(_sc_search_regexp) + vc-diff-check: - (unset CDPATH; cd $(srcdir) && $(VC) diff) > vc-diffs || : - if test -s vc-diffs; then \ + $(AM_V_GEN)(unset CDPATH; cd $(srcdir) && $(VC) diff) > vc-diffs || : + $(AM_V_at)if test -s vc-diffs; then \ cat vc-diffs; \ echo "Some files are locally modified:" 1>&2; \ exit 1; \ @@ -1231,35 +1288,42 @@ bootstrap-tools ?= autoconf,automake,gnulib # 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 ?= \ - $$(git cat-file tag v$(VERSION) \ - | gpgv --status-fd 1 --keyring /dev/null - - 2>/dev/null \ - | sed -n '/^\[GNUPG:\] ERRSIG /{s///;s/ .*//p;q}') +gpg_key_ID ?= \ + $$(cd $(srcdir) \ + && git cat-file tag v$(VERSION) \ + | gpgv --status-fd 1 --keyring /dev/null - - 2>/dev/null \ + | awk '/^\[GNUPG:\] ERRSIG / {print $$3; exit}') translation_project_ ?= coordinator@translationproject.org # Make info-gnu the default only for a stable release. -ifeq ($(RELEASE_TYPE),stable) - announcement_Cc_ ?= $(translation_project_), $(PACKAGE_BUGREPORT) - announcement_mail_headers_ ?= \ - To: info-gnu@gnu.org \ - Cc: $(announcement_Cc_) \ - Mail-Followup-To: $(PACKAGE_BUGREPORT) -else - announcement_Cc_ ?= $(translation_project_) - announcement_mail_headers_ ?= \ - To: $(PACKAGE_BUGREPORT) \ - Cc: $(announcement_Cc_) -endif - +announcement_Cc_stable = $(translation_project_), $(PACKAGE_BUGREPORT) +announcement_mail_headers_stable = \ + To: info-gnu@gnu.org \ + Cc: $(announcement_Cc_) \ + Mail-Followup-To: $(PACKAGE_BUGREPORT) + +announcement_Cc_alpha = $(translation_project_) +announcement_mail_headers_alpha = \ + To: $(PACKAGE_BUGREPORT) \ + Cc: $(announcement_Cc_) + +announcement_mail_Cc_beta = $(announcement_mail_Cc_alpha) +announcement_mail_headers_beta = $(announcement_mail_headers_alpha) + +announcement_mail_Cc_ ?= $(announcement_mail_Cc_$(release-type)) +announcement_mail_headers_ ?= $(announcement_mail_headers_$(release-type)) announcement: NEWS ChangeLog $(rel-files) - @$(srcdir)/$(_build-aux)/announce-gen \ +# Not $(AM_V_GEN) since the output of this command serves as +# announcement message: it would start with " GEN announcement". + $(AM_V_at)$(srcdir)/$(_build-aux)/announce-gen \ --mail-headers='$(announcement_mail_headers_)' \ - --release-type=$(RELEASE_TYPE) \ + --release-type=$(release-type) \ --package=$(PACKAGE) \ --prev=$(PREV_VERSION) \ --curr=$(VERSION) \ --gpg-key-id=$(gpg_key_ID) \ + --srcdir=$(srcdir) \ --news=$(srcdir)/NEWS \ --bootstrap-tools=$(bootstrap-tools) \ $$(case ,$(bootstrap-tools), in (*,gnulib,*) \ @@ -1267,6 +1331,12 @@ announcement: NEWS ChangeLog $(rel-files) --no-print-checksums \ $(addprefix --url-dir=, $(url_dir_list)) +.PHONY: release-commit +release-commit: + $(AM_V_GEN)cd $(srcdir) \ + && $(_build-aux)/do-release-commit-and-tag \ + -C $(abs_builddir) $(RELEASE) + ## ---------------- ## ## Updating files. ## ## ---------------- ## @@ -1275,16 +1345,22 @@ ftp-gnu = ftp://ftp.gnu.org/gnu www-gnu = http://www.gnu.org upload_dest_dir_ ?= $(PACKAGE) +upload_command = \ + $(srcdir)/$(_build-aux)/gnupload $(GNUPLOADFLAGS) \ + --to $(gnu_rel_host):$(upload_dest_dir_) \ + $(rel-files) emit_upload_commands: @echo ===================================== @echo ===================================== - @echo "$(srcdir)/$(_build-aux)/gnupload $(GNUPLOADFLAGS) \\" - @echo " --to $(gnu_rel_host):$(upload_dest_dir_) \\" - @echo " $(rel-files)" + @echo '$(upload_command)' @echo '# send the ~/announce-$(my_distdir) e-mail' @echo ===================================== @echo ===================================== +.PHONY: upload +upload: + $(AM_V_GEN)$(upload_command) + define emit-commit-log printf '%s\n' 'maint: post-release administrivia' '' \ '* NEWS: Add header line for next release.' \ @@ -1294,7 +1370,8 @@ endef .PHONY: no-submodule-changes no-submodule-changes: - if test -d $(srcdir)/.git; then \ + $(AM_V_GEN)if test -d $(srcdir)/.git \ + && git --version >/dev/null 2>&1; then \ diff=$$(cd $(srcdir) && git submodule -q foreach \ git diff-index --name-only HEAD) \ || exit 1; \ @@ -1312,10 +1389,12 @@ submodule-checks ?= no-submodule-changes public-submodule-commit # cannot be built from a fresh clone. .PHONY: public-submodule-commit public-submodule-commit: - $(AM_V_GEN)if test -d $(srcdir)/.git; then \ + $(AM_V_GEN)if test -d $(srcdir)/.git \ + && git --version >/dev/null 2>&1; then \ cd $(srcdir) && \ - git submodule --quiet foreach test '$$(git rev-parse $$sha1)' \ - = '$$(git merge-base origin $$sha1)' \ + git submodule --quiet foreach \ + test '"$$(git rev-parse "$$sha1")"' \ + = '"$$(git merge-base origin "$$sha1")"' \ || { echo '$(ME): found non-public submodule commit' >&2; \ exit 1; }; \ else \ @@ -1330,19 +1409,22 @@ public-submodule-commit: gl_public_submodule_commit ?= public-submodule-commit check: $(gl_public_submodule_commit) -.PHONY: alpha beta stable +.PHONY: alpha beta stable release ALL_RECURSIVE_TARGETS += alpha beta stable alpha beta stable: $(local-check) writable-files $(submodule-checks) - test $@ = stable \ + $(AM_V_GEN)test $@ = stable \ && { echo $(VERSION) | grep -E '^[0-9]+(\.[0-9]+)+$$' \ || { echo "invalid version string: $(VERSION)" 1>&2; exit 1;};}\ || : - $(MAKE) vc-diff-check - $(MAKE) news-check - $(MAKE) distcheck - $(MAKE) dist - $(MAKE) $(release-prep-hook) RELEASE_TYPE=$@ - $(MAKE) -s emit_upload_commands RELEASE_TYPE=$@ + $(AM_V_at)$(MAKE) vc-diff-check + $(AM_V_at)$(MAKE) news-check + $(AM_V_at)$(MAKE) distcheck + $(AM_V_at)$(MAKE) dist + $(AM_V_at)$(MAKE) $(release-prep-hook) RELEASE_TYPE=$@ + $(AM_V_at)$(MAKE) -s emit_upload_commands RELEASE_TYPE=$@ + +release: + $(AM_V_GEN)$(MAKE) $(release-type) # Override this in cfg.mk if you follow different procedures. release-prep-hook ?= release-prep @@ -1350,19 +1432,19 @@ release-prep-hook ?= release-prep gl_noteworthy_news_ = * Noteworthy changes in release ?.? (????-??-??) [?] .PHONY: release-prep release-prep: - case $$RELEASE_TYPE in alpha|beta|stable) ;; \ - *) echo "invalid RELEASE_TYPE: $$RELEASE_TYPE" 1>&2; exit 1;; esac - $(MAKE) --no-print-directory -s announcement > ~/announce-$(my_distdir) - if test -d $(release_archive_dir); then \ + $(AM_V_GEN)$(MAKE) --no-print-directory -s announcement \ + > ~/announce-$(my_distdir) + $(AM_V_at)if test -d $(release_archive_dir); then \ ln $(rel-files) $(release_archive_dir); \ chmod a-w $(rel-files); \ fi - echo $(VERSION) > $(prev_version_file) - $(MAKE) update-NEWS-hash - perl -pi -e '$$. == 3 and print "$(gl_noteworthy_news_)\n\n\n"' NEWS - $(emit-commit-log) > .ci-msg - $(VC) commit -F .ci-msg -a - rm .ci-msg + $(AM_V_at)echo $(VERSION) > $(prev_version_file) + $(AM_V_at)$(MAKE) update-NEWS-hash + $(AM_V_at)perl -pi \ + -e '$$. == 3 and print "$(gl_noteworthy_news_)\n\n\n"' \ + $(srcdir)/NEWS + $(AM_V_at)msg=$$($(emit-commit-log)) || exit 1; \ + cd $(srcdir) && $(VC) commit -m "$$msg" -a # Override this with e.g., -s $(srcdir)/some_other_name.texi # if the default $(PACKAGE)-derived name doesn't apply. @@ -1370,14 +1452,20 @@ gendocs_options_ ?= .PHONY: web-manual web-manual: - @test -z "$(manual_title)" \ + $(AM_V_GEN)test -z "$(manual_title)" \ && { echo define manual_title in cfg.mk 1>&2; exit 1; } || : - @cd '$(srcdir)/doc'; \ + $(AM_V_at)cd '$(srcdir)/doc'; \ $(SHELL) ../$(_build-aux)/gendocs.sh $(gendocs_options_) \ -o '$(abs_builddir)/doc/manual' \ --email $(PACKAGE_BUGREPORT) $(PACKAGE) \ "$(PACKAGE_NAME) - $(manual_title)" - @echo " *** Upload the doc/manual directory to web-cvs." + $(AM_V_at)echo " *** Upload the doc/manual directory to web-cvs." + +.PHONY: web-manual-update +web-manual-update: + $(AM_V_GEN)cd $(srcdir) \ + && $(_build-aux)/gnu-web-doc-update -C $(abs_builddir) + # Code Coverage @@ -1403,6 +1491,31 @@ gen-coverage: coverage: init-coverage build-coverage gen-coverage +# Some projects carry local adjustments for gnulib modules via patches in +# a gnulib patch directory whose default name is gl/ (defined in bootstrap +# via local_gl_dir=gl). Those patches become stale as the originals evolve +# in gnulib. Use this rule to refresh any stale patches. It applies each +# patch to the original in $(gnulib_dir) and uses the temporary result to +# generate a fuzz-free .diff file. If you customize the name of your local +# gnulib patch directory via bootstrap.conf, this rule detects that name. +# Run this from a non-VPATH (i.e., srcdir) build directory. +.PHONY: refresh-gnulib-patches +refresh-gnulib-patches: + gl=gl; \ + if test -f bootstrap.conf; then \ + t=$$(perl -lne '/^\s*local_gl_dir=(\S+)/ and $$d=$$1;' \ + -e 'END{defined $$d and print $$d}' bootstrap.conf); \ + test -n "$$t" && gl=$$t; \ + fi; \ + for diff in $$(cd $$gl; git ls-files | grep '\.diff$$'); do \ + b=$$(printf %s "$$diff"|sed 's/\.diff$$//'); \ + VERSION_CONTROL=none \ + patch "$(gnulib_dir)/$$b" "$$gl/$$diff" || exit 1; \ + ( cd $(gnulib_dir) || exit 1; \ + git diff "$$b" > "../$$gl/$$diff"; \ + git checkout $$b ) || exit 1; \ + done + # Update gettext files. PACKAGE ?= $(shell basename $(PWD)) PO_DOMAIN ?= $(PACKAGE) @@ -1414,7 +1527,7 @@ 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//' | sed '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) @@ -1436,7 +1549,7 @@ update-copyright-env ?= # in the file .x-update-copyright. .PHONY: update-copyright update-copyright: - grep -l -w Copyright \ + $(AM_V_GEN)grep -l -w Copyright \ $$(export VC_LIST_EXCEPT_DEFAULT=COPYING && $(VC_LIST_EXCEPT)) \ | $(update-copyright-env) xargs $(srcdir)/$(_build-aux)/$@ @@ -1509,6 +1622,7 @@ _gl_TS_obj_files ?= *.$(OBJEXT) # Files in which to search for the one-line style extern declarations. # $(_gl_TS_dir)-relative. _gl_TS_headers ?= $(noinst_HEADERS) +_gl_TS_other_headers ?= *.h .PHONY: _gl_tight_scope _gl_tight_scope: $(bin_PROGRAMS) @@ -1531,7 +1645,8 @@ _gl_tight_scope: $(bin_PROGRAMS) && { 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 *.h \ + 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' \ | sort -u | grep -Ev -f $$t \ diff --git a/man/Makefile.am b/man/Makefile.am deleted file mode 100644 index d869f9bc..00000000 --- a/man/Makefile.am +++ /dev/null @@ -1,220 +0,0 @@ -# Make coreutils man pages. -*-Makefile-*- - -# Copyright (C) 2002-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 -# 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/>. - -dist_man1_MANS = $(MAN) - -man_aux = $(dist_man1_MANS:.1=.x) - -EXTRA_DIST = $(man_aux) $(NO_INSTALL_PROGS_DEFAULT:%=%.x) help2man \ - $(NO_INSTALL_PROGS_DEFAULT:%=%.1) -MAINTAINERCLEANFILES = $(dist_man1_MANS) - -# Depend on ../.version to get version number changes. -common_dep = ../.version - -# Note that arch depends on uname.c -arch.1: $(common_dep) $(srcdir)/arch.x ../src/uname.c - -base64.1: $(common_dep) $(srcdir)/base64.x ../src/base64.c -basename.1: $(common_dep) $(srcdir)/basename.x ../src/basename.c -cat.1: $(common_dep) $(srcdir)/cat.x ../src/cat.c -chcon.1: $(common_dep) $(srcdir)/chcon.x ../src/chcon.c -chgrp.1: $(common_dep) $(srcdir)/chgrp.x ../src/chgrp.c -chmod.1: $(common_dep) $(srcdir)/chmod.x ../src/chmod.c -chown.1: $(common_dep) $(srcdir)/chown.x ../src/chown.c -chroot.1: $(common_dep) $(srcdir)/chroot.x ../src/chroot.c -cksum.1: $(common_dep) $(srcdir)/cksum.x ../src/cksum.c -comm.1: $(common_dep) $(srcdir)/comm.x ../src/comm.c -cp.1: $(common_dep) $(srcdir)/cp.x ../src/cp.c -csplit.1: $(common_dep) $(srcdir)/csplit.x ../src/csplit.c -cut.1: $(common_dep) $(srcdir)/cut.x ../src/cut.c -date.1: $(common_dep) $(srcdir)/date.x ../src/date.c -dd.1: $(common_dep) $(srcdir)/dd.x ../src/dd.c -df.1: $(common_dep) $(srcdir)/df.x ../src/df.c - -# Note that dir depends on ls.c, since that's where it's --help text is. -dir.1: $(common_dep) $(srcdir)/dir.x ../src/ls.c - -dircolors.1: $(common_dep) $(srcdir)/dircolors.x ../src/dircolors.c -dirname.1: $(common_dep) $(srcdir)/dirname.x ../src/dirname.c -du.1: $(common_dep) $(srcdir)/du.x ../src/du.c -echo.1: $(common_dep) $(srcdir)/echo.x ../src/echo.c -env.1: $(common_dep) $(srcdir)/env.x ../src/env.c -expand.1: $(common_dep) $(srcdir)/expand.x ../src/expand.c -expr.1: $(common_dep) $(srcdir)/expr.x ../src/expr.c -factor.1: $(common_dep) $(srcdir)/factor.x ../src/factor.c -false.1: $(common_dep) $(srcdir)/false.x ../src/false.c -fmt.1: $(common_dep) $(srcdir)/fmt.x ../src/fmt.c -fold.1: $(common_dep) $(srcdir)/fold.x ../src/fold.c -groups.1: $(common_dep) $(srcdir)/groups.x ../src/groups.c -head.1: $(common_dep) $(srcdir)/head.x ../src/head.c -hostid.1: $(common_dep) $(srcdir)/hostid.x ../src/hostid.c -hostname.1: $(common_dep) $(srcdir)/hostname.x ../src/hostname.c -id.1: $(common_dep) $(srcdir)/id.x ../src/id.c -install.1: $(common_dep) $(srcdir)/install.x ../src/install.c -join.1: $(common_dep) $(srcdir)/join.x ../src/join.c -kill.1: $(common_dep) $(srcdir)/kill.x ../src/kill.c -link.1: $(common_dep) $(srcdir)/link.x ../src/link.c -ln.1: $(common_dep) $(srcdir)/ln.x ../src/ln.c -logname.1: $(common_dep) $(srcdir)/logname.x ../src/logname.c -ls.1: $(common_dep) $(srcdir)/ls.x ../src/ls.c -md5sum.1: $(common_dep) $(srcdir)/md5sum.x ../src/md5sum.c -mkdir.1: $(common_dep) $(srcdir)/mkdir.x ../src/mkdir.c -mkfifo.1: $(common_dep) $(srcdir)/mkfifo.x ../src/mkfifo.c -mknod.1: $(common_dep) $(srcdir)/mknod.x ../src/mknod.c -mktemp.1: $(common_dep) $(srcdir)/mktemp.x ../src/mktemp.c -mv.1: $(common_dep) $(srcdir)/mv.x ../src/mv.c -nice.1: $(common_dep) $(srcdir)/nice.x ../src/nice.c -nl.1: $(common_dep) $(srcdir)/nl.x ../src/nl.c -nohup.1: $(common_dep) $(srcdir)/nohup.x ../src/nohup.c -nproc.1: $(common_dep) $(srcdir)/nproc.x ../src/nproc.c -od.1: $(common_dep) $(srcdir)/od.x ../src/od.c -paste.1: $(common_dep) $(srcdir)/paste.x ../src/paste.c -pathchk.1: $(common_dep) $(srcdir)/pathchk.x ../src/pathchk.c -pinky.1: $(common_dep) $(srcdir)/pinky.x ../src/pinky.c -pr.1: $(common_dep) $(srcdir)/pr.x ../src/pr.c -printenv.1: $(common_dep) $(srcdir)/printenv.x ../src/printenv.c -printf.1: $(common_dep) $(srcdir)/printf.x ../src/printf.c -ptx.1: $(common_dep) $(srcdir)/ptx.x ../src/ptx.c -pwd.1: $(common_dep) $(srcdir)/pwd.x ../src/pwd.c -readlink.1: $(common_dep) $(srcdir)/readlink.x ../src/readlink.c -realpath.1: $(common_dep) $(srcdir)/realpath.x ../src/realpath.c -rm.1: $(common_dep) $(srcdir)/rm.x ../src/rm.c -rmdir.1: $(common_dep) $(srcdir)/rmdir.x ../src/rmdir.c -runcon.1: $(common_dep) $(srcdir)/runcon.x ../src/runcon.c -seq.1: $(common_dep) $(srcdir)/seq.x ../src/seq.c -sha1sum.1: $(common_dep) $(srcdir)/sha1sum.x ../src/md5sum.c -sha224sum.1: $(common_dep) $(srcdir)/sha224sum.x ../src/md5sum.c -sha256sum.1: $(common_dep) $(srcdir)/sha256sum.x ../src/md5sum.c -sha384sum.1: $(common_dep) $(srcdir)/sha384sum.x ../src/md5sum.c -sha512sum.1: $(common_dep) $(srcdir)/sha512sum.x ../src/md5sum.c -shred.1: $(common_dep) $(srcdir)/shred.x ../src/shred.c -shuf.1: $(common_dep) $(srcdir)/shuf.x ../src/shuf.c -sleep.1: $(common_dep) $(srcdir)/sleep.x ../src/sleep.c -sort.1: $(common_dep) $(srcdir)/sort.x ../src/sort.c -split.1: $(common_dep) $(srcdir)/split.x ../src/split.c -stat.1: $(common_dep) $(srcdir)/stat.x ../src/stat.c -stdbuf.1: $(common_dep) $(srcdir)/stdbuf.x ../src/stdbuf.c -stty.1: $(common_dep) $(srcdir)/stty.x ../src/stty.c -su.1: $(common_dep) $(srcdir)/su.x ../src/su.c -sum.1: $(common_dep) $(srcdir)/sum.x ../src/sum.c -sync.1: $(common_dep) $(srcdir)/sync.x ../src/sync.c -tac.1: $(common_dep) $(srcdir)/tac.x ../src/tac.c -tail.1: $(common_dep) $(srcdir)/tail.x ../src/tail.c -tee.1: $(common_dep) $(srcdir)/tee.x ../src/tee.c -test.1: $(common_dep) $(srcdir)/test.x ../src/test.c -timeout.1: $(common_dep) $(srcdir)/timeout.x ../src/timeout.c -touch.1: $(common_dep) $(srcdir)/touch.x ../src/touch.c -tr.1: $(common_dep) $(srcdir)/tr.x ../src/tr.c -true.1: $(common_dep) $(srcdir)/true.x ../src/true.c -truncate.1: $(common_dep) $(srcdir)/truncate.x ../src/truncate.c -tsort.1: $(common_dep) $(srcdir)/tsort.x ../src/tsort.c -tty.1: $(common_dep) $(srcdir)/tty.x ../src/tty.c -uname.1: $(common_dep) $(srcdir)/uname.x ../src/uname.c -unexpand.1: $(common_dep) $(srcdir)/unexpand.x ../src/unexpand.c -uniq.1: $(common_dep) $(srcdir)/uniq.x ../src/uniq.c -unlink.1: $(common_dep) $(srcdir)/unlink.x ../src/unlink.c -uptime.1: $(common_dep) $(srcdir)/uptime.x ../src/uptime.c -users.1: $(common_dep) $(srcdir)/users.x ../src/users.c -vdir.1: $(common_dep) $(srcdir)/vdir.x ../src/ls.c -wc.1: $(common_dep) $(srcdir)/wc.x ../src/wc.c -who.1: $(common_dep) $(srcdir)/who.x ../src/who.c -whoami.1: $(common_dep) $(srcdir)/whoami.x ../src/whoami.c -yes.1: $(common_dep) $(srcdir)/yes.x ../src/yes.c - -# This is required so that changes to e.g., emit_bug_reporting_address -# provoke regeneration of all $(MAN) files. -$(MAN): $(top_srcdir)/src/system.h - -SUFFIXES = .x .1 - -# Ensure that help2man runs the ../src/ginstall binary as -# 'install' when creating install.1. -# Similarly, ensure that it uses the ../src/[ binary to create test.1. -t = $*.td -mapped_name = `echo $*|sed 's/^install$$/ginstall/; s/^test$$/[/'` - -# Note the use of $t/$*, rather than just '$*' as in other packages. -# That is necessary to avoid failures for programs that are also shell built-in -# functions like echo, false, printf, pwd. -.x.1: - $(AM_V_GEN)case '$(PERL)' in \ - *"/missing "*) \ - echo 'WARNING: cannot update man page $@ since perl is missing' \ - 'or inadequate' 1>&2 \ - ;; \ - *) \ - rm -f $@ $@-t \ - && { \ - rm -rf $t; \ - mkdir $t; \ - (cd $t && $(LN_S) ../../src/$(mapped_name) $*); \ - $(PERL) -- $(srcdir)/help2man \ - --source='$(PACKAGE_STRING)' \ - --include=$(srcdir)/$*.x \ - --output=$t/$@ $t/$*; \ - } \ - && sed 's|$*\.td/||g' $t/$@ > $@-t \ - && rm -rf $t \ - && chmod -w $@-t \ - && mv $@-t $@ \ - ;; \ - esac - -# Option descriptions should not start with a capital letter -.PHONY: sc_option_desc_uppercase -sc_option_desc_uppercase: $(dist_man1_MANS) $(NO_INSTALL_PROGS_DEFAULT:%=%.1) - @grep '^\\fB\\-' -A1 *.1 | LC_ALL=C grep '\.1.[A-Z][a-z]' && \ - { echo 1>&2 '$(ME): found initial capitals in --help'; \ - exit 1; } || :; - -.PHONY: sc_man_file_correlation -sc_man_file_correlation: check-x-vs-1 check-programs-vs-x - -# Sort in traditional ASCII order, regardless of the current locale; -# otherwise we may get into trouble with distinct strings that the -# current locale considers to be equal. -ASSORT = LC_ALL=C sort - -# Ensure that for each .x file in this directory, there is a -# corresponding .1 file in the definition of $(dist_man1_MANS) above. -# But since that expansion usually lacks programs like su and arch, -# add them here manually. -.PHONY: check-x-vs-1 -check-x-vs-1: - @PATH=../src$(PATH_SEPARATOR)$$PATH; export PATH; \ - t=$@-t; \ - (cd $(srcdir) && ls -1 *.x) | sed 's/\.x$$//' | $(ASSORT) > $$t;\ - (echo $(dist_man1_MANS) $(NO_INSTALL_PROGS_DEFAULT) \ - | tr -s ' ' '\n' | sed 's/\.1$$//') \ - | $(ASSORT) -u | diff - $$t || { rm $$t; exit 1; }; \ - rm $$t - -all_programs = \ - (cd ../src && MAKEFLAGS= $(MAKE) -s all_programs.list) \ - | grep -v '\[' - -.PHONY: check-programs-vs-x -check-programs-vs-x: - @status=0; \ - for p in dummy `$(all_programs)`; do \ - test $$p = dummy && continue; \ - test $$p = ginstall && p=install || : ; \ - test -f $(srcdir)/$$p.x \ - || { echo missing $$p.x 1>&2; status=1; }; \ - done; \ - exit $$status diff --git a/man/Makefile.in b/man/Makefile.in deleted file mode 100644 index 24e63c75..00000000 --- a/man/Makefile.in +++ /dev/null @@ -1,2086 +0,0 @@ -# Makefile.in generated by automake 1.12a from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2012 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. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# Make coreutils man pages. -*-Makefile-*- - -# Copyright (C) 2002-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 -# 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/>. -VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ - 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;; \ - esac; \ - test $$am__dry = yes; \ - } -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = man -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(dist_man1_MANS) -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/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 \ - $(top_srcdir)/m4/close-stream.m4 $(top_srcdir)/m4/close.m4 \ - $(top_srcdir)/m4/closedir.m4 $(top_srcdir)/m4/closein.m4 \ - $(top_srcdir)/m4/closeout.m4 $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/config-h.m4 $(top_srcdir)/m4/configmake.m4 \ - $(top_srcdir)/m4/ctype.m4 $(top_srcdir)/m4/cycle-check.m4 \ - $(top_srcdir)/m4/d-ino.m4 $(top_srcdir)/m4/d-type.m4 \ - $(top_srcdir)/m4/dirent-safer.m4 $(top_srcdir)/m4/dirent_h.m4 \ - $(top_srcdir)/m4/dirfd.m4 $(top_srcdir)/m4/dirname.m4 \ - $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup.m4 \ - $(top_srcdir)/m4/dup2.m4 $(top_srcdir)/m4/eealloc.m4 \ - $(top_srcdir)/m4/environ.m4 $(top_srcdir)/m4/errno_h.m4 \ - $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/euidaccess.m4 \ - $(top_srcdir)/m4/exponentd.m4 $(top_srcdir)/m4/exponentf.m4 \ - $(top_srcdir)/m4/exponentl.m4 $(top_srcdir)/m4/extensions.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/fd-reopen.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/freading.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/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 \ - $(top_srcdir)/m4/getgroups.m4 $(top_srcdir)/m4/gethostname.m4 \ - $(top_srcdir)/m4/gethrxtime.m4 $(top_srcdir)/m4/getline.m4 \ - $(top_srcdir)/m4/getloadavg.m4 $(top_srcdir)/m4/getlogin.m4 \ - $(top_srcdir)/m4/getndelim2.m4 $(top_srcdir)/m4/getopt.m4 \ - $(top_srcdir)/m4/getpagesize.m4 $(top_srcdir)/m4/getpass.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/gmp.m4 $(top_srcdir)/m4/gnu-make.m4 \ - $(top_srcdir)/m4/gnulib-common.m4 \ - $(top_srcdir)/m4/gnulib-comp.m4 \ - $(top_srcdir)/m4/group-member.m4 \ - $(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/host-os.m4 \ - $(top_srcdir)/m4/hostent.m4 $(top_srcdir)/m4/human.m4 \ - $(top_srcdir)/m4/i-ring.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/iconv_h.m4 $(top_srcdir)/m4/iconv_open.m4 \ - $(top_srcdir)/m4/idcache.m4 \ - $(top_srcdir)/m4/include-exclude-prog.m4 \ - $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inet_ntop.m4 \ - $(top_srcdir)/m4/inet_pton.m4 $(top_srcdir)/m4/inline.m4 \ - $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intmax_t.m4 \ - $(top_srcdir)/m4/inttostr.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ - $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ - $(top_srcdir)/m4/ioctl.m4 $(top_srcdir)/m4/isapipe.m4 \ - $(top_srcdir)/m4/isatty.m4 $(top_srcdir)/m4/isblank.m4 \ - $(top_srcdir)/m4/isnand.m4 $(top_srcdir)/m4/isnanf.m4 \ - $(top_srcdir)/m4/isnanl.m4 $(top_srcdir)/m4/iswblank.m4 \ - $(top_srcdir)/m4/jm-macros.m4 $(top_srcdir)/m4/jm-winsz1.m4 \ - $(top_srcdir)/m4/jm-winsz2.m4 $(top_srcdir)/m4/langinfo_h.m4 \ - $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lchmod.m4 \ - $(top_srcdir)/m4/lchown.m4 $(top_srcdir)/m4/lcmessage.m4 \ - $(top_srcdir)/m4/ldexp.m4 $(top_srcdir)/m4/ldexpl.m4 \ - $(top_srcdir)/m4/lib-check.m4 $(top_srcdir)/m4/lib-ignore.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/libunistring-base.m4 \ - $(top_srcdir)/m4/link-follow.m4 $(top_srcdir)/m4/link.m4 \ - $(top_srcdir)/m4/linkat.m4 $(top_srcdir)/m4/localcharset.m4 \ - $(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \ - $(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \ - $(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localeconv.m4 \ - $(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \ - $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/ls-mntd-fs.m4 \ - $(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \ - $(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \ - $(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/math_h.m4 \ - $(top_srcdir)/m4/mbchar.m4 $(top_srcdir)/m4/mbiter.m4 \ - $(top_srcdir)/m4/mbrlen.m4 $(top_srcdir)/m4/mbrtowc.m4 \ - $(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbslen.m4 \ - $(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbswidth.m4 $(top_srcdir)/m4/mbtowc.m4 \ - $(top_srcdir)/m4/md5.m4 $(top_srcdir)/m4/memcasecmp.m4 \ - $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/memcoll.m4 \ - $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \ - $(top_srcdir)/m4/mgetgroups.m4 $(top_srcdir)/m4/mkancesdirs.m4 \ - $(top_srcdir)/m4/mkdir-p.m4 $(top_srcdir)/m4/mkdir.m4 \ - $(top_srcdir)/m4/mkfifo.m4 $(top_srcdir)/m4/mknod.m4 \ - $(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mktime.m4 \ - $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \ - $(top_srcdir)/m4/modechange.m4 $(top_srcdir)/m4/mountlist.m4 \ - $(top_srcdir)/m4/mpsort.m4 $(top_srcdir)/m4/msvc-inval.m4 \ - $(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \ - $(top_srcdir)/m4/nanosleep.m4 $(top_srcdir)/m4/netdb_h.m4 \ - $(top_srcdir)/m4/netinet_in_h.m4 \ - $(top_srcdir)/m4/nl_langinfo.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/nproc.m4 \ - $(top_srcdir)/m4/off_t.m4 $(top_srcdir)/m4/open.m4 \ - $(top_srcdir)/m4/openat.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/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/root-dev-ino.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/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/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/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 \ - $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stdbool.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/strcase.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/strings_h.m4 $(top_srcdir)/m4/strncat.m4 \ - $(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \ - $(top_srcdir)/m4/strnumcmp.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 \ - $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \ - $(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/sys_uio_h.m4 \ - $(top_srcdir)/m4/sys_utsname_h.m4 \ - $(top_srcdir)/m4/sys_wait_h.m4 $(top_srcdir)/m4/tempname.m4 \ - $(top_srcdir)/m4/termios_h.m4 $(top_srcdir)/m4/thread.m4 \ - $(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/time_h.m4 \ - $(top_srcdir)/m4/time_r.m4 $(top_srcdir)/m4/timer_time.m4 \ - $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tls.m4 \ - $(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/tzset.m4 \ - $(top_srcdir)/m4/uname.m4 $(top_srcdir)/m4/ungetc.m4 \ - $(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \ - $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink-busy.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/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/xfts.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)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/lib/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -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_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -SOURCES = -DIST_SOURCES = -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -man1dir = $(mandir)/man1 -am__installdirs = "$(DESTDIR)$(man1dir)" -NROFF = nroff -MANS = $(dist_man1_MANS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -pkglibexecdir = @pkglibexecdir@ -ACLOCAL = @ACLOCAL@ -ALLOCA = @ALLOCA@ -ALLOCA_H = @ALLOCA_H@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ -AR = @AR@ -ARFLAGS = @ARFLAGS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BITSIZEOF_PTRDIFF_T = @BITSIZEOF_PTRDIFF_T@ -BITSIZEOF_SIG_ATOMIC_T = @BITSIZEOF_SIG_ATOMIC_T@ -BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@ -BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@ -BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CONFIG_INCLUDE = @CONFIG_INCLUDE@ -CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFAULT_POSIX2_VERSION = @DEFAULT_POSIX2_VERSION@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EMULTIHOP_HIDDEN = @EMULTIHOP_HIDDEN@ -EMULTIHOP_VALUE = @EMULTIHOP_VALUE@ -ENOLINK_HIDDEN = @ENOLINK_HIDDEN@ -ENOLINK_VALUE = @ENOLINK_VALUE@ -EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ -EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ -ERRNO_H = @ERRNO_H@ -EXEEXT = @EXEEXT@ -FLOAT_H = @FLOAT_H@ -FNMATCH_H = @FNMATCH_H@ -GETADDRINFO_LIB = @GETADDRINFO_LIB@ -GETHOSTNAME_LIB = @GETHOSTNAME_LIB@ -GETLOADAVG_LIBS = @GETLOADAVG_LIBS@ -GETOPT_H = @GETOPT_H@ -GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ -GLIBC21 = @GLIBC21@ -GMSGFMT = @GMSGFMT@ -GMSGFMT_015 = @GMSGFMT_015@ -GNULIB_ACCEPT = @GNULIB_ACCEPT@ -GNULIB_ACCEPT4 = @GNULIB_ACCEPT4@ -GNULIB_ACOSF = @GNULIB_ACOSF@ -GNULIB_ACOSL = @GNULIB_ACOSL@ -GNULIB_ALPHASORT = @GNULIB_ALPHASORT@ -GNULIB_ASINF = @GNULIB_ASINF@ -GNULIB_ASINL = @GNULIB_ASINL@ -GNULIB_ATAN2F = @GNULIB_ATAN2F@ -GNULIB_ATANF = @GNULIB_ATANF@ -GNULIB_ATANL = @GNULIB_ATANL@ -GNULIB_ATOLL = @GNULIB_ATOLL@ -GNULIB_BIND = @GNULIB_BIND@ -GNULIB_BTOWC = @GNULIB_BTOWC@ -GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@ -GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@ -GNULIB_CBRT = @GNULIB_CBRT@ -GNULIB_CBRTF = @GNULIB_CBRTF@ -GNULIB_CBRTL = @GNULIB_CBRTL@ -GNULIB_CEIL = @GNULIB_CEIL@ -GNULIB_CEILF = @GNULIB_CEILF@ -GNULIB_CEILL = @GNULIB_CEILL@ -GNULIB_CHDIR = @GNULIB_CHDIR@ -GNULIB_CHOWN = @GNULIB_CHOWN@ -GNULIB_CLOSE = @GNULIB_CLOSE@ -GNULIB_CLOSEDIR = @GNULIB_CLOSEDIR@ -GNULIB_CONNECT = @GNULIB_CONNECT@ -GNULIB_COPYSIGN = @GNULIB_COPYSIGN@ -GNULIB_COPYSIGNF = @GNULIB_COPYSIGNF@ -GNULIB_COPYSIGNL = @GNULIB_COPYSIGNL@ -GNULIB_COSF = @GNULIB_COSF@ -GNULIB_COSHF = @GNULIB_COSHF@ -GNULIB_COSL = @GNULIB_COSL@ -GNULIB_DIRFD = @GNULIB_DIRFD@ -GNULIB_DPRINTF = @GNULIB_DPRINTF@ -GNULIB_DUP = @GNULIB_DUP@ -GNULIB_DUP2 = @GNULIB_DUP2@ -GNULIB_DUP3 = @GNULIB_DUP3@ -GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@ -GNULIB_ENVIRON = @GNULIB_ENVIRON@ -GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@ -GNULIB_EXP2 = @GNULIB_EXP2@ -GNULIB_EXP2F = @GNULIB_EXP2F@ -GNULIB_EXP2L = @GNULIB_EXP2L@ -GNULIB_EXPF = @GNULIB_EXPF@ -GNULIB_EXPL = @GNULIB_EXPL@ -GNULIB_EXPM1 = @GNULIB_EXPM1@ -GNULIB_EXPM1F = @GNULIB_EXPM1F@ -GNULIB_EXPM1L = @GNULIB_EXPM1L@ -GNULIB_FABSF = @GNULIB_FABSF@ -GNULIB_FABSL = @GNULIB_FABSL@ -GNULIB_FACCESSAT = @GNULIB_FACCESSAT@ -GNULIB_FCHDIR = @GNULIB_FCHDIR@ -GNULIB_FCHMODAT = @GNULIB_FCHMODAT@ -GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@ -GNULIB_FCLOSE = @GNULIB_FCLOSE@ -GNULIB_FCNTL = @GNULIB_FCNTL@ -GNULIB_FDATASYNC = @GNULIB_FDATASYNC@ -GNULIB_FDOPEN = @GNULIB_FDOPEN@ -GNULIB_FDOPENDIR = @GNULIB_FDOPENDIR@ -GNULIB_FFLUSH = @GNULIB_FFLUSH@ -GNULIB_FFS = @GNULIB_FFS@ -GNULIB_FFSL = @GNULIB_FFSL@ -GNULIB_FFSLL = @GNULIB_FFSLL@ -GNULIB_FGETC = @GNULIB_FGETC@ -GNULIB_FGETS = @GNULIB_FGETS@ -GNULIB_FLOOR = @GNULIB_FLOOR@ -GNULIB_FLOORF = @GNULIB_FLOORF@ -GNULIB_FLOORL = @GNULIB_FLOORL@ -GNULIB_FMA = @GNULIB_FMA@ -GNULIB_FMAF = @GNULIB_FMAF@ -GNULIB_FMAL = @GNULIB_FMAL@ -GNULIB_FMOD = @GNULIB_FMOD@ -GNULIB_FMODF = @GNULIB_FMODF@ -GNULIB_FMODL = @GNULIB_FMODL@ -GNULIB_FOPEN = @GNULIB_FOPEN@ -GNULIB_FPRINTF = @GNULIB_FPRINTF@ -GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@ -GNULIB_FPURGE = @GNULIB_FPURGE@ -GNULIB_FPUTC = @GNULIB_FPUTC@ -GNULIB_FPUTS = @GNULIB_FPUTS@ -GNULIB_FREAD = @GNULIB_FREAD@ -GNULIB_FREOPEN = @GNULIB_FREOPEN@ -GNULIB_FREXP = @GNULIB_FREXP@ -GNULIB_FREXPF = @GNULIB_FREXPF@ -GNULIB_FREXPL = @GNULIB_FREXPL@ -GNULIB_FSCANF = @GNULIB_FSCANF@ -GNULIB_FSEEK = @GNULIB_FSEEK@ -GNULIB_FSEEKO = @GNULIB_FSEEKO@ -GNULIB_FSTAT = @GNULIB_FSTAT@ -GNULIB_FSTATAT = @GNULIB_FSTATAT@ -GNULIB_FSYNC = @GNULIB_FSYNC@ -GNULIB_FTELL = @GNULIB_FTELL@ -GNULIB_FTELLO = @GNULIB_FTELLO@ -GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@ -GNULIB_FUTIMENS = @GNULIB_FUTIMENS@ -GNULIB_FWRITE = @GNULIB_FWRITE@ -GNULIB_GETADDRINFO = @GNULIB_GETADDRINFO@ -GNULIB_GETC = @GNULIB_GETC@ -GNULIB_GETCHAR = @GNULIB_GETCHAR@ -GNULIB_GETCWD = @GNULIB_GETCWD@ -GNULIB_GETDELIM = @GNULIB_GETDELIM@ -GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@ -GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@ -GNULIB_GETGROUPS = @GNULIB_GETGROUPS@ -GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@ -GNULIB_GETLINE = @GNULIB_GETLINE@ -GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@ -GNULIB_GETLOGIN = @GNULIB_GETLOGIN@ -GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ -GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ -GNULIB_GETPEERNAME = @GNULIB_GETPEERNAME@ -GNULIB_GETRUSAGE = @GNULIB_GETRUSAGE@ -GNULIB_GETSOCKNAME = @GNULIB_GETSOCKNAME@ -GNULIB_GETSOCKOPT = @GNULIB_GETSOCKOPT@ -GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@ -GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ -GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ -GNULIB_GL_UNISTD_H_GETOPT = @GNULIB_GL_UNISTD_H_GETOPT@ -GNULIB_GRANTPT = @GNULIB_GRANTPT@ -GNULIB_GROUP_MEMBER = @GNULIB_GROUP_MEMBER@ -GNULIB_HYPOT = @GNULIB_HYPOT@ -GNULIB_HYPOTF = @GNULIB_HYPOTF@ -GNULIB_HYPOTL = @GNULIB_HYPOTL@ -GNULIB_ICONV = @GNULIB_ICONV@ -GNULIB_ILOGB = @GNULIB_ILOGB@ -GNULIB_ILOGBF = @GNULIB_ILOGBF@ -GNULIB_ILOGBL = @GNULIB_ILOGBL@ -GNULIB_IMAXABS = @GNULIB_IMAXABS@ -GNULIB_IMAXDIV = @GNULIB_IMAXDIV@ -GNULIB_INET_NTOP = @GNULIB_INET_NTOP@ -GNULIB_INET_PTON = @GNULIB_INET_PTON@ -GNULIB_IOCTL = @GNULIB_IOCTL@ -GNULIB_ISATTY = @GNULIB_ISATTY@ -GNULIB_ISBLANK = @GNULIB_ISBLANK@ -GNULIB_ISFINITE = @GNULIB_ISFINITE@ -GNULIB_ISINF = @GNULIB_ISINF@ -GNULIB_ISNAN = @GNULIB_ISNAN@ -GNULIB_ISNAND = @GNULIB_ISNAND@ -GNULIB_ISNANF = @GNULIB_ISNANF@ -GNULIB_ISNANL = @GNULIB_ISNANL@ -GNULIB_ISWBLANK = @GNULIB_ISWBLANK@ -GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@ -GNULIB_LCHMOD = @GNULIB_LCHMOD@ -GNULIB_LCHOWN = @GNULIB_LCHOWN@ -GNULIB_LDEXPF = @GNULIB_LDEXPF@ -GNULIB_LDEXPL = @GNULIB_LDEXPL@ -GNULIB_LINK = @GNULIB_LINK@ -GNULIB_LINKAT = @GNULIB_LINKAT@ -GNULIB_LISTEN = @GNULIB_LISTEN@ -GNULIB_LOCALECONV = @GNULIB_LOCALECONV@ -GNULIB_LOG = @GNULIB_LOG@ -GNULIB_LOG10 = @GNULIB_LOG10@ -GNULIB_LOG10F = @GNULIB_LOG10F@ -GNULIB_LOG10L = @GNULIB_LOG10L@ -GNULIB_LOG1P = @GNULIB_LOG1P@ -GNULIB_LOG1PF = @GNULIB_LOG1PF@ -GNULIB_LOG1PL = @GNULIB_LOG1PL@ -GNULIB_LOG2 = @GNULIB_LOG2@ -GNULIB_LOG2F = @GNULIB_LOG2F@ -GNULIB_LOG2L = @GNULIB_LOG2L@ -GNULIB_LOGB = @GNULIB_LOGB@ -GNULIB_LOGBF = @GNULIB_LOGBF@ -GNULIB_LOGBL = @GNULIB_LOGBL@ -GNULIB_LOGF = @GNULIB_LOGF@ -GNULIB_LOGL = @GNULIB_LOGL@ -GNULIB_LSEEK = @GNULIB_LSEEK@ -GNULIB_LSTAT = @GNULIB_LSTAT@ -GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ -GNULIB_MBRLEN = @GNULIB_MBRLEN@ -GNULIB_MBRTOWC = @GNULIB_MBRTOWC@ -GNULIB_MBSCASECMP = @GNULIB_MBSCASECMP@ -GNULIB_MBSCASESTR = @GNULIB_MBSCASESTR@ -GNULIB_MBSCHR = @GNULIB_MBSCHR@ -GNULIB_MBSCSPN = @GNULIB_MBSCSPN@ -GNULIB_MBSINIT = @GNULIB_MBSINIT@ -GNULIB_MBSLEN = @GNULIB_MBSLEN@ -GNULIB_MBSNCASECMP = @GNULIB_MBSNCASECMP@ -GNULIB_MBSNLEN = @GNULIB_MBSNLEN@ -GNULIB_MBSNRTOWCS = @GNULIB_MBSNRTOWCS@ -GNULIB_MBSPBRK = @GNULIB_MBSPBRK@ -GNULIB_MBSPCASECMP = @GNULIB_MBSPCASECMP@ -GNULIB_MBSRCHR = @GNULIB_MBSRCHR@ -GNULIB_MBSRTOWCS = @GNULIB_MBSRTOWCS@ -GNULIB_MBSSEP = @GNULIB_MBSSEP@ -GNULIB_MBSSPN = @GNULIB_MBSSPN@ -GNULIB_MBSSTR = @GNULIB_MBSSTR@ -GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@ -GNULIB_MBTOWC = @GNULIB_MBTOWC@ -GNULIB_MEMCHR = @GNULIB_MEMCHR@ -GNULIB_MEMMEM = @GNULIB_MEMMEM@ -GNULIB_MEMPCPY = @GNULIB_MEMPCPY@ -GNULIB_MEMRCHR = @GNULIB_MEMRCHR@ -GNULIB_MKDIRAT = @GNULIB_MKDIRAT@ -GNULIB_MKDTEMP = @GNULIB_MKDTEMP@ -GNULIB_MKFIFO = @GNULIB_MKFIFO@ -GNULIB_MKFIFOAT = @GNULIB_MKFIFOAT@ -GNULIB_MKNOD = @GNULIB_MKNOD@ -GNULIB_MKNODAT = @GNULIB_MKNODAT@ -GNULIB_MKOSTEMP = @GNULIB_MKOSTEMP@ -GNULIB_MKOSTEMPS = @GNULIB_MKOSTEMPS@ -GNULIB_MKSTEMP = @GNULIB_MKSTEMP@ -GNULIB_MKSTEMPS = @GNULIB_MKSTEMPS@ -GNULIB_MKTIME = @GNULIB_MKTIME@ -GNULIB_MODF = @GNULIB_MODF@ -GNULIB_MODFF = @GNULIB_MODFF@ -GNULIB_MODFL = @GNULIB_MODFL@ -GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@ -GNULIB_NL_LANGINFO = @GNULIB_NL_LANGINFO@ -GNULIB_NONBLOCKING = @GNULIB_NONBLOCKING@ -GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@ -GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ -GNULIB_OPEN = @GNULIB_OPEN@ -GNULIB_OPENAT = @GNULIB_OPENAT@ -GNULIB_OPENDIR = @GNULIB_OPENDIR@ -GNULIB_PCLOSE = @GNULIB_PCLOSE@ -GNULIB_PERROR = @GNULIB_PERROR@ -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@ -GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@ -GNULIB_PSELECT = @GNULIB_PSELECT@ -GNULIB_PTHREAD_SIGMASK = @GNULIB_PTHREAD_SIGMASK@ -GNULIB_PTSNAME = @GNULIB_PTSNAME@ -GNULIB_PTSNAME_R = @GNULIB_PTSNAME_R@ -GNULIB_PUTC = @GNULIB_PUTC@ -GNULIB_PUTCHAR = @GNULIB_PUTCHAR@ -GNULIB_PUTENV = @GNULIB_PUTENV@ -GNULIB_PUTS = @GNULIB_PUTS@ -GNULIB_PWRITE = @GNULIB_PWRITE@ -GNULIB_RAISE = @GNULIB_RAISE@ -GNULIB_RANDOM = @GNULIB_RANDOM@ -GNULIB_RANDOM_R = @GNULIB_RANDOM_R@ -GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ -GNULIB_READ = @GNULIB_READ@ -GNULIB_READDIR = @GNULIB_READDIR@ -GNULIB_READLINK = @GNULIB_READLINK@ -GNULIB_READLINKAT = @GNULIB_READLINKAT@ -GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@ -GNULIB_REALPATH = @GNULIB_REALPATH@ -GNULIB_RECV = @GNULIB_RECV@ -GNULIB_RECVFROM = @GNULIB_RECVFROM@ -GNULIB_REMAINDER = @GNULIB_REMAINDER@ -GNULIB_REMAINDERF = @GNULIB_REMAINDERF@ -GNULIB_REMAINDERL = @GNULIB_REMAINDERL@ -GNULIB_REMOVE = @GNULIB_REMOVE@ -GNULIB_RENAME = @GNULIB_RENAME@ -GNULIB_RENAMEAT = @GNULIB_RENAMEAT@ -GNULIB_REWINDDIR = @GNULIB_REWINDDIR@ -GNULIB_RINT = @GNULIB_RINT@ -GNULIB_RINTF = @GNULIB_RINTF@ -GNULIB_RINTL = @GNULIB_RINTL@ -GNULIB_RMDIR = @GNULIB_RMDIR@ -GNULIB_ROUND = @GNULIB_ROUND@ -GNULIB_ROUNDF = @GNULIB_ROUNDF@ -GNULIB_ROUNDL = @GNULIB_ROUNDL@ -GNULIB_RPMATCH = @GNULIB_RPMATCH@ -GNULIB_SCANDIR = @GNULIB_SCANDIR@ -GNULIB_SCANF = @GNULIB_SCANF@ -GNULIB_SELECT = @GNULIB_SELECT@ -GNULIB_SEND = @GNULIB_SEND@ -GNULIB_SENDTO = @GNULIB_SENDTO@ -GNULIB_SETENV = @GNULIB_SETENV@ -GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@ -GNULIB_SETLOCALE = @GNULIB_SETLOCALE@ -GNULIB_SETSOCKOPT = @GNULIB_SETSOCKOPT@ -GNULIB_SHUTDOWN = @GNULIB_SHUTDOWN@ -GNULIB_SIGACTION = @GNULIB_SIGACTION@ -GNULIB_SIGNAL_H_SIGPIPE = @GNULIB_SIGNAL_H_SIGPIPE@ -GNULIB_SIGNBIT = @GNULIB_SIGNBIT@ -GNULIB_SIGPROCMASK = @GNULIB_SIGPROCMASK@ -GNULIB_SINF = @GNULIB_SINF@ -GNULIB_SINHF = @GNULIB_SINHF@ -GNULIB_SINL = @GNULIB_SINL@ -GNULIB_SLEEP = @GNULIB_SLEEP@ -GNULIB_SNPRINTF = @GNULIB_SNPRINTF@ -GNULIB_SOCKET = @GNULIB_SOCKET@ -GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@ -GNULIB_SQRTF = @GNULIB_SQRTF@ -GNULIB_SQRTL = @GNULIB_SQRTL@ -GNULIB_STAT = @GNULIB_STAT@ -GNULIB_STDIO_H_NONBLOCKING = @GNULIB_STDIO_H_NONBLOCKING@ -GNULIB_STDIO_H_SIGPIPE = @GNULIB_STDIO_H_SIGPIPE@ -GNULIB_STPCPY = @GNULIB_STPCPY@ -GNULIB_STPNCPY = @GNULIB_STPNCPY@ -GNULIB_STRCASESTR = @GNULIB_STRCASESTR@ -GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@ -GNULIB_STRDUP = @GNULIB_STRDUP@ -GNULIB_STRERROR = @GNULIB_STRERROR@ -GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ -GNULIB_STRNCAT = @GNULIB_STRNCAT@ -GNULIB_STRNDUP = @GNULIB_STRNDUP@ -GNULIB_STRNLEN = @GNULIB_STRNLEN@ -GNULIB_STRPBRK = @GNULIB_STRPBRK@ -GNULIB_STRPTIME = @GNULIB_STRPTIME@ -GNULIB_STRSEP = @GNULIB_STRSEP@ -GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@ -GNULIB_STRSTR = @GNULIB_STRSTR@ -GNULIB_STRTOD = @GNULIB_STRTOD@ -GNULIB_STRTOIMAX = @GNULIB_STRTOIMAX@ -GNULIB_STRTOK_R = @GNULIB_STRTOK_R@ -GNULIB_STRTOLL = @GNULIB_STRTOLL@ -GNULIB_STRTOULL = @GNULIB_STRTOULL@ -GNULIB_STRTOUMAX = @GNULIB_STRTOUMAX@ -GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@ -GNULIB_SYMLINK = @GNULIB_SYMLINK@ -GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@ -GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@ -GNULIB_TANF = @GNULIB_TANF@ -GNULIB_TANHF = @GNULIB_TANHF@ -GNULIB_TANL = @GNULIB_TANL@ -GNULIB_TCGETSID = @GNULIB_TCGETSID@ -GNULIB_TEST_WARN_CFLAGS = @GNULIB_TEST_WARN_CFLAGS@ -GNULIB_TIMEGM = @GNULIB_TIMEGM@ -GNULIB_TIME_R = @GNULIB_TIME_R@ -GNULIB_TMPFILE = @GNULIB_TMPFILE@ -GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@ -GNULIB_TRUNC = @GNULIB_TRUNC@ -GNULIB_TRUNCF = @GNULIB_TRUNCF@ -GNULIB_TRUNCL = @GNULIB_TRUNCL@ -GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@ -GNULIB_UNAME = @GNULIB_UNAME@ -GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@ -GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ -GNULIB_UNLINK = @GNULIB_UNLINK@ -GNULIB_UNLINKAT = @GNULIB_UNLINKAT@ -GNULIB_UNLOCKPT = @GNULIB_UNLOCKPT@ -GNULIB_UNSETENV = @GNULIB_UNSETENV@ -GNULIB_USLEEP = @GNULIB_USLEEP@ -GNULIB_UTIMENSAT = @GNULIB_UTIMENSAT@ -GNULIB_VASPRINTF = @GNULIB_VASPRINTF@ -GNULIB_VDPRINTF = @GNULIB_VDPRINTF@ -GNULIB_VFPRINTF = @GNULIB_VFPRINTF@ -GNULIB_VFPRINTF_POSIX = @GNULIB_VFPRINTF_POSIX@ -GNULIB_VFSCANF = @GNULIB_VFSCANF@ -GNULIB_VPRINTF = @GNULIB_VPRINTF@ -GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@ -GNULIB_VSCANF = @GNULIB_VSCANF@ -GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@ -GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@ -GNULIB_WAITPID = @GNULIB_WAITPID@ -GNULIB_WARN_CFLAGS = @GNULIB_WARN_CFLAGS@ -GNULIB_WCPCPY = @GNULIB_WCPCPY@ -GNULIB_WCPNCPY = @GNULIB_WCPNCPY@ -GNULIB_WCRTOMB = @GNULIB_WCRTOMB@ -GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@ -GNULIB_WCSCAT = @GNULIB_WCSCAT@ -GNULIB_WCSCHR = @GNULIB_WCSCHR@ -GNULIB_WCSCMP = @GNULIB_WCSCMP@ -GNULIB_WCSCOLL = @GNULIB_WCSCOLL@ -GNULIB_WCSCPY = @GNULIB_WCSCPY@ -GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ -GNULIB_WCSDUP = @GNULIB_WCSDUP@ -GNULIB_WCSLEN = @GNULIB_WCSLEN@ -GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ -GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ -GNULIB_WCSNCMP = @GNULIB_WCSNCMP@ -GNULIB_WCSNCPY = @GNULIB_WCSNCPY@ -GNULIB_WCSNLEN = @GNULIB_WCSNLEN@ -GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@ -GNULIB_WCSPBRK = @GNULIB_WCSPBRK@ -GNULIB_WCSRCHR = @GNULIB_WCSRCHR@ -GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@ -GNULIB_WCSSPN = @GNULIB_WCSSPN@ -GNULIB_WCSSTR = @GNULIB_WCSSTR@ -GNULIB_WCSTOK = @GNULIB_WCSTOK@ -GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@ -GNULIB_WCSXFRM = @GNULIB_WCSXFRM@ -GNULIB_WCTOB = @GNULIB_WCTOB@ -GNULIB_WCTOMB = @GNULIB_WCTOMB@ -GNULIB_WCTRANS = @GNULIB_WCTRANS@ -GNULIB_WCTYPE = @GNULIB_WCTYPE@ -GNULIB_WCWIDTH = @GNULIB_WCWIDTH@ -GNULIB_WMEMCHR = @GNULIB_WMEMCHR@ -GNULIB_WMEMCMP = @GNULIB_WMEMCMP@ -GNULIB_WMEMCPY = @GNULIB_WMEMCPY@ -GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@ -GNULIB_WMEMSET = @GNULIB_WMEMSET@ -GNULIB_WRITE = @GNULIB_WRITE@ -GNULIB__EXIT = @GNULIB__EXIT@ -GREP = @GREP@ -HAVE_ACCEPT4 = @HAVE_ACCEPT4@ -HAVE_ACOSF = @HAVE_ACOSF@ -HAVE_ACOSL = @HAVE_ACOSL@ -HAVE_ALPHASORT = @HAVE_ALPHASORT@ -HAVE_ARPA_INET_H = @HAVE_ARPA_INET_H@ -HAVE_ASINF = @HAVE_ASINF@ -HAVE_ASINL = @HAVE_ASINL@ -HAVE_ATAN2F = @HAVE_ATAN2F@ -HAVE_ATANF = @HAVE_ATANF@ -HAVE_ATANL = @HAVE_ATANL@ -HAVE_ATOLL = @HAVE_ATOLL@ -HAVE_BTOWC = @HAVE_BTOWC@ -HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ -HAVE_CBRT = @HAVE_CBRT@ -HAVE_CBRTF = @HAVE_CBRTF@ -HAVE_CBRTL = @HAVE_CBRTL@ -HAVE_CHOWN = @HAVE_CHOWN@ -HAVE_CLOSEDIR = @HAVE_CLOSEDIR@ -HAVE_COPYSIGN = @HAVE_COPYSIGN@ -HAVE_COPYSIGNL = @HAVE_COPYSIGNL@ -HAVE_COSF = @HAVE_COSF@ -HAVE_COSHF = @HAVE_COSHF@ -HAVE_COSL = @HAVE_COSL@ -HAVE_DECL_ACOSL = @HAVE_DECL_ACOSL@ -HAVE_DECL_ASINL = @HAVE_DECL_ASINL@ -HAVE_DECL_ATANL = @HAVE_DECL_ATANL@ -HAVE_DECL_CBRTF = @HAVE_DECL_CBRTF@ -HAVE_DECL_CBRTL = @HAVE_DECL_CBRTL@ -HAVE_DECL_CEILF = @HAVE_DECL_CEILF@ -HAVE_DECL_CEILL = @HAVE_DECL_CEILL@ -HAVE_DECL_COPYSIGNF = @HAVE_DECL_COPYSIGNF@ -HAVE_DECL_COSL = @HAVE_DECL_COSL@ -HAVE_DECL_DIRFD = @HAVE_DECL_DIRFD@ -HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ -HAVE_DECL_EXP2 = @HAVE_DECL_EXP2@ -HAVE_DECL_EXP2F = @HAVE_DECL_EXP2F@ -HAVE_DECL_EXP2L = @HAVE_DECL_EXP2L@ -HAVE_DECL_EXPL = @HAVE_DECL_EXPL@ -HAVE_DECL_EXPM1L = @HAVE_DECL_EXPM1L@ -HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ -HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@ -HAVE_DECL_FDOPENDIR = @HAVE_DECL_FDOPENDIR@ -HAVE_DECL_FLOORF = @HAVE_DECL_FLOORF@ -HAVE_DECL_FLOORL = @HAVE_DECL_FLOORL@ -HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@ -HAVE_DECL_FREEADDRINFO = @HAVE_DECL_FREEADDRINFO@ -HAVE_DECL_FREXPL = @HAVE_DECL_FREXPL@ -HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@ -HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@ -HAVE_DECL_GAI_STRERROR = @HAVE_DECL_GAI_STRERROR@ -HAVE_DECL_GETADDRINFO = @HAVE_DECL_GETADDRINFO@ -HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@ -HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ -HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ -HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@ -HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ -HAVE_DECL_GETNAMEINFO = @HAVE_DECL_GETNAMEINFO@ -HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ -HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ -HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ -HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ -HAVE_DECL_INET_NTOP = @HAVE_DECL_INET_NTOP@ -HAVE_DECL_INET_PTON = @HAVE_DECL_INET_PTON@ -HAVE_DECL_LDEXPL = @HAVE_DECL_LDEXPL@ -HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@ -HAVE_DECL_LOG10L = @HAVE_DECL_LOG10L@ -HAVE_DECL_LOG2 = @HAVE_DECL_LOG2@ -HAVE_DECL_LOG2F = @HAVE_DECL_LOG2F@ -HAVE_DECL_LOG2L = @HAVE_DECL_LOG2L@ -HAVE_DECL_LOGB = @HAVE_DECL_LOGB@ -HAVE_DECL_LOGL = @HAVE_DECL_LOGL@ -HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ -HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ -HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ -HAVE_DECL_REMAINDER = @HAVE_DECL_REMAINDER@ -HAVE_DECL_REMAINDERL = @HAVE_DECL_REMAINDERL@ -HAVE_DECL_RINTF = @HAVE_DECL_RINTF@ -HAVE_DECL_ROUND = @HAVE_DECL_ROUND@ -HAVE_DECL_ROUNDF = @HAVE_DECL_ROUNDF@ -HAVE_DECL_ROUNDL = @HAVE_DECL_ROUNDL@ -HAVE_DECL_SETENV = @HAVE_DECL_SETENV@ -HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@ -HAVE_DECL_SINL = @HAVE_DECL_SINL@ -HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@ -HAVE_DECL_SQRTL = @HAVE_DECL_SQRTL@ -HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ -HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@ -HAVE_DECL_STRNCASECMP = @HAVE_DECL_STRNCASECMP@ -HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@ -HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@ -HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ -HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ -HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ -HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ -HAVE_DECL_TANL = @HAVE_DECL_TANL@ -HAVE_DECL_TCGETSID = @HAVE_DECL_TCGETSID@ -HAVE_DECL_TRUNC = @HAVE_DECL_TRUNC@ -HAVE_DECL_TRUNCF = @HAVE_DECL_TRUNCF@ -HAVE_DECL_TRUNCL = @HAVE_DECL_TRUNCL@ -HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ -HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ -HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ -HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ -HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ -HAVE_DIRENT_H = @HAVE_DIRENT_H@ -HAVE_DPRINTF = @HAVE_DPRINTF@ -HAVE_DUP2 = @HAVE_DUP2@ -HAVE_DUP3 = @HAVE_DUP3@ -HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ -HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ -HAVE_EXPF = @HAVE_EXPF@ -HAVE_EXPL = @HAVE_EXPL@ -HAVE_EXPM1 = @HAVE_EXPM1@ -HAVE_EXPM1F = @HAVE_EXPM1F@ -HAVE_FABSF = @HAVE_FABSF@ -HAVE_FABSL = @HAVE_FABSL@ -HAVE_FACCESSAT = @HAVE_FACCESSAT@ -HAVE_FCHDIR = @HAVE_FCHDIR@ -HAVE_FCHMODAT = @HAVE_FCHMODAT@ -HAVE_FCHOWNAT = @HAVE_FCHOWNAT@ -HAVE_FCNTL = @HAVE_FCNTL@ -HAVE_FDATASYNC = @HAVE_FDATASYNC@ -HAVE_FDOPENDIR = @HAVE_FDOPENDIR@ -HAVE_FEATURES_H = @HAVE_FEATURES_H@ -HAVE_FFS = @HAVE_FFS@ -HAVE_FFSL = @HAVE_FFSL@ -HAVE_FFSLL = @HAVE_FFSLL@ -HAVE_FMA = @HAVE_FMA@ -HAVE_FMAF = @HAVE_FMAF@ -HAVE_FMAL = @HAVE_FMAL@ -HAVE_FMODF = @HAVE_FMODF@ -HAVE_FMODL = @HAVE_FMODL@ -HAVE_FREXPF = @HAVE_FREXPF@ -HAVE_FSEEKO = @HAVE_FSEEKO@ -HAVE_FSTATAT = @HAVE_FSTATAT@ -HAVE_FSYNC = @HAVE_FSYNC@ -HAVE_FTELLO = @HAVE_FTELLO@ -HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ -HAVE_FUTIMENS = @HAVE_FUTIMENS@ -HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ -HAVE_GETGROUPS = @HAVE_GETGROUPS@ -HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@ -HAVE_GETLOGIN = @HAVE_GETLOGIN@ -HAVE_GETOPT_H = @HAVE_GETOPT_H@ -HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ -HAVE_GETRUSAGE = @HAVE_GETRUSAGE@ -HAVE_GETSUBOPT = @HAVE_GETSUBOPT@ -HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@ -HAVE_GRANTPT = @HAVE_GRANTPT@ -HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@ -HAVE_HYPOTF = @HAVE_HYPOTF@ -HAVE_HYPOTL = @HAVE_HYPOTL@ -HAVE_ILOGB = @HAVE_ILOGB@ -HAVE_ILOGBF = @HAVE_ILOGBF@ -HAVE_ILOGBL = @HAVE_ILOGBL@ -HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ -HAVE_ISBLANK = @HAVE_ISBLANK@ -HAVE_ISNAND = @HAVE_ISNAND@ -HAVE_ISNANF = @HAVE_ISNANF@ -HAVE_ISNANL = @HAVE_ISNANL@ -HAVE_ISWBLANK = @HAVE_ISWBLANK@ -HAVE_ISWCNTRL = @HAVE_ISWCNTRL@ -HAVE_LANGINFO_CODESET = @HAVE_LANGINFO_CODESET@ -HAVE_LANGINFO_ERA = @HAVE_LANGINFO_ERA@ -HAVE_LANGINFO_H = @HAVE_LANGINFO_H@ -HAVE_LANGINFO_T_FMT_AMPM = @HAVE_LANGINFO_T_FMT_AMPM@ -HAVE_LANGINFO_YESEXPR = @HAVE_LANGINFO_YESEXPR@ -HAVE_LCHMOD = @HAVE_LCHMOD@ -HAVE_LCHOWN = @HAVE_LCHOWN@ -HAVE_LDEXPF = @HAVE_LDEXPF@ -HAVE_LINK = @HAVE_LINK@ -HAVE_LINKAT = @HAVE_LINKAT@ -HAVE_LOG10F = @HAVE_LOG10F@ -HAVE_LOG10L = @HAVE_LOG10L@ -HAVE_LOG1P = @HAVE_LOG1P@ -HAVE_LOG1PF = @HAVE_LOG1PF@ -HAVE_LOG1PL = @HAVE_LOG1PL@ -HAVE_LOGBF = @HAVE_LOGBF@ -HAVE_LOGBL = @HAVE_LOGBL@ -HAVE_LOGF = @HAVE_LOGF@ -HAVE_LOGL = @HAVE_LOGL@ -HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ -HAVE_LSTAT = @HAVE_LSTAT@ -HAVE_MBRLEN = @HAVE_MBRLEN@ -HAVE_MBRTOWC = @HAVE_MBRTOWC@ -HAVE_MBSINIT = @HAVE_MBSINIT@ -HAVE_MBSLEN = @HAVE_MBSLEN@ -HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ -HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ -HAVE_MEMCHR = @HAVE_MEMCHR@ -HAVE_MEMPCPY = @HAVE_MEMPCPY@ -HAVE_MKDIRAT = @HAVE_MKDIRAT@ -HAVE_MKDTEMP = @HAVE_MKDTEMP@ -HAVE_MKFIFO = @HAVE_MKFIFO@ -HAVE_MKFIFOAT = @HAVE_MKFIFOAT@ -HAVE_MKNOD = @HAVE_MKNOD@ -HAVE_MKNODAT = @HAVE_MKNODAT@ -HAVE_MKOSTEMP = @HAVE_MKOSTEMP@ -HAVE_MKOSTEMPS = @HAVE_MKOSTEMPS@ -HAVE_MKSTEMP = @HAVE_MKSTEMP@ -HAVE_MKSTEMPS = @HAVE_MKSTEMPS@ -HAVE_MODFF = @HAVE_MODFF@ -HAVE_MODFL = @HAVE_MODFL@ -HAVE_MSVC_INVALID_PARAMETER_HANDLER = @HAVE_MSVC_INVALID_PARAMETER_HANDLER@ -HAVE_NANOSLEEP = @HAVE_NANOSLEEP@ -HAVE_NETDB_H = @HAVE_NETDB_H@ -HAVE_NETINET_IN_H = @HAVE_NETINET_IN_H@ -HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@ -HAVE_OPENAT = @HAVE_OPENAT@ -HAVE_OPENDIR = @HAVE_OPENDIR@ -HAVE_OS_H = @HAVE_OS_H@ -HAVE_PCLOSE = @HAVE_PCLOSE@ -HAVE_PIPE = @HAVE_PIPE@ -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@ -HAVE_PTHREAD_H = @HAVE_PTHREAD_H@ -HAVE_PTHREAD_SIGMASK = @HAVE_PTHREAD_SIGMASK@ -HAVE_PTHREAD_SPINLOCK_T = @HAVE_PTHREAD_SPINLOCK_T@ -HAVE_PTHREAD_T = @HAVE_PTHREAD_T@ -HAVE_PTSNAME = @HAVE_PTSNAME@ -HAVE_PTSNAME_R = @HAVE_PTSNAME_R@ -HAVE_PWRITE = @HAVE_PWRITE@ -HAVE_RAISE = @HAVE_RAISE@ -HAVE_RANDOM = @HAVE_RANDOM@ -HAVE_RANDOM_H = @HAVE_RANDOM_H@ -HAVE_RANDOM_R = @HAVE_RANDOM_R@ -HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@ -HAVE_READDIR = @HAVE_READDIR@ -HAVE_READLINK = @HAVE_READLINK@ -HAVE_READLINKAT = @HAVE_READLINKAT@ -HAVE_REALPATH = @HAVE_REALPATH@ -HAVE_REMAINDER = @HAVE_REMAINDER@ -HAVE_REMAINDERF = @HAVE_REMAINDERF@ -HAVE_RENAMEAT = @HAVE_RENAMEAT@ -HAVE_REWINDDIR = @HAVE_REWINDDIR@ -HAVE_RINT = @HAVE_RINT@ -HAVE_RINTL = @HAVE_RINTL@ -HAVE_RPMATCH = @HAVE_RPMATCH@ -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_SETENV = @HAVE_SETENV@ -HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@ -HAVE_SIGACTION = @HAVE_SIGACTION@ -HAVE_SIGHANDLER_T = @HAVE_SIGHANDLER_T@ -HAVE_SIGINFO_T = @HAVE_SIGINFO_T@ -HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ -HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@ -HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@ -HAVE_SIGSET_T = @HAVE_SIGSET_T@ -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@ -HAVE_STPCPY = @HAVE_STPCPY@ -HAVE_STPNCPY = @HAVE_STPNCPY@ -HAVE_STRCASECMP = @HAVE_STRCASECMP@ -HAVE_STRCASESTR = @HAVE_STRCASESTR@ -HAVE_STRCHRNUL = @HAVE_STRCHRNUL@ -HAVE_STRINGS_H = @HAVE_STRINGS_H@ -HAVE_STRPBRK = @HAVE_STRPBRK@ -HAVE_STRPTIME = @HAVE_STRPTIME@ -HAVE_STRSEP = @HAVE_STRSEP@ -HAVE_STRTOD = @HAVE_STRTOD@ -HAVE_STRTOLL = @HAVE_STRTOLL@ -HAVE_STRTOULL = @HAVE_STRTOULL@ -HAVE_STRUCT_ADDRINFO = @HAVE_STRUCT_ADDRINFO@ -HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@ -HAVE_STRUCT_SCHED_PARAM = @HAVE_STRUCT_SCHED_PARAM@ -HAVE_STRUCT_SIGACTION_SA_SIGACTION = @HAVE_STRUCT_SIGACTION_SA_SIGACTION@ -HAVE_STRUCT_SOCKADDR_STORAGE = @HAVE_STRUCT_SOCKADDR_STORAGE@ -HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY = @HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY@ -HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@ -HAVE_STRUCT_UTSNAME = @HAVE_STRUCT_UTSNAME@ -HAVE_STRVERSCMP = @HAVE_STRVERSCMP@ -HAVE_SYMLINK = @HAVE_SYMLINK@ -HAVE_SYMLINKAT = @HAVE_SYMLINKAT@ -HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@ -HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@ -HAVE_SYS_IOCTL_H = @HAVE_SYS_IOCTL_H@ -HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@ -HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ -HAVE_SYS_RESOURCE_H = @HAVE_SYS_RESOURCE_H@ -HAVE_SYS_SELECT_H = @HAVE_SYS_SELECT_H@ -HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ -HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ -HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ -HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ -HAVE_SYS_UTSNAME_H = @HAVE_SYS_UTSNAME_H@ -HAVE_TANF = @HAVE_TANF@ -HAVE_TANHF = @HAVE_TANHF@ -HAVE_TANL = @HAVE_TANL@ -HAVE_TERMIOS_H = @HAVE_TERMIOS_H@ -HAVE_TIMEGM = @HAVE_TIMEGM@ -HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ -HAVE_UNAME = @HAVE_UNAME@ -HAVE_UNISTD_H = @HAVE_UNISTD_H@ -HAVE_UNLINKAT = @HAVE_UNLINKAT@ -HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ -HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ -HAVE_USLEEP = @HAVE_USLEEP@ -HAVE_UTIMENSAT = @HAVE_UTIMENSAT@ -HAVE_VASPRINTF = @HAVE_VASPRINTF@ -HAVE_VDPRINTF = @HAVE_VDPRINTF@ -HAVE_WCHAR_H = @HAVE_WCHAR_H@ -HAVE_WCHAR_T = @HAVE_WCHAR_T@ -HAVE_WCPCPY = @HAVE_WCPCPY@ -HAVE_WCPNCPY = @HAVE_WCPNCPY@ -HAVE_WCRTOMB = @HAVE_WCRTOMB@ -HAVE_WCSCASECMP = @HAVE_WCSCASECMP@ -HAVE_WCSCAT = @HAVE_WCSCAT@ -HAVE_WCSCHR = @HAVE_WCSCHR@ -HAVE_WCSCMP = @HAVE_WCSCMP@ -HAVE_WCSCOLL = @HAVE_WCSCOLL@ -HAVE_WCSCPY = @HAVE_WCSCPY@ -HAVE_WCSCSPN = @HAVE_WCSCSPN@ -HAVE_WCSDUP = @HAVE_WCSDUP@ -HAVE_WCSLEN = @HAVE_WCSLEN@ -HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@ -HAVE_WCSNCAT = @HAVE_WCSNCAT@ -HAVE_WCSNCMP = @HAVE_WCSNCMP@ -HAVE_WCSNCPY = @HAVE_WCSNCPY@ -HAVE_WCSNLEN = @HAVE_WCSNLEN@ -HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@ -HAVE_WCSPBRK = @HAVE_WCSPBRK@ -HAVE_WCSRCHR = @HAVE_WCSRCHR@ -HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@ -HAVE_WCSSPN = @HAVE_WCSSPN@ -HAVE_WCSSTR = @HAVE_WCSSTR@ -HAVE_WCSTOK = @HAVE_WCSTOK@ -HAVE_WCSWIDTH = @HAVE_WCSWIDTH@ -HAVE_WCSXFRM = @HAVE_WCSXFRM@ -HAVE_WCTRANS_T = @HAVE_WCTRANS_T@ -HAVE_WCTYPE_H = @HAVE_WCTYPE_H@ -HAVE_WCTYPE_T = @HAVE_WCTYPE_T@ -HAVE_WINSOCK2_H = @HAVE_WINSOCK2_H@ -HAVE_WINT_T = @HAVE_WINT_T@ -HAVE_WMEMCHR = @HAVE_WMEMCHR@ -HAVE_WMEMCMP = @HAVE_WMEMCMP@ -HAVE_WMEMCPY = @HAVE_WMEMCPY@ -HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ -HAVE_WMEMSET = @HAVE_WMEMSET@ -HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@ -HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ -HAVE__BOOL = @HAVE__BOOL@ -HAVE__EXIT = @HAVE__EXIT@ -HELP2MAN = @HELP2MAN@ -HOSTENT_LIB = @HOSTENT_LIB@ -ICONV_CONST = @ICONV_CONST@ -ICONV_H = @ICONV_H@ -IGNORE_UNUSED_LIBRARIES_CFLAGS = @IGNORE_UNUSED_LIBRARIES_CFLAGS@ -INCLUDE_NEXT = @INCLUDE_NEXT@ -INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@ -INET_NTOP_LIB = @INET_NTOP_LIB@ -INET_PTON_LIB = @INET_PTON_LIB@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTALL_SU = @INSTALL_SU@ -INT32_MAX_LT_INTMAX_MAX = @INT32_MAX_LT_INTMAX_MAX@ -INT64_MAX_EQ_LONG_MAX = @INT64_MAX_EQ_LONG_MAX@ -INTLLIBS = @INTLLIBS@ -INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ -LDFLAGS = @LDFLAGS@ -LIBCOREUTILS_LIBDEPS = @LIBCOREUTILS_LIBDEPS@ -LIBCOREUTILS_LTLIBDEPS = @LIBCOREUTILS_LTLIBDEPS@ -LIBICONV = @LIBICONV@ -LIBINTL = @LIBINTL@ -LIBMULTITHREAD = @LIBMULTITHREAD@ -LIBOBJS = @LIBOBJS@ -LIBPTH = @LIBPTH@ -LIBPTH_PREFIX = @LIBPTH_PREFIX@ -LIBS = @LIBS@ -LIBSOCKET = @LIBSOCKET@ -LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@ -LIBTHREAD = @LIBTHREAD@ -LIBUNISTRING_UNISTR_H = @LIBUNISTRING_UNISTR_H@ -LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@ -LIBUNISTRING_UNIWIDTH_H = @LIBUNISTRING_UNIWIDTH_H@ -LIB_ACL = @LIB_ACL@ -LIB_CAP = @LIB_CAP@ -LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ -LIB_CRYPT = @LIB_CRYPT@ -LIB_EACCESS = @LIB_EACCESS@ -LIB_FDATASYNC = @LIB_FDATASYNC@ -LIB_GETHRXTIME = @LIB_GETHRXTIME@ -LIB_GMP = @LIB_GMP@ -LIB_NANOSLEEP = @LIB_NANOSLEEP@ -LIB_PTHREAD = @LIB_PTHREAD@ -LIB_SELECT = @LIB_SELECT@ -LIB_SELINUX = @LIB_SELINUX@ -LIB_TIMER_TIME = @LIB_TIMER_TIME@ -LIB_XATTR = @LIB_XATTR@ -LN_S = @LN_S@ -LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@ -LOCALE_FR = @LOCALE_FR@ -LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@ -LOCALE_JA = @LOCALE_JA@ -LOCALE_TR_UTF8 = @LOCALE_TR_UTF8@ -LOCALE_ZH_CN = @LOCALE_ZH_CN@ -LTLIBICONV = @LTLIBICONV@ -LTLIBINTL = @LTLIBINTL@ -LTLIBMULTITHREAD = @LTLIBMULTITHREAD@ -LTLIBOBJS = @LTLIBOBJS@ -LTLIBPTH = @LTLIBPTH@ -LTLIBTHREAD = @LTLIBTHREAD@ -MAKEINFO = @MAKEINFO@ -MAN = @MAN@ -MKDIR_P = @MKDIR_P@ -MSGFMT = @MSGFMT@ -MSGFMT_015 = @MSGFMT_015@ -MSGMERGE = @MSGMERGE@ -NETINET_IN_H = @NETINET_IN_H@ -NEXT_ARPA_INET_H = @NEXT_ARPA_INET_H@ -NEXT_AS_FIRST_DIRECTIVE_ARPA_INET_H = @NEXT_AS_FIRST_DIRECTIVE_ARPA_INET_H@ -NEXT_AS_FIRST_DIRECTIVE_CTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_CTYPE_H@ -NEXT_AS_FIRST_DIRECTIVE_DIRENT_H = @NEXT_AS_FIRST_DIRECTIVE_DIRENT_H@ -NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@ -NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@ -NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@ -NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ -NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@ -NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@ -NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@ -NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@ -NEXT_AS_FIRST_DIRECTIVE_MATH_H = @NEXT_AS_FIRST_DIRECTIVE_MATH_H@ -NEXT_AS_FIRST_DIRECTIVE_NETDB_H = @NEXT_AS_FIRST_DIRECTIVE_NETDB_H@ -NEXT_AS_FIRST_DIRECTIVE_NETINET_IN_H = @NEXT_AS_FIRST_DIRECTIVE_NETINET_IN_H@ -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@ -NEXT_AS_FIRST_DIRECTIVE_STDIO_H = @NEXT_AS_FIRST_DIRECTIVE_STDIO_H@ -NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@ -NEXT_AS_FIRST_DIRECTIVE_STRINGS_H = @NEXT_AS_FIRST_DIRECTIVE_STRINGS_H@ -NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_IOCTL_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_IOCTL_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_RESOURCE_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_RESOURCE_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_UTSNAME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UTSNAME_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H@ -NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H = @NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H@ -NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ -NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ -NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@ -NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@ -NEXT_CTYPE_H = @NEXT_CTYPE_H@ -NEXT_DIRENT_H = @NEXT_DIRENT_H@ -NEXT_ERRNO_H = @NEXT_ERRNO_H@ -NEXT_FCNTL_H = @NEXT_FCNTL_H@ -NEXT_FLOAT_H = @NEXT_FLOAT_H@ -NEXT_GETOPT_H = @NEXT_GETOPT_H@ -NEXT_ICONV_H = @NEXT_ICONV_H@ -NEXT_INTTYPES_H = @NEXT_INTTYPES_H@ -NEXT_LANGINFO_H = @NEXT_LANGINFO_H@ -NEXT_LOCALE_H = @NEXT_LOCALE_H@ -NEXT_MATH_H = @NEXT_MATH_H@ -NEXT_NETDB_H = @NEXT_NETDB_H@ -NEXT_NETINET_IN_H = @NEXT_NETINET_IN_H@ -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@ -NEXT_STDIO_H = @NEXT_STDIO_H@ -NEXT_STDLIB_H = @NEXT_STDLIB_H@ -NEXT_STRINGS_H = @NEXT_STRINGS_H@ -NEXT_STRING_H = @NEXT_STRING_H@ -NEXT_SYS_IOCTL_H = @NEXT_SYS_IOCTL_H@ -NEXT_SYS_RESOURCE_H = @NEXT_SYS_RESOURCE_H@ -NEXT_SYS_SELECT_H = @NEXT_SYS_SELECT_H@ -NEXT_SYS_SOCKET_H = @NEXT_SYS_SOCKET_H@ -NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ -NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@ -NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ -NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ -NEXT_SYS_UTSNAME_H = @NEXT_SYS_UTSNAME_H@ -NEXT_SYS_WAIT_H = @NEXT_SYS_WAIT_H@ -NEXT_TERMIOS_H = @NEXT_TERMIOS_H@ -NEXT_TIME_H = @NEXT_TIME_H@ -NEXT_UNISTD_H = @NEXT_UNISTD_H@ -NEXT_WCHAR_H = @NEXT_WCHAR_H@ -NEXT_WCTYPE_H = @NEXT_WCTYPE_H@ -NO_INSTALL_PROGS_DEFAULT = @NO_INSTALL_PROGS_DEFAULT@ -OBJEXT = @OBJEXT@ -OPTIONAL_BIN_PROGS = @OPTIONAL_BIN_PROGS@ -OPTIONAL_PKGLIB_PROGS = @OPTIONAL_PKGLIB_PROGS@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL = @PERL@ -POSIX_SHELL = @POSIX_SHELL@ -POSUB = @POSUB@ -PRAGMA_COLUMNS = @PRAGMA_COLUMNS@ -PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ -PREFERABLY_POSIX_SHELL = @PREFERABLY_POSIX_SHELL@ -PRIPTR_PREFIX = @PRIPTR_PREFIX@ -PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ -PTHREAD_H = @PTHREAD_H@ -PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ -PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ -RANLIB = @RANLIB@ -REPLACE_BTOWC = @REPLACE_BTOWC@ -REPLACE_CALLOC = @REPLACE_CALLOC@ -REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ -REPLACE_CBRTF = @REPLACE_CBRTF@ -REPLACE_CBRTL = @REPLACE_CBRTL@ -REPLACE_CEIL = @REPLACE_CEIL@ -REPLACE_CEILF = @REPLACE_CEILF@ -REPLACE_CEILL = @REPLACE_CEILL@ -REPLACE_CHOWN = @REPLACE_CHOWN@ -REPLACE_CLOSE = @REPLACE_CLOSE@ -REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@ -REPLACE_DIRFD = @REPLACE_DIRFD@ -REPLACE_DPRINTF = @REPLACE_DPRINTF@ -REPLACE_DUP = @REPLACE_DUP@ -REPLACE_DUP2 = @REPLACE_DUP2@ -REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@ -REPLACE_EXP2 = @REPLACE_EXP2@ -REPLACE_EXP2L = @REPLACE_EXP2L@ -REPLACE_EXPM1 = @REPLACE_EXPM1@ -REPLACE_EXPM1F = @REPLACE_EXPM1F@ -REPLACE_FABSL = @REPLACE_FABSL@ -REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ -REPLACE_FCLOSE = @REPLACE_FCLOSE@ -REPLACE_FCNTL = @REPLACE_FCNTL@ -REPLACE_FDOPEN = @REPLACE_FDOPEN@ -REPLACE_FDOPENDIR = @REPLACE_FDOPENDIR@ -REPLACE_FFLUSH = @REPLACE_FFLUSH@ -REPLACE_FLOOR = @REPLACE_FLOOR@ -REPLACE_FLOORF = @REPLACE_FLOORF@ -REPLACE_FLOORL = @REPLACE_FLOORL@ -REPLACE_FMA = @REPLACE_FMA@ -REPLACE_FMAF = @REPLACE_FMAF@ -REPLACE_FMAL = @REPLACE_FMAL@ -REPLACE_FMOD = @REPLACE_FMOD@ -REPLACE_FMODF = @REPLACE_FMODF@ -REPLACE_FMODL = @REPLACE_FMODL@ -REPLACE_FOPEN = @REPLACE_FOPEN@ -REPLACE_FPRINTF = @REPLACE_FPRINTF@ -REPLACE_FPURGE = @REPLACE_FPURGE@ -REPLACE_FREOPEN = @REPLACE_FREOPEN@ -REPLACE_FREXP = @REPLACE_FREXP@ -REPLACE_FREXPF = @REPLACE_FREXPF@ -REPLACE_FREXPL = @REPLACE_FREXPL@ -REPLACE_FSEEK = @REPLACE_FSEEK@ -REPLACE_FSEEKO = @REPLACE_FSEEKO@ -REPLACE_FSTAT = @REPLACE_FSTAT@ -REPLACE_FSTATAT = @REPLACE_FSTATAT@ -REPLACE_FTELL = @REPLACE_FTELL@ -REPLACE_FTELLO = @REPLACE_FTELLO@ -REPLACE_FTRUNCATE = @REPLACE_FTRUNCATE@ -REPLACE_FUTIMENS = @REPLACE_FUTIMENS@ -REPLACE_GAI_STRERROR = @REPLACE_GAI_STRERROR@ -REPLACE_GETCWD = @REPLACE_GETCWD@ -REPLACE_GETDELIM = @REPLACE_GETDELIM@ -REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ -REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ -REPLACE_GETLINE = @REPLACE_GETLINE@ -REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ -REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ -REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ -REPLACE_HUGE_VAL = @REPLACE_HUGE_VAL@ -REPLACE_HYPOT = @REPLACE_HYPOT@ -REPLACE_HYPOTF = @REPLACE_HYPOTF@ -REPLACE_HYPOTL = @REPLACE_HYPOTL@ -REPLACE_ICONV = @REPLACE_ICONV@ -REPLACE_ICONV_OPEN = @REPLACE_ICONV_OPEN@ -REPLACE_ICONV_UTF = @REPLACE_ICONV_UTF@ -REPLACE_ILOGB = @REPLACE_ILOGB@ -REPLACE_ILOGBF = @REPLACE_ILOGBF@ -REPLACE_INET_NTOP = @REPLACE_INET_NTOP@ -REPLACE_INET_PTON = @REPLACE_INET_PTON@ -REPLACE_IOCTL = @REPLACE_IOCTL@ -REPLACE_ISATTY = @REPLACE_ISATTY@ -REPLACE_ISFINITE = @REPLACE_ISFINITE@ -REPLACE_ISINF = @REPLACE_ISINF@ -REPLACE_ISNAN = @REPLACE_ISNAN@ -REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ -REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ -REPLACE_ITOLD = @REPLACE_ITOLD@ -REPLACE_LCHOWN = @REPLACE_LCHOWN@ -REPLACE_LDEXPL = @REPLACE_LDEXPL@ -REPLACE_LINK = @REPLACE_LINK@ -REPLACE_LINKAT = @REPLACE_LINKAT@ -REPLACE_LOCALECONV = @REPLACE_LOCALECONV@ -REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@ -REPLACE_LOG = @REPLACE_LOG@ -REPLACE_LOG10 = @REPLACE_LOG10@ -REPLACE_LOG10F = @REPLACE_LOG10F@ -REPLACE_LOG10L = @REPLACE_LOG10L@ -REPLACE_LOG1P = @REPLACE_LOG1P@ -REPLACE_LOG1PF = @REPLACE_LOG1PF@ -REPLACE_LOG1PL = @REPLACE_LOG1PL@ -REPLACE_LOG2 = @REPLACE_LOG2@ -REPLACE_LOG2F = @REPLACE_LOG2F@ -REPLACE_LOG2L = @REPLACE_LOG2L@ -REPLACE_LOGB = @REPLACE_LOGB@ -REPLACE_LOGBF = @REPLACE_LOGBF@ -REPLACE_LOGBL = @REPLACE_LOGBL@ -REPLACE_LOGF = @REPLACE_LOGF@ -REPLACE_LOGL = @REPLACE_LOGL@ -REPLACE_LSEEK = @REPLACE_LSEEK@ -REPLACE_LSTAT = @REPLACE_LSTAT@ -REPLACE_MALLOC = @REPLACE_MALLOC@ -REPLACE_MBRLEN = @REPLACE_MBRLEN@ -REPLACE_MBRTOWC = @REPLACE_MBRTOWC@ -REPLACE_MBSINIT = @REPLACE_MBSINIT@ -REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@ -REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@ -REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@ -REPLACE_MBTOWC = @REPLACE_MBTOWC@ -REPLACE_MEMCHR = @REPLACE_MEMCHR@ -REPLACE_MEMMEM = @REPLACE_MEMMEM@ -REPLACE_MKDIR = @REPLACE_MKDIR@ -REPLACE_MKFIFO = @REPLACE_MKFIFO@ -REPLACE_MKNOD = @REPLACE_MKNOD@ -REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ -REPLACE_MKTIME = @REPLACE_MKTIME@ -REPLACE_MODF = @REPLACE_MODF@ -REPLACE_MODFF = @REPLACE_MODFF@ -REPLACE_MODFL = @REPLACE_MODFL@ -REPLACE_NAN = @REPLACE_NAN@ -REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@ -REPLACE_NL_LANGINFO = @REPLACE_NL_LANGINFO@ -REPLACE_NULL = @REPLACE_NULL@ -REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@ -REPLACE_OPEN = @REPLACE_OPEN@ -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@ -REPLACE_PTHREAD_SIGMASK = @REPLACE_PTHREAD_SIGMASK@ -REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@ -REPLACE_PUTENV = @REPLACE_PUTENV@ -REPLACE_PWRITE = @REPLACE_PWRITE@ -REPLACE_RAISE = @REPLACE_RAISE@ -REPLACE_RANDOM_R = @REPLACE_RANDOM_R@ -REPLACE_READ = @REPLACE_READ@ -REPLACE_READLINK = @REPLACE_READLINK@ -REPLACE_REALLOC = @REPLACE_REALLOC@ -REPLACE_REALPATH = @REPLACE_REALPATH@ -REPLACE_REMAINDER = @REPLACE_REMAINDER@ -REPLACE_REMAINDERF = @REPLACE_REMAINDERF@ -REPLACE_REMAINDERL = @REPLACE_REMAINDERL@ -REPLACE_REMOVE = @REPLACE_REMOVE@ -REPLACE_RENAME = @REPLACE_RENAME@ -REPLACE_RENAMEAT = @REPLACE_RENAMEAT@ -REPLACE_RMDIR = @REPLACE_RMDIR@ -REPLACE_ROUND = @REPLACE_ROUND@ -REPLACE_ROUNDF = @REPLACE_ROUNDF@ -REPLACE_ROUNDL = @REPLACE_ROUNDL@ -REPLACE_SELECT = @REPLACE_SELECT@ -REPLACE_SETENV = @REPLACE_SETENV@ -REPLACE_SETLOCALE = @REPLACE_SETLOCALE@ -REPLACE_SIGNBIT = @REPLACE_SIGNBIT@ -REPLACE_SIGNBIT_USING_GCC = @REPLACE_SIGNBIT_USING_GCC@ -REPLACE_SLEEP = @REPLACE_SLEEP@ -REPLACE_SNPRINTF = @REPLACE_SNPRINTF@ -REPLACE_SPRINTF = @REPLACE_SPRINTF@ -REPLACE_SQRTL = @REPLACE_SQRTL@ -REPLACE_STAT = @REPLACE_STAT@ -REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@ -REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@ -REPLACE_STPNCPY = @REPLACE_STPNCPY@ -REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ -REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ -REPLACE_STRDUP = @REPLACE_STRDUP@ -REPLACE_STRERROR = @REPLACE_STRERROR@ -REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ -REPLACE_STRNCAT = @REPLACE_STRNCAT@ -REPLACE_STRNDUP = @REPLACE_STRNDUP@ -REPLACE_STRNLEN = @REPLACE_STRNLEN@ -REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@ -REPLACE_STRSTR = @REPLACE_STRSTR@ -REPLACE_STRTOD = @REPLACE_STRTOD@ -REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@ -REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ -REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@ -REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ -REPLACE_SYMLINK = @REPLACE_SYMLINK@ -REPLACE_TIMEGM = @REPLACE_TIMEGM@ -REPLACE_TMPFILE = @REPLACE_TMPFILE@ -REPLACE_TOWLOWER = @REPLACE_TOWLOWER@ -REPLACE_TRUNC = @REPLACE_TRUNC@ -REPLACE_TRUNCF = @REPLACE_TRUNCF@ -REPLACE_TRUNCL = @REPLACE_TRUNCL@ -REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@ -REPLACE_UNLINK = @REPLACE_UNLINK@ -REPLACE_UNLINKAT = @REPLACE_UNLINKAT@ -REPLACE_UNSETENV = @REPLACE_UNSETENV@ -REPLACE_USLEEP = @REPLACE_USLEEP@ -REPLACE_UTIMENSAT = @REPLACE_UTIMENSAT@ -REPLACE_VASPRINTF = @REPLACE_VASPRINTF@ -REPLACE_VDPRINTF = @REPLACE_VDPRINTF@ -REPLACE_VFPRINTF = @REPLACE_VFPRINTF@ -REPLACE_VPRINTF = @REPLACE_VPRINTF@ -REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@ -REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ -REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ -REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ -REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ -REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ -REPLACE_WCTOB = @REPLACE_WCTOB@ -REPLACE_WCTOMB = @REPLACE_WCTOMB@ -REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ -REPLACE_WRITE = @REPLACE_WRITE@ -SCHED_H = @SCHED_H@ -SELINUX_CONTEXT_H = @SELINUX_CONTEXT_H@ -SEQ_LIBM = @SEQ_LIBM@ -SERVENT_LIB = @SERVENT_LIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ -SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ -STDALIGN_H = @STDALIGN_H@ -STDARG_H = @STDARG_H@ -STDBOOL_H = @STDBOOL_H@ -STDDEF_H = @STDDEF_H@ -STDINT_H = @STDINT_H@ -STRIP = @STRIP@ -SYS_IOCTL_H_HAVE_WINSOCK2_H = @SYS_IOCTL_H_HAVE_WINSOCK2_H@ -SYS_IOCTL_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @SYS_IOCTL_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ -SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ -TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ -UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@ -UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@ -UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ -UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ -UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ -USE_ACL = @USE_ACL@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WARN_CFLAGS = @WARN_CFLAGS@ -WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ -WERROR_CFLAGS = @WERROR_CFLAGS@ -WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@ -WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@ -WINT_T_SUFFIX = @WINT_T_SUFFIX@ -XGETTEXT = @XGETTEXT@ -XGETTEXT_015 = @XGETTEXT_015@ -XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ -YACC = @YACC@ -YFLAGS = @YFLAGS@ -YIELD_LIB = @YIELD_LIB@ -abs_aux_dir = @abs_aux_dir@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -gl_LIBOBJS = @gl_LIBOBJS@ -gl_LTLIBOBJS = @gl_LTLIBOBJS@ -gltests_LIBOBJS = @gltests_LIBOBJS@ -gltests_LTLIBOBJS = @gltests_LTLIBOBJS@ -gltests_WITNESS = @gltests_WITNESS@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -lispdir = @lispdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -dist_man1_MANS = $(MAN) -man_aux = $(dist_man1_MANS:.1=.x) -EXTRA_DIST = $(man_aux) $(NO_INSTALL_PROGS_DEFAULT:%=%.x) help2man \ - $(NO_INSTALL_PROGS_DEFAULT:%=%.1) - -MAINTAINERCLEANFILES = $(dist_man1_MANS) - -# Depend on ../.version to get version number changes. -common_dep = ../.version -SUFFIXES = .x .1 - -# Ensure that help2man runs the ../src/ginstall binary as -# 'install' when creating install.1. -# Similarly, ensure that it uses the ../src/[ binary to create test.1. -t = $*.td -mapped_name = `echo $*|sed 's/^install$$/ginstall/; s/^test$$/[/'` - -# Sort in traditional ASCII order, regardless of the current locale; -# otherwise we may get into trouble with distinct strings that the -# current locale considers to be equal. -ASSORT = LC_ALL=C sort -all_programs = \ - (cd ../src && MAKEFLAGS= $(MAKE) -s all_programs.list) \ - | grep -v '\[' - -all: all-am - -.SUFFIXES: -.SUFFIXES: .x .1 -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu man/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): -install-man1: $(dist_man1_MANS) - @$(NORMAL_INSTALL) - @list1='$(dist_man1_MANS)'; \ - list2=''; \ - test -n "$(man1dir)" \ - && test -n "`echo $$list1$$list2`" \ - || exit 0; \ - echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ - { for i in $$list1; do echo "$$i"; done; \ - if test -n "$$list2"; then \ - for i in $$list2; do echo "$$i"; done \ - | sed -n '/\.1[a-z]*$$/p'; \ - fi; \ - } | while read p; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; echo "$$p"; \ - done | \ - sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ - -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \ - sed 'N;N;s,\n, ,g' | { \ - list=; while read file base inst; do \ - if test "$$base" = "$$inst"; then list="$$list $$file"; else \ - echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ - $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \ - fi; \ - done; \ - for i in $$list; do echo "$$i"; done | $(am__base_list) | \ - while read files; do \ - test -z "$$files" || { \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \ - done; } - -uninstall-man1: - @$(NORMAL_UNINSTALL) - @list='$(dist_man1_MANS)'; test -n "$(man1dir)" || exit 0; \ - files=`{ for i in $$list; do echo "$$i"; done; \ - } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ - -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - -cscope cscopelist: - - -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)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(MANS) -installdirs: - for dir in "$(DESTDIR)$(man1dir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) -clean: clean-am - -clean-am: clean-generic mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: install-man - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: install-man1 - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-man - -uninstall-man: uninstall-man1 - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am 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-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \ - uninstall-am uninstall-man uninstall-man1 - - -# Note that arch depends on uname.c -arch.1: $(common_dep) $(srcdir)/arch.x ../src/uname.c - -base64.1: $(common_dep) $(srcdir)/base64.x ../src/base64.c -basename.1: $(common_dep) $(srcdir)/basename.x ../src/basename.c -cat.1: $(common_dep) $(srcdir)/cat.x ../src/cat.c -chcon.1: $(common_dep) $(srcdir)/chcon.x ../src/chcon.c -chgrp.1: $(common_dep) $(srcdir)/chgrp.x ../src/chgrp.c -chmod.1: $(common_dep) $(srcdir)/chmod.x ../src/chmod.c -chown.1: $(common_dep) $(srcdir)/chown.x ../src/chown.c -chroot.1: $(common_dep) $(srcdir)/chroot.x ../src/chroot.c -cksum.1: $(common_dep) $(srcdir)/cksum.x ../src/cksum.c -comm.1: $(common_dep) $(srcdir)/comm.x ../src/comm.c -cp.1: $(common_dep) $(srcdir)/cp.x ../src/cp.c -csplit.1: $(common_dep) $(srcdir)/csplit.x ../src/csplit.c -cut.1: $(common_dep) $(srcdir)/cut.x ../src/cut.c -date.1: $(common_dep) $(srcdir)/date.x ../src/date.c -dd.1: $(common_dep) $(srcdir)/dd.x ../src/dd.c -df.1: $(common_dep) $(srcdir)/df.x ../src/df.c - -# Note that dir depends on ls.c, since that's where it's --help text is. -dir.1: $(common_dep) $(srcdir)/dir.x ../src/ls.c - -dircolors.1: $(common_dep) $(srcdir)/dircolors.x ../src/dircolors.c -dirname.1: $(common_dep) $(srcdir)/dirname.x ../src/dirname.c -du.1: $(common_dep) $(srcdir)/du.x ../src/du.c -echo.1: $(common_dep) $(srcdir)/echo.x ../src/echo.c -env.1: $(common_dep) $(srcdir)/env.x ../src/env.c -expand.1: $(common_dep) $(srcdir)/expand.x ../src/expand.c -expr.1: $(common_dep) $(srcdir)/expr.x ../src/expr.c -factor.1: $(common_dep) $(srcdir)/factor.x ../src/factor.c -false.1: $(common_dep) $(srcdir)/false.x ../src/false.c -fmt.1: $(common_dep) $(srcdir)/fmt.x ../src/fmt.c -fold.1: $(common_dep) $(srcdir)/fold.x ../src/fold.c -groups.1: $(common_dep) $(srcdir)/groups.x ../src/groups.c -head.1: $(common_dep) $(srcdir)/head.x ../src/head.c -hostid.1: $(common_dep) $(srcdir)/hostid.x ../src/hostid.c -hostname.1: $(common_dep) $(srcdir)/hostname.x ../src/hostname.c -id.1: $(common_dep) $(srcdir)/id.x ../src/id.c -install.1: $(common_dep) $(srcdir)/install.x ../src/install.c -join.1: $(common_dep) $(srcdir)/join.x ../src/join.c -kill.1: $(common_dep) $(srcdir)/kill.x ../src/kill.c -link.1: $(common_dep) $(srcdir)/link.x ../src/link.c -ln.1: $(common_dep) $(srcdir)/ln.x ../src/ln.c -logname.1: $(common_dep) $(srcdir)/logname.x ../src/logname.c -ls.1: $(common_dep) $(srcdir)/ls.x ../src/ls.c -md5sum.1: $(common_dep) $(srcdir)/md5sum.x ../src/md5sum.c -mkdir.1: $(common_dep) $(srcdir)/mkdir.x ../src/mkdir.c -mkfifo.1: $(common_dep) $(srcdir)/mkfifo.x ../src/mkfifo.c -mknod.1: $(common_dep) $(srcdir)/mknod.x ../src/mknod.c -mktemp.1: $(common_dep) $(srcdir)/mktemp.x ../src/mktemp.c -mv.1: $(common_dep) $(srcdir)/mv.x ../src/mv.c -nice.1: $(common_dep) $(srcdir)/nice.x ../src/nice.c -nl.1: $(common_dep) $(srcdir)/nl.x ../src/nl.c -nohup.1: $(common_dep) $(srcdir)/nohup.x ../src/nohup.c -nproc.1: $(common_dep) $(srcdir)/nproc.x ../src/nproc.c -od.1: $(common_dep) $(srcdir)/od.x ../src/od.c -paste.1: $(common_dep) $(srcdir)/paste.x ../src/paste.c -pathchk.1: $(common_dep) $(srcdir)/pathchk.x ../src/pathchk.c -pinky.1: $(common_dep) $(srcdir)/pinky.x ../src/pinky.c -pr.1: $(common_dep) $(srcdir)/pr.x ../src/pr.c -printenv.1: $(common_dep) $(srcdir)/printenv.x ../src/printenv.c -printf.1: $(common_dep) $(srcdir)/printf.x ../src/printf.c -ptx.1: $(common_dep) $(srcdir)/ptx.x ../src/ptx.c -pwd.1: $(common_dep) $(srcdir)/pwd.x ../src/pwd.c -readlink.1: $(common_dep) $(srcdir)/readlink.x ../src/readlink.c -realpath.1: $(common_dep) $(srcdir)/realpath.x ../src/realpath.c -rm.1: $(common_dep) $(srcdir)/rm.x ../src/rm.c -rmdir.1: $(common_dep) $(srcdir)/rmdir.x ../src/rmdir.c -runcon.1: $(common_dep) $(srcdir)/runcon.x ../src/runcon.c -seq.1: $(common_dep) $(srcdir)/seq.x ../src/seq.c -sha1sum.1: $(common_dep) $(srcdir)/sha1sum.x ../src/md5sum.c -sha224sum.1: $(common_dep) $(srcdir)/sha224sum.x ../src/md5sum.c -sha256sum.1: $(common_dep) $(srcdir)/sha256sum.x ../src/md5sum.c -sha384sum.1: $(common_dep) $(srcdir)/sha384sum.x ../src/md5sum.c -sha512sum.1: $(common_dep) $(srcdir)/sha512sum.x ../src/md5sum.c -shred.1: $(common_dep) $(srcdir)/shred.x ../src/shred.c -shuf.1: $(common_dep) $(srcdir)/shuf.x ../src/shuf.c -sleep.1: $(common_dep) $(srcdir)/sleep.x ../src/sleep.c -sort.1: $(common_dep) $(srcdir)/sort.x ../src/sort.c -split.1: $(common_dep) $(srcdir)/split.x ../src/split.c -stat.1: $(common_dep) $(srcdir)/stat.x ../src/stat.c -stdbuf.1: $(common_dep) $(srcdir)/stdbuf.x ../src/stdbuf.c -stty.1: $(common_dep) $(srcdir)/stty.x ../src/stty.c -su.1: $(common_dep) $(srcdir)/su.x ../src/su.c -sum.1: $(common_dep) $(srcdir)/sum.x ../src/sum.c -sync.1: $(common_dep) $(srcdir)/sync.x ../src/sync.c -tac.1: $(common_dep) $(srcdir)/tac.x ../src/tac.c -tail.1: $(common_dep) $(srcdir)/tail.x ../src/tail.c -tee.1: $(common_dep) $(srcdir)/tee.x ../src/tee.c -test.1: $(common_dep) $(srcdir)/test.x ../src/test.c -timeout.1: $(common_dep) $(srcdir)/timeout.x ../src/timeout.c -touch.1: $(common_dep) $(srcdir)/touch.x ../src/touch.c -tr.1: $(common_dep) $(srcdir)/tr.x ../src/tr.c -true.1: $(common_dep) $(srcdir)/true.x ../src/true.c -truncate.1: $(common_dep) $(srcdir)/truncate.x ../src/truncate.c -tsort.1: $(common_dep) $(srcdir)/tsort.x ../src/tsort.c -tty.1: $(common_dep) $(srcdir)/tty.x ../src/tty.c -uname.1: $(common_dep) $(srcdir)/uname.x ../src/uname.c -unexpand.1: $(common_dep) $(srcdir)/unexpand.x ../src/unexpand.c -uniq.1: $(common_dep) $(srcdir)/uniq.x ../src/uniq.c -unlink.1: $(common_dep) $(srcdir)/unlink.x ../src/unlink.c -uptime.1: $(common_dep) $(srcdir)/uptime.x ../src/uptime.c -users.1: $(common_dep) $(srcdir)/users.x ../src/users.c -vdir.1: $(common_dep) $(srcdir)/vdir.x ../src/ls.c -wc.1: $(common_dep) $(srcdir)/wc.x ../src/wc.c -who.1: $(common_dep) $(srcdir)/who.x ../src/who.c -whoami.1: $(common_dep) $(srcdir)/whoami.x ../src/whoami.c -yes.1: $(common_dep) $(srcdir)/yes.x ../src/yes.c - -# This is required so that changes to e.g., emit_bug_reporting_address -# provoke regeneration of all $(MAN) files. -$(MAN): $(top_srcdir)/src/system.h - -# Note the use of $t/$*, rather than just '$*' as in other packages. -# That is necessary to avoid failures for programs that are also shell built-in -# functions like echo, false, printf, pwd. -.x.1: - $(AM_V_GEN)case '$(PERL)' in \ - *"/missing "*) \ - echo 'WARNING: cannot update man page $@ since perl is missing' \ - 'or inadequate' 1>&2 \ - ;; \ - *) \ - rm -f $@ $@-t \ - && { \ - rm -rf $t; \ - mkdir $t; \ - (cd $t && $(LN_S) ../../src/$(mapped_name) $*); \ - $(PERL) -- $(srcdir)/help2man \ - --source='$(PACKAGE_STRING)' \ - --include=$(srcdir)/$*.x \ - --output=$t/$@ $t/$*; \ - } \ - && sed 's|$*\.td/||g' $t/$@ > $@-t \ - && rm -rf $t \ - && chmod -w $@-t \ - && mv $@-t $@ \ - ;; \ - esac - -# Option descriptions should not start with a capital letter -.PHONY: sc_option_desc_uppercase -sc_option_desc_uppercase: $(dist_man1_MANS) $(NO_INSTALL_PROGS_DEFAULT:%=%.1) - @grep '^\\fB\\-' -A1 *.1 | LC_ALL=C grep '\.1.[A-Z][a-z]' && \ - { echo 1>&2 '$(ME): found initial capitals in --help'; \ - exit 1; } || :; - -.PHONY: sc_man_file_correlation -sc_man_file_correlation: check-x-vs-1 check-programs-vs-x - -# Ensure that for each .x file in this directory, there is a -# corresponding .1 file in the definition of $(dist_man1_MANS) above. -# But since that expansion usually lacks programs like su and arch, -# add them here manually. -.PHONY: check-x-vs-1 -check-x-vs-1: - @PATH=../src$(PATH_SEPARATOR)$$PATH; export PATH; \ - t=$@-t; \ - (cd $(srcdir) && ls -1 *.x) | sed 's/\.x$$//' | $(ASSORT) > $$t;\ - (echo $(dist_man1_MANS) $(NO_INSTALL_PROGS_DEFAULT) \ - | tr -s ' ' '\n' | sed 's/\.1$$//') \ - | $(ASSORT) -u | diff - $$t || { rm $$t; exit 1; }; \ - rm $$t - -.PHONY: check-programs-vs-x -check-programs-vs-x: - @status=0; \ - for p in dummy `$(all_programs)`; do \ - test $$p = dummy && continue; \ - test $$p = ginstall && p=install || : ; \ - test -f $(srcdir)/$$p.x \ - || { echo missing $$p.x 1>&2; status=1; }; \ - done; \ - exit $$status - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/man/arch.1 b/man/arch.1 deleted file mode 100644 index 6944b99d..00000000 --- a/man/arch.1 +++ /dev/null @@ -1,47 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH ARCH "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -arch \- print machine hardware name (same as uname -m) -.SH SYNOPSIS -.B arch -[\fIOPTION\fR]... -.SH DESCRIPTION -.\" Add any additional description here -.PP -Print machine architecture. -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.SH AUTHOR -Written by David MacKenzie and Karel Zak. -.SH "REPORTING BUGS" -Report arch bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report arch translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -uname(1), uname(2) -.PP -The full documentation for -.B arch -is maintained as a Texinfo manual. If the -.B info -and -.B arch -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqarch invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/base64.1 b/man/base64.1 deleted file mode 100644 index 92c75ac2..00000000 --- a/man/base64.1 +++ /dev/null @@ -1,62 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH BASE64 "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -base64 \- base64 encode/decode data and print to standard output -.SH SYNOPSIS -.B base64 -[\fIOPTION\fR]... [\fIFILE\fR] -.SH DESCRIPTION -.\" Add any additional description here -.PP -Base64 encode or decode FILE, or standard input, to standard output. -.TP -\fB\-d\fR, \fB\-\-decode\fR -decode data -.TP -\fB\-i\fR, \fB\-\-ignore\-garbage\fR -when decoding, ignore non\-alphabet characters -.TP -\fB\-w\fR, \fB\-\-wrap\fR=\fICOLS\fR -wrap encoded lines after COLS character (default 76). -Use 0 to disable line wrapping -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -With no FILE, or when FILE is \-, read standard input. -.PP -The data are encoded as described for the base64 alphabet in RFC 3548. -When decoding, the input may contain newlines in addition to the bytes of -the formal base64 alphabet. Use \fB\-\-ignore\-garbage\fR to attempt to recover -from any other non\-alphabet bytes in the encoded stream. -.SH AUTHOR -Written by Simon Josefsson. -.SH "REPORTING BUGS" -Report base64 bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report base64 translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B base64 -is maintained as a Texinfo manual. If the -.B info -and -.B base64 -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqbase64 invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/basename.1 b/man/basename.1 deleted file mode 100644 index b319d655..00000000 --- a/man/basename.1 +++ /dev/null @@ -1,73 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH BASENAME "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -basename \- strip directory and suffix from filenames -.SH SYNOPSIS -.B basename -\fINAME \fR[\fISUFFIX\fR] -.br -.B basename -\fIOPTION\fR... \fINAME\fR... -.SH DESCRIPTION -.\" Add any additional description here -.PP -Print NAME with any leading directory components removed. -If specified, also remove a trailing SUFFIX. -.TP -\fB\-a\fR, \fB\-\-multiple\fR -support multiple arguments and treat each as a NAME -.TP -\fB\-s\fR, \fB\-\-suffix\fR=\fISUFFIX\fR -remove a trailing SUFFIX -.TP -\fB\-z\fR, \fB\-\-zero\fR -separate output with NUL rather than newline -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.SH EXAMPLES -.TP -basename /usr/bin/sort -\-> "sort" -.TP -basename include/stdio.h .h -\-> "stdio" -.TP -basename \fB\-s\fR .h include/stdio.h -\-> "stdio" -.TP -basename \fB\-a\fR any/str1 any/str2 -\-> "str1" followed by "str2" -.SH AUTHOR -Written by David MacKenzie. -.SH "REPORTING BUGS" -Report basename bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report basename translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -dirname(1), readlink(1) -.PP -The full documentation for -.B basename -is maintained as a Texinfo manual. If the -.B info -and -.B basename -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqbasename invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/cat.1 b/man/cat.1 deleted file mode 100644 index b9acd17f..00000000 --- a/man/cat.1 +++ /dev/null @@ -1,86 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH CAT "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -cat \- concatenate files and print on the standard output -.SH SYNOPSIS -.B cat -[\fIOPTION\fR]... [\fIFILE\fR]... -.SH DESCRIPTION -.\" Add any additional description here -.PP -Concatenate FILE(s), or standard input, to standard output. -.TP -\fB\-A\fR, \fB\-\-show\-all\fR -equivalent to \fB\-vET\fR -.TP -\fB\-b\fR, \fB\-\-number\-nonblank\fR -number nonempty output lines, overrides \fB\-n\fR -.TP -\fB\-e\fR -equivalent to \fB\-vE\fR -.TP -\fB\-E\fR, \fB\-\-show\-ends\fR -display $ at end of each line -.TP -\fB\-n\fR, \fB\-\-number\fR -number all output lines -.TP -\fB\-s\fR, \fB\-\-squeeze\-blank\fR -suppress repeated empty output lines -.TP -\fB\-t\fR -equivalent to \fB\-vT\fR -.TP -\fB\-T\fR, \fB\-\-show\-tabs\fR -display TAB characters as ^I -.TP -\fB\-u\fR -(ignored) -.TP -\fB\-v\fR, \fB\-\-show\-nonprinting\fR -use ^ and M\- notation, except for LFD and TAB -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -With no FILE, or when FILE is \-, read standard input. -.SH EXAMPLES -.TP -cat f \- g -Output f's contents, then standard input, then g's contents. -.TP -cat -Copy standard input to standard output. -.SH AUTHOR -Written by Torbjorn Granlund and Richard M. Stallman. -.SH "REPORTING BUGS" -Report cat bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report cat translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -\fBtac\fP(1) -.PP -The full documentation for -.B cat -is maintained as a Texinfo manual. If the -.B info -and -.B cat -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqcat invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/chcon.1 b/man/chcon.1 deleted file mode 100644 index 48f39181..00000000 --- a/man/chcon.1 +++ /dev/null @@ -1,96 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH CHCON "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -chcon \- change file security context -.SH SYNOPSIS -.B chcon -[\fIOPTION\fR]... \fICONTEXT FILE\fR... -.br -.B chcon -[\fIOPTION\fR]... [\fI-u USER\fR] [\fI-r ROLE\fR] [\fI-l RANGE\fR] [\fI-t TYPE\fR] \fIFILE\fR... -.br -.B chcon -[\fIOPTION\fR]... \fI--reference=RFILE FILE\fR... -.SH DESCRIPTION -.\" Add any additional description here -.PP -Change the security context of each FILE to CONTEXT. -With \fB\-\-reference\fR, change the security context of each FILE to that of RFILE. -.TP -\fB\-\-dereference\fR -affect the referent of each symbolic link (this is -the default), rather than the symbolic link itself -.TP -\fB\-h\fR, \fB\-\-no\-dereference\fR -affect symbolic links instead of any referenced file -.TP -\fB\-u\fR, \fB\-\-user\fR=\fIUSER\fR -set user USER in the target security context -.TP -\fB\-r\fR, \fB\-\-role\fR=\fIROLE\fR -set role ROLE in the target security context -.TP -\fB\-t\fR, \fB\-\-type\fR=\fITYPE\fR -set type TYPE in the target security context -.TP -\fB\-l\fR, \fB\-\-range\fR=\fIRANGE\fR -set range RANGE in the target security context -.TP -\fB\-\-reference\fR=\fIRFILE\fR -use RFILE's security context rather than specifying -a CONTEXT value -.TP -\fB\-R\fR, \fB\-\-recursive\fR -operate on files and directories recursively -.TP -\fB\-v\fR, \fB\-\-verbose\fR -output a diagnostic for every file processed -.PP -The following options modify how a hierarchy is traversed when the \fB\-R\fR -option is also specified. If more than one is specified, only the final -one takes effect. -.TP -\fB\-H\fR -if a command line argument is a symbolic link -to a directory, traverse it -.TP -\fB\-L\fR -traverse every symbolic link to a directory -encountered -.TP -\fB\-P\fR -do not traverse any symbolic links (default) -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.SH AUTHOR -Written by Russell Coker and Jim Meyering. -.SH "REPORTING BUGS" -Report chcon bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report chcon translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B chcon -is maintained as a Texinfo manual. If the -.B info -and -.B chcon -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqchcon invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/chgrp.1 b/man/chgrp.1 deleted file mode 100644 index 4f5e64bc..00000000 --- a/man/chgrp.1 +++ /dev/null @@ -1,102 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH CHGRP "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -chgrp \- change group ownership -.SH SYNOPSIS -.B chgrp -[\fIOPTION\fR]... \fIGROUP FILE\fR... -.br -.B chgrp -[\fIOPTION\fR]... \fI--reference=RFILE FILE\fR... -.SH DESCRIPTION -.\" Add any additional description here -.PP -Change the group of each FILE to GROUP. -With \fB\-\-reference\fR, change the group of each FILE to that of RFILE. -.TP -\fB\-c\fR, \fB\-\-changes\fR -like verbose but report only when a change is made -.TP -\fB\-f\fR, \fB\-\-silent\fR, \fB\-\-quiet\fR -suppress most error messages -.TP -\fB\-v\fR, \fB\-\-verbose\fR -output a diagnostic for every file processed -.TP -\fB\-\-dereference\fR -affect the referent of each symbolic link (this is -the default), rather than the symbolic link itself -.TP -\fB\-h\fR, \fB\-\-no\-dereference\fR -affect symbolic links instead of any referenced file -(useful only on systems that can change the -ownership of a symlink) -.TP -\fB\-\-no\-preserve\-root\fR -do not treat '/' specially (the default) -.TP -\fB\-\-preserve\-root\fR -fail to operate recursively on '/' -.TP -\fB\-\-reference\fR=\fIRFILE\fR -use RFILE's group rather than specifying a -GROUP value -.TP -\fB\-R\fR, \fB\-\-recursive\fR -operate on files and directories recursively -.PP -The following options modify how a hierarchy is traversed when the \fB\-R\fR -option is also specified. If more than one is specified, only the final -one takes effect. -.TP -\fB\-H\fR -if a command line argument is a symbolic link -to a directory, traverse it -.TP -\fB\-L\fR -traverse every symbolic link to a directory -encountered -.TP -\fB\-P\fR -do not traverse any symbolic links (default) -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.SH EXAMPLES -.TP -chgrp staff /u -Change the group of /u to "staff". -.TP -chgrp \fB\-hR\fR staff /u -Change the group of /u and subfiles to "staff". -.SH AUTHOR -Written by David MacKenzie and Jim Meyering. -.SH "REPORTING BUGS" -Report chgrp bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report chgrp translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B chgrp -is maintained as a Texinfo manual. If the -.B info -and -.B chgrp -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqchgrp invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/chmod.1 b/man/chmod.1 deleted file mode 100644 index a60a26b3..00000000 --- a/man/chmod.1 +++ /dev/null @@ -1,177 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH CHMOD "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -chmod \- change file mode bits -.SH SYNOPSIS -.B chmod -[\fIOPTION\fR]... \fIMODE\fR[\fI,MODE\fR]... \fIFILE\fR... -.br -.B chmod -[\fIOPTION\fR]... \fIOCTAL-MODE FILE\fR... -.br -.B chmod -[\fIOPTION\fR]... \fI--reference=RFILE FILE\fR... -.SH DESCRIPTION -This manual page -documents the GNU version of -.BR chmod . -.B chmod -changes the file mode bits of each given file according to -.IR mode , -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.\|.\|.].\|.\|.], -where -.I "perms" -is either zero or more letters from the set -\fBrwxXst\fP, or a single letter from the set \fBugo\fP. -Multiple symbolic -modes can be given, separated by commas. -.PP -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 -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 -the existing file mode bits of each file; \fB-\fP causes them to be -removed; and \fB=\fP causes them to be added and causes unmentioned -bits to be removed except that a directory's unmentioned set user and -group ID bits are not affected. -.PP -The letters \fBrwxXst\fP select file mode bits for the affected users: -read (\fBr\fP), write (\fBw\fP), execute (or search for directories) -(\fBx\fP), execute/search only if the file is a directory or already -has execute permission for some user (\fBX\fP), set user or group ID -on execution (\fBs\fP), restricted deletion flag or sticky bit -(\fBt\fP). Instead of one or more of these letters, you can specify -exactly one of the letters \fBugo\fP: the permissions granted to the -user who owns the file (\fBu\fP), the permissions granted to other -users who are members of the file's group (\fBg\fP), -and the permissions granted to users that are in neither of the two preceding -categories (\fBo\fP). -.PP -A numeric mode is from one to four octal digits (0\-7), derived by -adding up the bits with values 4, 2, and 1. Omitted digits are -assumed to be leading zeros. -The first digit selects the set user ID (4) and set group ID (2) and -restricted deletion or sticky (1) attributes. The second digit -selects permissions for the user who owns the file: read (4), write (2), -and execute (1); the third selects permissions for other users in the -file's group, with the same values; and the fourth for other users not -in the file's group, with the same values. -.PP -.B chmod -never changes the permissions of symbolic links; the -.B 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, -.B chmod -changes the permissions of the pointed-to file. -In contrast, -.B chmod -ignores symbolic links encountered during recursive directory -traversals. -.SH "SETUID AND SETGID BITS" -.B 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 -.I MODE -or -.I RFILE -to be ignored. This behavior depends on the policy and -functionality of the underlying -.B chmod -system call. When in -doubt, check the underlying system behavior. -.PP -.B chmod -preserves a directory's set-user-ID and set-group-ID bits unless you -explicitly specify otherwise. You can set or clear the bits with -symbolic modes like -.B u+s -and -.BR g\-s , -and you can set (but not clear) the bits with a numeric mode. -.SH "RESTRICTED DELETION FLAG OR STICKY BIT" -The restricted deletion flag or sticky bit is a single bit, whose -interpretation depends on the file type. For directories, it prevents -unprivileged users from removing or renaming a file in the directory -unless they own the file or the directory; this is called the -.I "restricted deletion flag" -for the directory, and is commonly found on world-writable directories -like \fB/tmp\fP. For regular files on some older systems, the bit -saves the program's text image on the swap device so it will load more -quickly when run; this is called the -.IR "sticky bit" . -.SH OPTIONS -.PP -Change the mode of each FILE to MODE. -With \fB\-\-reference\fR, change the mode of each FILE to that of RFILE. -.TP -\fB\-c\fR, \fB\-\-changes\fR -like verbose but report only when a change is made -.TP -\fB\-f\fR, \fB\-\-silent\fR, \fB\-\-quiet\fR -suppress most error messages -.TP -\fB\-v\fR, \fB\-\-verbose\fR -output a diagnostic for every file processed -.TP -\fB\-\-no\-preserve\-root\fR -do not treat '/' specially (the default) -.TP -\fB\-\-preserve\-root\fR -fail to operate recursively on '/' -.TP -\fB\-\-reference\fR=\fIRFILE\fR -use RFILE's mode instead of MODE values -.TP -\fB\-R\fR, \fB\-\-recursive\fR -change files and directories recursively -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -Each MODE is of the form '[ugoa]*([\-+=]([rwxXst]*|[ugo]))+|[\-+=][0\-7]+'. -.SH AUTHOR -Written by David MacKenzie and Jim Meyering. -.SH "REPORTING BUGS" -Report chmod bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report chmod translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -chmod(2) -.PP -The full documentation for -.B chmod -is maintained as a Texinfo manual. If the -.B info -and -.B chmod -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqchmod invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/chmod.x b/man/chmod.x index e0af0260..d9147a44 100644 --- a/man/chmod.x +++ b/man/chmod.x @@ -1,4 +1,4 @@ -'\" Copyright (C) 1998-2012 Free Software Foundation, Inc. +'\" Copyright (C) 1998-2013 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/chown.1 b/man/chown.1 deleted file mode 100644 index f32a401e..00000000 --- a/man/chown.1 +++ /dev/null @@ -1,136 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH CHOWN "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -chown \- change file owner and group -.SH SYNOPSIS -.B chown -[\fIOPTION\fR]... [\fIOWNER\fR][\fI:\fR[\fIGROUP\fR]] \fIFILE\fR... -.br -.B chown -[\fIOPTION\fR]... \fI--reference=RFILE FILE\fR... -.SH DESCRIPTION -This manual page -documents the GNU version of -.BR chown . -.B chown -changes the user and/or group ownership of each given file. 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 not changed. If the -owner is followed by a colon and a group name (or numeric group ID), -with no spaces between them, the group ownership of the files is -changed as well. If a colon but no group name follows the user name, -that user is made the owner of the files and the group of the files is -changed to that user's login group. If the colon and group are given, -but the owner is omitted, only the group of the files is changed; -in this case, -.B chown -performs the same function as -.BR chgrp . -If only a colon is given, or if the entire operand is empty, neither the -owner nor the group is changed. -.SH OPTIONS -.PP -Change the owner and/or group of each FILE to OWNER and/or GROUP. -With \fB\-\-reference\fR, change the owner and group of each FILE to those of RFILE. -.TP -\fB\-c\fR, \fB\-\-changes\fR -like verbose but report only when a change is made -.TP -\fB\-f\fR, \fB\-\-silent\fR, \fB\-\-quiet\fR -suppress most error messages -.TP -\fB\-v\fR, \fB\-\-verbose\fR -output a diagnostic for every file processed -.TP -\fB\-\-dereference\fR -affect the referent of each symbolic link (this is -the default), rather than the symbolic link itself -.TP -\fB\-h\fR, \fB\-\-no\-dereference\fR -affect symbolic links instead of any referenced file -(useful only on systems that can change the -ownership of a symlink) -.TP -\fB\-\-from\fR=\fICURRENT_OWNER\fR:CURRENT_GROUP -change the owner and/or group of each file only if -its current owner and/or group match those specified -here. Either may be omitted, in which case a match -is not required for the omitted attribute -.TP -\fB\-\-no\-preserve\-root\fR -do not treat '/' specially (the default) -.TP -\fB\-\-preserve\-root\fR -fail to operate recursively on '/' -.TP -\fB\-\-reference\fR=\fIRFILE\fR -use RFILE's owner and group rather than -specifying OWNER:GROUP values -.TP -\fB\-R\fR, \fB\-\-recursive\fR -operate on files and directories recursively -.PP -The following options modify how a hierarchy is traversed when the \fB\-R\fR -option is also specified. If more than one is specified, only the final -one takes effect. -.TP -\fB\-H\fR -if a command line argument is a symbolic link -to a directory, traverse it -.TP -\fB\-L\fR -traverse every symbolic link to a directory -encountered -.TP -\fB\-P\fR -do not traverse any symbolic links (default) -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -Owner is unchanged if missing. Group is unchanged if missing, but changed -to login group if implied by a ':' following a symbolic OWNER. -OWNER and GROUP may be numeric as well as symbolic. -.SH EXAMPLES -.TP -chown root /u -Change the owner of /u to "root". -.TP -chown root:staff /u -Likewise, but also change its group to "staff". -.TP -chown \fB\-hR\fR root /u -Change the owner of /u and subfiles to "root". -.SH AUTHOR -Written by David MacKenzie and Jim Meyering. -.SH "REPORTING BUGS" -Report chown bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report chown translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -chown(2) -.PP -The full documentation for -.B chown -is maintained as a Texinfo manual. If the -.B info -and -.B chown -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqchown invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/chown.x b/man/chown.x index ef02cbc2..7ad591d4 100644 --- a/man/chown.x +++ b/man/chown.x @@ -1,4 +1,4 @@ -'\" Copyright (C) 1998-2012 Free Software Foundation, Inc. +'\" Copyright (C) 1998-2013 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/chroot.1 b/man/chroot.1 deleted file mode 100644 index e1c3c5b1..00000000 --- a/man/chroot.1 +++ /dev/null @@ -1,58 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH CHROOT "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -chroot \- run command or interactive shell with special root directory -.SH SYNOPSIS -.B chroot -[\fIOPTION\fR] \fINEWROOT \fR[\fICOMMAND \fR[\fIARG\fR]...] -.br -.B chroot -\fIOPTION\fR -.SH DESCRIPTION -.\" Add any additional description here -.PP -Run COMMAND with root directory set to NEWROOT. -.TP -\fB\-\-userspec\fR=\fIUSER\fR:GROUP -specify user and group (ID or name) to use -.TP -\fB\-\-groups\fR=\fIG_LIST\fR -specify supplementary groups as g1,g2,..,gN -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -If no command is given, run '${SHELL} \fB\-i\fR' (default: '/bin/sh \fB\-i\fR'). -.SH AUTHOR -Written by Roland McGrath. -.SH "REPORTING BUGS" -Report chroot bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report chroot translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -chroot(2) -.PP -The full documentation for -.B chroot -is maintained as a Texinfo manual. If the -.B info -and -.B chroot -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqchroot invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/cksum.1 b/man/cksum.1 deleted file mode 100644 index ad5a826a..00000000 --- a/man/cksum.1 +++ /dev/null @@ -1,48 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH CKSUM "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -cksum \- checksum and count the bytes in a file -.SH SYNOPSIS -.B cksum -[\fIFILE\fR]... -.br -.B cksum -[\fIOPTION\fR] -.SH DESCRIPTION -.\" Add any additional description here -.PP -Print CRC checksum and byte counts of each FILE. -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.SH AUTHOR -Written by Q. Frank Xia. -.SH "REPORTING BUGS" -Report cksum bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report cksum translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B cksum -is maintained as a Texinfo manual. If the -.B info -and -.B cksum -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqcksum invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/comm.1 b/man/comm.1 deleted file mode 100644 index b2c9f68a..00000000 --- a/man/comm.1 +++ /dev/null @@ -1,79 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH COMM "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -comm \- compare two sorted files line by line -.SH SYNOPSIS -.B comm -[\fIOPTION\fR]... \fIFILE1 FILE2\fR -.SH DESCRIPTION -.\" Add any additional description here -.PP -Compare sorted files FILE1 and FILE2 line by line. -.PP -With no options, produce 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. -.TP -\fB\-1\fR -suppress column 1 (lines unique to FILE1) -.TP -\fB\-2\fR -suppress column 2 (lines unique to FILE2) -.TP -\fB\-3\fR -suppress column 3 (lines that appear in both files) -.TP -\fB\-\-check\-order\fR -check that the input is correctly sorted, even -if all input lines are pairable -.TP -\fB\-\-nocheck\-order\fR -do not check that the input is correctly sorted -.TP -\fB\-\-output\-delimiter\fR=\fISTR\fR -separate columns with STR -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -Note, comparisons honor the rules specified by 'LC_COLLATE'. -.SH EXAMPLES -.TP -comm \fB\-12\fR file1 file2 -Print only lines present in both file1 and file2. -.TP -comm \fB\-3\fR file1 file2 -Print lines in file1 not in file2, and vice versa. -.SH AUTHOR -Written by Richard M. Stallman and David MacKenzie. -.SH "REPORTING BUGS" -Report comm bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report comm translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -join(1), uniq(1) -.PP -The full documentation for -.B comm -is maintained as a Texinfo manual. If the -.B info -and -.B comm -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqcomm invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/cp.1 b/man/cp.1 deleted file mode 100644 index b70b4b0a..00000000 --- a/man/cp.1 +++ /dev/null @@ -1,181 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH CP "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -cp \- copy files and directories -.SH SYNOPSIS -.B cp -[\fIOPTION\fR]... [\fI-T\fR] \fISOURCE DEST\fR -.br -.B cp -[\fIOPTION\fR]... \fISOURCE\fR... \fIDIRECTORY\fR -.br -.B cp -[\fIOPTION\fR]... \fI-t DIRECTORY SOURCE\fR... -.SH DESCRIPTION -.\" Add any additional description here -.PP -Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY. -.PP -Mandatory arguments to long options are mandatory for short options too. -.TP -\fB\-a\fR, \fB\-\-archive\fR -same as \fB\-dR\fR \fB\-\-preserve\fR=\fIall\fR -.TP -\fB\-\-attributes\-only\fR -don't copy the file data, just the attributes -.TP -\fB\-\-backup\fR[=\fICONTROL\fR] -make a backup of each existing destination file -.TP -\fB\-b\fR -like \fB\-\-backup\fR but does not accept an argument -.TP -\fB\-\-copy\-contents\fR -copy contents of special files when recursive -.TP -\fB\-d\fR -same as \fB\-\-no\-dereference\fR \fB\-\-preserve\fR=\fIlinks\fR -.TP -\fB\-f\fR, \fB\-\-force\fR -if an existing destination file cannot be -opened, remove it and try again (redundant if -the \fB\-n\fR option is used) -.TP -\fB\-i\fR, \fB\-\-interactive\fR -prompt before overwrite (overrides a previous \fB\-n\fR -option) -.TP -\fB\-H\fR -follow command\-line symbolic links in SOURCE -.TP -\fB\-l\fR, \fB\-\-link\fR -hard link files instead of copying -.TP -\fB\-L\fR, \fB\-\-dereference\fR -always follow symbolic links in SOURCE -.TP -\fB\-n\fR, \fB\-\-no\-clobber\fR -do not overwrite an existing file (overrides -a previous \fB\-i\fR option) -.TP -\fB\-P\fR, \fB\-\-no\-dereference\fR -never follow symbolic links in SOURCE -.TP -\fB\-p\fR -same as \fB\-\-preserve\fR=\fImode\fR,ownership,timestamps -.TP -\fB\-\-preserve\fR[=\fIATTR_LIST\fR] -preserve the specified attributes (default: -mode,ownership,timestamps), if possible -additional attributes: context, links, xattr, -all -.TP -\fB\-\-no\-preserve\fR=\fIATTR_LIST\fR -don't preserve the specified attributes -.TP -\fB\-\-parents\fR -use full source file name under DIRECTORY -.TP -\fB\-R\fR, \fB\-r\fR, \fB\-\-recursive\fR -copy directories recursively -.TP -\fB\-\-reflink\fR[=\fIWHEN\fR] -control clone/CoW copies. See below -.TP -\fB\-\-remove\-destination\fR -remove each existing destination file before -attempting to open it (contrast with \fB\-\-force\fR) -.TP -\fB\-\-sparse\fR=\fIWHEN\fR -control creation of sparse files. See below -.TP -\fB\-\-strip\-trailing\-slashes\fR -remove any trailing slashes from each SOURCE -argument -.TP -\fB\-s\fR, \fB\-\-symbolic\-link\fR -make symbolic links instead of copying -.TP -\fB\-S\fR, \fB\-\-suffix\fR=\fISUFFIX\fR -override the usual backup suffix -.TP -\fB\-t\fR, \fB\-\-target\-directory\fR=\fIDIRECTORY\fR -copy all SOURCE arguments into DIRECTORY -.TP -\fB\-T\fR, \fB\-\-no\-target\-directory\fR -treat DEST as a normal file -.TP -\fB\-u\fR, \fB\-\-update\fR -copy only when the SOURCE file is newer -than the destination file or when the -destination file is missing -.TP -\fB\-v\fR, \fB\-\-verbose\fR -explain what is being done -.TP -\fB\-x\fR, \fB\-\-one\-file\-system\fR -stay on this file system -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -By default, sparse SOURCE files are detected by a crude heuristic and the -corresponding DEST file is made sparse as well. That is the behavior -selected by \fB\-\-sparse\fR=\fIauto\fR. Specify \fB\-\-sparse\fR=\fIalways\fR to create a sparse DEST -file whenever the SOURCE file contains a long enough sequence of zero bytes. -Use \fB\-\-sparse\fR=\fInever\fR to inhibit creation of sparse files. -.PP -When \fB\-\-reflink\fR[=\fIalways\fR] is specified, perform a lightweight copy, where the -data blocks are copied only when modified. If this is not possible the copy -fails, or if \fB\-\-reflink\fR=\fIauto\fR is specified, fall back to a standard copy. -.PP -The backup suffix is '~', unless set with \fB\-\-suffix\fR or SIMPLE_BACKUP_SUFFIX. -The version control method may be selected via the \fB\-\-backup\fR option or through -the VERSION_CONTROL environment variable. Here are the values: -.TP -none, off -never make backups (even if \fB\-\-backup\fR is given) -.TP -numbered, t -make numbered backups -.TP -existing, nil -numbered if numbered backups exist, simple otherwise -.TP -simple, never -always make simple backups -.PP -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. -.SH AUTHOR -Written by Torbjorn Granlund, David MacKenzie, and Jim Meyering. -.SH "REPORTING BUGS" -Report cp bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report cp translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B cp -is maintained as a Texinfo manual. If the -.B info -and -.B cp -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqcp invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/csplit.1 b/man/csplit.1 deleted file mode 100644 index dd9f2e77..00000000 --- a/man/csplit.1 +++ /dev/null @@ -1,85 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH CSPLIT "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -csplit \- split a file into sections determined by context lines -.SH SYNOPSIS -.B csplit -[\fIOPTION\fR]... \fIFILE PATTERN\fR... -.SH DESCRIPTION -.\" Add any additional description here -.PP -Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ..., -and output byte counts of each piece to standard output. -.PP -Mandatory arguments to long options are mandatory for short options too. -.TP -\fB\-b\fR, \fB\-\-suffix\-format\fR=\fIFORMAT\fR -use sprintf FORMAT instead of %02d -.TP -\fB\-f\fR, \fB\-\-prefix\fR=\fIPREFIX\fR -use PREFIX instead of 'xx' -.TP -\fB\-k\fR, \fB\-\-keep\-files\fR -do not remove output files on errors -.TP -\fB\-n\fR, \fB\-\-digits\fR=\fIDIGITS\fR -use specified number of digits instead of 2 -.TP -\fB\-s\fR, \fB\-\-quiet\fR, \fB\-\-silent\fR -do not print counts of output file sizes -.TP -\fB\-z\fR, \fB\-\-elide\-empty\-files\fR -remove empty output files -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -Read standard input if FILE is \-. Each PATTERN may be: -.TP -INTEGER -copy up to but not including specified line number -.TP -/REGEXP/[OFFSET] -copy up to but not including a matching line -.TP -%REGEXP%[OFFSET] -skip to, but not including a matching line -.TP -{INTEGER} -repeat the previous pattern specified number of times -.TP -{*} -repeat the previous pattern as many times as possible -.PP -A line OFFSET is a required '+' or '\-' followed by a positive integer. -.SH AUTHOR -Written by Stuart Kemp and David MacKenzie. -.SH "REPORTING BUGS" -Report csplit bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report csplit translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B csplit -is maintained as a Texinfo manual. If the -.B info -and -.B csplit -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqcsplit invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/cut.1 b/man/cut.1 deleted file mode 100644 index 844b3830..00000000 --- a/man/cut.1 +++ /dev/null @@ -1,94 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH CUT "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -cut \- remove sections from each line of files -.SH SYNOPSIS -.B cut -\fIOPTION\fR... [\fIFILE\fR]... -.SH DESCRIPTION -.\" Add any additional description here -.PP -Print selected parts of lines from each FILE to standard output. -.PP -Mandatory arguments to long options are mandatory for short options too. -.TP -\fB\-b\fR, \fB\-\-bytes\fR=\fILIST\fR -select only these bytes -.TP -\fB\-c\fR, \fB\-\-characters\fR=\fILIST\fR -select only these characters -.TP -\fB\-d\fR, \fB\-\-delimiter\fR=\fIDELIM\fR -use DELIM instead of TAB for field delimiter -.TP -\fB\-f\fR, \fB\-\-fields\fR=\fILIST\fR -select only these fields; also print any line -that contains no delimiter character, unless -the \fB\-s\fR option is specified -.TP -\fB\-n\fR -(ignored) -.TP -\fB\-\-complement\fR -complement the set of selected bytes, characters -or fields -.TP -\fB\-s\fR, \fB\-\-only\-delimited\fR -do not print lines not containing delimiters -.TP -\fB\-\-output\-delimiter\fR=\fISTRING\fR -use STRING as the output delimiter -the default is to use the input delimiter -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -Use one, and only one of \fB\-b\fR, \fB\-c\fR or \fB\-f\fR. Each LIST is made up of one -range, or many ranges separated by commas. Selected input is written -in the same order that it is read, and is written exactly once. -Each range is one of: -.TP -N -N'th byte, character or field, counted from 1 -.TP -N\- -from N'th byte, character or field, to end of line -.TP -N\-M -from N'th to M'th (included) byte, character or field -.TP -\fB\-M\fR -from first to M'th (included) byte, character or field -.PP -With no FILE, or when FILE is \-, read standard input. -.SH AUTHOR -Written by David M. Ihnat, David MacKenzie, and Jim Meyering. -.SH "REPORTING BUGS" -Report cut bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report cut translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B cut -is maintained as a Texinfo manual. If the -.B info -and -.B cut -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqcut invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/date.1 b/man/date.1 deleted file mode 100644 index 260a09c4..00000000 --- a/man/date.1 +++ /dev/null @@ -1,261 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH DATE "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -date \- print or set the system date and time -.SH SYNOPSIS -.B date -[\fIOPTION\fR]... [\fI+FORMAT\fR] -.br -.B date -[\fI-u|--utc|--universal\fR] [\fIMMDDhhmm\fR[[\fICC\fR]\fIYY\fR][\fI.ss\fR]] -.SH DESCRIPTION -.\" Add any additional description here -.PP -Display the current time in the given FORMAT, or set the system date. -.TP -\fB\-d\fR, \fB\-\-date\fR=\fISTRING\fR -display time described by STRING, not 'now' -.TP -\fB\-f\fR, \fB\-\-file\fR=\fIDATEFILE\fR -like \fB\-\-date\fR once for each line of DATEFILE -.TP -\fB\-I[TIMESPEC]\fR, \fB\-\-iso\-8601\fR[=\fITIMESPEC\fR] -output date/time in ISO 8601 format. -TIMESPEC='date' for date only (the default), -\&'hours', 'minutes', 'seconds', or 'ns' for date -and time to the indicated precision. -.TP -\fB\-r\fR, \fB\-\-reference\fR=\fIFILE\fR -display the last modification time of FILE -.TP -\fB\-R\fR, \fB\-\-rfc\-2822\fR -output date and time in RFC 2822 format. -Example: Mon, 07 Aug 2006 12:34:56 \fB\-0600\fR -.TP -\fB\-\-rfc\-3339\fR=\fITIMESPEC\fR -output date and time in RFC 3339 format. -TIMESPEC='date', 'seconds', or 'ns' for -date and time to the indicated precision. -Date and time components are separated by -a single space: 2006\-08\-07 12:34:56\-06:00 -.TP -\fB\-s\fR, \fB\-\-set\fR=\fISTRING\fR -set time described by STRING -.TP -\fB\-u\fR, \fB\-\-utc\fR, \fB\-\-universal\fR -print or set Coordinated Universal Time -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -FORMAT controls the output. Interpreted sequences are: -.TP -%% -a literal % -.TP -%a -locale's abbreviated weekday name (e.g., Sun) -.TP -%A -locale's full weekday name (e.g., Sunday) -.TP -%b -locale's abbreviated month name (e.g., Jan) -.TP -%B -locale's full month name (e.g., January) -.TP -%c -locale's date and time (e.g., Thu Mar 3 23:05:25 2005) -.TP -%C -century; like %Y, except omit last two digits (e.g., 20) -.TP -%d -day of month (e.g., 01) -.TP -%D -date; same as %m/%d/%y -.TP -%e -day of month, space padded; same as %_d -.TP -%F -full date; same as %Y\-%m\-%d -.TP -%g -last two digits of year of ISO week number (see %G) -.TP -%G -year of ISO week number (see %V); normally useful only with %V -.TP -%h -same as %b -.TP -%H -hour (00..23) -.TP -%I -hour (01..12) -.TP -%j -day of year (001..366) -.TP -%k -hour, space padded ( 0..23); same as %_H -.TP -%l -hour, space padded ( 1..12); same as %_I -.TP -%m -month (01..12) -.TP -%M -minute (00..59) -.TP -%n -a newline -.TP -%N -nanoseconds (000000000..999999999) -.TP -%p -locale's equivalent of either AM or PM; blank if not known -.TP -%P -like %p, but lower case -.TP -%r -locale's 12\-hour clock time (e.g., 11:11:04 PM) -.TP -%R -24\-hour hour and minute; same as %H:%M -.TP -%s -seconds since 1970\-01\-01 00:00:00 UTC -.TP -%S -second (00..60) -.TP -%t -a tab -.TP -%T -time; same as %H:%M:%S -.TP -%u -day of week (1..7); 1 is Monday -.TP -%U -week number of year, with Sunday as first day of week (00..53) -.TP -%V -ISO week number, with Monday as first day of week (01..53) -.TP -%w -day of week (0..6); 0 is Sunday -.TP -%W -week number of year, with Monday as first day of week (00..53) -.TP -%x -locale's date representation (e.g., 12/31/99) -.TP -%X -locale's time representation (e.g., 23:13:48) -.TP -%y -last two digits of year (00..99) -.TP -%Y -year -.TP -%z -+hhmm numeric time zone (e.g., \fB\-0400\fR) -.TP -%:z -+hh:mm numeric time zone (e.g., \fB\-04\fR:00) -.TP -%::z -+hh:mm:ss numeric time zone (e.g., \fB\-04\fR:00:00) -.TP -%:::z -numeric time zone with : to necessary precision (e.g., \fB\-04\fR, +05:30) -.TP -%Z -alphabetic time zone abbreviation (e.g., EDT) -.PP -By default, date pads numeric fields with zeroes. -The following optional flags may follow '%': -.TP -\- -(hyphen) do not pad the field -.TP -_ -(underscore) pad with spaces -.TP -0 -(zero) pad with zeros -.TP -^ -use upper case if possible -.TP -# -use opposite case if possible -.PP -After any flags comes an optional field width, as a decimal number; -then an optional modifier, which is either -E to use the locale's alternate representations if available, or -O to use the locale's alternate numeric symbols if available. -.SH EXAMPLES -Convert seconds since the epoch (1970\-01\-01 UTC) to a date -.IP -\f(CW$ date --date='@2147483647'\fR -.PP -Show the time on the west coast of the US (use tzselect(1) to find TZ) -.IP -\f(CW$ TZ='America/Los_Angeles' date\fR -.PP -Show the local time for 9AM next Friday on the west coast of the US -.IP -\f(CW$ date --date='TZ="America/Los_Angeles" 09:00 next Fri'\fR -.SH "DATE STRING" -.\" NOTE: keep this paragraph in sync with the one in touch.x -The --date=STRING is a mostly free format human readable date string -such as "Sun, 29 Feb 2004 16:21:42 -0800" or "2004-02-29 16:21:42" or -even "next Thursday". A date string may contain items indicating -calendar date, time of day, time zone, day of week, relative time, -relative date, and numbers. An empty string indicates the beginning -of the day. The date string format is more complex than is easily -documented here but is fully described in the info documentation. -.SH AUTHOR -Written by David MacKenzie. -.SH "REPORTING BUGS" -Report date bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report date translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B date -is maintained as a Texinfo manual. If the -.B info -and -.B date -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqdate invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/dd.1 b/man/dd.1 deleted file mode 100644 index 65a8f19b..00000000 --- a/man/dd.1 +++ /dev/null @@ -1,199 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH DD "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -dd \- convert and copy a file -.SH SYNOPSIS -.B dd -[\fIOPERAND\fR]... -.br -.B dd -\fIOPTION\fR -.SH DESCRIPTION -.\" Add any additional description here -.PP -Copy a file, converting and formatting according to the operands. -.TP -bs=BYTES -read and write up to BYTES bytes at a time -.TP -cbs=BYTES -convert BYTES bytes at a time -.TP -conv=CONVS -convert the file as per the comma separated symbol list -.TP -count=N -copy only N input blocks -.TP -ibs=BYTES -read up to BYTES bytes at a time (default: 512) -.TP -if=FILE -read from FILE instead of stdin -.TP -iflag=FLAGS -read as per the comma separated symbol list -.TP -obs=BYTES -write BYTES bytes at a time (default: 512) -.TP -of=FILE -write to FILE instead of stdout -.TP -oflag=FLAGS -write as per the comma separated symbol list -.TP -seek=N -skip N obs\-sized blocks at start of output -.TP -skip=N -skip N ibs\-sized blocks at start of input -.TP -status=noxfer -suppress transfer statistics -.PP -BLOCKS and BYTES may be followed by the following multiplicative suffixes: -c =1, w =2, b =512, kB =1000, K =1024, MB =1000*1000, M =1024*1024, xM =M -GB =1000*1000*1000, G =1024*1024*1024, and so on for T, P, E, Z, Y. -.PP -Each CONV symbol may be: -.TP -ascii -from EBCDIC to ASCII -.TP -ebcdic -from ASCII to EBCDIC -.TP -ibm -from ASCII to alternate EBCDIC -.TP -block -pad newline\-terminated records with spaces to cbs\-size -.TP -unblock -replace trailing spaces in cbs\-size records with newline -.TP -lcase -change upper case to lower case -.TP -ucase -change lower case to upper case -.TP -sparse -try to seek rather than write the output for NUL input blocks -.TP -swab -swap every pair of input bytes -.TP -sync -pad every input block with NULs to ibs\-size; when used -with block or unblock, pad with spaces rather than NULs -.TP -excl -fail if the output file already exists -.TP -nocreat -do not create the output file -.TP -notrunc -do not truncate the output file -.TP -noerror -continue after read errors -.TP -fdatasync -physically write output file data before finishing -.TP -fsync -likewise, but also write metadata -.PP -Each FLAG symbol may be: -.TP -append -append mode (makes sense only for output; conv=notrunc suggested) -.TP -direct -use direct I/O for data -.TP -directory -fail unless a directory -.TP -dsync -use synchronized I/O for data -.TP -sync -likewise, but also for metadata -.TP -fullblock -accumulate full blocks of input (iflag only) -.TP -nonblock -use non\-blocking I/O -.TP -noatime -do not update access time -.TP -nocache -discard cached data -.TP -noctty -do not assign controlling terminal from file -.TP -nofollow -do not follow symlinks -.TP -count_bytes -treat 'count=N' as a byte count (iflag only) -.TP -skip_bytes -treat 'skip=N' as a byte count (iflag only) -.TP -seek_bytes -treat 'seek=N' as a byte count (oflag only) -.PP -Sending a USR1 signal to a running 'dd' process makes it -print I/O statistics to standard error and then resume copying. -.IP -\f(CW$ dd if=/dev/zero of=/dev/null& pid=$!\fR -.br -\f(CW$ kill -USR1 $pid; sleep 1; kill $pid\fR -.IP -18335302+0 records in -18335302+0 records out -9387674624 bytes (9.4 GB) copied, 34.6279 seconds, 271 MB/s -.PP -Options are: -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.SH AUTHOR -Written by Paul Rubin, David MacKenzie, and Stuart Kemp. -.SH "REPORTING BUGS" -Report dd bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report dd translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B dd -is maintained as a Texinfo manual. If the -.B info -and -.B dd -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqdd invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/df.1 b/man/df.1 deleted file mode 100644 index eed6fbb0..00000000 --- a/man/df.1 +++ /dev/null @@ -1,123 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH DF "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -df \- report file system disk space usage -.SH SYNOPSIS -.B df -[\fIOPTION\fR]... [\fIFILE\fR]... -.SH DESCRIPTION -This manual page -documents the GNU version of -.BR df . -.B df -displays the amount of disk space available on the file system -containing each file name argument. If no file name is given, the -space available on all currently mounted file systems is shown. Disk -space is shown in 1K blocks by default, unless the environment -variable POSIXLY_CORRECT is set, in which case 512-byte blocks are -used. -.PP -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 -.B df -cannot show the space available on unmounted file systems, because on -most kinds of systems doing so requires very nonportable intimate -knowledge of file system structures. -.SH OPTIONS -.PP -Show information about the file system on which each FILE resides, -or all file systems by default. -.PP -Mandatory arguments to long options are mandatory for short options too. -.TP -\fB\-a\fR, \fB\-\-all\fR -include dummy file systems -.TP -\fB\-B\fR, \fB\-\-block\-size\fR=\fISIZE\fR -scale sizes by SIZE before printing them. E.g., -\&'\-BM' prints sizes in units of 1,048,576 bytes. -See SIZE format below. -.TP -\fB\-\-total\fR -produce a grand total -.TP -\fB\-h\fR, \fB\-\-human\-readable\fR -print sizes in human readable format (e.g., 1K 234M 2G) -.TP -\fB\-H\fR, \fB\-\-si\fR -likewise, but use powers of 1000 not 1024 -.TP -\fB\-i\fR, \fB\-\-inodes\fR -list inode information instead of block usage -.TP -\fB\-k\fR -like \fB\-\-block\-size\fR=\fI1K\fR -.TP -\fB\-l\fR, \fB\-\-local\fR -limit listing to local file systems -.TP -\fB\-\-no\-sync\fR -do not invoke sync before getting usage info (default) -.TP -\fB\-P\fR, \fB\-\-portability\fR -use the POSIX output format -.TP -\fB\-\-sync\fR -invoke sync before getting usage info -.TP -\fB\-t\fR, \fB\-\-type\fR=\fITYPE\fR -limit listing to file systems of type TYPE -.TP -\fB\-T\fR, \fB\-\-print\-type\fR -print file system type -.TP -\fB\-x\fR, \fB\-\-exclude\-type\fR=\fITYPE\fR -limit listing to file systems not of type TYPE -.TP -\fB\-v\fR -(ignored) -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -Display values are in units of the first available SIZE from \fB\-\-block\-size\fR, -and the DF_BLOCK_SIZE, BLOCK_SIZE and BLOCKSIZE environment variables. -Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set). -.PP -SIZE is an integer and optional unit (example: 10M is 10*1024*1024). Units -are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of 1000). -.SH AUTHOR -Written by Torbjorn Granlund, David MacKenzie, and Paul Eggert. -.SH "REPORTING BUGS" -Report df bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report df translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B df -is maintained as a Texinfo manual. If the -.B info -and -.B df -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqdf invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/df.x b/man/df.x index a98a408d..7e908ae0 100644 --- a/man/df.x +++ b/man/df.x @@ -1,4 +1,4 @@ -'\" Copyright (C) 1998-2012 Free Software Foundation, Inc. +'\" Copyright (C) 1998-2013 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/dir.1 b/man/dir.1 deleted file mode 100644 index 6c2de888..00000000 --- a/man/dir.1 +++ /dev/null @@ -1,267 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH DIR "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -dir \- list directory contents -.SH SYNOPSIS -.B dir -[\fIOPTION\fR]... [\fIFILE\fR]... -.SH DESCRIPTION -.\" Add any additional description here -.PP -List information about the FILEs (the current directory by default). -Sort entries alphabetically if none of \fB\-cftuvSUX\fR nor \fB\-\-sort\fR is specified. -.PP -Mandatory arguments to long options are mandatory for short options too. -.TP -\fB\-a\fR, \fB\-\-all\fR -do not ignore entries starting with . -.TP -\fB\-A\fR, \fB\-\-almost\-all\fR -do not list implied . and .. -.TP -\fB\-\-author\fR -with \fB\-l\fR, print the author of each file -.TP -\fB\-b\fR, \fB\-\-escape\fR -print C\-style escapes for nongraphic characters -.TP -\fB\-\-block\-size\fR=\fISIZE\fR -scale sizes by SIZE before printing them. E.g., -\&'\-\-block\-size=M' prints sizes in units of -1,048,576 bytes. See SIZE format below. -.TP -\fB\-B\fR, \fB\-\-ignore\-backups\fR -do not list implied entries ending with ~ -.TP -\fB\-c\fR -with \fB\-lt\fR: sort by, and show, ctime (time of last -modification of file status information) -with \fB\-l\fR: show ctime and sort by name -otherwise: sort by ctime, newest first -.TP -\fB\-C\fR -list entries by columns -.TP -\fB\-\-color\fR[=\fIWHEN\fR] -colorize the output. WHEN defaults to 'always' -or can be 'never' or 'auto'. More info below -.TP -\fB\-d\fR, \fB\-\-directory\fR -list directory entries instead of contents, -and do not dereference symbolic links -.TP -\fB\-D\fR, \fB\-\-dired\fR -generate output designed for Emacs' dired mode -.TP -\fB\-f\fR -do not sort, enable \fB\-aU\fR, disable \fB\-ls\fR \fB\-\-color\fR -.TP -\fB\-F\fR, \fB\-\-classify\fR -append indicator (one of */=>@|) to entries -.TP -\fB\-\-file\-type\fR -likewise, except do not append '*' -.TP -\fB\-\-format\fR=\fIWORD\fR -across \fB\-x\fR, commas \fB\-m\fR, horizontal \fB\-x\fR, long \fB\-l\fR, -single\-column \fB\-1\fR, verbose \fB\-l\fR, vertical \fB\-C\fR -.TP -\fB\-\-full\-time\fR -like \fB\-l\fR \fB\-\-time\-style\fR=\fIfull\-iso\fR -.TP -\fB\-g\fR -like \fB\-l\fR, but do not list owner -.TP -\fB\-\-group\-directories\-first\fR -group directories before files. -.IP -augment with a \fB\-\-sort\fR option, but any -use of \fB\-\-sort\fR=\fInone\fR (\fB\-U\fR) disables grouping -.TP -\fB\-G\fR, \fB\-\-no\-group\fR -in a long listing, don't print group names -.TP -\fB\-h\fR, \fB\-\-human\-readable\fR -with \fB\-l\fR, print sizes in human readable format -(e.g., 1K 234M 2G) -.TP -\fB\-\-si\fR -likewise, but use powers of 1000 not 1024 -.TP -\fB\-H\fR, \fB\-\-dereference\-command\-line\fR -follow symbolic links listed on the command line -.TP -\fB\-\-dereference\-command\-line\-symlink\-to\-dir\fR -follow each command line symbolic link -that points to a directory -.TP -\fB\-\-hide\fR=\fIPATTERN\fR -do not list implied entries matching shell PATTERN -(overridden by \fB\-a\fR or \fB\-A\fR) -.TP -\fB\-\-indicator\-style\fR=\fIWORD\fR -append indicator with style WORD to entry names: -none (default), slash (\fB\-p\fR), -file\-type (\fB\-\-file\-type\fR), classify (\fB\-F\fR) -.TP -\fB\-i\fR, \fB\-\-inode\fR -print the index number of each file -.TP -\fB\-I\fR, \fB\-\-ignore\fR=\fIPATTERN\fR -do not list implied entries matching shell PATTERN -.TP -\fB\-k\fR, \fB\-\-kibibytes\fR -use 1024\-byte blocks -.TP -\fB\-l\fR -use a long listing format -.TP -\fB\-L\fR, \fB\-\-dereference\fR -when showing file information for a symbolic -link, show information for the file the link -references rather than for the link itself -.TP -\fB\-m\fR -fill width with a comma separated list of entries -.TP -\fB\-n\fR, \fB\-\-numeric\-uid\-gid\fR -like \fB\-l\fR, but list numeric user and group IDs -.TP -\fB\-N\fR, \fB\-\-literal\fR -print raw entry names (don't treat e.g. control -characters specially) -.TP -\fB\-o\fR -like \fB\-l\fR, but do not list group information -.TP -\fB\-p\fR, \fB\-\-indicator\-style\fR=\fIslash\fR -append / indicator to directories -.TP -\fB\-q\fR, \fB\-\-hide\-control\-chars\fR -print ? instead of non graphic characters -.TP -\fB\-\-show\-control\-chars\fR -show non graphic characters as\-is (default -unless program is 'ls' and output is a terminal) -.TP -\fB\-Q\fR, \fB\-\-quote\-name\fR -enclose entry names in double quotes -.TP -\fB\-\-quoting\-style\fR=\fIWORD\fR -use quoting style WORD for entry names: -literal, locale, shell, shell\-always, c, escape -.TP -\fB\-r\fR, \fB\-\-reverse\fR -reverse order while sorting -.TP -\fB\-R\fR, \fB\-\-recursive\fR -list subdirectories recursively -.TP -\fB\-s\fR, \fB\-\-size\fR -print the allocated size of each file, in blocks -.TP -\fB\-S\fR -sort by file size -.TP -\fB\-\-sort\fR=\fIWORD\fR -sort by WORD instead of name: none \fB\-U\fR, -extension \fB\-X\fR, size \fB\-S\fR, time \fB\-t\fR, version \fB\-v\fR -.TP -\fB\-\-time\fR=\fIWORD\fR -with \fB\-l\fR, show time as WORD instead of modification -time: atime \fB\-u\fR, access \fB\-u\fR, use \fB\-u\fR, ctime \fB\-c\fR, -or status \fB\-c\fR; use specified time as sort key -if \fB\-\-sort\fR=\fItime\fR -.TP -\fB\-\-time\-style\fR=\fISTYLE\fR -with \fB\-l\fR, show times using style STYLE: -full\-iso, long\-iso, iso, locale, +FORMAT. -FORMAT is interpreted like 'date'; if FORMAT is -FORMAT1<newline>FORMAT2, FORMAT1 applies to -non\-recent files and FORMAT2 to recent files; -if STYLE is prefixed with 'posix\-', STYLE -takes effect only outside the POSIX locale -.TP -\fB\-t\fR -sort by modification time, newest first -.TP -\fB\-T\fR, \fB\-\-tabsize\fR=\fICOLS\fR -assume tab stops at each COLS instead of 8 -.TP -\fB\-u\fR -with \fB\-lt\fR: sort by, and show, access time -with \fB\-l\fR: show access time and sort by name -otherwise: sort by access time -.TP -\fB\-U\fR -do not sort; list entries in directory order -.TP -\fB\-v\fR -natural sort of (version) numbers within text -.TP -\fB\-w\fR, \fB\-\-width\fR=\fICOLS\fR -assume screen width instead of current value -.TP -\fB\-x\fR -list entries by lines instead of by columns -.TP -\fB\-X\fR -sort alphabetically by entry extension -.TP -\fB\-Z\fR, \fB\-\-context\fR -print any SELinux security context of each file -.TP -\fB\-1\fR -list one file per line -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -SIZE is an integer and optional unit (example: 10M is 10*1024*1024). Units -are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of 1000). -.PP -Using color to distinguish file types is disabled both by default and -with \fB\-\-color\fR=\fInever\fR. With \fB\-\-color\fR=\fIauto\fR, ls emits color codes only when -standard output is connected to a terminal. The LS_COLORS environment -variable can change the settings. Use the dircolors command to set it. -.SS "Exit status:" -.TP -0 -if OK, -.TP -1 -if minor problems (e.g., cannot access subdirectory), -.TP -2 -if serious trouble (e.g., cannot access command\-line argument). -.SH AUTHOR -Written by Richard M. Stallman and David MacKenzie. -.SH "REPORTING BUGS" -Report dir bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report dir translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B dir -is maintained as a Texinfo manual. If the -.B info -and -.B dir -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqdir invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/dircolors.1 b/man/dircolors.1 deleted file mode 100644 index 7a7baf03..00000000 --- a/man/dircolors.1 +++ /dev/null @@ -1,59 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH DIRCOLORS "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -dircolors \- color setup for ls -.SH SYNOPSIS -.B dircolors -[\fIOPTION\fR]... [\fIFILE\fR] -.SH DESCRIPTION -.\" Add any additional description here -.PP -Output commands to set the LS_COLORS environment variable. -.SS "Determine format of output:" -.TP -\fB\-b\fR, \fB\-\-sh\fR, \fB\-\-bourne\-shell\fR -output Bourne shell code to set LS_COLORS -.TP -\fB\-c\fR, \fB\-\-csh\fR, \fB\-\-c\-shell\fR -output C shell code to set LS_COLORS -.TP -\fB\-p\fR, \fB\-\-print\-database\fR -output defaults -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -If FILE is specified, read 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 \fB\-\-print\-database\fR'. -.SH AUTHOR -Written by H. Peter Anvin. -.SH "REPORTING BUGS" -Report dircolors bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report dircolors translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B dircolors -is maintained as a Texinfo manual. If the -.B info -and -.B dircolors -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqdircolors invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/dirname.1 b/man/dirname.1 deleted file mode 100644 index 7f427e60..00000000 --- a/man/dirname.1 +++ /dev/null @@ -1,61 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH DIRNAME "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -dirname \- strip last component from file name -.SH SYNOPSIS -.B dirname -[\fIOPTION\fR] \fINAME\fR... -.SH DESCRIPTION -.\" Add any additional description here -.PP -Output each NAME with its last non\-slash component and trailing slashes -removed; if NAME contains no /'s, output '.' (meaning the current directory). -.TP -\fB\-z\fR, \fB\-\-zero\fR -separate output with NUL rather than newline -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.SH EXAMPLES -.TP -dirname /usr/bin/ -\-> "/usr" -.TP -dirname dir1/str dir2/str -\-> "dir1" followed by "dir2" -.TP -dirname stdio.h -\-> "." -.SH AUTHOR -Written by David MacKenzie and Jim Meyering. -.SH "REPORTING BUGS" -Report dirname bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report dirname translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -basename(1), readlink(1) -.PP -The full documentation for -.B dirname -is maintained as a Texinfo manual. If the -.B info -and -.B dirname -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqdirname invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/du.1 b/man/du.1 deleted file mode 100644 index 046c3bfd..00000000 --- a/man/du.1 +++ /dev/null @@ -1,167 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH DU "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -du \- estimate file space usage -.SH SYNOPSIS -.B du -[\fIOPTION\fR]... [\fIFILE\fR]... -.br -.B du -[\fIOPTION\fR]... \fI--files0-from=F\fR -.SH DESCRIPTION -.\" Add any additional description here -.PP -Summarize disk usage of each FILE, recursively for directories. -.PP -Mandatory arguments to long options are mandatory for short options too. -.TP -\fB\-a\fR, \fB\-\-all\fR -write counts for all files, not just directories -.TP -\fB\-\-apparent\-size\fR -print apparent sizes, rather than disk usage; although -the apparent size is usually smaller, it may be -larger due to holes in ('sparse') files, internal -fragmentation, indirect blocks, and the like -.TP -\fB\-B\fR, \fB\-\-block\-size\fR=\fISIZE\fR -scale sizes by SIZE before printing them. E.g., -\&'\-BM' prints sizes in units of 1,048,576 bytes. -See SIZE format below. -.TP -\fB\-b\fR, \fB\-\-bytes\fR -equivalent to '\-\-apparent\-size \fB\-\-block\-size\fR=\fI1\fR' -.TP -\fB\-c\fR, \fB\-\-total\fR -produce a grand total -.TP -\fB\-D\fR, \fB\-\-dereference\-args\fR -dereference only symlinks that are listed on the -command line -.TP -\fB\-\-files0\-from\fR=\fIF\fR -summarize disk usage of the NUL\-terminated file -names specified in file F; -If F is \- then read names from standard input -.TP -\fB\-H\fR -equivalent to \fB\-\-dereference\-args\fR (\fB\-D\fR) -.TP -\fB\-h\fR, \fB\-\-human\-readable\fR -print sizes in human readable format (e.g., 1K 234M 2G) -.TP -\fB\-\-si\fR -like \fB\-h\fR, but use powers of 1000 not 1024 -.TP -\fB\-k\fR -like \fB\-\-block\-size\fR=\fI1K\fR -.TP -\fB\-l\fR, \fB\-\-count\-links\fR -count sizes many times if hard linked -.TP -\fB\-m\fR -like \fB\-\-block\-size\fR=\fI1M\fR -.TP -\fB\-L\fR, \fB\-\-dereference\fR -dereference all symbolic links -.TP -\fB\-P\fR, \fB\-\-no\-dereference\fR -don't follow any symbolic links (this is the default) -.TP -\fB\-0\fR, \fB\-\-null\fR -end each output line with 0 byte rather than newline -.TP -\fB\-S\fR, \fB\-\-separate\-dirs\fR -do not include size of subdirectories -.TP -\fB\-s\fR, \fB\-\-summarize\fR -display only a total for each argument -.TP -\fB\-x\fR, \fB\-\-one\-file\-system\fR -skip directories on different file systems -.TP -\fB\-X\fR, \fB\-\-exclude\-from\fR=\fIFILE\fR -exclude files that match any pattern in FILE -.TP -\fB\-\-exclude\fR=\fIPATTERN\fR -exclude files that match PATTERN -.TP -\fB\-d\fR, \fB\-\-max\-depth\fR=\fIN\fR -print the total for a directory (or file, with \fB\-\-all\fR) -only if it is N or fewer levels below the command -line argument; \fB\-\-max\-depth\fR=\fI0\fR is the same as -\fB\-\-summarize\fR -.TP -\fB\-\-time\fR -show time of the last modification of any file in the -directory, or any of its subdirectories -.TP -\fB\-\-time\fR=\fIWORD\fR -show time as WORD instead of modification time: -atime, access, use, ctime or status -.TP -\fB\-\-time\-style\fR=\fISTYLE\fR -show times using style STYLE: -full\-iso, long\-iso, iso, +FORMAT -FORMAT is interpreted like 'date' -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -Display values are in units of the first available SIZE from \fB\-\-block\-size\fR, -and the DU_BLOCK_SIZE, BLOCK_SIZE and BLOCKSIZE environment variables. -Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set). -.PP -SIZE is an integer and optional unit (example: 10M is 10*1024*1024). Units -are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of 1000). -.SH PATTERNS -PATTERN is a shell pattern (not a regular expression). The pattern -.BR ? -matches any one character, whereas -.BR * -matches any string (composed of zero, one or multiple characters). For -example, -.BR *.o -will match any files whose names end in -.BR .o . -Therefore, the command -.IP -.B du --exclude=\(aq*.o\(aq -.PP -will skip all files and subdirectories ending in -.BR .o -(including the file -.BR .o -itself). -.SH AUTHOR -Written by Torbjorn Granlund, David MacKenzie, Paul Eggert, -and Jim Meyering. -.SH "REPORTING BUGS" -Report du bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report du translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B du -is maintained as a Texinfo manual. If the -.B info -and -.B du -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqdu invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/du.x b/man/du.x index 7672158b..6e578c0c 100644 --- a/man/du.x +++ b/man/du.x @@ -1,4 +1,4 @@ -'\" Copyright (C) 1998-2012 Free Software Foundation, Inc. +'\" Copyright (C) 1998-2013 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 new file mode 100755 index 00000000..30693762 --- /dev/null +++ b/man/dummy-man @@ -0,0 +1,72 @@ +#!/bin/sh +# Poor man's placeholder for help2man invocation on systems lacking perl; +# it generates a dummy man page stating that a proper one could not be +# generated, and redirecting the user back to either the info +# documentation or the '--help' output. + +set -e; set -u + +fatal_ () +{ + printf '%s: %s\n' "$0" "$*" >&2 + exit 1 +} + +basename_ () +{ + printf '%s\n' "$1" | sed 's,.*/,,' +} + +output= +source="GNU coreutils" +while test $# -gt 0; do + case $1 in + # Help2man options we recognize and handle. + --output=*) output=`expr x"$1" : x'--output=\(.*\)'`;; + --output) shift; output=$1;; + --source=*) source=`expr x"$1" : x'--source=\(.*\)'`;; + --source) shift; source=$1;; + # Recognize (as no-op) other help2man options that might be used + # in the makefile. + --include=*);; + --include) shift;; + -*) fatal_ "invalid or unrecognized help2man option '$1'";; + --) shift; break;; + *) break;; + esac + shift +done + +test $# -gt 0 || fatal_ "missing argument" +test $# -le 1 || fatal_ "too many non-option arguments" + +baseout=`basename_ "$output"` +sed 's/^/WARNING: /' >&2 <<END +Cannot create proper '$baseout' man page, since perl is missing or +inadequate on this system. Creating a stub man page instead. +END + +progname=`basename_ "$1"` +year=`LC_ALL=C date +%Y` +bs='\' + +cat >"$output" <<END +.TH "$progname" 1 "$year" "$source" "User Commands" +.SH NAME +$progname $bs- a $source program +.SH DESCRIPTION +.B OOOPS! +Due to the lack of perl on the build system, we were +unable to create a proper manual page for +.B $progname. +For concise option descriptions, run +.IP +.B env $progname --help +.PP +The full documentation for +.B $progname +is maintained as a Texinfo manual, which should be accessible +on your system via the command +.IP +.B info coreutils $bs(aq$progname invocation$bs(aq +END diff --git a/man/echo.1 b/man/echo.1 deleted file mode 100644 index 55e659c4..00000000 --- a/man/echo.1 +++ /dev/null @@ -1,99 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH ECHO "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -echo \- display a line of text -.SH SYNOPSIS -.B echo -[\fISHORT-OPTION\fR]... [\fISTRING\fR]... -.br -.B echo -\fILONG-OPTION\fR -.SH DESCRIPTION -.\" Add any additional description here -.PP -Echo the STRING(s) to standard output. -.TP -\fB\-n\fR -do not output the trailing newline -.TP -\fB\-e\fR -enable interpretation of backslash escapes -.TP -\fB\-E\fR -disable interpretation of backslash escapes (default) -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -If \fB\-e\fR is in effect, the following sequences are recognized: -.TP -\e\e -backslash -.TP -\ea -alert (BEL) -.TP -\eb -backspace -.TP -\ec -produce no further output -.TP -\ee -escape -.TP -\ef -form feed -.TP -\en -new line -.TP -\er -carriage return -.TP -\et -horizontal tab -.TP -\ev -vertical tab -.TP -\e0NNN -byte with octal value NNN (1 to 3 digits) -.TP -\exHH -byte with hexadecimal value HH (1 to 2 digits) -.PP -NOTE: your shell may have its own version of echo, which usually supersedes -the version described here. Please refer to your shell's documentation -for details about the options it supports. -.SH AUTHOR -Written by Brian Fox and Chet Ramey. -.SH "REPORTING BUGS" -Report echo bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report echo translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B echo -is maintained as a Texinfo manual. If the -.B info -and -.B echo -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqecho invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/env.1 b/man/env.1 deleted file mode 100644 index caedb4e1..00000000 --- a/man/env.1 +++ /dev/null @@ -1,56 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH ENV "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -env \- run a program in a modified environment -.SH SYNOPSIS -.B env -[\fIOPTION\fR]... [\fI-\fR] [\fINAME=VALUE\fR]... [\fICOMMAND \fR[\fIARG\fR]...] -.SH DESCRIPTION -.\" Add any additional description here -.PP -Set each NAME to VALUE in the environment and run COMMAND. -.TP -\fB\-i\fR, \fB\-\-ignore\-environment\fR -start with an empty environment -.TP -\fB\-0\fR, \fB\-\-null\fR -end each output line with 0 byte rather than newline -.TP -\fB\-u\fR, \fB\-\-unset\fR=\fINAME\fR -remove variable from the environment -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -A mere \- implies \fB\-i\fR. If no COMMAND, print the resulting environment. -.SH AUTHOR -Written by Richard Mlynarik and David MacKenzie. -.SH "REPORTING BUGS" -Report env bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report env translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B env -is maintained as a Texinfo manual. If the -.B info -and -.B env -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqenv invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/expand.1 b/man/expand.1 deleted file mode 100644 index 49b4f314..00000000 --- a/man/expand.1 +++ /dev/null @@ -1,59 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH EXPAND "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -expand \- convert tabs to spaces -.SH SYNOPSIS -.B expand -[\fIOPTION\fR]... [\fIFILE\fR]... -.SH DESCRIPTION -.\" Add any additional description here -.PP -Convert tabs in each FILE to spaces, writing to standard output. -With no FILE, or when FILE is \-, read standard input. -.PP -Mandatory arguments to long options are mandatory for short options too. -.TP -\fB\-i\fR, \fB\-\-initial\fR -do not convert tabs after non blanks -.TP -\fB\-t\fR, \fB\-\-tabs\fR=\fINUMBER\fR -have tabs NUMBER characters apart, not 8 -.TP -\fB\-t\fR, \fB\-\-tabs\fR=\fILIST\fR -use comma separated list of explicit tab positions -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.SH AUTHOR -Written by David MacKenzie. -.SH "REPORTING BUGS" -Report expand bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report expand translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -unexpand(1) -.PP -The full documentation for -.B expand -is maintained as a Texinfo manual. If the -.B info -and -.B expand -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqexpand invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/expr.1 b/man/expr.1 deleted file mode 100644 index c644ab4e..00000000 --- a/man/expr.1 +++ /dev/null @@ -1,119 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH EXPR "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -expr \- evaluate expressions -.SH SYNOPSIS -.B expr -\fIEXPRESSION\fR -.br -.B expr -\fIOPTION\fR -.SH DESCRIPTION -.\" Add any additional description here -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -Print the value of EXPRESSION to standard output. A blank line below -separates increasing precedence groups. EXPRESSION may be: -.TP -ARG1 | ARG2 -ARG1 if it is neither null nor 0, otherwise ARG2 -.TP -ARG1 & ARG2 -ARG1 if neither argument is null or 0, otherwise 0 -.TP -ARG1 < ARG2 -ARG1 is less than ARG2 -.TP -ARG1 <= ARG2 -ARG1 is less than or equal to ARG2 -.TP -ARG1 = ARG2 -ARG1 is equal to ARG2 -.TP -ARG1 != ARG2 -ARG1 is unequal to ARG2 -.TP -ARG1 >= ARG2 -ARG1 is greater than or equal to ARG2 -.TP -ARG1 > ARG2 -ARG1 is greater than ARG2 -.TP -ARG1 + ARG2 -arithmetic sum of ARG1 and ARG2 -.TP -ARG1 \- ARG2 -arithmetic difference of ARG1 and ARG2 -.TP -ARG1 * ARG2 -arithmetic product of ARG1 and ARG2 -.TP -ARG1 / ARG2 -arithmetic quotient of ARG1 divided by ARG2 -.TP -ARG1 % ARG2 -arithmetic remainder of ARG1 divided by ARG2 -.TP -STRING : REGEXP -anchored pattern match of REGEXP in STRING -.TP -match STRING REGEXP -same as STRING : REGEXP -.TP -substr STRING POS LENGTH -substring of STRING, POS counted from 1 -.TP -index STRING CHARS -index in STRING where any CHARS is found, or 0 -.TP -length STRING -length of STRING -.TP -+ TOKEN -interpret TOKEN as a string, even if it is a -.IP -keyword like 'match' or an operator like '/' -.TP -( EXPRESSION ) -value of EXPRESSION -.PP -Beware that many operators need to be escaped or quoted for shells. -Comparisons are arithmetic if both ARGs are numbers, else lexicographical. -Pattern matches return the string matched between \e( and \e) or null; if -\e( and \e) are not used, they return the number of characters matched or 0. -.PP -Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is null -or 0, 2 if EXPRESSION is syntactically invalid, and 3 if an error occurred. -.SH AUTHOR -Written by Mike Parker, James Youngman, and Paul Eggert. -.SH "REPORTING BUGS" -Report expr bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report expr translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B expr -is maintained as a Texinfo manual. If the -.B info -and -.B expr -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqexpr invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/factor.1 b/man/factor.1 deleted file mode 100644 index 43956656..00000000 --- a/man/factor.1 +++ /dev/null @@ -1,49 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH FACTOR "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -factor \- factor numbers -.SH SYNOPSIS -.B factor -[\fINUMBER\fR]... -.br -.B factor -\fIOPTION\fR -.SH DESCRIPTION -.\" Add any additional description here -.PP -Print the prime factors of each specified integer NUMBER. If none -are specified on the command line, read them from standard input. -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.SH AUTHOR -Written by Paul Rubin. -.SH "REPORTING BUGS" -Report factor bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report factor translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B factor -is maintained as a Texinfo manual. If the -.B info -and -.B factor -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqfactor invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/false.1 b/man/false.1 deleted file mode 100644 index 1150fa80..00000000 --- a/man/false.1 +++ /dev/null @@ -1,52 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH FALSE "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -false \- do nothing, unsuccessfully -.SH SYNOPSIS -.B false -[\fIignored command line arguments\fR] -.br -.B false -\fIOPTION\fR -.SH DESCRIPTION -.\" Add any additional description here -.PP -Exit with a status code indicating failure. -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -NOTE: your shell may have its own version of false, which usually supersedes -the version described here. Please refer to your shell's documentation -for details about the options it supports. -.SH AUTHOR -Written by Jim Meyering. -.SH "REPORTING BUGS" -Report false bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report false translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B false -is maintained as a Texinfo manual. If the -.B info -and -.B false -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqfalse invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/fmt.1 b/man/fmt.1 deleted file mode 100644 index 4124823f..00000000 --- a/man/fmt.1 +++ /dev/null @@ -1,72 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH FMT "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -fmt \- simple optimal text formatter -.SH SYNOPSIS -.B fmt -[\fI-WIDTH\fR] [\fIOPTION\fR]... [\fIFILE\fR]... -.SH DESCRIPTION -.\" Add any additional description here -.PP -Reformat each paragraph in the FILE(s), writing to standard output. -The option \fB\-WIDTH\fR is an abbreviated form of \fB\-\-width\fR=\fIDIGITS\fR. -.PP -Mandatory arguments to long options are mandatory for short options too. -.TP -\fB\-c\fR, \fB\-\-crown\-margin\fR -preserve indentation of first two lines -.TP -\fB\-p\fR, \fB\-\-prefix\fR=\fISTRING\fR -reformat only lines beginning with STRING, -reattaching the prefix to reformatted lines -.TP -\fB\-s\fR, \fB\-\-split\-only\fR -split long lines, but do not refill -.TP -\fB\-t\fR, \fB\-\-tagged\-paragraph\fR -indentation of first line different from second -.TP -\fB\-u\fR, \fB\-\-uniform\-spacing\fR -one space between words, two after sentences -.TP -\fB\-w\fR, \fB\-\-width\fR=\fIWIDTH\fR -maximum line width (default of 75 columns) -.TP -\fB\-g\fR, \fB\-\-goal\fR=\fIWIDTH\fR -goal width (default of 93% of width) -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -With no FILE, or when FILE is \-, read standard input. -.SH AUTHOR -Written by Ross Paterson. -.SH "REPORTING BUGS" -Report fmt bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report fmt translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B fmt -is maintained as a Texinfo manual. If the -.B info -and -.B fmt -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqfmt invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/fold.1 b/man/fold.1 deleted file mode 100644 index b89aef2b..00000000 --- a/man/fold.1 +++ /dev/null @@ -1,57 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH FOLD "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -fold \- wrap each input line to fit in specified width -.SH SYNOPSIS -.B fold -[\fIOPTION\fR]... [\fIFILE\fR]... -.SH DESCRIPTION -.\" Add any additional description here -.PP -Wrap input lines in each FILE (standard input by default), writing to -standard output. -.PP -Mandatory arguments to long options are mandatory for short options too. -.TP -\fB\-b\fR, \fB\-\-bytes\fR -count bytes rather than columns -.TP -\fB\-s\fR, \fB\-\-spaces\fR -break at spaces -.TP -\fB\-w\fR, \fB\-\-width\fR=\fIWIDTH\fR -use WIDTH columns instead of 80 -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.SH AUTHOR -Written by David MacKenzie. -.SH "REPORTING BUGS" -Report fold bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report fold translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B fold -is maintained as a Texinfo manual. If the -.B info -and -.B fold -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqfold invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/groups.1 b/man/groups.1 deleted file mode 100644 index 99c55914..00000000 --- a/man/groups.1 +++ /dev/null @@ -1,46 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH GROUPS "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -groups \- print the groups a user is in -.SH SYNOPSIS -.B groups -[\fIOPTION\fR]... [\fIUSERNAME\fR]... -.SH DESCRIPTION -.\" Add any additional description here -.PP -Print group memberships for each USERNAME or, if no USERNAME is specified, for -the current process (which may differ if the groups database has changed). -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.SH AUTHOR -Written by David MacKenzie and James Youngman. -.SH "REPORTING BUGS" -Report groups bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report groups translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B groups -is maintained as a Texinfo manual. If the -.B info -and -.B groups -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqgroups invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/head.1 b/man/head.1 deleted file mode 100644 index 1db12508..00000000 --- a/man/head.1 +++ /dev/null @@ -1,69 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH HEAD "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -head \- output the first part of files -.SH SYNOPSIS -.B head -[\fIOPTION\fR]... [\fIFILE\fR]... -.SH DESCRIPTION -.\" Add any additional description here -.PP -Print the first 10 lines of each FILE to standard output. -With more than one FILE, precede each with a header giving the file name. -With no FILE, or when FILE is \-, read standard input. -.PP -Mandatory arguments to long options are mandatory for short options too. -.TP -\fB\-c\fR, \fB\-\-bytes\fR=\fI[\-]K\fR -print the first K bytes of each file; -with the leading '\-', print all but the last -K bytes of each file -.TP -\fB\-n\fR, \fB\-\-lines\fR=\fI[\-]K\fR -print the first K lines instead of the first 10; -with the leading '\-', print all but the last -K lines of each file -.TP -\fB\-q\fR, \fB\-\-quiet\fR, \fB\-\-silent\fR -never print headers giving file names -.TP -\fB\-v\fR, \fB\-\-verbose\fR -always print headers giving file names -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -K may have a multiplier suffix: -b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024, -GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y. -.SH AUTHOR -Written by David MacKenzie and Jim Meyering. -.SH "REPORTING BUGS" -Report head bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report head translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B head -is maintained as a Texinfo manual. If the -.B info -and -.B head -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqhead invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/help2man b/man/help2man index 27d04c9f..8e83f355 100755 --- a/man/help2man +++ b/man/help2man @@ -1,7 +1,7 @@ #!/usr/bin/perl -w # Generate a short man page from --help and --version output. -# Copyright (C) 1997-2012 Free Software Foundation, Inc. +# Copyright (C) 1997-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 diff --git a/man/hostid.1 b/man/hostid.1 deleted file mode 100644 index d2738d31..00000000 --- a/man/hostid.1 +++ /dev/null @@ -1,45 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH HOSTID "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -hostid \- print the numeric identifier for the current host -.SH SYNOPSIS -.B hostid -[\fIOPTION\fR] -.SH DESCRIPTION -.\" Add any additional description here -.PP -Print the numeric identifier (in hexadecimal) for the current host. -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.SH AUTHOR -Written by Jim Meyering. -.SH "REPORTING BUGS" -Report hostid bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report hostid translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B hostid -is maintained as a Texinfo manual. If the -.B info -and -.B hostid -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqhostid invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/hostid.x b/man/hostid.x index 1bba0a63..767a3e2b 100644 --- a/man/hostid.x +++ b/man/hostid.x @@ -2,3 +2,5 @@ hostid \- print the numeric identifier for the current host [DESCRIPTION] .\" Add any additional description here +[SEE ALSO] +gethostid(3) diff --git a/man/hostname.1 b/man/hostname.1 deleted file mode 100644 index 897bd7fb..00000000 --- a/man/hostname.1 +++ /dev/null @@ -1,48 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH HOSTNAME "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -hostname \- set or print the name of the current host system -.SH SYNOPSIS -.B hostname -[\fINAME\fR] -.br -.B hostname -\fIOPTION\fR -.SH DESCRIPTION -.\" Add any additional description here -.PP -Print or set the hostname of the current system. -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.SH AUTHOR -Written by Jim Meyering. -.SH "REPORTING BUGS" -Report hostname bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report hostname translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B hostname -is maintained as a Texinfo manual. If the -.B info -and -.B hostname -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqhostname invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/id.1 b/man/id.1 deleted file mode 100644 index a1470a47..00000000 --- a/man/id.1 +++ /dev/null @@ -1,69 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH ID "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -id \- print real and effective user and group IDs -.SH SYNOPSIS -.B id -[\fIOPTION\fR]... [\fIUSERNAME\fR] -.SH DESCRIPTION -.\" Add any additional description here -.PP -Print user and group information for the specified USERNAME, -or (when USERNAME omitted) for the current user. -.TP -\fB\-a\fR -ignore, for compatibility with other versions -.TP -\fB\-Z\fR, \fB\-\-context\fR -print only the security context of the current user -.TP -\fB\-g\fR, \fB\-\-group\fR -print only the effective group ID -.TP -\fB\-G\fR, \fB\-\-groups\fR -print all group IDs -.TP -\fB\-n\fR, \fB\-\-name\fR -print a name instead of a number, for \fB\-ugG\fR -.TP -\fB\-r\fR, \fB\-\-real\fR -print the real ID instead of the effective ID, with \fB\-ugG\fR -.TP -\fB\-u\fR, \fB\-\-user\fR -print only the effective user ID -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -Without any OPTION, print some useful set of identified information. -.SH AUTHOR -Written by Arnold Robbins and David MacKenzie. -.SH "REPORTING BUGS" -Report id bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report id translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B id -is maintained as a Texinfo manual. If the -.B info -and -.B id -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqid invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/install.1 b/man/install.1 deleted file mode 100644 index 8d72ad29..00000000 --- a/man/install.1 +++ /dev/null @@ -1,137 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH INSTALL "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -install \- copy files and set attributes -.SH SYNOPSIS -.B install -[\fIOPTION\fR]... [\fI-T\fR] \fISOURCE DEST\fR -.br -.B install -[\fIOPTION\fR]... \fISOURCE\fR... \fIDIRECTORY\fR -.br -.B install -[\fIOPTION\fR]... \fI-t DIRECTORY SOURCE\fR... -.br -.B install -[\fIOPTION\fR]... \fI-d DIRECTORY\fR... -.SH DESCRIPTION -.\" Add any additional description here -.PP -This install program copies files (often just compiled) into destination -locations you choose. If you want to download and install a ready\-to\-use -package on a GNU/Linux system, you should instead be using a package manager -like yum(1) or apt\-get(1). -.PP -In the first three forms, copy SOURCE to DEST or multiple SOURCE(s) to -the existing DIRECTORY, while setting permission modes and owner/group. -In the 4th form, create all components of the given DIRECTORY(ies). -.PP -Mandatory arguments to long options are mandatory for short options too. -.TP -\fB\-\-backup\fR[=\fICONTROL\fR] -make a backup of each existing destination file -.TP -\fB\-b\fR -like \fB\-\-backup\fR but does not accept an argument -.TP -\fB\-c\fR -(ignored) -.TP -\fB\-C\fR, \fB\-\-compare\fR -compare each pair of source and destination files, and -in some cases, do not modify the destination at all -.TP -\fB\-d\fR, \fB\-\-directory\fR -treat all arguments as directory names; create all -components of the specified directories -.TP -\fB\-D\fR -create all leading components of DEST except the last, -then copy SOURCE to DEST -.TP -\fB\-g\fR, \fB\-\-group\fR=\fIGROUP\fR -set group ownership, instead of process' current group -.TP -\fB\-m\fR, \fB\-\-mode\fR=\fIMODE\fR -set permission mode (as in chmod), instead of rwxr\-xr\-x -.TP -\fB\-o\fR, \fB\-\-owner\fR=\fIOWNER\fR -set ownership (super\-user only) -.TP -\fB\-p\fR, \fB\-\-preserve\-timestamps\fR -apply access/modification times of SOURCE files -to corresponding destination files -.TP -\fB\-s\fR, \fB\-\-strip\fR -strip symbol tables -.TP -\fB\-\-strip\-program\fR=\fIPROGRAM\fR -program used to strip binaries -.TP -\fB\-S\fR, \fB\-\-suffix\fR=\fISUFFIX\fR -override the usual backup suffix -.TP -\fB\-t\fR, \fB\-\-target\-directory\fR=\fIDIRECTORY\fR -copy all SOURCE arguments into DIRECTORY -.TP -\fB\-T\fR, \fB\-\-no\-target\-directory\fR -treat DEST as a normal file -.TP -\fB\-v\fR, \fB\-\-verbose\fR -print the name of each directory as it is created -.TP -\fB\-\-preserve\-context\fR -preserve SELinux security context -.TP -\fB\-Z\fR, \fB\-\-context\fR=\fICONTEXT\fR -set SELinux security context of files and directories -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -The backup suffix is '~', unless set with \fB\-\-suffix\fR or SIMPLE_BACKUP_SUFFIX. -The version control method may be selected via the \fB\-\-backup\fR option or through -the VERSION_CONTROL environment variable. Here are the values: -.TP -none, off -never make backups (even if \fB\-\-backup\fR is given) -.TP -numbered, t -make numbered backups -.TP -existing, nil -numbered if numbered backups exist, simple otherwise -.TP -simple, never -always make simple backups -.SH AUTHOR -Written by David MacKenzie. -.SH "REPORTING BUGS" -Report install bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report install translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B install -is maintained as a Texinfo manual. If the -.B info -and -.B install -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqinstall invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/join.1 b/man/join.1 deleted file mode 100644 index 904aac65..00000000 --- a/man/join.1 +++ /dev/null @@ -1,103 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH JOIN "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -join \- join lines of two files on a common field -.SH SYNOPSIS -.B join -[\fIOPTION\fR]... \fIFILE1 FILE2\fR -.SH DESCRIPTION -.\" Add any additional description here -.PP -For each pair of input lines with identical join fields, write a line to -standard output. The default join field is the first, delimited -by whitespace. When FILE1 or FILE2 (not both) is \-, read standard input. -.TP -\fB\-a\fR FILENUM -also print unpairable lines from file FILENUM, where -FILENUM is 1 or 2, corresponding to FILE1 or FILE2 -.TP -\fB\-e\fR EMPTY -replace missing input fields with EMPTY -.TP -\fB\-i\fR, \fB\-\-ignore\-case\fR -ignore differences in case when comparing fields -.TP -\fB\-j\fR FIELD -equivalent to '\-1 FIELD \fB\-2\fR FIELD' -.TP -\fB\-o\fR FORMAT -obey FORMAT while constructing output line -.TP -\fB\-t\fR CHAR -use CHAR as input and output field separator -.TP -\fB\-v\fR FILENUM -like \fB\-a\fR FILENUM, but suppress joined output lines -.TP -\fB\-1\fR FIELD -join on this FIELD of file 1 -.TP -\fB\-2\fR FIELD -join on this FIELD of file 2 -.TP -\fB\-\-check\-order\fR -check that the input is correctly sorted, even -if all input lines are pairable -.TP -\fB\-\-nocheck\-order\fR -do not check that the input is correctly sorted -.TP -\fB\-\-header\fR -treat the first line in each file as field headers, -print them without trying to pair them -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -Unless \fB\-t\fR CHAR is given, leading blanks separate fields and are ignored, -else fields are separated by CHAR. Any FIELD is a field number counted -from 1. FORMAT is one or more comma or blank separated specifications, -each being 'FILENUM.FIELD' or '0'. Default FORMAT outputs the join field, -the remaining fields from FILE1, the remaining fields from FILE2, all -separated by CHAR. If FORMAT is the keyword 'auto', then the first -line of each file determines the number of fields output for each line. -.PP -Important: FILE1 and FILE2 must be sorted on the join fields. -E.g., use "sort \fB\-k\fR 1b,1" if 'join' has no options, -or use "join \fB\-t\fR ''" if 'sort' has no options. -Note, comparisons honor the rules specified by 'LC_COLLATE'. -If the input is not sorted and some lines cannot be joined, a -warning message will be given. -.SH AUTHOR -Written by Mike Haertel. -.SH "REPORTING BUGS" -Report join bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report join translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -comm(1), uniq(1) -.PP -The full documentation for -.B join -is maintained as a Texinfo manual. If the -.B info -and -.B join -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqjoin invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/kill.1 b/man/kill.1 deleted file mode 100644 index 7347961d..00000000 --- a/man/kill.1 +++ /dev/null @@ -1,73 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH KILL "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -kill \- send signals to processes, or list signals -.SH SYNOPSIS -.B kill -[\fI-s SIGNAL | -SIGNAL\fR] \fIPID\fR... -.br -.B kill -\fI-l \fR[\fISIGNAL\fR]... -.br -.B kill -\fI-t \fR[\fISIGNAL\fR]... -.SH DESCRIPTION -.\" Add any additional description here -.PP -Send signals to processes, or list signals. -.PP -Mandatory arguments to long options are mandatory for short options too. -.HP -\fB\-s\fR, \fB\-\-signal\fR=\fISIGNAL\fR, \fB\-SIGNAL\fR -.IP -specify the name or number of the signal to be sent -.TP -\fB\-l\fR, \fB\-\-list\fR -list signal names, or convert signal names to/from numbers -.TP -\fB\-t\fR, \fB\-\-table\fR -print a table of signal information -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -SIGNAL may be a signal name like 'HUP', or a signal number like '1', -or the exit status of a process terminated by a signal. -PID is an integer; if negative it identifies a process group. -.PP -NOTE: your shell may have its own version of kill, which usually supersedes -the version described here. Please refer to your shell's documentation -for details about the options it supports. -.SH AUTHOR -Written by Paul Eggert. -.SH "REPORTING BUGS" -Report kill bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report kill translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -kill(2) -.PP -The full documentation for -.B kill -is maintained as a Texinfo manual. If the -.B info -and -.B kill -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqkill invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/link.1 b/man/link.1 deleted file mode 100644 index ded46416..00000000 --- a/man/link.1 +++ /dev/null @@ -1,50 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH LINK "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -link \- call the link function to create a link to a file -.SH SYNOPSIS -.B link -\fIFILE1 FILE2\fR -.br -.B link -\fIOPTION\fR -.SH DESCRIPTION -.\" Add any additional description here -.PP -Call the link function to create a link named FILE2 to an existing FILE1. -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.SH AUTHOR -Written by Michael Stone. -.SH "REPORTING BUGS" -Report link bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report link translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -link(2) -.PP -The full documentation for -.B link -is maintained as a Texinfo manual. If the -.B info -and -.B link -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqlink invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/ln.1 b/man/ln.1 deleted file mode 100644 index c3708ee7..00000000 --- a/man/ln.1 +++ /dev/null @@ -1,130 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH LN "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -ln \- make links between files -.SH SYNOPSIS -.B ln -[\fIOPTION\fR]... [\fI-T\fR] \fITARGET LINK_NAME (1st form)\fR -.br -.B ln -[\fIOPTION\fR]... \fITARGET (2nd form)\fR -.br -.B ln -[\fIOPTION\fR]... \fITARGET\fR... \fIDIRECTORY (3rd form)\fR -.br -.B ln -[\fIOPTION\fR]... \fI-t DIRECTORY TARGET\fR... \fI(4th form)\fR -.SH DESCRIPTION -.\" Add any additional description here -.PP -In the 1st form, create a link to TARGET with the name LINK_NAME. -In the 2nd form, create a link to TARGET in the current directory. -In the 3rd and 4th forms, create links to each TARGET in DIRECTORY. -Create hard links by default, symbolic links with \fB\-\-symbolic\fR. -By default, each destination (name of new link) should not already exist. -When creating hard links, each TARGET must exist. Symbolic links -can hold arbitrary text; if later resolved, a relative link is -interpreted in relation to its parent directory. -.PP -Mandatory arguments to long options are mandatory for short options too. -.TP -\fB\-\-backup\fR[=\fICONTROL\fR] -make a backup of each existing destination file -.TP -\fB\-b\fR -like \fB\-\-backup\fR but does not accept an argument -.TP -\fB\-d\fR, \fB\-F\fR, \fB\-\-directory\fR -allow the superuser to attempt to hard link -directories (note: will probably fail due to -system restrictions, even for the superuser) -.TP -\fB\-f\fR, \fB\-\-force\fR -remove existing destination files -.TP -\fB\-i\fR, \fB\-\-interactive\fR -prompt whether to remove destinations -.TP -\fB\-L\fR, \fB\-\-logical\fR -dereference TARGETs that are symbolic links -.TP -\fB\-n\fR, \fB\-\-no\-dereference\fR -treat LINK_NAME as a normal file if -it is a symbolic link to a directory -.TP -\fB\-P\fR, \fB\-\-physical\fR -make hard links directly to symbolic links -.TP -\fB\-r\fR, \fB\-\-relative\fR -create symbolic links relative to link location -.TP -\fB\-s\fR, \fB\-\-symbolic\fR -make symbolic links instead of hard links -.TP -\fB\-S\fR, \fB\-\-suffix\fR=\fISUFFIX\fR -override the usual backup suffix -.TP -\fB\-t\fR, \fB\-\-target\-directory\fR=\fIDIRECTORY\fR -specify the DIRECTORY in which to create -the links -.TP -\fB\-T\fR, \fB\-\-no\-target\-directory\fR -treat LINK_NAME as a normal file always -.TP -\fB\-v\fR, \fB\-\-verbose\fR -print name of each linked file -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -The backup suffix is '~', unless set with \fB\-\-suffix\fR or SIMPLE_BACKUP_SUFFIX. -The version control method may be selected via the \fB\-\-backup\fR option or through -the VERSION_CONTROL environment variable. Here are the values: -.TP -none, off -never make backups (even if \fB\-\-backup\fR is given) -.TP -numbered, t -make numbered backups -.TP -existing, nil -numbered if numbered backups exist, simple otherwise -.TP -simple, never -always make simple backups -.PP -Using \fB\-s\fR ignores \fB\-L\fR and \fB\-P\fR. Otherwise, the last option specified controls -behavior when a TARGET is a symbolic link, defaulting to \fB\-P\fR. -.SH AUTHOR -Written by Mike Parker and David MacKenzie. -.SH "REPORTING BUGS" -Report ln bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report ln translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -link(2), symlink(2) -.PP -The full documentation for -.B ln -is maintained as a Texinfo manual. If the -.B info -and -.B ln -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqln invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/local.mk b/man/local.mk new file mode 100644 index 00000000..b5e6e21d --- /dev/null +++ b/man/local.mk @@ -0,0 +1,196 @@ +# Make coreutils man pages. -*-Makefile-*- +# This is included by the top-level Makefile.am. + +# Copyright (C) 2002-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/>. + +EXTRA_DIST += man/help2man man/dummy-man + +## Graceful degradation for systems lacking perl. +if HAVE_PERL +run_help2man = $(PERL) -- $(srcdir)/man/help2man +else +run_help2man = $(SHELL) $(srcdir)/man/dummy-man +endif + +man1_MANS = @man1_MANS@ +EXTRA_DIST += $(man1_MANS:.1=.x) + +EXTRA_MANS = @EXTRA_MANS@ +EXTRA_DIST += $(EXTRA_MANS:.1=.x) + +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: + test x$(srcdir) = x$(builddir) || rm -f $(ALL_MANS) + +# Dependencies common to all man pages. Updated below. +mandeps = + +# Depend on this to get version number changes. +mandeps += .version + +# This is required so that changes to e.g., emit_bug_reporting_address +# provoke regeneration of all the manpages. +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 + +.x.1: + $(AM_V_GEN)name=`echo $@ | sed 's|.*/||; s|\.1$$||'` || exit 1; \ +## Ensure that help2man runs the 'src/ginstall' binary as 'install' when +## 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;; \ + 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 +## built-in functions like echo, false, printf, pwd. + rm -f $@ $@-t \ + && t=$*.td \ + && rm -rf $$t \ + && $(MKDIR_P) $$t \ + && (cd $$t && $(LN_S) '$(abs_top_builddir)/src/'$$prog $$name) \ + && $(run_help2man) \ + --source='$(PACKAGE_STRING)' \ + --include=$(srcdir)/man/$$name.x \ + --output=$$t/$$name.1 $$t/$$name \ + && sed 's|$*\.td/||g' $$t/$$name.1 > $@-t \ + && rm -rf $$t \ + && chmod -w $@-t \ + && mv $@-t $@ diff --git a/man/logname.1 b/man/logname.1 deleted file mode 100644 index 93330e2e..00000000 --- a/man/logname.1 +++ /dev/null @@ -1,45 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH LOGNAME "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -logname \- print user\'s login name -.SH SYNOPSIS -.B logname -[\fIOPTION\fR] -.SH DESCRIPTION -.\" Add any additional description here -.PP -Print the name of the current user. -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.SH AUTHOR -Written by FIXME: unknown. -.SH "REPORTING BUGS" -Report logname bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report logname translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B logname -is maintained as a Texinfo manual. If the -.B info -and -.B logname -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqlogname invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/ls.1 b/man/ls.1 deleted file mode 100644 index bfe4278d..00000000 --- a/man/ls.1 +++ /dev/null @@ -1,267 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH LS "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -ls \- list directory contents -.SH SYNOPSIS -.B ls -[\fIOPTION\fR]... [\fIFILE\fR]... -.SH DESCRIPTION -.\" Add any additional description here -.PP -List information about the FILEs (the current directory by default). -Sort entries alphabetically if none of \fB\-cftuvSUX\fR nor \fB\-\-sort\fR is specified. -.PP -Mandatory arguments to long options are mandatory for short options too. -.TP -\fB\-a\fR, \fB\-\-all\fR -do not ignore entries starting with . -.TP -\fB\-A\fR, \fB\-\-almost\-all\fR -do not list implied . and .. -.TP -\fB\-\-author\fR -with \fB\-l\fR, print the author of each file -.TP -\fB\-b\fR, \fB\-\-escape\fR -print C\-style escapes for nongraphic characters -.TP -\fB\-\-block\-size\fR=\fISIZE\fR -scale sizes by SIZE before printing them. E.g., -\&'\-\-block\-size=M' prints sizes in units of -1,048,576 bytes. See SIZE format below. -.TP -\fB\-B\fR, \fB\-\-ignore\-backups\fR -do not list implied entries ending with ~ -.TP -\fB\-c\fR -with \fB\-lt\fR: sort by, and show, ctime (time of last -modification of file status information) -with \fB\-l\fR: show ctime and sort by name -otherwise: sort by ctime, newest first -.TP -\fB\-C\fR -list entries by columns -.TP -\fB\-\-color\fR[=\fIWHEN\fR] -colorize the output. WHEN defaults to 'always' -or can be 'never' or 'auto'. More info below -.TP -\fB\-d\fR, \fB\-\-directory\fR -list directory entries instead of contents, -and do not dereference symbolic links -.TP -\fB\-D\fR, \fB\-\-dired\fR -generate output designed for Emacs' dired mode -.TP -\fB\-f\fR -do not sort, enable \fB\-aU\fR, disable \fB\-ls\fR \fB\-\-color\fR -.TP -\fB\-F\fR, \fB\-\-classify\fR -append indicator (one of */=>@|) to entries -.TP -\fB\-\-file\-type\fR -likewise, except do not append '*' -.TP -\fB\-\-format\fR=\fIWORD\fR -across \fB\-x\fR, commas \fB\-m\fR, horizontal \fB\-x\fR, long \fB\-l\fR, -single\-column \fB\-1\fR, verbose \fB\-l\fR, vertical \fB\-C\fR -.TP -\fB\-\-full\-time\fR -like \fB\-l\fR \fB\-\-time\-style\fR=\fIfull\-iso\fR -.TP -\fB\-g\fR -like \fB\-l\fR, but do not list owner -.TP -\fB\-\-group\-directories\-first\fR -group directories before files. -.IP -augment with a \fB\-\-sort\fR option, but any -use of \fB\-\-sort\fR=\fInone\fR (\fB\-U\fR) disables grouping -.TP -\fB\-G\fR, \fB\-\-no\-group\fR -in a long listing, don't print group names -.TP -\fB\-h\fR, \fB\-\-human\-readable\fR -with \fB\-l\fR, print sizes in human readable format -(e.g., 1K 234M 2G) -.TP -\fB\-\-si\fR -likewise, but use powers of 1000 not 1024 -.TP -\fB\-H\fR, \fB\-\-dereference\-command\-line\fR -follow symbolic links listed on the command line -.TP -\fB\-\-dereference\-command\-line\-symlink\-to\-dir\fR -follow each command line symbolic link -that points to a directory -.TP -\fB\-\-hide\fR=\fIPATTERN\fR -do not list implied entries matching shell PATTERN -(overridden by \fB\-a\fR or \fB\-A\fR) -.TP -\fB\-\-indicator\-style\fR=\fIWORD\fR -append indicator with style WORD to entry names: -none (default), slash (\fB\-p\fR), -file\-type (\fB\-\-file\-type\fR), classify (\fB\-F\fR) -.TP -\fB\-i\fR, \fB\-\-inode\fR -print the index number of each file -.TP -\fB\-I\fR, \fB\-\-ignore\fR=\fIPATTERN\fR -do not list implied entries matching shell PATTERN -.TP -\fB\-k\fR, \fB\-\-kibibytes\fR -use 1024\-byte blocks -.TP -\fB\-l\fR -use a long listing format -.TP -\fB\-L\fR, \fB\-\-dereference\fR -when showing file information for a symbolic -link, show information for the file the link -references rather than for the link itself -.TP -\fB\-m\fR -fill width with a comma separated list of entries -.TP -\fB\-n\fR, \fB\-\-numeric\-uid\-gid\fR -like \fB\-l\fR, but list numeric user and group IDs -.TP -\fB\-N\fR, \fB\-\-literal\fR -print raw entry names (don't treat e.g. control -characters specially) -.TP -\fB\-o\fR -like \fB\-l\fR, but do not list group information -.TP -\fB\-p\fR, \fB\-\-indicator\-style\fR=\fIslash\fR -append / indicator to directories -.TP -\fB\-q\fR, \fB\-\-hide\-control\-chars\fR -print ? instead of non graphic characters -.TP -\fB\-\-show\-control\-chars\fR -show non graphic characters as\-is (default -unless program is 'ls' and output is a terminal) -.TP -\fB\-Q\fR, \fB\-\-quote\-name\fR -enclose entry names in double quotes -.TP -\fB\-\-quoting\-style\fR=\fIWORD\fR -use quoting style WORD for entry names: -literal, locale, shell, shell\-always, c, escape -.TP -\fB\-r\fR, \fB\-\-reverse\fR -reverse order while sorting -.TP -\fB\-R\fR, \fB\-\-recursive\fR -list subdirectories recursively -.TP -\fB\-s\fR, \fB\-\-size\fR -print the allocated size of each file, in blocks -.TP -\fB\-S\fR -sort by file size -.TP -\fB\-\-sort\fR=\fIWORD\fR -sort by WORD instead of name: none \fB\-U\fR, -extension \fB\-X\fR, size \fB\-S\fR, time \fB\-t\fR, version \fB\-v\fR -.TP -\fB\-\-time\fR=\fIWORD\fR -with \fB\-l\fR, show time as WORD instead of modification -time: atime \fB\-u\fR, access \fB\-u\fR, use \fB\-u\fR, ctime \fB\-c\fR, -or status \fB\-c\fR; use specified time as sort key -if \fB\-\-sort\fR=\fItime\fR -.TP -\fB\-\-time\-style\fR=\fISTYLE\fR -with \fB\-l\fR, show times using style STYLE: -full\-iso, long\-iso, iso, locale, +FORMAT. -FORMAT is interpreted like 'date'; if FORMAT is -FORMAT1<newline>FORMAT2, FORMAT1 applies to -non\-recent files and FORMAT2 to recent files; -if STYLE is prefixed with 'posix\-', STYLE -takes effect only outside the POSIX locale -.TP -\fB\-t\fR -sort by modification time, newest first -.TP -\fB\-T\fR, \fB\-\-tabsize\fR=\fICOLS\fR -assume tab stops at each COLS instead of 8 -.TP -\fB\-u\fR -with \fB\-lt\fR: sort by, and show, access time -with \fB\-l\fR: show access time and sort by name -otherwise: sort by access time -.TP -\fB\-U\fR -do not sort; list entries in directory order -.TP -\fB\-v\fR -natural sort of (version) numbers within text -.TP -\fB\-w\fR, \fB\-\-width\fR=\fICOLS\fR -assume screen width instead of current value -.TP -\fB\-x\fR -list entries by lines instead of by columns -.TP -\fB\-X\fR -sort alphabetically by entry extension -.TP -\fB\-Z\fR, \fB\-\-context\fR -print any SELinux security context of each file -.TP -\fB\-1\fR -list one file per line -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -SIZE is an integer and optional unit (example: 10M is 10*1024*1024). Units -are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of 1000). -.PP -Using color to distinguish file types is disabled both by default and -with \fB\-\-color\fR=\fInever\fR. With \fB\-\-color\fR=\fIauto\fR, ls emits color codes only when -standard output is connected to a terminal. The LS_COLORS environment -variable can change the settings. Use the dircolors command to set it. -.SS "Exit status:" -.TP -0 -if OK, -.TP -1 -if minor problems (e.g., cannot access subdirectory), -.TP -2 -if serious trouble (e.g., cannot access command\-line argument). -.SH AUTHOR -Written by Richard M. Stallman and David MacKenzie. -.SH "REPORTING BUGS" -Report ls bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report ls translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B ls -is maintained as a Texinfo manual. If the -.B info -and -.B ls -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqls invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/md5sum.1 b/man/md5sum.1 deleted file mode 100644 index c78ed457..00000000 --- a/man/md5sum.1 +++ /dev/null @@ -1,77 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH MD5SUM "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -md5sum \- compute and check MD5 message digest -.SH SYNOPSIS -.B md5sum -[\fIOPTION\fR]... [\fIFILE\fR]... -.SH DESCRIPTION -.\" Add any additional description here -.PP -Print or check MD5 (128\-bit) checksums. -With no FILE, or when FILE is \-, read standard input. -.TP -\fB\-b\fR, \fB\-\-binary\fR -read in binary mode -.TP -\fB\-c\fR, \fB\-\-check\fR -read MD5 sums from the FILEs and check them -.TP -\fB\-t\fR, \fB\-\-text\fR -read in text mode (default) -.SS "The following three options are useful only when verifying checksums:" -.TP -\fB\-\-quiet\fR -don't print OK for each successfully verified file -.TP -\fB\-\-status\fR -don't output anything, status code shows success -.TP -\fB\-w\fR, \fB\-\-warn\fR -warn about improperly formatted checksum lines -.TP -\fB\-\-strict\fR -with \fB\-\-check\fR, exit non\-zero for any invalid input -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -The sums are computed as described in RFC 1321. When checking, the input -should be a former output of this program. The default mode is to print -a line with checksum, a character indicating input mode ('*' for binary, -space for text), and name for each FILE. -.SH BUGS -The MD5 algorithm should not be used any more for security related purposes. -Instead, better use an SHA\-2 algorithm, implemented in the programs -sha224sum(1), sha256sum(1), sha384sum(1), sha512sum(1) -.SH AUTHOR -Written by Ulrich Drepper, Scott Miller, and David Madore. -.SH "REPORTING BUGS" -Report md5sum bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report md5sum translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B md5sum -is maintained as a Texinfo manual. If the -.B info -and -.B md5sum -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqmd5sum invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/mkdir.1 b/man/mkdir.1 deleted file mode 100644 index e1943edf..00000000 --- a/man/mkdir.1 +++ /dev/null @@ -1,62 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH MKDIR "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -mkdir \- make directories -.SH SYNOPSIS -.B mkdir -[\fIOPTION\fR]... \fIDIRECTORY\fR... -.SH DESCRIPTION -.\" Add any additional description here -.PP -Create the DIRECTORY(ies), if they do not already exist. -.PP -Mandatory arguments to long options are mandatory for short options too. -.TP -\fB\-m\fR, \fB\-\-mode\fR=\fIMODE\fR -set file mode (as in chmod), not a=rwx \- umask -.TP -\fB\-p\fR, \fB\-\-parents\fR -no error if existing, make parent directories as needed -.TP -\fB\-v\fR, \fB\-\-verbose\fR -print a message for each created directory -.TP -\fB\-Z\fR, \fB\-\-context\fR=\fICTX\fR -set the SELinux security context of each created -directory to CTX -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.SH AUTHOR -Written by David MacKenzie. -.SH "REPORTING BUGS" -Report mkdir bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report mkdir translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -mkdir(2) -.PP -The full documentation for -.B mkdir -is maintained as a Texinfo manual. If the -.B info -and -.B mkdir -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqmkdir invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/mkfifo.1 b/man/mkfifo.1 deleted file mode 100644 index fffc97f1..00000000 --- a/man/mkfifo.1 +++ /dev/null @@ -1,55 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH MKFIFO "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -mkfifo \- make FIFOs (named pipes) -.SH SYNOPSIS -.B mkfifo -[\fIOPTION\fR]... \fINAME\fR... -.SH DESCRIPTION -.\" Add any additional description here -.PP -Create named pipes (FIFOs) with the given NAMEs. -.PP -Mandatory arguments to long options are mandatory for short options too. -.TP -\fB\-m\fR, \fB\-\-mode\fR=\fIMODE\fR -set file permission bits to MODE, not a=rw \- umask -.TP -\fB\-Z\fR, \fB\-\-context\fR=\fICTX\fR -set the SELinux security context of each NAME to CTX -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.SH AUTHOR -Written by David MacKenzie. -.SH "REPORTING BUGS" -Report mkfifo bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report mkfifo translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -mkfifo(3) -.PP -The full documentation for -.B mkfifo -is maintained as a Texinfo manual. If the -.B info -and -.B mkfifo -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqmkfifo invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/mknod.1 b/man/mknod.1 deleted file mode 100644 index 4cb0b6c9..00000000 --- a/man/mknod.1 +++ /dev/null @@ -1,73 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH MKNOD "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -mknod \- make block or character special files -.SH SYNOPSIS -.B mknod -[\fIOPTION\fR]... \fINAME TYPE \fR[\fIMAJOR MINOR\fR] -.SH DESCRIPTION -.\" Add any additional description here -.PP -Create the special file NAME of the given TYPE. -.PP -Mandatory arguments to long options are mandatory for short options too. -.TP -\fB\-m\fR, \fB\-\-mode\fR=\fIMODE\fR -set file permission bits to MODE, not a=rw \- umask -.TP -\fB\-Z\fR, \fB\-\-context\fR=\fICTX\fR -set the SELinux security context of NAME to CTX -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they -must be omitted when TYPE is p. If MAJOR or MINOR begins with 0x or 0X, -it is interpreted as hexadecimal; otherwise, if it begins with 0, as octal; -otherwise, as decimal. TYPE may be: -.TP -b -create a block (buffered) special file -.TP -c, u -create a character (unbuffered) special file -.TP -p -create a FIFO -.PP -NOTE: your shell may have its own version of mknod, which usually supersedes -the version described here. Please refer to your shell's documentation -for details about the options it supports. -.SH AUTHOR -Written by David MacKenzie. -.SH "REPORTING BUGS" -Report mknod bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report mknod translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -mknod(2) -.PP -The full documentation for -.B mknod -is maintained as a Texinfo manual. If the -.B info -and -.B mknod -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqmknod invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/mktemp.1 b/man/mktemp.1 deleted file mode 100644 index badc5027..00000000 --- a/man/mktemp.1 +++ /dev/null @@ -1,78 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH MKTEMP "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -mktemp \- create a temporary file or directory -.SH SYNOPSIS -.B mktemp -[\fIOPTION\fR]... [\fITEMPLATE\fR] -.SH DESCRIPTION -.\" Add any additional description here -.PP -Create a temporary file or directory, safely, and print its name. -TEMPLATE must contain at least 3 consecutive 'X's in last component. -If TEMPLATE is not specified, use tmp.XXXXXXXXXX, and \fB\-\-tmpdir\fR is implied. -Files are created u+rw, and directories u+rwx, minus umask restrictions. -.TP -\fB\-d\fR, \fB\-\-directory\fR -create a directory, not a file -.TP -\fB\-u\fR, \fB\-\-dry\-run\fR -do not create anything; merely print a name (unsafe) -.TP -\fB\-q\fR, \fB\-\-quiet\fR -suppress diagnostics about file/dir\-creation failure -.TP -\fB\-\-suffix\fR=\fISUFF\fR -append SUFF to TEMPLATE. SUFF must not contain slash. -This option is implied if TEMPLATE does not end in X. -.TP -\fB\-\-tmpdir\fR[=\fIDIR\fR] -interpret TEMPLATE relative to DIR. If DIR is not -specified, use $TMPDIR if set, else /tmp. With -this option, TEMPLATE must not be an absolute name. -Unlike with \fB\-t\fR, TEMPLATE may contain slashes, but -mktemp creates only the final component -.TP -\fB\-p\fR DIR -use DIR as a prefix; implies \fB\-t\fR [deprecated] -.TP -\fB\-t\fR -interpret TEMPLATE as a single file name component, -relative to a directory: $TMPDIR, if set; else the -directory specified via \fB\-p\fR; else /tmp [deprecated] -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.SH AUTHOR -Written by Jim Meyering and Eric Blake. -.SH "REPORTING BUGS" -Report mktemp bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report mktemp translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -mkstemp(3), mkdtemp(3), mktemp(3) -.PP -The full documentation for -.B mktemp -is maintained as a Texinfo manual. If the -.B info -and -.B mktemp -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqmktemp invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/mv.1 b/man/mv.1 deleted file mode 100644 index b488e60b..00000000 --- a/man/mv.1 +++ /dev/null @@ -1,109 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH MV "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -mv \- move (rename) files -.SH SYNOPSIS -.B mv -[\fIOPTION\fR]... [\fI-T\fR] \fISOURCE DEST\fR -.br -.B mv -[\fIOPTION\fR]... \fISOURCE\fR... \fIDIRECTORY\fR -.br -.B mv -[\fIOPTION\fR]... \fI-t DIRECTORY SOURCE\fR... -.SH DESCRIPTION -.\" Add any additional description here -.PP -Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY. -.PP -Mandatory arguments to long options are mandatory for short options too. -.TP -\fB\-\-backup\fR[=\fICONTROL\fR] -make a backup of each existing destination file -.TP -\fB\-b\fR -like \fB\-\-backup\fR but does not accept an argument -.TP -\fB\-f\fR, \fB\-\-force\fR -do not prompt before overwriting -.TP -\fB\-i\fR, \fB\-\-interactive\fR -prompt before overwrite -.TP -\fB\-n\fR, \fB\-\-no\-clobber\fR -do not overwrite an existing file -.PP -If you specify more than one of \fB\-i\fR, \fB\-f\fR, \fB\-n\fR, only the final one takes effect. -.TP -\fB\-\-strip\-trailing\-slashes\fR -remove any trailing slashes from each SOURCE -argument -.TP -\fB\-S\fR, \fB\-\-suffix\fR=\fISUFFIX\fR -override the usual backup suffix -.TP -\fB\-t\fR, \fB\-\-target\-directory\fR=\fIDIRECTORY\fR -move all SOURCE arguments into DIRECTORY -.TP -\fB\-T\fR, \fB\-\-no\-target\-directory\fR -treat DEST as a normal file -.TP -\fB\-u\fR, \fB\-\-update\fR -move only when the SOURCE file is newer -than the destination file or when the -destination file is missing -.TP -\fB\-v\fR, \fB\-\-verbose\fR -explain what is being done -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -The backup suffix is '~', unless set with \fB\-\-suffix\fR or SIMPLE_BACKUP_SUFFIX. -The version control method may be selected via the \fB\-\-backup\fR option or through -the VERSION_CONTROL environment variable. Here are the values: -.TP -none, off -never make backups (even if \fB\-\-backup\fR is given) -.TP -numbered, t -make numbered backups -.TP -existing, nil -numbered if numbered backups exist, simple otherwise -.TP -simple, never -always make simple backups -.SH AUTHOR -Written by Mike Parker, David MacKenzie, and Jim Meyering. -.SH "REPORTING BUGS" -Report mv bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report mv translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -rename(2) -.PP -The full documentation for -.B mv -is maintained as a Texinfo manual. If the -.B info -and -.B mv -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqmv invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/nice.1 b/man/nice.1 deleted file mode 100644 index 2e3397df..00000000 --- a/man/nice.1 +++ /dev/null @@ -1,56 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH NICE "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -nice \- run a program with modified scheduling priority -.SH SYNOPSIS -.B nice -[\fIOPTION\fR] [\fICOMMAND \fR[\fIARG\fR]...] -.SH DESCRIPTION -.\" Add any additional description here -.PP -Run COMMAND with an adjusted niceness, which affects process scheduling. -With no COMMAND, print the current niceness. Nicenesses range from -\fB\-20\fR (most favorable scheduling) to 19 (least favorable). -.TP -\fB\-n\fR, \fB\-\-adjustment\fR=\fIN\fR -add integer N to the niceness (default 10) -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -NOTE: your shell may have its own version of nice, which usually supersedes -the version described here. Please refer to your shell's documentation -for details about the options it supports. -.SH AUTHOR -Written by David MacKenzie. -.SH "REPORTING BUGS" -Report nice bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report nice translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -nice(2) -.PP -The full documentation for -.B nice -is maintained as a Texinfo manual. If the -.B info -and -.B nice -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqnice invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/nice.x b/man/nice.x index 3448d699..952cb107 100644 --- a/man/nice.x +++ b/man/nice.x @@ -3,4 +3,4 @@ nice \- run a program with modified scheduling priority [DESCRIPTION] .\" Add any additional description here [SEE ALSO] -nice(2) +nice(2), renice(1) diff --git a/man/nl.1 b/man/nl.1 deleted file mode 100644 index 0d98fd6c..00000000 --- a/man/nl.1 +++ /dev/null @@ -1,109 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH NL "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -nl \- number lines of files -.SH SYNOPSIS -.B nl -[\fIOPTION\fR]... [\fIFILE\fR]... -.SH DESCRIPTION -.\" Add any additional description here -.PP -Write each FILE to standard output, with line numbers added. -With no FILE, or when FILE is \-, read standard input. -.PP -Mandatory arguments to long options are mandatory for short options too. -.TP -\fB\-b\fR, \fB\-\-body\-numbering\fR=\fISTYLE\fR -use STYLE for numbering body lines -.TP -\fB\-d\fR, \fB\-\-section\-delimiter\fR=\fICC\fR -use CC for separating logical pages -.TP -\fB\-f\fR, \fB\-\-footer\-numbering\fR=\fISTYLE\fR -use STYLE for numbering footer lines -.TP -\fB\-h\fR, \fB\-\-header\-numbering\fR=\fISTYLE\fR -use STYLE for numbering header lines -.TP -\fB\-i\fR, \fB\-\-line\-increment\fR=\fINUMBER\fR -line number increment at each line -.TP -\fB\-l\fR, \fB\-\-join\-blank\-lines\fR=\fINUMBER\fR -group of NUMBER empty lines counted as one -.TP -\fB\-n\fR, \fB\-\-number\-format\fR=\fIFORMAT\fR -insert line numbers according to FORMAT -.TP -\fB\-p\fR, \fB\-\-no\-renumber\fR -do not reset line numbers at logical pages -.TP -\fB\-s\fR, \fB\-\-number\-separator\fR=\fISTRING\fR -add STRING after (possible) line number -.TP -\fB\-v\fR, \fB\-\-starting\-line\-number\fR=\fINUMBER\fR -first line number on each logical page -.TP -\fB\-w\fR, \fB\-\-number\-width\fR=\fINUMBER\fR -use NUMBER columns for line numbers -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -By default, selects \fB\-v1\fR \fB\-i1\fR \fB\-l1\fR \fB\-sTAB\fR \fB\-w6\fR \fB\-nrn\fR \fB\-hn\fR \fB\-bt\fR \fB\-fn\fR. CC are -two delimiter characters for separating logical pages, a missing -second character implies :. Type \e\e for \e. STYLE is one of: -.TP -a -number all lines -.TP -t -number only nonempty lines -.TP -n -number no lines -.TP -pBRE -number only lines that contain a match for the basic regular -expression, BRE -.PP -FORMAT is one of: -.TP -ln -left justified, no leading zeros -.TP -rn -right justified, no leading zeros -.TP -rz -right justified, leading zeros -.SH AUTHOR -Written by Scott Bartram and David MacKenzie. -.SH "REPORTING BUGS" -Report nl bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report nl translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B nl -is maintained as a Texinfo manual. If the -.B info -and -.B nl -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqnl invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/nohup.1 b/man/nohup.1 deleted file mode 100644 index 3ab78439..00000000 --- a/man/nohup.1 +++ /dev/null @@ -1,58 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH NOHUP "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -nohup \- run a command immune to hangups, with output to a non-tty -.SH SYNOPSIS -.B nohup -\fICOMMAND \fR[\fIARG\fR]... -.br -.B nohup -\fIOPTION\fR -.SH DESCRIPTION -.\" Add any additional description here -.PP -Run COMMAND, ignoring hangup signals. -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -If standard input is a terminal, redirect it from /dev/null. -If standard output is a terminal, append output to 'nohup.out' if possible, -\&'$HOME/nohup.out' otherwise. -If standard error is a terminal, redirect it to standard output. -To save output to FILE, use 'nohup COMMAND > FILE'. -.PP -NOTE: your shell may have its own version of nohup, which usually supersedes -the version described here. Please refer to your shell's documentation -for details about the options it supports. -.SH AUTHOR -Written by Jim Meyering. -.SH "REPORTING BUGS" -Report nohup bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report nohup translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B nohup -is maintained as a Texinfo manual. If the -.B info -and -.B nohup -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqnohup invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/nproc.1 b/man/nproc.1 deleted file mode 100644 index bff45977..00000000 --- a/man/nproc.1 +++ /dev/null @@ -1,52 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH NPROC "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -nproc \- print the number of processing units available -.SH SYNOPSIS -.B nproc -[\fIOPTION\fR]... -.SH DESCRIPTION -.\" Add any additional description here -.PP -Print the number of processing units available to the current process, -which may be less than the number of online processors -.TP -\fB\-\-all\fR -print the number of installed processors -.TP -\fB\-\-ignore\fR=\fIN\fR -if possible, exclude N processing units -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.SH AUTHOR -Written by Giuseppe Scrivano. -.SH "REPORTING BUGS" -Report nproc bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report nproc translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B nproc -is maintained as a Texinfo manual. If the -.B info -and -.B nproc -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqnproc invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/numfmt.x b/man/numfmt.x new file mode 100644 index 00000000..6deaff1c --- /dev/null +++ b/man/numfmt.x @@ -0,0 +1,4 @@ +[NAME] +numfmt \- Convert numbers from/to human-readable strings +[DESCRIPTION] +.\" Add any additional description here diff --git a/man/od.1 b/man/od.1 deleted file mode 100644 index b9956902..00000000 --- a/man/od.1 +++ /dev/null @@ -1,155 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH OD "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -od \- dump files in octal and other formats -.SH SYNOPSIS -.B od -[\fIOPTION\fR]... [\fIFILE\fR]... -.br -.B od -[\fI-abcdfilosx\fR]... [\fIFILE\fR] [[\fI+\fR]\fIOFFSET\fR[\fI.\fR][\fIb\fR]] -.br -.B od -\fI--traditional \fR[\fIOPTION\fR]... [\fIFILE\fR] [[\fI+\fR]\fIOFFSET\fR[\fI.\fR][\fIb\fR] [\fI+\fR][\fILABEL\fR][\fI.\fR][\fIb\fR]] -.SH DESCRIPTION -.\" Add any additional description here -.PP -Write an unambiguous representation, octal bytes by default, -of FILE to standard output. With more than one FILE argument, -concatenate them in the listed order to form the input. -With no FILE, or when FILE is \-, read standard input. -.PP -All arguments to long options are mandatory for short options. -.TP -\fB\-A\fR, \fB\-\-address\-radix\fR=\fIRADIX\fR -decide how file offsets are printed -.TP -\fB\-j\fR, \fB\-\-skip\-bytes\fR=\fIBYTES\fR -skip BYTES input bytes first -.TP -\fB\-N\fR, \fB\-\-read\-bytes\fR=\fIBYTES\fR -limit dump to BYTES input bytes -.TP -\fB\-S\fR BYTES, \fB\-\-strings\fR[=\fIBYTES\fR] -output strings of at least BYTES graphic chars -.TP -\fB\-t\fR, \fB\-\-format\fR=\fITYPE\fR -select output format or formats -.TP -\fB\-v\fR, \fB\-\-output\-duplicates\fR -do not use * to mark line suppression -.TP -\fB\-w[BYTES]\fR, \fB\-\-width\fR[=\fIBYTES\fR] -output BYTES bytes per output line -.TP -\fB\-\-traditional\fR -accept arguments in traditional form -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.SS "Traditional format specifications may be intermixed; they accumulate:" -.TP -\fB\-a\fR -same as \fB\-t\fR a, select named characters, ignoring high\-order bit -.TP -\fB\-b\fR -same as \fB\-t\fR o1, select octal bytes -.TP -\fB\-c\fR -same as \fB\-t\fR c, select ASCII characters or backslash escapes -.TP -\fB\-d\fR -same as \fB\-t\fR u2, select unsigned decimal 2\-byte units -.TP -\fB\-f\fR -same as \fB\-t\fR fF, select floats -.TP -\fB\-i\fR -same as \fB\-t\fR dI, select decimal ints -.TP -\fB\-l\fR -same as \fB\-t\fR dL, select decimal longs -.TP -\fB\-o\fR -same as \fB\-t\fR o2, select octal 2\-byte units -.TP -\fB\-s\fR -same as \fB\-t\fR d2, select decimal 2\-byte units -.TP -\fB\-x\fR -same as \fB\-t\fR x2, select hexadecimal 2\-byte units -.PP -If first and second call formats both apply, the second format is assumed -if the last operand begins with + or (if there are 2 operands) a digit. -An OFFSET operand means \fB\-j\fR OFFSET. LABEL is the pseudo\-address -at first byte printed, incremented when dump is progressing. -For OFFSET and LABEL, a 0x or 0X prefix indicates hexadecimal; -suffixes may be . for octal and b for multiply by 512. -.PP -TYPE is made up of one or more of these specifications: -.TP -a -named character, ignoring high\-order bit -.TP -c -ASCII character or backslash escape -.TP -d[SIZE] -signed decimal, SIZE bytes per integer -.TP -f[SIZE] -floating point, SIZE bytes per integer -.TP -o[SIZE] -octal, SIZE bytes per integer -.TP -u[SIZE] -unsigned decimal, SIZE bytes per integer -.TP -x[SIZE] -hexadecimal, SIZE bytes per integer -.PP -SIZE is a number. For TYPE in doux, SIZE may also be C for -sizeof(char), S for sizeof(short), I for sizeof(int) or L for -sizeof(long). If TYPE is f, SIZE may also be F for sizeof(float), D -for sizeof(double) or L for sizeof(long double). -.PP -RADIX is d for decimal, o for octal, x for hexadecimal or n for none. -BYTES is hexadecimal with 0x or 0X prefix, and may have a multiplier suffix: -b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024, -GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y. -Adding a z suffix to any type displays printable characters at the end of each -output line. -Option \fB\-\-string\fR without a number implies 3; option \fB\-\-width\fR without a number -implies 32. By default, od uses \fB\-A\fR o \fB\-t\fR oS \fB\-w16\fR. -.SH AUTHOR -Written by Jim Meyering. -.SH "REPORTING BUGS" -Report od bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report od translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B od -is maintained as a Texinfo manual. If the -.B info -and -.B od -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqod invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/od.x b/man/od.x index c913f804..c3382d25 100644 --- a/man/od.x +++ b/man/od.x @@ -2,3 +2,10 @@ od \- dump files in octal and other formats [DESCRIPTION] .\" Add any additional description here +[EXAMPLES] +.TP +.B od -A x -t x1z -v +Display hexdump format output +.TP +.B od -A o -t oS -w16 +The default output format used by od diff --git a/man/paste.1 b/man/paste.1 deleted file mode 100644 index 5b6fe27f..00000000 --- a/man/paste.1 +++ /dev/null @@ -1,55 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH PASTE "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -paste \- merge lines of files -.SH SYNOPSIS -.B paste -[\fIOPTION\fR]... [\fIFILE\fR]... -.SH DESCRIPTION -.\" Add any additional description here -.PP -Write lines consisting of the sequentially corresponding lines from -each FILE, separated by TABs, to standard output. -With no FILE, or when FILE is \-, read standard input. -.PP -Mandatory arguments to long options are mandatory for short options too. -.TP -\fB\-d\fR, \fB\-\-delimiters\fR=\fILIST\fR -reuse characters from LIST instead of TABs -.TP -\fB\-s\fR, \fB\-\-serial\fR -paste one file at a time instead of in parallel -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.SH AUTHOR -Written by David M. Ihnat and David MacKenzie. -.SH "REPORTING BUGS" -Report paste bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report paste translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B paste -is maintained as a Texinfo manual. If the -.B info -and -.B paste -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqpaste invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/pathchk.1 b/man/pathchk.1 deleted file mode 100644 index 290d1ff7..00000000 --- a/man/pathchk.1 +++ /dev/null @@ -1,54 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH PATHCHK "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -pathchk \- check whether file names are valid or portable -.SH SYNOPSIS -.B pathchk -[\fIOPTION\fR]... \fINAME\fR... -.SH DESCRIPTION -.\" Add any additional description here -.PP -Diagnose invalid or unportable file names. -.TP -\fB\-p\fR -check for most POSIX systems -.TP -\fB\-P\fR -check for empty names and leading "\-" -.TP -\fB\-\-portability\fR -check for all POSIX systems (equivalent to \fB\-p\fR \fB\-P\fR) -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.SH AUTHOR -Written by Paul Eggert, David MacKenzie, and Jim Meyering. -.SH "REPORTING BUGS" -Report pathchk bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report pathchk translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B pathchk -is maintained as a Texinfo manual. If the -.B info -and -.B pathchk -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqpathchk invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/pinky.1 b/man/pinky.1 deleted file mode 100644 index ffc8d2c3..00000000 --- a/man/pinky.1 +++ /dev/null @@ -1,74 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH PINKY "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -pinky \- lightweight finger -.SH SYNOPSIS -.B pinky -[\fIOPTION\fR]... [\fIUSER\fR]... -.SH DESCRIPTION -.\" Add any additional description here -.TP -\fB\-l\fR -produce long format output for the specified USERs -.TP -\fB\-b\fR -omit the user's home directory and shell in long format -.TP -\fB\-h\fR -omit the user's project file in long format -.TP -\fB\-p\fR -omit the user's plan file in long format -.TP -\fB\-s\fR -do short format output, this is the default -.TP -\fB\-f\fR -omit the line of column headings in short format -.TP -\fB\-w\fR -omit the user's full name in short format -.TP -\fB\-i\fR -omit the user's full name and remote host in short format -.TP -\fB\-q\fR -omit the user's full name, remote host and idle time -in short format -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -A lightweight 'finger' program; print user information. -The utmp file will be /var/run/utmp. -.SH AUTHOR -Written by Joseph Arceneaux, David MacKenzie, and Kaveh Ghazi. -.SH "REPORTING BUGS" -Report pinky bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report pinky translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B pinky -is maintained as a Texinfo manual. If the -.B info -and -.B pinky -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqpinky invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/pr.1 b/man/pr.1 deleted file mode 100644 index fba33fc6..00000000 --- a/man/pr.1 +++ /dev/null @@ -1,143 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH PR "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -pr \- convert text files for printing -.SH SYNOPSIS -.B pr -[\fIOPTION\fR]... [\fIFILE\fR]... -.SH DESCRIPTION -.\" Add any additional description here -.PP -Paginate or columnate FILE(s) for printing. -.PP -Mandatory arguments to long options are mandatory for short options too. -.TP -+FIRST_PAGE[:LAST_PAGE], \fB\-\-pages\fR=\fIFIRST_PAGE[\fR:LAST_PAGE] -begin [stop] printing with page FIRST_[LAST_]PAGE -.TP -\fB\-COLUMN\fR, \fB\-\-columns\fR=\fICOLUMN\fR -output COLUMN columns and print columns down, -unless \fB\-a\fR is used. Balance number of lines in the -columns on each page -.TP -\fB\-a\fR, \fB\-\-across\fR -print columns across rather than down, used together -with \fB\-COLUMN\fR -.TP -\fB\-c\fR, \fB\-\-show\-control\-chars\fR -use hat notation (^G) and octal backslash notation -.TP -\fB\-d\fR, \fB\-\-double\-space\fR -double space the output -.TP -\fB\-D\fR, \fB\-\-date\-format\fR=\fIFORMAT\fR -use FORMAT for the header date -.TP -\fB\-e[CHAR[WIDTH]]\fR, \fB\-\-expand\-tabs\fR[=\fICHAR[WIDTH]\fR] -expand input CHARs (TABs) to tab WIDTH (8) -.TP -\fB\-F\fR, \fB\-f\fR, \fB\-\-form\-feed\fR -use form feeds instead of newlines to separate pages -(by a 3\-line page header with \fB\-F\fR or a 5\-line header -and trailer without \fB\-F\fR) -.TP -\fB\-h\fR, \fB\-\-header\fR=\fIHEADER\fR -use a centered HEADER instead of filename in page header, -\fB\-h\fR "" prints a blank line, don't use \fB\-h\fR"" -.TP -\fB\-i[CHAR[WIDTH]]\fR, \fB\-\-output\-tabs\fR[=\fICHAR[WIDTH]\fR] -replace spaces with CHARs (TABs) to tab WIDTH (8) -.TP -\fB\-J\fR, \fB\-\-join\-lines\fR -merge full lines, turns off \fB\-W\fR line truncation, no column -alignment, \fB\-\-sep\-string\fR[=\fISTRING\fR] sets separators -.TP -\fB\-l\fR, \fB\-\-length\fR=\fIPAGE_LENGTH\fR -set the page length to PAGE_LENGTH (66) lines -(default number of lines of text 56, and with \fB\-F\fR 63) -.TP -\fB\-m\fR, \fB\-\-merge\fR -print all files in parallel, one in each column, -truncate lines, but join lines of full length with \fB\-J\fR -.TP -\fB\-n[SEP[DIGITS]]\fR, \fB\-\-number\-lines\fR[=\fISEP[DIGITS]\fR] -number lines, use DIGITS (5) digits, then SEP (TAB), -default counting starts with 1st line of input file -.TP -\fB\-N\fR, \fB\-\-first\-line\-number\fR=\fINUMBER\fR -start counting with NUMBER at 1st line of first -page printed (see +FIRST_PAGE) -.TP -\fB\-o\fR, \fB\-\-indent\fR=\fIMARGIN\fR -offset each line with MARGIN (zero) spaces, do not -affect \fB\-w\fR or \fB\-W\fR, MARGIN will be added to PAGE_WIDTH -.TP -\fB\-r\fR, \fB\-\-no\-file\-warnings\fR -omit warning when a file cannot be opened -.TP -\fB\-s[CHAR]\fR, \fB\-\-separator\fR[=\fICHAR\fR] -separate columns by a single character, default for CHAR -is the <TAB> character without \fB\-w\fR and 'no char' with \fB\-w\fR -\fB\-s[CHAR]\fR turns off line truncation of all 3 column -options (\fB\-COLUMN\fR|\-a \fB\-COLUMN\fR|\-m) except \fB\-w\fR is set -.TP -\fB\-S[STRING]\fR, \fB\-\-sep\-string\fR[=\fISTRING\fR] -separate columns by STRING, -without \fB\-S\fR: Default separator <TAB> with \fB\-J\fR and <space> -otherwise (same as \fB\-S\fR" "), no effect on column options -.TP -\fB\-t\fR, \fB\-\-omit\-header\fR -omit page headers and trailers -.TP -\fB\-T\fR, \fB\-\-omit\-pagination\fR -omit page headers and trailers, eliminate any pagination -by form feeds set in input files -.TP -\fB\-v\fR, \fB\-\-show\-nonprinting\fR -use octal backslash notation -.TP -\fB\-w\fR, \fB\-\-width\fR=\fIPAGE_WIDTH\fR -set page width to PAGE_WIDTH (72) characters for -multiple text\-column output only, \fB\-s[char]\fR turns off (72) -.TP -\fB\-W\fR, \fB\-\-page\-width\fR=\fIPAGE_WIDTH\fR -set page width to PAGE_WIDTH (72) characters always, -truncate lines, except \fB\-J\fR option is set, no interference -with \fB\-S\fR or \fB\-s\fR -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -\fB\-t\fR is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is \-, read -standard input. -.SH AUTHOR -Written by Pete TerMaat and Roland Huebner. -.SH "REPORTING BUGS" -Report pr bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report pr translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B pr -is maintained as a Texinfo manual. If the -.B info -and -.B pr -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqpr invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/printenv.1 b/man/printenv.1 deleted file mode 100644 index f89f403d..00000000 --- a/man/printenv.1 +++ /dev/null @@ -1,53 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH PRINTENV "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -printenv \- print all or part of environment -.SH SYNOPSIS -.B printenv -[\fIOPTION\fR]... [\fIVARIABLE\fR]... -.SH DESCRIPTION -.\" Add any additional description here -.PP -Print the values of the specified environment VARIABLE(s). -If no VARIABLE is specified, print name and value pairs for them all. -.TP -\fB\-0\fR, \fB\-\-null\fR -end each output line with 0 byte rather than newline -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -NOTE: your shell may have its own version of printenv, which usually supersedes -the version described here. Please refer to your shell's documentation -for details about the options it supports. -.SH AUTHOR -Written by David MacKenzie and Richard Mlynarik. -.SH "REPORTING BUGS" -Report printenv bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report printenv translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B printenv -is maintained as a Texinfo manual. If the -.B info -and -.B printenv -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqprintenv invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/printf.1 b/man/printf.1 deleted file mode 100644 index ae0f0fdf..00000000 --- a/man/printf.1 +++ /dev/null @@ -1,111 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH PRINTF "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -printf \- format and print data -.SH SYNOPSIS -.B printf -\fIFORMAT \fR[\fIARGUMENT\fR]... -.br -.B printf -\fIOPTION\fR -.SH DESCRIPTION -.\" Add any additional description here -.PP -Print ARGUMENT(s) according to FORMAT, or execute according to OPTION: -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -FORMAT controls the output as in C printf. Interpreted sequences are: -.TP -\e" -double quote -.TP -\e\e -backslash -.TP -\ea -alert (BEL) -.TP -\eb -backspace -.TP -\ec -produce no further output -.TP -\ee -escape -.TP -\ef -form feed -.TP -\en -new line -.TP -\er -carriage return -.TP -\et -horizontal tab -.TP -\ev -vertical tab -.TP -\eNNN -byte with octal value NNN (1 to 3 digits) -.TP -\exHH -byte with hexadecimal value HH (1 to 2 digits) -.TP -\euHHHH -Unicode (ISO/IEC 10646) character with hex value HHHH (4 digits) -.TP -\eUHHHHHHHH -Unicode character with hex value HHHHHHHH (8 digits) -.TP -%% -a single % -.TP -%b -ARGUMENT as a string with '\e' escapes interpreted, -except that octal escapes are of the form \e0 or \e0NNN -.PP -and all C format specifications ending with one of diouxXfeEgGcs, with -ARGUMENTs converted to proper type first. Variable widths are handled. -.PP -NOTE: your shell may have its own version of printf, which usually supersedes -the version described here. Please refer to your shell's documentation -for details about the options it supports. -.SH AUTHOR -Written by David MacKenzie. -.SH "REPORTING BUGS" -Report printf bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report printf translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -printf(3) -.PP -The full documentation for -.B printf -is maintained as a Texinfo manual. If the -.B info -and -.B printf -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqprintf invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/ptx.1 b/man/ptx.1 deleted file mode 100644 index d6a1198d..00000000 --- a/man/ptx.1 +++ /dev/null @@ -1,102 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH PTX "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -ptx \- produce a permuted index of file contents -.SH SYNOPSIS -.B ptx -[\fIOPTION\fR]... [\fIINPUT\fR]... \fI(without -G)\fR -.br -.B ptx -\fI-G \fR[\fIOPTION\fR]... [\fIINPUT \fR[\fIOUTPUT\fR]] -.SH DESCRIPTION -.\" Add any additional description here -.PP -Output a permuted index, including context, of the words in the input files. -.PP -Mandatory arguments to long options are mandatory for short options too. -.TP -\fB\-A\fR, \fB\-\-auto\-reference\fR -output automatically generated references -.TP -\fB\-G\fR, \fB\-\-traditional\fR -behave more like System V 'ptx' -.TP -\fB\-F\fR, \fB\-\-flag\-truncation\fR=\fISTRING\fR -use STRING for flagging line truncations -.TP -\fB\-M\fR, \fB\-\-macro\-name\fR=\fISTRING\fR -macro name to use instead of 'xx' -.TP -\fB\-O\fR, \fB\-\-format\fR=\fIroff\fR -generate output as roff directives -.TP -\fB\-R\fR, \fB\-\-right\-side\-refs\fR -put references at right, not counted in \fB\-w\fR -.TP -\fB\-S\fR, \fB\-\-sentence\-regexp\fR=\fIREGEXP\fR -for end of lines or end of sentences -.TP -\fB\-T\fR, \fB\-\-format\fR=\fItex\fR -generate output as TeX directives -.TP -\fB\-W\fR, \fB\-\-word\-regexp\fR=\fIREGEXP\fR -use REGEXP to match each keyword -.TP -\fB\-b\fR, \fB\-\-break\-file\fR=\fIFILE\fR -word break characters in this FILE -.TP -\fB\-f\fR, \fB\-\-ignore\-case\fR -fold lower case to upper case for sorting -.TP -\fB\-g\fR, \fB\-\-gap\-size\fR=\fINUMBER\fR -gap size in columns between output fields -.TP -\fB\-i\fR, \fB\-\-ignore\-file\fR=\fIFILE\fR -read ignore word list from FILE -.TP -\fB\-o\fR, \fB\-\-only\-file\fR=\fIFILE\fR -read only word list from this FILE -.TP -\fB\-r\fR, \fB\-\-references\fR -first field of each line is a reference -.HP -\fB\-t\fR, \fB\-\-typeset\-mode\fR \- not implemented \- -.TP -\fB\-w\fR, \fB\-\-width\fR=\fINUMBER\fR -output width in columns, reference excluded -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -With no FILE or if FILE is \-, read Standard Input. '\-F /' by default. -.SH AUTHOR -Written by F. Pinard. -.SH "REPORTING BUGS" -Report ptx bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report ptx translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B ptx -is maintained as a Texinfo manual. If the -.B info -and -.B ptx -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqptx invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/pwd.1 b/man/pwd.1 deleted file mode 100644 index f413c375..00000000 --- a/man/pwd.1 +++ /dev/null @@ -1,57 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH PWD "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -pwd \- print name of current/working directory -.SH SYNOPSIS -.B pwd -[\fIOPTION\fR]... -.SH DESCRIPTION -.\" Add any additional description here -.PP -Print the full filename of the current working directory. -.TP -\fB\-L\fR, \fB\-\-logical\fR -use PWD from environment, even if it contains symlinks -.TP -\fB\-P\fR, \fB\-\-physical\fR -avoid all symlinks -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -NOTE: your shell may have its own version of pwd, which usually supersedes -the version described here. Please refer to your shell's documentation -for details about the options it supports. -.SH AUTHOR -Written by Jim Meyering. -.SH "REPORTING BUGS" -Report pwd bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report pwd translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -getcwd(3) -.PP -The full documentation for -.B pwd -is maintained as a Texinfo manual. If the -.B info -and -.B pwd -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqpwd invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/readlink.1 b/man/readlink.1 deleted file mode 100644 index de50c91b..00000000 --- a/man/readlink.1 +++ /dev/null @@ -1,73 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH READLINK "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -readlink \- print value of a symbolic link or canonical file name -.SH SYNOPSIS -.B readlink -[\fIOPTION\fR]... \fIFILE\fR -.SH DESCRIPTION -.\" Add any additional description here -.PP -Print value of a symbolic link or canonical file name -.TP -\fB\-f\fR, \fB\-\-canonicalize\fR -canonicalize by following every symlink in -every component of the given name recursively; -all but the last component must exist -.TP -\fB\-e\fR, \fB\-\-canonicalize\-existing\fR -canonicalize by following every symlink in -every component of the given name recursively, -all components must exist -.TP -\fB\-m\fR, \fB\-\-canonicalize\-missing\fR -canonicalize by following every symlink in -every component of the given name recursively, -without requirements on components existence -.TP -\fB\-n\fR, \fB\-\-no\-newline\fR -do not output the trailing newline -.HP -\fB\-q\fR, \fB\-\-quiet\fR, -.TP -\fB\-s\fR, \fB\-\-silent\fR -suppress most error messages -.TP -\fB\-v\fR, \fB\-\-verbose\fR -report error messages -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.SH AUTHOR -Written by Dmitry V. Levin. -.SH "REPORTING BUGS" -Report readlink bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report readlink translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -readlink(2) -.PP -The full documentation for -.B readlink -is maintained as a Texinfo manual. If the -.B info -and -.B readlink -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqreadlink invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/readlink.x b/man/readlink.x index 79ba7585..6b28bca4 100644 --- a/man/readlink.x +++ b/man/readlink.x @@ -1,6 +1,6 @@ [NAME] -readlink \- print value of a symbolic link or canonical file name +readlink \- print resolved symbolic links or canonical file names [DESCRIPTION] .\" Add any additional description here [SEE ALSO] -readlink(2) +readlink(2), realpath(1), realpath(3) diff --git a/man/realpath.1 b/man/realpath.1 deleted file mode 100644 index 6d4580e9..00000000 --- a/man/realpath.1 +++ /dev/null @@ -1,75 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH REALPATH "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -realpath \- print the resolved path -.SH SYNOPSIS -.B realpath -[\fIOPTION\fR]... \fIFILE\fR... -.SH DESCRIPTION -.\" Add any additional description here -.PP -Print the resolved absolute file name; -all but the last component must exist -.TP -\fB\-e\fR, \fB\-\-canonicalize\-existing\fR -all components of the path must exist -.TP -\fB\-m\fR, \fB\-\-canonicalize\-missing\fR -no components of the path need exist -.TP -\fB\-L\fR, \fB\-\-logical\fR -resolve '..' components before symlinks -.TP -\fB\-P\fR, \fB\-\-physical\fR -resolve symlinks as encountered (default) -.TP -\fB\-q\fR, \fB\-\-quiet\fR -suppress most error messages -.TP -\fB\-\-relative\-to\fR=\fIFILE\fR -print the resolved path relative to FILE -.TP -\fB\-\-relative\-base\fR=\fIFILE\fR -print absolute paths unless paths below FILE -.TP -\fB\-s\fR, \fB\-\-strip\fR, \fB\-\-no\-symlinks\fR -don't expand symlinks -.TP -\fB\-z\fR, \fB\-\-zero\fR -separate output with NUL rather than newline -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.SH AUTHOR -Written by Padraig Brady. -.SH "REPORTING BUGS" -Report realpath bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report realpath translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -readlink(1), readlink(2), realpath(3) -.PP -The full documentation for -.B realpath -is maintained as a Texinfo manual. If the -.B info -and -.B realpath -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqrealpath invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/rm.1 b/man/rm.1 deleted file mode 100644 index 32cc454d..00000000 --- a/man/rm.1 +++ /dev/null @@ -1,114 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH RM "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -rm \- remove files or directories -.SH SYNOPSIS -.B rm -[\fIOPTION\fR]... \fIFILE\fR... -.SH DESCRIPTION -This manual page -documents the GNU version of -.BR rm . -.B rm -removes each specified file. By default, it does not remove -directories. -.P -If the \fI\-I\fR or \fI\-\-interactive\=once\fR option is given, -and there are more than three files or the \fI\-r\fR, \fI\-R\fR, -or \fI\-\-recursive\fR are given, then -.B rm -prompts the user for whether to proceed with the entire operation. If -the response is not affirmative, the entire command is aborted. -.P -Otherwise, if a file is unwritable, standard input is a terminal, and -the \fI\-f\fR or \fI\-\-force\fR option is not given, or the -\fI\-i\fR or \fI\-\-interactive\=always\fR option is given, -.B rm -prompts the user for whether to remove the file. If the response is -not affirmative, the file is skipped. -.SH OPTIONS -.PP -Remove (unlink) the FILE(s). -.TP -\fB\-f\fR, \fB\-\-force\fR -ignore nonexistent files and arguments, never prompt -.TP -\fB\-i\fR -prompt before every removal -.TP -\fB\-I\fR -prompt once before removing more than three files, or -when removing recursively. Less intrusive than \fB\-i\fR, -while still giving protection against most mistakes -.TP -\fB\-\-interactive\fR[=\fIWHEN\fR] -prompt according to WHEN: never, once (\fB\-I\fR), or -always (\fB\-i\fR). Without WHEN, prompt always -.TP -\fB\-\-one\-file\-system\fR -when removing a hierarchy recursively, skip any -directory that is on a file system different from -that of the corresponding command line argument -.TP -\fB\-\-no\-preserve\-root\fR -do not treat '/' specially -.TP -\fB\-\-preserve\-root\fR -do not remove '/' (default) -.TP -\fB\-r\fR, \fB\-R\fR, \fB\-\-recursive\fR -remove directories and their contents recursively -.TP -\fB\-v\fR, \fB\-\-verbose\fR -explain what is being done -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -By default, rm does not remove directories. Use the \fB\-\-recursive\fR (\fB\-r\fR or \fB\-R\fR) -option to remove each listed directory, too, along with all of its contents. -.PP -To remove a file whose name starts with a '\-', for example '\-foo', -use one of these commands: -.IP -rm \fB\-\-\fR \fB\-foo\fR -.IP -rm ./\-foo -.PP -Note that if you use rm to remove a file, it might be possible to recover -some of its contents, given sufficient expertise and/or time. For greater -assurance that the contents are truly unrecoverable, consider using shred. -.SH AUTHOR -Written by Paul Rubin, David MacKenzie, Richard M. Stallman, -and Jim Meyering. -.SH "REPORTING BUGS" -Report rm bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report rm translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -unlink(1), unlink(2), chattr(1), shred(1) -.PP -The full documentation for -.B rm -is maintained as a Texinfo manual. If the -.B info -and -.B rm -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqrm invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/rm.x b/man/rm.x index d9341d7d..3eeb6c8d 100644 --- a/man/rm.x +++ b/man/rm.x @@ -1,4 +1,4 @@ -'\" Copyright (C) 1998-2012 Free Software Foundation, Inc. +'\" Copyright (C) 1998-2013 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/rmdir.1 b/man/rmdir.1 deleted file mode 100644 index 8d937e2b..00000000 --- a/man/rmdir.1 +++ /dev/null @@ -1,60 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH RMDIR "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -rmdir \- remove empty directories -.SH SYNOPSIS -.B rmdir -[\fIOPTION\fR]... \fIDIRECTORY\fR... -.SH DESCRIPTION -.\" Add any additional description here -.PP -Remove the DIRECTORY(ies), if they are empty. -.HP -\fB\-\-ignore\-fail\-on\-non\-empty\fR -.IP -ignore each failure that is solely because a directory -.IP -is non\-empty -.TP -\fB\-p\fR, \fB\-\-parents\fR -remove DIRECTORY and its ancestors; e.g., 'rmdir \fB\-p\fR a/b/c' is -similar to 'rmdir a/b/c a/b a' -.TP -\fB\-v\fR, \fB\-\-verbose\fR -output a diagnostic for every directory processed -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.SH AUTHOR -Written by David MacKenzie. -.SH "REPORTING BUGS" -Report rmdir bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report rmdir translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -rmdir(2) -.PP -The full documentation for -.B rmdir -is maintained as a Texinfo manual. If the -.B info -and -.B rmdir -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqrmdir invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/runcon.1 b/man/runcon.1 deleted file mode 100644 index b6203e09..00000000 --- a/man/runcon.1 +++ /dev/null @@ -1,77 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH RUNCON "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -runcon \- run command with specified security context -.SH SYNOPSIS -.B runcon -\fICONTEXT COMMAND \fR[\fIargs\fR] -.br -.B runcon -[ \fI-c \fR] [\fI-u USER\fR] [\fI-r ROLE\fR] [\fI-t TYPE\fR] [\fI-l RANGE\fR] \fICOMMAND \fR[\fIargs\fR] -.SH DESCRIPTION -Run COMMAND with completely-specified CONTEXT, or with current or -transitioned security context modified by one or more of LEVEL, -ROLE, TYPE, and USER. -.PP -If none of \fI-c\fR, \fI-t\fR, \fI-u\fR, \fI-r\fR, or \fI-l\fR, is specified, -the first argument is used as the complete context. Any additional -arguments after \fICOMMAND\fR are interpreted as arguments to the -command. -.PP -Note that only carefully-chosen contexts are likely to successfully -run. -.PP -Run a program in a different security context. -With neither CONTEXT nor COMMAND, print the current security context. -.TP -CONTEXT -Complete security context -.TP -\fB\-c\fR, \fB\-\-compute\fR -compute process transition context before modifying -.TP -\fB\-t\fR, \fB\-\-type\fR=\fITYPE\fR -type (for same role as parent) -.TP -\fB\-u\fR, \fB\-\-user\fR=\fIUSER\fR -user identity -.TP -\fB\-r\fR, \fB\-\-role\fR=\fIROLE\fR -role -.TP -\fB\-l\fR, \fB\-\-range\fR=\fIRANGE\fR -levelrange -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.SH AUTHOR -Written by Russell Coker. -.SH "REPORTING BUGS" -Report runcon bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report runcon translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B runcon -is maintained as a Texinfo manual. If the -.B info -and -.B runcon -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqruncon invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/seq.1 b/man/seq.1 deleted file mode 100644 index 4ec6caf9..00000000 --- a/man/seq.1 +++ /dev/null @@ -1,69 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH SEQ "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -seq \- print a sequence of numbers -.SH SYNOPSIS -.B seq -[\fIOPTION\fR]... \fILAST\fR -.br -.B seq -[\fIOPTION\fR]... \fIFIRST LAST\fR -.br -.B seq -[\fIOPTION\fR]... \fIFIRST INCREMENT LAST\fR -.SH DESCRIPTION -.\" Add any additional description here -.PP -Print numbers from FIRST to LAST, in steps of INCREMENT. -.TP -\fB\-f\fR, \fB\-\-format\fR=\fIFORMAT\fR -use printf style floating\-point FORMAT -.TP -\fB\-s\fR, \fB\-\-separator\fR=\fISTRING\fR -use STRING to separate numbers (default: \en) -.TP -\fB\-w\fR, \fB\-\-equal\-width\fR -equalize width by padding with leading zeroes -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -If FIRST or INCREMENT is omitted, it defaults to 1. That is, an -omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST. -FIRST, INCREMENT, and LAST are interpreted as floating point values. -INCREMENT is usually positive if FIRST is smaller than LAST, and -INCREMENT is usually negative if FIRST is greater than LAST. -FORMAT must be suitable for printing one argument of type 'double'; -it defaults to %.PRECf if FIRST, INCREMENT, and LAST are all fixed point -decimal numbers with maximum precision PREC, and to %g otherwise. -.SH AUTHOR -Written by Ulrich Drepper. -.SH "REPORTING BUGS" -Report seq bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report seq translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B seq -is maintained as a Texinfo manual. If the -.B info -and -.B seq -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqseq invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/sha1sum.1 b/man/sha1sum.1 deleted file mode 100644 index e8473e12..00000000 --- a/man/sha1sum.1 +++ /dev/null @@ -1,73 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH SHA1SUM "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -sha1sum \- compute and check SHA1 message digest -.SH SYNOPSIS -.B sha1sum -[\fIOPTION\fR]... [\fIFILE\fR]... -.SH DESCRIPTION -.\" Add any additional description here -.PP -Print or check SHA1 (160\-bit) checksums. -With no FILE, or when FILE is \-, read standard input. -.TP -\fB\-b\fR, \fB\-\-binary\fR -read in binary mode -.TP -\fB\-c\fR, \fB\-\-check\fR -read SHA1 sums from the FILEs and check them -.TP -\fB\-t\fR, \fB\-\-text\fR -read in text mode (default) -.SS "The following three options are useful only when verifying checksums:" -.TP -\fB\-\-quiet\fR -don't print OK for each successfully verified file -.TP -\fB\-\-status\fR -don't output anything, status code shows success -.TP -\fB\-w\fR, \fB\-\-warn\fR -warn about improperly formatted checksum lines -.TP -\fB\-\-strict\fR -with \fB\-\-check\fR, exit non\-zero for any invalid input -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -The sums are computed as described in FIPS\-180\-1. When checking, the input -should be a former output of this program. The default mode is to print -a line with checksum, a character indicating input mode ('*' for binary, -space for text), and name for each FILE. -.SH AUTHOR -Written by Ulrich Drepper, Scott Miller, and David Madore. -.SH "REPORTING BUGS" -Report sha1sum bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report sha1sum translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B sha1sum -is maintained as a Texinfo manual. If the -.B info -and -.B sha1sum -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqsha1sum invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/sha224sum.1 b/man/sha224sum.1 deleted file mode 100644 index 62a63241..00000000 --- a/man/sha224sum.1 +++ /dev/null @@ -1,73 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH SHA224SUM "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -sha224sum \- compute and check SHA224 message digest -.SH SYNOPSIS -.B sha224sum -[\fIOPTION\fR]... [\fIFILE\fR]... -.SH DESCRIPTION -.\" Add any additional description here -.PP -Print or check SHA224 (224\-bit) checksums. -With no FILE, or when FILE is \-, read standard input. -.TP -\fB\-b\fR, \fB\-\-binary\fR -read in binary mode -.TP -\fB\-c\fR, \fB\-\-check\fR -read SHA224 sums from the FILEs and check them -.TP -\fB\-t\fR, \fB\-\-text\fR -read in text mode (default) -.SS "The following three options are useful only when verifying checksums:" -.TP -\fB\-\-quiet\fR -don't print OK for each successfully verified file -.TP -\fB\-\-status\fR -don't output anything, status code shows success -.TP -\fB\-w\fR, \fB\-\-warn\fR -warn about improperly formatted checksum lines -.TP -\fB\-\-strict\fR -with \fB\-\-check\fR, exit non\-zero for any invalid input -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -The sums are computed as described in RFC 3874. When checking, the input -should be a former output of this program. The default mode is to print -a line with checksum, a character indicating input mode ('*' for binary, -space for text), and name for each FILE. -.SH AUTHOR -Written by Ulrich Drepper, Scott Miller, and David Madore. -.SH "REPORTING BUGS" -Report sha224sum bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report sha224sum translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B sha224sum -is maintained as a Texinfo manual. If the -.B info -and -.B sha224sum -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqsha224sum invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/sha256sum.1 b/man/sha256sum.1 deleted file mode 100644 index 1c34eb12..00000000 --- a/man/sha256sum.1 +++ /dev/null @@ -1,73 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH SHA256SUM "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -sha256sum \- compute and check SHA256 message digest -.SH SYNOPSIS -.B sha256sum -[\fIOPTION\fR]... [\fIFILE\fR]... -.SH DESCRIPTION -.\" Add any additional description here -.PP -Print or check SHA256 (256\-bit) checksums. -With no FILE, or when FILE is \-, read standard input. -.TP -\fB\-b\fR, \fB\-\-binary\fR -read in binary mode -.TP -\fB\-c\fR, \fB\-\-check\fR -read SHA256 sums from the FILEs and check them -.TP -\fB\-t\fR, \fB\-\-text\fR -read in text mode (default) -.SS "The following three options are useful only when verifying checksums:" -.TP -\fB\-\-quiet\fR -don't print OK for each successfully verified file -.TP -\fB\-\-status\fR -don't output anything, status code shows success -.TP -\fB\-w\fR, \fB\-\-warn\fR -warn about improperly formatted checksum lines -.TP -\fB\-\-strict\fR -with \fB\-\-check\fR, exit non\-zero for any invalid input -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -The sums are computed as described in FIPS\-180\-2. When checking, the input -should be a former output of this program. The default mode is to print -a line with checksum, a character indicating input mode ('*' for binary, -space for text), and name for each FILE. -.SH AUTHOR -Written by Ulrich Drepper, Scott Miller, and David Madore. -.SH "REPORTING BUGS" -Report sha256sum bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report sha256sum translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B sha256sum -is maintained as a Texinfo manual. If the -.B info -and -.B sha256sum -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqsha256sum invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/sha384sum.1 b/man/sha384sum.1 deleted file mode 100644 index c20dde7f..00000000 --- a/man/sha384sum.1 +++ /dev/null @@ -1,73 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH SHA384SUM "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -sha384sum \- compute and check SHA384 message digest -.SH SYNOPSIS -.B sha384sum -[\fIOPTION\fR]... [\fIFILE\fR]... -.SH DESCRIPTION -.\" Add any additional description here -.PP -Print or check SHA384 (384\-bit) checksums. -With no FILE, or when FILE is \-, read standard input. -.TP -\fB\-b\fR, \fB\-\-binary\fR -read in binary mode -.TP -\fB\-c\fR, \fB\-\-check\fR -read SHA384 sums from the FILEs and check them -.TP -\fB\-t\fR, \fB\-\-text\fR -read in text mode (default) -.SS "The following three options are useful only when verifying checksums:" -.TP -\fB\-\-quiet\fR -don't print OK for each successfully verified file -.TP -\fB\-\-status\fR -don't output anything, status code shows success -.TP -\fB\-w\fR, \fB\-\-warn\fR -warn about improperly formatted checksum lines -.TP -\fB\-\-strict\fR -with \fB\-\-check\fR, exit non\-zero for any invalid input -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -The sums are computed as described in FIPS\-180\-2. When checking, the input -should be a former output of this program. The default mode is to print -a line with checksum, a character indicating input mode ('*' for binary, -space for text), and name for each FILE. -.SH AUTHOR -Written by Ulrich Drepper, Scott Miller, and David Madore. -.SH "REPORTING BUGS" -Report sha384sum bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report sha384sum translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B sha384sum -is maintained as a Texinfo manual. If the -.B info -and -.B sha384sum -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqsha384sum invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/sha512sum.1 b/man/sha512sum.1 deleted file mode 100644 index 7819b385..00000000 --- a/man/sha512sum.1 +++ /dev/null @@ -1,73 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH SHA512SUM "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -sha512sum \- compute and check SHA512 message digest -.SH SYNOPSIS -.B sha512sum -[\fIOPTION\fR]... [\fIFILE\fR]... -.SH DESCRIPTION -.\" Add any additional description here -.PP -Print or check SHA512 (512\-bit) checksums. -With no FILE, or when FILE is \-, read standard input. -.TP -\fB\-b\fR, \fB\-\-binary\fR -read in binary mode -.TP -\fB\-c\fR, \fB\-\-check\fR -read SHA512 sums from the FILEs and check them -.TP -\fB\-t\fR, \fB\-\-text\fR -read in text mode (default) -.SS "The following three options are useful only when verifying checksums:" -.TP -\fB\-\-quiet\fR -don't print OK for each successfully verified file -.TP -\fB\-\-status\fR -don't output anything, status code shows success -.TP -\fB\-w\fR, \fB\-\-warn\fR -warn about improperly formatted checksum lines -.TP -\fB\-\-strict\fR -with \fB\-\-check\fR, exit non\-zero for any invalid input -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -The sums are computed as described in FIPS\-180\-2. When checking, the input -should be a former output of this program. The default mode is to print -a line with checksum, a character indicating input mode ('*' for binary, -space for text), and name for each FILE. -.SH AUTHOR -Written by Ulrich Drepper, Scott Miller, and David Madore. -.SH "REPORTING BUGS" -Report sha512sum bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report sha512sum translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B sha512sum -is maintained as a Texinfo manual. If the -.B info -and -.B sha512sum -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqsha512sum invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/shred.1 b/man/shred.1 deleted file mode 100644 index 2f622469..00000000 --- a/man/shred.1 +++ /dev/null @@ -1,112 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH SHRED "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -shred \- overwrite a file to hide its contents, and optionally delete it -.SH SYNOPSIS -.B shred -[\fIOPTION\fR]... \fIFILE\fR... -.SH DESCRIPTION -.\" Add any additional description here -.PP -Overwrite the specified FILE(s) repeatedly, in order to make it harder -for even very expensive hardware probing to recover the data. -.PP -Mandatory arguments to long options are mandatory for short options too. -.TP -\fB\-f\fR, \fB\-\-force\fR -change permissions to allow writing if necessary -.TP -\fB\-n\fR, \fB\-\-iterations\fR=\fIN\fR -overwrite N times instead of the default (3) -.TP -\fB\-\-random\-source\fR=\fIFILE\fR -get random bytes from FILE -.TP -\fB\-s\fR, \fB\-\-size\fR=\fIN\fR -shred this many bytes (suffixes like K, M, G accepted) -.TP -\fB\-u\fR, \fB\-\-remove\fR -truncate and remove file after overwriting -.TP -\fB\-v\fR, \fB\-\-verbose\fR -show progress -.TP -\fB\-x\fR, \fB\-\-exact\fR -do not round file sizes up to the next full block; -.IP -this is the default for non\-regular files -.TP -\fB\-z\fR, \fB\-\-zero\fR -add a final overwrite with zeros to hide shredding -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -If FILE is \-, shred standard output. -.PP -Delete FILE(s) if \fB\-\-remove\fR (\fB\-u\fR) is specified. The default is not to remove -the files because it is common to operate on device files like /dev/hda, -and those files usually should not be removed. When operating on regular -files, most people use the \fB\-\-remove\fR option. -.PP -CAUTION: 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. The following are examples of file systems on which shred is -not effective, or is not guaranteed to be effective in all file system modes: -.PP -* log\-structured or journaled file systems, such as those supplied with -AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.) -.PP -* file systems that write redundant data and carry on even if some writes -fail, such as RAID\-based file systems -.PP -* file systems that make snapshots, such as Network Appliance's NFS server -.PP -* file systems that cache in temporary locations, such as NFS -version 3 clients -.PP -* compressed file systems -.PP -In the 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). -.PP -In addition, 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. -.SH AUTHOR -Written by Colin Plumb. -.SH "REPORTING BUGS" -Report shred bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report shred translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B shred -is maintained as a Texinfo manual. If the -.B info -and -.B shred -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqshred invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/shuf.1 b/man/shuf.1 deleted file mode 100644 index 4fa1a1a0..00000000 --- a/man/shuf.1 +++ /dev/null @@ -1,73 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH SHUF "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -shuf \- generate random permutations -.SH SYNOPSIS -.B shuf -[\fIOPTION\fR]... [\fIFILE\fR] -.br -.B shuf -\fI-e \fR[\fIOPTION\fR]... [\fIARG\fR]... -.br -.B shuf -\fI-i LO-HI \fR[\fIOPTION\fR]... -.SH DESCRIPTION -.\" Add any additional description here -.PP -Write a random permutation of the input lines to standard output. -.PP -Mandatory arguments to long options are mandatory for short options too. -.TP -\fB\-e\fR, \fB\-\-echo\fR -treat each ARG as an input line -.TP -\fB\-i\fR, \fB\-\-input\-range\fR=\fILO\-HI\fR -treat each number LO through HI as an input line -.TP -\fB\-n\fR, \fB\-\-head\-count\fR=\fICOUNT\fR -output at most COUNT lines -.TP -\fB\-o\fR, \fB\-\-output\fR=\fIFILE\fR -write result to FILE instead of standard output -.TP -\fB\-\-random\-source\fR=\fIFILE\fR -get random bytes from FILE -.TP -\fB\-z\fR, \fB\-\-zero\-terminated\fR -end lines with 0 byte, not newline -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -With no FILE, or when FILE is \-, read standard input. -.SH AUTHOR -Written by Paul Eggert. -.SH "REPORTING BUGS" -Report shuf bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report shuf translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B shuf -is maintained as a Texinfo manual. If the -.B info -and -.B shuf -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqshuf invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/sleep.1 b/man/sleep.1 deleted file mode 100644 index 163284a3..00000000 --- a/man/sleep.1 +++ /dev/null @@ -1,54 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH SLEEP "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -sleep \- delay for a specified amount of time -.SH SYNOPSIS -.B sleep -\fINUMBER\fR[\fISUFFIX\fR]... -.br -.B sleep -\fIOPTION\fR -.SH DESCRIPTION -.\" Add any additional description here -.PP -Pause for NUMBER seconds. SUFFIX may be 's' for seconds (the default), -\&'m' for minutes, 'h' for hours or 'd' for days. Unlike most implementations -that require NUMBER be an integer, here NUMBER may be an arbitrary floating -point number. Given two or more arguments, pause for the amount of time -specified by the sum of their values. -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.SH AUTHOR -Written by Jim Meyering and Paul Eggert. -.SH "REPORTING BUGS" -Report sleep bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report sleep translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -sleep(3) -.PP -The full documentation for -.B sleep -is maintained as a Texinfo manual. If the -.B info -and -.B sleep -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqsleep invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/sort.1 b/man/sort.1 deleted file mode 100644 index e49efb51..00000000 --- a/man/sort.1 +++ /dev/null @@ -1,167 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH SORT "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -sort \- sort lines of text files -.SH SYNOPSIS -.B sort -[\fIOPTION\fR]... [\fIFILE\fR]... -.br -.B sort -[\fIOPTION\fR]... \fI--files0-from=F\fR -.SH DESCRIPTION -.\" Add any additional description here -.PP -Write sorted concatenation of all FILE(s) to standard output. -.PP -Mandatory arguments to long options are mandatory for short options too. -Ordering options: -.TP -\fB\-b\fR, \fB\-\-ignore\-leading\-blanks\fR -ignore leading blanks -.TP -\fB\-d\fR, \fB\-\-dictionary\-order\fR -consider only blanks and alphanumeric characters -.TP -\fB\-f\fR, \fB\-\-ignore\-case\fR -fold lower case to upper case characters -.TP -\fB\-g\fR, \fB\-\-general\-numeric\-sort\fR -compare according to general numerical value -.TP -\fB\-i\fR, \fB\-\-ignore\-nonprinting\fR -consider only printable characters -.TP -\fB\-M\fR, \fB\-\-month\-sort\fR -compare (unknown) < 'JAN' < ... < 'DEC' -.TP -\fB\-h\fR, \fB\-\-human\-numeric\-sort\fR -compare human readable numbers (e.g., 2K 1G) -.TP -\fB\-n\fR, \fB\-\-numeric\-sort\fR -compare according to string numerical value -.TP -\fB\-R\fR, \fB\-\-random\-sort\fR -sort by random hash of keys -.TP -\fB\-\-random\-source\fR=\fIFILE\fR -get random bytes from FILE -.TP -\fB\-r\fR, \fB\-\-reverse\fR -reverse the result of comparisons -.TP -\fB\-\-sort\fR=\fIWORD\fR -sort according to WORD: -general\-numeric \fB\-g\fR, human\-numeric \fB\-h\fR, month \fB\-M\fR, -numeric \fB\-n\fR, random \fB\-R\fR, version \fB\-V\fR -.TP -\fB\-V\fR, \fB\-\-version\-sort\fR -natural sort of (version) numbers within text -.PP -Other options: -.TP -\fB\-\-batch\-size\fR=\fINMERGE\fR -merge at most NMERGE inputs at once; -for more use temp files -.TP -\fB\-c\fR, \fB\-\-check\fR, \fB\-\-check\fR=\fIdiagnose\-first\fR -check for sorted input; do not sort -.TP -\fB\-C\fR, \fB\-\-check\fR=\fIquiet\fR, \fB\-\-check\fR=\fIsilent\fR -like \fB\-c\fR, but do not report first bad line -.TP -\fB\-\-compress\-program\fR=\fIPROG\fR -compress temporaries with PROG; -decompress them with PROG \fB\-d\fR -.TP -\fB\-\-debug\fR -annotate the part of the line used to sort, -and warn about questionable usage to stderr -.TP -\fB\-\-files0\-from\fR=\fIF\fR -read input from the files specified by -NUL\-terminated names in file F; -If F is \- then read names from standard input -.TP -\fB\-k\fR, \fB\-\-key\fR=\fIKEYDEF\fR -sort via a key; KEYDEF gives location and type -.TP -\fB\-m\fR, \fB\-\-merge\fR -merge already sorted files; do not sort -.TP -\fB\-o\fR, \fB\-\-output\fR=\fIFILE\fR -write result to FILE instead of standard output -.TP -\fB\-s\fR, \fB\-\-stable\fR -stabilize sort by disabling last\-resort comparison -.TP -\fB\-S\fR, \fB\-\-buffer\-size\fR=\fISIZE\fR -use SIZE for main memory buffer -.TP -\fB\-t\fR, \fB\-\-field\-separator\fR=\fISEP\fR -use SEP instead of non\-blank to blank transition -.TP -\fB\-T\fR, \fB\-\-temporary\-directory\fR=\fIDIR\fR -use DIR for temporaries, not $TMPDIR or /tmp; -multiple options specify multiple directories -.TP -\fB\-\-parallel\fR=\fIN\fR -change the number of sorts run concurrently to N -.TP -\fB\-u\fR, \fB\-\-unique\fR -with \fB\-c\fR, check for strict ordering; -without \fB\-c\fR, output only the first of an equal run -.TP -\fB\-z\fR, \fB\-\-zero\-terminated\fR -end lines with 0 byte, not newline -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is a -field number and C a character position in the field; both are origin 1, and -the stop position defaults to the line's end. If neither \fB\-t\fR nor \fB\-b\fR is in -effect, characters in a field are counted from the beginning of the preceding -whitespace. OPTS is one or more single\-letter ordering options [bdfgiMhnRrV], -which override global ordering options for that key. If no key is given, use -the entire line as the key. -.PP -SIZE may be followed by the following multiplicative suffixes: -% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y. -.PP -With no FILE, or when FILE is \-, read standard input. -.PP -*** WARNING *** -The locale specified by the environment affects sort order. -Set LC_ALL=C to get the traditional sort order that uses -native byte values. -.SH AUTHOR -Written by Mike Haertel and Paul Eggert. -.SH "REPORTING BUGS" -Report sort bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report sort translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B sort -is maintained as a Texinfo manual. If the -.B info -and -.B sort -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqsort invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/sort.x b/man/sort.x index 5c171ddf..b0d4a1a3 100644 --- a/man/sort.x +++ b/man/sort.x @@ -2,3 +2,5 @@ sort \- sort lines of text files [DESCRIPTION] .\" Add any additional description here +[SEE ALSO] +uniq(1) diff --git a/man/split.1 b/man/split.1 deleted file mode 100644 index 5f4401f4..00000000 --- a/man/split.1 +++ /dev/null @@ -1,95 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH SPLIT "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -split \- split a file into pieces -.SH SYNOPSIS -.B split -[\fIOPTION\fR]... [\fIINPUT \fR[\fIPREFIX\fR]] -.SH DESCRIPTION -.\" Add any additional description here -.PP -Output fixed\-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default -size is 1000 lines, and default PREFIX is 'x'. With no INPUT, or when INPUT -is \-, read standard input. -.PP -Mandatory arguments to long options are mandatory for short options too. -.TP -\fB\-a\fR, \fB\-\-suffix\-length\fR=\fIN\fR -generate suffixes of length N (default 2) -.TP -\fB\-\-additional\-suffix\fR=\fISUFFIX\fR -append an additional SUFFIX to file names. -.TP -\fB\-b\fR, \fB\-\-bytes\fR=\fISIZE\fR -put SIZE bytes per output file -.TP -\fB\-C\fR, \fB\-\-line\-bytes\fR=\fISIZE\fR -put at most SIZE bytes of lines per output file -.TP -\fB\-d\fR, \fB\-\-numeric\-suffixes\fR[=\fIFROM\fR] -use numeric suffixes instead of alphabetic. -FROM changes the start value (default 0). -.TP -\fB\-e\fR, \fB\-\-elide\-empty\-files\fR -do not generate empty output files with '\-n' -.TP -\fB\-\-filter\fR=\fICOMMAND\fR -write to shell COMMAND; file name is $FILE -.TP -\fB\-l\fR, \fB\-\-lines\fR=\fINUMBER\fR -put NUMBER lines per output file -.TP -\fB\-n\fR, \fB\-\-number\fR=\fICHUNKS\fR -generate CHUNKS output files. See below -.TP -\fB\-u\fR, \fB\-\-unbuffered\fR -immediately copy input to output with '\-n r/...' -.TP -\fB\-\-verbose\fR -print a diagnostic just before each -output file is opened -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -SIZE is an integer and optional unit (example: 10M is 10*1024*1024). Units -are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of 1000). -.PP -CHUNKS may be: -N split into N files based on size of input -K/N output Kth of N to stdout -l/N split into N files without splitting lines -l/K/N output Kth of N to stdout without splitting lines -r/N like 'l' but use round robin distribution -r/K/N likewise but only output Kth of N to stdout -.SH AUTHOR -Written by Torbjorn Granlund and Richard M. Stallman. -.SH "REPORTING BUGS" -Report split bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report split translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B split -is maintained as a Texinfo manual. If the -.B info -and -.B split -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqsplit invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/stat.1 b/man/stat.1 deleted file mode 100644 index 95552b73..00000000 --- a/man/stat.1 +++ /dev/null @@ -1,199 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH STAT "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -stat \- display file or file system status -.SH SYNOPSIS -.B stat -[\fIOPTION\fR]... \fIFILE\fR... -.SH DESCRIPTION -.\" Add any additional description here -.PP -Display file or file system status. -.TP -\fB\-L\fR, \fB\-\-dereference\fR -follow links -.TP -\fB\-f\fR, \fB\-\-file\-system\fR -display file system status instead of file status -.TP -\fB\-c\fR \fB\-\-format\fR=\fIFORMAT\fR -use the specified FORMAT instead of the default; -output a newline after each use of FORMAT -.TP -\fB\-\-printf\fR=\fIFORMAT\fR -like \fB\-\-format\fR, but interpret backslash escapes, -and do not output a mandatory trailing newline. -If you want a newline, include \en in FORMAT -.TP -\fB\-t\fR, \fB\-\-terse\fR -print the information in terse form -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -The valid format sequences for files (without \fB\-\-file\-system\fR): -.TP -%a -access rights in octal -.TP -%A -access rights in human readable form -.TP -%b -number of blocks allocated (see %B) -.TP -%B -the size in bytes of each block reported by %b -.TP -%C -SELinux security context string -.TP -%d -device number in decimal -.TP -%D -device number in hex -.TP -%f -raw mode in hex -.TP -%F -file type -.TP -%g -group ID of owner -.TP -%G -group name of owner -.TP -%h -number of hard links -.TP -%i -inode number -.TP -%m -mount point -.TP -%n -file name -.TP -%N -quoted file name with dereference if symbolic link -.TP -%o -optimal I/O transfer size hint -.TP -%s -total size, in bytes -.TP -%t -major device type in hex -.TP -%T -minor device type in hex -.TP -%u -user ID of owner -.TP -%U -user name of owner -.TP -%w -time of file birth, human\-readable; \- if unknown -.TP -%W -time of file birth, seconds since Epoch; 0 if unknown -.TP -%x -time of last access, human\-readable -.TP -%X -time of last access, seconds since Epoch -.TP -%y -time of last modification, human\-readable -.TP -%Y -time of last modification, seconds since Epoch -.TP -%z -time of last change, human\-readable -.TP -%Z -time of last change, seconds since Epoch -.PP -Valid format sequences for file systems: -.TP -%a -free blocks available to non\-superuser -.TP -%b -total data blocks in file system -.TP -%c -total file nodes in file system -.TP -%d -free file nodes in file system -.TP -%f -free blocks in file system -.TP -%i -file system ID in hex -.TP -%l -maximum length of filenames -.TP -%n -file name -.TP -%s -block size (for faster transfers) -.TP -%S -fundamental block size (for block counts) -.TP -%t -file system type in hex -.TP -%T -file system type in human readable form -.PP -NOTE: your shell may have its own version of stat, which usually supersedes -the version described here. Please refer to your shell's documentation -for details about the options it supports. -.SH AUTHOR -Written by Michael Meskes. -.SH "REPORTING BUGS" -Report stat bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report stat translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -stat(2) -.PP -The full documentation for -.B stat -is maintained as a Texinfo manual. If the -.B info -and -.B stat -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqstat invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/stdbuf.1 b/man/stdbuf.1 deleted file mode 100644 index 504516a3..00000000 --- a/man/stdbuf.1 +++ /dev/null @@ -1,79 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH STDBUF "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -stdbuf \- -Run COMMAND, with modified buffering operations for its standard streams. -.SH SYNOPSIS -.B stdbuf -\fIOPTION\fR... \fICOMMAND\fR -.SH DESCRIPTION -.\" Add any additional description here -.PP -Run COMMAND, with modified buffering operations for its standard streams. -.PP -Mandatory arguments to long options are mandatory for short options too. -.TP -\fB\-i\fR, \fB\-\-input\fR=\fIMODE\fR -adjust standard input stream buffering -.TP -\fB\-o\fR, \fB\-\-output\fR=\fIMODE\fR -adjust standard output stream buffering -.TP -\fB\-e\fR, \fB\-\-error\fR=\fIMODE\fR -adjust standard error stream buffering -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -If MODE is 'L' the corresponding stream will be line buffered. -This option is invalid with standard input. -.PP -If MODE is '0' the corresponding stream will be unbuffered. -.PP -Otherwise MODE is a number which may be followed by one of the following: -KB 1000, K 1024, MB 1000*1000, M 1024*1024, and so on for G, T, P, E, Z, Y. -In this case the corresponding stream will be fully buffered with the buffer -size set to MODE bytes. -.PP -NOTE: If COMMAND adjusts the buffering of its standard streams ('tee' does -for e.g.) then that will override corresponding settings changed by 'stdbuf'. -Also some filters (like 'dd' and 'cat' etc.) don't use streams for I/O, -and are thus unaffected by 'stdbuf' settings. -.SH EXAMPLES -.B tail -f access.log | stdbuf -oL cut -d \(aq \(aq -f1 | uniq -.br -This will immedidately display unique entries from access.log -.SH BUGS -On GLIBC platforms, specifying a buffer size, i.e. using fully buffered mode -will result in undefined operation. -.SH AUTHOR -Written by Padraig Brady. -.SH "REPORTING BUGS" -Report stdbuf bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report stdbuf translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B stdbuf -is maintained as a Texinfo manual. If the -.B info -and -.B stdbuf -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqstdbuf invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/stdbuf.x b/man/stdbuf.x index d61c471d..8a770413 100644 --- a/man/stdbuf.x +++ b/man/stdbuf.x @@ -1,4 +1,4 @@ -'\" Copyright (C) 2009-2012 Free Software Foundation, Inc. +'\" Copyright (C) 2009-2013 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/stty.1 b/man/stty.1 deleted file mode 100644 index 81c094c6..00000000 --- a/man/stty.1 +++ /dev/null @@ -1,411 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH STTY "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -stty \- change and print terminal line settings -.SH SYNOPSIS -.B stty -[\fI-F DEVICE | --file=DEVICE\fR] [\fISETTING\fR]... -.br -.B stty -[\fI-F DEVICE | --file=DEVICE\fR] [\fI-a|--all\fR] -.br -.B stty -[\fI-F DEVICE | --file=DEVICE\fR] [\fI-g|--save\fR] -.SH DESCRIPTION -.\" Add any additional description here -.PP -Print or change terminal characteristics. -.TP -\fB\-a\fR, \fB\-\-all\fR -print all current settings in human\-readable form -.TP -\fB\-g\fR, \fB\-\-save\fR -print all current settings in a stty\-readable form -.TP -\fB\-F\fR, \fB\-\-file\fR=\fIDEVICE\fR -open and use the specified DEVICE instead of stdin -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -Optional \- before SETTING indicates negation. An * marks non\-POSIX -settings. The underlying system defines which settings are available. -.SS "Special characters:" -.TP -* dsusp CHAR -CHAR will send a terminal stop signal once input flushed -.TP -eof CHAR -CHAR will send an end of file (terminate the input) -.TP -eol CHAR -CHAR will end the line -.TP -* eol2 CHAR -alternate CHAR for ending the line -.TP -erase CHAR -CHAR will erase the last character typed -.TP -intr CHAR -CHAR will send an interrupt signal -.TP -kill CHAR -CHAR will erase the current line -.TP -* lnext CHAR -CHAR will enter the next character quoted -.TP -quit CHAR -CHAR will send a quit signal -.TP -* rprnt CHAR -CHAR will redraw the current line -.TP -start CHAR -CHAR will restart the output after stopping it -.TP -stop CHAR -CHAR will stop the output -.TP -susp CHAR -CHAR will send a terminal stop signal -.TP -* swtch CHAR -CHAR will switch to a different shell layer -.TP -* werase CHAR -CHAR will erase the last word typed -.SS "Special settings:" -.TP -N -set the input and output speeds to N bauds -.TP -* cols N -tell the kernel that the terminal has N columns -.TP -* columns N -same as cols N -.TP -ispeed N -set the input speed to N -.TP -* line N -use line discipline N -.TP -min N -with \fB\-icanon\fR, set N characters minimum for a completed read -.TP -ospeed N -set the output speed to N -.TP -* rows N -tell the kernel that the terminal has N rows -.TP -* size -print the number of rows and columns according to the kernel -.TP -speed -print the terminal speed -.TP -time N -with \fB\-icanon\fR, set read timeout of N tenths of a second -.SS "Control settings:" -.TP -[\-]clocal -disable modem control signals -.TP -[\-]cread -allow input to be received -.TP -* [\-]crtscts -enable RTS/CTS handshaking -.TP -csN -set character size to N bits, N in [5..8] -.TP -[\-]cstopb -use two stop bits per character (one with '\-') -.TP -[\-]hup -send a hangup signal when the last process closes the tty -.TP -[\-]hupcl -same as [\-]hup -.TP -[\-]parenb -generate parity bit in output and expect parity bit in input -.TP -[\-]parodd -set odd parity (even with '\-') -.SS "Input settings:" -.TP -[\-]brkint -breaks cause an interrupt signal -.TP -[\-]icrnl -translate carriage return to newline -.TP -[\-]ignbrk -ignore break characters -.TP -[\-]igncr -ignore carriage return -.TP -[\-]ignpar -ignore characters with parity errors -.TP -* [\-]imaxbel -beep and do not flush a full input buffer on a character -.TP -[\-]inlcr -translate newline to carriage return -.TP -[\-]inpck -enable input parity checking -.TP -[\-]istrip -clear high (8th) bit of input characters -.TP -* [\-]iutf8 -assume input characters are UTF\-8 encoded -.TP -* [\-]iuclc -translate uppercase characters to lowercase -.TP -* [\-]ixany -let any character restart output, not only start character -.TP -[\-]ixoff -enable sending of start/stop characters -.TP -[\-]ixon -enable XON/XOFF flow control -.TP -[\-]parmrk -mark parity errors (with a 255\-0\-character sequence) -.TP -[\-]tandem -same as [\-]ixoff -.SS "Output settings:" -.TP -* bsN -backspace delay style, N in [0..1] -.TP -* crN -carriage return delay style, N in [0..3] -.TP -* ffN -form feed delay style, N in [0..1] -.TP -* nlN -newline delay style, N in [0..1] -.TP -* [\-]ocrnl -translate carriage return to newline -.TP -* [\-]ofdel -use delete characters for fill instead of null characters -.TP -* [\-]ofill -use fill (padding) characters instead of timing for delays -.TP -* [\-]olcuc -translate lowercase characters to uppercase -.TP -* [\-]onlcr -translate newline to carriage return\-newline -.TP -* [\-]onlret -newline performs a carriage return -.TP -* [\-]onocr -do not print carriage returns in the first column -.TP -[\-]opost -postprocess output -.TP -* tabN -horizontal tab delay style, N in [0..3] -.TP -* tabs -same as tab0 -.TP -* \fB\-tabs\fR -same as tab3 -.TP -* vtN -vertical tab delay style, N in [0..1] -.SS "Local settings:" -.TP -[\-]crterase -echo erase characters as backspace\-space\-backspace -.TP -* crtkill -kill all line by obeying the echoprt and echoe settings -.TP -* \fB\-crtkill\fR -kill all line by obeying the echoctl and echok settings -.TP -* [\-]ctlecho -echo control characters in hat notation ('^c') -.TP -[\-]echo -echo input characters -.TP -* [\-]echoctl -same as [\-]ctlecho -.TP -[\-]echoe -same as [\-]crterase -.TP -[\-]echok -echo a newline after a kill character -.TP -* [\-]echoke -same as [\-]crtkill -.TP -[\-]echonl -echo newline even if not echoing other characters -.TP -* [\-]echoprt -echo erased characters backward, between '\e' and '/' -.TP -[\-]icanon -enable erase, kill, werase, and rprnt special characters -.TP -[\-]iexten -enable non\-POSIX special characters -.TP -[\-]isig -enable interrupt, quit, and suspend special characters -.TP -[\-]noflsh -disable flushing after interrupt and quit special characters -.TP -* [\-]prterase -same as [\-]echoprt -.TP -* [\-]tostop -stop background jobs that try to write to the terminal -.TP -* [\-]xcase -with icanon, escape with '\e' for uppercase characters -.SS "Combination settings:" -.TP -* [\-]LCASE -same as [\-]lcase -.TP -cbreak -same as \fB\-icanon\fR -.TP -\fB\-cbreak\fR -same as icanon -.TP -cooked -same as brkint ignpar istrip icrnl ixon opost isig -icanon, eof and eol characters to their default values -.TP -\fB\-cooked\fR -same as raw -.TP -crt -same as echoe echoctl echoke -.TP -dec -same as echoe echoctl echoke \fB\-ixany\fR intr ^c erase 0177 -kill ^u -.TP -* [\-]decctlq -same as [\-]ixany -.TP -ek -erase and kill characters to their default values -.TP -evenp -same as parenb \fB\-parodd\fR cs7 -.TP -\fB\-evenp\fR -same as \fB\-parenb\fR cs8 -.TP -* [\-]lcase -same as xcase iuclc olcuc -.TP -litout -same as \fB\-parenb\fR \fB\-istrip\fR \fB\-opost\fR cs8 -.TP -\fB\-litout\fR -same as parenb istrip opost cs7 -.TP -nl -same as \fB\-icrnl\fR \fB\-onlcr\fR -.TP -\fB\-nl\fR -same as icrnl \fB\-inlcr\fR \fB\-igncr\fR onlcr \fB\-ocrnl\fR \fB\-onlret\fR -.TP -oddp -same as parenb parodd cs7 -.TP -\fB\-oddp\fR -same as \fB\-parenb\fR cs8 -.TP -[\-]parity -same as [\-]evenp -.TP -pass8 -same as \fB\-parenb\fR \fB\-istrip\fR cs8 -.TP -\fB\-pass8\fR -same as parenb istrip cs7 -.TP -raw -same as \fB\-ignbrk\fR \fB\-brkint\fR \fB\-ignpar\fR \fB\-parmrk\fR \fB\-inpck\fR \fB\-istrip\fR -\fB\-inlcr\fR \fB\-igncr\fR \fB\-icrnl\fR \fB\-ixon\fR \fB\-ixoff\fR \fB\-iuclc\fR \fB\-ixany\fR -\fB\-imaxbel\fR \fB\-opost\fR \fB\-isig\fR \fB\-icanon\fR \fB\-xcase\fR min 1 time 0 -.TP -\fB\-raw\fR -same as cooked -.TP -sane -same as cread \fB\-ignbrk\fR brkint \fB\-inlcr\fR \fB\-igncr\fR icrnl \fB\-iutf8\fR -\fB\-ixoff\fR \fB\-iuclc\fR \fB\-ixany\fR imaxbel opost \fB\-olcuc\fR \fB\-ocrnl\fR onlcr -\fB\-onocr\fR \fB\-onlret\fR \fB\-ofill\fR \fB\-ofdel\fR nl0 cr0 tab0 bs0 vt0 ff0 -isig icanon iexten echo echoe echok \fB\-echonl\fR \fB\-noflsh\fR -\fB\-xcase\fR \fB\-tostop\fR \fB\-echoprt\fR echoctl echoke, all special -characters to their default values -.PP -Handle the tty line connected to standard input. Without arguments, -prints baud rate, line discipline, and deviations from stty sane. In -settings, CHAR is taken literally, or coded as in ^c, 0x37, 0177 or -127; special values ^\- or undef used to disable special characters. -.SH AUTHOR -Written by David MacKenzie. -.SH "REPORTING BUGS" -Report stty bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report stty translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B stty -is maintained as a Texinfo manual. If the -.B info -and -.B stty -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqstty invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/su.1 b/man/su.1 deleted file mode 100644 index 0be28150..00000000 --- a/man/su.1 +++ /dev/null @@ -1,65 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH SU "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -su \- run a shell with substitute user and group IDs -.SH SYNOPSIS -.B su -[\fIOPTION\fR]... [\fI-\fR] [\fIUSER \fR[\fIARG\fR]...] -.SH DESCRIPTION -.\" Add any additional description here -.PP -Change the effective user id and group id to that of USER. -.TP -\-, \fB\-l\fR, \fB\-\-login\fR -make the shell a login shell -.TP -\fB\-c\fR, \fB\-\-command\fR=\fICOMMAND\fR -pass a single COMMAND to the shell with \fB\-c\fR -.TP -\fB\-f\fR, \fB\-\-fast\fR -pass \fB\-f\fR to the shell (for csh or tcsh) -.TP -\fB\-m\fR, \fB\-\-preserve\-environment\fR -do not reset environment variables -.TP -\fB\-p\fR -same as \fB\-m\fR -.TP -\fB\-s\fR, \fB\-\-shell\fR=\fISHELL\fR -run SHELL if /etc/shells allows it -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -A mere \- implies \fB\-l\fR. If USER not given, assume root. -.SH AUTHOR -Written by David MacKenzie. -.SH "REPORTING BUGS" -Report su bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report su translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B su -is maintained as a Texinfo manual. If the -.B info -and -.B su -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqsu invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/su.x b/man/su.x deleted file mode 100644 index b368dd65..00000000 --- a/man/su.x +++ /dev/null @@ -1,4 +0,0 @@ -[NAME] -su \- run a shell with substitute user and group IDs -[DESCRIPTION] -.\" Add any additional description here diff --git a/man/sum.1 b/man/sum.1 deleted file mode 100644 index 72aa9d13..00000000 --- a/man/sum.1 +++ /dev/null @@ -1,53 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH SUM "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -sum \- checksum and count the blocks in a file -.SH SYNOPSIS -.B sum -[\fIOPTION\fR]... [\fIFILE\fR]... -.SH DESCRIPTION -.\" Add any additional description here -.PP -Print checksum and block counts for each FILE. -.TP -\fB\-r\fR -use BSD sum algorithm, use 1K blocks -.TP -\fB\-s\fR, \fB\-\-sysv\fR -use System V sum algorithm, use 512 bytes blocks -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -With no FILE, or when FILE is \-, read standard input. -.SH AUTHOR -Written by Kayvan Aghaiepour and David MacKenzie. -.SH "REPORTING BUGS" -Report sum bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report sum translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B sum -is maintained as a Texinfo manual. If the -.B info -and -.B sum -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqsum invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/sync.1 b/man/sync.1 deleted file mode 100644 index df395e2f..00000000 --- a/man/sync.1 +++ /dev/null @@ -1,47 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH SYNC "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -sync \- flush file system buffers -.SH SYNOPSIS -.B sync -[\fIOPTION\fR] -.SH DESCRIPTION -.\" Add any additional description here -.PP -Force changed blocks to disk, update the super block. -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.SH AUTHOR -Written by Jim Meyering. -.SH "REPORTING BUGS" -Report sync bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report sync translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -sync(2) -.PP -The full documentation for -.B sync -is maintained as a Texinfo manual. If the -.B info -and -.B sync -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqsync invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/tac.1 b/man/tac.1 deleted file mode 100644 index efccd3ab..00000000 --- a/man/tac.1 +++ /dev/null @@ -1,59 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH TAC "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -tac \- concatenate and print files in reverse -.SH SYNOPSIS -.B tac -[\fIOPTION\fR]... [\fIFILE\fR]... -.SH DESCRIPTION -.\" Add any additional description here -.PP -Write each FILE to standard output, last line first. -With no FILE, or when FILE is \-, read standard input. -.PP -Mandatory arguments to long options are mandatory for short options too. -.TP -\fB\-b\fR, \fB\-\-before\fR -attach the separator before instead of after -.TP -\fB\-r\fR, \fB\-\-regex\fR -interpret the separator as a regular expression -.TP -\fB\-s\fR, \fB\-\-separator\fR=\fISTRING\fR -use STRING as the separator instead of newline -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.SH AUTHOR -Written by Jay Lepreau and David MacKenzie. -.SH "REPORTING BUGS" -Report tac bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report tac translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -\fBrev\fP(1) -.PP -The full documentation for -.B tac -is maintained as a Texinfo manual. If the -.B info -and -.B tac -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqtac invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/tail.1 b/man/tail.1 deleted file mode 100644 index 145cbd90..00000000 --- a/man/tail.1 +++ /dev/null @@ -1,106 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH TAIL "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -tail \- output the last part of files -.SH SYNOPSIS -.B tail -[\fIOPTION\fR]... [\fIFILE\fR]... -.SH DESCRIPTION -.\" Add any additional description here -.PP -Print the last 10 lines of each FILE to standard output. -With more than one FILE, precede each with a header giving the file name. -With no FILE, or when FILE is \-, read standard input. -.PP -Mandatory arguments to long options are mandatory for short options too. -.TP -\fB\-c\fR, \fB\-\-bytes\fR=\fIK\fR -output the last K bytes; alternatively, use \fB\-c\fR +K -to output bytes starting with the Kth of each file -.TP -\fB\-f\fR, \fB\-\-follow[=\fR{name|descriptor}] -output appended data as the file grows; -\fB\-f\fR, \fB\-\-follow\fR, and \fB\-\-follow\fR=\fIdescriptor\fR are -equivalent -.TP -\fB\-F\fR -same as \fB\-\-follow\fR=\fIname\fR \fB\-\-retry\fR -.TP -\fB\-n\fR, \fB\-\-lines\fR=\fIK\fR -output the last K lines, instead of the last 10; -or use \fB\-n\fR +K to output lines starting with the Kth -.TP -\fB\-\-max\-unchanged\-stats\fR=\fIN\fR -with \fB\-\-follow\fR=\fIname\fR, reopen a FILE which has not -changed size after N (default 5) iterations -to see if it has been unlinked or renamed -(this is the usual case of rotated log files). -With inotify, this option is rarely useful. -.TP -\fB\-\-pid\fR=\fIPID\fR -with \fB\-f\fR, terminate after process ID, PID dies -.TP -\fB\-q\fR, \fB\-\-quiet\fR, \fB\-\-silent\fR -never output headers giving file names -.TP -\fB\-\-retry\fR -keep trying to open a file even when it is or -becomes inaccessible; useful when following by -name, i.e., with \fB\-\-follow\fR=\fIname\fR -.TP -\fB\-s\fR, \fB\-\-sleep\-interval\fR=\fIN\fR -with \fB\-f\fR, sleep for approximately N seconds -(default 1.0) between iterations. -With inotify and \fB\-\-pid\fR=\fIP\fR, check process P at -least once every N seconds. -.TP -\fB\-v\fR, \fB\-\-verbose\fR -always output headers giving file names -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -If the first character of K (the number of bytes or lines) is a '+', -print beginning with the Kth item from the start of each file, otherwise, -print the last K items in the file. K may have a multiplier suffix: -b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024, -GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y. -.PP -With \fB\-\-follow\fR (\fB\-f\fR), tail defaults to following the file descriptor, which -means that even if a tail'ed file is renamed, tail will continue to track -its end. This default behavior is not desirable when you really want to -track the actual name of the file, not the file descriptor (e.g., log -rotation). Use \fB\-\-follow\fR=\fIname\fR in that case. That causes tail to track the -named file in a way that accommodates renaming, removal and creation. -.SH AUTHOR -Written by Paul Rubin, David MacKenzie, Ian Lance Taylor, -and Jim Meyering. -.SH "REPORTING BUGS" -Report tail bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report tail translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B tail -is maintained as a Texinfo manual. If the -.B info -and -.B tail -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqtail invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/tee.1 b/man/tee.1 deleted file mode 100644 index cf3e68c8..00000000 --- a/man/tee.1 +++ /dev/null @@ -1,53 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH TEE "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -tee \- read from standard input and write to standard output and files -.SH SYNOPSIS -.B tee -[\fIOPTION\fR]... [\fIFILE\fR]... -.SH DESCRIPTION -.\" Add any additional description here -.PP -Copy standard input to each FILE, and also to standard output. -.TP -\fB\-a\fR, \fB\-\-append\fR -append to the given FILEs, do not overwrite -.TP -\fB\-i\fR, \fB\-\-ignore\-interrupts\fR -ignore interrupt signals -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -If a FILE is \-, copy again to standard output. -.SH AUTHOR -Written by Mike Parker, Richard M. Stallman, and David MacKenzie. -.SH "REPORTING BUGS" -Report tee bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report tee translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B tee -is maintained as a Texinfo manual. If the -.B info -and -.B tee -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqtee invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/test.1 b/man/test.1 deleted file mode 100644 index 8ff57ea9..00000000 --- a/man/test.1 +++ /dev/null @@ -1,182 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH TEST "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -test \- check file types and compare values -.SH SYNOPSIS -.B test -\fIEXPRESSION\fR -.br -.B test - -.br -.B [ -\fIEXPRESSION \fR] -.br -.B [ -] -.br -.B [ -\fIOPTION\fR -.SH DESCRIPTION -.\" Add any additional description here -.PP -Exit with the status determined by EXPRESSION. -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -An omitted EXPRESSION defaults to false. Otherwise, -EXPRESSION is true or false and sets exit status. It is one of: -.TP -( EXPRESSION ) -EXPRESSION is true -.TP -! EXPRESSION -EXPRESSION is false -.TP -EXPRESSION1 \fB\-a\fR EXPRESSION2 -both EXPRESSION1 and EXPRESSION2 are true -.TP -EXPRESSION1 \fB\-o\fR EXPRESSION2 -either EXPRESSION1 or EXPRESSION2 is true -.TP -\fB\-n\fR STRING -the length of STRING is nonzero -.TP -STRING -equivalent to \fB\-n\fR STRING -.TP -\fB\-z\fR STRING -the length of STRING is zero -.TP -STRING1 = STRING2 -the strings are equal -.TP -STRING1 != STRING2 -the strings are not equal -.TP -INTEGER1 \fB\-eq\fR INTEGER2 -INTEGER1 is equal to INTEGER2 -.TP -INTEGER1 \fB\-ge\fR INTEGER2 -INTEGER1 is greater than or equal to INTEGER2 -.TP -INTEGER1 \fB\-gt\fR INTEGER2 -INTEGER1 is greater than INTEGER2 -.TP -INTEGER1 \fB\-le\fR INTEGER2 -INTEGER1 is less than or equal to INTEGER2 -.TP -INTEGER1 \fB\-lt\fR INTEGER2 -INTEGER1 is less than INTEGER2 -.TP -INTEGER1 \fB\-ne\fR INTEGER2 -INTEGER1 is not equal to INTEGER2 -.TP -FILE1 \fB\-ef\fR FILE2 -FILE1 and FILE2 have the same device and inode numbers -.TP -FILE1 \fB\-nt\fR FILE2 -FILE1 is newer (modification date) than FILE2 -.TP -FILE1 \fB\-ot\fR FILE2 -FILE1 is older than FILE2 -.TP -\fB\-b\fR FILE -FILE exists and is block special -.TP -\fB\-c\fR FILE -FILE exists and is character special -.TP -\fB\-d\fR FILE -FILE exists and is a directory -.TP -\fB\-e\fR FILE -FILE exists -.TP -\fB\-f\fR FILE -FILE exists and is a regular file -.TP -\fB\-g\fR FILE -FILE exists and is set\-group\-ID -.TP -\fB\-G\fR FILE -FILE exists and is owned by the effective group ID -.TP -\fB\-h\fR FILE -FILE exists and is a symbolic link (same as \fB\-L\fR) -.TP -\fB\-k\fR FILE -FILE exists and has its sticky bit set -.TP -\fB\-L\fR FILE -FILE exists and is a symbolic link (same as \fB\-h\fR) -.TP -\fB\-O\fR FILE -FILE exists and is owned by the effective user ID -.TP -\fB\-p\fR FILE -FILE exists and is a named pipe -.TP -\fB\-r\fR FILE -FILE exists and read permission is granted -.TP -\fB\-s\fR FILE -FILE exists and has a size greater than zero -.TP -\fB\-S\fR FILE -FILE exists and is a socket -.TP -\fB\-t\fR FD -file descriptor FD is opened on a terminal -.TP -\fB\-u\fR FILE -FILE exists and its set\-user\-ID bit is set -.TP -\fB\-w\fR FILE -FILE exists and write permission is granted -.TP -\fB\-x\fR FILE -FILE exists and execute (or search) permission is granted -.PP -Except for \fB\-h\fR and \fB\-L\fR, all FILE\-related tests dereference symbolic links. -Beware that parentheses need to be escaped (e.g., by backslashes) for shells. -INTEGER may also be \fB\-l\fR STRING, which evaluates to the length of STRING. -.PP -NOTE: [ honors the \fB\-\-help\fR and \fB\-\-version\fR options, but test does not. -test treats each of those as it treats any other nonempty STRING. -.PP -NOTE: your shell may have its own version of test and/or [, which usually supersedes -the version described here. Please refer to your shell's documentation -for details about the options it supports. -.SH AUTHOR -Written by Kevin Braunsdorf and Matthew Bradburn. -.SH "REPORTING BUGS" -Report test bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report test translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B test -is maintained as a Texinfo manual. If the -.B info -and -.B test -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqtest invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/timeout.1 b/man/timeout.1 deleted file mode 100644 index 74841a88..00000000 --- a/man/timeout.1 +++ /dev/null @@ -1,81 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH TIMEOUT "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -timeout \- run a command with a time limit -.SH SYNOPSIS -.B timeout -[\fIOPTION\fR] \fIDURATION COMMAND \fR[\fIARG\fR]... -.br -.B timeout -[\fIOPTION\fR] -.SH DESCRIPTION -.\" Add any additional description here -.PP -Start COMMAND, and kill it if still running after DURATION. -.PP -Mandatory arguments to long options are mandatory for short options too. -.HP -\fB\-\-foreground\fR -.IP -When not running timeout directly from a shell prompt, -allow COMMAND to read from the TTY and receive TTY signals. -In this mode, children of COMMAND will not be timed out. -.HP -\fB\-k\fR, \fB\-\-kill\-after\fR=\fIDURATION\fR -.IP -also send a KILL signal if COMMAND is still running -this long after the initial signal was sent. -.HP -\fB\-s\fR, \fB\-\-signal\fR=\fISIGNAL\fR -.IP -specify the signal to be sent on timeout. -SIGNAL may be a name like 'HUP' or a number. -See 'kill \fB\-l\fR' for a list of signals -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -DURATION is a floating point number with an optional suffix: -\&'s' for seconds (the default), 'm' for minutes, 'h' for hours or 'd' for days. -.PP -If the command times out, then exit with status 124. Otherwise, exit -with the status of COMMAND. If no signal is specified, send the TERM -signal upon timeout. The TERM signal kills any process that does not -block or catch that signal. For other processes, it may be necessary to -use the KILL (9) signal, since this signal cannot be caught. If the -KILL (9) signal is sent, the exit status is 128+9 rather than 124. -.SH BUGS -Some platforms don't curently support timeouts beyond 2038 -.SH AUTHOR -Written by Padraig Brady. -.SH "REPORTING BUGS" -Report timeout bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report timeout translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -kill(1) -.PP -The full documentation for -.B timeout -is maintained as a Texinfo manual. If the -.B info -and -.B timeout -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqtimeout invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/touch.1 b/man/touch.1 deleted file mode 100644 index aebca2da..00000000 --- a/man/touch.1 +++ /dev/null @@ -1,96 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH TOUCH "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -touch \- change file timestamps -.SH SYNOPSIS -.B touch -[\fIOPTION\fR]... \fIFILE\fR... -.SH DESCRIPTION -.\" Add any additional description here -.PP -Update the access and modification times of each FILE to the current time. -.PP -A FILE argument that does not exist is created empty, unless \fB\-c\fR or \fB\-h\fR -is supplied. -.PP -A FILE argument string of \- is handled specially and causes touch to -change the times of the file associated with standard output. -.PP -Mandatory arguments to long options are mandatory for short options too. -.TP -\fB\-a\fR -change only the access time -.TP -\fB\-c\fR, \fB\-\-no\-create\fR -do not create any files -.TP -\fB\-d\fR, \fB\-\-date\fR=\fISTRING\fR -parse STRING and use it instead of current time -.TP -\fB\-f\fR -(ignored) -.TP -\fB\-h\fR, \fB\-\-no\-dereference\fR -affect each symbolic link instead of any referenced -file (useful only on systems that can change the -timestamps of a symlink) -.TP -\fB\-m\fR -change only the modification time -.TP -\fB\-r\fR, \fB\-\-reference\fR=\fIFILE\fR -use this file's times instead of current time -.TP -\fB\-t\fR STAMP -use [[CC]YY]MMDDhhmm[.ss] instead of current time -.TP -\fB\-\-time\fR=\fIWORD\fR -change the specified time: -WORD is access, atime, or use: equivalent to \fB\-a\fR -WORD is modify or mtime: equivalent to \fB\-m\fR -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -Note that the \fB\-d\fR and \fB\-t\fR options accept different time\-date formats. -.SH "DATE STRING" -.\" NOTE: keep this paragraph in sync with the one in date.x -The --date=STRING is a mostly free format human readable date string -such as "Sun, 29 Feb 2004 16:21:42 -0800" or "2004-02-29 16:21:42" or -even "next Thursday". A date string may contain items indicating -calendar date, time of day, time zone, day of week, relative time, -relative date, and numbers. An empty string indicates the beginning -of the day. The date string format is more complex than is easily -documented here but is fully described in the info documentation. -.SH AUTHOR -Written by Paul Rubin, Arnold Robbins, Jim Kingdon, -David MacKenzie, and Randy Smith. -.SH "REPORTING BUGS" -Report touch bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report touch translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B touch -is maintained as a Texinfo manual. If the -.B info -and -.B touch -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqtouch invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/tr.1 b/man/tr.1 deleted file mode 100644 index 190792f3..00000000 --- a/man/tr.1 +++ /dev/null @@ -1,147 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH TR "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -tr \- translate or delete characters -.SH SYNOPSIS -.B tr -[\fIOPTION\fR]... \fISET1 \fR[\fISET2\fR] -.SH DESCRIPTION -.\" Add any additional description here -.PP -Translate, squeeze, and/or delete characters from standard input, -writing to standard output. -.TP -\fB\-c\fR, \fB\-C\fR, \fB\-\-complement\fR -use the complement of SET1 -.TP -\fB\-d\fR, \fB\-\-delete\fR -delete characters in SET1, do not translate -.TP -\fB\-s\fR, \fB\-\-squeeze\-repeats\fR -replace each input sequence of a repeated character -that is listed in SET1 with a single occurrence -of that character -.TP -\fB\-t\fR, \fB\-\-truncate\-set1\fR -first truncate SET1 to length of SET2 -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -SETs are specified as strings of characters. Most represent themselves. -Interpreted sequences are: -.TP -\eNNN -character with octal value NNN (1 to 3 octal digits) -.TP -\e\e -backslash -.TP -\ea -audible BEL -.TP -\eb -backspace -.TP -\ef -form feed -.TP -\en -new line -.TP -\er -return -.TP -\et -horizontal tab -.TP -\ev -vertical tab -.TP -CHAR1\-CHAR2 -all characters from CHAR1 to CHAR2 in ascending order -.TP -[CHAR*] -in SET2, copies of CHAR until length of SET1 -.TP -[CHAR*REPEAT] -REPEAT copies of CHAR, REPEAT octal if starting with 0 -.TP -[:alnum:] -all letters and digits -.TP -[:alpha:] -all letters -.TP -[:blank:] -all horizontal whitespace -.TP -[:cntrl:] -all control characters -.TP -[:digit:] -all digits -.TP -[:graph:] -all printable characters, not including space -.TP -[:lower:] -all lower case letters -.TP -[:print:] -all printable characters, including space -.TP -[:punct:] -all punctuation characters -.TP -[:space:] -all horizontal or vertical whitespace -.TP -[:upper:] -all upper case letters -.TP -[:xdigit:] -all hexadecimal digits -.TP -[=CHAR=] -all characters which are equivalent to CHAR -.PP -Translation occurs if \fB\-d\fR is not given and both SET1 and SET2 appear. -\fB\-t\fR may be used only when translating. SET2 is extended to length of -SET1 by repeating its last character as necessary. Excess characters -of SET2 are ignored. Only [:lower:] and [:upper:] are guaranteed to -expand in ascending order; used in SET2 while translating, they may -only be used in pairs to specify case conversion. \fB\-s\fR uses SET1 if not -translating nor deleting; else squeezing uses SET2 and occurs after -translation or deletion. -.SH AUTHOR -Written by Jim Meyering. -.SH "REPORTING BUGS" -Report tr bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report tr translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B tr -is maintained as a Texinfo manual. If the -.B info -and -.B tr -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqtr invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/true.1 b/man/true.1 deleted file mode 100644 index 7c74de60..00000000 --- a/man/true.1 +++ /dev/null @@ -1,52 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH TRUE "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -true \- do nothing, successfully -.SH SYNOPSIS -.B true -[\fIignored command line arguments\fR] -.br -.B true -\fIOPTION\fR -.SH DESCRIPTION -.\" Add any additional description here -.PP -Exit with a status code indicating success. -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -NOTE: your shell may have its own version of true, which usually supersedes -the version described here. Please refer to your shell's documentation -for details about the options it supports. -.SH AUTHOR -Written by Jim Meyering. -.SH "REPORTING BUGS" -Report true bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report true translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B true -is maintained as a Texinfo manual. If the -.B info -and -.B true -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqtrue invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/truncate.1 b/man/truncate.1 deleted file mode 100644 index 0dbd3501..00000000 --- a/man/truncate.1 +++ /dev/null @@ -1,74 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH TRUNCATE "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -truncate \- shrink or extend the size of a file to the specified size -.SH SYNOPSIS -.B truncate -\fIOPTION\fR... \fIFILE\fR... -.SH DESCRIPTION -.\" Add any additional description here -.PP -Shrink or extend the size of each FILE to the specified size -.PP -A FILE argument that does not exist is created. -.PP -If a FILE is larger than the specified size, the extra data is lost. -If a FILE is shorter, it is extended and the extended part (hole) -reads as zero bytes. -.PP -Mandatory arguments to long options are mandatory for short options too. -.TP -\fB\-c\fR, \fB\-\-no\-create\fR -do not create any files -.TP -\fB\-o\fR, \fB\-\-io\-blocks\fR -treat SIZE as number of IO blocks instead of bytes -.TP -\fB\-r\fR, \fB\-\-reference\fR=\fIRFILE\fR -base size on RFILE -.TP -\fB\-s\fR, \fB\-\-size\fR=\fISIZE\fR -set or adjust the file size by SIZE -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -SIZE is an integer and optional unit (example: 10M is 10*1024*1024). Units -are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of 1000). -.PP -SIZE may also be prefixed by one of the following modifying characters: -\&'+' extend by, '\-' reduce by, '<' at most, '>' at least, -\&'/' round down to multiple of, '%' round up to multiple of. -.SH AUTHOR -Written by Padraig Brady. -.SH "REPORTING BUGS" -Report truncate bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report truncate translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -dd(1), truncate(2), ftruncate(2) -.PP -The full documentation for -.B truncate -is maintained as a Texinfo manual. If the -.B info -and -.B truncate -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqtruncate invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/tsort.1 b/man/tsort.1 deleted file mode 100644 index b820f1cd..00000000 --- a/man/tsort.1 +++ /dev/null @@ -1,46 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH TSORT "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -tsort \- perform topological sort -.SH SYNOPSIS -.B tsort -[\fIOPTION\fR] [\fIFILE\fR] -.SH DESCRIPTION -.\" Add any additional description here -.PP -Write totally ordered list consistent with the partial ordering in FILE. -With no FILE, or when FILE is \-, read standard input. -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.SH AUTHOR -Written by Mark Kettenis. -.SH "REPORTING BUGS" -Report tsort bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report tsort translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B tsort -is maintained as a Texinfo manual. If the -.B info -and -.B tsort -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqtsort invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/tty.1 b/man/tty.1 deleted file mode 100644 index e65bbe42..00000000 --- a/man/tty.1 +++ /dev/null @@ -1,48 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH TTY "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -tty \- print the file name of the terminal connected to standard input -.SH SYNOPSIS -.B tty -[\fIOPTION\fR]... -.SH DESCRIPTION -.\" Add any additional description here -.PP -Print the file name of the terminal connected to standard input. -.TP -\fB\-s\fR, \fB\-\-silent\fR, \fB\-\-quiet\fR -print nothing, only return an exit status -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.SH AUTHOR -Written by David MacKenzie. -.SH "REPORTING BUGS" -Report tty bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report tty translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B tty -is maintained as a Texinfo manual. If the -.B info -and -.B tty -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqtty invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/uname.1 b/man/uname.1 deleted file mode 100644 index 963c67fc..00000000 --- a/man/uname.1 +++ /dev/null @@ -1,75 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH UNAME "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -uname \- print system information -.SH SYNOPSIS -.B uname -[\fIOPTION\fR]... -.SH DESCRIPTION -.\" Add any additional description here -.PP -Print certain system information. With no OPTION, same as \fB\-s\fR. -.TP -\fB\-a\fR, \fB\-\-all\fR -print all information, in the following order, -except omit \fB\-p\fR and \fB\-i\fR if unknown: -.TP -\fB\-s\fR, \fB\-\-kernel\-name\fR -print the kernel name -.TP -\fB\-n\fR, \fB\-\-nodename\fR -print the network node hostname -.TP -\fB\-r\fR, \fB\-\-kernel\-release\fR -print the kernel release -.TP -\fB\-v\fR, \fB\-\-kernel\-version\fR -print the kernel version -.TP -\fB\-m\fR, \fB\-\-machine\fR -print the machine hardware name -.TP -\fB\-p\fR, \fB\-\-processor\fR -print the processor type or "unknown" -.TP -\fB\-i\fR, \fB\-\-hardware\-platform\fR -print the hardware platform or "unknown" -.TP -\fB\-o\fR, \fB\-\-operating\-system\fR -print the operating system -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.SH AUTHOR -Written by David MacKenzie. -.SH "REPORTING BUGS" -Report uname bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report uname translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -arch(1), uname(2) -.PP -The full documentation for -.B uname -is maintained as a Texinfo manual. If the -.B info -and -.B uname -programs are properly installed at your site, the command -.IP -.B info coreutils \(aquname invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/unexpand.1 b/man/unexpand.1 deleted file mode 100644 index 122aafd1..00000000 --- a/man/unexpand.1 +++ /dev/null @@ -1,62 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH UNEXPAND "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -unexpand \- convert spaces to tabs -.SH SYNOPSIS -.B unexpand -[\fIOPTION\fR]... [\fIFILE\fR]... -.SH DESCRIPTION -.\" Add any additional description here -.PP -Convert blanks in each FILE to tabs, writing to standard output. -With no FILE, or when FILE is \-, read standard input. -.PP -Mandatory arguments to long options are mandatory for short options too. -.TP -\fB\-a\fR, \fB\-\-all\fR -convert all blanks, instead of just initial blanks -.TP -\fB\-\-first\-only\fR -convert only leading sequences of blanks (overrides \fB\-a\fR) -.TP -\fB\-t\fR, \fB\-\-tabs\fR=\fIN\fR -have tabs N characters apart instead of 8 (enables \fB\-a\fR) -.TP -\fB\-t\fR, \fB\-\-tabs\fR=\fILIST\fR -use comma separated LIST of tab positions (enables \fB\-a\fR) -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.SH AUTHOR -Written by David MacKenzie. -.SH "REPORTING BUGS" -Report unexpand bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report unexpand translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -expand(1) -.PP -The full documentation for -.B unexpand -is maintained as a Texinfo manual. If the -.B info -and -.B unexpand -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqunexpand invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/uniq.1 b/man/uniq.1 deleted file mode 100644 index cb3d2e7e..00000000 --- a/man/uniq.1 +++ /dev/null @@ -1,88 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH UNIQ "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -uniq \- report or omit repeated lines -.SH SYNOPSIS -.B uniq -[\fIOPTION\fR]... [\fIINPUT \fR[\fIOUTPUT\fR]] -.SH DESCRIPTION -.\" Add any additional description here -.PP -Filter adjacent matching lines from INPUT (or standard input), -writing to OUTPUT (or standard output). -.PP -With no options, matching lines are merged to the first occurrence. -.PP -Mandatory arguments to long options are mandatory for short options too. -.TP -\fB\-c\fR, \fB\-\-count\fR -prefix lines by the number of occurrences -.TP -\fB\-d\fR, \fB\-\-repeated\fR -only print duplicate lines -.TP -\fB\-D\fR, \fB\-\-all\-repeated\fR[=\fIdelimit\-method\fR] -print all duplicate lines -delimit\-method={none(default),prepend,separate} -Delimiting is done with blank lines -.TP -\fB\-f\fR, \fB\-\-skip\-fields\fR=\fIN\fR -avoid comparing the first N fields -.TP -\fB\-i\fR, \fB\-\-ignore\-case\fR -ignore differences in case when comparing -.TP -\fB\-s\fR, \fB\-\-skip\-chars\fR=\fIN\fR -avoid comparing the first N characters -.TP -\fB\-u\fR, \fB\-\-unique\fR -only print unique lines -.TP -\fB\-z\fR, \fB\-\-zero\-terminated\fR -end lines with 0 byte, not newline -.TP -\fB\-w\fR, \fB\-\-check\-chars\fR=\fIN\fR -compare no more than N characters in lines -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -A field is a run of blanks (usually spaces and/or TABs), then non\-blank -characters. Fields are skipped before chars. -.PP -Note: 'uniq' does not detect repeated lines unless they are adjacent. -You may want to sort the input first, or use 'sort \fB\-u\fR' without 'uniq'. -Also, comparisons honor the rules specified by 'LC_COLLATE'. -.SH AUTHOR -Written by Richard M. Stallman and David MacKenzie. -.SH "REPORTING BUGS" -Report uniq bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report uniq translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -comm(1), join(1) -.PP -The full documentation for -.B uniq -is maintained as a Texinfo manual. If the -.B info -and -.B uniq -programs are properly installed at your site, the command -.IP -.B info coreutils \(aquniq invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/uniq.x b/man/uniq.x index 98a95f99..013cef33 100644 --- a/man/uniq.x +++ b/man/uniq.x @@ -3,4 +3,4 @@ uniq \- report or omit repeated lines [DESCRIPTION] .\" Add any additional description here [SEE ALSO] -comm(1), join(1) +comm(1), join(1), sort(1) diff --git a/man/unlink.1 b/man/unlink.1 deleted file mode 100644 index 12d2f7a7..00000000 --- a/man/unlink.1 +++ /dev/null @@ -1,50 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH UNLINK "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -unlink \- call the unlink function to remove the specified file -.SH SYNOPSIS -.B unlink -\fIFILE\fR -.br -.B unlink -\fIOPTION\fR -.SH DESCRIPTION -.\" Add any additional description here -.PP -Call the unlink function to remove the specified FILE. -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.SH AUTHOR -Written by Michael Stone. -.SH "REPORTING BUGS" -Report unlink bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report unlink translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -unlink(2) -.PP -The full documentation for -.B unlink -is maintained as a Texinfo manual. If the -.B info -and -.B unlink -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqunlink invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/uptime.1 b/man/uptime.1 deleted file mode 100644 index 1a297548..00000000 --- a/man/uptime.1 +++ /dev/null @@ -1,49 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH UPTIME "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -uptime \- tell how long the system has been running -.SH SYNOPSIS -.B uptime -[\fIOPTION\fR]... [\fIFILE\fR] -.SH DESCRIPTION -.\" Add any additional description here -.PP -Print the current time, the length of time the system has been up, -the number of users on the system, and the average number of jobs -in the run queue over the last 1, 5 and 15 minutes. Processes in -an uninterruptible sleep state also contribute to the load average. -If FILE is not specified, use /var/run/utmp. /var/log/wtmp as FILE is common. -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.SH AUTHOR -Written by Joseph Arceneaux, David MacKenzie, and Kaveh Ghazi. -.SH "REPORTING BUGS" -Report uptime bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report uptime translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B uptime -is maintained as a Texinfo manual. If the -.B info -and -.B uptime -programs are properly installed at your site, the command -.IP -.B info coreutils \(aquptime invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/users.1 b/man/users.1 deleted file mode 100644 index fd6db8f4..00000000 --- a/man/users.1 +++ /dev/null @@ -1,46 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH USERS "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -users \- print the user names of users currently logged in to the current host -.SH SYNOPSIS -.B users -[\fIOPTION\fR]... [\fIFILE\fR] -.SH DESCRIPTION -.\" Add any additional description here -.PP -Output who is currently logged in according to FILE. -If FILE is not specified, use /var/run/utmp. /var/log/wtmp as FILE is common. -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.SH AUTHOR -Written by Joseph Arceneaux and David MacKenzie. -.SH "REPORTING BUGS" -Report users bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report users translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B users -is maintained as a Texinfo manual. If the -.B info -and -.B users -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqusers invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/vdir.1 b/man/vdir.1 deleted file mode 100644 index eb0be8eb..00000000 --- a/man/vdir.1 +++ /dev/null @@ -1,267 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH VDIR "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -vdir \- list directory contents -.SH SYNOPSIS -.B vdir -[\fIOPTION\fR]... [\fIFILE\fR]... -.SH DESCRIPTION -.\" Add any additional description here -.PP -List information about the FILEs (the current directory by default). -Sort entries alphabetically if none of \fB\-cftuvSUX\fR nor \fB\-\-sort\fR is specified. -.PP -Mandatory arguments to long options are mandatory for short options too. -.TP -\fB\-a\fR, \fB\-\-all\fR -do not ignore entries starting with . -.TP -\fB\-A\fR, \fB\-\-almost\-all\fR -do not list implied . and .. -.TP -\fB\-\-author\fR -with \fB\-l\fR, print the author of each file -.TP -\fB\-b\fR, \fB\-\-escape\fR -print C\-style escapes for nongraphic characters -.TP -\fB\-\-block\-size\fR=\fISIZE\fR -scale sizes by SIZE before printing them. E.g., -\&'\-\-block\-size=M' prints sizes in units of -1,048,576 bytes. See SIZE format below. -.TP -\fB\-B\fR, \fB\-\-ignore\-backups\fR -do not list implied entries ending with ~ -.TP -\fB\-c\fR -with \fB\-lt\fR: sort by, and show, ctime (time of last -modification of file status information) -with \fB\-l\fR: show ctime and sort by name -otherwise: sort by ctime, newest first -.TP -\fB\-C\fR -list entries by columns -.TP -\fB\-\-color\fR[=\fIWHEN\fR] -colorize the output. WHEN defaults to 'always' -or can be 'never' or 'auto'. More info below -.TP -\fB\-d\fR, \fB\-\-directory\fR -list directory entries instead of contents, -and do not dereference symbolic links -.TP -\fB\-D\fR, \fB\-\-dired\fR -generate output designed for Emacs' dired mode -.TP -\fB\-f\fR -do not sort, enable \fB\-aU\fR, disable \fB\-ls\fR \fB\-\-color\fR -.TP -\fB\-F\fR, \fB\-\-classify\fR -append indicator (one of */=>@|) to entries -.TP -\fB\-\-file\-type\fR -likewise, except do not append '*' -.TP -\fB\-\-format\fR=\fIWORD\fR -across \fB\-x\fR, commas \fB\-m\fR, horizontal \fB\-x\fR, long \fB\-l\fR, -single\-column \fB\-1\fR, verbose \fB\-l\fR, vertical \fB\-C\fR -.TP -\fB\-\-full\-time\fR -like \fB\-l\fR \fB\-\-time\-style\fR=\fIfull\-iso\fR -.TP -\fB\-g\fR -like \fB\-l\fR, but do not list owner -.TP -\fB\-\-group\-directories\-first\fR -group directories before files. -.IP -augment with a \fB\-\-sort\fR option, but any -use of \fB\-\-sort\fR=\fInone\fR (\fB\-U\fR) disables grouping -.TP -\fB\-G\fR, \fB\-\-no\-group\fR -in a long listing, don't print group names -.TP -\fB\-h\fR, \fB\-\-human\-readable\fR -with \fB\-l\fR, print sizes in human readable format -(e.g., 1K 234M 2G) -.TP -\fB\-\-si\fR -likewise, but use powers of 1000 not 1024 -.TP -\fB\-H\fR, \fB\-\-dereference\-command\-line\fR -follow symbolic links listed on the command line -.TP -\fB\-\-dereference\-command\-line\-symlink\-to\-dir\fR -follow each command line symbolic link -that points to a directory -.TP -\fB\-\-hide\fR=\fIPATTERN\fR -do not list implied entries matching shell PATTERN -(overridden by \fB\-a\fR or \fB\-A\fR) -.TP -\fB\-\-indicator\-style\fR=\fIWORD\fR -append indicator with style WORD to entry names: -none (default), slash (\fB\-p\fR), -file\-type (\fB\-\-file\-type\fR), classify (\fB\-F\fR) -.TP -\fB\-i\fR, \fB\-\-inode\fR -print the index number of each file -.TP -\fB\-I\fR, \fB\-\-ignore\fR=\fIPATTERN\fR -do not list implied entries matching shell PATTERN -.TP -\fB\-k\fR, \fB\-\-kibibytes\fR -use 1024\-byte blocks -.TP -\fB\-l\fR -use a long listing format -.TP -\fB\-L\fR, \fB\-\-dereference\fR -when showing file information for a symbolic -link, show information for the file the link -references rather than for the link itself -.TP -\fB\-m\fR -fill width with a comma separated list of entries -.TP -\fB\-n\fR, \fB\-\-numeric\-uid\-gid\fR -like \fB\-l\fR, but list numeric user and group IDs -.TP -\fB\-N\fR, \fB\-\-literal\fR -print raw entry names (don't treat e.g. control -characters specially) -.TP -\fB\-o\fR -like \fB\-l\fR, but do not list group information -.TP -\fB\-p\fR, \fB\-\-indicator\-style\fR=\fIslash\fR -append / indicator to directories -.TP -\fB\-q\fR, \fB\-\-hide\-control\-chars\fR -print ? instead of non graphic characters -.TP -\fB\-\-show\-control\-chars\fR -show non graphic characters as\-is (default -unless program is 'ls' and output is a terminal) -.TP -\fB\-Q\fR, \fB\-\-quote\-name\fR -enclose entry names in double quotes -.TP -\fB\-\-quoting\-style\fR=\fIWORD\fR -use quoting style WORD for entry names: -literal, locale, shell, shell\-always, c, escape -.TP -\fB\-r\fR, \fB\-\-reverse\fR -reverse order while sorting -.TP -\fB\-R\fR, \fB\-\-recursive\fR -list subdirectories recursively -.TP -\fB\-s\fR, \fB\-\-size\fR -print the allocated size of each file, in blocks -.TP -\fB\-S\fR -sort by file size -.TP -\fB\-\-sort\fR=\fIWORD\fR -sort by WORD instead of name: none \fB\-U\fR, -extension \fB\-X\fR, size \fB\-S\fR, time \fB\-t\fR, version \fB\-v\fR -.TP -\fB\-\-time\fR=\fIWORD\fR -with \fB\-l\fR, show time as WORD instead of modification -time: atime \fB\-u\fR, access \fB\-u\fR, use \fB\-u\fR, ctime \fB\-c\fR, -or status \fB\-c\fR; use specified time as sort key -if \fB\-\-sort\fR=\fItime\fR -.TP -\fB\-\-time\-style\fR=\fISTYLE\fR -with \fB\-l\fR, show times using style STYLE: -full\-iso, long\-iso, iso, locale, +FORMAT. -FORMAT is interpreted like 'date'; if FORMAT is -FORMAT1<newline>FORMAT2, FORMAT1 applies to -non\-recent files and FORMAT2 to recent files; -if STYLE is prefixed with 'posix\-', STYLE -takes effect only outside the POSIX locale -.TP -\fB\-t\fR -sort by modification time, newest first -.TP -\fB\-T\fR, \fB\-\-tabsize\fR=\fICOLS\fR -assume tab stops at each COLS instead of 8 -.TP -\fB\-u\fR -with \fB\-lt\fR: sort by, and show, access time -with \fB\-l\fR: show access time and sort by name -otherwise: sort by access time -.TP -\fB\-U\fR -do not sort; list entries in directory order -.TP -\fB\-v\fR -natural sort of (version) numbers within text -.TP -\fB\-w\fR, \fB\-\-width\fR=\fICOLS\fR -assume screen width instead of current value -.TP -\fB\-x\fR -list entries by lines instead of by columns -.TP -\fB\-X\fR -sort alphabetically by entry extension -.TP -\fB\-Z\fR, \fB\-\-context\fR -print any SELinux security context of each file -.TP -\fB\-1\fR -list one file per line -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -SIZE is an integer and optional unit (example: 10M is 10*1024*1024). Units -are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of 1000). -.PP -Using color to distinguish file types is disabled both by default and -with \fB\-\-color\fR=\fInever\fR. With \fB\-\-color\fR=\fIauto\fR, ls emits color codes only when -standard output is connected to a terminal. The LS_COLORS environment -variable can change the settings. Use the dircolors command to set it. -.SS "Exit status:" -.TP -0 -if OK, -.TP -1 -if minor problems (e.g., cannot access subdirectory), -.TP -2 -if serious trouble (e.g., cannot access command\-line argument). -.SH AUTHOR -Written by Richard M. Stallman and David MacKenzie. -.SH "REPORTING BUGS" -Report vdir bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report vdir translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B vdir -is maintained as a Texinfo manual. If the -.B info -and -.B vdir -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqvdir invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/wc.1 b/man/wc.1 deleted file mode 100644 index 87535fa2..00000000 --- a/man/wc.1 +++ /dev/null @@ -1,73 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH WC "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -wc \- print newline, word, and byte counts for each file -.SH SYNOPSIS -.B wc -[\fIOPTION\fR]... [\fIFILE\fR]... -.br -.B wc -[\fIOPTION\fR]... \fI--files0-from=F\fR -.SH DESCRIPTION -.\" Add any additional description here -.PP -Print newline, word, and byte counts for each FILE, and a total line if -more than one FILE is specified. With no FILE, or when FILE is \-, -read standard input. A word is a non\-zero\-length sequence of characters -delimited by white space. -The options below may be used to select which counts are printed, always in -the following order: newline, word, character, byte, maximum line length. -.TP -\fB\-c\fR, \fB\-\-bytes\fR -print the byte counts -.TP -\fB\-m\fR, \fB\-\-chars\fR -print the character counts -.TP -\fB\-l\fR, \fB\-\-lines\fR -print the newline counts -.TP -\fB\-\-files0\-from\fR=\fIF\fR -read input from the files specified by -NUL\-terminated names in file F; -If F is \- then read names from standard input -.TP -\fB\-L\fR, \fB\-\-max\-line\-length\fR -print the length of the longest line -.TP -\fB\-w\fR, \fB\-\-words\fR -print the word counts -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.SH AUTHOR -Written by Paul Rubin and David MacKenzie. -.SH "REPORTING BUGS" -Report wc bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report wc translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B wc -is maintained as a Texinfo manual. If the -.B info -and -.B wc -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqwc invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/who.1 b/man/who.1 deleted file mode 100644 index 8a141946..00000000 --- a/man/who.1 +++ /dev/null @@ -1,96 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH WHO "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -who \- show who is logged on -.SH SYNOPSIS -.B who -[\fIOPTION\fR]... [ \fIFILE | ARG1 ARG2 \fR] -.SH DESCRIPTION -.\" Add any additional description here -.PP -Print information about users who are currently logged in. -.TP -\fB\-a\fR, \fB\-\-all\fR -same as \fB\-b\fR \fB\-d\fR \fB\-\-login\fR \fB\-p\fR \fB\-r\fR \fB\-t\fR \fB\-T\fR \fB\-u\fR -.TP -\fB\-b\fR, \fB\-\-boot\fR -time of last system boot -.TP -\fB\-d\fR, \fB\-\-dead\fR -print dead processes -.TP -\fB\-H\fR, \fB\-\-heading\fR -print line of column headings -.TP -\fB\-l\fR, \fB\-\-login\fR -print system login processes -.TP -\fB\-\-lookup\fR -attempt to canonicalize hostnames via DNS -.TP -\fB\-m\fR -only hostname and user associated with stdin -.TP -\fB\-p\fR, \fB\-\-process\fR -print active processes spawned by init -.TP -\fB\-q\fR, \fB\-\-count\fR -all login names and number of users logged on -.TP -\fB\-r\fR, \fB\-\-runlevel\fR -print current runlevel -.TP -\fB\-s\fR, \fB\-\-short\fR -print only name, line, and time (default) -.TP -\fB\-t\fR, \fB\-\-time\fR -print last system clock change -.TP -\fB\-T\fR, \fB\-w\fR, \fB\-\-mesg\fR -add user's message status as +, \- or ? -.TP -\fB\-u\fR, \fB\-\-users\fR -list users logged in -.TP -\fB\-\-message\fR -same as \fB\-T\fR -.TP -\fB\-\-writable\fR -same as \fB\-T\fR -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.PP -If FILE is not specified, use /var/run/utmp. /var/log/wtmp as FILE is common. -If ARG1 ARG2 given, \fB\-m\fR presumed: 'am i' or 'mom likes' are usual. -.SH AUTHOR -Written by Joseph Arceneaux, David MacKenzie, and Michael Stone. -.SH "REPORTING BUGS" -Report who bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report who translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B who -is maintained as a Texinfo manual. If the -.B info -and -.B who -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqwho invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/whoami.1 b/man/whoami.1 deleted file mode 100644 index 0af688a1..00000000 --- a/man/whoami.1 +++ /dev/null @@ -1,46 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH WHOAMI "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -whoami \- print effective userid -.SH SYNOPSIS -.B whoami -[\fIOPTION\fR]... -.SH DESCRIPTION -.\" Add any additional description here -.PP -Print the user name associated with the current effective user ID. -Same as id \fB\-un\fR. -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.SH AUTHOR -Written by Richard Mlynarik. -.SH "REPORTING BUGS" -Report whoami bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report whoami translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B whoami -is maintained as a Texinfo manual. If the -.B info -and -.B whoami -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqwhoami invocation\(aq -.PP -should give you access to the complete manual. diff --git a/man/yes.1 b/man/yes.1 deleted file mode 100644 index ad8821eb..00000000 --- a/man/yes.1 +++ /dev/null @@ -1,48 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -.TH YES "1" "May 2012" "GNU coreutils 8.17" "User Commands" -.SH NAME -yes \- output a string repeatedly until killed -.SH SYNOPSIS -.B yes -[\fISTRING\fR]... -.br -.B yes -\fIOPTION\fR -.SH DESCRIPTION -.\" Add any additional description here -.PP -Repeatedly output a line with all specified STRING(s), or 'y'. -.TP -\fB\-\-help\fR -display this help and exit -.TP -\fB\-\-version\fR -output version information and exit -.SH AUTHOR -Written by David MacKenzie. -.SH "REPORTING BUGS" -Report yes bugs to bug\-coreutils@gnu.org -.br -GNU coreutils home page: <http://www.gnu.org/software/coreutils/> -.br -General help using GNU software: <http://www.gnu.org/gethelp/> -.br -Report yes translation bugs to <http://translationproject.org/team/> -.SH COPYRIGHT -Copyright \(co 2012 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B yes -is maintained as a Texinfo manual. If the -.B info -and -.B yes -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqyes invocation\(aq -.PP -should give you access to the complete manual. diff --git a/old/fileutils/ChangeLog b/old/fileutils/ChangeLog index cf37a628..a49fcbc2 100644 --- a/old/fileutils/ChangeLog +++ b/old/fileutils/ChangeLog @@ -4420,7 +4420,7 @@ 2000-02-26 Jim Meyering <meyering@lucent.com> - Tranform the generated src/Makefile.in file so it falls back on + Transform the generated src/Makefile.in file so it falls back on using /bin/rm when necessary. The old rule didn't always work. This is necessary only on certain losing systems, and because this package builds an `rm' executable and some people put `.' too @@ -8390,7 +8390,7 @@ ----- - Copyright (C) 1998-2012 Free Software Foundation, Inc. + Copyright (C) 1998-2013 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 53cdf20e..6c02d063 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-2012 Free Software Foundation, Inc. + Copyright (C) 1990-2013 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 8432c53a..6d58c0fa 100644 --- a/old/fileutils/NEWS +++ b/old/fileutils/NEWS @@ -749,7 +749,7 @@ Major changes in release 3.3: ======================================================================== -Copyright (C) 1992-2012 Free Software Foundation, Inc. +Copyright (C) 1992-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 diff --git a/old/sh-utils/ChangeLog b/old/sh-utils/ChangeLog index e7c5027c..11579771 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-2012 Free Software Foundation, Inc. + Copyright (C) 1994-2013 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 880e3f3a..7b33d195 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-2012 Free Software Foundation, Inc. + Copyright (C) 1989-2013 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 347957fe..c4181d64 100644 --- a/old/sh-utils/NEWS +++ b/old/sh-utils/NEWS @@ -273,7 +273,7 @@ Major changes in release 1.7: ======================================================================== -Copyright (C) 1992-2012 Free Software Foundation, Inc. +Copyright (C) 1992-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 diff --git a/old/textutils/ChangeLog b/old/textutils/ChangeLog index 36f58ffc..f389fdec 100644 --- a/old/textutils/ChangeLog +++ b/old/textutils/ChangeLog @@ -5496,7 +5496,7 @@ Thu Jul 4 07:24:54 1996 Jim Meyering <meyering@na-net.ornl.gov> Wed Jul 3 23:21:09 1996 Jim Meyering <meyering@na-net.ornl.gov> - * src/md5sum.c (split_3): Correct test for 35-byte line to accomodate + * src/md5sum.c (split_3): Correct test for 35-byte line to accommodate fact that leading blanks may be stripped. Tue Jul 2 21:51:40 1996 Jim Meyering <meyering@na-net.ornl.gov> @@ -8550,7 +8550,7 @@ Tue Jul 17 12:36:11 EDT 1990 Jay Fenlason (hack@ai.mit.edu) * pr.c Deleted excess whitespace from ends of lines. Modified to work with current version of getopt, which returns 1 instead of 0 for non-options. - Reversed the meaning of the -f option, to be compatable + Reversed the meaning of the -f option, to be compatible with real pr. Sun Jul 8 00:39:31 1990 David J. MacKenzie (djm at apple-gunkies) @@ -8745,7 +8745,7 @@ Sat Dec 16 15:15:50 1989 David J. MacKenzie (djm at hobbes.ai.mit.edu) ----- - Copyright (C) 1998-2012 Free Software Foundation, Inc. + Copyright (C) 1998-2013 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 234650e5..44b0f172 100644 --- a/old/textutils/NEWS +++ b/old/textutils/NEWS @@ -461,7 +461,7 @@ Major changes in release 1.4: ======================================================================== -Copyright (C) 1992-2012 Free Software Foundation, Inc. +Copyright (C) 1992-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 diff --git a/po/ChangeLog-2007 b/po/ChangeLog-2007 index 9e86c700..33e1bdf9 100644 --- a/po/ChangeLog-2007 +++ b/po/ChangeLog-2007 @@ -246,7 +246,7 @@ ----- - Copyright (C) 2002-2012 Free Software Foundation, Inc. + Copyright (C) 2002-2013 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice diff --git a/po/LINGUAS b/po/LINGUAS index 286321ae..87cd254e 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -14,7 +14,9 @@ fi fr ga gl +hr hu +ia id it ja diff --git a/po/POTFILES.in b/po/POTFILES.in index 7b3de0b0..21617cc7 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,5 +1,5 @@ # List of files which contain translatable strings. -# Copyright (C) 1996-2012 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # These are nominally temporary... lib/argmatch.c @@ -91,6 +91,7 @@ src/nice.c src/nl.c src/nohup.c src/nproc.c +src/numfmt.c src/od.c src/operand2sig.c src/paste.c @@ -118,7 +119,6 @@ src/split.c src/stat.c src/stdbuf.c src/stty.c -src/su.c src/sum.c src/sync.c src/system.h diff --git a/po/af.gmo b/po/af.gmo index a8cfe6dc..d852563e 100644 Binary files a/po/af.gmo and b/po/af.gmo differ diff --git a/po/af.po b/po/af.po index 5c824caa..594215e1 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: 2012-05-10 19:35+0200\n" +"POT-Creation-Date: 2013-02-14 15:56+0000\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,19 +35,19 @@ msgstr "Geldige parameters is soos volg:" msgid "error closing file" msgstr "toevoerlêer %s word toegemaak" -#: lib/closeout.c:112 src/base64.c:109 src/base64.c:121 src/base64.c:127 -#: src/base64.c:168 src/base64.c:224 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:330 src/expand.c:355 src/head.c:298 -#: src/head.c:348 src/head.c:756 src/head.c:797 src/mktemp.c:350 src/od.c:919 -#: src/paste.c:160 src/shuf.c:369 src/split.c:727 src/split.c:964 -#: src/split.c:969 src/tail.c:350 src/tail.c:1201 src/tail.c:1307 +#: 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 -#: src/unexpand.c:427 src/unexpand.c:443 +#: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "skryffout" -#: lib/copy-acl.c:611 src/copy.c:1160 src/copy.c:2602 +#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617 #, fuzzy, c-format msgid "preserving permissions for %s" msgstr "toegangsregte vir %s word gestel" @@ -245,18 +245,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:483 +#: lib/mkdir-p.c:196 src/install.c:484 #, c-format msgid "cannot change permissions of %s" msgstr "kan nie toegangsregte van %s verander nie" -#: lib/mkdir-p.c:206 src/copy.c:2261 src/install.c:709 src/install.c:722 +#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722 #, 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:915 src/tac.c:435 +#: src/split.c:929 src/tac.c:434 #, c-format msgid "memory exhausted" msgstr "geheue uitgeput" @@ -305,81 +305,81 @@ msgstr "'" msgid "%s: end of file" msgstr "%s: seek het misluk" -#: lib/regcomp.c:130 +#: lib/regcomp.c:131 msgid "Success" msgstr "" -#: lib/regcomp.c:133 +#: lib/regcomp.c:134 msgid "No match" msgstr "" -#: lib/regcomp.c:136 +#: lib/regcomp.c:137 #, fuzzy msgid "Invalid regular expression" msgstr "%s: ongeldige reëlmatige uitdrukking: %s" -#: lib/regcomp.c:139 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "" -#: lib/regcomp.c:142 +#: lib/regcomp.c:143 #, fuzzy msgid "Invalid character class name" msgstr "ongeldige karakterklas `%s'" -#: lib/regcomp.c:145 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "" -#: lib/regcomp.c:148 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "" -#: lib/regcomp.c:151 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "" -#: lib/regcomp.c:154 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "" -#: lib/regcomp.c:157 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "" -#: lib/regcomp.c:160 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "" -#: lib/regcomp.c:163 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "" -#: lib/regcomp.c:166 +#: lib/regcomp.c:167 #, fuzzy msgid "Memory exhausted" msgstr "geheue uitgeput" -#: lib/regcomp.c:169 +#: lib/regcomp.c:170 #, fuzzy msgid "Invalid preceding regular expression" msgstr "%s: ongeldige reëlmatige uitdrukking: %s" -#: lib/regcomp.c:172 +#: lib/regcomp.c:173 #, fuzzy msgid "Premature end of regular expression" msgstr "fout in soektog met reëlmatige uitdrukking" -#: lib/regcomp.c:175 +#: lib/regcomp.c:176 #, fuzzy msgid "Regular expression too big" msgstr "fout in soektog met reëlmatige uitdrukking" -#: lib/regcomp.c:178 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:703 +#: lib/regcomp.c:704 #, fuzzy msgid "No previous regular expression" msgstr "fout in soektog met reëlmatige uitdrukking" @@ -419,7 +419,7 @@ msgstr "^[jJ]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-mode-acl.c:695 src/copy.c:2284 src/cp.c:518 +#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516 #, c-format msgid "setting permissions for %s" msgstr "toegangsregte vir %s word gestel" @@ -566,13 +566,13 @@ msgstr "'open' het gefaal" msgid "Resource lost" msgstr "" -#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262 -#: lib/spawn-pipe.c:265 +#: 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:232 lib/spawn-pipe.c:346 lib/wait-process.c:282 +#: 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" @@ -588,24 +588,24 @@ msgstr "" msgid "Unknown signal %d" msgstr "" -#: lib/unicodeio.c:103 +#: lib/unicodeio.c:102 msgid "iconv function not usable" msgstr "iconv-funksie onbruikbaar" -#: lib/unicodeio.c:105 +#: lib/unicodeio.c:104 msgid "iconv function not available" msgstr "iconv-funksie is nie beskikbaar nie" -#: lib/unicodeio.c:112 +#: lib/unicodeio.c:111 msgid "character out of range" msgstr "karakter is buite die grense" -#: lib/unicodeio.c:182 +#: lib/unicodeio.c:181 #, c-format msgid "cannot convert U+%04X to local character set" msgstr "kan nie U+%04X omskakel na 'n plaaslike karakterstel nie" -#: lib/unicodeio.c:184 +#: lib/unicodeio.c:183 #, c-format msgid "cannot convert U+%04X to local character set: %s" msgstr "kan nie U+%04X omskakel na 'n plaaslike karakterstel nie: %s" @@ -791,7 +791,7 @@ msgstr "" "\n" "Rapporteer foute aan <%s>.\n" -#: lib/version-etc.c:251 src/system.h:562 +#: lib/version-etc.c:251 src/system.h:573 #, c-format msgid "%s home page: <%s>\n" msgstr "" @@ -801,7 +801,7 @@ msgstr "" msgid "%s home page: <http://www.gnu.org/software/%s/>\n" msgstr "" -#: lib/version-etc.c:256 src/system.h:563 +#: lib/version-etc.c:256 src/system.h:574 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" @@ -888,14 +888,17 @@ msgid "Simon Josefsson" msgstr "" #: src/base64.c:60 -#, c-format +#, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" "Base64 encode or decode FILE, or standard input, to standard output.\n" -"\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:64 +#: src/base64.c:67 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -905,7 +908,7 @@ msgid "" "\n" msgstr "" -#: src/base64.c:73 src/cat.c:110 src/fmt.c:293 src/shuf.c:71 src/sum.c:70 +#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -913,7 +916,7 @@ msgstr "" "\n" "Met geen LÊER, of wanneer die LÊER - is, lees standaardtoevoer.\n" -#: src/base64.c:76 +#: src/base64.c:79 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -922,37 +925,37 @@ msgid "" "from any other non-alphabet bytes in the encoded stream.\n" msgstr "" -#: src/base64.c:171 src/base64.c:208 src/csplit.c:263 src/csplit.c:1435 -#: src/join.c:451 src/shuf.c:157 src/shuf.c:361 src/tac-pipe.c:74 +#: 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 #, c-format msgid "read error" msgstr "leesfout" -#: src/base64.c:227 +#: src/base64.c:230 #, fuzzy, c-format msgid "invalid input" msgstr "ongeldige gebruiker" -#: src/base64.c:264 +#: src/base64.c:267 #, fuzzy, c-format msgid "invalid wrap size: %s" msgstr "ongeldige keepgrootte: %s" -#: src/base64.c:283 src/basename.c:173 src/comm.c:435 src/cp.c:607 -#: src/date.c:441 src/dircolors.c:447 src/du.c:894 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:169 src/install.c:929 src/join.c:961 -#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:157 src/mv.c:447 -#: src/od.c:1802 src/ptx.c:2081 src/readlink.c:154 src/seq.c:408 -#: src/shuf.c:320 src/shuf.c:339 src/sort.c:4477 src/split.c:1313 -#: src/tr.c:1797 src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:454 -#: src/uniq.c:471 src/unlink.c:81 src/uptime.c:250 src/users.c:146 -#: src/wc.c:666 src/who.c:836 src/whoami.c:79 +#: 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 msgid "extra operand %s" msgstr "ekstra operand `%s'" -#: src/base64.c:315 src/cat.c:781 +#: src/base64.c:318 src/cat.c:781 #, c-format msgid "closing standard input" msgstr "standaard-toevoer word nou toegemaak" @@ -960,15 +963,15 @@ 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/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:53 src/env.c:33 +#: 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/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:65 src/su.c:88 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 +#: 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 msgid "David MacKenzie" msgstr "" @@ -982,23 +985,23 @@ msgstr "" " of: %s OPSIE\n" #: src/basename.c:53 +#, fuzzy msgid "" "Print NAME with any leading directory components removed.\n" "If specified, also remove a trailing SUFFIX.\n" -"\n" msgstr "" "Druk NAAM sonder enige voorafgaande gidsaanduiding.\n" "Indien gespesifiseer, word die SUFFIKS agteraan ook verwyder.\n" "\n" -#: src/basename.c:59 +#: 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" msgstr "" -#: src/basename.c:66 +#: src/basename.c:67 #, c-format msgid "" "\n" @@ -1009,20 +1012,21 @@ msgid "" " %s -a any/str1 any/str2 -> \"str1\" followed by \"str2\"\n" msgstr "" -#: src/basename.c:167 src/chcon.c:531 src/chgrp.c:277 src/chmod.c:526 -#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1369 +#: 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:183 src/mkfifo.c:108 src/mknod.c:146 src/nohup.c:111 -#: src/pathchk.c:148 src/printf.c:674 src/readlink.c:146 src/realpath.c:236 -#: src/rm.c:314 src/rmdir.c:223 src/seq.c:402 src/setuidgid.c:137 -#: src/sleep.c:119 src/stat.c:1476 src/stdbuf.c:346 src/tr.c:1782 +#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 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 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:52 src/split.c:49 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/split.c:49 msgid "Torbjorn Granlund" msgstr "" @@ -1032,8 +1036,8 @@ msgstr "" msgid "Richard M. Stallman" msgstr "" -#: src/cat.c:88 src/df.c:846 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4720 src/nl.c:182 src/paste.c:435 src/pr.c:2768 src/sum.c:58 +#: 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/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 +1091,7 @@ msgstr "" msgid "cannot do ioctl on %s" msgstr "kan nie ioctl uitvoer op `%s' nie" -#: src/cat.c:637 src/dd.c:2209 src/sort.c:379 src/tee.c:165 src/yes.c:86 +#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86 #, c-format msgid "standard output" msgstr "standaard-afvoer" @@ -1104,14 +1108,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:55 src/head.c:46 src/hostid.c:33 +#: 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 msgid "Jim Meyering" msgstr "" -#: src/chcon.c:100 src/runcon.c:203 src/runcon.c:234 +#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238 #, fuzzy, c-format msgid "failed to create security context: %s" msgstr "kon nie attribute van %s verkry nie" @@ -1121,8 +1125,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:540 src/copy.c:2222 src/runcon.c:217 -#: src/stat.c:683 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221 +#: src/stat.c:702 #, fuzzy, c-format msgid "failed to get security context of %s" msgstr "kon nie attribute van %s verkry nie" @@ -1138,12 +1142,12 @@ 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:446 src/ls.c:2981 +#: src/du.c:457 src/ls.c:2981 #, 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:426 +#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437 #, c-format msgid "cannot read directory %s" msgstr "kan nie gids %s lees nie" @@ -1153,13 +1157,13 @@ 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:599 +#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562 #, 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:618 -#: src/remove.c:613 +#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642 +#: src/remove.c:576 #, fuzzy, c-format msgid "fts_close failed" msgstr "'close' het gefaal" @@ -1180,10 +1184,9 @@ msgid "" "Change the security context of each FILE to CONTEXT.\n" "With --reference, change the security context of each FILE to that of " "RFILE.\n" -"\n" msgstr "" -#: src/chcon.c:362 src/chgrp.c:123 src/chown.c:94 +#: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94 msgid "" " --dereference affect the referent of each symbolic link (this is\n" " the default), rather than the symbolic link itself\n" @@ -1191,7 +1194,7 @@ msgid "" "file\n" msgstr "" -#: src/chcon.c:367 +#: src/chcon.c:369 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" @@ -1199,22 +1202,32 @@ msgid "" " -l, --range=RANGE set range RANGE in the target security context\n" msgstr "" -#: src/chcon.c:373 +#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110 +#, fuzzy +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" + +#: src/chcon.c:379 msgid "" " --reference=RFILE use RFILE's security context rather than " "specifying\n" " a CONTEXT value\n" msgstr "" -#: src/chcon.c:377 src/chgrp.c:140 src/chown.c:118 +#: 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:380 +#: src/chcon.c:386 msgid " -v, --verbose output a diagnostic for every file processed\n" msgstr "" -#: src/chcon.c:383 src/chgrp.c:143 src/chown.c:121 +#: src/chcon.c:389 src/chgrp.c:143 src/chown.c:121 msgid "" "\n" "The following options modify how a hierarchy is traversed when the -R\n" @@ -1229,36 +1242,36 @@ msgid "" "\n" msgstr "" -#: src/chcon.c:512 src/chgrp.c:264 src/chown.c:267 +#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267 #, c-format msgid "-R --dereference requires either -H or -L" msgstr "" -#: src/chcon.c:518 +#: src/chcon.c:524 #, c-format msgid "-R -h requires -P" msgstr "" -#: src/chcon.c:533 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282 -#: src/comm.c:429 src/csplit.c:1371 src/join.c:1149 src/link.c:79 -#: src/mknod.c:148 src/setuidgid.c:139 src/tr.c:1785 +#: 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 msgid "missing operand after %s" msgstr "parameter vir `%s' ontbreek" -#: src/chcon.c:556 src/runcon.c:247 +#: src/chcon.c:562 src/runcon.c:251 #, fuzzy, c-format msgid "invalid context: %s" msgstr "ongeldige omskakeling: %s" -#: src/chcon.c:563 +#: src/chcon.c:569 #, c-format msgid "conflicting security context specifiers given" msgstr "" -#: src/chcon.c:572 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:433 src/cp.c:493 -#: src/mv.c:96 src/pwd.c:273 src/rm.c:324 src/touch.c:351 +#: 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 #, c-format msgid "failed to get attributes of %s" msgstr "kon nie attribute van %s verkry nie" @@ -1297,16 +1310,6 @@ msgid "" " ownership of a symlink)\n" msgstr "" -#: src/chgrp.c:132 src/chmod.c:387 src/chown.c:110 -#, fuzzy -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" - #: src/chgrp.c:136 msgid "" " --reference=RFILE use RFILE's group rather than specifying a\n" @@ -1528,7 +1531,7 @@ msgstr "" msgid "Roland McGrath" msgstr "" -#: src/chroot.c:97 src/install.c:575 src/setuidgid.c:110 src/setuidgid.c:120 +#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120 #, c-format msgid "invalid group %s" msgstr "ongeldige groep %s" @@ -1595,8 +1598,8 @@ msgstr "kan nie groep-ID na %ld verander nie" msgid "failed to set user-ID" msgstr "kon nie %s oopmaak nie" -#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:213 src/stdbuf.c:366 -#: src/timeout.c:402 +#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365 +#: src/timeout.c:454 #, fuzzy, c-format msgid "failed to run command %s" msgstr "kan nie bevel %s uitvoer nie" @@ -1695,20 +1698,24 @@ msgstr "veelvuldige afvoerlêers is gespesifiseer" msgid "empty %s not allowed" msgstr "" -#: src/copy.c:168 src/dd.c:1609 src/dd.c:1976 +#: 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 #, c-format -msgid "reading %s" -msgstr "besig om %s te lees" +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:426 +#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425 #, c-format msgid "cannot lseek %s" msgstr "kan nie lseek op %s doen nie" -#: src/copy.c:206 src/dd.c:2039 src/dd.c:2102 +#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151 #, c-format -msgid "writing %s" -msgstr "besig om %s te skryf" +msgid "error writing %s" +msgstr "fout met die skryf na %s" #: src/copy.c:313 #, fuzzy, c-format @@ -1730,7 +1737,7 @@ msgstr "kon nie %s oopmaak nie" msgid "clearing permissions for %s" msgstr "toegangsregte vir %s word gestel" -#: src/copy.c:697 src/copy.c:2470 src/cp.c:331 +#: src/copy.c:697 src/copy.c:2480 src/cp.c:329 #, c-format msgid "failed to preserve ownership for %s" msgstr "eienaarskap van %s kon nie behou word nie" @@ -1745,14 +1752,14 @@ msgstr "kon nie lêer %s opspoor nie" msgid "failed to preserve authorship for %s" msgstr "outeurskap van %s kon nie behou word nie" -#: src/copy.c:804 src/csplit.c:638 src/du.c:901 src/fmt.c:449 src/head.c:847 -#: src/sort.c:4489 src/split.c:1329 src/tail.c:1756 src/wc.c:678 +#: 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 "kan nie %s oopmaak om te lees nie" -#: src/copy.c:810 src/copy.c:972 src/dd.c:1546 src/dd.c:2114 src/dd.c:2252 -#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:141 +#: 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 #, c-format msgid "cannot fstat %s" msgstr "kan nie fstat op %s uitvoer nie" @@ -1772,14 +1779,14 @@ msgstr "" 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:1574 src/copy.c:1777 src/copy.c:1935 src/ln.c:314 -#: src/remove.c:267 src/remove.c:293 src/remove.c:444 src/remove.c:465 +#: 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 #, c-format msgid "cannot remove %s" msgstr "kan nie %s verwyder nie" -#: src/copy.c:886 src/copy.c:1578 src/copy.c:1772 src/copy.c:1940 -#: src/remove.c:418 +#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945 +#: src/remove.c:375 #, c-format msgid "removed %s\n" msgstr "%s is verwyder.\n" @@ -1799,191 +1806,191 @@ msgstr "kan nie 'n gewone lêer %s skep nie" msgid "failed to clone %s from %s" msgstr "kon nie %s oopmaak nie" -#: src/copy.c:1098 src/copy.c:2531 +#: src/copy.c:1098 src/copy.c:2541 #, c-format msgid "preserving times for %s" msgstr "lêertye van %s word behou" -#: src/copy.c:1170 src/copy.c:1176 src/head.c:855 src/touch.c:175 -#: src/truncate.c:413 -#, c-format -msgid "closing %s" -msgstr "besig om %s toe te maak" +#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 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:1466 +#: src/copy.c:1471 #, fuzzy, c-format msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? " msgstr "%s: oorskryf %s, moet modus %04lo ter syde gestel word? " -#: src/copy.c:1473 +#: src/copy.c:1478 #, c-format msgid "%s: overwrite %s? " msgstr "%s: oorskryf %s?" -#: src/copy.c:1542 +#: src/copy.c:1547 #, c-format msgid " (backup: %s)" msgstr "(rugsteun: %s)" -#: src/copy.c:1552 +#: src/copy.c:1557 #, c-format msgid "failed to restore the default file creation context" msgstr "" -#: src/copy.c:1584 +#: src/copy.c:1589 #, c-format msgid "cannot create hard link %s to %s" msgstr "kon nie vaste skakel %s na %s skep nie" -#: src/copy.c:1637 src/copy.c:1689 src/copy.c:2272 src/copy.c:2589 +#: 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:1220 src/truncate.c:365 +#: src/stat.c:1239 src/truncate.c:363 #, c-format msgid "cannot stat %s" msgstr "kan nie stat %s uitvoer nie" -#: src/copy.c:1645 +#: src/copy.c:1650 #, c-format msgid "omitting directory %s" msgstr "lêergids %s word oorgeslaan" -#: src/copy.c:1659 +#: src/copy.c:1664 #, 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:1707 src/ln.c:246 +#: src/copy.c:1712 src/ln.c:246 #, c-format msgid "%s and %s are the same file" msgstr "%s en %s is dieselfde lêer" -#: src/copy.c:1806 +#: src/copy.c:1811 #, 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:1824 src/ln.c:214 +#: src/copy.c:1829 src/ln.c:214 #, 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:1842 +#: src/copy.c:1847 #, 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:1856 +#: src/copy.c:1861 #, 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:1886 +#: src/copy.c:1891 #, 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:1887 +#: src/copy.c:1892 #, 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:1910 src/ln.c:276 +#: src/copy.c:1915 src/ln.c:276 #, c-format msgid "cannot backup %s" msgstr "kan nie rugsteun neem van %s nie" -#: src/copy.c:1974 +#: src/copy.c:1979 #, 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:2051 +#: src/copy.c:2056 #, 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:2068 +#: src/copy.c:2073 #, 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:2118 +#: src/copy.c:2123 #, 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:2161 +#: src/copy.c:2166 #, c-format msgid "cannot move %s to %s" msgstr "kan nie %s skuif na %s nie" -#: src/copy.c:2173 +#: src/copy.c:2178 #, 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:2207 src/install.c:905 src/mkdir.c:189 src/mkfifo.c:114 -#: src/mknod.c:167 +#: 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:2241 +#: src/copy.c:2246 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "sikliese simboliese skakel %s kan nie gekopieer word nie" -#: src/copy.c:2350 +#: src/copy.c:2355 #, 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:2357 +#: src/copy.c:2362 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "kon nie simboliese skakel %s na %s skep nie" -#: src/copy.c:2406 src/mkfifo.c:133 +#: src/copy.c:2416 src/mkfifo.c:132 #, c-format msgid "cannot create fifo %s" msgstr "kan nie die pyp %s skep nie" -#: src/copy.c:2415 +#: src/copy.c:2425 #, c-format msgid "cannot create special file %s" msgstr "kan nie spesiale lêer %s skep nie" -#: src/copy.c:2426 src/ls.c:3191 src/stat.c:902 +#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921 #, c-format msgid "cannot read symbolic link %s" msgstr "simboliese skakel %s kan nie gelees word nie" -#: src/copy.c:2453 +#: src/copy.c:2463 #, c-format msgid "cannot create symbolic link %s" msgstr "kon nie simboliese skakel %s skep nie" -#: src/copy.c:2485 +#: src/copy.c:2495 #, c-format msgid "%s has unknown file type" msgstr "%s het 'n onbekende lêertipe" -#: src/copy.c:2629 src/ln.c:358 +#: src/copy.c:2644 src/ln.c:358 #, c-format msgid "cannot un-backup %s" msgstr "kan nie %s ont-rugsteun nie" -#: src/copy.c:2633 +#: src/copy.c:2648 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (ont-rugsteun)\n" -#: src/cp.c:156 src/mv.c:284 +#: src/cp.c:156 src/mv.c:286 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -1995,25 +2002,10 @@ msgstr "" " or: %s [OPSIE]... --reference=RLÊER LÊER...\n" #: src/cp.c:162 -msgid "" -"Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" -"\n" +msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" msgstr "" -#: src/cp.c:166 src/csplit.c:1458 src/cut.c:197 src/df.c:852 src/du.c:268 -#: src/expand.c:112 src/fmt.c:275 src/fold.c:75 src/head.c:115 -#: src/install.c:612 src/kill.c:86 src/ln.c:392 src/ls.c:4726 src/mkdir.c:61 -#: src/mkfifo.c:56 src/mknod.c:58 src/mv.c:294 src/nl.c:191 src/paste.c:445 -#: src/pr.c:2777 src/ptx.c:1825 src/shred.c:153 src/shuf.c:58 src/sort.c:399 -#: src/split.c:211 src/stdbuf.c:95 src/tac.c:142 src/tail.c:268 -#: src/touch.c:226 src/truncate.c:107 src/unexpand.c:122 src/uniq.c:145 -msgid "" -"Mandatory arguments to long options are mandatory for short options too.\n" -msgstr "" -"Verpligte parameters vir langformaat opsies is ook verpligtend vir " -"kortformaat opsies.\n" - -#: src/cp.c:169 +#: src/cp.c:168 msgid "" " -a, --archive same as -dR --preserve=all\n" " --attributes-only don't copy the file data, just the " @@ -2027,32 +2019,33 @@ msgid "" " -d same as --no-dereference --preserve=links\n" msgstr "" -#: src/cp.c:178 +#: src/cp.c:177 msgid "" " -f, --force if an existing destination file cannot be\n" -" opened, remove it and try again (redundant " -"if\n" -" the -n option is used)\n" +" opened, remove it and try again (this " +"option\n" +" is ignored when the -n option is also " +"used)\n" " -i, --interactive prompt before overwrite (overrides a previous " "-n\n" " option)\n" " -H follow command-line symbolic links in SOURCE\n" msgstr "" -#: src/cp.c:188 +#: src/cp.c:186 msgid "" " -l, --link hard link files instead of copying\n" " -L, --dereference always follow symbolic links in SOURCE\n" msgstr "" -#: src/cp.c:192 +#: src/cp.c:190 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:197 +#: src/cp.c:195 msgid "" " -p same as --preserve=mode,ownership,timestamps\n" " --preserve[=ATTR_LIST] preserve the specified attributes (default:\n" @@ -2062,13 +2055,13 @@ msgid "" " all\n" msgstr "" -#: src/cp.c:205 +#: src/cp.c:203 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:209 +#: src/cp.c:207 msgid "" " -R, -r, --recursive copy directories recursively\n" " --reflink[=WHEN] control clone/CoW copies. See below\n" @@ -2077,7 +2070,7 @@ msgid "" "force)\n" msgstr "" -#: src/cp.c:215 +#: src/cp.c:213 msgid "" " --sparse=WHEN control creation of sparse files. See below\n" " --strip-trailing-slashes remove any trailing slashes from each " @@ -2085,7 +2078,7 @@ msgid "" " argument\n" msgstr "" -#: src/cp.c:220 +#: src/cp.c:218 msgid "" " -s, --symbolic-link make symbolic links instead of copying\n" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -2094,7 +2087,7 @@ msgid "" " -T, --no-target-directory treat DEST as a normal file\n" msgstr "" -#: src/cp.c:226 +#: src/cp.c:224 msgid "" " -u, --update copy only when the SOURCE file is newer\n" " than the destination file or when the\n" @@ -2103,7 +2096,7 @@ msgid "" " -x, --one-file-system stay on this file system\n" msgstr "" -#: src/cp.c:235 +#: src/cp.c:233 msgid "" "\n" "By default, sparse SOURCE files are detected by a crude heuristic and the\n" @@ -2119,7 +2112,7 @@ msgid "" "fails, or if --reflink=auto is specified, fall back to a standard copy.\n" msgstr "" -#: src/cp.c:247 src/install.c:649 src/ln.c:421 src/mv.c:321 +#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322 msgid "" "\n" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -2129,7 +2122,7 @@ msgid "" "\n" msgstr "" -#: src/cp.c:254 src/install.c:656 src/mv.c:328 +#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329 msgid "" " none, off never make backups (even if --backup is given)\n" " numbered, t make numbered backups\n" @@ -2137,7 +2130,7 @@ msgid "" " simple, never always make simple backups\n" msgstr "" -#: src/cp.c:260 +#: src/cp.c:258 msgid "" "\n" "As a special case, cp makes a backup of SOURCE when the force and backup\n" @@ -2145,90 +2138,90 @@ msgid "" "regular file.\n" msgstr "" -#: src/cp.c:319 +#: src/cp.c:317 #, c-format msgid "failed to preserve times for %s" msgstr "lêertye van %s kon nie behou word nie" -#: src/cp.c:350 +#: src/cp.c:348 #, c-format msgid "failed to preserve permissions for %s" msgstr "magtigings vir %s kon nie behou word nie" -#: src/cp.c:477 +#: src/cp.c:475 #, c-format msgid "cannot make directory %s" msgstr "kan nie gids %s maak nie" -#: src/cp.c:526 src/cp.c:545 +#: src/cp.c:524 src/cp.c:543 #, c-format msgid "%s exists but is not a directory" msgstr "%s bestaan maar is nie 'n lêergids nie" -#: src/cp.c:572 src/cp.c:1068 src/install.c:401 src/install.c:844 src/ln.c:123 -#: src/ln.c:181 src/ln.c:202 src/ln.c:516 src/mv.c:152 src/mv.c:399 -#, c-format -msgid "accessing %s" -msgstr "verkry toegang na %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 +#, fuzzy, c-format +msgid "failed to access %s" +msgstr "kon nie %s oopmaak nie" -#: src/cp.c:592 src/install.c:914 src/ln.c:546 src/mv.c:432 src/shred.c:1182 -#: src/touch.c:433 src/truncate.c:356 +#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181 +#: src/touch.c:429 src/truncate.c:354 #, fuzzy, c-format msgid "missing file operand" msgstr "lêerparameter ontbreek" -#: src/cp.c:594 src/install.c:916 src/ln.c:560 src/mv.c:434 +#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436 #, fuzzy, c-format msgid "missing destination file operand after %s" msgstr "spesifikasie lêer ontbreek" -#: src/cp.c:603 src/install.c:925 src/mv.c:443 +#: src/cp.c:601 src/install.c:926 src/mv.c:445 #, 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:619 src/cp.c:1070 src/install.c:403 src/install.c:846 -#: src/install.c:938 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:401 -#: src/mv.c:457 +#: 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 msgid "target %s is not a directory" msgstr "%s: hierdie bestemming is nie 'n lêergids nie" -#: src/cp.c:730 +#: src/cp.c:728 #, 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:1063 src/install.c:839 src/ln.c:511 src/mv.c:394 +#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395 #, fuzzy, c-format msgid "multiple target directories specified" msgstr "veelvuldige afvoerlêers is gespesifiseer" -#: src/cp.c:1108 +#: src/cp.c:1110 #, c-format msgid "cannot make both hard and symbolic links" msgstr "kan nie sowel vaste skakels as simboliese skakels maak nie" -#: src/cp.c:1115 src/mv.c:464 +#: src/cp.c:1117 src/mv.c:466 #, fuzzy, c-format msgid "options --backup and --no-clobber are mutually exclusive" msgstr "die --string en --check opsies is onderling uitsluitend" -#: src/cp.c:1121 +#: src/cp.c:1123 #, c-format msgid "--reflink can be used only with --sparse=auto" msgstr "" -#: src/cp.c:1129 src/install.c:899 src/ln.c:582 src/mv.c:472 +#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474 msgid "backup type" msgstr "rugsteuntipe" -#: src/cp.c:1154 +#: src/cp.c:1156 #, c-format msgid "cannot preserve security context without an SELinux-enabled kernel" msgstr "" -#: src/cp.c:1160 +#: src/cp.c:1162 #, c-format msgid "cannot preserve extended attributes, cp is built without xattr support" msgstr "" @@ -2238,135 +2231,134 @@ msgstr "" msgid "Stuart Kemp" msgstr "" -#: src/csplit.c:529 +#: src/csplit.c:531 #, c-format msgid "input disappeared" msgstr "toevoer het verdwyn" -#: src/csplit.c:658 src/csplit.c:669 +#: src/csplit.c:660 src/csplit.c:671 #, c-format msgid "%s: line number out of range" msgstr "%s: reëlnommer buite bereik" -#: src/csplit.c:698 +#: src/csplit.c:700 #, fuzzy, c-format msgid "%s: %s: line number out of range" msgstr "%s: `%s': reëlnommer buite bereik" -#: src/csplit.c:701 src/csplit.c:750 +#: src/csplit.c:703 src/csplit.c:752 #, c-format msgid " on repetition %s\n" msgstr "by herhaling %s\n" -#: src/csplit.c:744 +#: src/csplit.c:746 #, fuzzy, c-format msgid "%s: %s: match not found" msgstr "%s: `%s': patroon nie gevind nie" -#: src/csplit.c:808 src/csplit.c:848 src/nl.c:359 src/tac.c:274 +#: src/csplit.c:810 src/csplit.c:850 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:981 +#: src/csplit.c:983 #, fuzzy, c-format msgid "write error for %s" msgstr "skryffout vir `%s'" -#: src/csplit.c:1057 +#: src/csplit.c:1059 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: 'n heelgetal is verwag na die skeisimbool" -#: src/csplit.c:1073 +#: src/csplit.c:1075 #, fuzzy, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: `}' word benodig in herhaaltelling" -#: src/csplit.c:1083 +#: src/csplit.c:1085 #, fuzzy, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: tussen `{' en `}' moet 'n heelgetal wees" -#: src/csplit.c:1110 +#: src/csplit.c:1112 #, fuzzy, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: afsluit-skeisimbool `%c' ontbreek" -#: src/csplit.c:1127 +#: src/csplit.c:1129 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: ongeldige reëlmatige uitdrukking: %s" -#: src/csplit.c:1160 +#: src/csplit.c:1162 #, c-format msgid "%s: invalid pattern" msgstr "%s: ongeldige patroon" -#: src/csplit.c:1163 +#: src/csplit.c:1165 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: reëlnommer moet groter as nul wees" -#: src/csplit.c:1169 +#: src/csplit.c:1171 #, 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:1175 +#: src/csplit.c:1177 #, 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:1253 +#: src/csplit.c:1255 #, c-format msgid "missing conversion specifier in suffix" msgstr "ontbrekende omskakelingaanduider in suffiks" -#: src/csplit.c:1259 +#: src/csplit.c:1261 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "ontbrekende omskakelingaanduider in suffiks: %c" -#: src/csplit.c:1262 +#: src/csplit.c:1264 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "ontbrekende omskakelingaanduider in suffiks: \\%.3o" -#: src/csplit.c:1267 +#: src/csplit.c:1269 #, fuzzy, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "ontbrekende omskakelingaanduider in suffiks: %c" -#: src/csplit.c:1284 +#: src/csplit.c:1286 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "te veel %% omskakelingaanduiders in suffiks" -#: src/csplit.c:1298 +#: src/csplit.c:1300 #, c-format msgid "missing %% conversion specification in suffix" msgstr "ontbrekende %% omskakelingaanduider in suffiks" -#: src/csplit.c:1345 +#: src/csplit.c:1347 #, c-format msgid "%s: invalid number" msgstr "%s: ongeldige getal" -#: src/csplit.c:1449 +#: src/csplit.c:1451 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Gebruik so: %s [OPSIE]... LÊER PATROON...\n" -#: src/csplit.c:1453 +#: src/csplit.c:1455 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" -"\n" msgstr "" -#: src/csplit.c:1461 +#: src/csplit.c:1462 #, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2374,14 +2366,14 @@ msgid "" " -k, --keep-files do not remove output files on errors\n" msgstr "" -#: src/csplit.c:1466 +#: src/csplit.c:1467 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:1473 +#: src/csplit.c:1474 msgid "" "\n" "Read standard input if FILE is -. Each PATTERN may be:\n" @@ -2389,7 +2381,7 @@ msgstr "" "\n" "Lees vanaf standaardtoevoer as LÊER gegee is as -. Elke PATROON kan wees:\n" -#: src/csplit.c:1477 +#: src/csplit.c:1478 msgid "" "\n" " INTEGER copy up to but not including specified line number\n" @@ -2406,7 +2398,7 @@ msgstr "" msgid "David M. Ihnat" msgstr "" -#: src/cut.c:64 +#: src/cut.c:64 src/cut.c:372 msgid "fields and positions are numbered from 1" msgstr "" @@ -2416,21 +2408,20 @@ msgid "Usage: %s OPTION... [FILE]...\n" msgstr "Gebruik so: %s [OPSIE]... [LÊER]...\n" #: src/cut.c:193 -msgid "" -"Print selected parts of lines from each FILE to standard output.\n" -"\n" +#, 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:200 +#: src/cut.c:199 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:205 +#: src/cut.c:204 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2438,7 +2429,7 @@ msgid "" " -n (ignored)\n" msgstr "" -#: src/cut.c:211 +#: src/cut.c:210 #, fuzzy msgid "" " --complement complement the set of selected bytes, characters\n" @@ -2447,14 +2438,14 @@ msgstr "" " --verbose druk 'n diagnostiese boodskap op standaardafvoer\n" " direk voor elke afvoerlêer oopgemaak word\n" -#: src/cut.c:215 +#: src/cut.c:214 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:222 +#: src/cut.c:221 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2462,7 +2453,7 @@ msgid "" "in the same order that it is read, and is written exactly once.\n" msgstr "" -#: src/cut.c:228 +#: src/cut.c:227 msgid "" "Each range is one of:\n" "\n" @@ -2474,49 +2465,51 @@ msgid "" "With no FILE, or when FILE is -, read standard input.\n" msgstr "" -#: src/cut.c:368 src/cut.c:489 -msgid "invalid byte or field list" +#: src/cut.c:367 src/cut.c:493 +#, fuzzy +msgid "invalid byte, character or field list" msgstr "ongeldige greep of veldlys" -#: src/cut.c:385 +#: src/cut.c:387 #, fuzzy msgid "invalid range with no endpoint: -" msgstr "ongeldige opsie %s vir wydte" -#: src/cut.c:399 +#: src/cut.c:403 #, fuzzy msgid "invalid decreasing range" msgstr "ongeldige modusstring: %s" -#: src/cut.c:478 +#: src/cut.c:482 #, c-format msgid "byte offset %s is too large" msgstr "greepuitwyking %s is te groot" -#: src/cut.c:481 +#: src/cut.c:485 #, c-format msgid "field number %s is too large" msgstr "veldnommer %s is te groot" -#: src/cut.c:789 src/cut.c:797 +#: src/cut.c:795 src/cut.c:803 msgid "only one type of list may be specified" msgstr "slegs een soort lys mag gespesifiseer word" -#: src/cut.c:806 +#: src/cut.c:812 src/numfmt.c:1408 +#, c-format msgid "the delimiter must be a single character" msgstr "die verdeler mag net een karakter wees" -#: src/cut.c:841 +#: src/cut.c:847 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:844 +#: src/cut.c:850 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:848 +#: src/cut.c:854 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2524,11 +2517,11 @@ msgstr "" "om nie-afgeslote reëls te onderdruk, maak slegs sin\n" "\twanneer dit op velde van toepassing gemaak word" -#: src/cut.c:864 +#: src/cut.c:870 msgid "missing list of fields" msgstr "ontbrekende lys van velde" -#: src/cut.c:866 +#: src/cut.c:872 msgid "missing list of positions" msgstr "ontbrekende lys van posisies" @@ -2540,9 +2533,11 @@ msgid "" msgstr "" #: src/date.c:128 +msgid "Display the current time in the given FORMAT, or set the system date.\n" +msgstr "" + +#: src/date.c:134 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" " -I[TIMESPEC], --iso-8601[=TIMESPEC] output date/time in ISO 8601 format.\n" @@ -2551,14 +2546,14 @@ msgid "" " and time to the indicated precision.\n" msgstr "" -#: src/date.c:138 +#: src/date.c:142 msgid "" " -r, --reference=FILE display the last modification time of FILE\n" " -R, --rfc-2822 output date and time in RFC 2822 format.\n" " Example: Mon, 07 Aug 2006 12:34:56 -0600\n" msgstr "" -#: src/date.c:143 +#: src/date.c:147 msgid "" " --rfc-3339=TIMESPEC output date and time in RFC 3339 format.\n" " TIMESPEC='date', 'seconds', or 'ns' for\n" @@ -2569,7 +2564,7 @@ msgid "" " -u, --utc, --universal print or set Coordinated Universal Time\n" msgstr "" -#: src/date.c:154 +#: src/date.c:158 msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" @@ -2578,7 +2573,7 @@ msgid "" " %a locale's abbreviated weekday name (e.g., Sun)\n" msgstr "" -#: src/date.c:161 +#: src/date.c:165 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2586,7 +2581,7 @@ msgid "" " %c locale's date and time (e.g., Thu Mar 3 23:05:25 2005)\n" msgstr "" -#: src/date.c:167 +#: src/date.c:171 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2594,14 +2589,14 @@ msgid "" " %e day of month, space padded; same as %_d\n" msgstr "" -#: src/date.c:173 +#: src/date.c:177 msgid "" " %F full date; same as %Y-%m-%d\n" " %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 "" -#: src/date.c:178 +#: src/date.c:182 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2609,7 +2604,7 @@ msgid "" " %j day of year (001..366)\n" msgstr "" -#: src/date.c:184 +#: src/date.c:188 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -2617,7 +2612,7 @@ msgid "" " %M minute (00..59)\n" msgstr "" -#: src/date.c:190 +#: src/date.c:194 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2628,7 +2623,7 @@ msgid "" " %s seconds since 1970-01-01 00:00:00 UTC\n" msgstr "" -#: src/date.c:199 +#: src/date.c:203 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2636,7 +2631,7 @@ msgid "" " %u day of week (1..7); 1 is Monday\n" msgstr "" -#: src/date.c:205 +#: src/date.c:209 msgid "" " %U week number of year, with Sunday as first day of week (00..53)\n" " %V ISO week number, with Monday as first day of week (01..53)\n" @@ -2644,7 +2639,7 @@ msgid "" " %W week number of year, with Monday as first day of week (00..53)\n" msgstr "" -#: src/date.c:211 +#: src/date.c:215 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -2652,7 +2647,7 @@ msgid "" " %Y year\n" msgstr "" -#: src/date.c:217 +#: src/date.c:221 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -2664,7 +2659,7 @@ msgid "" "By default, date pads numeric fields with zeroes.\n" msgstr "" -#: src/date.c:226 +#: src/date.c:230 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -2675,7 +2670,7 @@ msgid "" " # use opposite case if possible\n" msgstr "" -#: src/date.c:235 +#: src/date.c:239 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -2684,7 +2679,7 @@ msgid "" "O to use the locale's alternate numeric symbols if available.\n" msgstr "" -#: src/date.c:242 +#: src/date.c:246 msgid "" "\n" "Examples:\n" @@ -2698,36 +2693,36 @@ msgid "" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:275 src/dd.c:2193 src/head.c:838 src/md5sum.c:477 -#: src/md5sum.c:798 src/od.c:863 src/od.c:1914 src/pr.c:1176 src/pr.c:1372 -#: src/pr.c:1494 src/stty.c:842 src/tac.c:563 src/tail.c:343 src/tee.c:126 +#: 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 #, c-format msgid "standard input" msgstr "standaardtoevoer" -#: src/date.c:303 src/date.c:523 +#: src/date.c:307 src/date.c:527 #, fuzzy, c-format msgid "invalid date %s" msgstr "ongeldige datum `%s'" -#: src/date.c:414 src/date.c:448 +#: src/date.c:418 src/date.c:452 #, fuzzy, c-format msgid "multiple output formats specified" msgstr "veelvuldige afvoerlêers is gespesifiseer" -#: src/date.c:426 +#: src/date.c:430 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "die opsies om drukdatums te spesifiseer is onderling uitsluitend" -#: src/date.c:433 +#: src/date.c:437 #, c-format msgid "the options to print and set the time may not be used together" msgstr "" "die opsies om die tyd te vertoon en te stel kan nie saam gebruik word nie" -#: src/date.c:454 +#: src/date.c:458 #, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -2735,23 +2730,23 @@ msgid "" "argument must be a format string beginning with '+'" msgstr "" -#: src/date.c:531 +#: src/date.c:535 #, c-format msgid "cannot set date" msgstr "kon nie die datum stel nie" -#: src/date.c:554 src/du.c:360 +#: src/date.c:558 src/du.c:371 #, c-format msgid "time %s is out of range" msgstr "tyd %s is buite bereik" #. This is a proper name. See the gettext manual, section Names. -#: src/dd.c:44 src/factor.c:43 src/rm.c:41 src/tail.c:69 src/touch.c:41 +#: 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 "" -#: src/dd.c:517 +#: src/dd.c:521 #, fuzzy, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -2760,7 +2755,7 @@ msgstr "" "Gebruik so: %s [GETAL]... \n" " of: %s OPSIE\n" -#: src/dd.c:522 +#: src/dd.c:526 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -2771,7 +2766,7 @@ msgid "" " ibs=BYTES read up to BYTES bytes at a time (default: 512)\n" msgstr "" -#: src/dd.c:531 +#: src/dd.c:535 #, fuzzy msgid "" " if=FILE read from FILE instead of stdin\n" @@ -2781,7 +2776,8 @@ msgid "" " oflag=FLAGS write as per the comma separated symbol list\n" " seek=N skip N obs-sized blocks at start of output\n" " skip=N skip N ibs-sized blocks at start of input\n" -" status=noxfer suppress transfer statistics\n" +" status=WHICH WHICH info to suppress outputting to stderr;\n" +" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" msgstr "" " if=LÊER lees vanaf LÊER in plaas van stdin\n" " obs=GREPE skryf GREPE(aantal) grepe op 'n slag\n" @@ -2791,10 +2787,10 @@ msgstr "" " skip=BLOKKE slaan BLOKKE(aantal) ibs-grootte blokke oor aan die begin " "van toevoer\n" -#: src/dd.c:541 +#: src/dd.c:546 msgid "" "\n" -"BLOCKS and BYTES may be followed by the following multiplicative suffixes:\n" +"N and BYTES may be followed by the following multiplicative suffixes:\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, and so on for T, P, E, Z, Y.\n" "\n" @@ -2802,7 +2798,7 @@ msgid "" "\n" msgstr "" -#: src/dd.c:550 +#: src/dd.c:555 #, fuzzy msgid "" " ascii from EBCDIC to ASCII\n" @@ -2830,7 +2826,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:563 +#: src/dd.c:568 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -2840,7 +2836,7 @@ msgid "" " fsync likewise, but also write metadata\n" msgstr "" -#: src/dd.c:571 +#: src/dd.c:576 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -2849,76 +2845,76 @@ msgid "" "suggested)\n" msgstr "" -#: src/dd.c:578 +#: src/dd.c:583 msgid " cio use concurrent I/O for data\n" msgstr "" -#: src/dd.c:580 +#: src/dd.c:585 msgid " direct use direct I/O for data\n" msgstr "" -#: src/dd.c:582 +#: src/dd.c:587 #, fuzzy msgid " directory fail unless a directory\n" msgstr "%s: hierdie bestemming is nie 'n lêergids nie" -#: src/dd.c:584 +#: src/dd.c:589 msgid " dsync use synchronized I/O for data\n" msgstr "" -#: src/dd.c:586 +#: src/dd.c:591 msgid " sync likewise, but also for metadata\n" msgstr "" -#: src/dd.c:587 +#: src/dd.c:592 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr "" -#: src/dd.c:590 +#: src/dd.c:595 msgid " nonblock use non-blocking I/O\n" msgstr "" -#: src/dd.c:592 +#: src/dd.c:597 msgid " noatime do not update access time\n" msgstr "" -#: src/dd.c:595 +#: src/dd.c:600 msgid " nocache discard cached data\n" msgstr "" -#: src/dd.c:598 +#: src/dd.c:603 msgid " noctty do not assign controlling terminal from file\n" msgstr "" -#: src/dd.c:601 +#: src/dd.c:606 msgid " nofollow do not follow symlinks\n" msgstr "" -#: src/dd.c:603 +#: src/dd.c:608 msgid " nolinks fail if multiply-linked\n" msgstr "" -#: src/dd.c:605 +#: src/dd.c:610 msgid " binary use binary I/O for data\n" msgstr "" -#: src/dd.c:607 +#: src/dd.c:612 msgid " text use text I/O for data\n" msgstr "" -#: src/dd.c:609 +#: src/dd.c:614 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:612 +#: src/dd.c:617 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:615 +#: src/dd.c:620 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:620 +#: src/dd.c:625 #, c-format msgid "" "\n" @@ -2935,28 +2931,28 @@ msgid "" "\n" msgstr "" -#: src/dd.c:676 +#: src/dd.c:683 #, c-format msgid "" "%<PRIuMAX>+%<PRIuMAX> records in\n" "%<PRIuMAX>+%<PRIuMAX> records out\n" msgstr "" -#: src/dd.c:682 +#: src/dd.c:689 #, 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:694 +#: src/dd.c:701 #, c-format msgid "%<PRIuMAX> byte (%s) copied" msgid_plural "%<PRIuMAX> bytes (%s) copied" msgstr[0] "" msgstr[1] "" -#: src/dd.c:712 +#: src/dd.c:720 msgid "Infinity B" msgstr "" @@ -2970,240 +2966,261 @@ 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:725 +#: src/dd.c:733 #, c-format msgid ", %g s, %s/s\n" msgstr "" -#: src/dd.c:804 +#: src/dd.c:812 #, c-format msgid "closing input file %s" msgstr "toevoerlêer %s word toegemaak" -#: src/dd.c:811 +#: src/dd.c:819 #, c-format msgid "closing output file %s" msgstr "afvoerlêer %s word toegemaak" -#: src/dd.c:1014 +#: src/dd.c:1022 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "" -#: src/dd.c:1085 src/dd.c:1934 +#: src/dd.c:1093 src/dd.c:1942 #, c-format msgid "writing to %s" msgstr "besig om te skryf na %s" -#: src/dd.c:1199 src/dd.c:1253 +#: src/dd.c:1207 src/dd.c:1261 #, fuzzy, c-format msgid "unrecognized operand %s" msgstr "onbekende opsie %s" -#: src/dd.c:1210 +#: src/dd.c:1218 #, fuzzy msgid "invalid conversion" msgstr "ongeldige omskakeling: %s" -#: src/dd.c:1213 src/dd.c:1289 +#: src/dd.c:1221 src/dd.c:1297 #, fuzzy msgid "invalid input flag" msgstr "ongeldige nommer by begin van veld" -#: src/dd.c:1216 src/dd.c:1283 src/dd.c:1295 +#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303 #, fuzzy msgid "invalid output flag" msgstr "ongeldige groep " -#: src/dd.c:1219 +#: src/dd.c:1227 #, fuzzy msgid "invalid status flag" msgstr "ongeldige gebruiker %s" -#: src/dd.c:1258 src/truncate.c:312 +#: src/dd.c:1266 src/truncate.c:310 #, c-format msgid "invalid number %s" msgstr "ongeldige nommer %s" -#: src/dd.c:1340 +#: src/dd.c:1348 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "" -#: src/dd.c:1342 +#: src/dd.c:1350 #, fuzzy, c-format msgid "cannot combine block and unblock" msgstr "die gebruikernaam en groepnaam mag nie albei ontbreek nie" -#: src/dd.c:1344 +#: src/dd.c:1352 #, fuzzy, c-format msgid "cannot combine lcase and ucase" msgstr "die gebruikernaam en groepnaam mag nie albei ontbreek nie" -#: src/dd.c:1346 +#: src/dd.c:1354 #, c-format msgid "cannot combine excl and nocreat" msgstr "" -#: src/dd.c:1349 +#: src/dd.c:1357 #, c-format msgid "cannot combine direct and nocache" msgstr "" -#: src/dd.c:1506 +#: src/dd.c:1514 #, 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:1593 +#: src/dd.c:1601 #, fuzzy, c-format msgid "%s: cannot skip" msgstr "%s: kan nie teruggaan nie" -#: src/dd.c:1595 src/dd.c:1614 src/dd.c:1675 +#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683 #, fuzzy, c-format msgid "%s: cannot seek" msgstr "%s: kan nie verwyder nie" -#: src/dd.c:1655 +#: src/dd.c:1663 #, c-format msgid "offset overflow while reading file %s" msgstr "" -#: src/dd.c:1667 +#: src/dd.c:1675 #, c-format msgid "warning: invalid file offset after failed read" msgstr "" -#: src/dd.c:1671 +#: src/dd.c:1679 #, c-format msgid "cannot work around kernel bug after all" msgstr "" -#: src/dd.c:1814 +#: src/dd.c:1822 #, fuzzy, c-format msgid "setting flags for %s" msgstr "die tyd van %s is verstel" -#: src/dd.c:1867 +#: src/dd.c:1875 #, c-format msgid "memory exhausted by input buffer of size %zu bytes (%s)" msgstr "" -#: src/dd.c:1881 +#: src/dd.c:1889 #, c-format msgid "memory exhausted by output buffer of size %zu bytes (%s)" msgstr "" -#: src/dd.c:1914 +#: src/dd.c:1922 #, fuzzy, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: kan nie skuif tot by uitwyking %s nie" -#: src/dd.c:2125 src/dd.c:2258 +#: src/dd.c:2133 #, c-format -msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" +msgid "failed to truncate to %<PRIdMAX> bytes in output file %s" msgstr "" -#: src/dd.c:2138 +#: src/dd.c:2146 #, c-format msgid "fdatasync failed for %s" msgstr "" -#: src/dd.c:2148 +#: src/dd.c:2156 #, fuzzy, c-format msgid "fsync failed for %s" msgstr "kon nie %s oopmaak nie" -#: src/dd.c:2199 src/dd.c:2228 +#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165 #, c-format -msgid "opening %s" -msgstr "%s word oopgemaak" +msgid "failed to open %s" +msgstr "kon nie %s oopmaak nie" -#: src/dd.c:2237 +#: src/dd.c:2246 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) " "blocks" msgstr "" -#: src/dd.c:2274 src/dd.c:2280 +#: src/dd.c:2267 +#, c-format +msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" +msgstr "" + +#: src/dd.c:2283 src/dd.c:2289 #, 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:54 src/expr.c:153 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:39 src/sleep.c:35 src/sort.c:66 +#: 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 msgid "Paul Eggert" msgstr "" -#: src/df.c:140 +#: src/df.c:172 msgid "Filesystem" msgstr "Lêerstelsel" -#: src/df.c:141 +#: src/df.c:175 msgid "Type" msgstr "Tipe" -#: src/df.c:142 +#: src/df.c:178 src/df.c:542 msgid "blocks" msgstr "blok" -#: src/df.c:142 -msgid "Inodes" -msgstr "" - -#: src/df.c:142 -msgid "Size" -msgstr "Grootte" - -#: src/df.c:143 +#: src/df.c:181 msgid "Used" msgstr "InGebruik" -#: src/df.c:143 -msgid "IUsed" -msgstr "" - -#: src/df.c:144 +#: src/df.c:184 msgid "Available" msgstr "Beskikbaar" -#: src/df.c:144 -msgid "IFree" +#: src/df.c:187 +msgid "Use%" +msgstr "Gebruik%" + +#: src/df.c:190 +msgid "Inodes" msgstr "" -#: src/df.c:144 -msgid "Avail" -msgstr "Beskikbaar" +#: src/df.c:193 +msgid "IUsed" +msgstr "" -#: src/df.c:145 -msgid "Use%" -msgstr "Gebruik%" +#: src/df.c:196 +msgid "IFree" +msgstr "" -#: src/df.c:145 +#: src/df.c:199 msgid "IUse%" msgstr "" -#: src/df.c:145 +#: src/df.c:202 +msgid "Mounted on" +msgstr "Geheg aan" + +#: src/df.c:383 +#, c-format +msgid "option --output: field '%s' unknown" +msgstr "" + +#: src/df.c:390 +#, fuzzy, c-format +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 +msgid "Size" +msgstr "Grootte" + +#: src/df.c:414 src/df.c:451 +msgid "Avail" +msgstr "Beskikbaar" + +#: src/df.c:474 msgid "Capacity" msgstr "" -#: src/df.c:146 -msgid "Mounted on" -msgstr "Geheg aan" +#. 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 +#, c-format +msgid "%s-%s" +msgstr "" -#: src/df.c:847 +#: src/df.c:1210 msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" -"\n" msgstr "" -#: src/df.c:855 +#: src/df.c:1217 msgid "" " -a, --all include dummy file systems\n" " -B, --block-size=SIZE scale sizes by SIZE before printing them. E.g.,\n" @@ -3215,7 +3232,7 @@ msgid "" " -H, --si likewise, but use powers of 1000 not 1024\n" msgstr "" -#: src/df.c:865 +#: src/df.c:1227 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3224,8 +3241,11 @@ msgid "" "(default)\n" msgstr "" -#: src/df.c:872 +#: src/df.c:1234 msgid "" +" --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" +" or print all fields if FIELD_LIST is " +"omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" " -t, --type=TYPE limit listing to file systems of type TYPE\n" @@ -3234,21 +3254,43 @@ msgid "" " -v (ignored)\n" msgstr "" -#: src/df.c:1027 +#: src/df.c:1248 +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" +msgstr "" + +#: src/df.c:1285 +#, 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 "" + +#: src/df.c:1442 #, c-format msgid "file system type %s both selected and excluded" msgstr "" -#: src/df.c:1075 +#: src/df.c:1500 msgid "Warning: " msgstr "Waarskuwing: " -#: src/df.c:1077 src/stat.c:795 +#: src/df.c:1502 src/stat.c:814 #, fuzzy msgid "cannot read table of mounted file systems" msgstr "%s kan nie die tabel met gemonteerde lêerstelsels lees nie" -#: src/df.c:1107 +#: src/df.c:1539 #, c-format msgid "no file systems processed" msgstr "" @@ -3341,7 +3383,7 @@ msgid "" " %s stdio.h -> \".\"\n" msgstr "" -#: src/du.c:260 src/sort.c:390 src/wc.c:112 +#: src/du.c:270 src/sort.c:394 src/wc.c:112 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3350,14 +3392,14 @@ msgstr "" "Gebruik so: %s [OPSIE]... GROEP LÊER...\n" " of: %s [OPSIE]... --reference=RLÊER LÊER...\n" -#: src/du.c:264 -msgid "" -"Summarize disk usage of each FILE, recursively for directories.\n" -"\n" +#: src/du.c:274 +msgid "Summarize disk usage of each FILE, recursively for directories.\n" msgstr "" -#: src/du.c:271 +#: src/du.c:280 msgid "" +" -0, --null end each output line with 0 byte rather than " +"newline\n" " -a, --all write counts for all files, not just directories\n" " --apparent-size print apparent sizes, rather than disk usage; " "although\n" @@ -3366,7 +3408,7 @@ msgid "" " fragmentation, indirect blocks, and the like\n" msgstr "" -#: src/du.c:279 +#: src/du.c:289 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" @@ -3375,9 +3417,14 @@ msgid "" " -c, --total produce a grand total\n" " -D, --dereference-args dereference only symlinks that are listed on the\n" " command line\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 "" -#: src/du.c:288 +#: src/du.c:302 msgid "" " --files0-from=F summarize disk usage of the NUL-terminated file\n" " names specified in file F;\n" @@ -3385,41 +3432,29 @@ msgid "" " -H equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" --si like -h, but use powers of 1000 not 1024\n" msgstr "" -#: src/du.c:297 +#: src/du.c:310 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 "" -#: src/du.c:302 +#: src/du.c:316 msgid "" -" -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " "default)\n" -" -0, --null end each output line with 0 byte rather than " -"newline\n" " -S, --separate-dirs 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:309 -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 "" - -#: src/du.c:318 +#: src/du.c:322 msgid "" +" -t, --threshold=SIZE exclude entries smaller than SIZE if positive,\n" +" or entries greater than SIZE if negative\n" " --time show time of the last modification of any file in " "the\n" " directory, or any of its subdirectories\n" @@ -3430,64 +3465,73 @@ msgid "" " FORMAT is interpreted like 'date'\n" msgstr "" -#: src/du.c:375 +#: src/du.c:333 +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 msgid "Infinity" msgstr "" -#: src/du.c:600 +#: src/du.c:507 +#, c-format +msgid "mount point %s already traversed" +msgstr "" + +#: src/du.c:624 #, fuzzy, c-format msgid "fts_read failed: %s" msgstr "fts_read het misluk" -#: src/du.c:724 +#: src/du.c:780 #, c-format msgid "invalid maximum depth %s" msgstr "ongeldige maksimum diepte %s" -#: src/du.c:817 +#: src/du.c:809 +#, fuzzy, c-format +msgid "invalid --threshold argument '-0'" +msgstr "ongeldige parameter: %s" + +#: src/du.c:887 #, c-format msgid "cannot both summarize and show all entries" msgstr "" -#: src/du.c:824 +#: src/du.c:894 #, c-format msgid "warning: summarizing is the same as using --max-depth=0" msgstr "" -#: src/du.c:830 +#: src/du.c:900 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "" -#: src/du.c:896 src/sort.c:4479 src/wc.c:668 +#: src/du.c:966 src/sort.c:4533 src/wc.c:668 msgid "file operands cannot be combined with --files0-from" msgstr "" -#: src/du.c:949 src/md5sum.c:587 src/od.c:903 src/tac.c:239 src/tac.c:350 -#: src/tac.c:506 src/tac.c:586 src/wc.c:733 +#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 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:963 src/sort.c:4508 src/wc.c:747 +#: src/du.c:1040 src/sort.c:4562 src/wc.c:747 #, c-format msgid "when reading file names from stdin, no file name of %s allowed" msgstr "" -#: src/du.c:980 src/du.c:988 src/wc.c:760 src/wc.c:768 +#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768 #, fuzzy msgid "invalid zero-length file name" msgstr "ongeldige groepnaam %s" -#: src/du.c:1007 src/head.c:149 src/head.c:262 src/head.c:334 src/head.c:538 -#: src/head.c:620 src/head.c:692 src/head.c:750 src/head.c:774 src/tail.c:412 -#: src/tail.c:500 src/tail.c:549 src/tail.c:642 src/tail.c:770 src/tail.c:818 -#: src/tail.c:855 src/tail.c:1782 src/tail.c:1812 src/uniq.c:395 -#, c-format -msgid "error reading %s" -msgstr "fout met die les van %s" - -#: src/du.c:1010 src/ls.c:2649 src/wc.c:791 +#: src/du.c:1088 src/ls.c:2649 src/wc.c:791 msgid "total" msgstr "totaal" @@ -3567,74 +3611,80 @@ msgid "Usage: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n" msgstr "" #: src/env.c:55 +msgid "Set each NAME to VALUE in the environment and run COMMAND.\n" +msgstr "" + +#: src/env.c:61 msgid "" -"Set each NAME to VALUE in the environment and run COMMAND.\n" -"\n" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with 0 byte rather than newline\n" " -u, --unset=NAME remove variable from the environment\n" msgstr "" -#: src/env.c:64 +#: src/env.c:68 msgid "" "\n" "A mere - implies -i. If no COMMAND, print the resulting environment.\n" msgstr "" -#: src/env.c:120 +#: src/env.c:124 #, fuzzy, c-format msgid "cannot unset %s" msgstr "kan nie stat %s uitvoer nie" -#: src/env.c:131 +#: src/env.c:135 #, fuzzy, c-format msgid "cannot set %s" msgstr "kan nie stat %s uitvoer nie" -#: src/env.c:148 +#: src/env.c:152 #, c-format msgid "cannot specify --null (-0) with command" msgstr "" #: 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" -"\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/expand.c:115 +#: src/expand.c:114 msgid "" " -i, --initial do not convert tabs after non blanks\n" " -t, --tabs=NUMBER have tabs NUMBER characters apart, not 8\n" msgstr "" -#: src/expand.c:119 +#: src/expand.c:118 msgid "" " -t, --tabs=LIST use comma separated list of explicit tab positions\n" msgstr "" -#: src/expand.c:172 src/unexpand.c:191 +#: src/expand.c:171 src/unexpand.c:190 #, c-format msgid "tab stop is too large %s" msgstr "inkeping is te groot %s" -#: src/expand.c:180 src/unexpand.c:199 +#: src/expand.c:179 src/unexpand.c:198 #, c-format msgid "tab size contains invalid character(s): %s" msgstr "" -#: src/expand.c:206 src/unexpand.c:225 +#: src/expand.c:205 src/unexpand.c:224 #, c-format msgid "tab size cannot be 0" msgstr "inkeping mag nie 0 wees nie" -#: src/expand.c:208 src/unexpand.c:227 +#: src/expand.c:207 src/unexpand.c:226 #, c-format msgid "tab sizes must be ascending" msgstr "" -#: src/expand.c:326 src/expand.c:345 src/unexpand.c:374 src/unexpand.c:419 +#: src/expand.c:325 src/expand.c:344 src/unexpand.c:373 src/unexpand.c:418 #, fuzzy, c-format msgid "input line is too long" msgstr "groepnaam te lank" @@ -3748,12 +3798,12 @@ msgstr "fout in soektog met reëlmatige uitdrukking" msgid "non-integer argument" msgstr "nie-numeriese parameter" -#: src/expr.c:793 src/truncate.c:316 +#: src/expr.c:793 src/truncate.c:314 #, c-format msgid "division by zero" msgstr "deling deur nul" -#: src/expr.c:887 src/sort.c:2029 +#: src/expr.c:887 src/sort.c:2044 #, fuzzy, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "Stel LC_ALL='C' om die probleem te systap" @@ -3763,25 +3813,32 @@ msgstr "Stel LC_ALL='C' om die probleem te systap" msgid "the strings compared were %s and %s" msgstr "Die stringe wat vergelyk is, is %s en %s." -#: src/factor.c:449 -msgid "using arbitrary-precision arithmetic" +#. This is a proper name. See the gettext manual, section Names. +#: src/factor.c:111 +msgid "Niels Moller" msgstr "" -#: src/factor.c:460 -msgid "using single-precision arithmetic" +#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459 +#, c-format +msgid "Lucas prime test failure. This should not happen" msgstr "" -#: src/factor.c:465 src/od.c:1640 src/od.c:1709 +#: src/factor.c:2092 #, c-format -msgid "%s is too large" -msgstr "%s is te groot" +msgid "squfof queue overflow" +msgstr "" -#: src/factor.c:469 +#: src/factor.c:2419 #, fuzzy, c-format msgid "%s is not a valid positive integer" msgstr "`%s' is nie 'n geldige positiewe heelgetal nie" -#: src/factor.c:494 +#: src/factor.c:2442 src/od.c:1646 src/od.c:1715 +#, c-format +msgid "%s is too large" +msgstr "%s is te groot" + +#: src/factor.c:2454 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -3790,7 +3847,7 @@ msgstr "" "Gebruik so: %s [GETAL]... \n" " of: %s OPSIE\n" -#: src/factor.c:499 +#: src/factor.c:2459 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" @@ -3814,20 +3871,19 @@ msgid "cannot stat current directory (now %s)" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/fmt.c:37 +#: src/fmt.c:38 msgid "Ross Paterson" msgstr "" -#: src/fmt.c:269 +#: src/fmt.c:270 #, fuzzy, c-format msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n" msgstr "Gebruik so: %s [-SYFERS] [OPSIE]... [LÊER]... \n" -#: src/fmt.c:270 +#: 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" -"\n" msgstr "" #: src/fmt.c:278 @@ -3838,8 +3894,8 @@ msgid "" " -s, --split-only split long lines, but do not refill\n" msgstr "" -#: src/fmt.c:285 -#, c-format +#: src/fmt.c:287 +#, 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" @@ -3847,14 +3903,14 @@ msgid "" " -g, --goal=WIDTH goal width (default of 93% of width)\n" msgstr "" -#: src/fmt.c:357 +#: src/fmt.c:359 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" "option; use -w N instead" msgstr "" -#: src/fmt.c:403 src/fmt.c:414 +#: src/fmt.c:405 src/fmt.c:416 #, c-format msgid "invalid width: %s" msgstr "ongeldige wydte: %s" @@ -3863,23 +3919,22 @@ msgstr "ongeldige wydte: %s" msgid "" "Wrap input lines in each FILE (standard input by default), writing to\n" "standard output.\n" -"\n" msgstr "" -#: src/fold.c:78 +#: src/fold.c:77 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" " -w, --width=WIDTH use WIDTH columns instead of 80\n" msgstr "" -#: src/fold.c:289 src/pr.c:836 +#: src/fold.c:288 src/pr.c:832 #, fuzzy, c-format 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:75 +#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 #: src/truncate.c:37 msgid "Padraig Brady" msgstr "" @@ -3895,17 +3950,17 @@ msgid "" "\n" msgstr "" -#: src/group-list.c:69 src/id.c:345 src/setuidgid.c:184 +#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184 #, 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:350 +#: src/group-list.c:74 src/id.c:370 #, fuzzy, c-format msgid "failed to get groups for the current process" msgstr "groep kon nie van %s na %s verander word nie\n" -#: src/group-list.c:104 +#: src/group-list.c:114 #, fuzzy, c-format msgid "cannot find name for group ID %lu" msgstr "%s: kan nie die gebruikersnaam vir UID %u opspoor nie\n" @@ -3943,14 +3998,18 @@ msgid "%s: no such user" msgstr "%s: gebruiker bestaan nie" #: 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" -"\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/head.c:118 +#: src/head.c:117 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -3960,13 +4019,13 @@ msgid "" " K lines of each file\n" msgstr "" -#: src/head.c:126 +#: 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 "" -#: src/head.c:132 +#: src/head.c:131 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -3974,58 +4033,58 @@ msgid "" "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n" msgstr "" -#: src/head.c:152 -#, c-format -msgid "error writing %s" -msgstr "fout met die skryf na %s" - -#: src/head.c:155 +#: src/head.c:154 #, c-format msgid "%s: file has shrunk too much" msgstr "" -#: src/head.c:228 src/head.c:1044 +#: src/head.c:227 src/head.c:1051 #, c-format msgid "%s: number of bytes is too large" msgstr "%s: aantal grepe is te veel" -#: src/head.c:441 +#: src/head.c:440 #, c-format msgid "%s: cannot lseek back to original position" msgstr "" -#: src/head.c:613 src/head.c:684 src/tail.c:450 +#: src/head.c:612 src/head.c:691 src/tail.c:449 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: kan nie skuif tot by uitwyking %s nie" -#: src/head.c:791 +#: src/head.c:673 +#, fuzzy, c-format +msgid "%s: failed to reset file pointer" +msgstr "%s: lêer te groot" + +#: src/head.c:798 #, c-format msgid "cannot reposition file pointer for %s" msgstr "kan nie die lêerwyser herposisioneer vir %s nie" -#: src/head.c:878 +#: src/head.c:885 #, c-format msgid "%s: %s is so large that it is not representable" msgstr "" -#: src/head.c:879 +#: src/head.c:886 msgid "number of lines" msgstr "aantal reëls" -#: src/head.c:879 +#: src/head.c:886 msgid "number of bytes" msgstr "aantal grepe" -#: src/head.c:886 src/tail.c:1947 +#: src/head.c:893 src/tail.c:1947 msgid "invalid number of lines" msgstr "ongeldige aantal reëls" -#: src/head.c:887 src/tail.c:1948 +#: src/head.c:894 src/tail.c:1948 msgid "invalid number of bytes" msgstr "ongeldige aantal grepe" -#: src/head.c:974 src/head.c:1032 +#: src/head.c:981 src/head.c:1039 #, fuzzy, c-format msgid "invalid trailing option -- %c" msgstr "ongeldige opsie -- %c" @@ -4122,86 +4181,86 @@ msgstr "" msgid "cannot get effective UID" msgstr "kan nie %s verwyder nie" -#: src/id.c:289 +#: src/id.c:311 #, fuzzy, c-format -msgid "cannot find name for user ID %lu" +msgid "cannot find name for user ID %s" msgstr "%s: kan nie die gebruikersnaam vir UID %u opspoor nie\n" -#: src/id.c:309 +#: src/id.c:329 #, c-format -msgid "uid=%lu" +msgid "uid=%s" msgstr "" -#: src/id.c:314 +#: src/id.c:334 #, c-format -msgid " gid=%lu" +msgid " gid=%s" msgstr "" -#: src/id.c:321 +#: src/id.c:341 #, c-format -msgid " euid=%lu" +msgid " euid=%s" msgstr "" -#: src/id.c:329 +#: src/id.c:349 #, c-format -msgid " egid=%lu" +msgid " egid=%s" msgstr "" -#: src/id.c:357 +#: src/id.c:377 msgid " groups=" msgstr "groepe=" -#: src/id.c:373 +#: src/id.c:393 #, c-format msgid " context=%s" msgstr "" -#: src/install.c:372 +#: src/install.c:373 #, 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:413 +#: src/install.c:414 #, c-format msgid "creating directory %s" msgstr "gids %s word geskep" -#: src/install.c:481 +#: src/install.c:482 #, c-format msgid "cannot change ownership of %s" msgstr "kan nie eienaarskap van %s verander nie" -#: src/install.c:505 +#: src/install.c:506 #, c-format msgid "cannot set time stamps for %s" msgstr "" -#: src/install.c:526 src/split.c:412 src/timeout.c:387 +#: src/install.c:527 src/split.c:426 src/timeout.c:439 #, c-format msgid "fork system call failed" msgstr "fork-stelselroep het gefaal" -#: src/install.c:530 +#: src/install.c:531 #, fuzzy, c-format msgid "cannot run %s" msgstr "kan nie strip-bevel uitvoer nie" -#: src/install.c:534 +#: src/install.c:535 #, fuzzy, c-format msgid "waiting for strip" msgstr "besig om te skryf na %s" -#: src/install.c:536 +#: src/install.c:537 #, c-format msgid "strip process terminated abnormally" msgstr "" -#: src/install.c:557 +#: src/install.c:558 #, c-format msgid "invalid user %s" msgstr "ongeldige gebruiker %s" -#: src/install.c:593 +#: src/install.c:594 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -4213,7 +4272,7 @@ msgstr "" " or: %s [OPSIE]... :GROEP LÊER...\n" " or: %s [OPSIE]... --reference=RLÊER LÊER...\n" -#: src/install.c:600 +#: src/install.c:601 msgid "" "\n" "This install program copies files (often just compiled) into destination\n" @@ -4225,7 +4284,6 @@ msgid "" "In the first three forms, copy SOURCE to DEST or multiple SOURCE(s) to\n" "the existing DIRECTORY, while setting permission modes and owner/group.\n" "In the 4th form, create all components of the given DIRECTORY(ies).\n" -"\n" msgstr "" #: src/install.c:615 @@ -4273,53 +4331,53 @@ msgid "" "directories\n" msgstr "" -#: src/install.c:858 +#: src/install.c:859 #, c-format msgid "" "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled" msgstr "" -#: src/install.c:868 +#: src/install.c:869 #, c-format msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled" msgstr "" -#: src/install.c:885 +#: src/install.c:886 #, c-format msgid "the strip option may not be used when installing a directory" msgstr "" -#: src/install.c:888 +#: src/install.c:889 #, 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:892 +#: src/install.c:893 #, c-format msgid "cannot force target context to %s and preserve it" msgstr "" -#: src/install.c:946 src/mkdir.c:202 src/stdbuf.c:327 +#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326 #, c-format msgid "invalid mode %s" msgstr "ongeldige modus %s" -#: src/install.c:953 +#: src/install.c:954 #, c-format msgid "WARNING: ignoring --strip-program option as -s option was not specified" msgstr "" -#: src/install.c:958 +#: src/install.c:959 #, 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:965 +#: src/install.c:966 #, 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:971 +#: src/install.c:972 #, c-format msgid "" "the --compare (-C) option is ignored when you specify a mode with non-" @@ -4327,7 +4385,7 @@ msgid "" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/join.c:40 src/sort.c:65 +#: src/join.c:40 src/sort.c:66 msgid "Mike Haertel" msgstr "" @@ -4383,7 +4441,7 @@ msgstr "" #: src/join.c:403 #, c-format -msgid "%s:%ju: is not sorted: %.*s" +msgid "%s:%<PRIuMAX>: is not sorted: %.*s" msgstr "" #: src/join.c:840 src/join.c:1038 @@ -4411,12 +4469,12 @@ msgstr "" msgid "conflicting empty-field replacement strings" msgstr "" -#: src/join.c:1101 src/sort.c:4414 +#: src/join.c:1101 src/sort.c:4468 #, fuzzy, c-format msgid "multi-character tab %s" msgstr "saamgestelde keepkarakter `%s'" -#: src/join.c:1105 src/sort.c:4419 +#: src/join.c:1105 src/sort.c:4473 #, c-format msgid "incompatible tabs" msgstr "onversoenbare keepkarakters" @@ -4438,12 +4496,10 @@ msgstr "" " of: %s -t [SEIN]...\n" #: src/kill.c:82 -msgid "" -"Send signals to processes, or list signals.\n" -"\n" +msgid "Send signals to processes, or list signals.\n" msgstr "" -#: src/kill.c:89 +#: src/kill.c:88 msgid "" " -s, --signal=SIGNAL, -SIGNAL\n" " specify the name or number of the signal to be sent\n" @@ -4452,7 +4508,7 @@ msgid "" " -t, --table print a table of signal information\n" msgstr "" -#: src/kill.c:97 +#: src/kill.c:96 msgid "" "\n" "SIGNAL may be a signal name like 'HUP', or a signal number like '1',\n" @@ -4460,32 +4516,32 @@ msgid "" "PID is an integer; if negative it identifies a process group.\n" msgstr "" -#: src/kill.c:206 +#: src/kill.c:205 #, c-format msgid "%s: invalid process id" msgstr "%s: ongeldige proses-id" -#: src/kill.c:260 +#: src/kill.c:259 #, c-format msgid "invalid option -- %c" msgstr "ongeldige opsie -- %c" -#: src/kill.c:269 +#: src/kill.c:268 #, c-format msgid "%s: multiple signals specified" msgstr "%s: veelvuldige seine is gespesifiseer" -#: src/kill.c:283 +#: src/kill.c:282 #, c-format msgid "multiple -l or -t options specified" msgstr "veelvuldige -l of -t opsies is gespesifiseer" -#: src/kill.c:300 +#: src/kill.c:299 #, c-format msgid "cannot combine signal with -l or -t" msgstr "" -#: src/kill.c:306 +#: src/kill.c:305 #, c-format msgid "no process ID specified" msgstr "geen proses-id is gespesifiseer" @@ -4589,10 +4645,9 @@ msgid "" "When creating hard links, each TARGET must exist. Symbolic links\n" "can hold arbitrary text; if later resolved, a relative link is\n" "interpreted in relation to its parent directory.\n" -"\n" msgstr "" -#: src/ln.c:395 +#: src/ln.c:394 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -4605,7 +4660,7 @@ msgid "" " -f, --force remove existing destination files\n" msgstr "" -#: src/ln.c:403 +#: src/ln.c:402 msgid "" " -i, --interactive prompt whether to remove destinations\n" " -L, --logical dereference TARGETs that are symbolic links\n" @@ -4617,7 +4672,7 @@ msgid "" " -s, --symbolic make symbolic links instead of hard links\n" msgstr "" -#: src/ln.c:412 +#: src/ln.c:411 msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" " -t, --target-directory=DIRECTORY specify the DIRECTORY in which to " @@ -4627,18 +4682,10 @@ msgid "" " -v, --verbose print name of each linked file\n" msgstr "" -#: src/ln.c:428 -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 "" - -#: src/ln.c:435 +#: src/ln.c:433 #, 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 "" @@ -4709,7 +4756,7 @@ msgstr "" msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "" -#: src/ls.c:1750 src/ptx.c:1976 +#: src/ls.c:1750 src/ptx.c:1975 #, c-format msgid "invalid line width: %s" msgstr "ongeldige reëlwydte: %s" @@ -4773,7 +4820,7 @@ msgstr "lêergids %s word gelees" msgid "closing directory %s" msgstr "lêergids %s word oorgeslaan" -#: src/ls.c:3301 +#: src/ls.c:3302 #, c-format msgid "cannot compare file names %s and %s" msgstr "" @@ -4782,10 +4829,9 @@ msgstr "" msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" -"\n" msgstr "" -#: src/ls.c:4729 +#: src/ls.c:4728 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -4794,7 +4840,7 @@ msgid "" "characters\n" msgstr "" -#: src/ls.c:4735 +#: src/ls.c:4734 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them. E." "g.,\n" @@ -4808,7 +4854,7 @@ msgid "" " otherwise: sort by ctime, newest first\n" msgstr "" -#: src/ls.c:4745 +#: src/ls.c:4744 msgid "" " -C list entries by columns\n" " --color[=WHEN] colorize the output. WHEN defaults to " @@ -4820,7 +4866,7 @@ msgid "" " -D, --dired generate output designed for Emacs' dired mode\n" msgstr "" -#: src/ls.c:4753 +#: src/ls.c:4752 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -4830,11 +4876,11 @@ msgid "" " --full-time like -l --time-style=full-iso\n" msgstr "" -#: src/ls.c:4761 +#: src/ls.c:4760 msgid " -g like -l, but do not list owner\n" msgstr "" -#: src/ls.c:4764 +#: src/ls.c:4763 msgid "" " --group-directories-first\n" " group directories before files.\n" @@ -4842,7 +4888,7 @@ msgid "" " use of --sort=none (-U) disables grouping\n" msgstr "" -#: src/ls.c:4770 +#: src/ls.c:4769 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" @@ -4850,7 +4896,7 @@ msgid "" " --si likewise, but use powers of 1000 not 1024\n" msgstr "" -#: src/ls.c:4776 +#: src/ls.c:4775 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -4863,7 +4909,7 @@ msgid "" " (overridden by -a or -A)\n" msgstr "" -#: src/ls.c:4786 +#: src/ls.c:4785 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -4875,7 +4921,7 @@ msgid "" " -k, --kibibytes use 1024-byte blocks\n" msgstr "" -#: src/ls.c:4796 +#: src/ls.c:4795 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -4885,7 +4931,7 @@ msgid "" "entries\n" msgstr "" -#: src/ls.c:4804 +#: src/ls.c:4803 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. " @@ -4896,7 +4942,7 @@ msgid "" " append / indicator to directories\n" msgstr "" -#: src/ls.c:4812 +#: src/ls.c:4811 msgid "" " -q, --hide-control-chars print ? instead of non graphic characters\n" " --show-control-chars show non graphic characters as-is (default\n" @@ -4908,7 +4954,7 @@ msgid "" "escape\n" msgstr "" -#: src/ls.c:4821 +#: src/ls.c:4820 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -4916,7 +4962,7 @@ msgid "" "blocks\n" msgstr "" -#: src/ls.c:4826 +#: src/ls.c:4825 msgid "" " -S sort by file size\n" " --sort=WORD sort by WORD instead of name: none -U,\n" @@ -4928,7 +4974,7 @@ msgid "" " if --sort=time\n" msgstr "" -#: src/ls.c:4836 +#: src/ls.c:4835 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, +FORMAT.\n" @@ -4940,13 +4986,13 @@ msgid "" " takes effect only outside the POSIX locale\n" msgstr "" -#: src/ls.c:4845 +#: src/ls.c:4844 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:4849 +#: src/ls.c:4848 msgid "" " -u with -lt: sort by, and show, access time\n" " with -l: show access time and sort by name\n" @@ -4955,7 +5001,7 @@ msgid "" " -v natural sort of (version) numbers within text\n" msgstr "" -#: src/ls.c:4856 +#: src/ls.c:4855 msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" @@ -4965,7 +5011,7 @@ msgid "" " -1 list one file per line\n" msgstr "" -#: src/ls.c:4866 +#: src/ls.c:4865 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -4974,7 +5020,7 @@ msgid "" "variable can change the settings. Use the dircolors command to set it.\n" msgstr "" -#: src/ls.c:4873 +#: src/ls.c:4872 msgid "" "\n" "Exit status:\n" @@ -4998,7 +5044,7 @@ msgstr "" msgid "David Madore" msgstr "" -#: src/md5sum.c:162 +#: src/md5sum.c:164 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -5011,13 +5057,13 @@ msgstr "" "Met geen LÊER, of as LÊER gegee is as -, lees vanaf standaardtoevoer.\n" "\n" -#: src/md5sum.c:172 +#: src/md5sum.c:174 msgid "" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr "" -#: src/md5sum.c:176 +#: src/md5sum.c:178 #, fuzzy msgid " -b, --binary read in binary mode\n" msgstr "" @@ -5025,21 +5071,25 @@ msgstr "" " -B, --binary skryf binêre data na die konsole-toestel.\n" "\n" -#: src/md5sum.c:179 +#: src/md5sum.c:181 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr "" -#: src/md5sum.c:183 +#: src/md5sum.c:184 +msgid " --tag create a BSD-style checksum\n" +msgstr "" + +#: src/md5sum.c:188 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" -#: src/md5sum.c:187 +#: src/md5sum.c:192 msgid " -t, --text read in text mode (default)\n" msgstr "" -#: src/md5sum.c:190 +#: src/md5sum.c:195 msgid "" "\n" "The following three options are useful only when verifying checksums:\n" @@ -5049,12 +5099,12 @@ msgid "" "\n" msgstr "" -#: src/md5sum.c:198 +#: src/md5sum.c:203 msgid "" " --strict with --check, exit non-zero for any invalid input\n" msgstr "" -#: src/md5sum.c:203 +#: src/md5sum.c:208 #, c-format msgid "" "\n" @@ -5064,77 +5114,87 @@ msgid "" "space for text), and name for each FILE.\n" msgstr "" -#: src/md5sum.c:502 +#: src/md5sum.c:523 #, c-format msgid "%s: too many checksum lines" msgstr "" -#: src/md5sum.c:526 +#: src/md5sum.c:547 #, c-format msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line" msgstr "" -#: src/md5sum.c:551 +#: src/md5sum.c:572 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: MISLUKTE open of lees\n" -#: src/md5sum.c:574 +#: src/md5sum.c:595 msgid "FAILED" msgstr "GEFAAL" -#: src/md5sum.c:576 +#: src/md5sum.c:597 msgid "OK" msgstr "OK" -#: src/md5sum.c:600 +#: src/md5sum.c:621 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "" -#: src/md5sum.c:610 +#: src/md5sum.c:631 #, c-format msgid "WARNING: %<PRIuMAX> line is improperly formatted" msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted" msgstr[0] "" msgstr[1] "" -#: src/md5sum.c:618 +#: src/md5sum.c:639 #, 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:626 +#: src/md5sum.c:647 #, 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:704 +#: src/md5sum.c:760 +#, c-format +msgid "--tag does not support --text mode" +msgstr "" + +#: src/md5sum.c:766 +#, 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 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" msgstr "" -#: src/md5sum.c:712 +#: src/md5sum.c:781 #, 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:719 +#: src/md5sum.c:788 #, 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:726 +#: src/md5sum.c:795 #, 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:733 +#: src/md5sum.c:802 #, 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" @@ -5145,14 +5205,13 @@ msgid "Usage: %s [OPTION]... DIRECTORY...\n" msgstr "Gebruik so: %s [OPSIE]... GIDS...\n" #: src/mkdir.c:57 -msgid "" -"Create the DIRECTORY(ies), if they do not already exist.\n" -"\n" +#, 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:64 +#: src/mkdir.c:63 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" @@ -5161,7 +5220,7 @@ msgid "" " directory to CTX\n" msgstr "" -#: src/mkdir.c:169 +#: src/mkdir.c:168 #, c-format msgid "created directory %s" msgstr "gids %s is geskep" @@ -5172,27 +5231,25 @@ msgid "Usage: %s [OPTION]... NAME...\n" msgstr "Gebruik so: %s [OPSIE]... NAAM...\n" #: src/mkfifo.c:52 -msgid "" -"Create named pipes (FIFOs) with the given NAMEs.\n" -"\n" +msgid "Create named pipes (FIFOs) with the given NAMEs.\n" msgstr "" -#: src/mkfifo.c:59 src/mknod.c:61 +#: src/mkfifo.c:58 src/mknod.c:60 msgid "" " -m, --mode=MODE set file permission bits to MODE, not a=rw - umask\n" msgstr "" -#: src/mkfifo.c:62 +#: src/mkfifo.c:61 msgid "" " -Z, --context=CTX set the SELinux security context of each NAME to CTX\n" msgstr "" -#: src/mkfifo.c:122 src/mknod.c:128 +#: src/mkfifo.c:121 src/mknod.c:127 #, c-format msgid "invalid mode" msgstr "ongeldige modus" -#: src/mkfifo.c:127 src/mknod.c:133 +#: src/mkfifo.c:126 src/mknod.c:132 #, c-format msgid "mode must specify only file permission bits" msgstr "" @@ -5203,16 +5260,14 @@ msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n" msgstr "" #: src/mknod.c:54 -msgid "" -"Create the special file NAME of the given TYPE.\n" -"\n" +msgid "Create the special file NAME of the given TYPE.\n" msgstr "" -#: src/mknod.c:64 +#: src/mknod.c:63 msgid " -Z, --context=CTX set the SELinux security context of NAME to CTX\n" msgstr "" -#: src/mknod.c:69 +#: src/mknod.c:68 msgid "" "\n" "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n" @@ -5221,7 +5276,7 @@ msgid "" "otherwise, as decimal. TYPE may be:\n" msgstr "" -#: src/mknod.c:76 +#: src/mknod.c:75 msgid "" "\n" " b create a block (buffered) special file\n" @@ -5229,42 +5284,42 @@ msgid "" " p create a FIFO\n" msgstr "" -#: src/mknod.c:151 +#: src/mknod.c:150 #, fuzzy msgid "Special files require major and minor device numbers." msgstr "ongeldige subtoestelnommer %s" -#: src/mknod.c:161 +#: src/mknod.c:160 #, fuzzy msgid "Fifos do not have major and minor device numbers." msgstr "ongeldige subtoestelnommer %s" -#: src/mknod.c:177 +#: src/mknod.c:176 #, c-format msgid "block special files not supported" msgstr "spesiale bloklêers word nie ondersteun nie" -#: src/mknod.c:186 +#: src/mknod.c:185 #, c-format msgid "character special files not supported" msgstr "spesiale karakterlêers word nie ondersteun nie" -#: src/mknod.c:202 +#: src/mknod.c:201 #, c-format msgid "invalid major device number %s" msgstr "ongeldige hooftoestelnommer %s" -#: src/mknod.c:207 +#: src/mknod.c:206 #, c-format msgid "invalid minor device number %s" msgstr "ongeldige subtoestelnommer %s" -#: src/mknod.c:212 +#: src/mknod.c:211 #, c-format msgid "invalid device %s %s" msgstr "ongeldige toestel %s %s" -#: src/mknod.c:226 +#: src/mknod.c:225 #, c-format msgid "invalid device type %s" msgstr "ongeldige toesteltipe %s" @@ -5323,58 +5378,56 @@ msgid "" " directory specified via -p; else /tmp [deprecated]\n" msgstr "" -#: src/mktemp.c:222 +#: src/mktemp.c:223 #, fuzzy, c-format msgid "failed to redirect stderr to /dev/null" msgstr "kon nie standaardfoutafvoer herlei nie" -#: src/mktemp.c:228 +#: src/mktemp.c:229 #, fuzzy, c-format msgid "too many templates" msgstr "te veel parameters" -#: src/mktemp.c:248 +#: src/mktemp.c:249 #, c-format msgid "with --suffix, template %s must end in X" msgstr "" -#: src/mktemp.c:273 src/split.c:1117 +#: src/mktemp.c:274 src/split.c:1130 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "" -#: src/mktemp.c:278 +#: src/mktemp.c:279 #, c-format msgid "too few X's in template %s" msgstr "" -#: src/mktemp.c:291 +#: src/mktemp.c:292 #, c-format msgid "invalid template, %s, contains directory separator" msgstr "" -#: src/mktemp.c:305 +#: src/mktemp.c:306 #, c-format msgid "invalid template, %s; with --tmpdir, it may not be absolute" msgstr "" -#: src/mktemp.c:325 +#: src/mktemp.c:326 #, fuzzy, c-format msgid "failed to create directory via template %s" msgstr "Kan nie lêergids %s skep nie." -#: src/mktemp.c:335 +#: src/mktemp.c:336 #, fuzzy, c-format msgid "failed to create file via template %s" msgstr "lêertye van %s kon nie behou word nie" -#: src/mv.c:290 -msgid "" -"Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" -"\n" +#: src/mv.c:292 +msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" msgstr "" -#: src/mv.c:297 +#: src/mv.c:298 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -5387,7 +5440,7 @@ msgid "" "effect.\n" msgstr "" -#: src/mv.c:306 +#: src/mv.c:307 msgid "" " --strip-trailing-slashes remove any trailing slashes from each " "SOURCE\n" @@ -5395,7 +5448,7 @@ msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" msgstr "" -#: src/mv.c:311 +#: src/mv.c:312 msgid "" " -t, --target-directory=DIRECTORY move all SOURCE arguments into " "DIRECTORY\n" @@ -5415,28 +5468,30 @@ msgstr "Gebruik so: %s [OPSIE] [BEVEL [ARG]...]\n" #, c-format msgid "" "Run COMMAND with an adjusted niceness, which affects process scheduling.\n" -"With no COMMAND, print the current niceness. Nicenesses range from\n" -"%d (most favorable scheduling) to %d (least favorable).\n" -"\n" -" -n, --adjustment=N add integer N to the niceness (default 10)\n" +"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 "" + +#: src/nice.c:82 +msgid " -n, --adjustment=N add integer N to the niceness (default 10)\n" msgstr "" -#: src/nice.c:168 +#: src/nice.c:172 #, fuzzy, c-format msgid "invalid adjustment %s" msgstr "ongeldige parameter: %s" -#: src/nice.c:177 +#: src/nice.c:181 #, c-format msgid "a command must be given with an adjustment" msgstr "" -#: src/nice.c:184 src/nice.c:195 +#: src/nice.c:188 src/nice.c:199 #, fuzzy, c-format msgid "cannot get niceness" msgstr "kan nie die stelselnaam vasstel nie" -#: src/nice.c:201 +#: src/nice.c:205 #, fuzzy, c-format msgid "cannot set niceness" msgstr "kon nie die datum stel nie" @@ -5446,21 +5501,25 @@ msgstr "kon nie die datum stel nie" msgid "Scott Bartram" msgstr "" -#: src/nl.c:186 +#: 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" -"\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/nl.c:194 +#: src/nl.c:186 msgid "" " -b, --body-numbering=STYLE use STYLE for numbering body lines\n" " -d, --section-delimiter=CC use CC for separating logical pages\n" " -f, --footer-numbering=STYLE use STYLE for numbering footer lines\n" msgstr "" -#: src/nl.c:199 +#: src/nl.c:191 msgid "" " -h, --header-numbering=STYLE use STYLE for numbering header lines\n" " -i, --line-increment=NUMBER line number increment at each line\n" @@ -5472,13 +5531,13 @@ msgid "" " -s, --number-separator=STRING add STRING after (possible) line number\n" msgstr "" -#: src/nl.c:207 +#: src/nl.c:199 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 "" -#: src/nl.c:213 +#: src/nl.c:205 msgid "" "\n" "By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC are\n" @@ -5486,7 +5545,7 @@ msgid "" "second character implies :. Type \\\\ for \\. STYLE is one of:\n" msgstr "" -#: src/nl.c:219 +#: src/nl.c:211 msgid "" "\n" " a number all lines\n" @@ -5503,52 +5562,47 @@ msgid "" "\n" msgstr "" -#: src/nl.c:286 +#: src/nl.c:278 #, fuzzy, c-format msgid "line number overflow" msgstr "veldnommer is nul" -#: src/nl.c:486 +#: src/nl.c:478 #, c-format msgid "invalid header numbering style: %s" msgstr "ongeldige styl vir kopnommering: %s" -#: src/nl.c:494 +#: src/nl.c:486 #, c-format msgid "invalid body numbering style: %s" msgstr "ongeldige styl vir lyfnommering: %s" -#: src/nl.c:502 +#: src/nl.c:494 #, c-format msgid "invalid footer numbering style: %s" msgstr "ongeldige styl vir voetnommering: %s" -#: src/nl.c:511 +#: src/nl.c:503 #, c-format msgid "invalid starting line number: %s" msgstr "ongeldige beginreëlnommer: %s" -#: src/nl.c:517 -#, c-format -msgid "WARNING: --page-increment is deprecated; use --line-increment instead" -msgstr "" - -#: src/nl.c:524 +#: src/nl.c:512 #, c-format msgid "invalid line number increment: %s" msgstr "ongeldige inkrement vir reëlnommers: %s" -#: src/nl.c:536 +#: src/nl.c:524 #, c-format msgid "invalid number of blank lines: %s" msgstr "ongeldige aantal leë reëls: %s" -#: src/nl.c:550 +#: src/nl.c:538 #, c-format msgid "invalid line number field width: %s" msgstr "ongeldige wydte vir reëlnommer veld: %s" -#: src/nl.c:569 +#: src/nl.c:557 #, c-format msgid "invalid line numbering format: %s" msgstr "ongeldige reëlnommeringformaat: %s" @@ -5589,11 +5643,6 @@ msgstr "herleiding van standaardafvoer het misluk" msgid "ignoring input" msgstr "all parameters word geïgnoreer" -#: src/nohup.c:163 src/nohup.c:165 -#, c-format -msgid "failed to open %s" -msgstr "kon nie %s oopmaak nie" - #: src/nohup.c:175 #, fuzzy, c-format msgid "ignoring input and appending output to %s" @@ -5625,32 +5674,366 @@ msgid "failed to redirect standard error" msgstr "kon nie standaardfoutafvoer herlei nie" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:32 +#: src/nproc.c:33 msgid "Giuseppe Scrivano" msgstr "" -#: src/nproc.c:56 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 +#: src/nproc.c:57 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Gebruik so: %s [OPSIE]...\n" -#: src/nproc.c:57 -msgid "" -"Print the number of processing units available to the current process,\n" -"which may be less than the number of online processors\n" -"\n" +#: src/nproc.c:58 +msgid "" +"Print the number of processing units available to the current process,\n" +"which may be less than the number of online processors\n" +"\n" +msgstr "" + +#: src/nproc.c:63 +msgid "" +" --all print the number of installed processors\n" +" --ignore=N if possible, exclude N processing units\n" +msgstr "" + +#: src/nproc.c:107 +#, fuzzy, c-format +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 +msgid "Assaf Gordon" +msgstr "" + +#: src/numfmt.c:676 +#, fuzzy, c-format +msgid "value too large to be converted: '%s'" +msgstr "%s: waarde is nie volledig omgeskakel nie" + +#: src/numfmt.c:680 +#, fuzzy, c-format +msgid "invalid number: '%s'" +msgstr "ongeldige nommer %s" + +#: src/numfmt.c:684 +#, c-format +msgid "rejecting suffix in input: '%s' (consider using --from)" +msgstr "" + +#: src/numfmt.c:688 +#, fuzzy, c-format +msgid "invalid suffix in input: '%s'" +msgstr "ongeldige heelgetalparameter `%s'" + +#: src/numfmt.c:692 +#, c-format +msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)" +msgstr "" + +#: src/numfmt.c:723 +#, fuzzy, c-format +msgid "failed to prepare value '%Lf' for printing" +msgstr "%s: lêer te lank" + +#: src/numfmt.c:787 +#, fuzzy, c-format +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 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [NUMBER]...\n" +msgstr "Gebruik so: %s [OPSIE]... [GEBRUIKER]...\n" + +#: src/numfmt.c:816 +msgid "" +"Reformat NUMBER(s), or the numbers from standard input if none are " +"specified.\n" +msgstr "" + +#: src/numfmt.c:820 +msgid " --debug print warnings about invalid input\n" +msgstr "" + +#: src/numfmt.c:823 +msgid "" +" -d, --delimiter=X use X instead of whitespace for field delimiter\n" +msgstr "" + +#: src/numfmt.c:826 +msgid "" +" --field=N replace the number in input field N (default is 1)\n" +msgstr "" + +#: src/numfmt.c:829 +msgid "" +" --format=FORMAT use printf style floating-point FORMAT;\n" +" see FORMAT below for details\n" +msgstr "" + +#: src/numfmt.c:833 +msgid "" +" --from=UNIT auto-scale input numbers to UNITs; default is " +"'none';\n" +" see UNIT below\n" +msgstr "" + +#: src/numfmt.c:837 +msgid "" +" --from-unit=N specify the input unit size (instead of the default " +"1)\n" +msgstr "" + +#: src/numfmt.c:840 +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 "" + +#: src/numfmt.c:844 +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 +msgid "" +" --invalid=MODE failure mode for invalid numbers: MODE can be:\n" +" abort (default), fail, warn, ignore\n" +msgstr "" + +#: src/numfmt.c:852 +msgid "" +" --padding=N pad the output to N characters; positive N will\n" +" right-align; negative N will left-align;\n" +" padding is ignored if the output is wider than N;\n" +" the default is to automatically pad if a " +"whitespace\n" +" is found\n" +msgstr "" + +#: src/numfmt.c:859 +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 +msgid "" +" --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" +" SUFFIX in input numbers\n" +msgstr "" + +#: src/numfmt.c:867 +msgid "" +" --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" +msgstr "" + +#: src/numfmt.c:870 +msgid "" +" --to-unit=N the output unit size (instead of the default 1)\n" +msgstr "" + +#: src/numfmt.c:877 +msgid "" +"\n" +"UNIT options:\n" +msgstr "" + +#: src/numfmt.c:880 +msgid " none no auto-scaling is done; suffixes will trigger an error\n" +msgstr "" + +#: src/numfmt.c:883 +msgid "" +" auto accept optional single/two letter suffix:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" +msgstr "" + +#: src/numfmt.c:889 +msgid "" +" si accept optional single letter suffix:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:894 +msgid "" +" iec accept optional single letter suffix:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:899 +msgid "" +" iec-i accept optional two-letter suffix:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:905 +#, 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" +msgstr "" + +#: src/numfmt.c:912 +#, c-format +msgid "" +"\n" +"Exit status is 0 if all input numbers were successfully converted.\n" +"By default, %s will stop at the first conversion error with exit status 2.\n" +"With --invalid='fail' a warning is printed for each conversion error\n" +"and the exit status is 2. With --invalid='warn' each conversion error is\n" +"diagnosed, but the exit status is 0. With --invalid='ignore' conversion\n" +"errors are not diagnosed and the exit status is 0.\n" +msgstr "" + +#: src/numfmt.c:921 +#, c-format +msgid "" +"\n" +"Examples:\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" +msgstr "" + +#: src/numfmt.c:974 src/seq.c:212 +#, c-format +msgid "format %s has no %% directive" +msgstr "" + +#: src/numfmt.c:990 +#, fuzzy, c-format +msgid "invalid format %s (width overflow)" +msgstr "ongeldige wydte vir formaat" + +#: src/numfmt.c:1007 src/seq.c:229 +#, c-format +msgid "format %s ends in %%" +msgstr "" + +#: src/numfmt.c:1010 +#, c-format +msgid "invalid format %s, directive must be %%['][-][N]f" +msgstr "" + +#: src/numfmt.c:1018 src/seq.c:236 +#, 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 "ongeldige heelgetalparameter `%s'" + +#: src/numfmt.c:1092 +#, c-format +msgid "value too large to be printed: '%Lg' (consider using --to)" +msgstr "" + +#: src/numfmt.c:1100 +#, c-format +msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" +msgstr "" + +#: src/numfmt.c:1184 +#, c-format +msgid "large input value '%s': possible precision loss" +msgstr "" + +#: src/numfmt.c:1293 +#, 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 "ongeldige tipe-string `%s'" + +#: src/numfmt.c:1401 +#, fuzzy, c-format +msgid "invalid field value '%s'" +msgstr "ongeldige veldnommer: `%s'" + +#: src/numfmt.c:1430 +#, fuzzy, c-format +msgid "invalid header value '%s'" +msgstr "ongeldige datum `%s'" + +#: src/numfmt.c:1456 +#, 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 +#, fuzzy, c-format +msgid "no conversion option specified" +msgstr "veelvuldige -l of -t opsies is gespesifiseer" + +#: src/numfmt.c:1471 +#, c-format +msgid "grouping cannot be combined with --to" +msgstr "" + +#: src/numfmt.c:1473 +#, c-format +msgid "grouping has no effect in this locale" msgstr "" -#: src/nproc.c:62 -msgid "" -" --all print the number of installed processors\n" -" --ignore=N if possible, exclude N processing units\n" +#: src/numfmt.c:1486 +#, c-format +msgid "--header ignored with command-line input" msgstr "" -#: src/nproc.c:106 +#: src/numfmt.c:1511 #, fuzzy, c-format -msgid "%s: invalid number to ignore" -msgstr "%s: ongeldige aantal reëls" +msgid "error reading input" +msgstr "fout met die les van %s" + +#: src/numfmt.c:1520 +#, fuzzy, c-format +msgid "failed to convert some of the input numbers" +msgstr "herleiding van standaardafvoer het misluk" #: src/od.c:294 #, c-format @@ -5672,29 +6055,39 @@ msgid "" msgstr "" #: src/od.c:307 -msgid "All arguments to long options are mandatory for short options.\n" +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" +"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" +"at first byte printed, incremented when dump is progressing.\n" +"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 "" -#: src/od.c:310 +#: src/od.c:318 msgid "" -" -A, --address-radix=RADIX decide how file offsets are printed\n" +" -A, --address-radix=RADIX output format for file offsets. RADIX is one\n" +" of [doxn], for Decimal, Octal, Hex or None\n" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" -#: src/od.c:314 +#: src/od.c:323 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" -" --traditional accept arguments in traditional form\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:324 +#: src/od.c:336 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" @@ -5702,7 +6095,7 @@ msgid "" " -d same as -t u2, select unsigned decimal 2-byte units\n" msgstr "" -#: src/od.c:332 +#: src/od.c:345 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -5712,27 +6105,16 @@ msgid "" " -x same as -t x2, select hexadecimal 2-byte units\n" msgstr "" -#: src/od.c:340 +#: src/od.c:353 msgid "" "\n" -"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" -"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" -"at first byte printed, incremented when dump is progressing.\n" -"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 "" - -#: src/od.c:349 -msgid "" "\n" "TYPE is made up of one or more of these specifications:\n" -"\n" " a named character, ignoring high-order bit\n" " c ASCII character or backslash escape\n" msgstr "" -#: src/od.c:356 +#: src/od.c:360 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -5741,83 +6123,84 @@ msgid "" " x[SIZE] hexadecimal, SIZE bytes per integer\n" msgstr "" -#: src/od.c:363 +#: src/od.c:367 msgid "" "\n" -"SIZE is a number. For TYPE in doux, SIZE may also be C for\n" +"SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" "sizeof(char), S for sizeof(short), I for sizeof(int) or L for\n" "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 "" -#: src/od.c:370 +#: src/od.c:374 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" +"Adding a z suffix to any type displays printable characters at the end of\n" +"each output line.\n" msgstr "" -#: src/od.c:380 +#: src/od.c:379 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" +"\n" +"BYTES is hex with 0x or 0X prefix, and may have a multiplier suffix:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"and so on for G, T, P, E, Z, Y.\n" msgstr "" -#: src/od.c:633 src/od.c:753 +#: src/od.c:639 src/od.c:759 #, fuzzy, c-format msgid "invalid type string %s" msgstr "ongeldige tipe-string `%s'" -#: src/od.c:643 +#: src/od.c:649 #, c-format msgid "" "invalid type string %s;\n" "this system doesn't provide a %lu-byte integral type" msgstr "" -#: src/od.c:764 +#: src/od.c:770 #, c-format msgid "" "invalid type string %s;\n" "this system doesn't provide a %lu-byte floating point type" msgstr "" -#: src/od.c:822 +#: src/od.c:828 #, fuzzy, c-format msgid "invalid character '%c' in type string %s" msgstr "ongeldige karakter `%c' in tipe-string `%s'" -#: src/od.c:1047 +#: src/od.c:1053 #, c-format msgid "cannot skip past end of combined input" msgstr "" -#: src/od.c:1603 +#: src/od.c:1609 #, c-format msgid "invalid output address radix '%c'; it must be one character from [doxn]" msgstr "" -#: src/od.c:1729 +#: src/od.c:1735 #, c-format msgid "no type may be specified when dumping strings" msgstr "" -#: src/od.c:1804 +#: src/od.c:1810 msgid "compatibility mode supports at most one file" msgstr "" -#: src/od.c:1825 +#: src/od.c:1831 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "" -#: src/od.c:1868 +#: src/od.c:1874 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "" @@ -5833,20 +6216,24 @@ msgid "standard input is closed" msgstr "standaardtoevoer is gesluit" #: 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" -"\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/paste.c:448 +#: 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 "" -#: src/paste.c:509 +#: src/paste.c:508 #, c-format msgid "delimiter list ends with an unescaped backslash: %s" msgstr "" @@ -5901,80 +6288,80 @@ msgid "Kaveh Ghazi" msgstr "" #. TRANSLATORS: Real name is unknown; at most 19 characters. -#: src/pinky.c:250 +#: src/pinky.c:242 msgid " ???" msgstr "" #. TRANSLATORS: Idle time is unknown; at most 5 characters. -#: src/pinky.c:274 +#: src/pinky.c:266 msgid "?????" msgstr "" -#: src/pinky.c:323 +#: src/pinky.c:314 #, c-format msgid "Login name: " msgstr "Aantekennaam:" -#: src/pinky.c:326 +#: src/pinky.c:317 #, c-format msgid "In real life: " msgstr "In die regte lewe:" #. TRANSLATORS: Real name is unknown; no hard limit. -#: src/pinky.c:330 +#: src/pinky.c:321 msgid "???\n" msgstr "???\n" -#: src/pinky.c:350 +#: src/pinky.c:341 #, c-format msgid "Directory: " msgstr "Lêergids:" -#: src/pinky.c:352 +#: src/pinky.c:343 #, c-format msgid "Shell: " msgstr "Dop:" -#: src/pinky.c:371 +#: src/pinky.c:362 #, c-format msgid "Project: " msgstr "Projek:" -#: src/pinky.c:395 +#: src/pinky.c:386 #, c-format msgid "Plan:\n" msgstr "Plan:\n" -#: src/pinky.c:414 +#: src/pinky.c:405 msgid "Login" msgstr "Aanteken" -#: src/pinky.c:416 +#: src/pinky.c:407 msgid "Name" msgstr "Naam" -#: src/pinky.c:417 +#: src/pinky.c:408 msgid " TTY" msgstr " TTY" -#: src/pinky.c:419 +#: src/pinky.c:410 msgid "Idle" msgstr "Luier" -#: src/pinky.c:420 +#: src/pinky.c:411 msgid "When" msgstr "Wanneer" -#: src/pinky.c:423 +#: src/pinky.c:414 msgid "Where" msgstr "Waar" -#: src/pinky.c:502 +#: src/pinky.c:493 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Gebruik so: %s [OPSIE]... [GEBRUIKER]...\n" -#: src/pinky.c:503 +#: src/pinky.c:494 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -5984,7 +6371,7 @@ msgid "" " -s do short format output, this is the default\n" msgstr "" -#: src/pinky.c:511 +#: src/pinky.c:502 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -5993,7 +6380,7 @@ msgid "" " in short format\n" msgstr "" -#: src/pinky.c:520 +#: src/pinky.c:511 #, c-format msgid "" "\n" @@ -6001,7 +6388,7 @@ msgid "" "The utmp file will be %s.\n" msgstr "" -#: src/pinky.c:604 +#: src/pinky.c:595 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "" @@ -6016,83 +6403,81 @@ msgstr "" msgid "Roland Huebner" msgstr "" -#: src/pr.c:912 +#: src/pr.c:908 #, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "" -#: src/pr.c:914 +#: src/pr.c:910 #, fuzzy, c-format msgid "invalid page range %s" msgstr "ongeldige tipe-string `%s'" -#: src/pr.c:979 +#: src/pr.c:975 #, fuzzy, c-format msgid "'-l PAGE_LENGTH' invalid number of lines: %s" msgstr "`-l PAGE_LENGTH' ongeldige aantal reëls: `%s'" -#: src/pr.c:1003 +#: src/pr.c:999 #, fuzzy, c-format msgid "'-N NUMBER' invalid starting line number: %s" msgstr "`-N NUMBER' ongeldige beginreëlnommer: `%s'" -#: src/pr.c:1015 +#: src/pr.c:1011 #, fuzzy, c-format msgid "'-o MARGIN' invalid line offset: %s" msgstr "`-o MARGIN' ongeldige lynuitwyking: `%s'" -#: src/pr.c:1056 +#: src/pr.c:1052 #, fuzzy, c-format msgid "'-w PAGE_WIDTH' invalid number of characters: %s" msgstr "`-w PAGE_WIDTH' ongeldige aantal karakters: `%s'" -#: src/pr.c:1070 +#: src/pr.c:1066 #, fuzzy, c-format msgid "'-W PAGE_WIDTH' invalid number of characters: %s" msgstr "`-W PAGE_WIDTH' ongeldige aantal karakters: `%s'" -#: src/pr.c:1100 +#: src/pr.c:1096 #, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "" -#: src/pr.c:1104 +#: src/pr.c:1100 #, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "" -#: src/pr.c:1200 +#: src/pr.c:1196 #, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "" -#: src/pr.c:1304 +#: src/pr.c:1293 #, c-format msgid "page width too narrow" msgstr "Bladsywydte te nou" -#: src/pr.c:2369 +#: src/pr.c:2353 #, c-format msgid "starting page number %<PRIuMAX> exceeds page count %<PRIuMAX>" msgstr "" -#: src/pr.c:2396 +#: src/pr.c:2380 #, fuzzy, c-format msgid "page number overflow" msgstr "veldnommer is nul" -#: src/pr.c:2401 +#: src/pr.c:2385 #, c-format msgid "Page %<PRIuMAX>" msgstr "" -#: src/pr.c:2773 -msgid "" -"Paginate or columnate FILE(s) for printing.\n" -"\n" +#: src/pr.c:2757 +msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" -#: src/pr.c:2780 +#: src/pr.c:2763 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -6102,7 +6487,7 @@ msgid "" " columns on each page\n" msgstr "" -#: src/pr.c:2788 +#: src/pr.c:2771 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -6112,7 +6497,7 @@ msgid "" " double space the output\n" msgstr "" -#: src/pr.c:2796 +#: src/pr.c:2779 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -6124,7 +6509,7 @@ msgid "" " and trailer without -F)\n" msgstr "" -#: src/pr.c:2806 +#: src/pr.c:2789 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -6137,7 +6522,7 @@ msgid "" " alignment, --sep-string[=STRING] sets separators\n" msgstr "" -#: src/pr.c:2815 +#: src/pr.c:2798 msgid "" " -l, --length=PAGE_LENGTH\n" " set the page length to PAGE_LENGTH (66) lines\n" @@ -6146,7 +6531,7 @@ msgid "" " truncate lines, but join lines of full length with -J\n" msgstr "" -#: src/pr.c:2822 +#: src/pr.c:2805 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -6156,7 +6541,7 @@ msgid "" " page printed (see +FIRST_PAGE)\n" msgstr "" -#: src/pr.c:2830 +#: src/pr.c:2813 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -6165,7 +6550,7 @@ msgid "" " omit warning when a file cannot be opened\n" msgstr "" -#: src/pr.c:2837 +#: src/pr.c:2820 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -6175,7 +6560,7 @@ msgid "" " options (-COLUMN|-a -COLUMN|-m) except -w is set\n" msgstr "" -#: src/pr.c:2844 +#: src/pr.c:2827 msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" @@ -6185,7 +6570,7 @@ msgid "" " -t, --omit-header omit page headers and trailers\n" msgstr "" -#: src/pr.c:2851 +#: src/pr.c:2834 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -6199,7 +6584,7 @@ msgid "" "(72)\n" msgstr "" -#: src/pr.c:2861 +#: src/pr.c:2844 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -6208,7 +6593,7 @@ msgid "" " with -S or -s\n" msgstr "" -#: src/pr.c:2869 +#: src/pr.c:2852 #, fuzzy msgid "" "\n" @@ -6345,17 +6730,16 @@ msgstr "" msgid "" "Output a permuted index, including context, of the words in the input " "files.\n" -"\n" msgstr "" -#: src/ptx.c:1828 +#: src/ptx.c:1827 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:1833 +#: src/ptx.c:1832 msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" " -O, --format=roff generate output as roff directives\n" @@ -6364,7 +6748,7 @@ msgid "" " -T, --format=tex generate output as TeX directives\n" msgstr "" -#: src/ptx.c:1840 +#: src/ptx.c:1839 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -6374,7 +6758,7 @@ msgid "" " -o, --only-file=FILE read only word list from this FILE\n" msgstr "" -#: src/ptx.c:1848 +#: src/ptx.c:1847 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -6382,7 +6766,7 @@ msgid "" "excluded\n" msgstr "" -#: src/ptx.c:1855 +#: src/ptx.c:1854 #, fuzzy msgid "" "\n" @@ -6391,7 +6775,7 @@ msgstr "" "\n" "Met geen LÊER, of wanneer die LÊER - is, lees standaardtoevoer.\n" -#: src/ptx.c:1949 +#: src/ptx.c:1948 #, fuzzy, c-format msgid "invalid gap width: %s" msgstr "ongeldige wydte: %s" @@ -6413,7 +6797,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "kon nie %s oopmaak nie" -#: src/pwd.c:170 src/pwd.c:277 +#: src/pwd.c:170 src/pwd.c:277 src/split.c:373 #, fuzzy, c-format msgid "failed to stat %s" msgstr "kon nie %s oopmaak nie" @@ -6429,14 +6813,15 @@ msgid "ignoring non-option arguments" msgstr "parameters wat nie opsies is nie word geïgnoreer" #. This is a proper name. See the gettext manual, section Names. -#: src/readlink.c:33 +#: src/readlink.c:32 msgid "Dmitry V. Levin" msgstr "" -#: src/readlink.c:62 +#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147 +#: src/stat.c:1349 src/touch.c:212 #, c-format -msgid "Usage: %s [OPTION]... FILE\n" -msgstr "Gebruik so: %s [OPSIE]... LÊER \n" +msgid "Usage: %s [OPTION]... FILE...\n" +msgstr "Gebruik so: %s [OPSIE]... LÊER...\n" #: src/readlink.c:63 msgid "" @@ -6463,17 +6848,18 @@ msgid "" "recursively,\n" " without requirements on components " "existence\n" -" -n, --no-newline do not output the trailing newline\n" +" -n, --no-newline do not output the trailing delimiter\n" " -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" msgstr "" -#: src/realpath.c:71 src/rm.c:134 src/shred.c:147 src/stat.c:1330 -#: src/touch.c:215 -#, c-format -msgid "Usage: %s [OPTION]... FILE...\n" -msgstr "Gebruik so: %s [OPSIE]... LÊER...\n" +#: src/readlink.c:152 +#, fuzzy, c-format +msgid "ignoring --no-newline with multiple arguments" +msgstr "parameters wat nie opsies is nie word geïgnoreer" #: src/realpath.c:72 msgid "" @@ -6500,12 +6886,12 @@ msgstr "" msgid "generating relative path" msgstr "" -#: src/remove.c:286 +#: src/remove.c:273 #, c-format msgid "%s: descend into write-protected directory %s? " msgstr "" -#: src/remove.c:287 +#: src/remove.c:274 #, c-format msgid "%s: descend into directory %s? " msgstr "%s: wil jy ingaan in lêergids %s?" @@ -6514,49 +6900,49 @@ msgstr "%s: wil jy ingaan in lêergids %s?" #. translate "%s: remove %s (write-protected) %s? " #. instead. It should avoid grammatical problems #. with the output of file_type. -#: src/remove.c:303 +#: src/remove.c:290 #, c-format msgid "%s: remove write-protected %s %s? " msgstr "%s: verwyder lees-alleen %s %s? " -#: src/remove.c:304 +#: src/remove.c:291 #, c-format msgid "%s: remove %s %s? " msgstr "%s: verwyder %s %s? " -#: src/remove.c:417 +#: src/remove.c:374 #, c-format msgid "removed directory: %s\n" msgstr "lêergids is verwyder: %s\n" -#: src/remove.c:481 +#: src/remove.c:444 #, fuzzy, c-format msgid "cannot remove directory: %s" msgstr "kan nie gids %s verwyder nie" -#: src/remove.c:537 +#: src/remove.c:500 #, c-format msgid "skipping %s, since it's on a different device" msgstr "" -#: src/remove.c:557 +#: src/remove.c:520 #, fuzzy, c-format msgid "traversal failed: %s" msgstr "'read' het gefaal" -#: src/remove.c:563 +#: src/remove.c:526 #, c-format msgid "" "unexpected failure: fts_info=%d: %s\n" "please report to %s" msgstr "" -#: src/rm.c:118 +#: src/rm.c:119 #, c-format msgid "Try '%s ./%s' to remove the file %s.\n" msgstr "" -#: src/rm.c:135 +#: src/rm.c:136 msgid "" "Remove (unlink) the FILE(s).\n" "\n" @@ -6565,7 +6951,7 @@ msgid "" " -i prompt before every removal\n" msgstr "" -#: src/rm.c:141 +#: src/rm.c:142 msgid "" " -I prompt once before removing more than three files, " "or\n" @@ -6577,22 +6963,23 @@ msgid "" " always (-i). Without WHEN, prompt always\n" msgstr "" -#: src/rm.c:148 +#: src/rm.c:149 msgid "" " --one-file-system when removing a hierarchy recursively, skip any\n" " directory that is on a file system different from\n" " that of the corresponding command line argument\n" msgstr "" -#: src/rm.c:153 +#: src/rm.c:154 msgid "" " --no-preserve-root do not treat '/' specially\n" " --preserve-root do not remove '/' (default)\n" " -r, -R, --recursive remove directories and their contents recursively\n" +" -d, --dir remove empty directories\n" " -v, --verbose explain what is being done\n" msgstr "" -#: src/rm.c:161 +#: src/rm.c:163 msgid "" "\n" "By default, rm does not remove directories. Use the --recursive (-r or -R)\n" @@ -6600,7 +6987,7 @@ msgid "" "contents.\n" msgstr "" -#: src/rm.c:166 +#: src/rm.c:168 #, c-format msgid "" "\n" @@ -6611,7 +6998,7 @@ msgid "" " %s ./-foo\n" msgstr "" -#: src/rm.c:175 +#: src/rm.c:177 msgid "" "\n" "Note that if you use rm to remove a file, it might be possible to recover\n" @@ -6619,12 +7006,12 @@ msgid "" "assurance that the contents are truly unrecoverable, consider using shred.\n" msgstr "" -#: src/rm.c:335 +#: src/rm.c:342 #, c-format msgid "%s: remove all arguments recursively? " msgstr "" -#: src/rm.c:336 +#: src/rm.c:343 #, fuzzy, c-format msgid "%s: remove all arguments? " msgstr "%s: verwyder %s %s? " @@ -6672,7 +7059,10 @@ msgstr "" msgid "" "Run a program in a different security context.\n" "With neither CONTEXT nor COMMAND, print the current security context.\n" -"\n" +msgstr "" + +#: src/runcon.c:94 +msgid "" " CONTEXT Complete security context\n" " -c, --compute compute process transition context before modifying\n" " -t, --type=TYPE type (for same role as parent)\n" @@ -6682,72 +7072,72 @@ msgid "" "\n" msgstr "" -#: src/runcon.c:140 +#: src/runcon.c:144 #, c-format msgid "multiple roles" msgstr "" -#: src/runcon.c:145 +#: src/runcon.c:149 #, c-format msgid "multiple types" msgstr "" -#: src/runcon.c:150 +#: src/runcon.c:154 #, c-format msgid "multiple users" msgstr "" -#: src/runcon.c:155 +#: src/runcon.c:159 #, c-format msgid "multiple levelranges" msgstr "" -#: src/runcon.c:173 src/runcon.c:209 +#: src/runcon.c:177 src/runcon.c:213 #, fuzzy, c-format msgid "failed to get current context" msgstr "kon nie attribute van %s verkry nie" -#: src/runcon.c:183 +#: src/runcon.c:187 #, c-format msgid "you must specify -c, -t, -u, -l, -r, or context" msgstr "" -#: src/runcon.c:191 +#: src/runcon.c:195 #, fuzzy, c-format msgid "no command specified" msgstr "geen proses-id is gespesifiseer" -#: src/runcon.c:197 +#: src/runcon.c:201 #, c-format msgid "%s may be used only on a SELinux kernel" msgstr "" -#: src/runcon.c:223 +#: src/runcon.c:227 #, fuzzy, c-format msgid "failed to compute a new context" msgstr "kon nie %s oopmaak nie" -#: src/runcon.c:237 +#: src/runcon.c:241 #, fuzzy, c-format msgid "failed to set new user %s" msgstr "kon nie %s oopmaak nie" -#: src/runcon.c:239 +#: src/runcon.c:243 #, fuzzy, c-format msgid "failed to set new type %s" msgstr "kon nie %s oopmaak nie" -#: src/runcon.c:241 +#: src/runcon.c:245 #, fuzzy, c-format msgid "failed to set new range %s" msgstr "kon nie %s oopmaak nie" -#: src/runcon.c:243 +#: src/runcon.c:247 #, fuzzy, c-format msgid "failed to set new role %s" msgstr "kon nie %s oopmaak nie" -#: src/runcon.c:251 +#: src/runcon.c:255 #, c-format msgid "unable to set security context %s" msgstr "" @@ -6761,15 +7151,17 @@ msgid "" msgstr "" #: src/seq.c:73 +msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" +msgstr "" + +#: src/seq.c:79 msgid "" -"Print numbers from FIRST to LAST, in steps of INCREMENT.\n" -"\n" " -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 "" -#: src/seq.c:82 +#: src/seq.c:86 msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" @@ -6779,39 +7171,24 @@ msgid "" "INCREMENT is usually negative if FIRST is greater than LAST.\n" msgstr "" -#: src/seq.c:90 +#: src/seq.c:94 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:136 +#: src/seq.c:140 #, c-format msgid "invalid floating point argument: %s" msgstr "ongeldige wisselpunt parameter: %s" -#: src/seq.c:193 -#, c-format -msgid "format %s has no %% directive" -msgstr "" - -#: src/seq.c:210 -#, c-format -msgid "format %s ends in %%" -msgstr "" - -#: src/seq.c:213 +#: src/seq.c:232 #, fuzzy, c-format msgid "format %s has unknown %%%c directive" msgstr "%s het 'n onbekende lêertipe" -#: src/seq.c:217 -#, c-format -msgid "format %s has too many %% directives" -msgstr "" - -#: src/seq.c:431 +#: src/seq.c:555 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" @@ -6843,27 +7220,27 @@ msgid "" " (if specified) supplemental group IDs to GID1, ...\n" msgstr "" -#: src/setuidgid.c:163 +#: src/setuidgid.c:162 #, c-format msgid "unknown user-ID: %s" msgstr "onbekende gebruiker-id: %s" -#: src/setuidgid.c:174 +#: src/setuidgid.c:173 #, c-format msgid "to use user-ID %s you need to use -g too" msgstr "" -#: src/setuidgid.c:191 +#: 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:201 +#: 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:205 +#: src/setuidgid.c:204 #, fuzzy, c-format msgid "cannot set user-ID to %lu" msgstr "kan nie gebruiker-ID na %ld verander nie" @@ -6877,10 +7254,9 @@ msgstr "" 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" -"\n" msgstr "" -#: src/shred.c:156 +#: src/shred.c:155 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -6889,7 +7265,7 @@ msgid "" " -s, --size=N shred this many bytes (suffixes like K, M, G accepted)\n" msgstr "" -#: src/shred.c:162 +#: src/shred.c:161 msgid "" " -u, --remove truncate and remove file after overwriting\n" " -v, --verbose show progress\n" @@ -6898,7 +7274,7 @@ msgid "" " -z, --zero add a final overwrite with zeros to hide shredding\n" msgstr "" -#: src/shred.c:171 +#: src/shred.c:170 msgid "" "\n" "If FILE is -, shred standard output.\n" @@ -6910,7 +7286,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:181 +#: src/shred.c:180 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" @@ -6921,7 +7297,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:189 +#: src/shred.c:188 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -6933,7 +7309,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:199 +#: src/shred.c:198 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -6942,7 +7318,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:206 +#: src/shred.c:205 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" @@ -6954,129 +7330,129 @@ msgid "" "\n" msgstr "" -#: src/shred.c:216 +#: src/shred.c:215 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:296 +#: src/shred.c:295 #, fuzzy, c-format msgid "%s: fdatasync failed" msgstr "%s: seek het misluk" -#: src/shred.c:307 +#: src/shred.c:306 #, fuzzy, c-format msgid "%s: fsync failed" msgstr "%s: seek het misluk" -#: src/shred.c:384 +#: src/shred.c:383 #, c-format msgid "%s: cannot rewind" msgstr "%s: kan nie teruggaan nie" -#: src/shred.c:403 +#: src/shred.c:402 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: pass %lu/%lu (%s)..." -#: src/shred.c:453 +#: src/shred.c:452 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: fout tydens skryfbewerking by uitwyking %s" -#: src/shred.c:471 +#: src/shred.c:470 #, fuzzy, c-format msgid "%s: lseek failed" msgstr "%s: seek het misluk" -#: src/shred.c:482 +#: src/shred.c:481 #, c-format msgid "%s: file too large" msgstr "%s: lêer te groot" -#: src/shred.c:505 +#: src/shred.c:504 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: pass %lu/%lu (%s)...%s" -#: src/shred.c:521 +#: src/shred.c:520 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: pass %lu/%lu (%s)...%s/%s %d%%" -#: src/shred.c:768 +#: src/shred.c:767 #, fuzzy, c-format msgid "%s: fstat failed" msgstr "'stat' het gefaal" -#: src/shred.c:779 +#: src/shred.c:778 #, c-format msgid "%s: invalid file type" msgstr "%s: ongeldige lêertipe:" -#: src/shred.c:798 +#: src/shred.c:797 #, c-format msgid "%s: file has negative size" msgstr "%s: lêer het negatiewe grootte" -#: src/shred.c:865 +#: src/shred.c:864 src/sort.c:932 src/split.c:378 #, c-format msgid "%s: error truncating" msgstr "%s: fout tydens afeindiging" -#: src/shred.c:881 +#: src/shred.c:880 #, fuzzy, c-format msgid "%s: fcntl failed" msgstr "%s: seek het misluk" -#: src/shred.c:886 +#: src/shred.c:885 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "" -#: src/shred.c:968 +#: src/shred.c:967 #, c-format msgid "%s: removing" msgstr "%s: besig om te verwyder" -#: src/shred.c:992 +#: src/shred.c:991 #, c-format msgid "%s: renamed to %s" msgstr "%s: hernoem as %s" -#: src/shred.c:1014 +#: src/shred.c:1013 #, fuzzy, c-format msgid "%s: failed to remove" msgstr "%s: lêer te groot" -#: src/shred.c:1018 +#: src/shred.c:1017 #, c-format msgid "%s: removed" msgstr "%s: is verwyder" -#: src/shred.c:1025 src/shred.c:1068 +#: src/shred.c:1024 src/shred.c:1067 #, fuzzy, c-format msgid "%s: failed to close" msgstr "%s: lêer te lank" -#: src/shred.c:1061 +#: src/shred.c:1060 #, fuzzy, c-format msgid "%s: failed to open for writing" msgstr "%s: lêer te lank" -#: src/shred.c:1126 +#: src/shred.c:1125 #, c-format msgid "%s: invalid number of passes" msgstr "%s: ongeldige aantal lopies" -#: src/shred.c:1135 src/shuf.c:291 src/sort.c:4387 +#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441 #, fuzzy, c-format msgid "multiple random sources specified" msgstr "veelvuldige afvoerlêers is gespesifiseer" -#: src/shred.c:1149 +#: src/shred.c:1148 #, c-format msgid "%s: invalid file size" msgstr "%s: ongeldige lêergrootte." @@ -7094,14 +7470,12 @@ msgstr "" #: src/shuf.c:54 #, fuzzy -msgid "" -"Write a random permutation of the input lines to standard output.\n" -"\n" +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:61 +#: src/shuf.c:60 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 " @@ -7112,27 +7486,27 @@ msgid "" " -z, --zero-terminated end lines with 0 byte, not newline\n" msgstr "" -#: src/shuf.c:245 +#: src/shuf.c:244 #, fuzzy, c-format msgid "multiple -i options specified" msgstr "veelvuldige -l of -t opsies is gespesifiseer" -#: src/shuf.c:265 +#: src/shuf.c:264 #, fuzzy, c-format msgid "invalid input range %s" msgstr "ongeldige nommer %s" -#: src/shuf.c:278 +#: src/shuf.c:277 #, fuzzy, c-format msgid "invalid line count %s" msgstr "ongeldige reëlwydte: %s" -#: src/shuf.c:285 src/sort.c:4381 +#: src/shuf.c:284 src/sort.c:4435 #, c-format msgid "multiple output files specified" msgstr "veelvuldige afvoerlêers is gespesifiseer" -#: src/shuf.c:311 +#: src/shuf.c:310 #, fuzzy, c-format msgid "cannot combine -e and -i options" msgstr "die gebruikernaam en groepnaam mag nie albei ontbreek nie" @@ -7151,7 +7525,7 @@ msgid "" "\n" msgstr "" -#: src/sleep.c:135 src/timeout.c:295 +#: src/sleep.c:135 src/timeout.c:320 #, fuzzy, c-format msgid "invalid time interval %s" msgstr "ongeldige tydinterval `%s'" @@ -7161,22 +7535,20 @@ msgstr "ongeldige tydinterval `%s'" msgid "cannot read realtime clock" msgstr "kan nie die reëletyd-horlosie lees nie" -#: src/sort.c:395 +#: src/sort.c:399 #, fuzzy -msgid "" -"Write sorted concatenation of all FILE(s) to standard output.\n" -"\n" +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:402 +#: src/sort.c:405 msgid "" "Ordering options:\n" "\n" msgstr "" -#: src/sort.c:406 +#: src/sort.c:409 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -7184,19 +7556,19 @@ msgid "" " -f, --ignore-case fold lower case to upper case characters\n" msgstr "" -#: src/sort.c:412 +#: src/sort.c:415 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:417 +#: src/sort.c:420 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" -#: src/sort.c:420 +#: src/sort.c:423 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -7204,7 +7576,7 @@ msgid "" " -r, --reverse reverse the result of comparisons\n" msgstr "" -#: src/sort.c:426 +#: src/sort.c:429 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -7214,19 +7586,19 @@ msgid "" "\n" msgstr "" -#: src/sort.c:434 +#: src/sort.c:437 msgid "" "Other options:\n" "\n" msgstr "" -#: src/sort.c:438 +#: src/sort.c:441 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" msgstr "" -#: src/sort.c:442 +#: src/sort.c:445 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 " @@ -7235,7 +7607,7 @@ msgid "" " decompress them with PROG -d\n" msgstr "" -#: src/sort.c:449 +#: src/sort.c:452 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -7244,13 +7616,13 @@ msgid "" " If F is - then read names from standard input\n" msgstr "" -#: src/sort.c:456 +#: src/sort.c:459 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:460 +#: src/sort.c:463 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -7258,7 +7630,7 @@ msgid "" " -S, --buffer-size=SIZE use SIZE for main memory buffer\n" msgstr "" -#: src/sort.c:466 +#: src/sort.c:469 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -7273,13 +7645,13 @@ msgid "" "run\n" msgstr "" -#: src/sort.c:475 +#: 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:480 +#: src/sort.c:483 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -7298,7 +7670,7 @@ msgid "" "SIZE may be followed by the following multiplicative suffixes:\n" msgstr "" -#: src/sort.c:493 +#: src/sort.c:496 msgid "" "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n" "\n" @@ -7310,264 +7682,268 @@ msgid "" "native byte values.\n" msgstr "" -#: src/sort.c:694 +#: src/sort.c:697 #, fuzzy, c-format msgid "waiting for %s [-d]" msgstr "besig om te skryf na %s" -#: src/sort.c:699 +#: src/sort.c:702 #, c-format msgid "%s [-d] terminated abnormally" msgstr "" -#: src/sort.c:853 +#: src/sort.c:856 #, fuzzy, c-format msgid "cannot create temporary file in %s" msgstr "kan nie 'n tydelike lêer skep nie" -#: src/sort.c:939 src/sort.c:2010 src/sort.c:3056 src/sort.c:3755 -#: src/sort.c:3758 +#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713 +#: src/sort.c:3804 src/sort.c:3807 msgid "open failed" msgstr "'open' het gefaal" -#: src/sort.c:959 +#: src/sort.c:970 #, fuzzy msgid "fflush failed" msgstr "'close' het gefaal" -#: src/sort.c:964 src/sort.c:2013 src/sort.c:4646 +#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706 msgid "close failed" msgstr "'close' het gefaal" -#: src/sort.c:973 +#: src/sort.c:986 #, fuzzy, c-format msgid "dup2 failed" msgstr "'open' het gefaal" -#: src/sort.c:1090 +#: src/sort.c:1103 #, c-format msgid "couldn't execute %s" msgstr "" -#: src/sort.c:1097 +#: src/sort.c:1110 #, fuzzy msgid "couldn't create temporary file" msgstr "kan nie 'n tydelike lêer skep nie" -#: src/sort.c:1136 +#: src/sort.c:1149 #, fuzzy, c-format msgid "couldn't create process for %s -d" msgstr "Kan nie lêergids %s skep nie." -#: src/sort.c:1150 +#: src/sort.c:1161 #, c-format msgid "couldn't execute %s -d" msgstr "" -#: src/sort.c:1209 +#: src/sort.c:1220 #, fuzzy, c-format msgid "warning: cannot remove: %s" msgstr "kan nie %s verwyder nie" -#: src/sort.c:1295 +#: src/sort.c:1306 #, fuzzy, c-format msgid "invalid --%s argument %s" msgstr "ongeldige parameter: %s" -#: src/sort.c:1298 +#: src/sort.c:1309 #, fuzzy, c-format msgid "minimum --%s argument is %s" msgstr "dubbelsinnige parameter %s vir %s" -#: src/sort.c:1313 +#: src/sort.c:1324 #, fuzzy, c-format msgid "--%s argument %s too large" msgstr "%s: telling `%.*s' is te groot" -#: src/sort.c:1316 +#: src/sort.c:1327 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "" -#: src/sort.c:1398 +#: src/sort.c:1409 #, c-format msgid "number in parallel must be nonzero" msgstr "" -#: src/sort.c:1479 +#: src/sort.c:1494 msgid "stat failed" msgstr "'stat' het gefaal" -#: src/sort.c:1740 +#: src/sort.c:1755 msgid "read failed" msgstr "'read' het gefaal" -#: src/sort.c:2028 +#: src/sort.c:2043 #, fuzzy, c-format msgid "string transformation failed" msgstr "stringvergelyking het gefaal" -#: src/sort.c:2031 +#: src/sort.c:2046 #, c-format msgid "the untransformed string was %s" msgstr "" -#: src/sort.c:2194 +#: src/sort.c:2209 #, c-format msgid "^ no match for key\n" msgstr "" -#: src/sort.c:2374 +#: src/sort.c:2389 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "" -#: src/sort.c:2380 +#: src/sort.c:2395 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "" -#: src/sort.c:2391 +#: src/sort.c:2406 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" -#: src/sort.c:2404 +#: src/sort.c:2419 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "" -#: src/sort.c:2436 +#: src/sort.c:2451 #, 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" -#: src/sort.c:2442 +#: src/sort.c:2457 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "" -#: src/sort.c:2716 src/sort.c:2725 +#: src/sort.c:2731 src/sort.c:2740 msgid "write failed" msgstr "'write' het gefaal" -#: src/sort.c:2768 +#: src/sort.c:2783 #, c-format msgid "%s: %s:%s: disorder: " msgstr "" -#: src/sort.c:2771 +#: src/sort.c:2786 msgid "standard error" msgstr "standaardfout-afvoer" -#: src/sort.c:3926 +#: src/sort.c:3698 +#, fuzzy +msgid "cannot read" +msgstr "%s: kan nie teruggaan nie" + +#: src/sort.c:3976 #, fuzzy, c-format msgid "%s: invalid field specification %s" msgstr "%s: ongeldige veldspesifikasie `%s'" -#: src/sort.c:3937 +#: src/sort.c:3987 #, fuzzy, c-format msgid "options '-%s' are incompatible" msgstr "%s: opsie `%s' is dubbelsinnig\n" -#: src/sort.c:3988 +#: src/sort.c:4038 #, fuzzy, c-format msgid "%s: invalid count at start of %s" msgstr "%s: ongeldige telling by begin van `%s'" -#: src/sort.c:4245 +#: src/sort.c:4295 #, fuzzy msgid "invalid number after '-'" msgstr "ongeldige getal na `-'" -#: src/sort.c:4248 src/sort.c:4334 src/sort.c:4362 +#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416 #, fuzzy msgid "invalid number after '.'" msgstr "ongeldige getal na `.'" -#: src/sort.c:4261 src/sort.c:4367 +#: src/sort.c:4315 src/sort.c:4421 msgid "stray character in field spec" msgstr "verdwaalde karakter in veldspesifikasie" -#: src/sort.c:4308 +#: src/sort.c:4362 #, fuzzy, c-format msgid "multiple compress programs specified" msgstr "veelvuldige -l of -t opsies is gespesifiseer" -#: src/sort.c:4325 +#: src/sort.c:4379 msgid "invalid number at field start" msgstr "ongeldige nommer by begin van veld" -#: src/sort.c:4329 src/sort.c:4357 +#: src/sort.c:4383 src/sort.c:4411 msgid "field number is zero" msgstr "veldnommer is nul" -#: src/sort.c:4338 +#: src/sort.c:4392 msgid "character offset is zero" msgstr "karakteruitwyking is nul" -#: src/sort.c:4353 +#: src/sort.c:4407 #, fuzzy msgid "invalid number after ','" msgstr "ongeldige getal na `,'" -#: src/sort.c:4403 +#: src/sort.c:4457 #, c-format msgid "empty tab" msgstr "leë keepkarakter" -#: src/sort.c:4496 src/wc.c:692 +#: src/sort.c:4550 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:4518 +#: src/sort.c:4572 #, fuzzy, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s: ongeldige lêertipe:" -#: src/sort.c:4524 +#: src/sort.c:4578 #, fuzzy, c-format msgid "no input from %s" msgstr "toevoerlêer %s word toegemaak" -#: src/sort.c:4570 +#: src/sort.c:4624 #, c-format msgid "using %s sorting rules" msgstr "" -#: src/sort.c:4573 +#: src/sort.c:4627 #, c-format msgid "using simple byte comparison" msgstr "" -#: src/sort.c:4604 +#: src/sort.c:4658 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "" -#: src/split.c:184 +#: src/split.c:187 #, c-format msgid "the suffix length needs to be at least %zu" msgstr "" -#: src/split.c:201 +#: src/split.c:204 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" msgstr "Gebruik so: %s [OPSIE] [TOEVOER [PREFIKS]]\n" -#: src/split.c:205 +#: src/split.c:208 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" -"\n" msgstr "" -#: src/split.c:214 +#: src/split.c:216 #, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" @@ -7586,7 +7962,7 @@ msgid "" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" -#: src/split.c:227 +#: src/split.c:229 #, fuzzy msgid "" " --verbose print a diagnostic just before each\n" @@ -7595,7 +7971,7 @@ msgstr "" " --verbose druk 'n diagnostiese boodskap op standaardafvoer\n" " direk voor elke afvoerlêer oopgemaak word\n" -#: src/split.c:234 +#: src/split.c:236 msgid "" "\n" "CHUNKS may be:\n" @@ -7607,184 +7983,189 @@ msgid "" "r/K/N likewise but only output Kth of N to stdout\n" msgstr "" -#: src/split.c:352 +#: src/split.c:354 #, fuzzy, c-format msgid "output file suffixes exhausted" msgstr "uitgange vir afvoerlêers is uitgeput" -#: src/split.c:364 +#: src/split.c:366 #, fuzzy, c-format msgid "creating file %s\n" msgstr "besig om nuwe lêer `%s' te skep\n" -#: src/split.c:377 -#, fuzzy, c-format +#: src/split.c:375 +#, c-format +msgid "%s would overwrite input; aborting" +msgstr "" + +#: src/split.c:391 +#, c-format msgid "failed to set FILE environment variable" -msgstr "kon nie %s oopmaak nie" +msgstr "" -#: src/split.c:379 +#: src/split.c:393 #, c-format msgid "executing with FILE=%s\n" msgstr "" -#: src/split.c:381 +#: src/split.c:395 #, fuzzy, c-format msgid "failed to create pipe" -msgstr "kon nie vaste skakel %s na %s skep nie" +msgstr "kon nie %s oopmaak nie" -#: src/split.c:395 +#: src/split.c:409 #, fuzzy, c-format msgid "closing prior pipe" -msgstr "lêergids %s word oorgeslaan" +msgstr "toevoerlêer %s word toegemaak" -#: src/split.c:397 +#: src/split.c:411 #, fuzzy, c-format msgid "closing output pipe" msgstr "afvoerlêer %s word toegemaak" -#: src/split.c:401 +#: src/split.c:415 #, fuzzy, c-format msgid "moving input pipe" msgstr "toevoerlêer %s word toegemaak" -#: src/split.c:403 +#: src/split.c:417 #, fuzzy, c-format msgid "closing input pipe" msgstr "toevoerlêer %s word toegemaak" -#: src/split.c:408 +#: src/split.c:422 #, fuzzy, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "kan nie bevel %s uitvoer nie" -#: src/split.c:414 +#: src/split.c:428 #, fuzzy, c-format msgid "failed to close input pipe" -msgstr "%s: lêer te lank" +msgstr "kon nie %s oopmaak nie" -#: src/split.c:450 -#, fuzzy, c-format +#: src/split.c:464 +#, c-format msgid "waiting for child process" -msgstr "besig om te skryf na %s" +msgstr "" -#: src/split.c:460 +#: src/split.c:474 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "" -#: src/split.c:468 +#: src/split.c:482 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:475 src/timeout.c:449 +#: src/split.c:489 src/timeout.c:494 #, c-format msgid "unknown status from command (0x%X)" msgstr "" -#: src/split.c:1037 +#: src/split.c:1052 #, c-format msgid "cannot split in more than one way" msgstr "kan nie verdeel op meer as een manier nie" -#: src/split.c:1050 src/split.c:1192 src/split.c:1363 +#: src/split.c:1065 src/split.c:1205 src/split.c:1376 #, fuzzy, c-format msgid "%s: invalid number of chunks" msgstr "%s: ongeldige aantal sekondes" -#: src/split.c:1054 +#: src/split.c:1069 #, fuzzy, c-format msgid "%s: invalid chunk number" msgstr "%s: ongeldige getal" -#: src/split.c:1106 +#: src/split.c:1119 #, c-format msgid "%s: invalid suffix length" msgstr "%s: ongeldige suffikslengte" -#: src/split.c:1131 src/split.c:1139 src/split.c:1162 src/split.c:1167 +#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180 #, c-format msgid "%s: invalid number of bytes" msgstr "%s: ongeldige aantal grepe" -#: src/split.c:1150 src/split.c:1297 +#: src/split.c:1163 src/split.c:1310 #, c-format msgid "%s: invalid number of lines" msgstr "%s: ongeldige aantal reëls" -#: src/split.c:1223 +#: src/split.c:1236 #, 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:1235 +#: src/split.c:1248 #, fuzzy, c-format msgid "%s: invalid start value for numerical suffix" msgstr "ongeldige beginreëlnommer: %s" -#: src/split.c:1263 +#: src/split.c:1276 #, fuzzy, c-format msgid "%s: invalid IO block size" msgstr "%s: ongeldige lêergrootte." -#: src/split.c:1284 +#: src/split.c:1297 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1321 +#: src/split.c:1334 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1356 +#: src/split.c:1369 #, 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:169 +#: src/stat.c:173 msgid "Michael Meskes" msgstr "" -#: src/stat.c:838 +#: src/stat.c:857 #, fuzzy, c-format msgid "failed to canonicalize %s" msgstr "kon nie %s oopmaak nie" -#: src/stat.c:1050 +#: src/stat.c:1069 #, fuzzy, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "%s: onbekende opsie `%c%s'\n" -#: src/stat.c:1105 +#: src/stat.c:1124 #, fuzzy, c-format msgid "%s: invalid directive" msgstr "%%%c: ongeldige direktief" -#: src/stat.c:1151 +#: src/stat.c:1170 #, c-format msgid "warning: backslash at end of format" msgstr "" -#: src/stat.c:1182 +#: src/stat.c:1201 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" -#: src/stat.c:1189 +#: src/stat.c:1208 #, c-format msgid "cannot read file system information for %s" msgstr "" -#: src/stat.c:1209 +#: src/stat.c:1228 #, 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:1245 +#: src/stat.c:1264 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -7795,7 +8176,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1268 +#: src/stat.c:1287 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -7803,30 +8184,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1278 +#: src/stat.c:1297 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:1286 +#: src/stat.c:1305 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:1295 +#: src/stat.c:1314 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:1305 +#: src/stat.c:1324 #, c-format msgid "Context: %C\n" msgstr "" -#: src/stat.c:1313 +#: src/stat.c:1332 msgid "" "Access: %x\n" "Modify: %y\n" @@ -7834,15 +8215,17 @@ msgid "" " Birth: %w\n" msgstr "" -#: src/stat.c:1331 +#: src/stat.c:1350 +msgid "Display file or file system status.\n" +msgstr "" + +#: src/stat.c:1356 msgid "" -"Display file or file system status.\n" -"\n" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" -#: src/stat.c:1337 +#: src/stat.c:1360 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -7852,7 +8235,7 @@ msgid "" " -t, --terse print the information in terse form\n" msgstr "" -#: src/stat.c:1348 +#: src/stat.c:1371 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -7864,7 +8247,7 @@ msgid "" " %C SELinux security context string\n" msgstr "" -#: src/stat.c:1357 +#: src/stat.c:1380 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -7874,7 +8257,7 @@ msgid "" " %G group name of owner\n" msgstr "" -#: src/stat.c:1365 +#: src/stat.c:1388 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -7887,7 +8270,7 @@ msgid "" " %T minor device type in hex\n" msgstr "" -#: src/stat.c:1376 +#: src/stat.c:1399 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -7902,7 +8285,7 @@ msgid "" "\n" msgstr "" -#: src/stat.c:1390 +#: src/stat.c:1413 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -7913,7 +8296,7 @@ msgid "" " %f free blocks in file system\n" msgstr "" -#: src/stat.c:1399 +#: src/stat.c:1422 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -7932,30 +8315,29 @@ msgstr "Gebruik so: %s [OPSIE]...\n" #: src/stdbuf.c:91 msgid "" "Run COMMAND, with modified buffering operations for its standard streams.\n" -"\n" msgstr "" -#: src/stdbuf.c:98 +#: src/stdbuf.c:97 msgid "" " -i, --input=MODE adjust standard input stream buffering\n" " -o, --output=MODE adjust standard output stream buffering\n" " -e, --error=MODE adjust standard error stream buffering\n" msgstr "" -#: src/stdbuf.c:105 +#: src/stdbuf.c:104 msgid "" "\n" "If MODE is 'L' the corresponding stream will be line buffered.\n" "This option is invalid with standard input.\n" msgstr "" -#: src/stdbuf.c:108 +#: src/stdbuf.c:107 msgid "" "\n" "If MODE is '0' the corresponding stream will be unbuffered.\n" msgstr "" -#: src/stdbuf.c:111 +#: src/stdbuf.c:110 msgid "" "\n" "Otherwise MODE is a number which may be followed by one of the following:\n" @@ -7965,7 +8347,7 @@ msgid "" "size set to MODE bytes.\n" msgstr "" -#: src/stdbuf.c:117 +#: src/stdbuf.c:116 msgid "" "\n" "NOTE: If COMMAND adjusts the buffering of its standard streams ('tee' does\n" @@ -7975,22 +8357,22 @@ msgid "" "and are thus unaffected by 'stdbuf' settings.\n" msgstr "" -#: src/stdbuf.c:227 +#: src/stdbuf.c:226 #, fuzzy, c-format msgid "failed to find %s" msgstr "kon nie %s oopmaak nie" -#: src/stdbuf.c:247 src/stdbuf.c:279 +#: src/stdbuf.c:246 src/stdbuf.c:278 #, c-format msgid "failed to update the environment with %s" msgstr "" -#: src/stdbuf.c:321 +#: src/stdbuf.c:320 #, c-format msgid "line buffering stdin is meaningless" msgstr "" -#: src/stty.c:509 +#: src/stty.c:513 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -7998,23 +8380,25 @@ msgid "" " or: %s [-F DEVICE | --file=DEVICE] [-g|--save]\n" msgstr "" -#: src/stty.c:515 +#: src/stty.c:519 +msgid "Print or change terminal characteristics.\n" +msgstr "" + +#: src/stty.c:525 msgid "" -"Print or change terminal characteristics.\n" -"\n" " -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:524 +#: src/stty.c:532 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:529 +#: src/stty.c:537 msgid "" "\n" "Special characters:\n" @@ -8023,7 +8407,7 @@ msgid "" " eol CHAR CHAR will end the line\n" msgstr "" -#: src/stty.c:536 +#: src/stty.c:544 msgid "" " * eol2 CHAR alternate CHAR for ending the line\n" " erase CHAR CHAR will erase the last character typed\n" @@ -8031,7 +8415,7 @@ msgid "" " kill CHAR CHAR will erase the current line\n" msgstr "" -#: src/stty.c:542 +#: src/stty.c:550 msgid "" " * lnext CHAR CHAR will enter the next character quoted\n" " quit CHAR CHAR will send a quit signal\n" @@ -8039,7 +8423,7 @@ msgid "" " start CHAR CHAR will restart the output after stopping it\n" msgstr "" -#: src/stty.c:548 +#: src/stty.c:556 msgid "" " stop CHAR CHAR will stop the output\n" " susp CHAR CHAR will send a terminal stop signal\n" @@ -8047,7 +8431,7 @@ msgid "" " * werase CHAR CHAR will erase the last word typed\n" msgstr "" -#: src/stty.c:554 +#: src/stty.c:562 msgid "" "\n" "Special settings:\n" @@ -8056,7 +8440,7 @@ msgid "" " * columns N same as cols N\n" msgstr "" -#: src/stty.c:561 +#: src/stty.c:569 msgid "" " ispeed N set the input speed to N\n" " * line N use line discipline N\n" @@ -8065,7 +8449,7 @@ msgid "" " ospeed N set the output speed to N\n" msgstr "" -#: src/stty.c:567 +#: src/stty.c:575 msgid "" " * rows N tell the kernel that the terminal has N rows\n" " * size print the number of rows and columns according to the " @@ -8074,27 +8458,28 @@ msgid "" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" -#: src/stty.c:573 +#: src/stty.c:581 msgid "" "\n" "Control settings:\n" " [-]clocal disable modem control signals\n" " [-]cread allow input to be received\n" " * [-]crtscts enable RTS/CTS handshaking\n" +" * [-]cdtrdsr enable DTR/DSR handshaking\n" " csN set character size to N bits, N in [5..8]\n" msgstr "" -#: src/stty.c:581 +#: src/stty.c:590 msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" " [-]hupcl same as [-]hup\n" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" -" [-]parodd set odd parity (even with '-')\n" +" [-]parodd set odd parity (or even parity with '-')\n" msgstr "" -#: src/stty.c:588 +#: src/stty.c:597 msgid "" "\n" "Input settings:\n" @@ -8104,7 +8489,7 @@ msgid "" " [-]igncr ignore carriage return\n" msgstr "" -#: src/stty.c:596 +#: src/stty.c:605 msgid "" " [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" @@ -8113,11 +8498,11 @@ msgid "" " [-]istrip clear high (8th) bit of input characters\n" msgstr "" -#: src/stty.c:603 +#: src/stty.c:612 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr "" -#: src/stty.c:606 +#: src/stty.c:615 msgid "" " * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" @@ -8127,7 +8512,7 @@ msgid "" " [-]tandem same as [-]ixoff\n" msgstr "" -#: src/stty.c:614 +#: src/stty.c:623 msgid "" "\n" "Output settings:\n" @@ -8137,7 +8522,7 @@ msgid "" " * nlN newline delay style, N in [0..1]\n" msgstr "" -#: src/stty.c:622 +#: src/stty.c:631 msgid "" " * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of null characters\n" @@ -8147,7 +8532,7 @@ msgid "" " * [-]onlret newline performs a carriage return\n" msgstr "" -#: src/stty.c:630 +#: src/stty.c:639 msgid "" " * [-]onocr do not print carriage returns in the first column\n" " [-]opost postprocess output\n" @@ -8157,7 +8542,7 @@ msgid "" " * vtN vertical tab delay style, N in [0..1]\n" msgstr "" -#: src/stty.c:638 +#: src/stty.c:647 msgid "" "\n" "Local settings:\n" @@ -8166,7 +8551,7 @@ msgid "" " * -crtkill kill all line by obeying the echoctl and echok settings\n" msgstr "" -#: src/stty.c:645 +#: src/stty.c:654 msgid "" " * [-]ctlecho echo control characters in hat notation ('^c')\n" " [-]echo echo input characters\n" @@ -8175,7 +8560,7 @@ msgid "" " [-]echok echo a newline after a kill character\n" msgstr "" -#: src/stty.c:652 +#: src/stty.c:661 msgid "" " * [-]echoke same as [-]crtkill\n" " [-]echonl echo newline even if not echoing other characters\n" @@ -8184,7 +8569,7 @@ msgid "" " [-]iexten enable non-POSIX special characters\n" msgstr "" -#: src/stty.c:659 +#: src/stty.c:668 msgid "" " [-]isig enable interrupt, quit, and suspend special characters\n" " [-]noflsh disable flushing after interrupt and quit special " @@ -8194,7 +8579,7 @@ msgid "" " * [-]xcase with icanon, escape with '\\' for uppercase characters\n" msgstr "" -#: src/stty.c:666 +#: src/stty.c:675 msgid "" "\n" "Combination settings:\n" @@ -8203,7 +8588,7 @@ msgid "" " -cbreak same as icanon\n" msgstr "" -#: src/stty.c:673 +#: src/stty.c:682 msgid "" " cooked same as brkint ignpar istrip icrnl ixon opost isig\n" " icanon, eof and eol characters to their default values\n" @@ -8211,7 +8596,7 @@ msgid "" " crt same as echoe echoctl echoke\n" msgstr "" -#: src/stty.c:679 +#: src/stty.c:688 msgid "" " dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" " kill ^u\n" @@ -8220,7 +8605,7 @@ msgid "" " evenp same as parenb -parodd cs7\n" msgstr "" -#: src/stty.c:686 +#: src/stty.c:695 msgid "" " -evenp same as -parenb cs8\n" " * [-]lcase same as xcase iuclc olcuc\n" @@ -8230,7 +8615,7 @@ msgid "" " -nl same as icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" msgstr "" -#: src/stty.c:694 +#: src/stty.c:703 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -8239,7 +8624,7 @@ msgid "" " -pass8 same as parenb istrip cs7\n" msgstr "" -#: src/stty.c:701 +#: src/stty.c:710 msgid "" " raw same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" " -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n" @@ -8247,7 +8632,7 @@ msgid "" " -raw same as cooked\n" msgstr "" -#: src/stty.c:707 +#: src/stty.c:716 msgid "" " sane same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" " -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n" @@ -8257,7 +8642,7 @@ msgid "" " characters to their default values\n" msgstr "" -#: src/stty.c:715 +#: src/stty.c:724 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -8266,126 +8651,59 @@ msgid "" "127; special values ^- or undef used to disable special characters.\n" msgstr "" -#: src/stty.c:787 +#: src/stty.c:796 #, c-format msgid "only one device may be specified" msgstr "slegs een toestel mag gespesifiseer word" -#: src/stty.c:817 +#: src/stty.c:826 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" "mutually exclusive" msgstr "" -#: src/stty.c:823 +#: src/stty.c:832 #, c-format msgid "when specifying an output style, modes may not be set" msgstr "" -#: src/stty.c:838 +#: src/stty.c:847 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "" -#: src/stty.c:883 src/stty.c:993 +#: src/stty.c:892 src/stty.c:1002 #, fuzzy, c-format msgid "invalid argument %s" msgstr "ongeldige parameter: %s" -#: src/stty.c:894 src/stty.c:911 src/stty.c:923 src/stty.c:936 src/stty.c:948 -#: src/stty.c:968 +#: 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 msgid "missing argument to %s" msgstr "parameter vir `%s' ontbreek" -#: src/stty.c:974 +#: src/stty.c:983 #, fuzzy, c-format msgid "invalid line discipline %s" msgstr "ongeldige reëlwydte: %s" -#: src/stty.c:1044 +#: src/stty.c:1053 #, c-format msgid "%s: unable to perform all requested operations" msgstr "" -#: src/stty.c:1390 +#: src/stty.c:1399 #, c-format msgid "%s: no size information for this device" msgstr "%s: geen grootte-inligting is beskikbaar vir hierdie toestel nie" -#: src/stty.c:1904 +#: src/stty.c:1920 #, fuzzy, c-format msgid "invalid integer argument %s" msgstr "ongeldige heelgetalparameter `%s'" -#: src/su.c:229 -msgid "Password:" -msgstr "Wagwoord:" - -#: src/su.c:232 -#, c-format -msgid "getpass: cannot open /dev/tty" -msgstr "getpass: kan nie /dev/tty oopmaak nie" - -#: src/su.c:290 -#, c-format -msgid "cannot set groups" -msgstr "kan nie groepe stel nie" - -#: src/su.c:294 -#, c-format -msgid "cannot set group id" -msgstr "kan nie die groep-id stel nie" - -#: src/su.c:296 -#, c-format -msgid "cannot set user id" -msgstr "kan nie gebruiker-id stel nie" - -#: src/su.c:371 -#, c-format -msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" -msgstr "Gebruik so: %s [OPSIE]... [-] [GEBRUIKER [ARG]...]\n" - -#: src/su.c:372 -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 "" - -#: src/su.c:384 -msgid "" -"\n" -"A mere - implies -l. If USER not given, assume root.\n" -msgstr "" - -#: src/su.c:461 -#, c-format -msgid "user %s does not exist" -msgstr "gebruiker %s bestaan nie" - -#: src/su.c:484 -#, c-format -msgid "incorrect password" -msgstr "verkeerde wagwoord" - -#: src/su.c:501 -#, c-format -msgid "using restricted shell %s" -msgstr "gebruik tans beperkte dop %s" - -#: src/su.c:509 -#, c-format -msgid "warning: cannot change directory to %s" -msgstr "waarskuwing: kan nie chdir uitvoer na gids %s toe nie" - #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 msgid "Kayvan Aghaiepour" @@ -8410,7 +8728,7 @@ msgstr "" msgid "ignoring all arguments" msgstr "all parameters word geïgnoreer" -#: src/system.h:340 +#: src/system.h:343 #, c-format msgid "" "\n" @@ -8419,15 +8737,24 @@ msgid "" "for details about the options it supports.\n" msgstr "" -#: src/system.h:346 +#: src/system.h:349 msgid " --help display this help and exit\n" msgstr " --help wys hierdie teks en stop\n" -#: src/system.h:348 +#: src/system.h:351 msgid " --version output version information and exit\n" msgstr " --version wys weergawe-inligting en stop\n" -#: src/system.h:541 +#: src/system.h:544 +#, fuzzy +msgid "" +"\n" +"Mandatory arguments to long options are mandatory for short options too.\n" +msgstr "" +"Verpligte parameters vir langformaat opsies is ook verpligtend vir " +"kortformaat opsies.\n" + +#: src/system.h:552 msgid "" "\n" "SIZE is an integer and optional unit (example: 10M is 10*1024*1024). Units\n" @@ -8435,7 +8762,7 @@ msgid "" "1000).\n" msgstr "" -#: src/system.h:550 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -8444,7 +8771,7 @@ msgid "" "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n" msgstr "" -#: src/system.h:560 +#: src/system.h:571 #, fuzzy, c-format msgid "" "\n" @@ -8457,22 +8784,22 @@ msgstr "" #. <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:574 +#: src/system.h:585 #, c-format msgid "Report %s translation bugs to <http://translationproject.org/team/>\n" msgstr "" -#: src/system.h:578 +#: src/system.h:589 #, c-format msgid "For complete documentation, run: info coreutils '%s invocation'\n" msgstr "" -#: src/system.h:585 +#: src/system.h:596 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "Probeer `%s --help' vir meer inligting.\n" -#: src/system.h:617 +#: src/system.h:628 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -8488,55 +8815,59 @@ 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" -"\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/tac.c:145 +#: src/tac.c:144 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 "" -#: src/tac.c:235 src/tac.c:336 +#: src/tac.c:234 src/tac.c:335 #, c-format msgid "%s: seek failed" msgstr "%s: seek het misluk" -#: src/tac.c:264 +#: src/tac.c:263 #, fuzzy, c-format msgid "record too large" msgstr "%s: lêer te groot" -#: src/tac.c:451 +#: src/tac.c:450 #, fuzzy, c-format msgid "failed to create temporary file in %s" msgstr "kan nie 'n tydelike lêer skep nie" -#: src/tac.c:459 +#: src/tac.c:458 #, fuzzy, c-format msgid "failed to open %s for writing" msgstr "%s: lêer te lank" -#: src/tac.c:476 +#: src/tac.c:475 #, fuzzy, c-format msgid "failed to rewind stream for %s" msgstr "lêertye van %s kon nie behou word nie" -#: src/tac.c:512 src/tac.c:519 +#: src/tac.c:511 src/tac.c:518 #, fuzzy, c-format msgid "%s: write error" msgstr "skryffout" -#: src/tac.c:572 +#: src/tac.c:571 #, fuzzy, c-format msgid "failed to open %s for reading" msgstr "kan nie %s oopmaak om te lees nie" -#: src/tac.c:630 +#: src/tac.c:629 #, c-format msgid "separator cannot be empty" msgstr "verdeler mag nie leeg wees nie" @@ -8547,15 +8878,18 @@ msgid "Ian Lance Taylor" msgstr "" #: src/tail.c:262 -#, c-format +#, fuzzy, 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" -"\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/tail.c:271 +#: src/tail.c:270 msgid "" " -c, --bytes=K output the last K bytes; alternatively, use -c " "+K\n" @@ -8563,7 +8897,7 @@ msgid "" "file\n" msgstr "" -#: src/tail.c:275 +#: src/tail.c:274 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -8572,7 +8906,7 @@ msgid "" " -F same as --follow=name --retry\n" msgstr "" -#: src/tail.c:282 +#: src/tail.c:281 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -8586,7 +8920,7 @@ msgid "" " With inotify, this option is rarely useful.\n" msgstr "" -#: src/tail.c:295 +#: src/tail.c:294 msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" " -q, --quiet, --silent never output headers giving file names\n" @@ -8595,7 +8929,7 @@ msgid "" " name, i.e., with --follow=name\n" msgstr "" -#: src/tail.c:302 +#: src/tail.c:301 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations.\n" @@ -8604,7 +8938,7 @@ msgid "" " -v, --verbose always output headers giving file names\n" msgstr "" -#: src/tail.c:311 +#: src/tail.c:310 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -8615,7 +8949,7 @@ msgid "" "\n" msgstr "" -#: src/tail.c:320 +#: src/tail.c:319 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" @@ -8625,64 +8959,64 @@ msgid "" "named file in a way that accommodates renaming, removal and creation.\n" msgstr "" -#: src/tail.c:379 +#: src/tail.c:378 #, c-format msgid "closing %s (fd=%d)" msgstr "lêer word toegemaak: %s (fd=%d)" -#: src/tail.c:454 +#: src/tail.c:453 #, c-format msgid "%s: cannot seek to relative offset %s" msgstr "" -#: src/tail.c:458 +#: src/tail.c:457 #, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "" -#: src/tail.c:895 +#: src/tail.c:894 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "" -#: src/tail.c:907 +#: src/tail.c:906 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" msgstr "" -#: src/tail.c:964 +#: src/tail.c:963 #, fuzzy, c-format msgid "%s has become inaccessible" msgstr "`%s' het ontoeganklik geword" -#: src/tail.c:981 +#: src/tail.c:980 #, c-format msgid "%s has been replaced with an untailable file; giving up on this name" msgstr "" -#: src/tail.c:990 +#: src/tail.c:989 #, c-format msgid "%s has been replaced with a remote file. giving up on this name" msgstr "" -#: src/tail.c:1011 +#: src/tail.c:1010 #, fuzzy, c-format msgid "%s has become accessible" msgstr "`%s' het toeganklik geword" -#: src/tail.c:1019 +#: src/tail.c:1018 #, c-format msgid "%s has appeared; following end of new file" msgstr "" -#: src/tail.c:1030 +#: src/tail.c:1029 #, c-format msgid "%s has been replaced; following end of new file" msgstr "" -#: src/tail.c:1131 +#: src/tail.c:1130 #, fuzzy, c-format msgid "%s: cannot change nonblocking mode" msgstr "kan nie verander na die null-groep nie" @@ -8985,17 +9319,22 @@ msgstr "ontbrekende `]'\n" msgid "extra argument %s" msgstr "ongeldige parameter: %s" -#: src/timeout.c:124 +#: src/timeout.c:112 +#, c-format +msgid "warning: sigprocmask" +msgstr "" + +#: src/timeout.c:145 #, c-format msgid "warning: timer_settime" msgstr "" -#: src/timeout.c:129 +#: src/timeout.c:150 #, c-format msgid "warning: timer_create" msgstr "" -#: src/timeout.c:204 +#: src/timeout.c:225 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -9004,18 +9343,18 @@ msgstr "" "Gebruik so: %s BEVEL [ARG]...\n" " of: %s OPSIE\n" -#: src/timeout.c:208 +#: src/timeout.c:229 #, fuzzy -msgid "" -"Start COMMAND, and kill it if still running after DURATION.\n" -"\n" -"Mandatory arguments to long options are mandatory for short options too.\n" +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:213 +#: src/timeout.c:235 msgid "" +" --preserve-status\n" +" exit with the same status as COMMAND, even when the\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 " @@ -9030,7 +9369,7 @@ msgid "" " See 'kill -l' for a list of signals\n" msgstr "" -#: src/timeout.c:229 +#: src/timeout.c:254 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -9038,25 +9377,30 @@ msgid "" "days.\n" msgstr "" -#: src/timeout.c:234 +#: src/timeout.c:259 msgid "" "\n" -"If the command times out, then exit with status 124. Otherwise, exit\n" -"with the status of COMMAND. If no signal is specified, send the TERM\n" -"signal upon timeout. The TERM signal kills any process that does not\n" -"block or catch that signal. For other processes, it may be necessary to\n" -"use the KILL (9) signal, since this signal cannot be caught. If the\n" -"KILL (9) signal is sent, the exit status is 128+9 rather than 124.\n" +"If the command times out, and --preserve-status is not set, then exit with\n" +"status 124. Otherwise, exit with the status of COMMAND. If no signal\n" +"is specified, send the TERM signal upon timeout. The TERM signal kills\n" +"any process that does not block or catch that signal. It may be necessary\n" +"to use the KILL (9) signal, since this signal cannot be caught, in which\n" +"case the exit status is 128+9 rather than 124.\n" +msgstr "" + +#: src/timeout.c:363 +#, c-format +msgid "warning: disabling core dumps failed" msgstr "" -#: src/timeout.c:419 +#: src/timeout.c:471 #, fuzzy, c-format msgid "error waiting for command" msgstr "fout met die skryf na %s" -#: src/timeout.c:441 +#: src/timeout.c:482 #, c-format -msgid "warning: disabling core dumps failed" +msgid "the monitored command dumped core" msgstr "" #. This is a proper name. See the gettext manual, section Names. @@ -9069,22 +9413,22 @@ msgstr "" msgid "Randy Smith" msgstr "" -#: src/touch.c:115 src/touch.c:313 +#: src/touch.c:115 src/touch.c:309 #, c-format msgid "invalid date format %s" msgstr "ongeldige datumformaat %s" -#: src/touch.c:194 +#: src/touch.c:191 #, c-format msgid "cannot touch %s" msgstr "kan nie %s aanraak nie" -#: src/touch.c:200 +#: src/touch.c:197 #, c-format msgid "setting times of %s" msgstr "die tyd van %s is verstel" -#: src/touch.c:216 +#: src/touch.c:213 msgid "" "Update the access and modification times of each FILE to the current time.\n" "\n" @@ -9093,10 +9437,9 @@ msgid "" "\n" "A FILE argument string of - is handled specially and causes touch to\n" "change the times of the file associated with standard output.\n" -"\n" msgstr "" -#: src/touch.c:229 +#: src/touch.c:225 msgid "" " -a change only the access time\n" " -c, --no-create do not create any files\n" @@ -9104,7 +9447,7 @@ msgid "" " -f (ignored)\n" msgstr "" -#: src/touch.c:235 +#: src/touch.c:231 msgid "" " -h, --no-dereference affect each symbolic link instead of any " "referenced\n" @@ -9113,27 +9456,27 @@ msgid "" " -m change only the modification time\n" msgstr "" -#: src/touch.c:241 +#: src/touch.c:237 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" -" --time=WORD change the specified time:\n" +" --time=WORD change the specified time:\n" " WORD is access, atime, or use: equivalent to -a\n" " WORD is modify or mtime: equivalent to -m\n" msgstr "" -#: src/touch.c:250 +#: src/touch.c:246 msgid "" "\n" "Note that the -d and -t options accept different time-date formats.\n" msgstr "" -#: src/touch.c:339 +#: src/touch.c:335 #, c-format msgid "cannot specify times from more than one source" msgstr "" -#: src/touch.c:413 +#: src/touch.c:409 #, c-format msgid "" "warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'" @@ -9355,25 +9698,24 @@ msgid "" "If a FILE is larger than the specified size, the extra data is lost.\n" "If a FILE is shorter, it is extended and the extended part (hole)\n" "reads as zero bytes.\n" -"\n" msgstr "" -#: src/truncate.c:110 +#: src/truncate.c:109 msgid " -c, --no-create do not create any files\n" msgstr "" -#: src/truncate.c:113 +#: src/truncate.c:112 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" -#: src/truncate.c:116 +#: 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" msgstr "" -#: src/truncate.c:122 +#: src/truncate.c:121 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -9381,57 +9723,57 @@ msgid "" "'/' round down to multiple of, '%' round up to multiple of.\n" msgstr "" -#: src/truncate.c:150 +#: src/truncate.c:149 #, c-format msgid "overflow in %<PRIdMAX> * %<PRIdMAX> byte blocks for file %s" msgstr "" -#: src/truncate.c:174 +#: src/truncate.c:173 #, fuzzy, c-format msgid "%s has unusable, apparently negative size" msgstr "%s: lêer het negatiewe grootte" -#: src/truncate.c:184 src/truncate.c:379 +#: src/truncate.c:183 src/truncate.c:384 #, fuzzy, c-format msgid "cannot get the size of %s" msgstr "kon nie die tyd van die dag vasstel nie" -#: src/truncate.c:206 +#: src/truncate.c:205 #, c-format msgid "overflow rounding up size of file %s" msgstr "" -#: src/truncate.c:216 +#: src/truncate.c:215 #, c-format msgid "overflow extending size of file %s" msgstr "" -#: src/truncate.c:231 +#: src/truncate.c:230 #, c-format msgid "failed to truncate %s at %<PRIdMAX> bytes" msgstr "" -#: src/truncate.c:305 +#: src/truncate.c:303 #, fuzzy, c-format msgid "multiple relative modifiers specified" msgstr "veelvuldige afvoerlêers is gespesifiseer" -#: src/truncate.c:335 +#: src/truncate.c:333 #, fuzzy, c-format msgid "you must specify either %s or %s" msgstr "u moet 'n lys van grepe, karakters of velde spesifiseer" -#: src/truncate.c:342 +#: src/truncate.c:340 #, c-format msgid "you must specify a relative %s with %s" msgstr "" -#: src/truncate.c:349 +#: src/truncate.c:347 #, c-format msgid "%s was specified but %s was not" msgstr "" -#: src/truncate.c:400 +#: src/truncate.c:404 #, fuzzy, c-format msgid "cannot open %s for writing" msgstr "kan nie %s oopmaak om te lees nie" @@ -9507,14 +9849,13 @@ msgstr "kan nie die stelselnaam vasstel nie" msgid "" "Convert blanks in each FILE to tabs, writing to standard output.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\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/unexpand.c:125 +#: src/unexpand.c:124 msgid "" " -a, --all convert all blanks, instead of just initial blanks\n" " --first-only convert only leading sequences of blanks (overrides -a)\n" @@ -9522,12 +9863,12 @@ msgid "" " -t, --tabs=LIST use comma separated LIST of tab positions (enables -a)\n" msgstr "" -#: src/unexpand.c:153 +#: src/unexpand.c:152 #, c-format msgid "tabs are too far apart" msgstr "" -#: src/unexpand.c:505 +#: src/unexpand.c:504 #, fuzzy, c-format msgid "tab stop value is too large" msgstr "inkeping is te groot %s" @@ -9543,16 +9884,15 @@ msgid "" "writing to OUTPUT (or standard output).\n" "\n" "With no options, matching lines are merged to the first occurrence.\n" -"\n" msgstr "" -#: src/uniq.c:148 +#: src/uniq.c:147 msgid "" " -c, --count prefix lines by the number of occurrences\n" " -d, --repeated only print duplicate lines\n" msgstr "" -#: src/uniq.c:152 +#: src/uniq.c:151 msgid "" " -D, --all-repeated[=delimit-method] print all duplicate lines\n" " delimit-method={none(default),prepend,separate}\n" @@ -9564,18 +9904,18 @@ msgid "" " -z, --zero-terminated end lines with 0 byte, not newline\n" msgstr "" -#: src/uniq.c:162 +#: src/uniq.c:161 msgid " -w, --check-chars=N compare no more than N characters in lines\n" msgstr "" -#: src/uniq.c:167 +#: src/uniq.c:166 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:172 +#: src/uniq.c:171 msgid "" "\n" "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n" @@ -9583,24 +9923,24 @@ msgid "" "Also, comparisons honor the rules specified by 'LC_COLLATE'.\n" msgstr "" -#: src/uniq.c:359 +#: src/uniq.c:358 #, fuzzy, c-format msgid "too many repeated lines" msgstr "te veel parameters" -#: src/uniq.c:522 +#: src/uniq.c:521 msgid "invalid number of fields to skip" msgstr "ongeldige aantal velde om oor te slaan" -#: src/uniq.c:531 +#: src/uniq.c:530 msgid "invalid number of bytes to skip" msgstr "ongeldige aantal grepe om oor te slaan" -#: src/uniq.c:540 +#: src/uniq.c:539 msgid "invalid number of bytes to compare" msgstr "ongeldige aantal grepe om te vergelyk" -#: src/uniq.c:559 +#: src/uniq.c:558 #, c-format msgid "printing all duplicated lines and repeat counts is meaningless" msgstr "" @@ -9654,6 +9994,11 @@ msgid_plural "up %ld days %2d:%02d, " msgstr[0] "" msgstr[1] "" +#: src/uptime.c:149 +#, fuzzy, c-format +msgid "up %2d:%02d, " +msgstr " %2d:%02d%s verby " + #: src/uptime.c:151 #, fuzzy, c-format msgid "%lu user" @@ -9733,39 +10078,39 @@ msgstr "" msgid " old " msgstr " oud" -#: src/who.c:449 +#: src/who.c:440 msgid "system boot" msgstr "" -#: src/who.c:456 src/who.c:458 +#: src/who.c:447 src/who.c:449 msgid "id=" msgstr "id=" -#: src/who.c:471 src/who.c:476 +#: src/who.c:462 src/who.c:467 msgid "term=" msgstr "term=" -#: src/who.c:473 src/who.c:477 +#: src/who.c:464 src/who.c:468 msgid "exit=" msgstr "verlaat=" -#: src/who.c:494 +#: src/who.c:485 msgid "LOGIN" msgstr "" -#: src/who.c:514 +#: src/who.c:505 msgid "clock change" msgstr "horlosieverandering" -#: src/who.c:526 src/who.c:527 +#: src/who.c:517 src/who.c:518 msgid "run-level" msgstr "uitvoervlak" -#: src/who.c:530 src/who.c:531 +#: src/who.c:521 src/who.c:522 msgid "last=" msgstr "laaste=" -#: src/who.c:562 +#: src/who.c:553 #, fuzzy, c-format msgid "" "\n" @@ -9774,44 +10119,44 @@ msgstr "" "\n" "# gebruikers=%u\n" -#: src/who.c:568 +#: src/who.c:559 msgid "NAME" msgstr "NAAM" -#: src/who.c:568 +#: src/who.c:559 msgid "LINE" msgstr "LYN" -#: src/who.c:568 +#: src/who.c:559 msgid "TIME" msgstr "TYD" -#: src/who.c:568 +#: src/who.c:559 msgid "IDLE" msgstr "LUIER" -#: src/who.c:569 +#: src/who.c:560 msgid "PID" msgstr "PID" -#: src/who.c:569 +#: src/who.c:560 msgid "COMMENT" msgstr "KOMMENTAAR" -#: src/who.c:569 +#: src/who.c:560 msgid "EXIT" msgstr "VERLAAT" -#: src/who.c:649 +#: src/who.c:640 #, c-format msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n" msgstr "Gebruik so: %s [OPSIE]... [ LÊER | ARG1 ARG2 ]\n" -#: src/who.c:650 +#: src/who.c:641 msgid "Print information about users who are currently logged in.\n" msgstr "" -#: src/who.c:653 +#: src/who.c:644 msgid "" "\n" " -a, --all same as -b -d --login -p -r -t -T -u\n" @@ -9820,18 +10165,18 @@ msgid "" " -H, --heading print line of column headings\n" msgstr "" -#: src/who.c:660 +#: src/who.c:651 msgid " -l, --login print system login processes\n" msgstr "" -#: src/who.c:663 +#: src/who.c:654 msgid "" " --lookup attempt to canonicalize hostnames via DNS\n" " -m only hostname and user associated with stdin\n" " -p, --process print active processes spawned by init\n" msgstr "" -#: src/who.c:668 +#: src/who.c:659 msgid "" " -q, --count all login names and number of users logged on\n" " -r, --runlevel print current runlevel\n" @@ -9839,7 +10184,7 @@ msgid "" " -t, --time print last system clock change\n" msgstr "" -#: src/who.c:674 +#: src/who.c:665 msgid "" " -T, -w, --mesg add user's message status as +, - or ?\n" " -u, --users list users logged in\n" @@ -9847,7 +10192,7 @@ msgid "" " --writable same as -T\n" msgstr "" -#: src/who.c:682 +#: src/who.c:673 #, fuzzy, c-format msgid "" "\n" @@ -9894,6 +10239,33 @@ 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" @@ -9901,18 +10273,38 @@ 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 "Usage: %s [OPTION]... FILE\n" +#~ msgstr "Gebruik so: %s [OPSIE]... LÊER \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 "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" @@ -9922,16 +10314,15 @@ msgstr "" #~ "verstek)\n" #~ " --preserve-root moenie rekursief te werk gaan met `/' nie\n" -#, fuzzy -#~ msgid "Usage: %s [OPTION]... PATH START\n" -#~ msgstr "Gebruik so: %s [OPSIE]... STEL1 [STEL2]\n" - -#~ msgid "cannot create link %s" -#~ msgstr "kan nie die skakel %s skep nie" - -#, fuzzy -#~ msgid "%s: option '%s' is ambiguous\n" -#~ msgstr "%s: opsie `-W %s' is dubbelsinnig\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" @@ -9988,6 +10379,9 @@ msgstr "" #~ 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 "%s: specified destination directory does not exist" #~ msgstr "%s: die gespesifiseerde doelgids bestaan nie" @@ -10009,9 +10403,6 @@ msgstr "" #~ msgid "symbolic links are not supported on this system" #~ msgstr "simboliese skakels word nie ondersteun op hierdie stelsel nie" -#~ msgid "invalid format width" -#~ msgstr "ongeldige wydte vir formaat" - #~ msgid "invalid format precision" #~ msgstr "ongeldige presisie vir formaat" @@ -10078,9 +10469,6 @@ msgstr "" #~ 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'" @@ -10237,6 +10625,9 @@ msgstr "" #~ msgid "invalid number of lines: 0" #~ msgstr "ongeldige aantal reëls: 0" +#~ msgid "Usage: %s [OPTION] FILE...\n" +#~ msgstr "Gebruik so: %s [OPSIE] LÊER...\n" + #~ msgid "Warning: `-l' is deprecated; use `-L' instead" #~ msgstr "Waarskuwing: `-l' is verouderd; gebruik eerder `-L'" @@ -10318,9 +10709,6 @@ msgstr "" #~ msgid "`-%lu' option is obsolete; use `-f %lu'" #~ msgstr "`-%lu' opsie is verouderd; gebruik `-f %lu'" -#~ msgid " %2d:%02d%s up " -#~ msgstr " %2d:%02d%s verby " - #~ msgid "am" #~ msgstr "vm" diff --git a/po/be.gmo b/po/be.gmo index 8f7d4206..c138bed7 100644 Binary files a/po/be.gmo and b/po/be.gmo differ diff --git a/po/be.po b/po/be.po index 1dccfd08..87c20e19 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: 2012-05-10 19:35+0200\n" +"POT-Creation-Date: 2013-02-14 15:56+0000\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,19 +39,19 @@ msgstr "Рэчаісныя довады:" msgid "error closing file" msgstr "зачыняецца файл уводу %s" -#: lib/closeout.c:112 src/base64.c:109 src/base64.c:121 src/base64.c:127 -#: src/base64.c:168 src/base64.c:224 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:330 src/expand.c:355 src/head.c:298 -#: src/head.c:348 src/head.c:756 src/head.c:797 src/mktemp.c:350 src/od.c:919 -#: src/paste.c:160 src/shuf.c:369 src/split.c:727 src/split.c:964 -#: src/split.c:969 src/tail.c:350 src/tail.c:1201 src/tail.c:1307 +#: 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 -#: src/unexpand.c:427 src/unexpand.c:443 +#: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "памылка запісу" -#: lib/copy-acl.c:611 src/copy.c:1160 src/copy.c:2602 +#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617 #, fuzzy, c-format msgid "preserving permissions for %s" msgstr "усталяваньне правоў для %s" @@ -243,18 +243,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:483 +#: lib/mkdir-p.c:196 src/install.c:484 #, c-format msgid "cannot change permissions of %s" msgstr "немагчыма зьмяніць правы %s" -#: lib/mkdir-p.c:206 src/copy.c:2261 src/install.c:709 src/install.c:722 +#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722 #, 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:915 src/tac.c:435 +#: src/split.c:929 src/tac.c:434 #, c-format msgid "memory exhausted" msgstr "памяць вычарпана" @@ -303,84 +303,84 @@ msgstr "'" msgid "%s: end of file" msgstr "%s: збой seek" -#: lib/regcomp.c:130 +#: lib/regcomp.c:131 msgid "Success" msgstr "" -#: lib/regcomp.c:133 +#: lib/regcomp.c:134 msgid "No match" msgstr "" -#: lib/regcomp.c:136 +#: lib/regcomp.c:137 #, fuzzy msgid "Invalid regular expression" msgstr "%s: нерэчаісны сталы выраз: %s" -#: lib/regcomp.c:139 +#: lib/regcomp.c:140 #, fuzzy msgid "Invalid collation character" msgstr "недзеяздольная кляса знака %s" -#: lib/regcomp.c:142 +#: lib/regcomp.c:143 #, fuzzy msgid "Invalid character class name" msgstr "недзеяздольная кляса знака %s" -#: lib/regcomp.c:145 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "" -#: lib/regcomp.c:148 +#: lib/regcomp.c:149 #, fuzzy msgid "Invalid back reference" msgstr "Недзеяздольны прамежак старонак %s" -#: lib/regcomp.c:151 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "" -#: lib/regcomp.c:154 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "" -#: lib/regcomp.c:157 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "" -#: lib/regcomp.c:160 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "" -#: lib/regcomp.c:163 +#: lib/regcomp.c:164 #, fuzzy msgid "Invalid range end" msgstr "Недзеяздольны прамежак старонак %s" -#: lib/regcomp.c:166 +#: lib/regcomp.c:167 #, fuzzy msgid "Memory exhausted" msgstr "памяць вычарпана" -#: lib/regcomp.c:169 +#: lib/regcomp.c:170 #, fuzzy msgid "Invalid preceding regular expression" msgstr "%s: нерэчаісны сталы выраз: %s" -#: lib/regcomp.c:172 +#: lib/regcomp.c:173 #, fuzzy msgid "Premature end of regular expression" msgstr "памылка ў пошуку звычайнага выразу" -#: lib/regcomp.c:175 +#: lib/regcomp.c:176 #, fuzzy msgid "Regular expression too big" msgstr "памылка ў супастаўляльніку сталых выразаў" -#: lib/regcomp.c:178 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:703 +#: lib/regcomp.c:704 #, fuzzy msgid "No previous regular expression" msgstr "памылка ў пошуку звычайнага выразу" @@ -420,7 +420,7 @@ msgstr "^[тТ]" msgid "^[nN]" msgstr "^[нН]" -#: lib/set-mode-acl.c:695 src/copy.c:2284 src/cp.c:518 +#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516 #, c-format msgid "setting permissions for %s" msgstr "усталяваньне правоў для %s" @@ -566,13 +566,13 @@ msgstr "памылка адкрыцьця" msgid "Resource lost" msgstr "" -#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262 -#: lib/spawn-pipe.c:265 +#: 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:232 lib/spawn-pipe.c:346 lib/wait-process.c:282 +#: 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" @@ -588,24 +588,24 @@ msgstr "нерэчаісны адрэзак часу %s" msgid "Unknown signal %d" msgstr "" -#: lib/unicodeio.c:103 +#: lib/unicodeio.c:102 msgid "iconv function not usable" msgstr "функцыя iconv непрыгодна для выкарыстаньня" -#: lib/unicodeio.c:105 +#: lib/unicodeio.c:104 msgid "iconv function not available" msgstr "недаступна функцыя iconv" -#: lib/unicodeio.c:112 +#: lib/unicodeio.c:111 msgid "character out of range" msgstr "знак па за дапушчальнымі межамі" -#: lib/unicodeio.c:182 +#: lib/unicodeio.c:181 #, c-format msgid "cannot convert U+%04X to local character set" msgstr "немагчыма пераўтварыць U+%04X у мясцовы набор знакаў" -#: lib/unicodeio.c:184 +#: lib/unicodeio.c:183 #, c-format msgid "cannot convert U+%04X to local character set: %s" msgstr "немагчыма пераўтварыць U+%04X у мясцовы набор знакаў: %s" @@ -779,7 +779,7 @@ msgstr "" "\n" "Паведамляйце пра памылкі на <%s>.\n" -#: lib/version-etc.c:251 src/system.h:562 +#: lib/version-etc.c:251 src/system.h:573 #, c-format msgid "%s home page: <%s>\n" msgstr "" @@ -789,7 +789,7 @@ msgstr "" msgid "%s home page: <http://www.gnu.org/software/%s/>\n" msgstr "" -#: lib/version-etc.c:256 src/system.h:563 +#: lib/version-etc.c:256 src/system.h:574 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" @@ -876,14 +876,17 @@ msgid "Simon Josefsson" msgstr "" #: src/base64.c:60 -#, c-format +#, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" "Base64 encode or decode FILE, or standard input, to standard output.\n" -"\n" msgstr "" +"Выкарыстаньне: %s [ВЫБАР] [ФАЙЛ]...\n" +" ці: %s [ВЫБАР] --check [ФАЙЛ]\n" +"Друкуе ці правярае %s (%d-бітавую) праверчую суму.\n" +"Калі файл незаданы, ці калі замест яго працяжнік, чытае стандартны ўвод.\n" -#: src/base64.c:64 +#: src/base64.c:67 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -893,7 +896,7 @@ msgid "" "\n" msgstr "" -#: src/base64.c:73 src/cat.c:110 src/fmt.c:293 src/shuf.c:71 src/sum.c:70 +#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -901,7 +904,7 @@ msgstr "" "\n" "Калі ФАЙЛ не зададзены альбо зададзены -, чытае стандартны ўвод.\n" -#: src/base64.c:76 +#: src/base64.c:79 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -910,37 +913,37 @@ msgid "" "from any other non-alphabet bytes in the encoded stream.\n" msgstr "" -#: src/base64.c:171 src/base64.c:208 src/csplit.c:263 src/csplit.c:1435 -#: src/join.c:451 src/shuf.c:157 src/shuf.c:361 src/tac-pipe.c:74 +#: 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 #, c-format msgid "read error" msgstr "памылка чытаньня" -#: src/base64.c:227 +#: src/base64.c:230 #, fuzzy, c-format msgid "invalid input" msgstr "нерэчаісны сьцяг уводу: %s" -#: src/base64.c:264 +#: src/base64.c:267 #, fuzzy, c-format msgid "invalid wrap size: %s" msgstr "незразумелы памер табуляцыі: %s" -#: src/base64.c:283 src/basename.c:173 src/comm.c:435 src/cp.c:607 -#: src/date.c:441 src/dircolors.c:447 src/du.c:894 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:169 src/install.c:929 src/join.c:961 -#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:157 src/mv.c:447 -#: src/od.c:1802 src/ptx.c:2081 src/readlink.c:154 src/seq.c:408 -#: src/shuf.c:320 src/shuf.c:339 src/sort.c:4477 src/split.c:1313 -#: src/tr.c:1797 src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:454 -#: src/uniq.c:471 src/unlink.c:81 src/uptime.c:250 src/users.c:146 -#: src/wc.c:666 src/who.c:836 src/whoami.c:79 +#: 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 #, c-format msgid "extra operand %s" msgstr "непатрэбны аргумэнт %s" -#: src/base64.c:315 src/cat.c:781 +#: src/base64.c:318 src/cat.c:781 #, c-format msgid "closing standard input" msgstr "зачыненьне стандартнага уводу" @@ -948,15 +951,15 @@ 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/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:53 src/env.c:33 +#: 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/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:65 src/su.c:88 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 +#: 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 msgid "David MacKenzie" msgstr "" @@ -970,23 +973,23 @@ msgstr "" " ці: %s ВЫБАР\n" #: src/basename.c:53 +#, fuzzy msgid "" "Print NAME with any leading directory components removed.\n" "If specified, also remove a trailing SUFFIX.\n" -"\n" msgstr "" "Друкуе НАЗВу без усялякіх папярэдніх частак(тэчак).\n" "Калі пазначака, так сама вікідае й УСТАЎКу.\n" "\n" -#: src/basename.c:59 +#: 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" msgstr "" -#: src/basename.c:66 +#: src/basename.c:67 #, c-format msgid "" "\n" @@ -997,20 +1000,21 @@ msgid "" " %s -a any/str1 any/str2 -> \"str1\" followed by \"str2\"\n" msgstr "" -#: src/basename.c:167 src/chcon.c:531 src/chgrp.c:277 src/chmod.c:526 -#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1369 +#: 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:183 src/mkfifo.c:108 src/mknod.c:146 src/nohup.c:111 -#: src/pathchk.c:148 src/printf.c:674 src/readlink.c:146 src/realpath.c:236 -#: src/rm.c:314 src/rmdir.c:223 src/seq.c:402 src/setuidgid.c:137 -#: src/sleep.c:119 src/stat.c:1476 src/stdbuf.c:346 src/tr.c:1782 +#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 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 #, 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:52 src/split.c:49 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/split.c:49 msgid "Torbjorn Granlund" msgstr "" @@ -1020,8 +1024,8 @@ msgstr "" msgid "Richard M. Stallman" msgstr "" -#: src/cat.c:88 src/df.c:846 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4720 src/nl.c:182 src/paste.c:435 src/pr.c:2768 src/sum.c:58 +#: 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/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 +1084,7 @@ msgstr "" msgid "cannot do ioctl on %s" msgstr "немагчыма выканаць ioctl на %s" -#: src/cat.c:637 src/dd.c:2209 src/sort.c:379 src/tee.c:165 src/yes.c:86 +#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86 #, c-format msgid "standard output" msgstr "стандартны вывад" @@ -1097,14 +1101,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:55 src/head.c:46 src/hostid.c:33 +#: 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 msgid "Jim Meyering" msgstr "" -#: src/chcon.c:100 src/runcon.c:203 src/runcon.c:234 +#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238 #, fuzzy, c-format msgid "failed to create security context: %s" msgstr "немагчыма зьмяніць уладальніка %s\n" @@ -1114,8 +1118,8 @@ msgstr "немагчыма зьмяніць уладальніка %s\n" msgid "failed to set %s security context component to %s" msgstr "" -#: src/chcon.c:156 src/chcon.c:540 src/copy.c:2222 src/runcon.c:217 -#: src/stat.c:683 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221 +#: src/stat.c:702 #, fuzzy, c-format msgid "failed to get security context of %s" msgstr "немагчыма атрымаць атрыбуты %s" @@ -1131,12 +1135,12 @@ 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:446 src/ls.c:2981 +#: src/du.c:457 src/ls.c:2981 #, c-format msgid "cannot access %s" msgstr "немагчыма атрымаць доступ да %s" -#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:426 +#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437 #, c-format msgid "cannot read directory %s" msgstr "немагчыма прачытаць тэчку %s" @@ -1146,13 +1150,13 @@ 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:599 +#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562 #, 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:618 -#: src/remove.c:613 +#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642 +#: src/remove.c:576 #, fuzzy, c-format msgid "fts_close failed" msgstr "памылка закрыцьця" @@ -1173,10 +1177,9 @@ msgid "" "Change the security context of each FILE to CONTEXT.\n" "With --reference, change the security context of each FILE to that of " "RFILE.\n" -"\n" msgstr "" -#: src/chcon.c:362 src/chgrp.c:123 src/chown.c:94 +#: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94 msgid "" " --dereference affect the referent of each symbolic link (this is\n" " the default), rather than the symbolic link itself\n" @@ -1184,7 +1187,7 @@ msgid "" "file\n" msgstr "" -#: src/chcon.c:367 +#: src/chcon.c:369 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" @@ -1192,7 +1195,13 @@ msgid "" " -l, --range=RANGE set range RANGE in the target security context\n" msgstr "" -#: src/chcon.c:373 +#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 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 " @@ -1206,15 +1215,15 @@ msgstr "" " -R, --recursive апрацоўвае файлы й тэчкі рэкурсыўна\n" " -v, --verbose выводзіць праверку для кожнага апрацаванага файлу\n" -#: src/chcon.c:377 src/chgrp.c:140 src/chown.c:118 +#: 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:380 +#: src/chcon.c:386 msgid " -v, --verbose output a diagnostic for every file processed\n" msgstr "" -#: src/chcon.c:383 src/chgrp.c:143 src/chown.c:121 +#: src/chcon.c:389 src/chgrp.c:143 src/chown.c:121 msgid "" "\n" "The following options modify how a hierarchy is traversed when the -R\n" @@ -1229,36 +1238,36 @@ msgid "" "\n" msgstr "" -#: src/chcon.c:512 src/chgrp.c:264 src/chown.c:267 +#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267 #, c-format msgid "-R --dereference requires either -H or -L" msgstr "-R --dereference патрабуе альо -H альбо -L" -#: src/chcon.c:518 +#: src/chcon.c:524 #, c-format msgid "-R -h requires -P" msgstr "-R -h патрабуе -P" -#: src/chcon.c:533 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282 -#: src/comm.c:429 src/csplit.c:1371 src/join.c:1149 src/link.c:79 -#: src/mknod.c:148 src/setuidgid.c:139 src/tr.c:1785 +#: 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 #, c-format msgid "missing operand after %s" msgstr "прапушчаны аргумент пасля %s" -#: src/chcon.c:556 src/runcon.c:247 +#: src/chcon.c:562 src/runcon.c:251 #, fuzzy, c-format msgid "invalid context: %s" msgstr "нерэчаісны рэжым: %s" -#: src/chcon.c:563 +#: src/chcon.c:569 #, c-format msgid "conflicting security context specifiers given" msgstr "" -#: src/chcon.c:572 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:433 src/cp.c:493 -#: src/mv.c:96 src/pwd.c:273 src/rm.c:324 src/touch.c:351 +#: 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 #, c-format msgid "failed to get attributes of %s" msgstr "немагчыма атрымаць атрыбуты %s" @@ -1297,12 +1306,6 @@ msgid "" " ownership of a symlink)\n" msgstr "" -#: src/chgrp.c:132 src/chmod.c:387 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/chgrp.c:136 msgid "" " --reference=RFILE use RFILE's group rather than specifying a\n" @@ -1378,8 +1381,15 @@ msgid "" msgstr "" #: src/chmod.c:391 +#, fuzzy 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 msgid " -R, --recursive change files and directories recursively\n" @@ -1554,7 +1564,7 @@ msgstr "" msgid "Roland McGrath" msgstr "" -#: src/chroot.c:97 src/install.c:575 src/setuidgid.c:110 src/setuidgid.c:120 +#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120 #, c-format msgid "invalid group %s" msgstr "нерэчаісная група %s" @@ -1621,8 +1631,8 @@ msgstr "збой stat %s" msgid "failed to set user-ID" msgstr "збой stat %s" -#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:213 src/stdbuf.c:366 -#: src/timeout.c:402 +#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365 +#: src/timeout.c:454 #, fuzzy, c-format msgid "failed to run command %s" msgstr "немагчыма выканаць загад %s" @@ -1727,20 +1737,24 @@ msgstr "заданыя шматлікія файлы вываду" msgid "empty %s not allowed" msgstr "" -#: src/copy.c:168 src/dd.c:1609 src/dd.c:1976 +#: 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 #, c-format -msgid "reading %s" -msgstr "чытаецца %s" +msgid "error reading %s" +msgstr "памылка чытаньня %s" -#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:426 +#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425 #, c-format msgid "cannot lseek %s" msgstr "немагчыма зрабіць lseek %s" -#: src/copy.c:206 src/dd.c:2039 src/dd.c:2102 +#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151 #, c-format -msgid "writing %s" -msgstr "пішацца %s" +msgid "error writing %s" +msgstr "памылка запісу %s" #: src/copy.c:313 #, fuzzy, c-format @@ -1762,7 +1776,7 @@ msgstr "немагчыма адчыніць %s" msgid "clearing permissions for %s" msgstr "усталяваньне правоў для %s" -#: src/copy.c:697 src/copy.c:2470 src/cp.c:331 +#: src/copy.c:697 src/copy.c:2480 src/cp.c:329 #, c-format msgid "failed to preserve ownership for %s" msgstr "памылка пры захаваньні ўладальніку для %s" @@ -1777,14 +1791,14 @@ msgstr "немагчыма адшукаць файл %s" msgid "failed to preserve authorship for %s" msgstr "збой пры захаваньні аўтарства для %s" -#: src/copy.c:804 src/csplit.c:638 src/du.c:901 src/fmt.c:449 src/head.c:847 -#: src/sort.c:4489 src/split.c:1329 src/tail.c:1756 src/wc.c:678 +#: 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 "немагыма адчыніць %s для чытаньня" -#: src/copy.c:810 src/copy.c:972 src/dd.c:1546 src/dd.c:2114 src/dd.c:2252 -#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:141 +#: 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 #, c-format msgid "cannot fstat %s" msgstr "немагчыма выканаць fstat %s" @@ -1804,14 +1818,14 @@ msgstr "" msgid "failed to set the security context of %s to %s" msgstr "немагчыма зьмяніць групу %s на %s\n" -#: src/copy.c:881 src/copy.c:1574 src/copy.c:1777 src/copy.c:1935 src/ln.c:314 -#: src/remove.c:267 src/remove.c:293 src/remove.c:444 src/remove.c:465 +#: 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 #, c-format msgid "cannot remove %s" msgstr "немагчыма выдаліць %s" -#: src/copy.c:886 src/copy.c:1578 src/copy.c:1772 src/copy.c:1940 -#: src/remove.c:418 +#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945 +#: src/remove.c:375 #, c-format msgid "removed %s\n" msgstr "выдален %s\n" @@ -1831,186 +1845,186 @@ msgstr "немагчыма стварыць звычайны файл %s" msgid "failed to clone %s from %s" msgstr "немагчыма адчыніць %s" -#: src/copy.c:1098 src/copy.c:2531 +#: src/copy.c:1098 src/copy.c:2541 #, c-format msgid "preserving times for %s" msgstr "захоўвае час для %s" -#: src/copy.c:1170 src/copy.c:1176 src/head.c:855 src/touch.c:175 -#: src/truncate.c:413 -#, c-format -msgid "closing %s" -msgstr "зачыняецца %s" +#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172 +#: src/truncate.c:417 +#, fuzzy, c-format +msgid "failed to close %s" +msgstr "немагчыма адчыніць %s" -#: src/copy.c:1466 +#: src/copy.c:1471 #, fuzzy, c-format msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? " msgstr "%s: перазапісаць %s, рэжым перазапісу %04lo? " -#: src/copy.c:1473 +#: src/copy.c:1478 #, c-format msgid "%s: overwrite %s? " msgstr "%s: перазапісаць %s? " -#: src/copy.c:1542 +#: src/copy.c:1547 #, c-format msgid " (backup: %s)" msgstr " (запасны: %s)" -#: src/copy.c:1552 +#: src/copy.c:1557 #, c-format msgid "failed to restore the default file creation context" msgstr "" -#: src/copy.c:1584 +#: src/copy.c:1589 #, c-format msgid "cannot create hard link %s to %s" msgstr "немагчыма стварыць жорсткае лучыва %s на %s" -#: src/copy.c:1637 src/copy.c:1689 src/copy.c:2272 src/copy.c:2589 +#: 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:1220 src/truncate.c:365 +#: src/stat.c:1239 src/truncate.c:363 #, c-format msgid "cannot stat %s" msgstr "немагчыма зрабіць stat %s" -#: src/copy.c:1645 +#: src/copy.c:1650 #, c-format msgid "omitting directory %s" msgstr "мінаецца тэчка %s" -#: src/copy.c:1659 +#: src/copy.c:1664 #, c-format msgid "warning: source file %s specified more than once" msgstr "увага: зыходны файл %s зададзены больш за адзін раз" -#: src/copy.c:1707 src/ln.c:246 +#: src/copy.c:1712 src/ln.c:246 #, c-format msgid "%s and %s are the same file" msgstr "%s і %s адзін і той жа ж файл" -#: src/copy.c:1806 +#: src/copy.c:1811 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "немагчыма перазапісаць ня тэчку %s тэчкай %s" -#: src/copy.c:1824 src/ln.c:214 +#: src/copy.c:1829 src/ln.c:214 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "толькі што створаны %s з %s ня будзе перазапісаны" -#: src/copy.c:1842 +#: src/copy.c:1847 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "немагчыма перазапісаць тэчку %s ня тэчкай" -#: src/copy.c:1856 +#: src/copy.c:1861 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "немагчыма перамясьціць тэчку ў ня тэчку: %s -> %s" -#: src/copy.c:1886 +#: src/copy.c:1891 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "стварэньне запасной копіі %s зьнішчыць крыніцу; %s не перанесен" -#: src/copy.c:1887 +#: src/copy.c:1892 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "стварэньне запасной копіі %s зьнішчыць крыніцу; %s не скапіяван" -#: src/copy.c:1910 src/ln.c:276 +#: src/copy.c:1915 src/ln.c:276 #, c-format msgid "cannot backup %s" msgstr "немагчыма стварыць запасную копію %s" -#: src/copy.c:1974 +#: src/copy.c:1979 #, fuzzy, c-format msgid "will not copy %s through just-created symlink %s" msgstr "толькі што створаны %s з %s ня будзе перазапісаны" -#: src/copy.c:2051 +#: src/copy.c:2056 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "немагчыма скапіяваць тэчку, %s, саму ў сябе, %s" -#: src/copy.c:2068 +#: src/copy.c:2073 #, c-format msgid "will not create hard link %s to directory %s" msgstr "жорсткае лучыва %s на тэчку %s ня будзе створана" -#: src/copy.c:2118 +#: src/copy.c:2123 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "немагчыма перамясьціць %s ва ўласную падтэчку, %s" -#: src/copy.c:2161 +#: src/copy.c:2166 #, c-format msgid "cannot move %s to %s" msgstr "немагчыма перамясьціць %s у %s" -#: src/copy.c:2173 +#: src/copy.c:2178 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "збой міжпрыладнага перамяшчэньня: %s у %s; немагчыма выдаліць мэту" -#: src/copy.c:2207 src/install.c:905 src/mkdir.c:189 src/mkfifo.c:114 -#: src/mknod.c:167 +#: 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:2241 +#: src/copy.c:2246 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "немагчыма скапіяваць цыклічнае знакавае лучыва %s" -#: src/copy.c:2350 +#: src/copy.c:2355 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "%s: можа стварыць адноснае знакавае лучыва толькі ў бягучае тэчцы" -#: src/copy.c:2357 +#: src/copy.c:2362 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "немагчыма стварыць знакавае лучыва %s на %s" -#: src/copy.c:2406 src/mkfifo.c:133 +#: src/copy.c:2416 src/mkfifo.c:132 #, c-format msgid "cannot create fifo %s" msgstr "немагчыма стварыць fifo %s" -#: src/copy.c:2415 +#: src/copy.c:2425 #, c-format msgid "cannot create special file %s" msgstr "немагчыма стварыць асаблівы файл %s" -#: src/copy.c:2426 src/ls.c:3191 src/stat.c:902 +#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921 #, c-format msgid "cannot read symbolic link %s" msgstr "немагчыма прачытаць знакавае лучыва %s" -#: src/copy.c:2453 +#: src/copy.c:2463 #, c-format msgid "cannot create symbolic link %s" msgstr "немагчыма стварыць знакавае лучыва %s" -#: src/copy.c:2485 +#: src/copy.c:2495 #, c-format msgid "%s has unknown file type" msgstr "%s мае невядомы від файлу" -#: src/copy.c:2629 src/ln.c:358 +#: src/copy.c:2644 src/ln.c:358 #, c-format msgid "cannot un-backup %s" msgstr "немагчыма вастанавіць %s з запасное копіі" -#: src/copy.c:2633 +#: src/copy.c:2648 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (вастанаўленьне)\n" -#: src/cp.c:156 src/mv.c:284 +#: src/cp.c:156 src/mv.c:286 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -2022,25 +2036,13 @@ msgstr "" " ці: %s [ВЫБАР]... --target-directory=ТЭЧКА АДКУЛЬ...\n" #: src/cp.c:162 -msgid "" -"Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" -"\n" +#, fuzzy +msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" msgstr "" "Капуе КРЫНІЦу ў ПРЫЗНАЧЭНЬНЕ; ці шматлікія КРЫНІЦ(ы) у ТЭЧКу.\n" "\n" -#: src/cp.c:166 src/csplit.c:1458 src/cut.c:197 src/df.c:852 src/du.c:268 -#: src/expand.c:112 src/fmt.c:275 src/fold.c:75 src/head.c:115 -#: src/install.c:612 src/kill.c:86 src/ln.c:392 src/ls.c:4726 src/mkdir.c:61 -#: src/mkfifo.c:56 src/mknod.c:58 src/mv.c:294 src/nl.c:191 src/paste.c:445 -#: src/pr.c:2777 src/ptx.c:1825 src/shred.c:153 src/shuf.c:58 src/sort.c:399 -#: src/split.c:211 src/stdbuf.c:95 src/tac.c:142 src/tail.c:268 -#: src/touch.c:226 src/truncate.c:107 src/unexpand.c:122 src/uniq.c:145 -msgid "" -"Mandatory arguments to long options are mandatory for short options too.\n" -msgstr "Довады, абавязковыя для доўгіх выбараў, абавязковыя й для кароткіх.\n" - -#: src/cp.c:169 +#: src/cp.c:168 #, fuzzy msgid "" " -a, --archive same as -dR --preserve=all\n" @@ -2064,13 +2066,14 @@ msgstr "" " -d тое ж, што й --no-dereference --" "preserve=link\n" -#: src/cp.c:178 +#: src/cp.c:177 #, fuzzy msgid "" " -f, --force if an existing destination file cannot be\n" -" opened, remove it and try again (redundant " -"if\n" -" the -n option is used)\n" +" opened, remove it and try again (this " +"option\n" +" is ignored when the -n option is also " +"used)\n" " -i, --interactive prompt before overwrite (overrides a previous " "-n\n" " option)\n" @@ -2084,21 +2087,13 @@ msgstr "" " -i, --interactive паведаміць перад перазапісам\n" " -H ісьці за знакавымі лучывамі ў загадным радку\n" -#: src/cp.c:188 -#, fuzzy +#: src/cp.c:186 msgid "" " -l, --link hard link files instead of copying\n" " -L, --dereference always follow symbolic links in SOURCE\n" msgstr "" -" --no-dereference ніколі ня следаваць за знакавымі лучывамі\n" -" -f, --force калі існуючы файл прызначэньня ня можа " -"быць\n" -" адчынены, выдаліць яго й паспрабаваць " -"нанава\n" -" -i, --interactive паведаміць перад перазапісам\n" -" -H ісьці за знакавымі лучывамі ў загадным радку\n" -#: src/cp.c:192 +#: src/cp.c:190 #, fuzzy msgid "" " -n, --no-clobber do not overwrite an existing file (overrides\n" @@ -2113,7 +2108,7 @@ msgstr "" " -i, --interactive паведаміць перад перазапісам\n" " -H ісьці за знакавымі лучывамі ў загадным радку\n" -#: src/cp.c:197 +#: src/cp.c:195 #, fuzzy msgid "" " -p same as --preserve=mode,ownership,timestamps\n" @@ -2131,7 +2126,7 @@ msgstr "" " mode,ownership,timestamps), калі магчыма,\n" " дадатковыя атрыбуты: links, all\n" -#: src/cp.c:205 +#: src/cp.c:203 #, fuzzy msgid "" " --no-preserve=ATTR_LIST don't preserve the specified attributes\n" @@ -2142,7 +2137,7 @@ msgstr "" " --parents дадаць зыходны шлях да ТЭЧКі\n" " -P як і `--no-dereference'\n" -#: src/cp.c:209 +#: src/cp.c:207 #, fuzzy msgid "" " -R, -r, --recursive copy directories recursively\n" @@ -2156,7 +2151,7 @@ msgstr "" " перад тым як адчыніць яго (у разрэз з --" "force)\n" -#: src/cp.c:215 +#: src/cp.c:213 #, fuzzy msgid "" " --sparse=WHEN control creation of sparse files. See below\n" @@ -2171,7 +2166,7 @@ msgstr "" "доваду\n" " КРЫНІЦы\n" -#: src/cp.c:220 +#: src/cp.c:218 #, fuzzy msgid "" " -s, --symbolic-link make symbolic links instead of copying\n" @@ -2184,7 +2179,7 @@ msgstr "" " -S, --suffix=КАНЧАТАК перазапісвае звычайны канчатак запасу\n" " --target-directory=ТЭЧКА перамяшчае ўсе довады КРЫНІЦы ў ТЭЧКу\n" -#: src/cp.c:226 +#: src/cp.c:224 msgid "" " -u, --update copy only when the SOURCE file is newer\n" " than the destination file or when the\n" @@ -2199,7 +2194,7 @@ msgstr "" " -v, --verbose пведамляе што ўжо зроблена\n" " -x, --one-file-system не пакідаць межы гэтае файлавае сыстэмы\n" -#: src/cp.c:235 +#: src/cp.c:233 #, fuzzy msgid "" "\n" @@ -2226,7 +2221,7 @@ msgstr "" "нулявых байтаў. Выкарыстоўвайце--sparse=never для забароны стварэньня\n" "\"sparse\" файлаў.\n" -#: src/cp.c:247 src/install.c:649 src/ln.c:421 src/mv.c:321 +#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322 #, fuzzy msgid "" "\n" @@ -2242,7 +2237,7 @@ msgstr "" "пераменную асяродзьдзя VERSION_CONTROL. Магчымая значэньні:\n" "\n" -#: src/cp.c:254 src/install.c:656 src/mv.c:328 +#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329 msgid "" " none, off never make backups (even if --backup is given)\n" " numbered, t make numbered backups\n" @@ -2254,7 +2249,7 @@ msgstr "" " existing, nil нумараваць, калі йснуе нумараваны, інакш не нумараваць\n" " simple, never заўсёды ствараць ненумараваныя\n" -#: src/cp.c:260 +#: src/cp.c:258 msgid "" "\n" "As a special case, cp makes a backup of SOURCE when the force and backup\n" @@ -2265,90 +2260,90 @@ msgstr "" " Загад cp запасіць КРЫНІЦы калі зададзены выбары -f і -b, і калі\n" "КРЫНІЦА й ПРЫЗНАЧЭНЬНЕ адна й тая ж назва існуючага звычанага файлу.\n" -#: src/cp.c:319 +#: src/cp.c:317 #, c-format msgid "failed to preserve times for %s" msgstr "збой пры захаваньні часу для %s" -#: src/cp.c:350 +#: src/cp.c:348 #, c-format msgid "failed to preserve permissions for %s" msgstr "збой пры захаваньні правоў для %s" -#: src/cp.c:477 +#: src/cp.c:475 #, c-format msgid "cannot make directory %s" msgstr "немагчыма стварыць тэчку %s" -#: src/cp.c:526 src/cp.c:545 +#: src/cp.c:524 src/cp.c:543 #, c-format msgid "%s exists but is not a directory" msgstr "%s існуе, але гэта ня тэчка" -#: src/cp.c:572 src/cp.c:1068 src/install.c:401 src/install.c:844 src/ln.c:123 -#: src/ln.c:181 src/ln.c:202 src/ln.c:516 src/mv.c:152 src/mv.c:399 -#, c-format -msgid "accessing %s" -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 +#, fuzzy, c-format +msgid "failed to access %s" +msgstr "немагчыма адчыніць %s" -#: src/cp.c:592 src/install.c:914 src/ln.c:546 src/mv.c:432 src/shred.c:1182 -#: src/touch.c:433 src/truncate.c:356 +#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181 +#: src/touch.c:429 src/truncate.c:354 #, c-format msgid "missing file operand" msgstr "прапушчаны файлавы довад" -#: src/cp.c:594 src/install.c:916 src/ln.c:560 src/mv.c:434 +#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436 #, c-format msgid "missing destination file operand after %s" msgstr "прапушчаны файл прызначэньня пасьля %s" -#: src/cp.c:603 src/install.c:925 src/mv.c:443 +#: src/cp.c:601 src/install.c:926 src/mv.c:445 #, fuzzy, c-format msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)" msgstr "Немагчыма ўжыць разам --target-directory і --no-target-directory" -#: src/cp.c:619 src/cp.c:1070 src/install.c:403 src/install.c:846 -#: src/install.c:938 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:401 -#: src/mv.c:457 +#: 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 #, c-format msgid "target %s is not a directory" msgstr "згаданая мэта %s не з'яўляецца тэчкай" -#: src/cp.c:730 +#: src/cp.c:728 #, c-format msgid "with --parents, the destination must be a directory" msgstr "калі зададзены --parents, прызначэньне мусіць быць дырэкторыяй" -#: src/cp.c:1063 src/install.c:839 src/ln.c:511 src/mv.c:394 +#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395 #, c-format msgid "multiple target directories specified" msgstr "зададзены некалькі дырэкторыяў прызначэньня" -#: src/cp.c:1108 +#: src/cp.c:1110 #, c-format msgid "cannot make both hard and symbolic links" msgstr "немагчыма стварыць ні жорсткае, ні знакавае лучыва" -#: src/cp.c:1115 src/mv.c:464 +#: src/cp.c:1117 src/mv.c:466 #, fuzzy, c-format msgid "options --backup and --no-clobber are mutually exclusive" msgstr "выбары, што вызначаюць дату для друку ўзаема выключныя" -#: src/cp.c:1121 +#: src/cp.c:1123 #, c-format msgid "--reflink can be used only with --sparse=auto" msgstr "" -#: src/cp.c:1129 src/install.c:899 src/ln.c:582 src/mv.c:472 +#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474 msgid "backup type" msgstr "від запасной копіі" -#: src/cp.c:1154 +#: src/cp.c:1156 #, c-format msgid "cannot preserve security context without an SELinux-enabled kernel" msgstr "" -#: src/cp.c:1160 +#: src/cp.c:1162 #, c-format msgid "cannot preserve extended attributes, cp is built without xattr support" msgstr "" @@ -2358,138 +2353,137 @@ msgstr "" msgid "Stuart Kemp" msgstr "" -#: src/csplit.c:529 +#: src/csplit.c:531 #, c-format msgid "input disappeared" msgstr "увод недаступны" -#: src/csplit.c:658 src/csplit.c:669 +#: src/csplit.c:660 src/csplit.c:671 #, c-format msgid "%s: line number out of range" msgstr "%s: нумар радку за дапушчальнымі межамі" -#: src/csplit.c:698 +#: src/csplit.c:700 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: нумар радка па-за дазволенымі межамі" -#: src/csplit.c:701 src/csplit.c:750 +#: src/csplit.c:703 src/csplit.c:752 #, c-format msgid " on repetition %s\n" msgstr " на паўтарэньні %s\n" -#: src/csplit.c:744 +#: src/csplit.c:746 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: супадзеньне ня знойдзена" -#: src/csplit.c:808 src/csplit.c:848 src/nl.c:359 src/tac.c:274 +#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273 #, c-format msgid "error in regular expression search" msgstr "памылка ў пошуку звычайнага выразу" -#: src/csplit.c:981 +#: src/csplit.c:983 #, c-format msgid "write error for %s" msgstr "памылка запісу для %s" -#: src/csplit.c:1057 +#: src/csplit.c:1059 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: пасьля падзяляльніка чакаецца цэлы лік" -#: src/csplit.c:1073 +#: src/csplit.c:1075 #, fuzzy, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: `}' патрабуецца для падліку паўтораў" -#: src/csplit.c:1083 +#: src/csplit.c:1085 #, fuzzy, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: цэлы патрабуецца паміж `{' і `}'" -#: src/csplit.c:1110 +#: src/csplit.c:1112 #, fuzzy, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: прапушчаны падзяляльнік зачыненьня `%c'" -#: src/csplit.c:1127 +#: src/csplit.c:1129 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: нерэчаісны сталы выраз: %s" -#: src/csplit.c:1160 +#: src/csplit.c:1162 #, c-format msgid "%s: invalid pattern" msgstr "%s: нерэчаісны прыклад" -#: src/csplit.c:1163 +#: src/csplit.c:1165 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: нумар радку павінен быць большым за нуль." -#: src/csplit.c:1169 +#: src/csplit.c:1171 #, c-format msgid "line number %s is smaller than preceding line number, %s" msgstr "нумар радка %s меншы за нумар папярэдняга радка, %s" -#: src/csplit.c:1175 +#: src/csplit.c:1177 #, c-format msgid "warning: line number %s is the same as preceding line number" msgstr "Увага! Нумар радка %s супадае з нумарам папярэдняга радка." -#: src/csplit.c:1253 +#: src/csplit.c:1255 #, c-format msgid "missing conversion specifier in suffix" msgstr "прапушчан вызначальнік пераўтварэньня ва ўстаўцы" -#: src/csplit.c:1259 +#: src/csplit.c:1261 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "нерэчаісны вызначальнік пераўтварэньня ва ўстаўцы: %c" -#: src/csplit.c:1262 +#: src/csplit.c:1264 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "нерэчаісны вызначальнік пераўтварэньня ва ўстаўцы: \\%.3o" -#: src/csplit.c:1267 +#: src/csplit.c:1269 #, fuzzy, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "%s: нерэчаісная спэцыфікацыя поля \"%s\"" -#: src/csplit.c:1284 +#: src/csplit.c:1286 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "за шмат ва ўстаўцы %% вызначальнікаў пераўтварэньня" -#: src/csplit.c:1298 +#: src/csplit.c:1300 #, c-format msgid "missing %% conversion specification in suffix" msgstr "ва ўстаўцы прапушчан %% вызначальнік пераўтварэньня" -#: src/csplit.c:1345 +#: src/csplit.c:1347 #, c-format msgid "%s: invalid number" msgstr "%s: нерэчаісны нумар" -#: src/csplit.c:1449 +#: src/csplit.c:1451 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Выкарыстаньне: %s [ВЫБАР]... ФАЙЛ УЗОР..\n" -#: src/csplit.c:1453 +#: src/csplit.c:1455 #, 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" -"\n" msgstr "" "Выводзіць кавалкі ФАЙЛа падзеленыя па ЎЗОРу ў файлы `xx01', `xx02', ...,\n" "таксама выводзіць на стандартны вывад колькасьць байтаў у кожным кавалку.\n" "\n" -#: src/csplit.c:1461 +#: src/csplit.c:1462 #, fuzzy, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2500,7 +2494,7 @@ msgstr "" " -f, --prefix=ПРЫСТАЎКА Выкарыстоўваць ПРЫСТАЎКу замест `xx'\n" " -k, --keep-files Не выдаляць файлы вываду пры памылках\n" -#: src/csplit.c:1466 +#: src/csplit.c:1467 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" @@ -2512,7 +2506,7 @@ msgstr "" " -s, --quiet, --silent Не друкаваць падлікі памераў файлаў вываду.\n" " -z, --elide-empty-files Выдаляць парожнія файлы вываду.\n" -#: src/csplit.c:1473 +#: src/csplit.c:1474 msgid "" "\n" "Read standard input if FILE is -. Each PATTERN may be:\n" @@ -2520,7 +2514,7 @@ msgstr "" "\n" "Чытае стандартны ўвод, калі замест ФАЙЛа -. Кожны ЎЗОР можа быць:\n" -#: src/csplit.c:1477 +#: src/csplit.c:1478 msgid "" "\n" " INTEGER copy up to but not including specified line number\n" @@ -2537,7 +2531,7 @@ msgstr "" msgid "David M. Ihnat" msgstr "" -#: src/cut.c:64 +#: src/cut.c:64 src/cut.c:372 msgid "fields and positions are numbered from 1" msgstr "" @@ -2547,14 +2541,13 @@ msgid "Usage: %s OPTION... [FILE]...\n" msgstr "Выкарыстаньне: %s [ПАРАМЭТАР]... [ФАЙЛ]...\n" #: src/cut.c:193 -msgid "" -"Print selected parts of lines from each FILE to standard output.\n" -"\n" +#, fuzzy +msgid "Print selected parts of lines from each FILE to standard output.\n" msgstr "" " Друкуе абраныя часкі радкоў з кожнага ФАЙЛу ў стандартны вывад.\n" "\n" -#: src/cut.c:200 +#: src/cut.c:199 #, fuzzy msgid "" " -b, --bytes=LIST select only these bytes\n" @@ -2567,7 +2560,7 @@ msgstr "" " Выкарыстоўваць адмысловы падзяляльнік для\n" " размежаваньня палёў, замест TAB.\n" -#: src/cut.c:205 +#: src/cut.c:204 #, fuzzy msgid "" " -f, --fields=LIST select only these fields; also print any line\n" @@ -2580,13 +2573,13 @@ msgstr "" " выняткам тых выпадкаў, калі заданы выбар -s.\n" " -n (незаўважаецца)\n" -#: src/cut.c:211 +#: src/cut.c:210 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" msgstr "" -#: src/cut.c:215 +#: src/cut.c:214 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2597,7 +2590,7 @@ msgstr "" " Выкарыстоўвае радок як падзяляльнік вываду;\n" " дапомна выкарыстоўваецца падзяляльнік уводу.\n" -#: src/cut.c:222 +#: src/cut.c:221 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2605,7 +2598,7 @@ msgid "" "in the same order that it is read, and is written exactly once.\n" msgstr "" -#: src/cut.c:228 +#: src/cut.c:227 msgid "" "Each range is one of:\n" "\n" @@ -2617,47 +2610,49 @@ msgid "" "With no FILE, or when FILE is -, read standard input.\n" msgstr "" -#: src/cut.c:368 src/cut.c:489 -msgid "invalid byte or field list" +#: src/cut.c:367 src/cut.c:493 +#, fuzzy +msgid "invalid byte, character or field list" msgstr "нерэчаісны байт ці сьпіс поля" -#: src/cut.c:385 +#: src/cut.c:387 #, fuzzy msgid "invalid range with no endpoint: -" msgstr "незразумелая шырыня радка: %s" -#: src/cut.c:399 +#: src/cut.c:403 #, fuzzy msgid "invalid decreasing range" msgstr "Недзеяздольны прамежак старонак %s" -#: src/cut.c:478 +#: src/cut.c:482 #, c-format msgid "byte offset %s is too large" msgstr "байт зруху %s занадта вялікі" -#: src/cut.c:481 +#: src/cut.c:485 #, c-format msgid "field number %s is too large" msgstr "нумар поля %s занадта вялікі" -#: src/cut.c:789 src/cut.c:797 +#: src/cut.c:795 src/cut.c:803 msgid "only one type of list may be specified" msgstr "толькі адзін від сьпісу можа быць зададзены" -#: src/cut.c:806 +#: src/cut.c:812 src/numfmt.c:1408 +#, c-format msgid "the delimiter must be a single character" msgstr "падзяляльнік паінен быць адным знакам" -#: src/cut.c:841 +#: src/cut.c:847 msgid "you must specify a list of bytes, characters, or fields" msgstr "вы павінны пазначыць сьпіс байтаў, знакаў ці палёў" -#: src/cut.c:844 +#: src/cut.c:850 msgid "an input delimiter may be specified only when operating on fields" msgstr "падзяляльнік уводу можа быць зададзены толькі для дзеяньняў над палямі" -#: src/cut.c:848 +#: src/cut.c:854 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2665,11 +2660,11 @@ msgstr "" "падаўленьне непадзеленых радкоў мае сэнс толькі для\n" "\tдзеяньняў над палямі" -#: src/cut.c:864 +#: src/cut.c:870 msgid "missing list of fields" msgstr "прапушчан сьпіс палёў" -#: src/cut.c:866 +#: src/cut.c:872 msgid "missing list of positions" msgstr "прапушчан сьпіс становішчаў" @@ -2683,9 +2678,11 @@ msgstr "" " ці: %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 "" + +#: src/date.c:134 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" " -I[TIMESPEC], --iso-8601[=TIMESPEC] output date/time in ISO 8601 format.\n" @@ -2694,14 +2691,14 @@ msgid "" " and time to the indicated precision.\n" msgstr "" -#: src/date.c:138 +#: src/date.c:142 msgid "" " -r, --reference=FILE display the last modification time of FILE\n" " -R, --rfc-2822 output date and time in RFC 2822 format.\n" " Example: Mon, 07 Aug 2006 12:34:56 -0600\n" msgstr "" -#: src/date.c:143 +#: src/date.c:147 #, fuzzy msgid "" " --rfc-3339=TIMESPEC output date and time in RFC 3339 format.\n" @@ -2720,7 +2717,7 @@ msgstr "" " -s, --set=РАДОК Усталёвае час, які апісаны радком.\n" " -u, --utc, --universal Друкуе Ўнівэрсальны скаардынаваны час.\n" -#: src/date.c:154 +#: src/date.c:158 msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" @@ -2729,7 +2726,7 @@ msgid "" " %a locale's abbreviated weekday name (e.g., Sun)\n" msgstr "" -#: src/date.c:161 +#: src/date.c:165 #, fuzzy msgid "" " %A locale's full weekday name (e.g., Sunday)\n" @@ -2743,7 +2740,7 @@ msgstr "" "Сьнежань).\n" " %c Мясцовыя дата й час (Чцв Ліс 18 06:06:06 MSK 1982).\n" -#: src/date.c:167 +#: src/date.c:171 #, fuzzy msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" @@ -2756,7 +2753,7 @@ msgstr "" " %D Дата (мм/дздз/гг).\n" " %e Дзень месяца, бяз 0 ( 1..31).\n" -#: src/date.c:173 +#: src/date.c:177 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -2766,7 +2763,7 @@ msgstr "" " %g дзвюх лічбавы год нумара тыдня ў ISO (гл. %G).\n" " %G год нумара тыдня ў ISO (гл. %V); звычайна ідзе разам з %V.\n" -#: src/date.c:178 +#: src/date.c:182 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2778,7 +2775,7 @@ msgstr "" " %I гадзіна (01..12)\n" " %j дзень году (001..366)\n" -#: src/date.c:184 +#: src/date.c:188 #, fuzzy msgid "" " %k hour, space padded ( 0..23); same as %_H\n" @@ -2791,7 +2788,7 @@ msgstr "" " %m месяц (01..12)\n" " %M хвіліна (00..59)\n" -#: src/date.c:190 +#: src/date.c:194 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2809,7 +2806,7 @@ msgstr "" " %R 24-гадзінны час; як і %H:%M\n" " %s колькасьць сэкундаў з 1970-01-01 00:00:00 UTC\n" -#: src/date.c:199 +#: src/date.c:203 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2817,7 +2814,7 @@ msgid "" " %u day of week (1..7); 1 is Monday\n" msgstr "" -#: src/date.c:205 +#: src/date.c:209 #, fuzzy msgid "" " %U week number of year, with Sunday as first day of week (00..53)\n" @@ -2830,7 +2827,7 @@ msgstr "" " %w Дзень тыдня (0..6); дзе 0 - гэта нядзеля.\n" " %W Нумар тыдня года, дзе першы дзень тыдня - панядзелак (00..53).\n" -#: src/date.c:211 +#: src/date.c:215 #, fuzzy msgid "" " %x locale's date representation (e.g., 12/31/99)\n" @@ -2843,7 +2840,7 @@ msgstr "" " %y дзьве апошнія лічбы году (00..99)\n" " %Y год (1970...)\n" -#: src/date.c:217 +#: src/date.c:221 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -2855,7 +2852,7 @@ msgid "" "By default, date pads numeric fields with zeroes.\n" msgstr "" -#: src/date.c:226 +#: src/date.c:230 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -2866,7 +2863,7 @@ msgid "" " # use opposite case if possible\n" msgstr "" -#: src/date.c:235 +#: src/date.c:239 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -2875,7 +2872,7 @@ msgid "" "O to use the locale's alternate numeric symbols if available.\n" msgstr "" -#: src/date.c:242 +#: src/date.c:246 msgid "" "\n" "Examples:\n" @@ -2889,35 +2886,35 @@ msgid "" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:275 src/dd.c:2193 src/head.c:838 src/md5sum.c:477 -#: src/md5sum.c:798 src/od.c:863 src/od.c:1914 src/pr.c:1176 src/pr.c:1372 -#: src/pr.c:1494 src/stty.c:842 src/tac.c:563 src/tail.c:343 src/tee.c:126 +#: 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 #, c-format msgid "standard input" msgstr "стандартны ўвод" -#: src/date.c:303 src/date.c:523 +#: src/date.c:307 src/date.c:527 #, c-format msgid "invalid date %s" msgstr "нерэчаісная дата %s" -#: src/date.c:414 src/date.c:448 +#: src/date.c:418 src/date.c:452 #, c-format msgid "multiple output formats specified" msgstr "зададзены некалькі фарматаў вываду" -#: src/date.c:426 +#: src/date.c:430 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "выбары, што вызначаюць дату для друку ўзаема выключныя" -#: src/date.c:433 +#: src/date.c:437 #, c-format msgid "the options to print and set the time may not be used together" msgstr "выбары для ўсталяваньня й друку часу нельга ўжываць разам" -#: src/date.c:454 +#: src/date.c:458 #, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -2925,23 +2922,23 @@ msgid "" "argument must be a format string beginning with '+'" msgstr "" -#: src/date.c:531 +#: src/date.c:535 #, c-format msgid "cannot set date" msgstr "немагчыма ўсталяваць дату" -#: src/date.c:554 src/du.c:360 +#: src/date.c:558 src/du.c:371 #, c-format msgid "time %s is out of range" msgstr "час %s за дазволенымі межамі" #. This is a proper name. See the gettext manual, section Names. -#: src/dd.c:44 src/factor.c:43 src/rm.c:41 src/tail.c:69 src/touch.c:41 +#: 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 "" -#: src/dd.c:517 +#: src/dd.c:521 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -2950,7 +2947,7 @@ msgstr "" "Выкарыстаньне: %s [АПЭРАНД]...\n" " або: %s ПАРАМЭТАР\n" -#: src/dd.c:522 +#: src/dd.c:526 #, fuzzy msgid "" "Copy a file, converting and formatting according to the operands.\n" @@ -2971,7 +2968,7 @@ msgstr "" " count=БЛЁКАЎ Капіяваць толькі заданую колькасьць блёкаў уводу.\n" " ibs=БАЙТАЎ Чатаць заданую колькасьць байтаў за раз.\n" -#: src/dd.c:531 +#: src/dd.c:535 #, fuzzy msgid "" " if=FILE read from FILE instead of stdin\n" @@ -2981,7 +2978,8 @@ msgid "" " oflag=FLAGS write as per the comma separated symbol list\n" " seek=N skip N obs-sized blocks at start of output\n" " skip=N skip N ibs-sized blocks at start of input\n" -" status=noxfer suppress transfer statistics\n" +" status=WHICH WHICH info to suppress outputting to stderr;\n" +" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" msgstr "" " if=ФАЙЛ Чытаць з файлу замест стандартнага ўводу.\n" " obs=БАЙТАЎ Пісаць заданую колькасьць байтаў за раз.\n" @@ -2991,11 +2989,11 @@ msgstr "" " skip=БЛЁКАЎ Абмінуць заданую колькасьць блёкаў ад пачатку ў файле " "ўводу.\n" -#: src/dd.c:541 +#: src/dd.c:546 #, fuzzy msgid "" "\n" -"BLOCKS and BYTES may be followed by the following multiplicative suffixes:\n" +"N and BYTES may be followed by the following multiplicative suffixes:\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, and so on for T, P, E, Z, Y.\n" "\n" @@ -3009,7 +3007,7 @@ msgstr "" "Кожнае ключавое слова можа быць:\n" "\n" -#: src/dd.c:550 +#: src/dd.c:555 #, fuzzy msgid "" " ascii from EBCDIC to ASCII\n" @@ -3036,7 +3034,7 @@ msgstr "" " выкарыстоўваецца разам з block ці unblock, дадаваць прагалы,\n" " замест нулёў.\n" -#: src/dd.c:563 +#: src/dd.c:568 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3052,7 +3050,7 @@ msgstr "" " fdatasync physically write output file data before finishing\n" " fsync likewise, but also write metadata\n" -#: src/dd.c:571 +#: src/dd.c:576 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3061,77 +3059,77 @@ msgid "" "suggested)\n" msgstr "" -#: src/dd.c:578 +#: src/dd.c:583 #, fuzzy msgid " cio use concurrent I/O for data\n" msgstr " text выкарыстоўваць тэкставы ўвод/вывад для даных\n" -#: src/dd.c:580 +#: src/dd.c:585 msgid " direct use direct I/O for data\n" msgstr "" -#: src/dd.c:582 +#: src/dd.c:587 #, fuzzy msgid " directory fail unless a directory\n" msgstr "%s: заданая тэчка мэты не зьяўляецца тэчкай" -#: src/dd.c:584 +#: src/dd.c:589 msgid " dsync use synchronized I/O for data\n" msgstr "" -#: src/dd.c:586 +#: src/dd.c:591 msgid " sync likewise, but also for metadata\n" msgstr "" -#: src/dd.c:587 +#: src/dd.c:592 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr "" -#: src/dd.c:590 +#: src/dd.c:595 msgid " nonblock use non-blocking I/O\n" msgstr "" -#: src/dd.c:592 +#: src/dd.c:597 msgid " noatime do not update access time\n" msgstr "" -#: src/dd.c:595 +#: src/dd.c:600 msgid " nocache discard cached data\n" msgstr "" -#: src/dd.c:598 +#: src/dd.c:603 msgid " noctty do not assign controlling terminal from file\n" msgstr "" -#: src/dd.c:601 +#: src/dd.c:606 msgid " nofollow do not follow symlinks\n" msgstr "" -#: src/dd.c:603 +#: src/dd.c:608 msgid " nolinks fail if multiply-linked\n" msgstr "" -#: src/dd.c:605 +#: src/dd.c:610 msgid " binary use binary I/O for data\n" msgstr "" -#: src/dd.c:607 +#: src/dd.c:612 msgid " text use text I/O for data\n" msgstr " text выкарыстоўваць тэкставы ўвод/вывад для даных\n" -#: src/dd.c:609 +#: src/dd.c:614 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:612 +#: src/dd.c:617 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:615 +#: src/dd.c:620 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:620 +#: src/dd.c:625 #, c-format msgid "" "\n" @@ -3148,7 +3146,7 @@ msgid "" "\n" msgstr "" -#: src/dd.c:676 +#: src/dd.c:683 #, c-format msgid "" "%<PRIuMAX>+%<PRIuMAX> records in\n" @@ -3157,7 +3155,7 @@ msgstr "" "%<PRIuMAX>+%<PRIuMAX> запісаў уайшло\n" "%<PRIuMAX>+%<PRIuMAX> запісаў выйшла\n" -#: src/dd.c:682 +#: src/dd.c:689 #, c-format msgid "%<PRIuMAX> truncated record\n" msgid_plural "%<PRIuMAX> truncated records\n" @@ -3165,7 +3163,7 @@ msgstr[0] "%<PRIuMAX> абрэзаны запіс\n" msgstr[1] "%<PRIuMAX> абрэзаных запісы\n" msgstr[2] "%<PRIuMAX> абрэзаных запісаў\n" -#: src/dd.c:694 +#: src/dd.c:701 #, c-format msgid "%<PRIuMAX> byte (%s) copied" msgid_plural "%<PRIuMAX> bytes (%s) copied" @@ -3173,7 +3171,7 @@ msgstr[0] "%<PRIuMAX> байт (%s) скапіяваны" msgstr[1] "%<PRIuMAX> байты (%s) скапіявана" msgstr[2] "%<PRIuMAX> байтаў (%s) скапіявана" -#: src/dd.c:712 +#: src/dd.c:720 msgid "Infinity B" msgstr "Бясконцасьць" @@ -3187,245 +3185,266 @@ 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:725 +#: src/dd.c:733 #, fuzzy, c-format msgid ", %g s, %s/s\n" msgstr ", %g сэкунда , %s/s\n" -#: src/dd.c:804 +#: src/dd.c:812 #, c-format msgid "closing input file %s" msgstr "зачыняецца файл уводу %s" -#: src/dd.c:811 +#: src/dd.c:819 #, c-format msgid "closing output file %s" msgstr "закрываецца файл вываду %s" -#: src/dd.c:1014 +#: src/dd.c:1022 #, fuzzy, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "збой chdir у %s" -#: src/dd.c:1085 src/dd.c:1934 +#: src/dd.c:1093 src/dd.c:1942 #, c-format msgid "writing to %s" msgstr "запіс у %s" -#: src/dd.c:1199 src/dd.c:1253 +#: src/dd.c:1207 src/dd.c:1261 #, c-format msgid "unrecognized operand %s" msgstr "нераспазнаны апэранд %s" -#: src/dd.c:1210 +#: src/dd.c:1218 #, fuzzy msgid "invalid conversion" msgstr "нерэчаіснае ператварэньне: %s" -#: src/dd.c:1213 src/dd.c:1289 +#: src/dd.c:1221 src/dd.c:1297 #, fuzzy msgid "invalid input flag" msgstr "нерэчаісны сьцяг уводу: %s" -#: src/dd.c:1216 src/dd.c:1283 src/dd.c:1295 +#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303 #, fuzzy msgid "invalid output flag" msgstr "нерэчаісны сьцяг вываду: %s" -#: src/dd.c:1219 +#: src/dd.c:1227 #, fuzzy msgid "invalid status flag" msgstr "нерэчаісны сьцяг статусу: %s" -#: src/dd.c:1258 src/truncate.c:312 +#: src/dd.c:1266 src/truncate.c:310 #, c-format msgid "invalid number %s" msgstr "нерэчаісны нумар %s" -#: src/dd.c:1340 +#: src/dd.c:1348 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "" -#: src/dd.c:1342 +#: src/dd.c:1350 #, fuzzy, c-format msgid "cannot combine block and unblock" msgstr "немагчыма абмінуць разам карыстальніка й групу" -#: src/dd.c:1344 +#: src/dd.c:1352 #, fuzzy, c-format msgid "cannot combine lcase and ucase" msgstr "немагчыма параўнаць назвы файлаў %s і %s" -#: src/dd.c:1346 +#: src/dd.c:1354 #, c-format msgid "cannot combine excl and nocreat" msgstr "" -#: src/dd.c:1349 +#: src/dd.c:1357 #, fuzzy, c-format msgid "cannot combine direct and nocache" msgstr "немагчыма параўнаць назвы файлаў %s і %s" -#: src/dd.c:1506 +#: src/dd.c:1514 #, 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:1593 +#: src/dd.c:1601 #, fuzzy, c-format msgid "%s: cannot skip" msgstr "%s: немагчыма перасунуць паказальнік" -#: src/dd.c:1595 src/dd.c:1614 src/dd.c:1675 +#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683 #, c-format msgid "%s: cannot seek" msgstr "%s: немагчыма перасунуць паказальнік" -#: src/dd.c:1655 +#: src/dd.c:1663 #, c-format msgid "offset overflow while reading file %s" msgstr "перапаўненьне зруху цягам чытаньня файла %s" -#: src/dd.c:1667 +#: src/dd.c:1675 #, fuzzy, c-format msgid "warning: invalid file offset after failed read" msgstr "увага: зрух файла пашкоджаны пасьля памылкі чытаньня" -#: src/dd.c:1671 +#: src/dd.c:1679 #, c-format msgid "cannot work around kernel bug after all" msgstr "немагчыма абмінуць памылку ядра" -#: src/dd.c:1814 +#: src/dd.c:1822 #, c-format msgid "setting flags for %s" msgstr "выстаўленьне сьцягоў для %s" -#: src/dd.c:1867 +#: src/dd.c:1875 #, c-format msgid "memory exhausted by input buffer of size %zu bytes (%s)" msgstr "" -#: src/dd.c:1881 +#: src/dd.c:1889 #, c-format msgid "memory exhausted by output buffer of size %zu bytes (%s)" msgstr "" -#: src/dd.c:1914 +#: src/dd.c:1922 #, fuzzy, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: немагчыма перамясьціцца да адноснага зруху %s" -#: src/dd.c:2125 src/dd.c:2258 +#: src/dd.c:2133 #, fuzzy, c-format -msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" +msgid "failed to truncate to %<PRIdMAX> bytes in output file %s" msgstr "дасягнуты %s байтаў у файле вываду %s" -#: src/dd.c:2138 +#: src/dd.c:2146 #, c-format msgid "fdatasync failed for %s" msgstr "збой fdatasync для %s" -#: src/dd.c:2148 +#: src/dd.c:2156 #, c-format msgid "fsync failed for %s" msgstr "збой fsync для %s" -#: src/dd.c:2199 src/dd.c:2228 +#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165 #, c-format -msgid "opening %s" -msgstr "адчыняецца %s" +msgid "failed to open %s" +msgstr "немагчыма адчыніць %s" -#: src/dd.c:2237 +#: src/dd.c:2246 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) " "blocks" msgstr "" -#: src/dd.c:2274 src/dd.c:2280 +#: src/dd.c:2267 +#, 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 #, 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:54 src/expr.c:153 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:39 src/sleep.c:35 src/sort.c:66 +#: 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 msgid "Paul Eggert" msgstr "" -#: src/df.c:140 +#: src/df.c:172 msgid "Filesystem" msgstr "Ф-я сыстэма" -#: src/df.c:141 +#: src/df.c:175 msgid "Type" msgstr "Тып" -#: src/df.c:142 +#: src/df.c:178 src/df.c:542 msgid "blocks" msgstr "блёкаў" -#: src/df.c:142 -msgid "Inodes" -msgstr "" - -#: src/df.c:142 -msgid "Size" -msgstr "Памер" - -#: src/df.c:143 +#: src/df.c:181 msgid "Used" msgstr "Ужыта" -#: src/df.c:143 -msgid "IUsed" -msgstr "" - -#: src/df.c:144 +#: src/df.c:184 msgid "Available" msgstr "Вольна" -#: src/df.c:144 -msgid "IFree" +#: src/df.c:187 +msgid "Use%" +msgstr "У-а%" + +#: src/df.c:190 +msgid "Inodes" msgstr "" -#: src/df.c:144 -msgid "Avail" -msgstr "Вольна" +#: src/df.c:193 +msgid "IUsed" +msgstr "" -#: src/df.c:145 -msgid "Use%" -msgstr "У-а%" +#: src/df.c:196 +msgid "IFree" +msgstr "" -#: src/df.c:145 +#: src/df.c:199 msgid "IUse%" msgstr "" -#: src/df.c:145 +#: src/df.c:202 +msgid "Mounted on" +msgstr "Пункт мантаваньня" + +#: src/df.c:383 +#, c-format +msgid "option --output: field '%s' unknown" +msgstr "" + +#: src/df.c:390 +#, fuzzy, c-format +msgid "option --output: field '%s' used more than once" +msgstr "увага: зыходны файл %s зададзены больш за адзін раз" + +#: src/df.c:410 src/df.c:449 +msgid "Size" +msgstr "Памер" + +#: src/df.c:414 src/df.c:451 +msgid "Avail" +msgstr "Вольна" + +#: src/df.c:474 msgid "Capacity" msgstr "Ёміст." -#: src/df.c:146 -msgid "Mounted on" -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 +#, c-format +msgid "%s-%s" +msgstr "" -#: src/df.c:847 +#: src/df.c:1210 #, fuzzy msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" -"\n" msgstr "" " Паказывае зьвесткі пра файлавую сыстэму, на якой знаходзіцца файл, " "альбо,\n" "дапомна, пра ўсе файлавыя сыстэмы.\n" "\n" -#: src/df.c:855 +#: src/df.c:1217 #, fuzzy msgid "" " -a, --all include dummy file systems\n" @@ -3444,7 +3463,7 @@ msgstr "" " -H, --si гл. вышэй, але выкарыстоўваць ступені 1000 замест " "1024\n" -#: src/df.c:865 +#: src/df.c:1227 #, fuzzy msgid "" " -i, --inodes list inode information instead of block usage\n" @@ -3460,9 +3479,12 @@ msgstr "" " --no-sync не выклякаць sync перад атрыманьнем зьвестак " "(дапомна)\n" -#: src/df.c:872 +#: src/df.c:1234 #, fuzzy msgid "" +" --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" +" or print all fields if FIELD_LIST is " +"omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" " -t, --type=TYPE limit listing to file systems of type TYPE\n" @@ -3478,21 +3500,43 @@ msgstr "" " абмежаваць вывад файлавымі сыстэмамі ня гэтага тыпу\n" " -v (незаўважаецца)\n" -#: src/df.c:1027 +#: src/df.c:1248 +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" +msgstr "" + +#: src/df.c:1285 +#, 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 #, c-format msgid "file system type %s both selected and excluded" msgstr "файлавая сыстэма тыпу %s адначасова вылучана й выключана" -#: src/df.c:1075 +#: src/df.c:1500 msgid "Warning: " msgstr "Увага: " -#: src/df.c:1077 src/stat.c:795 +#: src/df.c:1502 src/stat.c:814 #, fuzzy msgid "cannot read table of mounted file systems" msgstr "%s немагчыма прачытаць табліцу прымантаваных файлавых сыстэм" -#: src/df.c:1107 +#: src/df.c:1539 #, c-format msgid "no file systems processed" msgstr "" @@ -3590,7 +3634,7 @@ msgstr "" " %s /usr/bin/sort друкуе \"/usr/bin\".\n" " %s stdio.h друкуе \".\".\n" -#: src/du.c:260 src/sort.c:390 src/wc.c:112 +#: src/du.c:270 src/sort.c:394 src/wc.c:112 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3599,18 +3643,19 @@ msgstr "" "Выкарыстаньне: %s [КЛЮЧ]... [ФАЙЛ]...\n" " ці: %s [КЛЮЧ]... --files0-from=F\n" -#: src/du.c:264 -msgid "" -"Summarize disk usage of each FILE, recursively for directories.\n" -"\n" +#: src/du.c:274 +#, fuzzy +msgid "Summarize disk usage of each FILE, recursively for directories.\n" msgstr "" "Падсумоўвае ўжываньне дыска кожным файлам; дзейнічае\n" "рэкурсіўна для тэчак.\n" "\n" -#: src/du.c:271 +#: src/du.c:280 #, fuzzy msgid "" +" -0, --null end each output line with 0 byte rather than " +"newline\n" " -a, --all write counts for all files, not just directories\n" " --apparent-size print apparent sizes, rather than disk usage; " "although\n" @@ -3631,8 +3676,7 @@ msgstr "" " -c, --total падлічыць агульны вынік\n" " -D, --dereference-args разьвязваць сымбалічныя спасылкі\n" -#: src/du.c:279 -#, fuzzy +#: src/du.c:289 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" @@ -3641,15 +3685,14 @@ msgid "" " -c, --total produce a grand total\n" " -D, --dereference-args dereference only symlinks that are listed on the\n" " command line\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 "" -" -a, --all уключыць файлавыя сыстэмы якія маюць 0 блёкаў\n" -" -B, --block-size=N выкарыстоўваць блёкі памерам N байтаў\n" -" -h, --human-readable друкаваць памеры ў чалавека-чытальным фармаце\n" -" (як напрыклад, 1Кб, 234Мб, 2Гб)\n" -" -H, --si гл. вышэй, але выкарыстоўваць ступені 1000 замест " -"1024\n" -#: src/du.c:288 +#: src/du.c:302 msgid "" " --files0-from=F summarize disk usage of the NUL-terminated file\n" " names specified in file F;\n" @@ -3657,41 +3700,29 @@ msgid "" " -H equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" --si like -h, but use powers of 1000 not 1024\n" msgstr "" -#: src/du.c:297 +#: src/du.c:310 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 "" -#: src/du.c:302 +#: src/du.c:316 msgid "" -" -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " "default)\n" -" -0, --null end each output line with 0 byte rather than " -"newline\n" " -S, --separate-dirs 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:309 -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 "" - -#: src/du.c:318 +#: src/du.c:322 msgid "" +" -t, --threshold=SIZE exclude entries smaller than SIZE if positive,\n" +" or entries greater than SIZE if negative\n" " --time show time of the last modification of any file in " "the\n" " directory, or any of its subdirectories\n" @@ -3702,65 +3733,74 @@ msgid "" " FORMAT is interpreted like 'date'\n" msgstr "" -#: src/du.c:375 +#: src/du.c:333 +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 msgid "Infinity" msgstr "Бясконцасьць" -#: src/du.c:600 +#: src/du.c:507 +#, c-format +msgid "mount point %s already traversed" +msgstr "" + +#: src/du.c:624 #, fuzzy, c-format msgid "fts_read failed: %s" msgstr "збой fts_read" -#: src/du.c:724 +#: src/du.c:780 #, c-format msgid "invalid maximum depth %s" msgstr "незразумелая найбольшая глыбіня %s" -#: src/du.c:817 +#: src/du.c:809 +#, fuzzy, c-format +msgid "invalid --threshold argument '-0'" +msgstr "нерэчаісны довад %s" + +#: src/du.c:887 #, c-format msgid "cannot both summarize and show all entries" msgstr "немагчыма адначасова й падлічыць і паказаць усе пункты" -#: src/du.c:824 +#: src/du.c:894 #, c-format msgid "warning: summarizing is the same as using --max-depth=0" msgstr "" -#: src/du.c:830 +#: src/du.c:900 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "" -#: src/du.c:896 src/sort.c:4479 src/wc.c:668 +#: src/du.c:966 src/sort.c:4533 src/wc.c:668 #, fuzzy msgid "file operands cannot be combined with --files0-from" msgstr "Файлавыя апэранбы ня могуць быць аб'яднаны з --print-database (-p)." -#: src/du.c:949 src/md5sum.c:587 src/od.c:903 src/tac.c:239 src/tac.c:350 -#: src/tac.c:506 src/tac.c:586 src/wc.c:733 +#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 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:963 src/sort.c:4508 src/wc.c:747 +#: src/du.c:1040 src/sort.c:4562 src/wc.c:747 #, c-format msgid "when reading file names from stdin, no file name of %s allowed" msgstr "" -#: src/du.c:980 src/du.c:988 src/wc.c:760 src/wc.c:768 +#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768 msgid "invalid zero-length file name" msgstr "назва файла нулявой даўжыні" -#: src/du.c:1007 src/head.c:149 src/head.c:262 src/head.c:334 src/head.c:538 -#: src/head.c:620 src/head.c:692 src/head.c:750 src/head.c:774 src/tail.c:412 -#: src/tail.c:500 src/tail.c:549 src/tail.c:642 src/tail.c:770 src/tail.c:818 -#: src/tail.c:855 src/tail.c:1782 src/tail.c:1812 src/uniq.c:395 -#, c-format -msgid "error reading %s" -msgstr "памылка чытаньня %s" - -#: src/du.c:1010 src/ls.c:2649 src/wc.c:791 +#: src/du.c:1088 src/ls.c:2649 src/wc.c:791 msgid "total" msgstr "усяго" @@ -3842,74 +3882,79 @@ msgstr "" "[ДОВАД]...]\n" #: src/env.c:55 +msgid "Set each NAME to VALUE in the environment and run COMMAND.\n" +msgstr "" + +#: src/env.c:61 msgid "" -"Set each NAME to VALUE in the environment and run COMMAND.\n" -"\n" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with 0 byte rather than newline\n" " -u, --unset=NAME remove variable from the environment\n" msgstr "" -#: src/env.c:64 +#: src/env.c:68 msgid "" "\n" "A mere - implies -i. If no COMMAND, print the resulting environment.\n" msgstr "" -#: src/env.c:120 +#: src/env.c:124 #, fuzzy, c-format msgid "cannot unset %s" msgstr "немагчыма зрабіць stat %s" -#: src/env.c:131 +#: src/env.c:135 #, fuzzy, c-format msgid "cannot set %s" msgstr "немагчыма зрабіць stat %s" -#: src/env.c:148 +#: src/env.c:152 #, c-format msgid "cannot specify --null (-0) with command" msgstr "" #: 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" -"\n" msgstr "" +"Запісвае кожны ФАЙЛ ў стандартны вывад з апошняга па першы радок.\n" +"Калі ФАЙЛ не зададзне альбо зададзены -, чытае стандартны ўвод.\n" +"\n" -#: src/expand.c:115 +#: src/expand.c:114 msgid "" " -i, --initial do not convert tabs after non blanks\n" " -t, --tabs=NUMBER have tabs NUMBER characters apart, not 8\n" msgstr "" -#: src/expand.c:119 +#: src/expand.c:118 msgid "" " -t, --tabs=LIST use comma separated list of explicit tab positions\n" msgstr "" -#: src/expand.c:172 src/unexpand.c:191 +#: src/expand.c:171 src/unexpand.c:190 #, c-format msgid "tab stop is too large %s" msgstr "крок табуляцыі %s занадта вялікі" -#: src/expand.c:180 src/unexpand.c:199 +#: src/expand.c:179 src/unexpand.c:198 #, c-format msgid "tab size contains invalid character(s): %s" msgstr "памер табуляцыі зьмяшчае нерэчаісны(я) знак(і): %s" -#: src/expand.c:206 src/unexpand.c:225 +#: src/expand.c:205 src/unexpand.c:224 #, c-format msgid "tab size cannot be 0" msgstr "памер табуляцыі ня можа быць нулявым" -#: src/expand.c:208 src/unexpand.c:227 +#: src/expand.c:207 src/unexpand.c:226 #, c-format msgid "tab sizes must be ascending" msgstr "памеры табуляцыі павінны ўзрастаць" -#: src/expand.c:326 src/expand.c:345 src/unexpand.c:374 src/unexpand.c:419 +#: 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 "радок вываду задаўгі" @@ -4023,12 +4068,12 @@ msgstr "памылка ў супастаўляльніку сталых выра msgid "non-integer argument" msgstr "ня лічбавы довад" -#: src/expr.c:793 src/truncate.c:316 +#: src/expr.c:793 src/truncate.c:314 #, c-format msgid "division by zero" msgstr "дзяленьне на нуль" -#: src/expr.c:887 src/sort.c:2029 +#: src/expr.c:887 src/sort.c:2044 #, fuzzy, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "Усталюйце LC_ALL='C' каб працаваць без пытаньняў." @@ -4038,25 +4083,32 @@ msgstr "Усталюйце LC_ALL='C' каб працаваць без пыта msgid "the strings compared were %s and %s" msgstr "Радкі былі параўнаны тут %s і тут %s." -#: src/factor.c:449 -msgid "using arbitrary-precision arithmetic" +#. This is a proper name. See the gettext manual, section Names. +#: src/factor.c:111 +msgid "Niels Moller" msgstr "" -#: src/factor.c:460 -msgid "using single-precision arithmetic" +#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459 +#, c-format +msgid "Lucas prime test failure. This should not happen" msgstr "" -#: src/factor.c:465 src/od.c:1640 src/od.c:1709 +#: src/factor.c:2092 #, c-format -msgid "%s is too large" -msgstr "%s занадта вялікі" +msgid "squfof queue overflow" +msgstr "" -#: src/factor.c:469 +#: src/factor.c:2419 #, c-format msgid "%s is not a valid positive integer" msgstr "%s - гэта не станоўчы цэлы лік" -#: src/factor.c:494 +#: src/factor.c:2442 src/od.c:1646 src/od.c:1715 +#, c-format +msgid "%s is too large" +msgstr "%s занадта вялікі" + +#: src/factor.c:2454 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4065,7 +4117,7 @@ msgstr "" "Выкарыстаньне: %s [ЛІК]...\n" " ці: %s ВЫБАР\n" -#: src/factor.c:499 +#: src/factor.c:2459 #, fuzzy msgid "" "Print the prime factors of each specified integer NUMBER. If none\n" @@ -4093,20 +4145,19 @@ msgid "cannot stat current directory (now %s)" msgstr "немагчыма атрымаць стан бягучае тэчкі (зараз %s)" #. This is a proper name. See the gettext manual, section Names. -#: src/fmt.c:37 +#: src/fmt.c:38 msgid "Ross Paterson" msgstr "" -#: src/fmt.c:269 +#: src/fmt.c:270 #, fuzzy, c-format msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n" msgstr "Выкарыстаньне: %s [-ЛІЧБЫ] [ВЫБАР]... [ФАЙЛ]...\n" -#: src/fmt.c:270 +#: 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" -"\n" msgstr "" #: src/fmt.c:278 @@ -4117,8 +4168,8 @@ msgid "" " -s, --split-only split long lines, but do not refill\n" msgstr "" -#: src/fmt.c:285 -#, c-format +#: src/fmt.c:287 +#, 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" @@ -4126,14 +4177,14 @@ msgid "" " -g, --goal=WIDTH goal width (default of 93% of width)\n" msgstr "" -#: src/fmt.c:357 +#: src/fmt.c:359 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" "option; use -w N instead" msgstr "" -#: src/fmt.c:403 src/fmt.c:414 +#: src/fmt.c:405 src/fmt.c:416 #, c-format msgid "invalid width: %s" msgstr "недзеяздольная шырыня: %s" @@ -4142,23 +4193,22 @@ msgstr "недзеяздольная шырыня: %s" msgid "" "Wrap input lines in each FILE (standard input by default), writing to\n" "standard output.\n" -"\n" msgstr "" -#: src/fold.c:78 +#: src/fold.c:77 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" " -w, --width=WIDTH use WIDTH columns instead of 80\n" msgstr "" -#: src/fold.c:289 src/pr.c:836 +#: src/fold.c:288 src/pr.c:832 #, c-format 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:75 +#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 #: src/truncate.c:37 msgid "Padraig Brady" msgstr "" @@ -4174,17 +4224,17 @@ msgid "" "\n" msgstr "" -#: src/group-list.c:69 src/id.c:345 src/setuidgid.c:184 +#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184 #, fuzzy, c-format msgid "failed to get groups for user %s" msgstr "немагчыма зьмяніць групу %s на %s\n" -#: src/group-list.c:74 src/id.c:350 +#: src/group-list.c:74 src/id.c:370 #, fuzzy, c-format msgid "failed to get groups for the current process" msgstr "немагчыма зьмяніць групу %s на %s\n" -#: src/group-list.c:104 +#: src/group-list.c:114 #, fuzzy, c-format msgid "cannot find name for group ID %lu" msgstr "немагчыма атрымаць назву для ID групы %u" @@ -4222,18 +4272,18 @@ msgid "%s: no such user" msgstr "%s: такі карыстальнік ня йснуе" #: 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" -"\n" msgstr "" " Друкуе першыя 10 радкоў кожнага файла ў стандартны вывад. Калі заданы\n" "больш чым адзін файл, дадаткова друкуе загаловак з назвай файла.\n" "Калі файл незаданы, ці калі замест яго працяжнік, чытае стандартны ўвод.\n" "\n" -#: src/head.c:118 +#: src/head.c:117 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -4243,13 +4293,13 @@ msgid "" " K lines of each file\n" msgstr "" -#: src/head.c:126 +#: 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 "" -#: src/head.c:132 +#: src/head.c:131 #, fuzzy msgid "" "\n" @@ -4264,58 +4314,58 @@ msgstr "" "Кожнае ключавое слова можа быць:\n" "\n" -#: src/head.c:152 -#, c-format -msgid "error writing %s" -msgstr "памылка запісу %s" - -#: src/head.c:155 +#: src/head.c:154 #, c-format msgid "%s: file has shrunk too much" msgstr "" -#: src/head.c:228 src/head.c:1044 +#: src/head.c:227 src/head.c:1051 #, c-format msgid "%s: number of bytes is too large" msgstr "%s: колькасьць байтаў занадта вялікая" -#: src/head.c:441 +#: src/head.c:440 #, c-format msgid "%s: cannot lseek back to original position" msgstr "%s: немагчыма перамясьціцца назад да зыходнага становішча" -#: src/head.c:613 src/head.c:684 src/tail.c:450 +#: src/head.c:612 src/head.c:691 src/tail.c:449 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: немагчыма перамясьціцца да зруха %s" -#: src/head.c:791 +#: src/head.c:673 +#, 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 "" -#: src/head.c:878 +#: src/head.c:885 #, c-format msgid "%s: %s is so large that it is not representable" msgstr "%s: %s такі вялікі, што немагчыма паказаць" -#: src/head.c:879 +#: src/head.c:886 msgid "number of lines" msgstr "колькасьць радкоў" -#: src/head.c:879 +#: src/head.c:886 msgid "number of bytes" msgstr "колькасьць байтаў" -#: src/head.c:886 src/tail.c:1947 +#: src/head.c:893 src/tail.c:1947 msgid "invalid number of lines" msgstr "недзеяздольная колькасьць радкоў" -#: src/head.c:887 src/tail.c:1948 +#: src/head.c:894 src/tail.c:1948 msgid "invalid number of bytes" msgstr "недзеяздольная колькасьць байтаў" -#: src/head.c:974 src/head.c:1032 +#: src/head.c:981 src/head.c:1039 #, fuzzy, c-format msgid "invalid trailing option -- %c" msgstr "нерэчаісны парамэтар -- %c" @@ -4420,86 +4470,86 @@ msgstr "" msgid "cannot get effective UID" msgstr "немагчыма знайсьці аб'ект спасылкі %s" -#: src/id.c:289 +#: src/id.c:311 #, fuzzy, c-format -msgid "cannot find name for user ID %lu" +msgid "cannot find name for user ID %s" msgstr "немагчыма атрымаць імя для ID карыстальніка %u" -#: src/id.c:309 +#: src/id.c:329 #, c-format -msgid "uid=%lu" +msgid "uid=%s" msgstr "" -#: src/id.c:314 +#: src/id.c:334 #, c-format -msgid " gid=%lu" +msgid " gid=%s" msgstr "" -#: src/id.c:321 +#: src/id.c:341 #, c-format -msgid " euid=%lu" +msgid " euid=%s" msgstr "" -#: src/id.c:329 +#: src/id.c:349 #, c-format -msgid " egid=%lu" +msgid " egid=%s" msgstr "" -#: src/id.c:357 +#: src/id.c:377 msgid " groups=" msgstr " групы=" -#: src/id.c:373 +#: src/id.c:393 #, c-format msgid " context=%s" msgstr "" -#: src/install.c:372 +#: src/install.c:373 #, fuzzy, c-format msgid "warning: %s: failed to change context to %s" msgstr "Увага! Немагчыма перайсьці да тэчкі %s" -#: src/install.c:413 +#: src/install.c:414 #, c-format msgid "creating directory %s" msgstr "ствараецца тэчка %s" -#: src/install.c:481 +#: src/install.c:482 #, c-format msgid "cannot change ownership of %s" msgstr "немагчыма зьмяніць уладальніка %s" -#: src/install.c:505 +#: src/install.c:506 #, c-format msgid "cannot set time stamps for %s" msgstr "немагчыма ўсталяваць адбіткі часу для %s" -#: src/install.c:526 src/split.c:412 src/timeout.c:387 +#: src/install.c:527 src/split.c:426 src/timeout.c:439 #, c-format msgid "fork system call failed" msgstr "" -#: src/install.c:530 +#: src/install.c:531 #, fuzzy, c-format msgid "cannot run %s" msgstr "немагчыма unlink %s" -#: src/install.c:534 +#: src/install.c:535 #, fuzzy, c-format msgid "waiting for strip" msgstr "запіс у %s" -#: src/install.c:536 +#: src/install.c:537 #, c-format msgid "strip process terminated abnormally" msgstr "" -#: src/install.c:557 +#: src/install.c:558 #, c-format msgid "invalid user %s" msgstr "нерэчаісны карыстальнік %s" -#: src/install.c:593 +#: src/install.c:594 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -4511,7 +4561,7 @@ msgstr "" " ці: %s [ВЫБАР]... АДКУЛЬ... ТЭЧКА\n" " ці: %s [ВЫБАР]... --target-directory=ТЭЧКА АДКУЛЬ...\n" -#: src/install.c:600 +#: src/install.c:601 msgid "" "\n" "This install program copies files (often just compiled) into destination\n" @@ -4523,7 +4573,6 @@ msgid "" "In the first three forms, copy SOURCE to DEST or multiple SOURCE(s) to\n" "the existing DIRECTORY, while setting permission modes and owner/group.\n" "In the 4th form, create all components of the given DIRECTORY(ies).\n" -"\n" msgstr "" #: src/install.c:615 @@ -4585,53 +4634,53 @@ msgid "" "directories\n" msgstr "" -#: src/install.c:858 +#: src/install.c:859 #, c-format msgid "" "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled" msgstr "" -#: src/install.c:868 +#: src/install.c:869 #, c-format msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled" msgstr "" -#: src/install.c:885 +#: src/install.c:886 #, c-format msgid "the strip option may not be used when installing a directory" msgstr "" -#: src/install.c:888 +#: src/install.c:889 #, fuzzy, c-format msgid "target directory not allowed when installing a directory" msgstr "%s: заданая тэчка мэты не зьяўляецца тэчкай" -#: src/install.c:892 +#: src/install.c:893 #, c-format msgid "cannot force target context to %s and preserve it" msgstr "" -#: src/install.c:946 src/mkdir.c:202 src/stdbuf.c:327 +#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326 #, c-format msgid "invalid mode %s" msgstr "нерэчаісны рэжым %s" -#: src/install.c:953 +#: src/install.c:954 #, c-format msgid "WARNING: ignoring --strip-program option as -s option was not specified" msgstr "" -#: src/install.c:958 +#: src/install.c:959 #, fuzzy, c-format msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive" msgstr "выбары, што вызначаюць дату для друку ўзаема выключныя" -#: src/install.c:965 +#: src/install.c:966 #, fuzzy, c-format msgid "options --compare (-C) and --strip are mutually exclusive" msgstr "выбары, што вызначаюць дату для друку ўзаема выключныя" -#: src/install.c:971 +#: src/install.c:972 #, c-format msgid "" "the --compare (-C) option is ignored when you specify a mode with non-" @@ -4639,7 +4688,7 @@ msgid "" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/join.c:40 src/sort.c:65 +#: src/join.c:40 src/sort.c:66 msgid "Mike Haertel" msgstr "" @@ -4695,7 +4744,7 @@ msgstr "" #: src/join.c:403 #, c-format -msgid "%s:%ju: is not sorted: %.*s" +msgid "%s:%<PRIuMAX>: is not sorted: %.*s" msgstr "" #: src/join.c:840 src/join.c:1038 @@ -4723,12 +4772,12 @@ msgstr "" msgid "conflicting empty-field replacement strings" msgstr "" -#: src/join.c:1101 src/sort.c:4414 +#: src/join.c:1101 src/sort.c:4468 #, c-format msgid "multi-character tab %s" msgstr "шмат-байтавы знак табуляцыі %s" -#: src/join.c:1105 src/sort.c:4419 +#: src/join.c:1105 src/sort.c:4473 #, c-format msgid "incompatible tabs" msgstr "" @@ -4750,14 +4799,13 @@ msgstr "" " ці: %s -t [СЫГНАЛ]...\n" #: src/kill.c:82 -msgid "" -"Send signals to processes, or list signals.\n" -"\n" +#, fuzzy +msgid "Send signals to processes, or list signals.\n" msgstr "" " Дасылае сыгналы працэсам альбо сьпіс сыгналаў.\n" "\n" -#: src/kill.c:89 +#: src/kill.c:88 msgid "" " -s, --signal=SIGNAL, -SIGNAL\n" " specify the name or number of the signal to be sent\n" @@ -4766,7 +4814,7 @@ msgid "" " -t, --table print a table of signal information\n" msgstr "" -#: src/kill.c:97 +#: src/kill.c:96 msgid "" "\n" "SIGNAL may be a signal name like 'HUP', or a signal number like '1',\n" @@ -4774,32 +4822,32 @@ msgid "" "PID is an integer; if negative it identifies a process group.\n" msgstr "" -#: src/kill.c:206 +#: src/kill.c:205 #, c-format msgid "%s: invalid process id" msgstr "%s: недзеяздольны id-працэсу" -#: src/kill.c:260 +#: src/kill.c:259 #, c-format msgid "invalid option -- %c" msgstr "нерэчаісны парамэтар -- %c" -#: src/kill.c:269 +#: src/kill.c:268 #, c-format msgid "%s: multiple signals specified" msgstr "%s: заданыя некалькі сыгналаў" -#: src/kill.c:283 +#: src/kill.c:282 #, c-format msgid "multiple -l or -t options specified" msgstr "" -#: src/kill.c:300 +#: src/kill.c:299 #, c-format msgid "cannot combine signal with -l or -t" msgstr "" -#: src/kill.c:306 +#: src/kill.c:305 #, c-format msgid "no process ID specified" msgstr "незаданы ID працэсу" @@ -4903,10 +4951,9 @@ msgid "" "When creating hard links, each TARGET must exist. Symbolic links\n" "can hold arbitrary text; if later resolved, a relative link is\n" "interpreted in relation to its parent directory.\n" -"\n" msgstr "" -#: src/ln.c:395 +#: src/ln.c:394 #, fuzzy msgid "" " --backup[=CONTROL] make a backup of each existing destination " @@ -4929,7 +4976,7 @@ msgstr "" " -d тое ж, што й --no-dereference --" "preserve=link\n" -#: src/ln.c:403 +#: src/ln.c:402 msgid "" " -i, --interactive prompt whether to remove destinations\n" " -L, --logical dereference TARGETs that are symbolic links\n" @@ -4941,7 +4988,7 @@ msgid "" " -s, --symbolic make symbolic links instead of hard links\n" msgstr "" -#: src/ln.c:412 +#: src/ln.c:411 msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" " -t, --target-directory=DIRECTORY specify the DIRECTORY in which to " @@ -4951,23 +4998,10 @@ msgid "" " -v, --verbose print name of each linked file\n" msgstr "" -#: src/ln.c:428 -#, 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" - -#: src/ln.c:435 +#: src/ln.c:433 #, 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 "" @@ -5040,7 +5074,7 @@ msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "" "незаўважае незразумелы памер табуляцыі ў пераменнай асяродзьдзя TABSIZE: %s" -#: src/ls.c:1750 src/ptx.c:1976 +#: src/ls.c:1750 src/ptx.c:1975 #, c-format msgid "invalid line width: %s" msgstr "незразумелая шырыня радка: %s" @@ -5104,7 +5138,7 @@ msgstr "чытаецца дырэкторыя %s" msgid "closing directory %s" msgstr "зачыняецца дырэкторыя %s" -#: src/ls.c:3301 +#: src/ls.c:3302 #, c-format msgid "cannot compare file names %s and %s" msgstr "немагчыма параўнаць назвы файлаў %s і %s" @@ -5114,14 +5148,13 @@ msgstr "немагчыма параўнаць назвы файлаў %s і %s" msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" -"\n" msgstr "" "Выводзіць зьвесткі пра файл(ы) (зь бягучае дырэкторыі, калі не зададзена " "іншае).\n" "Упарадкоўвае запісы па алфавіту, калі няма -cftuSUX ці --sort.\n" "\n" -#: src/ls.c:4729 +#: src/ls.c:4728 #, fuzzy msgid "" " -a, --all do not ignore entries starting with .\n" @@ -5136,7 +5169,7 @@ msgstr "" " -b, --escape друкаваць васьмярычныя значэньні для\n" " службовых/неграфічных знакаў\n" -#: src/ls.c:4735 +#: src/ls.c:4734 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them. E." "g.,\n" @@ -5150,7 +5183,7 @@ msgid "" " otherwise: sort by ctime, newest first\n" msgstr "" -#: src/ls.c:4745 +#: src/ls.c:4744 msgid "" " -C list entries by columns\n" " --color[=WHEN] colorize the output. WHEN defaults to " @@ -5162,7 +5195,7 @@ msgid "" " -D, --dired generate output designed for Emacs' dired mode\n" msgstr "" -#: src/ls.c:4753 +#: src/ls.c:4752 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -5172,11 +5205,11 @@ msgid "" " --full-time like -l --time-style=full-iso\n" msgstr "" -#: src/ls.c:4761 +#: src/ls.c:4760 msgid " -g like -l, but do not list owner\n" msgstr "" -#: src/ls.c:4764 +#: src/ls.c:4763 msgid "" " --group-directories-first\n" " group directories before files.\n" @@ -5184,7 +5217,7 @@ msgid "" " use of --sort=none (-U) disables grouping\n" msgstr "" -#: src/ls.c:4770 +#: src/ls.c:4769 #, fuzzy msgid "" " -G, --no-group in a long listing, don't print group names\n" @@ -5199,7 +5232,7 @@ msgstr "" " -H, --si гл. вышэй, але выкарыстоўваць ступені 1000 замест " "1024\n" -#: src/ls.c:4776 +#: src/ls.c:4775 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5212,7 +5245,7 @@ msgid "" " (overridden by -a or -A)\n" msgstr "" -#: src/ls.c:4786 +#: src/ls.c:4785 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -5224,7 +5257,7 @@ msgid "" " -k, --kibibytes use 1024-byte blocks\n" msgstr "" -#: src/ls.c:4796 +#: src/ls.c:4795 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5234,7 +5267,7 @@ msgid "" "entries\n" msgstr "" -#: src/ls.c:4804 +#: src/ls.c:4803 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. " @@ -5245,7 +5278,7 @@ msgid "" " append / indicator to directories\n" msgstr "" -#: src/ls.c:4812 +#: src/ls.c:4811 msgid "" " -q, --hide-control-chars print ? instead of non graphic characters\n" " --show-control-chars show non graphic characters as-is (default\n" @@ -5257,7 +5290,7 @@ msgid "" "escape\n" msgstr "" -#: src/ls.c:4821 +#: src/ls.c:4820 #, fuzzy msgid "" " -r, --reverse reverse order while sorting\n" @@ -5269,7 +5302,7 @@ msgstr "" " -R, --recursive паказываць тэчкі рэкурсыўна\n" " -s, --size друаваць памер кожнага файла ў блёках\n" -#: src/ls.c:4826 +#: src/ls.c:4825 msgid "" " -S sort by file size\n" " --sort=WORD sort by WORD instead of name: none -U,\n" @@ -5281,7 +5314,7 @@ msgid "" " if --sort=time\n" msgstr "" -#: src/ls.c:4836 +#: src/ls.c:4835 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, +FORMAT.\n" @@ -5293,13 +5326,13 @@ msgid "" " takes effect only outside the POSIX locale\n" msgstr "" -#: src/ls.c:4845 +#: src/ls.c:4844 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:4849 +#: src/ls.c:4848 msgid "" " -u with -lt: sort by, and show, access time\n" " with -l: show access time and sort by name\n" @@ -5308,7 +5341,7 @@ msgid "" " -v natural sort of (version) numbers within text\n" msgstr "" -#: src/ls.c:4856 +#: src/ls.c:4855 #, fuzzy msgid "" " -w, --width=COLS assume screen width instead of current value\n" @@ -5323,7 +5356,7 @@ msgstr "" " -X упарадкаваць па абэцэдзе суфіксаў файлаў\n" " -1 паказываць па файлу на радок\n" -#: src/ls.c:4866 +#: src/ls.c:4865 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5332,7 +5365,7 @@ msgid "" "variable can change the settings. Use the dircolors command to set it.\n" msgstr "" -#: src/ls.c:4873 +#: src/ls.c:4872 msgid "" "\n" "Exit status:\n" @@ -5356,7 +5389,7 @@ msgstr "" msgid "David Madore" msgstr "" -#: src/md5sum.c:162 +#: src/md5sum.c:164 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -5369,7 +5402,7 @@ msgstr "" "Друкуе ці правярае %s (%d-бітавую) праверчую суму.\n" "Калі файл незаданы, ці калі замест яго працяжнік, чытае стандартны ўвод.\n" -#: src/md5sum.c:172 +#: src/md5sum.c:174 #, fuzzy msgid "" " -b, --binary read in binary mode (default unless reading tty " @@ -5379,7 +5412,7 @@ msgstr "" " -B, --binary выкарыстоўвае дваічны запіс у прыладу кансолі.\n" "\n" -#: src/md5sum.c:176 +#: src/md5sum.c:178 #, fuzzy msgid " -b, --binary read in binary mode\n" msgstr "" @@ -5387,17 +5420,21 @@ msgstr "" " -B, --binary выкарыстоўвае дваічны запіс у прыладу кансолі.\n" "\n" -#: src/md5sum.c:179 +#: src/md5sum.c:181 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr "" -#: src/md5sum.c:183 +#: src/md5sum.c:184 +msgid " --tag create a BSD-style checksum\n" +msgstr "" + +#: src/md5sum.c:188 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" -#: src/md5sum.c:187 +#: src/md5sum.c:192 #, fuzzy msgid " -t, --text read in text mode (default)\n" msgstr "" @@ -5405,7 +5442,7 @@ msgstr "" " -B, --binary выкарыстоўвае дваічны запіс у прыладу кансолі.\n" "\n" -#: src/md5sum.c:190 +#: src/md5sum.c:195 #, fuzzy msgid "" "\n" @@ -5422,12 +5459,12 @@ msgstr "" "сумамі\n" "\n" -#: src/md5sum.c:198 +#: src/md5sum.c:203 msgid "" " --strict with --check, exit non-zero for any invalid input\n" msgstr "" -#: src/md5sum.c:203 +#: src/md5sum.c:208 #, c-format msgid "" "\n" @@ -5437,35 +5474,35 @@ msgid "" "space for text), and name for each FILE.\n" msgstr "" -#: src/md5sum.c:502 +#: src/md5sum.c:523 #, c-format msgid "%s: too many checksum lines" msgstr "%s: зашмат радкоў з кантрольнымі сумамі" -#: src/md5sum.c:526 +#: src/md5sum.c:547 #, c-format msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line" msgstr "%s: %<PRIuMAX>: ня правільна складзены радок з кантрольнай сумай %s" -#: src/md5sum.c:551 +#: src/md5sum.c:572 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: немагчыма прачытаць файл\n" -#: src/md5sum.c:574 +#: src/md5sum.c:595 msgid "FAILED" msgstr "ПАМЫЛКА" -#: src/md5sum.c:576 +#: src/md5sum.c:597 msgid "OK" msgstr "ДОБРА" -#: src/md5sum.c:600 +#: src/md5sum.c:621 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "" -#: src/md5sum.c:610 +#: src/md5sum.c:631 #, fuzzy, c-format msgid "WARNING: %<PRIuMAX> line is improperly formatted" msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted" @@ -5473,7 +5510,7 @@ msgstr[0] "%s: %<PRIuMAX>: ня правільна складзены радок msgstr[1] "%s: %<PRIuMAX>: ня правільна складзены радок з кантрольнай сумай %s" msgstr[2] "%s: %<PRIuMAX>: ня правільна складзены радок з кантрольнай сумай %s" -#: src/md5sum.c:618 +#: src/md5sum.c:639 #, fuzzy, c-format msgid "WARNING: %<PRIuMAX> listed file could not be read" msgid_plural "WARNING: %<PRIuMAX> listed files could not be read" @@ -5484,7 +5521,7 @@ msgstr[1] "" msgstr[2] "" "УВАГА! %<PRIuMAX> з %<PRIuMAX> пералічаных файлаў немагчыма прачытаць" -#: src/md5sum.c:626 +#: src/md5sum.c:647 #, fuzzy, c-format msgid "WARNING: %<PRIuMAX> computed checksum did NOT match" msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match" @@ -5492,28 +5529,38 @@ msgstr[0] "УВАГА! %d з %d вылічаных %s НЕ СУПАДАЕ" msgstr[1] "УВАГА! %d з %d вылічаных %s НЕ СУПАДАЕ" msgstr[2] "УВАГА! %d з %d вылічаных %s НЕ СУПАДАЕ" -#: src/md5sum.c:704 +#: src/md5sum.c:760 +#, c-format +msgid "--tag does not support --text mode" +msgstr "" + +#: src/md5sum.c:766 +#, fuzzy, c-format +msgid "the --tag option is meaningless when verifying checksums" +msgstr "выбар --warn мае сэнс толькі тады, калі параўноваюцца праверчыя сумы" + +#: src/md5sum.c:773 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" msgstr "" -#: src/md5sum.c:712 +#: src/md5sum.c:781 #, c-format msgid "the --status option is meaningful only when verifying checksums" msgstr "" -#: src/md5sum.c:719 +#: src/md5sum.c:788 #, c-format msgid "the --warn option is meaningful only when verifying checksums" msgstr "выбар --warn мае сэнс толькі тады, калі параўноваюцца праверчыя сумы" -#: src/md5sum.c:726 +#: src/md5sum.c:795 #, fuzzy, c-format msgid "the --quiet option is meaningful only when verifying checksums" msgstr "выбар --warn мае сэнс толькі тады, калі параўноваюцца праверчыя сумы" -#: src/md5sum.c:733 +#: src/md5sum.c:802 #, fuzzy, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "выбар --warn мае сэнс толькі тады, калі параўноваюцца праверчыя сумы" @@ -5524,14 +5571,13 @@ msgid "Usage: %s [OPTION]... DIRECTORY...\n" msgstr "Выкарыстаньне: %s [ВЫБАР]... ТЭЧКА ...\n" #: src/mkdir.c:57 -msgid "" -"Create the DIRECTORY(ies), if they do not already exist.\n" -"\n" +#, fuzzy +msgid "Create the DIRECTORY(ies), if they do not already exist.\n" msgstr "" " Стварае тэчку(і), калі яны шчэ не йснуюць.\n" "\n" -#: src/mkdir.c:64 +#: src/mkdir.c:63 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" @@ -5540,7 +5586,7 @@ msgid "" " directory to CTX\n" msgstr "" -#: src/mkdir.c:169 +#: src/mkdir.c:168 #, c-format msgid "created directory %s" msgstr "створана тэчка %s" @@ -5551,29 +5597,28 @@ msgid "Usage: %s [OPTION]... NAME...\n" msgstr "Выкарыстаньне: %s [ВЫБАР]... НАЗВА...\n" #: src/mkfifo.c:52 -msgid "" -"Create named pipes (FIFOs) with the given NAMEs.\n" -"\n" +#, fuzzy +msgid "Create named pipes (FIFOs) with the given NAMEs.\n" msgstr "" "Стварае найменны канвэер (fifo) з зададзенымі НАЗВАмі.\n" "\n" -#: src/mkfifo.c:59 src/mknod.c:61 +#: src/mkfifo.c:58 src/mknod.c:60 msgid "" " -m, --mode=MODE set file permission bits to MODE, not a=rw - umask\n" msgstr "" -#: src/mkfifo.c:62 +#: src/mkfifo.c:61 msgid "" " -Z, --context=CTX set the SELinux security context of each NAME to CTX\n" msgstr "" -#: src/mkfifo.c:122 src/mknod.c:128 +#: src/mkfifo.c:121 src/mknod.c:127 #, c-format msgid "invalid mode" msgstr "нерэчаісны рэжым" -#: src/mkfifo.c:127 src/mknod.c:133 +#: src/mkfifo.c:126 src/mknod.c:132 #, c-format msgid "mode must specify only file permission bits" msgstr "" @@ -5584,18 +5629,17 @@ msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n" msgstr "Выкарыстаньне: %s [ВЫБАР]... НАЗВА ТЫП [МАЖОР МІНОР]\n" #: src/mknod.c:54 -msgid "" -"Create the special file NAME of the given TYPE.\n" -"\n" +#, fuzzy +msgid "Create the special file NAME of the given TYPE.\n" msgstr "" " Стварае адмысловы файз з заданымі назвай і відам.\n" "\n" -#: src/mknod.c:64 +#: src/mknod.c:63 msgid " -Z, --context=CTX set the SELinux security context of NAME to CTX\n" msgstr "" -#: src/mknod.c:69 +#: src/mknod.c:68 msgid "" "\n" "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n" @@ -5604,7 +5648,7 @@ msgid "" "otherwise, as decimal. TYPE may be:\n" msgstr "" -#: src/mknod.c:76 +#: src/mknod.c:75 msgid "" "\n" " b create a block (buffered) special file\n" @@ -5612,44 +5656,44 @@ msgid "" " p create a FIFO\n" msgstr "" -#: src/mknod.c:151 +#: src/mknod.c:150 #, fuzzy msgid "Special files require major and minor device numbers." msgstr "" "калі ствараюцца адмысловыя файлы, павінны быць заданыя\n" "мажорны й мінорны нумары прылады" -#: src/mknod.c:161 +#: src/mknod.c:160 #, fuzzy msgid "Fifos do not have major and minor device numbers." msgstr "нерэчаісны мінорны нумар прылады %s" -#: src/mknod.c:177 +#: src/mknod.c:176 #, c-format msgid "block special files not supported" msgstr "адмысловыя блёчныя файлы непадтрымліваюцца" -#: src/mknod.c:186 +#: src/mknod.c:185 #, c-format msgid "character special files not supported" msgstr "адмысловыя знакавыя файлы непадтрымліваюцца" -#: src/mknod.c:202 +#: src/mknod.c:201 #, c-format msgid "invalid major device number %s" msgstr "нерэчаісны мажорны нумар прылады %s" -#: src/mknod.c:207 +#: src/mknod.c:206 #, c-format msgid "invalid minor device number %s" msgstr "нерэчаісны мінорны нумар прылады %s" -#: src/mknod.c:212 +#: src/mknod.c:211 #, c-format msgid "invalid device %s %s" msgstr "нерэчаісная прылада %s %s" -#: src/mknod.c:226 +#: src/mknod.c:225 #, c-format msgid "invalid device type %s" msgstr "нерэчаісны від прылады %s" @@ -5708,60 +5752,59 @@ msgid "" " directory specified via -p; else /tmp [deprecated]\n" msgstr "" -#: src/mktemp.c:222 +#: src/mktemp.c:223 #, fuzzy, c-format msgid "failed to redirect stderr to /dev/null" msgstr "немагчыма перанакіраваць стандартны вывад памылак" -#: src/mktemp.c:228 +#: src/mktemp.c:229 #, fuzzy, c-format msgid "too many templates" msgstr "зашмат аднолькавых радкоў" -#: src/mktemp.c:248 +#: src/mktemp.c:249 #, c-format msgid "with --suffix, template %s must end in X" msgstr "" -#: src/mktemp.c:273 src/split.c:1117 +#: src/mktemp.c:274 src/split.c:1130 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "" -#: src/mktemp.c:278 +#: src/mktemp.c:279 #, c-format msgid "too few X's in template %s" msgstr "" -#: src/mktemp.c:291 +#: src/mktemp.c:292 #, c-format msgid "invalid template, %s, contains directory separator" msgstr "" -#: src/mktemp.c:305 +#: src/mktemp.c:306 #, c-format msgid "invalid template, %s; with --tmpdir, it may not be absolute" msgstr "" -#: src/mktemp.c:325 +#: src/mktemp.c:326 #, fuzzy, c-format msgid "failed to create directory via template %s" msgstr "немагчыма стварыць тэчку %s" -#: src/mktemp.c:335 +#: src/mktemp.c:336 #, fuzzy, c-format msgid "failed to create file via template %s" msgstr "збой пры захаваньні часу для %s" -#: src/mv.c:290 -msgid "" -"Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" -"\n" +#: src/mv.c:292 +#, fuzzy +msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" msgstr "" " Пераназывае крыніцу ў мэту, ці перамяшчае крыніцу(ы) ў тэчку.\n" "\n" -#: src/mv.c:297 +#: src/mv.c:298 #, fuzzy msgid "" " --backup[=CONTROL] make a backup of each existing destination " @@ -5784,7 +5827,7 @@ msgstr "" " -d тое ж, што й --no-dereference --" "preserve=link\n" -#: src/mv.c:306 +#: src/mv.c:307 #, fuzzy msgid "" " --strip-trailing-slashes remove any trailing slashes from each " @@ -5799,7 +5842,7 @@ msgstr "" "доваду\n" " КРЫНІЦы\n" -#: src/mv.c:311 +#: src/mv.c:312 #, fuzzy msgid "" " -t, --target-directory=DIRECTORY move all SOURCE arguments into " @@ -5823,13 +5866,11 @@ msgid "Usage: %s [OPTION] [COMMAND [ARG]...]\n" msgstr "Выкарыстаньне: %s [ПАРАМЭТАР] [ЗАГАД [ДОВАД]...]\n" #: src/nice.c:73 -#, c-format +#, fuzzy, c-format msgid "" "Run COMMAND with an adjusted niceness, which affects process scheduling.\n" -"With no COMMAND, print the current niceness. Nicenesses range from\n" -"%d (most favorable scheduling) to %d (least favorable).\n" -"\n" -" -n, --adjustment=N add integer N to the niceness (default 10)\n" +"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 "" "Выконвае ЗАГАД са зьмененым значэньнем niceness, што ўзьдзейнічае\n" "на расклад выкананьня (прыярытэт) працэсу.\n" @@ -5839,22 +5880,26 @@ msgstr "" "\n" " -n, --adjustment=N дадаць цэлы N да niceness (прадвызначана 10)\n" -#: src/nice.c:168 +#: src/nice.c:82 +msgid " -n, --adjustment=N add integer N to the niceness (default 10)\n" +msgstr "" + +#: src/nice.c:172 #, c-format msgid "invalid adjustment %s" msgstr "нерэчаіснае значэньне %s" -#: src/nice.c:177 +#: src/nice.c:181 #, c-format msgid "a command must be given with an adjustment" msgstr "загад мусіць быць зададзены разам са значэньнем прыярытэту" -#: src/nice.c:184 src/nice.c:195 +#: src/nice.c:188 src/nice.c:199 #, c-format msgid "cannot get niceness" msgstr "немагчыма атрымаць значэньне niceness" -#: src/nice.c:201 +#: src/nice.c:205 #, c-format msgid "cannot set niceness" msgstr "немагчыма ўсталяваць значэньне niceness" @@ -5864,24 +5909,24 @@ msgstr "немагчыма ўсталяваць значэньне niceness" msgid "Scott Bartram" msgstr "" -#: src/nl.c:186 +#: 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" -"\n" msgstr "" "Write each FILE to standard output, with line numbers added.\n" "With no FILE, or when FILE is -, read standard input.\n" "\n" -#: src/nl.c:194 +#: src/nl.c:186 msgid "" " -b, --body-numbering=STYLE use STYLE for numbering body lines\n" " -d, --section-delimiter=CC use CC for separating logical pages\n" " -f, --footer-numbering=STYLE use STYLE for numbering footer lines\n" msgstr "" -#: src/nl.c:199 +#: src/nl.c:191 msgid "" " -h, --header-numbering=STYLE use STYLE for numbering header lines\n" " -i, --line-increment=NUMBER line number increment at each line\n" @@ -5893,13 +5938,13 @@ msgid "" " -s, --number-separator=STRING add STRING after (possible) line number\n" msgstr "" -#: src/nl.c:207 +#: src/nl.c:199 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 "" -#: src/nl.c:213 +#: src/nl.c:205 msgid "" "\n" "By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC are\n" @@ -5907,7 +5952,7 @@ msgid "" "second character implies :. Type \\\\ for \\. STYLE is one of:\n" msgstr "" -#: src/nl.c:219 +#: src/nl.c:211 msgid "" "\n" " a number all lines\n" @@ -5924,52 +5969,47 @@ msgid "" "\n" msgstr "" -#: src/nl.c:286 +#: src/nl.c:278 #, c-format msgid "line number overflow" msgstr "перапаўненьне колькасьці радкоў" -#: src/nl.c:486 +#: src/nl.c:478 #, c-format msgid "invalid header numbering style: %s" msgstr "нерэчаісны стыль нумараваньня загалоўку: %s" -#: src/nl.c:494 +#: src/nl.c:486 #, c-format msgid "invalid body numbering style: %s" msgstr "нерэчаісны стыль нумараваньня цела: %s" -#: src/nl.c:502 +#: src/nl.c:494 #, c-format msgid "invalid footer numbering style: %s" msgstr "нерэчаісны стыль нумараваньня падвалу: %s" -#: src/nl.c:511 +#: src/nl.c:503 #, c-format msgid "invalid starting line number: %s" msgstr "нерэчаісны нумар пачатковага радка: %s" -#: src/nl.c:517 -#, fuzzy, c-format -msgid "WARNING: --page-increment is deprecated; use --line-increment instead" -msgstr "парамэтар \"--megabytes \" - асуджаны; замест яго карыстайцеся \"-m\"" - -#: src/nl.c:524 +#: src/nl.c:512 #, c-format msgid "invalid line number increment: %s" msgstr "недзеяздольнае значэньне павелічэньня нумару радка: \"%s\"" -#: src/nl.c:536 +#: src/nl.c:524 #, c-format msgid "invalid number of blank lines: %s" msgstr "недзеяздольная колькасьць чыстых радокоў: %s" -#: src/nl.c:550 +#: src/nl.c:538 #, c-format msgid "invalid line number field width: %s" msgstr "недзеяздольная шырыня поля нумара радка: %s" -#: src/nl.c:569 +#: src/nl.c:557 #, c-format msgid "invalid line numbering format: %s" msgstr "нерэчаісны фармат нумараваньня радкоў: %s" @@ -6012,11 +6052,6 @@ msgstr "немагчыма перанакіраваць стандартны в msgid "ignoring input" msgstr "на ўсе довады не зьвяртаецца ўвага" -#: src/nohup.c:163 src/nohup.c:165 -#, c-format -msgid "failed to open %s" -msgstr "немагчыма адчыніць %s" - #: src/nohup.c:175 #, fuzzy, c-format msgid "ignoring input and appending output to %s" @@ -6048,33 +6083,370 @@ msgid "failed to redirect standard error" msgstr "немагчыма перанакіраваць стандартны вывад памылак" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:32 +#: src/nproc.c:33 msgid "Giuseppe Scrivano" msgstr "" -#: src/nproc.c:56 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 +#: src/nproc.c:57 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Выкарыстаньне: %s [ПАРАМЭТАР]...\n" -#: src/nproc.c:57 +#: src/nproc.c:58 msgid "" "Print the number of processing units available to the current process,\n" "which may be less than the number of online processors\n" "\n" msgstr "" -#: src/nproc.c:62 +#: src/nproc.c:63 msgid "" " --all print the number of installed processors\n" " --ignore=N if possible, exclude N processing units\n" msgstr "" -#: src/nproc.c:106 +#: src/nproc.c:107 #, fuzzy, c-format msgid "%s: invalid number to ignore" msgstr "%s: нерэчаісная колькасьць радкоў" +#. This is a proper name. See the gettext manual, section Names. +#: src/numfmt.c:35 +msgid "Assaf Gordon" +msgstr "" + +#: src/numfmt.c:676 +#, fuzzy, c-format +msgid "value too large to be converted: '%s'" +msgstr "%s: значэньне цалка не пераўтворана" + +#: src/numfmt.c:680 +#, fuzzy, c-format +msgid "invalid number: '%s'" +msgstr "нерэчаісны нумар %s" + +#: src/numfmt.c:684 +#, c-format +msgid "rejecting suffix in input: '%s' (consider using --from)" +msgstr "" + +#: src/numfmt.c:688 +#, fuzzy, c-format +msgid "invalid suffix in input: '%s'" +msgstr "кепскі цэлы довад %s" + +#: src/numfmt.c:692 +#, c-format +msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)" +msgstr "" + +#: src/numfmt.c:723 +#, fuzzy, c-format +msgid "failed to prepare value '%Lf' for printing" +msgstr "%s: немагчыма адчыніць для запісу" + +#: src/numfmt.c:787 +#, fuzzy, c-format +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 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [NUMBER]...\n" +msgstr "Выкарыстаньне: %s [ВЫБАР]... [КАРЫСТАЛЬНІК]...\n" + +#: src/numfmt.c:816 +msgid "" +"Reformat NUMBER(s), or the numbers from standard input if none are " +"specified.\n" +msgstr "" + +#: src/numfmt.c:820 +msgid " --debug print warnings about invalid input\n" +msgstr "" + +#: src/numfmt.c:823 +msgid "" +" -d, --delimiter=X use X instead of whitespace for field delimiter\n" +msgstr "" + +#: src/numfmt.c:826 +msgid "" +" --field=N replace the number in input field N (default is 1)\n" +msgstr "" + +#: src/numfmt.c:829 +msgid "" +" --format=FORMAT use printf style floating-point FORMAT;\n" +" see FORMAT below for details\n" +msgstr "" + +#: src/numfmt.c:833 +msgid "" +" --from=UNIT auto-scale input numbers to UNITs; default is " +"'none';\n" +" see UNIT below\n" +msgstr "" + +#: src/numfmt.c:837 +msgid "" +" --from-unit=N specify the input unit size (instead of the default " +"1)\n" +msgstr "" + +#: src/numfmt.c:840 +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 "" + +#: src/numfmt.c:844 +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 +msgid "" +" --invalid=MODE failure mode for invalid numbers: MODE can be:\n" +" abort (default), fail, warn, ignore\n" +msgstr "" + +#: src/numfmt.c:852 +msgid "" +" --padding=N pad the output to N characters; positive N will\n" +" right-align; negative N will left-align;\n" +" padding is ignored if the output is wider than N;\n" +" the default is to automatically pad if a " +"whitespace\n" +" is found\n" +msgstr "" + +#: src/numfmt.c:859 +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 +msgid "" +" --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" +" SUFFIX in input numbers\n" +msgstr "" + +#: src/numfmt.c:867 +msgid "" +" --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" +msgstr "" + +#: src/numfmt.c:870 +msgid "" +" --to-unit=N the output unit size (instead of the default 1)\n" +msgstr "" + +#: src/numfmt.c:877 +#, fuzzy +msgid "" +"\n" +"UNIT options:\n" +msgstr "" +"Парамэтры ўпарадкаваньня:\n" +"\n" + +#: src/numfmt.c:880 +msgid " none no auto-scaling is done; suffixes will trigger an error\n" +msgstr "" + +#: src/numfmt.c:883 +msgid "" +" auto accept optional single/two letter suffix:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" +msgstr "" + +#: src/numfmt.c:889 +msgid "" +" si accept optional single letter suffix:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:894 +msgid "" +" iec accept optional single letter suffix:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:899 +msgid "" +" iec-i accept optional two-letter suffix:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:905 +#, 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" +msgstr "" + +#: src/numfmt.c:912 +#, c-format +msgid "" +"\n" +"Exit status is 0 if all input numbers were successfully converted.\n" +"By default, %s will stop at the first conversion error with exit status 2.\n" +"With --invalid='fail' a warning is printed for each conversion error\n" +"and the exit status is 2. With --invalid='warn' each conversion error is\n" +"diagnosed, but the exit status is 0. With --invalid='ignore' conversion\n" +"errors are not diagnosed and the exit status is 0.\n" +msgstr "" + +#: src/numfmt.c:921 +#, c-format +msgid "" +"\n" +"Examples:\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" +msgstr "" + +#: src/numfmt.c:974 src/seq.c:212 +#, fuzzy, c-format +msgid "format %s has no %% directive" +msgstr "згаданая мэта %s не з'яўляецца тэчкай" + +#: src/numfmt.c:990 +#, fuzzy, c-format +msgid "invalid format %s (width overflow)" +msgstr "недзеяздольны фармат шырыні" + +#: src/numfmt.c:1007 src/seq.c:229 +#, c-format +msgid "format %s ends in %%" +msgstr "" + +#: src/numfmt.c:1010 +#, c-format +msgid "invalid format %s, directive must be %%['][-][N]f" +msgstr "" + +#: src/numfmt.c:1018 src/seq.c:236 +#, 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 "кепскі цэлы довад %s" + +#: src/numfmt.c:1092 +#, c-format +msgid "value too large to be printed: '%Lg' (consider using --to)" +msgstr "" + +#: src/numfmt.c:1100 +#, c-format +msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" +msgstr "" + +#: src/numfmt.c:1184 +#, c-format +msgid "large input value '%s': possible precision loss" +msgstr "" + +#: src/numfmt.c:1293 +#, 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 "Недзеяздольны прамежак старонак %s" + +#: src/numfmt.c:1401 +#, fuzzy, c-format +msgid "invalid field value '%s'" +msgstr "недзеяздольны нумар поля: %s" + +#: src/numfmt.c:1430 +#, fuzzy, c-format +msgid "invalid header value '%s'" +msgstr "нерэчаісная дата %s" + +#: src/numfmt.c:1456 +#, 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 +#, fuzzy, c-format +msgid "no conversion option specified" +msgstr "заданыя шматлікія файлы вываду" + +#: src/numfmt.c:1471 +#, fuzzy, c-format +msgid "grouping cannot be combined with --to" +msgstr "Файлавыя апэранбы ня могуць быць аб'яднаны з --print-database (-p)." + +#: src/numfmt.c:1473 +#, c-format +msgid "grouping has no effect in this locale" +msgstr "" + +#: src/numfmt.c:1486 +#, c-format +msgid "--header ignored with command-line input" +msgstr "" + +#: src/numfmt.c:1511 +#, fuzzy, c-format +msgid "error reading input" +msgstr "памылка чытаньня %s" + +#: src/numfmt.c:1520 +#, fuzzy, c-format +msgid "failed to convert some of the input numbers" +msgstr "немагчыма перанакіраваць стандартны вывад памылак" + #: src/od.c:294 #, fuzzy, c-format msgid "" @@ -6097,29 +6469,39 @@ msgid "" msgstr "" #: src/od.c:307 -msgid "All arguments to long options are mandatory for short options.\n" -msgstr "Усе довады для доўгіх выбараў абавязковы й для кароткіх.\n" +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" +"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" +"at first byte printed, incremented when dump is progressing.\n" +"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 "" -#: src/od.c:310 +#: src/od.c:318 msgid "" -" -A, --address-radix=RADIX decide how file offsets are printed\n" +" -A, --address-radix=RADIX output format for file offsets. RADIX is one\n" +" of [doxn], for Decimal, Octal, Hex or None\n" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" -#: src/od.c:314 +#: src/od.c:323 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" -" --traditional accept arguments in traditional form\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:324 +#: src/od.c:336 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" @@ -6127,7 +6509,7 @@ msgid "" " -d same as -t u2, select unsigned decimal 2-byte units\n" msgstr "" -#: src/od.c:332 +#: src/od.c:345 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -6137,27 +6519,16 @@ msgid "" " -x same as -t x2, select hexadecimal 2-byte units\n" msgstr "" -#: src/od.c:340 +#: src/od.c:353 msgid "" "\n" -"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" -"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" -"at first byte printed, incremented when dump is progressing.\n" -"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 "" - -#: src/od.c:349 -msgid "" "\n" "TYPE is made up of one or more of these specifications:\n" -"\n" " a named character, ignoring high-order bit\n" " c ASCII character or backslash escape\n" msgstr "" -#: src/od.c:356 +#: src/od.c:360 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -6166,40 +6537,48 @@ msgid "" " x[SIZE] hexadecimal, SIZE bytes per integer\n" msgstr "" -#: src/od.c:363 +#: src/od.c:367 msgid "" "\n" -"SIZE is a number. For TYPE in doux, SIZE may also be C for\n" +"SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" "sizeof(char), S for sizeof(short), I for sizeof(int) or L for\n" "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 "" -#: src/od.c:370 +#: src/od.c:374 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" +"Adding a z suffix to any type displays printable characters at the end of\n" +"each output line.\n" msgstr "" -#: src/od.c:380 +#: src/od.c:379 +#, 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" +"\n" +"\n" +"BYTES is hex with 0x or 0X prefix, and may have a multiplier suffix:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"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" -#: src/od.c:633 src/od.c:753 +#: src/od.c:639 src/od.c:759 #, c-format msgid "invalid type string %s" msgstr "недзеяздольны радок тыпу %s" -#: src/od.c:643 +#: src/od.c:649 #, fuzzy, c-format msgid "" "invalid type string %s;\n" @@ -6208,7 +6587,7 @@ msgstr "" "нерэчаісны від радка \"%s\";\n" "сыстэма не прадастаўляе %lu-байтны цэлы тып" -#: src/od.c:764 +#: src/od.c:770 #, fuzzy, c-format msgid "" "invalid type string %s;\n" @@ -6217,36 +6596,36 @@ msgstr "" "нерэчаісны від радка \"%s\";\n" "сыстэма не прадастаўляе %lu-байтны цэлы тып" -#: src/od.c:822 +#: src/od.c:828 #, fuzzy, c-format msgid "invalid character '%c' in type string %s" msgstr "нерэчаісны знак \"%c\" у радку тыпу \"%s\"" -#: src/od.c:1047 +#: src/od.c:1053 #, c-format msgid "cannot skip past end of combined input" msgstr "" -#: src/od.c:1603 +#: src/od.c:1609 #, c-format msgid "invalid output address radix '%c'; it must be one character from [doxn]" msgstr "" -#: src/od.c:1729 +#: src/od.c:1735 #, c-format msgid "no type may be specified when dumping strings" msgstr "" -#: src/od.c:1804 +#: src/od.c:1810 msgid "compatibility mode supports at most one file" msgstr "" -#: src/od.c:1825 +#: src/od.c:1831 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "" -#: src/od.c:1868 +#: src/od.c:1874 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "Увага! Нерэчаісная шырыня %lu; выкарыстоўвайце %d замест яе" @@ -6262,20 +6641,23 @@ msgid "standard input is closed" 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" -"\n" msgstr "" +"Запісвае кожны ФАЙЛ ў стандартны вывад з апошняга па першы радок.\n" +"Калі ФАЙЛ не зададзне альбо зададзены -, чытае стандартны ўвод.\n" +"\n" -#: src/paste.c:448 +#: 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 "" -#: src/paste.c:509 +#: src/paste.c:508 #, c-format msgid "delimiter list ends with an unescaped backslash: %s" msgstr "" @@ -6330,80 +6712,80 @@ msgid "Kaveh Ghazi" msgstr "" #. TRANSLATORS: Real name is unknown; at most 19 characters. -#: src/pinky.c:250 +#: src/pinky.c:242 msgid " ???" msgstr "" #. TRANSLATORS: Idle time is unknown; at most 5 characters. -#: src/pinky.c:274 +#: src/pinky.c:266 msgid "?????" msgstr "" -#: src/pinky.c:323 +#: src/pinky.c:314 #, c-format msgid "Login name: " msgstr "Уліковае ймя:" -#: src/pinky.c:326 +#: src/pinky.c:317 #, c-format msgid "In real life: " msgstr "У сапраўднасьці:" #. TRANSLATORS: Real name is unknown; no hard limit. -#: src/pinky.c:330 +#: src/pinky.c:321 msgid "???\n" msgstr "???\n" -#: src/pinky.c:350 +#: src/pinky.c:341 #, c-format msgid "Directory: " msgstr "Тэчка: " -#: src/pinky.c:352 +#: src/pinky.c:343 #, c-format msgid "Shell: " msgstr "Абалонка:" -#: src/pinky.c:371 +#: src/pinky.c:362 #, c-format msgid "Project: " msgstr "Пражэкт:" -#: src/pinky.c:395 +#: src/pinky.c:386 #, c-format msgid "Plan:\n" msgstr "Плян:\n" -#: src/pinky.c:414 +#: src/pinky.c:405 msgid "Login" msgstr "Імя" -#: src/pinky.c:416 +#: src/pinky.c:407 msgid "Name" msgstr "Назва" -#: src/pinky.c:417 +#: src/pinky.c:408 msgid " TTY" msgstr " Тэрмінал" -#: src/pinky.c:419 +#: src/pinky.c:410 msgid "Idle" msgstr "Дарэмна" -#: src/pinky.c:420 +#: src/pinky.c:411 msgid "When" msgstr "Калі" -#: src/pinky.c:423 +#: src/pinky.c:414 msgid "Where" msgstr "Дзе" -#: src/pinky.c:502 +#: src/pinky.c:493 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Выкарыстаньне: %s [ВЫБАР]... [КАРЫСТАЛЬНІК]...\n" -#: src/pinky.c:503 +#: src/pinky.c:494 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -6413,7 +6795,7 @@ msgid "" " -s do short format output, this is the default\n" msgstr "" -#: src/pinky.c:511 +#: src/pinky.c:502 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -6422,7 +6804,7 @@ msgid "" " in short format\n" msgstr "" -#: src/pinky.c:520 +#: src/pinky.c:511 #, fuzzy, c-format msgid "" "\n" @@ -6433,7 +6815,7 @@ msgstr "" "Спрошчаная праграма \"finger\"; друкуе зьвесткі пра карыстальніка.\n" "Файлам utmp будзе %s.\n" -#: src/pinky.c:604 +#: src/pinky.c:595 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "" @@ -6448,85 +6830,84 @@ msgstr "" msgid "Roland Huebner" msgstr "" -#: src/pr.c:912 +#: src/pr.c:908 #, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "" -#: src/pr.c:914 +#: src/pr.c:910 #, fuzzy, c-format msgid "invalid page range %s" msgstr "Недзеяздольны прамежак старонак %s" -#: src/pr.c:979 +#: src/pr.c:975 #, fuzzy, c-format msgid "'-l PAGE_LENGTH' invalid number of lines: %s" msgstr "\"-W ШЫРЫНЯ_СТАРОНКІ\" нерэчаісная колькасьць знакаў: %s" -#: src/pr.c:1003 +#: src/pr.c:999 #, fuzzy, c-format msgid "'-N NUMBER' invalid starting line number: %s" msgstr "нерэчаісны нумар пачатковага радка: %s" -#: src/pr.c:1015 +#: src/pr.c:1011 #, fuzzy, c-format msgid "'-o MARGIN' invalid line offset: %s" msgstr "незразумелая шырыня радка: %s" -#: src/pr.c:1056 +#: src/pr.c:1052 #, fuzzy, c-format msgid "'-w PAGE_WIDTH' invalid number of characters: %s" msgstr "\"-w ШЫРЫНЯ_СТАРОНКІ\" нерэчаісная колькасьць знакаў: %s" -#: src/pr.c:1070 +#: src/pr.c:1066 #, fuzzy, c-format msgid "'-W PAGE_WIDTH' invalid number of characters: %s" msgstr "\"-W ШЫРЫНЯ_СТАРОНКІ\" нерэчаісная колькасьць знакаў: %s" -#: src/pr.c:1100 +#: src/pr.c:1096 #, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "" -#: src/pr.c:1104 +#: src/pr.c:1100 #, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "" -#: src/pr.c:1200 +#: src/pr.c:1196 #, fuzzy, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "\"-%c\" дадатковыя знаці ці нерэчаісны нумар у довадзе: \"%s\"" -#: src/pr.c:1304 +#: src/pr.c:1293 #, c-format msgid "page width too narrow" msgstr "шырыня старонкі занадта вузкая" -#: src/pr.c:2369 +#: src/pr.c:2353 #, c-format msgid "starting page number %<PRIuMAX> exceeds page count %<PRIuMAX>" msgstr "" -#: src/pr.c:2396 +#: src/pr.c:2380 #, fuzzy, c-format msgid "page number overflow" msgstr "перапаўненьне колькасьці радкоў" -#: src/pr.c:2401 +#: src/pr.c:2385 #, c-format msgid "Page %<PRIuMAX>" msgstr "" -#: src/pr.c:2773 -msgid "" -"Paginate or columnate FILE(s) for printing.\n" -"\n" +#: src/pr.c:2757 +#, fuzzy +msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" " Падзяляе файл(ы) на старонкі ці слупкі для друку.\n" "\n" -#: src/pr.c:2780 +#: src/pr.c:2763 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -6536,7 +6917,7 @@ msgid "" " columns on each page\n" msgstr "" -#: src/pr.c:2788 +#: src/pr.c:2771 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -6546,7 +6927,7 @@ msgid "" " double space the output\n" msgstr "" -#: src/pr.c:2796 +#: src/pr.c:2779 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -6558,7 +6939,7 @@ msgid "" " and trailer without -F)\n" msgstr "" -#: src/pr.c:2806 +#: src/pr.c:2789 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -6571,7 +6952,7 @@ msgid "" " alignment, --sep-string[=STRING] sets separators\n" msgstr "" -#: src/pr.c:2815 +#: src/pr.c:2798 msgid "" " -l, --length=PAGE_LENGTH\n" " set the page length to PAGE_LENGTH (66) lines\n" @@ -6580,7 +6961,7 @@ msgid "" " truncate lines, but join lines of full length with -J\n" msgstr "" -#: src/pr.c:2822 +#: src/pr.c:2805 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -6590,7 +6971,7 @@ msgid "" " page printed (see +FIRST_PAGE)\n" msgstr "" -#: src/pr.c:2830 +#: src/pr.c:2813 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -6599,7 +6980,7 @@ msgid "" " omit warning when a file cannot be opened\n" msgstr "" -#: src/pr.c:2837 +#: src/pr.c:2820 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -6609,7 +6990,7 @@ msgid "" " options (-COLUMN|-a -COLUMN|-m) except -w is set\n" msgstr "" -#: src/pr.c:2844 +#: src/pr.c:2827 msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" @@ -6619,7 +7000,7 @@ msgid "" " -t, --omit-header omit page headers and trailers\n" msgstr "" -#: src/pr.c:2851 +#: src/pr.c:2834 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -6633,7 +7014,7 @@ msgid "" "(72)\n" msgstr "" -#: src/pr.c:2861 +#: src/pr.c:2844 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -6642,7 +7023,7 @@ msgid "" " with -S or -s\n" msgstr "" -#: src/pr.c:2869 +#: src/pr.c:2852 #, fuzzy msgid "" "\n" @@ -6787,17 +7168,16 @@ msgstr "" msgid "" "Output a permuted index, including context, of the words in the input " "files.\n" -"\n" msgstr "" -#: src/ptx.c:1828 +#: src/ptx.c:1827 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:1833 +#: src/ptx.c:1832 msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" " -O, --format=roff generate output as roff directives\n" @@ -6806,7 +7186,7 @@ msgid "" " -T, --format=tex generate output as TeX directives\n" msgstr "" -#: src/ptx.c:1840 +#: src/ptx.c:1839 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -6816,7 +7196,7 @@ msgid "" " -o, --only-file=FILE read only word list from this FILE\n" msgstr "" -#: src/ptx.c:1848 +#: src/ptx.c:1847 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -6824,7 +7204,7 @@ msgid "" "excluded\n" msgstr "" -#: src/ptx.c:1855 +#: src/ptx.c:1854 #, fuzzy msgid "" "\n" @@ -6833,7 +7213,7 @@ msgstr "" "\n" "Калі ФАЙЛ не зададзены альбо зададзены -, чытае стандартны ўвод.\n" -#: src/ptx.c:1949 +#: src/ptx.c:1948 #, c-format msgid "invalid gap width: %s" msgstr "нерэчаісная шырыня прамежку: %s" @@ -6857,7 +7237,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "збой chdir у %s" -#: src/pwd.c:170 src/pwd.c:277 +#: src/pwd.c:170 src/pwd.c:277 src/split.c:373 #, c-format msgid "failed to stat %s" msgstr "збой stat %s" @@ -6873,14 +7253,15 @@ msgid "ignoring non-option arguments" msgstr "незаўважаюцца довады, якія не зьўляюцца выбарамі" #. This is a proper name. See the gettext manual, section Names. -#: src/readlink.c:33 +#: src/readlink.c:32 msgid "Dmitry V. Levin" msgstr "" -#: src/readlink.c:62 +#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147 +#: src/stat.c:1349 src/touch.c:212 #, c-format -msgid "Usage: %s [OPTION]... FILE\n" -msgstr "Выкарыстаньне: %s [ВЫБАР]... ФАЙЛ\n" +msgid "Usage: %s [OPTION]... FILE...\n" +msgstr "Выкарыстаньне: %s [ВЫБАР]... ФАЙЛ...\n" #: src/readlink.c:63 #, fuzzy @@ -6910,17 +7291,18 @@ msgid "" "recursively,\n" " without requirements on components " "existence\n" -" -n, --no-newline do not output the trailing newline\n" +" -n, --no-newline do not output the trailing delimiter\n" " -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" msgstr "" -#: src/realpath.c:71 src/rm.c:134 src/shred.c:147 src/stat.c:1330 -#: src/touch.c:215 -#, c-format -msgid "Usage: %s [OPTION]... FILE...\n" -msgstr "Выкарыстаньне: %s [ВЫБАР]... ФАЙЛ...\n" +#: src/readlink.c:152 +#, fuzzy, c-format +msgid "ignoring --no-newline with multiple arguments" +msgstr "незаўважаюцца довады, якія не зьўляюцца выбарамі" #: src/realpath.c:72 msgid "" @@ -6947,12 +7329,12 @@ msgstr "" msgid "generating relative path" msgstr "" -#: src/remove.c:286 +#: src/remove.c:273 #, c-format msgid "%s: descend into write-protected directory %s? " msgstr "" -#: src/remove.c:287 +#: src/remove.c:274 #, c-format msgid "%s: descend into directory %s? " msgstr "" @@ -6961,49 +7343,49 @@ msgstr "" #. translate "%s: remove %s (write-protected) %s? " #. instead. It should avoid grammatical problems #. with the output of file_type. -#: src/remove.c:303 +#: src/remove.c:290 #, c-format msgid "%s: remove write-protected %s %s? " msgstr "%s: выдаліць абаронены ад запісу %s %s? " -#: src/remove.c:304 +#: src/remove.c:291 #, c-format msgid "%s: remove %s %s? " msgstr "%s: выдаліць %s %s? " -#: src/remove.c:417 +#: src/remove.c:374 #, c-format msgid "removed directory: %s\n" msgstr "тэчка выдалена: %s\n" -#: src/remove.c:481 +#: src/remove.c:444 #, fuzzy, c-format msgid "cannot remove directory: %s" msgstr "немагчыма выдаліць тэчку %s" -#: src/remove.c:537 +#: src/remove.c:500 #, c-format msgid "skipping %s, since it's on a different device" msgstr "" -#: src/remove.c:557 +#: src/remove.c:520 #, fuzzy, c-format msgid "traversal failed: %s" msgstr "памылка чытаньня" -#: src/remove.c:563 +#: src/remove.c:526 #, c-format msgid "" "unexpected failure: fts_info=%d: %s\n" "please report to %s" msgstr "" -#: src/rm.c:118 +#: src/rm.c:119 #, c-format msgid "Try '%s ./%s' to remove the file %s.\n" msgstr "" -#: src/rm.c:135 +#: src/rm.c:136 msgid "" "Remove (unlink) the FILE(s).\n" "\n" @@ -7012,7 +7394,7 @@ msgid "" " -i prompt before every removal\n" msgstr "" -#: src/rm.c:141 +#: src/rm.c:142 msgid "" " -I prompt once before removing more than three files, " "or\n" @@ -7024,22 +7406,23 @@ msgid "" " always (-i). Without WHEN, prompt always\n" msgstr "" -#: src/rm.c:148 +#: src/rm.c:149 msgid "" " --one-file-system when removing a hierarchy recursively, skip any\n" " directory that is on a file system different from\n" " that of the corresponding command line argument\n" msgstr "" -#: src/rm.c:153 +#: src/rm.c:154 msgid "" " --no-preserve-root do not treat '/' specially\n" " --preserve-root do not remove '/' (default)\n" " -r, -R, --recursive remove directories and their contents recursively\n" +" -d, --dir remove empty directories\n" " -v, --verbose explain what is being done\n" msgstr "" -#: src/rm.c:161 +#: src/rm.c:163 msgid "" "\n" "By default, rm does not remove directories. Use the --recursive (-r or -R)\n" @@ -7047,7 +7430,7 @@ msgid "" "contents.\n" msgstr "" -#: src/rm.c:166 +#: src/rm.c:168 #, fuzzy, c-format msgid "" "\n" @@ -7064,7 +7447,7 @@ msgstr "" "\n" " %s ./-foo\n" -#: src/rm.c:175 +#: src/rm.c:177 #, fuzzy msgid "" "\n" @@ -7078,12 +7461,12 @@ msgstr "" "ўпэўненасьці, што зьмест фала нельга аднавіць, разгледзьце выкарыстаньне " "shred.\n" -#: src/rm.c:335 +#: src/rm.c:342 #, c-format msgid "%s: remove all arguments recursively? " msgstr "" -#: src/rm.c:336 +#: src/rm.c:343 #, fuzzy, c-format msgid "%s: remove all arguments? " msgstr "%s: выдаліць %s %s? " @@ -7131,7 +7514,10 @@ msgstr "" msgid "" "Run a program in a different security context.\n" "With neither CONTEXT nor COMMAND, print the current security context.\n" -"\n" +msgstr "" + +#: src/runcon.c:94 +msgid "" " CONTEXT Complete security context\n" " -c, --compute compute process transition context before modifying\n" " -t, --type=TYPE type (for same role as parent)\n" @@ -7141,72 +7527,72 @@ msgid "" "\n" msgstr "" -#: src/runcon.c:140 +#: src/runcon.c:144 #, c-format msgid "multiple roles" msgstr "" -#: src/runcon.c:145 +#: src/runcon.c:149 #, c-format msgid "multiple types" msgstr "" -#: src/runcon.c:150 +#: src/runcon.c:154 #, c-format msgid "multiple users" msgstr "" -#: src/runcon.c:155 +#: src/runcon.c:159 #, c-format msgid "multiple levelranges" msgstr "" -#: src/runcon.c:173 src/runcon.c:209 +#: src/runcon.c:177 src/runcon.c:213 #, fuzzy, c-format msgid "failed to get current context" msgstr "немагчыма атрымаць атрыбуты %s" -#: src/runcon.c:183 +#: src/runcon.c:187 #, c-format msgid "you must specify -c, -t, -u, -l, -r, or context" msgstr "" -#: src/runcon.c:191 +#: src/runcon.c:195 #, fuzzy, c-format msgid "no command specified" msgstr "незаданы ID працэсу" -#: src/runcon.c:197 +#: src/runcon.c:201 #, c-format msgid "%s may be used only on a SELinux kernel" msgstr "" -#: src/runcon.c:223 +#: src/runcon.c:227 #, fuzzy, c-format msgid "failed to compute a new context" msgstr "немагчыма адчыніць %s" -#: src/runcon.c:237 +#: src/runcon.c:241 #, fuzzy, c-format msgid "failed to set new user %s" msgstr "збой stat %s" -#: src/runcon.c:239 +#: src/runcon.c:243 #, fuzzy, c-format msgid "failed to set new type %s" msgstr "збой stat %s" -#: src/runcon.c:241 +#: src/runcon.c:245 #, fuzzy, c-format msgid "failed to set new range %s" msgstr "збой stat %s" -#: src/runcon.c:243 +#: src/runcon.c:247 #, fuzzy, c-format msgid "failed to set new role %s" msgstr "збой stat %s" -#: src/runcon.c:251 +#: src/runcon.c:255 #, c-format msgid "unable to set security context %s" msgstr "" @@ -7223,15 +7609,17 @@ msgstr "" " ці: %s [ВЫБАР]... ПЕРШЫ ПРЫРОСТ АПОШНІ\n" #: src/seq.c:73 +msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" +msgstr "" + +#: src/seq.c:79 msgid "" -"Print numbers from FIRST to LAST, in steps of INCREMENT.\n" -"\n" " -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 "" -#: src/seq.c:82 +#: src/seq.c:86 msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" @@ -7241,39 +7629,24 @@ msgid "" "INCREMENT is usually negative if FIRST is greater than LAST.\n" msgstr "" -#: src/seq.c:90 +#: src/seq.c:94 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:136 +#: src/seq.c:140 #, c-format msgid "invalid floating point argument: %s" msgstr "" -#: src/seq.c:193 -#, fuzzy, c-format -msgid "format %s has no %% directive" -msgstr "згаданая мэта %s не з'яўляецца тэчкай" - -#: src/seq.c:210 -#, c-format -msgid "format %s ends in %%" -msgstr "" - -#: src/seq.c:213 +#: src/seq.c:232 #, fuzzy, c-format msgid "format %s has unknown %%%c directive" msgstr "%s мае невядомы від файлу" -#: src/seq.c:217 -#, c-format -msgid "format %s has too many %% directives" -msgstr "" - -#: src/seq.c:431 +#: src/seq.c:555 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" @@ -7305,27 +7678,27 @@ msgid "" " (if specified) supplemental group IDs to GID1, ...\n" msgstr "" -#: src/setuidgid.c:163 +#: src/setuidgid.c:162 #, c-format msgid "unknown user-ID: %s" msgstr "невядомы ID карыстальніка: %s" -#: src/setuidgid.c:174 +#: src/setuidgid.c:173 #, c-format msgid "to use user-ID %s you need to use -g too" msgstr "" -#: src/setuidgid.c:191 +#: src/setuidgid.c:190 #, fuzzy, c-format msgid "failed to set supplemental group(s)" msgstr "немагчыма ўсталяваць дадатковую групу" -#: src/setuidgid.c:201 +#: src/setuidgid.c:200 #, c-format msgid "cannot set group-ID to %lu" msgstr "немагчыма задаць ID групы для %lu" -#: src/setuidgid.c:205 +#: src/setuidgid.c:204 #, c-format msgid "cannot set user-ID to %lu" msgstr "немагчыма выставіць ID карыстальніка ў %lu" @@ -7339,10 +7712,9 @@ msgstr "" 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" -"\n" msgstr "" -#: src/shred.c:156 +#: src/shred.c:155 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -7351,7 +7723,7 @@ msgid "" " -s, --size=N shred this many bytes (suffixes like K, M, G accepted)\n" msgstr "" -#: src/shred.c:162 +#: src/shred.c:161 msgid "" " -u, --remove truncate and remove file after overwriting\n" " -v, --verbose show progress\n" @@ -7360,7 +7732,7 @@ msgid "" " -z, --zero add a final overwrite with zeros to hide shredding\n" msgstr "" -#: src/shred.c:171 +#: src/shred.c:170 msgid "" "\n" "If FILE is -, shred standard output.\n" @@ -7372,7 +7744,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:181 +#: src/shred.c:180 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" @@ -7383,7 +7755,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:189 +#: src/shred.c:188 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -7395,7 +7767,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:199 +#: src/shred.c:198 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -7404,7 +7776,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:206 +#: src/shred.c:205 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" @@ -7416,129 +7788,129 @@ msgid "" "\n" msgstr "" -#: src/shred.c:216 +#: src/shred.c:215 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:296 +#: src/shred.c:295 #, c-format msgid "%s: fdatasync failed" msgstr "%s: збой fdatasync" -#: src/shred.c:307 +#: src/shred.c:306 #, c-format msgid "%s: fsync failed" msgstr "%s: збой fsync" -#: src/shred.c:384 +#: src/shred.c:383 #, c-format msgid "%s: cannot rewind" msgstr "" -#: src/shred.c:403 +#: src/shred.c:402 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: праход %lu/%lu (%s)..." -#: src/shred.c:453 +#: src/shred.c:452 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: памылка запісу ля водступа %s" -#: src/shred.c:471 +#: src/shred.c:470 #, c-format msgid "%s: lseek failed" msgstr "%s: збой lseek" -#: src/shred.c:482 +#: src/shred.c:481 #, c-format msgid "%s: file too large" msgstr "%s: файл занадта вялікі" -#: src/shred.c:505 +#: src/shred.c:504 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: праход %lu/%lu (%s)...%s" -#: src/shred.c:521 +#: src/shred.c:520 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "" -#: src/shred.c:768 +#: src/shred.c:767 #, c-format msgid "%s: fstat failed" msgstr "%s: збой fstat" -#: src/shred.c:779 +#: src/shred.c:778 #, c-format msgid "%s: invalid file type" msgstr "%s: нерэчаісны від файла" -#: src/shred.c:798 +#: src/shred.c:797 #, c-format msgid "%s: file has negative size" msgstr "%s: файл мае адмоўны памер" -#: src/shred.c:865 +#: src/shred.c:864 src/sort.c:932 src/split.c:378 #, c-format msgid "%s: error truncating" msgstr "%s: памылка абрэзаньня" -#: src/shred.c:881 +#: src/shred.c:880 #, c-format msgid "%s: fcntl failed" msgstr "%s: збой fcntl" -#: src/shred.c:886 +#: src/shred.c:885 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "" -#: src/shred.c:968 +#: src/shred.c:967 #, c-format msgid "%s: removing" msgstr "%s: выдаленьне" -#: src/shred.c:992 +#: src/shred.c:991 #, c-format msgid "%s: renamed to %s" msgstr "%s: перайменаваны ў %s" -#: src/shred.c:1014 +#: src/shred.c:1013 #, c-format msgid "%s: failed to remove" msgstr "%s: немагчыма выдаліць" -#: src/shred.c:1018 +#: src/shred.c:1017 #, c-format msgid "%s: removed" msgstr "%s: выдален" -#: src/shred.c:1025 src/shred.c:1068 +#: src/shred.c:1024 src/shred.c:1067 #, c-format msgid "%s: failed to close" msgstr "%s: немагчыма зачыніць" -#: src/shred.c:1061 +#: src/shred.c:1060 #, c-format msgid "%s: failed to open for writing" msgstr "%s: немагчыма адчыніць для запісу" -#: src/shred.c:1126 +#: src/shred.c:1125 #, c-format msgid "%s: invalid number of passes" msgstr "%s: незразумелая колькасьць праходаў" -#: src/shred.c:1135 src/shuf.c:291 src/sort.c:4387 +#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441 #, fuzzy, c-format msgid "multiple random sources specified" msgstr "зададзены некалькі фарматаў вываду" -#: src/shred.c:1149 +#: src/shred.c:1148 #, c-format msgid "%s: invalid file size" msgstr "%s: нерэчаісны памер файла" @@ -7556,14 +7928,12 @@ msgstr "" #: src/shuf.c:54 #, fuzzy -msgid "" -"Write a random permutation of the input lines to standard output.\n" -"\n" +msgid "Write a random permutation of the input lines to standard output.\n" msgstr "" "Запісвае зьвяз упарадкаваных ФАЙЛаў на стандартны вывад.\n" "\n" -#: src/shuf.c:61 +#: src/shuf.c:60 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 " @@ -7574,27 +7944,27 @@ msgid "" " -z, --zero-terminated end lines with 0 byte, not newline\n" msgstr "" -#: src/shuf.c:245 +#: src/shuf.c:244 #, fuzzy, c-format msgid "multiple -i options specified" msgstr "заданыя шматлікія файлы вываду" -#: src/shuf.c:265 +#: src/shuf.c:264 #, fuzzy, c-format msgid "invalid input range %s" msgstr "нерэчаісны сьцяг уводу: %s" -#: src/shuf.c:278 +#: src/shuf.c:277 #, fuzzy, c-format msgid "invalid line count %s" msgstr "незразумелая шырыня радка: %s" -#: src/shuf.c:285 src/sort.c:4381 +#: src/shuf.c:284 src/sort.c:4435 #, c-format msgid "multiple output files specified" msgstr "заданыя шматлікія файлы вываду" -#: src/shuf.c:311 +#: src/shuf.c:310 #, fuzzy, c-format msgid "cannot combine -e and -i options" msgstr "немагчыма сумясьціць рэжым і парамэтры --reference" @@ -7613,7 +7983,7 @@ msgid "" "\n" msgstr "" -#: src/sleep.c:135 src/timeout.c:295 +#: src/sleep.c:135 src/timeout.c:320 #, c-format msgid "invalid time interval %s" msgstr "нерэчаісны адрэзак часу %s" @@ -7623,15 +7993,14 @@ msgstr "нерэчаісны адрэзак часу %s" msgid "cannot read realtime clock" msgstr "немагчыма прачытаць гадзіньнік рэальнага часу" -#: src/sort.c:395 -msgid "" -"Write sorted concatenation of all FILE(s) to standard output.\n" -"\n" +#: src/sort.c:399 +#, fuzzy +msgid "Write sorted concatenation of all FILE(s) to standard output.\n" msgstr "" "Запісвае зьвяз упарадкаваных ФАЙЛаў на стандартны вывад.\n" "\n" -#: src/sort.c:402 +#: src/sort.c:405 msgid "" "Ordering options:\n" "\n" @@ -7639,7 +8008,7 @@ msgstr "" "Парамэтры ўпарадкаваньня:\n" "\n" -#: src/sort.c:406 +#: src/sort.c:409 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -7647,19 +8016,19 @@ msgid "" " -f, --ignore-case fold lower case to upper case characters\n" msgstr "" -#: src/sort.c:412 +#: src/sort.c:415 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:417 +#: src/sort.c:420 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" -#: src/sort.c:420 +#: src/sort.c:423 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -7667,7 +8036,7 @@ msgid "" " -r, --reverse reverse the result of comparisons\n" msgstr "" -#: src/sort.c:426 +#: src/sort.c:429 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -7677,7 +8046,7 @@ msgid "" "\n" msgstr "" -#: src/sort.c:434 +#: src/sort.c:437 #, fuzzy msgid "" "Other options:\n" @@ -7686,13 +8055,13 @@ msgstr "" "Парамэтры ўпарадкаваньня:\n" "\n" -#: src/sort.c:438 +#: src/sort.c:441 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" msgstr "" -#: src/sort.c:442 +#: src/sort.c:445 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 " @@ -7701,7 +8070,7 @@ msgid "" " decompress them with PROG -d\n" msgstr "" -#: src/sort.c:449 +#: src/sort.c:452 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -7710,13 +8079,13 @@ msgid "" " If F is - then read names from standard input\n" msgstr "" -#: src/sort.c:456 +#: src/sort.c:459 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:460 +#: src/sort.c:463 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -7724,7 +8093,7 @@ msgid "" " -S, --buffer-size=SIZE use SIZE for main memory buffer\n" msgstr "" -#: src/sort.c:466 +#: src/sort.c:469 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -7739,12 +8108,12 @@ msgid "" "run\n" msgstr "" -#: src/sort.c:475 +#: 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:480 +#: src/sort.c:483 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -7763,7 +8132,7 @@ msgid "" "SIZE may be followed by the following multiplicative suffixes:\n" msgstr "" -#: src/sort.c:493 +#: src/sort.c:496 msgid "" "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n" "\n" @@ -7775,133 +8144,133 @@ msgid "" "native byte values.\n" msgstr "" -#: src/sort.c:694 +#: src/sort.c:697 #, fuzzy, c-format msgid "waiting for %s [-d]" msgstr "запіс у %s" -#: src/sort.c:699 +#: src/sort.c:702 #, c-format msgid "%s [-d] terminated abnormally" msgstr "" -#: src/sort.c:853 +#: src/sort.c:856 #, fuzzy, c-format msgid "cannot create temporary file in %s" msgstr "немагчыма стварыць часовы файл %s" -#: src/sort.c:939 src/sort.c:2010 src/sort.c:3056 src/sort.c:3755 -#: src/sort.c:3758 +#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713 +#: src/sort.c:3804 src/sort.c:3807 msgid "open failed" msgstr "памылка адкрыцьця" -#: src/sort.c:959 +#: src/sort.c:970 msgid "fflush failed" msgstr "збой fflush" -#: src/sort.c:964 src/sort.c:2013 src/sort.c:4646 +#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706 msgid "close failed" msgstr "памылка закрыцьця" -#: src/sort.c:973 +#: src/sort.c:986 #, fuzzy, c-format msgid "dup2 failed" msgstr "памылка адкрыцьця" -#: src/sort.c:1090 +#: src/sort.c:1103 #, c-format msgid "couldn't execute %s" msgstr "" -#: src/sort.c:1097 +#: src/sort.c:1110 #, fuzzy msgid "couldn't create temporary file" msgstr "немагчыма стварыць часовы файл" -#: src/sort.c:1136 +#: src/sort.c:1149 #, fuzzy, c-format msgid "couldn't create process for %s -d" msgstr "немагчыма стварыць тэчку %s" -#: src/sort.c:1150 +#: src/sort.c:1161 #, c-format msgid "couldn't execute %s -d" msgstr "" -#: src/sort.c:1209 +#: src/sort.c:1220 #, c-format msgid "warning: cannot remove: %s" msgstr "увага: немагчыма выдаліць: %s" -#: src/sort.c:1295 +#: src/sort.c:1306 #, fuzzy, c-format msgid "invalid --%s argument %s" msgstr "нерэчаісны довад %s" -#: src/sort.c:1298 +#: src/sort.c:1309 #, fuzzy, c-format msgid "minimum --%s argument is %s" msgstr "неадназначны довад %s для %s" -#: src/sort.c:1313 +#: src/sort.c:1324 #, fuzzy, c-format msgid "--%s argument %s too large" msgstr "%s занадта вялікі" -#: src/sort.c:1316 +#: src/sort.c:1327 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "" -#: src/sort.c:1398 +#: src/sort.c:1409 #, c-format msgid "number in parallel must be nonzero" msgstr "" -#: src/sort.c:1479 +#: src/sort.c:1494 msgid "stat failed" msgstr "збой пачатку" -#: src/sort.c:1740 +#: src/sort.c:1755 msgid "read failed" msgstr "памылка чытаньня" -#: src/sort.c:2028 +#: src/sort.c:2043 #, fuzzy, c-format msgid "string transformation failed" msgstr "памылка параўнаньня радку" -#: src/sort.c:2031 +#: src/sort.c:2046 #, c-format msgid "the untransformed string was %s" msgstr "" -#: src/sort.c:2194 +#: src/sort.c:2209 #, c-format msgid "^ no match for key\n" msgstr "" -#: src/sort.c:2374 +#: src/sort.c:2389 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "" -#: src/sort.c:2380 +#: src/sort.c:2395 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "" -#: src/sort.c:2391 +#: src/sort.c:2406 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" -#: src/sort.c:2404 +#: src/sort.c:2419 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "" -#: src/sort.c:2436 +#: src/sort.c:2451 #, fuzzy, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" @@ -7909,130 +8278,134 @@ msgstr[0] "%s: выбар `%s' неадназначны\n" msgstr[1] "%s: выбар `%s' неадназначны\n" msgstr[2] "%s: выбар `%s' неадназначны\n" -#: src/sort.c:2442 +#: src/sort.c:2457 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "" -#: src/sort.c:2716 src/sort.c:2725 +#: src/sort.c:2731 src/sort.c:2740 msgid "write failed" msgstr "памылка запісу" -#: src/sort.c:2768 +#: src/sort.c:2783 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: бязладдзе: " -#: src/sort.c:2771 +#: src/sort.c:2786 msgid "standard error" msgstr "стандартны вывад памылак" -#: src/sort.c:3926 +#: src/sort.c:3698 +#, fuzzy +msgid "cannot read" +msgstr "немагчыма ўсталяваць дату" + +#: src/sort.c:3976 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: нерэчаіснае вызначэньне поля %s" -#: src/sort.c:3937 +#: src/sort.c:3987 #, fuzzy, c-format msgid "options '-%s' are incompatible" msgstr "%s: выбар `%s' неадназначны\n" -#: src/sort.c:3988 +#: src/sort.c:4038 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s: нерэчаісны падлік на пачатку %s" -#: src/sort.c:4245 +#: src/sort.c:4295 #, fuzzy msgid "invalid number after '-'" msgstr "нерэчаісная лічба пасьля \"-\"" -#: src/sort.c:4248 src/sort.c:4334 src/sort.c:4362 +#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416 #, fuzzy msgid "invalid number after '.'" msgstr "нерэчаісная лічба пасьля \".\"" -#: src/sort.c:4261 src/sort.c:4367 +#: src/sort.c:4315 src/sort.c:4421 msgid "stray character in field spec" msgstr "" -#: src/sort.c:4308 +#: src/sort.c:4362 #, fuzzy, c-format msgid "multiple compress programs specified" msgstr "зададзены некалькі фарматаў вываду" -#: src/sort.c:4325 +#: src/sort.c:4379 msgid "invalid number at field start" msgstr "" -#: src/sort.c:4329 src/sort.c:4357 +#: src/sort.c:4383 src/sort.c:4411 msgid "field number is zero" msgstr "" -#: src/sort.c:4338 +#: src/sort.c:4392 msgid "character offset is zero" msgstr "" -#: src/sort.c:4353 +#: src/sort.c:4407 #, fuzzy msgid "invalid number after ','" msgstr "нерэчаісная лічба пасьля \",\"" -#: src/sort.c:4403 +#: src/sort.c:4457 #, c-format msgid "empty tab" msgstr "пустая табуляцыя" -#: src/sort.c:4496 src/wc.c:692 +#: src/sort.c:4550 src/wc.c:692 #, c-format msgid "cannot read file names from %s" msgstr "немагчыма прачытаць назвы файлаў з %s" -#: src/sort.c:4518 +#: src/sort.c:4572 #, fuzzy, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "назва файла нулявой даўжыні" -#: src/sort.c:4524 +#: src/sort.c:4578 #, fuzzy, c-format msgid "no input from %s" msgstr "зачыняецца файл уводу %s" -#: src/sort.c:4570 +#: src/sort.c:4624 #, c-format msgid "using %s sorting rules" msgstr "" -#: src/sort.c:4573 +#: src/sort.c:4627 #, c-format msgid "using simple byte comparison" msgstr "" -#: src/sort.c:4604 +#: src/sort.c:4658 #, fuzzy, c-format msgid "extra operand %s not allowed with -%c" msgstr "непатрэбны аргумэнт %s" -#: src/split.c:184 +#: src/split.c:187 #, c-format msgid "the suffix length needs to be at least %zu" msgstr "" -#: src/split.c:201 +#: src/split.c:204 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" msgstr "Выкарыстаньне: %s [ВЫБАР] [УВОД [ПРЫСТАЎКА]]\n" -#: src/split.c:205 +#: src/split.c:208 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" -"\n" msgstr "" -#: src/split.c:214 +#: src/split.c:216 #, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" @@ -8051,13 +8424,13 @@ msgid "" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" -#: src/split.c:227 +#: src/split.c:229 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" msgstr "" -#: src/split.c:234 +#: src/split.c:236 msgid "" "\n" "CHUNKS may be:\n" @@ -8069,184 +8442,190 @@ msgid "" "r/K/N likewise but only output Kth of N to stdout\n" msgstr "" -#: src/split.c:352 +#: src/split.c:354 #, c-format msgid "output file suffixes exhausted" msgstr "" -#: src/split.c:364 +#: src/split.c:366 #, c-format msgid "creating file %s\n" msgstr "стварэньне файла %s\n" -#: src/split.c:377 +#: src/split.c:375 +#, c-format +msgid "%s would overwrite input; aborting" +msgstr "" + +#: src/split.c:391 #, fuzzy, c-format msgid "failed to set FILE environment variable" -msgstr "збой stat %s" +msgstr "" +"незаўважае незразумелы памер табуляцыі ў пераменнай асяродзьдзя TABSIZE: %s" -#: src/split.c:379 +#: src/split.c:393 #, c-format msgid "executing with FILE=%s\n" msgstr "" -#: src/split.c:381 +#: src/split.c:395 #, fuzzy, c-format msgid "failed to create pipe" -msgstr "немагчыма стварыць жорсткае лучыва %s на %s" +msgstr "збой stat %s" -#: src/split.c:395 +#: src/split.c:409 #, fuzzy, c-format msgid "closing prior pipe" msgstr "зачыняецца дырэкторыя %s" -#: src/split.c:397 +#: src/split.c:411 #, fuzzy, c-format msgid "closing output pipe" msgstr "закрываецца файл вываду %s" -#: src/split.c:401 +#: src/split.c:415 #, fuzzy, c-format msgid "moving input pipe" msgstr "зачыняецца файл уводу %s" -#: src/split.c:403 +#: src/split.c:417 #, fuzzy, c-format msgid "closing input pipe" msgstr "зачыняецца файл уводу %s" -#: src/split.c:408 +#: src/split.c:422 #, fuzzy, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "немагчыма выканаць загад %s" -#: src/split.c:414 +#: src/split.c:428 #, fuzzy, c-format msgid "failed to close input pipe" msgstr "%s: немагчыма зачыніць" -#: src/split.c:450 -#, fuzzy, c-format +#: src/split.c:464 +#, c-format msgid "waiting for child process" -msgstr "запіс у %s" +msgstr "" -#: src/split.c:460 +#: src/split.c:474 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "" -#: src/split.c:468 +#: src/split.c:482 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:475 src/timeout.c:449 +#: src/split.c:489 src/timeout.c:494 #, c-format msgid "unknown status from command (0x%X)" msgstr "" -#: src/split.c:1037 +#: src/split.c:1052 #, c-format msgid "cannot split in more than one way" msgstr "" -#: src/split.c:1050 src/split.c:1192 src/split.c:1363 +#: src/split.c:1065 src/split.c:1205 src/split.c:1376 #, fuzzy, c-format msgid "%s: invalid number of chunks" msgstr "%s: нерэчаісная колькасьць сэкундаў" -#: src/split.c:1054 +#: src/split.c:1069 #, fuzzy, c-format msgid "%s: invalid chunk number" msgstr "%s: нерэчаісны нумар" -#: src/split.c:1106 +#: src/split.c:1119 #, c-format msgid "%s: invalid suffix length" msgstr "" -#: src/split.c:1131 src/split.c:1139 src/split.c:1162 src/split.c:1167 +#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180 #, c-format msgid "%s: invalid number of bytes" msgstr "%s: нерэчаісная колькасьць байтаў" -#: src/split.c:1150 src/split.c:1297 +#: src/split.c:1163 src/split.c:1310 #, c-format msgid "%s: invalid number of lines" msgstr "%s: нерэчаісная колькасьць радкоў" -#: src/split.c:1223 +#: src/split.c:1236 #, c-format msgid "line count option -%s%c... is too large" msgstr "" -#: src/split.c:1235 +#: src/split.c:1248 #, fuzzy, c-format msgid "%s: invalid start value for numerical suffix" msgstr "нерэчаісны нумар пачатковага радка: %s" -#: src/split.c:1263 +#: src/split.c:1276 #, fuzzy, c-format msgid "%s: invalid IO block size" msgstr "%s: нерэчаісны памер файла" -#: src/split.c:1284 +#: src/split.c:1297 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1321 +#: src/split.c:1334 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1356 +#: src/split.c:1369 #, fuzzy, c-format msgid "%s: cannot determine file size" msgstr "немагчыма вызначыць назву вузла" #. This is a proper name. See the gettext manual, section Names. -#: src/stat.c:169 +#: src/stat.c:173 msgid "Michael Meskes" msgstr "" -#: src/stat.c:838 +#: src/stat.c:857 #, fuzzy, c-format msgid "failed to canonicalize %s" msgstr "немагчыма адчыніць %s" -#: src/stat.c:1050 +#: src/stat.c:1069 #, fuzzy, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "увага!: нераспазнаны парамэтар \"\\%c\"" -#: src/stat.c:1105 +#: src/stat.c:1124 #, fuzzy, c-format msgid "%s: invalid directive" msgstr "%s%s: нерэчаісная дырэктыва" -#: src/stat.c:1151 +#: src/stat.c:1170 #, c-format msgid "warning: backslash at end of format" msgstr "" -#: src/stat.c:1182 +#: src/stat.c:1201 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" -#: src/stat.c:1189 +#: src/stat.c:1208 #, c-format msgid "cannot read file system information for %s" msgstr "немагчыма прачытаць зьвесткі файлавае сыстэмы для %s" -#: src/stat.c:1209 +#: src/stat.c:1228 #, 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:1245 +#: src/stat.c:1264 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -8257,7 +8636,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1268 +#: src/stat.c:1287 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -8265,30 +8644,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1278 +#: src/stat.c:1297 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:1286 +#: src/stat.c:1305 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:1295 +#: src/stat.c:1314 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:1305 +#: src/stat.c:1324 #, c-format msgid "Context: %C\n" msgstr "" -#: src/stat.c:1313 +#: src/stat.c:1332 msgid "" "Access: %x\n" "Modify: %y\n" @@ -8296,15 +8675,17 @@ msgid "" " Birth: %w\n" msgstr "" -#: src/stat.c:1331 +#: src/stat.c:1350 +msgid "Display file or file system status.\n" +msgstr "" + +#: src/stat.c:1356 msgid "" -"Display file or file system status.\n" -"\n" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" -#: src/stat.c:1337 +#: src/stat.c:1360 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -8314,7 +8695,7 @@ msgid "" " -t, --terse print the information in terse form\n" msgstr "" -#: src/stat.c:1348 +#: src/stat.c:1371 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -8326,7 +8707,7 @@ msgid "" " %C SELinux security context string\n" msgstr "" -#: src/stat.c:1357 +#: src/stat.c:1380 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -8336,7 +8717,7 @@ msgid "" " %G group name of owner\n" msgstr "" -#: src/stat.c:1365 +#: src/stat.c:1388 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -8349,7 +8730,7 @@ msgid "" " %T minor device type in hex\n" msgstr "" -#: src/stat.c:1376 +#: src/stat.c:1399 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -8364,7 +8745,7 @@ msgid "" "\n" msgstr "" -#: src/stat.c:1390 +#: src/stat.c:1413 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -8375,7 +8756,7 @@ msgid "" " %f free blocks in file system\n" msgstr "" -#: src/stat.c:1399 +#: src/stat.c:1422 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -8394,30 +8775,29 @@ msgstr "Выкарыстаньне: %s [ПАРАМЭТАР]...\n" #: src/stdbuf.c:91 msgid "" "Run COMMAND, with modified buffering operations for its standard streams.\n" -"\n" msgstr "" -#: src/stdbuf.c:98 +#: src/stdbuf.c:97 msgid "" " -i, --input=MODE adjust standard input stream buffering\n" " -o, --output=MODE adjust standard output stream buffering\n" " -e, --error=MODE adjust standard error stream buffering\n" msgstr "" -#: src/stdbuf.c:105 +#: src/stdbuf.c:104 msgid "" "\n" "If MODE is 'L' the corresponding stream will be line buffered.\n" "This option is invalid with standard input.\n" msgstr "" -#: src/stdbuf.c:108 +#: src/stdbuf.c:107 msgid "" "\n" "If MODE is '0' the corresponding stream will be unbuffered.\n" msgstr "" -#: src/stdbuf.c:111 +#: src/stdbuf.c:110 msgid "" "\n" "Otherwise MODE is a number which may be followed by one of the following:\n" @@ -8427,7 +8807,7 @@ msgid "" "size set to MODE bytes.\n" msgstr "" -#: src/stdbuf.c:117 +#: src/stdbuf.c:116 msgid "" "\n" "NOTE: If COMMAND adjusts the buffering of its standard streams ('tee' does\n" @@ -8437,22 +8817,22 @@ msgid "" "and are thus unaffected by 'stdbuf' settings.\n" msgstr "" -#: src/stdbuf.c:227 +#: src/stdbuf.c:226 #, fuzzy, c-format msgid "failed to find %s" msgstr "немагчыма адчыніць %s" -#: src/stdbuf.c:247 src/stdbuf.c:279 +#: src/stdbuf.c:246 src/stdbuf.c:278 #, c-format msgid "failed to update the environment with %s" msgstr "" -#: src/stdbuf.c:321 +#: src/stdbuf.c:320 #, c-format msgid "line buffering stdin is meaningless" msgstr "" -#: src/stty.c:509 +#: src/stty.c:513 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -8460,23 +8840,25 @@ msgid "" " or: %s [-F DEVICE | --file=DEVICE] [-g|--save]\n" msgstr "" -#: src/stty.c:515 +#: src/stty.c:519 +msgid "Print or change terminal characteristics.\n" +msgstr "" + +#: src/stty.c:525 msgid "" -"Print or change terminal characteristics.\n" -"\n" " -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:524 +#: src/stty.c:532 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:529 +#: src/stty.c:537 msgid "" "\n" "Special characters:\n" @@ -8485,7 +8867,7 @@ msgid "" " eol CHAR CHAR will end the line\n" msgstr "" -#: src/stty.c:536 +#: src/stty.c:544 msgid "" " * eol2 CHAR alternate CHAR for ending the line\n" " erase CHAR CHAR will erase the last character typed\n" @@ -8493,7 +8875,7 @@ msgid "" " kill CHAR CHAR will erase the current line\n" msgstr "" -#: src/stty.c:542 +#: src/stty.c:550 msgid "" " * lnext CHAR CHAR will enter the next character quoted\n" " quit CHAR CHAR will send a quit signal\n" @@ -8501,7 +8883,7 @@ msgid "" " start CHAR CHAR will restart the output after stopping it\n" msgstr "" -#: src/stty.c:548 +#: src/stty.c:556 msgid "" " stop CHAR CHAR will stop the output\n" " susp CHAR CHAR will send a terminal stop signal\n" @@ -8509,7 +8891,7 @@ msgid "" " * werase CHAR CHAR will erase the last word typed\n" msgstr "" -#: src/stty.c:554 +#: src/stty.c:562 msgid "" "\n" "Special settings:\n" @@ -8518,7 +8900,7 @@ msgid "" " * columns N same as cols N\n" msgstr "" -#: src/stty.c:561 +#: src/stty.c:569 msgid "" " ispeed N set the input speed to N\n" " * line N use line discipline N\n" @@ -8527,7 +8909,7 @@ msgid "" " ospeed N set the output speed to N\n" msgstr "" -#: src/stty.c:567 +#: src/stty.c:575 msgid "" " * rows N tell the kernel that the terminal has N rows\n" " * size print the number of rows and columns according to the " @@ -8536,27 +8918,28 @@ msgid "" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" -#: src/stty.c:573 +#: src/stty.c:581 msgid "" "\n" "Control settings:\n" " [-]clocal disable modem control signals\n" " [-]cread allow input to be received\n" " * [-]crtscts enable RTS/CTS handshaking\n" +" * [-]cdtrdsr enable DTR/DSR handshaking\n" " csN set character size to N bits, N in [5..8]\n" msgstr "" -#: src/stty.c:581 +#: src/stty.c:590 msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" " [-]hupcl same as [-]hup\n" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" -" [-]parodd set odd parity (even with '-')\n" +" [-]parodd set odd parity (or even parity with '-')\n" msgstr "" -#: src/stty.c:588 +#: src/stty.c:597 msgid "" "\n" "Input settings:\n" @@ -8566,7 +8949,7 @@ msgid "" " [-]igncr ignore carriage return\n" msgstr "" -#: src/stty.c:596 +#: src/stty.c:605 msgid "" " [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" @@ -8575,11 +8958,11 @@ msgid "" " [-]istrip clear high (8th) bit of input characters\n" msgstr "" -#: src/stty.c:603 +#: src/stty.c:612 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr "" -#: src/stty.c:606 +#: src/stty.c:615 msgid "" " * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" @@ -8589,7 +8972,7 @@ msgid "" " [-]tandem same as [-]ixoff\n" msgstr "" -#: src/stty.c:614 +#: src/stty.c:623 msgid "" "\n" "Output settings:\n" @@ -8599,7 +8982,7 @@ msgid "" " * nlN newline delay style, N in [0..1]\n" msgstr "" -#: src/stty.c:622 +#: src/stty.c:631 msgid "" " * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of null characters\n" @@ -8609,7 +8992,7 @@ msgid "" " * [-]onlret newline performs a carriage return\n" msgstr "" -#: src/stty.c:630 +#: src/stty.c:639 msgid "" " * [-]onocr do not print carriage returns in the first column\n" " [-]opost postprocess output\n" @@ -8619,7 +9002,7 @@ msgid "" " * vtN vertical tab delay style, N in [0..1]\n" msgstr "" -#: src/stty.c:638 +#: src/stty.c:647 msgid "" "\n" "Local settings:\n" @@ -8628,7 +9011,7 @@ msgid "" " * -crtkill kill all line by obeying the echoctl and echok settings\n" msgstr "" -#: src/stty.c:645 +#: src/stty.c:654 msgid "" " * [-]ctlecho echo control characters in hat notation ('^c')\n" " [-]echo echo input characters\n" @@ -8637,7 +9020,7 @@ msgid "" " [-]echok echo a newline after a kill character\n" msgstr "" -#: src/stty.c:652 +#: src/stty.c:661 msgid "" " * [-]echoke same as [-]crtkill\n" " [-]echonl echo newline even if not echoing other characters\n" @@ -8646,7 +9029,7 @@ msgid "" " [-]iexten enable non-POSIX special characters\n" msgstr "" -#: src/stty.c:659 +#: src/stty.c:668 msgid "" " [-]isig enable interrupt, quit, and suspend special characters\n" " [-]noflsh disable flushing after interrupt and quit special " @@ -8656,7 +9039,7 @@ msgid "" " * [-]xcase with icanon, escape with '\\' for uppercase characters\n" msgstr "" -#: src/stty.c:666 +#: src/stty.c:675 msgid "" "\n" "Combination settings:\n" @@ -8665,7 +9048,7 @@ msgid "" " -cbreak same as icanon\n" msgstr "" -#: src/stty.c:673 +#: src/stty.c:682 msgid "" " cooked same as brkint ignpar istrip icrnl ixon opost isig\n" " icanon, eof and eol characters to their default values\n" @@ -8673,7 +9056,7 @@ msgid "" " crt same as echoe echoctl echoke\n" msgstr "" -#: src/stty.c:679 +#: src/stty.c:688 msgid "" " dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" " kill ^u\n" @@ -8682,7 +9065,7 @@ msgid "" " evenp same as parenb -parodd cs7\n" msgstr "" -#: src/stty.c:686 +#: src/stty.c:695 msgid "" " -evenp same as -parenb cs8\n" " * [-]lcase same as xcase iuclc olcuc\n" @@ -8692,7 +9075,7 @@ msgid "" " -nl same as icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" msgstr "" -#: src/stty.c:694 +#: src/stty.c:703 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -8701,7 +9084,7 @@ msgid "" " -pass8 same as parenb istrip cs7\n" msgstr "" -#: src/stty.c:701 +#: src/stty.c:710 msgid "" " raw same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" " -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n" @@ -8709,7 +9092,7 @@ msgid "" " -raw same as cooked\n" msgstr "" -#: src/stty.c:707 +#: src/stty.c:716 msgid "" " sane same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" " -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n" @@ -8719,7 +9102,7 @@ msgid "" " characters to their default values\n" msgstr "" -#: src/stty.c:715 +#: src/stty.c:724 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -8728,126 +9111,59 @@ msgid "" "127; special values ^- or undef used to disable special characters.\n" msgstr "" -#: src/stty.c:787 +#: src/stty.c:796 #, c-format msgid "only one device may be specified" msgstr "толькі адна прылада можа быць пазначана" -#: src/stty.c:817 +#: src/stty.c:826 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" "mutually exclusive" msgstr "" -#: src/stty.c:823 +#: src/stty.c:832 #, c-format msgid "when specifying an output style, modes may not be set" msgstr "" -#: src/stty.c:838 +#: src/stty.c:847 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "" -#: src/stty.c:883 src/stty.c:993 +#: src/stty.c:892 src/stty.c:1002 #, c-format msgid "invalid argument %s" msgstr "нерэчаісны довад %s" -#: src/stty.c:894 src/stty.c:911 src/stty.c:923 src/stty.c:936 src/stty.c:948 -#: src/stty.c:968 +#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957 +#: src/stty.c:977 #, c-format msgid "missing argument to %s" msgstr "прапушчаны довад для %s" -#: src/stty.c:974 +#: src/stty.c:983 #, c-format msgid "invalid line discipline %s" msgstr "нерэчаісная дысцыпліна лініі %s" -#: src/stty.c:1044 +#: src/stty.c:1053 #, c-format msgid "%s: unable to perform all requested operations" msgstr "" -#: src/stty.c:1390 +#: src/stty.c:1399 #, c-format msgid "%s: no size information for this device" msgstr "%s: няма зьвестак пра памеры для гэтае прылады" -#: src/stty.c:1904 +#: src/stty.c:1920 #, c-format msgid "invalid integer argument %s" msgstr "кепскі цэлы довад %s" -#: src/su.c:229 -msgid "Password:" -msgstr "Пароль:" - -#: src/su.c:232 -#, c-format -msgid "getpass: cannot open /dev/tty" -msgstr "getpass: немагчыма адчыніць /dev/tty" - -#: src/su.c:290 -#, c-format -msgid "cannot set groups" -msgstr "немагчыма ўсталяваць групы" - -#: src/su.c:294 -#, c-format -msgid "cannot set group id" -msgstr "немагчыма ўсталяваць id групы" - -#: src/su.c:296 -#, c-format -msgid "cannot set user id" -msgstr "немагчыма ўсталяваць id карыстальніка" - -#: src/su.c:371 -#, c-format -msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" -msgstr "Выкарыстаньне: %s [ПАРАМЭТАР]... [-] [КАРЫСТАЛЬНІК [ДОВАД]...]\n" - -#: src/su.c:372 -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 "" - -#: src/su.c:384 -msgid "" -"\n" -"A mere - implies -l. If USER not given, assume root.\n" -msgstr "" - -#: src/su.c:461 -#, c-format -msgid "user %s does not exist" -msgstr "карыстальнік %s не існуе" - -#: src/su.c:484 -#, c-format -msgid "incorrect password" -msgstr "няслушны пароль" - -#: src/su.c:501 -#, c-format -msgid "using restricted shell %s" -msgstr "выкарыстоўваецца абмежаваная абалонка %s" - -#: src/su.c:509 -#, c-format -msgid "warning: cannot change directory to %s" -msgstr "Увага! Немагчыма перайсьці да тэчкі %s" - #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 msgid "Kayvan Aghaiepour" @@ -8880,7 +9196,7 @@ msgstr "" msgid "ignoring all arguments" msgstr "на ўсе довады не зьвяртаецца ўвага" -#: src/system.h:340 +#: src/system.h:343 #, c-format msgid "" "\n" @@ -8894,15 +9210,22 @@ msgstr "" "дакумэнтацыі вашага інтэрпрэтатара загадаў, каб даведацца аб парамэтрах,\n" "якія ён падтрымлівае.\n" -#: src/system.h:346 +#: src/system.h:349 msgid " --help display this help and exit\n" msgstr " --help паказвае гэтую даведку\n" -#: src/system.h:348 +#: src/system.h:351 msgid " --version output version information and exit\n" msgstr " --version выводзіць зьвесткі пра вэрсію\n" -#: src/system.h:541 +#: src/system.h:544 +#, fuzzy +msgid "" +"\n" +"Mandatory arguments to long options are mandatory for short options too.\n" +msgstr "Довады, абавязковыя для доўгіх выбараў, абавязковыя й для кароткіх.\n" + +#: src/system.h:552 msgid "" "\n" "SIZE is an integer and optional unit (example: 10M is 10*1024*1024). Units\n" @@ -8910,7 +9233,7 @@ msgid "" "1000).\n" msgstr "" -#: src/system.h:550 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -8919,7 +9242,7 @@ msgid "" "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n" msgstr "" -#: src/system.h:560 +#: src/system.h:571 #, fuzzy, c-format msgid "" "\n" @@ -8932,22 +9255,22 @@ msgstr "" #. <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:574 +#: src/system.h:585 #, c-format msgid "Report %s translation bugs to <http://translationproject.org/team/>\n" msgstr "" -#: src/system.h:578 +#: src/system.h:589 #, c-format msgid "For complete documentation, run: info coreutils '%s invocation'\n" msgstr "" -#: src/system.h:585 +#: src/system.h:596 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "Паспрабуйце \"%s --help\" для больш падрабязных зьвестак.\n" -#: src/system.h:617 +#: src/system.h:628 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -8963,58 +9286,58 @@ 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" -"\n" msgstr "" "Запісвае кожны ФАЙЛ ў стандартны вывад з апошняга па першы радок.\n" "Калі ФАЙЛ не зададзне альбо зададзены -, чытае стандартны ўвод.\n" "\n" -#: src/tac.c:145 +#: src/tac.c:144 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 "" -#: src/tac.c:235 src/tac.c:336 +#: src/tac.c:234 src/tac.c:335 #, c-format msgid "%s: seek failed" msgstr "%s: збой seek" -#: src/tac.c:264 +#: src/tac.c:263 #, c-format msgid "record too large" msgstr "запіс завялікі" -#: src/tac.c:451 +#: src/tac.c:450 #, fuzzy, c-format msgid "failed to create temporary file in %s" msgstr "немагчыма стварыць часовы файл %s" -#: src/tac.c:459 +#: src/tac.c:458 #, fuzzy, c-format msgid "failed to open %s for writing" msgstr "%s: немагчыма адчыніць для запісу" -#: src/tac.c:476 +#: src/tac.c:475 #, fuzzy, c-format msgid "failed to rewind stream for %s" msgstr "збой пры захаваньні часу для %s" -#: src/tac.c:512 src/tac.c:519 +#: src/tac.c:511 src/tac.c:518 #, c-format msgid "%s: write error" msgstr "%s: памылка запісу" -#: src/tac.c:572 +#: src/tac.c:571 #, fuzzy, c-format msgid "failed to open %s for reading" msgstr "немагыма адчыніць %s для чытаньня" -#: src/tac.c:630 +#: src/tac.c:629 #, c-format msgid "separator cannot be empty" msgstr "падзяляльнік павінен нешта ўтрымліваць" @@ -9025,15 +9348,18 @@ msgid "Ian Lance Taylor" msgstr "" #: src/tail.c:262 -#, c-format +#, fuzzy, 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" -"\n" msgstr "" +" Друкуе першыя 10 радкоў кожнага файла ў стандартны вывад. Калі заданы\n" +"больш чым адзін файл, дадаткова друкуе загаловак з назвай файла.\n" +"Калі файл незаданы, ці калі замест яго працяжнік, чытае стандартны ўвод.\n" +"\n" -#: src/tail.c:271 +#: src/tail.c:270 msgid "" " -c, --bytes=K output the last K bytes; alternatively, use -c " "+K\n" @@ -9041,7 +9367,7 @@ msgid "" "file\n" msgstr "" -#: src/tail.c:275 +#: src/tail.c:274 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -9050,7 +9376,7 @@ msgid "" " -F same as --follow=name --retry\n" msgstr "" -#: src/tail.c:282 +#: src/tail.c:281 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -9064,7 +9390,7 @@ msgid "" " With inotify, this option is rarely useful.\n" msgstr "" -#: src/tail.c:295 +#: src/tail.c:294 msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" " -q, --quiet, --silent never output headers giving file names\n" @@ -9073,7 +9399,7 @@ msgid "" " name, i.e., with --follow=name\n" msgstr "" -#: src/tail.c:302 +#: src/tail.c:301 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations.\n" @@ -9082,7 +9408,7 @@ msgid "" " -v, --verbose always output headers giving file names\n" msgstr "" -#: src/tail.c:311 +#: src/tail.c:310 #, fuzzy msgid "" "\n" @@ -9100,7 +9426,7 @@ msgstr "" "Кожнае ключавое слова можа быць:\n" "\n" -#: src/tail.c:320 +#: src/tail.c:319 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" @@ -9110,64 +9436,64 @@ msgid "" "named file in a way that accommodates renaming, removal and creation.\n" msgstr "" -#: src/tail.c:379 +#: src/tail.c:378 #, c-format msgid "closing %s (fd=%d)" msgstr "зачыняецца %s (fd=%d)" -#: src/tail.c:454 +#: src/tail.c:453 #, c-format msgid "%s: cannot seek to relative offset %s" msgstr "%s: немагчыма перамясьціцца да адноснага зруху %s" -#: src/tail.c:458 +#: src/tail.c:457 #, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "" -#: src/tail.c:895 +#: src/tail.c:894 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "" -#: src/tail.c:907 +#: src/tail.c:906 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" msgstr "" -#: src/tail.c:964 +#: src/tail.c:963 #, c-format msgid "%s has become inaccessible" msgstr "%s стаў недаступны" -#: src/tail.c:981 +#: src/tail.c:980 #, c-format msgid "%s has been replaced with an untailable file; giving up on this name" msgstr "%s быў заменены на небясконцы файл; апрацоўка гэтага файла спынена" -#: src/tail.c:990 +#: src/tail.c:989 #, fuzzy, c-format msgid "%s has been replaced with a remote file. giving up on this name" msgstr "%s быў заменены на небясконцы файл; апрацоўка гэтага файла спынена" -#: src/tail.c:1011 +#: src/tail.c:1010 #, c-format msgid "%s has become accessible" msgstr "%s стаў даступны" -#: src/tail.c:1019 +#: src/tail.c:1018 #, c-format msgid "%s has appeared; following end of new file" msgstr "" -#: src/tail.c:1030 +#: src/tail.c:1029 #, c-format msgid "%s has been replaced; following end of new file" msgstr "" -#: src/tail.c:1131 +#: src/tail.c:1130 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: немагчыма зьмяніць незаблякаваны рэжым" @@ -9486,17 +9812,22 @@ msgstr "прапушчаны \"]\"\n" msgid "extra argument %s" msgstr "дадатковы довад %s" -#: src/timeout.c:124 +#: src/timeout.c:112 +#, c-format +msgid "warning: sigprocmask" +msgstr "" + +#: src/timeout.c:145 #, c-format msgid "warning: timer_settime" msgstr "" -#: src/timeout.c:129 +#: src/timeout.c:150 #, c-format msgid "warning: timer_create" msgstr "" -#: src/timeout.c:204 +#: src/timeout.c:225 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -9505,16 +9836,16 @@ msgstr "" "Выкарыстаньне: %s ЗАГАД [ДОВАД]...\n" " ці: %s ВЫБАР\n" -#: src/timeout.c:208 +#: src/timeout.c:229 #, fuzzy -msgid "" -"Start COMMAND, and kill it if still running after DURATION.\n" -"\n" -"Mandatory arguments to long options are mandatory for short options too.\n" +msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "Довады, абавязковыя для доўгіх выбараў, абавязковыя й для кароткіх.\n" -#: src/timeout.c:213 +#: src/timeout.c:235 msgid "" +" --preserve-status\n" +" exit with the same status as COMMAND, even when the\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 " @@ -9529,7 +9860,7 @@ msgid "" " See 'kill -l' for a list of signals\n" msgstr "" -#: src/timeout.c:229 +#: src/timeout.c:254 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -9537,25 +9868,30 @@ msgid "" "days.\n" msgstr "" -#: src/timeout.c:234 +#: src/timeout.c:259 msgid "" "\n" -"If the command times out, then exit with status 124. Otherwise, exit\n" -"with the status of COMMAND. If no signal is specified, send the TERM\n" -"signal upon timeout. The TERM signal kills any process that does not\n" -"block or catch that signal. For other processes, it may be necessary to\n" -"use the KILL (9) signal, since this signal cannot be caught. If the\n" -"KILL (9) signal is sent, the exit status is 128+9 rather than 124.\n" +"If the command times out, and --preserve-status is not set, then exit with\n" +"status 124. Otherwise, exit with the status of COMMAND. If no signal\n" +"is specified, send the TERM signal upon timeout. The TERM signal kills\n" +"any process that does not block or catch that signal. It may be necessary\n" +"to use the KILL (9) signal, since this signal cannot be caught, in which\n" +"case the exit status is 128+9 rather than 124.\n" +msgstr "" + +#: src/timeout.c:363 +#, c-format +msgid "warning: disabling core dumps failed" msgstr "" -#: src/timeout.c:419 +#: src/timeout.c:471 #, fuzzy, c-format msgid "error waiting for command" msgstr "памылка запісу %s" -#: src/timeout.c:441 +#: src/timeout.c:482 #, c-format -msgid "warning: disabling core dumps failed" +msgid "the monitored command dumped core" msgstr "" #. This is a proper name. See the gettext manual, section Names. @@ -9568,22 +9904,22 @@ msgstr "" msgid "Randy Smith" msgstr "" -#: src/touch.c:115 src/touch.c:313 +#: src/touch.c:115 src/touch.c:309 #, c-format msgid "invalid date format %s" msgstr "нерэчаісны фармат даты %s" -#: src/touch.c:194 +#: src/touch.c:191 #, c-format msgid "cannot touch %s" msgstr "немагчыма дакрануцца да %s" -#: src/touch.c:200 +#: src/touch.c:197 #, c-format msgid "setting times of %s" msgstr "усталяваньне часу %s" -#: src/touch.c:216 +#: src/touch.c:213 msgid "" "Update the access and modification times of each FILE to the current time.\n" "\n" @@ -9592,10 +9928,9 @@ msgid "" "\n" "A FILE argument string of - is handled specially and causes touch to\n" "change the times of the file associated with standard output.\n" -"\n" msgstr "" -#: src/touch.c:229 +#: src/touch.c:225 #, fuzzy msgid "" " -a change only the access time\n" @@ -9609,7 +9944,7 @@ msgstr "" " -f (не заўважаецца)\n" " -m Зьмяняць толькі час зьмяненьня.\n" -#: src/touch.c:235 +#: src/touch.c:231 msgid "" " -h, --no-dereference affect each symbolic link instead of any " "referenced\n" @@ -9618,16 +9953,16 @@ msgid "" " -m change only the modification time\n" msgstr "" -#: src/touch.c:241 +#: src/touch.c:237 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" -" --time=WORD change the specified time:\n" +" --time=WORD change the specified time:\n" " WORD is access, atime, or use: equivalent to -a\n" " WORD is modify or mtime: equivalent to -m\n" msgstr "" -#: src/touch.c:250 +#: src/touch.c:246 #, fuzzy msgid "" "\n" @@ -9638,12 +9973,12 @@ msgstr "" "\n" "Калі ФАЙЛ -, дакранаецца да стандартнага вываду.\n" -#: src/touch.c:339 +#: src/touch.c:335 #, c-format msgid "cannot specify times from more than one source" msgstr "немагчыма вызначыць час больш чым з адной крыніцы" -#: src/touch.c:413 +#: src/touch.c:409 #, fuzzy, c-format msgid "" "warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'" @@ -9752,9 +10087,9 @@ msgid "missing character class name '[::]'" msgstr "недзеяздольная кляса знака %s" #: src/tr.c:913 -#, fuzzy, c-format +#, c-format msgid "missing equivalence class character '[==]'" -msgstr "недзеяздольная кляса знака %s" +msgstr "" #: src/tr.c:928 #, c-format @@ -9865,25 +10200,24 @@ msgid "" "If a FILE is larger than the specified size, the extra data is lost.\n" "If a FILE is shorter, it is extended and the extended part (hole)\n" "reads as zero bytes.\n" -"\n" msgstr "" -#: src/truncate.c:110 +#: src/truncate.c:109 msgid " -c, --no-create do not create any files\n" msgstr "" -#: src/truncate.c:113 +#: src/truncate.c:112 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" -#: src/truncate.c:116 +#: 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" msgstr "" -#: src/truncate.c:122 +#: src/truncate.c:121 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -9891,57 +10225,57 @@ msgid "" "'/' round down to multiple of, '%' round up to multiple of.\n" msgstr "" -#: src/truncate.c:150 +#: src/truncate.c:149 #, c-format msgid "overflow in %<PRIdMAX> * %<PRIdMAX> byte blocks for file %s" msgstr "" -#: src/truncate.c:174 +#: src/truncate.c:173 #, fuzzy, c-format msgid "%s has unusable, apparently negative size" msgstr "%s: файл мае адмоўны памер" -#: src/truncate.c:184 src/truncate.c:379 +#: src/truncate.c:183 src/truncate.c:384 #, fuzzy, c-format msgid "cannot get the size of %s" msgstr "немагчыма ўсталяваць правы %s" -#: src/truncate.c:206 +#: src/truncate.c:205 #, fuzzy, c-format msgid "overflow rounding up size of file %s" msgstr "перапаўненьне зруху цягам чытаньня файла %s" -#: src/truncate.c:216 +#: src/truncate.c:215 #, fuzzy, c-format msgid "overflow extending size of file %s" msgstr "перапаўненьне зруху цягам чытаньня файла %s" -#: src/truncate.c:231 +#: src/truncate.c:230 #, c-format msgid "failed to truncate %s at %<PRIdMAX> bytes" msgstr "" -#: src/truncate.c:305 +#: src/truncate.c:303 #, fuzzy, c-format msgid "multiple relative modifiers specified" msgstr "зададзены некалькі дырэкторыяў прызначэньня" -#: src/truncate.c:335 +#: src/truncate.c:333 #, fuzzy, c-format msgid "you must specify either %s or %s" msgstr "вы павінны пазначыць сьпіс байтаў, знакаў ці палёў" -#: src/truncate.c:342 +#: src/truncate.c:340 #, c-format msgid "you must specify a relative %s with %s" msgstr "" -#: src/truncate.c:349 +#: src/truncate.c:347 #, c-format msgid "%s was specified but %s was not" msgstr "" -#: src/truncate.c:400 +#: src/truncate.c:404 #, c-format msgid "cannot open %s for writing" msgstr "немагчыма адчыніць %s для запісу" @@ -10027,13 +10361,16 @@ msgid "cannot get system name" 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" -"\n" msgstr "" +"Запісвае кожны ФАЙЛ ў стандартны вывад з апошняга па першы радок.\n" +"Калі ФАЙЛ не зададзне альбо зададзены -, чытае стандартны ўвод.\n" +"\n" -#: src/unexpand.c:125 +#: src/unexpand.c:124 msgid "" " -a, --all convert all blanks, instead of just initial blanks\n" " --first-only convert only leading sequences of blanks (overrides -a)\n" @@ -10041,12 +10378,12 @@ msgid "" " -t, --tabs=LIST use comma separated LIST of tab positions (enables -a)\n" msgstr "" -#: src/unexpand.c:153 +#: src/unexpand.c:152 #, c-format msgid "tabs are too far apart" msgstr "" -#: src/unexpand.c:505 +#: src/unexpand.c:504 #, c-format msgid "tab stop value is too large" msgstr "крок табуляцыі завялікі" @@ -10062,16 +10399,15 @@ msgid "" "writing to OUTPUT (or standard output).\n" "\n" "With no options, matching lines are merged to the first occurrence.\n" -"\n" msgstr "" -#: src/uniq.c:148 +#: src/uniq.c:147 msgid "" " -c, --count prefix lines by the number of occurrences\n" " -d, --repeated only print duplicate lines\n" msgstr "" -#: src/uniq.c:152 +#: src/uniq.c:151 msgid "" " -D, --all-repeated[=delimit-method] print all duplicate lines\n" " delimit-method={none(default),prepend,separate}\n" @@ -10083,18 +10419,18 @@ msgid "" " -z, --zero-terminated end lines with 0 byte, not newline\n" msgstr "" -#: src/uniq.c:162 +#: src/uniq.c:161 msgid " -w, --check-chars=N compare no more than N characters in lines\n" msgstr "" -#: src/uniq.c:167 +#: src/uniq.c:166 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:172 +#: src/uniq.c:171 msgid "" "\n" "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n" @@ -10102,24 +10438,24 @@ msgid "" "Also, comparisons honor the rules specified by 'LC_COLLATE'.\n" msgstr "" -#: src/uniq.c:359 +#: src/uniq.c:358 #, c-format msgid "too many repeated lines" msgstr "зашмат аднолькавых радкоў" -#: src/uniq.c:522 +#: src/uniq.c:521 msgid "invalid number of fields to skip" msgstr "" -#: src/uniq.c:531 +#: src/uniq.c:530 msgid "invalid number of bytes to skip" msgstr "" -#: src/uniq.c:540 +#: src/uniq.c:539 msgid "invalid number of bytes to compare" msgstr "нерэчаісная колькасьць байтаў для параўнаньня" -#: src/uniq.c:559 +#: src/uniq.c:558 #, c-format msgid "printing all duplicated lines and repeat counts is meaningless" msgstr "" @@ -10174,6 +10510,11 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" +#: src/uptime.c:149 +#, fuzzy, c-format +msgid "up %2d:%02d, " +msgstr " %2d:%02d%s працуе " + #: src/uptime.c:151 #, c-format msgid "%lu user" @@ -10258,40 +10599,40 @@ msgstr "" msgid " old " msgstr " стары " -#: src/who.c:449 +#: src/who.c:440 #, fuzzy msgid "system boot" msgstr "Сістэмная памылка" -#: src/who.c:456 src/who.c:458 +#: src/who.c:447 src/who.c:449 msgid "id=" msgstr "id=" -#: src/who.c:471 src/who.c:476 +#: src/who.c:462 src/who.c:467 msgid "term=" msgstr "тэрм.=" -#: src/who.c:473 src/who.c:477 +#: src/who.c:464 src/who.c:468 msgid "exit=" msgstr "выхад=" -#: src/who.c:494 +#: src/who.c:485 msgid "LOGIN" msgstr "" -#: src/who.c:514 +#: src/who.c:505 msgid "clock change" msgstr "зьмена часу" -#: src/who.c:526 src/who.c:527 +#: src/who.c:517 src/who.c:518 msgid "run-level" msgstr "узровень" -#: src/who.c:530 src/who.c:531 +#: src/who.c:521 src/who.c:522 msgid "last=" msgstr "апошні=" -#: src/who.c:562 +#: src/who.c:553 #, c-format msgid "" "\n" @@ -10300,44 +10641,44 @@ msgstr "" "\n" "# карыстальнікі=%lu\n" -#: src/who.c:568 +#: src/who.c:559 msgid "NAME" msgstr "NAME" -#: src/who.c:568 +#: src/who.c:559 msgid "LINE" msgstr "LINE" -#: src/who.c:568 +#: src/who.c:559 msgid "TIME" msgstr "TIME" -#: src/who.c:568 +#: src/who.c:559 msgid "IDLE" msgstr "IDLE" -#: src/who.c:569 +#: src/who.c:560 msgid "PID" msgstr "PID" -#: src/who.c:569 +#: src/who.c:560 msgid "COMMENT" msgstr "COMMENT" -#: src/who.c:569 +#: src/who.c:560 msgid "EXIT" msgstr "EXIT" -#: src/who.c:649 +#: src/who.c:640 #, c-format msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n" msgstr "Выкарыстаньне: %s [ПАРАМЭТАР]... [ ФАЙЛ | ДОВАД1 ДОВАД2 ]\n" -#: src/who.c:650 +#: src/who.c:641 msgid "Print information about users who are currently logged in.\n" msgstr "" -#: src/who.c:653 +#: src/who.c:644 msgid "" "\n" " -a, --all same as -b -d --login -p -r -t -T -u\n" @@ -10351,11 +10692,11 @@ msgstr "" " -d, --dead друкуе мёртвыя прцэсы\n" " -H, --heading друкуе радок загалоўкаў слупкоў\n" -#: src/who.c:660 +#: src/who.c:651 msgid " -l, --login print system login processes\n" msgstr " -l, --login друкуе працэсы ўваходу ў сыстэму\n" -#: src/who.c:663 +#: src/who.c:654 msgid "" " --lookup attempt to canonicalize hostnames via DNS\n" " -m only hostname and user associated with stdin\n" @@ -10366,7 +10707,7 @@ msgstr "" "stdin\n" " -p, --process друкуе актыўныя працэсы, народжаныя init\n" -#: src/who.c:668 +#: src/who.c:659 msgid "" " -q, --count all login names and number of users logged on\n" " -r, --runlevel print current runlevel\n" @@ -10378,7 +10719,7 @@ msgstr "" " -s, --short друкуе толькі імя, лінію й час (прадвызначаны вывад)\n" " -t, --time друкуе апошнюю зьмену сыстэмнага часу\n" -#: src/who.c:674 +#: src/who.c:665 msgid "" " -T, -w, --mesg add user's message status as +, - or ?\n" " -u, --users list users logged in\n" @@ -10390,7 +10731,7 @@ msgstr "" " --message тое, што й -T\n" " --writable тое, што й -T\n" -#: src/who.c:682 +#: src/who.c:673 #, fuzzy, c-format msgid "" "\n" @@ -10436,12 +10777,13 @@ msgstr "" "Бесперапынна выводзіць РАДОК(і), ці літару \"y\".\n" "\n" -#~ msgid "" -#~ "Usage: %s NAME\n" -#~ " or: %s OPTION\n" -#~ msgstr "" -#~ "Выкарыстаньне: %s НАЗВА\n" -#~ " ці: %s ВЫБАР\n" +#, fuzzy +#~ msgid " returning value: '%s'\n" +#~ msgstr "стварэньне файла %s\n" + +#, fuzzy +#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n" +#~ msgstr "Выкарыстаньне: %s [ВЫБАР] НАЗВА...\n" #~ msgid "" #~ "\n" @@ -10454,8 +10796,82 @@ msgstr "" #~ " %s /usr/bin/sort Выводзіць \"sort\".\n" #~ " %s include/stdio.h .h Выводзіць \"stdio\".\n" -#~ msgid "Usage: %s [OPTION] FILE...\n" -#~ msgstr "Выкарыстаньне: %s [ВЫБАР] ФАЙЛ...\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 "" @@ -10464,10 +10880,8 @@ 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" +#~ " -f, --silent, --quiet suppress most error messages\n" +#~ " -v, --verbose output a diagnostic for every file processed\n" #~ msgstr "" #~ "Зьмяняе ўладальніка й/альбо групу кожнага ФАЙЛа на ЎЛАДАЛЬНІКа й/альбо " #~ "ГРУПУ.\n" @@ -10551,15 +10965,11 @@ msgstr "" #~ " -v, --verbose выводзіць праверку для кожнага апрацаванага " #~ "файлу\n" -#, fuzzy -#~ msgid "Usage: %s [OPTION]... PATH START\n" -#~ msgstr "Выкарыстаньне: %s [ВЫБАР]... МНОСТВА1 [МНОСТВА2]\n" - #, fuzzy #~ msgid "" #~ "\n" -#~ "SIZE is an integer with an optional suffix (example: 10MB). Suffixes " -#~ "are:\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 "" @@ -10569,13 +10979,6 @@ msgstr "" #~ "kB 1000, K 1024, MB 1000*1000, M 1024*1024, and so on for G, T, P, E, Z, " #~ "Y.\n" -#~ msgid "cannot create link %s" -#~ msgstr "немагчыма стварыць лучыва %s" - -#, fuzzy -#~ msgid "%s: option '%s' is ambiguous\n" -#~ msgstr "%s: выбар `-W %s' неадназначыны\n" - #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s: недапушчальны выраб -- %c\n" @@ -10600,15 +11003,15 @@ msgstr "" #~ msgid "%s" #~ msgstr "%s" +#~ msgid "cannot create link %s" +#~ msgstr "немагчыма стварыць лучыва %s" + #~ msgid "the --reply option is deprecated; use -i or -f instead" #~ msgstr "парамэтар --reply асуджаны; выкарыстоўваеце замест яго -i альбо -f" #~ msgid "symbolic links are not supported on this system" #~ msgstr "знакавыя лучывы не падтрымліваюцца гэтае сыстэмай" -#~ msgid "invalid format width" -#~ msgstr "недзеяздольны фармат шырыні" - #~ msgid "invalid format precision" #~ msgstr "недзеяздольны фармат дакладнасьці" @@ -10733,6 +11136,9 @@ msgstr "" #~ msgid "invalid number of lines: 0" #~ msgstr "недзеяздольная колькасьць радкоў: 0" +#~ msgid "Usage: %s [OPTION] FILE...\n" +#~ msgstr "Выкарыстаньне: %s [ВЫБАР] ФАЙЛ...\n" + #~ msgid "new_mode: mode\n" #~ msgstr "new_mode: рэжым\n" @@ -10747,9 +11153,6 @@ msgstr "" #~ " Абнаўляе час доступу й зьмяненьня кожнага ФАЙЛа да бягучага часу.\n" #~ "\n" -#~ msgid " %2d:%02d%s up " -#~ msgstr " %2d:%02d%s працуе " - #~ msgid "am" #~ msgstr "am" diff --git a/po/bg.gmo b/po/bg.gmo index 25b65eaa..d7adf862 100644 Binary files a/po/bg.gmo and b/po/bg.gmo differ diff --git a/po/bg.po b/po/bg.po index 1b69d94a..c706ce88 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: 2012-05-10 19:35+0200\n" +"POT-Creation-Date: 2013-02-14 15:56+0000\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,19 +43,19 @@ msgstr "Допустими аргументи са:" msgid "error closing file" msgstr "затваряне на входния файл %s" -#: lib/closeout.c:112 src/base64.c:109 src/base64.c:121 src/base64.c:127 -#: src/base64.c:168 src/base64.c:224 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:330 src/expand.c:355 src/head.c:298 -#: src/head.c:348 src/head.c:756 src/head.c:797 src/mktemp.c:350 src/od.c:919 -#: src/paste.c:160 src/shuf.c:369 src/split.c:727 src/split.c:964 -#: src/split.c:969 src/tail.c:350 src/tail.c:1201 src/tail.c:1307 +#: 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 -#: src/unexpand.c:427 src/unexpand.c:443 +#: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "грешка при запис" -#: lib/copy-acl.c:611 src/copy.c:1160 src/copy.c:2602 +#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617 #, c-format msgid "preserving permissions for %s" msgstr "режимът за достъп до %s е запазен" @@ -248,18 +248,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:483 +#: lib/mkdir-p.c:196 src/install.c:484 #, c-format msgid "cannot change permissions of %s" msgstr "не може да се сменят правата за достъп до %s" -#: lib/mkdir-p.c:206 src/copy.c:2261 src/install.c:709 src/install.c:722 +#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722 #, 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:915 src/tac.c:435 +#: src/split.c:929 src/tac.c:434 #, c-format msgid "memory exhausted" msgstr "паметта е изчерпана" @@ -308,75 +308,75 @@ msgstr "“" msgid "%s: end of file" msgstr "%s: край на файла" -#: lib/regcomp.c:130 +#: lib/regcomp.c:131 msgid "Success" msgstr "Успех" -#: lib/regcomp.c:133 +#: lib/regcomp.c:134 msgid "No match" msgstr "Няма съответствие" -#: lib/regcomp.c:136 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "Неправилен регулярен израз" -#: lib/regcomp.c:139 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "Неправилен знак за съпоставяне" -#: lib/regcomp.c:142 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "Неправилно име на клас символи" -#: lib/regcomp.c:145 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "Завършваща обратно наклонена черта" -#: lib/regcomp.c:148 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "Неправилно обратно позоваване" -#: lib/regcomp.c:151 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "Незатворена [ или [^" -#: lib/regcomp.c:154 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "Незатворена ( или \\(" -#: lib/regcomp.c:157 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "Незатворена \\{" -#: lib/regcomp.c:160 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "Неправилно съдържание на \\{\\}" -#: lib/regcomp.c:163 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "Неправилен край на диапазон" -#: lib/regcomp.c:166 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Паметта е изчерпана" -#: lib/regcomp.c:169 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "Неправилен предхождащ регулярен израз" -#: lib/regcomp.c:172 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "Неочакван край на регулярен израз" -#: lib/regcomp.c:175 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "Регулярният израз е твърде голям" -#: lib/regcomp.c:178 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "Неотворена ) или \\)" -#: lib/regcomp.c:703 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "Няма предходен регулярен израз" @@ -417,7 +417,7 @@ msgstr "^[дДoOyY]" msgid "^[nN]" msgstr "^[нНkKnN]" -#: lib/set-mode-acl.c:695 src/copy.c:2284 src/cp.c:518 +#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516 #, c-format msgid "setting permissions for %s" msgstr "установява се режимът за достъп до %s" @@ -564,13 +564,13 @@ msgstr "неуспешно отваряне на файл" msgid "Resource lost" msgstr "" -#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262 -#: lib/spawn-pipe.c:265 +#: 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:232 lib/spawn-pipe.c:346 lib/wait-process.c:282 +#: 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" @@ -586,24 +586,24 @@ msgstr "неправилен интервал за време %s" msgid "Unknown signal %d" msgstr "" -#: lib/unicodeio.c:103 +#: lib/unicodeio.c:102 msgid "iconv function not usable" msgstr "функцията iconv не е използваема" -#: lib/unicodeio.c:105 +#: lib/unicodeio.c:104 msgid "iconv function not available" msgstr "функцията iconv е недостъпна" -#: lib/unicodeio.c:112 +#: lib/unicodeio.c:111 msgid "character out of range" msgstr "знак извън диапазона" -#: lib/unicodeio.c:182 +#: lib/unicodeio.c:181 #, c-format msgid "cannot convert U+%04X to local character set" msgstr "не може да се конвертира U+%04X в локалното кодиране" -#: lib/unicodeio.c:184 +#: lib/unicodeio.c:183 #, c-format msgid "cannot convert U+%04X to local character set: %s" msgstr "не може да се конвертира U+%04X в локалното кодиране: %s" @@ -782,7 +782,7 @@ msgstr "" "Съобщавайте за програмни грешки на <%s>.\n" "За грешки в българския превод на <dict@fsa-bg.org>\n" -#: lib/version-etc.c:251 src/system.h:562 +#: lib/version-etc.c:251 src/system.h:573 #, c-format msgid "%s home page: <%s>\n" msgstr "" @@ -792,7 +792,7 @@ msgstr "" msgid "%s home page: <http://www.gnu.org/software/%s/>\n" msgstr "" -#: lib/version-etc.c:256 src/system.h:563 +#: lib/version-etc.c:256 src/system.h:574 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" @@ -883,14 +883,13 @@ msgstr "" msgid "" "Usage: %s [OPTION]... [FILE]\n" "Base64 encode or decode FILE, or standard input, to standard output.\n" -"\n" msgstr "" "Използване: %s [ОПЦИЯ] [ФАЙЛ]\n" "Кодира/декодира с основа 64 от ФАЙЛ или стандартния вход към стандартния " "изход\n" "\n" -#: src/base64.c:64 +#: src/base64.c:67 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -900,7 +899,7 @@ msgid "" "\n" msgstr "" -#: src/base64.c:73 src/cat.c:110 src/fmt.c:293 src/shuf.c:71 src/sum.c:70 +#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -908,7 +907,7 @@ msgstr "" "\n" "Ако няма ФАЙЛ или ако ФАЙЛ е -, се чете от стандартния вход.\n" -#: src/base64.c:76 +#: src/base64.c:79 #, fuzzy msgid "" "\n" @@ -924,37 +923,37 @@ msgstr "" "ред)\n" "във входния поток.\n" -#: src/base64.c:171 src/base64.c:208 src/csplit.c:263 src/csplit.c:1435 -#: src/join.c:451 src/shuf.c:157 src/shuf.c:361 src/tac-pipe.c:74 +#: 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 #, c-format msgid "read error" msgstr "грешка при четене" -#: src/base64.c:227 +#: src/base64.c:230 #, c-format msgid "invalid input" msgstr "недопустим вход" -#: src/base64.c:264 +#: src/base64.c:267 #, c-format msgid "invalid wrap size: %s" msgstr "неправилен размер за пренасяне: %s" -#: src/base64.c:283 src/basename.c:173 src/comm.c:435 src/cp.c:607 -#: src/date.c:441 src/dircolors.c:447 src/du.c:894 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:169 src/install.c:929 src/join.c:961 -#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:157 src/mv.c:447 -#: src/od.c:1802 src/ptx.c:2081 src/readlink.c:154 src/seq.c:408 -#: src/shuf.c:320 src/shuf.c:339 src/sort.c:4477 src/split.c:1313 -#: src/tr.c:1797 src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:454 -#: src/uniq.c:471 src/unlink.c:81 src/uptime.c:250 src/users.c:146 -#: src/wc.c:666 src/who.c:836 src/whoami.c:79 +#: 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 #, c-format msgid "extra operand %s" msgstr "излишен операнд „%s“" -#: src/base64.c:315 src/cat.c:781 +#: src/base64.c:318 src/cat.c:781 #, c-format msgid "closing standard input" msgstr "затваряне на стандартния вход" @@ -962,15 +961,15 @@ 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/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:53 src/env.c:33 +#: 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/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:65 src/su.c:88 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 +#: 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 и David MacKenzie" @@ -985,23 +984,23 @@ msgstr "" " или: %s ОПЦИЯ\n" #: src/basename.c:53 +#, fuzzy msgid "" "Print NAME with any leading directory components removed.\n" "If specified, also remove a trailing SUFFIX.\n" -"\n" msgstr "" "Отстранява от ИМЕ каталозите в началото и го отпечатва.\n" "Ако е посочено, изтрива също и РАЗШИРЕНИЕ-то в края.\n" "\n" -#: src/basename.c:59 +#: 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" msgstr "" -#: src/basename.c:66 +#: src/basename.c:67 #, c-format msgid "" "\n" @@ -1012,20 +1011,21 @@ msgid "" " %s -a any/str1 any/str2 -> \"str1\" followed by \"str2\"\n" msgstr "" -#: src/basename.c:167 src/chcon.c:531 src/chgrp.c:277 src/chmod.c:526 -#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1369 +#: 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:183 src/mkfifo.c:108 src/mknod.c:146 src/nohup.c:111 -#: src/pathchk.c:148 src/printf.c:674 src/readlink.c:146 src/realpath.c:236 -#: src/rm.c:314 src/rmdir.c:223 src/seq.c:402 src/setuidgid.c:137 -#: src/sleep.c:119 src/stat.c:1476 src/stdbuf.c:346 src/tr.c:1782 +#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 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 #, 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:52 src/split.c:49 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/split.c:49 msgid "Torbjorn Granlund" msgstr "" @@ -1036,8 +1036,8 @@ msgstr "" msgid "Richard M. Stallman" msgstr "Torbjorn Granlund и Richard M. Stallman" -#: src/cat.c:88 src/df.c:846 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4720 src/nl.c:182 src/paste.c:435 src/pr.c:2768 src/sum.c:58 +#: 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/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 +1097,7 @@ msgstr "" msgid "cannot do ioctl on %s" msgstr "не може да се изпълни ioctl за „%s“" -#: src/cat.c:637 src/dd.c:2209 src/sort.c:379 src/tee.c:165 src/yes.c:86 +#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86 #, c-format msgid "standard output" msgstr "стандартният изход" @@ -1114,7 +1114,7 @@ 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:55 src/head.c:46 src/hostid.c:33 +#: 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 @@ -1122,7 +1122,7 @@ msgstr "" msgid "Jim Meyering" msgstr "Jim Meyering и Paul Eggert" -#: src/chcon.c:100 src/runcon.c:203 src/runcon.c:234 +#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238 #, fuzzy, c-format msgid "failed to create security context: %s" msgstr "промяната на собственика на %s не успя\n" @@ -1132,8 +1132,8 @@ msgstr "промяната на собственика на %s не успя\n" msgid "failed to set %s security context component to %s" msgstr "" -#: src/chcon.c:156 src/chcon.c:540 src/copy.c:2222 src/runcon.c:217 -#: src/stat.c:683 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221 +#: src/stat.c:702 #, fuzzy, c-format msgid "failed to get security context of %s" msgstr "не могат да се получат атрибутите на %s" @@ -1149,12 +1149,12 @@ 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:446 src/ls.c:2981 +#: src/du.c:457 src/ls.c:2981 #, c-format msgid "cannot access %s" msgstr "няма достъп до %s" -#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:426 +#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437 #, c-format msgid "cannot read directory %s" msgstr "каталогът %s не може да се чете" @@ -1164,13 +1164,13 @@ 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:599 +#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562 #, 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:618 -#: src/remove.c:613 +#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642 +#: src/remove.c:576 #, fuzzy, c-format msgid "fts_close failed" msgstr "неуспешно затваряне на файл" @@ -1191,10 +1191,9 @@ msgid "" "Change the security context of each FILE to CONTEXT.\n" "With --reference, change the security context of each FILE to that of " "RFILE.\n" -"\n" msgstr "" -#: src/chcon.c:362 src/chgrp.c:123 src/chown.c:94 +#: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94 msgid "" " --dereference affect the referent of each symbolic link (this is\n" " the default), rather than the symbolic link itself\n" @@ -1202,7 +1201,7 @@ msgid "" "file\n" msgstr "" -#: src/chcon.c:367 +#: src/chcon.c:369 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" @@ -1210,7 +1209,17 @@ msgid "" " -l, --range=RANGE set range RANGE in the target security context\n" msgstr "" -#: src/chcon.c:373 +#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110 +#, fuzzy +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" + +#: src/chcon.c:379 #, fuzzy msgid "" " --reference=RFILE use RFILE's security context rather than " @@ -1223,15 +1232,15 @@ msgstr "" " -v, --verbose извежда диагностично съобщение за всеки обработен " "файл\n" -#: src/chcon.c:377 src/chgrp.c:140 src/chown.c:118 +#: 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:380 +#: src/chcon.c:386 msgid " -v, --verbose output a diagnostic for every file processed\n" msgstr "" -#: src/chcon.c:383 src/chgrp.c:143 src/chown.c:121 +#: src/chcon.c:389 src/chgrp.c:143 src/chown.c:121 #, fuzzy msgid "" "\n" @@ -1259,36 +1268,36 @@ msgstr "" "подразбиране)\n" "\n" -#: src/chcon.c:512 src/chgrp.c:264 src/chown.c:267 +#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267 #, c-format msgid "-R --dereference requires either -H or -L" msgstr "-R --dereference изисква -H или -L" -#: src/chcon.c:518 +#: src/chcon.c:524 #, c-format msgid "-R -h requires -P" msgstr "-R -h изисква -P" -#: src/chcon.c:533 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282 -#: src/comm.c:429 src/csplit.c:1371 src/join.c:1149 src/link.c:79 -#: src/mknod.c:148 src/setuidgid.c:139 src/tr.c:1785 +#: 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 #, c-format msgid "missing operand after %s" msgstr "липсващ операнд след %s" -#: src/chcon.c:556 src/runcon.c:247 +#: src/chcon.c:562 src/runcon.c:251 #, fuzzy, c-format msgid "invalid context: %s" msgstr "неправилен режим за достъп %s" -#: src/chcon.c:563 +#: src/chcon.c:569 #, c-format msgid "conflicting security context specifiers given" msgstr "" -#: src/chcon.c:572 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:433 src/cp.c:493 -#: src/mv.c:96 src/pwd.c:273 src/rm.c:324 src/touch.c:351 +#: 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 #, c-format msgid "failed to get attributes of %s" msgstr "не могат да се получат атрибутите на %s" @@ -1332,16 +1341,6 @@ msgstr "" " файлове (само при системи, позволяващи промяна на\n" " собствеността на символна връзка)\n" -#: src/chgrp.c:132 src/chmod.c:387 src/chown.c:110 -#, fuzzy -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" - #: src/chgrp.c:136 msgid "" " --reference=RFILE use RFILE's group rather than specifying a\n" @@ -1420,8 +1419,14 @@ msgid "" msgstr "" #: src/chmod.c:391 +#, fuzzy 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 msgid " -R, --recursive change files and directories recursively\n" @@ -1595,7 +1600,7 @@ msgstr "" msgid "Roland McGrath" msgstr "" -#: src/chroot.c:97 src/install.c:575 src/setuidgid.c:110 src/setuidgid.c:120 +#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120 #, c-format msgid "invalid group %s" msgstr "неправилна група %s" @@ -1663,8 +1668,8 @@ msgstr "не може да се изпълни stat за %s" msgid "failed to set user-ID" msgstr "не може да се изпълни stat за %s" -#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:213 src/stdbuf.c:366 -#: src/timeout.c:402 +#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365 +#: src/timeout.c:454 #, fuzzy, c-format msgid "failed to run command %s" msgstr "неуспешно изпълнение на командата %s" @@ -1772,20 +1777,24 @@ msgstr "посочени са много опции -i" msgid "empty %s not allowed" msgstr "допълнителният операнд %s не е позволен с -c" -#: src/copy.c:168 src/dd.c:1609 src/dd.c:1976 +#: 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 #, c-format -msgid "reading %s" -msgstr "чете се %s" +msgid "error reading %s" +msgstr "грешка при четене на %s" -#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:426 +#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425 #, c-format msgid "cannot lseek %s" msgstr "не може да се обработи непоследователно %s" -#: src/copy.c:206 src/dd.c:2039 src/dd.c:2102 +#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151 #, c-format -msgid "writing %s" -msgstr "записва се %s" +msgid "error writing %s" +msgstr "грешка при запис в %s" #: src/copy.c:313 #, fuzzy, c-format @@ -1807,7 +1816,7 @@ msgstr "не може да се отвори %s" msgid "clearing permissions for %s" msgstr "установява се режимът за достъп до %s" -#: src/copy.c:697 src/copy.c:2470 src/cp.c:331 +#: src/copy.c:697 src/copy.c:2480 src/cp.c:329 #, c-format msgid "failed to preserve ownership for %s" msgstr "собствеността на %s не можа да се запази" @@ -1822,14 +1831,14 @@ msgstr "не може да се търси файла %s" msgid "failed to preserve authorship for %s" msgstr "не можа да се запази авторството на %s" -#: src/copy.c:804 src/csplit.c:638 src/du.c:901 src/fmt.c:449 src/head.c:847 -#: src/sort.c:4489 src/split.c:1329 src/tail.c:1756 src/wc.c:678 +#: 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 "не може да се отвори %s за четене" -#: src/copy.c:810 src/copy.c:972 src/dd.c:1546 src/dd.c:2114 src/dd.c:2252 -#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:141 +#: 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 #, c-format msgid "cannot fstat %s" msgstr "не може да се получи режимът за достъп до %s" @@ -1849,14 +1858,14 @@ msgstr "не успешно затваряне на стандартната г msgid "failed to set the security context of %s to %s" msgstr "групата на %s не можа да се промени на %s\n" -#: src/copy.c:881 src/copy.c:1574 src/copy.c:1777 src/copy.c:1935 src/ln.c:314 -#: src/remove.c:267 src/remove.c:293 src/remove.c:444 src/remove.c:465 +#: 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 #, c-format msgid "cannot remove %s" msgstr "не може да се изтрие %s" -#: src/copy.c:886 src/copy.c:1578 src/copy.c:1772 src/copy.c:1940 -#: src/remove.c:418 +#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945 +#: src/remove.c:375 #, c-format msgid "removed %s\n" msgstr "%s е изтрит\n" @@ -1874,192 +1883,192 @@ msgstr "не може да се създаде обикновен файл %s" #: src/copy.c:985 #, fuzzy, c-format msgid "failed to clone %s from %s" -msgstr "не може да се отвори %s" +msgstr "каталогът %s не може да се затвори" -#: src/copy.c:1098 src/copy.c:2531 +#: src/copy.c:1098 src/copy.c:2541 #, c-format msgid "preserving times for %s" msgstr "времената за %s се запазват" -#: src/copy.c:1170 src/copy.c:1176 src/head.c:855 src/touch.c:175 -#: src/truncate.c:413 -#, c-format -msgid "closing %s" -msgstr "затваря се %s" +#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172 +#: src/truncate.c:417 +#, fuzzy, c-format +msgid "failed to close %s" +msgstr "не може да се отвори %s" -#: src/copy.c:1466 +#: src/copy.c:1471 #, fuzzy, c-format msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? " msgstr "%s: да се замести ли %s (режимът за достъп е %04lo)? " -#: src/copy.c:1473 +#: src/copy.c:1478 #, c-format msgid "%s: overwrite %s? " msgstr "%s: да се замести ли %s? " -#: src/copy.c:1542 +#: src/copy.c:1547 #, c-format msgid " (backup: %s)" msgstr " (резервно копие: %s)" -#: src/copy.c:1552 +#: src/copy.c:1557 #, c-format msgid "failed to restore the default file creation context" msgstr "" -#: src/copy.c:1584 +#: src/copy.c:1589 #, c-format msgid "cannot create hard link %s to %s" msgstr "не може да се направи твърда връзка %s към %s" -#: src/copy.c:1637 src/copy.c:1689 src/copy.c:2272 src/copy.c:2589 +#: 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:1220 src/truncate.c:365 +#: src/stat.c:1239 src/truncate.c:363 #, c-format msgid "cannot stat %s" msgstr "не могат да се получат атрибутите на %s" -#: src/copy.c:1645 +#: src/copy.c:1650 #, c-format msgid "omitting directory %s" msgstr "каталогът %s се пропуска" -#: src/copy.c:1659 +#: src/copy.c:1664 #, c-format msgid "warning: source file %s specified more than once" msgstr "внимание: изходния файл %s е посочен повече от веднъж" -#: src/copy.c:1707 src/ln.c:246 +#: src/copy.c:1712 src/ln.c:246 #, c-format msgid "%s and %s are the same file" msgstr "%s и %s са един и същ файл" -#: src/copy.c:1806 +#: src/copy.c:1811 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "%s не е каталог и не може да се замести с каталога %s" -#: src/copy.c:1824 src/ln.c:214 +#: src/copy.c:1829 src/ln.c:214 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "току що създаденият %s няма да бъде заместен с %s" -#: src/copy.c:1842 +#: src/copy.c:1847 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "каталогът %s не може да се замести с файл, който не е каталог" -#: src/copy.c:1856 +#: src/copy.c:1861 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "" "каталог не може да се премести върху файл, който не е каталог: %s -> %s" -#: src/copy.c:1886 +#: src/copy.c:1891 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "резервното копиране на %s би разрушило източника; %s не бе преместен" -#: src/copy.c:1887 +#: src/copy.c:1892 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "резервното копиране на %s би разрушило източника; %s не бе копиран" -#: src/copy.c:1910 src/ln.c:276 +#: src/copy.c:1915 src/ln.c:276 #, c-format msgid "cannot backup %s" msgstr "не може да се направи резервно копие на %s" -#: src/copy.c:1974 +#: src/copy.c:1979 #, fuzzy, c-format msgid "will not copy %s through just-created symlink %s" msgstr "току що създаденият %s няма да бъде заместен с %s" -#: src/copy.c:2051 +#: src/copy.c:2056 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "не може да се копира каталог (%s) в самия себе си (%s)" -#: src/copy.c:2068 +#: src/copy.c:2073 #, c-format msgid "will not create hard link %s to directory %s" msgstr "няма да се направи твърда връзка %s към каталога %s" -#: src/copy.c:2118 +#: src/copy.c:2123 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "не може да се премести %s в своя подкаталог %s" -#: src/copy.c:2161 +#: src/copy.c:2166 #, c-format msgid "cannot move %s to %s" msgstr "не може да се премести %s в %s" -#: src/copy.c:2173 +#: src/copy.c:2178 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" "преместването между устройства не успя (от %s в %s); целевият файл не можа " "да се изтрие" -#: src/copy.c:2207 src/install.c:905 src/mkdir.c:189 src/mkfifo.c:114 -#: src/mknod.c:167 +#: 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:2241 +#: src/copy.c:2246 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "не може да се копира цикличната символна връзка %s" -#: src/copy.c:2350 +#: src/copy.c:2355 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "" "%s: относителни символни връзки може да се правят само в текущия каталог" -#: src/copy.c:2357 +#: src/copy.c:2362 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "не може да се създаде символна връзка %s към %s" -#: src/copy.c:2406 src/mkfifo.c:133 +#: src/copy.c:2416 src/mkfifo.c:132 #, c-format msgid "cannot create fifo %s" msgstr "не може да се създаде именуван канал %s" -#: src/copy.c:2415 +#: src/copy.c:2425 #, c-format msgid "cannot create special file %s" msgstr "не може да се създаде специален файл %s" -#: src/copy.c:2426 src/ls.c:3191 src/stat.c:902 +#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921 #, c-format msgid "cannot read symbolic link %s" msgstr "не може да се чете символната връзка %s" -#: src/copy.c:2453 +#: src/copy.c:2463 #, c-format msgid "cannot create symbolic link %s" msgstr "не може да се създаде символна връзка %s" -#: src/copy.c:2485 +#: src/copy.c:2495 #, c-format msgid "%s has unknown file type" msgstr "%s има непознат файлов тип" -#: src/copy.c:2629 src/ln.c:358 +#: src/copy.c:2644 src/ln.c:358 #, c-format msgid "cannot un-backup %s" msgstr "не може да се възстанови от резервно копие %s" -#: src/copy.c:2633 +#: src/copy.c:2648 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (от резервно копие)\n" -#: src/cp.c:156 src/mv.c:284 +#: src/cp.c:156 src/mv.c:286 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -2071,26 +2080,13 @@ msgstr "" " или: %s [ОПЦИЯ]... -t КАТАЛОГ ИЗТОЧНИК...\n" #: src/cp.c:162 -msgid "" -"Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" -"\n" +#, fuzzy +msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" msgstr "" "Копира ИЗТОЧНИК в ЦЕЛ или много ИЗТОЧНИЦ(и) в КАТАЛОГ.\n" "\n" -#: src/cp.c:166 src/csplit.c:1458 src/cut.c:197 src/df.c:852 src/du.c:268 -#: src/expand.c:112 src/fmt.c:275 src/fold.c:75 src/head.c:115 -#: src/install.c:612 src/kill.c:86 src/ln.c:392 src/ls.c:4726 src/mkdir.c:61 -#: src/mkfifo.c:56 src/mknod.c:58 src/mv.c:294 src/nl.c:191 src/paste.c:445 -#: src/pr.c:2777 src/ptx.c:1825 src/shred.c:153 src/shuf.c:58 src/sort.c:399 -#: src/split.c:211 src/stdbuf.c:95 src/tac.c:142 src/tail.c:268 -#: src/touch.c:226 src/truncate.c:107 src/unexpand.c:122 src/uniq.c:145 -msgid "" -"Mandatory arguments to long options are mandatory for short options too.\n" -msgstr "" -"Аргументите, задължителни за дългите опции, са задължителни и за късите.\n" - -#: src/cp.c:169 +#: src/cp.c:168 #, fuzzy msgid "" " -a, --archive same as -dR --preserve=all\n" @@ -2113,13 +2109,14 @@ msgstr "" "рекурс.\n" " -d като --no-dereference --preserve=link\n" -#: src/cp.c:178 +#: src/cp.c:177 #, fuzzy msgid "" " -f, --force if an existing destination file cannot be\n" -" opened, remove it and try again (redundant " -"if\n" -" the -n option is used)\n" +" opened, remove it and try again (this " +"option\n" +" is ignored when the -n option is also " +"used)\n" " -i, --interactive prompt before overwrite (overrides a previous " "-n\n" " option)\n" @@ -2131,7 +2128,7 @@ msgstr "" " -H копира файла от символна връзка на командния " "ред\n" -#: src/cp.c:188 +#: src/cp.c:186 #, fuzzy msgid "" " -l, --link hard link files instead of copying\n" @@ -2140,7 +2137,7 @@ msgstr "" " -l, --link не копира, а прави връзки (твърди)\n" " -L, --dereference винаги проследява символните връзки\n" -#: src/cp.c:192 +#: src/cp.c:190 #, fuzzy msgid "" " -n, --no-clobber do not overwrite an existing file (overrides\n" @@ -2153,7 +2150,7 @@ msgstr "" " -H копира файла от символна връзка на командния " "ред\n" -#: src/cp.c:197 +#: src/cp.c:195 #, fuzzy msgid "" " -p same as --preserve=mode,ownership,timestamps\n" @@ -2171,7 +2168,7 @@ msgstr "" "възможност и\n" " следните допълнителни атрибути: links, all\n" -#: src/cp.c:205 +#: src/cp.c:203 msgid "" " --no-preserve=ATTR_LIST don't preserve the specified attributes\n" " --parents use full source file name under DIRECTORY\n" @@ -2179,7 +2176,7 @@ msgstr "" " --no-preserve=СПИС_АТРИБ да не се запазват посочените атрибути\n" " --parents допълва КАТАЛОГ с пътеката в ИЗТОЧНИК\n" -#: src/cp.c:209 +#: src/cp.c:207 #, fuzzy msgid "" " -R, -r, --recursive copy directories recursively\n" @@ -2192,7 +2189,7 @@ msgstr "" " --remove-destination премахва всеки съществуващ целеви файл преди\n" " да се опитва отваряне (сравнете с --force)\n" -#: src/cp.c:215 +#: src/cp.c:213 #, fuzzy msgid "" " --sparse=WHEN control creation of sparse files. See below\n" @@ -2204,7 +2201,7 @@ msgstr "" " --strip-trailing-slashes премахва крайните „/“ от всеки аргумент " "ИЗТОЧНИК\n" -#: src/cp.c:220 +#: src/cp.c:218 msgid "" " -s, --symbolic-link make symbolic links instead of copying\n" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -2218,7 +2215,7 @@ msgstr "" "КАТАЛОГ\n" " -T, --no-target-directory работи с ЦЕЛ като с нормален файл\n" -#: src/cp.c:226 +#: src/cp.c:224 msgid "" " -u, --update copy only when the SOURCE file is newer\n" " than the destination file or when the\n" @@ -2232,7 +2229,7 @@ msgstr "" " -v, --verbose съобщава какво се прави\n" " -x, --one-file-system остава в текущата файлова система\n" -#: src/cp.c:235 +#: src/cp.c:233 #, fuzzy msgid "" "\n" @@ -2258,7 +2255,7 @@ msgstr "" "Ползвайте --sparse=never, за да забраните създаването на разредени файлове.\n" "\n" -#: src/cp.c:247 src/install.c:649 src/ln.c:421 src/mv.c:321 +#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322 #, fuzzy msgid "" "\n" @@ -2276,7 +2273,7 @@ msgstr "" "се посочва с --backup или с променливата VERSION_CONTROL. Ето стойностите:\n" "\n" -#: src/cp.c:254 src/install.c:656 src/mv.c:328 +#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329 msgid "" " none, off never make backups (even if --backup is given)\n" " numbered, t make numbered backups\n" @@ -2290,7 +2287,7 @@ msgstr "" "иначе\n" " simple, never винаги да се правят прости резервни копия\n" -#: src/cp.c:260 +#: src/cp.c:258 msgid "" "\n" "As a special case, cp makes a backup of SOURCE when the force and backup\n" @@ -2303,91 +2300,91 @@ msgstr "" "и също име на съществуващ обикновен файл, cp прави резервно копие на " "ИЗТОЧНИК.\n" -#: src/cp.c:319 +#: src/cp.c:317 #, c-format msgid "failed to preserve times for %s" msgstr "времената на %s не можаха да се запазят" -#: src/cp.c:350 +#: src/cp.c:348 #, c-format msgid "failed to preserve permissions for %s" msgstr "правата за достъп до %s не можаха да се запазят" -#: src/cp.c:477 +#: src/cp.c:475 #, c-format msgid "cannot make directory %s" msgstr "не може да се направи каталог %s" -#: src/cp.c:526 src/cp.c:545 +#: src/cp.c:524 src/cp.c:543 #, c-format msgid "%s exists but is not a directory" msgstr "%s съществува, но не е каталог" -#: src/cp.c:572 src/cp.c:1068 src/install.c:401 src/install.c:844 src/ln.c:123 -#: src/ln.c:181 src/ln.c:202 src/ln.c:516 src/mv.c:152 src/mv.c:399 -#, c-format -msgid "accessing %s" -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 +#, fuzzy, c-format +msgid "failed to access %s" +msgstr "не може да се отвори %s" -#: src/cp.c:592 src/install.c:914 src/ln.c:546 src/mv.c:432 src/shred.c:1182 -#: src/touch.c:433 src/truncate.c:356 +#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181 +#: src/touch.c:429 src/truncate.c:354 #, c-format msgid "missing file operand" msgstr "липсващ файлов операнд" -#: src/cp.c:594 src/install.c:916 src/ln.c:560 src/mv.c:434 +#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436 #, c-format msgid "missing destination file operand after %s" msgstr "липсващ операнд за целеви файл след %s" -#: src/cp.c:603 src/install.c:925 src/mv.c:443 +#: src/cp.c:601 src/install.c:926 src/mv.c:445 #, 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:619 src/cp.c:1070 src/install.c:403 src/install.c:846 -#: src/install.c:938 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:401 -#: src/mv.c:457 +#: 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 #, c-format msgid "target %s is not a directory" msgstr "целта %s не е каталог" -#: src/cp.c:730 +#: src/cp.c:728 #, c-format msgid "with --parents, the destination must be a directory" msgstr "с --parents целта трябва да бъде каталог" -#: src/cp.c:1063 src/install.c:839 src/ln.c:511 src/mv.c:394 +#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395 #, c-format msgid "multiple target directories specified" msgstr "посочени са много целеви каталози" -#: src/cp.c:1108 +#: src/cp.c:1110 #, c-format msgid "cannot make both hard and symbolic links" msgstr "не може едновременно да се правят твърди и символни връзки" -#: src/cp.c:1115 src/mv.c:464 +#: src/cp.c:1117 src/mv.c:466 #, fuzzy, c-format msgid "options --backup and --no-clobber are mutually exclusive" msgstr "опциите --string и --check не може да се използват едновременно" -#: src/cp.c:1121 +#: src/cp.c:1123 #, c-format msgid "--reflink can be used only with --sparse=auto" msgstr "" -#: src/cp.c:1129 src/install.c:899 src/ln.c:582 src/mv.c:472 +#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474 msgid "backup type" msgstr "тип резервни копия" -#: src/cp.c:1154 +#: src/cp.c:1156 #, c-format msgid "cannot preserve security context without an SELinux-enabled kernel" msgstr "" -#: src/cp.c:1160 +#: src/cp.c:1162 #, c-format msgid "cannot preserve extended attributes, cp is built without xattr support" msgstr "" @@ -2397,139 +2394,138 @@ msgstr "" msgid "Stuart Kemp" msgstr "" -#: src/csplit.c:529 +#: src/csplit.c:531 #, c-format msgid "input disappeared" msgstr "входът изчезна" -#: src/csplit.c:658 src/csplit.c:669 +#: src/csplit.c:660 src/csplit.c:671 #, c-format msgid "%s: line number out of range" msgstr "%s: номерът на ред е извън диапазона" -#: src/csplit.c:698 +#: src/csplit.c:700 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: номерът на ред е извън диапазона" # Не е ясно за какво служи това. -#: src/csplit.c:701 src/csplit.c:750 +#: src/csplit.c:703 src/csplit.c:752 #, c-format msgid " on repetition %s\n" msgstr " при повтаряне %s\n" -#: src/csplit.c:744 +#: src/csplit.c:746 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: не е открито съответствие" -#: src/csplit.c:808 src/csplit.c:848 src/nl.c:359 src/tac.c:274 +#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273 #, c-format msgid "error in regular expression search" msgstr "грешка при търсене на регулярен израз" -#: src/csplit.c:981 +#: src/csplit.c:983 #, c-format msgid "write error for %s" msgstr "грешка при запис за %s" -#: src/csplit.c:1057 +#: src/csplit.c:1059 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: след разделител се очаква цяло число" -#: src/csplit.c:1073 +#: src/csplit.c:1075 #, fuzzy, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: при означаване брой повторения е необходим „}“" -#: src/csplit.c:1083 +#: src/csplit.c:1085 #, fuzzy, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: между „{“ и „}“ е необходимо цяло число" -#: src/csplit.c:1110 +#: src/csplit.c:1112 #, fuzzy, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: липсва затварящ ограничител „%c“" -#: src/csplit.c:1127 +#: src/csplit.c:1129 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: неправилен регулярен израз: %s" -#: src/csplit.c:1160 +#: src/csplit.c:1162 #, c-format msgid "%s: invalid pattern" msgstr "%s: неправилен образец" -#: src/csplit.c:1163 +#: src/csplit.c:1165 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: номерът на ред трябва да бъде положителен" -#: src/csplit.c:1169 +#: src/csplit.c:1171 #, c-format msgid "line number %s is smaller than preceding line number, %s" msgstr "номерът на ред %s е по-малък от предходния номер - %s" -#: src/csplit.c:1175 +#: src/csplit.c:1177 #, c-format msgid "warning: line number %s is the same as preceding line number" msgstr "внимание: номерът на ред %s съвпада с предходния номер на ред" -#: src/csplit.c:1253 +#: src/csplit.c:1255 #, c-format msgid "missing conversion specifier in suffix" msgstr "в суфикса липсва означител за преобразуване" -#: src/csplit.c:1259 +#: src/csplit.c:1261 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "неправилен означител за преобразуване в суфикса: %c" -#: src/csplit.c:1262 +#: src/csplit.c:1264 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "неправилен означител за преобразуване в суфикса: \\%.3o" -#: src/csplit.c:1267 +#: src/csplit.c:1269 #, fuzzy, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "%.*s: неправилна спецификация на преобразувание" -#: src/csplit.c:1284 +#: src/csplit.c:1286 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "твърде много означители за преобразуване %% в суфикса" -#: src/csplit.c:1298 +#: src/csplit.c:1300 #, c-format msgid "missing %% conversion specification in suffix" msgstr "липсва означител %% за преобразуване в суфикса" -#: src/csplit.c:1345 +#: src/csplit.c:1347 #, c-format msgid "%s: invalid number" msgstr "%s: недопустимо число" -#: src/csplit.c:1449 +#: src/csplit.c:1451 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Използване: %s [ОПЦИЯ]... ФАЙЛ ОБРАЗЕЦ...\n" -#: src/csplit.c:1453 +#: src/csplit.c:1455 #, 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" -"\n" msgstr "" "Отделя частите на ФАЙЛ, разделени от ОБРАЗЕЦ(и) и ги записва във файлове\n" "“xx01“, „xx02“,... Дължината им в байтове се извежда на стандартния изход.\n" "\n" -#: src/csplit.c:1461 +#: src/csplit.c:1462 #, fuzzy, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2541,7 +2537,7 @@ msgstr "" " -k, --keep-files да не се изтриват създадените файлове при " "грешка\n" -#: src/csplit.c:1466 +#: src/csplit.c:1467 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 +2548,7 @@ msgstr "" "файлове\n" " -z, --elide-empty-files да се изтриват генерираните празни файлове\n" -#: src/csplit.c:1473 +#: src/csplit.c:1474 msgid "" "\n" "Read standard input if FILE is -. Each PATTERN may be:\n" @@ -2560,7 +2556,7 @@ msgstr "" "\n" "Ако ФАЙЛ е -, се чете от стандартния вход. Всеки ОБРАЗЕЦ може да бъде:\n" -#: src/csplit.c:1477 +#: src/csplit.c:1478 #, fuzzy msgid "" "\n" @@ -2586,7 +2582,7 @@ msgstr "" msgid "David M. Ihnat" msgstr "" -#: src/cut.c:64 +#: src/cut.c:64 src/cut.c:372 msgid "fields and positions are numbered from 1" msgstr "" @@ -2596,14 +2592,13 @@ msgid "Usage: %s OPTION... [FILE]...\n" msgstr "Използване: %s [ОПЦИЯ]... [ФАЙЛ]...\n" #: src/cut.c:193 -msgid "" -"Print selected parts of lines from each FILE to standard output.\n" -"\n" +#, fuzzy +msgid "Print selected parts of lines from each FILE to standard output.\n" msgstr "" "Отпечатва избраните части от редовете на всеки ФАЙЛ на стандартния изход.\n" "\n" -#: src/cut.c:200 +#: src/cut.c:199 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2614,7 +2609,7 @@ msgstr "" " -d, --delimiter=РАЗДЕЛ РАЗДЕЛ вместо табулация като разделител между " "полетата\n" -#: src/cut.c:205 +#: src/cut.c:204 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2627,7 +2622,7 @@ msgstr "" " ако е посочена и опцията -s.\n" " -n (пренебрегва се)\n" -#: src/cut.c:211 +#: src/cut.c:210 #, fuzzy msgid "" " --complement complement the set of selected bytes, characters\n" @@ -2636,7 +2631,7 @@ msgstr "" " --complement извежда допълнението на съвкупността от избрани\n" " байтове, знаци или полета.\n" -#: src/cut.c:215 +#: src/cut.c:214 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2647,7 +2642,7 @@ msgstr "" " --output-delimiter=НИЗ да се ползва НИЗ като разделител на изхода\n" " по подразбиране се използва входният разделител\n" -#: src/cut.c:222 +#: src/cut.c:221 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2655,7 +2650,7 @@ msgid "" "in the same order that it is read, and is written exactly once.\n" msgstr "" -#: src/cut.c:228 +#: src/cut.c:227 #, fuzzy msgid "" "Each range is one of:\n" @@ -2680,47 +2675,49 @@ msgstr "" "\n" "Без ФАЙЛ или ако ФАЙЛ е - се чете от стандартния вход.\n" -#: src/cut.c:368 src/cut.c:489 -msgid "invalid byte or field list" +#: src/cut.c:367 src/cut.c:493 +#, fuzzy +msgid "invalid byte, character or field list" msgstr "неправилен списък байтове или полета" -#: src/cut.c:385 +#: src/cut.c:387 #, fuzzy msgid "invalid range with no endpoint: -" msgstr "неправилна опция за ширина: %s" -#: src/cut.c:399 +#: src/cut.c:403 #, fuzzy msgid "invalid decreasing range" msgstr "неправилен входен диапазон: %s" -#: src/cut.c:478 +#: src/cut.c:482 #, c-format msgid "byte offset %s is too large" msgstr "байтовото отместване %s е твърде дълго" -#: src/cut.c:481 +#: src/cut.c:485 #, c-format msgid "field number %s is too large" msgstr "номерът на поле %s е твърде голям" -#: src/cut.c:789 src/cut.c:797 +#: src/cut.c:795 src/cut.c:803 msgid "only one type of list may be specified" msgstr "трябва да се посочи само един вид списък" -#: src/cut.c:806 +#: src/cut.c:812 src/numfmt.c:1408 +#, c-format msgid "the delimiter must be a single character" msgstr "разделителят трябва да се състои от един знак" -#: src/cut.c:841 +#: src/cut.c:847 msgid "you must specify a list of bytes, characters, or fields" msgstr "трябва да посочите списък байтове, знаци или полета" -#: src/cut.c:844 +#: src/cut.c:850 msgid "an input delimiter may be specified only when operating on fields" msgstr "входен разделител може да се посочва само ако се работи с полета" -#: src/cut.c:848 +#: src/cut.c:854 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2728,11 +2725,11 @@ msgstr "" "потискането на редове, несъдържащи разделител, има смисъл\n" "\tсамо ако се работи с полета" -#: src/cut.c:864 +#: src/cut.c:870 msgid "missing list of fields" msgstr "липсва списък полета" -#: src/cut.c:866 +#: src/cut.c:872 msgid "missing list of positions" msgstr "липсва списък позиции" @@ -2746,10 +2743,12 @@ msgstr "" " или: %s [-u|--utc|--universal] [ММДДччмм[[ГГ]ГГ][.сс]]\n" #: src/date.c:128 +msgid "Display the current time in the given FORMAT, or set the system date.\n" +msgstr "" + +#: src/date.c:134 #, 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" " -I[TIMESPEC], --iso-8601[=TIMESPEC] output date/time in ISO 8601 format.\n" @@ -2772,14 +2771,14 @@ msgstr "" " --iso-8601 без ВИДВРЕМЕ е еквивалентно на " "„date“.\n" -#: src/date.c:138 +#: src/date.c:142 msgid "" " -r, --reference=FILE display the last modification time of FILE\n" " -R, --rfc-2822 output date and time in RFC 2822 format.\n" " Example: Mon, 07 Aug 2006 12:34:56 -0600\n" msgstr "" -#: src/date.c:143 +#: src/date.c:147 #, fuzzy msgid "" " --rfc-3339=TIMESPEC output date and time in RFC 3339 format.\n" @@ -2800,7 +2799,7 @@ msgstr "" "НИЗ\n" " -u, --utc, --universal отпечатва или настройва гринуичко време\n" -#: src/date.c:154 +#: src/date.c:158 #, fuzzy msgid "" "\n" @@ -2818,7 +2817,7 @@ msgstr "" " %a съкратено наименование на деня от седмицата според локала (пн,вт," "ср,...)\n" -#: src/date.c:161 +#: src/date.c:165 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2831,7 +2830,7 @@ msgstr "" " %B име на месеца според локала, променлива дължина (напр. януари)\n" " %c датата и часът според локала (например сб ное 4 12:02:33 EЕТ 1989)\n" -#: src/date.c:167 +#: src/date.c:171 #, fuzzy msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" @@ -2844,7 +2843,7 @@ msgstr "" " %D датата; същото като %m/%d/%y\n" " %e денят от месеца с пълнеж от интервал; същото като %_d (напр. „ 1“)\n" -#: src/date.c:173 +#: src/date.c:177 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -2854,7 +2853,7 @@ msgstr "" " %g последните две цифри на годината, съдържаща седмицата с номер %V\n" " %G годината, съдържаща седмицата с номер %V\n" -#: src/date.c:178 +#: src/date.c:182 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2866,7 +2865,7 @@ msgstr "" " %I часът (01-12)\n" " %j поредният ден в годината (001-366)\n" -#: src/date.c:184 +#: src/date.c:188 #, fuzzy msgid "" " %k hour, space padded ( 0..23); same as %_H\n" @@ -2879,7 +2878,7 @@ msgstr "" " %m месецът (01-12)\n" " %M минутата (00-59)\n" -#: src/date.c:190 +#: src/date.c:194 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2897,7 +2896,7 @@ msgstr "" " %R 24 часово време, същото като %H:%M\n" " %s секундите изминали от 1 януари 1970, 00:00:00 по гринуич\n" -#: src/date.c:199 +#: src/date.c:203 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2910,7 +2909,7 @@ msgstr "" " %T 24 часово време, същото като %H:%M:%S\n" " %u денят от седмицата (1-7); 1 означава понеделник\n" -#: src/date.c:205 +#: src/date.c:209 msgid "" " %U week number of year, with Sunday as first day of week (00..53)\n" " %V ISO week number, with Monday as first day of week (01..53)\n" @@ -2924,7 +2923,7 @@ msgstr "" " %W номерът на седмицата в годината, понеделник е пръв седмичен ден " "(00-53)\n" -#: src/date.c:211 +#: src/date.c:215 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -2936,7 +2935,7 @@ msgstr "" " %y последните две цифри от годината (00-99)\n" " %Y годината\n" -#: src/date.c:217 +#: src/date.c:221 #, fuzzy msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" @@ -2964,7 +2963,7 @@ msgstr "" " ^ да се използват главни букви, където може\n" " # да се използват малки букви, където може\n" -#: src/date.c:226 +#: src/date.c:230 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -2975,7 +2974,7 @@ msgid "" " # use opposite case if possible\n" msgstr "" -#: src/date.c:235 +#: src/date.c:239 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -2992,7 +2991,7 @@ msgstr "" "E за да се използва алтернативното представяне според локала, или\n" "O за да се използват алтернативните числови знаци, ако ги има.\n" -#: src/date.c:242 +#: src/date.c:246 msgid "" "\n" "Examples:\n" @@ -3006,37 +3005,37 @@ msgid "" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:275 src/dd.c:2193 src/head.c:838 src/md5sum.c:477 -#: src/md5sum.c:798 src/od.c:863 src/od.c:1914 src/pr.c:1176 src/pr.c:1372 -#: src/pr.c:1494 src/stty.c:842 src/tac.c:563 src/tail.c:343 src/tee.c:126 +#: 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 #, c-format msgid "standard input" msgstr "стандартният вход" -#: src/date.c:303 src/date.c:523 +#: src/date.c:307 src/date.c:527 #, c-format msgid "invalid date %s" msgstr "неправилна дата %s" -#: src/date.c:414 src/date.c:448 +#: src/date.c:418 src/date.c:452 #, c-format msgid "multiple output formats specified" msgstr "посочени са много формати за изхода" -#: src/date.c:426 +#: src/date.c:430 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "посочените опции за дати за отпечатване са взаимно изключващи се" -#: src/date.c:433 +#: src/date.c:437 #, c-format msgid "the options to print and set the time may not be used together" msgstr "" "не може едновременно да се използват опции за отпечатване и настройка на " "времето" -#: src/date.c:454 +#: src/date.c:458 #, fuzzy, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -3048,23 +3047,23 @@ msgstr "" "аргумент\n" "трябва да бъде форматен низ, започващ с „+“." -#: src/date.c:531 +#: src/date.c:535 #, c-format msgid "cannot set date" msgstr "не може да се настрои датата" -#: src/date.c:554 src/du.c:360 +#: src/date.c:558 src/du.c:371 #, c-format msgid "time %s is out of range" msgstr "времето %s е извън допустимия диапазон" #. This is a proper name. See the gettext manual, section Names. -#: src/dd.c:44 src/factor.c:43 src/rm.c:41 src/tail.c:69 src/touch.c:41 +#: 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 "" -#: src/dd.c:517 +#: src/dd.c:521 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3073,7 +3072,7 @@ msgstr "" "Използване: %s [ОПЕРАНД]...\n" " или: %s ОПЦИЯ\n" -#: src/dd.c:522 +#: src/dd.c:526 #, fuzzy msgid "" "Copy a file, converting and formatting according to the operands.\n" @@ -3092,7 +3091,7 @@ msgstr "" " count=БЛОКОВЕ копира само БЛОКОВЕ входни блока\n" " ibs=БАЙТОВЕ чете на парчета от по БАЙТОВЕ байта\n" -#: src/dd.c:531 +#: src/dd.c:535 #, fuzzy msgid "" " if=FILE read from FILE instead of stdin\n" @@ -3102,7 +3101,8 @@ msgid "" " oflag=FLAGS write as per the comma separated symbol list\n" " seek=N skip N obs-sized blocks at start of output\n" " skip=N skip N ibs-sized blocks at start of input\n" -" status=noxfer suppress transfer statistics\n" +" status=WHICH WHICH info to suppress outputting to stderr;\n" +" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" msgstr "" " if=ФАЙЛ чете от ФАЙЛ вместо от стандартния вход\n" " iflag=ФЛАГ,... чете според посочените флагове\n" @@ -3113,11 +3113,11 @@ msgstr "" " skip=БЛОКОВЕ пропуска БЛОКОВЕ входни блока с размер ibs всеки\n" " status=noxfer без статистика за трансфера\n" -#: src/dd.c:541 +#: src/dd.c:546 #, fuzzy msgid "" "\n" -"BLOCKS and BYTES may be followed by the following multiplicative suffixes:\n" +"N and BYTES may be followed by the following multiplicative suffixes:\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, and so on for T, P, E, Z, Y.\n" "\n" @@ -3131,7 +3131,7 @@ msgstr "" "Всяка КЛЮЧДУМА може да бъде:\n" "\n" -#: src/dd.c:550 +#: src/dd.c:555 #, fuzzy msgid "" " ascii from EBCDIC to ASCII\n" @@ -3161,7 +3161,7 @@ msgstr "" " използване с block или unblock попълва с интервали вместо с " "нули\n" -#: src/dd.c:563 +#: src/dd.c:568 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3177,7 +3177,7 @@ msgstr "" " fdatasync записва физически изходните данни още преди пълното приключване\n" " fsync подобно, но освен това записва и метаданните\n" -#: src/dd.c:571 +#: src/dd.c:576 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3191,85 +3191,85 @@ msgstr "" " append режим добавяне (смислено само за изхода, препоръчва се " "conv=notrunc)\n" -#: src/dd.c:578 +#: src/dd.c:583 #, fuzzy msgid " cio use concurrent I/O for data\n" msgstr "" " text да се използват текстови входно/изходни операции за данните\n" -#: src/dd.c:580 +#: src/dd.c:585 msgid " direct use direct I/O for data\n" msgstr "" " direct да се използват директни входно/изходни операции за данните\n" -#: src/dd.c:582 +#: src/dd.c:587 #, fuzzy msgid " directory fail unless a directory\n" msgstr " directory отказва да работи, освен при каталог\n" -#: src/dd.c:584 +#: src/dd.c:589 msgid " dsync use synchronized I/O for data\n" msgstr "" " dsync да се използват синхронизирани входно/изходни операции за " "данните\n" -#: src/dd.c:586 +#: src/dd.c:591 msgid " sync likewise, but also for metadata\n" msgstr "" " sync подобно, но също и за метаданните (напр. на файловата система)\n" -#: src/dd.c:587 +#: src/dd.c:592 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr "" -#: src/dd.c:590 +#: src/dd.c:595 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock да се използват неблокиращи входно/изходни операции\n" -#: src/dd.c:592 +#: src/dd.c:597 msgid " noatime do not update access time\n" msgstr " noatime да не се обновява времето за достъп\n" -#: src/dd.c:595 +#: src/dd.c:600 msgid " nocache discard cached data\n" msgstr "" -#: src/dd.c:598 +#: src/dd.c:603 msgid " noctty do not assign controlling terminal from file\n" msgstr " noctty да не се определя управляващ терминал от файл\n" -#: src/dd.c:601 +#: src/dd.c:606 msgid " nofollow do not follow symlinks\n" msgstr " nofollow да не се следват символните връзки\n" # TODO: наистина ли се имат предвид твърди връзки? -#: src/dd.c:603 +#: src/dd.c:608 msgid " nolinks fail if multiply-linked\n" msgstr " nolinks отказва да работи при множество твърди връзки\n" -#: src/dd.c:605 +#: src/dd.c:610 msgid " binary use binary I/O for data\n" msgstr "" " binary да се използват двоични входно/изходни операции за данните\n" -#: src/dd.c:607 +#: src/dd.c:612 msgid " text use text I/O for data\n" msgstr "" " text да се използват текстови входно/изходни операции за данните\n" -#: src/dd.c:609 +#: src/dd.c:614 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:612 +#: src/dd.c:617 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:615 +#: src/dd.c:620 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:620 +#: src/dd.c:625 #, fuzzy, c-format msgid "" "\n" @@ -3296,7 +3296,7 @@ msgstr "" " 18335302+0 записани блока\n" " изкопирани са 9387674624 байта (9.4 GB) за 34,6279 секунди с 271 MB/s\n" -#: src/dd.c:676 +#: src/dd.c:683 #, c-format msgid "" "%<PRIuMAX>+%<PRIuMAX> records in\n" @@ -3305,21 +3305,21 @@ msgstr "" "%<PRIuMAX>+%<PRIuMAX> прочетени блока\n" "%<PRIuMAX>+%<PRIuMAX> записани блока\n" -#: src/dd.c:682 +#: src/dd.c:689 #, c-format msgid "%<PRIuMAX> truncated record\n" msgid_plural "%<PRIuMAX> truncated records\n" msgstr[0] "%<PRIuMAX> съкратен запис\n" msgstr[1] "%<PRIuMAX> съкратени записа\n" -#: src/dd.c:694 +#: src/dd.c:701 #, c-format msgid "%<PRIuMAX> byte (%s) copied" msgid_plural "%<PRIuMAX> bytes (%s) copied" msgstr[0] "изкопиран е %<PRIuMAX> байт (%s)" msgstr[1] "изкопирани са %<PRIuMAX> байта (%s)" -#: src/dd.c:712 +#: src/dd.c:720 msgid "Infinity B" msgstr "Безброй" @@ -3333,88 +3333,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:725 +#: src/dd.c:733 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g s, %s/s\n" -#: src/dd.c:804 +#: src/dd.c:812 #, c-format msgid "closing input file %s" msgstr "затваряне на входния файл %s" -#: src/dd.c:811 +#: src/dd.c:819 #, c-format msgid "closing output file %s" msgstr "затваряне на изходния файл %s" -#: src/dd.c:1014 +#: src/dd.c:1022 #, fuzzy, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "не може отвори каталогът %s" -#: src/dd.c:1085 src/dd.c:1934 +#: src/dd.c:1093 src/dd.c:1942 #, c-format msgid "writing to %s" msgstr "запис в %s" -#: src/dd.c:1199 src/dd.c:1253 +#: src/dd.c:1207 src/dd.c:1261 #, c-format msgid "unrecognized operand %s" msgstr "непознат операнд %s" -#: src/dd.c:1210 +#: src/dd.c:1218 #, fuzzy msgid "invalid conversion" msgstr "неправилно посочено преобразуване: %s" -#: src/dd.c:1213 src/dd.c:1289 +#: src/dd.c:1221 src/dd.c:1297 #, fuzzy msgid "invalid input flag" msgstr "непознат входен флаг: %s" -#: src/dd.c:1216 src/dd.c:1283 src/dd.c:1295 +#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303 #, fuzzy msgid "invalid output flag" msgstr "непознат изходен флаг: %s" -#: src/dd.c:1219 +#: src/dd.c:1227 #, fuzzy msgid "invalid status flag" msgstr "непознат флаг за състояние: %s" -#: src/dd.c:1258 src/truncate.c:312 +#: src/dd.c:1266 src/truncate.c:310 #, c-format msgid "invalid number %s" msgstr "недопустимо число %s" -#: src/dd.c:1340 +#: src/dd.c:1348 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "не може да се комбинират никои две от {ascii,ebcdic,ibm}" -#: src/dd.c:1342 +#: src/dd.c:1350 #, c-format msgid "cannot combine block and unblock" msgstr "не може да се комбинират block и unblock" -#: src/dd.c:1344 +#: src/dd.c:1352 #, c-format msgid "cannot combine lcase and ucase" msgstr "не може да се комбинират lcase и ucase" -#: src/dd.c:1346 +#: src/dd.c:1354 #, c-format msgid "cannot combine excl and nocreat" msgstr "не може да се комбинират excl и nocreat" -#: src/dd.c:1349 +#: src/dd.c:1357 #, fuzzy, c-format msgid "cannot combine direct and nocache" msgstr "не може да се комбинират excl и nocreat" # Това ме мързи да го превеждам. -#: src/dd.c:1506 +#: src/dd.c:1514 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3423,72 +3423,72 @@ 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:1593 +#: src/dd.c:1601 #, fuzzy, c-format msgid "%s: cannot skip" msgstr "%s: неуспешно позициониране" -#: src/dd.c:1595 src/dd.c:1614 src/dd.c:1675 +#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683 #, c-format msgid "%s: cannot seek" msgstr "%s: неуспешно позициониране" -#: src/dd.c:1655 +#: src/dd.c:1663 #, c-format msgid "offset overflow while reading file %s" msgstr "препълване на отместването при четене на файла %s" -#: src/dd.c:1667 +#: src/dd.c:1675 #, fuzzy, c-format msgid "warning: invalid file offset after failed read" msgstr "внимание: съмнително отместване във файла след пропаднало четене" -#: src/dd.c:1671 +#: src/dd.c:1679 #, c-format msgid "cannot work around kernel bug after all" msgstr "в крайна сметка не може да се компенсира грешката в ядрото" -#: src/dd.c:1814 +#: src/dd.c:1822 #, c-format msgid "setting flags for %s" msgstr "задействат се флаговете за %s" -#: src/dd.c:1867 +#: src/dd.c:1875 #, c-format msgid "memory exhausted by input buffer of size %zu bytes (%s)" msgstr "" -#: src/dd.c:1881 +#: src/dd.c:1889 #, c-format msgid "memory exhausted by output buffer of size %zu bytes (%s)" msgstr "" -#: src/dd.c:1914 +#: src/dd.c:1922 #, fuzzy, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: не може да се отиде на относително отместване %s във файла" -#: src/dd.c:2125 src/dd.c:2258 +#: src/dd.c:2133 #, fuzzy, c-format -msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" +msgid "failed to truncate to %<PRIdMAX> bytes in output file %s" msgstr "съкращаване до %<PRIuMAX> байта в изходния файл %s" -#: src/dd.c:2138 +#: src/dd.c:2146 #, c-format msgid "fdatasync failed for %s" msgstr "неуспешно извикване на fdatasync за %s" -#: src/dd.c:2148 +#: src/dd.c:2156 #, c-format msgid "fsync failed for %s" msgstr "неуспешнен запис (fsync) за %s" -#: src/dd.c:2199 src/dd.c:2228 +#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165 #, c-format -msgid "opening %s" -msgstr "отваряне на %s" +msgid "failed to open %s" +msgstr "не може да се отвори %s" -#: src/dd.c:2237 +#: src/dd.c:2246 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) " @@ -3497,84 +3497,106 @@ msgstr "" "твърде голямо отместване: не може да се отреже до дължината на seek=" "%<PRIuMAX> (%lu-byte) блокове" -#: src/dd.c:2274 src/dd.c:2280 +#: src/dd.c:2267 +#, 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 #, 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:54 src/expr.c:153 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:39 src/sleep.c:35 src/sort.c:66 +#: 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 msgid "Paul Eggert" msgstr "" -#: src/df.c:140 +#: src/df.c:172 msgid "Filesystem" msgstr "Файлова с-ма" -#: src/df.c:141 +#: src/df.c:175 msgid "Type" msgstr "Тип" -#: src/df.c:142 +#: src/df.c:178 src/df.c:542 msgid "blocks" msgstr "блокове" -#: src/df.c:142 -msgid "Inodes" -msgstr "I-възли" - -#: src/df.c:142 -msgid "Size" -msgstr "Размер" - -#: src/df.c:143 +#: src/df.c:181 msgid "Used" msgstr "Заети" -#: src/df.c:143 -msgid "IUsed" -msgstr "Заети" - -#: src/df.c:144 +#: src/df.c:184 msgid "Available" msgstr "Свободни" -#: src/df.c:144 -msgid "IFree" -msgstr "Свобод" - -#: src/df.c:144 -msgid "Avail" -msgstr "Свобод" - -#: src/df.c:145 +#: src/df.c:187 msgid "Use%" msgstr "Изп%" -#: src/df.c:145 +#: src/df.c:190 +msgid "Inodes" +msgstr "I-възли" + +#: src/df.c:193 +msgid "IUsed" +msgstr "Заети" + +#: src/df.c:196 +msgid "IFree" +msgstr "Свобод" + +#: src/df.c:199 msgid "IUse%" msgstr "Изп%" -#: src/df.c:145 +#: src/df.c:202 +msgid "Mounted on" +msgstr "Монтирана на" + +#: src/df.c:383 +#, c-format +msgid "option --output: field '%s' unknown" +msgstr "" + +#: src/df.c:390 +#, fuzzy, c-format +msgid "option --output: field '%s' used more than once" +msgstr "внимание: изходния файл %s е посочен повече от веднъж" + +#: src/df.c:410 src/df.c:449 +msgid "Size" +msgstr "Размер" + +#: src/df.c:414 src/df.c:451 +msgid "Avail" +msgstr "Свобод" + +#: src/df.c:474 msgid "Capacity" msgstr "Обем" -#: src/df.c:146 -msgid "Mounted on" -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 +#, c-format +msgid "%s-%s" +msgstr "" -#: src/df.c:847 +#: src/df.c:1210 +#, fuzzy msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" -"\n" msgstr "" "Дава информация за файловата система, съдържаща всеки от ФАЙЛ-овете\n" "или за всички файлови системи по подразбиране.\n" "\n" -#: src/df.c:855 +#: src/df.c:1217 #, fuzzy msgid "" " -a, --all include dummy file systems\n" @@ -3591,7 +3613,7 @@ msgstr "" " -h, --human-readable извежда размерите като за хора (напр. 1K, 234M, 2G)\n" " -H, --si подобно, но с множител 1000 вместо 1024\n" -#: src/df.c:865 +#: src/df.c:1227 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3607,8 +3629,12 @@ msgstr "" " --no-sync без sync преди получаване на използването (по " "подразб.)\n" -#: src/df.c:872 +#: src/df.c:1234 +#, fuzzy msgid "" +" --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" +" or print all fields if FIELD_LIST is " +"omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" " -t, --type=TYPE limit listing to file systems of type TYPE\n" @@ -3625,21 +3651,43 @@ msgstr "" "ТИП\n" " -v (пренебрегва се)\n" -#: src/df.c:1027 +#: src/df.c:1248 +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" +msgstr "" + +#: src/df.c:1285 +#, 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 #, c-format msgid "file system type %s both selected and excluded" msgstr "файловите системи от тип %s са едновременно избрани и изключени" -#: src/df.c:1075 +#: src/df.c:1500 msgid "Warning: " msgstr "Внимание: " -#: src/df.c:1077 src/stat.c:795 +#: src/df.c:1502 src/stat.c:814 #, fuzzy msgid "cannot read table of mounted file systems" msgstr "%sне може да се прочете таблицата на монтирани файлови системи" -#: src/df.c:1107 +#: src/df.c:1539 #, c-format msgid "no file systems processed" msgstr "нито една файлова система не бе обработена" @@ -3756,7 +3804,7 @@ msgstr "" " %s /usr/bin/sort извежда „/usr/bin“.\n" " %s stdio.h извежда „.“.\n" -#: src/du.c:260 src/sort.c:390 src/wc.c:112 +#: src/du.c:270 src/sort.c:394 src/wc.c:112 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3765,17 +3813,18 @@ msgstr "" "Използване: %s [ОПЦИЯ]... [ФАЙЛ]...\n" " или: %s [ОПЦИЯ]... --files0-from==Ф\n" -#: src/du.c:264 -msgid "" -"Summarize disk usage of each FILE, recursively for directories.\n" -"\n" +#: src/du.c:274 +#, fuzzy +msgid "Summarize disk usage of each FILE, recursively for directories.\n" msgstr "" "Резюмира използването на диска от всеки ФАЙЛ, рекурсивно за каталозите.\n" "\n" -#: src/du.c:271 +#: src/du.c:280 #, fuzzy msgid "" +" -0, --null end each output line with 0 byte rather than " +"newline\n" " -a, --all write counts for all files, not just directories\n" " --apparent-size print apparent sizes, rather than disk usage; " "although\n" @@ -3798,7 +3847,7 @@ msgstr "" " -D, --dereference-args работи върху файловете, сочени от ФАЙЛ-символна " "връзка\n" -#: src/du.c:279 +#: src/du.c:289 #, fuzzy msgid "" " -B, --block-size=SIZE scale sizes by SIZE before printing them. E.g.,\n" @@ -3808,13 +3857,26 @@ msgid "" " -c, --total produce a grand total\n" " -D, --dereference-args dereference only symlinks that are listed on the\n" " command line\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 "" -" -a, --all включително празните файлови системи (с 0 блокове)\n" -" -B, --block-size=РАЗМ да се ползват блокове с размер РАЗМ байта\n" -" -h, --human-readable извежда размерите като за хора (напр. 1K, 234M, 2G)\n" -" -H, --si подобно, но с множител 1000 вместо 1024\n" +" -x, --one-file-system пропуска каталозите, които са в друга файлова " +"система\n" +" -X ФАЙЛ, --exclude-from=ФАЙЛ изключва файлове, пасващи на образец от " +"ФАЙЛ\n" +" --exclude=ОБРАЗЕЦ изключва файлове, чието име пасва на ОБРАЗЕЦ\n" +" --max-depth=N отпечатва общ размер на каталози (или файлове с --" +"all)\n" +" само ако те са с N или по-малко нива под " +"аргумента\n" +" на командния ред; --max-depth=0 е еквивалентно " +"на\n" +" --summarize\n" -#: src/du.c:288 +#: src/du.c:302 #, fuzzy msgid "" " --files0-from=F summarize disk usage of the NUL-terminated file\n" @@ -3823,7 +3885,6 @@ msgid "" " -H equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" --si like -h, but use powers of 1000 not 1024\n" msgstr "" " --files0-from=Ф резюмира използваното дисково пространство от " "файловите\n" @@ -3839,21 +3900,21 @@ msgstr "" " -l, --count-links брои размерите многократно при твърди връзки\n" " -m също като --block-size=1M\n" -#: src/du.c:297 +#: src/du.c:310 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 "" -#: src/du.c:302 +#: src/du.c:316 +#, fuzzy msgid "" -" -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " "default)\n" -" -0, --null end each output line with 0 byte rather than " -"newline\n" " -S, --separate-dirs 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 работи върху файловете, сочени от символни връзки\n" @@ -3864,34 +3925,11 @@ msgstr "" " -s, --summarize резюмира -- извежда само общата сума за всеки " "аргумент\n" -#: src/du.c:309 -#, 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 пропуска каталозите, които са в друга файлова " -"система\n" -" -X ФАЙЛ, --exclude-from=ФАЙЛ изключва файлове, пасващи на образец от " -"ФАЙЛ\n" -" --exclude=ОБРАЗЕЦ изключва файлове, чието име пасва на ОБРАЗЕЦ\n" -" --max-depth=N отпечатва общ размер на каталози (или файлове с --" -"all)\n" -" само ако те са с N или по-малко нива под " -"аргумента\n" -" на командния ред; --max-depth=0 е еквивалентно " -"на\n" -" --summarize\n" - -#: src/du.c:318 +#: src/du.c:322 #, fuzzy msgid "" +" -t, --threshold=SIZE exclude entries smaller than SIZE if positive,\n" +" or entries greater than SIZE if negative\n" " --time show time of the last modification of any file in " "the\n" " directory, or any of its subdirectories\n" @@ -3911,66 +3949,75 @@ msgstr "" " full-iso, long-iso, iso или +ФОРМАТ\n" " ФОРМАТ се интерпретира както от „date“\n" -#: src/du.c:375 +#: src/du.c:333 +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 msgid "Infinity" msgstr "Безброй" -#: src/du.c:600 +#: src/du.c:507 +#, c-format +msgid "mount point %s already traversed" +msgstr "" + +#: src/du.c:624 #, fuzzy, c-format msgid "fts_read failed: %s" msgstr "неуспешен fts_read" -#: src/du.c:724 +#: src/du.c:780 #, c-format msgid "invalid maximum depth %s" msgstr "неправилна максимална дълбочина %s" -#: src/du.c:817 +#: src/du.c:809 +#, fuzzy, c-format +msgid "invalid --threshold argument '-0'" +msgstr "неправилен аргумент %s" + +#: src/du.c:887 #, c-format msgid "cannot both summarize and show all entries" msgstr "не може едновременно да се резюмира и да се показват всички елементи" -#: src/du.c:824 +#: src/du.c:894 #, c-format msgid "warning: summarizing is the same as using --max-depth=0" msgstr "внимание: резюмирането е еквивалентно на --max-depth=0" -#: src/du.c:830 +#: src/du.c:900 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "внимание: резюмирането влиза в конфликт с --max-depth=%lu" -#: src/du.c:896 src/sort.c:4479 src/wc.c:668 +#: src/du.c:966 src/sort.c:4533 src/wc.c:668 #, fuzzy msgid "file operands cannot be combined with --files0-from" msgstr "Не може да се комбинират файлови операнди с --files0-from." -#: src/du.c:949 src/md5sum.c:587 src/od.c:903 src/tac.c:239 src/tac.c:350 -#: src/tac.c:506 src/tac.c:586 src/wc.c:733 +#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 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:963 src/sort.c:4508 src/wc.c:747 +#: src/du.c:1040 src/sort.c:4562 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:980 src/du.c:988 src/wc.c:760 src/wc.c:768 +#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768 msgid "invalid zero-length file name" msgstr "неправилно файлово име с дължина нула" -#: src/du.c:1007 src/head.c:149 src/head.c:262 src/head.c:334 src/head.c:538 -#: src/head.c:620 src/head.c:692 src/head.c:750 src/head.c:774 src/tail.c:412 -#: src/tail.c:500 src/tail.c:549 src/tail.c:642 src/tail.c:770 src/tail.c:818 -#: src/tail.c:855 src/tail.c:1782 src/tail.c:1812 src/uniq.c:395 -#, c-format -msgid "error reading %s" -msgstr "грешка при четене на %s" - -#: src/du.c:1010 src/ls.c:2649 src/wc.c:791 +#: src/du.c:1088 src/ls.c:2649 src/wc.c:791 msgid "total" msgstr "общо" @@ -4067,10 +4114,12 @@ msgstr "" "Използване: %s [ОПЦИЯ]... [-] [ПРОМЕНЛИВА=СТОЙНОСТ]... [КОМАНДА [АРГ]...]\n" #: src/env.c:55 +msgid "Set each NAME to VALUE in the environment and run COMMAND.\n" +msgstr "" + +#: src/env.c:61 #, fuzzy msgid "" -"Set each NAME to VALUE in the environment and run COMMAND.\n" -"\n" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with 0 byte rather than newline\n" " -u, --unset=NAME remove variable from the environment\n" @@ -4081,7 +4130,7 @@ msgstr "" " -i, --ignore-environment започва с празно обкръжение\n" " -u, --unset=ПРОМЕНЛИВА отстранява променливата от обкръжението\n" -#: src/env.c:64 +#: src/env.c:68 msgid "" "\n" "A mere - implies -i. If no COMMAND, print the resulting environment.\n" @@ -4090,33 +4139,33 @@ msgstr "" "Просто - означава -i. Ако не е дадена КОМАНДА, отпечатва полученото " "обкръжение.\n" -#: src/env.c:120 +#: src/env.c:124 #, fuzzy, c-format msgid "cannot unset %s" msgstr "не могат да се получат атрибутите на %s" -#: src/env.c:131 +#: src/env.c:135 #, fuzzy, c-format msgid "cannot set %s" msgstr "не могат да се получат атрибутите на %s" -#: src/env.c:148 +#: src/env.c:152 #, c-format msgid "cannot specify --null (-0) with command" msgstr "" #: 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" -"\n" msgstr "" "Замества табулациите във всеки ФАЙЛ с интервали и извежда на стандартния " "изход.\n" "Без ФАЙЛ или ако ФАЙЛ е - чете от стандартния вход.\n" "\n" -#: src/expand.c:115 +#: src/expand.c:114 msgid "" " -i, --initial do not convert tabs after non blanks\n" " -t, --tabs=NUMBER have tabs NUMBER characters apart, not 8\n" @@ -4124,34 +4173,34 @@ msgstr "" " -i, --initial не преобразува табулациите след не-интервал\n" " -t, --tabs=БРОЙ работи с табулации през БРОЙ интервала вместо през 8\n" -#: src/expand.c:119 +#: src/expand.c:118 msgid "" " -t, --tabs=LIST use comma separated list of explicit tab positions\n" msgstr "" " -t, --tabs=СПИС да се ползва списък от явно зададени табулационни " "позиции\n" -#: src/expand.c:172 src/unexpand.c:191 +#: src/expand.c:171 src/unexpand.c:190 #, c-format msgid "tab stop is too large %s" msgstr "табулацията е твърде дълга %s" -#: src/expand.c:180 src/unexpand.c:199 +#: src/expand.c:179 src/unexpand.c:198 #, c-format msgid "tab size contains invalid character(s): %s" msgstr "размерът на табулациите включва непозволен знак: %s" -#: src/expand.c:206 src/unexpand.c:225 +#: src/expand.c:205 src/unexpand.c:224 #, c-format msgid "tab size cannot be 0" msgstr "размерът на табулациите не може да бъде 0" -#: src/expand.c:208 src/unexpand.c:227 +#: src/expand.c:207 src/unexpand.c:226 #, c-format msgid "tab sizes must be ascending" msgstr "позициите на табулациите трябва да са в нарастващ ред" -#: src/expand.c:326 src/expand.c:345 src/unexpand.c:374 src/unexpand.c:419 +#: 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 "входният ред е твърде дълъг" @@ -4314,12 +4363,12 @@ msgstr "грешка при пасването на регулярния изр msgid "non-integer argument" msgstr "нечислов аргумент" -#: src/expr.c:793 src/truncate.c:316 +#: src/expr.c:793 src/truncate.c:314 #, c-format msgid "division by zero" msgstr "делене на нула" -#: src/expr.c:887 src/sort.c:2029 +#: src/expr.c:887 src/sort.c:2044 #, fuzzy, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "Използвайте LC_ALL='C', за да заобиколите този проблем." @@ -4329,25 +4378,32 @@ msgstr "Използвайте LC_ALL='C', за да заобиколите то msgid "the strings compared were %s and %s" msgstr "Сравняваните низове бяха %s и %s." -#: src/factor.c:449 -msgid "using arbitrary-precision arithmetic" +#. This is a proper name. See the gettext manual, section Names. +#: src/factor.c:111 +msgid "Niels Moller" msgstr "" -#: src/factor.c:460 -msgid "using single-precision arithmetic" +#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459 +#, c-format +msgid "Lucas prime test failure. This should not happen" msgstr "" -#: src/factor.c:465 src/od.c:1640 src/od.c:1709 +#: src/factor.c:2092 #, c-format -msgid "%s is too large" -msgstr "%s е твърде дълго" +msgid "squfof queue overflow" +msgstr "" -#: src/factor.c:469 +#: src/factor.c:2419 #, c-format msgid "%s is not a valid positive integer" msgstr "%s не е правилно положително цяло число" -#: src/factor.c:494 +#: src/factor.c:2442 src/od.c:1646 src/od.c:1715 +#, c-format +msgid "%s is too large" +msgstr "%s е твърде дълго" + +#: src/factor.c:2454 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4356,7 +4412,7 @@ msgstr "" "Използване: %s [ЧИСЛО]...\n" " или: %s ОПЦИЯ\n" -#: src/factor.c:499 +#: src/factor.c:2459 #, fuzzy msgid "" "Print the prime factors of each specified integer NUMBER. If none\n" @@ -4385,21 +4441,20 @@ msgid "cannot stat current directory (now %s)" msgstr "не може да се намери текущият каталог (сега %s)" #. This is a proper name. See the gettext manual, section Names. -#: src/fmt.c:37 +#: src/fmt.c:38 msgid "Ross Paterson" msgstr "" -#: src/fmt.c:269 +#: src/fmt.c:270 #, fuzzy, c-format msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n" msgstr "Използване: %s [-ШИРИНА] [ОПЦИЯ]... [ФАЙЛ]...\n" -#: src/fmt.c:270 +#: 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" -"\n" msgstr "" "Преформатира всеки абзац във ФАЙЛовете, извеждайки на стандартния изход.\n" "Ако няма посочен ФАЙЛ или ако ФАЙЛ е „-“, чете от стандартния вход.\n" @@ -4418,8 +4473,8 @@ msgstr "" " НИЗ, форматира, след което добавя пак НИЗ\n" " -s, --split-only цепи дългите редове, но не попълва късите\n" -#: src/fmt.c:285 -#, fuzzy, c-format +#: src/fmt.c:287 +#, fuzzy, 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" @@ -4431,7 +4486,7 @@ msgstr "" " -w, --width=ШИРИНА максимална ширина на реда (по подразбиране 75 " "знака)\n" -#: src/fmt.c:357 +#: src/fmt.c:359 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -4440,22 +4495,22 @@ msgstr "" "неправилна опция -- %c; -ШИРИНА се разпознава само ако е първа опция;\n" "в противен случай ползвайте -w ШИРИНА" -#: src/fmt.c:403 src/fmt.c:414 +#: src/fmt.c:405 src/fmt.c:416 #, c-format msgid "invalid width: %s" msgstr "неправилна ширина: %s" #: src/fold.c:70 +#, fuzzy msgid "" "Wrap input lines in each FILE (standard input by default), writing to\n" "standard output.\n" -"\n" msgstr "" "Развива поредово входните редове на всеки ФАЙЛ (или стандартния вход), като\n" "извежда резултата на стандартния изход.\n" "\n" -#: src/fold.c:78 +#: src/fold.c:77 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4465,13 +4520,13 @@ msgstr "" " -s, --spaces прекъсва при интервали\n" " -w, --width=ШИРИНА да се ползват ШИРИНА стълбове, вместо 80\n" -#: src/fold.c:289 src/pr.c:836 +#: src/fold.c:288 src/pr.c:832 #, c-format 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:75 +#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 #: src/truncate.c:37 msgid "Padraig Brady" msgstr "" @@ -4487,17 +4542,17 @@ msgid "" "\n" msgstr "" -#: src/group-list.c:69 src/id.c:345 src/setuidgid.c:184 +#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184 #, fuzzy, c-format msgid "failed to get groups for user %s" msgstr "групата на %s не можа да се промени на %s\n" -#: src/group-list.c:74 src/id.c:350 +#: src/group-list.c:74 src/id.c:370 #, fuzzy, c-format msgid "failed to get groups for the current process" msgstr "групата на %s не можа да се промени на %s\n" -#: src/group-list.c:104 +#: src/group-list.c:114 #, c-format msgid "cannot find name for group ID %lu" msgstr "не може да се намери името на група с номер %lu" @@ -4535,18 +4590,18 @@ msgid "%s: no such user" msgstr "%s: Няма такъв потребител" #: 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" -"\n" msgstr "" "Извежда първите 10 реда от всеки ФАЙЛ на стандартния изход.\n" "При повече от един ФАЙЛ, поставя заглавия с файловите имена.\n" "При отсъствие на ФАЙЛ или ако ФАЙЛ е -, чете от стандартния вход.\n" "\n" -#: src/head.c:118 +#: src/head.c:117 #, fuzzy msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" @@ -4563,7 +4618,7 @@ msgstr "" " със знак минус преди N извежда всички, освен\n" " последните N реда от всеки файл\n" -#: src/head.c:126 +#: src/head.c:125 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4571,7 +4626,7 @@ msgstr "" " -q, --quiet, --silent да не се извеждат заглавия с файловите имена\n" " -v, --verbose винаги да извежда заглавия с файловите имена\n" -#: src/head.c:132 +#: src/head.c:131 #, fuzzy msgid "" "\n" @@ -4586,59 +4641,59 @@ msgstr "" "Всяка КЛЮЧДУМА може да бъде:\n" "\n" -#: src/head.c:152 -#, c-format -msgid "error writing %s" -msgstr "грешка при запис в %s" - -#: src/head.c:155 +#: src/head.c:154 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: файлът се е свил твърде много" -#: src/head.c:228 src/head.c:1044 +#: src/head.c:227 src/head.c:1051 #, c-format msgid "%s: number of bytes is too large" msgstr "%s: твърде голям брой байтове" -#: src/head.c:441 +#: src/head.c:440 #, c-format msgid "%s: cannot lseek back to original position" msgstr "%s: не може да се отиде на първоначалното място във файла" -#: src/head.c:613 src/head.c:684 src/tail.c:450 +#: src/head.c:612 src/head.c:691 src/tail.c:449 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: не може да се отиде на отместване %s във файла" -#: src/head.c:791 +#: src/head.c:673 +#, 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" -#: src/head.c:878 +#: src/head.c:885 #, c-format msgid "%s: %s is so large that it is not representable" msgstr "%s: %s е толкова голям, че не е изводим" -#: src/head.c:879 +#: src/head.c:886 msgid "number of lines" msgstr "брой на редовете" -#: src/head.c:879 +#: src/head.c:886 msgid "number of bytes" msgstr "количество байтове" -#: src/head.c:886 src/tail.c:1947 +#: src/head.c:893 src/tail.c:1947 msgid "invalid number of lines" msgstr "недопустим брой редове" -#: src/head.c:887 src/tail.c:1948 +#: src/head.c:894 src/tail.c:1948 msgid "invalid number of bytes" msgstr "недопустимо количество байтове" # TODO: Как да се праведе trailing? -#: src/head.c:974 src/head.c:1032 +#: src/head.c:981 src/head.c:1039 #, c-format msgid "invalid trailing option -- %c" msgstr "неправилна опция -- %c" @@ -4756,86 +4811,86 @@ msgstr "" msgid "cannot get effective UID" msgstr "символната връзка %s не може да бъде последвана" -#: src/id.c:289 +#: src/id.c:311 #, fuzzy, c-format -msgid "cannot find name for user ID %lu" +msgid "cannot find name for user ID %s" msgstr "не може да се намери името на потребител с номер %lu" -#: src/id.c:309 +#: src/id.c:329 #, c-format -msgid "uid=%lu" +msgid "uid=%s" msgstr "" -#: src/id.c:314 +#: src/id.c:334 #, c-format -msgid " gid=%lu" +msgid " gid=%s" msgstr "" -#: src/id.c:321 +#: src/id.c:341 #, c-format -msgid " euid=%lu" +msgid " euid=%s" msgstr "" -#: src/id.c:329 +#: src/id.c:349 #, c-format -msgid " egid=%lu" +msgid " egid=%s" msgstr "" -#: src/id.c:357 +#: src/id.c:377 msgid " groups=" msgstr " групи=" -#: src/id.c:373 +#: src/id.c:393 #, c-format msgid " context=%s" msgstr "" -#: src/install.c:372 +#: src/install.c:373 #, fuzzy, c-format msgid "warning: %s: failed to change context to %s" msgstr "внимание: каталогът не може да се смени на %s" -#: src/install.c:413 +#: src/install.c:414 #, c-format msgid "creating directory %s" msgstr "създава се каталог %s" -#: src/install.c:481 +#: src/install.c:482 #, c-format msgid "cannot change ownership of %s" msgstr "не може да се смени собствеността на %s" -#: src/install.c:505 +#: src/install.c:506 #, c-format msgid "cannot set time stamps for %s" msgstr "не може да се зададе времето на %s" -#: src/install.c:526 src/split.c:412 src/timeout.c:387 +#: src/install.c:527 src/split.c:426 src/timeout.c:439 #, c-format msgid "fork system call failed" msgstr "системната функция за нов процес (fork) не успя" -#: src/install.c:530 +#: src/install.c:531 #, fuzzy, c-format msgid "cannot run %s" msgstr "не може да се стартира strip" -#: src/install.c:534 +#: src/install.c:535 #, fuzzy, c-format msgid "waiting for strip" msgstr "запис в %s" -#: src/install.c:536 +#: src/install.c:537 #, c-format msgid "strip process terminated abnormally" msgstr "" -#: src/install.c:557 +#: src/install.c:558 #, c-format msgid "invalid user %s" msgstr "неправилен потребител %s" -#: src/install.c:593 +#: src/install.c:594 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -4848,7 +4903,7 @@ msgstr "" " или: %s [ОПЦИЯ]... -t КАТАЛОГ ЦЕЛ...\n" " или: %s [ОПЦИЯ]... -d КАТАЛОГ...\n" -#: src/install.c:600 +#: src/install.c:601 #, fuzzy msgid "" "\n" @@ -4861,7 +4916,6 @@ msgid "" "In the first three forms, copy SOURCE to DEST or multiple SOURCE(s) to\n" "the existing DIRECTORY, while setting permission modes and owner/group.\n" "In the 4th form, create all components of the given DIRECTORY(ies).\n" -"\n" msgstr "" "При първите три формата ИЗТОЧНИК се копира в ЦЕЛ или няколкото ИЗТОЧНИКа\n" "в съществуващ КАТАЛОГ, като се установяват режим на достъп и собственик/" @@ -4940,56 +4994,56 @@ msgid "" "directories\n" msgstr "" -#: src/install.c:858 +#: src/install.c:859 #, c-format msgid "" "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled" msgstr "" -#: src/install.c:868 +#: src/install.c:869 #, c-format msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled" msgstr "" -#: src/install.c:885 +#: src/install.c:886 #, c-format msgid "the strip option may not be used when installing a directory" msgstr "" "опцията махане на символните таблици не може да се използва при инсталиране " "на каталог" -#: src/install.c:888 +#: src/install.c:889 #, c-format msgid "target directory not allowed when installing a directory" msgstr "" "при инсталиране на каталог не се позволява посочването на целеви каталог" -#: src/install.c:892 +#: src/install.c:893 #, c-format msgid "cannot force target context to %s and preserve it" msgstr "" -#: src/install.c:946 src/mkdir.c:202 src/stdbuf.c:327 +#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326 #, c-format msgid "invalid mode %s" msgstr "неправилен режим %s" -#: src/install.c:953 +#: src/install.c:954 #, c-format msgid "WARNING: ignoring --strip-program option as -s option was not specified" msgstr "" -#: src/install.c:958 +#: src/install.c:959 #, fuzzy, c-format msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive" msgstr "опциите --string и --check не може да се използват едновременно" -#: src/install.c:965 +#: src/install.c:966 #, fuzzy, c-format msgid "options --compare (-C) and --strip are mutually exclusive" msgstr "посочените опции за дати за отпечатване са взаимно изключващи се" -#: src/install.c:971 +#: src/install.c:972 #, c-format msgid "" "the --compare (-C) option is ignored when you specify a mode with non-" @@ -4997,7 +5051,7 @@ msgid "" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/join.c:40 src/sort.c:65 +#: src/join.c:40 src/sort.c:66 #, fuzzy msgid "Mike Haertel" msgstr "Mike Haertel и Paul Eggert" @@ -5086,7 +5140,7 @@ msgstr "" #: src/join.c:403 #, c-format -msgid "%s:%ju: is not sorted: %.*s" +msgid "%s:%<PRIuMAX>: is not sorted: %.*s" msgstr "" #: src/join.c:840 src/join.c:1038 @@ -5114,12 +5168,12 @@ msgstr "неправилни свързващи полета %lu, %lu" msgid "conflicting empty-field replacement strings" msgstr "несъвместими заменящи низове за празно поле" -#: src/join.c:1101 src/sort.c:4414 +#: src/join.c:1101 src/sort.c:4468 #, c-format msgid "multi-character tab %s" msgstr "многосимволна табулация %s" -#: src/join.c:1105 src/sort.c:4419 +#: src/join.c:1105 src/sort.c:4473 #, c-format msgid "incompatible tabs" msgstr "несъвместими табулации" @@ -5141,14 +5195,13 @@ msgstr "" " или: %s -t [СИГНАЛ]...\n" #: src/kill.c:82 -msgid "" -"Send signals to processes, or list signals.\n" -"\n" +#, fuzzy +msgid "Send signals to processes, or list signals.\n" msgstr "" "Изпраща сигнали на процесите или извежда сигналите.\n" "\n" -#: src/kill.c:89 +#: src/kill.c:88 msgid "" " -s, --signal=SIGNAL, -SIGNAL\n" " specify the name or number of the signal to be sent\n" @@ -5163,7 +5216,7 @@ msgstr "" "номера\n" " -t, --table извежда таблица с информация за сигналите\n" -#: src/kill.c:97 +#: src/kill.c:96 #, fuzzy msgid "" "\n" @@ -5176,32 +5229,32 @@ msgstr "" "или код-състояние на изход на процес, прекратен чрез сигнал.\n" "PID е цяло число; ако е отрицателно, посочва група от процеси.\n" -#: src/kill.c:206 +#: src/kill.c:205 #, c-format msgid "%s: invalid process id" msgstr "%s: неправилен номер на процес" -#: src/kill.c:260 +#: src/kill.c:259 #, c-format msgid "invalid option -- %c" msgstr "неправилна опция -- %c" -#: src/kill.c:269 +#: src/kill.c:268 #, c-format msgid "%s: multiple signals specified" msgstr "%s: посочени са много сигнали" -#: src/kill.c:283 +#: src/kill.c:282 #, c-format msgid "multiple -l or -t options specified" msgstr "посочени са много опции -l или -t" -#: src/kill.c:300 +#: src/kill.c:299 #, c-format msgid "cannot combine signal with -l or -t" msgstr "не може да се задават сигнали заедно с -l или -t" -#: src/kill.c:306 +#: src/kill.c:305 #, c-format msgid "no process ID specified" msgstr "не е посочен номер на процес" @@ -5312,7 +5365,6 @@ msgid "" "When creating hard links, each TARGET must exist. Symbolic links\n" "can hold arbitrary text; if later resolved, a relative link is\n" "interpreted in relation to its parent directory.\n" -"\n" msgstr "" "При първия формат създава връзка към посочения файл-ЦЕЛ с име " "ИМЕ_НА_ВРЪЗКА.\n" @@ -5322,7 +5374,7 @@ msgstr "" "При правене на твърди връзки всяка ЦЕЛ трябва да съществува.\n" "\n" -#: src/ln.c:395 +#: src/ln.c:394 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -5344,7 +5396,7 @@ msgstr "" "пропадне)\n" " -f, --force изтрива съществуващи целеви файлове\n" -#: src/ln.c:403 +#: src/ln.c:402 #, fuzzy msgid "" " -i, --interactive prompt whether to remove destinations\n" @@ -5364,7 +5416,7 @@ msgstr "" " -s, --symbolic да се правят символни връзки вместо твърди " "връзки\n" -#: src/ln.c:412 +#: src/ln.c:411 #, fuzzy msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -5380,27 +5432,12 @@ msgstr "" " -T, --no-target-directory работи с ИМЕ_НА_ВРЪЗКА като с обикновен файл\n" " -v, --verbose извежда името на всеки файл преди свързване\n" -#: src/ln.c:428 -#, fuzzy +#: src/ln.c:433 +#, c-format 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" - -#: src/ln.c:435 -#, c-format -msgid "" -"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" +"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 "" #: src/ln.c:554 @@ -5476,7 +5513,7 @@ msgstr "" "пренебрегва се неправилният размер на табулациите в променливата от " "обкръжението TABSIZE: %s" -#: src/ls.c:1750 src/ptx.c:1976 +#: src/ls.c:1750 src/ptx.c:1975 #, c-format msgid "invalid line width: %s" msgstr "неправилна дължина на реда: %s" @@ -5540,7 +5577,7 @@ msgstr "чете се каталогът %s" msgid "closing directory %s" msgstr "затваря се каталогът %s" -#: src/ls.c:3301 +#: src/ls.c:3302 #, c-format msgid "cannot compare file names %s and %s" msgstr "не може да се сравнят файловите имена %s и %s" @@ -5550,13 +5587,12 @@ msgstr "не може да се сравнят файловите имена %s msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" -"\n" msgstr "" "Извежда информация за ФАЙЛовете (по подразбиране за текущия каталог).\n" "Сортира елементите азбучно, освен ако има опция -cftuSUX или --sort.\n" "\n" -#: src/ls.c:4729 +#: src/ls.c:4728 #, fuzzy msgid "" " -a, --all do not ignore entries starting with .\n" @@ -5570,7 +5606,7 @@ msgstr "" " --author с -l извежда автора на всеки файл\n" " -b, --escape извежда осмични числа за неграфичните знаци\n" -#: src/ls.c:4735 +#: src/ls.c:4734 #, fuzzy msgid "" " --block-size=SIZE scale sizes by SIZE before printing them. E." @@ -5592,7 +5628,7 @@ msgstr "" " с -l: показва ctime и сортира според името\n" " иначе: сортира според ctime\n" -#: src/ls.c:4745 +#: src/ls.c:4744 #, fuzzy msgid "" " -C list entries by columns\n" @@ -5615,7 +5651,7 @@ msgstr "" " и символните връзки, вместо сочените файлове\n" " -D, --dired генерира изход за режима „dired“ на Емакс\n" -#: src/ls.c:4753 +#: src/ls.c:4752 #, fuzzy msgid "" " -f do not sort, enable -aU, disable -ls --color\n" @@ -5634,11 +5670,11 @@ msgstr "" " single-column -1, verbose -l, vertical -C\n" " --full-time като -l --time-style=full-iso\n" -#: src/ls.c:4761 +#: src/ls.c:4760 msgid " -g like -l, but do not list owner\n" msgstr " -g като -l, но не извежда собственика\n" -#: src/ls.c:4764 +#: src/ls.c:4763 msgid "" " --group-directories-first\n" " group directories before files.\n" @@ -5646,7 +5682,7 @@ msgid "" " use of --sort=none (-U) disables grouping\n" msgstr "" -#: src/ls.c:4770 +#: src/ls.c:4769 #, fuzzy msgid "" " -G, --no-group in a long listing, don't print group names\n" @@ -5659,7 +5695,7 @@ msgstr "" " -h, --human-readable извежда размерите като за хора (напр. 1K, 234M, 2G)\n" " -H, --si подобно, но с множител 1000 вместо 1024\n" -#: src/ls.c:4776 +#: src/ls.c:4775 #, fuzzy msgid "" " -H, --dereference-command-line\n" @@ -5685,7 +5721,7 @@ msgstr "" " (пренебрегва се, ако има -a или -A)\n" # TODO: превод на shell-ОБРАЗЕЦ? -#: src/ls.c:4786 +#: src/ls.c:4785 #, fuzzy msgid "" " --indicator-style=WORD append indicator with style WORD to entry " @@ -5705,7 +5741,7 @@ msgstr "" "ОБРАЗЕЦ\n" " -k като --block-size=1K\n" -#: src/ls.c:4796 +#: src/ls.c:4795 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5722,7 +5758,7 @@ msgstr "" " -m попълва в широчина с разделени със запетая " "елементи\n" -#: src/ls.c:4804 +#: src/ls.c:4803 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. " @@ -5743,7 +5779,7 @@ msgstr "" " -p, --indicator-style=slash\n" " добавя знак / към каталозите\n" -#: src/ls.c:4812 +#: src/ls.c:4811 #, fuzzy msgid "" " -q, --hide-control-chars print ? instead of non graphic characters\n" @@ -5765,7 +5801,7 @@ msgstr "" " literal, locale, shell, shell-always, c, " "escape\n" -#: src/ls.c:4821 +#: src/ls.c:4820 #, fuzzy msgid "" " -r, --reverse reverse order while sorting\n" @@ -5777,7 +5813,7 @@ msgstr "" " -R, --recursive извежда подкаталозите рекурсивно\n" " -s, --size извежда размера в блокове на всеки файл\n" -#: src/ls.c:4826 +#: src/ls.c:4825 msgid "" " -S sort by file size\n" " --sort=WORD sort by WORD instead of name: none -U,\n" @@ -5797,7 +5833,7 @@ msgstr "" "ctime,\n" " или status; по това време се и сортира\n" -#: src/ls.c:4836 +#: src/ls.c:4835 #, fuzzy msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" @@ -5822,13 +5858,13 @@ msgstr "" " -T, --tabsize=КОЛОНИ приема, че табулациите са през КОЛОНИ вместо " "през 8\n" -#: src/ls.c:4845 +#: src/ls.c:4844 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:4849 +#: src/ls.c:4848 #, fuzzy msgid "" " -u with -lt: sort by, and show, access time\n" @@ -5846,7 +5882,7 @@ msgstr "" "каталога\n" " -v сортира според версията\n" -#: src/ls.c:4856 +#: src/ls.c:4855 #, fuzzy msgid "" " -w, --width=COLS assume screen width instead of current value\n" @@ -5861,7 +5897,7 @@ msgstr "" " -X сортира в азбучен ред според разширението\n" " -1 извежда по един файл на ред\n" -#: src/ls.c:4866 +#: src/ls.c:4865 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5870,7 +5906,7 @@ msgid "" "variable can change the settings. Use the dircolors command to set it.\n" msgstr "" -#: src/ls.c:4873 +#: src/ls.c:4872 msgid "" "\n" "Exit status:\n" @@ -5895,7 +5931,7 @@ msgstr "" msgid "David Madore" msgstr "" -#: src/md5sum.c:162 +#: src/md5sum.c:164 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -5907,7 +5943,7 @@ msgstr "" "Извежда или проверява контролни суми %s (%d-битови).\n" "Без ФАЙЛ или ако ФАЙЛ е -, чете от стандартния вход.\n" -#: src/md5sum.c:172 +#: src/md5sum.c:174 #, fuzzy msgid "" " -b, --binary read in binary mode (default unless reading tty " @@ -5916,18 +5952,22 @@ msgstr "" " -b, --binary чете в двоичен режим (по подразбиране, при четене от " "терминал)\n" -#: src/md5sum.c:176 +#: src/md5sum.c:178 #, fuzzy msgid " -b, --binary read in binary mode\n" msgstr " -b, --binary чете в двоичен режим\n" -#: src/md5sum.c:179 +#: src/md5sum.c:181 #, fuzzy, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr "" " -c, --check прочита %s суми от ФАЙЛовете и ги проверява\n" -#: src/md5sum.c:183 +#: src/md5sum.c:184 +msgid " --tag create a BSD-style checksum\n" +msgstr "" + +#: src/md5sum.c:188 #, fuzzy msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" @@ -5935,12 +5975,12 @@ msgstr "" " -t, --text чете в текстов режим (по подразбиране, ako\n" " стандартният вход е от терминал)\n" -#: src/md5sum.c:187 +#: src/md5sum.c:192 #, fuzzy msgid " -t, --text read in text mode (default)\n" msgstr " -t, --text чете в текстов режим (по подразбиране)\n" -#: src/md5sum.c:190 +#: src/md5sum.c:195 #, fuzzy msgid "" "\n" @@ -5958,12 +5998,12 @@ msgstr "" "суми\n" "\n" -#: src/md5sum.c:198 +#: src/md5sum.c:203 msgid "" " --strict with --check, exit non-zero for any invalid input\n" msgstr "" -#: src/md5sum.c:203 +#: src/md5sum.c:208 #, fuzzy, c-format msgid "" "\n" @@ -5979,44 +6019,44 @@ msgstr "" "с контролна сума, знак посочващ типа (“*“ за двоичен, „ “ за текстов)\n" "и името на всеки ФАЙЛ.\n" -#: src/md5sum.c:502 +#: src/md5sum.c:523 #, c-format msgid "%s: too many checksum lines" msgstr "%s: твърде много редове с контролни суми" -#: src/md5sum.c:526 +#: src/md5sum.c:547 #, c-format msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line" msgstr "%s: %<PRIuMAX>: неправилно форматиран ред с контролна сума %s" -#: src/md5sum.c:551 +#: src/md5sum.c:572 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: НЕ УСПЯ системна функция open или read\n" # Не е ясно къде се използва -#: src/md5sum.c:574 +#: src/md5sum.c:595 msgid "FAILED" msgstr "НЕУСПЕШНО" # Не е ясно къде се използва -#: src/md5sum.c:576 +#: src/md5sum.c:597 msgid "OK" msgstr "ОК" -#: src/md5sum.c:600 +#: src/md5sum.c:621 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "%s: не са открити правилно форматирани %s редове с контролни суми" -#: src/md5sum.c:610 +#: src/md5sum.c:631 #, 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:618 +#: src/md5sum.c:639 #, fuzzy, c-format msgid "WARNING: %<PRIuMAX> listed file could not be read" msgid_plural "WARNING: %<PRIuMAX> listed files could not be read" @@ -6026,7 +6066,7 @@ msgstr[1] "" "ВНИМАНИЕ: %<PRIuMAX> от общо %<PRIuMAX> изброени файла не могат да бъдат " "прочетени" -#: src/md5sum.c:626 +#: src/md5sum.c:647 #, fuzzy, c-format msgid "WARNING: %<PRIuMAX> computed checksum did NOT match" msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match" @@ -6035,29 +6075,39 @@ msgstr[0] "" msgstr[1] "" "ВНИМАНИЕ: %<PRIuMAX> от %<PRIuMAX> пресметнати контролни суми НЕ пасват" -#: src/md5sum.c:704 +#: src/md5sum.c:760 +#, c-format +msgid "--tag does not support --text mode" +msgstr "" + +#: src/md5sum.c:766 +#, fuzzy, c-format +msgid "the --tag option is meaningless when verifying checksums" +msgstr "опцията --status е смислена само при проверяване на контролни суми" + +#: src/md5sum.c:773 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" msgstr "" "опциите --binary и --text са безсмислени при проверка на контролни суми" -#: src/md5sum.c:712 +#: src/md5sum.c:781 #, c-format msgid "the --status option is meaningful only when verifying checksums" msgstr "опцията --status е смислена само при проверяване на контролни суми" -#: src/md5sum.c:719 +#: src/md5sum.c:788 #, c-format msgid "the --warn option is meaningful only when verifying checksums" msgstr "опцията --warn е смислена само при проверяване на контролни суми" -#: src/md5sum.c:726 +#: src/md5sum.c:795 #, fuzzy, c-format msgid "the --quiet option is meaningful only when verifying checksums" msgstr "опцията --status е смислена само при проверяване на контролни суми" -#: src/md5sum.c:733 +#: src/md5sum.c:802 #, fuzzy, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "опцията --status е смислена само при проверяване на контролни суми" @@ -6068,14 +6118,13 @@ msgid "Usage: %s [OPTION]... DIRECTORY...\n" msgstr "Използване: %s [ОПЦИЯ]... КАТАЛОГ...\n" #: src/mkdir.c:57 -msgid "" -"Create the DIRECTORY(ies), if they do not already exist.\n" -"\n" +#, fuzzy +msgid "Create the DIRECTORY(ies), if they do not already exist.\n" msgstr "" "Създава КАТАЛОГ(зи), ако вече не са създадени.\n" "\n" -#: src/mkdir.c:64 +#: src/mkdir.c:63 #, fuzzy msgid "" " -m, --mode=MODE set file mode (as in chmod), not a=rwx - umask\n" @@ -6089,7 +6138,7 @@ msgstr "" "съществуващи\n" " -v, --verbose извежда съобщение за всеки създаден каталог\n" -#: src/mkdir.c:169 +#: src/mkdir.c:168 #, c-format msgid "created directory %s" msgstr "създаден е каталог %s" @@ -6100,14 +6149,13 @@ msgid "Usage: %s [OPTION]... NAME...\n" msgstr "Използване: %s [ОПЦИЯ]... ИМЕ...\n" #: src/mkfifo.c:52 -msgid "" -"Create named pipes (FIFOs) with the given NAMEs.\n" -"\n" +#, fuzzy +msgid "Create named pipes (FIFOs) with the given NAMEs.\n" msgstr "" "Създава именувани канали (FIFO) с посочените ИМЕна.\n" "\n" -#: src/mkfifo.c:59 src/mknod.c:61 +#: src/mkfifo.c:58 src/mknod.c:60 #, fuzzy msgid "" " -m, --mode=MODE set file permission bits to MODE, not a=rw - umask\n" @@ -6115,17 +6163,17 @@ msgstr "" " -m, --mode=РЕЖИМ задава режим за достъп (като при chmod), not a=rw - " "umask\n" -#: src/mkfifo.c:62 +#: src/mkfifo.c:61 msgid "" " -Z, --context=CTX set the SELinux security context of each NAME to CTX\n" msgstr "" -#: src/mkfifo.c:122 src/mknod.c:128 +#: src/mkfifo.c:121 src/mknod.c:127 #, c-format msgid "invalid mode" msgstr "неправилен режим за достъп" -#: src/mkfifo.c:127 src/mknod.c:133 +#: src/mkfifo.c:126 src/mknod.c:132 #, c-format msgid "mode must specify only file permission bits" msgstr "режимът трябва да определя само битовете за достъп до файла" @@ -6136,18 +6184,17 @@ msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n" msgstr "Използване: %s [ОПЦИЯ]... ИМЕ ТИП [ГОЛЯМ МАЛЪК]\n" #: src/mknod.c:54 -msgid "" -"Create the special file NAME of the given TYPE.\n" -"\n" +#, fuzzy +msgid "Create the special file NAME of the given TYPE.\n" msgstr "" "Създава специален файл ИМЕ от зададен ТИП.\n" "\n" -#: src/mknod.c:64 +#: src/mknod.c:63 msgid " -Z, --context=CTX set the SELinux security context of NAME to CTX\n" msgstr "" -#: src/mknod.c:69 +#: src/mknod.c:68 msgid "" "\n" "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n" @@ -6163,7 +6210,7 @@ msgstr "" "номерът се интерпретира като шестнадесетичен, иначе ако започва с 0, като\n" "осмичен и иначе -- като десетичен. ТИП може да бъде:\n" -#: src/mknod.c:76 +#: src/mknod.c:75 msgid "" "\n" " b create a block (buffered) special file\n" @@ -6175,42 +6222,42 @@ msgstr "" " c, u създава символен (небуфериран) специален файл\n" " p създава именуван канал\n" -#: src/mknod.c:151 +#: src/mknod.c:150 msgid "Special files require major and minor device numbers." msgstr "" "при създаване на специални файлове трябва да се посочат\n" "голям и малък номер на устройство" -#: src/mknod.c:161 +#: src/mknod.c:160 msgid "Fifos do not have major and minor device numbers." msgstr "Именуваните канали нямат малък и голям номер на устройство." -#: src/mknod.c:177 +#: src/mknod.c:176 #, c-format msgid "block special files not supported" msgstr "не се поддържа работа с блокови специални файлове" -#: src/mknod.c:186 +#: src/mknod.c:185 #, c-format msgid "character special files not supported" msgstr "не се поддържа работа със символни специални файлове" -#: src/mknod.c:202 +#: src/mknod.c:201 #, c-format msgid "invalid major device number %s" msgstr "погрешен голям номер на устройство %s" -#: src/mknod.c:207 +#: src/mknod.c:206 #, c-format msgid "invalid minor device number %s" msgstr "погрешен малък номер на устройство %s" -#: src/mknod.c:212 +#: src/mknod.c:211 #, c-format msgid "invalid device %s %s" msgstr "неправилно устройство %s %s" -#: src/mknod.c:226 +#: src/mknod.c:225 #, c-format msgid "invalid device type %s" msgstr "неправилен тип на устройство %s" @@ -6269,60 +6316,59 @@ msgid "" " directory specified via -p; else /tmp [deprecated]\n" msgstr "" -#: src/mktemp.c:222 +#: src/mktemp.c:223 #, fuzzy, c-format msgid "failed to redirect stderr to /dev/null" msgstr "неуспешно пренасочване на стандартната грешка" -#: src/mktemp.c:228 +#: src/mktemp.c:229 #, fuzzy, c-format msgid "too many templates" msgstr "твърде много повторени редове" -#: src/mktemp.c:248 +#: src/mktemp.c:249 #, c-format msgid "with --suffix, template %s must end in X" msgstr "" -#: src/mktemp.c:273 src/split.c:1117 +#: src/mktemp.c:274 src/split.c:1130 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "" -#: src/mktemp.c:278 +#: src/mktemp.c:279 #, c-format msgid "too few X's in template %s" msgstr "" -#: src/mktemp.c:291 +#: src/mktemp.c:292 #, c-format msgid "invalid template, %s, contains directory separator" msgstr "" -#: src/mktemp.c:305 +#: src/mktemp.c:306 #, c-format msgid "invalid template, %s; with --tmpdir, it may not be absolute" msgstr "" -#: src/mktemp.c:325 +#: src/mktemp.c:326 #, fuzzy, c-format msgid "failed to create directory via template %s" msgstr "каталогът %s не може да се затвори" -#: src/mktemp.c:335 +#: src/mktemp.c:336 #, fuzzy, c-format msgid "failed to create file via template %s" msgstr "времената на %s не можаха да се запазят" -#: src/mv.c:290 -msgid "" -"Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" -"\n" +#: src/mv.c:292 +#, fuzzy +msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" msgstr "" "Преименува ИЗТОЧНИК на ЦЕЛ или премества ИЗТОЧНИК(ци) в КАТАЛОГ.\n" "\n" -#: src/mv.c:297 +#: src/mv.c:298 #, fuzzy msgid "" " --backup[=CONTROL] make a backup of each existing destination " @@ -6341,7 +6387,7 @@ msgstr "" " -f, --force да не се пита преди заместване на файлове\n" " -i, --interactive да се пита преди заместване на файлове\n" -#: src/mv.c:306 +#: src/mv.c:307 msgid "" " --strip-trailing-slashes remove any trailing slashes from each " "SOURCE\n" @@ -6352,7 +6398,7 @@ msgstr "" " аргумент ЦЕЛ\n" " -S, --suffix=СУФИКС вместо обичайния суфикс за резервни копия\n" -#: src/mv.c:311 +#: src/mv.c:312 msgid "" " -t, --target-directory=DIRECTORY move all SOURCE arguments into " "DIRECTORY\n" @@ -6376,13 +6422,11 @@ msgid "Usage: %s [OPTION] [COMMAND [ARG]...]\n" msgstr "Използване: %s [ОПЦИЯ] [КОМАНДА [АРГУМЕНТ]...]\n" #: src/nice.c:73 -#, c-format +#, fuzzy, c-format msgid "" "Run COMMAND with an adjusted niceness, which affects process scheduling.\n" -"With no COMMAND, print the current niceness. Nicenesses range from\n" -"%d (most favorable scheduling) to %d (least favorable).\n" -"\n" -" -n, --adjustment=N add integer N to the niceness (default 10)\n" +"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 "" "Изпълнява КОМАНДА с нагодена стойност на nice, влияеща на диспечера на " "задачите\n" @@ -6393,22 +6437,26 @@ msgstr "" "\n" " -n, --adjustment=N добавя N към стойността на nice (по подразбиране 10)\n" -#: src/nice.c:168 +#: src/nice.c:82 +msgid " -n, --adjustment=N add integer N to the niceness (default 10)\n" +msgstr "" + +#: src/nice.c:172 #, c-format msgid "invalid adjustment %s" msgstr "неправилна настройка: %s" -#: src/nice.c:177 +#: src/nice.c:181 #, c-format msgid "a command must be given with an adjustment" msgstr "заедно с корекцията трябва да се посочи команда" -#: src/nice.c:184 src/nice.c:195 +#: src/nice.c:188 src/nice.c:199 #, c-format msgid "cannot get niceness" msgstr "не може да се получи стойността на nice" -#: src/nice.c:201 +#: src/nice.c:205 #, c-format msgid "cannot set niceness" msgstr "не може да се настрои стойността на nice" @@ -6418,18 +6466,18 @@ msgstr "не може да се настрои стойността на nice" msgid "Scott Bartram" msgstr "" -#: src/nl.c:186 +#: 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" -"\n" msgstr "" "Извежда всеки от ФАЙЛовете на стандартния изход с добавени номера на " "редовете.\n" "Без ФАЙЛ или ако ФАЙЛ е - се чете от стандартния вход.\n" "\n" -#: src/nl.c:194 +#: src/nl.c:186 msgid "" " -b, --body-numbering=STYLE use STYLE for numbering body lines\n" " -d, --section-delimiter=CC use CC for separating logical pages\n" @@ -6442,7 +6490,7 @@ msgstr "" " -f, --footer-numbering=СТИЛ ползва СТИЛ при номериране долния " "колонтитул\n" -#: src/nl.c:199 +#: src/nl.c:191 #, fuzzy msgid "" " -h, --header-numbering=STYLE use STYLE for numbering header lines\n" @@ -6465,7 +6513,7 @@ msgstr "" "страница\n" " -s, --number-separator=НИЗ добавя НИЗ след всеки номер на ред\n" -#: src/nl.c:207 +#: src/nl.c:199 #, fuzzy msgid "" " -v, --starting-line-number=NUMBER first line number on each logical page\n" @@ -6476,7 +6524,7 @@ msgstr "" " -w, --number-width=БРОЙ ползва БРОЙ стълбове за номерата на " "редовете\n" -#: src/nl.c:213 +#: src/nl.c:205 msgid "" "\n" "By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC are\n" @@ -6490,7 +6538,7 @@ msgstr "" "по подразбиране вторият символ е :. Използвайте \\\\ за \\. СТИЛ е едно " "от:\n" -#: src/nl.c:219 +#: src/nl.c:211 #, fuzzy msgid "" "\n" @@ -6521,52 +6569,47 @@ msgstr "" " rz за дясно подравняване, с предхождащи нули\n" "\n" -#: src/nl.c:286 +#: src/nl.c:278 #, c-format msgid "line number overflow" msgstr "препълване на номера на ред" -#: src/nl.c:486 +#: src/nl.c:478 #, c-format msgid "invalid header numbering style: %s" msgstr "неправилен формат за номериране на горен колонтитул: %s" -#: src/nl.c:494 +#: src/nl.c:486 #, c-format msgid "invalid body numbering style: %s" msgstr "неправилен формат за номериране: %s" -#: src/nl.c:502 +#: src/nl.c:494 #, c-format msgid "invalid footer numbering style: %s" msgstr "неправилен формат за номериране на долен колонтитул: %s" -#: src/nl.c:511 +#: src/nl.c:503 #, c-format msgid "invalid starting line number: %s" msgstr "неправилен начален номер на ред: %s" -#: src/nl.c:517 -#, fuzzy, c-format -msgid "WARNING: --page-increment is deprecated; use --line-increment instead" -msgstr "опцията --allow-missing е остаряла; ползвайте --retry вместо нея" - -#: src/nl.c:524 +#: src/nl.c:512 #, c-format msgid "invalid line number increment: %s" msgstr "неправилна разлика между съседни редове: %s" -#: src/nl.c:536 +#: src/nl.c:524 #, c-format msgid "invalid number of blank lines: %s" msgstr "неправилен брой празни редове: %s" -#: src/nl.c:550 +#: src/nl.c:538 #, c-format msgid "invalid line number field width: %s" msgstr "неправилна ширина на полето за номер на ред: %s" -#: src/nl.c:569 +#: src/nl.c:557 #, c-format msgid "invalid line numbering format: %s" msgstr "неправилен формат за номериране на редове: %s" @@ -6609,11 +6652,6 @@ msgstr "не може да се пренасочи стандартния изх msgid "ignoring input" msgstr "входът се пренебрегва" -#: src/nohup.c:163 src/nohup.c:165 -#, c-format -msgid "failed to open %s" -msgstr "не може да се отвори %s" - #: src/nohup.c:175 #, c-format msgid "ignoring input and appending output to %s" @@ -6649,33 +6687,370 @@ msgid "failed to redirect standard error" msgstr "неуспешно пренасочване на стандартната грешка" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:32 +#: src/nproc.c:33 msgid "Giuseppe Scrivano" msgstr "" -#: src/nproc.c:56 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 +#: src/nproc.c:57 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Използване: %s [ОПЦИЯ]...\n" -#: src/nproc.c:57 +#: src/nproc.c:58 msgid "" "Print the number of processing units available to the current process,\n" "which may be less than the number of online processors\n" "\n" msgstr "" -#: src/nproc.c:62 +#: src/nproc.c:63 msgid "" " --all print the number of installed processors\n" " --ignore=N if possible, exclude N processing units\n" msgstr "" -#: src/nproc.c:106 +#: src/nproc.c:107 #, fuzzy, c-format msgid "%s: invalid number to ignore" msgstr "%s: неправилен брой редове" +#. This is a proper name. See the gettext manual, section Names. +#: src/numfmt.c:35 +msgid "Assaf Gordon" +msgstr "" + +#: src/numfmt.c:676 +#, fuzzy, c-format +msgid "value too large to be converted: '%s'" +msgstr "%s: стойността не е напълно преобразувана" + +#: src/numfmt.c:680 +#, fuzzy, c-format +msgid "invalid number: '%s'" +msgstr "недопустимо число %s" + +#: src/numfmt.c:684 +#, c-format +msgid "rejecting suffix in input: '%s' (consider using --from)" +msgstr "" + +#: src/numfmt.c:688 +#, fuzzy, c-format +msgid "invalid suffix in input: '%s'" +msgstr "неправилен аргумент „%s“" + +#: src/numfmt.c:692 +#, c-format +msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)" +msgstr "" + +#: src/numfmt.c:723 +#, fuzzy, c-format +msgid "failed to prepare value '%Lf' for printing" +msgstr "%s: не може да се отвори в режим за писане" + +#: src/numfmt.c:787 +#, fuzzy, c-format +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 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [NUMBER]...\n" +msgstr "Използване: %s [ОПЦИЯ]... [ПОТРЕБИТЕЛ]...\n" + +#: src/numfmt.c:816 +msgid "" +"Reformat NUMBER(s), or the numbers from standard input if none are " +"specified.\n" +msgstr "" + +#: src/numfmt.c:820 +msgid " --debug print warnings about invalid input\n" +msgstr "" + +#: src/numfmt.c:823 +msgid "" +" -d, --delimiter=X use X instead of whitespace for field delimiter\n" +msgstr "" + +#: src/numfmt.c:826 +msgid "" +" --field=N replace the number in input field N (default is 1)\n" +msgstr "" + +#: src/numfmt.c:829 +msgid "" +" --format=FORMAT use printf style floating-point FORMAT;\n" +" see FORMAT below for details\n" +msgstr "" + +#: src/numfmt.c:833 +msgid "" +" --from=UNIT auto-scale input numbers to UNITs; default is " +"'none';\n" +" see UNIT below\n" +msgstr "" + +#: src/numfmt.c:837 +msgid "" +" --from-unit=N specify the input unit size (instead of the default " +"1)\n" +msgstr "" + +#: src/numfmt.c:840 +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 "" + +#: src/numfmt.c:844 +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 +msgid "" +" --invalid=MODE failure mode for invalid numbers: MODE can be:\n" +" abort (default), fail, warn, ignore\n" +msgstr "" + +#: src/numfmt.c:852 +msgid "" +" --padding=N pad the output to N characters; positive N will\n" +" right-align; negative N will left-align;\n" +" padding is ignored if the output is wider than N;\n" +" the default is to automatically pad if a " +"whitespace\n" +" is found\n" +msgstr "" + +#: src/numfmt.c:859 +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 +msgid "" +" --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" +" SUFFIX in input numbers\n" +msgstr "" + +#: src/numfmt.c:867 +msgid "" +" --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" +msgstr "" + +#: src/numfmt.c:870 +msgid "" +" --to-unit=N the output unit size (instead of the default 1)\n" +msgstr "" + +#: src/numfmt.c:877 +#, fuzzy +msgid "" +"\n" +"UNIT options:\n" +msgstr "" +"Опции, определящи наредбата:\n" +"\n" + +#: src/numfmt.c:880 +msgid " none no auto-scaling is done; suffixes will trigger an error\n" +msgstr "" + +#: src/numfmt.c:883 +msgid "" +" auto accept optional single/two letter suffix:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" +msgstr "" + +#: src/numfmt.c:889 +msgid "" +" si accept optional single letter suffix:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:894 +msgid "" +" iec accept optional single letter suffix:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:899 +msgid "" +" iec-i accept optional two-letter suffix:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:905 +#, 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" +msgstr "" + +#: src/numfmt.c:912 +#, c-format +msgid "" +"\n" +"Exit status is 0 if all input numbers were successfully converted.\n" +"By default, %s will stop at the first conversion error with exit status 2.\n" +"With --invalid='fail' a warning is printed for each conversion error\n" +"and the exit status is 2. With --invalid='warn' each conversion error is\n" +"diagnosed, but the exit status is 0. With --invalid='ignore' conversion\n" +"errors are not diagnosed and the exit status is 0.\n" +msgstr "" + +#: src/numfmt.c:921 +#, c-format +msgid "" +"\n" +"Examples:\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" +msgstr "" + +#: src/numfmt.c:974 src/seq.c:212 +#, fuzzy, c-format +msgid "format %s has no %% directive" +msgstr "целта %s не е каталог" + +#: src/numfmt.c:990 +#, fuzzy, c-format +msgid "invalid format %s (width overflow)" +msgstr "неправилна ширина на формат" + +#: src/numfmt.c:1007 src/seq.c:229 +#, c-format +msgid "format %s ends in %%" +msgstr "" + +#: src/numfmt.c:1010 +#, c-format +msgid "invalid format %s, directive must be %%['][-][N]f" +msgstr "" + +#: src/numfmt.c:1018 src/seq.c:236 +#, 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 "неправилен аргумент „%s“" + +#: src/numfmt.c:1092 +#, c-format +msgid "value too large to be printed: '%Lg' (consider using --to)" +msgstr "" + +#: src/numfmt.c:1100 +#, c-format +msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" +msgstr "" + +#: src/numfmt.c:1184 +#, c-format +msgid "large input value '%s': possible precision loss" +msgstr "" + +#: src/numfmt.c:1293 +#, 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 "Неправилен диапазон от страници %s" + +#: src/numfmt.c:1401 +#, fuzzy, c-format +msgid "invalid field value '%s'" +msgstr "неправилен номер на поле: „%s“" + +#: src/numfmt.c:1430 +#, fuzzy, c-format +msgid "invalid header value '%s'" +msgstr "неправилна дата %s" + +#: src/numfmt.c:1456 +#, 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 +#, fuzzy, c-format +msgid "no conversion option specified" +msgstr "посочени са много опции -i" + +#: src/numfmt.c:1471 +#, fuzzy, c-format +msgid "grouping cannot be combined with --to" +msgstr "Не може да се комбинират файлови операнди с --files0-from." + +#: src/numfmt.c:1473 +#, c-format +msgid "grouping has no effect in this locale" +msgstr "" + +#: src/numfmt.c:1486 +#, c-format +msgid "--header ignored with command-line input" +msgstr "" + +#: src/numfmt.c:1511 +#, fuzzy, c-format +msgid "error reading input" +msgstr "грешка при четене на %s" + +#: src/numfmt.c:1520 +#, fuzzy, c-format +msgid "failed to convert some of the input numbers" +msgstr "не може да се пренасочи стандартния изход" + #: src/od.c:294 #, c-format msgid "" @@ -6705,29 +7080,52 @@ msgstr "" "\n" #: src/od.c:307 -msgid "All arguments to long options are mandatory for short options.\n" +#, fuzzy +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" +"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" +"at first byte printed, incremented when dump is progressing.\n" +"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" +"Ако и първият, и вторият формат са валидни, се приема вторият, ако " +"последният\n" +"операнд започва с + или (ако има два операнда) число. \n" +"Операнд ОТМЕСТВАНЕ означава -j ОТМЕСТВАНЕ. ЕТИКЕТ е псевдоадресът на " +"първия\n" +"изведен байт и се увеличава постепенно заедно с обработката. При\n" +"ОТМЕСТВАНЕ и ЕТИКЕТ може да има префикси 0x или 0X, които показват\n" +"шестнадесетично число, и суфикси . за осмично число и b за множител 512.\n" +"\n" +"ТИП се състои от една или повече от следните спецификации:\n" +"\n" +" a именуван знак, старшият бит се пренебрегва\n" +" c знак от ASCII или код, защитен с \\\n" -#: src/od.c:310 +#: src/od.c:318 +#, fuzzy msgid "" -" -A, --address-radix=RADIX decide how file offsets are printed\n" +" -A, --address-radix=RADIX output format for file offsets. RADIX is one\n" +" of [doxn], for Decimal, Octal, Hex or None\n" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" " -A, --address-radix=БАЗА как да се извежда отместването\n" " -j, --skip-bytes=БАЙТОВЕ пропуска БАЙТОВЕ входни байта в началото\n" -#: src/od.c:314 +#: src/od.c:323 #, 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" -" --traditional accept arguments in traditional form\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[=ДЪЛЖИНА] извежда низове от поне по ДЪЛЖИНА графични " @@ -6738,9 +7136,11 @@ msgstr "" " -w, --width[=БАЙТОВЕ] извежда по БАЙТОВЕ входни байта на един ред\n" " --traditional да се приемат аргументи в традиционния формат\n" -#: src/od.c:324 +#: src/od.c:336 +#, fuzzy 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" @@ -6756,7 +7156,7 @@ msgstr "" " -d е същото като -t u2, извеждат се беззнакови двубайтови десетични " "числа\n" -#: src/od.c:332 +#: src/od.c:345 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -6772,42 +7172,16 @@ msgstr "" " -s е същото като -t d2, извеждат се двубайтови десетични числа\n" " -x е същото като -t x2, извеждат се двубайтови шестнадесетични числа\n" -#: src/od.c:340 -#, fuzzy +#: src/od.c:353 msgid "" "\n" -"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" -"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" -"at first byte printed, incremented when dump is progressing.\n" -"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" -"операнд започва с + или (ако има два операнда) число. \n" -"Операнд ОТМЕСТВАНЕ означава -j ОТМЕСТВАНЕ. ЕТИКЕТ е псевдоадресът на " -"първия\n" -"изведен байт и се увеличава постепенно заедно с обработката. При\n" -"ОТМЕСТВАНЕ и ЕТИКЕТ може да има префикси 0x или 0X, които показват\n" -"шестнадесетично число, и суфикси . за осмично число и b за множител 512.\n" -"\n" -"ТИП се състои от една или повече от следните спецификации:\n" -"\n" -" a именуван знак, старшият бит се пренебрегва\n" -" c знак от ASCII или код, защитен с \\\n" - -#: src/od.c:349 -msgid "" "\n" "TYPE is made up of one or more of these specifications:\n" -"\n" " a named character, ignoring high-order bit\n" " c ASCII character or backslash escape\n" msgstr "" -#: src/od.c:356 +#: src/od.c:360 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -6821,10 +7195,11 @@ msgstr "" " u[РАЗМ] беззнаково десетично число от РАЗМ байта\n" " x[РАЗМ] шестнадесетично число от РАЗМ байта\n" -#: src/od.c:363 +#: src/od.c:367 +#, fuzzy msgid "" "\n" -"SIZE is a number. For TYPE in doux, SIZE may also be C for\n" +"SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" "sizeof(char), S for sizeof(short), I for sizeof(int) or L for\n" "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" @@ -6835,41 +7210,39 @@ msgstr "" "f, РАЗМ може да бъде и F за sizeof(float), D за sizeof(double) или L\n" "за sizeof(long double).\n" -#: src/od.c:370 -#, fuzzy +#: src/od.c:374 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" +"Adding a z suffix to any type displays printable characters at the end of\n" +"each output line.\n" msgstr "" -"\n" -"БАЗА е d за десетична бройна система, o за осмична, x за\n" -"шестнадесетична или n за никаква. БАЙТОВЕ е шестнадесетично, ако има\n" -"префикс 0x или 0X и се умножава по 512 при суфикс b, по 1024 при k и\n" -"по 1048576 при m. Ако се добави суфикс z, в края на всеки изведен ред\n" -"се добавя изображение на входните знаци. " -#: src/od.c:380 +#: src/od.c:379 #, 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" +"\n" +"\n" +"BYTES is hex with 0x or 0X prefix, and may have a multiplier suffix:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"and so on for G, T, P, E, Z, Y.\n" msgstr "" -"--string без число предполага 3. --width без число предполага 32.\n" -"По подразбиране od ползва -A o -t d2 -w16. \n" +"\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/od.c:633 src/od.c:753 +#: src/od.c:639 src/od.c:759 #, c-format msgid "invalid type string %s" msgstr "неправилен низ за тип %s" -#: src/od.c:643 +#: src/od.c:649 #, c-format msgid "" "invalid type string %s;\n" @@ -6878,7 +7251,7 @@ msgstr "" "неправилен низ за тип %s;\n" "тази система не поддържа %lu-байтови целочислени числа" -#: src/od.c:764 +#: src/od.c:770 #, c-format msgid "" "invalid type string %s;\n" @@ -6887,38 +7260,38 @@ msgstr "" "неправилен низ за тип %s;\n" "тази система не поддържа %lu-байтови числа с плаваща запетая" -#: src/od.c:822 +#: src/od.c:828 #, fuzzy, c-format msgid "invalid character '%c' in type string %s" msgstr "неправилен знак „%c“ в низа за тип %s" -#: src/od.c:1047 +#: src/od.c:1053 #, c-format msgid "cannot skip past end of combined input" msgstr "не може да се пропусне след края на комбинирания вход" -#: src/od.c:1603 +#: src/od.c:1609 #, fuzzy, c-format msgid "invalid output address radix '%c'; it must be one character from [doxn]" msgstr "" "неправилна база „%c“ на изходния адрес; трябва да бъде знак измежду [doxn]" -#: src/od.c:1729 +#: src/od.c:1735 #, c-format msgid "no type may be specified when dumping strings" msgstr "при извеждане на низове не може да се посочва тип" -#: src/od.c:1804 +#: src/od.c:1810 #, fuzzy msgid "compatibility mode supports at most one file" msgstr "При традиционния формат се поддържа най-много един файл." -#: src/od.c:1825 +#: src/od.c:1831 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "skip-bytes + read-bytes са твърде много" -#: src/od.c:1868 +#: src/od.c:1874 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "внимание: неправилна ширина %lu; вместо нея се ползва %d" @@ -6934,18 +7307,18 @@ msgid "standard input is closed" 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" -"\n" msgstr "" "Извежда на стандартния изход редове, състоящи се от поредно\n" "съответстващи си редове от всеки ФАЙЛ, разделени с табулации.\n" "Без ФАЙЛ или ако ФАЙЛ е - чете от стандартния вход.\n" "\n" -#: src/paste.c:448 +#: 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" @@ -6953,7 +7326,7 @@ msgstr "" " -d, --delimiters=СПИС разделя със знаците от СПИС вместо с табулации\n" " -s, --serial изкарва файловете един след друг вместо паралелно\n" -#: src/paste.c:509 +#: src/paste.c:508 #, c-format msgid "delimiter list ends with an unescaped backslash: %s" msgstr "" @@ -7018,80 +7391,80 @@ msgid "Kaveh Ghazi" msgstr "" #. TRANSLATORS: Real name is unknown; at most 19 characters. -#: src/pinky.c:250 +#: src/pinky.c:242 msgid " ???" msgstr "" #. TRANSLATORS: Idle time is unknown; at most 5 characters. -#: src/pinky.c:274 +#: src/pinky.c:266 msgid "?????" msgstr "" -#: src/pinky.c:323 +#: src/pinky.c:314 #, c-format msgid "Login name: " msgstr "Входящо име: " -#: src/pinky.c:326 +#: src/pinky.c:317 #, c-format msgid "In real life: " msgstr "В реалния живот: " #. TRANSLATORS: Real name is unknown; no hard limit. -#: src/pinky.c:330 +#: src/pinky.c:321 msgid "???\n" msgstr "???\n" -#: src/pinky.c:350 +#: src/pinky.c:341 #, c-format msgid "Directory: " msgstr "Каталог: " -#: src/pinky.c:352 +#: src/pinky.c:343 #, c-format msgid "Shell: " msgstr "Обвивка: " -#: src/pinky.c:371 +#: src/pinky.c:362 #, c-format msgid "Project: " msgstr "Проект: " -#: src/pinky.c:395 +#: src/pinky.c:386 #, c-format msgid "Plan:\n" msgstr "План:\n" -#: src/pinky.c:414 +#: src/pinky.c:405 msgid "Login" msgstr "Вход " -#: src/pinky.c:416 +#: src/pinky.c:407 msgid "Name" msgstr "Име " -#: src/pinky.c:417 +#: src/pinky.c:408 msgid " TTY" msgstr " TTY" -#: src/pinky.c:419 +#: src/pinky.c:410 msgid "Idle" msgstr "Неактивен" -#: src/pinky.c:420 +#: src/pinky.c:411 msgid "When" msgstr "Кога" -#: src/pinky.c:423 +#: src/pinky.c:414 msgid "Where" msgstr "Къде" -#: src/pinky.c:502 +#: src/pinky.c:493 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Използване: %s [ОПЦИЯ]... [ПОТРЕБИТЕЛ]...\n" -#: src/pinky.c:503 +#: src/pinky.c:494 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7108,7 +7481,7 @@ msgstr "" " -p изпуска потребителския файл план в дългия формат\n" " -s извежда в кратък формат; по подразбиране е така\n" -#: src/pinky.c:511 +#: src/pinky.c:502 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7123,7 +7496,7 @@ msgstr "" " -q изпуска пълните имена, отдалечените хостове и\n" " време на неактивност при късия формат\n" -#: src/pinky.c:520 +#: src/pinky.c:511 #, fuzzy, c-format msgid "" "\n" @@ -7134,7 +7507,7 @@ msgstr "" "Олекотена програма „finger“ -- извежда информация за потребител.\n" "Файлът utmp ще бъде %s.\n" -#: src/pinky.c:604 +#: src/pinky.c:595 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "при използване на -l трябва да се посочи поне едно потребителско име" @@ -7150,86 +7523,85 @@ msgstr "" msgid "Roland Huebner" msgstr "Pete TerMaat и Roland Huebner" -#: src/pr.c:912 +#: src/pr.c:908 #, fuzzy, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "на „--pages=ПЪРВА_СТР[:ПОСЛ_СТР]“ липсва аргумент" -#: src/pr.c:914 +#: src/pr.c:910 #, fuzzy, c-format msgid "invalid page range %s" msgstr "Неправилен диапазон от страници %s" -#: src/pr.c:979 +#: src/pr.c:975 #, fuzzy, c-format msgid "'-l PAGE_LENGTH' invalid number of lines: %s" msgstr "“-l СТР_ДЪЛЖ“ неправилен брой редове: %s" -#: src/pr.c:1003 +#: src/pr.c:999 #, fuzzy, c-format msgid "'-N NUMBER' invalid starting line number: %s" msgstr "“-N НОМЕР“ неправилен номер на ред: %s" -#: src/pr.c:1015 +#: src/pr.c:1011 #, fuzzy, c-format msgid "'-o MARGIN' invalid line offset: %s" msgstr "“-o ПОЛЕ“ неправилно отместване на редовете: %s" -#: src/pr.c:1056 +#: src/pr.c:1052 #, fuzzy, c-format msgid "'-w PAGE_WIDTH' invalid number of characters: %s" msgstr "“-w СТР_ШИР“ неправилен брой знаци: %s" -#: src/pr.c:1070 +#: src/pr.c:1066 #, fuzzy, c-format msgid "'-W PAGE_WIDTH' invalid number of characters: %s" msgstr "“-W СТР_ШИР“ неправилен брой знаци: %s" -#: src/pr.c:1100 +#: src/pr.c:1096 #, fuzzy, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "Не може да се посочва номер на стълбове при паралелен печат." -#: src/pr.c:1104 +#: src/pr.c:1100 #, fuzzy, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "Не може да се задава едновременно успореден печат и печат напреки." -#: src/pr.c:1200 +#: src/pr.c:1196 #, fuzzy, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "“-%c“ излишни знаци или неправилен номер в аргумент: %s" -#: src/pr.c:1304 +#: src/pr.c:1293 #, c-format msgid "page width too narrow" msgstr "ширината на страницата е твърде малка" -#: src/pr.c:2369 +#: src/pr.c:2353 #, c-format msgid "starting page number %<PRIuMAX> exceeds page count %<PRIuMAX>" msgstr "" "началният номер на страница %<PRIuMAX> надминава броя страници %<PRIuMAX>" -#: src/pr.c:2396 +#: src/pr.c:2380 #, fuzzy, c-format msgid "page number overflow" msgstr "Препълване на номера на страница" -#: src/pr.c:2401 +#: src/pr.c:2385 #, c-format msgid "Page %<PRIuMAX>" msgstr "Стр. %<PRIuMAX>" -#: src/pr.c:2773 -msgid "" -"Paginate or columnate FILE(s) for printing.\n" -"\n" +#: src/pr.c:2757 +#, fuzzy +msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" "Форматира за печат ФАЙЛовете по страници и стълбове.\n" "\n" -#: src/pr.c:2780 +#: src/pr.c:2763 #, fuzzy msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" @@ -7246,7 +7618,7 @@ msgstr "" " освен ако е използвано -a. Подравнява броя на редове\n" " в стълбовете на всяка страница.\n" -#: src/pr.c:2788 +#: src/pr.c:2771 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7262,7 +7634,7 @@ msgstr "" " -d, --double-space\n" " двойни интервали в изхода\n" -#: src/pr.c:2796 +#: src/pr.c:2779 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7284,7 +7656,7 @@ msgstr "" "редови\n" " горен и долен колонтитули)\n" -#: src/pr.c:2806 +#: src/pr.c:2789 #, fuzzy msgid "" " -h, --header=HEADER\n" @@ -7309,7 +7681,7 @@ msgstr "" "посочва\n" " ограничителите\n" -#: src/pr.c:2815 +#: src/pr.c:2798 #, fuzzy msgid "" " -l, --length=PAGE_LENGTH\n" @@ -7325,7 +7697,7 @@ msgstr "" " -m, --merge извежда паралелно всички файлове, по един в стълб.\n" " съкращава редовете, но с -J слива пълните редове\n" -#: src/pr.c:2822 +#: src/pr.c:2805 #, fuzzy msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" @@ -7344,7 +7716,7 @@ msgstr "" "страница\n" " е с номер НОМЕР (вж. +ПЪРВА_СТР)\n" -#: src/pr.c:2830 +#: src/pr.c:2813 #, fuzzy msgid "" " -o, --indent=MARGIN\n" @@ -7360,7 +7732,7 @@ msgstr "" " -r, --no-file-warnings\n" " не предупреждава, ако файлът не може да бъде отворен\n" -#: src/pr.c:2837 +#: src/pr.c:2820 #, fuzzy msgid "" " -s[CHAR], --separator[=CHAR]\n" @@ -7381,7 +7753,7 @@ msgstr "" "е\n" " зададено и -w\n" -#: src/pr.c:2844 +#: src/pr.c:2827 #, fuzzy msgid "" " -S[STRING], --sep-string[=STRING]\n" @@ -7397,7 +7769,7 @@ msgstr "" "опции.\n" " -t, --omit-header пропуска горните и долните колонтитули\n" -#: src/pr.c:2851 +#: src/pr.c:2834 #, fuzzy msgid "" " -T, --omit-pagination\n" @@ -7421,7 +7793,7 @@ msgstr "" " задава ширина на страницата от СТР_ШИР (72) знака при\n" " многоколонен извод, -s[знак] отменя (72)\n" -#: src/pr.c:2861 +#: src/pr.c:2844 #, fuzzy msgid "" " -W, --page-width=PAGE_WIDTH\n" @@ -7437,7 +7809,7 @@ msgstr "" "се\n" " влияе от -S и -s\n" -#: src/pr.c:2869 +#: src/pr.c:2852 #, fuzzy msgid "" "\n" @@ -7600,16 +7972,16 @@ msgstr "" " или: %s -G [ОПЦИЯ]... [ВХОД [ИЗХОД]]\n" #: src/ptx.c:1821 +#, fuzzy msgid "" "Output a permuted index, including context, of the words in the input " "files.\n" -"\n" msgstr "" "Извежда подреден азбучен показалец на думите и контекста им във входните " "файлове\n" "\n" -#: src/ptx.c:1828 +#: src/ptx.c:1827 #, fuzzy msgid "" " -A, --auto-reference output automatically generated references\n" @@ -7622,7 +7994,7 @@ msgstr "" " -F, --flag-truncation=НИЗ обозначава с НИЗ при съкращаване на " "редовете\n" -#: src/ptx.c:1833 +#: src/ptx.c:1832 #, fuzzy msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" @@ -7639,7 +8011,7 @@ msgstr "" "изреченията\n" " -T, --format=tex извежда изход с команди за TeX\n" -#: src/ptx.c:1840 +#: src/ptx.c:1839 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -7655,7 +8027,7 @@ msgstr "" " -i, --ignore-file=ФАЙЛ ФАЙЛ с думи, които да се пренебрегват\n" " -o, --only-file=ФАЙЛ признават се само думи от този ФАЙЛ\n" -#: src/ptx.c:1848 +#: src/ptx.c:1847 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -7666,7 +8038,7 @@ msgstr "" " -t, --typeset-mode - не е реализирана -\n" " -w, --width=БРОЙ ширина на изхода, препратките не се броят\n" -#: src/ptx.c:1855 +#: src/ptx.c:1854 #, fuzzy msgid "" "\n" @@ -7676,7 +8048,7 @@ msgstr "" "Без ФАЙЛ или ако ФАЙЛ е -, се чете от стандартния вход. „-F /“ се " "подразбира.\n" -#: src/ptx.c:1949 +#: src/ptx.c:1948 #, c-format msgid "invalid gap width: %s" msgstr "неправилна ширина на мястото между полетата: %s" @@ -7700,7 +8072,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "не може отвори каталогът %s" -#: src/pwd.c:170 src/pwd.c:277 +#: src/pwd.c:170 src/pwd.c:277 src/split.c:373 #, c-format msgid "failed to stat %s" msgstr "не може да се изпълни stat за %s" @@ -7717,14 +8089,15 @@ msgid "ignoring non-option arguments" msgstr "пренебрегват се аргументи, които не са опции" #. This is a proper name. See the gettext manual, section Names. -#: src/readlink.c:33 +#: src/readlink.c:32 msgid "Dmitry V. Levin" msgstr "" -#: src/readlink.c:62 +#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147 +#: src/stat.c:1349 src/touch.c:212 #, c-format -msgid "Usage: %s [OPTION]... FILE\n" -msgstr "Използване: %s [ОПЦИЯ]... ФАЙЛ\n" +msgid "Usage: %s [OPTION]... FILE...\n" +msgstr "Използване: %s [ОПЦИЯ]... ФАЙЛ...\n" #: src/readlink.c:63 #, fuzzy @@ -7777,10 +8150,12 @@ msgid "" "recursively,\n" " without requirements on components " "existence\n" -" -n, --no-newline do not output the trailing newline\n" +" -n, --no-newline do not output the trailing delimiter\n" " -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" msgstr "" " -f, --canonicalize нормализира, следвайки рекурсивно всяка символна\n" " връзка, която е компонент на зададената пътека\n" @@ -7789,11 +8164,10 @@ msgstr "" " -s, --silent потиска повечето съобщения за грешка\n" " -v, --verbose съобщава при наличие на грешка\n" -#: src/realpath.c:71 src/rm.c:134 src/shred.c:147 src/stat.c:1330 -#: src/touch.c:215 -#, c-format -msgid "Usage: %s [OPTION]... FILE...\n" -msgstr "Използване: %s [ОПЦИЯ]... ФАЙЛ...\n" +#: src/readlink.c:152 +#, fuzzy, c-format +msgid "ignoring --no-newline with multiple arguments" +msgstr "пренебрегват се аргументи, които не са опции" #: src/realpath.c:72 msgid "" @@ -7820,12 +8194,12 @@ msgstr "" msgid "generating relative path" msgstr "" -#: src/remove.c:286 +#: src/remove.c:273 #, c-format msgid "%s: descend into write-protected directory %s? " msgstr "%s: да се навлезе ли в защитения срещу запис каталог %s? " -#: src/remove.c:287 +#: src/remove.c:274 #, c-format msgid "%s: descend into directory %s? " msgstr "%s: да се навлезе ли в каталога %s? " @@ -7834,49 +8208,49 @@ msgstr "%s: да се навлезе ли в каталога %s? " #. translate "%s: remove %s (write-protected) %s? " #. instead. It should avoid grammatical problems #. with the output of file_type. -#: src/remove.c:303 +#: src/remove.c:290 #, c-format msgid "%s: remove write-protected %s %s? " msgstr "%s: да се изтрие ли %s със защита срещу запис %s? " -#: src/remove.c:304 +#: src/remove.c:291 #, c-format msgid "%s: remove %s %s? " msgstr "%s: да се изтрие ли %s %s? " -#: src/remove.c:417 +#: src/remove.c:374 #, c-format msgid "removed directory: %s\n" msgstr "каталогът %s е изтрит\n" -#: src/remove.c:481 +#: src/remove.c:444 #, fuzzy, c-format msgid "cannot remove directory: %s" msgstr "не може да се изтрие каталогът %s" -#: src/remove.c:537 +#: src/remove.c:500 #, c-format msgid "skipping %s, since it's on a different device" msgstr "пропуска се %s тъй като е на друго устройство" -#: src/remove.c:557 +#: src/remove.c:520 #, fuzzy, c-format msgid "traversal failed: %s" msgstr "не може да се чете" -#: src/remove.c:563 +#: src/remove.c:526 #, c-format msgid "" "unexpected failure: fts_info=%d: %s\n" "please report to %s" msgstr "" -#: src/rm.c:118 +#: src/rm.c:119 #, fuzzy, c-format msgid "Try '%s ./%s' to remove the file %s.\n" msgstr "Опитайте „%s ./%s“, за да изтриете файла %s.\n" -#: src/rm.c:135 +#: src/rm.c:136 #, fuzzy msgid "" "Remove (unlink) the FILE(s).\n" @@ -7890,7 +8264,7 @@ msgstr "" " -f, --force пренебрегва несъществуващи файлове, не пита\n" " -i пита преди всяко триене\n" -#: src/rm.c:141 +#: src/rm.c:142 msgid "" " -I prompt once before removing more than three files, " "or\n" @@ -7910,7 +8284,7 @@ msgstr "" "i).\n" " Без КОГА пита винаги\n" -#: src/rm.c:148 +#: src/rm.c:149 msgid "" " --one-file-system when removing a hierarchy recursively, skip any\n" " directory that is on a file system different from\n" @@ -7921,12 +8295,13 @@ msgstr "" "от\n" " тази на съответния аргумент на командния ред\n" -#: src/rm.c:153 +#: src/rm.c:154 #, fuzzy msgid "" " --no-preserve-root do not treat '/' specially\n" " --preserve-root do not remove '/' (default)\n" " -r, -R, --recursive remove directories and their contents recursively\n" +" -d, --dir remove empty directories\n" " -v, --verbose explain what is being done\n" msgstr "" " --no-preserve-root да не се обработва „/“ по-особено\n" @@ -7935,7 +8310,7 @@ msgstr "" " -r, -R, --recursive изтрива рекурсивно каталозите и съдържанието им\n" " -v, --verbose съобщава какво се прави\n" -#: src/rm.c:161 +#: src/rm.c:163 msgid "" "\n" "By default, rm does not remove directories. Use the --recursive (-r or -R)\n" @@ -7948,7 +8323,7 @@ msgstr "" "(-r или -R), която ще изтрие всеки изброен каталог, заедно със съдържанието " "му.\n" -#: src/rm.c:166 +#: src/rm.c:168 #, fuzzy, c-format msgid "" "\n" @@ -7965,7 +8340,7 @@ msgstr "" "\n" " %s ./-трънки\n" -#: src/rm.c:175 +#: src/rm.c:177 #, fuzzy msgid "" "\n" @@ -7980,12 +8355,12 @@ msgstr "" "съдържанието му е напълно невъзстановимо, помислете дали да не използвате " "shred.\n" -#: src/rm.c:335 +#: src/rm.c:342 #, c-format msgid "%s: remove all arguments recursively? " msgstr "%s: да се изтрият ли рекурсивно всички аргументи? " -#: src/rm.c:336 +#: src/rm.c:343 #, c-format msgid "%s: remove all arguments? " msgstr "%s: да се изтрият ли всички аргументи" @@ -8047,7 +8422,10 @@ msgstr "" msgid "" "Run a program in a different security context.\n" "With neither CONTEXT nor COMMAND, print the current security context.\n" -"\n" +msgstr "" + +#: src/runcon.c:94 +msgid "" " CONTEXT Complete security context\n" " -c, --compute compute process transition context before modifying\n" " -t, --type=TYPE type (for same role as parent)\n" @@ -8057,72 +8435,72 @@ msgid "" "\n" msgstr "" -#: src/runcon.c:140 +#: src/runcon.c:144 #, c-format msgid "multiple roles" msgstr "" -#: src/runcon.c:145 +#: src/runcon.c:149 #, c-format msgid "multiple types" msgstr "" -#: src/runcon.c:150 +#: src/runcon.c:154 #, c-format msgid "multiple users" msgstr "" -#: src/runcon.c:155 +#: src/runcon.c:159 #, c-format msgid "multiple levelranges" msgstr "" -#: src/runcon.c:173 src/runcon.c:209 +#: src/runcon.c:177 src/runcon.c:213 #, fuzzy, c-format msgid "failed to get current context" msgstr "не могат да се получат атрибутите на %s" -#: src/runcon.c:183 +#: src/runcon.c:187 #, c-format msgid "you must specify -c, -t, -u, -l, -r, or context" msgstr "" -#: src/runcon.c:191 +#: src/runcon.c:195 #, fuzzy, c-format msgid "no command specified" msgstr "не е посочен номер на процес" -#: src/runcon.c:197 +#: src/runcon.c:201 #, c-format msgid "%s may be used only on a SELinux kernel" msgstr "" -#: src/runcon.c:223 +#: src/runcon.c:227 #, fuzzy, c-format msgid "failed to compute a new context" msgstr "не може да се отвори %s" -#: src/runcon.c:237 +#: src/runcon.c:241 #, fuzzy, c-format msgid "failed to set new user %s" msgstr "не може да се изпълни stat за %s" -#: src/runcon.c:239 +#: src/runcon.c:243 #, fuzzy, c-format msgid "failed to set new type %s" msgstr "не може да се изпълни stat за %s" -#: src/runcon.c:241 +#: src/runcon.c:245 #, fuzzy, c-format msgid "failed to set new range %s" msgstr "не може да се изпълни stat за %s" -#: src/runcon.c:243 +#: src/runcon.c:247 #, fuzzy, c-format msgid "failed to set new role %s" msgstr "не може да се изпълни stat за %s" -#: src/runcon.c:251 +#: src/runcon.c:255 #, fuzzy, c-format msgid "unable to set security context %s" msgstr "не може да се възстановят правата за достъп до %s" @@ -8139,9 +8517,12 @@ msgstr "" " или: %s [ОПЦИЯ]... ПЪРВО СТЪПКА ПОСЛЕДНО\n" #: src/seq.c:73 +msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" +msgstr "" + +#: src/seq.c:79 +#, fuzzy msgid "" -"Print numbers from FIRST to LAST, in steps of INCREMENT.\n" -"\n" " -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" @@ -8154,7 +8535,7 @@ msgstr "" " -w, --equal-width подравнява ширината, попълвайки в началото с " "нули\n" -#: src/seq.c:82 +#: src/seq.c:86 #, fuzzy msgid "" "\n" @@ -8179,39 +8560,24 @@ msgstr "" "е\n" "число с плаваща запетая с максимална точност TOЧНОСТ и %g иначе.\n" -#: src/seq.c:90 +#: src/seq.c:94 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:136 +#: src/seq.c:140 #, c-format msgid "invalid floating point argument: %s" msgstr "неправилно число с плаваща запетая като аргумент: %s" -#: src/seq.c:193 -#, fuzzy, c-format -msgid "format %s has no %% directive" -msgstr "целта %s не е каталог" - -#: src/seq.c:210 -#, c-format -msgid "format %s ends in %%" -msgstr "" - -#: src/seq.c:213 +#: src/seq.c:232 #, fuzzy, c-format msgid "format %s has unknown %%%c directive" msgstr "%s има непознат файлов тип" -#: src/seq.c:217 -#, c-format -msgid "format %s has too many %% directives" -msgstr "" - -#: src/seq.c:431 +#: src/seq.c:555 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" @@ -8252,27 +8618,27 @@ msgid "" " (if specified) supplemental group IDs to GID1, ...\n" msgstr "" -#: src/setuidgid.c:163 +#: src/setuidgid.c:162 #, c-format msgid "unknown user-ID: %s" msgstr "непознат потребител: %s" -#: src/setuidgid.c:174 +#: src/setuidgid.c:173 #, c-format msgid "to use user-ID %s you need to use -g too" msgstr "" -#: src/setuidgid.c:191 +#: src/setuidgid.c:190 #, fuzzy, c-format msgid "failed to set supplemental group(s)" msgstr "не може да се установи допълнителна група" -#: src/setuidgid.c:201 +#: src/setuidgid.c:200 #, c-format msgid "cannot set group-ID to %lu" msgstr "не може да се приеме група %lu" -#: src/setuidgid.c:205 +#: src/setuidgid.c:204 #, c-format msgid "cannot set user-ID to %lu" msgstr "не може да се приеме потребител %lu" @@ -8283,17 +8649,17 @@ msgid "Colin Plumb" msgstr "" #: src/shred.c:148 +#, 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" -"\n" msgstr "" "Заличава многократно посочените ФАЙЛ(ове) с цел да се затрудни значително\n" "възстановяването на данните от тях дори и с използване на специална " "апаратура.\n" "\n" -#: src/shred.c:156 +#: src/shred.c:155 #, fuzzy, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -8308,7 +8674,7 @@ msgstr "" "urandom)\n" " -s, --size=N заличава N байта (приемат се суфикси като K, M, G)\n" -#: src/shred.c:162 +#: src/shred.c:161 msgid "" " -u, --remove truncate and remove file after overwriting\n" " -v, --verbose show progress\n" @@ -8325,7 +8691,7 @@ msgstr "" " -z, --zero накрая заличава с нули, за да се скрие използването на " "shred\n" -#: src/shred.c:171 +#: src/shred.c:170 msgid "" "\n" "If FILE is -, shred standard output.\n" @@ -8347,7 +8713,7 @@ msgstr "" "действа върху обикновени файлове, повечето хора използват опцията --remove.\n" "\n" -#: src/shred.c:181 +#: src/shred.c:180 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" @@ -8368,7 +8734,7 @@ msgstr "" "всички режими на работа на файловата система:\n" "\n" -#: src/shred.c:189 +#: src/shred.c:188 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -8391,7 +8757,7 @@ msgstr "" " Network Appliance\n" "\n" -#: src/shred.c:199 +#: src/shred.c:198 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -8400,7 +8766,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:206 +#: src/shred.c:205 #, fuzzy msgid "" "In the case of ext3 file systems, the above disclaimer applies\n" @@ -8435,7 +8801,7 @@ msgstr "" "също могат да съдържат копия на файла, които не могат да бъдат отстранени и\n" "дават възможност заличеният със shred файл да бъде възстановен.\n" -#: src/shred.c:216 +#: src/shred.c:215 #, fuzzy msgid "" "In addition, file system backups and remote mirrors may contain copies\n" @@ -8453,122 +8819,122 @@ msgstr "" "изтритият\n" "файл да бъде възстановен.\n" -#: src/shred.c:296 +#: src/shred.c:295 #, c-format msgid "%s: fdatasync failed" msgstr "%s: неуспешно извикване на fdatasync" -#: src/shred.c:307 +#: src/shred.c:306 #, c-format msgid "%s: fsync failed" msgstr "%s: неуспешно извикване на fsync" -#: src/shred.c:384 +#: src/shred.c:383 #, c-format msgid "%s: cannot rewind" msgstr "%s: битовете не могат да се обръщат" -#: src/shred.c:403 +#: src/shred.c:402 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: итерация %lu/%lu (%s)..." -#: src/shred.c:453 +#: src/shred.c:452 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: грешка при запис на отместване %s" -#: src/shred.c:471 +#: src/shred.c:470 #, c-format msgid "%s: lseek failed" msgstr "%s: неуспешно извикване на lseek" -#: src/shred.c:482 +#: src/shred.c:481 #, c-format msgid "%s: file too large" msgstr "%s: файлът е твърде дълъг" -#: src/shred.c:505 +#: src/shred.c:504 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: итерация %lu/%lu (%s)...%s" -#: src/shred.c:521 +#: src/shred.c:520 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: итерация %lu/%lu (%s)...%s/%s %d%%" -#: src/shred.c:768 +#: src/shred.c:767 #, c-format msgid "%s: fstat failed" msgstr "%s: неуспешно извикване на fstat" -#: src/shred.c:779 +#: src/shred.c:778 #, c-format msgid "%s: invalid file type" msgstr "%s: недопустим тип на файла" -#: src/shred.c:798 +#: src/shred.c:797 #, c-format msgid "%s: file has negative size" msgstr "%s: файлът има отрицателен размер" -#: src/shred.c:865 +#: src/shred.c:864 src/sort.c:932 src/split.c:378 #, c-format msgid "%s: error truncating" msgstr "%s: грешка при съкращаване" -#: src/shred.c:881 +#: src/shred.c:880 #, c-format msgid "%s: fcntl failed" msgstr "%s: неуспешно извикване на fcntl" -#: src/shred.c:886 +#: src/shred.c:885 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "%s: не може да се заличава файл с режим на достъп само за добавяне" -#: src/shred.c:968 +#: src/shred.c:967 #, c-format msgid "%s: removing" msgstr "%s: изтриване" -#: src/shred.c:992 +#: src/shred.c:991 #, c-format msgid "%s: renamed to %s" msgstr "%s: преименуван на %s" -#: src/shred.c:1014 +#: src/shred.c:1013 #, c-format msgid "%s: failed to remove" msgstr "%s: не може да се отстрани" -#: src/shred.c:1018 +#: src/shred.c:1017 #, c-format msgid "%s: removed" msgstr "%s: изтрит" -#: src/shred.c:1025 src/shred.c:1068 +#: src/shred.c:1024 src/shred.c:1067 #, c-format msgid "%s: failed to close" msgstr "%s: не може да се затвори" -#: src/shred.c:1061 +#: src/shred.c:1060 #, c-format msgid "%s: failed to open for writing" msgstr "%s: не може да се отвори в режим за писане" -#: src/shred.c:1126 +#: src/shred.c:1125 #, c-format msgid "%s: invalid number of passes" msgstr "%s: неправилен брой итерации" -#: src/shred.c:1135 src/shuf.c:291 src/sort.c:4387 +#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441 #, c-format msgid "multiple random sources specified" msgstr "посочени са много случайни източници" -#: src/shred.c:1149 +#: src/shred.c:1148 #, c-format msgid "%s: invalid file size" msgstr "%s: неправилен размер на файла" @@ -8585,14 +8951,13 @@ msgstr "" " или: %s -i ОТ-ДО [ОПЦИЯ]...\n" #: src/shuf.c:54 -msgid "" -"Write a random permutation of the input lines to standard output.\n" -"\n" +#, fuzzy +msgid "Write a random permutation of the input lines to standard output.\n" msgstr "" "Извежда на стандартния изход случайни пермутации на входните редове.\n" "\n" -#: src/shuf.c:61 +#: src/shuf.c:60 #, fuzzy msgid "" " -e, --echo treat each ARG as an input line\n" @@ -8613,27 +8978,27 @@ msgstr "" "urandom)\n" " -z, --zero-terminated завършва редовете с нулев байт вместо с нов ред\n" -#: src/shuf.c:245 +#: src/shuf.c:244 #, c-format msgid "multiple -i options specified" msgstr "посочени са много опции -i" -#: src/shuf.c:265 +#: src/shuf.c:264 #, c-format msgid "invalid input range %s" msgstr "неправилен входен диапазон: %s" -#: src/shuf.c:278 +#: src/shuf.c:277 #, c-format msgid "invalid line count %s" msgstr "неправилен брой редове: %s" -#: src/shuf.c:285 src/sort.c:4381 +#: src/shuf.c:284 src/sort.c:4435 #, c-format msgid "multiple output files specified" msgstr "посочени са твърде много изходни файлове" -#: src/shuf.c:311 +#: src/shuf.c:310 #, c-format msgid "cannot combine -e and -i options" msgstr "не може да се комбинират опциите -e и -i" @@ -8662,7 +9027,7 @@ msgstr "" "от посочените времена.\n" "\n" -#: src/sleep.c:135 src/timeout.c:295 +#: src/sleep.c:135 src/timeout.c:320 #, c-format msgid "invalid time interval %s" msgstr "неправилен интервал за време %s" @@ -8672,15 +9037,14 @@ msgstr "неправилен интервал за време %s" msgid "cannot read realtime clock" msgstr "не може да се чете часовникът в реално време" -#: src/sort.c:395 -msgid "" -"Write sorted concatenation of all FILE(s) to standard output.\n" -"\n" +#: src/sort.c:399 +#, fuzzy +msgid "Write sorted concatenation of all FILE(s) to standard output.\n" msgstr "" "Извежда на стандартния изход сортирана конкатенация на всички ФАЙЛ(ове).\n" "\n" -#: src/sort.c:402 +#: src/sort.c:405 msgid "" "Ordering options:\n" "\n" @@ -8688,7 +9052,7 @@ msgstr "" "Опции, определящи наредбата:\n" "\n" -#: src/sort.c:406 +#: src/sort.c:409 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -8700,7 +9064,7 @@ msgstr "" "знаци\n" " -f, --ignore-case приравнява малките с главните букви\n" -#: src/sort.c:412 +#: src/sort.c:415 #, fuzzy msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" @@ -8718,12 +9082,12 @@ msgstr "" " -r, --reverse сортира в обратен ред\n" "\n" -#: src/sort.c:417 +#: src/sort.c:420 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" -#: src/sort.c:420 +#: src/sort.c:423 #, fuzzy msgid "" " -n, --numeric-sort compare according to string numerical value\n" @@ -8742,7 +9106,7 @@ msgstr "" " -r, --reverse сортира в обратен ред\n" "\n" -#: src/sort.c:426 +#: src/sort.c:429 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -8752,7 +9116,7 @@ msgid "" "\n" msgstr "" -#: src/sort.c:434 +#: src/sort.c:437 #, fuzzy msgid "" "Other options:\n" @@ -8761,13 +9125,13 @@ msgstr "" "Опции, определящи наредбата:\n" "\n" -#: src/sort.c:438 +#: src/sort.c:441 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" msgstr "" -#: src/sort.c:442 +#: src/sort.c:445 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 " @@ -8776,7 +9140,7 @@ msgid "" " decompress them with PROG -d\n" msgstr "" -#: src/sort.c:449 +#: src/sort.c:452 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -8785,13 +9149,13 @@ msgid "" " If F is - then read names from standard input\n" msgstr "" -#: src/sort.c:456 +#: src/sort.c:459 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:460 +#: src/sort.c:463 #, fuzzy msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" @@ -8810,7 +9174,7 @@ msgstr "" "comparison\n" " -S, --buffer-size=РАЗМ използва буфер в паметта с размер РАЗМ\n" -#: src/sort.c:466 +#: src/sort.c:469 #, fuzzy, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -8833,12 +9197,12 @@ msgstr "" " извежда само първия от група еквивалентни " "редове\n" -#: src/sort.c:475 +#: 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:480 +#: src/sort.c:483 #, fuzzy msgid "" "\n" @@ -8867,7 +9231,7 @@ msgstr "" "\n" "РАЗМ може да бъде следван от някой от следните множители:\n" -#: src/sort.c:493 +#: src/sort.c:496 msgid "" "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n" "\n" @@ -8887,261 +9251,265 @@ msgstr "" "Използвайте LC_ALL=C, за да получите традиционната наредба,\n" "която сравнява според кодовете на знаците.\n" -#: src/sort.c:694 +#: src/sort.c:697 #, fuzzy, c-format msgid "waiting for %s [-d]" msgstr "запис в %s" -#: src/sort.c:699 +#: src/sort.c:702 #, c-format msgid "%s [-d] terminated abnormally" msgstr "" -#: src/sort.c:853 +#: src/sort.c:856 #, fuzzy, c-format msgid "cannot create temporary file in %s" msgstr "не може да се направи временен файл %s" -#: src/sort.c:939 src/sort.c:2010 src/sort.c:3056 src/sort.c:3755 -#: src/sort.c:3758 +#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713 +#: src/sort.c:3804 src/sort.c:3807 msgid "open failed" msgstr "неуспешно отваряне на файл" -#: src/sort.c:959 +#: src/sort.c:970 msgid "fflush failed" msgstr "неуспешно извикване на fflush" -#: src/sort.c:964 src/sort.c:2013 src/sort.c:4646 +#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706 msgid "close failed" msgstr "неуспешно затваряне на файл" -#: src/sort.c:973 +#: src/sort.c:986 #, fuzzy, c-format msgid "dup2 failed" msgstr "неуспешно отваряне на файл" -#: src/sort.c:1090 +#: src/sort.c:1103 #, c-format msgid "couldn't execute %s" msgstr "" -#: src/sort.c:1097 +#: src/sort.c:1110 #, fuzzy msgid "couldn't create temporary file" msgstr "не може да се направи временен файл" -#: src/sort.c:1136 +#: src/sort.c:1149 #, fuzzy, c-format msgid "couldn't create process for %s -d" msgstr "не може да се създаде каталог %s" -#: src/sort.c:1150 +#: src/sort.c:1161 #, c-format msgid "couldn't execute %s -d" msgstr "" -#: src/sort.c:1209 +#: src/sort.c:1220 #, c-format msgid "warning: cannot remove: %s" msgstr "внимание: не може да се изтрие: %s" -#: src/sort.c:1295 +#: src/sort.c:1306 #, fuzzy, c-format msgid "invalid --%s argument %s" msgstr "неправилен аргумент %s" -#: src/sort.c:1298 +#: src/sort.c:1309 #, fuzzy, c-format msgid "minimum --%s argument is %s" msgstr "двусмислен аргумент %s за %s" -#: src/sort.c:1313 +#: src/sort.c:1324 #, fuzzy, c-format msgid "--%s argument %s too large" msgstr "%s: броят „%.*s“ е твърде голям" -#: src/sort.c:1316 +#: src/sort.c:1327 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "" -#: src/sort.c:1398 +#: src/sort.c:1409 #, c-format msgid "number in parallel must be nonzero" msgstr "" -#: src/sort.c:1479 +#: src/sort.c:1494 msgid "stat failed" msgstr "файл не може да бъде открит" -#: src/sort.c:1740 +#: src/sort.c:1755 msgid "read failed" msgstr "не може да се чете" -#: src/sort.c:2028 +#: src/sort.c:2043 #, c-format msgid "string transformation failed" msgstr "неуспешно преобразуване на низ" -#: src/sort.c:2031 +#: src/sort.c:2046 #, fuzzy, c-format msgid "the untransformed string was %s" msgstr "Непреобразуваният низ беше %s." -#: src/sort.c:2194 +#: src/sort.c:2209 #, c-format msgid "^ no match for key\n" msgstr "" -#: src/sort.c:2374 +#: src/sort.c:2389 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "" -#: src/sort.c:2380 +#: src/sort.c:2395 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "" -#: src/sort.c:2391 +#: src/sort.c:2406 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" -#: src/sort.c:2404 +#: src/sort.c:2419 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "" -#: src/sort.c:2436 +#: src/sort.c:2451 #, fuzzy, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" msgstr[0] "%s: опцията „%s“ е двусмислена\n" msgstr[1] "%s: опцията „%s“ е двусмислена\n" -#: src/sort.c:2442 +#: src/sort.c:2457 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "" -#: src/sort.c:2716 src/sort.c:2725 +#: src/sort.c:2731 src/sort.c:2740 msgid "write failed" msgstr "неуспешен запис" -#: src/sort.c:2768 +#: src/sort.c:2783 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: разбърканост: " -#: src/sort.c:2771 +#: src/sort.c:2786 msgid "standard error" msgstr "стандартната грешка" -#: src/sort.c:3926 +#: src/sort.c:3698 +#, fuzzy +msgid "cannot read" +msgstr "%s: битовете не могат да се обръщат" + +#: src/sort.c:3976 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: неправилна спецификация на поле %s" -#: src/sort.c:3937 +#: src/sort.c:3987 #, fuzzy, c-format msgid "options '-%s' are incompatible" msgstr "опциите „-%s“ са несъвместими" -#: src/sort.c:3988 +#: src/sort.c:4038 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s: неправилен брой в началото на %s" -#: src/sort.c:4245 +#: src/sort.c:4295 #, fuzzy msgid "invalid number after '-'" msgstr "неправилно число след „-“" -#: src/sort.c:4248 src/sort.c:4334 src/sort.c:4362 +#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416 #, fuzzy msgid "invalid number after '.'" msgstr "неправилно число след „.“" -#: src/sort.c:4261 src/sort.c:4367 +#: src/sort.c:4315 src/sort.c:4421 msgid "stray character in field spec" msgstr "неочакван знак в спецификация на поле" -#: src/sort.c:4308 +#: src/sort.c:4362 #, fuzzy, c-format msgid "multiple compress programs specified" msgstr "посочени са много формати за изхода" -#: src/sort.c:4325 +#: src/sort.c:4379 msgid "invalid number at field start" msgstr "неправилно число в началото на поле" -#: src/sort.c:4329 src/sort.c:4357 +#: src/sort.c:4383 src/sort.c:4411 msgid "field number is zero" msgstr "номерът на поле е нула" -#: src/sort.c:4338 +#: src/sort.c:4392 msgid "character offset is zero" msgstr "отместването в знаци е нула" -#: src/sort.c:4353 +#: src/sort.c:4407 #, fuzzy msgid "invalid number after ','" msgstr "неправилно число след „,“" -#: src/sort.c:4403 +#: src/sort.c:4457 #, c-format msgid "empty tab" msgstr "празна табулация" -#: src/sort.c:4496 src/wc.c:692 +#: src/sort.c:4550 src/wc.c:692 #, c-format msgid "cannot read file names from %s" msgstr "не може да се четат файлови имена от %s" -#: src/sort.c:4518 +#: src/sort.c:4572 #, fuzzy, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "неправилно файлово име с дължина нула" -#: src/sort.c:4524 +#: src/sort.c:4578 #, fuzzy, c-format msgid "no input from %s" msgstr "затваряне на входния файл %s" -#: src/sort.c:4570 +#: src/sort.c:4624 #, c-format msgid "using %s sorting rules" msgstr "" -#: src/sort.c:4573 +#: src/sort.c:4627 #, c-format msgid "using simple byte comparison" msgstr "" -#: src/sort.c:4604 +#: src/sort.c:4658 #, fuzzy, c-format msgid "extra operand %s not allowed with -%c" msgstr "допълнителният операнд %s не е позволен с -c" -#: src/split.c:184 +#: src/split.c:187 #, c-format msgid "the suffix length needs to be at least %zu" msgstr "" -#: src/split.c:201 +#: src/split.c:204 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" msgstr "Използване: %s [ОПЦИЯ] [ВХОД [ПРЕФИКС]]\n" -#: src/split.c:205 +#: src/split.c:208 #, fuzzy 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" -"\n" msgstr "" "Разделя ВХОД на парчета ПРЕФИКСaa, ПРЕФИКСab,... с фиксиран размер. По \n" "подразбиране ПРЕФИКС е „xx“, а размерът - 1000 реда. Без ВХОД или ако ВХОД " @@ -9149,7 +9517,7 @@ msgstr "" "чете от стандартния вход.\n" "\n" -#: src/split.c:214 +#: src/split.c:216 #, fuzzy, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" @@ -9173,7 +9541,7 @@ msgstr "" " -d, --numeric-suffixes ползва числови суфикси вместо буквени\n" " -l, --lines=ЧИСЛО дели на по ЧИСЛО редове на изходен файл\n" -#: src/split.c:227 +#: src/split.c:229 #, fuzzy msgid "" " --verbose print a diagnostic just before each\n" @@ -9182,7 +9550,7 @@ msgstr "" " --verbose съобщава на стандартната грешка преди отварянето\n" " на всеки изходен файл\n" -#: src/split.c:234 +#: src/split.c:236 msgid "" "\n" "CHUNKS may be:\n" @@ -9194,184 +9562,189 @@ msgid "" "r/K/N likewise but only output Kth of N to stdout\n" msgstr "" -#: src/split.c:352 +#: src/split.c:354 #, fuzzy, c-format msgid "output file suffixes exhausted" msgstr "Изчерпаха се суфиксите за изходни файлове" -#: src/split.c:364 +#: src/split.c:366 #, c-format msgid "creating file %s\n" msgstr "създава се файл %s\n" -#: src/split.c:377 +#: src/split.c:375 +#, c-format +msgid "%s would overwrite input; aborting" +msgstr "" + +#: src/split.c:391 #, fuzzy, c-format msgid "failed to set FILE environment variable" -msgstr "не може да се изпълни stat за %s" +msgstr "неразбираема стойност на променливата от обкръжението LS_COLORS" -#: src/split.c:379 +#: src/split.c:393 #, c-format msgid "executing with FILE=%s\n" msgstr "" -#: src/split.c:381 +#: src/split.c:395 #, fuzzy, c-format msgid "failed to create pipe" -msgstr "не може да се направи твърда връзка %s към %s" +msgstr "не може да се изпълни stat за %s" -#: src/split.c:395 +#: src/split.c:409 #, fuzzy, c-format msgid "closing prior pipe" msgstr "затваря се каталогът %s" -#: src/split.c:397 +#: src/split.c:411 #, fuzzy, c-format msgid "closing output pipe" msgstr "затваряне на изходния файл %s" -#: src/split.c:401 +#: src/split.c:415 #, fuzzy, c-format msgid "moving input pipe" msgstr "затваряне на входния файл %s" -#: src/split.c:403 +#: src/split.c:417 #, fuzzy, c-format msgid "closing input pipe" msgstr "затваряне на входния файл %s" -#: src/split.c:408 +#: src/split.c:422 #, fuzzy, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "неуспешно изпълнение на командата %s" -#: src/split.c:414 +#: src/split.c:428 #, fuzzy, c-format msgid "failed to close input pipe" -msgstr "%s: не може да се затвори" +msgstr "каталогът %s не може да се затвори" -#: src/split.c:450 -#, fuzzy, c-format +#: src/split.c:464 +#, c-format msgid "waiting for child process" -msgstr "запис в %s" +msgstr "" -#: src/split.c:460 +#: src/split.c:474 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "" -#: src/split.c:468 +#: src/split.c:482 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:475 src/timeout.c:449 +#: src/split.c:489 src/timeout.c:494 #, c-format msgid "unknown status from command (0x%X)" msgstr "" -#: src/split.c:1037 +#: src/split.c:1052 #, c-format msgid "cannot split in more than one way" msgstr "не може да се цепи по повече от един начин" -#: src/split.c:1050 src/split.c:1192 src/split.c:1363 +#: src/split.c:1065 src/split.c:1205 src/split.c:1376 #, fuzzy, c-format msgid "%s: invalid number of chunks" msgstr "%s: неправилен брой секунди" -#: src/split.c:1054 +#: src/split.c:1069 #, fuzzy, c-format msgid "%s: invalid chunk number" msgstr "%s: недопустимо число" -#: src/split.c:1106 +#: src/split.c:1119 #, c-format msgid "%s: invalid suffix length" msgstr "%s: неправилна дължина на суфикс" -#: src/split.c:1131 src/split.c:1139 src/split.c:1162 src/split.c:1167 +#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180 #, c-format msgid "%s: invalid number of bytes" msgstr "%s: неправилен брой байтове" -#: src/split.c:1150 src/split.c:1297 +#: src/split.c:1163 src/split.c:1310 #, c-format msgid "%s: invalid number of lines" msgstr "%s: неправилен брой редове" -#: src/split.c:1223 +#: src/split.c:1236 #, c-format msgid "line count option -%s%c... is too large" msgstr "опцията за брой редове -%s%c... е твърде голямa" -#: src/split.c:1235 +#: src/split.c:1248 #, fuzzy, c-format msgid "%s: invalid start value for numerical suffix" msgstr "неправилен начален номер на ред: %s" -#: src/split.c:1263 +#: src/split.c:1276 #, fuzzy, c-format msgid "%s: invalid IO block size" msgstr "%s: неправилен размер на файла" -#: src/split.c:1284 +#: src/split.c:1297 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1321 +#: src/split.c:1334 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1356 +#: src/split.c:1369 #, fuzzy, c-format msgid "%s: cannot determine file size" msgstr "хост-името не може да бъде определено" #. This is a proper name. See the gettext manual, section Names. -#: src/stat.c:169 +#: src/stat.c:173 msgid "Michael Meskes" msgstr "" -#: src/stat.c:838 +#: src/stat.c:857 #, fuzzy, c-format msgid "failed to canonicalize %s" msgstr "не може да се отвори %s" -#: src/stat.c:1050 +#: src/stat.c:1069 #, fuzzy, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "внимание: неразпозната команда с обратна наклонена черта „\\%c“" -#: src/stat.c:1105 +#: src/stat.c:1124 #, c-format msgid "%s: invalid directive" msgstr "%s: неправилна команда" -#: src/stat.c:1151 +#: src/stat.c:1170 #, c-format msgid "warning: backslash at end of format" msgstr "внимание: обратна наклонена черта в края на форматен низ" -#: src/stat.c:1182 +#: src/stat.c:1201 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" -#: src/stat.c:1189 +#: src/stat.c:1208 #, c-format msgid "cannot read file system information for %s" msgstr "не може да се прочете от файловата система информация за %s" -#: src/stat.c:1209 +#: src/stat.c:1228 #, 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:1245 +#: src/stat.c:1264 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -9382,7 +9755,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1268 +#: src/stat.c:1287 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -9390,30 +9763,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1278 +#: src/stat.c:1297 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:1286 +#: src/stat.c:1305 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:1295 +#: src/stat.c:1314 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:1305 +#: src/stat.c:1324 #, c-format msgid "Context: %C\n" msgstr "" -#: src/stat.c:1313 +#: src/stat.c:1332 msgid "" "Access: %x\n" "Modify: %y\n" @@ -9421,10 +9794,13 @@ msgid "" " Birth: %w\n" msgstr "" -#: src/stat.c:1331 +#: src/stat.c:1350 +msgid "Display file or file system status.\n" +msgstr "" + +#: src/stat.c:1356 +#, fuzzy msgid "" -"Display file or file system status.\n" -"\n" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" @@ -9434,7 +9810,7 @@ msgstr "" " -f, --file-system извежда състоянието на файловата система, вместо на " "файла\n" -#: src/stat.c:1337 +#: src/stat.c:1360 #, fuzzy msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" @@ -9455,7 +9831,7 @@ msgstr "" " Ако искате нов ред, вмъкнете \\n във ФОРМАТ.\n" " -t, --terse информацията да се извежда в сбита форма\n" -#: src/stat.c:1348 +#: src/stat.c:1371 #, fuzzy msgid "" "\n" @@ -9475,7 +9851,7 @@ msgstr "" " %b Брой заделени блокове (вж. %B)\n" " %B Размерът в байтове на всеки блок, съобщен от %b\n" -#: src/stat.c:1357 +#: src/stat.c:1380 #, fuzzy msgid "" " %d device number in decimal\n" @@ -9492,7 +9868,7 @@ msgstr "" " %g Номер на групата на собственика\n" " %G Име на групата на собственика\n" -#: src/stat.c:1365 +#: src/stat.c:1388 #, fuzzy msgid "" " %h number of hard links\n" @@ -9514,7 +9890,7 @@ msgstr "" " %t Голям шестнадесетичен номер на устройство\n" " %T Малък шестнадесетичен номер на устройство\n" -#: src/stat.c:1376 +#: src/stat.c:1399 #, fuzzy msgid "" " %u user ID of owner\n" @@ -9539,7 +9915,7 @@ msgstr "" " %Z Време на последна промяна в секунди от Епохата\n" "\n" -#: src/stat.c:1390 +#: src/stat.c:1413 #, fuzzy msgid "" "Valid format sequences for file systems:\n" @@ -9558,7 +9934,7 @@ msgstr "" " %d Свободни файлови възли във файловата система\n" " %f Свободни блокове във файловата система\n" -#: src/stat.c:1399 +#: src/stat.c:1422 #, fuzzy msgid "" " %i file system ID in hex\n" @@ -9585,30 +9961,29 @@ msgstr "Използване: %s [ОПЦИЯ]...\n" #: src/stdbuf.c:91 msgid "" "Run COMMAND, with modified buffering operations for its standard streams.\n" -"\n" msgstr "" -#: src/stdbuf.c:98 +#: src/stdbuf.c:97 msgid "" " -i, --input=MODE adjust standard input stream buffering\n" " -o, --output=MODE adjust standard output stream buffering\n" " -e, --error=MODE adjust standard error stream buffering\n" msgstr "" -#: src/stdbuf.c:105 +#: src/stdbuf.c:104 msgid "" "\n" "If MODE is 'L' the corresponding stream will be line buffered.\n" "This option is invalid with standard input.\n" msgstr "" -#: src/stdbuf.c:108 +#: src/stdbuf.c:107 msgid "" "\n" "If MODE is '0' the corresponding stream will be unbuffered.\n" msgstr "" -#: src/stdbuf.c:111 +#: src/stdbuf.c:110 msgid "" "\n" "Otherwise MODE is a number which may be followed by one of the following:\n" @@ -9618,7 +9993,7 @@ msgid "" "size set to MODE bytes.\n" msgstr "" -#: src/stdbuf.c:117 +#: src/stdbuf.c:116 msgid "" "\n" "NOTE: If COMMAND adjusts the buffering of its standard streams ('tee' does\n" @@ -9628,22 +10003,22 @@ msgid "" "and are thus unaffected by 'stdbuf' settings.\n" msgstr "" -#: src/stdbuf.c:227 +#: src/stdbuf.c:226 #, fuzzy, c-format msgid "failed to find %s" msgstr "не може да се отвори %s" -#: src/stdbuf.c:247 src/stdbuf.c:279 +#: src/stdbuf.c:246 src/stdbuf.c:278 #, c-format msgid "failed to update the environment with %s" msgstr "" -#: src/stdbuf.c:321 +#: src/stdbuf.c:320 #, c-format msgid "line buffering stdin is meaningless" msgstr "" -#: src/stty.c:509 +#: src/stty.c:513 #, fuzzy, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -9654,10 +10029,13 @@ msgstr "" " или: %s [-F УСТРОЙСТВО] [--file=УСТРОЙСТВО] [-a|--all]\n" " или: %s [-F УСТРОЙСТВО] [--file=УСТРОЙСТВО] [-g|--save]\n" -#: src/stty.c:515 +#: src/stty.c:519 +msgid "Print or change terminal characteristics.\n" +msgstr "" + +#: src/stty.c:525 +#, fuzzy msgid "" -"Print or change terminal characteristics.\n" -"\n" " -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" @@ -9670,7 +10048,7 @@ msgstr "" " -F, --file=УСТРОЙСТВО отваря и използва посоченото УСТРОЙСТВО вместо стд." "вход\n" -#: src/stty.c:524 +#: src/stty.c:532 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -9681,7 +10059,7 @@ msgstr "" "настройка.\n" "Кои настройки са допустими зависи от използваната система.\n" -#: src/stty.c:529 +#: src/stty.c:537 msgid "" "\n" "Special characters:\n" @@ -9696,7 +10074,7 @@ msgstr "" " eof ЗНАК ЗНАК ще изпрати сигнал край на файл (ще прекрати входа)\n" " eol ЗНАК ЗНАК ще завърши реда\n" -#: src/stty.c:536 +#: src/stty.c:544 msgid "" " * eol2 CHAR alternate CHAR for ending the line\n" " erase CHAR CHAR will erase the last character typed\n" @@ -9708,7 +10086,7 @@ msgstr "" " intr ЗНАК ЗНАК ще изпрати сигнал за прекъсване\n" " kill ЗНАК ЗНАК ще изтрие текущия ред\n" -#: src/stty.c:542 +#: src/stty.c:550 msgid "" " * lnext CHAR CHAR will enter the next character quoted\n" " quit CHAR CHAR will send a quit signal\n" @@ -9721,7 +10099,7 @@ msgstr "" " * rprnt ЗНАК ЗНАК ще пречертае текущия ред\n" " start ЗНАК ЗНАК ще възобнови извеждането, след като е било прекъснато\n" -#: src/stty.c:548 +#: src/stty.c:556 msgid "" " stop CHAR CHAR will stop the output\n" " susp CHAR CHAR will send a terminal stop signal\n" @@ -9733,7 +10111,7 @@ msgstr "" " * swtch ЗНАК ЗНАК ще превключи на друг слой на обвивката (shell layer)\n" " * werase ЗНАК ЗНАК ще изтрие последната въведена дума\n" -#: src/stty.c:554 +#: src/stty.c:562 #, fuzzy msgid "" "\n" @@ -9748,7 +10126,7 @@ msgstr "" " * cols N казва на ядрото, че терминалът има N стълба\n" " * columns N същото като cols N\n" -#: src/stty.c:561 +#: src/stty.c:569 msgid "" " ispeed N set the input speed to N\n" " * line N use line discipline N\n" @@ -9761,7 +10139,7 @@ msgstr "" " min N с -icanon посочва поне N знака за завършено четене\n" " ospeed N посочва скорост на изхода N бода\n" -#: src/stty.c:567 +#: src/stty.c:575 msgid "" " * rows N tell the kernel that the terminal has N rows\n" " * size print the number of rows and columns according to the " @@ -9775,13 +10153,15 @@ msgstr "" " time N с -icanon посочва прекъсване при четене до N десети от " "секундата\n" -#: src/stty.c:573 +#: src/stty.c:581 +#, fuzzy msgid "" "\n" "Control settings:\n" " [-]clocal disable modem control signals\n" " [-]cread allow input to be received\n" " * [-]crtscts enable RTS/CTS handshaking\n" +" * [-]cdtrdsr enable DTR/DSR handshaking\n" " csN set character size to N bits, N in [5..8]\n" msgstr "" "\n" @@ -9791,7 +10171,7 @@ msgstr "" " * [-]crtscts позволява диалог (handshaking) RTS/CTS\n" " csN посочва размер на знаците до N бита, N е от 5 до 8\n" -#: src/stty.c:581 +#: src/stty.c:590 #, fuzzy msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" @@ -9799,7 +10179,7 @@ msgid "" " [-]hupcl same as [-]hup\n" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" -" [-]parodd set odd parity (even with '-')\n" +" [-]parodd set odd parity (or even parity with '-')\n" msgstr "" " [-]cstopb използва два стоп-бита на знак (един с „-“)\n" " [-]hup изпраща сигнал за увисване, ako всички процеси затворят " @@ -9808,7 +10188,7 @@ msgstr "" " [-]parenb генерира на изхода и очаква на входа бит за четност\n" " [-]parodd посочва текова четност (четна с „-“)\n" -#: src/stty.c:588 +#: src/stty.c:597 msgid "" "\n" "Input settings:\n" @@ -9825,7 +10205,7 @@ msgstr "" " [-]ignbrk пренебрегва знаците за прекъсване\n" " [-]igncr пренебрегва знаците за връщане на курсора\n" -#: src/stty.c:596 +#: src/stty.c:605 msgid "" " [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" @@ -9840,12 +10220,12 @@ msgstr "" " [-]inpck позволява проверка за четността на входа\n" " [-]istrip изчиства старшия (8-мия) бит на входните знаци\n" -#: src/stty.c:603 +#: src/stty.c:612 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr "" " * [-]iutf8 да се предполага, че входните знаци са кодирани в UTF-8\n" -#: src/stty.c:606 +#: src/stty.c:615 msgid "" " * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" @@ -9863,7 +10243,7 @@ msgstr "" " [-]parmrk маркира грешките по четност (с последователност 255-0)\n" " [-]tandem същото като [-]ixoff\n" -#: src/stty.c:614 +#: src/stty.c:623 msgid "" "\n" "Output settings:\n" @@ -9879,7 +10259,7 @@ msgstr "" " * ffN стил за задържане на код за нова страница, N е 0 или 1\n" " * nlN стил за задържане на код за нов ред, N е 0 или 1\n" -#: src/stty.c:622 +#: src/stty.c:631 msgid "" " * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of null characters\n" @@ -9899,7 +10279,7 @@ msgstr "" "ред\n" " * [-]onlret кодът за нов ред осъществява връщане на курсора\n" -#: src/stty.c:630 +#: src/stty.c:639 msgid "" " * [-]onocr do not print carriage returns in the first column\n" " [-]opost postprocess output\n" @@ -9917,7 +10297,7 @@ msgstr "" " * vtN стил за задържане на кодове за вертик. табулация, N е 0 или " "1\n" -#: src/stty.c:638 +#: src/stty.c:647 msgid "" "\n" "Local settings:\n" @@ -9932,7 +10312,7 @@ msgstr "" " * crtkill убива реда според на настройките echoprt и echoe\n" " * -crtkill убива реда според на настройките echoctl и echok\n" -#: src/stty.c:645 +#: src/stty.c:654 #, fuzzy msgid "" " * [-]ctlecho echo control characters in hat notation ('^c')\n" @@ -9947,7 +10327,7 @@ msgstr "" " [-]echoe същото като [-]crterase\n" " [-]echok ехо на нов ред след код за убиване\n" -#: src/stty.c:652 +#: src/stty.c:661 #, fuzzy msgid "" " * [-]echoke same as [-]crtkill\n" @@ -9964,7 +10344,7 @@ msgstr "" " [-]iexten позволява управляващите кодове, които не отговарят на " "POSIX\n" -#: src/stty.c:659 +#: src/stty.c:668 #, fuzzy msgid "" " [-]isig enable interrupt, quit, and suspend special characters\n" @@ -9984,7 +10364,7 @@ msgstr "" " * [-]xcase с icanon извежда главните букви като предшествани от „\\“ " "малки\n" -#: src/stty.c:666 +#: src/stty.c:675 msgid "" "\n" "Combination settings:\n" @@ -9998,7 +10378,7 @@ msgstr "" " cbreak същото като -icanon\n" " -cbreak същото като icanon\n" -#: src/stty.c:673 +#: src/stty.c:682 msgid "" " cooked same as brkint ignpar istrip icrnl ixon opost isig\n" " icanon, eof and eol characters to their default values\n" @@ -10012,7 +10392,7 @@ msgstr "" " -cooked същото като raw\n" " crt същото като echoe echoctl echoke\n" -#: src/stty.c:679 +#: src/stty.c:688 msgid "" " dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" " kill ^u\n" @@ -10027,7 +10407,7 @@ msgstr "" "стойност\n" " evenp същото като parenb -parodd cs7\n" -#: src/stty.c:686 +#: src/stty.c:695 msgid "" " -evenp same as -parenb cs8\n" " * [-]lcase same as xcase iuclc olcuc\n" @@ -10043,7 +10423,7 @@ msgstr "" " nl същото като -icrnl -onlcr\n" " -nl същото като icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" -#: src/stty.c:694 +#: src/stty.c:703 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -10057,7 +10437,7 @@ msgstr "" " pass8 същото като -parenb -istrip cs8\n" " -pass8 същото като parenb istrip cs7\n" -#: src/stty.c:701 +#: src/stty.c:710 msgid "" " raw same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" " -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n" @@ -10069,7 +10449,7 @@ msgstr "" " -imaxbel -opost -isig -icanon -xcase min 1 time 0\n" " -raw същото като\n" -#: src/stty.c:707 +#: src/stty.c:716 #, fuzzy msgid "" " sane same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" @@ -10086,7 +10466,7 @@ msgstr "" " -xcase -tostop -echoprt echoctl echoke, всички управляващи\n" " знаци запазват стандартната си стойност.\n" -#: src/stty.c:715 +#: src/stty.c:724 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -10101,12 +10481,12 @@ msgstr "" "като ^c, 0x37, 0177 или 127; специалните стойности ^- и undef се използват,\n" "за да се забранят съответните управляващи знаци.\n" -#: src/stty.c:787 +#: src/stty.c:796 #, c-format msgid "only one device may be specified" msgstr "може да се посочва само едно устройство" -#: src/stty.c:817 +#: src/stty.c:826 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" @@ -10115,127 +10495,47 @@ msgstr "" "опциите за подробен и stty-четим изходен стил\n" "взаимно се изключват" -#: src/stty.c:823 +#: src/stty.c:832 #, c-format msgid "when specifying an output style, modes may not be set" msgstr "при посочване на изходен стил не може да се настройват режими" -#: src/stty.c:838 +#: src/stty.c:847 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s: не може да се презададе режимът non-blocking" -#: src/stty.c:883 src/stty.c:993 +#: src/stty.c:892 src/stty.c:1002 #, c-format msgid "invalid argument %s" msgstr "неправилен аргумент %s" -#: src/stty.c:894 src/stty.c:911 src/stty.c:923 src/stty.c:936 src/stty.c:948 -#: src/stty.c:968 +#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957 +#: src/stty.c:977 #, c-format msgid "missing argument to %s" msgstr "липсва аргумент за %s" -#: src/stty.c:974 +#: src/stty.c:983 #, c-format msgid "invalid line discipline %s" msgstr "неправилна дисциплина на редовете %s" -#: src/stty.c:1044 +#: src/stty.c:1053 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s: не може да се осъществят всички поискани операции" -#: src/stty.c:1390 +#: src/stty.c:1399 #, c-format msgid "%s: no size information for this device" msgstr "%s: няма информация за размера на това устройство" -#: src/stty.c:1904 +#: src/stty.c:1920 #, c-format msgid "invalid integer argument %s" msgstr "неправилен числов аргумент %s" -#: src/su.c:229 -msgid "Password:" -msgstr "Парола:" - -#: src/su.c:232 -#, c-format -msgid "getpass: cannot open /dev/tty" -msgstr "getpass: не може да се отвори /dev/tty" - -#: src/su.c:290 -#, c-format -msgid "cannot set groups" -msgstr "не може да се зададат групите" - -#: src/su.c:294 -#, c-format -msgid "cannot set group id" -msgstr "не може да се зададе групата" - -#: src/su.c:296 -#, c-format -msgid "cannot set user id" -msgstr "не може да се зададе потребителят" - -#: src/su.c:371 -#, c-format -msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" -msgstr "Използване: %s [ОПЦИЯ]... [-] [ПОТР [АРГ]...]\n" - -#: src/su.c:372 -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" - -#: src/su.c:384 -msgid "" -"\n" -"A mere - implies -l. If USER not given, assume root.\n" -msgstr "" -"\n" -"Само - влече -l. Ако не е посочен ПОТР, приема се root.\n" - -#: src/su.c:461 -#, c-format -msgid "user %s does not exist" -msgstr "не съществува потребител %s" - -#: src/su.c:484 -#, c-format -msgid "incorrect password" -msgstr "неправилна парола" - -#: src/su.c:501 -#, c-format -msgid "using restricted shell %s" -msgstr "използва се ограничената обвивка %s" - -#: src/su.c:509 -#, c-format -msgid "warning: cannot change directory to %s" -msgstr "внимание: каталогът не може да се смени на %s" - #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 #, fuzzy @@ -10268,7 +10568,7 @@ msgstr "Записва на диска изменените блокове, ак msgid "ignoring all arguments" msgstr "всички аргументи се пренебрегват" -#: src/system.h:340 +#: src/system.h:343 #, c-format msgid "" "\n" @@ -10282,15 +10582,23 @@ msgstr "" "към документацията на използваната от вас обвивка за поддържаните от нея " "опции.\n" -#: src/system.h:346 +#: src/system.h:349 msgid " --help display this help and exit\n" msgstr " --help извежда тази справка и завършва\n" -#: src/system.h:348 +#: src/system.h:351 msgid " --version output version information and exit\n" msgstr " --version извежда информация за версията и завършва\n" -#: src/system.h:541 +#: src/system.h:544 +#, fuzzy +msgid "" +"\n" +"Mandatory arguments to long options are mandatory for short options too.\n" +msgstr "" +"Аргументите, задължителни за дългите опции, са задължителни и за късите.\n" + +#: src/system.h:552 msgid "" "\n" "SIZE is an integer and optional unit (example: 10M is 10*1024*1024). Units\n" @@ -10298,7 +10606,7 @@ msgid "" "1000).\n" msgstr "" -#: src/system.h:550 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -10307,7 +10615,7 @@ msgid "" "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n" msgstr "" -#: src/system.h:560 +#: src/system.h:571 #, fuzzy, c-format msgid "" "\n" @@ -10321,22 +10629,22 @@ msgstr "" #. <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:574 +#: src/system.h:585 #, c-format msgid "Report %s translation bugs to <http://translationproject.org/team/>\n" msgstr "" -#: src/system.h:578 +#: src/system.h:589 #, c-format msgid "For complete documentation, run: info coreutils '%s invocation'\n" msgstr "" -#: src/system.h:585 +#: src/system.h:596 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "Използвайте „%s --help“ за повече информация.\n" -#: src/system.h:617 +#: src/system.h:628 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -10357,16 +10665,16 @@ 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" -"\n" msgstr "" "Извежда на стандартния изход всеки ФАЙЛ, последеният ред е пръв.\n" "Без ФАЙЛ или ако ФАЙЛ е -, се чете от стандартния вход.\n" "\n" -#: src/tac.c:145 +#: src/tac.c:144 msgid "" " -b, --before attach the separator before instead of after\n" " -r, --regex interpret the separator as a regular expression\n" @@ -10377,42 +10685,42 @@ msgstr "" " -s, --separator=НИЗ вместо кода за нов ред, използва като разделител " "НИЗ\n" -#: src/tac.c:235 src/tac.c:336 +#: src/tac.c:234 src/tac.c:335 #, c-format msgid "%s: seek failed" msgstr "%s: неуспешно позициониране (seek) във файл" -#: src/tac.c:264 +#: src/tac.c:263 #, c-format msgid "record too large" msgstr "твърде дълъг запис" -#: src/tac.c:451 +#: src/tac.c:450 #, fuzzy, c-format msgid "failed to create temporary file in %s" msgstr "не може да се направи временен файл %s" -#: src/tac.c:459 +#: src/tac.c:458 #, fuzzy, c-format msgid "failed to open %s for writing" msgstr "%s: не може да се отвори в режим за писане" -#: src/tac.c:476 +#: src/tac.c:475 #, fuzzy, c-format msgid "failed to rewind stream for %s" msgstr "времената на %s не можаха да се запазят" -#: src/tac.c:512 src/tac.c:519 +#: src/tac.c:511 src/tac.c:518 #, c-format msgid "%s: write error" msgstr "%s: грешка при запис" -#: src/tac.c:572 +#: src/tac.c:571 #, fuzzy, c-format msgid "failed to open %s for reading" msgstr "не може да се отвори %s за четене" -#: src/tac.c:630 +#: src/tac.c:629 #, c-format msgid "separator cannot be empty" msgstr "разделителят не може да бъде празен" @@ -10423,19 +10731,18 @@ msgid "Ian Lance Taylor" msgstr "" #: src/tail.c:262 -#, c-format +#, fuzzy, 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" -"\n" msgstr "" "Извежда на стандартния изход последните %d реда от всеки ФАЙЛ.\n" "Ако има повече от един ФАЙЛ, преди всеки поставя заглавие с файловото име.\n" "Без ФАЙЛ или ако ФАЙЛ е -, се чете от стандартния вход.\n" "\n" -#: src/tail.c:271 +#: src/tail.c:270 msgid "" " -c, --bytes=K output the last K bytes; alternatively, use -c " "+K\n" @@ -10443,7 +10750,7 @@ msgid "" "file\n" msgstr "" -#: src/tail.c:275 +#: src/tail.c:274 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -10458,7 +10765,7 @@ msgstr "" "еквивалентни\n" " -F същото като --follow=name --retry\n" -#: src/tail.c:282 +#: src/tail.c:281 #, fuzzy, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -10481,7 +10788,7 @@ msgstr "" " преименуван (което е обичайно при завъртане на\n" " журналните файлове)\n" -#: src/tail.c:295 +#: src/tail.c:294 #, fuzzy msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" @@ -10498,8 +10805,7 @@ msgstr "" " (стандартно 1.0)\n" " -v, --verbose винаги извежда заглавия с файловите имена\n" -#: src/tail.c:302 -#, fuzzy +#: src/tail.c:301 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations.\n" @@ -10507,15 +10813,8 @@ msgid "" " least once every N seconds.\n" " -v, --verbose always output headers giving file names\n" msgstr "" -" --pid=PID с -f завършва след като процесът с номер PID " -"умре\n" -" -q, --quiet, --silent не извежда заглавия с файловите имена\n" -" -s, --sleep-interval=S с -f интервалът между итерациите е около S " -"секунди\n" -" (стандартно 1.0)\n" -" -v, --verbose винаги извежда заглавия с файловите имена\n" -#: src/tail.c:311 +#: src/tail.c:310 #, fuzzy msgid "" "\n" @@ -10533,7 +10832,7 @@ msgstr "" "суфикс-множител: b за 512, k за 1024, m за 1024*1024.\n" "\n" -#: src/tail.c:320 +#: src/tail.c:319 #, fuzzy msgid "" "With --follow (-f), tail defaults to following the file descriptor, which\n" @@ -10551,68 +10850,68 @@ msgstr "" "многократно файла, за да провери дали той не е бил отстранен или създаден\n" "нов файл със същото име от друга програма.\n" -#: src/tail.c:379 +#: src/tail.c:378 #, c-format msgid "closing %s (fd=%d)" msgstr "Затваряне на %s (файлов дескриптор=%d)" -#: src/tail.c:454 +#: src/tail.c:453 #, c-format msgid "%s: cannot seek to relative offset %s" msgstr "%s: не може да се отиде на относително отместване %s във файла" -#: src/tail.c:458 +#: src/tail.c:457 #, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "%s: не може да се отиде на отместване %s относно края на файла" -#: src/tail.c:895 +#: src/tail.c:894 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "" -#: src/tail.c:907 +#: src/tail.c:906 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" msgstr "" -#: src/tail.c:964 +#: src/tail.c:963 #, c-format msgid "%s has become inaccessible" msgstr "%s е станал недостъпен" -#: src/tail.c:981 +#: src/tail.c:980 #, c-format msgid "%s has been replaced with an untailable file; giving up on this name" msgstr "" "%s е бил заменен с файл, който е недостъпен за tail; tail повече няма да го " "следи" -#: src/tail.c:990 +#: src/tail.c:989 #, fuzzy, c-format msgid "%s has been replaced with a remote file. giving up on this name" msgstr "" "%s е бил заменен с файл, който е недостъпен за tail; tail повече няма да го " "следи" -#: src/tail.c:1011 +#: src/tail.c:1010 #, c-format msgid "%s has become accessible" msgstr "%s е станал достъпен" -#: src/tail.c:1019 +#: src/tail.c:1018 #, c-format msgid "%s has appeared; following end of new file" msgstr "%s се е появил; следва се краят на новия файл" -#: src/tail.c:1030 +#: src/tail.c:1029 #, c-format msgid "%s has been replaced; following end of new file" msgstr "%s е бил заменен; следва се краят на новия файл" -#: src/tail.c:1131 +#: src/tail.c:1130 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: не може да се смени режимът non-blocking" @@ -10980,17 +11279,22 @@ msgstr "липсва „]“" msgid "extra argument %s" msgstr "излишен аргумент %s" -#: src/timeout.c:124 +#: src/timeout.c:112 +#, c-format +msgid "warning: sigprocmask" +msgstr "" + +#: src/timeout.c:145 #, c-format msgid "warning: timer_settime" msgstr "" -#: src/timeout.c:129 +#: src/timeout.c:150 #, c-format msgid "warning: timer_create" msgstr "" -#: src/timeout.c:204 +#: src/timeout.c:225 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -10999,17 +11303,17 @@ msgstr "" "Използване: %s КОМАНДА [АРГУМЕНТ]...\n" " или: %s ОПЦИЯ\n" -#: src/timeout.c:208 +#: src/timeout.c:229 #, fuzzy -msgid "" -"Start COMMAND, and kill it if still running after DURATION.\n" -"\n" -"Mandatory arguments to long options are mandatory for short options too.\n" +msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "" "Аргументите, задължителни за дългите опции, са задължителни и за късите.\n" -#: src/timeout.c:213 +#: src/timeout.c:235 msgid "" +" --preserve-status\n" +" exit with the same status as COMMAND, even when the\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 " @@ -11024,7 +11328,7 @@ msgid "" " See 'kill -l' for a list of signals\n" msgstr "" -#: src/timeout.c:229 +#: src/timeout.c:254 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -11032,25 +11336,30 @@ msgid "" "days.\n" msgstr "" -#: src/timeout.c:234 +#: src/timeout.c:259 msgid "" "\n" -"If the command times out, then exit with status 124. Otherwise, exit\n" -"with the status of COMMAND. If no signal is specified, send the TERM\n" -"signal upon timeout. The TERM signal kills any process that does not\n" -"block or catch that signal. For other processes, it may be necessary to\n" -"use the KILL (9) signal, since this signal cannot be caught. If the\n" -"KILL (9) signal is sent, the exit status is 128+9 rather than 124.\n" +"If the command times out, and --preserve-status is not set, then exit with\n" +"status 124. Otherwise, exit with the status of COMMAND. If no signal\n" +"is specified, send the TERM signal upon timeout. The TERM signal kills\n" +"any process that does not block or catch that signal. It may be necessary\n" +"to use the KILL (9) signal, since this signal cannot be caught, in which\n" +"case the exit status is 128+9 rather than 124.\n" +msgstr "" + +#: src/timeout.c:363 +#, c-format +msgid "warning: disabling core dumps failed" msgstr "" -#: src/timeout.c:419 +#: src/timeout.c:471 #, fuzzy, c-format msgid "error waiting for command" msgstr "грешка при запис в %s" -#: src/timeout.c:441 +#: src/timeout.c:482 #, c-format -msgid "warning: disabling core dumps failed" +msgid "the monitored command dumped core" msgstr "" #. This is a proper name. See the gettext manual, section Names. @@ -11063,22 +11372,22 @@ msgstr "" msgid "Randy Smith" msgstr "" -#: src/touch.c:115 src/touch.c:313 +#: src/touch.c:115 src/touch.c:309 #, c-format msgid "invalid date format %s" msgstr "неправилен формат за дата %s" -#: src/touch.c:194 +#: src/touch.c:191 #, c-format msgid "cannot touch %s" msgstr "не може да се въздейства на %s" -#: src/touch.c:200 +#: src/touch.c:197 #, c-format msgid "setting times of %s" msgstr "задава се време на %s" -#: src/touch.c:216 +#: src/touch.c:213 msgid "" "Update the access and modification times of each FILE to the current time.\n" "\n" @@ -11087,10 +11396,9 @@ msgid "" "\n" "A FILE argument string of - is handled specially and causes touch to\n" "change the times of the file associated with standard output.\n" -"\n" msgstr "" -#: src/touch.c:229 +#: src/touch.c:225 #, fuzzy msgid "" " -a change only the access time\n" @@ -11105,7 +11413,7 @@ msgstr "" " -f (пренебрегва се)\n" " -m променя само времето на последна промяна\n" -#: src/touch.c:235 +#: src/touch.c:231 #, fuzzy msgid "" " -h, --no-dereference affect each symbolic link instead of any " @@ -11119,11 +11427,12 @@ msgstr "" " файлове (само при системи, позволяващи промяна на\n" " собствеността на символна връзка)\n" -#: src/touch.c:241 +#: 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" -" --time=WORD change the specified time:\n" +" --time=WORD change the specified time:\n" " WORD is access, atime, or use: equivalent to -a\n" " WORD is modify or mtime: equivalent to -m\n" msgstr "" @@ -11134,7 +11443,7 @@ msgstr "" " access, atime и use: същото като -а\n" " modify и mtime: същото като -m\n" -#: src/touch.c:250 +#: src/touch.c:246 #, fuzzy msgid "" "\n" @@ -11145,12 +11454,12 @@ msgstr "" "\n" "Ако ФАЙЛ е -, действа с файловия дескриптор за стандартния изход.\n" -#: src/touch.c:339 +#: src/touch.c:335 #, c-format msgid "cannot specify times from more than one source" msgstr "не може да се посочват времена с повече от един източник" -#: src/touch.c:413 +#: src/touch.c:409 #, fuzzy, c-format msgid "" "warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'" @@ -11424,25 +11733,24 @@ msgid "" "If a FILE is larger than the specified size, the extra data is lost.\n" "If a FILE is shorter, it is extended and the extended part (hole)\n" "reads as zero bytes.\n" -"\n" msgstr "" -#: src/truncate.c:110 +#: src/truncate.c:109 msgid " -c, --no-create do not create any files\n" msgstr "" -#: src/truncate.c:113 +#: src/truncate.c:112 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" -#: src/truncate.c:116 +#: 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" msgstr "" -#: src/truncate.c:122 +#: src/truncate.c:121 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -11450,57 +11758,57 @@ msgid "" "'/' round down to multiple of, '%' round up to multiple of.\n" msgstr "" -#: src/truncate.c:150 +#: src/truncate.c:149 #, c-format msgid "overflow in %<PRIdMAX> * %<PRIdMAX> byte blocks for file %s" msgstr "" -#: src/truncate.c:174 +#: src/truncate.c:173 #, fuzzy, c-format msgid "%s has unusable, apparently negative size" msgstr "%s: файлът има отрицателен размер" -#: src/truncate.c:184 src/truncate.c:379 +#: src/truncate.c:183 src/truncate.c:384 #, fuzzy, c-format msgid "cannot get the size of %s" msgstr "не може да се получи времето от деня" -#: src/truncate.c:206 +#: src/truncate.c:205 #, fuzzy, c-format msgid "overflow rounding up size of file %s" msgstr "препълване на отместването при четене на файла %s" -#: src/truncate.c:216 +#: src/truncate.c:215 #, fuzzy, c-format msgid "overflow extending size of file %s" msgstr "препълване на отместването при четене на файла %s" -#: src/truncate.c:231 +#: src/truncate.c:230 #, c-format msgid "failed to truncate %s at %<PRIdMAX> bytes" msgstr "" -#: src/truncate.c:305 +#: src/truncate.c:303 #, fuzzy, c-format msgid "multiple relative modifiers specified" msgstr "посочени са много целеви каталози" -#: src/truncate.c:335 +#: src/truncate.c:333 #, fuzzy, c-format msgid "you must specify either %s or %s" msgstr "трябва да посочите списък байтове, знаци или полета" -#: src/truncate.c:342 +#: src/truncate.c:340 #, c-format msgid "you must specify a relative %s with %s" msgstr "" -#: src/truncate.c:349 +#: src/truncate.c:347 #, c-format msgid "%s was specified but %s was not" msgstr "" -#: src/truncate.c:400 +#: src/truncate.c:404 #, c-format msgid "cannot open %s for writing" msgstr "не може да се отвори %s за запис" @@ -11593,16 +11901,16 @@ msgid "cannot get system name" 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" -"\n" msgstr "" "Преобразува интервалите във всеки от ФАЙЛовете в табулации, извежда на\n" "стандартния изход. Без ФАЙЛ или ако ФАЙЛ е - чете от стандартния вход.\n" "\n" -#: src/unexpand.c:125 +#: src/unexpand.c:124 msgid "" " -a, --all convert all blanks, instead of just initial blanks\n" " --first-only convert only leading sequences of blanks (overrides -a)\n" @@ -11618,12 +11926,12 @@ msgstr "" " -t, --tabs=СПИС СПИСък от разделени с „,“ позиции за табулации (позволява " "-a)\n" -#: src/unexpand.c:153 +#: src/unexpand.c:152 #, c-format msgid "tabs are too far apart" msgstr "табулациите са твърде отдалечени" -#: src/unexpand.c:505 +#: src/unexpand.c:504 #, c-format msgid "tab stop value is too large" msgstr "табулацията е твърде дълга" @@ -11639,10 +11947,9 @@ msgid "" "writing to OUTPUT (or standard output).\n" "\n" "With no options, matching lines are merged to the first occurrence.\n" -"\n" msgstr "" -#: src/uniq.c:148 +#: src/uniq.c:147 msgid "" " -c, --count prefix lines by the number of occurrences\n" " -d, --repeated only print duplicate lines\n" @@ -11650,7 +11957,7 @@ msgstr "" " -c, --count редовете да се предхождат от брой срещания\n" " -d, --repeated извежда само повтарящите се редове\n" -#: src/uniq.c:152 +#: src/uniq.c:151 #, fuzzy msgid "" " -D, --all-repeated[=delimit-method] print all duplicate lines\n" @@ -11671,11 +11978,11 @@ msgstr "" " -s, --skip-chars=N не сравнява първите N знака\n" " -u, --unique извежда само редовете, които не се повтарят\n" -#: src/uniq.c:162 +#: src/uniq.c:161 msgid " -w, --check-chars=N compare no more than N characters in lines\n" msgstr " -w, --check-chars=N сравнява по не повече от N знака в редовете\n" -#: src/uniq.c:167 +#: src/uniq.c:166 #, fuzzy msgid "" "\n" @@ -11686,7 +11993,7 @@ msgstr "" "Полето се състои от бяло поле, следвано от видими знаци.\n" "Fields are skipped before chars.\n" -#: src/uniq.c:172 +#: src/uniq.c:171 msgid "" "\n" "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n" @@ -11694,24 +12001,24 @@ msgid "" "Also, comparisons honor the rules specified by 'LC_COLLATE'.\n" msgstr "" -#: src/uniq.c:359 +#: src/uniq.c:358 #, c-format msgid "too many repeated lines" msgstr "твърде много повторени редове" -#: src/uniq.c:522 +#: src/uniq.c:521 msgid "invalid number of fields to skip" msgstr "неправилен брой полета за пропускане" -#: src/uniq.c:531 +#: src/uniq.c:530 msgid "invalid number of bytes to skip" msgstr "неправилен брой байтове за пропускане" -#: src/uniq.c:540 +#: src/uniq.c:539 msgid "invalid number of bytes to compare" msgstr "неправилен брой знаци за сравняване" -#: src/uniq.c:559 +#: src/uniq.c:558 #, c-format msgid "printing all duplicated lines and repeat counts is meaningless" msgstr "" @@ -11766,6 +12073,11 @@ msgid_plural "up %ld days %2d:%02d, " msgstr[0] "" msgstr[1] "" +#: src/uptime.c:149 +#, fuzzy, c-format +msgid "up %2d:%02d, " +msgstr " %2d:%02d%s включен " + #: src/uptime.c:151 #, c-format msgid "%lu user" @@ -11867,40 +12179,40 @@ msgstr "" msgid " old " msgstr " стар " -#: src/who.c:449 +#: src/who.c:440 #, fuzzy msgid "system boot" msgstr "грешка в системата" -#: src/who.c:456 src/who.c:458 +#: src/who.c:447 src/who.c:449 msgid "id=" msgstr "id=" -#: src/who.c:471 src/who.c:476 +#: src/who.c:462 src/who.c:467 msgid "term=" msgstr "term=" -#: src/who.c:473 src/who.c:477 +#: src/who.c:464 src/who.c:468 msgid "exit=" msgstr "exit=" -#: src/who.c:494 +#: src/who.c:485 msgid "LOGIN" msgstr "" -#: src/who.c:514 +#: src/who.c:505 msgid "clock change" msgstr "смяна на часа" -#: src/who.c:526 src/who.c:527 +#: src/who.c:517 src/who.c:518 msgid "run-level" msgstr "стартниво" -#: src/who.c:530 src/who.c:531 +#: src/who.c:521 src/who.c:522 msgid "last=" msgstr "last=" -#: src/who.c:562 +#: src/who.c:553 #, c-format msgid "" "\n" @@ -11909,44 +12221,44 @@ msgstr "" "\n" "брой потребители - %lu\n" -#: src/who.c:568 +#: src/who.c:559 msgid "NAME" msgstr "ИМЕ" -#: src/who.c:568 +#: src/who.c:559 msgid "LINE" msgstr "ЛИНИЯ" -#: src/who.c:568 +#: src/who.c:559 msgid "TIME" msgstr "ВРЕМЕ" -#: src/who.c:568 +#: src/who.c:559 msgid "IDLE" msgstr "БЕЗДЕЕН" -#: src/who.c:569 +#: src/who.c:560 msgid "PID" msgstr "PID" -#: src/who.c:569 +#: src/who.c:560 msgid "COMMENT" msgstr "КОМЕНТАР" -#: src/who.c:569 +#: src/who.c:560 msgid "EXIT" msgstr "ИЗХОД" -#: src/who.c:649 +#: src/who.c:640 #, c-format msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n" msgstr "Използване: %s [ОПЦИЯ]... [ ФАЙЛ | АРГ1 АРГ2 ]\n" -#: src/who.c:650 +#: src/who.c:641 msgid "Print information about users who are currently logged in.\n" msgstr "" -#: src/who.c:653 +#: src/who.c:644 msgid "" "\n" " -a, --all same as -b -d --login -p -r -t -T -u\n" @@ -11960,11 +12272,11 @@ msgstr "" " -d, --dead извежда броя умрели процеси\n" " -H, --heading извежда антетка\n" -#: src/who.c:660 +#: src/who.c:651 msgid " -l, --login print system login processes\n" msgstr " -l, --login извежда процесите за влизане в системата\n" -#: src/who.c:663 +#: src/who.c:654 msgid "" " --lookup attempt to canonicalize hostnames via DNS\n" " -m only hostname and user associated with stdin\n" @@ -11976,7 +12288,7 @@ msgstr "" "вход\n" " -p, --process извежда активните процеси, породени от init\n" -#: src/who.c:668 +#: src/who.c:659 msgid "" " -q, --count all login names and number of users logged on\n" " -r, --runlevel print current runlevel\n" @@ -11989,7 +12301,7 @@ msgstr "" " -s, --short извежда само името, линията и времето (по подразбиране)\n" " -t, --time извежда последната промяна на системния часовник\n" -#: src/who.c:674 +#: src/who.c:665 msgid "" " -T, -w, --mesg add user's message status as +, - or ?\n" " -u, --users list users logged in\n" @@ -12002,7 +12314,7 @@ msgstr "" " --message същото като -T\n" " --writable същото като -T\n" -#: src/who.c:682 +#: src/who.c:673 #, fuzzy, c-format msgid "" "\n" @@ -12046,12 +12358,17 @@ msgstr "" "Непрекъснато извежда ред, състоящ се от посочените НИЗ(ове) или „y“.\n" "\n" -#~ msgid "" -#~ "Usage: %s NAME\n" -#~ " or: %s OPTION\n" -#~ msgstr "" -#~ "Използване: %s ИМЕ\n" -#~ " или: %s ОПЦИЯ\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 "" #~ "\n" @@ -12064,19 +12381,154 @@ msgstr "" #~ " %s /usr/bin/sort извежда „sort“.\n" #~ " %s include/stdio.h .h извежда „stdio“.\n" -#~ msgid "Usage: %s [OPTION] FILE...\n" -#~ msgstr "Използване: %s [ОПЦИЯ] ФАЙЛ...\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 "опцията --allow-missing е остаряла; ползвайте --retry вместо нея" + +#~ 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 за десетична бройна система, 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" +#~ 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 "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" -#~ " --dereference affect the referent of each symbolic link (this " -#~ "is\n" -#~ " the default), rather than the symbolic link " -#~ "itself\n" +#~ " -f, --silent, --quiet suppress most error messages\n" +#~ " -v, --verbose output a diagnostic for every file processed\n" #~ msgstr "" #~ "Прави ГРУПА да бъде групата на всеки ФАЙЛ.\n" #~ "При --reference прави групата на всеки ФАЙЛ да бъде същата като тази на " @@ -12089,6 +12541,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" #~ " --reference=RFILE use RFILE's group rather than specifying a\n" @@ -12114,14 +12574,6 @@ msgstr "" #~ " -c, --changes като 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 да не се обработва „/“ по-особено (по " -#~ "подразбиране)\n" -#~ " --preserve-root да не се действа рекурсивно от „/“\n" - #~ msgid "" #~ " -f, --silent, --quiet suppress most error messages\n" #~ " -v, --verbose output a diagnostic for every file processed\n" @@ -12173,33 +12625,6 @@ msgstr "" #~ " -v, --verbose извежда диагностично съобщение за всеки " #~ "обработен файл\n" -#, fuzzy -#~ msgid "Usage: %s [OPTION]... PATH START\n" -#~ msgstr "Използване: %s [ОПЦИЯ]... МНОЖ1 [МНОЖ2]\n" - -#, fuzzy -#~ msgid "" -#~ " -n, --no-newline do not output the trailing " -#~ "newline\n" -#~ " " -#~ msgstr "" -#~ "Извежда НИЗовете на стандартния изход.\n" -#~ "\n" -#~ " -n не извежда знаци за нов ред след всеки от НИЗовете\n" - -#, fuzzy -#~ 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" -#~ "РАЗМ се състои от незадължително цяло число, следвано от едно от:\n" -#~ "kB=1000, K=1024, MB=1000*1000, M=1024*1024 и аналогично за G, T, P, E, Z " -#~ "и Y.\n" - #~ msgid "" #~ "Display the current time in the given FORMAT, or set the system date.\n" #~ "\n" @@ -12214,17 +12639,18 @@ msgstr "" #~ " -f, --file=ФАЙЛДАТИ като --date по веднъж за всеки ред от " #~ "ФАЙЛДАТИ\n" -#~ msgid "cannot create link %s" -#~ msgstr "не може да се създаде връзка %s" - -#, fuzzy -#~ msgid "%s: option '%s' is ambiguous\n" -#~ msgstr "%s: опцията „-W %s“ е двусмислена\n" - #, fuzzy #~ msgid "" -#~ "WARNING: --preserve_context is deprecated; use --preserve-context instead" -#~ msgstr "опцията --copyright е остаряла; ползвайте --version вместо нея" +#~ "\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" @@ -12290,6 +12716,9 @@ msgstr "" #~ msgid "%s" #~ msgstr "%s" +#~ msgid "cannot create link %s" +#~ msgstr "не може да се създаде връзка %s" + #~ msgid " -P, --no-dereference never follow symbolic links\n" #~ msgstr " -P, --no-dereference не проследява символните връзки\n" @@ -12312,9 +12741,6 @@ msgstr "" #~ msgid "the --reply option is deprecated; use -i or -f instead" #~ msgstr "опцията --reply е остаряла; ползвайте -i или -f вместо нея" -#~ msgid "invalid format width" -#~ msgstr "неправилна ширина на формат" - #~ msgid "invalid format precision" #~ msgstr "неправилна точност на формат" @@ -12504,6 +12930,9 @@ msgstr "" #~ " \\t хоризонтална табулация\n" #~ " \\v вертикална табулация\n" +#~ msgid "the --copyright option is deprecated; use --version instead" +#~ msgstr "опцията --copyright е остаряла; ползвайте --version вместо нея" + #~ msgid "FATAL: failed to close directory %s" #~ msgstr "КРИТИЧНА ГРЕШКА: каталогът %s не може да се затвори" @@ -12559,6 +12988,9 @@ msgstr "" #~ msgid "invalid number of lines: 0" #~ msgstr "недопустим брой редове: 0" +#~ msgid "Usage: %s [OPTION] FILE...\n" +#~ msgstr "Използване: %s [ОПЦИЯ] ФАЙЛ...\n" + #~ msgid "new_mode: mode\n" #~ msgstr "new_mode: mode\n" @@ -12646,9 +13078,6 @@ msgstr "" #~ "(или стандартния вход); извежда в ИЗХОД (или стандартния изход).\n" #~ "\n" -#~ msgid " %2d:%02d%s up " -#~ msgstr " %2d:%02d%s включен " - #~ msgid "am" #~ msgstr "пр.обед" @@ -13000,9 +13429,6 @@ 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 356b5370..90388cfd 100644 Binary files a/po/ca.gmo and b/po/ca.gmo differ diff --git a/po/ca.po b/po/ca.po index 3f1fff1f..f880583e 100644 --- a/po/ca.po +++ b/po/ca.po @@ -47,10 +47,10 @@ # bonic, excepte quan quede realment horrend o porte a confusió). msgid "" msgstr "" -"Project-Id-Version: coreutils 8.15\n" +"Project-Id-Version: coreutils 8.20-pre1\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2012-05-10 19:35+0200\n" -"PO-Revision-Date: 2012-02-24 23:06+0100\n" +"POT-Creation-Date: 2013-02-14 15:56+0000\n" +"PO-Revision-Date: 2012-10-21 20:29+0200\n" "Last-Translator: Ivan Vilata i Balaguer <ivan@selidor.net>\n" "Language-Team: Catalan <ca@dodds.net>\n" "Language: ca\n" @@ -80,21 +80,21 @@ msgstr "Els arguments vàlids són:" msgid "error closing file" msgstr "error en tancar el fitxer" -#: lib/closeout.c:112 src/base64.c:109 src/base64.c:121 src/base64.c:127 -#: src/base64.c:168 src/base64.c:224 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:330 src/expand.c:355 src/head.c:298 -#: src/head.c:348 src/head.c:756 src/head.c:797 src/mktemp.c:350 src/od.c:919 -#: src/paste.c:160 src/shuf.c:369 src/split.c:727 src/split.c:964 -#: src/split.c:969 src/tail.c:350 src/tail.c:1201 src/tail.c:1307 +#: 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 -#: src/unexpand.c:427 src/unexpand.c:443 +#: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "error d’escriptura" # Usa quote(). ivb # Indica condició d'error. ivb -#: lib/copy-acl.c:611 src/copy.c:1160 src/copy.c:2602 +#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617 #, c-format msgid "preserving permissions for %s" msgstr "en preservar els permisos de %s" @@ -288,19 +288,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:483 +#: lib/mkdir-p.c:196 src/install.c:484 #, 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:2261 src/install.c:709 src/install.c:722 +#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722 #, 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:915 src/tac.c:435 +#: src/split.c:929 src/tac.c:434 #, c-format msgid "memory exhausted" msgstr "la memòria s’ha exhaurit" @@ -350,79 +350,79 @@ msgstr "»" msgid "%s: end of file" msgstr "%s: s’ha trobat el final del fitxer" -#: lib/regcomp.c:130 +#: lib/regcomp.c:131 msgid "Success" msgstr "Èxit" -#: lib/regcomp.c:133 +#: lib/regcomp.c:134 msgid "No match" msgstr "No hi ha cap coincidència" -#: lib/regcomp.c:136 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "L’expressió regular no és vàlida" # Usa quote(). ivb -#: lib/regcomp.c:139 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "El caràcter d’ordenació no és vàlid" # Usa quote(). ivb -#: lib/regcomp.c:142 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "El nom de la classe de caràcters no és vàlid" -#: lib/regcomp.c:145 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "Hi ha una barra invertida sobrant al final" # Usa quote(). ivb -#: lib/regcomp.c:148 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "La referència cap enrere no és vàlida" -#: lib/regcomp.c:151 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "«[» o «[^» desaparellat" -#: lib/regcomp.c:154 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "«(» o «\\(» desaparellat" -#: lib/regcomp.c:157 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "«\\{» desaparellat" -#: lib/regcomp.c:160 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "El contingut de «\\{\\}» no és vàlid" # Usa quote(). ivb -#: lib/regcomp.c:163 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "El final del rang no és vàlid" -#: lib/regcomp.c:166 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "La memòria s’ha exhaurit" -#: lib/regcomp.c:169 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "L’expressió regular precedent és incorrecta" -#: lib/regcomp.c:172 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "Fi prematura de l’expressió regular" -#: lib/regcomp.c:175 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "L’expressió regular és massa llarga" -#: lib/regcomp.c:178 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "«)» o «\\)» desaparellat" -#: lib/regcomp.c:703 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "No hi ha expressió regular prèvia" @@ -465,7 +465,7 @@ msgstr "^[nN]" # Usa quote(). ivb # Indica condició d'error. ivb -#: lib/set-mode-acl.c:695 src/copy.c:2284 src/cp.c:518 +#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516 #, c-format msgid "setting permissions for %s" msgstr "en establir els permisos de %s" @@ -606,18 +606,19 @@ msgstr "Fallada d’alimentació" msgid "Resource lost" msgstr "S’ha perdut el recurs" -# Els 2 usen quote(). ivb -#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262 -#: lib/spawn-pipe.c:265 -#, fuzzy, c-format +# 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 cua FIFO %s" +msgstr "no s’ha pogut crear la canonada" -#: lib/spawn-pipe.c:232 lib/spawn-pipe.c:346 lib/wait-process.c:282 +# Cap empra quote(). ivb +#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282 #: lib/wait-process.c:356 -#, fuzzy, c-format +#, c-format msgid "%s subprocess failed" -msgstr "%s: ha fallat el desplaçament" +msgstr "el subprocés «%s» ha fallat" #: lib/strsignal.c:114 #, c-format @@ -629,24 +630,24 @@ msgstr "Senyal de temps real %d" msgid "Unknown signal %d" msgstr "Senyal desconegut %d" -#: lib/unicodeio.c:103 +#: lib/unicodeio.c:102 msgid "iconv function not usable" msgstr "la funció iconv() no és útil" -#: lib/unicodeio.c:105 +#: lib/unicodeio.c:104 msgid "iconv function not available" msgstr "la funció iconv() no es troba disponible" -#: lib/unicodeio.c:112 +#: lib/unicodeio.c:111 msgid "character out of range" msgstr "el caràcter es troba fora del rang" -#: lib/unicodeio.c:182 +#: lib/unicodeio.c:181 #, c-format msgid "cannot convert U+%04X to local character set" msgstr "no s’ha pogut convertir U+%04X al joc de caràcters local" -#: lib/unicodeio.c:184 +#: lib/unicodeio.c:183 #, c-format msgid "cannot convert U+%04X to local character set: %s" msgstr "no s’ha pogut convertir U+%04X al joc de caràcters local: %s" @@ -832,7 +833,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:562 +#: lib/version-etc.c:251 src/system.h:573 #, c-format msgid "%s home page: <%s>\n" msgstr "Pàgina principal de «%s»: %s\n" @@ -843,30 +844,35 @@ 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:563 +#: lib/version-etc.c:256 src/system.h:574 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 -#, fuzzy, c-format +#, c-format msgid "_open_osfhandle failed" -msgstr "no s’ha pogut obrir" +msgstr "ha fallat _open_osfhandle()" #: lib/w32spawn.h:84 #, c-format msgid "cannot restore fd %d: dup2 failed" -msgstr "" +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 "" +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 "" +msgstr "el subprocés «%s» ha rebut el senyal fatal %d" #: lib/xfreopen.c:35 msgid "stdin" @@ -935,18 +941,17 @@ msgid "Simon Josefsson" msgstr "Simon Josefsson" #: src/base64.c:60 -#, c-format +#, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" "Base64 encode or decode FILE, or standard input, to standard output.\n" -"\n" 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:64 +#: src/base64.c:67 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -960,10 +965,10 @@ msgstr "" " alfabètics.\n" " -w, --wrap=COLS Ajusta la longitud de les línies codificades al " "valor\n" -" indicat (76 per defecte). Empreu 0 per a no " +" indicat (per defecte 76). Empreu 0 per a no " "ajustar.\n" -#: src/base64.c:73 src/cat.c:110 src/fmt.c:293 src/shuf.c:71 src/sum.c:70 +#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -971,7 +976,7 @@ msgstr "" "\n" "Sense cap FITXER, o quan FITXER és «-», llegeix l’entrada estàndard.\n" -#: src/base64.c:76 +#: src/base64.c:79 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -986,39 +991,39 @@ msgstr "" "de\n" "tolerar altres octets no alfabètics en el flux codificat.\n" -#: src/base64.c:171 src/base64.c:208 src/csplit.c:263 src/csplit.c:1435 -#: src/join.c:451 src/shuf.c:157 src/shuf.c:361 src/tac-pipe.c:74 +#: 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 #, c-format msgid "read error" msgstr "error de lectura" -#: src/base64.c:227 +#: src/base64.c:230 #, c-format msgid "invalid input" msgstr "l’entrada no és vàlida" -#: src/base64.c:264 +#: src/base64.c:267 #, c-format msgid "invalid wrap size: %s" msgstr "la longitud d’ajustament no és vàlida: %s" # Usa quote(). ivb -#: src/base64.c:283 src/basename.c:173 src/comm.c:435 src/cp.c:607 -#: src/date.c:441 src/dircolors.c:447 src/du.c:894 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:169 src/install.c:929 src/join.c:961 -#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:157 src/mv.c:447 -#: src/od.c:1802 src/ptx.c:2081 src/readlink.c:154 src/seq.c:408 -#: src/shuf.c:320 src/shuf.c:339 src/sort.c:4477 src/split.c:1313 -#: src/tr.c:1797 src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:454 -#: src/uniq.c:471 src/unlink.c:81 src/uptime.c:250 src/users.c:146 -#: src/wc.c:666 src/who.c:836 src/whoami.c:79 +#: 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 #, c-format msgid "extra operand %s" msgstr "sobra l’operand %s" # Indica la situació d'un missatge d'error. ivb -#: src/base64.c:315 src/cat.c:781 +#: src/base64.c:318 src/cat.c:781 #, c-format msgid "closing standard input" msgstr "en tancar l’entrada estàndard" @@ -1026,45 +1031,51 @@ 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/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:53 src/env.c:33 +#: 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/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:65 src/su.c:88 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 +#: 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 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 "" "Forma d’ús: %s NOM [SUFIX]\n" -" o bé: %s OPCIÓ\n" +" 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" -"\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:59 +#: 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" msgstr "" +" -a, --multiple Admet múltiples arguments i tracta cadascun d’ells " +"com\n" +" a un NOM.\n" +" -s, --suffix=SUFIX Elimina el SUFIX del darrere.\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/basename.c:66 +#: src/basename.c:67 #, c-format msgid "" "\n" @@ -1074,21 +1085,29 @@ msgid "" " %s -s .h include/stdio.h -> \"stdio\"\n" " %s -a any/str1 any/str2 -> \"str1\" followed by \"str2\"\n" msgstr "" +"\n" +"Exemples:\n" +"\n" +" %s /usr/bin/sort -> «sort»\n" +" %s include/stdio.h .h -> «stdio»\n" +" %s -s .h include/stdio.h -> «stdio»\n" +" %s -a una/cad1 una/cad2 -> «cad1» seguit per «cad2»\n" -#: src/basename.c:167 src/chcon.c:531 src/chgrp.c:277 src/chmod.c:526 -#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1369 +#: 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:183 src/mkfifo.c:108 src/mknod.c:146 src/nohup.c:111 -#: src/pathchk.c:148 src/printf.c:674 src/readlink.c:146 src/realpath.c:236 -#: src/rm.c:314 src/rmdir.c:223 src/seq.c:402 src/setuidgid.c:137 -#: src/sleep.c:119 src/stat.c:1476 src/stdbuf.c:346 src/tr.c:1782 +#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 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 #, 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:52 src/split.c:49 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/split.c:49 msgid "Torbjorn Granlund" msgstr "Torbjörn Granlund" @@ -1098,8 +1117,8 @@ msgstr "Torbjörn Granlund" msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:846 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4720 src/nl.c:182 src/paste.c:435 src/pr.c:2768 src/sum.c:58 +#: 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/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 +1184,7 @@ msgstr "" msgid "cannot do ioctl on %s" msgstr "ha fallat ioctl() sobre %s" -#: src/cat.c:637 src/dd.c:2209 src/sort.c:379 src/tee.c:165 src/yes.c:86 +#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86 #, c-format msgid "standard output" msgstr "eixida estàndard" @@ -1182,7 +1201,7 @@ 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:55 src/head.c:46 src/hostid.c:33 +#: 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 @@ -1190,7 +1209,7 @@ msgid "Jim Meyering" msgstr "Jim Meyering" # Usa quote(). ivb -#: src/chcon.c:100 src/runcon.c:203 src/runcon.c:234 +#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238 #, c-format msgid "failed to create security context: %s" msgstr "no s’ha pogut crear el context de seguretat: %s" @@ -1202,8 +1221,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:540 src/copy.c:2222 src/runcon.c:217 -#: src/stat.c:683 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221 +#: src/stat.c:702 #, c-format msgid "failed to get security context of %s" msgstr "no s’ha pogut obtenir el context de seguretat de %s" @@ -1223,13 +1242,13 @@ 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:446 src/ls.c:2981 +#: src/du.c:457 src/ls.c:2981 #, 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:426 +#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437 #, c-format msgid "cannot read directory %s" msgstr "no s’ha pogut llegir el directori %s" @@ -1242,14 +1261,14 @@ 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:599 +#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562 #, 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:618 -#: src/remove.c:613 +#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642 +#: src/remove.c:576 #, c-format msgid "fts_close failed" msgstr "ha fallat fts_close()" @@ -1266,18 +1285,18 @@ 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" "With --reference, change the security context of each FILE to that of " "RFILE.\n" -"\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" -#: src/chcon.c:362 src/chgrp.c:123 src/chown.c:94 +#: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94 msgid "" " --dereference affect the referent of each symbolic link (this is\n" " the default), rather than the symbolic link itself\n" @@ -1291,7 +1310,7 @@ msgstr "" "dels\n" " fitxers apuntats.\n" -#: src/chcon.c:367 +#: src/chcon.c:369 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" @@ -1307,7 +1326,16 @@ msgstr "" " -l, --range=RANG Estableix el RANG del context de seguretat de la\n" " destinació.\n" -#: src/chcon.c:373 +#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 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\n" +" No tracta «/» de forma especial (per defecte).\n" +" --preserve-root Falla en operar recursivament sobre «/».\n" + +#: src/chcon.c:379 msgid "" " --reference=RFILE use RFILE's security context rather than " "specifying\n" @@ -1318,16 +1346,16 @@ msgstr "" "lloc\n" " del valor especificat de CONTEXT.\n" -#: src/chcon.c:377 src/chgrp.c:140 src/chown.c:118 +#: 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 recursivament sobre fitxers i directoris.\n" -#: src/chcon.c:380 +#: src/chcon.c:386 msgid " -v, --verbose output a diagnostic for every file processed\n" msgstr " -v, --verbose Mostra un missatge per cada fitxer processat.\n" -#: src/chcon.c:383 src/chgrp.c:143 src/chown.c:121 +#: src/chcon.c:389 src/chgrp.c:143 src/chown.c:121 msgid "" "\n" "The following options modify how a hierarchy is traversed when the -R\n" @@ -1355,38 +1383,38 @@ msgstr "" "\n" # -H i -L es reemplacen però no són incompatibles. ivb -#: src/chcon.c:512 src/chgrp.c:264 src/chown.c:267 +#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267 #, c-format msgid "-R --dereference requires either -H or -L" msgstr "«-R --dereference» necessita «-H» o «-L»" -#: src/chcon.c:518 +#: src/chcon.c:524 #, c-format msgid "-R -h requires -P" msgstr "«-R -h» necessita «-P»" # Usa quote(). ivb -#: src/chcon.c:533 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282 -#: src/comm.c:429 src/csplit.c:1371 src/join.c:1149 src/link.c:79 -#: src/mknod.c:148 src/setuidgid.c:139 src/tr.c:1785 +#: 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 #, c-format msgid "missing operand after %s" msgstr "manca un operand després de %s" -#: src/chcon.c:556 src/runcon.c:247 +#: src/chcon.c:562 src/runcon.c:251 #, c-format msgid "invalid context: %s" msgstr "el context no és vàlid: %s" -#: src/chcon.c:563 +#: src/chcon.c:569 #, 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:572 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:433 src/cp.c:493 -#: src/mv.c:96 src/pwd.c:273 src/rm.c:324 src/touch.c:351 +#: 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 #, c-format msgid "failed to get attributes of %s" msgstr "no s’han pogut obtenir els atributs de %s" @@ -1437,16 +1465,6 @@ msgstr "" " Disponible només en sistemes on es puga canviar el\n" " propietari d’un enllaç simbòlic.\n" -#: src/chgrp.c:132 src/chmod.c:387 src/chown.c:110 -#, fuzzy -msgid "" -" --no-preserve-root do not treat '/' specially (the default)\n" -" --preserve-root fail to operate recursively on '/'\n" -msgstr "" -" --no-preserve-root\n" -" No tracta «/» de forma especial (per defecte).\n" -" --preserve-root Falla en operar recursivament sobre «/».\n" - #: src/chgrp.c:136 msgid "" " --reference=RFILE use RFILE's group rather than specifying a\n" @@ -1555,13 +1573,12 @@ msgid " -R, --recursive change files and directories recursively\n" msgstr " -R, --recursive Canvia recursivament fitxers i directoris.\n" #: src/chmod.c:399 -#, fuzzy msgid "" "\n" "Each MODE is of the form '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n" msgstr "" "\n" -"Cada MODE té la forma «[ugoa]*([-+=]([rwxXst]*|[ugo]))+».\n" +"Cada MODE té la forma «[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+».\n" #: src/chmod.c:513 #, c-format @@ -1708,7 +1725,6 @@ msgstr "" " dels valors especificats de PROPIETARI:GRUP.\n" #: src/chown.c:136 -#, fuzzy msgid "" "\n" "Owner is unchanged if missing. Group is unchanged if missing, but changed\n" @@ -1748,7 +1764,7 @@ msgid "Roland McGrath" msgstr "Roland McGrath" # Usa quote(). ivb -#: src/chroot.c:97 src/install.c:575 src/setuidgid.c:110 src/setuidgid.c:120 +#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120 #, c-format msgid "invalid group %s" msgstr "el grup %s no és vàlid" @@ -1791,14 +1807,13 @@ msgstr "" " --groups=GRUPS Llista de grups suplementaris, com «g1,g2,…,gN».\n" #: src/chroot.c:149 -#, fuzzy msgid "" "\n" "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n" msgstr "" "\n" -"Si no s’especifica cap ordre s’executa «${SHELL} -i» (per defecte: /bin/" -"sh).\n" +"Si no s’indica cap ordre s’executa «${SHELL} -i» (per defecte «/bin/sh -" +"i»).\n" # No usa quote(). ivb #: src/chroot.c:202 @@ -1822,8 +1837,8 @@ 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:213 src/stdbuf.c:366 -#: src/timeout.c:402 +#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365 +#: src/timeout.c:454 #, c-format msgid "failed to run command %s" msgstr "no s’ha pogut executar l’ordre %s" @@ -1913,7 +1928,6 @@ msgstr "" " Separa les columnes amb la CADENA.\n" #: src/comm.c:133 -#, fuzzy msgid "" "\n" "Note, comparisons honor the rules specified by 'LC_COLLATE'.\n" @@ -1957,24 +1971,27 @@ msgstr "s’han especificat múltiples delimitadors" msgid "empty %s not allowed" msgstr "no es permet un valor buit per a %s" -# Els 3 usen quote(). ivb -#: src/copy.c:168 src/dd.c:1609 src/dd.c:1976 +# 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 #, c-format -msgid "reading %s" -msgstr "s’està llegint %s" +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:426 +#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425 #, c-format msgid "cannot lseek %s" msgstr "ha fallat lseek() sobre %s" -# Els 4 usen quote(). ivb -# En els 4 indica condició d'error. ivb -#: src/copy.c:206 src/dd.c:2039 src/dd.c:2102 +# uniq no usa quote(). ivb +#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151 #, c-format -msgid "writing %s" -msgstr "en escriure %s" +msgid "error writing %s" +msgstr "error en escriure %s" #: src/copy.c:313 #, c-format @@ -2001,7 +2018,7 @@ msgid "clearing permissions for %s" msgstr "en assegurar els permisos de %s" # Els 3 usen quote(). ivb -#: src/copy.c:697 src/copy.c:2470 src/cp.c:331 +#: src/copy.c:697 src/copy.c:2480 src/cp.c:329 #, c-format msgid "failed to preserve ownership for %s" msgstr "no s’ha pogut preservar el propietari de %s" @@ -2019,15 +2036,15 @@ 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:638 src/du.c:901 src/fmt.c:449 src/head.c:847 -#: src/sort.c:4489 src/split.c:1329 src/tail.c:1756 src/wc.c:678 +#: 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 "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:1546 src/dd.c:2114 src/dd.c:2252 -#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:141 +#: 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 #, c-format msgid "cannot fstat %s" msgstr "ha fallat fstat() sobre %s" @@ -2050,16 +2067,16 @@ 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:1574 src/copy.c:1777 src/copy.c:1935 src/ln.c:314 -#: src/remove.c:267 src/remove.c:293 src/remove.c:444 src/remove.c:465 +#: 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 #, 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:1578 src/copy.c:1772 src/copy.c:1940 -#: src/remove.c:418 +#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945 +#: src/remove.c:375 #, c-format msgid "removed %s\n" msgstr "s’ha eliminat %s\n" @@ -2085,18 +2102,17 @@ 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:2531 +#: src/copy.c:1098 src/copy.c:2541 #, c-format msgid "preserving times for %s" msgstr "en preservar les dates de %s" # Els 2 usen quote(). ivb -# En els 2 indica condició d'error. ivb -#: src/copy.c:1170 src/copy.c:1176 src/head.c:855 src/touch.c:175 -#: src/truncate.c:413 -#, c-format -msgid "closing %s" -msgstr "en tancar %s" +#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172 +#: src/truncate.c:417 +#, fuzzy, c-format +msgid "failed to close %s" +msgstr "no s’ha pogut obrir %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 @@ -2107,135 +2123,135 @@ msgstr "en tancar %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:1466 +#: src/copy.c:1471 #, c-format msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? " msgstr "%s: voleu sobreescriure %s, reemplaçant el mode %04lo (%s)? " # Usa quote(). ivb -#: src/copy.c:1473 +#: src/copy.c:1478 #, c-format msgid "%s: overwrite %s? " msgstr "%s: voleu sobreescriure %s? " # Usa quote(). ivb -#: src/copy.c:1542 +#: src/copy.c:1547 #, c-format msgid " (backup: %s)" msgstr " (còpia de seguretat: %s)" -#: src/copy.c:1552 +#: src/copy.c:1557 #, 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:1584 +#: src/copy.c:1589 #, 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:1637 src/copy.c:1689 src/copy.c:2272 src/copy.c:2589 +#: 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:1220 src/truncate.c:365 +#: src/stat.c:1239 src/truncate.c:363 #, c-format msgid "cannot stat %s" msgstr "ha fallat stat() sobre %s" # Usa quote(). ivb -#: src/copy.c:1645 +#: src/copy.c:1650 #, c-format msgid "omitting directory %s" msgstr "es descarta el directori %s" # Usa quote(). ivb -#: src/copy.c:1659 +#: src/copy.c:1664 #, 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:1707 src/ln.c:246 +#: src/copy.c:1712 src/ln.c:246 #, 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:1806 +#: src/copy.c:1811 #, 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:1824 src/ln.c:214 +#: src/copy.c:1829 src/ln.c:214 #, 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:1842 +#: src/copy.c:1847 #, 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:1856 +#: src/copy.c:1861 #, 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:1886 +#: src/copy.c:1891 #, 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:1887 +#: src/copy.c:1892 #, 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:1910 src/ln.c:276 +#: src/copy.c:1915 src/ln.c:276 #, 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:1974 +#: src/copy.c:1979 #, 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:2051 +#: src/copy.c:2056 #, 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:2068 +#: src/copy.c:2073 #, 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:2118 +#: src/copy.c:2123 #, 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:2161 +#: src/copy.c:2166 #, 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:2173 +#: src/copy.c:2178 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" @@ -2243,75 +2259,75 @@ msgstr "" "destinació" # Els 5 usen quote(). ivb -#: src/copy.c:2207 src/install.c:905 src/mkdir.c:189 src/mkfifo.c:114 -#: src/mknod.c:167 +#: 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:2241 +#: src/copy.c:2246 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "no es pot copiar l’enllaç simbòlic cíclic %s" -#: src/copy.c:2350 +#: src/copy.c:2355 #, 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:2357 +#: src/copy.c:2362 #, 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:2406 src/mkfifo.c:133 +#: src/copy.c:2416 src/mkfifo.c:132 #, c-format msgid "cannot create fifo %s" msgstr "no s’ha pogut crear la cua FIFO %s" # Usa quote(). ivb -#: src/copy.c:2415 +#: src/copy.c:2425 #, 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:2426 src/ls.c:3191 src/stat.c:902 +#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921 #, 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:2453 +#: src/copy.c:2463 #, 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:2485 +#: src/copy.c:2495 #, 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:2629 src/ln.c:358 +#: src/copy.c:2644 src/ln.c:358 #, 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:2633 +#: src/copy.c:2648 #, 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:284 +#: src/cp.c:156 src/mv.c:286 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -2323,28 +2339,13 @@ msgstr "" " o bé: %s [OPCIÓ]… -t DIRECTORI ORIGEN…\n" #: src/cp.c:162 -msgid "" -"Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" -"\n" +#, fuzzy +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" -# Agafat més o menys de libc. ivb -#: src/cp.c:166 src/csplit.c:1458 src/cut.c:197 src/df.c:852 src/du.c:268 -#: src/expand.c:112 src/fmt.c:275 src/fold.c:75 src/head.c:115 -#: src/install.c:612 src/kill.c:86 src/ln.c:392 src/ls.c:4726 src/mkdir.c:61 -#: src/mkfifo.c:56 src/mknod.c:58 src/mv.c:294 src/nl.c:191 src/paste.c:445 -#: src/pr.c:2777 src/ptx.c:1825 src/shred.c:153 src/shuf.c:58 src/sort.c:399 -#: src/split.c:211 src/stdbuf.c:95 src/tac.c:142 src/tail.c:268 -#: src/touch.c:226 src/truncate.c:107 src/unexpand.c:122 src/uniq.c:145 -msgid "" -"Mandatory arguments to long options are mandatory for short options too.\n" -msgstr "" -"Els arguments obligatoris per a les opcions llargues també ho són per a les\n" -"opcions curtes corresponents.\n" - -#: src/cp.c:169 +#: src/cp.c:168 msgid "" " -a, --archive same as -dR --preserve=all\n" " --attributes-only don't copy the file data, just the " @@ -2370,12 +2371,14 @@ msgstr "" " recursivament.\n" " -d Equival a «--no-dereference --preserve=links».\n" -#: src/cp.c:178 +#: src/cp.c:177 +#, fuzzy msgid "" " -f, --force if an existing destination file cannot be\n" -" opened, remove it and try again (redundant " -"if\n" -" the -n option is used)\n" +" opened, remove it and try again (this " +"option\n" +" is ignored when the -n option is also " +"used)\n" " -i, --interactive prompt before overwrite (overrides a previous " "-n\n" " option)\n" @@ -2390,7 +2393,7 @@ msgstr "" " -H Segueix els enllaços simbòlics que es troben a " "l’ORIGEN.\n" -#: src/cp.c:188 +#: src/cp.c:186 msgid "" " -l, --link hard link files instead of copying\n" " -L, --dereference always follow symbolic links in SOURCE\n" @@ -2401,7 +2404,7 @@ msgstr "" "a\n" " l’ORIGEN.\n" -#: src/cp.c:192 +#: src/cp.c:190 msgid "" " -n, --no-clobber do not overwrite an existing file (overrides\n" " a previous -i option)\n" @@ -2413,7 +2416,7 @@ msgstr "" "troben a\n" " l’ORIGEN.\n" -#: src/cp.c:197 +#: src/cp.c:195 msgid "" " -p same as --preserve=mode,ownership,timestamps\n" " --preserve[=ATTR_LIST] preserve the specified attributes (default:\n" @@ -2430,7 +2433,7 @@ msgstr "" " (dates); atributs addicionals: «context», «links»\n" " (enllaços), «all» (tots).\n" -#: src/cp.c:205 +#: src/cp.c:203 msgid "" " --no-preserve=ATTR_LIST don't preserve the specified attributes\n" " --parents use full source file name under DIRECTORY\n" @@ -2440,7 +2443,7 @@ msgstr "" " --parents Crea el camí complet del fitxer origen sota el\n" " directori destinació.\n" -#: src/cp.c:209 +#: src/cp.c:207 msgid "" " -R, -r, --recursive copy directories recursively\n" " --reflink[=WHEN] control clone/CoW copies. See below\n" @@ -2456,7 +2459,7 @@ msgstr "" " Elimina cada fitxer destinació existent abans\n" " d’intentar obrir‐lo (no després, com fa «--force»).\n" -#: src/cp.c:215 +#: src/cp.c:213 msgid "" " --sparse=WHEN control creation of sparse files. See below\n" " --strip-trailing-slashes remove any trailing slashes from each " @@ -2469,7 +2472,7 @@ msgstr "" " Elimina la barra final (si n’hi ha) de cada argument\n" " ORIGEN.\n" -#: src/cp.c:220 +#: src/cp.c:218 msgid "" " -s, --symbolic-link make symbolic links instead of copying\n" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -2486,7 +2489,7 @@ msgstr "" " -T, --no-target-directory\n" " Tracta la DESTINACIÓ com a un fitxer normal.\n" -#: src/cp.c:226 +#: src/cp.c:224 msgid "" " -u, --update copy only when the SOURCE file is newer\n" " than the destination file or when the\n" @@ -2503,7 +2506,7 @@ msgstr "" # «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:235 +#: src/cp.c:233 msgid "" "\n" "By default, sparse SOURCE files are detected by a crude heuristic and the\n" @@ -2536,8 +2539,7 @@ msgstr "" "es\n" "recorrerà a una còpia estàndard.\n" -#: src/cp.c:247 src/install.c:649 src/ln.c:421 src/mv.c:321 -#, fuzzy +#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322 msgid "" "\n" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -2554,7 +2556,7 @@ msgstr "" "VERSION_CONTROL. Es poden emprar aquests valors:\n" "\n" -#: src/cp.c:254 src/install.c:656 src/mv.c:328 +#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329 msgid "" " none, off never make backups (even if --backup is given)\n" " numbered, t make numbered backups\n" @@ -2568,7 +2570,7 @@ msgstr "" " simples en cas contrari.\n" " simple, never Fa còpies de seguretat simples sempre.\n" -#: src/cp.c:260 +#: src/cp.c:258 msgid "" "\n" "As a special case, cp makes a backup of SOURCE when the force and backup\n" @@ -2582,99 +2584,98 @@ msgstr "" "d’un fitxer ordinari existent.\n" # Usa quote(). ivb -#: src/cp.c:319 +#: src/cp.c:317 #, 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:350 +#: src/cp.c:348 #, 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:477 +#: src/cp.c:475 #, c-format msgid "cannot make directory %s" msgstr "no s’ha pogut crear el directori %s" # Els 4 usen quote(). ivb -#: src/cp.c:526 src/cp.c:545 +#: src/cp.c:524 src/cp.c:543 #, c-format msgid "%s exists but is not a directory" msgstr "%s existeix però no és un directori" -# Els 5 usen quote(). ivb -# Indica condició d'error. ivb -#: src/cp.c:572 src/cp.c:1068 src/install.c:401 src/install.c:844 src/ln.c:123 -#: src/ln.c:181 src/ln.c:202 src/ln.c:516 src/mv.c:152 src/mv.c:399 -#, c-format -msgid "accessing %s" -msgstr "en accedir a %s" +# 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 +msgid "failed to access %s" +msgstr "no s’ha pogut obrir %s" -#: src/cp.c:592 src/install.c:914 src/ln.c:546 src/mv.c:432 src/shred.c:1182 -#: src/touch.c:433 src/truncate.c:356 +#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181 +#: 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:594 src/install.c:916 src/ln.c:560 src/mv.c:434 +#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436 #, c-format msgid "missing destination file operand after %s" msgstr "manca un operand fitxer destinació després de %s" -#: src/cp.c:603 src/install.c:925 src/mv.c:443 +#: src/cp.c:601 src/install.c:926 src/mv.c:445 #, 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:619 src/cp.c:1070 src/install.c:403 src/install.c:846 -#: src/install.c:938 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:401 -#: src/mv.c:457 +#: 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 #, c-format msgid "target %s is not a directory" msgstr "la destinació %s no és un directori" -#: src/cp.c:730 +#: src/cp.c:728 #, 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:1063 src/install.c:839 src/ln.c:511 src/mv.c:394 +#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395 #, c-format msgid "multiple target directories specified" msgstr "s’han especificat múltiples directoris destinació" -#: src/cp.c:1108 +#: src/cp.c:1110 #, 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:1115 src/mv.c:464 +#: src/cp.c:1117 src/mv.c:466 #, 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:1121 +#: src/cp.c:1123 #, c-format msgid "--reflink can be used only with --sparse=auto" msgstr "«--reflink» només es pot emprar amb «--sparse=auto»" -#: src/cp.c:1129 src/install.c:899 src/ln.c:582 src/mv.c:472 +#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474 msgid "backup type" msgstr "tipus de còpia de seguretat" -#: src/cp.c:1154 +#: src/cp.c:1156 #, 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:1160 +#: src/cp.c:1162 #, c-format msgid "cannot preserve extended attributes, cp is built without xattr support" msgstr "" @@ -2686,137 +2687,136 @@ msgstr "" msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:529 +#: src/csplit.c:531 #, c-format msgid "input disappeared" msgstr "l’entrada ha desaparegut" -#: src/csplit.c:658 src/csplit.c:669 +#: src/csplit.c:660 src/csplit.c:671 #, 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:698 +#: src/csplit.c:700 #, 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:701 src/csplit.c:750 +#: src/csplit.c:703 src/csplit.c:752 #, c-format msgid " on repetition %s\n" msgstr " a la %sa repetició\n" # Usa quote(). ivb -#: src/csplit.c:744 +#: src/csplit.c:746 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: no s’ha trobat cap coincidència" -#: src/csplit.c:808 src/csplit.c:848 src/nl.c:359 src/tac.c:274 +#: src/csplit.c:810 src/csplit.c:850 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:981 +#: src/csplit.c:983 #, c-format msgid "write error for %s" msgstr "error en escriure %s" -#: src/csplit.c:1057 +#: src/csplit.c:1059 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: s’esperava un número enter després del delimitador" -#: src/csplit.c:1073 -#, fuzzy, c-format +#: src/csplit.c:1075 +#, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: cal «}» al nombre de repeticions" -#: src/csplit.c:1083 -#, fuzzy, c-format +#: src/csplit.c:1085 +#, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: cal especificar un número enter entre «{» i «}»" -#: src/csplit.c:1110 -#, fuzzy, c-format +#: src/csplit.c:1112 +#, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: manca el delimitador «%c» de tancament" -#: src/csplit.c:1127 +#: src/csplit.c:1129 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: l’expressió regular no és vàlida: %s" -#: src/csplit.c:1160 +#: src/csplit.c:1162 #, c-format msgid "%s: invalid pattern" msgstr "%s: el patró no és vàlid" -#: src/csplit.c:1163 +#: src/csplit.c:1165 #, 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:1169 +#: src/csplit.c:1171 #, 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:1175 +#: src/csplit.c:1177 #, 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:1253 +#: src/csplit.c:1255 #, c-format msgid "missing conversion specifier in suffix" msgstr "manca l’especificació de conversió al sufix" -#: src/csplit.c:1259 +#: src/csplit.c:1261 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "l’especificació de conversió al sufix no és vàlida: %c" -#: src/csplit.c:1262 +#: src/csplit.c:1264 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "l’especificació de conversió al sufix no és vàlida: \\%.3o" -#: src/csplit.c:1267 +#: src/csplit.c:1269 #, 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:1284 +#: src/csplit.c:1286 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "sobren especificacions de conversió «%%» al sufix" -#: src/csplit.c:1298 +#: src/csplit.c:1300 #, c-format msgid "missing %% conversion specification in suffix" msgstr "manca l’especificació de conversió «%%» al sufix" -#: src/csplit.c:1345 +#: src/csplit.c:1347 #, c-format msgid "%s: invalid number" msgstr "%s: el número no és vàlid" -#: src/csplit.c:1449 +#: src/csplit.c:1451 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Forma d’ús: %s [OPCIÓ]… FITXER PATRÓ…\n" -#: src/csplit.c:1453 +#: src/csplit.c:1455 #, 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" -"\n" msgstr "" "Divideix el FITXER en trossos separats pels patrons (PATRÓ) indicats, i " "escriu\n" @@ -2825,8 +2825,8 @@ msgstr "" "la mida en octets de cadascun d’ells.\n" "\n" -#: src/csplit.c:1461 -#, fuzzy, c-format +#: src/csplit.c:1462 +#, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" " -f, --prefix=PREFIX use PREFIX instead of 'xx'\n" @@ -2837,7 +2837,7 @@ 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:1466 +#: src/csplit.c:1467 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 +2849,7 @@ msgstr "" " -z, --elide-empty-files\n" " Elimina els fitxers resultants que estan buits.\n" -#: src/csplit.c:1473 +#: src/csplit.c:1474 msgid "" "\n" "Read standard input if FILE is -. Each PATTERN may be:\n" @@ -2857,8 +2857,7 @@ msgstr "" "\n" "Si FITXER és «-», llegeix l’entrada estàndard. Cada PATRÓ pot ser:\n" -#: src/csplit.c:1477 -#, fuzzy +#: src/csplit.c:1478 msgid "" "\n" " INTEGER copy up to but not including specified line number\n" @@ -2881,7 +2880,7 @@ msgstr "" " {*} Repeteix el patró anterior tants cops com sigui " "possible.\n" "\n" -"Un desplaçament de línia (DESPL) és un «+» o «-» seguit d’un número enter\n" +"Un desplaçament de línia (DESPL) és un «+» o «-» seguit per un número enter\n" "positiu.\n" #. This is a proper name. See the gettext manual, section Names. @@ -2889,7 +2888,7 @@ msgstr "" msgid "David M. Ihnat" msgstr "David M. Ihnat" -#: src/cut.c:64 +#: 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" @@ -2899,15 +2898,14 @@ msgid "Usage: %s OPTION... [FILE]...\n" msgstr "Forma d’ús: %s OPCIÓ… [FITXER]…\n" #: src/cut.c:193 -msgid "" -"Print selected parts of lines from each FILE to standard output.\n" -"\n" +#, fuzzy +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:200 +#: src/cut.c:199 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2919,7 +2917,7 @@ msgstr "" " -d, --delimiter=DELIM Empra DELIM en lloc de la tabulació com a\n" " delimitador de camp.\n" -#: src/cut.c:205 +#: src/cut.c:204 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2933,7 +2931,7 @@ msgstr "" " que s’especifique l’opció «-s».\n" " -n (No es té en compte.)\n" -#: src/cut.c:211 +#: src/cut.c:210 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" @@ -2941,7 +2939,7 @@ msgstr "" " --complement Complementa el conjunt d’octets, caràcters o camps\n" " escollits.\n" -#: src/cut.c:215 +#: src/cut.c:214 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2954,7 +2952,7 @@ msgstr "" " Empra la CADENA com a delimitador de sortida; per\n" " defecte s’utilitza el delimitador d’entrada.\n" -#: src/cut.c:222 +#: src/cut.c:221 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2969,7 +2967,7 @@ msgstr "" "una\n" "sola volta, exactament.\n" -#: src/cut.c:228 +#: src/cut.c:227 msgid "" "Each range is one of:\n" "\n" @@ -2989,61 +2987,63 @@ msgstr "" "\n" "Sense FITXER, o quan FITXER és «-», llegeix l’entrada estàndard.\n" -#: src/cut.c:368 src/cut.c:489 -msgid "invalid byte or field list" +#: src/cut.c:367 src/cut.c:493 +#, fuzzy +msgid "invalid byte, character or field list" msgstr "la llista d’octets o camps no és vàlida" -#: src/cut.c:385 +#: src/cut.c:387 msgid "invalid range with no endpoint: -" msgstr "l’interval sense punt final no és vàlid: -" -#: src/cut.c:399 +#: src/cut.c:403 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:478 +#: src/cut.c:482 #, 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:481 +#: src/cut.c:485 #, c-format msgid "field number %s is too large" msgstr "el número de camp %s és massa gran" -#: src/cut.c:789 src/cut.c:797 +#: src/cut.c:795 src/cut.c:803 msgid "only one type of list may be specified" msgstr "només es pot especificar un únic tipus de llista" -#: src/cut.c:806 +#: src/cut.c:812 src/numfmt.c:1408 +#, c-format msgid "the delimiter must be a single character" msgstr "el delimitador ha de ser un únic caràcter" -#: src/cut.c:841 +#: src/cut.c:847 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:844 +#: src/cut.c:850 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:848 +#: src/cut.c:854 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:864 +#: src/cut.c:870 msgid "missing list of fields" msgstr "manca la llista de camps" -#: src/cut.c:866 +#: src/cut.c:872 msgid "missing list of positions" msgstr "manca la llista de posicions" @@ -3058,15 +3058,17 @@ msgstr "" "Forma d’ús: %s [OPCIÓ]… [+FORMAT]\n" " o bé: %s [-u|--utc|--universal] [MMDDhhmm[[CC]AA][.ss]]\n" +#: src/date.c:128 +msgid "Display the current time in the given FORMAT, or set the system date.\n" +msgstr "" + # 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:128 +#: src/date.c:134 #, 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" " -I[TIMESPEC], --iso-8601[=TIMESPEC] output date/time in ISO 8601 format.\n" @@ -3092,7 +3094,7 @@ msgstr "" " (nanosegons).\n" # «-R» no mostra la data traduïda. ivb -#: src/date.c:138 +#: src/date.c:142 msgid "" " -r, --reference=FILE display the last modification time of FILE\n" " -R, --rfc-2822 output date and time in RFC 2822 format.\n" @@ -3103,8 +3105,7 @@ msgstr "" " -R, --rfc-2822 Mostra la data conforme a l’RFC 2822. Per exemple:\n" " Mon, 07 Aug 2006 12:34:56 -0600\n" -#: src/date.c:143 -#, fuzzy +#: src/date.c:147 msgid "" " --rfc-3339=TIMESPEC output date and time in RFC 3339 format.\n" " TIMESPEC='date', 'seconds', or 'ns' for\n" @@ -3126,7 +3127,7 @@ msgstr "" " Mostra o estableix el Temps Universal Coordinat.\n" # Les descr. han de començar en la 12a. columna (per «%:::z»). ivb -#: src/date.c:154 +#: src/date.c:158 msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" @@ -3140,7 +3141,7 @@ msgstr "" " %% Un «%» literal.\n" " %a Dia de la setmana abreujat del locale, p. ex. «dg».\n" -#: src/date.c:161 +#: src/date.c:165 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -3153,7 +3154,7 @@ msgstr "" " %c Data i hora del locale, p. ex. «dj 03 mar 2005 23:05:25 CET».\n" # No pose «segle» pq no ho és exactament, així llegiran l'explicació. ivb -#: src/date.c:167 +#: src/date.c:171 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -3167,7 +3168,7 @@ msgstr "" " %e Dia del mes reomplit amb blancs, equival a «%_d».\n" # Ja sé que sona estrany però és el que vol dir. info date. ivb -#: src/date.c:173 +#: src/date.c:177 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -3179,7 +3180,7 @@ msgstr "" " %G Any, segons el número ISO de la setmana (vegeu «%V»); a sovint\n" " només és útil amb «%V».\n" -#: src/date.c:178 +#: src/date.c:182 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -3191,7 +3192,7 @@ msgstr "" " %I Hora (01..12).\n" " %j Dia de l’any (001..366).\n" -#: src/date.c:184 +#: src/date.c:188 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -3203,7 +3204,7 @@ msgstr "" " %m Mes (01..12).\n" " %M Minut (00..59).\n" -#: src/date.c:190 +#: src/date.c:194 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -3223,7 +3224,7 @@ msgstr "" " %R Hora i minuts del rellotge de 24 hores, equival a «%H:%M».\n" " %s Segons des de l’1 de gener de 1970 a les 00:00:00 UTC.\n" -#: src/date.c:199 +#: src/date.c:203 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -3235,7 +3236,7 @@ msgstr "" " %T Hora, equival a «%H:%M:%S».\n" " %u Dia de la setmana (1..7), on 1 és el dilluns.\n" -#: src/date.c:205 +#: src/date.c:209 msgid "" " %U week number of year, with Sunday as first day of week (00..53)\n" " %V ISO week number, with Monday as first day of week (01..53)\n" @@ -3252,7 +3253,7 @@ msgstr "" "de\n" " la setmana (00..53).\n" -#: src/date.c:211 +#: src/date.c:215 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -3264,7 +3265,7 @@ msgstr "" " %y Darrers dos dígits de l’any (00..99).\n" " %Y Any.\n" -#: src/date.c:217 +#: src/date.c:221 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -3284,8 +3285,7 @@ msgstr "" "\n" "Per defecte, «date» reomple els camps numèrics amb zeros.\n" -#: src/date.c:226 -#, fuzzy +#: src/date.c:230 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -3303,7 +3303,7 @@ msgstr "" " «^» Empra majúscules, si és possible.\n" " «#» Intercanvia majúscules i minúscules, si és possible.\n" -#: src/date.c:235 +#: src/date.c:239 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -3319,7 +3319,7 @@ msgstr "" "els\n" "símbols numèrics alternatius del locale (si n’hi ha).\n" -#: src/date.c:242 +#: src/date.c:246 msgid "" "\n" "Examples:\n" @@ -3351,39 +3351,39 @@ msgstr "" "\n" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" -#: src/date.c:275 src/dd.c:2193 src/head.c:838 src/md5sum.c:477 -#: src/md5sum.c:798 src/od.c:863 src/od.c:1914 src/pr.c:1176 src/pr.c:1372 -#: src/pr.c:1494 src/stty.c:842 src/tac.c:563 src/tail.c:343 src/tee.c:126 +#: 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 #, c-format msgid "standard input" msgstr "entrada estàndard" # Ambdues usen quote(). ivb -#: src/date.c:303 src/date.c:523 +#: src/date.c:307 src/date.c:527 #, c-format msgid "invalid date %s" msgstr "la data %s no és vàlida" -#: src/date.c:414 src/date.c:448 +#: src/date.c:418 src/date.c:452 #, c-format msgid "multiple output formats specified" msgstr "s’han especificat múltiples formats d’eixida" -#: src/date.c:426 +#: src/date.c:430 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "les opcions per a especificar dates a mostrar són mútuament excloents" -#: src/date.c:433 +#: src/date.c:437 #, c-format msgid "the options to print and set the time may not be used together" msgstr "" "no es poden emprar alhora les opcions per a mostrar i per a establir dates" # Usa quote(). ivb -#: src/date.c:454 -#, fuzzy, c-format +#: src/date.c:458 +#, c-format msgid "" "the argument %s lacks a leading '+';\n" "when using an option to specify date(s), any non-option\n" @@ -3393,23 +3393,23 @@ msgstr "" "especificar dates, cal que qualsevol argument no‐opció siga una cadena de " "format que comence per «+»" -#: src/date.c:531 +#: src/date.c:535 #, c-format msgid "cannot set date" msgstr "no s’ha pogut establir la data" -#: src/date.c:554 src/du.c:360 +#: src/date.c:558 src/du.c:371 #, c-format msgid "time %s is out of range" msgstr "la data %s està fora de rang" #. This is a proper name. See the gettext manual, section Names. -#: src/dd.c:44 src/factor.c:43 src/rm.c:41 src/tail.c:69 src/touch.c:41 +#: 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 "Paul Rubin" -#: src/dd.c:517 +#: src/dd.c:521 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3418,8 +3418,7 @@ msgstr "" "Forma d’ús: %s [OPERAND]…\n" " o bé: %s OPCIÓ\n" -#: src/dd.c:522 -#, fuzzy +#: src/dd.c:526 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -3436,12 +3435,11 @@ msgstr "" " cbs=OCTETS Converteix aquest nombre d’OCTETS alhora.\n" " conv=CONVERSIONS Converteix el fitxer d’acord amb la llista de símbols\n" " separats per comes.\n" -" count=BLOCS Només còpia aquest nombre de BLOCS de l’entrada.\n" +" count=N Només còpia N blocs de l’entrada.\n" " ibs=OCTETS Llegeix com a molt aquest nombre d’OCTETS alhora (per\n" " defecte 512).\n" -#: src/dd.c:531 -#, fuzzy +#: src/dd.c:535 msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -3450,7 +3448,8 @@ msgid "" " oflag=FLAGS write as per the comma separated symbol list\n" " seek=N skip N obs-sized blocks at start of output\n" " skip=N skip N ibs-sized blocks at start of input\n" -" status=noxfer suppress transfer statistics\n" +" status=WHICH WHICH info to suppress outputting to stderr;\n" +" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" msgstr "" " if=FITXER Llegeix del FITXER en lloc de fer‐ho de l’entrada\n" " estàndard.\n" @@ -3462,18 +3461,16 @@ msgstr "" "estàndard.\n" " oflag=SENYALADOR Escriu d’acord amb la llista de símbols separats per\n" " comes.\n" -" seek=BLOCS Salta aquest nombre de BLOCS de mida «obs» al " -"principi\n" -" de l’eixida.\n" -" skip=BLOCS Salta aquest nombre de BLOCS de mida «ibs» al " -"principi\n" -" de l’entrada.\n" -" status=noxfer No mostra l’estadística de la tranferència.\n" +" seek=N Salta N blocs de mida «obs» al principi de l’eixida.\n" +" skip=N Salta N blocs de mida «ibs» al principi de l’entrada.\n" +" status=INFO Controla la informació mostrada en l’eixida estàndard\n" +" d’errors: «noxfer» amaga l’estadística de la\n" +" tranferència, «none» amaga tota la informació.\n" -#: src/dd.c:541 +#: src/dd.c:546 msgid "" "\n" -"BLOCKS and BYTES may be followed by the following multiplicative suffixes:\n" +"N and BYTES may be followed by the following multiplicative suffixes:\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, and so on for T, P, E, Z, Y.\n" "\n" @@ -3481,16 +3478,14 @@ msgid "" "\n" msgstr "" "\n" -"BLOCS i OCTETS poden estar seguits dels sufixos multiplicatius següents: c " -"=1,\n" -"w =2, b =512, kB =1000, K =1024, MB =1000*1000, M =1024*1024, xM =M,\n" +"N i OCTETS poden anar seguits pels sufixos multiplicatius següents:\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, i així per a T, P, E, Z, Y.\n" "\n" "Cada símbol de CONVERSIONS pot ser:\n" "\n" -#: src/dd.c:550 -#, fuzzy +#: src/dd.c:555 msgid "" " ascii from EBCDIC to ASCII\n" " ebcdic from ASCII to EBCDIC\n" @@ -3515,6 +3510,8 @@ msgstr "" " per un caràcter de nova línia.\n" " lcase Transforma les majúscules en minúscules.\n" " ucase Transforma les minúscules en majúscules.\n" +" 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»; " "quan\n" @@ -3522,7 +3519,7 @@ msgstr "" "espais\n" " en lloc de NUL.\n" -#: src/dd.c:563 +#: src/dd.c:568 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3539,7 +3536,8 @@ msgstr "" " finalitzar.\n" " fsync El mateix, però també n’escriu les metadades.\n" -#: src/dd.c:571 +# El més llarg és «count_bytes». ivb +#: src/dd.c:576 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3550,81 +3548,87 @@ msgstr "" "\n" "Cada símbol SENYALADOR pot ser:\n" "\n" -" append Mode de només addició (només té sentit per a l’eixida, es\n" -" suggereix emprar «conv=notrunc»).\n" +" append Mode de només addició (només té sentit per a l’eixida, es\n" +" suggereix emprar «conv=notrunc»).\n" -#: src/dd.c:578 +#: src/dd.c:583 msgid " cio use concurrent I/O for data\n" -msgstr " cio Empra E/S concurrent per a les dades.\n" +msgstr " cio Empra E/S concurrent per a les dades.\n" -#: src/dd.c:580 +#: src/dd.c:585 msgid " direct use direct I/O for data\n" -msgstr " direct Empra E/S directa per a les dades.\n" +msgstr " direct Empra E/S directa per a les dades.\n" -#: src/dd.c:582 +#: src/dd.c:587 msgid " directory fail unless a directory\n" -msgstr " directory Falla si no és un directori.\n" +msgstr " directory Falla si no és un directori.\n" -#: src/dd.c:584 +#: src/dd.c:589 msgid " dsync use synchronized I/O for data\n" -msgstr " dsync Empra E/S sincronitzada per a les dades.\n" +msgstr " dsync Empra E/S sincronitzada per a les dades.\n" -#: src/dd.c:586 +#: src/dd.c:591 msgid " sync likewise, but also for metadata\n" -msgstr " sync El mateix, però també per a les metadades.\n" +msgstr " sync El mateix, però també per a les metadades.\n" -#: src/dd.c:587 +#: src/dd.c:592 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr "" -" fullblock Acumula blocs d’entrada sencers (símbol per a «iflag»).\n" +" fullblock Acumula blocs d’entrada sencers (símbol per a «iflag»).\n" -#: src/dd.c:590 +#: src/dd.c:595 msgid " nonblock use non-blocking I/O\n" -msgstr " nonblock Empra E/S no blocadora.\n" +msgstr " nonblock Empra E/S no blocadora.\n" -#: src/dd.c:592 +#: src/dd.c:597 msgid " noatime do not update access time\n" -msgstr " noatime No actualitza la data d’accés.\n" +msgstr " noatime No actualitza la data d’accés.\n" -#: src/dd.c:595 +#: src/dd.c:600 msgid " nocache discard cached data\n" -msgstr " nocache Descarta les dades de la memòria cau.\n" +msgstr " nocache Descarta les dades de la memòria cau.\n" -#: src/dd.c:598 +#: src/dd.c:603 msgid " noctty do not assign controlling terminal from file\n" -msgstr " noctty No assigna el fitxer com a terminal de control.\n" +msgstr " noctty No assigna el fitxer com a terminal de control.\n" -#: src/dd.c:601 +#: src/dd.c:606 msgid " nofollow do not follow symlinks\n" -msgstr " nofollow No segueix els enllaços simbòlics.\n" +msgstr " nofollow No segueix els enllaços simbòlics.\n" -#: src/dd.c:603 +#: src/dd.c:608 msgid " nolinks fail if multiply-linked\n" -msgstr " nolinks Falla si el fitxer té més d’un enllaç.\n" +msgstr " nolinks Falla si el fitxer té més d’un enllaç.\n" -#: src/dd.c:605 +#: src/dd.c:610 msgid " binary use binary I/O for data\n" -msgstr " binary Empra E/S binària per a les dades.\n" +msgstr " binary Empra E/S binària per a les dades.\n" -#: src/dd.c:607 +#: src/dd.c:612 msgid " text use text I/O for data\n" -msgstr " text Empra E/S textual per a les dades.\n" +msgstr " text Empra E/S textual per a les dades.\n" -#: src/dd.c:609 +#: src/dd.c:614 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:612 +#: src/dd.c:617 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:615 +#: src/dd.c:620 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:620 -#, fuzzy, c-format +#: src/dd.c:625 +#, c-format msgid "" "\n" "Sending a %s signal to a running 'dd' process makes it\n" @@ -3653,7 +3657,7 @@ msgstr "" "Les opcions són:\n" "\n" -#: src/dd.c:676 +#: src/dd.c:683 #, c-format msgid "" "%<PRIuMAX>+%<PRIuMAX> records in\n" @@ -3662,14 +3666,14 @@ msgstr "" "%<PRIuMAX>+%<PRIuMAX> registres llegits\n" "%<PRIuMAX>+%<PRIuMAX> registres escrits\n" -#: src/dd.c:682 +#: src/dd.c:689 #, 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:694 +#: src/dd.c:701 #, c-format msgid "%<PRIuMAX> byte (%s) copied" msgid_plural "%<PRIuMAX> bytes (%s) copied" @@ -3677,7 +3681,7 @@ msgstr[0] "%<PRIuMAX> octet (%s) copiat" msgstr[1] "%<PRIuMAX> octets (%s) copiats" # Es refereix a octets per segon. ivb -#: src/dd.c:712 +#: src/dd.c:720 msgid "Infinity B" msgstr "Infinits B" @@ -3691,96 +3695,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:725 +#: src/dd.c:733 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g s, %s/s\n" # Usa quote(). ivb # Condició d'error. ivb -#: src/dd.c:804 +#: src/dd.c:812 #, 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:811 +#: src/dd.c:819 #, 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:1014 +#: src/dd.c:1022 #, 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:1085 src/dd.c:1934 +#: src/dd.c:1093 src/dd.c:1942 #, c-format msgid "writing to %s" msgstr "en escriure %s" # Usa quote(). ivb -#: src/dd.c:1199 src/dd.c:1253 +#: src/dd.c:1207 src/dd.c:1261 #, c-format msgid "unrecognized operand %s" msgstr "l’operand %s no és reconegut" -#: src/dd.c:1210 +#: src/dd.c:1218 msgid "invalid conversion" msgstr "la conversió no és vàlida" -#: src/dd.c:1213 src/dd.c:1289 +#: src/dd.c:1221 src/dd.c:1297 msgid "invalid input flag" msgstr "el senyalador d’entrada no és vàlid" -#: src/dd.c:1216 src/dd.c:1283 src/dd.c:1295 +#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303 msgid "invalid output flag" msgstr "el senyalador d’eixida no és vàlid" -#: src/dd.c:1219 +#: src/dd.c:1227 msgid "invalid status flag" msgstr "el senyalador d’estat no és vàlid" # Usa quote(). ivb -#: src/dd.c:1258 src/truncate.c:312 +#: src/dd.c:1266 src/truncate.c:310 #, c-format msgid "invalid number %s" msgstr "el número %s no és vàlid" -#: src/dd.c:1340 +#: src/dd.c:1348 #, 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:1342 +#: src/dd.c:1350 #, 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:1344 +#: src/dd.c:1352 #, 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:1346 +#: src/dd.c:1354 #, 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:1349 +#: src/dd.c:1357 #, c-format msgid "cannot combine direct and nocache" msgstr "no es poden combinar «direct» i «nocache»" -#: src/dd.c:1506 +#: src/dd.c:1514 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3789,84 +3793,83 @@ 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:1593 +#: src/dd.c:1601 #, c-format msgid "%s: cannot skip" msgstr "%s: no s’ha pogut saltar" -#: src/dd.c:1595 src/dd.c:1614 src/dd.c:1675 +#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683 #, c-format msgid "%s: cannot seek" msgstr "%s: no s’ha pogut desplaçar" # Usa quote(). ivb -#: src/dd.c:1655 +#: src/dd.c:1663 #, c-format msgid "offset overflow while reading file %s" msgstr "s’ha desbordat el desplaçament en llegir el fitxer %s" -#: src/dd.c:1667 +#: src/dd.c:1675 #, 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:1671 +#: src/dd.c:1679 #, 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:1814 +#: src/dd.c:1822 #, 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:1867 +#: 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:1881 +#: 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:1914 +#: src/dd.c:1922 #, 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:2125 src/dd.c:2258 -#, c-format -msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" +#: src/dd.c:2133 +#, fuzzy, 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" # Usa quote. ivb -#: src/dd.c:2138 +#: src/dd.c:2146 #, c-format msgid "fdatasync failed for %s" msgstr "ha fallat fdatasync() sobre %s" # Usa quote(). ivb -#: src/dd.c:2148 +#: src/dd.c:2156 #, c-format msgid "fsync failed for %s" msgstr "ha fallat fsync() sobre %s" -# Usa quote(). ivb -# Condició d'error. ivb -#: src/dd.c:2199 src/dd.c:2228 +# Els 2 usen quote(). ivb +#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165 #, c-format -msgid "opening %s" -msgstr "en obrir %s" +msgid "failed to open %s" +msgstr "no s’ha pogut obrir %s" -#: src/dd.c:2237 +#: src/dd.c:2246 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) " @@ -3876,78 +3879,104 @@ msgstr "" "%<PRIuMAX> blocs de %lu octets" # Usa quote(). ivb -#: src/dd.c:2274 src/dd.c:2280 +# Condició d'error. ivb +#: src/dd.c:2267 +#, 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 #, 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:54 src/expr.c:153 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:39 src/sleep.c:35 src/sort.c:66 +#: 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 msgid "Paul Eggert" msgstr "Paul Eggert" -#: src/df.c:140 +#: src/df.c:172 msgid "Filesystem" msgstr "S. fitxers" -#: src/df.c:141 +#: src/df.c:175 msgid "Type" msgstr "Tipus" -#: src/df.c:142 +# Per a les capçaleres va al davant, en majúscula. ivb +#: src/df.c:178 src/df.c:542 msgid "blocks" -msgstr "blocs" - -#: src/df.c:142 -msgid "Inodes" -msgstr "Nodes-i" - -#: src/df.c:142 -msgid "Size" -msgstr "Mida" +msgstr "Blocs" -#: src/df.c:143 +#: src/df.c:181 msgid "Used" msgstr "En ús" -#: src/df.c:143 -msgid "IUsed" -msgstr "En ús" - -#: src/df.c:144 +#: src/df.c:184 msgid "Available" msgstr "Lliures" -#: src/df.c:144 -msgid "IFree" -msgstr "Lliures" - -#: src/df.c:144 -msgid "Avail" -msgstr "Lliure" - -#: src/df.c:145 +#: src/df.c:187 msgid "Use%" msgstr "%Ús" -#: src/df.c:145 +#: src/df.c:190 +msgid "Inodes" +msgstr "Nodes-i" + +#: src/df.c:193 +msgid "IUsed" +msgstr "En ús" + +#: src/df.c:196 +msgid "IFree" +msgstr "Lliures" + +#: src/df.c:199 msgid "IUse%" msgstr "%Ús" -#: src/df.c:145 +#: src/df.c:202 +msgid "Mounted on" +msgstr "Muntat a" + +#: src/df.c:383 +#, c-format +msgid "option --output: field '%s' unknown" +msgstr "" + +# 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:410 src/df.c:449 +msgid "Size" +msgstr "Mida" + +#: src/df.c:414 src/df.c:451 +msgid "Avail" +msgstr "Lliure" + +#: src/df.c:474 msgid "Capacity" msgstr "Cabuda" -#: src/df.c:146 -msgid "Mounted on" -msgstr "Muntat a" +#. 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 +#, c-format +msgid "%s-%s" +msgstr "%2$s de %1$s" -#: src/df.c:847 +#: src/df.c:1210 +#, fuzzy msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" -"\n" msgstr "" "Mostra informació sobre el sistema de fitxers on resideix cada FITXER, o " "(per\n" @@ -3955,8 +3984,7 @@ msgstr "" "\n" # Crec que «virtual» capta millor el significat de «dummy». ivb -#: src/df.c:855 -#, fuzzy +#: src/df.c:1217 msgid "" " -a, --all include dummy file systems\n" " -B, --block-size=SIZE scale sizes by SIZE before printing them. E.g.,\n" @@ -3977,7 +4005,7 @@ msgstr "" " humans (per exemple: 1K 234M 2G).\n" " -H, --si El mateix, però empra potències de 1000, no de 1024.\n" -#: src/df.c:865 +#: src/df.c:1227 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3992,8 +4020,12 @@ msgstr "" " --no-sync No invoca sync() abans d’obtenir la informació sobre\n" " l’ús (per defecte).\n" -#: src/df.c:872 +#: src/df.c:1234 +#, fuzzy msgid "" +" --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" +" or print all fields if FIELD_LIST is " +"omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" " -t, --type=TYPE limit listing to file systems of type TYPE\n" @@ -4013,21 +4045,42 @@ msgstr "" " del TIPUS especificat.\n" " -v (No es té en compte.)\n" +#: src/df.c:1248 +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" +msgstr "" + +#: src/df.c:1285 +#, fuzzy, 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" + # Usa quote(). ivb -#: src/df.c:1027 +#: src/df.c:1442 #, 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:1075 +#: src/df.c:1500 msgid "Warning: " msgstr "avís: " -#: src/df.c:1077 src/stat.c:795 +#: src/df.c:1502 src/stat.c:814 msgid "cannot read table of mounted file systems" msgstr "no s’ha pogut llegir la taula de sistemes de fitxers muntats" -#: src/df.c:1107 +#: src/df.c:1539 #, c-format msgid "no file systems processed" msgstr "no s’ha processat cap sistema de fitxers" @@ -4062,7 +4115,6 @@ msgstr "" " -p, --print-database Mostra els valors per defecte.\n" #: src/dircolors.c:108 -#, fuzzy msgid "" "\n" "If FILE is specified, read it to determine which colors to use for which\n" @@ -4114,34 +4166,31 @@ msgstr "" "d’intèrpret" #: src/dirname.c:50 -#, fuzzy, c-format +#, c-format msgid "Usage: %s [OPTION] NAME...\n" -msgstr "Forma d’ús: %s [OPCIÓ]… NOM…\n" +msgstr "Forma d’ús: %s [OPCIÓ] NOM…\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 "" -"Mostra el NOM eliminant‐ne l’últim component no buit que es trobe al " +"Mostra cada NOM eliminant‐ne l’últim component no buit que es trobe al " "darrere\n" "d’una barra «/», així com les barres finals; si el NOM no conté cap barra,\n" "mostra «.» (indicant el directori actual).\n" "\n" #: src/dirname.c:59 -#, fuzzy msgid " -z, --zero separate output with NUL rather than newline\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" +" -z, --zero Escriu un octet 0 en lloc de cada caràcter de nova\n" +" línia per a separar els resultats.\n" #: src/dirname.c:64 -#, fuzzy, c-format +#, c-format msgid "" "\n" "Examples:\n" @@ -4152,10 +4201,11 @@ msgstr "" "\n" "Exemples:\n" "\n" -" %s /usr/bin/ Mostra «/usr».\n" -" %s stdio.h Mostra «.».\n" +" %s /usr/bin/ -> «/usr»\n" +" %s dir1/str dir2/str -> «dir1» seguit per «dir2»\n" +" %s stdio.h -> «.»\n" -#: src/du.c:260 src/sort.c:390 src/wc.c:112 +#: src/du.c:270 src/sort.c:394 src/wc.c:112 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -4164,18 +4214,19 @@ msgstr "" "Forma d’ús: %s [OPCIÓ]… [FITXER]…\n" " o bé: %s [OPCIÓ]… --files0-from=FITXER\n" -#: src/du.c:264 -msgid "" -"Summarize disk usage of each FILE, recursively for directories.\n" -"\n" +#: src/du.c:274 +#, fuzzy +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:271 +#: src/du.c:280 #, fuzzy msgid "" +" -0, --null end each output line with 0 byte rather than " +"newline\n" " -a, --all write counts for all files, not just directories\n" " --apparent-size print apparent sizes, rather than disk usage; " "although\n" @@ -4192,7 +4243,7 @@ msgstr "" " pels forats dels fitxers dispersos, per fragmentació\n" " interna, blocs indirectes…\n" -#: src/du.c:279 +#: src/du.c:289 #, fuzzy msgid "" " -B, --block-size=SIZE scale sizes by SIZE before printing them. E.g.,\n" @@ -4202,6 +4253,11 @@ msgid "" " -c, --total produce a grand total\n" " -D, --dereference-args dereference only symlinks that are listed on the\n" " command line\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 "" " -B, --block-size=MIDA Escala les mides a la MIDA donada abans de\n" " mostrar‐les. Per exemple, «-BM» mostra les mides en\n" @@ -4214,7 +4270,8 @@ msgstr "" "línia\n" " d’ordres.\n" -#: src/du.c:288 +#: src/du.c:302 +#, fuzzy msgid "" " --files0-from=F summarize disk usage of the NUL-terminated file\n" " names specified in file F;\n" @@ -4222,7 +4279,6 @@ msgid "" " -H equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" --si like -h, but use powers of 1000 not 1024\n" msgstr "" " --files0-from=FITXER\n" " Resumeix l’ús de disc dels fitxers els noms dels " @@ -4236,9 +4292,11 @@ msgstr "" " humans (per exemple: 1K 234M 2G).\n" " --si Com «-h», però empra potències de 1000, no de 1024.\n" -#: src/du.c:297 +#: src/du.c:310 +#, fuzzy 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 "" @@ -4247,14 +4305,13 @@ msgstr "" " forts.\n" " -m Equival a «--block-size=1M».\n" -#: src/du.c:302 +#: src/du.c:316 +#, fuzzy msgid "" -" -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " "default)\n" -" -0, --null end each output line with 0 byte rather than " -"newline\n" " -S, --separate-dirs 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" @@ -4265,35 +4322,13 @@ msgstr "" " -S, --separate-dirs No inclou la mida dels subdirectoris.\n" " -s, --summarize Només mostra un total per cada argument.\n" -#: src/du.c:309 -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 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" - # «du» significa «disc usage», què OO tenen a veure aquestes opcions? ivb # More creeping featurism. ivb -#: src/du.c:318 +#: src/du.c:322 #, fuzzy msgid "" +" -t, --threshold=SIZE exclude entries smaller than SIZE if positive,\n" +" or entries greater than SIZE if negative\n" " --time show time of the last modification of any file in " "the\n" " directory, or any of its subdirectories\n" @@ -4315,74 +4350,83 @@ msgstr "" " long-iso, iso, +FORMAT; FORMAT s’interpreta com en\n" " «date».\n" +#: src/du.c:333 +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 "" + # Es refereix a octets per segon. ivb -#: src/du.c:375 -#, fuzzy +#: src/du.c:386 msgid "Infinity" -msgstr "Infinits B" +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:600 +#: src/du.c:624 #, c-format msgid "fts_read failed: %s" msgstr "ha fallat fts_read(): %s" # Usa quote(). ivb -#: src/du.c:724 +#: src/du.c:780 #, c-format msgid "invalid maximum depth %s" msgstr "la profunditat màxima %s no és vàlida" -#: src/du.c:817 -#, c-format -msgid "cannot both summarize and show all entries" -msgstr "no es pot resumir les entrades i mostrar‐ne els continguts alhora" +# La segona usa quote(). ivb +#: src/du.c:809 +#, fuzzy, c-format +msgid "invalid --threshold argument '-0'" +msgstr "l’argument %2$s de l’opció «--%1$s» no és vàlid" + +#: src/du.c:887 +#, 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:824 +#: src/du.c:894 #, 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:830 +#: src/du.c:900 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "avís: resumir no és compatible amb «--max-depth=%lu»" # Açò s'imprimeix després d'un missatge d'error. ivb -#: src/du.c:896 src/sort.c:4479 src/wc.c:668 +#: src/du.c:966 src/sort.c:4533 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:949 src/md5sum.c:587 src/od.c:903 src/tac.c:239 src/tac.c:350 -#: src/tac.c:506 src/tac.c:586 src/wc.c:733 +#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 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:963 src/sort.c:4508 src/wc.c:747 +#: src/du.c:1040 src/sort.c:4562 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:980 src/du.c:988 src/wc.c:760 src/wc.c:768 +#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768 msgid "invalid zero-length file name" msgstr "el nom buit de fitxer no és vàlid" -# uniq no usa quote(). ivb -#: src/du.c:1007 src/head.c:149 src/head.c:262 src/head.c:334 src/head.c:538 -#: src/head.c:620 src/head.c:692 src/head.c:750 src/head.c:774 src/tail.c:412 -#: src/tail.c:500 src/tail.c:549 src/tail.c:642 src/tail.c:770 src/tail.c:818 -#: src/tail.c:855 src/tail.c:1782 src/tail.c:1812 src/uniq.c:395 -#, c-format -msgid "error reading %s" -msgstr "error en llegir %s" - # Els 3 fan el mateix ús. ivb -#: src/du.c:1010 src/ls.c:2649 src/wc.c:791 +#: src/du.c:1088 src/ls.c:2649 src/wc.c:791 msgid "total" msgstr "total" @@ -4492,9 +4536,12 @@ msgid "Usage: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n" 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 "" + +#: src/env.c:61 +#, fuzzy msgid "" -"Set each NAME to VALUE in the environment and run COMMAND.\n" -"\n" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with 0 byte rather than newline\n" " -u, --unset=NAME remove variable from the environment\n" @@ -4508,7 +4555,7 @@ msgstr "" " caràcter de nova línia.\n" " -u, --unset=NOM Elimina la variable NOM de l’entorn.\n" -#: src/env.c:64 +#: src/env.c:68 msgid "" "\n" "A mere - implies -i. If no COMMAND, print the resulting environment.\n" @@ -4518,27 +4565,27 @@ msgstr "" "resultant.\n" # Usa quote(). ivb -#: src/env.c:120 +#: src/env.c:124 #, c-format msgid "cannot unset %s" msgstr "no s’ha pogut eliminar la variable %s" # Usa quote(). ivb -#: src/env.c:131 +#: src/env.c:135 #, c-format msgid "cannot set %s" msgstr "no s’ha pogut establir la variable %s" -#: src/env.c:148 +#: src/env.c:152 #, c-format 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" -"\n" msgstr "" "Converteix els caràcters de tabulació de cada FITXER a espais, i escriu el\n" "resultat a la sortida estàndard. Sense FITXER, o quan FITXER és «-», " @@ -4548,7 +4595,7 @@ msgstr "" # Hau! ivb # L'explicació d'«--initial» vé de la plana info. ivb -#: src/expand.c:115 +#: src/expand.c:114 msgid "" " -i, --initial do not convert tabs after non blanks\n" " -t, --tabs=NUMBER have tabs NUMBER characters apart, not 8\n" @@ -4558,7 +4605,7 @@ msgstr "" " -t, --tabs=NÚMERO Tabula a una distància de NÚMERO caràcters, en lloc\n" " de 8.\n" -#: src/expand.c:119 +#: src/expand.c:118 msgid "" " -t, --tabs=LIST use comma separated list of explicit tab positions\n" msgstr "" @@ -4568,28 +4615,28 @@ msgstr "" # És un enter correcte però massa gran. ivb # Usa quote(). ivb -#: src/expand.c:172 src/unexpand.c:191 +#: src/expand.c:171 src/unexpand.c:190 #, c-format msgid "tab stop is too large %s" msgstr "la distància de tabulació %s és massa gran" # Usa quote(). ivb -#: src/expand.c:180 src/unexpand.c:199 +#: src/expand.c:179 src/unexpand.c:198 #, c-format msgid "tab size contains invalid character(s): %s" msgstr "la distància de tabulació conté caràcters no vàlids: %s" -#: src/expand.c:206 src/unexpand.c:225 +#: src/expand.c:205 src/unexpand.c:224 #, c-format msgid "tab size cannot be 0" msgstr "la distància de tabulació no pot ser 0" -#: src/expand.c:208 src/unexpand.c:227 +#: src/expand.c:207 src/unexpand.c:226 #, c-format msgid "tab sizes must be ascending" msgstr "les distàncies de tabulació han de ser ascendents" -#: src/expand.c:326 src/expand.c:345 src/unexpand.c:374 src/unexpand.c:419 +#: 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 "la línia d’entrada és massa llarga" @@ -4701,7 +4748,6 @@ msgstr "" # El més llarg és «substr CADENA POS LONGITUD». ivb #: src/expr.c:251 -#, fuzzy msgid "" " + TOKEN interpret TOKEN as a string, even if it is a\n" " keyword like 'match' or an operator like '/'\n" @@ -4760,12 +4806,12 @@ msgstr "error al cercador d’expressions regulars" msgid "non-integer argument" msgstr "l’argument no és enter" -#: src/expr.c:793 src/truncate.c:316 +#: src/expr.c:793 src/truncate.c:314 #, c-format msgid "division by zero" msgstr "divisió entre zero" -#: src/expr.c:887 src/sort.c:2029 +#: src/expr.c:887 src/sort.c:2044 #, 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" @@ -4777,29 +4823,34 @@ msgstr "establiu la variable LC_ALL a «C» per a evitar el problema" msgid "the strings compared were %s and %s" msgstr "Les cadenes comparades eren %s i %s." -# És un missatge informatiu. ivb -#: src/factor.c:449 -msgid "using arbitrary-precision arithmetic" -msgstr "s’està emprant l’aritmètica de precisió arbitrària" +#. This is a proper name. See the gettext manual, section Names. +#: src/factor.c:111 +msgid "Niels Moller" +msgstr "Niels Möller" -# És un missatge informatiu. ivb -#: src/factor.c:460 -msgid "using single-precision arithmetic" -msgstr "s’està emprant l’aritmètica de precisió simple" +#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459 +#, 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. " -# És un enter correcte però massa gran. ivb -#: src/factor.c:465 src/od.c:1640 src/od.c:1709 +#: src/factor.c:2092 #, c-format -msgid "%s is too large" -msgstr "%s és massa gran" +msgid "squfof queue overflow" +msgstr "s’ha desbordat la cua d’SQUFOF" # Usa quote(). ivb -#: src/factor.c:469 +#: src/factor.c:2419 #, c-format msgid "%s is not a valid positive integer" msgstr "%s no és un número enter positiu vàlid" -#: src/factor.c:494 +# És un enter correcte però massa gran. ivb +#: src/factor.c:2442 src/od.c:1646 src/od.c:1715 +#, c-format +msgid "%s is too large" +msgstr "%s és massa gran" + +#: src/factor.c:2454 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4808,7 +4859,7 @@ msgstr "" "Forma d’ús: %s [NÚMERO]…\n" " o bé: %s OPCIÓ\n" -#: src/factor.c:499 +#: src/factor.c:2459 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" @@ -4837,20 +4888,20 @@ msgid "cannot stat current directory (now %s)" msgstr "ha fallat stat() sobre el directori actual (ara %s)" #. This is a proper name. See the gettext manual, section Names. -#: src/fmt.c:37 +#: src/fmt.c:38 msgid "Ross Paterson" msgstr "Ross Paterson" -#: src/fmt.c:269 +#: src/fmt.c:270 #, c-format msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n" msgstr "Forma d’ús: %s [-AMPLADA] [OPCIÓ]… [FITXER]…\n" -#: src/fmt.c:270 +#: 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" -"\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" @@ -4873,8 +4924,9 @@ msgstr "" "línies\n" " curtes.\n" -#: src/fmt.c:285 -#, fuzzy, c-format +# FIXME: invalid/untranslatable accidental format specification! ivb +#: src/fmt.c:287 +#, 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" @@ -4889,8 +4941,10 @@ msgstr "" " -w, --width=AMPLADA Indica l’AMPLADA màxima de la línia (per defecte " "75\n" " columnes).\n" +" -g, --goal=AMPLADA Indica l’AMPLADA objectiu (per defecte un 93% ode\n" +" l’amplada).\n" -#: src/fmt.c:357 +#: src/fmt.c:359 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -4900,23 +4954,23 @@ msgstr "" "opció; empreu «-w AMPLADA» al seu lloc" # Usa quote(). ivb -#: src/fmt.c:403 src/fmt.c:414 +#: src/fmt.c:405 src/fmt.c:416 #, c-format 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" -"\n" 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:78 +#: src/fold.c:77 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4927,13 +4981,13 @@ msgstr "" " -w, --width=AMPLADA Indica el nombre de columnes, en lloc de 80.\n" # Usa quote(). ivb -#: src/fold.c:289 src/pr.c:836 +#: src/fold.c:288 src/pr.c:832 #, c-format 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:75 +#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 #: src/truncate.c:37 msgid "Padraig Brady" msgstr "Padraig Brady" @@ -4953,17 +5007,17 @@ msgstr "" "\n" # Usa quote(). ivb -#: src/group-list.c:69 src/id.c:345 src/setuidgid.c:184 +#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184 #, 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:350 +#: src/group-list.c:74 src/id.c:370 #, c-format msgid "failed to get groups for the current process" msgstr "no s’han pogut obtenir els grups del procés actual" -#: src/group-list.c:104 +#: src/group-list.c:114 #, c-format msgid "cannot find name for group ID %lu" msgstr "no s’ha pogut trobar el nom de l’ID de grup %lu" @@ -5006,11 +5060,11 @@ 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" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" "Escriu les 10 primeres línies de cada FITXER a la sortida estàndard. Amb " "més\n" @@ -5019,8 +5073,7 @@ msgstr "" "FITXER, o quan FITXER és «-», llegeix l’entrada estàndard.\n" "\n" -#: src/head.c:118 -#, fuzzy +#: src/head.c:117 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -5037,7 +5090,7 @@ msgstr "" " 10; amb un «-» al davant, escriu totes les línies de\n" " cada fitxer exceptuant‐ne les darreres N.\n" -#: src/head.c:126 +#: src/head.c:125 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -5046,7 +5099,7 @@ msgstr "" " -v, --verbose Sempre escriu les capçaleres amb els noms dels " "fitxers.\n" -#: src/head.c:132 +#: src/head.c:131 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -5059,61 +5112,60 @@ msgstr "" "M 1024*1024, GB 1000*1000*1000, G 1024*1024*1024, i així per a T, P, E, Z, " "Y.\n" -# uniq no usa quote(). ivb -#: src/head.c:152 -#, c-format -msgid "error writing %s" -msgstr "error en escriure %s" - -#: src/head.c:155 +#: src/head.c:154 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: el fitxer ha minvat massa" -#: src/head.c:228 src/head.c:1044 +#: src/head.c:227 src/head.c:1051 #, c-format msgid "%s: number of bytes is too large" msgstr "%s: el nombre d’octets és massa gran" -#: src/head.c:441 +#: 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:613 src/head.c:684 src/tail.c:450 +#: src/head.c:612 src/head.c:691 src/tail.c:449 #, 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:791 +#: src/head.c:798 #, c-format msgid "cannot reposition file pointer for %s" msgstr "no s’ha pogut recoŀlocar el punter del fitxer de %s" -#: src/head.c:878 +#: src/head.c:885 #, 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:879 +#: src/head.c:886 msgid "number of lines" msgstr "el nombre de línies" -#: src/head.c:879 +#: src/head.c:886 msgid "number of bytes" msgstr "el nombre d’octets" -#: src/head.c:886 src/tail.c:1947 +#: src/head.c:893 src/tail.c:1947 msgid "invalid number of lines" msgstr "el nombre de línies no és vàlid" -#: src/head.c:887 src/tail.c:1948 +#: src/head.c:894 src/tail.c:1948 msgid "invalid number of bytes" msgstr "el nombre d’octets no és vàlid" # Per a invocacions com ``head -10x``. ivb -#: src/head.c:974 src/head.c:1032 +#: src/head.c:981 src/head.c:1039 #, c-format msgid "invalid trailing option -- %c" msgstr "l’opció final «%c» no és vàlida" @@ -5237,96 +5289,96 @@ msgstr "no s’ha pogut obtenir el context del procés" msgid "cannot get effective UID" msgstr "no s’ha pogut obtenir l’UID efectiu" -#: src/id.c:289 -#, fuzzy, c-format -msgid "cannot find name for user ID %lu" -msgstr "no s’ha pogut trobar el nom de l’ID d’usuari %lu" +#: src/id.c:311 +#, 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:309 -#, fuzzy, c-format -msgid "uid=%lu" -msgstr "uid=%lu" +#: src/id.c:329 +#, c-format +msgid "uid=%s" +msgstr "uid=%s" -#: src/id.c:314 -#, fuzzy, c-format -msgid " gid=%lu" -msgstr " egid=%lu" +#: src/id.c:334 +#, c-format +msgid " gid=%s" +msgstr " gid=%s" -#: src/id.c:321 -#, fuzzy, c-format -msgid " euid=%lu" -msgstr " egid=%lu" +#: src/id.c:341 +#, c-format +msgid " euid=%s" +msgstr " euid=%s" -#: src/id.c:329 +#: src/id.c:349 #, c-format -msgid " egid=%lu" -msgstr " egid=%lu" +msgid " egid=%s" +msgstr " egid=%s" -#: src/id.c:357 +#: src/id.c:377 msgid " groups=" msgstr " grups=" -#: src/id.c:373 +#: src/id.c:393 #, c-format msgid " context=%s" msgstr " context=%s" # Usa quote() en el 1r. argument, però no en el 2n. ivb -#: src/install.c:372 +#: src/install.c:373 #, 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:413 +#: src/install.c:414 #, c-format msgid "creating directory %s" msgstr "s’està creant el directori %s" # Usa quote(). ivb -#: src/install.c:481 +#: src/install.c:482 #, c-format msgid "cannot change ownership of %s" msgstr "no s’ha pogut canviar el propietari de %s" # Usa quote(). ivb -#: src/install.c:505 +#: src/install.c:506 #, c-format msgid "cannot set time stamps for %s" msgstr "no s’han pogut establir les dates de %s" -#: src/install.c:526 src/split.c:412 src/timeout.c:387 +#: src/install.c:527 src/split.c:426 src/timeout.c:439 #, c-format msgid "fork system call failed" msgstr "ha fallat la crida al sistema fork()" # No usa quote(). ivb -#: src/install.c:530 +#: src/install.c:531 #, c-format msgid "cannot run %s" msgstr "no s’ha pogut executar «%s»" # Usa quote(). ivb # Condició d'error. ivb -#: src/install.c:534 +#: src/install.c:535 #, c-format msgid "waiting for strip" msgstr "en esperar la finalització d’«strip»" -#: src/install.c:536 +#: src/install.c:537 #, c-format msgid "strip process terminated abnormally" msgstr "el procés «strip» ha finalitzat de forma anormal" # Usa quote(). ivb -#: src/install.c:557 +#: src/install.c:558 #, c-format msgid "invalid user %s" msgstr "l’usuari %s no és vàlid" -#: src/install.c:593 +#: src/install.c:594 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -5339,7 +5391,8 @@ msgstr "" " o bé: %s [OPCIÓ]… -t DIRECTORI ORIGEN…\n" " o bé: %s [OPCIÓ]… -d DIRECTORI…\n" -#: src/install.c:600 +#: src/install.c:601 +#, fuzzy msgid "" "\n" "This install program copies files (often just compiled) into destination\n" @@ -5351,7 +5404,6 @@ msgid "" "In the first three forms, copy SOURCE to DEST or multiple SOURCE(s) to\n" "the existing DIRECTORY, while setting permission modes and owner/group.\n" "In the 4th form, create all components of the given DIRECTORY(ies).\n" -"\n" msgstr "" "\n" "Aquest programa d’instaŀlació còpia fitxers (a sovint tot just compiŀlats) " @@ -5453,62 +5505,62 @@ msgstr "" "dels\n" " fitxers i directoris.\n" -#: src/install.c:858 +#: src/install.c:859 #, 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" -#: src/install.c:868 +#: src/install.c:869 #, 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" -#: src/install.c:885 +#: src/install.c:886 #, 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" # Es refereix a especificar l'opció «--target-directory». ivb -#: src/install.c:888 +#: src/install.c:889 #, 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:892 +#: 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" # Els 2 usen quote(). ivb -#: src/install.c:946 src/mkdir.c:202 src/stdbuf.c:327 +#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326 #, c-format msgid "invalid mode %s" msgstr "el mode %s no és vàlid" -#: src/install.c:953 +#: src/install.c:954 #, 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:958 +#: src/install.c:959 #, 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:965 +#: src/install.c:966 #, 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:971 +#: src/install.c:972 #, c-format msgid "" "the --compare (-C) option is ignored when you specify a mode with non-" @@ -5518,7 +5570,7 @@ msgstr "" "bits que no corresponen a permisos" #. This is a proper name. See the gettext manual, section Names. -#: src/join.c:40 src/sort.c:65 +#: src/join.c:40 src/sort.c:66 msgid "Mike Haertel" msgstr "Mike Haertel" @@ -5543,7 +5595,6 @@ msgstr "" " -e CADENA Reemplaça els camps que manquen amb CADENA.\n" #: src/join.c:200 -#, fuzzy msgid "" " -i, --ignore-case ignore differences in case when comparing fields\n" " -j FIELD equivalent to '-1 FIELD -2 FIELD'\n" @@ -5586,7 +5637,6 @@ msgstr "" "les.\n" #: src/join.c:218 -#, fuzzy msgid "" "\n" "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n" @@ -5629,8 +5679,8 @@ msgstr "" "poden emparellar algunes línies, es mostrarà un missatge d’avís.\n" #: src/join.c:403 -#, c-format -msgid "%s:%ju: is not sorted: %.*s" +#, fuzzy, c-format +msgid "%s:%<PRIuMAX>: is not sorted: %.*s" msgstr "%s:%ju: no es troba ordenat: %.*s" #: src/join.c:840 src/join.c:1038 @@ -5666,13 +5716,13 @@ msgstr "" # Ambdues usen quote(). ivb # No és necessàriament una tabulació, ho diu info. ivb -#: src/join.c:1101 src/sort.c:4414 +#: src/join.c:1101 src/sort.c:4468 #, 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:4419 +#: src/join.c:1105 src/sort.c:4473 #, c-format msgid "incompatible tabs" msgstr "els separadors no són compatibles" @@ -5694,14 +5744,13 @@ msgstr "" " o bé: %s -t [SENYAL]…\n" #: src/kill.c:82 -msgid "" -"Send signals to processes, or list signals.\n" -"\n" +#, fuzzy +msgid "Send signals to processes, or list signals.\n" msgstr "" "Envia senyals als processos, o llista els senyals.\n" "\n" -#: src/kill.c:89 +#: src/kill.c:88 msgid "" " -s, --signal=SIGNAL, -SIGNAL\n" " specify the name or number of the signal to be sent\n" @@ -5716,8 +5765,7 @@ msgstr "" " senyals a números i a la inversa.\n" " -t, --table Mostra una taula amb informació sobre els senyals.\n" -#: src/kill.c:97 -#, fuzzy +#: src/kill.c:96 msgid "" "\n" "SIGNAL may be a signal name like 'HUP', or a signal number like '1',\n" @@ -5729,32 +5777,32 @@ msgstr "" "l’estat 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:206 +#: src/kill.c:205 #, c-format msgid "%s: invalid process id" msgstr "%s: l’identificador de procés no és vàlid" -#: src/kill.c:260 +#: src/kill.c:259 #, c-format msgid "invalid option -- %c" msgstr "l’opció «%c» no és vàlida" -#: src/kill.c:269 +#: src/kill.c:268 #, c-format msgid "%s: multiple signals specified" msgstr "%s: s’han especificat múltiples senyals" -#: src/kill.c:283 +#: src/kill.c:282 #, c-format msgid "multiple -l or -t options specified" msgstr "s’han especificat múltiples opcions «-l» o «-t»" -#: src/kill.c:300 +#: src/kill.c:299 #, c-format msgid "cannot combine signal with -l or -t" msgstr "no es pot combinar un senyal amb «-l» o «-t»" -#: src/kill.c:306 +#: src/kill.c:305 #, c-format msgid "no process ID specified" msgstr "no s’ha especificat cap identificador de procés" @@ -5871,6 +5919,7 @@ msgstr "" " o bé: %s [OPCIÓ]… -t DIRECTORI DESTINACIÓ… (4a forma)\n" #: src/ln.c:381 +#, fuzzy 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" @@ -5880,7 +5929,6 @@ msgid "" "When creating hard links, each TARGET must exist. Symbolic links\n" "can hold arbitrary text; if later resolved, a relative link is\n" "interpreted in relation to its parent directory.\n" -"\n" msgstr "" "A la 1a forma crea un enllaç anomenat NOM_ENLLAÇ que apunta a la " "DESTINACIÓ.\n" @@ -5895,7 +5943,7 @@ msgstr "" "resolt, un enllaç relatiu serà interpretat respecte al seu directori pare.\n" "\n" -#: src/ln.c:395 +#: src/ln.c:394 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -5921,8 +5969,7 @@ msgstr "" " sistema).\n" " -f, --force Elimina els fitxers destinació existents.\n" -#: src/ln.c:403 -#, fuzzy +#: src/ln.c:402 msgid "" " -i, --interactive prompt whether to remove destinations\n" " -L, --logical dereference TARGETs that are symbolic links\n" @@ -5940,9 +5987,11 @@ msgstr "" " un enllaç simbòlic a un directori.\n" " -P, --physical Crea enllaços forts que apunten directament als\n" " enllaços simbòlics indicats.\n" +" -r, --relative Crea enllaços simbòlics relatius a la seua pròpia\n" +" ubicació.\n" " -s, --symbolic Crea enllaços simbòlics en lloc de forts.\n" -#: src/ln.c:412 +#: src/ln.c:411 msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" " -t, --target-directory=DIRECTORY specify the DIRECTORY in which to " @@ -5959,25 +6008,10 @@ 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:428 +#: src/ln.c:433 +#, fuzzy, c-format 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 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" - -#: src/ln.c:435 -#, c-format -msgid "" "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 "" @@ -5991,11 +6025,10 @@ msgstr "" msgid "cannot combine --target-directory and --no-target-directory" msgstr "no es poden combinar «--target-directory» i «--no-target-directory»" -# Usa quote(). ivb #: src/ln.c:588 -#, fuzzy, c-format +#, c-format msgid "cannot do --relative without --symbolic" -msgstr "no s’ha pogut crear l’enllaç simbòlic %s" +msgstr "«--relative» necessita «--symbolic»" #. This is a proper name. See the gettext manual, section Names. #: src/logname.c:30 @@ -6058,7 +6091,7 @@ 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:1976 +#: src/ls.c:1750 src/ptx.c:1975 #, c-format msgid "invalid line width: %s" msgstr "l’amplària de línia no és vàlida: %s" @@ -6079,7 +6112,6 @@ 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 -#, fuzzy 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" @@ -6131,7 +6163,7 @@ msgid "closing directory %s" msgstr "en tancar el directori %s" # Usa quote() en els 2 args. ivb -#: src/ls.c:3301 +#: src/ls.c:3302 #, c-format msgid "cannot compare file names %s and %s" msgstr "no es poden comparar els noms de fitxer %s i %s" @@ -6142,10 +6174,10 @@ msgstr "no es poden comparar els noms de fitxer %s i %s" # 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 msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" -"\n" msgstr "" "Llista informació sobre cada FITXER (per defecte sobre el directori " "actual).\n" @@ -6154,7 +6186,7 @@ msgstr "" "\n" # Amb «implied» vol dir que no han estat indicats explícitament com a args. ivb -#: src/ls.c:4729 +#: src/ls.c:4728 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -6168,8 +6200,7 @@ 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:4735 -#, fuzzy +#: src/ls.c:4734 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them. E." "g.,\n" @@ -6196,8 +6227,7 @@ msgstr "" "més\n" " nou).\n" -#: src/ls.c:4745 -#, fuzzy +#: src/ls.c:4744 msgid "" " -C list entries by columns\n" " --color[=WHEN] colorize the output. WHEN defaults to " @@ -6216,8 +6246,7 @@ msgstr "" " continguts, i no segueix els enllaços simbòlics.\n" " -D, --dired Genera eixida preparada per al mode «dired» d’Emacs.\n" -#: src/ls.c:4753 -#, fuzzy +#: src/ls.c:4752 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -6236,11 +6265,11 @@ msgstr "" " single-column (-1), verbose (-l), vertical (-C).\n" " --full-time Equival a «-l --time-style=full-iso».\n" -#: src/ls.c:4761 +#: src/ls.c:4760 msgid " -g like -l, but do not list owner\n" msgstr " -g Com «-l», però no mostra el propietari.\n" -#: src/ls.c:4764 +#: src/ls.c:4763 msgid "" " --group-directories-first\n" " group directories before files.\n" @@ -6253,7 +6282,7 @@ msgstr "" " l’agrupament.\n" # Crec que «virtual» capta millor el significat de «dummy». ivb -#: src/ls.c:4770 +#: src/ls.c:4769 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" @@ -6268,7 +6297,7 @@ msgstr "" # «--dereference-command-line-symlink-to-dir» /**/ ivb # «--hide», encara una altra opció! O_O ivb -#: src/ls.c:4776 +#: src/ls.c:4775 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -6293,7 +6322,7 @@ msgstr "" " el PATRÓ d’intèrpret indicat (inhabilitada per les\n" " opcions «-a» i «A»).\n" -#: src/ls.c:4786 +#: src/ls.c:4785 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -6314,7 +6343,7 @@ msgstr "" " el PATRÓ d’intèrpret indicat.\n" " -k, --kibibytes Empra blocs de 1024 octets.\n" -#: src/ls.c:4796 +#: src/ls.c:4795 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -6331,7 +6360,7 @@ msgstr "" "per\n" " comes.\n" -#: src/ls.c:4804 +#: src/ls.c:4803 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. " @@ -6351,8 +6380,7 @@ msgstr "" " -p, --indicator-style=slash\n" " Afegeix l’indicador «/» als directoris.\n" -#: src/ls.c:4812 -#, fuzzy +#: src/ls.c:4811 msgid "" " -q, --hide-control-chars print ? instead of non graphic characters\n" " --show-control-chars show non graphic characters as-is (default\n" @@ -6376,7 +6404,7 @@ msgstr "" " Empra l’ESTIL indicat per a citar les paraules:\n" " literal, locale, shell, shell-always, c, escape.\n" -#: src/ls.c:4821 +#: src/ls.c:4820 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -6387,7 +6415,7 @@ msgstr "" " -R, --recursive Llista recursivament els subdirectoris.\n" " -s, --size Mostra la mida en blocs de cada fitxer.\n" -#: src/ls.c:4826 +#: src/ls.c:4825 msgid "" " -S sort by file size\n" " --sort=WORD sort by WORD instead of name: none -U,\n" @@ -6414,8 +6442,7 @@ msgstr "" " aquesta data.\n" # ls, your next programming language for the shell... ivb -#: src/ls.c:4836 -#, fuzzy +#: src/ls.c:4835 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, +FORMAT.\n" @@ -6436,7 +6463,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:4845 +#: src/ls.c:4844 msgid "" " -t sort by modification time, newest first\n" " -T, --tabsize=COLS assume tab stops at each COLS instead of 8\n" @@ -6446,7 +6473,7 @@ msgstr "" " -T, --tabsize=COLUMNES\n" " Indica les COLUMNES entre tabulacions, en lloc de 8.\n" -#: src/ls.c:4849 +#: src/ls.c:4848 msgid "" " -u with -lt: sort by, and show, access time\n" " with -l: show access time and sort by name\n" @@ -6461,7 +6488,7 @@ msgstr "" " troben al directori.\n" " -v Ordena pel número (de versió) inclós al nom.\n" -#: src/ls.c:4856 +#: src/ls.c:4855 msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" @@ -6480,7 +6507,7 @@ msgstr "" " fitxer.\n" " -1 Llista un fitxer per línia.\n" -#: src/ls.c:4866 +#: src/ls.c:4865 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -6496,7 +6523,7 @@ msgstr "" "LS_COLORS permet canviar la configuració dels colors. Empreu l’ordre\n" "«dircolors» per a establir la variable.\n" -#: src/ls.c:4873 +#: src/ls.c:4872 msgid "" "\n" "Exit status:\n" @@ -6527,7 +6554,7 @@ msgstr "Scott Miller" msgid "David Madore" msgstr "David Madore" -#: src/md5sum.c:162 +#: src/md5sum.c:164 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -6541,7 +6568,7 @@ msgstr "" "FITXER és «-», llegeix l’entrada estàndard.\n" "\n" -#: src/md5sum.c:172 +#: src/md5sum.c:174 msgid "" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" @@ -6549,28 +6576,33 @@ msgstr "" " -b, --binary Llegeix en mode binari (per defecte, excepte quan es\n" " llegeix l’entrada estàndard d’un terminal).\n" -#: src/md5sum.c:176 +#: src/md5sum.c:178 msgid " -b, --binary read in binary mode\n" msgstr " -b, --binary Llegeix en mode binari.\n" -#: src/md5sum.c:179 +#: src/md5sum.c:181 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr " -c, --check Llegeix i comprova la suma %s de cada FITXER.\n" -#: src/md5sum.c:183 +#: src/md5sum.c:184 +msgid " --tag create a BSD-style checksum\n" +msgstr "" +" --tag Crea una suma de verificació a l’estil de BSD.\n" + +#: src/md5sum.c:188 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" " -t, --text Llegeix en mode text (per defecte quan es llegeix\n" " l’entrada estàndard d’un terminal).\n" -#: src/md5sum.c:187 +#: src/md5sum.c:192 msgid " -t, --text read in text mode (default)\n" msgstr " -t, --text Llegeix en mode text (per defecte).\n" # Compte amb la traducció d’«OK». ivb -#: src/md5sum.c:190 +#: src/md5sum.c:195 msgid "" "\n" "The following three options are useful only when verifying checksums:\n" @@ -6589,7 +6621,7 @@ msgstr "" "\n" # FIXME: Can be confused with invalid checksums. ivb -#: src/md5sum.c:198 +#: src/md5sum.c:203 msgid "" " --strict with --check, exit non-zero for any invalid input\n" msgstr "" @@ -6598,8 +6630,8 @@ msgstr "" " si es troben línies d’entrada amb un format " "incorrecte.\n" -#: src/md5sum.c:203 -#, fuzzy, c-format +#: src/md5sum.c:208 +#, c-format msgid "" "\n" "The sums are computed as described in %s. When checking, the input\n" @@ -6616,78 +6648,88 @@ msgstr "" "el\n" "nom de cada FITXER.\n" -#: src/md5sum.c:502 +#: src/md5sum.c:523 #, c-format msgid "%s: too many checksum lines" msgstr "%s: hi ha massa línies de suma" -#: src/md5sum.c:526 +#: src/md5sum.c:547 #, 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:551 +#: src/md5sum.c:572 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: no s’ha pogut obrir o llegir\n" -#: src/md5sum.c:574 +#: src/md5sum.c:595 msgid "FAILED" msgstr "INCORRECTE" -#: src/md5sum.c:576 +#: src/md5sum.c:597 msgid "OK" msgstr "CORRECTE" -#: src/md5sum.c:600 +#: src/md5sum.c:621 #, 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:610 +#: src/md5sum.c:631 #, 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:618 +#: src/md5sum.c:639 #, 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:626 +#: src/md5sum.c:647 #, 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:704 +#: src/md5sum.c:760 +#, c-format +msgid "--tag does not support --text mode" +msgstr "l’opció «--tag» no admet el mode text" + +#: src/md5sum.c:766 +#, 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 #, 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:712 +#: src/md5sum.c:781 #, 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:719 +#: src/md5sum.c:788 #, 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:726 +#: src/md5sum.c:795 #, 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:733 +#: src/md5sum.c:802 #, 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" @@ -6698,14 +6740,13 @@ msgid "Usage: %s [OPTION]... DIRECTORY...\n" msgstr "Forma d’ús: %s [OPCIÓ]… DIRECTORI…\n" #: src/mkdir.c:57 -msgid "" -"Create the DIRECTORY(ies), if they do not already exist.\n" -"\n" +#, fuzzy +msgid "Create the DIRECTORY(ies), if they do not already exist.\n" msgstr "" "Crea cada DIRECTORI indicat, si no existeix ja.\n" "\n" -#: src/mkdir.c:64 +#: src/mkdir.c:63 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" @@ -6722,7 +6763,7 @@ msgstr "" " directori creat a CTX.\n" # Usa quote(). ivb -#: src/mkdir.c:169 +#: src/mkdir.c:168 #, c-format msgid "created directory %s" msgstr "s’ha creat el directori %s" @@ -6733,33 +6774,32 @@ msgid "Usage: %s [OPTION]... NAME...\n" msgstr "Forma d’ús: %s [OPCIÓ]… NOM…\n" #: src/mkfifo.c:52 -msgid "" -"Create named pipes (FIFOs) with the given NAMEs.\n" -"\n" +#, fuzzy +msgid "Create named pipes (FIFOs) with the given NAMEs.\n" msgstr "" "Crea les canonades amb nom (FIFO) indicades pels seus NOMs.\n" "\n" -#: src/mkfifo.c:59 src/mknod.c:61 +#: src/mkfifo.c:58 src/mknod.c:60 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:62 +#: src/mkfifo.c:61 msgid "" " -Z, --context=CTX set the SELinux security context of each NAME 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:122 src/mknod.c:128 +#: src/mkfifo.c:121 src/mknod.c:127 #, c-format msgid "invalid mode" msgstr "el mode no és vàlid" -#: src/mkfifo.c:127 src/mknod.c:133 +#: src/mkfifo.c:126 src/mknod.c:132 #, c-format msgid "mode must specify only file permission bits" msgstr "el mode només ha d’especificar bits de permisos de fitxer" @@ -6770,20 +6810,19 @@ msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n" msgstr "Forma d’ús: %s [OPCIÓ]… NOM TIPUS [MAJOR MENOR]\n" #: src/mknod.c:54 -msgid "" -"Create the special file NAME of the given TYPE.\n" -"\n" +#, fuzzy +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:64 +#: 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" -#: src/mknod.c:69 +#: src/mknod.c:68 msgid "" "\n" "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n" @@ -6797,7 +6836,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:76 +#: src/mknod.c:75 msgid "" "\n" " b create a block (buffered) special file\n" @@ -6810,45 +6849,45 @@ msgstr "" " p Crea una cua FIFO.\n" # Açò s'imprimeix després d'un missatge d'error. ivb -#: src/mknod.c:151 +#: src/mknod.c:150 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:161 +#: src/mknod.c:160 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:177 +#: src/mknod.c:176 #, c-format msgid "block special files not supported" msgstr "aquest sistema no permet fitxers especials de blocs" -#: src/mknod.c:186 +#: src/mknod.c:185 #, c-format msgid "character special files not supported" msgstr "aquest sistema no permet fitxers especials de caràcters" # Usa quote(). ivb -#: src/mknod.c:202 +#: src/mknod.c:201 #, 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:207 +#: src/mknod.c:206 #, 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:212 +#: src/mknod.c:211 #, c-format msgid "invalid device %s %s" msgstr "el dispositiu %s %s no és vàlid" # Usa quote(). ivb -#: src/mknod.c:226 +#: src/mknod.c:225 #, c-format msgid "invalid device type %s" msgstr "el tipus de dispositiu %s no és vàlid" @@ -6864,7 +6903,6 @@ msgid "Usage: %s [OPTION]... [TEMPLATE]\n" msgstr "Foma d’ús: %s [OPCIÓ]… [PLANTILLA]\n" #: src/mktemp.c:69 -#, fuzzy 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" @@ -6941,68 +6979,67 @@ msgstr "" "altrament\n" " a «/tmp» (opció desaprovada).\n" -#: src/mktemp.c:222 +#: 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:228 +#: src/mktemp.c:229 #, c-format msgid "too many templates" msgstr "s’han indicat massa plantilles" # Usa quote(). ivb -#: src/mktemp.c:248 +#: src/mktemp.c:249 #, 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:273 src/split.c:1117 +#: src/mktemp.c:274 src/split.c:1130 #, 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:278 +#: src/mktemp.c:279 #, 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:291 +#: src/mktemp.c:292 #, 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:305 +#: src/mktemp.c:306 #, 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:325 +#: src/mktemp.c:326 #, 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:335 +#: src/mktemp.c:336 #, 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:290 -msgid "" -"Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" -"\n" +#: src/mv.c:292 +#, fuzzy +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" -#: src/mv.c:297 +#: src/mv.c:298 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -7027,7 +7064,7 @@ msgstr "" "tindrà\n" "efecte.\n" -#: src/mv.c:306 +#: src/mv.c:307 msgid "" " --strip-trailing-slashes remove any trailing slashes from each " "SOURCE\n" @@ -7040,7 +7077,7 @@ msgstr "" " -S, --suffix=SUFIX Reemplaça el sufix habitual de les còpies de\n" " seguretat.\n" -#: src/mv.c:311 +#: src/mv.c:312 msgid "" " -t, --target-directory=DIRECTORY move all SOURCE arguments into " "DIRECTORY\n" @@ -7065,41 +7102,43 @@ msgid "Usage: %s [OPTION] [COMMAND [ARG]...]\n" msgstr "Forma d’ús: %s [OPCIÓ] [ORDRE [ARG]…]\n" #: src/nice.c:73 -#, c-format +#, fuzzy, c-format msgid "" "Run COMMAND with an adjusted niceness, which affects process scheduling.\n" -"With no COMMAND, print the current niceness. Nicenesses range from\n" -"%d (most favorable scheduling) to %d (least favorable).\n" -"\n" -" -n, --adjustment=N add integer N to the niceness (default 10)\n" +"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 "" "Executa l’ORDRE amb un valor de prioritat ajustat, cosa que afecta la\n" "planificació del procés. Sense l’ORDRE, mostra el valor actual de " "prioritat.\n" -"Els valors de prioritat van des de %d (planificació més favorable) a %d\n" -"(planificació menys favorable).\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 "" + # Usa quote(). ivb -#: src/nice.c:168 +#: src/nice.c:172 #, c-format msgid "invalid adjustment %s" msgstr "l’ajust %s no és vàlid" -#: src/nice.c:177 +#: src/nice.c:181 #, c-format msgid "a command must be given with an adjustment" msgstr "cal que especifiqueu una ordre juntament amb l’ajustament" -#: src/nice.c:184 src/nice.c:195 +#: src/nice.c:188 src/nice.c:199 #, c-format msgid "cannot get niceness" msgstr "no s’ha pogut obtenir la prioritat" -#: src/nice.c:201 +#: src/nice.c:205 #, c-format msgid "cannot set niceness" msgstr "no s’ha pogut establir la prioritat" @@ -7109,17 +7148,17 @@ msgstr "no s’ha pogut establir la prioritat" msgid "Scott Bartram" msgstr "Scott Bartram" -#: src/nl.c:186 +#: 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" -"\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:194 +#: src/nl.c:186 msgid "" " -b, --body-numbering=STYLE use STYLE for numbering body lines\n" " -d, --section-delimiter=CC use CC for separating logical pages\n" @@ -7132,7 +7171,7 @@ msgstr "" " -f, --footer-numbering=ESTIL\n" " Enumera les línies del peu segons ESTIL.\n" -#: src/nl.c:199 +#: src/nl.c:191 msgid "" " -h, --header-numbering=STYLE use STYLE for numbering header lines\n" " -i, --line-increment=NUMBER line number increment at each line\n" @@ -7158,7 +7197,7 @@ msgstr "" " Escriu la CADENA al darrere del possible número de\n" " línia.\n" -#: src/nl.c:207 +#: src/nl.c:199 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" @@ -7168,7 +7207,7 @@ msgstr "" " -w, --number-width=NÚMERO\n" " Empra NÚMERO columnes per cada número de línia.\n" -#: src/nl.c:213 +#: src/nl.c:205 msgid "" "\n" "By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC are\n" @@ -7183,7 +7222,7 @@ msgstr "" "del segon caràcter implica «:». Escriviu «\\\\» per a «\\». ESTIL pot " "ser:\n" -#: src/nl.c:219 +#: src/nl.c:211 msgid "" "\n" " a number all lines\n" @@ -7213,62 +7252,55 @@ msgstr "" " rz Alineat a la dreta, reomplit amb zeros.\n" "\n" -#: src/nl.c:286 +#: src/nl.c:278 #, c-format msgid "line number overflow" msgstr "el comptador de línies s’ha desbordat" # Usa quote(). ivb -#: src/nl.c:486 +#: src/nl.c:478 #, c-format msgid "invalid header numbering style: %s" msgstr "l’estil de numeració de capçalera no és vàlid: %s" # Usa quote(). ivb -#: src/nl.c:494 +#: src/nl.c:486 #, c-format msgid "invalid body numbering style: %s" msgstr "l’estil de numeració de cos no és vàlid: %s" # Usa quote(). ivb -#: src/nl.c:502 +#: src/nl.c:494 #, c-format msgid "invalid footer numbering style: %s" msgstr "l’estil de numeració de peu no és vàlid: «%s»" # Usa quote(). ivb -#: src/nl.c:511 +#: src/nl.c:503 #, c-format msgid "invalid starting line number: %s" msgstr "el número inicial de línia no és vàlid: %s" -#: src/nl.c:517 -#, c-format -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" - # Usa quote(). ivb -#: src/nl.c:524 +#: src/nl.c:512 #, c-format msgid "invalid line number increment: %s" msgstr "l’increment del número de línia no és vàlid: %s" # Usa quote(). ivb -#: src/nl.c:536 +#: src/nl.c:524 #, c-format msgid "invalid number of blank lines: %s" msgstr "el número de línies en blanc no és vàlid: %s" # Usa quote(). ivb -#: src/nl.c:550 +#: src/nl.c:538 #, c-format msgid "invalid line number field width: %s" msgstr "l’amplada del camp de números de línia no és vàlida: %s" # Usa quote(). ivb -#: src/nl.c:569 +#: src/nl.c:557 #, c-format msgid "invalid line numbering format: %s" msgstr "l’estil de numeració de línia no és vàlid: %s" @@ -7291,7 +7323,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" @@ -7322,12 +7354,6 @@ msgstr "no s’ha pogut inhabilitar l’entrada estàndard" msgid "ignoring input" msgstr "es descarta l’entrada" -# Els 2 usen quote(). ivb -#: src/nohup.c:163 src/nohup.c:165 -#, c-format -msgid "failed to open %s" -msgstr "no s’ha pogut obrir %s" - # Missatge informatiu. ivb # Usa quote(). ivb #: src/nohup.c:175 @@ -7368,16 +7394,16 @@ msgid "failed to redirect standard error" msgstr "no s’ha pogut redirigir l’eixida estàndard d’errors" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:32 +#: src/nproc.c:33 msgid "Giuseppe Scrivano" msgstr "Giuseppe Scrivano" -#: src/nproc.c:56 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 +#: src/nproc.c:57 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Forma d’ús: %s [OPCIÓ]…\n" -#: src/nproc.c:57 +#: src/nproc.c:58 msgid "" "Print the number of processing units available to the current process,\n" "which may be less than the number of online processors\n" @@ -7388,7 +7414,7 @@ msgstr "" "que pot ser menor que el nombre de processadors actius.\n" "\n" -#: src/nproc.c:62 +#: src/nproc.c:63 msgid "" " --all print the number of installed processors\n" " --ignore=N if possible, exclude N processing units\n" @@ -7397,11 +7423,365 @@ msgstr "" "sistema.\n" " --ignore=N Exclou N unitats de processament si és possible.\n" -#: src/nproc.c:106 +#: src/nproc.c:107 #, c-format 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 +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" + +# 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:684 +#, c-format +msgid "rejecting suffix in input: '%s' (consider using --from)" +msgstr "" + +#: 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" + +#: src/numfmt.c:692 +#, c-format +msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)" +msgstr "" + +# 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:787 +#, fuzzy, c-format +msgid "invalid unit size: '%s'" +msgstr "l’amplària de tabulació no és vàlida: %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 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [NUMBER]...\n" +msgstr "Forma d’ús: %s [OPCIÓ]… [USUARI]…\n" + +#: src/numfmt.c:816 +msgid "" +"Reformat NUMBER(s), or the numbers from standard input if none are " +"specified.\n" +msgstr "" + +# FIXME: Can be confused with invalid checksums. ivb +#: src/numfmt.c:820 +#, fuzzy +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" + +#: src/numfmt.c:823 +msgid "" +" -d, --delimiter=X use X instead of whitespace for field delimiter\n" +msgstr "" + +#: src/numfmt.c:826 +msgid "" +" --field=N replace the number in input field N (default is 1)\n" +msgstr "" + +#: src/numfmt.c:829 +msgid "" +" --format=FORMAT use printf style floating-point FORMAT;\n" +" see FORMAT below for details\n" +msgstr "" + +#: src/numfmt.c:833 +msgid "" +" --from=UNIT auto-scale input numbers to UNITs; default is " +"'none';\n" +" see UNIT below\n" +msgstr "" + +#: src/numfmt.c:837 +msgid "" +" --from-unit=N specify the input unit size (instead of the default " +"1)\n" +msgstr "" + +#: src/numfmt.c:840 +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 "" + +#: src/numfmt.c:844 +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 +msgid "" +" --invalid=MODE failure mode for invalid numbers: MODE can be:\n" +" abort (default), fail, warn, ignore\n" +msgstr "" + +#: src/numfmt.c:852 +msgid "" +" --padding=N pad the output to N characters; positive N will\n" +" right-align; negative N will left-align;\n" +" padding is ignored if the output is wider than N;\n" +" the default is to automatically pad if a " +"whitespace\n" +" is found\n" +msgstr "" + +#: src/numfmt.c:859 +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 +msgid "" +" --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" +" SUFFIX in input numbers\n" +msgstr "" + +#: src/numfmt.c:867 +msgid "" +" --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" +msgstr "" + +#: src/numfmt.c:870 +msgid "" +" --to-unit=N the output unit size (instead of the default 1)\n" +msgstr "" + +#: src/numfmt.c:877 +#, fuzzy +msgid "" +"\n" +"UNIT options:\n" +msgstr "" +"Altres opcions:\n" +"\n" + +#: src/numfmt.c:880 +msgid " none no auto-scaling is done; suffixes will trigger an error\n" +msgstr "" + +#: src/numfmt.c:883 +msgid "" +" auto accept optional single/two letter suffix:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" +msgstr "" + +#: src/numfmt.c:889 +msgid "" +" si accept optional single letter suffix:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:894 +msgid "" +" iec accept optional single letter suffix:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:899 +msgid "" +" iec-i accept optional two-letter suffix:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:905 +#, 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" +msgstr "" + +#: src/numfmt.c:912 +#, c-format +msgid "" +"\n" +"Exit status is 0 if all input numbers were successfully converted.\n" +"By default, %s will stop at the first conversion error with exit status 2.\n" +"With --invalid='fail' a warning is printed for each conversion error\n" +"and the exit status is 2. With --invalid='warn' each conversion error is\n" +"diagnosed, but the exit status is 0. With --invalid='ignore' conversion\n" +"errors are not diagnosed and the exit status is 0.\n" +msgstr "" + +#: src/numfmt.c:921 +#, c-format +msgid "" +"\n" +"Examples:\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" +msgstr "" + +# Usa quote(). ivb +#: src/numfmt.c:974 src/seq.c:212 +#, c-format +msgid "format %s has no %% directive" +msgstr "el format %s no té una directiva «%%»" + +#: src/numfmt.c:990 +#, fuzzy, c-format +msgid "invalid format %s (width overflow)" +msgstr "el format de data «%s» no és vàlid" + +# Usa quote(). ivb +#: src/numfmt.c:1007 src/seq.c:229 +#, 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:1018 src/seq.c:236 +#, 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" + +#: src/numfmt.c:1092 +#, c-format +msgid "value too large to be printed: '%Lg' (consider using --to)" +msgstr "" + +#: src/numfmt.c:1100 +#, c-format +msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" +msgstr "" + +#: src/numfmt.c:1184 +#, c-format +msgid "large input value '%s': possible precision loss" +msgstr "" + +#: src/numfmt.c:1293 +#, c-format +msgid "input line is too short, no numbers found to convert in field %ld" +msgstr "" + +# 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" + +#: src/numfmt.c:1401 +#, fuzzy, 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" + +# Açò s'imprimeix després d'un missatge d'error. ivb +#: src/numfmt.c:1456 +#, fuzzy, 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»." + +#: src/numfmt.c:1463 +#, fuzzy, c-format +msgid "no conversion option specified" +msgstr "s’han especificat múltiples opcions «-i»" + +# Açò s'imprimeix després d'un missatge d'error. ivb +#: src/numfmt.c:1471 +#, fuzzy, c-format +msgid "grouping cannot be combined with --to" +msgstr "No es poden combinar els operands fitxer amb «--files0-from»." + +#: src/numfmt.c:1473 +#, c-format +msgid "grouping has no effect in this locale" +msgstr "" + +#: src/numfmt.c:1486 +#, c-format +msgid "--header ignored with command-line input" +msgstr "" + +# uniq no usa quote(). ivb +#: src/numfmt.c:1511 +#, fuzzy, c-format +msgid "error reading input" +msgstr "error en llegir %s" + +#: src/numfmt.c:1520 +#, fuzzy, c-format +msgid "failed to convert some of the input numbers" +msgstr "no s’ha pogut inhabilitar l’entrada estàndard" + #: src/od.c:294 #, c-format msgid "" @@ -7431,15 +7811,33 @@ msgstr "" "«-», llegeix l’entrada estàndard.\n" "\n" +# El més llarg és «x[MIDA]». ivb #: src/od.c:307 -msgid "All arguments to long options are mandatory for short options.\n" +#, fuzzy +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" +"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" +"at first byte printed, incremented when dump is progressing.\n" +"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 "" -"Els arguments obligatoris per a les opcions llargues també ho són per a les\n" -"opcions curtes corresponents.\n" +"\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». " +"ETIQUETA\n" +"és la pseudoadreça del primer octet escrit, que s’incrementa a mesura que " +"va\n" +"progressant la transcripció. En DESPLAÇAMENT i ETIQUETA, un prefix «0x» o\n" +"«0X» indica hexadecimal. Els sufixs poden ser «.» per a octal i «b» com a\n" +"multiplicació per 512.\n" -#: src/od.c:310 +#: src/od.c:318 +#, fuzzy msgid "" -" -A, --address-radix=RADIX decide how file offsets are printed\n" +" -A, --address-radix=RADIX output format for file offsets. RADIX is one\n" +" of [doxn], for Decimal, Octal, Hex or None\n" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" " -A, --address-radix=BASE\n" @@ -7449,22 +7847,25 @@ msgstr "" " Salta aquest nombre d’OCTETS al principi de " "l’entrada.\n" -#: src/od.c:314 +#: src/od.c:323 #, 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" -" --traditional accept arguments in traditional form\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=OCTETS\n" " Limita la transcripció a aquest nombre d’OCTETS\n" " 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" " -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" @@ -7473,9 +7874,11 @@ msgstr "" # buscar una traducció per `named characters' i `shorts' # Crec que així va bé. ivb -#: src/od.c:324 +#: src/od.c:336 +#, fuzzy 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" @@ -7495,7 +7898,7 @@ msgstr "" # buscar traduccions pels diferents tipus # Crec que així va bé. ivb -#: src/od.c:332 +#: src/od.c:345 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -7511,33 +7914,12 @@ 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" -# El més llarg és «x[MIDA]». ivb -#: src/od.c:340 +#: src/od.c:353 +#, fuzzy msgid "" "\n" -"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" -"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" -"at first byte printed, incremented when dump is progressing.\n" -"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». " -"ETIQUETA\n" -"és la pseudoadreça del primer octet escrit, que s’incrementa a mesura que " -"va\n" -"progressant la transcripció. En DESPLAÇAMENT i ETIQUETA, un prefix «0x» o\n" -"«0X» indica hexadecimal. Els sufixs poden ser «.» per a octal i «b» com a\n" -"multiplicació per 512.\n" - -#: src/od.c:349 -msgid "" "\n" "TYPE is made up of one or more of these specifications:\n" -"\n" " a named character, ignoring high-order bit\n" " c ASCII character or backslash escape\n" msgstr "" @@ -7549,7 +7931,7 @@ msgstr "" # 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:356 +#: src/od.c:360 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -7563,10 +7945,11 @@ 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:363 +#: src/od.c:367 +#, fuzzy msgid "" "\n" -"SIZE is a number. For TYPE in doux, SIZE may also be C for\n" +"SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" "sizeof(char), S for sizeof(short), I for sizeof(int) or L for\n" "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" @@ -7579,44 +7962,40 @@ msgstr "" "«sizeof(float)», «D» per a «sizeof(double)» o bé «L» per a\n" "«sizeof(long double)».\n" -#: src/od.c:370 +#: src/od.c:374 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" +"Adding a z suffix to any type displays printable characters at the end of\n" +"each output line.\n" msgstr "" -"\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" -#: src/od.c:380 +#: src/od.c:379 +#, 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" +"\n" +"\n" +"BYTES is hex with 0x or 0X prefix, and may have a multiplier suffix:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"and so on for G, T, P, E, Z, Y.\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" +"\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" # Ambdues usen quote(). ivb -#: src/od.c:633 src/od.c:753 +#: src/od.c:639 src/od.c:759 #, c-format msgid "invalid type string %s" msgstr "la cadena de tipus no és vàlida: %s" # Usa quote(). ivb -#: src/od.c:643 +#: src/od.c:649 #, c-format msgid "" "invalid type string %s;\n" @@ -7626,7 +8005,7 @@ msgstr "" "enter de %lu octets" # Usa quote(). ivb -#: src/od.c:764 +#: src/od.c:770 #, c-format msgid "" "invalid type string %s;\n" @@ -7636,39 +8015,39 @@ msgstr "" "de coma flotant de %lu octets" # Usa quote() en la segona. ivb -#: src/od.c:822 -#, fuzzy, c-format +#: src/od.c:828 +#, 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:1047 +#: src/od.c:1053 #, 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:1603 -#, fuzzy, c-format +#: src/od.c:1609 +#, 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:1729 +#: src/od.c:1735 #, 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:1804 +#: src/od.c:1810 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:1825 +#: src/od.c:1831 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "«skip-bytes» + «read-bytes» és massa gran" -#: src/od.c:1868 +#: src/od.c:1874 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "atenció: l’amplada %lu no és vàlida; s’emprarà %d" @@ -7684,11 +8063,11 @@ 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" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" "Escriu línies consistents en les línies corresponents seqüencialment de " "cada\n" @@ -7697,7 +8076,7 @@ msgstr "" "FITXER, o quan FITXER és «-», llegeix l’entrada estàndard.\n" "\n" -#: src/paste.c:448 +#: 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" @@ -7707,7 +8086,7 @@ msgstr "" " tabulacions.\n" " -s, --serial Processa cada fitxer de cop, i no en paraŀlel.\n" -#: src/paste.c:509 +#: src/paste.c:508 #, c-format msgid "delimiter list ends with an unescaped backslash: %s" msgstr "" @@ -7730,7 +8109,7 @@ msgstr "" # Usa quote(). ivb #: src/pathchk.c:170 -#, fuzzy, c-format +#, c-format msgid "leading '-' in a component of file name %s" msgstr "un dels components del nom de fitxer %s comença per «-»" @@ -7775,86 +8154,86 @@ msgid "Kaveh Ghazi" msgstr "Kaveh Ghazi" #. TRANSLATORS: Real name is unknown; at most 19 characters. -#: src/pinky.c:250 +#: src/pinky.c:242 msgid " ???" msgstr " ???" #. TRANSLATORS: Idle time is unknown; at most 5 characters. -#: src/pinky.c:274 +#: src/pinky.c:266 msgid "?????" msgstr "?????" # FIXME: This way of arranging output is language dependent. ivb -#: src/pinky.c:323 +#: src/pinky.c:314 #, c-format msgid "Login name: " msgstr "Nom d’entrada: " -#: src/pinky.c:326 +#: src/pinky.c:317 #, c-format msgid "In real life: " msgstr "A la vida real: " # Un nom real desconegut. ivb #. TRANSLATORS: Real name is unknown; no hard limit. -#: src/pinky.c:330 +#: src/pinky.c:321 msgid "???\n" msgstr "???\n" -#: src/pinky.c:350 +#: src/pinky.c:341 #, c-format msgid "Directory: " msgstr "Directori: " # Compensa els 3 caràcters que «Nom d'entrada» desplaça «A la vida real». ivb -#: src/pinky.c:352 +#: src/pinky.c:343 #, c-format msgid "Shell: " msgstr " Intèrpret d’ordres: " -#: src/pinky.c:371 +#: src/pinky.c:362 #, c-format msgid "Project: " msgstr "Projecte: " -#: src/pinky.c:395 +#: src/pinky.c:386 #, c-format msgid "Plan:\n" msgstr "Pla:\n" # FIXME: This way of arranging output is language dependent. ivb # No es passa de 8, ok. ivb -#: src/pinky.c:414 +#: src/pinky.c:405 msgid "Login" msgstr "Entrada" -#: src/pinky.c:416 +#: src/pinky.c:407 msgid "Name" msgstr "Nom" -#: src/pinky.c:417 +#: src/pinky.c:408 msgid " TTY" msgstr " TTY" # Hauria de ser «Inactiu», però té més de 6 caràcters. ivb -#: src/pinky.c:419 +#: src/pinky.c:410 msgid "Idle" msgstr "Ociós" -#: src/pinky.c:420 +#: src/pinky.c:411 msgid "When" msgstr "Quan" -#: src/pinky.c:423 +#: src/pinky.c:414 msgid "Where" msgstr "On" -#: src/pinky.c:502 +#: src/pinky.c:493 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Forma d’ús: %s [OPCIÓ]… [USUARI]…\n" -#: src/pinky.c:503 +#: src/pinky.c:494 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7873,7 +8252,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:511 +#: src/pinky.c:502 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7891,8 +8270,8 @@ msgstr "" " d’inactivitat (ociós) al format curt.\n" # No usa quote(). ivb -#: src/pinky.c:520 -#, fuzzy, c-format +#: src/pinky.c:511 +#, c-format msgid "" "\n" "A lightweight 'finger' program; print user information.\n" @@ -7902,7 +8281,7 @@ msgstr "" "Un programa de «finger» lleuger; mostra informació sobre els usuaris. El\n" "fitxer «utmp» serà «%s».\n" -#: src/pinky.c:604 +#: src/pinky.c:595 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "" @@ -7918,96 +8297,95 @@ msgstr "Pete TerMaat" msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:912 -#, fuzzy, c-format +#: src/pr.c:908 +#, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "--pages=PRIM_PÀG[:ÚLT_PÀG]: manca un argument" # Usa quote(). ivb -#: src/pr.c:914 +#: src/pr.c:910 #, c-format msgid "invalid page range %s" msgstr "el rang de pàgines no és vàlid: %s" # Usa quote(). ivb -#: src/pr.c:979 -#, fuzzy, c-format +#: src/pr.c:975 +#, c-format msgid "'-l PAGE_LENGTH' invalid number of lines: %s" msgstr "-l LLARG_PÀG: el nombre de línies no és vàlid: %s" # Usa quote(). ivb -#: src/pr.c:1003 -#, fuzzy, c-format +#: src/pr.c:999 +#, c-format msgid "'-N NUMBER' invalid starting line number: %s" msgstr "-N NÚMERO: el número inicial de línia no és vàlid: %s" # Usa quote(). ivb -#: src/pr.c:1015 -#, fuzzy, c-format +#: src/pr.c:1011 +#, c-format msgid "'-o MARGIN' invalid line offset: %s" msgstr "-o MARGE: el desplaçament de línia no és vàlid: %s" # Usa quote(). ivb -#: src/pr.c:1056 -#, fuzzy, c-format +#: src/pr.c:1052 +#, c-format msgid "'-w PAGE_WIDTH' invalid number of characters: %s" msgstr "-w AMPLADA_PÀG: el nombre de caràcters no és vàlid: %s" # Usa quote(). ivb -#: src/pr.c:1070 -#, fuzzy, c-format +#: src/pr.c:1066 +#, c-format msgid "'-W PAGE_WIDTH' invalid number of characters: %s" msgstr "-W AMPLADA_PÀG: el nombre de caràcters no és vàlid: %s" -#: src/pr.c:1100 +#: src/pr.c:1096 #, 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" -#: src/pr.c:1104 +#: 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" # Usa quote() en la segona. ivb -#: src/pr.c:1200 -#, fuzzy, c-format +#: src/pr.c:1196 +#, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "-%c: sobren caràcters o el número de l’argument no és vàlid: %s" -#: src/pr.c:1304 +#: src/pr.c:1293 #, c-format msgid "page width too narrow" msgstr "l’amplada de pàgina és insuficient" -#: src/pr.c:2369 +#: src/pr.c:2353 #, c-format msgid "starting page number %<PRIuMAX> exceeds page count %<PRIuMAX>" msgstr "" "el número de pàgina inicial %<PRIuMAX> excedeix el comptador de pàgines " "%<PRIuMAX>" -#: src/pr.c:2396 +#: src/pr.c:2380 #, c-format msgid "page number overflow" msgstr "el comptador de pàgines s’ha desbordat" # Açò és el text per a numerar les pàgines. ivb -#: src/pr.c:2401 +#: src/pr.c:2385 #, c-format msgid "Page %<PRIuMAX>" msgstr "Pàgina %<PRIuMAX>" -#: src/pr.c:2773 -msgid "" -"Paginate or columnate FILE(s) for printing.\n" -"\n" +#: 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" -#: src/pr.c:2780 +#: src/pr.c:2763 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -8025,7 +8403,7 @@ msgstr "" " en vertical, tret que especifiqueu «-a». Iguala el\n" " nombre de línies de les columnes de cada pàgina.\n" -#: src/pr.c:2788 +#: src/pr.c:2771 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -8042,7 +8420,7 @@ msgstr "" " d’escapada en octal amb barra invertida.\n" " -d, --double-space Escriu el text amb espaiat doble.\n" -#: src/pr.c:2796 +#: src/pr.c:2779 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -8068,7 +8446,7 @@ msgstr "" "de\n" " capçalera i 5 de cua sense «-F»).\n" -#: src/pr.c:2806 +#: src/pr.c:2789 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -8095,7 +8473,7 @@ msgstr "" "columna,\n" " i «--sep-string[=CADENA]» defineix els separadors.\n" -#: src/pr.c:2815 +#: src/pr.c:2798 msgid "" " -l, --length=PAGE_LENGTH\n" " set the page length to PAGE_LENGTH (66) lines\n" @@ -8112,7 +8490,7 @@ msgstr "" "ocupen\n" " una línia sencera si s’empra l’opció «-J».\n" -#: src/pr.c:2822 +#: src/pr.c:2805 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -8132,7 +8510,7 @@ msgstr "" " Comença la numeració amb NÚMERO a la 1a línia de la\n" " primera pàgina escrita (vegeu «+PRIM_PÀG»).\n" -#: src/pr.c:2830 +#: src/pr.c:2813 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -8147,7 +8525,7 @@ msgstr "" " No avisa quan un fitxer no es pot obrir.\n" # Aaalaaa, ni punts ni res! ivb -#: src/pr.c:2837 +#: src/pr.c:2820 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -8167,8 +8545,7 @@ msgstr "" " especifiqueu «-w».\n" # Eeeeinnn?? Beneït info! ivb -#: src/pr.c:2844 -#, fuzzy +#: src/pr.c:2827 msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" @@ -8177,7 +8554,7 @@ msgid "" "options\n" " -t, --omit-header omit page headers and trailers\n" msgstr "" -" -S[CADENA], --sep-string[=CADENA]\n" +" -S, --sep-string[=CADENA]\n" " Separa les columnes amb aquesta CADENA; si no " "s’empra\n" " «-S» i sí s’empra «-J» el separador per defecte és " @@ -8191,7 +8568,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:2851 +#: src/pr.c:2834 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -8218,7 +8595,7 @@ msgstr "" "inhabilita\n" " l’amplada de pàgina per defecte.\n" -#: src/pr.c:2861 +#: src/pr.c:2844 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -8234,7 +8611,7 @@ msgstr "" " amb les opcions «-S» o «-s».\n" # Acaba pr i encara estic viu! Vaig a prendre una aspirina... ivb -#: src/pr.c:2869 +#: src/pr.c:2852 msgid "" "\n" "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" @@ -8321,7 +8698,6 @@ msgstr "" # El més llarg és «UHHHHHHHH». ivb #: src/printf.c:123 -#, fuzzy msgid "" " %% a single %\n" " %b ARGUMENT as a string with '\\' escapes interpreted,\n" @@ -8407,18 +8783,17 @@ msgstr "" # Escriu les paraules del text seguides, començant cada colta per una. ivb #: src/ptx.c:1821 +#, fuzzy msgid "" "Output a permuted index, including context, of the words in the input " "files.\n" -"\n" msgstr "" "Escriu un índex permutat, incloent el context, amb les paraules dels " "fitxers\n" "que formen l’entrada.\n" "\n" -#: src/ptx.c:1828 -#, fuzzy +#: src/ptx.c:1827 msgid "" " -A, --auto-reference output automatically generated references\n" " -G, --traditional behave more like System V 'ptx'\n" @@ -8430,8 +8805,7 @@ msgstr "" " Empra la CADENA per a senyalar els truncaments de\n" " línia.\n" -#: src/ptx.c:1833 -#, fuzzy +#: src/ptx.c:1832 msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" " -O, --format=roff generate output as roff directives\n" @@ -8451,7 +8825,7 @@ msgstr "" " l’expressió regular indicada.\n" " -T, --format=tex Genera la sortida com a directives de TeX.\n" -#: src/ptx.c:1840 +#: src/ptx.c:1839 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -8478,7 +8852,7 @@ msgstr "" "que\n" " seran preses com a paraules clau.\n" -#: src/ptx.c:1848 +#: src/ptx.c:1847 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -8491,8 +8865,7 @@ msgstr "" " -w, --width=NÚMERO Amplada (en columnes) de la sortida (excloent‐ne la\n" " referència).\n" -#: src/ptx.c:1855 -#, fuzzy +#: src/ptx.c:1854 msgid "" "\n" "With no FILE or if FILE is -, read Standard Input. '-F /' by default.\n" @@ -8503,7 +8876,7 @@ msgstr "" "s’empra «-F /».\n" # Usa quote(). ivb -#: src/ptx.c:1949 +#: src/ptx.c:1948 #, c-format msgid "invalid gap width: %s" msgstr "la mida de la separació no és vàlida: %s" @@ -8532,7 +8905,7 @@ 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/pwd.c:170 src/pwd.c:277 src/split.c:373 #, c-format msgid "failed to stat %s" msgstr "ha fallat stat() sobre %s" @@ -8551,14 +8924,15 @@ msgid "ignoring non-option arguments" msgstr "es descarten els arguments no‐opció" #. This is a proper name. See the gettext manual, section Names. -#: src/readlink.c:33 +#: src/readlink.c:32 msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 +#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147 +#: src/stat.c:1349 src/touch.c:212 #, c-format -msgid "Usage: %s [OPTION]... FILE\n" -msgstr "Foma d’ús: %s [OPCIÓ]… FITXER\n" +msgid "Usage: %s [OPTION]... FILE...\n" +msgstr "Forma d’ús: %s [OPCIÓ]… FITXER…\n" #: src/readlink.c:63 msgid "" @@ -8591,16 +8965,19 @@ msgstr "" " camí.\n" #: src/readlink.c:75 +#, fuzzy msgid "" " -m, --canonicalize-missing canonicalize by following every symlink in\n" " every component of the given name " "recursively,\n" " without requirements on components " "existence\n" -" -n, --no-newline do not output the trailing newline\n" +" -n, --no-newline do not output the trailing delimiter\n" " -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" msgstr "" " -m, --canonicalize-missing\n" " Prova de trobar el nom canònic seguint recursivament\n" @@ -8612,11 +8989,10 @@ msgstr "" " -s, --silent No mostra la majoria de missatges d’error.\n" " -v, --verbose Mostra els missatges d’error.\n" -#: src/realpath.c:71 src/rm.c:134 src/shred.c:147 src/stat.c:1330 -#: src/touch.c:215 -#, c-format -msgid "Usage: %s [OPTION]... FILE...\n" -msgstr "Forma d’ús: %s [OPCIÓ]… FITXER…\n" +#: src/readlink.c:152 +#, fuzzy, c-format +msgid "ignoring --no-newline with multiple arguments" +msgstr "es descarten els arguments no‐opció" #: src/realpath.c:72 msgid "" @@ -8630,7 +9006,6 @@ 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" @@ -8665,18 +9040,19 @@ msgstr "" " -z, --zero Escriu un octet 0 en lloc de cada caràcter de nova\n" " línia per a separar els resultats.\n" +# Condició d’error. ivb #: src/relpath.c:130 msgid "generating relative path" -msgstr "" +msgstr "en generar el camí relatiu" # Usa quote(9. ivb -#: src/remove.c:286 +#: src/remove.c:273 #, c-format msgid "%s: descend into write-protected directory %s? " msgstr "%s: voleu descendir al directori protegit contra escriptura %s? " # Usa quote(). ivb -#: src/remove.c:287 +#: src/remove.c:274 #, c-format msgid "%s: descend into directory %s? " msgstr "%s: voleu descendir al directori %s? " @@ -8687,45 +9063,45 @@ msgstr "%s: voleu descendir al directori %s? " #. translate "%s: remove %s (write-protected) %s? " #. instead. It should avoid grammatical problems #. with the output of file_type. -#: src/remove.c:303 +#: src/remove.c:290 #, 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:304 +#: src/remove.c:291 #, 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:417 +#: src/remove.c:374 #, 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:481 +#: src/remove.c:444 #, c-format msgid "cannot remove directory: %s" msgstr "no es pot eliminar el directori %s" # Usa quote(). ivb -#: src/remove.c:537 +#: src/remove.c:500 #, 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:557 +#: src/remove.c:520 #, 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:563 +#: src/remove.c:526 #, c-format msgid "" "unexpected failure: fts_info=%d: %s\n" @@ -8735,13 +9111,12 @@ msgstr "" "Per favor, informeu %s." # La tercera usa quote(). ivb -#: src/rm.c:118 -#, fuzzy, c-format +#: src/rm.c:119 +#, c-format msgid "Try '%s ./%s' to remove the file %s.\n" msgstr "Proveu amb «%s ./%s» per a eliminar el fitxer %s.\n" -#: src/rm.c:135 -#, fuzzy +#: src/rm.c:136 msgid "" "Remove (unlink) the FILE(s).\n" "\n" @@ -8751,10 +9126,12 @@ msgid "" msgstr "" "Elimina (deslliga) cada FITXER.\n" "\n" -" -f, --force Descarta els fitxers inexistents, i mai no pregunta.\n" +" -f, --force Descarta els fitxers i arguments inexistents, i mai " +"no\n" +" pregunta.\n" " -i Pregunta abans de cada eliminació.\n" -#: src/rm.c:141 +#: src/rm.c:142 msgid "" " -I prompt once before removing more than three files, " "or\n" @@ -8776,7 +9153,7 @@ msgstr "" "sempre\n" " com a «-i»). Si no s’indica, pregunta sempre.\n" -#: src/rm.c:148 +#: src/rm.c:149 msgid "" " --one-file-system when removing a hierarchy recursively, skip any\n" " directory that is on a file system different from\n" @@ -8788,12 +9165,12 @@ msgstr "" "diferent\n" " al de l’argument corresponent de la línia d’ordres.\n" -#: src/rm.c:153 -#, fuzzy +#: src/rm.c:154 msgid "" " --no-preserve-root do not treat '/' specially\n" " --preserve-root do not remove '/' (default)\n" " -r, -R, --recursive remove directories and their contents recursively\n" +" -d, --dir remove empty directories\n" " -v, --verbose explain what is being done\n" msgstr "" " --no-preserve-root\n" @@ -8801,9 +9178,10 @@ msgstr "" " --preserve-root No elimina «/» (per defecte).\n" " -r, -R, --recursive Elimina recursivament els directoris i llurs\n" " continguts.\n" +" -d, --dir Elimina els directoris buits.\n" " -v, --verbose Explica què s’està fent.\n" -#: src/rm.c:161 +#: src/rm.c:163 msgid "" "\n" "By default, rm does not remove directories. Use the --recursive (-r or -R)\n" @@ -8815,8 +9193,8 @@ msgstr "" "(«-r» o «-R») per a eliminar també cadascun dels directoris llistats,\n" "juntament amb el seu contingut.\n" -#: src/rm.c:166 -#, fuzzy, c-format +#: src/rm.c:168 +#, c-format msgid "" "\n" "To remove a file whose name starts with a '-', for example '-foo',\n" @@ -8829,11 +9207,11 @@ msgstr "" "Per a eliminar un fitxer amb un nom que comence per «-», per exemple «-" "mec»,\n" "empreu una d’aquestes ordres:\n" -" %s -- -mec\n" "\n" +" %s -- -mec\n" " %s ./-mec\n" -#: src/rm.c:175 +#: src/rm.c:177 msgid "" "\n" "Note that if you use rm to remove a file, it might be possible to recover\n" @@ -8848,12 +9226,12 @@ msgstr "" "esdevinguen\n" "realment irrecuperables, considereu emprar «shred».\n" -#: src/rm.c:335 +#: src/rm.c:342 #, c-format msgid "%s: remove all arguments recursively? " msgstr "%s: voleu eliminar tots els arguments recursivament? " -#: src/rm.c:336 +#: src/rm.c:343 #, c-format msgid "%s: remove all arguments? " msgstr "%s: voleu eliminar tots els arguments? " @@ -8886,7 +9264,6 @@ msgstr "" " directori no es troba buit.\n" #: src/rmdir.c:172 -#, fuzzy msgid "" " -p, --parents remove DIRECTORY and its ancestors; e.g., 'rmdir -p a/b/c' " "is\n" @@ -8914,12 +9291,16 @@ msgstr "" "Forma d’ús: %s CONTEXT ORDRE [ARG…]\n" " o bé: %s [-c] [-u USUARI] [-r ROL] [-t TIPUS] [-l RANG] ORDRE [ARG…]\n" -# (process transition) context ivb #: src/runcon.c:87 msgid "" "Run a program in a different security context.\n" "With neither CONTEXT nor COMMAND, print the current security context.\n" -"\n" +msgstr "" + +# (process transition) context ivb +#: src/runcon.c:94 +#, fuzzy +msgid "" " CONTEXT Complete security context\n" " -c, --compute compute process transition context before modifying\n" " -t, --type=TYPE type (for same role as parent)\n" @@ -8940,80 +9321,80 @@ msgstr "" " -r, --role=ROL Nou ROL.\n" " -l, --range=RANG Nou RANG de nivells.\n" -#: src/runcon.c:140 +#: src/runcon.c:144 #, c-format msgid "multiple roles" msgstr "s’han especificat múltiples rols" -#: src/runcon.c:145 +#: src/runcon.c:149 #, c-format msgid "multiple types" msgstr "s’han especificat múltiples tipus" -#: src/runcon.c:150 +#: src/runcon.c:154 #, c-format msgid "multiple users" msgstr "s’han especificat múltiples usuaris" -#: src/runcon.c:155 +#: src/runcon.c:159 #, c-format msgid "multiple levelranges" msgstr "s’han especificat múltiples rangs de nivells" -#: src/runcon.c:173 src/runcon.c:209 +#: src/runcon.c:177 src/runcon.c:213 #, c-format msgid "failed to get current context" msgstr "no s’ha pogut obtenir el context actual" -#: src/runcon.c:183 +#: src/runcon.c:187 #, c-format msgid "you must specify -c, -t, -u, -l, -r, or context" msgstr "" "cal que empreu les opcions «-c», «-t», «-u», «-l», «-r» o que especifiqueu " "un context" -#: src/runcon.c:191 +#: src/runcon.c:195 #, c-format msgid "no command specified" msgstr "no s’ha especificat cap ordre" # No usa quote(). ivb -#: src/runcon.c:197 +#: src/runcon.c:201 #, 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:223 +#: src/runcon.c:227 #, 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:237 +#: src/runcon.c:241 #, 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:239 +#: src/runcon.c:243 #, 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:241 +#: src/runcon.c:245 #, 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:243 +#: src/runcon.c:247 #, 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:251 +#: src/runcon.c:255 #, c-format msgid "unable to set security context %s" msgstr "no s’ha pogut establir el context de seguretat «%s»" @@ -9030,9 +9411,12 @@ msgstr "" " o bé: %s [OPCIÓ]… PRIMER INCREMENT DARRER\n" #: src/seq.c:73 +msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" +msgstr "" + +#: src/seq.c:79 +#, fuzzy msgid "" -"Print numbers from FIRST to LAST, in steps of INCREMENT.\n" -"\n" " -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" @@ -9045,7 +9429,7 @@ msgstr "" " (per defecte «\\n»).\n" " -w, --equal-width Iguala l’amplària reomplint amb zeros al davant.\n" -#: src/seq.c:82 +#: src/seq.c:86 msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" @@ -9064,8 +9448,7 @@ msgstr "" "ser\n" "negatiu si PRIMER és major que DARRER.\n" -#: src/seq.c:90 -#, fuzzy +#: src/seq.c:94 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" @@ -9077,36 +9460,18 @@ msgstr "" "números decimals de coma fixa amb una PRECISIÓ màxima, «%g» en cas " "contrari.\n" -#: src/seq.c:136 +#: src/seq.c:140 #, c-format msgid "invalid floating point argument: %s" msgstr "l’argument de coma flotant no és vàlid: «%s»" -# Usa quote(). ivb -#: src/seq.c:193 -#, c-format -msgid "format %s has no %% directive" -msgstr "el format %s no té una directiva «%%»" - -# Usa quote(). ivb -#: src/seq.c:210 -#, c-format -msgid "format %s ends in %%" -msgstr "el format %s acaba en «%%»" - # Usa quote() en la 1a. ivb -#: src/seq.c:213 +#: src/seq.c:232 #, c-format msgid "format %s has unknown %%%c directive" msgstr "el format %s té una directiva «%%%c» desconeguda" -# Usa quote(). ivb -#: src/seq.c:217 -#, c-format -msgid "format %s has too many %% directives" -msgstr "el format %s té massa directives «%%»" - -#: src/seq.c:431 +#: src/seq.c:555 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" @@ -9152,29 +9517,29 @@ msgstr "" " s’indiquen, els grups suplementaris a GID1, GID2…\n" # Usa quote(). ivb -#: src/setuidgid.c:163 +#: 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:174 +#: 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:191 +#: 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:201 +#: 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:205 +#: src/setuidgid.c:204 #, c-format msgid "cannot set user-ID to %lu" msgstr "no s’ha pogut establir l’identificador d’usuari %lu" @@ -9185,17 +9550,17 @@ msgid "Colin Plumb" msgstr "Colin Plumb" #: src/shred.c:148 +#, 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" -"\n" 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:156 +#: src/shred.c:155 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -9213,7 +9578,7 @@ msgstr "" "sufixos\n" " com «K», «M» i «G»).\n" -#: src/shred.c:162 +#: src/shred.c:161 msgid "" " -u, --remove truncate and remove file after overwriting\n" " -v, --verbose show progress\n" @@ -9232,7 +9597,7 @@ msgstr "" "zeros\n" " per amagar la destrucció de les dades.\n" -#: src/shred.c:171 +#: src/shred.c:170 msgid "" "\n" "If FILE is -, shred standard output.\n" @@ -9253,7 +9618,7 @@ msgstr "" "«--remove».\n" "\n" -#: src/shred.c:181 +#: src/shred.c:180 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" @@ -9275,7 +9640,7 @@ msgstr "" "del sistema de fitxers:\n" "\n" -#: src/shred.c:189 +#: src/shred.c:188 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -9299,7 +9664,7 @@ msgstr "" " Appliances.\n" "\n" -#: src/shred.c:199 +#: src/shred.c:198 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -9313,7 +9678,7 @@ msgstr "" "* Sistemes de fitxers amb compressió.\n" "\n" -#: src/shred.c:206 +#: src/shred.c:205 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" @@ -9337,7 +9702,7 @@ msgstr "" "«/etc/fstab», com s’indica al manual de «mount» (executeu «man mount»).\n" "\n" -#: src/shred.c:216 +#: src/shred.c:215 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" @@ -9348,125 +9713,125 @@ 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:296 +#: src/shred.c:295 #, c-format msgid "%s: fdatasync failed" msgstr "%s: ha fallat fdatasync()" -#: src/shred.c:307 +#: src/shred.c:306 #, c-format msgid "%s: fsync failed" msgstr "%s: ha fallat fsync()" -#: src/shred.c:384 +#: src/shred.c:383 #, c-format msgid "%s: cannot rewind" msgstr "%s: no s’ha pogut rebobinar" -#: src/shred.c:403 +#: src/shred.c:402 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: passada %lu/%lu (%s)…" -#: src/shred.c:453 +#: src/shred.c:452 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: error en escriure al desplaçament %s" -#: src/shred.c:471 +#: src/shred.c:470 #, c-format msgid "%s: lseek failed" msgstr "%s: ha fallat lseek()" -#: src/shred.c:482 +#: src/shred.c:481 #, c-format msgid "%s: file too large" msgstr "%s: el fitxer és massa gran" -#: src/shred.c:505 +#: src/shred.c:504 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: passada %lu/%lu (%s)…%s" -#: src/shred.c:521 +#: src/shred.c:520 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: passada %lu/%lu (%s)…%s/%s %d%%" -#: src/shred.c:768 +#: src/shred.c:767 #, c-format msgid "%s: fstat failed" msgstr "%s: ha fallat fstat()" -#: src/shred.c:779 +#: src/shred.c:778 #, c-format msgid "%s: invalid file type" msgstr "%s: el tipus del fitxer no és vàlid" -#: src/shred.c:798 +#: src/shred.c:797 #, c-format msgid "%s: file has negative size" msgstr "%s: el fitxer té una mida negativa" -#: src/shred.c:865 +#: src/shred.c:864 src/sort.c:932 src/split.c:378 #, c-format msgid "%s: error truncating" msgstr "%s: error en truncar" -#: src/shred.c:881 +#: src/shred.c:880 #, c-format msgid "%s: fcntl failed" msgstr "%s: ha fallat fcntl()" -#: src/shred.c:886 +#: src/shred.c:885 #, 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:968 +#: src/shred.c:967 #, c-format msgid "%s: removing" msgstr "%s: inici de l’eliminació" # No usa quote(). ivb -#: src/shred.c:992 +#: src/shred.c:991 #, c-format msgid "%s: renamed to %s" msgstr "%s: s’ha reanomenat a «%s»" -#: src/shred.c:1014 +#: src/shred.c:1013 #, c-format msgid "%s: failed to remove" msgstr "%s: no s’ha pogut eliminar" -#: src/shred.c:1018 +#: src/shred.c:1017 #, c-format msgid "%s: removed" msgstr "%s: ha estat eliminat" -#: src/shred.c:1025 src/shred.c:1068 +#: src/shred.c:1024 src/shred.c:1067 #, c-format msgid "%s: failed to close" msgstr "%s: no s’ha pogut tancar" -#: src/shred.c:1061 +#: src/shred.c:1060 #, c-format msgid "%s: failed to open for writing" msgstr "%s: no s’ha pogut obrir per a escriure" -#: src/shred.c:1126 +#: src/shred.c:1125 #, c-format msgid "%s: invalid number of passes" msgstr "%s: el nombre de passades no és vàlid" -#: src/shred.c:1135 src/shuf.c:291 src/sort.c:4387 +#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441 #, c-format msgid "multiple random sources specified" msgstr "s’han especificat múltiples fonts d’aleatorietat" -#: src/shred.c:1149 +#: src/shred.c:1148 #, c-format msgid "%s: invalid file size" msgstr "%s: la mida del fitxer no és vàlida" @@ -9483,15 +9848,14 @@ msgstr "" " o bé: %s -i INF-SUP [OPCIÓ]…\n" #: src/shuf.c:54 -msgid "" -"Write a random permutation of the input lines to standard output.\n" -"\n" +#, fuzzy +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:61 +#: src/shuf.c:60 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 " @@ -9516,33 +9880,33 @@ msgstr "" "nova\n" " línia.\n" -#: src/shuf.c:245 +#: src/shuf.c:244 #, c-format msgid "multiple -i options specified" msgstr "s’han especificat múltiples opcions «-i»" -#: src/shuf.c:265 +#: src/shuf.c:264 #, c-format msgid "invalid input range %s" msgstr "el rang d’entrada no és vàlid: %s" -#: src/shuf.c:278 +#: src/shuf.c:277 #, c-format msgid "invalid line count %s" msgstr "el nombre de línies no és vàlid: %s" -#: src/shuf.c:285 src/sort.c:4381 +#: src/shuf.c:284 src/sort.c:4435 #, c-format msgid "multiple output files specified" msgstr "s’han especificat múltiples fitxers d’eixida" -#: src/shuf.c:311 +#: src/shuf.c:310 #, c-format msgid "cannot combine -e and -i options" msgstr "no es poden combinar les opcions «-e» i «-i»" #: src/sleep.c:44 -#, fuzzy, c-format +#, c-format msgid "" "Usage: %s NUMBER[SUFFIX]...\n" " or: %s OPTION\n" @@ -9567,7 +9931,7 @@ msgstr "" "\n" # Usa quote(). ivb -#: src/sleep.c:135 src/timeout.c:295 +#: src/sleep.c:135 src/timeout.c:320 #, c-format msgid "invalid time interval %s" msgstr "l’interval de temps %s no és vàlid" @@ -9577,15 +9941,14 @@ msgstr "l’interval de temps %s no és vàlid" msgid "cannot read realtime clock" msgstr "no s’ha pogut llegir el rellotge de temps real" -#: src/sort.c:395 -msgid "" -"Write sorted concatenation of all FILE(s) to standard output.\n" -"\n" +#: src/sort.c:399 +#, fuzzy +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:402 +#: src/sort.c:405 msgid "" "Ordering options:\n" "\n" @@ -9593,7 +9956,7 @@ msgstr "" "Opcions d’ordenació:\n" "\n" -#: src/sort.c:406 +#: src/sort.c:409 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -9608,8 +9971,7 @@ msgstr "" " alfanumèrics.\n" " -f, --ignore-case Converteix a majúscules.\n" -#: src/sort.c:412 -#, fuzzy +#: src/sort.c:415 msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" " -i, --ignore-nonprinting consider only printable characters\n" @@ -9622,7 +9984,7 @@ msgstr "" " -M, --month-sort Ordena per mesos en anglés:\n" " (desconegut) < JAN < … < DEC.\n" -#: src/sort.c:417 +#: src/sort.c:420 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" @@ -9630,7 +9992,7 @@ msgstr "" " Compara números en format llegible per als humans\n" " (p.ex. «2K» i «1G»).\n" -#: src/sort.c:420 +#: src/sort.c:423 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -9643,7 +10005,7 @@ msgstr "" " Obté octets aleatoris del FITXER.\n" " -r, --reverse Inverteix el resultat de l’ordenació.\n" -#: src/sort.c:426 +#: src/sort.c:429 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -9661,7 +10023,7 @@ msgstr "" " «random» (-R).\n" " -V, --version-sort Ordena pel número (de versió) inclós al nom.\n" -#: src/sort.c:434 +#: src/sort.c:437 msgid "" "Other options:\n" "\n" @@ -9669,7 +10031,7 @@ msgstr "" "Altres opcions:\n" "\n" -#: src/sort.c:438 +#: src/sort.c:441 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" @@ -9678,7 +10040,7 @@ msgstr "" "a\n" " mesclar‐ne més empra fitxers temporals.\n" -#: src/sort.c:442 +#: src/sort.c:445 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 " @@ -9695,7 +10057,7 @@ msgstr "" " Comprimeix els fitxers temporals amb el PROGRAMA,\n" " els descomprimeix amb «PROGRAMA -d».\n" -#: src/sort.c:449 +#: src/sort.c:452 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -9713,7 +10075,7 @@ msgstr "" " Si el FITXER és «-», llegeix els noms de l’entrada\n" " estàndard.\n" -#: src/sort.c:456 +#: src/sort.c:459 msgid "" " -k, --key=KEYDEF sort via a key; KEYDEF gives location and type\n" " -m, --merge merge already sorted files; do not sort\n" @@ -9722,7 +10084,7 @@ msgstr "" " ubicació i el tipus.\n" " -m, --merge Mescla fitxers prèviament ordenats; no ordena.\n" -#: src/sort.c:460 +#: src/sort.c:463 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -9736,7 +10098,7 @@ msgstr "" " -S, --buffer-size=MIDA\n" " Defineix la MIDA de la memòria intermèdia principal.\n" -#: src/sort.c:466 +#: src/sort.c:469 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -9763,14 +10125,14 @@ msgstr "" " contrari només escriu la primera d’aquelles entrades\n" " que resulten iguals.\n" -#: src/sort.c:475 +#: 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:480 +#: src/sort.c:483 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -9801,9 +10163,9 @@ msgstr "" "a aquesta clau. Si no s’indica cap clau, s’empra la línia sencera com a " "clau.\n" "\n" -"La MIDA pot anar seguida dels següent sufixs multiplicadors:\n" +"La MIDA pot anar seguida pels següents sufixs multiplicadors:\n" -#: src/sort.c:493 +#: src/sort.c:496 msgid "" "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n" "\n" @@ -9826,286 +10188,287 @@ msgstr "" # No usa quote() (afortunadament). ivb # Condició d'error. ivb -#: src/sort.c:694 +#: src/sort.c:697 #, c-format msgid "waiting for %s [-d]" msgstr "en esperar la finalització de «%s [-d]»" # No usa quote() (afortunadament). ivb -#: src/sort.c:699 +#: src/sort.c:702 #, c-format msgid "%s [-d] terminated abnormally" msgstr "«%s [-d]» ha finalitzat de forma anormal" # Usa quote(). ivb -#: src/sort.c:853 +#: src/sort.c:856 #, c-format msgid "cannot create temporary file in %s" msgstr "no s’ha pogut crear un fitxer temporal a %s" -#: src/sort.c:939 src/sort.c:2010 src/sort.c:3056 src/sort.c:3755 -#: src/sort.c:3758 +#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713 +#: src/sort.c:3804 src/sort.c:3807 msgid "open failed" msgstr "no s’ha pogut obrir" -#: src/sort.c:959 +#: src/sort.c:970 msgid "fflush failed" msgstr "ha fallat fflush()" -#: src/sort.c:964 src/sort.c:2013 src/sort.c:4646 +#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706 msgid "close failed" msgstr "no s’ha pogut tancar" -#: src/sort.c:973 +#: src/sort.c:986 #, c-format msgid "dup2 failed" msgstr "ha fallat dup2()" # No usa quote(). ivb -#: src/sort.c:1090 +#: 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:1097 +#: src/sort.c:1110 msgid "couldn't create temporary file" msgstr "no s’ha pogut crear el fitxer temporal" # No usa quote() (afortunadament). ivb -#: src/sort.c:1136 +#: src/sort.c:1149 #, 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:1150 +#: 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:1209 +#: src/sort.c:1220 #, c-format msgid "warning: cannot remove: %s" msgstr "avís: no s’ha pogut eliminar: %s" # La segona usa quote(). ivb -#: src/sort.c:1295 +#: src/sort.c:1306 #, 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:1298 +#: src/sort.c:1309 #, 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:1313 +#: src/sort.c:1324 #, 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:1316 +#: src/sort.c:1327 #, 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:1398 +#: src/sort.c:1409 #, c-format msgid "number in parallel must be nonzero" msgstr "el nombre d’ordenacions concurrents ha de ser major que zero" -#: src/sort.c:1479 +#: src/sort.c:1494 msgid "stat failed" msgstr "ha fallat stat()" -#: src/sort.c:1740 +#: src/sort.c:1755 msgid "read failed" msgstr "no s’ha pogut llegir" -#: src/sort.c:2028 +#: src/sort.c:2043 #, c-format msgid "string transformation failed" msgstr "ha fallat la transformació de la cadena" # Usa quote(). ivb -#: src/sort.c:2031 +#: src/sort.c:2046 #, c-format msgid "the untransformed string was %s" msgstr "la cadena sense transformar era %s" -#: src/sort.c:2194 +#: src/sort.c:2209 #, c-format msgid "^ no match for key\n" msgstr "^ no s’ha trobat la clau\n" -#: src/sort.c:2374 -#, fuzzy, c-format +#: src/sort.c:2389 +#, 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:2380 +#: src/sort.c:2395 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "es descarta la clau %lu de longitud zero" -#: src/sort.c:2391 -#, fuzzy, c-format +#: src/sort.c:2406 +#, 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:2404 +#: src/sort.c:2419 #, 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:2436 -#, fuzzy, c-format +#: src/sort.c:2451 +#, 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:2442 -#, fuzzy, c-format +#: src/sort.c:2457 +#, 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:2716 src/sort.c:2725 +#: src/sort.c:2731 src/sort.c:2740 msgid "write failed" msgstr "no s’ha pogut escriure" -#: src/sort.c:2768 +#: src/sort.c:2783 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: fora d’ordre: " -#: src/sort.c:2771 +#: src/sort.c:2786 msgid "standard error" msgstr "eixida estàndard d’errors" +# Condició d’error, però imprecisa. ivb +#: src/sort.c:3698 +msgid "cannot read" +msgstr "no es pot llegir" + # Usa quote(). ivb -#: src/sort.c:3926 +#: src/sort.c:3976 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: l’especifiació de camp no és vàlida: %s" -#: src/sort.c:3937 -#, fuzzy, c-format +#: src/sort.c:3987 +#, c-format msgid "options '-%s' are incompatible" msgstr "les opcions «%s» no són compatibles" # Usa quote(). ivb -#: src/sort.c:3988 +#: src/sort.c:4038 #, 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:4245 -#, fuzzy +#: src/sort.c:4295 msgid "invalid number after '-'" msgstr "el número després de «-» no és vàlid" -#: src/sort.c:4248 src/sort.c:4334 src/sort.c:4362 -#, fuzzy +#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416 msgid "invalid number after '.'" msgstr "el número després de «.» no és vàlid" -#: src/sort.c:4261 src/sort.c:4367 +#: src/sort.c:4315 src/sort.c:4421 msgid "stray character in field spec" msgstr "l’especificació de camp conté un caràcter extraviat" -#: src/sort.c:4308 +#: src/sort.c:4362 #, c-format msgid "multiple compress programs specified" msgstr "s’han especificat múltiples programes de compressió" -#: src/sort.c:4325 +#: src/sort.c:4379 msgid "invalid number at field start" msgstr "el número a l’inici del camp no és vàlid" -#: src/sort.c:4329 src/sort.c:4357 +#: src/sort.c:4383 src/sort.c:4411 msgid "field number is zero" msgstr "el número de camp és zero" -#: src/sort.c:4338 +#: src/sort.c:4392 msgid "character offset is zero" msgstr "el desplaçament de caràcter és zero" -#: src/sort.c:4353 -#, fuzzy +#: src/sort.c:4407 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:4403 +#: src/sort.c:4457 #, c-format msgid "empty tab" msgstr "el separador és buit" # Usa quote(). ivb -#: src/sort.c:4496 src/wc.c:692 +#: src/sort.c:4550 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:4518 +#: src/sort.c:4572 #, 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:4524 +#: src/sort.c:4578 #, 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:4570 +#: src/sort.c:4624 #, c-format msgid "using %s sorting rules" msgstr "s’estan emprant les regles d’ordenació de %s" # Missatge informatiu. ivb -#: src/sort.c:4573 +#: src/sort.c:4627 #, c-format msgid "using simple byte comparison" msgstr "s’està emprant la comparació directa d’octets" # Usa quote(). ivb -#: src/sort.c:4604 +#: src/sort.c:4658 #, 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:184 +#: src/split.c:187 #, 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:201 +#: src/split.c:204 #, c-format msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" msgstr "Forma d’ús: %s [OPCIÓ]… [ENTRADA [PREFIX]]\n" -#: src/split.c:205 +#: src/split.c:208 #, fuzzy 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" -"\n" msgstr "" "Escriu trossos de mida fixa de l’ENTRADA en fitxers «PREFIXaa», «PREFIXab»…\n" "La mida per defecte és de 1000 línies, i el PREFIX per defecte és «x». " @@ -10115,8 +10478,8 @@ msgstr "" # corregir l'opció -C # Ein? ivb -#: src/split.c:214 -#, fuzzy, c-format +#: src/split.c:216 +#, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" " --additional-suffix=SUFFIX append an additional SUFFIX to file " @@ -10133,12 +10496,16 @@ msgid "" " -n, --number=CHUNKS generate CHUNKS output files. See below\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" -" -a, --suffix-length=N Empra sufixs de longitud N (per defecte %d).\n" +" -a, --suffix-length=N Genera sufixs de longitud N (per defecte %d).\n" +" --additional-suffix=SUFIX\n" +" Afegeix un SUFIX addicional als noms de fitxer.\n" " -b, --bytes=MIDA Escriu MIDA octets per fitxer.\n" " -C, --line-bytes=MIDA Escriu com a molt MIDA octets de línies senceres\n" " per cada fitxer d’eixida.\n" -" -d, --numeric-suffixes\n" -" Empra sufixs numèrics en lloc d’alfabètics.\n" +" -d, --numeric-suffixes[=INICI]\n" +" Empra sufixs numèrics en lloc d’alfabètics, " +"començant\n" +" pel valor d’INICI indicat (per defecte 0).\n" " -e, --elide-empty-files\n" " No genera fitmers d’eixida buits amb «-n».\n" " --filter=ORDRE Escriu a l’ORDRE de l’intèrpret indicada; el nom " @@ -10149,7 +10516,7 @@ msgstr "" " -u, --unbuffered Còpia immediatament l’entrada a l’eixida en emprar\n" " «-n r/…».\n" -#: src/split.c:227 +#: src/split.c:229 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" @@ -10157,8 +10524,7 @@ msgstr "" " --verbose Mostra un missatge abans d’obrir cada fitxer de\n" " sortida.\n" -#: src/split.c:234 -#, fuzzy +#: src/split.c:236 msgid "" "\n" "CHUNKS may be:\n" @@ -10181,181 +10547,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:352 +#: src/split.c:354 #, 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:364 +#: src/split.c:366 #, c-format msgid "creating file %s\n" msgstr "s’està creant el fitxer %s\n" # Usa quote(). ivb -#: src/split.c:377 +#: src/split.c:375 +#, c-format +msgid "%s would overwrite input; aborting" +msgstr "%s sobreescriuria l’entrada; s’avorta" + +# Usa quote(). ivb +#: src/split.c:391 #, 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:379 +#: src/split.c:393 #, c-format msgid "executing with FILE=%s\n" msgstr "s’està executant amb «FILE=%s»\n" -#: src/split.c:381 +#: src/split.c:395 #, c-format msgid "failed to create pipe" msgstr "no s’ha pogut crear la canonada" # És un missatge d'error. ivb -#: src/split.c:395 +#: src/split.c:409 #, c-format msgid "closing prior pipe" msgstr "en tancar la canonada anterior" # Condició d'error. ivb -#: src/split.c:397 +#: src/split.c:411 #, c-format msgid "closing output pipe" msgstr "en tancar la canonada d’eixida" # Condició d'error. ivb -#: src/split.c:401 +#: src/split.c:415 #, c-format msgid "moving input pipe" msgstr "en moure la canonada d’entrada" # Condició d'error. ivb -#: src/split.c:403 +#: src/split.c:417 #, c-format msgid "closing input pipe" msgstr "en tancar la canonada d’entrada" -#: src/split.c:408 +#: src/split.c:422 #, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "no s’ha pogut executar l’ordre «%s -c %s»" -#: src/split.c:414 +#: src/split.c:428 #, 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:450 +#: src/split.c:464 #, c-format msgid "waiting for child process" msgstr "en esperar la finalització del procés fill" -#: src/split.c:460 +#: src/split.c:474 #, 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:468 +#: src/split.c:482 #, 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" -#: src/split.c:475 src/timeout.c:449 +#: src/split.c:489 src/timeout.c:494 #, c-format msgid "unknown status from command (0x%X)" msgstr "l’estat d’eixida de l’ordre és desconegut (0x%X)" -#: src/split.c:1037 +#: src/split.c:1052 #, 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:1050 src/split.c:1192 src/split.c:1363 +#: src/split.c:1065 src/split.c:1205 src/split.c:1376 #, 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:1054 +#: src/split.c:1069 #, c-format msgid "%s: invalid chunk number" msgstr "%s: el número del tros no és vàlid" -#: src/split.c:1106 +#: src/split.c:1119 #, c-format msgid "%s: invalid suffix length" msgstr "%s: la longitud del sufix no és vàlida" -#: src/split.c:1131 src/split.c:1139 src/split.c:1162 src/split.c:1167 +#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180 #, c-format msgid "%s: invalid number of bytes" msgstr "%s: el nombre d’octets no és vàlid" -#: src/split.c:1150 src/split.c:1297 +#: src/split.c:1163 src/split.c:1310 #, c-format msgid "%s: invalid number of lines" msgstr "%s: el nombre de línies no és vàlid" -#: src/split.c:1223 +#: src/split.c:1236 #, c-format msgid "line count option -%s%c... is too large" msgstr "l’opció de nombre de línies «-%s%c…» és massa gran" -# Usa quote(). ivb -#: src/split.c:1235 -#, fuzzy, c-format +#: src/split.c:1248 +#, c-format msgid "%s: invalid start value for numerical suffix" -msgstr "el número inicial de línia no és vàlid: %s" +msgstr "%s: el valor d’inici per als sufixs numèrics no és vàlid" -#: src/split.c:1263 +#: src/split.c:1276 #, c-format msgid "%s: invalid IO block size" msgstr "%s: la mida del bloc d’E/S no és vàlida" -#: src/split.c:1284 +#: src/split.c:1297 #, 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:1321 +#: src/split.c:1334 #, 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:1356 +#: src/split.c:1369 #, 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:169 +#: src/stat.c:173 msgid "Michael Meskes" msgstr "Michael Meskes" # Usa quote(). ivb -#: src/stat.c:838 +#: src/stat.c:857 #, c-format msgid "failed to canonicalize %s" msgstr "no s’ha pogut trobar el nom canònic de %s" -#: src/stat.c:1050 -#, fuzzy, c-format +#: src/stat.c:1069 +#, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "avís: la seqüència d’escapada «\\%c» no és reconeguda" -#: src/stat.c:1105 +#: src/stat.c:1124 #, c-format msgid "%s: invalid directive" msgstr "%s: la directiva no és vàlida" -#: src/stat.c:1151 +#: src/stat.c:1170 #, 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:1182 +#: src/stat.c:1201 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" @@ -10363,20 +10736,20 @@ msgstr "" "fitxers" # Usa quote(). ivb -#: src/stat.c:1189 +#: src/stat.c:1208 #, 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:1209 +#: src/stat.c:1228 #, 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:1245 +#: src/stat.c:1264 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -10393,7 +10766,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:1268 +#: src/stat.c:1287 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -10404,34 +10777,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:1278 +#: src/stat.c:1297 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:1286 +#: src/stat.c:1305 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:1295 +#: src/stat.c:1314 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:1305 +#: src/stat.c:1324 #, c-format msgid "Context: %C\n" msgstr " Context: %C\n" # Alineat amb «Modificació:». ivb -#: src/stat.c:1313 +#: src/stat.c:1332 msgid "" "Access: %x\n" "Modify: %y\n" @@ -10443,10 +10816,13 @@ msgstr "" " Canvi: %z\n" " Naixement: %w\n" -#: src/stat.c:1331 +#: src/stat.c:1350 +msgid "Display file or file system status.\n" +msgstr "" + +#: src/stat.c:1356 +#, fuzzy msgid "" -"Display file or file system status.\n" -"\n" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" @@ -10456,7 +10832,7 @@ msgstr "" " -f, --file-system Mostra l’estat del sistema de fitxers en lloc de\n" " l’estat del fitxer.\n" -#: src/stat.c:1337 +#: src/stat.c:1360 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -10476,7 +10852,7 @@ msgstr "" " incloeu «\\n» al FORMAT.\n" " -t, --terse Mostra la informació de forma pelada.\n" -#: src/stat.c:1348 +#: src/stat.c:1371 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -10497,7 +10873,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:1357 +#: src/stat.c:1380 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -10513,8 +10889,7 @@ msgstr "" " %g Identificador del grup del propietari.\n" " %G Nom del grup del propietari.\n" -#: src/stat.c:1365 -#, fuzzy +#: src/stat.c:1388 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -10533,13 +10908,13 @@ msgstr "" " %N Nom entrecometat del fitxer, o del fitxer apuntat al cas d’un " "enllaç\n" " simbòlic.\n" -" %o Mida del bloc d’E/S.\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" # Indique «de les dades» i «del node índex», queda més clar. ivb -#: src/stat.c:1376 +#: src/stat.c:1399 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -10571,7 +10946,7 @@ msgstr "" " %Z Data del darrer canvi al node índex en segons des de l’Època.\n" "\n" -#: src/stat.c:1390 +#: src/stat.c:1413 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -10589,7 +10964,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:1399 +#: src/stat.c:1422 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -10613,14 +10988,14 @@ 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" -"\n" msgstr "" "Executa l’ORDRE tot ajustant la memòria intermèdia dels seus fluxos " "estàndard.\n" -#: src/stdbuf.c:98 +#: src/stdbuf.c:97 msgid "" " -i, --input=MODE adjust standard input stream buffering\n" " -o, --output=MODE adjust standard output stream buffering\n" @@ -10631,8 +11006,7 @@ msgstr "" " -e, --error=MODE Ajusta la memòria intermèdia de l’eixida estàndard\n" " d’errors.\n" -#: src/stdbuf.c:105 -#, fuzzy +#: src/stdbuf.c:104 msgid "" "\n" "If MODE is 'L' the corresponding stream will be line buffered.\n" @@ -10643,8 +11017,7 @@ msgstr "" "basada\n" "en línies. Aquesta opció no és vàlida per a l’entrada estàndard.\n" -#: src/stdbuf.c:108 -#, fuzzy +#: src/stdbuf.c:107 msgid "" "\n" "If MODE is '0' the corresponding stream will be unbuffered.\n" @@ -10652,7 +11025,7 @@ msgstr "" "\n" "Si el MODE és «0», el flux corresponent no emprarà memòria intermèdia.\n" -#: src/stdbuf.c:111 +#: src/stdbuf.c:110 msgid "" "\n" "Otherwise MODE is a number which may be followed by one of the following:\n" @@ -10670,8 +11043,7 @@ msgstr "" "indicada\n" "pel MODE en octets.\n" -#: src/stdbuf.c:117 -#, fuzzy +#: src/stdbuf.c:116 msgid "" "\n" "NOTE: If COMMAND adjusts the buffering of its standard streams ('tee' does\n" @@ -10690,24 +11062,24 @@ msgstr "" "«stdbuf».\n" # Usa quote(). ivb -#: src/stdbuf.c:227 +#: src/stdbuf.c:226 #, c-format msgid "failed to find %s" msgstr "no s’ha trobat %s" # Usa quote(). ivb -#: src/stdbuf.c:247 src/stdbuf.c:279 +#: src/stdbuf.c:246 src/stdbuf.c:278 #, c-format msgid "failed to update the environment with %s" msgstr "no s’ha pogut modificar l’entorn amb %s" -#: src/stdbuf.c:321 +#: src/stdbuf.c:320 #, 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:509 +#: src/stty.c:513 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -10718,10 +11090,13 @@ msgstr "" " o bé: %s [-F DISPOSITIU | --file=DISPOSITIU] [-a|--all]\n" " o bé: %s [-F DISPOSITIU | --file=DISPOSITIU] [-g|--save]\n" -#: src/stty.c:515 +#: src/stty.c:519 +msgid "Print or change terminal characteristics.\n" +msgstr "" + +#: src/stty.c:525 +#, fuzzy msgid "" -"Print or change terminal characteristics.\n" -"\n" " -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" @@ -10738,7 +11113,7 @@ msgstr "" "de\n" " l’entrada estàndard.\n" -#: src/stty.c:524 +#: src/stty.c:532 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -10751,7 +11126,7 @@ msgstr "" "subjaent.\n" # El més llarg és «werase CAR». ivb -#: src/stty.c:529 +#: src/stty.c:537 msgid "" "\n" "Special characters:\n" @@ -10767,7 +11142,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:536 +#: src/stty.c:544 msgid "" " * eol2 CHAR alternate CHAR for ending the line\n" " erase CHAR CHAR will erase the last character typed\n" @@ -10779,7 +11154,7 @@ msgstr "" " intr CAR CAR enviarà un senyal d’interrupció.\n" " kill CAR CAR esborrarà la línia actual.\n" -#: src/stty.c:542 +#: src/stty.c:550 msgid "" " * lnext CHAR CHAR will enter the next character quoted\n" " quit CHAR CHAR will send a quit signal\n" @@ -10791,7 +11166,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:548 +#: src/stty.c:556 msgid "" " stop CHAR CHAR will stop the output\n" " susp CHAR CHAR will send a terminal stop signal\n" @@ -10803,7 +11178,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:554 +#: src/stty.c:562 msgid "" "\n" "Special settings:\n" @@ -10817,7 +11192,7 @@ msgstr "" " * cols N Anuncia al nucli que el terminal té N columnes.\n" " * columns N Equival a «cols N».\n" -#: src/stty.c:561 +#: src/stty.c:569 msgid "" " ispeed N set the input speed to N\n" " * line N use line discipline N\n" @@ -10831,7 +11206,7 @@ msgstr "" " lectura completa.\n" " ospeed N Estableix la velocitat d’eixida a N bauds.\n" -#: src/stty.c:567 +#: src/stty.c:575 msgid "" " * rows N tell the kernel that the terminal has N rows\n" " * size print the number of rows and columns according to the " @@ -10846,13 +11221,15 @@ msgstr "" "dècimes\n" " de segon.\n" -#: src/stty.c:573 +#: src/stty.c:581 +#, fuzzy msgid "" "\n" "Control settings:\n" " [-]clocal disable modem control signals\n" " [-]cread allow input to be received\n" " * [-]crtscts enable RTS/CTS handshaking\n" +" * [-]cdtrdsr enable DTR/DSR handshaking\n" " csN set character size to N bits, N in [5..8]\n" msgstr "" "\n" @@ -10862,15 +11239,14 @@ msgstr "" " * [-]crtscts Habilita l’establiment de connexió amb RTS/CTS.\n" " csN Estableix la mida de caràcter a N bits [5..8].\n" -#: src/stty.c:581 -#, fuzzy +#: src/stty.c:590 msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" " [-]hupcl same as [-]hup\n" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" -" [-]parodd set odd parity (even with '-')\n" +" [-]parodd set odd parity (or even parity with '-')\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 " @@ -10881,7 +11257,7 @@ msgstr "" " l’entrada.\n" " [-]parodd Empra paritat senar (parella amb «-»).\n" -#: src/stty.c:588 +#: src/stty.c:597 msgid "" "\n" "Input settings:\n" @@ -10898,7 +11274,7 @@ msgstr "" " [-]ignbrk Descarta els caràcters d’interrupció.\n" " [-]igncr Descarta els retorns de carro.\n" -#: src/stty.c:596 +#: src/stty.c:605 msgid "" " [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" @@ -10914,13 +11290,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:603 +#: src/stty.c:612 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:606 +#: src/stty.c:615 msgid "" " * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" @@ -10939,7 +11315,7 @@ msgstr "" " 255‐0‐caràcter).\n" " [-]tandem Equival a «[-]ixoff»\n" -#: src/stty.c:614 +#: src/stty.c:623 msgid "" "\n" "Output settings:\n" @@ -10955,7 +11331,7 @@ 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:622 +#: src/stty.c:631 msgid "" " * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of null characters\n" @@ -10972,7 +11348,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:630 +#: src/stty.c:639 msgid "" " * [-]onocr do not print carriage returns in the first column\n" " [-]opost postprocess output\n" @@ -10988,7 +11364,7 @@ msgstr "" " * -tabs Equival a «tab3».\n" " * vtN Estil del retard de la tabulació vertical, N en [0..1].\n" -#: src/stty.c:638 +#: src/stty.c:647 msgid "" "\n" "Local settings:\n" @@ -11003,8 +11379,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:645 -#, fuzzy +#: src/stty.c:654 msgid "" " * [-]ctlecho echo control characters in hat notation ('^c')\n" " [-]echo echo input characters\n" @@ -11020,8 +11395,7 @@ msgstr "" " [-]echok Mostra una nova línia després del caràcter d’esborrar " "línia.\n" -#: src/stty.c:652 -#, fuzzy +#: src/stty.c:661 msgid "" " * [-]echoke same as [-]crtkill\n" " [-]echonl echo newline even if not echoing other characters\n" @@ -11039,8 +11413,7 @@ msgstr "" " esborrar paraula i redibuixar.\n" " [-]iexten Habilita els caràcters especials no‐POSIX.\n" -#: src/stty.c:659 -#, fuzzy +#: src/stty.c:668 msgid "" " [-]isig enable interrupt, quit, and suspend special characters\n" " [-]noflsh disable flushing after interrupt and quit special " @@ -11058,7 +11431,7 @@ msgstr "" "terminal.\n" " * [-]xcase Amb «icanon», escapa amb «\\\\» les majúscules.\n" -#: src/stty.c:666 +#: src/stty.c:675 msgid "" "\n" "Combination settings:\n" @@ -11072,7 +11445,7 @@ msgstr "" " cbreak Equival a «-icanon».\n" " -cbreak Equival a «icanon».\n" -#: src/stty.c:673 +#: src/stty.c:682 msgid "" " cooked same as brkint ignpar istrip icrnl ixon opost isig\n" " icanon, eof and eol characters to their default values\n" @@ -11085,7 +11458,7 @@ msgstr "" " -cooked Equival a «raw».\n" " crt Equival a «echoe echoctl echoke».\n" -#: src/stty.c:679 +#: src/stty.c:688 msgid "" " dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" " kill ^u\n" @@ -11100,7 +11473,7 @@ msgstr "" " «erase».\n" " evenp Equival a «parenb -parodd cs7».\n" -#: src/stty.c:686 +#: src/stty.c:695 msgid "" " -evenp same as -parenb cs8\n" " * [-]lcase same as xcase iuclc olcuc\n" @@ -11116,7 +11489,7 @@ msgstr "" " nl Equival a «-icrnl -onlcr».\n" " -nl Equival a «icrnl -inlcr -igncr onlcr -ocrnl -onlret».\n" -#: src/stty.c:694 +#: src/stty.c:703 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -11130,7 +11503,7 @@ msgstr "" " pass8 Equival a «-parenb -istrip cs8».\n" " -pass8 Equival a «parenb istrip cs7».\n" -#: src/stty.c:701 +#: src/stty.c:710 msgid "" " raw same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" " -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n" @@ -11142,7 +11515,7 @@ msgstr "" " -opost -isig -icanon -xcase min 1 time 0»\n" " -raw Equival a «cooked».\n" -#: src/stty.c:707 +#: src/stty.c:716 msgid "" " sane same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" " -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n" @@ -11160,7 +11533,7 @@ msgstr "" "especials\n" " a llurs valors per defecte.\n" -#: src/stty.c:715 +#: src/stty.c:724 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -11175,12 +11548,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:787 +#: src/stty.c:796 #, c-format msgid "only one device may be specified" msgstr "només es pot especificar un dispositiu" -#: src/stty.c:817 +#: src/stty.c:826 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" @@ -11189,133 +11562,52 @@ msgstr "" "les opcions per a mostrar les propietats de forma llegible per humans i per " "«stty» són mútuament excloents" -#: src/stty.c:823 +#: src/stty.c:832 #, 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:838 +#: src/stty.c:847 #, 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:883 src/stty.c:993 +#: src/stty.c:892 src/stty.c:1002 #, c-format msgid "invalid argument %s" msgstr "l’argument %s no és vàlid" # Totes sis usen quote(). ivb -#: src/stty.c:894 src/stty.c:911 src/stty.c:923 src/stty.c:936 src/stty.c:948 -#: src/stty.c:968 +#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957 +#: src/stty.c:977 #, c-format msgid "missing argument to %s" msgstr "manca un argument per a %s" # Usa quote(). ivb -#: src/stty.c:974 +#: src/stty.c:983 #, c-format msgid "invalid line discipline %s" msgstr "la disciplina de línia %s no és vàlida" -#: src/stty.c:1044 +#: src/stty.c:1053 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s: no s’han pogut realitzar totes les operacions requerides" -#: src/stty.c:1390 +#: src/stty.c:1399 #, 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:1904 +#: src/stty.c:1920 #, c-format msgid "invalid integer argument %s" msgstr "l’argument enter %s no és vàlid" -#: src/su.c:229 -msgid "Password:" -msgstr "Contrasenya:" - -#: src/su.c:232 -#, c-format -msgid "getpass: cannot open /dev/tty" -msgstr "getpass: no s’ha pogut obrir «/dev/tty»" - -#: src/su.c:290 -#, c-format -msgid "cannot set groups" -msgstr "no s’han pogut establir els grups" - -#: src/su.c:294 -#, c-format -msgid "cannot set group id" -msgstr "no s’ha pogut establir l’identificador de grup" - -#: src/su.c:296 -#, c-format -msgid "cannot set user id" -msgstr "no s’ha pogut establir l’identificador d’usuari" - -#: src/su.c:371 -#, c-format -msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" -msgstr "Forma d’ús: %s [OPCIÓ]… [-] [USUARI [ARG]…]\n" - -#: src/su.c:372 -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 "" -"Canvia els identificadors efectius d’usuari i grup als de l’USUARI.\n" -"\n" -" -, -l, --login Fa servir un intèrpret d’entrada.\n" -" -c, --command=ORDRE Passa una ORDRE a l’intèrpret amb «-c».\n" -" -f, --fast Passa «-f» a l’intèrpret (per a «csh» o «tcsh»).\n" -" -m, --preserve-environment\n" -" No reinicia les variables d’entorn.\n" -" -p Equival a «-m».\n" -" -s, --shell=INTÈRPRET Executa l’INTÈRPRET si «/etc/shells» ho permet.\n" - -#: src/su.c:384 -msgid "" -"\n" -"A mere - implies -l. If USER not given, assume root.\n" -msgstr "" -"\n" -"Un «-» simple implica «-l». Si no s’indica cap USUARI, s’assumeix «root».\n" - -#: src/su.c:461 -#, c-format -msgid "user %s does not exist" -msgstr "l’usuari «%s» no existeix" - -#: src/su.c:484 -#, c-format -msgid "incorrect password" -msgstr "la contrasenya no és correcta" - -# No usa quote(). ivb -# Missatge informatiu. ivb -#: src/su.c:501 -#, c-format -msgid "using restricted shell %s" -msgstr "s’empra l’intèrpret restringit «%s»" - -# No usa quote(). ivb -#: src/su.c:509 -#, c-format -msgid "warning: cannot change directory to %s" -msgstr "avís: no s’ha pogut canviar al directori «%s»" - #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 msgid "Kayvan Aghaiepour" @@ -11348,7 +11640,7 @@ msgstr "" msgid "ignoring all arguments" msgstr "es descarten tots els arguments" -#: src/system.h:340 +#: src/system.h:343 #, c-format msgid "" "\n" @@ -11362,15 +11654,25 @@ msgstr "" "del\n" "vostre intèrpret quines opcions admet.\n" -#: src/system.h:346 +#: src/system.h:349 msgid " --help display this help and exit\n" msgstr " --help Mostra aquesta ajuda i surt.\n" -#: src/system.h:348 +#: src/system.h:351 msgid " --version output version information and exit\n" msgstr " --version Mostra informació sobre la versió i surt.\n" -#: src/system.h:541 +# Agafat més o menys de libc. ivb +#: src/system.h:544 +#, fuzzy +msgid "" +"\n" +"Mandatory arguments to long options are mandatory for short options too.\n" +msgstr "" +"Els arguments obligatoris per a les opcions llargues també ho són per a les\n" +"opcions curtes corresponents.\n" + +#: src/system.h:552 msgid "" "\n" "SIZE is an integer and optional unit (example: 10M is 10*1024*1024). Units\n" @@ -11385,7 +11687,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:550 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -11403,7 +11705,7 @@ msgstr "" # 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:560 +#: src/system.h:571 #, c-format msgid "" "\n" @@ -11416,24 +11718,24 @@ msgstr "" #. <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:574 +#: src/system.h:585 #, 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:578 +#: src/system.h:589 #, 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:585 -#, fuzzy, c-format +#: src/system.h:596 +#, 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:617 +#: src/system.h:628 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -11454,16 +11756,16 @@ 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" -"\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:145 +#: src/tac.c:144 msgid "" " -b, --before attach the separator before instead of after\n" " -r, --regex interpret the separator as a regular expression\n" @@ -11476,46 +11778,46 @@ msgstr "" "de\n" " nova línia.\n" -#: src/tac.c:235 src/tac.c:336 +#: src/tac.c:234 src/tac.c:335 #, c-format msgid "%s: seek failed" msgstr "%s: ha fallat el desplaçament" -#: src/tac.c:264 +#: src/tac.c:263 #, c-format msgid "record too large" msgstr "el registre és massa gran" # Usa quote(). ivb -#: src/tac.c:451 +#: src/tac.c:450 #, c-format msgid "failed to create temporary file in %s" msgstr "no s’ha pogut crear un fitxer temporal a %s" # Usa quote(). ivb -#: src/tac.c:459 +#: src/tac.c:458 #, c-format msgid "failed to open %s for writing" msgstr "no s’ha pogut obrir %s per a escriure" # Usa quote(). ivb -#: src/tac.c:476 +#: src/tac.c:475 #, c-format msgid "failed to rewind stream for %s" msgstr "no s’ha pogut rebobinar el flux de %s" -#: src/tac.c:512 src/tac.c:519 +#: src/tac.c:511 src/tac.c:518 #, c-format msgid "%s: write error" msgstr "%s: error d’escriptura" # Usa quote(). ivb -#: src/tac.c:572 +#: src/tac.c:571 #, c-format msgid "failed to open %s for reading" msgstr "no s’ha pogut obrir %s per a llegir" -#: src/tac.c:630 +#: src/tac.c:629 #, c-format msgid "separator cannot be empty" msgstr "el separador no pot ser buit" @@ -11526,12 +11828,11 @@ msgid "Ian Lance Taylor" msgstr "Ian Lance Taylor" #: src/tail.c:262 -#, c-format +#, fuzzy, 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" -"\n" msgstr "" "Escriu les darreres %d línies de cada FITXER a la sortida estàndard. Amb " "més\n" @@ -11540,7 +11841,7 @@ msgstr "" "FITXER, o quan FITXER és «-», llegeix l’entrada estàndard.\n" "\n" -#: src/tail.c:271 +#: src/tail.c:270 msgid "" " -c, --bytes=K output the last K bytes; alternatively, use -c " "+K\n" @@ -11553,7 +11854,7 @@ msgstr "" "de\n" " cada fitxer.\n" -#: src/tail.c:275 +#: src/tail.c:274 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -11567,7 +11868,7 @@ msgstr "" " -F Equival a «--follow=name --retry».\n" # «-n» cap pq per defecte és 10. ivb -#: src/tail.c:282 +#: src/tail.c:281 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -11595,7 +11896,7 @@ msgstr "" "Amb\n" " «inotify» aquesta opció no sol ser útil.\n" -#: src/tail.c:295 +#: src/tail.c:294 msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" " -q, --quiet, --silent never output headers giving file names\n" @@ -11613,7 +11914,7 @@ msgstr "" "pista\n" " d’un nom, és a dir, amb «--follow=NOM».\n" -#: src/tail.c:302 +#: src/tail.c:301 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations.\n" @@ -11628,8 +11929,7 @@ msgstr "" " segons.\n" " -v, --verbose Sempre escriu els noms dels fitxers.\n" -#: src/tail.c:311 -#, fuzzy +#: src/tail.c:310 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -11648,7 +11948,7 @@ msgstr "" "Y.\n" "\n" -#: src/tail.c:320 +#: src/tail.c:319 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" @@ -11669,29 +11969,29 @@ msgstr "" # No usa quote(). ivb # Missatge d'error. ivb -#: src/tail.c:379 +#: src/tail.c:378 #, c-format msgid "closing %s (fd=%d)" msgstr "en tancar «%s» (fd=%d)" -#: src/tail.c:454 +#: 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:458 +#: src/tail.c:457 #, 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:895 +#: src/tail.c:894 #, 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:907 +#: src/tail.c:906 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " @@ -11702,7 +12002,7 @@ msgstr "" # Usa quote(). ivb # FIXME: pretty_name() lacks i18n. ivb -#: src/tail.c:964 +#: src/tail.c:963 #, c-format msgid "%s has become inaccessible" msgstr "%s ha esdevingut inaccessible" @@ -11710,7 +12010,7 @@ msgstr "%s ha esdevingut inaccessible" # tailable = cuable? ;) # Usa quote(). ivb # FIXME: pretty_name() lacks i18n. ivb -#: src/tail.c:981 +#: src/tail.c:980 #, c-format msgid "%s has been replaced with an untailable file; giving up on this name" msgstr "" @@ -11719,7 +12019,7 @@ msgstr "" # Usa quote(). ivb # FIXME: pretty_name() lacks i18n. ivb -#: src/tail.c:990 +#: src/tail.c:989 #, c-format msgid "%s has been replaced with a remote file. giving up on this name" msgstr "" @@ -11727,27 +12027,27 @@ msgstr "" # Usa quote(). ivb # FIXME: pretty_name() lacks i18n. ivb -#: src/tail.c:1011 +#: src/tail.c:1010 #, c-format msgid "%s has become accessible" msgstr "%s ha esdevingut accessible" # Usa quote(). ivb # FIXME: pretty_name() lacks i18n. ivb -#: src/tail.c:1019 +#: src/tail.c:1018 #, 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:1030 +#: src/tail.c:1029 #, 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:1131 +#: src/tail.c:1130 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: no s’ha pogut desactivar el mode no blocador" @@ -12137,7 +12437,6 @@ msgid "Matthew Bradburn" msgstr "Matthew Bradburn" #: src/test.c:858 -#, fuzzy msgid "missing ']'" msgstr "manca «]»" @@ -12148,18 +12447,24 @@ msgid "extra argument %s" msgstr "sobra l’argument %s" # Indica una fallada de la crida. ivb -#: src/timeout.c:124 +#: src/timeout.c:112 +#, fuzzy, c-format +msgid "warning: sigprocmask" +msgstr "avís: ha fallat timer_create()" + +# Indica una fallada de la crida. ivb +#: src/timeout.c:145 #, c-format msgid "warning: timer_settime" msgstr "avís: ha fallat timer_settime()" # Indica una fallada de la crida. ivb -#: src/timeout.c:129 +#: src/timeout.c:150 #, c-format msgid "warning: timer_create" msgstr "avís: ha fallat timer_create()" -#: src/timeout.c:204 +#: src/timeout.c:225 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -12169,11 +12474,9 @@ msgstr "" " o bé: %s [OPCIÓ]\n" # Agafat més o menys de libc. ivb -#: src/timeout.c:208 -msgid "" -"Start COMMAND, and kill it if still running after DURATION.\n" -"\n" -"Mandatory arguments to long options are mandatory for short options too.\n" +#: src/timeout.c:229 +#, fuzzy +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" @@ -12182,9 +12485,12 @@ msgstr "" "Els arguments obligatoris per a les opcions llargues també ho són per a les\n" "opcions curtes corresponents.\n" -#: src/timeout.c:213 +#: src/timeout.c:235 #, fuzzy msgid "" +" --preserve-status\n" +" exit with the same status as COMMAND, even when the\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 " @@ -12212,8 +12518,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:229 -#, fuzzy +#: src/timeout.c:254 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -12225,16 +12530,16 @@ msgstr "" "a\n" "segons (per defecte), «m» per a minuts, «h» per a hores i «d» per a dies.\n" -#: src/timeout.c:234 +#: src/timeout.c:259 #, fuzzy msgid "" "\n" -"If the command times out, then exit with status 124. Otherwise, exit\n" -"with the status of COMMAND. If no signal is specified, send the TERM\n" -"signal upon timeout. The TERM signal kills any process that does not\n" -"block or catch that signal. For other processes, it may be necessary to\n" -"use the KILL (9) signal, since this signal cannot be caught. If the\n" -"KILL (9) signal is sent, the exit status is 128+9 rather than 124.\n" +"If the command times out, and --preserve-status is not set, then exit with\n" +"status 124. Otherwise, exit with the status of COMMAND. If no signal\n" +"is specified, send the TERM signal upon timeout. The TERM signal kills\n" +"any process that does not block or catch that signal. It may be necessary\n" +"to use the KILL (9) signal, since this signal cannot be caught, in which\n" +"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 " @@ -12245,17 +12550,24 @@ msgstr "" "a\n" "uns altres processos és possible que calga emprar el senyal «KILL» (9), que " "no\n" -"pot ser interceptat.\n" +"pot ser interceptat. Si s’envia el senyal «KILL» (9), l’estat d’eixida " +"serà\n" +"128+9 en lloc de 124.\n" + +#: src/timeout.c:363 +#, c-format +msgid "warning: disabling core dumps failed" +msgstr "avís: no s’han pogut inhabilitar els bolcats de memòria" -#: src/timeout.c:419 +#: src/timeout.c:471 #, c-format msgid "error waiting for command" msgstr "error en esperar l’ordre" -#: src/timeout.c:441 +#: src/timeout.c:482 #, c-format -msgid "warning: disabling core dumps failed" -msgstr "avís: no s’han pogut inhabilitar els bolcats de memòria" +msgid "the monitored command dumped core" +msgstr "l’ordre llançada ha bolcat la seua memòria" #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 @@ -12267,26 +12579,27 @@ msgstr "Jim Kingdon" msgid "Randy Smith" msgstr "Randy Smith" -#: src/touch.c:115 src/touch.c:313 +#: src/touch.c:115 src/touch.c:309 #, c-format msgid "invalid date format %s" msgstr "el format de data «%s» no és vàlid" # Usa quote(). ivb # En el codi font diu que no val la pena distingir el tipus d'error. ivb -#: src/touch.c:194 +#: src/touch.c:191 #, c-format msgid "cannot touch %s" msgstr "no s’han pogut canviar les dates de %s" # Usa quote(). ivb # Condició d'error. ivb -#: src/touch.c:200 +#: src/touch.c:197 #, c-format msgid "setting times of %s" msgstr "en establir les dates de %s" -#: src/touch.c:216 +#: src/touch.c:213 +#, fuzzy msgid "" "Update the access and modification times of each FILE to the current time.\n" "\n" @@ -12295,7 +12608,6 @@ msgid "" "\n" "A FILE argument string of - is handled specially and causes touch to\n" "change the times of the file associated with standard output.\n" -"\n" msgstr "" "Actualitza les dates d’accés i modificació de cada FITXER a la data actual.\n" "\n" @@ -12306,7 +12618,7 @@ msgstr "" "del fitxer associat amb l’entrada estàndard.\n" "\n" -#: src/touch.c:229 +#: src/touch.c:225 msgid "" " -a change only the access time\n" " -c, --no-create do not create any files\n" @@ -12319,7 +12631,7 @@ msgstr "" " actual.\n" " -f (No es té en compte.)\n" -#: src/touch.c:235 +#: src/touch.c:231 msgid "" " -h, --no-dereference affect each symbolic link instead of any " "referenced\n" @@ -12334,11 +12646,11 @@ msgstr "" " -m Només canvia la data de modificació de les dades.\n" # Què té aquesta gent en contra de les cometes? ivb -#: src/touch.c:241 +#: src/touch.c:237 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" -" --time=WORD change the specified time:\n" +" --time=WORD change the specified time:\n" " WORD is access, atime, or use: equivalent to -a\n" " WORD is modify or mtime: equivalent to -m\n" msgstr "" @@ -12354,7 +12666,7 @@ msgstr "" "o\n" " «mtime» (-m).\n" -#: src/touch.c:250 +#: src/touch.c:246 msgid "" "\n" "Note that the -d and -t options accept different time-date formats.\n" @@ -12363,13 +12675,13 @@ msgstr "" "Teniu en compte que les opcions «-d» i «-t» accepten formats de data i hora\n" "distints.\n" -#: src/touch.c:339 +#: src/touch.c:335 #, c-format msgid "cannot specify times from more than one source" msgstr "no es poden especificar dates de més d’un origen" -#: src/touch.c:413 -#, fuzzy, c-format +#: src/touch.c:409 +#, c-format msgid "" "warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'" msgstr "" @@ -12522,7 +12834,7 @@ msgstr "" # que coi significa `cotejar'??? #: src/tr.c:673 -#, fuzzy, c-format +#, c-format msgid "range-endpoints of '%s-%s' are in reverse collating sequence order" msgstr "els extrems del rang «%s-%s» es troben en ordre invers" @@ -12533,12 +12845,12 @@ msgid "invalid repeat count %s in [c*n] construct" msgstr "el nombre de repeticions %s de la construcció «[c*n]» no és vàlid" #: src/tr.c:910 -#, fuzzy, c-format +#, c-format msgid "missing character class name '[::]'" msgstr "manca el nom de la classe de caràcters: «[::]»" #: src/tr.c:913 -#, fuzzy, c-format +#, c-format msgid "missing equivalence class character '[==]'" msgstr "manca el caràcter de la classe d’equivalència: «[==]»" @@ -12591,7 +12903,7 @@ msgstr "" "en traduir, les expressions «[=c=]» no poden aparèixer a la segona cadena" #: 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'" @@ -12661,6 +12973,7 @@ 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" @@ -12669,7 +12982,6 @@ msgid "" "If a FILE is larger than the specified size, the extra data is lost.\n" "If a FILE is shorter, it is extended and the extended part (hole)\n" "reads as zero bytes.\n" -"\n" msgstr "" "Redueix o augmenta la mida de cada FITXER a la mida indicada.\n" "\n" @@ -12680,18 +12992,18 @@ msgstr "" "octets\n" "zero.\n" -#: src/truncate.c:110 +#: src/truncate.c:109 msgid " -c, --no-create do not create any files\n" msgstr " -c, --no-create No crea cap fitxer.\n" -#: src/truncate.c:113 +#: src/truncate.c:112 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" " -o, --io-blocks Interpreta la MIDA com a un nombre de blocs d’E/S en\n" " lloc d’un nombre d’octets.\n" -#: src/truncate.c:116 +#: 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" @@ -12701,8 +13013,7 @@ msgstr "" " -s, --size=MIDA Estableix o ajusta la mida dels fitxers segons la " "MIDA.\n" -#: src/truncate.c:122 -#, fuzzy +#: src/truncate.c:121 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -12717,68 +13028,68 @@ msgstr "" # Usa quote. ivb # Espere que així quede més clar. ivb -#: src/truncate.c:150 +#: src/truncate.c:149 #, c-format msgid "overflow in %<PRIdMAX> * %<PRIdMAX> byte blocks for file %s" msgstr "" "desbordament en (%<PRIdMAX> blocs * %<PRIdMAX> octets/bloc) per al fitxer %s" # Usa quote(). ivb -#: src/truncate.c:174 +#: src/truncate.c:173 #, c-format msgid "%s has unusable, apparently negative size" msgstr "%s té una mida aparentment negativa que no pot ser tractada" # Usa quote(). ivb # Es refereix a fitxers sense mida definida. ivb -#: src/truncate.c:184 src/truncate.c:379 +#: src/truncate.c:183 src/truncate.c:384 #, c-format msgid "cannot get the size of %s" msgstr "no es pot obtenir la mida de %s" # Usa quote(). ivb -#: src/truncate.c:206 +#: src/truncate.c:205 #, c-format msgid "overflow rounding up size of file %s" msgstr "desbordament en arrodonir cap amunt la mida del fitxer %s" # Usa quote(). ivb -#: src/truncate.c:216 +#: src/truncate.c:215 #, c-format msgid "overflow extending size of file %s" msgstr "desbordament en augmentar la mida del fitxer %s" # Usa quote(). ivb -#: src/truncate.c:231 +#: src/truncate.c:230 #, c-format msgid "failed to truncate %s at %<PRIdMAX> bytes" msgstr "no s’ha pogut truncar %s a %<PRIdMAX> octets" -#: src/truncate.c:305 +#: src/truncate.c:303 #, c-format msgid "multiple relative modifiers specified" msgstr "s’han especificat múltiples modificadors relatius" # Usa quote() en el ambdós args. ivb -#: src/truncate.c:335 +#: src/truncate.c:333 #, c-format msgid "you must specify either %s or %s" msgstr "cal que especifiqueu %s o %s" # Usa quote() en el ambdós args. ivb -#: src/truncate.c:342 +#: src/truncate.c:340 #, c-format msgid "you must specify a relative %s with %s" msgstr "en emprar %2$s, cal que especifiqueu %1$s de forma relativa" # Usa quote() en el ambdós args. ivb -#: src/truncate.c:349 +#: src/truncate.c:347 #, c-format msgid "%s was specified but %s was not" msgstr "heu especificat %s però no %s" # Usa quote(). ivb -#: src/truncate.c:400 +#: src/truncate.c:404 #, c-format msgid "cannot open %s for writing" msgstr "no s’ha pogut obrir %s per a escriure" @@ -12881,10 +13192,10 @@ 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" -"\n" 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" @@ -12892,7 +13203,7 @@ msgstr "" "\n" # mirar la traducció del expand -#: src/unexpand.c:125 +#: src/unexpand.c:124 msgid "" " -a, --all convert all blanks, instead of just initial blanks\n" " --first-only convert only leading sequences of blanks (overrides -a)\n" @@ -12912,13 +13223,13 @@ msgstr "" "cada\n" " tabulació, separades per comes (habilita «-a»).\n" -#: src/unexpand.c:153 +#: src/unexpand.c:152 #, c-format msgid "tabs are too far apart" msgstr "els tabuladors es troben massa separats" # És un enter correcte però massa gran. ivb -#: src/unexpand.c:505 +#: src/unexpand.c:504 #, c-format msgid "tab stop value is too large" msgstr "la distància de tabulació és massa gran" @@ -12929,12 +13240,12 @@ msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n" msgstr "Forma d’ús: %s [OPCIÓ]… [ENTRADA [EIXIDA]]\n" #: src/uniq.c:138 +#, fuzzy 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" -"\n" msgstr "" "Elimina de l’ENTRADA (o de l’entrada estàndard) les línies repetides que " "vagen\n" @@ -12943,7 +13254,7 @@ msgstr "" "Sense opcions, les línies repetides es redueixen a la primera ocurrència.\n" "\n" -#: src/uniq.c:148 +#: src/uniq.c:147 msgid "" " -c, --count prefix lines by the number of occurrences\n" " -d, --repeated only print duplicate lines\n" @@ -12951,7 +13262,7 @@ msgstr "" " -c, --count Prefixa cada línia amb el nombre d’ocurrències.\n" " -d, --repeated Només escriu les línies duplicades.\n" -#: src/uniq.c:152 +#: src/uniq.c:151 msgid "" " -D, --all-repeated[=delimit-method] print all duplicate lines\n" " delimit-method={none(default),prepend,separate}\n" @@ -12977,12 +13288,12 @@ msgstr "" "nova\n" " línia.\n" -#: src/uniq.c:162 +#: src/uniq.c:161 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:167 +#: src/uniq.c:166 msgid "" "\n" "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n" @@ -12994,8 +13305,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:172 -#, fuzzy +#: src/uniq.c:171 msgid "" "\n" "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n" @@ -13007,24 +13317,24 @@ 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:359 +#: src/uniq.c:358 #, c-format msgid "too many repeated lines" msgstr "hi ha massa línies repetides" -#: src/uniq.c:522 +#: src/uniq.c:521 msgid "invalid number of fields to skip" msgstr "el nombre de camps a saltar no és vàlid" -#: src/uniq.c:531 +#: src/uniq.c:530 msgid "invalid number of bytes to skip" msgstr "el nombre d’octets a saltar no és vàlid" -#: src/uniq.c:540 +#: src/uniq.c:539 msgid "invalid number of bytes to compare" msgstr "el nombre d’octets a comparar no és vàlid" -#: src/uniq.c:559 +#: src/uniq.c:558 #, c-format msgid "printing all duplicated lines and repeat counts is meaningless" msgstr "" @@ -13083,6 +13393,11 @@ msgid_plural "up %ld days %2d:%02d, " msgstr[0] "en marxa %ld dia %2d:%02d, " msgstr[1] "en marxa %ld dies %2d:%02d, " +#: src/uptime.c:149 +#, fuzzy, c-format +msgid "up %2d:%02d, " +msgstr "en marxa %ld dia %2d:%02d, " + #: src/uptime.c:151 #, c-format msgid "%lu user" @@ -13204,46 +13519,46 @@ msgid " old " msgstr "antic" # 12 caràcters. ivb -#: src/who.c:449 +#: src/who.c:440 msgid "system boot" msgstr "arrenca sist" # Identificador d'una tasca d'init. ivb -#: src/who.c:456 src/who.c:458 +#: src/who.c:447 src/who.c:449 msgid "id=" msgstr "id=" # Codi de finalització. ivb -#: src/who.c:471 src/who.c:476 +#: src/who.c:462 src/who.c:467 msgid "term=" msgstr "fin=" # Codi d'eixida. ivb -#: src/who.c:473 src/who.c:477 +#: src/who.c:464 src/who.c:468 msgid "exit=" msgstr "eixida=" # Ho deixe tal qual perquè es refereix al procés «login». ivb -#: src/who.c:494 +#: src/who.c:485 msgid "LOGIN" msgstr "LOGIN" # 12 caràcters. ivb -#: src/who.c:514 +#: src/who.c:505 msgid "clock change" msgstr "canvi rlltge" # 10 caràcters. ivb -#: src/who.c:526 src/who.c:527 +#: src/who.c:517 src/who.c:518 msgid "run-level" msgstr "nivll exec" # Últim nivell d'execució. ivb -#: src/who.c:530 src/who.c:531 +#: src/who.c:521 src/who.c:522 msgid "last=" msgstr "darrer=" -#: src/who.c:562 +#: src/who.c:553 #, c-format msgid "" "\n" @@ -13254,51 +13569,51 @@ msgstr "" # FIXME: This arrangement is language-dependent because of width. ivb # Nom d'un usuari del sistema. ivb -#: src/who.c:568 +#: src/who.c:559 msgid "NAME" msgstr "NOM" # FIXME: print_line() fails to compute column widths with multibyte character # (e.g. UTF-8) translations. ivb # FIXME: "who" is *really* painful to get translated so that fields align!! :( -#: src/who.c:568 +#: src/who.c:559 msgid "LINE" msgstr "LÍNIA" # Hora d'entrada d'un usuari al sistema. ivb -#: src/who.c:568 +#: src/who.c:559 msgid "TIME" msgstr "HORA" # Temps ociós d'un usuari. ivb -#: src/who.c:568 +#: src/who.c:559 msgid "IDLE" msgstr "OCIÓS" -#: src/who.c:569 +#: src/who.c:560 msgid "PID" msgstr "PID" # 8 caràcters. ivb -#: src/who.c:569 +#: src/who.c:560 msgid "COMMENT" msgstr "COMENTARI" # Codis de finalització i eixida del procés. ivb -#: src/who.c:569 +#: src/who.c:560 msgid "EXIT" msgstr "EIXIDA" -#: src/who.c:649 +#: src/who.c:640 #, c-format msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n" msgstr "Forma d’ús: %s [OPCIÓ]… [FITXER | ARG1 ARG2]\n" -#: src/who.c:650 +#: src/who.c:641 msgid "Print information about users who are currently logged in.\n" msgstr "Mostra informació sobre els usuaris connectats actualment.\n" -#: src/who.c:653 +#: src/who.c:644 msgid "" "\n" " -a, --all same as -b -d --login -p -r -t -T -u\n" @@ -13312,11 +13627,11 @@ msgstr "" " -d, --dead Mostra els processos morts.\n" " -H, --heading Mostra una línia de capçaleres de columna.\n" -#: src/who.c:660 +#: src/who.c:651 msgid " -l, --login print system login processes\n" msgstr " -l, --login Mostra els processos d’entrada al sistema.\n" -#: src/who.c:663 +#: src/who.c:654 msgid "" " --lookup attempt to canonicalize hostnames via DNS\n" " -m only hostname and user associated with stdin\n" @@ -13327,7 +13642,7 @@ msgstr "" " l’entrada estàndard.\n" " -p, --process Mostra els processos actius llançats per «init».\n" -#: src/who.c:668 +#: src/who.c:659 msgid "" " -q, --count all login names and number of users logged on\n" " -r, --runlevel print current runlevel\n" @@ -13341,7 +13656,7 @@ msgstr "" " -t, --time Mostra el moment del darrer canvi del rellotge del\n" " sistema.\n" -#: src/who.c:674 +#: src/who.c:665 msgid "" " -T, -w, --mesg add user's message status as +, - or ?\n" " -u, --users list users logged in\n" @@ -13356,8 +13671,8 @@ msgstr "" " --writable Equival a «-T».\n" # No usa quote() en cap dels 2 args. ivb -#: src/who.c:682 -#, fuzzy, c-format +#: src/who.c:673 +#, c-format msgid "" "\n" "If FILE is not specified, use %s. %s as FILE is common.\n" @@ -13394,7 +13709,6 @@ msgstr "" " o bé: %s OPCIÓ\n" #: src/yes.c:47 -#, fuzzy msgid "" "Repeatedly output a line with all specified STRING(s), or 'y'.\n" "\n" @@ -13402,33 +13716,137 @@ 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" + +# És un missatge informatiu. ivb +#~ msgid "using arbitrary-precision arithmetic" +#~ msgstr "s’està emprant l’aritmètica de precisió arbitrària" + +# Usa quote(). ivb +# Missatge informatiu. ivb +#, fuzzy +#~ msgid " returning value: '%s'\n" +#~ msgstr "s’està creant el fitxer %s\n" + #, fuzzy -#~ msgid " gid=%s" -#~ msgstr " gid=%lu" +#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n" +#~ msgstr "Forma d’ús: %s [OPCIÓ] NOM…\n" #, fuzzy -#~ msgid " euid=%s" -#~ msgstr " euid=%lu" +#~ msgid "no valid suffix found\n" +#~ msgstr "%s: la longitud del sufix no és vàlida" + +# Els 3 usen quote(). ivb +#~ msgid "reading %s" +#~ msgstr "s’està llegint %s" + +# Els 4 usen quote(). ivb +# En els 4 indica condició d'error. ivb +#~ msgid "writing %s" +#~ msgstr "en escriure %s" + +# Els 2 usen quote(). ivb +# En els 2 indica condició d'error. ivb +#~ msgid "closing %s" +#~ msgstr "en tancar %s" + +# Els 5 usen quote(). ivb +# Indica condició d'error. ivb +#~ msgid "accessing %s" +#~ msgstr "en accedir a %s" + +# Usa quote(). ivb +# Condició d'error. ivb +#~ msgid "opening %s" +#~ msgstr "en obrir %s" #~ msgid "" -#~ "Usage: %s NAME\n" -#~ " or: %s OPTION\n" +#~ " -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 "" -#~ "Forma d’ús: %s NOM\n" -#~ " o bé: %s OPCIÓ\n" - -#~ msgid "--relative-base requires --relative-to" -#~ msgstr "«--relative-base» necessita «--relative-to»" +#~ " -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" -# Esperem que el «%s» no empente la línia més enllà de la columna 78. ivb #~ 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 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" -#~ "Examples:\n" -#~ " %s /usr/bin/sort Output \"sort\".\n" -#~ " %s include/stdio.h .h Output \"stdio\".\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 "All arguments to long options are mandatory for short options.\n" #~ msgstr "" +#~ "Els arguments obligatoris per a les opcions llargues també ho són per a " +#~ "les\n" +#~ "opcions curtes corresponents.\n" + +#~ msgid "" #~ "\n" -#~ "Exemples:\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" -#~ " «%s /usr/bin/sort» produeix «sort».\n" -#~ " «%s include/stdio.h .h» produeix «stdio».\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" +#~ 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" + +#~ msgid "Usage: %s [OPTION]... FILE\n" +#~ msgstr "Foma d’ús: %s [OPCIÓ]… FITXER\n" diff --git a/po/coreutils.pot b/po/coreutils.pot index 737ece7a..88944bb5 100644 --- a/po/coreutils.pot +++ b/po/coreutils.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: GNU coreutils 8.17\n" +"Project-Id-Version: GNU coreutils 8.21\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2012-05-10 19:35+0200\n" +"POT-Creation-Date: 2013-02-14 15:56+0000\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,19 +36,19 @@ msgstr "" msgid "error closing file" msgstr "" -#: lib/closeout.c:112 src/base64.c:109 src/base64.c:121 src/base64.c:127 -#: src/base64.c:168 src/base64.c:224 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:330 src/expand.c:355 src/head.c:298 -#: src/head.c:348 src/head.c:756 src/head.c:797 src/mktemp.c:350 src/od.c:919 -#: src/paste.c:160 src/shuf.c:369 src/split.c:727 src/split.c:964 -#: src/split.c:969 src/tail.c:350 src/tail.c:1201 src/tail.c:1307 +#: 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 -#: src/unexpand.c:427 src/unexpand.c:443 +#: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "" -#: lib/copy-acl.c:611 src/copy.c:1160 src/copy.c:2602 +#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617 #, c-format msgid "preserving permissions for %s" msgstr "" @@ -240,18 +240,18 @@ msgstr "" msgid "%s: option '-W %s' requires an argument\n" msgstr "" -#: lib/mkdir-p.c:196 src/install.c:483 +#: lib/mkdir-p.c:196 src/install.c:484 #, c-format msgid "cannot change permissions of %s" msgstr "" -#: lib/mkdir-p.c:206 src/copy.c:2261 src/install.c:709 src/install.c:722 +#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722 #, 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:915 src/tac.c:435 +#: src/split.c:929 src/tac.c:434 #, c-format msgid "memory exhausted" msgstr "" @@ -300,75 +300,75 @@ msgstr "" msgid "%s: end of file" msgstr "" -#: lib/regcomp.c:130 +#: lib/regcomp.c:131 msgid "Success" msgstr "" -#: lib/regcomp.c:133 +#: lib/regcomp.c:134 msgid "No match" msgstr "" -#: lib/regcomp.c:136 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "" -#: lib/regcomp.c:139 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "" -#: lib/regcomp.c:142 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "" -#: lib/regcomp.c:145 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "" -#: lib/regcomp.c:148 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "" -#: lib/regcomp.c:151 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "" -#: lib/regcomp.c:154 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "" -#: lib/regcomp.c:157 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "" -#: lib/regcomp.c:160 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "" -#: lib/regcomp.c:163 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "" -#: lib/regcomp.c:166 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "" -#: lib/regcomp.c:169 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "" -#: lib/regcomp.c:172 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "" -#: lib/regcomp.c:175 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "" -#: lib/regcomp.c:178 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:703 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "" @@ -407,7 +407,7 @@ msgstr "" msgid "^[nN]" msgstr "" -#: lib/set-mode-acl.c:695 src/copy.c:2284 src/cp.c:518 +#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516 #, c-format msgid "setting permissions for %s" msgstr "" @@ -548,13 +548,13 @@ msgstr "" msgid "Resource lost" msgstr "" -#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262 -#: lib/spawn-pipe.c:265 +#: 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:232 lib/spawn-pipe.c:346 lib/wait-process.c:282 +#: 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" @@ -570,24 +570,24 @@ msgstr "" msgid "Unknown signal %d" msgstr "" -#: lib/unicodeio.c:103 +#: lib/unicodeio.c:102 msgid "iconv function not usable" msgstr "" -#: lib/unicodeio.c:105 +#: lib/unicodeio.c:104 msgid "iconv function not available" msgstr "" -#: lib/unicodeio.c:112 +#: lib/unicodeio.c:111 msgid "character out of range" msgstr "" -#: lib/unicodeio.c:182 +#: lib/unicodeio.c:181 #, c-format msgid "cannot convert U+%04X to local character set" msgstr "" -#: lib/unicodeio.c:184 +#: lib/unicodeio.c:183 #, c-format msgid "cannot convert U+%04X to local character set: %s" msgstr "" @@ -743,7 +743,7 @@ msgstr "" msgid "Report %s bugs to: %s\n" msgstr "" -#: lib/version-etc.c:251 src/system.h:562 +#: lib/version-etc.c:251 src/system.h:573 #, c-format msgid "%s home page: <%s>\n" msgstr "" @@ -753,7 +753,7 @@ msgstr "" msgid "%s home page: <http://www.gnu.org/software/%s/>\n" msgstr "" -#: lib/version-etc.c:256 src/system.h:563 +#: lib/version-etc.c:256 src/system.h:574 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" @@ -843,10 +843,9 @@ msgstr "" msgid "" "Usage: %s [OPTION]... [FILE]\n" "Base64 encode or decode FILE, or standard input, to standard output.\n" -"\n" msgstr "" -#: src/base64.c:64 +#: src/base64.c:67 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -856,13 +855,13 @@ msgid "" "\n" msgstr "" -#: src/base64.c:73 src/cat.c:110 src/fmt.c:293 src/shuf.c:71 src/sum.c:70 +#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" msgstr "" -#: src/base64.c:76 +#: src/base64.c:79 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -871,37 +870,37 @@ msgid "" "from any other non-alphabet bytes in the encoded stream.\n" msgstr "" -#: src/base64.c:171 src/base64.c:208 src/csplit.c:263 src/csplit.c:1435 -#: src/join.c:451 src/shuf.c:157 src/shuf.c:361 src/tac-pipe.c:74 +#: 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 #, c-format msgid "read error" msgstr "" -#: src/base64.c:227 +#: src/base64.c:230 #, c-format msgid "invalid input" msgstr "" -#: src/base64.c:264 +#: src/base64.c:267 #, c-format msgid "invalid wrap size: %s" msgstr "" -#: src/base64.c:283 src/basename.c:173 src/comm.c:435 src/cp.c:607 -#: src/date.c:441 src/dircolors.c:447 src/du.c:894 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:169 src/install.c:929 src/join.c:961 -#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:157 src/mv.c:447 -#: src/od.c:1802 src/ptx.c:2081 src/readlink.c:154 src/seq.c:408 -#: src/shuf.c:320 src/shuf.c:339 src/sort.c:4477 src/split.c:1313 -#: src/tr.c:1797 src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:454 -#: src/uniq.c:471 src/unlink.c:81 src/uptime.c:250 src/users.c:146 -#: src/wc.c:666 src/who.c:836 src/whoami.c:79 +#: 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 #, c-format msgid "extra operand %s" msgstr "" -#: src/base64.c:315 src/cat.c:781 +#: src/base64.c:318 src/cat.c:781 #, c-format msgid "closing standard input" msgstr "" @@ -909,15 +908,15 @@ 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/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:53 src/env.c:33 +#: 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/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:65 src/su.c:88 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 +#: 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 msgid "David MacKenzie" msgstr "" @@ -932,17 +931,16 @@ msgstr "" msgid "" "Print NAME with any leading directory components removed.\n" "If specified, also remove a trailing SUFFIX.\n" -"\n" msgstr "" -#: src/basename.c:59 +#: 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" msgstr "" -#: src/basename.c:66 +#: src/basename.c:67 #, c-format msgid "" "\n" @@ -953,20 +951,21 @@ msgid "" " %s -a any/str1 any/str2 -> \"str1\" followed by \"str2\"\n" msgstr "" -#: src/basename.c:167 src/chcon.c:531 src/chgrp.c:277 src/chmod.c:526 -#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1369 +#: 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:183 src/mkfifo.c:108 src/mknod.c:146 src/nohup.c:111 -#: src/pathchk.c:148 src/printf.c:674 src/readlink.c:146 src/realpath.c:236 -#: src/rm.c:314 src/rmdir.c:223 src/seq.c:402 src/setuidgid.c:137 -#: src/sleep.c:119 src/stat.c:1476 src/stdbuf.c:346 src/tr.c:1782 +#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 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 #, 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:52 src/split.c:49 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/split.c:49 msgid "Torbjorn Granlund" msgstr "" @@ -976,8 +975,8 @@ msgstr "" msgid "Richard M. Stallman" msgstr "" -#: src/cat.c:88 src/df.c:846 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4720 src/nl.c:182 src/paste.c:435 src/pr.c:2768 src/sum.c:58 +#: 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/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" @@ -1017,7 +1016,7 @@ msgstr "" msgid "cannot do ioctl on %s" msgstr "" -#: src/cat.c:637 src/dd.c:2209 src/sort.c:379 src/tee.c:165 src/yes.c:86 +#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86 #, c-format msgid "standard output" msgstr "" @@ -1034,14 +1033,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:55 src/head.c:46 src/hostid.c:33 +#: 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 msgid "Jim Meyering" msgstr "" -#: src/chcon.c:100 src/runcon.c:203 src/runcon.c:234 +#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238 #, c-format msgid "failed to create security context: %s" msgstr "" @@ -1051,8 +1050,8 @@ msgstr "" msgid "failed to set %s security context component to %s" msgstr "" -#: src/chcon.c:156 src/chcon.c:540 src/copy.c:2222 src/runcon.c:217 -#: src/stat.c:683 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221 +#: src/stat.c:702 #, c-format msgid "failed to get security context of %s" msgstr "" @@ -1068,12 +1067,12 @@ 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:446 src/ls.c:2981 +#: src/du.c:457 src/ls.c:2981 #, c-format msgid "cannot access %s" msgstr "" -#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:426 +#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437 #, c-format msgid "cannot read directory %s" msgstr "" @@ -1083,13 +1082,13 @@ 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:599 +#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562 #, c-format msgid "fts_read failed" msgstr "" -#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:618 -#: src/remove.c:613 +#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642 +#: src/remove.c:576 #, c-format msgid "fts_close failed" msgstr "" @@ -1107,10 +1106,9 @@ msgid "" "Change the security context of each FILE to CONTEXT.\n" "With --reference, change the security context of each FILE to that of " "RFILE.\n" -"\n" msgstr "" -#: src/chcon.c:362 src/chgrp.c:123 src/chown.c:94 +#: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94 msgid "" " --dereference affect the referent of each symbolic link (this is\n" " the default), rather than the symbolic link itself\n" @@ -1118,7 +1116,7 @@ msgid "" "file\n" msgstr "" -#: src/chcon.c:367 +#: src/chcon.c:369 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" @@ -1126,22 +1124,28 @@ msgid "" " -l, --range=RANGE set range RANGE in the target security context\n" msgstr "" -#: src/chcon.c:373 +#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 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 msgid "" " --reference=RFILE use RFILE's security context rather than " "specifying\n" " a CONTEXT value\n" msgstr "" -#: src/chcon.c:377 src/chgrp.c:140 src/chown.c:118 +#: 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:380 +#: src/chcon.c:386 msgid " -v, --verbose output a diagnostic for every file processed\n" msgstr "" -#: src/chcon.c:383 src/chgrp.c:143 src/chown.c:121 +#: src/chcon.c:389 src/chgrp.c:143 src/chown.c:121 msgid "" "\n" "The following options modify how a hierarchy is traversed when the -R\n" @@ -1156,36 +1160,36 @@ msgid "" "\n" msgstr "" -#: src/chcon.c:512 src/chgrp.c:264 src/chown.c:267 +#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267 #, c-format msgid "-R --dereference requires either -H or -L" msgstr "" -#: src/chcon.c:518 +#: src/chcon.c:524 #, c-format msgid "-R -h requires -P" msgstr "" -#: src/chcon.c:533 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282 -#: src/comm.c:429 src/csplit.c:1371 src/join.c:1149 src/link.c:79 -#: src/mknod.c:148 src/setuidgid.c:139 src/tr.c:1785 +#: 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 #, c-format msgid "missing operand after %s" msgstr "" -#: src/chcon.c:556 src/runcon.c:247 +#: src/chcon.c:562 src/runcon.c:251 #, c-format msgid "invalid context: %s" msgstr "" -#: src/chcon.c:563 +#: src/chcon.c:569 #, c-format msgid "conflicting security context specifiers given" msgstr "" -#: src/chcon.c:572 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:433 src/cp.c:493 -#: src/mv.c:96 src/pwd.c:273 src/rm.c:324 src/touch.c:351 +#: 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 #, c-format msgid "failed to get attributes of %s" msgstr "" @@ -1222,12 +1226,6 @@ msgid "" " ownership of a symlink)\n" msgstr "" -#: src/chgrp.c:132 src/chmod.c:387 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/chgrp.c:136 msgid "" " --reference=RFILE use RFILE's group rather than specifying a\n" @@ -1447,7 +1445,7 @@ msgstr "" msgid "Roland McGrath" msgstr "" -#: src/chroot.c:97 src/install.c:575 src/setuidgid.c:110 src/setuidgid.c:120 +#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120 #, c-format msgid "invalid group %s" msgstr "" @@ -1507,8 +1505,8 @@ msgstr "" msgid "failed to set user-ID" msgstr "" -#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:213 src/stdbuf.c:366 -#: src/timeout.c:402 +#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365 +#: src/timeout.c:454 #, c-format msgid "failed to run command %s" msgstr "" @@ -1603,19 +1601,23 @@ msgstr "" msgid "empty %s not allowed" msgstr "" -#: src/copy.c:168 src/dd.c:1609 src/dd.c:1976 +#: 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 #, c-format -msgid "reading %s" +msgid "error reading %s" msgstr "" -#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:426 +#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425 #, c-format msgid "cannot lseek %s" msgstr "" -#: src/copy.c:206 src/dd.c:2039 src/dd.c:2102 +#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151 #, c-format -msgid "writing %s" +msgid "error writing %s" msgstr "" #: src/copy.c:313 @@ -1638,7 +1640,7 @@ msgstr "" msgid "clearing permissions for %s" msgstr "" -#: src/copy.c:697 src/copy.c:2470 src/cp.c:331 +#: src/copy.c:697 src/copy.c:2480 src/cp.c:329 #, c-format msgid "failed to preserve ownership for %s" msgstr "" @@ -1653,14 +1655,14 @@ msgstr "" msgid "failed to preserve authorship for %s" msgstr "" -#: src/copy.c:804 src/csplit.c:638 src/du.c:901 src/fmt.c:449 src/head.c:847 -#: src/sort.c:4489 src/split.c:1329 src/tail.c:1756 src/wc.c:678 +#: 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:1546 src/dd.c:2114 src/dd.c:2252 -#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:141 +#: 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 #, c-format msgid "cannot fstat %s" msgstr "" @@ -1680,14 +1682,14 @@ msgstr "" msgid "failed to set the security context of %s to %s" msgstr "" -#: src/copy.c:881 src/copy.c:1574 src/copy.c:1777 src/copy.c:1935 src/ln.c:314 -#: src/remove.c:267 src/remove.c:293 src/remove.c:444 src/remove.c:465 +#: 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 #, c-format msgid "cannot remove %s" msgstr "" -#: src/copy.c:886 src/copy.c:1578 src/copy.c:1772 src/copy.c:1940 -#: src/remove.c:418 +#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945 +#: src/remove.c:375 #, c-format msgid "removed %s\n" msgstr "" @@ -1707,186 +1709,186 @@ msgstr "" msgid "failed to clone %s from %s" msgstr "" -#: src/copy.c:1098 src/copy.c:2531 +#: src/copy.c:1098 src/copy.c:2541 #, c-format msgid "preserving times for %s" msgstr "" -#: src/copy.c:1170 src/copy.c:1176 src/head.c:855 src/touch.c:175 -#: src/truncate.c:413 +#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172 +#: src/truncate.c:417 #, c-format -msgid "closing %s" +msgid "failed to close %s" msgstr "" -#: src/copy.c:1466 +#: src/copy.c:1471 #, c-format msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? " msgstr "" -#: src/copy.c:1473 +#: src/copy.c:1478 #, c-format msgid "%s: overwrite %s? " msgstr "" -#: src/copy.c:1542 +#: src/copy.c:1547 #, c-format msgid " (backup: %s)" msgstr "" -#: src/copy.c:1552 +#: src/copy.c:1557 #, c-format msgid "failed to restore the default file creation context" msgstr "" -#: src/copy.c:1584 +#: src/copy.c:1589 #, c-format msgid "cannot create hard link %s to %s" msgstr "" -#: src/copy.c:1637 src/copy.c:1689 src/copy.c:2272 src/copy.c:2589 +#: 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:1220 src/truncate.c:365 +#: src/stat.c:1239 src/truncate.c:363 #, c-format msgid "cannot stat %s" msgstr "" -#: src/copy.c:1645 +#: src/copy.c:1650 #, c-format msgid "omitting directory %s" msgstr "" -#: src/copy.c:1659 +#: src/copy.c:1664 #, c-format msgid "warning: source file %s specified more than once" msgstr "" -#: src/copy.c:1707 src/ln.c:246 +#: src/copy.c:1712 src/ln.c:246 #, c-format msgid "%s and %s are the same file" msgstr "" -#: src/copy.c:1806 +#: src/copy.c:1811 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "" -#: src/copy.c:1824 src/ln.c:214 +#: src/copy.c:1829 src/ln.c:214 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "" -#: src/copy.c:1842 +#: src/copy.c:1847 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "" -#: src/copy.c:1856 +#: src/copy.c:1861 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "" -#: src/copy.c:1886 +#: src/copy.c:1891 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "" -#: src/copy.c:1887 +#: src/copy.c:1892 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "" -#: src/copy.c:1910 src/ln.c:276 +#: src/copy.c:1915 src/ln.c:276 #, c-format msgid "cannot backup %s" msgstr "" -#: src/copy.c:1974 +#: src/copy.c:1979 #, c-format msgid "will not copy %s through just-created symlink %s" msgstr "" -#: src/copy.c:2051 +#: src/copy.c:2056 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "" -#: src/copy.c:2068 +#: src/copy.c:2073 #, c-format msgid "will not create hard link %s to directory %s" msgstr "" -#: src/copy.c:2118 +#: src/copy.c:2123 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "" -#: src/copy.c:2161 +#: src/copy.c:2166 #, c-format msgid "cannot move %s to %s" msgstr "" -#: src/copy.c:2173 +#: src/copy.c:2178 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" -#: src/copy.c:2207 src/install.c:905 src/mkdir.c:189 src/mkfifo.c:114 -#: src/mknod.c:167 +#: 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:2241 +#: src/copy.c:2246 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "" -#: src/copy.c:2350 +#: src/copy.c:2355 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "" -#: src/copy.c:2357 +#: src/copy.c:2362 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "" -#: src/copy.c:2406 src/mkfifo.c:133 +#: src/copy.c:2416 src/mkfifo.c:132 #, c-format msgid "cannot create fifo %s" msgstr "" -#: src/copy.c:2415 +#: src/copy.c:2425 #, c-format msgid "cannot create special file %s" msgstr "" -#: src/copy.c:2426 src/ls.c:3191 src/stat.c:902 +#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921 #, c-format msgid "cannot read symbolic link %s" msgstr "" -#: src/copy.c:2453 +#: src/copy.c:2463 #, c-format msgid "cannot create symbolic link %s" msgstr "" -#: src/copy.c:2485 +#: src/copy.c:2495 #, c-format msgid "%s has unknown file type" msgstr "" -#: src/copy.c:2629 src/ln.c:358 +#: src/copy.c:2644 src/ln.c:358 #, c-format msgid "cannot un-backup %s" msgstr "" -#: src/copy.c:2633 +#: src/copy.c:2648 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "" -#: src/cp.c:156 src/mv.c:284 +#: src/cp.c:156 src/mv.c:286 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -1895,23 +1897,10 @@ msgid "" msgstr "" #: src/cp.c:162 -msgid "" -"Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" -"\n" -msgstr "" - -#: src/cp.c:166 src/csplit.c:1458 src/cut.c:197 src/df.c:852 src/du.c:268 -#: src/expand.c:112 src/fmt.c:275 src/fold.c:75 src/head.c:115 -#: src/install.c:612 src/kill.c:86 src/ln.c:392 src/ls.c:4726 src/mkdir.c:61 -#: src/mkfifo.c:56 src/mknod.c:58 src/mv.c:294 src/nl.c:191 src/paste.c:445 -#: src/pr.c:2777 src/ptx.c:1825 src/shred.c:153 src/shuf.c:58 src/sort.c:399 -#: src/split.c:211 src/stdbuf.c:95 src/tac.c:142 src/tail.c:268 -#: src/touch.c:226 src/truncate.c:107 src/unexpand.c:122 src/uniq.c:145 -msgid "" -"Mandatory arguments to long options are mandatory for short options too.\n" +msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" msgstr "" -#: src/cp.c:169 +#: src/cp.c:168 msgid "" " -a, --archive same as -dR --preserve=all\n" " --attributes-only don't copy the file data, just the " @@ -1925,32 +1914,33 @@ msgid "" " -d same as --no-dereference --preserve=links\n" msgstr "" -#: src/cp.c:178 +#: src/cp.c:177 msgid "" " -f, --force if an existing destination file cannot be\n" -" opened, remove it and try again (redundant " -"if\n" -" the -n option is used)\n" +" opened, remove it and try again (this " +"option\n" +" is ignored when the -n option is also " +"used)\n" " -i, --interactive prompt before overwrite (overrides a previous " "-n\n" " option)\n" " -H follow command-line symbolic links in SOURCE\n" msgstr "" -#: src/cp.c:188 +#: src/cp.c:186 msgid "" " -l, --link hard link files instead of copying\n" " -L, --dereference always follow symbolic links in SOURCE\n" msgstr "" -#: src/cp.c:192 +#: src/cp.c:190 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:197 +#: src/cp.c:195 msgid "" " -p same as --preserve=mode,ownership,timestamps\n" " --preserve[=ATTR_LIST] preserve the specified attributes (default:\n" @@ -1960,13 +1950,13 @@ msgid "" " all\n" msgstr "" -#: src/cp.c:205 +#: src/cp.c:203 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:209 +#: src/cp.c:207 msgid "" " -R, -r, --recursive copy directories recursively\n" " --reflink[=WHEN] control clone/CoW copies. See below\n" @@ -1975,7 +1965,7 @@ msgid "" "force)\n" msgstr "" -#: src/cp.c:215 +#: src/cp.c:213 msgid "" " --sparse=WHEN control creation of sparse files. See below\n" " --strip-trailing-slashes remove any trailing slashes from each " @@ -1983,7 +1973,7 @@ msgid "" " argument\n" msgstr "" -#: src/cp.c:220 +#: src/cp.c:218 msgid "" " -s, --symbolic-link make symbolic links instead of copying\n" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -1992,7 +1982,7 @@ msgid "" " -T, --no-target-directory treat DEST as a normal file\n" msgstr "" -#: src/cp.c:226 +#: src/cp.c:224 msgid "" " -u, --update copy only when the SOURCE file is newer\n" " than the destination file or when the\n" @@ -2001,7 +1991,7 @@ msgid "" " -x, --one-file-system stay on this file system\n" msgstr "" -#: src/cp.c:235 +#: src/cp.c:233 msgid "" "\n" "By default, sparse SOURCE files are detected by a crude heuristic and the\n" @@ -2017,7 +2007,7 @@ msgid "" "fails, or if --reflink=auto is specified, fall back to a standard copy.\n" msgstr "" -#: src/cp.c:247 src/install.c:649 src/ln.c:421 src/mv.c:321 +#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322 msgid "" "\n" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -2027,7 +2017,7 @@ msgid "" "\n" msgstr "" -#: src/cp.c:254 src/install.c:656 src/mv.c:328 +#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329 msgid "" " none, off never make backups (even if --backup is given)\n" " numbered, t make numbered backups\n" @@ -2035,7 +2025,7 @@ msgid "" " simple, never always make simple backups\n" msgstr "" -#: src/cp.c:260 +#: src/cp.c:258 msgid "" "\n" "As a special case, cp makes a backup of SOURCE when the force and backup\n" @@ -2043,90 +2033,90 @@ msgid "" "regular file.\n" msgstr "" -#: src/cp.c:319 +#: src/cp.c:317 #, c-format msgid "failed to preserve times for %s" msgstr "" -#: src/cp.c:350 +#: src/cp.c:348 #, c-format msgid "failed to preserve permissions for %s" msgstr "" -#: src/cp.c:477 +#: src/cp.c:475 #, c-format msgid "cannot make directory %s" msgstr "" -#: src/cp.c:526 src/cp.c:545 +#: src/cp.c:524 src/cp.c:543 #, c-format msgid "%s exists but is not a directory" msgstr "" -#: src/cp.c:572 src/cp.c:1068 src/install.c:401 src/install.c:844 src/ln.c:123 -#: src/ln.c:181 src/ln.c:202 src/ln.c:516 src/mv.c:152 src/mv.c:399 +#: 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 #, c-format -msgid "accessing %s" +msgid "failed to access %s" msgstr "" -#: src/cp.c:592 src/install.c:914 src/ln.c:546 src/mv.c:432 src/shred.c:1182 -#: src/touch.c:433 src/truncate.c:356 +#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181 +#: src/touch.c:429 src/truncate.c:354 #, c-format msgid "missing file operand" msgstr "" -#: src/cp.c:594 src/install.c:916 src/ln.c:560 src/mv.c:434 +#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436 #, c-format msgid "missing destination file operand after %s" msgstr "" -#: src/cp.c:603 src/install.c:925 src/mv.c:443 +#: src/cp.c:601 src/install.c:926 src/mv.c:445 #, c-format msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)" msgstr "" -#: src/cp.c:619 src/cp.c:1070 src/install.c:403 src/install.c:846 -#: src/install.c:938 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:401 -#: src/mv.c:457 +#: 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 #, c-format msgid "target %s is not a directory" msgstr "" -#: src/cp.c:730 +#: src/cp.c:728 #, c-format msgid "with --parents, the destination must be a directory" msgstr "" -#: src/cp.c:1063 src/install.c:839 src/ln.c:511 src/mv.c:394 +#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395 #, c-format msgid "multiple target directories specified" msgstr "" -#: src/cp.c:1108 +#: src/cp.c:1110 #, c-format msgid "cannot make both hard and symbolic links" msgstr "" -#: src/cp.c:1115 src/mv.c:464 +#: src/cp.c:1117 src/mv.c:466 #, c-format msgid "options --backup and --no-clobber are mutually exclusive" msgstr "" -#: src/cp.c:1121 +#: src/cp.c:1123 #, c-format msgid "--reflink can be used only with --sparse=auto" msgstr "" -#: src/cp.c:1129 src/install.c:899 src/ln.c:582 src/mv.c:472 +#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474 msgid "backup type" msgstr "" -#: src/cp.c:1154 +#: src/cp.c:1156 #, c-format msgid "cannot preserve security context without an SELinux-enabled kernel" msgstr "" -#: src/cp.c:1160 +#: src/cp.c:1162 #, c-format msgid "cannot preserve extended attributes, cp is built without xattr support" msgstr "" @@ -2136,134 +2126,133 @@ msgstr "" msgid "Stuart Kemp" msgstr "" -#: src/csplit.c:529 +#: src/csplit.c:531 #, c-format msgid "input disappeared" msgstr "" -#: src/csplit.c:658 src/csplit.c:669 +#: src/csplit.c:660 src/csplit.c:671 #, c-format msgid "%s: line number out of range" msgstr "" -#: src/csplit.c:698 +#: src/csplit.c:700 #, c-format msgid "%s: %s: line number out of range" msgstr "" -#: src/csplit.c:701 src/csplit.c:750 +#: src/csplit.c:703 src/csplit.c:752 #, c-format msgid " on repetition %s\n" msgstr "" -#: src/csplit.c:744 +#: src/csplit.c:746 #, c-format msgid "%s: %s: match not found" msgstr "" -#: src/csplit.c:808 src/csplit.c:848 src/nl.c:359 src/tac.c:274 +#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273 #, c-format msgid "error in regular expression search" msgstr "" -#: src/csplit.c:981 +#: src/csplit.c:983 #, c-format msgid "write error for %s" msgstr "" -#: src/csplit.c:1057 +#: src/csplit.c:1059 #, c-format msgid "%s: integer expected after delimiter" msgstr "" -#: src/csplit.c:1073 +#: src/csplit.c:1075 #, c-format msgid "%s: '}' is required in repeat count" msgstr "" -#: src/csplit.c:1083 +#: src/csplit.c:1085 #, c-format msgid "%s}: integer required between '{' and '}'" msgstr "" -#: src/csplit.c:1110 +#: src/csplit.c:1112 #, c-format msgid "%s: closing delimiter '%c' missing" msgstr "" -#: src/csplit.c:1127 +#: src/csplit.c:1129 #, c-format msgid "%s: invalid regular expression: %s" msgstr "" -#: src/csplit.c:1160 +#: src/csplit.c:1162 #, c-format msgid "%s: invalid pattern" msgstr "" -#: src/csplit.c:1163 +#: src/csplit.c:1165 #, c-format msgid "%s: line number must be greater than zero" msgstr "" -#: src/csplit.c:1169 +#: src/csplit.c:1171 #, c-format msgid "line number %s is smaller than preceding line number, %s" msgstr "" -#: src/csplit.c:1175 +#: src/csplit.c:1177 #, c-format msgid "warning: line number %s is the same as preceding line number" msgstr "" -#: src/csplit.c:1253 +#: src/csplit.c:1255 #, c-format msgid "missing conversion specifier in suffix" msgstr "" -#: src/csplit.c:1259 +#: src/csplit.c:1261 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "" -#: src/csplit.c:1262 +#: src/csplit.c:1264 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "" -#: src/csplit.c:1267 +#: src/csplit.c:1269 #, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "" -#: src/csplit.c:1284 +#: src/csplit.c:1286 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "" -#: src/csplit.c:1298 +#: src/csplit.c:1300 #, c-format msgid "missing %% conversion specification in suffix" msgstr "" -#: src/csplit.c:1345 +#: src/csplit.c:1347 #, c-format msgid "%s: invalid number" msgstr "" -#: src/csplit.c:1449 +#: src/csplit.c:1451 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "" -#: src/csplit.c:1453 +#: src/csplit.c:1455 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" -"\n" msgstr "" -#: src/csplit.c:1461 +#: src/csplit.c:1462 #, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2271,20 +2260,20 @@ msgid "" " -k, --keep-files do not remove output files on errors\n" msgstr "" -#: src/csplit.c:1466 +#: src/csplit.c:1467 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:1473 +#: src/csplit.c:1474 msgid "" "\n" "Read standard input if FILE is -. Each PATTERN may be:\n" msgstr "" -#: src/csplit.c:1477 +#: src/csplit.c:1478 msgid "" "\n" " INTEGER copy up to but not including specified line number\n" @@ -2301,7 +2290,7 @@ msgstr "" msgid "David M. Ihnat" msgstr "" -#: src/cut.c:64 +#: src/cut.c:64 src/cut.c:372 msgid "fields and positions are numbered from 1" msgstr "" @@ -2311,19 +2300,17 @@ msgid "Usage: %s OPTION... [FILE]...\n" msgstr "" #: src/cut.c:193 -msgid "" -"Print selected parts of lines from each FILE to standard output.\n" -"\n" +msgid "Print selected parts of lines from each FILE to standard output.\n" msgstr "" -#: src/cut.c:200 +#: src/cut.c:199 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:205 +#: src/cut.c:204 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2331,20 +2318,20 @@ msgid "" " -n (ignored)\n" msgstr "" -#: src/cut.c:211 +#: src/cut.c:210 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" msgstr "" -#: src/cut.c:215 +#: src/cut.c:214 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:222 +#: src/cut.c:221 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2352,7 +2339,7 @@ msgid "" "in the same order that it is read, and is written exactly once.\n" msgstr "" -#: src/cut.c:228 +#: src/cut.c:227 msgid "" "Each range is one of:\n" "\n" @@ -2364,55 +2351,56 @@ msgid "" "With no FILE, or when FILE is -, read standard input.\n" msgstr "" -#: src/cut.c:368 src/cut.c:489 -msgid "invalid byte or field list" +#: src/cut.c:367 src/cut.c:493 +msgid "invalid byte, character or field list" msgstr "" -#: src/cut.c:385 +#: src/cut.c:387 msgid "invalid range with no endpoint: -" msgstr "" -#: src/cut.c:399 +#: src/cut.c:403 msgid "invalid decreasing range" msgstr "" -#: src/cut.c:478 +#: src/cut.c:482 #, c-format msgid "byte offset %s is too large" msgstr "" -#: src/cut.c:481 +#: src/cut.c:485 #, c-format msgid "field number %s is too large" msgstr "" -#: src/cut.c:789 src/cut.c:797 +#: src/cut.c:795 src/cut.c:803 msgid "only one type of list may be specified" msgstr "" -#: src/cut.c:806 +#: src/cut.c:812 src/numfmt.c:1408 +#, c-format msgid "the delimiter must be a single character" msgstr "" -#: src/cut.c:841 +#: src/cut.c:847 msgid "you must specify a list of bytes, characters, or fields" msgstr "" -#: src/cut.c:844 +#: src/cut.c:850 msgid "an input delimiter may be specified only when operating on fields" msgstr "" -#: src/cut.c:848 +#: src/cut.c:854 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" msgstr "" -#: src/cut.c:864 +#: src/cut.c:870 msgid "missing list of fields" msgstr "" -#: src/cut.c:866 +#: src/cut.c:872 msgid "missing list of positions" msgstr "" @@ -2424,9 +2412,11 @@ msgid "" msgstr "" #: src/date.c:128 +msgid "Display the current time in the given FORMAT, or set the system date.\n" +msgstr "" + +#: src/date.c:134 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" " -I[TIMESPEC], --iso-8601[=TIMESPEC] output date/time in ISO 8601 format.\n" @@ -2435,14 +2425,14 @@ msgid "" " and time to the indicated precision.\n" msgstr "" -#: src/date.c:138 +#: src/date.c:142 msgid "" " -r, --reference=FILE display the last modification time of FILE\n" " -R, --rfc-2822 output date and time in RFC 2822 format.\n" " Example: Mon, 07 Aug 2006 12:34:56 -0600\n" msgstr "" -#: src/date.c:143 +#: src/date.c:147 msgid "" " --rfc-3339=TIMESPEC output date and time in RFC 3339 format.\n" " TIMESPEC='date', 'seconds', or 'ns' for\n" @@ -2453,7 +2443,7 @@ msgid "" " -u, --utc, --universal print or set Coordinated Universal Time\n" msgstr "" -#: src/date.c:154 +#: src/date.c:158 msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" @@ -2462,7 +2452,7 @@ msgid "" " %a locale's abbreviated weekday name (e.g., Sun)\n" msgstr "" -#: src/date.c:161 +#: src/date.c:165 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2470,7 +2460,7 @@ msgid "" " %c locale's date and time (e.g., Thu Mar 3 23:05:25 2005)\n" msgstr "" -#: src/date.c:167 +#: src/date.c:171 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2478,14 +2468,14 @@ msgid "" " %e day of month, space padded; same as %_d\n" msgstr "" -#: src/date.c:173 +#: src/date.c:177 msgid "" " %F full date; same as %Y-%m-%d\n" " %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 "" -#: src/date.c:178 +#: src/date.c:182 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2493,7 +2483,7 @@ msgid "" " %j day of year (001..366)\n" msgstr "" -#: src/date.c:184 +#: src/date.c:188 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -2501,7 +2491,7 @@ msgid "" " %M minute (00..59)\n" msgstr "" -#: src/date.c:190 +#: src/date.c:194 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2512,7 +2502,7 @@ msgid "" " %s seconds since 1970-01-01 00:00:00 UTC\n" msgstr "" -#: src/date.c:199 +#: src/date.c:203 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2520,7 +2510,7 @@ msgid "" " %u day of week (1..7); 1 is Monday\n" msgstr "" -#: src/date.c:205 +#: src/date.c:209 msgid "" " %U week number of year, with Sunday as first day of week (00..53)\n" " %V ISO week number, with Monday as first day of week (01..53)\n" @@ -2528,7 +2518,7 @@ msgid "" " %W week number of year, with Monday as first day of week (00..53)\n" msgstr "" -#: src/date.c:211 +#: src/date.c:215 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -2536,7 +2526,7 @@ msgid "" " %Y year\n" msgstr "" -#: src/date.c:217 +#: src/date.c:221 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -2548,7 +2538,7 @@ msgid "" "By default, date pads numeric fields with zeroes.\n" msgstr "" -#: src/date.c:226 +#: src/date.c:230 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -2559,7 +2549,7 @@ msgid "" " # use opposite case if possible\n" msgstr "" -#: src/date.c:235 +#: src/date.c:239 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -2568,7 +2558,7 @@ msgid "" "O to use the locale's alternate numeric symbols if available.\n" msgstr "" -#: src/date.c:242 +#: src/date.c:246 msgid "" "\n" "Examples:\n" @@ -2582,35 +2572,35 @@ msgid "" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:275 src/dd.c:2193 src/head.c:838 src/md5sum.c:477 -#: src/md5sum.c:798 src/od.c:863 src/od.c:1914 src/pr.c:1176 src/pr.c:1372 -#: src/pr.c:1494 src/stty.c:842 src/tac.c:563 src/tail.c:343 src/tee.c:126 +#: 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 #, c-format msgid "standard input" msgstr "" -#: src/date.c:303 src/date.c:523 +#: src/date.c:307 src/date.c:527 #, c-format msgid "invalid date %s" msgstr "" -#: src/date.c:414 src/date.c:448 +#: src/date.c:418 src/date.c:452 #, c-format msgid "multiple output formats specified" msgstr "" -#: src/date.c:426 +#: src/date.c:430 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "" -#: src/date.c:433 +#: src/date.c:437 #, c-format msgid "the options to print and set the time may not be used together" msgstr "" -#: src/date.c:454 +#: src/date.c:458 #, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -2618,30 +2608,30 @@ msgid "" "argument must be a format string beginning with '+'" msgstr "" -#: src/date.c:531 +#: src/date.c:535 #, c-format msgid "cannot set date" msgstr "" -#: src/date.c:554 src/du.c:360 +#: src/date.c:558 src/du.c:371 #, c-format msgid "time %s is out of range" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/dd.c:44 src/factor.c:43 src/rm.c:41 src/tail.c:69 src/touch.c:41 +#: 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 "" -#: src/dd.c:517 +#: src/dd.c:521 #, c-format msgid "" "Usage: %s [OPERAND]...\n" " or: %s OPTION\n" msgstr "" -#: src/dd.c:522 +#: src/dd.c:526 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -2652,7 +2642,7 @@ msgid "" " ibs=BYTES read up to BYTES bytes at a time (default: 512)\n" msgstr "" -#: src/dd.c:531 +#: src/dd.c:535 msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -2661,13 +2651,14 @@ msgid "" " oflag=FLAGS write as per the comma separated symbol list\n" " seek=N skip N obs-sized blocks at start of output\n" " skip=N skip N ibs-sized blocks at start of input\n" -" status=noxfer suppress transfer statistics\n" +" status=WHICH WHICH info to suppress outputting to stderr;\n" +" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" msgstr "" -#: src/dd.c:541 +#: src/dd.c:546 msgid "" "\n" -"BLOCKS and BYTES may be followed by the following multiplicative suffixes:\n" +"N and BYTES may be followed by the following multiplicative suffixes:\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, and so on for T, P, E, Z, Y.\n" "\n" @@ -2675,7 +2666,7 @@ msgid "" "\n" msgstr "" -#: src/dd.c:550 +#: src/dd.c:555 msgid "" " ascii from EBCDIC to ASCII\n" " ebcdic from ASCII to EBCDIC\n" @@ -2690,7 +2681,7 @@ msgid "" " with block or unblock, pad with spaces rather than NULs\n" msgstr "" -#: src/dd.c:563 +#: src/dd.c:568 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -2700,7 +2691,7 @@ msgid "" " fsync likewise, but also write metadata\n" msgstr "" -#: src/dd.c:571 +#: src/dd.c:576 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -2709,75 +2700,75 @@ msgid "" "suggested)\n" msgstr "" -#: src/dd.c:578 +#: src/dd.c:583 msgid " cio use concurrent I/O for data\n" msgstr "" -#: src/dd.c:580 +#: src/dd.c:585 msgid " direct use direct I/O for data\n" msgstr "" -#: src/dd.c:582 +#: src/dd.c:587 msgid " directory fail unless a directory\n" msgstr "" -#: src/dd.c:584 +#: src/dd.c:589 msgid " dsync use synchronized I/O for data\n" msgstr "" -#: src/dd.c:586 +#: src/dd.c:591 msgid " sync likewise, but also for metadata\n" msgstr "" -#: src/dd.c:587 +#: src/dd.c:592 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr "" -#: src/dd.c:590 +#: src/dd.c:595 msgid " nonblock use non-blocking I/O\n" msgstr "" -#: src/dd.c:592 +#: src/dd.c:597 msgid " noatime do not update access time\n" msgstr "" -#: src/dd.c:595 +#: src/dd.c:600 msgid " nocache discard cached data\n" msgstr "" -#: src/dd.c:598 +#: src/dd.c:603 msgid " noctty do not assign controlling terminal from file\n" msgstr "" -#: src/dd.c:601 +#: src/dd.c:606 msgid " nofollow do not follow symlinks\n" msgstr "" -#: src/dd.c:603 +#: src/dd.c:608 msgid " nolinks fail if multiply-linked\n" msgstr "" -#: src/dd.c:605 +#: src/dd.c:610 msgid " binary use binary I/O for data\n" msgstr "" -#: src/dd.c:607 +#: src/dd.c:612 msgid " text use text I/O for data\n" msgstr "" -#: src/dd.c:609 +#: src/dd.c:614 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:612 +#: src/dd.c:617 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:615 +#: src/dd.c:620 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:620 +#: src/dd.c:625 #, c-format msgid "" "\n" @@ -2794,28 +2785,28 @@ msgid "" "\n" msgstr "" -#: src/dd.c:676 +#: src/dd.c:683 #, c-format msgid "" "%<PRIuMAX>+%<PRIuMAX> records in\n" "%<PRIuMAX>+%<PRIuMAX> records out\n" msgstr "" -#: src/dd.c:682 +#: src/dd.c:689 #, c-format msgid "%<PRIuMAX> truncated record\n" msgid_plural "%<PRIuMAX> truncated records\n" msgstr[0] "" msgstr[1] "" -#: src/dd.c:694 +#: src/dd.c:701 #, c-format msgid "%<PRIuMAX> byte (%s) copied" msgid_plural "%<PRIuMAX> bytes (%s) copied" msgstr[0] "" msgstr[1] "" -#: src/dd.c:712 +#: src/dd.c:720 msgid "Infinity B" msgstr "" @@ -2829,236 +2820,257 @@ 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:725 +#: src/dd.c:733 #, c-format msgid ", %g s, %s/s\n" msgstr "" -#: src/dd.c:804 +#: src/dd.c:812 #, c-format msgid "closing input file %s" msgstr "" -#: src/dd.c:811 +#: src/dd.c:819 #, c-format msgid "closing output file %s" msgstr "" -#: src/dd.c:1014 +#: src/dd.c:1022 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "" -#: src/dd.c:1085 src/dd.c:1934 +#: src/dd.c:1093 src/dd.c:1942 #, c-format msgid "writing to %s" msgstr "" -#: src/dd.c:1199 src/dd.c:1253 +#: src/dd.c:1207 src/dd.c:1261 #, c-format msgid "unrecognized operand %s" msgstr "" -#: src/dd.c:1210 +#: src/dd.c:1218 msgid "invalid conversion" msgstr "" -#: src/dd.c:1213 src/dd.c:1289 +#: src/dd.c:1221 src/dd.c:1297 msgid "invalid input flag" msgstr "" -#: src/dd.c:1216 src/dd.c:1283 src/dd.c:1295 +#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303 msgid "invalid output flag" msgstr "" -#: src/dd.c:1219 +#: src/dd.c:1227 msgid "invalid status flag" msgstr "" -#: src/dd.c:1258 src/truncate.c:312 +#: src/dd.c:1266 src/truncate.c:310 #, c-format msgid "invalid number %s" msgstr "" -#: src/dd.c:1340 +#: src/dd.c:1348 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "" -#: src/dd.c:1342 +#: src/dd.c:1350 #, c-format msgid "cannot combine block and unblock" msgstr "" -#: src/dd.c:1344 +#: src/dd.c:1352 #, c-format msgid "cannot combine lcase and ucase" msgstr "" -#: src/dd.c:1346 +#: src/dd.c:1354 #, c-format msgid "cannot combine excl and nocreat" msgstr "" -#: src/dd.c:1349 +#: src/dd.c:1357 #, c-format msgid "cannot combine direct and nocache" msgstr "" -#: src/dd.c:1506 +#: src/dd.c:1514 #, 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:1593 +#: src/dd.c:1601 #, c-format msgid "%s: cannot skip" msgstr "" -#: src/dd.c:1595 src/dd.c:1614 src/dd.c:1675 +#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683 #, c-format msgid "%s: cannot seek" msgstr "" -#: src/dd.c:1655 +#: src/dd.c:1663 #, c-format msgid "offset overflow while reading file %s" msgstr "" -#: src/dd.c:1667 +#: src/dd.c:1675 #, c-format msgid "warning: invalid file offset after failed read" msgstr "" -#: src/dd.c:1671 +#: src/dd.c:1679 #, c-format msgid "cannot work around kernel bug after all" msgstr "" -#: src/dd.c:1814 +#: src/dd.c:1822 #, c-format msgid "setting flags for %s" msgstr "" -#: src/dd.c:1867 +#: src/dd.c:1875 #, c-format msgid "memory exhausted by input buffer of size %zu bytes (%s)" msgstr "" -#: src/dd.c:1881 +#: src/dd.c:1889 #, c-format msgid "memory exhausted by output buffer of size %zu bytes (%s)" msgstr "" -#: src/dd.c:1914 +#: src/dd.c:1922 #, c-format msgid "%s: cannot skip to specified offset" msgstr "" -#: src/dd.c:2125 src/dd.c:2258 +#: src/dd.c:2133 #, c-format -msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" +msgid "failed to truncate to %<PRIdMAX> bytes in output file %s" msgstr "" -#: src/dd.c:2138 +#: src/dd.c:2146 #, c-format msgid "fdatasync failed for %s" msgstr "" -#: src/dd.c:2148 +#: src/dd.c:2156 #, c-format msgid "fsync failed for %s" msgstr "" -#: src/dd.c:2199 src/dd.c:2228 +#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165 #, c-format -msgid "opening %s" +msgid "failed to open %s" msgstr "" -#: src/dd.c:2237 +#: src/dd.c:2246 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) " "blocks" msgstr "" -#: src/dd.c:2274 src/dd.c:2280 +#: src/dd.c:2267 +#, c-format +msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" +msgstr "" + +#: src/dd.c:2283 src/dd.c:2289 #, 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:54 src/expr.c:153 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:39 src/sleep.c:35 src/sort.c:66 +#: 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 msgid "Paul Eggert" msgstr "" -#: src/df.c:140 +#: src/df.c:172 msgid "Filesystem" msgstr "" -#: src/df.c:141 +#: src/df.c:175 msgid "Type" msgstr "" -#: src/df.c:142 +#: src/df.c:178 src/df.c:542 msgid "blocks" msgstr "" -#: src/df.c:142 -msgid "Inodes" +#: src/df.c:181 +msgid "Used" msgstr "" -#: src/df.c:142 -msgid "Size" +#: src/df.c:184 +msgid "Available" msgstr "" -#: src/df.c:143 -msgid "Used" +#: src/df.c:187 +msgid "Use%" msgstr "" -#: src/df.c:143 -msgid "IUsed" +#: src/df.c:190 +msgid "Inodes" msgstr "" -#: src/df.c:144 -msgid "Available" +#: src/df.c:193 +msgid "IUsed" msgstr "" -#: src/df.c:144 +#: src/df.c:196 msgid "IFree" msgstr "" -#: src/df.c:144 -msgid "Avail" +#: src/df.c:199 +msgid "IUse%" msgstr "" -#: src/df.c:145 -msgid "Use%" +#: src/df.c:202 +msgid "Mounted on" msgstr "" -#: src/df.c:145 -msgid "IUse%" +#: src/df.c:383 +#, c-format +msgid "option --output: field '%s' unknown" +msgstr "" + +#: src/df.c:390 +#, c-format +msgid "option --output: field '%s' used more than once" +msgstr "" + +#: src/df.c:410 src/df.c:449 +msgid "Size" msgstr "" -#: src/df.c:145 +#: src/df.c:414 src/df.c:451 +msgid "Avail" +msgstr "" + +#: src/df.c:474 msgid "Capacity" msgstr "" -#: src/df.c:146 -msgid "Mounted on" +#. 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 +#, c-format +msgid "%s-%s" msgstr "" -#: src/df.c:847 +#: src/df.c:1210 msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" -"\n" msgstr "" -#: src/df.c:855 +#: src/df.c:1217 msgid "" " -a, --all include dummy file systems\n" " -B, --block-size=SIZE scale sizes by SIZE before printing them. E.g.,\n" @@ -3070,7 +3082,7 @@ msgid "" " -H, --si likewise, but use powers of 1000 not 1024\n" msgstr "" -#: src/df.c:865 +#: src/df.c:1227 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3079,8 +3091,11 @@ msgid "" "(default)\n" msgstr "" -#: src/df.c:872 +#: src/df.c:1234 msgid "" +" --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" +" or print all fields if FIELD_LIST is " +"omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" " -t, --type=TYPE limit listing to file systems of type TYPE\n" @@ -3089,20 +3104,41 @@ msgid "" " -v (ignored)\n" msgstr "" -#: src/df.c:1027 +#: src/df.c:1248 +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" +msgstr "" + +#: src/df.c:1285 +#, 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 #, c-format msgid "file system type %s both selected and excluded" msgstr "" -#: src/df.c:1075 +#: src/df.c:1500 msgid "Warning: " msgstr "" -#: src/df.c:1077 src/stat.c:795 +#: src/df.c:1502 src/stat.c:814 msgid "cannot read table of mounted file systems" msgstr "" -#: src/df.c:1107 +#: src/df.c:1539 #, c-format msgid "no file systems processed" msgstr "" @@ -3192,21 +3228,21 @@ msgid "" " %s stdio.h -> \".\"\n" msgstr "" -#: src/du.c:260 src/sort.c:390 src/wc.c:112 +#: src/du.c:270 src/sort.c:394 src/wc.c:112 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" " or: %s [OPTION]... --files0-from=F\n" msgstr "" -#: src/du.c:264 -msgid "" -"Summarize disk usage of each FILE, recursively for directories.\n" -"\n" +#: src/du.c:274 +msgid "Summarize disk usage of each FILE, recursively for directories.\n" msgstr "" -#: src/du.c:271 +#: src/du.c:280 msgid "" +" -0, --null end each output line with 0 byte rather than " +"newline\n" " -a, --all write counts for all files, not just directories\n" " --apparent-size print apparent sizes, rather than disk usage; " "although\n" @@ -3215,7 +3251,7 @@ msgid "" " fragmentation, indirect blocks, and the like\n" msgstr "" -#: src/du.c:279 +#: src/du.c:289 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" @@ -3224,9 +3260,14 @@ msgid "" " -c, --total produce a grand total\n" " -D, --dereference-args dereference only symlinks that are listed on the\n" " command line\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 "" -#: src/du.c:288 +#: src/du.c:302 msgid "" " --files0-from=F summarize disk usage of the NUL-terminated file\n" " names specified in file F;\n" @@ -3234,41 +3275,29 @@ msgid "" " -H equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" --si like -h, but use powers of 1000 not 1024\n" msgstr "" -#: src/du.c:297 +#: src/du.c:310 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 "" -#: src/du.c:302 +#: src/du.c:316 msgid "" -" -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " "default)\n" -" -0, --null end each output line with 0 byte rather than " -"newline\n" " -S, --separate-dirs 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:309 -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 "" - -#: src/du.c:318 +#: src/du.c:322 msgid "" +" -t, --threshold=SIZE exclude entries smaller than SIZE if positive,\n" +" or entries greater than SIZE if negative\n" " --time show time of the last modification of any file in " "the\n" " directory, or any of its subdirectories\n" @@ -3279,63 +3308,72 @@ msgid "" " FORMAT is interpreted like 'date'\n" msgstr "" -#: src/du.c:375 +#: src/du.c:333 +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 msgid "Infinity" msgstr "" -#: src/du.c:600 +#: src/du.c:507 +#, c-format +msgid "mount point %s already traversed" +msgstr "" + +#: src/du.c:624 #, c-format msgid "fts_read failed: %s" msgstr "" -#: src/du.c:724 +#: src/du.c:780 #, c-format msgid "invalid maximum depth %s" msgstr "" -#: src/du.c:817 +#: src/du.c:809 +#, c-format +msgid "invalid --threshold argument '-0'" +msgstr "" + +#: src/du.c:887 #, c-format msgid "cannot both summarize and show all entries" msgstr "" -#: src/du.c:824 +#: src/du.c:894 #, c-format msgid "warning: summarizing is the same as using --max-depth=0" msgstr "" -#: src/du.c:830 +#: src/du.c:900 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "" -#: src/du.c:896 src/sort.c:4479 src/wc.c:668 +#: src/du.c:966 src/sort.c:4533 src/wc.c:668 msgid "file operands cannot be combined with --files0-from" msgstr "" -#: src/du.c:949 src/md5sum.c:587 src/od.c:903 src/tac.c:239 src/tac.c:350 -#: src/tac.c:506 src/tac.c:586 src/wc.c:733 +#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 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:963 src/sort.c:4508 src/wc.c:747 +#: src/du.c:1040 src/sort.c:4562 src/wc.c:747 #, c-format msgid "when reading file names from stdin, no file name of %s allowed" msgstr "" -#: src/du.c:980 src/du.c:988 src/wc.c:760 src/wc.c:768 +#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768 msgid "invalid zero-length file name" msgstr "" -#: src/du.c:1007 src/head.c:149 src/head.c:262 src/head.c:334 src/head.c:538 -#: src/head.c:620 src/head.c:692 src/head.c:750 src/head.c:774 src/tail.c:412 -#: src/tail.c:500 src/tail.c:549 src/tail.c:642 src/tail.c:770 src/tail.c:818 -#: src/tail.c:855 src/tail.c:1782 src/tail.c:1812 src/uniq.c:395 -#, c-format -msgid "error reading %s" -msgstr "" - -#: src/du.c:1010 src/ls.c:2649 src/wc.c:791 +#: src/du.c:1088 src/ls.c:2649 src/wc.c:791 msgid "total" msgstr "" @@ -3413,31 +3451,33 @@ msgid "Usage: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n" msgstr "" #: src/env.c:55 +msgid "Set each NAME to VALUE in the environment and run COMMAND.\n" +msgstr "" + +#: src/env.c:61 msgid "" -"Set each NAME to VALUE in the environment and run COMMAND.\n" -"\n" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with 0 byte rather than newline\n" " -u, --unset=NAME remove variable from the environment\n" msgstr "" -#: src/env.c:64 +#: src/env.c:68 msgid "" "\n" "A mere - implies -i. If no COMMAND, print the resulting environment.\n" msgstr "" -#: src/env.c:120 +#: src/env.c:124 #, c-format msgid "cannot unset %s" msgstr "" -#: src/env.c:131 +#: src/env.c:135 #, c-format msgid "cannot set %s" msgstr "" -#: src/env.c:148 +#: src/env.c:152 #, c-format msgid "cannot specify --null (-0) with command" msgstr "" @@ -3446,41 +3486,40 @@ msgstr "" msgid "" "Convert tabs in each FILE to spaces, writing to standard output.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" -#: src/expand.c:115 +#: src/expand.c:114 msgid "" " -i, --initial do not convert tabs after non blanks\n" " -t, --tabs=NUMBER have tabs NUMBER characters apart, not 8\n" msgstr "" -#: src/expand.c:119 +#: src/expand.c:118 msgid "" " -t, --tabs=LIST use comma separated list of explicit tab positions\n" msgstr "" -#: src/expand.c:172 src/unexpand.c:191 +#: src/expand.c:171 src/unexpand.c:190 #, c-format msgid "tab stop is too large %s" msgstr "" -#: src/expand.c:180 src/unexpand.c:199 +#: src/expand.c:179 src/unexpand.c:198 #, c-format msgid "tab size contains invalid character(s): %s" msgstr "" -#: src/expand.c:206 src/unexpand.c:225 +#: src/expand.c:205 src/unexpand.c:224 #, c-format msgid "tab size cannot be 0" msgstr "" -#: src/expand.c:208 src/unexpand.c:227 +#: src/expand.c:207 src/unexpand.c:226 #, c-format msgid "tab sizes must be ascending" msgstr "" -#: src/expand.c:326 src/expand.c:345 src/unexpand.c:374 src/unexpand.c:419 +#: 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 "" @@ -3592,12 +3631,12 @@ msgstr "" msgid "non-integer argument" msgstr "" -#: src/expr.c:793 src/truncate.c:316 +#: src/expr.c:793 src/truncate.c:314 #, c-format msgid "division by zero" msgstr "" -#: src/expr.c:887 src/sort.c:2029 +#: src/expr.c:887 src/sort.c:2044 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "" @@ -3607,32 +3646,39 @@ msgstr "" msgid "the strings compared were %s and %s" msgstr "" -#: src/factor.c:449 -msgid "using arbitrary-precision arithmetic" +#. This is a proper name. See the gettext manual, section Names. +#: src/factor.c:111 +msgid "Niels Moller" msgstr "" -#: src/factor.c:460 -msgid "using single-precision arithmetic" +#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459 +#, c-format +msgid "Lucas prime test failure. This should not happen" msgstr "" -#: src/factor.c:465 src/od.c:1640 src/od.c:1709 +#: src/factor.c:2092 #, c-format -msgid "%s is too large" +msgid "squfof queue overflow" msgstr "" -#: src/factor.c:469 +#: src/factor.c:2419 #, c-format msgid "%s is not a valid positive integer" msgstr "" -#: src/factor.c:494 +#: src/factor.c:2442 src/od.c:1646 src/od.c:1715 +#, c-format +msgid "%s is too large" +msgstr "" + +#: src/factor.c:2454 #, c-format msgid "" "Usage: %s [NUMBER]...\n" " or: %s OPTION\n" msgstr "" -#: src/factor.c:499 +#: src/factor.c:2459 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" @@ -3656,20 +3702,19 @@ msgid "cannot stat current directory (now %s)" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/fmt.c:37 +#: src/fmt.c:38 msgid "Ross Paterson" msgstr "" -#: src/fmt.c:269 +#: src/fmt.c:270 #, c-format msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n" msgstr "" -#: src/fmt.c:270 +#: 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" -"\n" msgstr "" #: src/fmt.c:278 @@ -3680,8 +3725,8 @@ msgid "" " -s, --split-only split long lines, but do not refill\n" msgstr "" -#: src/fmt.c:285 -#, c-format +#: src/fmt.c:287 +#, 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" @@ -3689,14 +3734,14 @@ msgid "" " -g, --goal=WIDTH goal width (default of 93% of width)\n" msgstr "" -#: src/fmt.c:357 +#: src/fmt.c:359 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" "option; use -w N instead" msgstr "" -#: src/fmt.c:403 src/fmt.c:414 +#: src/fmt.c:405 src/fmt.c:416 #, c-format msgid "invalid width: %s" msgstr "" @@ -3705,23 +3750,22 @@ msgstr "" msgid "" "Wrap input lines in each FILE (standard input by default), writing to\n" "standard output.\n" -"\n" msgstr "" -#: src/fold.c:78 +#: src/fold.c:77 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" " -w, --width=WIDTH use WIDTH columns instead of 80\n" msgstr "" -#: src/fold.c:289 src/pr.c:836 +#: src/fold.c:288 src/pr.c:832 #, c-format 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:75 +#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 #: src/truncate.c:37 msgid "Padraig Brady" msgstr "" @@ -3737,17 +3781,17 @@ msgid "" "\n" msgstr "" -#: src/group-list.c:69 src/id.c:345 src/setuidgid.c:184 +#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184 #, c-format msgid "failed to get groups for user %s" msgstr "" -#: src/group-list.c:74 src/id.c:350 +#: src/group-list.c:74 src/id.c:370 #, c-format msgid "failed to get groups for the current process" msgstr "" -#: src/group-list.c:104 +#: src/group-list.c:114 #, c-format msgid "cannot find name for group ID %lu" msgstr "" @@ -3789,10 +3833,9 @@ 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" -"\n" msgstr "" -#: src/head.c:118 +#: src/head.c:117 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -3802,13 +3845,13 @@ msgid "" " K lines of each file\n" msgstr "" -#: src/head.c:126 +#: 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 "" -#: src/head.c:132 +#: src/head.c:131 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -3816,58 +3859,58 @@ msgid "" "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n" msgstr "" -#: src/head.c:152 -#, c-format -msgid "error writing %s" -msgstr "" - -#: src/head.c:155 +#: src/head.c:154 #, c-format msgid "%s: file has shrunk too much" msgstr "" -#: src/head.c:228 src/head.c:1044 +#: src/head.c:227 src/head.c:1051 #, c-format msgid "%s: number of bytes is too large" msgstr "" -#: src/head.c:441 +#: src/head.c:440 #, c-format msgid "%s: cannot lseek back to original position" msgstr "" -#: src/head.c:613 src/head.c:684 src/tail.c:450 +#: src/head.c:612 src/head.c:691 src/tail.c:449 #, c-format msgid "%s: cannot seek to offset %s" msgstr "" -#: src/head.c:791 +#: src/head.c:673 +#, c-format +msgid "%s: failed to reset file pointer" +msgstr "" + +#: src/head.c:798 #, c-format msgid "cannot reposition file pointer for %s" msgstr "" -#: src/head.c:878 +#: src/head.c:885 #, c-format msgid "%s: %s is so large that it is not representable" msgstr "" -#: src/head.c:879 +#: src/head.c:886 msgid "number of lines" msgstr "" -#: src/head.c:879 +#: src/head.c:886 msgid "number of bytes" msgstr "" -#: src/head.c:886 src/tail.c:1947 +#: src/head.c:893 src/tail.c:1947 msgid "invalid number of lines" msgstr "" -#: src/head.c:887 src/tail.c:1948 +#: src/head.c:894 src/tail.c:1948 msgid "invalid number of bytes" msgstr "" -#: src/head.c:974 src/head.c:1032 +#: src/head.c:981 src/head.c:1039 #, c-format msgid "invalid trailing option -- %c" msgstr "" @@ -3964,86 +4007,86 @@ msgstr "" msgid "cannot get effective UID" msgstr "" -#: src/id.c:289 +#: src/id.c:311 #, c-format -msgid "cannot find name for user ID %lu" +msgid "cannot find name for user ID %s" msgstr "" -#: src/id.c:309 +#: src/id.c:329 #, c-format -msgid "uid=%lu" +msgid "uid=%s" msgstr "" -#: src/id.c:314 +#: src/id.c:334 #, c-format -msgid " gid=%lu" +msgid " gid=%s" msgstr "" -#: src/id.c:321 +#: src/id.c:341 #, c-format -msgid " euid=%lu" +msgid " euid=%s" msgstr "" -#: src/id.c:329 +#: src/id.c:349 #, c-format -msgid " egid=%lu" +msgid " egid=%s" msgstr "" -#: src/id.c:357 +#: src/id.c:377 msgid " groups=" msgstr "" -#: src/id.c:373 +#: src/id.c:393 #, c-format msgid " context=%s" msgstr "" -#: src/install.c:372 +#: src/install.c:373 #, c-format msgid "warning: %s: failed to change context to %s" msgstr "" -#: src/install.c:413 +#: src/install.c:414 #, c-format msgid "creating directory %s" msgstr "" -#: src/install.c:481 +#: src/install.c:482 #, c-format msgid "cannot change ownership of %s" msgstr "" -#: src/install.c:505 +#: src/install.c:506 #, c-format msgid "cannot set time stamps for %s" msgstr "" -#: src/install.c:526 src/split.c:412 src/timeout.c:387 +#: src/install.c:527 src/split.c:426 src/timeout.c:439 #, c-format msgid "fork system call failed" msgstr "" -#: src/install.c:530 +#: src/install.c:531 #, c-format msgid "cannot run %s" msgstr "" -#: src/install.c:534 +#: src/install.c:535 #, c-format msgid "waiting for strip" msgstr "" -#: src/install.c:536 +#: src/install.c:537 #, c-format msgid "strip process terminated abnormally" msgstr "" -#: src/install.c:557 +#: src/install.c:558 #, c-format msgid "invalid user %s" msgstr "" -#: src/install.c:593 +#: src/install.c:594 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -4052,7 +4095,7 @@ msgid "" " or: %s [OPTION]... -d DIRECTORY...\n" msgstr "" -#: src/install.c:600 +#: src/install.c:601 msgid "" "\n" "This install program copies files (often just compiled) into destination\n" @@ -4064,7 +4107,6 @@ msgid "" "In the first three forms, copy SOURCE to DEST or multiple SOURCE(s) to\n" "the existing DIRECTORY, while setting permission modes and owner/group.\n" "In the 4th form, create all components of the given DIRECTORY(ies).\n" -"\n" msgstr "" #: src/install.c:615 @@ -4112,53 +4154,53 @@ msgid "" "directories\n" msgstr "" -#: src/install.c:858 +#: src/install.c:859 #, c-format msgid "" "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled" msgstr "" -#: src/install.c:868 +#: src/install.c:869 #, c-format msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled" msgstr "" -#: src/install.c:885 +#: src/install.c:886 #, c-format msgid "the strip option may not be used when installing a directory" msgstr "" -#: src/install.c:888 +#: src/install.c:889 #, c-format msgid "target directory not allowed when installing a directory" msgstr "" -#: src/install.c:892 +#: src/install.c:893 #, c-format msgid "cannot force target context to %s and preserve it" msgstr "" -#: src/install.c:946 src/mkdir.c:202 src/stdbuf.c:327 +#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326 #, c-format msgid "invalid mode %s" msgstr "" -#: src/install.c:953 +#: src/install.c:954 #, c-format msgid "WARNING: ignoring --strip-program option as -s option was not specified" msgstr "" -#: src/install.c:958 +#: src/install.c:959 #, c-format msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive" msgstr "" -#: src/install.c:965 +#: src/install.c:966 #, c-format msgid "options --compare (-C) and --strip are mutually exclusive" msgstr "" -#: src/install.c:971 +#: src/install.c:972 #, c-format msgid "" "the --compare (-C) option is ignored when you specify a mode with non-" @@ -4166,7 +4208,7 @@ msgid "" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/join.c:40 src/sort.c:65 +#: src/join.c:40 src/sort.c:66 msgid "Mike Haertel" msgstr "" @@ -4222,7 +4264,7 @@ msgstr "" #: src/join.c:403 #, c-format -msgid "%s:%ju: is not sorted: %.*s" +msgid "%s:%<PRIuMAX>: is not sorted: %.*s" msgstr "" #: src/join.c:840 src/join.c:1038 @@ -4250,12 +4292,12 @@ msgstr "" msgid "conflicting empty-field replacement strings" msgstr "" -#: src/join.c:1101 src/sort.c:4414 +#: src/join.c:1101 src/sort.c:4468 #, c-format msgid "multi-character tab %s" msgstr "" -#: src/join.c:1105 src/sort.c:4419 +#: src/join.c:1105 src/sort.c:4473 #, c-format msgid "incompatible tabs" msgstr "" @@ -4274,12 +4316,10 @@ msgid "" msgstr "" #: src/kill.c:82 -msgid "" -"Send signals to processes, or list signals.\n" -"\n" +msgid "Send signals to processes, or list signals.\n" msgstr "" -#: src/kill.c:89 +#: src/kill.c:88 msgid "" " -s, --signal=SIGNAL, -SIGNAL\n" " specify the name or number of the signal to be sent\n" @@ -4288,7 +4328,7 @@ msgid "" " -t, --table print a table of signal information\n" msgstr "" -#: src/kill.c:97 +#: src/kill.c:96 msgid "" "\n" "SIGNAL may be a signal name like 'HUP', or a signal number like '1',\n" @@ -4296,32 +4336,32 @@ msgid "" "PID is an integer; if negative it identifies a process group.\n" msgstr "" -#: src/kill.c:206 +#: src/kill.c:205 #, c-format msgid "%s: invalid process id" msgstr "" -#: src/kill.c:260 +#: src/kill.c:259 #, c-format msgid "invalid option -- %c" msgstr "" -#: src/kill.c:269 +#: src/kill.c:268 #, c-format msgid "%s: multiple signals specified" msgstr "" -#: src/kill.c:283 +#: src/kill.c:282 #, c-format msgid "multiple -l or -t options specified" msgstr "" -#: src/kill.c:300 +#: src/kill.c:299 #, c-format msgid "cannot combine signal with -l or -t" msgstr "" -#: src/kill.c:306 +#: src/kill.c:305 #, c-format msgid "no process ID specified" msgstr "" @@ -4423,10 +4463,9 @@ msgid "" "When creating hard links, each TARGET must exist. Symbolic links\n" "can hold arbitrary text; if later resolved, a relative link is\n" "interpreted in relation to its parent directory.\n" -"\n" msgstr "" -#: src/ln.c:395 +#: src/ln.c:394 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -4439,7 +4478,7 @@ msgid "" " -f, --force remove existing destination files\n" msgstr "" -#: src/ln.c:403 +#: src/ln.c:402 msgid "" " -i, --interactive prompt whether to remove destinations\n" " -L, --logical dereference TARGETs that are symbolic links\n" @@ -4451,7 +4490,7 @@ msgid "" " -s, --symbolic make symbolic links instead of hard links\n" msgstr "" -#: src/ln.c:412 +#: src/ln.c:411 msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" " -t, --target-directory=DIRECTORY specify the DIRECTORY in which to " @@ -4461,18 +4500,10 @@ msgid "" " -v, --verbose print name of each linked file\n" msgstr "" -#: src/ln.c:428 -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 "" - -#: src/ln.c:435 +#: src/ln.c:433 #, 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 "" @@ -4541,7 +4572,7 @@ msgstr "" msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "" -#: src/ls.c:1750 src/ptx.c:1976 +#: src/ls.c:1750 src/ptx.c:1975 #, c-format msgid "invalid line width: %s" msgstr "" @@ -4604,7 +4635,7 @@ msgstr "" msgid "closing directory %s" msgstr "" -#: src/ls.c:3301 +#: src/ls.c:3302 #, c-format msgid "cannot compare file names %s and %s" msgstr "" @@ -4613,10 +4644,9 @@ msgstr "" msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" -"\n" msgstr "" -#: src/ls.c:4729 +#: src/ls.c:4728 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -4625,7 +4655,7 @@ msgid "" "characters\n" msgstr "" -#: src/ls.c:4735 +#: src/ls.c:4734 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them. E." "g.,\n" @@ -4639,7 +4669,7 @@ msgid "" " otherwise: sort by ctime, newest first\n" msgstr "" -#: src/ls.c:4745 +#: src/ls.c:4744 msgid "" " -C list entries by columns\n" " --color[=WHEN] colorize the output. WHEN defaults to " @@ -4651,7 +4681,7 @@ msgid "" " -D, --dired generate output designed for Emacs' dired mode\n" msgstr "" -#: src/ls.c:4753 +#: src/ls.c:4752 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -4661,11 +4691,11 @@ msgid "" " --full-time like -l --time-style=full-iso\n" msgstr "" -#: src/ls.c:4761 +#: src/ls.c:4760 msgid " -g like -l, but do not list owner\n" msgstr "" -#: src/ls.c:4764 +#: src/ls.c:4763 msgid "" " --group-directories-first\n" " group directories before files.\n" @@ -4673,7 +4703,7 @@ msgid "" " use of --sort=none (-U) disables grouping\n" msgstr "" -#: src/ls.c:4770 +#: src/ls.c:4769 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" @@ -4681,7 +4711,7 @@ msgid "" " --si likewise, but use powers of 1000 not 1024\n" msgstr "" -#: src/ls.c:4776 +#: src/ls.c:4775 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -4694,7 +4724,7 @@ msgid "" " (overridden by -a or -A)\n" msgstr "" -#: src/ls.c:4786 +#: src/ls.c:4785 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -4706,7 +4736,7 @@ msgid "" " -k, --kibibytes use 1024-byte blocks\n" msgstr "" -#: src/ls.c:4796 +#: src/ls.c:4795 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -4716,7 +4746,7 @@ msgid "" "entries\n" msgstr "" -#: src/ls.c:4804 +#: src/ls.c:4803 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. " @@ -4727,7 +4757,7 @@ msgid "" " append / indicator to directories\n" msgstr "" -#: src/ls.c:4812 +#: src/ls.c:4811 msgid "" " -q, --hide-control-chars print ? instead of non graphic characters\n" " --show-control-chars show non graphic characters as-is (default\n" @@ -4739,7 +4769,7 @@ msgid "" "escape\n" msgstr "" -#: src/ls.c:4821 +#: src/ls.c:4820 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -4747,7 +4777,7 @@ msgid "" "blocks\n" msgstr "" -#: src/ls.c:4826 +#: src/ls.c:4825 msgid "" " -S sort by file size\n" " --sort=WORD sort by WORD instead of name: none -U,\n" @@ -4759,7 +4789,7 @@ msgid "" " if --sort=time\n" msgstr "" -#: src/ls.c:4836 +#: src/ls.c:4835 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, +FORMAT.\n" @@ -4771,13 +4801,13 @@ msgid "" " takes effect only outside the POSIX locale\n" msgstr "" -#: src/ls.c:4845 +#: src/ls.c:4844 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:4849 +#: src/ls.c:4848 msgid "" " -u with -lt: sort by, and show, access time\n" " with -l: show access time and sort by name\n" @@ -4786,7 +4816,7 @@ msgid "" " -v natural sort of (version) numbers within text\n" msgstr "" -#: src/ls.c:4856 +#: src/ls.c:4855 msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" @@ -4796,7 +4826,7 @@ msgid "" " -1 list one file per line\n" msgstr "" -#: src/ls.c:4866 +#: src/ls.c:4865 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -4805,7 +4835,7 @@ msgid "" "variable can change the settings. Use the dircolors command to set it.\n" msgstr "" -#: src/ls.c:4873 +#: src/ls.c:4872 msgid "" "\n" "Exit status:\n" @@ -4829,7 +4859,7 @@ msgstr "" msgid "David Madore" msgstr "" -#: src/md5sum.c:162 +#: src/md5sum.c:164 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -4838,31 +4868,35 @@ msgid "" "\n" msgstr "" -#: src/md5sum.c:172 +#: src/md5sum.c:174 msgid "" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr "" -#: src/md5sum.c:176 +#: src/md5sum.c:178 msgid " -b, --binary read in binary mode\n" msgstr "" -#: src/md5sum.c:179 +#: src/md5sum.c:181 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr "" -#: src/md5sum.c:183 +#: src/md5sum.c:184 +msgid " --tag create a BSD-style checksum\n" +msgstr "" + +#: src/md5sum.c:188 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" -#: src/md5sum.c:187 +#: src/md5sum.c:192 msgid " -t, --text read in text mode (default)\n" msgstr "" -#: src/md5sum.c:190 +#: src/md5sum.c:195 msgid "" "\n" "The following three options are useful only when verifying checksums:\n" @@ -4872,12 +4906,12 @@ msgid "" "\n" msgstr "" -#: src/md5sum.c:198 +#: src/md5sum.c:203 msgid "" " --strict with --check, exit non-zero for any invalid input\n" msgstr "" -#: src/md5sum.c:203 +#: src/md5sum.c:208 #, c-format msgid "" "\n" @@ -4887,77 +4921,87 @@ msgid "" "space for text), and name for each FILE.\n" msgstr "" -#: src/md5sum.c:502 +#: src/md5sum.c:523 #, c-format msgid "%s: too many checksum lines" msgstr "" -#: src/md5sum.c:526 +#: src/md5sum.c:547 #, c-format msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line" msgstr "" -#: src/md5sum.c:551 +#: src/md5sum.c:572 #, c-format msgid "%s: FAILED open or read\n" msgstr "" -#: src/md5sum.c:574 +#: src/md5sum.c:595 msgid "FAILED" msgstr "" -#: src/md5sum.c:576 +#: src/md5sum.c:597 msgid "OK" msgstr "" -#: src/md5sum.c:600 +#: src/md5sum.c:621 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "" -#: src/md5sum.c:610 +#: src/md5sum.c:631 #, c-format msgid "WARNING: %<PRIuMAX> line is improperly formatted" msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted" msgstr[0] "" msgstr[1] "" -#: src/md5sum.c:618 +#: src/md5sum.c:639 #, 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:626 +#: src/md5sum.c:647 #, 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:704 +#: src/md5sum.c:760 +#, c-format +msgid "--tag does not support --text mode" +msgstr "" + +#: src/md5sum.c:766 +#, c-format +msgid "the --tag option is meaningless when verifying checksums" +msgstr "" + +#: src/md5sum.c:773 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" msgstr "" -#: src/md5sum.c:712 +#: src/md5sum.c:781 #, c-format msgid "the --status option is meaningful only when verifying checksums" msgstr "" -#: src/md5sum.c:719 +#: src/md5sum.c:788 #, c-format msgid "the --warn option is meaningful only when verifying checksums" msgstr "" -#: src/md5sum.c:726 +#: src/md5sum.c:795 #, c-format msgid "the --quiet option is meaningful only when verifying checksums" msgstr "" -#: src/md5sum.c:733 +#: src/md5sum.c:802 #, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "" @@ -4968,12 +5012,10 @@ msgid "Usage: %s [OPTION]... DIRECTORY...\n" msgstr "" #: src/mkdir.c:57 -msgid "" -"Create the DIRECTORY(ies), if they do not already exist.\n" -"\n" +msgid "Create the DIRECTORY(ies), if they do not already exist.\n" msgstr "" -#: src/mkdir.c:64 +#: src/mkdir.c:63 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" @@ -4982,7 +5024,7 @@ msgid "" " directory to CTX\n" msgstr "" -#: src/mkdir.c:169 +#: src/mkdir.c:168 #, c-format msgid "created directory %s" msgstr "" @@ -4993,27 +5035,25 @@ msgid "Usage: %s [OPTION]... NAME...\n" msgstr "" #: src/mkfifo.c:52 -msgid "" -"Create named pipes (FIFOs) with the given NAMEs.\n" -"\n" +msgid "Create named pipes (FIFOs) with the given NAMEs.\n" msgstr "" -#: src/mkfifo.c:59 src/mknod.c:61 +#: src/mkfifo.c:58 src/mknod.c:60 msgid "" " -m, --mode=MODE set file permission bits to MODE, not a=rw - umask\n" msgstr "" -#: src/mkfifo.c:62 +#: src/mkfifo.c:61 msgid "" " -Z, --context=CTX set the SELinux security context of each NAME to CTX\n" msgstr "" -#: src/mkfifo.c:122 src/mknod.c:128 +#: src/mkfifo.c:121 src/mknod.c:127 #, c-format msgid "invalid mode" msgstr "" -#: src/mkfifo.c:127 src/mknod.c:133 +#: src/mkfifo.c:126 src/mknod.c:132 #, c-format msgid "mode must specify only file permission bits" msgstr "" @@ -5024,16 +5064,14 @@ msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n" msgstr "" #: src/mknod.c:54 -msgid "" -"Create the special file NAME of the given TYPE.\n" -"\n" +msgid "Create the special file NAME of the given TYPE.\n" msgstr "" -#: src/mknod.c:64 +#: src/mknod.c:63 msgid " -Z, --context=CTX set the SELinux security context of NAME to CTX\n" msgstr "" -#: src/mknod.c:69 +#: src/mknod.c:68 msgid "" "\n" "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n" @@ -5042,7 +5080,7 @@ msgid "" "otherwise, as decimal. TYPE may be:\n" msgstr "" -#: src/mknod.c:76 +#: src/mknod.c:75 msgid "" "\n" " b create a block (buffered) special file\n" @@ -5050,40 +5088,40 @@ msgid "" " p create a FIFO\n" msgstr "" -#: src/mknod.c:151 +#: src/mknod.c:150 msgid "Special files require major and minor device numbers." msgstr "" -#: src/mknod.c:161 +#: src/mknod.c:160 msgid "Fifos do not have major and minor device numbers." msgstr "" -#: src/mknod.c:177 +#: src/mknod.c:176 #, c-format msgid "block special files not supported" msgstr "" -#: src/mknod.c:186 +#: src/mknod.c:185 #, c-format msgid "character special files not supported" msgstr "" -#: src/mknod.c:202 +#: src/mknod.c:201 #, c-format msgid "invalid major device number %s" msgstr "" -#: src/mknod.c:207 +#: src/mknod.c:206 #, c-format msgid "invalid minor device number %s" msgstr "" -#: src/mknod.c:212 +#: src/mknod.c:211 #, c-format msgid "invalid device %s %s" msgstr "" -#: src/mknod.c:226 +#: src/mknod.c:225 #, c-format msgid "invalid device type %s" msgstr "" @@ -5142,58 +5180,56 @@ msgid "" " directory specified via -p; else /tmp [deprecated]\n" msgstr "" -#: src/mktemp.c:222 +#: src/mktemp.c:223 #, c-format msgid "failed to redirect stderr to /dev/null" msgstr "" -#: src/mktemp.c:228 +#: src/mktemp.c:229 #, c-format msgid "too many templates" msgstr "" -#: src/mktemp.c:248 +#: src/mktemp.c:249 #, c-format msgid "with --suffix, template %s must end in X" msgstr "" -#: src/mktemp.c:273 src/split.c:1117 +#: src/mktemp.c:274 src/split.c:1130 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "" -#: src/mktemp.c:278 +#: src/mktemp.c:279 #, c-format msgid "too few X's in template %s" msgstr "" -#: src/mktemp.c:291 +#: src/mktemp.c:292 #, c-format msgid "invalid template, %s, contains directory separator" msgstr "" -#: src/mktemp.c:305 +#: src/mktemp.c:306 #, c-format msgid "invalid template, %s; with --tmpdir, it may not be absolute" msgstr "" -#: src/mktemp.c:325 +#: src/mktemp.c:326 #, c-format msgid "failed to create directory via template %s" msgstr "" -#: src/mktemp.c:335 +#: src/mktemp.c:336 #, c-format msgid "failed to create file via template %s" msgstr "" -#: src/mv.c:290 -msgid "" -"Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" -"\n" +#: src/mv.c:292 +msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" msgstr "" -#: src/mv.c:297 +#: src/mv.c:298 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -5206,7 +5242,7 @@ msgid "" "effect.\n" msgstr "" -#: src/mv.c:306 +#: src/mv.c:307 msgid "" " --strip-trailing-slashes remove any trailing slashes from each " "SOURCE\n" @@ -5214,7 +5250,7 @@ msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" msgstr "" -#: src/mv.c:311 +#: src/mv.c:312 msgid "" " -t, --target-directory=DIRECTORY move all SOURCE arguments into " "DIRECTORY\n" @@ -5234,28 +5270,30 @@ msgstr "" #, c-format msgid "" "Run COMMAND with an adjusted niceness, which affects process scheduling.\n" -"With no COMMAND, print the current niceness. Nicenesses range from\n" -"%d (most favorable scheduling) to %d (least favorable).\n" -"\n" -" -n, --adjustment=N add integer N to the niceness (default 10)\n" +"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 "" + +#: src/nice.c:82 +msgid " -n, --adjustment=N add integer N to the niceness (default 10)\n" msgstr "" -#: src/nice.c:168 +#: src/nice.c:172 #, c-format msgid "invalid adjustment %s" msgstr "" -#: src/nice.c:177 +#: src/nice.c:181 #, c-format msgid "a command must be given with an adjustment" msgstr "" -#: src/nice.c:184 src/nice.c:195 +#: src/nice.c:188 src/nice.c:199 #, c-format msgid "cannot get niceness" msgstr "" -#: src/nice.c:201 +#: src/nice.c:205 #, c-format msgid "cannot set niceness" msgstr "" @@ -5265,21 +5303,20 @@ msgstr "" msgid "Scott Bartram" msgstr "" -#: src/nl.c:186 +#: src/nl.c:179 msgid "" "Write each FILE to standard output, with line numbers added.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" -#: src/nl.c:194 +#: src/nl.c:186 msgid "" " -b, --body-numbering=STYLE use STYLE for numbering body lines\n" " -d, --section-delimiter=CC use CC for separating logical pages\n" " -f, --footer-numbering=STYLE use STYLE for numbering footer lines\n" msgstr "" -#: src/nl.c:199 +#: src/nl.c:191 msgid "" " -h, --header-numbering=STYLE use STYLE for numbering header lines\n" " -i, --line-increment=NUMBER line number increment at each line\n" @@ -5291,13 +5328,13 @@ msgid "" " -s, --number-separator=STRING add STRING after (possible) line number\n" msgstr "" -#: src/nl.c:207 +#: src/nl.c:199 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 "" -#: src/nl.c:213 +#: src/nl.c:205 msgid "" "\n" "By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC are\n" @@ -5305,7 +5342,7 @@ msgid "" "second character implies :. Type \\\\ for \\. STYLE is one of:\n" msgstr "" -#: src/nl.c:219 +#: src/nl.c:211 msgid "" "\n" " a number all lines\n" @@ -5322,52 +5359,47 @@ msgid "" "\n" msgstr "" -#: src/nl.c:286 +#: src/nl.c:278 #, c-format msgid "line number overflow" msgstr "" -#: src/nl.c:486 +#: src/nl.c:478 #, c-format msgid "invalid header numbering style: %s" msgstr "" -#: src/nl.c:494 +#: src/nl.c:486 #, c-format msgid "invalid body numbering style: %s" msgstr "" -#: src/nl.c:502 +#: src/nl.c:494 #, c-format msgid "invalid footer numbering style: %s" msgstr "" -#: src/nl.c:511 +#: src/nl.c:503 #, c-format msgid "invalid starting line number: %s" msgstr "" -#: src/nl.c:517 -#, c-format -msgid "WARNING: --page-increment is deprecated; use --line-increment instead" -msgstr "" - -#: src/nl.c:524 +#: src/nl.c:512 #, c-format msgid "invalid line number increment: %s" msgstr "" -#: src/nl.c:536 +#: src/nl.c:524 #, c-format msgid "invalid number of blank lines: %s" msgstr "" -#: src/nl.c:550 +#: src/nl.c:538 #, c-format msgid "invalid line number field width: %s" msgstr "" -#: src/nl.c:569 +#: src/nl.c:557 #, c-format msgid "invalid line numbering format: %s" msgstr "" @@ -5406,11 +5438,6 @@ msgstr "" msgid "ignoring input" msgstr "" -#: src/nohup.c:163 src/nohup.c:165 -#, c-format -msgid "failed to open %s" -msgstr "" - #: src/nohup.c:175 #, c-format msgid "ignoring input and appending output to %s" @@ -5442,96 +5469,388 @@ msgid "failed to redirect standard error" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:32 +#: src/nproc.c:33 msgid "Giuseppe Scrivano" msgstr "" -#: src/nproc.c:56 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 +#: src/nproc.c:57 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "" -#: src/nproc.c:57 +#: src/nproc.c:58 msgid "" "Print the number of processing units available to the current process,\n" "which may be less than the number of online processors\n" "\n" msgstr "" -#: src/nproc.c:62 +#: src/nproc.c:63 msgid "" " --all print the number of installed processors\n" " --ignore=N if possible, exclude N processing units\n" msgstr "" -#: src/nproc.c:106 +#: src/nproc.c:107 #, c-format msgid "%s: invalid number to ignore" msgstr "" -#: src/od.c:294 +#. This is a proper name. See the gettext manual, section Names. +#: src/numfmt.c:35 +msgid "Assaf Gordon" +msgstr "" + +#: src/numfmt.c:676 #, 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" +msgid "value too large to be converted: '%s'" msgstr "" -#: src/od.c:300 -msgid "" -"\n" -"Write an unambiguous representation, octal bytes by default,\n" -"of FILE to standard output. With more than one FILE argument,\n" -"concatenate them in the listed order to form the input.\n" -"With no FILE, or when FILE is -, read standard input.\n" -"\n" +#: src/numfmt.c:680 +#, c-format +msgid "invalid number: '%s'" msgstr "" -#: src/od.c:307 -msgid "All arguments to long options are mandatory for short options.\n" +#: src/numfmt.c:684 +#, c-format +msgid "rejecting suffix in input: '%s' (consider using --from)" msgstr "" -#: src/od.c:310 -msgid "" -" -A, --address-radix=RADIX decide how file offsets are printed\n" -" -j, --skip-bytes=BYTES skip BYTES input bytes first\n" +#: src/numfmt.c:688 +#, c-format +msgid "invalid suffix in input: '%s'" msgstr "" -#: src/od.c:314 -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" -" -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" -" --traditional accept arguments in traditional form\n" +#: src/numfmt.c:692 +#, c-format +msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)" msgstr "" -#: src/od.c:324 -msgid "" -"\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" -" -d same as -t u2, select unsigned decimal 2-byte units\n" +#: src/numfmt.c:723 +#, c-format +msgid "failed to prepare value '%Lf' for printing" msgstr "" -#: src/od.c:332 -msgid "" -" -f same as -t fF, select floats\n" -" -i same as -t dI, select decimal ints\n" -" -l same as -t dL, select decimal longs\n" -" -o same as -t o2, select octal 2-byte units\n" -" -s same as -t d2, select decimal 2-byte units\n" -" -x same as -t x2, select hexadecimal 2-byte units\n" +#: src/numfmt.c:787 +#, c-format +msgid "invalid unit size: '%s'" msgstr "" -#: src/od.c:340 -msgid "" -"\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 +#, c-format +msgid "Usage: %s [OPTION]... [NUMBER]...\n" +msgstr "" + +#: src/numfmt.c:816 +msgid "" +"Reformat NUMBER(s), or the numbers from standard input if none are " +"specified.\n" +msgstr "" + +#: src/numfmt.c:820 +msgid " --debug print warnings about invalid input\n" +msgstr "" + +#: src/numfmt.c:823 +msgid "" +" -d, --delimiter=X use X instead of whitespace for field delimiter\n" +msgstr "" + +#: src/numfmt.c:826 +msgid "" +" --field=N replace the number in input field N (default is 1)\n" +msgstr "" + +#: src/numfmt.c:829 +msgid "" +" --format=FORMAT use printf style floating-point FORMAT;\n" +" see FORMAT below for details\n" +msgstr "" + +#: src/numfmt.c:833 +msgid "" +" --from=UNIT auto-scale input numbers to UNITs; default is " +"'none';\n" +" see UNIT below\n" +msgstr "" + +#: src/numfmt.c:837 +msgid "" +" --from-unit=N specify the input unit size (instead of the default " +"1)\n" +msgstr "" + +#: src/numfmt.c:840 +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 "" + +#: src/numfmt.c:844 +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 +msgid "" +" --invalid=MODE failure mode for invalid numbers: MODE can be:\n" +" abort (default), fail, warn, ignore\n" +msgstr "" + +#: src/numfmt.c:852 +msgid "" +" --padding=N pad the output to N characters; positive N will\n" +" right-align; negative N will left-align;\n" +" padding is ignored if the output is wider than N;\n" +" the default is to automatically pad if a " +"whitespace\n" +" is found\n" +msgstr "" + +#: src/numfmt.c:859 +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 +msgid "" +" --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" +" SUFFIX in input numbers\n" +msgstr "" + +#: src/numfmt.c:867 +msgid "" +" --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" +msgstr "" + +#: src/numfmt.c:870 +msgid "" +" --to-unit=N the output unit size (instead of the default 1)\n" +msgstr "" + +#: src/numfmt.c:877 +msgid "" +"\n" +"UNIT options:\n" +msgstr "" + +#: src/numfmt.c:880 +msgid " none no auto-scaling is done; suffixes will trigger an error\n" +msgstr "" + +#: src/numfmt.c:883 +msgid "" +" auto accept optional single/two letter suffix:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" +msgstr "" + +#: src/numfmt.c:889 +msgid "" +" si accept optional single letter suffix:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:894 +msgid "" +" iec accept optional single letter suffix:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:899 +msgid "" +" iec-i accept optional two-letter suffix:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:905 +#, 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" +msgstr "" + +#: src/numfmt.c:912 +#, c-format +msgid "" +"\n" +"Exit status is 0 if all input numbers were successfully converted.\n" +"By default, %s will stop at the first conversion error with exit status 2.\n" +"With --invalid='fail' a warning is printed for each conversion error\n" +"and the exit status is 2. With --invalid='warn' each conversion error is\n" +"diagnosed, but the exit status is 0. With --invalid='ignore' conversion\n" +"errors are not diagnosed and the exit status is 0.\n" +msgstr "" + +#: src/numfmt.c:921 +#, c-format +msgid "" +"\n" +"Examples:\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" +msgstr "" + +#: src/numfmt.c:974 src/seq.c:212 +#, c-format +msgid "format %s has no %% directive" +msgstr "" + +#: src/numfmt.c:990 +#, c-format +msgid "invalid format %s (width overflow)" +msgstr "" + +#: src/numfmt.c:1007 src/seq.c:229 +#, c-format +msgid "format %s ends in %%" +msgstr "" + +#: src/numfmt.c:1010 +#, c-format +msgid "invalid format %s, directive must be %%['][-][N]f" +msgstr "" + +#: src/numfmt.c:1018 src/seq.c:236 +#, c-format +msgid "format %s has too many %% directives" +msgstr "" + +#: src/numfmt.c:1070 +#, c-format +msgid "invalid suffix in input '%s': '%s'" +msgstr "" + +#: src/numfmt.c:1092 +#, c-format +msgid "value too large to be printed: '%Lg' (consider using --to)" +msgstr "" + +#: src/numfmt.c:1100 +#, c-format +msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" +msgstr "" + +#: src/numfmt.c:1184 +#, c-format +msgid "large input value '%s': possible precision loss" +msgstr "" + +#: src/numfmt.c:1293 +#, c-format +msgid "input line is too short, no numbers found to convert in field %ld" +msgstr "" + +#: src/numfmt.c:1388 +#, c-format +msgid "invalid padding value '%s'" +msgstr "" + +#: src/numfmt.c:1401 +#, c-format +msgid "invalid field value '%s'" +msgstr "" + +#: src/numfmt.c:1430 +#, c-format +msgid "invalid header value '%s'" +msgstr "" + +#: src/numfmt.c:1456 +#, 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 +#, c-format +msgid "no conversion option specified" +msgstr "" + +#: src/numfmt.c:1471 +#, c-format +msgid "grouping cannot be combined with --to" +msgstr "" + +#: src/numfmt.c:1473 +#, c-format +msgid "grouping has no effect in this locale" +msgstr "" + +#: src/numfmt.c:1486 +#, c-format +msgid "--header ignored with command-line input" +msgstr "" + +#: src/numfmt.c:1511 +#, c-format +msgid "error reading input" +msgstr "" + +#: src/numfmt.c:1520 +#, c-format +msgid "failed to convert some of the input numbers" +msgstr "" + +#: src/od.c:294 +#, 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 "" + +#: src/od.c:300 +msgid "" +"\n" +"Write an unambiguous representation, octal bytes by default,\n" +"of FILE to standard output. With more than one FILE argument,\n" +"concatenate them in the listed order to form the input.\n" +"With no FILE, or when FILE is -, read standard input.\n" +"\n" +msgstr "" + +#: src/od.c:307 +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" "An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" @@ -5540,16 +5859,57 @@ msgid "" "suffixes may be . for octal and b for multiply by 512.\n" msgstr "" -#: src/od.c:349 +#: src/od.c:318 +msgid "" +" -A, --address-radix=RADIX output format for file offsets. RADIX is one\n" +" of [doxn], for Decimal, Octal, Hex or None\n" +" -j, --skip-bytes=BYTES skip BYTES input bytes first\n" +msgstr "" + +#: src/od.c:323 +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" +" 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" +" 32 is implied when BYTES is not specified\n" +" --traditional accept arguments in third form above\n" +msgstr "" + +#: src/od.c:336 msgid "" "\n" -"TYPE is made up of one or more of these specifications:\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" +" -d same as -t u2, select unsigned decimal 2-byte units\n" +msgstr "" + +#: src/od.c:345 +msgid "" +" -f same as -t fF, select floats\n" +" -i same as -t dI, select decimal ints\n" +" -l same as -t dL, select decimal longs\n" +" -o same as -t o2, select octal 2-byte units\n" +" -s same as -t d2, select decimal 2-byte units\n" +" -x same as -t x2, select hexadecimal 2-byte units\n" +msgstr "" + +#: src/od.c:353 +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" msgstr "" -#: src/od.c:356 +#: src/od.c:360 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -5558,83 +5918,84 @@ msgid "" " x[SIZE] hexadecimal, SIZE bytes per integer\n" msgstr "" -#: src/od.c:363 +#: src/od.c:367 msgid "" "\n" -"SIZE is a number. For TYPE in doux, SIZE may also be C for\n" +"SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" "sizeof(char), S for sizeof(short), I for sizeof(int) or L for\n" "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 "" -#: src/od.c:370 +#: src/od.c:374 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" +"Adding a z suffix to any type displays printable characters at the end of\n" +"each output line.\n" msgstr "" -#: src/od.c:380 +#: src/od.c:379 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" +"\n" +"BYTES is hex with 0x or 0X prefix, and may have a multiplier suffix:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"and so on for G, T, P, E, Z, Y.\n" msgstr "" -#: src/od.c:633 src/od.c:753 +#: src/od.c:639 src/od.c:759 #, c-format msgid "invalid type string %s" msgstr "" -#: src/od.c:643 +#: src/od.c:649 #, c-format msgid "" "invalid type string %s;\n" "this system doesn't provide a %lu-byte integral type" msgstr "" -#: src/od.c:764 +#: src/od.c:770 #, c-format msgid "" "invalid type string %s;\n" "this system doesn't provide a %lu-byte floating point type" msgstr "" -#: src/od.c:822 +#: src/od.c:828 #, c-format msgid "invalid character '%c' in type string %s" msgstr "" -#: src/od.c:1047 +#: src/od.c:1053 #, c-format msgid "cannot skip past end of combined input" msgstr "" -#: src/od.c:1603 +#: src/od.c:1609 #, c-format msgid "invalid output address radix '%c'; it must be one character from [doxn]" msgstr "" -#: src/od.c:1729 +#: src/od.c:1735 #, c-format msgid "no type may be specified when dumping strings" msgstr "" -#: src/od.c:1804 +#: src/od.c:1810 msgid "compatibility mode supports at most one file" msgstr "" -#: src/od.c:1825 +#: src/od.c:1831 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "" -#: src/od.c:1868 +#: src/od.c:1874 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "" @@ -5654,16 +6015,15 @@ 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" -"\n" msgstr "" -#: src/paste.c:448 +#: 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 "" -#: src/paste.c:509 +#: src/paste.c:508 #, c-format msgid "delimiter list ends with an unescaped backslash: %s" msgstr "" @@ -5718,80 +6078,80 @@ msgid "Kaveh Ghazi" msgstr "" #. TRANSLATORS: Real name is unknown; at most 19 characters. -#: src/pinky.c:250 +#: src/pinky.c:242 msgid " ???" msgstr "" #. TRANSLATORS: Idle time is unknown; at most 5 characters. -#: src/pinky.c:274 +#: src/pinky.c:266 msgid "?????" msgstr "" -#: src/pinky.c:323 +#: src/pinky.c:314 #, c-format msgid "Login name: " msgstr "" -#: src/pinky.c:326 +#: src/pinky.c:317 #, c-format msgid "In real life: " msgstr "" #. TRANSLATORS: Real name is unknown; no hard limit. -#: src/pinky.c:330 +#: src/pinky.c:321 msgid "???\n" msgstr "" -#: src/pinky.c:350 +#: src/pinky.c:341 #, c-format msgid "Directory: " msgstr "" -#: src/pinky.c:352 +#: src/pinky.c:343 #, c-format msgid "Shell: " msgstr "" -#: src/pinky.c:371 +#: src/pinky.c:362 #, c-format msgid "Project: " msgstr "" -#: src/pinky.c:395 +#: src/pinky.c:386 #, c-format msgid "Plan:\n" msgstr "" -#: src/pinky.c:414 +#: src/pinky.c:405 msgid "Login" msgstr "" -#: src/pinky.c:416 +#: src/pinky.c:407 msgid "Name" msgstr "" -#: src/pinky.c:417 +#: src/pinky.c:408 msgid " TTY" msgstr "" -#: src/pinky.c:419 +#: src/pinky.c:410 msgid "Idle" msgstr "" -#: src/pinky.c:420 +#: src/pinky.c:411 msgid "When" msgstr "" -#: src/pinky.c:423 +#: src/pinky.c:414 msgid "Where" msgstr "" -#: src/pinky.c:502 +#: src/pinky.c:493 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "" -#: src/pinky.c:503 +#: src/pinky.c:494 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -5801,7 +6161,7 @@ msgid "" " -s do short format output, this is the default\n" msgstr "" -#: src/pinky.c:511 +#: src/pinky.c:502 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -5810,7 +6170,7 @@ msgid "" " in short format\n" msgstr "" -#: src/pinky.c:520 +#: src/pinky.c:511 #, c-format msgid "" "\n" @@ -5818,7 +6178,7 @@ msgid "" "The utmp file will be %s.\n" msgstr "" -#: src/pinky.c:604 +#: src/pinky.c:595 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "" @@ -5833,83 +6193,81 @@ msgstr "" msgid "Roland Huebner" msgstr "" -#: src/pr.c:912 +#: src/pr.c:908 #, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "" -#: src/pr.c:914 +#: src/pr.c:910 #, c-format msgid "invalid page range %s" msgstr "" -#: src/pr.c:979 +#: src/pr.c:975 #, c-format msgid "'-l PAGE_LENGTH' invalid number of lines: %s" msgstr "" -#: src/pr.c:1003 +#: src/pr.c:999 #, c-format msgid "'-N NUMBER' invalid starting line number: %s" msgstr "" -#: src/pr.c:1015 +#: src/pr.c:1011 #, c-format msgid "'-o MARGIN' invalid line offset: %s" msgstr "" -#: src/pr.c:1056 +#: src/pr.c:1052 #, c-format msgid "'-w PAGE_WIDTH' invalid number of characters: %s" msgstr "" -#: src/pr.c:1070 +#: src/pr.c:1066 #, c-format msgid "'-W PAGE_WIDTH' invalid number of characters: %s" msgstr "" -#: src/pr.c:1100 +#: src/pr.c:1096 #, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "" -#: src/pr.c:1104 +#: src/pr.c:1100 #, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "" -#: src/pr.c:1200 +#: src/pr.c:1196 #, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "" -#: src/pr.c:1304 +#: src/pr.c:1293 #, c-format msgid "page width too narrow" msgstr "" -#: src/pr.c:2369 +#: src/pr.c:2353 #, c-format msgid "starting page number %<PRIuMAX> exceeds page count %<PRIuMAX>" msgstr "" -#: src/pr.c:2396 +#: src/pr.c:2380 #, c-format msgid "page number overflow" msgstr "" -#: src/pr.c:2401 +#: src/pr.c:2385 #, c-format msgid "Page %<PRIuMAX>" msgstr "" -#: src/pr.c:2773 -msgid "" -"Paginate or columnate FILE(s) for printing.\n" -"\n" +#: src/pr.c:2757 +msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" -#: src/pr.c:2780 +#: src/pr.c:2763 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -5919,7 +6277,7 @@ msgid "" " columns on each page\n" msgstr "" -#: src/pr.c:2788 +#: src/pr.c:2771 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -5929,7 +6287,7 @@ msgid "" " double space the output\n" msgstr "" -#: src/pr.c:2796 +#: src/pr.c:2779 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -5941,7 +6299,7 @@ msgid "" " and trailer without -F)\n" msgstr "" -#: src/pr.c:2806 +#: src/pr.c:2789 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -5954,7 +6312,7 @@ msgid "" " alignment, --sep-string[=STRING] sets separators\n" msgstr "" -#: src/pr.c:2815 +#: src/pr.c:2798 msgid "" " -l, --length=PAGE_LENGTH\n" " set the page length to PAGE_LENGTH (66) lines\n" @@ -5963,7 +6321,7 @@ msgid "" " truncate lines, but join lines of full length with -J\n" msgstr "" -#: src/pr.c:2822 +#: src/pr.c:2805 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -5973,7 +6331,7 @@ msgid "" " page printed (see +FIRST_PAGE)\n" msgstr "" -#: src/pr.c:2830 +#: src/pr.c:2813 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -5982,7 +6340,7 @@ msgid "" " omit warning when a file cannot be opened\n" msgstr "" -#: src/pr.c:2837 +#: src/pr.c:2820 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -5992,7 +6350,7 @@ msgid "" " options (-COLUMN|-a -COLUMN|-m) except -w is set\n" msgstr "" -#: src/pr.c:2844 +#: src/pr.c:2827 msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" @@ -6002,7 +6360,7 @@ msgid "" " -t, --omit-header omit page headers and trailers\n" msgstr "" -#: src/pr.c:2851 +#: src/pr.c:2834 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -6016,7 +6374,7 @@ msgid "" "(72)\n" msgstr "" -#: src/pr.c:2861 +#: src/pr.c:2844 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -6025,7 +6383,7 @@ msgid "" " with -S or -s\n" msgstr "" -#: src/pr.c:2869 +#: src/pr.c:2852 msgid "" "\n" "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" @@ -6154,17 +6512,16 @@ msgstr "" msgid "" "Output a permuted index, including context, of the words in the input " "files.\n" -"\n" msgstr "" -#: src/ptx.c:1828 +#: src/ptx.c:1827 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:1833 +#: src/ptx.c:1832 msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" " -O, --format=roff generate output as roff directives\n" @@ -6173,7 +6530,7 @@ msgid "" " -T, --format=tex generate output as TeX directives\n" msgstr "" -#: src/ptx.c:1840 +#: src/ptx.c:1839 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -6183,7 +6540,7 @@ msgid "" " -o, --only-file=FILE read only word list from this FILE\n" msgstr "" -#: src/ptx.c:1848 +#: src/ptx.c:1847 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -6191,13 +6548,13 @@ msgid "" "excluded\n" msgstr "" -#: src/ptx.c:1855 +#: src/ptx.c:1854 msgid "" "\n" "With no FILE or if FILE is -, read Standard Input. '-F /' by default.\n" msgstr "" -#: src/ptx.c:1949 +#: src/ptx.c:1948 #, c-format msgid "invalid gap width: %s" msgstr "" @@ -6219,7 +6576,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "" -#: src/pwd.c:170 src/pwd.c:277 +#: src/pwd.c:170 src/pwd.c:277 src/split.c:373 #, c-format msgid "failed to stat %s" msgstr "" @@ -6235,13 +6592,14 @@ msgid "ignoring non-option arguments" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/readlink.c:33 +#: src/readlink.c:32 msgid "Dmitry V. Levin" msgstr "" -#: src/readlink.c:62 +#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147 +#: src/stat.c:1349 src/touch.c:212 #, c-format -msgid "Usage: %s [OPTION]... FILE\n" +msgid "Usage: %s [OPTION]... FILE...\n" msgstr "" #: src/readlink.c:63 @@ -6269,16 +6627,17 @@ msgid "" "recursively,\n" " without requirements on components " "existence\n" -" -n, --no-newline do not output the trailing newline\n" +" -n, --no-newline do not output the trailing delimiter\n" " -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" msgstr "" -#: src/realpath.c:71 src/rm.c:134 src/shred.c:147 src/stat.c:1330 -#: src/touch.c:215 +#: src/readlink.c:152 #, c-format -msgid "Usage: %s [OPTION]... FILE...\n" +msgid "ignoring --no-newline with multiple arguments" msgstr "" #: src/realpath.c:72 @@ -6306,12 +6665,12 @@ msgstr "" msgid "generating relative path" msgstr "" -#: src/remove.c:286 +#: src/remove.c:273 #, c-format msgid "%s: descend into write-protected directory %s? " msgstr "" -#: src/remove.c:287 +#: src/remove.c:274 #, c-format msgid "%s: descend into directory %s? " msgstr "" @@ -6320,49 +6679,49 @@ msgstr "" #. translate "%s: remove %s (write-protected) %s? " #. instead. It should avoid grammatical problems #. with the output of file_type. -#: src/remove.c:303 +#: src/remove.c:290 #, c-format msgid "%s: remove write-protected %s %s? " msgstr "" -#: src/remove.c:304 +#: src/remove.c:291 #, c-format msgid "%s: remove %s %s? " msgstr "" -#: src/remove.c:417 +#: src/remove.c:374 #, c-format msgid "removed directory: %s\n" msgstr "" -#: src/remove.c:481 +#: src/remove.c:444 #, c-format msgid "cannot remove directory: %s" msgstr "" -#: src/remove.c:537 +#: src/remove.c:500 #, c-format msgid "skipping %s, since it's on a different device" msgstr "" -#: src/remove.c:557 +#: src/remove.c:520 #, c-format msgid "traversal failed: %s" msgstr "" -#: src/remove.c:563 +#: src/remove.c:526 #, c-format msgid "" "unexpected failure: fts_info=%d: %s\n" "please report to %s" msgstr "" -#: src/rm.c:118 +#: src/rm.c:119 #, c-format msgid "Try '%s ./%s' to remove the file %s.\n" msgstr "" -#: src/rm.c:135 +#: src/rm.c:136 msgid "" "Remove (unlink) the FILE(s).\n" "\n" @@ -6371,7 +6730,7 @@ msgid "" " -i prompt before every removal\n" msgstr "" -#: src/rm.c:141 +#: src/rm.c:142 msgid "" " -I prompt once before removing more than three files, " "or\n" @@ -6383,22 +6742,23 @@ msgid "" " always (-i). Without WHEN, prompt always\n" msgstr "" -#: src/rm.c:148 +#: src/rm.c:149 msgid "" " --one-file-system when removing a hierarchy recursively, skip any\n" " directory that is on a file system different from\n" " that of the corresponding command line argument\n" msgstr "" -#: src/rm.c:153 +#: src/rm.c:154 msgid "" " --no-preserve-root do not treat '/' specially\n" " --preserve-root do not remove '/' (default)\n" " -r, -R, --recursive remove directories and their contents recursively\n" +" -d, --dir remove empty directories\n" " -v, --verbose explain what is being done\n" msgstr "" -#: src/rm.c:161 +#: src/rm.c:163 msgid "" "\n" "By default, rm does not remove directories. Use the --recursive (-r or -R)\n" @@ -6406,7 +6766,7 @@ msgid "" "contents.\n" msgstr "" -#: src/rm.c:166 +#: src/rm.c:168 #, c-format msgid "" "\n" @@ -6417,7 +6777,7 @@ msgid "" " %s ./-foo\n" msgstr "" -#: src/rm.c:175 +#: src/rm.c:177 msgid "" "\n" "Note that if you use rm to remove a file, it might be possible to recover\n" @@ -6425,12 +6785,12 @@ msgid "" "assurance that the contents are truly unrecoverable, consider using shred.\n" msgstr "" -#: src/rm.c:335 +#: src/rm.c:342 #, c-format msgid "%s: remove all arguments recursively? " msgstr "" -#: src/rm.c:336 +#: src/rm.c:343 #, c-format msgid "%s: remove all arguments? " msgstr "" @@ -6478,7 +6838,10 @@ msgstr "" msgid "" "Run a program in a different security context.\n" "With neither CONTEXT nor COMMAND, print the current security context.\n" -"\n" +msgstr "" + +#: src/runcon.c:94 +msgid "" " CONTEXT Complete security context\n" " -c, --compute compute process transition context before modifying\n" " -t, --type=TYPE type (for same role as parent)\n" @@ -6488,72 +6851,72 @@ msgid "" "\n" msgstr "" -#: src/runcon.c:140 +#: src/runcon.c:144 #, c-format msgid "multiple roles" msgstr "" -#: src/runcon.c:145 +#: src/runcon.c:149 #, c-format msgid "multiple types" msgstr "" -#: src/runcon.c:150 +#: src/runcon.c:154 #, c-format msgid "multiple users" msgstr "" -#: src/runcon.c:155 +#: src/runcon.c:159 #, c-format msgid "multiple levelranges" msgstr "" -#: src/runcon.c:173 src/runcon.c:209 +#: src/runcon.c:177 src/runcon.c:213 #, c-format msgid "failed to get current context" msgstr "" -#: src/runcon.c:183 +#: src/runcon.c:187 #, c-format msgid "you must specify -c, -t, -u, -l, -r, or context" msgstr "" -#: src/runcon.c:191 +#: src/runcon.c:195 #, c-format msgid "no command specified" msgstr "" -#: src/runcon.c:197 +#: src/runcon.c:201 #, c-format msgid "%s may be used only on a SELinux kernel" msgstr "" -#: src/runcon.c:223 +#: src/runcon.c:227 #, c-format msgid "failed to compute a new context" msgstr "" -#: src/runcon.c:237 +#: src/runcon.c:241 #, c-format msgid "failed to set new user %s" msgstr "" -#: src/runcon.c:239 +#: src/runcon.c:243 #, c-format msgid "failed to set new type %s" msgstr "" -#: src/runcon.c:241 +#: src/runcon.c:245 #, c-format msgid "failed to set new range %s" msgstr "" -#: src/runcon.c:243 +#: src/runcon.c:247 #, c-format msgid "failed to set new role %s" msgstr "" -#: src/runcon.c:251 +#: src/runcon.c:255 #, c-format msgid "unable to set security context %s" msgstr "" @@ -6567,15 +6930,17 @@ msgid "" msgstr "" #: src/seq.c:73 +msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" +msgstr "" + +#: src/seq.c:79 msgid "" -"Print numbers from FIRST to LAST, in steps of INCREMENT.\n" -"\n" " -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 "" -#: src/seq.c:82 +#: src/seq.c:86 msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" @@ -6585,39 +6950,24 @@ msgid "" "INCREMENT is usually negative if FIRST is greater than LAST.\n" msgstr "" -#: src/seq.c:90 +#: src/seq.c:94 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:136 +#: src/seq.c:140 #, c-format msgid "invalid floating point argument: %s" msgstr "" -#: src/seq.c:193 -#, c-format -msgid "format %s has no %% directive" -msgstr "" - -#: src/seq.c:210 -#, c-format -msgid "format %s ends in %%" -msgstr "" - -#: src/seq.c:213 +#: src/seq.c:232 #, c-format msgid "format %s has unknown %%%c directive" msgstr "" -#: src/seq.c:217 -#, c-format -msgid "format %s has too many %% directives" -msgstr "" - -#: src/seq.c:431 +#: src/seq.c:555 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" @@ -6647,27 +6997,27 @@ msgid "" " (if specified) supplemental group IDs to GID1, ...\n" msgstr "" -#: src/setuidgid.c:163 +#: src/setuidgid.c:162 #, c-format msgid "unknown user-ID: %s" msgstr "" -#: src/setuidgid.c:174 +#: src/setuidgid.c:173 #, c-format msgid "to use user-ID %s you need to use -g too" msgstr "" -#: src/setuidgid.c:191 +#: src/setuidgid.c:190 #, c-format msgid "failed to set supplemental group(s)" msgstr "" -#: src/setuidgid.c:201 +#: src/setuidgid.c:200 #, c-format msgid "cannot set group-ID to %lu" msgstr "" -#: src/setuidgid.c:205 +#: src/setuidgid.c:204 #, c-format msgid "cannot set user-ID to %lu" msgstr "" @@ -6681,10 +7031,9 @@ msgstr "" 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" -"\n" msgstr "" -#: src/shred.c:156 +#: src/shred.c:155 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -6693,7 +7042,7 @@ msgid "" " -s, --size=N shred this many bytes (suffixes like K, M, G accepted)\n" msgstr "" -#: src/shred.c:162 +#: src/shred.c:161 msgid "" " -u, --remove truncate and remove file after overwriting\n" " -v, --verbose show progress\n" @@ -6702,7 +7051,7 @@ msgid "" " -z, --zero add a final overwrite with zeros to hide shredding\n" msgstr "" -#: src/shred.c:171 +#: src/shred.c:170 msgid "" "\n" "If FILE is -, shred standard output.\n" @@ -6714,7 +7063,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:181 +#: src/shred.c:180 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" @@ -6725,7 +7074,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:189 +#: src/shred.c:188 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -6737,7 +7086,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:199 +#: src/shred.c:198 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -6746,7 +7095,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:206 +#: src/shred.c:205 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" @@ -6758,129 +7107,129 @@ msgid "" "\n" msgstr "" -#: src/shred.c:216 +#: src/shred.c:215 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:296 +#: src/shred.c:295 #, c-format msgid "%s: fdatasync failed" msgstr "" -#: src/shred.c:307 +#: src/shred.c:306 #, c-format msgid "%s: fsync failed" msgstr "" -#: src/shred.c:384 +#: src/shred.c:383 #, c-format msgid "%s: cannot rewind" msgstr "" -#: src/shred.c:403 +#: src/shred.c:402 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "" -#: src/shred.c:453 +#: src/shred.c:452 #, c-format msgid "%s: error writing at offset %s" msgstr "" -#: src/shred.c:471 +#: src/shred.c:470 #, c-format msgid "%s: lseek failed" msgstr "" -#: src/shred.c:482 +#: src/shred.c:481 #, c-format msgid "%s: file too large" msgstr "" -#: src/shred.c:505 +#: src/shred.c:504 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "" -#: src/shred.c:521 +#: src/shred.c:520 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "" -#: src/shred.c:768 +#: src/shred.c:767 #, c-format msgid "%s: fstat failed" msgstr "" -#: src/shred.c:779 +#: src/shred.c:778 #, c-format msgid "%s: invalid file type" msgstr "" -#: src/shred.c:798 +#: src/shred.c:797 #, c-format msgid "%s: file has negative size" msgstr "" -#: src/shred.c:865 +#: src/shred.c:864 src/sort.c:932 src/split.c:378 #, c-format msgid "%s: error truncating" msgstr "" -#: src/shred.c:881 +#: src/shred.c:880 #, c-format msgid "%s: fcntl failed" msgstr "" -#: src/shred.c:886 +#: src/shred.c:885 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "" -#: src/shred.c:968 +#: src/shred.c:967 #, c-format msgid "%s: removing" msgstr "" -#: src/shred.c:992 +#: src/shred.c:991 #, c-format msgid "%s: renamed to %s" msgstr "" -#: src/shred.c:1014 +#: src/shred.c:1013 #, c-format msgid "%s: failed to remove" msgstr "" -#: src/shred.c:1018 +#: src/shred.c:1017 #, c-format msgid "%s: removed" msgstr "" -#: src/shred.c:1025 src/shred.c:1068 +#: src/shred.c:1024 src/shred.c:1067 #, c-format msgid "%s: failed to close" msgstr "" -#: src/shred.c:1061 +#: src/shred.c:1060 #, c-format msgid "%s: failed to open for writing" msgstr "" -#: src/shred.c:1126 +#: src/shred.c:1125 #, c-format msgid "%s: invalid number of passes" msgstr "" -#: src/shred.c:1135 src/shuf.c:291 src/sort.c:4387 +#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441 #, c-format msgid "multiple random sources specified" msgstr "" -#: src/shred.c:1149 +#: src/shred.c:1148 #, c-format msgid "%s: invalid file size" msgstr "" @@ -6894,12 +7243,10 @@ msgid "" msgstr "" #: src/shuf.c:54 -msgid "" -"Write a random permutation of the input lines to standard output.\n" -"\n" +msgid "Write a random permutation of the input lines to standard output.\n" msgstr "" -#: src/shuf.c:61 +#: src/shuf.c:60 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 " @@ -6910,27 +7257,27 @@ msgid "" " -z, --zero-terminated end lines with 0 byte, not newline\n" msgstr "" -#: src/shuf.c:245 +#: src/shuf.c:244 #, c-format msgid "multiple -i options specified" msgstr "" -#: src/shuf.c:265 +#: src/shuf.c:264 #, c-format msgid "invalid input range %s" msgstr "" -#: src/shuf.c:278 +#: src/shuf.c:277 #, c-format msgid "invalid line count %s" msgstr "" -#: src/shuf.c:285 src/sort.c:4381 +#: src/shuf.c:284 src/sort.c:4435 #, c-format msgid "multiple output files specified" msgstr "" -#: src/shuf.c:311 +#: src/shuf.c:310 #, c-format msgid "cannot combine -e and -i options" msgstr "" @@ -6949,7 +7296,7 @@ msgid "" "\n" msgstr "" -#: src/sleep.c:135 src/timeout.c:295 +#: src/sleep.c:135 src/timeout.c:320 #, c-format msgid "invalid time interval %s" msgstr "" @@ -6959,19 +7306,17 @@ msgstr "" msgid "cannot read realtime clock" msgstr "" -#: src/sort.c:395 -msgid "" -"Write sorted concatenation of all FILE(s) to standard output.\n" -"\n" +#: src/sort.c:399 +msgid "Write sorted concatenation of all FILE(s) to standard output.\n" msgstr "" -#: src/sort.c:402 +#: src/sort.c:405 msgid "" "Ordering options:\n" "\n" msgstr "" -#: src/sort.c:406 +#: src/sort.c:409 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -6979,19 +7324,19 @@ msgid "" " -f, --ignore-case fold lower case to upper case characters\n" msgstr "" -#: src/sort.c:412 +#: src/sort.c:415 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:417 +#: src/sort.c:420 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" -#: src/sort.c:420 +#: src/sort.c:423 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -6999,7 +7344,7 @@ msgid "" " -r, --reverse reverse the result of comparisons\n" msgstr "" -#: src/sort.c:426 +#: src/sort.c:429 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -7009,19 +7354,19 @@ msgid "" "\n" msgstr "" -#: src/sort.c:434 +#: src/sort.c:437 msgid "" "Other options:\n" "\n" msgstr "" -#: src/sort.c:438 +#: src/sort.c:441 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" msgstr "" -#: src/sort.c:442 +#: src/sort.c:445 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 " @@ -7030,7 +7375,7 @@ msgid "" " decompress them with PROG -d\n" msgstr "" -#: src/sort.c:449 +#: src/sort.c:452 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -7039,13 +7384,13 @@ msgid "" " If F is - then read names from standard input\n" msgstr "" -#: src/sort.c:456 +#: src/sort.c:459 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:460 +#: src/sort.c:463 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -7053,7 +7398,7 @@ msgid "" " -S, --buffer-size=SIZE use SIZE for main memory buffer\n" msgstr "" -#: src/sort.c:466 +#: src/sort.c:469 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -7068,11 +7413,11 @@ msgid "" "run\n" msgstr "" -#: src/sort.c:475 +#: src/sort.c:478 msgid " -z, --zero-terminated end lines with 0 byte, not newline\n" msgstr "" -#: src/sort.c:480 +#: src/sort.c:483 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -7091,7 +7436,7 @@ msgid "" "SIZE may be followed by the following multiplicative suffixes:\n" msgstr "" -#: src/sort.c:493 +#: src/sort.c:496 msgid "" "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n" "\n" @@ -7103,259 +7448,262 @@ msgid "" "native byte values.\n" msgstr "" -#: src/sort.c:694 +#: src/sort.c:697 #, c-format msgid "waiting for %s [-d]" msgstr "" -#: src/sort.c:699 +#: src/sort.c:702 #, c-format msgid "%s [-d] terminated abnormally" msgstr "" -#: src/sort.c:853 +#: src/sort.c:856 #, c-format msgid "cannot create temporary file in %s" msgstr "" -#: src/sort.c:939 src/sort.c:2010 src/sort.c:3056 src/sort.c:3755 -#: src/sort.c:3758 +#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713 +#: src/sort.c:3804 src/sort.c:3807 msgid "open failed" msgstr "" -#: src/sort.c:959 +#: src/sort.c:970 msgid "fflush failed" msgstr "" -#: src/sort.c:964 src/sort.c:2013 src/sort.c:4646 +#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706 msgid "close failed" msgstr "" -#: src/sort.c:973 +#: src/sort.c:986 #, c-format msgid "dup2 failed" msgstr "" -#: src/sort.c:1090 +#: src/sort.c:1103 #, c-format msgid "couldn't execute %s" msgstr "" -#: src/sort.c:1097 +#: src/sort.c:1110 msgid "couldn't create temporary file" msgstr "" -#: src/sort.c:1136 +#: src/sort.c:1149 #, c-format msgid "couldn't create process for %s -d" msgstr "" -#: src/sort.c:1150 +#: src/sort.c:1161 #, c-format msgid "couldn't execute %s -d" msgstr "" -#: src/sort.c:1209 +#: src/sort.c:1220 #, c-format msgid "warning: cannot remove: %s" msgstr "" -#: src/sort.c:1295 +#: src/sort.c:1306 #, c-format msgid "invalid --%s argument %s" msgstr "" -#: src/sort.c:1298 +#: src/sort.c:1309 #, c-format msgid "minimum --%s argument is %s" msgstr "" -#: src/sort.c:1313 +#: src/sort.c:1324 #, c-format msgid "--%s argument %s too large" msgstr "" -#: src/sort.c:1316 +#: src/sort.c:1327 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "" -#: src/sort.c:1398 +#: src/sort.c:1409 #, c-format msgid "number in parallel must be nonzero" msgstr "" -#: src/sort.c:1479 +#: src/sort.c:1494 msgid "stat failed" msgstr "" -#: src/sort.c:1740 +#: src/sort.c:1755 msgid "read failed" msgstr "" -#: src/sort.c:2028 +#: src/sort.c:2043 #, c-format msgid "string transformation failed" msgstr "" -#: src/sort.c:2031 +#: src/sort.c:2046 #, c-format msgid "the untransformed string was %s" msgstr "" -#: src/sort.c:2194 +#: src/sort.c:2209 #, c-format msgid "^ no match for key\n" msgstr "" -#: src/sort.c:2374 +#: src/sort.c:2389 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "" -#: src/sort.c:2380 +#: src/sort.c:2395 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "" -#: src/sort.c:2391 +#: src/sort.c:2406 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" -#: src/sort.c:2404 +#: src/sort.c:2419 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "" -#: src/sort.c:2436 +#: src/sort.c:2451 #, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" msgstr[0] "" msgstr[1] "" -#: src/sort.c:2442 +#: src/sort.c:2457 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "" -#: src/sort.c:2716 src/sort.c:2725 +#: src/sort.c:2731 src/sort.c:2740 msgid "write failed" msgstr "" -#: src/sort.c:2768 +#: src/sort.c:2783 #, c-format msgid "%s: %s:%s: disorder: " msgstr "" -#: src/sort.c:2771 +#: src/sort.c:2786 msgid "standard error" msgstr "" -#: src/sort.c:3926 +#: src/sort.c:3698 +msgid "cannot read" +msgstr "" + +#: src/sort.c:3976 #, c-format msgid "%s: invalid field specification %s" msgstr "" -#: src/sort.c:3937 +#: src/sort.c:3987 #, c-format msgid "options '-%s' are incompatible" msgstr "" -#: src/sort.c:3988 +#: src/sort.c:4038 #, c-format msgid "%s: invalid count at start of %s" msgstr "" -#: src/sort.c:4245 +#: src/sort.c:4295 msgid "invalid number after '-'" msgstr "" -#: src/sort.c:4248 src/sort.c:4334 src/sort.c:4362 +#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416 msgid "invalid number after '.'" msgstr "" -#: src/sort.c:4261 src/sort.c:4367 +#: src/sort.c:4315 src/sort.c:4421 msgid "stray character in field spec" msgstr "" -#: src/sort.c:4308 +#: src/sort.c:4362 #, c-format msgid "multiple compress programs specified" msgstr "" -#: src/sort.c:4325 +#: src/sort.c:4379 msgid "invalid number at field start" msgstr "" -#: src/sort.c:4329 src/sort.c:4357 +#: src/sort.c:4383 src/sort.c:4411 msgid "field number is zero" msgstr "" -#: src/sort.c:4338 +#: src/sort.c:4392 msgid "character offset is zero" msgstr "" -#: src/sort.c:4353 +#: src/sort.c:4407 msgid "invalid number after ','" msgstr "" -#: src/sort.c:4403 +#: src/sort.c:4457 #, c-format msgid "empty tab" msgstr "" -#: src/sort.c:4496 src/wc.c:692 +#: src/sort.c:4550 src/wc.c:692 #, c-format msgid "cannot read file names from %s" msgstr "" -#: src/sort.c:4518 +#: src/sort.c:4572 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "" -#: src/sort.c:4524 +#: src/sort.c:4578 #, c-format msgid "no input from %s" msgstr "" -#: src/sort.c:4570 +#: src/sort.c:4624 #, c-format msgid "using %s sorting rules" msgstr "" -#: src/sort.c:4573 +#: src/sort.c:4627 #, c-format msgid "using simple byte comparison" msgstr "" -#: src/sort.c:4604 +#: src/sort.c:4658 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "" -#: src/split.c:184 +#: src/split.c:187 #, c-format msgid "the suffix length needs to be at least %zu" msgstr "" -#: src/split.c:201 +#: src/split.c:204 #, c-format msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" msgstr "" -#: src/split.c:205 +#: src/split.c:208 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" -"\n" msgstr "" -#: src/split.c:214 +#: src/split.c:216 #, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" @@ -7374,13 +7722,13 @@ msgid "" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" -#: src/split.c:227 +#: src/split.c:229 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" msgstr "" -#: src/split.c:234 +#: src/split.c:236 msgid "" "\n" "CHUNKS may be:\n" @@ -7392,184 +7740,189 @@ msgid "" "r/K/N likewise but only output Kth of N to stdout\n" msgstr "" -#: src/split.c:352 +#: src/split.c:354 #, c-format msgid "output file suffixes exhausted" msgstr "" -#: src/split.c:364 +#: src/split.c:366 #, c-format msgid "creating file %s\n" msgstr "" -#: src/split.c:377 +#: src/split.c:375 +#, c-format +msgid "%s would overwrite input; aborting" +msgstr "" + +#: src/split.c:391 #, c-format msgid "failed to set FILE environment variable" msgstr "" -#: src/split.c:379 +#: src/split.c:393 #, c-format msgid "executing with FILE=%s\n" msgstr "" -#: src/split.c:381 +#: src/split.c:395 #, c-format msgid "failed to create pipe" msgstr "" -#: src/split.c:395 +#: src/split.c:409 #, c-format msgid "closing prior pipe" msgstr "" -#: src/split.c:397 +#: src/split.c:411 #, c-format msgid "closing output pipe" msgstr "" -#: src/split.c:401 +#: src/split.c:415 #, c-format msgid "moving input pipe" msgstr "" -#: src/split.c:403 +#: src/split.c:417 #, c-format msgid "closing input pipe" msgstr "" -#: src/split.c:408 +#: src/split.c:422 #, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "" -#: src/split.c:414 +#: src/split.c:428 #, c-format msgid "failed to close input pipe" msgstr "" -#: src/split.c:450 +#: src/split.c:464 #, c-format msgid "waiting for child process" msgstr "" -#: src/split.c:460 +#: src/split.c:474 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "" -#: src/split.c:468 +#: src/split.c:482 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:475 src/timeout.c:449 +#: src/split.c:489 src/timeout.c:494 #, c-format msgid "unknown status from command (0x%X)" msgstr "" -#: src/split.c:1037 +#: src/split.c:1052 #, c-format msgid "cannot split in more than one way" msgstr "" -#: src/split.c:1050 src/split.c:1192 src/split.c:1363 +#: src/split.c:1065 src/split.c:1205 src/split.c:1376 #, c-format msgid "%s: invalid number of chunks" msgstr "" -#: src/split.c:1054 +#: src/split.c:1069 #, c-format msgid "%s: invalid chunk number" msgstr "" -#: src/split.c:1106 +#: src/split.c:1119 #, c-format msgid "%s: invalid suffix length" msgstr "" -#: src/split.c:1131 src/split.c:1139 src/split.c:1162 src/split.c:1167 +#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180 #, c-format msgid "%s: invalid number of bytes" msgstr "" -#: src/split.c:1150 src/split.c:1297 +#: src/split.c:1163 src/split.c:1310 #, c-format msgid "%s: invalid number of lines" msgstr "" -#: src/split.c:1223 +#: src/split.c:1236 #, c-format msgid "line count option -%s%c... is too large" msgstr "" -#: src/split.c:1235 +#: src/split.c:1248 #, c-format msgid "%s: invalid start value for numerical suffix" msgstr "" -#: src/split.c:1263 +#: src/split.c:1276 #, c-format msgid "%s: invalid IO block size" msgstr "" -#: src/split.c:1284 +#: src/split.c:1297 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1321 +#: src/split.c:1334 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1356 +#: src/split.c:1369 #, c-format msgid "%s: cannot determine file size" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/stat.c:169 +#: src/stat.c:173 msgid "Michael Meskes" msgstr "" -#: src/stat.c:838 +#: src/stat.c:857 #, c-format msgid "failed to canonicalize %s" msgstr "" -#: src/stat.c:1050 +#: src/stat.c:1069 #, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "" -#: src/stat.c:1105 +#: src/stat.c:1124 #, c-format msgid "%s: invalid directive" msgstr "" -#: src/stat.c:1151 +#: src/stat.c:1170 #, c-format msgid "warning: backslash at end of format" msgstr "" -#: src/stat.c:1182 +#: src/stat.c:1201 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" -#: src/stat.c:1189 +#: src/stat.c:1208 #, c-format msgid "cannot read file system information for %s" msgstr "" -#: src/stat.c:1209 +#: src/stat.c:1228 #, 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:1245 +#: src/stat.c:1264 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -7580,7 +7933,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1268 +#: src/stat.c:1287 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -7588,30 +7941,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1278 +#: src/stat.c:1297 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:1286 +#: src/stat.c:1305 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:1295 +#: src/stat.c:1314 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:1305 +#: src/stat.c:1324 #, c-format msgid "Context: %C\n" msgstr "" -#: src/stat.c:1313 +#: src/stat.c:1332 msgid "" "Access: %x\n" "Modify: %y\n" @@ -7619,15 +7972,17 @@ msgid "" " Birth: %w\n" msgstr "" -#: src/stat.c:1331 +#: src/stat.c:1350 +msgid "Display file or file system status.\n" +msgstr "" + +#: src/stat.c:1356 msgid "" -"Display file or file system status.\n" -"\n" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" -#: src/stat.c:1337 +#: src/stat.c:1360 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -7637,7 +7992,7 @@ msgid "" " -t, --terse print the information in terse form\n" msgstr "" -#: src/stat.c:1348 +#: src/stat.c:1371 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -7649,7 +8004,7 @@ msgid "" " %C SELinux security context string\n" msgstr "" -#: src/stat.c:1357 +#: src/stat.c:1380 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -7659,7 +8014,7 @@ msgid "" " %G group name of owner\n" msgstr "" -#: src/stat.c:1365 +#: src/stat.c:1388 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -7672,7 +8027,7 @@ msgid "" " %T minor device type in hex\n" msgstr "" -#: src/stat.c:1376 +#: src/stat.c:1399 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -7687,7 +8042,7 @@ msgid "" "\n" msgstr "" -#: src/stat.c:1390 +#: src/stat.c:1413 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -7698,7 +8053,7 @@ msgid "" " %f free blocks in file system\n" msgstr "" -#: src/stat.c:1399 +#: src/stat.c:1422 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -7717,30 +8072,29 @@ msgstr "" #: src/stdbuf.c:91 msgid "" "Run COMMAND, with modified buffering operations for its standard streams.\n" -"\n" msgstr "" -#: src/stdbuf.c:98 +#: src/stdbuf.c:97 msgid "" " -i, --input=MODE adjust standard input stream buffering\n" " -o, --output=MODE adjust standard output stream buffering\n" " -e, --error=MODE adjust standard error stream buffering\n" msgstr "" -#: src/stdbuf.c:105 +#: src/stdbuf.c:104 msgid "" "\n" "If MODE is 'L' the corresponding stream will be line buffered.\n" "This option is invalid with standard input.\n" msgstr "" -#: src/stdbuf.c:108 +#: src/stdbuf.c:107 msgid "" "\n" "If MODE is '0' the corresponding stream will be unbuffered.\n" msgstr "" -#: src/stdbuf.c:111 +#: src/stdbuf.c:110 msgid "" "\n" "Otherwise MODE is a number which may be followed by one of the following:\n" @@ -7750,7 +8104,7 @@ msgid "" "size set to MODE bytes.\n" msgstr "" -#: src/stdbuf.c:117 +#: src/stdbuf.c:116 msgid "" "\n" "NOTE: If COMMAND adjusts the buffering of its standard streams ('tee' does\n" @@ -7760,22 +8114,22 @@ msgid "" "and are thus unaffected by 'stdbuf' settings.\n" msgstr "" -#: src/stdbuf.c:227 +#: src/stdbuf.c:226 #, c-format msgid "failed to find %s" msgstr "" -#: src/stdbuf.c:247 src/stdbuf.c:279 +#: src/stdbuf.c:246 src/stdbuf.c:278 #, c-format msgid "failed to update the environment with %s" msgstr "" -#: src/stdbuf.c:321 +#: src/stdbuf.c:320 #, c-format msgid "line buffering stdin is meaningless" msgstr "" -#: src/stty.c:509 +#: src/stty.c:513 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -7783,23 +8137,25 @@ msgid "" " or: %s [-F DEVICE | --file=DEVICE] [-g|--save]\n" msgstr "" -#: src/stty.c:515 +#: src/stty.c:519 +msgid "Print or change terminal characteristics.\n" +msgstr "" + +#: src/stty.c:525 msgid "" -"Print or change terminal characteristics.\n" -"\n" " -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:524 +#: src/stty.c:532 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:529 +#: src/stty.c:537 msgid "" "\n" "Special characters:\n" @@ -7808,7 +8164,7 @@ msgid "" " eol CHAR CHAR will end the line\n" msgstr "" -#: src/stty.c:536 +#: src/stty.c:544 msgid "" " * eol2 CHAR alternate CHAR for ending the line\n" " erase CHAR CHAR will erase the last character typed\n" @@ -7816,7 +8172,7 @@ msgid "" " kill CHAR CHAR will erase the current line\n" msgstr "" -#: src/stty.c:542 +#: src/stty.c:550 msgid "" " * lnext CHAR CHAR will enter the next character quoted\n" " quit CHAR CHAR will send a quit signal\n" @@ -7824,7 +8180,7 @@ msgid "" " start CHAR CHAR will restart the output after stopping it\n" msgstr "" -#: src/stty.c:548 +#: src/stty.c:556 msgid "" " stop CHAR CHAR will stop the output\n" " susp CHAR CHAR will send a terminal stop signal\n" @@ -7832,7 +8188,7 @@ msgid "" " * werase CHAR CHAR will erase the last word typed\n" msgstr "" -#: src/stty.c:554 +#: src/stty.c:562 msgid "" "\n" "Special settings:\n" @@ -7841,7 +8197,7 @@ msgid "" " * columns N same as cols N\n" msgstr "" -#: src/stty.c:561 +#: src/stty.c:569 msgid "" " ispeed N set the input speed to N\n" " * line N use line discipline N\n" @@ -7850,7 +8206,7 @@ msgid "" " ospeed N set the output speed to N\n" msgstr "" -#: src/stty.c:567 +#: src/stty.c:575 msgid "" " * rows N tell the kernel that the terminal has N rows\n" " * size print the number of rows and columns according to the " @@ -7859,27 +8215,28 @@ msgid "" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" -#: src/stty.c:573 +#: src/stty.c:581 msgid "" "\n" "Control settings:\n" " [-]clocal disable modem control signals\n" " [-]cread allow input to be received\n" " * [-]crtscts enable RTS/CTS handshaking\n" +" * [-]cdtrdsr enable DTR/DSR handshaking\n" " csN set character size to N bits, N in [5..8]\n" msgstr "" -#: src/stty.c:581 +#: src/stty.c:590 msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" " [-]hupcl same as [-]hup\n" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" -" [-]parodd set odd parity (even with '-')\n" +" [-]parodd set odd parity (or even parity with '-')\n" msgstr "" -#: src/stty.c:588 +#: src/stty.c:597 msgid "" "\n" "Input settings:\n" @@ -7889,7 +8246,7 @@ msgid "" " [-]igncr ignore carriage return\n" msgstr "" -#: src/stty.c:596 +#: src/stty.c:605 msgid "" " [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" @@ -7898,11 +8255,11 @@ msgid "" " [-]istrip clear high (8th) bit of input characters\n" msgstr "" -#: src/stty.c:603 +#: src/stty.c:612 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr "" -#: src/stty.c:606 +#: src/stty.c:615 msgid "" " * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" @@ -7912,7 +8269,7 @@ msgid "" " [-]tandem same as [-]ixoff\n" msgstr "" -#: src/stty.c:614 +#: src/stty.c:623 msgid "" "\n" "Output settings:\n" @@ -7922,7 +8279,7 @@ msgid "" " * nlN newline delay style, N in [0..1]\n" msgstr "" -#: src/stty.c:622 +#: src/stty.c:631 msgid "" " * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of null characters\n" @@ -7932,7 +8289,7 @@ msgid "" " * [-]onlret newline performs a carriage return\n" msgstr "" -#: src/stty.c:630 +#: src/stty.c:639 msgid "" " * [-]onocr do not print carriage returns in the first column\n" " [-]opost postprocess output\n" @@ -7942,7 +8299,7 @@ msgid "" " * vtN vertical tab delay style, N in [0..1]\n" msgstr "" -#: src/stty.c:638 +#: src/stty.c:647 msgid "" "\n" "Local settings:\n" @@ -7951,7 +8308,7 @@ msgid "" " * -crtkill kill all line by obeying the echoctl and echok settings\n" msgstr "" -#: src/stty.c:645 +#: src/stty.c:654 msgid "" " * [-]ctlecho echo control characters in hat notation ('^c')\n" " [-]echo echo input characters\n" @@ -7960,7 +8317,7 @@ msgid "" " [-]echok echo a newline after a kill character\n" msgstr "" -#: src/stty.c:652 +#: src/stty.c:661 msgid "" " * [-]echoke same as [-]crtkill\n" " [-]echonl echo newline even if not echoing other characters\n" @@ -7969,7 +8326,7 @@ msgid "" " [-]iexten enable non-POSIX special characters\n" msgstr "" -#: src/stty.c:659 +#: src/stty.c:668 msgid "" " [-]isig enable interrupt, quit, and suspend special characters\n" " [-]noflsh disable flushing after interrupt and quit special " @@ -7979,7 +8336,7 @@ msgid "" " * [-]xcase with icanon, escape with '\\' for uppercase characters\n" msgstr "" -#: src/stty.c:666 +#: src/stty.c:675 msgid "" "\n" "Combination settings:\n" @@ -7988,7 +8345,7 @@ msgid "" " -cbreak same as icanon\n" msgstr "" -#: src/stty.c:673 +#: src/stty.c:682 msgid "" " cooked same as brkint ignpar istrip icrnl ixon opost isig\n" " icanon, eof and eol characters to their default values\n" @@ -7996,7 +8353,7 @@ msgid "" " crt same as echoe echoctl echoke\n" msgstr "" -#: src/stty.c:679 +#: src/stty.c:688 msgid "" " dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" " kill ^u\n" @@ -8005,7 +8362,7 @@ msgid "" " evenp same as parenb -parodd cs7\n" msgstr "" -#: src/stty.c:686 +#: src/stty.c:695 msgid "" " -evenp same as -parenb cs8\n" " * [-]lcase same as xcase iuclc olcuc\n" @@ -8015,7 +8372,7 @@ msgid "" " -nl same as icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" msgstr "" -#: src/stty.c:694 +#: src/stty.c:703 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -8024,7 +8381,7 @@ msgid "" " -pass8 same as parenb istrip cs7\n" msgstr "" -#: src/stty.c:701 +#: src/stty.c:710 msgid "" " raw same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" " -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n" @@ -8032,7 +8389,7 @@ msgid "" " -raw same as cooked\n" msgstr "" -#: src/stty.c:707 +#: src/stty.c:716 msgid "" " sane same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" " -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n" @@ -8042,7 +8399,7 @@ msgid "" " characters to their default values\n" msgstr "" -#: src/stty.c:715 +#: src/stty.c:724 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -8051,126 +8408,59 @@ msgid "" "127; special values ^- or undef used to disable special characters.\n" msgstr "" -#: src/stty.c:787 +#: src/stty.c:796 #, c-format msgid "only one device may be specified" msgstr "" -#: src/stty.c:817 +#: src/stty.c:826 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" "mutually exclusive" msgstr "" -#: src/stty.c:823 +#: src/stty.c:832 #, c-format msgid "when specifying an output style, modes may not be set" msgstr "" -#: src/stty.c:838 +#: src/stty.c:847 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "" -#: src/stty.c:883 src/stty.c:993 +#: src/stty.c:892 src/stty.c:1002 #, c-format msgid "invalid argument %s" msgstr "" -#: src/stty.c:894 src/stty.c:911 src/stty.c:923 src/stty.c:936 src/stty.c:948 -#: src/stty.c:968 +#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957 +#: src/stty.c:977 #, c-format msgid "missing argument to %s" msgstr "" -#: src/stty.c:974 +#: src/stty.c:983 #, c-format msgid "invalid line discipline %s" msgstr "" -#: src/stty.c:1044 +#: src/stty.c:1053 #, c-format msgid "%s: unable to perform all requested operations" msgstr "" -#: src/stty.c:1390 +#: src/stty.c:1399 #, c-format msgid "%s: no size information for this device" msgstr "" -#: src/stty.c:1904 +#: src/stty.c:1920 #, c-format msgid "invalid integer argument %s" msgstr "" -#: src/su.c:229 -msgid "Password:" -msgstr "" - -#: src/su.c:232 -#, c-format -msgid "getpass: cannot open /dev/tty" -msgstr "" - -#: src/su.c:290 -#, c-format -msgid "cannot set groups" -msgstr "" - -#: src/su.c:294 -#, c-format -msgid "cannot set group id" -msgstr "" - -#: src/su.c:296 -#, c-format -msgid "cannot set user id" -msgstr "" - -#: src/su.c:371 -#, c-format -msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" -msgstr "" - -#: src/su.c:372 -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 "" - -#: src/su.c:384 -msgid "" -"\n" -"A mere - implies -l. If USER not given, assume root.\n" -msgstr "" - -#: src/su.c:461 -#, c-format -msgid "user %s does not exist" -msgstr "" - -#: src/su.c:484 -#, c-format -msgid "incorrect password" -msgstr "" - -#: src/su.c:501 -#, c-format -msgid "using restricted shell %s" -msgstr "" - -#: src/su.c:509 -#, c-format -msgid "warning: cannot change directory to %s" -msgstr "" - #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 msgid "Kayvan Aghaiepour" @@ -8195,7 +8485,7 @@ msgstr "" msgid "ignoring all arguments" msgstr "" -#: src/system.h:340 +#: src/system.h:343 #, c-format msgid "" "\n" @@ -8204,15 +8494,21 @@ msgid "" "for details about the options it supports.\n" msgstr "" -#: src/system.h:346 +#: src/system.h:349 msgid " --help display this help and exit\n" msgstr "" -#: src/system.h:348 +#: src/system.h:351 msgid " --version output version information and exit\n" msgstr "" -#: src/system.h:541 +#: src/system.h:544 +msgid "" +"\n" +"Mandatory arguments to long options are mandatory for short options too.\n" +msgstr "" + +#: src/system.h:552 msgid "" "\n" "SIZE is an integer and optional unit (example: 10M is 10*1024*1024). Units\n" @@ -8220,7 +8516,7 @@ msgid "" "1000).\n" msgstr "" -#: src/system.h:550 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -8229,7 +8525,7 @@ msgid "" "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n" msgstr "" -#: src/system.h:560 +#: src/system.h:571 #, c-format msgid "" "\n" @@ -8240,22 +8536,22 @@ msgstr "" #. <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:574 +#: src/system.h:585 #, c-format msgid "Report %s translation bugs to <http://translationproject.org/team/>\n" msgstr "" -#: src/system.h:578 +#: src/system.h:589 #, c-format msgid "For complete documentation, run: info coreutils '%s invocation'\n" msgstr "" -#: src/system.h:585 +#: src/system.h:596 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "" -#: src/system.h:617 +#: src/system.h:628 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -8274,52 +8570,51 @@ msgstr "" msgid "" "Write each FILE to standard output, last line first.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" -#: src/tac.c:145 +#: src/tac.c:144 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 "" -#: src/tac.c:235 src/tac.c:336 +#: src/tac.c:234 src/tac.c:335 #, c-format msgid "%s: seek failed" msgstr "" -#: src/tac.c:264 +#: src/tac.c:263 #, c-format msgid "record too large" msgstr "" -#: src/tac.c:451 +#: src/tac.c:450 #, c-format msgid "failed to create temporary file in %s" msgstr "" -#: src/tac.c:459 +#: src/tac.c:458 #, c-format msgid "failed to open %s for writing" msgstr "" -#: src/tac.c:476 +#: src/tac.c:475 #, c-format msgid "failed to rewind stream for %s" msgstr "" -#: src/tac.c:512 src/tac.c:519 +#: src/tac.c:511 src/tac.c:518 #, c-format msgid "%s: write error" msgstr "" -#: src/tac.c:572 +#: src/tac.c:571 #, c-format msgid "failed to open %s for reading" msgstr "" -#: src/tac.c:630 +#: src/tac.c:629 #, c-format msgid "separator cannot be empty" msgstr "" @@ -8335,10 +8630,9 @@ 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" -"\n" msgstr "" -#: src/tail.c:271 +#: src/tail.c:270 msgid "" " -c, --bytes=K output the last K bytes; alternatively, use -c " "+K\n" @@ -8346,7 +8640,7 @@ msgid "" "file\n" msgstr "" -#: src/tail.c:275 +#: src/tail.c:274 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -8355,7 +8649,7 @@ msgid "" " -F same as --follow=name --retry\n" msgstr "" -#: src/tail.c:282 +#: src/tail.c:281 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -8369,7 +8663,7 @@ msgid "" " With inotify, this option is rarely useful.\n" msgstr "" -#: src/tail.c:295 +#: src/tail.c:294 msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" " -q, --quiet, --silent never output headers giving file names\n" @@ -8378,7 +8672,7 @@ msgid "" " name, i.e., with --follow=name\n" msgstr "" -#: src/tail.c:302 +#: src/tail.c:301 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations.\n" @@ -8387,7 +8681,7 @@ msgid "" " -v, --verbose always output headers giving file names\n" msgstr "" -#: src/tail.c:311 +#: src/tail.c:310 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -8398,7 +8692,7 @@ msgid "" "\n" msgstr "" -#: src/tail.c:320 +#: src/tail.c:319 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" @@ -8408,64 +8702,64 @@ msgid "" "named file in a way that accommodates renaming, removal and creation.\n" msgstr "" -#: src/tail.c:379 +#: src/tail.c:378 #, c-format msgid "closing %s (fd=%d)" msgstr "" -#: src/tail.c:454 +#: src/tail.c:453 #, c-format msgid "%s: cannot seek to relative offset %s" msgstr "" -#: src/tail.c:458 +#: src/tail.c:457 #, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "" -#: src/tail.c:895 +#: src/tail.c:894 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "" -#: src/tail.c:907 +#: src/tail.c:906 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" msgstr "" -#: src/tail.c:964 +#: src/tail.c:963 #, c-format msgid "%s has become inaccessible" msgstr "" -#: src/tail.c:981 +#: src/tail.c:980 #, c-format msgid "%s has been replaced with an untailable file; giving up on this name" msgstr "" -#: src/tail.c:990 +#: src/tail.c:989 #, c-format msgid "%s has been replaced with a remote file. giving up on this name" msgstr "" -#: src/tail.c:1011 +#: src/tail.c:1010 #, c-format msgid "%s has become accessible" msgstr "" -#: src/tail.c:1019 +#: src/tail.c:1018 #, c-format msgid "%s has appeared; following end of new file" msgstr "" -#: src/tail.c:1030 +#: src/tail.c:1029 #, c-format msgid "%s has been replaced; following end of new file" msgstr "" -#: src/tail.c:1131 +#: src/tail.c:1130 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "" @@ -8759,32 +9053,37 @@ msgstr "" msgid "extra argument %s" msgstr "" -#: src/timeout.c:124 +#: src/timeout.c:112 +#, c-format +msgid "warning: sigprocmask" +msgstr "" + +#: src/timeout.c:145 #, c-format msgid "warning: timer_settime" msgstr "" -#: src/timeout.c:129 +#: src/timeout.c:150 #, c-format msgid "warning: timer_create" msgstr "" -#: src/timeout.c:204 +#: src/timeout.c:225 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" " or: %s [OPTION]\n" msgstr "" -#: src/timeout.c:208 -msgid "" -"Start COMMAND, and kill it if still running after DURATION.\n" -"\n" -"Mandatory arguments to long options are mandatory for short options too.\n" +#: src/timeout.c:229 +msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "" -#: src/timeout.c:213 +#: src/timeout.c:235 msgid "" +" --preserve-status\n" +" exit with the same status as COMMAND, even when the\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 " @@ -8799,7 +9098,7 @@ msgid "" " See 'kill -l' for a list of signals\n" msgstr "" -#: src/timeout.c:229 +#: src/timeout.c:254 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -8807,25 +9106,30 @@ msgid "" "days.\n" msgstr "" -#: src/timeout.c:234 +#: src/timeout.c:259 msgid "" "\n" -"If the command times out, then exit with status 124. Otherwise, exit\n" -"with the status of COMMAND. If no signal is specified, send the TERM\n" -"signal upon timeout. The TERM signal kills any process that does not\n" -"block or catch that signal. For other processes, it may be necessary to\n" -"use the KILL (9) signal, since this signal cannot be caught. If the\n" -"KILL (9) signal is sent, the exit status is 128+9 rather than 124.\n" +"If the command times out, and --preserve-status is not set, then exit with\n" +"status 124. Otherwise, exit with the status of COMMAND. If no signal\n" +"is specified, send the TERM signal upon timeout. The TERM signal kills\n" +"any process that does not block or catch that signal. It may be necessary\n" +"to use the KILL (9) signal, since this signal cannot be caught, in which\n" +"case the exit status is 128+9 rather than 124.\n" msgstr "" -#: src/timeout.c:419 +#: src/timeout.c:363 +#, c-format +msgid "warning: disabling core dumps failed" +msgstr "" + +#: src/timeout.c:471 #, c-format msgid "error waiting for command" msgstr "" -#: src/timeout.c:441 +#: src/timeout.c:482 #, c-format -msgid "warning: disabling core dumps failed" +msgid "the monitored command dumped core" msgstr "" #. This is a proper name. See the gettext manual, section Names. @@ -8838,22 +9142,22 @@ msgstr "" msgid "Randy Smith" msgstr "" -#: src/touch.c:115 src/touch.c:313 +#: src/touch.c:115 src/touch.c:309 #, c-format msgid "invalid date format %s" msgstr "" -#: src/touch.c:194 +#: src/touch.c:191 #, c-format msgid "cannot touch %s" msgstr "" -#: src/touch.c:200 +#: src/touch.c:197 #, c-format msgid "setting times of %s" msgstr "" -#: src/touch.c:216 +#: src/touch.c:213 msgid "" "Update the access and modification times of each FILE to the current time.\n" "\n" @@ -8862,10 +9166,9 @@ msgid "" "\n" "A FILE argument string of - is handled specially and causes touch to\n" "change the times of the file associated with standard output.\n" -"\n" msgstr "" -#: src/touch.c:229 +#: src/touch.c:225 msgid "" " -a change only the access time\n" " -c, --no-create do not create any files\n" @@ -8873,7 +9176,7 @@ msgid "" " -f (ignored)\n" msgstr "" -#: src/touch.c:235 +#: src/touch.c:231 msgid "" " -h, --no-dereference affect each symbolic link instead of any " "referenced\n" @@ -8882,27 +9185,27 @@ msgid "" " -m change only the modification time\n" msgstr "" -#: src/touch.c:241 +#: src/touch.c:237 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" -" --time=WORD change the specified time:\n" +" --time=WORD change the specified time:\n" " WORD is access, atime, or use: equivalent to -a\n" " WORD is modify or mtime: equivalent to -m\n" msgstr "" -#: src/touch.c:250 +#: src/touch.c:246 msgid "" "\n" "Note that the -d and -t options accept different time-date formats.\n" msgstr "" -#: src/touch.c:339 +#: src/touch.c:335 #, c-format msgid "cannot specify times from more than one source" msgstr "" -#: src/touch.c:413 +#: src/touch.c:409 #, c-format msgid "" "warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'" @@ -9120,25 +9423,24 @@ msgid "" "If a FILE is larger than the specified size, the extra data is lost.\n" "If a FILE is shorter, it is extended and the extended part (hole)\n" "reads as zero bytes.\n" -"\n" msgstr "" -#: src/truncate.c:110 +#: src/truncate.c:109 msgid " -c, --no-create do not create any files\n" msgstr "" -#: src/truncate.c:113 +#: src/truncate.c:112 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" -#: src/truncate.c:116 +#: 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" msgstr "" -#: src/truncate.c:122 +#: src/truncate.c:121 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -9146,57 +9448,57 @@ msgid "" "'/' round down to multiple of, '%' round up to multiple of.\n" msgstr "" -#: src/truncate.c:150 +#: src/truncate.c:149 #, c-format msgid "overflow in %<PRIdMAX> * %<PRIdMAX> byte blocks for file %s" msgstr "" -#: src/truncate.c:174 +#: src/truncate.c:173 #, c-format msgid "%s has unusable, apparently negative size" msgstr "" -#: src/truncate.c:184 src/truncate.c:379 +#: src/truncate.c:183 src/truncate.c:384 #, c-format msgid "cannot get the size of %s" msgstr "" -#: src/truncate.c:206 +#: src/truncate.c:205 #, c-format msgid "overflow rounding up size of file %s" msgstr "" -#: src/truncate.c:216 +#: src/truncate.c:215 #, c-format msgid "overflow extending size of file %s" msgstr "" -#: src/truncate.c:231 +#: src/truncate.c:230 #, c-format msgid "failed to truncate %s at %<PRIdMAX> bytes" msgstr "" -#: src/truncate.c:305 +#: src/truncate.c:303 #, c-format msgid "multiple relative modifiers specified" msgstr "" -#: src/truncate.c:335 +#: src/truncate.c:333 #, c-format msgid "you must specify either %s or %s" msgstr "" -#: src/truncate.c:342 +#: src/truncate.c:340 #, c-format msgid "you must specify a relative %s with %s" msgstr "" -#: src/truncate.c:349 +#: src/truncate.c:347 #, c-format msgid "%s was specified but %s was not" msgstr "" -#: src/truncate.c:400 +#: src/truncate.c:404 #, c-format msgid "cannot open %s for writing" msgstr "" @@ -9271,10 +9573,9 @@ msgstr "" msgid "" "Convert blanks in each FILE to tabs, writing to standard output.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" -#: src/unexpand.c:125 +#: src/unexpand.c:124 msgid "" " -a, --all convert all blanks, instead of just initial blanks\n" " --first-only convert only leading sequences of blanks (overrides -a)\n" @@ -9282,12 +9583,12 @@ msgid "" " -t, --tabs=LIST use comma separated LIST of tab positions (enables -a)\n" msgstr "" -#: src/unexpand.c:153 +#: src/unexpand.c:152 #, c-format msgid "tabs are too far apart" msgstr "" -#: src/unexpand.c:505 +#: src/unexpand.c:504 #, c-format msgid "tab stop value is too large" msgstr "" @@ -9303,16 +9604,15 @@ msgid "" "writing to OUTPUT (or standard output).\n" "\n" "With no options, matching lines are merged to the first occurrence.\n" -"\n" msgstr "" -#: src/uniq.c:148 +#: src/uniq.c:147 msgid "" " -c, --count prefix lines by the number of occurrences\n" " -d, --repeated only print duplicate lines\n" msgstr "" -#: src/uniq.c:152 +#: src/uniq.c:151 msgid "" " -D, --all-repeated[=delimit-method] print all duplicate lines\n" " delimit-method={none(default),prepend,separate}\n" @@ -9324,18 +9624,18 @@ msgid "" " -z, --zero-terminated end lines with 0 byte, not newline\n" msgstr "" -#: src/uniq.c:162 +#: src/uniq.c:161 msgid " -w, --check-chars=N compare no more than N characters in lines\n" msgstr "" -#: src/uniq.c:167 +#: src/uniq.c:166 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:172 +#: src/uniq.c:171 msgid "" "\n" "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n" @@ -9343,24 +9643,24 @@ msgid "" "Also, comparisons honor the rules specified by 'LC_COLLATE'.\n" msgstr "" -#: src/uniq.c:359 +#: src/uniq.c:358 #, c-format msgid "too many repeated lines" msgstr "" -#: src/uniq.c:522 +#: src/uniq.c:521 msgid "invalid number of fields to skip" msgstr "" -#: src/uniq.c:531 +#: src/uniq.c:530 msgid "invalid number of bytes to skip" msgstr "" -#: src/uniq.c:540 +#: src/uniq.c:539 msgid "invalid number of bytes to compare" msgstr "" -#: src/uniq.c:559 +#: src/uniq.c:558 #, c-format msgid "printing all duplicated lines and repeat counts is meaningless" msgstr "" @@ -9410,6 +9710,11 @@ msgid_plural "up %ld days %2d:%02d, " msgstr[0] "" msgstr[1] "" +#: src/uptime.c:149 +#, c-format +msgid "up %2d:%02d, " +msgstr "" + #: src/uptime.c:151 #, c-format msgid "%lu user" @@ -9483,83 +9788,83 @@ msgstr "" msgid " old " msgstr "" -#: src/who.c:449 +#: src/who.c:440 msgid "system boot" msgstr "" -#: src/who.c:456 src/who.c:458 +#: src/who.c:447 src/who.c:449 msgid "id=" msgstr "" -#: src/who.c:471 src/who.c:476 +#: src/who.c:462 src/who.c:467 msgid "term=" msgstr "" -#: src/who.c:473 src/who.c:477 +#: src/who.c:464 src/who.c:468 msgid "exit=" msgstr "" -#: src/who.c:494 +#: src/who.c:485 msgid "LOGIN" msgstr "" -#: src/who.c:514 +#: src/who.c:505 msgid "clock change" msgstr "" -#: src/who.c:526 src/who.c:527 +#: src/who.c:517 src/who.c:518 msgid "run-level" msgstr "" -#: src/who.c:530 src/who.c:531 +#: src/who.c:521 src/who.c:522 msgid "last=" msgstr "" -#: src/who.c:562 +#: src/who.c:553 #, c-format msgid "" "\n" "# users=%lu\n" msgstr "" -#: src/who.c:568 +#: src/who.c:559 msgid "NAME" msgstr "" -#: src/who.c:568 +#: src/who.c:559 msgid "LINE" msgstr "" -#: src/who.c:568 +#: src/who.c:559 msgid "TIME" msgstr "" -#: src/who.c:568 +#: src/who.c:559 msgid "IDLE" msgstr "" -#: src/who.c:569 +#: src/who.c:560 msgid "PID" msgstr "" -#: src/who.c:569 +#: src/who.c:560 msgid "COMMENT" msgstr "" -#: src/who.c:569 +#: src/who.c:560 msgid "EXIT" msgstr "" -#: src/who.c:649 +#: src/who.c:640 #, c-format msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n" msgstr "" -#: src/who.c:650 +#: src/who.c:641 msgid "Print information about users who are currently logged in.\n" msgstr "" -#: src/who.c:653 +#: src/who.c:644 msgid "" "\n" " -a, --all same as -b -d --login -p -r -t -T -u\n" @@ -9568,18 +9873,18 @@ msgid "" " -H, --heading print line of column headings\n" msgstr "" -#: src/who.c:660 +#: src/who.c:651 msgid " -l, --login print system login processes\n" msgstr "" -#: src/who.c:663 +#: src/who.c:654 msgid "" " --lookup attempt to canonicalize hostnames via DNS\n" " -m only hostname and user associated with stdin\n" " -p, --process print active processes spawned by init\n" msgstr "" -#: src/who.c:668 +#: src/who.c:659 msgid "" " -q, --count all login names and number of users logged on\n" " -r, --runlevel print current runlevel\n" @@ -9587,7 +9892,7 @@ msgid "" " -t, --time print last system clock change\n" msgstr "" -#: src/who.c:674 +#: src/who.c:665 msgid "" " -T, -w, --mesg add user's message status as +, - or ?\n" " -u, --users list users logged in\n" @@ -9595,7 +9900,7 @@ msgid "" " --writable same as -T\n" msgstr "" -#: src/who.c:682 +#: src/who.c:673 #, c-format msgid "" "\n" diff --git a/po/cs.gmo b/po/cs.gmo index b8f4cbcf..37d113e4 100644 Binary files a/po/cs.gmo and b/po/cs.gmo differ diff --git a/po/cs.po b/po/cs.po index e9877cb7..716b4a32 100644 --- a/po/cs.po +++ b/po/cs.po @@ -3,13 +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. # msgid "" msgstr "" -"Project-Id-Version: coreutils 8.16\n" +"Project-Id-Version: coreutils 8.20-pre3\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2012-05-10 19:35+0200\n" -"PO-Revision-Date: 2012-03-26 22:06+0200\n" +"POT-Creation-Date: 2013-02-14 15:56+0000\n" +"PO-Revision-Date: 2013-02-12 21:40+0100\n" "Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n" "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n" "Language: cs\n" @@ -36,19 +37,19 @@ msgstr "Platné argumenty jsou:" msgid "error closing file" msgstr "chyba při zavírání souboru" -#: lib/closeout.c:112 src/base64.c:109 src/base64.c:121 src/base64.c:127 -#: src/base64.c:168 src/base64.c:224 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:330 src/expand.c:355 src/head.c:298 -#: src/head.c:348 src/head.c:756 src/head.c:797 src/mktemp.c:350 src/od.c:919 -#: src/paste.c:160 src/shuf.c:369 src/split.c:727 src/split.c:964 -#: src/split.c:969 src/tail.c:350 src/tail.c:1201 src/tail.c:1307 +#: 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 -#: src/unexpand.c:427 src/unexpand.c:443 +#: 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:1160 src/copy.c:2602 +#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617 #, c-format msgid "preserving permissions for %s" msgstr "zachování práv pro %s" @@ -240,18 +241,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:483 +#: lib/mkdir-p.c:196 src/install.c:484 #, c-format msgid "cannot change permissions of %s" msgstr "práva %s nelze změnit" -#: lib/mkdir-p.c:206 src/copy.c:2261 src/install.c:709 src/install.c:722 +#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722 #, 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:915 src/tac.c:435 +#: src/split.c:929 src/tac.c:434 #, c-format msgid "memory exhausted" msgstr "paměť vyčerpána" @@ -300,75 +301,75 @@ msgstr "“" msgid "%s: end of file" msgstr "%s: konec souboru" -#: lib/regcomp.c:130 +#: lib/regcomp.c:131 msgid "Success" msgstr "Úspěch" -#: lib/regcomp.c:133 +#: lib/regcomp.c:134 msgid "No match" msgstr "Žádná shoda" -#: lib/regcomp.c:136 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "Neplatný regulární výraz" -#: lib/regcomp.c:139 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "Znak nevhodné třídy" -#: lib/regcomp.c:142 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "Chybný název znakové třídy" -#: lib/regcomp.c:145 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "Přebytečné zpětné lomítko" -#: lib/regcomp.c:148 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "Chybný zpětný odkaz" -#: lib/regcomp.c:151 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "Nepárová [ nebo [^" -#: lib/regcomp.c:154 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "Nepárová ( nebo \\(" -#: lib/regcomp.c:157 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "Nepárová \\{" -#: lib/regcomp.c:160 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "Chybný obsah mezi \\{ a \\}" -#: lib/regcomp.c:163 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "Chybný konec rozsahu" -#: lib/regcomp.c:166 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Paměť vyčerpána" -#: lib/regcomp.c:169 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "Předcházející regulární výraz je chybný" -#: lib/regcomp.c:172 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "Nenadálý konec regulárního výrazu" -#: lib/regcomp.c:175 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "Regulární výraz je příliš dlouhý" -#: lib/regcomp.c:178 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "Nepárová ) nebo \\)" -#: lib/regcomp.c:703 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "Chybí předcházející regulární výraz" @@ -407,7 +408,7 @@ msgstr "^[aAyY]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-mode-acl.c:695 src/copy.c:2284 src/cp.c:518 +#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516 #, c-format msgid "setting permissions for %s" msgstr "nastavení práv pro %s" @@ -549,13 +550,13 @@ msgstr "Výpadek napájení (SIGPWR)" msgid "Resource lost" msgstr "Prostředek byl ztracen (SIGLOST)" -#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262 -#: lib/spawn-pipe.c:265 +#: 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:232 lib/spawn-pipe.c:346 lib/wait-process.c:282 +#: 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" @@ -571,24 +572,24 @@ msgstr "Signál reálného času %d" msgid "Unknown signal %d" msgstr "Neznámý signál %d" -#: lib/unicodeio.c:103 +#: lib/unicodeio.c:102 msgid "iconv function not usable" msgstr "funkce iconv je nepoužitelná" -#: lib/unicodeio.c:105 +#: lib/unicodeio.c:104 msgid "iconv function not available" msgstr "funkce iconv není dostupná" -#: lib/unicodeio.c:112 +#: lib/unicodeio.c:111 msgid "character out of range" msgstr "znak je mimo rozsah" -#: lib/unicodeio.c:182 +#: lib/unicodeio.c:181 #, c-format msgid "cannot convert U+%04X to local character set" msgstr "znak U+%04X nelze převést do místní znakové sady" -#: lib/unicodeio.c:184 +#: lib/unicodeio.c:183 #, c-format msgid "cannot convert U+%04X to local character set: %s" msgstr "znak U+%04X nelze převést do místní znakové sady: %s" @@ -772,7 +773,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:562 +#: lib/version-etc.c:251 src/system.h:573 #, c-format msgid "%s home page: <%s>\n" msgstr "Domovská stránka %s: <%s>\n" @@ -782,7 +783,7 @@ 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:563 +#: lib/version-etc.c:256 src/system.h:574 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" @@ -873,14 +874,12 @@ msgstr "Simon Josefsson" msgid "" "Usage: %s [OPTION]... [FILE]\n" "Base64 encode or decode FILE, or standard input, to standard output.\n" -"\n" msgstr "" -"Použití: %s [VOLBA]… [SOUBOR]\n" +"Použití: %s [PŘEPÍNAČ]… [SOUBOR]\n" "Zakóduje do base64 nebo dekóduje z base64 SOUBOR nebo standardní vstup na\n" "standardní výstup.\n" -"\n" -#: src/base64.c:64 +#: src/base64.c:67 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -896,7 +895,7 @@ msgstr "" " Zalamování lze zakázat hodnotou 0\n" "\n" -#: src/base64.c:73 src/cat.c:110 src/fmt.c:293 src/shuf.c:71 src/sum.c:70 +#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -904,7 +903,7 @@ msgstr "" "\n" "Není-li uveden SOUBOR nebo když je SOUBOR „-“, čte ze standardního vstupu.\n" -#: src/base64.c:76 +#: src/base64.c:79 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -918,37 +917,37 @@ 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:171 src/base64.c:208 src/csplit.c:263 src/csplit.c:1435 -#: src/join.c:451 src/shuf.c:157 src/shuf.c:361 src/tac-pipe.c:74 +#: 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 #, c-format msgid "read error" msgstr "chyba při čtení" -#: src/base64.c:227 +#: src/base64.c:230 #, c-format msgid "invalid input" msgstr "neplatný vstup" -#: src/base64.c:264 +#: src/base64.c:267 #, c-format msgid "invalid wrap size: %s" msgstr "neplatná délka zalomení: %s" -#: src/base64.c:283 src/basename.c:173 src/comm.c:435 src/cp.c:607 -#: src/date.c:441 src/dircolors.c:447 src/du.c:894 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:169 src/install.c:929 src/join.c:961 -#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:157 src/mv.c:447 -#: src/od.c:1802 src/ptx.c:2081 src/readlink.c:154 src/seq.c:408 -#: src/shuf.c:320 src/shuf.c:339 src/sort.c:4477 src/split.c:1313 -#: src/tr.c:1797 src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:454 -#: src/uniq.c:471 src/unlink.c:81 src/uptime.c:250 src/users.c:146 -#: src/wc.c:666 src/who.c:836 src/whoami.c:79 +#: 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 #, c-format msgid "extra operand %s" msgstr "nadbytečný operand %s" -#: src/base64.c:315 src/cat.c:781 +#: src/base64.c:318 src/cat.c:781 #, c-format msgid "closing standard input" msgstr "zavírám standardní vstup" @@ -956,15 +955,15 @@ 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/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:53 src/env.c:33 +#: 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/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:65 src/su.c:88 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 +#: 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 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -981,12 +980,10 @@ msgstr "" msgid "" "Print NAME with any leading directory components removed.\n" "If specified, also remove a trailing SUFFIX.\n" -"\n" msgstr "" "Vypíše NÁZEV bez úvodních adresářů. Pokud je zadáno, odstraní také PŘÍPONU.\n" -"\n" -#: src/basename.c:59 +#: 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" @@ -997,7 +994,7 @@ msgstr "" " -z, --zero odděluje výstup pomocí znaku NUL namísto novým " "řádkem\n" -#: src/basename.c:66 +#: src/basename.c:67 #, c-format msgid "" "\n" @@ -1014,20 +1011,21 @@ 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:167 src/chcon.c:531 src/chgrp.c:277 src/chmod.c:526 -#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1369 +#: 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:183 src/mkfifo.c:108 src/mknod.c:146 src/nohup.c:111 -#: src/pathchk.c:148 src/printf.c:674 src/readlink.c:146 src/realpath.c:236 -#: src/rm.c:314 src/rmdir.c:223 src/seq.c:402 src/setuidgid.c:137 -#: src/sleep.c:119 src/stat.c:1476 src/stdbuf.c:346 src/tr.c:1782 +#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 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 #, 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:52 src/split.c:49 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/split.c:49 msgid "Torbjorn Granlund" msgstr "Torbjörn Granlund" @@ -1037,8 +1035,8 @@ msgstr "Torbjörn Granlund" msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:846 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4720 src/nl.c:182 src/paste.c:435 src/pr.c:2768 src/sum.c:58 +#: 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/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 +1094,7 @@ msgstr "" msgid "cannot do ioctl on %s" msgstr "ioctl na „%s“ není možné vykonat" -#: src/cat.c:637 src/dd.c:2209 src/sort.c:379 src/tee.c:165 src/yes.c:86 +#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86 #, c-format msgid "standard output" msgstr "standardní výstup" @@ -1113,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:55 src/head.c:46 src/hostid.c:33 +#: 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 msgid "Jim Meyering" msgstr "Jim Meyering" -#: src/chcon.c:100 src/runcon.c:203 src/runcon.c:234 +#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238 #, c-format msgid "failed to create security context: %s" msgstr "chyba při výrobě bezpečnostního kontextu: %s" @@ -1130,8 +1128,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:540 src/copy.c:2222 src/runcon.c:217 -#: src/stat.c:683 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221 +#: src/stat.c:702 #, c-format msgid "failed to get security context of %s" msgstr "získat bezpečnostní kontext %s se nezdařilo" @@ -1147,12 +1145,12 @@ 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:446 src/ls.c:2981 +#: src/du.c:457 src/ls.c:2981 #, 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:426 +#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437 #, c-format msgid "cannot read directory %s" msgstr "adresář %s nelze číst" @@ -1162,13 +1160,13 @@ 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:599 +#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562 #, 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:618 -#: src/remove.c:613 +#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642 +#: src/remove.c:576 #, c-format msgid "fts_close failed" msgstr "fts_close selhalo" @@ -1190,14 +1188,12 @@ msgid "" "Change the security context of each FILE to CONTEXT.\n" "With --reference, change the security context of each FILE to that of " "RFILE.\n" -"\n" msgstr "" "Změní 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" -"\n" -#: src/chcon.c:362 src/chgrp.c:123 src/chown.c:94 +#: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94 msgid "" " --dereference affect the referent of each symbolic link (this is\n" " the default), rather than the symbolic link itself\n" @@ -1209,7 +1205,7 @@ msgstr "" " -h, --no-dereference působí na symbolický odkaz místo na odkazovaný " "soubor\n" -#: src/chcon.c:367 +#: src/chcon.c:369 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" @@ -1223,7 +1219,16 @@ msgstr "" " -l, --range=ROZSAH nastaví rozsah ROZSAH v cílovém bezpečnostním " "kontextu\n" -#: src/chcon.c:373 +#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 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\n" +" s „/“ se nezachází zvláštně (výchozí chování)\n" +" --preserve-root odmítne rekurzivní zpracování nad „/“\n" + +#: src/chcon.c:379 msgid "" " --reference=RFILE use RFILE's security context rather than " "specifying\n" @@ -1233,15 +1238,15 @@ msgstr "" " místo zadání hodnoty KONTEXT použije bezpečnostní\n" " kontext souboru RSOUBOR\n" -#: src/chcon.c:377 src/chgrp.c:140 src/chown.c:118 +#: 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 vykoná se rekurzivně i v podadresářích\n" -#: src/chcon.c:380 +#: src/chcon.c:386 msgid " -v, --verbose output a diagnostic for every file processed\n" msgstr " -v, --verbose informuje o každém zpracovávaném souboru\n" -#: src/chcon.c:383 src/chgrp.c:143 src/chown.c:121 +#: src/chcon.c:389 src/chgrp.c:143 src/chown.c:121 msgid "" "\n" "The following options modify how a hierarchy is traversed when the -R\n" @@ -1268,36 +1273,36 @@ msgstr "" " -P neprochází žádné symbolické odkazy (výchozí)\n" "\n" -#: src/chcon.c:512 src/chgrp.c:264 src/chown.c:267 +#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267 #, c-format msgid "-R --dereference requires either -H or -L" msgstr "-R --dereference vyžaduje buď -H, a nebo -L" -#: src/chcon.c:518 +#: src/chcon.c:524 #, c-format msgid "-R -h requires -P" msgstr "-R -h vyžaduje -P" -#: src/chcon.c:533 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282 -#: src/comm.c:429 src/csplit.c:1371 src/join.c:1149 src/link.c:79 -#: src/mknod.c:148 src/setuidgid.c:139 src/tr.c:1785 +#: 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 #, c-format msgid "missing operand after %s" msgstr "po %s chybí operand" -#: src/chcon.c:556 src/runcon.c:247 +#: src/chcon.c:562 src/runcon.c:251 #, c-format msgid "invalid context: %s" msgstr "neplatný kontext: %s" -#: src/chcon.c:563 +#: src/chcon.c:569 #, c-format msgid "conflicting security context specifiers given" msgstr "byly zadány odporující si požadavky na bezpečnostní kontext" -#: src/chcon.c:572 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:433 src/cp.c:493 -#: src/mv.c:96 src/pwd.c:273 src/rm.c:324 src/touch.c:351 +#: 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 #, c-format msgid "failed to get attributes of %s" msgstr "selhalo získání vlastností souboru %s" @@ -1344,15 +1349,6 @@ msgstr "" " (užitečné pouze na systémech, které mohou\n" " měnit vlastnictví symbolických odkazů)\n" -#: src/chgrp.c:132 src/chmod.c:387 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\n" -" s „/“ se nezachází zvláštně (výchozí chování)\n" -" --preserve-root odmítne rekurzivní zpracování nad „/“\n" - #: src/chgrp.c:136 msgid "" " --reference=RFILE use RFILE's group rather than specifying a\n" @@ -1616,7 +1612,7 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:97 src/install.c:575 src/setuidgid.c:110 src/setuidgid.c:120 +#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120 #, c-format msgid "invalid group %s" msgstr "neplatná skupina %s" @@ -1686,8 +1682,8 @@ msgstr "selhalo nastavení ID skupiny" msgid "failed to set user-ID" msgstr "selhalo nastavení ID uživatele" -#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:213 src/stdbuf.c:366 -#: src/timeout.c:402 +#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365 +#: src/timeout.c:454 #, c-format msgid "failed to run command %s" msgstr "spuštění příkazu %s selhalo" @@ -1807,20 +1803,24 @@ msgstr "zadáno více oddělovačů" msgid "empty %s not allowed" msgstr "prázdný %s nedovolen" -#: src/copy.c:168 src/dd.c:1609 src/dd.c:1976 +#: 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 #, c-format -msgid "reading %s" -msgstr "čtení %s" +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:426 +#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425 #, c-format msgid "cannot lseek %s" msgstr "nelze nastavit pozici pro %s" -#: src/copy.c:206 src/dd.c:2039 src/dd.c:2102 +#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151 #, c-format -msgid "writing %s" -msgstr "zápis %s" +msgid "error writing %s" +msgstr "chyba při zápisu %s" #: src/copy.c:313 #, c-format @@ -1842,7 +1842,7 @@ msgstr "rozšíření %s selhalo" msgid "clearing permissions for %s" msgstr "odebírám práva k %s" -#: src/copy.c:697 src/copy.c:2470 src/cp.c:331 +#: src/copy.c:697 src/copy.c:2480 src/cp.c:329 #, c-format msgid "failed to preserve ownership for %s" msgstr "selhalo zachování vlastnictví souboru %s" @@ -1857,14 +1857,14 @@ msgstr "selhalo vyhledání souboru %s" msgid "failed to preserve authorship for %s" msgstr "selhalo zachování autorství souboru %s" -#: src/copy.c:804 src/csplit.c:638 src/du.c:901 src/fmt.c:449 src/head.c:847 -#: src/sort.c:4489 src/split.c:1329 src/tail.c:1756 src/wc.c:678 +#: 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 "%s nelze otevřít pro čtení" -#: src/copy.c:810 src/copy.c:972 src/dd.c:1546 src/dd.c:2114 src/dd.c:2252 -#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:141 +#: 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 #, c-format msgid "cannot fstat %s" msgstr "nelze získat informace o souboru %s z deskriptoru" @@ -1884,14 +1884,14 @@ msgstr "získat kontext pro vytváření na souborovém systému se nezdařilo" 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:1574 src/copy.c:1777 src/copy.c:1935 src/ln.c:314 -#: src/remove.c:267 src/remove.c:293 src/remove.c:444 src/remove.c:465 +#: 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 #, c-format msgid "cannot remove %s" msgstr "nelze odstranit %s" -#: src/copy.c:886 src/copy.c:1578 src/copy.c:1772 src/copy.c:1940 -#: src/remove.c:418 +#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945 +#: src/remove.c:375 #, c-format msgid "removed %s\n" msgstr "smazáno %s\n" @@ -1911,186 +1911,186 @@ msgstr "nelze vytvořit obyčejný soubor %s" msgid "failed to clone %s from %s" msgstr "klonování %s z %s selhalo" -#: src/copy.c:1098 src/copy.c:2531 +#: src/copy.c:1098 src/copy.c:2541 #, c-format msgid "preserving times for %s" msgstr "zachování časů souboru %s" -#: src/copy.c:1170 src/copy.c:1176 src/head.c:855 src/touch.c:175 -#: src/truncate.c:413 +#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172 +#: src/truncate.c:417 #, c-format -msgid "closing %s" -msgstr "uzavírání %s" +msgid "failed to close %s" +msgstr "zavření %s selhalo" -#: src/copy.c:1466 +#: src/copy.c:1471 #, 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)? " -#: src/copy.c:1473 +#: src/copy.c:1478 #, c-format msgid "%s: overwrite %s? " msgstr "%s: přepsat %s? " -#: src/copy.c:1542 +#: src/copy.c:1547 #, c-format msgid " (backup: %s)" msgstr " (záloha: %s)" -#: src/copy.c:1552 +#: src/copy.c:1557 #, 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:1584 +#: src/copy.c:1589 #, c-format msgid "cannot create hard link %s to %s" msgstr "nelze vytvořit pevný odkaz %s na %s" -#: src/copy.c:1637 src/copy.c:1689 src/copy.c:2272 src/copy.c:2589 +#: 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:1220 src/truncate.c:365 +#: src/stat.c:1239 src/truncate.c:363 #, c-format msgid "cannot stat %s" msgstr "nelze získat informace o %s" -#: src/copy.c:1645 +#: src/copy.c:1650 #, c-format msgid "omitting directory %s" msgstr "vynechávám adresář %s" -#: src/copy.c:1659 +#: src/copy.c:1664 #, 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:1707 src/ln.c:246 +#: src/copy.c:1712 src/ln.c:246 #, c-format msgid "%s and %s are the same file" msgstr "%s a %s jsou jeden a tentýž soubor" -#: src/copy.c:1806 +#: src/copy.c:1811 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "ne-adresář %s nelze přepsat adresářem %s" -#: src/copy.c:1824 src/ln.c:214 +#: src/copy.c:1829 src/ln.c:214 #, 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:1842 +#: src/copy.c:1847 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "adresář %s nelze přepsat ne-adresářem" -#: src/copy.c:1856 +#: src/copy.c:1861 #, 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:1886 +#: src/copy.c:1891 #, 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:1887 +#: src/copy.c:1892 #, 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:1910 src/ln.c:276 +#: src/copy.c:1915 src/ln.c:276 #, c-format msgid "cannot backup %s" msgstr "nelze vytvořit zálohu %s" -#: src/copy.c:1974 +#: src/copy.c:1979 #, 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:2051 +#: src/copy.c:2056 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "nelze kopírovat adresář %s na sebe %s" -#: src/copy.c:2068 +#: src/copy.c:2073 #, 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:2118 +#: src/copy.c:2123 #, 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:2161 +#: src/copy.c:2166 #, c-format msgid "cannot move %s to %s" msgstr "nelze přesunout %s do %s" -#: src/copy.c:2173 +#: src/copy.c:2178 #, 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:2207 src/install.c:905 src/mkdir.c:189 src/mkfifo.c:114 -#: src/mknod.c:167 +#: 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:2241 +#: src/copy.c:2246 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "%s: zacyklené symbolické odkazy nelze kopírovat" -#: src/copy.c:2350 +#: src/copy.c:2355 #, 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:2357 +#: src/copy.c:2362 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "nelze vytvořit symbolický odkaz %s na %s" -#: src/copy.c:2406 src/mkfifo.c:133 +#: src/copy.c:2416 src/mkfifo.c:132 #, c-format msgid "cannot create fifo %s" msgstr "nelze vytvořit rouru %s" -#: src/copy.c:2415 +#: src/copy.c:2425 #, c-format msgid "cannot create special file %s" msgstr "nelze vytvořit zvláštní soubor %s" -#: src/copy.c:2426 src/ls.c:3191 src/stat.c:902 +#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921 #, c-format msgid "cannot read symbolic link %s" msgstr "symbolický odkaz %s nelze přečíst" -#: src/copy.c:2453 +#: src/copy.c:2463 #, c-format msgid "cannot create symbolic link %s" msgstr "nelze vytvořit symbolický odkaz %s" -#: src/copy.c:2485 +#: src/copy.c:2495 #, c-format msgid "%s has unknown file type" msgstr "%s: neznámý typ souboru" -#: src/copy.c:2629 src/ln.c:358 +#: src/copy.c:2644 src/ln.c:358 #, c-format msgid "cannot un-backup %s" msgstr "%s: nelze obnovit ze zálohy" -#: src/copy.c:2633 +#: src/copy.c:2648 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s → %s (obnoven ze zálohy)\n" -#: src/cp.c:156 src/mv.c:284 +#: src/cp.c:156 src/mv.c:286 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -2102,27 +2102,10 @@ msgstr "" " nebo: %s [PŘEPÍNAČ]… -t ADRESÁŘ ZDROJ…\n" #: src/cp.c:162 -msgid "" -"Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" -"\n" -msgstr "" -"Kopíruje ZDROJ do CÍLE nebo více ZDROJŮ do ADRESÁŘE.\n" -"\n" - -#: src/cp.c:166 src/csplit.c:1458 src/cut.c:197 src/df.c:852 src/du.c:268 -#: src/expand.c:112 src/fmt.c:275 src/fold.c:75 src/head.c:115 -#: src/install.c:612 src/kill.c:86 src/ln.c:392 src/ls.c:4726 src/mkdir.c:61 -#: src/mkfifo.c:56 src/mknod.c:58 src/mv.c:294 src/nl.c:191 src/paste.c:445 -#: src/pr.c:2777 src/ptx.c:1825 src/shred.c:153 src/shuf.c:58 src/sort.c:399 -#: src/split.c:211 src/stdbuf.c:95 src/tac.c:142 src/tail.c:268 -#: src/touch.c:226 src/truncate.c:107 src/unexpand.c:122 src/uniq.c:145 -msgid "" -"Mandatory arguments to long options are mandatory for short options too.\n" -msgstr "" -"Povinné argumenty dlouhých přepínačů jsou také povinné u odpovídajících\n" -"krátkých přepínačů.\n" +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:169 +#: src/cp.c:168 msgid "" " -a, --archive same as -dR --preserve=all\n" " --attributes-only don't copy the file data, just the " @@ -2145,27 +2128,29 @@ msgstr "" " -d, stejné jako --no-dereference --" "preserve=links\n" -#: src/cp.c:178 +#: src/cp.c:177 msgid "" " -f, --force if an existing destination file cannot be\n" -" opened, remove it and try again (redundant " -"if\n" -" the -n option is used)\n" +" opened, remove it and try again (this " +"option\n" +" is ignored when the -n option is also " +"used)\n" " -i, --interactive prompt before overwrite (overrides a previous " "-n\n" " option)\n" " -H follow command-line symbolic links in SOURCE\n" msgstr "" -" -f, --force pokud cílový soubor existuje a nelze jej\n" +" -f, --force pokud cílový soubor existuje ale nelze jej\n" " otevřít, smaže jej a zkusí to znovu\n" -" (nadbytečné, je-li použit přepínač -n)\n" +" (ignorováno, je-li rovněž použit přepínač -" +"n)\n" " -i, --interactive ptá se před přepsáním (přebije předcházející\n" " přepínač -n)\n" " -H následuje symbolické odkazy z příkazové " "řádky\n" " ve ZDROJI\n" -#: src/cp.c:188 +#: src/cp.c:186 msgid "" " -l, --link hard link files instead of copying\n" " -L, --dereference always follow symbolic links in SOURCE\n" @@ -2173,7 +2158,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:192 +#: src/cp.c:190 msgid "" " -n, --no-clobber do not overwrite an existing file (overrides\n" " a previous -i option)\n" @@ -2184,7 +2169,7 @@ msgstr "" " -P, --no-dereference nikdy nenásleduje symbolické odkazy ve " "ZDROJI\n" -#: src/cp.c:197 +#: src/cp.c:195 msgid "" " -p same as --preserve=mode,ownership,timestamps\n" " --preserve[=ATTR_LIST] preserve the specified attributes (default:\n" @@ -2203,7 +2188,7 @@ msgstr "" " context [kontext], links [odkazy], xattr\n" " [rozšířené atributy], all [vše]\n" -#: src/cp.c:205 +#: src/cp.c:203 msgid "" " --no-preserve=ATTR_LIST don't preserve the specified attributes\n" " --parents use full source file name under DIRECTORY\n" @@ -2212,7 +2197,7 @@ msgstr "" " nezachovává určené atributy\n" " --parents přidává zdrojovou cestu do cílového ADRESÁŘE\n" -#: src/cp.c:209 +#: src/cp.c:207 msgid "" " -R, -r, --recursive copy directories recursively\n" " --reflink[=WHEN] control clone/CoW copies. See below\n" @@ -2226,7 +2211,7 @@ msgstr "" "jej\n" " pokusí otevřít (opak --force)\n" -#: src/cp.c:215 +#: src/cp.c:213 msgid "" " --sparse=WHEN control creation of sparse files. See below\n" " --strip-trailing-slashes remove any trailing slashes from each " @@ -2237,7 +2222,7 @@ msgstr "" " --strip-trailing-slashes odstraňuje lomítka na konci názvů všech " "ZDROJŮ\n" -#: src/cp.c:220 +#: src/cp.c:218 msgid "" " -s, --symbolic-link make symbolic links instead of copying\n" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -2251,7 +2236,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:226 +#: src/cp.c:224 msgid "" " -u, --update copy only when the SOURCE file is newer\n" " than the destination file or when the\n" @@ -2266,7 +2251,7 @@ msgstr "" "příkazu\n" " -x, --one-file-system zůstane v jednom souborovém systému\n" -#: src/cp.c:235 +#: src/cp.c:233 msgid "" "\n" "By default, sparse SOURCE files are detected by a crude heuristic and the\n" @@ -2295,7 +2280,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:247 src/install.c:649 src/ln.c:421 src/mv.c:321 +#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322 msgid "" "\n" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -2311,7 +2296,7 @@ msgstr "" "prostředí VERSION_CONTROL. Hodnoty mohou být:\n" "\n" -#: src/cp.c:254 src/install.c:656 src/mv.c:328 +#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329 msgid "" " none, off never make backups (even if --backup is given)\n" " numbered, t make numbered backups\n" @@ -2325,7 +2310,7 @@ msgstr "" " jinak jednoduché\n" " simple, never jednoduché záložní kopie\n" -#: src/cp.c:260 +#: src/cp.c:258 msgid "" "\n" "As a special case, cp makes a backup of SOURCE when the force and backup\n" @@ -2338,91 +2323,91 @@ msgstr "" "a CÍL jsou stejného jména jednoho obyčejného souboru. Pak cp kopii ZDROJE\n" "vytvoří.\n" -#: src/cp.c:319 +#: src/cp.c:317 #, c-format msgid "failed to preserve times for %s" msgstr "selhalo zachování časů souboru %s" -#: src/cp.c:350 +#: src/cp.c:348 #, c-format msgid "failed to preserve permissions for %s" msgstr "selhalo zachování práv souboru %s" -#: src/cp.c:477 +#: src/cp.c:475 #, c-format msgid "cannot make directory %s" msgstr "adresář %s nelze vytvořit" -#: src/cp.c:526 src/cp.c:545 +#: src/cp.c:524 src/cp.c:543 #, c-format msgid "%s exists but is not a directory" msgstr "%s existuje, ale není adresářem" -#: src/cp.c:572 src/cp.c:1068 src/install.c:401 src/install.c:844 src/ln.c:123 -#: src/ln.c:181 src/ln.c:202 src/ln.c:516 src/mv.c:152 src/mv.c:399 +#: 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 #, c-format -msgid "accessing %s" -msgstr "přistupuji k %s" +msgid "failed to access %s" +msgstr "k %s nelze přistoupit" -#: src/cp.c:592 src/install.c:914 src/ln.c:546 src/mv.c:432 src/shred.c:1182 -#: src/touch.c:433 src/truncate.c:356 +#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181 +#: src/touch.c:429 src/truncate.c:354 #, c-format msgid "missing file operand" msgstr "chybí název souboru" -#: src/cp.c:594 src/install.c:916 src/ln.c:560 src/mv.c:434 +#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436 #, c-format msgid "missing destination file operand after %s" msgstr "za %s chybí název cílového souboru" -#: src/cp.c:603 src/install.c:925 src/mv.c:443 +#: src/cp.c:601 src/install.c:926 src/mv.c:445 #, 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:619 src/cp.c:1070 src/install.c:403 src/install.c:846 -#: src/install.c:938 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:401 -#: src/mv.c:457 +#: 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 #, c-format msgid "target %s is not a directory" msgstr "cíl %s není adresářem" -#: src/cp.c:730 +#: src/cp.c:728 #, 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:1063 src/install.c:839 src/ln.c:511 src/mv.c:394 +#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395 #, c-format msgid "multiple target directories specified" msgstr "zadáno více cílových adresářů" -#: src/cp.c:1108 +#: src/cp.c:1110 #, c-format msgid "cannot make both hard and symbolic links" msgstr "symbolický a pevný odkaz nelze vytvořit zároveň" -#: src/cp.c:1115 src/mv.c:464 +#: src/cp.c:1117 src/mv.c:466 #, 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:1121 +#: src/cp.c:1123 #, c-format msgid "--reflink can be used only with --sparse=auto" msgstr "--reflink lze požít jen s --sparse=auto" -#: src/cp.c:1129 src/install.c:899 src/ln.c:582 src/mv.c:472 +#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474 msgid "backup type" msgstr "typ zálohy" -#: src/cp.c:1154 +#: src/cp.c:1156 #, 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:1160 +#: src/cp.c:1162 #, c-format msgid "cannot preserve extended attributes, cp is built without xattr support" msgstr "" @@ -2434,137 +2419,135 @@ msgstr "" msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:529 +#: src/csplit.c:531 #, c-format msgid "input disappeared" msgstr "vstup se ztratil" -#: src/csplit.c:658 src/csplit.c:669 +#: src/csplit.c:660 src/csplit.c:671 #, c-format msgid "%s: line number out of range" msgstr "%s: číslo řádku je mimo rozsah" -#: src/csplit.c:698 +#: src/csplit.c:700 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: číslo řádku je mimo rozsah" -#: src/csplit.c:701 src/csplit.c:750 +#: src/csplit.c:703 src/csplit.c:752 #, c-format msgid " on repetition %s\n" msgstr " v %s. opakování\n" -#: src/csplit.c:744 +#: src/csplit.c:746 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: nenalezeno" -#: src/csplit.c:808 src/csplit.c:848 src/nl.c:359 src/tac.c:274 +#: src/csplit.c:810 src/csplit.c:850 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:981 +#: src/csplit.c:983 #, c-format msgid "write error for %s" msgstr "chyba při zápisu do %s" -#: src/csplit.c:1057 +#: src/csplit.c:1059 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: po oddělovači je očekáváno celé číslo" -#: src/csplit.c:1073 +#: src/csplit.c:1075 #, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: „}' je požadována v počítadle opakování" -#: src/csplit.c:1083 +#: src/csplit.c:1085 #, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: mezi „{“ a „}“ musí být celé číslo" -#: src/csplit.c:1110 +#: src/csplit.c:1112 #, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: postrádán koncový oddělovač „%c“" -#: src/csplit.c:1127 +#: src/csplit.c:1129 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: chybný regulární výraz: %s" -#: src/csplit.c:1160 +#: src/csplit.c:1162 #, c-format msgid "%s: invalid pattern" msgstr "%s: chybný vzorek" -#: src/csplit.c:1163 +#: src/csplit.c:1165 #, 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:1169 +#: src/csplit.c:1171 #, 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:1175 +#: src/csplit.c:1177 #, 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:1253 +#: src/csplit.c:1255 #, c-format msgid "missing conversion specifier in suffix" msgstr "v parametru přepínače chybí určení typu konverze" -#: src/csplit.c:1259 +#: src/csplit.c:1261 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "chybně zadaný typ konverze v parametru přepínače: %c" -#: src/csplit.c:1262 +#: src/csplit.c:1264 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "chybně zadaný typ konverze v parametru přepínače: \\%.3o" -#: src/csplit.c:1267 +#: src/csplit.c:1269 #, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "neplatné příznaky v zadání konverze: %%%c%c" -#: src/csplit.c:1284 +#: src/csplit.c:1286 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "příliš mnoho typů konverze %% v parametru přepínače" -#: src/csplit.c:1298 +#: src/csplit.c:1300 #, c-format msgid "missing %% conversion specification in suffix" msgstr "v parametru přepínače chybí zadání typu konverze pomocí %%" -#: src/csplit.c:1345 +#: src/csplit.c:1347 #, c-format msgid "%s: invalid number" msgstr "%s: chybné číslo" -#: src/csplit.c:1449 +#: src/csplit.c:1451 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Použití: %s [PŘEPÍNAČ]… SOUBOR VZOREK…\n" -#: src/csplit.c:1453 +#: src/csplit.c:1455 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" -"\n" msgstr "" -"Rozděluje SOUBOR v místech VZORKU(Ů) do souborů „xx01“, „xx02“, …\n" +"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" -"\n" -#: src/csplit.c:1461 +#: src/csplit.c:1462 #, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2576,7 +2559,7 @@ 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:1466 +#: src/csplit.c:1467 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" @@ -2586,7 +2569,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:1473 +#: src/csplit.c:1474 msgid "" "\n" "Read standard input if FILE is -. Each PATTERN may be:\n" @@ -2594,7 +2577,7 @@ msgstr "" "\n" "Jestliže SOUBOR je „-“, bude čten standardní vstup. Každý VZOREK může být:\n" -#: src/csplit.c:1477 +#: src/csplit.c:1478 msgid "" "\n" " INTEGER copy up to but not including specified line number\n" @@ -2623,7 +2606,7 @@ msgstr "" msgid "David M. Ihnat" msgstr "David M. Ihnat" -#: src/cut.c:64 +#: 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" @@ -2633,14 +2616,10 @@ msgid "Usage: %s OPTION... [FILE]...\n" msgstr "Použití: %s PŘEPÍNAČ… [SOUBOR]…\n" #: src/cut.c:193 -msgid "" -"Print selected parts of lines from each FILE to standard output.\n" -"\n" -msgstr "" -"Vypíše pouze vybrané části řádků z každého SOUBORU na standardní výstup.\n" -"\n" +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:200 +#: src/cut.c:199 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2651,7 +2630,7 @@ msgstr "" " -d, --delimiter=ODDĚLOVAČ jako oddělovač použije ODDĚLOVAČ (místo " "tabulátoru)\n" -#: src/cut.c:205 +#: src/cut.c:204 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2664,7 +2643,7 @@ msgstr "" " není zadáno -s\n" " -n (ignorováno)\n" -#: src/cut.c:211 +#: src/cut.c:210 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" @@ -2672,7 +2651,7 @@ msgstr "" " --complement použije doplněk zadaných bajtů, znaků nebo " "položek\n" -#: src/cut.c:215 +#: src/cut.c:214 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2685,7 +2664,7 @@ msgstr "" "vstupní\n" " oddělovač.\n" -#: src/cut.c:222 +#: src/cut.c:221 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2698,7 +2677,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:228 +#: src/cut.c:227 msgid "" "Each range is one of:\n" "\n" @@ -2718,45 +2697,46 @@ msgstr "" "\n" "Jestliže SOUBOR není zadán, nebo je „-“, bude čten standardní vstup.\n" -#: src/cut.c:368 src/cut.c:489 -msgid "invalid byte or field list" -msgstr "chybný seznam bajtů nebo položek" +#: src/cut.c:367 src/cut.c:493 +msgid "invalid byte, character or field list" +msgstr "chybný seznam bajtů, znaků nebo položek" -#: src/cut.c:385 +#: src/cut.c:387 msgid "invalid range with no endpoint: -" msgstr "neplatný rozsah bez konce: -" -#: src/cut.c:399 +#: src/cut.c:403 msgid "invalid decreasing range" msgstr "neplatný klesající rozsah" -#: src/cut.c:478 +#: src/cut.c:482 #, c-format msgid "byte offset %s is too large" msgstr "posun bajtů %s je příliš velký" -#: src/cut.c:481 +#: src/cut.c:485 #, c-format msgid "field number %s is too large" msgstr "číslo položky %s je příliš velké" -#: src/cut.c:789 src/cut.c:797 +#: src/cut.c:795 src/cut.c:803 msgid "only one type of list may be specified" msgstr "pouze jeden typ seznamu může být zadán" -#: src/cut.c:806 +#: src/cut.c:812 src/numfmt.c:1408 +#, c-format msgid "the delimiter must be a single character" msgstr "oddělovač musí být jediný znak" -#: src/cut.c:841 +#: src/cut.c:847 msgid "you must specify a list of bytes, characters, or fields" msgstr "musíte zadat seznam bajtů, znaků nebo položek" -#: src/cut.c:844 +#: src/cut.c:850 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:848 +#: src/cut.c:854 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2764,11 +2744,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:864 +#: src/cut.c:870 msgid "missing list of fields" msgstr "chybí seznam položek" -#: src/cut.c:866 +#: src/cut.c:872 msgid "missing list of positions" msgstr "chybí seznam pozicí" @@ -2782,9 +2762,11 @@ msgstr "" " nebo: %s [-u|--utc|--universal] [MMDDhhmm[[CC]RR][.ss]]\n" #: src/date.c:128 +msgid "Display the current time in the given FORMAT, or set the system date.\n" +msgstr "Vypíše aktuální čas v daném FORMÁTU, nebo nastaví datum v systému.\n" + +#: src/date.c:134 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" " -I[TIMESPEC], --iso-8601[=TIMESPEC] output date/time in ISO 8601 format.\n" @@ -2792,8 +2774,6 @@ msgid "" " 'hours', 'minutes', 'seconds', or 'ns' for date\n" " and time to the indicated precision.\n" msgstr "" -"Vypíše aktuální čas v daném FORMÁTU, nebo nastaví datum v systému.\n" -"\n" " -d, --date=ŘETĚZEC vypíše čas zadaný jako ŘETĚZEC, nikoli aktuální\n" " -f, --file=DATASOUBOR jako --date, ale časy jsou v DATASOUBORU,\n" " -I[PŘESNOST], --iso-8601[=PŘESNOST]\n" @@ -2804,7 +2784,7 @@ msgstr "" " čas bude vrácen s přesností na hodiny, minuty,\n" " sekundy nebo nanosekundy.\n" -#: src/date.c:138 +#: src/date.c:142 msgid "" " -r, --reference=FILE display the last modification time of FILE\n" " -R, --rfc-2822 output date and time in RFC 2822 format.\n" @@ -2814,7 +2794,7 @@ msgstr "" " -R, --rfc-2822 vypíše datum podle RFC-2822\n" " Příklad: Mon, 07 Aug 2006 12:34:56 -0600\n" -#: src/date.c:143 +#: src/date.c:147 msgid "" " --rfc-3339=TIMESPEC output date and time in RFC 3339 format.\n" " TIMESPEC='date', 'seconds', or 'ns' for\n" @@ -2834,7 +2814,7 @@ msgstr "" " -u, --utc, --universal nastaví nebo vypíše UTC (světový koordinovaný " "čas)\n" -#: src/date.c:154 +#: src/date.c:158 msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" @@ -2848,7 +2828,7 @@ msgstr "" " %% znak %\n" " %a zkrácené jméno dne podle lokalizace (např. Ne)\n" -#: src/date.c:161 +#: src/date.c:165 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2860,7 +2840,7 @@ msgstr "" " %B celé jméno měsíce podle lokalizace (např. leden)\n" " %c datum a čas podle lokalizace (např. Ne 14. leden 2007, 00:49:20 CET)\n" -#: src/date.c:167 +#: src/date.c:171 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2872,7 +2852,7 @@ msgstr "" " %D datum; stejné jako %m/%d/%y\n" " %e den v měsíci zarovnaný mezerami; stejné jako %_d\n" -#: src/date.c:173 +#: src/date.c:177 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -2882,7 +2862,7 @@ msgstr "" " %g poslední dvě číslice roku dle ISO číslování týdnů (vizte %G)\n" " %G rok dle ISO číslování týdnů (vizte %V); obvykle užitečné jen s %V\n" -#: src/date.c:178 +#: src/date.c:182 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2894,7 +2874,7 @@ msgstr "" " %I hodina (01..12)\n" " %j číslo dne v roce (001..366)\n" -#: src/date.c:184 +#: src/date.c:188 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -2906,7 +2886,7 @@ msgstr "" " %m měsíc (01..12)\n" " %M minuta (00..59)\n" -#: src/date.c:190 +#: src/date.c:194 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2926,7 +2906,7 @@ msgstr "" " %R hodiny a minuty v 24h cyklu; stejné jako %H:%M\n" " %s počet sekund od 00:00:00 1. 1. 1970 UTC\n" -#: src/date.c:199 +#: src/date.c:203 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2938,7 +2918,7 @@ msgstr "" " %T čas; stejné jako %H:%M:%S\n" " %u den v týdnu (1..7); 1 znamená pondělí\n" -#: src/date.c:205 +#: src/date.c:209 msgid "" " %U week number of year, with Sunday as first day of week (00..53)\n" " %V ISO week number, with Monday as first day of week (01..53)\n" @@ -2952,7 +2932,7 @@ msgstr "" " %w den v týdnu (0..6); 0 znamená neděli\n" " %W číslo týdne v daném roce, pondělí jako první den v týdnu (00..53)\n" -#: src/date.c:211 +#: src/date.c:215 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -2964,7 +2944,7 @@ msgstr "" " %y poslední dvě číslice letopočtu (00..99)\n" " %Y rok\n" -#: src/date.c:217 +#: src/date.c:221 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -2986,7 +2966,7 @@ msgstr "" "\n" "Implicitně jsou číselné položky data zarovnány nulami.\n" -#: src/date.c:226 +#: src/date.c:230 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -3004,7 +2984,7 @@ msgstr "" " ^ pokud lze, použije velká písmena\n" " # pokud lze, použije písmena opačné velikosti\n" -#: src/date.c:235 +#: src/date.c:239 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -3019,7 +2999,7 @@ msgstr "" "E použije náhradní reprezentaci podle lokalizace, pokud lze; nebo\n" "O použije náhradní číselné symboly podle lokalizace, pokud lze.\n" -#: src/date.c:242 +#: src/date.c:246 msgid "" "\n" "Examples:\n" @@ -3043,35 +3023,35 @@ 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:275 src/dd.c:2193 src/head.c:838 src/md5sum.c:477 -#: src/md5sum.c:798 src/od.c:863 src/od.c:1914 src/pr.c:1176 src/pr.c:1372 -#: src/pr.c:1494 src/stty.c:842 src/tac.c:563 src/tail.c:343 src/tee.c:126 +#: 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 #, c-format msgid "standard input" msgstr "standardní vstup" -#: src/date.c:303 src/date.c:523 +#: src/date.c:307 src/date.c:527 #, c-format msgid "invalid date %s" msgstr "chybné datum: %s" -#: src/date.c:414 src/date.c:448 +#: src/date.c:418 src/date.c:452 #, c-format msgid "multiple output formats specified" msgstr "zadáno více výstupních formátů" -#: src/date.c:426 +#: src/date.c:430 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "přepínače určené k zadání data se vzájemně vylučují" -#: src/date.c:433 +#: src/date.c:437 #, c-format msgid "the options to print and set the time may not be used together" msgstr "přepínače pro výpis a nastavení času nemohou být užity současně" -#: src/date.c:454 +#: src/date.c:458 #, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -3082,23 +3062,23 @@ msgstr "" "když je použit přepínač pro zadání data, kterýkoli argument, který není\n" "přepínačem, musí být formátovací řetězec uvozený „+“." -#: src/date.c:531 +#: src/date.c:535 #, c-format msgid "cannot set date" msgstr "datum nelze nastavit" -#: src/date.c:554 src/du.c:360 +#: src/date.c:558 src/du.c:371 #, c-format msgid "time %s is out of range" msgstr "čas %s je mimo rozsah" #. This is a proper name. See the gettext manual, section Names. -#: src/dd.c:44 src/factor.c:43 src/rm.c:41 src/tail.c:69 src/touch.c:41 +#: 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 "Paul Rubin" -#: src/dd.c:517 +#: src/dd.c:521 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3107,7 +3087,7 @@ msgstr "" "Použití: %s [OPERAND]…\n" " nebo: %s PŘEPÍNAČ\n" -#: src/dd.c:522 +#: src/dd.c:526 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -3126,7 +3106,7 @@ msgstr "" " count=N zkopíruje pouze N vstupních bloků\n" " ibs=BAJTŮ čte BAJTŮ bajtů najednou (implicitně: 512)\n" -#: src/dd.c:531 +#: src/dd.c:535 msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -3135,7 +3115,8 @@ msgid "" " oflag=FLAGS write as per the comma separated symbol list\n" " seek=N skip N obs-sized blocks at start of output\n" " skip=N skip N ibs-sized blocks at start of input\n" -" status=noxfer suppress transfer statistics\n" +" status=WHICH WHICH info to suppress outputting to stderr;\n" +" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" msgstr "" " if=SOUBOR čte ze souboru SOUBOR místo ze stdin\n" " iflag=PŘÍZNAKY způsob čtení. PŘÍZNAKY je seznam čárkou oddělených " @@ -3146,12 +3127,14 @@ msgstr "" "příznaků\n" " seek=N přeskočí prvních N výstupních bloků velikosti „obs“\n" " skip=N přeskočí prvních N vstupních bloků velikosti „ibs“\n" -" status=noxfer nezobrazí statistické informace o přenosu dat\n" +" status=CO CO za údaje se nebude vypisovat na chybový výstup:\n" +" „noxfer“ potlačí statistické informace o přenosu dat,\n" +" „none“ potlačí vše\n" -#: src/dd.c:541 +#: src/dd.c:546 msgid "" "\n" -"BLOCKS and BYTES may be followed by the following multiplicative suffixes:\n" +"N and BYTES may be followed by the following multiplicative suffixes:\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, and so on for T, P, E, Z, Y.\n" "\n" @@ -3159,14 +3142,14 @@ msgid "" "\n" msgstr "" "\n" -"Hodnoty BLOKŮ a BAJTŮ mohou mít následující násobné přípony:\n" +"Hodnoty N a BAJTŮ mohou mít následující násobné přípony:\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 a tak dále pro T, P, E, Z, Y.\n" "\n" "Každá dílčí konverze v seznamu KONVERZÍ může být:\n" "\n" -#: src/dd.c:550 +#: src/dd.c:555 msgid "" " ascii from EBCDIC to ASCII\n" " ebcdic from ASCII to EBCDIC\n" @@ -3196,7 +3179,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:563 +#: src/dd.c:568 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3212,7 +3195,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:571 +#: src/dd.c:576 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3226,76 +3209,76 @@ msgstr "" " append připisuje na konec (má smysl pouze pro výstup;\n" " doporučeno s conv=notrunc)\n" -#: src/dd.c:578 +#: src/dd.c:583 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:580 +#: src/dd.c:585 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:582 +#: src/dd.c:587 msgid " directory fail unless a directory\n" msgstr " directory selže, pokud se nejedná o adresář\n" -#: src/dd.c:584 +#: src/dd.c:589 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:586 +#: src/dd.c:591 msgid " sync likewise, but also for metadata\n" msgstr " sync podobně, ale také pro metadata\n" -#: src/dd.c:587 +#: src/dd.c:592 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:590 +#: src/dd.c:595 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock použije neblokující I/O\n" -#: src/dd.c:592 +#: src/dd.c:597 msgid " noatime do not update access time\n" msgstr " noaime neaktualizuje čas posledního přístupu k souboru\n" -#: src/dd.c:595 +#: src/dd.c:600 msgid " nocache discard cached data\n" msgstr " nocache zahodí nakešovaná data\n" -#: src/dd.c:598 +#: src/dd.c:603 msgid " noctty do not assign controlling terminal from file\n" msgstr " noctty nepovažuje soubor za řídící terminál\n" -#: src/dd.c:601 +#: src/dd.c:606 msgid " nofollow do not follow symlinks\n" msgstr " nofollow nesleduje symbolické odkazy\n" -#: src/dd.c:603 +#: src/dd.c:608 msgid " nolinks fail if multiply-linked\n" msgstr " nolinks selže, pokud na soubor vede více pevných odkazů\n" -#: src/dd.c:605 +#: src/dd.c:610 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:607 +#: src/dd.c:612 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:609 +#: src/dd.c:614 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:612 +#: src/dd.c:617 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:615 +#: src/dd.c:620 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:620 +#: src/dd.c:625 #, c-format msgid "" "\n" @@ -3325,7 +3308,7 @@ msgstr "" "Volby jsou:\n" "\n" -#: src/dd.c:676 +#: src/dd.c:683 #, c-format msgid "" "%<PRIuMAX>+%<PRIuMAX> records in\n" @@ -3334,7 +3317,7 @@ msgstr "" "%<PRIuMAX>+%<PRIuMAX> vstoupivších záznamů\n" "%<PRIuMAX>+%<PRIuMAX> vystoupivších záznamů\n" -#: src/dd.c:682 +#: src/dd.c:689 #, c-format msgid "%<PRIuMAX> truncated record\n" msgid_plural "%<PRIuMAX> truncated records\n" @@ -3342,7 +3325,7 @@ 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" -#: src/dd.c:694 +#: src/dd.c:701 #, c-format msgid "%<PRIuMAX> byte (%s) copied" msgid_plural "%<PRIuMAX> bytes (%s) copied" @@ -3350,7 +3333,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:712 +#: src/dd.c:720 msgid "Infinity B" msgstr "nekonečno B" @@ -3364,83 +3347,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:725 +#: src/dd.c:733 #, c-format msgid ", %g s, %s/s\n" msgstr ", %'g s, %s/s\n" -#: src/dd.c:804 +#: src/dd.c:812 #, c-format msgid "closing input file %s" msgstr "zavírám vstupní soubor %s" -#: src/dd.c:811 +#: src/dd.c:819 #, c-format msgid "closing output file %s" msgstr "zavírám výstupní soubor %s" -#: src/dd.c:1014 +#: src/dd.c:1022 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "vypnutí O_DIRECT selhalo: %s" -#: src/dd.c:1085 src/dd.c:1934 +#: src/dd.c:1093 src/dd.c:1942 #, c-format msgid "writing to %s" msgstr "zapisuji do %s" -#: src/dd.c:1199 src/dd.c:1253 +#: src/dd.c:1207 src/dd.c:1261 #, c-format msgid "unrecognized operand %s" msgstr "neznámý operand %s" -#: src/dd.c:1210 +#: src/dd.c:1218 msgid "invalid conversion" msgstr "neplatná konverze" -#: src/dd.c:1213 src/dd.c:1289 +#: src/dd.c:1221 src/dd.c:1297 msgid "invalid input flag" msgstr "neplatný příznak vstupu" -#: src/dd.c:1216 src/dd.c:1283 src/dd.c:1295 +#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303 msgid "invalid output flag" msgstr "neplatný příznak výstupu" -#: src/dd.c:1219 +#: src/dd.c:1227 msgid "invalid status flag" msgstr "neplatná hodnota operandu status" -#: src/dd.c:1258 src/truncate.c:312 +#: src/dd.c:1266 src/truncate.c:310 #, c-format msgid "invalid number %s" msgstr "neplatné číslo %s" -#: src/dd.c:1340 +#: src/dd.c:1348 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "tyto konverze nelze kombinovat: ascii, ebcdic, ibm" -#: src/dd.c:1342 +#: src/dd.c:1350 #, c-format msgid "cannot combine block and unblock" msgstr "block a unblock nelze použít současně" -#: src/dd.c:1344 +#: src/dd.c:1352 #, c-format msgid "cannot combine lcase and ucase" msgstr "lcase a ucase nelze použít současně" -#: src/dd.c:1346 +#: src/dd.c:1354 #, c-format msgid "cannot combine excl and nocreat" msgstr "excl a nocreat nelze použít současně" -#: src/dd.c:1349 +#: src/dd.c:1357 #, c-format msgid "cannot combine direct and nocache" msgstr "direct a nocache nelze použít současně" -#: src/dd.c:1506 +#: src/dd.c:1514 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3449,72 +3432,72 @@ 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:1593 +#: src/dd.c:1601 #, c-format msgid "%s: cannot skip" msgstr "%s: vstup nelze převíjet" -#: src/dd.c:1595 src/dd.c:1614 src/dd.c:1675 +#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683 #, c-format msgid "%s: cannot seek" msgstr "%s: výstup nelze převíjet" -#: src/dd.c:1655 +#: src/dd.c:1663 #, c-format msgid "offset overflow while reading file %s" msgstr "během čtení ze souboru %s přetekl offset" -#: src/dd.c:1667 +#: src/dd.c:1675 #, c-format msgid "warning: invalid file offset after failed read" msgstr "varování: chybný offset souboru poté, co selhalo čtení" -#: src/dd.c:1671 +#: src/dd.c:1679 #, 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:1814 +#: src/dd.c:1822 #, c-format msgid "setting flags for %s" msgstr "nastavuji příznaky pro %s" -#: src/dd.c:1867 +#: 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:1881 +#: 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:1914 +#: src/dd.c:1922 #, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: nelze se přesunout na zadanou pozici ve vstupu" -#: src/dd.c:2125 src/dd.c:2258 +#: src/dd.c:2133 #, 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" +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:2138 +#: src/dd.c:2146 #, c-format msgid "fdatasync failed for %s" msgstr "fdatasync na %s selhalo" -#: src/dd.c:2148 +#: src/dd.c:2156 #, c-format msgid "fsync failed for %s" msgstr "fsync na %s selhalo" -#: src/dd.c:2199 src/dd.c:2228 +#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165 #, c-format -msgid "opening %s" -msgstr "otevírám %s" +msgid "failed to open %s" +msgstr "otevření %s selhalo" -#: src/dd.c:2237 +#: src/dd.c:2246 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) " @@ -3523,84 +3506,104 @@ msgstr "" "příliš velký offset: nelze zkrátit na délku seek=%<PRIuMAX> (%lu-bajtových) " "bloků" -#: src/dd.c:2274 src/dd.c:2280 +#: src/dd.c:2267 +#, 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 #, 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:54 src/expr.c:153 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:39 src/sleep.c:35 src/sort.c:66 +#: 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 msgid "Paul Eggert" msgstr "Paul Eggert" -#: src/df.c:140 +#: src/df.c:172 msgid "Filesystem" msgstr "Souborový systém" -#: src/df.c:141 +#: src/df.c:175 msgid "Type" msgstr "Typ" -#: src/df.c:142 +#: src/df.c:178 src/df.c:542 msgid "blocks" msgstr "bloků" -#: src/df.c:142 -msgid "Inodes" -msgstr "I-uzlů" - -#: src/df.c:142 -msgid "Size" -msgstr "Velikost" - -#: src/df.c:143 +#: src/df.c:181 msgid "Used" msgstr "Užito" -#: src/df.c:143 -msgid "IUsed" -msgstr "IUžito" - -#: src/df.c:144 +#: src/df.c:184 msgid "Available" msgstr "Volné" -#: src/df.c:144 -msgid "IFree" -msgstr "IVolno" - -#: src/df.c:144 -msgid "Avail" -msgstr "Volno" - -#: src/df.c:145 +#: src/df.c:187 msgid "Use%" msgstr "Uži%" -#: src/df.c:145 +#: src/df.c:190 +msgid "Inodes" +msgstr "I-uzlů" + +#: src/df.c:193 +msgid "IUsed" +msgstr "IUžito" + +#: src/df.c:196 +msgid "IFree" +msgstr "IVolno" + +#: src/df.c:199 msgid "IUse%" msgstr "IUži%" -#: src/df.c:145 +#: src/df.c:202 +msgid "Mounted on" +msgstr "Připojeno do" + +#: src/df.c:383 +#, c-format +msgid "option --output: field '%s' unknown" +msgstr "přepínač --output: neznámá položka „%s“" + +#: src/df.c:390 +#, 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" + +#: src/df.c:410 src/df.c:449 +msgid "Size" +msgstr "Velikost" + +#: src/df.c:414 src/df.c:451 +msgid "Avail" +msgstr "Volno" + +#: src/df.c:474 msgid "Capacity" msgstr "Kapacita" -#: src/df.c:146 -msgid "Mounted on" -msgstr "Připojeno do" +#. 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 +#, c-format +msgid "%s-%s" +msgstr "%s %s" -#: src/df.c:847 +#: src/df.c:1210 msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" -"\n" 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" -"\n" -#: src/df.c:855 +#: src/df.c:1217 msgid "" " -a, --all include dummy file systems\n" " -B, --block-size=SIZE scale sizes by SIZE before printing them. E.g.,\n" @@ -3623,7 +3626,7 @@ msgstr "" " (např. 1K 234M 2G)\n" " -H, --si podobně jako předchozí, ale násobky 1000, ne 1024\n" -#: src/df.c:865 +#: src/df.c:1227 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3636,8 +3639,11 @@ 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:872 +#: src/df.c:1234 msgid "" +" --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" +" or print all fields if FIELD_LIST is " +"omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" " -t, --type=TYPE limit listing to file systems of type TYPE\n" @@ -3645,6 +3651,9 @@ msgid "" " -x, --exclude-type=TYPE limit listing to file systems not of type TYPE\n" " -v (ignored)\n" msgstr "" +" --output[=SEZNAM_POLOŽEK]\n" +" výstup ve formátu určeném SEZNAMEM_POLOŽEK,\n" +" nebo vypíše všechny položky, je-li seznam vynechán.\n" " -P, --portability použije formát definovaný normou POSIX\n" " --sync zavolá „sync“ před získáním informací\n" " -t, --type=TYP ve výstupu pouze souborové systémy typu TYP\n" @@ -3653,20 +3662,49 @@ msgstr "" " ve výstupu nebudou souborové systémy typu TYP\n" " -v (ignorováno)\n" -#: src/df.c:1027 +#: src/df.c:1248 +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" +msgstr "" +"\n" +"SEZNAM_POLOŽEK je čárkou oddělený seznam sloupců. Platné názvy položek " +"jsou:\n" +"„source“ (zdroj), „fstype“ (druh souborového systému), „itotal“ (celkem " +"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" + +#: src/df.c:1285 +#, 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 #, 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:1075 +#: src/df.c:1500 msgid "Warning: " -msgstr "Varování: " +msgstr "Pozor: " -#: src/df.c:1077 src/stat.c:795 +#: src/df.c:1502 src/stat.c:814 msgid "cannot read table of mounted file systems" msgstr "tabulku připojených souborových systémů nelze přečíst" -#: src/df.c:1107 +#: src/df.c:1539 #, c-format msgid "no file systems processed" msgstr "žádný souborový systém nebyl zpracován" @@ -3783,7 +3821,7 @@ msgstr "" " %s adr1/řet adr2/řet Vypíše „adr1“ následovaný „adr2“\n" " %s stdio.h Vypíše „.“.\n" -#: src/du.c:260 src/sort.c:390 src/wc.c:112 +#: src/du.c:270 src/sort.c:394 src/wc.c:112 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3792,17 +3830,15 @@ msgstr "" "Použití: %s [PŘEPÍNAČ]… [SOUBOR]…\n" " nebo: %s [PŘEPÍNAČ]… --files0-from=S\n" -#: src/du.c:264 -msgid "" -"Summarize disk usage of each FILE, recursively for directories.\n" -"\n" +#: src/du.c:274 +msgid "Summarize disk usage of each FILE, recursively for directories.\n" msgstr "" -"Sčítá diskový prostor zabraný každým SOUBOREM, pro adresáře i s obsahem\n" -"podadresářů.\n" -"\n" +"Sčítá diskový prostor zabraný každým SOUBOREM, pro adresáře rekurzivně.\n" -#: src/du.c:271 +#: src/du.c:280 msgid "" +" -0, --null end each output line with 0 byte rather than " +"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,6 +3846,8 @@ 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" +" 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" " diskového prostoru; ačkoliv velikost obsahu bývá " @@ -3818,7 +3856,7 @@ msgstr "" "fragmentaci,\n" " nepřímým blokům apod. může být i větší.\n" -#: src/du.c:279 +#: src/du.c:289 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" @@ -3827,6 +3865,11 @@ msgid "" " -c, --total produce a grand total\n" " -D, --dereference-args dereference only symlinks that are listed on the\n" " command line\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 "" " -B --block-size=VELIKOST\n" " velikosti vypisuje v násobcích VELIKOSTI. Např. „-" @@ -3839,8 +3882,14 @@ msgstr "" " -D, --dereference-args\n" " následuje jen symbolické odkazy, které jsou uvedeny\n" " na příkazové řádce\n" +" -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 " +"přepínači\n" +" --summarize.\n" -#: src/du.c:288 +#: src/du.c:302 msgid "" " --files0-from=F summarize disk usage of the NUL-terminated file\n" " names specified in file F;\n" @@ -3848,7 +3897,6 @@ msgid "" " -H equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" --si like -h, but use powers of 1000 not 1024\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" @@ -3856,62 +3904,37 @@ msgstr "" " -H rovnocenné s --dereference-args (-D)\n" " -h, --human-readable vypisuje velikosti ve formátu čitelném pro lidi\n" " (např. 1K 234M 2G)\n" -" --si jako -h, ale používá mocniny 1000 a ne 1024\n" -#: src/du.c:297 +#: src/du.c:310 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 jako --block-size=1K\n" +" -L, --dereference následuje všechny symbolické odkazy\n" " -l, --count-links jestliže jsou jména pevnými odkazy na jeden soubor,\n" " započte každý odkaz znovu\n" " -m jako --block-size=1M\n" -#: src/du.c:302 +#: src/du.c:316 msgid "" -" -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " "default)\n" -" -0, --null end each output line with 0 byte rather than " -"newline\n" " -S, --separate-dirs 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 následuje všechny symbolické odkazy\n" -" -P, --no-dereference nenásleduje symbolické odkazy (implicitní chování)\n" -" -0, --null řádky výstupu zakončí nulovým bajtem místo znakem\n" -" nového řádku\n" -" -S, --separate-dirs nepočítá do velikosti adresářů velikosti jejich\n" -" podadresářů\n" +" -P, --no-dereference nenásleduje symbolické odkazy (výchozí chování)\n" +" -S, --separate-dirs 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:309 -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\n" -" přeskočí adresáře na jiných souborových systémech\n" -" -X, --exclude-from=SOUBOR\n" -" přeskočí soubory, které vyhovují libovolnému\n" -" výrazu ze souboru SOUBOR\n" -" --exclude=VZOR přeskočí soubory vyhovující VZORU\n" -" --max-depth=N vypíše celkové součty pouze pro adresáře (nebo\n" -" soubory, pokud je uvedeno --all), do N. úrovně\n" -" vzhledem k cestě na příkazovém řádku.\n" -" Argument --max-depth=0 je rovnocenný se --" -"summarize.\n" - -#: src/du.c:318 +#: src/du.c:322 msgid "" +" -t, --threshold=SIZE exclude entries smaller than SIZE if positive,\n" +" or entries greater than SIZE if negative\n" " --time show time of the last modification of any file in " "the\n" " directory, or any of its subdirectories\n" @@ -3921,6 +3944,9 @@ msgid "" " full-iso, long-iso, iso, +FORMAT\n" " FORMAT is interpreted like 'date'\n" msgstr "" +" -t, --threshold=VELIKOST\n" +" vynechá položky menší než VELIKOST, je-li kladná,\n" +" nebo položky vetší než VELIKOST, je-li záporná\n" " --time ukáže čas poslední změny obsahu každého souboru\n" " včetně souborů v podadresářích\n" " --time=TYP vypisuje čas podle TYPU namísto změny obsahu:\n" @@ -3930,66 +3956,80 @@ msgstr "" " full-iso (úplný), long-iso (dlouhý), iso, +FORMÁT\n" " FORMÁT je stejný jako u příkazu „date“\n" -#: src/du.c:375 -#, fuzzy +#: src/du.c:333 +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=SOUBOR\n" +" vynechá soubory odpovídající jakémukoliv vzoru " +"v SOUBORU\n" +" --exclude=VZOR vynechá soubory, které odpovídají VZORU\n" +" -x, --one-file-system\n" +" přeskočí adresáře z jiných souborových systémů\n" + +#: src/du.c:386 msgid "Infinity" -msgstr "nekonečno B" +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:600 +#: src/du.c:624 #, c-format msgid "fts_read failed: %s" msgstr "fts_read selhalo: %s" -#: src/du.c:724 +#: src/du.c:780 #, c-format msgid "invalid maximum depth %s" msgstr "chybné maximální hloubka %s" -#: src/du.c:817 +#: src/du.c:809 +#, c-format +msgid "invalid --threshold argument '-0'" +msgstr "argument „-0“ za přepínačem --threshold je neplatný" + +#: src/du.c:887 #, 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:824 +#: src/du.c:894 #, 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:830 +#: src/du.c:900 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "varování: sumarizace je v rozporu s --max-depth=%lu" -#: src/du.c:896 src/sort.c:4479 src/wc.c:668 +#: src/du.c:966 src/sort.c:4533 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:949 src/md5sum.c:587 src/od.c:903 src/tac.c:239 src/tac.c:350 -#: src/tac.c:506 src/tac.c:586 src/wc.c:733 +#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 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:963 src/sort.c:4508 src/wc.c:747 +#: src/du.c:1040 src/sort.c:4562 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:980 src/du.c:988 src/wc.c:760 src/wc.c:768 +#: src/du.c:1057 src/du.c:1065 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:1007 src/head.c:149 src/head.c:262 src/head.c:334 src/head.c:538 -#: src/head.c:620 src/head.c:692 src/head.c:750 src/head.c:774 src/tail.c:412 -#: src/tail.c:500 src/tail.c:549 src/tail.c:642 src/tail.c:770 src/tail.c:818 -#: src/tail.c:855 src/tail.c:1782 src/tail.c:1812 src/uniq.c:395 -#, c-format -msgid "error reading %s" -msgstr "chyba při čtení %s" - -#: src/du.c:1010 src/ls.c:2649 src/wc.c:791 +#: src/du.c:1088 src/ls.c:2649 src/wc.c:791 msgid "total" msgstr "celkem" @@ -4095,21 +4135,22 @@ msgid "Usage: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n" msgstr "Použití: %s [PŘEPÍNAČ]… [-] [JMÉNO=HODNOTA]… [PŘÍKAZ [ARGUMENT]…]\n" #: src/env.c:55 +msgid "Set each NAME to VALUE in the environment and run COMMAND.\n" +msgstr "" +"Nastaví v prostředí každou proměnnou JMÉNO na HODNOTU a spustí PŘÍKAZ.\n" + +#: src/env.c:61 msgid "" -"Set each NAME to VALUE in the environment and run COMMAND.\n" -"\n" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with 0 byte rather than newline\n" " -u, --unset=NAME remove variable from the environment\n" msgstr "" -"Nastaví v prostředí každou proměnnou JMÉNO na HODNOTU a spustí PŘÍKAZ.\n" -"\n" " -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" " místo znakem nového řádku\n" " -u, --unset=JMÉNO odstraní z prostředí proměnnou JMÉNO\n" -#: src/env.c:64 +#: src/env.c:68 msgid "" "\n" "A mere - implies -i. If no COMMAND, print the resulting environment.\n" @@ -4118,17 +4159,17 @@ msgstr "" "Samotná - (pomlčka) znamená -i. Pokud není PŘÍKAZ zadán, vypíše výslednou\n" "tabulku proměnných prostředí.\n" -#: src/env.c:120 +#: src/env.c:124 #, c-format msgid "cannot unset %s" msgstr "%s nelze odstranit z prostředí" -#: src/env.c:131 +#: src/env.c:135 #, c-format msgid "cannot set %s" msgstr "%s nelze nastavit" -#: src/env.c:148 +#: src/env.c:152 #, c-format msgid "cannot specify --null (-0) with command" msgstr "s příkazem nelze použít přepínač --null (-0)" @@ -4137,15 +4178,13 @@ msgstr "s příkazem nelze použít přepínač --null (-0)" msgid "" "Convert tabs in each FILE to spaces, writing to standard output.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" "Konvertuje tabelátory v každém SOUBORU na mezery, výsledek jde na " "standardní\n" "výstup. Nebude-li SOUBOR zadán nebo bude-li „-“, bude čten standardní " "vstup.\n" -"\n" -#: src/expand.c:115 +#: src/expand.c:114 msgid "" " -i, --initial do not convert tabs after non blanks\n" " -t, --tabs=NUMBER have tabs NUMBER characters apart, not 8\n" @@ -4154,34 +4193,34 @@ msgstr "" "konvertovány\n" " -t, --tabs=POČET tabelátor považuje za POČET (8) mezer\n" -#: src/expand.c:119 +#: src/expand.c:118 msgid "" " -t, --tabs=LIST use comma separated list of explicit tab positions\n" msgstr "" " -t, --tabs=SEZNAM použije čárkami oddělený seznam pozicí tabelátorů\n" -#: src/expand.c:172 src/unexpand.c:191 +#: src/expand.c:171 src/unexpand.c:190 #, c-format msgid "tab stop is too large %s" msgstr "velikost tabelátoru %s je příliš velká" -#: src/expand.c:180 src/unexpand.c:199 +#: src/expand.c:179 src/unexpand.c:198 #, c-format msgid "tab size contains invalid character(s): %s" msgstr "velikost tabelátoru obsahuje neplatný znak: %s" -#: src/expand.c:206 src/unexpand.c:225 +#: src/expand.c:205 src/unexpand.c:224 #, c-format msgid "tab size cannot be 0" msgstr "velikost tabelátoru nemůže být 0" # sizes or positions? - rzm -#: src/expand.c:208 src/unexpand.c:227 +#: src/expand.c:207 src/unexpand.c:226 #, c-format msgid "tab sizes must be ascending" msgstr "posloupnost pozic tabelátorů musí být rostoucí" -#: src/expand.c:326 src/expand.c:345 src/unexpand.c:374 src/unexpand.c:419 +#: 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 "řádka na vstupu je příliš dlouhá" @@ -4346,12 +4385,12 @@ msgstr "chyba při vyhledávání pomocí regulárního výrazu" msgid "non-integer argument" msgstr "neceločíselný argument" -#: src/expr.c:793 src/truncate.c:316 +#: src/expr.c:793 src/truncate.c:314 #, c-format msgid "division by zero" msgstr "dělení nulou" -#: src/expr.c:887 src/sort.c:2029 +#: src/expr.c:887 src/sort.c:2044 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "pro obejdete, když nastavíte LC_ALL='C'" @@ -4361,25 +4400,32 @@ msgstr "pro obejdete, když nastavíte LC_ALL='C'" msgid "the strings compared were %s and %s" msgstr "byly porovnávány řetězce %s a %s" -#: src/factor.c:449 -msgid "using arbitrary-precision arithmetic" -msgstr "používám aritmetiku s libovolnou přesností" +#. This is a proper name. See the gettext manual, section Names. +#: src/factor.c:111 +msgid "Niels Moller" +msgstr "Niels Möller" -#: src/factor.c:460 -msgid "using single-precision arithmetic" -msgstr "používám aritmetiku s jednoduchou přesností" +#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459 +#, 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:465 src/od.c:1640 src/od.c:1709 +#: src/factor.c:2092 #, c-format -msgid "%s is too large" -msgstr "%s je příliš velké" +msgid "squfof queue overflow" +msgstr "Fronta algoritmu SQUFOF přetekla" -#: src/factor.c:469 +#: src/factor.c:2419 #, c-format msgid "%s is not a valid positive integer" msgstr "%s není celé kladné číslo" -#: src/factor.c:494 +#: src/factor.c:2442 src/od.c:1646 src/od.c:1715 +#, c-format +msgid "%s is too large" +msgstr "%s je příliš velké" + +#: src/factor.c:2454 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4388,7 +4434,7 @@ msgstr "" "Použití: %s [ČÍSLO]…\n" " nebo: %s PŘEPÍNAČ\n" -#: src/factor.c:499 +#: src/factor.c:2459 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" @@ -4416,25 +4462,23 @@ msgid "cannot stat current directory (now %s)" msgstr "nelze získat informace o pracovním adresáři (nyní %s)" #. This is a proper name. See the gettext manual, section Names. -#: src/fmt.c:37 +#: src/fmt.c:38 msgid "Ross Paterson" msgstr "Ross Paterson" -#: src/fmt.c:269 +#: src/fmt.c:270 #, c-format msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n" msgstr "Použití: %s [-ŠÍŘKA] [PŘEPÍNAČ]… [SOUBOR]…\n" -#: src/fmt.c:270 +#: 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" -"\n" msgstr "" "Přeformátuje všechny odstavce v SOUBORU a výsledek vypíše na standardní " "výstup.\n" "Přepínač -ŠÍŘKA je zkrácená podoba --width=ŠÍŘKA.\n" -"\n" #: src/fmt.c:278 msgid "" @@ -4448,8 +4492,8 @@ msgstr "" "prefix\n" " -s, --split-only pouze rozdělí dlouhé řádky\n" -#: src/fmt.c:285 -#, fuzzy, c-format +#: src/fmt.c:287 +#, 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" @@ -4458,9 +4502,10 @@ msgid "" msgstr "" " -t, --tagged-paragraph odsadí první řádek rozdílně od druhého\n" " -u, --uniform-spacing jedna mezera mezi slovy, dvě za větou\n" -" -w, --width=ŠÍŘKA maximální šířka řádku (implicitně 75)\n" +" -w, --width=ŠÍŘKA maximální šířka řádku (implicitně 75 sloupců)\n" +" -g, --goal=ŠÍŘKA cílová šířka (výchozí je 93 % šířky)\n" -#: src/fmt.c:357 +#: src/fmt.c:359 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -4470,7 +4515,7 @@ msgstr "" "přepínačem;\n" "použijte -w ŠÍŘKA" -#: src/fmt.c:403 src/fmt.c:414 +#: src/fmt.c:405 src/fmt.c:416 #, c-format msgid "invalid width: %s" msgstr "chybné šířka: %s" @@ -4479,13 +4524,11 @@ msgstr "chybné šířka: %s" msgid "" "Wrap input lines in each FILE (standard input by default), writing to\n" "standard output.\n" -"\n" msgstr "" "Zalamuje vstupní řádky každého SOUBORU (implicitně standardního vstupu) a\n" "výsledek zapisuje na standardní výstup.\n" -"\n" -#: src/fold.c:78 +#: src/fold.c:77 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4495,13 +4538,13 @@ msgstr "" " -s, --spaces zalamuje řádky v mezerách\n" " -w, --width=ŠÍŘKA používá ŠÍŘKA sloupců místo 80\n" -#: src/fold.c:289 src/pr.c:836 +#: src/fold.c:288 src/pr.c:832 #, c-format 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:75 +#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 #: src/truncate.c:37 msgid "Padraig Brady" msgstr "Pádraig Brady" @@ -4520,17 +4563,17 @@ msgstr "" "skriptů.\n" "\n" -#: src/group-list.c:69 src/id.c:345 src/setuidgid.c:184 +#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184 #, 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:350 +#: src/group-list.c:74 src/id.c:370 #, c-format msgid "failed to get groups for the current process" msgstr "získání skupin aktuálního procesu selhalo" -#: src/group-list.c:104 +#: src/group-list.c:114 #, c-format msgid "cannot find name for group ID %lu" msgstr "jméno skupiny pro GID %lu nelze najít" @@ -4575,16 +4618,14 @@ 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" -"\n" msgstr "" "Vypíše prvních 10 řádků každého SOUBORU na standardní výstup. S více jak\n" "jedním SOUBOREM bude před vypsáním každého uvedena hlavička obsahující " "jméno\n" "SOUBORU. Jestliže SOUBOR nebude zadán nebo bude „-“, bude čten standardní\n" "vstup.\n" -"\n" -#: src/head.c:118 +#: src/head.c:117 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -4600,7 +4641,7 @@ msgstr "" " uvedení „-“ způsobí vypsání všech kromě\n" " posledních K řádků z každého souboru\n" -#: src/head.c:126 +#: src/head.c:125 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4608,7 +4649,7 @@ msgstr "" " -q, --quiet, --silent nikdy nevypisuje hlavičky s názvy souborů\n" " -v, --verbose vypisuje hlavičky s názvy souborů vždy\n" -#: src/head.c:132 +#: src/head.c:131 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -4620,59 +4661,59 @@ 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:152 -#, c-format -msgid "error writing %s" -msgstr "chyba při zápisu %s" - -#: src/head.c:155 +#: src/head.c:154 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: soubor byl příliš zkrácen" -#: src/head.c:228 src/head.c:1044 +#: src/head.c:227 src/head.c:1051 #, c-format msgid "%s: number of bytes is too large" msgstr "%s: počet bajtů je příliš velký" -#: src/head.c:441 +#: 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:613 src/head.c:684 src/tail.c:450 +#: src/head.c:612 src/head.c:691 src/tail.c:449 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: nelze se přemístit na pozici %s" -#: src/head.c:791 +#: src/head.c:673 +#, 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" # src/tail.c:968 -#: src/head.c:878 +#: src/head.c:885 #, 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:879 +#: src/head.c:886 msgid "number of lines" msgstr "počet řádků" -#: src/head.c:879 +#: src/head.c:886 msgid "number of bytes" msgstr "počet bajtů" -#: src/head.c:886 src/tail.c:1947 +#: src/head.c:893 src/tail.c:1947 msgid "invalid number of lines" msgstr "chybný počet řádků" -#: src/head.c:887 src/tail.c:1948 +#: src/head.c:894 src/tail.c:1948 msgid "invalid number of bytes" msgstr "chybný počet bajtů" -#: src/head.c:974 src/head.c:1032 +#: src/head.c:981 src/head.c:1039 #, c-format msgid "invalid trailing option -- %c" msgstr "neznámý závěrečný přepínač – %c" @@ -4788,86 +4829,86 @@ msgstr "kontext procesu nelze zjistit" msgid "cannot get effective UID" msgstr "nelze zjistit efektivní ID uživatele" -#: src/id.c:289 -#, fuzzy, c-format -msgid "cannot find name for user ID %lu" -msgstr "jméno uživatele pro UID %lu nelze najít" +#: src/id.c:311 +#, c-format +msgid "cannot find name for user ID %s" +msgstr "jméno uživatele pro UID %s nelze najít" -#: src/id.c:309 -#, fuzzy, c-format -msgid "uid=%lu" -msgstr "uid=%lu" +#: src/id.c:329 +#, c-format +msgid "uid=%s" +msgstr "uid=%s" -#: src/id.c:314 -#, fuzzy, c-format -msgid " gid=%lu" -msgstr " egid=%lu" +#: src/id.c:334 +#, c-format +msgid " gid=%s" +msgstr " gid=%s" -#: src/id.c:321 -#, fuzzy, c-format -msgid " euid=%lu" -msgstr " egid=%lu" +#: src/id.c:341 +#, c-format +msgid " euid=%s" +msgstr " euid=%s" -#: src/id.c:329 +#: src/id.c:349 #, c-format -msgid " egid=%lu" -msgstr " egid=%lu" +msgid " egid=%s" +msgstr " egid=%s" -#: src/id.c:357 +#: src/id.c:377 msgid " groups=" msgstr " skupiny=" -#: src/id.c:373 +#: src/id.c:393 #, c-format msgid " context=%s" msgstr " kontext=%s" -#: src/install.c:372 +#: src/install.c:373 #, c-format msgid "warning: %s: failed to change context to %s" msgstr "varování: %s: změna kontextu na %s selhala" -#: src/install.c:413 +#: src/install.c:414 #, c-format msgid "creating directory %s" msgstr "vytvářím adresář %s" -#: src/install.c:481 +#: src/install.c:482 #, c-format msgid "cannot change ownership of %s" msgstr "vlastnictví %s nelze změnit" -#: src/install.c:505 +#: src/install.c:506 #, c-format msgid "cannot set time stamps for %s" msgstr "nelze nastavit časy %s " -#: src/install.c:526 src/split.c:412 src/timeout.c:387 +#: src/install.c:527 src/split.c:426 src/timeout.c:439 #, c-format msgid "fork system call failed" msgstr "systémové volání fork selhalo" -#: src/install.c:530 +#: src/install.c:531 #, c-format msgid "cannot run %s" msgstr "%s nelze spustit" -#: src/install.c:534 +#: src/install.c:535 #, c-format msgid "waiting for strip" msgstr "čekám na strip" -#: src/install.c:536 +#: src/install.c:537 #, c-format msgid "strip process terminated abnormally" msgstr "proces strip skončil neobvykle" -#: src/install.c:557 +#: src/install.c:558 #, c-format msgid "invalid user %s" msgstr "neplatný uživatel %s" -#: src/install.c:593 +#: src/install.c:594 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -4880,7 +4921,7 @@ msgstr "" " nebo: %s [PŘEPÍNAČ]… -t ADRESÁŘ ZDROJ…\n" " nebo: %s [PŘEPÍNAČ]… -d ADRESÁŘ…\n" -#: src/install.c:600 +#: src/install.c:601 msgid "" "\n" "This install program copies files (often just compiled) into destination\n" @@ -4892,7 +4933,6 @@ msgid "" "In the first three forms, copy SOURCE to DEST or multiple SOURCE(s) to\n" "the existing DIRECTORY, while setting permission modes and owner/group.\n" "In the 4th form, create all components of the given DIRECTORY(ies).\n" -"\n" msgstr "" "\n" "Tento program install kopíruje soubory (často čerstvě přeložené) do " @@ -4904,7 +4944,6 @@ msgstr "" "Prvních tři způsoby kopírují ZDROJ do CÍLE nebo více ZDROJŮ\n" "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" -"\n" #: src/install.c:615 msgid "" @@ -4988,54 +5027,54 @@ msgstr "" " nastaví souborům a adresářům selinuxový bezp. " "kontext\n" -#: src/install.c:858 +#: src/install.c:859 #, 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:868 +#: 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:885 +#: src/install.c:886 #, 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:888 +#: src/install.c:889 #, 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:892 +#: 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:946 src/mkdir.c:202 src/stdbuf.c:327 +#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326 #, c-format msgid "invalid mode %s" msgstr "neplatná práva: %s" -#: src/install.c:953 +#: src/install.c:954 #, 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:958 +#: src/install.c:959 #, 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:965 +#: src/install.c:966 #, 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:971 +#: src/install.c:972 #, c-format msgid "" "the --compare (-C) option is ignored when you specify a mode with non-" @@ -5044,7 +5083,7 @@ msgstr "" "přepínač --compare (-C) bude ignorován, zadáte-li --mode (-m) s bity ne-práv" #. This is a proper name. See the gettext manual, section Names. -#: src/join.c:40 src/sort.c:65 +#: src/join.c:40 src/sort.c:66 msgid "Mike Haertel" msgstr "Mike Haertel" @@ -5141,8 +5180,8 @@ msgstr "" #: src/join.c:403 #, c-format -msgid "%s:%ju: is not sorted: %.*s" -msgstr "%s:%ju: není seřazeno: %.*s" +msgid "%s:%<PRIuMAX>: is not sorted: %.*s" +msgstr "%s:%<PRIuMAX>: není seřazeno: %.*s" #: src/join.c:840 src/join.c:1038 #, c-format @@ -5169,12 +5208,12 @@ msgstr "neslučitelné propojovací položky %lu, %lu" msgid "conflicting empty-field replacement strings" msgstr "řetězce výplně je jsou v konfliktu" -#: src/join.c:1101 src/sort.c:4414 +#: src/join.c:1101 src/sort.c:4468 #, 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:4419 +#: src/join.c:1105 src/sort.c:4473 #, c-format msgid "incompatible tabs" msgstr "neslučitelné oddělovače položek" @@ -5196,14 +5235,10 @@ msgstr "" " nebo: %s -t [SIGNÁL]…\n" #: src/kill.c:82 -msgid "" -"Send signals to processes, or list signals.\n" -"\n" -msgstr "" -"Zašle signál procesům nebo vypíše seznam signálů.\n" -"\n" +msgid "Send signals to processes, or list signals.\n" +msgstr "Zašle signál procesům nebo vypíše seznam signálů.\n" -#: src/kill.c:89 +#: src/kill.c:88 msgid "" " -s, --signal=SIGNAL, -SIGNAL\n" " specify the name or number of the signal to be sent\n" @@ -5217,7 +5252,7 @@ msgstr "" " na/z číslo\n" " -t, --table vypíše tabulku s informacemi o signálech\n" -#: src/kill.c:97 +#: src/kill.c:96 msgid "" "\n" "SIGNAL may be a signal name like 'HUP', or a signal number like '1',\n" @@ -5230,32 +5265,32 @@ msgstr "" "PID (číslo procesu) je celé číslo. Záporná hodnota adresuje skupinu " "procesu.\n" -#: src/kill.c:206 +#: src/kill.c:205 #, c-format msgid "%s: invalid process id" msgstr "%s: neplatné číslo procesu" -#: src/kill.c:260 +#: src/kill.c:259 #, c-format msgid "invalid option -- %c" msgstr "neznámý přepínač – %c" -#: src/kill.c:269 +#: src/kill.c:268 #, c-format msgid "%s: multiple signals specified" msgstr "%s: zadáno více signálů" -#: src/kill.c:283 +#: src/kill.c:282 #, c-format msgid "multiple -l or -t options specified" msgstr "zadáno více přepínačů -l nebo -t" -#: src/kill.c:300 +#: src/kill.c:299 #, c-format msgid "cannot combine signal with -l or -t" msgstr "signál nelze kombinovat s -l nebo -t" -#: src/kill.c:306 +#: src/kill.c:305 #, c-format msgid "no process ID specified" msgstr "nebylo zadáno číslo procesu" @@ -5365,7 +5400,6 @@ msgid "" "When creating hard links, each TARGET must exist. Symbolic links\n" "can hold arbitrary text; if later resolved, a relative link is\n" "interpreted in relation to its parent directory.\n" -"\n" msgstr "" "1. forma vytvoří odkaz na CÍL se jménem JMÉNO_ODKAZU.\n" "2. forma vytvoří odkaz na CÍL v aktuálním adresáři.\n" @@ -5375,9 +5409,8 @@ msgstr "" "Pokud se vytváří pevné odkazy, každý CÍL musí existovat. Symbolické odkazy\n" "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" -"\n" -#: src/ln.c:395 +#: src/ln.c:394 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -5399,7 +5432,7 @@ msgstr "" "i superuživateli)\n" " -f, --force odstraní existující cílové soubory\n" -#: src/ln.c:403 +#: src/ln.c:402 msgid "" " -i, --interactive prompt whether to remove destinations\n" " -L, --logical dereference TARGETs that are symbolic links\n" @@ -5422,7 +5455,7 @@ msgstr "" " umístění\n" " -s, --symbolic na místo pevných odkazů vytváří symbolické\n" -#: src/ln.c:412 +#: src/ln.c:411 msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" " -t, --target-directory=DIRECTORY specify the DIRECTORY in which to " @@ -5438,31 +5471,17 @@ 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:428 -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 záložní kopie nevytvářet (i když je zadán přepínač --" -"backup)\n" -" numbered, t číslované záložní kopie\n" -" existing, nil číslované, jestliže již číslovaná záložní kopie existuje,\n" -" jinak jednoduché\n" -" simple, never jednoduché záložní kopie\n" -"\n" - -#: src/ln.c:435 +#: src/ln.c:433 #, 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" "Při použití přepínače -s budou ignorovány přepínače -L a -P. V opačném\n" "případě, je-li CÍLEM symbolický odkaz, se uplatní poslední zadaný přepínač.\n" -"Implicitní je %s.\n" +"Výchozí je %s.\n" #: src/ln.c:554 #, c-format @@ -5531,7 +5550,7 @@ 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:1976 +#: src/ls.c:1750 src/ptx.c:1975 #, c-format msgid "invalid line width: %s" msgstr "chybné délka řádku: %s" @@ -5594,7 +5613,7 @@ msgstr "čte se adresář %s" msgid "closing directory %s" msgstr "zavírá se adresář %s" -#: src/ls.c:3301 +#: src/ls.c:3302 #, c-format msgid "cannot compare file names %s and %s" msgstr "jména souborů %s a %s nelze porovnat" @@ -5603,14 +5622,12 @@ msgstr "jména souborů %s a %s nelze porovnat" msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" -"\n" msgstr "" "Vypisuje informace o SOUBORECH (implicitně z aktuálního adresáře). Jestliže\n" "není zadán žádný z přepínačů -cftuvSUX nebo --sort, výstup bude seřazen\n" "abecedně.\n" -"\n" -#: src/ls.c:4729 +#: src/ls.c:4728 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -5624,7 +5641,7 @@ 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:4735 +#: src/ls.c:4734 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them. E." "g.,\n" @@ -5651,7 +5668,7 @@ msgstr "" " jinak: řadí podle ctime, vypisuje od " "nejnovějších\n" -#: src/ls.c:4745 +#: src/ls.c:4744 msgid "" " -C list entries by columns\n" " --color[=WHEN] colorize the output. WHEN defaults to " @@ -5673,7 +5690,7 @@ msgstr "" " -D, --dired generuje výstup formátovaný pro Emacsový\n" " mód „dired“\n" -#: src/ls.c:4753 +#: src/ls.c:4752 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -5693,11 +5710,11 @@ msgstr "" " verbose jako -l, vertical jako -C\n" " --full-time jako -l --time-style=full-iso\n" -#: src/ls.c:4761 +#: src/ls.c:4760 msgid " -g like -l, but do not list owner\n" msgstr " -g jako -l, ale nevypisuje vlastníka\n" -#: src/ls.c:4764 +#: src/ls.c:4763 msgid "" " --group-directories-first\n" " group directories before files.\n" @@ -5709,7 +5726,7 @@ msgstr "" " Zachová funkci přepínače --sort, avšak\n" " --sort=none (-U) seskupování potlačí.\n" -#: src/ls.c:4770 +#: src/ls.c:4769 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" @@ -5723,7 +5740,7 @@ msgstr "" " --si jako předchozí, ale jednotky jsou násobky 1000\n" " a ne 1024.\n" -#: src/ls.c:4776 +#: src/ls.c:4775 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5745,7 +5762,7 @@ msgstr "" " shellovému VZORU (lze přebít přepínači -a a -" "A)\n" -#: src/ls.c:4786 +#: src/ls.c:4785 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -5765,7 +5782,7 @@ msgstr "" " shellovému VZORU\n" " -k, --kibibytes použije 1024bajtové bloky\n" -#: src/ls.c:4796 +#: src/ls.c:4795 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5781,7 +5798,7 @@ msgstr "" "oddělených\n" " čárkami vyplňující šířku řádků\n" -#: src/ls.c:4804 +#: src/ls.c:4803 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. " @@ -5799,7 +5816,7 @@ msgstr "" " -p, --indicator-style=slash\n" " za názvy adresářů připojí „/“\n" -#: src/ls.c:4812 +#: src/ls.c:4811 msgid "" " -q, --hide-control-chars print ? instead of non graphic characters\n" " --show-control-chars show non graphic characters as-is (default\n" @@ -5822,7 +5839,7 @@ msgstr "" " literal (doslovný), locale (lokalizovaný),\n" " shell, shell-always, c, escape\n" -#: src/ls.c:4821 +#: src/ls.c:4820 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -5834,7 +5851,7 @@ msgstr "" " -s, --size vypíše alokovanou velikost každého souboru\n" " v blocích\n" -#: src/ls.c:4826 +#: src/ls.c:4825 msgid "" " -S sort by file size\n" " --sort=WORD sort by WORD instead of name: none -U,\n" @@ -5857,7 +5874,7 @@ msgstr "" "použije\n" " se tento čas jako řadicí klíč\n" -#: src/ls.c:4836 +#: src/ls.c:4835 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, +FORMAT.\n" @@ -5878,7 +5895,7 @@ msgstr "" " mladší soubory; pokud STYL začíná na „posix-“,\n" " bude STYL uvažován jen mimo POSIXOVÉ locale\n" -#: src/ls.c:4845 +#: src/ls.c:4844 msgid "" " -t sort by modification time, newest first\n" " -T, --tabsize=COLS assume tab stops at each COLS instead of 8\n" @@ -5888,7 +5905,7 @@ msgstr "" " -T, --tabsize=SLOUPCŮ pozice tabelátoru každých SLOUPCŮ znaků (impl. " "8)\n" -#: src/ls.c:4849 +#: src/ls.c:4848 msgid "" " -u with -lt: sort by, and show, access time\n" " with -l: show access time and sort by name\n" @@ -5905,7 +5922,7 @@ msgstr "" " v jakém jsou v adresáři uloženy\n" " -v přirozené řazení (verzovacích) čísel v textu\n" -#: src/ls.c:4856 +#: src/ls.c:4855 msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" @@ -5922,7 +5939,7 @@ msgstr "" " bezpečnostní kontext\n" " -1 vypíše jeden soubor na jeden řádek\n" -#: src/ls.c:4866 +#: src/ls.c:4865 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5937,7 +5954,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:4873 +#: src/ls.c:4872 msgid "" "\n" "Exit status:\n" @@ -5967,7 +5984,7 @@ msgstr "Scott Miller" msgid "David Madore" msgstr "David Madore" -#: src/md5sum.c:162 +#: src/md5sum.c:164 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -5980,7 +5997,7 @@ msgstr "" "Jestliže SOUBOR nebude zadán nebo bude „-“, bude čten standardní vstup.\n" "\n" -#: src/md5sum.c:172 +#: src/md5sum.c:174 msgid "" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" @@ -5988,27 +6005,31 @@ msgstr "" " -b, --binary čte v binárním módu (výchozí, pokud nečte standardní\n" " vstup terminálu)\n" -#: src/md5sum.c:176 +#: src/md5sum.c:178 msgid " -b, --binary read in binary mode\n" msgstr " -b, --binary čte v binárním módu\n" -#: src/md5sum.c:179 +#: src/md5sum.c:181 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr " -c, --check porovnává součty %s se zadanými v SOUBORECH\n" -#: src/md5sum.c:183 +#: src/md5sum.c:184 +msgid " --tag create a BSD-style checksum\n" +msgstr " --tag vytvoří kontrolní součet ve stylu BSD\n" + +#: src/md5sum.c:188 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" " -t, --text čte v textovém módu (výchozí, je-li čten standardní\n" " vstup terminálu)\n" -#: src/md5sum.c:187 +#: src/md5sum.c:192 msgid " -t, --text read in text mode (default)\n" msgstr " -t, --text čte v textovém módu (výchozí)\n" -#: src/md5sum.c:190 +#: src/md5sum.c:195 msgid "" "\n" "The following three options are useful only when verifying checksums:\n" @@ -6025,14 +6046,14 @@ msgstr "" " -w, --warn upozorňuje na nesprávně formátované řádky součtů\n" "\n" -#: src/md5sum.c:198 +#: 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:203 +#: src/md5sum.c:208 #, c-format msgid "" "\n" @@ -6047,35 +6068,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:502 +#: src/md5sum.c:523 #, c-format msgid "%s: too many checksum lines" msgstr "%s: příliš mnoho řádků s kontrolními součty" -#: src/md5sum.c:526 +#: src/md5sum.c:547 #, 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:551 +#: src/md5sum.c:572 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: SELHALO otevření nebo čtení\n" -#: src/md5sum.c:574 +#: src/md5sum.c:595 msgid "FAILED" msgstr "CHYBNÝ" -#: src/md5sum.c:576 +#: src/md5sum.c:597 msgid "OK" msgstr "V POŘÁDKU" -#: src/md5sum.c:600 +#: src/md5sum.c:621 #, 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:610 +#: src/md5sum.c:631 #, c-format msgid "WARNING: %<PRIuMAX> line is improperly formatted" msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted" @@ -6090,7 +6111,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:618 +#: src/md5sum.c:639 #, c-format msgid "WARNING: %<PRIuMAX> listed file could not be read" msgid_plural "WARNING: %<PRIuMAX> listed files could not be read" @@ -6107,7 +6128,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:626 +#: src/md5sum.c:647 #, c-format msgid "WARNING: %<PRIuMAX> computed checksum did NOT match" msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match" @@ -6115,29 +6136,39 @@ 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:704 +#: src/md5sum.c:760 +#, c-format +msgid "--tag does not support --text mode" +msgstr "přepínač --tag nepodporuje režim --text" + +#: src/md5sum.c:766 +#, 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 #, 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:712 +#: src/md5sum.c:781 #, 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:719 +#: src/md5sum.c:788 #, 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:726 +#: src/md5sum.c:795 #, 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:733 +#: src/md5sum.c:802 #, 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ů" @@ -6148,14 +6179,10 @@ msgid "Usage: %s [OPTION]... DIRECTORY...\n" msgstr "Použití: %s [PŘEPÍNAČ]… ADRESÁŘ…\n" #: src/mkdir.c:57 -msgid "" -"Create the DIRECTORY(ies), if they do not already exist.\n" -"\n" -msgstr "" -"Vytvoří ADRESÁŘ(E), pokud ještě neexistuje(í).\n" -"\n" +msgid "Create the DIRECTORY(ies), if they do not already exist.\n" +msgstr "Vytvoří ADRESÁŘ(E), pokud ještě neexistuje(í).\n" -#: src/mkdir.c:64 +#: src/mkdir.c:63 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" @@ -6172,7 +6199,7 @@ msgstr "" " nastaví selinuxový bezpečnostní kontext na KONTEXT\n" " každému vytvářenému adresáři\n" -#: src/mkdir.c:169 +#: src/mkdir.c:168 #, c-format msgid "created directory %s" msgstr "adresář %s vytvořen" @@ -6183,33 +6210,29 @@ msgid "Usage: %s [OPTION]... NAME...\n" msgstr "Použití: %s [PŘEPÍNAČ]… [JMÉNO]…\n" #: src/mkfifo.c:52 -msgid "" -"Create named pipes (FIFOs) with the given NAMEs.\n" -"\n" -msgstr "" -"Vytvoří pojmenované roury (FIFO) se zadanými JMÉNY.\n" -"\n" +msgid "Create named pipes (FIFOs) with the given NAMEs.\n" +msgstr "Vytvoří pojmenované roury (FIFO) se zadanými JMÉNY.\n" -#: src/mkfifo.c:59 src/mknod.c:61 +#: src/mkfifo.c:58 src/mknod.c:60 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:62 +#: src/mkfifo.c:61 msgid "" " -Z, --context=CTX set the SELinux security context of each NAME to CTX\n" msgstr "" " -Z, --context=KTX nastaví selinuxový bezpečnostní kontext každému JMÉNU\n" "na KTX\n" -#: src/mkfifo.c:122 src/mknod.c:128 +#: src/mkfifo.c:121 src/mknod.c:127 #, c-format msgid "invalid mode" msgstr "neplatná práva" -#: src/mkfifo.c:127 src/mknod.c:133 +#: src/mkfifo.c:126 src/mknod.c:132 #, 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" @@ -6220,17 +6243,15 @@ 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 -msgid "" -"Create the special file NAME of the given TYPE.\n" -"\n" +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:64 +#: 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:69 +#: src/mknod.c:68 msgid "" "\n" "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n" @@ -6246,7 +6267,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:76 +#: src/mknod.c:75 msgid "" "\n" " b create a block (buffered) special file\n" @@ -6258,40 +6279,40 @@ msgstr "" " c, u znakový (nebufferovaný) speciální soubor\n" " p roura (FIFO)\n" -#: src/mknod.c:151 +#: src/mknod.c:150 msgid "Special files require major and minor device numbers." msgstr "Zvláštní soubory vyžadují hlavní a vedlejší čísla zařízení." -#: src/mknod.c:161 +#: src/mknod.c:160 msgid "Fifos do not have major and minor device numbers." msgstr "Roury nemají hlavní a vedlejší číslo zařízení." -#: src/mknod.c:177 +#: src/mknod.c:176 #, c-format msgid "block special files not supported" msgstr "zvláštní blokové soubory nejsou podporovány" -#: src/mknod.c:186 +#: src/mknod.c:185 #, c-format msgid "character special files not supported" msgstr "zvláštní znakové soubory nejsou podporovány" -#: src/mknod.c:202 +#: src/mknod.c:201 #, c-format msgid "invalid major device number %s" msgstr "neplatné hlavní číslo zařízení: %s" -#: src/mknod.c:207 +#: src/mknod.c:206 #, c-format msgid "invalid minor device number %s" msgstr "neplatné vedlejší číslo zařízení %s" -#: src/mknod.c:212 +#: src/mknod.c:211 #, c-format msgid "invalid device %s %s" msgstr "neplatné zařízení %s %s" -#: src/mknod.c:226 +#: src/mknod.c:225 #, c-format msgid "invalid device type %s" msgstr "neplatný typ zařízení %s" @@ -6374,60 +6395,56 @@ msgstr "" " relativně k adresáři: $TMPDIR, je-li nastavena, jinak\n" " je adresář zadán pomocí -p, jinak /tmp [zastaralé]\n" -#: src/mktemp.c:222 +#: 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:228 +#: src/mktemp.c:229 #, c-format msgid "too many templates" msgstr "příliš mnoho šablon" -#: src/mktemp.c:248 +#: src/mktemp.c:249 #, 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:273 src/split.c:1117 +#: src/mktemp.c:274 src/split.c:1130 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "chybná přípona %s, obsahuje oddělovač adresářů" -#: src/mktemp.c:278 +#: src/mktemp.c:279 #, c-format msgid "too few X's in template %s" msgstr "příliš málo X v šabloně %s" -#: src/mktemp.c:291 +#: src/mktemp.c:292 #, c-format msgid "invalid template, %s, contains directory separator" msgstr "chybná šablona %s, obsahuje oddělovač adresářů" -#: src/mktemp.c:305 +#: src/mktemp.c:306 #, 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:325 +#: src/mktemp.c:326 #, c-format msgid "failed to create directory via template %s" msgstr "vytvoření adresáře dle šablony %s selhalo" -#: src/mktemp.c:335 +#: src/mktemp.c:336 #, c-format msgid "failed to create file via template %s" msgstr "vytvoření souboru dle šablony %s selhalo" -#: src/mv.c:290 -msgid "" -"Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" -"\n" -msgstr "" -"Přejmenuje ZDROJ na CÍL, nebo přesune ZDROJ(E) do ADRESÁŘE.\n" -"\n" +#: src/mv.c:292 +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:297 +#: src/mv.c:298 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -6448,7 +6465,7 @@ msgstr "" "Zadáte-li více jak jeden přepínač z -i, -f, -n, pouze poslední bude " "účinkovat.\n" -#: src/mv.c:306 +#: src/mv.c:307 msgid "" " --strip-trailing-slashes remove any trailing slashes from each " "SOURCE\n" @@ -6458,7 +6475,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:311 +#: src/mv.c:312 msgid "" " -t, --target-directory=DIRECTORY move all SOURCE arguments into " "DIRECTORY\n" @@ -6483,33 +6500,34 @@ msgstr "Použití: %s [PŘEPÍNAČ] [[PŘÍKAZ] [ARGUMENT]…]\n" #, c-format msgid "" "Run COMMAND with an adjusted niceness, which affects process scheduling.\n" -"With no COMMAND, print the current niceness. Nicenesses range from\n" -"%d (most favorable scheduling) to %d (least favorable).\n" -"\n" -" -n, --adjustment=N add integer N to the niceness (default 10)\n" +"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 "" -"Provede PŘÍKAZ s pozměněnou hodnotou nice, což ovlivní plánování procesů.\n" +"Spustí PŘÍKAZ s pozměněnou hodnotou nice, což ovlivní plánování procesů.\n" "Bez PŘÍKAZU vypíše aktuální hodnotu. Rozsah hodnoty nice je od %d\n" -"(nejupřednostňovanější plánovačem) do %d (nejupozaďovanější).\n" -"\n" -" -n, --adjustment=N k hodnotě nice přičte celé číslo N (implicitně 10)\n" +"(nejpříznivější pro proces) do %d (nejméně příznivé pro proces).\n" + +#: src/nice.c:82 +msgid " -n, --adjustment=N add integer N to the niceness (default 10)\n" +msgstr "" +" -n, --adjustment=N k hodnotě nice přičte celé číslo N (výchozí je 10)\n" -#: src/nice.c:168 +#: src/nice.c:172 #, c-format msgid "invalid adjustment %s" msgstr "neplatná úprava %s" -#: src/nice.c:177 +#: src/nice.c:181 #, c-format msgid "a command must be given with an adjustment" msgstr "příkaz musí být zadán s číslem upravujícím hodnotu nice" -#: src/nice.c:184 src/nice.c:195 +#: src/nice.c:188 src/nice.c:199 #, c-format msgid "cannot get niceness" msgstr "hodnotu nice nelze získat" -#: src/nice.c:201 +#: src/nice.c:205 #, c-format msgid "cannot set niceness" msgstr "hodnotu nice nelze nastavit" @@ -6519,18 +6537,16 @@ msgstr "hodnotu nice nelze nastavit" msgid "Scott Bartram" msgstr "Scott Bartram" -#: src/nl.c:186 +#: src/nl.c:179 msgid "" "Write each FILE to standard output, with line numbers added.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" "Přepíše každý SOUBOR na standardní výstup a ke každému řádku přidá jeho\n" "číslo. Jestliže SOUBOR nebude zadán nebo bude „-“, bude čten standardní " "vstup.\n" -"\n" -#: src/nl.c:194 +#: src/nl.c:186 msgid "" " -b, --body-numbering=STYLE use STYLE for numbering body lines\n" " -d, --section-delimiter=CC use CC for separating logical pages\n" @@ -6540,7 +6556,7 @@ msgstr "" " -d, --section-delimiter=CC použije CC pro oddělení logických stránek\n" " -f, --footer-numbering=STYL použije STYL k číslování řádků v patičce\n" -#: src/nl.c:199 +#: src/nl.c:191 msgid "" " -h, --header-numbering=STYLE use STYLE for numbering header lines\n" " -i, --line-increment=NUMBER line number increment at each line\n" @@ -6560,7 +6576,7 @@ msgstr "" " -s, --number-separator=ŘETĚZEC přidá ŘETĚZEC za číslo řádku (oddělovač\n" " čísla od dalšího řádku)\n" -#: src/nl.c:207 +#: src/nl.c:199 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" @@ -6570,7 +6586,7 @@ msgstr "" "stránce\n" " -w, --number-width=POČET čísla řádků vypisuje na POČET míst\n" -#: src/nl.c:213 +#: src/nl.c:205 msgid "" "\n" "By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC are\n" @@ -6583,7 +6599,7 @@ msgstr "" "druhý znak, použije se „:“. Pro zadání „\\“ je třeba napsat „\\\\“.\n" "STYL je jeden z:\n" -#: src/nl.c:219 +#: src/nl.c:211 msgid "" "\n" " a number all lines\n" @@ -6613,53 +6629,47 @@ msgstr "" " rz zarovnává vpravo s úvodními nulami\n" "\n" -#: src/nl.c:286 +#: src/nl.c:278 #, c-format msgid "line number overflow" msgstr "číslo řádku přeteklo" -#: src/nl.c:486 +#: src/nl.c:478 #, c-format msgid "invalid header numbering style: %s" msgstr "chybný styl číslování v hlavičce: %s" -#: src/nl.c:494 +#: src/nl.c:486 #, c-format msgid "invalid body numbering style: %s" msgstr "chybný styl číslování v těle: %s" -#: src/nl.c:502 +#: src/nl.c:494 #, c-format msgid "invalid footer numbering style: %s" msgstr "chybný styl číslování v patičce: %s" -#: src/nl.c:511 +#: src/nl.c:503 #, c-format msgid "invalid starting line number: %s" msgstr "chybné počáteční číslo řádku: %s" -#: src/nl.c:517 -#, c-format -msgid "WARNING: --page-increment is deprecated; use --line-increment instead" -msgstr "" -"VAROVÁNÍ: přepínač --page-increment je zastaralý, použijte --line-increment" - -#: src/nl.c:524 +#: src/nl.c:512 #, c-format msgid "invalid line number increment: %s" msgstr "chybná hodnota přírůstku čísla řádku: %s" -#: src/nl.c:536 +#: src/nl.c:524 #, c-format msgid "invalid number of blank lines: %s" msgstr "chybný počet prázdných řádků: %s" -#: src/nl.c:550 +#: src/nl.c:538 #, c-format msgid "invalid line number field width: %s" msgstr "chybná šířka čísla řádku: %s" -#: src/nl.c:569 +#: src/nl.c:557 #, c-format msgid "invalid line numbering format: %s" msgstr "chybný formát čísla řádku: %s" @@ -6706,11 +6716,6 @@ msgstr "přesměrování standardního vstupu do nepoužitelna selhalo" msgid "ignoring input" msgstr "ignoruji vstup" -#: src/nohup.c:163 src/nohup.c:165 -#, c-format -msgid "failed to open %s" -msgstr "otevření %s selhalo" - #: src/nohup.c:175 #, c-format msgid "ignoring input and appending output to %s" @@ -6742,16 +6747,16 @@ msgid "failed to redirect standard error" msgstr "přesměrování standardního chybové výstupu selhalo" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:32 +#: src/nproc.c:33 msgid "Giuseppe Scrivano" msgstr "Giuseppe Scrivano" -#: src/nproc.c:56 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 +#: src/nproc.c:57 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Použití: %s [PŘEPÍNAČ]…\n" -#: src/nproc.c:57 +#: src/nproc.c:58 msgid "" "Print the number of processing units available to the current process,\n" "which may be less than the number of online processors\n" @@ -6761,7 +6766,7 @@ msgstr "" "což může být méně než počet zapojených procesorů.\n" "\n" -#: src/nproc.c:62 +#: src/nproc.c:63 msgid "" " --all print the number of installed processors\n" " --ignore=N if possible, exclude N processing units\n" @@ -6769,11 +6774,431 @@ msgstr "" " --all vypíše počet nainstalovaných procesorů\n" " --ignore=N je-li možno, vynechá N výpočetních jednotek\n" -#: src/nproc.c:106 +#: src/nproc.c:107 #, c-format 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 +msgid "Assaf Gordon" +msgstr "Assaf Gordon" + +#: src/numfmt.c:676 +#, c-format +msgid "value too large to be converted: '%s'" +msgstr "hodnota je pro převod příliš velká: „%s“" + +#: src/numfmt.c:680 +#, c-format +msgid "invalid number: '%s'" +msgstr "neplatné číslo: „%s“" + +#: src/numfmt.c:684 +#, c-format +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 +#, c-format +msgid "invalid suffix in input: '%s'" +msgstr "neplatná přípona na vstupu: „%s“" + +#: src/numfmt.c:692 +#, 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)" + +#: src/numfmt.c:723 +#, 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 +#, c-format +msgid "invalid unit size: '%s'" +msgstr "chybná 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 +#, c-format +msgid "Usage: %s [OPTION]... [NUMBER]...\n" +msgstr "Použití: %s [PŘEPÍNAČ]… [ČÍSLO]…\n" + +#: src/numfmt.c:816 +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 +msgid " --debug print warnings about invalid input\n" +msgstr " --debug vypisuje varování při neplatném vstupu\n" + +#: src/numfmt.c:823 +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 +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 +msgid "" +" --format=FORMAT use printf style floating-point FORMAT;\n" +" see FORMAT below for details\n" +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 +msgid "" +" --from=UNIT auto-scale input numbers to UNITs; default is " +"'none';\n" +" see UNIT below\n" +msgstr "" +" --from=JEDNOTKA\n" +" automaticky přeškáluje vstupní čísla na JEDNOTKY.\n" +" Výchozí je „none“ (žádná). Vizte JEDNOTKY níže.\n" + +#: src/numfmt.c:837 +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 +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 sdruží číslice do skupin podle locale, např. " +"1 000 000\n" +" (což znamená, že nemá smysl v locale C či POSIX)\n" + +#: src/numfmt.c:844 +msgid "" +" --header[=N] print (without converting) the first N header lines;\n" +" N defaults to 1 if not specified\n" +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 +msgid "" +" --invalid=MODE failure mode for invalid numbers: MODE can be:\n" +" abort (default), fail, warn, ignore\n" +msgstr "" +" --invalid=MÓD způsob selhání při neplatných číslech: MÓD může být:\n" +" abort (přerušit, výchozí), fail (selhat),\n" +" warn (varovat), ignore (ignorovat).\n" + +#: src/numfmt.c:852 +msgid "" +" --padding=N pad the output to N characters; positive N will\n" +" right-align; negative N will left-align;\n" +" padding is ignored if the output is wider than N;\n" +" the default is to automatically pad if a " +"whitespace\n" +" is found\n" +msgstr "" +" --padding=N vyplní výstup na N znaků. Kladné N zarovná zprava,\n" +" záporné N zarovná zleva. Je-li výstup širší než N,\n" +" výplň se ignoruje. Výchozí je automatická výplň,\n" +" je-li nalezeno bílé místo.\n" + +#: src/numfmt.c:859 +msgid "" +" --round=METHOD use METHOD for rounding when scaling; METHOD can be:\n" +" up, down, from-zero (default), towards-zero, " +"nearest\n" +msgstr "" +" --round=METODA zaokrouhlovací metoda použitá při škálování. METODA\n" +" může být: up (nahoru), down (dolů),\n" +" from-zero (z nuly, výchozí), towards-zero (k nule),\n" +" nearest (nejbližší)\n" + +#: src/numfmt.c:863 +msgid "" +" --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" +" SUFFIX in input numbers\n" +msgstr "" +" --suffix=PŘÍPONA\n" +" přidá k výstupním číslům PŘÍPONU a přijímá " +"volitelnou\n" +" PŘÍPONU u vstupních čísel\n" + +#: src/numfmt.c:867 +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 +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 +msgid "" +"\n" +"UNIT options:\n" +msgstr "" +"\n" +"JEDNOTKY:\n" + +#: src/numfmt.c:880 +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 +msgid "" +" auto accept optional single/two letter suffix:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" +msgstr "" +" auto přijímá se volitelná jedno- nebo dvoupísmenná přípona:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" + +#: src/numfmt.c:889 +msgid "" +" si accept optional single letter suffix:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ...\n" +msgstr "" +" si přijímá se volitelná jednopísmenná přípona:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ⋮\n" + +#: src/numfmt.c:894 +msgid "" +" iec accept optional single letter suffix:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ...\n" +msgstr "" +" iec přijímá se volitelná jednopísmenná přípona:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ⋮\n" + +#: src/numfmt.c:899 +msgid "" +" iec-i accept optional two-letter suffix:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ...\n" +msgstr "" +" iec-i přijímá se volitelná dvoupísmenná přípona:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ⋮\n" + +#: src/numfmt.c:905 +#, 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" +msgstr "" +"\n" +"FORMÁT musí být vhodný pro zobrazení jednoho argumentu s plovoucí " +"desetinnou\n" +"čá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" + +#: src/numfmt.c:912 +#, c-format +msgid "" +"\n" +"Exit status is 0 if all input numbers were successfully converted.\n" +"By default, %s will stop at the first conversion error with exit status 2.\n" +"With --invalid='fail' a warning is printed for each conversion error\n" +"and the exit status is 2. With --invalid='warn' each conversion error is\n" +"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" +"Návratová hodnota je 0, jestliže všechna čísla byla úspěšně převedena.\n" +"Standardně %s se zastaví na první konverzní chybě a vrátí kód 2.\n" +"S přepínačem --invalid='fail' se u každé chyby vypíše varování a návratový\n" +"kód bude 2. S přepínačem --invalid='warn' bude každá chyba rovněž ohlášena,\n" +"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 +#, c-format +msgid "" +"\n" +"Examples:\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" +msgstr "" +"\n" +"Příklady:\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 +#, c-format +msgid "format %s has no %% directive" +msgstr "formát %s nemá žádnou direktivu %%" + +#: src/numfmt.c:990 +#, c-format +msgid "invalid format %s (width overflow)" +msgstr "neplatný formát %s (šířka přetekla)" + +#: src/numfmt.c:1007 src/seq.c:229 +#, c-format +msgid "format %s ends in %%" +msgstr "formát %s končí na %%" + +#: src/numfmt.c:1010 +#, c-format +msgid "invalid format %s, directive must be %%['][-][N]f" +msgstr "neplatný formát %s, řídicí posloupnost musí být %%['][-][N]" + +#: src/numfmt.c:1018 src/seq.c:236 +#, c-format +msgid "format %s has too many %% directives" +msgstr "formát %s má příliš mnoho direktiv %%" + +#: src/numfmt.c:1070 +#, c-format +msgid "invalid suffix in input '%s': '%s'" +msgstr "neplatná přípona na vstupu „%s“: „%s“" + +#: src/numfmt.c:1092 +#, 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 +#, 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 +#, c-format +msgid "large input value '%s': possible precision loss" +msgstr "velká vstupní hodnota „%s“: hrozí ztráta přesnosti" + +#: src/numfmt.c:1293 +#, 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 +#, c-format +msgid "invalid padding value '%s'" +msgstr "chybný hodnota výplně „%s“" + +#: src/numfmt.c:1401 +#, c-format +msgid "invalid field value '%s'" +msgstr "chybná hodnota položky „%s“" + +#: src/numfmt.c:1430 +#, c-format +msgid "invalid header value '%s'" +msgstr "chybné hodnota hlavičky „%s“" + +#: src/numfmt.c:1456 +#, 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 +#, c-format +msgid "no conversion option specified" +msgstr "nezadán žádný přepínač konverze" + +#: src/numfmt.c:1471 +#, 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 +#, 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 +#, 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 +#, c-format +msgid "error reading input" +msgstr "chyba při čtení vstupu" + +#: src/numfmt.c:1520 +#, 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 #, c-format msgid "" @@ -6805,41 +7230,60 @@ msgstr "" "\n" #: src/od.c:307 -msgid "All arguments to long options are mandatory for short options.\n" +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" +"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" +"at first byte printed, incremented when dump is progressing.\n" +"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 "" -"Všechny argumenty dlouhých přepínačů jsou povinné i pro jejich\n" -"krátké varianty.\n" +"Pokud je současně použit první i druhý způsob zápisu formátu, druhý formát\n" +"má přednost, pokud poslední operand začíná na „+“ nebo (existují-li dva\n" +"operandy) na číslici. Operand POSUN značí -j POSUN. NÁVĚŠTÍ je pseudoadresa\n" +"vypsaná u prvního bajtu a zvětšovaná během výpisu. POSUN a NÁVĚŠTÍ jsou\n" +"brána jako šestnáctková čísla, pokud začínají 0x nebo 0X. Pokud čísla končí\n" +"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:310 +#: src/od.c:318 msgid "" -" -A, --address-radix=RADIX decide how file offsets are printed\n" +" -A, --address-radix=RADIX output format for file offsets. RADIX is one\n" +" of [doxn], for Decimal, Octal, Hex or None\n" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" -" -A, --address-radix=ZÁKLAD pozici v souboru vypisuje v zadané soustavě\n" +" -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" " -j, --skip-bytes=POČET přeskočí prvních POČET bajtů ze vstupu\n" -#: src/od.c:314 +#: src/od.c:323 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" -" --traditional accept arguments in traditional form\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=POČET vypíše pouze POČET bajtů ze vstupu\n" " -S POČET, --strings[=POČET]\n" " vypíše pouze řetězce obsahující nejméně POČET\n" -" grafických znaků\n" +" grafických znaků (výchozí je 3)\n" " -t, --format=TYP vybere výstupní formát nebo formáty\n" " -v, --output-duplicates potlačené řádky neoznačuje „*“\n" -" -w[POČET], --width[=POČET] vypíše POČET bajtů na výstupní řádek\n" +" -w[POČET], --width[=POČET] vypíše POČET bajtů na výstupní řádek (výchozí\n" +" je 32)\n" " --traditional přijímá argumenty v před-POSIXOVÉM tvaru\n" -#: src/od.c:324 +#: src/od.c:336 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" @@ -6847,13 +7291,14 @@ msgid "" " -d same as -t u2, select unsigned decimal 2-byte units\n" msgstr "" "\n" +"\n" "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" " -d stejné jako -t u2, desítková bez znaménka (dvoubajtová)\n" -#: src/od.c:332 +#: src/od.c:345 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -6869,40 +7314,21 @@ msgstr "" " -s stejné jako -t d2, desítková (dvoubajtová)\n" " -x stejné jako -t x2, šestnáctková (dvoubajtová)\n" -#: src/od.c:340 +#: src/od.c:353 msgid "" "\n" -"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" -"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" -"at first byte printed, incremented when dump is progressing.\n" -"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" -"Pokud je současně použit první i druhý způsob zápisu formátu, druhý formát\n" -"má přednost, pokud poslední operand začíná na „+“ nebo (existují-li dva\n" -"operandy) na číslici. Operand POSUN značí -j POSUN. NÁVĚŠTÍ je pseudoadresa\n" -"vypsaná u prvního bajtu a zvětšovaná během výpisu. POSUN a NÁVĚŠTÍ jsou\n" -"brána jako šestnáctková čísla, pokud začínají 0x nebo 0X. Pokud čísla končí\n" -"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:349 -msgid "" "\n" "TYPE is made up of one or more of these specifications:\n" -"\n" " a named character, ignoring high-order bit\n" " c ASCII character or backslash escape\n" msgstr "" "\n" -"TYP je tvořen z jedné nebo více těchto možností:\n" "\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" +"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" -#: src/od.c:356 +#: src/od.c:360 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -6910,16 +7336,16 @@ msgid "" " u[SIZE] unsigned decimal, SIZE bytes per integer\n" " x[SIZE] hexadecimal, SIZE bytes per integer\n" msgstr "" -" d[BAJTŮ] desítkové se znaménkem s počtem BAJTŮ na číslo\n" -" f[BAJTŮ] s plovoucí řádovou čárkou s počtem BAJTŮ na číslo\n" -" o[BAJTŮ] osmičkové s počtem BAJTŮ na číslo\n" -" 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" +" d[BAJTŮ] desítkové se znaménkem s počtem BAJTŮ na číslo\n" +" f[BAJTŮ] s plovoucí řádovou čárkou s počtem BAJTŮ na číslo\n" +" o[BAJTŮ] osmičkové s počtem BAJTŮ na číslo\n" +" 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:363 +#: src/od.c:367 msgid "" "\n" -"SIZE is a number. For TYPE in doux, SIZE may also be C for\n" +"SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" "sizeof(char), S for sizeof(short), I for sizeof(int) or L for\n" "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" @@ -6930,41 +7356,45 @@ 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:370 +#: src/od.c:374 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" +"Adding a z suffix to any type displays printable characters at the end of\n" +"each output line.\n" msgstr "" "\n" -"ZÁKLAD je d pro desítkové, o pro osmičkové, x pro šestnáctkové nebo n pro " -"žádné.\n" -"POČET je brán jako šestnáctkové číslo, začíná-li 0x nebo 0X, a smí mít\n" -"násobné přípony: 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" -"Přidání přípony „z“ k libovolnému typu způsobí vypsání tisknutelných znaků\n" -"na konci každého výstupního řádku.\n" +"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:380 +#: src/od.c:379 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" +"\n" +"BYTES is hex with 0x or 0X prefix, and may have a multiplier suffix:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"and so on for G, T, P, E, Z, Y.\n" msgstr "" -"Přepínač --string bez zadaného čísla je brán jako 3. Přepínač --width bez\n" -"čísla je brán jako 32. Implicitní jsou tyto hodnoty: -A o -t oS -w16.\n" +"\n" +"\n" +"POČET s předponou 0x nebo 0X je šestnáctkové číslo a smí mít násobnou " +"příponu:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"a tak dále pro G, T, P, E, Z, Y.\n" -#: src/od.c:633 src/od.c:753 +#: src/od.c:639 src/od.c:759 #, c-format msgid "invalid type string %s" msgstr "chybný typ řetězce %s" -#: src/od.c:643 +#: src/od.c:649 #, c-format msgid "" "invalid type string %s;\n" @@ -6973,7 +7403,7 @@ msgstr "" "chybný typ řetězce %s;\n" "tento systém nemá %lubajtová celá čísla" -#: src/od.c:764 +#: src/od.c:770 #, c-format msgid "" "invalid type string %s;\n" @@ -6982,37 +7412,37 @@ msgstr "" "chybný typ řetězce %s;\n" "tento systém nemá %lubajtová čísla s plovoucí řádovou čárkou" -#: src/od.c:822 +#: src/od.c:828 #, c-format msgid "invalid character '%c' in type string %s" msgstr "znak „%c“ v řetězci typu „%s“ je chybný" -#: src/od.c:1047 +#: src/od.c:1053 #, 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:1603 +#: src/od.c:1609 #, 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:1729 +#: src/od.c:1735 #, c-format msgid "no type may be specified when dumping strings" msgstr "při vypisování řetězců nelze zadat typ" -#: src/od.c:1804 +#: src/od.c:1810 msgid "compatibility mode supports at most one file" msgstr "kompatibilní mód podporuje nejvýše jeden soubor" -#: src/od.c:1825 +#: src/od.c:1831 #, 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:1868 +#: src/od.c:1874 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "varování: chybná šířka %lu; užívám %d místo ní" @@ -7032,14 +7462,12 @@ 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" -"\n" msgstr "" "Vypíše řádky skládající se z řádků jednotlivých SOUBORŮ v zadaném pořadí\n" "a oddělených tabelátory na standardní výstup. Jestliže SOUBOR nebude zadán\n" "nebo bude „-“, bude čten standardní vstup.\n" -"\n" -#: src/paste.c:448 +#: 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" @@ -7048,7 +7476,7 @@ msgstr "" " (místo tabelátorů)\n" " -s, --serial vypíše soubory za sebou místo vedle sebe\n" -#: src/paste.c:509 +#: src/paste.c:508 #, c-format msgid "delimiter list ends with an unescaped backslash: %s" msgstr "Seznam oddělovačů končí na neošetřené zpětné lomítko: %s" @@ -7109,80 +7537,80 @@ msgid "Kaveh Ghazi" msgstr "Kaveh Ghazi" #. TRANSLATORS: Real name is unknown; at most 19 characters. -#: src/pinky.c:250 +#: src/pinky.c:242 msgid " ???" msgstr " ???" #. TRANSLATORS: Idle time is unknown; at most 5 characters. -#: src/pinky.c:274 +#: src/pinky.c:266 msgid "?????" msgstr "?????" -#: src/pinky.c:323 +#: src/pinky.c:314 #, c-format msgid "Login name: " msgstr "Přihlašovací jméno: " -#: src/pinky.c:326 +#: src/pinky.c:317 #, c-format msgid "In real life: " msgstr "Občanské jméno: " #. TRANSLATORS: Real name is unknown; no hard limit. -#: src/pinky.c:330 +#: src/pinky.c:321 msgid "???\n" msgstr "???\n" -#: src/pinky.c:350 +#: src/pinky.c:341 #, c-format msgid "Directory: " msgstr "Adresář: " -#: src/pinky.c:352 +#: src/pinky.c:343 #, c-format msgid "Shell: " msgstr "Shell: " -#: src/pinky.c:371 +#: src/pinky.c:362 #, c-format msgid "Project: " msgstr "Projekt: " -#: src/pinky.c:395 +#: src/pinky.c:386 #, c-format msgid "Plan:\n" msgstr "Plán:\n" -#: src/pinky.c:414 +#: src/pinky.c:405 msgid "Login" msgstr "Login" -#: src/pinky.c:416 +#: src/pinky.c:407 msgid "Name" msgstr "Jméno" -#: src/pinky.c:417 +#: src/pinky.c:408 msgid " TTY" msgstr " TTY" -#: src/pinky.c:419 +#: src/pinky.c:410 msgid "Idle" msgstr "Prostoj" -#: src/pinky.c:420 +#: src/pinky.c:411 msgid "When" msgstr "Kdy" -#: src/pinky.c:423 +#: src/pinky.c:414 msgid "Where" msgstr "Odkud" -#: src/pinky.c:502 +#: src/pinky.c:493 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Použití: %s [PŘEPÍNAČ]… [UŽIVATEL]…\n" -#: src/pinky.c:503 +#: src/pinky.c:494 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7198,7 +7626,7 @@ msgstr "" " -p nevypisuje plán v dlouhém formátu\n" " -s krátký výstupní formát (implicitní)\n" -#: src/pinky.c:511 +#: src/pinky.c:502 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7211,7 +7639,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:520 +#: src/pinky.c:511 #, c-format msgid "" "\n" @@ -7222,7 +7650,7 @@ msgstr "" "Odlehčený program „finger“; vypisuje údaje o uživateli.\n" "Utmp soubor bude %s.\n" -#: src/pinky.c:604 +#: src/pinky.c:595 #, 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" @@ -7237,86 +7665,82 @@ msgstr "Pete TerMaat" msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:912 +#: src/pr.c:908 #, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "„--pages=PRVNÍ_STRÁNKA[:POSLEDNÍ_STRÁNKA]“ postrádá argument" -#: src/pr.c:914 +#: src/pr.c:910 #, c-format msgid "invalid page range %s" msgstr "chybný rozsah stran %s" -#: src/pr.c:979 +#: src/pr.c:975 #, c-format msgid "'-l PAGE_LENGTH' invalid number of lines: %s" msgstr "„-l DÉLKA_STRÁNKY“ chybný počet řádků: %s" -#: src/pr.c:1003 +#: src/pr.c:999 #, c-format msgid "'-N NUMBER' invalid starting line number: %s" msgstr "„-N ČÍSLO“ chybné číslo počátečního řádku: %s" -#: src/pr.c:1015 +#: src/pr.c:1011 #, c-format msgid "'-o MARGIN' invalid line offset: %s" msgstr "„-o OKRAJ“ chybný posun řádku: %s" -#: src/pr.c:1056 +#: src/pr.c:1052 #, c-format msgid "'-w PAGE_WIDTH' invalid number of characters: %s" msgstr "„-w ŠÍŘKA_STRÁNKY“ chybný počet znaků: %s" -#: src/pr.c:1070 +#: src/pr.c:1066 #, c-format msgid "'-W PAGE_WIDTH' invalid number of characters: %s" msgstr "„-W ŠÍŘKA_STRÁNKY“ chybný počet znaků: %s" -#: src/pr.c:1100 +#: src/pr.c:1096 #, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "při výpisu vedle sebe, není možné zadat počet sloupců" # wzdluz? - rzm -#: src/pr.c:1104 +#: src/pr.c:1100 #, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "není možné zadat výpis souborů po sobě i vedle sebe" -#: src/pr.c:1200 +#: src/pr.c:1196 #, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "„-%c“ nadbytečné znaky nebo špatné číslo v argumentu: %s" -#: src/pr.c:1304 +#: src/pr.c:1293 #, c-format msgid "page width too narrow" msgstr "šířka stránky je příliš malá" -#: src/pr.c:2369 +#: src/pr.c:2353 #, c-format msgid "starting page number %<PRIuMAX> exceeds page count %<PRIuMAX>" msgstr "číslo počáteční stránka %<PRIuMAX> přesahuje počet stránek %<PRIuMAX>" -#: src/pr.c:2396 +#: src/pr.c:2380 #, c-format msgid "page number overflow" msgstr "číslo stránky přeteklo" -#: src/pr.c:2401 +#: src/pr.c:2385 #, c-format msgid "Page %<PRIuMAX>" msgstr "Stránka %<PRIuMAX>" -#: src/pr.c:2773 -msgid "" -"Paginate or columnate FILE(s) for printing.\n" -"\n" -msgstr "" -"Rozvrhne SOUBOR(Y) pro tisk na stránky nebo sloupce.\n" -"\n" +#: src/pr.c:2757 +msgid "Paginate or columnate FILE(s) for printing.\n" +msgstr "Rozvrhne SOUBOR(Y) pro tisk na stránky nebo sloupce.\n" -#: src/pr.c:2780 +#: src/pr.c:2763 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -7334,7 +7758,7 @@ msgstr "" " na stránku do sloupců, pokud není použit přepínač -a.\n" " Také se snaží vyrovnat počet řádků ve sloupcích\n" -#: src/pr.c:2788 +#: src/pr.c:2771 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7351,7 +7775,7 @@ msgstr "" " -d, --double-space\n" " za každý řádek vloží jeden prázdný\n" -#: src/pr.c:2796 +#: src/pr.c:2779 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7371,7 +7795,7 @@ msgstr "" " k oddělení stránek (a 3řádkovou hlavičku stránky při -F\n" " nebo 5řádkovou hlavičku s patičkou bez -F).\n" -#: src/pr.c:2806 +#: src/pr.c:2789 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -7392,7 +7816,7 @@ msgstr "" " zruší zarovnání sloupců, --sep-string[=ŘETĚZEC]\n" " nastavuje oddělovače\n" -#: src/pr.c:2815 +#: src/pr.c:2798 msgid "" " -l, --length=PAGE_LENGTH\n" " set the page length to PAGE_LENGTH (66) lines\n" @@ -7407,7 +7831,7 @@ msgstr "" " zkracuje řádky, ale spolu s přepínačem -J vypisuje plné\n" " řádky celé\n" -#: src/pr.c:2822 +#: src/pr.c:2805 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -7424,7 +7848,7 @@ msgstr "" " začne počítání číslem ČÍSLO prvního řádku první\n" " vypisované stránky (vizte +PRVNÍ_STRÁNKA)\n" -#: src/pr.c:2830 +#: src/pr.c:2813 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -7439,7 +7863,7 @@ msgstr "" " -r, --no-file-warnings\n" " potlačí varování, když soubor nemůže být otevřen\n" -#: src/pr.c:2837 +#: src/pr.c:2820 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -7456,7 +7880,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:2844 +#: src/pr.c:2827 msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" @@ -7472,7 +7896,7 @@ msgstr "" " neovlivňuje parametry sloupců.\n" " -t, --omit-header nevypisuje hlavičky a patičky stránek\n" -#: src/pr.c:2851 +#: src/pr.c:2834 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -7496,7 +7920,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:2861 +#: src/pr.c:2844 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -7509,7 +7933,7 @@ msgstr "" " když není zadán přepínač -J, zkracuje řádky;\n" " neovlivňuje -S nebo -s.\n" -#: src/pr.c:2869 +#: src/pr.c:2852 msgid "" "\n" "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" @@ -7673,12 +8097,10 @@ msgstr "" msgid "" "Output a permuted index, including context, of the words in the input " "files.\n" -"\n" msgstr "" "Vypíše permutovaný rejstřík, včetně kontextu, slov ze vstupních souborů\n" -"\n" -#: src/ptx.c:1828 +#: src/ptx.c:1827 msgid "" " -A, --auto-reference output automatically generated references\n" " -G, --traditional behave more like System V 'ptx'\n" @@ -7690,7 +8112,7 @@ msgstr "" " -F, --flag-truncation=ŘETĚZEC použije ŘETĚZEC pro určení zkracování " "řádků\n" -#: src/ptx.c:1833 +#: src/ptx.c:1832 msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" " -O, --format=roff generate output as roff directives\n" @@ -7704,7 +8126,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:1840 +#: src/ptx.c:1839 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -7723,7 +8145,7 @@ msgstr "" " ze SOUBORU\n" " -o, --only-file=SOUBOR přečtení seznamu slov pouze ze SOUBORU\n" -#: src/ptx.c:1848 +#: src/ptx.c:1847 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -7734,7 +8156,7 @@ msgstr "" " -t, --typeset-mode – neimplementováno –\n" " -w, --width=ČÍSLO šířka výstupu ve sloupcích, bez odkazů\n" -#: src/ptx.c:1855 +#: src/ptx.c:1854 msgid "" "\n" "With no FILE or if FILE is -, read Standard Input. '-F /' by default.\n" @@ -7743,7 +8165,7 @@ msgstr "" "Jestliže není SOUBOR zadán nebo je „-“, bude čten standardní vstup.\n" "Implicitní přepínače: „-F /“\n" -#: src/ptx.c:1949 +#: src/ptx.c:1948 #, c-format msgid "invalid gap width: %s" msgstr "chybné šířka mezery: %s" @@ -7770,7 +8192,7 @@ msgstr "" 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/pwd.c:170 src/pwd.c:277 src/split.c:373 #, c-format msgid "failed to stat %s" msgstr "nelze získat informace o %s" @@ -7786,14 +8208,15 @@ msgid "ignoring non-option arguments" msgstr "ignoruji argumenty, které nejsou přepínači" #. This is a proper name. See the gettext manual, section Names. -#: src/readlink.c:33 +#: src/readlink.c:32 msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 +#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147 +#: src/stat.c:1349 src/touch.c:212 #, c-format -msgid "Usage: %s [OPTION]... FILE\n" -msgstr "Použití: %s [PŘEPÍNAČ]… SOUBOR\n" +msgid "Usage: %s [OPTION]... FILE...\n" +msgstr "Použití: %s [PŘEPÍNAČ]… SOUBOR…\n" #: src/readlink.c:63 msgid "" @@ -7830,10 +8253,12 @@ msgid "" "recursively,\n" " without requirements on components " "existence\n" -" -n, --no-newline do not output the trailing newline\n" +" -n, --no-newline do not output the trailing delimiter\n" " -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" 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" @@ -7843,12 +8268,12 @@ 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" -#: src/realpath.c:71 src/rm.c:134 src/shred.c:147 src/stat.c:1330 -#: src/touch.c:215 +#: src/readlink.c:152 #, c-format -msgid "Usage: %s [OPTION]... FILE...\n" -msgstr "Použití: %s [PŘEPÍNAČ]… SOUBOR…\n" +msgid "ignoring --no-newline with multiple arguments" +msgstr "s více argumenty se přepínač --no-newline ignoruje" #: src/realpath.c:72 msgid "" @@ -7892,12 +8317,12 @@ msgstr "" msgid "generating relative path" msgstr "tvorba relativní cesty" -#: src/remove.c:286 +#: src/remove.c:273 #, c-format msgid "%s: descend into write-protected directory %s? " msgstr "%s: sestoupit do proti zápisu chráněného adresáře %s?" -#: src/remove.c:287 +#: src/remove.c:274 #, c-format msgid "%s: descend into directory %s? " msgstr "%s: sestoupit do adresáře %s?" @@ -7906,37 +8331,37 @@ msgstr "%s: sestoupit do adresáře %s?" #. translate "%s: remove %s (write-protected) %s? " #. instead. It should avoid grammatical problems #. with the output of file_type. -#: src/remove.c:303 +#: src/remove.c:290 #, c-format msgid "%s: remove write-protected %s %s? " msgstr "%s: smazat proti zápisu chráněný %s %s? " -#: src/remove.c:304 +#: src/remove.c:291 #, c-format msgid "%s: remove %s %s? " msgstr "%s: smazat %s %s? " -#: src/remove.c:417 +#: src/remove.c:374 #, c-format msgid "removed directory: %s\n" msgstr "smazán adresář: %s\n" -#: src/remove.c:481 +#: src/remove.c:444 #, c-format msgid "cannot remove directory: %s" msgstr "adresář nelze smazat: %s" -#: src/remove.c:537 +#: src/remove.c:500 #, 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í" -#: src/remove.c:557 +#: src/remove.c:520 #, c-format msgid "traversal failed: %s" msgstr "průchod se nezdařil: %s" -#: src/remove.c:563 +#: src/remove.c:526 #, c-format msgid "" "unexpected failure: fts_info=%d: %s\n" @@ -7945,12 +8370,12 @@ msgstr "" "neočekávané selhání: fts_info=%d: %s\n" "prosím, podejte hlášení (anglicky) na %s" -#: src/rm.c:118 +#: src/rm.c:119 #, c-format msgid "Try '%s ./%s' to remove the file %s.\n" msgstr "Pro odstranění %3$s zkuste „%1$s ./%2$s“.\n" -#: src/rm.c:135 +#: src/rm.c:136 msgid "" "Remove (unlink) the FILE(s).\n" "\n" @@ -7964,7 +8389,7 @@ msgstr "" " neptá\n" " -i, ptá se před každým smazáním\n" -#: src/rm.c:141 +#: src/rm.c:142 msgid "" " -I prompt once before removing more than three files, " "or\n" @@ -7983,7 +8408,7 @@ msgstr "" "I)\n" " nebo „always“ (vždy, -i). Bez KDY se ptá vždy.\n" -#: src/rm.c:148 +#: src/rm.c:149 msgid "" " --one-file-system when removing a hierarchy recursively, skip any\n" " directory that is on a file system different from\n" @@ -7995,20 +8420,22 @@ msgstr "" " na jiném souborovém systému než příslušný argument\n" " z příkazové řádky\n" -#: src/rm.c:153 +#: src/rm.c:154 msgid "" " --no-preserve-root do not treat '/' specially\n" " --preserve-root do not remove '/' (default)\n" " -r, -R, --recursive remove directories and their contents recursively\n" +" -d, --dir remove empty directories\n" " -v, --verbose explain what is being done\n" msgstr "" " --no-preserve-root\n" " s „/“ nezachází zvláštně\n" " --preserve-root nemaže „/“ (výchozí)\n" " -r, -R, --recursive maže adresáře a jejich obsah rekurzivně\n" +" -d, --dir maže prázdné adresáře\n" " -v, --verbose vypisuje, co je prováděno\n" -#: src/rm.c:161 +#: src/rm.c:163 msgid "" "\n" "By default, rm does not remove directories. Use the --recursive (-r or -R)\n" @@ -8019,7 +8446,7 @@ msgstr "" "Implicitně rm nemaže adresáře. Pro smazání každého zadaného adresáře včetně\n" "jeho obsahu použijte --recursive (-r nebo -R).\n" -#: src/rm.c:166 +#: src/rm.c:168 #, c-format msgid "" "\n" @@ -8036,7 +8463,7 @@ msgstr "" "\n" " %s ./-foo\n" -#: src/rm.c:175 +#: src/rm.c:177 msgid "" "\n" "Note that if you use rm to remove a file, it might be possible to recover\n" @@ -8049,12 +8476,12 @@ msgstr "" "souboru. Jestliže chcete větší jistotu, že obsah nepůjde obnovit, zvažte\n" "použití nástroje „shred“.\n" -#: src/rm.c:335 +#: src/rm.c:342 #, c-format msgid "%s: remove all arguments recursively? " msgstr "%s: smazat všechny argumenty rekurzivně? " -#: src/rm.c:336 +#: src/rm.c:343 #, c-format msgid "%s: remove all arguments? " msgstr "%s: smazat všechny argumenty? " @@ -8113,7 +8540,12 @@ msgstr "" msgid "" "Run a program in a different security context.\n" "With neither CONTEXT nor COMMAND, print the current security context.\n" -"\n" +msgstr "" +"Spustí program v jiném bezpečnostním kontextu.\n" +"Bez KONTEXTU a bez PŘÍKAZU vypíše současný bezpečnostní kontext.\n" + +#: src/runcon.c:94 +msgid "" " CONTEXT Complete security context\n" " -c, --compute compute process transition context before modifying\n" " -t, --type=TYPE type (for same role as parent)\n" @@ -8122,9 +8554,6 @@ msgid "" " -l, --range=RANGE levelrange\n" "\n" msgstr "" -"Spustí program v jiném bezpečnostním kontextu.\n" -"Bez KONTEXTU a bez PŘÍKAZU vypíše současný bezpečnostní kontext.\n" -"\n" " KONTEXT Úplný bezpečnostní kontext\n" " -c, --compute vypočte přechodový kontext procesu před úpravou\n" " -t, --type=DRUH druh (pro stejnou roli jako má rodič)\n" @@ -8133,72 +8562,72 @@ msgstr "" " -l, --range=ROZSAH rozsah úrovní\n" "\n" -#: src/runcon.c:140 +#: src/runcon.c:144 #, c-format msgid "multiple roles" msgstr "více rolí" -#: src/runcon.c:145 +#: src/runcon.c:149 #, c-format msgid "multiple types" msgstr "více druhů" -#: src/runcon.c:150 +#: src/runcon.c:154 #, c-format msgid "multiple users" msgstr "více uživatelů" -#: src/runcon.c:155 +#: src/runcon.c:159 #, c-format msgid "multiple levelranges" msgstr "více rozsahů úrovní" -#: src/runcon.c:173 src/runcon.c:209 +#: src/runcon.c:177 src/runcon.c:213 #, c-format msgid "failed to get current context" msgstr "selhalo získání současného kontextu" -#: src/runcon.c:183 +#: src/runcon.c:187 #, c-format msgid "you must specify -c, -t, -u, -l, -r, or context" msgstr "musíte zadat -c, -t, -u, -l, -r nebo kontext" -#: src/runcon.c:191 +#: src/runcon.c:195 #, c-format msgid "no command specified" msgstr "nebyl zadán žádný příkaz" -#: src/runcon.c:197 +#: src/runcon.c:201 #, 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:223 +#: src/runcon.c:227 #, c-format msgid "failed to compute a new context" msgstr "selhal výpočet nového kontextu" -#: src/runcon.c:237 +#: src/runcon.c:241 #, c-format msgid "failed to set new user %s" msgstr "selhalo nastavení nového uživatele %s" -#: src/runcon.c:239 +#: src/runcon.c:243 #, c-format msgid "failed to set new type %s" msgstr "selhalo nastavení nového druhu %s" -#: src/runcon.c:241 +#: src/runcon.c:245 #, c-format msgid "failed to set new range %s" msgstr "selhalo nastavení nového rozsahu %s" -#: src/runcon.c:243 +#: src/runcon.c:247 #, c-format msgid "failed to set new role %s" msgstr "selhalo nastavení nové role %s" -#: src/runcon.c:251 +#: src/runcon.c:255 #, c-format msgid "unable to set security context %s" msgstr "bezpečnostní kontext %s nelze nastavit" @@ -8215,21 +8644,21 @@ msgstr "" " nebo: %s [PŘEPÍNAČ]… PRVNÍ PŘÍRŮSTEK POSLEDNÍ\n" #: src/seq.c:73 +msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" +msgstr "Vypíše čísla od PRVNÍHO do POSLEDNÍHO s krokem PŘÍRŮSTEK.\n" + +#: src/seq.c:79 msgid "" -"Print numbers from FIRST to LAST, in steps of INCREMENT.\n" -"\n" " -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 "" -"Vypíše čísla od PRVNÍHO do POSLEDNÍHO s krokem PŘÍRŮSTEK.\n" -"\n" " -f, --format=FORMÁT použije printf FORMÁT pro výpis reálných čísel\n" " -s, --separator=ŘETĚZEC použije ŘETĚZEC k oddělení čísel (implicitně: " "\\n)\n" " -w, --equal-width srovná šířku zarovnáním úvodními nulami\n" -#: src/seq.c:82 +#: src/seq.c:86 msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" @@ -8245,7 +8674,7 @@ msgstr "" "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:90 +#: src/seq.c:94 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" @@ -8256,32 +8685,17 @@ msgstr "" "desítková čísla s pevnou řádovou čárkou s největší přesností PŘES, jinak " "„%g“.\n" -#: src/seq.c:136 +#: src/seq.c:140 #, c-format msgid "invalid floating point argument: %s" msgstr "chybný argument v pohyblivé řádové čárce: %s" -#: src/seq.c:193 -#, c-format -msgid "format %s has no %% directive" -msgstr "formát %s nemá žádnou direktivu %%" - -#: src/seq.c:210 -#, c-format -msgid "format %s ends in %%" -msgstr "formát %s končí na %%" - -#: src/seq.c:213 +#: src/seq.c:232 #, c-format msgid "format %s has unknown %%%c directive" msgstr "formát %s má neznámou direktivu %%%c" -#: src/seq.c:217 -#, c-format -msgid "format %s has too many %% directives" -msgstr "formát %s má příliš mnoho direktiv %%" - -#: src/seq.c:431 +#: src/seq.c:555 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" @@ -8324,27 +8738,27 @@ 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:163 +#: src/setuidgid.c:162 #, c-format msgid "unknown user-ID: %s" msgstr "neznámé ID uživatele: %s" -#: src/setuidgid.c:174 +#: 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:191 +#: src/setuidgid.c:190 #, c-format msgid "failed to set supplemental group(s)" msgstr "doplňkovou skupinu(y) nelze nastavit" -#: src/setuidgid.c:201 +#: src/setuidgid.c:200 #, c-format msgid "cannot set group-ID to %lu" msgstr "ID skupiny nelze nastavit na %lu" -#: src/setuidgid.c:205 +#: src/setuidgid.c:204 #, c-format msgid "cannot set user-ID to %lu" msgstr "ID uživatele nelze nastavit na %lu" @@ -8358,14 +8772,12 @@ msgstr "Colin Plumb" 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" -"\n" msgstr "" "Zadané SOUBORY opakovaně přepíše, čímž ztíží pokusy o obnovení jejich " "obsahu\n" "i za použití velmi drahého vybavení.\n" -"\n" -#: src/shred.c:156 +#: src/shred.c:155 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -8382,7 +8794,7 @@ msgstr "" " -s, --size=N aplikuje na toto množství bajtů (přípony jako K, M, G\n" " jsou možné)\n" -#: src/shred.c:162 +#: src/shred.c:161 msgid "" " -u, --remove truncate and remove file after overwriting\n" " -v, --verbose show progress\n" @@ -8396,7 +8808,7 @@ msgstr "" " implicitní pro ne-obyčejné soubory\n" " -z, --zero přidá poslední fázi přepisu nulami, aby zametl stopy\n" -#: src/shred.c:171 +#: src/shred.c:170 msgid "" "\n" "If FILE is -, shred standard output.\n" @@ -8415,7 +8827,7 @@ msgstr "" "soubory se obvykle nemažou. Pokud se pracuje nad obyčejným souborem,\n" "většina lidí volí přepínač --remove.\n" -#: src/shred.c:181 +#: src/shred.c:180 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" @@ -8434,7 +8846,7 @@ msgstr "" "těchto systémů:\n" "\n" -#: src/shred.c:189 +#: src/shred.c:188 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -8456,7 +8868,7 @@ msgstr "" "Network Appliance\n" "\n" -#: src/shred.c:199 +#: src/shred.c:198 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -8470,7 +8882,7 @@ msgstr "" "* komprimované souborové systémy\n" "\n" -#: src/shred.c:206 +#: src/shred.c:205 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" @@ -8492,7 +8904,7 @@ msgstr "" "(man mount).\n" "\n" -#: src/shred.c:216 +#: src/shred.c:215 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" @@ -8502,122 +8914,122 @@ msgstr "" "souboru, který nemůže být smazán, a tak umožňují pozdější obnovu\n" "skartovaných souborů.\n" -#: src/shred.c:296 +#: src/shred.c:295 #, c-format msgid "%s: fdatasync failed" msgstr "%s: fdatasync selhala" -#: src/shred.c:307 +#: src/shred.c:306 #, c-format msgid "%s: fsync failed" msgstr "%s: fsync selhala" -#: src/shred.c:384 +#: src/shred.c:383 #, c-format msgid "%s: cannot rewind" msgstr "%s: nelze převinout" -#: src/shred.c:403 +#: src/shred.c:402 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: průchod %lu/%lu (%s)…" -#: src/shred.c:453 +#: src/shred.c:452 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: chyba při zápisu na pozici %s" -#: src/shred.c:471 +#: src/shred.c:470 #, c-format msgid "%s: lseek failed" msgstr "%s: lseek selhala" -#: src/shred.c:482 +#: src/shred.c:481 #, c-format msgid "%s: file too large" msgstr "%s: soubor je příliš dlouhý" -#: src/shred.c:505 +#: src/shred.c:504 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: průchod %lu/%lu (%s)…%s" -#: src/shred.c:521 +#: src/shred.c:520 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: průchod %lu/%lu (%s)…%s/%s %d%%" -#: src/shred.c:768 +#: src/shred.c:767 #, c-format msgid "%s: fstat failed" msgstr "%s: fstat selhala" -#: src/shred.c:779 +#: src/shred.c:778 #, c-format msgid "%s: invalid file type" msgstr "%s: chybný typ souboru" -#: src/shred.c:798 +#: src/shred.c:797 #, c-format msgid "%s: file has negative size" msgstr "%s: soubor má zápornou velikost" -#: src/shred.c:865 +#: src/shred.c:864 src/sort.c:932 src/split.c:378 #, c-format msgid "%s: error truncating" msgstr "%s: chyba při zkracování souboru" -#: src/shred.c:881 +#: src/shred.c:880 #, c-format msgid "%s: fcntl failed" msgstr "%s: fcntl selhala" -#: src/shred.c:886 +#: src/shred.c:885 #, 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:968 +#: src/shred.c:967 #, c-format msgid "%s: removing" msgstr "%s: probíhá mazání" -#: src/shred.c:992 +#: src/shred.c:991 #, c-format msgid "%s: renamed to %s" msgstr "%s: přejmenováno na %s" -#: src/shred.c:1014 +#: src/shred.c:1013 #, c-format msgid "%s: failed to remove" msgstr "%s: mazání selhalo" -#: src/shred.c:1018 +#: src/shred.c:1017 #, c-format msgid "%s: removed" msgstr "%s: smazán" -#: src/shred.c:1025 src/shred.c:1068 +#: src/shred.c:1024 src/shred.c:1067 #, c-format msgid "%s: failed to close" msgstr "%s: uzavření selhalo" -#: src/shred.c:1061 +#: src/shred.c:1060 #, c-format msgid "%s: failed to open for writing" msgstr "%s: soubor nelze otevřít pro zápis" -#: src/shred.c:1126 +#: src/shred.c:1125 #, c-format msgid "%s: invalid number of passes" msgstr "%s: neplatný počet průchodů" -#: src/shred.c:1135 src/shuf.c:291 src/sort.c:4387 +#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441 #, c-format msgid "multiple random sources specified" msgstr "zadáno více zdrojů náhodných čísel" -#: src/shred.c:1149 +#: src/shred.c:1148 #, c-format msgid "%s: invalid file size" msgstr "%s: chybná velikost souboru" @@ -8634,14 +9046,10 @@ msgstr "" " nebo: %s -i DO-HO [PŘEPÍNAČ]…\n" #: src/shuf.c:54 -msgid "" -"Write a random permutation of the input lines to standard output.\n" -"\n" -msgstr "" -"Vypíše náhodnou permutaci vstupních řádků na standardní výstup.\n" -"\n" +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:61 +#: src/shuf.c:60 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 " @@ -8661,27 +9069,27 @@ msgstr "" " -z, --zero-terminated řádky zakončí bajtem 0 místo znakem nového " "řádku\n" -#: src/shuf.c:245 +#: src/shuf.c:244 #, c-format msgid "multiple -i options specified" msgstr "zadáno více přepínačů -i" -#: src/shuf.c:265 +#: src/shuf.c:264 #, c-format msgid "invalid input range %s" msgstr "neplatný vstupní rozsah %s" -#: src/shuf.c:278 +#: src/shuf.c:277 #, c-format msgid "invalid line count %s" msgstr "neplatný počet řádků %s" -#: src/shuf.c:285 src/sort.c:4381 +#: src/shuf.c:284 src/sort.c:4435 #, c-format msgid "multiple output files specified" msgstr "zadáno více výstupních souborů" -#: src/shuf.c:311 +#: src/shuf.c:310 #, c-format msgid "cannot combine -e and -i options" msgstr "přepínače -e a -i nelze kombinovat" @@ -8709,7 +9117,7 @@ msgstr "" "čekat po dobu danou součtem zadaných hodnot.\n" "\n" -#: src/sleep.c:135 src/timeout.c:295 +#: src/sleep.c:135 src/timeout.c:320 #, c-format msgid "invalid time interval %s" msgstr "chybné časový interval %s" @@ -8719,15 +9127,11 @@ msgstr "chybné časový interval %s" msgid "cannot read realtime clock" msgstr "z hodin reálného času nelze číst" -#: src/sort.c:395 -msgid "" -"Write sorted concatenation of all FILE(s) to standard output.\n" -"\n" -msgstr "" -"Vypíše seřazené zřetězení všech SOUBORŮ na standardní výstup.\n" -"\n" +#: src/sort.c:399 +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:402 +#: src/sort.c:405 msgid "" "Ordering options:\n" "\n" @@ -8735,7 +9139,7 @@ msgstr "" "Řadicí přepínače:\n" "\n" -#: src/sort.c:406 +#: src/sort.c:409 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -8746,7 +9150,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:412 +#: src/sort.c:415 msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" " -i, --ignore-nonprinting consider only printable characters\n" @@ -8757,14 +9161,14 @@ msgstr "" " -M, --month-sort porovnává podle měsíců\n" " (neznámý) < „LED“ < … < „PRO“\n" -#: src/sort.c:417 +#: src/sort.c:420 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:420 +#: src/sort.c:423 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -8776,7 +9180,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:426 +#: src/sort.c:429 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -8792,7 +9196,7 @@ msgstr "" " -V, --version-sort přirozené řazení (verzovacích) čísel v textu\n" "\n" -#: src/sort.c:434 +#: src/sort.c:437 msgid "" "Other options:\n" "\n" @@ -8800,7 +9204,7 @@ msgstr "" "Další přepínače:\n" "\n" -#: src/sort.c:438 +#: src/sort.c:441 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" @@ -8808,7 +9212,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:442 +#: src/sort.c:445 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 " @@ -8824,7 +9228,7 @@ msgstr "" " pomocné soubory komprimuje příkazem PROGRAM,\n" " dekomprimuje je pomocí PROGRAM -d\n" -#: src/sort.c:449 +#: src/sort.c:452 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -8839,7 +9243,7 @@ msgstr "" " Je-li S „-“, pak načte jména ze standardního " "vstupu\n" -#: src/sort.c:456 +#: src/sort.c:459 msgid "" " -k, --key=KEYDEF sort via a key; KEYDEF gives location and type\n" " -m, --merge merge already sorted files; do not sort\n" @@ -8848,7 +9252,7 @@ msgstr "" " a druh\n" " -m, --merge spojí již seřazené soubory, neřadí\n" -#: src/sort.c:460 +#: src/sort.c:463 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -8863,7 +9267,7 @@ msgstr "" " -S, --buffer-size=VELIKOST\n" " použije VELIKOST pro hlavní paměťový buffer\n" -#: src/sort.c:466 +#: src/sort.c:469 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -8888,12 +9292,12 @@ msgstr "" " -u, --unique s -c testuje striktní uspořádání;\n" " jinak vypíše pouze první ze stejných sekvencí\n" -#: src/sort.c:475 +#: 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:480 +#: src/sort.c:483 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -8924,7 +9328,7 @@ msgstr "" "\n" "VELIKOST smí být následována těmito násobnými příponami:\n" -#: src/sort.c:493 +#: src/sort.c:496 msgid "" "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n" "\n" @@ -8944,132 +9348,132 @@ 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:694 +#: src/sort.c:697 #, c-format msgid "waiting for %s [-d]" msgstr "čekám na %s [-d]" -#: src/sort.c:699 +#: src/sort.c:702 #, c-format msgid "%s [-d] terminated abnormally" msgstr "%s [-d] skončil neobvykle" -#: src/sort.c:853 +#: src/sort.c:856 #, c-format msgid "cannot create temporary file in %s" msgstr "v %s nelze vytvořit dočasný soubor" -#: src/sort.c:939 src/sort.c:2010 src/sort.c:3056 src/sort.c:3755 -#: src/sort.c:3758 +#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713 +#: src/sort.c:3804 src/sort.c:3807 msgid "open failed" msgstr "soubor se nepodařilo otevřít" -#: src/sort.c:959 +#: src/sort.c:970 msgid "fflush failed" msgstr "vyprázdnění souborového proudu selhalo" -#: src/sort.c:964 src/sort.c:2013 src/sort.c:4646 +#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706 msgid "close failed" msgstr "uzavření souboru selhalo" -#: src/sort.c:973 +#: src/sort.c:986 #, c-format msgid "dup2 failed" msgstr "volání dup2 selhalo" -#: src/sort.c:1090 +#: src/sort.c:1103 #, c-format msgid "couldn't execute %s" msgstr "nelze provést %s" -#: src/sort.c:1097 +#: src/sort.c:1110 msgid "couldn't create temporary file" msgstr "nelze vytvořit dočasný soubor" -#: src/sort.c:1136 +#: src/sort.c:1149 #, c-format msgid "couldn't create process for %s -d" msgstr "pro %s -d nelze založit proces" -#: src/sort.c:1150 +#: src/sort.c:1161 #, c-format msgid "couldn't execute %s -d" msgstr "nelze provést %s -d" -#: src/sort.c:1209 +#: src/sort.c:1220 #, c-format msgid "warning: cannot remove: %s" msgstr "varování: nelze smazat: %s" -#: src/sort.c:1295 +#: src/sort.c:1306 #, c-format msgid "invalid --%s argument %s" msgstr "argument %2$s za --%1$s je neplatný" -#: src/sort.c:1298 +#: src/sort.c:1309 #, c-format msgid "minimum --%s argument is %s" msgstr "minimální argument pro --%s je %s" -#: src/sort.c:1313 +#: src/sort.c:1324 #, c-format msgid "--%s argument %s too large" msgstr "argument %2$s za --%1$s je příliš velký" -#: src/sort.c:1316 +#: src/sort.c:1327 #, 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:1398 +#: src/sort.c:1409 #, c-format msgid "number in parallel must be nonzero" msgstr "číslo u --parallel nesmí být nulové" -#: src/sort.c:1479 +#: src/sort.c:1494 msgid "stat failed" msgstr "funkce stat selhala" -#: src/sort.c:1740 +#: src/sort.c:1755 msgid "read failed" msgstr "čtení ze souboru se nezdařilo" -#: src/sort.c:2028 +#: src/sort.c:2043 #, c-format msgid "string transformation failed" msgstr "převod řetězce selhal" -#: src/sort.c:2031 +#: src/sort.c:2046 #, c-format msgid "the untransformed string was %s" msgstr "nepřevedený řetězec byl %s" -#: src/sort.c:2194 +#: src/sort.c:2209 #, c-format msgid "^ no match for key\n" msgstr "^ žádná shoda klíče\n" -#: src/sort.c:2374 +#: src/sort.c:2389 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "použit zastaralý klíč %s, zvažte použití %s" -#: src/sort.c:2380 +#: src/sort.c:2395 #, 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:2391 +#: src/sort.c:2406 #, 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:2404 +#: src/sort.c:2419 #, 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:2436 +#: src/sort.c:2451 #, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" @@ -9077,131 +9481,133 @@ 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:2442 +#: src/sort.c:2457 #, 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:2716 src/sort.c:2725 +#: src/sort.c:2731 src/sort.c:2740 msgid "write failed" msgstr "zápis se nezdařil" -#: src/sort.c:2768 +#: src/sort.c:2783 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: neseřaditelný řádek: " -#: src/sort.c:2771 +#: src/sort.c:2786 msgid "standard error" msgstr "standardní chybový výstup" -#: src/sort.c:3926 +#: src/sort.c:3698 +msgid "cannot read" +msgstr "nelze číst" + +#: src/sort.c:3976 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: neplatné určení položky %s" -#: src/sort.c:3937 +#: src/sort.c:3987 #, c-format msgid "options '-%s' are incompatible" msgstr "přepínače „-%s“ nejsou slučitelné" -#: src/sort.c:3988 +#: src/sort.c:4038 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s: neplatné číslo na začátku %s" -#: src/sort.c:4245 +#: src/sort.c:4295 msgid "invalid number after '-'" msgstr "neplatné číslo za „-“" -#: src/sort.c:4248 src/sort.c:4334 src/sort.c:4362 +#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416 msgid "invalid number after '.'" msgstr "neplatné číslo za „.“" -#: src/sort.c:4261 src/sort.c:4367 +#: src/sort.c:4315 src/sort.c:4421 msgid "stray character in field spec" msgstr "zbloudilý znak v zadání řadicí položky" -#: src/sort.c:4308 +#: src/sort.c:4362 #, c-format msgid "multiple compress programs specified" msgstr "zadáno více kompresních programů" -#: src/sort.c:4325 +#: src/sort.c:4379 msgid "invalid number at field start" msgstr "neplatné číslo na začátku položky" -#: src/sort.c:4329 src/sort.c:4357 +#: src/sort.c:4383 src/sort.c:4411 msgid "field number is zero" msgstr "číslo položky je nula" -#: src/sort.c:4338 +#: src/sort.c:4392 msgid "character offset is zero" msgstr "posun znaku je nula" -#: src/sort.c:4353 +#: src/sort.c:4407 msgid "invalid number after ','" msgstr "neplatné číslo za „,“" -#: src/sort.c:4403 +#: src/sort.c:4457 #, c-format msgid "empty tab" msgstr "zvolený oddělovač položek je prázdný" -#: src/sort.c:4496 src/wc.c:692 +#: src/sort.c:4550 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:4518 +#: src/sort.c:4572 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s:%lu: neplatný název souboru s nulovou délkou" -#: src/sort.c:4524 +#: src/sort.c:4578 #, c-format msgid "no input from %s" msgstr "žádný vstup z %s" -#: src/sort.c:4570 +#: src/sort.c:4624 #, c-format msgid "using %s sorting rules" msgstr "použijí se řadicí pravidla %s" -#: src/sort.c:4573 +#: src/sort.c:4627 #, c-format msgid "using simple byte comparison" msgstr "použije se obyčejné porovnávání bajtů" -#: src/sort.c:4604 +#: src/sort.c:4658 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "další argument %s není s -%c dovolen" -#: src/split.c:184 +#: src/split.c:187 #, 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:201 +#: src/split.c:204 #, c-format msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" msgstr "Použití: %s [PŘEPÍNAČ]… [VSTUP [PŘEDPONA]]\n" -#: src/split.c:205 +#: src/split.c:208 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" -"\n" msgstr "" "Rozdělí VSTUP do souborů PŘEDPONAaa, PŘEDPONAab, … s pevnou délkou; výchozí\n" "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" -"\n" -#: src/split.c:214 +#: src/split.c:216 #, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" @@ -9241,7 +9647,7 @@ msgstr "" " -u, --unbuffered okamžitě kopíruje vstup na výstup spolu s „-n r/" "…“\n" -#: src/split.c:227 +#: src/split.c:229 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" @@ -9249,7 +9655,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:234 +#: src/split.c:236 msgid "" "\n" "CHUNKS may be:\n" @@ -9269,186 +9675,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:352 +#: src/split.c:354 #, c-format msgid "output file suffixes exhausted" msgstr "přípony výstupních souborů vyčerpány" -#: src/split.c:364 +#: src/split.c:366 #, c-format msgid "creating file %s\n" msgstr "vytvářím soubor %s\n" -#: src/split.c:377 +#: src/split.c:375 +#, c-format +msgid "%s would overwrite input; aborting" +msgstr "%s by přepsalo vstup; zpracování přerušeno" + +#: src/split.c:391 #, c-format msgid "failed to set FILE environment variable" msgstr "proměnnou prostředí FILE se nepodařilo nastavit" -#: src/split.c:379 +#: src/split.c:393 #, c-format msgid "executing with FILE=%s\n" msgstr "provádí se s FILE=%s\n" -#: src/split.c:381 +#: src/split.c:395 #, c-format msgid "failed to create pipe" msgstr "rouru nebylo možné vytvořit" -#: src/split.c:395 +#: src/split.c:409 #, c-format msgid "closing prior pipe" msgstr "zavírá se předchozí roura" -#: src/split.c:397 +#: src/split.c:411 #, c-format msgid "closing output pipe" msgstr "zavírá se výstupní roura" -#: src/split.c:401 +#: src/split.c:415 #, c-format msgid "moving input pipe" msgstr "přesunuje se vstupní roura" -#: src/split.c:403 +#: src/split.c:417 #, c-format msgid "closing input pipe" msgstr "zavírá se vstupní roura" -#: src/split.c:408 +#: src/split.c:422 #, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "selhalo spuštění příkazu: „%s -c %s“" -#: src/split.c:414 +#: src/split.c:428 #, c-format msgid "failed to close input pipe" msgstr "uzavření vstupní roury selhalo" -#: src/split.c:450 +#: src/split.c:464 #, c-format msgid "waiting for child process" msgstr "čeká se na proces potomka" -#: src/split.c:460 +#: src/split.c:474 #, 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:468 +#: src/split.c:482 #, 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:475 src/timeout.c:449 +#: src/split.c:489 src/timeout.c:494 #, c-format msgid "unknown status from command (0x%X)" msgstr "neznámý návratový kód příkazu (0x%X)" -#: src/split.c:1037 +#: src/split.c:1052 #, c-format msgid "cannot split in more than one way" msgstr "soubor nelze rozdělit více způsoby" -#: src/split.c:1050 src/split.c:1192 src/split.c:1363 +#: src/split.c:1065 src/split.c:1205 src/split.c:1376 #, c-format msgid "%s: invalid number of chunks" msgstr "%s: neplatný počet dílů" -#: src/split.c:1054 +#: src/split.c:1069 #, c-format msgid "%s: invalid chunk number" msgstr "%s: chybné číslo dílů" -#: src/split.c:1106 +#: src/split.c:1119 #, c-format msgid "%s: invalid suffix length" msgstr "%s: chybná délka přípony" -#: src/split.c:1131 src/split.c:1139 src/split.c:1162 src/split.c:1167 +#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180 #, c-format msgid "%s: invalid number of bytes" msgstr "%s: chybný počet bajtů" -#: src/split.c:1150 src/split.c:1297 +#: src/split.c:1163 src/split.c:1310 #, c-format msgid "%s: invalid number of lines" msgstr "%s: chybný počet řádků" -#: src/split.c:1223 +#: src/split.c:1236 #, 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:1235 +#: src/split.c:1248 #, c-format msgid "%s: invalid start value for numerical suffix" msgstr "%s: chybná počáteční hodnota číselné přípony" -#: src/split.c:1263 +#: src/split.c:1276 #, c-format msgid "%s: invalid IO block size" msgstr "%s: chybná velikost I/O bloku" -#: src/split.c:1284 +#: src/split.c:1297 #, 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:1321 +#: src/split.c:1334 #, 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:1356 +#: src/split.c:1369 #, 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:169 +#: src/stat.c:173 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:838 +#: src/stat.c:857 #, c-format msgid "failed to canonicalize %s" msgstr "normalizace %s selhala" -#: src/stat.c:1050 +#: src/stat.c:1069 #, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "pozor: neznámá escape sekvence „\\%c“" -#: src/stat.c:1105 +#: src/stat.c:1124 #, c-format msgid "%s: invalid directive" msgstr "%s: chybná specifikace" -#: src/stat.c:1151 +#: src/stat.c:1170 #, 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:1182 +#: src/stat.c:1201 #, 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:1189 +#: src/stat.c:1208 #, 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:1209 +#: src/stat.c:1228 #, 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:1245 +#: src/stat.c:1264 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -9464,7 +9875,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1268 +#: src/stat.c:1287 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -9474,30 +9885,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1278 +#: src/stat.c:1297 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:1286 +#: src/stat.c:1305 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:1295 +#: src/stat.c:1314 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:1305 +#: src/stat.c:1324 #, c-format msgid "Context: %C\n" msgstr " Kontext: %C\n" -#: src/stat.c:1313 +#: src/stat.c:1332 msgid "" "Access: %x\n" "Modify: %y\n" @@ -9509,20 +9920,20 @@ msgstr "" "Změna i-uzlu: %z\n" " Vznik: %w\n" -#: src/stat.c:1331 +#: src/stat.c:1350 +msgid "Display file or file system status.\n" +msgstr "Zobrazí informace o souboru nebo souborovém systému.\n" + +#: src/stat.c:1356 msgid "" -"Display file or file system status.\n" -"\n" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" -"Zobrazí informace o souboru nebo souborovém systému.\n" -"\n" " -L, --dereference následuje odkazy\n" " -f, --file-system zobrazí informace o souborovém systému místo " "o souboru\n" -#: src/stat.c:1337 +#: src/stat.c:1360 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -9539,7 +9950,7 @@ msgstr "" " přidejte do FORMÁTU „\\n“\n" " -t, --terse vytiskne informace ve stručné podobě\n" -#: src/stat.c:1348 +#: src/stat.c:1371 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -9559,7 +9970,7 @@ msgstr "" " %B velikost bloku z %b v bajtech\n" " %C řetězec selinuxového bezpečnostního kontextu\n" -#: src/stat.c:1357 +#: src/stat.c:1380 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -9575,7 +9986,7 @@ msgstr "" " %g ID skupiny vlastníka\n" " %G jméno skupiny vlastníka\n" -#: src/stat.c:1365 +#: src/stat.c:1388 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -9598,7 +10009,7 @@ msgstr "" " %t hlavní číslo zařízení šestnáctkově\n" " %T vedlejší číslo zařízení šestnáctkově\n" -#: src/stat.c:1376 +#: src/stat.c:1399 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -9625,7 +10036,7 @@ msgstr "" " %Z čas poslední změny i-uzlu v sekundách od počátku unixové epochy\n" "\n" -#: src/stat.c:1390 +#: src/stat.c:1413 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -9643,7 +10054,7 @@ msgstr "" " %d volných i-uzlů v systému souborů\n" " %f volných bloků v systému souborů\n" -#: src/stat.c:1399 +#: src/stat.c:1422 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -9669,12 +10080,10 @@ msgstr "Použití: %s PŘEPÍNAČ… PŘÍKAZ\n" #: src/stdbuf.c:91 msgid "" "Run COMMAND, with modified buffering operations for its standard streams.\n" -"\n" msgstr "" "Spustí PŘÍKAZ s pozměněnými bufferovacími operacemi standardních proudů.\n" -"\n" -#: src/stdbuf.c:98 +#: src/stdbuf.c:97 msgid "" " -i, --input=MODE adjust standard input stream buffering\n" " -o, --output=MODE adjust standard output stream buffering\n" @@ -9684,7 +10093,7 @@ msgstr "" " -o, --output=REŽIM přizpůsobí bufferování proudu standardního výstupu\n" " -e, --error=REŽIM přizpůsobí bufferování proudu chybového výstupu\n" -#: src/stdbuf.c:105 +#: src/stdbuf.c:104 msgid "" "\n" "If MODE is 'L' the corresponding stream will be line buffered.\n" @@ -9694,7 +10103,7 @@ msgstr "" "Je-li REŽIM „L“, bude odpovídající proud bufferován po řádcích.\n" "Tato možnost není pro standardní vstup platná.\n" -#: src/stdbuf.c:108 +#: src/stdbuf.c:107 msgid "" "\n" "If MODE is '0' the corresponding stream will be unbuffered.\n" @@ -9702,7 +10111,7 @@ msgstr "" "\n" "Je-li REŽIM „0“, odpovídající proud nebude bufferován.\n" -#: src/stdbuf.c:111 +#: src/stdbuf.c:110 msgid "" "\n" "Otherwise MODE is a number which may be followed by one of the following:\n" @@ -9718,7 +10127,7 @@ msgstr "" "o velikosti\n" "REŽIM bajtů.\n" -#: src/stdbuf.c:117 +#: src/stdbuf.c:116 msgid "" "\n" "NOTE: If COMMAND adjusts the buffering of its standard streams ('tee' does\n" @@ -9735,22 +10144,22 @@ msgstr "" "zpracování\n" "vstupu a výstupu proudy, a tudíž je nastavení „stdbuf“ nijak neovlivní.\n" -#: src/stdbuf.c:227 +#: src/stdbuf.c:226 #, c-format msgid "failed to find %s" msgstr "%s se nepodařilo nalézt" -#: src/stdbuf.c:247 src/stdbuf.c:279 +#: src/stdbuf.c:246 src/stdbuf.c:278 #, c-format msgid "failed to update the environment with %s" msgstr "aktualizace prostředí s %s se nezdařila" -#: src/stdbuf.c:321 +#: src/stdbuf.c:320 #, c-format msgid "line buffering stdin is meaningless" msgstr "bufferování po řádcích standardního vstupu nemá význam" -#: src/stty.c:509 +#: src/stty.c:513 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -9761,21 +10170,21 @@ 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:515 +#: src/stty.c:519 +msgid "Print or change terminal characteristics.\n" +msgstr "Vypíše nebo změní nastavení terminálu.\n" + +#: src/stty.c:525 msgid "" -"Print or change terminal characteristics.\n" -"\n" " -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 "" -"Vypíše nebo změní nastavení terminálu.\n" -"\n" " -a, --all vypíše všechna nastavení ve formě pro člověka čitelné\n" " -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:524 +#: src/stty.c:532 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -9786,7 +10195,7 @@ msgstr "" "nedefinované normou POSIX. Použitý systém určuje, která nastavení jsou " "možná.\n" -#: src/stty.c:529 +#: src/stty.c:537 msgid "" "\n" "Special characters:\n" @@ -9801,7 +10210,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:536 +#: src/stty.c:544 msgid "" " * eol2 CHAR alternate CHAR for ending the line\n" " erase CHAR CHAR will erase the last character typed\n" @@ -9813,7 +10222,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:542 +#: src/stty.c:550 msgid "" " * lnext CHAR CHAR will enter the next character quoted\n" " quit CHAR CHAR will send a quit signal\n" @@ -9825,7 +10234,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:548 +#: src/stty.c:556 msgid "" " stop CHAR CHAR will stop the output\n" " susp CHAR CHAR will send a terminal stop signal\n" @@ -9837,7 +10246,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:554 +#: src/stty.c:562 msgid "" "\n" "Special settings:\n" @@ -9851,7 +10260,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:561 +#: src/stty.c:569 msgid "" " ispeed N set the input speed to N\n" " * line N use line discipline N\n" @@ -9865,7 +10274,7 @@ msgstr "" " čtení\n" " ospeed N nastaví rychlost výstupu na N\n" -#: src/stty.c:567 +#: src/stty.c:575 msgid "" " * rows N tell the kernel that the terminal has N rows\n" " * size print the number of rows and columns according to the " @@ -9880,38 +10289,40 @@ msgstr "" "desetin\n" " sekundy\n" -#: src/stty.c:573 +#: src/stty.c:581 msgid "" "\n" "Control settings:\n" " [-]clocal disable modem control signals\n" " [-]cread allow input to be received\n" " * [-]crtscts enable RTS/CTS handshaking\n" +" * [-]cdtrdsr enable DTR/DSR handshaking\n" " csN set character size to N bits, N in [5..8]\n" msgstr "" "\n" "Nastavení řízení:\n" " [-]clocal zakáže signály pro řízení modemu\n" " [-]cread povolí příjem na vstupu\n" -" * [-]crtscts umožní „handshake“ (RTS/CTS)\n" +" * [-]crtscts umožní „handshake“ RTS/CTS\n" +" * [-]cdtrdsr umožní „handshake“ DTR/DSR\n" " csN nastaví velikost znaku na N bitů, N je 5–8\n" -#: src/stty.c:581 +#: src/stty.c:590 msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" " [-]hupcl same as [-]hup\n" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" -" [-]parodd set odd parity (even with '-')\n" +" [-]parodd set odd parity (or even parity with '-')\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 (sudou pomocí „-“)\n" +" [-]parodd nastaví lichou paritu (nebo sudou pomocí „-“)\n" -#: src/stty.c:588 +#: src/stty.c:597 msgid "" "\n" "Input settings:\n" @@ -9927,7 +10338,7 @@ msgstr "" " [-]ignbrk ignoruje znak break\n" " [-]igncr ignoruje znak CR (carriage return)\n" -#: src/stty.c:596 +#: src/stty.c:605 msgid "" " [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" @@ -9943,11 +10354,11 @@ msgstr "" " [-]inpck začne kontrolovat paritu na vstupu\n" " [-]istrip nuluje horní (8.) bit vstupních znaků\n" -#: src/stty.c:603 +#: src/stty.c:612 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:606 +#: src/stty.c:615 msgid "" " * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" @@ -9963,7 +10374,7 @@ msgstr "" " [-]parmrk označí chyby parity (sekvencí 255-0-znak)\n" " [-]tandem jako [-]ixoff\n" -#: src/stty.c:614 +#: src/stty.c:623 msgid "" "\n" "Output settings:\n" @@ -9979,7 +10390,7 @@ 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:622 +#: src/stty.c:631 msgid "" " * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of null characters\n" @@ -9995,7 +10406,7 @@ msgstr "" " * [-]onlcr překládá LF (newline) na CRLF (carriage return-newline)\n" " * [-]onlret LF (newline) provede CR (carriage return)\n" -#: src/stty.c:630 +#: src/stty.c:639 msgid "" " * [-]onocr do not print carriage returns in the first column\n" " [-]opost postprocess output\n" @@ -10011,7 +10422,7 @@ msgstr "" " * -tabs jako tab3\n" " * vtN způsob čekání na svislý tabelátor, N je 0–1\n" -#: src/stty.c:638 +#: src/stty.c:647 msgid "" "\n" "Local settings:\n" @@ -10026,7 +10437,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:645 +#: src/stty.c:654 msgid "" " * [-]ctlecho echo control characters in hat notation ('^c')\n" " [-]echo echo input characters\n" @@ -10040,7 +10451,7 @@ msgstr "" " [-]echoe jako [-]crterase\n" " [-]echok vypíše znak CR (newline) po znaku „kill“\n" -#: src/stty.c:652 +#: src/stty.c:661 msgid "" " * [-]echoke same as [-]crtkill\n" " [-]echonl echo newline even if not echoing other characters\n" @@ -10054,7 +10465,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:659 +#: src/stty.c:668 msgid "" " [-]isig enable interrupt, quit, and suspend special characters\n" " [-]noflsh disable flushing after interrupt and quit special " @@ -10073,7 +10484,7 @@ msgstr "" " * [-]xcase spolu s icanon použije escape sekvenci („\\“) pro velká " "písmena\n" -#: src/stty.c:666 +#: src/stty.c:675 msgid "" "\n" "Combination settings:\n" @@ -10087,7 +10498,7 @@ msgstr "" " cbreak jako -icanon\n" " -cbreak jako icanon\n" -#: src/stty.c:673 +#: src/stty.c:682 msgid "" " cooked same as brkint ignpar istrip icrnl ixon opost isig\n" " icanon, eof and eol characters to their default values\n" @@ -10101,7 +10512,7 @@ msgstr "" " -cooked jako raw\n" " crt jako echoe echoctl echoke\n" -#: src/stty.c:679 +#: src/stty.c:688 msgid "" " dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" " kill ^u\n" @@ -10115,7 +10526,7 @@ msgstr "" " ek znaky erase a kill vrátí na jejich implicitní hodnoty\n" " evenp jako parenb -parodd cs7\n" -#: src/stty.c:686 +#: src/stty.c:695 msgid "" " -evenp same as -parenb cs8\n" " * [-]lcase same as xcase iuclc olcuc\n" @@ -10131,7 +10542,7 @@ msgstr "" " nl jako -icrnl -onlcr\n" " -nl jako icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" -#: src/stty.c:694 +#: src/stty.c:703 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -10145,7 +10556,7 @@ msgstr "" " pass8 jako -parenb -istrip cs8\n" " -pass8 jako parenb istrip cs7\n" -#: src/stty.c:701 +#: src/stty.c:710 msgid "" " raw same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" " -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n" @@ -10157,7 +10568,7 @@ msgstr "" " -imaxbel -opost -isig -icanon -xcase min 1 time 0\n" " -raw jako cooked\n" -#: src/stty.c:707 +#: src/stty.c:716 msgid "" " sane same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" " -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n" @@ -10173,7 +10584,7 @@ msgstr "" " -xcase -tostop -echoprt echoctl echoke, všechny speciální\n" " znaky vrátí na jejich implicitní hodnoty\n" -#: src/stty.c:715 +#: src/stty.c:724 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -10188,12 +10599,12 @@ msgstr "" "127; speciální hodnoty ^- nebo „undef“ jsou použity pro zákaz speciálních\n" "znaků.\n" -#: src/stty.c:787 +#: src/stty.c:796 #, c-format msgid "only one device may be specified" msgstr "pouze jedno zařízení může být zadáno" -#: src/stty.c:817 +#: src/stty.c:826 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" @@ -10201,126 +10612,47 @@ msgid "" msgstr "" "přepínače pro upovídaný a stty čitelný styl výstupu se vzájemně vylučují" -#: src/stty.c:823 +#: src/stty.c:832 #, 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:838 +#: src/stty.c:847 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s: neblokovací mód souboru nelze zrušit" -#: src/stty.c:883 src/stty.c:993 +#: src/stty.c:892 src/stty.c:1002 #, c-format msgid "invalid argument %s" msgstr "argument %s je neplatný" -#: src/stty.c:894 src/stty.c:911 src/stty.c:923 src/stty.c:936 src/stty.c:948 -#: src/stty.c:968 +#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957 +#: src/stty.c:977 #, c-format msgid "missing argument to %s" msgstr "postrádám argument pro %s" -#: src/stty.c:974 +#: src/stty.c:983 #, c-format msgid "invalid line discipline %s" msgstr "chybná linková disciplína %s" -#: src/stty.c:1044 +#: src/stty.c:1053 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s: všechny požadované operace nelze provést" -#: src/stty.c:1390 +#: src/stty.c:1399 #, c-format msgid "%s: no size information for this device" msgstr "%s: pro toto zařízení neexistuje informace o velikosti" -#: src/stty.c:1904 +#: src/stty.c:1920 #, c-format msgid "invalid integer argument %s" msgstr "chybná celočíselný argument %s" -#: src/su.c:229 -msgid "Password:" -msgstr "Heslo:" - -#: src/su.c:232 -#, c-format -msgid "getpass: cannot open /dev/tty" -msgstr "getpass: /dev/tty nelze otevřít" - -#: src/su.c:290 -#, c-format -msgid "cannot set groups" -msgstr "nelze nastavit skupiny" - -#: src/su.c:294 -#, c-format -msgid "cannot set group id" -msgstr "nelze nastavit ID skupiny" - -#: src/su.c:296 -#, c-format -msgid "cannot set user id" -msgstr "nelze nastavit ID uživatele" - -#: src/su.c:371 -#, c-format -msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" -msgstr "Použití: %s [PŘEPÍNAČ]… [-] [UŽIVATEL [ARG]…]\n" - -#: src/su.c:372 -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 "" -"Mění efektivní číslo uživatele a skupiny na daného UŽIVATELE.\n" -"\n" -" -, -l, --login učiní shell přihlašovacím shellem\n" -" -c, --command=PŘÍKAZ předá jeden PŘÍKAZ shellu pomocí -c\n" -" -f, --fast předá shellu -f (pro csh nebo tcsh)\n" -" -m, --preserve-environment nemaže proměnné prostředí\n" -" -p jako -m\n" -" -s, --shell=SHELL použije SHELL (pokud to povoluje /etc/" -"shells)\n" - -#: src/su.c:384 -msgid "" -"\n" -"A mere - implies -l. If USER not given, assume root.\n" -msgstr "" -"\n" -"Je-li zadáno pouze „-“, znamená to „-l“. Pokud uživatel není zadán,\n" -"předpokládá se uživatel root.\n" - -#: src/su.c:461 -#, c-format -msgid "user %s does not exist" -msgstr "uživatel %s neexistuje" - -#: src/su.c:484 -#, c-format -msgid "incorrect password" -msgstr "chybné heslo" - -#: src/su.c:501 -#, c-format -msgid "using restricted shell %s" -msgstr "používán omezený (restricted) shell %s" - -#: src/su.c:509 -#, c-format -msgid "warning: cannot change directory to %s" -msgstr "varování: nelze vejít do adresáře %s" - #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 msgid "Kayvan Aghaiepour" @@ -10351,7 +10683,7 @@ msgstr "" msgid "ignoring all arguments" msgstr "ignoruji všechny argumenty" -#: src/system.h:340 +#: src/system.h:343 #, c-format msgid "" "\n" @@ -10364,15 +10696,24 @@ msgstr "" "obvykle přednost před verzí popsanou zde. Pro podrobnosti o podpoře\n" "jednotlivých přepínačů nahlédněte do dokumentace vašeho shellu.\n" -#: src/system.h:346 +#: src/system.h:349 msgid " --help display this help and exit\n" msgstr " --help vypíše tuto nápovědu a skončí\n" -#: src/system.h:348 +#: src/system.h:351 msgid " --version output version information and exit\n" msgstr " --version vypíše označení verze a skončí\n" -#: src/system.h:541 +#: src/system.h:544 +msgid "" +"\n" +"Mandatory arguments to long options are mandatory for short options too.\n" +msgstr "" +"\n" +"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 msgid "" "\n" "SIZE is an integer and optional unit (example: 10M is 10*1024*1024). Units\n" @@ -10384,7 +10725,7 @@ msgstr "" "10 * 1024 * 1024). Jednotky jsou K, M, G, T, P, E, Z, Y (násobky 1024) nebo\n" "KB, MB, … (násobky 1000).\n" -#: src/system.h:550 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -10398,7 +10739,7 @@ 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:560 +#: src/system.h:571 #, c-format msgid "" "\n" @@ -10411,25 +10752,25 @@ msgstr "" #. <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:574 +#: src/system.h:585 #, 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:578 +#: src/system.h:589 #, 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:585 +#: src/system.h:596 #, 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:617 +#: src/system.h:628 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -10453,13 +10794,11 @@ msgstr "Jay Lepreau" msgid "" "Write each FILE to standard output, last line first.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" "Vypíše každý SOUBOR na standardní výstup. Poslední řádek jako první.\n" "Jestliže SOUBOR nebude zadán nebo bude „-“, bude čten standardní vstup.\n" -"\n" -#: src/tac.c:145 +#: src/tac.c:144 msgid "" " -b, --before attach the separator before instead of after\n" " -r, --regex interpret the separator as a regular expression\n" @@ -10470,42 +10809,42 @@ msgstr "" " -s, --separator=ŘETĚZEC použije ŘETĚZCE jako oddělovače místo nového " "řádku\n" -#: src/tac.c:235 src/tac.c:336 +#: src/tac.c:234 src/tac.c:335 #, c-format msgid "%s: seek failed" msgstr "%s: pohyb v souboru selhal" -#: src/tac.c:264 +#: src/tac.c:263 #, c-format msgid "record too large" msgstr "záznam je příliš dlouhý" -#: src/tac.c:451 +#: src/tac.c:450 #, c-format msgid "failed to create temporary file in %s" msgstr "vytvoření dočasného souboru v %s se nezdařilo" -#: src/tac.c:459 +#: src/tac.c:458 #, c-format msgid "failed to open %s for writing" msgstr "soubor %s se nepodařilo se otevřít pro zápis" -#: src/tac.c:476 +#: src/tac.c:475 #, c-format msgid "failed to rewind stream for %s" msgstr "selhalo převinutí proudu souboru %s" -#: src/tac.c:512 src/tac.c:519 +#: src/tac.c:511 src/tac.c:518 #, c-format msgid "%s: write error" msgstr "%s: chyba při zápisu" -#: src/tac.c:572 +#: src/tac.c:571 #, c-format msgid "failed to open %s for reading" msgstr "otevření %s pro čtení selhalo" -#: src/tac.c:630 +#: src/tac.c:629 #, c-format msgid "separator cannot be empty" msgstr "oddělovač nemůže být prázdný" @@ -10521,15 +10860,13 @@ 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" -"\n" msgstr "" "Vypíše posledních %d řádků každého souboru na standardní výstup. S více jak\n" "jedním SOUBOREM bude před vypsáním každého uvedena hlavička obsahující jeho\n" "jméno. Jestliže SOUBOR nebude zadán nebo bude „-“, bude čten standardní " "vstup.\n" -"\n" -#: src/tail.c:271 +#: src/tail.c:270 msgid "" " -c, --bytes=K output the last K bytes; alternatively, use -c " "+K\n" @@ -10541,7 +10878,7 @@ msgstr "" "z každého\n" " souboru\n" -#: src/tail.c:275 +#: src/tail.c:274 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -10556,7 +10893,7 @@ msgstr "" " -f, --follow a --follow=descriptor jsou stejné\n" " -F stejné jako --follow=name --retry\n" -#: src/tail.c:282 +#: src/tail.c:281 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -10582,7 +10919,7 @@ msgstr "" "tento přepínač\n" " nemá valného smyslu.\n" -#: src/tail.c:295 +#: src/tail.c:294 msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" " -q, --quiet, --silent never output headers giving file names\n" @@ -10596,7 +10933,7 @@ msgstr "" " nedostupný; vhodné při sledování podle jména,\n" " tj. s --follow=name\n" -#: src/tail.c:302 +#: src/tail.c:301 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations.\n" @@ -10609,7 +10946,7 @@ msgstr "" " kontroluje proces P alespoň jednou za N sekund.\n" " -v, --verbose vždy vypisuje záhlaví s názvy souborů\n" -#: src/tail.c:311 +#: src/tail.c:310 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -10627,7 +10964,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:320 +#: src/tail.c:319 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" @@ -10644,27 +10981,27 @@ 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:379 +#: src/tail.c:378 #, c-format msgid "closing %s (fd=%d)" msgstr "uzavírání %s (fd=%d)" -#: src/tail.c:454 +#: 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:458 +#: src/tail.c:457 #, 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:895 +#: src/tail.c:894 #, 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:907 +#: src/tail.c:906 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " @@ -10673,38 +11010,38 @@ 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:964 +#: src/tail.c:963 #, c-format msgid "%s has become inaccessible" msgstr "%s se stal nedostupným" -#: src/tail.c:981 +#: src/tail.c:980 #, 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:990 +#: src/tail.c:989 #, 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:1011 +#: src/tail.c:1010 #, c-format msgid "%s has become accessible" msgstr "%s se stal znovu dostupným" -#: src/tail.c:1019 +#: src/tail.c:1018 #, 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:1030 +#: src/tail.c:1029 #, 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:1131 +#: src/tail.c:1130 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: neblokující režim nelze změnit" @@ -11072,17 +11409,22 @@ msgstr "chybí „]“" msgid "extra argument %s" msgstr "nadbytečný argumentů %s" -#: src/timeout.c:124 +#: src/timeout.c:112 +#, c-format +msgid "warning: sigprocmask" +msgstr "pozor: sigprocmask" + +#: src/timeout.c:145 #, c-format msgid "warning: timer_settime" msgstr "pozor: timer_settime" -#: src/timeout.c:129 +#: src/timeout.c:150 #, c-format msgid "warning: timer_create" msgstr "pozor: timer_create" -#: src/timeout.c:204 +#: src/timeout.c:225 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -11091,19 +11433,15 @@ msgstr "" "Použití: %s [PŘEPÍNAČ] DOBA PŘÍKAZ [ARG]…\n" " nebo: %s [PŘEPÍNAČ]\n" -#: src/timeout.c:208 -msgid "" -"Start COMMAND, and kill it if still running after DURATION.\n" -"\n" -"Mandatory arguments to long options are mandatory for short options too.\n" -msgstr "" -"Spustí PŘÍKAZ a zabije jej, pokud poběží i po zadané DOBĚ.\n" -"\n" -"Povinné argumenty dlouhých přepínačů jsou také povinné u krátkých " -"přepínačů.\n" +#: src/timeout.c:229 +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:213 +#: src/timeout.c:235 msgid "" +" --preserve-status\n" +" exit with the same status as COMMAND, even when the\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 " @@ -11117,6 +11455,9 @@ msgid "" " 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" " --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" @@ -11130,7 +11471,7 @@ msgstr "" " 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:229 +#: src/timeout.c:254 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -11141,34 +11482,39 @@ 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:234 +#: src/timeout.c:259 msgid "" "\n" -"If the command times out, then exit with status 124. Otherwise, exit\n" -"with the status of COMMAND. If no signal is specified, send the TERM\n" -"signal upon timeout. The TERM signal kills any process that does not\n" -"block or catch that signal. For other processes, it may be necessary to\n" -"use the KILL (9) signal, since this signal cannot be caught. If the\n" -"KILL (9) signal is sent, the exit status is 128+9 rather than 124.\n" +"If the command times out, and --preserve-status is not set, then exit with\n" +"status 124. Otherwise, exit with the status of COMMAND. If no signal\n" +"is specified, send the TERM signal upon timeout. The TERM signal kills\n" +"any process that does not block or catch that signal. It may be necessary\n" +"to use the KILL (9) signal, since this signal cannot be caught, in which\n" +"case the exit status is 128+9 rather than 124.\n" msgstr "" "\n" -"Pokud příkazu vyprší časový limit, pak skončíme s kódem 124, jinak bude\n" -"vrácen návratový kód PŘÍKAZU. Nebyl-li zadán signál, bude po vypršení " -"limitu\n" -"zaslán signál TERM. Signál TERM má za následek zabití procesu, který tento\n" -"signál nezachytává nebo neblokuje. V opačném případě je nezbytné použít\n" -"signál KILL (9), neboť takový signál nelze zachytit. Je-li zaslán signál\n" -"KILL (9), návratový kód bude 128+9 místo 124.\n" +"Pokud příkazu vyprší časový limit a --preserve-status nebylo použito, pak\n" +"skončí s kódem 124. Jinak bude vrácen návratový kód PŘÍKAZU. Nebyl-li zadán\n" +"signál, bude po vypršení limitu zaslán signál TERM. Signál TERM má za\n" +"následek zabití procesu, který tento signál nezachytává nebo neblokuje.\n" +"V opačném případě je nezbytné použít signál KILL (9), neboť takový signál\n" +"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 +#, c-format +msgid "warning: disabling core dumps failed" +msgstr "pozor: nepodařilo se vypnout vytváření výpisů paměti" -#: src/timeout.c:419 +#: src/timeout.c:471 #, c-format msgid "error waiting for command" msgstr "chyba při čekání na příkaz" -#: src/timeout.c:441 +#: src/timeout.c:482 #, c-format -msgid "warning: disabling core dumps failed" -msgstr "pozor: nepodařilo se vypnout vytváření výpisů paměti" +msgid "the monitored command dumped core" +msgstr "sledovaný příkaz skončil uložením obrazu paměti" #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 @@ -11180,22 +11526,22 @@ msgstr "Jim Kingdon" msgid "Randy Smith" msgstr "Randy Smith" -#: src/touch.c:115 src/touch.c:313 +#: src/touch.c:115 src/touch.c:309 #, c-format msgid "invalid date format %s" msgstr "neplatný formát data %s" -#: src/touch.c:194 +#: src/touch.c:191 #, c-format msgid "cannot touch %s" msgstr "nelze se dotknout (provést příkaz „touch“) %s" -#: src/touch.c:200 +#: src/touch.c:197 #, c-format msgid "setting times of %s" msgstr "zachování časů souboru %s" -#: src/touch.c:216 +#: src/touch.c:213 msgid "" "Update the access and modification times of each FILE to the current time.\n" "\n" @@ -11204,7 +11550,6 @@ msgid "" "\n" "A FILE argument string of - is handled specially and causes touch to\n" "change the times of the file associated with standard output.\n" -"\n" msgstr "" "Nastaví čas posledního přístupu a poslední změny obsahu každého zadaného\n" "SOUBORU na aktuální čas.\n" @@ -11214,9 +11559,8 @@ msgstr "" "\n" "Argument SOUBOR s hodnotou „-“ bude ošetřen zvláštně: změna časů se dotkne\n" "souboru spojeného se standardním výstupem.\n" -"\n" -#: src/touch.c:229 +#: src/touch.c:225 msgid "" " -a change only the access time\n" " -c, --no-create do not create any files\n" @@ -11229,7 +11573,7 @@ msgstr "" "času\n" " -f (ignorován)\n" -#: src/touch.c:235 +#: src/touch.c:231 msgid "" " -h, --no-dereference affect each symbolic link instead of any " "referenced\n" @@ -11243,11 +11587,11 @@ msgstr "" " které mohou měnit časy symbolických odkazů)\n" " -m změní pouze čas poslední změny obsahu souboru\n" -#: src/touch.c:241 +#: src/touch.c:237 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" -" --time=WORD change the specified time:\n" +" --time=WORD change the specified time:\n" " WORD is access, atime, or use: equivalent to -a\n" " WORD is modify or mtime: equivalent to -m\n" msgstr "" @@ -11259,7 +11603,7 @@ msgstr "" " „access“, „atime“, „use“ (jako -a)\n" " „modify“, „mtime“ (jako -m)\n" -#: src/touch.c:250 +#: src/touch.c:246 msgid "" "\n" "Note that the -d and -t options accept different time-date formats.\n" @@ -11267,12 +11611,12 @@ msgstr "" "\n" "Vezměte na vědomí, že formáty časů pro přepínače -d a -t jsou různé.\n" -#: src/touch.c:339 +#: src/touch.c:335 #, c-format msgid "cannot specify times from more than one source" msgstr "čas nelze určit více jak jedním zdrojem" -#: src/touch.c:413 +#: src/touch.c:409 #, c-format msgid "" "warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'" @@ -11558,7 +11902,6 @@ msgid "" "If a FILE is larger than the specified size, the extra data is lost.\n" "If a FILE is shorter, it is extended and the extended part (hole)\n" "reads as zero bytes.\n" -"\n" msgstr "" "Zkrátí nebo prodlouží velikost každého SOUBORU na zadanou velikost.\n" "\n" @@ -11568,17 +11911,17 @@ msgstr "" "Je-li SOUBOR kratší, bude prodloužen a prodloužená část (díra) bude při\n" "čtení vypadat jako řada nulových bajtů.\n" -#: src/truncate.c:110 +#: src/truncate.c:109 msgid " -c, --no-create do not create any files\n" msgstr " -c, --no-create nevytváří žádné soubory\n" -#: src/truncate.c:113 +#: src/truncate.c:112 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" " -o, --io-blocks považuje VELIKOST za počet IO bloků namísto bajtů\n" -#: src/truncate.c:116 +#: 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" @@ -11586,7 +11929,7 @@ msgstr "" " -r, --reference=SOUBOR použije velikost tohoto SOUBORU\n" " -s, --size=VELIKOST použije tuto VELIKOST\n" -#: src/truncate.c:122 +#: src/truncate.c:121 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -11599,57 +11942,57 @@ msgstr "" "„+“ prodloužit o, „-“ zkrátit o, „<“ nejvíce, „>“ nejméně, „/“ zaokrouhlit\n" "dolů na násobek kolika, „%“ zaokrouhlit nahoru na násobek kolika.\n" -#: src/truncate.c:150 +#: src/truncate.c:149 #, c-format msgid "overflow in %<PRIdMAX> * %<PRIdMAX> byte blocks for file %s" msgstr "přetečení v %<PRIdMAX> * %<PRIdMAX> bajt bloků u souboru %s" -#: src/truncate.c:174 +#: src/truncate.c:173 #, c-format msgid "%s has unusable, apparently negative size" msgstr "%s má nepoužitelnou, zjevně zápornou velikost" -#: src/truncate.c:184 src/truncate.c:379 +#: src/truncate.c:183 src/truncate.c:384 #, c-format msgid "cannot get the size of %s" msgstr "velikost %s nelze zjistit" -#: src/truncate.c:206 +#: src/truncate.c:205 #, c-format msgid "overflow rounding up size of file %s" msgstr "přetečení při zaokrouhlování velikosti souboru %s nahoru" -#: src/truncate.c:216 +#: src/truncate.c:215 #, c-format msgid "overflow extending size of file %s" msgstr "přetečení při prodlužování velikosti souboru %s" -#: src/truncate.c:231 +#: src/truncate.c:230 #, c-format msgid "failed to truncate %s at %<PRIdMAX> bytes" msgstr "zkrácení %s na %<PRIdMAX> bajtů selhalo" -#: src/truncate.c:305 +#: src/truncate.c:303 #, c-format msgid "multiple relative modifiers specified" msgstr "zadáno více relativních modifikátorů" -#: src/truncate.c:335 +#: src/truncate.c:333 #, c-format msgid "you must specify either %s or %s" msgstr "musíte zadat buď %s, nebo %s" -#: src/truncate.c:342 +#: src/truncate.c:340 #, c-format msgid "you must specify a relative %s with %s" msgstr "musíte zadat relativní %s s %s" -#: src/truncate.c:349 +#: src/truncate.c:347 #, c-format msgid "%s was specified but %s was not" msgstr "bylo zadáno %s, ale nebylo %s" -#: src/truncate.c:400 +#: src/truncate.c:404 #, c-format msgid "cannot open %s for writing" msgstr "%s nelze otevřít pro zápis" @@ -11748,14 +12091,12 @@ msgstr "nelze zjistit název systému" msgid "" "Convert blanks in each FILE to tabs, writing to standard output.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" "V každém SOUBORU převádí mezery na tabelátory a výsledek vypisuje\n" "na standardní výstup. Nebude-li SOUBOR zadán nebo bude-li „-“, bude čten\n" "standardní vstup.\n" -"\n" -#: src/unexpand.c:125 +#: src/unexpand.c:124 msgid "" " -a, --all convert all blanks, instead of just initial blanks\n" " --first-only convert only leading sequences of blanks (overrides -a)\n" @@ -11768,12 +12109,12 @@ msgstr "" " -t, --tabs=SEZNAM použije čárkami oddělený seznam pro pozice tabelátorů\n" " (zapne -a)\n" -#: src/unexpand.c:153 +#: src/unexpand.c:152 #, c-format msgid "tabs are too far apart" msgstr "tabelátory od jsou od sebe příliš vzdálené" -#: src/unexpand.c:505 +#: src/unexpand.c:504 #, c-format msgid "tab stop value is too large" msgstr "velikost tabelátoru je příliš velká" @@ -11789,15 +12130,13 @@ msgid "" "writing to OUTPUT (or standard output).\n" "\n" "With no options, matching lines are merged to the first occurrence.\n" -"\n" msgstr "" "Ze VSTUPU (nebo standardního vstupu) filtruje sousedící shodné řádky\n" "a výsledek zapíše na VÝSTUP (nebo standardní výstup).\n" "\n" "Bez přepínačů zredukuje odpovídající řádky na první výskyt.\n" -"\n" -#: src/uniq.c:148 +#: src/uniq.c:147 msgid "" " -c, --count prefix lines by the number of occurrences\n" " -d, --repeated only print duplicate lines\n" @@ -11805,7 +12144,7 @@ msgstr "" " -c, --count před každý řádek vloží počet výskytů\n" " -d, --repeated vypisuje pouze opakující se řádky\n" -#: src/uniq.c:152 +#: src/uniq.c:151 msgid "" " -D, --all-repeated[=delimit-method] print all duplicate lines\n" " delimit-method={none(default),prepend,separate}\n" @@ -11830,12 +12169,12 @@ msgstr "" " řádky zakončuje nulovým bajtem, ne znakem nového " "řádku\n" -#: src/uniq.c:162 +#: src/uniq.c:161 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:167 +#: src/uniq.c:166 msgid "" "\n" "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n" @@ -11845,7 +12184,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:172 +#: src/uniq.c:171 msgid "" "\n" "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n" @@ -11857,25 +12196,25 @@ 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:359 +#: src/uniq.c:358 #, c-format msgid "too many repeated lines" msgstr "příliš mnoho opakujících se řádků" -#: src/uniq.c:522 +#: src/uniq.c:521 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:531 +#: src/uniq.c:530 msgid "invalid number of bytes to skip" msgstr "chybný počet bajtů na přeskočení" -#: src/uniq.c:540 +#: src/uniq.c:539 msgid "invalid number of bytes to compare" msgstr "chybný počet bajtů pro porovnání" -#: src/uniq.c:559 +#: src/uniq.c:558 #, 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" @@ -11928,6 +12267,11 @@ msgstr[0] "běží %ld den %2d:%02d, " msgstr[1] "běží %ld dny %2d:%02d, " msgstr[2] "běží %ld dnů %2d:%02d, " +#: src/uptime.c:149 +#, c-format +msgid "up %2d:%02d, " +msgstr "běží %2d:%02d, " + #: src/uptime.c:151 #, c-format msgid "%lu user" @@ -12029,39 +12373,39 @@ msgstr "" msgid " old " msgstr "starý" -#: src/who.c:449 +#: src/who.c:440 msgid "system boot" msgstr "start systému" -#: src/who.c:456 src/who.c:458 +#: src/who.c:447 src/who.c:449 msgid "id=" msgstr "id=" -#: src/who.c:471 src/who.c:476 +#: src/who.c:462 src/who.c:467 msgid "term=" msgstr "signál=" -#: src/who.c:473 src/who.c:477 +#: src/who.c:464 src/who.c:468 msgid "exit=" msgstr "návkód=" -#: src/who.c:494 +#: src/who.c:485 msgid "LOGIN" msgstr "LOGIN" -#: src/who.c:514 +#: src/who.c:505 msgid "clock change" msgstr "změna času" -#: src/who.c:526 src/who.c:527 +#: src/who.c:517 src/who.c:518 msgid "run-level" msgstr "úroveň běhu" -#: src/who.c:530 src/who.c:531 +#: src/who.c:521 src/who.c:522 msgid "last=" msgstr "minulá=" -#: src/who.c:562 +#: src/who.c:553 #, c-format msgid "" "\n" @@ -12072,44 +12416,44 @@ msgstr "" # FIXME: who.c:print_line() is not wide character aware. Striping non ASCII # chars. This bug has been reported to <bug-coreutils@gnu.org>. -#: src/who.c:568 +#: src/who.c:559 msgid "NAME" msgstr "JMENO" -#: src/who.c:568 +#: src/who.c:559 msgid "LINE" msgstr "TERMINAL" -#: src/who.c:568 +#: src/who.c:559 msgid "TIME" msgstr "CAS" -#: src/who.c:568 +#: src/who.c:559 msgid "IDLE" msgstr "ZAHALI" -#: src/who.c:569 +#: src/who.c:560 msgid "PID" msgstr "PID" -#: src/who.c:569 +#: src/who.c:560 msgid "COMMENT" msgstr "KOMENTAR" -#: src/who.c:569 +#: src/who.c:560 msgid "EXIT" msgstr "UKONCENI" -#: src/who.c:649 +#: src/who.c:640 #, c-format msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n" msgstr "Použití: %s [PŘEPÍNAČ]… [SOUBOR | ARG1 ARG2]\n" -#: src/who.c:650 +#: src/who.c:641 msgid "Print information about users who are currently logged in.\n" msgstr "Vypíše informace o právě přihlášených uživatelích.\n" -#: src/who.c:653 +#: src/who.c:644 msgid "" "\n" " -a, --all same as -b -d --login -p -r -t -T -u\n" @@ -12123,13 +12467,13 @@ msgstr "" " -d, --dead vypíše mrtvé procesy\n" " -H, --heading vypíše názvy jednotlivých sloupců\n" -#: src/who.c:660 +#: src/who.c:651 msgid " -l, --login print system login processes\n" msgstr "" " -l, --login vypíše procesy zajišťující přihlášení do systému " "(login)\n" -#: src/who.c:663 +#: src/who.c:654 msgid "" " --lookup attempt to canonicalize hostnames via DNS\n" " -m only hostname and user associated with stdin\n" @@ -12140,7 +12484,7 @@ msgstr "" "vstupu\n" " -p, --process vypíše aktivní procesy obnovené initem\n" -#: src/who.c:668 +#: src/who.c:659 msgid "" " -q, --count all login names and number of users logged on\n" " -r, --runlevel print current runlevel\n" @@ -12153,7 +12497,7 @@ msgstr "" " -s vypíše pouze jméno, terminál a čas (implicitní)\n" " -t, --time vypíše poslední změnu času\n" -#: src/who.c:674 +#: src/who.c:665 msgid "" " -T, -w, --mesg add user's message status as +, - or ?\n" " -u, --users list users logged in\n" @@ -12165,7 +12509,7 @@ msgstr "" " --message jako -T\n" " --writable jako -T\n" -#: src/who.c:682 +#: src/who.c:673 #, c-format msgid "" "\n" @@ -12209,13 +12553,398 @@ msgstr "" "Opakovaně vypisuje řádku se zadanými ŘETĚZCI nebo s „y“.\n" "\n" -#, fuzzy -#~ msgid " gid=%s" -#~ msgstr " gid=%lu" +#~ msgid "using single-precision arithmetic" +#~ msgstr "používám aritmetiku s jednoduchou přesností" + +#~ msgid "using arbitrary-precision arithmetic" +#~ msgstr "používám aritmetiku s libovolnou přesností" + +#~ msgid "" +#~ "simple_strtod_human:\n" +#~ " input string: '%s'\n" +#~ " locale decimal-point: '%s'\n" +#~ msgstr "" +#~ "simple_strtod_human:\n" +#~ " vstupní řetězec: „%s“\n" +#~ " desetinná čárka: „%s“\n" + +#~ msgid "" +#~ " parsed numeric value: %Lf\n" +#~ " input precision = %d\n" +#~ msgstr "" +#~ " získaná číselná hodnota: %Lf\n" +#~ " přesnost vstupu = %d\n" + +#~ msgid " Auto-scaling, found 'i', switching to base %d\n" +#~ msgstr " Automatické škálování, nalezeno „i“, přechod k základu %d\n" + +#~ msgid " suffix power=%d^%d = %Lf\n" +#~ msgstr " mocnina přípony=%d^%d = %Lf\n" + +#~ msgid " returning value: %Lf (%LG)\n" +#~ msgstr " vrácená hodnota: %Lf (%LG)\n" + +#~ msgid "double_to_human:\n" +#~ msgstr "double_to_human:\n" + +#~ msgid " no scaling, returning (grouped) value: %'.*Lf\n" +#~ msgstr " neškáluje se, vrácena (seskupená) hodnota: %'.*Lf\n" + +#~ msgid " no scaling, returning value: %.*Lf\n" +#~ msgstr " neškáluje se, vrácena hodnota: %.*Lf\n" + +#~ msgid " scaled value to %Lf * %0.f ^ %d\n" +#~ msgstr " hodnota zvětšena na %Lf * %0.f ^ %d\n" + +#~ msgid " after rounding, value=%Lf * %0.f ^ %d\n" +#~ msgstr " hodnota po zaokrouhlení = %Lf * %0.f ^ %d\n" + +#~ msgid " returning value: '%s'\n" +#~ msgstr " vrácená hodnota: „%s“\n" + +#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n" +#~ msgstr "Použití: %s [PŘEPÍNAČE] [ČÍSLO]\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=JEDNOTKA\n" +#~ " automaticky přeškáluje vstupní čísla na JEDNOTKY. " +#~ "Výchozí\n" +#~ " je „none“ (žádná). Vizte JEDNOTKY níže.\n" +#~ " --from-unit=N určuje velikost vstupní jednotky (místo výchozí 1).\n" +#~ " --to=JEDNOTKA automaticky přeškáluje výstupní čísla do JEDNOTEK.\n" +#~ " Vizte JEDNOTKY níže.\n" +#~ " --to-unit=N velikost výstupní jednotky (místo výchozí 1).\n" +#~ " --round=METODA zaokrouhlovací metoda použitá při škálování. METODA " +#~ "může být:\n" +#~ " up (nahoru), down (dolů), from-zero (z nuly, výchozí),\n" +#~ " towards-zero (k nule), nearest (nejbližší)\n" +#~ " --suffix=PŘÍPONA\n" +#~ " přidá k výstupním číslům PŘÍPONU a přijímá volitelnou\n" +#~ " PŘÍPONU u vstupních čísel.\n" +#~ " --padding=N vyplní výstup na N znaků.\n" +#~ " Kladné N zarovná zprava. Záporné N zarovná zleva.\n" +#~ " Poznámka: Je-li výstup širší než N, výplň se ignoruje.\n" +#~ " Výchozí je automatická výplň, je-li nalezeno bílé " +#~ "místo.\n" +#~ " --grouping seskupí číslice (například 1 000 000).\n" +#~ " Používá seskupování určené locale (t.j. nemá význam\n" +#~ " v locale C nebo POSIX).\n" +#~ " --header[=N] vypíše (bez převodu) prvních N řádků hlavičky.\n" +#~ " Výchozí hodnota N je 1, není-li zadána.\n" +#~ " --field N nahradí číslo ve vstupní položce N (výchozí je 1)\n" +#~ " -d, --delimiter=X\n" +#~ " jako oddělovač položek použije X namísto bílého místa\n" +#~ " --format=FORMÁT\n" +#~ " použije FORMÁT s plovoucí desetinou čárkou ve stylu " +#~ "printf.\n" +#~ " Pro podrobnosti vizte FORMÁT níže.\n" +#~ " --invalid=MÓD způsob selhání při neplatném čísle: MÓD může být:\n" +#~ " abort (přerušit, výchozí), fail (selhat), warn " +#~ "(varovat),\n" +#~ " ignore (ignorovat).\n" +#~ " --debug vypisuje varování při neplatném vstupu.\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" +#~ "JEDNOTKY:\n" +#~ " none Neprovádí se žádné škálování. Přípony vyvolají chybu.\n" +#~ " auto Přijímá se volitelná jedno- nebo dvoupísmenná přípona:\n" +#~ " 1K = 1000\n" +#~ " 1Ki = 1024\n" +#~ " 1M = 1000000\n" +#~ " 1Mi = 1048576\n" +#~ " si Přijímá se volitelná jednopísmenná přípona:\n" +#~ " 1K = 1000\n" +#~ " 1M = 1000000\n" +#~ " ⋮\n" +#~ " iec Přijímá se volitelná jednopísmenná přípona:\n" +#~ " 1K = 1024\n" +#~ " 1M = 1048576\n" +#~ " ⋮\n" +#~ " iec-i Přijímá se volitelná dvoupísmenná přípona:\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átovací řetězec:\n" +#~ " vstup: %s\n" +#~ " seskupování: %s\n" +#~ " šířka výplně: %ld\n" +#~ " zarovnání: %s\n" +#~ " předpona: „%s“\n" +#~ " přípona: „%s“\n" + +#~ msgid "" +#~ "formatting output:\n" +#~ " value: %Lf\n" +#~ " humanized: '%s'\n" +#~ msgstr "" +#~ "Formátování výstupu:\n" +#~ " hodnota: %Lf\n" +#~ " čitelná podoba: „%s“\n" + +#~ msgid " After padding: '%s'\n" +#~ msgstr " Po výplni: „%s“\n" + +#~ msgid "trimming suffix '%s'\n" +#~ msgstr "zkracuje se přípona „%s“\n" + +#~ msgid "no valid suffix found\n" +#~ msgstr "nenalezna žádná platná přípona\n" + +# TODO: pluralize +#~ msgid "setting Auto-Padding to %ld characters\n" +#~ msgstr "automatický výplň nastavena na %ld znaků\n" + +#~ msgid "" +#~ "extracting Fields:\n" +#~ " input: '%s'\n" +#~ " field: %d\n" +#~ msgstr "" +#~ "Získané položky:\n" +#~ " vstup: „%s“\n" +#~ " položka: %d\n" + +#~ msgid "" +#~ " TOO FEW FIELDS!\n" +#~ " prefix: '%s'\n" +#~ msgstr "" +#~ " PŘÍLIŠ MÁLO POLOŽEK!\n" +#~ " předpona: „%s“\n" + +#~ msgid "" +#~ " prefix: '%s'\n" +#~ " number: '%s'\n" +#~ " suffix: '%s'\n" +#~ msgstr "" +#~ " předpona: „%s“\n" +#~ " číslo: „%s“\n" +#~ " přípona: „%s“\n" + +#~ msgid "reading %s" +#~ msgstr "čtení %s" + +#~ msgid "writing %s" +#~ msgstr "zápis %s" + +#~ msgid "closing %s" +#~ msgstr "uzavírání %s" + +#~ msgid "accessing %s" +#~ msgstr "přistupuji k %s" + +#~ msgid "opening %s" +#~ msgstr "otevírám %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\n" +#~ " přeskočí adresáře na jiných souborových " +#~ "systémech\n" +#~ " -X, --exclude-from=SOUBOR\n" +#~ " přeskočí soubory, které vyhovují libovolnému\n" +#~ " výrazu ze souboru SOUBOR\n" +#~ " --exclude=VZOR přeskočí soubory vyhovující VZORU\n" +#~ " --max-depth=N vypíše celkové součty pouze pro adresáře (nebo\n" +#~ " soubory, pokud je uvedeno --all), do N. úrovně\n" +#~ " vzhledem k cestě na příkazovém řádku.\n" +#~ " Argument --max-depth=0 je rovnocenný se --" +#~ "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 záložní kopie nevytvářet (i když je zadán přepínač --" +#~ "backup)\n" +#~ " numbered, t číslované záložní kopie\n" +#~ " existing, nil číslované, jestliže již číslovaná záložní kopie " +#~ "existuje,\n" +#~ " jinak jednoduché\n" +#~ " simple, never jednoduché záložní kopie\n" +#~ "\n" + +#~ msgid "" +#~ "WARNING: --page-increment is deprecated; use --line-increment instead" +#~ msgstr "" +#~ "VAROVÁNÍ: přepínač --page-increment je zastaralý, použijte --line-" +#~ "increment" + +#~ msgid "All arguments to long options are mandatory for short options.\n" +#~ msgstr "" +#~ "Všechny argumenty dlouhých přepínačů jsou povinné i pro jejich\n" +#~ "krátké varianty.\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" +#~ "ZÁKLAD je d pro desítkové, o pro osmičkové, x pro šestnáctkové nebo n pro " +#~ "žádné.\n" +#~ "POČET je brán jako šestnáctkové číslo, začíná-li 0x nebo 0X, a smí mít\n" +#~ "násobné přípony: 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" +#~ "Přidání přípony „z“ k libovolnému typu způsobí vypsání tisknutelných " +#~ "znaků\n" +#~ "na konci každého výstupního řádku.\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 "" +#~ "Přepínač --string bez zadaného čísla je brán jako 3. Přepínač --width " +#~ "bez\n" +#~ "čísla je brán jako 32. Implicitní jsou tyto hodnoty: -A o -t oS -w16.\n" + +#~ msgid "Usage: %s [OPTION]... FILE\n" +#~ msgstr "Použití: %s [PŘEPÍNAČ]… SOUBOR\n" + +#~ msgid "Password:" +#~ msgstr "Heslo:" + +#~ msgid "getpass: cannot open /dev/tty" +#~ msgstr "getpass: /dev/tty nelze otevřít" + +#~ msgid "cannot set groups" +#~ msgstr "nelze nastavit skupiny" + +#~ msgid "cannot set group id" +#~ msgstr "nelze nastavit ID skupiny" + +#~ msgid "cannot set user id" +#~ msgstr "nelze nastavit ID uživatele" -#, fuzzy -#~ msgid " euid=%s" -#~ msgstr " euid=%lu" +#~ msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" +#~ msgstr "Použití: %s [PŘEPÍNAČ]… [-] [UŽIVATEL [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 "" +#~ "Mění efektivní číslo uživatele a skupiny na daného UŽIVATELE.\n" +#~ "\n" +#~ " -, -l, --login učiní shell přihlašovacím shellem\n" +#~ " -c, --command=PŘÍKAZ předá jeden PŘÍKAZ shellu pomocí -c\n" +#~ " -f, --fast předá shellu -f (pro csh nebo tcsh)\n" +#~ " -m, --preserve-environment nemaže proměnné prostředí\n" +#~ " -p jako -m\n" +#~ " -s, --shell=SHELL použije SHELL (pokud to povoluje /etc/" +#~ "shells)\n" + +#~ msgid "" +#~ "\n" +#~ "A mere - implies -l. If USER not given, assume root.\n" +#~ msgstr "" +#~ "\n" +#~ "Je-li zadáno pouze „-“, znamená to „-l“. Pokud uživatel není zadán,\n" +#~ "předpokládá se uživatel root.\n" + +#~ msgid "user %s does not exist" +#~ msgstr "uživatel %s neexistuje" + +#~ msgid "incorrect password" +#~ msgstr "chybné heslo" + +#~ msgid "using restricted shell %s" +#~ msgstr "používán omezený (restricted) shell %s" + +#~ msgid "warning: cannot change directory to %s" +#~ msgstr "varování: nelze vejít do adresáře %s" #~ msgid "" #~ "\n" @@ -12385,9 +13114,6 @@ msgstr "" #~ msgid "invalid number of lines: 0" #~ msgstr "chybný počet řádků: 0" -#~ msgid "invalid format width" -#~ msgstr "neplatná šířka formátu" - #~ msgid "invalid format precision" #~ msgstr "neplatná přesnost formátu" diff --git a/po/da.gmo b/po/da.gmo index eb6acb17..059a0ee0 100644 Binary files a/po/da.gmo and b/po/da.gmo differ diff --git a/po/da.po b/po/da.po index b19bf7d3..ac27ad0d 100644 --- a/po/da.po +++ b/po/da.po @@ -1,10 +1,13 @@ -# translation of coreutils-8.4.po to Danish +# translation of coreutils-8.19.po to Danish # Danish messages for core-utils. -# Copyright (C) 1996, 2009, 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 1996, 2009, 2010, 2011, 2012 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. # -# Review 2003-03-26 Ole Laursen <olau@hardworking.dk> # # Bemærk. Coreutils består af mange programmer. Konventioner er # vigtigst at overholde inden for samme program. I visse tilfælde er der @@ -66,15 +69,12 @@ # translate (programmet tr) -> transformér # join (programmet join) -> flette # -# Keld Jørn Simonsen <keld@dkuug.dk>, 2000-2003. -# Keld Simonsen <keld@keldix.com>, 2010. -# Ask Hjorth Larsen <asklarsen@gmail.com>, 2009, 2010, 2011. msgid "" msgstr "" -"Project-Id-Version: coreutils-8.14\n" +"Project-Id-Version: coreutils-8.20-pre1\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2012-05-10 19:35+0200\n" -"PO-Revision-Date: 2011-12-15 00:57+0100\n" +"POT-Creation-Date: 2013-02-14 15:56+0000\n" +"PO-Revision-Date: 2012-10-27 13:17+0200\n" "Last-Translator: Ask Hjorth Larsen <asklarsen@gmail.com>\n" "Language-Team: Danish <dansk@dansk-gruppen.dk>\n" "Language: da\n" @@ -102,19 +102,19 @@ msgstr "Gyldige argumenter er:" msgid "error closing file" msgstr "fejl ved lukning af fil" -#: lib/closeout.c:112 src/base64.c:109 src/base64.c:121 src/base64.c:127 -#: src/base64.c:168 src/base64.c:224 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:330 src/expand.c:355 src/head.c:298 -#: src/head.c:348 src/head.c:756 src/head.c:797 src/mktemp.c:350 src/od.c:919 -#: src/paste.c:160 src/shuf.c:369 src/split.c:727 src/split.c:964 -#: src/split.c:969 src/tail.c:350 src/tail.c:1201 src/tail.c:1307 +#: 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 -#: src/unexpand.c:427 src/unexpand.c:443 +#: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "skrivefejl" -#: lib/copy-acl.c:611 src/copy.c:1160 src/copy.c:2602 +#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617 #, c-format msgid "preserving permissions for %s" msgstr "beholder rettigheder for %s" @@ -306,18 +306,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:483 +#: lib/mkdir-p.c:196 src/install.c:484 #, c-format msgid "cannot change permissions of %s" msgstr "kan ikke ændre adgangsrettigheder på %s" -#: lib/mkdir-p.c:206 src/copy.c:2261 src/install.c:709 src/install.c:722 +#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722 #, 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:915 src/tac.c:435 +#: src/split.c:929 src/tac.c:434 #, c-format msgid "memory exhausted" msgstr "hukommelsen opbrugt" @@ -366,75 +366,75 @@ msgstr "'" msgid "%s: end of file" msgstr "%s: filslut" -#: lib/regcomp.c:130 +#: lib/regcomp.c:131 msgid "Success" msgstr "Success" -#: lib/regcomp.c:133 +#: lib/regcomp.c:134 msgid "No match" msgstr "Ingen træffer" -#: lib/regcomp.c:136 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "Ugyldigt regulært udtryk" -#: lib/regcomp.c:139 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "Ugyldigt kollationeringstegn" -#: lib/regcomp.c:142 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "Ugyldigt navn på tegnklasse" -#: lib/regcomp.c:145 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "Afsluttende omvendt skråstreg" -#: lib/regcomp.c:148 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "Ugyldig baglæns reference" -#: lib/regcomp.c:151 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "Uparret [ eller [^" -#: lib/regcomp.c:154 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "Uparret ( eller \\(" -#: lib/regcomp.c:157 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "Uparret \\{" -#: lib/regcomp.c:160 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "Ugyldigt indhold af \\{\\}" -#: lib/regcomp.c:163 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "Ugyldigt intervalendepunkt" -#: lib/regcomp.c:166 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Hukommelsen opbrugt" -#: lib/regcomp.c:169 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "Ugyldigt forudgående regulært udtryk" -#: lib/regcomp.c:172 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "Uventet afslutning af regulært udtryk" -#: lib/regcomp.c:175 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "Regulært udtryk er for stort" -#: lib/regcomp.c:178 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "Uparret ) eller \\)" -#: lib/regcomp.c:703 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "Intet foregående regulært udtryk" @@ -473,7 +473,7 @@ msgstr "^[YyJj]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-mode-acl.c:695 src/copy.c:2284 src/cp.c:518 +#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516 #, c-format msgid "setting permissions for %s" msgstr "sætter adgangsrettigheder på %s" @@ -618,17 +618,17 @@ msgstr "Fejl på strømkilde" msgid "Resource lost" msgstr "Ressource tabt" -#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262 -#: lib/spawn-pipe.c:265 -#, fuzzy, c-format +#: 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 fifo %s" +msgstr "kan ikke oprette datakanal" -#: lib/spawn-pipe.c:232 lib/spawn-pipe.c:346 lib/wait-process.c:282 +#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282 #: lib/wait-process.c:356 -#, fuzzy, c-format +#, c-format msgid "%s subprocess failed" -msgstr "%s: søgning mislykkedes" +msgstr "%s: underproces fejlede" #: lib/strsignal.c:114 #, c-format @@ -640,24 +640,24 @@ msgstr "Realtids signal %d" msgid "Unknown signal %d" msgstr "Ukendt signal %d" -#: lib/unicodeio.c:103 +#: lib/unicodeio.c:102 msgid "iconv function not usable" msgstr "iconv-funktion ikke brugelig" -#: lib/unicodeio.c:105 +#: lib/unicodeio.c:104 msgid "iconv function not available" msgstr "iconv-funktion ikke til stede" -#: lib/unicodeio.c:112 +#: lib/unicodeio.c:111 msgid "character out of range" msgstr "tegn uden for område" -#: lib/unicodeio.c:182 +#: lib/unicodeio.c:181 #, c-format msgid "cannot convert U+%04X to local character set" msgstr "kan ikke konvertere U+%04X til lokalt tegnsæt" -#: lib/unicodeio.c:184 +#: lib/unicodeio.c:183 #, c-format msgid "cannot convert U+%04X to local character set: %s" msgstr "kan ikke konvertere U+%04X til lokalt tegnsæt: %s" @@ -840,7 +840,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:562 +#: lib/version-etc.c:251 src/system.h:573 #, c-format msgid "%s home page: <%s>\n" msgstr "%s hjemmeside: <%s>\n" @@ -850,30 +850,29 @@ 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:563 +#: lib/version-etc.c:256 src/system.h:574 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" -# bør det blive stående som open? #: lib/w32spawn.h:43 -#, fuzzy, c-format +#, c-format msgid "_open_osfhandle failed" -msgstr "fejl ved åbning" +msgstr "_open_osfhandle mislykkedes" #: lib/w32spawn.h:84 #, c-format msgid "cannot restore fd %d: dup2 failed" -msgstr "" +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 "" +msgstr "%s-underproces" #: lib/wait-process.c:274 lib/wait-process.c:346 #, c-format msgid "%s subprocess got fatal signal %d" -msgstr "" +msgstr "%s-underproces fik fatalt signal %d" #: lib/xfreopen.c:35 msgid "stdin" @@ -917,17 +916,17 @@ msgid "cannot perform formatted output" msgstr "kan ikke udføre formateret udskrift" #: lib/xstrtol-error.c:63 -#, fuzzy, c-format +#, c-format msgid "invalid %s%s argument '%s'" msgstr "ugyldigt %s%s-argument '%s'" #: lib/xstrtol-error.c:68 -#, fuzzy, c-format +#, c-format msgid "invalid suffix in %s%s argument '%s'" msgstr "ugyldigt 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%s-argumentet '%s' er for stort" @@ -938,18 +937,17 @@ msgstr "Simon Josefsson" # Base64 er en mime-kodning, så oversættelse bør være konservativ #: src/base64.c:60 -#, c-format +#, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" "Base64 encode or decode FILE, or standard input, to standard output.\n" -"\n" 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:64 +#: src/base64.c:67 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -965,7 +963,7 @@ msgstr "" " Brug 0 for at slå linjeombrydning fra\n" "\n" -#: src/base64.c:73 src/cat.c:110 src/fmt.c:293 src/shuf.c:71 src/sum.c:70 +#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -973,7 +971,7 @@ msgstr "" "\n" "Hvis ingen FIL er angivet, eller FIL er -, læses fra standard-ind.\n" -#: src/base64.c:76 +#: src/base64.c:79 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -987,37 +985,37 @@ 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:171 src/base64.c:208 src/csplit.c:263 src/csplit.c:1435 -#: src/join.c:451 src/shuf.c:157 src/shuf.c:361 src/tac-pipe.c:74 +#: 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 #, c-format msgid "read error" msgstr "læsefejl" -#: src/base64.c:227 +#: src/base64.c:230 #, c-format msgid "invalid input" msgstr "ugyldig inddata" -#: src/base64.c:264 +#: src/base64.c:267 #, c-format msgid "invalid wrap size: %s" msgstr "ugyldig ombrydningsstørrelse: %s" -#: src/base64.c:283 src/basename.c:173 src/comm.c:435 src/cp.c:607 -#: src/date.c:441 src/dircolors.c:447 src/du.c:894 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:169 src/install.c:929 src/join.c:961 -#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:157 src/mv.c:447 -#: src/od.c:1802 src/ptx.c:2081 src/readlink.c:154 src/seq.c:408 -#: src/shuf.c:320 src/shuf.c:339 src/sort.c:4477 src/split.c:1313 -#: src/tr.c:1797 src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:454 -#: src/uniq.c:471 src/unlink.c:81 src/uptime.c:250 src/users.c:146 -#: src/wc.c:666 src/who.c:836 src/whoami.c:79 +#: 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 #, c-format msgid "extra operand %s" msgstr "ekstra operand %s" -#: src/base64.c:315 src/cat.c:781 +#: src/base64.c:318 src/cat.c:781 #, c-format msgid "closing standard input" msgstr "lukker standard-ind" @@ -1025,45 +1023,49 @@ 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/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:53 src/env.c:33 +#: 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/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:65 src/su.c:88 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 +#: 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 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 "" "Brug: %s NAVN [SUFFIKS]\n" -" eller: %s FLAG\n" +" 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" -"\n" msgstr "" "Udskriv NAVN med eventuelle indledende katalog-komponenter fjernet.\n" "Hvis SUFFIKS er angivet, fjernes også afsluttende SUFFIKS.\n" "\n" -#: src/basename.c:59 +#: 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" msgstr "" +" -a, --multiple understøt flere argumenter og behandl hvert som et " +"NAVN\n" +" -s, --suffix=SUFFIKS fjern efterfølgende SUFFIKS\n" +" -z, --zero separér uddata med NUL frem for linjeskift\n" -#: src/basename.c:66 +#: src/basename.c:67 #, c-format msgid "" "\n" @@ -1073,14 +1075,20 @@ 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 noget/str1 noget/str2 -> \"str1\" efterfulgt af \"str2\"\n" -#: src/basename.c:167 src/chcon.c:531 src/chgrp.c:277 src/chmod.c:526 -#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1369 +#: 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:183 src/mkfifo.c:108 src/mknod.c:146 src/nohup.c:111 -#: src/pathchk.c:148 src/printf.c:674 src/readlink.c:146 src/realpath.c:236 -#: src/rm.c:314 src/rmdir.c:223 src/seq.c:402 src/setuidgid.c:137 -#: src/sleep.c:119 src/stat.c:1476 src/stdbuf.c:346 src/tr.c:1782 +#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 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 #, c-format msgid "missing operand" @@ -1088,7 +1096,8 @@ 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:52 src/split.c:49 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/split.c:49 msgid "Torbjorn Granlund" msgstr "Torbjørn Granlund" @@ -1098,8 +1107,8 @@ msgstr "Torbjørn Granlund" msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:846 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4720 src/nl.c:182 src/paste.c:435 src/pr.c:2768 src/sum.c:58 +#: 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/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" @@ -1156,7 +1165,7 @@ msgstr "" msgid "cannot do ioctl on %s" msgstr "kan ikke udføre ioctl på %s" -#: src/cat.c:637 src/dd.c:2209 src/sort.c:379 src/tee.c:165 src/yes.c:86 +#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86 #, c-format msgid "standard output" msgstr "standard-ud" @@ -1173,14 +1182,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:55 src/head.c:46 src/hostid.c:33 +#: 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 msgid "Jim Meyering" msgstr "Jim Meyering" -#: src/chcon.c:100 src/runcon.c:203 src/runcon.c:234 +#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238 #, c-format msgid "failed to create security context: %s" msgstr "kunne ikke oprette sikkerhedskontekst: %s" @@ -1191,8 +1200,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:540 src/copy.c:2222 src/runcon.c:217 -#: src/stat.c:683 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221 +#: src/stat.c:702 #, c-format msgid "failed to get security context of %s" msgstr "kunne ikke hente sikkerhedskontekst for %s" @@ -1208,12 +1217,12 @@ 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:446 src/ls.c:2981 +#: src/du.c:457 src/ls.c:2981 #, 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:426 +#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437 #, c-format msgid "cannot read directory %s" msgstr "kan ikke læse katalog %s" @@ -1223,13 +1232,13 @@ 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:599 +#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562 #, 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:618 -#: src/remove.c:613 +#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642 +#: src/remove.c:576 #, c-format msgid "fts_close failed" msgstr "fts_close mislykkedes" @@ -1251,23 +1260,24 @@ msgid "" "Change the security context of each FILE to CONTEXT.\n" "With --reference, change the security context of each FILE to that of " "RFILE.\n" -"\n" msgstr "" "Ændr sikkerhedskonteksten for hver FIL til KONTEKST.\n" -"Med --reference, ændr sikkerhedskonteksten for hver FIL til den for RFIL.\n" +"Med --reference ændres sikkerhedskonteksten for hver FIL til den for RFIL.\n" "\n" -" -h, --no-dereference virk på symbolske lænker frem for refereret fil\n" -#: src/chcon.c:362 src/chgrp.c:123 src/chown.c:94 +#: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94 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 "" +" --dereference virk på referenten af hver symbolsk lænke (dette " +"er\n" +" standardopførsel) frem for selve lænken\n" +" -h, --no-dereference virk på symbolske lænker frem for refereret fil\n" -#: src/chcon.c:367 -#, fuzzy +#: src/chcon.c:369 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" @@ -1276,32 +1286,36 @@ msgid "" msgstr "" " -u, --user=BRUGER sæt brugeren BRUGER i målsikkerhedskonteksten\n" " -r, --role=ROLLE sæt rollen ROLLE i målsikkerhedskonteksten\n" -" -t, --type=TYPE set typen TYPE i målsikkerhedskonteksten\n" +" -t, --type=TYPE sæt typen TYPE i målsikkerhedskonteksten\n" " -l, --range=INTERVAL sæt intervallet INTERVAL i målsikkerhedskonteksten\n" -"\n" -#: src/chcon.c:373 -#, fuzzy +#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 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 behandl ikke '/' specielt (standard)\n" +" --preserve-root virk ikke rekursivt på '/'\n" + +#: src/chcon.c:379 msgid "" " --reference=RFILE use RFILE's security context rather than " "specifying\n" " a CONTEXT value\n" msgstr "" -" --reference=RFIL brug RFILs sikkerhedskontekst i steedet for at\n" +" --reference=RFIL brug RFILs sikkerhedskontekst i stedet for at\n" " angive en KONTEKST-værdi\n" -" -R, --recursive operér på filer og kataloger rekursivt\n" -" -v, --verbose vis en meddelelse for hver fil som behandles\n" -#: src/chcon.c:377 src/chgrp.c:140 src/chown.c:118 +#: 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 virk på filer og kataloger rekursivt\n" -#: src/chcon.c:380 +#: src/chcon.c:386 msgid " -v, --verbose output a diagnostic for every file processed\n" msgstr "" +" -v, --verbose udskriv en statusbesked for hver fil der behandles\n" -#: src/chcon.c:383 src/chgrp.c:143 src/chown.c:121 -#, fuzzy +#: src/chcon.c:389 src/chgrp.c:143 src/chown.c:121 msgid "" "\n" "The following options modify how a hierarchy is traversed when the -R\n" @@ -1315,6 +1329,7 @@ msgid "" " -P do not traverse any symbolic links (default)\n" "\n" msgstr "" +"\n" "Følgende flag ændrer måden hvorpå et hierarki gennemløbes når flaget -R\n" "også angives. Hvis mere end et angives, vil kun det sidst valgte være\n" "gyldigt.\n" @@ -1326,36 +1341,36 @@ msgstr "" " -P gennemløb ingen symbolske lænker (standard)\n" "\n" -#: src/chcon.c:512 src/chgrp.c:264 src/chown.c:267 +#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267 #, c-format msgid "-R --dereference requires either -H or -L" msgstr "-R --dereference kræver enten -H eller -L" -#: src/chcon.c:518 +#: src/chcon.c:524 #, c-format msgid "-R -h requires -P" msgstr "-R -h kræver -P" -#: src/chcon.c:533 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282 -#: src/comm.c:429 src/csplit.c:1371 src/join.c:1149 src/link.c:79 -#: src/mknod.c:148 src/setuidgid.c:139 src/tr.c:1785 +#: 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 #, c-format msgid "missing operand after %s" msgstr "manglende operand efter %s" -#: src/chcon.c:556 src/runcon.c:247 +#: src/chcon.c:562 src/runcon.c:251 #, c-format msgid "invalid context: %s" msgstr "ugyldig kontekst: %s" -#: src/chcon.c:563 +#: src/chcon.c:569 #, c-format msgid "conflicting security context specifiers given" msgstr "der er givet modstridende specifikationer for sikkerhedskontekst" -#: src/chcon.c:572 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:433 src/cp.c:493 -#: src/mv.c:96 src/pwd.c:273 src/rm.c:324 src/touch.c:351 +#: 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 #, c-format msgid "failed to get attributes of %s" msgstr "kunne ikke hente attributter for %s" @@ -1375,16 +1390,14 @@ msgstr "" " eller: %s [FLAG]... --reference=RFIL FIL...\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 "" -"Ændr sikkerhedskonteksten for hver FIL til KONTEKST.\n" -"Med --reference, ændr sikkerhedskonteksten for hver FIL til den for RFIL.\n" +"Ændr gruppen for hver FIL til GRUPPE.\n" +"Med --reference ændres gruppen for hver FIL til den for RFIL.\n" "\n" -" -h, --no-dereference virk på symbolske lænker frem for refereret fil\n" #: src/chgrp.c:118 src/chmod.c:382 src/chown.c:89 msgid "" @@ -1392,32 +1405,25 @@ msgid "" " -f, --silent, --quiet suppress most error messages\n" " -v, --verbose output a diagnostic for every file processed\n" msgstr "" +" -c, --changes som verbose, men rapportér kun udførte ændringer\n" +" -f, --silent, --quiet undertryk de fleste fejlbeskeder\n" +" -v, --verbose udskriv en statusbesked for hver fil der behandles\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 "" -" -h, --no-dereference ændr symbolske lænker i stedet for refererede " -"filer\n" " (kun for systemer der kan ændre ejerskabet af\n" " en symlænke)\n" -#: src/chgrp.c:132 src/chmod.c:387 src/chown.c:110 -#, fuzzy -msgid "" -" --no-preserve-root do not treat '/' specially (the default)\n" -" --preserve-root fail to operate recursively on '/'\n" -msgstr "" -" --no-preserve-root behandl ikke '/' specielt (standard)\n" -" --preserve-root operér ikke rekursivt på '/'\n" - #: src/chgrp.c:136 msgid "" " --reference=RFILE use RFILE's group rather than specifying a\n" " GROUP value\n" msgstr "" +" --reference=RFIL brug gruppen for RFIL frem for at angive en værdi\n" +" for GRUPPE\n" # staff bør måske oversættes. Det er velsagtens ikke en standardbrugergruppe #: src/chgrp.c:158 @@ -1485,33 +1491,31 @@ msgstr "" " eller: %s [FLAG]... --reference=RFIL FIL...\n" #: src/chmod.c:377 -#, fuzzy 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 "" -"Ændr sikkerhedskonteksten for hver FIL til KONTEKST.\n" -"Med --reference, ændr sikkerhedskonteksten for hver FIL til den for RFIL.\n" +"Ændr tilstanden for hver FIL til TILSTAND.\n" +"Med --reference ændres tilstanden for hver FIL til den for RFIL.\n" "\n" -" -h, --no-dereference virk på symbolske lænker frem for refereret fil\n" #: src/chmod.c:391 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 msgid " -R, --recursive change files and directories recursively\n" -msgstr "" +msgstr " -R, --recursive ændr filer og kataloger rekursivt\n" #: src/chmod.c:399 -#, fuzzy msgid "" "\n" "Each MODE is of the form '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n" msgstr "" "\n" -"Hver TILSTAND er på formen '[ugoa]*([-+=]([rwxXst]*|[ugo]))+'.\n" +"Hver TILSTAND er på formen '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n" #: src/chmod.c:513 #, c-format @@ -1609,6 +1613,10 @@ msgid "" "RFILE.\n" "\n" msgstr "" +"Ændr ejeren og/eller gruppen for hver FIL til EJER og/eller GRUPPE.\n" +"Med --reference ændres ejer og gruppe for hver fil til de tilsvarende for " +"RFIL.\n" +"\n" #: src/chown.c:103 msgid "" @@ -1634,9 +1642,10 @@ msgid "" " --reference=RFILE use RFILE's owner and group rather than\n" " specifying OWNER:GROUP values\n" msgstr "" +" --reference=RFIL brug ejer og gruppe for RFIL frem for at angive\n" +" værdier for EJER:GRUPPE\n" #: src/chown.c:136 -#, fuzzy msgid "" "\n" "Owner is unchanged if missing. Group is unchanged if missing, but changed\n" @@ -1644,9 +1653,9 @@ msgid "" "OWNER and GROUP may be numeric as well as symbolic.\n" msgstr "" "\n" -"Ejer forbliver uændret hvis udeladt. Gruppe forbliver uændret hvis andet\n" -"ikke er angivet, men bliver sat til det samme som login-gruppen hvis det er\n" -"angivet med et ':', som følger efter en symbolsk EJER.\n" +"Ejer forbliver uændret hvis udeladt. Gruppe forbliver uændret hvis\n" +"udeladt, men ændres til logind-gruppen hvis det er angivet med et ':',\n" +"som følger efter en symbolsk EJER.\n" "EJER og GRUPPE kan være numerisk eller symbolsk.\n" #: src/chown.c:142 @@ -1670,7 +1679,7 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:97 src/install.c:575 src/setuidgid.c:110 src/setuidgid.c:120 +#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120 #, c-format msgid "invalid group %s" msgstr "ugyldig gruppe %s" @@ -1711,13 +1720,13 @@ msgstr "" " --groups=G_LISTE angiv supplerende grupper som g1,g2,..,gN\n" #: src/chroot.c:149 -#, fuzzy msgid "" "\n" "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n" msgstr "" "\n" -"Hvis ingen kommando er angivet, kør '${SHELL} -i' (default: /bin/sh).\n" +"Hvis ingen kommando er angivet, køres '${SHELL} -i' (som standard: /bin/" +"sh).\n" #: src/chroot.c:202 #, c-format @@ -1739,8 +1748,8 @@ msgstr "kunne ikke sætte gruppe-ID" msgid "failed to set user-ID" msgstr "kunne ikke sætte bruger-ID" -#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:213 src/stdbuf.c:366 -#: src/timeout.c:402 +#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365 +#: src/timeout.c:454 #, c-format msgid "failed to run command %s" msgstr "kunne ikke køre kommandoen %s" @@ -1822,7 +1831,6 @@ msgid " --output-delimiter=STR separate columns with STR\n" msgstr " --output-delimiter=STR adskil kolonner med STR\n" #: src/comm.c:133 -#, fuzzy msgid "" "\n" "Note, comparisons honor the rules specified by 'LC_COLLATE'.\n" @@ -1859,20 +1867,24 @@ msgstr "flere skilletegn angivet" msgid "empty %s not allowed" msgstr "tom %s er ikke tilladt" -#: src/copy.c:168 src/dd.c:1609 src/dd.c:1976 +#: 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 #, c-format -msgid "reading %s" -msgstr "læser %s" +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:426 +#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425 #, c-format msgid "cannot lseek %s" msgstr "kan ikke udføre lseek() %s" -#: src/copy.c:206 src/dd.c:2039 src/dd.c:2102 +#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151 #, c-format -msgid "writing %s" -msgstr "skriver %s" +msgid "error writing %s" +msgstr "fejl ved skrivning af %s" # ? #: src/copy.c:313 @@ -1896,7 +1908,7 @@ msgstr "kunne ikke udvide %s" msgid "clearing permissions for %s" msgstr "rydder rettigheder for %s" -#: src/copy.c:697 src/copy.c:2470 src/cp.c:331 +#: src/copy.c:697 src/copy.c:2480 src/cp.c:329 #, c-format msgid "failed to preserve ownership for %s" msgstr "kunne ikke bevare ejerskab for %s" @@ -1911,14 +1923,14 @@ msgstr "kunne ikke slå filen %s op" msgid "failed to preserve authorship for %s" msgstr "kunne ikke bevare forfatter af %s" -#: src/copy.c:804 src/csplit.c:638 src/du.c:901 src/fmt.c:449 src/head.c:847 -#: src/sort.c:4489 src/split.c:1329 src/tail.c:1756 src/wc.c:678 +#: 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 "kan ikke åbne %s til læsning" -#: src/copy.c:810 src/copy.c:972 src/dd.c:1546 src/dd.c:2114 src/dd.c:2252 -#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:141 +#: 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 #, c-format msgid "cannot fstat %s" msgstr "kan ikke udføre fstat() %s" @@ -1938,14 +1950,14 @@ msgstr "kunne ikke hente filsystemets oprettelseskontekst" 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:1574 src/copy.c:1777 src/copy.c:1935 src/ln.c:314 -#: src/remove.c:267 src/remove.c:293 src/remove.c:444 src/remove.c:465 +#: 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 #, c-format msgid "cannot remove %s" msgstr "kan ikke fjerne %s" -#: src/copy.c:886 src/copy.c:1578 src/copy.c:1772 src/copy.c:1940 -#: src/remove.c:418 +#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945 +#: src/remove.c:375 #, c-format msgid "removed %s\n" msgstr "fjernede %s\n" @@ -1965,186 +1977,186 @@ msgstr "kan ikke oprette almindelig fil %s" msgid "failed to clone %s from %s" msgstr "kunne ikke klone %s fra %s" -#: src/copy.c:1098 src/copy.c:2531 +#: src/copy.c:1098 src/copy.c:2541 #, c-format msgid "preserving times for %s" msgstr "beholder tider for %s" -#: src/copy.c:1170 src/copy.c:1176 src/head.c:855 src/touch.c:175 -#: src/truncate.c:413 -#, c-format -msgid "closing %s" -msgstr "lukker %s" +#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172 +#: src/truncate.c:417 +#, fuzzy, c-format +msgid "failed to close %s" +msgstr "kunne ikke åbne %s" -#: src/copy.c:1466 +#: src/copy.c:1471 #, c-format msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? " msgstr "%s: forsøg at overskrive %s, uden hensyn til tilstand %04lo (%s)? " -#: src/copy.c:1473 +#: src/copy.c:1478 #, c-format msgid "%s: overwrite %s? " msgstr "%s: overskriv %s? " -#: src/copy.c:1542 +#: src/copy.c:1547 #, c-format msgid " (backup: %s)" msgstr " (sikkerhedskopi: %s)" -#: src/copy.c:1552 +#: src/copy.c:1557 #, c-format msgid "failed to restore the default file creation context" msgstr "kunne ikke genskabe standardkontekst for filoprettelse" -#: src/copy.c:1584 +#: src/copy.c:1589 #, c-format msgid "cannot create hard link %s to %s" msgstr "kan ikke oprette hård lænke %s til %s" -#: src/copy.c:1637 src/copy.c:1689 src/copy.c:2272 src/copy.c:2589 +#: 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:1220 src/truncate.c:365 +#: src/stat.c:1239 src/truncate.c:363 #, c-format msgid "cannot stat %s" msgstr "kan ikke udføre stat() på %s" -#: src/copy.c:1645 +#: src/copy.c:1650 #, c-format msgid "omitting directory %s" msgstr "udelader katalog %s" -#: src/copy.c:1659 +#: src/copy.c:1664 #, c-format msgid "warning: source file %s specified more than once" msgstr "advarsel: kildefil %s er angivet mere end én gang" -#: src/copy.c:1707 src/ln.c:246 +#: src/copy.c:1712 src/ln.c:246 #, c-format msgid "%s and %s are the same file" msgstr "%s og %s er den samme fil" -#: src/copy.c:1806 +#: src/copy.c:1811 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "kan ikke overskrive ikke-katalog %s med katalog %s" -#: src/copy.c:1824 src/ln.c:214 +#: src/copy.c:1829 src/ln.c:214 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "vil ikke overskrive netop oprettet %s med %s" -#: src/copy.c:1842 +#: src/copy.c:1847 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "kan ikke overskrive katalog %s med ikke-katalog" -#: src/copy.c:1856 +#: src/copy.c:1861 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "kan ikke flytte katalog til ikke-katalog: %s -> %s" -#: src/copy.c:1886 +#: src/copy.c:1891 #, 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:1887 +#: src/copy.c:1892 #, 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:1910 src/ln.c:276 +#: src/copy.c:1915 src/ln.c:276 #, c-format msgid "cannot backup %s" msgstr "kan ikke sikkerhedskopiere %s" -#: src/copy.c:1974 +#: src/copy.c:1979 #, 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:2051 +#: src/copy.c:2056 #, 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:2068 +#: src/copy.c:2073 #, 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:2118 +#: src/copy.c:2123 #, 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:2161 +#: src/copy.c:2166 #, c-format msgid "cannot move %s to %s" msgstr "kan ikke flytte %s til %s" -#: src/copy.c:2173 +#: src/copy.c:2178 #, 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:2207 src/install.c:905 src/mkdir.c:189 src/mkfifo.c:114 -#: src/mknod.c:167 +#: 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:2241 +#: src/copy.c:2246 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "kan ikke kopiere cyklisk symbolsk lænke %s" -#: src/copy.c:2350 +#: src/copy.c:2355 #, 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:2357 +#: src/copy.c:2362 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "kan ikke oprette symbolsk lænke %s til %s" -#: src/copy.c:2406 src/mkfifo.c:133 +#: src/copy.c:2416 src/mkfifo.c:132 #, c-format msgid "cannot create fifo %s" msgstr "kan ikke oprette fifo %s" -#: src/copy.c:2415 +#: src/copy.c:2425 #, c-format msgid "cannot create special file %s" msgstr "kan ikke oprette specialfil %s" -#: src/copy.c:2426 src/ls.c:3191 src/stat.c:902 +#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921 #, c-format msgid "cannot read symbolic link %s" msgstr "kan ikke læse symbolsk lænke %s" -#: src/copy.c:2453 +#: src/copy.c:2463 #, c-format msgid "cannot create symbolic link %s" msgstr "kan ikke oprette symbolsk lænke %s" -#: src/copy.c:2485 +#: src/copy.c:2495 #, c-format msgid "%s has unknown file type" msgstr "%s har ukendt filtype" -#: src/copy.c:2629 src/ln.c:358 +#: src/copy.c:2644 src/ln.c:358 #, c-format msgid "cannot un-backup %s" msgstr "kan ikke fjerne sikkerhedskopi af %s" -#: src/copy.c:2633 +#: src/copy.c:2648 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (fjern sikkerhedskopi)\n" -#: src/cp.c:156 src/mv.c:284 +#: src/cp.c:156 src/mv.c:286 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -2156,26 +2168,13 @@ msgstr "" " eller: %s [FLAG]... -t KATALOG KILDE...\n" #: src/cp.c:162 -msgid "" -"Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" -"\n" +#, fuzzy +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" -#: src/cp.c:166 src/csplit.c:1458 src/cut.c:197 src/df.c:852 src/du.c:268 -#: src/expand.c:112 src/fmt.c:275 src/fold.c:75 src/head.c:115 -#: src/install.c:612 src/kill.c:86 src/ln.c:392 src/ls.c:4726 src/mkdir.c:61 -#: src/mkfifo.c:56 src/mknod.c:58 src/mv.c:294 src/nl.c:191 src/paste.c:445 -#: src/pr.c:2777 src/ptx.c:1825 src/shred.c:153 src/shuf.c:58 src/sort.c:399 -#: src/split.c:211 src/stdbuf.c:95 src/tac.c:142 src/tail.c:268 -#: src/touch.c:226 src/truncate.c:107 src/unexpand.c:122 src/uniq.c:145 -msgid "" -"Mandatory arguments to long options are mandatory for short options too.\n" -msgstr "" -"Obligatoriske argumenter til lange flag er også obligatoriske for de korte.\n" - -#: src/cp.c:169 +#: src/cp.c:168 msgid "" " -a, --archive same as -dR --preserve=all\n" " --attributes-only don't copy the file data, just the " @@ -2198,12 +2197,14 @@ msgstr "" "rekursion\n" " -d samme som --no-dereference --preserve=links\n" -#: src/cp.c:178 +#: src/cp.c:177 +#, fuzzy msgid "" " -f, --force if an existing destination file cannot be\n" -" opened, remove it and try again (redundant " -"if\n" -" the -n option is used)\n" +" opened, remove it and try again (this " +"option\n" +" is ignored when the -n option is also " +"used)\n" " -i, --interactive prompt before overwrite (overrides a previous " "-n\n" " option)\n" @@ -2219,7 +2220,7 @@ msgstr "" " -H følg symbolske lænker fra kommandolinje\n" " i KILDE\n" -#: src/cp.c:188 +#: src/cp.c:186 msgid "" " -l, --link hard link files instead of copying\n" " -L, --dereference always follow symbolic links in SOURCE\n" @@ -2228,7 +2229,7 @@ msgstr "" "kopiere\n" " -L, --dereference følg altid symbolske lænker i KILDE\n" -#: src/cp.c:192 +#: src/cp.c:190 msgid "" " -n, --no-clobber do not overwrite an existing file (overrides\n" " a previous -i option)\n" @@ -2239,7 +2240,7 @@ msgstr "" "i)\n" " -P, --no-dereference følg aldrig symbolske lænker i KILDE\n" -#: src/cp.c:197 +#: src/cp.c:195 msgid "" " -p same as --preserve=mode,ownership,timestamps\n" " --preserve[=ATTR_LIST] preserve the specified attributes (default:\n" @@ -2256,7 +2257,7 @@ msgstr "" "xattr,\n" " all\n" -#: src/cp.c:205 +#: src/cp.c:203 msgid "" " --no-preserve=ATTR_LIST don't preserve the specified attributes\n" " --parents use full source file name under DIRECTORY\n" @@ -2264,7 +2265,7 @@ msgstr "" " --no-preserve=ATTRLISTE bevar ikke de angivne attributter\n" " --parents brug det fulde kildefilnavn under KATALOG\n" -#: src/cp.c:209 +#: src/cp.c:207 msgid "" " -R, -r, --recursive copy directories recursively\n" " --reflink[=WHEN] control clone/CoW copies. See below\n" @@ -2277,7 +2278,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:215 +#: src/cp.c:213 msgid "" " --sparse=WHEN control creation of sparse files. See below\n" " --strip-trailing-slashes remove any trailing slashes from each " @@ -2290,7 +2291,7 @@ msgstr "" "af\n" " hvert KILDE-argument\n" -#: src/cp.c:220 +#: src/cp.c:218 msgid "" " -s, --symbolic-link make symbolic links instead of copying\n" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -2305,7 +2306,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:226 +#: src/cp.c:224 msgid "" " -u, --update copy only when the SOURCE file is newer\n" " than the destination file or when the\n" @@ -2318,7 +2319,7 @@ msgstr "" " -v, --verbose forklar hvad der sker\n" " -x, --one-file-system bliv på dette filsystem\n" -#: src/cp.c:235 +#: src/cp.c:233 msgid "" "\n" "By default, sparse SOURCE files are detected by a crude heuristic and the\n" @@ -2344,8 +2345,7 @@ msgstr "" "forhindre oprettelse af usammenhængende filer.\n" "\n" -#: src/cp.c:247 src/install.c:649 src/ln.c:421 src/mv.c:321 -#, fuzzy +#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322 msgid "" "\n" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -2356,12 +2356,12 @@ msgid "" msgstr "" "\n" "Suffikset for sikkerhedskopiering er '~', med mindre andet er angivet med\n" -"--suffix eller SIMPLE_BACKUP_SUFFIX. Versionskontrolmetoden kan vælges med\n" -"--backup flaget eller vha. miljøvariabelen VERSION_CONTROL. Gyldige værdier " +"--suffix eller SIMPLE_BACKUP_SUFFIX. Versionsstyringsmetoden kan vælges med\n" +"flaget --backup eller vha. miljøvariabelen VERSION_CONTROL. Gyldige værdier " "er:\n" "\n" -#: src/cp.c:254 src/install.c:656 src/mv.c:328 +#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329 msgid "" " none, off never make backups (even if --backup is given)\n" " numbered, t make numbered backups\n" @@ -2375,7 +2375,7 @@ msgstr "" " ellers enkle sikkerhedskopier\n" " simple, never lav altid enkle sikkerhedskopier\n" -#: src/cp.c:260 +#: src/cp.c:258 msgid "" "\n" "As a special case, cp makes a backup of SOURCE when the force and backup\n" @@ -2388,92 +2388,92 @@ msgstr "" "eksisterende,\n" "regulær fil.\n" -#: src/cp.c:319 +#: src/cp.c:317 #, c-format msgid "failed to preserve times for %s" msgstr "kunne ikke beholde tider for %s" -#: src/cp.c:350 +#: src/cp.c:348 #, c-format msgid "failed to preserve permissions for %s" msgstr "kan ikke beholde adgangsrettigheder på %s" -#: src/cp.c:477 +#: src/cp.c:475 #, c-format msgid "cannot make directory %s" msgstr "kan ikke oprette katalog %s" -#: src/cp.c:526 src/cp.c:545 +#: src/cp.c:524 src/cp.c:543 #, c-format msgid "%s exists but is not a directory" msgstr "%s eksisterer, men er ikke et katalog" -#: src/cp.c:572 src/cp.c:1068 src/install.c:401 src/install.c:844 src/ln.c:123 -#: src/ln.c:181 src/ln.c:202 src/ln.c:516 src/mv.c:152 src/mv.c:399 -#, c-format -msgid "accessing %s" -msgstr "tilgår %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 +#, fuzzy, c-format +msgid "failed to access %s" +msgstr "kunne ikke åbne %s" -#: src/cp.c:592 src/install.c:914 src/ln.c:546 src/mv.c:432 src/shred.c:1182 -#: src/touch.c:433 src/truncate.c:356 +#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181 +#: src/touch.c:429 src/truncate.c:354 #, c-format msgid "missing file operand" msgstr "manglende filoperand" -#: src/cp.c:594 src/install.c:916 src/ln.c:560 src/mv.c:434 +#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436 #, c-format msgid "missing destination file operand after %s" msgstr "manglende målfilsoperand efter %s" -#: src/cp.c:603 src/install.c:925 src/mv.c:443 +#: src/cp.c:601 src/install.c:926 src/mv.c:445 #, 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:619 src/cp.c:1070 src/install.c:403 src/install.c:846 -#: src/install.c:938 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:401 -#: src/mv.c:457 +#: 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 #, c-format msgid "target %s is not a directory" msgstr "målet %s er ikke et katalog" -#: src/cp.c:730 +#: src/cp.c:728 #, 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:1063 src/install.c:839 src/ln.c:511 src/mv.c:394 +#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395 #, c-format msgid "multiple target directories specified" msgstr "flere målkataloger angivet" -#: src/cp.c:1108 +#: src/cp.c:1110 #, 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:1115 src/mv.c:464 +#: src/cp.c:1117 src/mv.c:466 #, c-format msgid "options --backup and --no-clobber are mutually exclusive" msgstr "flagene --backup og --no-clobber kan ikke bruges samtidigt" -#: src/cp.c:1121 +#: src/cp.c:1123 #, c-format msgid "--reflink can be used only with --sparse=auto" msgstr "--reflink kan kun bruges sammen med --sparse=auto" -#: src/cp.c:1129 src/install.c:899 src/ln.c:582 src/mv.c:472 +#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474 msgid "backup type" msgstr "type af sikkerhedskopi" -#: src/cp.c:1154 +#: src/cp.c:1156 #, 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:1160 +#: src/cp.c:1162 #, c-format msgid "cannot preserve extended attributes, cp is built without xattr support" msgstr "" @@ -2485,139 +2485,138 @@ msgstr "" msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:529 +#: src/csplit.c:531 #, c-format msgid "input disappeared" msgstr "inddata forsvandt" -#: src/csplit.c:658 src/csplit.c:669 +#: src/csplit.c:660 src/csplit.c:671 #, c-format msgid "%s: line number out of range" msgstr "%s: linjenummer uden for område" -#: src/csplit.c:698 +#: src/csplit.c:700 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: linjenummer uden for område" -#: src/csplit.c:701 src/csplit.c:750 +#: src/csplit.c:703 src/csplit.c:752 #, c-format msgid " on repetition %s\n" msgstr " ved gentagelse %s\n" -#: src/csplit.c:744 +#: src/csplit.c:746 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: ingen træffer fundet" -#: src/csplit.c:808 src/csplit.c:848 src/nl.c:359 src/tac.c:274 +#: src/csplit.c:810 src/csplit.c:850 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:981 +#: src/csplit.c:983 #, c-format msgid "write error for %s" msgstr "skrivefejl for %s" -#: src/csplit.c:1057 +#: src/csplit.c:1059 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: heltal forventedes efter skilletegn" -#: src/csplit.c:1073 -#, fuzzy, c-format +#: src/csplit.c:1075 +#, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: '}' er nødvendig i gentagelsesantal" -#: src/csplit.c:1083 -#, fuzzy, c-format +#: src/csplit.c:1085 +#, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: heltal kræves mellem '{' og '}'" -#: src/csplit.c:1110 -#, fuzzy, c-format +#: src/csplit.c:1112 +#, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: afsluttende skilletegn '%c' mangler" -#: src/csplit.c:1127 +#: src/csplit.c:1129 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: ugyldigt regulært udtryk: %s" -#: src/csplit.c:1160 +#: src/csplit.c:1162 #, c-format msgid "%s: invalid pattern" msgstr "%s: ugyldigt mønster" -#: src/csplit.c:1163 +#: src/csplit.c:1165 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: linjenummeret skal være større end nul" -#: src/csplit.c:1169 +#: src/csplit.c:1171 #, 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:1175 +#: src/csplit.c:1177 #, 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:1253 +#: src/csplit.c:1255 #, c-format msgid "missing conversion specifier in suffix" msgstr "manglende konverteringsspecifikator i suffiks" -#: src/csplit.c:1259 +#: src/csplit.c:1261 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "ugyldig konverteringsspecifikator i suffiks: %c" -#: src/csplit.c:1262 +#: src/csplit.c:1264 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "ugyldig konverteringsspecifikator i suffiks: \\%.3o" -#: src/csplit.c:1267 +#: src/csplit.c:1269 #, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "ugyldige flag i konverteringsspecifikation: %%%c%c" -#: src/csplit.c:1284 +#: src/csplit.c:1286 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "for mange %%-konverteringsspecifikationer i suffiks" -#: src/csplit.c:1298 +#: src/csplit.c:1300 #, c-format msgid "missing %% conversion specification in suffix" msgstr "manglende %%-konverteringsspecifikation i suffiks" -#: src/csplit.c:1345 +#: src/csplit.c:1347 #, c-format msgid "%s: invalid number" msgstr "%s: ugyldigt tal" -#: src/csplit.c:1449 +#: src/csplit.c:1451 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Brug: %s [FLAG]... FIL MØNSTER...\n" -#: src/csplit.c:1453 +#: src/csplit.c:1455 #, 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" -"\n" msgstr "" "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:1461 -#, fuzzy, c-format +#: src/csplit.c:1462 +#, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" " -f, --prefix=PREFIX use PREFIX instead of 'xx'\n" @@ -2627,7 +2626,7 @@ 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:1466 +#: src/csplit.c:1467 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" @@ -2637,7 +2636,7 @@ msgstr "" " -s, --quiet, --silent vis ikke størrelsen af udfilerne\n" " -z, --elide-empty-files fjern tomme udfiler\n" -#: src/csplit.c:1473 +#: src/csplit.c:1474 msgid "" "\n" "Read standard input if FILE is -. Each PATTERN may be:\n" @@ -2645,8 +2644,7 @@ msgstr "" "\n" "Læs standard-ind når FIL er '-'. Hvert MØNSTER kan være:\n" -#: src/csplit.c:1477 -#, fuzzy +#: src/csplit.c:1478 msgid "" "\n" " INTEGER copy up to but not including specified line number\n" @@ -2671,7 +2669,7 @@ msgstr "" msgid "David M. Ihnat" msgstr "David M. Ihnat" -#: src/cut.c:64 +#: src/cut.c:64 src/cut.c:372 msgid "fields and positions are numbered from 1" msgstr "felter og positioner nummereres fra 1" @@ -2681,14 +2679,13 @@ msgid "Usage: %s OPTION... [FILE]...\n" msgstr "Brug: %s FLAG... [FIL]...\n" #: src/cut.c:193 -msgid "" -"Print selected parts of lines from each FILE to standard output.\n" -"\n" +#, fuzzy +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" -#: src/cut.c:200 +#: src/cut.c:199 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2698,7 +2695,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:205 +#: src/cut.c:204 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2711,14 +2708,14 @@ msgstr "" " flaget -s er angivet\n" " -n (ignoreres)\n" -#: src/cut.c:211 +#: src/cut.c:210 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:215 +#: src/cut.c:214 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2729,7 +2726,7 @@ msgstr "" " --output-delimiter=STRENG brug STRENG som forvalgt ud-skilletegn.\n" " forvalgt er at bruge ind-skilletegnet\n" -#: src/cut.c:222 +#: src/cut.c:221 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2741,7 +2738,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:228 +#: src/cut.c:227 msgid "" "Each range is one of:\n" "\n" @@ -2761,45 +2758,47 @@ msgstr "" "\n" "Hvis ingen FIL er angivet, eller FIL er -, læses fra standard-ind.\n" -#: src/cut.c:368 src/cut.c:489 -msgid "invalid byte or field list" +#: src/cut.c:367 src/cut.c:493 +#, fuzzy +msgid "invalid byte, character or field list" msgstr "ugyldig byte- eller feltliste" -#: src/cut.c:385 +#: src/cut.c:387 msgid "invalid range with no endpoint: -" msgstr "ugyldigt interval uden slutpunkt: -" -#: src/cut.c:399 +#: src/cut.c:403 msgid "invalid decreasing range" msgstr "ugyldigt aftagende interval" -#: src/cut.c:478 +#: src/cut.c:482 #, c-format msgid "byte offset %s is too large" msgstr "byte-startpunktet %s er for stort" -#: src/cut.c:481 +#: src/cut.c:485 #, c-format msgid "field number %s is too large" msgstr "felt nummer %s er for stort" -#: src/cut.c:789 src/cut.c:797 +#: src/cut.c:795 src/cut.c:803 msgid "only one type of list may be specified" msgstr "kun én slags liste må bruges" -#: src/cut.c:806 +#: src/cut.c:812 src/numfmt.c:1408 +#, c-format msgid "the delimiter must be a single character" msgstr "skilletegnet skal være et enkelt tegn" -#: src/cut.c:841 +#: src/cut.c:847 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:844 +#: src/cut.c:850 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:848 +#: src/cut.c:854 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2807,11 +2806,11 @@ msgstr "" "fjernelse af linjer uden skilletegn giver kun mening hvis man opererer\n" "\tmed felter" -#: src/cut.c:864 +#: src/cut.c:870 msgid "missing list of fields" msgstr "feltliste mangler" -#: src/cut.c:866 +#: src/cut.c:872 msgid "missing list of positions" msgstr "positionsliste mangler" @@ -2825,9 +2824,12 @@ msgstr "" " eller: %s [FLAG] [-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 "" + +#: src/date.c:134 +#, 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" " -I[TIMESPEC], --iso-8601[=TIMESPEC] output date/time in ISO 8601 format.\n" @@ -2835,9 +2837,19 @@ 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" +" -I[TIDSSPEC], --iso-8601[=TIDSSPEC] udskriv dato/tid i ISO 8601-format\n" +" TIDSSPEC='date' kun for dato (standardværdi),\n" +" 'hours', 'minutes', 'seconds', eller 'ns' for " +"dato\n" +" og tid med den angivne nøjagtighed.\n" # Bemærk: kommandoen date -R giver en engelsk udskrift på et dansk system, også -#: src/date.c:138 +#: src/date.c:142 msgid "" " -r, --reference=FILE display the last modification time of FILE\n" " -R, --rfc-2822 output date and time in RFC 2822 format.\n" @@ -2848,8 +2860,7 @@ msgstr "" " Eksempel: Sun, 08 Mar 2009 14:56:49 +0100\n" "\n" -#: src/date.c:143 -#, fuzzy +#: src/date.c:147 msgid "" " --rfc-3339=TIMESPEC output date and time in RFC 3339 format.\n" " TIMESPEC='date', 'seconds', or 'ns' for\n" @@ -2867,7 +2878,7 @@ msgstr "" " -s, --set=STRENG indstil tiden som beskrevet af STRENG\n" " -u, --utc, --universal udskriv eller indstil universel tid (UTC)\n" -#: src/date.c:154 +#: src/date.c:158 msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" @@ -2881,7 +2892,7 @@ msgstr "" " %% et ordret %-tegn\n" " %a lokaliseret, forkortet ugedagsnavn (f.eks. søn)\n" -#: src/date.c:161 +#: src/date.c:165 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2894,7 +2905,7 @@ msgstr "" " %c lokaliseret dato og tid (f.eks. lør 04 nov 1989 12:02:33 CET)\n" # Bemærk: med dansk $LANG er %m/%d/%y stadig opførslen af %D -#: src/date.c:167 +#: src/date.c:171 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2907,7 +2918,7 @@ msgstr "" " %e dag i måned, indledende nul erstattet med blanktegn; samme som %_d\n" # 'year of ISO week number' er umiddelbart meget mystisk, men det lader til at ISO har en ugenummereringsstandard hvor årene ikke følger den Gregorianske kalender, http://en.wikipedia.org/wiki/ISO_week_date -#: src/date.c:173 +#: src/date.c:177 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -2917,7 +2928,7 @@ msgstr "" " %g sidste to cifre af året ved ISO-ugetal (se %G)\n" " %G året ved ISO-ugetal (se %V); er normalt kun nyttig sammen med %V\n" -#: src/date.c:178 +#: src/date.c:182 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2929,7 +2940,7 @@ msgstr "" " %I time (01-12)\n" " %j dag på året (001-366)\n" -#: src/date.c:184 +#: src/date.c:188 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -2941,7 +2952,7 @@ msgstr "" " %m måned (01-12)\n" " %M minut (00-59)\n" -#: src/date.c:190 +#: src/date.c:194 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2959,7 +2970,7 @@ msgstr "" " %R 24-timers tid i timer og minutter; samme som %H:%M\n" " %s sekunder siden 1970-01-01 00:00:00 UTC\n" -#: src/date.c:199 +#: src/date.c:203 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2971,7 +2982,7 @@ msgstr "" " %T tid; samme som %H:%M:%S\n" " %u dag i ugen (1..7), 1 betyder mandag\n" -#: src/date.c:205 +#: src/date.c:209 msgid "" " %U week number of year, with Sunday as first day of week (00..53)\n" " %V ISO week number, with Monday as first day of week (01..53)\n" @@ -2983,7 +2994,7 @@ msgstr "" " %w ugedag (0..6); søndag repræsenteres som 0\n" " %W ugenummer, med mandag som første dag i ugen (00..53)\n" -#: src/date.c:211 +#: src/date.c:215 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -2995,7 +3006,7 @@ msgstr "" " %y sidste to cifre i årstallet (00..99)\n" " %Y år\n" -#: src/date.c:217 +#: src/date.c:221 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -3015,8 +3026,7 @@ msgstr "" "\n" "Som standard vil date udfylde eventuelle ekstra cifre ned nuller.\n" -#: src/date.c:226 -#, fuzzy +#: src/date.c:230 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -3028,13 +3038,13 @@ msgid "" msgstr "" "Følgende valgfri flag kan følge '%':\n" "\n" -" - (bindestreg) udfyld ikke ekstra cifre\n" +" - (bindestreg) udfyld ikke feltet\n" " _ (understreg) udfyld med blanktegn\n" " 0 (nul) udfyld med nuller\n" " ^ brug store bogstaver hvis muligt\n" " # brug store/små bogstaver omvendt, hvis muligt\n" -#: src/date.c:235 +#: src/date.c:239 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -3048,7 +3058,7 @@ msgstr "" "E for at bruge lokaltilpassede repræsentationer, hvis tilgængelige, eller\n" "O for at bruge lokaltilpassede numeriske symboler, hvis tilgængelige.\n" -#: src/date.c:242 +#: src/date.c:246 msgid "" "\n" "Examples:\n" @@ -3072,36 +3082,36 @@ 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:275 src/dd.c:2193 src/head.c:838 src/md5sum.c:477 -#: src/md5sum.c:798 src/od.c:863 src/od.c:1914 src/pr.c:1176 src/pr.c:1372 -#: src/pr.c:1494 src/stty.c:842 src/tac.c:563 src/tail.c:343 src/tee.c:126 +#: 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 #, c-format msgid "standard input" msgstr "standard-ind" -#: src/date.c:303 src/date.c:523 +#: src/date.c:307 src/date.c:527 #, c-format msgid "invalid date %s" msgstr "ugyldig dato %s" -#: src/date.c:414 src/date.c:448 +#: src/date.c:418 src/date.c:452 #, c-format msgid "multiple output formats specified" msgstr "flere udskriftsformater angivet" -#: src/date.c:426 +#: src/date.c:430 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "flagene for at angive datoer til udskriving kan ikke bruges sammen" -#: src/date.c:433 +#: src/date.c:437 #, c-format msgid "the options to print and set the time may not be used together" msgstr "flagene for at udskrive og sætte tiden kan ikke bruges sammen" -#: src/date.c:454 -#, fuzzy, c-format +#: src/date.c:458 +#, c-format msgid "" "the argument %s lacks a leading '+';\n" "when using an option to specify date(s), any non-option\n" @@ -3111,23 +3121,23 @@ msgstr "" "når man bruger et flag for at angive datoer, skal hvert argument,\n" "der ikke er flag, være en formatstreng som begynder med '+'" -#: src/date.c:531 +#: src/date.c:535 #, c-format msgid "cannot set date" msgstr "kan ikke sætte dato" -#: src/date.c:554 src/du.c:360 +#: src/date.c:558 src/du.c:371 #, c-format msgid "time %s is out of range" msgstr "tidspunktet %s uden for område" #. This is a proper name. See the gettext manual, section Names. -#: src/dd.c:44 src/factor.c:43 src/rm.c:41 src/tail.c:69 src/touch.c:41 +#: 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 "Paul Rubin" -#: src/dd.c:517 +#: src/dd.c:521 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3136,8 +3146,7 @@ msgstr "" "Brug: %s [OPERAND]...\n" " eller: %s FLAG\n" -#: src/dd.c:522 -#, fuzzy +#: src/dd.c:526 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -3153,10 +3162,10 @@ msgstr "" " cbs=BYTE konvertér BYTE byte ad gangen\n" " conv=KONV konvertér fil som angivet ved kommaadskilt liste af " "symboler\n" -" count=BLOKKE kopiér kun BLOKKE indblokke\n" +" count=N kopiér kun N indblokke\n" " ibs=BYTE læs BYTE byte ad gangen (standard: 512)\n" -#: src/dd.c:531 +#: src/dd.c:535 #, fuzzy msgid "" " if=FILE read from FILE instead of stdin\n" @@ -3166,7 +3175,8 @@ msgid "" " oflag=FLAGS write as per the comma separated symbol list\n" " seek=N skip N obs-sized blocks at start of output\n" " skip=N skip N ibs-sized blocks at start of input\n" -" status=noxfer suppress transfer statistics\n" +" status=WHICH WHICH info to suppress outputting to stderr;\n" +" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" msgstr "" " if=FIL læs fra FIL i stedet for stdin\n" " iflag=FLAG læs som angivet ved kommaadskilt liste af symboler\n" @@ -3179,10 +3189,11 @@ msgstr "" " begyndelsen af inddata\n" " status=noxfer udelad statistik for overførsel\n" -#: src/dd.c:541 +#: src/dd.c:546 +#, fuzzy msgid "" "\n" -"BLOCKS and BYTES may be followed by the following multiplicative suffixes:\n" +"N and BYTES may be followed by the following multiplicative suffixes:\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, and so on for T, P, E, Z, Y.\n" "\n" @@ -3197,8 +3208,7 @@ msgstr "" "Hvert KONV-symbol kan være:\n" "\n" -#: src/dd.c:550 -#, fuzzy +#: src/dd.c:555 msgid "" " ascii from EBCDIC to ASCII\n" " ebcdic from ASCII to EBCDIC\n" @@ -3222,11 +3232,12 @@ msgstr "" " som givet i cbs\n" " lcase lav store bogstaver om til små\n" " ucase ændr små bogstaver til store bogstaver\n" +" sparse prøv at søge frem for at skrive uddata for NUL-indblokke\n" " swab ombyt hvert par af ind-byte\n" " 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:563 +#: src/dd.c:568 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3242,7 +3253,7 @@ msgstr "" " fdatasync skriv data til udfil fysisk før der afsluttes\n" " fsync tilsvarende, men skriv også metadata\n" -#: src/dd.c:571 +#: src/dd.c:576 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3256,76 +3267,76 @@ msgstr "" " append tilføjelsestilstand (kun meningsfuld ved udskrift;\n" " conv=notrunc anbefales)\n" -#: src/dd.c:578 +#: src/dd.c:583 msgid " cio use concurrent I/O for data\n" msgstr " cio brug parallel data-I/O\n" -#: src/dd.c:580 +#: src/dd.c:585 msgid " direct use direct I/O for data\n" msgstr " direct brug direkte data-I/O\n" -#: src/dd.c:582 +#: src/dd.c:587 msgid " directory fail unless a directory\n" msgstr " directory meld fejl for ikke-kataloger\n" -#: src/dd.c:584 +#: src/dd.c:589 msgid " dsync use synchronized I/O for data\n" msgstr " dsync brug synkroniseret I/O til data\n" -#: src/dd.c:586 +#: src/dd.c:591 msgid " sync likewise, but also for metadata\n" msgstr " sync tilsvarende, men også for metadata\n" -#: src/dd.c:587 +#: src/dd.c:592 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr " fullblock opsaml fulde ind-blokke (kun iflag)\n" -#: src/dd.c:590 +#: src/dd.c:595 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock brug ikkeblokerende I/O\n" -#: src/dd.c:592 +#: src/dd.c:597 msgid " noatime do not update access time\n" msgstr " noatime opdatér ikke tilgangstid\n" -#: src/dd.c:595 +#: src/dd.c:600 msgid " nocache discard cached data\n" msgstr " nocache forkast lagrede data\n" -#: src/dd.c:598 +#: src/dd.c:603 msgid " noctty do not assign controlling terminal from file\n" msgstr " noctty tildel ikke styrende terminal fra fil\n" -#: src/dd.c:601 +#: src/dd.c:606 msgid " nofollow do not follow symlinks\n" msgstr " nofollow følg ikke symbolske lænker\n" -#: src/dd.c:603 +#: src/dd.c:608 msgid " nolinks fail if multiply-linked\n" msgstr " nolinks meld fejl hvis lænket flere gange\n" -#: src/dd.c:605 +#: src/dd.c:610 msgid " binary use binary I/O for data\n" msgstr " binary brug binær I/O til data\n" -#: src/dd.c:607 +#: src/dd.c:612 msgid " text use text I/O for data\n" msgstr " text brug tekst-I/O til data\n" -#: src/dd.c:609 +#: src/dd.c:614 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" -msgstr "" +msgstr " count_bytes behandl 'count=N' som et antal byte (kun iflag)\n" -#: src/dd.c:612 +#: src/dd.c:617 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" -msgstr "" +msgstr " skip_bytes behandl 'skip=N' som et antal byte (kun iflag)\n" -#: src/dd.c:615 +#: src/dd.c:620 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" -msgstr "" +msgstr " seek_bytes behandl 'seek=N' som et antal byte (kun oflag)\n" -#: src/dd.c:620 -#, fuzzy, c-format +#: src/dd.c:625 +#, c-format msgid "" "\n" "Sending a %s signal to a running 'dd' process makes it\n" @@ -3353,7 +3364,7 @@ msgstr "" "Mulige flag:\n" "\n" -#: src/dd.c:676 +#: src/dd.c:683 #, c-format msgid "" "%<PRIuMAX>+%<PRIuMAX> records in\n" @@ -3362,21 +3373,21 @@ msgstr "" "%<PRIuMAX>+%<PRIuMAX> blokke ind\n" "%<PRIuMAX>+%<PRIuMAX> blokke ud\n" -#: src/dd.c:682 +#: src/dd.c:689 #, 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:694 +#: src/dd.c:701 #, 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:712 +#: src/dd.c:720 msgid "Infinity B" msgstr "Uendelig B" @@ -3390,83 +3401,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:725 +#: src/dd.c:733 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g s, %s/s\n" -#: src/dd.c:804 +#: src/dd.c:812 #, c-format msgid "closing input file %s" msgstr "lukker indfil %s" -#: src/dd.c:811 +#: src/dd.c:819 #, c-format msgid "closing output file %s" msgstr "lukker uddatafil %s" -#: src/dd.c:1014 +#: src/dd.c:1022 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "kunne ikke slå O_DIRECT fra: %s" -#: src/dd.c:1085 src/dd.c:1934 +#: src/dd.c:1093 src/dd.c:1942 #, c-format msgid "writing to %s" msgstr "skriver til %s" -#: src/dd.c:1199 src/dd.c:1253 +#: src/dd.c:1207 src/dd.c:1261 #, c-format msgid "unrecognized operand %s" msgstr "ukendt operand %s" -#: src/dd.c:1210 +#: src/dd.c:1218 msgid "invalid conversion" msgstr "ugyldig konvertering" -#: src/dd.c:1213 src/dd.c:1289 +#: src/dd.c:1221 src/dd.c:1297 msgid "invalid input flag" msgstr "ugyldigt ind-flag" -#: src/dd.c:1216 src/dd.c:1283 src/dd.c:1295 +#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303 msgid "invalid output flag" msgstr "ugyldigt ud-flag" -#: src/dd.c:1219 +#: src/dd.c:1227 msgid "invalid status flag" msgstr "ugyldigt statusflag" -#: src/dd.c:1258 src/truncate.c:312 +#: src/dd.c:1266 src/truncate.c:310 #, c-format msgid "invalid number %s" msgstr "ugyldigt antal %s" -#: src/dd.c:1340 +#: src/dd.c:1348 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "kan ikke kombinere nogen af {ascii,ebcdic,ibm}" -#: src/dd.c:1342 +#: src/dd.c:1350 #, c-format msgid "cannot combine block and unblock" msgstr "kan ikke kombinere block og unblock" -#: src/dd.c:1344 +#: src/dd.c:1352 #, c-format msgid "cannot combine lcase and ucase" msgstr "kan ikke kombinere lcase og ucase" -#: src/dd.c:1346 +#: src/dd.c:1354 #, c-format msgid "cannot combine excl and nocreat" msgstr "kan ikke kombinere excl og nocreat" -#: src/dd.c:1349 +#: src/dd.c:1357 #, c-format msgid "cannot combine direct and nocache" msgstr "kan ikke kombinere direct og nocache" -#: src/dd.c:1506 +#: src/dd.c:1514 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3475,72 +3486,72 @@ 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:1593 +#: src/dd.c:1601 #, c-format msgid "%s: cannot skip" msgstr "%s: kan ikke overspringe" -#: src/dd.c:1595 src/dd.c:1614 src/dd.c:1675 +#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683 #, c-format msgid "%s: cannot seek" msgstr "%s: kan ikke søge" -#: src/dd.c:1655 +#: src/dd.c:1663 #, c-format msgid "offset overflow while reading file %s" msgstr "overløb for afsæt ved læsning af fil %s" -#: src/dd.c:1667 +#: src/dd.c:1675 #, c-format msgid "warning: invalid file offset after failed read" msgstr "advarsel: ugyldigt filafsæt efter fejlslagen læsning" -#: src/dd.c:1671 +#: src/dd.c:1679 #, c-format msgid "cannot work around kernel bug after all" msgstr "kan ikke arbejde omkring kernefejl alligevel" -#: src/dd.c:1814 +#: src/dd.c:1822 #, c-format msgid "setting flags for %s" msgstr "sætter flag for %s" -#: src/dd.c:1867 +#: 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:1881 +#: 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:1914 +#: src/dd.c:1922 #, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: kan ikke springe til det angivne afsæt" -#: src/dd.c:2125 src/dd.c:2258 -#, c-format -msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" +#: src/dd.c:2133 +#, fuzzy, c-format +msgid "failed to truncate to %<PRIdMAX> bytes in output file %s" msgstr "kunne ikke afkorte til %<PRIuMAX> byte i udfilen %s" -#: src/dd.c:2138 +#: src/dd.c:2146 #, c-format msgid "fdatasync failed for %s" msgstr "fdatasync mislykkedes for %s" -#: src/dd.c:2148 +#: src/dd.c:2156 #, c-format msgid "fsync failed for %s" msgstr "fsync mislykkedes for %s" -#: src/dd.c:2199 src/dd.c:2228 +#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165 #, c-format -msgid "opening %s" -msgstr "åbner %s" +msgid "failed to open %s" +msgstr "kunne ikke åbne %s" -#: src/dd.c:2237 +#: src/dd.c:2246 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) " @@ -3549,85 +3560,106 @@ msgstr "" "afsæt for stort: kan ikke afkorte til en længde på seek=%<PRIuMAX> (%lu-" "byte) blokke" -#: src/dd.c:2274 src/dd.c:2280 +#: src/dd.c:2267 +#, 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 #, 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:54 src/expr.c:153 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:39 src/sleep.c:35 src/sort.c:66 +#: 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 msgid "Paul Eggert" msgstr "Paul Eggert" -#: src/df.c:140 +#: src/df.c:172 msgid "Filesystem" msgstr "Filsystem" -#: src/df.c:141 +#: src/df.c:175 msgid "Type" msgstr "Type" -#: src/df.c:142 +#: src/df.c:178 src/df.c:542 msgid "blocks" msgstr "blokke" -#: src/df.c:142 -msgid "Inodes" -msgstr "Inoder" - -#: src/df.c:142 -msgid "Size" -msgstr "Størr" - -#: src/df.c:143 +#: src/df.c:181 msgid "Used" msgstr "Brugt" -#: src/df.c:143 -msgid "IUsed" -msgstr "IBrugt" - -#: src/df.c:144 +#: src/df.c:184 msgid "Available" msgstr "Tilbage" -#: src/df.c:144 -msgid "IFree" -msgstr "IFri" - -#: src/df.c:144 -msgid "Avail" -msgstr "Tilb" - -#: src/df.c:145 +#: src/df.c:187 msgid "Use%" msgstr "Brug%" -#: src/df.c:145 +#: src/df.c:190 +msgid "Inodes" +msgstr "Inoder" + +#: src/df.c:193 +msgid "IUsed" +msgstr "IBrugt" + +#: src/df.c:196 +msgid "IFree" +msgstr "IFri" + +#: src/df.c:199 msgid "IUse%" msgstr "IBrug%" -#: src/df.c:145 +#: src/df.c:202 +msgid "Mounted on" +msgstr "Monteret på" + +#: src/df.c:383 +#, c-format +msgid "option --output: field '%s' unknown" +msgstr "" + +#: 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:410 src/df.c:449 +msgid "Size" +msgstr "Størr" + +#: src/df.c:414 src/df.c:451 +msgid "Avail" +msgstr "Tilb" + +#: src/df.c:474 msgid "Capacity" msgstr "Kapacitet" -#: src/df.c:146 -msgid "Mounted on" -msgstr "Monteret på" +#. 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 +#, c-format +msgid "%s-%s" +msgstr "" -#: src/df.c:847 +#: src/df.c:1210 +#, fuzzy msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" -"\n" msgstr "" "Vis information om filsystemet som FIL ligger på, eller som \n" "standard alle filsystemer.\n" "\n" -#: src/df.c:855 -#, fuzzy +#: src/df.c:1217 msgid "" " -a, --all include dummy file systems\n" " -B, --block-size=SIZE scale sizes by SIZE before printing them. E.g.,\n" @@ -3647,9 +3679,8 @@ msgstr "" " --total udskriv en samlet sum\n" " -h, --human-readable skriv størrelser på en læsevenlig form \n" " (f.eks. 1K 234M 2G)\n" -" -H, --si det samme, men brug 1000 som grundtal, ikke 1024\n" -#: src/df.c:865 +#: src/df.c:1227 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3663,8 +3694,12 @@ msgstr "" " --no-sync kør ikke sync før hentning af forbrugsinfo " "(standard)\n" -#: src/df.c:872 +#: src/df.c:1234 +#, fuzzy msgid "" +" --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" +" or print all fields if FIELD_LIST is " +"omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" " -t, --type=TYPE limit listing to file systems of type TYPE\n" @@ -3679,20 +3714,41 @@ msgstr "" " -x, --exclude-type=TYPE vis kun filsystemer som ikke er af typen TYPE\n" " -v (ignoreret)\n" -#: src/df.c:1027 +#: src/df.c:1248 +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" +msgstr "" + +#: src/df.c:1285 +#, fuzzy, c-format +msgid "options %s and %s are mutually exclusive" +msgstr "flagene --compare (-C) og --strip 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 #, 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:1075 +#: src/df.c:1500 msgid "Warning: " msgstr "Advarsel: " -#: src/df.c:1077 src/stat.c:795 +#: src/df.c:1502 src/stat.c:814 msgid "cannot read table of mounted file systems" msgstr "kan ikke læse tabellen over monterede filsystemer" -#: src/df.c:1107 +#: src/df.c:1539 #, c-format msgid "no file systems processed" msgstr "ingen filsystemer behandlet" @@ -3725,7 +3781,6 @@ msgstr "" " -p, --print-database udskriv den interne database\n" #: src/dircolors.c:108 -#, fuzzy msgid "" "\n" "If FILE is specified, read it to determine which colors to use for which\n" @@ -3735,8 +3790,9 @@ msgstr "" "\n" "Hvis FIL er angivet, læs den for at bestemme hvilke farver der skal bruges " "til\n" -"hvilke filtyper og endelser. Ellers bliver en foroversat database brugt.\n" -"For detaljer om formatet af disse filer kør 'dircolors --print-database'.\n" +"hvilke filtyper og endelser. Ellers bruges en forudkompileret database.\n" +"For detaljer om formatet for disse filer, så kør 'dircolors --print-" +"database'.\n" #: src/dircolors.c:286 #, c-format @@ -3771,12 +3827,11 @@ msgid "no SHELL environment variable, and no shell type option given" msgstr "ingen SHELL-miljøvariabel, og ingen skal-type angivet med flag" #: src/dirname.c:50 -#, fuzzy, c-format +#, c-format msgid "Usage: %s [OPTION] NAME...\n" -msgstr "Brug: %s [FLAG]... NAVN...\n" +msgstr "Brug: %s [FLAG] NAVN...\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 " @@ -3788,12 +3843,11 @@ msgstr "" "nogen skråstreger, så udskriv '.' (for nuværende katalog).\n" #: src/dirname.c:59 -#, fuzzy msgid " -z, --zero separate output with NUL rather than newline\n" -msgstr " -0, --null afslut linjer med en 0-byte frem for linjeskift\n" +msgstr " -z, --zero afslut linjer med en 0-byte frem for linjeskift\n" #: src/dirname.c:64 -#, fuzzy, c-format +#, c-format msgid "" "\n" "Examples:\n" @@ -3803,10 +3857,11 @@ msgid "" msgstr "" "\n" "Eksempler:\n" -" %s /usr/bin/ Udskriv \"/usr\".\n" -" %s stdio.h Udskriv \".\".\n" +" %s /usr/bin/ -> \"/usr\"\n" +" %s dir1/str dir2/str -> \"dir1\" efterfulgt af \"dir2\"\n" +" %s stdio.h -> \".\"\n" -#: src/du.c:260 src/sort.c:390 src/wc.c:112 +#: src/du.c:270 src/sort.c:394 src/wc.c:112 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3815,17 +3870,18 @@ msgstr "" "Brug: %s [FLAG]... [FIL]...\n" " eller: %s [FLAG]... --files0-from=F\n" -#: src/du.c:264 -msgid "" -"Summarize disk usage of each FILE, recursively for directories.\n" -"\n" +#: src/du.c:274 +#, fuzzy +msgid "Summarize disk usage of each FILE, recursively for directories.\n" msgstr "" "Opsummér diskforbrug for hver FIL, rekursivt for kataloger.\n" "\n" -#: src/du.c:271 +#: src/du.c:280 #, fuzzy msgid "" +" -0, --null end each output line with 0 byte rather than " +"newline\n" " -a, --all write counts for all files, not just directories\n" " --apparent-size print apparent sizes, rather than disk usage; " "although\n" @@ -3834,14 +3890,14 @@ msgid "" " fragmentation, indirect blocks, and the like\n" msgstr "" " -a, --all udskriv antal for alle filer, ikke kun kataloger\n" -" --apparent-size udskriv tilsyneladende størrelser i stedet for \n" +" --apparent-size udskriv tilsyneladende størrelser i stedet for\n" " diskforbrug; selvom den tilsyneladende størrelse\n" " normalt er mindre, kan den være større på grund " -"af \n" -" huller i (ikke-sammenhængende) filer, intern \n" +"af\n" +" huller i (ikke-sammenhængende) filer, intern\n" " fragmentering, indirekte blokke og lignende\n" -#: src/du.c:279 +#: src/du.c:289 #, fuzzy msgid "" " -B, --block-size=SIZE scale sizes by SIZE before printing them. E.g.,\n" @@ -3851,6 +3907,11 @@ msgid "" " -c, --total produce a grand total\n" " -D, --dereference-args dereference only symlinks that are listed on the\n" " command line\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 "" " -B, --block-size=STØR skalér størrelser med STØR før de udskrives. F." "eks.\n" @@ -3862,7 +3923,8 @@ msgstr "" " -D, --dereference-args dereferér kun symbolske lænker, som angives på\n" " kommandolinjen\n" -#: src/du.c:288 +#: src/du.c:302 +#, fuzzy msgid "" " --files0-from=F summarize disk usage of the NUL-terminated file\n" " names specified in file F;\n" @@ -3870,7 +3932,6 @@ msgid "" " -H equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" --si like -h, but use powers of 1000 not 1024\n" msgstr "" " --files0-from=F giv oversigt over diskforbrug for de NUL-afsluttede\n" " filnavne angivet i filen F;\n" @@ -3880,9 +3941,11 @@ msgstr "" " (f.eks. 1K 234M 2G)\n" " --si som -h, men brug potenser af 1000 frem for 1024\n" -#: src/du.c:297 +#: src/du.c:310 +#, fuzzy 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 "" @@ -3890,14 +3953,13 @@ msgstr "" " -l, --count-links tæl størrelser flere gange for hårde lænker\n" " -m som --block-size=1M\n" -#: src/du.c:302 +#: src/du.c:316 +#, fuzzy msgid "" -" -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " "default)\n" -" -0, --null end each output line with 0 byte rather than " -"newline\n" " -S, --separate-dirs 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" @@ -3907,31 +3969,11 @@ msgstr "" " -S, --separate-dirs medtag ikke størrelsen på underkataloger\n" " -s, --summarize vis kun sum for hvert argument\n" -#: src/du.c:309 -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 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" - -#: src/du.c:318 +#: src/du.c:322 #, fuzzy msgid "" +" -t, --threshold=SIZE exclude entries smaller than SIZE if positive,\n" +" or entries greater than SIZE if negative\n" " --time show time of the last modification of any file in " "the\n" " directory, or any of its subdirectories\n" @@ -3941,75 +3983,82 @@ msgid "" " full-iso, long-iso, iso, +FORMAT\n" " FORMAT is interpreted like 'date'\n" msgstr "" -" --time vis sidste modifikationstid som den seneste \n" -" modifikationstids for enhver fil i mappen og " -"dens \n" -" undermapper\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" " FORMAT fortolkes som i 'date'\n" -#: src/du.c:375 -#, fuzzy +#: src/du.c:333 +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 msgid "Infinity" -msgstr "Uendelig B" +msgstr "Uendelig" + +#: src/du.c:507 +#, c-format +msgid "mount point %s already traversed" +msgstr "" -#: src/du.c:600 +#: src/du.c:624 #, c-format msgid "fts_read failed: %s" msgstr "fts_read mislykkedes: %s" -#: src/du.c:724 +#: src/du.c:780 #, c-format msgid "invalid maximum depth %s" msgstr "ugyldig største dybde %s" -#: src/du.c:817 +#: src/du.c:809 +#, fuzzy, c-format +msgid "invalid --threshold argument '-0'" +msgstr "ugyldigt argument %2$s til --%1$s" + +#: src/du.c:887 #, c-format msgid "cannot both summarize and show all entries" msgstr "kan ikke både summere og vise alle størrelser" -#: src/du.c:824 +#: src/du.c:894 #, 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:830 +#: src/du.c:900 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "advarsel: summering er i konflikt med --max-depth=%lu" -#: src/du.c:896 src/sort.c:4479 src/wc.c:668 +#: src/du.c:966 src/sort.c:4533 src/wc.c:668 msgid "file operands cannot be combined with --files0-from" msgstr "filoperander kan ikke kombineres med --files0-from" -#: src/du.c:949 src/md5sum.c:587 src/od.c:903 src/tac.c:239 src/tac.c:350 -#: src/tac.c:506 src/tac.c:586 src/wc.c:733 +#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 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:963 src/sort.c:4508 src/wc.c:747 +#: src/du.c:1040 src/sort.c:4562 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:980 src/du.c:988 src/wc.c:760 src/wc.c:768 +#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768 msgid "invalid zero-length file name" msgstr "ugyldigt filnavn af længde nul" -#: src/du.c:1007 src/head.c:149 src/head.c:262 src/head.c:334 src/head.c:538 -#: src/head.c:620 src/head.c:692 src/head.c:750 src/head.c:774 src/tail.c:412 -#: src/tail.c:500 src/tail.c:549 src/tail.c:642 src/tail.c:770 src/tail.c:818 -#: src/tail.c:855 src/tail.c:1782 src/tail.c:1812 src/uniq.c:395 -#, c-format -msgid "error reading %s" -msgstr "fejl ved læsning af %s" - -#: src/du.c:1010 src/ls.c:2649 src/wc.c:791 +#: src/du.c:1088 src/ls.c:2649 src/wc.c:791 msgid "total" msgstr "totalt" @@ -4113,9 +4162,12 @@ msgid "Usage: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n" 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 "" + +#: src/env.c:61 +#, fuzzy msgid "" -"Set each NAME to VALUE in the environment and run COMMAND.\n" -"\n" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with 0 byte rather than newline\n" " -u, --unset=NAME remove variable from the environment\n" @@ -4126,7 +4178,7 @@ msgstr "" " linjeskift\n" " -u, --unset=NAVN fjern miljøvariablen NAVN\n" -#: src/env.c:64 +#: src/env.c:68 msgid "" "\n" "A mere - implies -i. If no COMMAND, print the resulting environment.\n" @@ -4136,32 +4188,32 @@ msgstr "" "det resulterende miljø.\n" # Bemærk at det er env.c -- denne streng refererer til at 'unsette' miljøvariable -#: src/env.c:120 +#: src/env.c:124 #, c-format msgid "cannot unset %s" msgstr "kan ikke fjerne miljøvariabel %s" -#: src/env.c:131 +#: src/env.c:135 #, c-format msgid "cannot set %s" msgstr "kan ikke sætte %s" -#: src/env.c:148 +#: src/env.c:152 #, c-format 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" -"\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:115 +#: src/expand.c:114 msgid "" " -i, --initial do not convert tabs after non blanks\n" " -t, --tabs=NUMBER have tabs NUMBER characters apart, not 8\n" @@ -4169,32 +4221,32 @@ msgstr "" " -i, --initial konvertér ikke tabulatorer efter ikke-blanke tegn\n" " -t, --tabs=ANTAL hav tabulatorer ANTAL tegn fra hinanden, ikke 8\n" -#: src/expand.c:119 +#: src/expand.c:118 msgid "" " -t, --tabs=LIST use comma separated list of explicit tab positions\n" msgstr " -t, --tabs=LISTE brug komma-separeret LISTE med tab-positioner\n" -#: src/expand.c:172 src/unexpand.c:191 +#: src/expand.c:171 src/unexpand.c:190 #, c-format msgid "tab stop is too large %s" msgstr "tabulatorstop for stort %s" -#: src/expand.c:180 src/unexpand.c:199 +#: src/expand.c:179 src/unexpand.c:198 #, c-format msgid "tab size contains invalid character(s): %s" msgstr "tabulatorstørrelsen indeholder ugyldige tegn: %s" -#: src/expand.c:206 src/unexpand.c:225 +#: src/expand.c:205 src/unexpand.c:224 #, c-format msgid "tab size cannot be 0" msgstr "tabulatorstørrelse kan ikke være 0" -#: src/expand.c:208 src/unexpand.c:227 +#: src/expand.c:207 src/unexpand.c:226 #, c-format msgid "tab sizes must be ascending" msgstr "tabulatorstørrelser skal være stigende" -#: src/expand.c:326 src/expand.c:345 src/unexpand.c:374 src/unexpand.c:419 +#: 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 "ind-linjen er for lang" @@ -4298,16 +4350,15 @@ msgstr "" " length STRENG længden af STRENG\n" #: src/expr.c:251 -#, fuzzy 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 "" -" + ELEMENT tolk ELEMENT som en streng, selv om den er et\n" +" + SYMBOL tolk SYMBOL som en streng, selv om den er et\n" " nøgleord som \"match\" eller en operator som " -"\"/\"\n" +"'/'\n" " ( UDTRYK ) værdien af UDTRYK\n" #: src/expr.c:257 @@ -4355,12 +4406,12 @@ msgstr "fejl i regulært udtryksmatcher" msgid "non-integer argument" msgstr "ikke-heltalligt argument" -#: src/expr.c:793 src/truncate.c:316 +#: src/expr.c:793 src/truncate.c:314 #, c-format msgid "division by zero" msgstr "deling med nul" -#: src/expr.c:887 src/sort.c:2029 +#: src/expr.c:887 src/sort.c:2044 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "sæt LC_ALL='C' for at omgå problemet" @@ -4370,25 +4421,32 @@ msgstr "sæt LC_ALL='C' for at omgå problemet" msgid "the strings compared were %s and %s" msgstr "de sammenlignede strenge var %s og %s" -#: src/factor.c:449 -msgid "using arbitrary-precision arithmetic" -msgstr "regner med arbitrær præcision" +#. This is a proper name. See the gettext manual, section Names. +#: src/factor.c:111 +msgid "Niels Moller" +msgstr "" -#: src/factor.c:460 -msgid "using single-precision arithmetic" -msgstr "regner med enkeltpræcision" +#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459 +#, c-format +msgid "Lucas prime test failure. This should not happen" +msgstr "" -#: src/factor.c:465 src/od.c:1640 src/od.c:1709 +#: src/factor.c:2092 #, c-format -msgid "%s is too large" -msgstr "%s er for stor" +msgid "squfof queue overflow" +msgstr "" -#: src/factor.c:469 +#: src/factor.c:2419 #, c-format msgid "%s is not a valid positive integer" msgstr "%s er ikke et gyldigt positivt heltal" -#: src/factor.c:494 +#: src/factor.c:2442 src/od.c:1646 src/od.c:1715 +#, c-format +msgid "%s is too large" +msgstr "%s er for stor" + +#: src/factor.c:2454 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4397,7 +4455,7 @@ msgstr "" "Brug: %s [TAL]...\n" " eller: %s FLAG\n" -#: src/factor.c:499 +#: src/factor.c:2459 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" @@ -4424,21 +4482,21 @@ msgid "cannot stat current directory (now %s)" msgstr "kan ikke anvende stat på nuværende katalog (nu %s)" #. This is a proper name. See the gettext manual, section Names. -#: src/fmt.c:37 +#: src/fmt.c:38 msgid "Ross Paterson" msgstr "Ross Paterson" -#: src/fmt.c:269 +#: src/fmt.c:270 #, c-format msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n" 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:270 +#: 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" -"\n" msgstr "" "Omformatér hvert afsnit i FILerne, og skriv til standard-ud.\n" "Flaget -BREDDE er en forkortet form af --width=BREDDE.\n" @@ -4457,8 +4515,8 @@ msgstr "" " linjer\n" " -s, --split-only opdel lange linjer, men fyld ikke op\n" -#: src/fmt.c:285 -#, fuzzy, c-format +#: src/fmt.c:287 +#, 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" @@ -4469,8 +4527,9 @@ msgstr "" "næste\n" " -u, --uniform-spacing et mellemrum mellem ord, to efter sætninger\n" " -w, --width=BREDDE maksimal linjelængde (ellers 75 kolonner)\n" +" -g, --goal=BREDDE målbredde (som standard 93 % af bredden)\n" -#: src/fmt.c:357 +#: src/fmt.c:359 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -4479,22 +4538,22 @@ msgstr "" "ugyldigt flag -- %c; -BREDDE genkendes kun når det er første flag;\n" "brug -w N i stedet" -#: src/fmt.c:403 src/fmt.c:414 +#: src/fmt.c:405 src/fmt.c:416 #, c-format 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" -"\n" msgstr "" "Ombryd linjerne i hver FIL (forvalgt standard-ind), og skriv til standard-" "ud\n" "\n" -#: src/fold.c:78 +#: src/fold.c:77 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4504,13 +4563,13 @@ msgstr "" " -s, --spaces ombryd ved mellemrum\n" " -w, --width=BREDDE brug BREDDE kolonner i stedet for 80\n" -#: src/fold.c:289 src/pr.c:836 +#: src/fold.c:288 src/pr.c:832 #, c-format 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:75 +#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 #: src/truncate.c:37 msgid "Padraig Brady" msgstr "Padraig Brady" @@ -4529,17 +4588,17 @@ msgstr "" "skalscript.\n" "\n" -#: src/group-list.c:69 src/id.c:345 src/setuidgid.c:184 +#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184 #, 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:350 +#: src/group-list.c:74 src/id.c:370 #, c-format msgid "failed to get groups for the current process" msgstr "kunne ikke hente grupper for den aktuelle proces" -#: src/group-list.c:104 +#: src/group-list.c:114 #, c-format msgid "cannot find name for group ID %lu" msgstr "kan ikke finde navn for gruppe-ID %lu" @@ -4561,39 +4620,38 @@ msgstr "" "database er ændret).\n" #: src/groups.c:105 src/id.c:233 -#, fuzzy, c-format +#, c-format msgid "cannot get real UID" -msgstr "kan ikke sætte bruger-id" +msgstr "kan ikke finde reel UID" #: src/groups.c:110 src/id.c:241 -#, fuzzy, c-format +#, c-format msgid "cannot get effective GID" -msgstr "kan ikke dereferere %s" +msgstr "kan ikke finde effektiv GID" #: src/groups.c:115 src/id.c:246 -#, fuzzy, c-format +#, c-format msgid "cannot get real GID" -msgstr "kan ikke sætte bruger-id" +msgstr "kan ikke finde reel GID" #: src/groups.c:128 src/id.c:206 -#, fuzzy, c-format +#, c-format msgid "%s: no such user" -msgstr "%s: Ingen sådan bruger" +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" "With no FILE, or when FILE is -, read standard input.\n" -"\n" 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:118 -#, fuzzy +#: src/head.c:117 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -4612,7 +4670,7 @@ msgstr "" "sidste\n" " K linjer af hver fil\n" -#: src/head.c:126 +#: src/head.c:125 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4620,7 +4678,7 @@ msgstr "" " -q, --quiet, --silent udskriv ikke overskrifter med filnavne først\n" " -v, --verbose skriv altid overskrifter med filnavne først\n" -#: src/head.c:132 +#: src/head.c:131 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -4632,58 +4690,58 @@ 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:152 -#, c-format -msgid "error writing %s" -msgstr "fejl ved skrivning af %s" - -#: src/head.c:155 +#: src/head.c:154 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: filen er krympet for meget" -#: src/head.c:228 src/head.c:1044 +#: src/head.c:227 src/head.c:1051 #, c-format msgid "%s: number of bytes is too large" msgstr "%s: antal byte er for stort" -#: src/head.c:441 +#: 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:613 src/head.c:684 src/tail.c:450 +#: src/head.c:612 src/head.c:691 src/tail.c:449 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: kan ikke søge til afsæt %s" -#: src/head.c:791 +#: src/head.c:673 +#, 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" -#: src/head.c:878 +#: src/head.c:885 #, 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:879 +#: src/head.c:886 msgid "number of lines" msgstr "antal linjer" -#: src/head.c:879 +#: src/head.c:886 msgid "number of bytes" msgstr "antal byte" -#: src/head.c:886 src/tail.c:1947 +#: src/head.c:893 src/tail.c:1947 msgid "invalid number of lines" msgstr "ugyldigt antal linjer" -#: src/head.c:887 src/tail.c:1948 +#: src/head.c:894 src/tail.c:1948 msgid "invalid number of bytes" msgstr "ugyldigt antal byte" -#: src/head.c:974 src/head.c:1032 +#: src/head.c:981 src/head.c:1039 #, c-format msgid "invalid trailing option -- %c" msgstr "ugyldigt afsluttende flag -- %c" @@ -4796,90 +4854,90 @@ msgid "can't get process context" msgstr "kan ikke hente proceskontekst" #: src/id.c:224 -#, fuzzy, c-format +#, c-format msgid "cannot get effective UID" -msgstr "kan ikke dereferere %s" +msgstr "kan ikke finde effektiv UID" -#: src/id.c:289 -#, fuzzy, c-format -msgid "cannot find name for user ID %lu" -msgstr "kan ikke finde navnet for bruger-ID %lu" +#: src/id.c:311 +#, c-format +msgid "cannot find name for user ID %s" +msgstr "kan ikke finde navn for bruger-id %s" -#: src/id.c:309 -#, fuzzy, c-format -msgid "uid=%lu" -msgstr "uid=%lu" +#: src/id.c:329 +#, c-format +msgid "uid=%s" +msgstr "uid=%s" -#: src/id.c:314 -#, fuzzy, c-format -msgid " gid=%lu" -msgstr " egid=%lu" +#: src/id.c:334 +#, c-format +msgid " gid=%s" +msgstr " gid=%s" -#: src/id.c:321 -#, fuzzy, c-format -msgid " euid=%lu" -msgstr " egid=%lu" +#: src/id.c:341 +#, c-format +msgid " euid=%s" +msgstr " euid=%s" -#: src/id.c:329 +#: src/id.c:349 #, c-format -msgid " egid=%lu" -msgstr " egid=%lu" +msgid " egid=%s" +msgstr " egid=%s" -#: src/id.c:357 +#: src/id.c:377 msgid " groups=" msgstr " grupper=" -#: src/id.c:373 +#: src/id.c:393 #, c-format msgid " context=%s" msgstr " kontekst=%s" -#: src/install.c:372 +#: src/install.c:373 #, c-format msgid "warning: %s: failed to change context to %s" msgstr "advarsel: %s: kunne ikke ændre kontekst til %s" -#: src/install.c:413 +#: src/install.c:414 #, c-format msgid "creating directory %s" msgstr "opretter katalog %s" -#: src/install.c:481 +#: src/install.c:482 #, c-format msgid "cannot change ownership of %s" msgstr "kan ikke ændre ejerskab for %s" -#: src/install.c:505 +#: src/install.c:506 #, c-format msgid "cannot set time stamps for %s" msgstr "kan ikke sætte tidsstempler for %s" -#: src/install.c:526 src/split.c:412 src/timeout.c:387 +#: src/install.c:527 src/split.c:426 src/timeout.c:439 #, c-format msgid "fork system call failed" msgstr "systemkaldet fork mislykkedes" -#: src/install.c:530 +#: src/install.c:531 #, c-format msgid "cannot run %s" msgstr "kan ikke køre %s" -#: src/install.c:534 +#: src/install.c:535 #, c-format msgid "waiting for strip" msgstr "venter på strip" -#: src/install.c:536 +#: src/install.c:537 #, c-format msgid "strip process terminated abnormally" msgstr "strip-proces afsluttede uplanmæssigt" -#: src/install.c:557 +#: src/install.c:558 #, c-format msgid "invalid user %s" msgstr "ugyldig bruger %s" -#: src/install.c:593 +#: src/install.c:594 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -4892,7 +4950,8 @@ msgstr "" " eller: %s [FLAG]... -t KATALOG KILDE...\n" " eller: %s [FLAG]... -d KATALOG...\n" -#: src/install.c:600 +#: src/install.c:601 +#, fuzzy msgid "" "\n" "This install program copies files (often just compiled) into destination\n" @@ -4904,7 +4963,6 @@ msgid "" "In the first three forms, copy SOURCE to DEST or multiple SOURCE(s) to\n" "the existing DIRECTORY, while setting permission modes and owner/group.\n" "In the 4th form, create all components of the given DIRECTORY(ies).\n" -"\n" msgstr "" "\n" "Dette installationsprogram kopierer filer (ofte umiddelbart efter " @@ -4991,57 +5049,57 @@ msgstr "" " -Z, --context=KONTEKST sæt SELinux-sikkerhedskontekst for filer og " "kataloger\n" -#: src/install.c:858 +#: src/install.c:859 #, 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:868 +#: 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:885 +#: src/install.c:886 #, 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:888 +#: src/install.c:889 #, c-format msgid "target directory not allowed when installing a directory" msgstr "målkatalog ikke tilladt ved installation af et katalog" -#: src/install.c:892 +#: 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:946 src/mkdir.c:202 src/stdbuf.c:327 +#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326 #, c-format msgid "invalid mode %s" msgstr "ugyldig tilstand %s" -#: src/install.c:953 +#: src/install.c:954 #, 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:958 +#: src/install.c:959 #, 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:965 +#: src/install.c:966 #, c-format msgid "options --compare (-C) and --strip are mutually exclusive" msgstr "flagene --compare (-C) og --strip kan ikke bruges samtidigt" -#: src/install.c:971 +#: src/install.c:972 #, c-format msgid "" "the --compare (-C) option is ignored when you specify a mode with non-" @@ -5051,7 +5109,7 @@ msgstr "" "adgangsrettighedsbit" #. This is a proper name. See the gettext manual, section Names. -#: src/join.c:40 src/sort.c:65 +#: src/join.c:40 src/sort.c:66 msgid "Mike Haertel" msgstr "Mike Haertel" @@ -5077,7 +5135,6 @@ msgstr "" " -e TOM erstat manglende ind-felter med TOM\n" #: src/join.c:200 -#, fuzzy msgid "" " -i, --ignore-case ignore differences in case when comparing fields\n" " -j FIELD equivalent to '-1 FIELD -2 FIELD'\n" @@ -5113,8 +5170,8 @@ msgstr "" "og\n" " udskriv dem uden at forsøge parinddeling for disse\n" +# bruger ""-anførselstegn de steder hvor '' optræder i kommandolinjeeksempler af hensyn til læselighed #: src/join.c:218 -#, fuzzy msgid "" "\n" "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n" @@ -5143,14 +5200,14 @@ msgstr "" "hver fil antallet af felter, der udskrives for hver linje.\n" "\n" "Vigtigt: FIL1 og FIL2 skal være sorteret efter flettefelt. Brug f.eks.\n" -"'sort -k 1b,1' hvis 'join' ikke får nogen flag, eller ' join -t '' '\n" +"\"sort -k 1b,1\" hvis 'join' ikke får nogen flag, eller \"join -t ''\"\n" "hvis 'sort' ikke får nogen flag. Bemærk at sammenligninger følger\n" "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 -#, c-format -msgid "%s:%ju: is not sorted: %.*s" +#, fuzzy, c-format +msgid "%s:%<PRIuMAX>: is not sorted: %.*s" msgstr "%s:%ju: er ikke sorteret: %.*s" #: src/join.c:840 src/join.c:1038 @@ -5178,12 +5235,12 @@ msgstr "inkompatible join-felter %lu, %lu" msgid "conflicting empty-field replacement strings" msgstr "modstridende erstatningsstrenge for tomme felter" -#: src/join.c:1101 src/sort.c:4414 +#: src/join.c:1101 src/sort.c:4468 #, c-format msgid "multi-character tab %s" msgstr "flertegns-tabulator %s" -#: src/join.c:1105 src/sort.c:4419 +#: src/join.c:1105 src/sort.c:4473 #, c-format msgid "incompatible tabs" msgstr "inkompatible tabulatorer" @@ -5205,14 +5262,13 @@ msgstr "" " eller: %s -t [SIGNAL]...\n" #: src/kill.c:82 -msgid "" -"Send signals to processes, or list signals.\n" -"\n" +#, fuzzy +msgid "Send signals to processes, or list signals.\n" msgstr "" "Send signaler til processer, eller vis signaler.\n" "\n" -#: src/kill.c:89 +#: src/kill.c:88 msgid "" " -s, --signal=SIGNAL, -SIGNAL\n" " specify the name or number of the signal to be sent\n" @@ -5226,8 +5282,7 @@ msgstr "" " nummer\n" " -t, --table skriv en tabel med signalinformation\n" -#: src/kill.c:97 -#, fuzzy +#: src/kill.c:96 msgid "" "\n" "SIGNAL may be a signal name like 'HUP', or a signal number like '1',\n" @@ -5239,32 +5294,32 @@ msgstr "" "'1', eller en slutstatus fra en proces afsluttet af et signal. PID\n" "er et heltal; hvis det er negativt, identificerer det en procesgruppe.\n" -#: src/kill.c:206 +#: src/kill.c:205 #, c-format msgid "%s: invalid process id" msgstr "%s: ugyldig proces-id" -#: src/kill.c:260 +#: src/kill.c:259 #, c-format msgid "invalid option -- %c" msgstr "ugyldigt flag - %c" -#: src/kill.c:269 +#: src/kill.c:268 #, c-format msgid "%s: multiple signals specified" msgstr "%s: flere signaler angivet" -#: src/kill.c:283 +#: src/kill.c:282 #, c-format msgid "multiple -l or -t options specified" msgstr "flere -l eller -t-flag angivet" -#: src/kill.c:300 +#: src/kill.c:299 #, c-format msgid "cannot combine signal with -l or -t" msgstr "kan ikke kombinere signal med -l eller -t" -#: src/kill.c:306 +#: src/kill.c:305 #, c-format msgid "no process ID specified" msgstr "ingen proces-ID angivet" @@ -5377,17 +5432,18 @@ msgid "" "When creating hard links, each TARGET must exist. Symbolic links\n" "can hold arbitrary text; if later resolved, a relative link is\n" "interpreted in relation to its parent directory.\n" -"\n" msgstr "" "I 1. form: Opret en lænke til MÅL med navnet LÆNKENAVN.\n" "I 2. form: Opret en lænke til MÅL i det nuværende katalog.\n" "I 3. og 4. form: Opret lænker til hvert MÅL i KATALOG.\n" "Opret hårde lænker som standard, eller symbolske lænker med --symbolic.\n" -"Når der oprettes hårde lænker, skal hvert MÅL eksistere. Symbolske\n" -"lænker kan indeholde vilkårlig tekst; en relativ lænke fortolkes i\n" -"relation til dets overkatalog.\n" +"Som udgangspunkt må hver destination (navnet på den nye lænke) ikke " +"allerede\n" +"eksistere. Når der oprettes hårde lænker, skal hvert MÅL eksistere.\n" +"Symbolske lænker kan indeholde vilkårlig tekst; en relativ lænke fortolkes\n" +"i relation til dets overkatalog.\n" -#: src/ln.c:395 +#: src/ln.c:394 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -5410,8 +5466,7 @@ msgstr "" "superbrugeren)\n" " -f, --force fjern eksisterende destinationsfiler\n" -#: src/ln.c:403 -#, fuzzy +#: src/ln.c:402 msgid "" " -i, --interactive prompt whether to remove destinations\n" " -L, --logical dereference TARGETs that are symbolic links\n" @@ -5423,16 +5478,16 @@ msgid "" " -s, --symbolic make symbolic links instead of hard links\n" msgstr "" " -i, --interactive bekræft før sletning af destinationer\n" -" -L, --logical lav hårde lænker til symbolske " -"lænkereferencer\n" -" -n, --no-dereference behandl destination, som er en symbolsk lænke\n" -" til et katalog, som om den er en normal fil\n" +" -L, --logical dereferér MÅL som er symbolske lænker\n" +" -n, --no-dereference behandl LÆNKENAVN som en normal fil, hvis den\n" +" er en symbolsk lænke til et katalog\n" " -P, --physical lav hårde lænker direkte til symbolske lænker\n" +" -r, --relative opret symbolske lænker relativt til " +"lænkestedet\n" " -s, --symbolic lav symbolske lænker i stedet for hårde " "lænker\n" -#: src/ln.c:412 -#, fuzzy +#: src/ln.c:411 msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" " -t, --target-directory=DIRECTORY specify the DIRECTORY in which to " @@ -5445,33 +5500,18 @@ msgstr "" "suffiks\n" " -t, --target-directory=KATALOG angiv det KATALOG, lænkerne skal oprettes " "i\n" -" -T, --no-target-directory behandl LÆNKENAVN som en normal fil\n" +" -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:428 -#, 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 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" - -#: src/ln.c:435 +#: src/ln.c:433 #, fuzzy, 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 "" -"Brug af -s ignorerer -L og -P. Ellers vil det sidste givne flag angive\n" -"opførslen, når kilden er en symbolsk lænke, med %s som standard.\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 @@ -5480,9 +5520,9 @@ msgid "cannot combine --target-directory and --no-target-directory" msgstr "kan ikke kombinere --target-directory og --no-target-directory" #: src/ln.c:588 -#, fuzzy, c-format +#, c-format msgid "cannot do --relative without --symbolic" -msgstr "kan ikke oprette symbolsk lænke %s" +msgstr "kan ikke bruge --relative uden --symbolic" # Der står ganske vist proper name, men det er tydeligvis en "fejlmeddelelse" der vises når det rigtige navn mangler #. This is a proper name. See the gettext manual, section Names. @@ -5544,7 +5584,7 @@ msgstr "ignorerer ugyldig længde i miljøvariabelen COLUMNS: %s" 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:1976 +#: src/ls.c:1750 src/ptx.c:1975 #, c-format msgid "invalid line width: %s" msgstr "ugyldig linjelængde: %s" @@ -5560,13 +5600,12 @@ msgid "invalid time style format %s" msgstr "ugyldig tidsstilsformat %s" #: src/ls.c:2057 -#, fuzzy msgid "Valid arguments are:\n" -msgstr "Gyldige argumenter er:" +msgstr "Gyldige argumenter er:\n" #: src/ls.c:2061 msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" -msgstr "" +msgstr " - +FORMAT (f.eks., +%H:%M) for et format i stil med 'date'\n" #: src/ls.c:2096 #, c-format @@ -5608,23 +5647,23 @@ msgstr "læser katalog %s" msgid "closing directory %s" msgstr "lukker kataloget %s" -#: src/ls.c:3301 +#: src/ls.c:3302 #, c-format msgid "cannot compare file names %s and %s" msgstr "kan ikke sammenligne filnavnene %s og %s" #: src/ls.c:4721 +#, 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" -"\n" 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:4729 +#: src/ls.c:4728 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -5638,8 +5677,7 @@ msgstr "" " -b, --escape skriv undvigesekvenser for ikke-grafiske tegn\n" " i stil med C\n" -#: src/ls.c:4735 -#, fuzzy +#: src/ls.c:4734 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them. E." "g.,\n" @@ -5664,8 +5702,7 @@ msgstr "" " med -l: vis ctime og sortér efter navn\n" " ellers: sortér efter ctime, nyeste først\n" -#: src/ls.c:4745 -#, fuzzy +#: src/ls.c:4744 msgid "" " -C list entries by columns\n" " --color[=WHEN] colorize the output. WHEN defaults to " @@ -5686,8 +5723,7 @@ msgstr "" " og dereferér ikke symbolske lænker\n" " -D, --dired lav uddata til Emacs' dired-tilstand\n" -#: src/ls.c:4753 -#, fuzzy +#: src/ls.c:4752 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -5697,7 +5733,7 @@ msgid "" " --full-time like -l --time-style=full-iso\n" msgstr "" " -f sortér ikke, brug -aU, brug ikke -ls --color\n" -" -F, --classify føj en angivelse (*/=@|) til elementerne\n" +" -F, --classify føj en angivelse (*/=>@|) til elementerne\n" " --file-type det samme, men tilføj ikke '*'\n" " --format=ORD 'across' -x, 'commas' -m, 'horizontal' -x,\n" " 'long' -l, 'single-column' -1, 'verbose' -" @@ -5705,12 +5741,12 @@ msgstr "" " 'vertical' -C\n" " --full-time ligesom -l --time-style=full-iso\n" -#: src/ls.c:4761 +#: src/ls.c:4760 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:4764 +#: src/ls.c:4763 msgid "" " --group-directories-first\n" " group directories before files.\n" @@ -5723,7 +5759,7 @@ msgstr "" "brug\n" " af --sort=none (-U) deaktiverer gruppering\n" -#: src/ls.c:4770 +#: src/ls.c:4769 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" @@ -5742,7 +5778,7 @@ 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:4776 +#: src/ls.c:4775 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5764,8 +5800,7 @@ msgstr "" "skalmønstret\n" " MØNSTER (tilsidesættes af -a eller -A)\n" -#: src/ls.c:4786 -#, fuzzy +#: src/ls.c:4785 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -5782,9 +5817,9 @@ msgstr "" " -i, --inode vis indeksnummer for hver fil\n" " -I, --ignore=MØNSTER vis ikke filer, der matcher skalmønstret " "MØNSTER\n" -" -k ligesom --block-size=1K\n" +" -k, --kibibytes brug blokke på 1024 byte\n" -#: src/ls.c:4796 +#: src/ls.c:4795 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5802,7 +5837,7 @@ msgstr "" " -m brug hele skærmbredden med en liste adskilt af\n" " kommaer\n" -#: src/ls.c:4804 +#: src/ls.c:4803 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. " @@ -5820,8 +5855,7 @@ msgstr "" " -p, --indicator-style=slash\n" " tilføj skråstreg som indikator for kataloger\n" -#: src/ls.c:4812 -#, fuzzy +#: src/ls.c:4811 msgid "" " -q, --hide-control-chars print ? instead of non graphic characters\n" " --show-control-chars show non graphic characters as-is (default\n" @@ -5841,7 +5875,7 @@ msgstr "" " literal, locale, shell, shell-always, c\n" " eller escape\n" -#: src/ls.c:4821 +#: src/ls.c:4820 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -5853,7 +5887,7 @@ msgstr "" " -s, --size skriv allokeret størrelse for hver fil i " "blokke\n" -#: src/ls.c:4826 +#: src/ls.c:4825 msgid "" " -S sort by file size\n" " --sort=WORD sort by WORD instead of name: none -U,\n" @@ -5873,8 +5907,7 @@ msgstr "" " ctime -c eller status -c; brug den angivne tid\n" " som sorteringsnøgle, hvis --sort=time\n" -#: src/ls.c:4836 -#, fuzzy +#: src/ls.c:4835 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, +FORMAT.\n" @@ -5893,9 +5926,9 @@ msgstr "" " ældre filer, og FORMAT2 for nyere filer;\n" " hvis 'posix-' sættes foran STYLE, vil STYLE " "kun\n" -" blive anvendt udenfor POSIX-lokalet\n" +" blive anvendt uden for POSIX-lokalitet\n" -#: src/ls.c:4845 +#: src/ls.c:4844 msgid "" " -t sort by modification time, newest first\n" " -T, --tabsize=COLS assume tab stops at each COLS instead of 8\n" @@ -5903,7 +5936,7 @@ msgstr "" " -t sortér efter ændringstidspunkt, nyeste først\n" " -T, --tabsize=KOLONNER antag tabulatorstop på KOLONNER frem for 8\n" -#: src/ls.c:4849 +#: src/ls.c:4848 msgid "" " -u with -lt: sort by, and show, access time\n" " with -l: show access time and sort by name\n" @@ -5918,7 +5951,7 @@ msgstr "" "kataloget\n" " -v naturlig sortering af (versions-)tal i tekst\n" -#: src/ls.c:4856 +#: src/ls.c:4855 msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" @@ -5936,7 +5969,7 @@ msgstr "" " hver fil\n" " -1 vis én fil per linje\n" -#: src/ls.c:4866 +#: src/ls.c:4865 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5950,7 +5983,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:4873 +#: src/ls.c:4872 msgid "" "\n" "Exit status:\n" @@ -5981,7 +6014,7 @@ msgid "David Madore" msgstr "David Madore" # Anden %s er 'md5' -#: src/md5sum.c:162 +#: src/md5sum.c:164 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -5993,7 +6026,7 @@ msgstr "" "Udskriv eller tjek %s-kontrolsummer (%d-bit).\n" "Hvis ingen FIL er angivet, eller FIL er -, læses fra standard-ind.\n" -#: src/md5sum.c:172 +#: src/md5sum.c:174 msgid "" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" @@ -6001,27 +6034,31 @@ msgstr "" " -b, --binary binær læsetilstand (forvalg på nær ved læsning fra \n" " tty-stdin)\n" -#: src/md5sum.c:176 +#: src/md5sum.c:178 msgid " -b, --binary read in binary mode\n" msgstr " -b, --binary binær læsetilstand\n" -#: src/md5sum.c:179 +#: src/md5sum.c:181 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr " -c, --check læs %s-summer fra FILerne og tjek dem\n" -#: src/md5sum.c:183 +#: src/md5sum.c:184 +msgid " --tag create a BSD-style checksum\n" +msgstr "" + +#: src/md5sum.c:188 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" " -t, --text tekstlæsetilstand (forvalg ved læsning af tty-" "stdind)\n" -#: src/md5sum.c:187 +#: src/md5sum.c:192 msgid " -t, --text read in text mode (default)\n" msgstr " -t, --text tekstlæsetilstand (forvalg)\n" -#: src/md5sum.c:190 +#: src/md5sum.c:195 msgid "" "\n" "The following three options are useful only when verifying checksums:\n" @@ -6037,7 +6074,7 @@ msgstr "" " -w, --warn advar om fejlformaterede kontrolsum-linjer\n" "\n" -#: src/md5sum.c:198 +#: src/md5sum.c:203 msgid "" " --strict with --check, exit non-zero for any invalid input\n" msgstr "" @@ -6045,8 +6082,8 @@ msgstr "" "input\n" " sammen med --check\n" -#: src/md5sum.c:203 -#, fuzzy, c-format +#: src/md5sum.c:208 +#, c-format msgid "" "\n" "The sums are computed as described in %s. When checking, the input\n" @@ -6055,61 +6092,71 @@ msgid "" "space for text), and name for each FILE.\n" msgstr "" "\n" -"Summerne bliver beregnet som beskrevet i %s. Ved kontrol skal\n" -"inddata være tidligere uddata fra dette program. Forvalgt \n" -"tilstand er at udskrive en linje med kontrolsum, et tegn som indikerer\n" -"inddatatype ('*' for binær, mellemrum for tekst), og navnet på hver FIL.\n" +"Summerne bliver beregnet som beskrevet i %s. Ved kontrol skal inddata være\n" +"tidligere uddata fra dette program. Forvalgt tilstand er at udskrive en\n" +"linje med kontrolsum, et tegn som angiver inddatatilstand ('*' for binær,\n" +"mellemrum for tekst), og navnet på hver FIL.\n" -#: src/md5sum.c:502 +#: src/md5sum.c:523 #, c-format msgid "%s: too many checksum lines" msgstr "%s: for mange kontrolsumlinjer" -#: src/md5sum.c:526 +#: src/md5sum.c:547 #, c-format msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line" msgstr "%s: %<PRIuMAX>: ukorrekt formateret %s-kontrolsumlinje" -#: src/md5sum.c:551 +#: src/md5sum.c:572 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: FEJL ved åbning eller læsning\n" -#: src/md5sum.c:574 +#: src/md5sum.c:595 msgid "FAILED" msgstr "MISLYKKEDES" -#: src/md5sum.c:576 +#: src/md5sum.c:597 msgid "OK" msgstr "O.k." -#: src/md5sum.c:600 +#: src/md5sum.c:621 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "%s: ingen rigtigt formatterede %s-kontrolsumlinjer fundet" -#: src/md5sum.c:610 +#: src/md5sum.c:631 #, 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:618 +#: src/md5sum.c:639 #, 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:626 +#: src/md5sum.c:647 #, 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:704 +#: src/md5sum.c:760 +#, c-format +msgid "--tag does not support --text mode" +msgstr "" + +#: src/md5sum.c:766 +#, fuzzy, c-format +msgid "the --tag option is meaningless when verifying checksums" +msgstr "flaget --status har kun betydning ved kontrol af kontrolsummer" + +#: src/md5sum.c:773 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" @@ -6117,22 +6164,22 @@ msgstr "" "flagene --binary og --text giver ikke mening ved verificering af " "kontrolsummer" -#: src/md5sum.c:712 +#: src/md5sum.c:781 #, 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:719 +#: src/md5sum.c:788 #, 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:726 +#: src/md5sum.c:795 #, 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:733 +#: src/md5sum.c:802 #, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "flaget --strict har kun betydning ved kontrol af kontrolsummer" @@ -6143,14 +6190,13 @@ msgid "Usage: %s [OPTION]... DIRECTORY...\n" msgstr "Brug: %s [FLAG]... KATALOG...\n" #: src/mkdir.c:57 -msgid "" -"Create the DIRECTORY(ies), if they do not already exist.\n" -"\n" +#, fuzzy +msgid "Create the DIRECTORY(ies), if they do not already exist.\n" msgstr "" "Opret KATALOG(erne), hvis de ikke allerede eksisterer.\n" "\n" -#: src/mkdir.c:64 +#: src/mkdir.c:63 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" @@ -6165,7 +6211,7 @@ msgstr "" " -Z, --context=KONT sæt SELinux-sikkerhedskontekst for hvert oprettet \n" " katalog til KONT\n" -#: src/mkdir.c:169 +#: src/mkdir.c:168 #, c-format msgid "created directory %s" msgstr "oprettede katalog %s" @@ -6176,32 +6222,31 @@ msgid "Usage: %s [OPTION]... NAME...\n" msgstr "Brug: %s [FLAG]... NAVN...\n" #: src/mkfifo.c:52 -msgid "" -"Create named pipes (FIFOs) with the given NAMEs.\n" -"\n" +#, fuzzy +msgid "Create named pipes (FIFOs) with the given NAMEs.\n" msgstr "" "Opret navngivne datakanaler (FIFOer) med angivne NAVNe.\n" "\n" -#: src/mkfifo.c:59 src/mknod.c:61 +#: src/mkfifo.c:58 src/mknod.c:60 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:62 +#: src/mkfifo.c:61 msgid "" " -Z, --context=CTX set the SELinux security context of each NAME to CTX\n" msgstr "" " -Z, --context=KONT sæt SELinux-sikkerhedskontekst for hvert NAVN til " "KONT\n" -#: src/mkfifo.c:122 src/mknod.c:128 +#: src/mkfifo.c:121 src/mknod.c:127 #, c-format msgid "invalid mode" msgstr "ugyldig tilstand" -#: src/mkfifo.c:127 src/mknod.c:133 +#: src/mkfifo.c:126 src/mknod.c:132 #, c-format msgid "mode must specify only file permission bits" msgstr "tilstand må kun angive bit for filrettigheder" @@ -6212,19 +6257,18 @@ msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n" msgstr "Brug: %s [FLAG]... NAVN TYPE [OVERNR UNDERNR]\n" #: src/mknod.c:54 -msgid "" -"Create the special file NAME of the given TYPE.\n" -"\n" +#, fuzzy +msgid "Create the special file NAME of the given TYPE.\n" msgstr "" "Opret specialfilen NAVN med den angivne TYPE.\n" "\n" -#: src/mknod.c:64 +#: 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:69 +#: src/mknod.c:68 msgid "" "\n" "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n" @@ -6238,7 +6282,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:76 +#: src/mknod.c:75 msgid "" "\n" " b create a block (buffered) special file\n" @@ -6250,40 +6294,40 @@ msgstr "" " c, u opret en tegn-specialfil (ubufret) \n" " p opret en FIFO\n" -#: src/mknod.c:151 +#: src/mknod.c:150 msgid "Special files require major and minor device numbers." msgstr "Specialfiler kræver over- og underenhedsnummer." -#: src/mknod.c:161 +#: src/mknod.c:160 msgid "Fifos do not have major and minor device numbers." msgstr "Fifoer har ikke over- og underenhedsnumre." -#: src/mknod.c:177 +#: src/mknod.c:176 #, c-format msgid "block special files not supported" msgstr "blokspecialfiler understøttes ikke" -#: src/mknod.c:186 +#: src/mknod.c:185 #, c-format msgid "character special files not supported" msgstr "tegnspecialfiler understøttes ikke" -#: src/mknod.c:202 +#: src/mknod.c:201 #, c-format msgid "invalid major device number %s" msgstr "ugyldigt overenhedsnummer %s" -#: src/mknod.c:207 +#: src/mknod.c:206 #, c-format msgid "invalid minor device number %s" msgstr "ugyldigt underenhedsnummer %s" -#: src/mknod.c:212 +#: src/mknod.c:211 #, c-format msgid "invalid device %s %s" msgstr "ugyldig enhed %s %s" -#: src/mknod.c:226 +#: src/mknod.c:225 #, c-format msgid "invalid device type %s" msgstr "ugyldig enhedstype %s" @@ -6299,7 +6343,6 @@ msgid "Usage: %s [OPTION]... [TEMPLATE]\n" msgstr "Brug: %s [FLAG]... [SKABELON]\n" #: src/mktemp.c:69 -#, fuzzy 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" @@ -6371,60 +6414,59 @@ msgstr "" "kataloget\n" " angivet ved -p; ellers /tmp [forældet]\n" -#: src/mktemp.c:222 +#: 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:228 +#: src/mktemp.c:229 #, c-format msgid "too many templates" msgstr "for mange skabeloner" -#: src/mktemp.c:248 +#: src/mktemp.c:249 #, c-format msgid "with --suffix, template %s must end in X" msgstr "med --suffix, skal skabelon %s slutte med X" -#: src/mktemp.c:273 src/split.c:1117 +#: src/mktemp.c:274 src/split.c:1130 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "ugyldig skabelon %s, indeholder katalogseparator" -#: src/mktemp.c:278 +#: src/mktemp.c:279 #, c-format msgid "too few X's in template %s" msgstr "for få X'er i skabelonen %s" -#: src/mktemp.c:291 +#: src/mktemp.c:292 #, c-format msgid "invalid template, %s, contains directory separator" msgstr "ugyldig skabelon, %s, indeholder katalogseparator" -#: src/mktemp.c:305 +#: src/mktemp.c:306 #, 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:325 +#: src/mktemp.c:326 #, c-format msgid "failed to create directory via template %s" msgstr "kunne ikke oprette katalog ved hjælp af skabelon %s" -#: src/mktemp.c:335 +#: src/mktemp.c:336 #, c-format msgid "failed to create file via template %s" msgstr "kunne ikke oprette fil via skabelonen %s" -#: src/mv.c:290 -msgid "" -"Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" -"\n" +#: src/mv.c:292 +#, fuzzy +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" -#: src/mv.c:297 +#: src/mv.c:298 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -6446,7 +6488,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:306 +#: src/mv.c:307 msgid "" " --strip-trailing-slashes remove any trailing slashes from each " "SOURCE\n" @@ -6458,7 +6500,7 @@ msgstr "" " -S, --suffix=SUFFIKS tilsidesæt det sædvanlige sikkerhedskopi-" "suffiks\n" -#: src/mv.c:311 +#: src/mv.c:312 msgid "" " -t, --target-directory=DIRECTORY move all SOURCE arguments into " "DIRECTORY\n" @@ -6480,13 +6522,11 @@ msgid "Usage: %s [OPTION] [COMMAND [ARG]...]\n" msgstr "Brug: %s [FLAG]... [KOMMANDO [ARG]...]\n" #: src/nice.c:73 -#, c-format +#, fuzzy, c-format msgid "" "Run COMMAND with an adjusted niceness, which affects process scheduling.\n" -"With no COMMAND, print the current niceness. Nicenesses range from\n" -"%d (most favorable scheduling) to %d (least favorable).\n" -"\n" -" -n, --adjustment=N add integer N to the niceness (default 10)\n" +"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 "" "Kør KOMMANDO med ændret prioritet (niceness), hvilket påvirker\n" "procesplanlægningen. Uden KOMMANDO udskrives den aktuelle prioritet.\n" @@ -6494,22 +6534,26 @@ msgstr "" "\n" " -n, --adjustment=N læg heltallet N til prioriteten (standard: 10)\n" -#: src/nice.c:168 +#: src/nice.c:82 +msgid " -n, --adjustment=N add integer N to the niceness (default 10)\n" +msgstr "" + +#: src/nice.c:172 #, c-format msgid "invalid adjustment %s" msgstr "ugyldig justering %s" -#: src/nice.c:177 +#: src/nice.c:181 #, c-format msgid "a command must be given with an adjustment" msgstr "en kommando skal være givet med en justering" -#: src/nice.c:184 src/nice.c:195 +#: src/nice.c:188 src/nice.c:199 #, c-format msgid "cannot get niceness" msgstr "kan ikke hente prioritet" -#: src/nice.c:201 +#: src/nice.c:205 #, c-format msgid "cannot set niceness" msgstr "kan ikke sætte prioritet" @@ -6519,17 +6563,17 @@ msgstr "kan ikke sætte prioritet" msgid "Scott Bartram" msgstr "Scott Bartram" -#: src/nl.c:186 +#: 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" -"\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:194 +#: src/nl.c:186 msgid "" " -b, --body-numbering=STYLE use STYLE for numbering body lines\n" " -d, --section-delimiter=CC use CC for separating logical pages\n" @@ -6540,7 +6584,7 @@ msgstr "" " -f, --footer-numbering=STIL brug STIL til at nummerere bundtekst\n" "\n" -#: src/nl.c:199 +#: src/nl.c:191 msgid "" " -h, --header-numbering=STYLE use STYLE for numbering header lines\n" " -i, --line-increment=NUMBER line number increment at each line\n" @@ -6559,7 +6603,7 @@ msgstr "" " sider\n" " -s, --number-separator=STRENG tilføj STRENG efter (muligt) linjenummer\n" -#: src/nl.c:207 +#: src/nl.c:199 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" @@ -6567,7 +6611,7 @@ msgstr "" " -v, --starting-line-number=ANTAL første linjenummer på hver logisk side\n" " -w, --number-width=ANTAL brug ANTAL kolonner til linjenummerering\n" -#: src/nl.c:213 +#: src/nl.c:205 msgid "" "\n" "By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC are\n" @@ -6579,7 +6623,7 @@ msgstr "" "to skilletegn for at skille logiske sider, et manglende tegn nummer to\n" "implicerer ':'. Brug \\\\ for \\. STIL er en af:\n" -#: src/nl.c:219 +#: src/nl.c:211 msgid "" "\n" " a number all lines\n" @@ -6608,52 +6652,47 @@ msgstr "" " rz højrejusteret, indledende nuller\n" "\n" -#: src/nl.c:286 +#: src/nl.c:278 #, c-format msgid "line number overflow" msgstr "overløb for linjetal" -#: src/nl.c:486 +#: src/nl.c:478 #, c-format msgid "invalid header numbering style: %s" msgstr "ugyldig nummereringsstil til sidehoveder: %s" -#: src/nl.c:494 +#: src/nl.c:486 #, c-format msgid "invalid body numbering style: %s" msgstr "ugyldig nummereringsstil til brødtekst: %s" -#: src/nl.c:502 +#: src/nl.c:494 #, c-format msgid "invalid footer numbering style: %s" msgstr "ugyldig nummereringsstil til sidefod: %s" -#: src/nl.c:511 +#: src/nl.c:503 #, c-format msgid "invalid starting line number: %s" msgstr "ugyldigt første linjenummer: %s" -#: src/nl.c:517 -#, c-format -msgid "WARNING: --page-increment is deprecated; use --line-increment instead" -msgstr "ADVARSEL: --page-increment er forældet; brug --line-increment i stedet" - -#: src/nl.c:524 +#: src/nl.c:512 #, c-format msgid "invalid line number increment: %s" msgstr "ugyldig øgning af linjenummer: %s" -#: src/nl.c:536 +#: src/nl.c:524 #, c-format msgid "invalid number of blank lines: %s" msgstr "ugyldigt antal tomme linjer: %s" -#: src/nl.c:550 +#: src/nl.c:538 #, c-format msgid "invalid line number field width: %s" msgstr "ugyldig bredde på linjenummerfelt: %s" -#: src/nl.c:569 +#: src/nl.c:557 #, c-format msgid "invalid line numbering format: %s" msgstr "ugyldigt linjenummerformat: %s" @@ -6676,7 +6715,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" @@ -6702,11 +6741,6 @@ msgstr "kunne ikke ubrugeliggøre standard-ind" msgid "ignoring input" msgstr "ignorerer inddata" -#: src/nohup.c:163 src/nohup.c:165 -#, c-format -msgid "failed to open %s" -msgstr "kunne ikke åbne %s" - #: src/nohup.c:175 #, c-format msgid "ignoring input and appending output to %s" @@ -6738,16 +6772,16 @@ msgid "failed to redirect standard error" msgstr "kunne ikke omdirigere standard-fejl" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:32 +#: src/nproc.c:33 msgid "Giuseppe Scrivano" msgstr "Giuseppe Scrivano" -#: src/nproc.c:56 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 +#: src/nproc.c:57 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Brug: %s [FLAG]...\n" -#: src/nproc.c:57 +#: src/nproc.c:58 msgid "" "Print the number of processing units available to the current process,\n" "which may be less than the number of online processors\n" @@ -6756,7 +6790,7 @@ msgstr "" "Udskriv antallet af processorenheder, der er tilgængelige for den aktuelle\n" "proces, hvilket kan være mindre end antallet af aktive processorer\n" -#: src/nproc.c:62 +#: src/nproc.c:63 msgid "" " --all print the number of installed processors\n" " --ignore=N if possible, exclude N processing units\n" @@ -6764,11 +6798,352 @@ msgstr "" " --all udskriv antallet af installerede processorer\n" " --ignore=N hvis muligt, så ekskludér N processorenheder\n" -#: src/nproc.c:106 +#: src/nproc.c:107 #, c-format 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 +msgid "Assaf Gordon" +msgstr "" + +#: 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:680 +#, fuzzy, c-format +msgid "invalid number: '%s'" +msgstr "ugyldigt antal %s" + +#: src/numfmt.c:684 +#, c-format +msgid "rejecting suffix in input: '%s' (consider using --from)" +msgstr "" + +#: src/numfmt.c:688 +#, fuzzy, c-format +msgid "invalid suffix in input: '%s'" +msgstr "ugyldigt suffiks i %s%s-argument '%s'" + +#: src/numfmt.c:692 +#, c-format +msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)" +msgstr "" + +#: src/numfmt.c:723 +#, fuzzy, 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" + +#: 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 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [NUMBER]...\n" +msgstr "Brug: %s [FLAG]... [BRUGER]...\n" + +#: src/numfmt.c:816 +msgid "" +"Reformat NUMBER(s), or the numbers from standard input if none are " +"specified.\n" +msgstr "" + +#: src/numfmt.c:820 +#, fuzzy +msgid " --debug print warnings about invalid input\n" +msgstr "" +" --strict afslut med status forskellig fra nul ved ugyldigt " +"input\n" +" sammen med --check\n" + +#: src/numfmt.c:823 +msgid "" +" -d, --delimiter=X use X instead of whitespace for field delimiter\n" +msgstr "" + +#: src/numfmt.c:826 +msgid "" +" --field=N replace the number in input field N (default is 1)\n" +msgstr "" + +#: src/numfmt.c:829 +msgid "" +" --format=FORMAT use printf style floating-point FORMAT;\n" +" see FORMAT below for details\n" +msgstr "" + +#: src/numfmt.c:833 +msgid "" +" --from=UNIT auto-scale input numbers to UNITs; default is " +"'none';\n" +" see UNIT below\n" +msgstr "" + +#: src/numfmt.c:837 +msgid "" +" --from-unit=N specify the input unit size (instead of the default " +"1)\n" +msgstr "" + +#: src/numfmt.c:840 +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 "" + +#: src/numfmt.c:844 +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 +msgid "" +" --invalid=MODE failure mode for invalid numbers: MODE can be:\n" +" abort (default), fail, warn, ignore\n" +msgstr "" + +#: src/numfmt.c:852 +msgid "" +" --padding=N pad the output to N characters; positive N will\n" +" right-align; negative N will left-align;\n" +" padding is ignored if the output is wider than N;\n" +" the default is to automatically pad if a " +"whitespace\n" +" is found\n" +msgstr "" + +#: src/numfmt.c:859 +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 +msgid "" +" --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" +" SUFFIX in input numbers\n" +msgstr "" + +#: src/numfmt.c:867 +msgid "" +" --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" +msgstr "" + +#: src/numfmt.c:870 +msgid "" +" --to-unit=N the output unit size (instead of the default 1)\n" +msgstr "" + +#: src/numfmt.c:877 +#, fuzzy +msgid "" +"\n" +"UNIT options:\n" +msgstr "" +"Andre flag:\n" +"\n" + +#: src/numfmt.c:880 +msgid " none no auto-scaling is done; suffixes will trigger an error\n" +msgstr "" + +#: src/numfmt.c:883 +msgid "" +" auto accept optional single/two letter suffix:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" +msgstr "" + +#: src/numfmt.c:889 +msgid "" +" si accept optional single letter suffix:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:894 +msgid "" +" iec accept optional single letter suffix:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:899 +msgid "" +" iec-i accept optional two-letter suffix:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:905 +#, 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" +msgstr "" + +#: src/numfmt.c:912 +#, c-format +msgid "" +"\n" +"Exit status is 0 if all input numbers were successfully converted.\n" +"By default, %s will stop at the first conversion error with exit status 2.\n" +"With --invalid='fail' a warning is printed for each conversion error\n" +"and the exit status is 2. With --invalid='warn' each conversion error is\n" +"diagnosed, but the exit status is 0. With --invalid='ignore' conversion\n" +"errors are not diagnosed and the exit status is 0.\n" +msgstr "" + +#: src/numfmt.c:921 +#, c-format +msgid "" +"\n" +"Examples:\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" +msgstr "" + +#: src/numfmt.c:974 src/seq.c:212 +#, c-format +msgid "format %s has no %% directive" +msgstr "formatet %s har intet %%-direktiv" + +#: src/numfmt.c:990 +#, fuzzy, c-format +msgid "invalid format %s (width overflow)" +msgstr "ugyldigt datoformat %s" + +#: src/numfmt.c:1007 src/seq.c:229 +#, 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:1018 src/seq.c:236 +#, 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:1092 +#, c-format +msgid "value too large to be printed: '%Lg' (consider using --to)" +msgstr "" + +#: src/numfmt.c:1100 +#, c-format +msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" +msgstr "" + +#: src/numfmt.c:1184 +#, c-format +msgid "large input value '%s': possible precision loss" +msgstr "" + +#: src/numfmt.c:1293 +#, 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 "ugyldigt sideinterval %s" + +#: src/numfmt.c:1401 +#, fuzzy, c-format +msgid "invalid field value '%s'" +msgstr "ugyldigt feltnummer: %s" + +#: src/numfmt.c:1430 +#, fuzzy, c-format +msgid "invalid header value '%s'" +msgstr "ugyldig dato %s" + +#: src/numfmt.c:1456 +#, fuzzy, 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" + +#: src/numfmt.c:1463 +#, fuzzy, c-format +msgid "no conversion option specified" +msgstr "flere -i-flag angivet" + +#: src/numfmt.c:1471 +#, fuzzy, c-format +msgid "grouping cannot be combined with --to" +msgstr "filoperander kan ikke kombineres med --files0-from" + +#: src/numfmt.c:1473 +#, c-format +msgid "grouping has no effect in this locale" +msgstr "" + +#: src/numfmt.c:1486 +#, c-format +msgid "--header ignored with command-line input" +msgstr "" + +#: src/numfmt.c:1511 +#, fuzzy, c-format +msgid "error reading input" +msgstr "fejl ved læsning af %s" + +#: src/numfmt.c:1520 +#, fuzzy, c-format +msgid "failed to convert some of the input numbers" +msgstr "kunne ikke ubrugeliggøre standard-ind" + #: src/od.c:294 #, c-format msgid "" @@ -6798,38 +7173,62 @@ msgstr "" "\n" #: src/od.c:307 -msgid "All arguments to long options are mandatory for short options.\n" -msgstr "Alle argumenter til lange flag er obligatoriske for de korte flag.\n" +#, fuzzy +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" +"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" +"at first byte printed, incremented when dump is progressing.\n" +"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" +"hvis der er flere end to operander, et ciffer. Ved en AFSÆT-operand " +"forstås \n" +"-j AFSÆT. MÆRKE er pseudoadressen til den første udskrevne byte, som øges\n" +"mens udskriften pågår. For AFSÆT og MÆRKE indikerer en 0x- eller\n" +"0X-forstavelse hexadecimalt talformat. Endelser kan være '.' for oktal, og " +"b\n" +"for blokke på 512 bytes.\n" -#: src/od.c:310 +#: src/od.c:318 +#, fuzzy msgid "" -" -A, --address-radix=RADIX decide how file offsets are printed\n" +" -A, --address-radix=RADIX output format for file offsets. RADIX is one\n" +" of [doxn], for Decimal, Octal, Hex or None\n" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" " -A, --address-radix=RADIX bestem hvordan filafsæt udskrives\n" " -j, --skip-bytes=BYTE overspring første BYTE fra hver fil\n" -#: src/od.c:314 +#: src/od.c:323 #, 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" -" --traditional accept arguments in traditional form\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, --strings[=BYTE] udskriv strenge med mindst BYTE grafiske tegn\n" +" -S BYTE, --strings[=BYTE] udskriv strenge med mindst BYTE grafiske tegn\n" " -t, --format=TYPE vælg udformater\n" " -v, --output-duplicates brug ikke * for at markere linjefjernelse\n" -" -w, --width[=BYTE] skriv BYTE byte per udlinje\n" +" -w[BYTE], --width[=BYTE] skriv BYTE byte per udlinje\n" " --traditional acceptér argumenter på traditionel form\n" -#: src/od.c:324 +#: src/od.c:336 +#, fuzzy 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" @@ -6843,7 +7242,7 @@ msgstr "" " -c samme som -t c, vælg ASCII-tegn eller omvendt skråstregsnotation\n" " -d samme som -t u2, vælg decimale 2-byte-enheder uden fortegn\n" -#: src/od.c:332 +#: src/od.c:345 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -6859,33 +7258,12 @@ 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:340 +#: src/od.c:353 +#, fuzzy msgid "" "\n" -"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" -"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" -"at first byte printed, incremented when dump is progressing.\n" -"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" -"hvis der er flere end to operander, et ciffer. Ved en AFSÆT-operand " -"forstås \n" -"-j AFSÆT. MÆRKE er pseudoadressen til den første udskrevne byte, som øges\n" -"mens udskriften pågår. For AFSÆT og MÆRKE indikerer en 0x- eller\n" -"0X-forstavelse hexadecimalt talformat. Endelser kan være '.' for oktal, og " -"b\n" -"for blokke på 512 bytes.\n" - -#: src/od.c:349 -msgid "" "\n" "TYPE is made up of one or more of these specifications:\n" -"\n" " a named character, ignoring high-order bit\n" " c ASCII character or backslash escape\n" msgstr "" @@ -6895,7 +7273,7 @@ msgstr "" " a navngivet tegn, idet mest betydende (high-order) bit ignoreres\n" " c ASCII-tegn eller omvendt skråstregsnotation\n" -#: src/od.c:356 +#: src/od.c:360 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -6909,10 +7287,11 @@ 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:363 +#: src/od.c:367 +#, fuzzy msgid "" "\n" -"SIZE is a number. For TYPE in doux, SIZE may also be C for\n" +"SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" "sizeof(char), S for sizeof(short), I for sizeof(int) or L for\n" "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" @@ -6923,42 +7302,37 @@ msgstr "" "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" -# (TYPE er skrevet med stort med vilje) -#: src/od.c:370 +#: src/od.c:374 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" +"Adding a z suffix to any type displays printable characters at the end of\n" +"each output line.\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" -#: src/od.c:380 +#: src/od.c:379 +#, 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" +"\n" +"\n" +"BYTES is hex with 0x or 0X prefix, and may have a multiplier suffix:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"and so on for G, T, P, E, Z, Y.\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" +"\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" -#: src/od.c:633 src/od.c:753 +#: src/od.c:639 src/od.c:759 #, c-format msgid "invalid type string %s" msgstr "ugyldig typestreng %s" -#: src/od.c:643 +#: src/od.c:649 #, c-format msgid "" "invalid type string %s;\n" @@ -6967,7 +7341,7 @@ msgstr "" "ugyldig type-streng %s;\n" "dette system understøtter ikke en %lu-byte heltalstype" -#: src/od.c:764 +#: src/od.c:770 #, c-format msgid "" "invalid type string %s;\n" @@ -6976,37 +7350,37 @@ msgstr "" "ugyldig type-streng %s;\n" "dette system understøtter ikke en %lu-byte flydende-taltype" -#: src/od.c:822 -#, fuzzy, c-format +#: src/od.c:828 +#, c-format msgid "invalid character '%c' in type string %s" msgstr "ugyldigt tegn '%c' i typestrengen %s" -#: src/od.c:1047 +#: src/od.c:1053 #, c-format msgid "cannot skip past end of combined input" msgstr "kan ikke springe forbi afslutning af kombineret inddata" -#: src/od.c:1603 -#, fuzzy, c-format +#: src/od.c:1609 +#, 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:1729 +#: src/od.c:1735 #, c-format msgid "no type may be specified when dumping strings" msgstr "ingen type kan angives når strenge gemmes" -#: src/od.c:1804 +#: src/od.c:1810 msgid "compatibility mode supports at most one file" msgstr "kompatibilitetstilstand understøtter højst én fil" # jf. --skip-bytes -#: src/od.c:1825 +#: src/od.c:1831 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "skip-bytes + read-bytes er for stor" -#: src/od.c:1868 +#: src/od.c:1874 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "advarsel: ugyldig bredde %lu; bruger %d i stedet" @@ -7022,18 +7396,18 @@ 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" "With no FILE, or when FILE is -, read standard input.\n" -"\n" 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:448 +#: 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" @@ -7041,7 +7415,7 @@ msgstr "" " -d, --delimiters=LISTE brug tegn fra LISTE i stedet for tabulatorer\n" " -s, --serial indsæt en fil ad gangen i stedet for i parallel\n" -#: src/paste.c:509 +#: src/paste.c:508 #, c-format msgid "delimiter list ends with an unescaped backslash: %s" msgstr "skilletegnslisten slutter med en uundviget omvendt skråstreg: %s" @@ -7061,7 +7435,7 @@ msgstr "" " --portability kontrollér for alle POSIX-systemer (svarer til -p -P)\n" #: src/pathchk.c:170 -#, fuzzy, c-format +#, c-format msgid "leading '-' in a component of file name %s" msgstr "indledende '-' i filnavnskomponenten %s" @@ -7101,80 +7475,80 @@ msgid "Kaveh Ghazi" msgstr "Kaveh Ghazi" #. TRANSLATORS: Real name is unknown; at most 19 characters. -#: src/pinky.c:250 +#: src/pinky.c:242 msgid " ???" msgstr " ???" #. TRANSLATORS: Idle time is unknown; at most 5 characters. -#: src/pinky.c:274 +#: src/pinky.c:266 msgid "?????" msgstr "?????" -#: src/pinky.c:323 +#: src/pinky.c:314 #, c-format msgid "Login name: " msgstr "Login-navn: " -#: src/pinky.c:326 +#: src/pinky.c:317 #, c-format msgid "In real life: " msgstr "I virkeligheden: " #. TRANSLATORS: Real name is unknown; no hard limit. -#: src/pinky.c:330 +#: src/pinky.c:321 msgid "???\n" msgstr "???\n" -#: src/pinky.c:350 +#: src/pinky.c:341 #, c-format msgid "Directory: " msgstr "Katalog: " -#: src/pinky.c:352 +#: src/pinky.c:343 #, c-format msgid "Shell: " msgstr "Skal: " -#: src/pinky.c:371 +#: src/pinky.c:362 #, c-format msgid "Project: " msgstr "Projekt: " -#: src/pinky.c:395 +#: src/pinky.c:386 #, c-format msgid "Plan:\n" msgstr "Plan:\n" -#: src/pinky.c:414 +#: src/pinky.c:405 msgid "Login" msgstr "Login" -#: src/pinky.c:416 +#: src/pinky.c:407 msgid "Name" msgstr "Navn" -#: src/pinky.c:417 +#: src/pinky.c:408 msgid " TTY" msgstr " TTY" -#: src/pinky.c:419 +#: src/pinky.c:410 msgid "Idle" msgstr "Inaktiv" -#: src/pinky.c:420 +#: src/pinky.c:411 msgid "When" msgstr "Hvornår" -#: src/pinky.c:423 +#: src/pinky.c:414 msgid "Where" msgstr "Hvor" -#: src/pinky.c:502 +#: src/pinky.c:493 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Brug: %s [FLAG]... [BRUGER]...\n" -#: src/pinky.c:503 +#: src/pinky.c:494 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7190,7 +7564,7 @@ msgstr "" " -p udelad brugerens planfil i det lange format\n" " -s udskriv i kort format, dette er standard\n" -#: src/pinky.c:511 +#: src/pinky.c:502 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7205,18 +7579,18 @@ msgstr "" " -q udelad brugerens fulde navn, fjernvært og\n" " inaktiv tid i kort format\n" -#: src/pinky.c:520 -#, fuzzy, c-format +#: src/pinky.c:511 +#, c-format msgid "" "\n" "A lightweight 'finger' program; print user information.\n" "The utmp file will be %s.\n" msgstr "" "\n" -"Et letvægts \"finger\"-program; udskriver brugerinformation.\n" +"Et letvægts-'finger'-program; udskriver brugerinformation.\n" "utmp-filen vil være %s.\n" -#: src/pinky.c:604 +#: src/pinky.c:595 #, 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" @@ -7231,85 +7605,84 @@ msgstr "Pete TerMaat" msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:912 -#, fuzzy, c-format +#: src/pr.c:908 +#, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "'--pages=FØRSTE_SIDE[:SIDSTE_SIDE]' mangler argument" -#: src/pr.c:914 +#: src/pr.c:910 #, c-format msgid "invalid page range %s" msgstr "ugyldigt sideinterval %s" -#: src/pr.c:979 -#, fuzzy, c-format +#: src/pr.c:975 +#, c-format msgid "'-l PAGE_LENGTH' invalid number of lines: %s" -msgstr "'-l SIDELÆNGDE' ugyldigt antal linjer: %s" +msgstr "'-l SIDELÆNGDE' har ugyldigt antal linjer: %s" -#: src/pr.c:1003 -#, fuzzy, c-format +#: src/pr.c:999 +#, c-format msgid "'-N NUMBER' invalid starting line number: %s" -msgstr "'-N NUMMER' ugyldigt start-linjenummer: %s" +msgstr "'-N NUMMER' har ugyldigt start-linjenummer: %s" -#: src/pr.c:1015 -#, fuzzy, c-format +#: src/pr.c:1011 +#, c-format msgid "'-o MARGIN' invalid line offset: %s" -msgstr "'-o MARGEN' ugyldigt linjeafsæt: %s" +msgstr "'-o MARGEN' har ugyldigt linjeafsæt: %s" -#: src/pr.c:1056 -#, fuzzy, c-format +#: src/pr.c:1052 +#, c-format msgid "'-w PAGE_WIDTH' invalid number of characters: %s" -msgstr "'-w SIDEBREDDE' ugyldigt antal tegn: %s" +msgstr "'-w SIDEBREDDE' har ugyldigt antal tegn: %s" -#: src/pr.c:1070 -#, fuzzy, c-format +#: src/pr.c:1066 +#, c-format msgid "'-W PAGE_WIDTH' invalid number of characters: %s" -msgstr "'-W SIDEBREDDE' ugyldigt antal tegn: %s" +msgstr "'-W SIDEBREDDE' har ugyldigt antal tegn: %s" -#: src/pr.c:1100 +#: src/pr.c:1096 #, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "kan ikke angive antal kolonner når der skrives parallelt" -#: src/pr.c:1104 +#: src/pr.c:1100 #, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "kan ikke angive både skrivning på tværs og parallel skrivning" -#: src/pr.c:1200 -#, fuzzy, c-format +#: src/pr.c:1196 +#, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "'-%c' ekstra tegn eller ugyldigt tal i argumentet: %s" -#: src/pr.c:1304 +#: src/pr.c:1293 #, c-format msgid "page width too narrow" msgstr "sidebredde for smal" -#: src/pr.c:2369 +#: src/pr.c:2353 #, c-format msgid "starting page number %<PRIuMAX> exceeds page count %<PRIuMAX>" msgstr "startsidetallet %<PRIuMAX> overgår antallet af sider %<PRIuMAX>" -#: src/pr.c:2396 +#: src/pr.c:2380 #, c-format msgid "page number overflow" msgstr "overløb for sidetal" -#: src/pr.c:2401 +#: src/pr.c:2385 #, c-format msgid "Page %<PRIuMAX>" msgstr "Side %<PRIuMAX>" -#: src/pr.c:2773 -msgid "" -"Paginate or columnate FILE(s) for printing.\n" -"\n" +#: 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" -#: src/pr.c:2780 +#: src/pr.c:2763 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -7325,7 +7698,7 @@ msgstr "" " medmindre '-a' er angivet. Balancér antal linjer\n" " i kolonnerne på hver side.\n" -#: src/pr.c:2788 +#: src/pr.c:2771 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7342,7 +7715,7 @@ msgstr "" " -d, --double-space\n" " dobbelt afstand i udskriften\n" -#: src/pr.c:2796 +#: src/pr.c:2779 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7362,7 +7735,7 @@ msgstr "" " separere sider (med et 3-linjers sidehoved med -F eller\n" " et 5-linjers hoved og bund uden -F)\n" -#: src/pr.c:2806 +#: src/pr.c:2789 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -7385,7 +7758,7 @@ msgstr "" " ingen kolonnejustering, --sep-string[=STRENG] sætter\n" " separatorer\n" -#: src/pr.c:2815 +#: src/pr.c:2798 msgid "" " -l, --length=PAGE_LENGTH\n" " set the page length to PAGE_LENGTH (66) lines\n" @@ -7399,7 +7772,7 @@ msgstr "" " -m, --merge udskriv alle filer parallelt, en i hver kolonne;\n" " afkort linjer, men flet linjer af fuld længde med -J\n" -#: src/pr.c:2822 +#: src/pr.c:2805 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -7415,7 +7788,7 @@ msgstr "" " start tælling med NUMMER på første linje på første side\n" " som skrives (se +FØRSTE_SIDE)\n" -#: src/pr.c:2830 +#: src/pr.c:2813 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -7430,7 +7803,7 @@ msgstr "" " -r, --no-file-warnings\n" " advar ikke når en fil ikke kan åbnes\n" -#: src/pr.c:2837 +#: src/pr.c:2820 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -7445,8 +7818,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:2844 -#, fuzzy +#: src/pr.c:2827 msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" @@ -7455,7 +7827,7 @@ msgid "" "options\n" " -t, --omit-header omit page headers and trailers\n" msgstr "" -" -SSTRENG, --sep-string[=STRENG]\n" +" -S[STRENG], --sep-string[=STRENG]\n" " adskil kolonner med STRENG.\n" " Uden -S: Forvalgt skilletegn er <TAB> med -J og " "<mellemrum>\n" @@ -7463,7 +7835,7 @@ msgstr "" "kolonneflag\n" " -t, --omit-header brug ikke sidehoved og -fod\n" -#: src/pr.c:2851 +#: src/pr.c:2834 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -7486,7 +7858,7 @@ msgstr "" "for\n" " flerkolonneudskrift, -s[tegn] slår fra (72)\n" -#: src/pr.c:2861 +#: src/pr.c:2844 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -7499,7 +7871,7 @@ msgstr "" " Afkort linjer hvis -J ikke er sat. Påvirker ikke -S\n" " eller -s\n" -#: src/pr.c:2869 +#: src/pr.c:2852 msgid "" "\n" "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" @@ -7576,7 +7948,6 @@ msgstr "" " \\UHHHHHHHH Unicode-tegn med heksadecimal værdi HHHHHHHH (8 cifre)\n" #: src/printf.c:123 -#, fuzzy msgid "" " %% a single %\n" " %b ARGUMENT as a string with '\\' escapes interpreted,\n" @@ -7592,7 +7963,7 @@ msgstr "" "\n" "og alle specifikationer i C-format som slutter med en af diouxXfeEgGcs, " "med \n" -"ARGUMENTer konverterede til en passende type først. Variable bredder " +"ARGUMENTer konverteret til en passende type først. Variable bredder " "behandles.\n" #: src/printf.c:148 @@ -7658,16 +8029,15 @@ msgstr "" " eller: %s -G [FLAG]... [INDDATA [UDDATA]]\n" #: src/ptx.c:1821 +#, fuzzy msgid "" "Output a permuted index, including context, of the words in the input " "files.\n" -"\n" msgstr "" "Udskriv et permuteret indeks, med kontekst, over ordene i inddatafilerne.\n" "\n" -#: src/ptx.c:1828 -#, fuzzy +#: src/ptx.c:1827 msgid "" " -A, --auto-reference output automatically generated references\n" " -G, --traditional behave more like System V 'ptx'\n" @@ -7677,8 +8047,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:1833 -#, fuzzy +#: src/ptx.c:1832 msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" " -O, --format=roff generate output as roff directives\n" @@ -7695,7 +8064,7 @@ msgstr "" " sætninger\n" " -T, --format=tex generér udskrift som TeX-direktiver\n" -#: src/ptx.c:1840 +#: src/ptx.c:1839 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -7714,7 +8083,7 @@ msgstr "" " denne FIL\n" " -o, --only-file=FIL læs kun ordliste fra denne FIL\n" -#: src/ptx.c:1848 +#: src/ptx.c:1847 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -7726,17 +8095,16 @@ msgstr "" " -w, --width=BREDDE udskriftbredde for kolonner, eksklusive\n" " referencer\n" -#: src/ptx.c:1855 -#, fuzzy +#: src/ptx.c:1854 msgid "" "\n" "With no FILE or if FILE is -, read Standard Input. '-F /' by default.\n" msgstr "" "\n" -"Ved ingen FIL eller hvis FIL er -, læses fra standard-ind. '-F /' er\n" +"Ved ingen FIL eller hvis FIL er -, læses fra standard-ind. '-F /' er " "forvalgt.\n" -#: src/ptx.c:1949 +#: src/ptx.c:1948 #, c-format msgid "invalid gap width: %s" msgstr "ugyldig hulbredde: %s" @@ -7762,7 +8130,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "kunne ikke foretage chdir til %s" -#: src/pwd.c:170 src/pwd.c:277 +#: src/pwd.c:170 src/pwd.c:277 src/split.c:373 #, c-format msgid "failed to stat %s" msgstr "kunne ikke foretage stat på %s" @@ -7778,14 +8146,15 @@ msgid "ignoring non-option arguments" msgstr "ignorerer argumenter som ikke er flag" #. This is a proper name. See the gettext manual, section Names. -#: src/readlink.c:33 +#: src/readlink.c:32 msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 +#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147 +#: src/stat.c:1349 src/touch.c:212 #, c-format -msgid "Usage: %s [OPTION]... FILE\n" -msgstr "Brug: %s [FLAG]... [FIL]\n" +msgid "Usage: %s [OPTION]... FILE...\n" +msgstr "Brug: %s [FLAG]... [FIL]...\n" #: src/readlink.c:63 msgid "" @@ -7817,16 +8186,19 @@ msgstr "" " komponenter skal eksistere\n" #: src/readlink.c:75 +#, fuzzy msgid "" " -m, --canonicalize-missing canonicalize by following every symlink in\n" " every component of the given name " "recursively,\n" " without requirements on components " "existence\n" -" -n, --no-newline do not output the trailing newline\n" +" -n, --no-newline do not output the trailing delimiter\n" " -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" msgstr "" " -m, --canonicalize-missing normalisér ved at følge hver symlænke i " "hver\n" @@ -7837,11 +8209,10 @@ msgstr "" " -s, --silent udelad de fleste fejlmeddelelser\n" " -v, --verbose udskriv fejlmeddelelser\n" -#: src/realpath.c:71 src/rm.c:134 src/shred.c:147 src/stat.c:1330 -#: src/touch.c:215 -#, c-format -msgid "Usage: %s [OPTION]... FILE...\n" -msgstr "Brug: %s [FLAG]... [FIL]...\n" +#: src/readlink.c:152 +#, fuzzy, c-format +msgid "ignoring --no-newline with multiple arguments" +msgstr "ignorerer argumenter som ikke er flag" #: src/realpath.c:72 msgid "" @@ -7849,6 +8220,9 @@ msgid "" "all but the last component must exist\n" "\n" msgstr "" +"Bestem og udskriv det absolutte filnavn;\n" +"alle på nær sidste komponent skal eksistere\n" +"\n" #: src/realpath.c:77 msgid "" @@ -7863,17 +8237,30 @@ msgid "" " -z, --zero separate output with NUL rather than newline\n" "\n" msgstr "" +" -e, --canonicalize-existing alle stiens komponenter skal eksistere\n" +" -m, --canonicalize-missing ingen af stiens komponenter behøver " +"eksistere\n" +" -L, --logical evaluér '..'-komponenter før symlænker\n" +" -P, --physical evaluér symlænker når de findes (standard)\n" +" -q, --quiet undertryk de fleste fejlmeddelelser\n" +" --relative-to=FIL udskriv den evaluerede sti relativt til FIL\n" +" --relative-base=FIL udskriv absolutte stier med mindre stier " +"ligger\n" +" under FIL\n" +" -s, --strip, --no-symlinks omskriv ikke symlænker\n" +" -z, --zero separér udskrift med NUL frem for linjeskift\n" +"\n" #: src/relpath.c:130 msgid "generating relative path" -msgstr "" +msgstr "genererer relativ sti" -#: src/remove.c:286 +#: src/remove.c:273 #, c-format msgid "%s: descend into write-protected directory %s? " msgstr "%s: gå ned i skrivebeskyttet katalog %s? " -#: src/remove.c:287 +#: src/remove.c:274 #, c-format msgid "%s: descend into directory %s? " msgstr "%s: gå ned i katalog %s? " @@ -7882,37 +8269,37 @@ msgstr "%s: gå ned i katalog %s? " #. translate "%s: remove %s (write-protected) %s? " #. instead. It should avoid grammatical problems #. with the output of file_type. -#: src/remove.c:303 +#: src/remove.c:290 #, c-format msgid "%s: remove write-protected %s %s? " msgstr "%s: fjern skrivebeskyttet %s %s? " -#: src/remove.c:304 +#: src/remove.c:291 #, c-format msgid "%s: remove %s %s? " msgstr "%s: fjern %s %s? " -#: src/remove.c:417 +#: src/remove.c:374 #, c-format msgid "removed directory: %s\n" msgstr "fjernede katalog %s\n" -#: src/remove.c:481 +#: src/remove.c:444 #, c-format msgid "cannot remove directory: %s" msgstr "kan ikke fjerne katalog: %s" -#: src/remove.c:537 +#: src/remove.c:500 #, 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:557 +#: src/remove.c:520 #, c-format msgid "traversal failed: %s" msgstr "gennemløb slog fejl: %s" -#: src/remove.c:563 +#: src/remove.c:526 #, c-format msgid "" "unexpected failure: fts_info=%d: %s\n" @@ -7921,13 +8308,12 @@ msgstr "" "uventet fejl: fts_info=%d: %s\n" "rapportér venligst til %s" -#: src/rm.c:118 -#, fuzzy, c-format +#: src/rm.c:119 +#, c-format msgid "Try '%s ./%s' to remove the file %s.\n" msgstr "Prøv '%s ./%s' for at fjerne filen %s.\n" -#: src/rm.c:135 -#, fuzzy +#: src/rm.c:136 msgid "" "Remove (unlink) the FILE(s).\n" "\n" @@ -7937,10 +8323,11 @@ msgid "" msgstr "" "Fjern (aflænk) FILerne.\n" "\n" -" -f, --force ignorer filer, der ikke findes; spørg aldrig\n" +" -f, --force ignorér filer og argumenter, der ikke findes;\n" +" spørg aldrig\n" " -i spørg før hver sletning\n" -#: src/rm.c:141 +#: src/rm.c:142 msgid "" " -I prompt once before removing more than three files, " "or\n" @@ -7960,7 +8347,7 @@ msgstr "" "i).\n" " Uden NÅR spørges altid\n" -#: src/rm.c:148 +#: src/rm.c:149 msgid "" " --one-file-system when removing a hierarchy recursively, skip any\n" " directory that is on a file system different from\n" @@ -7972,20 +8359,21 @@ msgstr "" "end\n" " det, som svarer til kommandolinjeargumentet\n" -#: src/rm.c:153 -#, fuzzy +#: src/rm.c:154 msgid "" " --no-preserve-root do not treat '/' specially\n" " --preserve-root do not remove '/' (default)\n" " -r, -R, --recursive remove directories and their contents recursively\n" +" -d, --dir remove empty directories\n" " -v, --verbose explain what is being done\n" msgstr "" " --no-preserve-root behandl ikke '/' specielt\n" " --preserve-root fjern ikke '/' (standard)\n" " -r, -R, --recursive fjern kataloger og deres indhold rekursivt\n" +" -d, --dir fjern tomme kataloger\n" " -v, --verbose forklar hvad der bliver gjort\n" -#: src/rm.c:161 +#: src/rm.c:163 msgid "" "\n" "By default, rm does not remove directories. Use the --recursive (-r or -R)\n" @@ -7997,8 +8385,8 @@ msgstr "" "R)\n" "for at fjerne hvert anført katalog også, sammen med alt indhold.\n" -#: src/rm.c:166 -#, fuzzy, c-format +#: src/rm.c:168 +#, c-format msgid "" "\n" "To remove a file whose name starts with a '-', for example '-foo',\n" @@ -8014,7 +8402,7 @@ msgstr "" "\n" " %s ./-foo\n" -#: src/rm.c:175 +#: src/rm.c:177 msgid "" "\n" "Note that if you use rm to remove a file, it might be possible to recover\n" @@ -8028,12 +8416,12 @@ msgstr "" "tid. Hvis du ønsker større sikkerhed for at indholdet virkelig ikke kan \n" "genskabes, så overvej at bruge 'shred'.\n" -#: src/rm.c:335 +#: src/rm.c:342 #, c-format msgid "%s: remove all arguments recursively? " msgstr "%s: fjern alle argumenter rekursivt? " -#: src/rm.c:336 +#: src/rm.c:343 #, c-format msgid "%s: remove all arguments? " msgstr "%s: fjern alle argumenter? " @@ -8063,7 +8451,6 @@ msgstr "" " ikke er tomt\n" #: src/rmdir.c:172 -#, fuzzy msgid "" " -p, --parents remove DIRECTORY and its ancestors; e.g., 'rmdir -p a/b/c' " "is\n" @@ -8093,7 +8480,11 @@ msgstr "" msgid "" "Run a program in a different security context.\n" "With neither CONTEXT nor COMMAND, print the current security context.\n" -"\n" +msgstr "" + +#: src/runcon.c:94 +#, fuzzy +msgid "" " CONTEXT Complete security context\n" " -c, --compute compute process transition context before modifying\n" " -t, --type=TYPE type (for same role as parent)\n" @@ -8113,72 +8504,72 @@ msgstr "" " -l, --range=INTERV niveauinterval\n" "\n" -#: src/runcon.c:140 +#: src/runcon.c:144 #, c-format msgid "multiple roles" msgstr "flere roller" -#: src/runcon.c:145 +#: src/runcon.c:149 #, c-format msgid "multiple types" msgstr "flere typer" -#: src/runcon.c:150 +#: src/runcon.c:154 #, c-format msgid "multiple users" msgstr "flere brugere" -#: src/runcon.c:155 +#: src/runcon.c:159 #, c-format msgid "multiple levelranges" msgstr "flere niveauintervaller" -#: src/runcon.c:173 src/runcon.c:209 +#: src/runcon.c:177 src/runcon.c:213 #, c-format msgid "failed to get current context" msgstr "kunne ikke hente den aktuelle kontekst" -#: src/runcon.c:183 +#: src/runcon.c:187 #, c-format msgid "you must specify -c, -t, -u, -l, -r, or context" msgstr "du skal angive -c, -t, -u, -l, -r eller kontekst" -#: src/runcon.c:191 +#: src/runcon.c:195 #, c-format msgid "no command specified" msgstr "ingen kommando angivet" -#: src/runcon.c:197 +#: src/runcon.c:201 #, c-format msgid "%s may be used only on a SELinux kernel" msgstr "%s kan kun bruges på en SELinux-kerne" -#: src/runcon.c:223 +#: src/runcon.c:227 #, c-format msgid "failed to compute a new context" msgstr "kunne ikke udregne en ny kontekst" -#: src/runcon.c:237 +#: src/runcon.c:241 #, c-format msgid "failed to set new user %s" msgstr "kunne ikke sætte ny bruger %s" -#: src/runcon.c:239 +#: src/runcon.c:243 #, c-format msgid "failed to set new type %s" msgstr "kunne ikke sætte ny type %s" -#: src/runcon.c:241 +#: src/runcon.c:245 #, c-format msgid "failed to set new range %s" msgstr "kunne ikke sætte nyt interval %s" -#: src/runcon.c:243 +#: src/runcon.c:247 #, c-format msgid "failed to set new role %s" msgstr "kunne ikke sætte ny rolle %s" -#: src/runcon.c:251 +#: src/runcon.c:255 #, c-format msgid "unable to set security context %s" msgstr "kunne ikke sætte sikkerhedskontekst %s" @@ -8195,9 +8586,12 @@ msgstr "" " eller: %s [FLAG]... FØRSTE FORØGELSE SIDSTE\n" #: src/seq.c:73 +msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" +msgstr "" + +#: src/seq.c:79 +#, fuzzy msgid "" -"Print numbers from FIRST to LAST, in steps of INCREMENT.\n" -"\n" " -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" @@ -8209,7 +8603,7 @@ msgstr "" "\\n)\n" " -w, --equal-width gør bredden ens ved at foranstille nuller\n" -#: src/seq.c:82 +#: src/seq.c:86 msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" @@ -8225,8 +8619,7 @@ msgstr "" "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:90 -#, fuzzy +#: src/seq.c:94 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" @@ -8236,32 +8629,17 @@ 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:136 +#: src/seq.c:140 #, c-format msgid "invalid floating point argument: %s" msgstr "ugyldigt flydende tal-argument: %s" -#: src/seq.c:193 -#, c-format -msgid "format %s has no %% directive" -msgstr "formatet %s har intet %%-direktiv" - -#: src/seq.c:210 -#, c-format -msgid "format %s ends in %%" -msgstr "formatet %s slutter med %%" - -#: src/seq.c:213 +#: src/seq.c:232 #, c-format msgid "format %s has unknown %%%c directive" msgstr "formatet %s har et ukendt %%%c-direktiv" -#: src/seq.c:217 -#, c-format -msgid "format %s has too many %% directives" -msgstr "formatet %s har for mange %%-direktiver" - -#: src/seq.c:431 +#: src/seq.c:555 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" @@ -8307,27 +8685,27 @@ 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:163 +#: src/setuidgid.c:162 #, c-format msgid "unknown user-ID: %s" msgstr "ukendt bruger-ID: %s" -#: src/setuidgid.c:174 +#: 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:191 +#: src/setuidgid.c:190 #, c-format msgid "failed to set supplemental group(s)" msgstr "kunne ikke sætte supplerende grupper" -#: src/setuidgid.c:201 +#: 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:205 +#: src/setuidgid.c:204 #, c-format msgid "cannot set user-ID to %lu" msgstr "kan ikke sætte bruger-ID til %lu" @@ -8338,16 +8716,16 @@ msgid "Colin Plumb" msgstr "Colin Plumb" #: src/shred.c:148 +#, 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" -"\n" msgstr "" "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:156 +#: src/shred.c:155 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -8360,7 +8738,7 @@ 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:162 +#: src/shred.c:161 msgid "" " -u, --remove truncate and remove file after overwriting\n" " -v, --verbose show progress\n" @@ -8374,7 +8752,7 @@ msgstr "" " dette er forvalg for ikke-regulære filer\n" " -z, --zero overskriv til slut med nuller for at skjule makulering\n" -#: src/shred.c:171 +#: src/shred.c:170 msgid "" "\n" "If FILE is -, shred standard output.\n" @@ -8396,7 +8774,7 @@ msgstr "" "bruger de fleste flaget --remove.\n" "\n" -#: src/shred.c:181 +#: src/shred.c:180 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" @@ -8413,7 +8791,7 @@ msgstr "" "fungere efter hensigten, eller ikke vil fungere i alle filsystemtilstande:\n" "\n" -#: src/shred.c:189 +#: src/shred.c:188 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -8435,7 +8813,7 @@ msgstr "" "server\n" "\n" -#: src/shred.c:199 +#: src/shred.c:198 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -8449,7 +8827,7 @@ msgstr "" "* komprimerede filsystemer\n" "\n" -#: src/shred.c:206 +#: src/shred.c:205 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" @@ -8470,7 +8848,7 @@ msgstr "" "filen\n" "/etc/fstab, som dokumenteret i man-siden for mount (man mount).\n" -#: src/shred.c:216 +#: src/shred.c:215 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" @@ -8482,122 +8860,122 @@ msgstr "" "af\n" "en makuleret fil.\n" -#: src/shred.c:296 +#: src/shred.c:295 #, c-format msgid "%s: fdatasync failed" msgstr "%s: fdatasync mislykkedes" -#: src/shred.c:307 +#: src/shred.c:306 #, c-format msgid "%s: fsync failed" msgstr "%s: fsync mislykkedes" -#: src/shred.c:384 +#: src/shred.c:383 #, c-format msgid "%s: cannot rewind" msgstr "%s: kan ikke tilbagespole" -#: src/shred.c:403 +#: src/shred.c:402 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: gennemløb %lu/%lu (%s)..." -#: src/shred.c:453 +#: src/shred.c:452 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: fejl ved skrivning fra afsæt %s" -#: src/shred.c:471 +#: src/shred.c:470 #, c-format msgid "%s: lseek failed" msgstr "%s: lseek mislykkedes" -#: src/shred.c:482 +#: src/shred.c:481 #, c-format msgid "%s: file too large" msgstr "%s: fil for stor" -#: src/shred.c:505 +#: src/shred.c:504 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: gennemløb %lu/%lu (%s)...%s" -#: src/shred.c:521 +#: src/shred.c:520 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: gennemløb %lu/%lu (%s)...%s/%s %d%%" -#: src/shred.c:768 +#: src/shred.c:767 #, c-format msgid "%s: fstat failed" msgstr "%s: fstat mislykkedes" -#: src/shred.c:779 +#: src/shred.c:778 #, c-format msgid "%s: invalid file type" msgstr "%s: ugyldig filtype" -#: src/shred.c:798 +#: src/shred.c:797 #, c-format msgid "%s: file has negative size" msgstr "%s: fil har negativ størrelse" -#: src/shred.c:865 +#: src/shred.c:864 src/sort.c:932 src/split.c:378 #, c-format msgid "%s: error truncating" msgstr "%s: fejl ved afkortning" -#: src/shred.c:881 +#: src/shred.c:880 #, c-format msgid "%s: fcntl failed" msgstr "%s: fcntl mislykkedes" -#: src/shred.c:886 +#: src/shred.c:885 #, 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:968 +#: src/shred.c:967 #, c-format msgid "%s: removing" msgstr "%s: sletter" -#: src/shred.c:992 +#: src/shred.c:991 #, c-format msgid "%s: renamed to %s" msgstr "%s: omdøbt til %s" -#: src/shred.c:1014 +#: src/shred.c:1013 #, c-format msgid "%s: failed to remove" msgstr "%s: kunne ikke fjerne" -#: src/shred.c:1018 +#: src/shred.c:1017 #, c-format msgid "%s: removed" msgstr "%s: slettet" -#: src/shred.c:1025 src/shred.c:1068 +#: src/shred.c:1024 src/shred.c:1067 #, c-format msgid "%s: failed to close" msgstr "%s: kunne ikke lukke" -#: src/shred.c:1061 +#: src/shred.c:1060 #, c-format msgid "%s: failed to open for writing" msgstr "%s: kunne ikke åbne til skrivning" -#: src/shred.c:1126 +#: src/shred.c:1125 #, c-format msgid "%s: invalid number of passes" msgstr "%s: ugyldigt antal gennemløb" -#: src/shred.c:1135 src/shuf.c:291 src/sort.c:4387 +#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441 #, c-format msgid "multiple random sources specified" msgstr "der er angivet flere kilder til tilfældige tal" -#: src/shred.c:1149 +#: src/shred.c:1148 #, c-format msgid "%s: invalid file size" msgstr "%s: ugyldig filstørrelse" @@ -8614,14 +8992,13 @@ msgstr "" " eller: %s -i LAV-HØJ [FLAG]...\n" #: src/shuf.c:54 -msgid "" -"Write a random permutation of the input lines to standard output.\n" -"\n" +#, fuzzy +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" -#: src/shuf.c:61 +#: src/shuf.c:60 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 " @@ -8639,33 +9016,33 @@ msgstr "" " --random-source=FIL læs tilfældige byte fra FIL\n" " -z, --zero-terminated afslut linjer med 0-byte, ikke linjeskiftstegn\n" -#: src/shuf.c:245 +#: src/shuf.c:244 #, c-format msgid "multiple -i options specified" msgstr "flere -i-flag angivet" -#: src/shuf.c:265 +#: src/shuf.c:264 #, c-format msgid "invalid input range %s" msgstr "ugyldigt talområde %s angivet" -#: src/shuf.c:278 +#: src/shuf.c:277 #, c-format msgid "invalid line count %s" msgstr "ugyldigt linjetal %s" -#: src/shuf.c:285 src/sort.c:4381 +#: src/shuf.c:284 src/sort.c:4435 #, c-format msgid "multiple output files specified" msgstr "flere udfiler angivet" -#: src/shuf.c:311 +#: src/shuf.c:310 #, c-format msgid "cannot combine -e and -i options" msgstr "kan ikke kombinere flagene -e og -i" #: src/sleep.c:44 -#, fuzzy, c-format +#, c-format msgid "" "Usage: %s NUMBER[SUFFIX]...\n" " or: %s OPTION\n" @@ -8689,7 +9066,7 @@ msgstr "" "tidsrummet givet ved værdiernes sum.\n" "\n" -#: src/sleep.c:135 src/timeout.c:295 +#: src/sleep.c:135 src/timeout.c:320 #, c-format msgid "invalid time interval %s" msgstr "ugyldigt tidsinterval %s" @@ -8699,15 +9076,14 @@ msgstr "ugyldigt tidsinterval %s" msgid "cannot read realtime clock" msgstr "kan ikke læse realtids-ur" -#: src/sort.c:395 -msgid "" -"Write sorted concatenation of all FILE(s) to standard output.\n" -"\n" +#: src/sort.c:399 +#, fuzzy +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" -#: src/sort.c:402 +#: src/sort.c:405 msgid "" "Ordering options:\n" "\n" @@ -8715,7 +9091,7 @@ msgstr "" "Sorteringsflag:\n" "\n" -#: src/sort.c:406 +#: src/sort.c:409 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -8727,8 +9103,7 @@ msgstr "" " betragtning\n" " -f, --ignore-case behandl små bogstaver som store bogstaver\n" -#: src/sort.c:412 -#, fuzzy +#: src/sort.c:415 msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" " -i, --ignore-nonprinting consider only printable characters\n" @@ -8738,14 +9113,14 @@ msgstr "" " -i, --ignore-nonprinting tag kun synlige tegn i betragtning\n" " -M, --month-sort sammenlign (ukendt) < 'JAN' < ... < 'DEC'\n" -#: src/sort.c:417 +#: src/sort.c:420 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:420 +#: src/sort.c:423 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -8757,7 +9132,7 @@ msgstr "" " --random-source=FIL hent tilfældige byte fra FIL \n" " -r, --reverse vend resultaterne af sammenligningerne om\n" -#: src/sort.c:426 +#: src/sort.c:429 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -8774,7 +9149,7 @@ msgstr "" "tekst\n" "\n" -#: src/sort.c:434 +#: src/sort.c:437 msgid "" "Other options:\n" "\n" @@ -8782,7 +9157,7 @@ msgstr "" "Andre flag:\n" "\n" -#: src/sort.c:438 +#: src/sort.c:441 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" @@ -8790,7 +9165,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:442 +#: src/sort.c:445 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 " @@ -8805,7 +9180,7 @@ msgstr "" " --compress-program=PROG komprimér midlertidige filer med PROG;\n" " udpak dem med PROG -d\n" -#: src/sort.c:449 +#: src/sort.c:452 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -8820,20 +9195,16 @@ msgstr "" " navne i filen F; hvis F er -, så læs filnavne\n" " fra standard-ind\n" -#: src/sort.c:456 -#, fuzzy +#: src/sort.c:459 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] start en nøgle ved POS1 (startindeks er 1), " -"afslut\n" -" den ved POS2 (som standard ved " -"linjeafslutning).\n" -" Se POS-syntaks nedenfor\n" +" -k, --key=NØGLEDEF sortér efter nøgle; NØGLEDEF angiver placering\n" +" og type\n" " -m, --merge flet allerede sorterede filer; sortér ikke\n" -#: src/sort.c:460 +#: src/sort.c:463 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -8847,7 +9218,7 @@ msgstr "" "hukommelsesbuffer\n" # Infosiden for sort indeholder bedre information om hvad dette betyder -#: src/sort.c:466 +#: src/sort.c:469 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -8873,13 +9244,12 @@ msgstr "" " uden -c: udskriv kun den første af en række " "ens\n" -#: src/sort.c:475 +#: 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:480 -#, fuzzy +#: src/sort.c:483 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -8898,17 +9268,18 @@ msgid "" "SIZE may be followed by the following multiplicative suffixes:\n" msgstr "" "\n" -"POS er F[.T][FLAG], hvor F er et feltnummer og T en tegnposition i feltet;\n" -"begge starter ved 1. Hvis hverken -t eller -b er valgt, vil tegn i et felt\n" -"tælles fra begyndelsen af det foregående område af blanke tegn. FLAG er " -"sat\n" -"sammen af et eller flere enkeltbogstavs-flag, som tilsidesætter globale\n" -"sorteringsflag for denne nøgle. Hvis ingen nøgle er angivet, bruges hele\n" -"linjen som nøgle.\n" +"NØGLEDEF er F[.T][FLAG][,F[.T][FLAG]], for start- og slutposition,\n" +"hvor F er et feltnummer og T en tegnposition i feltet. Begge starter\n" +"ved 1, og slutpositionen er som standard afslutningen af linjen. Hvis\n" +"hverken -t eller -b er valgt, vil tegn i et felt tælles fra\n" +"begyndelsen af det foregående område af blanke tegn. FLAG er sat\n" +"sammen af et eller flere enkeltbogstavs-flag [bdfgiMhnRrV], som\n" +"tilsidesætter globale sorteringsflag for denne nøgle. Hvis ingen\n" +"nøgle er angivet, bruges hele linjen som nøgle.\n" "\n" "STØR kan efterfølges af de følgende multiplikative endelser:\n" -#: src/sort.c:493 +#: src/sort.c:496 msgid "" "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n" "\n" @@ -8929,272 +9300,272 @@ msgstr "" "Sæt LC_ALL=C for at få den traditionelle sorteringsorden som benytter\n" "de interne byte-værdier.\n" -#: src/sort.c:694 +#: src/sort.c:697 #, c-format msgid "waiting for %s [-d]" msgstr "venter på %s [-d]" -#: src/sort.c:699 +#: src/sort.c:702 #, c-format msgid "%s [-d] terminated abnormally" msgstr "%s [-d] afsluttede uplanmæssigt" -#: src/sort.c:853 +#: src/sort.c:856 #, 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:939 src/sort.c:2010 src/sort.c:3056 src/sort.c:3755 -#: src/sort.c:3758 +#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713 +#: src/sort.c:3804 src/sort.c:3807 msgid "open failed" msgstr "fejl ved åbning" -#: src/sort.c:959 +#: src/sort.c:970 msgid "fflush failed" msgstr "fejl ved fflush" -#: src/sort.c:964 src/sort.c:2013 src/sort.c:4646 +#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706 msgid "close failed" msgstr "fejl ved lukning" -#: src/sort.c:973 +#: src/sort.c:986 #, c-format msgid "dup2 failed" msgstr "fejl ved dup2" -#: src/sort.c:1090 +#: src/sort.c:1103 #, c-format msgid "couldn't execute %s" msgstr "kunne ikke eksekvere %s" -#: src/sort.c:1097 +#: src/sort.c:1110 msgid "couldn't create temporary file" msgstr "kunne ikke oprette midlertidig fil" -#: src/sort.c:1136 +#: src/sort.c:1149 #, c-format msgid "couldn't create process for %s -d" msgstr "kunne ikke oprette proces for %s -d" -#: src/sort.c:1150 +#: src/sort.c:1161 #, c-format msgid "couldn't execute %s -d" msgstr "kunne ikke eksekvere %s -d" -#: src/sort.c:1209 +#: src/sort.c:1220 #, c-format msgid "warning: cannot remove: %s" msgstr "advarsel: kan ikke fjerne: %s" -#: src/sort.c:1295 +#: src/sort.c:1306 #, c-format msgid "invalid --%s argument %s" msgstr "ugyldigt argument %2$s til --%1$s" -#: src/sort.c:1298 +#: src/sort.c:1309 #, c-format msgid "minimum --%s argument is %s" msgstr "mindste argument til --%s er %s" -#: src/sort.c:1313 +#: src/sort.c:1324 #, c-format msgid "--%s argument %s too large" msgstr "argumentet %2$s til --%1$s er for stort" -#: src/sort.c:1316 +#: src/sort.c:1327 #, 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:1398 +#: src/sort.c:1409 #, c-format msgid "number in parallel must be nonzero" msgstr "paralleliseringstallet skal være forskelligt fra nul" -#: src/sort.c:1479 +#: src/sort.c:1494 msgid "stat failed" msgstr "stat() mislykkedes" -#: src/sort.c:1740 +#: src/sort.c:1755 msgid "read failed" msgstr "læsefejl" -#: src/sort.c:2028 +#: src/sort.c:2043 #, c-format msgid "string transformation failed" msgstr "strengtransformation mislykkedes" -#: src/sort.c:2031 +#: src/sort.c:2046 #, c-format msgid "the untransformed string was %s" msgstr "den utransformerede streng var %s" -#: src/sort.c:2194 +#: src/sort.c:2209 #, c-format msgid "^ no match for key\n" msgstr "^ ingen træffer for nøgle\n" -#: src/sort.c:2374 -#, fuzzy, c-format +#: src/sort.c:2389 +#, c-format msgid "obsolescent key %s used; consider %s instead" -msgstr "forældet nøgle '%s' brugt; overvej i stedet '%s'" +msgstr "forældet nøgle %s brugt; overvej i stedet %s" -#: src/sort.c:2380 +#: src/sort.c:2395 #, 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:2391 -#, fuzzy, c-format +#: src/sort.c:2406 +#, 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:2404 +#: src/sort.c:2419 #, 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:2436 -#, fuzzy, c-format +#: src/sort.c:2451 +#, 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:2442 -#, fuzzy, c-format +#: src/sort.c:2457 +#, 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:2716 src/sort.c:2725 +#: src/sort.c:2731 src/sort.c:2740 msgid "write failed" msgstr "fejl ved skrivning" -#: src/sort.c:2768 +#: src/sort.c:2783 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: uorden: " -#: src/sort.c:2771 +#: src/sort.c:2786 msgid "standard error" msgstr "standard-fejl" -#: src/sort.c:3926 +#: src/sort.c:3698 +msgid "cannot read" +msgstr "kan ikke læse" + +#: src/sort.c:3976 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: ugyldig feltangivelse %s" -#: src/sort.c:3937 -#, fuzzy, c-format +#: src/sort.c:3987 +#, c-format msgid "options '-%s' are incompatible" msgstr "flagene '-%s' er inkompatible" -#: src/sort.c:3988 +#: src/sort.c:4038 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s: ugyldigt antal ved starten af %s" -#: src/sort.c:4245 -#, fuzzy +#: src/sort.c:4295 msgid "invalid number after '-'" msgstr "ugyldigt tal efter '-'" -#: src/sort.c:4248 src/sort.c:4334 src/sort.c:4362 -#, fuzzy +#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416 msgid "invalid number after '.'" msgstr "ugyldigt tal efter '.'" -#: src/sort.c:4261 src/sort.c:4367 +#: src/sort.c:4315 src/sort.c:4421 msgid "stray character in field spec" msgstr "forvildet tegn i feltangivelse" -#: src/sort.c:4308 +#: src/sort.c:4362 #, c-format msgid "multiple compress programs specified" msgstr "flere compress-programmer angivet" -#: src/sort.c:4325 +#: src/sort.c:4379 msgid "invalid number at field start" msgstr "ugyldigt tal ved feltbegyndelsen" -#: src/sort.c:4329 src/sort.c:4357 +#: src/sort.c:4383 src/sort.c:4411 msgid "field number is zero" msgstr "felt-nummeret er nul" -#: src/sort.c:4338 +#: src/sort.c:4392 msgid "character offset is zero" msgstr "tegnafsæt er nul" -#: src/sort.c:4353 -#, fuzzy +#: src/sort.c:4407 msgid "invalid number after ','" msgstr "ugyldigt tal efter ','" -#: src/sort.c:4403 +#: src/sort.c:4457 #, c-format msgid "empty tab" msgstr "tom tabulator" -#: src/sort.c:4496 src/wc.c:692 +#: src/sort.c:4550 src/wc.c:692 #, c-format msgid "cannot read file names from %s" msgstr "kan ikke læse filnavne fra %s" -#: src/sort.c:4518 +#: src/sort.c:4572 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s:%lu: ugyldigt filnavn af længde nul" -#: src/sort.c:4524 +#: src/sort.c:4578 #, c-format msgid "no input from %s" msgstr "ingen inddata fra %s" -#: src/sort.c:4570 +#: src/sort.c:4624 #, c-format msgid "using %s sorting rules" msgstr "bruger sorteringsreglerne %s" -#: src/sort.c:4573 +#: src/sort.c:4627 #, c-format msgid "using simple byte comparison" msgstr "bruger simpel bytesammenligning" -#: src/sort.c:4604 +#: src/sort.c:4658 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "ekstra operand %s er ikke tilladt med -%c" -#: src/split.c:184 +#: src/split.c:187 #, c-format msgid "the suffix length needs to be at least %zu" msgstr "suffikslængden skal være mindst %zu" -#: src/split.c:201 +#: src/split.c:204 #, c-format msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" msgstr "Brug: %s [FLAG]... [INDDATA [PRÆFIKS]]\n" -#: src/split.c:205 +#: src/split.c:208 #, fuzzy 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" -"\n" 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:214 -#, fuzzy, c-format +#: src/split.c:216 +#, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" " --additional-suffix=SUFFIX append an additional SUFFIX to file " @@ -9212,17 +9583,20 @@ msgid "" " -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" " -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 brug numeriske suffikser frem for alfabetiske\n" -" -e, --elide-empty-files generér ikke tomme udfiler med \"-n\"\n" +" -d, --numeric-suffixes[=FRA] brug numeriske suffikser frem for " +"alfabetiske.\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" -" -u, --unbuffered kopiér omgående inddata til uddata med \"-n r/..." -"\"\n" +" -u, --unbuffered kopiér omgående inddata til uddata med '-n r/...'\n" -#: src/split.c:227 +#: src/split.c:229 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" @@ -9230,8 +9604,7 @@ msgstr "" " --verbose skriv informationer til standard-fejl lige\n" " før hver udfil åbnes\n" -#: src/split.c:234 -#, fuzzy +#: src/split.c:236 msgid "" "\n" "CHUNKS may be:\n" @@ -9248,189 +9621,194 @@ msgstr "" "K/N udskriv K'te af N til stdout\n" "l/N opdel i N filer uden at opdele linjer\n" "l/K/N udskriv K'te af N til standard-ud uden at opdele linjer\n" -"r/N som \"l\", men brug jævn ('round robin-') fordeling\n" +"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:352 +#: src/split.c:354 #, c-format msgid "output file suffixes exhausted" msgstr "løbet tør for endelser til udfiler" -#: src/split.c:364 +#: src/split.c:366 #, c-format msgid "creating file %s\n" msgstr "opretter filen %s\n" -#: src/split.c:377 +#: src/split.c:375 +#, c-format +msgid "%s would overwrite input; aborting" +msgstr "%s ville overskrive inddata; afbryder" + +#: src/split.c:391 #, c-format msgid "failed to set FILE environment variable" msgstr "kunne ikke sætte miljøvariablen FILE" -#: src/split.c:379 +#: src/split.c:393 #, c-format msgid "executing with FILE=%s\n" msgstr "kører med FILE=%s\n" -#: src/split.c:381 +#: src/split.c:395 #, c-format msgid "failed to create pipe" -msgstr "kunne ikke oprette rørledning" +msgstr "kunne ikke oprette datakanal" -#: src/split.c:395 +#: src/split.c:409 #, c-format msgid "closing prior pipe" -msgstr "lukker tidligere rørledning" +msgstr "lukker tidligere datakanal" -#: src/split.c:397 +#: src/split.c:411 #, c-format msgid "closing output pipe" -msgstr "lukker uddatarørledning" +msgstr "lukker uddatakanal" -#: src/split.c:401 +#: src/split.c:415 #, c-format msgid "moving input pipe" -msgstr "flytter inddatarørledning" +msgstr "flytter inddatakanal" -#: src/split.c:403 +#: src/split.c:417 #, c-format msgid "closing input pipe" -msgstr "lukker inddatarørledning" +msgstr "lukker inddatakanal" -#: src/split.c:408 +#: src/split.c:422 #, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "kunne ikke køre kommandoen: \"%s -c %s\"" -#: src/split.c:414 +#: src/split.c:428 #, c-format msgid "failed to close input pipe" -msgstr "kunne ikke lukke inddatarørledningen" +msgstr "kunne ikke lukke inddatakanal" -#: src/split.c:450 +#: src/split.c:464 #, 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:460 +#: src/split.c:474 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "med FILE=%s, signal %s fra kommando: %s" -#: src/split.c:468 +#: src/split.c:482 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "med FILE=%s, slutstatus %d fra kommando: %s" -#: src/split.c:475 src/timeout.c:449 +#: src/split.c:489 src/timeout.c:494 #, c-format msgid "unknown status from command (0x%X)" msgstr "ukendt status fra kommando (0x%X)" -#: src/split.c:1037 +#: src/split.c:1052 #, c-format msgid "cannot split in more than one way" msgstr "kan ikke opdele på mere end én måde" -#: src/split.c:1050 src/split.c:1192 src/split.c:1363 +#: src/split.c:1065 src/split.c:1205 src/split.c:1376 #, c-format msgid "%s: invalid number of chunks" msgstr "%s: ugyldigt antal klumper" -#: src/split.c:1054 +#: src/split.c:1069 #, c-format msgid "%s: invalid chunk number" msgstr "%s: ugyldigt klumpnummer" -#: src/split.c:1106 +#: src/split.c:1119 #, c-format msgid "%s: invalid suffix length" msgstr "%s: ugyldig længde på endelse" -#: src/split.c:1131 src/split.c:1139 src/split.c:1162 src/split.c:1167 +#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180 #, c-format msgid "%s: invalid number of bytes" msgstr "%s: ugyldigt antal byte" -#: src/split.c:1150 src/split.c:1297 +#: src/split.c:1163 src/split.c:1310 #, c-format msgid "%s: invalid number of lines" msgstr "%s: ugyldigt antal linjer" -#: src/split.c:1223 +#: src/split.c:1236 #, c-format msgid "line count option -%s%c... is too large" msgstr "linjetalflaget -%s%c... er for stort" -#: src/split.c:1235 -#, fuzzy, c-format +#: src/split.c:1248 +#, c-format msgid "%s: invalid start value for numerical suffix" -msgstr "ugyldigt første linjenummer: %s" +msgstr "%s: ugyldig startværdi for numerisk suffiks" -#: src/split.c:1263 +#: src/split.c:1276 #, c-format msgid "%s: invalid IO block size" msgstr "%s: ugyldig IO-blokstørrelse" -#: src/split.c:1284 +#: src/split.c:1297 #, 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:1321 +#: src/split.c:1334 #, c-format msgid "numerical suffix start value is too large for the suffix length" -msgstr "" +msgstr "numerisk suffiksstartværdi er for stor til suffikslængden" -#: src/split.c:1356 +#: src/split.c:1369 #, 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:169 +#: src/stat.c:173 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:838 +#: src/stat.c:857 #, c-format msgid "failed to canonicalize %s" msgstr "kunne ikke normalisere %s" -#: src/stat.c:1050 -#, fuzzy, c-format +#: src/stat.c:1069 +#, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "advarsel: ukendt undvigesekvens '\\%c'" -#: src/stat.c:1105 +#: src/stat.c:1124 #, c-format msgid "%s: invalid directive" msgstr "%s: ugyldigt direktiv" -#: src/stat.c:1151 +#: src/stat.c:1170 #, c-format msgid "warning: backslash at end of format" msgstr "advarsel: omvendt skråstreg ved slutningen af format" -#: src/stat.c:1182 +#: src/stat.c:1201 #, 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:1189 +#: src/stat.c:1208 #, c-format msgid "cannot read file system information for %s" msgstr "kan ikke læse information om filsystem for %s" -#: src/stat.c:1209 +#: src/stat.c:1228 #, 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:1245 +#: src/stat.c:1264 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -9446,7 +9824,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1268 +#: src/stat.c:1287 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -9456,31 +9834,31 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1278 +#: src/stat.c:1297 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:1286 +#: src/stat.c:1305 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:1295 +#: src/stat.c:1314 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:1305 +#: src/stat.c:1324 #, 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:1313 +#: src/stat.c:1332 msgid "" "Access: %x\n" "Modify: %y\n" @@ -9492,10 +9870,13 @@ msgstr "" "Ændret: %z\n" "Opret.: %w\n" -#: src/stat.c:1331 +#: src/stat.c:1350 +msgid "Display file or file system status.\n" +msgstr "" + +#: src/stat.c:1356 +#, fuzzy msgid "" -"Display file or file system status.\n" -"\n" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" @@ -9504,7 +9885,7 @@ msgstr "" " -L, --dereference følg lænker\n" " -f, --file-system vis filsystemstatus fremfor filstatus\n" -#: src/stat.c:1337 +#: src/stat.c:1360 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -9522,8 +9903,7 @@ msgstr "" " så tilføj \\n i FORMAT.\n" " -t, --terse udskriv information kortfattet\n" -#: src/stat.c:1348 -#, fuzzy +#: src/stat.c:1371 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -9537,14 +9917,13 @@ msgstr "" "\n" "De gyldige format-sekvenser for filer (uden --file-system):\n" "\n" -" %a Adgangsrettigheder oktalt\n" -" %A Adgangsrettigheder på læsevenlig form\n" -" %b Antal blokke allokeret (se %B)\n" -" %B Størrelsen i byte for hver blok rapporteret af %b\n" -" %C Streng for SELinux-sikkerhedskontekst\n" +" %a adgangsrettigheder oktalt\n" +" %A adgangsrettigheder på læsevenlig form\n" +" %b antal blokke allokeret (se %B)\n" +" %B størrelsen i byte for hver blok rapporteret af %b\n" +" %C streng for SELinux-sikkerhedskontekst\n" -#: src/stat.c:1357 -#, fuzzy +#: src/stat.c:1380 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -9553,15 +9932,14 @@ msgid "" " %g group ID of owner\n" " %G group name of owner\n" msgstr "" -" %d - Enhedsnummer decimalt\n" -" %D - Enhedsnummer i hex\n" -" %f - Rå tilstand i hex\n" -" %F - Filtype\n" -" %g - Gruppe-ID på ejer\n" -" %G - Gruppenavn på ejer\n" +" %d - enhedsnummer decimalt\n" +" %D - enhedsnummer i hex\n" +" %f - rå tilstand i hex\n" +" %F - filtype\n" +" %g - gruppe-id på ejer\n" +" %G - gruppenavn på ejer\n" -#: src/stat.c:1365 -#, fuzzy +#: src/stat.c:1388 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -9573,19 +9951,18 @@ msgid "" " %t major device type in hex\n" " %T minor device type in hex\n" msgstr "" -" %h Antal hårde lænker\n" -" %i Inode-nummer\n" -" %m Monteringspunkt\n" -" %n Filnavn\n" -" %N Citeret filnavn med dereference hvis symbolsk lænke\n" -" %o I/O-blokstørrelse\n" -" %s Total størrelse i byte\n" -" %t Underenhedstype i hex\n" -" %T Overenhedstype i hex\n" +" %h antal hårde lænker\n" +" %i inode-nummer\n" +" %m monteringspunkt\n" +" %n filnavn\n" +" %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" # Vi må hellere undgå den uklarheden i de engelske gloser (modification vs change) -#: src/stat.c:1376 -#, fuzzy +#: src/stat.c:1399 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -9599,21 +9976,20 @@ msgid "" " %Z time of last change, seconds since Epoch\n" "\n" msgstr "" -" %u Bruger-id på ejer\n" -" %U Brugernavn på ejer\n" -" %w Tidspunkt for filoprettelse i læsevenligt format, eller - hvis " +" %u bruger-id på ejer\n" +" %U brugernavn på ejer\n" +" %w tidspunkt for filoprettelse i læsevenligt format, eller - hvis " "ukendt\n" -" %W Tidspunkt for filoprettelse i sekunder siden Epoken, eller - hvis " +" %W tidspunkt for filoprettelse i sekunder siden Epoken, eller 0 hvis " "ukendt\n" -" %x Tidspunkt for sidste tilgang\n" -" %X Tidspunkt for sidste tilgang i sekunder siden Epoken\n" -" %y Tidspunkt for sidste indholdsændring i læsevenligt format\n" -" %Y Tidspunkt for sidste indholdsændring i sekunder siden Epoken\n" -" %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:1390 -#, fuzzy +" %x tidspunkt for sidste tilgang i læsevenligt format\n" +" %X tidspunkt for sidste tilgang i sekunder siden Epoken\n" +" %y tidspunkt for sidste indholdsændring i læsevenligt format\n" +" %Y tidspunkt for sidste indholdsændring i sekunder siden Epoken\n" +" %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 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -9625,14 +10001,13 @@ msgid "" msgstr "" "Gyldige formatsekvenser for filsystemer:\n" "\n" -" %a Frie blokke tilgængelige for ikke-superbruger\n" -" %b Totale datablokke i filsystem\n" -" %c Totale filnoder i filsystem\n" -" %d Frie filnoder i filsystem\n" -" %f Frie blokke i filsystem\n" +" %a frie blokke tilgængelige for ikke-superbruger\n" +" %b samlet antal datablokke i filsystem\n" +" %c samlet antal filnoder i filsystem\n" +" %d frie filnoder i filsystem\n" +" %f frie blokke i filsystem\n" -#: src/stat.c:1399 -#, fuzzy +#: src/stat.c:1422 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -9642,13 +10017,13 @@ msgid "" " %t file system type in hex\n" " %T file system type in human readable form\n" msgstr "" -" %i Filsystems-ID i hex\n" -" %l Største længde på filnavne\n" -" %n Filnavn\n" -" %s Blokstørrelse (for hurtigere overførsler)\n" -" %S Fundamental blokstørrelse (for blokoptællinger)\n" -" %t Type i hex\n" -" %T Type på læsevenlig form\n" +" %i filsystems-id i hex\n" +" %l største længde på filnavne\n" +" %n filnavn\n" +" %s blokstørrelse (for hurtigere overførsler)\n" +" %S fundamental blokstørrelse (for blokoptællinger)\n" +" %t filsystemtype i hex\n" +" %T filsystemtype på læsevenlig form\n" #: src/stdbuf.c:90 #, c-format @@ -9656,14 +10031,14 @@ 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" -"\n" msgstr "" "Kør KOMMANDO med ændrede bufferoperationer for dens standardstrømme.\n" "\n" -#: src/stdbuf.c:98 +#: src/stdbuf.c:97 msgid "" " -i, --input=MODE adjust standard input stream buffering\n" " -o, --output=MODE adjust standard output stream buffering\n" @@ -9673,8 +10048,7 @@ msgstr "" " -o, --output=TILSTAND angiv buffertilstand for standard-ud\n" " -e, --error=TILSTAND angiv buffertilstand for standard-fejl\n" -#: src/stdbuf.c:105 -#, fuzzy +#: src/stdbuf.c:104 msgid "" "\n" "If MODE is 'L' the corresponding stream will be line buffered.\n" @@ -9682,18 +10056,17 @@ msgid "" msgstr "" "\n" "Hvis TILSTAND er 'L', vil den tilhørende strøm være linjebufret.\n" -"Dette flag er ugyldigt for standard-ind.\n" +"Dette flag er ugyldigt med standard-ind.\n" -#: src/stdbuf.c:108 -#, fuzzy +#: src/stdbuf.c:107 msgid "" "\n" "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 ubufret.\n" +"If TILSTAND er '0', vil den tilhørende strøm være uden buffer.\n" -#: src/stdbuf.c:111 +#: src/stdbuf.c:110 msgid "" "\n" "Otherwise MODE is a number which may be followed by one of the following:\n" @@ -9709,8 +10082,7 @@ msgstr "" "I dette tilfælde vil den pågældende strøm være fuldt bufret med\n" "bufferstørrelsen angivet til TILSTAND byte.\n" -#: src/stdbuf.c:117 -#, fuzzy +#: src/stdbuf.c:116 msgid "" "\n" "NOTE: If COMMAND adjusts the buffering of its standard streams ('tee' does\n" @@ -9726,22 +10098,22 @@ 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:227 +#: src/stdbuf.c:226 #, c-format msgid "failed to find %s" msgstr "kunne ikke finde %s" -#: src/stdbuf.c:247 src/stdbuf.c:279 +#: src/stdbuf.c:246 src/stdbuf.c:278 #, c-format msgid "failed to update the environment with %s" msgstr "kunne ikke opdatere miljøet med %s" -#: src/stdbuf.c:321 +#: src/stdbuf.c:320 #, c-format msgid "line buffering stdin is meaningless" msgstr "linjebufring af stdin er meningsløst" -#: src/stty.c:509 +#: src/stty.c:513 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -9752,10 +10124,13 @@ msgstr "" " eller: %s [-F ENHED | --file=ENHED] [-a|--all]\n" " eller: %s [-F ENHED | --file=ENHED] [-g|--save]\n" -#: src/stty.c:515 +#: src/stty.c:519 +msgid "Print or change terminal characteristics.\n" +msgstr "" + +#: src/stty.c:525 +#, fuzzy msgid "" -"Print or change terminal characteristics.\n" -"\n" " -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" @@ -9767,7 +10142,7 @@ msgstr "" "form\n" " -F, --file=ENHED åbn og brug den angivne ENHED i stedet for stdin\n" -#: src/stty.c:524 +#: src/stty.c:532 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -9778,7 +10153,7 @@ msgstr "" "indstillinger som ikke følger POSIX-standarden. Det underliggende system\n" "definerer hvilke indstillinger som er tilgængelige.\n" -#: src/stty.c:529 +#: src/stty.c:537 msgid "" "\n" "Special characters:\n" @@ -9792,7 +10167,7 @@ msgstr "" " eof TEGN TEGN sender et filslut (afslutter inddata)\n" " eol TEGN TEGN afslutter linjen\n" -#: src/stty.c:536 +#: src/stty.c:544 msgid "" " * eol2 CHAR alternate CHAR for ending the line\n" " erase CHAR CHAR will erase the last character typed\n" @@ -9805,7 +10180,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:542 +#: src/stty.c:550 msgid "" " * lnext CHAR CHAR will enter the next character quoted\n" " quit CHAR CHAR will send a quit signal\n" @@ -9817,7 +10192,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:548 +#: src/stty.c:556 msgid "" " stop CHAR CHAR will stop the output\n" " susp CHAR CHAR will send a terminal stop signal\n" @@ -9829,7 +10204,7 @@ msgstr "" " * swtch TEGN TEGN skifter til en anden skál\n" " * werase TEGN TEGN sletter det senest skrevne ord\n" -#: src/stty.c:554 +#: src/stty.c:562 msgid "" "\n" "Special settings:\n" @@ -9844,7 +10219,7 @@ msgstr "" " * columns N samme som cols N\n" # http://en.wikipedia.org/wiki/Line_discipline -#: src/stty.c:561 +#: src/stty.c:569 msgid "" " ispeed N set the input speed to N\n" " * line N use line discipline N\n" @@ -9858,7 +10233,7 @@ msgstr "" "læsning\n" " ospeed N sæt udskriftshastighed til N\n" -#: src/stty.c:567 +#: src/stty.c:575 msgid "" " * rows N tell the kernel that the terminal has N rows\n" " * size print the number of rows and columns according to the " @@ -9872,13 +10247,15 @@ msgstr "" " time N med -icanon, sæt timeout for læsning til N tiendedels " "sekunder\n" -#: src/stty.c:573 +#: src/stty.c:581 +#, fuzzy msgid "" "\n" "Control settings:\n" " [-]clocal disable modem control signals\n" " [-]cread allow input to be received\n" " * [-]crtscts enable RTS/CTS handshaking\n" +" * [-]cdtrdsr enable DTR/DSR handshaking\n" " csN set character size to N bits, N in [5..8]\n" msgstr "" "\n" @@ -9888,25 +10265,24 @@ msgstr "" " * [-]crtscts aktivér RTS-/CTS-forhandling ('handshaking')\n" " csN sæt tegnstørrelse til N bit, N i [5..8]\n" -#: src/stty.c:581 -#, fuzzy +#: src/stty.c:590 msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" " [-]hupcl same as [-]hup\n" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" -" [-]parodd set odd parity (even with '-')\n" +" [-]parodd set odd parity (or even parity with '-')\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" +" [-]hup send et hangup-signal når den sidste proces lukker tty'en\n" " [-]hupcl samme som [-]hup\n" -" [-]parenb generér paritetsbit ved skriving og forvent paritetsbit " +" [-]parenb generér paritetsbit ved skrivning og forvent paritetsbit " "ved\n" " læsning\n" " [-]parodd sæt ulige paritet (lige paritet med '-')\n" -#: src/stty.c:588 +#: src/stty.c:597 msgid "" "\n" "Input settings:\n" @@ -9922,7 +10298,7 @@ msgstr "" " [-]ignbrk ignorér afbrydningstegn\n" " [-]igncr ignorér vognretur\n" -#: src/stty.c:596 +#: src/stty.c:605 msgid "" " [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" @@ -9937,11 +10313,11 @@ msgstr "" " [-]inpck muliggør paritetskontrol af inddata\n" " [-]istrip nulstil den høje (8.) bit i et inddatategn\n" -#: src/stty.c:603 +#: src/stty.c:612 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr " * [-]iutf8 antag at ind-tegn er UTF-8-kodet\n" -#: src/stty.c:606 +#: src/stty.c:615 msgid "" " * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" @@ -9958,7 +10334,7 @@ msgstr "" " [-]parmrk markér paritetsfejl (med en 255-0 tegnsekvens)\n" " [-]tandem samme som [-]ixoff\n" -#: src/stty.c:614 +#: src/stty.c:623 msgid "" "\n" "Output settings:\n" @@ -9974,7 +10350,7 @@ msgstr "" " * ffN sideskift-forsinkelsesstil, N i [0..1]\n" " * nlN linjeskift-forsinkelsesstil, N i [0..1]\n" -#: src/stty.c:622 +#: src/stty.c:631 msgid "" " * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of null characters\n" @@ -9990,7 +10366,7 @@ msgstr "" " * [-]onlcr transformér linjeskift til vognretur-linjeskift\n" " * [-]onlret linjeskift foretager vognretur\n" -#: src/stty.c:630 +#: src/stty.c:639 msgid "" " * [-]onocr do not print carriage returns in the first column\n" " [-]opost postprocess output\n" @@ -10006,7 +10382,7 @@ msgstr "" " * -tabs samme som tab3\n" " * vtN lodret tab-forsinkelsesstil, N i [0..1]\n" -#: src/stty.c:638 +#: src/stty.c:647 msgid "" "\n" "Local settings:\n" @@ -10022,8 +10398,7 @@ msgstr "" " * -crtkill dræb hele linjen ved at bruge indstillingerne\n" " for echoctl og echok\n" -#: src/stty.c:645 -#, fuzzy +#: src/stty.c:654 msgid "" " * [-]ctlecho echo control characters in hat notation ('^c')\n" " [-]echo echo input characters\n" @@ -10031,14 +10406,13 @@ msgid "" " [-]echoe same as [-]crterase\n" " [-]echok echo a newline after a kill character\n" msgstr "" -" * [-]ctlecho ekko kontroltegn med hatnotation (\"^c\")\n" +" * [-]ctlecho ekko kontroltegn med hatnotation ('^c')\n" " [-]echo ekko indtastede tegn\n" " * [-]echoctl samme som [-]ctlecho\n" " [-]echoe samme som [-]crterase\n" " [-]echok ekko et linjeskift efter et dræbertegn\n" -#: src/stty.c:652 -#, fuzzy +#: src/stty.c:661 msgid "" " * [-]echoke same as [-]crtkill\n" " [-]echonl echo newline even if not echoing other characters\n" @@ -10048,12 +10422,11 @@ msgid "" msgstr "" " * [-]echoke samme som [-]crtkill\n" " [-]echonl ekko linjeskift selv om ingen andre tegn ekkoes\n" -" * [-]echoprt ekko slettede tegn baglæns, mellem \"\\\" og \"/\"\n" +" * [-]echoprt ekko slettede tegn baglæns, mellem '\\' og '/'\n" " [-]icanon aktivér specialtegnene erase, kill, werase og rprnt\n" " [-]iexten aktivér specialtegn som ikke er POSIX-tegn\n" -#: src/stty.c:659 -#, fuzzy +#: src/stty.c:668 msgid "" " [-]isig enable interrupt, quit, and suspend special characters\n" " [-]noflsh disable flushing after interrupt and quit special " @@ -10063,14 +10436,14 @@ msgid "" " * [-]xcase with icanon, escape with '\\' for uppercase characters\n" msgstr "" " [-]isig aktivér specialtegn for afbrydning, afslut og hvile\n" -" [-]noflsh deaktivér rensning efter afbrydningssignaler og \n" -" specialsluttegn\n" +" [-]noflsh deaktivér tømning (flush) efter specialtegnene for\n" +" afbrydningssignaler og afslutning\n" " * [-]prterase samme som [-]echoprt\n" " * [-]tostop stop baggrundsjob som forsøger at skrive til terminalen\n" -" * [-]xcase sammen med icanon, brug \"\\\" som kontrolsekvens\n" +" * [-]xcase sammen med icanon, brug '\\' som kontrolsekvens\n" " for store bogstaver\n" -#: src/stty.c:666 +#: src/stty.c:675 msgid "" "\n" "Combination settings:\n" @@ -10084,7 +10457,7 @@ msgstr "" " cbreak samme som -icanon\n" " -cbreak samme som icanon\n" -#: src/stty.c:673 +#: src/stty.c:682 msgid "" " cooked same as brkint ignpar istrip icrnl ixon opost isig\n" " icanon, eof and eol characters to their default values\n" @@ -10096,7 +10469,7 @@ msgstr "" " -cooked samme som raw\n" " crt samme som echoe echoctl echoke\n" -#: src/stty.c:679 +#: src/stty.c:688 msgid "" " dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" " kill ^u\n" @@ -10110,7 +10483,7 @@ msgstr "" " ek slette- og dræbertegn sættes til deres standardværdier\n" " evenp samme som parenb -parodd cs7\n" -#: src/stty.c:686 +#: src/stty.c:695 msgid "" " -evenp same as -parenb cs8\n" " * [-]lcase same as xcase iuclc olcuc\n" @@ -10126,7 +10499,7 @@ msgstr "" " nl samme som -icrnl -onlcr\n" " -nl samme som icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" -#: src/stty.c:694 +#: src/stty.c:703 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -10140,7 +10513,7 @@ msgstr "" " pass8 samme som -parenb -istrip cs8\n" " -pass8 samme som parenb istrip cs7\n" -#: src/stty.c:701 +#: src/stty.c:710 msgid "" " raw same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" " -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n" @@ -10152,7 +10525,7 @@ msgstr "" " -imaxbel -opost -isig -icanon -xcase min 1 time 0\n" " -raw samme som cooked\n" -#: src/stty.c:707 +#: src/stty.c:716 msgid "" " sane same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" " -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n" @@ -10168,7 +10541,7 @@ msgstr "" " -xcase -tostop -echoprt echoctl echoke, alle specialtegn\n" " sættes til deres standardværdier.\n" -#: src/stty.c:715 +#: src/stty.c:724 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -10182,136 +10555,59 @@ 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:787 +#: src/stty.c:796 #, c-format msgid "only one device may be specified" msgstr "kun en enhed kan angives" -#: src/stty.c:817 +#: src/stty.c:826 #, 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:823 +#: src/stty.c:832 #, 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:838 +#: src/stty.c:847 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s: kunne ikke nulstille ikke-blokerende tilstand" -#: src/stty.c:883 src/stty.c:993 +#: src/stty.c:892 src/stty.c:1002 #, c-format msgid "invalid argument %s" msgstr "ugyldigt argument %s" -#: src/stty.c:894 src/stty.c:911 src/stty.c:923 src/stty.c:936 src/stty.c:948 -#: src/stty.c:968 +#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957 +#: src/stty.c:977 #, c-format msgid "missing argument to %s" msgstr "manglende argument til %s" -#: src/stty.c:974 +#: src/stty.c:983 #, c-format msgid "invalid line discipline %s" msgstr "ugyldig linjedisciplin %s" -#: src/stty.c:1044 +#: src/stty.c:1053 #, 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:1390 +#: src/stty.c:1399 #, c-format msgid "%s: no size information for this device" msgstr "%s: ingen størrelsesinformation for denne enhed" -#: src/stty.c:1904 +#: src/stty.c:1920 #, c-format msgid "invalid integer argument %s" msgstr "ugyldig heltalsargument %s" -#: src/su.c:229 -msgid "Password:" -msgstr "Adgangskode:" - -#: src/su.c:232 -#, c-format -msgid "getpass: cannot open /dev/tty" -msgstr "getpass: kan ikke åbne /dev/tty" - -#: src/su.c:290 -#, c-format -msgid "cannot set groups" -msgstr "kan ikke sætte grupper" - -#: src/su.c:294 -#, c-format -msgid "cannot set group id" -msgstr "kan ikke sætte gruppe-id" - -#: src/su.c:296 -#, c-format -msgid "cannot set user id" -msgstr "kan ikke sætte bruger-id" - -#: src/su.c:371 -#, c-format -msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" -msgstr "Brug: %s [FLAG]... [-] [BRUGER [ARG]...]\n" - -#: src/su.c:372 -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 "" -"Ændr den effektive bruger-id og gruppe-id til BRUGER.\n" -"\n" -" -, -l, --login gør skallen til en login-skal\n" -" -c, --command=KOMMANDO send en enkelt kommando til skallen med -c\n" -" -f, --fast send -f til skallen (for csh eller tcsh)\n" -" -m, --preserve-environment nulstil ikke miljøvariable\n" -" -p samme som -m\n" -" -s, --shell=SHELL kør SHELL hvis /etc/shells tillader det\n" - -#: src/su.c:384 -msgid "" -"\n" -"A mere - implies -l. If USER not given, assume root.\n" -msgstr "" -"\n" -"En enkelt - medfører -l. Hvis BRUGER ikke er angivet, antag root.\n" - -#: src/su.c:461 -#, c-format -msgid "user %s does not exist" -msgstr "bruger %s eksisterer ikke" - -#: src/su.c:484 -#, c-format -msgid "incorrect password" -msgstr "forkert adgangskode" - -#: src/su.c:501 -#, c-format -msgid "using restricted shell %s" -msgstr "bruger begrænset skal %s" - -#: src/su.c:509 -#, c-format -msgid "warning: cannot change directory to %s" -msgstr "advarsel: kan ikke skifte katalog til %s" - #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 msgid "Kayvan Aghaiepour" @@ -10342,7 +10638,7 @@ msgstr "" msgid "ignoring all arguments" msgstr "ignorerer alle argumenter" -#: src/system.h:340 +#: src/system.h:343 #, c-format msgid "" "\n" @@ -10355,23 +10651,36 @@ msgstr "" "versionen beskrevet her. Referér venligst til din skals dokumentation for\n" "detaljer angående de understøttede flag.\n" -#: src/system.h:346 +#: src/system.h:349 msgid " --help display this help and exit\n" msgstr " --help vis denne hjælpetekst og afslut\n" -#: src/system.h:348 +#: src/system.h:351 msgid " --version output version information and exit\n" msgstr " --version vis versionsinformation og afslut\n" -#: src/system.h:541 +#: src/system.h:544 +#, fuzzy +msgid "" +"\n" +"Mandatory arguments to long options are mandatory for short options too.\n" +msgstr "" +"Obligatoriske argumenter til lange flag er også obligatoriske for de korte.\n" + +#: src/system.h:552 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" msgstr "" +"\n" +"STØRRELSE er et heltal eventuelt plus enhed (eksempel: 10M er " +"10*1024*1024).\n" +"Enheder er K, M, G, T, P, E, Z, Y (potenser af 1024) eller KB, MB, ... \n" +"(potenser af 1000).\n" -#: src/system.h:550 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -10384,7 +10693,7 @@ 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:560 +#: src/system.h:571 #, c-format msgid "" "\n" @@ -10397,24 +10706,24 @@ msgstr "" #. <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:574 +#: src/system.h:585 #, 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:578 +#: src/system.h:589 #, 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:585 -#, fuzzy, c-format +#: src/system.h:596 +#, c-format msgid "Try '%s --help' for more information.\n" msgstr "Prøv '%s --help' for mere information.\n" -#: src/system.h:617 +#: src/system.h:628 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -10435,16 +10744,16 @@ 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" -"\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:145 +#: src/tac.c:144 msgid "" " -b, --before attach the separator before instead of after\n" " -r, --regex interpret the separator as a regular expression\n" @@ -10455,42 +10764,42 @@ msgstr "" " -s, --separator=STRENG brug STRENG som separator i stedet for " "linjeskift\n" -#: src/tac.c:235 src/tac.c:336 +#: src/tac.c:234 src/tac.c:335 #, c-format msgid "%s: seek failed" msgstr "%s: søgning mislykkedes" -#: src/tac.c:264 +#: src/tac.c:263 #, c-format msgid "record too large" msgstr "blok er for stor" -#: src/tac.c:451 -#, fuzzy, c-format +#: src/tac.c:450 +#, c-format msgid "failed to create temporary file in %s" -msgstr "kan ikke oprette midlertidig fil i %s" +msgstr "kunne ikke oprette midlertidig fil i %s" -#: src/tac.c:459 -#, fuzzy, c-format +#: src/tac.c:458 +#, c-format msgid "failed to open %s for writing" -msgstr "%s: kunne ikke åbne til skrivning" +msgstr "kunne ikke åbne %s til skrivning" -#: src/tac.c:476 -#, fuzzy, c-format +#: src/tac.c:475 +#, c-format msgid "failed to rewind stream for %s" -msgstr "kunne ikke beholde tider for %s" +msgstr "kunne ikke spole strøm tilbage for %s" -#: src/tac.c:512 src/tac.c:519 +#: src/tac.c:511 src/tac.c:518 #, c-format msgid "%s: write error" msgstr "%s: skrivefejl" -#: src/tac.c:572 -#, fuzzy, c-format +#: src/tac.c:571 +#, c-format msgid "failed to open %s for reading" -msgstr "kan ikke åbne %s til læsning" +msgstr "kunne ikke åbne %s til læsning" -#: src/tac.c:630 +#: src/tac.c:629 #, c-format msgid "separator cannot be empty" msgstr "separatoren kan ikke være tom" @@ -10501,19 +10810,18 @@ msgid "Ian Lance Taylor" msgstr "Ian Lance Taylor" #: src/tail.c:262 -#, c-format +#, fuzzy, 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" -"\n" 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:271 +#: src/tail.c:270 msgid "" " -c, --bytes=K output the last K bytes; alternatively, use -c " "+K\n" @@ -10523,7 +10831,7 @@ 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" -#: src/tail.c:275 +#: src/tail.c:274 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -10537,7 +10845,7 @@ msgstr "" " det samme\n" " -F det samme som --follow=navn --retry\n" -#: src/tail.c:282 +#: src/tail.c:281 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -10564,7 +10872,7 @@ msgstr "" " Dette flag er sjældent nyttigt sammen med " "inotify.\n" -#: src/tail.c:295 +#: src/tail.c:294 msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" " -q, --quiet, --silent never output headers giving file names\n" @@ -10581,7 +10889,7 @@ msgstr "" " et efterfølgende navn, f.eks. med --" "follow=name\n" -#: src/tail.c:302 +#: src/tail.c:301 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations.\n" @@ -10597,8 +10905,7 @@ msgstr "" " en gang hvert N sekunder.\n" " -v, --verbose udskriv altid overskrifter med filnavne\n" -#: src/tail.c:311 -#, fuzzy +#: src/tail.c:310 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -10617,7 +10924,7 @@ msgstr "" "GB 1000*1000*1000, G 1024*1024*1024, og så videre for T, P, E, Z, Y.\n" "\n" -#: src/tail.c:320 +#: src/tail.c:319 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" @@ -10634,68 +10941,69 @@ 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:379 +#: src/tail.c:378 #, c-format msgid "closing %s (fd=%d)" msgstr "lukker %s (fd=%d)" -#: src/tail.c:454 +#: 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:458 +#: src/tail.c:457 #, 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:895 +#: src/tail.c:894 #, 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:907 -#, fuzzy, c-format +#: src/tail.c:906 +#, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" msgstr "" -"kan ikke bestemme placeringen af %s. bruger i stedet gentagne forespørgsler" +"ukendt filsystemtype 0x%08lx for %s. rapportér venligst dette til %s. går " +"over til gentagne forespørgsler" -#: src/tail.c:964 +#: src/tail.c:963 #, c-format msgid "%s has become inaccessible" msgstr "%s er blevet utilgængelig" -#: src/tail.c:981 +#: src/tail.c:980 #, 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:990 +#: src/tail.c:989 #, 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:1011 +#: src/tail.c:1010 #, c-format msgid "%s has become accessible" msgstr "%s er blevet tilgængelig" -#: src/tail.c:1019 +#: src/tail.c:1018 #, 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:1030 +#: src/tail.c:1029 #, 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:1131 +#: src/tail.c:1130 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: kan ikke ændre ikke-blokerende tilstand" @@ -11053,7 +11361,6 @@ msgid "Matthew Bradburn" msgstr "Matthew Bradburn" #: src/test.c:858 -#, fuzzy msgid "missing ']'" msgstr "manglende ']'" @@ -11062,17 +11369,22 @@ msgstr "manglende ']'" msgid "extra argument %s" msgstr "ekstra argument %s" -#: src/timeout.c:124 +#: src/timeout.c:112 +#, fuzzy, c-format +msgid "warning: sigprocmask" +msgstr "advarsel: timer_create" + +#: src/timeout.c:145 #, c-format msgid "warning: timer_settime" msgstr "advarsel: timer_settime" -#: src/timeout.c:129 +#: src/timeout.c:150 #, c-format msgid "warning: timer_create" msgstr "advarsel: timer_create" -#: src/timeout.c:204 +#: src/timeout.c:225 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -11081,19 +11393,20 @@ msgstr "" "Brug: %s [FLAG] VARIGHED KOMMANDO [ARG]...\n" " eller: %s [FLAG]\n" -#: src/timeout.c:208 -msgid "" -"Start COMMAND, and kill it if still running after DURATION.\n" -"\n" -"Mandatory arguments to long options are mandatory for short options too.\n" +#: src/timeout.c:229 +#, fuzzy +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" -#: src/timeout.c:213 +#: src/timeout.c:235 #, fuzzy msgid "" +" --preserve-status\n" +" exit with the same status as COMMAND, even when the\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 " @@ -11115,14 +11428,13 @@ msgstr "" "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" -#: src/timeout.c:229 -#, fuzzy +#: src/timeout.c:254 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -11134,16 +11446,16 @@ msgstr "" "'s' for sekunder (standard), 'm' for minutter, 'h' for timer og 'd' for " "dage.\n" -#: src/timeout.c:234 +#: src/timeout.c:259 #, fuzzy msgid "" "\n" -"If the command times out, then exit with status 124. Otherwise, exit\n" -"with the status of COMMAND. If no signal is specified, send the TERM\n" -"signal upon timeout. The TERM signal kills any process that does not\n" -"block or catch that signal. For other processes, it may be necessary to\n" -"use the KILL (9) signal, since this signal cannot be caught. If the\n" -"KILL (9) signal is sent, the exit status is 128+9 rather than 124.\n" +"If the command times out, and --preserve-status is not set, then exit with\n" +"status 124. Otherwise, exit with the status of COMMAND. If no signal\n" +"is specified, send the TERM signal upon timeout. The TERM signal kills\n" +"any process that does not block or catch that signal. It may be necessary\n" +"to use the KILL (9) signal, since this signal cannot be caught, in which\n" +"case the exit status is 128+9 rather than 124.\n" msgstr "" "\n" "Hvis kommandoen overskrider tidsgrænsen, så afslut med kode 124.\n" @@ -11151,17 +11463,23 @@ msgstr "" "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.\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" + +#: src/timeout.c:363 +#, c-format +msgid "warning: disabling core dumps failed" +msgstr "advarsel: deaktivering af kernedump mislykkedes" -#: src/timeout.c:419 +#: src/timeout.c:471 #, c-format msgid "error waiting for command" msgstr "fejl under ventning på kommando" -#: src/timeout.c:441 +#: src/timeout.c:482 #, c-format -msgid "warning: disabling core dumps failed" -msgstr "advarsel: deaktivering af kernedump mislykkedes" +msgid "the monitored command dumped core" +msgstr "" #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 @@ -11173,22 +11491,23 @@ msgstr "Jim Kingdon" msgid "Randy Smith" msgstr "Randy Smith" -#: src/touch.c:115 src/touch.c:313 +#: src/touch.c:115 src/touch.c:309 #, c-format msgid "invalid date format %s" msgstr "ugyldigt datoformat %s" -#: src/touch.c:194 +#: src/touch.c:191 #, c-format msgid "cannot touch %s" msgstr "kan ikke røre %s" -#: src/touch.c:200 +#: src/touch.c:197 #, c-format msgid "setting times of %s" msgstr "sætter tider for %s" -#: src/touch.c:216 +#: src/touch.c:213 +#, fuzzy msgid "" "Update the access and modification times of each FILE to the current time.\n" "\n" @@ -11197,7 +11516,6 @@ msgid "" "\n" "A FILE argument string of - is handled specially and causes touch to\n" "change the times of the file associated with standard output.\n" -"\n" msgstr "" "Opdatér tilgangs- og ændringstidspunkter for hver FIL til nuværende " "tidspunkt.\n" @@ -11209,7 +11527,7 @@ msgstr "" "tidspunkterne for filen associeret med standard-ud.\n" "\n" -#: src/touch.c:229 +#: src/touch.c:225 msgid "" " -a change only the access time\n" " -c, --no-create do not create any files\n" @@ -11222,7 +11540,7 @@ msgstr "" "klokkeslæt\n" " -f (ignoreres)\n" -#: src/touch.c:235 +#: src/touch.c:231 msgid "" " -h, --no-dereference affect each symbolic link instead of any " "referenced\n" @@ -11236,11 +11554,12 @@ msgstr "" " en symlænke)\n" " -m ændr kun ændringstidspunktet\n" -#: src/touch.c:241 +#: 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" -" --time=WORD change the specified time:\n" +" --time=WORD change the specified time:\n" " WORD is access, atime, or use: equivalent to -a\n" " WORD is modify or mtime: equivalent to -m\n" msgstr "" @@ -11252,7 +11571,7 @@ msgstr "" " hvis ORD er access, atime eller use, gør som -a\n" " hvis ORD er mtime eller modify, gør som -m\n" -#: src/touch.c:250 +#: src/touch.c:246 msgid "" "\n" "Note that the -d and -t options accept different time-date formats.\n" @@ -11260,13 +11579,13 @@ msgstr "" "\n" "Bemærk at -d og -t flagene tager forskellige tidspunkts- og dato-formater.\n" -#: src/touch.c:339 +#: src/touch.c:335 #, c-format msgid "cannot specify times from more than one source" msgstr "kan ikke angive tidspunkter fra mere end én kilde" -#: src/touch.c:413 -#, fuzzy, c-format +#: src/touch.c:409 +#, c-format msgid "" "warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'" msgstr "" @@ -11414,9 +11733,9 @@ msgstr "" "portabel" #: src/tr.c:673 -#, fuzzy, c-format +#, c-format msgid "range-endpoints of '%s-%s' are in reverse collating sequence order" -msgstr "række-slutpunkt i '%s-%s' er i omvendt sorteringsrækkefølge" +msgstr "intervalgrænser for '%s-%s' er i omvendt sorteringsrækkefølge" #: src/tr.c:829 #, c-format @@ -11424,12 +11743,12 @@ msgid "invalid repeat count %s in [c*n] construct" msgstr "ugyldigt gentagelsestal %s i [c*n]-konstruktion" #: src/tr.c:910 -#, fuzzy, c-format +#, c-format msgid "missing character class name '[::]'" msgstr "mangler navn på tegnklasse '[::]'" #: src/tr.c:913 -#, fuzzy, c-format +#, c-format msgid "missing equivalence class character '[==]'" msgstr "mangler tegn for ækvivalensklasse '[==]'" @@ -11478,7 +11797,7 @@ msgid "[=c=] expressions may not appear in string2 when translating" msgstr "[=c=]-udtryk kan ikke optræde i streng2 under transkription" #: 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'" @@ -11544,6 +11863,7 @@ 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" @@ -11552,7 +11872,6 @@ msgid "" "If a FILE is larger than the specified size, the extra data is lost.\n" "If a FILE is shorter, it is extended and the extended part (hole)\n" "reads as zero bytes.\n" -"\n" msgstr "" "Formindsk eller udvid størrelsen af hver FIL til den angivne størrelse\n" "\n" @@ -11563,17 +11882,17 @@ msgstr "" "sættes til nul-byte.\n" "\n" -#: src/truncate.c:110 +#: src/truncate.c:109 msgid " -c, --no-create do not create any files\n" msgstr " -c, --no-create opret ikke nogen filer\n" -#: src/truncate.c:113 +#: src/truncate.c:112 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" " -o, --io-blocks fortolk STØR som antal IO-blokke frem for byte\n" -#: src/truncate.c:116 +#: 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" @@ -11581,8 +11900,7 @@ 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" -#: src/truncate.c:122 -#, fuzzy +#: src/truncate.c:121 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -11594,57 +11912,57 @@ msgstr "" "'-' formindsk med, '<' højst, '>' mindst, '/' rund ned til multiplum af,\n" "'%' rund op til multiplum af.\n" -#: src/truncate.c:150 +#: src/truncate.c:149 #, c-format msgid "overflow in %<PRIdMAX> * %<PRIdMAX> byte blocks for file %s" msgstr "overløb i %<PRIdMAX> * %<PRIdMAX> byte-blokke for filen %s" -#: src/truncate.c:174 +#: src/truncate.c:173 #, c-format msgid "%s has unusable, apparently negative size" msgstr "%s har en ubrugelig, tilsyneladende negativ størrelse" -#: src/truncate.c:184 src/truncate.c:379 +#: src/truncate.c:183 src/truncate.c:384 #, c-format msgid "cannot get the size of %s" msgstr "kan ikke bestemme størrelsen af %s" -#: src/truncate.c:206 +#: src/truncate.c:205 #, c-format msgid "overflow rounding up size of file %s" msgstr "overløb ved oprunding af filstørrelse for %s" -#: src/truncate.c:216 +#: src/truncate.c:215 #, c-format msgid "overflow extending size of file %s" msgstr "overløb ved udvidelse af filstørrelse for %s" -#: src/truncate.c:231 +#: src/truncate.c:230 #, c-format msgid "failed to truncate %s at %<PRIdMAX> bytes" msgstr "kunne ikke afkorte %s ved byte %<PRIdMAX>" -#: src/truncate.c:305 +#: src/truncate.c:303 #, c-format msgid "multiple relative modifiers specified" msgstr "flere relative modifikatorer angivet" -#: src/truncate.c:335 +#: src/truncate.c:333 #, c-format msgid "you must specify either %s or %s" msgstr "du skal angive enten %s eller %s" -#: src/truncate.c:342 +#: src/truncate.c:340 #, c-format msgid "you must specify a relative %s with %s" msgstr "du skal angive en relativ %s med %s" -#: src/truncate.c:349 +#: src/truncate.c:347 #, c-format msgid "%s was specified but %s was not" msgstr "%s blev angivet, men ikke %s" -#: src/truncate.c:400 +#: src/truncate.c:404 #, c-format msgid "cannot open %s for writing" msgstr "kan ikke åbne %s til skrivning" @@ -11739,16 +12057,16 @@ 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" -"\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:125 +#: src/unexpand.c:124 msgid "" " -a, --all convert all blanks, instead of just initial blanks\n" " --first-only convert only leading sequences of blanks (overrides -a)\n" @@ -11764,12 +12082,12 @@ msgstr "" " -t, --tabs=LISTE brug en kommasepareret LISTE med tabulatorpositioner\n" " (medfører -a)\n" -#: src/unexpand.c:153 +#: src/unexpand.c:152 #, c-format msgid "tabs are too far apart" msgstr "tabulatorer er for vidt adskilt" -#: src/unexpand.c:505 +#: src/unexpand.c:504 #, c-format msgid "tab stop value is too large" msgstr "tabulatorstopværdien er for stor" @@ -11780,12 +12098,12 @@ msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n" msgstr "Brug: %s [FLAG]... [INDDATA [UDDATA]]\n" #: src/uniq.c:138 +#, fuzzy 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" -"\n" msgstr "" "Filtrér tilstødende overensstemmende linjer fra INDDATA (eller standard-" "ind)\n" @@ -11794,7 +12112,7 @@ msgstr "" "Uden flag vil identiske linjer reduceres til første forekomst.\n" "\n" -#: src/uniq.c:148 +#: src/uniq.c:147 msgid "" " -c, --count prefix lines by the number of occurrences\n" " -d, --repeated only print duplicate lines\n" @@ -11802,7 +12120,7 @@ msgstr "" " -c, --count begynd linjer med antal forekomster\n" " -d, --repeated udskriv kun linjer der er flere af\n" -#: src/uniq.c:152 +#: src/uniq.c:151 msgid "" " -D, --all-repeated[=delimit-method] print all duplicate lines\n" " delimit-method={none(default),prepend,separate}\n" @@ -11823,11 +12141,11 @@ msgstr "" " -u, --unique udskriv kun unikke linjer\n" " -z, --zero-terminated afslut linjer med 0-byte frem for linjeskift\n" -#: src/uniq.c:162 +#: src/uniq.c:161 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:167 +#: src/uniq.c:166 msgid "" "\n" "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n" @@ -11838,8 +12156,7 @@ msgstr "" "tabulatorer),\n" "fulgt af ikke-blanke tegn. Felter hoppes over før tegn.\n" -#: src/uniq.c:172 -#, fuzzy +#: src/uniq.c:171 msgid "" "\n" "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n" @@ -11853,24 +12170,24 @@ msgstr "" "'sort -u' uden 'uniq'. I øvrigt følger sammenligninger reglerne angivet\n" "af 'LC_COLLATE'.\n" -#: src/uniq.c:359 +#: src/uniq.c:358 #, c-format msgid "too many repeated lines" msgstr "for mange gentagne linjer" -#: src/uniq.c:522 +#: src/uniq.c:521 msgid "invalid number of fields to skip" msgstr "ugyldigt antal felter at hoppe over" -#: src/uniq.c:531 +#: src/uniq.c:530 msgid "invalid number of bytes to skip" msgstr "ugyldigt antal byte at hoppe over" -#: src/uniq.c:540 +#: src/uniq.c:539 msgid "invalid number of bytes to compare" msgstr "ugyldigt antal byte at sammenligne" -#: src/uniq.c:559 +#: src/uniq.c:558 #, c-format msgid "printing all duplicated lines and repeat counts is meaningless" msgstr "" @@ -11926,6 +12243,11 @@ msgid_plural "up %ld days %2d:%02d, " msgstr[0] "oppe %ld dag %2d:%02d, " msgstr[1] "oppe %ld dage %2d:%02d, " +#: src/uptime.c:149 +#, fuzzy, c-format +msgid "up %2d:%02d, " +msgstr "oppe %ld dag %2d:%02d, " + #: src/uptime.c:151 #, c-format msgid "%lu user" @@ -12025,40 +12347,40 @@ msgstr "" msgid " old " msgstr " gammel " -#: src/who.c:449 +#: src/who.c:440 msgid "system boot" msgstr "systemstart" -#: src/who.c:456 src/who.c:458 +#: src/who.c:447 src/who.c:449 msgid "id=" msgstr "id=" -#: src/who.c:471 src/who.c:476 +#: src/who.c:462 src/who.c:467 msgid "term=" msgstr "term=" -#: src/who.c:473 src/who.c:477 +#: src/who.c:464 src/who.c:468 msgid "exit=" msgstr "afslut=" -#: src/who.c:494 +#: src/who.c:485 msgid "LOGIN" msgstr "LOGIN" -#: src/who.c:514 +#: src/who.c:505 msgid "clock change" msgstr "tidsændring" -#: src/who.c:526 src/who.c:527 +#: src/who.c:517 src/who.c:518 msgid "run-level" msgstr "kørselsniveau" -#: src/who.c:530 src/who.c:531 +#: src/who.c:521 src/who.c:522 msgid "last=" msgstr "sidste=" # ??? -#: src/who.c:562 +#: src/who.c:553 #, c-format msgid "" "\n" @@ -12067,44 +12389,44 @@ msgstr "" "\n" "# brugere=%lu\n" -#: src/who.c:568 +#: src/who.c:559 msgid "NAME" msgstr "NAVN" -#: src/who.c:568 +#: src/who.c:559 msgid "LINE" msgstr "LINJE" -#: src/who.c:568 +#: src/who.c:559 msgid "TIME" msgstr "TID" -#: src/who.c:568 +#: src/who.c:559 msgid "IDLE" msgstr "INAKTIV" -#: src/who.c:569 +#: src/who.c:560 msgid "PID" msgstr "PID" -#: src/who.c:569 +#: src/who.c:560 msgid "COMMENT" msgstr "KOMMENTAR" -#: src/who.c:569 +#: src/who.c:560 msgid "EXIT" msgstr "AFSLUT" -#: src/who.c:649 +#: src/who.c:640 #, c-format msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n" msgstr "Brug: %s [FLAG]... [ FIL | ARG1 ARG2 ]\n" -#: src/who.c:650 +#: src/who.c:641 msgid "Print information about users who are currently logged in.\n" msgstr "Udskriv information om brugere som er logget ind lige nu.\n" -#: src/who.c:653 +#: src/who.c:644 msgid "" "\n" " -a, --all same as -b -d --login -p -r -t -T -u\n" @@ -12118,11 +12440,11 @@ msgstr "" " -d, --dead udskriv døde processer\n" " -H, --heading udskriv linje med kolonneoverskrifter\n" -#: src/who.c:660 +#: src/who.c:651 msgid " -l, --login print system login processes\n" msgstr " -l, --login udskriv systemlogindprocesser\n" -#: src/who.c:663 +#: src/who.c:654 msgid "" " --lookup attempt to canonicalize hostnames via DNS\n" " -m only hostname and user associated with stdin\n" @@ -12132,7 +12454,7 @@ msgstr "" " -m kun værtsnavn og brugernavn associeret med stdin\n" " -p, --process udskriv aktive processer startet af init\n" -#: src/who.c:668 +#: src/who.c:659 msgid "" " -q, --count all login names and number of users logged on\n" " -r, --runlevel print current runlevel\n" @@ -12144,7 +12466,7 @@ msgstr "" " -s, --short skriv kun navn, linje og tid (standard)\n" " -t, --time skriv seneste ændring af systemklokken\n" -#: src/who.c:674 +#: src/who.c:665 msgid "" " -T, -w, --mesg add user's message status as +, - or ?\n" " -u, --users list users logged in\n" @@ -12156,16 +12478,17 @@ msgstr "" " --message samme som -T\n" " --writable samme som -T\n" -#: src/who.c:682 -#, fuzzy, c-format +# vittigheden ("who am I", "who mom likes") går lidt tabt hvis eksemplerne oversættes +#: src/who.c:673 +#, 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" -"Hvis FIL ikke er angivet, brug %s. %s som FIL er almindeligt.\n" -"Hvis ARG1 ARG2 er angivet, antages -m: \"am i\" eller \"mom likes\" er " +"Hvis FIL ikke er angivet, så brug %s. %s som FIL er almindeligt.\n" +"Hvis ARG1 ARG2 er angivet, antages -m: 'am i' eller 'mom likes' er " "almindeligt.\n" #: src/whoami.c:45 @@ -12193,166 +12516,121 @@ msgstr "" " eller: %s FLAG\n" #: src/yes.c:47 -#, fuzzy msgid "" "Repeatedly output a line with all specified STRING(s), or 'y'.\n" "\n" msgstr "" -"Skriv gentagne gange en linje med alle specificerede STRENG'e, eller \"y\"\n" +"Skriv gentagne gange en linje med alle specificerede STRENGe, eller 'y'\n" "\n" +#~ msgid "using single-precision arithmetic" +#~ msgstr "regner med enkeltpræcision" + +#~ msgid "using arbitrary-precision arithmetic" +#~ msgstr "regner med arbitrær præcision" + #, fuzzy -#~ msgid " gid=%s" -#~ msgstr " gid=%lu" +#~ msgid " returning value: '%s'\n" +#~ msgstr "opretter filen %s\n" #, fuzzy -#~ msgid " euid=%s" -#~ msgstr " euid=%lu" +#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n" +#~ msgstr "Brug: %s [FLAG] NAVN...\n" -#~ msgid "" -#~ "Usage: %s NAME\n" -#~ " or: %s OPTION\n" -#~ msgstr "" -#~ "Brug: %s NAVN\n" -#~ " eller: %s FLAG\n" +#, fuzzy +#~ msgid "no valid suffix found\n" +#~ msgstr "%s: ugyldig længde på endelse" -#~ msgid "" -#~ "\n" -#~ "Examples:\n" -#~ " %s /usr/bin/sort Output \"sort\".\n" -#~ " %s include/stdio.h .h Output \"stdio\".\n" -#~ msgstr "" -#~ "\n" -#~ "Eksempler:\n" -#~ " %s /usr/bin/sort Udskriv \"sort\".\n" -#~ " %s include/stdio.h .h Udskriv \"stdio\".\n" +#~ msgid "reading %s" +#~ msgstr "læser %s" -#, fuzzy -#~ msgid "Usage: %s [OPTION] FILE...\n" -#~ msgstr "Brug: %s [FLAG]... [FIL]...\n" +#~ msgid "writing %s" +#~ msgstr "skriver %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 "" -#~ "Ændr gruppemedlemskab af hver FIL til GRUPPE.\n" -#~ "Med --reference ændres gruppemedlemskab af hver FIL til samme som for " -#~ "RFIL.\n" -#~ "\n" -#~ " -c, --changes som verbose, men fortæl kun om ændringer\n" -#~ " --dereference ændr referent for hver symbolsk lænke " -#~ "(standard)\n" -#~ " i stedet for den symbolske lænke selv\n" +#~ msgid "closing %s" +#~ msgstr "lukker %s" -#~ 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 udelad de fleste fejlmeldinger\n" -#~ " --reference=RFIL brug RFILs gruppe i stedet for at angive\n" -#~ " GRUPPE-værdi\n" -#~ " -R, --recursive operér på filer og kataloger rekursivt\n" -#~ " -v, --verbose vis en meddelelse for hver fil som behandles\n" +#~ msgid "accessing %s" +#~ msgstr "tilgår %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 "" -#~ "Ændr tilstanden for hver FIL til TILSTAND.\n" -#~ "\n" -#~ " -c, --changes som verbose, men anfør kun udførte ændringer\n" +#~ msgid "opening %s" +#~ msgstr "åbner %s" #~ msgid "" -#~ " --no-preserve-root do not treat `/' specially (the default)\n" -#~ " --preserve-root fail to operate recursively on `/'\n" +#~ " -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 "" -#~ " --no-preserve-root behandl ikke '/' specielt (standard)\n" -#~ " --preserve-root operér ikke rekursivt på '/'\n" +#~ " -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" #~ 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" +#~ " 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 "" -#~ " -f, --silent, --quiet udelad de fleste fejlmeldinger\n" -#~ " -v, --verbose udskriv en meddelelse for hver fil som " -#~ "behandles\n" -#~ " --reference=RFIL brug RFILs tilstand i stedet for TILSTAND-" -#~ "værdier\n" -#~ " -R, --recursive ændr filer og kataloger rekursivt\n" +#~ " 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" #~ 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" +#~ "WARNING: --page-increment is deprecated; use --line-increment instead" #~ msgstr "" -#~ "Ændr ejer og/eller gruppe for hver FIL til EJER og/eller GRUPPE.\n" -#~ "Med --reference ændres ejer og gruppe for hver FIL til de samme som " -#~ "RFIL.\n" -#~ "\n" -#~ " -c, --changes som verbose, men rapportér kun ændringer\n" -#~ " --dereference foretag ændringerne på referenten af hver " -#~ "symbolsk\n" -#~ " lænke (standard) i stedet for den symbolske " -#~ "lænke selv\n" +#~ "ADVARSEL: --page-increment er forældet; brug --line-increment i stedet" -#~ 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" +#~ msgid "All arguments to long options are mandatory for short options.\n" #~ msgstr "" -#~ " -f, --silent, --quiet udelad de fleste fejlmeldinger\n" -#~ " --reference=RFIL brug ejer og gruppe af RFIL i stedet for at " -#~ "bruge\n" -#~ " de angivne EJER:GRUPPE-værdier\n" -#~ " -R, --recursive operér på filer og kataloger rekursivt\n" -#~ " -v, --verbose vis oplysninger for hver fil der behandles\n" +#~ "Alle argumenter til lange flag er obligatoriske for de korte flag.\n" +# (TYPE er skrevet med stort med vilje) #~ 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" +#~ "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 "" -#~ "Vis det nuværende klokkeslæt i det givne FORMAT, eller indstil " -#~ "systemtiden.\n" #~ "\n" -#~ " -d, --date=STRENG vis klokkeslættet beskrevet ved STRENG, ikke " -#~ "'nu'\n" -#~ " -f, --file=DATOFIL som --date for hver linje af DATOFIL\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" #~ 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" +#~ "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 "" -#~ "\n" -#~ "STØR kan være (eller kan være et heltal evt. fulgt af) en af følgende:\n" -#~ "KB 1000, K 1024, MB 1000*1000, M 1024*1024, og så videre for G, T, P, E, " -#~ "Z, Y.\n" +#~ "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" diff --git a/po/de.gmo b/po/de.gmo index e359d15d..19419dc3 100644 Binary files a/po/de.gmo and b/po/de.gmo differ diff --git a/po/de.po b/po/de.po index 47df8b71..5e826ddb 100644 --- a/po/de.po +++ b/po/de.po @@ -11,7 +11,6 @@ # # TAB: spell it out („Tabulatoren“). -ke- # Don’t use obscure abbreviations, please. -ke- -# No hyphenation, please. -ke- # # space: Leerzeichen oder Leerschritt # @@ -36,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. +# Philipp Thomas <pth@suse.de>, 2010, 2011, 2012, 2013. msgid "" msgstr "" -"Project-Id-Version: GNU coreutils-8.16\n" +"Project-Id-Version: GNU coreutils-8.20-pre3\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2012-05-10 19:35+0200\n" -"PO-Revision-Date: 2012-04-16 14:39+0200\n" +"POT-Creation-Date: 2013-02-14 15:56+0000\n" +"PO-Revision-Date: 2013-02-12 15:51+0100\n" "Last-Translator: Philipp Thomas <pth@suse.de>\n" "Language-Team: German <translation-team-de@lists.sourceforge.net>\n" "Language: de\n" @@ -70,19 +69,19 @@ msgstr "Gültige Argumente sind:" msgid "error closing file" msgstr "Fehler beim Schließen der Datei" -#: lib/closeout.c:112 src/base64.c:109 src/base64.c:121 src/base64.c:127 -#: src/base64.c:168 src/base64.c:224 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:330 src/expand.c:355 src/head.c:298 -#: src/head.c:348 src/head.c:756 src/head.c:797 src/mktemp.c:350 src/od.c:919 -#: src/paste.c:160 src/shuf.c:369 src/split.c:727 src/split.c:964 -#: src/split.c:969 src/tail.c:350 src/tail.c:1201 src/tail.c:1307 +#: 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 -#: src/unexpand.c:427 src/unexpand.c:443 +#: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "Schreibfehler" -#: lib/copy-acl.c:611 src/copy.c:1160 src/copy.c:2602 +#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617 #, c-format msgid "preserving permissions for %s" msgstr "Erhalten der Zugriffsrechte für %s" @@ -213,7 +212,7 @@ msgstr "Von einem Signal unterbrochen" #: lib/gai_strerror.c:75 msgid "Parameter string not correctly encoded" -msgstr "Parameterzeichenkette nicht korrekt codiert" +msgstr "die Parameterzeichenkette ist nicht korrekt codiert" #: lib/gai_strerror.c:87 msgid "Unknown error" @@ -227,78 +226,78 @@ msgstr "%s: die Option „%s“ ist mehrdeutig; Mögliche Bedeutungen:" #: lib/getopt.c:624 lib/getopt.c:628 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: Option „--%s“ erlaubt kein Argument\n" +msgstr "%s: die Option „--%s“ erlaubt kein Argument\n" #: lib/getopt.c:637 lib/getopt.c:642 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" -msgstr "%s: Option „%c%s“ erlaubt kein Argument\n" +msgstr "%s: die Option „%c%s“ erlaubt kein Argument\n" #: lib/getopt.c:685 lib/getopt.c:704 #, c-format msgid "%s: option '--%s' requires an argument\n" -msgstr "%s: Option „--%s“ benötigt ein Argument\n" +msgstr "%s: die Option „--%s“ benötigt ein Argument\n" #: lib/getopt.c:742 lib/getopt.c:745 #, c-format msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: unbekannte Option „--%s“\n" +msgstr "%s: die Option „--%s“ ist unbekannt\n" #: lib/getopt.c:753 lib/getopt.c:756 #, c-format msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: unbekannte Option „%c%s“\n" +msgstr "%s: die Option „%c%s“ ist unbekannt\n" #: lib/getopt.c:805 lib/getopt.c:808 #, c-format msgid "%s: invalid option -- '%c'\n" -msgstr "%s: ungültige Option -- „%c“\n" +msgstr "%s: die Option -- „%c“ist ungültig\n" #: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 #, c-format msgid "%s: option requires an argument -- '%c'\n" -msgstr "%s: Option erfordert ein Argument -- „%c“\n" +msgstr "%s: die Option erfordert ein Argument -- „%c“\n" #: lib/getopt.c:934 lib/getopt.c:950 #, c-format msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: Option „-W %s“ ist mehrdeutig\n" +msgstr "%s: die Option „-W %s“ ist mehrdeutig\n" #: lib/getopt.c:974 lib/getopt.c:992 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: Option „-W %s“ erlaubt kein Argument\n" +msgstr "%s: die Option „-W %s“ erlaubt kein Argument\n" #: lib/getopt.c:1013 lib/getopt.c:1031 #, c-format msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: Option „-W %s“ erfordert ein Argument\n" +msgstr "%s: die Option „-W %s“ erfordert ein Argument\n" -#: lib/mkdir-p.c:196 src/install.c:483 +#: lib/mkdir-p.c:196 src/install.c:484 #, c-format msgid "cannot change permissions of %s" -msgstr "kann Zugriffsrechte von %s nicht ändern" +msgstr "die Zugriffsrechte von %s können nicht geändert werden" -#: lib/mkdir-p.c:206 src/copy.c:2261 src/install.c:709 src/install.c:722 +#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722 #, c-format msgid "cannot create directory %s" -msgstr "kann Verzeichnis %s nicht anlegen" +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:915 src/tac.c:435 +#: src/split.c:929 src/tac.c:434 #, c-format msgid "memory exhausted" -msgstr "Speicher ausgeschöpft" +msgstr "der Speicher ist ausgeschöpft" #: lib/openat-die.c:38 #, c-format msgid "unable to record current working directory" -msgstr "kann aktuelles Verzeichnisses nicht aufzeichnen" +msgstr "das aktuelles Verzeichnisses kann nicht aufgezeichnet werden" #: lib/openat-die.c:57 src/find-mount-point.c:107 #, c-format msgid "failed to return to initial working directory" -msgstr "konnte nicht in ursprüngliches Arbeitsverzeichnis zurückkehren" +msgstr "die Rückkehr in das ursprüngliche Arbeitsverzeichnis war nicht möglich" #. TRANSLATORS: #. Get translations for open and closing quotation marks. @@ -334,75 +333,75 @@ msgstr "“" msgid "%s: end of file" msgstr "%s: Dateieende" -#: lib/regcomp.c:130 +#: lib/regcomp.c:131 msgid "Success" msgstr "Erfolg" -#: lib/regcomp.c:133 +#: lib/regcomp.c:134 msgid "No match" msgstr "Keine Übereinstimmung" -#: lib/regcomp.c:136 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "Ungültiger regulärer Ausdruck" -#: lib/regcomp.c:139 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "Ungültiges Suchzeichen" -#: lib/regcomp.c:142 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "Ungültiger Zeichenklassenname" -#: lib/regcomp.c:145 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "Rückschrägstrich am Ende" -#: lib/regcomp.c:148 +#: lib/regcomp.c:149 msgid "Invalid back reference" -msgstr "Ungültiger Rückwärtsreferenz" +msgstr "Ungültige Rückwärtsverweis" -#: lib/regcomp.c:151 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" -msgstr "Kein Gegenstück für [ oder [^" +msgstr "Keine schließende Klammer für [ oder [^" -#: lib/regcomp.c:154 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" -msgstr "Kein Gegenstück für ( oder \\(" +msgstr "Keine schließende Klammer für ( oder \\(" -#: lib/regcomp.c:157 +#: lib/regcomp.c:158 msgid "Unmatched \\{" -msgstr "Kein Gegenstück für \\{" +msgstr "Keine schließende Klammer für \\{" -#: lib/regcomp.c:160 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" -msgstr "Ungültiger Inhalt von \\{\\}" +msgstr "Der Inhalt von \\{\\} ist ungültig" -#: lib/regcomp.c:163 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "Ungültiges Bereichsende" -#: lib/regcomp.c:166 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Speicher ausgeschöpft" -#: lib/regcomp.c:169 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" -msgstr "Ungültiger vorhergehender regulärer Ausdruck" +msgstr "Der vorhergehende reguläre Ausdruck ist ungültig" -#: lib/regcomp.c:172 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" -msgstr "Vorzeitiges Ende des regulären Ausdrucks" +msgstr "Der reguläre Ausdruck endet vorzeitig" -#: lib/regcomp.c:175 +#: lib/regcomp.c:176 msgid "Regular expression too big" -msgstr "Regulärer Ausdruck zu groß" +msgstr "Der reguläre Ausdruck ist zu groß" -#: lib/regcomp.c:178 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "Kein Gegenstück für ) oder \\)" -#: lib/regcomp.c:703 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "Kein vorhergehender regulärer Ausdruck" @@ -442,7 +441,7 @@ msgstr "^[jJyY]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-mode-acl.c:695 src/copy.c:2284 src/cp.c:518 +#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516 #, c-format msgid "setting permissions for %s" msgstr "Setzen der Zugriffsrechte für %s" @@ -583,13 +582,13 @@ msgstr "Stromausfall" msgid "Resource lost" msgstr "Resource verloren" -#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262 -#: lib/spawn-pipe.c:265 +#: 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:232 lib/spawn-pipe.c:346 lib/wait-process.c:282 +#: 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" @@ -603,29 +602,29 @@ msgstr "Echtzeitsignal %d" #: lib/strsignal.c:118 #, c-format msgid "Unknown signal %d" -msgstr "Unbekanntes Signal %d" +msgstr "Das Signal %d ist unbekannt" -#: lib/unicodeio.c:103 +#: lib/unicodeio.c:102 msgid "iconv function not usable" -msgstr "iconv-Funktion nicht benutzbar" +msgstr "die iconv-Funktion ist nicht benutzbar" -#: lib/unicodeio.c:105 +#: lib/unicodeio.c:104 msgid "iconv function not available" -msgstr "iconv‐Funktion nicht verfügbar" +msgstr "die iconv‐Funktion ist nicht verfügbar" -#: lib/unicodeio.c:112 +#: lib/unicodeio.c:111 msgid "character out of range" -msgstr "Zeichen außerhalb erlaubter Grenzen" +msgstr "das Zeichen ist außerhalb der erlaubten Grenzen" -#: lib/unicodeio.c:182 +#: lib/unicodeio.c:181 #, c-format msgid "cannot convert U+%04X to local character set" -msgstr "kann U+%04X nicht in lokalen Zeichensatz konvertieren" +msgstr "U+%04X kann nicht in den lokalen Zeichensatz konvertiert werden" -#: lib/unicodeio.c:184 +#: lib/unicodeio.c:183 #, c-format msgid "cannot convert U+%04X to local character set: %s" -msgstr "kann U+%04X nicht in lokalen Zeichensatz konvertieren: %s" +msgstr "U+%04X kann nicht in den lokalen Zeichensatz konvertiert werden: %s" #: lib/userspec.c:106 msgid "invalid user" @@ -642,7 +641,7 @@ msgstr "ungültige Spezifikation" #: lib/verror.c:73 #, c-format msgid "unable to display error message" -msgstr "kann Fehlermeldung nicht anzeigen" +msgstr "eine Fehlermeldung konnte nicht angezeigt werden" #: lib/version-etc.c:74 #, c-format @@ -805,7 +804,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:562 +#: lib/version-etc.c:251 src/system.h:573 #, c-format msgid "%s home page: <%s>\n" msgstr "%s Homepage: <%s>\n" @@ -815,7 +814,7 @@ 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:563 +#: lib/version-etc.c:256 src/system.h:574 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/" @@ -860,7 +859,7 @@ msgstr "Unbekannter Stream" #: lib/xfreopen.c:39 #, c-format msgid "failed to reopen %s with mode %s" -msgstr "konnte %s nicht erneut öffnen im Modus %s" +msgstr "%s konnte nicht erneut im Modus %s geöffnet werden" #: lib/xmemcoll.c:39 src/expr.c:886 #, c-format @@ -880,7 +879,7 @@ msgstr "Die verglichenen Zeichenketten waren %s und %s." #: lib/xprintf.c:50 lib/xprintf.c:76 #, c-format msgid "cannot perform formatted output" -msgstr "kann keine formatierte Ausgabe durchführen" +msgstr "die formatierte Ausgabe kann nicht durchgeführt werden" #: lib/xstrtol-error.c:63 #, c-format @@ -890,7 +889,7 @@ msgstr "ungültiges %s%s Argument „%s“" #: lib/xstrtol-error.c:68 #, c-format msgid "invalid suffix in %s%s argument '%s'" -msgstr "ungültiger Suffix in %s%s Argument „%s“" +msgstr "ungültige Endung in %s%s Argument „%s“" #: lib/xstrtol-error.c:72 #, c-format @@ -907,14 +906,13 @@ msgstr "Simon Josefsson" msgid "" "Usage: %s [OPTION]... [FILE]\n" "Base64 encode or decode FILE, or standard input, to standard output.\n" -"\n" msgstr "" "Aufruf: %s [OPTION]... [DATEI]\n" "DATEI oder Standardeingabe mittels Base64 kodieren oder dekodieren und\n" "in die Standardausgabe schreiben.\n" "\n" -#: src/base64.c:64 +#: src/base64.c:67 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -932,7 +930,7 @@ msgstr "" "Zeilenumbruch zu verhindern\n" "\n" -#: src/base64.c:73 src/cat.c:110 src/fmt.c:293 src/shuf.c:71 src/sum.c:70 +#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -940,7 +938,7 @@ msgstr "" "\n" "Ohne DATEI oder wenn DATEI „-“ ist, Standardeingabe lesen.\n" -#: src/base64.c:76 +#: src/base64.c:79 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -956,37 +954,37 @@ msgstr "" "gehörende\n" "Zeichen in der kodierten Eingabe zu verkraften.\n" -#: src/base64.c:171 src/base64.c:208 src/csplit.c:263 src/csplit.c:1435 -#: src/join.c:451 src/shuf.c:157 src/shuf.c:361 src/tac-pipe.c:74 +#: 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 #, c-format msgid "read error" msgstr "Lesefehler" -#: src/base64.c:227 +#: src/base64.c:230 #, c-format msgid "invalid input" msgstr "ungültige Eingabe" -#: src/base64.c:264 +#: src/base64.c:267 #, c-format msgid "invalid wrap size: %s" msgstr "ungültige Umbruchgröße: %s" -#: src/base64.c:283 src/basename.c:173 src/comm.c:435 src/cp.c:607 -#: src/date.c:441 src/dircolors.c:447 src/du.c:894 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:169 src/install.c:929 src/join.c:961 -#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:157 src/mv.c:447 -#: src/od.c:1802 src/ptx.c:2081 src/readlink.c:154 src/seq.c:408 -#: src/shuf.c:320 src/shuf.c:339 src/sort.c:4477 src/split.c:1313 -#: src/tr.c:1797 src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:454 -#: src/uniq.c:471 src/unlink.c:81 src/uptime.c:250 src/users.c:146 -#: src/wc.c:666 src/who.c:836 src/whoami.c:79 +#: 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 #, c-format msgid "extra operand %s" msgstr "zusätzlicher Operand %s" -#: src/base64.c:315 src/cat.c:781 +#: src/base64.c:318 src/cat.c:781 #, c-format msgid "closing standard input" msgstr "schließe Standardeingabe" @@ -994,15 +992,15 @@ 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/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:53 src/env.c:33 +#: 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/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:65 src/su.c:88 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 +#: 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 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -1019,13 +1017,12 @@ msgstr "" msgid "" "Print NAME with any leading directory components removed.\n" "If specified, also remove a trailing SUFFIX.\n" -"\n" msgstr "" "Den NAMEn ohne führende Verzeichnisse ausgeben.\n" -"Wenn angegeben, auch SUFFIX entfernen.\n" +"Wenn angegeben, auch ENDUNG entfernen.\n" "\n" -#: src/basename.c:59 +#: 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" @@ -1033,11 +1030,11 @@ msgid "" msgstr "" " -a, --multiple mehrere Argumente werden unterstützt, wobei jedes\n" " einzelne als NAME behandelt wird.\n" -" -s, --suffix=SUFFIX eventuell vorhandene Endungen werden entfernt\n" +" -s, --suffix=ENDUNG ENDUNG wird entfernt\n" " -z, --zero Die Ausgabe wird mit NULL statt Zeilenumbruch " "beendet\n" -#: src/basename.c:66 +#: src/basename.c:67 #, c-format msgid "" "\n" @@ -1054,20 +1051,21 @@ msgstr "" " %s -s .h include/stdio.h -> \"stdio\"\n" " %s -a any/str1 any/str2 -> \"str1\" gefolgt von \"str2\"\n" -#: src/basename.c:167 src/chcon.c:531 src/chgrp.c:277 src/chmod.c:526 -#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1369 +#: 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:183 src/mkfifo.c:108 src/mknod.c:146 src/nohup.c:111 -#: src/pathchk.c:148 src/printf.c:674 src/readlink.c:146 src/realpath.c:236 -#: src/rm.c:314 src/rmdir.c:223 src/seq.c:402 src/setuidgid.c:137 -#: src/sleep.c:119 src/stat.c:1476 src/stdbuf.c:346 src/tr.c:1782 +#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 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 #, 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:52 src/split.c:49 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/split.c:49 msgid "Torbjorn Granlund" msgstr "Torbjörn Granlund" @@ -1077,8 +1075,8 @@ msgstr "Torbjörn Granlund" msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:846 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4720 src/nl.c:182 src/paste.c:435 src/pr.c:2768 src/sum.c:58 +#: 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/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" @@ -1136,7 +1134,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:2209 src/sort.c:379 src/tee.c:165 src/yes.c:86 +#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86 #, c-format msgid "standard output" msgstr "Standardausgabe" @@ -1153,62 +1151,64 @@ 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:55 src/head.c:46 src/hostid.c:33 +#: 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 msgid "Jim Meyering" msgstr "Jim Meyering" -#: src/chcon.c:100 src/runcon.c:203 src/runcon.c:234 +#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238 #, c-format msgid "failed to create security context: %s" -msgstr "konnte Sicherheitskontext nicht erstellen: %s" +msgstr "der Sicherheitskontext konnte nicht erstellt werden: %s" #: src/chcon.c:112 #, c-format msgid "failed to set %s security context component to %s" -msgstr "konnte %s Sicherheitskontextkomponente nicht auf %s setzen" +msgstr "die %s-Sicherheitskontextkomponente konnte nicht auf %s gesetzt werden" -#: src/chcon.c:156 src/chcon.c:540 src/copy.c:2222 src/runcon.c:217 -#: src/stat.c:683 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221 +#: src/stat.c:702 #, c-format msgid "failed to get security context of %s" -msgstr "konnte Sicherheitskontext von %s nicht holen" +msgstr "der Sicherheitskontext von %s konnte nicht ermittelt werden" #: src/chcon.c:166 #, c-format msgid "can't apply partial context to unlabeled file %s" -msgstr "kann partiellen Kontext nicht auf Datei %s ohne Label anwenden" +msgstr "" +"der unvollständige Kontext kann nicht auf Datei %s ohne Label angewendt " +"werden" #: src/chcon.c:193 #, c-format msgid "failed to change context of %s to %s" -msgstr "konnte Kontext von %s nicht in %s ändern" +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:446 src/ls.c:2981 +#: src/du.c:457 src/ls.c:2981 #, 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:426 +#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437 #, c-format msgid "cannot read directory %s" -msgstr "kann Verzeichnis %s nicht lesen" +msgstr "das Verzeichnis %s kann nicht gelesen werden" #: src/chcon.c:292 #, c-format msgid "changing security context of %s\n" -msgstr "ändere Sicherheitskontext für %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:599 +#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562 #, 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:618 -#: src/remove.c:613 +#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642 +#: src/remove.c:576 #, c-format msgid "fts_close failed" msgstr "fts_close scheiterte" @@ -1230,14 +1230,13 @@ msgid "" "Change the security context of each FILE to CONTEXT.\n" "With --reference, change the security context of each FILE to that of " "RFILE.\n" -"\n" msgstr "" -"Ändern des Sicherheitskontextes für jede DATEI nach KONTEXT.\n" -"Mit --reference: Ändern des Sicherheitskontextes für jede DATEI auf die von " +"Ändern des Sicherheitskontextes jeder DATEI nach KONTEXT.\n" +"Mit --reference: Ändern des Sicherheitskontextes jeder DATEI auf die von " "RDATEI.\n" "\n" -#: src/chcon.c:362 src/chgrp.c:123 src/chown.c:94 +#: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94 msgid "" " --dereference affect the referent of each symbolic link (this is\n" " the default), rather than the symbolic link itself\n" @@ -1251,7 +1250,7 @@ msgstr "" " -h, --no-dereference symbolische Verknüpfung anstatt der referenzierten\n" " Datei ändern\n" -#: src/chcon.c:367 +#: src/chcon.c:369 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" @@ -1264,7 +1263,15 @@ msgstr "" " -l, --range=BEREICH BEREICH im Ziel-Sicherheitskontext setzen\n" "\n" -#: src/chcon.c:373 +#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 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 „/“ nicht besonders behandeln (Voreinstellung)\n" +" --preserve-root rekursive Bearbeitung von „/“ ablehnen\n" + +#: src/chcon.c:379 msgid "" " --reference=RFILE use RFILE's security context rather than " "specifying\n" @@ -1274,16 +1281,16 @@ msgstr "" "eines\n" " KONTEXT‐Wertes\n" -#: src/chcon.c:377 src/chgrp.c:140 src/chown.c:118 +#: 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 Dateien und Verzeichnisse rekursiv ändern\n" -#: src/chcon.c:380 +#: src/chcon.c:386 msgid " -v, --verbose output a diagnostic for every file processed\n" msgstr "" " -v, --verbose Diagnose für jede verarbeitete Datei ausgeben\n" -#: src/chcon.c:383 src/chgrp.c:143 src/chown.c:121 +#: src/chcon.c:389 src/chgrp.c:143 src/chown.c:121 msgid "" "\n" "The following options modify how a hierarchy is traversed when the -R\n" @@ -1312,36 +1319,36 @@ msgstr "" " (Voreinstellung)\n" "\n" -#: src/chcon.c:512 src/chgrp.c:264 src/chown.c:267 +#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267 #, c-format msgid "-R --dereference requires either -H or -L" msgstr "-R --dereference erfordert entweder -H oder -L" -#: src/chcon.c:518 +#: src/chcon.c:524 #, c-format msgid "-R -h requires -P" msgstr "-R -h erfordert -P" -#: src/chcon.c:533 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282 -#: src/comm.c:429 src/csplit.c:1371 src/join.c:1149 src/link.c:79 -#: src/mknod.c:148 src/setuidgid.c:139 src/tr.c:1785 +#: 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 #, c-format msgid "missing operand after %s" msgstr "fehlender Operand nach %s" -#: src/chcon.c:556 src/runcon.c:247 +#: src/chcon.c:562 src/runcon.c:251 #, c-format msgid "invalid context: %s" msgstr "ungültiger Kontext: %s" -#: src/chcon.c:563 +#: src/chcon.c:569 #, c-format msgid "conflicting security context specifiers given" msgstr "widersprüchliche Sicherheitskontext-Angaben" -#: src/chcon.c:572 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:433 src/cp.c:493 -#: src/mv.c:96 src/pwd.c:273 src/rm.c:324 src/touch.c:351 +#: 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 #, c-format msgid "failed to get attributes of %s" msgstr "konnte Attribute von %s nicht holen" @@ -1387,17 +1394,8 @@ msgid "" " (useful only on systems that can change the\n" " ownership of a symlink)\n" msgstr "" -" (Nützlich auf Systemen, die für symb. " -"Verknüpfungen\n" -" die Besitzer ändern können.)\n" - -#: src/chgrp.c:132 src/chmod.c:387 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 „/“ nicht besonders behandeln (Voreinstellung)\n" -" --preserve-root rekursive Bearbeitung von „/“ ablehnen\n" +" (Nützlich auf Systemen, die für symbolische\n" +" Verknüpfungen die Besitzer ändern können.)\n" #: src/chgrp.c:136 msgid "" @@ -1452,7 +1450,9 @@ msgstr "Modus von %s als %04lo (%s) erhalten\n" #: src/chmod.c:236 #, c-format msgid "cannot operate on dangling symlink %s" -msgstr "kann nicht auf der freihängenden symbolischen Verknüpfung %s arbeiten" +msgstr "" +"auf der ins Leere weisenden symbolischen Verknüpfung %s kann nicht " +"gearbeitet werden" #: src/chmod.c:276 #, c-format @@ -1462,7 +1462,7 @@ msgstr "Beim Setzen der Zugriffsrechte für %s" #: src/chmod.c:311 #, c-format msgid "%s: new permissions are %s, not %s" -msgstr "%s: neue Zugriffsrechte sind %s, nicht %s" +msgstr "%s: die neuen Zugriffsrechte sind %s, nicht %s" #: src/chmod.c:371 #, c-format @@ -1526,12 +1526,12 @@ msgstr "die Gruppe von %s wurde von %s in %s geändert\n" #: src/chown-core.c:160 #, c-format msgid "no change to ownership of %s\n" -msgstr "kann Wechsel des Eigentümers von %s\n" +msgstr "kein Wechsel des Eigentümers von %s\n" #: src/chown-core.c:165 #, c-format msgid "failed to change ownership of %s from %s to %s\n" -msgstr "Ändern des Eigentümers von %s von %s zu %s ist fehlgeschlagen\n" +msgstr "das Ändern des Eigentümers von %s von %s zu %s ist fehlgeschlagen\n" #: src/chown-core.c:166 #, c-format @@ -1541,47 +1541,47 @@ msgstr "das Ändern der Gruppe von %s von %s in %s ist fehlgeschlagen\n" #: src/chown-core.c:167 src/chown-core.c:173 #, c-format msgid "failed to change ownership of %s\n" -msgstr "Wechsel des Eigentümers von %s ist fehlgeschlagen\n" +msgstr "der Wechsel des Eigentümers von %s ist fehlgeschlagen\n" #: src/chown-core.c:171 #, c-format msgid "failed to change ownership of %s to %s\n" -msgstr "Wechsel des Eigentümers von %s in %s fehlgeschlagen\n" +msgstr "der Wechsel des Eigentümers von %s in %s fehlgeschlagen\n" #: src/chown-core.c:172 #, c-format msgid "failed to change group of %s to %s\n" -msgstr "Wechsel der Gruppe von %s in %s fehlgeschlagen\n" +msgstr "der Wechsel der Gruppe von %s in %s fehlgeschlagen\n" #: src/chown-core.c:180 #, c-format msgid "ownership of %s retained as %s\n" -msgstr "Eigentümer von %s als %s erhalten\n" +msgstr "der Eigentümer von %s wurde als %s erhalten\n" #: src/chown-core.c:181 #, c-format msgid "group of %s retained as %s\n" -msgstr "Gruppe von %s als %s erhalten\n" +msgstr "die Gruppe von %s wurde als %s erhalten\n" #: src/chown-core.c:182 #, c-format msgid "ownership of %s retained\n" -msgstr "Eigentümer von %s erhalten\n" +msgstr "der Eigentümer von %s wurde erhalten\n" #: src/chown-core.c:379 #, c-format msgid "cannot dereference %s" -msgstr "kann %s nicht dereferenzieren" +msgstr "%s kann nicht dereferenziert werden" #: src/chown-core.c:467 #, c-format msgid "changing ownership of %s" -msgstr "Ändern des Eigentümers von %s" +msgstr "der Eigentümer von %s wird geändert" #: src/chown-core.c:468 #, c-format msgid "changing group of %s" -msgstr "Ändern der Gruppe für %s" +msgstr "die Gruppe von %s wird geändert" #: src/chown.c:79 #, c-format @@ -1669,7 +1669,7 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:97 src/install.c:575 src/setuidgid.c:110 src/setuidgid.c:120 +#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120 #, c-format msgid "invalid group %s" msgstr "ungültige Gruppe %s" @@ -1682,7 +1682,7 @@ msgstr "ungültige Gruppenliste %s" #: src/chroot.c:117 #, c-format msgid "failed to set additional groups" -msgstr "konnte keine zusätzlichen Gruppen setzen" +msgstr "es konnten keine zusätzlichen Gruppen gesetzt werden" #: src/chroot.c:132 #, c-format @@ -1739,11 +1739,11 @@ msgstr "die Gruppen-ID konnte nicht gesetzt werden" 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:213 src/stdbuf.c:366 -#: src/timeout.c:402 +#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365 +#: src/timeout.c:454 #, c-format msgid "failed to run command %s" -msgstr "Befehl %s konnte nicht ausgeführt werden" +msgstr "der Befehl %s konnte nicht ausgeführt werden" #. This is a proper name. See the gettext manual, section Names. #: src/cksum.c:40 @@ -1849,35 +1849,37 @@ msgstr "" #: src/comm.c:222 #, c-format msgid "file %d is not in sorted order" -msgstr "Datei %d ist nicht sortiert" +msgstr "die Datei %d ist nicht sortiert" #: src/comm.c:407 #, c-format msgid "multiple delimiters specified" -msgstr "mehrfache Trennzeichen angegeben" +msgstr "es wurden mehrfache Trennzeichen angegeben" # XLATE_REMARK: Check this out! What is %s? #: src/comm.c:411 #, c-format msgid "empty %s not allowed" -msgstr "leeres %s nicht erlaubt" +msgstr "leeres %s ist nicht erlaubt" -# XLATE_REMARK: Check this out! is the %s replaced by the name of the directory? -#: src/copy.c:168 src/dd.c:1609 src/dd.c:1976 +#: 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 #, c-format -msgid "reading %s" -msgstr "Lesen von %s" +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:426 +#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425 #, c-format msgid "cannot lseek %s" -msgstr "Aufruf von lseek für %s nicht möglich" +msgstr "der Aufruf von lseek für %s ist nicht möglich" -# XLATE_REMARK: Check this out! is the %s replaced by the name of the directory? -#: src/copy.c:206 src/dd.c:2039 src/dd.c:2102 +#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151 #, c-format -msgid "writing %s" -msgstr "Schreiben von %s" +msgid "error writing %s" +msgstr "Fehler beim Schreiben von %s" #: src/copy.c:313 #, c-format @@ -1887,7 +1889,7 @@ msgstr "%s: Info über die Erweiterung konnte nicht erfragt werden" #: src/copy.c:373 #, c-format msgid "%s: write failed" -msgstr "%s: Schreiben schlug fehl" +msgstr "%s: das Schreiben schlug fehl" #: src/copy.c:442 src/copy.c:1083 #, c-format @@ -1897,66 +1899,69 @@ msgstr "%s konnte nicht erweitert werden" #: src/copy.c:662 #, c-format msgid "clearing permissions for %s" -msgstr "lösche Zugriffsrechte für %s" +msgstr "die Zugriffsrechte für %s werden gelöscht" -#: src/copy.c:697 src/copy.c:2470 src/cp.c:331 +#: src/copy.c:697 src/copy.c:2480 src/cp.c:329 #, c-format msgid "failed to preserve ownership for %s" -msgstr "konnte den Eigentümer für %s nicht erhalten" +msgstr "der Eigentümer für %s konnte nicht beibehalten werden" #: src/copy.c:723 #, c-format msgid "failed to lookup file %s" -msgstr "konnte die Datei %s nicht finden" +msgstr "die Datei %s konnte nicht gefunden werden" #: src/copy.c:728 #, c-format msgid "failed to preserve authorship for %s" -msgstr "konnte den Urheber für %s nicht erhalten" +msgstr "der Urheber für %s konnte nicht beibehalten werden" -#: src/copy.c:804 src/csplit.c:638 src/du.c:901 src/fmt.c:449 src/head.c:847 -#: src/sort.c:4489 src/split.c:1329 src/tail.c:1756 src/wc.c:678 +#: 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 "%s kann nicht zum Lesen geöffnet werden" -#: src/copy.c:810 src/copy.c:972 src/dd.c:1546 src/dd.c:2114 src/dd.c:2252 -#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:141 +#: 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 #, c-format msgid "cannot fstat %s" -msgstr "Aufruf von fstat für %s nicht möglich" +msgstr "der Aufruf von fstat für %s ist nicht möglich" #: src/copy.c:820 #, c-format msgid "skipping file %s, as it was replaced while being copied" -msgstr "überspringe Datei %s, da sie während des Kopierens ersetzt wurde" +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 "konnte den Erstellungs-Kontext des Dateisystems nicht ermitteln" +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 "konnte Sicherheitskontext von %s nicht auf %s setzen" +msgstr "der Sicherheitskontext von %s konnte nicht auf %s gesetzt werden" -#: src/copy.c:881 src/copy.c:1574 src/copy.c:1777 src/copy.c:1935 src/ln.c:314 -#: src/remove.c:267 src/remove.c:293 src/remove.c:444 src/remove.c:465 +#: 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 #, c-format msgid "cannot remove %s" -msgstr "Entfernen von %s nicht möglich" +msgstr "das Entfernen von %s ist nicht möglich" -#: src/copy.c:886 src/copy.c:1578 src/copy.c:1772 src/copy.c:1940 -#: src/remove.c:418 +#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945 +#: src/remove.c:375 #, c-format msgid "removed %s\n" -msgstr "%s entfernt\n" +msgstr "%s wurde entfernt\n" #: src/copy.c:926 #, c-format msgid "not writing through dangling symlink %s" -msgstr "schreibe nicht durch die freihängende symbolische Verknüpfung %s" +msgstr "" +"schreiben durch die unvollständige symbolische Verknüpfung %s ist nicht " +"möglich" #: src/copy.c:964 #, c-format @@ -1968,195 +1973,207 @@ msgstr "reguläre Datei %s kann nicht angelegt werden" msgid "failed to clone %s from %s" msgstr "%s konnte nicht von %s geklont werden" -#: src/copy.c:1098 src/copy.c:2531 +#: src/copy.c:1098 src/copy.c:2541 #, c-format msgid "preserving times for %s" -msgstr "Erhalten der Zeiten für %s" +msgstr "die Zeiten für %s werden beibehalten" -# XLATE_REMARK: Check this out! is the %s replaced by the name of the directory? -#: src/copy.c:1170 src/copy.c:1176 src/head.c:855 src/touch.c:175 -#: src/truncate.c:413 +#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172 +#: src/truncate.c:417 #, c-format -msgid "closing %s" -msgstr "Schließen von %s" +msgid "failed to close %s" +msgstr "%s konnte nicht geöffnet werden" -#: src/copy.c:1466 +#: src/copy.c:1471 #, c-format msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? " msgstr "%s: Überschreiben von %s, über Modus %04lo (%s) hinwegsetzen? " -#: src/copy.c:1473 +#: src/copy.c:1478 #, c-format msgid "%s: overwrite %s? " msgstr "%s: %s überschreiben? " -#: src/copy.c:1542 +#: src/copy.c:1547 #, c-format msgid " (backup: %s)" msgstr " (Sicherung: %s)" -#: src/copy.c:1552 +#: src/copy.c:1557 #, c-format msgid "failed to restore the default file creation context" msgstr "" -"konnte den Standard-Kontext zur Dateierstellung nicht wieder herstellen" +"der Standard-Kontext zur Dateierstellung konnte nicht wieder hergestellt " +"werden" -#: src/copy.c:1584 +#: src/copy.c:1589 #, c-format msgid "cannot create hard link %s to %s" -msgstr "Erzeugen von harter Verknüpfung %s zu Verzeichnis %s nicht möglich" +msgstr "" +"das Erzeugen von harter Verknüpfung %s zu Verzeichnis %s ist nicht möglich" -#: src/copy.c:1637 src/copy.c:1689 src/copy.c:2272 src/copy.c:2589 +#: 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:1220 src/truncate.c:365 +#: src/stat.c:1239 src/truncate.c:363 #, c-format msgid "cannot stat %s" -msgstr "Aufruf von stat für %s nicht möglich" +msgstr "der Aufruf von stat für %s ist nicht möglich" -#: src/copy.c:1645 +#: src/copy.c:1650 #, c-format msgid "omitting directory %s" -msgstr "Verzeichnis %s ausgelassen" +msgstr "Verzeichnis %s wurde ausgelassen" -#: src/copy.c:1659 +#: src/copy.c:1664 #, c-format msgid "warning: source file %s specified more than once" msgstr "Warnung: Quelldatei %s mehr als einmal angegeben" -#: src/copy.c:1707 src/ln.c:246 +#: src/copy.c:1712 src/ln.c:246 #, c-format msgid "%s and %s are the same file" msgstr "%s und %s sind die gleiche Datei" -#: src/copy.c:1806 +#: src/copy.c:1811 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "" -"Überschreiben des Nicht‐Verzeichnisses %s mit Verzeichnis %s nicht möglich." +"das Überschreiben des Nicht‐Verzeichnisses %s mit Verzeichnis %s ist nicht " +"möglich." -#: src/copy.c:1824 src/ln.c:214 +#: src/copy.c:1829 src/ln.c:214 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "Neu erstelltes %s wird nicht mit %s überschrieben." -#: src/copy.c:1842 +#: src/copy.c:1847 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "" -"Überschreiben des Verzeichnisses %s mit Nicht‐Verzeichnis nicht möglich." +"das Überschreiben des Verzeichnisses %s mit einem Nicht‐Verzeichnis ist " +"nicht möglich." -#: src/copy.c:1856 +#: src/copy.c:1861 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "" -"Verschieben von Verzeichnis auf ein Nicht‐Verzeichnis nicht möglich: %s → %s" +"das Verschieben eines Verzeichnisses auf ein Nicht‐Verzeichnis ist nicht " +"möglich: %s → %s" -#: src/copy.c:1886 +#: src/copy.c:1891 #, c-format msgid "backing up %s would destroy source; %s not moved" -msgstr "Sicherung von %s würde Quelle zerstören; %s nicht verschoben" +msgstr "" +"die Sicherung von %s würde die Quelle zerstören; %s wurde nicht verschoben" -#: src/copy.c:1887 +#: src/copy.c:1892 #, c-format msgid "backing up %s would destroy source; %s not copied" -msgstr "Sicherung von %s würde Quelle zerstören; %s nicht kopiert" +msgstr "" +"die Sicherung von %s würde die Quelle zerstören; %s wurde nicht kopiert" -#: src/copy.c:1910 src/ln.c:276 +#: src/copy.c:1915 src/ln.c:276 #, c-format msgid "cannot backup %s" -msgstr "Sicherung von %s nicht möglich" +msgstr "die Sicherung von %s ist nicht möglich" -#: src/copy.c:1974 +#: src/copy.c:1979 #, c-format msgid "will not copy %s through just-created symlink %s" -msgstr "werde %s nicht durch neu erstellte symbolische Verknüpfung %s kopieren" +msgstr "" +"%s wird nicht mittels der neu erstellten symbolische Verknüpfung %s kopiert" -#: src/copy.c:2051 +#: src/copy.c:2056 #, c-format msgid "cannot copy a directory, %s, into itself, %s" -msgstr "Kopieren eines Verzeichnisses, %s, in sich selbst (%s) nicht möglich" +msgstr "" +"Kopieren eines Verzeichnisses, %s, in sich selbst (%s) ist nicht möglich" -#: src/copy.c:2068 +#: src/copy.c:2073 #, 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:2118 +#: src/copy.c:2123 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" -msgstr "Verschieben von %s in eigenes Unterverzeichnis (%s) nicht möglich" +msgstr "" +"das Verschieben von %s in ein Unterverzeichnis seiner selbst (%s) ist nicht " +"möglich" -#: src/copy.c:2161 +#: src/copy.c:2166 #, c-format msgid "cannot move %s to %s" -msgstr "Verschieben von %s nach %s nicht möglich" +msgstr "das Verschieben von %s nach %s ist nicht möglich" -#: src/copy.c:2173 +#: src/copy.c:2178 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" -"Verschieben zwischen Geräten fehlgeschlagen: %s zu %s; kann Ziel nicht " -"entfernen" +"das Verschieben zwischen Geräten ist fehlgeschlagen: %s zu %s; das Ziel kann " +"nicht entfernt werden" -#: src/copy.c:2207 src/install.c:905 src/mkdir.c:189 src/mkfifo.c:114 -#: src/mknod.c:167 +#: 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 "konnte den Standard-Kontext zur Dateierstellung nicht auf %s setzen" +msgstr "" +"der Standard-Kontext zur Dateierstellung konnte nicht auf %s gesetzt werden" -#: src/copy.c:2241 +#: src/copy.c:2246 #, c-format msgid "cannot copy cyclic symbolic link %s" -msgstr "Kopieren von zyklischer symbolischer Verknüpfung %s nicht möglich" +msgstr "" +"das Kopieren der zyklischen symbolischen Verknüpfung %s ist nicht möglich" -#: src/copy.c:2350 +#: src/copy.c:2355 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "" -"%s: Erzeugen relativer symbolischer Verknüpfungen nur in momentanem " -"Verzeichnis möglich" +"%s: eine relative symbolische Verknüpfungen kann nur im aktuellen " +"Verzeichnis angelgt werden" -#: src/copy.c:2357 +#: src/copy.c:2362 #, c-format msgid "cannot create symbolic link %s to %s" -msgstr "Erzeugen der symbolischen Verknüpfung %s nach %s nicht möglich" +msgstr "die symbolische Verknüpfung %s zu %s kann nicht angelegt werden" -#: src/copy.c:2406 src/mkfifo.c:133 +#: src/copy.c:2416 src/mkfifo.c:132 #, c-format msgid "cannot create fifo %s" -msgstr "Erzeugen von FIFO %s nicht möglich" +msgstr "der FIFO %s kann nicht erzeugt werden" -#: src/copy.c:2415 +#: src/copy.c:2425 #, c-format msgid "cannot create special file %s" -msgstr "Erzeugen der Spezialdatei %s nicht möglich" +msgstr "die Spezialdatei %s kann nicht erzeugt werden" -#: src/copy.c:2426 src/ls.c:3191 src/stat.c:902 +#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921 #, c-format msgid "cannot read symbolic link %s" msgstr "Lesen der symbolischen Verknüpfung %s nicht möglich" -#: src/copy.c:2453 +#: src/copy.c:2463 #, c-format msgid "cannot create symbolic link %s" -msgstr "Erzeugen der symbolischen Verknüpfung %s nicht möglich" +msgstr "die symbolische Verknüpfung %s kann nicht angelegt werden" -#: src/copy.c:2485 +#: src/copy.c:2495 #, c-format msgid "%s has unknown file type" msgstr "%s hat einen unbekannten Dateityp" -#: src/copy.c:2629 src/ln.c:358 +#: src/copy.c:2644 src/ln.c:358 #, c-format msgid "cannot un-backup %s" -msgstr "Löschen der Sicherung von %s nicht möglich" +msgstr "das Löschen der Sicherung von %s ist nicht möglich" -#: src/copy.c:2633 +#: src/copy.c:2648 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s → %s (Löschen der Sicherung)\n" -#: src/cp.c:156 src/mv.c:284 +#: src/cp.c:156 src/mv.c:286 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -2168,27 +2185,12 @@ msgstr "" " oder: %s [OPTION]... -t VERZEICHNIS QUELLE...\n" #: src/cp.c:162 -msgid "" -"Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" -"\n" +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:166 src/csplit.c:1458 src/cut.c:197 src/df.c:852 src/du.c:268 -#: src/expand.c:112 src/fmt.c:275 src/fold.c:75 src/head.c:115 -#: src/install.c:612 src/kill.c:86 src/ln.c:392 src/ls.c:4726 src/mkdir.c:61 -#: src/mkfifo.c:56 src/mknod.c:58 src/mv.c:294 src/nl.c:191 src/paste.c:445 -#: src/pr.c:2777 src/ptx.c:1825 src/shred.c:153 src/shuf.c:58 src/sort.c:399 -#: src/split.c:211 src/stdbuf.c:95 src/tac.c:142 src/tail.c:268 -#: src/touch.c:226 src/truncate.c:107 src/unexpand.c:122 src/uniq.c:145 -msgid "" -"Mandatory arguments to long options are mandatory for short options too.\n" -msgstr "" -"Erforderliche Argumente für lange Optionen sind auch für kurze " -"erforderlich.\n" - -#: src/cp.c:169 +#: src/cp.c:168 msgid "" " -a, --archive same as -dR --preserve=all\n" " --attributes-only don't copy the file data, just the " @@ -2210,12 +2212,13 @@ msgstr "" "kopieren\n" " -d genauso wie --no-dereference --preserve=links\n" -#: src/cp.c:178 +#: src/cp.c:177 msgid "" " -f, --force if an existing destination file cannot be\n" -" opened, remove it and try again (redundant " -"if\n" -" the -n option is used)\n" +" opened, remove it and try again (this " +"option\n" +" is ignored when the -n option is also " +"used)\n" " -i, --interactive prompt before overwrite (overrides a previous " "-n\n" " option)\n" @@ -2233,7 +2236,7 @@ msgstr "" " Kommandozeile als QUELLE angegeben sind,\n" " folgen\n" -#: src/cp.c:188 +#: src/cp.c:186 msgid "" " -l, --link hard link files instead of copying\n" " -L, --dereference always follow symbolic links in SOURCE\n" @@ -2242,7 +2245,7 @@ msgstr "" " -L, --dereference symbolischen Verknüpfungen in QUELLE immer " "folgen\n" -#: src/cp.c:192 +#: src/cp.c:190 msgid "" " -n, --no-clobber do not overwrite an existing file (overrides\n" " a previous -i option)\n" @@ -2253,7 +2256,7 @@ msgstr "" " -P, --no-dereference symbolischen Verknüpfungen in QUELLE nie " "folgen\n" -#: src/cp.c:197 +#: src/cp.c:195 msgid "" " -p same as --preserve=mode,ownership,timestamps\n" " --preserve[=ATTR_LIST] preserve the specified attributes (default:\n" @@ -2271,7 +2274,7 @@ msgstr "" " weitere Attribute: context, links, xattr, " "all\n" -#: src/cp.c:205 +#: src/cp.c:203 msgid "" " --no-preserve=ATTR_LIST don't preserve the specified attributes\n" " --parents use full source file name under DIRECTORY\n" @@ -2279,7 +2282,7 @@ msgstr "" " --no-preserve=ATTR_LIST Angegebene Attribute nicht erhalten\n" " --parents Quell‐Pfad an VERZEICHNIS anhängen\n" -#: src/cp.c:209 +#: src/cp.c:207 msgid "" " -R, -r, --recursive copy directories recursively\n" " --reflink[=WHEN] control clone/CoW copies. See below\n" @@ -2293,7 +2296,7 @@ msgstr "" "öffnen,\n" " löschen (im Gegensatz zu --force)\n" -#: src/cp.c:215 +#: src/cp.c:213 msgid "" " --sparse=WHEN control creation of sparse files. See below\n" " --strip-trailing-slashes remove any trailing slashes from each " @@ -2306,7 +2309,7 @@ msgstr "" "Arguments\n" " entfernen\n" -#: src/cp.c:220 +#: src/cp.c:218 msgid "" " -s, --symbolic-link make symbolic links instead of copying\n" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -2316,11 +2319,11 @@ msgid "" msgstr "" " -s, --symbolic-link symbolische Verknüpfungen erzeugen anstatt\n" " zu kopieren\n" -" -S, --suffix=SUFFIX normale Sicherungs‐Dateiendung ändern\n" +" -S, --suffix=ENDUNG Standard-Sicherungs‐Dateiendung ändern\n" " -t, --target-directory=VERZ alle QUELLE‐Argumente in VERZ kopieren\n" " -T, --no-target-directory ZIEL als normale Datei behandeln\n" -#: src/cp.c:226 +#: src/cp.c:224 msgid "" " -u, --update copy only when the SOURCE file is newer\n" " than the destination file or when the\n" @@ -2334,7 +2337,7 @@ msgstr "" " -v, --verbose durchgeführte Tätigkeiten erklären\n" " -x, --one-file-system in diesem Dateisystem verbleiben\n" -#: src/cp.c:235 +#: src/cp.c:233 msgid "" "\n" "By default, sparse SOURCE files are detected by a crude heuristic and the\n" @@ -2353,8 +2356,7 @@ msgstr "" "Standardmäßig werden QUELL‐Dateien mit Löchern („sparse“) durch eine " "einfache\n" "Heuristik erkannt und die korrespondierenden ZIEL‐Dateien werden ebenfalls\n" -"„sparse“ gemacht. Dieses Verhalten wird mit --sparse=auto ausgewählt. " -"Geben\n" +"„sparse“ gemacht. Dieses Verhalten wird mit --sparse=auto ausgewählt. Geben\n" "Sie --sparse=always an, um „sparse“‐ZIEL‐Dateien zu erzeugen, wenn die\n" "QUELL-Datei eine ausreichend lange Sequenz aus Null‐Bytes enthält.\n" "Verwenden Sie --sparse=never, um das Erzeugen von „sparse“‐Dateien zu\n" @@ -2362,10 +2364,10 @@ msgstr "" "Wird --reflink[=always] angegeben, wird eine leichtgewichtige Kopie " "gemacht,\n" "bei welcher die Datenblöcke nur dann kopiert werden, wenn sie sich geändert\n" -"haben. Wenn dies nicht möglich ist, scheitert das Kopieren. Wurde \n" +"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:247 src/install.c:649 src/ln.c:421 src/mv.c:321 +#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322 msgid "" "\n" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -2381,7 +2383,7 @@ msgstr "" "festgelegt werden. Mögliche Werte sind:\n" "\n" -#: src/cp.c:254 src/install.c:656 src/mv.c:328 +#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329 msgid "" " none, off never make backups (even if --backup is given)\n" " numbered, t make numbered backups\n" @@ -2395,7 +2397,7 @@ msgstr "" "einfach.\n" " simple, never Immer einfache Sicherheitskopien erzeugen\n" -#: src/cp.c:260 +#: src/cp.c:258 msgid "" "\n" "As a special case, cp makes a backup of SOURCE when the force and backup\n" @@ -2408,235 +2410,236 @@ 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:319 +#: src/cp.c:317 #, c-format msgid "failed to preserve times for %s" -msgstr "konnte die Zeiten für %s nicht erhalten" +msgstr "die Zeiten für %s konnten nicht beibehalten werden" -#: src/cp.c:350 +#: src/cp.c:348 #, c-format msgid "failed to preserve permissions for %s" -msgstr "konnte die Zugriffsrechte für %s nicht erhalten" +msgstr "die Zugriffsrechte für %s konnten nicht beibehalten werden" -#: src/cp.c:477 +#: src/cp.c:475 #, c-format msgid "cannot make directory %s" -msgstr "Erzeugen des Verzeichnisses %s nicht möglich" +msgstr "das Verzeichnisses %s konnte nicht angelegt werden" -#: src/cp.c:526 src/cp.c:545 +#: src/cp.c:524 src/cp.c:543 #, c-format msgid "%s exists but is not a directory" msgstr "%s existiert, ist aber kein Verzeichnis" -# XLATE_REMARK: Check this out! is the %s replaced by the name of the directory? -#: src/cp.c:572 src/cp.c:1068 src/install.c:401 src/install.c:844 src/ln.c:123 -#: src/ln.c:181 src/ln.c:202 src/ln.c:516 src/mv.c:152 src/mv.c:399 +#: 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 #, c-format -msgid "accessing %s" -msgstr "Zugriff auf %s" +msgid "failed to access %s" +msgstr "auf %s konnte nicht zugegriffen werden" -#: src/cp.c:592 src/install.c:914 src/ln.c:546 src/mv.c:432 src/shred.c:1182 -#: src/touch.c:433 src/truncate.c:356 +#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181 +#: src/touch.c:429 src/truncate.c:354 #, c-format msgid "missing file operand" msgstr "Fehlender Dateioperand" -#: src/cp.c:594 src/install.c:916 src/ln.c:560 src/mv.c:434 +#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436 #, c-format msgid "missing destination file operand after %s" msgstr "Fehlender Zieldatei‐Operand hinter %s" -#: src/cp.c:603 src/install.c:925 src/mv.c:443 +#: src/cp.c:601 src/install.c:926 src/mv.c:445 #, c-format msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)" msgstr "" -"Kann --target-directory (-t) und --no-target-directory (-T) nicht kombinieren" +"--target-directory (-t) und --no-target-directory (-T) können nicht " +"kombiniert werden" -#: src/cp.c:619 src/cp.c:1070 src/install.c:403 src/install.c:846 -#: src/install.c:938 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:401 -#: src/mv.c:457 +#: 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 #, c-format msgid "target %s is not a directory" -msgstr "angegebenes Ziel %s ist kein Verzeichnis" +msgstr "das angegebene Ziel %s ist kein Verzeichnis" -#: src/cp.c:730 +#: src/cp.c:728 #, c-format msgid "with --parents, the destination must be a directory" msgstr "mit --parents muss das Ziel ein Verzeichnis sein" -#: src/cp.c:1063 src/install.c:839 src/ln.c:511 src/mv.c:394 +#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395 #, c-format msgid "multiple target directories specified" msgstr "mehrere Zielverzeichnisse angegeben" -#: src/cp.c:1108 +#: src/cp.c:1110 #, c-format msgid "cannot make both hard and symbolic links" msgstr "" -"Gleichzeitiges Erzeugen harter und symbolischer Verknüpfung nicht möglich." +"Gleichzeitiges Erzeugen harter und symbolischer Verknüpfung ist nicht möglich" -#: src/cp.c:1115 src/mv.c:464 +#: src/cp.c:1117 src/mv.c:466 #, 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:1121 +#: src/cp.c:1123 #, c-format msgid "--reflink can be used only with --sparse=auto" msgstr "--reflink kann nur zusammen mit --sparse=auto verwendet werden" -#: src/cp.c:1129 src/install.c:899 src/ln.c:582 src/mv.c:472 +#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474 msgid "backup type" msgstr "Typ der Sicherung" -#: src/cp.c:1154 +#: src/cp.c:1156 #, c-format msgid "cannot preserve security context without an SELinux-enabled kernel" -msgstr "kann Sicherheitskontext nicht ohne einen SELinux-Kernel erhalten" +msgstr "" +"das Beibehalten des Sicherheitskontextes ist ohne einen Kernel mit\n" +"Unterstützung für SELinux nicht möglich" -#: src/cp.c:1160 +#: src/cp.c:1162 #, c-format msgid "cannot preserve extended attributes, cp is built without xattr support" msgstr "" -"kann erweiterte Attribute nicht erhalten, „cp“ wurde ohne Unterstützung für " -"xattr gebaut" +"erweiterte Attribute können nicht beibehalten werden, da „cp“ ohne\n" +"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 msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:529 +#: src/csplit.c:531 #, c-format msgid "input disappeared" msgstr "Eingabe ist verschwunden" -#: src/csplit.c:658 src/csplit.c:669 +#: src/csplit.c:660 src/csplit.c:671 #, c-format msgid "%s: line number out of range" msgstr "%s: Zeilennummer nicht im zulässigen Bereich" -#: src/csplit.c:698 +#: src/csplit.c:700 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: Zeilennummer nicht im zulässigen Bereich" -#: src/csplit.c:701 src/csplit.c:750 +#: src/csplit.c:703 src/csplit.c:752 #, c-format msgid " on repetition %s\n" msgstr " bei Wiederholung %s\n" -#: src/csplit.c:744 +#: src/csplit.c:746 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: keine Entsprechung gefunden" -#: src/csplit.c:808 src/csplit.c:848 src/nl.c:359 src/tac.c:274 +#: src/csplit.c:810 src/csplit.c:850 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:981 +#: src/csplit.c:983 #, c-format msgid "write error for %s" msgstr "Fehler beim Schreiben von %s" -#: src/csplit.c:1057 +#: src/csplit.c:1059 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: ganze Zahl nach Trenner erwartet" -#: src/csplit.c:1073 +#: src/csplit.c:1075 #, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: „}“ ist bei Angabe einer Wiederholungsanzahl erforderlich" -#: src/csplit.c:1083 +#: src/csplit.c:1085 #, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: zwischen „{“ and „}“ ist eine Ganzzahl erforderlich" -#: src/csplit.c:1110 +#: src/csplit.c:1112 #, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: schließender Trenner „%c“ fehlt" -#: src/csplit.c:1127 +#: src/csplit.c:1129 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: ungültiger regulärer Ausdruck: %s" -#: src/csplit.c:1160 +#: src/csplit.c:1162 #, c-format msgid "%s: invalid pattern" msgstr "%s: ungültiges Muster" -#: src/csplit.c:1163 +#: src/csplit.c:1165 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: Zeilennummer muss größer als Null sein" -#: src/csplit.c:1169 +#: src/csplit.c:1171 #, 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:1175 +#: src/csplit.c:1177 #, 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:1253 +#: src/csplit.c:1255 #, c-format msgid "missing conversion specifier in suffix" -msgstr "Angabe zur Wandlung fehlt im Suffix" +msgstr "Angabe zur Wandlung fehlt im Anhang" -#: src/csplit.c:1259 +#: src/csplit.c:1261 #, c-format msgid "invalid conversion specifier in suffix: %c" -msgstr "Angabe zur Wandlung fehlt im Suffix: %c" +msgstr "Angabe zur Wandlung fehlt im Anhang: %c" -#: src/csplit.c:1262 +#: src/csplit.c:1264 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" -msgstr "Ungültige Angabe zur Wandlung im Suffix: \\%.3o" +msgstr "Ungültige Angabe zur Wandlung im Anhang: \\%.3o" -#: src/csplit.c:1267 +#: src/csplit.c:1269 #, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "ungültige Kennungen in der Umwandlungsangabe: %%%c%c" -#: src/csplit.c:1284 +#: src/csplit.c:1286 #, c-format msgid "too many %% conversion specifications in suffix" -msgstr "Zu viele Angaben zur %%-Wandlung im Suffix" +msgstr "Zu viele Angaben zur %%-Wandlung im Anhang" -#: src/csplit.c:1298 +#: src/csplit.c:1300 #, c-format msgid "missing %% conversion specification in suffix" -msgstr "Fehlende %%-Angabe zur Wandlung im Suffix" +msgstr "Fehlende %%-Angabe zur Wandlung im Anhang" -#: src/csplit.c:1345 +#: src/csplit.c:1347 #, c-format msgid "%s: invalid number" msgstr "%s: ungültige Zahl" -#: src/csplit.c:1449 +#: src/csplit.c:1451 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Aufruf: %s [OPTION]... DATEI MUSTER...\n" -#: src/csplit.c:1453 +#: src/csplit.c:1455 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" -"\n" msgstr "" "Teile der DATEI getrennt durch MUSTER in die Dateien „xx01“, „xx02“, ...\n" -"ausgeben und die Bytezahl für jedes Teil auf Standardausgabe.\n" +"schreiben und die Bytezahl für jedes Teil auf Standardausgabe ausgeben.\n" "\n" -#: src/csplit.c:1461 +#: src/csplit.c:1462 #, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2647,7 +2650,7 @@ 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:1466 +#: src/csplit.c:1467 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" @@ -2659,7 +2662,7 @@ msgstr "" "ausgeben\n" " -z, --elide-empty-files leere Ausgabedateien löschen\n" -#: src/csplit.c:1473 +#: src/csplit.c:1474 msgid "" "\n" "Read standard input if FILE is -. Each PATTERN may be:\n" @@ -2667,7 +2670,7 @@ msgstr "" "\n" "Standardeingabe lesen, wenn DATEI „-“ ist. Jedes MUSTER kann sein:\n" -#: src/csplit.c:1477 +#: src/csplit.c:1478 msgid "" "\n" " INTEGER copy up to but not including specified line number\n" @@ -2695,7 +2698,7 @@ msgstr "" msgid "David M. Ihnat" msgstr "David M. Ihnat" -#: src/cut.c:64 +#: 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" @@ -2705,12 +2708,11 @@ msgid "Usage: %s OPTION... [FILE]...\n" msgstr "Aufruf: %s OPTION... [DATEI]...\n" #: src/cut.c:193 -msgid "" -"Print selected parts of lines from each FILE to standard output.\n" -"\n" -msgstr "Ausgewählte Teile jeder DATEI auf Standardausgabe ausgeben.\n" +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:200 +#: src/cut.c:199 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2720,20 +2722,20 @@ msgstr "" " -c, --characters=LISTE nur diese Zeichen ausgeben\n" " -d, --delimiter=TRENN TRENN anstelle von Tabulator als Trenner benutzen\n" -#: src/cut.c:205 +#: src/cut.c:204 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=LIST nur diese Felder ausgeben; außerdem jede Zeile\n" +" -f, --fields=LISTE nur diese Felder ausgeben; außerdem jede Zeile\n" " ausgeben, die kein Trennzeichen enthält, außer " "die\n" " Option -s ist gegeben\n" " -n (wird ignoriert)\n" -#: src/cut.c:211 +#: src/cut.c:210 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" @@ -2741,7 +2743,7 @@ msgstr "" " --complement das Komplement der Menge der gewählten Bytes,\n" " Zeichen oder Felder bilden\n" -#: src/cut.c:215 +#: src/cut.c:214 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2752,7 +2754,7 @@ msgstr "" " --ouput-delimiter=ZKETTE ZKETTE als Ausgabetrennzeichen benutzen;\n" " Voreinstellung ist das Eingabetrennzeichen\n" -#: src/cut.c:222 +#: src/cut.c:221 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2760,12 +2762,12 @@ msgid "" "in the same order that it is read, and is written exactly once.\n" msgstr "" "\n" -"Benutzen Sie genau eins aus -b, -c oder -f. Jede LISTE besteht aus einem\n" +"Benutzen Sie genau eins aus -b, -c oder -f. Jede LISTE besteht aus einem\n" "oder mehreren kommagetrennten Bereichen. Die gewählte Eingabe wird in\n" "derselben Reihenfolge geschrieben, wie sie gelesen wird, und genau einmal\n" "geschrieben.\n" -#: src/cut.c:228 +#: src/cut.c:227 msgid "" "Each range is one of:\n" "\n" @@ -2785,41 +2787,42 @@ msgstr "" "\n" "Ohne DATEI, oder wenn DATEI „-“ ist, die Standardeingabe lesen.\n" -#: src/cut.c:368 src/cut.c:489 -msgid "invalid byte or field list" -msgstr "Ungültige Byte‐ oder Feldliste" +#: src/cut.c:367 src/cut.c:493 +msgid "invalid byte, character or field list" +msgstr "Ungültige Byte‐, Zeichen- oder Feldliste" -#: src/cut.c:385 +#: src/cut.c:387 msgid "invalid range with no endpoint: -" msgstr "ungültiger Bereich ohne Endpunkt: -" -#: src/cut.c:399 +#: src/cut.c:403 msgid "invalid decreasing range" msgstr "ungültiger abnehmender Bereich" -#: src/cut.c:478 +#: src/cut.c:482 #, c-format msgid "byte offset %s is too large" msgstr "Byte‐Offset %s ist zu groß" -#: src/cut.c:481 +#: src/cut.c:485 #, c-format msgid "field number %s is too large" msgstr "Feldnummer %s ist zu groß" -#: src/cut.c:789 src/cut.c:797 +#: src/cut.c:795 src/cut.c:803 msgid "only one type of list may be specified" msgstr "Nur ein Typ einer Liste kann angegeben werden" -#: src/cut.c:806 +#: src/cut.c:812 src/numfmt.c:1408 +#, c-format msgid "the delimiter must be a single character" msgstr "Trenner muss ein einzelnes Zeichen sein" -#: src/cut.c:841 +#: src/cut.c:847 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:844 +#: src/cut.c:850 msgid "an input delimiter may be specified only when operating on fields" msgstr "" "Ein Eingabe-Begrenzer darf nur angegeben werden, wenn auf Feldern gearbeitet " @@ -2827,7 +2830,7 @@ msgstr "" # CHECKIT → no \t, please # 2001-08-10 08:03:34 CEST -ke- -#: src/cut.c:848 +#: src/cut.c:854 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2835,11 +2838,11 @@ msgstr "" "Nicht‐getrennte Zeilen zu unterdrücken ist nur sinnvoll,\n" "\twenn auf Feldern operiert wird." -#: src/cut.c:864 +#: src/cut.c:870 msgid "missing list of fields" msgstr "Liste der Felder fehlt" -#: src/cut.c:866 +#: src/cut.c:872 msgid "missing list of positions" msgstr "Liste der Positionen fehlt" @@ -2853,9 +2856,13 @@ msgstr "" " oder: %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 "" +"Anzeige der aktuellen Zeit im angegebenen FORMAT oder Setzen der " +"Systemzeit.\n" + +#: src/date.c:134 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" " -I[TIMESPEC], --iso-8601[=TIMESPEC] output date/time in ISO 8601 format.\n" @@ -2863,9 +2870,6 @@ msgid "" " 'hours', 'minutes', 'seconds', or 'ns' for date\n" " and time to the indicated precision.\n" msgstr "" -"Anzeige der aktuellen Zeit im angegebenen FORMAT oder Setzen der " -"Systemzeit.\n" -"\n" " -d, --date=ZEICHENKETTE Zeit gemäß ZEICHENKETTE anzeigen, nicht „jetzt“\n" " -f, --file=DATEI wie --date für jede Zeile in DATEI\n" " -I[ZEITSPEZ], --iso-8601[=ZEITSPEZ] gibt Datum/Zeit im ISO 8601 Format " @@ -2875,7 +2879,7 @@ msgstr "" "Datum\n" " und Zeit mit der angegebenen Präzision.\n" -#: src/date.c:138 +#: src/date.c:142 msgid "" " -r, --reference=FILE display the last modification time of FILE\n" " -R, --rfc-2822 output date and time in RFC 2822 format.\n" @@ -2885,7 +2889,7 @@ msgstr "" " -R, --rfc-2822 Datumsausgabe gemäß RFC‐2822 anzeigen\n" " Beispiel: Tue, 27 Feb 2007 16:03:44 +0100\n" -#: src/date.c:143 +#: src/date.c:147 msgid "" " --rfc-3339=TIMESPEC output date and time in RFC 3339 format.\n" " TIMESPEC='date', 'seconds', or 'ns' for\n" @@ -2904,7 +2908,7 @@ msgstr "" " -s, --set=ZEICHENKETTE Zeit gemäß ZEICHENKETTE setzen\n" " -u, --utc, --universal Coordinated Universal Time anzeigen oder setzen\n" -#: src/date.c:154 +#: src/date.c:158 msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" @@ -2918,7 +2922,7 @@ msgstr "" " %% wörtliches %\n" " %a abgekürzter Name des Wochentags der Lokale (z. B. Son)\n" -#: src/date.c:161 +#: src/date.c:165 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2930,7 +2934,7 @@ msgstr "" " %B voller Monatsname der Lokale, variable Länge (z. B. November)\n" " %c Datum und Zeit der Lokale (z. B. Fr 18 Nov 2005 15:05:42 CET)\n" -#: src/date.c:167 +#: src/date.c:171 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2942,7 +2946,7 @@ msgstr "" " %D amerikanisches Datumsformat; dasselbe wie %m/%d/%y\n" " %e Tag des Monats, mit Leerzeichen aufgefüllt; wie %_d\n" -#: src/date.c:173 +#: src/date.c:177 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -2953,7 +2957,7 @@ msgstr "" " %G Jahr der ISO‐Wochennummer (siehe %V); normalerweise nur mit %V " "benutzt\n" -#: src/date.c:178 +#: src/date.c:182 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2965,7 +2969,7 @@ msgstr "" " %I Stunde (01..12)\n" " %j Tag des Jahres (001..366)\n" -#: src/date.c:184 +#: src/date.c:188 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -2977,7 +2981,7 @@ msgstr "" " %m Monat (01..12)\n" " %M Minute (00..59)\n" -#: src/date.c:190 +#: src/date.c:194 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2995,7 +2999,7 @@ msgstr "" " %R Zeit im 24‐Stunden‐Format; dasselbe wie %H:%M\n" " %s Sekunden seit „1970-01-01 00:00:00 UTC“\n" -#: src/date.c:199 +#: src/date.c:203 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -3007,7 +3011,7 @@ msgstr "" " %T Zeit; dasselbe wie %H:%M:%S\n" " %u Tag der Woche (1..7); 1 steht für Montag\n" -#: src/date.c:205 +#: src/date.c:209 msgid "" " %U week number of year, with Sunday as first day of week (00..53)\n" " %V ISO week number, with Monday as first day of week (01..53)\n" @@ -3020,7 +3024,7 @@ msgstr "" " %w Tag der Woche (0..6); 0 steht für Sonntag\n" " %W Wochennummer des Jahres mit Montag als erstem Tag der Woche (00..53)\n" -#: src/date.c:211 +#: src/date.c:215 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -3032,7 +3036,7 @@ msgstr "" " %y die letzten zwei Ziffern des Jahres (00..99)\n" " %Y Jahr\n" -#: src/date.c:217 +#: src/date.c:221 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -3052,7 +3056,7 @@ msgstr "" "\n" "Die Vorgabe ist, numerische Felder mit Nullen aufzufüllen.\n" -#: src/date.c:226 +#: src/date.c:230 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -3070,7 +3074,7 @@ msgstr "" " ^ wenn möglich Großbuchstaben benutzen\n" " # wenn möglich Groß- und Kleinbuchstaben vertauschen\n" -#: src/date.c:235 +#: src/date.c:239 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -3084,7 +3088,7 @@ msgstr "" "E: die alternative Repräsentation der Locale verwenden (so vorhanden)\n" "O: die alternativen numerischen Symbole der Locale verwenden (so vorhanden)\n" -#: src/date.c:242 +#: src/date.c:246 msgid "" "\n" "Examples:\n" @@ -3111,38 +3115,38 @@ msgstr "" "USA\n" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" -#: src/date.c:275 src/dd.c:2193 src/head.c:838 src/md5sum.c:477 -#: src/md5sum.c:798 src/od.c:863 src/od.c:1914 src/pr.c:1176 src/pr.c:1372 -#: src/pr.c:1494 src/stty.c:842 src/tac.c:563 src/tail.c:343 src/tee.c:126 +#: 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 #, c-format msgid "standard input" msgstr "Standardeingabe" -#: src/date.c:303 src/date.c:523 +#: src/date.c:307 src/date.c:527 #, c-format msgid "invalid date %s" msgstr "ungültiges Datum %s" -#: src/date.c:414 src/date.c:448 +#: src/date.c:418 src/date.c:452 #, c-format msgid "multiple output formats specified" msgstr "mehrere Ausgabeformate angegeben" -#: src/date.c:426 +#: src/date.c:430 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "" "Die angegebenen Optionen zur Datumsanzeige schließen sich gegenseitig aus" -#: src/date.c:433 +#: src/date.c:437 #, c-format msgid "the options to print and set the time may not be used together" msgstr "" "Die Optionen zum Anzeigen und Setzen der Zeit können\n" "nicht zugleich verwendet werden." -#: src/date.c:454 +#: src/date.c:458 #, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -3154,23 +3158,23 @@ msgstr "" "Argument, das keine Option ist, eine Formatzeichenkette sein, die mit „+“\n" "beginnt." -#: src/date.c:531 +#: src/date.c:535 #, c-format msgid "cannot set date" msgstr "das Datum kann nicht gesetzt werden" -#: src/date.c:554 src/du.c:360 +#: src/date.c:558 src/du.c:371 #, c-format msgid "time %s is out of range" msgstr "Zeit %s außerhalb des zulässigen Bereichs" #. This is a proper name. See the gettext manual, section Names. -#: src/dd.c:44 src/factor.c:43 src/rm.c:41 src/tail.c:69 src/touch.c:41 +#: 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 "Paul Rubin" -#: src/dd.c:517 +#: src/dd.c:521 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3179,7 +3183,7 @@ msgstr "" "Aufruf: %s [OPERAND...]\n" " oder: %s OPTION\n" -#: src/dd.c:522 +#: src/dd.c:526 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -3199,7 +3203,7 @@ msgstr "" " count=N nur N Eingabeblöcke kopieren\n" " ibs=BYTES Lesen von BYTES Bytes auf einmal (Voreinstellung: 512)\n" -#: src/dd.c:531 +#: src/dd.c:535 msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -3208,7 +3212,8 @@ msgid "" " oflag=FLAGS write as per the comma separated symbol list\n" " seek=N skip N obs-sized blocks at start of output\n" " skip=N skip N ibs-sized blocks at start of input\n" -" status=noxfer suppress transfer statistics\n" +" status=WHICH WHICH info to suppress outputting to stderr;\n" +" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" msgstr "" " if=DATEI aus DATEI statt von der Standardeingabe lesen\n" " iflag=FLAGS anhand der kommagetrennten Symbolliste lesen\n" @@ -3217,12 +3222,15 @@ msgstr "" " oflag=FLAGS anhand der kommagetrennten Symbolliste schreiben\n" " 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=noxfer Übertragungsstatistik unterdrücken\n" +" status=WELCHE WELCHE Info nicht auf dem Standardfehlerkanal ausgegeben\n" +" werden soll. „noxfer“ unterdrückt die " +"übertragungsstatistik\n" +" und „none“ alle Ausgaben\n" -#: src/dd.c:541 +#: src/dd.c:546 msgid "" "\n" -"BLOCKS and BYTES may be followed by the following multiplicative suffixes:\n" +"N and BYTES may be followed by the following multiplicative suffixes:\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, and so on for T, P, E, Z, Y.\n" "\n" @@ -3230,14 +3238,14 @@ msgid "" "\n" msgstr "" "\n" -"BLÖCKE und BYTES können folgende multiplikative Endungen tragen:\n" +"N und BYTES können folgende multiplikative Endungen tragen:\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, und so weiter für T, P, E, Z, Y.\n" "\n" "Jedes CONV‐Symbol kann sein:\n" "\n" -#: src/dd.c:550 +#: src/dd.c:555 msgid "" " ascii from EBCDIC to ASCII\n" " ebcdic from ASCII to EBCDIC\n" @@ -3264,7 +3272,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:563 +#: src/dd.c:568 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3273,14 +3281,14 @@ msgid "" " fdatasync physically write output file data before finishing\n" " fsync likewise, but also write metadata\n" msgstr "" -" excl scheitert wenn das auszugebende Byte bereits existiert\n" +" excl scheitert, wenn das auszugebende Byte bereits existiert\n" " nocreat Die Ausgabedatei wird nicht erzeugt\n" " notrunc Die Ausgabedatei wird nicht abgeschnitten\n" " noerror nach Lesefehlern fortfahren\n" " fdatasync vor Beendigung Ausgabedatendatei physisch schreiben\n" " fsync genauso, zusätzlich auch die Metadaten\n" -#: src/dd.c:571 +#: src/dd.c:576 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3293,75 +3301,75 @@ msgstr "" "\n" " append Anfügemodus (nur für Ausgabe sinnvoll; conv=notrunc empfohlen)\n" -#: src/dd.c:578 +#: src/dd.c:583 msgid " cio use concurrent I/O for data\n" msgstr " cio nebenläufige Ein‐/Ausgabe für Daten benutzen\n" -#: src/dd.c:580 +#: src/dd.c:585 msgid " direct use direct I/O for data\n" msgstr " direct direkte Ein‐/Ausgabe für Daten benutzen\n" -#: src/dd.c:582 +#: src/dd.c:587 msgid " directory fail unless a directory\n" msgstr " directory abbrechen, wenn kein Verzeichnis\n" -#: src/dd.c:584 +#: src/dd.c:589 msgid " dsync use synchronized I/O for data\n" msgstr " dsync synchronisierte Ein‐/Ausgabe für Daten benutzen\n" -#: src/dd.c:586 +#: src/dd.c:591 msgid " sync likewise, but also for metadata\n" msgstr " sync genauso, aber auch für Metadaten\n" -#: src/dd.c:587 +#: src/dd.c:592 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr " fullblock volle Eingabeblöcke ansammeln (nur iflag)\n" -#: src/dd.c:590 +#: src/dd.c:595 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock nicht‐blockierende Ein‐/Ausgabe benutzen\n" -#: src/dd.c:592 +#: src/dd.c:597 msgid " noatime do not update access time\n" msgstr " noatime die Zugriffszeit nicht erneuern\n" -#: src/dd.c:595 +#: src/dd.c:600 msgid " nocache discard cached data\n" msgstr " nocache zwischengespeicherte Daten verwerfen\n" -#: src/dd.c:598 +#: src/dd.c:603 msgid " noctty do not assign controlling terminal from file\n" msgstr " noctty das kontrollierende Terminal nicht von Datei zuweisen\n" -#: src/dd.c:601 +#: src/dd.c:606 msgid " nofollow do not follow symlinks\n" msgstr " nofollow symbolischen Verknüpfungen nicht folgen\n" -#: src/dd.c:603 +#: src/dd.c:608 msgid " nolinks fail if multiply-linked\n" msgstr " nolinks abbrechen, wenn mehrfach verlinkt\n" -#: src/dd.c:605 +#: src/dd.c:610 msgid " binary use binary I/O for data\n" msgstr " binary binäre Ein‐/Ausgabe benutzen\n" -#: src/dd.c:607 +#: src/dd.c:612 msgid " text use text I/O for data\n" msgstr " text textuelle Ein‐/Ausgabe benutzen\n" -#: src/dd.c:609 +#: src/dd.c:614 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:612 +#: src/dd.c:617 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:615 +#: src/dd.c:620 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:620 +#: src/dd.c:625 #, c-format msgid "" "\n" @@ -3391,7 +3399,7 @@ msgstr "" "Optionen sind:\n" "\n" -#: src/dd.c:676 +#: src/dd.c:683 #, c-format msgid "" "%<PRIuMAX>+%<PRIuMAX> records in\n" @@ -3400,21 +3408,21 @@ msgstr "" "%<PRIuMAX>+%<PRIuMAX> Datensätze ein\n" "%<PRIuMAX>+%<PRIuMAX> Datensätze aus\n" -#: src/dd.c:682 +#: src/dd.c:689 #, 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:694 +#: src/dd.c:701 #, 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:712 +#: src/dd.c:720 msgid "Infinity B" msgstr "unendlich B" @@ -3428,83 +3436,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:725 +#: src/dd.c:733 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g s, %s/s\n" -#: src/dd.c:804 +#: src/dd.c:812 #, c-format msgid "closing input file %s" msgstr "Schließen der Eingabedatei %s" -#: src/dd.c:811 +#: src/dd.c:819 #, c-format msgid "closing output file %s" msgstr "Schließen der Ausgabedatei %s" -#: src/dd.c:1014 +#: src/dd.c:1022 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "O_DIRECT konnte nicht abgeschaltet werden: %s" -#: src/dd.c:1085 src/dd.c:1934 +#: src/dd.c:1093 src/dd.c:1942 #, c-format msgid "writing to %s" msgstr "Schreiben in %s" -#: src/dd.c:1199 src/dd.c:1253 +#: src/dd.c:1207 src/dd.c:1261 #, c-format msgid "unrecognized operand %s" msgstr "nicht erkannter Operand %s" -#: src/dd.c:1210 +#: src/dd.c:1218 msgid "invalid conversion" msgstr "ungültige Konvertierung" -#: src/dd.c:1213 src/dd.c:1289 +#: src/dd.c:1221 src/dd.c:1297 msgid "invalid input flag" msgstr "ungültiges Eingabeflag" -#: src/dd.c:1216 src/dd.c:1283 src/dd.c:1295 +#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303 msgid "invalid output flag" msgstr "ungültiges Ausgabeflag" -#: src/dd.c:1219 +#: src/dd.c:1227 msgid "invalid status flag" msgstr "ungültiges Statusflag" -#: src/dd.c:1258 src/truncate.c:312 +#: src/dd.c:1266 src/truncate.c:310 #, c-format msgid "invalid number %s" msgstr "ungültige Zahl %s" -#: src/dd.c:1340 +#: src/dd.c:1348 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "{ascii,ebcdic,ibm} sind in keiner Weise kombinierbar" -#: src/dd.c:1342 +#: src/dd.c:1350 #, c-format msgid "cannot combine block and unblock" msgstr "block und unblock sind nicht kombinierbar" -#: src/dd.c:1344 +#: src/dd.c:1352 #, c-format msgid "cannot combine lcase and ucase" msgstr "lcase und ucase sind nicht kombinierbar" -#: src/dd.c:1346 +#: src/dd.c:1354 #, c-format msgid "cannot combine excl and nocreat" msgstr "excl und nocreat sind nicht kombinierbar" -#: src/dd.c:1349 +#: src/dd.c:1357 #, c-format msgid "cannot combine direct and nocache" msgstr "direct und nocache sind nicht kombinierbar" -#: src/dd.c:1506 +#: src/dd.c:1514 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3513,72 +3521,72 @@ 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:1593 +#: src/dd.c:1601 #, c-format msgid "%s: cannot skip" -msgstr "%s: kann nicht überspringen" +msgstr "%s: überspringen nicht möglich" -#: src/dd.c:1595 src/dd.c:1614 src/dd.c:1675 +#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683 #, c-format msgid "%s: cannot seek" -msgstr "%s: kann nicht zu Position springen" +msgstr "%s: das Springen zu Position ist nicht möglich" -#: src/dd.c:1655 +#: src/dd.c:1663 #, c-format msgid "offset overflow while reading file %s" -msgstr "Offset‐Overflow beim Lesen der Datei %s" +msgstr "Offset‐Überlauf beim Lesen der Datei %s" -#: src/dd.c:1667 +#: src/dd.c:1675 #, c-format msgid "warning: invalid file offset after failed read" msgstr "Warnung: ungültiger Datei‐Offset nach fehlgeschlagenem Lesen" -#: src/dd.c:1671 +#: src/dd.c:1679 #, c-format msgid "cannot work around kernel bug after all" -msgstr "kann nun einmal nicht um Kernel‐Fehler herumarbeiten" +msgstr "ein Kernel‐Fehler kann nun mal nicht umgangen werden" -#: src/dd.c:1814 +#: src/dd.c:1822 #, c-format msgid "setting flags for %s" -msgstr "setze Flags für %s" +msgstr "die Flags für %s werden gesetzt" -#: src/dd.c:1867 +#: 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:1881 +#: 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:1914 +#: src/dd.c:1922 #, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: es ist nicht möglich, zum angegebenen Offset zu springen" -#: src/dd.c:2125 src/dd.c:2258 +#: src/dd.c:2133 #, c-format -msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" -msgstr "abschneiden bei %<PRIuMAX> Bytes in Ausgabedatei %s scheiterte" +msgid "failed to truncate to %<PRIdMAX> bytes in output file %s" +msgstr "das Abschneiden bei %<PRIdMAX> Bytes in Ausgabedatei %s scheiterte" -#: src/dd.c:2138 +#: src/dd.c:2146 #, c-format msgid "fdatasync failed for %s" -msgstr "fdatasync für %s fehlgeschlagen" +msgstr "fdatasync für %s ist fehlgeschlagen" -#: src/dd.c:2148 +#: src/dd.c:2156 #, c-format msgid "fsync failed for %s" -msgstr "fsync für %s fehlgeschlagen" +msgstr "fsync für %s ist fehlgeschlagen" -#: src/dd.c:2199 src/dd.c:2228 +#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165 #, c-format -msgid "opening %s" -msgstr "öffne %s" +msgid "failed to open %s" +msgstr "konnte %s nicht öffnen" -#: src/dd.c:2237 +#: src/dd.c:2246 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) " @@ -3587,84 +3595,105 @@ msgstr "" "Offset zu groß: kann nicht auf eine Länge von seek=%<PRIuMAX> (%lu‐Byte‐) " "Blöcke abschneiden" -#: src/dd.c:2274 src/dd.c:2280 +#: src/dd.c:2267 +#, 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 #, 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:54 src/expr.c:153 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:39 src/sleep.c:35 src/sort.c:66 +#: 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 msgid "Paul Eggert" msgstr "Paul Eggert" -#: src/df.c:140 +#: src/df.c:172 msgid "Filesystem" msgstr "Dateisystem" -#: src/df.c:141 +#: src/df.c:175 msgid "Type" msgstr "Typ" -#: src/df.c:142 +#: src/df.c:178 src/df.c:542 msgid "blocks" msgstr "Blöcke" -#: src/df.c:142 -msgid "Inodes" -msgstr "Inodes" - -#: src/df.c:142 -msgid "Size" -msgstr "Größe" - -#: src/df.c:143 +#: src/df.c:181 msgid "Used" msgstr "Benutzt" -#: src/df.c:143 -msgid "IUsed" -msgstr "IBenutzt" - -#: src/df.c:144 +#: src/df.c:184 msgid "Available" msgstr "Verfügbar" -#: src/df.c:144 -msgid "IFree" -msgstr "IFrei" - -#: src/df.c:144 -msgid "Avail" -msgstr "Verf." - -#: src/df.c:145 +#: src/df.c:187 msgid "Use%" msgstr "Verw%" -#: src/df.c:145 +#: src/df.c:190 +msgid "Inodes" +msgstr "Inodes" + +#: src/df.c:193 +msgid "IUsed" +msgstr "IBenutzt" + +#: src/df.c:196 +msgid "IFree" +msgstr "IFrei" + +#: src/df.c:199 msgid "IUse%" msgstr "IUse%" -#: src/df.c:145 +#: src/df.c:202 +msgid "Mounted on" +msgstr "Eingehängt auf" + +#: src/df.c:383 +#, c-format +msgid "option --output: field '%s' unknown" +msgstr "Option --output: Feld „%s“ ist unbekannt" + +#: src/df.c:390 +#, c-format +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 +msgid "Size" +msgstr "Größe" + +#: src/df.c:414 src/df.c:451 +msgid "Avail" +msgstr "Verf." + +#: src/df.c:474 msgid "Capacity" msgstr "Kapazität" -#: src/df.c:146 -msgid "Mounted on" -msgstr "Eingehängt auf" +#. 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 +#, c-format +msgid "%s-%s" +msgstr "%s-%s" -#: src/df.c:847 +#: src/df.c:1210 msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" -"\n" msgstr "" "Anzeige von Informationen über die Dateisysteme, auf dem sich jede\n" -"DATEI befindet, oder alle Dateisysteme als Standardvorgabe.\n" +"DATEI befindet, oder alle Dateisysteme, welches der Normalfall ist.\n" "\n" -#: src/df.c:855 +#: src/df.c:1217 msgid "" " -a, --all include dummy file systems\n" " -B, --block-size=SIZE scale sizes by SIZE before printing them. E.g.,\n" @@ -3676,13 +3705,18 @@ msgid "" " -H, --si likewise, but use powers of 1000 not 1024\n" msgstr "" " -a, --all unechte Dateisysteme mit einschließen\n" -" -B, --block-size=GRÖßE GRÖßE große Blöcke verwenden\n" +" -B, --block-size=GRÖßE Größen in Einheiten von GRÖßE ausgeben, z.B. " +"werden\n" +" bei „-BM“ die Grössen in Einheiten von " +"1.048.576\n" +" 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 " "2G)\n" " -H, --si genauso, aber mit 1000 statt 1024 als Teiler\n" -#: src/df.c:865 +#: src/df.c:1227 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3698,8 +3732,11 @@ msgstr "" "Benutzungsinformation\n" " aufrufen (Standardvorgabe)\n" -#: src/df.c:872 +#: src/df.c:1234 msgid "" +" --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" +" or print all fields if FIELD_LIST is " +"omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" " -t, --type=TYPE limit listing to file systems of type TYPE\n" @@ -3707,6 +3744,9 @@ msgid "" " -x, --exclude-type=TYPE limit listing to file systems not of type TYPE\n" " -v (ignored)\n" msgstr "" +" --output[=FELDLISTE] Das durch FELDLISTE definierte Ausgabeformat\n" +" verwenden, oder alle Felder ausgeben, wenn\n" +" FELDLISTE nicht angegeben wird.\n" " -P, --portability POSIX‐Ausgabeformat verwenden\n" " --sync „sync“ vor Erlangen der Benutzungsinformation\n" " aufrufen\n" @@ -3716,20 +3756,45 @@ msgstr "" "begrenzen.\n" " -v (ignoriert)\n" -#: src/df.c:1027 +#: src/df.c:1248 +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" +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" + +#: src/df.c:1285 +#, 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 #, c-format msgid "file system type %s both selected and excluded" msgstr "Dateisystemtyp %s ist sowohl ausgewählt als auch ausgeschlossen" -#: src/df.c:1075 +#: src/df.c:1500 msgid "Warning: " msgstr "Warnung: " -#: src/df.c:1077 src/stat.c:795 +#: src/df.c:1502 src/stat.c:814 msgid "cannot read table of mounted file systems" msgstr "Lesen der Tabelle eingehängter Dateisysteme nicht möglich" -#: src/df.c:1107 +#: src/df.c:1539 #, c-format msgid "no file systems processed" msgstr "keine Dateisysteme bearbeitet" @@ -3776,12 +3841,12 @@ msgstr "" #: src/dircolors.c:286 #, c-format msgid "%s:%lu: invalid line; missing second token" -msgstr "%s: %lu: ungültige Zeile, zweites Token fehlt" +msgstr "%s: %lu: ungültige Zeile; das zweite Token fehlt" #: src/dircolors.c:358 #, c-format msgid "%s:%lu: unrecognized keyword %s" -msgstr "%s:%lu: unbekanntes Schlüsselwort %s" +msgstr "%s:%lu: das Schlüsselwort %s ist unbekannt" #: src/dircolors.c:359 msgid "<internal>" @@ -3843,7 +3908,7 @@ msgstr "" " %s dir1/str dir2/str -> \"dir1\" gefolgt von \"dir2\"\n" " %s stdio.h -> \".\"\n" -#: src/du.c:260 src/sort.c:390 src/wc.c:112 +#: src/du.c:270 src/sort.c:394 src/wc.c:112 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3852,16 +3917,16 @@ msgstr "" "Aufruf: %s [OPTION]... [DATEI]...\n" " oder: %s [OPTION]... --files0-from=DL\n" -#: src/du.c:264 -msgid "" -"Summarize disk usage of each FILE, recursively for directories.\n" -"\n" +#: src/du.c:274 +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:271 +#: src/du.c:280 msgid "" +" -0, --null end each output line with 0 byte rather than " +"newline\n" " -a, --all write counts for all files, not just directories\n" " --apparent-size print apparent sizes, rather than disk usage; " "although\n" @@ -3869,16 +3934,19 @@ msgid "" " larger due to holes in ('sparse') files, internal\n" " fragmentation, indirect blocks, and the like\n" msgstr "" -" -a, --all Zählung für jede Datei ausgeben, nicht nur für\n" -" Verzeichnisse\n" -" --apparent-size die sichtbare Größe ausgeben statt " -"Platzverbrauchs;\n" -" diese ist meist kleiner, kann aber auch größer\n" -" sein durch Löcher in („sparse“‐)Dateien, " -"interne\n" -" Fragmentierung, indirekte Blöcke und ähnliches\n" +" -0, --null jede Zeile mit einem Nullbyte statt eines\n" +" Zeilenumbruchs beenden\n" +" -a, --all Zählung für jede Datei ausgeben, nicht nur für\n" +" Verzeichnisse\n" +" --apparent-size die sichtbare Größe ausgeben statt des\n" +" Platzverbrauchs; diese ist meist kleiner, kann\n" +" aber auch größer sein durch Löcher in " +"(„sparse“‐)\n" +" Dateien, interne Fragmentierung, indirekte " +"Blöcke\n" +" und ähnliches\n" -#: src/du.c:279 +#: src/du.c:289 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" @@ -3887,15 +3955,26 @@ msgid "" " -c, --total produce a grand total\n" " -D, --dereference-args dereference only symlinks that are listed on the\n" " command line\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 "" -" -B, --block-size=GRÖßE GRÖßE große Blöcke verwenden. Siehe GRÖßE unten.\n" -" -b, --bytes äquivalent zu „--apparent-size --block-size=1“\n" -" -c, --total Gesamtsumme erzeugen\n" -" -D, --dereference-args nur symbolische Verknüpfungen dereferenzieren, " +" -B, --block-size=GRÖßE GRÖßE große Blöcke verwenden. Siehe GRÖßE unten.\n" +" -b, --bytes äquivalent zu „--apparent-size --block-size=1“\n" +" -c, --total Gesamtsumme erzeugen\n" +" -D, --dereference-args nur symbolische Verknüpfungen dereferenzieren, " "die\n" -" an der Kommandozeile angegeben wurden\n" +" an der Kommandozeile angegeben wurden\n" +" -d, --max-depth=N die Gesamtgröße für ein Verzeichnis (oder, mit\n" +" --all, einer Datei) ausgeben, aber nur dann, " +"wenn\n" +" es bzw. sie N oder weniger Ebenen unterhalb des\n" +" Kommando-zeilenarguments ist; --max-depth=0 ist\n" +" gleichbedeutend mit --summarize\n" -#: src/du.c:288 +#: src/du.c:302 msgid "" " --files0-from=F summarize disk usage of the NUL-terminated file\n" " names specified in file F;\n" @@ -3903,75 +3982,50 @@ msgid "" " -H equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" --si like -h, but use powers of 1000 not 1024\n" msgstr "" -" --files0-from=D zusammengefasste Größe der Dateien aus der Datei " -"DL\n" -" ausgeben (null‐terminierte Dateinamen);\n" -" ist D „-“, so wird aus der Standardeingabe " +" --files0-from=D aufsummierten Platzverbrauch der in der Datei D\n" +" angegebenen null-terminierten Dateinamen " +"ausgeben.\n" +" ist D „-“, so wird aus der Standardeingabe " "gelesen\n" -" -H wie --dereference-args (-D)\n" -" -h, --human-readable Größen in menschenlesbarem Format (z.B. 1K 234M " +" -H wie --dereference-args (-D)\n" +" -h, --human-readable Größen in menschenlesbarem Format (z.B. 1K 234M " "2G)\n" -" ausgeben\n" -" --si wie „-h“, aber mit 1000 statt 1024 als Teiler\n" +" ausgeben\n" -#: src/du.c:297 +#: src/du.c:310 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 Wie „--block-size=1K“\n" -" -l, --count-links Größe mehrfach zählen, wenn durch harte\n" -" Verknüpfungen verbunden\n" -" -m Wie „--block-size=1M“\n" +" -k Wie „--block-size=1K“\n" +" -L, --dereference alle symbolischen Verknüpfungen dereferenzieren\n" +" -l, --count-links Größe mehrfach zählen, wenn durch harte\n" +" Verknüpfungen verbunden\n" +" -m Wie „--block-size=1M“\n" -#: src/du.c:302 +#: src/du.c:316 msgid "" -" -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " "default)\n" -" -0, --null end each output line with 0 byte rather than " -"newline\n" " -S, --separate-dirs 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 alle symbolischen Verknüpfungen dereferenzieren\n" -" -P, --no-dereference keinen symb. Verknüpfungen folgen " +" -P, --no-dereference keinen symbolischen Verknüpfungen folgen " "(Voreinstellung)\n" -" -0, --null jede Ausgabezeile mit 0 beenden anstelle des\n" -" Zeilenendezeichens\n" -" -S, --separate-dirs Größe von Unterverzeichnissen nicht\n" -" mitzählen\n" -" -s, --summarize nur Summe für jedes Argument anzeigen\n" - -#: src/du.c:309 -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" +" -S, --separate-dirs Größe von Unterverzeichnissen nicht\n" +" mitzählen\n" +" --si wie -h, verwendet aber Potenzen von 1000 statt " +"1024\n" +" -s, --summarize nur Summe für jedes Argument anzeigen\n" -#: src/du.c:318 +#: src/du.c:322 msgid "" +" -t, --threshold=SIZE exclude entries smaller than SIZE if positive,\n" +" or entries greater than SIZE if negative\n" " --time show time of the last modification of any file in " "the\n" " directory, or any of its subdirectories\n" @@ -3981,76 +4035,90 @@ msgid "" " full-iso, long-iso, iso, +FORMAT\n" " FORMAT is interpreted like 'date'\n" msgstr "" -" --time Zeit der letzten Änderung irgendeiner Datei im\n" -" Verzeichnis oder einem seiner " -"Unterverzeichnisse\n" -" anzeigen\n" -" --time=WORT Zeit als WORT anstelle der Änderungszeit " -"anzeigen:\n" -" atime, access, use, ctime or status\n" -" --time-style=STIL Zeit in bestimmten Stil anzeigen:\n" -" full-iso, long-iso, iso, +FORMAT\n" -" FORMAT wird wie bei „date“ interpretiert\n" - -#: src/du.c:375 -#, fuzzy +" -t, --threshold=GRÖẞE Einträge kleiner als GRÖẞE ausschließen wenn " +"positiv,\n" +" oder größer als GRÖẞE wenn negativ\n" +" --time Zeit der letzten Änderung irgendeiner Datei im\n" +" Verzeichnis oder einem seiner Unterverzeichnisse\n" +" anzeigen\n" +" --time=WORT Zeit als WORT anstelle der Änderungszeit anzeigen:\n" +" atime, access, use, ctime or status\n" +" --time-style=STIL Zeit in Stil STIL anzeigen:\n" +" full-iso, long-iso, iso, +FORMAT\n" +" FORMAT wird wie bei „date“ interpretiert\n" + +#: src/du.c:333 +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=DATEI Dateien ausschließen, die einem Muster in DATEI\n" +" entsprechen\n" +" --exclude=MUSTER Dateien ausschließen, die MUSTER entsprechen\n" +" -x, --one-file-system Verzeichnisse auf anderen Dateisystemen " +"überspringen\n" + +#: src/du.c:386 msgid "Infinity" -msgstr "unendlich B" +msgstr "Unendlich" + +#: src/du.c:507 +#, c-format +msgid "mount point %s already traversed" +msgstr "Einhängungspunkt %s wurde bereits durchlaufen" -#: src/du.c:600 +#: src/du.c:624 #, c-format msgid "fts_read failed: %s" msgstr "fts_read schlug fehl: %s" -#: src/du.c:724 +#: src/du.c:780 #, c-format msgid "invalid maximum depth %s" msgstr "Ungültige maximale Tiefe %s" -#: src/du.c:817 +#: src/du.c:809 +#, c-format +msgid "invalid --threshold argument '-0'" +msgstr "ungültiges Argument „-0“ Option --threshold" + +#: src/du.c:887 #, 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:824 +#: src/du.c:894 #, 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:830 +#: src/du.c:900 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "Warnung: Zusammenfassen widerspricht --max-depth=%lu" -#: src/du.c:896 src/sort.c:4479 src/wc.c:668 +#: src/du.c:966 src/sort.c:4533 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:949 src/md5sum.c:587 src/od.c:903 src/tac.c:239 src/tac.c:350 -#: src/tac.c:506 src/tac.c:586 src/wc.c:733 +#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 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:963 src/sort.c:4508 src/wc.c:747 +#: src/du.c:1040 src/sort.c:4562 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:980 src/du.c:988 src/wc.c:760 src/wc.c:768 +#: src/du.c:1057 src/du.c:1065 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:1007 src/head.c:149 src/head.c:262 src/head.c:334 src/head.c:538 -#: src/head.c:620 src/head.c:692 src/head.c:750 src/head.c:774 src/tail.c:412 -#: src/tail.c:500 src/tail.c:549 src/tail.c:642 src/tail.c:770 src/tail.c:818 -#: src/tail.c:855 src/tail.c:1782 src/tail.c:1812 src/uniq.c:395 -#, c-format -msgid "error reading %s" -msgstr "Fehler beim Lesen von %s" - -#: src/du.c:1010 src/ls.c:2649 src/wc.c:791 +#: src/du.c:1088 src/ls.c:2649 src/wc.c:791 msgid "total" msgstr "insgesamt" @@ -4154,40 +4222,40 @@ msgid "Usage: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n" msgstr "Aufruf: %s [OPTION]... [-] [NAME=WERT]... [BEFEHL [ARG]...]\n" #: src/env.c:55 +msgid "Set each NAME to VALUE in the environment and run COMMAND.\n" +msgstr "Jeden NAMEn in der Umgebung auf WERT setzen und BEFEHL ausführen.\n" + +#: src/env.c:61 msgid "" -"Set each NAME to VALUE in the environment and run COMMAND.\n" -"\n" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with 0 byte rather than newline\n" " -u, --unset=NAME remove variable from the environment\n" msgstr "" -"Jeden NAMEn in der Umgebung auf WERT setzen und BEFEHL ausführen.\n" -"\n" " -i, --ignore-environment mit leerer Umgebung beginnen\n" -" -0, --null jede Zeile mit einem Nullbyte statt eines " -"Zeilen-/n vorschubs beenden/n -u, --" -"unset=NAME Variable aus der Umgebung entfernen\n" +" -0, --null jede Zeile mit einem Nullbyte anstatt eines\n" +" Zeilenvorschubs beenden\n" +" -u, --unset=NAME Variable aus der Umgebung entfernen\n" -#: src/env.c:64 +#: src/env.c:68 msgid "" "\n" "A mere - implies -i. If no COMMAND, print the resulting environment.\n" msgstr "" "\n" -"Ein einzelnes „-“ steht für -i. Wenn kein BEFEHL angegeben ist, wird die\n" +"Ein einzelnes „-“ steht für -i. Wenn kein BEFEHL angegeben ist, wird die\n" "resultierende Umgebung ausgegeben.\n" -#: src/env.c:120 +#: src/env.c:124 #, c-format msgid "cannot unset %s" msgstr "%s kann nicht entfernt werden" -#: src/env.c:131 +#: src/env.c:135 #, c-format msgid "cannot set %s" msgstr "%s kann nicht gesetzt werden" -#: src/env.c:148 +#: src/env.c:152 #, c-format msgid "cannot specify --null (-0) with command" msgstr "--null (-0) kann nicht zusammen mit einem Befehl angegeben werden" @@ -4196,14 +4264,13 @@ msgstr "--null (-0) kann nicht zusammen mit einem Befehl angegeben werden" msgid "" "Convert tabs in each FILE to spaces, writing to standard output.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" "Tabulatoren in jeder DATEI in Leerzeichen wandeln, auf Standardausgabe\n" "schreiben. Wurde keine DATEI angegeben, oder ist DATEI „-“, die\n" "Standardeingabe lesen.\n" "\n" -#: src/expand.c:115 +#: src/expand.c:114 msgid "" " -i, --initial do not convert tabs after non blanks\n" " -t, --tabs=NUMBER have tabs NUMBER characters apart, not 8\n" @@ -4212,34 +4279,34 @@ msgstr "" " (non blanks) wandeln\n" " -t, --tabs=ZAHL Tabulator alle ZAHL Zeichen annehmen, nicht 8\n" -#: src/expand.c:119 +#: src/expand.c:118 msgid "" " -t, --tabs=LIST use comma separated list of explicit tab positions\n" msgstr "" " -t, --tabs=LISTE durch Komma getrennte LISTE von Tabulatorpositionen\n" " annehmen\n" -#: src/expand.c:172 src/unexpand.c:191 +#: src/expand.c:171 src/unexpand.c:190 #, c-format msgid "tab stop is too large %s" msgstr "Tabulatorstopp ist zu groß %s" -#: src/expand.c:180 src/unexpand.c:199 +#: src/expand.c:179 src/unexpand.c:198 #, c-format msgid "tab size contains invalid character(s): %s" msgstr "Tabulatorgröße enthält (ein) ungültige(s) Zeichen: %s" -#: src/expand.c:206 src/unexpand.c:225 +#: src/expand.c:205 src/unexpand.c:224 #, c-format msgid "tab size cannot be 0" msgstr "Tabulatorgröße muss ungleich 0 sein" -#: src/expand.c:208 src/unexpand.c:227 +#: src/expand.c:207 src/unexpand.c:226 #, c-format msgid "tab sizes must be ascending" msgstr "Tabulatorgrößen müssen aufsteigend sein" -#: src/expand.c:326 src/expand.c:345 src/unexpand.c:374 src/unexpand.c:419 +#: 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 "Eingabezeile zu lang" @@ -4403,12 +4470,12 @@ msgstr "Fehler bei Suche mit regulären Ausdrücken" msgid "non-integer argument" msgstr "Argument, das keine Zahl ist" -#: src/expr.c:793 src/truncate.c:316 +#: src/expr.c:793 src/truncate.c:314 #, c-format msgid "division by zero" msgstr "Teilung durch Null" -#: src/expr.c:887 src/sort.c:2029 +#: src/expr.c:887 src/sort.c:2044 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "setzen Sie LC_ALL=C, um das Problem zu umgehen" @@ -4418,25 +4485,32 @@ msgstr "setzen Sie LC_ALL=C, um das Problem zu umgehen" msgid "the strings compared were %s and %s" msgstr "die verglichenen Zeichenketten waren %s und %s" -#: src/factor.c:449 -msgid "using arbitrary-precision arithmetic" -msgstr "verwende Arithmetik mit beliebiger Genauigkeit" +#. This is a proper name. See the gettext manual, section Names. +#: src/factor.c:111 +msgid "Niels Moller" +msgstr "Niels Möller" -#: src/factor.c:460 -msgid "using single-precision arithmetic" -msgstr "verwende Arithmetik mit einfacher Genauigkeit" +#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459 +#, c-format +msgid "Lucas prime test failure. This should not happen" +msgstr "Lucas-Primzahlentest scheiterte. Dies sollte nicht vorkommen" -#: src/factor.c:465 src/od.c:1640 src/od.c:1709 +#: src/factor.c:2092 #, c-format -msgid "%s is too large" -msgstr "%s ist zu groß" +msgid "squfof queue overflow" +msgstr "Überlauf der Warteschlange in squfof" -#: src/factor.c:469 +#: src/factor.c:2419 #, c-format msgid "%s is not a valid positive integer" msgstr "%s ist keine gültige positive ganze Zahl" -#: src/factor.c:494 +#: src/factor.c:2442 src/od.c:1646 src/od.c:1715 +#, c-format +msgid "%s is too large" +msgstr "%s ist zu groß" + +#: src/factor.c:2454 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4445,7 +4519,7 @@ msgstr "" "Aufruf: %s [ZAHL...]\n" " oder: %s OPTION\n" -#: src/factor.c:499 +#: src/factor.c:2459 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" @@ -4473,24 +4547,22 @@ msgid "cannot stat current directory (now %s)" msgstr "Das aktuelle Verzeichnis (jetzt %s) ist nicht erreichbar" #. This is a proper name. See the gettext manual, section Names. -#: src/fmt.c:37 +#: src/fmt.c:38 msgid "Ross Paterson" msgstr "Ross Paterson" -#: src/fmt.c:269 +#: src/fmt.c:270 #, c-format msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n" msgstr "Aufruf: %s [-BREITE] [OPTION]... [DATEI]...\n" -#: src/fmt.c:270 +#: 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" -"\n" msgstr "" "Jeden Absatz in DATEI(en) formatieren, auf Standardausgabe schreiben.\n" "Die Option -BREITE ist eine abgekürzte Form von --width=BREITE.\n" -"\n" #: src/fmt.c:278 msgid "" @@ -4505,8 +4577,9 @@ msgstr "" " dabei ZKETTE jeder neuen Zeile voranstellen\n" " -s, --split-only lange Zeilen umbrechen, aber nicht auffüllen\n" -#: src/fmt.c:285 -#, fuzzy, c-format +# no-c-format +#: src/fmt.c:287 +#, 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" @@ -4517,8 +4590,9 @@ msgstr "" " -u, --uniform-spacing ein Leerzeichen zwischen Wörtern, zwei nach " "Sätzen\n" " -w, --width=BREITE maximale Zeilenbreite (Vorgabe: 75 Spalten)\n" +" -g, --goal=BREITE Zielbreite (Vorgabe sind 93% der Breite)\n" -#: src/fmt.c:357 +#: src/fmt.c:359 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -4527,7 +4601,7 @@ msgstr "" "ungültige Option -- %c; -BREITE wird nur erkannt, wenn es die erste\n" "Option ist; benutzen Sie stattdessen -W N" -#: src/fmt.c:403 src/fmt.c:414 +#: src/fmt.c:405 src/fmt.c:416 #, c-format msgid "invalid width: %s" msgstr "ungültige Zeilenbreite: %s" @@ -4536,13 +4610,11 @@ msgstr "ungültige Zeilenbreite: %s" msgid "" "Wrap input lines in each FILE (standard input by default), writing to\n" "standard output.\n" -"\n" msgstr "" "Eingabezeilen jeder DATEI umbrechen (Vorgabe: Standardeingabe),\n" "das Ergebnis auf Standardausgabe ausgeben.\n" -"\n" -#: src/fold.c:78 +#: src/fold.c:77 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4552,13 +4624,13 @@ msgstr "" " -s, --spaces Umbruch bei Leerzeichen\n" " -w, --width=BREITE BREITE Spalten anstatt 80 benutzen\n" -#: src/fold.c:289 src/pr.c:836 +#: src/fold.c:288 src/pr.c:832 #, c-format 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:75 +#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 #: src/truncate.c:37 msgid "Padraig Brady" msgstr "Pádraig Brady" @@ -4576,17 +4648,17 @@ msgstr "" "Plattformabhängige Grenzen ausgeben in für Shell-Scripte nützlichem Format.\n" "\n" -#: src/group-list.c:69 src/id.c:345 src/setuidgid.c:184 +#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184 #, 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:350 +#: src/group-list.c:74 src/id.c:370 #, c-format msgid "failed to get groups for the current process" msgstr "konnte Gruppen für den aktuellen Prozess nicht ermitteln" -#: src/group-list.c:104 +#: src/group-list.c:114 #, c-format msgid "cannot find name for group ID %lu" msgstr "Es ist kein Name zur Gruppen‐ID %lu zu finden" @@ -4632,14 +4704,12 @@ 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" -"\n" msgstr "" "Die ersten 10 Zeilen jeder DATEI auf Standardausgabe ausgeben.\n" "Mit mehr als einer DATEI, vorab den Dateinamen ausgeben.\n" -"Ohne DATEI oder DATEI ist -, Standardeingabe lesen.\n" -"\n" +"Ohne DATEI oder wenn DATEI „-“ ist, Standardeingabe lesen.\n" -#: src/head.c:118 +#: src/head.c:117 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -4656,7 +4726,7 @@ msgstr "" " mit führendem „-“, alle außer den letzten\n" " K Zeilen jeder Datei\n" -#: src/head.c:126 +#: src/head.c:125 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4664,7 +4734,7 @@ msgstr "" " -q, --quiet, --silent nie Dateinamen vorab ausgeben\n" " -v, --verbose immer Dateinamen vorab ausgeben\n" -#: src/head.c:132 +#: src/head.c:131 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -4676,58 +4746,58 @@ 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:152 -#, c-format -msgid "error writing %s" -msgstr "Fehler beim Schreiben von %s" - -#: src/head.c:155 +#: src/head.c:154 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: Datei zu stark geschrumpft" -#: src/head.c:228 src/head.c:1044 +#: src/head.c:227 src/head.c:1051 #, c-format msgid "%s: number of bytes is too large" msgstr "%s: Anzahl Bytes ist zu groß" -#: src/head.c:441 +#: 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:613 src/head.c:684 src/tail.c:450 +#: src/head.c:612 src/head.c:691 src/tail.c:449 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: es ist nicht möglich, zum Offset %s zu springen" -#: src/head.c:791 +#: 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 #, c-format msgid "cannot reposition file pointer for %s" msgstr "es ist nicht möglich, den Datei‐Zeiger für %s neu zu positionieren" -#: src/head.c:878 +#: src/head.c:885 #, 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:879 +#: src/head.c:886 msgid "number of lines" msgstr "Anzahl Zeilen" -#: src/head.c:879 +#: src/head.c:886 msgid "number of bytes" msgstr "Anzahl Bytes" -#: src/head.c:886 src/tail.c:1947 +#: src/head.c:893 src/tail.c:1947 msgid "invalid number of lines" msgstr "ungültige Anzahl von Zeilen" -#: src/head.c:887 src/tail.c:1948 +#: src/head.c:894 src/tail.c:1948 msgid "invalid number of bytes" msgstr "ungültige Anzahl von Bytes" -#: src/head.c:974 src/head.c:1032 +#: src/head.c:981 src/head.c:1039 #, c-format msgid "invalid trailing option -- %c" msgstr "ungültige folgende Option -- %c" @@ -4759,13 +4829,14 @@ msgstr "" #: src/hostname.c:94 #, c-format msgid "cannot set name to %s" -msgstr "kann Namen nicht auf %s setzen" +msgstr "der Name kann nicht auf %s gesetzt werden" #: src/hostname.c:97 #, c-format msgid "cannot set hostname; this system lacks the functionality" msgstr "" -"Rechnername kann nicht gesetzt werden; diesem System fehlt diese Möglichkeit." +"der Rechnername kann nicht gesetzt werden; diesem System fehlt diese " +"Möglichkeit" #: src/hostname.c:105 #, c-format @@ -4823,12 +4894,14 @@ msgstr "--context (-Z) funktioniert nur auf einem Kernel mit SELinux" #: src/id.c:175 #, c-format msgid "cannot print security context when user specified" -msgstr "kann Sicherheitskontext nicht ausgeben, wenn Nutzer angegeben ist" +msgstr "" +"der Sicherheitskontext kann nicht ausgegeben werden, wenn ein Nutzer " +"angegeben wurde" #: src/id.c:178 #, c-format msgid "cannot print \"only\" of more than one choice" -msgstr "kann nicht „nur“ für Mehrfachauswahl anzeigen" +msgstr "eine eingeschränkte Ausgabe ist bei Mehrfachauswahl nicht möglich" #: src/id.c:185 #, c-format @@ -4839,93 +4912,93 @@ msgstr "" #: src/id.c:199 #, c-format msgid "can't get process context" -msgstr "kann Prozesskontext nicht ermitteln" +msgstr "der Prozesskontext kann nicht ermittelt werden" #: src/id.c:224 #, c-format msgid "cannot get effective UID" msgstr "die effektive UID kann nicht ermittelt werden" -#: src/id.c:289 +#: src/id.c:311 #, c-format -msgid "cannot find name for user ID %lu" -msgstr "Es ist kein Name zur Nutzer‐ID %lu zu finden" +msgid "cannot find name for user ID %s" +msgstr "Für Benutzerkennung %s kann kein Name gefunden werden" -#: src/id.c:309 +#: src/id.c:329 #, c-format -msgid "uid=%lu" -msgstr "uid=%lu" +msgid "uid=%s" +msgstr "uid=%s" -#: src/id.c:314 +#: src/id.c:334 #, c-format -msgid " gid=%lu" -msgstr " gid=%lu" +msgid " gid=%s" +msgstr " gid=%s" -#: src/id.c:321 +#: src/id.c:341 #, c-format -msgid " euid=%lu" -msgstr " euid=%lu" +msgid " euid=%s" +msgstr " euid=%s" -#: src/id.c:329 +#: src/id.c:349 #, c-format -msgid " egid=%lu" -msgstr " egid=%lu" +msgid " egid=%s" +msgstr " egid=%s" -#: src/id.c:357 +#: src/id.c:377 msgid " groups=" msgstr " Gruppen=" -#: src/id.c:373 +#: src/id.c:393 #, c-format msgid " context=%s" msgstr " Kontext=%s" -#: src/install.c:372 +#: src/install.c:373 #, c-format msgid "warning: %s: failed to change context to %s" -msgstr "Warnung: %s: konnte Kontext nicht zu %s wechseln" +msgstr "Warnung: %s: der Kontext konnte nicht auf %s geändert werden" -#: src/install.c:413 +#: src/install.c:414 #, c-format msgid "creating directory %s" -msgstr "Verzeichnis %s angelegt" +msgstr "Verzeichnis %s wird angelegt" -#: src/install.c:481 +#: src/install.c:482 #, c-format msgid "cannot change ownership of %s" -msgstr "kann Eigentümer von %s nicht ändern" +msgstr "der Eigentümer von %s kann nicht geändert werden" -#: src/install.c:505 +#: src/install.c:506 #, c-format msgid "cannot set time stamps for %s" msgstr "Setzen der Zeitstempel für %s nicht möglich" -#: src/install.c:526 src/split.c:412 src/timeout.c:387 +#: src/install.c:527 src/split.c:426 src/timeout.c:439 #, c-format msgid "fork system call failed" msgstr "Systemruf fork fehlgeschlagen" -#: src/install.c:530 +#: src/install.c:531 #, c-format msgid "cannot run %s" -msgstr "kann %s nicht ausführen" +msgstr "%s kann nicht ausgeführt werden" -#: src/install.c:534 +#: src/install.c:535 #, c-format msgid "waiting for strip" -msgstr "Warte auf strip" +msgstr "Es wird auf strip gewartet" -#: src/install.c:536 +#: src/install.c:537 #, c-format msgid "strip process terminated abnormally" msgstr "strip‐Prozess beendete sich auf ungute Weise" -#: src/install.c:557 +#: src/install.c:558 #, c-format msgid "invalid user %s" msgstr "Ungültiger Anwender %s" -#: src/install.c:593 +#: src/install.c:594 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -4938,7 +5011,7 @@ msgstr "" " oder: %s [OPTION]... -t=VERZEICHNIS QUELLE...\n" " oder: %s [OPTION]... -d=VERZEICHNIS...\n" -#: src/install.c:600 +#: src/install.c:601 msgid "" "\n" "This install program copies files (often just compiled) into destination\n" @@ -4950,12 +5023,11 @@ msgid "" "In the first three forms, copy SOURCE to DEST or multiple SOURCE(s) to\n" "the existing DIRECTORY, while setting permission modes and owner/group.\n" "In the 4th form, create all components of the given DIRECTORY(ies).\n" -"\n" msgstr "" "\n" "Dieses „install“-Programm kopiert Dateien (oftmals frisch kompiliert) an\n" "Zielorte Ihrer Wahl. Wenn Sie fertig konfektionierte Pakete auf einem\n" -"GNU/Linux-System benutzen möchten, sollten Sie stattdessen ein Werkzeug zus\n" +"GNU/Linux-System benutzen möchten, sollten Sie stattdessen ein Werkzeug zur\n" "Paketverwaltung wie yum(1) oder apt-get(1) benutzen.\n" "\n" "In den drei ersten Formaten wird QUELLE nach ZIEL kopiert, oder mehrere\n" @@ -5022,7 +5094,7 @@ msgstr "" " QUELL‐Dateien auf entsprechende Zieldateien\n" " -s, --strip Symboltabellen bereinigen\n" " --strip-program=PRG Programm zum Bereinigen von ausführbaren Dateien\n" -" -S, --suffix=SUFFIX alternative Erweiterung für Sicherungsdateien\n" +" -S, --suffix=ENDUNG alternative Endung für Sicherungsdateien\n" " -t, --target-directory=VERZ alle QUELL‐Argumente in VERZ kopieren\n" " -T, --no-target-directory ZIEL als normale Datei behandeln\n" " -v, --verbose den Namen jedes Verzeichnisses bei Erzeugung " @@ -5038,60 +5110,60 @@ msgstr "" " -Z, --context=KONTEXT SELinux-Sicherheitskontext von Dateien u. Verz. " "setzen\n" -#: src/install.c:858 +#: src/install.c:859 #, 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:868 +#: 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:885 +#: src/install.c:886 #, 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:888 +#: src/install.c:889 #, c-format msgid "target directory not allowed when installing a directory" msgstr "" "Zielverzeichnis darf nicht bei Installation von Verzeichnissen benutzt werden" -#: src/install.c:892 +#: src/install.c:893 #, c-format msgid "cannot force target context to %s and preserve it" -msgstr "kann Ziel-Kontext %s nicht erzwingen und erhalten" +msgstr "der Ziel-Kontext von %s kann nicht erzwungen und beibehalten werden" -#: src/install.c:946 src/mkdir.c:202 src/stdbuf.c:327 +#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326 #, c-format msgid "invalid mode %s" msgstr "Ungültiger Modus %s" -#: src/install.c:953 +#: src/install.c:954 #, 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:958 +#: src/install.c:959 #, 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:965 +#: src/install.c:966 #, 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:971 +#: src/install.c:972 #, c-format msgid "" "the --compare (-C) option is ignored when you specify a mode with non-" @@ -5101,7 +5173,7 @@ msgstr "" "Rechten" #. This is a proper name. See the gettext manual, section Names. -#: src/join.c:40 src/sort.c:65 +#: src/join.c:40 src/sort.c:66 msgid "Mike Haertel" msgstr "Mike Haertel" @@ -5201,8 +5273,8 @@ msgstr "" #: src/join.c:403 #, c-format -msgid "%s:%ju: is not sorted: %.*s" -msgstr "%s:%ju: ist nicht sortiert: %.*s" +msgid "%s:%<PRIuMAX>: is not sorted: %.*s" +msgstr "%s:%<PRIuMAX>: ist nicht sortiert: %.*s" #: src/join.c:840 src/join.c:1038 #, c-format @@ -5229,12 +5301,12 @@ msgstr "inkompatible Verschmelzungsfelder: %lu, %lu" msgid "conflicting empty-field replacement strings" msgstr "einander widersprechende Leerfeld‐Ersetzungszeichenketten" -#: src/join.c:1101 src/sort.c:4414 +#: src/join.c:1101 src/sort.c:4468 #, c-format msgid "multi-character tab %s" msgstr "Multi-Zeichen-Tabulator %s" -#: src/join.c:1105 src/sort.c:4419 +#: src/join.c:1105 src/sort.c:4473 #, c-format msgid "incompatible tabs" msgstr "inkompatible Tabulatoren" @@ -5256,14 +5328,12 @@ msgstr "" " oder: %s -t [SIGNAL]...\n" #: src/kill.c:82 -msgid "" -"Send signals to processes, or list signals.\n" -"\n" +msgid "Send signals to processes, or list signals.\n" msgstr "" "Signale an Prozesse senden oder Signale auflisten.\n" "\n" -#: src/kill.c:89 +#: src/kill.c:88 msgid "" " -s, --signal=SIGNAL, -SIGNAL\n" " specify the name or number of the signal to be sent\n" @@ -5275,7 +5345,7 @@ msgstr "" " -l, --list Signalnamen auflisten oder von oder zu Nummern umwandeln\n" " -t, --table Liste mit Informationen zu den Signalen\n" -#: src/kill.c:97 +#: src/kill.c:96 msgid "" "\n" "SIGNAL may be a signal name like 'HUP', or a signal number like '1',\n" @@ -5290,32 +5360,32 @@ msgstr "" "von\n" "Prozessen.\n" -#: src/kill.c:206 +#: src/kill.c:205 #, c-format msgid "%s: invalid process id" msgstr "%s: ungültige Prozess‐ID" -#: src/kill.c:260 +#: src/kill.c:259 #, c-format msgid "invalid option -- %c" msgstr "ungültige Option -- %c" -#: src/kill.c:269 +#: src/kill.c:268 #, c-format msgid "%s: multiple signals specified" msgstr "%s: mehrere Signale angegeben" -#: src/kill.c:283 +#: src/kill.c:282 #, c-format msgid "multiple -l or -t options specified" msgstr "mehrfach die Optionen -l oder -t angegeben" -#: src/kill.c:300 +#: src/kill.c:299 #, c-format msgid "cannot combine signal with -l or -t" msgstr "es ist nicht möglich, Signale mit -l oder -t zu kombinieren" -#: src/kill.c:306 +#: src/kill.c:305 #, c-format msgid "no process ID specified" msgstr "keine Prozess‐ID angegeben" @@ -5374,7 +5444,7 @@ msgstr "%s: harte Verknüpfung für Verzeichnisse nicht erlaubt" #: src/ln.c:255 #, c-format msgid "%s: cannot overwrite directory" -msgstr "%s: Überschreiben des Verzeichnisses nicht möglich" +msgstr "%s: das Überschreiben des Verzeichnisses ist nicht möglich" #: src/ln.c:260 #, c-format @@ -5384,27 +5454,27 @@ msgstr "%s: %s ersetzen? " #: src/ln.c:345 #, c-format msgid "failed to create symbolic link %s" -msgstr "Symbolische Verknüpfung %s konnte nicht angelegt werden" +msgstr "die symbolische Verknüpfung %s konnte nicht angelegt werden" #: src/ln.c:346 #, c-format msgid "failed to create symbolic link %s -> %s" -msgstr "Symbolische Verknüpfung %s -> %s konnte nicht angelegt werden" +msgstr "die symbolische Verknüpfung %s -> %s konnte nicht angelegt werden" #: src/ln.c:348 #, c-format msgid "failed to create hard link to %.0s%s" -msgstr "Harte Verknüpfung zu %.0s%s konnte nicht angelegt werden" +msgstr "Die harte Verknüpfung zu %.0s%s konnte nicht angelegt werden" #: src/ln.c:351 #, c-format msgid "failed to create hard link %s" -msgstr "Harte Verknüpfung %s konnte nicht angelegt werden" +msgstr "Die harte Verknüpfung %s konnte nicht angelegt werden" #: src/ln.c:352 #, c-format msgid "failed to create hard link %s => %s" -msgstr "Harte Verknüpfung %s => %s konnte nicht angelegt werden" +msgstr "Die harte Verknüpfung %s => %s konnte nicht angelegt werden" #: src/ln.c:374 #, c-format @@ -5429,22 +5499,21 @@ msgid "" "When creating hard links, each TARGET must exist. Symbolic links\n" "can hold arbitrary text; if later resolved, a relative link is\n" "interpreted in relation to its parent directory.\n" -"\n" msgstr "" "In der 1. Form: Eine Verknüpfung namens LINK_NAME auf ZIEL erstellen\n" "In der 2. Form: Eine Verknüpfung auf ZIEL im aktuellen Verzeichnis " "erstellen\n" "In der 3. und 4. Form: Verknüpfungen zu jedem ZIEL in VERZ erstellen\n" -"Als Standardvorgabe werde harte Verknüpfungen erstellt, für symbolische\n" +"Als Standardvorgabe werden harte Verknüpfungen erstellt, für symbolische\n" "Verknüpfungen ist die Option --symbolic anzugeben.\n" "Beim Erzeugen von harten Verknüpfungen muss jedes ZIEL existieren. Bei\n" -"symbolischen Verknüpfungen dagegen kann beliebiger Text stehen; bei " +"symbolischen Verknüpfungen kann dagegen beliebiger Text stehen; bei " "späterer\n" "Auflösung wird eine relative Verknüpfung bezogen auf ihr beinhaltendes\n" "Verzeichnis interpretiert.\n" "\n" -#: src/ln.c:395 +#: src/ln.c:394 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -5466,7 +5535,7 @@ msgstr "" " Systembeschränkungen, auch für Superuser.)\n" " -f, --force Vorhandene Ziele entfernen.\n" -#: src/ln.c:403 +#: src/ln.c:402 msgid "" " -i, --interactive prompt whether to remove destinations\n" " -L, --logical dereference TARGETs that are symbolic links\n" @@ -5489,7 +5558,7 @@ msgstr "" " -s, --symbolic symbolische statt harter Verknüpfung " "erzeugen\n" -#: src/ln.c:412 +#: src/ln.c:411 msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" " -t, --target-directory=DIRECTORY specify the DIRECTORY in which to " @@ -5498,38 +5567,25 @@ 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 normale Anhänge für Sicherungen " -"überschreiben\n" +" -S, --suffix=ENDUNG die normalerweise verwendeten Dateiendung " +"ändern\n" " -t, --target-directory=VERZ VERZeichnis angeben, in dem die " "Verknüpfungen\n" " erstellt werden sollen\n" " -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:428 -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" - -#: src/ln.c:435 +#: src/ln.c:433 #, 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" "Wird -s verwendet, werden -L und -P ignoriert. Ansonsten bestimmt die " "zuletzt\n" -"verwendete Option das Verhalten wenn die Quelle eine symbolische " +"verwendete Option das Verhalten, wenn die Quelle eine symbolische " "Verknüpfung\n" "ist. Vorgabe ist %s.\n" "\n" @@ -5601,7 +5657,7 @@ 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:1976 +#: src/ls.c:1750 src/ptx.c:1975 #, c-format msgid "invalid line width: %s" msgstr "ungültige Zeilenbreite: %s" @@ -5647,40 +5703,38 @@ msgstr "Öffnen von Verzeichnis %s nicht möglich" #: src/ls.c:2529 #, c-format msgid "cannot determine device and inode of %s" -msgstr "kann Gerät und INode von %s nicht bestimmen" +msgstr "Gerät und INode von %s können nicht bestimmt werden" #: src/ls.c:2538 #, c-format msgid "%s: not listing already-listed directory" -msgstr "%s: zeige schon angezeigtes Verzeichnis nicht an" +msgstr "%s: schon angezeigtes Verzeichnis wird nicht erneut aufgeführt" #: src/ls.c:2615 src/pwd.c:229 #, c-format msgid "reading directory %s" -msgstr "lese Verzeichnis %s" +msgstr "das Verzeichnis %s wird gelesen" #: src/ls.c:2630 #, c-format msgid "closing directory %s" -msgstr "Schließen von Verzeichnis %s" +msgstr "das Verzeichnis %s wird geschlossen" -#: src/ls.c:3301 +#: src/ls.c:3302 #, c-format msgid "cannot compare file names %s and %s" -msgstr "Kann Dateinamen %s und %s nicht vergleichen." +msgstr "Die Dateinamen %s und %s können nicht verglichen werden" #: src/ls.c:4721 msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" -"\n" msgstr "" -"Auflistung von Informationen der DATEIen (Standardvorgabe ist das momentane\n" -"Verzeichnis). Alphabetisches Sortieren der Einträge, falls weder -cftuvSUX\n" -"noch --sort angegeben wurden.\n" -"\n" +"Auflistung von Informationen über die DATEIen (Standardvorgabe ist das\n" +"momentane Verzeichnis). Alphabetisches Sortieren der Einträge, falls weder\n" +"-cftuvSUX noch --sort angegeben wurden.\n" -#: src/ls.c:4729 +#: src/ls.c:4728 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -5693,7 +5747,7 @@ msgstr "" " --author mit -l, den Urheber jeder Datei ausgeben\n" " -b, --escape nicht‐druckbare Zeichen oktale ausgeben\n" -#: src/ls.c:4735 +#: src/ls.c:4734 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them. E." "g.,\n" @@ -5719,7 +5773,7 @@ msgstr "" "nach\n" " Namen sortieren\n" -#: src/ls.c:4745 +#: src/ls.c:4744 msgid "" " -C list entries by columns\n" " --color[=WHEN] colorize the output. WHEN defaults to " @@ -5741,7 +5795,7 @@ msgstr "" " -D, --dired Ausgabe für den „dired“‐Modus im Emacs " "formatieren\n" -#: src/ls.c:4753 +#: src/ls.c:4752 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -5759,11 +5813,11 @@ msgstr "" " single-column -1, verbose -l, vertical -C\n" " --full-time wie -l --time-style=full-iso\n" -#: src/ls.c:4761 +#: src/ls.c:4760 msgid " -g like -l, but do not list owner\n" msgstr " -g wie -l, aber Eigentümer nicht auflisten\n" -#: src/ls.c:4764 +#: src/ls.c:4763 msgid "" " --group-directories-first\n" " group directories before files.\n" @@ -5775,7 +5829,7 @@ msgstr "" " kann zusammen mit Sortierung benutzt werden,\n" " doch --sort=none schaltet Gruppierung ab\n" -#: src/ls.c:4770 +#: src/ls.c:4769 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" @@ -5787,7 +5841,7 @@ msgstr "" " Format ausgeben (z. B. 1K 234M 2G)\n" " --si genauso, aber mit 1000 statt 1024 als Teiler\n" -#: src/ls.c:4776 +#: src/ls.c:4775 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5810,7 +5864,7 @@ msgstr "" " nicht auflisten (überschrieben durch -a oder -" "A)\n" -#: src/ls.c:4786 +#: src/ls.c:4785 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -5831,7 +5885,7 @@ msgstr "" " passt, nicht auflisten\n" " -k, --kibibytes benutzt 1024 Byte Blöcke\n" -#: src/ls.c:4796 +#: src/ls.c:4795 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5847,7 +5901,7 @@ msgstr "" " -m so viele Einträge wie möglich, durch Kommata\n" " getrennt, in eine Zeile packen\n" -#: src/ls.c:4804 +#: src/ls.c:4803 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. " @@ -5863,7 +5917,7 @@ msgstr "" " -o wie -l, aber ohne Gruppen‐Informationen\n" " -p, --indicator-style=slash an Verzeichnisse ein „/“ anhängen\n" -#: src/ls.c:4812 +#: src/ls.c:4811 msgid "" " -q, --hide-control-chars print ? instead of non graphic characters\n" " --show-control-chars show non graphic characters as-is (default\n" @@ -5884,7 +5938,7 @@ msgstr "" " literal, locale, shell, shell-always, c, " "escape\n" -#: src/ls.c:4821 +#: src/ls.c:4820 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -5895,7 +5949,7 @@ msgstr "" " -R, --recursive Unterverzeichnissen rekursiv ausgeben\n" " -s, --size die Größe jeder Datei in Blöcken ausgeben\n" -#: src/ls.c:4826 +#: src/ls.c:4825 msgid "" " -S sort by file size\n" " --sort=WORD sort by WORD instead of name: none -U,\n" @@ -5915,7 +5969,7 @@ msgstr "" " die angegebene Zeit als Sortierkriterium\n" " bei --sort=time verwenden\n" -#: src/ls.c:4836 +#: src/ls.c:4835 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, +FORMAT.\n" @@ -5937,7 +5991,7 @@ msgstr "" "„posix-“,\n" " ist STIL nur außerhalb der POSIX‐Locale gültig\n" -#: src/ls.c:4845 +#: src/ls.c:4844 msgid "" " -t sort by modification time, newest first\n" " -T, --tabsize=COLS assume tab stops at each COLS instead of 8\n" @@ -5946,7 +6000,7 @@ msgstr "" " -T, --tabsize=SPALTEN Tabstops statt alle 8 alle SPALTEN Zeichen " "setzen\n" -#: src/ls.c:4849 +#: src/ls.c:4848 msgid "" " -u with -lt: sort by, and show, access time\n" " with -l: show access time and sort by name\n" @@ -5964,7 +6018,7 @@ msgstr "" "innerhalb\n" " von Text\n" -#: src/ls.c:4856 +#: src/ls.c:4855 msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" @@ -5981,7 +6035,7 @@ msgstr "" "anzeigen\n" " -1 eine Datei pro Zeile auflisten\n" -#: src/ls.c:4866 +#: src/ls.c:4865 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5997,7 +6051,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:4873 +#: src/ls.c:4872 msgid "" "\n" "Exit status:\n" @@ -6026,7 +6080,7 @@ msgstr "Scott Miller" msgid "David Madore" msgstr "David Madore" -#: src/md5sum.c:162 +#: src/md5sum.c:164 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -6039,7 +6093,7 @@ msgstr "" "Ohne DATEI oder wenn DATEI „-“ ist, Standardeingabe lesen.\n" "\n" -#: src/md5sum.c:172 +#: src/md5sum.c:174 msgid "" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" @@ -6047,28 +6101,32 @@ msgstr "" " -b, --binary im Binärmodus lesen (Voreinstellung außer beim Lesen\n" " aus an eine Konsole gebundenen Standardeingabe)\n" -#: src/md5sum.c:176 +#: src/md5sum.c:178 msgid " -b, --binary read in binary mode\n" msgstr " -b, --binary im Binärmodus lesen\n" -#: src/md5sum.c:179 +#: src/md5sum.c:181 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr "" " -c, --check %s‐Prüfsummen aus DATEIen lesen und überprüfen\n" -#: src/md5sum.c:183 +#: src/md5sum.c:184 +msgid " --tag create a BSD-style checksum\n" +msgstr " --tag Prüfsummen im BSD-Stil erzeugen\n" + +#: src/md5sum.c:188 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" " -t, --text im Textmodus lesen (Voreinstellung beim Lesen\n" " aus an eine Konsole gebundene Standardeingabe)\n" -#: src/md5sum.c:187 +#: src/md5sum.c:192 msgid " -t, --text read in text mode (default)\n" msgstr " -t, --text im Textmodus lesen (Voreinstellung)\n" -#: src/md5sum.c:190 +#: src/md5sum.c:195 msgid "" "\n" "The following three options are useful only when verifying checksums:\n" @@ -6085,13 +6143,13 @@ msgstr "" " -w, --warn bei ungeeignet formatierten Prüfsummenzeilen warnen\n" "\n" -#: src/md5sum.c:198 +#: 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:203 +#: src/md5sum.c:208 #, c-format msgid "" "\n" @@ -6102,47 +6160,47 @@ msgid "" msgstr "" "\n" "Die Summen werden wie in %s beschrieben berechnet. Beim Überprüfen\n" -"sollte die Eingabe eine frühere Ausgabe dieses Programms sein. Die normale\n" +"sollte die Eingabe eine frühere Ausgabe dieses Programms sein. Die normale\n" "Arbeitsweise ist es, eine Zeile mit Prüfsumme, einem Zeichen, das den Typ\n" "anzeigt („*“ für binär, „ “ für Text), und dem Namen jeder Datei " "auszugeben.\n" -#: src/md5sum.c:502 +#: src/md5sum.c:523 #, c-format msgid "%s: too many checksum lines" msgstr "%s: zu viele Prüfsummenzeilen" -#: src/md5sum.c:526 +#: src/md5sum.c:547 #, c-format msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line" msgstr "%s: %<PRIuMAX>: nicht korrekt formatierte %s‐Prüfsummenzeile" -#: src/md5sum.c:551 +#: src/md5sum.c:572 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: FEHLSCHLAG bei open oder read\n" -#: src/md5sum.c:574 +#: src/md5sum.c:595 msgid "FAILED" msgstr "FEHLSCHLAG" -#: src/md5sum.c:576 +#: src/md5sum.c:597 msgid "OK" msgstr "OK" -#: src/md5sum.c:600 +#: src/md5sum.c:621 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "%s: keine korrekt formatierte %s‐Prüfsummenzeile gefunden" -#: src/md5sum.c:610 +#: src/md5sum.c:631 #, 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:618 +#: src/md5sum.c:639 #, c-format msgid "WARNING: %<PRIuMAX> listed file could not be read" msgid_plural "WARNING: %<PRIuMAX> listed files could not be read" @@ -6150,14 +6208,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:626 +#: src/md5sum.c:647 #, 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:704 +#: src/md5sum.c:760 +#, c-format +msgid "--tag does not support --text mode" +msgstr "--tag unterstützt nicht den --text Modus" + +#: src/md5sum.c:766 +#, 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 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" @@ -6165,23 +6233,23 @@ msgstr "" "Die Optionen --binary und --text sind bei der Kontrolle von Prüfsummen " "nutzlos" -#: src/md5sum.c:712 +#: src/md5sum.c:781 #, 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:719 +#: src/md5sum.c:788 #, 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:726 +#: src/md5sum.c:795 #, 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:733 +#: src/md5sum.c:802 #, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "" @@ -6193,14 +6261,10 @@ msgid "Usage: %s [OPTION]... DIRECTORY...\n" msgstr "Aufruf: %s [OPTION]... VERZEICHNIS...\n" #: src/mkdir.c:57 -msgid "" -"Create the DIRECTORY(ies), if they do not already exist.\n" -"\n" -msgstr "" -"Erzeugen der/des Verzeichnisse(s), wenn sie noch nicht existieren.\n" -"\n" +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:64 +#: src/mkdir.c:63 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" @@ -6216,7 +6280,7 @@ msgstr "" "Verzeichnisses\n" " auf K setzen\n" -#: src/mkdir.c:169 +#: src/mkdir.c:168 #, c-format msgid "created directory %s" msgstr "Verzeichnis %s angelegt" @@ -6227,32 +6291,30 @@ msgid "Usage: %s [OPTION]... NAME...\n" msgstr "Aufruf: %s [OPTION]... NAME...\n" #: src/mkfifo.c:52 -msgid "" -"Create named pipes (FIFOs) with the given NAMEs.\n" -"\n" +msgid "Create named pipes (FIFOs) with the given NAMEs.\n" msgstr "" "Benannte Pipes (FIFOs) mit den angegebenen NAMEn erzeugen.\n" "\n" -#: src/mkfifo.c:59 src/mknod.c:61 +#: src/mkfifo.c:58 src/mknod.c:60 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:62 +#: src/mkfifo.c:61 msgid "" " -Z, --context=CTX set the SELinux security context of each NAME to CTX\n" msgstr "" " -Z, --context=KTX den SELinux-Sicherheitskontext jedes NAME auf KTX " "setzen\n" -#: src/mkfifo.c:122 src/mknod.c:128 +#: src/mkfifo.c:121 src/mknod.c:127 #, c-format msgid "invalid mode" msgstr "ungültiger Zugriffsmodus" -#: src/mkfifo.c:127 src/mknod.c:133 +#: src/mkfifo.c:126 src/mknod.c:132 #, c-format msgid "mode must specify only file permission bits" msgstr "Der Modus darf nur Dateizugriffsrechte angeben." @@ -6263,19 +6325,17 @@ msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n" msgstr "Aufruf: %s [OPTION]... NAME TYP [MAJOR MINOR]\n" #: src/mknod.c:54 -msgid "" -"Create the special file NAME of the given TYPE.\n" -"\n" +msgid "Create the special file NAME of the given TYPE.\n" msgstr "" "Spezial‐Datei NAME vom angegebenen TYP erzeugen.\n" "\n" -#: src/mknod.c:64 +#: 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:69 +#: src/mknod.c:68 msgid "" "\n" "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n" @@ -6292,7 +6352,7 @@ msgstr "" "0\n" "beginnen, oktal; anderenfalls dezimal. TYP kann sein:\n" -#: src/mknod.c:76 +#: src/mknod.c:75 msgid "" "\n" " b create a block (buffered) special file\n" @@ -6304,42 +6364,42 @@ msgstr "" " c, u eine zeichenorienterte (ungepufferte) Spezial‐Datei anlegen\n" " p eine FIFO anlegen\n" -#: src/mknod.c:151 +#: src/mknod.c:150 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:161 +#: src/mknod.c:160 msgid "Fifos do not have major and minor device numbers." msgstr "Fifos habe keine Major‐ und Minor‐Gerätenummern." -#: src/mknod.c:177 +#: src/mknod.c:176 #, c-format msgid "block special files not supported" msgstr "Blockorientierte Spezialdateien werden nicht unterstützt" -#: src/mknod.c:186 +#: src/mknod.c:185 #, c-format msgid "character special files not supported" msgstr "Zeichenorientierte Spezialdateien werden nicht unterstützt" -#: src/mknod.c:202 +#: src/mknod.c:201 #, c-format msgid "invalid major device number %s" msgstr "Ungültige Major‐Gerätenummer %s" -#: src/mknod.c:207 +#: src/mknod.c:206 #, c-format msgid "invalid minor device number %s" msgstr "Ungültige Minor‐Gerätenummer %s" -#: src/mknod.c:212 +#: src/mknod.c:211 #, c-format msgid "invalid device %s %s" msgstr "Ungültiges Gerät %s %s" -#: src/mknod.c:226 +#: src/mknod.c:225 #, c-format msgid "invalid device type %s" msgstr "Ungültiger Gerätetyp %s" @@ -6391,7 +6451,7 @@ msgid "" " This option is implied if TEMPLATE does not end in " "X.\n" msgstr "" -" --suffix=SUFF hängt SUFF an SCHABLONE an. SUFF darf keinen\n" +" --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" @@ -6428,60 +6488,57 @@ msgstr "" "sonst\n" " das mit -p gegebene Verzeichnis; sonst /tmp (veraltet)\n" -#: src/mktemp.c:222 +#: 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:228 +#: src/mktemp.c:229 #, c-format msgid "too many templates" msgstr "zu viele Schablonen" -#: src/mktemp.c:248 +#: src/mktemp.c:249 #, c-format msgid "with --suffix, template %s must end in X" -msgstr "bei --suffix muss Schablone %s mit einem X enden" +msgstr "bei --suffix muss die Schablone %s mit einem X enden" -#: src/mktemp.c:273 src/split.c:1117 +#: src/mktemp.c:274 src/split.c:1130 #, c-format msgid "invalid suffix %s, contains directory separator" -msgstr "ungültige Endung %s, sie enthält Verzeichnistrenner" +msgstr "ungültige Endung %s, sie enthält einen Verzeichnistrenner" -#: src/mktemp.c:278 +#: src/mktemp.c:279 #, c-format msgid "too few X's in template %s" -msgstr "zu wenige Xs in Schablone %s" +msgstr "zu wenige Xs in der Schablone %s" -#: src/mktemp.c:291 +#: src/mktemp.c:292 #, c-format msgid "invalid template, %s, contains directory separator" -msgstr "ungültige Schablone, %s, enthält Verzeichnistrenner" +msgstr "ungültige Schablone, %s, sie enthält einen Verzeichnistrenner" -#: src/mktemp.c:305 +#: src/mktemp.c:306 #, 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:325 +#: src/mktemp.c:326 #, c-format msgid "failed to create directory via template %s" -msgstr "konnte Verzeichnis nicht mittels Schablone %s erstellen" +msgstr "konnte das Verzeichnis nicht mittels Schablone %s erstellen" -#: src/mktemp.c:335 +#: src/mktemp.c:336 #, c-format msgid "failed to create file via template %s" -msgstr "konnte Datei nicht mittels Schablone %s erstellen" +msgstr "konnte die Datei nicht mittels Schablone %s erstellen" -#: src/mv.c:290 -msgid "" -"Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" -"\n" +#: src/mv.c:292 +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" -"\n" -#: src/mv.c:297 +#: src/mv.c:298 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -6502,7 +6559,7 @@ msgstr "" "Wenn mehr als eine Option von -i, -f und -n angeben wird, so gilt die " "letzte.\n" -#: src/mv.c:306 +#: src/mv.c:307 msgid "" " --strip-trailing-slashes remove any trailing slashes from each " "SOURCE\n" @@ -6515,7 +6572,7 @@ msgstr "" " -S, --suffix=SUFFIX die normale Sicherungs‐Erweiterung " "überschreiben\n" -#: src/mv.c:311 +#: src/mv.c:312 msgid "" " -t, --target-directory=DIRECTORY move all SOURCE arguments into " "DIRECTORY\n" @@ -6540,54 +6597,54 @@ msgstr "Aufruf: %s [OPTION] [BEFEHL [ARGUMENT]...]\n" #, c-format msgid "" "Run COMMAND with an adjusted niceness, which affects process scheduling.\n" -"With no COMMAND, print the current niceness. Nicenesses range from\n" -"%d (most favorable scheduling) to %d (least favorable).\n" -"\n" -" -n, --adjustment=N add integer N to the niceness (default 10)\n" -msgstr "" -"BEFEHL mit festgelegter Priorität ausführen, was Zeitzuteilung beeinflusst.\n" -"Ohne BEFEHL, die aktuelle Priorität ausgeben. Die Priorität reicht dabei " -"von\n" -"%d (vorteilhafteste Zeitzuteilung) bis %d (unvorteilhafteste " +"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 "" +"BEFEHL mit festgelegter Priorität ausführen, was die Zeitzuteilung\n" +"beeinflusst. Ohne BEFEHL wird die aktuelle Priorität ausgegeben. Die " +"Priorität\n" +"reicht dabei von %d (vorteilhafteste Zeitzuteilung) bis %d " +"(unvorteilhafteste\n" "Zeitzuteilung).\n" -"\n" -" -n, --adjustment=N Priorität N erhöhen (Voreinstellung 10)\n" -#: src/nice.c:168 +#: src/nice.c:82 +msgid " -n, --adjustment=N add integer N to the niceness (default 10)\n" +msgstr " -n, --adjustment=N Priorität um N erhöhen (Voreinstellung 10)\n" + +#: src/nice.c:172 #, c-format msgid "invalid adjustment %s" msgstr "ungültiges Argument %s" -#: src/nice.c:177 +#: src/nice.c:181 #, c-format msgid "a command must be given with an adjustment" msgstr "Mit einer Priorität muss ein Befehl angegeben werden" -#: src/nice.c:184 src/nice.c:195 +#: src/nice.c:188 src/nice.c:199 #, c-format msgid "cannot get niceness" -msgstr "kann aktuelle Priorität nicht ermitteln" +msgstr "die aktuelle Priorität kann nicht ermittelt werden" -#: src/nice.c:201 +#: src/nice.c:205 #, c-format msgid "cannot set niceness" -msgstr "kann Priorität nicht setzen" +msgstr "die Priorität kann nicht gesetzt werden" #. This is a proper name. See the gettext manual, section Names. #: src/nl.c:40 msgid "Scott Bartram" msgstr "Scott Bartram" -#: src/nl.c:186 +#: src/nl.c:179 msgid "" "Write each FILE to standard output, with line numbers added.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" "Jede DATEI mit Zeilennummern nach Standardausgabe schreiben.\n" "Ohne DATEI oder wenn DATEI „-“ ist, Standardeingabe lesen.\n" -#: src/nl.c:194 +#: src/nl.c:186 msgid "" " -b, --body-numbering=STYLE use STYLE for numbering body lines\n" " -d, --section-delimiter=CC use CC for separating logical pages\n" @@ -6599,7 +6656,7 @@ msgstr "" " -f, --footer-numbering=STIL STIL benutzen, um Fußzeilen zu " "nummerieren\n" -#: src/nl.c:199 +#: src/nl.c:191 msgid "" " -h, --header-numbering=STYLE use STYLE for numbering header lines\n" " -i, --line-increment=NUMBER line number increment at each line\n" @@ -6621,7 +6678,7 @@ msgstr "" " -s, --number-separator=ZKETTE ZKETTE nach (möglicher) Zeilennummer " "einfügen\n" -#: src/nl.c:207 +#: src/nl.c:199 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" @@ -6630,7 +6687,7 @@ msgstr "" "Seite\n" " -w, --number-width=ANZAHL ANZAHL Spalten für Zeilennummern benutzen\n" -#: src/nl.c:213 +#: src/nl.c:205 msgid "" "\n" "By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC are\n" @@ -6638,12 +6695,12 @@ msgid "" "second character implies :. Type \\\\ for \\. STYLE is one of:\n" msgstr "" "\n" -"Standardeinstellung ist -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC sind\n" +"Standardeinstellung ist -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC sind\n" "zwei Begrenzungszeichen, um logische Seiten zu trennen, ein fehlendes " "zweites\n" -"Zeichen impliziert „:“. Geben Sie \\\\ für \\ ein. STIL ist einer aus:\n" +"Zeichen impliziert „:“. Geben Sie \\\\ für \\ ein. STIL ist einer aus:\n" -#: src/nl.c:219 +#: src/nl.c:211 msgid "" "\n" " a number all lines\n" @@ -6672,54 +6729,47 @@ msgstr "" " rz rechtsbündig, führende Nullen\n" "\n" -#: src/nl.c:286 +#: src/nl.c:278 #, c-format msgid "line number overflow" msgstr "Überlauf bei den Zeilennummern" -#: src/nl.c:486 +#: src/nl.c:478 #, c-format msgid "invalid header numbering style: %s" msgstr "ungültiger Stil für Kopfzeilennummerierung: %s" -#: src/nl.c:494 +#: src/nl.c:486 #, c-format msgid "invalid body numbering style: %s" msgstr "ungültiger Stil für Textkörpernummerierung: %s" -#: src/nl.c:502 +#: src/nl.c:494 #, c-format msgid "invalid footer numbering style: %s" msgstr "ungültiger Stil für Fußzeilennummerierung: %s" -#: src/nl.c:511 +#: src/nl.c:503 #, c-format msgid "invalid starting line number: %s" msgstr "ungültiger anfängliche Zeilennummer: %s" -#: src/nl.c:517 -#, c-format -msgid "WARNING: --page-increment is deprecated; use --line-increment instead" -msgstr "" -"WARNUNG: --page-increment ist veraltet; stattdessen --line-increment\n" -"benutzen" - -#: src/nl.c:524 +#: src/nl.c:512 #, c-format msgid "invalid line number increment: %s" msgstr "ungültiges Inkrement für Zeilennummer: %s" -#: src/nl.c:536 +#: src/nl.c:524 #, c-format msgid "invalid number of blank lines: %s" msgstr "ungültige Anzahl von Leerzeilen: %s" -#: src/nl.c:550 +#: src/nl.c:538 #, c-format msgid "invalid line number field width: %s" msgstr "ungültige Breite des Feldes für die Zeilennummer: %s" -#: src/nl.c:569 +#: src/nl.c:557 #, c-format msgid "invalid line numbering format: %s" msgstr "ungültiges Zeilennummerformat: %s" @@ -6771,11 +6821,6 @@ msgstr "Die Standardeingabe konnte nicht unbrauchbar gemacht werden" msgid "ignoring input" msgstr "ignoriere Eingabe" -#: src/nohup.c:163 src/nohup.c:165 -#, c-format -msgid "failed to open %s" -msgstr "konnte %s nicht öffnen" - #: src/nohup.c:175 #, c-format msgid "ignoring input and appending output to %s" @@ -6808,16 +6853,16 @@ msgid "failed to redirect standard error" msgstr "konnte Standardfehlerausgabe nicht umleiten" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:32 +#: src/nproc.c:33 msgid "Giuseppe Scrivano" msgstr "Giuseppe Scrivano" -#: src/nproc.c:56 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 +#: src/nproc.c:57 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Aufruf: %s [OPTION]...\n" -#: src/nproc.c:57 +#: src/nproc.c:58 msgid "" "Print the number of processing units available to the current process,\n" "which may be less than the number of online processors\n" @@ -6829,7 +6874,7 @@ msgstr "" "Prozessoren sein\n" "\n" -#: src/nproc.c:62 +#: src/nproc.c:63 msgid "" " --all print the number of installed processors\n" " --ignore=N if possible, exclude N processing units\n" @@ -6837,11 +6882,440 @@ msgstr "" " --all Anzahl der installierten Prozessoren ausgeben\n" " --ignore=N wenn möglich N Verarbeitungseinheiten ausschließen\n" -#: src/nproc.c:106 +#: src/nproc.c:107 #, c-format 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 +msgid "Assaf Gordon" +msgstr "Assaf Gordon" + +#: src/numfmt.c:676 +#, c-format +msgid "value too large to be converted: '%s'" +msgstr "Wert ist für Umwandlung zu groß: „%s“" + +#: src/numfmt.c:680 +#, c-format +msgid "invalid number: '%s'" +msgstr "ungültige Zahl: „%s“" + +#: src/numfmt.c:684 +#, c-format +msgid "rejecting suffix in input: '%s' (consider using --from)" +msgstr "Endung in Eingabe zurück gewiesen: „%s“ (evtl. --from verwenden)" + +#: src/numfmt.c:688 +#, c-format +msgid "invalid suffix in input: '%s'" +msgstr "ungültige Endung in Eingabe: „%s“" + +#: src/numfmt.c:692 +#, c-format +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 +#, 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 +#, c-format +msgid "invalid unit size: '%s'" +msgstr "ungültige Tabulatorgröß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 +#, c-format +msgid "Usage: %s [OPTION]... [NUMBER]...\n" +msgstr "Aufruf: %s [OPTION]... [NUMMER]...\n" + +#: src/numfmt.c:816 +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 +msgid " --debug print warnings about invalid input\n" +msgstr " --debug Warnungen bei ungültigen Eingaben ausgeben.\n" + +#: src/numfmt.c:823 +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 +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 +msgid "" +" --format=FORMAT use printf style floating-point FORMAT;\n" +" see FORMAT below for details\n" +msgstr "" +" --format=FORMAT verwendet Fließkomma-FORMAT im Stil von printf.\n" +" Siehe FORMAT weiter unten für Details.\n" + +#: src/numfmt.c:833 +msgid "" +" --from=UNIT auto-scale input numbers to UNITs; default is " +"'none';\n" +" see UNIT below\n" +msgstr "" +" --from-unit=N Angabe der Einheit der Eingabe (statt der Vorgabe " +"1).\n" +" Siehe EINHEIT weiter unten\n" + +#: src/numfmt.c:837 +msgid "" +" --from-unit=N specify the input unit size (instead of the default " +"1)\n" +msgstr "" +" --from-unit=N Angabe der Einheit der Eingabe (statt der Vorgabe " +"1).\n" + +#: src/numfmt.c:840 +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 Verwendet die locale-spezifische Gruppierung von\n" +" Ziffern, z.B. 1.000.000 (hat also in C/POSIX\n" +" Locales keine Auswirkung).\n" + +#: src/numfmt.c:844 +msgid "" +" --header[=N] print (without converting) the first N header lines;\n" +" N defaults to 1 if not specified\n" +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 +msgid "" +" --invalid=MODE failure mode for invalid numbers: MODE can be:\n" +" abort (default), fail, warn, ignore\n" +msgstr "" +" --invalid=MODUS Verhalten bei ungültigen Zahlen: MODUS kann sein:\n" +" abort (Vorgabe), fail, warn, ignore.\n" + +#: src/numfmt.c:852 +msgid "" +" --padding=N pad the output to N characters; positive N will\n" +" right-align; negative N will left-align;\n" +" padding is ignored if the output is wider than N;\n" +" the default is to automatically pad if a " +"whitespace\n" +" is found\n" +msgstr "" +" --padding=N die Ausgabe auf N Zeichen auffüllen. Positives N\n" +" bedeutet rechtsbündig, negatives N linksbündig.\n" +" Es wird nicht aufgefüllt, wenn die Ausgabe breiter\n" +" als N ist.\n" +" Standardmäßig wird automatisch aufgefüllt, wenn\n" +" Leerzeichen, Tabulator oder Zeilenumbruch gefunden\n" +" werden.\n" + +#: src/numfmt.c:859 +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 die bei der Skalierung zu verwendende " +"Rundungsmethode.\n" +" METHODE kann sein:\n" +" up, down, from-zero (Vorgabe), towards-zero, " +"nearest\n" + +#: src/numfmt.c:863 +msgid "" +" --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" +" SUFFIX in input numbers\n" +msgstr "" +" --suffix=ENDUNG ENDUNG an auszugebende Zahlen anhängen und eine\n" +" eventuell vorhandene ENDUNG bei eingegebenen " +"Zahlen\n" +" akzeptieren.\n" + +#: src/numfmt.c:867 +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 +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 +msgid "" +"\n" +"UNIT options:\n" +msgstr "" +"\n" +"EINHEIT-Optionen:\n" + +#: src/numfmt.c:880 +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 +msgid "" +" auto accept optional single/two letter suffix:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" +msgstr "" +" auto Akzeptiere optionale ein- bzw. zweibuchstabige Endungen:\n" +" 1K = 1000\n" +" 1Ki = 1024\n" +" 1M = 1000000\n" +" 1Mi = 1048576\n" + +#: src/numfmt.c:889 +msgid "" +" si accept optional single letter suffix:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ...\n" +msgstr "" +" si Akzeptiere eine optionale einbuchstabige Endung:\n" +" 1K = 1000\n" +" 1M = 1000000\n" +" ...\n" + +#: src/numfmt.c:894 +msgid "" +" iec accept optional single letter suffix:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ...\n" +msgstr "" +" iec Akzeptiere eine optionale einbuchstabige Endung:\n" +" 1K = 1024\n" +" 1M = 1048576\n" +" ...\n" + +#: src/numfmt.c:899 +msgid "" +" iec-i accept optional two-letter suffix:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ...\n" +msgstr "" +" iec-i Akzeptiere eine optionale zweibuchstabige Endung:\n" +" 1Ki = 1024\n" +" 1Mi = 1048576\n" +" ...\n" + +#: src/numfmt.c:905 +#, 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" +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" +"wird nach links aufgefüllt.\n" +"\n" + +#: src/numfmt.c:912 +#, c-format +msgid "" +"\n" +"Exit status is 0 if all input numbers were successfully converted.\n" +"By default, %s will stop at the first conversion error with exit status 2.\n" +"With --invalid='fail' a warning is printed for each conversion error\n" +"and the exit status is 2. With --invalid='warn' each conversion error is\n" +"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" +"Der Rückgabewert des Programms ist 0 wenn alle eingegeben Zahlen " +"erfolgreich\n" +"umgewandelt werden konnten. Noramlerweise stopt %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" +"--invalid='warn' wird jede fehlerhafte Umwandlung angegeben aber der\n" +"Rückgabewert bei Ende ist 0. Bei --invalid='ignore' werden " +"Umwandlungsfehler\n" +"nicht angegeben und das Programm mit 0 beendet.\n" +"\n" + +#: src/numfmt.c:921 +#, c-format +msgid "" +"\n" +"Examples:\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" +msgstr "" +"\n" +"Beispiele:\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 +#, c-format +msgid "format %s has no %% directive" +msgstr "das Format %s enthält keine %%-Anweisung" + +#: src/numfmt.c:990 +#, c-format +msgid "invalid format %s (width overflow)" +msgstr "ungültiges Format %s (Überlauf der Breite)" + +#: src/numfmt.c:1007 src/seq.c:229 +#, c-format +msgid "format %s ends in %%" +msgstr "das Format %s endet mit %%" + +#: src/numfmt.c:1010 +#, c-format +msgid "invalid format %s, directive must be %%['][-][N]f" +msgstr "ungültiges Formt %s, die Anweisung muss die Form %%['][-][N]f haben" + +#: src/numfmt.c:1018 src/seq.c:236 +#, c-format +msgid "format %s has too many %% directives" +msgstr "das Format %s enthält zu viele %%-Direktiven" + +#: src/numfmt.c:1070 +#, c-format +msgid "invalid suffix in input '%s': '%s'" +msgstr "ungültige Endung in Eingabe „%s“: „%s“" + +#: src/numfmt.c:1092 +#, 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 +#, 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 +#, c-format +msgid "large input value '%s': possible precision loss" +msgstr "großer Eingabewert „%s“: möglicher Verlust von Präzision" + +#: src/numfmt.c:1293 +#, 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 +#, c-format +msgid "invalid padding value '%s'" +msgstr "Ungültiger Wert für Auffüllung „%s“" + +#: src/numfmt.c:1401 +#, c-format +msgid "invalid field value '%s'" +msgstr "Ungültiger Feldwert: %s" + +#: src/numfmt.c:1430 +#, c-format +msgid "invalid header value '%s'" +msgstr "ungültiger Kopf-Wert „%s“" + +#: src/numfmt.c:1456 +#, 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 +#, c-format +msgid "no conversion option specified" +msgstr "es wurde keine Umwandlungsoption angegeben" + +#: src/numfmt.c:1471 +#, c-format +msgid "grouping cannot be combined with --to" +msgstr "Gruppierung kann nicht mit --to kombiniert werden" + +#: src/numfmt.c:1473 +#, c-format +msgid "grouping has no effect in this locale" +msgstr "Gruppierung hat in dieser Locale keine Auswirkung" + +#: src/numfmt.c:1486 +#, c-format +msgid "--header ignored with command-line input" +msgstr "--header wird bei Eingabe über Kommandozeile ignoriert" + +#: src/numfmt.c:1511 +#, c-format +msgid "error reading input" +msgstr "Fehler beim Lesen der Eingabe" + +#: src/numfmt.c:1520 +#, c-format +msgid "failed to convert some of the input numbers" +msgstr "einige der eingegebenen Zahlen konnten nicht umgewandelt werden" + #: src/od.c:294 #, c-format msgid "" @@ -6867,34 +7341,56 @@ msgstr "" "\n" "Eine eindeutige Darstellung der DATEI, auf Standardausgabe ausgeben " "(Vorgabe:\n" -"Oktalzahlen). Bei mehr als einem Argument DATEI, die Dateien in der\n" +"Oktalzahlen). Bei mehr als einem Argument DATEI, die Dateien in der\n" "angegebenen Folge verketten und die Eingabe zu bilden.\n" "Ohne DATEI oder wenn DATEI „-“ ist, Standardeingabe lesen.\n" #: src/od.c:307 -msgid "All arguments to long options are mandatory for short options.\n" +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" +"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" +"at first byte printed, incremented when dump is progressing.\n" +"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 "" -"Erforderliche Argumente für lange Optionen sind für kurze auch notwendig.\n" +"Wenn die erste und zweite Aufrufform beide zutreffen, wird das zweite " +"Format\n" +"angenommen, wenn der letzte Operand mit + oder (wenn es zwei Operanden " +"gibt)\n" +"einer Ziffer anfängt. Ein OFFSET‐Operand bedeutet -j OFFSET. MARKE ist die\n" +"Pseudoadresse des ersten auszugebenden Bytes; sie wird entsprechend erhöht,\n" +"wenn die Ausgabe fortschreitet. Für OFFSET und MARKE bedeutet ein „0x“‐ " +"oder\n" +"„0X“‐Präfix hexadezimal; Endungen können „.“ für oktal und „b“ für " +"Vielfaches\n" +"von 512 sein.\n" -#: src/od.c:310 +#: src/od.c:318 msgid "" -" -A, --address-radix=RADIX decide how file offsets are printed\n" +" -A, --address-radix=RADIX output format for file offsets. RADIX is one\n" +" of [doxn], for Decimal, Octal, Hex or None\n" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" -" -A, --address-radix=RADIX entscheiden, wie Dateioffsets ausgegeben " +" -A, --address-radix=BASIS entscheiden, wie Dateioffsets ausgegeben " "werden\n" +" BASIS kann [doxn] für Dezimal, Oktal, Hex " +"oder\n" +" Keine sein\n" " -j, --skip-bytes=BYTES BYTES Eingabebytes am Anfang jeder Datei\n" " übergehen\n" -#: src/od.c:314 +#: src/od.c:323 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" -" --traditional accept arguments in traditional form\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" @@ -6906,9 +7402,10 @@ msgstr "" " -w[BYTES], --width[=BYTES] Anzahl BYTES pro Ausgabezeile ausgeben\n" " --traditional Argumente in traditioneller Form akzeptieren\n" -#: src/od.c:324 +#: src/od.c:336 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" @@ -6916,6 +7413,7 @@ msgid "" " -d same as -t u2, select unsigned decimal 2-byte units\n" msgstr "" "\n" +"\n" "Traditionell spezifizierte Formatangaben können gemischt werden; sie werden\n" "akkumuliert:\n" " -a dasselbe wie -t a, benannte Zeichen wählen, oberstes Bit ignorieren\n" @@ -6924,7 +7422,7 @@ msgstr "" "wählen\n" " -d dasselbe wie -t u2, dezimale vorzeichenlose 2‐Byte‐Zahlen wählen\n" -#: src/od.c:332 +#: src/od.c:345 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -6940,44 +7438,22 @@ 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:340 +#: src/od.c:353 msgid "" "\n" -"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" -"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" -"at first byte printed, incremented when dump is progressing.\n" -"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" -"Wenn die erste und zweite Aufrufform beide zutreffen, wird das zweite " -"Format\n" -"angenommen, wenn der letzte Operand mit + oder (wenn es zwei Operanden " -"gibt)\n" -"einer Ziffer anfängt. Ein OFFSET‐Operand bedeutet -j OFFSET. MARKE ist die\n" -"Pseudoadresse des ersten auszugebenden Bytes; sie wird entsprechend erhöht,\n" -"wenn die Ausgabe fortschreitet. Für OFFSET und MARKE bedeutet ein „0x“‐ " -"oder\n" -"„0X“‐Präfix hexadezimal; Suffixe können „.“ für oktal und „b“ für " -"Vielfaches\n" -"von 512 sein.\n" - -#: src/od.c:349 -msgid "" "\n" "TYPE is made up of one or more of these specifications:\n" -"\n" " a named character, ignoring high-order bit\n" " c ASCII character or backslash escape\n" msgstr "" "\n" +"\n" "TYP setzt sich zusammen aus einer oder mehreren dieser Spezifikationen:\n" "\n" " a ein benanntes Zeichen, oberstes Bit ignorieren\n" " c ASCII‐Zeichen oder Rückschrägstrich‐Escape\n" -#: src/od.c:356 +#: src/od.c:360 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -6991,57 +7467,62 @@ msgstr "" " u[ANZAHL] dezimal ohne Vorzeichen, ANZAHL Bytes pro Zahl\n" " x[ANZAHL] hexadezimal, ANZAHL Bytes pro Zahl\n" -#: src/od.c:363 +#: src/od.c:367 msgid "" "\n" -"SIZE is a number. For TYPE in doux, SIZE may also be C for\n" +"SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" "sizeof(char), S for sizeof(short), I for sizeof(int) or L for\n" "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" -"ANZAHL ist eine Zahl. Wenn TYP einer von „d“, „o“, „u“, oder „x“ ist, kann\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" -"oder „L“ für sizeof(long) sein. Wenn TYP „f“ ist, kann ANZAHL auch „F“ für\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:370 +#: src/od.c:374 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" +"Adding a z suffix to any type displays printable characters at the end of\n" +"each 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 ein Suffix „z“ an einen beliebigen Typ angehängt, werden am Ende jeder\n" -"Zeile die druckbaren Zeichen ausgegeben.\n" +"Durch Anhängen von „z“ an einen beliebigen Typ werden am Ende jeder " +"ausgegebe-\n" +"nen Zeile druckbare Zeichen angezeigt.\n" -#: src/od.c:380 +#: src/od.c:379 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" +"\n" +"BYTES is hex with 0x or 0X prefix, and may have a multiplier suffix:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"and so on for G, T, P, E, Z, Y.\n" msgstr "" -"--string ohne Zahl impliziert „3“. --width ohne Zahl impliziert „32“.\n" -"Standardmäßig benutzt od: -A o -t oS -w16.\n" +"\n" +"\n" +"BYTES ist hexadezimal bei vorangestelltem 0x oder 0X und kann folgende\n" +"multiplikative Endungen haben:\n" +" b 512\n" +" kB 1000\n" +" K 1024\n" +" MB 1000×1000\n" +" M 1024×1024\n" +"und so weiter für G, T, P, E, Z, Y.\n" -#: src/od.c:633 src/od.c:753 +#: src/od.c:639 src/od.c:759 #, c-format msgid "invalid type string %s" msgstr "Ungültige Typbezeichnung %s" -#: src/od.c:643 +#: src/od.c:649 #, c-format msgid "" "invalid type string %s;\n" @@ -7050,7 +7531,7 @@ msgstr "" "Ungültige Typbezeichnung %s;\n" "dieses System hat keinen Typ für %lu‐Byte große Ganzzahlen" -#: src/od.c:764 +#: src/od.c:770 #, c-format msgid "" "invalid type string %s;\n" @@ -7059,38 +7540,38 @@ msgstr "" "Ungültige Typbezeichnung %s;\n" "dieses System hat keinen Typ für %lu-Byte große Gleitkommazahlen" -#: src/od.c:822 +#: src/od.c:828 #, c-format msgid "invalid character '%c' in type string %s" msgstr "Ungültiges Zeichen „%c“ in Typenbezeichnung %s" -#: src/od.c:1047 +#: src/od.c:1053 #, 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:1603 +#: src/od.c:1609 #, 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:1729 +#: src/od.c:1735 #, 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:1804 +#: src/od.c:1810 msgid "compatibility mode supports at most one file" msgstr "Der Kompatibilitätsmodus unterstützt höchstens eine Datei." -#: src/od.c:1825 +#: src/od.c:1831 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "skip-bytes + read-bytes ist zu groß" -#: src/od.c:1868 +#: src/od.c:1874 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "Warnung: ungültige Breite %lu; %d wird benutzt" @@ -7110,15 +7591,14 @@ 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" -"\n" msgstr "" "Zeilen auf Standardausgabe ausgeben, die aus sequenziell sich " "entsprechenden\n" "Zeilen jeder DATEI bestehen, getrennt durch Tabulatoren.\n" -"Ohne DATEI oder wenn DATEI „-“ ist, Standardeingabe lesen.\n" +"Ohne DATEI oder wenn DATEI „-“ ist, wird die Standardeingabe gelesen.\n" "\n" -#: src/paste.c:448 +#: 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" @@ -7127,7 +7607,7 @@ msgstr "" "benutzen\n" " -s, --serial Dateien nacheinander ausgeben anstelle parallel\n" -#: src/paste.c:509 +#: src/paste.c:508 #, c-format msgid "delimiter list ends with an unescaped backslash: %s" msgstr "Trennzeichenliste endet mit einzelnem Rückschrägstrich: %s" @@ -7164,7 +7644,7 @@ msgstr "leerer Dateiname" #: src/pathchk.c:314 #, c-format msgid "%s: unable to determine maximum file name length" -msgstr "%s: kann maximale Dateinamenlänge nicht ermitteln" +msgstr "%s: die maximale Dateinamenlänge kann nicht ermittelt werden" #: src/pathchk.c:325 #, c-format @@ -7188,80 +7668,80 @@ msgid "Kaveh Ghazi" msgstr "Kaveh Ghazi" #. TRANSLATORS: Real name is unknown; at most 19 characters. -#: src/pinky.c:250 +#: src/pinky.c:242 msgid " ???" msgstr " ???" #. TRANSLATORS: Idle time is unknown; at most 5 characters. -#: src/pinky.c:274 +#: src/pinky.c:266 msgid "?????" msgstr "?????" -#: src/pinky.c:323 +#: src/pinky.c:314 #, c-format msgid "Login name: " msgstr "Loginname: " -#: src/pinky.c:326 +#: src/pinky.c:317 #, c-format msgid "In real life: " msgstr "Im richtigen Leben: " #. TRANSLATORS: Real name is unknown; no hard limit. -#: src/pinky.c:330 +#: src/pinky.c:321 msgid "???\n" msgstr "???\n" -#: src/pinky.c:350 +#: src/pinky.c:341 #, c-format msgid "Directory: " msgstr "Verzeichnis: " -#: src/pinky.c:352 +#: src/pinky.c:343 #, c-format msgid "Shell: " msgstr "Shell: " -#: src/pinky.c:371 +#: src/pinky.c:362 #, c-format msgid "Project: " msgstr "Projekt: " -#: src/pinky.c:395 +#: src/pinky.c:386 #, c-format msgid "Plan:\n" msgstr "Plan:\n" -#: src/pinky.c:414 +#: src/pinky.c:405 msgid "Login" msgstr "Login" -#: src/pinky.c:416 +#: src/pinky.c:407 msgid "Name" msgstr "Name" -#: src/pinky.c:417 +#: src/pinky.c:408 msgid " TTY" msgstr " TTY" -#: src/pinky.c:419 +#: src/pinky.c:410 msgid "Idle" msgstr "Untätig" -#: src/pinky.c:420 +#: src/pinky.c:411 msgid "When" msgstr "Wann" -#: src/pinky.c:423 +#: src/pinky.c:414 msgid "Where" msgstr "Wo " -#: src/pinky.c:502 +#: src/pinky.c:493 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Aufruf: %s [OPTION]... [BENUTZER]...\n" -#: src/pinky.c:503 +#: src/pinky.c:494 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7278,7 +7758,7 @@ msgstr "" " -p ohne Plan‐Datei der Benutzer (bei langem Format)\n" " -s kurzes Format erzeugen (dies ist die Vorgabe)\n" -#: src/pinky.c:511 +#: src/pinky.c:502 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7293,7 +7773,7 @@ msgstr "" " -q ohne volle Namen, entfernte Rechner und Idle‐Zeit der " "Benutzer\n" -#: src/pinky.c:520 +#: src/pinky.c:511 #, c-format msgid "" "\n" @@ -7304,7 +7784,7 @@ msgstr "" "Ein abgespecktes „finger“‐Programm zum Anzeigen von Benutzerinformationen.\n" "Als utmp‐Datei wird %s genommen.\n" -#: src/pinky.c:604 +#: src/pinky.c:595 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "" @@ -7322,89 +7802,87 @@ msgstr "Pete TerMaat" msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:912 +#: src/pr.c:908 #, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "„--pages=ERSTE_SEITE[:LETZTE_SEITE]“ fehlendes Argument" -#: src/pr.c:914 +#: src/pr.c:910 #, c-format msgid "invalid page range %s" msgstr "Ungültiger Seitenbereich %s" -#: src/pr.c:979 +#: src/pr.c:975 #, c-format msgid "'-l PAGE_LENGTH' invalid number of lines: %s" msgstr "„-l SEITEN_LÄNGE“ ungültige Anzahl von Zeilen: %s" -#: src/pr.c:1003 +#: src/pr.c:999 #, c-format msgid "'-N NUMBER' invalid starting line number: %s" msgstr "„-N ZAHL“ ungültige Angabe der Startzeilennummer: %s" -#: src/pr.c:1015 +#: src/pr.c:1011 #, c-format msgid "'-o MARGIN' invalid line offset: %s" msgstr "„-o RAND“ ungültige Angabe des Zeilenoffsets: %s" -#: src/pr.c:1056 +#: src/pr.c:1052 #, c-format msgid "'-w PAGE_WIDTH' invalid number of characters: %s" msgstr "„-w SEITEN_BREITE“ ungültige Anzahl von Zeichen: %s" -#: src/pr.c:1070 +#: src/pr.c:1066 #, c-format msgid "'-W PAGE_WIDTH' invalid number of characters: %s" msgstr "„-W SEITEN_BREITE“ ungültige Anzahl von Zeichen: %s" -#: src/pr.c:1100 +#: src/pr.c:1096 #, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "" "Es ist nicht möglich, die Anzahl der Spalten bei Parallel‐Ausgabe " "festzulegen." -#: src/pr.c:1104 +#: src/pr.c:1100 #, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "" "Es ist nicht möglich, gleichzeitig die Parallel‐ und Überkreuz‐Ausgabe\n" "festzulegen." -#: src/pr.c:1200 +#: src/pr.c:1196 #, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "„-%c“ Extrazeichen oder ungültige Zahl im Argument: %s" -#: src/pr.c:1304 +#: src/pr.c:1293 #, c-format msgid "page width too narrow" msgstr "Seitenbreite zu schmal" -#: src/pr.c:2369 +#: src/pr.c:2353 #, c-format msgid "starting page number %<PRIuMAX> exceeds page count %<PRIuMAX>" msgstr "Anfangsseitennummer %<PRIuMAX> übersteigt Seitenzahl %<PRIuMAX>" -#: src/pr.c:2396 +#: src/pr.c:2380 #, c-format msgid "page number overflow" msgstr "Überlauf bei den Seitennummern" -#: src/pr.c:2401 +#: src/pr.c:2385 #, c-format msgid "Page %<PRIuMAX>" msgstr "Seite %<PRIuMAX>" -#: src/pr.c:2773 -msgid "" -"Paginate or columnate FILE(s) for printing.\n" -"\n" +#: src/pr.c:2757 +msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" "DATEI(en) in Seiten oder Spalten für die Druckausgabe unterteilen.\n" "\n" -#: src/pr.c:2780 +#: src/pr.c:2763 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -7418,11 +7896,11 @@ msgstr "" " -SPALTEN, --columns=SPALTEN\n" " SPALTEN‐spaltige Ausgabe erzeugen und Spalten vertikal " "schreiben,\n" -" es sei denn, -a wurde benutzt. Zahl der Zeilen in jeder " +" es sei denn, -a wurde benutzt. Zahl der Zeilen in jeder " "Spalte\n" " ausbalancieren.\n" -#: src/pr.c:2788 +#: src/pr.c:2771 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7440,7 +7918,7 @@ msgstr "" " -d, --double-space\n" " doppelter Zeilenvorschub in der Ausgabe\n" -#: src/pr.c:2796 +#: src/pr.c:2779 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7461,7 +7939,7 @@ msgstr "" " trennen (durch einen 3‐Zeilen‐Seitenkopf bei -F oder einen\n" " 5‐Zeilen‐Seitenkopf und ‐fuß ohne -F)\n" -#: src/pr.c:2806 +#: src/pr.c:2789 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -7484,7 +7962,7 @@ msgstr "" " veranlasste Zeilenbeschneidung abschalten, keine\n" " Spaltenausrichtung, --sep-string[=ZKETTE] setzt Trennzeichen\n" -#: src/pr.c:2815 +#: src/pr.c:2798 msgid "" " -l, --length=PAGE_LENGTH\n" " set the page length to PAGE_LENGTH (66) lines\n" @@ -7499,7 +7977,7 @@ msgstr "" " Zeilen abschneiden, aber Zeilen voller Länge bei -J " "vereinigen\n" -#: src/pr.c:2822 +#: src/pr.c:2805 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -7517,7 +7995,7 @@ msgstr "" " Nummerierung mit ZAHL bei der ersten Zeile der ersten Seite\n" " beginnen, die ausgedruckt wird (siehe auch +ERSTE_SEITE)\n" -#: src/pr.c:2830 +#: src/pr.c:2813 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -7532,7 +8010,7 @@ msgstr "" " Warnung unterdrücken, wenn eine Datei nicht geöffnet werden " "kann\n" -#: src/pr.c:2837 +#: src/pr.c:2820 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -7549,7 +8027,7 @@ msgstr "" " -s[ZEICHEN] schaltet Zeilenabschneidung bei allen drei\n" " Spaltenoptionen (-SPALTE|-a -SPALTE|-m) ab, außer bei -w\n" -#: src/pr.c:2844 +#: src/pr.c:2827 msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" @@ -7565,7 +8043,7 @@ msgstr "" " Auswirkung auf Spaltenoptionen\n" " -t, --omit-header Kopf‐ und Fußzeilen unterdrücken\n" -#: src/pr.c:2851 +#: src/pr.c:2834 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -7590,7 +8068,7 @@ msgstr "" " mehrfacher Textspalten setzen, -s[Zeichen] schaltet ab " "(72)\n" -#: src/pr.c:2861 +#: src/pr.c:2844 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -7604,14 +8082,14 @@ msgstr "" " Zeilen abschneiden, es sei denn -J ist gesetzt, keine\n" " gegenseitige Störung mit -S oder -s\n" -#: src/pr.c:2869 +#: src/pr.c:2852 msgid "" "\n" "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" "standard input.\n" msgstr "" "\n" -"-t wird impliziert wenn PAGE_LENGTH <= 10. Ohne DATEI oder wenn\n" +"-t wird impliziert, wenn PAGE_LENGTH <= 10. Ohne DATEI oder wenn\n" "DATEI „-“ ist, Standardeingabe lesen.\n" #: src/printenv.c:62 @@ -7765,14 +8243,13 @@ msgstr "" msgid "" "Output a permuted index, including context, of the words in the input " "files.\n" -"\n" msgstr "" "Einen permutierten Index der Wörter der Eingabedateien einschließlich " "Kontext\n" "ausgeben.\n" "\n" -#: src/ptx.c:1828 +#: src/ptx.c:1827 msgid "" " -A, --auto-reference output automatically generated references\n" " -G, --traditional behave more like System V 'ptx'\n" @@ -7783,7 +8260,7 @@ msgstr "" " -F, --flag-truncation=ZKETTE ZKETTE benutzen, um Abschneidungen " "anzuzeigen\n" -#: src/ptx.c:1833 +#: src/ptx.c:1832 msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" " -O, --format=roff generate output as roff directives\n" @@ -7798,7 +8275,7 @@ msgstr "" " -S, --sentence-regexp=REGEXP für Zeilen‐ oder Satzende\n" " -T, --format=tex Ausgabe als TeX‐Anweisungen erzeugen\n" -#: src/ptx.c:1840 +#: src/ptx.c:1839 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -7817,7 +8294,7 @@ msgstr "" "lesen\n" " -o, --only-file=DATEI Wortliste nur aus dieser DATEI lesen\n" -#: src/ptx.c:1848 +#: src/ptx.c:1847 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -7830,16 +8307,16 @@ msgstr "" "die\n" " Referenzen\n" -#: src/ptx.c:1855 +#: src/ptx.c:1854 msgid "" "\n" "With no FILE or if FILE is -, read Standard Input. '-F /' by default.\n" msgstr "" "\n" -"Ohne DATEI, oder falls DATEI „-“ ist, Standardeingabe lesen. Vorgabe: „-" +"Ohne DATEI, oder falls DATEI „-“ ist, Standardeingabe lesen. Vorgabe: „-" "F /“.\n" -#: src/ptx.c:1949 +#: src/ptx.c:1948 #, c-format msgid "invalid gap width: %s" msgstr "ungültige Lückenbreite: %s" @@ -7867,7 +8344,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "konnte nicht nach %s wechseln" -#: src/pwd.c:170 src/pwd.c:277 +#: src/pwd.c:170 src/pwd.c:277 src/split.c:373 #, c-format msgid "failed to stat %s" msgstr "konnte auf %s nicht zugreifen" @@ -7883,14 +8360,15 @@ msgid "ignoring non-option arguments" msgstr "Argumente, die keine Optionen sind, werden ignoriert" #. This is a proper name. See the gettext manual, section Names. -#: src/readlink.c:33 +#: src/readlink.c:32 msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 +#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147 +#: src/stat.c:1349 src/touch.c:212 #, c-format -msgid "Usage: %s [OPTION]... FILE\n" -msgstr "Aufruf: %s [OPTION]... DATEI\n" +msgid "Usage: %s [OPTION]... FILE...\n" +msgstr "Aufruf: %s [OPTION]... DATEI...\n" #: src/readlink.c:63 msgid "" @@ -7931,10 +8409,12 @@ msgid "" "recursively,\n" " without requirements on components " "existence\n" -" -n, --no-newline do not output the trailing newline\n" +" -n, --no-newline do not output the trailing delimiter\n" " -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" msgstr "" " -m, --canonicalize-missing kanonisieren, indem jeder symb. Verknüpfung " "in jeder\n" @@ -7945,12 +8425,13 @@ msgstr "" " -q, --quiet,\n" " -s, --silent Fehlermeldungen größtenteils unterdrücken\n" " -v, --verbose Fehlermeldungen ausgeben\n" +" -z, --zero die Ausgaben mit Nullbyte statt Zeilenvorschub " +"trennen\n" -#: src/realpath.c:71 src/rm.c:134 src/shred.c:147 src/stat.c:1330 -#: src/touch.c:215 +#: src/readlink.c:152 #, c-format -msgid "Usage: %s [OPTION]... FILE...\n" -msgstr "Aufruf: %s [OPTION]... DATEI...\n" +msgid "ignoring --no-newline with multiple arguments" +msgstr "bei mehreren Argumenten wird --no-newline ignoriert" #: src/realpath.c:72 msgid "" @@ -7996,12 +8477,12 @@ msgstr "" msgid "generating relative path" msgstr "ein relativer Pfad wird erzeugt" -#: src/remove.c:286 +#: src/remove.c:273 #, c-format msgid "%s: descend into write-protected directory %s? " msgstr "%s: in schreibgeschütztes Verzeichnis %s absteigen? " -#: src/remove.c:287 +#: src/remove.c:274 #, c-format msgid "%s: descend into directory %s? " msgstr "%s: in Verzeichnis %s absteigen? " @@ -8010,37 +8491,37 @@ msgstr "%s: in Verzeichnis %s absteigen? " #. translate "%s: remove %s (write-protected) %s? " #. instead. It should avoid grammatical problems #. with the output of file_type. -#: src/remove.c:303 +#: src/remove.c:290 #, c-format msgid "%s: remove write-protected %s %s? " msgstr "%s: %s (schreibgeschützt) %s entfernen? " -#: src/remove.c:304 +#: src/remove.c:291 #, c-format msgid "%s: remove %s %s? " msgstr "%s: %s %s entfernen? " -#: src/remove.c:417 +#: src/remove.c:374 #, c-format msgid "removed directory: %s\n" msgstr "Verzeichnis wurde entfernt: %s\n" -#: src/remove.c:481 +#: src/remove.c:444 #, c-format msgid "cannot remove directory: %s" msgstr "das Verzeichnis kann nicht entfernt werden: %s" -#: src/remove.c:537 +#: src/remove.c:500 #, 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:557 +#: src/remove.c:520 #, c-format msgid "traversal failed: %s" msgstr "Traversal fehlgeschlagen: %s" -#: src/remove.c:563 +#: src/remove.c:526 #, c-format msgid "" "unexpected failure: fts_info=%d: %s\n" @@ -8049,12 +8530,12 @@ msgstr "" "unerwarteter Fehler: fts_info=%d: %s\n" "bitte melden Sie dies an %s" -#: src/rm.c:118 +#: src/rm.c:119 #, c-format msgid "Try '%s ./%s' to remove the file %s.\n" msgstr "Versuchen Sie „%s ./%s“, um die Datei %s zu entfernen.\n" -#: src/rm.c:135 +#: src/rm.c:136 msgid "" "Remove (unlink) the FILE(s).\n" "\n" @@ -8068,7 +8549,7 @@ msgstr "" "Nachfragen\n" " -i vor jeder Entfernung nachfragen\n" -#: src/rm.c:141 +#: src/rm.c:142 msgid "" " -I prompt once before removing more than three files, " "or\n" @@ -8087,7 +8568,7 @@ msgstr "" "oder\n" " „always“ (-i); ohne WANN: immer\n" -#: src/rm.c:148 +#: src/rm.c:149 msgid "" " --one-file-system when removing a hierarchy recursively, skip any\n" " directory that is on a file system different from\n" @@ -8099,19 +8580,21 @@ msgstr "" "einem\n" " anderen Gerät als der Parameter befinden\n" -#: src/rm.c:153 +#: src/rm.c:154 msgid "" " --no-preserve-root do not treat '/' specially\n" " --preserve-root do not remove '/' (default)\n" " -r, -R, --recursive remove directories and their contents recursively\n" +" -d, --dir remove empty directories\n" " -v, --verbose explain what is being done\n" msgstr "" " --no-preserve-root „/“ nicht besonders behandeln\n" " --preserve-root nicht rekursiv auf „/“ arbeiten (Voreinstellung)\n" " -r, -R, --recursive Inhalte von Verzeichnissen rekursiv entfernen\n" +" -d, --dir leere Verzeichnisse werden entfernt\n" " -v, --verbose durchgeführte Tätigkeiten erklären\n" -#: src/rm.c:161 +#: src/rm.c:163 msgid "" "\n" "By default, rm does not remove directories. Use the --recursive (-r or -R)\n" @@ -8125,7 +8608,7 @@ msgstr "" "seiner\n" "Inhalte gelöscht.\n" -#: src/rm.c:166 +#: src/rm.c:168 #, c-format msgid "" "\n" @@ -8143,7 +8626,7 @@ msgstr "" "\n" " %s ./-foo\n" -#: src/rm.c:175 +#: src/rm.c:177 msgid "" "\n" "Note that if you use rm to remove a file, it might be possible to recover\n" @@ -8156,12 +8639,12 @@ msgstr "" "dass die Inhalte tatsächlich nicht wiederherstellbar sind, sollten Sie eher\n" "„shred“ benutzen.\n" -#: src/rm.c:335 +#: src/rm.c:342 #, c-format msgid "%s: remove all arguments recursively? " msgstr "%s: Alle Argumente rekursiv entfernen? " -#: src/rm.c:336 +#: src/rm.c:343 #, c-format msgid "%s: remove all arguments? " msgstr "%s: alle Argumente entfernen? " @@ -8221,7 +8704,14 @@ msgstr "" msgid "" "Run a program in a different security context.\n" "With neither CONTEXT nor COMMAND, print the current security context.\n" -"\n" +msgstr "" +"Ein Programm in einem anderen Sicherheitskontext ausführen.\n" +"Wenn weder KONTEXT noch BEFEHL gegeben sind, den aktuellen " +"Sicherheitskontext\n" +"ausgeben.\n" + +#: src/runcon.c:94 +msgid "" " CONTEXT Complete security context\n" " -c, --compute compute process transition context before modifying\n" " -t, --type=TYPE type (for same role as parent)\n" @@ -8230,11 +8720,6 @@ msgid "" " -l, --range=RANGE levelrange\n" "\n" msgstr "" -"Ein Programm in einem anderen Sicherheitskontext ausführen.\n" -"Wenn weder KONTEXT noch BEFEHL gegeben sind, den aktuellen " -"Sicherheitskontext\n" -"ausgeben.\n" -"\n" " KONTEXT vollständiger Sicherheitskontext\n" " -c, --compute Prozessübergangskontext berechnen vor der Modifikation\n" " -t, --type=TYP Typ (für die selbe Rolle wie übergeordnetes Element)\n" @@ -8243,75 +8728,75 @@ msgstr "" " -l, --range=BEREICH Niveaubereich\n" "\n" -#: src/runcon.c:140 +#: src/runcon.c:144 #, c-format msgid "multiple roles" msgstr "mehrere Rollen" -#: src/runcon.c:145 +#: src/runcon.c:149 #, c-format msgid "multiple types" msgstr "mehrere Typen" -#: src/runcon.c:150 +#: src/runcon.c:154 #, c-format msgid "multiple users" msgstr "mehrere Nutzer" -#: src/runcon.c:155 +#: src/runcon.c:159 #, c-format msgid "multiple levelranges" msgstr "mehrere Niveaubereiche" -#: src/runcon.c:173 src/runcon.c:209 +#: src/runcon.c:177 src/runcon.c:213 #, c-format msgid "failed to get current context" msgstr "konnte aktuellen Kontext nicht ermitteln" -#: src/runcon.c:183 +#: src/runcon.c:187 #, c-format msgid "you must specify -c, -t, -u, -l, -r, or context" msgstr "es müssen -c, -t, -u, -l, -r oder Kontext angegeben werden" -#: src/runcon.c:191 +#: src/runcon.c:195 #, c-format msgid "no command specified" msgstr "kein Befehl angegeben" -#: src/runcon.c:197 +#: src/runcon.c:201 #, 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:223 +#: src/runcon.c:227 #, c-format msgid "failed to compute a new context" msgstr "konnte keine neuen Kontext berechnen" -#: src/runcon.c:237 +#: src/runcon.c:241 #, c-format msgid "failed to set new user %s" msgstr "konnte neuen Nutzer %s nicht setzen" -#: src/runcon.c:239 +#: src/runcon.c:243 #, c-format msgid "failed to set new type %s" msgstr "konnte neuen Typ %s nicht setzen" -#: src/runcon.c:241 +#: src/runcon.c:245 #, c-format msgid "failed to set new range %s" msgstr "konnte neuen Bereich %s nicht setzen" -#: src/runcon.c:243 +#: src/runcon.c:247 #, c-format msgid "failed to set new role %s" msgstr "konnte neue Rolle %s nicht setzen" -#: src/runcon.c:251 +#: src/runcon.c:255 #, c-format msgid "unable to set security context %s" -msgstr "kann Sicherheitskontext %s nicht setzen" +msgstr "der Sicherheitskontext %s kann nicht gesetzt werden" #: src/seq.c:68 #, c-format @@ -8325,21 +8810,21 @@ msgstr "" " oder: %s [OPTION]... ERSTER PLUS LETZTER\n" #: src/seq.c:73 +msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" +msgstr "Die Zahlen von ERSTER bis LETZTER ausgeben, in Schritten von PLUS.\n" + +#: src/seq.c:79 msgid "" -"Print numbers from FIRST to LAST, in steps of INCREMENT.\n" -"\n" " -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 "" -"Die Zahlen von ERSTER bis LETZTER ausgeben, in Schritten von PLUS.\n" -"\n" " -f, --format=FORMAT Fließkomma‐FORMAT im Stil von printf benutzen\n" " -s, --separator=ZKETTE ZKETTE benutzen, um Zahlen zu trennen (Vorgabe :" "\\n)\n" " -w, --equal-width gleiche Breite durch führende Nullen herstellen\n" -#: src/seq.c:82 +#: src/seq.c:86 msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" @@ -8357,14 +8842,14 @@ 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:90 +#: src/seq.c:94 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 "" "FORMAT muss in der Lage sein, ein Argument vom Typ „double“ auszugeben;\n" -"per Voreinstellung ist es %.PRÄZf wenn ERSTER, PLUS und LETZTER alle " +"per Voreinstellung ist es %.PRÄZf, wenn ERSTER, PLUS und LETZTER alle " "dezimale\n" "Fixkommazahlen sind mit einer maximalen Genauigkeit PRÄZ, ansonsten %g.\n" "Die Angabe der Zahlen auf der Kommandozeilen muss im englischen Format " @@ -8374,32 +8859,17 @@ msgstr "" "ein Dezimalpunkt in der Eingabe und ein Dezimalkomma in der Ausgabe " "benutzt.)\n" -#: src/seq.c:136 +#: src/seq.c:140 #, c-format msgid "invalid floating point argument: %s" msgstr "ungültiges Fließkommaargument: %s" -#: src/seq.c:193 -#, c-format -msgid "format %s has no %% directive" -msgstr "das Format %s enthält keine %%-Direktive" - -#: src/seq.c:210 -#, c-format -msgid "format %s ends in %%" -msgstr "das Format %s endet mit %%" - -#: src/seq.c:213 +#: src/seq.c:232 #, c-format msgid "format %s has unknown %%%c directive" msgstr "das Format %s enthält die unbekannte Direktive %%%c" -#: src/seq.c:217 -#, c-format -msgid "format %s has too many %% directives" -msgstr "das Format %s enthält zu viele %%-Direktiven" - -#: src/seq.c:431 +#: src/seq.c:555 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" @@ -8443,30 +8913,30 @@ msgstr "" "auf\n" " GID1, ...\n" -#: src/setuidgid.c:163 +#: src/setuidgid.c:162 #, c-format msgid "unknown user-ID: %s" msgstr "unbekannte Nutzer‐ID: %s" -#: src/setuidgid.c:174 +#: 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:191 +#: src/setuidgid.c:190 #, c-format msgid "failed to set supplemental group(s)" msgstr "konnte keine erweiterte Gruppe(n) setzen" -#: src/setuidgid.c:201 +#: src/setuidgid.c:200 #, c-format msgid "cannot set group-ID to %lu" -msgstr "kann die Gruppen‐ID nicht auf %lu setzen" +msgstr "die Gruppen‐ID kann nicht auf %lu gesetzt werden" -#: src/setuidgid.c:205 +#: src/setuidgid.c:204 #, c-format msgid "cannot set user-ID to %lu" -msgstr "kann die Nutzer‐ID nicht auf %lu setzen" +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 @@ -8477,15 +8947,13 @@ msgstr "Colin Plumb" 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" -"\n" msgstr "" "Mehrfaches Überschreiben der angegebenen DATEI(en), um es schwerer zu " "machen,\n" "selbst mit aufwändigen und teuren Hardware‐Analysemitteln die Daten\n" "wieder herzustellen.\n" -"\n" -#: src/shred.c:156 +#: src/shred.c:155 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -8496,10 +8964,10 @@ msgstr "" " -f, --force wenn nötig Zugriffsrechte ändern, um Schreiben zuzulassen\n" " -n, --iteration=N N‐fach überschreiben statt des Standardwertes (%d)\n" " --random-source=DATEI zufällige Bytes aus DATEI nehmen\n" -" -s, --size=N diese Anzahl Bytes zerhacken (Suffixe wie K, M, G " +" -s, --size=N diese Anzahl Bytes zerhacken (Endungen wie K, M, G sind " "zulässig)\n" -#: src/shred.c:162 +#: src/shred.c:161 msgid "" " -u, --remove truncate and remove file after overwriting\n" " -v, --verbose show progress\n" @@ -8515,7 +8983,7 @@ msgstr "" "um\n" " Zerhacken zu verbergen.\n" -#: src/shred.c:171 +#: src/shred.c:170 msgid "" "\n" "If FILE is -, shred standard output.\n" @@ -8537,7 +9005,7 @@ msgstr "" "mit normalen Dateien verwenden die meisten Anwender die Option --remove.\n" "\n" -#: src/shred.c:181 +#: src/shred.c:180 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" @@ -8556,7 +9024,7 @@ msgstr "" "alle Dateisystemmodi eine Wirkung garantiert werden kann:\n" "\n" -#: src/shred.c:189 +#: src/shred.c:188 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -8578,7 +9046,7 @@ msgstr "" "von Network Appliance\n" "\n" -#: src/shred.c:199 +#: src/shred.c:198 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -8592,7 +9060,7 @@ msgstr "" "* komprimierte Dateisysteme\n" "\n" -#: src/shred.c:206 +#: src/shred.c:205 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" @@ -8613,7 +9081,7 @@ msgstr "" "bestimmtes\n" "Dateisystem in der /etc/fstab, wie es in der Manpage zu mount erklärt ist.\n" -#: src/shred.c:216 +#: src/shred.c:215 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" @@ -8624,122 +9092,122 @@ msgstr "" "enthalten, die nicht entfernt werden können, und die es erlauben, eine\n" "zerhackte Datei wieder herzustellen.\n" -#: src/shred.c:296 +#: src/shred.c:295 #, c-format msgid "%s: fdatasync failed" msgstr "%s: fdatasync fehlgeschlagen" -#: src/shred.c:307 +#: src/shred.c:306 #, c-format msgid "%s: fsync failed" msgstr "%s: fsync fehlgeschlagen" -#: src/shred.c:384 +#: src/shred.c:383 #, c-format msgid "%s: cannot rewind" msgstr "%s: Zurückspulen nicht möglich" -#: src/shred.c:403 +#: src/shred.c:402 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: Durchgang %lu/%lu (%s)..." -#: src/shred.c:453 +#: src/shred.c:452 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: Fehler beim Schreiben an Verschiebung %s" -#: src/shred.c:471 +#: src/shred.c:470 #, c-format msgid "%s: lseek failed" msgstr "%s: lseek fehlgeschlagen" -#: src/shred.c:482 +#: src/shred.c:481 #, c-format msgid "%s: file too large" msgstr "%s: Datei zu groß" -#: src/shred.c:505 +#: src/shred.c:504 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: Durchgang %lu/%lu (%s)...%s" -#: src/shred.c:521 +#: src/shred.c:520 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: Durchgang %lu/%lu (%s)...%s/%s %d%%" -#: src/shred.c:768 +#: src/shred.c:767 #, c-format msgid "%s: fstat failed" msgstr "%s: fstat fehlgeschlagen" -#: src/shred.c:779 +#: src/shred.c:778 #, c-format msgid "%s: invalid file type" msgstr "%s: ungültiger Dateityp" -#: src/shred.c:798 +#: src/shred.c:797 #, c-format msgid "%s: file has negative size" msgstr "%s: Datei hat negative Größe" -#: src/shred.c:865 +#: src/shred.c:864 src/sort.c:932 src/split.c:378 #, c-format msgid "%s: error truncating" msgstr "%s: Fehler beim Abschneiden" -#: src/shred.c:881 +#: src/shred.c:880 #, c-format msgid "%s: fcntl failed" msgstr "%s: fcntl fehlgeschlagen" -#: src/shred.c:886 +#: src/shred.c:885 #, c-format msgid "%s: cannot shred append-only file descriptor" -msgstr "%s: kann einen Nur‐Anfügen‐Dateideskriptors nicht zerhacken" +msgstr "%s: ein Nur‐Anfügen‐Dateideskriptor kann nicht vernichtet werden" -#: src/shred.c:968 +#: src/shred.c:967 #, c-format msgid "%s: removing" msgstr "%s: wird entfernt" -#: src/shred.c:992 +#: src/shred.c:991 #, c-format msgid "%s: renamed to %s" msgstr "%s: in %s umbenannt" -#: src/shred.c:1014 +#: src/shred.c:1013 #, c-format msgid "%s: failed to remove" -msgstr "%s: konnte nicht entfernen" +msgstr "%s: konnte nicht entfernt werden" -#: src/shred.c:1018 +#: src/shred.c:1017 #, c-format msgid "%s: removed" msgstr "%s: entfernt" -#: src/shred.c:1025 src/shred.c:1068 +#: src/shred.c:1024 src/shred.c:1067 #, c-format msgid "%s: failed to close" -msgstr "%s: konnte nicht schließen" +msgstr "%s: konnte nicht geschloßen werden" -#: src/shred.c:1061 +#: src/shred.c:1060 #, c-format msgid "%s: failed to open for writing" -msgstr "%s: konnte nicht zum Schreiben öffnen" +msgstr "%s: konnte nicht zum Schreiben geöffnet werden" -#: src/shred.c:1126 +#: src/shred.c:1125 #, c-format msgid "%s: invalid number of passes" msgstr "%s: ungültige Anzahl von Durchgängen" -#: src/shred.c:1135 src/shuf.c:291 src/sort.c:4387 +#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441 #, c-format msgid "multiple random sources specified" msgstr "mehrere Zufallsquellen angegeben" -#: src/shred.c:1149 +#: src/shred.c:1148 #, c-format msgid "%s: invalid file size" msgstr "%s: ungültige Dateigröße" @@ -8756,15 +9224,13 @@ msgstr "" " oder: %s -i VON-BIS [OPTION]...\n" #: src/shuf.c:54 -msgid "" -"Write a random permutation of the input lines to standard output.\n" -"\n" +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:61 +#: src/shuf.c:60 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 " @@ -8784,27 +9250,27 @@ msgstr "" " -z, --zero-terminated Zeilen mit Nullbyte statt Zeilenumbruch " "abschließen\n" -#: src/shuf.c:245 +#: src/shuf.c:244 #, c-format msgid "multiple -i options specified" msgstr "mehrfach die Optionen -i angegeben" -#: src/shuf.c:265 +#: src/shuf.c:264 #, c-format msgid "invalid input range %s" msgstr "ungültiger Eingabebereich: %s" -#: src/shuf.c:278 +#: src/shuf.c:277 #, c-format msgid "invalid line count %s" msgstr "ungültige Zeilenanzahl: %s" -#: src/shuf.c:285 src/sort.c:4381 +#: src/shuf.c:284 src/sort.c:4435 #, c-format msgid "multiple output files specified" msgstr "mehrere Ausgabedateien angegeben" -#: src/shuf.c:311 +#: src/shuf.c:310 #, c-format msgid "cannot combine -e and -i options" msgstr "Optionen -e und -i können nicht kombiniert werden." @@ -8822,12 +9288,11 @@ msgid "" "specified by the sum of their values.\n" "\n" msgstr "" -"Aufruf: %s ANZAHL[SUFFIX]...\n" +"Aufruf: %s ANZAHL[ENDUNG]...\n" " oder: %s OPTION\n" -"Für ANZAHL Sekunden pausieren. SUFFIX kann sein: „s“ für Sekunden " +"Für ANZAHL Sekunden pausieren. ENDUNG kann sein: „s“ für Sekunden " "(Vorgabe),\n" -"„m“ für Minuten, „h“ für Stunden, „d“ für Tage. Im Gegensatz zu den " -"meisten\n" +"„m“ für Minuten, „h“ für Stunden, „d“ für Tage. Im Gegensatz zu den meisten\n" "Implementierungen, die ANZAHL als eine ganze Zahl erfordern, kann ANZAHL " "hier\n" "eine beliebige Gleitkommazahl sein. Werden zwei oder mehr Argumente " @@ -8835,7 +9300,7 @@ msgstr "" "wird für eine Zeit pausiert, die der Summe der Werte entspricht.\n" "\n" -#: src/sleep.c:135 src/timeout.c:295 +#: src/sleep.c:135 src/timeout.c:320 #, c-format msgid "invalid time interval %s" msgstr "ungültiges Zeitintervall %s" @@ -8843,18 +9308,16 @@ msgstr "ungültiges Zeitintervall %s" #: src/sleep.c:146 src/tail.c:1219 #, c-format msgid "cannot read realtime clock" -msgstr "Echtzeit‐Uhr kann nicht gelesen werden" +msgstr "die Echtzeit‐Uhr kann nicht gelesen werden" -#: src/sort.c:395 -msgid "" -"Write sorted concatenation of all FILE(s) to standard output.\n" -"\n" +#: src/sort.c:399 +msgid "Write sorted concatenation of all FILE(s) to standard output.\n" msgstr "" -"Aneinanderfügung aller DATEI(en) sortiert nach der Standardausgabe " +"Aneinanderfügung aller DATEI(en) sortiert auf die Standardausgabe " "schreiben.\n" "\n" -#: src/sort.c:402 +#: src/sort.c:405 msgid "" "Ordering options:\n" "\n" @@ -8862,7 +9325,7 @@ msgstr "" "Sortieroptionen:\n" "\n" -#: src/sort.c:406 +#: src/sort.c:409 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -8874,7 +9337,7 @@ msgstr "" "beachten\n" " -f, --ignore-case Klein‐ als Großbuchstaben behandeln\n" -#: src/sort.c:412 +#: src/sort.c:415 msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" " -i, --ignore-nonprinting consider only printable characters\n" @@ -8886,14 +9349,14 @@ msgstr "" " -M, --month-sort Reihenfolge: (unbekannt) < „JAN“ < ... < " "„DEZ“\n" -#: src/sort.c:417 +#: src/sort.c:420 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:420 +#: src/sort.c:423 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -8906,7 +9369,7 @@ msgstr "" " --random-source=DATEI zufällige Bytes aus DATEI nehmen\n" " -r, --reverse das Ergebnis der Sortierung umkehren\n" -#: src/sort.c:426 +#: src/sort.c:429 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -8923,7 +9386,7 @@ msgstr "" "innerhalb\n" " des Textes\n" -#: src/sort.c:434 +#: src/sort.c:437 msgid "" "Other options:\n" "\n" @@ -8931,7 +9394,7 @@ msgstr "" "Andere Optionen:\n" "\n" -#: src/sort.c:438 +#: src/sort.c:441 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" @@ -8940,7 +9403,7 @@ msgstr "" " zusammenführen; für mehr benutzen Sie temporäre\n" " Dateien\n" -#: src/sort.c:442 +#: src/sort.c:445 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 " @@ -8955,7 +9418,7 @@ msgstr "" " --compress-program=PROG temporäre Dateien mit PROG komprimieren;\n" " mit PROG -d wieder entpacken\n" -#: src/sort.c:449 +#: src/sort.c:452 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -8971,7 +9434,7 @@ msgstr "" " NULL-terminiert in DATEI aufgeführt sind;\n" " ist D „-“, so wird die Standardeingabe gelesen\n" -#: src/sort.c:456 +#: src/sort.c:459 msgid "" " -k, --key=KEYDEF sort via a key; KEYDEF gives location and type\n" " -m, --merge merge already sorted files; do not sort\n" @@ -8982,7 +9445,7 @@ msgstr "" " -m, --merge schon sortierte Dateien zusammenführen; nicht\n" " sortieren\n" -#: src/sort.c:460 +#: src/sort.c:463 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -8996,7 +9459,7 @@ msgstr "" " deaktivieren)\n" " -S, --buffer-size=GRÖßE GRÖßE für Hauptspeicherpuffer benutzen\n" -#: src/sort.c:466 +#: src/sort.c:469 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -9022,13 +9485,13 @@ msgstr "" "nur\n" " das erste von mehreren Gleichen ausgeben\n" -#: src/sort.c:475 +#: 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:480 +#: src/sort.c:483 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -9058,9 +9521,9 @@ msgstr "" "Schlüssel außer Kraft setzen. Wenn kein Schlüssel angegeben wurde, wird die\n" "ganze Zeile als Schlüssel benutzt.\n" "\n" -"GRÖSSE kann einer der folgenden multiplikativen Suffixe sein:\n" +"GRÖẞE kann eine der folgenden multiplikativen Endungen folgen:\n" -#: src/sort.c:493 +#: src/sort.c:496 msgid "" "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n" "\n" @@ -9083,260 +9546,263 @@ msgstr "" "bei\n" "der native Bytewerte verwendet werden.\n" -#: src/sort.c:694 +#: src/sort.c:697 #, c-format msgid "waiting for %s [-d]" msgstr "Warte auf %s [-d]" -#: src/sort.c:699 +#: src/sort.c:702 #, c-format msgid "%s [-d] terminated abnormally" msgstr "%s [-d] beendete sich auf ungute Weise" -#: src/sort.c:853 +#: src/sort.c:856 #, c-format msgid "cannot create temporary file in %s" msgstr "temporäre Datei konnte nicht in %s angelegt werden" -#: src/sort.c:939 src/sort.c:2010 src/sort.c:3056 src/sort.c:3755 -#: src/sort.c:3758 +#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713 +#: src/sort.c:3804 src/sort.c:3807 msgid "open failed" msgstr "Öffnen fehlgeschlagen" -#: src/sort.c:959 +#: src/sort.c:970 msgid "fflush failed" msgstr "fflush fehlgeschlagen" -#: src/sort.c:964 src/sort.c:2013 src/sort.c:4646 +#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706 msgid "close failed" msgstr "Schließen fehlgeschlagen" -#: src/sort.c:973 +#: src/sort.c:986 #, c-format msgid "dup2 failed" msgstr "dup2 fehlgeschlagen" -#: src/sort.c:1090 +#: src/sort.c:1103 #, c-format msgid "couldn't execute %s" msgstr "konnte %s nicht ausführen" -#: src/sort.c:1097 +#: src/sort.c:1110 msgid "couldn't create temporary file" msgstr "konnte temporäre Datei nicht anlegen" -#: src/sort.c:1136 +#: src/sort.c:1149 #, c-format msgid "couldn't create process for %s -d" msgstr "konnte keinen Prozess für %s -d anlegen" -#: src/sort.c:1150 +#: src/sort.c:1161 #, c-format msgid "couldn't execute %s -d" msgstr "konnte %s -d nicht ausführen" -#: src/sort.c:1209 +#: src/sort.c:1220 #, c-format msgid "warning: cannot remove: %s" -msgstr "Warnung: kann %s nicht entfernen" +msgstr "Warnung: %s kann nicht entfernt werden" -#: src/sort.c:1295 +#: src/sort.c:1306 #, c-format msgid "invalid --%s argument %s" msgstr "ungültiges Argument %2$s für Option --%1$s" -#: src/sort.c:1298 +#: src/sort.c:1309 #, c-format msgid "minimum --%s argument is %s" msgstr "kleinstes Argument für Option --%s ist %s" -#: src/sort.c:1313 +#: src/sort.c:1324 #, c-format msgid "--%s argument %s too large" msgstr "Argument %2$s für Option --%1$s zu groß" -#: src/sort.c:1316 +#: src/sort.c:1327 #, 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:1398 +#: src/sort.c:1409 #, c-format msgid "number in parallel must be nonzero" msgstr "parallele Anzahl darf nicht Null sein" -#: src/sort.c:1479 +#: src/sort.c:1494 msgid "stat failed" msgstr "stat fehlgeschlagen" -#: src/sort.c:1740 +#: src/sort.c:1755 msgid "read failed" msgstr "Lesen fehlgeschlagen" -#: src/sort.c:2028 +#: src/sort.c:2043 #, c-format msgid "string transformation failed" msgstr "Zeichenkettentransformation fehlgeschlagen" -#: src/sort.c:2031 +#: src/sort.c:2046 #, c-format msgid "the untransformed string was %s" msgstr "die untransformierte Zeichenkette war %s" -#: src/sort.c:2194 +#: src/sort.c:2209 #, c-format msgid "^ no match for key\n" msgstr "^ passt nicht zu Schlüssel\n" -#: src/sort.c:2374 +#: src/sort.c:2389 #, 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:2380 +#: src/sort.c:2395 #, 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:2391 +#: src/sort.c:2406 #, 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:2404 +#: src/sort.c:2419 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "Schlüssel %lu ist numerisch und überspannt mehrere Felder" -#: src/sort.c:2436 +#: src/sort.c:2451 #, 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:2442 +#: src/sort.c:2457 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "Option „-r“ gilt nur für Notlösungsvergleiche" -#: src/sort.c:2716 src/sort.c:2725 +#: src/sort.c:2731 src/sort.c:2740 msgid "write failed" msgstr "Schreiben fehlgeschlagen" -#: src/sort.c:2768 +#: src/sort.c:2783 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: ungeordnet: " -#: src/sort.c:2771 +#: src/sort.c:2786 msgid "standard error" msgstr "Standardfehler" -#: src/sort.c:3926 +#: src/sort.c:3698 +msgid "cannot read" +msgstr "Lesen unmöglich" + +#: src/sort.c:3976 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: ungültige Feldangabe %s" -#: src/sort.c:3937 +#: src/sort.c:3987 #, c-format msgid "options '-%s' are incompatible" msgstr "Optionen „-%s“ sind inkompatibel" -#: src/sort.c:3988 +#: src/sort.c:4038 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s: ungültige Zähler am Anfang von %s" -#: src/sort.c:4245 +#: src/sort.c:4295 msgid "invalid number after '-'" msgstr "ungültige Zahl hinter „-“" -#: src/sort.c:4248 src/sort.c:4334 src/sort.c:4362 +#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416 msgid "invalid number after '.'" msgstr "ungültige Zahl hinter „.“" -#: src/sort.c:4261 src/sort.c:4367 +#: src/sort.c:4315 src/sort.c:4421 msgid "stray character in field spec" msgstr "verirrte Buchstaben in Feldspezifikation" -#: src/sort.c:4308 +#: src/sort.c:4362 #, c-format msgid "multiple compress programs specified" msgstr "mehrere Komprimierungsprogramme angegeben" -#: src/sort.c:4325 +#: src/sort.c:4379 msgid "invalid number at field start" msgstr "ungültige Zahl am Feldanfang" -#: src/sort.c:4329 src/sort.c:4357 +#: src/sort.c:4383 src/sort.c:4411 msgid "field number is zero" msgstr "Feldnummer ist Null" -#: src/sort.c:4338 +#: src/sort.c:4392 msgid "character offset is zero" msgstr "Zeichenversatz ist Null" -#: src/sort.c:4353 +#: src/sort.c:4407 msgid "invalid number after ','" msgstr "ungültige Zahl hinter „,“" -#: src/sort.c:4403 +#: src/sort.c:4457 #, c-format msgid "empty tab" msgstr "leerer Tabulator" -#: src/sort.c:4496 src/wc.c:692 +#: src/sort.c:4550 src/wc.c:692 #, c-format msgid "cannot read file names from %s" msgstr "Kann Dateinamen nicht aus %s lesen." -#: src/sort.c:4518 +#: src/sort.c:4572 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s:%lu: ungültiger Dateiname der Länge 0" -#: src/sort.c:4524 +#: src/sort.c:4578 #, c-format msgid "no input from %s" msgstr "keine Eingabe aus %s" -#: src/sort.c:4570 +#: src/sort.c:4624 #, c-format msgid "using %s sorting rules" msgstr "es werden die Sortierregeln für %s verwendet" -#: src/sort.c:4573 +#: src/sort.c:4627 #, c-format msgid "using simple byte comparison" msgstr "es wird ein einfacher Bytevergleich verwendet" -#: src/sort.c:4604 +#: src/sort.c:4658 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "zusätzlicher Operand %s nicht erlaubt mit -%c" -#: src/split.c:184 +#: src/split.c:187 #, c-format msgid "the suffix length needs to be at least %zu" -msgstr "die Suffixlänge muss mindestens %zu betragen" +msgstr "die Endungslänge muss mindestens %zu betragen" -#: src/split.c:201 +#: src/split.c:204 #, c-format msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" msgstr "Aufruf: %s [OPTION]... [EINGABE [PRÄFIX]]\n" -#: src/split.c:205 +#: src/split.c:208 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" -"\n" msgstr "" "Stücke fester Größe der EINGABE auf PRÄFIXaa, PRÄFIXab, ... ausgeben; " "Vorgabe\n" @@ -9345,7 +9811,7 @@ msgstr "" "wurde oder die EINGABE „-“ ist, wird von der Standardeingabe gelesen.\n" "\n" -#: src/split.c:214 +#: src/split.c:216 #, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" @@ -9363,12 +9829,12 @@ msgid "" " -n, --number=CHUNKS generate CHUNKS output files. See below\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" -" -a, --suffix-length=N Suffixe mit Länge N verwenden (Vorgabe %d)\n" -" -b, --bytes=GRÖSSE GRÖSSE Bytes in die Ausgabedatei ausgeben\n" -" -C, --line-bytes=GRÖSSE höchstens GRÖSSE Bytes pro Zeile auf die Ausgabe\n" +" -a, --suffix-length=N Endungen mit Länge N verwenden (Vorgabe %d)\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" -" -d, --numeric-suffixes[=START] numerische Suffixe statt alphabetischer " -"benutzen\n" +" -d, --numeric-suffixes[=START] numerische Endungen statt alphabetischer\n" +" benutzen\n" " START ändert den Startwert (Vorgabe 0).\n" " -e, --elide-empty-files bei „-n“ keine leeren Ausgabezeilen erzeugen\n" " --filter=BEFEHL schreibe an Shell-BEFEHL; Dateiname ist $FILE\n" @@ -9377,7 +9843,7 @@ msgstr "" " -u, --unbuffered kopiere die Eingabe direkt mit „-n r/...“ zur\n" " Ausgabe\n" -#: src/split.c:227 +#: src/split.c:229 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" @@ -9385,7 +9851,7 @@ msgstr "" " --verbose Meldung ausgeben, bevor\n" " jede Ausgabedatei geöffnet wird\n" -#: src/split.c:234 +#: src/split.c:236 msgid "" "\n" "CHUNKS may be:\n" @@ -9405,127 +9871,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:352 +#: src/split.c:354 #, c-format msgid "output file suffixes exhausted" -msgstr "keine Suffixe für Ausgabedateien mehr verfügbar" +msgstr "keine Endungen für Ausgabedateien mehr verfügbar" -#: src/split.c:364 +#: src/split.c:366 #, c-format msgid "creating file %s\n" msgstr "Datei %s wird angelegt\n" -#: src/split.c:377 +#: src/split.c:375 +#, c-format +msgid "%s would overwrite input; aborting" +msgstr "%s würde die Eingabe überschreiben; Abbruch" + +#: src/split.c:391 #, c-format msgid "failed to set FILE environment variable" msgstr "die Umgebungsvariable FILE konnte nicht gesetzt werden" -#: src/split.c:379 +#: src/split.c:393 #, c-format msgid "executing with FILE=%s\n" msgstr "Ausführung mit DATEI=%s\n" -#: src/split.c:381 +#: src/split.c:395 #, c-format msgid "failed to create pipe" msgstr "Die Pipe konnte nicht erzeugt werden" -#: src/split.c:395 +#: src/split.c:409 #, c-format msgid "closing prior pipe" msgstr "die vorherige Pipe wird geschlossen" -#: src/split.c:397 +#: src/split.c:411 #, c-format msgid "closing output pipe" msgstr "Die Ausgabepipe wird geschlossen" -#: src/split.c:401 +#: src/split.c:415 #, c-format msgid "moving input pipe" msgstr "die Eingabepipe wird verschoben" -#: src/split.c:403 +#: src/split.c:417 #, c-format msgid "closing input pipe" msgstr "die Eingabepipe wird geschlossen" -#: src/split.c:408 +#: src/split.c:422 #, c-format msgid "failed to run command: \"%s -c %s\"" -msgstr "der Befehl konnte nicht ausgeführt werden: \"%s -c %s\"" +msgstr "der Befehl „%s -c %s” konnte nicht ausgeführt werden" -#: src/split.c:414 +#: src/split.c:428 #, c-format msgid "failed to close input pipe" msgstr "die Eingabepipe konnte nicht geschlossen werden" -#: src/split.c:450 +#: src/split.c:464 #, c-format msgid "waiting for child process" msgstr "es wird auf den Kindprozess gewartet" -#: src/split.c:460 +#: src/split.c:474 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "mit FILE=%s, Signal %s von Befehl: %s" -#: src/split.c:468 +#: src/split.c:482 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "mit FILE=%s, Ende mit %d in Befehl: %s" -#: src/split.c:475 src/timeout.c:449 +#: src/split.c:489 src/timeout.c:494 #, c-format msgid "unknown status from command (0x%X)" msgstr "unbekannter Status von Befehl (0x%X)" -#: src/split.c:1037 +#: src/split.c:1052 #, 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:1050 src/split.c:1192 src/split.c:1363 +#: src/split.c:1065 src/split.c:1205 src/split.c:1376 #, c-format msgid "%s: invalid number of chunks" msgstr "%s: ungültige Anzahl von Abschnitten" -#: src/split.c:1054 +#: src/split.c:1069 #, c-format msgid "%s: invalid chunk number" msgstr "%s: ungültige Abschnittsnummer" -#: src/split.c:1106 +#: src/split.c:1119 #, c-format msgid "%s: invalid suffix length" -msgstr "%s: ungültige Suffixlänge" +msgstr "%s: ungültige Endungslänge" -#: src/split.c:1131 src/split.c:1139 src/split.c:1162 src/split.c:1167 +#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180 #, c-format msgid "%s: invalid number of bytes" msgstr "%s: ungültige Anzahl von Bytes" -#: src/split.c:1150 src/split.c:1297 +#: src/split.c:1163 src/split.c:1310 #, c-format msgid "%s: invalid number of lines" msgstr "%s: ungültige Anzahl von Zeilen" -#: src/split.c:1223 +#: src/split.c:1236 #, c-format msgid "line count option -%s%c... is too large" msgstr "Zeilenanzahloption -%s%c... ist zu groß" -#: src/split.c:1235 +#: src/split.c:1248 #, c-format msgid "%s: invalid start value for numerical suffix" msgstr "%s: ungültiger Startwert für eine numerische Endung" -#: src/split.c:1263 +#: src/split.c:1276 #, c-format msgid "%s: invalid IO block size" msgstr "%s: ungültige E/A Blockgröße" -#: src/split.c:1284 +#: src/split.c:1297 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" @@ -9533,62 +10004,62 @@ msgstr "" "ausgegeben\n" "werden" -#: src/split.c:1321 +#: src/split.c:1334 #, 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:1356 +#: src/split.c:1369 #, 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:169 +#: src/stat.c:173 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:838 +#: src/stat.c:857 #, c-format msgid "failed to canonicalize %s" msgstr "%s konnte nicht in kanonische Form gebracht werden" -#: src/stat.c:1050 +#: src/stat.c:1069 #, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "Warnung: unbekannte Flucht‐Sequenz „\\%c“" -#: src/stat.c:1105 +#: src/stat.c:1124 #, c-format msgid "%s: invalid directive" msgstr "%s: ungültige Anweisung" -#: src/stat.c:1151 +#: src/stat.c:1170 #, c-format msgid "warning: backslash at end of format" msgstr "Warnung: ungültiger Rückschrägstrich (\\) am Ende der Zeichenkette" -#: src/stat.c:1182 +#: src/stat.c:1201 #, 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:1189 +#: src/stat.c:1208 #, c-format msgid "cannot read file system information for %s" -msgstr "kann Dateisysteminformation für %s nicht lesen" +msgstr "die Dateisysteminformation für %s kann nicht gelesen werden" -#: src/stat.c:1209 +#: src/stat.c:1228 #, c-format msgid "cannot stat standard input" -msgstr "Status der Standardeingabe kann nicht abgefragt werden" +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:1245 +#: src/stat.c:1264 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -9604,7 +10075,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1268 +#: src/stat.c:1287 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -9614,30 +10085,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1278 +#: src/stat.c:1297 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:1286 +#: src/stat.c:1305 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:1295 +#: src/stat.c:1314 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:1305 +#: src/stat.c:1324 #, c-format msgid "Context: %C\n" msgstr "Kontext: %C\n" -#: src/stat.c:1313 +#: src/stat.c:1332 msgid "" "Access: %x\n" "Modify: %y\n" @@ -9649,19 +10120,19 @@ msgstr "" "Geändert : %z\n" " Geburt : %w\n" -#: src/stat.c:1331 +#: src/stat.c:1350 +msgid "Display file or file system status.\n" +msgstr "Status einer Datei oder eines Dateisystems anzeigen.\n" + +#: src/stat.c:1356 msgid "" -"Display file or file system status.\n" -"\n" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" -"Status einer Datei oder eines Dateisystems anzeigen.\n" -"\n" " -L, --dereference Verknüpfungen folgen\n" " -f, --file-system Dateisystemstatus anstelle von Dateistatus anzeigen\n" -#: src/stat.c:1337 +#: src/stat.c:1360 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -9679,7 +10150,7 @@ msgstr "" " mittels \\n in FORMAT eingefügt werden\n" " -t, --terse die Information in knapper Form ausgeben\n" -#: src/stat.c:1348 +#: src/stat.c:1371 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -9699,7 +10170,7 @@ msgstr "" " %B die Größe in Bytes jedes mit „%b“ gemeldeten Blocks\n" " %C SELinux-Sicherheitskontext-Zeichenkette\n" -#: src/stat.c:1357 +#: src/stat.c:1380 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -9715,7 +10186,7 @@ msgstr "" " %g Gruppen‐ID des Eigners\n" " %G Gruppenname des Eigners\n" -#: src/stat.c:1365 +#: src/stat.c:1388 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -9737,7 +10208,7 @@ msgstr "" " %t Major‐Gerätetyp in Hex\n" " %T Minor‐Gerätetyp in Hex\n" -#: src/stat.c:1376 +#: src/stat.c:1399 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -9763,7 +10234,7 @@ msgstr "" " %Z Zeit der letzten Änderung in Sekunden seit der Epoche\n" "\n" -#: src/stat.c:1390 +#: src/stat.c:1413 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -9781,7 +10252,7 @@ msgstr "" " %d Freie Dateiknoten im Dateisystem\n" " %f Freie Blöcke im Dateisystem\n" -#: src/stat.c:1399 +#: src/stat.c:1422 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -9807,22 +10278,21 @@ msgstr "Aufruf: %s [OPTION]... BEFEHL\n" #: src/stdbuf.c:91 msgid "" "Run COMMAND, with modified buffering operations for its standard streams.\n" -"\n" msgstr "" "Führe BEFEHL mit geänderter Pufferung für seine standard Ein/Ausgabeströme\n" "aus.\n" -#: src/stdbuf.c:98 +#: src/stdbuf.c:97 msgid "" " -i, --input=MODE adjust standard input stream buffering\n" " -o, --output=MODE adjust standard output stream buffering\n" " -e, --error=MODE adjust standard error stream buffering\n" msgstr "" " -i, --input=MODUS ändert die Pufferung der Standardeingabe\n" -" -o, --output=MODUS ändert die Pufferung der Standardausgabe -e, --" -"error=MODUS ändert die Pufferung der Standardfehlerausgabe\n" +" -o, --output=MODUS ändert die Pufferung der Standardausgabe\n" +" -e, --error=MODUS ändert die Pufferung der Standardfehlerausgabe\n" -#: src/stdbuf.c:105 +#: src/stdbuf.c:104 msgid "" "\n" "If MODE is 'L' the corresponding stream will be line buffered.\n" @@ -9832,7 +10302,7 @@ msgstr "" "Wenn der MODUS „L“ ist, wird der zugehörige Strom zeilenweise gepuffert.\n" "Diese Option ist ungültig für die Standardeingabe.\n" -#: src/stdbuf.c:108 +#: src/stdbuf.c:107 msgid "" "\n" "If MODE is '0' the corresponding stream will be unbuffered.\n" @@ -9840,7 +10310,7 @@ msgstr "" "\n" "Wenn der MODUS „0“ ist, wird der zugehörige Strom nicht gepuffert.\n" -#: src/stdbuf.c:111 +#: src/stdbuf.c:110 msgid "" "\n" "Otherwise MODE is a number which may be followed by one of the following:\n" @@ -9858,7 +10328,7 @@ msgstr "" "von\n" "GRÖßE Bytes.\n" -#: src/stdbuf.c:117 +#: src/stdbuf.c:116 msgid "" "\n" "NOTE: If COMMAND adjusts the buffering of its standard streams ('tee' does\n" @@ -9876,22 +10346,22 @@ msgstr "" "E/A\n" "und werden daher durch „stdbuf“ nicht beeinflusst.\n" -#: src/stdbuf.c:227 +#: src/stdbuf.c:226 #, c-format msgid "failed to find %s" msgstr "%s konnte nicht gefunden werden" -#: src/stdbuf.c:247 src/stdbuf.c:279 +#: src/stdbuf.c:246 src/stdbuf.c:278 #, c-format msgid "failed to update the environment with %s" msgstr "die Umgebung konnte nicht mit %s aktualisiert werden" -#: src/stdbuf.c:321 +#: src/stdbuf.c:320 #, c-format msgid "line buffering stdin is meaningless" msgstr "die zeilenweise Pufferung von Stdin hat keinen Sinn" -#: src/stty.c:509 +#: src/stty.c:513 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -9902,34 +10372,34 @@ 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:515 +#: src/stty.c:519 +msgid "Print or change terminal characteristics.\n" +msgstr "Eigenschaften eines Terminals ausgeben oder ändern.\n" + +#: src/stty.c:525 msgid "" -"Print or change terminal characteristics.\n" -"\n" " -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 "" -"Charakteristika des Terminals ausgeben oder ändern.\n" -"\n" " -a, --all alle Einstellungen in lesbarer Form ausgeben\n" " -g, --save alle Einstellungen lesbar für stty ausgeben\n" " -F, --file=GERÄT das angegebene GERÄT anstelle der Standardeingabe " "öffnen\n" " und benutzen\n" -#: src/stty.c:524 +#: src/stty.c:532 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" "settings. The underlying system defines which settings are available.\n" msgstr "" "\n" -"Ein optionales „-“ vor EINSTELLUNGEN bedeutet Verneinung. Ein „*“ markiert\n" -"nicht POSIX‐konforme Einstellungen. Das Wirtssystem bestimmt, welche\n" +"Ein optionales „-“ vor EINSTELLUNGEN bedeutet Verneinung. Ein „*“ markiert\n" +"nicht POSIX‐konforme Einstellungen. Das Wirtssystem bestimmt, welche\n" "Einstellungen zur Verfügung stehen.\n" -#: src/stty.c:529 +#: src/stty.c:537 msgid "" "\n" "Special characters:\n" @@ -9944,7 +10414,7 @@ msgstr "" " eof CHAR CHAR sendet Ende‐der‐Datei (Eingabe beenden)\n" " eol CHAR CHAR beendet Zeile\n" -#: src/stty.c:536 +#: src/stty.c:544 msgid "" " * eol2 CHAR alternate CHAR for ending the line\n" " erase CHAR CHAR will erase the last character typed\n" @@ -9956,7 +10426,7 @@ msgstr "" " intr CHAR CHAR sendet Unterbrechungssignal (Interrupt)\n" " kill CHAR CHAR löscht aktuelle Zeile\n" -#: src/stty.c:542 +#: src/stty.c:550 msgid "" " * lnext CHAR CHAR will enter the next character quoted\n" " quit CHAR CHAR will send a quit signal\n" @@ -9968,7 +10438,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:548 +#: src/stty.c:556 msgid "" " stop CHAR CHAR will stop the output\n" " susp CHAR CHAR will send a terminal stop signal\n" @@ -9980,7 +10450,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:554 +#: src/stty.c:562 msgid "" "\n" "Special settings:\n" @@ -9994,7 +10464,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:561 +#: src/stty.c:569 msgid "" " ispeed N set the input speed to N\n" " * line N use line discipline N\n" @@ -10008,7 +10478,7 @@ msgstr "" "setzen\n" " ospeed N Ausgabegeschwindigkeit auf N setzen\n" -#: src/stty.c:567 +#: src/stty.c:575 msgid "" " * rows N tell the kernel that the terminal has N rows\n" " * size print the number of rows and columns according to the " @@ -10021,13 +10491,14 @@ msgstr "" " speed die Terminal‐Geschwindigkeit ausgeben\n" " time N mit -icanon, die Lesewartezeit auf N Zehntelsekunden setzen\n" -#: src/stty.c:573 +#: src/stty.c:581 msgid "" "\n" "Control settings:\n" " [-]clocal disable modem control signals\n" " [-]cread allow input to be received\n" " * [-]crtscts enable RTS/CTS handshaking\n" +" * [-]cdtrdsr enable DTR/DSR handshaking\n" " csN set character size to N bits, N in [5..8]\n" msgstr "" "\n" @@ -10035,16 +10506,17 @@ msgstr "" " [-]clocal Modemkontrollsignale ignorieren\n" " [-]cread Empfang von Eingaben erlauben\n" "* [-]crtscts RTS/CTS‐Handshaking erlauben\n" +" * [-]cdtrdsr DTR/DSR-Handshaking erlauben\n" " csN Zeichengröße auf N Bits setzen, N in [5..8]\n" -#: src/stty.c:581 +#: src/stty.c:590 msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" " [-]hupcl same as [-]hup\n" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" -" [-]parodd set odd parity (even with '-')\n" +" [-]parodd set odd parity (or even parity with '-')\n" msgstr "" " [-]cstopb zwei Stopp‐Bits pro Zeichen benutzen (eins mit „-“)\n" " [-]hup ein Hangup‐Signal senden, wenn der letzte Prozess das " @@ -10053,9 +10525,9 @@ msgstr "" " [-]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 (auch mit „-“)\n" +" [-]parodd ungerade Parität setzen (oder gerade Parität „-“)\n" -#: src/stty.c:588 +#: src/stty.c:597 msgid "" "\n" "Input settings:\n" @@ -10071,7 +10543,7 @@ msgstr "" " [-]ignbrk Breaks ignorieren\n" " [-]igncr Wagenrücklauf ignorieren\n" -#: src/stty.c:596 +#: src/stty.c:605 msgid "" " [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" @@ -10086,11 +10558,11 @@ msgstr "" " [-]inpck Eingabeprüfung der Parity erlauben\n" " [-]istrip höchstes Bit (das 8.) der Eingabezeichen löschen\n" -#: src/stty.c:603 +#: src/stty.c:612 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr "* [-]iutf8 Eingabezeichen als UTF-8 annehmen\n" -#: src/stty.c:606 +#: src/stty.c:615 msgid "" " * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" @@ -10107,7 +10579,7 @@ msgstr "" " [-]parmrk Parity‐Fehler markieren (mit einer 255‐0‐Zeichenfolge)\n" " [-]tandem dasselbe wie [-]ixoff\n" -#: src/stty.c:614 +#: src/stty.c:623 msgid "" "\n" "Output settings:\n" @@ -10123,7 +10595,7 @@ 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:622 +#: src/stty.c:631 msgid "" " * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of null characters\n" @@ -10140,7 +10612,7 @@ msgstr "" "* [-]onlcr Zeilenvorschub in Wagenrücklauf (CR) wandeln\n" "* [-]onlret Zeilenvorschub bedingt Wagenrücklauf (CR)\n" -#: src/stty.c:630 +#: src/stty.c:639 msgid "" " * [-]onocr do not print carriage returns in the first column\n" " [-]opost postprocess output\n" @@ -10156,7 +10628,7 @@ msgstr "" "* -tabs dasselbe wie tab3\n" "* vtN vertikale Tabulatorverzögerung, N in [0..1]\n" -#: src/stty.c:638 +#: src/stty.c:647 msgid "" "\n" "Local settings:\n" @@ -10170,7 +10642,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:645 +#: src/stty.c:654 msgid "" " * [-]ctlecho echo control characters in hat notation ('^c')\n" " [-]echo echo input characters\n" @@ -10184,7 +10656,7 @@ msgstr "" " [-]echoe dasselbe wie [-]crterase\n" " [-]echok Zeilenvorschub nach Killzeichen ausgeben\n" -#: src/stty.c:652 +#: src/stty.c:661 msgid "" " * [-]echoke same as [-]crtkill\n" " [-]echonl echo newline even if not echoing other characters\n" @@ -10199,7 +10671,7 @@ msgstr "" " [-]icanon erase‐, kill‐, werase‐ und rprnt‐Sonderzeichen erlauben\n" " [-]iexten Sonderzeichen erlauben, die nicht POSIX‐konform sind\n" -#: src/stty.c:659 +#: src/stty.c:668 msgid "" " [-]isig enable interrupt, quit, and suspend special characters\n" " [-]noflsh disable flushing after interrupt and quit special " @@ -10215,7 +10687,7 @@ msgstr "" "* [-]tostop Hintergrundjobs stoppen, die auf das Terminal schreiben\n" "* [-]xcase mit icanon, Großbuchstaben mit „\\“ maskieren\n" -#: src/stty.c:666 +#: src/stty.c:675 msgid "" "\n" "Combination settings:\n" @@ -10229,7 +10701,7 @@ msgstr "" " cbreak dasselbe wie -icanon\n" " -cbreak dasselbe wie icanon\n" -#: src/stty.c:673 +#: src/stty.c:682 msgid "" " cooked same as brkint ignpar istrip icrnl ixon opost isig\n" " icanon, eof and eol characters to their default values\n" @@ -10241,7 +10713,7 @@ msgstr "" " -cooked dasselbe wie raw\n" " crt dasselbe wie echoe echoctl echoke\n" -#: src/stty.c:679 +#: src/stty.c:688 msgid "" " dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" " kill ^u\n" @@ -10255,7 +10727,7 @@ msgstr "" " ek Erase‐ und Killzeichen auf Vorgabewert setzen\n" " evenp dasselbe wie parenb -parodd cs7\n" -#: src/stty.c:686 +#: src/stty.c:695 msgid "" " -evenp same as -parenb cs8\n" " * [-]lcase same as xcase iuclc olcuc\n" @@ -10271,7 +10743,7 @@ msgstr "" " nl dasselbe wie -icrnl -onlcr\n" " -nl dasselbe wie icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" -#: src/stty.c:694 +#: src/stty.c:703 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -10285,7 +10757,7 @@ msgstr "" " pass8 dasselbe wie -parenb -istrip cs8\n" " -pass8 dasselbe wie parenb istrip cs7\n" -#: src/stty.c:701 +#: src/stty.c:710 msgid "" " raw same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" " -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n" @@ -10297,7 +10769,7 @@ msgstr "" " -imaxbel -opost -isig -icanon -xcase min 1 time 0\n" " -raw dasselbe wie cooked\n" -#: src/stty.c:707 +#: src/stty.c:716 msgid "" " sane same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" " -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n" @@ -10314,7 +10786,7 @@ msgstr "" " -xcase -tostop -echoprt echoctl echoke,\n" " alle Sonderzeichen auf ihren Vorgabewert\n" -#: src/stty.c:715 +#: src/stty.c:724 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -10323,20 +10795,20 @@ msgid "" "127; special values ^- or undef used to disable special characters.\n" msgstr "" "\n" -"Die TTY‐Leitung manipulieren, die mit der Standardeingabe verbunden ist. " +"Die TTY‐Leitung manipulieren, die mit der Standardeingabe verbunden ist. " "Ohne\n" "Argumente, die Baud‐Rate, Line‐Disziplin und Abweichungen von „stty sane“\n" -"ausgeben. In den Einstellungen wird CHAR wörtlich genommen oder kodiert wie " +"ausgeben. In den Einstellungen wird CHAR wörtlich genommen oder kodiert wie " "in\n" "^c, 0x37, 0177 oder 127; spezielle Werte ^- oder undef werden benutzt, um\n" "Sonderzeichen zu unterbinden.\n" -#: src/stty.c:787 +#: src/stty.c:796 #, c-format msgid "only one device may be specified" msgstr "nur ein Gerät darf angegeben werden" -#: src/stty.c:817 +#: src/stty.c:826 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" @@ -10345,127 +10817,47 @@ msgstr "" "Die Optionen für ausführliche und stty‐lesbare Ausgabe\n" "können nicht gleichzeitig benutzt werden" -#: src/stty.c:823 +#: src/stty.c:832 #, 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:838 +#: src/stty.c:847 #, 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:883 src/stty.c:993 +#: src/stty.c:892 src/stty.c:1002 #, c-format msgid "invalid argument %s" msgstr "ungültiges Argument %s" -#: src/stty.c:894 src/stty.c:911 src/stty.c:923 src/stty.c:936 src/stty.c:948 -#: src/stty.c:968 +#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957 +#: src/stty.c:977 #, c-format msgid "missing argument to %s" msgstr "fehlendes Argument für %s" -#: src/stty.c:974 +#: src/stty.c:983 #, c-format msgid "invalid line discipline %s" msgstr "ungültige Line‐Disziplin %s" -#: src/stty.c:1044 +#: src/stty.c:1053 #, 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:1390 +#: src/stty.c:1399 #, c-format msgid "%s: no size information for this device" msgstr "%s: Keine Information zur Größe dieses Gerätes" -#: src/stty.c:1904 +#: src/stty.c:1920 #, c-format msgid "invalid integer argument %s" msgstr "ungültiges Ganzzahlargument %s" -#: src/su.c:229 -msgid "Password:" -msgstr "Kennwort:" - -#: src/su.c:232 -#, c-format -msgid "getpass: cannot open /dev/tty" -msgstr "getpass: es ist nicht möglich, /dev/tty zu öffnen" - -#: src/su.c:290 -#, c-format -msgid "cannot set groups" -msgstr "es ist nicht möglich, die Gruppen zu setzen" - -#: src/su.c:294 -#, c-format -msgid "cannot set group id" -msgstr "es ist nicht möglich, die Gruppen‐ID zu setzen" - -#: src/su.c:296 -#, c-format -msgid "cannot set user id" -msgstr "es ist nicht möglich, die Benutzer‐ID zu setzen" - -#: src/su.c:371 -#, c-format -msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" -msgstr "Aufruf: %s [OPTION]... [-] [BENUTZER [ARG]...]\n" - -#: src/su.c:372 -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" - -#: src/su.c:384 -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" - -#: src/su.c:461 -#, c-format -msgid "user %s does not exist" -msgstr "Benutzer %s existiert nicht" - -#: src/su.c:484 -#, c-format -msgid "incorrect password" -msgstr "ungültiges Kennwort" - -#: src/su.c:501 -#, c-format -msgid "using restricted shell %s" -msgstr "eingeschränkte Shell %s benutzen" - -#: src/su.c:509 -#, c-format -msgid "warning: cannot change directory to %s" -msgstr "Warnung: es ist nicht möglich, in das Verzeichnis %s zu wechseln" - #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 msgid "Kayvan Aghaiepour" @@ -10498,7 +10890,7 @@ msgstr "" msgid "ignoring all arguments" msgstr "ignoriere alle Argumente" -#: src/system.h:340 +#: src/system.h:343 #, c-format msgid "" "\n" @@ -10513,15 +10905,24 @@ msgstr "" "auf die Dokumentation der Shell zurück, um die dort unterstützten Optionen\n" "in Erfahrung zu bringen.\n" -#: src/system.h:346 +#: src/system.h:349 msgid " --help display this help and exit\n" msgstr " --help diese Hilfe anzeigen und beenden\n" -#: src/system.h:348 +#: src/system.h:351 msgid " --version output version information and exit\n" msgstr " --version Versionsinformation anzeigen und beenden\n" -#: src/system.h:541 +#: src/system.h:544 +msgid "" +"\n" +"Mandatory arguments to long options are mandatory for short options too.\n" +msgstr "" +"\n" +"Erforderliche Argumente für lange Optionen sind auch für kurze " +"erforderlich.\n" + +#: src/system.h:552 msgid "" "\n" "SIZE is an integer and optional unit (example: 10M is 10*1024*1024). Units\n" @@ -10529,12 +10930,12 @@ msgid "" "1000).\n" msgstr "" "\n" -"GRÖSSE ist eine Ganzzahl und eine optionale Einheit (Beispiel: 10M sind\n" +"GRÖẞE ist eine Ganzzahl und eine optionale Einheit (Beispiel: 10M sind\n" "10*1024*1024). Einheiten sind K, M, G, T, P, E, Z, Y (Potenzen von 1024) " "oder\n" "KB, MB, ... (Potenzen von 1000).\n" -#: src/system.h:550 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -10548,7 +10949,7 @@ msgstr "" "Andernfalls ist die Vorgabe Einheiten von 1024 Bytes \t(oder 512 wenn\n" "POSIXLY_CORRECT gesetzt wurde).\n" -#: src/system.h:560 +#: src/system.h:571 #, c-format msgid "" "\n" @@ -10561,26 +10962,26 @@ msgstr "" #. <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:574 +#: src/system.h:585 #, 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:578 +#: src/system.h:589 #, 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:585 +#: src/system.h:596 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "„%s --help“ liefert weitere Informationen.\n" -#: src/system.h:617 +#: src/system.h:628 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -10604,12 +11005,11 @@ msgstr "Jay Lepreau" msgid "" "Write each FILE to standard output, last line first.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" "Jede DATEI nach Standardausgabe schreiben, die letzte Zeile zuerst.\n" "Wurde keine DATEI angegeben oder ist DATEI „-“, Standardeingabe lesen.\n" -#: src/tac.c:145 +#: src/tac.c:144 msgid "" " -b, --before attach the separator before instead of after\n" " -r, --regex interpret the separator as a regular expression\n" @@ -10621,42 +11021,42 @@ msgstr "" " -s, --separator=ZKETTE ZKETTE als Trennzeichen statt Zeilenumbruch " "benutzen\n" -#: src/tac.c:235 src/tac.c:336 +#: src/tac.c:234 src/tac.c:335 #, c-format msgid "%s: seek failed" msgstr "%s: Seek fehlgeschlagen" -#: src/tac.c:264 +#: src/tac.c:263 #, c-format msgid "record too large" msgstr "Datensatz zu groß" -#: src/tac.c:451 +#: src/tac.c:450 #, c-format msgid "failed to create temporary file in %s" msgstr "die temporäre Datei konnte in %s nicht angelegt werden" -#: src/tac.c:459 +#: src/tac.c:458 #, c-format msgid "failed to open %s for writing" msgstr "%s konnte nicht zum Schreiben geöffnet werden" -#: src/tac.c:476 +#: src/tac.c:475 #, c-format msgid "failed to rewind stream for %s" msgstr "Der Strom für %s konnte nicht zurückgesetzt werden" -#: src/tac.c:512 src/tac.c:519 +#: src/tac.c:511 src/tac.c:518 #, c-format msgid "%s: write error" msgstr "%s: Schreibfehler" -#: src/tac.c:572 +#: src/tac.c:571 #, c-format msgid "failed to open %s for reading" msgstr "%s konnte nicht zum Lesen geöffnet werden" -#: src/tac.c:630 +#: src/tac.c:629 #, c-format msgid "separator cannot be empty" msgstr "Trennzeichen darf nicht leer sein" @@ -10672,14 +11072,13 @@ 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" -"\n" msgstr "" -"Die letzten %d Zeilen jeder DATEI auf Standardausgabe ausgeben. Wurden\n" +"Die letzten %d Zeilen jeder DATEI auf Standardausgabe ausgeben. Wurden\n" "mehrere DATEIen angegeben, wird für jede zunächst der Dateinamen ausgeben.\n" -"Ohne DATEI, oder wenn DATEI „-“ ist, von der Standardeingabe lesen.\n" +"Ohne DATEI, oder wenn DATEI „-“ ist wird von der Standardeingabe gelesen.\n" "\n" -#: src/tail.c:271 +#: src/tail.c:270 msgid "" " -c, --bytes=K output the last K bytes; alternatively, use -c " "+K\n" @@ -10690,7 +11089,7 @@ msgstr "" "benutzen,\n" " um Bytes ab dem Kten jeder Datei auszugeben\n" -#: src/tail.c:275 +#: src/tail.c:274 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -10706,7 +11105,7 @@ msgstr "" " äquivalent\n" " -F gleichbedeutend mit „--follow=name --retry“\n" -#: src/tail.c:282 +#: src/tail.c:281 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -10732,7 +11131,7 @@ msgstr "" " (das ist normalerweise der Fall bei rotierten\n" " Logdateien)\n" -#: src/tail.c:295 +#: src/tail.c:294 msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" " -q, --quiet, --silent never output headers giving file names\n" @@ -10750,7 +11149,7 @@ msgstr "" " verfolgt wird, also mit --follow=Name\n" # -#: src/tail.c:302 +#: src/tail.c:301 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations.\n" @@ -10764,7 +11163,7 @@ msgstr "" " mindestens alle N Sekunden geprüft.\n" " -v, --verbose immer Kopfzeilen mit Dateinamen ausgeben\n" -#: src/tail.c:311 +#: src/tail.c:310 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -10784,7 +11183,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:320 +#: src/tail.c:319 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" @@ -10805,29 +11204,29 @@ msgstr "" "ob\n" "die Datei gelöscht und von einem anderen Programm neu angelegt wurde.\n" -#: src/tail.c:379 +#: src/tail.c:378 #, c-format msgid "closing %s (fd=%d)" msgstr "%s wird geschlossen (df=%d)" -#: src/tail.c:454 +#: 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:458 +#: src/tail.c:457 #, 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:895 +#: src/tail.c:894 #, 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:907 +#: src/tail.c:906 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " @@ -10837,38 +11236,38 @@ msgstr "" "(in\n" "Englisch) an %s. Es wird auf Pollen zurückgefallen" -#: src/tail.c:964 +#: src/tail.c:963 #, c-format msgid "%s has become inaccessible" msgstr "auf %s kann nicht mehr zugegriffen werden" -#: src/tail.c:981 +#: src/tail.c:980 #, 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" -#: src/tail.c:990 +#: src/tail.c:989 #, 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" -#: src/tail.c:1011 +#: src/tail.c:1010 #, c-format msgid "%s has become accessible" msgstr "auf „%s“ kann jetzt zugegriffen werden" -#: src/tail.c:1019 +#: src/tail.c:1018 #, c-format msgid "%s has appeared; following end of new file" msgstr "%s ist aufgetaucht; folge Ende der neuen Datei" -#: src/tail.c:1030 +#: src/tail.c:1029 #, c-format msgid "%s has been replaced; following end of new file" msgstr "%s wurde ersetzt; folge Ende der neuen Datei" -#: src/tail.c:1131 +#: src/tail.c:1130 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: Ändern desf nicht‐blockierenden Modus ist nicht möglich" @@ -10886,7 +11285,7 @@ msgstr "Keine Dateien mehr übrig" #: src/tail.c:1369 #, c-format msgid "cannot watch parent directory of %s" -msgstr "kann Elternverzeichnis von %s nicht beobachten" +msgstr "das Elternverzeichnis von %s kann nicht beobachtet werden" #: src/tail.c:1372 src/tail.c:1387 #, c-format @@ -10896,7 +11295,7 @@ msgstr "die Inotify-Resourcen sind erschöpft" #: src/tail.c:1390 src/tail.c:1519 #, c-format msgid "cannot watch %s" -msgstr "kann %s nicht beobachten" +msgstr "%s nicht beobachtet werden" #: src/tail.c:1473 #, c-format @@ -10961,7 +11360,7 @@ msgstr "Warnung: --pid=PID wird auf diesem System nicht unterstützt" #: src/tail.c:2142 #, c-format msgid "cannot follow %s by name" -msgstr "kann %s nicht nach Namen verfolgen" +msgstr "%s nicht nach Namen verfolgt werden" #: src/tail.c:2148 #, c-format @@ -11242,17 +11641,22 @@ msgstr "„]“ fehlt" msgid "extra argument %s" msgstr "zusätzliches Argument %s" -#: src/timeout.c:124 +#: src/timeout.c:112 +#, c-format +msgid "warning: sigprocmask" +msgstr "Warnung: sigprocmask" + +#: src/timeout.c:145 #, c-format msgid "warning: timer_settime" msgstr "Warnung: timer_settime" -#: src/timeout.c:129 +#: src/timeout.c:150 #, c-format msgid "warning: timer_create" msgstr "Warnung: timer_create" -#: src/timeout.c:204 +#: src/timeout.c:225 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -11261,20 +11665,17 @@ msgstr "" "Aufruf: %s [OPTION] ZEITSPANNE BEFEHL [ARGUMENT]...\n" " oder: %s [OPTION]\n" -#: src/timeout.c:208 -msgid "" -"Start COMMAND, and kill it if still running after DURATION.\n" -"\n" -"Mandatory arguments to long options are mandatory for short options too.\n" +#: src/timeout.c:229 +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" -"\n" -"Erforderliche Argumente für lange Optionen sind auch für kurze " -"erforderlich.\n" -#: src/timeout.c:213 +#: src/timeout.c:235 msgid "" +" --preserve-status\n" +" exit with the same status as COMMAND, even when the\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 " @@ -11288,11 +11689,14 @@ msgid "" " 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" +" wenn der Befehl in die Zeitsperre läuft\n" " --foreground\n" -" Wenn timeout nicht direkt von der Eingabeaufforderung\n" -" gestartet wurde, wird BEFEHL erlaubt, vom TTY zu lesen\n" -" und Signale vom Terminal zu empfangen. In diesem Modus\n" -" werden Kinder von BEFEHL keinen Timeout bekommen.\n" +" Wenn timeout nicht direkt von der Eingabeaufforderung\n" +" gestartet wurde, wird BEFEHL erlaubt, vom TTY zu lesen\n" +" und Signale vom Terminal zu empfangen. In diesem Modus\n" +" werden Kinder von BEFEHL keinen Timeout bekommen.\n" " -k, --kill-after=ZEITSPANNE\n" " sende außerdem das KILL-Signal, wenn BEFEHL so lange " "nach\n" @@ -11303,7 +11707,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:229 +#: src/timeout.c:254 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -11315,15 +11719,15 @@ 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:234 +#: src/timeout.c:259 msgid "" "\n" -"If the command times out, then exit with status 124. Otherwise, exit\n" -"with the status of COMMAND. If no signal is specified, send the TERM\n" -"signal upon timeout. The TERM signal kills any process that does not\n" -"block or catch that signal. For other processes, it may be necessary to\n" -"use the KILL (9) signal, since this signal cannot be caught. If the\n" -"KILL (9) signal is sent, the exit status is 128+9 rather than 124.\n" +"If the command times out, and --preserve-status is not set, then exit with\n" +"status 124. Otherwise, exit with the status of COMMAND. If no signal\n" +"is specified, send the TERM signal upon timeout. The TERM signal kills\n" +"any process that does not block or catch that signal. It may be necessary\n" +"to use the KILL (9) signal, since this signal cannot be caught, in which\n" +"case the exit status is 128+9 rather than 124.\n" msgstr "" "\n" "Wenn ein Befehl von timeout beendet wird, so beendet sich timeout mit einem\n" @@ -11335,15 +11739,20 @@ msgstr "" "werden kann. Wenn das Signal Kill (9) gesendet wird, ist der Rückgabewert\n" "von timeout 128+9 statt 124.\n" -#: src/timeout.c:419 +#: src/timeout.c:363 +#, c-format +msgid "warning: disabling core dumps failed" +msgstr "Warnung: das Verhindern von Coredumps scheiterte" + +#: src/timeout.c:471 #, c-format msgid "error waiting for command" msgstr "Fehler beim Warten auf den Befehl" -#: src/timeout.c:441 +#: src/timeout.c:482 #, c-format -msgid "warning: disabling core dumps failed" -msgstr "Warnung: das Verhindern von Coredumps scheiterte" +msgid "the monitored command dumped core" +msgstr "der beobachtete Befehl erzeugte einen Speicherauszug" #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 @@ -11355,22 +11764,22 @@ msgstr "Jim Kingdon" msgid "Randy Smith" msgstr "Randy Smith" -#: src/touch.c:115 src/touch.c:313 +#: src/touch.c:115 src/touch.c:309 #, c-format msgid "invalid date format %s" msgstr "Ungültiges Datumsformat %s" -#: src/touch.c:194 +#: src/touch.c:191 #, c-format msgid "cannot touch %s" -msgstr "kann %s nicht berühren" +msgstr "%s kann nicht berührt werden" -#: src/touch.c:200 +#: src/touch.c:197 #, c-format msgid "setting times of %s" msgstr "Setzen der Zeiten für %s" -#: src/touch.c:216 +#: src/touch.c:213 msgid "" "Update the access and modification times of each FILE to the current time.\n" "\n" @@ -11379,7 +11788,6 @@ msgid "" "\n" "A FILE argument string of - is handled specially and causes touch to\n" "change the times of the file associated with standard output.\n" -"\n" msgstr "" "Die Zugriffs‐ und Modifikationszeiten jeder DATEI auf die\n" "momentane Zeit aktualisieren.\n" @@ -11391,7 +11799,7 @@ msgstr "" "die mit der Standardausgabe verbunden ist.\n" "\n" -#: src/touch.c:229 +#: src/touch.c:225 msgid "" " -a change only the access time\n" " -c, --no-create do not create any files\n" @@ -11404,7 +11812,7 @@ msgstr "" "verwenden\n" " -f (ignoriert)\n" -#: src/touch.c:235 +#: src/touch.c:231 msgid "" " -h, --no-dereference affect each symbolic link instead of any " "referenced\n" @@ -11418,24 +11826,24 @@ msgstr "" "können.)\n" " -m nur Modifikationszeit ändern\n" -#: src/touch.c:241 +#: src/touch.c:237 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" -" --time=WORD change the specified time:\n" +" --time=WORD change the specified time:\n" " WORD is access, atime, or use: equivalent to -a\n" " WORD is modify or mtime: equivalent to -m\n" msgstr "" " -r, --reference=DATEI Die Zeiten dieser Datei anstatt der momentanen " "Zeit\n" " verwenden.\n" -" -t MARKE [[HH]JJ]MMTTSSmm[.ss] statt momentaner Zeit " -"verwenden.\n" -" --time=WORT Die Zeit, die von WORT angegeben wird, setzen:\n" -" access, atime oder use: wie -a; mtime, modify: " -"wie -m\n" +" -t MARKE [[HH]JJ]MMTTSSmm[.ss] statt der momentanen Zeit\n" +" verwenden.\n" +" --time=WORT Die durch WORT angegebene Zeit setzen:\n" +" access, atime oder use: wie bei -a\n" +" WORT ist modify oder mtime: wie beiu -m\n" -#: src/touch.c:250 +#: src/touch.c:246 msgid "" "\n" "Note that the -d and -t options accept different time-date formats.\n" @@ -11443,12 +11851,12 @@ msgstr "" "\n" "Beachten Sie, dass -d und -t verschiedene Zeit‐Datum‐Formate akzeptieren.\n" -#: src/touch.c:339 +#: src/touch.c:335 #, c-format msgid "cannot specify times from more than one source" msgstr "Angabe von mehr als einer Zeitquelle nicht möglich" -#: src/touch.c:413 +#: src/touch.c:409 #, c-format msgid "" "warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'" @@ -11502,9 +11910,9 @@ msgid "" " \\t horizontal tab\n" msgstr "" "\n" -"MENGEn werden angegeben als Zeichenketten. Die meisten Zeichen stehen für " +"MENGEn werden angegeben als Zeichenketten. Die meisten Zeichen stehen für " "sich\n" -"selbst. Interpretierte Folgen sind:\n" +"selbst. Interpretierte Folgen sind:\n" "\n" " \\NNN Zeichen mit Oktalwert NNN (1 bis 3 oktale Ziffern)\n" " \\\\ Rückschrägstrich (\\)\n" @@ -11573,15 +11981,14 @@ 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" +"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. Zusätzliche Zeichen in MENGE2 werden ignoriert. " -"Nur\n" +"von MENGE1 vergrößert. 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, " +"expandiert. In MENGE2 dürfen sie zum Wandeln nur in Paaren benutzt werden, " "um\n" -"eine Groß-/Kleinschreibung anzuzeigen. -s benutzt MENGE1, wenn nicht\n" +"eine Groß-/Kleinschreibung anzuzeigen. -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" @@ -11741,7 +12148,6 @@ msgid "" "If a FILE is larger than the specified size, the extra data is lost.\n" "If a FILE is shorter, it is extended and the extended part (hole)\n" "reads as zero bytes.\n" -"\n" msgstr "" "Die Größe jeder DATEI auf die angegebene Größe bringen (durch Beschneiden\n" "oder Auffüllen).\n" @@ -11753,18 +12159,18 @@ msgstr "" "Daten verloren. Ist sie kürzer, wird sie erweitert und der erweiterte Teil\n" "(Loch) wird als Nullbytes gelesen.\n" -#: src/truncate.c:110 +#: src/truncate.c:109 msgid " -c, --no-create do not create any files\n" msgstr " -c, --no-create keine Dateien erstellen\n" -#: src/truncate.c:113 +#: src/truncate.c:112 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" " -o, --io-blocks GRÖßE als Anzahl von EA Blöcken statt Bytes " "auffassen\n" -#: src/truncate.c:116 +#: 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" @@ -11772,7 +12178,7 @@ msgstr "" " -r, --reference=DATEI die Größe dieser DATEI nehmen\n" " -s, --size=GRÖßE diese GRÖßE benutzen\n" -#: src/truncate.c:122 +#: src/truncate.c:121 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -11784,57 +12190,57 @@ msgstr "" "‚+‘ erweitern um, ‚-‘ verkleinern um, ‚<‘ höchstens, ‚>‘ mindestens,\n" "‚/‘ abrunden zu Vielfachem von, ‚%‘ aufrunden zu Vielfachem von.\n" -#: src/truncate.c:150 +#: src/truncate.c:149 #, c-format msgid "overflow in %<PRIdMAX> * %<PRIdMAX> byte blocks for file %s" msgstr "Überlauf in %<PRIdMAX> * %<PRIdMAX> Byte-Blöcken für Datei %s" -#: src/truncate.c:174 +#: src/truncate.c:173 #, c-format msgid "%s has unusable, apparently negative size" msgstr "%s has nicht nutzbare, scheinbar negative Größe" -#: src/truncate.c:184 src/truncate.c:379 +#: src/truncate.c:183 src/truncate.c:384 #, c-format msgid "cannot get the size of %s" msgstr "die Größe von %s kann nicht ermittelt werden" -#: src/truncate.c:206 +#: src/truncate.c:205 #, c-format msgid "overflow rounding up size of file %s" msgstr "Überlauf beim Aufrunden der Größe der Datei %s" -#: src/truncate.c:216 +#: src/truncate.c:215 #, c-format msgid "overflow extending size of file %s" msgstr "Überlauf bei erweitern der Größe der Datei %s" -#: src/truncate.c:231 +#: src/truncate.c:230 #, c-format msgid "failed to truncate %s at %<PRIdMAX> bytes" msgstr "Beschneiden von %s bei %<PRIdMAX> Bytes ist misslungen" -#: src/truncate.c:305 +#: src/truncate.c:303 #, c-format msgid "multiple relative modifiers specified" msgstr "mehrere relative Modifikatoren angegeben" -#: src/truncate.c:335 +#: src/truncate.c:333 #, c-format msgid "you must specify either %s or %s" msgstr "Sie müssen entweder %s oder %s angeben" -#: src/truncate.c:342 +#: src/truncate.c:340 #, c-format msgid "you must specify a relative %s with %s" msgstr "Sie müssen eine relative %s zusammen mit %s angeben" -#: src/truncate.c:349 +#: src/truncate.c:347 #, c-format msgid "%s was specified but %s was not" msgstr "%s wurde angegeben, %s aber nicht" -#: src/truncate.c:400 +#: src/truncate.c:404 #, c-format msgid "cannot open %s for writing" msgstr "%s kann nicht zum Schreiben geöffnet werden" @@ -11894,10 +12300,10 @@ msgid "" " -n, --nodename print the network node hostname\n" " -r, --kernel-release print the kernel release\n" msgstr "" -"Bestimmte Systeminformationen ausgeben. Ohne OPTION dasselbe wie -s.\n" +"Bestimmte Systeminformationen ausgeben. Ohne OPTION dasselbe wie -s.\n" "\n" " -a, --all alle Informationen ausgeben, in der folgenden\n" -" Reihenfolge (außer -p und -i wenn nicht " +" Reihenfolge (außer -p und -i, wenn nicht " "bekannt):\n" " -s, --kernel-name Namen des Kernels ausgeben\n" " -n, --nodename Netzwerknamen der Maschine ausgeben\n" @@ -11934,13 +12340,13 @@ msgstr "es ist nicht möglich, den Namen des Betriebssystems zu ermitteln" msgid "" "Convert blanks in each FILE to tabs, writing to standard output.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" -"Alle Leerzeichen in jeder DATEI in Tabulatoren wandeln, auf Standardausgabe\n" -"schreiben. Ohne DATEI, oder wenn DATEI „-“ ist, Standardeingabe lesen.\n" -"\n" +"Alle Leerzeichen in jeder DATEI in Tabulatoren wandeln und auf " +"Standardausgabe\n" +"schreiben. Ohne DATEI, oder wenn DATEI „-“ ist, wird die Standardeingabe\n" +"gelesen.\n" -#: src/unexpand.c:125 +#: src/unexpand.c:124 msgid "" " -a, --all convert all blanks, instead of just initial blanks\n" " --first-only convert only leading sequences of blanks (overrides -a)\n" @@ -11954,12 +12360,12 @@ msgstr "" " -t, --tabs=LISTE kommagetrennte Liste von Tabulatorpositionen verwenden\n" " (-t und --tabs implizieren -a)\n" -#: src/unexpand.c:153 +#: src/unexpand.c:152 #, c-format msgid "tabs are too far apart" msgstr "Tabulatoren sind zu weit auseinander" -#: src/unexpand.c:505 +#: src/unexpand.c:504 #, c-format msgid "tab stop value is too large" msgstr "Tabulatorstopp ist zu groß" @@ -11975,7 +12381,6 @@ msgid "" "writing to OUTPUT (or standard output).\n" "\n" "With no options, matching lines are merged to the first occurrence.\n" -"\n" msgstr "" "Benachbarte identische Zeilen aus EINGABE (oder der Standardeingabe) " "filtern,\n" @@ -11984,7 +12389,7 @@ msgstr "" "Ohne Optionen werden identische Zeilen zur ersten vereinigt.\n" "\n" -#: src/uniq.c:148 +#: src/uniq.c:147 msgid "" " -c, --count prefix lines by the number of occurrences\n" " -d, --repeated only print duplicate lines\n" @@ -11992,7 +12397,7 @@ msgstr "" " -c, --count den Zeilen die Anzahl des Vorkommens voranstellen\n" " -d, --repeated nur die doppelten Zeilen ausgeben\n" -#: src/uniq.c:152 +#: src/uniq.c:151 msgid "" " -D, --all-repeated[=delimit-method] print all duplicate lines\n" " delimit-method={none(default),prepend,separate}\n" @@ -12013,12 +12418,12 @@ msgstr "" " -z, --zero-terminated Zeilen mit Nullbyte, nicht Zeilenvorschub, " "abschließen\n" -#: src/uniq.c:162 +#: src/uniq.c:161 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:167 +#: src/uniq.c:166 msgid "" "\n" "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n" @@ -12028,7 +12433,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:172 +#: src/uniq.c:171 msgid "" "\n" "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n" @@ -12041,24 +12446,24 @@ msgstr "" "anstelle von „uniq“ gleich „sort -u“ verwenden.\n" "Die Vergleiche folgen dabei den durch „LC_COLLATE“ gegebenen Regeln.\n" -#: src/uniq.c:359 +#: src/uniq.c:358 #, c-format msgid "too many repeated lines" msgstr "zu viele wiederholte Zeilen" -#: src/uniq.c:522 +#: src/uniq.c:521 msgid "invalid number of fields to skip" msgstr "Ungültige Anzahl an zu überspringenden Feldern" -#: src/uniq.c:531 +#: src/uniq.c:530 msgid "invalid number of bytes to skip" msgstr "Ungültige Anzahl an zu überspringenden Bytes" -#: src/uniq.c:540 +#: src/uniq.c:539 msgid "invalid number of bytes to compare" msgstr "Ungültige Anzahl an zu vergleichenden Bytes" -#: src/uniq.c:559 +#: src/uniq.c:558 #, c-format msgid "printing all duplicated lines and repeat counts is meaningless" msgstr "" @@ -12116,6 +12521,11 @@ msgid_plural "up %ld days %2d:%02d, " msgstr[0] "%ld Tag %2d:%02d an, " msgstr[1] "%ld Tage %2d:%02d an, " +#: src/uptime.c:149 +#, c-format +msgid "up %2d:%02d, " +msgstr "up %2d:%02d, " + #: src/uptime.c:151 #, c-format msgid "%lu user" @@ -12190,7 +12600,7 @@ msgid "" msgstr "" "Zeilen‐, Wort‐ und Byteanzahl für jede DATEI ausgeben und eine Zeile mit " "der\n" -"Gesamtsumme, wenn mehr als eine DATEI angegeben wurde. Ohne DATEI, oder " +"Gesamtsumme, wenn mehr als eine DATEI angegeben wurde. Ohne DATEI, oder " "wenn\n" "DATEI „-“ ist wird von der Standardeingabe gelesen. Ein Wort ist eine nicht\n" "leere Folge von Zeichen, die durch Leerzeichen begrenzt wird.\n" @@ -12222,40 +12632,40 @@ msgstr "" msgid " old " msgstr " alt " -#: src/who.c:449 +#: src/who.c:440 msgid "system boot" msgstr "Systemstart" -#: src/who.c:456 src/who.c:458 +#: src/who.c:447 src/who.c:449 msgid "id=" msgstr "id=" -#: src/who.c:471 src/who.c:476 +#: src/who.c:462 src/who.c:467 msgid "term=" msgstr "term=" -#: src/who.c:473 src/who.c:477 +#: src/who.c:464 src/who.c:468 msgid "exit=" msgstr "exit=" # 8 chars are okay -#: src/who.c:494 +#: src/who.c:485 msgid "LOGIN" msgstr "LOGIN" -#: src/who.c:514 +#: src/who.c:505 msgid "clock change" msgstr "Stellen der Uhr" -#: src/who.c:526 src/who.c:527 +#: src/who.c:517 src/who.c:518 msgid "run-level" msgstr "Runlevel" -#: src/who.c:530 src/who.c:531 +#: src/who.c:521 src/who.c:522 msgid "last=" msgstr "last=" -#: src/who.c:562 +#: src/who.c:553 #, c-format msgid "" "\n" @@ -12264,45 +12674,45 @@ msgstr "" "\n" "# Benutzer=%lu\n" -#: src/who.c:568 +#: src/who.c:559 msgid "NAME" msgstr "NAME" # 8 chars are okay -#: src/who.c:568 +#: src/who.c:559 msgid "LINE" msgstr "LEITUNG" -#: src/who.c:568 +#: src/who.c:559 msgid "TIME" msgstr "ZEIT" -#: src/who.c:568 +#: src/who.c:559 msgid "IDLE" msgstr "UNTÄTIG" -#: src/who.c:569 +#: src/who.c:560 msgid "PID" msgstr "PID" -#: src/who.c:569 +#: src/who.c:560 msgid "COMMENT" msgstr "KOMMENTAR" -#: src/who.c:569 +#: src/who.c:560 msgid "EXIT" msgstr "EXIT" -#: src/who.c:649 +#: src/who.c:640 #, c-format msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n" msgstr "Aufruf: %s [OPTION]... [ DATEI | ARG1 ARG2 ]\n" -#: src/who.c:650 +#: src/who.c:641 msgid "Print information about users who are currently logged in.\n" msgstr "Informationen über gerade angemeldete Benutzer ausgeben.\n" -#: src/who.c:653 +#: src/who.c:644 msgid "" "\n" " -a, --all same as -b -d --login -p -r -t -T -u\n" @@ -12316,11 +12726,11 @@ msgstr "" " -d, --dead tote Prozesse ausgeben\n" " -H, --heading Kopfzeile mit Spaltenbezeichnungen ausgeben\n" -#: src/who.c:660 +#: src/who.c:651 msgid " -l, --login print system login processes\n" msgstr " -l, --login Login‐Prozesse des Systems ausgeben\n" -#: src/who.c:663 +#: src/who.c:654 msgid "" " --lookup attempt to canonicalize hostnames via DNS\n" " -m only hostname and user associated with stdin\n" @@ -12332,7 +12742,7 @@ msgstr "" " -p, --process aktive Prozesse ausgeben, die von init aufgerufen " "wurden\n" -#: src/who.c:668 +#: src/who.c:659 msgid "" " -q, --count all login names and number of users logged on\n" " -r, --runlevel print current runlevel\n" @@ -12344,7 +12754,7 @@ msgstr "" " -s, --short nur Namen, Leitung und Zeit ausgeben (Vorgabe)\n" " -t, --time das letztmalige Stellen der Systemuhr ausgeben\n" -#: src/who.c:674 +#: src/who.c:665 msgid "" " -T, -w, --mesg add user's message status as +, - or ?\n" " -u, --users list users logged in\n" @@ -12357,7 +12767,7 @@ msgstr "" " --message dasselbe wie -T\n" " --writable dasselbe wie -T\n" -#: src/who.c:682 +#: src/who.c:673 #, c-format msgid "" "\n" @@ -12376,7 +12786,7 @@ msgid "" "\n" msgstr "" "Den Benutzernamen ausgeben, der zu der aktuellen effektiven Benutzer‐ID\n" -"gehört. Dasselbe wie „id -un“.\n" +"gehört. Dasselbe wie „id -un“.\n" "\n" #: src/whoami.c:91 @@ -12402,6 +12812,406 @@ msgstr "" "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" @@ -12579,7 +13389,6 @@ msgstr "" #~ "\n" #~ " -n den abschließenden Zeilenvorschub unterdrücken\n" -#, fuzzy #~ msgid "" #~ "\n" #~ "SIZE is an integer with an optional suffix (example: 10MB). Suffixes " @@ -12650,9 +13459,6 @@ msgstr "" #~ msgid " %4s-blocks Used Available Use%%" #~ msgstr " %4s‐Blöcke Benutzt Verfügbar Ben%%" -#~ msgid "invalid format width" -#~ msgstr "Ungültige Format‐Breite" - #~ msgid "invalid format precision" #~ msgstr "Ungültige Format‐Genauigkeit" @@ -12882,7 +13688,7 @@ msgstr "" #~ "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n" #~ msgstr "" #~ "\n" -#~ "GRÖSSE kann folgende multiplikative Endungen tragen:\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" @@ -13047,8 +13853,7 @@ 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" +#~ "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. " @@ -13059,10 +13864,10 @@ msgstr "" #~ "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" +#~ "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 " +#~ "expandiert. In MENGE2 dürfen sie zum Wandeln nur in Paaren benutzt " #~ "werden, um\n" #~ "eine Groß-/Kleinschreibung anzuzeigen. " diff --git a/po/el.gmo b/po/el.gmo index 7992de30..0ff6e32a 100644 Binary files a/po/el.gmo and b/po/el.gmo differ diff --git a/po/el.po b/po/el.po index 981e8389..c0e15627 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: 2012-05-10 19:35+0200\n" +"POT-Creation-Date: 2013-02-14 15:56+0000\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,20 +39,20 @@ msgid "error closing file" msgstr "σφάλμα κατά το κλείσιμο του αρχείου" # -#: lib/closeout.c:112 src/base64.c:109 src/base64.c:121 src/base64.c:127 -#: src/base64.c:168 src/base64.c:224 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:330 src/expand.c:355 src/head.c:298 -#: src/head.c:348 src/head.c:756 src/head.c:797 src/mktemp.c:350 src/od.c:919 -#: src/paste.c:160 src/shuf.c:369 src/split.c:727 src/split.c:964 -#: src/split.c:969 src/tail.c:350 src/tail.c:1201 src/tail.c:1307 +#: 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 -#: src/unexpand.c:427 src/unexpand.c:443 +#: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "σφάλμα εγγραφής" # -#: lib/copy-acl.c:611 src/copy.c:1160 src/copy.c:2602 +#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617 #, fuzzy, c-format msgid "preserving permissions for %s" msgstr "αδυναμία αλλαγής ιδιοκτησίας στο %s" @@ -274,20 +274,20 @@ msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: η επιλογή `-%s' απαιτεί ένα όρισμα\n" # -#: lib/mkdir-p.c:196 src/install.c:483 +#: lib/mkdir-p.c:196 src/install.c:484 #, c-format msgid "cannot change permissions of %s" msgstr "αδύνατη η αλλαγή δικαιωμάτων του %s" # -#: lib/mkdir-p.c:206 src/copy.c:2261 src/install.c:709 src/install.c:722 +#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722 #, 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:915 src/tac.c:435 +#: src/split.c:929 src/tac.c:434 #, c-format msgid "memory exhausted" msgstr "η μνήμη εξαντλήθηκε" @@ -340,87 +340,87 @@ msgstr "»" msgid "%s: end of file" msgstr "%s: τέλος αρχείου" -#: lib/regcomp.c:130 +#: lib/regcomp.c:131 msgid "Success" msgstr "Επιτυχία" -#: lib/regcomp.c:133 +#: lib/regcomp.c:134 msgid "No match" msgstr "" # -#: lib/regcomp.c:136 +#: lib/regcomp.c:137 #, fuzzy msgid "Invalid regular expression" msgstr "%s: μη έγκυρη κανονική έκφραση: %s" -#: lib/regcomp.c:139 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "" # -#: lib/regcomp.c:142 +#: lib/regcomp.c:143 #, fuzzy msgid "Invalid character class name" msgstr "μη έγκυρη τάξη χαρακτήρων `%s'" -#: lib/regcomp.c:145 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "" -#: lib/regcomp.c:148 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "" -#: lib/regcomp.c:151 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "" -#: lib/regcomp.c:154 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "" -#: lib/regcomp.c:157 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "" -#: lib/regcomp.c:160 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "" -#: lib/regcomp.c:163 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "" # -#: lib/regcomp.c:166 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Η μνήμη εξαντλήθηκε" # -#: lib/regcomp.c:169 +#: lib/regcomp.c:170 #, fuzzy msgid "Invalid preceding regular expression" msgstr "%s: μη έγκυρη κανονική έκφραση: %s" # -#: lib/regcomp.c:172 +#: lib/regcomp.c:173 #, fuzzy msgid "Premature end of regular expression" msgstr "σφάλμα στην ανεύρεση μέσω κανονικής έκφρασης" # -#: lib/regcomp.c:175 +#: lib/regcomp.c:176 #, fuzzy msgid "Regular expression too big" msgstr "σφάλμα στην ανεύρεση μέσω κανονικής έκφρασης" -#: lib/regcomp.c:178 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "" # -#: lib/regcomp.c:703 +#: lib/regcomp.c:704 #, fuzzy msgid "No previous regular expression" msgstr "σφάλμα στην ανεύρεση μέσω κανονικής έκφρασης" @@ -463,7 +463,7 @@ msgid "^[nN]" msgstr "^[nNοΟ]" # -#: lib/set-mode-acl.c:695 src/copy.c:2284 src/cp.c:518 +#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516 #, fuzzy, c-format msgid "setting permissions for %s" msgstr "αδυναμία αλλαγής ιδιοκτησίας στο %s" @@ -618,14 +618,14 @@ msgid "Resource lost" msgstr "" # -#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262 -#: lib/spawn-pipe.c:265 +#: 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:232 lib/spawn-pipe.c:346 lib/wait-process.c:282 +#: 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" @@ -643,29 +643,29 @@ msgid "Unknown signal %d" msgstr "" # -#: lib/unicodeio.c:103 +#: lib/unicodeio.c:102 msgid "iconv function not usable" msgstr "" # -#: lib/unicodeio.c:105 +#: lib/unicodeio.c:104 msgid "iconv function not available" msgstr "" # -#: lib/unicodeio.c:112 +#: lib/unicodeio.c:111 #, fuzzy msgid "character out of range" msgstr "%s: αριθμός γραμμής έξω από τα όρια" # -#: lib/unicodeio.c:182 +#: lib/unicodeio.c:181 #, c-format msgid "cannot convert U+%04X to local character set" msgstr "" # -#: lib/unicodeio.c:184 +#: lib/unicodeio.c:183 #, c-format msgid "cannot convert U+%04X to local character set: %s" msgstr "" @@ -840,7 +840,7 @@ msgstr "" "\n" "Αναφέρατε σφάλματα στο <%s>.\n" -#: lib/version-etc.c:251 src/system.h:562 +#: lib/version-etc.c:251 src/system.h:573 #, fuzzy, c-format msgid "%s home page: <%s>\n" msgstr "Χρήση: %s [ΕΠΙΛΟΓΗ]\n" @@ -850,7 +850,7 @@ msgstr "Χρήση: %s [ΕΠΙΛΟΓΗ]\n" msgid "%s home page: <http://www.gnu.org/software/%s/>\n" msgstr "" -#: lib/version-etc.c:256 src/system.h:563 +#: lib/version-etc.c:256 src/system.h:574 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" @@ -947,15 +947,22 @@ msgstr "το %s είναι πολύ μεγάλο" msgid "Simon Josefsson" msgstr "" +# #: src/base64.c:60 -#, c-format +#, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" "Base64 encode or decode FILE, or standard input, to standard output.\n" -"\n" msgstr "" +"Χρήση: %s [ΕΠΙΛΟΓΗ] [ΑΡΧΕΙΟ]\n" +"Εγγραφή πλήρους ταξινομημένης λίστας σε συμφωνία με τη μερική ταξινόμηση\n" +"στο ΑΡΧΕΙΟ. Χωρίς ΑΡΧΕΙΟ, ή όταν το αρχείο είναι το -, ανάγνωση από την\n" +"κανονική είσοδο.\n" +"\n" +" --help εμφάνιση αυτής της βοήθειας και έξοδος\n" +" --version εμφάνιση πληροφοριών έκδοσης και έξοδος\n" -#: src/base64.c:64 +#: src/base64.c:67 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -966,13 +973,13 @@ msgid "" msgstr "" # -#: src/base64.c:73 src/cat.c:110 src/fmt.c:293 src/shuf.c:71 src/sum.c:70 +#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" msgstr "" -#: src/base64.c:76 +#: src/base64.c:79 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -982,40 +989,40 @@ msgid "" msgstr "" # -#: src/base64.c:171 src/base64.c:208 src/csplit.c:263 src/csplit.c:1435 -#: src/join.c:451 src/shuf.c:157 src/shuf.c:361 src/tac-pipe.c:74 +#: 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 #, c-format msgid "read error" msgstr "σφάλμα ανάγνωσης" # -#: src/base64.c:227 +#: src/base64.c:230 #, c-format msgid "invalid input" msgstr "Μη έγκυρη είσοδος" # -#: src/base64.c:264 +#: src/base64.c:267 #, fuzzy, c-format msgid "invalid wrap size: %s" msgstr "μη έγκυρο είδος αλφαριθμητικού `%s'" -#: src/base64.c:283 src/basename.c:173 src/comm.c:435 src/cp.c:607 -#: src/date.c:441 src/dircolors.c:447 src/du.c:894 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:169 src/install.c:929 src/join.c:961 -#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:157 src/mv.c:447 -#: src/od.c:1802 src/ptx.c:2081 src/readlink.c:154 src/seq.c:408 -#: src/shuf.c:320 src/shuf.c:339 src/sort.c:4477 src/split.c:1313 -#: src/tr.c:1797 src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:454 -#: src/uniq.c:471 src/unlink.c:81 src/uptime.c:250 src/users.c:146 -#: src/wc.c:666 src/who.c:836 src/whoami.c:79 +#: 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 #, c-format msgid "extra operand %s" msgstr "" # -#: src/base64.c:315 src/cat.c:781 +#: src/base64.c:318 src/cat.c:781 #, fuzzy, c-format msgid "closing standard input" msgstr "κανονική είσοδος" @@ -1024,15 +1031,15 @@ 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/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:53 src/env.c:33 +#: 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/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:65 src/su.c:88 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 +#: 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 "Πωλ Ρούμπιν και Ντέιβιντ Μακένζη" @@ -1052,7 +1059,6 @@ msgstr "" msgid "" "Print NAME with any leading directory components removed.\n" "If specified, also remove a trailing SUFFIX.\n" -"\n" msgstr "" "Τυπώνει το ΟΝΟΜΑ χωρίς να ακολουθείται απο συστατικά καταλόγου.\n" "Εαν προσδιορίζεται, αφαιρεί το ΕΠΙΘΗΜΑ που ακολουθεί.\n" @@ -1060,14 +1066,14 @@ msgstr "" " --help Εκτυπώνει αυτή την βοήθεια και τερματίζει\n" " --version Εκτυπώνει πληροφορίες έκδοσης και τερματίζει\n" -#: src/basename.c:59 +#: 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" msgstr "" -#: src/basename.c:66 +#: src/basename.c:67 #, c-format msgid "" "\n" @@ -1079,20 +1085,21 @@ msgid "" msgstr "" # -#: src/basename.c:167 src/chcon.c:531 src/chgrp.c:277 src/chmod.c:526 -#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1369 +#: 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:183 src/mkfifo.c:108 src/mknod.c:146 src/nohup.c:111 -#: src/pathchk.c:148 src/printf.c:674 src/readlink.c:146 src/realpath.c:236 -#: src/rm.c:314 src/rmdir.c:223 src/seq.c:402 src/setuidgid.c:137 -#: src/sleep.c:119 src/stat.c:1476 src/stdbuf.c:346 src/tr.c:1782 +#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 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 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:52 src/split.c:49 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/split.c:49 msgid "Torbjorn Granlund" msgstr "" @@ -1103,8 +1110,8 @@ msgid "Richard M. Stallman" msgstr "" # -#: src/cat.c:88 src/df.c:846 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4720 src/nl.c:182 src/paste.c:435 src/pr.c:2768 src/sum.c:58 +#: 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/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 +1191,7 @@ msgid "cannot do ioctl on %s" msgstr "αδυναμία εκτέλεσης ioctl στο `%s'" # -#: src/cat.c:637 src/dd.c:2209 src/sort.c:379 src/tee.c:165 src/yes.c:86 +#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86 #, c-format msgid "standard output" msgstr "κανονική έξοδος" @@ -1202,14 +1209,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:55 src/head.c:46 src/hostid.c:33 +#: 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 msgid "Jim Meyering" msgstr "" -#: src/chcon.c:100 src/runcon.c:203 src/runcon.c:234 +#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238 #, fuzzy, c-format msgid "failed to create security context: %s" msgstr "διατήρηση ωρών στο %s" @@ -1219,8 +1226,8 @@ msgstr "διατήρηση ωρών στο %s" msgid "failed to set %s security context component to %s" msgstr "" -#: src/chcon.c:156 src/chcon.c:540 src/copy.c:2222 src/runcon.c:217 -#: src/stat.c:683 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221 +#: src/stat.c:702 #, fuzzy, c-format msgid "failed to get security context of %s" msgstr "διατήρηση ωρών στο %s" @@ -1238,13 +1245,13 @@ msgstr "αδυναμία αλλαγής ιδιοκτησίας στο %s" # #: src/chcon.c:255 src/chmod.c:216 src/chown-core.c:325 src/copy.c:581 -#: src/du.c:446 src/ls.c:2981 +#: src/du.c:457 src/ls.c:2981 #, 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:426 +#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437 #, fuzzy, c-format msgid "cannot read directory %s" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" @@ -1256,14 +1263,14 @@ 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:599 +#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562 #, fuzzy, c-format msgid "fts_read failed" msgstr "αποτυχία ανάγνωσης" # -#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:618 -#: src/remove.c:613 +#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642 +#: src/remove.c:576 #, fuzzy, c-format msgid "fts_close failed" msgstr "σφάλμα κλεισίματος αρχείου" @@ -1284,10 +1291,9 @@ msgid "" "Change the security context of each FILE to CONTEXT.\n" "With --reference, change the security context of each FILE to that of " "RFILE.\n" -"\n" msgstr "" -#: src/chcon.c:362 src/chgrp.c:123 src/chown.c:94 +#: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94 msgid "" " --dereference affect the referent of each symbolic link (this is\n" " the default), rather than the symbolic link itself\n" @@ -1295,7 +1301,7 @@ msgid "" "file\n" msgstr "" -#: src/chcon.c:367 +#: src/chcon.c:369 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" @@ -1303,22 +1309,28 @@ msgid "" " -l, --range=RANGE set range RANGE in the target security context\n" msgstr "" -#: src/chcon.c:373 +#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 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 msgid "" " --reference=RFILE use RFILE's security context rather than " "specifying\n" " a CONTEXT value\n" msgstr "" -#: src/chcon.c:377 src/chgrp.c:140 src/chown.c:118 +#: 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:380 +#: src/chcon.c:386 msgid " -v, --verbose output a diagnostic for every file processed\n" msgstr "" -#: src/chcon.c:383 src/chgrp.c:143 src/chown.c:121 +#: src/chcon.c:389 src/chgrp.c:143 src/chown.c:121 msgid "" "\n" "The following options modify how a hierarchy is traversed when the -R\n" @@ -1333,38 +1345,38 @@ msgid "" "\n" msgstr "" -#: src/chcon.c:512 src/chgrp.c:264 src/chown.c:267 +#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267 #, c-format msgid "-R --dereference requires either -H or -L" msgstr "" -#: src/chcon.c:518 +#: src/chcon.c:524 #, c-format msgid "-R -h requires -P" msgstr "" # -#: src/chcon.c:533 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282 -#: src/comm.c:429 src/csplit.c:1371 src/join.c:1149 src/link.c:79 -#: src/mknod.c:148 src/setuidgid.c:139 src/tr.c:1785 +#: 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 #, c-format msgid "missing operand after %s" msgstr "λείπει τελεστής μετά το %s" # -#: src/chcon.c:556 src/runcon.c:247 +#: src/chcon.c:562 src/runcon.c:251 #, fuzzy, c-format msgid "invalid context: %s" msgstr "μη έγκυρο είδος αλφαριθμητικού `%s'" -#: src/chcon.c:563 +#: src/chcon.c:569 #, c-format msgid "conflicting security context specifiers given" msgstr "" -#: src/chcon.c:572 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:433 src/cp.c:493 -#: src/mv.c:96 src/pwd.c:273 src/rm.c:324 src/touch.c:351 +#: 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 #, fuzzy, c-format msgid "failed to get attributes of %s" msgstr "διατήρηση ωρών στο %s" @@ -1411,12 +1423,6 @@ msgstr "" " --help εμφάνιση αυτής της βοήθειας και έξοδος\n" " --version εμφάνιση πληροφοριών έκδοσης και έξοδος\n" -#: src/chgrp.c:132 src/chmod.c:387 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/chgrp.c:136 msgid "" " --reference=RFILE use RFILE's group rather than specifying a\n" @@ -1652,7 +1658,7 @@ msgid "Roland McGrath" msgstr "" # -#: src/chroot.c:97 src/install.c:575 src/setuidgid.c:110 src/setuidgid.c:120 +#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120 #, c-format msgid "invalid group %s" msgstr "μη έγκυρη ομάδα %s" @@ -1717,8 +1723,8 @@ msgid "failed to set user-ID" msgstr "διατήρηση ωρών στο %s" # -#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:213 src/stdbuf.c:366 -#: src/timeout.c:402 +#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365 +#: src/timeout.c:454 #, fuzzy, c-format msgid "failed to run command %s" msgstr "αδύνατη η αλλαγή δικαιωμάτων στο %s" @@ -1828,21 +1834,25 @@ msgid "empty %s not allowed" msgstr "" # -#: src/copy.c:168 src/dd.c:1609 src/dd.c:1976 -#, fuzzy, c-format -msgid "reading %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 +#, c-format +msgid "error reading %s" msgstr "σφάλμα ανάγνωσης %s" # -#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:426 +#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425 #, fuzzy, c-format msgid "cannot lseek %s" msgstr "αδύνατη η αλλαγή δικαιωμάτων στο %s" # -#: src/copy.c:206 src/dd.c:2039 src/dd.c:2102 -#, fuzzy, c-format -msgid "writing %s" +#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151 +#, c-format +msgid "error writing %s" msgstr "σφάλμα εγγραφής %s" #: src/copy.c:313 @@ -1867,7 +1877,7 @@ msgstr "διατήρηση ωρών στο %s" msgid "clearing permissions for %s" msgstr "αδυναμία αλλαγής ιδιοκτησίας στο %s" -#: src/copy.c:697 src/copy.c:2470 src/cp.c:331 +#: src/copy.c:697 src/copy.c:2480 src/cp.c:329 #, fuzzy, c-format msgid "failed to preserve ownership for %s" msgstr "διατήρηση ιδιοκτήτη για το %s" @@ -1882,15 +1892,15 @@ msgstr "διατήρηση ωρών στο %s" msgid "failed to preserve authorship for %s" msgstr "διατήρηση ιδιοκτήτη για το %s" -#: src/copy.c:804 src/csplit.c:638 src/du.c:901 src/fmt.c:449 src/head.c:847 -#: src/sort.c:4489 src/split.c:1329 src/tail.c:1756 src/wc.c:678 +#: 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 "αδυναμία ανοίγματος του %s προς ανάγνωση" # -#: src/copy.c:810 src/copy.c:972 src/dd.c:1546 src/dd.c:2114 src/dd.c:2252 -#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:141 +#: 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 #, fuzzy, c-format msgid "cannot fstat %s" msgstr "αδύνατη η αλλαγή δικαιωμάτων στο %s" @@ -1911,14 +1921,14 @@ msgid "failed to set the security context of %s to %s" msgstr "αποτυχία αλλαγής της ομάδας από %s σε %s\n" # -#: src/copy.c:881 src/copy.c:1574 src/copy.c:1777 src/copy.c:1935 src/ln.c:314 -#: src/remove.c:267 src/remove.c:293 src/remove.c:444 src/remove.c:465 +#: 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 "αδύνατη η αλλαγή δικαιωμάτων στο %s" -#: src/copy.c:886 src/copy.c:1578 src/copy.c:1772 src/copy.c:1940 -#: src/remove.c:418 +#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945 +#: src/remove.c:375 #, fuzzy, c-format msgid "removed %s\n" msgstr "διαγραφή καταλόγου %s\n" @@ -1934,106 +1944,106 @@ msgstr "" msgid "cannot create regular file %s" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" +# #: src/copy.c:985 #, fuzzy, c-format msgid "failed to clone %s from %s" -msgstr "διατήρηση ωρών στο %s" +msgstr "αδύνατη η αλλαγή στο κατάλογο %s" -#: src/copy.c:1098 src/copy.c:2531 +#: src/copy.c:1098 src/copy.c:2541 #, c-format msgid "preserving times for %s" msgstr "διατήρηση ωρών στο %s" -# -#: src/copy.c:1170 src/copy.c:1176 src/head.c:855 src/touch.c:175 -#: src/truncate.c:413 +#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172 +#: src/truncate.c:417 #, fuzzy, c-format -msgid "closing %s" -msgstr "κλείσιμο του %s (fd=%d)" +msgid "failed to close %s" +msgstr "διατήρηση ωρών στο %s" -#: src/copy.c:1466 +#: src/copy.c:1471 #, fuzzy, c-format msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? " msgstr "%s: αντιγραφή πάνω στο `%s', παράκαμψη δικαιωμάτων %04lo; " # -#: src/copy.c:1473 +#: src/copy.c:1478 #, c-format msgid "%s: overwrite %s? " msgstr "%s: αντικατάσταση %s; " -#: src/copy.c:1542 +#: src/copy.c:1547 #, c-format msgid " (backup: %s)" msgstr " (αντίγραφο ασφαλείας: %s)" -#: src/copy.c:1552 +#: src/copy.c:1557 #, c-format msgid "failed to restore the default file creation context" msgstr "" # -#: src/copy.c:1584 +#: src/copy.c:1589 #, fuzzy, c-format msgid "cannot create hard link %s to %s" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" # -#: src/copy.c:1637 src/copy.c:1689 src/copy.c:2272 src/copy.c:2589 +#: 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:1220 src/truncate.c:365 +#: src/stat.c:1239 src/truncate.c:363 #, fuzzy, c-format msgid "cannot stat %s" msgstr "αδύνατη η αλλαγή δικαιωμάτων στο %s" # -#: src/copy.c:1645 +#: src/copy.c:1650 #, fuzzy, c-format msgid "omitting directory %s" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" -#: src/copy.c:1659 +#: src/copy.c:1664 #, c-format msgid "warning: source file %s specified more than once" msgstr "" -#: src/copy.c:1707 src/ln.c:246 +#: src/copy.c:1712 src/ln.c:246 #, fuzzy, c-format msgid "%s and %s are the same file" msgstr "τα `%s' και `%s' είναι το ίδιο αρχείο" # -#: src/copy.c:1806 +#: src/copy.c:1811 #, fuzzy, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "αδύνατη η αλλαγή στο κατάλογο %s" -#: src/copy.c:1824 src/ln.c:214 +#: src/copy.c:1829 src/ln.c:214 #, fuzzy, c-format msgid "will not overwrite just-created %s with %s" msgstr "%s: δε μπορεί να γραφτεί μη-κατάλογος πάνω σε κατάλογο" # -#: src/copy.c:1842 +#: src/copy.c:1847 #, fuzzy, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" # -#: src/copy.c:1856 +#: src/copy.c:1861 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "" "αδύνατη η μετακίνηση του καταλόγου σε κάτι που δεν είναι κατάλογος: %s -> %s" -#: src/copy.c:1886 +#: src/copy.c:1891 #, fuzzy, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "" "η δημιουργία αντιγράφου ασφαλείας του `%s' θα κατέστρεφε τη πηγή· το `%s' δε " "μετακινείται" -#: src/copy.c:1887 +#: src/copy.c:1892 #, fuzzy, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "" @@ -2041,57 +2051,57 @@ msgstr "" "δεν αντιγράφεται" # -#: src/copy.c:1910 src/ln.c:276 +#: src/copy.c:1915 src/ln.c:276 #, fuzzy, c-format msgid "cannot backup %s" msgstr "αδύνατη η αλλαγή δικαιωμάτων στο %s" -#: src/copy.c:1974 +#: src/copy.c:1979 #, fuzzy, c-format msgid "will not copy %s through just-created symlink %s" msgstr "%s: δε μπορεί να γραφτεί μη-κατάλογος πάνω σε κατάλογο" # -#: src/copy.c:2051 +#: src/copy.c:2056 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "αδύνατη η αντιγραφή του καταλόγου %s μέσα στον εαυτό του, %s" # -#: src/copy.c:2068 +#: src/copy.c:2073 #, fuzzy, c-format msgid "will not create hard link %s to directory %s" msgstr "αδύνατη η αλλαγή στο κατάλογο %s" # -#: src/copy.c:2118 +#: src/copy.c:2123 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "αδύνατη η μετακίνηση του %s σε υποκατάλογο του εαυτού του, %s" # -#: src/copy.c:2161 +#: src/copy.c:2166 #, fuzzy, c-format msgid "cannot move %s to %s" msgstr "αδύνατη η αλλαγή δικαιωμάτων στο %s" -#: src/copy.c:2173 +#: src/copy.c:2178 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" -#: src/copy.c:2207 src/install.c:905 src/mkdir.c:189 src/mkfifo.c:114 -#: src/mknod.c:167 +#: 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:2241 +#: src/copy.c:2246 #, fuzzy, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "%s: αδυναμία αντιγραφής κυκλίκού συμβολικού συνδέσμου" -#: src/copy.c:2350 +#: src/copy.c:2355 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "" @@ -2099,53 +2109,53 @@ msgstr "" "κατάλογο" # -#: src/copy.c:2357 +#: src/copy.c:2362 #, fuzzy, c-format msgid "cannot create symbolic link %s to %s" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" # -#: src/copy.c:2406 src/mkfifo.c:133 +#: src/copy.c:2416 src/mkfifo.c:132 #, fuzzy, c-format msgid "cannot create fifo %s" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" # -#: src/copy.c:2415 +#: src/copy.c:2425 #, c-format msgid "cannot create special file %s" msgstr "αδυναμία δημιουργίας του ειδικού αρχείου %s" # -#: src/copy.c:2426 src/ls.c:3191 src/stat.c:902 +#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921 #, fuzzy, c-format msgid "cannot read symbolic link %s" msgstr "συμβολικός σύνδεσμος" # -#: src/copy.c:2453 +#: src/copy.c:2463 #, fuzzy, c-format msgid "cannot create symbolic link %s" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" -#: src/copy.c:2485 +#: src/copy.c:2495 #, fuzzy, c-format msgid "%s has unknown file type" msgstr "%s: άγνωστο είδος αρχείου" # -#: src/copy.c:2629 src/ln.c:358 +#: src/copy.c:2644 src/ln.c:358 #, fuzzy, c-format msgid "cannot un-backup %s" msgstr "αδύνατη η αλλαγή δικαιωμάτων στο %s" # src/copy.c:924 -#: src/copy.c:2633 +#: src/copy.c:2648 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (χρήση αντιγράφου ασφαλείας)\n" -#: src/cp.c:156 src/mv.c:284 +#: src/cp.c:156 src/mv.c:286 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -2157,24 +2167,10 @@ msgstr "" " ή: %s [ΕΠΙΛΟΓΗ]... ΠΡΩΤΟΣ ΑΥΞΗΣΗ ΤΕΛΕΥΤΑΙΟΣ\n" #: src/cp.c:162 -msgid "" -"Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" -"\n" -msgstr "" - -# -#: src/cp.c:166 src/csplit.c:1458 src/cut.c:197 src/df.c:852 src/du.c:268 -#: src/expand.c:112 src/fmt.c:275 src/fold.c:75 src/head.c:115 -#: src/install.c:612 src/kill.c:86 src/ln.c:392 src/ls.c:4726 src/mkdir.c:61 -#: src/mkfifo.c:56 src/mknod.c:58 src/mv.c:294 src/nl.c:191 src/paste.c:445 -#: src/pr.c:2777 src/ptx.c:1825 src/shred.c:153 src/shuf.c:58 src/sort.c:399 -#: src/split.c:211 src/stdbuf.c:95 src/tac.c:142 src/tail.c:268 -#: src/touch.c:226 src/truncate.c:107 src/unexpand.c:122 src/uniq.c:145 -msgid "" -"Mandatory arguments to long options are mandatory for short options too.\n" +msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" msgstr "" -#: src/cp.c:169 +#: src/cp.c:168 msgid "" " -a, --archive same as -dR --preserve=all\n" " --attributes-only don't copy the file data, just the " @@ -2188,32 +2184,33 @@ msgid "" " -d same as --no-dereference --preserve=links\n" msgstr "" -#: src/cp.c:178 +#: src/cp.c:177 msgid "" " -f, --force if an existing destination file cannot be\n" -" opened, remove it and try again (redundant " -"if\n" -" the -n option is used)\n" +" opened, remove it and try again (this " +"option\n" +" is ignored when the -n option is also " +"used)\n" " -i, --interactive prompt before overwrite (overrides a previous " "-n\n" " option)\n" " -H follow command-line symbolic links in SOURCE\n" msgstr "" -#: src/cp.c:188 +#: src/cp.c:186 msgid "" " -l, --link hard link files instead of copying\n" " -L, --dereference always follow symbolic links in SOURCE\n" msgstr "" -#: src/cp.c:192 +#: src/cp.c:190 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:197 +#: src/cp.c:195 msgid "" " -p same as --preserve=mode,ownership,timestamps\n" " --preserve[=ATTR_LIST] preserve the specified attributes (default:\n" @@ -2223,13 +2220,13 @@ msgid "" " all\n" msgstr "" -#: src/cp.c:205 +#: src/cp.c:203 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:209 +#: src/cp.c:207 msgid "" " -R, -r, --recursive copy directories recursively\n" " --reflink[=WHEN] control clone/CoW copies. See below\n" @@ -2238,7 +2235,7 @@ msgid "" "force)\n" msgstr "" -#: src/cp.c:215 +#: src/cp.c:213 #, fuzzy msgid "" " --sparse=WHEN control creation of sparse files. See below\n" @@ -2295,7 +2292,7 @@ msgstr "" "Με --sparse=never απογορεύετε τη δημιουργία αραιών αρχείων.\n" "\n" -#: src/cp.c:220 +#: src/cp.c:218 msgid "" " -s, --symbolic-link make symbolic links instead of copying\n" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -2304,7 +2301,7 @@ msgid "" " -T, --no-target-directory treat DEST as a normal file\n" msgstr "" -#: src/cp.c:226 +#: src/cp.c:224 #, fuzzy msgid "" " -u, --update copy only when the SOURCE file is newer\n" @@ -2335,7 +2332,7 @@ msgstr "" " --version εμφάνιση πληροφοριών έκδοσης και έξοδος\n" "\n" -#: src/cp.c:235 +#: src/cp.c:233 #, fuzzy msgid "" "\n" @@ -2400,7 +2397,7 @@ msgstr "" "Με --sparse=never απογορεύετε τη δημιουργία αραιών αρχείων.\n" "\n" -#: src/cp.c:247 src/install.c:649 src/ln.c:421 src/mv.c:321 +#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322 #, fuzzy msgid "" "\n" @@ -2423,7 +2420,7 @@ msgstr "" " απλά αντίγραφα\n" " simple, never πάντα δημιουργία απλών αντιγράφων\n" -#: src/cp.c:254 src/install.c:656 src/mv.c:328 +#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329 #, fuzzy msgid "" " none, off never make backups (even if --backup is given)\n" @@ -2444,7 +2441,7 @@ msgstr "" " απλά αντίγραφα\n" " simple, never πάντα δημιουργία απλών αντιγράφων\n" -#: src/cp.c:260 +#: src/cp.c:258 msgid "" "\n" "As a special case, cp makes a backup of SOURCE when the force and backup\n" @@ -2456,99 +2453,99 @@ msgstr "" "και τα ΠΗΓΗ και ΠΡΟΟΡΙΣΜΟΣ έχουν το ίδιο όνομα, για ένα υπάρχον, κανονικό " "αρχείο.\n" -#: src/cp.c:319 +#: src/cp.c:317 #, fuzzy, c-format msgid "failed to preserve times for %s" msgstr "διατήρηση ωρών στο %s" # -#: src/cp.c:350 +#: src/cp.c:348 #, fuzzy, c-format msgid "failed to preserve permissions for %s" msgstr "αδυναμία αλλαγής ιδιοκτησίας στο %s" # -#: src/cp.c:477 +#: src/cp.c:475 #, fuzzy, c-format msgid "cannot make directory %s" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" # -#: src/cp.c:526 src/cp.c:545 +#: src/cp.c:524 src/cp.c:543 #, fuzzy, c-format msgid "%s exists but is not a directory" msgstr "το `%s' υπάρχει ήδη άλλα δεν είναι κατάλογος" -#: src/cp.c:572 src/cp.c:1068 src/install.c:401 src/install.c:844 src/ln.c:123 -#: src/ln.c:181 src/ln.c:202 src/ln.c:516 src/mv.c:152 src/mv.c:399 +#: 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 -msgid "accessing %s" -msgstr "διαγραφή καταλόγου %s\n" +msgid "failed to access %s" +msgstr "διατήρηση ωρών στο %s" # -#: src/cp.c:592 src/install.c:914 src/ln.c:546 src/mv.c:432 src/shred.c:1182 -#: src/touch.c:433 src/truncate.c:356 +#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181 +#: src/touch.c:429 src/truncate.c:354 #, fuzzy, c-format msgid "missing file operand" msgstr "προσπέρασμα ορίσματος" # -#: src/cp.c:594 src/install.c:916 src/ln.c:560 src/mv.c:434 +#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436 #, fuzzy, c-format msgid "missing destination file operand after %s" msgstr "έχει παραληφθεί η λίστα με τα πεδία" # -#: src/cp.c:603 src/install.c:925 src/mv.c:443 +#: src/cp.c:601 src/install.c:926 src/mv.c:445 #, fuzzy, c-format msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)" msgstr "το `%s' υπάρχει ήδη άλλα δεν είναι κατάλογος" # -#: src/cp.c:619 src/cp.c:1070 src/install.c:403 src/install.c:846 -#: src/install.c:938 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:401 -#: src/mv.c:457 +#: 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 msgid "target %s is not a directory" msgstr "το `%s' υπάρχει ήδη άλλα δεν είναι κατάλογος" -#: src/cp.c:730 +#: src/cp.c:728 #, fuzzy, c-format msgid "with --parents, the destination must be a directory" msgstr "" "όταν διατηρούνται τα μονοπάτια, το τελευταίο όρισμα πρέπει να είναι κατάλογος" -#: src/cp.c:1063 src/install.c:839 src/ln.c:511 src/mv.c:394 +#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395 #, fuzzy, c-format msgid "multiple target directories specified" msgstr "\\%c: Μη έγκυρη διαφυγή." -#: src/cp.c:1108 +#: src/cp.c:1110 #, c-format msgid "cannot make both hard and symbolic links" msgstr "αδυναμία δημιουργίας σθεναρών(hard) και συμβολικών συνδέσμων" # -#: src/cp.c:1115 src/mv.c:464 +#: src/cp.c:1117 src/mv.c:466 #, fuzzy, c-format msgid "options --backup and --no-clobber are mutually exclusive" msgstr "οι επιλογές --string και --check είναι αμοιβαίως αποκλειόμενες" -#: src/cp.c:1121 +#: src/cp.c:1123 #, c-format msgid "--reflink can be used only with --sparse=auto" msgstr "" -#: src/cp.c:1129 src/install.c:899 src/ln.c:582 src/mv.c:472 +#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474 msgid "backup type" msgstr "είδος αντιγράφου ασφάλειας" -#: src/cp.c:1154 +#: src/cp.c:1156 #, c-format msgid "cannot preserve security context without an SELinux-enabled kernel" msgstr "" -#: src/cp.c:1160 +#: src/cp.c:1162 #, c-format msgid "cannot preserve extended attributes, cp is built without xattr support" msgstr "" @@ -2559,91 +2556,91 @@ msgid "Stuart Kemp" msgstr "" # -#: src/csplit.c:529 +#: src/csplit.c:531 #, c-format msgid "input disappeared" msgstr "η είσοδος εξαφανίστηκε" # -#: src/csplit.c:658 src/csplit.c:669 +#: src/csplit.c:660 src/csplit.c:671 #, c-format msgid "%s: line number out of range" msgstr "%s: αριθμός γραμμής έξω από τα όρια" # -#: src/csplit.c:698 +#: src/csplit.c:700 #, fuzzy, c-format msgid "%s: %s: line number out of range" msgstr "%s: `%s': αριθμός γραμμής έξω από τα όρια" # -#: src/csplit.c:701 src/csplit.c:750 +#: src/csplit.c:703 src/csplit.c:752 #, fuzzy, c-format msgid " on repetition %s\n" msgstr " στην επανάληψη %d\n" # -#: src/csplit.c:744 +#: src/csplit.c:746 #, fuzzy, c-format msgid "%s: %s: match not found" msgstr "%s: `%s': δεν βρέθηκε ταίριασμα" # -#: src/csplit.c:808 src/csplit.c:848 src/nl.c:359 src/tac.c:274 +#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273 #, c-format msgid "error in regular expression search" msgstr "σφάλμα στην ανεύρεση μέσω κανονικής έκφρασης" # -#: src/csplit.c:981 +#: src/csplit.c:983 #, fuzzy, c-format msgid "write error for %s" msgstr "σφάλμα εγγραφής για το `%s'" # -#: src/csplit.c:1057 +#: src/csplit.c:1059 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: αναμενόταν ακέραιος μετά τον οριοθέτη" # -#: src/csplit.c:1073 +#: src/csplit.c:1075 #, fuzzy, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: το `}' απαιτείται όταν δηλώνονται οι επαναλήψεις" # -#: src/csplit.c:1083 +#: src/csplit.c:1085 #, fuzzy, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: απαιτείται ακέραιος μεταξύ των `{' και `}'" # -#: src/csplit.c:1110 +#: src/csplit.c:1112 #, fuzzy, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: ο τελεστής τερματισμού `%c' έχει παραληφθεί" # -#: src/csplit.c:1127 +#: src/csplit.c:1129 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: μη έγκυρη κανονική έκφραση: %s" # -#: src/csplit.c:1160 +#: src/csplit.c:1162 #, c-format msgid "%s: invalid pattern" msgstr "%s: μη έγκυρη μορφή" # -#: src/csplit.c:1163 +#: src/csplit.c:1165 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: ο αριθμός γραμμής πρέπει να είναι μεγαλύτερος από το μηδέν" # -#: src/csplit.c:1169 +#: src/csplit.c:1171 #, fuzzy, c-format msgid "line number %s is smaller than preceding line number, %s" msgstr "" @@ -2651,7 +2648,7 @@ msgstr "" "%s" # -#: src/csplit.c:1175 +#: src/csplit.c:1177 #, fuzzy, c-format msgid "warning: line number %s is the same as preceding line number" msgstr "" @@ -2659,61 +2656,60 @@ msgstr "" "γραμμής" # -#: src/csplit.c:1253 +#: src/csplit.c:1255 #, c-format msgid "missing conversion specifier in suffix" msgstr "έχει παραληφθεί ο δηλωτής μετατροπής στην κατάληξη" # -#: src/csplit.c:1259 +#: src/csplit.c:1261 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "μη έγκυρος δηλωτής μετατροπής στην κατάληξη: %c" # -#: src/csplit.c:1262 +#: src/csplit.c:1264 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "μη έγκυρος δηλωτής μετατροπής στην κατάληξη: \\%.3o" # -#: src/csplit.c:1267 +#: src/csplit.c:1269 #, fuzzy, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "μη έγκυρη δήλωση πεδίου `%s'" # -#: src/csplit.c:1284 +#: src/csplit.c:1286 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "πάρα πολλές δηλώσεις μετατροπής στην κατάληξη" # -#: src/csplit.c:1298 +#: src/csplit.c:1300 #, c-format msgid "missing %% conversion specification in suffix" msgstr "έχει παραληφθεί η δήλωση μετατροπής %% στην κατάληξη" # -#: src/csplit.c:1345 +#: src/csplit.c:1347 #, c-format msgid "%s: invalid number" msgstr "%s: μη έγκυρος αριθμός" # -#: src/csplit.c:1449 +#: src/csplit.c:1451 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Χρήση: %s [ΕΠΙΛΟΓΗ]... ΑΡΧΕΙΟ ΜΟΡΦΗ...\n" -#: src/csplit.c:1453 +#: src/csplit.c:1455 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" -"\n" msgstr "" -#: src/csplit.c:1461 +#: src/csplit.c:1462 #, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2722,7 +2718,7 @@ msgid "" msgstr "" # -#: src/csplit.c:1466 +#: src/csplit.c:1467 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" @@ -2730,13 +2726,13 @@ msgid "" msgstr "" # -#: src/csplit.c:1473 +#: src/csplit.c:1474 msgid "" "\n" "Read standard input if FILE is -. Each PATTERN may be:\n" msgstr "" -#: src/csplit.c:1477 +#: src/csplit.c:1478 msgid "" "\n" " INTEGER copy up to but not including specified line number\n" @@ -2753,7 +2749,7 @@ msgstr "" msgid "David M. Ihnat" msgstr "" -#: src/cut.c:64 +#: src/cut.c:64 src/cut.c:372 msgid "fields and positions are numbered from 1" msgstr "" @@ -2763,15 +2759,12 @@ msgstr "" msgid "Usage: %s OPTION... [FILE]...\n" msgstr "Χρήση: %s [ΕΠΙΛΟΓΕΣ]... [ΑΡΧΕΙΟ]...\n" -# #: src/cut.c:193 -msgid "" -"Print selected parts of lines from each FILE to standard output.\n" -"\n" +msgid "Print selected parts of lines from each FILE to standard output.\n" msgstr "" # -#: src/cut.c:200 +#: src/cut.c:199 #, fuzzy msgid "" " -b, --bytes=LIST select only these bytes\n" @@ -2787,7 +2780,7 @@ msgstr "" " --help εμφάνιση αυτής της βοήθειας και έξοδος\n" " --version εμφάνιση πληροφοριών έκδοσης και έξοδος\n" -#: src/cut.c:205 +#: src/cut.c:204 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2795,21 +2788,21 @@ msgid "" " -n (ignored)\n" msgstr "" -#: src/cut.c:211 +#: src/cut.c:210 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" msgstr "" # -#: src/cut.c:215 +#: src/cut.c:214 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:222 +#: src/cut.c:221 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2817,7 +2810,7 @@ msgid "" "in the same order that it is read, and is written exactly once.\n" msgstr "" -#: src/cut.c:228 +#: src/cut.c:227 msgid "" "Each range is one of:\n" "\n" @@ -2830,57 +2823,59 @@ msgid "" msgstr "" # -#: src/cut.c:368 src/cut.c:489 -msgid "invalid byte or field list" +#: src/cut.c:367 src/cut.c:493 +#, fuzzy +msgid "invalid byte, character or field list" msgstr "μη έγκυρο byte ή λίστα πεδίων" # -#: src/cut.c:385 +#: src/cut.c:387 #, fuzzy msgid "invalid range with no endpoint: -" msgstr "μη έγκυρο είδος αλφαριθμητικού `%s'" # -#: src/cut.c:399 +#: src/cut.c:403 #, fuzzy msgid "invalid decreasing range" msgstr "μη έγκυρο είδος αλφαριθμητικού `%s'" # -#: src/cut.c:478 +#: src/cut.c:482 #, fuzzy, c-format msgid "byte offset %s is too large" msgstr "το %s είναι πολύ μεγάλο" # -#: src/cut.c:481 +#: src/cut.c:485 #, fuzzy, c-format msgid "field number %s is too large" msgstr "μη έγκυρος αριθμός πεδίου: `%s'" # -#: src/cut.c:789 src/cut.c:797 +#: src/cut.c:795 src/cut.c:803 msgid "only one type of list may be specified" msgstr "μόνο ένα είδος λίστας μπορεί να οριστεί" # -#: src/cut.c:806 +#: src/cut.c:812 src/numfmt.c:1408 +#, c-format msgid "the delimiter must be a single character" msgstr "ο διαχωριστής πρέπει να είναι ένας μόνο χαρακτήρας" # -#: src/cut.c:841 +#: src/cut.c:847 msgid "you must specify a list of bytes, characters, or fields" msgstr "πρέπει να ορίσετε λίστα από bytes, χαρακτήρες ή πεδία" # -#: src/cut.c:844 +#: src/cut.c:850 #, fuzzy msgid "an input delimiter may be specified only when operating on fields" msgstr "ένας διαχωριστής μπορεί να οριστεί μόνο όταν λειτουργούμε με πεδία" # -#: src/cut.c:848 +#: src/cut.c:854 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2889,12 +2884,12 @@ msgstr "" "\tμόνο όταν λειτουργούμε με πεδία" # -#: src/cut.c:864 +#: src/cut.c:870 msgid "missing list of fields" msgstr "έχει παραληφθεί η λίστα με τα πεδία" # -#: src/cut.c:866 +#: src/cut.c:872 msgid "missing list of positions" msgstr "έχει παραληφθεί η λίστα με τις θέσεις" @@ -2908,9 +2903,11 @@ msgstr "" " ή: %s [ΕΠΙΛΟΓΗ] [ΜΜΗΗωωλλ[[ΥΥ]ΧΧ][.δδ]]\n" #: src/date.c:128 +msgid "Display the current time in the given FORMAT, or set the system date.\n" +msgstr "" + +#: src/date.c:134 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" " -I[TIMESPEC], --iso-8601[=TIMESPEC] output date/time in ISO 8601 format.\n" @@ -2919,14 +2916,14 @@ msgid "" " and time to the indicated precision.\n" msgstr "" -#: src/date.c:138 +#: src/date.c:142 msgid "" " -r, --reference=FILE display the last modification time of FILE\n" " -R, --rfc-2822 output date and time in RFC 2822 format.\n" " Example: Mon, 07 Aug 2006 12:34:56 -0600\n" msgstr "" -#: src/date.c:143 +#: src/date.c:147 msgid "" " --rfc-3339=TIMESPEC output date and time in RFC 3339 format.\n" " TIMESPEC='date', 'seconds', or 'ns' for\n" @@ -2937,7 +2934,7 @@ msgid "" " -u, --utc, --universal print or set Coordinated Universal Time\n" msgstr "" -#: src/date.c:154 +#: src/date.c:158 msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" @@ -2946,7 +2943,7 @@ msgid "" " %a locale's abbreviated weekday name (e.g., Sun)\n" msgstr "" -#: src/date.c:161 +#: src/date.c:165 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2954,7 +2951,7 @@ msgid "" " %c locale's date and time (e.g., Thu Mar 3 23:05:25 2005)\n" msgstr "" -#: src/date.c:167 +#: src/date.c:171 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2962,14 +2959,14 @@ msgid "" " %e day of month, space padded; same as %_d\n" msgstr "" -#: src/date.c:173 +#: src/date.c:177 msgid "" " %F full date; same as %Y-%m-%d\n" " %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 "" -#: src/date.c:178 +#: src/date.c:182 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2977,7 +2974,7 @@ msgid "" " %j day of year (001..366)\n" msgstr "" -#: src/date.c:184 +#: src/date.c:188 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -2985,7 +2982,7 @@ msgid "" " %M minute (00..59)\n" msgstr "" -#: src/date.c:190 +#: src/date.c:194 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2996,7 +2993,7 @@ msgid "" " %s seconds since 1970-01-01 00:00:00 UTC\n" msgstr "" -#: src/date.c:199 +#: src/date.c:203 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -3004,7 +3001,7 @@ msgid "" " %u day of week (1..7); 1 is Monday\n" msgstr "" -#: src/date.c:205 +#: src/date.c:209 msgid "" " %U week number of year, with Sunday as first day of week (00..53)\n" " %V ISO week number, with Monday as first day of week (01..53)\n" @@ -3012,7 +3009,7 @@ msgid "" " %W week number of year, with Monday as first day of week (00..53)\n" msgstr "" -#: src/date.c:211 +#: src/date.c:215 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -3020,7 +3017,7 @@ msgid "" " %Y year\n" msgstr "" -#: src/date.c:217 +#: src/date.c:221 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -3032,7 +3029,7 @@ msgid "" "By default, date pads numeric fields with zeroes.\n" msgstr "" -#: src/date.c:226 +#: src/date.c:230 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -3043,7 +3040,7 @@ msgid "" " # use opposite case if possible\n" msgstr "" -#: src/date.c:235 +#: src/date.c:239 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -3052,7 +3049,7 @@ msgid "" "O to use the locale's alternate numeric symbols if available.\n" msgstr "" -#: src/date.c:242 +#: src/date.c:246 msgid "" "\n" "Examples:\n" @@ -3067,39 +3064,39 @@ msgid "" msgstr "" # -#: src/date.c:275 src/dd.c:2193 src/head.c:838 src/md5sum.c:477 -#: src/md5sum.c:798 src/od.c:863 src/od.c:1914 src/pr.c:1176 src/pr.c:1372 -#: src/pr.c:1494 src/stty.c:842 src/tac.c:563 src/tail.c:343 src/tee.c:126 +#: 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 #, c-format msgid "standard input" msgstr "κανονική είσοδος" # -#: src/date.c:303 src/date.c:523 +#: src/date.c:307 src/date.c:527 #, fuzzy, c-format msgid "invalid date %s" msgstr "μη έγκυρος αριθμός πεδίου: `%s'" -#: src/date.c:414 src/date.c:448 +#: src/date.c:418 src/date.c:452 #, fuzzy, c-format msgid "multiple output formats specified" msgstr "\\%c: Μη έγκυρη διαφυγή." # -#: src/date.c:426 +#: src/date.c:430 #, fuzzy, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "οι επιλογές --string και --check είναι αμοιβαίως αποκλειόμενες" -#: src/date.c:433 +#: src/date.c:437 #, c-format msgid "the options to print and set the time may not be used together" msgstr "" "Οι επιλογές για να εκτυπωθεί και να οριστεί η ώρα δεν μπορούν να\n" "χρησιμοποιηθούν παράλληλα." -#: src/date.c:454 +#: src/date.c:458 #, fuzzy, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -3111,25 +3108,25 @@ msgstr "" "κάθε παράμετρος που δεν είναι επιλογή πρέπει να είναι διαμορφωμένη έτσι\n" "ώστε να ξεκινάει με το `+'." -#: src/date.c:531 +#: src/date.c:535 #, c-format msgid "cannot set date" msgstr "Δεν μπορεί να τεθεί η ημερομηνία." # -#: src/date.c:554 src/du.c:360 +#: src/date.c:558 src/du.c:371 #, fuzzy, c-format msgid "time %s is out of range" msgstr "%s: αριθμός γραμμής έξω από τα όρια" #. This is a proper name. See the gettext manual, section Names. -#: src/dd.c:44 src/factor.c:43 src/rm.c:41 src/tail.c:69 src/touch.c:41 +#: 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 "" # -#: src/dd.c:517 +#: src/dd.c:521 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3138,7 +3135,7 @@ msgstr "" "Χρήση: %s [ΤΕΛΕΣΤΗΣ]...\n" " ή: %s ΕΠΙΛΟΓΗ\n" -#: src/dd.c:522 +#: src/dd.c:526 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -3149,7 +3146,7 @@ msgid "" " ibs=BYTES read up to BYTES bytes at a time (default: 512)\n" msgstr "" -#: src/dd.c:531 +#: src/dd.c:535 msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -3158,13 +3155,14 @@ msgid "" " oflag=FLAGS write as per the comma separated symbol list\n" " seek=N skip N obs-sized blocks at start of output\n" " skip=N skip N ibs-sized blocks at start of input\n" -" status=noxfer suppress transfer statistics\n" +" status=WHICH WHICH info to suppress outputting to stderr;\n" +" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" msgstr "" -#: src/dd.c:541 +#: src/dd.c:546 msgid "" "\n" -"BLOCKS and BYTES may be followed by the following multiplicative suffixes:\n" +"N and BYTES may be followed by the following multiplicative suffixes:\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, and so on for T, P, E, Z, Y.\n" "\n" @@ -3172,7 +3170,7 @@ msgid "" "\n" msgstr "" -#: src/dd.c:550 +#: src/dd.c:555 msgid "" " ascii from EBCDIC to ASCII\n" " ebcdic from ASCII to EBCDIC\n" @@ -3187,7 +3185,7 @@ msgid "" " with block or unblock, pad with spaces rather than NULs\n" msgstr "" -#: src/dd.c:563 +#: src/dd.c:568 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3197,7 +3195,7 @@ msgid "" " fsync likewise, but also write metadata\n" msgstr "" -#: src/dd.c:571 +#: src/dd.c:576 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3206,77 +3204,77 @@ msgid "" "suggested)\n" msgstr "" -#: src/dd.c:578 +#: src/dd.c:583 msgid " cio use concurrent I/O for data\n" msgstr "" -#: src/dd.c:580 +#: src/dd.c:585 msgid " direct use direct I/O for data\n" msgstr "" # -#: src/dd.c:582 +#: src/dd.c:587 #, fuzzy msgid " directory fail unless a directory\n" msgstr "το `%s' υπάρχει ήδη άλλα δεν είναι κατάλογος" -#: src/dd.c:584 +#: src/dd.c:589 msgid " dsync use synchronized I/O for data\n" msgstr "" -#: src/dd.c:586 +#: src/dd.c:591 msgid " sync likewise, but also for metadata\n" msgstr "" -#: src/dd.c:587 +#: src/dd.c:592 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr "" -#: src/dd.c:590 +#: src/dd.c:595 msgid " nonblock use non-blocking I/O\n" msgstr "" -#: src/dd.c:592 +#: src/dd.c:597 msgid " noatime do not update access time\n" msgstr "" -#: src/dd.c:595 +#: src/dd.c:600 msgid " nocache discard cached data\n" msgstr "" -#: src/dd.c:598 +#: src/dd.c:603 msgid " noctty do not assign controlling terminal from file\n" msgstr "" -#: src/dd.c:601 +#: src/dd.c:606 msgid " nofollow do not follow symlinks\n" msgstr "" -#: src/dd.c:603 +#: src/dd.c:608 msgid " nolinks fail if multiply-linked\n" msgstr "" -#: src/dd.c:605 +#: src/dd.c:610 msgid " binary use binary I/O for data\n" msgstr "" -#: src/dd.c:607 +#: src/dd.c:612 msgid " text use text I/O for data\n" msgstr "" -#: src/dd.c:609 +#: src/dd.c:614 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:612 +#: src/dd.c:617 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:615 +#: src/dd.c:620 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:620 +#: src/dd.c:625 #, c-format msgid "" "\n" @@ -3293,28 +3291,28 @@ msgid "" "\n" msgstr "" -#: src/dd.c:676 +#: src/dd.c:683 #, c-format msgid "" "%<PRIuMAX>+%<PRIuMAX> records in\n" "%<PRIuMAX>+%<PRIuMAX> records out\n" msgstr "" -#: src/dd.c:682 +#: src/dd.c:689 #, fuzzy, c-format msgid "%<PRIuMAX> truncated record\n" msgid_plural "%<PRIuMAX> truncated records\n" msgstr[0] "μηδενισμένη εγγραφή και γράψιμο πάνω σε αυτή (truncated)" msgstr[1] "μηδενισμένη εγγραφή και γράψιμο πάνω σε αυτή (truncated)" -#: src/dd.c:694 +#: src/dd.c:701 #, c-format msgid "%<PRIuMAX> byte (%s) copied" msgid_plural "%<PRIuMAX> bytes (%s) copied" msgstr[0] "" msgstr[1] "" -#: src/dd.c:712 +#: src/dd.c:720 msgid "Infinity B" msgstr "" @@ -3328,253 +3326,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:725 +#: src/dd.c:733 #, c-format msgid ", %g s, %s/s\n" msgstr "" # -#: src/dd.c:804 +#: src/dd.c:812 #, fuzzy, c-format msgid "closing input file %s" msgstr "δημιουργία αρχείου `%s'\n" -#: src/dd.c:811 +#: src/dd.c:819 #, fuzzy, c-format msgid "closing output file %s" msgstr "διαγραφή καταλόγου %s\n" -#: src/dd.c:1014 +#: src/dd.c:1022 #, fuzzy, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "αποτυχία αλλαγής της ομάδας από %s σε %s\n" # -#: src/dd.c:1085 src/dd.c:1934 +#: src/dd.c:1093 src/dd.c:1942 #, fuzzy, c-format msgid "writing to %s" msgstr "σφάλμα εγγραφής %s" # -#: src/dd.c:1199 src/dd.c:1253 +#: src/dd.c:1207 src/dd.c:1261 #, c-format msgid "unrecognized operand %s" msgstr "άγνωστος τελεστής %s" # -#: src/dd.c:1210 +#: src/dd.c:1218 #, fuzzy msgid "invalid conversion" msgstr "μη έγκυρο είδος αλφαριθμητικού `%s'" # -#: src/dd.c:1213 src/dd.c:1289 +#: src/dd.c:1221 src/dd.c:1297 #, fuzzy msgid "invalid input flag" msgstr "μη έγκυρος αριθμός πεδίου: `%s'" # -#: src/dd.c:1216 src/dd.c:1283 src/dd.c:1295 +#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303 msgid "invalid output flag" msgstr "μη έγκυρη σημαία εξόδου" # -#: src/dd.c:1219 +#: src/dd.c:1227 msgid "invalid status flag" msgstr "μη έγκυρη σημαία κατάστασης" # -#: src/dd.c:1258 src/truncate.c:312 +#: src/dd.c:1266 src/truncate.c:310 #, c-format msgid "invalid number %s" msgstr "μη έγκυρος αριθμός %s" -#: src/dd.c:1340 +#: src/dd.c:1348 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "" # -#: src/dd.c:1342 +#: src/dd.c:1350 #, fuzzy, c-format msgid "cannot combine block and unblock" msgstr "δεν είναι δυνατό να παραληφθεί χρήστης και ομάδα" -#: src/dd.c:1344 +#: src/dd.c:1352 #, fuzzy, c-format msgid "cannot combine lcase and ucase" msgstr "δεν είναι δυνατό να δημιουργηθεί το %s `%s' στο `%s'" # -#: src/dd.c:1346 +#: src/dd.c:1354 #, fuzzy, c-format msgid "cannot combine excl and nocreat" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" # -#: src/dd.c:1349 +#: src/dd.c:1357 #, fuzzy, c-format msgid "cannot combine direct and nocache" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" -#: src/dd.c:1506 +#: src/dd.c:1514 #, 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:1593 +#: src/dd.c:1601 #, fuzzy, c-format msgid "%s: cannot skip" msgstr "%s: δε μπορεί να διαγραφεί" -#: src/dd.c:1595 src/dd.c:1614 src/dd.c:1675 +#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683 #, fuzzy, c-format msgid "%s: cannot seek" msgstr "%s: δε μπορεί να διαγραφεί" -#: src/dd.c:1655 +#: src/dd.c:1663 #, c-format msgid "offset overflow while reading file %s" msgstr "" -#: src/dd.c:1667 +#: src/dd.c:1675 #, c-format msgid "warning: invalid file offset after failed read" msgstr "" -#: src/dd.c:1671 +#: src/dd.c:1679 #, c-format msgid "cannot work around kernel bug after all" msgstr "" -#: src/dd.c:1814 +#: src/dd.c:1822 #, fuzzy, c-format msgid "setting flags for %s" msgstr "διατήρηση ωρών στο %s" -#: src/dd.c:1867 +#: src/dd.c:1875 #, c-format msgid "memory exhausted by input buffer of size %zu bytes (%s)" msgstr "" -#: src/dd.c:1881 +#: src/dd.c:1889 #, c-format msgid "memory exhausted by output buffer of size %zu bytes (%s)" msgstr "" # -#: src/dd.c:1914 +#: src/dd.c:1922 #, fuzzy, c-format msgid "%s: cannot skip to specified offset" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" -#: src/dd.c:2125 src/dd.c:2258 +#: src/dd.c:2133 #, fuzzy, c-format -msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" +msgid "failed to truncate to %<PRIdMAX> bytes in output file %s" msgstr "διαγραφή καταλόγου %s\n" -#: src/dd.c:2138 +#: src/dd.c:2146 #, c-format msgid "fdatasync failed for %s" msgstr "" -#: src/dd.c:2148 +#: src/dd.c:2156 #, c-format msgid "fsync failed for %s" msgstr "" -# -#: src/dd.c:2199 src/dd.c:2228 +#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165 #, fuzzy, c-format -msgid "opening %s" -msgstr "σφάλμα ανάγνωσης %s" +msgid "failed to open %s" +msgstr "διατήρηση ωρών στο %s" -#: src/dd.c:2237 +#: src/dd.c:2246 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) " "blocks" msgstr "" -#: src/dd.c:2274 src/dd.c:2280 +#: src/dd.c:2267 +#, 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 #, 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:54 src/expr.c:153 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:39 src/sleep.c:35 src/sort.c:66 +#: 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 msgid "Paul Eggert" msgstr "" -#: src/df.c:140 +#: src/df.c:172 msgid "Filesystem" msgstr "" -#: src/df.c:141 +#: src/df.c:175 msgid "Type" msgstr "" # -#: src/df.c:142 +#: src/df.c:178 src/df.c:542 #, fuzzy msgid "blocks" msgstr "μέγεθος μπλοκ" -#: src/df.c:142 -msgid "Inodes" +#: src/df.c:181 +msgid "Used" msgstr "" -#: src/df.c:142 -msgid "Size" +#: src/df.c:184 +msgid "Available" msgstr "" -#: src/df.c:143 -msgid "Used" +#: src/df.c:187 +msgid "Use%" msgstr "" -#: src/df.c:143 -msgid "IUsed" +#: src/df.c:190 +msgid "Inodes" msgstr "" -#: src/df.c:144 -msgid "Available" +#: src/df.c:193 +msgid "IUsed" msgstr "" -#: src/df.c:144 +#: src/df.c:196 msgid "IFree" msgstr "" -#: src/df.c:144 -msgid "Avail" +#: src/df.c:199 +msgid "IUse%" msgstr "" -#: src/df.c:145 -msgid "Use%" +#: src/df.c:202 +msgid "Mounted on" msgstr "" -#: src/df.c:145 -msgid "IUse%" +#: src/df.c:383 +#, c-format +msgid "option --output: field '%s' unknown" +msgstr "" + +#: src/df.c:390 +#, c-format +msgid "option --output: field '%s' used more than once" +msgstr "" + +#: src/df.c:410 src/df.c:449 +msgid "Size" msgstr "" -#: src/df.c:145 +#: src/df.c:414 src/df.c:451 +msgid "Avail" +msgstr "" + +#: src/df.c:474 msgid "Capacity" msgstr "" -#: src/df.c:146 -msgid "Mounted on" +#. 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 +#, c-format +msgid "%s-%s" msgstr "" -#: src/df.c:847 +#: src/df.c:1210 msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" -"\n" msgstr "" -#: src/df.c:855 +#: src/df.c:1217 msgid "" " -a, --all include dummy file systems\n" " -B, --block-size=SIZE scale sizes by SIZE before printing them. E.g.,\n" @@ -3586,7 +3604,7 @@ msgid "" " -H, --si likewise, but use powers of 1000 not 1024\n" msgstr "" -#: src/df.c:865 +#: src/df.c:1227 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3595,8 +3613,11 @@ msgid "" "(default)\n" msgstr "" -#: src/df.c:872 +#: src/df.c:1234 msgid "" +" --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" +" or print all fields if FIELD_LIST is " +"omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" " -t, --type=TYPE limit listing to file systems of type TYPE\n" @@ -3605,21 +3626,44 @@ msgid "" " -v (ignored)\n" msgstr "" -#: src/df.c:1027 +#: src/df.c:1248 +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" +msgstr "" + +# +#: src/df.c:1285 +#, 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 #, fuzzy, c-format msgid "file system type %s both selected and excluded" msgstr "το σύστημα αρχείων `%s' είναι και επελεγμένο και αποκλειώμενο" -#: src/df.c:1075 +#: src/df.c:1500 msgid "Warning: " msgstr "Προειδοποίηση:" -#: src/df.c:1077 src/stat.c:795 +#: src/df.c:1502 src/stat.c:814 #, fuzzy msgid "cannot read table of mounted file systems" msgstr "%sαδυναμία ανάγνωσης πίνακα προσαρτημένων συστήματος αρχείων" -#: src/df.c:1107 +#: src/df.c:1539 #, c-format msgid "no file systems processed" msgstr "" @@ -3741,7 +3785,7 @@ msgid "" msgstr "" # -#: src/du.c:260 src/sort.c:390 src/wc.c:112 +#: src/du.c:270 src/sort.c:394 src/wc.c:112 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3750,14 +3794,14 @@ msgstr "" "Χρήση: %s [ΕΠΙΛΟΓΗ]... [ΑΡΧΕΙΟ]...\n" " ή: %s --traditional [ΑΡΧΕΙΟ] [[+]ΘΕΣΗ [[+]ΧΑΡΑΚΤΗΡΙΣΤΙΚΟ]]\n" -#: src/du.c:264 -msgid "" -"Summarize disk usage of each FILE, recursively for directories.\n" -"\n" +#: src/du.c:274 +msgid "Summarize disk usage of each FILE, recursively for directories.\n" msgstr "" -#: src/du.c:271 +#: src/du.c:280 msgid "" +" -0, --null end each output line with 0 byte rather than " +"newline\n" " -a, --all write counts for all files, not just directories\n" " --apparent-size print apparent sizes, rather than disk usage; " "although\n" @@ -3766,7 +3810,7 @@ msgid "" " fragmentation, indirect blocks, and the like\n" msgstr "" -#: src/du.c:279 +#: src/du.c:289 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" @@ -3775,9 +3819,16 @@ msgid "" " -c, --total produce a grand total\n" " -D, --dereference-args dereference only symlinks that are listed on the\n" " command line\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 "" -#: src/du.c:288 +# +#: src/du.c:302 +#, fuzzy msgid "" " --files0-from=F summarize disk usage of the NUL-terminated file\n" " names specified in file F;\n" @@ -3785,41 +3836,33 @@ msgid "" " -H equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" --si like -h, but use powers of 1000 not 1024\n" msgstr "" +"Εμφάνιση άθροισμα ελέγχου CRC και αριθμό bytes για κάθε ΑΡΧΕΙΟ.\n" +"\n" +" --help εμφάνιση αυτής της βοήθειας και έξοδος\n" +" --version εμφάνιση πληροφοριών έκδοσης και έξοδος\n" -#: src/du.c:297 +#: src/du.c:310 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 "" -#: src/du.c:302 +#: src/du.c:316 msgid "" -" -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " "default)\n" -" -0, --null end each output line with 0 byte rather than " -"newline\n" " -S, --separate-dirs 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:309 -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 "" - -#: src/du.c:318 +#: src/du.c:322 msgid "" +" -t, --threshold=SIZE exclude entries smaller than SIZE if positive,\n" +" or entries greater than SIZE if negative\n" " --time show time of the last modification of any file in " "the\n" " directory, or any of its subdirectories\n" @@ -3830,71 +3873,80 @@ msgid "" " FORMAT is interpreted like 'date'\n" msgstr "" -#: src/du.c:375 +#: src/du.c:333 +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 msgid "Infinity" msgstr "" +#: src/du.c:507 +#, c-format +msgid "mount point %s already traversed" +msgstr "" + # -#: src/du.c:600 +#: src/du.c:624 #, fuzzy, c-format msgid "fts_read failed: %s" msgstr "αποτυχία ανάγνωσης" # -#: src/du.c:724 +#: src/du.c:780 #, fuzzy, c-format msgid "invalid maximum depth %s" msgstr "μη έγκυρος αριθμός πεδίου: `%s'" -#: src/du.c:817 +# +#: src/du.c:809 +#, fuzzy, c-format +msgid "invalid --threshold argument '-0'" +msgstr "μη έγκυρο όρισμα %s για %s" + +#: src/du.c:887 #, c-format msgid "cannot both summarize and show all entries" msgstr "" "δεν είναι δυνατό να δειχτεί περίληψη και να εμφανιστούν όλες οι καταχωρίσεις" -#: src/du.c:824 +#: src/du.c:894 #, c-format msgid "warning: summarizing is the same as using --max-depth=0" msgstr "προειδοποίηση: η περίληψη είναι όμοιο με --max-depth=0" -#: src/du.c:830 +#: src/du.c:900 #, fuzzy, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "προειδοποίηση: η περίληψη έρχεται σε αντίφαση με το --max-depth=%d" -#: src/du.c:896 src/sort.c:4479 src/wc.c:668 +#: src/du.c:966 src/sort.c:4533 src/wc.c:668 msgid "file operands cannot be combined with --files0-from" msgstr "" # -#: src/du.c:949 src/md5sum.c:587 src/od.c:903 src/tac.c:239 src/tac.c:350 -#: src/tac.c:506 src/tac.c:586 src/wc.c:733 +#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 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:963 src/sort.c:4508 src/wc.c:747 +#: src/du.c:1040 src/sort.c:4562 src/wc.c:747 #, c-format msgid "when reading file names from stdin, no file name of %s allowed" msgstr "" # -#: src/du.c:980 src/du.c:988 src/wc.c:760 src/wc.c:768 +#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768 #, fuzzy msgid "invalid zero-length file name" msgstr "μη έγκυρη ομάδα" # -#: src/du.c:1007 src/head.c:149 src/head.c:262 src/head.c:334 src/head.c:538 -#: src/head.c:620 src/head.c:692 src/head.c:750 src/head.c:774 src/tail.c:412 -#: src/tail.c:500 src/tail.c:549 src/tail.c:642 src/tail.c:770 src/tail.c:818 -#: src/tail.c:855 src/tail.c:1782 src/tail.c:1812 src/uniq.c:395 -#, c-format -msgid "error reading %s" -msgstr "σφάλμα ανάγνωσης %s" - -# -#: src/du.c:1010 src/ls.c:2649 src/wc.c:791 +#: src/du.c:1088 src/ls.c:2649 src/wc.c:791 msgid "total" msgstr "σύνολο" @@ -3975,10 +4027,12 @@ msgid "Usage: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n" msgstr "Χρήση: %s [ΕΠΙΛΟΓΕΣ]... [ΑΡΧΕΙΟ]...\n" #: src/env.c:55 +msgid "Set each NAME to VALUE in the environment and run COMMAND.\n" +msgstr "" + +#: src/env.c:61 #, fuzzy msgid "" -"Set each NAME to VALUE in the environment and run COMMAND.\n" -"\n" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with 0 byte rather than newline\n" " -u, --unset=NAME remove variable from the environment\n" @@ -3993,74 +4047,89 @@ msgstr "" "Ενα απλό - υπονοείται -i. Εαν δεν υπάρχει ΕΝΤΟΛΗ, εκτυπώνεται το\n" "περιβαλλον που δημιουργήθηκε.\n" -#: src/env.c:64 +#: src/env.c:68 msgid "" "\n" "A mere - implies -i. If no COMMAND, print the resulting environment.\n" msgstr "" -#: src/env.c:120 +#: src/env.c:124 #, fuzzy, c-format msgid "cannot unset %s" msgstr "Δεν είναι δυνατόν να εκτελεστεί το %s" # -#: src/env.c:131 +#: src/env.c:135 #, fuzzy, c-format msgid "cannot set %s" msgstr "αδύνατη η αλλαγή δικαιωμάτων στο %s" -#: src/env.c:148 +#: src/env.c:152 #, c-format msgid "cannot specify --null (-0) with command" msgstr "" # #: 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" -"\n" msgstr "" +"Μετατροπή διαστημάτων σε κάθε ΑΡΧΕΙΟ σε στηλοθέτες, γράφοντας στην κανονική " +"έξοδο.\n" +"Χωρίς ΑΡΧΕΙΟ, ή όταν το αρχείο είναι το -, ανάγνωση από την κανονική " +"είσοδο.\n" +"\n" +" -a, --all μετατροπή όλων των λευκών χαρακτήρων, αντί μόνο των " +"αρχικών\n" +" -t, --tabs=ΑΡΙΘΜΟΣ οι στηλοθέτες να έχουν απόσταση ΑΡΙΘΜΟΣ αντί 8\n" +" -t, --tabs=ΛΙΣΤΑ χρήση λίστας χωρισμένης με κόμμα για τη δήλωση της " +"θέσης των στηλοθετών\n" +" --help εμφάνιση αυτής της βοήθειας και έξοδος\n" +" --version εμφάνιση πληροφοριών έκδοσης και έξοδος\n" +"\n" +"Αντί για -t ΑΡΙΘΜΟΣ ή -t ΛΙΣΤΑ, -ΑΡΙΘΜΟΣ ή -ΛΙΣΤΑ μπορούν να " +"χρησιμοποιηθούν.\n" -#: src/expand.c:115 +#: src/expand.c:114 msgid "" " -i, --initial do not convert tabs after non blanks\n" " -t, --tabs=NUMBER have tabs NUMBER characters apart, not 8\n" msgstr "" # -#: src/expand.c:119 +#: src/expand.c:118 msgid "" " -t, --tabs=LIST use comma separated list of explicit tab positions\n" msgstr "" # -#: src/expand.c:172 src/unexpand.c:191 +#: src/expand.c:171 src/unexpand.c:190 #, fuzzy, c-format msgid "tab stop is too large %s" msgstr "το %s είναι πολύ μεγάλο" # -#: src/expand.c:180 src/unexpand.c:199 +#: src/expand.c:179 src/unexpand.c:198 #, fuzzy, c-format msgid "tab size contains invalid character(s): %s" msgstr "το μέγεθος στηλογνώμονα περιέχει μη έγκυρο χαρακτήρα" # -#: src/expand.c:206 src/unexpand.c:225 +#: src/expand.c:205 src/unexpand.c:224 #, c-format msgid "tab size cannot be 0" msgstr "το μέγεθος στηλογνώμονα δε μπορεί να είναι 0" # -#: src/expand.c:208 src/unexpand.c:227 +#: src/expand.c:207 src/unexpand.c:226 #, c-format msgid "tab sizes must be ascending" msgstr "τα μεγέθη του στηλογνώμονα πρέπει να είναι κατά αύξουσα σειρά" # -#: src/expand.c:326 src/expand.c:345 src/unexpand.c:374 src/unexpand.c:419 +#: src/expand.c:325 src/expand.c:344 src/unexpand.c:373 src/unexpand.c:418 #, fuzzy, c-format msgid "input line is too long" msgstr "το αρχείο μηδενίστηκε" @@ -4184,13 +4253,13 @@ msgstr "σφάλμα στην ανεύρεση μέσω κανονικής έκ msgid "non-integer argument" msgstr "όριο ορίσματος" -#: src/expr.c:793 src/truncate.c:316 +#: src/expr.c:793 src/truncate.c:314 #, c-format msgid "division by zero" msgstr "" # -#: src/expr.c:887 src/sort.c:2029 +#: src/expr.c:887 src/sort.c:2044 #, fuzzy, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "Θέστε LC_ALL='C' για να παρακάμψετε το πρόβλημα." @@ -4200,34 +4269,41 @@ msgstr "Θέστε LC_ALL='C' για να παρακάμψετε το πρόβλ msgid "the strings compared were %s and %s" msgstr "δεν είναι δυνατό να δημιουργηθεί το %s `%s' στο `%s'" -#: src/factor.c:449 -msgid "using arbitrary-precision arithmetic" +#. This is a proper name. See the gettext manual, section Names. +#: src/factor.c:111 +msgid "Niels Moller" msgstr "" -#: src/factor.c:460 -msgid "using single-precision arithmetic" +#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459 +#, c-format +msgid "Lucas prime test failure. This should not happen" msgstr "" -# -#: src/factor.c:465 src/od.c:1640 src/od.c:1709 +#: src/factor.c:2092 #, c-format -msgid "%s is too large" -msgstr "το %s είναι πολύ μεγάλο" +msgid "squfof queue overflow" +msgstr "" -#: src/factor.c:469 +#: src/factor.c:2419 #, fuzzy, c-format msgid "%s is not a valid positive integer" msgstr "%s' δεν είναι ισχύων θετικός ακέραιος." # -#: src/factor.c:494 +#: src/factor.c:2442 src/od.c:1646 src/od.c:1715 +#, c-format +msgid "%s is too large" +msgstr "το %s είναι πολύ μεγάλο" + +# +#: src/factor.c:2454 #, fuzzy, c-format msgid "" "Usage: %s [NUMBER]...\n" " or: %s OPTION\n" msgstr "Χρήση: %s [ΕΠΙΛΟΓΗ]... [ΕΙΣΟΔΟΣ [ΕΞΟΔΟΣ]]\n" -#: src/factor.c:499 +#: src/factor.c:2459 #, fuzzy msgid "" "Print the prime factors of each specified integer NUMBER. If none\n" @@ -4263,21 +4339,20 @@ msgid "cannot stat current directory (now %s)" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" #. This is a proper name. See the gettext manual, section Names. -#: src/fmt.c:37 +#: src/fmt.c:38 msgid "Ross Paterson" msgstr "" # -#: src/fmt.c:269 +#: src/fmt.c:270 #, fuzzy, c-format msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n" msgstr "Χρήση: %s [-ΨΗΦΙΑ] [ΕΠΙΛΟΓΗ]... [ΑΡΧΕΙΟ]...\n" -#: src/fmt.c:270 +#: 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" -"\n" msgstr "" # @@ -4312,8 +4387,8 @@ msgstr "" "Στο -wΑΡΙΘΜΟΣ, το γράμμα `w' μπορεί να παραληφθεί.\n" # -#: src/fmt.c:285 -#, fuzzy, c-format +#: src/fmt.c:287 +#, fuzzy, 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" @@ -4342,7 +4417,7 @@ msgstr "" "\n" "Στο -wΑΡΙΘΜΟΣ, το γράμμα `w' μπορεί να παραληφθεί.\n" -#: src/fmt.c:357 +#: src/fmt.c:359 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -4350,21 +4425,19 @@ msgid "" msgstr "" # -#: src/fmt.c:403 src/fmt.c:414 +#: src/fmt.c:405 src/fmt.c:416 #, fuzzy, c-format msgid "invalid width: %s" msgstr "μη έγκυρος αριθμός πεδίου: `%s'" -# #: src/fold.c:70 msgid "" "Wrap input lines in each FILE (standard input by default), writing to\n" "standard output.\n" -"\n" msgstr "" # -#: src/fold.c:78 +#: src/fold.c:77 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4372,13 +4445,13 @@ msgid "" msgstr "" # -#: src/fold.c:289 src/pr.c:836 +#: src/fold.c:288 src/pr.c:832 #, fuzzy, c-format 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:75 +#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 #: src/truncate.c:37 msgid "Padraig Brady" msgstr "" @@ -4394,18 +4467,18 @@ msgid "" "\n" msgstr "" -#: src/group-list.c:69 src/id.c:345 src/setuidgid.c:184 +#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184 #, fuzzy, c-format msgid "failed to get groups for user %s" msgstr "αποτυχία αλλαγής της ομάδας από %s σε %s\n" -#: src/group-list.c:74 src/id.c:350 +#: src/group-list.c:74 src/id.c:370 #, fuzzy, c-format msgid "failed to get groups for the current process" msgstr "αποτυχία αλλαγής της ομάδας από %s σε %s\n" # -#: src/group-list.c:104 +#: src/group-list.c:114 #, fuzzy, c-format msgid "cannot find name for group ID %lu" msgstr "δεν είναι δυνατό να παραληφθεί χρήστης και ομάδα" @@ -4453,7 +4526,6 @@ 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" -"\n" msgstr "" "Εμφάνιση των 10 πρώτων γραμμών από κάθε ΑΡΧΕΙΟ στην κανονική έξοδο.\n" "Με περισσότερα από ένα ΑΡΧΕΙΟ, να προηγηθεί επισέλιδο με το όνομα του " @@ -4476,7 +4548,7 @@ msgstr "" "ένας από τους πολλαπλασιαστές bkm ακολουθεί συνενωμένος, διαφορετικά " "ανάγνωσε -n ΤΙΜΗ\n" -#: src/head.c:118 +#: src/head.c:117 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -4487,13 +4559,13 @@ msgid "" msgstr "" # -#: src/head.c:126 +#: 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 "" -#: src/head.c:132 +#: src/head.c:131 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -4501,68 +4573,68 @@ msgid "" "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n" msgstr "" -# -#: src/head.c:152 -#, c-format -msgid "error writing %s" -msgstr "σφάλμα εγγραφής %s" - -#: src/head.c:155 +#: src/head.c:154 #, c-format msgid "%s: file has shrunk too much" msgstr "" # -#: src/head.c:228 src/head.c:1044 +#: src/head.c:227 src/head.c:1051 #, fuzzy, c-format msgid "%s: number of bytes is too large" msgstr "μη έγκυρος αριθμός από bytes προς σύγκριση: `%s'" -#: src/head.c:441 +#: src/head.c:440 #, c-format msgid "%s: cannot lseek back to original position" msgstr "" # -#: src/head.c:613 src/head.c:684 src/tail.c:450 +#: src/head.c:612 src/head.c:691 src/tail.c:449 #, fuzzy, c-format msgid "%s: cannot seek to offset %s" msgstr "αδυναμία εκτέλεσης ioctl στο `%s'" # -#: src/head.c:791 +#: src/head.c:673 +#, 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" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" # -#: src/head.c:878 +#: src/head.c:885 #, c-format msgid "%s: %s is so large that it is not representable" msgstr "%s: το %s είναι τόσο μεγάλο που δε μπορεί να αναπαρασταθεί" # -#: src/head.c:879 +#: src/head.c:886 msgid "number of lines" msgstr "αριθμός γραμμών" # -#: src/head.c:879 +#: src/head.c:886 msgid "number of bytes" msgstr "αριθμός από bytes" # -#: src/head.c:886 src/tail.c:1947 +#: src/head.c:893 src/tail.c:1947 msgid "invalid number of lines" msgstr "μη έγκυρος αριθμός από γραμμές" # -#: src/head.c:887 src/tail.c:1948 +#: src/head.c:894 src/tail.c:1948 msgid "invalid number of bytes" msgstr "μη έγκυρος αριθμός από bytes" # -#: src/head.c:974 src/head.c:1032 +#: src/head.c:981 src/head.c:1039 #, fuzzy, c-format msgid "invalid trailing option -- %c" msgstr "%s: μη έγκυρη επιλογή -- %c\n" @@ -4691,94 +4763,94 @@ msgstr "Δεν είναι δυνατόν να βρεθεί ο τύπος του msgid "cannot get effective UID" msgstr "αδύνατη η αλλαγή δικαιωμάτων στο %s" -#: src/id.c:289 +#: src/id.c:311 #, fuzzy, c-format -msgid "cannot find name for user ID %lu" +msgid "cannot find name for user ID %s" msgstr "%s: δεν μπορει να βρεθεί όνομα χρήστη για το 'UID' %u\n" -#: src/id.c:309 +#: src/id.c:329 #, c-format -msgid "uid=%lu" +msgid "uid=%s" msgstr "" -#: src/id.c:314 +#: src/id.c:334 #, c-format -msgid " gid=%lu" +msgid " gid=%s" msgstr "" -#: src/id.c:321 +#: src/id.c:341 #, c-format -msgid " euid=%lu" +msgid " euid=%s" msgstr "" -#: src/id.c:329 +#: src/id.c:349 #, c-format -msgid " egid=%lu" +msgid " egid=%s" msgstr "" -#: src/id.c:357 +#: src/id.c:377 msgid " groups=" msgstr " ομάδες=" # -#: src/id.c:373 +#: src/id.c:393 #, fuzzy, c-format msgid " context=%s" msgstr "μη έγκυρο είδος αλφαριθμητικού `%s'" # -#: src/install.c:372 +#: src/install.c:373 #, fuzzy, c-format msgid "warning: %s: failed to change context to %s" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" # -#: src/install.c:413 +#: src/install.c:414 #, fuzzy, c-format msgid "creating directory %s" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" # -#: src/install.c:481 +#: src/install.c:482 #, fuzzy, c-format msgid "cannot change ownership of %s" msgstr "αδυναμία αλλαγής ιδιοκτησίας στο %s" # -#: src/install.c:505 +#: src/install.c:506 #, fuzzy, c-format msgid "cannot set time stamps for %s" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" # -#: src/install.c:526 src/split.c:412 src/timeout.c:387 +#: src/install.c:527 src/split.c:426 src/timeout.c:439 #, fuzzy, c-format msgid "fork system call failed" msgstr "ειδικό αρχείο μπλοκ" -#: src/install.c:530 +#: src/install.c:531 #, fuzzy, c-format msgid "cannot run %s" msgstr "Δεν είναι δυνατόν να εκτελεστεί το %s" # -#: src/install.c:534 +#: src/install.c:535 #, fuzzy, c-format msgid "waiting for strip" msgstr "σφάλμα εγγραφής %s" -#: src/install.c:536 +#: src/install.c:537 #, c-format msgid "strip process terminated abnormally" msgstr "" # -#: src/install.c:557 +#: src/install.c:558 #, fuzzy, c-format msgid "invalid user %s" msgstr "μη έγκυρος χρήστης" -#: src/install.c:593 +#: src/install.c:594 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -4790,7 +4862,7 @@ msgstr "" " ή: %s [ΕΠΙΛΟΓΗ]... ΠΡΩΤΟΣ ΤΕΛΕΥΤΑΙΟΣ\n" " ή: %s [ΕΠΙΛΟΓΗ]... ΠΡΩΤΟΣ ΑΥΞΗΣΗ ΤΕΛΕΥΤΑΙΟΣ\n" -#: src/install.c:600 +#: src/install.c:601 msgid "" "\n" "This install program copies files (often just compiled) into destination\n" @@ -4802,7 +4874,6 @@ msgid "" "In the first three forms, copy SOURCE to DEST or multiple SOURCE(s) to\n" "the existing DIRECTORY, while setting permission modes and owner/group.\n" "In the 4th form, create all components of the given DIRECTORY(ies).\n" -"\n" msgstr "" #: src/install.c:615 @@ -4850,60 +4921,60 @@ msgid "" "directories\n" msgstr "" -#: src/install.c:858 +#: src/install.c:859 #, c-format msgid "" "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled" msgstr "" -#: src/install.c:868 +#: src/install.c:869 #, c-format msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled" msgstr "" -#: src/install.c:885 +#: src/install.c:886 #, fuzzy, c-format msgid "the strip option may not be used when installing a directory" msgstr "" "Η αλυσίδα μορφής δεν πρέπει να καθορίζεται όταν εκτυπώνονται\n" "αλυσίδες με ίσα μήκη." -#: src/install.c:888 +#: src/install.c:889 #, fuzzy, c-format msgid "target directory not allowed when installing a directory" msgstr "" "Η αλυσίδα μορφής δεν πρέπει να καθορίζεται όταν εκτυπώνονται\n" "αλυσίδες με ίσα μήκη." -#: src/install.c:892 +#: src/install.c:893 #, c-format msgid "cannot force target context to %s and preserve it" msgstr "" # -#: src/install.c:946 src/mkdir.c:202 src/stdbuf.c:327 +#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326 #, fuzzy, c-format msgid "invalid mode %s" msgstr "μη έγκυρος αριθμός πεδίου: `%s'" -#: src/install.c:953 +#: src/install.c:954 #, c-format msgid "WARNING: ignoring --strip-program option as -s option was not specified" msgstr "" # -#: src/install.c:958 +#: src/install.c:959 #, fuzzy, c-format msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive" msgstr "οι επιλογές --string και --check είναι αμοιβαίως αποκλειόμενες" # -#: src/install.c:965 +#: src/install.c:966 #, fuzzy, c-format msgid "options --compare (-C) and --strip are mutually exclusive" msgstr "οι επιλογές --string και --check είναι αμοιβαίως αποκλειόμενες" -#: src/install.c:971 +#: src/install.c:972 #, c-format msgid "" "the --compare (-C) option is ignored when you specify a mode with non-" @@ -4911,7 +4982,7 @@ msgid "" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/join.c:40 src/sort.c:65 +#: src/join.c:40 src/sort.c:66 msgid "Mike Haertel" msgstr "" @@ -4977,7 +5048,7 @@ msgstr "" #: src/join.c:403 #, c-format -msgid "%s:%ju: is not sorted: %.*s" +msgid "%s:%<PRIuMAX>: is not sorted: %.*s" msgstr "" # @@ -5009,12 +5080,12 @@ msgid "conflicting empty-field replacement strings" msgstr "" # -#: src/join.c:1101 src/sort.c:4414 +#: src/join.c:1101 src/sort.c:4468 #, fuzzy, c-format msgid "multi-character tab %s" msgstr "μη έγκυρη τάξη χαρακτήρων `%s'" -#: src/join.c:1105 src/sort.c:4419 +#: src/join.c:1105 src/sort.c:4473 #, c-format msgid "incompatible tabs" msgstr "" @@ -5034,12 +5105,10 @@ msgid "" msgstr "" #: src/kill.c:82 -msgid "" -"Send signals to processes, or list signals.\n" -"\n" +msgid "Send signals to processes, or list signals.\n" msgstr "" -#: src/kill.c:89 +#: src/kill.c:88 #, fuzzy msgid "" " -s, --signal=SIGNAL, -SIGNAL\n" @@ -5056,7 +5125,7 @@ msgstr "" " --help Εκτυπώνει αυτή την βοήθεια και τερματίζει\n" " --version Εκτυπώνει πληροφορίες έκδοσης και τερματίζει\n" -#: src/kill.c:97 +#: src/kill.c:96 msgid "" "\n" "SIGNAL may be a signal name like 'HUP', or a signal number like '1',\n" @@ -5065,33 +5134,33 @@ msgid "" msgstr "" # -#: src/kill.c:206 +#: src/kill.c:205 #, fuzzy, c-format msgid "%s: invalid process id" msgstr "%s: μη έγκυρη μορφή" # -#: src/kill.c:260 +#: src/kill.c:259 #, fuzzy, c-format msgid "invalid option -- %c" msgstr "%s: μη έγκυρη επιλογή -- %c\n" -#: src/kill.c:269 +#: src/kill.c:268 #, fuzzy, c-format msgid "%s: multiple signals specified" msgstr "\\%c: Μη έγκυρη διαφυγή." -#: src/kill.c:283 +#: src/kill.c:282 #, c-format msgid "multiple -l or -t options specified" msgstr "" -#: src/kill.c:300 +#: src/kill.c:299 #, c-format msgid "cannot combine signal with -l or -t" msgstr "" -#: src/kill.c:306 +#: src/kill.c:305 #, c-format msgid "no process ID specified" msgstr "" @@ -5204,10 +5273,9 @@ msgid "" "When creating hard links, each TARGET must exist. Symbolic links\n" "can hold arbitrary text; if later resolved, a relative link is\n" "interpreted in relation to its parent directory.\n" -"\n" msgstr "" -#: src/ln.c:395 +#: src/ln.c:394 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -5220,7 +5288,7 @@ msgid "" " -f, --force remove existing destination files\n" msgstr "" -#: src/ln.c:403 +#: src/ln.c:402 msgid "" " -i, --interactive prompt whether to remove destinations\n" " -L, --logical dereference TARGETs that are symbolic links\n" @@ -5232,7 +5300,7 @@ msgid "" " -s, --symbolic make symbolic links instead of hard links\n" msgstr "" -#: src/ln.c:412 +#: src/ln.c:411 msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" " -t, --target-directory=DIRECTORY specify the DIRECTORY in which to " @@ -5242,31 +5310,10 @@ msgid "" " -v, --verbose print name of each linked file\n" msgstr "" -#: src/ln.c:428 -#, 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" - -#: src/ln.c:435 +#: src/ln.c:433 #, 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 "" @@ -5346,7 +5393,7 @@ msgstr "" "TABSIZE: %s" # -#: src/ls.c:1750 src/ptx.c:1976 +#: src/ls.c:1750 src/ptx.c:1975 #, fuzzy, c-format msgid "invalid line width: %s" msgstr "μη έγκυρος αριθμός πεδίου: `%s'" @@ -5420,7 +5467,7 @@ msgstr "αδύνατη η δημιουργία καταλόγου `%s'" msgid "closing directory %s" msgstr "αδύνατη η αλλαγή στο κατάλογο %s" -#: src/ls.c:3301 +#: src/ls.c:3302 #, fuzzy, c-format msgid "cannot compare file names %s and %s" msgstr "δεν είναι δυνατό να δημιουργηθεί το %s `%s' στο `%s'" @@ -5429,10 +5476,9 @@ msgstr "δεν είναι δυνατό να δημιουργηθεί το %s `%s msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" -"\n" msgstr "" -#: src/ls.c:4729 +#: src/ls.c:4728 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -5441,7 +5487,7 @@ msgid "" "characters\n" msgstr "" -#: src/ls.c:4735 +#: src/ls.c:4734 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them. E." "g.,\n" @@ -5455,7 +5501,7 @@ msgid "" " otherwise: sort by ctime, newest first\n" msgstr "" -#: src/ls.c:4745 +#: src/ls.c:4744 msgid "" " -C list entries by columns\n" " --color[=WHEN] colorize the output. WHEN defaults to " @@ -5467,7 +5513,7 @@ msgid "" " -D, --dired generate output designed for Emacs' dired mode\n" msgstr "" -#: src/ls.c:4753 +#: src/ls.c:4752 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -5477,11 +5523,11 @@ msgid "" " --full-time like -l --time-style=full-iso\n" msgstr "" -#: src/ls.c:4761 +#: src/ls.c:4760 msgid " -g like -l, but do not list owner\n" msgstr "" -#: src/ls.c:4764 +#: src/ls.c:4763 msgid "" " --group-directories-first\n" " group directories before files.\n" @@ -5489,7 +5535,7 @@ msgid "" " use of --sort=none (-U) disables grouping\n" msgstr "" -#: src/ls.c:4770 +#: src/ls.c:4769 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" @@ -5497,7 +5543,7 @@ msgid "" " --si likewise, but use powers of 1000 not 1024\n" msgstr "" -#: src/ls.c:4776 +#: src/ls.c:4775 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5510,7 +5556,7 @@ msgid "" " (overridden by -a or -A)\n" msgstr "" -#: src/ls.c:4786 +#: src/ls.c:4785 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -5522,7 +5568,7 @@ msgid "" " -k, --kibibytes use 1024-byte blocks\n" msgstr "" -#: src/ls.c:4796 +#: src/ls.c:4795 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5532,7 +5578,7 @@ msgid "" "entries\n" msgstr "" -#: src/ls.c:4804 +#: src/ls.c:4803 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. " @@ -5543,7 +5589,7 @@ msgid "" " append / indicator to directories\n" msgstr "" -#: src/ls.c:4812 +#: src/ls.c:4811 #, fuzzy msgid "" " -q, --hide-control-chars print ? instead of non graphic characters\n" @@ -5597,7 +5643,7 @@ msgstr "" " -R, --recursive εμφάνιση υποκαταλόγων αναδρομικά\n" " -s, --size εμφάνιση μεγέθους κάθε αρχείου, σε μπλοκ\n" -#: src/ls.c:4821 +#: src/ls.c:4820 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -5605,7 +5651,7 @@ msgid "" "blocks\n" msgstr "" -#: src/ls.c:4826 +#: src/ls.c:4825 msgid "" " -S sort by file size\n" " --sort=WORD sort by WORD instead of name: none -U,\n" @@ -5617,7 +5663,7 @@ msgid "" " if --sort=time\n" msgstr "" -#: src/ls.c:4836 +#: src/ls.c:4835 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, +FORMAT.\n" @@ -5629,13 +5675,13 @@ msgid "" " takes effect only outside the POSIX locale\n" msgstr "" -#: src/ls.c:4845 +#: src/ls.c:4844 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:4849 +#: src/ls.c:4848 msgid "" " -u with -lt: sort by, and show, access time\n" " with -l: show access time and sort by name\n" @@ -5644,7 +5690,7 @@ msgid "" " -v natural sort of (version) numbers within text\n" msgstr "" -#: src/ls.c:4856 +#: src/ls.c:4855 msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" @@ -5654,7 +5700,7 @@ msgid "" " -1 list one file per line\n" msgstr "" -#: src/ls.c:4866 +#: src/ls.c:4865 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5663,7 +5709,7 @@ msgid "" "variable can change the settings. Use the dircolors command to set it.\n" msgstr "" -#: src/ls.c:4873 +#: src/ls.c:4872 msgid "" "\n" "Exit status:\n" @@ -5688,7 +5734,7 @@ msgid "David Madore" msgstr "" # -#: src/md5sum.c:162 +#: src/md5sum.c:164 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -5705,7 +5751,7 @@ msgstr "" " --version εμφάνιση πληροφοριών έκδοσης και έξοδος\n" # -#: src/md5sum.c:172 +#: src/md5sum.c:174 #, fuzzy msgid "" " -b, --binary read in binary mode (default unless reading tty " @@ -5717,7 +5763,7 @@ msgstr "" "\n" # -#: src/md5sum.c:176 +#: src/md5sum.c:178 #, fuzzy msgid " -b, --binary read in binary mode\n" msgstr "" @@ -5726,18 +5772,22 @@ msgstr "" "κονσόλας.\n" "\n" -#: src/md5sum.c:179 +#: src/md5sum.c:181 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr "" -#: src/md5sum.c:183 +#: src/md5sum.c:184 +msgid " --tag create a BSD-style checksum\n" +msgstr "" + +#: src/md5sum.c:188 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" # -#: src/md5sum.c:187 +#: src/md5sum.c:192 #, fuzzy msgid " -t, --text read in text mode (default)\n" msgstr "" @@ -5746,7 +5796,7 @@ msgstr "" "κονσόλας.\n" "\n" -#: src/md5sum.c:190 +#: src/md5sum.c:195 msgid "" "\n" "The following three options are useful only when verifying checksums:\n" @@ -5756,12 +5806,12 @@ msgid "" "\n" msgstr "" -#: src/md5sum.c:198 +#: src/md5sum.c:203 msgid "" " --strict with --check, exit non-zero for any invalid input\n" msgstr "" -#: src/md5sum.c:203 +#: src/md5sum.c:208 #, c-format msgid "" "\n" @@ -5772,43 +5822,43 @@ msgid "" msgstr "" # -#: src/md5sum.c:502 +#: src/md5sum.c:523 #, fuzzy, c-format msgid "%s: too many checksum lines" msgstr "" "%s: δε βρέθηκαν κανονικά μορφοποιημένες γραμμές αθροισμάτων ελέγχου MD5" # -#: src/md5sum.c:526 +#: src/md5sum.c:547 #, fuzzy, c-format msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line" msgstr "%s: %lu: εσφαλμένα μορφοποιημένη γραμμή αθροίσματος ελέγχου MD5" # -#: src/md5sum.c:551 +#: src/md5sum.c:572 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: ΑΝΕΠΙΤΥΧΕΣ άνοιγμα ή ανάγνωση\n" # -#: src/md5sum.c:574 +#: src/md5sum.c:595 msgid "FAILED" msgstr "ΑΝΕΠΙΤΥΧΕΣ" # -#: src/md5sum.c:576 +#: src/md5sum.c:597 msgid "OK" msgstr "ΕΝΤΑΞΕΙ" # -#: src/md5sum.c:600 +#: src/md5sum.c:621 #, fuzzy, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "" "%s: δε βρέθηκαν κανονικά μορφοποιημένες γραμμές αθροισμάτων ελέγχου MD5" # -#: src/md5sum.c:610 +#: src/md5sum.c:631 #, fuzzy, c-format msgid "WARNING: %<PRIuMAX> line is improperly formatted" msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted" @@ -5816,7 +5866,7 @@ msgstr[0] "%s: %lu: εσφαλμένα μορφοποιημένη γραμμή msgstr[1] "%s: %lu: εσφαλμένα μορφοποιημένη γραμμή αθροίσματος ελέγχου MD5" # -#: src/md5sum.c:618 +#: src/md5sum.c:639 #, fuzzy, c-format msgid "WARNING: %<PRIuMAX> listed file could not be read" msgid_plural "WARNING: %<PRIuMAX> listed files could not be read" @@ -5826,15 +5876,27 @@ msgstr[1] "" "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: %d από %d αναφερόμενα %s δεν ήταν δυνατό να αναγνωστούν" # -#: src/md5sum.c:626 +#: src/md5sum.c:647 #, 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 +#, c-format +msgid "--tag does not support --text mode" +msgstr "" + +# +#: src/md5sum.c:766 +#, fuzzy, c-format +msgid "the --tag option is meaningless when verifying checksums" +msgstr "" +"η επιλογή --status έχει έννοια μόνο στην επιβεβαίωση αθροισμάτων ελέγχου" + # -#: src/md5sum.c:704 +#: src/md5sum.c:773 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" @@ -5843,27 +5905,27 @@ msgstr "" "αθροίσματα ελέγχου" # -#: src/md5sum.c:712 +#: src/md5sum.c:781 #, c-format msgid "the --status option is meaningful only when verifying checksums" msgstr "" "η επιλογή --status έχει έννοια μόνο στην επιβεβαίωση αθροισμάτων ελέγχου" # -#: src/md5sum.c:719 +#: src/md5sum.c:788 #, c-format msgid "the --warn option is meaningful only when verifying checksums" msgstr "η επιλογή --warn έχει έννοια μόνο στην επιβεβαίωση αθροισμάτων ελέγχου" # -#: src/md5sum.c:726 +#: src/md5sum.c:795 #, fuzzy, c-format msgid "the --quiet option is meaningful only when verifying checksums" msgstr "" "η επιλογή --status έχει έννοια μόνο στην επιβεβαίωση αθροισμάτων ελέγχου" # -#: src/md5sum.c:733 +#: src/md5sum.c:802 #, fuzzy, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "" @@ -5876,12 +5938,10 @@ msgid "Usage: %s [OPTION]... DIRECTORY...\n" msgstr "Χρήση: %s [ΕΠΙΛΟΓΕΣ]... [ΑΡΧΕΙΟ]...\n" #: src/mkdir.c:57 -msgid "" -"Create the DIRECTORY(ies), if they do not already exist.\n" -"\n" +msgid "Create the DIRECTORY(ies), if they do not already exist.\n" msgstr "" -#: src/mkdir.c:64 +#: src/mkdir.c:63 #, fuzzy msgid "" " -m, --mode=MODE set file mode (as in chmod), not a=rwx - umask\n" @@ -5902,7 +5962,7 @@ msgstr "" " --version εμφάνιση πληροφοριών έκδοσης και έξοδος\n" # -#: src/mkdir.c:169 +#: src/mkdir.c:168 #, fuzzy, c-format msgid "created directory %s" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" @@ -5914,12 +5974,10 @@ msgid "Usage: %s [OPTION]... NAME...\n" msgstr "Χρήση: %s [ΕΠΙΛΟΓΕΣ]... [ΑΡΧΕΙΟ]...\n" #: src/mkfifo.c:52 -msgid "" -"Create named pipes (FIFOs) with the given NAMEs.\n" -"\n" +msgid "Create named pipes (FIFOs) with the given NAMEs.\n" msgstr "" -#: src/mkfifo.c:59 src/mknod.c:61 +#: src/mkfifo.c:58 src/mknod.c:60 #, fuzzy msgid "" " -m, --mode=MODE set file permission bits to MODE, not a=rw - umask\n" @@ -5931,18 +5989,18 @@ msgstr "" " --help εμφάνιση αυτής της βοήθειας και έξοδος\n" " --version εμφάνιση πληροφοριών έκδοσης και έξοδος\n" -#: src/mkfifo.c:62 +#: src/mkfifo.c:61 msgid "" " -Z, --context=CTX set the SELinux security context of each NAME to CTX\n" msgstr "" # -#: src/mkfifo.c:122 src/mknod.c:128 +#: src/mkfifo.c:121 src/mknod.c:127 #, fuzzy, c-format msgid "invalid mode" msgstr "μη έγκυρος αριθμός" -#: src/mkfifo.c:127 src/mknod.c:133 +#: src/mkfifo.c:126 src/mknod.c:132 #, c-format msgid "mode must specify only file permission bits" msgstr "" @@ -5954,16 +6012,14 @@ msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n" msgstr "Χρήση: %s [ΕΠΙΛΟΓΗ]... ΣΥΝΟΛΟ1 [ΣΥΝΟΛΟ2]\n" #: src/mknod.c:54 -msgid "" -"Create the special file NAME of the given TYPE.\n" -"\n" +msgid "Create the special file NAME of the given TYPE.\n" msgstr "" -#: src/mknod.c:64 +#: src/mknod.c:63 msgid " -Z, --context=CTX set the SELinux security context of NAME to CTX\n" msgstr "" -#: src/mknod.c:69 +#: src/mknod.c:68 msgid "" "\n" "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n" @@ -5972,7 +6028,7 @@ msgid "" "otherwise, as decimal. TYPE may be:\n" msgstr "" -#: src/mknod.c:76 +#: src/mknod.c:75 #, fuzzy msgid "" "\n" @@ -5994,7 +6050,7 @@ msgstr "" " c, u δημιουργία ειδικού αρχείου χαρακτήρων (χωρίς ενταμίευση)\n" " p δημιουργία αρχείου FIFO\n" -#: src/mknod.c:151 +#: src/mknod.c:150 #, fuzzy msgid "Special files require major and minor device numbers." msgstr "" @@ -6002,43 +6058,43 @@ msgstr "" "αριθμοί συσκευής πρέπει να ορίζονται" # -#: src/mknod.c:161 +#: src/mknod.c:160 #, fuzzy msgid "Fifos do not have major and minor device numbers." msgstr "μη έγκυρος αρχικός αριθμός γραμμής: `%s'" # -#: src/mknod.c:177 +#: src/mknod.c:176 #, fuzzy, c-format msgid "block special files not supported" msgstr "ειδικό αρχείο μπλοκ" # -#: src/mknod.c:186 +#: src/mknod.c:185 #, fuzzy, c-format msgid "character special files not supported" msgstr "ειδικό αρχείο χαρακτήρων" # -#: src/mknod.c:202 +#: src/mknod.c:201 #, fuzzy, c-format msgid "invalid major device number %s" msgstr "μη έγκυρος αρχικός αριθμός γραμμής: `%s'" # -#: src/mknod.c:207 +#: src/mknod.c:206 #, fuzzy, c-format msgid "invalid minor device number %s" msgstr "μη έγκυρος αρχικός αριθμός γραμμής: `%s'" # -#: src/mknod.c:212 +#: src/mknod.c:211 #, fuzzy, c-format msgid "invalid device %s %s" msgstr "μη έγκυρο όρισμα %s για %s" # -#: src/mknod.c:226 +#: src/mknod.c:225 #, fuzzy, c-format msgid "invalid device type %s" msgstr "μη έγκυρο όρισμα %s για %s" @@ -6098,60 +6154,58 @@ msgid "" " directory specified via -p; else /tmp [deprecated]\n" msgstr "" -#: src/mktemp.c:222 +#: src/mktemp.c:223 #, c-format msgid "failed to redirect stderr to /dev/null" msgstr "" # -#: src/mktemp.c:228 +#: src/mktemp.c:229 #, fuzzy, c-format msgid "too many templates" msgstr "πάρα πολλά ορίσματα" -#: src/mktemp.c:248 +#: src/mktemp.c:249 #, c-format msgid "with --suffix, template %s must end in X" msgstr "" -#: src/mktemp.c:273 src/split.c:1117 +#: src/mktemp.c:274 src/split.c:1130 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "" -#: src/mktemp.c:278 +#: src/mktemp.c:279 #, c-format msgid "too few X's in template %s" msgstr "" -#: src/mktemp.c:291 +#: src/mktemp.c:292 #, c-format msgid "invalid template, %s, contains directory separator" msgstr "" -#: src/mktemp.c:305 +#: src/mktemp.c:306 #, c-format msgid "invalid template, %s; with --tmpdir, it may not be absolute" msgstr "" # -#: src/mktemp.c:325 +#: src/mktemp.c:326 #, fuzzy, c-format msgid "failed to create directory via template %s" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" -#: src/mktemp.c:335 +#: src/mktemp.c:336 #, fuzzy, c-format msgid "failed to create file via template %s" msgstr "διατήρηση ωρών στο %s" -#: src/mv.c:290 -msgid "" -"Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" -"\n" +#: src/mv.c:292 +msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" msgstr "" -#: src/mv.c:297 +#: src/mv.c:298 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -6164,7 +6218,7 @@ msgid "" "effect.\n" msgstr "" -#: src/mv.c:306 +#: src/mv.c:307 msgid "" " --strip-trailing-slashes remove any trailing slashes from each " "SOURCE\n" @@ -6172,7 +6226,7 @@ msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" msgstr "" -#: src/mv.c:311 +#: src/mv.c:312 #, fuzzy msgid "" " -t, --target-directory=DIRECTORY move all SOURCE arguments into " @@ -6215,30 +6269,32 @@ msgstr "Χρήση: %s [ΕΠΙΛΟΓΗ] [ΑΡΧΕΙΟ]...\n" #, c-format msgid "" "Run COMMAND with an adjusted niceness, which affects process scheduling.\n" -"With no COMMAND, print the current niceness. Nicenesses range from\n" -"%d (most favorable scheduling) to %d (least favorable).\n" -"\n" -" -n, --adjustment=N add integer N to the niceness (default 10)\n" +"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 "" + +#: src/nice.c:82 +msgid " -n, --adjustment=N add integer N to the niceness (default 10)\n" msgstr "" # -#: src/nice.c:168 +#: src/nice.c:172 #, fuzzy, c-format msgid "invalid adjustment %s" msgstr "μη έγκυρο όρισμα %s για %s" -#: src/nice.c:177 +#: src/nice.c:181 #, c-format msgid "a command must be given with an adjustment" msgstr "Μια εντολή πρέπει να δίνεται με μια προσαρμογή (προτεραιότητας)." # -#: src/nice.c:184 src/nice.c:195 +#: src/nice.c:188 src/nice.c:199 #, fuzzy, c-format msgid "cannot get niceness" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" -#: src/nice.c:201 +#: src/nice.c:205 #, fuzzy, c-format msgid "cannot set niceness" msgstr "Δεν μπορεί να τεθεί η ημερομηνία." @@ -6249,15 +6305,30 @@ msgid "Scott Bartram" msgstr "" # -#: src/nl.c:186 +#: 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" -"\n" msgstr "" +"Μετατροπή διαστημάτων σε κάθε ΑΡΧΕΙΟ σε στηλοθέτες, γράφοντας στην κανονική " +"έξοδο.\n" +"Χωρίς ΑΡΧΕΙΟ, ή όταν το αρχείο είναι το -, ανάγνωση από την κανονική " +"είσοδο.\n" +"\n" +" -a, --all μετατροπή όλων των λευκών χαρακτήρων, αντί μόνο των " +"αρχικών\n" +" -t, --tabs=ΑΡΙΘΜΟΣ οι στηλοθέτες να έχουν απόσταση ΑΡΙΘΜΟΣ αντί 8\n" +" -t, --tabs=ΛΙΣΤΑ χρήση λίστας χωρισμένης με κόμμα για τη δήλωση της " +"θέσης των στηλοθετών\n" +" --help εμφάνιση αυτής της βοήθειας και έξοδος\n" +" --version εμφάνιση πληροφοριών έκδοσης και έξοδος\n" +"\n" +"Αντί για -t ΑΡΙΘΜΟΣ ή -t ΛΙΣΤΑ, -ΑΡΙΘΜΟΣ ή -ΛΙΣΤΑ μπορούν να " +"χρησιμοποιηθούν.\n" # -#: src/nl.c:194 +#: src/nl.c:186 #, fuzzy msgid "" " -b, --body-numbering=STYLE use STYLE for numbering body lines\n" @@ -6275,7 +6346,7 @@ msgstr "" " --help εμφάνιση αυτής της βοήθειας και έξοδος\n" " --version εμφάνιση πληροφοριών έκδοσης και έξοδος\n" -#: src/nl.c:199 +#: src/nl.c:191 msgid "" " -h, --header-numbering=STYLE use STYLE for numbering header lines\n" " -i, --line-increment=NUMBER line number increment at each line\n" @@ -6287,14 +6358,14 @@ msgid "" " -s, --number-separator=STRING add STRING after (possible) line number\n" msgstr "" -#: src/nl.c:207 +#: src/nl.c:199 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 "" # -#: src/nl.c:213 +#: src/nl.c:205 msgid "" "\n" "By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC are\n" @@ -6302,7 +6373,7 @@ msgid "" "second character implies :. Type \\\\ for \\. STYLE is one of:\n" msgstr "" -#: src/nl.c:219 +#: src/nl.c:211 msgid "" "\n" " a number all lines\n" @@ -6320,60 +6391,55 @@ msgid "" msgstr "" # -#: src/nl.c:286 +#: src/nl.c:278 #, fuzzy, c-format msgid "line number overflow" msgstr "μη έγκυρος αριθμός πεδίου: `%s'" # -#: src/nl.c:486 +#: src/nl.c:478 #, fuzzy, c-format msgid "invalid header numbering style: %s" msgstr "μη έγκυρος αριθμός πεδίου: `%s'" # -#: src/nl.c:494 +#: src/nl.c:486 #, fuzzy, c-format msgid "invalid body numbering style: %s" msgstr "μη έγκυρος αριθμός" # -#: src/nl.c:502 +#: src/nl.c:494 #, fuzzy, c-format msgid "invalid footer numbering style: %s" msgstr "μη έγκυρος αριθμός αρχείου στη δήλωση πεδίου: `%s'" # -#: src/nl.c:511 +#: src/nl.c:503 #, fuzzy, c-format msgid "invalid starting line number: %s" msgstr "μη έγκυρος αρχικός αριθμός γραμμής: `%s'" -#: src/nl.c:517 -#, c-format -msgid "WARNING: --page-increment is deprecated; use --line-increment instead" -msgstr "" - # -#: src/nl.c:524 +#: src/nl.c:512 #, fuzzy, c-format msgid "invalid line number increment: %s" msgstr "μη έγκυρη αύξηση στον αριθμό εντολής: `%s'" # -#: src/nl.c:536 +#: src/nl.c:524 #, fuzzy, c-format msgid "invalid number of blank lines: %s" msgstr "μη έγκυρος αριθμός από κενές γραμμές: `%s'" # -#: src/nl.c:550 +#: src/nl.c:538 #, fuzzy, c-format msgid "invalid line number field width: %s" msgstr "μη έγκυρος μήκος πεδίου αριθμού γραμμής: `%s'" # -#: src/nl.c:569 +#: src/nl.c:557 #, fuzzy, c-format msgid "invalid line numbering format: %s" msgstr "μη έγκυρη αύξηση στον αριθμό εντολής: `%s'" @@ -6415,11 +6481,6 @@ msgstr "και τα δύο αρχεία δε μπορεί να είναι η κ msgid "ignoring input" msgstr "πάρα πολλά ορίσματα" -#: src/nohup.c:163 src/nohup.c:165 -#, fuzzy, c-format -msgid "failed to open %s" -msgstr "διατήρηση ωρών στο %s" - #: src/nohup.c:175 #, c-format msgid "ignoring input and appending output to %s" @@ -6452,35 +6513,382 @@ msgid "failed to redirect standard error" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:32 +#: src/nproc.c:33 msgid "Giuseppe Scrivano" msgstr "" # -#: src/nproc.c:56 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 +#: src/nproc.c:57 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 #, fuzzy, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Χρήση: %s [ΕΠΙΛΟΓΗ] [ΑΡΧΕΙΟ]...\n" -#: src/nproc.c:57 +#: src/nproc.c:58 msgid "" "Print the number of processing units available to the current process,\n" "which may be less than the number of online processors\n" "\n" msgstr "" -#: src/nproc.c:62 +#: src/nproc.c:63 msgid "" " --all print the number of installed processors\n" " --ignore=N if possible, exclude N processing units\n" msgstr "" # -#: src/nproc.c:106 +#: src/nproc.c:107 #, fuzzy, c-format msgid "%s: invalid number to ignore" msgstr "%s: μη έγκυρος αριθμός γραμμών" +#. This is a proper name. See the gettext manual, section Names. +#: src/numfmt.c:35 +msgid "Assaf Gordon" +msgstr "" + +#: src/numfmt.c:676 +#, fuzzy, c-format +msgid "value too large to be converted: '%s'" +msgstr "%s: η τιμή δεν έχει πλήρως μετατραπεί." + +# +#: src/numfmt.c:680 +#, fuzzy, c-format +msgid "invalid number: '%s'" +msgstr "μη έγκυρος αριθμός %s" + +#: src/numfmt.c:684 +#, c-format +msgid "rejecting suffix in input: '%s' (consider using --from)" +msgstr "" + +# +#: src/numfmt.c:688 +#, fuzzy, c-format +msgid "invalid suffix in input: '%s'" +msgstr "μη έγκυρη αύξηση στον αριθμό εντολής: `%s'" + +#: src/numfmt.c:692 +#, c-format +msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)" +msgstr "" + +# +#: src/numfmt.c:723 +#, fuzzy, c-format +msgid "failed to prepare value '%Lf' for printing" +msgstr "το αρχείο μηδενίστηκε" + +# +#: src/numfmt.c:787 +#, fuzzy, c-format +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 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [NUMBER]...\n" +msgstr "Χρήση: %s [ΕΠΙΛΟΓΕΣ]... [ΑΡΧΕΙΟ]...\n" + +#: src/numfmt.c:816 +msgid "" +"Reformat NUMBER(s), or the numbers from standard input if none are " +"specified.\n" +msgstr "" + +#: src/numfmt.c:820 +msgid " --debug print warnings about invalid input\n" +msgstr "" + +#: src/numfmt.c:823 +msgid "" +" -d, --delimiter=X use X instead of whitespace for field delimiter\n" +msgstr "" + +#: src/numfmt.c:826 +msgid "" +" --field=N replace the number in input field N (default is 1)\n" +msgstr "" + +#: src/numfmt.c:829 +msgid "" +" --format=FORMAT use printf style floating-point FORMAT;\n" +" see FORMAT below for details\n" +msgstr "" + +#: src/numfmt.c:833 +msgid "" +" --from=UNIT auto-scale input numbers to UNITs; default is " +"'none';\n" +" see UNIT below\n" +msgstr "" + +#: src/numfmt.c:837 +msgid "" +" --from-unit=N specify the input unit size (instead of the default " +"1)\n" +msgstr "" + +#: src/numfmt.c:840 +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 "" + +#: src/numfmt.c:844 +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 +msgid "" +" --invalid=MODE failure mode for invalid numbers: MODE can be:\n" +" abort (default), fail, warn, ignore\n" +msgstr "" + +#: src/numfmt.c:852 +msgid "" +" --padding=N pad the output to N characters; positive N will\n" +" right-align; negative N will left-align;\n" +" padding is ignored if the output is wider than N;\n" +" the default is to automatically pad if a " +"whitespace\n" +" is found\n" +msgstr "" + +#: src/numfmt.c:859 +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 +msgid "" +" --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" +" SUFFIX in input numbers\n" +msgstr "" + +#: src/numfmt.c:867 +msgid "" +" --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" +msgstr "" + +#: src/numfmt.c:870 +msgid "" +" --to-unit=N the output unit size (instead of the default 1)\n" +msgstr "" + +#: src/numfmt.c:877 +msgid "" +"\n" +"UNIT options:\n" +msgstr "" + +#: src/numfmt.c:880 +msgid " none no auto-scaling is done; suffixes will trigger an error\n" +msgstr "" + +#: src/numfmt.c:883 +msgid "" +" auto accept optional single/two letter suffix:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" +msgstr "" + +#: src/numfmt.c:889 +msgid "" +" si accept optional single letter suffix:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:894 +msgid "" +" iec accept optional single letter suffix:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:899 +msgid "" +" iec-i accept optional two-letter suffix:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:905 +#, 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" +msgstr "" + +#: src/numfmt.c:912 +#, c-format +msgid "" +"\n" +"Exit status is 0 if all input numbers were successfully converted.\n" +"By default, %s will stop at the first conversion error with exit status 2.\n" +"With --invalid='fail' a warning is printed for each conversion error\n" +"and the exit status is 2. With --invalid='warn' each conversion error is\n" +"diagnosed, but the exit status is 0. With --invalid='ignore' conversion\n" +"errors are not diagnosed and the exit status is 0.\n" +msgstr "" + +#: src/numfmt.c:921 +#, c-format +msgid "" +"\n" +"Examples:\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" +msgstr "" + +# +#: src/numfmt.c:974 src/seq.c:212 +#, fuzzy, c-format +msgid "format %s has no %% directive" +msgstr "το `%s' υπάρχει ήδη άλλα δεν είναι κατάλογος" + +# +#: src/numfmt.c:990 +#, fuzzy, c-format +msgid "invalid format %s (width overflow)" +msgstr "μη έγκυρο όρισμα %s για %s" + +#: src/numfmt.c:1007 src/seq.c:229 +#, c-format +msgid "format %s ends in %%" +msgstr "" + +#: src/numfmt.c:1010 +#, c-format +msgid "invalid format %s, directive must be %%['][-][N]f" +msgstr "" + +#: src/numfmt.c:1018 src/seq.c:236 +#, 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 "μη έγκυρη αύξηση στον αριθμό εντολής: `%s'" + +#: src/numfmt.c:1092 +#, c-format +msgid "value too large to be printed: '%Lg' (consider using --to)" +msgstr "" + +#: src/numfmt.c:1100 +#, c-format +msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" +msgstr "" + +#: src/numfmt.c:1184 +#, c-format +msgid "large input value '%s': possible precision loss" +msgstr "" + +#: src/numfmt.c:1293 +#, 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 "μη έγκυρο είδος αλφαριθμητικού `%s'" + +# +#: src/numfmt.c:1401 +#, fuzzy, c-format +msgid "invalid field value '%s'" +msgstr "μη έγκυρος αριθμός πεδίου: `%s'" + +# +#: src/numfmt.c:1430 +#, fuzzy, c-format +msgid "invalid header value '%s'" +msgstr "μη έγκυρος αριθμός πεδίου: `%s'" + +#: src/numfmt.c:1456 +#, 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 +#, fuzzy, c-format +msgid "no conversion option specified" +msgstr "\\%c: Μη έγκυρη διαφυγή." + +#: src/numfmt.c:1471 +#, c-format +msgid "grouping cannot be combined with --to" +msgstr "" + +#: src/numfmt.c:1473 +#, c-format +msgid "grouping has no effect in this locale" +msgstr "" + +#: src/numfmt.c:1486 +#, c-format +msgid "--header ignored with command-line input" +msgstr "" + +# +#: src/numfmt.c:1511 +#, fuzzy, c-format +msgid "error reading input" +msgstr "σφάλμα ανάγνωσης %s" + +# +#: src/numfmt.c:1520 +#, fuzzy, c-format +msgid "failed to convert some of the input numbers" +msgstr "και τα δύο αρχεία δε μπορεί να είναι η κανονική είσοδος" + # #: src/od.c:294 #, fuzzy, c-format @@ -6504,32 +6912,40 @@ msgid "" "\n" msgstr "" -# #: src/od.c:307 -msgid "All arguments to long options are mandatory for short options.\n" +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" +"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" +"at first byte printed, incremented when dump is progressing.\n" +"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 "" -# -#: src/od.c:310 +#: src/od.c:318 msgid "" -" -A, --address-radix=RADIX decide how file offsets are printed\n" +" -A, --address-radix=RADIX output format for file offsets. RADIX is one\n" +" of [doxn], for Decimal, Octal, Hex or None\n" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" -#: src/od.c:314 +#: src/od.c:323 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" -" --traditional accept arguments in traditional form\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:324 +#: src/od.c:336 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" @@ -6537,7 +6953,7 @@ msgid "" " -d same as -t u2, select unsigned decimal 2-byte units\n" msgstr "" -#: src/od.c:332 +#: src/od.c:345 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -6547,28 +6963,17 @@ msgid "" " -x same as -t x2, select hexadecimal 2-byte units\n" msgstr "" -#: src/od.c:340 +#: src/od.c:353 msgid "" "\n" -"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" -"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" -"at first byte printed, incremented when dump is progressing.\n" -"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 "" - -#: src/od.c:349 -msgid "" "\n" "TYPE is made up of one or more of these specifications:\n" -"\n" " a named character, ignoring high-order bit\n" " c ASCII character or backslash escape\n" msgstr "" # -#: src/od.c:356 +#: src/od.c:360 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -6577,43 +6982,43 @@ msgid "" " x[SIZE] hexadecimal, SIZE bytes per integer\n" msgstr "" -# -#: src/od.c:363 +#: src/od.c:367 msgid "" "\n" -"SIZE is a number. For TYPE in doux, SIZE may also be C for\n" +"SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" "sizeof(char), S for sizeof(short), I for sizeof(int) or L for\n" "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 "" -#: src/od.c:370 +#: src/od.c:374 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" +"Adding a z suffix to any type displays printable characters at the end of\n" +"each output line.\n" msgstr "" -#: src/od.c:380 +#: src/od.c:379 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" +"\n" +"BYTES is hex with 0x or 0X prefix, and may have a multiplier suffix:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"and so on for G, T, P, E, Z, Y.\n" msgstr "" # -#: src/od.c:633 src/od.c:753 +#: src/od.c:639 src/od.c:759 #, fuzzy, c-format msgid "invalid type string %s" msgstr "μη έγκυρο είδος αλφαριθμητικού `%s'" # -#: src/od.c:643 +#: src/od.c:649 #, fuzzy, c-format msgid "" "invalid type string %s;\n" @@ -6623,7 +7028,7 @@ msgstr "" "αυτό το σύστημα δεν παρέχει τον εσωτερικό τύπο δεδομένων %lu-byte" # -#: src/od.c:764 +#: src/od.c:770 #, fuzzy, c-format msgid "" "invalid type string %s;\n" @@ -6634,41 +7039,41 @@ msgstr "" "υποδιαστολής %lu-byte" # -#: src/od.c:822 +#: src/od.c:828 #, fuzzy, c-format msgid "invalid character '%c' in type string %s" msgstr "μη έγκυρος χαρακτήρας `%c' στο τύπο αλφαριθμητικού `%s'" # -#: src/od.c:1047 +#: src/od.c:1053 #, c-format msgid "cannot skip past end of combined input" msgstr "αδυναμία προσπέρασης μετά το τέλος της συνδυασμένης εισόδου" -#: src/od.c:1603 +#: src/od.c:1609 #, c-format msgid "invalid output address radix '%c'; it must be one character from [doxn]" msgstr "" # -#: src/od.c:1729 +#: src/od.c:1735 #, c-format msgid "no type may be specified when dumping strings" msgstr "κανένα είδος δε μπορεί να δηλωθεί όταν τυπώνονται αλφαριθμητικά" # -#: src/od.c:1804 +#: src/od.c:1810 #, fuzzy msgid "compatibility mode supports at most one file" msgstr "η κατάσταση συμβατότητας υποστηρίζει το πολύ τρία ορίσματα" -#: src/od.c:1825 +#: src/od.c:1831 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "" # -#: src/od.c:1868 +#: src/od.c:1874 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "" @@ -6687,21 +7092,36 @@ 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" -"\n" msgstr "" +"Μετατροπή διαστημάτων σε κάθε ΑΡΧΕΙΟ σε στηλοθέτες, γράφοντας στην κανονική " +"έξοδο.\n" +"Χωρίς ΑΡΧΕΙΟ, ή όταν το αρχείο είναι το -, ανάγνωση από την κανονική " +"είσοδο.\n" +"\n" +" -a, --all μετατροπή όλων των λευκών χαρακτήρων, αντί μόνο των " +"αρχικών\n" +" -t, --tabs=ΑΡΙΘΜΟΣ οι στηλοθέτες να έχουν απόσταση ΑΡΙΘΜΟΣ αντί 8\n" +" -t, --tabs=ΛΙΣΤΑ χρήση λίστας χωρισμένης με κόμμα για τη δήλωση της " +"θέσης των στηλοθετών\n" +" --help εμφάνιση αυτής της βοήθειας και έξοδος\n" +" --version εμφάνιση πληροφοριών έκδοσης και έξοδος\n" +"\n" +"Αντί για -t ΑΡΙΘΜΟΣ ή -t ΛΙΣΤΑ, -ΑΡΙΘΜΟΣ ή -ΛΙΣΤΑ μπορούν να " +"χρησιμοποιηθούν.\n" # -#: src/paste.c:448 +#: 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 "" -#: src/paste.c:509 +#: src/paste.c:508 #, c-format msgid "delimiter list ends with an unescaped backslash: %s" msgstr "" @@ -6760,83 +7180,83 @@ msgid "Kaveh Ghazi" msgstr "" #. TRANSLATORS: Real name is unknown; at most 19 characters. -#: src/pinky.c:250 +#: src/pinky.c:242 msgid " ???" msgstr "" #. TRANSLATORS: Idle time is unknown; at most 5 characters. -#: src/pinky.c:274 +#: src/pinky.c:266 msgid "?????" msgstr "" -#: src/pinky.c:323 +#: src/pinky.c:314 #, fuzzy, c-format msgid "Login name: " msgstr "%s: Δεν υπάρχει όνομα χρήστη (login name).\n" -#: src/pinky.c:326 +#: src/pinky.c:317 #, c-format msgid "In real life: " msgstr "" #. TRANSLATORS: Real name is unknown; no hard limit. -#: src/pinky.c:330 +#: src/pinky.c:321 msgid "???\n" msgstr "" # -#: src/pinky.c:350 +#: src/pinky.c:341 #, fuzzy, c-format msgid "Directory: " msgstr "κατάλογος" -#: src/pinky.c:352 +#: src/pinky.c:343 #, c-format msgid "Shell: " msgstr "" -#: src/pinky.c:371 +#: src/pinky.c:362 #, c-format msgid "Project: " msgstr "" -#: src/pinky.c:395 +#: src/pinky.c:386 #, c-format msgid "Plan:\n" msgstr "" -#: src/pinky.c:414 +#: src/pinky.c:405 msgid "Login" msgstr "" -#: src/pinky.c:416 +#: src/pinky.c:407 #, fuzzy msgid "Name" msgstr "πμ" -#: src/pinky.c:417 +#: src/pinky.c:408 msgid " TTY" msgstr "" -#: src/pinky.c:419 +#: src/pinky.c:410 msgid "Idle" msgstr "" -#: src/pinky.c:420 +#: src/pinky.c:411 msgid "When" msgstr "" -#: src/pinky.c:423 +#: src/pinky.c:414 msgid "Where" msgstr "" # -#: src/pinky.c:502 +#: src/pinky.c:493 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Χρήση: %s [ΕΠΙΛΟΓΕΣ]... [ΑΡΧΕΙΟ]...\n" -#: src/pinky.c:503 +#: src/pinky.c:494 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -6846,7 +7266,7 @@ msgid "" " -s do short format output, this is the default\n" msgstr "" -#: src/pinky.c:511 +#: src/pinky.c:502 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -6855,7 +7275,7 @@ msgid "" " in short format\n" msgstr "" -#: src/pinky.c:520 +#: src/pinky.c:511 #, c-format msgid "" "\n" @@ -6864,7 +7284,7 @@ msgid "" msgstr "" # -#: src/pinky.c:604 +#: src/pinky.c:595 #, fuzzy, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "δε μπορούν να δηλώνονται αρχεία όταν γίνεται χρήση του --string" @@ -6882,95 +7302,92 @@ msgid "Roland Huebner" msgstr "Πιτ ΤερΜάτ και Ρόλαντ Χέμπνερ" # -#: src/pr.c:912 +#: src/pr.c:908 #, fuzzy, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "`--pages=ΠΡΩΤΗ_ΣΕΛΙΔΑ[:ΤΕΛΕΥΤΑΙΑ_ΣΕΛΙΔΑ]' απουσία ορίσματος" # -#: src/pr.c:914 +#: src/pr.c:910 #, fuzzy, c-format msgid "invalid page range %s" msgstr "μη έγκυρο είδος αλφαριθμητικού `%s'" # -#: src/pr.c:979 +#: src/pr.c:975 #, fuzzy, c-format msgid "'-l PAGE_LENGTH' invalid number of lines: %s" msgstr "`-l ΜΗΚΟΣ_ΣΕΛΙΔΑΣ' μη έγκυρος αριθμός γραμμών: `%s'" # -#: src/pr.c:1003 +#: src/pr.c:999 #, fuzzy, c-format msgid "'-N NUMBER' invalid starting line number: %s" msgstr "`-N ΑΡΙΘΜΟΣ' μη έγκυρος αριθμός αρχικής σελίδας: `%s'" # -#: src/pr.c:1015 +#: src/pr.c:1011 #, fuzzy, c-format msgid "'-o MARGIN' invalid line offset: %s" msgstr "`-o ΠΕΡΙΘΩΡΙΟ' μη έγκυρη θέση γραμμής: `%s'" # -#: src/pr.c:1056 +#: src/pr.c:1052 #, fuzzy, c-format msgid "'-w PAGE_WIDTH' invalid number of characters: %s" msgstr "`-w ΠΛΑΤΟΣ_ΣΕΛΙΔΑΣ' μη έγκυρος αριθμός χαρακτήρων : `%s'" # -#: src/pr.c:1070 +#: src/pr.c:1066 #, fuzzy, c-format msgid "'-W PAGE_WIDTH' invalid number of characters: %s" msgstr "`-W ΠΛΑΤΟΣ_ΣΕΛΙΔΑΣ' μη έγκυρος αριθμός χαρακτήρων : `%s'" # -#: src/pr.c:1100 +#: src/pr.c:1096 #, fuzzy, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "Δεν είναι δυνατό να δηλωθεί αριθμός στηλών στην παράλληλη εκτύπωση." # -#: src/pr.c:1104 +#: src/pr.c:1100 #, fuzzy, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "Δεν είναι δυνατό να δηλωθεί σειριακή και παράλληλη εκτύπωση." # -#: src/pr.c:1200 +#: src/pr.c:1196 #, fuzzy, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "`-%c' επιπλέον χαρακτήρες ή μη έγκυρος αριθμός στο όρισμα: `%s'" # -#: src/pr.c:1304 +#: src/pr.c:1293 #, c-format msgid "page width too narrow" msgstr "το πλάτος σελίδας είναι πολύ στενό" -#: src/pr.c:2369 +#: src/pr.c:2353 #, c-format msgid "starting page number %<PRIuMAX> exceeds page count %<PRIuMAX>" msgstr "" # -#: src/pr.c:2396 +#: src/pr.c:2380 #, fuzzy, c-format msgid "page number overflow" msgstr "μη έγκυρος αριθμός πεδίου: `%s'" -#: src/pr.c:2401 +#: src/pr.c:2385 #, c-format msgid "Page %<PRIuMAX>" msgstr "" -# -#: src/pr.c:2773 -msgid "" -"Paginate or columnate FILE(s) for printing.\n" -"\n" +#: src/pr.c:2757 +msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" -#: src/pr.c:2780 +#: src/pr.c:2763 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -6981,7 +7398,7 @@ msgid "" msgstr "" # -#: src/pr.c:2788 +#: src/pr.c:2771 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -6992,7 +7409,7 @@ msgid "" msgstr "" # -#: src/pr.c:2796 +#: src/pr.c:2779 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7004,7 +7421,7 @@ msgid "" " and trailer without -F)\n" msgstr "" -#: src/pr.c:2806 +#: src/pr.c:2789 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -7017,7 +7434,7 @@ msgid "" " alignment, --sep-string[=STRING] sets separators\n" msgstr "" -#: src/pr.c:2815 +#: src/pr.c:2798 msgid "" " -l, --length=PAGE_LENGTH\n" " set the page length to PAGE_LENGTH (66) lines\n" @@ -7026,7 +7443,7 @@ msgid "" " truncate lines, but join lines of full length with -J\n" msgstr "" -#: src/pr.c:2822 +#: src/pr.c:2805 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -7036,7 +7453,7 @@ msgid "" " page printed (see +FIRST_PAGE)\n" msgstr "" -#: src/pr.c:2830 +#: src/pr.c:2813 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -7045,7 +7462,7 @@ msgid "" " omit warning when a file cannot be opened\n" msgstr "" -#: src/pr.c:2837 +#: src/pr.c:2820 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -7055,7 +7472,7 @@ msgid "" " options (-COLUMN|-a -COLUMN|-m) except -w is set\n" msgstr "" -#: src/pr.c:2844 +#: src/pr.c:2827 msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" @@ -7065,7 +7482,7 @@ msgid "" " -t, --omit-header omit page headers and trailers\n" msgstr "" -#: src/pr.c:2851 +#: src/pr.c:2834 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -7080,7 +7497,7 @@ msgid "" msgstr "" # -#: src/pr.c:2861 +#: src/pr.c:2844 #, fuzzy msgid "" " -W, --page-width=PAGE_WIDTH\n" @@ -7099,7 +7516,7 @@ msgstr "" " --version εμφάνιση πληροφοριών έκδοσης και έξοδος\n" # -#: src/pr.c:2869 +#: src/pr.c:2852 #, fuzzy msgid "" "\n" @@ -7254,22 +7671,20 @@ msgstr "" "Χρήση: %s [ΕΠΙΛΟΓΗ]... [ΕΙΣΟΔΟΣ]... (χωρίς -G)\n" " ή: %s -G [ΕΠΙΛΟΓΗ]... [ΕΙΣΟΔΟΣ [ΕΞΟΔΟΣ]]\n" -# #: src/ptx.c:1821 msgid "" "Output a permuted index, including context, of the words in the input " "files.\n" -"\n" msgstr "" -#: src/ptx.c:1828 +#: src/ptx.c:1827 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:1833 +#: src/ptx.c:1832 msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" " -O, --format=roff generate output as roff directives\n" @@ -7279,7 +7694,7 @@ msgid "" msgstr "" # -#: src/ptx.c:1840 +#: src/ptx.c:1839 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -7290,7 +7705,7 @@ msgid "" msgstr "" # -#: src/ptx.c:1848 +#: src/ptx.c:1847 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -7298,14 +7713,14 @@ msgid "" "excluded\n" msgstr "" -#: src/ptx.c:1855 +#: src/ptx.c:1854 msgid "" "\n" "With no FILE or if FILE is -, read Standard Input. '-F /' by default.\n" msgstr "" # -#: src/ptx.c:1949 +#: src/ptx.c:1948 #, fuzzy, c-format msgid "invalid gap width: %s" msgstr "μη έγκυρος αριθμός πεδίου: `%s'" @@ -7327,7 +7742,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "αποτυχία αλλαγής της ομάδας από %s σε %s\n" -#: src/pwd.c:170 src/pwd.c:277 +#: src/pwd.c:170 src/pwd.c:277 src/split.c:373 #, fuzzy, c-format msgid "failed to stat %s" msgstr "διατήρηση ωρών στο %s" @@ -7344,14 +7759,15 @@ msgid "ignoring non-option arguments" msgstr "πάρα πολλά ορίσματα που δεν έχουν επιλογές" #. This is a proper name. See the gettext manual, section Names. -#: src/readlink.c:33 +#: src/readlink.c:32 msgid "Dmitry V. Levin" msgstr "" # -#: src/readlink.c:62 +#: 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 -msgid "Usage: %s [OPTION]... FILE\n" +msgid "Usage: %s [OPTION]... FILE...\n" msgstr "Χρήση: %s [ΕΠΙΛΟΓΕΣ]... [ΑΡΧΕΙΟ]...\n" #: src/readlink.c:63 @@ -7379,18 +7795,19 @@ msgid "" "recursively,\n" " without requirements on components " "existence\n" -" -n, --no-newline do not output the trailing newline\n" +" -n, --no-newline do not output the trailing delimiter\n" " -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" msgstr "" # -#: src/realpath.c:71 src/rm.c:134 src/shred.c:147 src/stat.c:1330 -#: src/touch.c:215 +#: src/readlink.c:152 #, fuzzy, c-format -msgid "Usage: %s [OPTION]... FILE...\n" -msgstr "Χρήση: %s [ΕΠΙΛΟΓΕΣ]... [ΑΡΧΕΙΟ]...\n" +msgid "ignoring --no-newline with multiple arguments" +msgstr "πάρα πολλά ορίσματα που δεν έχουν επιλογές" #: src/realpath.c:72 msgid "" @@ -7418,13 +7835,13 @@ msgid "generating relative path" msgstr "" # -#: src/remove.c:286 +#: src/remove.c:273 #, fuzzy, c-format msgid "%s: descend into write-protected directory %s? " msgstr "αδύνατη η δημιουργία καταλόγου `%s'" # -#: src/remove.c:287 +#: src/remove.c:274 #, fuzzy, c-format msgid "%s: descend into directory %s? " msgstr "αδύνατη η αλλαγή στο κατάλογο %s" @@ -7433,52 +7850,52 @@ msgstr "αδύνατη η αλλαγή στο κατάλογο %s" #. translate "%s: remove %s (write-protected) %s? " #. instead. It should avoid grammatical problems #. with the output of file_type. -#: src/remove.c:303 +#: src/remove.c:290 #, fuzzy, c-format msgid "%s: remove write-protected %s %s? " msgstr "%s: διαγραφή προστατευμένου από εγγραφή καταλόγου `%s'; " -#: src/remove.c:304 +#: src/remove.c:291 #, fuzzy, c-format msgid "%s: remove %s %s? " msgstr "%s: διαγραφή του `%s'; " # -#: src/remove.c:417 +#: src/remove.c:374 #, fuzzy, c-format msgid "removed directory: %s\n" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" # -#: src/remove.c:481 +#: src/remove.c:444 #, fuzzy, c-format msgid "cannot remove directory: %s" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" -#: src/remove.c:537 +#: src/remove.c:500 #, c-format msgid "skipping %s, since it's on a different device" msgstr "" # -#: src/remove.c:557 +#: src/remove.c:520 #, fuzzy, c-format msgid "traversal failed: %s" msgstr "αποτυχία ανάγνωσης" -#: src/remove.c:563 +#: src/remove.c:526 #, c-format msgid "" "unexpected failure: fts_info=%d: %s\n" "please report to %s" msgstr "" -#: src/rm.c:118 +#: src/rm.c:119 #, c-format msgid "Try '%s ./%s' to remove the file %s.\n" msgstr "" -#: src/rm.c:135 +#: src/rm.c:136 msgid "" "Remove (unlink) the FILE(s).\n" "\n" @@ -7487,7 +7904,7 @@ msgid "" " -i prompt before every removal\n" msgstr "" -#: src/rm.c:141 +#: src/rm.c:142 msgid "" " -I prompt once before removing more than three files, " "or\n" @@ -7499,22 +7916,23 @@ msgid "" " always (-i). Without WHEN, prompt always\n" msgstr "" -#: src/rm.c:148 +#: src/rm.c:149 msgid "" " --one-file-system when removing a hierarchy recursively, skip any\n" " directory that is on a file system different from\n" " that of the corresponding command line argument\n" msgstr "" -#: src/rm.c:153 +#: src/rm.c:154 msgid "" " --no-preserve-root do not treat '/' specially\n" " --preserve-root do not remove '/' (default)\n" " -r, -R, --recursive remove directories and their contents recursively\n" +" -d, --dir remove empty directories\n" " -v, --verbose explain what is being done\n" msgstr "" -#: src/rm.c:161 +#: src/rm.c:163 msgid "" "\n" "By default, rm does not remove directories. Use the --recursive (-r or -R)\n" @@ -7522,7 +7940,7 @@ msgid "" "contents.\n" msgstr "" -#: src/rm.c:166 +#: src/rm.c:168 #, c-format msgid "" "\n" @@ -7533,7 +7951,7 @@ msgid "" " %s ./-foo\n" msgstr "" -#: src/rm.c:175 +#: src/rm.c:177 msgid "" "\n" "Note that if you use rm to remove a file, it might be possible to recover\n" @@ -7541,12 +7959,12 @@ msgid "" "assurance that the contents are truly unrecoverable, consider using shred.\n" msgstr "" -#: src/rm.c:335 +#: src/rm.c:342 #, c-format msgid "%s: remove all arguments recursively? " msgstr "" -#: src/rm.c:336 +#: src/rm.c:343 #, fuzzy, c-format msgid "%s: remove all arguments? " msgstr "%s: διαγραφή του `%s'; " @@ -7609,7 +8027,10 @@ msgstr "" msgid "" "Run a program in a different security context.\n" "With neither CONTEXT nor COMMAND, print the current security context.\n" -"\n" +msgstr "" + +#: src/runcon.c:94 +msgid "" " CONTEXT Complete security context\n" " -c, --compute compute process transition context before modifying\n" " -t, --type=TYPE type (for same role as parent)\n" @@ -7619,74 +8040,74 @@ msgid "" "\n" msgstr "" -#: src/runcon.c:140 +#: src/runcon.c:144 #, c-format msgid "multiple roles" msgstr "" -#: src/runcon.c:145 +#: src/runcon.c:149 #, fuzzy, c-format msgid "multiple types" msgstr "είδος ώρας" -#: src/runcon.c:150 +#: src/runcon.c:154 #, c-format msgid "multiple users" msgstr "" -#: src/runcon.c:155 +#: src/runcon.c:159 #, c-format msgid "multiple levelranges" msgstr "" -#: src/runcon.c:173 src/runcon.c:209 +#: src/runcon.c:177 src/runcon.c:213 #, fuzzy, c-format msgid "failed to get current context" msgstr "διατήρηση ωρών στο %s" -#: src/runcon.c:183 +#: src/runcon.c:187 #, c-format msgid "you must specify -c, -t, -u, -l, -r, or context" msgstr "" # -#: src/runcon.c:191 +#: src/runcon.c:195 #, fuzzy, c-format msgid "no command specified" msgstr "μόνο ένα όρισμα μπορεί να δηλωθεί" -#: src/runcon.c:197 +#: src/runcon.c:201 #, c-format msgid "%s may be used only on a SELinux kernel" msgstr "" -#: src/runcon.c:223 +#: src/runcon.c:227 #, c-format msgid "failed to compute a new context" msgstr "" -#: src/runcon.c:237 +#: src/runcon.c:241 #, fuzzy, c-format msgid "failed to set new user %s" msgstr "διατήρηση ωρών στο %s" -#: src/runcon.c:239 +#: src/runcon.c:243 #, fuzzy, c-format msgid "failed to set new type %s" msgstr "διατήρηση ωρών στο %s" -#: src/runcon.c:241 +#: src/runcon.c:245 #, fuzzy, c-format msgid "failed to set new range %s" msgstr "διατήρηση ωρών στο %s" -#: src/runcon.c:243 +#: src/runcon.c:247 #, fuzzy, c-format msgid "failed to set new role %s" msgstr "διατήρηση ωρών στο %s" # -#: src/runcon.c:251 +#: src/runcon.c:255 #, fuzzy, c-format msgid "unable to set security context %s" msgstr "αδυναμία αλλαγής ιδιοκτησίας στο %s" @@ -7703,15 +8124,17 @@ msgstr "" " ή: %s -G [ΕΠΙΛΟΓΗ]... [ΕΙΣΟΔΟΣ [ΕΞΟΔΟΣ]]\n" #: src/seq.c:73 +msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" +msgstr "" + +#: src/seq.c:79 msgid "" -"Print numbers from FIRST to LAST, in steps of INCREMENT.\n" -"\n" " -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 "" -#: src/seq.c:82 +#: src/seq.c:86 #, fuzzy msgid "" "\n" @@ -7742,7 +8165,7 @@ msgstr "" "τις διαμορφώσεις της printf για κινητής υποδιαστολής αριθμό %%e, %%f, or %" "%g.\n" -#: src/seq.c:90 +#: src/seq.c:94 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" @@ -7750,34 +8173,18 @@ msgid "" msgstr "" # -#: src/seq.c:136 +#: src/seq.c:140 #, fuzzy, c-format msgid "invalid floating point argument: %s" msgstr "μη έγκυρος αρχικός αριθμός γραμμής: `%s'" -# -#: src/seq.c:193 -#, fuzzy, c-format -msgid "format %s has no %% directive" -msgstr "το `%s' υπάρχει ήδη άλλα δεν είναι κατάλογος" - -#: src/seq.c:210 -#, c-format -msgid "format %s ends in %%" -msgstr "" - -#: src/seq.c:213 +#: src/seq.c:232 #, fuzzy, c-format msgid "format %s has unknown %%%c directive" msgstr "%s: άγνωστο είδος αρχείου" -#: src/seq.c:217 -#, c-format -msgid "format %s has too many %% directives" -msgstr "" - # -#: src/seq.c:431 +#: src/seq.c:555 #, fuzzy, c-format msgid "format string may not be specified when printing equal width strings" msgstr "κανένα είδος δε μπορεί να δηλωθεί όταν τυπώνονται αλφαριθμητικά" @@ -7808,29 +8215,29 @@ msgid "" " (if specified) supplemental group IDs to GID1, ...\n" msgstr "" -#: src/setuidgid.c:163 +#: src/setuidgid.c:162 #, c-format msgid "unknown user-ID: %s" msgstr "" -#: src/setuidgid.c:174 +#: src/setuidgid.c:173 #, c-format msgid "to use user-ID %s you need to use -g too" msgstr "" -#: src/setuidgid.c:191 +#: src/setuidgid.c:190 #, fuzzy, c-format msgid "failed to set supplemental group(s)" msgstr "Δεν μπορεί να παρθεί ο συμπληρωματικός κατάλογος ομάδων." # -#: src/setuidgid.c:201 +#: src/setuidgid.c:200 #, fuzzy, c-format msgid "cannot set group-ID to %lu" msgstr "δεν είναι δυνατό να παραληφθεί χρήστης και ομάδα" # -#: src/setuidgid.c:205 +#: src/setuidgid.c:204 #, fuzzy, c-format msgid "cannot set user-ID to %lu" msgstr "δεν είναι δυνατό να παραληφθεί χρήστης και ομάδα" @@ -7844,10 +8251,9 @@ msgstr "" 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" -"\n" msgstr "" -#: src/shred.c:156 +#: src/shred.c:155 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -7856,7 +8262,7 @@ msgid "" " -s, --size=N shred this many bytes (suffixes like K, M, G accepted)\n" msgstr "" -#: src/shred.c:162 +#: src/shred.c:161 msgid "" " -u, --remove truncate and remove file after overwriting\n" " -v, --verbose show progress\n" @@ -7865,7 +8271,7 @@ msgid "" " -z, --zero add a final overwrite with zeros to hide shredding\n" msgstr "" -#: src/shred.c:171 +#: src/shred.c:170 msgid "" "\n" "If FILE is -, shred standard output.\n" @@ -7877,7 +8283,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:181 +#: src/shred.c:180 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" @@ -7888,7 +8294,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:189 +#: src/shred.c:188 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -7900,7 +8306,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:199 +#: src/shred.c:198 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -7909,7 +8315,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:206 +#: src/shred.c:205 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" @@ -7921,147 +8327,147 @@ msgid "" "\n" msgstr "" -#: src/shred.c:216 +#: src/shred.c:215 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:296 +#: src/shred.c:295 #, c-format msgid "%s: fdatasync failed" msgstr "" -#: src/shred.c:307 +#: src/shred.c:306 #, c-format msgid "%s: fsync failed" msgstr "" -#: src/shred.c:384 +#: src/shred.c:383 #, fuzzy, c-format msgid "%s: cannot rewind" msgstr "Δεν είναι δυνατόν να εκτελεστεί το %s" # src/shred.c:1067 -#: src/shred.c:403 +#: src/shred.c:402 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: πέρασμα %lu/%lu (%s)..." # -#: src/shred.c:453 +#: src/shred.c:452 #, fuzzy, c-format msgid "%s: error writing at offset %s" msgstr "σφάλμα εγγραφής %s" # -#: src/shred.c:471 +#: src/shred.c:470 #, fuzzy, c-format msgid "%s: lseek failed" msgstr "σφάλμα κλεισίματος αρχείου" # -#: src/shred.c:482 +#: src/shred.c:481 #, fuzzy, c-format msgid "%s: file too large" msgstr "το αρχείο μηδενίστηκε" # src/shred.c:1154 -#: src/shred.c:505 +#: src/shred.c:504 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: πέρασμα %lu/%lu (%s)...%s" # src/shred.c:1149 -#: src/shred.c:521 +#: src/shred.c:520 #, fuzzy, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: πέρασμα %lu/%lu (%s)...%s/%s" # -#: src/shred.c:768 +#: src/shred.c:767 #, fuzzy, c-format msgid "%s: fstat failed" msgstr "αποτυχία εγγραφής" # -#: src/shred.c:779 +#: src/shred.c:778 #, fuzzy, c-format msgid "%s: invalid file type" msgstr "%s: μη έγκυρος αριθμός γραμμών" # src/shred.c:1424 -#: src/shred.c:798 +#: src/shred.c:797 #, c-format msgid "%s: file has negative size" msgstr "%s: το αρχείο έχει αρνητικό μέγεθος" # -#: src/shred.c:865 +#: src/shred.c:864 src/sort.c:932 src/split.c:378 #, fuzzy, c-format msgid "%s: error truncating" msgstr "το αρχείο μηδενίστηκε" # -#: src/shred.c:881 +#: src/shred.c:880 #, fuzzy, c-format msgid "%s: fcntl failed" msgstr "αποτυχία εγγραφής" # src/shred.c:1483 -#: src/shred.c:886 +#: src/shred.c:885 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "%s: αδυναμία διάλυσης μόνο-προσθήκη περιγραφέα αρχείου" -#: src/shred.c:968 +#: src/shred.c:967 #, c-format msgid "%s: removing" msgstr "%s: διαγράφεται" # -#: src/shred.c:992 +#: src/shred.c:991 #, fuzzy, c-format msgid "%s: renamed to %s" msgstr "%s: σφάλμα ανάγνωσης" # -#: src/shred.c:1014 +#: src/shred.c:1013 #, fuzzy, c-format msgid "%s: failed to remove" msgstr "το αρχείο μηδενίστηκε" -#: src/shred.c:1018 +#: src/shred.c:1017 #, c-format msgid "%s: removed" msgstr "%s: διεγράφει" # -#: src/shred.c:1025 src/shred.c:1068 +#: src/shred.c:1024 src/shred.c:1067 #, fuzzy, c-format msgid "%s: failed to close" msgstr "το αρχείο μηδενίστηκε" # -#: src/shred.c:1061 +#: src/shred.c:1060 #, fuzzy, c-format msgid "%s: failed to open for writing" msgstr "το αρχείο μηδενίστηκε" # -#: src/shred.c:1126 +#: src/shred.c:1125 #, fuzzy, c-format msgid "%s: invalid number of passes" msgstr "%s: μη έγκυρος αριθμός δευτερολέπτων" -#: src/shred.c:1135 src/shuf.c:291 src/sort.c:4387 +#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441 #, fuzzy, c-format msgid "multiple random sources specified" msgstr "\\%c: Μη έγκυρη διαφυγή." # -#: src/shred.c:1149 +#: src/shred.c:1148 #, fuzzy, c-format msgid "%s: invalid file size" msgstr "%s: μη έγκυρος αριθμός γραμμών" @@ -8078,12 +8484,10 @@ msgstr "" " ή: %s -G [ΕΠΙΛΟΓΗ]... [ΕΙΣΟΔΟΣ [ΕΞΟΔΟΣ]]\n" #: src/shuf.c:54 -msgid "" -"Write a random permutation of the input lines to standard output.\n" -"\n" +msgid "Write a random permutation of the input lines to standard output.\n" msgstr "" -#: src/shuf.c:61 +#: src/shuf.c:60 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 " @@ -8094,30 +8498,30 @@ msgid "" " -z, --zero-terminated end lines with 0 byte, not newline\n" msgstr "" -#: src/shuf.c:245 +#: src/shuf.c:244 #, fuzzy, c-format msgid "multiple -i options specified" msgstr "\\%c: Μη έγκυρη διαφυγή." # -#: src/shuf.c:265 +#: src/shuf.c:264 #, fuzzy, c-format msgid "invalid input range %s" msgstr "μη έγκυρος αριθμός" # -#: src/shuf.c:278 +#: src/shuf.c:277 #, fuzzy, c-format msgid "invalid line count %s" msgstr "μη έγκυρος αριθμός πεδίου: `%s'" -#: src/shuf.c:285 src/sort.c:4381 +#: src/shuf.c:284 src/sort.c:4435 #, fuzzy, c-format msgid "multiple output files specified" msgstr "\\%c: Μη έγκυρη διαφυγή." # -#: src/shuf.c:311 +#: src/shuf.c:310 #, fuzzy, c-format msgid "cannot combine -e and -i options" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" @@ -8143,7 +8547,7 @@ msgstr "" " --version Εκτυπώνει πληροφορίες έκδοσης και τερματίζει\n" # -#: src/sleep.c:135 src/timeout.c:295 +#: src/sleep.c:135 src/timeout.c:320 #, fuzzy, c-format msgid "invalid time interval %s" msgstr "μη έγκυρος αριθμός πεδίου: `%s'" @@ -8153,19 +8557,17 @@ msgstr "μη έγκυρος αριθμός πεδίου: `%s'" msgid "cannot read realtime clock" msgstr "" -#: src/sort.c:395 -msgid "" -"Write sorted concatenation of all FILE(s) to standard output.\n" -"\n" +#: src/sort.c:399 +msgid "Write sorted concatenation of all FILE(s) to standard output.\n" msgstr "" -#: src/sort.c:402 +#: src/sort.c:405 msgid "" "Ordering options:\n" "\n" msgstr "" -#: src/sort.c:406 +#: src/sort.c:409 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -8173,19 +8575,19 @@ msgid "" " -f, --ignore-case fold lower case to upper case characters\n" msgstr "" -#: src/sort.c:412 +#: src/sort.c:415 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:417 +#: src/sort.c:420 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" -#: src/sort.c:420 +#: src/sort.c:423 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -8193,7 +8595,7 @@ msgid "" " -r, --reverse reverse the result of comparisons\n" msgstr "" -#: src/sort.c:426 +#: src/sort.c:429 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -8203,19 +8605,19 @@ msgid "" "\n" msgstr "" -#: src/sort.c:434 +#: src/sort.c:437 msgid "" "Other options:\n" "\n" msgstr "" -#: src/sort.c:438 +#: src/sort.c:441 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" msgstr "" -#: src/sort.c:442 +#: src/sort.c:445 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 " @@ -8225,7 +8627,7 @@ msgid "" msgstr "" # -#: src/sort.c:449 +#: src/sort.c:452 #, fuzzy msgid "" " --debug annotate the part of the line used to sort,\n" @@ -8239,13 +8641,13 @@ msgstr "" " --help εμφάνιση αυτής της βοήθειας και έξοδος\n" " --version εμφάνιση πληροφοριών έκδοσης και έξοδος\n" -#: src/sort.c:456 +#: src/sort.c:459 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:460 +#: src/sort.c:463 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -8253,7 +8655,7 @@ msgid "" " -S, --buffer-size=SIZE use SIZE for main memory buffer\n" msgstr "" -#: src/sort.c:466 +#: src/sort.c:469 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -8269,12 +8671,12 @@ msgid "" msgstr "" # -#: src/sort.c:475 +#: src/sort.c:478 msgid " -z, --zero-terminated end lines with 0 byte, not newline\n" msgstr "" # -#: src/sort.c:480 +#: src/sort.c:483 #, fuzzy msgid "" "\n" @@ -8302,7 +8704,7 @@ msgstr "" "από την κανονική είσοδο.\n" # -#: src/sort.c:493 +#: src/sort.c:496 msgid "" "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n" "\n" @@ -8315,301 +8717,306 @@ msgid "" msgstr "" # -#: src/sort.c:694 +#: src/sort.c:697 #, fuzzy, c-format msgid "waiting for %s [-d]" msgstr "σφάλμα εγγραφής %s" -#: src/sort.c:699 +#: src/sort.c:702 #, c-format msgid "%s [-d] terminated abnormally" msgstr "" # -#: src/sort.c:853 +#: src/sort.c:856 #, fuzzy, c-format msgid "cannot create temporary file in %s" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" # -#: src/sort.c:939 src/sort.c:2010 src/sort.c:3056 src/sort.c:3755 -#: src/sort.c:3758 +#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713 +#: src/sort.c:3804 src/sort.c:3807 msgid "open failed" msgstr "αποτυχία ανοίγματος" # -#: src/sort.c:959 +#: src/sort.c:970 #, fuzzy msgid "fflush failed" msgstr "ολοκλήρωση αρχείου" # -#: src/sort.c:964 src/sort.c:2013 src/sort.c:4646 +#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706 #, fuzzy msgid "close failed" msgstr "σφάλμα κλεισίματος αρχείου" # -#: src/sort.c:973 +#: src/sort.c:986 #, fuzzy, c-format msgid "dup2 failed" msgstr "αποτυχία ανοίγματος" # -#: src/sort.c:1090 +#: src/sort.c:1103 #, fuzzy, c-format msgid "couldn't execute %s" msgstr "αδύνατη η αλλαγή δικαιωμάτων στο %s" # -#: src/sort.c:1097 +#: src/sort.c:1110 #, fuzzy msgid "couldn't create temporary file" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" # -#: src/sort.c:1136 +#: src/sort.c:1149 #, fuzzy, c-format msgid "couldn't create process for %s -d" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" # -#: src/sort.c:1150 +#: src/sort.c:1161 #, fuzzy, c-format msgid "couldn't execute %s -d" msgstr "αδύνατη η αλλαγή δικαιωμάτων στο %s" # -#: src/sort.c:1209 +#: src/sort.c:1220 #, fuzzy, c-format msgid "warning: cannot remove: %s" msgstr "αδύνατη η αλλαγή δικαιωμάτων στο %s" # -#: src/sort.c:1295 +#: src/sort.c:1306 #, fuzzy, c-format msgid "invalid --%s argument %s" msgstr "μη έγκυρο όρισμα %s για %s" # -#: src/sort.c:1298 +#: src/sort.c:1309 #, fuzzy, c-format msgid "minimum --%s argument is %s" msgstr "μη έγκυρο όρισμα %s για %s" # -#: src/sort.c:1313 +#: src/sort.c:1324 #, fuzzy, c-format msgid "--%s argument %s too large" msgstr "το %s είναι πολύ μεγάλο" -#: src/sort.c:1316 +#: src/sort.c:1327 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "" -#: src/sort.c:1398 +#: src/sort.c:1409 #, c-format msgid "number in parallel must be nonzero" msgstr "" # -#: src/sort.c:1479 +#: src/sort.c:1494 msgid "stat failed" msgstr "" # -#: src/sort.c:1740 +#: src/sort.c:1755 msgid "read failed" msgstr "αποτυχία ανάγνωσης" # -#: src/sort.c:2028 +#: src/sort.c:2043 #, c-format msgid "string transformation failed" msgstr "Η μετατροπή της συμβολοσειράς απέτυχε" -#: src/sort.c:2031 +#: src/sort.c:2046 #, c-format msgid "the untransformed string was %s" msgstr "" -#: src/sort.c:2194 +#: src/sort.c:2209 #, c-format msgid "^ no match for key\n" msgstr "" -#: src/sort.c:2374 +#: src/sort.c:2389 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "" -#: src/sort.c:2380 +#: src/sort.c:2395 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "" -#: src/sort.c:2391 +#: src/sort.c:2406 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" -#: src/sort.c:2404 +#: src/sort.c:2419 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "" # -#: src/sort.c:2436 +#: src/sort.c:2451 #, fuzzy, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" msgstr[0] "%s: η επιλογή `%s' είναι ασαφής\n" msgstr[1] "%s: η επιλογή `%s' είναι ασαφής\n" -#: src/sort.c:2442 +#: src/sort.c:2457 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "" # -#: src/sort.c:2716 src/sort.c:2725 +#: src/sort.c:2731 src/sort.c:2740 msgid "write failed" msgstr "αποτυχία εγγραφής" # -#: src/sort.c:2768 +#: src/sort.c:2783 #, fuzzy, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%d: όχι σε σειρά: " # -#: src/sort.c:2771 +#: src/sort.c:2786 msgid "standard error" msgstr "κανονικό σφάλμα" # -#: src/sort.c:3926 +#: src/sort.c:3698 +#, fuzzy +msgid "cannot read" +msgstr "αδύνατη η αλλαγή δικαιωμάτων στο %s" + +# +#: src/sort.c:3976 #, fuzzy, c-format msgid "%s: invalid field specification %s" msgstr "μη έγκυρη δήλωση πεδίου `%s'" # -#: src/sort.c:3937 +#: src/sort.c:3987 #, fuzzy, c-format msgid "options '-%s' are incompatible" msgstr "%s: η επιλογή `%s' είναι ασαφής\n" # -#: src/sort.c:3988 +#: src/sort.c:4038 #, fuzzy, c-format msgid "%s: invalid count at start of %s" msgstr "μη έγκυρο όρισμα %s για `%s'" # -#: src/sort.c:4245 +#: src/sort.c:4295 #, fuzzy msgid "invalid number after '-'" msgstr "μη έγκυρος αριθμός από bytes" # -#: src/sort.c:4248 src/sort.c:4334 src/sort.c:4362 +#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416 #, fuzzy msgid "invalid number after '.'" msgstr "μη έγκυρος αριθμός από bytes" # -#: src/sort.c:4261 src/sort.c:4367 +#: src/sort.c:4315 src/sort.c:4421 msgid "stray character in field spec" msgstr "" -#: src/sort.c:4308 +#: src/sort.c:4362 #, fuzzy, c-format msgid "multiple compress programs specified" msgstr "\\%c: Μη έγκυρη διαφυγή." # -#: src/sort.c:4325 +#: src/sort.c:4379 #, fuzzy msgid "invalid number at field start" msgstr "μη έγκυρος αριθμός από γραμμές" # -#: src/sort.c:4329 src/sort.c:4357 +#: src/sort.c:4383 src/sort.c:4411 #, fuzzy msgid "field number is zero" msgstr "μη έγκυρος αριθμός πεδίου: `%s'" # -#: src/sort.c:4338 +#: src/sort.c:4392 msgid "character offset is zero" msgstr "" # -#: src/sort.c:4353 +#: src/sort.c:4407 #, fuzzy msgid "invalid number after ','" msgstr "μη έγκυρος αριθμός από bytes" -#: src/sort.c:4403 +#: src/sort.c:4457 #, c-format msgid "empty tab" msgstr "" -#: src/sort.c:4496 src/wc.c:692 +#: src/sort.c:4550 src/wc.c:692 #, fuzzy, c-format msgid "cannot read file names from %s" msgstr "δεν είναι δυνατό να δημιουργηθεί το %s `%s' στο `%s'" # -#: src/sort.c:4518 +#: src/sort.c:4572 #, fuzzy, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "μη έγκυρη ομάδα" # -#: src/sort.c:4524 +#: src/sort.c:4578 #, fuzzy, c-format msgid "no input from %s" msgstr "δημιουργία αρχείου `%s'\n" -#: src/sort.c:4570 +#: src/sort.c:4624 #, c-format msgid "using %s sorting rules" msgstr "" -#: src/sort.c:4573 +#: src/sort.c:4627 #, c-format msgid "using simple byte comparison" msgstr "" -#: src/sort.c:4604 +#: src/sort.c:4658 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "" -#: src/split.c:184 +#: src/split.c:187 #, c-format msgid "the suffix length needs to be at least %zu" msgstr "" # -#: src/split.c:201 +#: src/split.c:204 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" msgstr "Χρήση: %s [ΕΠΙΛΟΓΗ] [ΕΙΣΟΔΟΣ [ΠΡΟΘΕΜΑ]]\n" -#: src/split.c:205 +#: src/split.c:208 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" -"\n" msgstr "" # -#: src/split.c:214 +#: src/split.c:216 #, fuzzy, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" @@ -8646,13 +9053,13 @@ msgstr "" "ΜΕΓΕΘΟΣ μπορεί να έχει πρόθεμα πολλαπλασιαστή: b για 512, k για 1K, m για 1 " "Meg.\n" -#: src/split.c:227 +#: src/split.c:229 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" msgstr "" -#: src/split.c:234 +#: src/split.c:236 msgid "" "\n" "CHUNKS may be:\n" @@ -8664,205 +9071,210 @@ msgid "" "r/K/N likewise but only output Kth of N to stdout\n" msgstr "" -#: src/split.c:352 +#: src/split.c:354 #, c-format msgid "output file suffixes exhausted" msgstr "" # -#: src/split.c:364 +#: src/split.c:366 #, fuzzy, c-format msgid "creating file %s\n" msgstr "δημιουργία αρχείου `%s'\n" -#: src/split.c:377 +#: src/split.c:375 +#, c-format +msgid "%s would overwrite input; aborting" +msgstr "" + +#: src/split.c:391 #, fuzzy, c-format msgid "failed to set FILE environment variable" -msgstr "αποτυχία αλλαγής της ομάδας από %s σε %s\n" +msgstr "διατήρηση ωρών στο %s" -#: src/split.c:379 +#: src/split.c:393 #, c-format msgid "executing with FILE=%s\n" msgstr "" # -#: src/split.c:381 +#: src/split.c:395 #, fuzzy, c-format msgid "failed to create pipe" -msgstr "αδύνατη η δημιουργία καταλόγου `%s'" +msgstr "αδύνατη η αλλαγή δικαιωμάτων στο %s" # -#: src/split.c:395 +#: src/split.c:409 #, fuzzy, c-format msgid "closing prior pipe" msgstr "αδύνατη η αλλαγή στο κατάλογο %s" -#: src/split.c:397 +#: src/split.c:411 #, fuzzy, c-format msgid "closing output pipe" msgstr "διαγραφή καταλόγου %s\n" # -#: src/split.c:401 +#: src/split.c:415 #, fuzzy, c-format msgid "moving input pipe" msgstr "δημιουργία αρχείου `%s'\n" # -#: src/split.c:403 +#: src/split.c:417 #, fuzzy, c-format msgid "closing input pipe" msgstr "δημιουργία αρχείου `%s'\n" # -#: src/split.c:408 +#: src/split.c:422 #, fuzzy, c-format msgid "failed to run command: \"%s -c %s\"" -msgstr "αδύνατη η αλλαγή δικαιωμάτων στο %s" +msgstr "αδυναμία αλλαγής ιδιοκτησίας στο %s" # -#: src/split.c:414 +#: src/split.c:428 #, fuzzy, c-format msgid "failed to close input pipe" msgstr "αδύνατη η αλλαγή στο κατάλογο %s" # -#: src/split.c:450 +#: src/split.c:464 #, fuzzy, c-format msgid "waiting for child process" msgstr "σφάλμα εγγραφής %s" -#: src/split.c:460 +#: src/split.c:474 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "" -#: src/split.c:468 +#: src/split.c:482 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:475 src/timeout.c:449 +#: src/split.c:489 src/timeout.c:494 #, c-format msgid "unknown status from command (0x%X)" msgstr "" # -#: src/split.c:1037 +#: src/split.c:1052 #, c-format msgid "cannot split in more than one way" msgstr "δεν είναι δυνατό να γίνει διαχωρισμός σε περισσότερους από ένα τρόπο" # -#: src/split.c:1050 src/split.c:1192 src/split.c:1363 +#: src/split.c:1065 src/split.c:1205 src/split.c:1376 #, fuzzy, c-format msgid "%s: invalid number of chunks" msgstr "%s: μη έγκυρος αριθμός δευτερολέπτων" # -#: src/split.c:1054 +#: src/split.c:1069 #, fuzzy, c-format msgid "%s: invalid chunk number" msgstr "%s: μη έγκυρος αριθμός" # -#: src/split.c:1106 +#: src/split.c:1119 #, fuzzy, c-format msgid "%s: invalid suffix length" msgstr "%s: μη έγκυρος αριθμός γραμμών" # -#: src/split.c:1131 src/split.c:1139 src/split.c:1162 src/split.c:1167 +#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180 #, c-format msgid "%s: invalid number of bytes" msgstr "%s: μη έγκυρος αριθμός από bytes" # -#: src/split.c:1150 src/split.c:1297 +#: src/split.c:1163 src/split.c:1310 #, c-format msgid "%s: invalid number of lines" msgstr "%s: μη έγκυρος αριθμός γραμμών" -#: src/split.c:1223 +#: src/split.c:1236 #, c-format msgid "line count option -%s%c... is too large" msgstr "" # -#: src/split.c:1235 +#: src/split.c:1248 #, fuzzy, c-format msgid "%s: invalid start value for numerical suffix" msgstr "μη έγκυρος αρχικός αριθμός γραμμής: `%s'" # -#: src/split.c:1263 +#: src/split.c:1276 #, fuzzy, c-format msgid "%s: invalid IO block size" msgstr "%s: μη έγκυρος αριθμός γραμμών" -#: src/split.c:1284 +#: src/split.c:1297 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1321 +#: src/split.c:1334 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1356 +#: src/split.c:1369 #, fuzzy, c-format msgid "%s: cannot determine file size" msgstr "Δεν μπορεί να καθοριστεί το όνομα του συστήματος" #. This is a proper name. See the gettext manual, section Names. -#: src/stat.c:169 +#: src/stat.c:173 msgid "Michael Meskes" msgstr "" -#: src/stat.c:838 +#: src/stat.c:857 #, fuzzy, c-format msgid "failed to canonicalize %s" msgstr "διατήρηση ωρών στο %s" # -#: src/stat.c:1050 +#: src/stat.c:1069 #, fuzzy, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "%s: μη αναγνωρίσιμη επιλογή `-%c'\n" # -#: src/stat.c:1105 +#: src/stat.c:1124 #, fuzzy, c-format msgid "%s: invalid directive" msgstr "%s: μη έγκυρη μορφή" # -#: src/stat.c:1151 +#: src/stat.c:1170 #, fuzzy, c-format msgid "warning: backslash at end of format" msgstr "μη έγκυρη διαφυγή με πισωκάθετο στο τέλος του αλφαριθμητικού" -#: src/stat.c:1182 +#: src/stat.c:1201 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" # -#: src/stat.c:1189 +#: src/stat.c:1208 #, fuzzy, c-format msgid "cannot read file system information for %s" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" # -#: src/stat.c:1209 +#: src/stat.c:1228 #, 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:1245 +#: src/stat.c:1264 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -8873,7 +9285,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1268 +#: src/stat.c:1287 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -8881,31 +9293,31 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1278 +#: src/stat.c:1297 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:1286 +#: src/stat.c:1305 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:1295 +#: src/stat.c:1314 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:1305 +#: src/stat.c:1324 #, fuzzy, c-format msgid "Context: %C\n" msgstr "μη έγκυρο είδος αλφαριθμητικού `%s'" -#: src/stat.c:1313 +#: src/stat.c:1332 msgid "" "Access: %x\n" "Modify: %y\n" @@ -8913,15 +9325,17 @@ msgid "" " Birth: %w\n" msgstr "" -#: src/stat.c:1331 +#: src/stat.c:1350 +msgid "Display file or file system status.\n" +msgstr "" + +#: src/stat.c:1356 msgid "" -"Display file or file system status.\n" -"\n" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" -#: src/stat.c:1337 +#: src/stat.c:1360 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -8931,7 +9345,7 @@ msgid "" " -t, --terse print the information in terse form\n" msgstr "" -#: src/stat.c:1348 +#: src/stat.c:1371 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -8943,7 +9357,7 @@ msgid "" " %C SELinux security context string\n" msgstr "" -#: src/stat.c:1357 +#: src/stat.c:1380 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -8953,7 +9367,7 @@ msgid "" " %G group name of owner\n" msgstr "" -#: src/stat.c:1365 +#: src/stat.c:1388 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -8966,7 +9380,7 @@ msgid "" " %T minor device type in hex\n" msgstr "" -#: src/stat.c:1376 +#: src/stat.c:1399 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -8981,7 +9395,7 @@ msgid "" "\n" msgstr "" -#: src/stat.c:1390 +#: src/stat.c:1413 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -8992,7 +9406,7 @@ msgid "" " %f free blocks in file system\n" msgstr "" -#: src/stat.c:1399 +#: src/stat.c:1422 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -9012,30 +9426,29 @@ msgstr "Χρήση: %s [ΕΠΙΛΟΓΗ] [ΑΡΧΕΙΟ]...\n" #: src/stdbuf.c:91 msgid "" "Run COMMAND, with modified buffering operations for its standard streams.\n" -"\n" msgstr "" -#: src/stdbuf.c:98 +#: src/stdbuf.c:97 msgid "" " -i, --input=MODE adjust standard input stream buffering\n" " -o, --output=MODE adjust standard output stream buffering\n" " -e, --error=MODE adjust standard error stream buffering\n" msgstr "" -#: src/stdbuf.c:105 +#: src/stdbuf.c:104 msgid "" "\n" "If MODE is 'L' the corresponding stream will be line buffered.\n" "This option is invalid with standard input.\n" msgstr "" -#: src/stdbuf.c:108 +#: src/stdbuf.c:107 msgid "" "\n" "If MODE is '0' the corresponding stream will be unbuffered.\n" msgstr "" -#: src/stdbuf.c:111 +#: src/stdbuf.c:110 msgid "" "\n" "Otherwise MODE is a number which may be followed by one of the following:\n" @@ -9045,7 +9458,7 @@ msgid "" "size set to MODE bytes.\n" msgstr "" -#: src/stdbuf.c:117 +#: src/stdbuf.c:116 msgid "" "\n" "NOTE: If COMMAND adjusts the buffering of its standard streams ('tee' does\n" @@ -9055,22 +9468,22 @@ msgid "" "and are thus unaffected by 'stdbuf' settings.\n" msgstr "" -#: src/stdbuf.c:227 +#: src/stdbuf.c:226 #, fuzzy, c-format msgid "failed to find %s" msgstr "διατήρηση ωρών στο %s" -#: src/stdbuf.c:247 src/stdbuf.c:279 +#: src/stdbuf.c:246 src/stdbuf.c:278 #, fuzzy, c-format msgid "failed to update the environment with %s" msgstr "αποτυχία αλλαγής της ομάδας από %s σε %s\n" -#: src/stdbuf.c:321 +#: src/stdbuf.c:320 #, c-format msgid "line buffering stdin is meaningless" msgstr "" -#: src/stty.c:509 +#: src/stty.c:513 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -9078,11 +9491,13 @@ msgid "" " or: %s [-F DEVICE | --file=DEVICE] [-g|--save]\n" msgstr "" -#: src/stty.c:515 +#: src/stty.c:519 +msgid "Print or change terminal characteristics.\n" +msgstr "" + +#: src/stty.c:525 #, fuzzy msgid "" -"Print or change terminal characteristics.\n" -"\n" " -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" @@ -9098,14 +9513,14 @@ msgstr "" "Προεραιτικό - πριν την ΕΚΛΟΓΗ σημαίνει άρνηση. Το * σημαίνει μια\n" "ΕΚΛΟΓΗ μη POSIX. Το σύστημα καθορίζει ποιές επιλογές είναι διαθέσιμες.\n" -#: src/stty.c:524 +#: src/stty.c:532 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:529 +#: src/stty.c:537 msgid "" "\n" "Special characters:\n" @@ -9114,7 +9529,7 @@ msgid "" " eol CHAR CHAR will end the line\n" msgstr "" -#: src/stty.c:536 +#: src/stty.c:544 msgid "" " * eol2 CHAR alternate CHAR for ending the line\n" " erase CHAR CHAR will erase the last character typed\n" @@ -9122,7 +9537,7 @@ msgid "" " kill CHAR CHAR will erase the current line\n" msgstr "" -#: src/stty.c:542 +#: src/stty.c:550 msgid "" " * lnext CHAR CHAR will enter the next character quoted\n" " quit CHAR CHAR will send a quit signal\n" @@ -9130,7 +9545,7 @@ msgid "" " start CHAR CHAR will restart the output after stopping it\n" msgstr "" -#: src/stty.c:548 +#: src/stty.c:556 msgid "" " stop CHAR CHAR will stop the output\n" " susp CHAR CHAR will send a terminal stop signal\n" @@ -9138,7 +9553,7 @@ msgid "" " * werase CHAR CHAR will erase the last word typed\n" msgstr "" -#: src/stty.c:554 +#: src/stty.c:562 msgid "" "\n" "Special settings:\n" @@ -9147,7 +9562,7 @@ msgid "" " * columns N same as cols N\n" msgstr "" -#: src/stty.c:561 +#: src/stty.c:569 msgid "" " ispeed N set the input speed to N\n" " * line N use line discipline N\n" @@ -9156,7 +9571,7 @@ msgid "" " ospeed N set the output speed to N\n" msgstr "" -#: src/stty.c:567 +#: src/stty.c:575 msgid "" " * rows N tell the kernel that the terminal has N rows\n" " * size print the number of rows and columns according to the " @@ -9165,17 +9580,18 @@ msgid "" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" -#: src/stty.c:573 +#: src/stty.c:581 msgid "" "\n" "Control settings:\n" " [-]clocal disable modem control signals\n" " [-]cread allow input to be received\n" " * [-]crtscts enable RTS/CTS handshaking\n" +" * [-]cdtrdsr enable DTR/DSR handshaking\n" " csN set character size to N bits, N in [5..8]\n" msgstr "" -#: src/stty.c:581 +#: src/stty.c:590 #, fuzzy msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" @@ -9183,7 +9599,7 @@ msgid "" " [-]hupcl same as [-]hup\n" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" -" [-]parodd set odd parity (even with '-')\n" +" [-]parodd set odd parity (or even parity with '-')\n" msgstr "" "\n" "Επιλογές ελέγχου:\n" @@ -9200,7 +9616,7 @@ msgstr "" " ισότημίας στην είσοδο\n" " [-]parodd Θέτει περιτή ισοτημία (ακόμα και με `-')\n" -#: src/stty.c:588 +#: src/stty.c:597 msgid "" "\n" "Input settings:\n" @@ -9210,7 +9626,7 @@ msgid "" " [-]igncr ignore carriage return\n" msgstr "" -#: src/stty.c:596 +#: src/stty.c:605 msgid "" " [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" @@ -9219,11 +9635,11 @@ msgid "" " [-]istrip clear high (8th) bit of input characters\n" msgstr "" -#: src/stty.c:603 +#: src/stty.c:612 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr "" -#: src/stty.c:606 +#: src/stty.c:615 msgid "" " * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" @@ -9233,7 +9649,7 @@ msgid "" " [-]tandem same as [-]ixoff\n" msgstr "" -#: src/stty.c:614 +#: src/stty.c:623 msgid "" "\n" "Output settings:\n" @@ -9243,7 +9659,7 @@ msgid "" " * nlN newline delay style, N in [0..1]\n" msgstr "" -#: src/stty.c:622 +#: src/stty.c:631 #, fuzzy msgid "" " * [-]ocrnl translate carriage return to newline\n" @@ -9277,7 +9693,7 @@ msgstr "" "* vtN Τύπος καθυστέρησης της κάθετης πινακοποίησης, N μεταξύ " "[0..1]\n" -#: src/stty.c:630 +#: src/stty.c:639 msgid "" " * [-]onocr do not print carriage returns in the first column\n" " [-]opost postprocess output\n" @@ -9287,7 +9703,7 @@ msgid "" " * vtN vertical tab delay style, N in [0..1]\n" msgstr "" -#: src/stty.c:638 +#: src/stty.c:647 msgid "" "\n" "Local settings:\n" @@ -9296,7 +9712,7 @@ msgid "" " * -crtkill kill all line by obeying the echoctl and echok settings\n" msgstr "" -#: src/stty.c:645 +#: src/stty.c:654 msgid "" " * [-]ctlecho echo control characters in hat notation ('^c')\n" " [-]echo echo input characters\n" @@ -9305,7 +9721,7 @@ msgid "" " [-]echok echo a newline after a kill character\n" msgstr "" -#: src/stty.c:652 +#: src/stty.c:661 msgid "" " * [-]echoke same as [-]crtkill\n" " [-]echonl echo newline even if not echoing other characters\n" @@ -9314,7 +9730,7 @@ msgid "" " [-]iexten enable non-POSIX special characters\n" msgstr "" -#: src/stty.c:659 +#: src/stty.c:668 msgid "" " [-]isig enable interrupt, quit, and suspend special characters\n" " [-]noflsh disable flushing after interrupt and quit special " @@ -9324,7 +9740,7 @@ msgid "" " * [-]xcase with icanon, escape with '\\' for uppercase characters\n" msgstr "" -#: src/stty.c:666 +#: src/stty.c:675 msgid "" "\n" "Combination settings:\n" @@ -9333,7 +9749,7 @@ msgid "" " -cbreak same as icanon\n" msgstr "" -#: src/stty.c:673 +#: src/stty.c:682 msgid "" " cooked same as brkint ignpar istrip icrnl ixon opost isig\n" " icanon, eof and eol characters to their default values\n" @@ -9341,7 +9757,7 @@ msgid "" " crt same as echoe echoctl echoke\n" msgstr "" -#: src/stty.c:679 +#: src/stty.c:688 msgid "" " dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" " kill ^u\n" @@ -9350,7 +9766,7 @@ msgid "" " evenp same as parenb -parodd cs7\n" msgstr "" -#: src/stty.c:686 +#: src/stty.c:695 msgid "" " -evenp same as -parenb cs8\n" " * [-]lcase same as xcase iuclc olcuc\n" @@ -9360,7 +9776,7 @@ msgid "" " -nl same as icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" msgstr "" -#: src/stty.c:694 +#: src/stty.c:703 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -9369,7 +9785,7 @@ msgid "" " -pass8 same as parenb istrip cs7\n" msgstr "" -#: src/stty.c:701 +#: src/stty.c:710 msgid "" " raw same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" " -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n" @@ -9377,7 +9793,7 @@ msgid "" " -raw same as cooked\n" msgstr "" -#: src/stty.c:707 +#: src/stty.c:716 msgid "" " sane same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" " -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n" @@ -9387,7 +9803,7 @@ msgid "" " characters to their default values\n" msgstr "" -#: src/stty.c:715 +#: src/stty.c:724 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -9404,158 +9820,68 @@ msgstr "" "χαρακτήρες.\n" # -#: src/stty.c:787 +#: src/stty.c:796 #, fuzzy, c-format msgid "only one device may be specified" msgstr "μόνο ένα όρισμα μπορεί να δηλωθεί" # -#: src/stty.c:817 +#: src/stty.c:826 #, fuzzy, c-format msgid "" "the options for verbose and stty-readable output styles are\n" "mutually exclusive" msgstr "οι επιλογές --string και --check είναι αμοιβαίως αποκλειόμενες" -#: src/stty.c:823 +#: src/stty.c:832 #, c-format msgid "when specifying an output style, modes may not be set" msgstr "" "Οταν καθορίζεται ένας τύπος εξόδου, οι καταστάσεις λειτουργίας (modes)\n" "δεν είναι δυνατόν να οριστούν" -#: src/stty.c:838 +#: src/stty.c:847 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "" # -#: src/stty.c:883 src/stty.c:993 +#: src/stty.c:892 src/stty.c:1002 #, fuzzy, c-format msgid "invalid argument %s" msgstr "μη έγκυρο όρισμα %s για %s" # -#: src/stty.c:894 src/stty.c:911 src/stty.c:923 src/stty.c:936 src/stty.c:948 -#: src/stty.c:968 +#: 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 msgid "missing argument to %s" msgstr "ασαφές όρισμα %s για %s" # -#: src/stty.c:974 +#: src/stty.c:983 #, fuzzy, c-format msgid "invalid line discipline %s" msgstr "μη έγκυρος αριθμός πεδίου: `%s'" -#: src/stty.c:1044 +#: src/stty.c:1053 #, fuzzy, c-format msgid "%s: unable to perform all requested operations" msgstr "" "Τυπική είσοδος: αδύνατον να πραγματοποιήθουν όλες τις ζητούμενες\n" "λειτουργίες" -#: src/stty.c:1390 +#: src/stty.c:1399 #, fuzzy, c-format msgid "%s: no size information for this device" msgstr "Δεν υπάρχουν πληροφορίες μεγέθους γι'αυτό το περιφερειακό" # -#: src/stty.c:1904 +#: src/stty.c:1920 #, fuzzy, c-format msgid "invalid integer argument %s" msgstr "μη έγκυρη αύξηση στον αριθμό εντολής: `%s'" -#: src/su.c:229 -msgid "Password:" -msgstr "Συνθηματικό:" - -#: src/su.c:232 -#, c-format -msgid "getpass: cannot open /dev/tty" -msgstr "getpass(): δεν είναι δυνατόν να ανοιχτεί το /dev/tty" - -# -#: src/su.c:290 -#, fuzzy, c-format -msgid "cannot set groups" -msgstr "δεν είναι δυνατό να παραληφθεί χρήστης και ομάδα" - -# -#: src/su.c:294 -#, fuzzy, c-format -msgid "cannot set group id" -msgstr "δεν είναι δυνατό να παραληφθεί χρήστης και ομάδα" - -# -#: src/su.c:296 -#, fuzzy, c-format -msgid "cannot set user id" -msgstr "δεν είναι δυνατό να παραληφθεί χρήστης και ομάδα" - -# -#: src/su.c:371 -#, fuzzy, c-format -msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" -msgstr "Χρήση: %s [ΕΠΙΛΟΓΕΣ]... [ΑΡΧΕΙΟ]...\n" - -#: src/su.c:372 -#, 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" - -#: src/su.c:384 -msgid "" -"\n" -"A mere - implies -l. If USER not given, assume root.\n" -msgstr "" - -#: src/su.c:461 -#, c-format -msgid "user %s does not exist" -msgstr "ο χρήστης %s δεν υπάρχει" - -#: src/su.c:484 -#, c-format -msgid "incorrect password" -msgstr "λάθος συνθηματικό" - -#: src/su.c:501 -#, c-format -msgid "using restricted shell %s" -msgstr "χρησιμοποιείται το περιορισμένο κέλυφος (restricted shell) %s" - -# -#: src/su.c:509 -#, fuzzy, c-format -msgid "warning: cannot change directory to %s" -msgstr "αδύνατη η δημιουργία καταλόγου `%s'" - #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 msgid "Kayvan Aghaiepour" @@ -9594,7 +9920,7 @@ msgstr "" msgid "ignoring all arguments" msgstr "πάρα πολλά ορίσματα" -#: src/system.h:340 +#: src/system.h:343 #, c-format msgid "" "\n" @@ -9604,14 +9930,14 @@ msgid "" msgstr "" # -#: src/system.h:346 +#: src/system.h:349 msgid " --help display this help and exit\n" msgstr "" " --help εμφάνιση αυτής της βοήθειας και έξοδος\n" "\n" # -#: src/system.h:348 +#: src/system.h:351 #, fuzzy msgid " --version output version information and exit\n" msgstr "" @@ -9620,7 +9946,13 @@ msgstr "" " --help εμφάνιση αυτής της βοήθειας και έξοδος\n" " --version εμφάνιση πληροφοριών έκδοσης και έξοδος\n" -#: src/system.h:541 +#: src/system.h:544 +msgid "" +"\n" +"Mandatory arguments to long options are mandatory for short options too.\n" +msgstr "" + +#: src/system.h:552 msgid "" "\n" "SIZE is an integer and optional unit (example: 10M is 10*1024*1024). Units\n" @@ -9628,7 +9960,7 @@ msgid "" "1000).\n" msgstr "" -#: src/system.h:550 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -9638,7 +9970,7 @@ msgid "" msgstr "" # -#: src/system.h:560 +#: src/system.h:571 #, fuzzy, c-format msgid "" "\n" @@ -9651,23 +9983,23 @@ msgstr "" #. <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:574 +#: src/system.h:585 #, c-format msgid "Report %s translation bugs to <http://translationproject.org/team/>\n" msgstr "" -#: src/system.h:578 +#: src/system.h:589 #, c-format msgid "For complete documentation, run: info coreutils '%s invocation'\n" msgstr "" # -#: src/system.h:585 +#: src/system.h:596 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "Δοκιμάστε `%s --help' για περισσότερη βοήθεια.\n" -#: src/system.h:617 +#: src/system.h:628 #, fuzzy, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -9688,14 +10020,29 @@ 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" -"\n" msgstr "" +"Μετατροπή διαστημάτων σε κάθε ΑΡΧΕΙΟ σε στηλοθέτες, γράφοντας στην κανονική " +"έξοδο.\n" +"Χωρίς ΑΡΧΕΙΟ, ή όταν το αρχείο είναι το -, ανάγνωση από την κανονική " +"είσοδο.\n" +"\n" +" -a, --all μετατροπή όλων των λευκών χαρακτήρων, αντί μόνο των " +"αρχικών\n" +" -t, --tabs=ΑΡΙΘΜΟΣ οι στηλοθέτες να έχουν απόσταση ΑΡΙΘΜΟΣ αντί 8\n" +" -t, --tabs=ΛΙΣΤΑ χρήση λίστας χωρισμένης με κόμμα για τη δήλωση της " +"θέσης των στηλοθετών\n" +" --help εμφάνιση αυτής της βοήθειας και έξοδος\n" +" --version εμφάνιση πληροφοριών έκδοσης και έξοδος\n" +"\n" +"Αντί για -t ΑΡΙΘΜΟΣ ή -t ΛΙΣΤΑ, -ΑΡΙΘΜΟΣ ή -ΛΙΣΤΑ μπορούν να " +"χρησιμοποιηθούν.\n" # -#: src/tac.c:145 +#: src/tac.c:144 #, fuzzy msgid "" " -b, --before attach the separator before instead of after\n" @@ -9714,47 +10061,47 @@ msgstr "" " --version εμφάνιση πληροφοριών έκδοσης και έξοδος\n" # -#: src/tac.c:235 src/tac.c:336 +#: src/tac.c:234 src/tac.c:335 #, fuzzy, c-format msgid "%s: seek failed" msgstr "σφάλμα κλεισίματος αρχείου" # -#: src/tac.c:264 +#: src/tac.c:263 #, fuzzy, c-format msgid "record too large" msgstr "το αρχείο μηδενίστηκε" # -#: src/tac.c:451 +#: src/tac.c:450 #, fuzzy, c-format msgid "failed to create temporary file in %s" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" # -#: src/tac.c:459 +#: src/tac.c:458 #, fuzzy, c-format msgid "failed to open %s for writing" msgstr "το αρχείο μηδενίστηκε" -#: src/tac.c:476 +#: src/tac.c:475 #, fuzzy, c-format msgid "failed to rewind stream for %s" msgstr "διατήρηση ωρών στο %s" # -#: src/tac.c:512 src/tac.c:519 +#: src/tac.c:511 src/tac.c:518 #, fuzzy, c-format msgid "%s: write error" msgstr "σφάλμα εγγραφής" -#: src/tac.c:572 +#: src/tac.c:571 #, fuzzy, c-format msgid "failed to open %s for reading" msgstr "αδυναμία ανοίγματος του %s προς ανάγνωση" # -#: src/tac.c:630 +#: src/tac.c:629 #, c-format msgid "separator cannot be empty" msgstr "ο διαχωριστής δε μπορεί να είναι κενός" @@ -9771,7 +10118,6 @@ 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" -"\n" msgstr "" "Εμφάνιση των 10 πρώτων γραμμών από κάθε ΑΡΧΕΙΟ στην κανονική έξοδο.\n" "Με περισσότερα από ένα ΑΡΧΕΙΟ, να προηγηθεί επισέλιδο με το όνομα του " @@ -9794,7 +10140,7 @@ msgstr "" "ένας από τους πολλαπλασιαστές bkm ακολουθεί συνενωμένος, διαφορετικά " "ανάγνωσε -n ΤΙΜΗ\n" -#: src/tail.c:271 +#: src/tail.c:270 msgid "" " -c, --bytes=K output the last K bytes; alternatively, use -c " "+K\n" @@ -9803,7 +10149,7 @@ msgid "" msgstr "" # -#: src/tail.c:275 +#: src/tail.c:274 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -9812,7 +10158,7 @@ msgid "" " -F same as --follow=name --retry\n" msgstr "" -#: src/tail.c:282 +#: src/tail.c:281 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -9826,7 +10172,7 @@ msgid "" " With inotify, this option is rarely useful.\n" msgstr "" -#: src/tail.c:295 +#: src/tail.c:294 msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" " -q, --quiet, --silent never output headers giving file names\n" @@ -9835,7 +10181,7 @@ msgid "" " name, i.e., with --follow=name\n" msgstr "" -#: src/tail.c:302 +#: src/tail.c:301 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations.\n" @@ -9844,7 +10190,7 @@ msgid "" " -v, --verbose always output headers giving file names\n" msgstr "" -#: src/tail.c:311 +#: src/tail.c:310 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -9855,7 +10201,7 @@ msgid "" "\n" msgstr "" -#: src/tail.c:320 +#: src/tail.c:319 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" @@ -9866,28 +10212,28 @@ msgid "" msgstr "" # -#: src/tail.c:379 +#: src/tail.c:378 #, c-format msgid "closing %s (fd=%d)" msgstr "κλείσιμο του %s (fd=%d)" # -#: src/tail.c:454 +#: src/tail.c:453 #, fuzzy, c-format msgid "%s: cannot seek to relative offset %s" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" -#: src/tail.c:458 +#: src/tail.c:457 #, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "" -#: src/tail.c:895 +#: src/tail.c:894 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "" -#: src/tail.c:907 +#: src/tail.c:906 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " @@ -9895,45 +10241,45 @@ msgid "" msgstr "" # -#: src/tail.c:964 +#: src/tail.c:963 #, fuzzy, c-format msgid "%s has become inaccessible" msgstr "το `%s' είναι μη-προσπελάσιμο" # -#: src/tail.c:981 +#: src/tail.c:980 #, fuzzy, c-format msgid "%s has been replaced with an untailable file; giving up on this name" msgstr "" "%s: αδύνατη η ακολούθηση του τέλους αυτού του είδους αρχείου· παράκαμψη" # -#: src/tail.c:990 +#: src/tail.c:989 #, fuzzy, c-format msgid "%s has been replaced with a remote file. giving up on this name" msgstr "" "%s: αδύνατη η ακολούθηση του τέλους αυτού του είδους αρχείου· παράκαμψη" # -#: src/tail.c:1011 +#: src/tail.c:1010 #, fuzzy, c-format msgid "%s has become accessible" msgstr "το `%s' έχει γίνει προσπελάσιμο" # -#: src/tail.c:1019 +#: src/tail.c:1018 #, fuzzy, c-format msgid "%s has appeared; following end of new file" msgstr "το `%s' εμφανίστηκε· ακολούθηση τέλους νέου αρχείου" # -#: src/tail.c:1030 +#: src/tail.c:1029 #, fuzzy, c-format msgid "%s has been replaced; following end of new file" msgstr "το `%s' έχει αντικατασταθεί· ακολούθηση τέλους νέου αρχείου" # -#: src/tail.c:1131 +#: src/tail.c:1130 #, fuzzy, c-format msgid "%s: cannot change nonblocking mode" msgstr "δεν είναι δυνατό να παραληφθεί χρήστης και ομάδα" @@ -10301,33 +10647,38 @@ msgstr "το `]' λείπει\n" msgid "extra argument %s" msgstr "πάρα πολλά ορίσματα" -#: src/timeout.c:124 +#: src/timeout.c:112 +#, c-format +msgid "warning: sigprocmask" +msgstr "" + +#: src/timeout.c:145 #, c-format msgid "warning: timer_settime" msgstr "" -#: src/timeout.c:129 +#: src/timeout.c:150 #, c-format msgid "warning: timer_create" msgstr "" # -#: src/timeout.c:204 +#: src/timeout.c:225 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" " or: %s [OPTION]\n" msgstr "Χρήση: %s [ΕΠΙΛΟΓΗ]... [ΕΙΣΟΔΟΣ [ΕΞΟΔΟΣ]]\n" -#: src/timeout.c:208 -msgid "" -"Start COMMAND, and kill it if still running after DURATION.\n" -"\n" -"Mandatory arguments to long options are mandatory for short options too.\n" +#: src/timeout.c:229 +msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "" -#: src/timeout.c:213 +#: src/timeout.c:235 msgid "" +" --preserve-status\n" +" exit with the same status as COMMAND, even when the\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 " @@ -10342,7 +10693,7 @@ msgid "" " See 'kill -l' for a list of signals\n" msgstr "" -#: src/timeout.c:229 +#: src/timeout.c:254 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -10350,26 +10701,31 @@ msgid "" "days.\n" msgstr "" -#: src/timeout.c:234 +#: src/timeout.c:259 msgid "" "\n" -"If the command times out, then exit with status 124. Otherwise, exit\n" -"with the status of COMMAND. If no signal is specified, send the TERM\n" -"signal upon timeout. The TERM signal kills any process that does not\n" -"block or catch that signal. For other processes, it may be necessary to\n" -"use the KILL (9) signal, since this signal cannot be caught. If the\n" -"KILL (9) signal is sent, the exit status is 128+9 rather than 124.\n" +"If the command times out, and --preserve-status is not set, then exit with\n" +"status 124. Otherwise, exit with the status of COMMAND. If no signal\n" +"is specified, send the TERM signal upon timeout. The TERM signal kills\n" +"any process that does not block or catch that signal. It may be necessary\n" +"to use the KILL (9) signal, since this signal cannot be caught, in which\n" +"case the exit status is 128+9 rather than 124.\n" +msgstr "" + +#: src/timeout.c:363 +#, c-format +msgid "warning: disabling core dumps failed" msgstr "" # -#: src/timeout.c:419 +#: src/timeout.c:471 #, fuzzy, c-format msgid "error waiting for command" msgstr "σφάλμα εγγραφής %s" -#: src/timeout.c:441 +#: src/timeout.c:482 #, c-format -msgid "warning: disabling core dumps failed" +msgid "the monitored command dumped core" msgstr "" #. This is a proper name. See the gettext manual, section Names. @@ -10383,23 +10739,23 @@ msgid "Randy Smith" msgstr "" # -#: src/touch.c:115 src/touch.c:313 +#: src/touch.c:115 src/touch.c:309 #, fuzzy, c-format msgid "invalid date format %s" msgstr "μη έγκυρο όρισμα %s για %s" # -#: src/touch.c:194 +#: src/touch.c:191 #, fuzzy, c-format msgid "cannot touch %s" msgstr "αδύνατη η αλλαγή δικαιωμάτων στο %s" -#: src/touch.c:200 +#: src/touch.c:197 #, fuzzy, c-format msgid "setting times of %s" msgstr "διατήρηση ωρών στο %s" -#: src/touch.c:216 +#: src/touch.c:213 msgid "" "Update the access and modification times of each FILE to the current time.\n" "\n" @@ -10408,10 +10764,9 @@ msgid "" "\n" "A FILE argument string of - is handled specially and causes touch to\n" "change the times of the file associated with standard output.\n" -"\n" msgstr "" -#: src/touch.c:229 +#: src/touch.c:225 msgid "" " -a change only the access time\n" " -c, --no-create do not create any files\n" @@ -10419,7 +10774,7 @@ msgid "" " -f (ignored)\n" msgstr "" -#: src/touch.c:235 +#: src/touch.c:231 msgid "" " -h, --no-dereference affect each symbolic link instead of any " "referenced\n" @@ -10428,28 +10783,28 @@ msgid "" " -m change only the modification time\n" msgstr "" -#: src/touch.c:241 +#: src/touch.c:237 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" -" --time=WORD change the specified time:\n" +" --time=WORD change the specified time:\n" " WORD is access, atime, or use: equivalent to -a\n" " WORD is modify or mtime: equivalent to -m\n" msgstr "" -#: src/touch.c:250 +#: src/touch.c:246 msgid "" "\n" "Note that the -d and -t options accept different time-date formats.\n" msgstr "" # -#: src/touch.c:339 +#: src/touch.c:335 #, fuzzy, c-format msgid "cannot specify times from more than one source" msgstr "δεν είναι δυνατό να γίνει διαχωρισμός σε περισσότερους από ένα τρόπο" -#: src/touch.c:413 +#: src/touch.c:409 #, c-format msgid "" "warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'" @@ -10735,25 +11090,24 @@ msgid "" "If a FILE is larger than the specified size, the extra data is lost.\n" "If a FILE is shorter, it is extended and the extended part (hole)\n" "reads as zero bytes.\n" -"\n" msgstr "" -#: src/truncate.c:110 +#: src/truncate.c:109 msgid " -c, --no-create do not create any files\n" msgstr "" -#: src/truncate.c:113 +#: src/truncate.c:112 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" -#: src/truncate.c:116 +#: 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" msgstr "" -#: src/truncate.c:122 +#: src/truncate.c:121 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -10761,59 +11115,59 @@ msgid "" "'/' round down to multiple of, '%' round up to multiple of.\n" msgstr "" -#: src/truncate.c:150 +#: src/truncate.c:149 #, c-format msgid "overflow in %<PRIdMAX> * %<PRIdMAX> byte blocks for file %s" msgstr "" # src/shred.c:1424 -#: src/truncate.c:174 +#: src/truncate.c:173 #, fuzzy, c-format msgid "%s has unusable, apparently negative size" msgstr "%s: το αρχείο έχει αρνητικό μέγεθος" # -#: src/truncate.c:184 src/truncate.c:379 +#: src/truncate.c:183 src/truncate.c:384 #, fuzzy, c-format msgid "cannot get the size of %s" msgstr "δεν είναι δυνατό να γίνει διαχωρισμός σε περισσότερους από ένα τρόπο" -#: src/truncate.c:206 +#: src/truncate.c:205 #, c-format msgid "overflow rounding up size of file %s" msgstr "" -#: src/truncate.c:216 +#: src/truncate.c:215 #, c-format msgid "overflow extending size of file %s" msgstr "" -#: src/truncate.c:231 +#: src/truncate.c:230 #, fuzzy, c-format msgid "failed to truncate %s at %<PRIdMAX> bytes" msgstr "διαγραφή καταλόγου %s\n" -#: src/truncate.c:305 +#: src/truncate.c:303 #, fuzzy, c-format msgid "multiple relative modifiers specified" msgstr "\\%c: Μη έγκυρη διαφυγή." -#: src/truncate.c:335 +#: src/truncate.c:333 #, fuzzy, c-format msgid "you must specify either %s or %s" msgstr "αποτυχία αλλαγής της ομάδας από %s σε %s\n" -#: src/truncate.c:342 +#: src/truncate.c:340 #, fuzzy, c-format msgid "you must specify a relative %s with %s" msgstr "αποτυχία αλλαγής της ομάδας από %s σε %s\n" -#: src/truncate.c:349 +#: src/truncate.c:347 #, c-format msgid "%s was specified but %s was not" msgstr "" -#: src/truncate.c:400 +#: src/truncate.c:404 #, fuzzy, c-format msgid "cannot open %s for writing" msgstr "αδυναμία μεταφοράς του `%s' στο `%s'" @@ -10924,7 +11278,6 @@ msgstr "αδύνατη η δημιουργία καταλόγου `%s'" msgid "" "Convert blanks in each FILE to tabs, writing to standard output.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" "Μετατροπή διαστημάτων σε κάθε ΑΡΧΕΙΟ σε στηλοθέτες, γράφοντας στην κανονική " "έξοδο.\n" @@ -10942,7 +11295,7 @@ msgstr "" "Αντί για -t ΑΡΙΘΜΟΣ ή -t ΛΙΣΤΑ, -ΑΡΙΘΜΟΣ ή -ΛΙΣΤΑ μπορούν να " "χρησιμοποιηθούν.\n" -#: src/unexpand.c:125 +#: src/unexpand.c:124 msgid "" " -a, --all convert all blanks, instead of just initial blanks\n" " --first-only convert only leading sequences of blanks (overrides -a)\n" @@ -10950,13 +11303,13 @@ msgid "" " -t, --tabs=LIST use comma separated LIST of tab positions (enables -a)\n" msgstr "" -#: src/unexpand.c:153 +#: src/unexpand.c:152 #, c-format msgid "tabs are too far apart" msgstr "" # -#: src/unexpand.c:505 +#: src/unexpand.c:504 #, fuzzy, c-format msgid "tab stop value is too large" msgstr "το %s είναι πολύ μεγάλο" @@ -10973,17 +11326,16 @@ msgid "" "writing to OUTPUT (or standard output).\n" "\n" "With no options, matching lines are merged to the first occurrence.\n" -"\n" msgstr "" # -#: src/uniq.c:148 +#: src/uniq.c:147 msgid "" " -c, --count prefix lines by the number of occurrences\n" " -d, --repeated only print duplicate lines\n" msgstr "" -#: src/uniq.c:152 +#: src/uniq.c:151 msgid "" " -D, --all-repeated[=delimit-method] print all duplicate lines\n" " delimit-method={none(default),prepend,separate}\n" @@ -10996,18 +11348,18 @@ msgid "" msgstr "" # -#: src/uniq.c:162 +#: src/uniq.c:161 msgid " -w, --check-chars=N compare no more than N characters in lines\n" msgstr "" -#: src/uniq.c:167 +#: src/uniq.c:166 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:172 +#: src/uniq.c:171 msgid "" "\n" "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n" @@ -11016,31 +11368,31 @@ msgid "" msgstr "" # -#: src/uniq.c:359 +#: src/uniq.c:358 #, fuzzy, c-format msgid "too many repeated lines" msgstr "πάρα πολλά ορίσματα" # -#: src/uniq.c:522 +#: src/uniq.c:521 #, fuzzy msgid "invalid number of fields to skip" msgstr "μη έγκυρος αριθμός πεδίων προς προσπέραση: `%s'" # -#: src/uniq.c:531 +#: src/uniq.c:530 #, fuzzy msgid "invalid number of bytes to skip" msgstr "μη έγκυρος αριθμός bytes προς προσπέραση: `%s'" # -#: src/uniq.c:540 +#: src/uniq.c:539 #, fuzzy msgid "invalid number of bytes to compare" msgstr "μη έγκυρος αριθμός από bytes προς σύγκριση: `%s'" # -#: src/uniq.c:559 +#: src/uniq.c:558 #, c-format msgid "printing all duplicated lines and repeat counts is meaningless" msgstr "" @@ -11093,6 +11445,11 @@ msgid_plural "up %ld days %2d:%02d, " msgstr[0] "" msgstr[1] "" +#: src/uptime.c:149 +#, fuzzy, c-format +msgid "up %2d:%02d, " +msgstr " %2d:%02d%s up " + # #: src/uptime.c:151 #, fuzzy, c-format @@ -11205,41 +11562,41 @@ msgid " old " msgstr "παλιά" # -#: src/who.c:449 +#: src/who.c:440 #, fuzzy msgid "system boot" msgstr "σφάλμα εγγραφής" -#: src/who.c:456 src/who.c:458 +#: src/who.c:447 src/who.c:449 msgid "id=" msgstr "" -#: src/who.c:471 src/who.c:476 +#: src/who.c:462 src/who.c:467 msgid "term=" msgstr "" -#: src/who.c:473 src/who.c:477 +#: src/who.c:464 src/who.c:468 msgid "exit=" msgstr "" -#: src/who.c:494 +#: src/who.c:485 #, fuzzy msgid "LOGIN" msgstr "ΓΡΑΜΜΗ" -#: src/who.c:514 +#: src/who.c:505 msgid "clock change" msgstr "" -#: src/who.c:526 src/who.c:527 +#: src/who.c:517 src/who.c:518 msgid "run-level" msgstr "" -#: src/who.c:530 src/who.c:531 +#: src/who.c:521 src/who.c:522 msgid "last=" msgstr "" -#: src/who.c:562 +#: src/who.c:553 #, fuzzy, c-format msgid "" "\n" @@ -11248,47 +11605,47 @@ msgstr "" "\n" "# χρήστες=%u\n" -#: src/who.c:568 +#: src/who.c:559 msgid "NAME" msgstr "" -#: src/who.c:568 +#: src/who.c:559 msgid "LINE" msgstr "ΓΡΑΜΜΗ" -#: src/who.c:568 +#: src/who.c:559 msgid "TIME" msgstr "" # -#: src/who.c:568 +#: src/who.c:559 #, fuzzy msgid "IDLE" msgstr "ΑΝΕΠΙΤΥΧΕΣ" -#: src/who.c:569 +#: src/who.c:560 msgid "PID" msgstr "" -#: src/who.c:569 +#: src/who.c:560 msgid "COMMENT" msgstr "" -#: src/who.c:569 +#: src/who.c:560 msgid "EXIT" msgstr "" # -#: src/who.c:649 +#: src/who.c:640 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n" msgstr "Χρήση: %s [ΕΠΙΛΟΓΗ]... ΑΡΧΕΙΟ1 ΑΡΧΕΙΟ2\n" -#: src/who.c:650 +#: src/who.c:641 msgid "Print information about users who are currently logged in.\n" msgstr "" -#: src/who.c:653 +#: src/who.c:644 msgid "" "\n" " -a, --all same as -b -d --login -p -r -t -T -u\n" @@ -11297,18 +11654,18 @@ msgid "" " -H, --heading print line of column headings\n" msgstr "" -#: src/who.c:660 +#: src/who.c:651 msgid " -l, --login print system login processes\n" msgstr "" -#: src/who.c:663 +#: src/who.c:654 msgid "" " --lookup attempt to canonicalize hostnames via DNS\n" " -m only hostname and user associated with stdin\n" " -p, --process print active processes spawned by init\n" msgstr "" -#: src/who.c:668 +#: src/who.c:659 msgid "" " -q, --count all login names and number of users logged on\n" " -r, --runlevel print current runlevel\n" @@ -11316,7 +11673,7 @@ msgid "" " -t, --time print last system clock change\n" msgstr "" -#: src/who.c:674 +#: src/who.c:665 msgid "" " -T, -w, --mesg add user's message status as +, - or ?\n" " -u, --users list users logged in\n" @@ -11324,7 +11681,7 @@ msgid "" " --writable same as -T\n" msgstr "" -#: src/who.c:682 +#: src/who.c:673 #, fuzzy, c-format msgid "" "\n" @@ -11370,6 +11727,49 @@ 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 "" @@ -11377,14 +11777,102 @@ msgstr "" #~ " 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" + # -#~ msgid "Try `%s --help' for more information.\n" -#~ msgstr "Δοκιμάστε `%s --help' για περισσότερη βοήθεια.\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 "Usage: %s [OPTION] FILE...\n" -#~ msgstr "Χρήση: %s [ΕΠΙΛΟΓΗ] [ΑΡΧΕΙΟ]...\n" +#~ 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" +#~ 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 "" @@ -11412,11 +11900,6 @@ msgstr "" #~ "Κάθε ΔΙΚΑΙΩΜΑ είναι ένα ή περισσότερα από τα γράμματα ugoa, ένα από τα\n" #~ "σύμβολα +-= και ένα ή περισσότερα από τα γράμματα rwxXstugo.\n" -# -#, fuzzy -#~ msgid "Usage: %s [OPTION]... PATH START\n" -#~ msgstr "Χρήση: %s [ΕΠΙΛΟΓΗ]... ΣΥΝΟΛΟ1 [ΣΥΝΟΛΟ2]\n" - #, fuzzy #~ msgid "" #~ "Display the current time in the given FORMAT, or set the system date.\n" @@ -11445,16 +11928,6 @@ msgstr "" #~ " --version Εκτυπώνει πληροφορίες για την έκδοση και " #~ "τερματίζει\n" -# -#, fuzzy -#~ msgid "cannot create link %s" -#~ msgstr "αδύνατη η δημιουργία καταλόγου `%s'" - -# -#, fuzzy -#~ msgid "%s: option '%s' is ambiguous\n" -#~ msgstr "%s: η επιλογή `-W %s' είναι ασαφής\n" - # #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s: μη αναγνωρίσιμη επιλογή -- %c\n" @@ -11477,8 +11950,8 @@ msgstr "" # #, fuzzy -#~ msgid "invalid format width" -#~ msgstr "μη έγκυρο όρισμα %s για %s" +#~ msgid "cannot create link %s" +#~ msgstr "αδύνατη η δημιουργία καταλόγου `%s'" # #, fuzzy @@ -11628,12 +12101,14 @@ msgstr "" #~ msgid "couldn't open temporary file" #~ msgstr "αδύνατη η δημιουργία καταλόγου `%s'" +# +#, fuzzy +#~ msgid "Usage: %s [OPTION] FILE...\n" +#~ msgstr "Χρήση: %s [ΕΠΙΛΟΓΗ] [ΑΡΧΕΙΟ]...\n" + #~ msgid "new_mode: mode\n" #~ msgstr "νεα_κατάσταση: κατάσταση λειτουργίας\n" -#~ msgid " %2d:%02d%s up " -#~ msgstr " %2d:%02d%s up " - #~ msgid "am" #~ msgstr "πμ" @@ -12356,11 +12831,6 @@ msgstr "" #~ msgid "removing the directory itself: %s\n" #~ msgstr "ΠΡΟΣΟΧΗ: δεν είναι δυνατόν να αλλαχτεί ο κατάλογος σε %s" -# -#, fuzzy -#~ msgid "cannot fork" -#~ msgstr "αδύνατη η αλλαγή δικαιωμάτων στο %s" - #, fuzzy #~ msgid "" #~ "ERROR: the source file %s initially had device/inode\n" diff --git a/po/eo.gmo b/po/eo.gmo index 78945750..ebafb5f4 100644 Binary files a/po/eo.gmo and b/po/eo.gmo differ diff --git a/po/eo.po b/po/eo.po index 422c8bdd..5a52eca3 100644 --- a/po/eo.po +++ b/po/eo.po @@ -2,18 +2,25 @@ # Copyright (C) 2012 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). +# # 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 # -# Benno Schulenberg <benno@vertaalt.nl>, 2011, 2012. +# "Mai liber, mai sănătos, mai bogat." +# +# Benno Schulenberg <benno@vertaalt.nl>, 2011, 2012, 2013. msgid "" msgstr "" -"Project-Id-Version: coreutils-8.16\n" +"Project-Id-Version: coreutils-8.20-pre1\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2012-05-10 19:35+0200\n" -"PO-Revision-Date: 2012-04-22 20:08+0200\n" +"POT-Creation-Date: 2013-02-14 15:56+0000\n" +"PO-Revision-Date: 2013-01-01 15:51+0100\n" "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n" "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n" "Language: eo\n" @@ -41,19 +48,19 @@ msgstr "Validaj argumentoj estas:" msgid "error closing file" msgstr "eraro dum fermado de dosiero" -#: lib/closeout.c:112 src/base64.c:109 src/base64.c:121 src/base64.c:127 -#: src/base64.c:168 src/base64.c:224 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:330 src/expand.c:355 src/head.c:298 -#: src/head.c:348 src/head.c:756 src/head.c:797 src/mktemp.c:350 src/od.c:919 -#: src/paste.c:160 src/shuf.c:369 src/split.c:727 src/split.c:964 -#: src/split.c:969 src/tail.c:350 src/tail.c:1201 src/tail.c:1307 +#: 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 -#: src/unexpand.c:427 src/unexpand.c:443 +#: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "skrib-eraro" -#: lib/copy-acl.c:611 src/copy.c:1160 src/copy.c:2602 +#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617 #, c-format msgid "preserving permissions for %s" msgstr "konserviĝas permesoj pri %s" @@ -84,7 +91,7 @@ msgstr "signoaparatdosiero" #: lib/file-type.c:50 msgid "fifo" -msgstr "fifo" +msgstr "vicmemoro" #: lib/file-type.c:53 msgid "symbolic link" @@ -108,7 +115,7 @@ msgstr "komuna memorobjekto" #: lib/file-type.c:68 msgid "typed memory object" -msgstr "tipita memorbjekto" +msgstr "tipita memorobjekto" #: lib/file-type.c:70 msgid "weird file" @@ -245,18 +252,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:483 +#: lib/mkdir-p.c:196 src/install.c:484 #, c-format msgid "cannot change permissions of %s" msgstr "ne eblas ŝanĝi permesojn de %s" -#: lib/mkdir-p.c:206 src/copy.c:2261 src/install.c:709 src/install.c:722 +#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722 #, 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:915 src/tac.c:435 +#: src/split.c:929 src/tac.c:434 #, c-format msgid "memory exhausted" msgstr "mankas sufiĉa memoro" @@ -305,87 +312,87 @@ msgstr "»" msgid "%s: end of file" msgstr "%s: fino de dosiero" -#: lib/regcomp.c:130 +#: lib/regcomp.c:131 msgid "Success" msgstr "Sukceso" -#: lib/regcomp.c:133 +#: lib/regcomp.c:134 msgid "No match" msgstr "Neniu trafo" -#: lib/regcomp.c:136 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "Nevalida regulesprimo" -#: lib/regcomp.c:139 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "Nevalida kunmetita signo" -#: lib/regcomp.c:142 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "Nevalida nomo de signoklaso" -#: lib/regcomp.c:145 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "Malsuprenstreko '\\' ĉe la fino" -#: lib/regcomp.c:148 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "Nevalida retroreferenco" -#: lib/regcomp.c:151 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "Senpara [ aŭ [^" -#: lib/regcomp.c:154 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "Senpara ( aŭ \\(" -#: lib/regcomp.c:157 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "Senpara \\{" -#: lib/regcomp.c:160 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "Nevalida enhavo de \\{\\}" -#: lib/regcomp.c:163 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "Nevalida fino de gamo" -#: lib/regcomp.c:166 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Mankas sufiĉa memoro" -#: lib/regcomp.c:169 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "Nevalida antaŭa regulesprimo" -#: lib/regcomp.c:172 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "Neatendita fino de regulesprimo" -#: lib/regcomp.c:175 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "Regulesprimo tro grandas" -#: lib/regcomp.c:178 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "Senpara ) aŭ \\)" -#: lib/regcomp.c:703 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "Mankas antaŭa regulesprimo" #: lib/root-dev-ino.h:37 #, c-format msgid "it is dangerous to operate recursively on %s" -msgstr "estas danĝere operacii rekursie al %s" +msgstr "estas danĝere operacii rikure al %s" #: lib/root-dev-ino.h:41 #, c-format msgid "it is dangerous to operate recursively on %s (same as %s)" -msgstr "estas danĝere operacii rekursie al %s (samkiel %s)" +msgstr "estas danĝere operacii rikure al %s (samkiel %s)" #: lib/root-dev-ino.h:43 #, c-format @@ -412,7 +419,7 @@ msgstr "^[jJyY]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-mode-acl.c:695 src/copy.c:2284 src/cp.c:518 +#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516 #, c-format msgid "setting permissions for %s" msgstr "agordiĝas permesoj pri %s" @@ -570,13 +577,13 @@ msgstr "Elektra provizo perdiĝis" msgid "Resource lost" msgstr "Risurco perdiĝis" -#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262 -#: lib/spawn-pipe.c:265 +#: 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:232 lib/spawn-pipe.c:346 lib/wait-process.c:282 +#: 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" @@ -592,24 +599,24 @@ msgstr "Realtempa signalo %d" msgid "Unknown signal %d" msgstr "Nekonata signalo %d" -#: lib/unicodeio.c:103 +#: lib/unicodeio.c:102 msgid "iconv function not usable" msgstr "funkcio 'iconv()' ne uzeblas" -#: lib/unicodeio.c:105 +#: lib/unicodeio.c:104 msgid "iconv function not available" msgstr "funkcio 'iconv()' ne disponeblas" -#: lib/unicodeio.c:112 +#: lib/unicodeio.c:111 msgid "character out of range" msgstr "signo estas ekster gamo" -#: lib/unicodeio.c:182 +#: lib/unicodeio.c:181 #, c-format msgid "cannot convert U+%04X to local character set" msgstr "ne eblas konverti U+%04X al loka signaro" -#: lib/unicodeio.c:184 +#: lib/unicodeio.c:183 #, c-format msgid "cannot convert U+%04X to local character set: %s" msgstr "ne eblas konverti U+%04X al loka signaro: %s" @@ -783,15 +790,15 @@ msgid "" "Report bugs to: %s\n" msgstr "" "\n" -"Raportu programcimojn al %s;\n" +"Raportu programmisojn al %s;\n" "sciigu tradukerarojn al <translation-team-eo@lists.sourceforge.net>.\n" #: lib/version-etc.c:247 #, c-format msgid "Report %s bugs to: %s\n" -msgstr "Raportu programcimojn en «%s» al: %s\n" +msgstr "Raportu programmisojn en «%s» al: %s\n" -#: lib/version-etc.c:251 src/system.h:562 +#: lib/version-etc.c:251 src/system.h:573 #, c-format msgid "%s home page: <%s>\n" msgstr "Hejmpaĝo de «%s»: <%s>\n" @@ -801,7 +808,7 @@ 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:563 +#: lib/version-etc.c:256 src/system.h:574 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" @@ -821,9 +828,9 @@ msgid "%s subprocess" msgstr "subprocezo %s" #: lib/wait-process.c:274 lib/wait-process.c:346 -#, fuzzy, c-format +#, c-format msgid "%s subprocess got fatal signal %d" -msgstr "subprocezo %s ricevis ... signalon %d" +msgstr "subprocezo %s ricevis pereigan signalon %d" #: lib/xfreopen.c:35 msgid "stdin" @@ -887,18 +894,17 @@ msgid "Simon Josefsson" msgstr "Simon ĜOSEFSON (Simon Josefsson)" #: src/base64.c:60 -#, c-format +#, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" "Base64 encode or decode FILE, or standard input, to standard output.\n" -"\n" msgstr "" "Uzmaniero: %s [OPCIO...] [DOSIERO]\n" "\n" "Kodas aŭ malkodas 64-ume DOSIEROn (aŭ ĉefenigujon) al ĉefeligujo.\n" "\n" -#: src/base64.c:64 +#: src/base64.c:67 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -907,8 +913,12 @@ msgid "" " Use 0 to disable line wrapping\n" "\n" msgstr "" +" -d, --decode malkodi la datenojn\n" +" -i, --ignore-garbage ignori nealfabetajn signojn dum malkodado\n" +" -w, --wrap=NOMBRO faldi koditajn liniojn post NOMBRO (defaŭlte 76)\n" +" da signoj; uzu 0 por malŝalti linifaldadon\n" -#: src/base64.c:73 src/cat.c:110 src/fmt.c:293 src/shuf.c:71 src/sum.c:70 +#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -916,7 +926,7 @@ msgstr "" "\n" "Sen DOSIERO, aŭ kiam DOSIERO estas «-», ĉefenigujo legiĝas.\n" -#: src/base64.c:76 +#: src/base64.c:79 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -930,37 +940,37 @@ 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:171 src/base64.c:208 src/csplit.c:263 src/csplit.c:1435 -#: src/join.c:451 src/shuf.c:157 src/shuf.c:361 src/tac-pipe.c:74 +#: 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 #, c-format msgid "read error" msgstr "leg-eraro" -#: src/base64.c:227 +#: src/base64.c:230 #, c-format msgid "invalid input" msgstr "nevalida enigaĵo" -#: src/base64.c:264 +#: src/base64.c:267 #, c-format msgid "invalid wrap size: %s" msgstr "nevalida faldiga grando: %s" -#: src/base64.c:283 src/basename.c:173 src/comm.c:435 src/cp.c:607 -#: src/date.c:441 src/dircolors.c:447 src/du.c:894 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:169 src/install.c:929 src/join.c:961 -#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:157 src/mv.c:447 -#: src/od.c:1802 src/ptx.c:2081 src/readlink.c:154 src/seq.c:408 -#: src/shuf.c:320 src/shuf.c:339 src/sort.c:4477 src/split.c:1313 -#: src/tr.c:1797 src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:454 -#: src/uniq.c:471 src/unlink.c:81 src/uptime.c:250 src/users.c:146 -#: src/wc.c:666 src/who.c:836 src/whoami.c:79 +#: 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 #, c-format msgid "extra operand %s" msgstr "superflua argumento: %s" -#: src/base64.c:315 src/cat.c:781 +#: src/base64.c:318 src/cat.c:781 #, c-format msgid "closing standard input" msgstr "fermiĝas ĉefenigujo" @@ -968,15 +978,15 @@ 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/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:53 src/env.c:33 +#: 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/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:65 src/su.c:88 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 +#: 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 msgid "David MacKenzie" msgstr "David MEKENZI (David MacKenzie)" @@ -990,16 +1000,16 @@ 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" -"\n" msgstr "" "Eligas NOMOn sen ĉiuj antaŭaj elementoj dosierujaj.\n" "Se indikata, ankaŭ forigas postan SUFIKSOn.\n" "\n" -#: src/basename.c:59 +#: 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" @@ -1010,7 +1020,7 @@ msgstr "" " -s, --suffix=SUFIKSO forlasi ĉi tiun SUFIKSOn kiam ĝi okazas\n" " -z, --zero disigi eligon per nulbajtoj anstataŭ per novlinioj\n" -#: src/basename.c:66 +#: src/basename.c:67 #, c-format msgid "" "\n" @@ -1027,22 +1037,23 @@ msgstr "" " %s -s .h include/stdio.h -> «stdio»\n" " %s -a ia/ĉeno1 ia/ĉeno2 -> «ĉeno1» kaj poste «ĉeno2»\n" -#: src/basename.c:167 src/chcon.c:531 src/chgrp.c:277 src/chmod.c:526 -#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1369 +#: 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:183 src/mkfifo.c:108 src/mknod.c:146 src/nohup.c:111 -#: src/pathchk.c:148 src/printf.c:674 src/readlink.c:146 src/realpath.c:236 -#: src/rm.c:314 src/rmdir.c:223 src/seq.c:402 src/setuidgid.c:137 -#: src/sleep.c:119 src/stat.c:1476 src/stdbuf.c:346 src/tr.c:1782 +#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 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 #, 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:52 src/split.c:49 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/split.c:49 msgid "Torbjorn Granlund" -msgstr "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 @@ -1050,8 +1061,8 @@ msgstr "Torbjorn GRANLUND" msgid "Richard M. Stallman" msgstr "Riĉard STOLMEN (Richard M. Stallman)" -#: src/cat.c:88 src/df.c:846 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4720 src/nl.c:182 src/paste.c:435 src/pr.c:2768 src/sum.c:58 +#: 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/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" @@ -1109,7 +1120,7 @@ msgstr "" msgid "cannot do ioctl on %s" msgstr "ne eblas fari 'ioctl' al %s" -#: src/cat.c:637 src/dd.c:2209 src/sort.c:379 src/tee.c:165 src/yes.c:86 +#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86 #, c-format msgid "standard output" msgstr "ĉefeligujo" @@ -1126,14 +1137,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:55 src/head.c:46 src/hostid.c:33 +#: 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 msgid "Jim Meyering" msgstr "Ĝim MEJERING (Jim Meyering)" -#: src/chcon.c:100 src/runcon.c:203 src/runcon.c:234 +#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238 #, c-format msgid "failed to create security context: %s" msgstr "malsukcesis krei sekurecan kuntekston: %s" @@ -1143,8 +1154,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:540 src/copy.c:2222 src/runcon.c:217 -#: src/stat.c:683 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221 +#: src/stat.c:702 #, c-format msgid "failed to get security context of %s" msgstr "malsukcesis eltrovi sekurecan kuntekston de %s" @@ -1160,12 +1171,12 @@ 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:446 src/ls.c:2981 +#: src/du.c:457 src/ls.c:2981 #, 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:426 +#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437 #, c-format msgid "cannot read directory %s" msgstr "ne eblas legi dosierujon %s" @@ -1175,13 +1186,13 @@ 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:599 +#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562 #, 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:618 -#: src/remove.c:613 +#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642 +#: src/remove.c:576 #, c-format msgid "fts_close failed" msgstr "malsukcesis 'fts_close()'" @@ -1194,27 +1205,34 @@ msgid "" " or: %s [OPTION]... --reference=RFILE FILE...\n" msgstr "" "Uzmaniero: %s [OPCIO...] KUNTEKSTO DOSIERO...\n" -" aŭ: %s [OPCIO...] [-u UZANTO] [-r ROLO] [-l INTERVALO] [-t TIPO] " +" aŭ: %s [OPCIO...] [-u UZANTO] [-r ROLO] [-l GAMO] [-t TIPO] " "DOSIERO...\n" " aŭ: %s [OPCIO...] --reference=REFERENCDOSIERO DOSIERO...\n" #: src/chcon.c:357 +#, fuzzy msgid "" "Change the security context of each FILE to CONTEXT.\n" "With --reference, change the security context of each FILE to that of " "RFILE.\n" -"\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" -#: src/chcon.c:362 src/chgrp.c:123 src/chown.c:94 +#: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94 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 "" +" --dereference (defaŭlte) efiki la referencatan de ĉiu simbola " +"ligo\n" +" -h, --no-dereference efiki simbolan ligon mem anstataŭ kion ĝi indikas\n" -#: src/chcon.c:367 +#: src/chcon.c:369 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" @@ -1225,25 +1243,36 @@ msgstr "" "kunteksto\n" " -r, --role=ROLO difini rolon ROLO en la cela sekureca kunteksto\n" " -t, --type=TIPO difini tipon TIPO en la cela sekureca kunteksto\n" -" -l, --range=INTERVALO difini intervalon INTERVALO 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 +msgid "" +" --no-preserve-root do not treat '/' specially (the default)\n" +" --preserve-root fail to operate recursively on '/'\n" +msgstr "" +" --no-preserve-root ne trakti '/' aparte (la defaŭlto)\n" +" --preserve-root rifuzi operacii rikure sur '/'\n" -#: src/chcon.c:373 +#: src/chcon.c:379 msgid "" " --reference=RFILE use RFILE's security context rather than " "specifying\n" " a CONTEXT value\n" msgstr "" +" --reference=REFERENCDOSIERO\n" +" uzi sekurecan kuntekston de REFERENCDOSIERO\n" +" anstataŭ la valoron KUNTEKSTO\n" -#: src/chcon.c:377 src/chgrp.c:140 src/chown.c:118 +#: 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 operacii rikure pri dosieroj kaj dosierujoj\n" -#: src/chcon.c:380 +#: src/chcon.c:386 msgid " -v, --verbose output a diagnostic for every file processed\n" msgstr "" +" -v, --verbose eligi mesaĝon por ĉiu dosiero kiu proceziĝis\n" -#: src/chcon.c:383 src/chgrp.c:143 src/chown.c:121 +#: src/chcon.c:389 src/chgrp.c:143 src/chown.c:121 msgid "" "\n" "The following options modify how a hierarchy is traversed when the -R\n" @@ -1257,37 +1286,47 @@ msgid "" " -P do not traverse any symbolic links (default)\n" "\n" msgstr "" +"\n" +"La sekvaj opcioj modifas la trapason de la hierarkio kiam la opcio «-R»\n" +"indikatas. Se pli ol unu el ili indikatas, nur la lasta efikas.\n" +"\n" +" -H se komandlinia argumento estas simbola ligo al\n" +" dosierujo, trapasi ĝin\n" +" -L trapasi ĉiun renkontatan simbolan ligon al " +"dosierujo\n" +" -P ne trapasi iujn ajn simbolajn ligojn (defaŭlte)\n" +"\n" -#: src/chcon.c:512 src/chgrp.c:264 src/chown.c:267 +#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267 #, c-format msgid "-R --dereference requires either -H or -L" msgstr "'-R --dereference' bezonas aŭ '-H' aŭ '-L'" -#: src/chcon.c:518 +#: src/chcon.c:524 #, c-format msgid "-R -h requires -P" msgstr "'-R -h' bezonas '-P'" -#: src/chcon.c:533 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282 -#: src/comm.c:429 src/csplit.c:1371 src/join.c:1149 src/link.c:79 -#: src/mknod.c:148 src/setuidgid.c:139 src/tr.c:1785 +#: 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 #, c-format msgid "missing operand after %s" msgstr "mankas argumento post %s" -#: src/chcon.c:556 src/runcon.c:247 +#: src/chcon.c:562 src/runcon.c:251 #, c-format msgid "invalid context: %s" msgstr "nevalida kunteksto: %s" -#: src/chcon.c:563 +#: src/chcon.c:569 #, c-format msgid "conflicting security context specifiers given" msgstr "konfliktas la indikoj de sekureca kunteksto" -#: src/chcon.c:572 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:433 src/cp.c:493 -#: src/mv.c:96 src/pwd.c:273 src/rm.c:324 src/touch.c:351 +#: 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 #, c-format msgid "failed to get attributes of %s" msgstr "malsukcesis eltrovi atributojn de %s" @@ -1312,6 +1351,10 @@ msgid "" "With --reference, change the group of each FILE to that of RFILE.\n" "\n" msgstr "" +"Ŝanĝas la grupon de ĉiu DOSIERO al GRUPO.\n" +"Kun «--reference», ŝanĝas la grupon de ĉiu DOSIERO al tiu de " +"REFERENCDOSIERO.\n" +"\n" #: src/chgrp.c:118 src/chmod.c:382 src/chown.c:89 msgid "" @@ -1319,6 +1362,9 @@ msgid "" " -f, --silent, --quiet suppress most error messages\n" " -v, --verbose output a diagnostic for every file processed\n" msgstr "" +" -c, --changes kiel '--verbose', sed nur kiam ŝanĝo okazis\n" +" -f, --silent, --quiet forlasi la plejmulton de erarmesaĝoj\n" +" -v, --verbose eligi mesaĝon por ĉiu dosiero kiu proceziĝis\n" #: src/chgrp.c:128 src/chown.c:99 msgid "" @@ -1328,17 +1374,13 @@ msgstr "" " (utilas nur en sistemoj kie eblas ŝanĝi posedanton\n" " de simbola ligo)\n" -#: src/chgrp.c:132 src/chmod.c:387 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/chgrp.c:136 msgid "" " --reference=RFILE use RFILE's group rather than specifying a\n" " GROUP value\n" msgstr "" +" --reference=REFERENCDOSIERO\n" +" uzi la grupon de REFERENCDOSIERO anstataŭ valoron\n" #: src/chgrp.c:158 #, c-format @@ -1422,7 +1464,7 @@ msgstr "" #: src/chmod.c:394 msgid " -R, --recursive change files and directories recursively\n" -msgstr " -R, --recursive ŝanĝas dosierojn kaj dosierujojn rekursive\n" +msgstr " -R, --recursive ŝanĝas dosierojn kaj dosierujojn rikure\n" #: src/chmod.c:399 msgid "" @@ -1529,6 +1571,12 @@ msgid "" "RFILE.\n" "\n" msgstr "" +"Ŝanĝas la posedanton kaj/aŭ grupon de ĉiu DOSIERO al POSEDANTO kaj/aŭ " +"GRUPO.\n" +"Kun «--reference», ŝanĝas la posedanton kaj grupon de ĉiu DOSIERO al tiuj " +"de\n" +"REFERENCDOSIERO.\n" +"\n" #: src/chown.c:103 msgid "" @@ -1540,12 +1588,22 @@ msgid "" "match\n" " is not required for the omitted attribute\n" msgstr "" +" --from=NUNA_POSEDANTO:NUNA_GRUPO\n" +" ŝanĝi la posedanton kaj/aŭ grupon de ĉiu dosiero " +"nur\n" +" se ĝia nuna posedanto kaj/aŭ grupo kongruas kun la " +"ĉi\n" +" tie indikataj; la unua aŭ la dua povas esti " +"forlasata,\n" +" en kiu kazo kongruo ne bezonas por tiu\n" #: src/chown.c:114 msgid "" " --reference=RFILE use RFILE's owner and group rather than\n" " specifying OWNER:GROUP values\n" msgstr "" +" --reference=REFERENCDOSIERO\n" +" uzi posedanton kaj grupon de REFERENCDOSIERO\n" #: src/chown.c:136 msgid "" @@ -1554,6 +1612,10 @@ 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" +"Posedanto ne ŝanĝiĝas se mankas. Ankaŭ grupo ne ŝanĝiĝas se mankas, sed\n" +"ĝi ŝanĝiĝas al la ensaluta grupo se ':' sekvas simbolan POSEDANTOn.\n" +"POSEDANTO kaj GRUPO povas esti numerecaj aŭ simbolaj.\n" #: src/chown.c:142 #, c-format @@ -1576,7 +1638,7 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland MEKGRAF (Roland McGrath)" -#: src/chroot.c:97 src/install.c:575 src/setuidgid.c:110 src/setuidgid.c:120 +#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120 #, c-format msgid "invalid group %s" msgstr "nevalida grupo: %s" @@ -1613,6 +1675,9 @@ 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=UZANTO:GRUPO uzendaj uzanto kaj grupo (ID aŭ nomo)\n" +" --groups=GRUPLISTO agordendaj aldonaj grupoj (indiki kiel «g1,g2,..," +"gN»)\n" #: src/chroot.c:149 msgid "" @@ -1642,8 +1707,8 @@ msgstr "malsukcesis agordi grupnumeron" msgid "failed to set user-ID" msgstr "malsukcesis agordi uzantnumeron" -#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:213 src/stdbuf.c:366 -#: src/timeout.c:402 +#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365 +#: src/timeout.c:454 #, c-format msgid "failed to run command %s" msgstr "malsukcesis ruli komandon %s" @@ -1703,6 +1768,11 @@ msgid "" " -2 suppress column 2 (lines unique to FILE2)\n" " -3 suppress column 3 (lines that appear in both files)\n" msgstr "" +"\n" +" -1 forlasi kolumnon 1 (liniojn unikajn al DOSIERO1)\n" +" -2 forlasi kolumnon 2 (liniojn unikajn al DOSIERO2)\n" +" -3 forlasi kolumnon 3 (liniojn kiuj aperas en ambaŭ " +"dosieroj)\n" #: src/comm.c:122 msgid "" @@ -1711,10 +1781,14 @@ msgid "" " if all input lines are pairable\n" " --nocheck-order do not check that the input is correctly sorted\n" msgstr "" +"\n" +" --check-order kontroli ke la enigo estas ĝuste ordigita, eĉ\n" +" se ĉiuj enigaj linioj estas pareblaj\n" +" --nocheck-order ne kontroli ke la enigo estas ĝuste ordigita\n" #: src/comm.c:128 msgid " --output-delimiter=STR separate columns with STR\n" -msgstr "" +msgstr " --output-delimiter=ĈENO disigi kolumnojn kun ĈENO\n" #: src/comm.c:133 msgid "" @@ -1732,6 +1806,13 @@ 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" +"Ekzemploj:\n" +" %s -12 dosiero1 dosiero2 Montras nur liniojn kiuj ĉeestas en ambaŭ " +"dosieroj.\n" +" %s -3 dosiero1 dosiero2 Montras liniojn kiuj ĉeestas en unu dosiero sed " +"ne\n" +" en la alia.\n" #: src/comm.c:222 #, c-format @@ -1748,20 +1829,24 @@ msgstr "pluraj limigiloj indikatas" msgid "empty %s not allowed" msgstr "vaka %s ne permesatas" -#: src/copy.c:168 src/dd.c:1609 src/dd.c:1976 +#: 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 #, c-format -msgid "reading %s" -msgstr "legiĝas %s" +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:426 +#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425 #, c-format msgid "cannot lseek %s" msgstr "ne eblas 'lseek' sur %s" -#: src/copy.c:206 src/dd.c:2039 src/dd.c:2102 +#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151 #, c-format -msgid "writing %s" -msgstr "skribiĝas %s" +msgid "error writing %s" +msgstr "eraro dum skribado de %s" #: src/copy.c:313 #, c-format @@ -1783,7 +1868,7 @@ msgstr "malsukcesis etendi %s" msgid "clearing permissions for %s" msgstr "vakigiĝas permesoj pri %s" -#: src/copy.c:697 src/copy.c:2470 src/cp.c:331 +#: src/copy.c:697 src/copy.c:2480 src/cp.c:329 #, c-format msgid "failed to preserve ownership for %s" msgstr "malsukcesis konservi posedanton pri %s" @@ -1798,14 +1883,14 @@ msgstr "malsukcesis trovi dosieron %s" msgid "failed to preserve authorship for %s" msgstr "malsukcesis konservi aŭtorecon pri %s" -#: src/copy.c:804 src/csplit.c:638 src/du.c:901 src/fmt.c:449 src/head.c:847 -#: src/sort.c:4489 src/split.c:1329 src/tail.c:1756 src/wc.c:678 +#: 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 "ne eblas malfermi %s por legi" -#: src/copy.c:810 src/copy.c:972 src/dd.c:1546 src/dd.c:2114 src/dd.c:2252 -#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:141 +#: 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 #, c-format msgid "cannot fstat %s" msgstr "malsukcesis eltrovi statinformon pri malferma %s" @@ -1825,14 +1910,14 @@ msgstr "malsukcesis eltrovi dosiersisteman krean kuntekston" 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:1574 src/copy.c:1777 src/copy.c:1935 src/ln.c:314 -#: src/remove.c:267 src/remove.c:293 src/remove.c:444 src/remove.c:465 +#: 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 #, c-format msgid "cannot remove %s" msgstr "ne eblas forigi %s" -#: src/copy.c:886 src/copy.c:1578 src/copy.c:1772 src/copy.c:1940 -#: src/remove.c:418 +#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945 +#: src/remove.c:375 #, c-format msgid "removed %s\n" msgstr "forigiĝis %s\n" @@ -1852,186 +1937,186 @@ msgstr "ne eblas krei regulan dosieron %s" msgid "failed to clone %s from %s" msgstr "malsukcesis kloni %s el %s" -#: src/copy.c:1098 src/copy.c:2531 +#: src/copy.c:1098 src/copy.c:2541 #, c-format msgid "preserving times for %s" msgstr "konserviĝas tempoj pri %s" -#: src/copy.c:1170 src/copy.c:1176 src/head.c:855 src/touch.c:175 -#: src/truncate.c:413 -#, c-format -msgid "closing %s" -msgstr "fermiĝas %s" +#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172 +#: src/truncate.c:417 +#, fuzzy, c-format +msgid "failed to close %s" +msgstr "malsukcesis malfermi %s" -#: src/copy.c:1466 +#: src/copy.c:1471 #, c-format msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? " msgstr "%s: ĉu anstataŭigi %s, ignorante moduson %04lo (%s)? " -#: src/copy.c:1473 +#: src/copy.c:1478 #, c-format msgid "%s: overwrite %s? " msgstr "%s: ĉu anstataŭigi %s? " -#: src/copy.c:1542 +#: src/copy.c:1547 #, c-format msgid " (backup: %s)" msgstr " (savkopio: %s)" -#: src/copy.c:1552 +#: src/copy.c:1557 #, c-format msgid "failed to restore the default file creation context" msgstr "malsukcesis restaŭri defaŭltan dosierkrean kuntekston" -#: src/copy.c:1584 +#: src/copy.c:1589 #, c-format msgid "cannot create hard link %s to %s" msgstr "ne eblas krei senperan ligon %s al %s" -#: src/copy.c:1637 src/copy.c:1689 src/copy.c:2272 src/copy.c:2589 +#: 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:1220 src/truncate.c:365 +#: src/stat.c:1239 src/truncate.c:363 #, c-format msgid "cannot stat %s" msgstr "malsukcesis eltrovi statinformon pri %s" -#: src/copy.c:1645 +#: src/copy.c:1650 #, c-format msgid "omitting directory %s" msgstr "preterpasiĝas dosierujo %s" -#: src/copy.c:1659 +#: src/copy.c:1664 #, c-format msgid "warning: source file %s specified more than once" msgstr "averto: fontdosiero %s indikatas plurfoje" -#: src/copy.c:1707 src/ln.c:246 +#: src/copy.c:1712 src/ln.c:246 #, c-format msgid "%s and %s are the same file" msgstr "%s kaj %s estas la sama dosiero" -#: src/copy.c:1806 +#: src/copy.c:1811 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "ne eblas anstataŭigi nedosierujon %s per dosierujo %s" -#: src/copy.c:1824 src/ln.c:214 +#: src/copy.c:1829 src/ln.c:214 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "ne anstataŭiĝos ĵuskreita %s per %s" -#: src/copy.c:1842 +#: src/copy.c:1847 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "ne eblas anstataŭigi dosierujon %s per nedosierujo" -#: src/copy.c:1856 +#: src/copy.c:1861 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "ne eblas movi dosierujon al nedosierujo: %s -> %s" -#: src/copy.c:1886 +#: src/copy.c:1891 #, 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:1887 +#: src/copy.c:1892 #, 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:1910 src/ln.c:276 +#: src/copy.c:1915 src/ln.c:276 #, c-format msgid "cannot backup %s" msgstr "ne eblas krei savkopion de %s" -#: src/copy.c:1974 +#: src/copy.c:1979 #, 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:2051 +#: src/copy.c:2056 #, 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:2068 +#: src/copy.c:2073 #, 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:2118 +#: src/copy.c:2123 #, 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:2161 +#: src/copy.c:2166 #, c-format msgid "cannot move %s to %s" msgstr "ne eblas movi %s al %s" -#: src/copy.c:2173 +#: src/copy.c:2178 #, 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:2207 src/install.c:905 src/mkdir.c:189 src/mkfifo.c:114 -#: src/mknod.c:167 +#: 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:2241 +#: src/copy.c:2246 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "ne eblas kopii ciklan simbolan ligon %s" -#: src/copy.c:2350 +#: src/copy.c:2355 #, 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:2357 +#: src/copy.c:2362 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "ne eblas krei simbolan ligon %s al %s" -#: src/copy.c:2406 src/mkfifo.c:133 +#: src/copy.c:2416 src/mkfifo.c:132 #, c-format msgid "cannot create fifo %s" -msgstr "ne eblas krei 'FIFO'-on %s" +msgstr "ne eblas krei vicmemoron %s" -#: src/copy.c:2415 +#: src/copy.c:2425 #, c-format msgid "cannot create special file %s" msgstr "ne eblas krei specialan dosieron %s" -#: src/copy.c:2426 src/ls.c:3191 src/stat.c:902 +#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921 #, c-format msgid "cannot read symbolic link %s" msgstr "ne eblas legi simbolan ligon %s" -#: src/copy.c:2453 +#: src/copy.c:2463 #, c-format msgid "cannot create symbolic link %s" msgstr "ne eblas krei simbolan ligon %s" -#: src/copy.c:2485 +#: src/copy.c:2495 #, c-format msgid "%s has unknown file type" msgstr "%s havas nekonatan dosiertipon" -#: src/copy.c:2629 src/ln.c:358 +#: src/copy.c:2644 src/ln.c:358 #, c-format msgid "cannot un-backup %s" msgstr "ne eblas restaŭri savkopion %s" -#: src/copy.c:2633 +#: src/copy.c:2648 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (restaŭro)\n" -#: src/cp.c:156 src/mv.c:284 +#: src/cp.c:156 src/mv.c:286 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -2043,25 +2128,13 @@ msgstr "" " aŭ: %s [OPCIO...] -t DOSIERUJO ORIGINO...\n" #: src/cp.c:162 -msgid "" -"Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" -"\n" +#, fuzzy +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:166 src/csplit.c:1458 src/cut.c:197 src/df.c:852 src/du.c:268 -#: src/expand.c:112 src/fmt.c:275 src/fold.c:75 src/head.c:115 -#: src/install.c:612 src/kill.c:86 src/ln.c:392 src/ls.c:4726 src/mkdir.c:61 -#: src/mkfifo.c:56 src/mknod.c:58 src/mv.c:294 src/nl.c:191 src/paste.c:445 -#: src/pr.c:2777 src/ptx.c:1825 src/shred.c:153 src/shuf.c:58 src/sort.c:399 -#: src/split.c:211 src/stdbuf.c:95 src/tac.c:142 src/tail.c:268 -#: src/touch.c:226 src/truncate.c:107 src/unexpand.c:122 src/uniq.c:145 -msgid "" -"Mandatory arguments to long options are mandatory for short options too.\n" -msgstr "(Endaj argumentoj por longaj opcioj ankaŭ endas por la mallongaj.)\n" - -#: src/cp.c:169 +#: src/cp.c:168 msgid "" " -a, --archive same as -dR --preserve=all\n" " --attributes-only don't copy the file data, just the " @@ -2074,33 +2147,58 @@ msgid "" "recursive\n" " -d same as --no-dereference --preserve=links\n" msgstr "" - -#: src/cp.c:178 +" -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" +" -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 msgid "" " -f, --force if an existing destination file cannot be\n" -" opened, remove it and try again (redundant " -"if\n" -" the -n option is used)\n" +" opened, remove it and try again (this " +"option\n" +" is ignored when the -n option is also " +"used)\n" " -i, --interactive prompt before overwrite (overrides a previous " "-n\n" " option)\n" " -H follow command-line symbolic links in SOURCE\n" msgstr "" +" -f, --force se ekzistanta celdosiero ne malfermeblas, " +"forigi\n" +" ĝin kaj provi denove (nuliĝas per 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:188 +#: src/cp.c:186 msgid "" " -l, --link hard link files instead of copying\n" " -L, --dereference always follow symbolic links in SOURCE\n" msgstr "" +" -l, --link senpere ligi dosierojn anstataŭ kopii ilin\n" +" -L, --dereference ĉiam sekvi simbolajn ligojn en ORIGINO\n" -#: src/cp.c:192 +#: src/cp.c:190 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 anstataŭigi ekzistantan dosieron\n" +" (transpasas antaŭan opcion «-i»)\n" +" -P, --no-dereference neniam sekvi simbolajn ligojn en ORIGINO\n" -#: src/cp.c:197 +#: src/cp.c:195 msgid "" " -p same as --preserve=mode,ownership,timestamps\n" " --preserve[=ATTR_LIST] preserve the specified attributes (default:\n" @@ -2109,14 +2207,22 @@ msgid "" "xattr,\n" " all\n" msgstr "" +" -p egalas al «--preserve=mode,ownership," +"timestamps»\n" +" --preserve[=ATRIBUTLISTO] konservi la indikatajn atributojn\n" +" (defaŭlte: «mode,ownership,timestamps»),\n" +" eblas ankaŭ: «context, links, xattr, all»\n" -#: src/cp.c:205 +#: src/cp.c:203 msgid "" " --no-preserve=ATTR_LIST don't preserve the specified attributes\n" " --parents use full source file name under DIRECTORY\n" msgstr "" +" --no-preserve=ATRIBUTLISTO ne konservi la indikatajn atributojn\n" +" --parents uzi plenan ORIGINOdosieran nomon sub " +"DOSIERUJO\n" -#: src/cp.c:209 +#: src/cp.c:207 msgid "" " -R, -r, --recursive copy directories recursively\n" " --reflink[=WHEN] control clone/CoW copies. See below\n" @@ -2124,16 +2230,25 @@ msgid "" " attempting to open it (contrast with --" "force)\n" msgstr "" +" -R, --recursive, -r kopii dosierujojn rikure\n" +" --reflink[=KIAM] kopii nur skribotajn blokojn (vidu sube)\n" +" --remove-destination forigi ĉiun ekzistantan celdosieron antaŭ ol\n" +" provi malfermi ĝin (kontraste kun «--" +"force»)\n" -#: src/cp.c:215 +#: src/cp.c:213 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=KIAM stiri kreon de maldensaj dosieroj (vidu " +"sube)\n" +" --strip-trailing-slashes forigi ajn vostajn suprenstrekojn de ĉiu " +"ORIGINO\n" -#: src/cp.c:220 +#: src/cp.c:218 msgid "" " -s, --symbolic-link make symbolic links instead of copying\n" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -2141,8 +2256,14 @@ msgid "" "DIRECTORY\n" " -T, --no-target-directory treat DEST as a normal file\n" msgstr "" +" -s, --symbolic-link krei simbolajn ligojn anstataŭ kopii la " +"enhavon\n" +" -S, --suffix=SUFIKSO uzi ĉi tiun anstataŭ kutiman savkopian " +"sufikson\n" +" -t, --target-directory=DOSIERUJO kopii ĉiujn ORIGINOjn al DOSIERUJO\n" +" -T, --no-target-directory trakti CELO kiel normala dosiero\n" -#: src/cp.c:226 +#: src/cp.c:224 msgid "" " -u, --update copy only when the SOURCE file is newer\n" " than the destination file or when the\n" @@ -2150,8 +2271,16 @@ msgid "" " -v, --verbose explain what is being done\n" " -x, --one-file-system stay on this file system\n" msgstr "" +" -u, --update kopii nur kiam la ORIGINO estas pli nova ol " +"la\n" +" cela dosiero aŭ kiam la cela dosiero " +"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:235 +#: src/cp.c:233 msgid "" "\n" "By default, sparse SOURCE files are detected by a crude heuristic and the\n" @@ -2166,8 +2295,22 @@ msgid "" "copy\n" "fails, or if --reflink=auto is specified, fall back to a standard copy.\n" msgstr "" +"\n" +"Defaŭlte, maldensaj ORIGINOj detektiĝas per kruda heŭristiko kaj la " +"koresponda\n" +"CELO-dosiero fariĝas maldensa ankaŭ. Tiu konduto elektiĝas de «--" +"sparse=aŭto».\n" +"Indiku «--sparse=always» por ĉiam krei maldensan CELO-dosieron kiam ajn la\n" +"ORIGINO enhavas sufiĉe longan sekvencon de nulbajtoj. Uzu «--sparse=never»\n" +"por malebligi kreon de maldensaj dosieroj.\n" +"\n" +"Kiam indikatas «--reflink[=always]», mola kopio fariĝas, en kiu la " +"datumblokoj\n" +"estos kopiataj nur kiam ili modifotas. Se mola kopio ne eblas, malsukcesas " +"la\n" +"kopio, aŭ (se «--reflink=aŭto» indikatas) normala kopio fariĝas anstataŭe.\n" -#: src/cp.c:247 src/install.c:649 src/ln.c:421 src/mv.c:321 +#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322 msgid "" "\n" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -2176,109 +2319,126 @@ msgid "" "the VERSION_CONTROL environment variable. Here are the values:\n" "\n" msgstr "" +"\n" +"La savkopia sufikso estas «~», krom se agordita per «--suffix» aŭ per " +"ĉirkaŭaĵa\n" +"variablo «SIMPLE_BACKUP_SUFFIX». La versirega metodo elekteblas per «--" +"backup»\n" +"aŭ per ĉirkaŭaĵa variablo «VERSION_CONTROL». Jen la eblaj metodoj:\n" +"\n" -#: src/cp.c:254 src/install.c:656 src/mv.c:328 +#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329 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" +" 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:260 +#: src/cp.c:258 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" +"Specialkaze, «cp» faras savkopion de ORIGINO kiam opcioj «--force» kaj «--" +"backup»\n" +"indikatas, kaj ORIGINO kaj CELO estas la sama nomo de ekzistanta normala " +"dosiero.\n" -#: src/cp.c:319 +#: src/cp.c:317 #, c-format msgid "failed to preserve times for %s" msgstr "malsukcesis konservi tempojn pri %s" -#: src/cp.c:350 +#: src/cp.c:348 #, c-format msgid "failed to preserve permissions for %s" msgstr "malsukcesis konservi permesojn pri %s" -#: src/cp.c:477 +#: src/cp.c:475 #, c-format msgid "cannot make directory %s" msgstr "ne eblas krei dosierujon %s" -#: src/cp.c:526 src/cp.c:545 +#: src/cp.c:524 src/cp.c:543 #, c-format msgid "%s exists but is not a directory" msgstr "%s ekzistas sed ne estas dosierujo" -#: src/cp.c:572 src/cp.c:1068 src/install.c:401 src/install.c:844 src/ln.c:123 -#: src/ln.c:181 src/ln.c:202 src/ln.c:516 src/mv.c:152 src/mv.c:399 -#, c-format -msgid "accessing %s" -msgstr "atingiĝas %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 +#, fuzzy, c-format +msgid "failed to access %s" +msgstr "malsukcesis malfermi %s" -#: src/cp.c:592 src/install.c:914 src/ln.c:546 src/mv.c:432 src/shred.c:1182 -#: src/touch.c:433 src/truncate.c:356 +#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181 +#: src/touch.c:429 src/truncate.c:354 #, c-format msgid "missing file operand" msgstr "mankas dosiera argumento" -#: src/cp.c:594 src/install.c:916 src/ln.c:560 src/mv.c:434 +#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436 #, c-format msgid "missing destination file operand after %s" msgstr "mankas celdosiera argumento post %s" -#: src/cp.c:603 src/install.c:925 src/mv.c:443 +#: src/cp.c:601 src/install.c:926 src/mv.c:445 #, 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:619 src/cp.c:1070 src/install.c:403 src/install.c:846 -#: src/install.c:938 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:401 -#: src/mv.c:457 +#: 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 #, c-format msgid "target %s is not a directory" msgstr "cela %s ne estas dosierujo" -#: src/cp.c:730 +#: src/cp.c:728 #, c-format msgid "with --parents, the destination must be a directory" msgstr "kun opcio «--parents» la celo devas esti dosierujo" -#: src/cp.c:1063 src/install.c:839 src/ln.c:511 src/mv.c:394 +#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395 #, c-format msgid "multiple target directories specified" msgstr "pluraj celaj dosierujoj indikatas" -#: src/cp.c:1108 +#: src/cp.c:1110 #, c-format msgid "cannot make both hard and symbolic links" msgstr "ne eblas krei samtempe senperan kaj simbolan ligon" -#: src/cp.c:1115 src/mv.c:464 +#: src/cp.c:1117 src/mv.c:466 #, c-format msgid "options --backup and --no-clobber are mutually exclusive" msgstr "nekombineblas opcioj '--backup' kaj '--no-clobber'" -#: src/cp.c:1121 +#: src/cp.c:1123 #, c-format msgid "--reflink can be used only with --sparse=auto" msgstr "eblas uzi opcion '--reflink' nur kune kun '--sparse=auto'" -#: src/cp.c:1129 src/install.c:899 src/ln.c:582 src/mv.c:472 +#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474 msgid "backup type" msgstr "tipo de savkopio" -#: src/cp.c:1154 +#: src/cp.c:1156 #, 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:1160 +#: src/cp.c:1162 #, c-format msgid "cannot preserve extended attributes, cp is built without xattr support" msgstr "" @@ -2290,156 +2450,169 @@ msgstr "" msgid "Stuart Kemp" msgstr "Stjuŭart KEMP (Stuart Kemp)" -#: src/csplit.c:529 +#: src/csplit.c:531 #, c-format msgid "input disappeared" msgstr "enigo malaperis" -#: src/csplit.c:658 src/csplit.c:669 +#: src/csplit.c:660 src/csplit.c:671 #, c-format msgid "%s: line number out of range" -msgstr "%s: lininumero estas ekster intervalo" +msgstr "%s: lininumero estas ekster gamo" -#: src/csplit.c:698 +#: src/csplit.c:700 #, c-format msgid "%s: %s: line number out of range" -msgstr "%s: %s: lininumero estas ekster intervalo" +msgstr "%s: %s: lininumero estas ekster gamo" -#: src/csplit.c:701 src/csplit.c:750 +#: src/csplit.c:703 src/csplit.c:752 #, c-format msgid " on repetition %s\n" msgstr " ĉe ripeto %s\n" -#: src/csplit.c:744 +#: src/csplit.c:746 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: paron ne trovatas" -#: src/csplit.c:808 src/csplit.c:848 src/nl.c:359 src/tac.c:274 +#: src/csplit.c:810 src/csplit.c:850 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:981 +#: src/csplit.c:983 #, c-format msgid "write error for %s" msgstr "skrib-eraro por %s" -#: src/csplit.c:1057 +#: src/csplit.c:1059 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: post disigilo atendiĝas entjero" -#: src/csplit.c:1073 +#: src/csplit.c:1075 #, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: '}' nepras en ripeta nombro" # La '}' endas, ĉar %s komencas per '{'. -#: src/csplit.c:1083 +#: src/csplit.c:1085 #, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: entjero nepras inter '{' kaj '}'" -#: src/csplit.c:1110 +#: src/csplit.c:1112 #, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: mankas ferma disigilo '%c'" -#: src/csplit.c:1127 +#: src/csplit.c:1129 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: nevalida regulesprimo: %s" -#: src/csplit.c:1160 +#: src/csplit.c:1162 #, c-format msgid "%s: invalid pattern" msgstr "%s: nevalida serĉa ŝablono" -#: src/csplit.c:1163 +#: src/csplit.c:1165 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: lininumero devas esti pli ol nulo" -#: src/csplit.c:1169 +#: src/csplit.c:1171 #, 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:1175 +#: src/csplit.c:1177 #, 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:1253 +#: src/csplit.c:1255 #, c-format msgid "missing conversion specifier in suffix" msgstr "mankas konvertindiko en sufikso" -#: src/csplit.c:1259 +#: src/csplit.c:1261 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "nevalida konvertindiko en sufikso: %c" -#: src/csplit.c:1262 +#: src/csplit.c:1264 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "nevalida konvertindiko en sufikso: \\%.3o" -#: src/csplit.c:1267 +#: src/csplit.c:1269 #, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "nevalidaj flagoj en konvertindiko:: %%%c%c" -#: src/csplit.c:1284 +#: src/csplit.c:1286 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "tro multaj konvertindikoj %% en sufikso" -#: src/csplit.c:1298 +#: src/csplit.c:1300 #, c-format msgid "missing %% conversion specification in suffix" msgstr "mankas konvertindiko %% en sufikso" -#: src/csplit.c:1345 +#: src/csplit.c:1347 #, c-format msgid "%s: invalid number" msgstr "%s: nevalida numero" -#: src/csplit.c:1449 +#: src/csplit.c:1451 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Uzmaniero: %s [OPCIO...] DOSIERO SERĈŜABLONO...\n" -#: src/csplit.c:1453 +#: src/csplit.c:1455 +#, 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" -"\n" msgstr "" +"Eligas la pecojn de DOSIERO kiuj disigatas per ŜABLONO(j) al la dosieroj\n" +"'xx00', 'xx01', ...; kaj eligas la bajtnombron de ĉiu peco al ĉefeligujo.\n" +"\n" -#: src/csplit.c:1461 +#: src/csplit.c:1462 #, 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=ARANĜO uzi ĉi tiun ARANĜOn (de 'sprintf') anstataŭ " +"%02d\n" +" -f, --prefix=PREFIKSO uzi ĉi tiun PREFIKSOn anstataŭ 'xx'\n" +" -k, --keep-files ne forigi eligajn dosierojn kiam eraro okazas\n" -#: src/csplit.c:1466 +#: src/csplit.c:1467 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=NOMBRO uzi ĉi tiun nombron de ciferoj anstataŭ 2\n" +" -s, --quiet, --silent ne montri la bajtnombrojn de la eligaj " +"dosieroj\n" +" -z, --elide-empty-files forigi vakajn eligajn dosierojn\n" -#: src/csplit.c:1473 +#: src/csplit.c:1474 msgid "" "\n" "Read standard input if FILE is -. Each PATTERN may be:\n" msgstr "" +"\n" +"Kiam DOSIERO estas «-», ĉefenigujo legiĝas. Ĉiu ŜABLONO povas esti:\n" -#: src/csplit.c:1477 +#: src/csplit.c:1478 msgid "" "\n" " INTEGER copy up to but not including specified line number\n" @@ -2450,13 +2623,21 @@ msgid "" "\n" "A line OFFSET is a required '+' or '-' followed by a positive integer.\n" msgstr "" +"\n" +" ENTJERO kopii ĝis sed ne inkluzive indikata lininumero\n" +" /REGESP/[DEŜOVO] kopii ĝis sed ne inkluzive kongrua linio\n" +" %REFESP%[DEŜOVO] transpasi ĝis sed ne inkluzive kongrua linio\n" +" {ENTJERO} ripeti la antaŭan ŝablonon je ĉi tiu nombro de fojoj\n" +" {*} ripeti la antaŭan ŝablonon kiel eble plej multe\n" +"\n" +"Linia DEŜOVO estas necesa '+' aŭ '-' kun posta pozitiva entjero.\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 IĤNAT (David M. Ihnat)" -#: src/cut.c:64 +#: src/cut.c:64 src/cut.c:372 msgid "fields and positions are numbered from 1" msgstr "kampoj kaj pozicioj komencas ekde 1" @@ -2466,50 +2647,66 @@ msgid "Usage: %s OPTION... [FILE]...\n" msgstr "Uzmaniero: %s OPCIO... [DOSIERO...]\n" #: src/cut.c:193 -msgid "" -"Print selected parts of lines from each FILE to standard output.\n" -"\n" +#, fuzzy +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:200 +#: src/cut.c:199 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=LISTO elekti nur ĉi tiujn bajtojn\n" +" -c, --characters=LISTO elekti nur ĉi tiujn signojn\n" +" -d, --delimiter=SIGNO uzi SIGNOn anstataŭ TAB-on por kampdisigilo\n" -#: src/cut.c:205 +#: src/cut.c:204 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=LISTO elekti nur ĉi tiujn kampojn;\n" +" ankaŭ eligi ĉiun linion kiu ne enhavas " +"disigilon,\n" +" krom se la opcio «-s» indikatas\n" +" -n (ignoriĝas)\n" -#: src/cut.c:211 +#: src/cut.c:210 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" msgstr "" +" --complement komplementi la aron de elektitaj bajtoj, signoj,\n" +" aŭ kampoj\n" -#: src/cut.c:215 +#: src/cut.c:214 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 eligi liniojn kiuj ne enhavas disigilojn\n" +" --output-delimter=ĈENO uzi tiun ĉi ĈENOn kiel eligan disigilon;\n" +" defaŭlte uziĝas la eniga disigilo\n" -#: src/cut.c:222 +#: src/cut.c:221 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" +"Uzu unu, kaj nur unu, de «-b», «-c», aŭ «-f». Ĉiu LISTO konsistendas el\n" +"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:228 +#: src/cut.c:227 msgid "" "Each range is one of:\n" "\n" @@ -2520,56 +2717,67 @@ msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" msgstr "" +"Ĉiu gamo povas esti unu el:\n" +"\n" +" N la N-a bajto, signo aŭ kampo, numerata ekde 1\n" +" N- de la N-a bajto, signo aŭ kampo, ĝis la fino de la linio\n" +" N-M de la N-a al la M-a (inkluzive) bajto, signo aŭ kampo\n" +" -M de la unua ĝis la M-a (inkluzive) bajto, signo aŭ kampo\n" +"\n" +"Sen DOSIERO, aŭ kiam DOSIERO estas «-», ĉefenigujo legiĝas.\n" -#: src/cut.c:368 src/cut.c:489 -msgid "invalid byte or field list" +#: src/cut.c:367 src/cut.c:493 +#, fuzzy +msgid "invalid byte, character or field list" msgstr "nevalida listo de bajtoj aŭ kampoj" -#: src/cut.c:385 +# La originalo malklaras, la traduko ĝustas. +#: src/cut.c:387 msgid "invalid range with no endpoint: -" -msgstr "nevalida intervalo sen finpunkto: -" +msgstr "nevalida gamo, sen finpunktoj: «-»" -#: src/cut.c:399 +#: src/cut.c:403 msgid "invalid decreasing range" -msgstr "nevalida malkreska intervalo" +msgstr "nevalida gamo, ĝi malkreskas" -#: src/cut.c:478 +#: src/cut.c:482 #, c-format msgid "byte offset %s is too large" msgstr "bajtpozicio %s estas tro granda" -#: src/cut.c:481 +#: src/cut.c:485 #, c-format msgid "field number %s is too large" msgstr "kampnumero %s estas tro granda" -#: src/cut.c:789 src/cut.c:797 +#: src/cut.c:795 src/cut.c:803 msgid "only one type of list may be specified" msgstr "eblas indiki nur unu tipon de listo" -#: src/cut.c:806 +#: src/cut.c:812 src/numfmt.c:1408 +#, c-format msgid "the delimiter must be a single character" msgstr "la disigilo devas esti ununura signo" -#: src/cut.c:841 +#: src/cut.c:847 msgid "you must specify a list of bytes, characters, or fields" msgstr "nepras indiki liston de bajtoj, signoj, aŭ kampoj" -#: src/cut.c:844 +#: src/cut.c:850 msgid "an input delimiter may be specified only when operating on fields" msgstr "eblas indiki enigan disigilon nur kiam traktante kampojn" -#: src/cut.c:848 +#: src/cut.c:854 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:864 +#: src/cut.c:870 msgid "missing list of fields" msgstr "mankas listo de kampoj" -#: src/cut.c:866 +#: src/cut.c:872 msgid "missing list of positions" msgstr "mankas listo de pozicioj" @@ -2583,9 +2791,11 @@ msgstr "" " aŭ: %s [-u|--utc|--universal] [MMTThhmm[[CC]JJ][.ss]]\n" #: src/date.c:128 +msgid "Display the current time in the given FORMAT, or set the system date.\n" +msgstr "" + +#: src/date.c:134 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" " -I[TIMESPEC], --iso-8601[=TIMESPEC] output date/time in ISO 8601 format.\n" @@ -2594,14 +2804,14 @@ msgid "" " and time to the indicated precision.\n" msgstr "" -#: src/date.c:138 +#: src/date.c:142 msgid "" " -r, --reference=FILE display the last modification time of FILE\n" " -R, --rfc-2822 output date and time in RFC 2822 format.\n" " Example: Mon, 07 Aug 2006 12:34:56 -0600\n" msgstr "" -#: src/date.c:143 +#: src/date.c:147 msgid "" " --rfc-3339=TIMESPEC output date and time in RFC 3339 format.\n" " TIMESPEC='date', 'seconds', or 'ns' for\n" @@ -2612,7 +2822,7 @@ msgid "" " -u, --utc, --universal print or set Coordinated Universal Time\n" msgstr "" -#: src/date.c:154 +#: src/date.c:158 msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" @@ -2621,7 +2831,7 @@ msgid "" " %a locale's abbreviated weekday name (e.g., Sun)\n" msgstr "" -#: src/date.c:161 +#: src/date.c:165 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2629,7 +2839,7 @@ msgid "" " %c locale's date and time (e.g., Thu Mar 3 23:05:25 2005)\n" msgstr "" -#: src/date.c:167 +#: src/date.c:171 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2637,14 +2847,14 @@ msgid "" " %e day of month, space padded; same as %_d\n" msgstr "" -#: src/date.c:173 +#: src/date.c:177 msgid "" " %F full date; same as %Y-%m-%d\n" " %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 "" -#: src/date.c:178 +#: src/date.c:182 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2652,7 +2862,7 @@ msgid "" " %j day of year (001..366)\n" msgstr "" -#: src/date.c:184 +#: src/date.c:188 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -2660,7 +2870,7 @@ msgid "" " %M minute (00..59)\n" msgstr "" -#: src/date.c:190 +#: src/date.c:194 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2671,7 +2881,7 @@ msgid "" " %s seconds since 1970-01-01 00:00:00 UTC\n" msgstr "" -#: src/date.c:199 +#: src/date.c:203 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2679,7 +2889,7 @@ msgid "" " %u day of week (1..7); 1 is Monday\n" msgstr "" -#: src/date.c:205 +#: src/date.c:209 msgid "" " %U week number of year, with Sunday as first day of week (00..53)\n" " %V ISO week number, with Monday as first day of week (01..53)\n" @@ -2687,7 +2897,7 @@ msgid "" " %W week number of year, with Monday as first day of week (00..53)\n" msgstr "" -#: src/date.c:211 +#: src/date.c:215 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -2695,7 +2905,7 @@ msgid "" " %Y year\n" msgstr "" -#: src/date.c:217 +#: src/date.c:221 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -2707,7 +2917,7 @@ msgid "" "By default, date pads numeric fields with zeroes.\n" msgstr "" -#: src/date.c:226 +#: src/date.c:230 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -2718,7 +2928,7 @@ msgid "" " # use opposite case if possible\n" msgstr "" -#: src/date.c:235 +#: src/date.c:239 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -2727,7 +2937,7 @@ msgid "" "O to use the locale's alternate numeric symbols if available.\n" msgstr "" -#: src/date.c:242 +#: src/date.c:246 msgid "" "\n" "Examples:\n" @@ -2741,35 +2951,35 @@ msgid "" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:275 src/dd.c:2193 src/head.c:838 src/md5sum.c:477 -#: src/md5sum.c:798 src/od.c:863 src/od.c:1914 src/pr.c:1176 src/pr.c:1372 -#: src/pr.c:1494 src/stty.c:842 src/tac.c:563 src/tail.c:343 src/tee.c:126 +#: 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 #, c-format msgid "standard input" msgstr "ĉefenigujo" -#: src/date.c:303 src/date.c:523 +#: src/date.c:307 src/date.c:527 #, c-format msgid "invalid date %s" msgstr "nevalida dato %s" -#: src/date.c:414 src/date.c:448 +#: src/date.c:418 src/date.c:452 #, c-format msgid "multiple output formats specified" msgstr "pluraj eligaj aranĝoj indikatas" -#: src/date.c:426 +#: src/date.c:430 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "nekombineblas la diversaj opcioj por indiki eligotaj datoj" -#: src/date.c:433 +#: src/date.c:437 #, c-format msgid "the options to print and set the time may not be used together" msgstr "nekombineblas la opcioj por eligi kaj por agordi tempon" -#: src/date.c:454 +#: src/date.c:458 #, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -2780,23 +2990,23 @@ msgstr "" "kiam opcio por indiki dato(j)n uzatas, iu ajn neopcia\n" "argumento devas esti aranĝa ĉeno kiu komencas per '+'" -#: src/date.c:531 +#: src/date.c:535 #, c-format msgid "cannot set date" msgstr "ne eblas agordi daton" -#: src/date.c:554 src/du.c:360 +#: src/date.c:558 src/du.c:371 #, c-format msgid "time %s is out of range" -msgstr "tempo %s estas ekster intervalo" +msgstr "tempo %s estas ekster gamo" #. This is a proper name. See the gettext manual, section Names. -#: src/dd.c:44 src/factor.c:43 src/rm.c:41 src/tail.c:69 src/touch.c:41 +#: 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 "Paŭl RUBIN (Paul Rubin)" -#: src/dd.c:517 +#: src/dd.c:521 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -2805,7 +3015,7 @@ msgstr "" "Uzmaniero: %s [ARGUMENTO...]\n" " aŭ: %s OPCIO\n" -#: src/dd.c:522 +#: src/dd.c:526 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -2816,7 +3026,7 @@ msgid "" " ibs=BYTES read up to BYTES bytes at a time (default: 512)\n" msgstr "" -#: src/dd.c:531 +#: src/dd.c:535 msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -2825,13 +3035,14 @@ msgid "" " oflag=FLAGS write as per the comma separated symbol list\n" " seek=N skip N obs-sized blocks at start of output\n" " skip=N skip N ibs-sized blocks at start of input\n" -" status=noxfer suppress transfer statistics\n" +" status=WHICH WHICH info to suppress outputting to stderr;\n" +" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" msgstr "" -#: src/dd.c:541 +#: src/dd.c:546 msgid "" "\n" -"BLOCKS and BYTES may be followed by the following multiplicative suffixes:\n" +"N and BYTES may be followed by the following multiplicative suffixes:\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, and so on for T, P, E, Z, Y.\n" "\n" @@ -2839,7 +3050,7 @@ msgid "" "\n" msgstr "" -#: src/dd.c:550 +#: src/dd.c:555 msgid "" " ascii from EBCDIC to ASCII\n" " ebcdic from ASCII to EBCDIC\n" @@ -2854,7 +3065,7 @@ msgid "" " with block or unblock, pad with spaces rather than NULs\n" msgstr "" -#: src/dd.c:563 +#: src/dd.c:568 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -2864,7 +3075,7 @@ msgid "" " fsync likewise, but also write metadata\n" msgstr "" -#: src/dd.c:571 +#: src/dd.c:576 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -2873,75 +3084,75 @@ msgid "" "suggested)\n" msgstr "" -#: src/dd.c:578 +#: src/dd.c:583 msgid " cio use concurrent I/O for data\n" msgstr "" -#: src/dd.c:580 +#: src/dd.c:585 msgid " direct use direct I/O for data\n" msgstr "" -#: src/dd.c:582 +#: src/dd.c:587 msgid " directory fail unless a directory\n" msgstr "" -#: src/dd.c:584 +#: src/dd.c:589 msgid " dsync use synchronized I/O for data\n" msgstr "" -#: src/dd.c:586 +#: src/dd.c:591 msgid " sync likewise, but also for metadata\n" msgstr "" -#: src/dd.c:587 +#: src/dd.c:592 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr "" -#: src/dd.c:590 +#: src/dd.c:595 msgid " nonblock use non-blocking I/O\n" msgstr "" -#: src/dd.c:592 +#: src/dd.c:597 msgid " noatime do not update access time\n" msgstr "" -#: src/dd.c:595 +#: src/dd.c:600 msgid " nocache discard cached data\n" msgstr "" -#: src/dd.c:598 +#: src/dd.c:603 msgid " noctty do not assign controlling terminal from file\n" msgstr "" -#: src/dd.c:601 +#: src/dd.c:606 msgid " nofollow do not follow symlinks\n" msgstr "" -#: src/dd.c:603 +#: src/dd.c:608 msgid " nolinks fail if multiply-linked\n" msgstr "" -#: src/dd.c:605 +#: src/dd.c:610 msgid " binary use binary I/O for data\n" msgstr "" -#: src/dd.c:607 +#: src/dd.c:612 msgid " text use text I/O for data\n" msgstr "" -#: src/dd.c:609 +#: src/dd.c:614 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:612 +#: src/dd.c:617 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:615 +#: src/dd.c:620 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:620 +#: src/dd.c:625 #, c-format msgid "" "\n" @@ -2958,7 +3169,7 @@ msgid "" "\n" msgstr "" -#: src/dd.c:676 +#: src/dd.c:683 #, c-format msgid "" "%<PRIuMAX>+%<PRIuMAX> records in\n" @@ -2967,21 +3178,21 @@ msgstr "" "%<PRIuMAX>+%<PRIuMAX> rikordo eniĝis\n" "%<PRIuMAX>+%<PRIuMAX> rikordoj eliĝis\n" -#: src/dd.c:682 +#: src/dd.c:689 #, 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:694 +#: src/dd.c:701 #, 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:712 +#: src/dd.c:720 msgid "Infinity B" msgstr "senfino" @@ -2995,155 +3206,155 @@ 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:725 +#: src/dd.c:733 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g s, %s/s\n" -#: src/dd.c:804 +#: src/dd.c:812 #, c-format msgid "closing input file %s" msgstr "fermiĝas eniga dosiero %s" -#: src/dd.c:811 +#: src/dd.c:819 #, c-format msgid "closing output file %s" msgstr "fermiĝas eliga dosiero %s" -#: src/dd.c:1014 +#: src/dd.c:1022 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "malsukcesis malŝalti O_DIRECT: %s" -#: src/dd.c:1085 src/dd.c:1934 +#: src/dd.c:1093 src/dd.c:1942 #, c-format msgid "writing to %s" msgstr "skribiĝas al %s" -#: src/dd.c:1199 src/dd.c:1253 +#: src/dd.c:1207 src/dd.c:1261 #, c-format msgid "unrecognized operand %s" msgstr "ne rekonatas argumento %s" -#: src/dd.c:1210 +#: src/dd.c:1218 msgid "invalid conversion" msgstr "nevalida konverto" -#: src/dd.c:1213 src/dd.c:1289 +#: src/dd.c:1221 src/dd.c:1297 msgid "invalid input flag" msgstr "nevalida enigflago" -#: src/dd.c:1216 src/dd.c:1283 src/dd.c:1295 +#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303 msgid "invalid output flag" msgstr "nevalida eligflago" -#: src/dd.c:1219 +#: src/dd.c:1227 msgid "invalid status flag" msgstr "nevalida statflago" -#: src/dd.c:1258 src/truncate.c:312 +#: src/dd.c:1266 src/truncate.c:310 #, c-format msgid "invalid number %s" msgstr "nevalida numero %s" -#: src/dd.c:1340 +#: src/dd.c:1348 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "ne eblas kombini iujn ajn el {ascii,ebcdic,ibm}" -#: src/dd.c:1342 +#: src/dd.c:1350 #, c-format msgid "cannot combine block and unblock" msgstr "ne eblas kombini 'block' kaj 'unblock'" -#: src/dd.c:1344 +#: src/dd.c:1352 #, c-format msgid "cannot combine lcase and ucase" msgstr "ne eblas kombini 'lcase' kaj 'ucase'" -#: src/dd.c:1346 +#: src/dd.c:1354 #, c-format msgid "cannot combine excl and nocreat" msgstr "ne eblas kombini 'excl' kaj 'nocreat'" -#: src/dd.c:1349 +#: src/dd.c:1357 #, c-format msgid "cannot combine direct and nocache" msgstr "ne eblas kombini 'direct' kaj 'nocache'" -#: src/dd.c:1506 +#: src/dd.c:1514 #, 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:1593 +#: src/dd.c:1601 #, c-format msgid "%s: cannot skip" msgstr "%s: ne eblas transsalti" -#: src/dd.c:1595 src/dd.c:1614 src/dd.c:1675 +#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683 #, c-format msgid "%s: cannot seek" msgstr "%s: 'seek' ne eblas" -#: src/dd.c:1655 +#: src/dd.c:1663 #, c-format msgid "offset overflow while reading file %s" msgstr "pozicio trograndiĝis dum legado de dosiero %s" -#: src/dd.c:1667 +#: src/dd.c:1675 #, c-format msgid "warning: invalid file offset after failed read" msgstr "averto: nevalida dosiera pozicio post malsukcesa lego" -#: src/dd.c:1671 +#: src/dd.c:1679 #, c-format msgid "cannot work around kernel bug after all" msgstr "tamen rezultas ke maleblas preterpasi kern-eraron" -#: src/dd.c:1814 +#: src/dd.c:1822 #, c-format msgid "setting flags for %s" msgstr "agordiĝas flagoj pri %s" -#: src/dd.c:1867 +#: 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:1881 +#: 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:1914 +#: src/dd.c:1922 #, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: ne eblas salti al indikata pozicio" -#: src/dd.c:2125 src/dd.c:2258 -#, c-format -msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" +#: src/dd.c:2133 +#, fuzzy, c-format +msgid "failed to truncate to %<PRIdMAX> bytes in output file %s" msgstr "malsukcesis trunki al %<PRIuMAX> bajtoj en eliga dosiero %s" -#: src/dd.c:2138 +#: src/dd.c:2146 #, c-format msgid "fdatasync failed for %s" msgstr "malsukcesis 'fdatasync' por %s" -#: src/dd.c:2148 +#: src/dd.c:2156 #, c-format msgid "fsync failed for %s" msgstr "malsukcesis 'fsync' por %s" -#: src/dd.c:2199 src/dd.c:2228 +#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165 #, c-format -msgid "opening %s" -msgstr "malfermiĝas %s" +msgid "failed to open %s" +msgstr "malsukcesis malfermi %s" -#: src/dd.c:2237 +#: src/dd.c:2246 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) " @@ -3152,84 +3363,106 @@ msgstr "" "pozicio estas tro granda: ne eblas trunki al longeco de seek=%<PRIuMAX> (%lu-" "bajtaj) blokoj" -#: src/dd.c:2274 src/dd.c:2280 +#: src/dd.c:2267 +#, 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 #, 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:54 src/expr.c:153 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:39 src/sleep.c:35 src/sort.c:66 +#: 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 msgid "Paul Eggert" msgstr "Paŭl EGERT (Paul Eggert)" -#: src/df.c:140 +#: src/df.c:172 msgid "Filesystem" msgstr "Dosiersistemo" -#: src/df.c:141 +#: src/df.c:175 msgid "Type" msgstr "Tipo" -#: src/df.c:142 +#: src/df.c:178 src/df.c:542 msgid "blocks" msgstr "blokoj" -#: src/df.c:142 -msgid "Inodes" -msgstr "I-nodoj" - -#: src/df.c:142 -msgid "Size" -msgstr "Grando" - -#: src/df.c:143 +#: src/df.c:181 msgid "Used" msgstr "Uzata" -#: src/df.c:143 -msgid "IUsed" -msgstr "I-uzata" - -#: src/df.c:144 +#: src/df.c:184 msgid "Available" msgstr "Liberaj" -#: src/df.c:144 -msgid "IFree" -msgstr "I-lbr" - -#: src/df.c:144 -msgid "Avail" -msgstr "Liber" - -#: src/df.c:145 +#: src/df.c:187 msgid "Use%" msgstr "Uza%" -#: src/df.c:145 +#: src/df.c:190 +msgid "Inodes" +msgstr "I-nodoj" + +#: src/df.c:193 +msgid "IUsed" +msgstr "I-uzata" + +#: src/df.c:196 +msgid "IFree" +msgstr "I-lbr" + +#: src/df.c:199 msgid "IUse%" msgstr "Iuza%" -#: src/df.c:145 +#: src/df.c:202 +msgid "Mounted on" +msgstr "Metita sur" + +#: src/df.c:383 +#, c-format +msgid "option --output: field '%s' unknown" +msgstr "" + +#: 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:410 src/df.c:449 +msgid "Size" +msgstr "Grando" + +#: src/df.c:414 src/df.c:451 +msgid "Avail" +msgstr "Liber" + +#: src/df.c:474 msgid "Capacity" msgstr "Kapacito" -#: src/df.c:146 -msgid "Mounted on" -msgstr "Metita sur" +#. 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 +#, c-format +msgid "%s-%s" +msgstr "" -#: src/df.c:847 +#: src/df.c:1210 +#, fuzzy msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" -"\n" msgstr "" "Montras informon pri dosiersistemo en kiu loĝas ĉiu indikata DOSIERO,\n" "aŭ defaŭlte pri ĉiuj dosiersistemoj.\n" "\n" -#: src/df.c:855 +#: src/df.c:1217 msgid "" " -a, --all include dummy file systems\n" " -B, --block-size=SIZE scale sizes by SIZE before printing them. E.g.,\n" @@ -3240,8 +3473,16 @@ msgid "" "2G)\n" " -H, --si likewise, but use powers of 1000 not 1024\n" msgstr "" +" -a, --all inkluzivi virtualajn dosiersistemojn\n" +" -B, --block-size=NOMBRO skali grandojn per NOMBRO antaŭ eligi ilin;\n" +" '-BM' ekzemple elmetas grandojn en unuoj de\n" +" 1048576 bajtoj; vidu ankaŭ sube\n" +" --total eligi grandan totalon\n" +" -h, --human-readable eligi grandojn en homlegebla aranĝo (ekzemple: 1K " +"234M)\n" +" -H, --si same, sed uzi potencojn de 1000 anstataŭ de 1024\n" -#: src/df.c:865 +#: src/df.c:1227 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3249,9 +3490,19 @@ msgid "" " --no-sync do not invoke sync before getting usage info " "(default)\n" msgstr "" +" -i, --inodes listigi informon pri indeksnodoj anstataŭ pri " +"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 " +"(defaŭlto)\n" -#: src/df.c:872 +#: src/df.c:1234 +#, fuzzy msgid "" +" --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" +" or print all fields if FIELD_LIST is " +"omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" " -t, --type=TYPE limit listing to file systems of type TYPE\n" @@ -3259,21 +3510,48 @@ msgid "" " -x, --exclude-type=TYPE limit listing to file systems not of type TYPE\n" " -v (ignored)\n" msgstr "" +" -P, --portability uzi la POSIX-an eligan aranĝon\n" +" --sync voki 'sync' antaŭ havigo de uzadinformo\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 +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" +msgstr "" + +#: src/df.c:1285 +#, fuzzy, c-format +msgid "options %s and %s are mutually exclusive" +msgstr "nekombineblas opcioj '--compare' (-C) kaj '--strip'" + +#: 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:1027 +#: src/df.c:1442 #, c-format msgid "file system type %s both selected and excluded" msgstr "dosiersistema tipo %s estas ambaŭ elektita kaj ekskluzivita" -#: src/df.c:1075 +#: src/df.c:1500 msgid "Warning: " msgstr "Averto: " -#: src/df.c:1077 src/stat.c:795 +#: src/df.c:1502 src/stat.c:814 msgid "cannot read table of mounted file systems" msgstr "ne eblas legi tabelon de surmetitaj dosiersistemoj" -#: src/df.c:1107 +#: src/df.c:1539 #, c-format msgid "no file systems processed" msgstr "neniu dosiersistemo pritraktatas" @@ -3297,6 +3575,12 @@ msgid "" " -c, --csh, --c-shell output C shell code to set LS_COLORS\n" " -p, --print-database output defaults\n" msgstr "" +"Eligas komandojn por agordi la ĉirkaŭaĵan variablon 'LS_COLORS'.\n" +"\n" +" -b, --sh, --bourne-shell eligi Bourne-ŝelan kodon por starigi " +"'LS_COLORS'\n" +" -c, --csh, --c-shell eligi C-ŝelan kodon por starigi 'LS_COLORS'\n" +" -p, --print-database eligi la defaŭltojn\n" #: src/dircolors.c:108 msgid "" @@ -3305,6 +3589,11 @@ 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" +"Se DOSIERO indikatas, ĝi legiĝas por decidi kiujn kolorojn uzi por kiuj\n" +"dosiertipoj kaj dosierfinaĵoj. Alie, antaŭkompilita datumbazo uzatas.\n" +"Por detaloj pri la aranĝo de tiuj dosieroj, lanĉu 'dircolors --print-" +"database'.\n" #: src/dircolors.c:286 #, c-format @@ -3326,6 +3615,8 @@ msgid "" "the options to output dircolors' internal database and\n" "to select a shell syntax are mutually exclusive" msgstr "" +"nekombineblas la opcio por eligi la internan datumbazon kun\n" +"iu opcio kiu elektas ŝelan sintakson" #: src/dircolors.c:450 msgid "file operands cannot be combined with --print-database (-p)" @@ -3335,6 +3626,7 @@ msgstr "nekombineblas dosieraj argumentoj kun opcio '--print-database' (-p)" #, c-format msgid "no SHELL environment variable, and no shell type option given" msgstr "" +"ĉirkaŭaĵa variablo SHELL ne ekzistas, kaj neniu ŝelsintaksa opcio indikatas" #: src/dirname.c:50 #, c-format @@ -3371,7 +3663,7 @@ msgstr "" " %s ujo1/ĉeno ujo2/ĉeno -> «ujo1» kaj poste «ujo2»\n" " %s stdio.h -> «.».\n" -#: src/du.c:260 src/sort.c:390 src/wc.c:112 +#: src/du.c:270 src/sort.c:394 src/wc.c:112 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3380,16 +3672,17 @@ msgstr "" "Uzmaniero: %s [OPCIO...] [DOSIERO...]\n" " aŭ: %s [OPCIO...] --files0-from=LISTDOSIERO\n" -#: src/du.c:264 -msgid "" -"Summarize disk usage of each FILE, recursively for directories.\n" -"\n" +#: src/du.c:274 +#, fuzzy +msgid "Summarize disk usage of each FILE, recursively for directories.\n" msgstr "" -"Resumas uzon de disko por ĉiu indikata DOSIERO; rekursie por dosierujoj.\n" +"Resumas uzon de disko por ĉiu indikata DOSIERO; rikure por dosierujoj.\n" "\n" -#: src/du.c:271 +#: src/du.c:280 msgid "" +" -0, --null end each output line with 0 byte rather than " +"newline\n" " -a, --all write counts for all files, not just directories\n" " --apparent-size print apparent sizes, rather than disk usage; " "although\n" @@ -3398,7 +3691,7 @@ msgid "" " fragmentation, indirect blocks, and the like\n" msgstr "" -#: src/du.c:279 +#: src/du.c:289 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" @@ -3407,9 +3700,15 @@ msgid "" " -c, --total produce a grand total\n" " -D, --dereference-args dereference only symlinks that are listed on the\n" " command line\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 "" -#: src/du.c:288 +#: src/du.c:302 +#, fuzzy msgid "" " --files0-from=F summarize disk usage of the NUL-terminated file\n" " names specified in file F;\n" @@ -3417,41 +3716,35 @@ msgid "" " -H equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" --si like -h, but use powers of 1000 not 1024\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:297 +#: src/du.c:310 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 "" -#: src/du.c:302 +#: src/du.c:316 msgid "" -" -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " "default)\n" -" -0, --null end each output line with 0 byte rather than " -"newline\n" " -S, --separate-dirs 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:309 -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 "" - -#: src/du.c:318 +#: src/du.c:322 msgid "" +" -t, --threshold=SIZE exclude entries smaller than SIZE if positive,\n" +" or entries greater than SIZE if negative\n" " --time show time of the last modification of any file in " "the\n" " directory, or any of its subdirectories\n" @@ -3462,64 +3755,72 @@ msgid "" " FORMAT is interpreted like 'date'\n" msgstr "" -#: src/du.c:375 -#, fuzzy +#: src/du.c:333 +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 msgid "Infinity" msgstr "senfino" -#: src/du.c:600 +#: src/du.c:507 +#, fuzzy, c-format +msgid "mount point %s already traversed" +msgstr "muntloko %s jam traktiĝis" + +#: src/du.c:624 #, c-format msgid "fts_read failed: %s" msgstr "malsukcesis 'fts_read()': %s" -#: src/du.c:724 +#: src/du.c:780 #, c-format msgid "invalid maximum depth %s" msgstr "nevalida maksimuma profundo %s" -#: src/du.c:817 +#: src/du.c:809 +#, fuzzy, c-format +msgid "invalid --threshold argument '-0'" +msgstr "nevalida argumento por opcio '--%s': %s" + +#: src/du.c:887 #, c-format msgid "cannot both summarize and show all entries" msgstr "ne eblas ambaŭ resumi kaj montri ĉiujn elementojn" -#: src/du.c:824 +#: src/du.c:894 #, 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:830 +#: src/du.c:900 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "averto: resumi konfliktas kun opcio «--max-depth=%lu»" -#: src/du.c:896 src/sort.c:4479 src/wc.c:668 +#: src/du.c:966 src/sort.c:4533 src/wc.c:668 msgid "file operands cannot be combined with --files0-from" msgstr "nekombineblas dosieraj argumentoj kun opcio «--files0-from»" -#: src/du.c:949 src/md5sum.c:587 src/od.c:903 src/tac.c:239 src/tac.c:350 -#: src/tac.c:506 src/tac.c:586 src/wc.c:733 +#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 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:963 src/sort.c:4508 src/wc.c:747 +#: src/du.c:1040 src/sort.c:4562 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:980 src/du.c:988 src/wc.c:760 src/wc.c:768 +#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768 msgid "invalid zero-length file name" msgstr "nevalida dosiernomo (longo nulas)" -#: src/du.c:1007 src/head.c:149 src/head.c:262 src/head.c:334 src/head.c:538 -#: src/head.c:620 src/head.c:692 src/head.c:750 src/head.c:774 src/tail.c:412 -#: src/tail.c:500 src/tail.c:549 src/tail.c:642 src/tail.c:770 src/tail.c:818 -#: src/tail.c:855 src/tail.c:1782 src/tail.c:1812 src/uniq.c:395 -#, c-format -msgid "error reading %s" -msgstr "eraro dum legado de %s" - -#: src/du.c:1010 src/ls.c:2649 src/wc.c:791 +#: src/du.c:1088 src/ls.c:2649 src/wc.c:791 msgid "total" msgstr "totalo" @@ -3548,18 +3849,27 @@ msgid "" "\n" " -n do not output the trailing newline\n" msgstr "" +"Eligi la indikata(j)n ĈENO(j)n al ĉefeligujo.\n" +"\n" +" -n ne eligi la finan linifinon\n" #: src/echo.c:51 msgid "" " -e enable interpretation of backslash escapes (default)\n" " -E disable interpretation of backslash escapes\n" msgstr "" +" -e ebligi interpretadon de malsuprenstrekaj eskapoj " +"(defaŭlto)\n" +" -E malebligi interpretadon de malsuprenstrekaj eskapoj\n" #: src/echo.c:54 msgid "" " -e enable interpretation of backslash escapes\n" " -E disable interpretation of backslash escapes (default)\n" msgstr "" +" -e ebligi interpretadon de malsuprenstrekaj eskapoj\n" +" -E malebligi interpretadon de malsuprenstrekaj eskapoj " +"(defaŭlto)\n" #: src/echo.c:60 msgid "" @@ -3567,6 +3877,9 @@ msgid "" "If -e is in effect, the following sequences are recognized:\n" "\n" msgstr "" +"\n" +"Se opcio '-e' efikas, la subaj eskapsekvencoj rekoniĝas:\n" +"\n" #: src/echo.c:65 src/printf.c:105 msgid "" @@ -3581,12 +3894,24 @@ msgid "" " \\t horizontal tab\n" " \\v vertical tab\n" msgstr "" +" \\\\ malsuprenstreko\n" +" \\a pepo (BEL)\n" +" \\b retropaŝo\n" +" \\c produkti nenian plian eligon\n" +" \\e eskapo\n" +" \\f paĝavanco\n" +" \\n liniavanco\n" +" \\r ĉaretreiro\n" +" \\t horizontala tabo\n" +" \\v vertikala tabo\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 bajto kun okuma valoro NNN (1 ĝis 3 ciferoj)\n" +" \\xHH bajto kun deksesuma valoro HH (1 aŭ 2 ciferoj)\n" #. This is a proper name. See the gettext manual, section Names. #: src/env.c:32 src/printenv.c:45 src/whoami.c:35 @@ -3600,76 +3925,89 @@ msgstr "" "Uzmaniero: %s [OPCIO...] [-] [NOMO=VALORO]... [KOMANDO [ARGUMENTO...]]\n" #: src/env.c:55 +msgid "Set each NAME to VALUE in the environment and run COMMAND.\n" +msgstr "" + +#: src/env.c:61 +#, fuzzy msgid "" -"Set each NAME to VALUE in the environment and run COMMAND.\n" -"\n" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with 0 byte rather than 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" +" -u, --unset=NOMO forigi variablon de la ĉirkaŭaĵo\n" -#: src/env.c:64 +#: src/env.c:68 msgid "" "\n" "A mere - implies -i. If no COMMAND, print the resulting environment.\n" msgstr "" +"\n" +"Nura «-» signifas «-i». Sen iu KOMANDO, eligi la rezultan ĉirkaŭaĵon.\n" -#: src/env.c:120 +#: src/env.c:124 #, c-format msgid "cannot unset %s" msgstr "ne eblas malestigi %s" -#: src/env.c:131 +#: src/env.c:135 #, c-format msgid "cannot set %s" msgstr "ne eblas estigi %s" -#: src/env.c:148 +#: src/env.c:152 #, c-format 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" -"\n" msgstr "" "Konvertas tabojn en ĉiu DOSIERO al spacetoj, skribante al ĉefeligujo.\n" "Sen DOSIERO, aŭ kiam DOSIERO estas «-», ĉefenigujo legiĝas.\n" -#: src/expand.c:115 +#: src/expand.c:114 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 ne konverti tabojn post ne-blankspacoj\n" +" -t, --tabs=NOMBRO meti tabojn dise je NOMBRO anstataŭ 8 pozicioj\n" -#: src/expand.c:119 +#: src/expand.c:118 msgid "" " -t, --tabs=LIST use comma separated list of explicit tab positions\n" -msgstr "" +msgstr " -t, --tabs=LISTO uzi komadisigatan LISTOn de tabpozicioj\n" -#: src/expand.c:172 src/unexpand.c:191 +#: src/expand.c:171 src/unexpand.c:190 #, c-format msgid "tab stop is too large %s" msgstr "taba pozicio %s estas tro granda" -#: src/expand.c:180 src/unexpand.c:199 +#: src/expand.c:179 src/unexpand.c:198 #, c-format msgid "tab size contains invalid character(s): %s" msgstr "taba pozicio enhavas nevalida(j)n signo(j)n: %s" -#: src/expand.c:206 src/unexpand.c:225 +#: src/expand.c:205 src/unexpand.c:224 #, c-format msgid "tab size cannot be 0" msgstr "taba pozicio ne povas esti nulo" -#: src/expand.c:208 src/unexpand.c:227 +#: src/expand.c:207 src/unexpand.c:226 #, c-format msgid "tab sizes must be ascending" msgstr "tabaj pozicioj devas kreski" -#: src/expand.c:326 src/expand.c:345 src/unexpand.c:374 src/unexpand.c:419 +#: 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" @@ -3703,6 +4041,15 @@ msgid "" "\n" " ARG1 & ARG2 ARG1 if neither argument is null or 0, otherwise 0\n" msgstr "" +"\n" +"Eligas la valoron de ESPRIMO al ĉefeligujo.\n" +"\n" +"(Sube vaka linio disigas kreskantajn antaŭecajn grupojn.)\n" +"ESPRIMO povas esti:\n" +"\n" +" ARG1 | ARG2 ARG1 se ĝi estas nek vaka nek nulo, alie ARG2\n" +"\n" +" ARG1 & ARG2 ARG1 se nek ARG1 kaj ARG2 estas vaka aŭ nulo, alie nulo\n" #: src/expr.c:220 msgid "" @@ -3714,6 +4061,13 @@ 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 estas malpli ol ARG2\n" +" ARG1 <= ARG2 ARG1 estas malpli aŭ egalas al ARG2\n" +" ARG1 = ARG2 ARG1 egalas al ARG2\n" +" ARG1 != ARG2 ARG1 ne egalas al ARG2\n" +" ARG1 >= ARG2 ARG1 estas pli ol aŭ egalas al ARG2\n" +" ARG1 > ARG2 ARG1 estas pli ol ARG2\n" #: src/expr.c:229 msgid "" @@ -3721,6 +4075,9 @@ msgid "" " ARG1 + ARG2 arithmetic sum of ARG1 and ARG2\n" " ARG1 - ARG2 arithmetic difference of ARG1 and ARG2\n" msgstr "" +"\n" +" ARG1 + ARG2 aritmetika sumo de ARG1 kaj ARG2\n" +" ARG1 - ARG2 aritmetika diferenco de ARG1 kaj ARG2\n" #: src/expr.c:236 #, no-c-format @@ -3730,6 +4087,10 @@ 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 aritmetika produkto de ARG1 kaj ARG2\n" +" ARG1 / ARG2 aritmetika kvociento de ARG1 dividita per ARG2\n" +" ARG1 % ARG2 aritmetika resto de ARG1 dividita per ARG2\n" #: src/expr.c:242 msgid "" @@ -3741,6 +4102,15 @@ msgid "" " index STRING CHARS index in STRING where any CHARS is found, or 0\n" " length STRING length of STRING\n" msgstr "" +"\n" +" ĈENO : REGULESPRIMO ankrita ŝablona kongruo de REGULESPRIMO en " +"ĈENO\n" +"\n" +" match ĈENO REGULESPRIMO same kiel 'ĈENO : REGULESPRIMO'\n" +" substr ĈENO POZICIO LONGO subĉeno de ĈENO (POZICIO nombriĝas ekde 1)\n" +" index ĈENO SIGNOJ pozicio en ĈENO kie ĉi tiuj SIGNOJ troviĝas, " +"alie 0\n" +" length ĈENO longo de ĈENO\n" #: src/expr.c:251 msgid "" @@ -3749,6 +4119,11 @@ msgid "" "\n" " ( EXPRESSION ) value of EXPRESSION\n" msgstr "" +" + ĴETONO interpreti ĴETONOn kiel ĉeno, eĉ se ĝi estas\n" +" ŝlosilvorto kiel 'match' aŭ operacio kiel " +"'/'\n" +"\n" +" ( ESPRIMO ) valoro de ESPRIMO\n" #: src/expr.c:257 msgid "" @@ -3774,6 +4149,9 @@ msgid "" "null\n" "or 0, 2 if EXPRESSION is syntactically invalid, and 3 if an error occurred.\n" msgstr "" +"\n" +"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 #, c-format @@ -3790,12 +4168,12 @@ msgstr "eraro en regulesprima serĉo" msgid "non-integer argument" msgstr "argumento estas ne-entjera" -#: src/expr.c:793 src/truncate.c:316 +#: src/expr.c:793 src/truncate.c:314 #, c-format msgid "division by zero" msgstr "divido per nulo" -#: src/expr.c:887 src/sort.c:2029 +#: src/expr.c:887 src/sort.c:2044 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "Agordu LC_ALL='C' por eviti la problemon." @@ -3805,25 +4183,32 @@ msgstr "Agordu LC_ALL='C' por eviti la problemon." msgid "the strings compared were %s and %s" msgstr "la komparitaj ĉenoj estis %s kaj %s" -#: src/factor.c:449 -msgid "using arbitrary-precision arithmetic" -msgstr "uziĝas aritmetiko de arbitra precizeco" +#. This is a proper name. See the gettext manual, section Names. +#: src/factor.c:111 +msgid "Niels Moller" +msgstr "Nils MOLER (Niels Moller)" -#: src/factor.c:460 -msgid "using single-precision arithmetic" -msgstr "uziĝas aritmetiko de simpla precizeco" +#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459 +#, c-format +msgid "Lucas prime test failure. This should not happen" +msgstr "" -#: src/factor.c:465 src/od.c:1640 src/od.c:1709 +#: src/factor.c:2092 #, c-format -msgid "%s is too large" -msgstr "%s estas tro granda" +msgid "squfof queue overflow" +msgstr "troo en atendovico de «SQUFOF»" -#: src/factor.c:469 +#: src/factor.c:2419 #, c-format msgid "%s is not a valid positive integer" msgstr "%s ne estas valida pozitiva entjero" -#: src/factor.c:494 +#: src/factor.c:2442 src/od.c:1646 src/od.c:1715 +#, c-format +msgid "%s is too large" +msgstr "%s estas tro granda" + +#: src/factor.c:2454 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -3832,12 +4217,14 @@ msgstr "" "Uzmaniero: %s [ENTJERO...]\n" " aŭ: %s OPCIO\n" -#: src/factor.c:499 +#: src/factor.c:2459 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 "" +"Eligas la primajn faktorojn de ĉiu indikata ENTJERO. Se neniu\n" +"indikatas sur la komandlinio, ili legiĝas de ĉefenigujo.\n" #: src/find-mount-point.c:40 #, c-format @@ -3856,21 +4243,24 @@ msgid "cannot stat current directory (now %s)" msgstr "malsukcesis eltrovi statinformon pri aktuala dosierujo (nun %s)" #. This is a proper name. See the gettext manual, section Names. -#: src/fmt.c:37 +#: src/fmt.c:38 msgid "Ross Paterson" msgstr "Ros PETERSON (Ross Paterson)" -#: src/fmt.c:269 +#: src/fmt.c:270 #, c-format msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n" msgstr "Uzmaniero: %s [-LARĜO] [OPCIO...] [DOSIERO...]\n" -#: src/fmt.c:270 +#: 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" -"\n" msgstr "" +"Rearanĝas ĉiun paragrafon el la DOSIERO(j), skribante al ĉefeligujo.\n" +"La opcio '-CIFEROJ' estas mallongigo de '--width=CIFEROJ'.\n" +"\n" #: src/fmt.c:278 msgid "" @@ -3879,41 +4269,52 @@ msgid "" " reattaching the prefix to reformatted lines\n" " -s, --split-only split long lines, but do not refill\n" msgstr "" +" -c, --crown-margin konservi krommarĝenon de la unuaj du linioj\n" +" -p, --prefix=ĈENO rearanĝi nur liniojn kiuj komencas per ĈENO,\n" +" realdonante tiun prefikson al rearanĝitaj " +"linioj\n" +" -s, --split-only fendi longajn liniojn, sed ne rerektigi ilin\n" -#: src/fmt.c:285 -#, c-format +#: src/fmt.c:287 +#, 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 krommarĝeno de unua linio malsamas al tiu de " +"dua\n" +" -u, --uniform-spacing unu spaceto inter vortoj, du post frazoj\n" +" -w, --width=LARĜO maksimuma larĝo de linio (defaŭlto: 75 " +"kolumnoj)\n" +" -g, --goal=LARĜO cela larĝo (defaŭlto: 93% de maksimuma larĝo)\n" -#: src/fmt.c:357 +#: src/fmt.c:359 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" "option; use -w N instead" msgstr "" "nevalida opcio %c;\n" -"opcio '-WIDTH' nur rekonatas kiam ĝi esta la unua;\n" -"uzu '-w N' anstataŭe" +"opcio '-LARĜO' nur rekoniĝas kiam ĝi esta la unua;\n" +"alie uzu '-w LARĜO' anstataŭe" -#: src/fmt.c:403 src/fmt.c:414 +#: src/fmt.c:405 src/fmt.c:416 #, c-format 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" -"\n" msgstr "" "Faldas enigliniojn el ĉiu DOSIERO, skribante al ĉefeligujo.\n" "Sen DOSIERO, aŭ kiam DOSIERO estas «-», ĉefenigujo legiĝas.\n" -#: src/fold.c:78 +#: src/fold.c:77 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -3923,16 +4324,16 @@ msgstr "" " -s, --spaces faldi nur je spacetoj (kiam eblas)\n" " -w, --width=NOMBRO uzi ĉi tiun larĝon anstataŭ de 80\n" -#: src/fold.c:289 src/pr.c:836 +#: src/fold.c:288 src/pr.c:832 #, c-format 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:75 +#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 #: src/truncate.c:37 msgid "Padraig Brady" -msgstr "Padrejg BREJDI (Padraig Brady)" +msgstr "Padrejg BREJDI (Pádraig Brady)" #: src/getlimits.c:65 #, c-format @@ -3944,18 +4345,20 @@ msgid "" "Output platform dependent limits in a format useful for shell scripts.\n" "\n" msgstr "" +"Eligas platformdependajn limojn en aranĝo kiu utilas por ŝelskriptoj.\n" +"\n" -#: src/group-list.c:69 src/id.c:345 src/setuidgid.c:184 +#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184 #, 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:350 +#: src/group-list.c:74 src/id.c:370 #, c-format msgid "failed to get groups for the current process" msgstr "malsukcesis eltrovi grupojn por aktuala procezo" -#: src/group-list.c:104 +#: src/group-list.c:114 #, c-format msgid "cannot find name for group ID %lu" msgstr "ne eblas eltrovi nomon por grupa ID-o %lu" @@ -3996,14 +4399,19 @@ 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" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" +"Eligas la unuajn dek liniojn de ĉiu DOSIERO al ĉefeligujo.\n" +"\n" +"Kun pli ol unu DOSIERO, antaŭ ĉiu meti ĉapon kiu montras la dosiernomon.\n" +"Sen DOSIERO, aŭ kiam DOSIERO estas «-», ĉefenigujo legiĝas.\n" +"\n" -#: src/head.c:118 +#: src/head.c:117 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -4012,73 +4420,86 @@ msgid "" " with the leading '-', print all but the last\n" " K lines of each file\n" msgstr "" +" -c, --bytes=[-]NOMBRO eligi la unuajn NOMBRO bajtojn de ĉiu dosiero;\n" +" kun komenca «-», eligi ĉiujn bajtojn krom la\n" +" NOMBRO lastaj\n" +" -n, --lines=[-]NOMBRO eligi la unuajn NOMBRO liniojn anstataŭ unuajn " +"dek;\n" +" kun komenca «-», eligi ĉiujn liniojn krom la\n" +" NOMBRO lastaj\n" -#: src/head.c:126 +#: 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 neniam eligi ĉapojn kun dosiernomoj\n" +" -v, --verbose ĉiam eligi ĉapojn kun dosiernomoj\n" -#: src/head.c:132 +#: src/head.c:131 msgid "" "\n" "K 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" +"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" -#: src/head.c:152 -#, c-format -msgid "error writing %s" -msgstr "eraro dum skribado de %s" - -#: src/head.c:155 +#: src/head.c:154 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: dosiero ŝrumpis troe" -#: src/head.c:228 src/head.c:1044 +#: src/head.c:227 src/head.c:1051 #, c-format msgid "%s: number of bytes is too large" msgstr "%s: nombro de bajtoj tro grandas" -#: src/head.c:441 +#: 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:613 src/head.c:684 src/tail.c:450 +#: src/head.c:612 src/head.c:691 src/tail.c:449 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: ne eblas fari 'seek' al pozicio %s" -#: src/head.c:791 +#: src/head.c:673 +#, 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" -#: src/head.c:878 +#: src/head.c:885 #, 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:879 +#: src/head.c:886 msgid "number of lines" msgstr "nombro da linioj" -#: src/head.c:879 +#: src/head.c:886 msgid "number of bytes" msgstr "nombro da bajtoj" -#: src/head.c:886 src/tail.c:1947 +#: src/head.c:893 src/tail.c:1947 msgid "invalid number of lines" msgstr "nevalida nombro da linioj" -#: src/head.c:887 src/tail.c:1948 +#: src/head.c:894 src/tail.c:1948 msgid "invalid number of bytes" msgstr "nevalida nombro da bajtoj" -#: src/head.c:974 src/head.c:1032 +#: src/head.c:981 src/head.c:1039 #, c-format msgid "invalid trailing option -- %c" msgstr "nevalida opcio je la fino -- %c" @@ -4147,17 +4568,30 @@ msgid "" " -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" +"\n" +" -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" +" -G, --groups eligi ĉiujn grupajn ID-ojn\n" +" -n, --name eligi nomon anstataŭ nombron (kun '-ugG')\n" +" -r, --real eligi la veran ID anstataŭ la efektivan ID-on (kun '-" +"ugG')\n" +" -u, --user eligi nur la efektivan uzantan ID-on\n" #: src/id.c:96 msgid "" "\n" "Without any OPTION, print some useful set of identified information.\n" msgstr "" +"\n" +"Sen iu ajn OPCIO, eligi iun utilan aron de uzanta kaj grupa informo.\n" #: src/id.c:140 #, c-format msgid "--context (-Z) works only on an SELinux-enabled kernel" -msgstr "opcio '--context' (-Z) nur funkcias je SE-Linuksa kerno" +msgstr "opcio '--context' (-Z) nur funkcias kun SE-Linuksa kerno" #: src/id.c:175 #, c-format @@ -4184,86 +4618,86 @@ msgstr "ne eblas eltrovi kuntekston de procezo" msgid "cannot get effective UID" msgstr "malsukcesis eltrovi efektivan UID-on" -#: src/id.c:289 +#: src/id.c:311 #, c-format -msgid "cannot find name for user ID %lu" -msgstr "ne eblas eltrovi nomon por uzantnumero %lu" +msgid "cannot find name for user ID %s" +msgstr "ne eblas eltrovi nomon por uzantnumero %s" -#: src/id.c:309 +#: src/id.c:329 #, c-format -msgid "uid=%lu" -msgstr "UID=%lu" +msgid "uid=%s" +msgstr "UID=%s" -#: src/id.c:314 +#: src/id.c:334 #, c-format -msgid " gid=%lu" -msgstr " GID=%lu" +msgid " gid=%s" +msgstr " GID=%s" -#: src/id.c:321 +#: src/id.c:341 #, c-format -msgid " euid=%lu" -msgstr " EUID=%lu" +msgid " euid=%s" +msgstr " EUID=%s" -#: src/id.c:329 +#: src/id.c:349 #, c-format -msgid " egid=%lu" -msgstr " EGID=%lu" +msgid " egid=%s" +msgstr " EGID=%s" -#: src/id.c:357 +#: src/id.c:377 msgid " groups=" msgstr " grupoj=" -#: src/id.c:373 +#: src/id.c:393 #, c-format msgid " context=%s" msgstr " kunteksto=%s" -#: src/install.c:372 +#: src/install.c:373 #, c-format msgid "warning: %s: failed to change context to %s" msgstr "averto: %s: malsukcesis ŝanĝi kuntekston al %s" -#: src/install.c:413 +#: src/install.c:414 #, c-format msgid "creating directory %s" msgstr "kreiĝas dosierujo %s" -#: src/install.c:481 +#: src/install.c:482 #, c-format msgid "cannot change ownership of %s" msgstr "ne eblas ŝanĝi posedanton de %s" -#: src/install.c:505 +#: src/install.c:506 #, c-format msgid "cannot set time stamps for %s" msgstr "ne eblas agordi tempojn pri %s" -#: src/install.c:526 src/split.c:412 src/timeout.c:387 +#: src/install.c:527 src/split.c:426 src/timeout.c:439 #, c-format msgid "fork system call failed" msgstr "ne eblas krei novan procezon" -#: src/install.c:530 +#: src/install.c:531 #, c-format msgid "cannot run %s" msgstr "ne eblas ruli %s" -#: src/install.c:534 +#: src/install.c:535 #, c-format msgid "waiting for strip" msgstr "atendiĝas fino de 'strip'" -#: src/install.c:536 +#: src/install.c:537 #, c-format msgid "strip process terminated abnormally" msgstr "procezo 'strip' finiĝis nenormale" -#: src/install.c:557 +#: src/install.c:558 #, c-format msgid "invalid user %s" msgstr "nevalida uzanto: %s" -#: src/install.c:593 +#: src/install.c:594 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -4276,7 +4710,7 @@ msgstr "" " aŭ: %s [OPCIO...] -t DOSIERUJO ORIGINO...\n" " aŭ: %s [OPCIO...] -d DOSIERUJO...\n" -#: src/install.c:600 +#: src/install.c:601 msgid "" "\n" "This install program copies files (often just compiled) into destination\n" @@ -4288,7 +4722,6 @@ msgid "" "In the first three forms, copy SOURCE to DEST or multiple SOURCE(s) to\n" "the existing DIRECTORY, while setting permission modes and owner/group.\n" "In the 4th form, create all components of the given DIRECTORY(ies).\n" -"\n" msgstr "" #: src/install.c:615 @@ -4336,64 +4769,64 @@ msgid "" "directories\n" msgstr "" -#: src/install.c:858 +#: src/install.c:859 #, 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:868 +#: 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:885 +#: src/install.c:886 #, 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:888 +#: src/install.c:889 #, c-format msgid "target directory not allowed when installing a directory" msgstr "celdosierujo malpermesatas dum instalado al dosierujo" -#: src/install.c:892 +#: 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:946 src/mkdir.c:202 src/stdbuf.c:327 +#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326 #, c-format msgid "invalid mode %s" msgstr "nevalida moduso %s" -#: src/install.c:953 +#: src/install.c:954 #, c-format msgid "WARNING: ignoring --strip-program option as -s option was not specified" -msgstr "AVERTO: ignoriĝas '--strip-program' ĉar opcio '-s' ne specifiĝis" +msgstr "AVERTO: ignoriĝas '--strip-program' ĉar opcio '-s' ne indikatas" -#: src/install.c:958 +#: src/install.c:959 #, c-format msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive" msgstr "nekombineblas opcioj '--compare' (-C) kaj '--preserve-timestamps'" -#: src/install.c:965 +#: src/install.c:966 #, c-format msgid "options --compare (-C) and --strip are mutually exclusive" msgstr "nekombineblas opcioj '--compare' (-C) kaj '--strip'" -#: src/install.c:971 +#: src/install.c:972 #, c-format msgid "" "the --compare (-C) option is ignored when you specify a mode with non-" "permission bits" msgstr "" "opcio '--compare' (-C) ignoriĝas kiam indikatas moduso kiu enhavas " -"senpermesajn bitojn" +"nepermesajn bitojn" #. This is a proper name. See the gettext manual, section Names. -#: src/join.c:40 src/sort.c:65 +#: src/join.c:40 src/sort.c:66 msgid "Mike Haertel" msgstr "Majk HERTEL (Mike Haertel)" @@ -4448,8 +4881,8 @@ msgid "" msgstr "" #: src/join.c:403 -#, c-format -msgid "%s:%ju: is not sorted: %.*s" +#, fuzzy, c-format +msgid "%s:%<PRIuMAX>: is not sorted: %.*s" msgstr "%s:%ju: ne estas ordigita: %.*s" #: src/join.c:840 src/join.c:1038 @@ -4477,12 +4910,12 @@ msgstr "nekongruaj kunigkampoj %lu, %lu" msgid "conflicting empty-field replacement strings" msgstr "konfliktas la anstataŭigaj ĉenoj por vakaj kampoj" -#: src/join.c:1101 src/sort.c:4414 +#: src/join.c:1101 src/sort.c:4468 #, c-format msgid "multi-character tab %s" msgstr "plursigna tabo %s" -#: src/join.c:1105 src/sort.c:4419 +#: src/join.c:1105 src/sort.c:4473 #, c-format msgid "incompatible tabs" msgstr "nekongruaj taboj" @@ -4504,14 +4937,13 @@ msgstr "" " aŭ: %s -t [SIGNALO...]\n" #: src/kill.c:82 -msgid "" -"Send signals to processes, or list signals.\n" -"\n" +#, fuzzy +msgid "Send signals to processes, or list signals.\n" msgstr "" "Sendas signalojn al procezoj, aŭ eligas signalnomojn kaj -numerojn.\n" "\n" -#: src/kill.c:89 +#: src/kill.c:88 msgid "" " -s, --signal=SIGNAL, -SIGNAL\n" " specify the name or number of the signal to be sent\n" @@ -4525,7 +4957,7 @@ msgstr "" "numeroj)\n" " -t, --table montri tabelon de informoj pri signaloj\n" -#: src/kill.c:97 +#: src/kill.c:96 msgid "" "\n" "SIGNAL may be a signal name like 'HUP', or a signal number like '1',\n" @@ -4537,32 +4969,32 @@ msgstr "" "aŭ la elirstato de procezo kiu terminiĝis per signalo.\n" "PROCEZNUMERO estas entjero; se negativa, ĝi indikas procezgrupon.\n" -#: src/kill.c:206 +#: src/kill.c:205 #, c-format msgid "%s: invalid process id" msgstr "%s: nevalida indiko de procezo" -#: src/kill.c:260 +#: src/kill.c:259 #, c-format msgid "invalid option -- %c" msgstr "nevalida opcio -- %c" -#: src/kill.c:269 +#: src/kill.c:268 #, c-format msgid "%s: multiple signals specified" msgstr "%s: pluraj signaloj indikatas" -#: src/kill.c:283 +#: src/kill.c:282 #, c-format msgid "multiple -l or -t options specified" msgstr "pluraj opcioj '-l' aŭ '-t' indikatas" -#: src/kill.c:300 +#: src/kill.c:299 #, c-format msgid "cannot combine signal with -l or -t" msgstr "maleblas kombini signalon kun opcio '-l' aŭ '-t'" -#: src/kill.c:306 +#: src/kill.c:305 #, c-format msgid "no process ID specified" msgstr "neniu proceznumero indikatas" @@ -4666,10 +5098,9 @@ msgid "" "When creating hard links, each TARGET must exist. Symbolic links\n" "can hold arbitrary text; if later resolved, a relative link is\n" "interpreted in relation to its parent directory.\n" -"\n" msgstr "" -#: src/ln.c:395 +#: src/ln.c:394 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -4682,7 +5113,7 @@ msgid "" " -f, --force remove existing destination files\n" msgstr "" -#: src/ln.c:403 +#: src/ln.c:402 msgid "" " -i, --interactive prompt whether to remove destinations\n" " -L, --logical dereference TARGETs that are symbolic links\n" @@ -4694,7 +5125,7 @@ msgid "" " -s, --symbolic make symbolic links instead of hard links\n" msgstr "" -#: src/ln.c:412 +#: src/ln.c:411 msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" " -t, --target-directory=DIRECTORY specify the DIRECTORY in which to " @@ -4704,18 +5135,10 @@ msgid "" " -v, --verbose print name of each linked file\n" msgstr "" -#: src/ln.c:428 +#: src/ln.c:433 +#, fuzzy, c-format 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 "" - -#: src/ln.c:435 -#, c-format -msgid "" "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 "" @@ -4791,7 +5214,7 @@ msgstr "ignoriĝas nevalida larĝo (%s) en ĉirkaŭaĵa variablo COLUMNS" 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:1976 +#: src/ls.c:1750 src/ptx.c:1975 #, c-format msgid "invalid line width: %s" msgstr "nevalida linia larĝo: %s" @@ -4854,22 +5277,22 @@ msgstr "legiĝas dosierujo %s" msgid "closing directory %s" msgstr "fermiĝas dosierujo %s" -#: src/ls.c:3301 +#: src/ls.c:3302 #, c-format msgid "cannot compare file names %s and %s" msgstr "ne eblas kompari dosiernomojn %s kaj %s" #: src/ls.c:4721 +#, 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" -"\n" msgstr "" "Listigas informon pri DOSIERUJOj (defaŭlte pri la aktuala).\n" "Alfabetigas la termojn se neniu de '-cftuvSUX' nek '--sort' indikatas.\n" "\n" -#: src/ls.c:4729 +#: src/ls.c:4728 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -4878,7 +5301,7 @@ msgid "" "characters\n" msgstr "" -#: src/ls.c:4735 +#: src/ls.c:4734 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them. E." "g.,\n" @@ -4892,7 +5315,7 @@ msgid "" " otherwise: sort by ctime, newest first\n" msgstr "" -#: src/ls.c:4745 +#: src/ls.c:4744 msgid "" " -C list entries by columns\n" " --color[=WHEN] colorize the output. WHEN defaults to " @@ -4904,7 +5327,7 @@ msgid "" " -D, --dired generate output designed for Emacs' dired mode\n" msgstr "" -#: src/ls.c:4753 +#: src/ls.c:4752 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -4914,11 +5337,11 @@ msgid "" " --full-time like -l --time-style=full-iso\n" msgstr "" -#: src/ls.c:4761 +#: src/ls.c:4760 msgid " -g like -l, but do not list owner\n" msgstr "" -#: src/ls.c:4764 +#: src/ls.c:4763 msgid "" " --group-directories-first\n" " group directories before files.\n" @@ -4926,7 +5349,7 @@ msgid "" " use of --sort=none (-U) disables grouping\n" msgstr "" -#: src/ls.c:4770 +#: src/ls.c:4769 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" @@ -4934,7 +5357,7 @@ msgid "" " --si likewise, but use powers of 1000 not 1024\n" msgstr "" -#: src/ls.c:4776 +#: src/ls.c:4775 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -4947,7 +5370,7 @@ msgid "" " (overridden by -a or -A)\n" msgstr "" -#: src/ls.c:4786 +#: src/ls.c:4785 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -4959,7 +5382,7 @@ msgid "" " -k, --kibibytes use 1024-byte blocks\n" msgstr "" -#: src/ls.c:4796 +#: src/ls.c:4795 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -4969,7 +5392,7 @@ msgid "" "entries\n" msgstr "" -#: src/ls.c:4804 +#: src/ls.c:4803 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. " @@ -4980,7 +5403,7 @@ msgid "" " append / indicator to directories\n" msgstr "" -#: src/ls.c:4812 +#: src/ls.c:4811 msgid "" " -q, --hide-control-chars print ? instead of non graphic characters\n" " --show-control-chars show non graphic characters as-is (default\n" @@ -4992,7 +5415,7 @@ msgid "" "escape\n" msgstr "" -#: src/ls.c:4821 +#: src/ls.c:4820 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -5000,7 +5423,7 @@ msgid "" "blocks\n" msgstr "" -#: src/ls.c:4826 +#: src/ls.c:4825 msgid "" " -S sort by file size\n" " --sort=WORD sort by WORD instead of name: none -U,\n" @@ -5012,7 +5435,7 @@ msgid "" " if --sort=time\n" msgstr "" -#: src/ls.c:4836 +#: src/ls.c:4835 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, +FORMAT.\n" @@ -5024,13 +5447,13 @@ msgid "" " takes effect only outside the POSIX locale\n" msgstr "" -#: src/ls.c:4845 +#: src/ls.c:4844 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:4849 +#: src/ls.c:4848 msgid "" " -u with -lt: sort by, and show, access time\n" " with -l: show access time and sort by name\n" @@ -5039,7 +5462,7 @@ msgid "" " -v natural sort of (version) numbers within text\n" msgstr "" -#: src/ls.c:4856 +#: src/ls.c:4855 msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" @@ -5049,7 +5472,7 @@ msgid "" " -1 list one file per line\n" msgstr "" -#: src/ls.c:4866 +#: src/ls.c:4865 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5058,7 +5481,7 @@ msgid "" "variable can change the settings. Use the dircolors command to set it.\n" msgstr "" -#: src/ls.c:4873 +#: src/ls.c:4872 msgid "" "\n" "Exit status:\n" @@ -5082,7 +5505,7 @@ msgstr "Skot MILER (Scott Miller)" msgid "David Madore" msgstr "David MADOR (David Madore)" -#: src/md5sum.c:162 +#: src/md5sum.c:164 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -5096,31 +5519,41 @@ msgstr "" "Sen DOSIERO, aŭ kiam DOSIERO estas «-», ĉefenigujo legiĝas.\n" "\n" -#: src/md5sum.c:172 +#: src/md5sum.c:174 msgid "" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr "" +" -b, --binary legi en duuma moduso\n" +" (defaŭlte kiam ne legiĝas terminala ĉefenigujo)\n" -#: src/md5sum.c:176 +#: src/md5sum.c:178 msgid " -b, --binary read in binary mode\n" -msgstr "" +msgstr " -b, --binary legi en duuma moduso\n" -#: src/md5sum.c:179 +#: src/md5sum.c:181 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr "" +" -c, --check legi %s-kontrolsumojn el la DOSIEROj kaj kontroli " +"ilin\n" + +#: src/md5sum.c:184 +msgid " --tag create a BSD-style checksum\n" +msgstr "" -#: src/md5sum.c:183 +#: src/md5sum.c:188 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" +" -t, --text legi en teksta moduso\n" +" (defaŭlte kiam legiĝas terminala ĉefenigujo)\n" -#: src/md5sum.c:187 +#: src/md5sum.c:192 msgid " -t, --text read in text mode (default)\n" -msgstr "" +msgstr " -t, --text legi en teksta moduso (defaŭlte)\n" -#: src/md5sum.c:190 +#: src/md5sum.c:195 msgid "" "\n" "The following three options are useful only when verifying checksums:\n" @@ -5129,13 +5562,21 @@ msgid "" " -w, --warn warn about improperly formatted checksum lines\n" "\n" msgstr "" +"\n" +"La sekvaj tri 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" +" -w, --warn averti pri malĝuste formitaj kontrolsumaj linioj\n" +"\n" -#: src/md5sum.c:198 +#: 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:203 +#: src/md5sum.c:208 #, c-format msgid "" "\n" @@ -5144,80 +5585,95 @@ msgid "" "a line with checksum, a character indicating input mode ('*' for binary,\n" "space for text), and name for each FILE.\n" msgstr "" +"\n" +"La kontrolsumoj kalkuliĝas kiel estas priskribita en %s. Dum kontrolo,\n" +"la enigo devas esti antaŭa eligo de ĉi tiu programo. La defaŭlta reĝimo\n" +"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:502 +#: src/md5sum.c:523 #, c-format msgid "%s: too many checksum lines" msgstr "%s: tro multaj linioj de kontrolsumoj" -#: src/md5sum.c:526 +#: src/md5sum.c:547 #, c-format msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line" msgstr "%s: linio %<PRIuMAX>: nevalida %s-kontrolsumo" -#: src/md5sum.c:551 +#: src/md5sum.c:572 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: malsukcesis malfermo aŭ lego\n" # Ĉi tiu priskribas malsaman kontrolsumon. -#: src/md5sum.c:574 +#: src/md5sum.c:595 msgid "FAILED" msgstr "MALSAMAS" # Ĉi tiu priskribas kongruan kontrolsumon. -#: src/md5sum.c:576 +#: src/md5sum.c:597 msgid "OK" msgstr "bonas" -#: src/md5sum.c:600 +#: src/md5sum.c:621 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "%s: neniu valida %s-kontrolsumo troviĝas" -#: src/md5sum.c:610 +#: src/md5sum.c:631 #, 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:618 +#: src/md5sum.c:639 #, 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:626 +#: src/md5sum.c:647 #, 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:704 +#: src/md5sum.c:760 +#, c-format +msgid "--tag does not support --text mode" +msgstr "opcioj '--tag' kaj '--text' ne kombineblas" + +#: src/md5sum.c:766 +#, c-format +msgid "the --tag option is meaningless when verifying checksums" +msgstr "opcio '--tag' ne havas sencon dum sumkontrolo" + +#: src/md5sum.c:773 #, 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:712 +#: src/md5sum.c:781 #, c-format msgid "the --status option is meaningful only when verifying checksums" msgstr "opcio '--status' nur havas sencon dum sumkontrolo" -#: src/md5sum.c:719 +#: src/md5sum.c:788 #, c-format msgid "the --warn option is meaningful only when verifying checksums" msgstr "opcio '--warn' nur havas sencon dum sumkontrolo" -#: src/md5sum.c:726 +#: src/md5sum.c:795 #, c-format msgid "the --quiet option is meaningful only when verifying checksums" msgstr "opcio '--quiet' nur havas sencon dum sumkontrolo" -#: src/md5sum.c:733 +#: src/md5sum.c:802 #, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "opcio '--strict' nur havas sencon dum sumkontrolo" @@ -5228,14 +5684,13 @@ msgid "Usage: %s [OPTION]... DIRECTORY...\n" msgstr "Uzmaniero: %s [OPCIO...] DOSIERUJO...\n" #: src/mkdir.c:57 -msgid "" -"Create the DIRECTORY(ies), if they do not already exist.\n" -"\n" +#, fuzzy +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:64 +#: src/mkdir.c:63 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" @@ -5243,8 +5698,15 @@ msgid "" " -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" -#: src/mkdir.c:169 +#: src/mkdir.c:168 #, c-format msgid "created directory %s" msgstr "kreiĝas dosierujo %s" @@ -5255,31 +5717,31 @@ msgid "Usage: %s [OPTION]... NAME...\n" msgstr "Uzmaniero: %s [OPCIO...] NOMO...\n" #: src/mkfifo.c:52 -msgid "" -"Create named pipes (FIFOs) with the given NAMEs.\n" -"\n" +#, fuzzy +msgid "Create named pipes (FIFOs) with the given NAMEs.\n" msgstr "" -"Kreas nomhavajn duktojn (FIFO-jn) kun la indikataj NOMOj.\n" +"Kreas nomhavajn duktojn (vicmemorojn) kun la indikataj NOMOj.\n" "\n" -#: src/mkfifo.c:59 src/mknod.c:61 +#: src/mkfifo.c:58 src/mknod.c:60 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:62 +#: src/mkfifo.c:61 msgid "" " -Z, --context=CTX set the SELinux security context of each NAME to CTX\n" msgstr "" +" -Z, --context=KTT agordi la sekurecan kuntekston de ĉiu NOMO al KTT\n" -#: src/mkfifo.c:122 src/mknod.c:128 +#: src/mkfifo.c:121 src/mknod.c:127 #, c-format msgid "invalid mode" msgstr "nevalida moduso" -#: src/mkfifo.c:127 src/mknod.c:133 +#: src/mkfifo.c:126 src/mknod.c:132 #, c-format msgid "mode must specify only file permission bits" msgstr "moduso povas indiki nur permesajn bitojn" @@ -5290,18 +5752,17 @@ msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n" msgstr "Uzmaniero: %s [OPCIO...] NOMO TIPO [ĈEFNUMERO KROMNUMERO]\n" #: src/mknod.c:54 -msgid "" -"Create the special file NAME of the given TYPE.\n" -"\n" +#, fuzzy +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:64 +#: src/mknod.c:63 msgid " -Z, --context=CTX set the SELinux security context of NAME to CTX\n" -msgstr "" +msgstr " -Z, --context=KTT agordi la sekurecan kuntekston de NOMO al KTT\n" -#: src/mknod.c:69 +#: src/mknod.c:68 msgid "" "\n" "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n" @@ -5309,49 +5770,61 @@ msgid "" "it is interpreted as hexadecimal; otherwise, if it begins with 0, as octal;\n" "otherwise, as decimal. TYPE may be:\n" msgstr "" +"\n" +"ĈEFNUMERO kaj KROMNUMERO ambaŭ indikendas kiam TIPO estas 'b' aŭ 'c' aŭ " +"'u',\n" +"kaj ili forlasendas kiam TIPO estas 'p'. Kiam ĈEFNUMERO aŭ KROMNUMERO " +"komencas\n" +"per '0x' aŭ '0X', ĝi interpretiĝas kiel deksesuma; alie, se ĝi komencas per " +"'0',\n" +"kiel okuma; alie, kiel dekuma. TIPO povas esti:\n" -#: src/mknod.c:76 +#: src/mknod.c:75 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 krei blokan specialan dosieron (bufritan)\n" +" c, u krei signan specialan dosieron (nebufritan)\n" +" p krei vicmemoron ('FIFO'-n)\n" -#: src/mknod.c:151 +#: src/mknod.c:150 msgid "Special files require major and minor device numbers." msgstr "Specialaj dosieroj postulas ĉefajn kaj kromajn aparatnumerojn." -#: src/mknod.c:161 +#: src/mknod.c:160 msgid "Fifos do not have major and minor device numbers." -msgstr "Vica memoro ('fifo') ne havas ĉefan kaj kroman aparatnumeron." +msgstr "Vicmemoro ('FIFO') ne havas ĉefan kaj kroman aparatnumeron." -#: src/mknod.c:177 +#: src/mknod.c:176 #, c-format msgid "block special files not supported" msgstr "blokaparatdosieroj ne subtenatas" -#: src/mknod.c:186 +#: src/mknod.c:185 #, c-format msgid "character special files not supported" msgstr "signoaparatdosieroj ne subtenatas" -#: src/mknod.c:202 +#: src/mknod.c:201 #, c-format msgid "invalid major device number %s" msgstr "nevalida ĉefa aparatnumero %s" -#: src/mknod.c:207 +#: src/mknod.c:206 #, c-format msgid "invalid minor device number %s" msgstr "nevalida kroma aparatnumero %s" -#: src/mknod.c:212 +#: src/mknod.c:211 #, c-format msgid "invalid device %s %s" msgstr "nevalida aparato %s %s" -#: src/mknod.c:226 +#: src/mknod.c:225 #, c-format msgid "invalid device type %s" msgstr "nevalida aparattipo %s" @@ -5410,60 +5883,59 @@ msgid "" " directory specified via -p; else /tmp [deprecated]\n" msgstr "" -#: src/mktemp.c:222 +#: 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:228 +#: src/mktemp.c:229 #, c-format msgid "too many templates" msgstr "tro multaj ŝablonoj" -#: src/mktemp.c:248 +#: src/mktemp.c:249 #, c-format msgid "with --suffix, template %s must end in X" msgstr "kun opcio '--suffix', ŝablono %s devas fini per X" -#: src/mktemp.c:273 src/split.c:1117 +#: src/mktemp.c:274 src/split.c:1130 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "nevalida sufikso %s; ĝi enhavas apartigilon de dosierujoj" -#: src/mktemp.c:278 +#: src/mktemp.c:279 #, c-format msgid "too few X's in template %s" msgstr "tro malmultaj X en ŝablono %s" -#: src/mktemp.c:291 +#: src/mktemp.c:292 #, c-format msgid "invalid template, %s, contains directory separator" msgstr "nevalida ŝablono %s; ĝi enhavas apartigilon de dosierujoj" -#: src/mktemp.c:305 +#: src/mktemp.c:306 #, 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:325 +#: src/mktemp.c:326 #, c-format msgid "failed to create directory via template %s" msgstr "malsukcesis krei dosierujon tra ŝablono %s" -#: src/mktemp.c:335 +#: src/mktemp.c:336 #, c-format msgid "failed to create file via template %s" msgstr "malsukcesis krei dosieron tra ŝablono %s" -#: src/mv.c:290 -msgid "" -"Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" -"\n" +#: src/mv.c:292 +#, fuzzy +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" "\n" -#: src/mv.c:297 +#: src/mv.c:298 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -5476,7 +5948,7 @@ msgid "" "effect.\n" msgstr "" -#: src/mv.c:306 +#: src/mv.c:307 msgid "" " --strip-trailing-slashes remove any trailing slashes from each " "SOURCE\n" @@ -5484,7 +5956,7 @@ msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" msgstr "" -#: src/mv.c:311 +#: src/mv.c:312 msgid "" " -t, --target-directory=DIRECTORY move all SOURCE arguments into " "DIRECTORY\n" @@ -5501,31 +5973,38 @@ msgid "Usage: %s [OPTION] [COMMAND [ARG]...]\n" msgstr "Uzmaniero: %s [OPCIO] [KOMANDO [ARGUMENTO...]]\n" #: src/nice.c:73 -#, c-format +#, fuzzy, c-format msgid "" "Run COMMAND with an adjusted niceness, which affects process scheduling.\n" -"With no COMMAND, print the current niceness. Nicenesses range from\n" -"%d (most favorable scheduling) to %d (least favorable).\n" +"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 "" +"Rulas KOMANDOn kun ŝanĝita afableco, kiu afektas procezan planadon.\n" +"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 add integer N to the niceness (default 10)\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 "" -#: src/nice.c:168 +#: src/nice.c:172 #, c-format msgid "invalid adjustment %s" msgstr "nevalida alĝustigo %s" -#: src/nice.c:177 +#: src/nice.c:181 #, c-format msgid "a command must be given with an adjustment" msgstr "kune kun ĝustigo endas indiki komandon" -#: src/nice.c:184 src/nice.c:195 +#: src/nice.c:188 src/nice.c:199 #, c-format msgid "cannot get niceness" msgstr "ne eblas eltrovi afablecon" -#: src/nice.c:201 +#: src/nice.c:205 #, c-format msgid "cannot set niceness" msgstr "ne eblas agordi afablecon" @@ -5535,21 +6014,23 @@ msgstr "ne eblas agordi afablecon" msgid "Scott Bartram" msgstr "Skot BARTREM (Scott Bartram)" -#: src/nl.c:186 +#: 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" -"\n" msgstr "" +"Skribas kun inversa liniordo ĉiun indikatan DOSIEROn al ĉefeligujo.\n" +"Sen DOSIERO, aŭ kiam DOSIERO estas «-», ĉefenigujo legiĝas.\n" -#: src/nl.c:194 +#: src/nl.c:186 msgid "" " -b, --body-numbering=STYLE use STYLE for numbering body lines\n" " -d, --section-delimiter=CC use CC for separating logical pages\n" " -f, --footer-numbering=STYLE use STYLE for numbering footer lines\n" msgstr "" -#: src/nl.c:199 +#: src/nl.c:191 msgid "" " -h, --header-numbering=STYLE use STYLE for numbering header lines\n" " -i, --line-increment=NUMBER line number increment at each line\n" @@ -5561,13 +6042,13 @@ msgid "" " -s, --number-separator=STRING add STRING after (possible) line number\n" msgstr "" -#: src/nl.c:207 +#: src/nl.c:199 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 "" -#: src/nl.c:213 +#: src/nl.c:205 msgid "" "\n" "By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC are\n" @@ -5575,7 +6056,7 @@ msgid "" "second character implies :. Type \\\\ for \\. STYLE is one of:\n" msgstr "" -#: src/nl.c:219 +#: src/nl.c:211 msgid "" "\n" " a number all lines\n" @@ -5592,53 +6073,47 @@ msgid "" "\n" msgstr "" -#: src/nl.c:286 +#: src/nl.c:278 #, c-format msgid "line number overflow" msgstr "troo de lininumero" -#: src/nl.c:486 +#: src/nl.c:478 #, c-format msgid "invalid header numbering style: %s" msgstr "nevalida stilo por numeri kapliniojn: %s" -#: src/nl.c:494 +#: src/nl.c:486 #, c-format msgid "invalid body numbering style: %s" msgstr "nevalida stilo por numeri korpliniojn: %s" -#: src/nl.c:502 +#: src/nl.c:494 #, c-format msgid "invalid footer numbering style: %s" msgstr "nevalida stilo por numeri piedliniojn: %s" -#: src/nl.c:511 +#: src/nl.c:503 #, c-format msgid "invalid starting line number: %s" msgstr "nevalida komenca lininumero: %s" -#: src/nl.c:517 -#, c-format -msgid "WARNING: --page-increment is deprecated; use --line-increment instead" -msgstr "" -"AVERTO: malrekomendatas '--page-increment'; uzu '--line-increment' anstataŭe" - -#: src/nl.c:524 +#: src/nl.c:512 #, c-format msgid "invalid line number increment: %s" msgstr "nevalida lininumera alkremento: %s" -#: src/nl.c:536 +#: src/nl.c:524 #, c-format msgid "invalid number of blank lines: %s" msgstr "nevalida nombro da malplenaj linioj: %s" -#: src/nl.c:550 +#: src/nl.c:538 #, c-format msgid "invalid line number field width: %s" msgstr "nevalida lininumera kampgrando: %s" -#: src/nl.c:569 +#: src/nl.c:557 #, c-format msgid "invalid line numbering format: %s" msgstr "nevalida lininumera aranĝo: %s" @@ -5670,6 +6145,13 @@ msgid "" "If standard error is a terminal, redirect it to standard output.\n" "To save output to FILE, use '%s COMMAND > FILE'.\n" msgstr "" +"\n" +"Se ĉefenigujo estas terminalo, alidirekti ĝin de «/dev/null».\n" +"Se ĉefeligujo estas terminalo, aldoni eligon al dosiero «nohup.out», se " +"eblas,\n" +"alie al «$HOME/nohup.out»\n" +"Se ĉeferar-eliguo estas terminalo, alidirekti ĝin al ĉefeligujo.\n" +"Por savi la eligon al DOSIERO, uzu «%s KOMANDO > DOSIERO».\n" #: src/nohup.c:127 #, c-format @@ -5681,11 +6163,6 @@ msgstr "malsukcesis fari ĉefenigujon neuzebla" msgid "ignoring input" msgstr "enigo ignoratas" -#: src/nohup.c:163 src/nohup.c:165 -#, c-format -msgid "failed to open %s" -msgstr "malsukcesis malfermi %s" - #: src/nohup.c:175 #, c-format msgid "ignoring input and appending output to %s" @@ -5717,32 +6194,377 @@ msgid "failed to redirect standard error" msgstr "malsukcesis alidirektigi ĉeferar-eligujon" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:32 +#: src/nproc.c:33 msgid "Giuseppe Scrivano" msgstr "Ĝusepe SKRIVANO (Giuseppe Scrivano)" -#: src/nproc.c:56 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 +#: src/nproc.c:57 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Uzmaniero: %s [OPCIO...]\n" -#: src/nproc.c:57 +#: src/nproc.c:58 msgid "" "Print the number of processing units available to the current process,\n" "which may be less than the number of online processors\n" "\n" msgstr "" +"Eligi nombron de procesoraj unuoj kiuj disponeblas al la nuna procezo,\n" +"kiu povas esti malpli ol la nombro de aktivaj procesoroj.\n" +"\n" -#: src/nproc.c:62 +#: src/nproc.c:63 msgid "" " --all print the number of installed processors\n" " --ignore=N if possible, exclude N processing units\n" msgstr "" +" --all eligi la nombron de instalitaj procesoroj\n" +" --ignore=NOMBRO se eblas, ekskluzivi NOMBROn de procesoraj unuoj\n" + +#: src/nproc.c:107 +#, c-format +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 +msgid "Assaf Gordon" +msgstr "" + +#: 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:680 +#, fuzzy, c-format +msgid "invalid number: '%s'" +msgstr "nevalida numero %s" + +#: src/numfmt.c:684 +#, c-format +msgid "rejecting suffix in input: '%s' (consider using --from)" +msgstr "" + +#: 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:692 +#, c-format +msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)" +msgstr "" + +#: src/numfmt.c:723 +#, fuzzy, c-format +msgid "failed to prepare value '%Lf' for printing" +msgstr "malsukcesis malfermi %s por skribado" + +#: 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 +#, c-format +msgid "out of memory (requested %zu bytes)" +msgstr "" + +#: src/numfmt.c:813 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [NUMBER]...\n" +msgstr "Uzmaniero: %s [OPCIO...] [UZANTO...]\n" + +#: src/numfmt.c:816 +msgid "" +"Reformat NUMBER(s), or the numbers from standard input if none are " +"specified.\n" +msgstr "" + +#: src/numfmt.c:820 +#, fuzzy +msgid " --debug print warnings about invalid input\n" +msgstr "" +" --strict kun «--check»: eliri nenule por iu ajn nevalida " +"enigo\n" + +#: src/numfmt.c:823 +msgid "" +" -d, --delimiter=X use X instead of whitespace for field delimiter\n" +msgstr "" + +#: src/numfmt.c:826 +msgid "" +" --field=N replace the number in input field N (default is 1)\n" +msgstr "" + +#: src/numfmt.c:829 +msgid "" +" --format=FORMAT use printf style floating-point FORMAT;\n" +" see FORMAT below for details\n" +msgstr "" + +#: src/numfmt.c:833 +msgid "" +" --from=UNIT auto-scale input numbers to UNITs; default is " +"'none';\n" +" see UNIT below\n" +msgstr "" + +#: src/numfmt.c:837 +msgid "" +" --from-unit=N specify the input unit size (instead of the default " +"1)\n" +msgstr "" + +#: src/numfmt.c:840 +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 "" + +#: src/numfmt.c:844 +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 +msgid "" +" --invalid=MODE failure mode for invalid numbers: MODE can be:\n" +" abort (default), fail, warn, ignore\n" +msgstr "" + +#: src/numfmt.c:852 +msgid "" +" --padding=N pad the output to N characters; positive N will\n" +" right-align; negative N will left-align;\n" +" padding is ignored if the output is wider than N;\n" +" the default is to automatically pad if a " +"whitespace\n" +" is found\n" +msgstr "" + +#: src/numfmt.c:859 +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 +msgid "" +" --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" +" SUFFIX in input numbers\n" +msgstr "" + +#: src/numfmt.c:867 +msgid "" +" --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" +msgstr "" + +#: src/numfmt.c:870 +msgid "" +" --to-unit=N the output unit size (instead of the default 1)\n" +msgstr "" + +#: src/numfmt.c:877 +#, fuzzy +msgid "" +"\n" +"UNIT options:\n" +msgstr "" +"Aliaj opcioj:\n" +"\n" + +#: src/numfmt.c:880 +msgid " none no auto-scaling is done; suffixes will trigger an error\n" +msgstr "" + +#: src/numfmt.c:883 +msgid "" +" auto accept optional single/two letter suffix:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" +msgstr "" + +#: src/numfmt.c:889 +msgid "" +" si accept optional single letter suffix:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:894 +msgid "" +" iec accept optional single letter suffix:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:899 +msgid "" +" iec-i accept optional two-letter suffix:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:905 +#, 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" +msgstr "" + +#: src/numfmt.c:912 +#, c-format +msgid "" +"\n" +"Exit status is 0 if all input numbers were successfully converted.\n" +"By default, %s will stop at the first conversion error with exit status 2.\n" +"With --invalid='fail' a warning is printed for each conversion error\n" +"and the exit status is 2. With --invalid='warn' each conversion error is\n" +"diagnosed, but the exit status is 0. With --invalid='ignore' conversion\n" +"errors are not diagnosed and the exit status is 0.\n" +msgstr "" + +#: src/numfmt.c:921 +#, c-format +msgid "" +"\n" +"Examples:\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" +msgstr "" + +#: src/numfmt.c:974 src/seq.c:212 +#, c-format +msgid "format %s has no %% directive" +msgstr "aranĝo %s ne enhavas %%-indikon" + +#: src/numfmt.c:990 +#, fuzzy, c-format +msgid "invalid format %s (width overflow)" +msgstr "nevalida dataranĝo: %s" + +#: src/numfmt.c:1007 src/seq.c:229 +#, 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:1018 src/seq.c:236 +#, 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:1092 +#, c-format +msgid "value too large to be printed: '%Lg' (consider using --to)" +msgstr "" + +#: src/numfmt.c:1100 +#, c-format +msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" +msgstr "" + +#: src/numfmt.c:1184 +#, c-format +msgid "large input value '%s': possible precision loss" +msgstr "" + +#: src/numfmt.c:1293 +#, 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 "nevalida gamo de paĝoj: %s" + +#: src/numfmt.c:1401 +#, fuzzy, c-format +msgid "invalid field value '%s'" +msgstr "nevalida kampnumero: %s" + +#: src/numfmt.c:1430 +#, fuzzy, c-format +msgid "invalid header value '%s'" +msgstr "nevalida dato %s" + +#: src/numfmt.c:1456 +#, fuzzy, c-format +msgid "--grouping cannot be combined with --format" +msgstr "nekombineblas dosieraj argumentoj kun opcio «--files0-from»" + +#: 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 +msgid "no conversion option specified" +msgstr "pluraj opcioj '-i' indikatas" + +#: src/numfmt.c:1471 +#, fuzzy, c-format +msgid "grouping cannot be combined with --to" +msgstr "nekombineblas dosieraj argumentoj kun opcio «--files0-from»" + +#: src/numfmt.c:1473 +#, c-format +msgid "grouping has no effect in this locale" +msgstr "" + +#: src/numfmt.c:1486 +#, c-format +msgid "--header ignored with command-line input" +msgstr "" -#: src/nproc.c:106 -#, c-format -msgid "%s: invalid number to ignore" -msgstr "%s: nevalida ignorenda nombro" +#: src/numfmt.c:1511 +#, fuzzy, c-format +msgid "error reading input" +msgstr "eraro dum legado de %s" + +#: src/numfmt.c:1520 +#, fuzzy, c-format +msgid "failed to convert some of the input numbers" +msgstr "malsukcesis fari ĉefenigujon neuzebla" #: src/od.c:294 #, c-format @@ -5766,31 +6588,46 @@ msgid "" "With no FILE, or when FILE is -, read standard input.\n" "\n" msgstr "" +"\n" +"Eligas neambiguan reprezenton (per okumaj bajtoj defaŭlte)\n" +"de DOSIERO al ĉefeligujo. Kun pli ol unu DOSIERO,\n" +"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 -msgid "All arguments to long options are mandatory for short options.\n" -msgstr "(Endaj argumentoj por longaj opcioj ankaŭ endas por la mallongaj.)\n" +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" +"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" +"at first byte printed, incremented when dump is progressing.\n" +"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 "" -#: src/od.c:310 +#: src/od.c:318 msgid "" -" -A, --address-radix=RADIX decide how file offsets are printed\n" +" -A, --address-radix=RADIX output format for file offsets. RADIX is one\n" +" of [doxn], for Decimal, Octal, Hex or None\n" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" -#: src/od.c:314 +#: src/od.c:323 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" -" --traditional accept arguments in traditional form\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:324 +#: src/od.c:336 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" @@ -5798,7 +6635,7 @@ msgid "" " -d same as -t u2, select unsigned decimal 2-byte units\n" msgstr "" -#: src/od.c:332 +#: src/od.c:345 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -5808,27 +6645,16 @@ msgid "" " -x same as -t x2, select hexadecimal 2-byte units\n" msgstr "" -#: src/od.c:340 +#: src/od.c:353 msgid "" "\n" -"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" -"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" -"at first byte printed, incremented when dump is progressing.\n" -"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 "" - -#: src/od.c:349 -msgid "" "\n" "TYPE is made up of one or more of these specifications:\n" -"\n" " a named character, ignoring high-order bit\n" " c ASCII character or backslash escape\n" msgstr "" -#: src/od.c:356 +#: src/od.c:360 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -5837,43 +6663,46 @@ msgid "" " x[SIZE] hexadecimal, SIZE bytes per integer\n" msgstr "" -#: src/od.c:363 +#: src/od.c:367 msgid "" "\n" -"SIZE is a number. For TYPE in doux, SIZE may also be C for\n" +"SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" "sizeof(char), S for sizeof(short), I for sizeof(int) or L for\n" "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 "" -#: src/od.c:370 +#: src/od.c:374 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" +"Adding a z suffix to any type displays printable characters at the end of\n" +"each output line.\n" msgstr "" -#: src/od.c:380 +#: src/od.c:379 +#, 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" +"\n" +"\n" +"BYTES is hex with 0x or 0X prefix, and may have a multiplier suffix:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"and so on for G, T, P, E, Z, Y.\n" msgstr "" -"Opcio '--string' sen nombro implikas 3; opcio '--width' sen nombro implikas " -"32.\n" -"Defaŭlte 'od' uzas '-A o -t oS -w16'.\n" +"\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" -#: src/od.c:633 src/od.c:753 +#: src/od.c:639 src/od.c:759 #, c-format msgid "invalid type string %s" msgstr "nevalida tipa ĉeno: %s" -#: src/od.c:643 +#: src/od.c:649 #, c-format msgid "" "invalid type string %s;\n" @@ -5882,7 +6711,7 @@ msgstr "" "nevalida tipa ĉeno: %s\n" "ĉi tiu sistemo ne provizas entjertipon de %lu bajtoj" -#: src/od.c:764 +#: src/od.c:770 #, c-format msgid "" "invalid type string %s;\n" @@ -5891,36 +6720,36 @@ msgstr "" "nevalida tipa ĉeno: %s\n" "ĉi tiu sistemo ne provizas glitkomtipon de %lu bajtoj" -#: src/od.c:822 +#: src/od.c:828 #, c-format msgid "invalid character '%c' in type string %s" msgstr "nevalida signo '%c' en tipa ĉeno %s" -#: src/od.c:1047 +#: src/od.c:1053 #, c-format msgid "cannot skip past end of combined input" msgstr "maleblas transsalti la finon de kombinata enigo" -#: src/od.c:1603 +#: src/od.c:1609 #, 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:1729 +#: src/od.c:1735 #, c-format msgid "no type may be specified when dumping strings" msgstr "ne eblas indiki tipon kiam ŝutendas ĉenoj" -#: src/od.c:1804 +#: src/od.c:1810 msgid "compatibility mode supports at most one file" msgstr "kongrua moduso permesas maksimume unu dosieron" -#: src/od.c:1825 +#: src/od.c:1831 #, 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:1868 +#: src/od.c:1874 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "averto: nevalida larĝo %lu; uzatas %d anstataŭe" @@ -5936,20 +6765,27 @@ 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" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" +"Skribas liniojn kiuj konsistas de la kungluo de la sekve korespondaj linioj\n" +"de ĉiu indikata DOSIERO, disigitaj per TABOJ, al ĉefeligujo.\n" +"\n" +"Sen DOSIERO, aŭ kiam DOSIERO estas «-», ĉefenigujo legiĝas.\n" -#: src/paste.c:448 +#: 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=LISTO uzi la signojn el tiu LISTO anstataŭ tabojn\n" +" -s, --serial alglui unu dosieron pofoje anstataŭ ĉiujn " +"paralele\n" -#: src/paste.c:509 +#: src/paste.c:508 #, c-format msgid "delimiter list ends with an unescaped backslash: %s" msgstr "listo de disigiloj finas per nuda malsuprenstreko: %s" @@ -5962,6 +6798,12 @@ msgid "" " -P check for empty names and leading \"-\"\n" " --portability check for all POSIX systems (equivalent to -p -P)\n" msgstr "" +"Diagnozas nevalidajn aŭ neporteblajn dosiernomojn.\n" +"\n" +" -p fari kontrolon por la plejmulto de POSIX-sistemoj\n" +" -P kontroli ankaŭ je vakaj nomoj kaj komencaj «-»\n" +" --portability fari kontrolon por ĉiuj POSIX-sistemoj (egalas al '-p -" +"P')\n" #: src/pathchk.c:170 #, c-format @@ -6004,80 +6846,80 @@ msgid "Kaveh Ghazi" msgstr "Kave GAZI (Kaveh Ghazi)" #. TRANSLATORS: Real name is unknown; at most 19 characters. -#: src/pinky.c:250 +#: src/pinky.c:242 msgid " ???" msgstr " (nekonata)" #. TRANSLATORS: Idle time is unknown; at most 5 characters. -#: src/pinky.c:274 +#: src/pinky.c:266 msgid "?????" msgstr "-----" -#: src/pinky.c:323 +#: src/pinky.c:314 #, c-format msgid "Login name: " msgstr "Ensaluta nomo: " -#: src/pinky.c:326 +#: src/pinky.c:317 #, c-format msgid "In real life: " msgstr "Vera nomo: " #. TRANSLATORS: Real name is unknown; no hard limit. -#: src/pinky.c:330 +#: src/pinky.c:321 msgid "???\n" msgstr "(nekonata)\n" -#: src/pinky.c:350 +#: src/pinky.c:341 #, c-format msgid "Directory: " msgstr "Dosierujo: " -#: src/pinky.c:352 +#: src/pinky.c:343 #, c-format msgid "Shell: " msgstr "Ŝelo: " -#: src/pinky.c:371 +#: src/pinky.c:362 #, c-format msgid "Project: " msgstr "Projekto: " -#: src/pinky.c:395 +#: src/pinky.c:386 #, c-format msgid "Plan:\n" msgstr "Plano:\n" -#: src/pinky.c:414 +#: src/pinky.c:405 msgid "Login" msgstr "Saluto" -#: src/pinky.c:416 +#: src/pinky.c:407 msgid "Name" msgstr "Nomo" -#: src/pinky.c:417 +#: src/pinky.c:408 msgid " TTY" msgstr " TTY" -#: src/pinky.c:419 +#: src/pinky.c:410 msgid "Idle" msgstr "Vakas" -#: src/pinky.c:420 +#: src/pinky.c:411 msgid "When" msgstr "Ensalutis" -#: src/pinky.c:423 +#: src/pinky.c:414 msgid "Where" msgstr "Kie" -#: src/pinky.c:502 +#: src/pinky.c:493 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Uzmaniero: %s [OPCIO...] [UZANTO...]\n" -#: src/pinky.c:503 +#: src/pinky.c:494 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -6086,8 +6928,17 @@ msgid "" " -p omit the user's plan file in long format\n" " -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" +" -b forlasi hejman dosierujon kaj ŝelon de uzanto en longa " +"aranĝo\n" +" -h forlasi projektan dosieron de uzanto en longa aranĝo\n" +" -p forlasi la 'plan'-dosieron de uzanto en longa aranĝo\n" +" -s produkti eligon en mallonga aranĝo (ĉi tio estas la " +"defaŭlto)\n" -#: src/pinky.c:511 +#: src/pinky.c:502 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -6095,16 +6946,23 @@ msgid "" " -q omit the user's full name, remote host and idle time\n" " in short format\n" msgstr "" +" -f forlasi la linion de kolumnaj ĉapoj en mallonga aranĝo\n" +" -w forlasi plenan uzantnomon en mallonga aranĝo\n" +" -i kiel '-w' sed ankaŭ forlasi foran gastiganton\n" +" -q kiel '-i' sed ankaŭ forlasi vakan tempon\n" -#: src/pinky.c:520 +#: src/pinky.c:511 #, c-format msgid "" "\n" "A lightweight 'finger' program; print user information.\n" "The utmp file will be %s.\n" msgstr "" +"\n" +"Malpeza 'finger'-programo; eligas informon pri uzantoj.\n" +"La uzita 'utmp'-dosiero estos %s.\n" -#: src/pinky.c:604 +#: src/pinky.c:595 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "" @@ -6120,83 +6978,81 @@ msgstr "Pit TERMAT (Pete TerMaat)" msgid "Roland Huebner" msgstr "Roland HIBNER (Roland Huebner)" -#: src/pr.c:912 +#: src/pr.c:908 #, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "mankas argumento en '--page=UNUA_PAĜO[:LASTA_PAĜO]'" -#: src/pr.c:914 +#: src/pr.c:910 #, c-format msgid "invalid page range %s" -msgstr "nevalida intervalo de paĝoj: %s" +msgstr "nevalida gamo de paĝoj: %s" -#: src/pr.c:979 +#: src/pr.c:975 #, c-format msgid "'-l PAGE_LENGTH' invalid number of lines: %s" msgstr "nevalida nombro da linioj je opcio '-l': %s" -#: src/pr.c:1003 +#: src/pr.c:999 #, c-format msgid "'-N NUMBER' invalid starting line number: %s" msgstr "nevalida komenca lininumero je opcio '-N': %s" -#: src/pr.c:1015 +#: src/pr.c:1011 #, c-format msgid "'-o MARGIN' invalid line offset: %s" msgstr "nevalida marĝeno je opcio '-o': %s" -#: src/pr.c:1056 +#: src/pr.c:1052 #, c-format msgid "'-w PAGE_WIDTH' invalid number of characters: %s" msgstr "nevalida nombro da signoj je opcio '-w': %s" -#: src/pr.c:1070 +#: src/pr.c:1066 #, c-format msgid "'-W PAGE_WIDTH' invalid number of characters: %s" msgstr "nevalida nombro da signoj je opcio '-W': %s" -#: src/pr.c:1100 +#: src/pr.c:1096 #, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "ne eblas indiki nombro da kolumnoj kiam printiĝas horizontale" -#: src/pr.c:1104 +#: src/pr.c:1100 #, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "ne eblas printi ambaŭ vertikale kaj horizontale" -#: src/pr.c:1200 +#: src/pr.c:1196 #, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "troaj signoj aŭ nevalida nombro je opcio '-%c': %s" -#: src/pr.c:1304 +#: src/pr.c:1293 #, c-format msgid "page width too narrow" msgstr "tro malgrandas paĝa larĝo" -#: src/pr.c:2369 +#: src/pr.c:2353 #, c-format msgid "starting page number %<PRIuMAX> exceeds page count %<PRIuMAX>" msgstr "komenca paĝnumero %<PRIuMAX> pligrandas ol nombro da paĝoj %<PRIuMAX>" -#: src/pr.c:2396 +#: src/pr.c:2380 #, c-format msgid "page number overflow" msgstr "troo de paĝnumero" -#: src/pr.c:2401 +#: src/pr.c:2385 #, c-format msgid "Page %<PRIuMAX>" msgstr "Paĝo %<PRIuMAX>" -#: src/pr.c:2773 -msgid "" -"Paginate or columnate FILE(s) for printing.\n" -"\n" +#: src/pr.c:2757 +msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" -#: src/pr.c:2780 +#: src/pr.c:2763 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -6206,7 +7062,7 @@ msgid "" " columns on each page\n" msgstr "" -#: src/pr.c:2788 +#: src/pr.c:2771 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -6216,7 +7072,7 @@ msgid "" " double space the output\n" msgstr "" -#: src/pr.c:2796 +#: src/pr.c:2779 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -6228,7 +7084,7 @@ msgid "" " and trailer without -F)\n" msgstr "" -#: src/pr.c:2806 +#: src/pr.c:2789 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -6241,7 +7097,7 @@ msgid "" " alignment, --sep-string[=STRING] sets separators\n" msgstr "" -#: src/pr.c:2815 +#: src/pr.c:2798 msgid "" " -l, --length=PAGE_LENGTH\n" " set the page length to PAGE_LENGTH (66) lines\n" @@ -6250,7 +7106,7 @@ msgid "" " truncate lines, but join lines of full length with -J\n" msgstr "" -#: src/pr.c:2822 +#: src/pr.c:2805 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -6260,7 +7116,7 @@ msgid "" " page printed (see +FIRST_PAGE)\n" msgstr "" -#: src/pr.c:2830 +#: src/pr.c:2813 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -6269,7 +7125,7 @@ msgid "" " omit warning when a file cannot be opened\n" msgstr "" -#: src/pr.c:2837 +#: src/pr.c:2820 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -6279,7 +7135,7 @@ msgid "" " options (-COLUMN|-a -COLUMN|-m) except -w is set\n" msgstr "" -#: src/pr.c:2844 +#: src/pr.c:2827 msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" @@ -6289,7 +7145,7 @@ msgid "" " -t, --omit-header omit page headers and trailers\n" msgstr "" -#: src/pr.c:2851 +#: src/pr.c:2834 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -6303,7 +7159,7 @@ msgid "" "(72)\n" msgstr "" -#: src/pr.c:2861 +#: src/pr.c:2844 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -6312,7 +7168,7 @@ msgid "" " with -S or -s\n" msgstr "" -#: src/pr.c:2869 +#: src/pr.c:2852 msgid "" "\n" "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" @@ -6327,16 +7183,21 @@ msgid "" "If no VARIABLE is specified, print name and value pairs for them all.\n" "\n" msgstr "" +"Uzmaniero: %s [OPCIO...] [VARIABLO...]\n" +"\n" +"Eligas la valorojn de la indikata(j) ĉirkaŭaĵa(j) variablo(j).\n" +"Sen iu VARIABLO, paroj de nomo kaj valoro por ĉiuj ekzistantaj eligiĝas.\n" +"\n" #: src/printenv.c:69 msgid " -0, --null end each output line with 0 byte rather than newline\n" -msgstr "" +msgstr " -0, --null disigi eligon per nulbajtoj anstataŭ per novlinioj\n" #: src/printf.c:79 #, c-format msgid "" "warning: %s: character(s) following character constant have been ignored" -msgstr "" +msgstr "averto: %s: signo(j) post signokonstanto ignoriĝas" #: src/printf.c:88 #, c-format @@ -6445,17 +7306,16 @@ msgstr "" msgid "" "Output a permuted index, including context, of the words in the input " "files.\n" -"\n" msgstr "" -#: src/ptx.c:1828 +#: src/ptx.c:1827 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:1833 +#: src/ptx.c:1832 msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" " -O, --format=roff generate output as roff directives\n" @@ -6464,7 +7324,7 @@ msgid "" " -T, --format=tex generate output as TeX directives\n" msgstr "" -#: src/ptx.c:1840 +#: src/ptx.c:1839 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -6474,7 +7334,7 @@ msgid "" " -o, --only-file=FILE read only word list from this FILE\n" msgstr "" -#: src/ptx.c:1848 +#: src/ptx.c:1847 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -6482,7 +7342,7 @@ msgid "" "excluded\n" msgstr "" -#: src/ptx.c:1855 +#: src/ptx.c:1854 msgid "" "\n" "With no FILE or if FILE is -, read Standard Input. '-F /' by default.\n" @@ -6491,7 +7351,7 @@ msgstr "" "Sen DOSIERO, aŭ kiam DOSIERO estas «-», ĉefenigujo legiĝas.\n" "Defaŭlte uziĝas opcio «-F /».\n" -#: src/ptx.c:1949 +#: src/ptx.c:1948 #, c-format msgid "invalid gap width: %s" msgstr "nevalida larĝo de fendo: %s" @@ -6501,19 +7361,24 @@ msgid "" "Print the full filename of the current working directory.\n" "\n" msgstr "" +"Eligas la kompletan dosiernomon de la aktuala labordosierujo.\n" +"\n" #: src/pwd.c:61 msgid "" " -L, --logical use PWD from environment, even if it contains symlinks\n" " -P, --physical avoid all symlinks\n" msgstr "" +" -L, --logical uzi PWD de la ĉirkaŭaĵo, eĉ se ĝi enhavas simbolajn " +"ligojn\n" +" -P, --physical eviti ĉiujn simbolajn ligojn\n" #: src/pwd.c:166 #, 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/pwd.c:170 src/pwd.c:277 src/split.c:373 #, c-format msgid "failed to stat %s" msgstr "malsukcesis eltrovi statinformon pri %s" @@ -6529,14 +7394,15 @@ msgid "ignoring non-option arguments" msgstr "ignoratas ne-opciaj argumentoj" #. This is a proper name. See the gettext manual, section Names. -#: src/readlink.c:33 +#: src/readlink.c:32 msgid "Dmitry V. Levin" msgstr "Dmitri LEVIN (Dmitry V. Levin)" -#: src/readlink.c:62 +#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147 +#: src/stat.c:1349 src/touch.c:212 #, c-format -msgid "Usage: %s [OPTION]... FILE\n" -msgstr "Uzmaniero: %s [OPCIO...] DOSIERO\n" +msgid "Usage: %s [OPTION]... FILE...\n" +msgstr "Uzmaniero: %s [OPCIO...] DOSIERO...\n" #: src/readlink.c:63 msgid "" @@ -6565,17 +7431,18 @@ msgid "" "recursively,\n" " without requirements on components " "existence\n" -" -n, --no-newline do not output the trailing newline\n" +" -n, --no-newline do not output the trailing delimiter\n" " -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" msgstr "" -#: src/realpath.c:71 src/rm.c:134 src/shred.c:147 src/stat.c:1330 -#: src/touch.c:215 -#, c-format -msgid "Usage: %s [OPTION]... FILE...\n" -msgstr "Uzmaniero: %s [OPCIO...] DOSIERO...\n" +#: src/readlink.c:152 +#, fuzzy, c-format +msgid "ignoring --no-newline with multiple arguments" +msgstr "ignoratas ne-opciaj argumentoj" #: src/realpath.c:72 msgid "" @@ -6600,14 +7467,14 @@ msgstr "" #: src/relpath.c:130 msgid "generating relative path" -msgstr "" +msgstr "relativa pado generiĝas" -#: src/remove.c:286 +#: src/remove.c:273 #, c-format msgid "%s: descend into write-protected directory %s? " msgstr "%s: ĉu eniri en kontraŭskribe protektatan dosierujon %s? " -#: src/remove.c:287 +#: src/remove.c:274 #, c-format msgid "%s: descend into directory %s? " msgstr "%s: ĉu eniri en dosierujon %s? " @@ -6616,37 +7483,37 @@ msgstr "%s: ĉu eniri en dosierujon %s? " #. translate "%s: remove %s (write-protected) %s? " #. instead. It should avoid grammatical problems #. with the output of file_type. -#: src/remove.c:303 +#: src/remove.c:290 #, c-format msgid "%s: remove write-protected %s %s? " msgstr "%s: ĉu forigi kontraŭskribe protektatan %s %s? " -#: src/remove.c:304 +#: src/remove.c:291 #, c-format msgid "%s: remove %s %s? " msgstr "%s: ĉu forigi %s %s? " -#: src/remove.c:417 +#: src/remove.c:374 #, c-format msgid "removed directory: %s\n" msgstr "forigiĝis dosierujo %s\n" -#: src/remove.c:481 +#: src/remove.c:444 #, c-format msgid "cannot remove directory: %s" msgstr "ne eblas forigi dosierujon %s" -#: src/remove.c:537 +#: src/remove.c:500 #, c-format msgid "skipping %s, since it's on a different device" msgstr "transsaltatas %s, ĉar ĝi estas en alia aparato" -#: src/remove.c:557 +#: src/remove.c:520 #, c-format msgid "traversal failed: %s" msgstr "malsukcesis transiro: %s" -#: src/remove.c:563 +#: src/remove.c:526 #, c-format msgid "" "unexpected failure: fts_info=%d: %s\n" @@ -6655,12 +7522,12 @@ msgstr "" "neatendita malsukceso: fts_info()=%d: %s\n" "bonvolu raporti ĉi tion al %s" -#: src/rm.c:118 +#: src/rm.c:119 #, c-format msgid "Try '%s ./%s' to remove the file %s.\n" msgstr "Tajpu '%s ./%s' por forigi dosieron %s.\n" -#: src/rm.c:135 +#: src/rm.c:136 msgid "" "Remove (unlink) the FILE(s).\n" "\n" @@ -6669,7 +7536,7 @@ msgid "" " -i prompt before every removal\n" msgstr "" -#: src/rm.c:141 +#: src/rm.c:142 msgid "" " -I prompt once before removing more than three files, " "or\n" @@ -6681,22 +7548,23 @@ msgid "" " always (-i). Without WHEN, prompt always\n" msgstr "" -#: src/rm.c:148 +#: src/rm.c:149 msgid "" " --one-file-system when removing a hierarchy recursively, skip any\n" " directory that is on a file system different from\n" " that of the corresponding command line argument\n" msgstr "" -#: src/rm.c:153 +#: src/rm.c:154 msgid "" " --no-preserve-root do not treat '/' specially\n" " --preserve-root do not remove '/' (default)\n" " -r, -R, --recursive remove directories and their contents recursively\n" +" -d, --dir remove empty directories\n" " -v, --verbose explain what is being done\n" msgstr "" -#: src/rm.c:161 +#: src/rm.c:163 msgid "" "\n" "By default, rm does not remove directories. Use the --recursive (-r or -R)\n" @@ -6707,7 +7575,7 @@ msgstr "" "Defaŭlte, 'rm' ne forigas dosierujojn. Uzu opcion '--recursive' (-r aŭ -R)\n" "por ankaŭ forigi ĉiun indikatan dosierujon kaj ĝian tutan enhavon.\n" -#: src/rm.c:166 +#: src/rm.c:168 #, c-format msgid "" "\n" @@ -6718,7 +7586,7 @@ msgid "" " %s ./-foo\n" msgstr "" -#: src/rm.c:175 +#: src/rm.c:177 msgid "" "\n" "Note that if you use rm to remove a file, it might be possible to recover\n" @@ -6726,12 +7594,12 @@ msgid "" "assurance that the contents are truly unrecoverable, consider using shred.\n" msgstr "" -#: src/rm.c:335 +#: src/rm.c:342 #, c-format msgid "%s: remove all arguments recursively? " -msgstr "%s: ĉu forigi ĉiujn argumentojn rekursie? " +msgstr "%s: ĉu forigi ĉiujn argumentojn rikure? " -#: src/rm.c:336 +#: src/rm.c:343 #, c-format msgid "%s: remove all arguments? " msgstr "%s: ĉu forigi ĉiujn argumentojn? " @@ -6754,6 +7622,11 @@ msgid "" " ignore each failure that is solely because a directory\n" " is non-empty\n" msgstr "" +"Forigas ĉiun DOSIERUJOn, se ĝi vakas.\n" +"\n" +" --ignore-fail-on-non-empty\n" +" ignori ĉiun malsukceson kiu kaŭziĝas nur per nevaka " +"dosierujo\n" #: src/rmdir.c:172 msgid "" @@ -6762,6 +7635,9 @@ msgid "" " similar to 'rmdir a/b/c a/b a'\n" " -v, --verbose output a diagnostic for every directory processed\n" msgstr "" +" -p, --parents forigi la DOSIERUJOn kaj ĝiajn patrajn; ekzemple\n" +" «rmdir -p a/b/c» similas al «rmdir a/b/c a/b a»\n" +" -v, --verbose eligi mesaĝon por ĉiu dosierujo kiu proceziĝis\n" #: src/rmdir.c:242 #, c-format @@ -6779,7 +7655,10 @@ msgstr "" msgid "" "Run a program in a different security context.\n" "With neither CONTEXT nor COMMAND, print the current security context.\n" -"\n" +msgstr "" + +#: src/runcon.c:94 +msgid "" " CONTEXT Complete security context\n" " -c, --compute compute process transition context before modifying\n" " -t, --type=TYPE type (for same role as parent)\n" @@ -6789,72 +7668,72 @@ msgid "" "\n" msgstr "" -#: src/runcon.c:140 +#: src/runcon.c:144 #, c-format msgid "multiple roles" msgstr "pluraj roloj" -#: src/runcon.c:145 +#: src/runcon.c:149 #, c-format msgid "multiple types" msgstr "pluraj tipoj" -#: src/runcon.c:150 +#: src/runcon.c:154 #, c-format msgid "multiple users" msgstr "pluraj uzantoj" -#: src/runcon.c:155 +#: src/runcon.c:159 #, c-format msgid "multiple levelranges" -msgstr "pluraj intervaloj de niveloj" +msgstr "pluraj gamoj de niveloj" -#: src/runcon.c:173 src/runcon.c:209 +#: src/runcon.c:177 src/runcon.c:213 #, c-format msgid "failed to get current context" msgstr "malsukcesis eltrovi aktualan kuntekston" -#: src/runcon.c:183 +#: src/runcon.c:187 #, c-format msgid "you must specify -c, -t, -u, -l, -r, or context" msgstr "nepras indiki '-c', '-l', '-r', '-t', '-u' aŭ kuntekston" -#: src/runcon.c:191 +#: src/runcon.c:195 #, c-format msgid "no command specified" msgstr "neniu komando indikatas" -#: src/runcon.c:197 +#: src/runcon.c:201 #, c-format msgid "%s may be used only on a SELinux kernel" msgstr "eblas uzi %s nur je SE-Linuksa kerno" -#: src/runcon.c:223 +#: src/runcon.c:227 #, c-format msgid "failed to compute a new context" msgstr "malsukcesis kalkuli novan kuntekston" -#: src/runcon.c:237 +#: src/runcon.c:241 #, c-format msgid "failed to set new user %s" msgstr "malsukcesis agordi novan uzanton %s" -#: src/runcon.c:239 +#: src/runcon.c:243 #, c-format msgid "failed to set new type %s" msgstr "malsukcesis agordi novan tipon %s" -#: src/runcon.c:241 +#: src/runcon.c:245 #, c-format msgid "failed to set new range %s" -msgstr "malsukcesis agordi novan intervalon %s" +msgstr "malsukcesis agordi novan gamon %s" -#: src/runcon.c:243 +#: src/runcon.c:247 #, c-format msgid "failed to set new role %s" msgstr "malsukcesis agordi novan rolon %s" -#: src/runcon.c:251 +#: src/runcon.c:255 #, c-format msgid "unable to set security context %s" msgstr "malsukcesis agordi sekurecan kuntekston %s" @@ -6871,15 +7750,17 @@ msgstr "" " aŭ: %s [OPCIO...] UNUA PAŜO LASTA\n" #: src/seq.c:73 +msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" +msgstr "" + +#: src/seq.c:79 msgid "" -"Print numbers from FIRST to LAST, in steps of INCREMENT.\n" -"\n" " -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 "" -#: src/seq.c:82 +#: src/seq.c:86 msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" @@ -6889,39 +7770,24 @@ msgid "" "INCREMENT is usually negative if FIRST is greater than LAST.\n" msgstr "" -#: src/seq.c:90 +#: src/seq.c:94 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:136 +#: src/seq.c:140 #, c-format msgid "invalid floating point argument: %s" msgstr "nevalida glitkoma argumento: %s" -#: src/seq.c:193 -#, c-format -msgid "format %s has no %% directive" -msgstr "aranĝo %s ne enhavas %%-indikon" - -#: src/seq.c:210 -#, c-format -msgid "format %s ends in %%" -msgstr "aranĝo %s finiĝas per %%" - -#: src/seq.c:213 +#: src/seq.c:232 #, c-format msgid "format %s has unknown %%%c directive" msgstr "aranĝo %s enhavas nekonatan %%%c-indikon" -#: src/seq.c:217 -#, c-format -msgid "format %s has too many %% directives" -msgstr "aranĝo %s enhavas tro multajn %%-indikojn" - -#: src/seq.c:431 +#: src/seq.c:555 #, 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" @@ -6953,27 +7819,27 @@ msgid "" " (if specified) supplemental group IDs to GID1, ...\n" msgstr "" -#: src/setuidgid.c:163 +#: src/setuidgid.c:162 #, c-format msgid "unknown user-ID: %s" msgstr "nekonata uzant-ID: %s" -#: src/setuidgid.c:174 +#: 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:191 +#: src/setuidgid.c:190 #, c-format msgid "failed to set supplemental group(s)" msgstr "malsukcesis agordi la pluajn grupojn" -#: src/setuidgid.c:201 +#: 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:205 +#: src/setuidgid.c:204 #, c-format msgid "cannot set user-ID to %lu" msgstr "ne eblas agordi uzantan ID-on al %lu" @@ -6987,10 +7853,9 @@ msgstr "Kolin PLOM (Colin Plumb)" 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" -"\n" msgstr "" -#: src/shred.c:156 +#: src/shred.c:155 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -6999,7 +7864,7 @@ msgid "" " -s, --size=N shred this many bytes (suffixes like K, M, G accepted)\n" msgstr "" -#: src/shred.c:162 +#: src/shred.c:161 msgid "" " -u, --remove truncate and remove file after overwriting\n" " -v, --verbose show progress\n" @@ -7008,7 +7873,7 @@ msgid "" " -z, --zero add a final overwrite with zeros to hide shredding\n" msgstr "" -#: src/shred.c:171 +#: src/shred.c:170 msgid "" "\n" "If FILE is -, shred standard output.\n" @@ -7020,7 +7885,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:181 +#: src/shred.c:180 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" @@ -7031,7 +7896,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:189 +#: src/shred.c:188 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -7043,7 +7908,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:199 +#: src/shred.c:198 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -7052,7 +7917,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:206 +#: src/shred.c:205 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" @@ -7064,129 +7929,129 @@ msgid "" "\n" msgstr "" -#: src/shred.c:216 +#: src/shred.c:215 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:296 +#: src/shred.c:295 #, c-format msgid "%s: fdatasync failed" msgstr "malsukcesis 'fdatasync' por %s" -#: src/shred.c:307 +#: src/shred.c:306 #, c-format msgid "%s: fsync failed" msgstr "malsukcesis 'fsync' por %s" -#: src/shred.c:384 +#: src/shred.c:383 #, c-format msgid "%s: cannot rewind" msgstr "malsukcesis 'lseek' ĝis komenco sur %s" -#: src/shred.c:403 +#: src/shred.c:402 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: paŝo %lu/%lu (%s)..." -#: src/shred.c:453 +#: src/shred.c:452 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: skrib-eraro je pozicio %s" -#: src/shred.c:471 +#: src/shred.c:470 #, c-format msgid "%s: lseek failed" msgstr "malsukcesis 'lseek' sur %s" -#: src/shred.c:482 +#: src/shred.c:481 #, c-format msgid "%s: file too large" msgstr "%s: dosiero tro grandas" -#: src/shred.c:505 +#: src/shred.c:504 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: paŝo %lu/%lu (%s)...%s" -#: src/shred.c:521 +#: src/shred.c:520 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: paŝo %lu/%lu (%s)...%s/%s %d%%" -#: src/shred.c:768 +#: src/shred.c:767 #, c-format msgid "%s: fstat failed" msgstr "malsukcesis eltrovi statinformon pri malferma %s" -#: src/shred.c:779 +#: src/shred.c:778 #, c-format msgid "%s: invalid file type" msgstr "%s: nevalida dosiertipo" -#: src/shred.c:798 +#: src/shred.c:797 #, c-format msgid "%s: file has negative size" msgstr "%s: dosiero havas negativan grandon" -#: src/shred.c:865 +#: src/shred.c:864 src/sort.c:932 src/split.c:378 #, c-format msgid "%s: error truncating" msgstr "%s: eraro dum trunkado" -#: src/shred.c:881 +#: src/shred.c:880 #, c-format msgid "%s: fcntl failed" msgstr "malsukcesis fcntl() sur %s" -#: src/shred.c:886 +#: src/shred.c:885 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "maleblas tutviŝi nur-aldonan dosieron %s" -#: src/shred.c:968 +#: src/shred.c:967 #, c-format msgid "%s: removing" msgstr "forigiĝas %s" -#: src/shred.c:992 +#: src/shred.c:991 #, c-format msgid "%s: renamed to %s" msgstr "%s renomiĝis al %s" -#: src/shred.c:1014 +#: src/shred.c:1013 #, c-format msgid "%s: failed to remove" msgstr "malsukcesis forigi %s" -#: src/shred.c:1018 +#: src/shred.c:1017 #, c-format msgid "%s: removed" msgstr "forigiĝis %s" -#: src/shred.c:1025 src/shred.c:1068 +#: src/shred.c:1024 src/shred.c:1067 #, c-format msgid "%s: failed to close" msgstr "malsukcesis fermi %s" -#: src/shred.c:1061 +#: src/shred.c:1060 #, c-format msgid "%s: failed to open for writing" msgstr "malsukcesis malfermi %s por skribado" -#: src/shred.c:1126 +#: src/shred.c:1125 #, c-format msgid "%s: invalid number of passes" msgstr "nevalida nombro de paŝoj: %s" -#: src/shred.c:1135 src/shuf.c:291 src/sort.c:4387 +#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441 #, c-format msgid "multiple random sources specified" msgstr "pluraj aleatoraj fontoj indikatas" -#: src/shred.c:1149 +#: src/shred.c:1148 #, c-format msgid "%s: invalid file size" msgstr "%s: nevalida dosiergrando" @@ -7200,15 +8065,16 @@ msgid "" msgstr "" "Uzmaniero: %s [OPCIO...] [DOSIERO]\n" " aŭ: %s -e [OPCIO...] [ARGUMENTO...]\n" -" aŭ: %s -i MALALTA-ALTA [OPCIO...]\n" +" aŭ: %s -i DE-ĜIS [OPCIO...]\n" #: src/shuf.c:54 -msgid "" -"Write a random permutation of the input lines to standard output.\n" -"\n" +#, fuzzy +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:61 +#: src/shuf.c:60 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 " @@ -7218,28 +8084,37 @@ msgid "" " --random-source=FILE get random bytes from FILE\n" " -z, --zero-terminated end lines with 0 byte, not newline\n" msgstr "" +" -e, --echo trakti ĉiun ARGUMENTOn kiel enigan linion\n" +" -i, --input-range=DE-ĜIS trakti ĉiun numeron ekde DE tra ĜIS kiel " +"enigan linion\n" +" -n, --head-count=NOMBRO eligi maksimume NOMBRO liniojn\n" +" -o, --output=DOSIERO eligi rezulton al DOSIERO anstataŭ al " +"ĉefeligujo\n" +" --random-source=DOSIERO preni hazardajn bajtojn el DOSIERO\n" +" -z, --zero-terminated disigi eligon per nulbajtoj anstataŭ per " +"novlinioj\n" -#: src/shuf.c:245 +#: src/shuf.c:244 #, c-format msgid "multiple -i options specified" msgstr "pluraj opcioj '-i' indikatas" -#: src/shuf.c:265 +#: src/shuf.c:264 #, c-format msgid "invalid input range %s" -msgstr "nevalida intervalo: %s" +msgstr "nevalida gamo: %s" -#: src/shuf.c:278 +#: src/shuf.c:277 #, c-format msgid "invalid line count %s" msgstr "nevalida nombro de linioj: %s" -#: src/shuf.c:285 src/sort.c:4381 +#: src/shuf.c:284 src/sort.c:4435 #, c-format msgid "multiple output files specified" msgstr "pluraj eligaj dosieroj indikatas" -#: src/shuf.c:311 +#: src/shuf.c:310 #, c-format msgid "cannot combine -e and -i options" msgstr "nekombineblas opcioj '-e' kaj '-i'" @@ -7258,7 +8133,7 @@ msgid "" "\n" msgstr "" -#: src/sleep.c:135 src/timeout.c:295 +#: src/sleep.c:135 src/timeout.c:320 #, c-format msgid "invalid time interval %s" msgstr "nevalida tempintervalo: %s" @@ -7268,13 +8143,14 @@ msgstr "nevalida tempintervalo: %s" msgid "cannot read realtime clock" msgstr "malsukcesis legi realtempan horloĝon" -#: src/sort.c:395 -msgid "" -"Write sorted concatenation of all FILE(s) to standard output.\n" -"\n" +#: src/sort.c:399 +#, fuzzy +msgid "Write sorted concatenation of all FILE(s) to standard output.\n" msgstr "" +"Eligas al ĉefeligujo elektitajn partojn de linioj de ĉiu DOSIERO.\n" +"\n" -#: src/sort.c:402 +#: src/sort.c:405 msgid "" "Ordering options:\n" "\n" @@ -7282,7 +8158,7 @@ msgstr "" "Ordigantaj opcioj:\n" "\n" -#: src/sort.c:406 +#: src/sort.c:409 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -7290,19 +8166,19 @@ msgid "" " -f, --ignore-case fold lower case to upper case characters\n" msgstr "" -#: src/sort.c:412 +#: src/sort.c:415 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:417 +#: src/sort.c:420 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" -#: src/sort.c:420 +#: src/sort.c:423 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -7310,7 +8186,7 @@ msgid "" " -r, --reverse reverse the result of comparisons\n" msgstr "" -#: src/sort.c:426 +#: src/sort.c:429 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -7320,7 +8196,7 @@ msgid "" "\n" msgstr "" -#: src/sort.c:434 +#: src/sort.c:437 msgid "" "Other options:\n" "\n" @@ -7328,13 +8204,13 @@ msgstr "" "Aliaj opcioj:\n" "\n" -#: src/sort.c:438 +#: src/sort.c:441 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" msgstr "" -#: src/sort.c:442 +#: src/sort.c:445 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 " @@ -7343,7 +8219,7 @@ msgid "" " decompress them with PROG -d\n" msgstr "" -#: src/sort.c:449 +#: src/sort.c:452 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -7352,13 +8228,13 @@ msgid "" " If F is - then read names from standard input\n" msgstr "" -#: src/sort.c:456 +#: src/sort.c:459 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:460 +#: src/sort.c:463 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -7366,7 +8242,7 @@ msgid "" " -S, --buffer-size=SIZE use SIZE for main memory buffer\n" msgstr "" -#: src/sort.c:466 +#: src/sort.c:469 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -7381,11 +8257,13 @@ msgid "" "run\n" msgstr "" -#: src/sort.c:475 +#: 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:480 +#: src/sort.c:483 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -7404,7 +8282,7 @@ msgid "" "SIZE may be followed by the following multiplicative suffixes:\n" msgstr "" -#: src/sort.c:493 +#: src/sort.c:496 msgid "" "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n" "\n" @@ -7416,260 +8294,263 @@ msgid "" "native byte values.\n" msgstr "" -#: src/sort.c:694 +#: src/sort.c:697 #, c-format msgid "waiting for %s [-d]" msgstr "atendado pri '%s [-d]'" -#: src/sort.c:699 +#: src/sort.c:702 #, c-format msgid "%s [-d] terminated abnormally" msgstr "'%s [-d]' finiĝis nenormale" -#: src/sort.c:853 +#: src/sort.c:856 #, c-format msgid "cannot create temporary file in %s" msgstr "malsukcesis krei provizoran dosieron en %s" -#: src/sort.c:939 src/sort.c:2010 src/sort.c:3056 src/sort.c:3755 -#: src/sort.c:3758 +#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713 +#: src/sort.c:3804 src/sort.c:3807 msgid "open failed" msgstr "malsukcesis malfermo" -#: src/sort.c:959 +#: src/sort.c:970 msgid "fflush failed" msgstr "malsukcesis fflush()" -#: src/sort.c:964 src/sort.c:2013 src/sort.c:4646 +#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706 msgid "close failed" msgstr "malsukcesis fermo" -#: src/sort.c:973 +#: src/sort.c:986 #, c-format msgid "dup2 failed" msgstr "malsukcesis dup2()" -#: src/sort.c:1090 +#: src/sort.c:1103 #, c-format msgid "couldn't execute %s" msgstr "malsukcesis ruli %s" -#: src/sort.c:1097 +#: src/sort.c:1110 msgid "couldn't create temporary file" msgstr "malsukcesis krei provizoran dosieron" -#: src/sort.c:1136 +#: src/sort.c:1149 #, c-format msgid "couldn't create process for %s -d" msgstr "malsukcesis krei novan procezon por '%s -d'" -#: src/sort.c:1150 +#: src/sort.c:1161 #, c-format msgid "couldn't execute %s -d" msgstr "malsukcesis ruli '%s -d'" -#: src/sort.c:1209 +#: src/sort.c:1220 #, c-format msgid "warning: cannot remove: %s" msgstr "averto: malsukcesis forigi %s" -#: src/sort.c:1295 +#: src/sort.c:1306 #, c-format msgid "invalid --%s argument %s" msgstr "nevalida argumento por opcio '--%s': %s" -#: src/sort.c:1298 +#: src/sort.c:1309 #, c-format msgid "minimum --%s argument is %s" msgstr "minimuma argumento por opcio '--%s' estas %s" -#: src/sort.c:1313 +#: src/sort.c:1324 #, c-format msgid "--%s argument %s too large" msgstr "argumento por opcio '--%s' tro grandas: %s" -#: src/sort.c:1316 +#: src/sort.c:1327 #, 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:1398 +#: src/sort.c:1409 #, c-format msgid "number in parallel must be nonzero" msgstr "paralelnombro devas esti pli ol nulo" -#: src/sort.c:1479 +#: src/sort.c:1494 msgid "stat failed" msgstr "malsukcesis eltrovi statinformon" -#: src/sort.c:1740 +#: src/sort.c:1755 msgid "read failed" msgstr "malsukcesis lego" -#: src/sort.c:2028 +#: src/sort.c:2043 #, c-format msgid "string transformation failed" msgstr "malsukcesis transformi signoĉenon" -#: src/sort.c:2031 +#: src/sort.c:2046 #, c-format msgid "the untransformed string was %s" msgstr "la neŝanĝita ĉeno estas %s" -#: src/sort.c:2194 +#: src/sort.c:2209 #, c-format msgid "^ no match for key\n" msgstr "^ neniu kongruo por klavo\n" -#: src/sort.c:2374 +#: src/sort.c:2389 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "uziĝis olda klavo %s; pripensu uzi %s anstataŭe" -#: src/sort.c:2380 +#: src/sort.c:2395 #, 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:2391 +#: src/sort.c:2406 #, 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:2404 +#: src/sort.c:2419 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "klavo %lu estas numera kaj ampleksas plurajn kampojn" -#: src/sort.c:2436 +#: src/sort.c:2451 #, 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:2442 +#: src/sort.c:2457 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "opcio «-r» aplikas nur al lastebla komparo" -#: src/sort.c:2716 src/sort.c:2725 +#: src/sort.c:2731 src/sort.c:2740 msgid "write failed" msgstr "malsukcesis skribo" -#: src/sort.c:2768 +#: src/sort.c:2783 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: malordo: " -#: src/sort.c:2771 +#: src/sort.c:2786 msgid "standard error" msgstr "ĉeferar-eligujo" -#: src/sort.c:3926 +#: src/sort.c:3698 +msgid "cannot read" +msgstr "ne eblas legi" + +#: src/sort.c:3976 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: nevalida kampindiko %s" -#: src/sort.c:3937 +#: src/sort.c:3987 #, c-format msgid "options '-%s' are incompatible" msgstr "nekombineblas opcioj «-%s»" -#: src/sort.c:3988 +#: src/sort.c:4038 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s: nevalida nombro je komenco de %s" -#: src/sort.c:4245 +#: src/sort.c:4295 msgid "invalid number after '-'" msgstr "nevalida numero post '-'" -#: src/sort.c:4248 src/sort.c:4334 src/sort.c:4362 +#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416 msgid "invalid number after '.'" msgstr "nevalida numero post '.'" -#: src/sort.c:4261 src/sort.c:4367 +#: src/sort.c:4315 src/sort.c:4421 msgid "stray character in field spec" msgstr "hazarda signo en kampindiko" -#: src/sort.c:4308 +#: src/sort.c:4362 #, c-format msgid "multiple compress programs specified" msgstr "pluraj kunpremaj programoj indikatas" -#: src/sort.c:4325 +#: src/sort.c:4379 msgid "invalid number at field start" msgstr "nevalida numero je kampkomenco" -#: src/sort.c:4329 src/sort.c:4357 +#: src/sort.c:4383 src/sort.c:4411 msgid "field number is zero" msgstr "kampnumero estas nulo" -#: src/sort.c:4338 +#: src/sort.c:4392 msgid "character offset is zero" msgstr "signopozicio estas nulo" -#: src/sort.c:4353 +#: src/sort.c:4407 msgid "invalid number after ','" msgstr "nevalida numero post ','" -#: src/sort.c:4403 +#: src/sort.c:4457 #, c-format msgid "empty tab" msgstr "vaka tabo" -#: src/sort.c:4496 src/wc.c:692 +#: src/sort.c:4550 src/wc.c:692 #, c-format msgid "cannot read file names from %s" msgstr "malsukcesis legi dosiernomojn el %s" -#: src/sort.c:4518 +#: src/sort.c:4572 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s:%lu: nevalida dosiernomo (longo nulas)" -#: src/sort.c:4524 +#: src/sort.c:4578 #, c-format msgid "no input from %s" msgstr "neniu enigo el %s" -#: src/sort.c:4570 +#: src/sort.c:4624 #, c-format msgid "using %s sorting rules" msgstr "uzatas %s ordigaj reguloj" -#: src/sort.c:4573 +#: src/sort.c:4627 #, c-format msgid "using simple byte comparison" msgstr "uzatas simpla bajtkomparo" -#: src/sort.c:4604 +#: src/sort.c:4658 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "aldona argumento %s ne permesatas por '-%c'" -#: src/split.c:184 +#: src/split.c:187 #, c-format msgid "the suffix length needs to be at least %zu" msgstr "longo de sufikso nepras esti almenaŭ %zu" -#: src/split.c:201 +#: src/split.c:204 #, c-format msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" msgstr "Uzmaniero: %s [OPCIO...] [ENIGO [PREFIKSO]]\n" -#: src/split.c:205 +#: src/split.c:208 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" -"\n" msgstr "" -#: src/split.c:214 +#: src/split.c:216 #, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" @@ -7688,13 +8569,13 @@ msgid "" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" -#: src/split.c:227 +#: src/split.c:229 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" msgstr "" -#: src/split.c:234 +#: src/split.c:236 msgid "" "\n" "CHUNKS may be:\n" @@ -7706,184 +8587,189 @@ msgid "" "r/K/N likewise but only output Kth of N to stdout\n" msgstr "" -#: src/split.c:352 +#: src/split.c:354 #, c-format msgid "output file suffixes exhausted" msgstr "elirdosieraj sufiksoj elĉerpiĝis" -#: src/split.c:364 +#: src/split.c:366 #, c-format msgid "creating file %s\n" msgstr "kreiĝas dosiero %s\n" -#: src/split.c:377 +#: src/split.c:375 +#, c-format +msgid "%s would overwrite input; aborting" +msgstr "%s anstataŭigus la enigon -- abortiĝas" + +#: src/split.c:391 #, c-format msgid "failed to set FILE environment variable" msgstr "malsukcesis agordi ĉirkaŭaĵan variablon FILE" -#: src/split.c:379 +#: src/split.c:393 #, c-format msgid "executing with FILE=%s\n" msgstr "plenumiĝas kun FILE=%s\n" -#: src/split.c:381 +#: src/split.c:395 #, c-format msgid "failed to create pipe" msgstr "malsukcesis krei dukton" -#: src/split.c:395 +#: src/split.c:409 #, c-format msgid "closing prior pipe" msgstr "fermiĝas antaŭa dukto" -#: src/split.c:397 +#: src/split.c:411 #, c-format msgid "closing output pipe" msgstr "fermiĝas eliga dukto" -#: src/split.c:401 +#: src/split.c:415 #, c-format msgid "moving input pipe" msgstr "moviĝas eniga dukto" -#: src/split.c:403 +#: src/split.c:417 #, c-format msgid "closing input pipe" msgstr "fermiĝas eniga dukto" -#: src/split.c:408 +#: src/split.c:422 #, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "malsukcesis ruli komandon \"%s -c %s\"" -#: src/split.c:414 +#: src/split.c:428 #, c-format msgid "failed to close input pipe" msgstr "malsukcesis fermi enigan dukton" -#: src/split.c:450 +#: src/split.c:464 #, c-format msgid "waiting for child process" msgstr "atendado pri ida procezo" -#: src/split.c:460 +#: src/split.c:474 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "kun FILE=%s, signalo %s el komando %s" -#: src/split.c:468 +#: src/split.c:482 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "kun FILE=%s, eliro %d el komando %s" -#: src/split.c:475 src/timeout.c:449 +#: src/split.c:489 src/timeout.c:494 #, c-format msgid "unknown status from command (0x%X)" msgstr "nekonata rezulto (0x%X) el komando" -#: src/split.c:1037 +#: src/split.c:1052 #, c-format msgid "cannot split in more than one way" msgstr "maleblas dividi en pluraj manieroj" -#: src/split.c:1050 src/split.c:1192 src/split.c:1363 +#: src/split.c:1065 src/split.c:1205 src/split.c:1376 #, c-format msgid "%s: invalid number of chunks" msgstr "nevalida nombro da pecoj: %s" -#: src/split.c:1054 +#: src/split.c:1069 #, c-format msgid "%s: invalid chunk number" msgstr "nevalida pecnumero: %s" -#: src/split.c:1106 +#: src/split.c:1119 #, c-format msgid "%s: invalid suffix length" msgstr "nevalida sufikslongo: %s" -#: src/split.c:1131 src/split.c:1139 src/split.c:1162 src/split.c:1167 +#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180 #, c-format msgid "%s: invalid number of bytes" msgstr "nevalida nombro da bajtoj: %s" -#: src/split.c:1150 src/split.c:1297 +#: src/split.c:1163 src/split.c:1310 #, c-format msgid "%s: invalid number of lines" msgstr "nevalida nombro da linioj: %s" -#: src/split.c:1223 +#: src/split.c:1236 #, c-format msgid "line count option -%s%c... is too large" msgstr "lininombro '-%s%c...' tro grandas" -#: src/split.c:1235 +#: src/split.c:1248 #, c-format msgid "%s: invalid start value for numerical suffix" msgstr "%s: nevalida komenca valoro por numera sufikso" -#: src/split.c:1263 +#: src/split.c:1276 #, c-format msgid "%s: invalid IO block size" msgstr "nevalida grando por IO-bloko: %s" -#: src/split.c:1284 +#: src/split.c:1297 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "opcio «--filter» ne pritraktas pecon eligatan al ĉefeligujo" -#: src/split.c:1321 +#: src/split.c:1334 #, c-format msgid "numerical suffix start value is too large for the suffix length" -msgstr "" +msgstr "komenca valoro de numereca sufikso tro grandas por sufikslongo" -#: src/split.c:1356 +#: src/split.c:1369 #, 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:169 +#: src/stat.c:173 msgid "Michael Meskes" msgstr "Majkel MESKES (Michael Meskes)" -#: src/stat.c:838 +#: src/stat.c:857 #, c-format msgid "failed to canonicalize %s" msgstr "malsukcesis normaligi %s" -#: src/stat.c:1050 +#: src/stat.c:1069 #, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "averto: nerekonata eskapsigno '\\%c'" -#: src/stat.c:1105 +#: src/stat.c:1124 #, c-format msgid "%s: invalid directive" msgstr "nevalida indiko: %s" -#: src/stat.c:1151 +#: src/stat.c:1170 #, c-format msgid "warning: backslash at end of format" msgstr "averto: malsuprenstreko je aranĝofino" -#: src/stat.c:1182 +#: src/stat.c:1201 #, 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:1189 +#: src/stat.c:1208 #, c-format msgid "cannot read file system information for %s" msgstr "malsukcesis legi en dosiersistemo informon pri %s" -#: src/stat.c:1209 +#: src/stat.c:1228 #, 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:1245 +#: src/stat.c:1264 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -7899,7 +8785,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1268 +#: src/stat.c:1287 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -7909,30 +8795,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1278 +#: src/stat.c:1297 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:1286 +#: src/stat.c:1305 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:1295 +#: src/stat.c:1314 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:1305 +#: src/stat.c:1324 #, c-format msgid "Context: %C\n" msgstr "Kunteksto: %C\n" -#: src/stat.c:1313 +#: src/stat.c:1332 msgid "" "Access: %x\n" "Modify: %y\n" @@ -7944,15 +8830,17 @@ msgstr "" "Ŝanĝo: %z\n" "Kreo: %w\n" -#: src/stat.c:1331 +#: src/stat.c:1350 +msgid "Display file or file system status.\n" +msgstr "" + +#: src/stat.c:1356 msgid "" -"Display file or file system status.\n" -"\n" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" -#: src/stat.c:1337 +#: src/stat.c:1360 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -7962,7 +8850,7 @@ msgid "" " -t, --terse print the information in terse form\n" msgstr "" -#: src/stat.c:1348 +#: src/stat.c:1371 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -7974,7 +8862,7 @@ msgid "" " %C SELinux security context string\n" msgstr "" -#: src/stat.c:1357 +#: src/stat.c:1380 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -7984,7 +8872,7 @@ msgid "" " %G group name of owner\n" msgstr "" -#: src/stat.c:1365 +#: src/stat.c:1388 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -7997,7 +8885,7 @@ msgid "" " %T minor device type in hex\n" msgstr "" -#: src/stat.c:1376 +#: src/stat.c:1399 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -8012,7 +8900,7 @@ msgid "" "\n" msgstr "" -#: src/stat.c:1390 +#: src/stat.c:1413 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -8023,7 +8911,7 @@ msgid "" " %f free blocks in file system\n" msgstr "" -#: src/stat.c:1399 +#: src/stat.c:1422 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -8042,30 +8930,29 @@ msgstr "Uzmaniero: %s OPCIO... KOMANDO\n" #: src/stdbuf.c:91 msgid "" "Run COMMAND, with modified buffering operations for its standard streams.\n" -"\n" msgstr "" -#: src/stdbuf.c:98 +#: src/stdbuf.c:97 msgid "" " -i, --input=MODE adjust standard input stream buffering\n" " -o, --output=MODE adjust standard output stream buffering\n" " -e, --error=MODE adjust standard error stream buffering\n" msgstr "" -#: src/stdbuf.c:105 +#: src/stdbuf.c:104 msgid "" "\n" "If MODE is 'L' the corresponding stream will be line buffered.\n" "This option is invalid with standard input.\n" msgstr "" -#: src/stdbuf.c:108 +#: src/stdbuf.c:107 msgid "" "\n" "If MODE is '0' the corresponding stream will be unbuffered.\n" msgstr "" -#: src/stdbuf.c:111 +#: src/stdbuf.c:110 msgid "" "\n" "Otherwise MODE is a number which may be followed by one of the following:\n" @@ -8075,7 +8962,7 @@ msgid "" "size set to MODE bytes.\n" msgstr "" -#: src/stdbuf.c:117 +#: src/stdbuf.c:116 msgid "" "\n" "NOTE: If COMMAND adjusts the buffering of its standard streams ('tee' does\n" @@ -8085,22 +8972,22 @@ msgid "" "and are thus unaffected by 'stdbuf' settings.\n" msgstr "" -#: src/stdbuf.c:227 +#: src/stdbuf.c:226 #, c-format msgid "failed to find %s" msgstr "malsukcesis trovi %s" -#: src/stdbuf.c:247 src/stdbuf.c:279 +#: src/stdbuf.c:246 src/stdbuf.c:278 #, c-format msgid "failed to update the environment with %s" msgstr "malsukcesis ĝisdatigi la ĉirkaŭaĵon kun %s" -#: src/stdbuf.c:321 +#: src/stdbuf.c:320 #, c-format msgid "line buffering stdin is meaningless" msgstr "linia bufrado de ĉefenigaĵo sensencas" -#: src/stty.c:509 +#: src/stty.c:513 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -8111,23 +8998,25 @@ msgstr "" " aŭ: %s [-F APARATO | --file=APARATO] [-a|--all]\n" " aŭ: %s [-F APARATO | --file=APARATO] [-g|--save]\n" -#: src/stty.c:515 +#: src/stty.c:519 +msgid "Print or change terminal characteristics.\n" +msgstr "" + +#: src/stty.c:525 msgid "" -"Print or change terminal characteristics.\n" -"\n" " -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:524 +#: src/stty.c:532 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:529 +#: src/stty.c:537 msgid "" "\n" "Special characters:\n" @@ -8136,7 +9025,7 @@ msgid "" " eol CHAR CHAR will end the line\n" msgstr "" -#: src/stty.c:536 +#: src/stty.c:544 msgid "" " * eol2 CHAR alternate CHAR for ending the line\n" " erase CHAR CHAR will erase the last character typed\n" @@ -8144,7 +9033,7 @@ msgid "" " kill CHAR CHAR will erase the current line\n" msgstr "" -#: src/stty.c:542 +#: src/stty.c:550 msgid "" " * lnext CHAR CHAR will enter the next character quoted\n" " quit CHAR CHAR will send a quit signal\n" @@ -8152,7 +9041,7 @@ msgid "" " start CHAR CHAR will restart the output after stopping it\n" msgstr "" -#: src/stty.c:548 +#: src/stty.c:556 msgid "" " stop CHAR CHAR will stop the output\n" " susp CHAR CHAR will send a terminal stop signal\n" @@ -8160,7 +9049,7 @@ msgid "" " * werase CHAR CHAR will erase the last word typed\n" msgstr "" -#: src/stty.c:554 +#: src/stty.c:562 msgid "" "\n" "Special settings:\n" @@ -8169,7 +9058,7 @@ msgid "" " * columns N same as cols N\n" msgstr "" -#: src/stty.c:561 +#: src/stty.c:569 msgid "" " ispeed N set the input speed to N\n" " * line N use line discipline N\n" @@ -8178,7 +9067,7 @@ msgid "" " ospeed N set the output speed to N\n" msgstr "" -#: src/stty.c:567 +#: src/stty.c:575 msgid "" " * rows N tell the kernel that the terminal has N rows\n" " * size print the number of rows and columns according to the " @@ -8187,27 +9076,28 @@ msgid "" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" -#: src/stty.c:573 +#: src/stty.c:581 msgid "" "\n" "Control settings:\n" " [-]clocal disable modem control signals\n" " [-]cread allow input to be received\n" " * [-]crtscts enable RTS/CTS handshaking\n" +" * [-]cdtrdsr enable DTR/DSR handshaking\n" " csN set character size to N bits, N in [5..8]\n" msgstr "" -#: src/stty.c:581 +#: src/stty.c:590 msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" " [-]hupcl same as [-]hup\n" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" -" [-]parodd set odd parity (even with '-')\n" +" [-]parodd set odd parity (or even parity with '-')\n" msgstr "" -#: src/stty.c:588 +#: src/stty.c:597 msgid "" "\n" "Input settings:\n" @@ -8217,7 +9107,7 @@ msgid "" " [-]igncr ignore carriage return\n" msgstr "" -#: src/stty.c:596 +#: src/stty.c:605 msgid "" " [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" @@ -8226,11 +9116,11 @@ msgid "" " [-]istrip clear high (8th) bit of input characters\n" msgstr "" -#: src/stty.c:603 +#: src/stty.c:612 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr "" -#: src/stty.c:606 +#: src/stty.c:615 msgid "" " * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" @@ -8240,7 +9130,7 @@ msgid "" " [-]tandem same as [-]ixoff\n" msgstr "" -#: src/stty.c:614 +#: src/stty.c:623 msgid "" "\n" "Output settings:\n" @@ -8250,7 +9140,7 @@ msgid "" " * nlN newline delay style, N in [0..1]\n" msgstr "" -#: src/stty.c:622 +#: src/stty.c:631 msgid "" " * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of null characters\n" @@ -8260,7 +9150,7 @@ msgid "" " * [-]onlret newline performs a carriage return\n" msgstr "" -#: src/stty.c:630 +#: src/stty.c:639 msgid "" " * [-]onocr do not print carriage returns in the first column\n" " [-]opost postprocess output\n" @@ -8270,7 +9160,7 @@ msgid "" " * vtN vertical tab delay style, N in [0..1]\n" msgstr "" -#: src/stty.c:638 +#: src/stty.c:647 msgid "" "\n" "Local settings:\n" @@ -8279,7 +9169,7 @@ msgid "" " * -crtkill kill all line by obeying the echoctl and echok settings\n" msgstr "" -#: src/stty.c:645 +#: src/stty.c:654 msgid "" " * [-]ctlecho echo control characters in hat notation ('^c')\n" " [-]echo echo input characters\n" @@ -8288,7 +9178,7 @@ msgid "" " [-]echok echo a newline after a kill character\n" msgstr "" -#: src/stty.c:652 +#: src/stty.c:661 msgid "" " * [-]echoke same as [-]crtkill\n" " [-]echonl echo newline even if not echoing other characters\n" @@ -8297,7 +9187,7 @@ msgid "" " [-]iexten enable non-POSIX special characters\n" msgstr "" -#: src/stty.c:659 +#: src/stty.c:668 msgid "" " [-]isig enable interrupt, quit, and suspend special characters\n" " [-]noflsh disable flushing after interrupt and quit special " @@ -8307,7 +9197,7 @@ msgid "" " * [-]xcase with icanon, escape with '\\' for uppercase characters\n" msgstr "" -#: src/stty.c:666 +#: src/stty.c:675 msgid "" "\n" "Combination settings:\n" @@ -8316,7 +9206,7 @@ msgid "" " -cbreak same as icanon\n" msgstr "" -#: src/stty.c:673 +#: src/stty.c:682 msgid "" " cooked same as brkint ignpar istrip icrnl ixon opost isig\n" " icanon, eof and eol characters to their default values\n" @@ -8324,7 +9214,7 @@ msgid "" " crt same as echoe echoctl echoke\n" msgstr "" -#: src/stty.c:679 +#: src/stty.c:688 msgid "" " dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" " kill ^u\n" @@ -8333,7 +9223,7 @@ msgid "" " evenp same as parenb -parodd cs7\n" msgstr "" -#: src/stty.c:686 +#: src/stty.c:695 msgid "" " -evenp same as -parenb cs8\n" " * [-]lcase same as xcase iuclc olcuc\n" @@ -8343,7 +9233,7 @@ msgid "" " -nl same as icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" msgstr "" -#: src/stty.c:694 +#: src/stty.c:703 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -8352,7 +9242,7 @@ msgid "" " -pass8 same as parenb istrip cs7\n" msgstr "" -#: src/stty.c:701 +#: src/stty.c:710 msgid "" " raw same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" " -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n" @@ -8360,7 +9250,7 @@ msgid "" " -raw same as cooked\n" msgstr "" -#: src/stty.c:707 +#: src/stty.c:716 msgid "" " sane same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" " -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n" @@ -8370,7 +9260,7 @@ msgid "" " characters to their default values\n" msgstr "" -#: src/stty.c:715 +#: src/stty.c:724 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -8384,12 +9274,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:787 +#: src/stty.c:796 #, c-format msgid "only one device may be specified" msgstr "eblas indiki nur unu aparaton" -#: src/stty.c:817 +#: src/stty.c:826 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" @@ -8397,116 +9287,47 @@ msgid "" msgstr "" "nekombineblas opcioj '-a' kaj '-g' (por hom-legebla kaj stty-legebla eligo)" -#: src/stty.c:823 +#: src/stty.c:832 #, 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:838 +#: src/stty.c:847 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s: malsukcesis reagordi nebarantan moduson" -#: src/stty.c:883 src/stty.c:993 +#: src/stty.c:892 src/stty.c:1002 #, c-format msgid "invalid argument %s" msgstr "nevalida argumento %s" -#: src/stty.c:894 src/stty.c:911 src/stty.c:923 src/stty.c:936 src/stty.c:948 -#: src/stty.c:968 +#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957 +#: src/stty.c:977 #, c-format msgid "missing argument to %s" msgstr "mankas argumento al %s" -#: src/stty.c:974 +#: src/stty.c:983 #, c-format msgid "invalid line discipline %s" msgstr "nevalida protokolo %s por lineo" -#: src/stty.c:1044 +#: src/stty.c:1053 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s: ne eblas efiki ĉiujn petatajn operaciojn" -#: src/stty.c:1390 +#: src/stty.c:1399 #, c-format msgid "%s: no size information for this device" msgstr "%s: mankas informo pri grando de ĉi tiu aparato" -#: src/stty.c:1904 +#: src/stty.c:1920 #, c-format msgid "invalid integer argument %s" msgstr "nevalida entjerargumento %s" -#: src/su.c:229 -msgid "Password:" -msgstr "Pasvorto:" - -#: src/su.c:232 -#, c-format -msgid "getpass: cannot open /dev/tty" -msgstr "getpass: ne eblas malfermi /dev/tty" - -#: src/su.c:290 -#, c-format -msgid "cannot set groups" -msgstr "malsukcesis agordi grupojn" - -#: src/su.c:294 -#, c-format -msgid "cannot set group id" -msgstr "malsukcesis agordi grupan ID-on" - -#: src/su.c:296 -#, c-format -msgid "cannot set user id" -msgstr "malsukcesis agordi uzantan ID-on" - -#: src/su.c:371 -#, c-format -msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" -msgstr "Uzmaniero: %s [OPCIO...] [-] [UZANTO [ARGUMENTO...]]\n" - -#: src/su.c:372 -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 "" - -#: src/su.c:384 -msgid "" -"\n" -"A mere - implies -l. If USER not given, assume root.\n" -msgstr "" -"\n" -"Nura «-» implikas «-l». Kiam UZANTO ne indikatas, \"root\" supoziĝas.\n" - -#: src/su.c:461 -#, c-format -msgid "user %s does not exist" -msgstr "uzanto %s ne ekzistas" - -#: src/su.c:484 -#, c-format -msgid "incorrect password" -msgstr "malĝusta pasvorto" - -#: src/su.c:501 -#, c-format -msgid "using restricted shell %s" -msgstr "uzatas limigita ŝelo %s" - -#: src/su.c:509 -#, c-format -msgid "warning: cannot change directory to %s" -msgstr "averto: malsukcesis ŝanĝi dosierujon al %s" - #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 msgid "Kayvan Aghaiepour" @@ -8519,19 +9340,25 @@ msgid "" " -r use BSD sum algorithm, use 1K blocks\n" " -s, --sysv use System V sum algorithm, use 512 bytes blocks\n" msgstr "" +"Eligas kontrolsumon kaj nombron de blokoj por ĉiu DOSIERO.\n" +"\n" +" -r uzi BSD-sumalgoritmon, uzi blokojn de 1K\n" +" -s, --sysv uzi Sistemo V-sumalgoritmon, uzi blokojn de 512 bajtoj\n" #: src/sync.c:41 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" +"\n" #: src/sync.c:69 #, c-format msgid "ignoring all arguments" msgstr "ignoratas ĉiuj argumentoj" -#: src/system.h:340 +#: src/system.h:343 #, c-format msgid "" "\n" @@ -8540,15 +9367,22 @@ msgid "" "for details about the options it supports.\n" msgstr "" -#: src/system.h:346 +#: src/system.h:349 msgid " --help display this help and exit\n" -msgstr " --help montri ĉi tiun helpon kaj eliri\n" +msgstr " --help montri ĉi tiun helpon kaj eliri\n" -#: src/system.h:348 +#: src/system.h:351 msgid " --version output version information and exit\n" -msgstr " --version montri programversion kaj eliri\n" +msgstr " --version montri programversion kaj eliri\n" + +#: src/system.h:544 +#, fuzzy +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" -#: src/system.h:541 +#: src/system.h:552 msgid "" "\n" "SIZE is an integer and optional unit (example: 10M is 10*1024*1024). Units\n" @@ -8556,7 +9390,7 @@ msgid "" "1000).\n" msgstr "" -#: src/system.h:550 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -8565,37 +9399,37 @@ msgid "" "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n" msgstr "" -#: src/system.h:560 +#: src/system.h:571 #, c-format msgid "" "\n" "Report %s bugs to %s\n" msgstr "" "\n" -"Raportu cimojn en «%s» al <%s>.\n" +"Raportu programmisojn en «%s» al <%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:574 +#: src/system.h:585 #, 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:578 +#: src/system.h:589 #, 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:585 +#: src/system.h:596 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "Tajpu '%s --help' por pli da informoj.\n" -#: src/system.h:617 +#: src/system.h:628 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -8611,57 +9445,57 @@ 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" -"\n" msgstr "" "Skribas kun inversa liniordo ĉiun indikatan DOSIEROn al ĉefeligujo.\n" "Sen DOSIERO, aŭ kiam DOSIERO estas «-», ĉefenigujo legiĝas.\n" -#: src/tac.c:145 +#: src/tac.c:144 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 "" -#: src/tac.c:235 src/tac.c:336 +#: src/tac.c:234 src/tac.c:335 #, c-format msgid "%s: seek failed" msgstr "malsukcesis 'seek' sur %s" -#: src/tac.c:264 +#: src/tac.c:263 #, c-format msgid "record too large" msgstr "rikordo tro grandas" -#: src/tac.c:451 +#: src/tac.c:450 #, c-format msgid "failed to create temporary file in %s" msgstr "malsukcesis krei provizoran dosieron en %s" -#: src/tac.c:459 +#: src/tac.c:458 #, c-format msgid "failed to open %s for writing" msgstr "malsukcesis malfermi %s por skribado" -#: src/tac.c:476 -#, fuzzy, c-format +#: src/tac.c:475 +#, c-format msgid "failed to rewind stream for %s" -msgstr "malsukcesis ... fluon por %s" +msgstr "malsukcesis revolvi fluon por %s" -#: src/tac.c:512 src/tac.c:519 +#: src/tac.c:511 src/tac.c:518 #, c-format msgid "%s: write error" msgstr "%s: skrib-eraro" -#: src/tac.c:572 +#: src/tac.c:571 #, c-format msgid "failed to open %s for reading" msgstr "malsukcesis malfermi %s por legi" -#: src/tac.c:630 +#: src/tac.c:629 #, c-format msgid "separator cannot be empty" msgstr "disigilo ne povas esti vaka" @@ -8672,18 +9506,17 @@ msgid "Ian Lance Taylor" msgstr "Ien Lans TEJLOR (Ian Lance Taylor)" #: src/tail.c:262 -#, c-format +#, fuzzy, 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" -"\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" "Sen DOSIERO, aŭ kiam DOSIERO estas «-», ĉefenigujo legiĝas.\n" -#: src/tail.c:271 +#: src/tail.c:270 msgid "" " -c, --bytes=K output the last K bytes; alternatively, use -c " "+K\n" @@ -8691,7 +9524,7 @@ msgid "" "file\n" msgstr "" -#: src/tail.c:275 +#: src/tail.c:274 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -8700,7 +9533,7 @@ msgid "" " -F same as --follow=name --retry\n" msgstr "" -#: src/tail.c:282 +#: src/tail.c:281 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -8714,7 +9547,7 @@ msgid "" " With inotify, this option is rarely useful.\n" msgstr "" -#: src/tail.c:295 +#: src/tail.c:294 msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" " -q, --quiet, --silent never output headers giving file names\n" @@ -8723,7 +9556,7 @@ msgid "" " name, i.e., with --follow=name\n" msgstr "" -#: src/tail.c:302 +#: src/tail.c:301 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations.\n" @@ -8732,7 +9565,7 @@ msgid "" " -v, --verbose always output headers giving file names\n" msgstr "" -#: src/tail.c:311 +#: src/tail.c:310 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -8743,7 +9576,7 @@ msgid "" "\n" msgstr "" -#: src/tail.c:320 +#: src/tail.c:319 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" @@ -8753,64 +9586,64 @@ msgid "" "named file in a way that accommodates renaming, removal and creation.\n" msgstr "" -#: src/tail.c:379 +#: src/tail.c:378 #, c-format msgid "closing %s (fd=%d)" msgstr "fermiĝas %s (dosiernumero=%d)" -#: src/tail.c:454 +#: 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:458 +#: src/tail.c:457 #, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "%s: ne eblas fari 'seek' al finrelativa pozicio %s" -#: src/tail.c:895 +#: src/tail.c:894 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "ne eblas eltrovi lokon de %s; uzatas nun skrutinio" -#: src/tail.c:907 +#: src/tail.c:906 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" msgstr "" -#: src/tail.c:964 +#: src/tail.c:963 #, c-format msgid "%s has become inaccessible" msgstr "%s iĝis neatingebla" -#: src/tail.c:981 +#: src/tail.c:980 #, 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:990 +#: src/tail.c:989 #, 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:1011 +#: src/tail.c:1010 #, c-format msgid "%s has become accessible" msgstr "%s iĝis atingebla" -#: src/tail.c:1019 +#: src/tail.c:1018 #, c-format msgid "%s has appeared; following end of new file" msgstr "%s aperis; sekvatas fino de nova dosiero" -#: src/tail.c:1030 +#: src/tail.c:1029 #, 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:1131 +#: src/tail.c:1130 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: ne eblas ŝanĝi nebarantan moduson" @@ -8917,12 +9750,19 @@ msgid "" " -a, --append append to the given FILEs, do not overwrite\n" " -i, --ignore-interrupts ignore interrupt signals\n" msgstr "" +"Kopias ĉefenigujon al ĉiu indikata DOSIERO, kaj ankaŭ al ĉefeligujo.\n" +"\n" +" -a, --append postglui al la indikataj DOSIEROj, ne " +"anstataŭigi\n" +" -i, --ignore-interrrupts ignori interrompsignalojn\n" #: src/tee.c:71 msgid "" "\n" "If a FILE is -, copy again to standard output.\n" msgstr "" +"\n" +"Kiam DOSIERO estas «-», kopii denove al ĉefeligujo.\n" #: src/test.c:123 #, c-format @@ -9109,17 +9949,22 @@ msgstr "mankas ']'" msgid "extra argument %s" msgstr "superflua argumento: %s" -#: src/timeout.c:124 +#: src/timeout.c:112 +#, fuzzy, c-format +msgid "warning: sigprocmask" +msgstr "averto: malsukcesis krei horloĝon" + +#: src/timeout.c:145 #, c-format msgid "warning: timer_settime" msgstr "averto: malsukcesis agordi horloĝtempon" -#: src/timeout.c:129 +#: src/timeout.c:150 #, c-format msgid "warning: timer_create" msgstr "averto: malsukcesis krei horloĝon" -#: src/timeout.c:204 +#: src/timeout.c:225 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -9128,18 +9973,19 @@ msgstr "" "Uzmaniero: %s [OPCIO] DAŬRO KOMANDO [ARGUMENTO...]\n" " aŭ: %s [OPCIO]\n" -#: src/timeout.c:208 -msgid "" -"Start COMMAND, and kill it if still running after DURATION.\n" -"\n" -"Mandatory arguments to long options are mandatory for short options too.\n" +#: src/timeout.c:229 +#, fuzzy +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" -#: src/timeout.c:213 +#: src/timeout.c:235 msgid "" +" --preserve-status\n" +" exit with the same status as COMMAND, even when the\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 " @@ -9154,7 +10000,7 @@ msgid "" " See 'kill -l' for a list of signals\n" msgstr "" -#: src/timeout.c:229 +#: src/timeout.c:254 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -9162,26 +10008,31 @@ msgid "" "days.\n" msgstr "" -#: src/timeout.c:234 +#: src/timeout.c:259 msgid "" "\n" -"If the command times out, then exit with status 124. Otherwise, exit\n" -"with the status of COMMAND. If no signal is specified, send the TERM\n" -"signal upon timeout. The TERM signal kills any process that does not\n" -"block or catch that signal. For other processes, it may be necessary to\n" -"use the KILL (9) signal, since this signal cannot be caught. If the\n" -"KILL (9) signal is sent, the exit status is 128+9 rather than 124.\n" +"If the command times out, and --preserve-status is not set, then exit with\n" +"status 124. Otherwise, exit with the status of COMMAND. If no signal\n" +"is specified, send the TERM signal upon timeout. The TERM signal kills\n" +"any process that does not block or catch that signal. It may be necessary\n" +"to use the KILL (9) signal, since this signal cannot be caught, in which\n" +"case the exit status is 128+9 rather than 124.\n" msgstr "" -#: src/timeout.c:419 +#: src/timeout.c:363 +#, c-format +msgid "warning: disabling core dumps failed" +msgstr "averto: malsukcesis malŝalti nekropsiojn" + +#: src/timeout.c:471 #, c-format msgid "error waiting for command" msgstr "eraro dum atendado je komando" -#: src/timeout.c:441 +#: src/timeout.c:482 #, c-format -msgid "warning: disabling core dumps failed" -msgstr "averto: malsukcesis malŝalti nekropsiojn" +msgid "the monitored command dumped core" +msgstr "" #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 @@ -9193,22 +10044,22 @@ msgstr "Ĝim KINGDON (Jim Kingdon)" msgid "Randy Smith" msgstr "Rendi SMIF (Randy Smith)" -#: src/touch.c:115 src/touch.c:313 +#: src/touch.c:115 src/touch.c:309 #, c-format msgid "invalid date format %s" msgstr "nevalida dataranĝo: %s" -#: src/touch.c:194 +#: src/touch.c:191 #, c-format msgid "cannot touch %s" msgstr "ne eblas tuŝi %s" -#: src/touch.c:200 +#: src/touch.c:197 #, c-format msgid "setting times of %s" msgstr "agordiĝas tempoj de %s" -#: src/touch.c:216 +#: src/touch.c:213 msgid "" "Update the access and modification times of each FILE to the current time.\n" "\n" @@ -9217,10 +10068,9 @@ msgid "" "\n" "A FILE argument string of - is handled specially and causes touch to\n" "change the times of the file associated with standard output.\n" -"\n" msgstr "" -#: src/touch.c:229 +#: src/touch.c:225 msgid "" " -a change only the access time\n" " -c, --no-create do not create any files\n" @@ -9228,7 +10078,7 @@ msgid "" " -f (ignored)\n" msgstr "" -#: src/touch.c:235 +#: src/touch.c:231 msgid "" " -h, --no-dereference affect each symbolic link instead of any " "referenced\n" @@ -9237,27 +10087,27 @@ msgid "" " -m change only the modification time\n" msgstr "" -#: src/touch.c:241 +#: src/touch.c:237 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" -" --time=WORD change the specified time:\n" +" --time=WORD change the specified time:\n" " WORD is access, atime, or use: equivalent to -a\n" " WORD is modify or mtime: equivalent to -m\n" msgstr "" -#: src/touch.c:250 +#: src/touch.c:246 msgid "" "\n" "Note that the -d and -t options accept different time-date formats.\n" msgstr "" -#: src/touch.c:339 +#: src/touch.c:335 #, c-format msgid "cannot specify times from more than one source" msgstr "nekombineblas opcio '-t' kun '-d' aŭ '-r'" -#: src/touch.c:413 +#: src/touch.c:409 #, c-format msgid "" "warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'" @@ -9356,7 +10206,7 @@ msgstr "" #: src/tr.c:673 #, c-format msgid "range-endpoints of '%s-%s' are in reverse collating sequence order" -msgstr "intervalaj ekstremoj '%s-%s' estas en inversa ordo" +msgstr "la gamekstremoj en '%s-%s' estas en inversa ordo" #: src/tr.c:829 #, c-format @@ -9487,25 +10337,24 @@ msgid "" "If a FILE is larger than the specified size, the extra data is lost.\n" "If a FILE is shorter, it is extended and the extended part (hole)\n" "reads as zero bytes.\n" -"\n" msgstr "" -#: src/truncate.c:110 +#: src/truncate.c:109 msgid " -c, --no-create do not create any files\n" msgstr "" -#: src/truncate.c:113 +#: src/truncate.c:112 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" -#: src/truncate.c:116 +#: 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" msgstr "" -#: src/truncate.c:122 +#: src/truncate.c:121 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -9513,57 +10362,57 @@ msgid "" "'/' round down to multiple of, '%' round up to multiple of.\n" msgstr "" -#: src/truncate.c:150 +#: src/truncate.c:149 #, c-format msgid "overflow in %<PRIdMAX> * %<PRIdMAX> byte blocks for file %s" msgstr "troo en %<PRIdMAX> * %<PRIdMAX>-bajtaj blokoj por dosiero %s" -#: src/truncate.c:174 +#: src/truncate.c:173 #, c-format msgid "%s has unusable, apparently negative size" msgstr "%s havas neuzeblan, ŝajne negativan grandon" -#: src/truncate.c:184 src/truncate.c:379 +#: src/truncate.c:183 src/truncate.c:384 #, c-format msgid "cannot get the size of %s" msgstr "ne eblas eltrovi grandon de %s" -#: src/truncate.c:206 +#: src/truncate.c:205 #, c-format msgid "overflow rounding up size of file %s" msgstr "troo dum rondigo de grando de dosiero %s" -#: src/truncate.c:216 +#: src/truncate.c:215 #, c-format msgid "overflow extending size of file %s" msgstr "troo dum etendo de grando de dosiero %s" -#: src/truncate.c:231 +#: src/truncate.c:230 #, c-format msgid "failed to truncate %s at %<PRIdMAX> bytes" msgstr "malsukcesis trunki %s al %<PRIdMAX> bajtoj" -#: src/truncate.c:305 +#: src/truncate.c:303 #, c-format msgid "multiple relative modifiers specified" msgstr "pluraj relativaj modifiloj indikatas" -#: src/truncate.c:335 +#: src/truncate.c:333 #, c-format msgid "you must specify either %s or %s" msgstr "nepras indiki aŭ %s aŭ %s" -#: src/truncate.c:342 +#: src/truncate.c:340 #, c-format msgid "you must specify a relative %s with %s" msgstr "nepras indiki relativan %s kun %s" -#: src/truncate.c:349 +#: src/truncate.c:347 #, c-format msgid "%s was specified but %s was not" msgstr "indikatas %s sen %s" -#: src/truncate.c:400 +#: src/truncate.c:404 #, c-format msgid "cannot open %s for writing" msgstr "malsukcesis malfermi %s por skribi" @@ -9581,6 +10430,11 @@ msgid "" "With no FILE, or when FILE is -, read standard input.\n" "\n" msgstr "" +"Uzmaniero: %s [OPCIO] [DOSIERO]\n" +"\n" +"Eligas tute ordigitan liston kiu koheras kun la parta ordo en DOSIERO.\n" +"\n" +"Sen DOSIERO, aŭ kiam DOSIERO estas «-», ĉefenigujo legiĝas.\n" #: src/tsort.c:472 #, c-format @@ -9598,6 +10452,9 @@ msgid "" "\n" " -s, --silent, --quiet print nothing, only return an exit status\n" msgstr "" +"Montras la dosiernomon de la terminalo kiu estas konektata al ĉefenigujo.\n" +"\n" +" -s, --silent, --quiet eligi nenion, nur produkti elirstaton\n" #: src/tty.c:120 msgid "not a tty" @@ -9652,29 +10509,35 @@ 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" -"\n" msgstr "" "Konvertas spacetojn en ĉiu DOSIERO al taboj, skribante al ĉefeligujo.\n" "Sen DOSIERO, aŭ kiam DOSIERO estas «-», ĉefenigujo legiĝas.\n" "\n" -#: src/unexpand.c:125 +#: src/unexpand.c:124 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 konverti ĉiujn blankspacojn anstataŭ nur la komencajn\n" +" --first-only konverti nur komencan sinsekvon de blankspacoj (nuligas " +"'-a')\n" +" -t, --tabs=NMBRO meti tabojn dise je NMBRO anstataŭ 8 pozicioj (ebligas '-" +"a')\n" +" -t, --tabs=LISTO uzi komadisigatan LISTOn de tabpozicioj (ebligas '-a')\n" -#: src/unexpand.c:153 +#: src/unexpand.c:152 #, c-format msgid "tabs are too far apart" msgstr "tabaj pozicioj tro malproksimas" -#: src/unexpand.c:505 +#: src/unexpand.c:504 #, c-format msgid "tab stop value is too large" msgstr "taba pozicio estas tro granda" @@ -9682,24 +10545,31 @@ msgstr "taba pozicio estas tro granda" #: src/uniq.c:134 #, c-format msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n" -msgstr "Uzmaniero: %s [OPCIO...] [ENIGO [ELIGO]]\n" +msgstr "Uzmaniero: %s [OPCIO...] [ENIGDOSIERO [ELIGDOSIERO]]\n" #: src/uniq.c:138 +#, fuzzy 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" -"\n" msgstr "" +"Filtras apudajn kongruajn linioj elde ENIGDOSIERO (aŭ ĉefenigujo),\n" +"kaj skribas la restaĵon al ELIGDOSIERO (aŭ ĉefeligujo).\n" +"\n" +"Sen opcioj, kongruaj linioj estas kunfandataj al la unua okazo.\n" +"\n" -#: src/uniq.c:148 +#: src/uniq.c:147 msgid "" " -c, --count prefix lines by the number of occurrences\n" " -d, --repeated only print duplicate lines\n" msgstr "" +" -c, --count prefiksi liniojn per la nombro de okazoj\n" +" -d, --repeated montri nur la ripetitajn liniojn\n" -#: src/uniq.c:152 +#: src/uniq.c:151 msgid "" " -D, --all-repeated[=delimit-method] print all duplicate lines\n" " delimit-method={none(default),prepend,separate}\n" @@ -9710,44 +10580,60 @@ msgid "" " -u, --unique only print unique lines\n" " -z, --zero-terminated end lines with 0 byte, not newline\n" msgstr "" - -#: src/uniq.c:162 +" -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" +" -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" + +#: src/uniq.c:161 msgid " -w, --check-chars=N compare no more than N characters in lines\n" -msgstr "" +msgstr " -w, --check-chars=N kompari en ĉiu linio ne pli ol N signoj\n" -#: src/uniq.c:167 +#: src/uniq.c:166 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" +"Kampo estas vico de blankspacoj (kutime spacetoj kaj/aŭ taboj) kaj poste\n" +"neblankaj signoj. Kampoj saltiĝas antaŭ signoj.\n" -#: src/uniq.c:172 +#: src/uniq.c:171 msgid "" "\n" "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n" "You may want to sort the input first, or use 'sort -u' without 'uniq'.\n" "Also, comparisons honor the rules specified by 'LC_COLLATE'.\n" msgstr "" +"\n" +"Notu: 'uniq' nur rimarkas ripetitajn liniojn kiam ili estas apudaj.\n" +"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:359 +#: src/uniq.c:358 #, c-format msgid "too many repeated lines" msgstr "tro da ripetitaj linioj" -#: src/uniq.c:522 +#: src/uniq.c:521 msgid "invalid number of fields to skip" msgstr "nevalida nombro de saltendaj kampoj" -#: src/uniq.c:531 +#: src/uniq.c:530 msgid "invalid number of bytes to skip" msgstr "nevalida nombro de saltendaj bajtoj" -#: src/uniq.c:540 +#: src/uniq.c:539 msgid "invalid number of bytes to compare" msgstr "nevalida nombro de komparendaj bajtoj" -#: src/uniq.c:559 +#: src/uniq.c:558 #, c-format msgid "printing all duplicated lines and repeat counts is meaningless" msgstr "sensencas montri kaj ĉiujn ripetitajn liniojn kaj la ripetnombrojn" @@ -9801,6 +10687,11 @@ msgid_plural "up %ld days %2d:%02d, " msgstr[0] "rulas %ld tago %2d:%02d, " msgstr[1] "rulas %ld tagoj %2d:%02d, " +#: src/uptime.c:149 +#, fuzzy, c-format +msgid "up %2d:%02d, " +msgstr "rulas %ld tago %2d:%02d, " + #: src/uptime.c:151 #, c-format msgid "%lu user" @@ -9870,6 +10761,17 @@ msgid "" " -m, --chars print the character counts\n" " -l, --lines print the newline counts\n" msgstr "" +"Montras la nombrojn de novlinioj, vortoj kaj bajtoj por ĉiu DOSIERO,\n" +"kaj plue linion de totaloj se pli ol unu DOSIERO indikatas.\n" +"Sen DOSIERO, aŭ kiam DOSIERO estas «-», ĉefenigujo legiĝas.\n" +"Vorto estas nenullonga vico de signoj limigita de blankspaco.\n" +"\n" +"La subaj opcioj uzeblas por elekti kiuj nombroj montriĝos, sed ĉiam en la\n" +"sekvanta ordo: novlinioj, vortoj, signoj, bajtoj, kaj maksimuma linilongo.\n" +"\n" +" -c, --bytes montri la nombron de bajtoj\n" +" -m, --chars montri la nombron de signoj\n" +" -l, --lines montri la nombron de novlinioj\n" #: src/wc.c:128 msgid "" @@ -9879,45 +10781,51 @@ msgid "" " -L, --max-line-length print the length of the longest line\n" " -w, --words print the word counts\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" # Kiam uzanto jam tre longe ne faras ion ajn. #: src/who.c:210 msgid " old " -msgstr " longe " +msgstr "longe" -#: src/who.c:449 +#: src/who.c:440 msgid "system boot" -msgstr "starto" +msgstr "(starto)" -#: src/who.c:456 src/who.c:458 +#: src/who.c:447 src/who.c:449 msgid "id=" msgstr "id=" -#: src/who.c:471 src/who.c:476 +#: src/who.c:462 src/who.c:467 msgid "term=" msgstr "term=" -#: src/who.c:473 src/who.c:477 +#: src/who.c:464 src/who.c:468 msgid "exit=" msgstr "eliro=" -#: src/who.c:494 +#: src/who.c:485 msgid "LOGIN" msgstr "LOGIN" -#: src/who.c:514 +#: src/who.c:505 msgid "clock change" msgstr "horloĝŝanĝo" -#: src/who.c:526 src/who.c:527 +#: src/who.c:517 src/who.c:518 msgid "run-level" msgstr "rulnivelo" -#: src/who.c:530 src/who.c:531 +#: src/who.c:521 src/who.c:522 msgid "last=" msgstr "antaŭa=" -#: src/who.c:562 +#: src/who.c:553 #, c-format msgid "" "\n" @@ -9926,44 +10834,44 @@ msgstr "" "\n" "nombro da uzantoj=%lu\n" -#: src/who.c:568 +#: src/who.c:559 msgid "NAME" msgstr "Nomo" -#: src/who.c:568 +#: src/who.c:559 msgid "LINE" -msgstr "Lineo" +msgstr "Terminalo" -#: src/who.c:568 +#: src/who.c:559 msgid "TIME" msgstr "Ensalutis" -#: src/who.c:568 +#: src/who.c:559 msgid "IDLE" msgstr "Vakas" -#: src/who.c:569 +#: src/who.c:560 msgid "PID" msgstr "PID" -#: src/who.c:569 +#: src/who.c:560 msgid "COMMENT" msgstr "Komento" -#: src/who.c:569 +#: src/who.c:560 msgid "EXIT" msgstr "Eliro" -#: src/who.c:649 +#: src/who.c:640 #, c-format msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n" msgstr "Uzmaniero: %s [OPCIO...] [ DOSIERO | ARGUMENTO1 ARGUMENTO2 ]\n" -#: src/who.c:650 +#: src/who.c:641 msgid "Print information about users who are currently logged in.\n" msgstr "Montras informon pri la aktuale ensalutitaj uzantoj.\n" -#: src/who.c:653 +#: src/who.c:644 msgid "" "\n" " -a, --all same as -b -d --login -p -r -t -T -u\n" @@ -9971,35 +10879,51 @@ msgid "" " -d, --dead print dead processes\n" " -H, --heading print line of column headings\n" msgstr "" +"\n" +" -a, --all egalas al «-b -d --login -p -r -t -T -u»\n" +" -b, --boot montri tempon de lasta sistemstarto\n" +" -d, --dead montri ankaŭ mortajn procezojn\n" +" -H, --heading montri linion de kolumno-kapoj\n" -#: src/who.c:660 +#: src/who.c:651 msgid " -l, --login print system login processes\n" -msgstr "" +msgstr " -l, --login montri ensalutajn procezojn de la sistemo\n" -#: src/who.c:663 +#: src/who.c:654 msgid "" " --lookup attempt to canonicalize hostnames via DNS\n" " -m only hostname and user associated with stdin\n" " -p, --process print active processes spawned by init\n" msgstr "" +" --lookup provi normaligi gastnomojn per DNS\n" +" -m montri nur gastnomon kaj uzanton kiu uzas ĉefenigujon\n" +" -p, --process montri aktivajn procezojn kiuj kreiĝis far 'init'\n" -#: src/who.c:668 +#: src/who.c:659 msgid "" " -q, --count all login names and number of users logged on\n" " -r, --runlevel print current runlevel\n" " -s, --short print only name, line, and time (default)\n" " -t, --time print last system clock change\n" msgstr "" +" -q, --count montri nur nomojn kaj nombron de ensalutitaj uzantoj\n" +" -r, --runlevel montri nunan rulnivelon\n" +" -s, --short montri nur nomon, terminalon kaj tempon (defaŭlte)\n" +" -t, --time montri la lastan sistemhorloĝan ŝanĝon\n" -#: src/who.c:674 +#: src/who.c:665 msgid "" " -T, -w, --mesg add user's message status as +, - or ?\n" " -u, --users list users logged in\n" " --message same as -T\n" " --writable same as -T\n" msgstr "" +" -T, -w, --mesg aldoni mesaĝan staton de la uzanto kiel «+», «-» aŭ «?»\n" +" -u, --users montri ensalutitajn uzantojn\n" +" --message egalas al «-T»\n" +" --writable egalas al «-T»\n" -#: src/who.c:682 +#: src/who.c:673 #, c-format msgid "" "\n" @@ -10042,6 +10966,120 @@ 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 "using arbitrary-precision arithmetic" +#~ msgstr "uziĝas aritmetiko de arbitra precizeco" + +#, fuzzy +#~ msgid " returning value: '%s'\n" +#~ msgstr "kreiĝas dosiero %s\n" + +#, fuzzy +#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n" +#~ msgstr "Uzmaniero: %s [OPCIO] NOMO...\n" + +#, fuzzy +#~ msgid "no valid suffix found\n" +#~ msgstr "nevalida sufikslongo: %s" + +#~ msgid "reading %s" +#~ msgstr "legiĝas %s" + +#~ msgid "writing %s" +#~ msgstr "skribiĝas %s" + +#~ msgid "closing %s" +#~ msgstr "fermiĝas %s" + +#~ msgid "accessing %s" +#~ msgstr "atingiĝas %s" + +#~ msgid "opening %s" +#~ msgstr "malfermiĝas %s" + +#~ msgid "" +#~ "WARNING: --page-increment is deprecated; use --line-increment instead" +#~ msgstr "" +#~ "AVERTO: malrekomendatas '--page-increment'; uzu '--line-increment' " +#~ "anstataŭe" + +#~ msgid "All arguments to long options are mandatory for short options.\n" +#~ msgstr "" +#~ "(Endaj argumentoj por longaj opcioj ankaŭ endas por la mallongaj.)\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 "" +#~ "Opcio '--string' sen nombro implikas 3; opcio '--width' sen nombro " +#~ "implikas 32.\n" +#~ "Defaŭlte 'od' uzas '-A o -t oS -w16'.\n" + +#~ msgid "Usage: %s [OPTION]... FILE\n" +#~ msgstr "Uzmaniero: %s [OPCIO...] DOSIERO\n" + +#~ msgid "Password:" +#~ msgstr "Pasvorto:" + +#~ msgid "getpass: cannot open /dev/tty" +#~ msgstr "getpass: ne eblas malfermi /dev/tty" + +#~ msgid "cannot set groups" +#~ msgstr "malsukcesis agordi grupojn" + +#~ msgid "cannot set group id" +#~ msgstr "malsukcesis agordi grupan ID-on" + +#~ msgid "cannot set user id" +#~ msgstr "malsukcesis agordi uzantan ID-on" + +#~ msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" +#~ msgstr "Uzmaniero: %s [OPCIO...] [-] [UZANTO [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 "" +#~ "Ŝanĝas la efektivan uzant-ID-on kaj grup-ID-on al tiu de UZANTO.\n" +#~ "\n" +#~ " -, -l, --login fari la ŝelon ensaluta ŝelo\n" +#~ " -c. --command=KOMANDO pasi ununuran KOMANDOn al la ŝelo kun " +#~ "opcio '-c'\n" +#~ " -f, --fast pasi opcion '-f' al la ŝelo (por 'csh' aŭ " +#~ "'tcsh')\n" +#~ " -m, --preserve-environment ne reagordi ĉirkaŭaĵajn variablojn\n" +#~ " -p egalas al '-m'\n" +#~ " -s, --shell=ŜELO lanĉi ŜELOn (se /etc/shells permesas ĝin)\n" + +#~ msgid "" +#~ "\n" +#~ "A mere - implies -l. If USER not given, assume root.\n" +#~ msgstr "" +#~ "\n" +#~ "Nura «-» implikas «-l». Kiam UZANTO ne indikatas, \"root\" supoziĝas.\n" + +#~ msgid "user %s does not exist" +#~ msgstr "uzanto %s ne ekzistas" + +#~ msgid "incorrect password" +#~ msgstr "malĝusta pasvorto" + +#~ msgid "using restricted shell %s" +#~ msgstr "uzatas limigita ŝelo %s" + +#~ msgid "warning: cannot change directory to %s" +#~ msgstr "averto: malsukcesis ŝanĝi dosierujon al %s" + #~ msgid "" #~ "\n" #~ "Examples:\n" diff --git a/po/es.gmo b/po/es.gmo index 80c8e2ba..eda281f0 100644 Binary files a/po/es.gmo and b/po/es.gmo differ diff --git a/po/es.po b/po/es.po index 83292345..a694cf54 100644 --- a/po/es.po +++ b/po/es.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU coreutils 8.14\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2012-05-10 19:35+0200\n" +"POT-Creation-Date: 2013-02-14 15:56+0000\n" "PO-Revision-Date: 2011-10-18 15:26+0200\n" "Last-Translator: Santiago Vila Doncel <sanvila@unex.es>\n" "Language-Team: Spanish <es@li.org>\n" @@ -39,19 +39,19 @@ msgstr "Los argumentos válidos son:" msgid "error closing file" msgstr "error al cerrar el fichero" -#: lib/closeout.c:112 src/base64.c:109 src/base64.c:121 src/base64.c:127 -#: src/base64.c:168 src/base64.c:224 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:330 src/expand.c:355 src/head.c:298 -#: src/head.c:348 src/head.c:756 src/head.c:797 src/mktemp.c:350 src/od.c:919 -#: src/paste.c:160 src/shuf.c:369 src/split.c:727 src/split.c:964 -#: src/split.c:969 src/tail.c:350 src/tail.c:1201 src/tail.c:1307 +#: 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 -#: src/unexpand.c:427 src/unexpand.c:443 +#: 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:1160 src/copy.c:2602 +#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617 #, c-format msgid "preserving permissions for %s" msgstr "se conservan los permisos de %s" @@ -268,18 +268,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:483 +#: lib/mkdir-p.c:196 src/install.c:484 #, 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:2261 src/install.c:709 src/install.c:722 +#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722 #, 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:915 src/tac.c:435 +#: src/split.c:929 src/tac.c:434 #, c-format msgid "memory exhausted" msgstr "memoria agotada" @@ -330,76 +330,76 @@ msgstr "»" msgid "%s: end of file" msgstr "%s: fin de fichero" -#: lib/regcomp.c:130 +#: lib/regcomp.c:131 msgid "Success" msgstr "Éxito" -#: lib/regcomp.c:133 +#: lib/regcomp.c:134 msgid "No match" msgstr "No hay ninguna coincidencia" -#: lib/regcomp.c:136 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "Expresión regular inválida" # Se admiten sugerencias -#: lib/regcomp.c:139 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "Carácter de \"collation\" invalido" -#: lib/regcomp.c:142 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "Nombre de clase de caracteres inválido" -#: lib/regcomp.c:145 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "Barra invertida final" -#: lib/regcomp.c:148 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "Referencia hacia atrás inválida" -#: lib/regcomp.c:151 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "[ o [^ desemparejado" -#: lib/regcomp.c:154 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "( o \\( desemparejado" -#: lib/regcomp.c:157 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "\\{ desemparejado" -#: lib/regcomp.c:160 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "Contenido inválido de \\{\\}" -#: lib/regcomp.c:163 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "Final de rango inválido" -#: lib/regcomp.c:166 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Memoria agotada" -#: lib/regcomp.c:169 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "Expresión regular precedente inválida" -#: lib/regcomp.c:172 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "Fin prematuro de la expresión regular" -#: lib/regcomp.c:175 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "La expresión regular es demasiado grande" -#: lib/regcomp.c:178 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr ") o \\) desemparejado" -#: lib/regcomp.c:703 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "No hay ninguna expresión regular previa" @@ -441,7 +441,7 @@ msgstr "^[sS]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-mode-acl.c:695 src/copy.c:2284 src/cp.c:518 +#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516 #, c-format msgid "setting permissions for %s" msgstr "estableciendo los permisos de %s" @@ -645,13 +645,13 @@ msgstr "Recurso perdido" # tu lado :) Déjalo como está :D ipg # # Gracias a los dos. sv -#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262 -#: lib/spawn-pipe.c:265 +#: 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:232 lib/spawn-pipe.c:346 lib/wait-process.c:282 +#: 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" @@ -667,24 +667,24 @@ msgstr "Señal de tiempo real %d" msgid "Unknown signal %d" msgstr "Señal desconocida %d" -#: lib/unicodeio.c:103 +#: lib/unicodeio.c:102 msgid "iconv function not usable" msgstr "la función iconv no es utilizable" -#: lib/unicodeio.c:105 +#: lib/unicodeio.c:104 msgid "iconv function not available" msgstr "la función iconv no está disponible" -#: lib/unicodeio.c:112 +#: lib/unicodeio.c:111 msgid "character out of range" msgstr "carácter fuera de rango" -#: lib/unicodeio.c:182 +#: lib/unicodeio.c:181 #, c-format msgid "cannot convert U+%04X to local character set" msgstr "no se puede convertir U+%04X al conjunto de caracteres local" -#: lib/unicodeio.c:184 +#: lib/unicodeio.c:183 #, c-format msgid "cannot convert U+%04X to local character set: %s" msgstr "no se puede convertir U+%04X al conjunto de caracteres local: %s" @@ -905,7 +905,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:562 +#: lib/version-etc.c:251 src/system.h:573 #, c-format msgid "%s home page: <%s>\n" msgstr "Página inicial de %s: <%s>\n" @@ -915,7 +915,7 @@ 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:563 +#: lib/version-etc.c:256 src/system.h:574 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/" @@ -1003,18 +1003,17 @@ msgid "Simon Josefsson" msgstr "Simon Josefsson" #: src/base64.c:60 -#, c-format +#, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" "Base64 encode or decode FILE, or standard input, to standard output.\n" -"\n" msgstr "" "Modo de empleo: %s [OPCIÓN]... [FICHERO]\n" "\n" "Codifica o descodifica en base64 FICHERO, o la entrada estándar, a la\n" "salida estándar.\n" -#: src/base64.c:64 +#: src/base64.c:67 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -1031,7 +1030,7 @@ msgstr "" " Utilice 0 para desactivar el corte de líneas\n" "\n" -#: src/base64.c:73 src/cat.c:110 src/fmt.c:293 src/shuf.c:71 src/sum.c:70 +#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -1039,7 +1038,7 @@ msgstr "" "\n" "Sin FICHERO, o cuando FICHERO es -, lee la entrada estándar.\n" -#: src/base64.c:76 +#: src/base64.c:79 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -1054,37 +1053,37 @@ msgstr "" "Utilice --ignore-garbage para descartar cualesquiera bytes del flujo\n" "de entrada que no pertenezcan al alfabeto.\n" -#: src/base64.c:171 src/base64.c:208 src/csplit.c:263 src/csplit.c:1435 -#: src/join.c:451 src/shuf.c:157 src/shuf.c:361 src/tac-pipe.c:74 +#: 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 #, c-format msgid "read error" msgstr "error de lectura" -#: src/base64.c:227 +#: src/base64.c:230 #, c-format msgid "invalid input" msgstr "entrada inválida" -#: src/base64.c:264 +#: src/base64.c:267 #, c-format msgid "invalid wrap size: %s" msgstr "tamaño del `wrap' inválido: %s" -#: src/base64.c:283 src/basename.c:173 src/comm.c:435 src/cp.c:607 -#: src/date.c:441 src/dircolors.c:447 src/du.c:894 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:169 src/install.c:929 src/join.c:961 -#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:157 src/mv.c:447 -#: src/od.c:1802 src/ptx.c:2081 src/readlink.c:154 src/seq.c:408 -#: src/shuf.c:320 src/shuf.c:339 src/sort.c:4477 src/split.c:1313 -#: src/tr.c:1797 src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:454 -#: src/uniq.c:471 src/unlink.c:81 src/uptime.c:250 src/users.c:146 -#: src/wc.c:666 src/who.c:836 src/whoami.c:79 +#: 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 #, c-format msgid "extra operand %s" msgstr "operando extra %s" -#: src/base64.c:315 src/cat.c:781 +#: src/base64.c:318 src/cat.c:781 #, c-format msgid "closing standard input" msgstr "cierre de la entrada estándar" @@ -1092,15 +1091,15 @@ 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/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:53 src/env.c:33 +#: 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/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:65 src/su.c:88 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 +#: 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 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -1114,24 +1113,24 @@ msgstr "" " o bien: %s OPCIÓ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" -"\n" 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:59 +#: 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" msgstr "" -#: src/basename.c:66 +#: src/basename.c:67 #, c-format msgid "" "\n" @@ -1142,20 +1141,21 @@ msgid "" " %s -a any/str1 any/str2 -> \"str1\" followed by \"str2\"\n" msgstr "" -#: src/basename.c:167 src/chcon.c:531 src/chgrp.c:277 src/chmod.c:526 -#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1369 +#: 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:183 src/mkfifo.c:108 src/mknod.c:146 src/nohup.c:111 -#: src/pathchk.c:148 src/printf.c:674 src/readlink.c:146 src/realpath.c:236 -#: src/rm.c:314 src/rmdir.c:223 src/seq.c:402 src/setuidgid.c:137 -#: src/sleep.c:119 src/stat.c:1476 src/stdbuf.c:346 src/tr.c:1782 +#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 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 #, 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:52 src/split.c:49 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/split.c:49 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" @@ -1165,8 +1165,8 @@ msgstr "Torbjorn Granlund" msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:846 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4720 src/nl.c:182 src/paste.c:435 src/pr.c:2768 src/sum.c:58 +#: 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/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 +1231,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:2209 src/sort.c:379 src/tee.c:165 src/yes.c:86 +#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86 #, c-format msgid "standard output" msgstr "salida estándar" @@ -1248,14 +1248,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:55 src/head.c:46 src/hostid.c:33 +#: 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 msgid "Jim Meyering" msgstr "Jim Meyering" -#: src/chcon.c:100 src/runcon.c:203 src/runcon.c:234 +#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238 #, c-format msgid "failed to create security context: %s" msgstr "fallo al crear el contexto de seguridad: %s" @@ -1265,8 +1265,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:540 src/copy.c:2222 src/runcon.c:217 -#: src/stat.c:683 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221 +#: src/stat.c:702 #, c-format msgid "failed to get security context of %s" msgstr "fallo al obtener el contexto de seguridad de %s" @@ -1282,12 +1282,12 @@ 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:446 src/ls.c:2981 +#: src/du.c:457 src/ls.c:2981 #, 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:426 +#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437 #, c-format msgid "cannot read directory %s" msgstr "no se puede leer el directorio %s" @@ -1297,13 +1297,13 @@ 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:599 +#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562 #, 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:618 -#: src/remove.c:613 +#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642 +#: src/remove.c:576 #, c-format msgid "fts_close failed" msgstr "fts_close falló" @@ -1326,7 +1326,6 @@ msgid "" "Change the security context of each FILE to CONTEXT.\n" "With --reference, change the security context 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" @@ -1336,7 +1335,7 @@ msgstr "" "cualquier\n" " fichero al que apunten\n" -#: src/chcon.c:362 src/chgrp.c:123 src/chown.c:94 +#: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94 msgid "" " --dereference affect the referent of each symbolic link (this is\n" " the default), rather than the symbolic link itself\n" @@ -1344,7 +1343,7 @@ msgid "" "file\n" msgstr "" -#: src/chcon.c:367 +#: src/chcon.c:369 #, fuzzy msgid "" " -u, --user=USER set user USER in the target security context\n" @@ -1360,6 +1359,15 @@ 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 +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 # @@ -1382,7 +1390,7 @@ 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:373 +#: src/chcon.c:379 #, fuzzy msgid "" " --reference=RFILE use RFILE's security context rather than " @@ -1396,15 +1404,15 @@ msgstr "" " -v, --verbose muestra un mensaje por cada fichero procesado\n" "\n" -#: src/chcon.c:377 src/chgrp.c:140 src/chown.c:118 +#: 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:380 +#: src/chcon.c:386 msgid " -v, --verbose output a diagnostic for every file processed\n" msgstr "" -#: src/chcon.c:383 src/chgrp.c:143 src/chown.c:121 +#: src/chcon.c:389 src/chgrp.c:143 src/chown.c:121 #, fuzzy msgid "" "\n" @@ -1432,36 +1440,36 @@ msgstr "" " -P no atraviesa ningún enlace simbólico " "(predeterminado)\n" -#: src/chcon.c:512 src/chgrp.c:264 src/chown.c:267 +#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267 #, c-format msgid "-R --dereference requires either -H or -L" msgstr "-R --dereference requiere o bien -H o bien -L" -#: src/chcon.c:518 +#: src/chcon.c:524 #, c-format msgid "-R -h requires -P" msgstr "-R -h requiere -P" -#: src/chcon.c:533 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282 -#: src/comm.c:429 src/csplit.c:1371 src/join.c:1149 src/link.c:79 -#: src/mknod.c:148 src/setuidgid.c:139 src/tr.c:1785 +#: 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 #, c-format msgid "missing operand after %s" msgstr "falta un operando después de %s" -#: src/chcon.c:556 src/runcon.c:247 +#: src/chcon.c:562 src/runcon.c:251 #, c-format msgid "invalid context: %s" msgstr "contexto inválido: %s" -#: src/chcon.c:563 +#: src/chcon.c:569 #, c-format msgid "conflicting security context specifiers given" msgstr "se han dado especificadores de contexto de seguridad conflictivos" -#: src/chcon.c:572 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:433 src/cp.c:493 -#: src/mv.c:96 src/pwd.c:273 src/rm.c:324 src/touch.c:351 +#: 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 #, c-format msgid "failed to get attributes of %s" msgstr "fallo al obtener los permisos de %s" @@ -1527,15 +1535,6 @@ msgstr "" " que pueden cambiar el propietario de un enlace\n" " simbólico)\n" -#: src/chgrp.c:132 src/chmod.c:387 src/chown.c:110 -#, fuzzy -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" - #: src/chgrp.c:136 msgid "" " --reference=RFILE use RFILE's group rather than specifying a\n" @@ -1634,9 +1633,38 @@ msgstr "" "cualquier\n" " fichero al que apunten\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 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" #: src/chmod.c:394 msgid " -R, --recursive change files and directories recursively\n" @@ -1823,7 +1851,7 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:97 src/install.c:575 src/setuidgid.c:110 src/setuidgid.c:120 +#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120 #, c-format msgid "invalid group %s" msgstr "grupo inválido %s" @@ -1895,8 +1923,8 @@ msgstr "fallo al establecer el ID del grupo" 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:213 src/stdbuf.c:366 -#: src/timeout.c:402 +#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365 +#: src/timeout.c:454 #, c-format msgid "failed to run command %s" msgstr "fallo al ejecutar la orden %s" @@ -2051,20 +2079,24 @@ 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:1609 src/dd.c:1976 +#: 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 #, c-format -msgid "reading %s" -msgstr "leyendo %s" +msgid "error reading %s" +msgstr "error al leer %s" -#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:426 +#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425 #, c-format msgid "cannot lseek %s" msgstr "no se puede efectuar `lseek' sobre %s" -#: src/copy.c:206 src/dd.c:2039 src/dd.c:2102 +#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151 #, c-format -msgid "writing %s" -msgstr "escribiendo %s" +msgid "error writing %s" +msgstr "error al escribir en %s" #: src/copy.c:313 #, c-format @@ -2086,7 +2118,7 @@ msgstr "fallo al extender %s" msgid "clearing permissions for %s" msgstr "borrando los permisos de %s" -#: src/copy.c:697 src/copy.c:2470 src/cp.c:331 +#: src/copy.c:697 src/copy.c:2480 src/cp.c:329 #, c-format msgid "failed to preserve ownership for %s" msgstr "fallo al conservar el propietario de %s" @@ -2101,14 +2133,14 @@ msgstr "fallo al buscar el fichero %s" msgid "failed to preserve authorship for %s" msgstr "fallo al conservar el autor de %s" -#: src/copy.c:804 src/csplit.c:638 src/du.c:901 src/fmt.c:449 src/head.c:847 -#: src/sort.c:4489 src/split.c:1329 src/tail.c:1756 src/wc.c:678 +#: 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 "no se puede abrir %s para lectura" -#: src/copy.c:810 src/copy.c:972 src/dd.c:1546 src/dd.c:2114 src/dd.c:2252 -#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:141 +#: 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 #, c-format msgid "cannot fstat %s" msgstr "no se puede efectuar `fstat' sobre %s" @@ -2128,14 +2160,14 @@ msgstr "fallo al obtener el contexto de creación del sistema de ficheros" 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:1574 src/copy.c:1777 src/copy.c:1935 src/ln.c:314 -#: src/remove.c:267 src/remove.c:293 src/remove.c:444 src/remove.c:465 +#: 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 #, c-format msgid "cannot remove %s" msgstr "no se puede borrar %s" -#: src/copy.c:886 src/copy.c:1578 src/copy.c:1772 src/copy.c:1940 -#: src/remove.c:418 +#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945 +#: src/remove.c:375 #, c-format msgid "removed %s\n" msgstr "%s borrado\n" @@ -2155,137 +2187,137 @@ msgstr "no se puede crear el fichero regular %s" msgid "failed to clone %s from %s" msgstr "fallo al clonar %s a partir de %s" -#: src/copy.c:1098 src/copy.c:2531 +#: src/copy.c:1098 src/copy.c:2541 #, c-format msgid "preserving times for %s" msgstr "se conserva las fechas de %s" -#: src/copy.c:1170 src/copy.c:1176 src/head.c:855 src/touch.c:175 -#: src/truncate.c:413 -#, c-format -msgid "closing %s" -msgstr "cerrando %s" +#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172 +#: src/truncate.c:417 +#, fuzzy, c-format +msgid "failed to close %s" +msgstr "No se puede abrir %s" # SIoNO -#: src/copy.c:1466 +#: src/copy.c:1471 #, c-format msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? " msgstr "%s: ¿intentar sobreescribir %s, sustituyendo el modo %04lo? (%s) " # SIoNO -#: src/copy.c:1473 +#: src/copy.c:1478 #, c-format msgid "%s: overwrite %s? " msgstr "%s: ¿sobreescribir %s? (s/n) " -#: src/copy.c:1542 +#: src/copy.c:1547 #, c-format msgid " (backup: %s)" msgstr " (respaldo: %s)" -#: src/copy.c:1552 +#: src/copy.c:1557 #, 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:1584 +#: src/copy.c:1589 #, c-format msgid "cannot create hard link %s to %s" msgstr "crea el enlace duro %s a %s" -#: src/copy.c:1637 src/copy.c:1689 src/copy.c:2272 src/copy.c:2589 +#: 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:1220 src/truncate.c:365 +#: src/stat.c:1239 src/truncate.c:363 #, c-format msgid "cannot stat %s" msgstr "no se puede efectuar `stat' sobre %s" -#: src/copy.c:1645 +#: src/copy.c:1650 #, c-format msgid "omitting directory %s" msgstr "se omite el directorio %s" -#: src/copy.c:1659 +#: src/copy.c:1664 #, 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:1707 src/ln.c:246 +#: src/copy.c:1712 src/ln.c:246 #, c-format msgid "%s and %s are the same file" msgstr "%s y %s son el mismo fichero" -#: src/copy.c:1806 +#: src/copy.c:1811 #, 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:1824 src/ln.c:214 +#: src/copy.c:1829 src/ln.c:214 #, 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:1842 +#: src/copy.c:1847 #, 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:1856 +#: src/copy.c:1861 #, 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:1886 +#: src/copy.c:1891 #, 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:1887 +#: src/copy.c:1892 #, 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:1910 src/ln.c:276 +#: src/copy.c:1915 src/ln.c:276 #, c-format msgid "cannot backup %s" msgstr "no se puede respaldar %s" -#: src/copy.c:1974 +#: src/copy.c:1979 #, 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:2051 +#: src/copy.c:2056 #, 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:2068 +#: src/copy.c:2073 #, 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:2118 +#: src/copy.c:2123 #, 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:2161 +#: src/copy.c:2166 #, c-format msgid "cannot move %s to %s" msgstr "no se puede mover %s a %s" -#: src/copy.c:2173 +#: src/copy.c:2178 #, 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:2207 src/install.c:905 src/mkdir.c:189 src/mkfifo.c:114 -#: src/mknod.c:167 +#: 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 "" @@ -2297,19 +2329,19 @@ msgstr "" # mkdir aa # cp -d bb aa # ls -l aa -#: src/copy.c:2241 +#: src/copy.c:2246 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "no se puede copiar el enlace simbólico cíclico %s" -#: src/copy.c:2350 +#: src/copy.c:2355 #, 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:2357 +#: src/copy.c:2362 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "no se puede crear el enlace simbólico %s a %s" @@ -2348,27 +2380,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:2406 src/mkfifo.c:133 +#: src/copy.c:2416 src/mkfifo.c:132 #, c-format msgid "cannot create fifo %s" msgstr "no se puede crear el fichero `fifo' %s" -#: src/copy.c:2415 +#: src/copy.c:2425 #, c-format msgid "cannot create special file %s" msgstr "no se puede crear el fichero especial %s" -#: src/copy.c:2426 src/ls.c:3191 src/stat.c:902 +#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921 #, c-format msgid "cannot read symbolic link %s" msgstr "no se puede leer el enlace simbólico %s" -#: src/copy.c:2453 +#: src/copy.c:2463 #, c-format msgid "cannot create symbolic link %s" msgstr "no se puede crear el enlace simbólico %s" -#: src/copy.c:2485 +#: src/copy.c:2495 #, c-format msgid "%s has unknown file type" msgstr "%s tiene un tipo de fichero desconocido" @@ -2376,17 +2408,17 @@ 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:2629 src/ln.c:358 +#: src/copy.c:2644 src/ln.c:358 #, c-format msgid "cannot un-backup %s" msgstr "no se puede restaurar %s" -#: src/copy.c:2633 +#: src/copy.c:2648 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (restauración)\n" -#: src/cp.c:156 src/mv.c:284 +#: src/cp.c:156 src/mv.c:286 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -2398,28 +2430,13 @@ msgstr "" " o bien: %s [OPCIÓN]... -t DIRECTORIO ORIGEN...\n" #: src/cp.c:162 -msgid "" -"Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" -"\n" +#, fuzzy +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" -#: src/cp.c:166 src/csplit.c:1458 src/cut.c:197 src/df.c:852 src/du.c:268 -#: src/expand.c:112 src/fmt.c:275 src/fold.c:75 src/head.c:115 -#: src/install.c:612 src/kill.c:86 src/ln.c:392 src/ls.c:4726 src/mkdir.c:61 -#: src/mkfifo.c:56 src/mknod.c:58 src/mv.c:294 src/nl.c:191 src/paste.c:445 -#: src/pr.c:2777 src/ptx.c:1825 src/shred.c:153 src/shuf.c:58 src/sort.c:399 -#: src/split.c:211 src/stdbuf.c:95 src/tac.c:142 src/tail.c:268 -#: src/touch.c:226 src/truncate.c:107 src/unexpand.c:122 src/uniq.c:145 -msgid "" -"Mandatory arguments to long options are mandatory for short options too.\n" -msgstr "" -"Los argumentos obligatorios para las opciones largas son también " -"obligatorios\n" -"para las opciones cortas.\n" - -#: src/cp.c:169 +#: src/cp.c:168 msgid "" " -a, --archive same as -dR --preserve=all\n" " --attributes-only don't copy the file data, just the " @@ -2447,12 +2464,14 @@ msgstr "" " -d lo mismo que --no-dereference --" "preserve=link\n" -#: src/cp.c:178 +#: src/cp.c:177 +#, fuzzy msgid "" " -f, --force if an existing destination file cannot be\n" -" opened, remove it and try again (redundant " -"if\n" -" the -n option is used)\n" +" opened, remove it and try again (this " +"option\n" +" is ignored when the -n option is also " +"used)\n" " -i, --interactive prompt before overwrite (overrides a previous " "-n\n" " option)\n" @@ -2467,7 +2486,7 @@ msgstr "" " -H sigue los enlaces simbólicos de la línea\n" " de órdenes\n" -#: src/cp.c:188 +#: src/cp.c:186 msgid "" " -l, --link hard link files instead of copying\n" " -L, --dereference always follow symbolic links in SOURCE\n" @@ -2477,7 +2496,7 @@ msgstr "" " -L, --dereference siempre sigue los enlaces simbólicos en " "ORIGEN\n" -#: src/cp.c:192 +#: src/cp.c:190 msgid "" " -n, --no-clobber do not overwrite an existing file (overrides\n" " a previous -i option)\n" @@ -2488,7 +2507,7 @@ msgstr "" "anterior)\n" " -P, --no-dereference nunca sigue los enlaces simbólicos en ORIGEN\n" -#: src/cp.c:197 +#: src/cp.c:195 msgid "" " -p same as --preserve=mode,ownership,timestamps\n" " --preserve[=ATTR_LIST] preserve the specified attributes (default:\n" @@ -2506,7 +2525,7 @@ msgstr "" "xattr,\n" " all\n" -#: src/cp.c:205 +#: src/cp.c:203 msgid "" " --no-preserve=ATTR_LIST don't preserve the specified attributes\n" " --parents use full source file name under DIRECTORY\n" @@ -2516,7 +2535,7 @@ msgstr "" "completo\n" " bajo DIRECTORIO\n" -#: src/cp.c:209 +#: src/cp.c:207 msgid "" " -R, -r, --recursive copy directories recursively\n" " --reflink[=WHEN] control clone/CoW copies. See below\n" @@ -2531,7 +2550,7 @@ msgstr "" " de intentar abrirlo (compárese con --" "force).\n" -#: src/cp.c:215 +#: src/cp.c:213 msgid "" " --sparse=WHEN control creation of sparse files. See below\n" " --strip-trailing-slashes remove any trailing slashes from each " @@ -2543,7 +2562,7 @@ msgstr "" " --strip-trailing-slashes elimina todas las barras finales de cada\n" " argumento ORIGEN\n" -#: src/cp.c:220 +#: src/cp.c:218 msgid "" " -s, --symbolic-link make symbolic links instead of copying\n" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -2558,7 +2577,7 @@ msgstr "" " directorio DIRECTORIO\n" " -T, --no-target-directory considera DEST como un fichero normal\n" -#: src/cp.c:226 +#: src/cp.c:224 msgid "" " -u, --update copy only when the SOURCE file is newer\n" " than the destination file or when the\n" @@ -2613,7 +2632,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:235 +#: src/cp.c:233 msgid "" "\n" "By default, sparse SOURCE files are detected by a crude heuristic and the\n" @@ -2646,7 +2665,7 @@ msgstr "" "es posible, la copia falla, o si se especifica --reflink=auto, se hace una\n" "copia normal.\n" -#: src/cp.c:247 src/install.c:649 src/ln.c:421 src/mv.c:321 +#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322 #, fuzzy msgid "" "\n" @@ -2664,7 +2683,7 @@ msgstr "" "Estos son los valores:\n" "\n" -#: src/cp.c:254 src/install.c:656 src/mv.c:328 +#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329 msgid "" " none, off never make backups (even if --backup is given)\n" " numbered, t make numbered backups\n" @@ -2679,7 +2698,7 @@ msgstr "" " simple, never siempre crea copias de seguridad simples\n" # Revisar esto un poco. Especialmente la última línea. -#: src/cp.c:260 +#: src/cp.c:258 msgid "" "\n" "As a special case, cp makes a backup of SOURCE when the force and backup\n" @@ -2693,64 +2712,64 @@ msgstr "" "para\n" "un nombre de fichero regular existente.\n" -#: src/cp.c:319 +#: src/cp.c:317 #, c-format msgid "failed to preserve times for %s" msgstr "fallo al conservar la fecha de %s" -#: src/cp.c:350 +#: src/cp.c:348 #, c-format msgid "failed to preserve permissions for %s" msgstr "fallo al conservar los permisos de %s" -#: src/cp.c:477 +#: src/cp.c:475 #, c-format msgid "cannot make directory %s" msgstr "no se puede crear el directorio %s" -#: src/cp.c:526 src/cp.c:545 +#: src/cp.c:524 src/cp.c:543 #, c-format msgid "%s exists but is not a directory" msgstr "%s existe pero no es un directorio" -#: src/cp.c:572 src/cp.c:1068 src/install.c:401 src/install.c:844 src/ln.c:123 -#: src/ln.c:181 src/ln.c:202 src/ln.c:516 src/mv.c:152 src/mv.c:399 -#, c-format -msgid "accessing %s" -msgstr "accediendo a %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 +#, fuzzy, c-format +msgid "failed to access %s" +msgstr "No se puede abrir %s" -#: src/cp.c:592 src/install.c:914 src/ln.c:546 src/mv.c:432 src/shred.c:1182 -#: src/touch.c:433 src/truncate.c:356 +#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181 +#: src/touch.c:429 src/truncate.c:354 #, c-format msgid "missing file operand" msgstr "falta un fichero como operando" -#: src/cp.c:594 src/install.c:916 src/ln.c:560 src/mv.c:434 +#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436 #, c-format msgid "missing destination file operand after %s" msgstr "falta el fichero de destino después de %s" -#: src/cp.c:603 src/install.c:925 src/mv.c:443 +#: src/cp.c:601 src/install.c:926 src/mv.c:445 #, 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:619 src/cp.c:1070 src/install.c:403 src/install.c:846 -#: src/install.c:938 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:401 -#: src/mv.c:457 +#: 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 #, 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:730 +#: src/cp.c:728 #, c-format msgid "with --parents, the destination must be a directory" msgstr "con --parents, el destino debe ser un directorio" -#: src/cp.c:1063 src/install.c:839 src/ln.c:511 src/mv.c:394 +#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395 #, c-format msgid "multiple target directories specified" msgstr "se han especificado varios directorios de destino" @@ -2763,33 +2782,33 @@ msgstr "se han especificado varios directorios de destino" # # ¿bibliografía? # (¿en qué libros os basáis?) sv+ -#: src/cp.c:1108 +#: src/cp.c:1110 #, 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:1115 src/mv.c:464 +#: src/cp.c:1117 src/mv.c:466 #, c-format msgid "options --backup and --no-clobber are mutually exclusive" msgstr "las opciones --backup y --no-clobber son mutuamente excluyentes" -#: src/cp.c:1121 +#: src/cp.c:1123 #, c-format msgid "--reflink can be used only with --sparse=auto" msgstr "--reflink solamente se puede usar con --sparse=auto" -#: src/cp.c:1129 src/install.c:899 src/ln.c:582 src/mv.c:472 +#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474 msgid "backup type" msgstr "tipo de respaldo" -#: src/cp.c:1154 +#: src/cp.c:1156 #, 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:1160 +#: src/cp.c:1162 #, c-format msgid "cannot preserve extended attributes, cp is built without xattr support" msgstr "" @@ -2801,33 +2820,33 @@ msgstr "" msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:529 +#: src/csplit.c:531 #, c-format msgid "input disappeared" msgstr "la entrada dejó de existir" -#: src/csplit.c:658 src/csplit.c:669 +#: src/csplit.c:660 src/csplit.c:671 #, c-format msgid "%s: line number out of range" msgstr "%s: número de línea fuera de rango" -#: src/csplit.c:698 +#: src/csplit.c:700 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: número de línea fuera de rango" # ??? -#: src/csplit.c:701 src/csplit.c:750 +#: src/csplit.c:703 src/csplit.c:752 #, c-format msgid " on repetition %s\n" msgstr " repetido %s\n" -#: src/csplit.c:744 +#: src/csplit.c:746 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: ocurrencia no encontrada" -#: src/csplit.c:808 src/csplit.c:848 src/nl.c:359 src/tac.c:274 +#: src/csplit.c:810 src/csplit.c:850 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" @@ -2835,103 +2854,102 @@ 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:981 +#: src/csplit.c:983 #, c-format msgid "write error for %s" msgstr "error de escritura para %s" -#: src/csplit.c:1057 +#: src/csplit.c:1059 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: se esperaba un número entero después del delimitador" -#: src/csplit.c:1073 +#: src/csplit.c:1075 #, fuzzy, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: se requiere un `}' después del número de repeticiones" -#: src/csplit.c:1083 +#: src/csplit.c:1085 #, fuzzy, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: entre `{' y `}' debe especificarse un número entero" -#: src/csplit.c:1110 +#: src/csplit.c:1112 #, fuzzy, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: falta el delimitador de cierre `%c'" -#: src/csplit.c:1127 +#: src/csplit.c:1129 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: la expresión regular no es válida: %s" -#: src/csplit.c:1160 +#: src/csplit.c:1162 #, c-format msgid "%s: invalid pattern" msgstr "%s: plantilla inválida" -#: src/csplit.c:1163 +#: src/csplit.c:1165 #, 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:1169 +#: src/csplit.c:1171 #, 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:1175 +#: src/csplit.c:1177 #, 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:1253 +#: src/csplit.c:1255 #, c-format msgid "missing conversion specifier in suffix" msgstr "falta el especificador de conversión en el sufijo" -#: src/csplit.c:1259 +#: src/csplit.c:1261 #, 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:1262 +#: src/csplit.c:1264 #, 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:1267 +#: src/csplit.c:1269 #, 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:1284 +#: src/csplit.c:1286 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "demasiados especificadores de conversión %% en el sufijo" -#: src/csplit.c:1298 +#: src/csplit.c:1300 #, c-format msgid "missing %% conversion specification in suffix" msgstr "falta el especificador de conversión %% en el sufijo" -#: src/csplit.c:1345 +#: src/csplit.c:1347 #, c-format msgid "%s: invalid number" msgstr "%s: número inválido" -#: src/csplit.c:1449 +#: src/csplit.c:1451 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Modo de empleo: %s [OPCIÓN]... FICHERO PLANTILLA...\n" -#: src/csplit.c:1453 +#: src/csplit.c:1455 #, 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" -"\n" msgstr "" "Escribe los trozos de FICHERO que estén separados por PLANTILLA(s) en " "ficheros\n" @@ -2939,7 +2957,7 @@ msgstr "" "estándar.\n" "\n" -#: src/csplit.c:1461 +#: src/csplit.c:1462 #, fuzzy, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2950,7 +2968,7 @@ msgstr "" " -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:1466 +#: src/csplit.c:1467 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" @@ -2961,7 +2979,7 @@ 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:1473 +#: src/csplit.c:1474 msgid "" "\n" "Read standard input if FILE is -. Each PATTERN may be:\n" @@ -2969,7 +2987,7 @@ msgstr "" "\n" "Lee la entrada estándar si FICHERO es `-'. Cada PLANTILLA puede ser:\n" -#: src/csplit.c:1477 +#: src/csplit.c:1478 #, fuzzy msgid "" "\n" @@ -2997,7 +3015,7 @@ msgstr "" msgid "David M. Ihnat" msgstr "David M. Ihnat" -#: src/cut.c:64 +#: 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" @@ -3007,14 +3025,13 @@ msgid "Usage: %s OPTION... [FILE]...\n" msgstr "Modo de empleo: %s OPCIÓN... [FICHERO]...\n" #: src/cut.c:193 -msgid "" -"Print selected parts of lines from each FILE to standard output.\n" -"\n" +#, fuzzy +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:200 +#: src/cut.c:199 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -3025,7 +3042,7 @@ msgstr "" " -d, --delimiter=DELIM usa DELIM en vez de caracteres de tabulación\n" " para delimitar los campos\n" -#: src/cut.c:205 +#: src/cut.c:204 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -3039,7 +3056,7 @@ msgstr "" " opción -s\n" " -n (no tiene efecto)\n" -#: src/cut.c:211 +#: src/cut.c:210 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" @@ -3048,7 +3065,7 @@ msgstr "" "campos\n" " seleccionados\n" -#: src/cut.c:215 +#: src/cut.c:214 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -3060,7 +3077,7 @@ msgstr "" " resultado. Por omisión se utiliza el\n" " delimitador de la entrada\n" -#: src/cut.c:222 +#: src/cut.c:221 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -3076,7 +3093,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:228 +#: src/cut.c:227 msgid "" "Each range is one of:\n" "\n" @@ -3099,47 +3116,49 @@ msgstr "" "\n" "Si no hay FICHERO, o cuando FICHERO es -, lee la entrada estándar.\n" -#: src/cut.c:368 src/cut.c:489 -msgid "invalid byte or field list" +#: src/cut.c:367 src/cut.c:493 +#, fuzzy +msgid "invalid byte, character or field list" msgstr "la lista de bytes o campos no es válida" -#: src/cut.c:385 +#: src/cut.c:387 msgid "invalid range with no endpoint: -" msgstr "rango inválido sin punto de final: -" -#: src/cut.c:399 +#: src/cut.c:403 msgid "invalid decreasing range" msgstr "rango decreciente inválido" -#: src/cut.c:478 +#: src/cut.c:482 #, c-format msgid "byte offset %s is too large" msgstr "el desplazamiento de bytes %s es demasiado grande" -#: src/cut.c:481 +#: src/cut.c:485 #, c-format msgid "field number %s is too large" msgstr "el número de campo %s es demasiado grande" -#: src/cut.c:789 src/cut.c:797 +#: src/cut.c:795 src/cut.c:803 msgid "only one type of list may be specified" msgstr "solamente se puede especificar un tipo de lista" -#: src/cut.c:806 +#: src/cut.c:812 src/numfmt.c:1408 +#, c-format msgid "the delimiter must be a single character" msgstr "el delimitador debe ser un sólo carácter" -#: src/cut.c:841 +#: src/cut.c:847 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:844 +#: src/cut.c:850 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:848 +#: src/cut.c:854 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -3147,11 +3166,11 @@ msgstr "" "suprimir las líneas no delimitadas solamente tiene sentido\n" "cuando se procesan campos" -#: src/cut.c:864 +#: src/cut.c:870 msgid "missing list of fields" msgstr "falta la lista de campos" -#: src/cut.c:866 +#: src/cut.c:872 msgid "missing list of positions" msgstr "falta la lista de posiciones" @@ -3167,9 +3186,11 @@ msgstr "" " o bien: %s [-u|--utc|--universal] [MMDDhhmm[[SS]AA][.ss]]\n" #: src/date.c:128 +msgid "Display the current time in the given FORMAT, or set the system date.\n" +msgstr "" + +#: src/date.c:134 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" " -I[TIMESPEC], --iso-8601[=TIMESPEC] output date/time in ISO 8601 format.\n" @@ -3178,7 +3199,7 @@ msgid "" " and time to the indicated precision.\n" msgstr "" -#: src/date.c:138 +#: src/date.c:142 msgid "" " -r, --reference=FILE display the last modification time of FILE\n" " -R, --rfc-2822 output date and time in RFC 2822 format.\n" @@ -3189,7 +3210,7 @@ msgstr "" " -R, --rfc-2822 muestra la fecha y hora en formato RFC 2822.\n" " Ejemplo: Mon, 07 Aug 2006 12:34:56 -0600\n" -#: src/date.c:143 +#: src/date.c:147 #, fuzzy msgid "" " --rfc-3339=TIMESPEC output date and time in RFC 3339 format.\n" @@ -3209,7 +3230,7 @@ msgstr "" " -u, --utc, --universal muestra o establece el Tiempo Universal " "Coordinado\n" -#: src/date.c:154 +#: src/date.c:158 msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" @@ -3223,7 +3244,7 @@ msgstr "" " %% un % literal\n" " %a el nombre local abreviado de la semana (p. ej., dom)\n" -#: src/date.c:161 +#: src/date.c:165 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -3235,7 +3256,7 @@ msgstr "" " %B el nombre local completo del mes (p. ej. Enero)\n" " %c la fecha y hora local (p. ej., jue mar 3 23:05:25 CET 2005)\n" -#: src/date.c:167 +#: src/date.c:171 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -3248,7 +3269,7 @@ msgstr "" " %D la fecha; igual que %m/%d/%y\n" " %e el día del mes, completado con espacios, igual que %_d\n" -#: src/date.c:173 +#: src/date.c:177 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -3258,7 +3279,7 @@ msgstr "" " %g últimos dos dígitos del año del número de semana ISO (ver %G)\n" " %G año del número de la semana ISO (ver %V); útil normalmente con %V\n" -#: src/date.c:178 +#: src/date.c:182 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -3270,7 +3291,7 @@ msgstr "" " %I la hora (01..12)\n" " %j el día del año (001..366)\n" -#: src/date.c:184 +#: src/date.c:188 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -3282,7 +3303,7 @@ msgstr "" " %m el mes (01..12)\n" " %M los minutos (00..59)\n" -#: src/date.c:190 +#: src/date.c:194 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -3300,7 +3321,7 @@ msgstr "" " %R la hora y minutos, en formato de 24 horas; igual que %H:%M\n" " %s los segundos desde 1970-01-01 00:00:00 UTC\n" -#: src/date.c:199 +#: src/date.c:203 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -3313,7 +3334,7 @@ msgstr "" " %u día de la semana (1..7); 1 representa lunes\n" # ¿Es realmente correcta la W? Casi coincide con %V -#: src/date.c:205 +#: src/date.c:209 msgid "" " %U week number of year, with Sunday as first day of week (00..53)\n" " %V ISO week number, with Monday as first day of week (01..53)\n" @@ -3328,7 +3349,7 @@ msgstr "" " %W el número de la semana en el año con lunes como primer día de\n" " la semana (00..53)\n" -#: src/date.c:211 +#: src/date.c:215 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -3340,7 +3361,7 @@ msgstr "" " %y los últimos dos dígitos del año (00..99)\n" " %Y el año\n" -#: src/date.c:217 +#: src/date.c:221 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -3360,7 +3381,7 @@ msgstr "" "\n" "Por omisión, date rellena los campos numéricos con ceros.\n" -#: src/date.c:226 +#: src/date.c:230 #, fuzzy msgid "" "The following optional flags may follow '%':\n" @@ -3379,7 +3400,7 @@ msgstr "" " ^ utiliza mayúsculas si es posible\n" " # utiliza mayúsuculas/minúsculas en sentido contrario si es posible\n" -#: src/date.c:235 +#: src/date.c:239 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -3399,7 +3420,7 @@ msgstr "" # # Como decía Douglas Hofstadter: "La mejor traducción de una novela de # Dostoievski acaba siendo una novela de Galdós". -#: src/date.c:242 +#: src/date.c:246 msgid "" "\n" "Examples:\n" @@ -3424,37 +3445,37 @@ msgstr "" "hora peninsular española\n" " $ date --date='TZ=\"Europe/Madrid\" 09:00 next Fri'\n" -#: src/date.c:275 src/dd.c:2193 src/head.c:838 src/md5sum.c:477 -#: src/md5sum.c:798 src/od.c:863 src/od.c:1914 src/pr.c:1176 src/pr.c:1372 -#: src/pr.c:1494 src/stty.c:842 src/tac.c:563 src/tail.c:343 src/tee.c:126 +#: 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 #, c-format msgid "standard input" msgstr "entrada estándar" -#: src/date.c:303 src/date.c:523 +#: src/date.c:307 src/date.c:527 #, c-format msgid "invalid date %s" msgstr "fecha inválida %s" -#: src/date.c:414 src/date.c:448 +#: src/date.c:418 src/date.c:452 #, c-format msgid "multiple output formats specified" msgstr "se han especificado varios formatos de salida" # Cualquier cosa menos poner "fechas a imprimir". -#: src/date.c:426 +#: src/date.c:430 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "las opciones para especificar la fecha son mutuamente excluyentes" -#: src/date.c:433 +#: src/date.c:437 #, c-format msgid "the options to print and set the time may not be used together" msgstr "" "las opciones para mostrar y establecer la hora no se pueden utilizar a la vez" -#: src/date.c:454 +#: src/date.c:458 #, fuzzy, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -3465,23 +3486,23 @@ msgstr "" "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 `+'." -#: src/date.c:531 +#: src/date.c:535 #, c-format msgid "cannot set date" msgstr "no se puede establecer la fecha" -#: src/date.c:554 src/du.c:360 +#: src/date.c:558 src/du.c:371 #, c-format msgid "time %s is out of range" msgstr "la fecha %s está fuera de rango" #. This is a proper name. See the gettext manual, section Names. -#: src/dd.c:44 src/factor.c:43 src/rm.c:41 src/tail.c:69 src/touch.c:41 +#: 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 "Paul Rubin" -#: src/dd.c:517 +#: src/dd.c:521 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3491,7 +3512,7 @@ msgstr "" " o bien: %s OPCIÓN\n" # Tenía un fuzzy pero no sé de qué. -#: src/dd.c:522 +#: src/dd.c:526 #, fuzzy msgid "" "Copy a file, converting and formatting according to the operands.\n" @@ -3512,7 +3533,7 @@ msgstr "" " count=BLOQUES copia solamente BLOQUES bloques de entrada\n" " ibs=BYTES lee BYTES bytes cada vez (por omision: 512)\n" -#: src/dd.c:531 +#: src/dd.c:535 #, fuzzy msgid "" " if=FILE read from FILE instead of stdin\n" @@ -3522,7 +3543,8 @@ msgid "" " oflag=FLAGS write as per the comma separated symbol list\n" " seek=N skip N obs-sized blocks at start of output\n" " skip=N skip N ibs-sized blocks at start of input\n" -" status=noxfer suppress transfer statistics\n" +" status=WHICH WHICH info to suppress outputting to stderr;\n" +" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" msgstr "" " if=FICHERO lee del FICHERO en lugar de la entrada estándar (stdin)\n" " iflag=OPCIONES lee según la lista de símbolos separados por comas\n" @@ -3535,10 +3557,11 @@ msgstr "" " entrada\n" " status=noxfer suprime estadísticas sobre la transferencia\n" -#: src/dd.c:541 +#: src/dd.c:546 +#, fuzzy msgid "" "\n" -"BLOCKS and BYTES may be followed by the following multiplicative suffixes:\n" +"N and BYTES may be followed by the following multiplicative suffixes:\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, and so on for T, P, E, Z, Y.\n" "\n" @@ -3556,7 +3579,7 @@ msgstr "" "\n" # Tampoco le encuentro el fuzzy -#: src/dd.c:550 +#: src/dd.c:555 #, fuzzy msgid "" " ascii from EBCDIC to ASCII\n" @@ -3587,7 +3610,7 @@ msgstr "" " cuando se utiliza con block o unblock, rellena con espacios\n" " en lugar de con NULos\n" -#: src/dd.c:563 +#: src/dd.c:568 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3603,7 +3626,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:571 +#: src/dd.c:576 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3617,75 +3640,75 @@ msgstr "" " append modo de adición (solamente tiene sentido para salida,\n" " se sugiere conv=notrunc)\n" -#: src/dd.c:578 +#: src/dd.c:583 msgid " cio use concurrent I/O for data\n" msgstr " cio utiliza E/S concurrente para los datos\n" -#: src/dd.c:580 +#: src/dd.c:585 msgid " direct use direct I/O for data\n" msgstr " direct utiliza E/S directa para los datos\n" -#: src/dd.c:582 +#: src/dd.c:587 msgid " directory fail unless a directory\n" msgstr " directory falla a menos que sea un directorio\n" -#: src/dd.c:584 +#: src/dd.c:589 msgid " dsync use synchronized I/O for data\n" msgstr " dsync utiliza E/S sincronizada para los datos\n" -#: src/dd.c:586 +#: src/dd.c:591 msgid " sync likewise, but also for metadata\n" msgstr " sync similar, pero también para metadatos\n" -#: src/dd.c:587 +#: src/dd.c:592 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr " fullblock acumula bloques llenos de entrada (solamente iflag)\n" -#: src/dd.c:590 +#: src/dd.c:595 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock utiliza E/S no bloqueante\n" -#: src/dd.c:592 +#: src/dd.c:597 msgid " noatime do not update access time\n" msgstr " noatime no actualiza la fecha de acceso\n" -#: src/dd.c:595 +#: src/dd.c:600 msgid " nocache discard cached data\n" msgstr " nocache descarta los datos en caché\n" -#: src/dd.c:598 +#: src/dd.c:603 msgid " noctty do not assign controlling terminal from file\n" msgstr " noctty no asigna una terminal controladora del fichero\n" -#: src/dd.c:601 +#: src/dd.c:606 msgid " nofollow do not follow symlinks\n" msgstr " nofollow no sigue los enlaces simbólicos\n" -#: src/dd.c:603 +#: src/dd.c:608 msgid " nolinks fail if multiply-linked\n" msgstr " nolinks falla si está enlazado varias veces\n" -#: src/dd.c:605 +#: src/dd.c:610 msgid " binary use binary I/O for data\n" msgstr " binary utiliza E/S binaria para los datos\n" -#: src/dd.c:607 +#: src/dd.c:612 msgid " text use text I/O for data\n" msgstr " text utiliza E/S de texto para los datos\n" -#: src/dd.c:609 +#: src/dd.c:614 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:612 +#: src/dd.c:617 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:615 +#: src/dd.c:620 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:620 +#: src/dd.c:625 #, fuzzy, c-format msgid "" "\n" @@ -3714,7 +3737,7 @@ msgstr "" "\n" "Las opciones son:\n" -#: src/dd.c:676 +#: src/dd.c:683 #, c-format msgid "" "%<PRIuMAX>+%<PRIuMAX> records in\n" @@ -3723,21 +3746,21 @@ msgstr "" "%<PRIuMAX>+%<PRIuMAX> registros leídos\n" "%<PRIuMAX>+%<PRIuMAX> registros escritos\n" -#: src/dd.c:682 +#: src/dd.c:689 #, 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:694 +#: src/dd.c:701 #, 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:712 +#: src/dd.c:720 msgid "Infinity B" msgstr "Infinito B" @@ -3751,85 +3774,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:725 +#: src/dd.c:733 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g s, %s/s\n" -#: src/dd.c:804 +#: src/dd.c:812 #, c-format msgid "closing input file %s" msgstr "cerrando el fichero de entrada %s" -#: src/dd.c:811 +#: src/dd.c:819 #, c-format msgid "closing output file %s" msgstr "cerrando el fichero de salida %s" -#: src/dd.c:1014 +#: src/dd.c:1022 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "fallo al desactivar O_DIRECT: %s" -#: src/dd.c:1085 src/dd.c:1934 +#: src/dd.c:1093 src/dd.c:1942 #, c-format msgid "writing to %s" msgstr "escribiendo en %s" -#: src/dd.c:1199 src/dd.c:1253 +#: src/dd.c:1207 src/dd.c:1261 #, c-format msgid "unrecognized operand %s" msgstr "operando no reconocido %s" -#: src/dd.c:1210 +#: src/dd.c:1218 msgid "invalid conversion" msgstr "conversión inválida" -#: src/dd.c:1213 src/dd.c:1289 +#: src/dd.c:1221 src/dd.c:1297 msgid "invalid input flag" msgstr "opción de entrada inválida" -#: src/dd.c:1216 src/dd.c:1283 src/dd.c:1295 +#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303 msgid "invalid output flag" msgstr "opción de salida inválida" -#: src/dd.c:1219 +#: src/dd.c:1227 msgid "invalid status flag" msgstr "opción de estado inválida" -#: src/dd.c:1258 src/truncate.c:312 +#: src/dd.c:1266 src/truncate.c:310 #, c-format msgid "invalid number %s" msgstr "número inválido %s" -#: src/dd.c:1340 +#: src/dd.c:1348 #, 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:1342 +#: src/dd.c:1350 #, c-format msgid "cannot combine block and unblock" msgstr "no se puede combinar block y unblock" # Lo mismo de antes. -#: src/dd.c:1344 +#: src/dd.c:1352 #, c-format msgid "cannot combine lcase and ucase" msgstr "no se puede combinar lcase y ucase" -#: src/dd.c:1346 +#: src/dd.c:1354 #, c-format msgid "cannot combine excl and nocreat" msgstr "no se puede combinar excl y nocreat" -#: src/dd.c:1349 +#: src/dd.c:1357 #, c-format msgid "cannot combine direct and nocache" msgstr "no se puede combinar direct y nocache" # Se admiten sugerencias. -#: src/dd.c:1506 +#: src/dd.c:1514 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3839,72 +3862,72 @@ 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:1593 +#: src/dd.c:1601 #, c-format msgid "%s: cannot skip" msgstr "%s: no se puede saltar" -#: src/dd.c:1595 src/dd.c:1614 src/dd.c:1675 +#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683 #, c-format msgid "%s: cannot seek" msgstr "%s: desplazamiento imposible" -#: src/dd.c:1655 +#: src/dd.c:1663 #, c-format msgid "offset overflow while reading file %s" msgstr "desbordamiento de desplazamiento leyendo el fichero %s" -#: src/dd.c:1667 +#: src/dd.c:1675 #, 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:1671 +#: src/dd.c:1679 #, 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:1814 +#: src/dd.c:1822 #, c-format msgid "setting flags for %s" msgstr "estableciendo opciones para %s" -#: src/dd.c:1867 +#: 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:1881 +#: 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:1914 +#: src/dd.c:1922 #, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: no se puede saltar al desplazamiento especificado" -#: src/dd.c:2125 src/dd.c:2258 -#, c-format -msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" +#: src/dd.c:2133 +#, fuzzy, 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" -#: src/dd.c:2138 +#: src/dd.c:2146 #, c-format msgid "fdatasync failed for %s" msgstr "fdatasync falló para %s" -#: src/dd.c:2148 +#: src/dd.c:2156 #, c-format msgid "fsync failed for %s" msgstr "falló fsync para %s" -#: src/dd.c:2199 src/dd.c:2228 +#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165 #, c-format -msgid "opening %s" -msgstr "abriendo %s" +msgid "failed to open %s" +msgstr "No se puede abrir %s" -#: src/dd.c:2237 +#: src/dd.c:2246 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) " @@ -3913,78 +3936,100 @@ msgstr "" "desplazamiento demasiado grande: no se puede truncar a una longitud de\n" "seek=%<PRIuMAX> bloques (%lu bytes)" -#: src/dd.c:2274 src/dd.c:2280 +#: src/dd.c:2267 +#, 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 #, 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:54 src/expr.c:153 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:39 src/sleep.c:35 src/sort.c:66 +#: 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 msgid "Paul Eggert" msgstr "Paul Eggert" -#: src/df.c:140 +#: src/df.c:172 msgid "Filesystem" msgstr "S.ficheros" -#: src/df.c:141 +#: src/df.c:175 msgid "Type" msgstr "Tipo" -#: src/df.c:142 +#: src/df.c:178 src/df.c:542 msgid "blocks" msgstr "bloques" -#: src/df.c:142 -msgid "Inodes" -msgstr "Nodos-i" - -#: src/df.c:142 -msgid "Size" -msgstr "Tamaño" - -#: src/df.c:143 +#: src/df.c:181 msgid "Used" msgstr "Usados" -#: src/df.c:143 -msgid "IUsed" -msgstr "NUsados" - -#: src/df.c:144 +#: src/df.c:184 msgid "Available" msgstr "Disponibles" -#: src/df.c:144 -msgid "IFree" -msgstr "NLibres" - -#: src/df.c:144 -msgid "Avail" -msgstr "Disp" - -#: src/df.c:145 +#: src/df.c:187 msgid "Use%" msgstr "Uso%" -#: src/df.c:145 +#: src/df.c:190 +msgid "Inodes" +msgstr "Nodos-i" + +#: src/df.c:193 +msgid "IUsed" +msgstr "NUsados" + +#: src/df.c:196 +msgid "IFree" +msgstr "NLibres" + +#: src/df.c:199 msgid "IUse%" msgstr "NUso%" -#: src/df.c:145 +#: src/df.c:202 +msgid "Mounted on" +msgstr "Montado en" + +#: src/df.c:383 +#, c-format +msgid "option --output: field '%s' unknown" +msgstr "" + +#: 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:410 src/df.c:449 +msgid "Size" +msgstr "Tamaño" + +#: src/df.c:414 src/df.c:451 +msgid "Avail" +msgstr "Disp" + +#: src/df.c:474 msgid "Capacity" msgstr "Capacidad" -#: src/df.c:146 -msgid "Mounted on" -msgstr "Montado en" +#. 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 +#, c-format +msgid "%s-%s" +msgstr "" -#: src/df.c:847 +#: src/df.c:1210 +#, fuzzy msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" -"\n" msgstr "" "Muestra información sobre el sistema de ficheros en el que reside cada " "FICHERO,\n" @@ -3992,7 +4037,7 @@ msgstr "" "\n" # Se aceptan sugerencias para lo de "dummy" -#: src/df.c:855 +#: src/df.c:1217 #, fuzzy msgid "" " -a, --all include dummy file systems\n" @@ -4015,7 +4060,7 @@ msgstr "" " -H, --si análogo, pero utiliza potencias de 1000 y no de " "1024\n" -#: src/df.c:865 +#: src/df.c:1227 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -4031,8 +4076,12 @@ msgstr "" " --no-sync no llama a sync antes de obtener el modo de empleo\n" " (por defecto)\n" -#: src/df.c:872 +#: src/df.c:1234 +#, fuzzy msgid "" +" --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" +" or print all fields if FIELD_LIST is " +"omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" " -t, --type=TYPE limit listing to file systems of type TYPE\n" @@ -4050,20 +4099,42 @@ msgstr "" " no son del tipo TIPO\n" " -v (no tiene efecto)\n" -#: src/df.c:1027 +#: src/df.c:1248 +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" +msgstr "" + +#: src/df.c:1285 +#, fuzzy, 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: " + +#: src/df.c:1336 +msgid "long option '--megabytes' is deprecated and will soon be removed" +msgstr "" + +#: src/df.c:1442 #, 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:1075 +#: src/df.c:1500 msgid "Warning: " msgstr "Atención: " -#: src/df.c:1077 src/stat.c:795 +#: src/df.c:1502 src/stat.c:814 msgid "cannot read table of mounted file systems" msgstr "no se puede leer la tabla de sistemas de ficheros montados" -#: src/df.c:1107 +#: src/df.c:1539 #, c-format msgid "no file systems processed" msgstr "no se ha procesado ningún sistema de ficheros" @@ -4185,7 +4256,7 @@ msgstr "" " %s /usr/bin/ Salida \"/usr\".\n" " %s stdio.h Salida \".\".\n" -#: src/du.c:260 src/sort.c:390 src/wc.c:112 +#: src/du.c:270 src/sort.c:394 src/wc.c:112 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -4202,18 +4273,19 @@ msgstr "" # ¿Por qué no algo tan simple y comprensible como "no hace referencia a"? uac # # Lo pensaré despacito. sv -#: src/du.c:264 -msgid "" -"Summarize disk usage of each FILE, recursively for directories.\n" -"\n" +#: src/du.c:274 +#, fuzzy +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:271 +#: src/du.c:280 #, fuzzy msgid "" +" -0, --null end each output line with 0 byte rather than " +"newline\n" " -a, --all write counts for all files, not just directories\n" " --apparent-size print apparent sizes, rather than disk usage; " "although\n" @@ -4232,7 +4304,7 @@ msgstr "" "indirectos,\n" " etc.\n" -#: src/du.c:279 +#: src/du.c:289 #, fuzzy msgid "" " -B, --block-size=SIZE scale sizes by SIZE before printing them. E.g.,\n" @@ -4242,6 +4314,11 @@ msgid "" " -c, --total produce a grand total\n" " -D, --dereference-args dereference only symlinks that are listed on the\n" " command line\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 "" " -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" @@ -4257,7 +4334,8 @@ msgstr "" # # En esto no os ponéis de acuerdo. # Creo que lo acabaremos preguntando en "spanglish". sv+ -#: src/du.c:288 +#: src/du.c:302 +#, fuzzy msgid "" " --files0-from=F summarize disk usage of the NUL-terminated file\n" " names specified in file F;\n" @@ -4265,7 +4343,6 @@ msgid "" " -H equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" --si like -h, but use powers of 1000 not 1024\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" @@ -4277,9 +4354,11 @@ msgstr "" " --si como -h, pero utiliza potencias de 1000 y no de " "1024\n" -#: src/du.c:297 +#: src/du.c:310 +#, fuzzy 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 "" @@ -4288,14 +4367,13 @@ msgstr "" "fuertes\n" " -m como --block-size=1M\n" -#: src/du.c:302 +#: src/du.c:316 +#, fuzzy msgid "" -" -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " "default)\n" -" -0, --null end each output line with 0 byte rather than " -"newline\n" " -S, --separate-dirs 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" @@ -4305,30 +4383,11 @@ msgstr "" " -S, --separate-dirs no incluye el tamaño de los subdirectorios\n" " -s, --summarize muestra solamente un total para cada argumento\n" -#: src/du.c:309 -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" - -#: src/du.c:318 +#: src/du.c:322 #, fuzzy msgid "" +" -t, --threshold=SIZE exclude entries smaller than SIZE if positive,\n" +" or entries greater than SIZE if negative\n" " --time show time of the last modification of any file in " "the\n" " directory, or any of its subdirectories\n" @@ -4348,66 +4407,75 @@ msgstr "" " full-iso, long-iso, iso, +FORMATO\n" " FORMATO se intepreta como `date'\n" -#: src/du.c:375 +#: src/du.c:333 +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 msgid "Infinity" msgstr "Infinito B" -#: src/du.c:600 +#: src/du.c:507 +#, c-format +msgid "mount point %s already traversed" +msgstr "" + +#: src/du.c:624 #, c-format msgid "fts_read failed: %s" msgstr "fts_read falló: %s" -#: src/du.c:724 +#: src/du.c:780 #, c-format msgid "invalid maximum depth %s" msgstr "profundidad máxima inválida %s" -#: src/du.c:817 +#: src/du.c:809 +#, fuzzy, c-format +msgid "invalid --threshold argument '-0'" +msgstr "argumento --%s inválido %s" + +#: src/du.c:887 #, 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:824 +#: src/du.c:894 #, 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:830 +#: src/du.c:900 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "atención: resumir entra en conflicto con --max-depth=%lu" -#: src/du.c:896 src/sort.c:4479 src/wc.c:668 +#: src/du.c:966 src/sort.c:4533 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:949 src/md5sum.c:587 src/od.c:903 src/tac.c:239 src/tac.c:350 -#: src/tac.c:506 src/tac.c:586 src/wc.c:733 +#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 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:963 src/sort.c:4508 src/wc.c:747 +#: src/du.c:1040 src/sort.c:4562 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:980 src/du.c:988 src/wc.c:760 src/wc.c:768 +#: src/du.c:1057 src/du.c:1065 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:1007 src/head.c:149 src/head.c:262 src/head.c:334 src/head.c:538 -#: src/head.c:620 src/head.c:692 src/head.c:750 src/head.c:774 src/tail.c:412 -#: src/tail.c:500 src/tail.c:549 src/tail.c:642 src/tail.c:770 src/tail.c:818 -#: src/tail.c:855 src/tail.c:1782 src/tail.c:1812 src/uniq.c:395 -#, c-format -msgid "error reading %s" -msgstr "error al leer %s" - -#: src/du.c:1010 src/ls.c:2649 src/wc.c:791 +#: src/du.c:1088 src/ls.c:2649 src/wc.c:791 msgid "total" msgstr "total" @@ -4511,9 +4579,12 @@ msgstr "" "Modo de empleo: %s [OPCIÓN]... [-] [NOMBRE=VALOR]... [ORDEN [ARGUMENTO]...]\n" #: src/env.c:55 +msgid "Set each NAME to VALUE in the environment and run COMMAND.\n" +msgstr "" + +#: src/env.c:61 +#, fuzzy msgid "" -"Set each NAME to VALUE in the environment and run COMMAND.\n" -"\n" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with 0 byte rather than newline\n" " -u, --unset=NAME remove variable from the environment\n" @@ -4525,7 +4596,7 @@ msgstr "" " en lugar de con nueva línea\n" " -u, --unset=NOMBRE borra la variable del entorno\n" -#: src/env.c:64 +#: src/env.c:68 msgid "" "\n" "A mere - implies -i. If no COMMAND, print the resulting environment.\n" @@ -4533,33 +4604,33 @@ msgstr "" "\n" "Un simple - implica -i. Si no hay ORDEN, muestra el entorno resultante.\n" -#: src/env.c:120 +#: src/env.c:124 #, c-format msgid "cannot unset %s" msgstr "no se puede borrar %s" -#: src/env.c:131 +#: src/env.c:135 #, c-format msgid "cannot set %s" msgstr "no se puede establecer %s" -#: src/env.c:148 +#: src/env.c:152 #, c-format 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" -"\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" -#: src/expand.c:115 +#: src/expand.c:114 msgid "" " -i, --initial do not convert tabs after non blanks\n" " -t, --tabs=NUMBER have tabs NUMBER characters apart, not 8\n" @@ -4569,35 +4640,35 @@ msgstr "" " -t, --tabs=NÚMERO establece las tabulaciones cada NÚMERO caracteres, no " "8\n" -#: src/expand.c:119 +#: src/expand.c:118 msgid "" " -t, --tabs=LIST use comma separated list of explicit tab positions\n" msgstr "" " -t, --tabs=LISTA usa la LISTA de posiciones separadas por comas para\n" " definir las posiciones de tabulación\n" -#: src/expand.c:172 src/unexpand.c:191 +#: src/expand.c:171 src/unexpand.c:190 #, c-format msgid "tab stop is too large %s" msgstr "la parada de tabulación es demasiado grande %s" -#: src/expand.c:180 src/unexpand.c:199 +#: src/expand.c:179 src/unexpand.c:198 #, c-format msgid "tab size contains invalid character(s): %s" msgstr "el tamaño de tabulación contiene uno o varios caracteres inválidos: %s" -#: src/expand.c:206 src/unexpand.c:225 +#: src/expand.c:205 src/unexpand.c:224 #, c-format msgid "tab size cannot be 0" msgstr "el tamaño de tabulación no puede ser 0" # ??? Mejor que el original, lo estoy dejando :-) -#: src/expand.c:208 src/unexpand.c:227 +#: src/expand.c:207 src/unexpand.c:226 #, c-format msgid "tab sizes must be ascending" msgstr "las posiciones de tabulación deben ir en orden creciente" -#: src/expand.c:326 src/expand.c:345 src/unexpand.c:374 src/unexpand.c:419 +#: 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 "la línea de entrada es demasiado larga" @@ -4792,12 +4863,12 @@ msgstr "error en el comparador de expresiones regulares" msgid "non-integer argument" msgstr "argumento no entero" -#: src/expr.c:793 src/truncate.c:316 +#: src/expr.c:793 src/truncate.c:314 #, c-format msgid "division by zero" msgstr "división por cero" -#: src/expr.c:887 src/sort.c:2029 +#: src/expr.c:887 src/sort.c:2044 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "establezca LC_ALL='C' para solucionar este problema de forma temporal." @@ -4807,25 +4878,32 @@ msgstr "establezca LC_ALL='C' para solucionar este problema de forma temporal." msgid "the strings compared were %s and %s" msgstr "las cadenas comparadas eran %s y %s." -#: src/factor.c:449 -msgid "using arbitrary-precision arithmetic" -msgstr "se usa aritmética de precisión arbitraria" +#. This is a proper name. See the gettext manual, section Names. +#: src/factor.c:111 +msgid "Niels Moller" +msgstr "" -#: src/factor.c:460 -msgid "using single-precision arithmetic" -msgstr "se usa aritmética de simple precisión" +#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459 +#, c-format +msgid "Lucas prime test failure. This should not happen" +msgstr "" -#: src/factor.c:465 src/od.c:1640 src/od.c:1709 +#: src/factor.c:2092 #, c-format -msgid "%s is too large" -msgstr "%s es demasiado grande" +msgid "squfof queue overflow" +msgstr "" -#: src/factor.c:469 +#: src/factor.c:2419 #, c-format msgid "%s is not a valid positive integer" msgstr "%s no es un entero positivo válido" -#: src/factor.c:494 +#: src/factor.c:2442 src/od.c:1646 src/od.c:1715 +#, c-format +msgid "%s is too large" +msgstr "%s es demasiado grande" + +#: src/factor.c:2454 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4834,7 +4912,7 @@ msgstr "" "Modo de empleo: %s [NÚMERO]...\n" " o bien: %s OPCIÓN\n" -#: src/factor.c:499 +#: src/factor.c:2459 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" @@ -4861,20 +4939,20 @@ msgid "cannot stat current directory (now %s)" msgstr "no se puede efectuar `stat' sobre el directorio actual (ahora %s)" #. This is a proper name. See the gettext manual, section Names. -#: src/fmt.c:37 +#: src/fmt.c:38 msgid "Ross Paterson" msgstr "Ross Paterson" -#: src/fmt.c:269 +#: src/fmt.c:270 #, c-format msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n" msgstr "Modo de empleo: %s [-ANCHO] [OPCIÓN]... [FICHERO]...\n" -#: src/fmt.c:270 +#: 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" -"\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" @@ -4892,8 +4970,8 @@ msgstr "" " -s, --split-only divide las líneas largas de manera que quepan\n" " en el ancho especificado, pero no junta líneas\n" -#: src/fmt.c:285 -#, fuzzy, c-format +#: src/fmt.c:287 +#, fuzzy, 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" @@ -4909,7 +4987,7 @@ msgstr "" "defecto,\n" " 75 columnas)\n" -#: src/fmt.c:357 +#: src/fmt.c:359 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -4918,7 +4996,7 @@ msgstr "" "opción inválida -- %c; -ANCHO solamente se reconoce cuando es la primera\n" "opción; utilice -w N en su lugar" -#: src/fmt.c:403 src/fmt.c:414 +#: src/fmt.c:405 src/fmt.c:416 #, c-format msgid "invalid width: %s" msgstr "ancho inválido: %s" @@ -4926,16 +5004,16 @@ 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" -"\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:78 +#: src/fold.c:77 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4945,13 +5023,13 @@ msgstr "" " -s, --spaces corta la línea por los espacios\n" " -w, --width=ANCHO utiliza ANCHO columnas en vez de 80\n" -#: src/fold.c:289 src/pr.c:836 +#: src/fold.c:288 src/pr.c:832 #, c-format 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:75 +#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 #: src/truncate.c:37 msgid "Padraig Brady" msgstr "Padraig Brady" @@ -4971,17 +5049,17 @@ msgstr "" "de shell.\n" "\n" -#: src/group-list.c:69 src/id.c:345 src/setuidgid.c:184 +#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184 #, 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:350 +#: src/group-list.c:74 src/id.c:370 #, c-format msgid "failed to get groups for the current process" msgstr "fallo al obtener los grupos del proceso actual" -#: src/group-list.c:104 +#: src/group-list.c:114 #, c-format msgid "cannot find name for group ID %lu" msgstr "no se puede encontrar el nombre para el grupo con ID %lu" @@ -5024,18 +5102,18 @@ msgid "%s: no such user" 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" "With no FILE, or when FILE is -, read standard input.\n" -"\n" 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" -#: src/head.c:118 +#: src/head.c:117 #, fuzzy msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" @@ -5052,7 +5130,7 @@ msgstr "" " primeras 10; con el `-' inicial, muestra todas\n" " menos las últimas K líneas de cada fichero\n" -#: src/head.c:126 +#: src/head.c:125 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -5062,7 +5140,7 @@ msgstr "" " -v, --verbose muestra siempre las cabeceras con el nombre del\n" " fichero\n" -#: src/head.c:132 +#: src/head.c:131 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -5075,32 +5153,32 @@ msgstr "" "GB 1000*1000*1000, G 1024*1024*1024, y así sucesivamente para T, P, E, Z, " "Y.\n" -#: src/head.c:152 -#, c-format -msgid "error writing %s" -msgstr "error al escribir en %s" - -#: src/head.c:155 +#: src/head.c:154 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: el fichero ha encogido demasiado" -#: src/head.c:228 src/head.c:1044 +#: src/head.c:227 src/head.c:1051 #, c-format msgid "%s: number of bytes is too large" msgstr "%s: el número de bytes es demasiado grande" -#: src/head.c:441 +#: 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:613 src/head.c:684 src/tail.c:450 +#: src/head.c:612 src/head.c:691 src/tail.c:449 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: no se puede desplazar a la posición %s" -#: src/head.c:791 +#: src/head.c:673 +#, fuzzy, c-format +msgid "%s: failed to reset file pointer" +msgstr "%s: fallo al borrar" + +#: src/head.c:798 #, c-format msgid "cannot reposition file pointer for %s" msgstr "no se puede reposicionar el puntero a fichero para %s" @@ -5110,28 +5188,28 @@ msgstr "no se puede reposicionar el puntero a fichero para %s" # # Pues un número, es un concepto abstracto, y su representación son # cosas como 1, 2 3i em+ -#: src/head.c:878 +#: src/head.c:885 #, 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:879 +#: src/head.c:886 msgid "number of lines" msgstr "número de líneas" -#: src/head.c:879 +#: src/head.c:886 msgid "number of bytes" msgstr "número de bytes" -#: src/head.c:886 src/tail.c:1947 +#: src/head.c:893 src/tail.c:1947 msgid "invalid number of lines" msgstr "el número de líneas no es válido" -#: src/head.c:887 src/tail.c:1948 +#: src/head.c:894 src/tail.c:1948 msgid "invalid number of bytes" msgstr "el número de bytes no es válido" -#: src/head.c:974 src/head.c:1032 +#: src/head.c:981 src/head.c:1039 #, c-format msgid "invalid trailing option -- %c" msgstr "opción inválida al final -- %c" @@ -5276,56 +5354,56 @@ msgstr "no se puede obtener el contexto del proceso" msgid "cannot get effective UID" msgstr "no se puede seguir %s" -#: src/id.c:289 +#: src/id.c:311 #, fuzzy, c-format -msgid "cannot find name for user ID %lu" +msgid "cannot find name for user ID %s" msgstr "no se puede encontrar el nombre para el usuario con ID %lu" -#: src/id.c:309 +#: src/id.c:329 #, fuzzy, c-format -msgid "uid=%lu" +msgid "uid=%s" msgstr "uid=%lu" -#: src/id.c:314 +#: src/id.c:334 #, fuzzy, c-format -msgid " gid=%lu" -msgstr " egid=%lu" +msgid " gid=%s" +msgstr " gid=%lu" -#: src/id.c:321 +#: src/id.c:341 #, fuzzy, c-format -msgid " euid=%lu" -msgstr " egid=%lu" +msgid " euid=%s" +msgstr " euid=%lu" -#: src/id.c:329 -#, c-format -msgid " egid=%lu" +#: src/id.c:349 +#, fuzzy, c-format +msgid " egid=%s" msgstr " egid=%lu" -#: src/id.c:357 +#: src/id.c:377 msgid " groups=" msgstr " grupos=" -#: src/id.c:373 +#: src/id.c:393 #, c-format msgid " context=%s" msgstr " contexto=%s" -#: src/install.c:372 +#: src/install.c:373 #, 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:413 +#: src/install.c:414 #, c-format msgid "creating directory %s" msgstr "creando el directorio %s" -#: src/install.c:481 +#: src/install.c:482 #, c-format msgid "cannot change ownership of %s" msgstr "no se puede cambiar el propietario de %s" -#: src/install.c:505 +#: src/install.c:506 #, c-format msgid "cannot set time stamps for %s" msgstr "no se puede establecer la fecha de %s" @@ -5336,32 +5414,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:526 src/split.c:412 src/timeout.c:387 +#: src/install.c:527 src/split.c:426 src/timeout.c:439 #, c-format msgid "fork system call failed" msgstr "falló la llamada al sistema `fork'" -#: src/install.c:530 +#: src/install.c:531 #, c-format msgid "cannot run %s" msgstr "no se puede ejecutar %s" -#: src/install.c:534 +#: src/install.c:535 #, c-format msgid "waiting for strip" msgstr "esperando a strip" -#: src/install.c:536 +#: src/install.c:537 #, c-format msgid "strip process terminated abnormally" msgstr "el proceso strip terminó anormalmente" -#: src/install.c:557 +#: src/install.c:558 #, c-format msgid "invalid user %s" msgstr "usuario inválido %s" -#: src/install.c:593 +#: src/install.c:594 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -5374,7 +5452,8 @@ msgstr "" " o bien: %s [OPCIÓN]... -t DIRECTORIO ORIGEN...\n" " o bien: %s [OPCIÓN]... -d DIRECTORIO...\n" -#: src/install.c:600 +#: src/install.c:601 +#, fuzzy msgid "" "\n" "This install program copies files (often just compiled) into destination\n" @@ -5386,7 +5465,6 @@ msgid "" "In the first three forms, copy SOURCE to DEST or multiple SOURCE(s) to\n" "the existing DIRECTORY, while setting permission modes and owner/group.\n" "In the 4th form, create all components of the given DIRECTORY(ies).\n" -"\n" msgstr "" "\n" "Este programa install copia los ficheros (a menudo recién compilados) al " @@ -5488,7 +5566,7 @@ msgstr "" " -Z, --context=CONTEXTO establece el contexto de seguridad SELinux de los\n" " ficheros y directorios\n" -#: src/install.c:858 +#: src/install.c:859 #, c-format msgid "" "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled" @@ -5496,7 +5574,7 @@ msgstr "" "ATENCIÓN: no se tendrá en cuenta --preserve-context; este núcleo no tiene\n" "SELinux activado" -#: src/install.c:868 +#: src/install.c:869 #, c-format msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled" msgstr "" @@ -5504,27 +5582,27 @@ msgstr "" "SELinux\n" "activado" -#: src/install.c:885 +#: src/install.c:886 #, 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:888 +#: src/install.c:889 #, 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:892 +#: 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:946 src/mkdir.c:202 src/stdbuf.c:327 +#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326 #, c-format msgid "invalid mode %s" msgstr "modo inválido %s" -#: src/install.c:953 +#: src/install.c:954 #, c-format msgid "WARNING: ignoring --strip-program option as -s option was not specified" msgstr "" @@ -5532,19 +5610,19 @@ msgstr "" "especificado\n" "la opción -s" -#: src/install.c:958 +#: src/install.c:959 #, 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:965 +#: src/install.c:966 #, c-format msgid "options --compare (-C) and --strip are mutually exclusive" msgstr "las opciones --compare (-C) y --strip son mutuamente excluyentes" -#: src/install.c:971 +#: src/install.c:972 #, c-format msgid "" "the --compare (-C) option is ignored when you specify a mode with non-" @@ -5554,7 +5632,7 @@ msgstr "" "con bits de no permiso" #. This is a proper name. See the gettext manual, section Names. -#: src/join.c:40 src/sort.c:65 +#: src/join.c:40 src/sort.c:66 msgid "Mike Haertel" msgstr "Mike Haertel" @@ -5665,8 +5743,8 @@ msgstr "" "dará un mensaje de aviso.\n" #: src/join.c:403 -#, c-format -msgid "%s:%ju: is not sorted: %.*s" +#, fuzzy, c-format +msgid "%s:%<PRIuMAX>: is not sorted: %.*s" msgstr "%s:%ju: no está ordenado: %.*s" #: src/join.c:840 src/join.c:1038 @@ -5694,12 +5772,12 @@ msgstr "campos de unión %lu, %lu incompatibles" msgid "conflicting empty-field replacement strings" msgstr "cadenas de reemplazo de campos vacíos conflictivas" -#: src/join.c:1101 src/sort.c:4414 +#: src/join.c:1101 src/sort.c:4468 #, c-format msgid "multi-character tab %s" msgstr "tab multicarácter %s" -#: src/join.c:1105 src/sort.c:4419 +#: src/join.c:1105 src/sort.c:4473 #, c-format msgid "incompatible tabs" msgstr "tabulaciones incompatibles" @@ -5726,14 +5804,13 @@ msgstr "" " o bien: %s -t [SEÑAL]...\n" #: src/kill.c:82 -msgid "" -"Send signals to processes, or list signals.\n" -"\n" +#, fuzzy +msgid "Send signals to processes, or list signals.\n" msgstr "" "Envía señales a los procesos, o lista señales.\n" "\n" -#: src/kill.c:89 +#: src/kill.c:88 msgid "" " -s, --signal=SIGNAL, -SIGNAL\n" " specify the name or number of the signal to be sent\n" @@ -5749,7 +5826,7 @@ msgstr "" " señales en números o viceversa\n" " -t, --table muestra una tabla de información sobre señales\n" -#: src/kill.c:97 +#: src/kill.c:96 #, fuzzy msgid "" "\n" @@ -5763,32 +5840,32 @@ msgstr "" "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" -#: src/kill.c:206 +#: src/kill.c:205 #, c-format msgid "%s: invalid process id" msgstr "%s: identificador de proceso inválido" -#: src/kill.c:260 +#: src/kill.c:259 #, c-format msgid "invalid option -- %c" msgstr "opción inválida -- %c" -#: src/kill.c:269 +#: src/kill.c:268 #, c-format msgid "%s: multiple signals specified" msgstr "%s: se han especificado varias señales" -#: src/kill.c:283 +#: src/kill.c:282 #, c-format msgid "multiple -l or -t options specified" msgstr "se han especificado varias opciones -l o -t" -#: src/kill.c:300 +#: src/kill.c:299 #, c-format msgid "cannot combine signal with -l or -t" msgstr "no se puede combinar la señal con -l o -t" -#: src/kill.c:306 +#: src/kill.c:305 #, c-format msgid "no process ID specified" msgstr "no se ha especificado ningún ID de proceso" @@ -5905,7 +5982,6 @@ msgid "" "When creating hard links, each TARGET must exist. Symbolic links\n" "can hold arbitrary text; if later resolved, a relative link is\n" "interpreted in relation to its parent directory.\n" -"\n" msgstr "" "En la primera forma, crea un enlace a OBJETIVO con el nombre " "NOMBRE_DEL_ENLACE.\n" @@ -5918,7 +5994,7 @@ msgstr "" "enlace\n" "relativo se interpreta en relación a su directorio padre.\n" -#: src/ln.c:395 +#: src/ln.c:394 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -5942,7 +6018,7 @@ msgstr "" " el superusuario)\n" " -f, --force borra los ficheros destino que ya existan\n" -#: src/ln.c:403 +#: src/ln.c:402 #, fuzzy msgid "" " -i, --interactive prompt whether to remove destinations\n" @@ -5965,7 +6041,7 @@ msgstr "" " -s, --symbolic crea enlaces simbólicos en vez de enlaces " "duros\n" -#: src/ln.c:412 +#: src/ln.c:411 #, fuzzy msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -5983,25 +6059,10 @@ msgstr "" " -v, --verbose imprime el nombre de cada fichero antes\n" " de crear el enlace\n" -#: src/ln.c:428 -#, 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" - -#: src/ln.c:435 +#: src/ln.c:433 #, fuzzy, 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 "" @@ -6087,7 +6148,7 @@ 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:1976 +#: src/ls.c:1750 src/ptx.c:1975 #, c-format msgid "invalid line width: %s" msgstr "ancho de línea inválido: %s" @@ -6165,7 +6226,7 @@ msgid "closing directory %s" msgstr "cerrando el directorio %s" # Lo mismo de antes. -#: src/ls.c:3301 +#: src/ls.c:3302 #, c-format msgid "cannot compare file names %s and %s" msgstr "no se pueden comparar los nombres de fichero %s y %s" @@ -6191,10 +6252,10 @@ msgstr "no se pueden comparar los nombres de fichero %s y %s" # # Eso es lo que me parece. Gracias. sv #: src/ls.c:4721 +#, 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" -"\n" msgstr "" "Muestra información acerca de los FICHEROs (del directorio actual por " "defecto).\n" @@ -6202,7 +6263,7 @@ msgstr "" "opciones -cftuvSUX ni --sort.\n" "\n" -#: src/ls.c:4729 +#: src/ls.c:4728 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -6217,7 +6278,7 @@ msgstr "" "no\n" " gráficos\n" -#: src/ls.c:4735 +#: src/ls.c:4734 #, fuzzy msgid "" " --block-size=SIZE scale sizes by SIZE before printing them. E." @@ -6246,7 +6307,7 @@ msgstr "" " en cualquier otro caso: ordena por ctime, el\n" " más reciente primero\n" -#: src/ls.c:4745 +#: src/ls.c:4744 #, fuzzy msgid "" " -C list entries by columns\n" @@ -6270,7 +6331,7 @@ msgstr "" " -D, --dired genera el resultado para el modo `dired' de " "Emacs\n" -#: src/ls.c:4753 +#: src/ls.c:4752 #, fuzzy msgid "" " -f do not sort, enable -aU, disable -ls --color\n" @@ -6288,11 +6349,11 @@ msgstr "" " single-column -1, verbose -l, vertical -C\n" " --full-time como -l --time-style=full-iso\n" -#: src/ls.c:4761 +#: src/ls.c:4760 msgid " -g like -l, but do not list owner\n" msgstr " -g como -l, pero no lista el propietario\n" -#: src/ls.c:4764 +#: src/ls.c:4763 msgid "" " --group-directories-first\n" " group directories before files.\n" @@ -6307,7 +6368,7 @@ msgstr "" "agrupación\n" # Se aceptan sugerencias para lo de "dummy" -#: src/ls.c:4770 +#: src/ls.c:4769 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" @@ -6321,7 +6382,7 @@ msgstr "" " -H, --si análogo, pero utiliza potencias de 1000 y no de " "1024\n" -#: src/ls.c:4776 +#: src/ls.c:4775 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -6343,7 +6404,7 @@ msgstr "" " con el patrón de shell PATRÓN\n" " (las opciones -a o -A tienen prioridad)\n" -#: src/ls.c:4786 +#: src/ls.c:4785 #, fuzzy msgid "" " --indicator-style=WORD append indicator with style WORD to entry " @@ -6366,7 +6427,7 @@ msgstr "" " con PATRÓN de shell\n" " -k como --block-size=1K\n" -#: src/ls.c:4796 +#: src/ls.c:4795 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -6385,7 +6446,7 @@ msgstr "" " -m rellena el ancho con una lista de entradas\n" " separadas por comas\n" -#: src/ls.c:4804 +#: src/ls.c:4803 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. " @@ -6415,7 +6476,7 @@ 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:4812 +#: src/ls.c:4811 #, fuzzy msgid "" " -q, --hide-control-chars print ? instead of non graphic characters\n" @@ -6440,7 +6501,7 @@ msgstr "" " literal, locale, shell, shell-always, c, " "escape\n" -#: src/ls.c:4821 +#: src/ls.c:4820 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -6454,7 +6515,7 @@ 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:4826 +#: src/ls.c:4825 msgid "" " -S sort by file size\n" " --sort=WORD sort by WORD instead of name: none -U,\n" @@ -6477,7 +6538,7 @@ msgstr "" " utiliza la fecha especificada como clave de\n" " ordenación si --sort=time\n" -#: src/ls.c:4836 +#: src/ls.c:4835 #, fuzzy msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" @@ -6502,7 +6563,7 @@ msgstr "" "fuera\n" " del local POSIX\n" -#: src/ls.c:4845 +#: src/ls.c:4844 msgid "" " -t sort by modification time, newest first\n" " -T, --tabsize=COLS assume tab stops at each COLS instead of 8\n" @@ -6512,7 +6573,7 @@ msgstr "" " -T, --tabsize=COLS establece los topes de tabulación a cada COLS\n" " en lugar de 8\n" -#: src/ls.c:4849 +#: src/ls.c:4848 msgid "" " -u with -lt: sort by, and show, access time\n" " with -l: show access time and sort by name\n" @@ -6531,7 +6592,7 @@ msgstr "" " -v orden natural de números (de versión) dentro\n" " del texto\n" -#: src/ls.c:4856 +#: src/ls.c:4855 msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" @@ -6551,7 +6612,7 @@ msgstr "" " fichero\n" " -1 muestra un fichero por cada línea\n" -#: src/ls.c:4866 +#: src/ls.c:4865 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -6566,7 +6627,7 @@ msgstr "" "terminal. La variable de entorno LS_COLORS puede cambiar las opciones.\n" "Utilice la orden dircolors para establecerla.\n" -#: src/ls.c:4873 +#: src/ls.c:4872 msgid "" "\n" "Exit status:\n" @@ -6598,7 +6659,7 @@ msgstr "Scott Miller" msgid "David Madore" msgstr "David Madore" -#: src/md5sum.c:162 +#: src/md5sum.c:164 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -6610,7 +6671,7 @@ msgstr "" "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" -#: src/md5sum.c:172 +#: src/md5sum.c:174 msgid "" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" @@ -6618,23 +6679,27 @@ msgstr "" " -b, --binary lee en modo binario (por omisión a menos\n" " que se lea la terminal como entrada estándar)\n" -#: src/md5sum.c:176 +#: src/md5sum.c:178 msgid " -b, --binary read in binary mode\n" msgstr " -b, --binary lee en modo binario\n" -#: src/md5sum.c:179 +#: src/md5sum.c:181 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr " -c, --check lee %s sumas de los FICHEROs y las comprueba\n" -#: src/md5sum.c:183 +#: src/md5sum.c:184 +msgid " --tag create a BSD-style checksum\n" +msgstr "" + +#: src/md5sum.c:188 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" " -t, --text lee en modo de texto (por omisión si se lee de la\n" " terminal como entrada estándar)\n" -#: src/md5sum.c:187 +#: src/md5sum.c:192 msgid " -t, --text read in text mode (default)\n" msgstr " -t, --text lee en modo de texto (por omisión)\n" @@ -6642,7 +6707,7 @@ msgstr " -t, --text lee en modo de texto (por omisión)\n" # "no muestra nada, el valor de retorno indica el estado\n" # y que sería mejor decir algo así como: # "...el resultado [del chequeo | comprobación]..." -#: src/md5sum.c:190 +#: src/md5sum.c:195 msgid "" "\n" "The following three options are useful only when verifying checksums:\n" @@ -6661,7 +6726,7 @@ msgstr "" " que no están correctamente formateadas\n" "\n" -#: src/md5sum.c:198 +#: src/md5sum.c:203 msgid "" " --strict with --check, exit non-zero for any invalid input\n" msgstr "" @@ -6669,7 +6734,7 @@ msgstr "" "cero\n" " para cualquier entrada inválida\n" -#: src/md5sum.c:203 +#: src/md5sum.c:208 #, fuzzy, c-format msgid "" "\n" @@ -6686,7 +6751,7 @@ msgstr "" "modo\n" "de entrada (`*' para binario, ` ' para texto), y el nombre de cada FICHERO.\n" -#: src/md5sum.c:502 +#: src/md5sum.c:523 #, c-format msgid "%s: too many checksum lines" msgstr "%s: demasiadas líneas de suma de comprobación" @@ -6699,14 +6764,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:526 +#: src/md5sum.c:547 #, 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:551 +#: src/md5sum.c:572 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: FALLO al abrir o leer\n" @@ -6714,7 +6779,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:574 +#: src/md5sum.c:595 msgid "FAILED" msgstr "La suma no coincide" @@ -6723,12 +6788,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:576 +#: src/md5sum.c:597 msgid "OK" msgstr "La suma coincide" # Me pregunto y no me contesto: ¿Qué podrá ser el segundo %s? -#: src/md5sum.c:600 +#: src/md5sum.c:621 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "" @@ -6742,28 +6807,40 @@ msgstr "" # "...de comprobación MD5 con formato erróneo." # # ipg: ¿y crece por allí? ¡con el frío que hace! }:-) -#: src/md5sum.c:610 +#: src/md5sum.c:631 #, 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:618 +#: src/md5sum.c:639 #, 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:626 +#: src/md5sum.c:647 #, 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:704 +#: src/md5sum.c:760 +#, c-format +msgid "--tag does not support --text mode" +msgstr "" + +#: src/md5sum.c:766 +#, fuzzy, 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" + +#: src/md5sum.c:773 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" @@ -6771,27 +6848,27 @@ msgstr "" "las opciones --binary y --text no tienen sentido cuando se verifican sumas\n" "de comprobación" -#: src/md5sum.c:712 +#: src/md5sum.c:781 #, 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:719 +#: src/md5sum.c:788 #, 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:726 +#: src/md5sum.c:795 #, 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:733 +#: src/md5sum.c:802 #, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "" @@ -6804,14 +6881,13 @@ msgid "Usage: %s [OPTION]... DIRECTORY...\n" msgstr "Modo de empleo: %s [OPCIÓN]... DIRECTORIO...\n" #: src/mkdir.c:57 -msgid "" -"Create the DIRECTORY(ies), if they do not already exist.\n" -"\n" +#, fuzzy +msgid "Create the DIRECTORY(ies), if they do not already exist.\n" msgstr "" "Crea los DIRECTORIO(s), si no existen ya.\n" "\n" -#: src/mkdir.c:64 +#: src/mkdir.c:63 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" @@ -6827,7 +6903,7 @@ msgstr "" " -Z, --context=CTX establece el contexto de seguridad SELinux de cada\n" " directorio creado a CTX\n" -#: src/mkdir.c:169 +#: src/mkdir.c:168 #, c-format msgid "created directory %s" msgstr "se ha creado el directorio %s" @@ -6874,21 +6950,20 @@ 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 -msgid "" -"Create named pipes (FIFOs) with the given NAMEs.\n" -"\n" +#, fuzzy +msgid "Create named pipes (FIFOs) with the given NAMEs.\n" msgstr "" "Crea tuberías con nombre (FIFOs) con los NOMBREs dados.\n" "\n" -#: src/mkfifo.c:59 src/mknod.c:61 +#: src/mkfifo.c:58 src/mknod.c:60 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:62 +#: src/mkfifo.c:61 msgid "" " -Z, --context=CTX set the SELinux security context of each NAME to CTX\n" msgstr "" @@ -6902,12 +6977,12 @@ 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:122 src/mknod.c:128 +#: src/mkfifo.c:121 src/mknod.c:127 #, c-format msgid "invalid mode" msgstr "modo inválido" -#: src/mkfifo.c:127 src/mknod.c:133 +#: src/mkfifo.c:126 src/mknod.c:132 #, c-format msgid "mode must specify only file permission bits" msgstr "el modo solamente debe especificar los bits de permisos del fichero" @@ -6920,20 +6995,19 @@ 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 -msgid "" -"Create the special file NAME of the given TYPE.\n" -"\n" +#, fuzzy +msgid "Create the special file NAME of the given TYPE.\n" msgstr "" "Crea el fichero especial NOMBRE del TIPO dado.\n" "\n" -#: src/mknod.c:64 +#: 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:69 +#: src/mknod.c:68 msgid "" "\n" "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n" @@ -6949,7 +7023,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:76 +#: src/mknod.c:75 msgid "" "\n" " b create a block (buffered) special file\n" @@ -6961,42 +7035,42 @@ msgstr "" " c, u crea un fichero especial de caracteres (unbuffered)\n" " p crea un `FIFO'\n" -#: src/mknod.c:151 +#: src/mknod.c:150 msgid "Special files require major and minor device numbers." msgstr "" "Los ficheros especiales necesitan números de dispositivo principal y " "secundario." -#: src/mknod.c:161 +#: src/mknod.c:160 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:177 +#: src/mknod.c:176 #, c-format msgid "block special files not supported" msgstr "los ficheros especiales de bloques no están soportados" -#: src/mknod.c:186 +#: src/mknod.c:185 #, c-format msgid "character special files not supported" msgstr "los ficheros especiales de caracteres no están soportados" -#: src/mknod.c:202 +#: src/mknod.c:201 #, c-format msgid "invalid major device number %s" msgstr "número principal de dispositivo inválido %s" -#: src/mknod.c:207 +#: src/mknod.c:206 #, c-format msgid "invalid minor device number %s" msgstr "número secundario de dispositivo inválido %s" -#: src/mknod.c:212 +#: src/mknod.c:211 #, c-format msgid "invalid device %s %s" msgstr "dispositivo inválido %s %s" -#: src/mknod.c:226 +#: src/mknod.c:225 #, c-format msgid "invalid device type %s" msgstr "tipo de dispositivo inválido %s" @@ -7086,60 +7160,59 @@ msgstr "" "tmp\n" " (obsoleto)\n" -#: src/mktemp.c:222 +#: 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:228 +#: src/mktemp.c:229 #, c-format msgid "too many templates" msgstr "demasiadas plantillas" -#: src/mktemp.c:248 +#: src/mktemp.c:249 #, c-format msgid "with --suffix, template %s must end in X" msgstr "con --suffix, la plantilla %s debe terminar en X" -#: src/mktemp.c:273 src/split.c:1117 +#: src/mktemp.c:274 src/split.c:1130 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "sufijo inválido %s, contiene el separador de directorios" -#: src/mktemp.c:278 +#: src/mktemp.c:279 #, c-format msgid "too few X's in template %s" msgstr "insuficiente número de X en la plantilla %s" -#: src/mktemp.c:291 +#: src/mktemp.c:292 #, c-format msgid "invalid template, %s, contains directory separator" msgstr "plantilla inválida, %s, contiene separador de directorios" -#: src/mktemp.c:305 +#: src/mktemp.c:306 #, 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:325 +#: src/mktemp.c:326 #, 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:335 +#: src/mktemp.c:336 #, 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:290 -msgid "" -"Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" -"\n" +#: src/mv.c:292 +#, fuzzy +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" -#: src/mv.c:297 +#: src/mv.c:298 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -7157,7 +7230,7 @@ msgstr "" " -f, --force no pregunta nunca antes de sobreescribir\n" " -i, --interactive pide confirmación antes de sobreescribir\n" -#: src/mv.c:306 +#: src/mv.c:307 msgid "" " --strip-trailing-slashes remove any trailing slashes from each " "SOURCE\n" @@ -7168,7 +7241,7 @@ msgstr "" " argumento ORIGEN\n" " -S, --suffix=SUFIJO reemplaza el sufijo de respaldo habitual\n" -#: src/mv.c:311 +#: src/mv.c:312 msgid "" " -t, --target-directory=DIRECTORY move all SOURCE arguments into " "DIRECTORY\n" @@ -7199,13 +7272,11 @@ 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 -#, c-format +#, fuzzy, c-format msgid "" "Run COMMAND with an adjusted niceness, which affects process scheduling.\n" -"With no COMMAND, print the current niceness. Nicenesses range from\n" -"%d (most favorable scheduling) to %d (least favorable).\n" -"\n" -" -n, --adjustment=N add integer N to the niceness (default 10)\n" +"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 "" "Ejecuta ORDEN con un valor ajustado de `nice', lo cual afecta a la prioridad " "de\n" @@ -7215,7 +7286,11 @@ msgstr "" "\n" " -n, --adjustment=N añade el entero N al valor `nice' (10 por omisión)\n" -#: src/nice.c:168 +#: src/nice.c:82 +msgid " -n, --adjustment=N add integer N to the niceness (default 10)\n" +msgstr "" + +#: src/nice.c:172 #, c-format msgid "invalid adjustment %s" msgstr "ajuste inválido %s" @@ -7224,17 +7299,17 @@ msgstr "ajuste inválido %s" # Lo consideraré. Esta frase es realmente fea. sv # Vale, lo cambio, pero añado una coma. # (Antes decía: debe darse una orden con un ajuste). -#: src/nice.c:177 +#: src/nice.c:181 #, c-format msgid "a command must be given with an adjustment" msgstr "con un ajuste, debe darse una orden" -#: src/nice.c:184 src/nice.c:195 +#: src/nice.c:188 src/nice.c:199 #, c-format msgid "cannot get niceness" msgstr "no se puede obtener el estado de `nice'" -#: src/nice.c:201 +#: src/nice.c:205 #, c-format msgid "cannot set niceness" msgstr "no se puede establecer el estado de `nice'" @@ -7244,17 +7319,17 @@ msgstr "no se puede establecer el estado de `nice'" msgid "Scott Bartram" msgstr "Scott Bartram" -#: src/nl.c:186 +#: 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" -"\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" -#: src/nl.c:194 +#: src/nl.c:186 msgid "" " -b, --body-numbering=STYLE use STYLE for numbering body lines\n" " -d, --section-delimiter=CC use CC for separating logical pages\n" @@ -7264,7 +7339,7 @@ msgstr "" " -d, --section-delimiter=CC usa CC para separar páginas\n" " -f, --footer-numbering=ESTILO usa ESTILO para numerar las líneas finales\n" -#: src/nl.c:199 +#: src/nl.c:191 msgid "" " -h, --header-numbering=STYLE use STYLE for numbering header lines\n" " -i, --line-increment=NUMBER line number increment at each line\n" @@ -7287,7 +7362,7 @@ msgstr "" " página\n" " -s, --number-separator=CADENA añade CADENA despúes del número de línea\n" -#: src/nl.c:207 +#: src/nl.c:199 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" @@ -7296,7 +7371,7 @@ msgstr "" "página\n" " -w, --number-width=NÚMERO usa NÚMERO columnas para los números de línea\n" -#: src/nl.c:213 +#: src/nl.c:205 msgid "" "\n" "By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC are\n" @@ -7309,7 +7384,7 @@ msgstr "" "de ellos, el otro se supone:`.'\n" "Utilícese \\\\ para obtener \\. ESTILO puede ser uno de lo siguientes:\n" -#: src/nl.c:219 +#: src/nl.c:211 msgid "" "\n" " a number all lines\n" @@ -7338,54 +7413,47 @@ msgstr "" " rn justificación a la derecha, sin ceros a la izquierda\n" " rz justificación a la derecha, con ceros a la izquierda\n" -#: src/nl.c:286 +#: src/nl.c:278 #, c-format msgid "line number overflow" msgstr "desbordamiento en el número de línea" -#: src/nl.c:486 +#: src/nl.c:478 #, c-format msgid "invalid header numbering style: %s" msgstr "estilo de numeración de cabecera inválido: %s" -#: src/nl.c:494 +#: src/nl.c:486 #, c-format msgid "invalid body numbering style: %s" msgstr "estilo de numeración de cuerpo inválido: %s" -#: src/nl.c:502 +#: src/nl.c:494 #, c-format msgid "invalid footer numbering style: %s" msgstr "estilo de numeración de pie inválido: %s" -#: src/nl.c:511 +#: src/nl.c:503 #, c-format msgid "invalid starting line number: %s" msgstr "número de comienzo de línea inválido: %s" -#: src/nl.c:517 -#, c-format -msgid "WARNING: --page-increment is deprecated; use --line-increment instead" -msgstr "" -"ATENCIÓN: --page-increment está obsoleto, utilice --line-increment en\n" -"su lugar" - -#: src/nl.c:524 +#: src/nl.c:512 #, c-format msgid "invalid line number increment: %s" msgstr "incremento de línea inválido: %s" -#: src/nl.c:536 +#: src/nl.c:524 #, c-format msgid "invalid number of blank lines: %s" msgstr "número de líneas vacías inválido: %s" -#: src/nl.c:550 +#: src/nl.c:538 #, c-format msgid "invalid line number field width: %s" msgstr "ancho para el número de línea inválido: %s" -#: src/nl.c:569 +#: src/nl.c:557 #, c-format msgid "invalid line numbering format: %s" msgstr "formato de numeración de líneas inválido: %s" @@ -7434,11 +7502,6 @@ msgstr "fallo al establecer la salida estándar como no utilizable" msgid "ignoring input" msgstr "no se tendrá en cuenta la entrada" -#: src/nohup.c:163 src/nohup.c:165 -#, c-format -msgid "failed to open %s" -msgstr "No se puede abrir %s" - #: src/nohup.c:175 #, c-format msgid "ignoring input and appending output to %s" @@ -7471,16 +7534,16 @@ msgid "failed to redirect standard error" msgstr "fallo al redireccionar la salida de error estándar" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:32 +#: src/nproc.c:33 msgid "Giuseppe Scrivano" msgstr "Giuseppe Scrivano" -#: src/nproc.c:56 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 +#: src/nproc.c:57 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Modo de empleo: %s [OPCIÓN]...\n" -#: src/nproc.c:57 +#: src/nproc.c:58 msgid "" "Print the number of processing units available to the current process,\n" "which may be less than the number of online processors\n" @@ -7490,7 +7553,7 @@ msgstr "" "lo cual puede ser menos que el número de procesadores activos\n" "\n" -#: src/nproc.c:62 +#: src/nproc.c:63 msgid "" " --all print the number of installed processors\n" " --ignore=N if possible, exclude N processing units\n" @@ -7498,11 +7561,352 @@ msgstr "" " --all muestra el número de procesadores instalados\n" " --ignore=N si es posible, excluye N unidades de proceso\n" -#: src/nproc.c:106 +#: src/nproc.c:107 #, c-format 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 +msgid "Assaf Gordon" +msgstr "" + +#: src/numfmt.c:676 +#, fuzzy, c-format +msgid "value too large to be converted: '%s'" +msgstr "%s: valor no completamente convertido" + +#: src/numfmt.c:680 +#, fuzzy, c-format +msgid "invalid number: '%s'" +msgstr "número inválido %s" + +#: src/numfmt.c:684 +#, c-format +msgid "rejecting suffix in input: '%s' (consider using --from)" +msgstr "" + +#: 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:692 +#, c-format +msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)" +msgstr "" + +#: src/numfmt.c:723 +#, fuzzy, c-format +msgid "failed to prepare value '%Lf' for printing" +msgstr "%s: fallo al abrir para escritura" + +#: 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 +#, c-format +msgid "out of memory (requested %zu bytes)" +msgstr "" + +#: src/numfmt.c:813 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [NUMBER]...\n" +msgstr "Modo de empleo: %s [OPCIÓN]... [USUARIO]...\n" + +#: src/numfmt.c:816 +msgid "" +"Reformat NUMBER(s), or the numbers from standard input if none are " +"specified.\n" +msgstr "" + +#: src/numfmt.c:820 +#, fuzzy +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" + +#: src/numfmt.c:823 +msgid "" +" -d, --delimiter=X use X instead of whitespace for field delimiter\n" +msgstr "" + +#: src/numfmt.c:826 +msgid "" +" --field=N replace the number in input field N (default is 1)\n" +msgstr "" + +#: src/numfmt.c:829 +msgid "" +" --format=FORMAT use printf style floating-point FORMAT;\n" +" see FORMAT below for details\n" +msgstr "" + +#: src/numfmt.c:833 +msgid "" +" --from=UNIT auto-scale input numbers to UNITs; default is " +"'none';\n" +" see UNIT below\n" +msgstr "" + +#: src/numfmt.c:837 +msgid "" +" --from-unit=N specify the input unit size (instead of the default " +"1)\n" +msgstr "" + +#: src/numfmt.c:840 +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 "" + +#: src/numfmt.c:844 +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 +msgid "" +" --invalid=MODE failure mode for invalid numbers: MODE can be:\n" +" abort (default), fail, warn, ignore\n" +msgstr "" + +#: src/numfmt.c:852 +msgid "" +" --padding=N pad the output to N characters; positive N will\n" +" right-align; negative N will left-align;\n" +" padding is ignored if the output is wider than N;\n" +" the default is to automatically pad if a " +"whitespace\n" +" is found\n" +msgstr "" + +#: src/numfmt.c:859 +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 +msgid "" +" --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" +" SUFFIX in input numbers\n" +msgstr "" + +#: src/numfmt.c:867 +msgid "" +" --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" +msgstr "" + +#: src/numfmt.c:870 +msgid "" +" --to-unit=N the output unit size (instead of the default 1)\n" +msgstr "" + +#: src/numfmt.c:877 +#, fuzzy +msgid "" +"\n" +"UNIT options:\n" +msgstr "" +"Otras opciones:\n" +"\n" + +#: src/numfmt.c:880 +msgid " none no auto-scaling is done; suffixes will trigger an error\n" +msgstr "" + +#: src/numfmt.c:883 +msgid "" +" auto accept optional single/two letter suffix:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" +msgstr "" + +#: src/numfmt.c:889 +msgid "" +" si accept optional single letter suffix:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:894 +msgid "" +" iec accept optional single letter suffix:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:899 +msgid "" +" iec-i accept optional two-letter suffix:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:905 +#, 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" +msgstr "" + +#: src/numfmt.c:912 +#, c-format +msgid "" +"\n" +"Exit status is 0 if all input numbers were successfully converted.\n" +"By default, %s will stop at the first conversion error with exit status 2.\n" +"With --invalid='fail' a warning is printed for each conversion error\n" +"and the exit status is 2. With --invalid='warn' each conversion error is\n" +"diagnosed, but the exit status is 0. With --invalid='ignore' conversion\n" +"errors are not diagnosed and the exit status is 0.\n" +msgstr "" + +#: src/numfmt.c:921 +#, c-format +msgid "" +"\n" +"Examples:\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" +msgstr "" + +#: src/numfmt.c:974 src/seq.c:212 +#, c-format +msgid "format %s has no %% directive" +msgstr "el formato %s no tiene ninguna directiva %%" + +#: src/numfmt.c:990 +#, fuzzy, c-format +msgid "invalid format %s (width overflow)" +msgstr "formato de ancho inválido" + +#: src/numfmt.c:1007 src/seq.c:229 +#, 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:1018 src/seq.c:236 +#, 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:1092 +#, c-format +msgid "value too large to be printed: '%Lg' (consider using --to)" +msgstr "" + +#: src/numfmt.c:1100 +#, c-format +msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" +msgstr "" + +#: src/numfmt.c:1184 +#, c-format +msgid "large input value '%s': possible precision loss" +msgstr "" + +#: src/numfmt.c:1293 +#, 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 "rango de páginas 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:1430 +#, fuzzy, c-format +msgid "invalid header value '%s'" +msgstr "fecha inválida %s" + +#: src/numfmt.c:1456 +#, fuzzy, c-format +msgid "--grouping cannot be combined with --format" +msgstr "los ficheros operando no se pueden combinar con --files0-from." + +#: 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 +msgid "no conversion option specified" +msgstr "se han especificado varias opciones -i" + +#: src/numfmt.c:1471 +#, fuzzy, c-format +msgid "grouping cannot be combined with --to" +msgstr "los ficheros operando no se pueden combinar con --files0-from." + +#: src/numfmt.c:1473 +#, c-format +msgid "grouping has no effect in this locale" +msgstr "" + +#: src/numfmt.c:1486 +#, c-format +msgid "--header ignored with command-line input" +msgstr "" + +#: src/numfmt.c:1511 +#, fuzzy, c-format +msgid "error reading input" +msgstr "error al leer %s" + +#: src/numfmt.c:1520 +#, fuzzy, c-format +msgid "failed to convert some of the input numbers" +msgstr "fallo al establecer la salida estándar como no utilizable" + #: src/od.c:294 #, c-format msgid "" @@ -7535,14 +7939,30 @@ msgstr "" "\n" #: src/od.c:307 -msgid "All arguments to long options are mandatory for short options.\n" +#, fuzzy +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" +"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" +"at first byte printed, incremented when dump is progressing.\n" +"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 "" -"Todos los argumentos para las opciones largas son obligatorios para las\n" -"opciones cortas.\n" +"\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" +"de 512 bytes.\n" -#: src/od.c:310 +#: src/od.c:318 +#, fuzzy msgid "" -" -A, --address-radix=RADIX decide how file offsets are printed\n" +" -A, --address-radix=RADIX output format for file offsets. RADIX is one\n" +" of [doxn], for Decimal, Octal, Hex or None\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" @@ -7550,16 +7970,18 @@ msgstr "" " -j, --skip-bytes=BYTES descarta los primeros BYTES bytes de cada " "fichero\n" -#: src/od.c:314 +#: src/od.c:323 #, 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" -" --traditional accept arguments in traditional form\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 " @@ -7570,9 +7992,11 @@ msgstr "" " -w, --width[=BYTES] muestra BYTES bytes por línea de salida\n" " --traditional acepta los argumentos en formato tradicional\n" -#: src/od.c:324 +#: src/od.c:336 +#, fuzzy 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" @@ -7590,7 +8014,7 @@ msgstr "" " -d lo mismo que -t u2, selecciona unidades decimales de 2 bytes sin " "signo\n" -#: src/od.c:332 +#: src/od.c:345 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -7606,31 +8030,12 @@ 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:340 +#: src/od.c:353 +#, fuzzy msgid "" "\n" -"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" -"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" -"at first byte printed, incremented when dump is progressing.\n" -"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" -"de 512 bytes.\n" - -#: src/od.c:349 -msgid "" "\n" "TYPE is made up of one or more of these specifications:\n" -"\n" " a named character, ignoring high-order bit\n" " c ASCII character or backslash escape\n" msgstr "" @@ -7640,7 +8045,7 @@ msgstr "" " a un determinado carácter, descartando el bit más significativo\n" " c carácter ASCII o secuencia de escape\n" -#: src/od.c:356 +#: src/od.c:360 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -7654,10 +8059,11 @@ 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:363 +#: src/od.c:367 +#, fuzzy msgid "" "\n" -"SIZE is a number. For TYPE in doux, SIZE may also be C for\n" +"SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" "sizeof(char), S for sizeof(short), I for sizeof(int) or L for\n" "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" @@ -7670,43 +8076,38 @@ msgstr "" "(float)',\n" " D para `sizeof(double)' ó L para `sizeof(long double)'.\n" -#: src/od.c:370 +#: src/od.c:374 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" +"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 +msgid "" "\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" +"\n" +"BYTES is hex with 0x or 0X prefix, and may have a multiplier suffix:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"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" -"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:380 -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" - -#: src/od.c:633 src/od.c:753 +#: src/od.c:639 src/od.c:759 #, c-format msgid "invalid type string %s" msgstr "tipo de cadena inválido %s" -#: src/od.c:643 +#: src/od.c:649 #, c-format msgid "" "invalid type string %s;\n" @@ -7715,7 +8116,7 @@ msgstr "" "tipo de cadena inválido %s;\n" "este sistema no posee el tipo de entero de %lu bytes" -#: src/od.c:764 +#: src/od.c:770 #, c-format msgid "" "invalid type string %s;\n" @@ -7724,12 +8125,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:822 +#: src/od.c:828 #, fuzzy, c-format msgid "invalid character '%c' in type string %s" msgstr "carácter inválido `%c' en la cadena de tipo %s" -#: src/od.c:1047 +#: src/od.c:1053 #, c-format msgid "cannot skip past end of combined input" msgstr "" @@ -7737,27 +8138,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:1603 +#: src/od.c:1609 #, fuzzy, 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]" -#: src/od.c:1729 +#: src/od.c:1735 #, c-format msgid "no type may be specified when dumping strings" msgstr "no se puede especificar tipo cuando se vuelcan cadenas" -#: src/od.c:1804 +#: src/od.c:1810 msgid "compatibility mode supports at most one file" msgstr "el modo de compatibilidad admite un fichero como mucho" -#: src/od.c:1825 +#: src/od.c:1831 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "skip-bytes + read-bytes es demasiado grande" -#: src/od.c:1868 +#: src/od.c:1874 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "atención: ancho %lu inválido; se usará %d en su lugar" @@ -7773,18 +8174,18 @@ 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" "With no FILE, or when FILE is -, read standard input.\n" -"\n" 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" -#: src/paste.c:448 +#: 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" @@ -7794,7 +8195,7 @@ msgstr "" " -s, --serial usa un fichero cada vez, en lugar de hacerlo en\n" " paralelo\n" -#: src/paste.c:509 +#: src/paste.c:508 #, c-format msgid "delimiter list ends with an unescaped backslash: %s" msgstr "" @@ -7860,81 +8261,81 @@ msgid "Kaveh Ghazi" msgstr "Kaveh Ghazi" #. TRANSLATORS: Real name is unknown; at most 19 characters. -#: src/pinky.c:250 +#: src/pinky.c:242 msgid " ???" msgstr " ¿¿¿???" #. TRANSLATORS: Idle time is unknown; at most 5 characters. -#: src/pinky.c:274 +#: src/pinky.c:266 msgid "?????" msgstr "¿¿??" -#: src/pinky.c:323 +#: src/pinky.c:314 #, c-format msgid "Login name: " msgstr "Nombre de usuario: " -#: src/pinky.c:326 +#: src/pinky.c:317 #, c-format msgid "In real life: " msgstr "En la vida real: " #. TRANSLATORS: Real name is unknown; no hard limit. -#: src/pinky.c:330 +#: src/pinky.c:321 msgid "???\n" msgstr "???\n" -#: src/pinky.c:350 +#: src/pinky.c:341 #, c-format msgid "Directory: " msgstr "Directorio: " -#: src/pinky.c:352 +#: src/pinky.c:343 #, c-format msgid "Shell: " msgstr "Shell: " -#: src/pinky.c:371 +#: src/pinky.c:362 #, c-format msgid "Project: " msgstr "Proyecto: " -#: src/pinky.c:395 +#: src/pinky.c:386 #, c-format msgid "Plan:\n" msgstr "Plan:\n" # FIXME: Sin el contexto es difícil. -#: src/pinky.c:414 +#: src/pinky.c:405 msgid "Login" msgstr "Login" -#: src/pinky.c:416 +#: src/pinky.c:407 msgid "Name" msgstr "Nombre" -#: src/pinky.c:417 +#: src/pinky.c:408 msgid " TTY" msgstr " TTY" -#: src/pinky.c:419 +#: src/pinky.c:410 msgid "Idle" msgstr "Inactivo" -#: src/pinky.c:420 +#: src/pinky.c:411 msgid "When" msgstr "Cuándo" -#: src/pinky.c:423 +#: src/pinky.c:414 msgid "Where" msgstr "Dónde" -#: src/pinky.c:502 +#: src/pinky.c:493 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Modo de empleo: %s [OPCIÓN]... [USUARIO]...\n" -#: src/pinky.c:503 +#: src/pinky.c:494 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7952,7 +8353,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:511 +#: src/pinky.c:502 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7967,7 +8368,7 @@ msgstr "" " -q omite el nombre completo del usuario, el `host' remoto\n" " y el tiempo inactivo en formato corto\n" -#: src/pinky.c:520 +#: src/pinky.c:511 #, fuzzy, c-format msgid "" "\n" @@ -7978,7 +8379,7 @@ msgstr "" "Un programa `finger' sencillo; muestra información del usuario.\n" "El fichero utmp será %s.\n" -#: src/pinky.c:604 +#: src/pinky.c:595 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "" @@ -7995,89 +8396,88 @@ msgstr "Pete TerMaat" msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:912 +#: src/pr.c:908 #, fuzzy, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "`--pages=PRIMERA_PÁGINA[:ÚLTIMA_PÁGINA]' falta un argumento" -#: src/pr.c:914 +#: src/pr.c:910 #, c-format msgid "invalid page range %s" msgstr "rango de páginas inválido %s" -#: src/pr.c:979 +#: src/pr.c:975 #, fuzzy, 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" -#: src/pr.c:1003 +#: src/pr.c:999 #, fuzzy, c-format msgid "'-N NUMBER' invalid starting line number: %s" msgstr "`-N NÚMERO' número de comienzo de línea inválido: %s" -#: src/pr.c:1015 +#: src/pr.c:1011 #, fuzzy, c-format msgid "'-o MARGIN' invalid line offset: %s" msgstr "`-o MARGEN' el desplazamiento de línea no es válido: %s" -#: src/pr.c:1056 +#: src/pr.c:1052 #, fuzzy, c-format msgid "'-w PAGE_WIDTH' invalid number of characters: %s" msgstr "`-w ANCHO_PÁGINA' número inválido de caracteres: %s" -#: src/pr.c:1070 +#: src/pr.c:1066 #, fuzzy, c-format msgid "'-W PAGE_WIDTH' invalid number of characters: %s" msgstr "`-W ANCHO_PÁGINA' número de caracteres inválido: %s" -#: src/pr.c:1100 +#: src/pr.c:1096 #, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "" "no se puede especificar un número de columnas cuando se escribe en paralelo." -#: src/pr.c:1104 +#: src/pr.c:1100 #, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "" "no se puede especificar a la vez impresión en paralelo y transversalmente." -#: src/pr.c:1200 +#: src/pr.c:1196 #, fuzzy, 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" -#: src/pr.c:1304 +#: src/pr.c:1293 #, c-format msgid "page width too narrow" msgstr "ancho de página demasiado estrecho" -#: src/pr.c:2369 +#: src/pr.c:2353 #, c-format msgid "starting page number %<PRIuMAX> exceeds page count %<PRIuMAX>" msgstr "" "el número de página de comienzo %<PRIuMAX> sobrepasa el número de páginas " "%<PRIuMAX>" -#: src/pr.c:2396 +#: src/pr.c:2380 #, c-format msgid "page number overflow" msgstr "desbordamiento del número de página" -#: src/pr.c:2401 +#: src/pr.c:2385 #, c-format msgid "Page %<PRIuMAX>" msgstr "Página %<PRIuMAX>" -#: src/pr.c:2773 -msgid "" -"Paginate or columnate FILE(s) for printing.\n" -"\n" +#: 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" -#: src/pr.c:2780 +#: src/pr.c:2763 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -8094,7 +8494,7 @@ msgstr "" " columnas, a menos que se especifique -a. Equilibra el\n" " número de líneas de cada columna en cada página.\n" -#: src/pr.c:2788 +#: src/pr.c:2771 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -8112,7 +8512,7 @@ msgstr "" " -d, --double-space\n" " salida con espaciado doble\n" -#: src/pr.c:2796 +#: src/pr.c:2779 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -8136,7 +8536,7 @@ msgstr "" " líneas con -f o una cabecera y una cola de 5 líneas sin -" "F)\n" -#: src/pr.c:2806 +#: src/pr.c:2789 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -8161,7 +8561,7 @@ msgstr "" "[=CADENA]\n" " establece los separadores\n" -#: src/pr.c:2815 +#: src/pr.c:2798 msgid "" " -l, --length=PAGE_LENGTH\n" " set the page length to PAGE_LENGTH (66) lines\n" @@ -8178,7 +8578,7 @@ msgstr "" " trunca líneas, pero une líneas de longitud completa con -" "J\n" -#: src/pr.c:2822 +#: src/pr.c:2805 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -8196,7 +8596,7 @@ msgstr "" " comienza a contar con NÚMERO en la primera línea de la\n" " primera página impresa (véase +PRIMERA_PÁGINA)\n" -#: src/pr.c:2830 +#: src/pr.c:2813 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -8211,7 +8611,7 @@ msgstr "" " -r, --no-file-warnings\n" " omite el aviso cuando no se puede abrir un fichero\n" -#: src/pr.c:2837 +#: src/pr.c:2820 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -8227,7 +8627,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:2844 +#: src/pr.c:2827 #, fuzzy msgid "" " -S[STRING], --sep-string[=STRING]\n" @@ -8244,7 +8644,7 @@ msgstr "" " no hay ningún efecto en las opciones de columnas\n" " -t, --omit-header no muestra cabeceras ni colas\n" -#: src/pr.c:2851 +#: src/pr.c:2834 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -8269,7 +8669,7 @@ msgstr "" "varias\n" " columnas, -s[car] lo desactiva (72)\n" -#: src/pr.c:2861 +#: src/pr.c:2844 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -8284,7 +8684,7 @@ msgstr "" " se usa la opción -J, no interfiere con las opciones -S o " "-s\n" -#: src/pr.c:2869 +#: src/pr.c:2852 msgid "" "\n" "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" @@ -8449,10 +8849,10 @@ msgstr "" " o bien: %s -G [OPCIÓN]... [ENTRADA [SALIDA]]\n" #: src/ptx.c:1821 +#, fuzzy msgid "" "Output a permuted index, including context, of the words in the input " "files.\n" -"\n" msgstr "" "Muestra un índice permutado, incluyendo contexto, de las palabras\n" "de los ficheros de entrada.\n" @@ -8529,7 +8929,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:1828 +#: src/ptx.c:1827 #, fuzzy msgid "" " -A, --auto-reference output automatically generated references\n" @@ -8542,7 +8942,7 @@ msgstr "" " -F, --flag-truncation=CADENA usa CADENA para marcar las líneas " "truncadas\n" -#: src/ptx.c:1833 +#: src/ptx.c:1832 #, fuzzy msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" @@ -8563,7 +8963,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:1840 +#: src/ptx.c:1839 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -8585,7 +8985,7 @@ msgstr "" " -o, --only-file=ARCHIVO lee la lista de palabras a mantener de\n" " ARCHIVO\n" -#: src/ptx.c:1848 +#: src/ptx.c:1847 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -8598,7 +8998,7 @@ msgstr "" " -w, --width=NÚMERO anchura de la salida en columnas,\n" " excluyendo referencias\n" -#: src/ptx.c:1855 +#: src/ptx.c:1854 #, fuzzy msgid "" "\n" @@ -8608,7 +9008,7 @@ msgstr "" "Si no se especifica ARCHIVO o ARCHIVO es `-', lee de la entrada estándar.\n" "Se toma `-F /' por defecto.\n" -#: src/ptx.c:1949 +#: src/ptx.c:1948 #, c-format msgid "invalid gap width: %s" msgstr "ancho de salto inválido: %s" @@ -8635,7 +9035,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "fallo al cambiar a %s" -#: src/pwd.c:170 src/pwd.c:277 +#: src/pwd.c:170 src/pwd.c:277 src/split.c:373 #, c-format msgid "failed to stat %s" msgstr "fallo al efectuar stat sobre %s" @@ -8653,14 +9053,15 @@ msgid "ignoring non-option arguments" msgstr "los argumentos que no son opciones no serán tenidos en cuenta" #. This is a proper name. See the gettext manual, section Names. -#: src/readlink.c:33 +#: src/readlink.c:32 msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 +#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147 +#: src/stat.c:1349 src/touch.c:212 #, c-format -msgid "Usage: %s [OPTION]... FILE\n" -msgstr "Modo de empleo: %s [OPCIÓN]... FICHERO\n" +msgid "Usage: %s [OPTION]... FILE...\n" +msgstr "Modo de empleo: %s [OPCIÓN]... FICHERO...\n" #: src/readlink.c:63 msgid "" @@ -8695,16 +9096,19 @@ msgstr "" " existir\n" #: src/readlink.c:75 +#, fuzzy msgid "" " -m, --canonicalize-missing canonicalize by following every symlink in\n" " every component of the given name " "recursively,\n" " without requirements on components " "existence\n" -" -n, --no-newline do not output the trailing newline\n" +" -n, --no-newline do not output the trailing delimiter\n" " -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" msgstr "" " -m, --canonicalize-missing canonicaliza siguiendo recursivamente cada\n" " enlace simbólico en cada componente de la\n" @@ -8715,11 +9119,10 @@ msgstr "" " -s, --silent suprime la mayor parte de mensajes de error\n" " -v, --verbose muestra los mensajes de error\n" -#: src/realpath.c:71 src/rm.c:134 src/shred.c:147 src/stat.c:1330 -#: src/touch.c:215 -#, c-format -msgid "Usage: %s [OPTION]... FILE...\n" -msgstr "Modo de empleo: %s [OPCIÓN]... FICHERO...\n" +#: src/readlink.c:152 +#, fuzzy, c-format +msgid "ignoring --no-newline with multiple arguments" +msgstr "los argumentos que no son opciones no serán tenidos en cuenta" #: src/realpath.c:72 msgid "" @@ -8747,13 +9150,13 @@ msgid "generating relative path" msgstr "" # SIoNO -#: src/remove.c:286 +#: src/remove.c:273 #, c-format msgid "%s: descend into write-protected directory %s? " msgstr "%s: ¿descender al directorio protegido contra escritura %s? (s/n) " # SIoNO -#: src/remove.c:287 +#: src/remove.c:274 #, c-format msgid "%s: descend into directory %s? " msgstr "%s: ¿descender al directorio %s? (s/n) " @@ -8763,7 +9166,7 @@ msgstr "%s: ¿descender al directorio %s? (s/n) " #. translate "%s: remove %s (write-protected) %s? " #. instead. It should avoid grammatical problems #. with the output of file_type. -#: src/remove.c:303 +#: src/remove.c:290 #, c-format msgid "%s: remove write-protected %s %s? " msgstr "%s: ¿borrar el %s %s protegido contra escritura? (s/n) " @@ -8773,33 +9176,33 @@ msgstr "%s: ¿borrar el %s %s protegido contra escritura? (s/n) " # ¿y el primero? # # SIoNO -#: src/remove.c:304 +#: src/remove.c:291 #, c-format msgid "%s: remove %s %s? " msgstr "%s: ¿borrar el %s %s? (s/n) " -#: src/remove.c:417 +#: src/remove.c:374 #, c-format msgid "removed directory: %s\n" msgstr "directorio borrado: %s\n" -#: src/remove.c:481 +#: src/remove.c:444 #, c-format msgid "cannot remove directory: %s" msgstr "no se puede borrar el directorio: %s" -#: src/remove.c:537 +#: src/remove.c:500 #, 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:557 +#: src/remove.c:520 #, c-format msgid "traversal failed: %s" msgstr "fallo al atravesar: %s" -#: src/remove.c:563 +#: src/remove.c:526 #, c-format msgid "" "unexpected failure: fts_info=%d: %s\n" @@ -8808,12 +9211,12 @@ msgstr "" "fallo inesperado: fts_info=%d: %s\n" "por favor comuníqueselo a %s" -#: src/rm.c:118 +#: src/rm.c:119 #, fuzzy, c-format msgid "Try '%s ./%s' to remove the file %s.\n" msgstr "Pruebe `%s ./%s' para borrar el fichero %s.\n" -#: src/rm.c:135 +#: src/rm.c:136 #, fuzzy msgid "" "Remove (unlink) the FILE(s).\n" @@ -8827,7 +9230,7 @@ msgstr "" " -f, --force descarta los ficheros que no existan, sin preguntar\n" " -i pregunta antes de cada borrado\n" -#: src/rm.c:141 +#: src/rm.c:142 msgid "" " -I prompt once before removing more than three files, " "or\n" @@ -8850,7 +9253,7 @@ msgstr "" " once (una vez, -I), o always (siempre, -i).\n" " Sin CUÁNDO, pregunta siempre\n" -#: src/rm.c:148 +#: src/rm.c:149 msgid "" " --one-file-system when removing a hierarchy recursively, skip any\n" " directory that is on a file system different from\n" @@ -8862,12 +9265,13 @@ msgstr "" " ficheros distinto de aquel que corresponde con el\n" " argumento de la línea de órdenes\n" -#: src/rm.c:153 +#: src/rm.c:154 #, fuzzy msgid "" " --no-preserve-root do not treat '/' specially\n" " --preserve-root do not remove '/' (default)\n" " -r, -R, --recursive remove directories and their contents recursively\n" +" -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" @@ -8876,7 +9280,7 @@ msgstr "" "recursivamente\n" " -v, --verbose explica lo que va haciendo\n" -#: src/rm.c:161 +#: src/rm.c:163 msgid "" "\n" "By default, rm does not remove directories. Use the --recursive (-r or -R)\n" @@ -8888,7 +9292,7 @@ msgstr "" "R)\n" "para borrar también cada directorio listado, junto con todo su contenido.\n" -#: src/rm.c:166 +#: src/rm.c:168 #, fuzzy, c-format msgid "" "\n" @@ -8905,7 +9309,7 @@ msgstr "" "\n" " %s ./-fu\n" -#: src/rm.c:175 +#: src/rm.c:177 msgid "" "\n" "Note that if you use rm to remove a file, it might be possible to recover\n" @@ -8920,7 +9324,7 @@ msgstr "" "mayor seguridad de que el contenido es realmente irrecuperable, considere\n" "utilizar shred.\n" -#: src/rm.c:335 +#: src/rm.c:342 #, c-format msgid "%s: remove all arguments recursively? " msgstr "%s: ¿borrar todos los argumentos recursivamente? " @@ -8930,7 +9334,7 @@ msgstr "%s: ¿borrar todos los argumentos recursivamente? " # ¿y el primero? # # SIoNO -#: src/rm.c:336 +#: src/rm.c:343 #, c-format msgid "%s: remove all arguments? " msgstr "%s: ¿borrar todos los argumentos? (s/n) " @@ -8991,7 +9395,11 @@ msgstr "" msgid "" "Run a program in a different security context.\n" "With neither CONTEXT nor COMMAND, print the current security context.\n" -"\n" +msgstr "" + +#: src/runcon.c:94 +#, fuzzy +msgid "" " CONTEXT Complete security context\n" " -c, --compute compute process transition context before modifying\n" " -t, --type=TYPE type (for same role as parent)\n" @@ -9012,7 +9420,7 @@ msgstr "" " -l, --range=RANGO rango de nivel\n" "\n" -#: src/runcon.c:140 +#: src/runcon.c:144 #, c-format msgid "multiple roles" msgstr "se han especificado varios roles" @@ -9023,67 +9431,67 @@ msgstr "se han especificado varios roles" # está todavía internacionalizado, para evitar que, por ejemplo, # "ls --time=ñ" dé como resultado "invalid tipo de fecha `ñ'" # lo dejo de momento en inglés, para no mezclar. -#: src/runcon.c:145 +#: src/runcon.c:149 #, c-format msgid "multiple types" msgstr "se han especificado varios tipos" -#: src/runcon.c:150 +#: src/runcon.c:154 #, c-format msgid "multiple users" msgstr "se han especificado varios usuarios" -#: src/runcon.c:155 +#: src/runcon.c:159 #, c-format msgid "multiple levelranges" msgstr "se han especificado varios rangos de nivel" -#: src/runcon.c:173 src/runcon.c:209 +#: src/runcon.c:177 src/runcon.c:213 #, c-format msgid "failed to get current context" msgstr "fallo al obtener el contexto actual" -#: src/runcon.c:183 +#: src/runcon.c:187 #, c-format msgid "you must specify -c, -t, -u, -l, -r, or context" msgstr "se debe especificar -c, -t, -u, -l, -r, o contexto" -#: src/runcon.c:191 +#: src/runcon.c:195 #, c-format msgid "no command specified" msgstr "no se ha especificado ninguna orden" -#: src/runcon.c:197 +#: src/runcon.c:201 #, 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:223 +#: src/runcon.c:227 #, c-format msgid "failed to compute a new context" msgstr "fallo al calcular un nuevo contexto" -#: src/runcon.c:237 +#: src/runcon.c:241 #, c-format msgid "failed to set new user %s" msgstr "fallo al establecer nuevo usuario %s" -#: src/runcon.c:239 +#: src/runcon.c:243 #, c-format msgid "failed to set new type %s" msgstr "fallo al establecer nuevo tipo %s" -#: src/runcon.c:241 +#: src/runcon.c:245 #, c-format msgid "failed to set new range %s" msgstr "fallo al establecer nuevo rango %s" -#: src/runcon.c:243 +#: src/runcon.c:247 #, c-format msgid "failed to set new role %s" msgstr "fallo al establecer nuevo rol %s" -#: src/runcon.c:251 +#: src/runcon.c:255 #, c-format msgid "unable to set security context %s" msgstr "no se puede establecer el contexto de seguridad %s" @@ -9100,9 +9508,12 @@ msgstr "" " o bien: %s [OPCIÓN]... PRIMERO INCREMENTO ÚLTIMO\n" #: src/seq.c:73 +msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" +msgstr "" + +#: src/seq.c:79 +#, fuzzy msgid "" -"Print numbers from FIRST to LAST, in steps of INCREMENT.\n" -"\n" " -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" @@ -9116,7 +9527,7 @@ msgstr "" " (por omisión: \\n)\n" " -w, --equal-width iguala el ancho rellenando con ceros\n" -#: src/seq.c:82 +#: src/seq.c:86 msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" @@ -9134,7 +9545,7 @@ msgstr "" "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" -#: src/seq.c:90 +#: src/seq.c:94 #, fuzzy msgid "" "FORMAT must be suitable for printing one argument of type 'double';\n" @@ -9146,32 +9557,17 @@ msgstr "" "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:136 +#: src/seq.c:140 #, c-format msgid "invalid floating point argument: %s" msgstr "argumento de coma flotante inválido: %s" -#: src/seq.c:193 -#, c-format -msgid "format %s has no %% directive" -msgstr "el formato %s no tiene ninguna directiva %%" - -#: src/seq.c:210 -#, c-format -msgid "format %s ends in %%" -msgstr "el formato %s termina en %%" - -#: src/seq.c:213 +#: src/seq.c:232 #, c-format msgid "format %s has unknown %%%c directive" msgstr "el formato %s tiene una directiva %%%c desconocida" -#: src/seq.c:217 -#, c-format -msgid "format %s has too many %% directives" -msgstr "el formato %s tiene demasiadas directivas %%" - -#: src/seq.c:431 +#: src/seq.c:555 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" @@ -9216,27 +9612,27 @@ msgstr "" " y (si se especifica) IDs de grupo sumplementario a " "GID1,...\n" -#: src/setuidgid.c:163 +#: src/setuidgid.c:162 #, c-format msgid "unknown user-ID: %s" msgstr "ID de usuario desconocido: %s" -#: src/setuidgid.c:174 +#: 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:191 +#: 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:201 +#: 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:205 +#: src/setuidgid.c:204 #, c-format msgid "cannot set user-ID to %lu" msgstr "no se puede establecer el ID del usuario a %lu" @@ -9247,17 +9643,17 @@ msgid "Colin Plumb" msgstr "Colin Plumb" #: src/shred.c:148 +#, 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" -"\n" 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:156 +#: src/shred.c:155 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -9272,7 +9668,7 @@ 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:162 +#: src/shred.c:161 msgid "" " -u, --remove truncate and remove file after overwriting\n" " -v, --verbose show progress\n" @@ -9289,7 +9685,7 @@ msgstr "" " -z, --zero añade una sobreescritura final con ceros para ocultar la\n" " acción de esta orden\n" -#: src/shred.c:171 +#: src/shred.c:170 msgid "" "\n" "If FILE is -, shred standard output.\n" @@ -9313,7 +9709,7 @@ msgstr "" "opción --remove.\n" "\n" -#: src/shred.c:181 +#: src/shred.c:180 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" @@ -9334,7 +9730,7 @@ msgstr "" "que sea efectivo en todos los modos de sistemas de ficheros:\n" "\n" -#: src/shred.c:189 +#: src/shred.c:188 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -9356,7 +9752,7 @@ msgstr "" "Network Appliance\n" "\n" -#: src/shred.c:199 +#: src/shred.c:198 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -9369,7 +9765,7 @@ msgstr "" "\n" "* sistemas de ficheros comprimidos\n" -#: src/shred.c:206 +#: src/shred.c:205 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" @@ -9390,7 +9786,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:216 +#: src/shred.c:215 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" @@ -9401,122 +9797,122 @@ msgstr "" "un\n" "fichero al que se le haya hecho shred.\n" -#: src/shred.c:296 +#: src/shred.c:295 #, c-format msgid "%s: fdatasync failed" msgstr "%s: fdatasync falló" -#: src/shred.c:307 +#: src/shred.c:306 #, c-format msgid "%s: fsync failed" msgstr "%s: fsync falló" -#: src/shred.c:384 +#: src/shred.c:383 #, c-format msgid "%s: cannot rewind" msgstr "%s: no se puede rebobinar" -#: src/shred.c:403 +#: src/shred.c:402 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: paso %lu/%lu (%s)..." -#: src/shred.c:453 +#: src/shred.c:452 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: error al escribir en el desplazamiento %s" -#: src/shred.c:471 +#: src/shred.c:470 #, c-format msgid "%s: lseek failed" msgstr "%s: lseek falló" -#: src/shred.c:482 +#: src/shred.c:481 #, c-format msgid "%s: file too large" msgstr "%s: fichero demasiado grande" -#: src/shred.c:505 +#: src/shred.c:504 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: paso %lu/%lu (%s)...%s" -#: src/shred.c:521 +#: src/shred.c:520 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: paso %lu/%lu (%s)...%s/%s %d%%" -#: src/shred.c:768 +#: src/shred.c:767 #, c-format msgid "%s: fstat failed" msgstr "%s: fallo en `fstat'" -#: src/shred.c:779 +#: src/shred.c:778 #, c-format msgid "%s: invalid file type" msgstr "%s: tipo de fichero inválido" -#: src/shred.c:798 +#: src/shred.c:797 #, c-format msgid "%s: file has negative size" msgstr "%s: el fichero tiene un tamaño negativo" -#: src/shred.c:865 +#: src/shred.c:864 src/sort.c:932 src/split.c:378 #, c-format msgid "%s: error truncating" msgstr "%s: error al truncar" -#: src/shred.c:881 +#: src/shred.c:880 #, c-format msgid "%s: fcntl failed" msgstr "%s: fcntl falló" -#: src/shred.c:886 +#: src/shred.c:885 #, 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:968 +#: src/shred.c:967 #, c-format msgid "%s: removing" msgstr "%s: borrando" -#: src/shred.c:992 +#: src/shred.c:991 #, c-format msgid "%s: renamed to %s" msgstr "%s: renombrado a %s" -#: src/shred.c:1014 +#: src/shred.c:1013 #, c-format msgid "%s: failed to remove" msgstr "%s: fallo al borrar" -#: src/shred.c:1018 +#: src/shred.c:1017 #, c-format msgid "%s: removed" msgstr "%s: borrado" -#: src/shred.c:1025 src/shred.c:1068 +#: src/shred.c:1024 src/shred.c:1067 #, c-format msgid "%s: failed to close" msgstr "%s: fallo al cerrar" -#: src/shred.c:1061 +#: src/shred.c:1060 #, c-format msgid "%s: failed to open for writing" msgstr "%s: fallo al abrir para escritura" -#: src/shred.c:1126 +#: src/shred.c:1125 #, c-format msgid "%s: invalid number of passes" msgstr "%s: número inválido de pasos" -#: src/shred.c:1135 src/shuf.c:291 src/sort.c:4387 +#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441 #, c-format msgid "multiple random sources specified" msgstr "se han especificado varios ficheros de origen" -#: src/shred.c:1149 +#: src/shred.c:1148 #, c-format msgid "%s: invalid file size" msgstr "%s: tamaño de fichero inválido" @@ -9533,14 +9929,13 @@ msgstr "" " o bien: %s -i IN-SU [OPCIÓN]...\n" #: src/shuf.c:54 -msgid "" -"Write a random permutation of the input lines to standard output.\n" -"\n" +#, fuzzy +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:61 +#: src/shuf.c:60 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 " @@ -9560,27 +9955,27 @@ msgstr "" " -z, --zero-terminated termina las líneas con un byte 0, no con nueva " "línea\n" -#: src/shuf.c:245 +#: src/shuf.c:244 #, c-format msgid "multiple -i options specified" msgstr "se han especificado varias opciones -i" -#: src/shuf.c:265 +#: src/shuf.c:264 #, c-format msgid "invalid input range %s" msgstr "rango de entrada inválido %s" -#: src/shuf.c:278 +#: src/shuf.c:277 #, c-format msgid "invalid line count %s" msgstr "contador de líneas inválido %s" -#: src/shuf.c:285 src/sort.c:4381 +#: src/shuf.c:284 src/sort.c:4435 #, c-format msgid "multiple output files specified" msgstr "se han especificado varios ficheros de salida" -#: src/shuf.c:311 +#: src/shuf.c:310 #, c-format msgid "cannot combine -e and -i options" msgstr "no se pueden combinar las opciones -e y -i" @@ -9609,7 +10004,7 @@ msgstr "" "de tiempo especificada por la suma de sus valores.\n" "\n" -#: src/sleep.c:135 src/timeout.c:295 +#: src/sleep.c:135 src/timeout.c:320 #, c-format msgid "invalid time interval %s" msgstr "intervalo de tiempo inválido %s" @@ -9618,17 +10013,16 @@ msgstr "intervalo de tiempo inválido %s" #, c-format msgid "cannot read realtime clock" msgstr "no se puede leer el reloj de tiempo real" - -#: src/sort.c:395 -msgid "" -"Write sorted concatenation of all FILE(s) to standard output.\n" -"\n" + +#: src/sort.c:399 +#, fuzzy +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:402 +#: src/sort.c:405 msgid "" "Ordering options:\n" "\n" @@ -9636,7 +10030,7 @@ msgstr "" "Opciones de ordenación:\n" "\n" -#: src/sort.c:406 +#: src/sort.c:409 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -9648,7 +10042,7 @@ msgstr "" " y los espacios\n" " -f, --ignore-case convierte las minúsculas en mayúsculas\n" -#: src/sort.c:412 +#: src/sort.c:415 #, fuzzy msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" @@ -9660,14 +10054,14 @@ msgstr "" " -i, --ignore-nonprinting considera solamente caracteres imprimibles\n" " -M, --month-sort compara (desconocido) < `JAN' < ... < `DEC'\n" -#: src/sort.c:417 +#: src/sort.c:420 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:420 +#: src/sort.c:423 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -9680,7 +10074,7 @@ msgstr "" " --random-source=FICHERO obtiene bytes aleatorios de FICHERO\n" " -r, --reverse invierte el resultado de las comparaciones\n" -#: src/sort.c:426 +#: src/sort.c:429 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -9697,7 +10091,7 @@ msgstr "" "dentro\n" " del texto\n" -#: src/sort.c:434 +#: src/sort.c:437 msgid "" "Other options:\n" "\n" @@ -9705,7 +10099,7 @@ msgstr "" "Otras opciones:\n" "\n" -#: src/sort.c:438 +#: src/sort.c:441 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" @@ -9713,7 +10107,7 @@ msgstr "" " --batch-size=NCOMBI combina como mucho NCOMBI entradas cada vez;\n" " para más use ficheros temporales\n" -#: src/sort.c:442 +#: src/sort.c:445 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 " @@ -9729,7 +10123,7 @@ msgstr "" " --compress-program=PROG comprime temporales con PROG;\n" " los descomprime con PROG -d\n" -#: src/sort.c:449 +#: src/sort.c:452 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -9747,7 +10141,7 @@ msgstr "" " Si F es - entonces lee los nombre de la entrada\n" " estándar\n" -#: src/sort.c:456 +#: src/sort.c:459 #, fuzzy msgid "" " -k, --key=KEYDEF sort via a key; KEYDEF gives location and type\n" @@ -9764,7 +10158,7 @@ msgstr "" # 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:460 +#: src/sort.c:463 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -9778,7 +10172,7 @@ msgstr "" " -S, --buffer-size=TAMAÑO utiliza TAMAÑO para el búfer de memoria " "principal\n" -#: src/sort.c:466 +#: src/sort.c:469 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -9804,13 +10198,13 @@ msgstr "" " sin -c; muestra solamente la primera de\n" " una tanda igual\n" -#: src/sort.c:475 +#: 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:480 +#: src/sort.c:483 #, fuzzy msgid "" "\n" @@ -9840,7 +10234,7 @@ msgstr "" "\n" "TAMAÑO puede estar seguido por lo siguientes sufijos multiplicativos:\n" -#: src/sort.c:493 +#: src/sort.c:496 msgid "" "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n" "\n" @@ -9861,123 +10255,123 @@ 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:694 +#: src/sort.c:697 #, c-format msgid "waiting for %s [-d]" msgstr "esperando a %s [-d]" -#: src/sort.c:699 +#: src/sort.c:702 #, c-format msgid "%s [-d] terminated abnormally" msgstr "%s [-d] terminó anormalmente" -#: src/sort.c:853 +#: src/sort.c:856 #, c-format msgid "cannot create temporary file in %s" msgstr "no se puede crear un fichero temporal en %s" -#: src/sort.c:939 src/sort.c:2010 src/sort.c:3056 src/sort.c:3755 -#: src/sort.c:3758 +#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713 +#: src/sort.c:3804 src/sort.c:3807 msgid "open failed" msgstr "fallo al abrir" -#: src/sort.c:959 +#: src/sort.c:970 msgid "fflush failed" msgstr "fflush falló" -#: src/sort.c:964 src/sort.c:2013 src/sort.c:4646 +#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706 msgid "close failed" msgstr "error al cerrar" -#: src/sort.c:973 +#: src/sort.c:986 #, c-format msgid "dup2 failed" msgstr "dup2 falló" -#: src/sort.c:1090 +#: src/sort.c:1103 #, c-format msgid "couldn't execute %s" msgstr "no se pudo ejecutar %s" -#: src/sort.c:1097 +#: src/sort.c:1110 msgid "couldn't create temporary file" msgstr "no se pudo crear un fichero temporal" -#: src/sort.c:1136 +#: src/sort.c:1149 #, c-format msgid "couldn't create process for %s -d" msgstr "no se pudo crear el proceso para %s -d" -#: src/sort.c:1150 +#: src/sort.c:1161 #, c-format msgid "couldn't execute %s -d" msgstr "no se pudo ejecutar %s -d" -#: src/sort.c:1209 +#: src/sort.c:1220 #, c-format msgid "warning: cannot remove: %s" msgstr "atención: no se puede borrar: %s" -#: src/sort.c:1295 +#: src/sort.c:1306 #, c-format msgid "invalid --%s argument %s" msgstr "argumento --%s inválido %s" -#: src/sort.c:1298 +#: src/sort.c:1309 #, 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:1313 +#: src/sort.c:1324 #, c-format msgid "--%s argument %s too large" msgstr "el argumento --%s %s es demasiado grande" -#: src/sort.c:1316 +#: src/sort.c:1327 #, 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:1398 +#: src/sort.c:1409 #, c-format msgid "number in parallel must be nonzero" msgstr "el número en paralelo debe ser distinto de cero" -#: src/sort.c:1479 +#: src/sort.c:1494 msgid "stat failed" msgstr "fallo en `stat'" -#: src/sort.c:1740 +#: src/sort.c:1755 msgid "read failed" msgstr "fallo al leer" -#: src/sort.c:2028 +#: src/sort.c:2043 #, c-format msgid "string transformation failed" msgstr "la transformación de cadenas falló" -#: src/sort.c:2031 +#: src/sort.c:2046 #, c-format msgid "the untransformed string was %s" msgstr "la cadena sin transformar era %s." -#: src/sort.c:2194 +#: src/sort.c:2209 #, c-format msgid "^ no match for key\n" msgstr "^ no hay ninguna coincidencia para la clave\n" -#: src/sort.c:2374 +#: src/sort.c:2389 #, fuzzy, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "se ha utilizado la clave obsoleta `%s`; considere `%s' en su lugar" -#: src/sort.c:2380 +#: src/sort.c:2395 #, 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:2391 +#: src/sort.c:2406 #, fuzzy, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" @@ -9985,143 +10379,148 @@ msgstr "" "especificar\n" "también `b'" -#: src/sort.c:2404 +#: src/sort.c:2419 #, 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:2436 +#: src/sort.c:2451 #, fuzzy, 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" -#: src/sort.c:2442 +#: src/sort.c:2457 #, fuzzy, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "" "la option `-r' solamente es aplicable a comparaciones de último recurso" -#: src/sort.c:2716 src/sort.c:2725 +#: src/sort.c:2731 src/sort.c:2740 msgid "write failed" msgstr "error al escribir" -#: src/sort.c:2768 +#: src/sort.c:2783 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: fuera de secuencia: " -#: src/sort.c:2771 +#: src/sort.c:2786 msgid "standard error" msgstr "salida de error estándar" -#: src/sort.c:3926 +# FIXME: ¿Por qué no "fork system call failed", como antes? +#: src/sort.c:3698 +#, fuzzy +msgid "cannot read" +msgstr "falló la llamada al sistema `fork'" + +#: src/sort.c:3976 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: especificación de campo inválida %s" -#: src/sort.c:3937 +#: src/sort.c:3987 #, fuzzy, c-format msgid "options '-%s' are incompatible" msgstr "las opciones `-%s' son incompatibles" -#: src/sort.c:3988 +#: src/sort.c:4038 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s: contador inválido al comienzo de %s" -#: src/sort.c:4245 +#: src/sort.c:4295 #, fuzzy msgid "invalid number after '-'" msgstr "número inválido después de`-'" -#: src/sort.c:4248 src/sort.c:4334 src/sort.c:4362 +#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416 #, fuzzy msgid "invalid number after '.'" msgstr "número inválido después de `.'" # No estoy muy seguro. Comprobar. -#: src/sort.c:4261 src/sort.c:4367 +#: src/sort.c:4315 src/sort.c:4421 msgid "stray character in field spec" msgstr "carácter extraño en el especificador de campo" -#: src/sort.c:4308 +#: src/sort.c:4362 #, c-format msgid "multiple compress programs specified" msgstr "se han especificado varios programas de compresión" -#: src/sort.c:4325 +#: src/sort.c:4379 msgid "invalid number at field start" msgstr "número inválido al comienzo del campo" -#: src/sort.c:4329 src/sort.c:4357 +#: src/sort.c:4383 src/sort.c:4411 msgid "field number is zero" msgstr "el número de campo es cero" -#: src/sort.c:4338 +#: src/sort.c:4392 msgid "character offset is zero" msgstr "el desplazamiento de caracteres es cero" -#: src/sort.c:4353 +#: src/sort.c:4407 #, fuzzy msgid "invalid number after ','" msgstr "número inválido después de `,'" -#: src/sort.c:4403 +#: src/sort.c:4457 #, c-format msgid "empty tab" msgstr "tabulación vacía" # Lo mismo de antes. -#: src/sort.c:4496 src/wc.c:692 +#: src/sort.c:4550 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:4518 +#: src/sort.c:4572 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s:%lu: nombre de fichero de longitud cero inválido" -#: src/sort.c:4524 +#: src/sort.c:4578 #, c-format msgid "no input from %s" msgstr "no hay entrada desde %s" -#: src/sort.c:4570 +#: src/sort.c:4624 #, c-format msgid "using %s sorting rules" msgstr "se utilizan las reglas de ordenación %s" -#: src/sort.c:4573 +#: src/sort.c:4627 #, c-format msgid "using simple byte comparison" msgstr "se utiliza la comparación simple de bytes" -#: src/sort.c:4604 +#: src/sort.c:4658 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "el operando extra %s no está permitido con -%c" -#: src/split.c:184 +#: src/split.c:187 #, 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:201 +#: src/split.c:204 #, c-format msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" msgstr "Modo de empleo: %s [OPCIÓN]... [ENTRADA [PREFIJO]]\n" -#: src/split.c:205 +#: src/split.c:208 #, fuzzy 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" -"\n" 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" @@ -10131,7 +10530,7 @@ msgstr "" # FIXME: ¿Ahora dos espacios es el estándar para mensajes de continuación? # (before each output file...) -#: src/split.c:214 +#: src/split.c:216 #, fuzzy, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" @@ -10162,7 +10561,7 @@ msgstr "" " -u, --unbuffered copia inmediatamente la entrada a la salida\n" " con `-n r/...'\n" -#: src/split.c:227 +#: src/split.c:229 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" @@ -10170,7 +10569,7 @@ msgstr "" " --verbose muestra un diagnóstico justo antes de abrir cada\n" " fichero\n" -#: src/split.c:234 +#: src/split.c:236 #, fuzzy msgid "" "\n" @@ -10192,169 +10591,174 @@ msgstr "" "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:352 +#: src/split.c:354 #, c-format msgid "output file suffixes exhausted" msgstr "se han agotado los sufijos para los ficheros de salida" -#: src/split.c:364 +#: src/split.c:366 #, c-format msgid "creating file %s\n" msgstr "creando fichero %s\n" -#: src/split.c:377 +#: src/split.c:375 +#, c-format +msgid "%s would overwrite input; aborting" +msgstr "" + +#: src/split.c:391 #, c-format msgid "failed to set FILE environment variable" msgstr "fallo al establecer la variable de entorno FILE" -#: src/split.c:379 +#: src/split.c:393 #, 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:381 +#: src/split.c:395 #, c-format msgid "failed to create pipe" msgstr "fallo al crear tubería" -#: src/split.c:395 +#: src/split.c:409 #, c-format msgid "closing prior pipe" msgstr "cerrando la tubería anterior" -#: src/split.c:397 +#: src/split.c:411 #, c-format msgid "closing output pipe" msgstr "cerrando la tubería de salida" -#: src/split.c:401 +#: src/split.c:415 #, c-format msgid "moving input pipe" msgstr "moviendo la tubería de entrada" -#: src/split.c:403 +#: src/split.c:417 #, c-format msgid "closing input pipe" msgstr "cerrando la tubería de entrada" -#: src/split.c:408 +#: src/split.c:422 #, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "fallo al ejecutar la orden: \"%s -c %s" -#: src/split.c:414 +#: src/split.c:428 #, c-format msgid "failed to close input pipe" msgstr "fallo al cerrar la tubería de entrada" -#: src/split.c:450 +#: src/split.c:464 #, c-format msgid "waiting for child process" msgstr "esperando al proceso hijo" -#: src/split.c:460 +#: src/split.c:474 #, 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:468 +#: src/split.c:482 #, 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:475 src/timeout.c:449 +#: src/split.c:489 src/timeout.c:494 #, c-format msgid "unknown status from command (0x%X)" msgstr "estado desconocido de la orden (0x%X)" -#: src/split.c:1037 +#: src/split.c:1052 #, c-format msgid "cannot split in more than one way" msgstr "no se puede trocear de varias formas distintas" -#: src/split.c:1050 src/split.c:1192 src/split.c:1363 +#: src/split.c:1065 src/split.c:1205 src/split.c:1376 #, c-format msgid "%s: invalid number of chunks" msgstr "%s: número de trozos inválido" -#: src/split.c:1054 +#: src/split.c:1069 #, c-format msgid "%s: invalid chunk number" msgstr "%s: número de trozo inválido" -#: src/split.c:1106 +#: src/split.c:1119 #, c-format msgid "%s: invalid suffix length" msgstr "%s: longitud del sufijo inválida" -#: src/split.c:1131 src/split.c:1139 src/split.c:1162 src/split.c:1167 +#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180 #, c-format msgid "%s: invalid number of bytes" msgstr "%s: número de bytes inválido" -#: src/split.c:1150 src/split.c:1297 +#: src/split.c:1163 src/split.c:1310 #, c-format msgid "%s: invalid number of lines" msgstr "%s: número de líneas inválido" -#: src/split.c:1223 +#: src/split.c:1236 #, 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:1235 +#: src/split.c:1248 #, fuzzy, c-format msgid "%s: invalid start value for numerical suffix" msgstr "número de comienzo de línea inválido: %s" -#: src/split.c:1263 +#: src/split.c:1276 #, c-format msgid "%s: invalid IO block size" msgstr "%s: tamaño de bloque de E/S inválido" -#: src/split.c:1284 +#: src/split.c:1297 #, 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:1321 +#: src/split.c:1334 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1356 +#: src/split.c:1369 #, 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:169 +#: src/stat.c:173 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:838 +#: src/stat.c:857 #, c-format msgid "failed to canonicalize %s" msgstr "fallo al canonicalizar %s" -#: src/stat.c:1050 +#: src/stat.c:1069 #, fuzzy, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "atención: escape no reconocido `\\%c'" -#: src/stat.c:1105 +#: src/stat.c:1124 #, c-format msgid "%s: invalid directive" msgstr "%s: directiva inválida" -#: src/stat.c:1151 +#: src/stat.c:1170 #, c-format msgid "warning: backslash at end of format" msgstr "atención: barra invertida al final del formato" -#: src/stat.c:1182 +#: src/stat.c:1201 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" @@ -10362,19 +10766,19 @@ msgstr "" "de\n" "ficheros" -#: src/stat.c:1189 +#: src/stat.c:1208 #, 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:1209 +#: src/stat.c:1228 #, 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:1245 +#: src/stat.c:1264 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -10390,7 +10794,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1268 +#: src/stat.c:1287 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -10400,7 +10804,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1278 +#: src/stat.c:1297 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," @@ -10408,24 +10812,24 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1286 +#: src/stat.c:1305 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:1295 +#: src/stat.c:1314 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:1305 +#: src/stat.c:1324 #, c-format msgid "Context: %C\n" msgstr "Contexto: %C\n" -#: src/stat.c:1313 +#: src/stat.c:1332 msgid "" "Access: %x\n" "Modify: %y\n" @@ -10437,10 +10841,13 @@ msgstr "" " Cambio: %z\n" " Creación: %w\n" -#: src/stat.c:1331 +#: src/stat.c:1350 +msgid "Display file or file system status.\n" +msgstr "" + +#: src/stat.c:1356 +#, fuzzy msgid "" -"Display file or file system status.\n" -"\n" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" @@ -10451,7 +10858,7 @@ msgstr "" "del\n" " estado del fichero\n" -#: src/stat.c:1337 +#: src/stat.c:1360 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -10472,7 +10879,7 @@ msgstr "" " If you want a newline, include \\n in FORMAT.\n" " -t, --terse muestra la información de manera escueta\n" -#: src/stat.c:1348 +#: src/stat.c:1371 #, fuzzy msgid "" "\n" @@ -10493,7 +10900,7 @@ msgstr "" " %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:1357 +#: src/stat.c:1380 #, fuzzy msgid "" " %d device number in decimal\n" @@ -10510,7 +10917,7 @@ msgstr "" " %g ID del grupo del propietario\n" " %G Nombre de grupo del propietario\n" -#: src/stat.c:1365 +#: src/stat.c:1388 #, fuzzy msgid "" " %h number of hard links\n" @@ -10534,7 +10941,7 @@ msgstr "" " %t Tipo de dispositivo principal en hexadecimal\n" " %T Tipo de dispositivo secundario en hexadecimal\n" -#: src/stat.c:1376 +#: src/stat.c:1399 #, fuzzy msgid "" " %u user ID of owner\n" @@ -10560,7 +10967,7 @@ msgstr "" " %z Fecha de último cambio, formato legible\n" " %Z Fecha de último cambio, segundos desde la Época\n" -#: src/stat.c:1390 +#: src/stat.c:1413 #, fuzzy msgid "" "Valid format sequences for file systems:\n" @@ -10579,7 +10986,7 @@ msgstr "" " %d Nodos de ficheros libres en el sistema de ficheros\n" " %f Bloques libres en el sistema de ficheros\n" -#: src/stat.c:1399 +#: src/stat.c:1422 #, fuzzy msgid "" " %i file system ID in hex\n" @@ -10604,14 +11011,14 @@ 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" -"\n" msgstr "" "Ejecuta ORDEN, con operaciones de búfer modificadas para sus flujos " "estándar\n" -#: src/stdbuf.c:98 +#: src/stdbuf.c:97 msgid "" " -i, --input=MODE adjust standard input stream buffering\n" " -o, --output=MODE adjust standard output stream buffering\n" @@ -10621,7 +11028,7 @@ msgstr "" " -o, --output=MODO ajusta el búfer de la salida estándar\n" " -e, --error=MODO ajusta el búfer de la salida de error estándar\n" -#: src/stdbuf.c:105 +#: src/stdbuf.c:104 #, fuzzy msgid "" "\n" @@ -10632,7 +11039,7 @@ msgstr "" "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:108 +#: src/stdbuf.c:107 #, fuzzy msgid "" "\n" @@ -10641,7 +11048,7 @@ msgstr "" "\n" "Si MODO es `0' el flujo correspondiente no tendrá búfer.\n" -#: src/stdbuf.c:111 +#: src/stdbuf.c:110 msgid "" "\n" "Otherwise MODE is a number which may be followed by one of the following:\n" @@ -10657,7 +11064,7 @@ msgstr "" "búfer\n" "con el tamaño del búfer establecido en MODO bytes.\n" -#: src/stdbuf.c:117 +#: src/stdbuf.c:116 #, fuzzy msgid "" "\n" @@ -10675,22 +11082,22 @@ msgstr "" "S,\n" "y por lo tanto no se ven afectados por las opciones de `stdbuf'.\n" -#: src/stdbuf.c:227 +#: src/stdbuf.c:226 #, c-format msgid "failed to find %s" msgstr "fallo al encontrar %s" -#: src/stdbuf.c:247 src/stdbuf.c:279 +#: src/stdbuf.c:246 src/stdbuf.c:278 #, c-format msgid "failed to update the environment with %s" msgstr "fallo al actualizar el entorno con %s" -#: src/stdbuf.c:321 +#: src/stdbuf.c:320 #, 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:509 +#: src/stty.c:513 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -10701,16 +11108,19 @@ 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 +msgid "Print or change terminal characteristics.\n" +msgstr "" + # Eso de los "humanos" en español suena un poco raro. ¿no? sv # Por acuerdo, usamos 'el' terminal em+ # Añado comillas en '-' em+ # FIXME. Comunicar primero al autor. sv+ # Sistema subyacente ?? , mejor dejar 'sistema' a secas em+ # Depende, ¿qué ocurre con los compiladores cruzados? -#: src/stty.c:515 +#: src/stty.c:525 +#, fuzzy msgid "" -"Print or change terminal characteristics.\n" -"\n" " -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" @@ -10724,7 +11134,7 @@ msgstr "" " -F, --file=DISP abre y utiliza el DISPositivo especificado en lugar de la\n" " entrada estándar\n" -#: src/stty.c:524 +#: src/stty.c:532 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -10735,7 +11145,7 @@ msgstr "" "El sistema subyacente define qué valores están disponibles.\n" # Contexto del shell ? , ¿qué es eso? em+ -#: src/stty.c:529 +#: src/stty.c:537 msgid "" "\n" "Special characters:\n" @@ -10751,7 +11161,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:536 +#: src/stty.c:544 msgid "" " * eol2 CHAR alternate CHAR for ending the line\n" " erase CHAR CHAR will erase the last character typed\n" @@ -10763,7 +11173,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:542 +#: src/stty.c:550 msgid "" " * lnext CHAR CHAR will enter the next character quoted\n" " quit CHAR CHAR will send a quit signal\n" @@ -10776,7 +11186,7 @@ msgstr "" " start CAR el CARácter reiniciará la salida después de haberla " "detenido\n" -#: src/stty.c:548 +#: src/stty.c:556 msgid "" " stop CHAR CHAR will stop the output\n" " susp CHAR CHAR will send a terminal stop signal\n" @@ -10789,7 +11199,7 @@ msgstr "" " * werase CAR el CARácter borrará la última palabra tecleada\n" # FIXME: Falta un espacio ¿? -#: src/stty.c:554 +#: src/stty.c:562 msgid "" "\n" "Special settings:\n" @@ -10803,7 +11213,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:561 +#: src/stty.c:569 msgid "" " ispeed N set the input speed to N\n" " * line N use line discipline N\n" @@ -10817,7 +11227,7 @@ msgstr "" " lectura completada\n" " ospeed N establece la velocidad de salida a N\n" -#: src/stty.c:567 +#: src/stty.c:575 msgid "" " * rows N tell the kernel that the terminal has N rows\n" " * size print the number of rows and columns according to the " @@ -10832,13 +11242,15 @@ msgstr "" " time N con -icanon, establece el tiempo fuera de lectura en N\n" " décimas de segundo\n" -#: src/stty.c:573 +#: src/stty.c:581 +#, fuzzy msgid "" "\n" "Control settings:\n" " [-]clocal disable modem control signals\n" " [-]cread allow input to be received\n" " * [-]crtscts enable RTS/CTS handshaking\n" +" * [-]cdtrdsr enable DTR/DSR handshaking\n" " csN set character size to N bits, N in [5..8]\n" msgstr "" "\n" @@ -10850,7 +11262,7 @@ msgstr "" # ## en -cread -> permite que se reciba entrada # ## vale. -#: src/stty.c:581 +#: src/stty.c:590 #, fuzzy msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" @@ -10858,7 +11270,7 @@ msgid "" " [-]hupcl same as [-]hup\n" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" -" [-]parodd set odd parity (even with '-')\n" +" [-]parodd set odd parity (or even parity with '-')\n" msgstr "" " [-]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" @@ -10868,7 +11280,7 @@ msgstr "" " paridad en la entrada\n" " [-]parodd establece paridad impar (incluso con `-')\n" -#: src/stty.c:588 +#: src/stty.c:597 msgid "" "\n" "Input settings:\n" @@ -10884,7 +11296,7 @@ msgstr "" " [-]ignbrk descarta los caracteres de `break'\n" " [-]igncr descarta los retornos de carro\n" -#: src/stty.c:596 +#: src/stty.c:605 msgid "" " [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" @@ -10900,11 +11312,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:603 +#: src/stty.c:612 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:606 +#: src/stty.c:615 msgid "" " * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" @@ -10922,7 +11334,7 @@ msgstr "" "255-0)\n" " [-]tandem igual que [-]ixoff\n" -#: src/stty.c:614 +#: src/stty.c:623 msgid "" "\n" "Output settings:\n" @@ -10938,7 +11350,7 @@ 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:622 +#: src/stty.c:631 msgid "" " * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of null characters\n" @@ -10956,7 +11368,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:630 +#: src/stty.c:639 msgid "" " * [-]onocr do not print carriage returns in the first column\n" " [-]opost postprocess output\n" @@ -10975,7 +11387,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:638 +#: src/stty.c:647 msgid "" "\n" "Local settings:\n" @@ -10990,7 +11402,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:645 +#: src/stty.c:654 #, fuzzy msgid "" " * [-]ctlecho echo control characters in hat notation ('^c')\n" @@ -11005,7 +11417,7 @@ msgstr "" " [-]echoe igual que [-]crterase\n" " [-]echok repite una nueva línea después de un carácter de matar\n" -#: src/stty.c:652 +#: src/stty.c:661 #, fuzzy msgid "" " * [-]echoke same as [-]crtkill\n" @@ -11023,7 +11435,7 @@ msgstr "" " y rprnt\n" " [-]iexten permite caracteres especiales no-POSIX\n" -#: src/stty.c:659 +#: src/stty.c:668 #, fuzzy msgid "" " [-]isig enable interrupt, quit, and suspend special characters\n" @@ -11042,7 +11454,7 @@ msgstr "" " la terminal\n" " * [-]xcase con icanon, escapa con `\\' para caracteres en mayúscula\n" -#: src/stty.c:666 +#: src/stty.c:675 msgid "" "\n" "Combination settings:\n" @@ -11056,7 +11468,7 @@ msgstr "" " cbreak igual que -icanon\n" " -cbreak igual que icanon\n" -#: src/stty.c:673 +#: src/stty.c:682 msgid "" " cooked same as brkint ignpar istrip icrnl ixon opost isig\n" " icanon, eof and eol characters to their default values\n" @@ -11068,7 +11480,7 @@ msgstr "" " -cooked igual que raw\n" " crt igual que echoe echoctl echoke\n" -#: src/stty.c:679 +#: src/stty.c:688 msgid "" " dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" " kill ^u\n" @@ -11082,7 +11494,7 @@ msgstr "" " ek caracteres erase y kill a sus valores por omisión\n" " evenp igual que parenb -parodd cs7\n" -#: src/stty.c:686 +#: src/stty.c:695 msgid "" " -evenp same as -parenb cs8\n" " * [-]lcase same as xcase iuclc olcuc\n" @@ -11098,7 +11510,7 @@ msgstr "" " nl igual que -icrnl -onlcr\n" " -nl igual que icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" -#: src/stty.c:694 +#: src/stty.c:703 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -11112,7 +11524,7 @@ msgstr "" " pass8 igual que -parenb -istrip cs8\n" " -pass8 igual que parenb istrip cs7\n" -#: src/stty.c:701 +#: src/stty.c:710 msgid "" " raw same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" " -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n" @@ -11124,7 +11536,7 @@ msgstr "" " -imaxbel -opost -isig -icanon -xcase min 1 time 0\n" " -raw igual que cooked\n" -#: src/stty.c:707 +#: src/stty.c:716 msgid "" " sane same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" " -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n" @@ -11140,7 +11552,7 @@ msgstr "" " -xcase -tostop -echoprt echoctl echoke, y todos los\n" " caracteres especiales a sus valores por omisión.\n" -#: src/stty.c:715 +#: src/stty.c:724 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -11155,12 +11567,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:787 +#: src/stty.c:796 #, c-format msgid "only one device may be specified" msgstr "sólo se puede especificar un dispositivo" -#: src/stty.c:817 +#: src/stty.c:826 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" @@ -11169,132 +11581,48 @@ msgstr "" "las opciones para estilos de salida explícitos y legibles para terminal son\n" "mutuamente excluyentes" -#: src/stty.c:823 +#: src/stty.c:832 #, 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:838 +#: src/stty.c:847 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s: no se pudo reiniciar el modo `non-blocking'" -#: src/stty.c:883 src/stty.c:993 +#: src/stty.c:892 src/stty.c:1002 #, c-format msgid "invalid argument %s" msgstr "argumento inválido %s" -#: src/stty.c:894 src/stty.c:911 src/stty.c:923 src/stty.c:936 src/stty.c:948 -#: src/stty.c:968 +#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957 +#: src/stty.c:977 #, c-format msgid "missing argument to %s" msgstr "falta el argumento de %s" -#: src/stty.c:974 +#: src/stty.c:983 #, c-format msgid "invalid line discipline %s" msgstr "disciplina de línea inválida %s" -#: src/stty.c:1044 +#: src/stty.c:1053 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s: no se pudieron realizar todas las operaciones solicitadas" -#: src/stty.c:1390 +#: src/stty.c:1399 #, 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:1904 +#: src/stty.c:1920 #, c-format msgid "invalid integer argument %s" msgstr "argumento entero inválido %s" -#: src/su.c:229 -msgid "Password:" -msgstr "Contraseña:" - -#: src/su.c:232 -#, c-format -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 -#: src/su.c:290 -#, c-format -msgid "cannot set groups" -msgstr "no se puede establecer el grupo" - -#: src/su.c:294 -#, c-format -msgid "cannot set group id" -msgstr "no se puede establecer el id del grupo" - -#: src/su.c:296 -#, c-format -msgid "cannot set user id" -msgstr "no se puede establecer el id del usuario" - -#: src/su.c:371 -#, c-format -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 -#: src/su.c:372 -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" - -#: src/su.c:384 -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" - -#: src/su.c:461 -#, c-format -msgid "user %s does not exist" -msgstr "el usuario %s no existe" - -#: src/su.c:484 -#, c-format -msgid "incorrect password" -msgstr "contraseña incorrecta" - -#: src/su.c:501 -#, c-format -msgid "using restricted shell %s" -msgstr "usando el shell restringido %s" - -#: src/su.c:509 -#, c-format -msgid "warning: cannot change directory to %s" -msgstr "atención: no se puede cambiar al directorio %s" - #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 msgid "Kayvan Aghaiepour" @@ -11328,7 +11656,7 @@ msgstr "" msgid "ignoring all arguments" msgstr "no se tendrá en cuenta ningún argumento" -#: src/system.h:340 +#: src/system.h:343 #, c-format msgid "" "\n" @@ -11358,15 +11686,25 @@ msgstr "" # dejarlo (daño no hace, eso sí es verdad) ipg # # Lo dejaremos para otra ocasión. Ya os avisaré. sv -#: src/system.h:346 +#: src/system.h:349 msgid " --help display this help and exit\n" msgstr " --help muestra esta ayuda y finaliza\n" -#: src/system.h:348 +#: src/system.h:351 msgid " --version output version information and exit\n" msgstr " --version informa de la versión y finaliza\n" -#: src/system.h:541 +#: src/system.h:544 +#, fuzzy +msgid "" +"\n" +"Mandatory arguments to long options are mandatory for short options too.\n" +msgstr "" +"Los argumentos obligatorios para las opciones largas son también " +"obligatorios\n" +"para las opciones cortas.\n" + +#: src/system.h:552 msgid "" "\n" "SIZE is an integer and optional unit (example: 10M is 10*1024*1024). Units\n" @@ -11374,7 +11712,7 @@ msgid "" "1000).\n" msgstr "" -#: src/system.h:550 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -11395,7 +11733,7 @@ msgstr "" # 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:560 +#: src/system.h:571 #, c-format msgid "" "\n" @@ -11409,19 +11747,19 @@ msgstr "" #. <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:574 +#: src/system.h:585 #, 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" -#: src/system.h:578 +#: src/system.h:589 #, c-format msgid "For complete documentation, run: info coreutils '%s invocation'\n" msgstr "" "Para la documentación completa, ejecute: info coreutils `%s invocation'\n" -#: src/system.h:585 +#: src/system.h:596 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "Pruebe `%s --help' para más información.\n" @@ -11434,7 +11772,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:617 +#: src/system.h:628 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -11455,16 +11793,16 @@ 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" -"\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" -#: src/tac.c:145 +#: src/tac.c:144 msgid "" " -b, --before attach the separator before instead of after\n" " -r, --regex interpret the separator as a regular expression\n" @@ -11478,37 +11816,37 @@ msgstr "" "de\n" " línea\n" -#: src/tac.c:235 src/tac.c:336 +#: src/tac.c:234 src/tac.c:335 #, c-format msgid "%s: seek failed" msgstr "%s: seek falló" -#: src/tac.c:264 +#: src/tac.c:263 #, c-format msgid "record too large" msgstr "registro demasiado grande" -#: src/tac.c:451 +#: src/tac.c:450 #, fuzzy, c-format msgid "failed to create temporary file in %s" msgstr "no se puede crear un fichero temporal en %s" -#: src/tac.c:459 +#: src/tac.c:458 #, fuzzy, c-format msgid "failed to open %s for writing" msgstr "%s: fallo al abrir para escritura" -#: src/tac.c:476 +#: src/tac.c:475 #, fuzzy, c-format msgid "failed to rewind stream for %s" msgstr "fallo al conservar la fecha de %s" -#: src/tac.c:512 src/tac.c:519 +#: src/tac.c:511 src/tac.c:518 #, c-format msgid "%s: write error" msgstr "%s: error de escritura" -#: src/tac.c:572 +#: src/tac.c:571 #, fuzzy, c-format msgid "failed to open %s for reading" msgstr "no se puede abrir %s para lectura" @@ -11524,7 +11862,7 @@ msgstr "no se puede abrir %s para lectura" # Yo pondría `el separador no puede ser nulo'. No es muy ortodoxo, # pero no queda mal. ipg # Por mí de acuerdo, lo cambio em -#: src/tac.c:630 +#: src/tac.c:629 #, c-format msgid "separator cannot be empty" msgstr "el separador no puede ser nulo" @@ -11535,19 +11873,18 @@ msgid "Ian Lance Taylor" msgstr "Ian Lance Taylor" #: src/tail.c:262 -#, c-format +#, fuzzy, 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" -"\n" 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" -#: src/tail.c:271 +#: src/tail.c:270 msgid "" " -c, --bytes=K output the last K bytes; alternatively, use -c " "+K\n" @@ -11559,7 +11896,7 @@ msgstr "" "en\n" " el K-ésimo de cada fichero\n" -#: src/tail.c:275 +#: src/tail.c:274 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -11572,7 +11909,7 @@ msgstr "" " equivalentes\n" " -F lo mismo que --follow=name --retry\n" -#: src/tail.c:282 +#: src/tail.c:281 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -11596,7 +11933,7 @@ msgstr "" " de registro que rotan). Con inotify, esta opción\n" " raramente es útil.\n" -#: src/tail.c:295 +#: src/tail.c:294 msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" " -q, --quiet, --silent never output headers giving file names\n" @@ -11615,7 +11952,7 @@ msgstr "" "sigue\n" " por nombre, es decir, con --follow=name\n" -#: src/tail.c:302 +#: src/tail.c:301 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations.\n" @@ -11630,7 +11967,7 @@ msgstr "" " menos una vez cada N segundos.\n" " -v, --verbose presenta siempre las cabeceras para cada fichero\n" -#: src/tail.c:311 +#: src/tail.c:310 #, fuzzy msgid "" "\n" @@ -11651,7 +11988,7 @@ msgstr "" "Y.\n" "\n" -#: src/tail.c:320 +#: src/tail.c:319 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" @@ -11672,68 +12009,68 @@ msgstr "" "borrado o recreado por algún otro programa.\n" # df=descriptor de fichero, por supuesto... sv -#: src/tail.c:379 +#: src/tail.c:378 #, c-format msgid "closing %s (fd=%d)" msgstr "cerrando %s (df=%d)" -#: src/tail.c:454 +#: 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:458 +#: src/tail.c:457 #, 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:895 +#: src/tail.c:894 #, 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:907 -#, fuzzy, c-format +#: src/tail.c:906 +#, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" -msgstr "no se puede determinar la localización de %s, se vuelve a `polling'" +msgstr "" -#: src/tail.c:964 +#: src/tail.c:963 #, c-format msgid "%s has become inaccessible" msgstr "%s se ha vuelto inaccesible" -#: src/tail.c:981 +#: src/tail.c:980 #, 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:990 +#: src/tail.c:989 #, 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:1011 +#: src/tail.c:1010 #, c-format msgid "%s has become accessible" msgstr "%s se ha vuelto accesible" -#: src/tail.c:1019 +#: src/tail.c:1018 #, c-format msgid "%s has appeared; following end of new file" msgstr "%s ha aparecido; siguiendo el final del nuevo fichero" -#: src/tail.c:1030 +#: src/tail.c:1029 #, 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:1131 +#: src/tail.c:1130 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: no se puede cambiar el modo `non-blocking'" @@ -12141,17 +12478,22 @@ msgstr "falta un `]'" msgid "extra argument %s" msgstr "sobra el argumento %s" -#: src/timeout.c:124 +#: src/timeout.c:112 +#, fuzzy, c-format +msgid "warning: sigprocmask" +msgstr "atención: timer_create" + +#: src/timeout.c:145 #, c-format msgid "warning: timer_settime" msgstr "atención: timer_settime" -#: src/timeout.c:129 +#: src/timeout.c:150 #, c-format msgid "warning: timer_create" msgstr "atención: timer_create" -#: src/timeout.c:204 +#: src/timeout.c:225 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -12160,11 +12502,9 @@ msgstr "" "Modo de empleo: %s [OPCIÓN] DURACIÓN ORDEN [ARG]...\n" " o bien: %s [OPCIÓN]\n" -#: src/timeout.c:208 -msgid "" -"Start COMMAND, and kill it if still running after DURATION.\n" -"\n" -"Mandatory arguments to long options are mandatory for short options too.\n" +#: src/timeout.c:229 +#, fuzzy +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" @@ -12172,9 +12512,12 @@ msgstr "" "obligatorios\n" "para las opciones cortas.\n" -#: src/timeout.c:213 +#: src/timeout.c:235 #, fuzzy msgid "" +" --preserve-status\n" +" exit with the same status as COMMAND, even when the\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 " @@ -12202,7 +12545,7 @@ msgstr "" " 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:229 +#: src/timeout.c:254 #, fuzzy msgid "" "\n" @@ -12215,16 +12558,16 @@ msgstr "" "`s' para segundos (por omisión), `m' para minutos, `h' para horas o\n" "`d' para días.\n" -#: src/timeout.c:234 +#: src/timeout.c:259 #, fuzzy msgid "" "\n" -"If the command times out, then exit with status 124. Otherwise, exit\n" -"with the status of COMMAND. If no signal is specified, send the TERM\n" -"signal upon timeout. The TERM signal kills any process that does not\n" -"block or catch that signal. For other processes, it may be necessary to\n" -"use the KILL (9) signal, since this signal cannot be caught. If the\n" -"KILL (9) signal is sent, the exit status is 128+9 rather than 124.\n" +"If the command times out, and --preserve-status is not set, then exit with\n" +"status 124. Otherwise, exit with the status of COMMAND. If no signal\n" +"is specified, send the TERM signal upon timeout. The TERM signal kills\n" +"any process that does not block or catch that signal. It may be necessary\n" +"to use the KILL (9) signal, since this signal cannot be caught, in which\n" +"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" @@ -12235,15 +12578,20 @@ msgstr "" "(9),\n" "dado que esta señal no se puede capturar.\n" -#: src/timeout.c:419 +#: src/timeout.c:363 +#, c-format +msgid "warning: disabling core dumps failed" +msgstr "atención: la desactivación de volcados de core ha fallado" + +#: src/timeout.c:471 #, c-format msgid "error waiting for command" msgstr "error esperando a la orden" -#: src/timeout.c:441 +#: src/timeout.c:482 #, c-format -msgid "warning: disabling core dumps failed" -msgstr "atención: la desactivación de volcados de core ha fallado" +msgid "the monitored command dumped core" +msgstr "" #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 @@ -12255,22 +12603,23 @@ msgstr "Jim Kingdon" msgid "Randy Smith" msgstr "Randy Smith" -#: src/touch.c:115 src/touch.c:313 +#: src/touch.c:115 src/touch.c:309 #, c-format msgid "invalid date format %s" msgstr "formato de fecha inválido %s" -#: src/touch.c:194 +#: src/touch.c:191 #, c-format msgid "cannot touch %s" msgstr "no se puede efectuar `touch' sobre %s" -#: src/touch.c:200 +#: src/touch.c:197 #, c-format msgid "setting times of %s" msgstr "estableciendo la fecha de %s" -#: src/touch.c:216 +#: src/touch.c:213 +#, fuzzy msgid "" "Update the access and modification times of each FILE to the current time.\n" "\n" @@ -12279,7 +12628,6 @@ msgid "" "\n" "A FILE argument string of - is handled specially and causes touch to\n" "change the times of the file associated with standard output.\n" -"\n" msgstr "" "Actualiza la fecha de acceso y modificación de cada FICHERO a la hora " "actual.\n" @@ -12290,7 +12638,7 @@ msgstr "" "Una cadena de argumento FICHERO que sea - se maneja especialmente y provoca\n" "que touch cambie la fecha del fichero asociado con la salida estándar.\n" -#: src/touch.c:229 +#: src/touch.c:225 msgid "" " -a change only the access time\n" " -c, --no-create do not create any files\n" @@ -12317,7 +12665,7 @@ msgstr "" # que no existe, inventada). ¿Estás seguro de que existe? # (Esto me recuerda el palabro "influenciar", a mucha gente se le olvida # que se dice *influir*). sv -#: src/touch.c:235 +#: src/touch.c:231 msgid "" " -h, --no-dereference affect each symbolic link instead of any " "referenced\n" @@ -12331,11 +12679,12 @@ msgstr "" " simbólico)\n" " -m cambia solamente la fecha de modificación\n" -#: src/touch.c:241 +#: 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" -" --time=WORD change the specified time:\n" +" --time=WORD change the specified time:\n" " WORD is access, atime, or use: equivalent to -a\n" " WORD is modify or mtime: equivalent to -m\n" msgstr "" @@ -12349,7 +12698,7 @@ msgstr "" " PALABRA es access, atime o use: equivale a -a\n" " PALABRA es modify o mtime: equivale a -m\n" -#: src/touch.c:250 +#: src/touch.c:246 msgid "" "\n" "Note that the -d and -t options accept different time-date formats.\n" @@ -12360,12 +12709,12 @@ msgstr "" # (em) Nota: Este mensaje sale, por ejemplo, al escribir # "touch logo -r . -t 10101010". -#: src/touch.c:339 +#: src/touch.c:335 #, c-format msgid "cannot specify times from more than one source" msgstr "no se puede especificar la fecha de dos formas distintas" -#: src/touch.c:413 +#: src/touch.c:409 #, fuzzy, c-format msgid "" "warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'" @@ -12653,6 +13002,7 @@ 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" @@ -12661,7 +13011,6 @@ msgid "" "If a FILE is larger than the specified size, the extra data is lost.\n" "If a FILE is shorter, it is extended and the extended part (hole)\n" "reads as zero bytes.\n" -"\n" msgstr "" "Encoge o extiende el tamaño de cada FICHERO al tamaño especificado\n" "\n" @@ -12674,11 +13023,11 @@ msgstr "" "se lee como bytes cero.\n" "\n" -#: src/truncate.c:110 +#: src/truncate.c:109 msgid " -c, --no-create do not create any files\n" msgstr " -c, --no-create no crea ningún fichero\n" -#: src/truncate.c:113 +#: src/truncate.c:112 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" @@ -12686,7 +13035,7 @@ msgstr "" "lugar\n" " de bytes\n" -#: src/truncate.c:116 +#: 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" @@ -12695,7 +13044,7 @@ msgstr "" " -s, --size=TAMAÑO establece o ajusta el tamaño del fichero en " "TAMAÑO\n" -#: src/truncate.c:122 +#: src/truncate.c:121 #, fuzzy msgid "" "\n" @@ -12711,58 +13060,58 @@ msgstr "" "`/' redondeo hacia abajo al múltiplo de, `%' redondeo hacia arriba al\n" "múltiplo de\n" -#: src/truncate.c:150 +#: src/truncate.c:149 #, c-format msgid "overflow in %<PRIdMAX> * %<PRIdMAX> byte blocks for file %s" msgstr "" "desbordamiento en bloques de %<PRIdMAX> * %<PRIdMAX> bytes para el fichero %s" -#: src/truncate.c:174 +#: src/truncate.c:173 #, c-format msgid "%s has unusable, apparently negative size" msgstr "no se puede usar %s, aparentemente tiene un tamaño negativo" -#: src/truncate.c:184 src/truncate.c:379 +#: src/truncate.c:183 src/truncate.c:384 #, c-format msgid "cannot get the size of %s" msgstr "no se puede obtener el tamaño de %s" -#: src/truncate.c:206 +#: src/truncate.c:205 #, c-format msgid "overflow rounding up size of file %s" msgstr "desbordamiento al redondear hacia arriba el tamaño del fichero %s" -#: src/truncate.c:216 +#: src/truncate.c:215 #, c-format msgid "overflow extending size of file %s" msgstr "desbordamiento al extender el tamaño del fichero %s" -#: src/truncate.c:231 +#: src/truncate.c:230 #, c-format msgid "failed to truncate %s at %<PRIdMAX> bytes" msgstr "fallo al truncar %s a %<PRIdMAX> bytes" -#: src/truncate.c:305 +#: src/truncate.c:303 #, c-format msgid "multiple relative modifiers specified" msgstr "se han especificado varios modificadores relativos" -#: src/truncate.c:335 +#: src/truncate.c:333 #, c-format msgid "you must specify either %s or %s" msgstr "debe especificar o bien %s o bien %s" -#: src/truncate.c:342 +#: src/truncate.c:340 #, c-format msgid "you must specify a relative %s with %s" msgstr "debe especificar un %s relativo con %s" -#: src/truncate.c:349 +#: src/truncate.c:347 #, c-format msgid "%s was specified but %s was not" msgstr "%s estaba especificado pero %s no" -#: src/truncate.c:400 +#: src/truncate.c:404 #, c-format msgid "cannot open %s for writing" msgstr "no se puede abrir %s para escritura" @@ -12893,16 +13242,16 @@ 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" -"\n" msgstr "" "Convierte los espacios de cada FICHERO en tabulaciones, escribiendo el\n" "resultado en la salida estándar. Si no se especifica FICHERO o FICHERO\n" "es -, lee la entrada estándar.\n" -#: src/unexpand.c:125 +#: src/unexpand.c:124 msgid "" " -a, --all convert all blanks, instead of just initial blanks\n" " --first-only convert only leading sequences of blanks (overrides -a)\n" @@ -12918,12 +13267,12 @@ msgstr "" " -t, --tabs=LISTA usa la LISTA de posiciones separadas por comas para\n" " definir las posiciones de tabulación (activa -a)\n" -#: src/unexpand.c:153 +#: src/unexpand.c:152 #, c-format msgid "tabs are too far apart" msgstr "las tabulaciones están demasiado separadas" -#: src/unexpand.c:505 +#: src/unexpand.c:504 #, c-format msgid "tab stop value is too large" msgstr "la parada de tabulación es demasiado grande" @@ -12934,12 +13283,12 @@ msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n" msgstr "Modo de empleo: %s [OPCIÓN]... [ENTRADA [SALIDA]]\n" #: src/uniq.c:138 +#, fuzzy 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" -"\n" msgstr "" "Filtra líneas adyacentes que coincidan de ENTRADA (o la entrada estándar),\n" "escribiendo en SALIDA (o la salida estándar).\n" @@ -12949,7 +13298,7 @@ msgstr "" "aparición.\n" "\n" -#: src/uniq.c:148 +#: src/uniq.c:147 msgid "" " -c, --count prefix lines by the number of occurrences\n" " -d, --repeated only print duplicate lines\n" @@ -12957,7 +13306,7 @@ 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" -#: src/uniq.c:152 +#: src/uniq.c:151 msgid "" " -D, --all-repeated[=delimit-method] print all duplicate lines\n" " delimit-method={none(default),prepend,separate}\n" @@ -12980,12 +13329,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:162 +#: src/uniq.c:161 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:167 +#: src/uniq.c:166 msgid "" "\n" "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n" @@ -12996,7 +13345,7 @@ msgstr "" "de\n" "caracteres no blancos. Los campos se descartan antes que los caracteres.\n" -#: src/uniq.c:172 +#: src/uniq.c:171 #, fuzzy msgid "" "\n" @@ -13009,24 +13358,24 @@ msgstr "" "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:359 +#: src/uniq.c:358 #, c-format msgid "too many repeated lines" msgstr "demasiadas líneas repetidas" -#: src/uniq.c:522 +#: src/uniq.c:521 msgid "invalid number of fields to skip" msgstr "el número de campos que se deben saltar es inválido" -#: src/uniq.c:531 +#: src/uniq.c:530 msgid "invalid number of bytes to skip" msgstr "el número de bytes que se deben saltar es inválido" -#: src/uniq.c:540 +#: src/uniq.c:539 msgid "invalid number of bytes to compare" msgstr "el número de bytes que hay que comparar es inválido" -#: src/uniq.c:559 +#: src/uniq.c:558 #, c-format msgid "printing all duplicated lines and repeat counts is meaningless" msgstr "" @@ -13095,6 +13444,11 @@ msgid_plural "up %ld days %2d:%02d, " msgstr[0] "arriba %ld día %2d:%02d, " msgstr[1] "arriba %ld días %2d:%02d, " +#: src/uptime.c:149 +#, fuzzy, c-format +msgid "up %2d:%02d, " +msgstr "arriba %ld día %2d:%02d, " + #: src/uptime.c:151 #, c-format msgid "%lu user" @@ -13202,41 +13556,41 @@ msgstr "" msgid " old " msgstr " antiguo " -#: src/who.c:449 +#: src/who.c:440 msgid "system boot" msgstr "arranque del sistema" -#: src/who.c:456 src/who.c:458 +#: src/who.c:447 src/who.c:449 msgid "id=" msgstr "id=" -#: src/who.c:471 src/who.c:476 +#: src/who.c:462 src/who.c:467 msgid "term=" msgstr "term=" -#: src/who.c:473 src/who.c:477 +#: src/who.c:464 src/who.c:468 msgid "exit=" msgstr "salida=" # Quiero un ejemplo -#: src/who.c:494 +#: src/who.c:485 msgid "LOGIN" msgstr "LOGIN" -#: src/who.c:514 +#: src/who.c:505 msgid "clock change" msgstr "cambio de reloj" # Se admiten sugerencias -#: src/who.c:526 src/who.c:527 +#: src/who.c:517 src/who.c:518 msgid "run-level" msgstr "`run-level'" -#: src/who.c:530 src/who.c:531 +#: src/who.c:521 src/who.c:522 msgid "last=" msgstr "último=" -#: src/who.c:562 +#: src/who.c:553 #, c-format msgid "" "\n" @@ -13255,15 +13609,15 @@ msgstr "" # Quien mantiene esto actualmente (Jim Meyering) me ha hecho caso # otras veces (si miras el ChangeLog de fileutils podrás comprobarlo) # y es bastante comprensivo. -#: src/who.c:568 +#: src/who.c:559 msgid "NAME" msgstr "NOMBRE" -#: src/who.c:568 +#: src/who.c:559 msgid "LINE" msgstr "LÍNEA" -#: src/who.c:568 +#: src/who.c:559 msgid "TIME" msgstr "TIEMPO" @@ -13276,28 +13630,28 @@ msgstr "TIEMPO" # en masculino (ya que en español, coinciden, que es lo que a muchos # les cuesta digerir). # De todas formas, ¿INACTIVO no es [TIEMPO] INACTIVO? sv -#: src/who.c:568 +#: src/who.c:559 msgid "IDLE" msgstr "INACTIVO" -#: src/who.c:569 +#: src/who.c:560 msgid "PID" msgstr "PID" -#: src/who.c:569 +#: src/who.c:560 msgid "COMMENT" msgstr "COMENTARIO" -#: src/who.c:569 +#: src/who.c:560 msgid "EXIT" msgstr "SALIDA" -#: src/who.c:649 +#: src/who.c:640 #, c-format msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n" msgstr "Modo de empleo: %s [OPCIÓN]... [ FICHERO | ARG1 ARG2 ]\n" -#: src/who.c:650 +#: src/who.c:641 msgid "Print information about users who are currently logged in.\n" msgstr "" "Muestra información sobre los usuarios que están actualmente conectados.\n" @@ -13318,7 +13672,7 @@ msgstr "" # # ¿Al haber un signo menos a su izquierda no tiene la "o" posibilidad de ser # confundida con un cero? sv -#: src/who.c:653 +#: src/who.c:644 msgid "" "\n" " -a, --all same as -b -d --login -p -r -t -T -u\n" @@ -13332,11 +13686,11 @@ msgstr "" " -d, --dead muestra los procesos muertos\n" " -H, --heading muestra la línea de encabezados de columnas\n" -#: src/who.c:660 +#: src/who.c:651 msgid " -l, --login print system login processes\n" msgstr " -l, --login muestra los procesos de login del sistema\n" -#: src/who.c:663 +#: src/who.c:654 msgid "" " --lookup attempt to canonicalize hostnames via DNS\n" " -m only hostname and user associated with stdin\n" @@ -13348,7 +13702,7 @@ msgstr "" " la entrada estándar\n" " -p, --process muestra los procesos activos lanzados por init\n" -#: src/who.c:668 +#: src/who.c:659 msgid "" " -q, --count all login names and number of users logged on\n" " -r, --runlevel print current runlevel\n" @@ -13361,7 +13715,7 @@ msgstr "" " -s, --short muestra sólo el nombre, línea y tiempo (predeterminado)\n" " -t, --time muestra el último cambio en el reloj del sistema\n" -#: src/who.c:674 +#: src/who.c:665 msgid "" " -T, -w, --mesg add user's message status as +, - or ?\n" " -u, --users list users logged in\n" @@ -13374,7 +13728,7 @@ msgstr "" " --message igual que -T\n" " --writable igual que -T\n" -#: src/who.c:682 +#: src/who.c:673 #, fuzzy, c-format msgid "" "\n" @@ -13436,20 +13790,23 @@ msgstr "" "`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 " gid=%s" -#~ msgstr " gid=%lu" +#~ msgid " returning value: '%s'\n" +#~ msgstr "creando fichero %s\n" #, fuzzy -#~ msgid " euid=%s" -#~ msgstr " euid=%lu" +#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n" +#~ msgstr "Modo de empleo: %s [OPCIÓN] NOMBRE...\n" -#~ msgid "" -#~ "Usage: %s NAME\n" -#~ " or: %s OPTION\n" -#~ msgstr "" -#~ "Modo de empleo: %s NOMBRE\n" -#~ " o bien: %s OPCIÓN\n" +#, fuzzy +#~ msgid "no valid suffix found\n" +#~ msgstr "%s: longitud del sufijo inválida" #~ msgid "" #~ "\n" @@ -13462,19 +13819,184 @@ msgstr "" #~ " %s /usr/bin/sort Salida \"sort\".\n" #~ " %s include/stdio.h .h Salida \"stdio\".\n" -#~ msgid "Usage: %s [OPTION] FILE...\n" -#~ msgstr "Modo de empleo: %s [OPCIÓN] FICHERO...\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" -#~ " --dereference affect the referent of each symbolic link (this " -#~ "is\n" -#~ " the default), rather than the symbolic link " -#~ "itself\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" @@ -13487,6 +14009,14 @@ msgstr "" #~ " 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 # @@ -13537,14 +14067,6 @@ msgstr "" #~ " -c, --changes como `verbose' pero sólo informa de los " #~ "cambios\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" - #~ msgid "" #~ " -f, --silent, --quiet suppress most error messages\n" #~ " -v, --verbose output a diagnostic for every file processed\n" @@ -13614,25 +14136,26 @@ msgstr "" #~ "recursivamente\n" #~ " -v, --verbose muestra un mensaje por cada fichero procesado\n" -#, fuzzy -#~ msgid "Usage: %s [OPTION]... PATH START\n" -#~ msgstr "Modo de empleo: %s [OPCIÓN]... CONJUNTO1 [CONJUNTO2]\n" - -#, fuzzy +# UTC = Tiempo Universal Coordinado, antiguo GMT (Greenwich Mean Time, +# Hora Media de Greenwich). gerardo #~ msgid "" -#~ " -n, --no-newline do not output the trailing " -#~ "newline\n" -#~ " " +#~ "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 cada CADENA en la salida estándar.\n" +#~ "Muestra la hora actual en el FORMATO dado, o establece la fecha del " +#~ "sistema.\n" #~ "\n" -#~ " -n no muestra la nueva línea final\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" -#, fuzzy #~ msgid "" #~ "\n" -#~ "SIZE is an integer with an optional suffix (example: 10MB). Suffixes " -#~ "are:\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 "" @@ -13644,22 +14167,6 @@ msgstr "" #~ "T, P,\n" #~ "E, Z, Y.\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 "cannot create link %s" #~ msgstr "no se puede crear el enlace %s" @@ -13710,9 +14217,6 @@ msgstr "" #~ msgid "invalid number of lines: 0" #~ msgstr "número de líneas inválido: 0" -#~ msgid "invalid format width" -#~ msgstr "formato de ancho inválido" - #~ msgid "invalid format precision" #~ msgstr "formato de precisión inválido" @@ -14135,6 +14639,9 @@ msgstr "" #~ 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" @@ -14511,9 +15018,6 @@ msgstr "" #~ msgid "cannot obtain time stamps for %s" #~ msgstr "no se puede obtener la fecha de %s" -#~ msgid "invalid field number: `%s'" -#~ msgstr "número de campo inválido: `%s'" - #~ msgid "invalid field number for file 1: `%s'" #~ msgstr "número de campo inválido para el fichero 1: `%s'" @@ -15147,10 +15651,6 @@ msgstr "" #~ "fichero\n" #~ "ha sido reemplazado por otro. Nos saltamos este fichero." -# FIXME: ¿Por qué no "fork system call failed", como antes? -#~ msgid "cannot fork" -#~ msgstr "falló la llamada al sistema `fork'" - #~ msgid "" #~ "ERROR: the directory %s initially had device/inode\n" #~ "numbers %lu/%lu, but now (after a chdir into it), the numbers for `.'\n" diff --git a/po/et.gmo b/po/et.gmo index 8e5f0094..171d6663 100644 Binary files a/po/et.gmo and b/po/et.gmo differ diff --git a/po/et.po b/po/et.po index 646648a5..4cb8329b 100644 --- a/po/et.po +++ b/po/et.po @@ -1,14 +1,14 @@ # 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>, 2012. +# Toomas Soome <Toomas.Soome@microlink.ee>, 2013. # msgid "" msgstr "" -"Project-Id-Version: coreutils 8.16\n" +"Project-Id-Version: coreutils 8.20-pre3\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2012-05-10 19:35+0200\n" -"PO-Revision-Date: 2012-03-27 00:45+0300\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" "Language-Team: Estonian <linux-ee@lists.eenet.ee>\n" "Language: et\n" @@ -35,19 +35,19 @@ msgstr "Lubatud argumendid on:" msgid "error closing file" msgstr "viga faili sulgemisel" -#: lib/closeout.c:112 src/base64.c:109 src/base64.c:121 src/base64.c:127 -#: src/base64.c:168 src/base64.c:224 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:330 src/expand.c:355 src/head.c:298 -#: src/head.c:348 src/head.c:756 src/head.c:797 src/mktemp.c:350 src/od.c:919 -#: src/paste.c:160 src/shuf.c:369 src/split.c:727 src/split.c:964 -#: src/split.c:969 src/tail.c:350 src/tail.c:1201 src/tail.c:1307 +#: 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 -#: src/unexpand.c:427 src/unexpand.c:443 +#: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "viga kirjutamisel" -#: lib/copy-acl.c:611 src/copy.c:1160 src/copy.c:2602 +#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617 #, c-format msgid "preserving permissions for %s" msgstr "säilitan %s õigused" @@ -239,18 +239,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:483 +#: lib/mkdir-p.c:196 src/install.c:484 #, c-format msgid "cannot change permissions of %s" msgstr "ei õnnestu muuta %s õigusi" -#: lib/mkdir-p.c:206 src/copy.c:2261 src/install.c:709 src/install.c:722 +#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722 #, 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:915 src/tac.c:435 +#: src/split.c:929 src/tac.c:434 #, c-format msgid "memory exhausted" msgstr "mälu on otsas" @@ -299,75 +299,75 @@ msgstr "'" msgid "%s: end of file" msgstr "%s: faili lõpp" -#: lib/regcomp.c:130 +#: lib/regcomp.c:131 msgid "Success" msgstr "Õnnestumine" -#: lib/regcomp.c:133 +#: lib/regcomp.c:134 msgid "No match" msgstr "Ei leitud" -#: lib/regcomp.c:136 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "Vigane regulaaravaldis" -#: lib/regcomp.c:139 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "Vigane järjestamise sümbol" -#: lib/regcomp.c:142 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "Vigane sümbolite klassi nimi" -#: lib/regcomp.c:145 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "Lõpetav langkriips" -#: lib/regcomp.c:148 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "Vigane tagasiviide" -#: lib/regcomp.c:151 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "Puudub [ või [^" -#: lib/regcomp.c:154 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "Puudub ( või \\(" -#: lib/regcomp.c:157 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "Puudub \\{" -#: lib/regcomp.c:160 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "Vigane \\{\\} kontekst" -#: lib/regcomp.c:163 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "Vigane vahemiku lõpp" -#: lib/regcomp.c:166 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Mälu on otsas" -#: lib/regcomp.c:169 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "Vigane eelnev regulaaravaldis" -#: lib/regcomp.c:172 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "Enneaegne regulaaravaldise lõpp" -#: lib/regcomp.c:175 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "Regulaaravaldis on liiga suur" -#: lib/regcomp.c:178 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "Puudub ) või \\)" -#: lib/regcomp.c:703 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "Eelmist regulaaravaldist pole" @@ -406,7 +406,7 @@ msgstr "^[jJ]" msgid "^[nN]" msgstr "^[eE]" -#: lib/set-mode-acl.c:695 src/copy.c:2284 src/cp.c:518 +#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516 #, c-format msgid "setting permissions for %s" msgstr "sean %s õigusi" @@ -547,13 +547,13 @@ msgstr "Voolutõrge" msgid "Resource lost" msgstr "Resurss on kadunud" -#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262 -#: lib/spawn-pipe.c:265 +#: 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:232 lib/spawn-pipe.c:346 lib/wait-process.c:282 +#: 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" @@ -569,24 +569,24 @@ msgstr "Reaalaja signaal %d" msgid "Unknown signal %d" msgstr "Tundmatu signaal %d" -#: lib/unicodeio.c:103 +#: lib/unicodeio.c:102 msgid "iconv function not usable" msgstr "iconv funktsioon ei ole kasutatav" -#: lib/unicodeio.c:105 +#: lib/unicodeio.c:104 msgid "iconv function not available" msgstr "iconv funktsioon puudub" -#: lib/unicodeio.c:112 +#: lib/unicodeio.c:111 msgid "character out of range" msgstr "sümbol on piirkonnast väljas" -#: lib/unicodeio.c:182 +#: lib/unicodeio.c:181 #, c-format msgid "cannot convert U+%04X to local character set" msgstr "U+%04X ei saa lokaalsesse kooditabelisse teisendada" -#: lib/unicodeio.c:184 +#: lib/unicodeio.c:183 #, c-format msgid "cannot convert U+%04X to local character set: %s" msgstr "U+%04X ei saa lokaalsesse kooditabelisse teisendada: %s" @@ -767,7 +767,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:562 +#: lib/version-etc.c:251 src/system.h:573 #, c-format msgid "%s home page: <%s>\n" msgstr "%s koduleht: <%s>\n" @@ -777,7 +777,7 @@ 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:563 +#: lib/version-etc.c:256 src/system.h:574 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "Üldine abiinfo GNU tarkvara kohta: <http://www.gnu.org/gethelp/>\n" @@ -867,14 +867,12 @@ msgstr "Simon Josefsson" msgid "" "Usage: %s [OPTION]... [FILE]\n" "Base64 encode or decode FILE, or standard input, to standard output.\n" -"\n" msgstr "" "Kasutamine: %s [VÕTI]... [FAIL]\n" "Base64 kodeeri või dekodeeri faile või standardsisenit väljastades\n" "standardväljundisse.\n" -"\n" -#: src/base64.c:64 +#: src/base64.c:67 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -891,7 +889,7 @@ msgstr "" " kasutage väärtust 0\n" "\n" -#: src/base64.c:73 src/cat.c:110 src/fmt.c:293 src/shuf.c:71 src/sum.c:70 +#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -899,7 +897,7 @@ msgstr "" "\n" "Kui FAIL puudub või on -, loe standardsisendit.\n" -#: src/base64.c:76 +#: src/base64.c:79 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -913,37 +911,37 @@ msgstr "" "ka reavahetusi. Andmevoos tähestikuväliste sümbolite eemaldamiseks\n" "kasutage --ignore-garbage.\n" -#: src/base64.c:171 src/base64.c:208 src/csplit.c:263 src/csplit.c:1435 -#: src/join.c:451 src/shuf.c:157 src/shuf.c:361 src/tac-pipe.c:74 +#: 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 #, c-format msgid "read error" msgstr "viga lugemisel" -#: src/base64.c:227 +#: src/base64.c:230 #, c-format msgid "invalid input" msgstr "vigane sisend" -#: src/base64.c:264 +#: src/base64.c:267 #, c-format msgid "invalid wrap size: %s" msgstr "vigane murdmise veerg: %s" -#: src/base64.c:283 src/basename.c:173 src/comm.c:435 src/cp.c:607 -#: src/date.c:441 src/dircolors.c:447 src/du.c:894 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:169 src/install.c:929 src/join.c:961 -#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:157 src/mv.c:447 -#: src/od.c:1802 src/ptx.c:2081 src/readlink.c:154 src/seq.c:408 -#: src/shuf.c:320 src/shuf.c:339 src/sort.c:4477 src/split.c:1313 -#: src/tr.c:1797 src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:454 -#: src/uniq.c:471 src/unlink.c:81 src/uptime.c:250 src/users.c:146 -#: src/wc.c:666 src/who.c:836 src/whoami.c:79 +#: 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 #, c-format msgid "extra operand %s" msgstr "liigne operand %s" -#: src/base64.c:315 src/cat.c:781 +#: src/base64.c:318 src/cat.c:781 #, c-format msgid "closing standard input" msgstr "sulen standardsisendi" @@ -951,15 +949,15 @@ 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/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:53 src/env.c:33 +#: 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/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:65 src/su.c:88 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 +#: 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 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -976,13 +974,11 @@ msgstr "" msgid "" "Print NAME with any leading directory components removed.\n" "If specified, also remove a trailing SUFFIX.\n" -"\n" msgstr "" "Väljasta NIMI ilma eelnevate kataloogideta.\n" "Kui määratud, eelmalda ka sufiks.\n" -"\n" -#: src/basename.c:59 +#: 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" @@ -992,7 +988,7 @@ msgstr "" " -s, --suffix=SUFIKS eemalda lõpetav SUFIKS\n" " -z, --zero eralda väljund reavahetuse asemel sümboliga NUL\n" -#: src/basename.c:66 +#: src/basename.c:67 #, c-format msgid "" "\n" @@ -1009,20 +1005,21 @@ msgstr "" " %s -s .h include/stdio.h -> \"stdio\"\n" " %s -a any/str1 any/str2 -> \"str1\" millele järgneb \"str2\"\n" -#: src/basename.c:167 src/chcon.c:531 src/chgrp.c:277 src/chmod.c:526 -#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1369 +#: 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:183 src/mkfifo.c:108 src/mknod.c:146 src/nohup.c:111 -#: src/pathchk.c:148 src/printf.c:674 src/readlink.c:146 src/realpath.c:236 -#: src/rm.c:314 src/rmdir.c:223 src/seq.c:402 src/setuidgid.c:137 -#: src/sleep.c:119 src/stat.c:1476 src/stdbuf.c:346 src/tr.c:1782 +#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 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 #, 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:52 src/split.c:49 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/split.c:49 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" @@ -1032,8 +1029,8 @@ msgstr "Torbjorn Granlund" msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:846 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4720 src/nl.c:182 src/paste.c:435 src/pr.c:2768 src/sum.c:58 +#: 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/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" @@ -1090,7 +1087,7 @@ msgstr "" msgid "cannot do ioctl on %s" msgstr "%s peal ioctl ei õnnestu" -#: src/cat.c:637 src/dd.c:2209 src/sort.c:379 src/tee.c:165 src/yes.c:86 +#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86 #, c-format msgid "standard output" msgstr "standardväljund" @@ -1107,14 +1104,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:55 src/head.c:46 src/hostid.c:33 +#: 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 msgid "Jim Meyering" msgstr "Jim Meyering" -#: src/chcon.c:100 src/runcon.c:203 src/runcon.c:234 +#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238 #, c-format msgid "failed to create security context: %s" msgstr "turvakonteksti loomine ebaõnnestus: %s" @@ -1124,8 +1121,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:540 src/copy.c:2222 src/runcon.c:217 -#: src/stat.c:683 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221 +#: src/stat.c:702 #, c-format msgid "failed to get security context of %s" msgstr "%s turvakonteksti lugemine ebaõnnestus" @@ -1141,12 +1138,12 @@ 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:446 src/ls.c:2981 +#: src/du.c:457 src/ls.c:2981 #, 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:426 +#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437 #, c-format msgid "cannot read directory %s" msgstr "kataloogi %s ei õnnestu lugeda" @@ -1156,13 +1153,13 @@ 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:599 +#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562 #, 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:618 -#: src/remove.c:613 +#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642 +#: src/remove.c:576 #, c-format msgid "fts_close failed" msgstr "fts_close ebaõnnestus" @@ -1184,13 +1181,11 @@ msgid "" "Change the security context of each FILE to CONTEXT.\n" "With --reference, change the security context of each FILE to that of " "RFILE.\n" -"\n" msgstr "" "Sea igale failile turvakontekst.\n" "Võtmega --reference, sea igale failile turvakontekst viidatud faili järgi.\n" -"\n" -#: src/chcon.c:362 src/chgrp.c:123 src/chown.c:94 +#: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94 msgid "" " --dereference affect the referent of each symbolic link (this is\n" " the default), rather than the symbolic link itself\n" @@ -1202,7 +1197,7 @@ msgstr "" " mitte nimeviidet ennast\n" " -h, --no-dereference muuda nimeviidet, mitte viidatavat\n" -#: src/chcon.c:367 +#: src/chcon.c:369 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" @@ -1215,7 +1210,15 @@ msgstr "" " -l, --range=VAHEMIK määra turvakonteksti vahemik\n" "\n" -#: src/chcon.c:373 +#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 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 ära käsitle '/' eriliselt (vaikimisi)\n" +" --preserve-root ära töötle '/' rekursiivselt\n" + +#: src/chcon.c:379 msgid "" " --reference=RFILE use RFILE's security context rather than " "specifying\n" @@ -1223,15 +1226,15 @@ msgid "" msgstr "" " --reference=VFAIL kasuta esitatud konteksti asemel VFAIL konteksti\n" -#: src/chcon.c:377 src/chgrp.c:140 src/chown.c:118 +#: 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 töötle faile ja katalooge rekursiivselt\n" -#: src/chcon.c:380 +#: src/chcon.c:386 msgid " -v, --verbose output a diagnostic for every file processed\n" msgstr " -v, --verbose väljasta infot iga töödeldava faili kohta\n" -#: src/chcon.c:383 src/chgrp.c:143 src/chown.c:121 +#: src/chcon.c:389 src/chgrp.c:143 src/chown.c:121 msgid "" "\n" "The following options modify how a hierarchy is traversed when the -R\n" @@ -1255,36 +1258,36 @@ msgstr "" " -P ära lahenda nimeviiteid (vaikimisi)\n" "\n" -#: src/chcon.c:512 src/chgrp.c:264 src/chown.c:267 +#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267 #, c-format msgid "-R --dereference requires either -H or -L" msgstr "-R --dereference nõuab kas -H või -L" -#: src/chcon.c:518 +#: src/chcon.c:524 #, c-format msgid "-R -h requires -P" msgstr "-R -h nõuab -P" -#: src/chcon.c:533 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282 -#: src/comm.c:429 src/csplit.c:1371 src/join.c:1149 src/link.c:79 -#: src/mknod.c:148 src/setuidgid.c:139 src/tr.c:1785 +#: 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 #, c-format msgid "missing operand after %s" msgstr "%s järel puudub operand" -#: src/chcon.c:556 src/runcon.c:247 +#: src/chcon.c:562 src/runcon.c:251 #, c-format msgid "invalid context: %s" msgstr "vigane kontekst: %s" -#: src/chcon.c:563 +#: src/chcon.c:569 #, c-format msgid "conflicting security context specifiers given" msgstr "anti konfliktne turvakontekst" -#: src/chcon.c:572 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:433 src/cp.c:493 -#: src/mv.c:96 src/pwd.c:273 src/rm.c:324 src/touch.c:351 +#: 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 #, c-format msgid "failed to get attributes of %s" msgstr "%s atribuutide lugemine ebaõnnestus" @@ -1331,14 +1334,6 @@ msgstr "" " (kasutatav süsteemides, kus saab muuta nimeviite\n" " omanikku)\n" -#: src/chgrp.c:132 src/chmod.c:387 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 ära käsitle '/' eriliselt (vaikimisi)\n" -" --preserve-root ära töötle '/' rekursiivselt\n" - #: src/chgrp.c:136 msgid "" " --reference=RFILE use RFILE's group rather than specifying a\n" @@ -1591,7 +1586,7 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:97 src/install.c:575 src/setuidgid.c:110 src/setuidgid.c:120 +#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120 #, c-format msgid "invalid group %s" msgstr "vigane grupp %s" @@ -1661,8 +1656,8 @@ msgstr "grupi ID seadmine ebaõnnestus" msgid "failed to set user-ID" msgstr "kasutaja ID seadmine ebaõnnestus" -#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:213 src/stdbuf.c:366 -#: src/timeout.c:402 +#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365 +#: src/timeout.c:454 #, c-format msgid "failed to run command %s" msgstr "käsklust %s ei saa käivitada" @@ -1780,20 +1775,24 @@ msgstr "kasutati mitut eraldajat" msgid "empty %s not allowed" msgstr "tühi %s pole lubatud" -#: src/copy.c:168 src/dd.c:1609 src/dd.c:1976 +#: 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 #, c-format -msgid "reading %s" -msgstr "loen %s" +msgid "error reading %s" +msgstr "viga %s lugemisel" -#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:426 +#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425 #, c-format msgid "cannot lseek %s" msgstr "lseek %s ei õnnestu" -#: src/copy.c:206 src/dd.c:2039 src/dd.c:2102 +#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151 #, c-format -msgid "writing %s" -msgstr "kirjutan %s" +msgid "error writing %s" +msgstr "viga %s kirjutamisel" #: src/copy.c:313 #, c-format @@ -1815,7 +1814,7 @@ msgstr "%s laiendamine ebaõnnestus" msgid "clearing permissions for %s" msgstr "puhastan %s õigused" -#: src/copy.c:697 src/copy.c:2470 src/cp.c:331 +#: src/copy.c:697 src/copy.c:2480 src/cp.c:329 #, c-format msgid "failed to preserve ownership for %s" msgstr "%s omanikku ei õnnestu säilitada" @@ -1830,14 +1829,14 @@ msgstr "ei õnnestu leida faili %s" msgid "failed to preserve authorship for %s" msgstr "%s autorit ei õnnestu säilitada" -#: src/copy.c:804 src/csplit.c:638 src/du.c:901 src/fmt.c:449 src/head.c:847 -#: src/sort.c:4489 src/split.c:1329 src/tail.c:1756 src/wc.c:678 +#: 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 "ei õnnestu avada %s lugemiseks" -#: src/copy.c:810 src/copy.c:972 src/dd.c:1546 src/dd.c:2114 src/dd.c:2252 -#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:141 +#: 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 #, c-format msgid "cannot fstat %s" msgstr "fstat %s ei õnnestu" @@ -1857,14 +1856,14 @@ msgstr "failisüsteemi loomise konteksti ei õnnestu lugeda" 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:1574 src/copy.c:1777 src/copy.c:1935 src/ln.c:314 -#: src/remove.c:267 src/remove.c:293 src/remove.c:444 src/remove.c:465 +#: 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 #, c-format msgid "cannot remove %s" msgstr "%s ei saa kustutada" -#: src/copy.c:886 src/copy.c:1578 src/copy.c:1772 src/copy.c:1940 -#: src/remove.c:418 +#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945 +#: src/remove.c:375 #, c-format msgid "removed %s\n" msgstr "%s eemaldatud\n" @@ -1884,188 +1883,188 @@ msgstr "ei õnnestu luua tavalist faili %s" msgid "failed to clone %s from %s" msgstr "%s kloonimine kloonitavast %s ebaõnnestus" -#: src/copy.c:1098 src/copy.c:2531 +#: src/copy.c:1098 src/copy.c:2541 #, c-format msgid "preserving times for %s" msgstr "jätan %s ajad muutmata" -#: src/copy.c:1170 src/copy.c:1176 src/head.c:855 src/touch.c:175 -#: src/truncate.c:413 +#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172 +#: src/truncate.c:417 #, c-format -msgid "closing %s" -msgstr "sulgen %s" +msgid "failed to close %s" +msgstr "%s sulgemine ebaõnnestus" -#: src/copy.c:1466 +#: src/copy.c:1471 #, c-format msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? " msgstr "%s: kirjutan %s üle, kirjutan üle ka õigused %04lo (%s)? " -#: src/copy.c:1473 +#: src/copy.c:1478 #, c-format msgid "%s: overwrite %s? " msgstr "%s: kirjutan %s üle? " -#: src/copy.c:1542 +#: src/copy.c:1547 #, c-format msgid " (backup: %s)" msgstr " (varukoopia: %s)" -#: src/copy.c:1552 +#: src/copy.c:1557 #, c-format msgid "failed to restore the default file creation context" msgstr "vaikimisi faili loomise konteksti ei õnnestunud taastada" -#: src/copy.c:1584 +#: src/copy.c:1589 #, c-format msgid "cannot create hard link %s to %s" msgstr "ei õnnestu luua viidet %s -> %s" -#: src/copy.c:1637 src/copy.c:1689 src/copy.c:2272 src/copy.c:2589 +#: 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:1220 src/truncate.c:365 +#: src/stat.c:1239 src/truncate.c:363 #, c-format msgid "cannot stat %s" msgstr "stat %s ei õnnestu" -#: src/copy.c:1645 +#: src/copy.c:1650 #, c-format msgid "omitting directory %s" msgstr "jätan kataloogi %s vahele" -#: src/copy.c:1659 +#: src/copy.c:1664 #, c-format msgid "warning: source file %s specified more than once" msgstr "hoiatus: lähtefail %s on esitatur enam kui korra" -#: src/copy.c:1707 src/ln.c:246 +#: src/copy.c:1712 src/ln.c:246 #, c-format msgid "%s and %s are the same file" msgstr "%s ja %s on üks ja sama fail" -#: src/copy.c:1806 +#: src/copy.c:1811 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "ei saa üle kirjutada mitte-katataloogi %s kataloogiga %s" -#: src/copy.c:1824 src/ln.c:214 +#: src/copy.c:1829 src/ln.c:214 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "ei kirjuta üle just loodud faili %s failiga %s" -#: src/copy.c:1842 +#: src/copy.c:1847 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "kataloogi %s ei saa üle kirjutada mitte kataloogiga" -#: src/copy.c:1856 +#: src/copy.c:1861 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "kataloogi ei saa tõsta mitte-kataloogi: %s -> %s" -#: src/copy.c:1886 +#: src/copy.c:1891 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "%s varundamine hävitaks allika; %s ei teisaldatud" -#: src/copy.c:1887 +#: src/copy.c:1892 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "%s varundamine hävitaks allika; %s ei kopeeritud" -#: src/copy.c:1910 src/ln.c:276 +#: src/copy.c:1915 src/ln.c:276 #, c-format msgid "cannot backup %s" msgstr "ei õnnestu luua %s varukoopiat" -#: src/copy.c:1974 +#: src/copy.c:1979 #, 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:2051 +#: src/copy.c:2056 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "kataloogi %s ei saa iseendasse, %s, kopeerida" -#: src/copy.c:2068 +#: src/copy.c:2073 #, c-format msgid "will not create hard link %s to directory %s" msgstr "ei loo viidet %s kataloogile %s" -#: src/copy.c:2118 +#: src/copy.c:2123 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "%s ei saa tõsta iseenda alamkataloogi %s" -#: src/copy.c:2161 +#: src/copy.c:2166 #, c-format msgid "cannot move %s to %s" msgstr "ei õnnestu tõsta %s -> %s" -#: src/copy.c:2173 +#: src/copy.c:2178 #, 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:2207 src/install.c:905 src/mkdir.c:189 src/mkfifo.c:114 -#: src/mknod.c:167 +#: 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:2241 +#: src/copy.c:2246 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "tsüklilist nimeviita %s ei õnnestu kopeerida" -#: src/copy.c:2350 +#: src/copy.c:2355 #, 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:2357 +#: src/copy.c:2362 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "ei õnnestu luua nimeviidet %s -> %s" -#: src/copy.c:2406 src/mkfifo.c:133 +#: src/copy.c:2416 src/mkfifo.c:132 #, c-format msgid "cannot create fifo %s" msgstr "ei õnnestu luua fifot %s" -#: src/copy.c:2415 +#: src/copy.c:2425 #, c-format msgid "cannot create special file %s" msgstr "ei õnnestu luua seadmefaili %s" -#: src/copy.c:2426 src/ls.c:3191 src/stat.c:902 +#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921 #, c-format msgid "cannot read symbolic link %s" msgstr "ei õnnestu lugeda nimeviidet %s" -#: src/copy.c:2453 +#: src/copy.c:2463 #, c-format msgid "cannot create symbolic link %s" msgstr "ei õnnestu luua nimeviidet %s" -#: src/copy.c:2485 +#: src/copy.c:2495 #, c-format msgid "%s has unknown file type" msgstr "%s on tundmatut tüüpi fail" -#: src/copy.c:2629 src/ln.c:358 +#: src/copy.c:2644 src/ln.c:358 #, c-format msgid "cannot un-backup %s" msgstr "%s ei saa taastada" -#: src/copy.c:2633 +#: src/copy.c:2648 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (taastamine)\n" -#: src/cp.c:156 src/mv.c:284 +#: src/cp.c:156 src/mv.c:286 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -2077,27 +2076,10 @@ msgstr "" " või: %s [VÕTI]... -t KATALOOG ALG...\n" #: src/cp.c:162 -msgid "" -"Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" -"\n" -msgstr "" -"Kopeeri allikas sihtpunkti või kataloogi või mitu allikat kataloogi.\n" -"\n" - -#: src/cp.c:166 src/csplit.c:1458 src/cut.c:197 src/df.c:852 src/du.c:268 -#: src/expand.c:112 src/fmt.c:275 src/fold.c:75 src/head.c:115 -#: src/install.c:612 src/kill.c:86 src/ln.c:392 src/ls.c:4726 src/mkdir.c:61 -#: src/mkfifo.c:56 src/mknod.c:58 src/mv.c:294 src/nl.c:191 src/paste.c:445 -#: src/pr.c:2777 src/ptx.c:1825 src/shred.c:153 src/shuf.c:58 src/sort.c:399 -#: src/split.c:211 src/stdbuf.c:95 src/tac.c:142 src/tail.c:268 -#: src/touch.c:226 src/truncate.c:107 src/unexpand.c:122 src/uniq.c:145 -msgid "" -"Mandatory arguments to long options are mandatory for short options too.\n" -msgstr "" -"Kohustuslikud argumendid pikkadele võtmetele on kohustuslikud ka " -"lühikestele.\n" +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:169 +#: src/cp.c:168 msgid "" " -a, --archive same as -dR --preserve=all\n" " --attributes-only don't copy the file data, just the " @@ -2119,26 +2101,28 @@ msgstr "" "sisu\n" " -d sama kui --no-dereference --preserve=links\n" -#: src/cp.c:178 +#: src/cp.c:177 msgid "" " -f, --force if an existing destination file cannot be\n" -" opened, remove it and try again (redundant " -"if\n" -" the -n option is used)\n" +" opened, remove it and try again (this " +"option\n" +" is ignored when the -n option is also " +"used)\n" " -i, --interactive prompt before overwrite (overrides a previous " "-n\n" " option)\n" " -H follow command-line symbolic links in SOURCE\n" msgstr "" " -f, --force kui olemasolevat sihtfaili ei saa avada,\n" -" eemalda see ja proovi uuesti (kasutu -n " -"võtmega)\n" -" -i, --interactive küsi enne ülekirjutamist (muudab eelmise -i\n" -" võtme kehtetuks)\n" +" eemalda see ja proovi uuesti (ignoreeritakse\n" +" kui võti -n on kasutusel)\n" +" -i, --interactive küsi enne ülekirjutamist (kirjutab eelmise -" +"n\n" +" võtme üle)\n" " -H järgi käsureal antud nimeviiteid " "kopeeritavas\n" -#: src/cp.c:188 +#: src/cp.c:186 msgid "" " -l, --link hard link files instead of copying\n" " -L, --dereference always follow symbolic links in SOURCE\n" @@ -2146,7 +2130,7 @@ msgstr "" " -l, --link kopeerimise asemel loo viited\n" " -L, --dereference järgi alati nimeviited kopeeritavas\n" -#: src/cp.c:192 +#: src/cp.c:190 msgid "" " -n, --no-clobber do not overwrite an existing file (overrides\n" " a previous -i option)\n" @@ -2156,7 +2140,7 @@ msgstr "" " kehtetuks eelmise -i võtme)\n" " -P, --no-dereference ära kunagi järgi nimeviiteid kopeeeritavas\n" -#: src/cp.c:197 +#: src/cp.c:195 msgid "" " -p same as --preserve=mode,ownership,timestamps\n" " --preserve[=ATTR_LIST] preserve the specified attributes (default:\n" @@ -2172,7 +2156,7 @@ msgstr "" " täiendavad atribuudid: context, links, xattr, " "all\n" -#: src/cp.c:205 +#: src/cp.c:203 msgid "" " --no-preserve=ATTR_LIST don't preserve the specified attributes\n" " --parents use full source file name under DIRECTORY\n" @@ -2180,7 +2164,7 @@ msgstr "" " --no-preserve=ATR_LOEND ära säilita antud atribuute\n" " --parents lisa allika tee kataloogi ette\n" -#: src/cp.c:209 +#: src/cp.c:207 msgid "" " -R, -r, --recursive copy directories recursively\n" " --reflink[=WHEN] control clone/CoW copies. See below\n" @@ -2193,7 +2177,7 @@ msgstr "" " --remove-destination eemalda iga sihtfail enne selle avamist\n" " (vastupidiselt võtmele --force)\n" -#: src/cp.c:215 +#: src/cp.c:213 msgid "" " --sparse=WHEN control creation of sparse files. See below\n" " --strip-trailing-slashes remove any trailing slashes from each " @@ -2205,7 +2189,7 @@ msgstr "" "nime\n" " lõpus olevad kaldkriipsud\n" -#: src/cp.c:220 +#: src/cp.c:218 msgid "" " -s, --symbolic-link make symbolic links instead of copying\n" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -2218,7 +2202,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:226 +#: src/cp.c:224 msgid "" " -u, --update copy only when the SOURCE file is newer\n" " than the destination file or when the\n" @@ -2231,7 +2215,7 @@ msgstr "" " -v, --verbose selgita, mis toimub\n" " -x, --one-file-system püsi selles failisüsteemis\n" -#: src/cp.c:235 +#: src/cp.c:233 msgid "" "\n" "By default, sparse SOURCE files are detected by a crude heuristic and the\n" @@ -2259,7 +2243,7 @@ msgstr "" "kopeerimine ebaõnnestub, või kui kasutati --reflink=auto, siis kasutatakse\n" "tavalist kopeerimist.\n" -#: src/cp.c:247 src/install.c:649 src/ln.c:421 src/mv.c:321 +#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322 msgid "" "\n" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -2275,7 +2259,7 @@ msgstr "" "väärtused on järgnevad:\n" "\n" -#: src/cp.c:254 src/install.c:656 src/mv.c:328 +#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329 msgid "" " none, off never make backups (even if --backup is given)\n" " numbered, t make numbered backups\n" @@ -2287,7 +2271,7 @@ msgstr "" " existing, nil nummerdatud, kui neid on, muidu lihtne\n" " simple, never loo alati lihtsaid varukoopiaid\n" -#: src/cp.c:260 +#: src/cp.c:258 msgid "" "\n" "As a special case, cp makes a backup of SOURCE when the force and backup\n" @@ -2299,91 +2283,91 @@ msgstr "" "force ja backup ning ALLIKAS ja SIHT on sama nimi olemasoleval tavalisel\n" "failil.\n" -#: src/cp.c:319 +#: src/cp.c:317 #, c-format msgid "failed to preserve times for %s" msgstr "%s aegu ei õnnestu säilitada" -#: src/cp.c:350 +#: src/cp.c:348 #, c-format msgid "failed to preserve permissions for %s" msgstr "%s õigusi ei õnnestu säilitada" -#: src/cp.c:477 +#: src/cp.c:475 #, c-format msgid "cannot make directory %s" msgstr "kataloogi %s ei õnnestu luua" -#: src/cp.c:526 src/cp.c:545 +#: src/cp.c:524 src/cp.c:543 #, c-format msgid "%s exists but is not a directory" msgstr "`%s' on olemas, aga ei ole kataloog" -#: src/cp.c:572 src/cp.c:1068 src/install.c:401 src/install.c:844 src/ln.c:123 -#: src/ln.c:181 src/ln.c:202 src/ln.c:516 src/mv.c:152 src/mv.c:399 +#: 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 #, c-format -msgid "accessing %s" -msgstr "kasutan %s" +msgid "failed to access %s" +msgstr "%s kasutamine ebaõnnestus" -#: src/cp.c:592 src/install.c:914 src/ln.c:546 src/mv.c:432 src/shred.c:1182 -#: src/touch.c:433 src/truncate.c:356 +#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181 +#: src/touch.c:429 src/truncate.c:354 #, c-format msgid "missing file operand" msgstr "argumentides puudub failinimi" -#: src/cp.c:594 src/install.c:916 src/ln.c:560 src/mv.c:434 +#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436 #, c-format msgid "missing destination file operand after %s" msgstr "%s järel puudub sihtfail" -#: src/cp.c:603 src/install.c:925 src/mv.c:443 +#: src/cp.c:601 src/install.c:926 src/mv.c:445 #, 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:619 src/cp.c:1070 src/install.c:403 src/install.c:846 -#: src/install.c:938 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:401 -#: src/mv.c:457 +#: 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 #, c-format msgid "target %s is not a directory" msgstr "antud siht, %s, ei ole kataloog" -#: src/cp.c:730 +#: src/cp.c:728 #, c-format msgid "with --parents, the destination must be a directory" msgstr "võtme --parents kasutamisel peab sihtkoht olema kataloog" -#: src/cp.c:1063 src/install.c:839 src/ln.c:511 src/mv.c:394 +#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395 #, c-format msgid "multiple target directories specified" msgstr "määrati mitu sihtkataloogi" -#: src/cp.c:1108 +#: src/cp.c:1110 #, c-format msgid "cannot make both hard and symbolic links" msgstr "ei õnnestu luua ei tavalist ega nimeviita" -#: src/cp.c:1115 src/mv.c:464 +#: src/cp.c:1117 src/mv.c:466 #, 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:1121 +#: src/cp.c:1123 #, c-format msgid "--reflink can be used only with --sparse=auto" msgstr "--reflink saab kasutada ainult võtmega --sparse=auto" -#: src/cp.c:1129 src/install.c:899 src/ln.c:582 src/mv.c:472 +#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474 msgid "backup type" msgstr "varukoopia tüüp" -#: src/cp.c:1154 +#: src/cp.c:1156 #, c-format msgid "cannot preserve security context without an SELinux-enabled kernel" msgstr "SELinux tuumata ei saa turvakonteksti säilitada" -#: src/cp.c:1160 +#: src/cp.c:1162 #, c-format msgid "cannot preserve extended attributes, cp is built without xattr support" msgstr "" @@ -2394,138 +2378,136 @@ msgstr "" msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:529 +#: src/csplit.c:531 #, c-format msgid "input disappeared" msgstr "sisend kadus" -#: src/csplit.c:658 src/csplit.c:669 +#: src/csplit.c:660 src/csplit.c:671 #, c-format msgid "%s: line number out of range" msgstr "%s: rea number on piirkonnast väljas" -#: src/csplit.c:698 +#: src/csplit.c:700 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: rea number on piirkonnast väljas" -#: src/csplit.c:701 src/csplit.c:750 +#: src/csplit.c:703 src/csplit.c:752 #, c-format msgid " on repetition %s\n" msgstr " %s kordamisel\n" -#: src/csplit.c:744 +#: src/csplit.c:746 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: sobivat ei leitud" -#: src/csplit.c:808 src/csplit.c:848 src/nl.c:359 src/tac.c:274 +#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273 #, c-format msgid "error in regular expression search" msgstr "viga regulaaravaldisega otsingul" -#: src/csplit.c:981 +#: src/csplit.c:983 #, c-format msgid "write error for %s" msgstr "viga %s kirjutamisel" -#: src/csplit.c:1057 +#: src/csplit.c:1059 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: eraldaja järel oodati täisarvu" -#: src/csplit.c:1073 +#: src/csplit.c:1075 #, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: korduste arvuga peab kasutama '}'" -#: src/csplit.c:1083 +#: src/csplit.c:1085 #, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: '{' ja '}' vahel peab olema täisarv" -#: src/csplit.c:1110 +#: src/csplit.c:1112 #, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: puudub sulgev eraldaja '%c'" -#: src/csplit.c:1127 +#: src/csplit.c:1129 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: vigane regulaaravaldis: %s" -#: src/csplit.c:1160 +#: src/csplit.c:1162 #, c-format msgid "%s: invalid pattern" msgstr "%s: vigane muster" -#: src/csplit.c:1163 +#: src/csplit.c:1165 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: rea number peab olema suurem kui null" -#: src/csplit.c:1169 +#: src/csplit.c:1171 #, 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:1175 +#: src/csplit.c:1177 #, 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:1253 +#: src/csplit.c:1255 #, c-format msgid "missing conversion specifier in suffix" msgstr "sufiksis puudub teisenduse määrang" -#: src/csplit.c:1259 +#: src/csplit.c:1261 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "vigane teisenduse määraja sufiksis: %c" -#: src/csplit.c:1262 +#: src/csplit.c:1264 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "vigane teisenduse määraja sufiksis: \\%.3o" -#: src/csplit.c:1267 +#: src/csplit.c:1269 #, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "vigased lipud teisenduse määrangus: %%%c%c" -#: src/csplit.c:1284 +#: src/csplit.c:1286 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "sufiksis on liiga palju %% teisenduse määranguid" -#: src/csplit.c:1298 +#: src/csplit.c:1300 #, c-format msgid "missing %% conversion specification in suffix" msgstr "sufiksis puudub %% teisenduse määrang" -#: src/csplit.c:1345 +#: src/csplit.c:1347 #, c-format msgid "%s: invalid number" msgstr "%s: vigane number" -#: src/csplit.c:1449 +#: src/csplit.c:1451 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Kasutamine: %s [VÕTI]... FAIL MUSTER...\n" -#: src/csplit.c:1453 +#: src/csplit.c:1455 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" -"\n" msgstr "" "Väljasta MUSTRI põhjal tükeldatud FAILi tükid failidesse 'xx01', " "'xx02', ...\n" "ja väljasta standardväljundisse iga osa suurus baitides.\n" -"\n" -#: src/csplit.c:1461 +#: src/csplit.c:1462 #, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2536,7 +2518,7 @@ msgstr "" " -f, --prefix=PREFIKS kasuta 'xx' asemel PREFIKS\n" " -k, --keep-files vigade korral jäta väljundfailid kustutamata\n" -#: src/csplit.c:1466 +#: src/csplit.c:1467 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" @@ -2546,7 +2528,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:1473 +#: src/csplit.c:1474 msgid "" "\n" "Read standard input if FILE is -. Each PATTERN may be:\n" @@ -2554,7 +2536,7 @@ msgstr "" "\n" "Kui FAIL on -, loe standardsisendit. Iga MUSTER võib olla:\n" -#: src/csplit.c:1477 +#: src/csplit.c:1478 msgid "" "\n" " INTEGER copy up to but not including specified line number\n" @@ -2581,7 +2563,7 @@ msgstr "" msgid "David M. Ihnat" msgstr "David M. Ihnat" -#: src/cut.c:64 +#: 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" @@ -2591,14 +2573,10 @@ msgid "Usage: %s OPTION... [FILE]...\n" msgstr "Kasutamine: %s VÕTI... [FAIL]...\n" #: src/cut.c:193 -msgid "" -"Print selected parts of lines from each FILE to standard output.\n" -"\n" -msgstr "" -"Väljasta igast FAIList valitud osad standardväljundisse.\n" -"\n" +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:200 +#: src/cut.c:199 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2608,7 +2586,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:205 +#: src/cut.c:204 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2620,7 +2598,7 @@ msgstr "" " välja arvatu juhul, kui kasutati võtit -s\n" " -n (ignoreerin)\n" -#: src/cut.c:211 +#: src/cut.c:210 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" @@ -2628,7 +2606,7 @@ msgstr "" " --complement täienda valitud baitide, sümbolite või väljade " "hulka.\n" -#: src/cut.c:215 +#: src/cut.c:214 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2638,7 +2616,7 @@ msgstr "" " --output-delimiter=SÕNE kasuta väljundis eraldajana SÕNE\n" " vaikimisi kasutatakse sisendi eraldajat\n" -#: src/cut.c:222 +#: src/cut.c:221 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2650,7 +2628,7 @@ msgstr "" "koosneb vahemikust või komadega eraldatud vahemikest. Valitud sisend\n" "kirjutatakse täpselt üks kord lugemise järjekorras.\n" -#: src/cut.c:228 +#: src/cut.c:227 msgid "" "Each range is one of:\n" "\n" @@ -2670,45 +2648,46 @@ msgstr "" "\n" "Kui FAIL puudub või on -, loeb standardsisendit.\n" -#: src/cut.c:368 src/cut.c:489 -msgid "invalid byte or field list" -msgstr "vigane baitide või väljade loend" +#: src/cut.c:367 src/cut.c:493 +msgid "invalid byte, character or field list" +msgstr "vigane baitide, sümbolite või väljade loend" -#: src/cut.c:385 +#: src/cut.c:387 msgid "invalid range with no endpoint: -" msgstr "vigane vahemik, lõpp puudub: -" -#: src/cut.c:399 +#: src/cut.c:403 msgid "invalid decreasing range" msgstr "vigane vähenev vahemik" -#: src/cut.c:478 +#: src/cut.c:482 #, c-format msgid "byte offset %s is too large" msgstr "baidi nihe %s on liiga suur" -#: src/cut.c:481 +#: src/cut.c:485 #, c-format msgid "field number %s is too large" msgstr "välja number %s on liiga suur" -#: src/cut.c:789 src/cut.c:797 +#: src/cut.c:795 src/cut.c:803 msgid "only one type of list may be specified" msgstr "lubatud on ainult sama tüüpi loend" -#: src/cut.c:806 +#: src/cut.c:812 src/numfmt.c:1408 +#, c-format msgid "the delimiter must be a single character" msgstr "eraldaja peab olema üks sümbol" -#: src/cut.c:841 +#: src/cut.c:847 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:844 +#: src/cut.c:850 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:848 +#: src/cut.c:854 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2716,11 +2695,11 @@ msgstr "" "eraldamata ridade blokeerimine omab mõtet ainult\n" "\tväljadega töötamise puhul" -#: src/cut.c:864 +#: src/cut.c:870 msgid "missing list of fields" msgstr "puudub väljade loend" -#: src/cut.c:866 +#: src/cut.c:872 msgid "missing list of positions" msgstr "puudub asukohtade loend" @@ -2734,9 +2713,11 @@ msgstr "" " või: %s [-u|--utc|--universal] [KKPPttmm[[SS]AA][.ss]]\n" #: src/date.c:128 +msgid "Display the current time in the given FORMAT, or set the system date.\n" +msgstr "Näita hetke aega antud vormingus või sea süsteemi aeg.\n" + +#: src/date.c:134 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" " -I[TIMESPEC], --iso-8601[=TIMESPEC] output date/time in ISO 8601 format.\n" @@ -2744,8 +2725,6 @@ msgid "" " 'hours', 'minutes', 'seconds', or 'ns' for date\n" " and time to the indicated precision.\n" msgstr "" -"Näita hetke aega vastavalt vormingule või sea süsteemi aeg.\n" -"\n" " -d, --date=SÕNE näita aega vastavalt sõnele, mitte 'now'\n" " -f, --file=FAIL nagu --date, sõned on failis eraldi ridadel\n" " -I[TIMESPEC], --iso-8601[=TIMESPEC] väljasta aeg in ISO 8601 vormingus.\n" @@ -2753,7 +2732,7 @@ msgstr "" " 'hours', 'minutes', 'seconds' või 'ns' määravad\n" " vastava täpsuse.\n" -#: src/date.c:138 +#: src/date.c:142 msgid "" " -r, --reference=FILE display the last modification time of FILE\n" " -R, --rfc-2822 output date and time in RFC 2822 format.\n" @@ -2763,7 +2742,7 @@ msgstr "" " -R, --rfc-2822 väljasta RFC-2822 ühilduv kuupäeva sõne\n" " Näiteks: Fri, 06 Aug 2010 14:15:31 +0300\n" -#: src/date.c:143 +#: src/date.c:147 msgid "" " --rfc-3339=TIMESPEC output date and time in RFC 3339 format.\n" " TIMESPEC='date', 'seconds', or 'ns' for\n" @@ -2778,7 +2757,7 @@ msgstr "" " -s, --set=SÕNE sea SÕNEga määratud aeg\n" " -u, --utc, --universal esita või sea koordineeritud universaalaeg\n" -#: src/date.c:154 +#: src/date.c:158 msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" @@ -2792,7 +2771,7 @@ msgstr "" " %% sümbol %\n" " %a lokaadi lühendatud nädalapäeva nimi (näiteks P)\n" -#: src/date.c:161 +#: src/date.c:165 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2805,7 +2784,7 @@ msgstr "" " %c lokaadi kuupäev ja aeg (nt. teisipäev, 25. juuni 2002. 12:11:55 " "EEST)\n" -#: src/date.c:167 +#: src/date.c:171 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2817,7 +2796,7 @@ msgstr "" " %D kuupäev, sama kui %m/%d/%y\n" " %e päev kuus, täiendatud tühikuga; sama kui %_d\n" -#: src/date.c:173 +#: src/date.c:177 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -2827,7 +2806,7 @@ msgstr "" " %g aasta 2-numbriga, mis vastab ISO nädala numbrile (vaata %G)\n" " %G aasta, mis vastab ISO nädala numbrile (vaata %V); kasutatav koos %V\n" -#: src/date.c:178 +#: src/date.c:182 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2839,7 +2818,7 @@ msgstr "" " %I tund (01..12)\n" " %j päev aastas (001..366)\n" -#: src/date.c:184 +#: src/date.c:188 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -2851,7 +2830,7 @@ msgstr "" " %m kuu (01..12)\n" " %M minut (00..59)\n" -#: src/date.c:190 +#: src/date.c:194 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2869,7 +2848,7 @@ msgstr "" " %R aeg, 24-tunni esitus (tt:mm)\n" " %s sekundeid alates `00:00:00 1970-01-01 UTC' (GNU laiendus)\n" -#: src/date.c:199 +#: src/date.c:203 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2881,7 +2860,7 @@ msgstr "" " %T aeg, sama kui %H:%M:%S\n" " %u nädalapäev (1..7); 1 esitab esmaspäeva\n" -#: src/date.c:205 +#: src/date.c:209 msgid "" " %U week number of year, with Sunday as first day of week (00..53)\n" " %V ISO week number, with Monday as first day of week (01..53)\n" @@ -2893,7 +2872,7 @@ msgstr "" " %w päev nädalas (0..6); 0 esitab pühapäeva\n" " %W nädala number aastas, esmaspäev nädala esimene (00..53)\n" -#: src/date.c:211 +#: src/date.c:215 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -2905,7 +2884,7 @@ msgstr "" " %y aasta kaks viimast numbrit (00..99)\n" " %Y aasta\n" -#: src/date.c:217 +#: src/date.c:221 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -2924,7 +2903,7 @@ msgstr "" "\n" "Vaikimisi täidab date numbriväljad nullidega.\n" -#: src/date.c:226 +#: src/date.c:230 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -2942,7 +2921,7 @@ msgstr "" " ^ kui võimalik, kasuta suurtähti\n" " # kui võimalik, kasuta vastupidi tähesuurust\n" -#: src/date.c:235 +#: src/date.c:239 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -2956,7 +2935,7 @@ msgstr "" "E et kasutada lokaadi alternatiivesitust või\n" "O et kasutada lokaadi alternatiivset numbrilist esitust\n" -#: src/date.c:242 +#: src/date.c:246 msgid "" "\n" "Examples:\n" @@ -2980,35 +2959,35 @@ 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:275 src/dd.c:2193 src/head.c:838 src/md5sum.c:477 -#: src/md5sum.c:798 src/od.c:863 src/od.c:1914 src/pr.c:1176 src/pr.c:1372 -#: src/pr.c:1494 src/stty.c:842 src/tac.c:563 src/tail.c:343 src/tee.c:126 +#: 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 #, c-format msgid "standard input" msgstr "standardsisend" -#: src/date.c:303 src/date.c:523 +#: src/date.c:307 src/date.c:527 #, c-format msgid "invalid date %s" msgstr "vigane kuupäev %s" -#: src/date.c:414 src/date.c:448 +#: src/date.c:418 src/date.c:452 #, c-format msgid "multiple output formats specified" msgstr "määrati mitu väljundvormingut" -#: src/date.c:426 +#: src/date.c:430 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "väljastatava ajaformaadi võtmed on üksteist välistavad" -#: src/date.c:433 +#: src/date.c:437 #, c-format msgid "the options to print and set the time may not be used together" msgstr "aja seadmise ja väljastamise võtmeid ei saa koos kasutada" -#: src/date.c:454 +#: src/date.c:458 #, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -3019,23 +2998,23 @@ msgstr "" "Kui soovite väljastada aega, peavad argumendid, mis ei ole võtmed,\n" "olema formaati määravad sümboliga '+' algavad sõned." -#: src/date.c:531 +#: src/date.c:535 #, c-format msgid "cannot set date" msgstr "kuupäeva ja kellaaega ei õnnestu seada" -#: src/date.c:554 src/du.c:360 +#: src/date.c:558 src/du.c:371 #, c-format msgid "time %s is out of range" msgstr "aeg %s on piirkonnast väljas" #. This is a proper name. See the gettext manual, section Names. -#: src/dd.c:44 src/factor.c:43 src/rm.c:41 src/tail.c:69 src/touch.c:41 +#: 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 "Paul Rubin" -#: src/dd.c:517 +#: src/dd.c:521 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3044,7 +3023,7 @@ msgstr "" "Kasutamine: %s [OPERAND]...\n" " või: %s VÕTI\n" -#: src/dd.c:522 +#: src/dd.c:526 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -3062,7 +3041,7 @@ msgstr "" " count=N kopeeri ainult N sisendplokki\n" " ibs=BAITI loe BAITI baiti korraga (vaikimisi: 512)\n" -#: src/dd.c:531 +#: src/dd.c:535 msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -3071,7 +3050,8 @@ msgid "" " oflag=FLAGS write as per the comma separated symbol list\n" " seek=N skip N obs-sized blocks at start of output\n" " skip=N skip N ibs-sized blocks at start of input\n" -" status=noxfer suppress transfer statistics\n" +" status=WHICH WHICH info to suppress outputting to stderr;\n" +" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" msgstr "" " if=FAIL loe standardsisendi asemel faili\n" " iflag=LIPUD loe vastavalt komadega eraldatud võtmetele\n" @@ -3080,12 +3060,14 @@ msgstr "" " oflag=LIPUD kirjuta vastavalt komadega eraldatud võtmetele\n" " seek=N jäta N obs mahus plokke väljundisse kirjutamata\n" " skip=N jäta N ibs mahus plokke sisendist lugemata\n" -" status=noxfer blokeeri ülekande statistika\n" +" status=MIS MIS infot standarveavoogu ei kirjutata;\n" +" 'noxfer' blokeerib ülekande statistika, 'none' blokeerib " +"kõik\n" -#: src/dd.c:541 +#: src/dd.c:546 msgid "" "\n" -"BLOCKS and BYTES may be followed by the following multiplicative suffixes:\n" +"N and BYTES may be followed by the following multiplicative suffixes:\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, and so on for T, P, E, Z, Y.\n" "\n" @@ -3093,7 +3075,7 @@ msgid "" "\n" msgstr "" "\n" -"PLOKID ja BAIDID võivad kasutada ka järgnevaid kordavaid sufikseid:\n" +"N ja BAIDID võivad kasutada ka järgnevaid kordavaid sufikseid:\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 ja nii edasi sümbolitele T, P, E, Z, " "Y.\n" @@ -3101,7 +3083,7 @@ msgstr "" "Iga VÕTMESÕNA võib olla:\n" "\n" -#: src/dd.c:550 +#: src/dd.c:555 msgid "" " ascii from EBCDIC to ASCII\n" " ebcdic from ASCII to EBCDIC\n" @@ -3127,7 +3109,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:563 +#: src/dd.c:568 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3143,7 +3125,7 @@ msgstr "" " fdatasync enne lõpetamist kindlusta andmete faili kirjutamine\n" " fsync nagu eelmine, aga kirjuta ka metainfo\n" -#: src/dd.c:571 +#: src/dd.c:576 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3157,75 +3139,75 @@ msgstr "" " append lisamise mood (omab mõtet ainult väljundil; soovitame " "conv=notrunc)\n" -#: src/dd.c:578 +#: src/dd.c:583 msgid " cio use concurrent I/O for data\n" msgstr " cio kasuta andmete käsitlemisel samaaegset S/V\n" -#: src/dd.c:580 +#: src/dd.c:585 msgid " direct use direct I/O for data\n" msgstr " direct kasuta andmete käsitlemisel puhverdamata S/V\n" -#: src/dd.c:582 +#: src/dd.c:587 msgid " directory fail unless a directory\n" msgstr " directory katkesta kui ei ole kataloog\n" -#: src/dd.c:584 +#: src/dd.c:589 msgid " dsync use synchronized I/O for data\n" msgstr " dsync kasuta andmete käsitlemisel sünkroonmoodi S/V\n" -#: src/dd.c:586 +#: src/dd.c:591 msgid " sync likewise, but also for metadata\n" msgstr " sync sama, aga ka metainfo korral\n" -#: src/dd.c:587 +#: src/dd.c:592 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr " fullblock kasuta sisendit täisblokkidena (ainult iflag)\n" -#: src/dd.c:590 +#: src/dd.c:595 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock kasuta mitteblokeeruvat S/V\n" -#: src/dd.c:592 +#: src/dd.c:597 msgid " noatime do not update access time\n" msgstr " noatime ära uuenda kasutamise aega\n" -#: src/dd.c:595 +#: src/dd.c:600 msgid " nocache discard cached data\n" msgstr " nocache ära kasuta puhverdatud andmeid\n" -#: src/dd.c:598 +#: src/dd.c:603 msgid " noctty do not assign controlling terminal from file\n" msgstr " noctty ei seosta kontrollivat terminali\n" -#: src/dd.c:601 +#: src/dd.c:606 msgid " nofollow do not follow symlinks\n" msgstr " nofollow ei järgi nimeviiteid\n" -#: src/dd.c:603 +#: src/dd.c:608 msgid " nolinks fail if multiply-linked\n" msgstr " nolinks katkesta, kui on viiteid\n" -#: src/dd.c:605 +#: src/dd.c:610 msgid " binary use binary I/O for data\n" msgstr " binary kasuta andmete käsitlemisel binaarmoodi\n" -#: src/dd.c:607 +#: src/dd.c:612 msgid " text use text I/O for data\n" msgstr " text kasuta andmete käsitlemisel tekstimoodi\n" -#: src/dd.c:609 +#: src/dd.c:614 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:612 +#: src/dd.c:617 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:615 +#: src/dd.c:620 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:620 +#: src/dd.c:625 #, c-format msgid "" "\n" @@ -3255,7 +3237,7 @@ msgstr "" "Võtmed on:\n" "\n" -#: src/dd.c:676 +#: src/dd.c:683 #, c-format msgid "" "%<PRIuMAX>+%<PRIuMAX> records in\n" @@ -3264,21 +3246,21 @@ msgstr "" "%<PRIuMAX>+%<PRIuMAX> kirjet sisse\n" "%<PRIuMAX>+%<PRIuMAX> kirjet välja\n" -#: src/dd.c:682 +#: src/dd.c:689 #, 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:694 +#: src/dd.c:701 #, 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:712 +#: src/dd.c:720 msgid "Infinity B" msgstr "Lõpmatu B" @@ -3292,83 +3274,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:725 +#: src/dd.c:733 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g s, %s/s\n" -#: src/dd.c:804 +#: src/dd.c:812 #, c-format msgid "closing input file %s" msgstr "sulgen sisendfaili %s" -#: src/dd.c:811 +#: src/dd.c:819 #, c-format msgid "closing output file %s" msgstr "sulgen väljundfaili %s" -#: src/dd.c:1014 +#: src/dd.c:1022 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "O_DIRECT välja lülitamine ebaõnnestus: %s" -#: src/dd.c:1085 src/dd.c:1934 +#: src/dd.c:1093 src/dd.c:1942 #, c-format msgid "writing to %s" msgstr "kirjutan faili %s" -#: src/dd.c:1199 src/dd.c:1253 +#: src/dd.c:1207 src/dd.c:1261 #, c-format msgid "unrecognized operand %s" msgstr "tundmatu operand %s" -#: src/dd.c:1210 +#: src/dd.c:1218 msgid "invalid conversion" msgstr "vigane teisendus" -#: src/dd.c:1213 src/dd.c:1289 +#: src/dd.c:1221 src/dd.c:1297 msgid "invalid input flag" msgstr "vigane sisendi lipp" -#: src/dd.c:1216 src/dd.c:1283 src/dd.c:1295 +#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303 msgid "invalid output flag" msgstr "vigane väljundi lipp" -#: src/dd.c:1219 +#: src/dd.c:1227 msgid "invalid status flag" msgstr "vigane oleku lipp" -#: src/dd.c:1258 src/truncate.c:312 +#: src/dd.c:1266 src/truncate.c:310 #, c-format msgid "invalid number %s" msgstr "vigane number %s" -#: src/dd.c:1340 +#: src/dd.c:1348 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "hulgast {ascii,ebcdic,ibm} ei saa ühtegi paari kasutada" -#: src/dd.c:1342 +#: src/dd.c:1350 #, c-format msgid "cannot combine block and unblock" msgstr "block ja unblock ei saa koos kasutada" -#: src/dd.c:1344 +#: src/dd.c:1352 #, c-format msgid "cannot combine lcase and ucase" msgstr "lcase ja ucase ei saa koos kasutada" -#: src/dd.c:1346 +#: src/dd.c:1354 #, c-format msgid "cannot combine excl and nocreat" msgstr "excl ja nocreat ei saa koos kasutada" -#: src/dd.c:1349 +#: src/dd.c:1357 #, c-format msgid "cannot combine direct and nocache" msgstr "direct ja nocache ei saa koos kasutada" -#: src/dd.c:1506 +#: src/dd.c:1514 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3377,72 +3359,72 @@ 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:1593 +#: src/dd.c:1601 #, c-format msgid "%s: cannot skip" msgstr "%s: skip ebaõnnestus" -#: src/dd.c:1595 src/dd.c:1614 src/dd.c:1675 +#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683 #, c-format msgid "%s: cannot seek" msgstr "%s: seek ebaõnnestus" -#: src/dd.c:1655 +#: src/dd.c:1663 #, c-format msgid "offset overflow while reading file %s" msgstr "failiviida ületäitumine %s lugemisel" -#: src/dd.c:1667 +#: src/dd.c:1675 #, c-format msgid "warning: invalid file offset after failed read" msgstr "hoiatus: peale lugemisviga ei pruugi failiviit olla õige" -#: src/dd.c:1671 +#: src/dd.c:1679 #, c-format msgid "cannot work around kernel bug after all" msgstr "ei õnnestu tuuma veast mööda minna" -#: src/dd.c:1814 +#: src/dd.c:1822 #, c-format msgid "setting flags for %s" msgstr "sean %s lipud" -#: src/dd.c:1867 +#: 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:1881 +#: 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:1914 +#: src/dd.c:1922 #, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: ei õnnestu liikuda antud nihkele" -#: src/dd.c:2125 src/dd.c:2258 +#: src/dd.c:2133 #, c-format -msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" -msgstr "%<PRIuMAX> baiti väljundfailis %s lühendamine ebaõnnestus" +msgid "failed to truncate to %<PRIdMAX> bytes in output file %s" +msgstr "%<PRIdMAX> baidini väljundfailis %s lühendamine ebaõnnestus" -#: src/dd.c:2138 +#: src/dd.c:2146 #, c-format msgid "fdatasync failed for %s" msgstr "fdatasync %s ebaõnnestus" -#: src/dd.c:2148 +#: src/dd.c:2156 #, c-format msgid "fsync failed for %s" msgstr "fsync %s ebaõnnestus" -#: src/dd.c:2199 src/dd.c:2228 +#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165 #, c-format -msgid "opening %s" -msgstr "avan %s" +msgid "failed to open %s" +msgstr "%s avamine ebaõnnestus" -#: src/dd.c:2237 +#: src/dd.c:2246 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) " @@ -3451,84 +3433,104 @@ msgstr "" "indeks on liiga suur: ei õnnestu lühendada pikkuseni seek=%<PRIuMAX> (%lu-" "baiti) blokki" -#: src/dd.c:2274 src/dd.c:2280 +#: src/dd.c:2267 +#, 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 #, 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:54 src/expr.c:153 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:39 src/sleep.c:35 src/sort.c:66 +#: 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 msgid "Paul Eggert" msgstr "Paul Eggert" -#: src/df.c:140 +#: src/df.c:172 msgid "Filesystem" msgstr "Failisüsteem" -#: src/df.c:141 +#: src/df.c:175 msgid "Type" msgstr "Tüüp" -#: src/df.c:142 +#: src/df.c:178 src/df.c:542 msgid "blocks" msgstr "blokke" -#: src/df.c:142 -msgid "Inodes" -msgstr "I-kirjeid" - -#: src/df.c:142 -msgid "Size" -msgstr "Maht" - -#: src/df.c:143 +#: src/df.c:181 msgid "Used" msgstr "Kasut" -#: src/df.c:143 -msgid "IUsed" -msgstr "IKasut" - -#: src/df.c:144 +#: src/df.c:184 msgid "Available" msgstr "Vaba" -#: src/df.c:144 -msgid "IFree" -msgstr "IVaba" - -#: src/df.c:144 -msgid "Avail" -msgstr "Vaba" - -#: src/df.c:145 +#: src/df.c:187 msgid "Use%" msgstr "Kas%" -#: src/df.c:145 +#: src/df.c:190 +msgid "Inodes" +msgstr "I-kirjeid" + +#: src/df.c:193 +msgid "IUsed" +msgstr "IKasut" + +#: src/df.c:196 +msgid "IFree" +msgstr "IVaba" + +#: src/df.c:199 msgid "IUse%" msgstr "IKas%" -#: src/df.c:145 +#: src/df.c:202 +msgid "Mounted on" +msgstr "Haagitud" + +#: src/df.c:383 +#, c-format +msgid "option --output: field '%s' unknown" +msgstr "võti --output: väli '%s' on tundmatu" + +#: src/df.c:390 +#, c-format +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 +msgid "Size" +msgstr "Maht" + +#: src/df.c:414 src/df.c:451 +msgid "Avail" +msgstr "Vaba" + +#: src/df.c:474 msgid "Capacity" msgstr "Maht" -#: src/df.c:146 -msgid "Mounted on" -msgstr "Haagitud" +#. 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 +#, c-format +msgid "%s-%s" +msgstr "%s-%s" -#: src/df.c:847 +#: src/df.c:1210 msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" -"\n" msgstr "" "Esita informatsioon failisüsteemidest, milles iga antud fail asub.\n" "Vaikimisi esita infot igast haagitud failisüsteemist.\n" -"\n" -#: src/df.c:855 +#: src/df.c:1217 msgid "" " -a, --all include dummy file systems\n" " -B, --block-size=SIZE scale sizes by SIZE before printing them. E.g.,\n" @@ -3550,7 +3552,7 @@ msgstr "" "2G)\n" " -H, --si sama, kui kasuta 1000 kordseid, mitte 1024\n" -#: src/df.c:865 +#: src/df.c:1227 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3563,8 +3565,11 @@ msgstr "" " -l, --local näita ainult lokaalseid failisüsteeme\n" " --no-sync enne info lugemist ära kasuta synci (vikimisi)\n" -#: src/df.c:872 +#: src/df.c:1234 msgid "" +" --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" +" or print all fields if FIELD_LIST is " +"omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" " -t, --type=TYPE limit listing to file systems of type TYPE\n" @@ -3572,6 +3577,7 @@ msgid "" " -x, --exclude-type=TYPE limit listing to file systems not of type TYPE\n" " -v (ignored)\n" msgstr "" +" --output[=VÄLJAD] väljasta kõik või ette antud väljad.\n" " -P, --portability kasuta POSIX väljundi vormingut\n" " --sync enne info lugemist käivita sync\n" " -t, --type=TÜÜP väljasta info antud tüüpi failisüsteemidest\n" @@ -3579,20 +3585,45 @@ msgstr "" " -x, --exclude-type=TÜÜP ära väljasta infot antud tüüpi failisüsteemidest\n" " -v (ignoreeritakse)\n" -#: src/df.c:1027 +#: src/df.c:1248 +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" +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" + +#: src/df.c:1285 +#, 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 #, 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:1075 +#: src/df.c:1500 msgid "Warning: " msgstr "Hoiatus: " -#: src/df.c:1077 src/stat.c:795 +#: src/df.c:1502 src/stat.c:814 msgid "cannot read table of mounted file systems" msgstr "ei õnnestu lugeda haagitud failisüsteemide tabelit" -#: src/df.c:1107 +#: src/df.c:1539 #, c-format msgid "no file systems processed" msgstr "ühtegi failisüsteemi ei töödeldud" @@ -3704,7 +3735,7 @@ msgstr "" " %s dir1/str dir2/str -> \"dir1\" millele järgneb \"dir2\" \n" " %s stdio.h -> \".\".\n" -#: src/du.c:260 src/sort.c:390 src/wc.c:112 +#: src/du.c:270 src/sort.c:394 src/wc.c:112 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3713,16 +3744,14 @@ msgstr "" "Kasutamine: %s [VÕTI]... [FAIL]...\n" " või: %s [VÕTI]... --files0-from=F\n" -#: src/du.c:264 -msgid "" -"Summarize disk usage of each FILE, recursively for directories.\n" -"\n" -msgstr "" -"Summeeri iga faili kettakasutus, kataloogid rekursiivselt.\n" -"\n" +#: src/du.c:274 +msgid "Summarize disk usage of each FILE, recursively for directories.\n" +msgstr "Summeeri iga faili kettakasutus, kataloogid rekursiivselt.\n" -#: src/du.c:271 +#: src/du.c:280 msgid "" +" -0, --null end each output line with 0 byte rather than " +"newline\n" " -a, --all write counts for all files, not just directories\n" " --apparent-size print apparent sizes, rather than disk usage; " "although\n" @@ -3730,6 +3759,7 @@ msgid "" " larger due to holes in ('sparse') files, internal\n" " fragmentation, indirect blocks, and the like\n" msgstr "" +" -0, --null eralda väljundread reavahetuse asemel baidiga 0\n" " -a, --all väljasta loendurid kõikidele failidele\n" " --apparent-size väljasta ketta kasutamise asemel nähtav suurus; " "kuigi\n" @@ -3739,7 +3769,7 @@ msgstr "" " misele fragmenteerumisele, kaudsetele blokkidele " "jms\n" -#: src/du.c:279 +#: src/du.c:289 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" @@ -3748,6 +3778,11 @@ msgid "" " -c, --total produce a grand total\n" " -D, --dereference-args dereference only symlinks that are listed on the\n" " command line\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 "" " -B, --block-size=MAHT kasuta määratud ploki suurust. Näiteks `-BM' " "väljastab\n" @@ -3758,8 +3793,13 @@ msgstr "" " -c, --total väljasta kogumaht\n" " -D, --dereference-args kasuta käsureal antud nimeviidete korral " "viidatavaid\n" +" -d, --max-depth=N väljasta kataloogi (võtme --all korral faili) " +"kogumaht\n" +" ainult kui see pole sügavam, kui N; --max-depth=0 " +"on\n" +" sama, kui --summarize\n" -#: src/du.c:288 +#: src/du.c:302 msgid "" " --files0-from=F summarize disk usage of the NUL-terminated file\n" " names specified in file F;\n" @@ -3767,63 +3807,43 @@ msgid "" " -H equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" --si like -h, but use powers of 1000 not 1024\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" -" --si sama, kui -h, aga kasuta 1024 asemel 1000 kordseid\n" -#: src/du.c:297 +#: src/du.c:310 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, --kilobytes sama, kui --block-size=1K\n" +" -L, --dereference järgi nimeviiteid\n" " -l, --count-links loenda viiteid eraldi failidena\n" " -m sama, kui --block-size=1M\n" -#: src/du.c:302 +#: src/du.c:316 msgid "" -" -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " "default)\n" -" -0, --null end each output line with 0 byte rather than " -"newline\n" " -S, --separate-dirs 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 kasuta nimeviidete korral viidatavaid\n" " -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" +" --si nagu -h, aga kasuta 1000 kordseid\n" " -s, --summarize väljasta iga argumendi kohta summa\n" -#: src/du.c:309 -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 jäta vahele kataloogid teistest failisüsteemidest\n" -" -X, --exclude-from=FAIL ära loenda failist loetud mustritega faile\n" -" --exclude=MUSTER ära loenda mustrile vastavaid faile\n" -" -d, --max-depth=N väljasta kataloogi summa (või faili, võtmega --all)\n" -" ainult juhul, kui see on N või vähem taset " -"sügavamal,\n" -" kui käsurea argument; --max-depth=0 on sama, kui\n" -" --summarize\n" - -#: src/du.c:318 +#: src/du.c:322 msgid "" +" -t, --threshold=SIZE exclude entries smaller than SIZE if positive,\n" +" or entries greater than SIZE if negative\n" " --time show time of the last modification of any file in " "the\n" " directory, or any of its subdirectories\n" @@ -3833,6 +3853,8 @@ msgid "" " full-iso, long-iso, iso, +FORMAT\n" " FORMAT is interpreted like 'date'\n" msgstr "" +" -t, --threshold=SUURUS positiivse väärtuse korral välista väiksemad,\n" +" negatiivse korral suuremad kui SUURUS.\n" " --time näita kataloogis ja selle alamkataloogides\n" " kõikide failide muutmise aega\n" " --time=SÕNA muutmise aja asemel näita üht järgnevaist:\n" @@ -3841,65 +3863,77 @@ msgstr "" " full-iso, long-iso, iso, +VORMING\n" " VORMING on sama mis 'date' käsu korral\n" -#: src/du.c:375 -#, fuzzy +#: src/du.c:333 +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 välista failist loetud mustritele vastavad " +"failid\n" +" --exclude=PATTERN välista mustrile vastavad failid\n" +" -x, --one-file-system ära mine muudesse failisüsteemidesse\n" + +#: src/du.c:386 msgid "Infinity" -msgstr "Lõpmatu B" +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:600 +#: src/du.c:624 #, c-format msgid "fts_read failed: %s" msgstr "fts_read ebaõnnestus: %s" -#: src/du.c:724 +#: src/du.c:780 #, c-format msgid "invalid maximum depth %s" msgstr "vigane maksimaalne sügavus %s" -#: src/du.c:817 +#: src/du.c:809 +#, c-format +msgid "invalid --threshold argument '-0'" +msgstr "vigane --threshold argument '-0'" + +#: src/du.c:887 #, c-format msgid "cannot both summarize and show all entries" msgstr "korraga ei saa summeerida ja näidata kõiki" -#: src/du.c:824 +#: src/du.c:894 #, 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:830 +#: src/du.c:900 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "hoiatus: summeerimine on konfliktne võtmega --max-depth=%lu" -#: src/du.c:896 src/sort.c:4479 src/wc.c:668 +#: src/du.c:966 src/sort.c:4533 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:949 src/md5sum.c:587 src/od.c:903 src/tac.c:239 src/tac.c:350 -#: src/tac.c:506 src/tac.c:586 src/wc.c:733 +#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 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:963 src/sort.c:4508 src/wc.c:747 +#: src/du.c:1040 src/sort.c:4562 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:980 src/du.c:988 src/wc.c:760 src/wc.c:768 +#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768 msgid "invalid zero-length file name" msgstr "vigane null-pikkusega faili nimi" -#: src/du.c:1007 src/head.c:149 src/head.c:262 src/head.c:334 src/head.c:538 -#: src/head.c:620 src/head.c:692 src/head.c:750 src/head.c:774 src/tail.c:412 -#: src/tail.c:500 src/tail.c:549 src/tail.c:642 src/tail.c:770 src/tail.c:818 -#: src/tail.c:855 src/tail.c:1782 src/tail.c:1812 src/uniq.c:395 -#, c-format -msgid "error reading %s" -msgstr "viga %s lugemisel" - -#: src/du.c:1010 src/ls.c:2649 src/wc.c:791 +#: src/du.c:1088 src/ls.c:2649 src/wc.c:791 msgid "total" msgstr "kokku" @@ -4001,20 +4035,20 @@ msgid "Usage: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n" msgstr "Kasutamine: %s [VÕTI]... [-] [NIMI=VÄÄRTUS]... [KÄSK [ARGUMENT]...]\n" #: src/env.c:55 +msgid "Set each NAME to VALUE in the environment and run COMMAND.\n" +msgstr "Sea keskkonnas iga NIMI=VÄÄRTUS ja käivita käsk.\n" + +#: src/env.c:61 msgid "" -"Set each NAME to VALUE in the environment and run COMMAND.\n" -"\n" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with 0 byte rather than newline\n" " -u, --unset=NAME remove variable from the environment\n" msgstr "" -"Sea iga keskkonnamuutuja NIMI väärtus ja käivita KÄSK.\n" -"\n" " -i, --ignore-environment alusta tühja keskkonnaga\n" " -0, --null lõpeta iga rida reavahetuse asemel baidiga 0\n" " -u, --unset=NIMI eemalda muutuja keskkonnast\n" -#: src/env.c:64 +#: src/env.c:68 msgid "" "\n" "A mere - implies -i. If no COMMAND, print the resulting environment.\n" @@ -4022,17 +4056,17 @@ msgstr "" "\n" "Ainult - rakendab võtme -i. Kui käsku ei ole antud, väljasta keskkond.\n" -#: src/env.c:120 +#: src/env.c:124 #, c-format msgid "cannot unset %s" msgstr "%s kustutamine ei õnnestu" -#: src/env.c:131 +#: src/env.c:135 #, c-format msgid "cannot set %s" msgstr "%s seadmine ei õnnestu" -#: src/env.c:148 +#: src/env.c:152 #, c-format msgid "cannot specify --null (-0) with command" msgstr "käsuga koos ei saa --null (-0) kasutada" @@ -4041,13 +4075,11 @@ msgstr "käsuga koos ei saa --null (-0) kasutada" msgid "" "Convert tabs in each FILE to spaces, writing to standard output.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" "Teisenda igas FAILIS tabulaatorid tühikuteks, väljasta standardväljundisse.\n" "Kui FAIL puudub või on -, loeb standardsisendit.\n" -"\n" -#: src/expand.c:115 +#: src/expand.c:114 msgid "" " -i, --initial do not convert tabs after non blanks\n" " -t, --tabs=NUMBER have tabs NUMBER characters apart, not 8\n" @@ -4056,34 +4088,34 @@ msgstr "" " -t, --tabs=NUMBER kasuta vaikimisi 8 asemel tabulaatoris NUMBER " "sümbolit\n" -#: src/expand.c:119 +#: src/expand.c:118 msgid "" " -t, --tabs=LIST use comma separated list of explicit tab positions\n" msgstr "" " -t, --tabs=LOEND kasuta komadega eraldatud loendit tab " "positsioonidest\n" -#: src/expand.c:172 src/unexpand.c:191 +#: src/expand.c:171 src/unexpand.c:190 #, c-format msgid "tab stop is too large %s" msgstr "tabulaatori peatus on liiga suur %s" -#: src/expand.c:180 src/unexpand.c:199 +#: src/expand.c:179 src/unexpand.c:198 #, c-format msgid "tab size contains invalid character(s): %s" msgstr "tabulaatori suurus sisaldab vigast sümbolit: %s" -#: src/expand.c:206 src/unexpand.c:225 +#: src/expand.c:205 src/unexpand.c:224 #, c-format msgid "tab size cannot be 0" msgstr "tabulaatori suurus ei saa olla 0" -#: src/expand.c:208 src/unexpand.c:227 +#: src/expand.c:207 src/unexpand.c:226 #, c-format msgid "tab sizes must be ascending" msgstr "tabulaatori suurused peavad olema kasvavad" -#: src/expand.c:326 src/expand.c:345 src/unexpand.c:374 src/unexpand.c:419 +#: 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 "sisendi rida on liiga pikk" @@ -4239,12 +4271,12 @@ msgstr "viga regulaaravaldisega otsingul" msgid "non-integer argument" msgstr "mitte-numbriline argument" -#: src/expr.c:793 src/truncate.c:316 +#: src/expr.c:793 src/truncate.c:314 #, c-format msgid "division by zero" msgstr "nulliga jagamine" -#: src/expr.c:887 src/sort.c:2029 +#: src/expr.c:887 src/sort.c:2044 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "probleemi lahendamiseks seadke LC_ALL=C." @@ -4254,25 +4286,32 @@ msgstr "probleemi lahendamiseks seadke LC_ALL=C." msgid "the strings compared were %s and %s" msgstr "võrreldi sõnesid %s ja %s" -#: src/factor.c:449 -msgid "using arbitrary-precision arithmetic" -msgstr "kasutan määramata täpsusega aritmeetikat" +#. This is a proper name. See the gettext manual, section Names. +#: src/factor.c:111 +msgid "Niels Moller" +msgstr "Niels Moller" -#: src/factor.c:460 -msgid "using single-precision arithmetic" -msgstr "kasutan \"single-precision\" aritmeetikat" +#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459 +#, c-format +msgid "Lucas prime test failure. This should not happen" +msgstr "Lucas algarvu testi tõrge. Seda et peaks juhtuma" -#: src/factor.c:465 src/od.c:1640 src/od.c:1709 +#: src/factor.c:2092 #, c-format -msgid "%s is too large" -msgstr "%s on liiga suur" +msgid "squfof queue overflow" +msgstr "squfof järjekorra ületäitumine" -#: src/factor.c:469 +#: src/factor.c:2419 #, c-format msgid "%s is not a valid positive integer" msgstr "%s ei ole korrektne positiivne täisarv" -#: src/factor.c:494 +#: src/factor.c:2442 src/od.c:1646 src/od.c:1715 +#, c-format +msgid "%s is too large" +msgstr "%s on liiga suur" + +#: src/factor.c:2454 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4281,7 +4320,7 @@ msgstr "" "Kasutamine: %s [NUMBER]...\n" " või: %s VÕTI\n" -#: src/factor.c:499 +#: src/factor.c:2459 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" @@ -4307,24 +4346,22 @@ msgid "cannot stat current directory (now %s)" msgstr "ei õnnestu lugeda jooksva kataloogi atribuute (nüüd %s)" #. This is a proper name. See the gettext manual, section Names. -#: src/fmt.c:37 +#: src/fmt.c:38 msgid "Ross Paterson" msgstr "Ross Paterson" -#: src/fmt.c:269 +#: src/fmt.c:270 #, c-format msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n" msgstr "Kasutamine: %s [-NUMBRID] [VÕTI]... [FAIL]...\n" -#: src/fmt.c:270 +#: 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" -"\n" msgstr "" "Vormista ümber iga lõik FAILides, kirjuta tulemus standardväljundisse.\n" "Võti -NUMBRID on lühivorm võtmest --width=NUMBRID.\n" -"\n" #: src/fmt.c:278 msgid "" @@ -4338,8 +4375,8 @@ msgstr "" " prefiks säilitatakse\n" " -s, --split-only tükelda pikad read, aga ära täida\n" -#: src/fmt.c:285 -#, fuzzy, c-format +#: src/fmt.c:287 +#, 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" @@ -4349,8 +4386,9 @@ msgstr "" " -t, --tagged-paragraph esimese rea taane on teise rea omast erinev\n" " -u, --uniform-spacing üks tühik sõnade vahel, kaks lausete vahel\n" " -w, --width=NUMBER maksimaalne rea pikkus (vaikimisi 75 veergu)\n" +" -g, --goal=NUMBER eelistatav laius (vaikimisi 93% rea pikkusest)\n" -#: src/fmt.c:357 +#: src/fmt.c:359 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -4359,7 +4397,7 @@ msgstr "" "vigane võti -- %c; -NUMBRID tuntakse ainult juhul, kui see on esimene võti;\n" "kasutage parem -w N" -#: src/fmt.c:403 src/fmt.c:414 +#: src/fmt.c:405 src/fmt.c:416 #, c-format msgid "invalid width: %s" msgstr "vigane laius: %s" @@ -4368,13 +4406,11 @@ msgstr "vigane laius: %s" msgid "" "Wrap input lines in each FILE (standard input by default), writing to\n" "standard output.\n" -"\n" msgstr "" "Murra iga FAILI (vaikimisi standardsisend) rida, väljasta " "standardväljundisse.\n" -"\n" -#: src/fold.c:78 +#: src/fold.c:77 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4384,13 +4420,13 @@ msgstr "" " -s, --spaces poolita tühikute kohal\n" " -w, --width=LAIUS kasuta 80 asemel use LAIUS sümbolit\n" -#: src/fold.c:289 src/pr.c:836 +#: src/fold.c:288 src/pr.c:832 #, c-format 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:75 +#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 #: src/truncate.c:37 msgid "Padraig Brady" msgstr "Padraig Brady" @@ -4409,17 +4445,17 @@ msgstr "" "kujul.\n" "\n" -#: src/group-list.c:69 src/id.c:345 src/setuidgid.c:184 +#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184 #, 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:350 +#: src/group-list.c:74 src/id.c:370 #, c-format msgid "failed to get groups for the current process" msgstr "jooksva protsessi gruppide lugemine ebaõnnestus" -#: src/group-list.c:104 +#: src/group-list.c:114 #, c-format msgid "cannot find name for group ID %lu" msgstr "ei leia GID %lu vastavat gruppi" @@ -4463,14 +4499,12 @@ 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" -"\n" msgstr "" "Väljasta igast FAIList esimesed 10 rida standardväljundisse.\n" "Enam, kui ühe faili korral lisa ka päis faili nimega.\n" "Kui FAIL puudub või on -, loe standardsisendit.\n" -"\n" -#: src/head.c:118 +#: src/head.c:117 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -4486,7 +4520,7 @@ msgstr "" " kui ees on '-', väljasta igast failist kõik,\n" " välja arvatud viimased K rida\n" -#: src/head.c:126 +#: src/head.c:125 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4494,7 +4528,7 @@ msgstr "" " -q, --quiet, --silent ära väljasta päiseid failide nimega\n" " -v, --verbose väljasta alati ka päis faili nimega\n" -#: src/head.c:132 +#: src/head.c:131 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -4506,58 +4540,58 @@ 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:152 -#, c-format -msgid "error writing %s" -msgstr "viga %s kirjutamisel" - -#: src/head.c:155 +#: src/head.c:154 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: fail on liiga palju lühenenud" -#: src/head.c:228 src/head.c:1044 +#: src/head.c:227 src/head.c:1051 #, c-format msgid "%s: number of bytes is too large" msgstr "%s: baitide arv on liiga suur" -#: src/head.c:441 +#: 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:613 src/head.c:684 src/tail.c:450 +#: src/head.c:612 src/head.c:691 src/tail.c:449 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: ei õnnestu liikuda nihkele %s" -#: src/head.c:791 +#: src/head.c:673 +#, 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" -#: src/head.c:878 +#: src/head.c:885 #, 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:879 +#: src/head.c:886 msgid "number of lines" msgstr "ridu" -#: src/head.c:879 +#: src/head.c:886 msgid "number of bytes" msgstr "baite" -#: src/head.c:886 src/tail.c:1947 +#: src/head.c:893 src/tail.c:1947 msgid "invalid number of lines" msgstr "vigane ridade arv" -#: src/head.c:887 src/tail.c:1948 +#: src/head.c:894 src/tail.c:1948 msgid "invalid number of bytes" msgstr "vigane baitide arv" -#: src/head.c:974 src/head.c:1032 +#: src/head.c:981 src/head.c:1039 #, c-format msgid "invalid trailing option -- %c" msgstr "vigane võti lõpus -- %c" @@ -4673,86 +4707,86 @@ msgstr "protsessi konteksti ei õnnestu tuvastada" msgid "cannot get effective UID" msgstr "ei õnnestu lugeda efektiivset UID" -#: src/id.c:289 -#, fuzzy, c-format -msgid "cannot find name for user ID %lu" -msgstr "ei leia UID %lu vastavat kasutajanime" +#: src/id.c:311 +#, c-format +msgid "cannot find name for user ID %s" +msgstr "ei leia kasutaja ID %s vastavat kasutajanime" -#: src/id.c:309 -#, fuzzy, c-format -msgid "uid=%lu" -msgstr "uid=%lu" +#: src/id.c:329 +#, c-format +msgid "uid=%s" +msgstr "uid=%s" -#: src/id.c:314 -#, fuzzy, c-format -msgid " gid=%lu" -msgstr " egid=%lu" +#: src/id.c:334 +#, c-format +msgid " gid=%s" +msgstr " gid=%s" -#: src/id.c:321 -#, fuzzy, c-format -msgid " euid=%lu" -msgstr " egid=%lu" +#: src/id.c:341 +#, c-format +msgid " euid=%s" +msgstr " euid=%s" -#: src/id.c:329 +#: src/id.c:349 #, c-format -msgid " egid=%lu" -msgstr " egid=%lu" +msgid " egid=%s" +msgstr " egid=%s" -#: src/id.c:357 +#: src/id.c:377 msgid " groups=" msgstr " grupid=" -#: src/id.c:373 +#: src/id.c:393 #, c-format msgid " context=%s" msgstr " kontekst=%s" -#: src/install.c:372 +#: src/install.c:373 #, c-format msgid "warning: %s: failed to change context to %s" msgstr "hoiatus: %s: ei saa muuta kontekstiks %s" -#: src/install.c:413 +#: src/install.c:414 #, c-format msgid "creating directory %s" msgstr "loon kataloogi %s" -#: src/install.c:481 +#: src/install.c:482 #, c-format msgid "cannot change ownership of %s" msgstr "ei õnnestu muuta %s omanikku" -#: src/install.c:505 +#: src/install.c:506 #, c-format msgid "cannot set time stamps for %s" msgstr "ei õnnestu seada %s ajatempleid" -#: src/install.c:526 src/split.c:412 src/timeout.c:387 +#: src/install.c:527 src/split.c:426 src/timeout.c:439 #, c-format msgid "fork system call failed" msgstr "süsteemifunktsioon fork ebaõnnestus" -#: src/install.c:530 +#: src/install.c:531 #, c-format msgid "cannot run %s" msgstr "käsku %s ei saa käivitada" -#: src/install.c:534 +#: src/install.c:535 #, c-format msgid "waiting for strip" msgstr "ootan strip käsu lõpetamist" -#: src/install.c:536 +#: src/install.c:537 #, c-format msgid "strip process terminated abnormally" msgstr "strip protsess lõpetas veaga" -#: src/install.c:557 +#: src/install.c:558 #, c-format msgid "invalid user %s" msgstr "vigane kasutaja %s" -#: src/install.c:593 +#: src/install.c:594 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -4765,7 +4799,7 @@ msgstr "" " või: %s [VÕTI]... -t KATALOOG ALG...\n" " või: %s [VÕTI]... -d KATALOOG...\n" -#: src/install.c:600 +#: src/install.c:601 msgid "" "\n" "This install program copies files (often just compiled) into destination\n" @@ -4777,7 +4811,6 @@ msgid "" "In the first three forms, copy SOURCE to DEST or multiple SOURCE(s) to\n" "the existing DIRECTORY, while setting permission modes and owner/group.\n" "In the 4th form, create all components of the given DIRECTORY(ies).\n" -"\n" msgstr "" "\n" "See installi programm kopeerib (tihti just kompileeritud) failid valitud\n" @@ -4787,7 +4820,6 @@ msgstr "" "Esimesed kolm varianti kopeerivad allika sihtkohta või allikad\n" "olemasolevasse kataloogi seades õigused ja omaniku/grupi.\n" "Neljas variant loob antud kataloogi(d).\n" -"\n" #: src/install.c:615 msgid "" @@ -4857,56 +4889,56 @@ msgstr "" " -Z, --context=KONTEKST sea SELinux turvakontekst failidele ja " "kataloogidele\n" -#: src/install.c:858 +#: src/install.c:859 #, 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:868 +#: 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:885 +#: src/install.c:886 #, 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:888 +#: src/install.c:889 #, c-format msgid "target directory not allowed when installing a directory" msgstr "kataloogi installeerimisel ei saa sihtkataloogi määrata" -#: src/install.c:892 +#: 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:946 src/mkdir.c:202 src/stdbuf.c:327 +#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326 #, c-format msgid "invalid mode %s" msgstr "vigane mood %s" -#: src/install.c:953 +#: src/install.c:954 #, 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:958 +#: src/install.c:959 #, 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:965 +#: src/install.c:966 #, c-format msgid "options --compare (-C) and --strip are mutually exclusive" msgstr "parameetrid --compare (-C) ja --strip on üksteist välistavad" -#: src/install.c:971 +#: src/install.c:972 #, c-format msgid "" "the --compare (-C) option is ignored when you specify a mode with non-" @@ -4915,7 +4947,7 @@ msgstr "" "võtit --compare (-C) ignoreeritakse, kui te annate moodi õiguste bittideta" #. This is a proper name. See the gettext manual, section Names. -#: src/join.c:40 src/sort.c:65 +#: src/join.c:40 src/sort.c:66 msgid "Mike Haertel" msgstr "Mike Haertel" @@ -5009,8 +5041,8 @@ msgstr "" #: src/join.c:403 #, c-format -msgid "%s:%ju: is not sorted: %.*s" -msgstr "%s:%ju: ei ole järjestatud: %.*s" +msgid "%s:%<PRIuMAX>: is not sorted: %.*s" +msgstr "%s:%<PRIuMAX>: ei ole järjestatud: %.*s" #: src/join.c:840 src/join.c:1038 #, c-format @@ -5037,12 +5069,12 @@ msgstr "ühildamatud väljad %lu, %lu" msgid "conflicting empty-field replacement strings" msgstr "konfliktsed tühja-välja asendamise sõned" -#: src/join.c:1101 src/sort.c:4414 +#: src/join.c:1101 src/sort.c:4468 #, c-format msgid "multi-character tab %s" msgstr "mitme-sümboliline tabulaator %s" -#: src/join.c:1105 src/sort.c:4419 +#: src/join.c:1105 src/sort.c:4473 #, c-format msgid "incompatible tabs" msgstr "mitteühilduvad tabulaatorid" @@ -5064,14 +5096,10 @@ msgstr "" " või: %s -t [SIGNAAL]...\n" #: src/kill.c:82 -msgid "" -"Send signals to processes, or list signals.\n" -"\n" -msgstr "" -"Saada protsessidele signaale või esita signaalide nimekiri.\n" -"\n" +msgid "Send signals to processes, or list signals.\n" +msgstr "Saada protsessidele signaale või esita signaalide nimekiri.\n" -#: src/kill.c:89 +#: src/kill.c:88 msgid "" " -s, --signal=SIGNAL, -SIGNAL\n" " specify the name or number of the signal to be sent\n" @@ -5084,7 +5112,7 @@ msgstr "" " -l, --list Esita signaalide nimed või tõlgi nimeks/numbriks.\n" " -t, --table Väljasta tabel infoga signaalidest.\n" -#: src/kill.c:97 +#: src/kill.c:96 msgid "" "\n" "SIGNAL may be a signal name like 'HUP', or a signal number like '1',\n" @@ -5096,32 +5124,32 @@ msgstr "" "või signaaliga katkestatud programmi lõpetamise kood.\n" "PID on täisarv, negatiivne tähendab protsessi gruppi.\n" -#: src/kill.c:206 +#: src/kill.c:205 #, c-format msgid "%s: invalid process id" msgstr "%s: vigane protsessi id" -#: src/kill.c:260 +#: src/kill.c:259 #, c-format msgid "invalid option -- %c" msgstr "vigane võti -- %c" -#: src/kill.c:269 +#: src/kill.c:268 #, c-format msgid "%s: multiple signals specified" msgstr "%s: anti mitu signaali" -#: src/kill.c:283 +#: src/kill.c:282 #, c-format msgid "multiple -l or -t options specified" msgstr "kasutati mitud -l või -t võtit" -#: src/kill.c:300 +#: src/kill.c:299 #, c-format msgid "cannot combine signal with -l or -t" msgstr "signaali ei saa kombineerida võtmetega -l või -t" -#: src/kill.c:306 +#: src/kill.c:305 #, c-format msgid "no process ID specified" msgstr "puudub protsessi ID" @@ -5231,7 +5259,6 @@ msgid "" "When creating hard links, each TARGET must exist. Symbolic links\n" "can hold arbitrary text; if later resolved, a relative link is\n" "interpreted in relation to its parent directory.\n" -"\n" msgstr "" "Esimesel kujul loo viide antud nimele.\n" "Teisel kujul loo viide jooksvasse kataloogi.\n" @@ -5244,7 +5271,7 @@ msgstr "" "suhtelist\n" "viidet tema vanemkataloogi suhtes.\n" -#: src/ln.c:395 +#: src/ln.c:394 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -5266,7 +5293,7 @@ msgstr "" "luua)\n" " -f, --force eemalda olemasolevad sihtfailid\n" -#: src/ln.c:403 +#: src/ln.c:402 msgid "" " -i, --interactive prompt whether to remove destinations\n" " -L, --logical dereference TARGETs that are symbolic links\n" @@ -5284,7 +5311,7 @@ msgstr "" " -P, --physical loo viide nimeviitele\n" " -s, --symbolic loo viidete asemel nimeviited\n" -#: src/ln.c:412 +#: src/ln.c:411 msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" " -t, --target-directory=DIRECTORY specify the DIRECTORY in which to " @@ -5298,28 +5325,16 @@ 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:428 -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 varukoopiaid ei looda (isegi kui kasutati võtit --backup)\n" -" numbered, t loo nummerdatud varukoopiad\n" -" existing, nil nummerdatud, kui neid on, muidu lihtne\n" -" simple, never loo alati lihtsaid varukoopiaid\n" - -#: src/ln.c:435 +#: src/ln.c:433 #, 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" "Võti -s ignoreerib -L ja -P. Muidu, viimane võti kontrollib kuidas käituda\n" "nimeviidetega, kasutades vaikimisi %s.\n" -"\n" #: src/ln.c:554 #, c-format @@ -5387,7 +5402,7 @@ msgstr "eiran vigast laiuse kirjeldust keskkonnamuutujas COLUMNS: %s" 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:1976 +#: src/ls.c:1750 src/ptx.c:1975 #, c-format msgid "invalid line width: %s" msgstr "vigane rea laius: %s" @@ -5450,7 +5465,7 @@ msgstr "loen kataloogi %s" msgid "closing directory %s" msgstr "sulen kataloogi %s" -#: src/ls.c:3301 +#: src/ls.c:3302 #, c-format msgid "cannot compare file names %s and %s" msgstr "failide %s ja %s nimesid ei õnnestu võrrelda" @@ -5459,14 +5474,12 @@ msgstr "failide %s ja %s nimesid ei õnnestu võrrelda" msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" -"\n" msgstr "" "Esita infot failidest (vaikimisi jooksvas kataloogis).\n" "Kui ei ole kasutatud võtmeid -cftuvSUX ega --sort, järjesta väljund\n" "tähestikuliselt\n" -"\n" -#: src/ls.c:4729 +#: src/ls.c:4728 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -5480,7 +5493,7 @@ msgstr "" " -b, --escape väljasta mitte-esitatavad sümbolid\n" " C-style vormingus\n" -#: src/ls.c:4735 +#: src/ls.c:4734 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them. E." "g.,\n" @@ -5505,7 +5518,7 @@ msgstr "" "järgi\n" " muidu: järjesta ctime järgi, uusim esimesena\n" -#: src/ls.c:4745 +#: src/ls.c:4744 msgid "" " -C list entries by columns\n" " --color[=WHEN] colorize the output. WHEN defaults to " @@ -5526,7 +5539,7 @@ msgstr "" " lahenda nimeviiteid\n" " -D, --dired vorminda väljund Emacs dired moodile\n" -#: src/ls.c:4753 +#: src/ls.c:4752 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -5542,11 +5555,11 @@ msgstr "" " single-column -1, verbose -l, vertical -C\n" " --full-time nagu -l --time-style=full-iso\n" -#: src/ls.c:4761 +#: src/ls.c:4760 msgid " -g like -l, but do not list owner\n" msgstr " -g nagu -l, aga ei näita omanikku\n" -#: src/ls.c:4764 +#: src/ls.c:4763 msgid "" " --group-directories-first\n" " group directories before files.\n" @@ -5558,7 +5571,7 @@ msgstr "" " täienda võtmega --sort, aga --sort=none (-U)\n" " blokeerib grupeerimise\n" -#: src/ls.c:4770 +#: src/ls.c:4769 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" @@ -5570,7 +5583,7 @@ msgstr "" "2G)\n" " --si sama, kui kasuta 1000 kordseid, mitte 1024\n" -#: src/ls.c:4776 +#: src/ls.c:4775 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5591,7 +5604,7 @@ msgstr "" " --hide=MUSTER ära näita mustrile vastavaid elemente\n" " (-a või -A tühistab)\n" -#: src/ls.c:4786 +#: src/ls.c:4785 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -5609,7 +5622,7 @@ msgstr "" " -I, --ignore=MUSTER ära näita shelli mustrile vastavaid nimesid\n" " -k, --kibibytes kasuta 1024 baidiseid blokke\n" -#: src/ls.c:4796 +#: src/ls.c:4795 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5623,7 +5636,7 @@ msgstr "" " asemel infot viidatavast failist\n" " -m väljasta nimed komadega eraldatult\n" -#: src/ls.c:4804 +#: src/ls.c:4803 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. " @@ -5640,7 +5653,7 @@ msgstr "" " -o nagu -l, aga ära väljasta grupi infot\n" " -p, --indicator-style=slash lisa kataloogide nimedele lõppu /\n" -#: src/ls.c:4812 +#: src/ls.c:4811 msgid "" " -q, --hide-control-chars print ? instead of non graphic characters\n" " --show-control-chars show non graphic characters as-is (default\n" @@ -5660,7 +5673,7 @@ msgstr "" " literal, locale, shell, shell-always, c, " "escape\n" -#: src/ls.c:4821 +#: src/ls.c:4820 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -5671,7 +5684,7 @@ msgstr "" " -R, --recursive esita alamkataloogid rekursiivselt\n" " -s, --size väljasta iga faili suurus plokkides\n" -#: src/ls.c:4826 +#: src/ls.c:4825 msgid "" " -S sort by file size\n" " --sort=WORD sort by WORD instead of name: none -U,\n" @@ -5692,7 +5705,7 @@ msgstr "" "võtmena,\n" " kui kasutati --sort=time\n" -#: src/ls.c:4836 +#: src/ls.c:4835 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, +FORMAT.\n" @@ -5712,7 +5725,7 @@ msgstr "" " kasutatakse SONA ainult mitte-POSIX lokaadi\n" " muutmise aegade järjestamisel\n" -#: src/ls.c:4845 +#: src/ls.c:4844 msgid "" " -t sort by modification time, newest first\n" " -T, --tabsize=COLS assume tab stops at each COLS instead of 8\n" @@ -5721,7 +5734,7 @@ msgstr "" "esimesena\n" " -T, --tabsize=VEERGE sea tabulaatori pikkus (vaikimisi 8 veergu)\n" -#: src/ls.c:4849 +#: src/ls.c:4848 msgid "" " -u with -lt: sort by, and show, access time\n" " with -l: show access time and sort by name\n" @@ -5738,7 +5751,7 @@ msgstr "" "kataloogis\n" " -v järjesta versiooni järgi\n" -#: src/ls.c:4856 +#: src/ls.c:4855 msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" @@ -5753,7 +5766,7 @@ msgstr "" " -Z, --context väljasta iga faili kohta SELinux turvakontekst\n" " -1 väljasta üks nimi rea kohta\n" -#: src/ls.c:4866 +#: src/ls.c:4865 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5768,7 +5781,7 @@ msgstr "" "LS_COLORS mõjutab värviseadeid. Selle muutuja seadmiseks kasutage dircolors\n" "käsku.\n" -#: src/ls.c:4873 +#: src/ls.c:4872 msgid "" "\n" "Exit status:\n" @@ -5797,7 +5810,7 @@ msgstr "Scott Miller" msgid "David Madore" msgstr "David Madore" -#: src/md5sum.c:162 +#: src/md5sum.c:164 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -5810,34 +5823,38 @@ msgstr "" "Kui FAIL puudub või on -, loe standardsisendit.\n" "\n" -#: src/md5sum.c:172 +#: src/md5sum.c:174 msgid "" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr "" " -b, --binary loe binaarmoodis (vaikimisi, kui ei loeta tty stdin)\n" -#: src/md5sum.c:176 +#: src/md5sum.c:178 msgid " -b, --binary read in binary mode\n" msgstr " -b, --binary loe binaarmoodis\n" -#: src/md5sum.c:179 +#: src/md5sum.c:181 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr " -c, --check loe %s summad failidest ja kontrolli\n" -#: src/md5sum.c:183 +#: src/md5sum.c:184 +msgid " --tag create a BSD-style checksum\n" +msgstr " --tag loo BSD-stiilis kontrollsumma\n" + +#: src/md5sum.c:188 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" " -t, --text loe tekstimoodis (vaikimisi, kui kasutatakse " "terminali)\n" -#: src/md5sum.c:187 +#: src/md5sum.c:192 msgid " -t, --text read in text mode (default)\n" msgstr " -t, --text loe tekstimoodis (vaikimisi)\n" -#: src/md5sum.c:190 +#: src/md5sum.c:195 msgid "" "\n" "The following three options are useful only when verifying checksums:\n" @@ -5853,13 +5870,13 @@ msgstr "" " -w, --warn hoiata vigaselt vormindatud kontrollsummadest\n" "\n" -#: src/md5sum.c:198 +#: 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:203 +#: src/md5sum.c:208 #, c-format msgid "" "\n" @@ -5874,77 +5891,87 @@ 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:502 +#: src/md5sum.c:523 #, c-format msgid "%s: too many checksum lines" msgstr "%s: liiga palju kontrollsumma ridu" -#: src/md5sum.c:526 +#: src/md5sum.c:547 #, c-format msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line" msgstr "%s: %<PRIuMAX>: vigaselt vormindatud %s kontrollsumma rida" -#: src/md5sum.c:551 +#: src/md5sum.c:572 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: avamine või lugemine ebaõnnestus\n" -#: src/md5sum.c:574 +#: src/md5sum.c:595 msgid "FAILED" msgstr "EBAÕNNESTUS" -#: src/md5sum.c:576 +#: src/md5sum.c:597 msgid "OK" msgstr "OK" -#: src/md5sum.c:600 +#: src/md5sum.c:621 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "%s: korrektselt vormindatud %s kontrollsumma ridu pole" -#: src/md5sum.c:610 +#: src/md5sum.c:631 #, 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:618 +#: src/md5sum.c:639 #, 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:626 +#: src/md5sum.c:647 #, 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:704 +#: src/md5sum.c:760 +#, c-format +msgid "--tag does not support --text mode" +msgstr "--tag ei toeta --text moodi" + +#: src/md5sum.c:766 +#, 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 #, 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:712 +#: src/md5sum.c:781 #, 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:719 +#: src/md5sum.c:788 #, 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:726 +#: src/md5sum.c:795 #, 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:733 +#: src/md5sum.c:802 #, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "võtit --strict on mõtet kasutada ainult kontrollsummade kontrollimisel" @@ -5955,14 +5982,10 @@ msgid "Usage: %s [OPTION]... DIRECTORY...\n" msgstr "Kasutamine: %s [VÕTI]... KATALOOG...\n" #: src/mkdir.c:57 -msgid "" -"Create the DIRECTORY(ies), if they do not already exist.\n" -"\n" -msgstr "" -"Loo KATALOOGid, kui neid juba pole.\n" -"\n" +msgid "Create the DIRECTORY(ies), if they do not already exist.\n" +msgstr "Loo KATALOOGid, kui neid juba pole.\n" -#: src/mkdir.c:64 +#: src/mkdir.c:63 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" @@ -5976,7 +5999,7 @@ msgstr "" " -v, --verbose teavitab igast loodud kataloogist\n" " -Z, --context=CTX sea iga loodud kataloogi SELinux turvakontekstiks CTX\n" -#: src/mkdir.c:169 +#: src/mkdir.c:168 #, c-format msgid "created directory %s" msgstr "kataloog %s on loodud" @@ -5987,29 +6010,25 @@ msgid "Usage: %s [OPTION]... NAME...\n" msgstr "Kasutamine: %s [VÕTI]... NIMI...\n" #: src/mkfifo.c:52 -msgid "" -"Create named pipes (FIFOs) with the given NAMEs.\n" -"\n" -msgstr "" -"Loo antud NIMega torud (FIFOd).\n" -"\n" +msgid "Create named pipes (FIFOs) with the given NAMEs.\n" +msgstr "Loo antud NIMega torud (FIFOd).\n" -#: src/mkfifo.c:59 src/mknod.c:61 +#: src/mkfifo.c:58 src/mknod.c:60 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:62 +#: src/mkfifo.c:61 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" -#: src/mkfifo.c:122 src/mknod.c:128 +#: src/mkfifo.c:121 src/mknod.c:127 #, c-format msgid "invalid mode" msgstr "vigane mood" -#: src/mkfifo.c:127 src/mknod.c:133 +#: src/mkfifo.c:126 src/mknod.c:132 #, c-format msgid "mode must specify only file permission bits" msgstr "mood peab määrama ainult failiõigused" @@ -6020,18 +6039,14 @@ 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 -msgid "" -"Create the special file NAME of the given TYPE.\n" -"\n" -msgstr "" -"Loo antud NIMEga ja TÜÜPi seadmefail.\n" -"\n" +msgid "Create the special file NAME of the given TYPE.\n" +msgstr "Loo antud NIMEga ja TÜÜPi seadmefail.\n" -#: src/mknod.c:64 +#: 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:69 +#: src/mknod.c:68 msgid "" "\n" "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n" @@ -6046,7 +6061,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:76 +#: src/mknod.c:75 msgid "" "\n" " b create a block (buffered) special file\n" @@ -6058,41 +6073,41 @@ msgstr "" " c, u loo sümbolseade (puhverdamata)\n" " p loo FIFO\n" -#: src/mknod.c:151 +#: src/mknod.c:150 msgid "Special files require major and minor device numbers." msgstr "" "Seadmefailide loomisel peab olema määratud nii klassi, kui esindaja number." -#: src/mknod.c:161 +#: src/mknod.c:160 msgid "Fifos do not have major and minor device numbers." msgstr "Fifodel puuduvad seadme klassi ja esindaja numbrid." -#: src/mknod.c:177 +#: src/mknod.c:176 #, c-format msgid "block special files not supported" msgstr "blokkseadme faile ei toetata" -#: src/mknod.c:186 +#: src/mknod.c:185 #, c-format msgid "character special files not supported" msgstr "sümbolseadme faile ei toetata" -#: src/mknod.c:202 +#: src/mknod.c:201 #, c-format msgid "invalid major device number %s" msgstr "vigane seadme põhinumber %s" -#: src/mknod.c:207 +#: src/mknod.c:206 #, c-format msgid "invalid minor device number %s" msgstr "vigane seadme alamnumber %s" -#: src/mknod.c:212 +#: src/mknod.c:211 #, c-format msgid "invalid device %s %s" msgstr "vigane seade %s %s" -#: src/mknod.c:226 +#: src/mknod.c:225 #, c-format msgid "invalid device type %s" msgstr "vigane seadme tüüp %s" @@ -6175,60 +6190,56 @@ msgstr "" "näidatud\n" " kataloog või /tmp [mittesoovitatav]\n" -#: src/mktemp.c:222 +#: 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:228 +#: src/mktemp.c:229 #, c-format msgid "too many templates" msgstr "liiga palju maatrikseid" -#: src/mktemp.c:248 +#: src/mktemp.c:249 #, 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:273 src/split.c:1117 +#: src/mktemp.c:274 src/split.c:1130 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "vigane sufiks %s, sisaldab kataloogi eraldajat" -#: src/mktemp.c:278 +#: src/mktemp.c:279 #, c-format msgid "too few X's in template %s" msgstr "maatriks %s sisaldab liiga vähe X tähti" -#: src/mktemp.c:291 +#: src/mktemp.c:292 #, c-format msgid "invalid template, %s, contains directory separator" msgstr "vigane maatriks %s, sisaldab kataloogi eraldajaid" -#: src/mktemp.c:305 +#: src/mktemp.c:306 #, 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:325 +#: src/mktemp.c:326 #, c-format msgid "failed to create directory via template %s" msgstr "maatriksiga %s ei õnnestunud kataloogi luua" -#: src/mktemp.c:335 +#: src/mktemp.c:336 #, c-format msgid "failed to create file via template %s" msgstr "maatriksiga %s ei õnnestunud faili luua" -#: src/mv.c:290 -msgid "" -"Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" -"\n" -msgstr "" -"Nimeta fail ümber või tõsta argumendid antud kataloogi.\n" -"\n" +#: src/mv.c:292 +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:297 +#: src/mv.c:298 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -6249,7 +6260,7 @@ msgstr "" "Kui te annate enam kui ühe võtmetest -i, -f, -n, ainult viimane jääb " "kehtima.\n" -#: src/mv.c:306 +#: src/mv.c:307 msgid "" " --strip-trailing-slashes remove any trailing slashes from each " "SOURCE\n" @@ -6260,7 +6271,7 @@ msgstr "" " lõpus olevad kaldkriipsud\n" " -S, --suffix=SUFIKS määra varukoopia järelliide\n" -#: src/mv.c:311 +#: src/mv.c:312 msgid "" " -t, --target-directory=DIRECTORY move all SOURCE arguments into " "DIRECTORY\n" @@ -6286,33 +6297,33 @@ msgstr "Kasutamine: %s [VÕTI] [KÄSK [ARGUMENT]...]\n" #, c-format msgid "" "Run COMMAND with an adjusted niceness, which affects process scheduling.\n" -"With no COMMAND, print the current niceness. Nicenesses range from\n" -"%d (most favorable scheduling) to %d (least favorable).\n" -"\n" -" -n, --adjustment=N add integer N to the niceness (default 10)\n" +"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 "" "Käivita KÄSK muudetud prioriteediga.\n" "Kui käsku ei antud, väljasta kehtiv prioriteet.\n" "Sammude vahemik on %d (kõrgeim prioriteet) kuni %d (madalaim prioriteet).\n" -"\n" -" -n, --adjustment=N suurenda prioriteeti (vaikimisi 10 võrra)\n" -#: src/nice.c:168 +#: src/nice.c:82 +msgid " -n, --adjustment=N add integer N to the niceness (default 10)\n" +msgstr " -n, --adjustment=N liida prioriteedile number N (vaikimisi 10)\n" + +#: src/nice.c:172 #, c-format msgid "invalid adjustment %s" msgstr "vigane muudatus %s" -#: src/nice.c:177 +#: src/nice.c:181 #, c-format msgid "a command must be given with an adjustment" msgstr "koos parandusega peab olema antud käsk" -#: src/nice.c:184 src/nice.c:195 +#: src/nice.c:188 src/nice.c:199 #, c-format msgid "cannot get niceness" msgstr "prioriteeti ei õnnestu lugeda" -#: src/nice.c:201 +#: src/nice.c:205 #, c-format msgid "cannot set niceness" msgstr "prioriteeti ei õnnestu seada" @@ -6322,17 +6333,15 @@ msgstr "prioriteeti ei õnnestu seada" msgid "Scott Bartram" msgstr "Scott Bartram" -#: src/nl.c:186 +#: src/nl.c:179 msgid "" "Write each FILE to standard output, with line numbers added.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" "Väljasta iga FAIL standardväljundisse lisades reanumbrid.\n" "Kui FAIL puudub või on -, loe standardsisendit.\n" -"\n" -#: src/nl.c:194 +#: src/nl.c:186 msgid "" " -b, --body-numbering=STYLE use STYLE for numbering body lines\n" " -d, --section-delimiter=CC use CC for separating logical pages\n" @@ -6342,7 +6351,7 @@ msgstr "" " -d, --section-delimiter=SE kasuta loogiliste lehtede eraldamiseks SE\n" " -f, --footer-numbering=STIIL kasuta jaluste nummerdamisel STIILI\n" -#: src/nl.c:199 +#: src/nl.c:191 msgid "" " -h, --header-numbering=STYLE use STYLE for numbering header lines\n" " -i, --line-increment=NUMBER line number increment at each line\n" @@ -6360,7 +6369,7 @@ msgstr "" " -p, --no-renumber jätka reanumbreid järgmisel lehel\n" " -s, --number-separator=SÕNE lisa SÕNE peale (võimalikku) reanumbrit\n" -#: src/nl.c:207 +#: src/nl.c:199 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" @@ -6369,7 +6378,7 @@ msgstr "" "lehel\n" " -w, --number-width=NUMBER kasuta reanumbritele NUMBER veergu\n" -#: src/nl.c:213 +#: src/nl.c:205 msgid "" "\n" "By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC are\n" @@ -6382,7 +6391,7 @@ msgstr "" "sümboli asemel kasutatakse :. \\ esitamiseks kirjutage \\\\.\n" "STIIL on üks järgnevaist:\n" -#: src/nl.c:219 +#: src/nl.c:211 msgid "" "\n" " a number all lines\n" @@ -6413,54 +6422,47 @@ msgstr "" " rz paremale joondatud, eest täidetud nullidega\n" "\n" -#: src/nl.c:286 +#: src/nl.c:278 #, c-format msgid "line number overflow" msgstr "rea numbri ületäitumine" -#: src/nl.c:486 +#: src/nl.c:478 #, c-format msgid "invalid header numbering style: %s" msgstr "vigane päise nummerdamise stiil: %s" -#: src/nl.c:494 +#: src/nl.c:486 #, c-format msgid "invalid body numbering style: %s" msgstr "vigane keha nummerdamise stiil: %s" -#: src/nl.c:502 +#: src/nl.c:494 #, c-format msgid "invalid footer numbering style: %s" msgstr "vigane jaluse nummerdamise stiil: %s" -#: src/nl.c:511 +#: src/nl.c:503 #, c-format msgid "invalid starting line number: %s" msgstr "vigane alustamise rea number: %s" -#: src/nl.c:517 -#, c-format -msgid "WARNING: --page-increment is deprecated; use --line-increment instead" -msgstr "" -"HOIATUS: võti --page-increment on aegunud; kasutage selle asemel --line-" -"increment" - -#: src/nl.c:524 +#: src/nl.c:512 #, c-format msgid "invalid line number increment: %s" msgstr "vigane rea numbri samm: %s" -#: src/nl.c:536 +#: src/nl.c:524 #, c-format msgid "invalid number of blank lines: %s" msgstr "vigane tühjade ridade arv: %s" -#: src/nl.c:550 +#: src/nl.c:538 #, c-format msgid "invalid line number field width: %s" msgstr "vigane rea numbri välja laius: %s" -#: src/nl.c:569 +#: src/nl.c:557 #, c-format msgid "invalid line numbering format: %s" msgstr "vigane rea numbri vorming: %s" @@ -6509,11 +6511,6 @@ msgstr "standardsisendi muutmine mittekasutatavaks ebaõnnestus" msgid "ignoring input" msgstr "ignoreerin sisendit" -#: src/nohup.c:163 src/nohup.c:165 -#, c-format -msgid "failed to open %s" -msgstr "%s avamine ebaõnnestus" - #: src/nohup.c:175 #, c-format msgid "ignoring input and appending output to %s" @@ -6545,16 +6542,16 @@ msgid "failed to redirect standard error" msgstr "standard veavoo ümbersuunamine ebaõnnestus" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:32 +#: src/nproc.c:33 msgid "Giuseppe Scrivano" msgstr "Giuseppe Scrivano" -#: src/nproc.c:56 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 +#: src/nproc.c:57 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Kasutamine: %s [VÕTI]...\n" -#: src/nproc.c:57 +#: src/nproc.c:58 msgid "" "Print the number of processing units available to the current process,\n" "which may be less than the number of online processors\n" @@ -6564,7 +6561,7 @@ msgstr "" "võib olla võiksem kui hetkel töötavate protsessorite arv\n" "\n" -#: src/nproc.c:62 +#: src/nproc.c:63 msgid "" " --all print the number of installed processors\n" " --ignore=N if possible, exclude N processing units\n" @@ -6572,11 +6569,423 @@ msgstr "" " --all väljasta installeeritud protsessorite arv\n" " --ignore=N kui võimalik, välista N protsessorit\n" -#: src/nproc.c:106 +#: src/nproc.c:107 #, c-format 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 +msgid "Assaf Gordon" +msgstr "Assaf Gordon" + +#: src/numfmt.c:676 +#, c-format +msgid "value too large to be converted: '%s'" +msgstr "väärtus on teisendamiseks liiga suur: '%s'" + +#: src/numfmt.c:680 +#, c-format +msgid "invalid number: '%s'" +msgstr "vigane number: '%s'" + +#: src/numfmt.c:684 +#, c-format +msgid "rejecting suffix in input: '%s' (consider using --from)" +msgstr "ei kasuta sisendi sufiksit: '%s' (kaaluge --from kasutamist)" + +#: src/numfmt.c:688 +#, c-format +msgid "invalid suffix in input: '%s'" +msgstr "vigane sufiks sisendis: '%s'" + +#: src/numfmt.c:692 +#, c-format +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 +#, 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 +#, c-format +msgid "out of memory (requested %zu bytes)" +msgstr "mälu on otsas (küsiti %zu baiti)" + +#: src/numfmt.c:813 +#, c-format +msgid "Usage: %s [OPTION]... [NUMBER]...\n" +msgstr "Kasutamine: %s [VÕTI]... [NUMBER]...\n" + +#: src/numfmt.c:816 +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 +msgid " --debug print warnings about invalid input\n" +msgstr " --debug väljasta hoiatused vigase sisendi kohta\n" + +#: src/numfmt.c:823 +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 +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 +msgid "" +" --format=FORMAT use printf style floating-point FORMAT;\n" +" see FORMAT below for details\n" +msgstr "" +" --format=FORMAT kasuta printf stiilis ujukoma vormingut;\n" +" detailid leiate allpool\n" + +#: src/numfmt.c:833 +msgid "" +" --from=UNIT auto-scale input numbers to UNITs; default is " +"'none';\n" +" see UNIT below\n" +msgstr "" +" --from=UNIT määra sisendnumbritele ühiku suurus; vaikimisi " +"'none'\n" +" ühikute kirjeldus on allpool\n" + +#: src/numfmt.c:837 +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 +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 grupeeri numbrid kasutades lokaadi reegleid,\n" +" näiteks. 1,000,000\n" + +#: src/numfmt.c:844 +msgid "" +" --header[=N] print (without converting) the first N header lines;\n" +" N defaults to 1 if not specified\n" +msgstr "" +" --header[=N] väljastab (teisendamata) esimesed N päiserida\n" +" vaikimisi N on 1\n" + +#: src/numfmt.c:848 +msgid "" +" --invalid=MODE failure mode for invalid numbers: MODE can be:\n" +" abort (default), fail, warn, ignore\n" +msgstr "" +" --invalid=MOOD vigaste numbrite korral kasutatav reaktsioon, " +"väärtused:\n" +" abort (vaikimisi), fail, warn, ignore\n" + +#: src/numfmt.c:852 +msgid "" +" --padding=N pad the output to N characters; positive N will\n" +" right-align; negative N will left-align;\n" +" padding is ignored if the output is wider than N;\n" +" the default is to automatically pad if a " +"whitespace\n" +" is found\n" +msgstr "" +" --padding=N täida väljundnumbrid N sümbolini;\n" +" positiivne N joondatakse paremale; negatiivne N\n" +" joondatakse vasakule; kui väljund on laiem kui N,\n" +" täitmist ei toimu; vaikimisi täidetakse " +"automaatselt\n" +" juhul, kui leitakse tühemik\n" + +#: src/numfmt.c:859 +msgid "" +" --round=METHOD use METHOD for rounding when scaling; METHOD can be:\n" +" up, down, from-zero (default), towards-zero, " +"nearest\n" +msgstr "" +" --round=MEETOD skaleerimisel kasutatav ümardamise meetod; meetod " +"võib\n" +" olla: up, down, from-zero (vaikimisi), towards-" +"zero,\n" +" nearest\n" + +#: src/numfmt.c:863 +msgid "" +" --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" +" SUFFIX in input numbers\n" +msgstr "" +" --suffix=SUFIKS lisa väljundi numbritele sufiks ja luba " +"mittekohustuslik\n" +" sufiks sisendnumbritel\n" + +#: src/numfmt.c:867 +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 +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 +msgid "" +"\n" +"UNIT options:\n" +msgstr "" +"\n" +"Ühiku võtmed:\n" + +#: src/numfmt.c:880 +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 +msgid "" +" auto accept optional single/two letter suffix:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" +msgstr "" +" auto luba ühe/kahe sümbolilisi sufikseid:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" + +#: src/numfmt.c:889 +msgid "" +" si accept optional single letter suffix:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ...\n" +msgstr "" +" si luba ühe sümbolilist sufiksit:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ...\n" + +#: src/numfmt.c:894 +msgid "" +" iec accept optional single letter suffix:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ...\n" +msgstr "" +" iec luba ühe sümbolilist sufiksit:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ...\n" + +#: src/numfmt.c:899 +msgid "" +" iec-i accept optional two-letter suffix:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ...\n" +msgstr "" +" iec-i luba kahe sümbolilist sufiksit:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ...\n" + +#: src/numfmt.c:905 +#, 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" +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 negatiivne laiuse väärtus (%-10f) määrab väljundi vasakult\n" +"täitmise.\n" + +#: src/numfmt.c:912 +#, c-format +msgid "" +"\n" +"Exit status is 0 if all input numbers were successfully converted.\n" +"By default, %s will stop at the first conversion error with exit status 2.\n" +"With --invalid='fail' a warning is printed for each conversion error\n" +"and the exit status is 2. With --invalid='warn' each conversion error is\n" +"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" +"Lõpetamise kood on 0, kui kõik sisendi numbrid õnnestus edukalt teisendada.\n" +"Vaikimisi lõpetab %s esimese teisendamise vea peale koodiga 2.\n" +"Võtmega --invalid='fail' väljastatakse iga teisendamise vea korral hoiatus\n" +"ja lõpetamise kood on 2. Võtme --invalid='warn' korral väljastatakse\n" +"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 +#, c-format +msgid "" +"\n" +"Examples:\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" +msgstr "" +"\n" +"Näited:\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 +#, c-format +msgid "format %s has no %% directive" +msgstr "vormingus %s puudub %% direktiiv" + +#: src/numfmt.c:990 +#, c-format +msgid "invalid format %s (width overflow)" +msgstr "vigane vorming %s (laius on liiga suur)" + +#: src/numfmt.c:1007 src/seq.c:229 +#, c-format +msgid "format %s ends in %%" +msgstr "vormingu %s lõpus on %%" + +#: src/numfmt.c:1010 +#, c-format +msgid "invalid format %s, directive must be %%['][-][N]f" +msgstr "vigane vorming %s, direktiiv peab olema %%['][-][N]f" + +#: src/numfmt.c:1018 src/seq.c:236 +#, c-format +msgid "format %s has too many %% directives" +msgstr "vormingus %s on liiga palju %% direktiive" + +#: src/numfmt.c:1070 +#, c-format +msgid "invalid suffix in input '%s': '%s'" +msgstr "vigane sufiks sisendis '%s': '%s'" + +#: src/numfmt.c:1092 +#, 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 +#, 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 +#, c-format +msgid "large input value '%s': possible precision loss" +msgstr "suur sisendväärtus '%s': võimalik on täpsuse kadu" + +#: src/numfmt.c:1293 +#, 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 +#, c-format +msgid "invalid padding value '%s'" +msgstr "vigane täitmise väärtus '%s'" + +#: src/numfmt.c:1401 +#, c-format +msgid "invalid field value '%s'" +msgstr "vigane välja väärtus: '%s'" + +#: src/numfmt.c:1430 +#, c-format +msgid "invalid header value '%s'" +msgstr "vigane päise väärtus '%s'" + +#: src/numfmt.c:1456 +#, 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 +#, c-format +msgid "no conversion option specified" +msgstr "teisendamise võtit ei antud" + +#: src/numfmt.c:1471 +#, c-format +msgid "grouping cannot be combined with --to" +msgstr "grupeerimist ei saa kasutada võtmega --to" + +#: src/numfmt.c:1473 +#, c-format +msgid "grouping has no effect in this locale" +msgstr "selles lokaadis grupeerimine ei mõju" + +#: src/numfmt.c:1486 +#, c-format +msgid "--header ignored with command-line input" +msgstr "käsurea sisendi korral ignoreetitakse võtit --header" + +#: src/numfmt.c:1511 +#, c-format +msgid "error reading input" +msgstr "viga sisendi lugemisel" + +#: src/numfmt.c:1520 +#, c-format +msgid "failed to convert some of the input numbers" +msgstr "osade sisendnumbrite teisendamine ebaõnnestus" + #: src/od.c:294 #, c-format msgid "" @@ -6607,39 +7016,58 @@ msgstr "" "\n" #: src/od.c:307 -msgid "All arguments to long options are mandatory for short options.\n" +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" +"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" +"at first byte printed, incremented when dump is progressing.\n" +"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 "" -"Kohustuslikud argumendid pikkadele võtmetele on kohustuslikud ka " -"lühikestele.\n" +"Kui on määratud nii esimene kui teine vorming, eeldatakse teist kui viimane\n" +"operand algab sümboliga + või (kui on 2 operandi) numbriga.\n" +"Operand INDEKS tähendab -j INDEKS. MÄRGEND on esimese väljastatava baidi\n" +"pseudoaadress, mida suurendatakse töö käigus.\n" +"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:310 +#: src/od.c:318 msgid "" -" -A, --address-radix=RADIX decide how file offsets are printed\n" +" -A, --address-radix=RADIX output format for file offsets. RADIX is one\n" +" of [doxn], for Decimal, Octal, Hex or None\n" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" -" -A, --address-radix=RAADIKS kuidas väljastada faili positsioonid\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" " -j, --skip-bytes=BAIDID jäta esimesed BAIDID baiti vahele\n" -#: src/od.c:314 +#: src/od.c:323 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" -" --traditional accept arguments in traditional form\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" " -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" " --traditional kasuta traditsioonilisel kujul argumente\n" -#: src/od.c:324 +#: src/od.c:336 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" @@ -6647,6 +7075,7 @@ msgid "" " -d same as -t u2, select unsigned decimal 2-byte units\n" msgstr "" "\n" +"\n" "Traditsioonilisi vormingu määranguid võib koos kasutada; need on:\n" " -a sama, kui -t a, vali nimedega sümbolid, ülemist bitti " "ignoreeritakse\n" @@ -6654,7 +7083,7 @@ msgstr "" " -c sama, kui -t c, vali ASCII sümbolid või langkriipsuga paojada\n" " -d sama, kui -t u2, vali märgita 2-baidised kümnendarvud\n" -#: src/od.c:332 +#: src/od.c:345 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -6670,39 +7099,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:340 +#: src/od.c:353 msgid "" "\n" -"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" -"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" -"at first byte printed, incremented when dump is progressing.\n" -"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" -"Kui on määratud nii esimene kui teine vorming, eeldatakse teist kui viimane\n" -"operand algab sümboliga + või (kui on 2 operandi) numbriga.\n" -"Operand INDEKS tähendab -j INDEKS. MÄRGEND on esimese väljastatava baidi\n" -"pseudoaadress, mida suurendatakse töö käigus.\n" -"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:349 -msgid "" "\n" "TYPE is made up of one or more of these specifications:\n" -"\n" " a named character, ignoring high-order bit\n" " c ASCII character or backslash escape\n" msgstr "" "\n" -"TÜÜP on üks või enam järgnevaid:\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" -#: src/od.c:356 +#: src/od.c:360 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -6716,58 +7127,60 @@ msgstr "" " u[SUURUS] märgita kümnendarv, SUURUS baiti\n" " x[SUURUS] kuueteiskümnendarv, SUURUS baiti\n" -#: src/od.c:363 +#: src/od.c:367 msgid "" "\n" -"SIZE is a number. For TYPE in doux, SIZE may also be C for\n" +"SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" "sizeof(char), S for sizeof(short), I for sizeof(int) or L for\n" "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" -"SUURUS on number. TÜÜPIDE doux korral võib SUURUS olla ka C, tähistamaks\n" +"SUURUS on number. TÜÜPIDE [doux] korral võib SUURUS olla ka C, tähistamaks\n" "sizeof(char), S tähistamaks sizeof(short), I tähistamaks sizeof(int) või\n" "L tähistamaks sizeof(long). Kui TÜÜP on f võib SUURUS olla ka F tähistamaks\n" "sizeof(float), D tähistamaks sizeof(double) või L tähistamaks\n" "sizeof(long double).\n" -#: src/od.c:370 +#: src/od.c:374 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" +"Adding a z suffix to any type displays printable characters at the end of\n" +"each output line.\n" msgstr "" "\n" -"RAADIKS on d kümnendarvu puhul, o kaheksandarvu puhul, x " -"kuueteistkümnendarvu\n" -"puhul või n et mitte väljastada.\n" -"BAITE on kuueteistkümnendnumber 0x või 0X prefiksiga, võib omada kordavat\n" -"sufiksit: b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024, GB " -"1000*1000*1000,\n" -"G 1024*1024*1024 ja nii edasi tähtedega T, P, E, Z, Y.\n" -"Sufiksi z lisamine suvalisele tüübile lisab iga väljundrea lõppu vaate\n" -"prinditavate sümbolitega.\n" +"Lisades igale tüübile sufiksi z, väljastatakse iga rea lõpus olevad\n" +"prinditavad sümbolid.\n" -#: src/od.c:380 +#: src/od.c:379 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" +"\n" +"BYTES is hex with 0x or 0X prefix, and may have a multiplier suffix:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"and so on for G, T, P, E, Z, Y.\n" msgstr "" -"Numbrita --string korral kasutatakse väärtust 3. Numbrita --width korral\n" -"kasutatakse väärtust 32. Vaikimisi kasutab od -A o -t oS -w16.\n" +"\n" +"\n" +"BAITE on kuueteistkümnend number prefiksi 0x või 0X korral, ja võib omada\n" +"kordaja sufiksit:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"ja nii edasi G, T, P, E, Z, Y korral.\n" -#: src/od.c:633 src/od.c:753 +#: src/od.c:639 src/od.c:759 #, c-format msgid "invalid type string %s" msgstr "vigane tüübisõne %s" -#: src/od.c:643 +#: src/od.c:649 #, c-format msgid "" "invalid type string %s;\n" @@ -6776,7 +7189,7 @@ msgstr "" "vigane tüübisõne %s;\n" "see süsteem ei realiseeri %lu-baidist sisetüüpi" -#: src/od.c:764 +#: src/od.c:770 #, c-format msgid "" "invalid type string %s;\n" @@ -6785,37 +7198,37 @@ msgstr "" "vigane tüübisõne %s;\n" "see süsteem ei realiseeri %lu-baidist ujukoma tüüpi" -#: src/od.c:822 +#: src/od.c:828 #, c-format msgid "invalid character '%c' in type string %s" msgstr "vigane sümbol '%c' tüübisõnes %s" -#: src/od.c:1047 +#: src/od.c:1053 #, c-format msgid "cannot skip past end of combined input" msgstr "kombineeritud sisendi lõpust kaugemale liikuda ei saa" -#: src/od.c:1603 +#: src/od.c:1609 #, 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:1729 +#: src/od.c:1735 #, 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:1804 +#: src/od.c:1810 msgid "compatibility mode supports at most one file" msgstr "ühilduvuse mood toetab ülimalt ühte faili" -#: src/od.c:1825 +#: src/od.c:1831 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "skip-bytes + read-bytes on liiga suur" -#: src/od.c:1868 +#: src/od.c:1874 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "hoiatus: vigane laius %lu; kasutan selle asemel %d" @@ -6835,14 +7248,12 @@ 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" -"\n" msgstr "" "Kirjuta read, mis koosnevad tabulaatoriga eraldatud igast failist kokku\n" "liidetud vastavatest ridadest, standardväljundisse.\n" "Kui FAIL puudub või on -, loe standardsisendit.\n" -"\n" -#: src/paste.c:448 +#: 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" @@ -6850,7 +7261,7 @@ msgstr "" " -d, --delimiters=LOEND kasuta TAB asemel sümboleid LOENDist\n" " -s, --serial väljasta üks fail korraga, mitte paralleelselt\n" -#: src/paste.c:509 +#: src/paste.c:508 #, c-format msgid "delimiter list ends with an unescaped backslash: %s" msgstr "eraldajate nimekirja lõpus on kaitsmata langkriips: %s" @@ -6910,80 +7321,80 @@ msgid "Kaveh Ghazi" msgstr "Kaveh Ghazi" #. TRANSLATORS: Real name is unknown; at most 19 characters. -#: src/pinky.c:250 +#: src/pinky.c:242 msgid " ???" msgstr " ???" #. TRANSLATORS: Idle time is unknown; at most 5 characters. -#: src/pinky.c:274 +#: src/pinky.c:266 msgid "?????" msgstr "?????" -#: src/pinky.c:323 +#: src/pinky.c:314 #, c-format msgid "Login name: " msgstr "Kasutajanimi: " -#: src/pinky.c:326 +#: src/pinky.c:317 #, c-format msgid "In real life: " msgstr "Reaalne nimi: " #. TRANSLATORS: Real name is unknown; no hard limit. -#: src/pinky.c:330 +#: src/pinky.c:321 msgid "???\n" msgstr "???\n" -#: src/pinky.c:350 +#: src/pinky.c:341 #, c-format msgid "Directory: " msgstr "Kataloog: " -#: src/pinky.c:352 +#: src/pinky.c:343 #, c-format msgid "Shell: " msgstr "Käsuinterpretaator: " -#: src/pinky.c:371 +#: src/pinky.c:362 #, c-format msgid "Project: " msgstr "Projekt: " -#: src/pinky.c:395 +#: src/pinky.c:386 #, c-format msgid "Plan:\n" msgstr "Plaan:\n" -#: src/pinky.c:414 +#: src/pinky.c:405 msgid "Login" msgstr "Kasutaja" -#: src/pinky.c:416 +#: src/pinky.c:407 msgid "Name" msgstr "Nimi" -#: src/pinky.c:417 +#: src/pinky.c:408 msgid " TTY" msgstr " TTY" -#: src/pinky.c:419 +#: src/pinky.c:410 msgid "Idle" msgstr "Eemal" -#: src/pinky.c:420 +#: src/pinky.c:411 msgid "When" msgstr "Millal" -#: src/pinky.c:423 +#: src/pinky.c:414 msgid "Where" msgstr "Kust" -#: src/pinky.c:502 +#: src/pinky.c:493 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Kasutamine: %s [VÕTI]... [KASUTAJA]...\n" -#: src/pinky.c:503 +#: src/pinky.c:494 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -6999,7 +7410,7 @@ msgstr "" " -p ära esita kogu infos kasutaja plaani faili\n" " -s väljasta lühiinfo, seda kasutatakse vaikimisi\n" -#: src/pinky.c:511 +#: src/pinky.c:502 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7013,7 +7424,7 @@ msgstr "" " -q ära väljasta lühiinfos kasutaja täisnime, masinat ja\n" " eemalolekut\n" -#: src/pinky.c:520 +#: src/pinky.c:511 #, c-format msgid "" "\n" @@ -7024,7 +7435,7 @@ msgstr "" "Kerge 'finger' programm; väljastab kasutaja kohta infot.\n" "Kasutatakse utmp faili %s.\n" -#: src/pinky.c:604 +#: src/pinky.c:595 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "" @@ -7040,83 +7451,81 @@ msgstr "Pete TerMaat" msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:912 +#: src/pr.c:908 #, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "'--pages=ESIMENE[:VIIMANE]' puudub argument" -#: src/pr.c:914 +#: src/pr.c:910 #, c-format msgid "invalid page range %s" msgstr "vigane lehekülgede vahemik %s" -#: src/pr.c:979 +#: src/pr.c:975 #, c-format msgid "'-l PAGE_LENGTH' invalid number of lines: %s" msgstr "'-l LEHE_PIKKUS' vigane ridade arv: %s" -#: src/pr.c:1003 +#: src/pr.c:999 #, c-format msgid "'-N NUMBER' invalid starting line number: %s" msgstr "'-N NUMBER' vigane alustamise rea number: %s" -#: src/pr.c:1015 +#: src/pr.c:1011 #, c-format msgid "'-o MARGIN' invalid line offset: %s" msgstr "'-o ÄÄR' vigane rea nihe: %s" -#: src/pr.c:1056 +#: src/pr.c:1052 #, c-format msgid "'-w PAGE_WIDTH' invalid number of characters: %s" msgstr "'-w LEHE_LAIUS' vigane arv sümboleid: %s" -#: src/pr.c:1070 +#: src/pr.c:1066 #, c-format msgid "'-W PAGE_WIDTH' invalid number of characters: %s" msgstr "'-W LEHE_LAIUS' vigane arv sümboleid: %s" -#: src/pr.c:1100 +#: src/pr.c:1096 #, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "paralleelselt väljastamisel ei saa veergude arvu määrata." -#: src/pr.c:1104 +#: src/pr.c:1100 #, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "ei saa trükkida korraga järjestikku ja paralleelselt." -#: src/pr.c:1200 +#: src/pr.c:1196 #, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "'-%c' liigsed sümbolid või vigane number argumendis: %s" -#: src/pr.c:1304 +#: src/pr.c:1293 #, c-format msgid "page width too narrow" msgstr "leht on liiga kitsas" -#: src/pr.c:2369 +#: src/pr.c:2353 #, c-format msgid "starting page number %<PRIuMAX> exceeds page count %<PRIuMAX>" msgstr "alguslege number %<PRIuMAX> ületab lehekülgede arvu %<PRIuMAX>" -#: src/pr.c:2396 +#: src/pr.c:2380 #, c-format msgid "page number overflow" msgstr "lehekülje numbri ületäitumine" -#: src/pr.c:2401 +#: src/pr.c:2385 #, c-format msgid "Page %<PRIuMAX>" msgstr "Lehekülg %<PRIuMAX>" -#: src/pr.c:2773 -msgid "" -"Paginate or columnate FILE(s) for printing.\n" -"\n" +#: src/pr.c:2757 +msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "Küljenda FAILid trükkimiseks lehekülgedeks või veergudeks.\n" -#: src/pr.c:2780 +#: src/pr.c:2763 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -7133,7 +7542,7 @@ msgstr "" " välja arvatud juhul, kui kasutatakse võtit -a.\n" " Ühtlusta ridade arv veergudes igal lehel.\n" -#: src/pr.c:2788 +#: src/pr.c:2771 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7149,7 +7558,7 @@ msgstr "" " -d, --double-space\n" " topeltreavahe väljundis\n" -#: src/pr.c:2796 +#: src/pr.c:2779 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7169,7 +7578,7 @@ msgstr "" " lehevahetuse sümboleid (3-realine lehe päis võtmega -F\n" " või 5-realine päis ja jalus võtmata -F)\n" -#: src/pr.c:2806 +#: src/pr.c:2789 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -7191,7 +7600,7 @@ msgstr "" "veerge\n" " ei joondata, --sep-string[=SÕNE] määrab eraldaja\n" -#: src/pr.c:2815 +#: src/pr.c:2798 msgid "" " -l, --length=PAGE_LENGTH\n" " set the page length to PAGE_LENGTH (66) lines\n" @@ -7206,7 +7615,7 @@ msgstr "" " lühenda read, ridade kogupikkuses ühendamiseks\n" " kasutage -J\n" -#: src/pr.c:2822 +#: src/pr.c:2805 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -7223,7 +7632,7 @@ msgstr "" " alusta loendamist ühe asemel antud numbrist esimese\n" " trükitava lehe esimesel real (vaata ka +ESIMENE_LEHT)\n" -#: src/pr.c:2830 +#: src/pr.c:2813 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -7237,7 +7646,7 @@ msgstr "" " -r, --no-file-warnings\n" " ära hoiata, kui faili ei saa avada\n" -#: src/pr.c:2837 +#: src/pr.c:2820 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -7253,7 +7662,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:2844 +#: src/pr.c:2827 msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" @@ -7270,7 +7679,7 @@ msgstr "" " seotud võtmetega\n" " -t, --omit-header blokeeri lehe päised ja sabad\n" -#: src/pr.c:2851 +#: src/pr.c:2834 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -7293,7 +7702,7 @@ msgstr "" "tekstiveeru\n" " väljundis, -s[sümbol] lülitab välja (72)\n" -#: src/pr.c:2861 +#: src/pr.c:2844 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -7306,7 +7715,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:2869 +#: src/pr.c:2852 msgid "" "\n" "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" @@ -7446,7 +7855,7 @@ msgstr "hoiatus: ignoreerin liigseid argumente, alustan argumendist %s" #. This is a proper name. See the gettext manual, section Names. #: src/ptx.c:42 msgid "F. Pinard" -msgstr "F. Pinard" +msgstr "François Pinard" #: src/ptx.c:419 #, c-format @@ -7466,12 +7875,9 @@ msgstr "" msgid "" "Output a permuted index, including context, of the words in the input " "files.\n" -"\n" -msgstr "" -"Väljasta sisendfailide sõnade kontekstregister.\n" -"\n" +msgstr "Väljasta sisendfailide sõnade kontekstregister.\n" -#: src/ptx.c:1828 +#: src/ptx.c:1827 msgid "" " -A, --auto-reference output automatically generated references\n" " -G, --traditional behave more like System V 'ptx'\n" @@ -7481,7 +7887,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:1833 +#: src/ptx.c:1832 msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" " -O, --format=roff generate output as roff directives\n" @@ -7496,7 +7902,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:1840 +#: src/ptx.c:1839 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -7512,7 +7918,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:1848 +#: src/ptx.c:1847 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -7523,7 +7929,7 @@ msgstr "" " -t, --typeset-mode - ei ole realiseeritud -\n" " -w, --width=NUMBER väljasta veergudena, viideteta\n" -#: src/ptx.c:1855 +#: src/ptx.c:1854 msgid "" "\n" "With no FILE or if FILE is -, read Standard Input. '-F /' by default.\n" @@ -7531,7 +7937,7 @@ msgstr "" "\n" "Kui FAIL puudub või on -, loe standardsisendit. '-F /' on vaikimisi.\n" -#: src/ptx.c:1949 +#: src/ptx.c:1948 #, c-format msgid "invalid gap width: %s" msgstr "vigane tühemiku laius: %s" @@ -7558,7 +7964,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "chdir %s ebaõnnestus" -#: src/pwd.c:170 src/pwd.c:277 +#: src/pwd.c:170 src/pwd.c:277 src/split.c:373 #, c-format msgid "failed to stat %s" msgstr "stat %s ebaõnnestus" @@ -7574,14 +7980,15 @@ msgid "ignoring non-option arguments" msgstr "ignoreerin argumente, mis ei ole võtmed" #. This is a proper name. See the gettext manual, section Names. -#: src/readlink.c:33 +#: src/readlink.c:32 msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 +#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147 +#: src/stat.c:1349 src/touch.c:212 #, c-format -msgid "Usage: %s [OPTION]... FILE\n" -msgstr "Kasutamine: %s [VÕTI]... FAIL\n" +msgid "Usage: %s [OPTION]... FILE...\n" +msgstr "Kasutamine: %s [VÕTI]... [FAIL]...\n" #: src/readlink.c:63 msgid "" @@ -7617,10 +8024,12 @@ msgid "" "recursively,\n" " without requirements on components " "existence\n" -" -n, --no-newline do not output the trailing newline\n" +" -n, --no-newline do not output the trailing delimiter\n" " -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" msgstr "" " -m, --canonicalize-missing õgvenda järgides iga nimeviidet igas nime\n" " komponendis rekursiivselt,\n" @@ -7629,12 +8038,13 @@ msgstr "" " -q, --quiet,\n" " -s, --silent blokeeri enamus veateateid\n" " -v, --verbose raporteeri vigadest\n" +" -z, --zero eralda väljund reavahetuse asemel sümboliga " +"NUL\n" -#: src/realpath.c:71 src/rm.c:134 src/shred.c:147 src/stat.c:1330 -#: src/touch.c:215 +#: src/readlink.c:152 #, c-format -msgid "Usage: %s [OPTION]... FILE...\n" -msgstr "Kasutamine: %s [VÕTI]... [FAIL]...\n" +msgid "ignoring --no-newline with multiple arguments" +msgstr "mitme argumendi korral ignoreerin võtit --no-newline" #: src/realpath.c:72 msgid "" @@ -7675,12 +8085,12 @@ msgstr "" msgid "generating relative path" msgstr "genereerin suhtelise tee" -#: src/remove.c:286 +#: src/remove.c:273 #, c-format msgid "%s: descend into write-protected directory %s? " msgstr "%s: laskun kirjutamise kaitsega kataloogi %s? " -#: src/remove.c:287 +#: src/remove.c:274 #, c-format msgid "%s: descend into directory %s? " msgstr "%s: laskun kataloogi %s? " @@ -7689,37 +8099,37 @@ msgstr "%s: laskun kataloogi %s? " #. translate "%s: remove %s (write-protected) %s? " #. instead. It should avoid grammatical problems #. with the output of file_type. -#: src/remove.c:303 +#: src/remove.c:290 #, c-format msgid "%s: remove write-protected %s %s? " msgstr "%s: eemaldan kirjutuskaitsega %s %s? " -#: src/remove.c:304 +#: src/remove.c:291 #, c-format msgid "%s: remove %s %s? " msgstr "%s: eemaldan %s %s? " -#: src/remove.c:417 +#: src/remove.c:374 #, c-format msgid "removed directory: %s\n" msgstr "kustutatud kataloog: %s\n" -#: src/remove.c:481 +#: src/remove.c:444 #, c-format msgid "cannot remove directory: %s" msgstr "ei õnnestu kustutada kataloogi: %s" -#: src/remove.c:537 +#: src/remove.c:500 #, c-format msgid "skipping %s, since it's on a different device" msgstr "jätan %s vahele, kuna asub teisel seadmel" -#: src/remove.c:557 +#: src/remove.c:520 #, c-format msgid "traversal failed: %s" msgstr "lugemine ebaõnnestus: %s" -#: src/remove.c:563 +#: src/remove.c:526 #, c-format msgid "" "unexpected failure: fts_info=%d: %s\n" @@ -7728,12 +8138,12 @@ msgstr "" "ootamatu tõrge: fts_info=%d: %s\n" "palun teatage aadressil %s" -#: src/rm.c:118 +#: src/rm.c:119 #, c-format msgid "Try '%s ./%s' to remove the file %s.\n" msgstr "Kasutage '%s ./%s' faili %s kustutamiseks.\n" -#: src/rm.c:135 +#: src/rm.c:136 msgid "" "Remove (unlink) the FILE(s).\n" "\n" @@ -7746,7 +8156,7 @@ msgstr "" " -f, --force ignoreeri puuduvaid faile, ära küsi\n" " -i küsi enne iga eemaldamist\n" -#: src/rm.c:141 +#: src/rm.c:142 msgid "" " -I prompt once before removing more than three files, " "or\n" @@ -7766,7 +8176,7 @@ msgstr "" "või\n" " always (-i). Kui MILLAL puudub, küsi alati\n" -#: src/rm.c:148 +#: src/rm.c:149 msgid "" " --one-file-system when removing a hierarchy recursively, skip any\n" " directory that is on a file system different from\n" @@ -7775,19 +8185,21 @@ msgstr "" " --one-file-system kustutades kataloogipuud, kustuta ainult samal\n" " seadmel olevaid faile\n" -#: src/rm.c:153 +#: src/rm.c:154 msgid "" " --no-preserve-root do not treat '/' specially\n" " --preserve-root do not remove '/' (default)\n" " -r, -R, --recursive remove directories and their contents recursively\n" +" -d, --dir remove empty directories\n" " -v, --verbose explain what is being done\n" msgstr "" " --no-preserve-root ära käsitle '/' eriliselt\n" -" --preserve-root ära töötle '/' rekursiivselt (vaikimisi)\n" +" --preserve-root ära kustuta '/' (vaikimisi)\n" " -r, -R, --recursive eemalda kataloogide sisu rekursiivselt\n" +" -d, --dir kustuta tühjad kataloogid\n" " -v, --verbose selgita mis on teoksil\n" -#: src/rm.c:161 +#: src/rm.c:163 msgid "" "\n" "By default, rm does not remove directories. Use the --recursive (-r or -R)\n" @@ -7798,7 +8210,7 @@ msgstr "" "Vaikimisi ei kustuta rm katalooge. Kataloogide ja nende sisu kustutamiseks\n" "kasutage võtit --recursive (-r või -R).\n" -#: src/rm.c:166 +#: src/rm.c:168 #, c-format msgid "" "\n" @@ -7815,7 +8227,7 @@ msgstr "" "\n" " %s ./-foo\n" -#: src/rm.c:175 +#: src/rm.c:177 msgid "" "\n" "Note that if you use rm to remove a file, it might be possible to recover\n" @@ -7827,12 +8239,12 @@ msgstr "" "faili sisu taastada. Kui teil on vaja suuremat kindlust, et faili\n" "sisu ei saa taastada, proovige käsku shred.\n" -#: src/rm.c:335 +#: src/rm.c:342 #, c-format msgid "%s: remove all arguments recursively? " msgstr "%s: eemaldada kõik argumendid rekursiivselt? " -#: src/rm.c:336 +#: src/rm.c:343 #, c-format msgid "%s: remove all arguments? " msgstr "%s: eemaldan kõik argumendid? " @@ -7891,7 +8303,12 @@ msgstr "" msgid "" "Run a program in a different security context.\n" "With neither CONTEXT nor COMMAND, print the current security context.\n" -"\n" +msgstr "" +"Käivitab programmi teises turvakontekstis.\n" +"Kui kontekst ja käsk puudub, väljastab hetkel kehtiva turvakonteksti.\n" + +#: src/runcon.c:94 +msgid "" " CONTEXT Complete security context\n" " -c, --compute compute process transition context before modifying\n" " -t, --type=TYPE type (for same role as parent)\n" @@ -7900,9 +8317,6 @@ msgid "" " -l, --range=RANGE levelrange\n" "\n" msgstr "" -"Käivita programm erinevas turvakontekstis.\n" -"Kui kontekst ja programm puudub, väljastab jooksva turvakonteksti.\n" -"\n" " KONTEKST Täielik turvakontekst\n" " -c, --compute enne muutmist arvuta protsessi ülemineku kontekst\n" " -t, --type=TÜÜP tüüp (vanemaga samas rollis)\n" @@ -7911,72 +8325,72 @@ msgstr "" " -l, --range=VAHEMIK taseme vahemik\n" "\n" -#: src/runcon.c:140 +#: src/runcon.c:144 #, c-format msgid "multiple roles" msgstr "mitu rolli" -#: src/runcon.c:145 +#: src/runcon.c:149 #, c-format msgid "multiple types" msgstr "mitu tüüpi" -#: src/runcon.c:150 +#: src/runcon.c:154 #, c-format msgid "multiple users" msgstr "mitu kasutajat" -#: src/runcon.c:155 +#: src/runcon.c:159 #, c-format msgid "multiple levelranges" msgstr "mitu taseme vahemikku" -#: src/runcon.c:173 src/runcon.c:209 +#: src/runcon.c:177 src/runcon.c:213 #, c-format msgid "failed to get current context" msgstr "jooksva konteksti lugemine ebaõnnestus" -#: src/runcon.c:183 +#: src/runcon.c:187 #, c-format msgid "you must specify -c, -t, -u, -l, -r, or context" msgstr "peab olema antud -c, -t, -u, -l, -r või kontekst" -#: src/runcon.c:191 +#: src/runcon.c:195 #, c-format msgid "no command specified" msgstr "puudub käsklus" -#: src/runcon.c:197 +#: src/runcon.c:201 #, c-format msgid "%s may be used only on a SELinux kernel" msgstr "%s saab kasutada ainult SELinux tuumaga" -#: src/runcon.c:223 +#: src/runcon.c:227 #, c-format msgid "failed to compute a new context" msgstr "uue konteksti arvutamine ebaõnnestus" -#: src/runcon.c:237 +#: src/runcon.c:241 #, c-format msgid "failed to set new user %s" msgstr "uue kasutaja %s seadmine ebaõnnestus" -#: src/runcon.c:239 +#: src/runcon.c:243 #, c-format msgid "failed to set new type %s" msgstr "uue tüübi %s seadmine ebaõnnestus" -#: src/runcon.c:241 +#: src/runcon.c:245 #, c-format msgid "failed to set new range %s" msgstr "uue vahemiku %s seadmine ebaõnnestus" -#: src/runcon.c:243 +#: src/runcon.c:247 #, c-format msgid "failed to set new role %s" msgstr "uue rolli %s seadmine ebaõnnestus" -#: src/runcon.c:251 +#: src/runcon.c:255 #, c-format msgid "unable to set security context %s" msgstr "turvakonteksti %s ei saa seada" @@ -7993,21 +8407,22 @@ msgstr "" " või: %s [VÕTI]... ESIMENE SAMM VIIMANE\n" #: src/seq.c:73 +msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" +msgstr "" +"Väljasta numbrite jada ESIMENE kuni VIIMANE, vastavalt antud sammule.\n" + +#: src/seq.c:79 msgid "" -"Print numbers from FIRST to LAST, in steps of INCREMENT.\n" -"\n" " -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 "" -"Väljasta numbrid esimesest viimaseni, vajadusel kasutades etteantud sammu.\n" -"\n" " -f, --format FORMAAT kasuta printf stiilis ujukoma formaati\n" " -s, --separator=SÕNE kasuta numbrite eraldamiseks SÕNE (vaikimisi: " "\\n)\n" " -w, --equal-width kasuta võrdse laiusega välju, täida nullidega\n" -#: src/seq.c:82 +#: src/seq.c:86 msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" @@ -8023,7 +8438,7 @@ msgstr "" "SAMM on tavaliselt positiivne, kui ESIMENE on VIIMASEST väiksem ja\n" "negatiivne, kui VIIMANE on ESIMESEST väiksem.\n" -#: src/seq.c:90 +#: src/seq.c:94 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" @@ -8033,32 +8448,17 @@ msgstr "" "on fikseeritud punktiga kümnendnumbrid maksimum täpsusega PREC,\n" "kasutatakse formaadina %.PRECf, muidu %g.\n" -#: src/seq.c:136 +#: src/seq.c:140 #, c-format msgid "invalid floating point argument: %s" msgstr "vigane murdarv: %s" -#: src/seq.c:193 -#, c-format -msgid "format %s has no %% directive" -msgstr "vormingus %s puudub %% direktiiv" - -#: src/seq.c:210 -#, c-format -msgid "format %s ends in %%" -msgstr "vormingu %s lõpus on %%" - -#: src/seq.c:213 +#: src/seq.c:232 #, c-format msgid "format %s has unknown %%%c directive" msgstr "vormingus %s on tundmatu %%%c direktiiv" -#: src/seq.c:217 -#, c-format -msgid "format %s has too many %% directives" -msgstr "vormingus %s on liiga palju %% direktiive" - -#: src/seq.c:431 +#: src/seq.c:555 #, 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" @@ -8098,27 +8498,27 @@ msgstr "" " -g GID[,GID1...] samuti sea primaarseks grupiks GID ja (kui on antud),\n" " täiendavate gruppide nimekiri GID1, ...\n" -#: src/setuidgid.c:163 +#: src/setuidgid.c:162 #, c-format msgid "unknown user-ID: %s" msgstr "tundmatu kasutaja-ID: %s" -#: src/setuidgid.c:174 +#: 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:191 +#: src/setuidgid.c:190 #, c-format msgid "failed to set supplemental group(s)" msgstr "lisagruppide nimekirja ei õnnestu seada" -#: src/setuidgid.c:201 +#: src/setuidgid.c:200 #, c-format msgid "cannot set group-ID to %lu" msgstr "ei õnnestu seada grupi ID %lu" -#: src/setuidgid.c:205 +#: src/setuidgid.c:204 #, c-format msgid "cannot set user-ID to %lu" msgstr "ei õnnestu seada kasutaja ID %lu" @@ -8132,13 +8532,11 @@ msgstr "Colin Plumb" 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" -"\n" msgstr "" "Kirjuta antud failid korduvalt üle, et muuta raskemaks andmete taastamine\n" "isegi väga kalli riistvara abil.\n" -"\n" -#: src/shred.c:156 +#: src/shred.c:155 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -8151,7 +8549,7 @@ 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:162 +#: src/shred.c:161 msgid "" " -u, --remove truncate and remove file after overwriting\n" " -v, --verbose show progress\n" @@ -8165,7 +8563,7 @@ msgstr "" " see on mitte-tavafailide puhul vaikimisi käitumine\n" " -z, --zero varja töötlemist, kirjutades viimase tegevusena nulle\n" -#: src/shred.c:171 +#: src/shred.c:170 msgid "" "\n" "If FILE is -, shred standard output.\n" @@ -8185,7 +8583,7 @@ msgstr "" "kasutab enamus inimesi võtit --remove.\n" "\n" -#: src/shred.c:181 +#: src/shred.c:180 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" @@ -8201,7 +8599,7 @@ msgstr "" "ei ole shred efektiivne või ei ole efektiivne kõikides moodides:\n" "\n" -#: src/shred.c:189 +#: src/shred.c:188 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -8222,7 +8620,7 @@ msgstr "" " Network Appliance NFS server\n" "\n" -#: src/shred.c:199 +#: src/shred.c:198 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -8234,7 +8632,7 @@ msgstr "" "\n" "* tihendavad failisüsteemid\n" -#: src/shred.c:206 +#: src/shred.c:205 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" @@ -8254,7 +8652,7 @@ msgstr "" "käsu manualist (man mount).\n" "\n" -#: src/shred.c:216 +#: src/shred.c:215 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" @@ -8264,122 +8662,122 @@ 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:296 +#: src/shred.c:295 #, c-format msgid "%s: fdatasync failed" msgstr "%s: fdatasync ebaõnnestus" -#: src/shred.c:307 +#: src/shred.c:306 #, c-format msgid "%s: fsync failed" msgstr "%s: fsync ebaõnnestus" -#: src/shred.c:384 +#: src/shred.c:383 #, c-format msgid "%s: cannot rewind" msgstr "%s: ei saa ümber kerida" -#: src/shred.c:403 +#: src/shred.c:402 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: läbimine %lu/%lu (%s)..." -#: src/shred.c:453 +#: src/shred.c:452 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: viga kirjutamisel aadressile %s" -#: src/shred.c:471 +#: src/shred.c:470 #, c-format msgid "%s: lseek failed" msgstr "%s: lseek ebaõnnestus" -#: src/shred.c:482 +#: src/shred.c:481 #, c-format msgid "%s: file too large" msgstr "%s: fail on liiga suur" -#: src/shred.c:505 +#: src/shred.c:504 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: läbimine %lu/%lu (%s)...%s" -#: src/shred.c:521 +#: src/shred.c:520 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: läbimine %lu/%lu (%s)...%s/%s %d%%" -#: src/shred.c:768 +#: src/shred.c:767 #, c-format msgid "%s: fstat failed" msgstr "%s: fstat ebaõnnestus" -#: src/shred.c:779 +#: src/shred.c:778 #, c-format msgid "%s: invalid file type" msgstr "%s: vigane failitüüp" -#: src/shred.c:798 +#: src/shred.c:797 #, c-format msgid "%s: file has negative size" msgstr "%s: fail on negatiivse suurusega" -#: src/shred.c:865 +#: src/shred.c:864 src/sort.c:932 src/split.c:378 #, c-format msgid "%s: error truncating" msgstr "%s: viga lühendamisel" -#: src/shred.c:881 +#: src/shred.c:880 #, c-format msgid "%s: fcntl failed" msgstr "%s: fcntl ebaõnnestus" -#: src/shred.c:886 +#: src/shred.c:885 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "%s: ei õnnestu töödelda ainult lisamiseks mõeldud faili" -#: src/shred.c:968 +#: src/shred.c:967 #, c-format msgid "%s: removing" msgstr "%s: eemaldan" -#: src/shred.c:992 +#: src/shred.c:991 #, c-format msgid "%s: renamed to %s" msgstr "%s: uus nimi %s" -#: src/shred.c:1014 +#: src/shred.c:1013 #, c-format msgid "%s: failed to remove" msgstr "%s: kustutamine ebaõnnestus" -#: src/shred.c:1018 +#: src/shred.c:1017 #, c-format msgid "%s: removed" msgstr "%s: eemaldatud" -#: src/shred.c:1025 src/shred.c:1068 +#: src/shred.c:1024 src/shred.c:1067 #, c-format msgid "%s: failed to close" msgstr "%s: sulgemine ebaõnnestus" -#: src/shred.c:1061 +#: src/shred.c:1060 #, c-format msgid "%s: failed to open for writing" msgstr "%s: faili ei saa kirjutamiseks avada" -#: src/shred.c:1126 +#: src/shred.c:1125 #, c-format msgid "%s: invalid number of passes" msgstr "%s: vigane läbimiste arv" -#: src/shred.c:1135 src/shuf.c:291 src/sort.c:4387 +#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441 #, c-format msgid "multiple random sources specified" msgstr "määrati mitu juhuarvude allikat" -#: src/shred.c:1149 +#: src/shred.c:1148 #, c-format msgid "%s: invalid file size" msgstr "%s: vigane faili suurus" @@ -8396,14 +8794,11 @@ msgstr "" " või: %s -i ALG-LÕPP [VÕTI]...\n" #: src/shuf.c:54 -msgid "" -"Write a random permutation of the input lines to standard output.\n" -"\n" +msgid "Write a random permutation of the input lines to standard output.\n" msgstr "" "Kirjuta sisendfailide read juhuslikus permutatsioonis standardväljundisse.\n" -"\n" -#: src/shuf.c:61 +#: src/shuf.c:60 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 " @@ -8420,27 +8815,27 @@ msgstr "" " --random-source=FAIL loe juhuslikud baidid FAIList\n" " -z, --zero-terminated ridade lõppu bait 0, mitte reavahetus\n" -#: src/shuf.c:245 +#: src/shuf.c:244 #, c-format msgid "multiple -i options specified" msgstr "kasutati mitut -i võtit" -#: src/shuf.c:265 +#: src/shuf.c:264 #, c-format msgid "invalid input range %s" msgstr "vigane sisendi vahemik: %s" -#: src/shuf.c:278 +#: src/shuf.c:277 #, c-format msgid "invalid line count %s" msgstr "vigane ridade arv: %s" -#: src/shuf.c:285 src/sort.c:4381 +#: src/shuf.c:284 src/sort.c:4435 #, c-format msgid "multiple output files specified" msgstr "määrati mitu väljundfaili" -#: src/shuf.c:311 +#: src/shuf.c:310 #, c-format msgid "cannot combine -e and -i options" msgstr "-e ja -i võtmeid ei saa kombineerida" @@ -8466,7 +8861,7 @@ msgstr "" "argumenti, on pausi pikkus kõikide argumentide summa.\n" "\n" -#: src/sleep.c:135 src/timeout.c:295 +#: src/sleep.c:135 src/timeout.c:320 #, c-format msgid "invalid time interval %s" msgstr "vigane ajaintervall %s" @@ -8476,15 +8871,11 @@ msgstr "vigane ajaintervall %s" msgid "cannot read realtime clock" msgstr "ei õnnestu lugeda reaalaja kella" -#: src/sort.c:395 -msgid "" -"Write sorted concatenation of all FILE(s) to standard output.\n" -"\n" -msgstr "" -"Kirjuta järjestatud FAILide ühend standardväljundisse.\n" -"\n" +#: src/sort.c:399 +msgid "Write sorted concatenation of all FILE(s) to standard output.\n" +msgstr "Kirjuta järjestatud FAILide ühend standardväljundisse.\n" -#: src/sort.c:402 +#: src/sort.c:405 msgid "" "Ordering options:\n" "\n" @@ -8492,7 +8883,7 @@ msgstr "" "Võtmed järjestamiseks:\n" "\n" -#: src/sort.c:406 +#: src/sort.c:409 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -8504,7 +8895,7 @@ msgstr "" "numbreid\n" " -f, --ignore-case tööta tõstutundetult\n" -#: src/sort.c:412 +#: src/sort.c:415 msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" " -i, --ignore-nonprinting consider only printable characters\n" @@ -8514,14 +8905,14 @@ msgstr "" " -i, --ignore-nonprinting kasuta ainult trükitavaid sümboleid\n" " -M, --month-sort võrdle (tundmatu) < 'JAAN' < ... < 'DETS'\n" -#: src/sort.c:417 +#: src/sort.c:420 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:420 +#: src/sort.c:423 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -8534,7 +8925,7 @@ msgstr "" " -r, --reverse pööra võrdluste tulemus\n" "\n" -#: src/sort.c:426 +#: src/sort.c:429 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -8551,7 +8942,7 @@ msgstr "" "tekstis\n" "\n" -#: src/sort.c:434 +#: src/sort.c:437 msgid "" "Other options:\n" "\n" @@ -8559,7 +8950,7 @@ msgstr "" "Muud võtmed:\n" "\n" -#: src/sort.c:438 +#: src/sort.c:441 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" @@ -8567,7 +8958,7 @@ msgstr "" " --batch-size=NMESTI mesti korraga ülimalt NMESTI sisendit;\n" " paremaks ajutiste failide kasutamiseks\n" -#: src/sort.c:442 +#: src/sort.c:445 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 " @@ -8581,7 +8972,7 @@ msgstr "" " --compress-program=PROG tihenda ajutised failid programmiga PROG;\n" " taastamiseks PROG -d\n" -#: src/sort.c:449 +#: src/sort.c:452 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -8596,7 +8987,7 @@ msgstr "" " nimedega failist F;\n" " Kui F on - siis loe nimed standardsisendist\n" -#: src/sort.c:456 +#: src/sort.c:459 msgid "" " -k, --key=KEYDEF sort via a key; KEYDEF gives location and type\n" " -m, --merge merge already sorted files; do not sort\n" @@ -8605,7 +8996,7 @@ msgstr "" " ja tüübi.\n" " -m, --merge mesti juba järjestatud failid; ei järjesta\n" -#: src/sort.c:460 +#: src/sort.c:463 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -8617,7 +9008,7 @@ msgstr "" "võrdlus\n" " -S, --buffer-size=MAHT määra mälupuhvri suurus\n" -#: src/sort.c:466 +#: src/sort.c:469 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -8640,11 +9031,11 @@ msgstr "" " -u, --unique võtmega -c: kontrolli ranget järjestatust\n" " muidu: väljasta võrdsetest ainult üks\n" -#: src/sort.c:475 +#: 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:480 +#: src/sort.c:483 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -8675,7 +9066,7 @@ msgstr "" "\n" "MAHT järel võib kasutada järgnevaid kordavaid sufikseid:\n" -#: src/sort.c:493 +#: src/sort.c:496 msgid "" "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n" "\n" @@ -8694,264 +9085,266 @@ 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:694 +#: src/sort.c:697 #, c-format msgid "waiting for %s [-d]" msgstr "ootan %s [-d] järel" -#: src/sort.c:699 +#: src/sort.c:702 #, c-format msgid "%s [-d] terminated abnormally" msgstr "%s [-d] lõpetas ebanormaalselt" -#: src/sort.c:853 +#: src/sort.c:856 #, c-format msgid "cannot create temporary file in %s" msgstr "%s sees ei õnnestu ajutist faili luua" -#: src/sort.c:939 src/sort.c:2010 src/sort.c:3056 src/sort.c:3755 -#: src/sort.c:3758 +#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713 +#: src/sort.c:3804 src/sort.c:3807 msgid "open failed" msgstr "open ebaõnnestus" -#: src/sort.c:959 +#: src/sort.c:970 msgid "fflush failed" msgstr "fflush ebaõnnestus" -#: src/sort.c:964 src/sort.c:2013 src/sort.c:4646 +#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706 msgid "close failed" msgstr "close ebaõnnestus" -#: src/sort.c:973 +#: src/sort.c:986 #, c-format msgid "dup2 failed" msgstr "dup2 ebaõnnestus" -#: src/sort.c:1090 +#: src/sort.c:1103 #, c-format msgid "couldn't execute %s" msgstr "%s ei õnnestu käivitada" -#: src/sort.c:1097 +#: src/sort.c:1110 msgid "couldn't create temporary file" msgstr "ajutist faili ei õnnestu luua" -#: src/sort.c:1136 +#: src/sort.c:1149 #, c-format msgid "couldn't create process for %s -d" msgstr "%s -d jaoks ei õnnestunud protsessi luua" -#: src/sort.c:1150 +#: src/sort.c:1161 #, c-format msgid "couldn't execute %s -d" msgstr "%s -d ei õnnestu käivitada" -#: src/sort.c:1209 +#: src/sort.c:1220 #, c-format msgid "warning: cannot remove: %s" msgstr "hoiatus: ei saa kustutada: %s" -#: src/sort.c:1295 +#: src/sort.c:1306 #, c-format msgid "invalid --%s argument %s" msgstr "vigane --%s argument %s" -#: src/sort.c:1298 +#: src/sort.c:1309 #, c-format msgid "minimum --%s argument is %s" msgstr "miinimum --%s argument on %s" -#: src/sort.c:1313 +#: src/sort.c:1324 #, c-format msgid "--%s argument %s too large" msgstr "--%s argument %s on liiga suur" -#: src/sort.c:1316 +#: src/sort.c:1327 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "maksimaalne --%s argument praeguse rlimit piiranguga on %s" -#: src/sort.c:1398 +#: src/sort.c:1409 #, c-format msgid "number in parallel must be nonzero" msgstr "paralleelsuse number peab olema mittenull" -#: src/sort.c:1479 +#: src/sort.c:1494 msgid "stat failed" msgstr "stat ebaõnnestus" -#: src/sort.c:1740 +#: src/sort.c:1755 msgid "read failed" msgstr "lugemine ebaõnnestus" -#: src/sort.c:2028 +#: src/sort.c:2043 #, c-format msgid "string transformation failed" msgstr "sõnede teisendamine ebaõnnestus" -#: src/sort.c:2031 +#: src/sort.c:2046 #, c-format msgid "the untransformed string was %s" msgstr "teisendamata sõne oli %s." -#: src/sort.c:2194 +#: src/sort.c:2209 #, c-format msgid "^ no match for key\n" msgstr "^ võtit ei leitud\n" -#: src/sort.c:2374 +#: src/sort.c:2389 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "kasutati aeguvat võtit %s; kasutage selle asemel %s" -#: src/sort.c:2380 +#: src/sort.c:2395 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "võtme %lu laius on null ja ignoreeritakse" -#: src/sort.c:2391 +#: src/sort.c:2406 #, 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:2404 +#: src/sort.c:2419 #, 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:2436 +#: src/sort.c:2451 #, 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:2442 +#: src/sort.c:2457 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "võti '-r' rakendub ainult viimase võrdluse korral" -#: src/sort.c:2716 src/sort.c:2725 +#: src/sort.c:2731 src/sort.c:2740 msgid "write failed" msgstr "kirjutamine ebaõnnestus" -#: src/sort.c:2768 +#: src/sort.c:2783 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: korratu: " -#: src/sort.c:2771 +#: src/sort.c:2786 msgid "standard error" msgstr "standard veavoog" -#: src/sort.c:3926 +#: src/sort.c:3698 +msgid "cannot read" +msgstr "ei saa lugeda" + +#: src/sort.c:3976 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: vigane välja määrang %s" -#: src/sort.c:3937 +#: src/sort.c:3987 #, c-format msgid "options '-%s' are incompatible" msgstr "võtmed '-%s' ei sobi kokku" -#: src/sort.c:3988 +#: src/sort.c:4038 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s: vigane loendur %s alguses" -#: src/sort.c:4245 +#: src/sort.c:4295 msgid "invalid number after '-'" msgstr "vigane kuupäev peale '-'" -#: src/sort.c:4248 src/sort.c:4334 src/sort.c:4362 +#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416 msgid "invalid number after '.'" msgstr "vigane number peale '.'" -#: src/sort.c:4261 src/sort.c:4367 +#: src/sort.c:4315 src/sort.c:4421 msgid "stray character in field spec" msgstr "juhuslik sümbol välja määrangus" -#: src/sort.c:4308 +#: src/sort.c:4362 #, c-format msgid "multiple compress programs specified" msgstr "määrati mitu tihendusprogrammi" -#: src/sort.c:4325 +#: src/sort.c:4379 msgid "invalid number at field start" msgstr "vigane number välja alguses" -#: src/sort.c:4329 src/sort.c:4357 +#: src/sort.c:4383 src/sort.c:4411 msgid "field number is zero" msgstr "välja number on null" -#: src/sort.c:4338 +#: src/sort.c:4392 msgid "character offset is zero" msgstr "sümboli nihe on null" -#: src/sort.c:4353 +#: src/sort.c:4407 msgid "invalid number after ','" msgstr "vigane number peale ','" -#: src/sort.c:4403 +#: src/sort.c:4457 #, c-format msgid "empty tab" msgstr "tühi tabulaator" -#: src/sort.c:4496 src/wc.c:692 +#: src/sort.c:4550 src/wc.c:692 #, c-format msgid "cannot read file names from %s" msgstr "failist %s ei õnnestu failide nimesid lugeda" -#: src/sort.c:4518 +#: src/sort.c:4572 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s:%lu: vigane null-pikkusega faili nimi" -#: src/sort.c:4524 +#: src/sort.c:4578 #, c-format msgid "no input from %s" msgstr "%s sisend puudub" -#: src/sort.c:4570 +#: src/sort.c:4624 #, c-format msgid "using %s sorting rules" msgstr "kasutan %s järjestamise reegleid" -#: src/sort.c:4573 +#: src/sort.c:4627 #, c-format msgid "using simple byte comparison" msgstr "kasutan lihtsat baidivõrdlust" -#: src/sort.c:4604 +#: src/sort.c:4658 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "täiendav operand %s pole võtmega -%c lubatud" -#: src/split.c:184 +#: src/split.c:187 #, c-format msgid "the suffix length needs to be at least %zu" msgstr "sufiksi pikkus peab olema vähemalt %zu" -#: src/split.c:201 +#: src/split.c:204 #, c-format msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" msgstr "Kasutamine: %s [VÕTI]... [SISEND [PREFIKS]]\n" -#: src/split.c:205 +#: src/split.c:208 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" -"\n" msgstr "" "Väljasta antud suurusega tükid sisendist failidesse PREFIKSaa,\n" "PREFIKSab, ...; vaikimisi kirjutatakse 1000 rida ja vaikimisi prefiks on " "'x'.\n" "Kui sisend puudub või on -, loe standardsisendit.\n" -"\n" -#: src/split.c:214 +#: src/split.c:216 #, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" @@ -8982,7 +9375,7 @@ msgstr "" " -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:227 +#: src/split.c:229 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" @@ -8990,7 +9383,7 @@ msgstr "" " --verbose väljasta enne iga faili avamist standard veavoogu\n" " diagnostilist infot\n" -#: src/split.c:234 +#: src/split.c:236 msgid "" "\n" "CHUNKS may be:\n" @@ -9010,184 +9403,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:352 +#: src/split.c:354 #, c-format msgid "output file suffixes exhausted" msgstr "väljundfailide sufiksid said otsa" -#: src/split.c:364 +#: src/split.c:366 #, c-format msgid "creating file %s\n" msgstr "loon faili %s\n" -#: src/split.c:377 +#: src/split.c:375 +#, c-format +msgid "%s would overwrite input; aborting" +msgstr "%s kirjutab sisendi üle; katkestan" + +#: src/split.c:391 #, c-format msgid "failed to set FILE environment variable" msgstr "keskkonna muutuja FILE väärtustamine ei õnnestunud" -#: src/split.c:379 +#: src/split.c:393 #, c-format msgid "executing with FILE=%s\n" msgstr "käivitan muutujaga FILE=%s\n" -#: src/split.c:381 +#: src/split.c:395 #, c-format msgid "failed to create pipe" msgstr "ei õnnestu luua toru" -#: src/split.c:395 +#: src/split.c:409 #, c-format msgid "closing prior pipe" msgstr "sulen eelneva toru" -#: src/split.c:397 +#: src/split.c:411 #, c-format msgid "closing output pipe" msgstr "sulgen väljundtoru" -#: src/split.c:401 +#: src/split.c:415 #, c-format msgid "moving input pipe" msgstr "liigutan sisendtoru" -#: src/split.c:403 +#: src/split.c:417 #, c-format msgid "closing input pipe" msgstr "sulgen sisendtoru" -#: src/split.c:408 +#: src/split.c:422 #, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "viga käivitamisel: \"%s -c %s\"" -#: src/split.c:414 +#: src/split.c:428 #, c-format msgid "failed to close input pipe" msgstr "sisendtoru sulgemine ebaõnnestus" -#: src/split.c:450 +#: src/split.c:464 #, c-format msgid "waiting for child process" msgstr "ootan alamprotsessi lõpetamist" -#: src/split.c:460 +#: src/split.c:474 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "failiga FILE=%s, signaal %s käsult: %s" -#: src/split.c:468 +#: src/split.c:482 #, 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:475 src/timeout.c:449 +#: src/split.c:489 src/timeout.c:494 #, c-format msgid "unknown status from command (0x%X)" msgstr "tundmatu olek käsult (0x%X)" -#: src/split.c:1037 +#: src/split.c:1052 #, c-format msgid "cannot split in more than one way" msgstr "ei saa tükeldada enam kui ühel viisil" -#: src/split.c:1050 src/split.c:1192 src/split.c:1363 +#: src/split.c:1065 src/split.c:1205 src/split.c:1376 #, c-format msgid "%s: invalid number of chunks" msgstr "%s: vigane osade arv" -#: src/split.c:1054 +#: src/split.c:1069 #, c-format msgid "%s: invalid chunk number" msgstr "%s: vigane osa number" -#: src/split.c:1106 +#: src/split.c:1119 #, c-format msgid "%s: invalid suffix length" msgstr "%s: vigane sufiksi pikkus" -#: src/split.c:1131 src/split.c:1139 src/split.c:1162 src/split.c:1167 +#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180 #, c-format msgid "%s: invalid number of bytes" msgstr "%s: vigane baitide arv" -#: src/split.c:1150 src/split.c:1297 +#: src/split.c:1163 src/split.c:1310 #, c-format msgid "%s: invalid number of lines" msgstr "%s: vigane ridade arv" -#: src/split.c:1223 +#: src/split.c:1236 #, c-format msgid "line count option -%s%c... is too large" msgstr "ridade arvu võti -%s%c... on liiga suur" -#: src/split.c:1235 +#: src/split.c:1248 #, c-format msgid "%s: invalid start value for numerical suffix" msgstr "%s: vigane sufiksi alustamise number" -#: src/split.c:1263 +#: src/split.c:1276 #, c-format msgid "%s: invalid IO block size" msgstr "%s: vigane IO bloki suurus" -#: src/split.c:1284 +#: src/split.c:1297 #, 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:1321 +#: src/split.c:1334 #, 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:1356 +#: src/split.c:1369 #, 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:169 +#: src/stat.c:173 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:838 +#: src/stat.c:857 #, c-format msgid "failed to canonicalize %s" msgstr "%s kanoniseerimine ebaõnnestus" -#: src/stat.c:1050 +#: src/stat.c:1069 #, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "hoiatus: tundmatu jada '\\%c'" -#: src/stat.c:1105 +#: src/stat.c:1124 #, c-format msgid "%s: invalid directive" msgstr "%s: vigane direktiiv" -#: src/stat.c:1151 +#: src/stat.c:1170 #, c-format msgid "warning: backslash at end of format" msgstr "hoiatus: langkriips vormingu lõpus" -#: src/stat.c:1182 +#: src/stat.c:1201 #, 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:1189 +#: src/stat.c:1208 #, c-format msgid "cannot read file system information for %s" msgstr "ei õnnestu lugeda %s failisüsteemi informatsiooni" -#: src/stat.c:1209 +#: src/stat.c:1228 #, 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:1245 +#: src/stat.c:1264 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -9203,7 +9601,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1268 +#: src/stat.c:1287 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -9213,30 +9611,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1278 +#: src/stat.c:1297 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:1286 +#: src/stat.c:1305 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:1295 +#: src/stat.c:1314 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:1305 +#: src/stat.c:1324 #, c-format msgid "Context: %C\n" msgstr "Kontekst=%C\n" -#: src/stat.c:1313 +#: src/stat.c:1332 msgid "" "Access: %x\n" "Modify: %y\n" @@ -9248,19 +9646,19 @@ msgstr "" "Muutmine: %z\n" " Sünd: %w\n" -#: src/stat.c:1331 +#: src/stat.c:1350 +msgid "Display file or file system status.\n" +msgstr "Näita faili või failisüsteemi olekut.\n" + +#: src/stat.c:1356 msgid "" -"Display file or file system status.\n" -"\n" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" -"Esita faili või failisüsteemi olek.\n" -"\n" " -L, --dereference järgi viiteid\n" " -f, --filesystem esita faili oleku asemel failisüsteemi olek\n" -#: src/stat.c:1337 +#: src/stat.c:1360 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -9277,7 +9675,7 @@ msgstr "" " Kui soovite reavahetust, kasutage \\n.\n" " -t, --terse esita info lakooniliselt\n" -#: src/stat.c:1348 +#: src/stat.c:1371 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -9297,7 +9695,7 @@ msgstr "" " %B iga `%b' poolt antud bloki maht baitides\n" " %C SELinux turvakontekst\n" -#: src/stat.c:1357 +#: src/stat.c:1380 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -9313,7 +9711,7 @@ msgstr "" " %g omaniku grupi ID\n" " %G omaniku grupi nimi\n" -#: src/stat.c:1365 +#: src/stat.c:1388 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -9335,7 +9733,7 @@ msgstr "" " %t seadme kuueteistkümnendsüsteemis põhinumber\n" " %T seadme kuueteistkümnendsüsteemis alamnumber\n" -#: src/stat.c:1376 +#: src/stat.c:1399 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -9361,7 +9759,7 @@ msgstr "" " %Z viimane muutmine, sekundites alates epohhist\n" "\n" -#: src/stat.c:1390 +#: src/stat.c:1413 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -9379,7 +9777,7 @@ msgstr "" " %d vabu failikirjeid failisüsteemis\n" " %f vabu blokke failisüsteemis\n" -#: src/stat.c:1399 +#: src/stat.c:1422 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -9405,12 +9803,9 @@ msgstr "Kasutamine: %s [VÕTI]... KÄSKLUS\n" #: src/stdbuf.c:91 msgid "" "Run COMMAND, with modified buffering operations for its standard streams.\n" -"\n" -msgstr "" -"Käivita KÄSKLUS, kasutades standardvoogude muudetud seadeid.\n" -"\n" +msgstr "Käivita KÄSKLUS, kasutades standardvoogude muudetud seadeid.\n" -#: src/stdbuf.c:98 +#: src/stdbuf.c:97 msgid "" " -i, --input=MODE adjust standard input stream buffering\n" " -o, --output=MODE adjust standard output stream buffering\n" @@ -9420,7 +9815,7 @@ msgstr "" " -o, --output=MOOD kohenda standard väljundi puhverdust\n" " -e, --error=MOOD kohenda standard veavoo puhverdust\n" -#: src/stdbuf.c:105 +#: src/stdbuf.c:104 msgid "" "\n" "If MODE is 'L' the corresponding stream will be line buffered.\n" @@ -9430,7 +9825,7 @@ msgstr "" "Kui MOOD on 'L', siis kasutatakse vastava voo korral reapuhvrit.\n" "See parameeter pole standardsisendi korral lubatud.\n" -#: src/stdbuf.c:108 +#: src/stdbuf.c:107 msgid "" "\n" "If MODE is '0' the corresponding stream will be unbuffered.\n" @@ -9438,7 +9833,7 @@ msgstr "" "\n" "Kui MOOD on '0', siis vastavaid vooge ei puhverdata.\n" -#: src/stdbuf.c:111 +#: src/stdbuf.c:110 msgid "" "\n" "Otherwise MODE is a number which may be followed by one of the following:\n" @@ -9452,7 +9847,7 @@ msgstr "" "KB 1000, K 1024, MB 1000*1000, M 1024*1024 ja nii edasi G, T, P, E, Z, Y.\n" "Sellise seadega on voog puhverdatud ja MOOD on puhvri suurus.\n" -#: src/stdbuf.c:117 +#: src/stdbuf.c:116 msgid "" "\n" "NOTE: If COMMAND adjusts the buffering of its standard streams ('tee' does\n" @@ -9467,22 +9862,22 @@ 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:227 +#: src/stdbuf.c:226 #, c-format msgid "failed to find %s" msgstr "%s ei leitud" -#: src/stdbuf.c:247 src/stdbuf.c:279 +#: src/stdbuf.c:246 src/stdbuf.c:278 #, c-format msgid "failed to update the environment with %s" msgstr "keskkonna muutmine väärtusega %s ei õnnestunud" -#: src/stdbuf.c:321 +#: src/stdbuf.c:320 #, c-format msgid "line buffering stdin is meaningless" msgstr "reapuhver standardsisendil ei oma mõtet" -#: src/stty.c:509 +#: src/stty.c:513 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -9493,22 +9888,22 @@ msgstr "" " või: %s [-F SEADE] [--file=SEADE] [-a|--all]\n" " või: %s [-F SEADE] [--file=SEADE] [-g|--save]\n" -#: src/stty.c:515 +#: src/stty.c:519 +msgid "Print or change terminal characteristics.\n" +msgstr "Näita või muuda terminali seadistust.\n" + +#: src/stty.c:525 msgid "" -"Print or change terminal characteristics.\n" -"\n" " -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 "" -"Väljasta või muuda terminali seadeid.\n" -"\n" " -a, --all väljasta kõik kehtivad seaded inimesele loetavalt\n" " -g, --save väljasta kõik kehtivad seaded stty programmile " "loetavalt\n" " -F, --file=SEADE ava ja kasuta standardsisendi asemel antud seadet\n" -#: src/stty.c:524 +#: src/stty.c:532 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -9519,7 +9914,7 @@ msgstr "" "mittevastavat seadet. Seadete kasutatavuse määrab kasutatav\n" "operatsioonisüsteem.\n" -#: src/stty.c:529 +#: src/stty.c:537 msgid "" "\n" "Special characters:\n" @@ -9534,7 +9929,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:536 +#: src/stty.c:544 msgid "" " * eol2 CHAR alternate CHAR for ending the line\n" " erase CHAR CHAR will erase the last character typed\n" @@ -9546,7 +9941,7 @@ msgstr "" " intr SÜMBOL SÜMBOL saadab katkestamise signaali\n" " kill SÜMBOL SÜMBOL kustutab jooksva rea\n" -#: src/stty.c:542 +#: src/stty.c:550 msgid "" " * lnext CHAR CHAR will enter the next character quoted\n" " quit CHAR CHAR will send a quit signal\n" @@ -9558,7 +9953,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:548 +#: src/stty.c:556 msgid "" " stop CHAR CHAR will stop the output\n" " susp CHAR CHAR will send a terminal stop signal\n" @@ -9570,7 +9965,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:554 +#: src/stty.c:562 msgid "" "\n" "Special settings:\n" @@ -9584,7 +9979,7 @@ msgstr "" " * cols N teata tuumale, et terminalil on N veergu\n" " * columns N sama, kui cols N\n" -#: src/stty.c:561 +#: src/stty.c:569 msgid "" " ispeed N set the input speed to N\n" " * line N use line discipline N\n" @@ -9598,7 +9993,7 @@ msgstr "" "sümbolit\n" " ospeed N sea väljundi kiiruseks N\n" -#: src/stty.c:567 +#: src/stty.c:575 msgid "" " * rows N tell the kernel that the terminal has N rows\n" " * size print the number of rows and columns according to the " @@ -9612,30 +10007,32 @@ msgstr "" " time N -icanon omadusega, sea lugemise taimout N sekundi " "kümnendikku\n" -#: src/stty.c:573 +#: src/stty.c:581 msgid "" "\n" "Control settings:\n" " [-]clocal disable modem control signals\n" " [-]cread allow input to be received\n" " * [-]crtscts enable RTS/CTS handshaking\n" +" * [-]cdtrdsr enable DTR/DSR handshaking\n" " csN set character size to N bits, N in [5..8]\n" msgstr "" "\n" "Kontrollseaded:\n" -" [-]clocal blokeeri modemi kontrolli signaalid\n" -" [-]cread luba sisendit\n" -"* [-]crtscts luba RTS/CTS vookontroll\n" -" csN sea sümboli suuruseks N bitti, N vahemikust [5..8]\n" +" [-]clocal blokeeri modemi kontrolli signaalid\n" +" [-]cread luba sisendit\n" +" * [-]crtscts luba RTS/CTS vookontroll\n" +" * [-]cdtrdsr luba DRT/DSR vookontroll\n" +" csN sea sümboli suuruseks N bitti, N vahemikust [5..8]\n" -#: src/stty.c:581 +#: src/stty.c:590 msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" " [-]hupcl same as [-]hup\n" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" -" [-]parodd set odd parity (even with '-')\n" +" [-]parodd set odd parity (or even parity with '-')\n" msgstr "" " [-]cstopb kasuta sümboli kohta kaht stop bitti (üks '-' korral)\n" " [-]hup saada hangup signaal, kui viimane protsess suleb tty\n" @@ -9643,7 +10040,7 @@ msgstr "" " [-]parenb genereeri väljundis paarsusbitt ja eelda paarsust sisendis\n" " [-]parodd sea paaritu paarsus (paaris '-' korral)\n" -#: src/stty.c:588 +#: src/stty.c:597 msgid "" "\n" "Input settings:\n" @@ -9659,7 +10056,7 @@ msgstr "" " [-]ignbrk ignoreeri break sümbolit\n" " [-]igncr ignoreeri rea algusse sümbolit\n" -#: src/stty.c:596 +#: src/stty.c:605 msgid "" " [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" @@ -9673,12 +10070,12 @@ msgstr "" " [-]inpck luba sisendi paarsuse kontroll\n" " [-]istrip eemalda sisendsümbolitelt ülemine (8-s) bitt\n" -#: src/stty.c:603 +#: src/stty.c:612 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr "" " * [-]iutf8 eelda et sisendsümbolid kasutavad UTF-8 kooditabelit\n" -#: src/stty.c:606 +#: src/stty.c:615 msgid "" " * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" @@ -9694,7 +10091,7 @@ msgstr "" " [-]parmrk märgi paarsusvead (kasutatakse 255-0-sümbol järjendis)\n" " [-]tandem sama, kui [-]ixoff\n" -#: src/stty.c:614 +#: src/stty.c:623 msgid "" "\n" "Output settings:\n" @@ -9710,7 +10107,7 @@ msgstr "" " * ffN lehevahetuse viivitus, N vahemikust [0..1]\n" " * nlN reavahetuse viivitus, N vahemikust [0..1]\n" -#: src/stty.c:622 +#: src/stty.c:631 msgid "" " * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of null characters\n" @@ -9726,7 +10123,7 @@ msgstr "" " * [-]onlcr tõlgi reavahetus paariks rea algusse-reavahetus\n" " * [-]onlret reavahetus käitub, nagu rea algusse sümbol\n" -#: src/stty.c:630 +#: src/stty.c:639 msgid "" " * [-]onocr do not print carriage returns in the first column\n" " [-]opost postprocess output\n" @@ -9742,7 +10139,7 @@ msgstr "" " * -tabs sama, kui tab3\n" " * vtN vertikaalse tabulaatori viivitus, N vahemikust [0..1]\n" -#: src/stty.c:638 +#: src/stty.c:647 msgid "" "\n" "Local settings:\n" @@ -9757,7 +10154,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:645 +#: src/stty.c:654 msgid "" " * [-]ctlecho echo control characters in hat notation ('^c')\n" " [-]echo echo input characters\n" @@ -9771,7 +10168,7 @@ msgstr "" " [-]echoe sama, kui [-]crterase\n" " [-]echok väljasta kill sümboli järel reavahetus\n" -#: src/stty.c:652 +#: src/stty.c:661 msgid "" " * [-]echoke same as [-]crtkill\n" " [-]echonl echo newline even if not echoing other characters\n" @@ -9785,7 +10182,7 @@ msgstr "" " [-]icanon luba spetsiaalsümbolid erase, kill, werase ja rprnt\n" " [-]iexten luba POSIX mittevastavad spetsiaalsümbolid\n" -#: src/stty.c:659 +#: src/stty.c:668 msgid "" " [-]isig enable interrupt, quit, and suspend special characters\n" " [-]noflsh disable flushing after interrupt and quit special " @@ -9801,7 +10198,7 @@ msgstr "" " * [-]tostop peata taustatööd, mis üritavad terminalile kirjutada\n" " * [-]xcase icanon omadusega, kasuta suurtähtede ees '\\'\n" -#: src/stty.c:666 +#: src/stty.c:675 msgid "" "\n" "Combination settings:\n" @@ -9815,7 +10212,7 @@ msgstr "" " cbreak sama, kui -icanon\n" " -cbreak sama, kui icanon\n" -#: src/stty.c:673 +#: src/stty.c:682 msgid "" " cooked same as brkint ignpar istrip icrnl ixon opost isig\n" " icanon, eof and eol characters to their default values\n" @@ -9827,7 +10224,7 @@ msgstr "" " -cooked sama, kui raw\n" " crt sama, kui echoe echoctl echoke\n" -#: src/stty.c:679 +#: src/stty.c:688 msgid "" " dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" " kill ^u\n" @@ -9841,7 +10238,7 @@ msgstr "" " ek erase ja kill sümbolid seatakse vaikimisi väärtustele\n" " evenp sama, kui parenb -parodd cs7\n" -#: src/stty.c:686 +#: src/stty.c:695 msgid "" " -evenp same as -parenb cs8\n" " * [-]lcase same as xcase iuclc olcuc\n" @@ -9857,7 +10254,7 @@ msgstr "" " nl sama, kui -icrnl -onlcr\n" " -nl sama, kui icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" -#: src/stty.c:694 +#: src/stty.c:703 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -9871,7 +10268,7 @@ msgstr "" " pass8 sama, kui -parenb -istrip cs8\n" " -pass8 sama, kui parenb istrip cs7\n" -#: src/stty.c:701 +#: src/stty.c:710 msgid "" " raw same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" " -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n" @@ -9883,7 +10280,7 @@ msgstr "" " -imaxbel -opost -isig -icanon -xcase min 1 time 0\n" " -raw sama, kui cooked\n" -#: src/stty.c:707 +#: src/stty.c:716 msgid "" " sane same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" " -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n" @@ -9899,7 +10296,7 @@ msgstr "" " -xcase -tostop -echoprt echoctl echoke, kõik\n" " spetsiaalsümbolid seatakse vaikimisi väärtustele\n" -#: src/stty.c:715 +#: src/stty.c:724 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -9914,12 +10311,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:787 +#: src/stty.c:796 #, c-format msgid "only one device may be specified" msgstr "lubatud on ainult üks seade" -#: src/stty.c:817 +#: src/stty.c:826 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" @@ -9928,124 +10325,47 @@ msgstr "" "inimesele loetava ja programmile loetava väljundi seaded on üksteist " "välistavad" -#: src/stty.c:823 +#: src/stty.c:832 #, 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:838 +#: src/stty.c:847 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s: ei õnnestu eemaldada mitte-blokeeruvat moodi" -#: src/stty.c:883 src/stty.c:993 +#: src/stty.c:892 src/stty.c:1002 #, c-format msgid "invalid argument %s" msgstr "vigane argument %s" -#: src/stty.c:894 src/stty.c:911 src/stty.c:923 src/stty.c:936 src/stty.c:948 -#: src/stty.c:968 +#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957 +#: src/stty.c:977 #, c-format msgid "missing argument to %s" msgstr "%s nõuab argumenti" -#: src/stty.c:974 +#: src/stty.c:983 #, c-format msgid "invalid line discipline %s" msgstr "vigane liini määrang %s" -#: src/stty.c:1044 +#: src/stty.c:1053 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s: kõiki nõutud operatsioone ei õnnestunud sooritada" -#: src/stty.c:1390 +#: src/stty.c:1399 #, c-format msgid "%s: no size information for this device" msgstr "%s: sellel seadmel puudub info suuruse kohta" -#: src/stty.c:1904 +#: src/stty.c:1920 #, c-format msgid "invalid integer argument %s" msgstr "vigane numbriline argument %s" -#: src/su.c:229 -msgid "Password:" -msgstr "Parool:" - -#: src/su.c:232 -#, c-format -msgid "getpass: cannot open /dev/tty" -msgstr "getpass: ei õnnestu avada /dev/tty" - -#: src/su.c:290 -#, c-format -msgid "cannot set groups" -msgstr "ei õnnestu seada gruppe" - -#: src/su.c:294 -#, c-format -msgid "cannot set group id" -msgstr "ei õnnestu seada grupi id" - -#: src/su.c:296 -#, c-format -msgid "cannot set user id" -msgstr "ei õnnestu seada kasutaja id" - -#: src/su.c:371 -#, c-format -msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" -msgstr "Kasutamine: %s [VÕTI]... [-] [KASUTAJA [ARGUMENT]...]\n" - -#: src/su.c:372 -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 "" -"Muuda kasutaja efektiine kasutaja id ja grupi id.\n" -"\n" -" -, -l, --login meldi kasutajana\n" -" -c, --command=KÄSK edasta KÄSK shellile võtmega -c\n" -" -f, --fast edasta shellile võti -f (csh või tcsh)\n" -" -m, --preserve-environment säilita keskkonnamuutujaid\n" -" -p sama, kui -m\n" -" -s, --shell=PROGRAMM käivita PROGRAMM, kui /etc/shells seda lubab\n" - -#: src/su.c:384 -msgid "" -"\n" -"A mere - implies -l. If USER not given, assume root.\n" -msgstr "" -"\n" -"Ainult - rakendab võtme -l. Kui KASUTAJA ei antud, kasuta nime root.\n" - -#: src/su.c:461 -#, c-format -msgid "user %s does not exist" -msgstr "kasutajat %s ei ole" - -#: src/su.c:484 -#, c-format -msgid "incorrect password" -msgstr "vale parool" - -#: src/su.c:501 -#, c-format -msgid "using restricted shell %s" -msgstr "kasutan piiratud käsuinterpretaatorit %s" - -#: src/su.c:509 -#, c-format -msgid "warning: cannot change directory to %s" -msgstr "hoiatus: ei saa minna kataloogi %s" - #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 msgid "Kayvan Aghaiepour" @@ -10077,7 +10397,7 @@ msgstr "" msgid "ignoring all arguments" msgstr "ignoreerin kõiki argumente" -#: src/system.h:340 +#: src/system.h:343 #, c-format msgid "" "\n" @@ -10091,15 +10411,24 @@ msgstr "" "eelistatakse siinkirjeldatule. Täpsemat infot ja kasutusjuhendi leiate\n" "oma käsuinterpretaatori dokumentatsioonist.\n" -#: src/system.h:346 +#: src/system.h:349 msgid " --help display this help and exit\n" msgstr " --help väljasta see abiinfo ja lõpeta töö\n" -#: src/system.h:348 +#: src/system.h:351 msgid " --version output version information and exit\n" msgstr " --version väljasta versiooniinfo ja lõpeta töö\n" -#: src/system.h:541 +#: src/system.h:544 +msgid "" +"\n" +"Mandatory arguments to long options are mandatory for short options too.\n" +msgstr "" +"\n" +"Kohustuslikud argumendid pikkadele võtmetele on kohustuslikud ka " +"lühikestele.\n" + +#: src/system.h:552 msgid "" "\n" "SIZE is an integer and optional unit (example: 10M is 10*1024*1024). Units\n" @@ -10110,7 +10439,7 @@ msgstr "" "SUURUS on täisarv ja võimalik ühik (näiteks: 10M on 10*1024*1024). Ühikud\n" "on K, M, G, T, P, E, Z, Y (1024 kordsed) või KB, MB, ... (1000 kordsed).\n" -#: src/system.h:550 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -10124,7 +10453,7 @@ msgstr "" "keskkonnamuutujatest. Muidu on ühik vaikimisi 1024 (või 512, kui \n" "POSIXLY_CORRECT on seatud).\n" -#: src/system.h:560 +#: src/system.h:571 #, c-format msgid "" "\n" @@ -10137,24 +10466,24 @@ msgstr "" #. <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:574 +#: src/system.h:585 #, 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:578 +#: src/system.h:589 #, 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:585 +#: src/system.h:596 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "Lisainfo saamiseks proovige '%s --help'.\n" -#: src/system.h:617 +#: src/system.h:628 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -10178,13 +10507,11 @@ msgstr "Jay Lepreau" msgid "" "Write each FILE to standard output, last line first.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" "Kirjuta iga FAIL standardväljundisse, viimane rida esimesena.\n" "Kui FAIL puudub või on -, loe standardsisendit.\n" -"\n" -#: src/tac.c:145 +#: src/tac.c:144 msgid "" " -b, --before attach the separator before instead of after\n" " -r, --regex interpret the separator as a regular expression\n" @@ -10194,42 +10521,42 @@ msgstr "" " -r, --regex interpreteeri eraldajat regulaaravaldisena\n" " -s, --separator=SÕNE kasuta reavahetuse asemel eraldajana SÕNE\n" -#: src/tac.c:235 src/tac.c:336 +#: src/tac.c:234 src/tac.c:335 #, c-format msgid "%s: seek failed" msgstr "%s: seek ebaõnnestus" -#: src/tac.c:264 +#: src/tac.c:263 #, c-format msgid "record too large" msgstr "kirje on liiga suur" -#: src/tac.c:451 +#: src/tac.c:450 #, c-format msgid "failed to create temporary file in %s" msgstr "%s sees ei õnnestu ajutist faili luua" -#: src/tac.c:459 +#: src/tac.c:458 #, c-format msgid "failed to open %s for writing" msgstr "faili %s ei saa kirjutamiseks avada" -#: src/tac.c:476 +#: src/tac.c:475 #, c-format msgid "failed to rewind stream for %s" msgstr "%s voogu ei saa kerida" -#: src/tac.c:512 src/tac.c:519 +#: src/tac.c:511 src/tac.c:518 #, c-format msgid "%s: write error" msgstr "%s: viga kirjutamisel" -#: src/tac.c:572 +#: src/tac.c:571 #, c-format msgid "failed to open %s for reading" msgstr "%s ei õnnestu lugemiseks avada" -#: src/tac.c:630 +#: src/tac.c:629 #, c-format msgid "separator cannot be empty" msgstr "eraldaja ei või olla tühi" @@ -10245,14 +10572,12 @@ 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" -"\n" msgstr "" "Väljasta viimased %d rida igast FAILIST standardväljundisse.\n" "Enam, kui ühe FAILI korral, lisa iga faili ette päis faili nimega.\n" "Kui FAIL puudub või on -, loe standardsisendit.\n" -"\n" -#: src/tail.c:271 +#: src/tail.c:270 msgid "" " -c, --bytes=K output the last K bytes; alternatively, use -c " "+K\n" @@ -10262,7 +10587,7 @@ msgstr "" " -c, --bytes=K väljasta viimased K baiti; alternatiiv, kasutage\n" " K-nda baidiga alustades baidid võtmega -c +K\n" -#: src/tail.c:275 +#: src/tail.c:274 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -10275,7 +10600,7 @@ msgstr "" " -f, --follow ja --follow=pide on samaväärsed\n" " -F sama, kui --follow=nimi --retry\n" -#: src/tail.c:282 +#: src/tail.c:281 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -10301,7 +10626,7 @@ msgstr "" " logifailidega). inotify korral pole seda võtit\n" " eriti vaja.\n" -#: src/tail.c:295 +#: src/tail.c:294 msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" " -q, --quiet, --silent never output headers giving file names\n" @@ -10315,7 +10640,7 @@ msgstr "" " muutub mittekasutatavaks; kasutatav võtmega\n" " --follow=nimi\n" -#: src/tail.c:302 +#: src/tail.c:301 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations.\n" @@ -10330,7 +10655,7 @@ msgstr "" " protsessi P vähemalt N sekundi järel.\n" " -v, --verbose väljasta alati päised faili nimega\n" -#: src/tail.c:311 +#: src/tail.c:310 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -10349,7 +10674,7 @@ msgstr "" "G 1024*1024*1024 ja nii edasi tähtedega T, P, E, Z, Y.\n" "\n" -#: src/tail.c:320 +#: src/tail.c:319 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" @@ -10366,27 +10691,27 @@ msgstr "" "seda perioodiliselt uuesti, millega testitakse faili ümber nimetatmist,\n" "kustutamist ja uuesti loomist.\n" -#: src/tail.c:379 +#: src/tail.c:378 #, c-format msgid "closing %s (fd=%d)" msgstr "sulen %s (fd=%d)" -#: src/tail.c:454 +#: 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:458 +#: src/tail.c:457 #, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "%s: ei õnnestu liikuda lõpu-suhtelisele nihkele %s" -#: src/tail.c:895 +#: src/tail.c:894 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "%s asukohta ei õnnestu tuvastada. kasutan pollimist" -#: src/tail.c:907 +#: src/tail.c:906 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " @@ -10395,37 +10720,37 @@ msgstr "" "tundmatu failisüsteemi tüüp 0x%08lx %s jaoks. Palun saatke raport: %s. " "kasutan pollimist" -#: src/tail.c:964 +#: src/tail.c:963 #, c-format msgid "%s has become inaccessible" msgstr "%s pole enam kasutatav" -#: src/tail.c:981 +#: src/tail.c:980 #, 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:990 +#: src/tail.c:989 #, 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:1011 +#: src/tail.c:1010 #, c-format msgid "%s has become accessible" msgstr "%s on jälle kasutatav" -#: src/tail.c:1019 +#: src/tail.c:1018 #, c-format msgid "%s has appeared; following end of new file" msgstr "%s tekkis; järgin uue faili lõppu" -#: src/tail.c:1030 +#: src/tail.c:1029 #, c-format msgid "%s has been replaced; following end of new file" msgstr "%s asendati; järgin uue faili lõppu" -#: src/tail.c:1131 +#: src/tail.c:1130 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: ei õnnestu muuta mitte-blokeeruvat moodi" @@ -10789,17 +11114,22 @@ msgstr "puudub ']'" msgid "extra argument %s" msgstr "liigne argument: %s" -#: src/timeout.c:124 +#: src/timeout.c:112 +#, c-format +msgid "warning: sigprocmask" +msgstr "hoiatus: sigprocmask" + +#: src/timeout.c:145 #, c-format msgid "warning: timer_settime" msgstr "hoiatus: timer_settime" -#: src/timeout.c:129 +#: src/timeout.c:150 #, c-format msgid "warning: timer_create" msgstr "hoiatus: timer_create" -#: src/timeout.c:204 +#: src/timeout.c:225 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -10808,19 +11138,16 @@ msgstr "" "Kasutamine: %s [VÕTI] KESTUS KÄSKLUS [ARGUMENT]...\n" " või: %s [VÕTI]\n" -#: src/timeout.c:208 -msgid "" -"Start COMMAND, and kill it if still running after DURATION.\n" -"\n" -"Mandatory arguments to long options are mandatory for short options too.\n" +#: src/timeout.c:229 +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" -"\n" -"Kohustuslikud argumendid pikkadele võtmetele on kohustuslikud ka " -"lühikestele.\n" -#: src/timeout.c:213 +#: src/timeout.c:235 msgid "" +" --preserve-status\n" +" exit with the same status as COMMAND, even when the\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 " @@ -10834,20 +11161,22 @@ msgid "" " 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" " --foreground\n" " Kui ei tööta esiplaanil, luba käsul lugeda terminali ja\n" " saada terminali signaale.\n" -"\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" +" saada KILL signaal, kui käsklus on nii kaua käinud peale\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:229 +#: src/timeout.c:254 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -10858,33 +11187,42 @@ 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:234 +#: src/timeout.c:259 msgid "" "\n" -"If the command times out, then exit with status 124. Otherwise, exit\n" -"with the status of COMMAND. If no signal is specified, send the TERM\n" -"signal upon timeout. The TERM signal kills any process that does not\n" -"block or catch that signal. For other processes, it may be necessary to\n" -"use the KILL (9) signal, since this signal cannot be caught. If the\n" -"KILL (9) signal is sent, the exit status is 128+9 rather than 124.\n" +"If the command times out, and --preserve-status is not set, then exit with\n" +"status 124. Otherwise, exit with the status of COMMAND. If no signal\n" +"is specified, send the TERM signal upon timeout. The TERM signal kills\n" +"any process that does not block or catch that signal. It may be necessary\n" +"to use the KILL (9) signal, since this signal cannot be caught, in which\n" +"case the exit status is 128+9 rather than 124.\n" msgstr "" "\n" -"Kui käsklus ei lõpeta õigeaegselt, lõpetab koodiga 124. Muidu lõpetab\n" -"käsu lõpetamise koodiga. Kui signaali ei määratud, saadab TERM signaali.\n" -"TERM signaal tapab iga protsessi, mis seda signaali ei blokeeri või\n" -"kinni ei püüa. Muude protsesside korral võib olla vajalik kasutada\n" +"Kui käsklus ei lõpeta õigeaegselt ja --preserve-status ei kasutatud, " +"lõpetab\n" +"koodiga 124. Muidu lõpetab käsu lõpetamise koodiga. Kui signaali ei " +"määratud,\n" +"saadab TERM signaali. TERM signaal tapab iga protsessi, mis seda signaali " +"ei\n" +"blokeeri või kinni ei püüa. Muude protsesside korral võib olla vajalik " +"kasutada\n" "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:419 +#: src/timeout.c:363 +#, c-format +msgid "warning: disabling core dumps failed" +msgstr "hoiatus: mälupildi salvaestamise keelamine ei õnnestunud" + +#: src/timeout.c:471 #, c-format msgid "error waiting for command" msgstr "viga käsu järele ootamisel" -#: src/timeout.c:441 +#: src/timeout.c:482 #, c-format -msgid "warning: disabling core dumps failed" -msgstr "hoiatus: mälupildi salvaestamise keelamine ei õnnestunud" +msgid "the monitored command dumped core" +msgstr "jälgitav käsk salvestas core faili" #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 @@ -10896,22 +11234,22 @@ msgstr "Jim Kingdon" msgid "Randy Smith" msgstr "Randy Smith" -#: src/touch.c:115 src/touch.c:313 +#: src/touch.c:115 src/touch.c:309 #, c-format msgid "invalid date format %s" msgstr "vigane kuupäeva vorming %s" -#: src/touch.c:194 +#: src/touch.c:191 #, c-format msgid "cannot touch %s" msgstr "%s ei õnnestu kasutada" -#: src/touch.c:200 +#: src/touch.c:197 #, c-format msgid "setting times of %s" msgstr "sean faili %s aegu" -#: src/touch.c:216 +#: src/touch.c:213 msgid "" "Update the access and modification times of each FILE to the current time.\n" "\n" @@ -10920,7 +11258,6 @@ msgid "" "\n" "A FILE argument string of - is handled specially and causes touch to\n" "change the times of the file associated with standard output.\n" -"\n" msgstr "" "Sea iga faili kasutamise ja muutmise ajad antud ajahetkele.\n" "\n" @@ -10928,9 +11265,8 @@ msgstr "" "kasutamisel.\n" "\n" "Kui fail on -, muudetakse faili, mis on seotud standardväljundiga.\n" -"\n" -#: src/touch.c:229 +#: src/touch.c:225 msgid "" " -a change only the access time\n" " -c, --no-create do not create any files\n" @@ -10942,7 +11278,7 @@ msgstr "" " -d, --date=SÕNE analüüsi SÕNE ja kasuta seda jooksva aja asemel\n" " -f (ignoreeritakse)\n" -#: src/touch.c:235 +#: src/touch.c:231 msgid "" " -h, --no-dereference affect each symbolic link instead of any " "referenced\n" @@ -10955,21 +11291,21 @@ msgstr "" " omanikku)\n" " -m muuda ainult muutmise (modification) aega\n" -#: src/touch.c:241 +#: src/touch.c:237 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" -" --time=WORD change the specified time:\n" +" --time=WORD change the specified time:\n" " WORD is access, atime, or use: equivalent to -a\n" " WORD is modify or mtime: equivalent to -m\n" msgstr "" " -r, --reference=FAIL kasuta jooksva aja asemel selle faili aegu\n" " -t TEMPEL kasuta jooksva aja asemel [[SS]AA]KKPPttmm[.ss]\n" -" --time=SÕNA sea antud aeg, SÕNA võib olla: \n" -" access, atime või use (sama kui -a)\n" -" modify või mtime (sama kui -m)\n" +" --time=SÕNA sea antud aeg, SÕNA võib olla: \n" +" access, atime või use: sama kui -a\n" +" modify või mtime: sama kui -m\n" -#: src/touch.c:250 +#: src/touch.c:246 msgid "" "\n" "Note that the -d and -t options accept different time-date formats.\n" @@ -10977,12 +11313,12 @@ msgstr "" "\n" "Pange tähele, et võtmed -d ja -t kasutavad erinevaid aja vorminguid.\n" -#: src/touch.c:339 +#: src/touch.c:335 #, c-format msgid "cannot specify times from more than one source" msgstr "ei õnnestu kirjeldada aegu rohkem kui ühest allikast" -#: src/touch.c:413 +#: src/touch.c:409 #, c-format msgid "" "warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'" @@ -11264,7 +11600,6 @@ msgid "" "If a FILE is larger than the specified size, the extra data is lost.\n" "If a FILE is shorter, it is extended and the extended part (hole)\n" "reads as zero bytes.\n" -"\n" msgstr "" "Lühenda või kasvata iga faili antud suuruseni\n" "\n" @@ -11273,20 +11608,19 @@ msgstr "" "Kui fail on suurem, kui antud suurus, liigsed andmed kustutatakse.\n" "Kui fail on väiksem, seda kasvatatakse ja täiendav osa loetakse null " "baitidena.\n" -"\n" -#: src/truncate.c:110 +#: src/truncate.c:109 msgid " -c, --no-create do not create any files\n" msgstr " -c, --no-create ära loo ühtegi faili\n" -#: src/truncate.c:113 +#: src/truncate.c:112 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" " -o, --io-blocks käsitle SUURUS kui IO blokkide arvu, baitide " "asemel\n" -#: src/truncate.c:116 +#: 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" @@ -11294,7 +11628,7 @@ msgstr "" " -r, --reference=FAIL kasuta selle faili suurust\n" " -s, --size=SUURUS sea või muuda faili suurust\n" -#: src/truncate.c:122 +#: src/truncate.c:121 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -11306,57 +11640,57 @@ msgstr "" "'+' suurenda, '-' vähenda, '<' kuni, '>' vähemalt,\n" "'/' ümarda alla kordseks, '%' ümarda üles kordseks.\n" -#: src/truncate.c:150 +#: src/truncate.c:149 #, c-format msgid "overflow in %<PRIdMAX> * %<PRIdMAX> byte blocks for file %s" msgstr "ületäitumine %<PRIdMAX> * %<PRIdMAX> baiti blokke faili %s kohta" -#: src/truncate.c:174 +#: src/truncate.c:173 #, c-format msgid "%s has unusable, apparently negative size" msgstr "%s pole kasutatav, negatiivne suurus" -#: src/truncate.c:184 src/truncate.c:379 +#: src/truncate.c:183 src/truncate.c:384 #, c-format msgid "cannot get the size of %s" msgstr "ei õnnestu lugeda %s suurust" -#: src/truncate.c:206 +#: src/truncate.c:205 #, c-format msgid "overflow rounding up size of file %s" msgstr "faili %s suuruse ümardamisel tekkis ületäitumine" -#: src/truncate.c:216 +#: src/truncate.c:215 #, c-format msgid "overflow extending size of file %s" msgstr "faili %s suurendamisel tekkis ületäitumine" -#: src/truncate.c:231 +#: src/truncate.c:230 #, c-format msgid "failed to truncate %s at %<PRIdMAX> bytes" msgstr "%s lühendamine %<PRIdMAX> baidile ebaõnnestus" -#: src/truncate.c:305 +#: src/truncate.c:303 #, c-format msgid "multiple relative modifiers specified" msgstr "määrati mitu suhtelist modifikaatorit" -#: src/truncate.c:335 +#: src/truncate.c:333 #, c-format msgid "you must specify either %s or %s" msgstr "peab olema määratud kas %s või %s" -#: src/truncate.c:342 +#: src/truncate.c:340 #, c-format msgid "you must specify a relative %s with %s" msgstr "peab olema määratud suhteline %s %s korral" -#: src/truncate.c:349 +#: src/truncate.c:347 #, c-format msgid "%s was specified but %s was not" msgstr "%s on antud, aga %s mitte" -#: src/truncate.c:400 +#: src/truncate.c:404 #, c-format msgid "cannot open %s for writing" msgstr "%s ei õnnestu kirjutamiseks avada" @@ -11452,13 +11786,11 @@ msgstr "ei õnnestu leida süsteemi nime" msgid "" "Convert blanks in each FILE to tabs, writing to standard output.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" "Teisenda igas FAILis tühikud tabulaatoriteks, väljasta standardväljundisse.\n" "Kui FAIL puudub, või on -, loe standardsisendit.\n" -"\n" -#: src/unexpand.c:125 +#: src/unexpand.c:124 msgid "" " -a, --all convert all blanks, instead of just initial blanks\n" " --first-only convert only leading sequences of blanks (overrides -a)\n" @@ -11471,12 +11803,12 @@ msgstr "" " -t, --tabs=LOEND komadega eraldatud tabulaatori positsioonid (lubab -" "a)\n" -#: src/unexpand.c:153 +#: src/unexpand.c:152 #, c-format msgid "tabs are too far apart" msgstr "tabulaatorid on liiga kaugel" -#: src/unexpand.c:505 +#: src/unexpand.c:504 #, c-format msgid "tab stop value is too large" msgstr "tabulaatori peatus on liiga suur" @@ -11492,15 +11824,13 @@ msgid "" "writing to OUTPUT (or standard output).\n" "\n" "With no options, matching lines are merged to the first occurrence.\n" -"\n" msgstr "" "Filtreeri sisendis (standard sisend) järgnevad kordused, väljastades\n" "väljundisse (standardväljund). \n" "\n" "Võtmeteta, sobivad read mestitakse esimese esinemiseni.\n" -"\n" -#: src/uniq.c:148 +#: src/uniq.c:147 msgid "" " -c, --count prefix lines by the number of occurrences\n" " -d, --repeated only print duplicate lines\n" @@ -11508,7 +11838,7 @@ msgstr "" " -c, --count lisa rea algusse esinemise number\n" " -d, --repeated väljasta ainult dubleeritud read\n" -#: src/uniq.c:152 +#: src/uniq.c:151 msgid "" " -D, --all-repeated[=delimit-method] print all duplicate lines\n" " delimit-method={none(default),prepend,separate}\n" @@ -11528,11 +11858,11 @@ msgstr "" " -u, --unique väljasta ainult dubleerimata read\n" " -z, --zero-terminated lõpeta read reavahetuse asemel baidiga 0\n" -#: src/uniq.c:162 +#: src/uniq.c:161 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:167 +#: src/uniq.c:166 msgid "" "\n" "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n" @@ -11543,7 +11873,7 @@ msgstr "" "millele\n" "järgnevad mittetühimik sümbolid. Väljad jäetakse vahele enne sümboleid.\n" -#: src/uniq.c:172 +#: src/uniq.c:171 msgid "" "\n" "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n" @@ -11555,24 +11885,24 @@ 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:359 +#: src/uniq.c:358 #, c-format msgid "too many repeated lines" msgstr "liiga palju korduvaid ridu" -#: src/uniq.c:522 +#: src/uniq.c:521 msgid "invalid number of fields to skip" msgstr "vigane vahelejäetavate väljade arv" -#: src/uniq.c:531 +#: src/uniq.c:530 msgid "invalid number of bytes to skip" msgstr "vigane vahelejäetavate baitide arv" -#: src/uniq.c:540 +#: src/uniq.c:539 msgid "invalid number of bytes to compare" msgstr "vigane võrreldavate baitide arv" -#: src/uniq.c:559 +#: src/uniq.c:558 #, 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" @@ -11626,6 +11956,11 @@ msgid_plural "up %ld days %2d:%02d, " msgstr[0] "püsti %ld päev %2d:%02d, " msgstr[1] "püsti %ld päeva %2d:%02d, " +#: src/uptime.c:149 +#, c-format +msgid "up %2d:%02d, " +msgstr "püsti %2d:%02d, " + #: src/uptime.c:151 #, c-format msgid "%lu user" @@ -11724,39 +12059,39 @@ msgstr "" msgid " old " msgstr " vana " -#: src/who.c:449 +#: src/who.c:440 msgid "system boot" msgstr "süsteemi boot" -#: src/who.c:456 src/who.c:458 +#: src/who.c:447 src/who.c:449 msgid "id=" msgstr "id=" -#: src/who.c:471 src/who.c:476 +#: src/who.c:462 src/who.c:467 msgid "term=" msgstr "term=" -#: src/who.c:473 src/who.c:477 +#: src/who.c:464 src/who.c:468 msgid "exit=" msgstr "exit=" -#: src/who.c:494 +#: src/who.c:485 msgid "LOGIN" msgstr "LOGIN" -#: src/who.c:514 +#: src/who.c:505 msgid "clock change" msgstr "kell muutus" -#: src/who.c:526 src/who.c:527 +#: src/who.c:517 src/who.c:518 msgid "run-level" msgstr "töö-olek" -#: src/who.c:530 src/who.c:531 +#: src/who.c:521 src/who.c:522 msgid "last=" msgstr "viimane=" -#: src/who.c:562 +#: src/who.c:553 #, c-format msgid "" "\n" @@ -11765,44 +12100,44 @@ msgstr "" "\n" "kasutajaid=%lu\n" -#: src/who.c:568 +#: src/who.c:559 msgid "NAME" msgstr "NIMI" -#: src/who.c:568 +#: src/who.c:559 msgid "LINE" msgstr "TERMINAL" -#: src/who.c:568 +#: src/who.c:559 msgid "TIME" msgstr "AEG" -#: src/who.c:568 +#: src/who.c:559 msgid "IDLE" msgstr "EEMAL" -#: src/who.c:569 +#: src/who.c:560 msgid "PID" msgstr "PID" -#: src/who.c:569 +#: src/who.c:560 msgid "COMMENT" msgstr "KOMMENTAAR" -#: src/who.c:569 +#: src/who.c:560 msgid "EXIT" msgstr "LÕPETAMINE" -#: src/who.c:649 +#: src/who.c:640 #, c-format msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n" msgstr "Kasutamine: %s [VÕTI]... [ FAIL | ARG1 ARG2 ]\n" -#: src/who.c:650 +#: src/who.c:641 msgid "Print information about users who are currently logged in.\n" msgstr "Väljast info hetkel masinasse loginud kasutajatest.\n" -#: src/who.c:653 +#: src/who.c:644 msgid "" "\n" " -a, --all same as -b -d --login -p -r -t -T -u\n" @@ -11816,11 +12151,11 @@ msgstr "" " -d, --dead esita surnud protsessid\n" " -H, --heading esita veergude päised\n" -#: src/who.c:660 +#: src/who.c:651 msgid " -l, --login print system login processes\n" msgstr " -l, --login väljasta süsteemi meldimise protsessid\n" -#: src/who.c:663 +#: src/who.c:654 msgid "" " --lookup attempt to canonicalize hostnames via DNS\n" " -m only hostname and user associated with stdin\n" @@ -11830,7 +12165,7 @@ msgstr "" " -m ainult standardsisendiga seotud masin ja kasutaja\n" " -p, --process väljasta init poolt loodud aktiivsed protsessid\n" -#: src/who.c:668 +#: src/who.c:659 msgid "" " -q, --count all login names and number of users logged on\n" " -r, --runlevel print current runlevel\n" @@ -11842,7 +12177,7 @@ msgstr "" " -s, --short väljasta ainult nimi, tyerminal ja aeg (vaikimisi)\n" " -t, --time väljasta viimane süsteemi kella muutus\n" -#: src/who.c:674 +#: src/who.c:665 msgid "" " -T, -w, --mesg add user's message status as +, - or ?\n" " -u, --users list users logged in\n" @@ -11854,7 +12189,7 @@ msgstr "" " --message sama, kui -T\n" " --writable sama, kui -T\n" -#: src/who.c:682 +#: src/who.c:673 #, c-format msgid "" "\n" @@ -11897,11 +12232,3 @@ msgid "" msgstr "" "Väljasta korduvalt rida antud sõnedega või 'y'.\n" "\n" - -#, fuzzy -#~ msgid " gid=%s" -#~ msgstr " gid=%lu" - -#, fuzzy -#~ msgid " euid=%s" -#~ msgstr " euid=%lu" diff --git a/po/eu.gmo b/po/eu.gmo index 8ea22d3a..66c0afaf 100644 Binary files a/po/eu.gmo and b/po/eu.gmo differ diff --git a/po/eu.po b/po/eu.po index bb2aeeb3..b7d21055 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: 2012-05-10 19:35+0200\n" +"POT-Creation-Date: 2013-02-14 15:56+0000\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,19 +35,19 @@ msgstr "Baliozko argumentuak hauek dira:" msgid "error closing file" msgstr "errorea fitxategia itxitzerakoan" -#: lib/closeout.c:112 src/base64.c:109 src/base64.c:121 src/base64.c:127 -#: src/base64.c:168 src/base64.c:224 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:330 src/expand.c:355 src/head.c:298 -#: src/head.c:348 src/head.c:756 src/head.c:797 src/mktemp.c:350 src/od.c:919 -#: src/paste.c:160 src/shuf.c:369 src/split.c:727 src/split.c:964 -#: src/split.c:969 src/tail.c:350 src/tail.c:1201 src/tail.c:1307 +#: 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 -#: src/unexpand.c:427 src/unexpand.c:443 +#: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "idazketa errorea" -#: lib/copy-acl.c:611 src/copy.c:1160 src/copy.c:2602 +#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617 #, fuzzy, c-format msgid "preserving permissions for %s" msgstr "baimenak errepikatu arte" @@ -241,18 +241,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:483 +#: lib/mkdir-p.c:196 src/install.c:484 #, c-format msgid "cannot change permissions of %s" msgstr "ezin da %s-(r)en baimenak aldatu" -#: lib/mkdir-p.c:206 src/copy.c:2261 src/install.c:709 src/install.c:722 +#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722 #, 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:915 src/tac.c:435 +#: src/split.c:929 src/tac.c:434 #, c-format msgid "memory exhausted" msgstr "memoria agortuta" @@ -301,79 +301,79 @@ msgstr "'" msgid "%s: end of file" msgstr "%s: fixategiaren amaiera" -#: lib/regcomp.c:130 +#: lib/regcomp.c:131 msgid "Success" msgstr "Arrakasta" -#: lib/regcomp.c:133 +#: lib/regcomp.c:134 msgid "No match" msgstr "" -#: lib/regcomp.c:136 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "Baliogabeko espresio erregularra" -#: lib/regcomp.c:139 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "" -#: lib/regcomp.c:142 +#: lib/regcomp.c:143 #, fuzzy msgid "Invalid character class name" msgstr "baliogabea" -#: lib/regcomp.c:145 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "" -#: lib/regcomp.c:148 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "" -#: lib/regcomp.c:151 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "" -#: lib/regcomp.c:154 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "" -#: lib/regcomp.c:157 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "" -#: lib/regcomp.c:160 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "" -#: lib/regcomp.c:163 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "" -#: lib/regcomp.c:166 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Memoria agortuta" -#: lib/regcomp.c:169 +#: lib/regcomp.c:170 #, fuzzy msgid "Invalid preceding regular expression" msgstr "baliogabea" -#: lib/regcomp.c:172 +#: lib/regcomp.c:173 #, fuzzy msgid "Premature end of regular expression" msgstr "in bilatu" -#: lib/regcomp.c:175 +#: lib/regcomp.c:176 #, fuzzy msgid "Regular expression too big" msgstr "in bilatu" -#: lib/regcomp.c:178 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:703 +#: lib/regcomp.c:704 #, fuzzy msgid "No previous regular expression" msgstr "in bilatu" @@ -413,7 +413,7 @@ msgstr "^[bB]" msgid "^[nN]" msgstr "^[eE]" -#: lib/set-mode-acl.c:695 src/copy.c:2284 src/cp.c:518 +#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516 #, c-format msgid "setting permissions for %s" msgstr "%s-(r)en baimenak ezartzen" @@ -557,13 +557,13 @@ msgstr "Argindarra arazoa" msgid "Resource lost" msgstr "-lt baino lehen" -#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262 -#: lib/spawn-pipe.c:265 +#: 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:232 lib/spawn-pipe.c:346 lib/wait-process.c:282 +#: 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" @@ -579,24 +579,24 @@ msgstr "" msgid "Unknown signal %d" msgstr "" -#: lib/unicodeio.c:103 +#: lib/unicodeio.c:102 msgid "iconv function not usable" msgstr "" -#: lib/unicodeio.c:105 +#: lib/unicodeio.c:104 msgid "iconv function not available" msgstr "" -#: lib/unicodeio.c:112 +#: lib/unicodeio.c:111 msgid "character out of range" msgstr "karakterea barrutitik kanpora" -#: lib/unicodeio.c:182 +#: lib/unicodeio.c:181 #, c-format msgid "cannot convert U+%04X to local character set" msgstr "" -#: lib/unicodeio.c:184 +#: lib/unicodeio.c:183 #, c-format msgid "cannot convert U+%04X to local character set: %s" msgstr "" @@ -773,7 +773,7 @@ msgstr "" "\n" "Programa-erroreen berri emateko idatzi hona: <%s>.\n" -#: lib/version-etc.c:251 src/system.h:562 +#: lib/version-etc.c:251 src/system.h:573 #, c-format msgid "%s home page: <%s>\n" msgstr "%s-(r)en orri nagusia: <%s>\n" @@ -783,7 +783,7 @@ 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:563 +#: lib/version-etc.c:256 src/system.h:574 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" "GNU softwarearen erabilera laguntza orokorra: <http://www.gnu.org/gethelp/>\n" @@ -871,14 +871,15 @@ msgid "Simon Josefsson" msgstr "Simon Josefsson" #: src/base64.c:60 -#, c-format +#, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" "Base64 encode or decode FILE, or standard input, to standard output.\n" -"\n" msgstr "" +"FITXATEGIA\n" +" edo FITXATEGIA edo ez FITXATEGIA edo FITXATEGIA da e" -#: src/base64.c:64 +#: src/base64.c:67 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -888,14 +889,14 @@ msgid "" "\n" msgstr "" -#: src/base64.c:73 src/cat.c:110 src/fmt.c:293 src/shuf.c:71 src/sum.c:70 +#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70 #, fuzzy msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" msgstr "ez FITXATEGIA edo FITXATEGIA da e" -#: src/base64.c:76 +#: src/base64.c:79 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -904,37 +905,37 @@ msgid "" "from any other non-alphabet bytes in the encoded stream.\n" msgstr "" -#: src/base64.c:171 src/base64.c:208 src/csplit.c:263 src/csplit.c:1435 -#: src/join.c:451 src/shuf.c:157 src/shuf.c:361 src/tac-pipe.c:74 +#: 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 #, c-format msgid "read error" msgstr "irakurketa errorea" -#: src/base64.c:227 +#: src/base64.c:230 #, c-format msgid "invalid input" msgstr "baliogabeko sarrera" -#: src/base64.c:264 +#: src/base64.c:267 #, fuzzy, c-format msgid "invalid wrap size: %s" msgstr "baliogabea tamaina" -#: src/base64.c:283 src/basename.c:173 src/comm.c:435 src/cp.c:607 -#: src/date.c:441 src/dircolors.c:447 src/du.c:894 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:169 src/install.c:929 src/join.c:961 -#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:157 src/mv.c:447 -#: src/od.c:1802 src/ptx.c:2081 src/readlink.c:154 src/seq.c:408 -#: src/shuf.c:320 src/shuf.c:339 src/sort.c:4477 src/split.c:1313 -#: src/tr.c:1797 src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:454 -#: src/uniq.c:471 src/unlink.c:81 src/uptime.c:250 src/users.c:146 -#: src/wc.c:666 src/who.c:836 src/whoami.c:79 +#: 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 msgid "extra operand %s" msgstr "`%s' eragigai extra" -#: src/base64.c:315 src/cat.c:781 +#: src/base64.c:318 src/cat.c:781 #, c-format msgid "closing standard input" msgstr "sarrera estandarra itxitzen" @@ -942,15 +943,15 @@ 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/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:53 src/env.c:33 +#: 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/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:65 src/su.c:88 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 +#: 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 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -968,17 +969,16 @@ msgstr "" msgid "" "Print NAME with any leading directory components removed.\n" "If specified, also remove a trailing SUFFIX.\n" -"\n" msgstr "Inprimatu IZENA honekin edozein a e e" -#: src/basename.c:59 +#: 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" msgstr "" -#: src/basename.c:66 +#: src/basename.c:67 #, c-format msgid "" "\n" @@ -989,20 +989,21 @@ msgid "" " %s -a any/str1 any/str2 -> \"str1\" followed by \"str2\"\n" msgstr "" -#: src/basename.c:167 src/chcon.c:531 src/chgrp.c:277 src/chmod.c:526 -#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1369 +#: 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:183 src/mkfifo.c:108 src/mknod.c:146 src/nohup.c:111 -#: src/pathchk.c:148 src/printf.c:674 src/readlink.c:146 src/realpath.c:236 -#: src/rm.c:314 src/rmdir.c:223 src/seq.c:402 src/setuidgid.c:137 -#: src/sleep.c:119 src/stat.c:1476 src/stdbuf.c:346 src/tr.c:1782 +#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 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 #, 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:52 src/split.c:49 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/split.c:49 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" @@ -1012,8 +1013,8 @@ msgstr "Torbjorn Granlund" msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:846 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4720 src/nl.c:182 src/paste.c:435 src/pr.c:2768 src/sum.c:58 +#: 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/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" @@ -1066,7 +1067,7 @@ msgstr "" msgid "cannot do ioctl on %s" msgstr "ezin zaio %s-(e)ri ioctil egin" -#: src/cat.c:637 src/dd.c:2209 src/sort.c:379 src/tee.c:165 src/yes.c:86 +#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86 #, c-format msgid "standard output" msgstr "irteera estandarra" @@ -1083,14 +1084,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:55 src/head.c:46 src/hostid.c:33 +#: 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 msgid "Jim Meyering" msgstr "Jim Meyering" -#: src/chcon.c:100 src/runcon.c:203 src/runcon.c:234 +#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238 #, fuzzy, c-format msgid "failed to create security context: %s" msgstr "-" @@ -1100,8 +1101,8 @@ msgstr "-" msgid "failed to set %s security context component to %s" msgstr "" -#: src/chcon.c:156 src/chcon.c:540 src/copy.c:2222 src/runcon.c:217 -#: src/stat.c:683 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221 +#: src/stat.c:702 #, fuzzy, c-format msgid "failed to get security context of %s" msgstr "-" @@ -1117,12 +1118,12 @@ 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:446 src/ls.c:2981 +#: src/du.c:457 src/ls.c:2981 #, 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:426 +#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437 #, c-format msgid "cannot read directory %s" msgstr "" @@ -1132,13 +1133,13 @@ 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:599 +#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562 #, 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:618 -#: src/remove.c:613 +#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642 +#: src/remove.c:576 #, c-format msgid "fts_close failed" msgstr "fts_close-ek huts egin du" @@ -1160,10 +1161,9 @@ msgid "" "Change the security context of each FILE to CONTEXT.\n" "With --reference, change the security context of each FILE to that of " "RFILE.\n" -"\n" msgstr "" -#: src/chcon.c:362 src/chgrp.c:123 src/chown.c:94 +#: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94 msgid "" " --dereference affect the referent of each symbolic link (this is\n" " the default), rather than the symbolic link itself\n" @@ -1171,7 +1171,7 @@ msgid "" "file\n" msgstr "" -#: src/chcon.c:367 +#: src/chcon.c:369 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" @@ -1179,7 +1179,16 @@ msgid "" " -l, --range=RANGE set range RANGE in the target security context\n" msgstr "" -#: src/chcon.c:373 +#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110 +#, 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" + +#: src/chcon.c:379 #, fuzzy msgid "" " --reference=RFILE use RFILE's security context rather than " @@ -1192,15 +1201,15 @@ msgstr "" " G aktibatuta eta\n" " a errepikatu arte e e" -#: src/chcon.c:377 src/chgrp.c:140 src/chown.c:118 +#: 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:380 +#: src/chcon.c:386 msgid " -v, --verbose output a diagnostic for every file processed\n" msgstr "" -#: src/chcon.c:383 src/chgrp.c:143 src/chown.c:121 +#: src/chcon.c:389 src/chgrp.c:143 src/chown.c:121 #, fuzzy msgid "" "\n" @@ -1222,36 +1231,36 @@ msgstr "" "\n" " edozein lehenetsia e e" -#: src/chcon.c:512 src/chgrp.c:264 src/chown.c:267 +#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267 #, c-format msgid "-R --dereference requires either -H or -L" msgstr "-R --dereference aukerak -H edo -L behar du" -#: src/chcon.c:518 +#: src/chcon.c:524 #, c-format msgid "-R -h requires -P" msgstr "-R -h aukerak -P behar du" -#: src/chcon.c:533 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282 -#: src/comm.c:429 src/csplit.c:1371 src/join.c:1149 src/link.c:79 -#: src/mknod.c:148 src/setuidgid.c:139 src/tr.c:1785 +#: 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 msgid "missing operand after %s" msgstr "baimenak errepikatu arte" -#: src/chcon.c:556 src/runcon.c:247 +#: src/chcon.c:562 src/runcon.c:251 #, c-format msgid "invalid context: %s" msgstr "baliogabeko kontestua: %s" -#: src/chcon.c:563 +#: src/chcon.c:569 #, c-format msgid "conflicting security context specifiers given" msgstr "" -#: src/chcon.c:572 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:433 src/cp.c:493 -#: src/mv.c:96 src/pwd.c:273 src/rm.c:324 src/touch.c:351 +#: 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 #, fuzzy, c-format msgid "failed to get attributes of %s" msgstr "-" @@ -1294,15 +1303,6 @@ msgstr "" " aktibatuta\n" " - a e" -#: src/chgrp.c:132 src/chmod.c:387 src/chown.c:110 -#, 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" - #: src/chgrp.c:136 msgid "" " --reference=RFILE use RFILE's group rather than specifying a\n" @@ -1377,8 +1377,14 @@ msgid "" msgstr "" #: src/chmod.c:391 +#, fuzzy 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 msgid " -R, --recursive change files and directories recursively\n" @@ -1534,7 +1540,7 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:97 src/install.c:575 src/setuidgid.c:110 src/setuidgid.c:120 +#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120 #, c-format msgid "invalid group %s" msgstr "baliogabea taldea %s" @@ -1598,8 +1604,8 @@ msgstr "huts egin da talde-id-a ezartzen" 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:213 src/stdbuf.c:366 -#: src/timeout.c:402 +#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365 +#: src/timeout.c:454 #, c-format msgid "failed to run command %s" msgstr "huts egin da %s komandoa exekutatzen" @@ -1706,20 +1712,24 @@ msgstr "irteera fitxategi anitz espezifikatu dira" msgid "empty %s not allowed" msgstr "%s hutsa ez da onartzen" -#: src/copy.c:168 src/dd.c:1609 src/dd.c:1976 +#: 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 #, c-format -msgid "reading %s" -msgstr "%s irakurtzen" +msgid "error reading %s" +msgstr "errorea %s irakurtzen" -#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:426 +#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425 #, c-format msgid "cannot lseek %s" msgstr "ezin zaio `lseek' egin %s-ri" -#: src/copy.c:206 src/dd.c:2039 src/dd.c:2102 +#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151 #, c-format -msgid "writing %s" -msgstr "%s idazten" +msgid "error writing %s" +msgstr "errorea %s idazten" #: src/copy.c:313 #, fuzzy, c-format @@ -1741,7 +1751,7 @@ msgstr "huts egin da %s irekitzen" msgid "clearing permissions for %s" msgstr "baimenak errepikatu arte" -#: src/copy.c:697 src/copy.c:2470 src/cp.c:331 +#: src/copy.c:697 src/copy.c:2480 src/cp.c:329 #, fuzzy, c-format msgid "failed to preserve ownership for %s" msgstr "errepikatu arte" @@ -1756,14 +1766,14 @@ msgstr "" msgid "failed to preserve authorship for %s" msgstr "errepikatu arte" -#: src/copy.c:804 src/csplit.c:638 src/du.c:901 src/fmt.c:449 src/head.c:847 -#: src/sort.c:4489 src/split.c:1329 src/tail.c:1756 src/wc.c:678 +#: 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 #, fuzzy, c-format msgid "cannot open %s for reading" msgstr "errepikatu arte" -#: src/copy.c:810 src/copy.c:972 src/dd.c:1546 src/dd.c:2114 src/dd.c:2252 -#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:141 +#: 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 #, c-format msgid "cannot fstat %s" msgstr "ezin zaio `fstat' egin %s-(e)ri" @@ -1783,14 +1793,14 @@ msgstr "kopiatu - aktibatuta" msgid "failed to set the security context of %s to %s" msgstr "taldea - e" -#: src/copy.c:881 src/copy.c:1574 src/copy.c:1777 src/copy.c:1935 src/ln.c:314 -#: src/remove.c:267 src/remove.c:293 src/remove.c:444 src/remove.c:465 +#: 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 #, c-format msgid "cannot remove %s" msgstr "ezin da %s kendu" -#: src/copy.c:886 src/copy.c:1578 src/copy.c:1772 src/copy.c:1940 -#: src/remove.c:418 +#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945 +#: src/remove.c:375 #, c-format msgid "removed %s\n" msgstr "%s ezabatua\n" @@ -1810,186 +1820,186 @@ msgstr "" msgid "failed to clone %s from %s" msgstr "huts egin da %s klonatzen" -#: src/copy.c:1098 src/copy.c:2531 +#: src/copy.c:1098 src/copy.c:2541 #, fuzzy, c-format msgid "preserving times for %s" msgstr "errepikatu arte" -#: src/copy.c:1170 src/copy.c:1176 src/head.c:855 src/touch.c:175 -#: src/truncate.c:413 -#, c-format -msgid "closing %s" -msgstr "%s itxitzen" +#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172 +#: src/truncate.c:417 +#, fuzzy, c-format +msgid "failed to close %s" +msgstr "huts egin da %s irekitzen" -#: src/copy.c:1466 +#: src/copy.c:1471 #, fuzzy, c-format msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? " msgstr "modua " -#: src/copy.c:1473 +#: src/copy.c:1478 #, c-format msgid "%s: overwrite %s? " msgstr "%s: %s gainidatzi?" -#: src/copy.c:1542 +#: src/copy.c:1547 #, c-format msgid " (backup: %s)" msgstr " (babeskopia: %s)" -#: src/copy.c:1552 +#: src/copy.c:1557 #, c-format msgid "failed to restore the default file creation context" msgstr "" -#: src/copy.c:1584 +#: src/copy.c:1589 #, fuzzy, c-format msgid "cannot create hard link %s to %s" msgstr "lotura" -#: src/copy.c:1637 src/copy.c:1689 src/copy.c:2272 src/copy.c:2589 +#: 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:1220 src/truncate.c:365 +#: src/stat.c:1239 src/truncate.c:363 #, c-format msgid "cannot stat %s" msgstr "ezin da `stat' egin %s-(r)engan" -#: src/copy.c:1645 +#: src/copy.c:1650 #, c-format msgid "omitting directory %s" msgstr "" -#: src/copy.c:1659 +#: src/copy.c:1664 #, c-format msgid "warning: source file %s specified more than once" msgstr "" -#: src/copy.c:1707 src/ln.c:246 +#: src/copy.c:1712 src/ln.c:246 #, fuzzy, c-format msgid "%s and %s are the same file" msgstr "eta" -#: src/copy.c:1806 +#: src/copy.c:1811 #, fuzzy, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "honekin" -#: src/copy.c:1824 src/ln.c:214 +#: src/copy.c:1829 src/ln.c:214 #, fuzzy, c-format msgid "will not overwrite just-created %s with %s" msgstr "honekin" -#: src/copy.c:1842 +#: src/copy.c:1847 #, fuzzy, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "honekin" -#: src/copy.c:1856 +#: src/copy.c:1861 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "" -#: src/copy.c:1886 +#: src/copy.c:1891 #, fuzzy, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "gora" -#: src/copy.c:1887 +#: src/copy.c:1892 #, fuzzy, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "gora" -#: src/copy.c:1910 src/ln.c:276 +#: src/copy.c:1915 src/ln.c:276 #, c-format msgid "cannot backup %s" msgstr "ezin da %s-(r)en babeskopia egin" -#: src/copy.c:1974 +#: src/copy.c:1979 #, fuzzy, c-format msgid "will not copy %s through just-created symlink %s" msgstr "honekin" -#: src/copy.c:2051 +#: src/copy.c:2056 #, fuzzy, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "kopiatu a bere gainera" -#: src/copy.c:2068 +#: src/copy.c:2073 #, fuzzy, c-format msgid "will not create hard link %s to directory %s" msgstr "lotura" -#: src/copy.c:2118 +#: src/copy.c:2123 #, fuzzy, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "a - bere gainera" -#: src/copy.c:2161 +#: src/copy.c:2166 #, c-format msgid "cannot move %s to %s" msgstr "ezin izan da %s %s-(r)a mugitu" -#: src/copy.c:2173 +#: src/copy.c:2178 #, fuzzy, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "gailua" -#: src/copy.c:2207 src/install.c:905 src/mkdir.c:189 src/mkfifo.c:114 -#: src/mknod.c:167 +#: 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:2241 +#: src/copy.c:2246 #, fuzzy, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "kopiatu lotura" -#: src/copy.c:2350 +#: src/copy.c:2355 #, fuzzy, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "erlatiboa in" -#: src/copy.c:2357 +#: src/copy.c:2362 #, fuzzy, c-format msgid "cannot create symbolic link %s to %s" msgstr "lotura" -#: src/copy.c:2406 src/mkfifo.c:133 +#: src/copy.c:2416 src/mkfifo.c:132 #, c-format msgid "cannot create fifo %s" msgstr "ezin da %s fifo-a sortu" -#: src/copy.c:2415 +#: src/copy.c:2425 #, c-format msgid "cannot create special file %s" msgstr "ezin da %s fitxategi berezia sortu" -#: src/copy.c:2426 src/ls.c:3191 src/stat.c:902 +#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921 #, fuzzy, c-format msgid "cannot read symbolic link %s" msgstr "lotura" -#: src/copy.c:2453 +#: src/copy.c:2463 #, fuzzy, c-format msgid "cannot create symbolic link %s" msgstr "lotura" -#: src/copy.c:2485 +#: src/copy.c:2495 #, fuzzy, c-format msgid "%s has unknown file type" msgstr "ezezaguna mota" -#: src/copy.c:2629 src/ln.c:358 +#: src/copy.c:2644 src/ln.c:358 #, c-format msgid "cannot un-backup %s" msgstr "ezin da %s babeskopia kendu" -#: src/copy.c:2633 +#: src/copy.c:2648 #, fuzzy, c-format msgid "%s -> %s (unbackup)\n" msgstr "e" -#: src/cp.c:156 src/mv.c:284 +#: src/cp.c:156 src/mv.c:286 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -2002,25 +2012,10 @@ msgstr "" #: src/cp.c:162 #, fuzzy -msgid "" -"Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" -"\n" +msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" msgstr "Kopiatu ITURBURUA edo ITURBURUA DIREKTORIOA e e" -#: src/cp.c:166 src/csplit.c:1458 src/cut.c:197 src/df.c:852 src/du.c:268 -#: src/expand.c:112 src/fmt.c:275 src/fold.c:75 src/head.c:115 -#: src/install.c:612 src/kill.c:86 src/ln.c:392 src/ls.c:4726 src/mkdir.c:61 -#: src/mkfifo.c:56 src/mknod.c:58 src/mv.c:294 src/nl.c:191 src/paste.c:445 -#: src/pr.c:2777 src/ptx.c:1825 src/shred.c:153 src/shuf.c:58 src/sort.c:399 -#: src/split.c:211 src/stdbuf.c:95 src/tac.c:142 src/tail.c:268 -#: src/touch.c:226 src/truncate.c:107 src/unexpand.c:122 src/uniq.c:145 -msgid "" -"Mandatory arguments to long options are mandatory for short options too.\n" -msgstr "" -"Beharrezkoak diren argumentuak aukera luzeetan, beharrezkoak dira aukera " -"txikietan ere.\n" - -#: src/cp.c:169 +#: src/cp.c:168 #, fuzzy msgid "" " -a, --archive same as -dR --preserve=all\n" @@ -2040,13 +2035,14 @@ msgstr "" " kopiatu kopiatu -\n" " ez lotura e" -#: src/cp.c:178 +#: src/cp.c:177 #, fuzzy msgid "" " -f, --force if an existing destination file cannot be\n" -" opened, remove it and try again (redundant " -"if\n" -" the -n option is used)\n" +" opened, remove it and try again (this " +"option\n" +" is ignored when the -n option is also " +"used)\n" " -i, --interactive prompt before overwrite (overrides a previous " "-n\n" " option)\n" @@ -2058,20 +2054,20 @@ msgstr "" " lehenago\n" " T e" -#: src/cp.c:188 +#: src/cp.c:186 msgid "" " -l, --link hard link files instead of copying\n" " -L, --dereference always follow symbolic links in SOURCE\n" msgstr "" -#: src/cp.c:192 +#: src/cp.c:190 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:197 +#: src/cp.c:195 #, fuzzy msgid "" " -p same as --preserve=mode,ownership,timestamps\n" @@ -2088,7 +2084,7 @@ msgstr "" " modua\n" " e" -#: src/cp.c:205 +#: src/cp.c:203 #, fuzzy msgid "" " --no-preserve=ATTR_LIST don't preserve the specified attributes\n" @@ -2098,7 +2094,7 @@ msgstr "" " bide-izena DIREKTORIOA\n" " ez e" -#: src/cp.c:209 +#: src/cp.c:207 #, fuzzy msgid "" " -R, -r, --recursive copy directories recursively\n" @@ -2111,7 +2107,7 @@ msgstr "" " lehenago\n" " honekin behartu e" -#: src/cp.c:215 +#: src/cp.c:213 #, fuzzy msgid "" " --sparse=WHEN control creation of sparse files. See below\n" @@ -2125,7 +2121,7 @@ msgstr "" " edozein ITURBURUA\n" " e" -#: src/cp.c:220 +#: src/cp.c:218 #, fuzzy msgid "" " -s, --symbolic-link make symbolic links instead of copying\n" @@ -2138,7 +2134,7 @@ msgstr "" " S\n" " DIREKTORIOA ITURBURUA DIREKTORIOA e" -#: src/cp.c:226 +#: src/cp.c:224 #, fuzzy msgid "" " -u, --update copy only when the SOURCE file is newer\n" @@ -2153,7 +2149,7 @@ msgstr "" " da eginda\n" " x aktibatuta uneko e" -#: src/cp.c:235 +#: src/cp.c:233 #, fuzzy msgid "" "\n" @@ -2172,7 +2168,7 @@ msgstr "" "lehenetsia ITURBURUA bider a eta da da bider auto a ITURBURUA hau daukana a " "- - e e" -#: src/cp.c:247 src/install.c:649 src/ln.c:421 src/mv.c:321 +#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322 #, fuzzy msgid "" "\n" @@ -2183,7 +2179,7 @@ msgid "" "\n" msgstr "da honekin edo maiatzak edo BERTSIOA e e" -#: src/cp.c:254 src/install.c:656 src/mv.c:328 +#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329 #, fuzzy msgid "" " none, off never make backups (even if --backup is given)\n" @@ -2196,7 +2192,7 @@ msgstr "" " sinplea\n" " sinplea sinplea e" -#: src/cp.c:260 +#: src/cp.c:258 #, fuzzy msgid "" "\n" @@ -2205,90 +2201,90 @@ msgid "" "regular file.\n" msgstr "a a - ITURBURUA behartu eta eta ITURBURUA eta errepikatu arte e" -#: src/cp.c:319 +#: src/cp.c:317 #, fuzzy, c-format msgid "failed to preserve times for %s" msgstr "errepikatu arte" -#: src/cp.c:350 +#: src/cp.c:348 #, fuzzy, c-format msgid "failed to preserve permissions for %s" msgstr "baimenak errepikatu arte" -#: src/cp.c:477 +#: src/cp.c:475 #, c-format msgid "cannot make directory %s" msgstr "ezin da %s direktorioa egin" -#: src/cp.c:526 src/cp.c:545 +#: src/cp.c:524 src/cp.c:543 #, c-format msgid "%s exists but is not a directory" msgstr "%s badago baina ez da direktorio bat" -#: src/cp.c:572 src/cp.c:1068 src/install.c:401 src/install.c:844 src/ln.c:123 -#: src/ln.c:181 src/ln.c:202 src/ln.c:516 src/mv.c:152 src/mv.c:399 -#, c-format -msgid "accessing %s" -msgstr "%s-(r)a sartzen" +#: 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 +msgid "failed to access %s" +msgstr "huts egin da %s irekitzen" -#: src/cp.c:592 src/install.c:914 src/ln.c:546 src/mv.c:432 src/shred.c:1182 -#: src/touch.c:433 src/truncate.c:356 +#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181 +#: src/touch.c:429 src/truncate.c:354 #, fuzzy, c-format msgid "missing file operand" msgstr "zerrenda -" -#: src/cp.c:594 src/install.c:916 src/ln.c:560 src/mv.c:434 +#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436 #, fuzzy, c-format msgid "missing destination file operand after %s" msgstr "errepikatu arte" -#: src/cp.c:603 src/install.c:925 src/mv.c:443 +#: src/cp.c:601 src/install.c:926 src/mv.c:445 #, c-format msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)" msgstr "" -#: src/cp.c:619 src/cp.c:1070 src/install.c:403 src/install.c:846 -#: src/install.c:938 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:401 -#: src/mv.c:457 +#: 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 msgid "target %s is not a directory" msgstr "da a" -#: src/cp.c:730 +#: src/cp.c:728 #, fuzzy, c-format msgid "with --parents, the destination must be a directory" msgstr "a" -#: src/cp.c:1063 src/install.c:839 src/ln.c:511 src/mv.c:394 +#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395 #, fuzzy, c-format msgid "multiple target directories specified" msgstr "irteera fitxategi anitz espezifikatu dira" -#: src/cp.c:1108 +#: src/cp.c:1110 #, fuzzy, c-format msgid "cannot make both hard and symbolic links" msgstr "eta" -#: src/cp.c:1115 src/mv.c:464 +#: src/cp.c:1117 src/mv.c:466 #, fuzzy, c-format msgid "options --backup and --no-clobber are mutually exclusive" msgstr "eta" -#: src/cp.c:1121 +#: src/cp.c:1123 #, c-format msgid "--reflink can be used only with --sparse=auto" msgstr "" -#: src/cp.c:1129 src/install.c:899 src/ln.c:582 src/mv.c:472 +#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474 msgid "backup type" msgstr "babeskopia moeta" -#: src/cp.c:1154 +#: src/cp.c:1156 #, c-format msgid "cannot preserve security context without an SELinux-enabled kernel" msgstr "" -#: src/cp.c:1160 +#: src/cp.c:1162 #, c-format msgid "cannot preserve extended attributes, cp is built without xattr support" msgstr "" @@ -2298,135 +2294,134 @@ msgstr "" msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:529 +#: src/csplit.c:531 #, c-format msgid "input disappeared" msgstr "sarrera desagertu da" -#: src/csplit.c:658 src/csplit.c:669 +#: src/csplit.c:660 src/csplit.c:671 #, fuzzy, c-format msgid "%s: line number out of range" msgstr "-" -#: src/csplit.c:698 +#: src/csplit.c:700 #, fuzzy, c-format msgid "%s: %s: line number out of range" msgstr "-" -#: src/csplit.c:701 src/csplit.c:750 +#: src/csplit.c:703 src/csplit.c:752 #, fuzzy, c-format msgid " on repetition %s\n" msgstr "aktibatuta e" -#: src/csplit.c:744 +#: src/csplit.c:746 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: ez da parekiderik topatu" -#: src/csplit.c:808 src/csplit.c:848 src/nl.c:359 src/tac.c:274 +#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273 #, fuzzy, c-format msgid "error in regular expression search" msgstr "in bilatu" -#: src/csplit.c:981 +#: src/csplit.c:983 #, c-format msgid "write error for %s" msgstr "idazketa errorea %s-(r)entzat" -#: src/csplit.c:1057 +#: src/csplit.c:1059 #, fuzzy, c-format msgid "%s: integer expected after delimiter" msgstr "geroago" -#: src/csplit.c:1073 +#: src/csplit.c:1075 #, fuzzy, c-format msgid "%s: '}' is required in repeat count" msgstr "da in" -#: src/csplit.c:1083 +#: src/csplit.c:1085 #, fuzzy, c-format msgid "%s}: integer required between '{' and '}'" msgstr "eta" -#: src/csplit.c:1110 +#: src/csplit.c:1112 #, c-format msgid "%s: closing delimiter '%c' missing" msgstr "" -#: src/csplit.c:1127 +#: src/csplit.c:1129 #, fuzzy, c-format msgid "%s: invalid regular expression: %s" msgstr "baliogabea" -#: src/csplit.c:1160 +#: src/csplit.c:1162 #, c-format msgid "%s: invalid pattern" msgstr "%s: baliogabeko eredua" -#: src/csplit.c:1163 +#: src/csplit.c:1165 #, c-format msgid "%s: line number must be greater than zero" msgstr "" -#: src/csplit.c:1169 +#: src/csplit.c:1171 #, fuzzy, c-format msgid "line number %s is smaller than preceding line number, %s" msgstr "da" -#: src/csplit.c:1175 +#: src/csplit.c:1177 #, fuzzy, c-format msgid "warning: line number %s is the same as preceding line number" msgstr "da" -#: src/csplit.c:1253 +#: src/csplit.c:1255 #, fuzzy, c-format msgid "missing conversion specifier in suffix" msgstr "in" -#: src/csplit.c:1259 +#: src/csplit.c:1261 #, fuzzy, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "baliogabea in" -#: src/csplit.c:1262 +#: src/csplit.c:1264 #, fuzzy, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "baliogabea in" -#: src/csplit.c:1267 +#: src/csplit.c:1269 #, fuzzy, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "baliogabea" -#: src/csplit.c:1284 +#: src/csplit.c:1286 #, fuzzy, c-format msgid "too many %% conversion specifications in suffix" msgstr "in" -#: src/csplit.c:1298 +#: src/csplit.c:1300 #, fuzzy, c-format msgid "missing %% conversion specification in suffix" msgstr "in" -#: src/csplit.c:1345 +#: src/csplit.c:1347 #, c-format msgid "%s: invalid number" msgstr "%s: baliogabeko zenbakia" -#: src/csplit.c:1449 +#: src/csplit.c:1451 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Erabilera: %s [AUKERA]... FITXATEGI EREDUA...\n" -#: src/csplit.c:1453 +#: src/csplit.c:1455 #, 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" -"\n" msgstr "Irteera - FITXATEGIA bider - e e" -#: src/csplit.c:1461 +#: src/csplit.c:1462 #, fuzzy, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2437,7 +2432,7 @@ msgstr "" " AURRIZKIA erabili AURRIZKIA horren ordez -\n" " aktibatuta e" -#: src/csplit.c:1466 +#: src/csplit.c:1467 #, fuzzy msgid "" " -n, --digits=DIGITS use specified number of digits instead of 2\n" @@ -2448,14 +2443,14 @@ msgstr "" " -\n" " hutsik hutsik e" -#: src/csplit.c:1473 +#: src/csplit.c:1474 #, fuzzy msgid "" "\n" "Read standard input if FILE is -. Each PATTERN may be:\n" msgstr "FITXATEGIA da maiatzak e" -#: src/csplit.c:1477 +#: src/csplit.c:1478 #, fuzzy msgid "" "\n" @@ -2479,7 +2474,7 @@ msgstr "" msgid "David M. Ihnat" msgstr "David M. Ihnat" -#: src/cut.c:64 +#: src/cut.c:64 src/cut.c:372 msgid "fields and positions are numbered from 1" msgstr "" @@ -2490,12 +2485,10 @@ msgstr "Erabilera: %s [AUKERA]... [FITXATEGIA]...\n" #: src/cut.c:193 #, fuzzy -msgid "" -"Print selected parts of lines from each FILE to standard output.\n" -"\n" +msgid "Print selected parts of lines from each FILE to standard output.\n" msgstr "Inprimatu - lerroz behin FITXATEGIA e e" -#: src/cut.c:200 +#: src/cut.c:199 #, fuzzy msgid "" " -b, --bytes=LIST select only these bytes\n" @@ -2506,7 +2499,7 @@ msgstr "" "\n" " erabili horren ordez - errepikatu arte e" -#: src/cut.c:205 +#: src/cut.c:204 #, fuzzy msgid "" " -f, --fields=LIST select only these fields; also print any line\n" @@ -2519,7 +2512,7 @@ msgstr "" " da\n" " e enoratua e" -#: src/cut.c:211 +#: src/cut.c:210 #, fuzzy msgid "" " --complement complement the set of selected bytes, characters\n" @@ -2528,7 +2521,7 @@ msgstr "" "a\n" " lehenago da e" -#: src/cut.c:215 +#: src/cut.c:214 #, fuzzy msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" @@ -2539,7 +2532,7 @@ msgstr "" " KATEA erabili KATEA\n" " lehenetsia da erabili e" -#: src/cut.c:222 +#: src/cut.c:221 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2547,7 +2540,7 @@ msgid "" "in the same order that it is read, and is written exactly once.\n" msgstr "" -#: src/cut.c:228 +#: src/cut.c:227 #, fuzzy msgid "" "Each range is one of:\n" @@ -2565,64 +2558,64 @@ msgstr "" " I M I M edo\n" " M lehen M edo e ez FITXATEGIA edo FITXATEGIA da e" -#: src/cut.c:368 src/cut.c:489 +#: src/cut.c:367 src/cut.c:493 #, fuzzy -msgid "invalid byte or field list" +msgid "invalid byte, character or field list" msgstr "baliogabea edo zerrenda" -#: src/cut.c:385 +#: src/cut.c:387 #, fuzzy msgid "invalid range with no endpoint: -" msgstr "baliogabea zabalera" -#: src/cut.c:399 +#: src/cut.c:403 #, fuzzy msgid "invalid decreasing range" msgstr "baliogabea modua" -#: src/cut.c:478 +#: src/cut.c:482 #, c-format msgid "byte offset %s is too large" msgstr "%s byte offset-a luzeegia da" -#: src/cut.c:481 +#: src/cut.c:485 #, fuzzy, c-format msgid "field number %s is too large" msgstr "da" -#: src/cut.c:789 src/cut.c:797 +#: src/cut.c:795 src/cut.c:803 #, fuzzy msgid "only one type of list may be specified" msgstr "mota - zerrenda maiatzak" -#: src/cut.c:806 -#, fuzzy +#: src/cut.c:812 src/numfmt.c:1408 +#, fuzzy, c-format msgid "the delimiter must be a single character" msgstr "a" -#: src/cut.c:841 +#: src/cut.c:847 #, fuzzy msgid "you must specify a list of bytes, characters, or fields" msgstr "a zerrenda - edo" -#: src/cut.c:844 +#: src/cut.c:850 #, fuzzy msgid "an input delimiter may be specified only when operating on fields" msgstr "maiatzak aktibatuta" -#: src/cut.c:848 +#: src/cut.c:854 #, fuzzy msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" msgstr "lerroz behin e aktibatuta" -#: src/cut.c:864 +#: src/cut.c:870 #, fuzzy msgid "missing list of fields" msgstr "zerrenda -" -#: src/cut.c:866 +#: src/cut.c:872 #, fuzzy msgid "missing list of positions" msgstr "zerrenda -" @@ -2637,10 +2630,12 @@ msgstr "" " edo: %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 "" + +#: src/date.c:134 #, 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" " -I[TIMESPEC], --iso-8601[=TIMESPEC] output date/time in ISO 8601 format.\n" @@ -2657,7 +2652,7 @@ msgstr "" "\n" " e" -#: src/date.c:138 +#: src/date.c:142 #, fuzzy msgid "" " -r, --reference=FILE display the last modification time of FILE\n" @@ -2669,7 +2664,7 @@ msgstr "" " KATEA bider KATEA\n" " edo Unibertsala Ordua e" -#: src/date.c:143 +#: src/date.c:147 msgid "" " --rfc-3339=TIMESPEC output date and time in RFC 3339 format.\n" " TIMESPEC='date', 'seconds', or 'ns' for\n" @@ -2680,7 +2675,7 @@ msgid "" " -u, --utc, --universal print or set Coordinated Universal Time\n" msgstr "" -#: src/date.c:154 +#: src/date.c:158 #, fuzzy msgid "" "\n" @@ -2693,7 +2688,7 @@ msgstr "" " a\n" " a Ig. Lr. e" -#: src/date.c:161 +#: src/date.c:165 #, fuzzy msgid "" " %A locale's full weekday name (e.g., Sunday)\n" @@ -2706,7 +2701,7 @@ msgstr "" " B hilabetea urtarrila abendua\n" " eta Lr. e" -#: src/date.c:167 +#: src/date.c:171 #, fuzzy msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" @@ -2719,14 +2714,14 @@ msgstr "" " mm dd\n" " eguna - hilabetea e" -#: src/date.c:173 +#: src/date.c:177 msgid "" " %F full date; same as %Y-%m-%d\n" " %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 "" -#: src/date.c:178 +#: src/date.c:182 #, fuzzy msgid "" " %h same as %b\n" @@ -2739,7 +2734,7 @@ msgstr "" " jn. ordu\n" " eguna - urtea e" -#: src/date.c:184 +#: src/date.c:188 #, fuzzy msgid "" " %k hour, space padded ( 0..23); same as %_H\n" @@ -2752,7 +2747,7 @@ msgstr "" " m hilabetea\n" " M minutu e" -#: src/date.c:190 +#: src/date.c:194 #, fuzzy msgid "" " %n a newline\n" @@ -2771,7 +2766,7 @@ msgstr "" " G ordu mm\n" " segundo UTC a e" -#: src/date.c:199 +#: src/date.c:203 #, fuzzy msgid "" " %S second (00..60)\n" @@ -2784,7 +2779,7 @@ msgstr "" " ordu mm\n" " eguna - astea Astelehena e" -#: src/date.c:205 +#: src/date.c:209 #, fuzzy msgid "" " %U week number of year, with Sunday as first day of week (00..53)\n" @@ -2797,7 +2792,7 @@ msgstr "" " eguna - astea Igandea\n" " M astea - urtea honekin Astelehena lehen eguna - astea e" -#: src/date.c:211 +#: src/date.c:215 #, fuzzy msgid "" " %x locale's date representation (e.g., 12/31/99)\n" @@ -2810,7 +2805,7 @@ msgstr "" " b azken bikoa - urtea\n" " Y urtea e" -#: src/date.c:217 +#: src/date.c:221 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -2822,7 +2817,7 @@ msgid "" "By default, date pads numeric fields with zeroes.\n" msgstr "" -#: src/date.c:226 +#: src/date.c:230 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -2833,7 +2828,7 @@ msgid "" " # use opposite case if possible\n" msgstr "" -#: src/date.c:235 +#: src/date.c:239 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -2842,7 +2837,7 @@ msgid "" "O to use the locale's alternate numeric symbols if available.\n" msgstr "" -#: src/date.c:242 +#: src/date.c:246 msgid "" "\n" "Examples:\n" @@ -2856,35 +2851,35 @@ msgid "" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:275 src/dd.c:2193 src/head.c:838 src/md5sum.c:477 -#: src/md5sum.c:798 src/od.c:863 src/od.c:1914 src/pr.c:1176 src/pr.c:1372 -#: src/pr.c:1494 src/stty.c:842 src/tac.c:563 src/tail.c:343 src/tee.c:126 +#: 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 #, c-format msgid "standard input" msgstr "sarrera estandarra" -#: src/date.c:303 src/date.c:523 +#: src/date.c:307 src/date.c:527 #, c-format msgid "invalid date %s" msgstr " %s baliogabeko data" -#: src/date.c:414 src/date.c:448 +#: src/date.c:418 src/date.c:452 #, fuzzy, c-format msgid "multiple output formats specified" msgstr "irteera fitxategi anitz espezifikatu dira" -#: src/date.c:426 +#: src/date.c:430 #, fuzzy, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "errepikatu arte" -#: src/date.c:433 +#: src/date.c:437 #, fuzzy, c-format msgid "the options to print and set the time may not be used together" msgstr "eta maiatzak" -#: src/date.c:454 +#: src/date.c:458 #, fuzzy, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -2892,23 +2887,23 @@ msgid "" "argument must be a format string beginning with '+'" msgstr "a edozein a honekin." -#: src/date.c:531 +#: src/date.c:535 #, c-format msgid "cannot set date" msgstr "ezin da data ezarri" -#: src/date.c:554 src/du.c:360 +#: src/date.c:558 src/du.c:371 #, c-format msgid "time %s is out of range" msgstr "%s ordua barrutitik kanpora dago" #. This is a proper name. See the gettext manual, section Names. -#: src/dd.c:44 src/factor.c:43 src/rm.c:41 src/tail.c:69 src/touch.c:41 +#: 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 "Paul Rubin" -#: src/dd.c:517 +#: src/dd.c:521 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -2917,7 +2912,7 @@ msgstr "" "Erabilera: %s [ERAGIGAI]...\n" " edo: %s AUKERA\n" -#: src/dd.c:522 +#: src/dd.c:526 #, fuzzy msgid "" "Copy a file, converting and formatting according to the operands.\n" @@ -2935,7 +2930,7 @@ msgstr "" " kopiatu\n" " a e" -#: src/dd.c:531 +#: src/dd.c:535 #, fuzzy msgid "" " if=FILE read from FILE instead of stdin\n" @@ -2945,7 +2940,8 @@ msgid "" " oflag=FLAGS write as per the comma separated symbol list\n" " seek=N skip N obs-sized blocks at start of output\n" " skip=N skip N ibs-sized blocks at start of input\n" -" status=noxfer suppress transfer statistics\n" +" status=WHICH WHICH info to suppress outputting to stderr;\n" +" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" msgstr "" "FITXATEGIA FITXATEGIA horren ordez -\n" " a\n" @@ -2953,11 +2949,11 @@ msgstr "" " hasi -\n" " hasi - e" -#: src/dd.c:541 +#: src/dd.c:546 #, fuzzy msgid "" "\n" -"BLOCKS and BYTES may be followed by the following multiplicative suffixes:\n" +"N and BYTES may be followed by the following multiplicative suffixes:\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, and so on for T, P, E, Z, Y.\n" "\n" @@ -2966,7 +2962,7 @@ msgid "" msgstr "" "eta maiatzak bider M MB M B eta aktibatuta errepikatu arte E Y maiatzak e e" -#: src/dd.c:550 +#: src/dd.c:555 msgid "" " ascii from EBCDIC to ASCII\n" " ebcdic from ASCII to EBCDIC\n" @@ -2981,7 +2977,7 @@ msgid "" " with block or unblock, pad with spaces rather than NULs\n" msgstr "" -#: src/dd.c:563 +#: src/dd.c:568 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -2991,7 +2987,7 @@ msgid "" " fsync likewise, but also write metadata\n" msgstr "" -#: src/dd.c:571 +#: src/dd.c:576 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3000,76 +2996,76 @@ msgid "" "suggested)\n" msgstr "" -#: src/dd.c:578 +#: src/dd.c:583 msgid " cio use concurrent I/O for data\n" msgstr "" -#: src/dd.c:580 +#: src/dd.c:585 msgid " direct use direct I/O for data\n" msgstr "" -#: src/dd.c:582 +#: src/dd.c:587 #, fuzzy msgid " directory fail unless a directory\n" msgstr "da a" -#: src/dd.c:584 +#: src/dd.c:589 msgid " dsync use synchronized I/O for data\n" msgstr "" -#: src/dd.c:586 +#: src/dd.c:591 msgid " sync likewise, but also for metadata\n" msgstr "" -#: src/dd.c:587 +#: src/dd.c:592 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr "" -#: src/dd.c:590 +#: src/dd.c:595 msgid " nonblock use non-blocking I/O\n" msgstr "" -#: src/dd.c:592 +#: src/dd.c:597 msgid " noatime do not update access time\n" msgstr "" -#: src/dd.c:595 +#: src/dd.c:600 msgid " nocache discard cached data\n" msgstr "" -#: src/dd.c:598 +#: src/dd.c:603 msgid " noctty do not assign controlling terminal from file\n" msgstr "" -#: src/dd.c:601 +#: src/dd.c:606 msgid " nofollow do not follow symlinks\n" msgstr "" -#: src/dd.c:603 +#: src/dd.c:608 msgid " nolinks fail if multiply-linked\n" msgstr "" -#: src/dd.c:605 +#: src/dd.c:610 msgid " binary use binary I/O for data\n" msgstr "" -#: src/dd.c:607 +#: src/dd.c:612 msgid " text use text I/O for data\n" msgstr "" -#: src/dd.c:609 +#: src/dd.c:614 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:612 +#: src/dd.c:617 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:615 +#: src/dd.c:620 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:620 +#: src/dd.c:625 #, fuzzy, c-format msgid "" "\n" @@ -3091,28 +3087,28 @@ msgstr "" " in\n" " e" -#: src/dd.c:676 +#: src/dd.c:683 #, c-format msgid "" "%<PRIuMAX>+%<PRIuMAX> records in\n" "%<PRIuMAX>+%<PRIuMAX> records out\n" msgstr "" -#: src/dd.c:682 +#: src/dd.c:689 #, c-format msgid "%<PRIuMAX> truncated record\n" msgid_plural "%<PRIuMAX> truncated records\n" msgstr[0] "" msgstr[1] "" -#: src/dd.c:694 +#: src/dd.c:701 #, c-format msgid "%<PRIuMAX> byte (%s) copied" msgid_plural "%<PRIuMAX> bytes (%s) copied" msgstr[0] "" msgstr[1] "" -#: src/dd.c:712 +#: src/dd.c:720 msgid "Infinity B" msgstr "Infinity B" @@ -3126,87 +3122,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:725 +#: src/dd.c:733 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g s, %s/s\n" -#: src/dd.c:804 +#: src/dd.c:812 #, c-format msgid "closing input file %s" msgstr "%s sarrera fitxategia itxitzen" -#: src/dd.c:811 +#: src/dd.c:819 #, c-format msgid "closing output file %s" msgstr "%s irteera fitxategia itxitzen" -#: src/dd.c:1014 +#: src/dd.c:1022 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "" -#: src/dd.c:1085 src/dd.c:1934 +#: src/dd.c:1093 src/dd.c:1942 #, c-format msgid "writing to %s" msgstr "%s-ra idazten" -#: src/dd.c:1199 src/dd.c:1253 +#: src/dd.c:1207 src/dd.c:1261 #, fuzzy, c-format msgid "unrecognized operand %s" msgstr "%s: '--%s' aukera ezezaguna\n" -#: src/dd.c:1210 +#: src/dd.c:1218 #, fuzzy msgid "invalid conversion" msgstr "baliogabea" -#: src/dd.c:1213 src/dd.c:1289 +#: src/dd.c:1221 src/dd.c:1297 #, fuzzy msgid "invalid input flag" msgstr "baliogabea hasi" -#: src/dd.c:1216 src/dd.c:1283 src/dd.c:1295 +#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303 #, fuzzy msgid "invalid output flag" msgstr "baliogabeko taldea" -#: src/dd.c:1219 +#: src/dd.c:1227 #, fuzzy msgid "invalid status flag" msgstr "baliogabea" -#: src/dd.c:1258 src/truncate.c:312 +#: src/dd.c:1266 src/truncate.c:310 #, fuzzy, c-format msgid "invalid number %s" msgstr "baliogabea" -#: src/dd.c:1340 +#: src/dd.c:1348 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "" -#: src/dd.c:1342 +#: src/dd.c:1350 #, fuzzy, c-format msgid "cannot combine block and unblock" msgstr "ezin dira biak, erabiltzailea eta taldea, alde batera utzi" -#: src/dd.c:1344 +#: src/dd.c:1352 #, fuzzy, c-format msgid "cannot combine lcase and ucase" msgstr "eta" -#: src/dd.c:1346 +#: src/dd.c:1354 #, fuzzy, c-format msgid "cannot combine excl and nocreat" msgstr "honekin edo" -#: src/dd.c:1349 +#: src/dd.c:1357 #, fuzzy, c-format msgid "cannot combine direct and nocache" msgstr "honekin edo" -#: src/dd.c:1506 +#: src/dd.c:1514 #, fuzzy, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3215,158 +3211,179 @@ msgstr "" "errepikatu arte\n" " - mota<sys/mtio.h> errepikatu arte zerrenda -" -#: src/dd.c:1593 +#: src/dd.c:1601 #, fuzzy, c-format msgid "%s: cannot skip" msgstr "%s: ezin da kendu" -#: src/dd.c:1595 src/dd.c:1614 src/dd.c:1675 +#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683 #, fuzzy, c-format msgid "%s: cannot seek" msgstr "%s: ezin da kendu" -#: src/dd.c:1655 +#: src/dd.c:1663 #, c-format msgid "offset overflow while reading file %s" msgstr "" -#: src/dd.c:1667 +#: src/dd.c:1675 #, fuzzy, c-format msgid "warning: invalid file offset after failed read" msgstr "baliogabea zabalera horren ordez" -#: src/dd.c:1671 +#: src/dd.c:1679 #, c-format msgid "cannot work around kernel bug after all" msgstr "" -#: src/dd.c:1814 +#: src/dd.c:1822 #, fuzzy, c-format msgid "setting flags for %s" msgstr "-" -#: src/dd.c:1867 +#: src/dd.c:1875 #, c-format msgid "memory exhausted by input buffer of size %zu bytes (%s)" msgstr "" -#: src/dd.c:1881 +#: src/dd.c:1889 #, c-format msgid "memory exhausted by output buffer of size %zu bytes (%s)" msgstr "" -#: src/dd.c:1914 +#: src/dd.c:1922 #, fuzzy, c-format msgid "%s: cannot skip to specified offset" msgstr "erlatiboa" -#: src/dd.c:2125 src/dd.c:2258 +#: src/dd.c:2133 #, c-format -msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" +msgid "failed to truncate to %<PRIdMAX> bytes in output file %s" msgstr "" -#: src/dd.c:2138 +#: src/dd.c:2146 #, c-format msgid "fdatasync failed for %s" msgstr "`fdatasync'-ek huts egin du %s-(r)entzat" -#: src/dd.c:2148 +#: src/dd.c:2156 #, c-format msgid "fsync failed for %s" msgstr "%s-(r)entzat fsync-ek huts egin du" -#: src/dd.c:2199 src/dd.c:2228 +#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165 #, c-format -msgid "opening %s" -msgstr "%s irekitzen" +msgid "failed to open %s" +msgstr "huts egin da %s irekitzen" -#: src/dd.c:2237 +#: src/dd.c:2246 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) " "blocks" msgstr "" -#: src/dd.c:2274 src/dd.c:2280 +#: src/dd.c:2267 +#, c-format +msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" +msgstr "" + +#: src/dd.c:2283 src/dd.c:2289 #, 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:54 src/expr.c:153 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:39 src/sleep.c:35 src/sort.c:66 +#: 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 msgid "Paul Eggert" msgstr "Paul Eggert" -#: src/df.c:140 +#: src/df.c:172 msgid "Filesystem" msgstr "Fitxategi-sistema" -#: src/df.c:141 +#: src/df.c:175 msgid "Type" msgstr "Moeta" -#: src/df.c:142 +#: src/df.c:178 src/df.c:542 msgid "blocks" msgstr "bloke" -#: src/df.c:142 -msgid "Inodes" -msgstr "Inodoak" - -#: src/df.c:142 -msgid "Size" -msgstr "Tamai" - -#: src/df.c:143 +#: src/df.c:181 msgid "Used" msgstr "Erab" -#: src/df.c:143 -msgid "IUsed" -msgstr "IErabil" - -#: src/df.c:144 +#: src/df.c:184 msgid "Available" msgstr "Eskuragar" -#: src/df.c:144 -msgid "IFree" -msgstr "ILibre" - -#: src/df.c:144 -msgid "Avail" -msgstr "Libre" - -#: src/df.c:145 +#: src/df.c:187 msgid "Use%" msgstr "Erab%" -#: src/df.c:145 +#: src/df.c:190 +msgid "Inodes" +msgstr "Inodoak" + +#: src/df.c:193 +msgid "IUsed" +msgstr "IErabil" + +#: src/df.c:196 +msgid "IFree" +msgstr "ILibre" + +#: src/df.c:199 msgid "IUse%" msgstr "IErab%" -#: src/df.c:145 +#: src/df.c:202 +msgid "Mounted on" +msgstr "Non muntatua" + +#: src/df.c:383 +#, c-format +msgid "option --output: field '%s' unknown" +msgstr "" + +#: src/df.c:390 +#, c-format +msgid "option --output: field '%s' used more than once" +msgstr "" + +#: src/df.c:410 src/df.c:449 +msgid "Size" +msgstr "Tamai" + +#: src/df.c:414 src/df.c:451 +msgid "Avail" +msgstr "Libre" + +#: src/df.c:474 msgid "Capacity" msgstr "Edukiera" -#: src/df.c:146 -msgid "Mounted on" -msgstr "Non muntatua" +#. 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 +#, c-format +msgid "%s-%s" +msgstr "" -#: src/df.c:847 +#: src/df.c:1210 #, fuzzy msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" -"\n" msgstr "" "FITXATEGI bakoitza dagoen fitxategi-sistemari buruzko informazioa erakutsi, " "edo\n" "lehenetsitako moduan fitxategi-sistema guztiena.\n" "\n" -#: src/df.c:855 +#: src/df.c:1217 #, fuzzy msgid "" " -a, --all include dummy file systems\n" @@ -3385,7 +3402,7 @@ msgstr "" " -H, --si analogoa, but 1000 erabiliz potentzia bezala 1024 " "beharrean\n" -#: src/df.c:865 +#: src/df.c:1227 #, fuzzy msgid "" " -i, --inodes list inode information instead of block usage\n" @@ -3400,9 +3417,12 @@ msgstr "" " --no-sync ez deitu sync-i erabilera datuak lortu aurretik " "(lehenetsia)\n" -#: src/df.c:872 +#: src/df.c:1234 #, fuzzy msgid "" +" --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" +" or print all fields if FIELD_LIST is " +"omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" " -t, --type=TYPE limit listing to file systems of type TYPE\n" @@ -3419,21 +3439,43 @@ msgstr "" "moetakoa ez direnera\n" " -v (ignoratua)\n" -#: src/df.c:1027 +#: src/df.c:1248 +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" +msgstr "" + +#: src/df.c:1285 +#, 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 #, c-format msgid "file system type %s both selected and excluded" msgstr "%s fitxategi-sistema moeta aukeratuta eta eskludituta" -#: src/df.c:1075 +#: src/df.c:1500 msgid "Warning: " msgstr "Abisua:" -#: src/df.c:1077 src/stat.c:795 +#: src/df.c:1502 src/stat.c:814 #, fuzzy msgid "cannot read table of mounted file systems" msgstr "%sezin da irakurri muntaturiko fitxategi-sistemen taula" -#: src/df.c:1107 +#: src/df.c:1539 #, c-format msgid "no file systems processed" msgstr "ez da fitxategi sistemarik prozesatu" @@ -3531,7 +3573,7 @@ msgid "" " %s stdio.h -> \".\"\n" msgstr "" -#: src/du.c:260 src/sort.c:390 src/wc.c:112 +#: src/du.c:270 src/sort.c:394 src/wc.c:112 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3540,16 +3582,16 @@ msgstr "" "Erabilera: %s [AUKERA]... [FITXATEGIA]...\n" " edo: %s [AUKERA]... --files0-from=FITXATEGIA\n" -#: src/du.c:264 +#: src/du.c:274 #, fuzzy -msgid "" -"Summarize disk usage of each FILE, recursively for directories.\n" -"\n" +msgid "Summarize disk usage of each FILE, recursively for directories.\n" msgstr "- FITXATEGIA errepikatu arte e e" -#: src/du.c:271 +#: src/du.c:280 #, fuzzy msgid "" +" -0, --null end each output line with 0 byte rather than " +"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,7 +3609,7 @@ msgstr "" " a\n" " e" -#: src/du.c:279 +#: src/du.c:289 #, fuzzy msgid "" " -B, --block-size=SIZE scale sizes by SIZE before printing them. E.g.,\n" @@ -3577,15 +3619,21 @@ msgid "" " -c, --total produce a grand total\n" " -D, --dereference-args dereference only symlinks that are listed on the\n" " command line\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 "" -" -a, --all 0 bloke dizuten fitxategi-sistemak ere erakutsi\n" -" -B, --block-size=TAMAINUA erabili TAMAINUA-byte-eko blokeak\n" -" -h, --human-readable gizaki-irakurgai formatuan eman tamainuak (adib., 1K " -"234M 2G)\n" -" -H, --si analogoa, but 1000 erabiliz potentzia bezala 1024 " -"beharrean\n" +"x aktibatuta\n" +" X FITXATEGIA FITXATEGIA edozein in FITXATEGIA\n" +"\n" +" I errepikatu arte a edo honekin\n" +" da I edo\n" +" da\n" +" e" -#: src/du.c:288 +#: src/du.c:302 #, fuzzy msgid "" " --files0-from=F summarize disk usage of the NUL-terminated file\n" @@ -3594,7 +3642,6 @@ msgid "" " -H equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" --si like -h, but use powers of 1000 not 1024\n" msgstr "" "T a\n" "\n" @@ -3603,22 +3650,21 @@ msgstr "" " tamaina\n" " e" -#: src/du.c:297 +#: src/du.c:310 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 "" -#: src/du.c:302 +#: src/du.c:316 #, fuzzy msgid "" -" -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " "default)\n" -" -0, --null end each output line with 0 byte rather than " -"newline\n" " -S, --separate-dirs 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 "" "\n" @@ -3627,29 +3673,11 @@ msgstr "" " S tamaina -\n" " a errepikatu arte e" -#: src/du.c:309 -#, 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 aktibatuta\n" -" X FITXATEGIA FITXATEGIA edozein in FITXATEGIA\n" -"\n" -" I errepikatu arte a edo honekin\n" -" da I edo\n" -" da\n" -" e" - -#: src/du.c:318 +#: src/du.c:322 #, fuzzy msgid "" +" -t, --threshold=SIZE exclude entries smaller than SIZE if positive,\n" +" or entries greater than SIZE if negative\n" " --time show time of the last modification of any file in " "the\n" " directory, or any of its subdirectories\n" @@ -3667,65 +3695,74 @@ msgstr "" " erabili edo erabili\n" " e" -#: src/du.c:375 +#: src/du.c:333 +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 msgid "Infinity" msgstr "Infinity B" -#: src/du.c:600 +#: src/du.c:507 +#, c-format +msgid "mount point %s already traversed" +msgstr "" + +#: src/du.c:624 #, fuzzy, c-format msgid "fts_read failed: %s" msgstr "`fts_read'-ek huts egin du" -#: src/du.c:724 +#: src/du.c:780 #, fuzzy, c-format msgid "invalid maximum depth %s" msgstr "baliogabea gehienezkoa" -#: src/du.c:817 +#: src/du.c:809 +#, fuzzy, c-format +msgid "invalid --threshold argument '-0'" +msgstr "baliogabeko argumentua: %s" + +#: src/du.c:887 #, fuzzy, c-format msgid "cannot both summarize and show all entries" msgstr "eta" -#: src/du.c:824 +#: src/du.c:894 #, fuzzy, c-format msgid "warning: summarizing is the same as using --max-depth=0" msgstr "da 0" -#: src/du.c:830 +#: src/du.c:900 #, fuzzy, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "honekin" -#: src/du.c:896 src/sort.c:4479 src/wc.c:668 +#: src/du.c:966 src/sort.c:4533 src/wc.c:668 msgid "file operands cannot be combined with --files0-from" msgstr "" -#: src/du.c:949 src/md5sum.c:587 src/od.c:903 src/tac.c:239 src/tac.c:350 -#: src/tac.c:506 src/tac.c:586 src/wc.c:733 +#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 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:963 src/sort.c:4508 src/wc.c:747 +#: src/du.c:1040 src/sort.c:4562 src/wc.c:747 #, c-format msgid "when reading file names from stdin, no file name of %s allowed" msgstr "" -#: src/du.c:980 src/du.c:988 src/wc.c:760 src/wc.c:768 +#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768 #, fuzzy msgid "invalid zero-length file name" msgstr "baliogabea taldea" -#: src/du.c:1007 src/head.c:149 src/head.c:262 src/head.c:334 src/head.c:538 -#: src/head.c:620 src/head.c:692 src/head.c:750 src/head.c:774 src/tail.c:412 -#: src/tail.c:500 src/tail.c:549 src/tail.c:642 src/tail.c:770 src/tail.c:818 -#: src/tail.c:855 src/tail.c:1782 src/tail.c:1812 src/uniq.c:395 -#, c-format -msgid "error reading %s" -msgstr "errorea %s irakurtzen" - -#: src/du.c:1010 src/ls.c:2649 src/wc.c:791 +#: src/du.c:1088 src/ls.c:2649 src/wc.c:791 msgid "total" msgstr "guztira" @@ -3817,10 +3854,12 @@ msgid "Usage: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n" msgstr "IZENA KOMANDOA e" #: src/env.c:55 +msgid "Set each NAME to VALUE in the environment and run COMMAND.\n" +msgstr "" + +#: src/env.c:61 #, fuzzy msgid "" -"Set each NAME to VALUE in the environment and run COMMAND.\n" -"\n" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with 0 byte rather than newline\n" " -u, --unset=NAME remove variable from the environment\n" @@ -3829,24 +3868,24 @@ msgstr "" " ez ikusi egin hasi honekin hutsik\n" " IZENA e" -#: src/env.c:64 +#: src/env.c:68 #, fuzzy msgid "" "\n" "A mere - implies -i. If no COMMAND, print the resulting environment.\n" msgstr "Baldintzak ez KOMANDOA e" -#: src/env.c:120 +#: src/env.c:124 #, fuzzy, c-format msgid "cannot unset %s" msgstr "ezin da %s esteka kendu" -#: src/env.c:131 +#: src/env.c:135 #, fuzzy, c-format msgid "cannot set %s" msgstr "ezin dira taldeak ezarri" -#: src/env.c:148 +#: src/env.c:152 #, c-format msgid "cannot specify --null (-0) with command" msgstr "" @@ -3856,10 +3895,9 @@ msgstr "" msgid "" "Convert tabs in each FILE to spaces, writing to standard output.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "Bihurtu in FITXATEGIA ez FITXATEGIA edo FITXATEGIA da e e" -#: src/expand.c:115 +#: src/expand.c:114 #, fuzzy msgid "" " -i, --initial do not convert tabs after non blanks\n" @@ -3868,33 +3906,33 @@ msgstr "" "geroago\n" " KOPURUA KOPURUA e" -#: src/expand.c:119 +#: src/expand.c:118 #, fuzzy msgid "" " -t, --tabs=LIST use comma separated list of explicit tab positions\n" msgstr "erabili zerrenda - e" -#: src/expand.c:172 src/unexpand.c:191 +#: src/expand.c:171 src/unexpand.c:190 #, fuzzy, c-format msgid "tab stop is too large %s" msgstr "gelditu da" -#: src/expand.c:180 src/unexpand.c:199 +#: src/expand.c:179 src/unexpand.c:198 #, fuzzy, c-format msgid "tab size contains invalid character(s): %s" msgstr "tamaina hau daukana baliogabea" -#: src/expand.c:206 src/unexpand.c:225 +#: src/expand.c:205 src/unexpand.c:224 #, fuzzy, c-format msgid "tab size cannot be 0" msgstr "tamaina 0" -#: src/expand.c:208 src/unexpand.c:227 +#: src/expand.c:207 src/unexpand.c:226 #, c-format msgid "tab sizes must be ascending" msgstr "" -#: src/expand.c:326 src/expand.c:345 src/unexpand.c:374 src/unexpand.c:419 +#: 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 "sarrera lerroa luzeegia da" @@ -4040,12 +4078,12 @@ msgstr "in bilatu" msgid "non-integer argument" msgstr "baliogabea" -#: src/expr.c:793 src/truncate.c:316 +#: src/expr.c:793 src/truncate.c:314 #, fuzzy, c-format msgid "division by zero" msgstr "bider" -#: src/expr.c:887 src/sort.c:2029 +#: src/expr.c:887 src/sort.c:2044 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "ezarri LC_ALL='C' arazo hau une batez konpontzeko" @@ -4055,25 +4093,32 @@ msgstr "ezarri LC_ALL='C' arazo hau une batez konpontzeko" msgid "the strings compared were %s and %s" msgstr "Alderatutako bi kateak %s eta %s izan dira." -#: src/factor.c:449 -msgid "using arbitrary-precision arithmetic" +#. This is a proper name. See the gettext manual, section Names. +#: src/factor.c:111 +msgid "Niels Moller" msgstr "" -#: src/factor.c:460 -msgid "using single-precision arithmetic" +#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459 +#, c-format +msgid "Lucas prime test failure. This should not happen" msgstr "" -#: src/factor.c:465 src/od.c:1640 src/od.c:1709 +#: src/factor.c:2092 #, c-format -msgid "%s is too large" -msgstr "%s luzeegia da" +msgid "squfof queue overflow" +msgstr "" -#: src/factor.c:469 +#: src/factor.c:2419 #, c-format msgid "%s is not a valid positive integer" msgstr "%s ez da zenbaki positibo zuzena" -#: src/factor.c:494 +#: src/factor.c:2442 src/od.c:1646 src/od.c:1715 +#, c-format +msgid "%s is too large" +msgstr "%s luzeegia da" + +#: src/factor.c:2454 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4082,7 +4127,7 @@ msgstr "" "Erabilera: %s [ZENBAKIA]...\n" " edo: %s AUKERA\n" -#: src/factor.c:499 +#: src/factor.c:2459 #, fuzzy msgid "" "Print the prime factors of each specified integer NUMBER. If none\n" @@ -4110,21 +4155,20 @@ msgid "cannot stat current directory (now %s)" msgstr "ezin da 'stat' egin uneko direktorioan (unekoa %s)" #. This is a proper name. See the gettext manual, section Names. -#: src/fmt.c:37 +#: src/fmt.c:38 msgid "Ross Paterson" msgstr "Ross Paterson" -#: src/fmt.c:269 +#: src/fmt.c:270 #, c-format msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n" msgstr "Erabilera: %s [-ZABALERA] [AUKERA]... [FITXATEGIA]...\n" -#: src/fmt.c:270 +#: 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" -"\n" msgstr "paragrafoa in FITXATEGIA ez FITXATEGIA edo FITXATEGIA da e e" #: src/fmt.c:278 @@ -4139,8 +4183,8 @@ msgstr "" " KATEA lerroz behin KATEA\n" " lerroz behin e" -#: src/fmt.c:285 -#, fuzzy, c-format +#: src/fmt.c:287 +#, fuzzy, 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" @@ -4151,14 +4195,14 @@ msgstr "" " bikoa geroago\n" " zabalera gehienezkoa zabalera lehenetsia - zutabetan e" -#: src/fmt.c:357 +#: src/fmt.c:359 #, fuzzy, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" "option; use -w N instead" msgstr "baliogabea da da lehen erabili I horren ordez" -#: src/fmt.c:403 src/fmt.c:414 +#: src/fmt.c:405 src/fmt.c:416 #, c-format msgid "invalid width: %s" msgstr "baliogabeko zabalera: %s" @@ -4168,10 +4212,9 @@ msgstr "baliogabeko zabalera: %s" msgid "" "Wrap input lines in each FILE (standard input by default), writing to\n" "standard output.\n" -"\n" msgstr "Itzulbiratu lerroz behin in FITXATEGIA bider lehenetsia e e" -#: src/fold.c:78 +#: src/fold.c:77 #, fuzzy msgid "" " -b, --bytes count bytes rather than columns\n" @@ -4182,13 +4225,13 @@ msgstr "" "\n" " zabalera erabili zutabetan horren ordez - e" -#: src/fold.c:289 src/pr.c:836 +#: src/fold.c:288 src/pr.c:832 #, c-format 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:75 +#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 #: src/truncate.c:37 msgid "Padraig Brady" msgstr "Padraig Brady" @@ -4204,17 +4247,17 @@ msgid "" "\n" msgstr "" -#: src/group-list.c:69 src/id.c:345 src/setuidgid.c:184 +#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184 #, fuzzy, c-format msgid "failed to get groups for user %s" msgstr "taldea - e" -#: src/group-list.c:74 src/id.c:350 +#: src/group-list.c:74 src/id.c:370 #, fuzzy, c-format msgid "failed to get groups for the current process" msgstr "taldea - e" -#: src/group-list.c:104 +#: src/group-list.c:114 #, fuzzy, c-format msgid "cannot find name for group ID %lu" msgstr "errepikatu arte taldea IDa" @@ -4257,12 +4300,11 @@ 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" -"\n" msgstr "" "Inprimatu lehen lerroz behin - FITXATEGIA FITXATEGIA honekin a goiburua ez " "FITXATEGIA edo FITXATEGIA da e e" -#: src/head.c:118 +#: src/head.c:117 #, fuzzy msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" @@ -4279,7 +4321,7 @@ msgstr "" " honekin azken\n" " I lerroz behin - e" -#: src/head.c:126 +#: src/head.c:125 #, fuzzy msgid "" " -q, --quiet, --silent never print headers giving file names\n" @@ -4288,7 +4330,7 @@ msgstr "" "\n" " e" -#: src/head.c:132 +#: src/head.c:131 #, fuzzy msgid "" "\n" @@ -4298,58 +4340,58 @@ msgid "" msgstr "" "eta maiatzak bider M MB M B eta aktibatuta errepikatu arte E Y maiatzak e e" -#: src/head.c:152 -#, c-format -msgid "error writing %s" -msgstr "errorea %s idazten" - -#: src/head.c:155 +#: src/head.c:154 #, c-format msgid "%s: file has shrunk too much" msgstr "" -#: src/head.c:228 src/head.c:1044 +#: src/head.c:227 src/head.c:1051 #, fuzzy, c-format msgid "%s: number of bytes is too large" msgstr "- da" -#: src/head.c:441 +#: src/head.c:440 #, c-format msgid "%s: cannot lseek back to original position" msgstr "" -#: src/head.c:613 src/head.c:684 src/tail.c:450 +#: src/head.c:612 src/head.c:691 src/tail.c:449 #, c-format msgid "%s: cannot seek to offset %s" msgstr "" -#: src/head.c:791 +#: src/head.c:673 +#, fuzzy, c-format +msgid "%s: failed to reset file pointer" +msgstr "%s: huts egin da ezabatzen" + +#: src/head.c:798 #, fuzzy, c-format msgid "cannot reposition file pointer for %s" msgstr "errepikatu arte" -#: src/head.c:878 +#: src/head.c:885 #, fuzzy, c-format msgid "%s: %s is so large that it is not representable" msgstr "da da" -#: src/head.c:879 +#: src/head.c:886 msgid "number of lines" msgstr "lerro kopurua" -#: src/head.c:879 +#: src/head.c:886 msgid "number of bytes" msgstr "byte kopurua" -#: src/head.c:886 src/tail.c:1947 +#: src/head.c:893 src/tail.c:1947 msgid "invalid number of lines" msgstr "lerro kopuru okerra" -#: src/head.c:887 src/tail.c:1948 +#: src/head.c:894 src/tail.c:1948 msgid "invalid number of bytes" msgstr "byte kopuru okerra" -#: src/head.c:974 src/head.c:1032 +#: src/head.c:981 src/head.c:1039 #, fuzzy, c-format msgid "invalid trailing option -- %c" msgstr "baliogabea" @@ -4459,86 +4501,86 @@ msgstr "" msgid "cannot get effective UID" msgstr "ezin da %s kendu" -#: src/id.c:289 +#: src/id.c:311 #, fuzzy, c-format -msgid "cannot find name for user ID %lu" +msgid "cannot find name for user ID %s" msgstr "errepikatu arte IDa" -#: src/id.c:309 +#: src/id.c:329 #, fuzzy, c-format -msgid "uid=%lu" +msgid "uid=%s" msgstr "uid=%lu" -#: src/id.c:314 +#: src/id.c:334 #, fuzzy, c-format -msgid " gid=%lu" -msgstr " egid=%lu" +msgid " gid=%s" +msgstr " gid=%lu" -#: src/id.c:321 +#: src/id.c:341 #, fuzzy, c-format -msgid " euid=%lu" -msgstr " egid=%lu" +msgid " euid=%s" +msgstr " euid=%lu" -#: src/id.c:329 -#, c-format -msgid " egid=%lu" +#: src/id.c:349 +#, fuzzy, c-format +msgid " egid=%s" msgstr " egid=%lu" -#: src/id.c:357 +#: src/id.c:377 msgid " groups=" msgstr " taldeak=" -#: src/id.c:373 +#: src/id.c:393 #, c-format msgid " context=%s" msgstr " kontestua=%s" -#: src/install.c:372 +#: src/install.c:373 #, fuzzy, c-format msgid "warning: %s: failed to change context to %s" msgstr "- e" -#: src/install.c:413 +#: src/install.c:414 #, c-format msgid "creating directory %s" msgstr "%s direktorioa sortzen" -#: src/install.c:481 +#: src/install.c:482 #, c-format msgid "cannot change ownership of %s" msgstr "ezin da aldatu %s-(r)en jabegoa" -#: src/install.c:505 +#: src/install.c:506 #, fuzzy, c-format msgid "cannot set time stamps for %s" msgstr "errepikatu arte" -#: src/install.c:526 src/split.c:412 src/timeout.c:387 +#: src/install.c:527 src/split.c:426 src/timeout.c:439 #, c-format msgid "fork system call failed" msgstr "" -#: src/install.c:530 +#: src/install.c:531 #, c-format msgid "cannot run %s" msgstr "ezin da %s exekutatu" -#: src/install.c:534 +#: src/install.c:535 #, fuzzy, c-format msgid "waiting for strip" msgstr "%s-ra idazten" -#: src/install.c:536 +#: src/install.c:537 #, c-format msgid "strip process terminated abnormally" msgstr "" -#: src/install.c:557 +#: src/install.c:558 #, c-format msgid "invalid user %s" msgstr "%s baliogabeko erabiltzailea" -#: src/install.c:593 +#: src/install.c:594 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -4550,7 +4592,7 @@ msgstr "" " edo ITURBURUA DIREKTORIOA\n" " edo DIREKTORIOA ITURBURUA e" -#: src/install.c:600 +#: src/install.c:601 #, fuzzy msgid "" "\n" @@ -4563,7 +4605,6 @@ msgid "" "In the first three forms, copy SOURCE to DEST or multiple SOURCE(s) to\n" "the existing DIRECTORY, while setting permission modes and owner/group.\n" "In the 4th form, create all components of the given DIRECTORY(ies).\n" -"\n" msgstr "" "Handiagotu lehen bikoa kopiatu ITURBURUA edo ITURBURUA DIREKTORIOA eta jabea " "taldea hirugarren - DIREKTORIOA e e" @@ -4631,53 +4672,53 @@ msgid "" "directories\n" msgstr "" -#: src/install.c:858 +#: src/install.c:859 #, c-format msgid "" "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled" msgstr "" -#: src/install.c:868 +#: src/install.c:869 #, c-format msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled" msgstr "" -#: src/install.c:885 +#: src/install.c:886 #, fuzzy, c-format msgid "the strip option may not be used when installing a directory" msgstr "maiatzak a" -#: src/install.c:888 +#: src/install.c:889 #, fuzzy, c-format msgid "target directory not allowed when installing a directory" msgstr "maiatzak a" -#: src/install.c:892 +#: src/install.c:893 #, c-format msgid "cannot force target context to %s and preserve it" msgstr "" -#: src/install.c:946 src/mkdir.c:202 src/stdbuf.c:327 +#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326 #, c-format msgid "invalid mode %s" msgstr "%s baliogabeko modua" -#: src/install.c:953 +#: src/install.c:954 #, c-format msgid "WARNING: ignoring --strip-program option as -s option was not specified" msgstr "" -#: src/install.c:958 +#: src/install.c:959 #, fuzzy, c-format msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive" msgstr "eta" -#: src/install.c:965 +#: src/install.c:966 #, fuzzy, c-format msgid "options --compare (-C) and --strip are mutually exclusive" msgstr "errepikatu arte" -#: src/install.c:971 +#: src/install.c:972 #, c-format msgid "" "the --compare (-C) option is ignored when you specify a mode with non-" @@ -4685,7 +4726,7 @@ msgid "" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/join.c:40 src/sort.c:65 +#: src/join.c:40 src/sort.c:66 msgid "Mike Haertel" msgstr "Mike Haertel" @@ -4757,7 +4798,7 @@ msgstr "" #: src/join.c:403 #, c-format -msgid "%s:%ju: is not sorted: %.*s" +msgid "%s:%<PRIuMAX>: is not sorted: %.*s" msgstr "" #: src/join.c:840 src/join.c:1038 @@ -4785,12 +4826,12 @@ msgstr "" msgid "conflicting empty-field replacement strings" msgstr "" -#: src/join.c:1101 src/sort.c:4414 +#: src/join.c:1101 src/sort.c:4468 #, fuzzy, c-format msgid "multi-character tab %s" msgstr "baliogabea" -#: src/join.c:1105 src/sort.c:4419 +#: src/join.c:1105 src/sort.c:4473 #, c-format msgid "incompatible tabs" msgstr "" @@ -4813,12 +4854,10 @@ msgstr "" #: src/kill.c:82 #, fuzzy -msgid "" -"Send signals to processes, or list signals.\n" -"\n" +msgid "Send signals to processes, or list signals.\n" msgstr "Bidali edo zerrenda e e" -#: src/kill.c:89 +#: src/kill.c:88 #, fuzzy msgid "" " -s, --signal=SIGNAL, -SIGNAL\n" @@ -4832,7 +4871,7 @@ msgstr "" " zerrenda zerrenda edo\n" " taula a taula - e" -#: src/kill.c:97 +#: src/kill.c:96 #, fuzzy msgid "" "\n" @@ -4841,32 +4880,32 @@ msgid "" "PID is an integer; if negative it identifies a process group.\n" msgstr "maiatzak a edo a - a bider a da a taldea e" -#: src/kill.c:206 +#: src/kill.c:205 #, c-format msgid "%s: invalid process id" msgstr "%s: baliogabeko prozesu id-a" -#: src/kill.c:260 +#: src/kill.c:259 #, c-format msgid "invalid option -- %c" msgstr "baliogabeko aukera -- %c" -#: src/kill.c:269 +#: src/kill.c:268 #, c-format msgid "%s: multiple signals specified" msgstr "" -#: src/kill.c:283 +#: src/kill.c:282 #, c-format msgid "multiple -l or -t options specified" msgstr "-l edo -t aukera anitz espezifikatu dira" -#: src/kill.c:300 +#: src/kill.c:299 #, fuzzy, c-format msgid "cannot combine signal with -l or -t" msgstr "honekin edo" -#: src/kill.c:306 +#: src/kill.c:305 #, fuzzy, c-format msgid "no process ID specified" msgstr "ez IDa" @@ -4974,10 +5013,9 @@ msgid "" "When creating hard links, each TARGET must exist. Symbolic links\n" "can hold arbitrary text; if later resolved, a relative link is\n" "interpreted in relation to its parent directory.\n" -"\n" msgstr "" -#: src/ln.c:395 +#: src/ln.c:394 #, fuzzy msgid "" " --backup[=CONTROL] make a backup of each existing destination " @@ -4997,7 +5035,7 @@ msgstr "" " errepikatu arte\n" " behartu e" -#: src/ln.c:403 +#: src/ln.c:402 #, fuzzy msgid "" " -i, --interactive prompt whether to remove destinations\n" @@ -5014,7 +5052,7 @@ msgstr "" "\n" " horren ordez - e" -#: src/ln.c:412 +#: src/ln.c:411 #, fuzzy msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -5029,23 +5067,10 @@ msgstr "" "\n" " - lehenago e" -#: src/ln.c:428 -#, 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" - -#: src/ln.c:435 +#: src/ln.c:433 #, 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 "" @@ -5115,7 +5140,7 @@ msgstr "baliogabea zabalera in" msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "baliogabea tamaina in" -#: src/ls.c:1750 src/ptx.c:1976 +#: src/ls.c:1750 src/ptx.c:1975 #, fuzzy, c-format msgid "invalid line width: %s" msgstr "baliogabea zabalera" @@ -5179,7 +5204,7 @@ msgstr "%s direktorioa irakurtzen" msgid "closing directory %s" msgstr "%s direktorioa itxitzen" -#: src/ls.c:3301 +#: src/ls.c:3302 #, fuzzy, c-format msgid "cannot compare file names %s and %s" msgstr "eta" @@ -5189,10 +5214,9 @@ msgstr "eta" msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" -"\n" msgstr "Zerrenda bider lehenetsia bat ere ez - e e" -#: src/ls.c:4729 +#: src/ls.c:4728 #, fuzzy msgid "" " -a, --all do not ignore entries starting with .\n" @@ -5206,7 +5230,7 @@ msgstr "" " egilea egilea -\n" " errepikatu arte e" -#: src/ls.c:4735 +#: src/ls.c:4734 #, fuzzy msgid "" " --block-size=SIZE scale sizes by SIZE before printing them. E." @@ -5227,7 +5251,7 @@ msgstr "" " honekin eta bider\n" " bider e" -#: src/ls.c:4745 +#: src/ls.c:4744 #, fuzzy msgid "" " -C list entries by columns\n" @@ -5246,7 +5270,7 @@ msgstr "" " eta\n" " errepikatu arte Emacs modua e" -#: src/ls.c:4753 +#: src/ls.c:4752 #, fuzzy msgid "" " -f do not sort, enable -aU, disable -ls --color\n" @@ -5262,11 +5286,11 @@ msgstr "" " C\n" " e" -#: src/ls.c:4761 +#: src/ls.c:4760 msgid " -g like -l, but do not list owner\n" msgstr "" -#: src/ls.c:4764 +#: src/ls.c:4763 msgid "" " --group-directories-first\n" " group directories before files.\n" @@ -5274,7 +5298,7 @@ msgid "" " use of --sort=none (-U) disables grouping\n" msgstr "" -#: src/ls.c:4770 +#: src/ls.c:4769 #, fuzzy msgid "" " -G, --no-group in a long listing, don't print group names\n" @@ -5289,7 +5313,7 @@ msgstr "" " -H, --si analogoa, but 1000 erabiliz potentzia bezala 1024 " "beharrean\n" -#: src/ls.c:4776 +#: src/ls.c:4775 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5302,7 +5326,7 @@ msgid "" " (overridden by -a or -A)\n" msgstr "" -#: src/ls.c:4786 +#: src/ls.c:4785 #, fuzzy msgid "" " --indicator-style=WORD append indicator with style WORD to entry " @@ -5320,7 +5344,7 @@ msgstr "" " jn. ez ikusi egin zerrenda\n" " tamaina e" -#: src/ls.c:4796 +#: src/ls.c:4795 #, fuzzy msgid "" " -l use a long listing format\n" @@ -5336,7 +5360,7 @@ msgstr "" " errepikatu arte lotura bere gainera\n" " m zabalera honekin a zerrenda - e" -#: src/ls.c:4804 +#: src/ls.c:4803 #, fuzzy msgid "" " -n, --numeric-uid-gid like -l, but list numeric user and group IDs\n" @@ -5353,7 +5377,7 @@ msgstr "" " zerrenda taldea\n" " mota - e" -#: src/ls.c:4812 +#: src/ls.c:4811 #, fuzzy msgid "" " -q, --hide-control-chars print ? instead of non graphic characters\n" @@ -5372,7 +5396,7 @@ msgstr "" " erabili errepikatu arte\n" " e" -#: src/ls.c:4821 +#: src/ls.c:4820 #, fuzzy msgid "" " -r, --reverse reverse order while sorting\n" @@ -5384,7 +5408,7 @@ msgstr "" " G zerrenda\n" " tamaina tamaina - in e" -#: src/ls.c:4826 +#: src/ls.c:4825 #, fuzzy msgid "" " -S sort by file size\n" @@ -5404,7 +5428,7 @@ msgstr "" " erabili edo erabili\n" " e" -#: src/ls.c:4836 +#: src/ls.c:4835 #, fuzzy msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" @@ -5426,13 +5450,13 @@ msgstr "" " bider\n" " horren ordez - e" -#: src/ls.c:4845 +#: src/ls.c:4844 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:4849 +#: src/ls.c:4848 #, fuzzy msgid "" " -u with -lt: sort by, and show, access time\n" @@ -5447,7 +5471,7 @@ msgstr "" " zerrenda in\n" " bider e" -#: src/ls.c:4856 +#: src/ls.c:4855 #, fuzzy msgid "" " -w, --width=COLS assume screen width instead of current value\n" @@ -5462,7 +5486,7 @@ msgstr "" " X bider\n" " zerrenda e" -#: src/ls.c:4866 +#: src/ls.c:4865 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5471,7 +5495,7 @@ msgid "" "variable can change the settings. Use the dircolors command to set it.\n" msgstr "" -#: src/ls.c:4873 +#: src/ls.c:4872 msgid "" "\n" "Exit status:\n" @@ -5495,7 +5519,7 @@ msgstr "Scott Miller" msgid "David Madore" msgstr "David Madore" -#: src/md5sum.c:162 +#: src/md5sum.c:164 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -5506,7 +5530,7 @@ msgstr "" "FITXATEGIA\n" " edo FITXATEGIA edo ez FITXATEGIA edo FITXATEGIA da e" -#: src/md5sum.c:172 +#: src/md5sum.c:174 #, fuzzy msgid "" " -b, --binary read in binary mode (default unless reading tty " @@ -5515,31 +5539,35 @@ msgstr "" "\n" " B erabili gailua e e" -#: src/md5sum.c:176 +#: src/md5sum.c:178 #, fuzzy msgid " -b, --binary read in binary mode\n" msgstr "" "\n" " B erabili gailua e e" -#: src/md5sum.c:179 +#: src/md5sum.c:181 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr "" -#: src/md5sum.c:183 +#: src/md5sum.c:184 +msgid " --tag create a BSD-style checksum\n" +msgstr "" + +#: src/md5sum.c:188 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" -#: src/md5sum.c:187 +#: src/md5sum.c:192 #, fuzzy msgid " -t, --text read in text mode (default)\n" msgstr "" "\n" " B erabili gailua e e" -#: src/md5sum.c:190 +#: src/md5sum.c:195 #, fuzzy msgid "" "\n" @@ -5553,12 +5581,12 @@ msgstr "" "\n" " lerroz behin e e" -#: src/md5sum.c:198 +#: src/md5sum.c:203 msgid "" " --strict with --check, exit non-zero for any invalid input\n" msgstr "" -#: src/md5sum.c:203 +#: src/md5sum.c:208 #, fuzzy, c-format msgid "" "\n" @@ -5570,77 +5598,87 @@ msgstr "" "in Noiz a - uneko programa lehenetsia modua da honekin a mota errepikatu " "arte errepikatu arte eta errepikatu arte FITXATEGIA e" -#: src/md5sum.c:502 +#: src/md5sum.c:523 #, fuzzy, c-format msgid "%s: too many checksum lines" msgstr "ez lerroz behin" -#: src/md5sum.c:526 +#: src/md5sum.c:547 #, fuzzy, c-format msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line" msgstr "ez lerroz behin" -#: src/md5sum.c:551 +#: src/md5sum.c:572 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: HUTS egin du irekitzeak edo irakurtzeak\n" -#: src/md5sum.c:574 +#: src/md5sum.c:595 msgid "FAILED" msgstr "HUTS EGIN DA" -#: src/md5sum.c:576 +#: src/md5sum.c:597 msgid "OK" msgstr "ongi" -#: src/md5sum.c:600 +#: src/md5sum.c:621 #, fuzzy, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "ez lerroz behin" -#: src/md5sum.c:610 +#: src/md5sum.c:631 #, 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:618 +#: src/md5sum.c:639 #, 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:626 +#: src/md5sum.c:647 #, 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:704 +#: src/md5sum.c:760 +#, c-format +msgid "--tag does not support --text mode" +msgstr "" + +#: src/md5sum.c:766 +#, fuzzy, c-format +msgid "the --tag option is meaningless when verifying checksums" +msgstr "da" + +#: src/md5sum.c:773 #, fuzzy, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" msgstr "eta testua" -#: src/md5sum.c:712 +#: src/md5sum.c:781 #, fuzzy, c-format msgid "the --status option is meaningful only when verifying checksums" msgstr "da" -#: src/md5sum.c:719 +#: src/md5sum.c:788 #, fuzzy, c-format msgid "the --warn option is meaningful only when verifying checksums" msgstr "da" -#: src/md5sum.c:726 +#: src/md5sum.c:795 #, fuzzy, c-format msgid "the --quiet option is meaningful only when verifying checksums" msgstr "da" -#: src/md5sum.c:733 +#: src/md5sum.c:802 #, fuzzy, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "da" @@ -5651,14 +5689,13 @@ msgid "Usage: %s [OPTION]... DIRECTORY...\n" msgstr "Erabilera: %s [AUKERA]... DIREKTORIOA...\n" #: src/mkdir.c:57 -msgid "" -"Create the DIRECTORY(ies), if they do not already exist.\n" -"\n" +#, 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:64 +#: src/mkdir.c:63 #, fuzzy msgid "" " -m, --mode=MODE set file mode (as in chmod), not a=rwx - umask\n" @@ -5671,7 +5708,7 @@ msgstr "" " ez\n" " a errepikatu arte e" -#: src/mkdir.c:169 +#: src/mkdir.c:168 #, c-format msgid "created directory %s" msgstr "%s direktorioa sortua" @@ -5683,28 +5720,26 @@ msgstr "Erabilera: %s [AUKERA]... IZENA...\n" #: src/mkfifo.c:52 #, fuzzy -msgid "" -"Create named pipes (FIFOs) with the given NAMEs.\n" -"\n" +msgid "Create named pipes (FIFOs) with the given NAMEs.\n" msgstr "Sortu honekin e e" -#: src/mkfifo.c:59 src/mknod.c:61 +#: src/mkfifo.c:58 src/mknod.c:60 #, 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:62 +#: src/mkfifo.c:61 msgid "" " -Z, --context=CTX set the SELinux security context of each NAME to CTX\n" msgstr "" -#: src/mkfifo.c:122 src/mknod.c:128 +#: src/mkfifo.c:121 src/mknod.c:127 #, fuzzy, c-format msgid "invalid mode" msgstr "baliogabea modua" -#: src/mkfifo.c:127 src/mknod.c:133 +#: src/mkfifo.c:126 src/mknod.c:132 #, c-format msgid "mode must specify only file permission bits" msgstr "" @@ -5716,16 +5751,14 @@ msgstr "IZENA MOTA e" #: src/mknod.c:54 #, fuzzy -msgid "" -"Create the special file NAME of the given TYPE.\n" -"\n" +msgid "Create the special file NAME of the given TYPE.\n" msgstr "Sortu IZENA - MOTA e e" -#: src/mknod.c:64 +#: src/mknod.c:63 msgid " -Z, --context=CTX set the SELinux security context of NAME to CTX\n" msgstr "" -#: src/mknod.c:69 +#: src/mknod.c:68 #, fuzzy msgid "" "\n" @@ -5737,7 +5770,7 @@ msgstr "" "eta MOTA da edo eta MOTA da Baldintzak edo honekin edo da honekin MOTA " "maiatzak e" -#: src/mknod.c:76 +#: src/mknod.c:75 #, fuzzy msgid "" "\n" @@ -5750,42 +5783,42 @@ msgstr "" " a\n" " a e" -#: src/mknod.c:151 +#: src/mknod.c:150 #, fuzzy msgid "Special files require major and minor device numbers." msgstr "eta gailua" -#: src/mknod.c:161 +#: src/mknod.c:160 #, fuzzy msgid "Fifos do not have major and minor device numbers." msgstr "baliogabea gailua" -#: src/mknod.c:177 +#: src/mknod.c:176 #, c-format msgid "block special files not supported" msgstr "" -#: src/mknod.c:186 +#: src/mknod.c:185 #, c-format msgid "character special files not supported" msgstr "" -#: src/mknod.c:202 +#: src/mknod.c:201 #, c-format msgid "invalid major device number %s" msgstr "%s baliogabeko `major' gailu zenbakia" -#: src/mknod.c:207 +#: src/mknod.c:206 #, c-format msgid "invalid minor device number %s" msgstr "%s baliogabeko `minor' gailu zenbakia" -#: src/mknod.c:212 +#: src/mknod.c:211 #, c-format msgid "invalid device %s %s" msgstr "%s %s baliogabeko gailua" -#: src/mknod.c:226 +#: src/mknod.c:225 #, c-format msgid "invalid device type %s" msgstr "%s baliogabeko gailua mota" @@ -5844,59 +5877,57 @@ msgid "" " directory specified via -p; else /tmp [deprecated]\n" msgstr "" -#: src/mktemp.c:222 +#: src/mktemp.c:223 #, c-format msgid "failed to redirect stderr to /dev/null" msgstr "" -#: src/mktemp.c:228 +#: src/mktemp.c:229 #, c-format msgid "too many templates" msgstr "txantiloi gehiegi" -#: src/mktemp.c:248 +#: src/mktemp.c:249 #, c-format msgid "with --suffix, template %s must end in X" msgstr "" -#: src/mktemp.c:273 src/split.c:1117 +#: src/mktemp.c:274 src/split.c:1130 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "" -#: src/mktemp.c:278 +#: src/mktemp.c:279 #, c-format msgid "too few X's in template %s" msgstr "X gutxitxo %s txantiloian" -#: src/mktemp.c:291 +#: src/mktemp.c:292 #, c-format msgid "invalid template, %s, contains directory separator" msgstr "" -#: src/mktemp.c:305 +#: src/mktemp.c:306 #, c-format msgid "invalid template, %s; with --tmpdir, it may not be absolute" msgstr "" -#: src/mktemp.c:325 +#: src/mktemp.c:326 #, fuzzy, c-format msgid "failed to create directory via template %s" msgstr "ezin da %s direktorioa sortu" -#: src/mktemp.c:335 +#: src/mktemp.c:336 #, fuzzy, c-format msgid "failed to create file via template %s" msgstr "errepikatu arte" -#: src/mv.c:290 +#: src/mv.c:292 #, fuzzy -msgid "" -"Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" -"\n" +msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" msgstr "Izena aldatu ITURBURUA edo ITURBURUA DIREKTORIOA e e" -#: src/mv.c:297 +#: src/mv.c:298 #, fuzzy msgid "" " --backup[=CONTROL] make a backup of each existing destination " @@ -5916,7 +5947,7 @@ msgstr "" " lehenago\n" " e" -#: src/mv.c:306 +#: src/mv.c:307 #, fuzzy msgid "" " --strip-trailing-slashes remove any trailing slashes from each " @@ -5930,7 +5961,7 @@ msgstr "" "\n" " S e" -#: src/mv.c:311 +#: src/mv.c:312 #, fuzzy msgid "" " -t, --target-directory=DIRECTORY move all SOURCE arguments into " @@ -5956,28 +5987,30 @@ msgstr "Erabilera: %s [AUKERA] [KOMANDOA [ARGUMENTUA]...]\n" #, c-format msgid "" "Run COMMAND with an adjusted niceness, which affects process scheduling.\n" -"With no COMMAND, print the current niceness. Nicenesses range from\n" -"%d (most favorable scheduling) to %d (least favorable).\n" -"\n" -" -n, --adjustment=N add integer N to the niceness (default 10)\n" +"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 "" -#: src/nice.c:168 +#: src/nice.c:82 +msgid " -n, --adjustment=N add integer N to the niceness (default 10)\n" +msgstr "" + +#: src/nice.c:172 #, c-format msgid "invalid adjustment %s" msgstr "%s baliogabeko aldaketa" -#: src/nice.c:177 +#: src/nice.c:181 #, fuzzy, c-format msgid "a command must be given with an adjustment" msgstr "a honekin" -#: src/nice.c:184 src/nice.c:195 +#: src/nice.c:188 src/nice.c:199 #, fuzzy, c-format msgid "cannot get niceness" msgstr "ezin da sistemaren izena lortu" -#: src/nice.c:201 +#: src/nice.c:205 #, fuzzy, c-format msgid "cannot set niceness" msgstr "ezin da data ezarri" @@ -5987,15 +6020,14 @@ msgstr "ezin da data ezarri" msgid "Scott Bartram" msgstr "Scott Bartram" -#: src/nl.c:186 +#: 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" -"\n" msgstr "Idatzi FITXATEGIA honekin ez FITXATEGIA edo FITXATEGIA da e e" -#: src/nl.c:194 +#: src/nl.c:186 #, fuzzy msgid "" " -b, --body-numbering=STYLE use STYLE for numbering body lines\n" @@ -6006,7 +6038,7 @@ msgstr "" " CC erabili CC errepikatu arte\n" " orri-oina ESTILOA erabili ESTILOA errepikatu arte orri-oina lerroz behin e" -#: src/nl.c:199 +#: src/nl.c:191 #, fuzzy msgid "" " -h, --header-numbering=STYLE use STYLE for numbering header lines\n" @@ -6025,7 +6057,7 @@ msgstr "" " ez berrezarri\n" " bereizlea KATEA KATEA geroago e" -#: src/nl.c:207 +#: src/nl.c:199 #, fuzzy msgid "" " -v, --starting-line-number=NUMBER first line number on each logical page\n" @@ -6034,7 +6066,7 @@ msgstr "" "lehen KOPURUA lehen aktibatuta\n" " zabalera KOPURUA erabili KOPURUA zutabetan errepikatu arte e" -#: src/nl.c:213 +#: src/nl.c:205 #, fuzzy msgid "" "\n" @@ -6043,7 +6075,7 @@ msgid "" "second character implies :. Type \\\\ for \\. STYLE is one of:\n" msgstr "lehenetsia CC errepikatu arte a Mota errepikatu arte ESTILOA da - e" -#: src/nl.c:219 +#: src/nl.c:211 #, fuzzy msgid "" "\n" @@ -6069,52 +6101,47 @@ msgstr "" " right ez\n" " right e e" -#: src/nl.c:286 +#: src/nl.c:278 #, fuzzy, c-format msgid "line number overflow" msgstr "da" -#: src/nl.c:486 +#: src/nl.c:478 #, fuzzy, c-format msgid "invalid header numbering style: %s" msgstr "baliogabea goiburua" -#: src/nl.c:494 +#: src/nl.c:486 #, fuzzy, c-format msgid "invalid body numbering style: %s" msgstr "baliogabea" -#: src/nl.c:502 +#: src/nl.c:494 #, fuzzy, c-format msgid "invalid footer numbering style: %s" msgstr "baliogabea orri-oina" -#: src/nl.c:511 +#: src/nl.c:503 #, fuzzy, c-format msgid "invalid starting line number: %s" msgstr "baliogabea" -#: src/nl.c:517 -#, fuzzy, c-format -msgid "WARNING: --page-increment is deprecated; use --line-increment instead" -msgstr "da erabili horren ordez" - -#: src/nl.c:524 +#: src/nl.c:512 #, fuzzy, c-format msgid "invalid line number increment: %s" msgstr "baliogabea" -#: src/nl.c:536 +#: src/nl.c:524 #, fuzzy, c-format msgid "invalid number of blank lines: %s" msgstr "baliogabea - lerroz behin" -#: src/nl.c:550 +#: src/nl.c:538 #, fuzzy, c-format msgid "invalid line number field width: %s" msgstr "baliogabea zabalera" -#: src/nl.c:569 +#: src/nl.c:557 #, fuzzy, c-format msgid "invalid line numbering format: %s" msgstr "baliogabea" @@ -6156,11 +6183,6 @@ msgstr "stderr berbideratzeak huts egin du" msgid "ignoring input" msgstr "sarrerari ezikusiarena egiten" -#: src/nohup.c:163 src/nohup.c:165 -#, c-format -msgid "failed to open %s" -msgstr "huts egin da %s irekitzen" - #: src/nohup.c:175 #, fuzzy, c-format msgid "ignoring input and appending output to %s" @@ -6192,33 +6214,370 @@ msgid "failed to redirect standard error" msgstr "stderr berbideratzeak huts egin du" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:32 +#: src/nproc.c:33 msgid "Giuseppe Scrivano" msgstr "Giuseppe Scrivano" -#: src/nproc.c:56 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 +#: src/nproc.c:57 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Erabilera: %s [AUKERA]...\n" -#: src/nproc.c:57 +#: src/nproc.c:58 msgid "" "Print the number of processing units available to the current process,\n" "which may be less than the number of online processors\n" "\n" msgstr "" -#: src/nproc.c:62 +#: src/nproc.c:63 msgid "" " --all print the number of installed processors\n" " --ignore=N if possible, exclude N processing units\n" msgstr "" -#: src/nproc.c:106 +#: src/nproc.c:107 #, fuzzy, c-format 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 +msgid "Assaf Gordon" +msgstr "" + +#: src/numfmt.c:676 +#, fuzzy, c-format +msgid "value too large to be converted: '%s'" +msgstr "balioa" + +#: src/numfmt.c:680 +#, fuzzy, c-format +msgid "invalid number: '%s'" +msgstr "baliogabea" + +#: src/numfmt.c:684 +#, c-format +msgid "rejecting suffix in input: '%s' (consider using --from)" +msgstr "" + +#: src/numfmt.c:688 +#, fuzzy, c-format +msgid "invalid suffix in input: '%s'" +msgstr "baliogabeko atzizkia %s%s argumentua `%s'" + +#: src/numfmt.c:692 +#, c-format +msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)" +msgstr "" + +#: src/numfmt.c:723 +#, fuzzy, c-format +msgid "failed to prepare value '%Lf' for printing" +msgstr "%s: huts egin da idazteko irekitzean" + +#: src/numfmt.c:787 +#, fuzzy, c-format +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 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [NUMBER]...\n" +msgstr "Erabilera: %s [AUKERA]... [ERABILTZAILEA]...\n" + +#: src/numfmt.c:816 +msgid "" +"Reformat NUMBER(s), or the numbers from standard input if none are " +"specified.\n" +msgstr "" + +#: src/numfmt.c:820 +msgid " --debug print warnings about invalid input\n" +msgstr "" + +#: src/numfmt.c:823 +msgid "" +" -d, --delimiter=X use X instead of whitespace for field delimiter\n" +msgstr "" + +#: src/numfmt.c:826 +msgid "" +" --field=N replace the number in input field N (default is 1)\n" +msgstr "" + +#: src/numfmt.c:829 +msgid "" +" --format=FORMAT use printf style floating-point FORMAT;\n" +" see FORMAT below for details\n" +msgstr "" + +#: src/numfmt.c:833 +msgid "" +" --from=UNIT auto-scale input numbers to UNITs; default is " +"'none';\n" +" see UNIT below\n" +msgstr "" + +#: src/numfmt.c:837 +msgid "" +" --from-unit=N specify the input unit size (instead of the default " +"1)\n" +msgstr "" + +#: src/numfmt.c:840 +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 "" + +#: src/numfmt.c:844 +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 +msgid "" +" --invalid=MODE failure mode for invalid numbers: MODE can be:\n" +" abort (default), fail, warn, ignore\n" +msgstr "" + +#: src/numfmt.c:852 +msgid "" +" --padding=N pad the output to N characters; positive N will\n" +" right-align; negative N will left-align;\n" +" padding is ignored if the output is wider than N;\n" +" the default is to automatically pad if a " +"whitespace\n" +" is found\n" +msgstr "" + +#: src/numfmt.c:859 +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 +msgid "" +" --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" +" SUFFIX in input numbers\n" +msgstr "" + +#: src/numfmt.c:867 +msgid "" +" --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" +msgstr "" + +#: src/numfmt.c:870 +msgid "" +" --to-unit=N the output unit size (instead of the default 1)\n" +msgstr "" + +#: src/numfmt.c:877 +#, fuzzy +msgid "" +"\n" +"UNIT options:\n" +msgstr "" +"Beste aukerak:\n" +"\n" + +#: src/numfmt.c:880 +msgid " none no auto-scaling is done; suffixes will trigger an error\n" +msgstr "" + +#: src/numfmt.c:883 +msgid "" +" auto accept optional single/two letter suffix:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" +msgstr "" + +#: src/numfmt.c:889 +msgid "" +" si accept optional single letter suffix:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:894 +msgid "" +" iec accept optional single letter suffix:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:899 +msgid "" +" iec-i accept optional two-letter suffix:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:905 +#, 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" +msgstr "" + +#: src/numfmt.c:912 +#, c-format +msgid "" +"\n" +"Exit status is 0 if all input numbers were successfully converted.\n" +"By default, %s will stop at the first conversion error with exit status 2.\n" +"With --invalid='fail' a warning is printed for each conversion error\n" +"and the exit status is 2. With --invalid='warn' each conversion error is\n" +"diagnosed, but the exit status is 0. With --invalid='ignore' conversion\n" +"errors are not diagnosed and the exit status is 0.\n" +msgstr "" + +#: src/numfmt.c:921 +#, c-format +msgid "" +"\n" +"Examples:\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" +msgstr "" + +#: src/numfmt.c:974 src/seq.c:212 +#, c-format +msgid "format %s has no %% directive" +msgstr "" + +#: src/numfmt.c:990 +#, fuzzy, c-format +msgid "invalid format %s (width overflow)" +msgstr "baliogabea zabalera" + +#: src/numfmt.c:1007 src/seq.c:229 +#, c-format +msgid "format %s ends in %%" +msgstr "" + +#: src/numfmt.c:1010 +#, c-format +msgid "invalid format %s, directive must be %%['][-][N]f" +msgstr "" + +#: src/numfmt.c:1018 src/seq.c:236 +#, 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 "baliogabeko atzizkia %s%s argumentua `%s'" + +#: src/numfmt.c:1092 +#, c-format +msgid "value too large to be printed: '%Lg' (consider using --to)" +msgstr "" + +#: src/numfmt.c:1100 +#, c-format +msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" +msgstr "" + +#: src/numfmt.c:1184 +#, c-format +msgid "large input value '%s': possible precision loss" +msgstr "" + +#: src/numfmt.c:1293 +#, 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 "baliogabea mota" + +#: src/numfmt.c:1401 +#, fuzzy, c-format +msgid "invalid field value '%s'" +msgstr "baliogabea" + +#: src/numfmt.c:1430 +#, fuzzy, c-format +msgid "invalid header value '%s'" +msgstr " %s baliogabeko data" + +#: src/numfmt.c:1456 +#, 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 +#, fuzzy, c-format +msgid "no conversion option specified" +msgstr "-l edo -t aukera anitz espezifikatu dira" + +#: src/numfmt.c:1471 +#, fuzzy, c-format +msgid "grouping cannot be combined with --to" +msgstr "honekin edo" + +#: src/numfmt.c:1473 +#, c-format +msgid "grouping has no effect in this locale" +msgstr "" + +#: src/numfmt.c:1486 +#, c-format +msgid "--header ignored with command-line input" +msgstr "" + +#: src/numfmt.c:1511 +#, fuzzy, c-format +msgid "error reading input" +msgstr "errorea %s irakurtzen" + +#: src/numfmt.c:1520 +#, fuzzy, c-format +msgid "failed to convert some of the input numbers" +msgstr "stderr berbideratzeak huts egin du" + #: src/od.c:294 #, fuzzy, c-format msgid "" @@ -6244,28 +6603,41 @@ msgstr "" #: src/od.c:307 #, fuzzy -msgid "All arguments to long options are mandatory for short options.\n" -msgstr "Denak errepikatu arte e" +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" +"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" +"at first byte printed, incremented when dump is progressing.\n" +"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 "" +"segundo lehen da eta a edo maiatzak errepikatu arte eta errepikatu arte " +"bider e da gora - edo - e\n" +" a\n" +" ASCII edo e" -#: src/od.c:310 +#: src/od.c:318 #, fuzzy msgid "" -" -A, --address-radix=RADIX decide how file offsets are printed\n" +" -A, --address-radix=RADIX output format for file offsets. RADIX is one\n" +" of [doxn], for Decimal, Octal, Hex or None\n" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" "A\n" " lehen e" -#: src/od.c:314 +#: src/od.c:323 #, 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" -" --traditional accept arguments in traditional form\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 "" "I\n" " -\n" @@ -6274,10 +6646,11 @@ msgstr "" " zabalera\n" " in e" -#: src/od.c:324 +#: src/od.c:336 #, fuzzy 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" @@ -6290,7 +6663,7 @@ msgstr "" " ASCII edo\n" " e" -#: src/od.c:332 +#: src/od.c:345 #, fuzzy msgid "" " -f same as -t fF, select floats\n" @@ -6307,32 +6680,16 @@ msgstr "" "\n" " x e" -#: src/od.c:340 -#, fuzzy +#: src/od.c:353 msgid "" "\n" -"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" -"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" -"at first byte printed, incremented when dump is progressing.\n" -"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 "" -"segundo lehen da eta a edo maiatzak errepikatu arte eta errepikatu arte " -"bider e da gora - edo - e\n" -" a\n" -" ASCII edo e" - -#: src/od.c:349 -msgid "" "\n" "TYPE is made up of one or more of these specifications:\n" -"\n" " a named character, ignoring high-order bit\n" " c ASCII character or backslash escape\n" msgstr "" -#: src/od.c:356 +#: src/od.c:360 #, fuzzy msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" @@ -6347,11 +6704,11 @@ msgstr "" " TAMAINA TAMAINA\n" " x TAMAINA TAMAINA e" -#: src/od.c:363 +#: src/od.c:367 #, fuzzy msgid "" "\n" -"SIZE is a number. For TYPE in doux, SIZE may also be C for\n" +"SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" "sizeof(char), S for sizeof(short), I for sizeof(int) or L for\n" "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" @@ -6360,80 +6717,78 @@ msgstr "" "errepikatu arte edo errepikatu arte Baldintzak MOTA da TAMAINA maiatzak " "errepikatu arte bikoitza edo errepikatu arte bikoitza e" -#: src/od.c:370 -#, fuzzy +#: src/od.c:374 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" +"Adding a z suffix to any type displays printable characters at the end of\n" +"each output line.\n" msgstr "" -"da errepikatu arte errepikatu arte x errepikatu arte edo e errepikatu arte " -"bat ere ez da honekin edo da bider bider honekin eta bider honekin m a mota " -"a - - " -#: src/od.c:380 +#: src/od.c:379 #, 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 "a zabalera a lehenetsia A e" +"\n" +"\n" +"BYTES is hex with 0x or 0X prefix, and may have a multiplier suffix:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"and so on for G, T, P, E, Z, Y.\n" +msgstr "" +"eta maiatzak bider M MB M B eta aktibatuta errepikatu arte E Y maiatzak e e" -#: src/od.c:633 src/od.c:753 +#: src/od.c:639 src/od.c:759 #, fuzzy, c-format msgid "invalid type string %s" msgstr "baliogabea mota" -#: src/od.c:643 +#: src/od.c:649 #, 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:764 +#: src/od.c:770 #, 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:822 +#: src/od.c:828 #, fuzzy, c-format msgid "invalid character '%c' in type string %s" msgstr "baliogabea in mota" -#: src/od.c:1047 +#: src/od.c:1053 #, fuzzy, c-format msgid "cannot skip past end of combined input" msgstr "-" -#: src/od.c:1603 +#: src/od.c:1609 #, fuzzy, c-format msgid "invalid output address radix '%c'; it must be one character from [doxn]" msgstr "baliogabea" -#: src/od.c:1729 +#: src/od.c:1735 #, fuzzy, c-format msgid "no type may be specified when dumping strings" msgstr "ez mota maiatzak" -#: src/od.c:1804 +#: src/od.c:1810 #, fuzzy msgid "compatibility mode supports at most one file" msgstr "modua hirukoa" -#: src/od.c:1825 +#: src/od.c:1831 #, fuzzy, c-format msgid "skip-bytes + read-bytes is too large" msgstr "da" -#: src/od.c:1868 +#: src/od.c:1874 #, fuzzy, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "baliogabea zabalera horren ordez" @@ -6454,12 +6809,11 @@ 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" -"\n" msgstr "" "Idatzi lerroz behin - lerroz behin FITXATEGIA bider ez FITXATEGIA edo " "FITXATEGIA da e e" -#: src/paste.c:448 +#: src/paste.c:447 #, fuzzy msgid "" " -d, --delimiters=LIST reuse characters from LIST instead of TABs\n" @@ -6468,7 +6822,7 @@ msgstr "" "horren ordez -\n" " seriekoa itsatsi a horren ordez - in e" -#: src/paste.c:509 +#: src/paste.c:508 #, c-format msgid "delimiter list ends with an unescaped backslash: %s" msgstr "" @@ -6523,80 +6877,80 @@ msgid "Kaveh Ghazi" msgstr "Kaveh Ghazi" #. TRANSLATORS: Real name is unknown; at most 19 characters. -#: src/pinky.c:250 +#: src/pinky.c:242 msgid " ???" msgstr " ???" #. TRANSLATORS: Idle time is unknown; at most 5 characters. -#: src/pinky.c:274 +#: src/pinky.c:266 msgid "?????" msgstr "?????" -#: src/pinky.c:323 +#: src/pinky.c:314 #, c-format msgid "Login name: " msgstr "Saio izena:" -#: src/pinky.c:326 +#: src/pinky.c:317 #, c-format msgid "In real life: " msgstr "Egiazko bizitzan:" #. TRANSLATORS: Real name is unknown; no hard limit. -#: src/pinky.c:330 +#: src/pinky.c:321 msgid "???\n" msgstr "???\n" -#: src/pinky.c:350 +#: src/pinky.c:341 #, c-format msgid "Directory: " msgstr "Direktorioa:" -#: src/pinky.c:352 +#: src/pinky.c:343 #, c-format msgid "Shell: " msgstr "Shell-a:" -#: src/pinky.c:371 +#: src/pinky.c:362 #, c-format msgid "Project: " msgstr "Proiektua: " -#: src/pinky.c:395 +#: src/pinky.c:386 #, c-format msgid "Plan:\n" msgstr "Plana:\n" -#: src/pinky.c:414 +#: src/pinky.c:405 msgid "Login" msgstr "Saio-hasiera" -#: src/pinky.c:416 +#: src/pinky.c:407 msgid "Name" msgstr "Izena" -#: src/pinky.c:417 +#: src/pinky.c:408 msgid " TTY" msgstr " TTY" -#: src/pinky.c:419 +#: src/pinky.c:410 msgid "Idle" msgstr "alfer-denbora" -#: src/pinky.c:420 +#: src/pinky.c:411 msgid "When" msgstr "Noiz" -#: src/pinky.c:423 +#: src/pinky.c:414 msgid "Where" msgstr "Non" -#: src/pinky.c:502 +#: src/pinky.c:493 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Erabilera: %s [AUKERA]... [ERABILTZAILEA]...\n" -#: src/pinky.c:503 +#: src/pinky.c:494 #, fuzzy msgid "" "\n" @@ -6613,7 +6967,7 @@ msgstr "" " in\n" " uneko da lehenetsia e" -#: src/pinky.c:511 +#: src/pinky.c:502 #, fuzzy msgid "" " -f omit the line of column headings in short format\n" @@ -6628,7 +6982,7 @@ msgstr "" " urrunekoa eta\n" " in e" -#: src/pinky.c:520 +#: src/pinky.c:511 #, fuzzy, c-format msgid "" "\n" @@ -6636,7 +6990,7 @@ msgid "" "The utmp file will be %s.\n" msgstr "programa e" -#: src/pinky.c:604 +#: src/pinky.c:595 #, fuzzy, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "ez" @@ -6651,84 +7005,82 @@ msgstr "Pete TerMaat" msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:912 +#: src/pr.c:908 #, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "" -#: src/pr.c:914 +#: src/pr.c:910 #, fuzzy, c-format msgid "invalid page range %s" msgstr "baliogabea mota" -#: src/pr.c:979 +#: src/pr.c:975 #, fuzzy, c-format msgid "'-l PAGE_LENGTH' invalid number of lines: %s" msgstr "baliogabea - lerroz behin" -#: src/pr.c:1003 +#: src/pr.c:999 #, fuzzy, c-format msgid "'-N NUMBER' invalid starting line number: %s" msgstr "I KOPURUA baliogabea" -#: src/pr.c:1015 +#: src/pr.c:1011 #, fuzzy, c-format msgid "'-o MARGIN' invalid line offset: %s" msgstr "baliogabea" -#: src/pr.c:1056 +#: src/pr.c:1052 #, fuzzy, c-format msgid "'-w PAGE_WIDTH' invalid number of characters: %s" msgstr "baliogabea -" -#: src/pr.c:1070 +#: src/pr.c:1066 #, fuzzy, c-format msgid "'-W PAGE_WIDTH' invalid number of characters: %s" msgstr "M baliogabea -" -#: src/pr.c:1100 +#: src/pr.c:1096 #, fuzzy, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "- zutabetan in." -#: src/pr.c:1104 +#: src/pr.c:1100 #, fuzzy, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "eta in." -#: src/pr.c:1200 +#: src/pr.c:1196 #, fuzzy, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "edo baliogabea in" -#: src/pr.c:1304 +#: src/pr.c:1293 #, fuzzy, c-format msgid "page width too narrow" msgstr "zabalera" -#: src/pr.c:2369 +#: src/pr.c:2353 #, c-format msgid "starting page number %<PRIuMAX> exceeds page count %<PRIuMAX>" msgstr "" -#: src/pr.c:2396 +#: src/pr.c:2380 #, fuzzy, c-format msgid "page number overflow" msgstr "da" -#: src/pr.c:2401 +#: src/pr.c:2385 #, c-format msgid "Page %<PRIuMAX>" msgstr "" -#: src/pr.c:2773 +#: src/pr.c:2757 #, fuzzy -msgid "" -"Paginate or columnate FILE(s) for printing.\n" -"\n" +msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "edo FITXATEGIA errepikatu arte e e" -#: src/pr.c:2780 +#: src/pr.c:2763 #, fuzzy msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" @@ -6745,7 +7097,7 @@ msgstr "" " a da - lerroz behin in\n" " zutabetan aktibatuta e" -#: src/pr.c:2788 +#: src/pr.c:2771 #, fuzzy msgid "" " -a, --across print columns across rather than down, used together\n" @@ -6762,7 +7114,7 @@ msgstr "" " bikoitza\n" " bikoitza e" -#: src/pr.c:2796 +#: src/pr.c:2779 #, fuzzy msgid "" " -D, --date-format=FORMAT\n" @@ -6783,7 +7135,7 @@ msgstr "" " bider a goiburua honekin edo a goiburua\n" " eta e" -#: src/pr.c:2806 +#: src/pr.c:2789 #, fuzzy msgid "" " -h, --header=HEADER\n" @@ -6804,7 +7156,7 @@ msgstr "" " lerroz behin lerroz behin desaktibatuta M ez\n" " KATEA e" -#: src/pr.c:2815 +#: src/pr.c:2798 #, fuzzy msgid "" " -l, --length=PAGE_LENGTH\n" @@ -6819,7 +7171,7 @@ msgstr "" " m in in\n" " lerroz behin lerroz behin - honekin e" -#: src/pr.c:2822 +#: src/pr.c:2805 #, fuzzy msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" @@ -6836,7 +7188,7 @@ msgstr "" " hasi honekin KOPURUA 1. - lehen\n" " e" -#: src/pr.c:2830 +#: src/pr.c:2813 #, fuzzy msgid "" " -o, --indent=MARGIN\n" @@ -6851,7 +7203,7 @@ msgstr "" " ez\n" " a e" -#: src/pr.c:2837 +#: src/pr.c:2820 #, fuzzy msgid "" " -s[CHAR], --separator[=CHAR]\n" @@ -6867,7 +7219,7 @@ msgstr "" " desaktibatuta -\n" " a m da e" -#: src/pr.c:2844 +#: src/pr.c:2827 #, fuzzy msgid "" " -S[STRING], --sep-string[=STRING]\n" @@ -6882,7 +7234,7 @@ msgstr "" " S ez aktibatuta\n" " goiburua eta e" -#: src/pr.c:2851 +#: src/pr.c:2834 #, fuzzy msgid "" " -T, --omit-pagination\n" @@ -6905,7 +7257,7 @@ msgstr "" " zabalera errepikatu arte\n" " testua desaktibatuta e" -#: src/pr.c:2861 +#: src/pr.c:2844 #, fuzzy msgid "" " -W, --page-width=PAGE_WIDTH\n" @@ -6919,7 +7271,7 @@ msgstr "" " lerroz behin da ez\n" " honekin S edo e" -#: src/pr.c:2869 +#: src/pr.c:2852 #, fuzzy msgid "" "\n" @@ -7071,10 +7423,9 @@ msgstr "" msgid "" "Output a permuted index, including context, of the words in the input " "files.\n" -"\n" msgstr "Irteera a - in e e" -#: src/ptx.c:1828 +#: src/ptx.c:1827 #, fuzzy msgid "" " -A, --auto-reference output automatically generated references\n" @@ -7086,7 +7437,7 @@ msgstr "" " B Sistema B\n" " KATEA erabili KATEA errepikatu arte e" -#: src/ptx.c:1833 +#: src/ptx.c:1832 #, fuzzy msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" @@ -7101,7 +7452,7 @@ msgstr "" " S errepikatu arte - lerroz behin edo -\n" " e" -#: src/ptx.c:1840 +#: src/ptx.c:1839 #, fuzzy msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" @@ -7118,7 +7469,7 @@ msgstr "" " ez ikusi egin FITXATEGIA ez ikusi egin zerrenda FITXATEGIA\n" " FITXATEGIA zerrenda uneko FITXATEGIA e" -#: src/ptx.c:1848 +#: src/ptx.c:1847 #, fuzzy msgid "" " -r, --references first field of each line is a reference\n" @@ -7130,14 +7481,14 @@ msgstr "" " modua\n" " zabalera KOPURUA zabalera in zutabetan e" -#: src/ptx.c:1855 +#: src/ptx.c:1854 #, 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" -#: src/ptx.c:1949 +#: src/ptx.c:1948 #, fuzzy, c-format msgid "invalid gap width: %s" msgstr "baliogabea zabalera" @@ -7160,7 +7511,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "huts egin da %s-(r)i `chdir' egiten" -#: src/pwd.c:170 src/pwd.c:277 +#: src/pwd.c:170 src/pwd.c:277 src/split.c:373 #, c-format msgid "failed to stat %s" msgstr "huts egin da %s-(r) `stat' egiten" @@ -7176,14 +7527,15 @@ msgid "ignoring non-option arguments" msgstr "aukera ez diren argumentuak baztertzen" #. This is a proper name. See the gettext manual, section Names. -#: src/readlink.c:33 +#: src/readlink.c:32 msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 +#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147 +#: src/stat.c:1349 src/touch.c:212 #, c-format -msgid "Usage: %s [OPTION]... FILE\n" -msgstr "Erabilera: %s [AUKERA]... FITXATEGIA\n" +msgid "Usage: %s [OPTION]... FILE...\n" +msgstr "Erabilera: %s [AUKERA]... FITXATEGIA...\n" #: src/readlink.c:63 #, fuzzy @@ -7212,10 +7564,12 @@ msgid "" "recursively,\n" " without requirements on components " "existence\n" -" -n, --no-newline do not output the trailing newline\n" +" -n, --no-newline do not output the trailing delimiter\n" " -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" msgstr "" "bider in\n" " osagaia - bide-izena\n" @@ -7224,11 +7578,10 @@ msgstr "" "\n" " e" -#: src/realpath.c:71 src/rm.c:134 src/shred.c:147 src/stat.c:1330 -#: src/touch.c:215 -#, c-format -msgid "Usage: %s [OPTION]... FILE...\n" -msgstr "Erabilera: %s [AUKERA]... FITXATEGIA...\n" +#: src/readlink.c:152 +#, fuzzy, c-format +msgid "ignoring --no-newline with multiple arguments" +msgstr "aukera ez diren argumentuak baztertzen" #: src/realpath.c:72 msgid "" @@ -7255,12 +7608,12 @@ msgstr "" msgid "generating relative path" msgstr "" -#: src/remove.c:286 +#: src/remove.c:273 #, c-format msgid "%s: descend into write-protected directory %s? " msgstr "" -#: src/remove.c:287 +#: src/remove.c:274 #, c-format msgid "%s: descend into directory %s? " msgstr "" @@ -7269,49 +7622,49 @@ msgstr "" #. translate "%s: remove %s (write-protected) %s? " #. instead. It should avoid grammatical problems #. with the output of file_type. -#: src/remove.c:303 +#: src/remove.c:290 #, c-format msgid "%s: remove write-protected %s %s? " msgstr "" -#: src/remove.c:304 +#: src/remove.c:291 #, c-format msgid "%s: remove %s %s? " msgstr "%s: %s %s ezabatu?" -#: src/remove.c:417 +#: src/remove.c:374 #, fuzzy, c-format msgid "removed directory: %s\n" msgstr "e" -#: src/remove.c:481 +#: src/remove.c:444 #, fuzzy, c-format msgid "cannot remove directory: %s" msgstr "ezin da %s direktorioa sortu" -#: src/remove.c:537 +#: src/remove.c:500 #, c-format msgid "skipping %s, since it's on a different device" msgstr "" -#: src/remove.c:557 +#: src/remove.c:520 #, fuzzy, c-format msgid "traversal failed: %s" msgstr "irakurtzeak huts egin du" -#: src/remove.c:563 +#: src/remove.c:526 #, c-format msgid "" "unexpected failure: fts_info=%d: %s\n" "please report to %s" msgstr "" -#: src/rm.c:118 +#: src/rm.c:119 #, c-format msgid "Try '%s ./%s' to remove the file %s.\n" msgstr "" -#: src/rm.c:135 +#: src/rm.c:136 msgid "" "Remove (unlink) the FILE(s).\n" "\n" @@ -7320,7 +7673,7 @@ msgid "" " -i prompt before every removal\n" msgstr "" -#: src/rm.c:141 +#: src/rm.c:142 msgid "" " -I prompt once before removing more than three files, " "or\n" @@ -7332,19 +7685,20 @@ msgid "" " always (-i). Without WHEN, prompt always\n" msgstr "" -#: src/rm.c:148 +#: src/rm.c:149 msgid "" " --one-file-system when removing a hierarchy recursively, skip any\n" " directory that is on a file system different from\n" " that of the corresponding command line argument\n" msgstr "" -#: src/rm.c:153 +#: src/rm.c:154 #, fuzzy msgid "" " --no-preserve-root do not treat '/' specially\n" " --preserve-root do not remove '/' (default)\n" " -r, -R, --recursive remove directories and their contents recursively\n" +" -d, --dir remove empty directories\n" " -v, --verbose explain what is being done\n" msgstr "" "ez lehenetsia\n" @@ -7352,7 +7706,7 @@ msgstr "" " G -\n" " da eginda e" -#: src/rm.c:161 +#: src/rm.c:163 msgid "" "\n" "By default, rm does not remove directories. Use the --recursive (-r or -R)\n" @@ -7360,7 +7714,7 @@ msgid "" "contents.\n" msgstr "" -#: src/rm.c:166 +#: src/rm.c:168 #, fuzzy, c-format msgid "" "\n" @@ -7374,7 +7728,7 @@ msgstr "" " foo e\n" " foo e" -#: src/rm.c:175 +#: src/rm.c:177 #, fuzzy msgid "" "\n" @@ -7383,12 +7737,12 @@ msgid "" "assurance that the contents are truly unrecoverable, consider using shred.\n" msgstr "erabili a da - Baldintzak e" -#: src/rm.c:335 +#: src/rm.c:342 #, c-format msgid "%s: remove all arguments recursively? " msgstr "%s: ezabatu argumentu guztiak errekurtsiboki?" -#: src/rm.c:336 +#: src/rm.c:343 #, c-format msgid "%s: remove all arguments? " msgstr "%s: ezabatu argumentu guztiak?" @@ -7446,7 +7800,10 @@ msgstr "" msgid "" "Run a program in a different security context.\n" "With neither CONTEXT nor COMMAND, print the current security context.\n" -"\n" +msgstr "" + +#: src/runcon.c:94 +msgid "" " CONTEXT Complete security context\n" " -c, --compute compute process transition context before modifying\n" " -t, --type=TYPE type (for same role as parent)\n" @@ -7456,72 +7813,72 @@ msgid "" "\n" msgstr "" -#: src/runcon.c:140 +#: src/runcon.c:144 #, c-format msgid "multiple roles" msgstr "rol anitz" -#: src/runcon.c:145 +#: src/runcon.c:149 #, c-format msgid "multiple types" msgstr "mota anitz" -#: src/runcon.c:150 +#: src/runcon.c:154 #, c-format msgid "multiple users" msgstr "erabiltzaile anitz" -#: src/runcon.c:155 +#: src/runcon.c:159 #, c-format msgid "multiple levelranges" msgstr "maila anitz" -#: src/runcon.c:173 src/runcon.c:209 +#: src/runcon.c:177 src/runcon.c:213 #, fuzzy, c-format msgid "failed to get current context" msgstr "-" -#: src/runcon.c:183 +#: src/runcon.c:187 #, c-format msgid "you must specify -c, -t, -u, -l, -r, or context" msgstr "-c, -t, -u, -l, -r edo kontestua adierazi behar duzu" -#: src/runcon.c:191 +#: src/runcon.c:195 #, fuzzy, c-format msgid "no command specified" msgstr "ez IDa" -#: src/runcon.c:197 +#: src/runcon.c:201 #, c-format msgid "%s may be used only on a SELinux kernel" msgstr "" -#: src/runcon.c:223 +#: src/runcon.c:227 #, fuzzy, c-format msgid "failed to compute a new context" msgstr "huts egin da %s irekitzen" -#: src/runcon.c:237 +#: src/runcon.c:241 #, fuzzy, c-format msgid "failed to set new user %s" msgstr "huts egin da %s irekitzen" -#: src/runcon.c:239 +#: src/runcon.c:243 #, fuzzy, c-format msgid "failed to set new type %s" msgstr "huts egin da %s irekitzen" -#: src/runcon.c:241 +#: src/runcon.c:245 #, fuzzy, c-format msgid "failed to set new range %s" msgstr "huts egin da %s irekitzen" -#: src/runcon.c:243 +#: src/runcon.c:247 #, fuzzy, c-format msgid "failed to set new role %s" msgstr "huts egin da %s irekitzen" -#: src/runcon.c:251 +#: src/runcon.c:255 #, c-format msgid "unable to set security context %s" msgstr "" @@ -7538,10 +7895,12 @@ msgstr "" " edo e" #: src/seq.c:73 +msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" +msgstr "" + +#: src/seq.c:79 #, fuzzy msgid "" -"Print numbers from FIRST to LAST, in steps of INCREMENT.\n" -"\n" " -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" @@ -7551,7 +7910,7 @@ msgstr "" " bereizlea KATEA erabili KATEA lehenetsia e\n" " zabalera zabalera bider honekin e" -#: src/seq.c:82 +#: src/seq.c:86 #, fuzzy msgid "" "\n" @@ -7562,39 +7921,24 @@ msgid "" "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:90 +#: src/seq.c:94 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:136 +#: src/seq.c:140 #, fuzzy, c-format msgid "invalid floating point argument: %s" msgstr "baliogabea puntu" -#: src/seq.c:193 -#, c-format -msgid "format %s has no %% directive" -msgstr "" - -#: src/seq.c:210 -#, c-format -msgid "format %s ends in %%" -msgstr "" - -#: src/seq.c:213 +#: src/seq.c:232 #, fuzzy, c-format msgid "format %s has unknown %%%c directive" msgstr "ezezaguna mota" -#: src/seq.c:217 -#, c-format -msgid "format %s has too many %% directives" -msgstr "" - -#: src/seq.c:431 +#: src/seq.c:555 #, fuzzy, c-format msgid "format string may not be specified when printing equal width strings" msgstr "maiatzak zabalera" @@ -7629,27 +7973,27 @@ msgid "" " (if specified) supplemental group IDs to GID1, ...\n" msgstr "" -#: src/setuidgid.c:163 +#: src/setuidgid.c:162 #, c-format msgid "unknown user-ID: %s" msgstr "erabiltzile-ID ezezaguna: %s" -#: src/setuidgid.c:174 +#: src/setuidgid.c:173 #, c-format msgid "to use user-ID %s you need to use -g too" msgstr "" -#: src/setuidgid.c:191 +#: src/setuidgid.c:190 #, fuzzy, c-format msgid "failed to set supplemental group(s)" msgstr "taldea" -#: src/setuidgid.c:201 +#: src/setuidgid.c:200 #, fuzzy, c-format msgid "cannot set group-ID to %lu" msgstr "taldea IDa" -#: src/setuidgid.c:205 +#: src/setuidgid.c:204 #, fuzzy, c-format msgid "cannot set user-ID to %lu" msgstr "IDa" @@ -7664,10 +8008,9 @@ msgstr "Colin Plumb" 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" -"\n" msgstr "Gainidatzi FITXATEGIA in e e" -#: src/shred.c:156 +#: src/shred.c:155 #, fuzzy, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -7679,7 +8022,7 @@ msgstr "" " e I Gainidatzi I horren ordez - lehenetsia\n" " tamaina I uneko M B e" -#: src/shred.c:162 +#: src/shred.c:161 #, fuzzy msgid "" " -u, --remove truncate and remove file after overwriting\n" @@ -7695,7 +8038,7 @@ msgstr "" " a honekin\n" " e" -#: src/shred.c:171 +#: src/shred.c:170 #, fuzzy msgid "" "\n" @@ -7709,7 +8052,7 @@ msgid "" msgstr "" "FITXATEGIA da lehenetsia da da aktibatuta gailua Noiz aktibatuta erabili e e" -#: src/shred.c:181 +#: src/shred.c:180 #, fuzzy msgid "" "CAUTION: Note that shred relies on a very important assumption:\n" @@ -7721,7 +8064,7 @@ msgid "" "\n" msgstr "Oharra aktibatuta a garrantzitsua in da uneko - aktibatuta da e e" -#: src/shred.c:189 +#: src/shred.c:188 #, fuzzy msgid "" "* log-structured or journaled file systems, such as those supplied with\n" @@ -7737,7 +8080,7 @@ msgstr "" " eta Solaris eta e e eta aktibatuta\n" " e e Sarea zerbitzaria e e" -#: src/shred.c:199 +#: src/shred.c:198 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -7746,7 +8089,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:206 +#: src/shred.c:205 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" @@ -7758,7 +8101,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:216 +#: src/shred.c:215 #, fuzzy msgid "" "In addition, file system backups and remote mirrors may contain copies\n" @@ -7768,122 +8111,122 @@ msgstr "" "in\n" " e e e eta urrunekoa maiatzak eta a e" -#: src/shred.c:296 +#: src/shred.c:295 #, c-format msgid "%s: fdatasync failed" msgstr "" -#: src/shred.c:307 +#: src/shred.c:306 #, c-format msgid "%s: fsync failed" msgstr "" -#: src/shred.c:384 +#: src/shred.c:383 #, c-format msgid "%s: cannot rewind" msgstr "" -#: src/shred.c:403 +#: src/shred.c:402 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "" -#: src/shred.c:453 +#: src/shred.c:452 #, c-format msgid "%s: error writing at offset %s" msgstr "" -#: src/shred.c:471 +#: src/shred.c:470 #, c-format msgid "%s: lseek failed" msgstr "%s: lseek-ek huts egin du" -#: src/shred.c:482 +#: src/shred.c:481 #, c-format msgid "%s: file too large" msgstr "%s: fitxategi luzeegia" -#: src/shred.c:505 +#: src/shred.c:504 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "" -#: src/shred.c:521 +#: src/shred.c:520 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "" -#: src/shred.c:768 +#: src/shred.c:767 #, c-format msgid "%s: fstat failed" msgstr "%s: fstat-ek huts egin du" -#: src/shred.c:779 +#: src/shred.c:778 #, c-format msgid "%s: invalid file type" msgstr "%s: fitxategi moeta baliogabea" -#: src/shred.c:798 +#: src/shred.c:797 #, c-format msgid "%s: file has negative size" msgstr "%s: fitxategiak luzeera negatiboa dauka" -#: src/shred.c:865 +#: src/shred.c:864 src/sort.c:932 src/split.c:378 #, c-format msgid "%s: error truncating" msgstr "" -#: src/shred.c:881 +#: src/shred.c:880 #, c-format msgid "%s: fcntl failed" msgstr "%s: fnctl-ek huts egin du" -#: src/shred.c:886 +#: src/shred.c:885 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "" -#: src/shred.c:968 +#: src/shred.c:967 #, c-format msgid "%s: removing" msgstr "%s: kentzen" -#: src/shred.c:992 +#: src/shred.c:991 #, c-format msgid "%s: renamed to %s" msgstr "%s: %s-(e)ra izena aldatu da" -#: src/shred.c:1014 +#: src/shred.c:1013 #, c-format msgid "%s: failed to remove" msgstr "%s: huts egin da ezabatzen" -#: src/shred.c:1018 +#: src/shred.c:1017 #, c-format msgid "%s: removed" msgstr "%s: kenduta" -#: src/shred.c:1025 src/shred.c:1068 +#: src/shred.c:1024 src/shred.c:1067 #, c-format msgid "%s: failed to close" msgstr "%s: huts egin da itxitzean" -#: src/shred.c:1061 +#: src/shred.c:1060 #, c-format msgid "%s: failed to open for writing" msgstr "%s: huts egin da idazteko irekitzean" -#: src/shred.c:1126 +#: src/shred.c:1125 #, c-format msgid "%s: invalid number of passes" msgstr "%s: baliogabeko pausu kopurua" -#: src/shred.c:1135 src/shuf.c:291 src/sort.c:4387 +#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441 #, fuzzy, c-format msgid "multiple random sources specified" msgstr "irteera fitxategi anitz espezifikatu dira" -#: src/shred.c:1149 +#: src/shred.c:1148 #, c-format msgid "%s: invalid file size" msgstr "%s; fitxategi tamaina baliogabea" @@ -7901,12 +8244,10 @@ msgstr "" #: src/shuf.c:54 #, fuzzy -msgid "" -"Write a random permutation of the input lines to standard output.\n" -"\n" +msgid "Write a random permutation of the input lines to standard output.\n" msgstr "Inprimatu - lerroz behin FITXATEGIA e e" -#: src/shuf.c:61 +#: src/shuf.c:60 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 " @@ -7917,27 +8258,27 @@ msgid "" " -z, --zero-terminated end lines with 0 byte, not newline\n" msgstr "" -#: src/shuf.c:245 +#: src/shuf.c:244 #, fuzzy, c-format msgid "multiple -i options specified" msgstr "-l edo -t aukera anitz espezifikatu dira" -#: src/shuf.c:265 +#: src/shuf.c:264 #, fuzzy, c-format msgid "invalid input range %s" msgstr "baliogabea" -#: src/shuf.c:278 +#: src/shuf.c:277 #, fuzzy, c-format msgid "invalid line count %s" msgstr "baliogabea zabalera" -#: src/shuf.c:285 src/sort.c:4381 +#: src/shuf.c:284 src/sort.c:4435 #, c-format msgid "multiple output files specified" msgstr "irteera fitxategi anitz espezifikatu dira" -#: src/shuf.c:311 +#: src/shuf.c:310 #, fuzzy, c-format msgid "cannot combine -e and -i options" msgstr "honekin edo" @@ -7960,7 +8301,7 @@ 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:295 +#: src/sleep.c:135 src/timeout.c:320 #, fuzzy, c-format msgid "invalid time interval %s" msgstr "baliogabea" @@ -7970,14 +8311,12 @@ msgstr "baliogabea" msgid "cannot read realtime clock" msgstr "" -#: src/sort.c:395 +#: src/sort.c:399 #, fuzzy -msgid "" -"Write sorted concatenation of all FILE(s) to standard output.\n" -"\n" +msgid "Write sorted concatenation of all FILE(s) to standard output.\n" msgstr "Idatzi - FITXATEGIA e e e" -#: src/sort.c:402 +#: src/sort.c:405 msgid "" "Ordering options:\n" "\n" @@ -7985,7 +8324,7 @@ msgstr "" "Aukerak ordenatzen:\n" "\n" -#: src/sort.c:406 +#: src/sort.c:409 #, fuzzy msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" @@ -7997,7 +8336,7 @@ msgstr "" " eta\n" " ez ikusi egin e" -#: src/sort.c:412 +#: src/sort.c:415 #, fuzzy msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" @@ -8010,12 +8349,12 @@ msgstr "" " e balioa\n" " - e e" -#: src/sort.c:417 +#: src/sort.c:420 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" -#: src/sort.c:420 +#: src/sort.c:423 #, fuzzy msgid "" " -n, --numeric-sort compare according to string numerical value\n" @@ -8029,7 +8368,7 @@ msgstr "" " e balioa\n" " - e e" -#: src/sort.c:426 +#: src/sort.c:429 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -8039,7 +8378,7 @@ msgid "" "\n" msgstr "" -#: src/sort.c:434 +#: src/sort.c:437 msgid "" "Other options:\n" "\n" @@ -8047,13 +8386,13 @@ msgstr "" "Beste aukerak:\n" "\n" -#: src/sort.c:438 +#: src/sort.c:441 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" msgstr "" -#: src/sort.c:442 +#: src/sort.c:445 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 " @@ -8062,7 +8401,7 @@ msgid "" " decompress them with PROG -d\n" msgstr "" -#: src/sort.c:449 +#: src/sort.c:452 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -8071,13 +8410,13 @@ msgid "" " If F is - then read names from standard input\n" msgstr "" -#: src/sort.c:456 +#: src/sort.c:459 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:460 +#: src/sort.c:463 #, fuzzy msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" @@ -8093,7 +8432,7 @@ msgstr "" " bider azken\n" " S tamaina TAMAINA erabili TAMAINA errepikatu arte e" -#: src/sort.c:466 +#: src/sort.c:469 #, fuzzy, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -8113,12 +8452,12 @@ msgstr "" " esklusiboa honekin errepikatu arte\n" " lehen - e" -#: src/sort.c:475 +#: 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:480 +#: src/sort.c:483 #, fuzzy msgid "" "\n" @@ -8140,7 +8479,7 @@ msgstr "" "da C da eta C da edo errepikatu arte Baldintzak ez da erabili e maiatzak " "bider e" -#: src/sort.c:493 +#: src/sort.c:496 #, fuzzy msgid "" "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n" @@ -8155,268 +8494,272 @@ 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:694 +#: src/sort.c:697 #, fuzzy, c-format msgid "waiting for %s [-d]" msgstr "%s-ra idazten" -#: src/sort.c:699 +#: src/sort.c:702 #, c-format msgid "%s [-d] terminated abnormally" msgstr "" -#: src/sort.c:853 +#: src/sort.c:856 #, fuzzy, c-format msgid "cannot create temporary file in %s" msgstr "ezin da %s esteka sortu" -#: src/sort.c:939 src/sort.c:2010 src/sort.c:3056 src/sort.c:3755 -#: src/sort.c:3758 +#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713 +#: src/sort.c:3804 src/sort.c:3807 msgid "open failed" msgstr "irekitzeak huts egin du" -#: src/sort.c:959 +#: src/sort.c:970 #, fuzzy msgid "fflush failed" msgstr "itxierak huts egin du" -#: src/sort.c:964 src/sort.c:2013 src/sort.c:4646 +#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706 msgid "close failed" msgstr "itxierak huts egin du" -#: src/sort.c:973 +#: src/sort.c:986 #, fuzzy, c-format msgid "dup2 failed" msgstr "irekitzeak huts egin du" -#: src/sort.c:1090 +#: src/sort.c:1103 #, c-format msgid "couldn't execute %s" msgstr "ezin izan da %s exekutatu" -#: src/sort.c:1097 +#: src/sort.c:1110 #, fuzzy msgid "couldn't create temporary file" msgstr "ezin izan da abio ordua lortu" -#: src/sort.c:1136 +#: src/sort.c:1149 #, fuzzy, c-format msgid "couldn't create process for %s -d" msgstr "ezin da %s direktorioa sortu" -#: src/sort.c:1150 +#: src/sort.c:1161 #, c-format msgid "couldn't execute %s -d" msgstr "ezin izan da %s -d exekutatu" -#: src/sort.c:1209 +#: src/sort.c:1220 #, fuzzy, c-format msgid "warning: cannot remove: %s" msgstr "ezin da %s kendu" -#: src/sort.c:1295 +#: src/sort.c:1306 #, fuzzy, c-format msgid "invalid --%s argument %s" msgstr "baliogabeko argumentua: %s" -#: src/sort.c:1298 +#: src/sort.c:1309 #, fuzzy, c-format msgid "minimum --%s argument is %s" msgstr "%s argumentu anbiguoa da %s-(r)entzat" -#: src/sort.c:1313 +#: src/sort.c:1324 #, fuzzy, c-format msgid "--%s argument %s too large" msgstr "%s luzeegia da" -#: src/sort.c:1316 +#: src/sort.c:1327 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "uneko rlimit-arekin gehienezko --%s argumentu kopurua %s da " -#: src/sort.c:1398 +#: src/sort.c:1409 #, c-format msgid "number in parallel must be nonzero" msgstr "" -#: src/sort.c:1479 +#: src/sort.c:1494 msgid "stat failed" msgstr "`stat'-ek huts egin du" -#: src/sort.c:1740 +#: src/sort.c:1755 msgid "read failed" msgstr "irakurtzeak huts egin du" -#: src/sort.c:2028 +#: src/sort.c:2043 #, fuzzy, c-format msgid "string transformation failed" msgstr "kate konparaketak huts egin du" -#: src/sort.c:2031 +#: src/sort.c:2046 #, c-format msgid "the untransformed string was %s" msgstr "" -#: src/sort.c:2194 +#: src/sort.c:2209 #, c-format msgid "^ no match for key\n" msgstr "" -#: src/sort.c:2374 +#: src/sort.c:2389 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "" -#: src/sort.c:2380 +#: src/sort.c:2395 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "" -#: src/sort.c:2391 +#: src/sort.c:2406 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" -#: src/sort.c:2404 +#: src/sort.c:2419 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "" -#: src/sort.c:2436 +#: src/sort.c:2451 #, 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" -#: src/sort.c:2442 +#: src/sort.c:2457 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "" -#: src/sort.c:2716 src/sort.c:2725 +#: src/sort.c:2731 src/sort.c:2740 msgid "write failed" msgstr "idazketak huts egin du" -#: src/sort.c:2768 +#: src/sort.c:2783 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: desordena: " -#: src/sort.c:2771 +#: src/sort.c:2786 msgid "standard error" msgstr "errore estandarra" -#: src/sort.c:3926 +#: src/sort.c:3698 +#, fuzzy +msgid "cannot read" +msgstr "ezin da data ezarri" + +#: src/sort.c:3976 #, fuzzy, c-format msgid "%s: invalid field specification %s" msgstr "baliogabea" -#: src/sort.c:3937 +#: src/sort.c:3987 #, fuzzy, c-format msgid "options '-%s' are incompatible" msgstr "`-%s' aukerak ez dira bateragarriak" -#: src/sort.c:3988 +#: src/sort.c:4038 #, fuzzy, c-format msgid "%s: invalid count at start of %s" msgstr "baliogabea hasi -" -#: src/sort.c:4245 +#: src/sort.c:4295 #, fuzzy msgid "invalid number after '-'" msgstr "baliogabeko zenbakia `-'-ren ondoren" -#: src/sort.c:4248 src/sort.c:4334 src/sort.c:4362 +#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416 #, fuzzy msgid "invalid number after '.'" msgstr "baliogabeko zenbakia `.'-ren ondoren" -#: src/sort.c:4261 src/sort.c:4367 +#: src/sort.c:4315 src/sort.c:4421 #, fuzzy msgid "stray character in field spec" msgstr "in" -#: src/sort.c:4308 +#: src/sort.c:4362 #, fuzzy, c-format msgid "multiple compress programs specified" msgstr "-l edo -t aukera anitz espezifikatu dira" -#: src/sort.c:4325 +#: src/sort.c:4379 #, fuzzy msgid "invalid number at field start" msgstr "baliogabea hasi" -#: src/sort.c:4329 src/sort.c:4357 +#: src/sort.c:4383 src/sort.c:4411 #, fuzzy msgid "field number is zero" msgstr "da" -#: src/sort.c:4338 +#: src/sort.c:4392 msgid "character offset is zero" msgstr "offset karakterea zero da" -#: src/sort.c:4353 +#: src/sort.c:4407 #, fuzzy msgid "invalid number after ','" msgstr "`,' ondoren zenbaki baliogabea" -#: src/sort.c:4403 +#: src/sort.c:4457 #, c-format msgid "empty tab" msgstr "tabulazioa hutsa" -#: src/sort.c:4496 src/wc.c:692 +#: src/sort.c:4550 src/wc.c:692 #, fuzzy, c-format msgid "cannot read file names from %s" msgstr "eta" -#: src/sort.c:4518 +#: src/sort.c:4572 #, fuzzy, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s: fitxategi moeta baliogabea" -#: src/sort.c:4524 +#: src/sort.c:4578 #, c-format msgid "no input from %s" msgstr "ez dago sarrearik %s-(e)tik" -#: src/sort.c:4570 +#: src/sort.c:4624 #, c-format msgid "using %s sorting rules" msgstr "" -#: src/sort.c:4573 +#: src/sort.c:4627 #, c-format msgid "using simple byte comparison" msgstr "" -#: src/sort.c:4604 +#: src/sort.c:4658 #, fuzzy, c-format msgid "extra operand %s not allowed with -%c" msgstr "-c-rekin baimendu gabeko `%s' eragigai extra" -#: src/split.c:184 +#: src/split.c:187 #, c-format msgid "the suffix length needs to be at least %zu" msgstr "" -#: src/split.c:201 +#: src/split.c:204 #, c-format msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" msgstr "Erabilera: %s [AUKERA]... [SARRERA [AURRIZKIA]]\n" -#: src/split.c:205 +#: src/split.c:208 #, fuzzy 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" -"\n" msgstr "Irteera finkoa tamaina - lehenetsia da x ez edo da e e" -#: src/split.c:214 +#: src/split.c:216 #, fuzzy, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" @@ -8440,7 +8783,7 @@ msgstr "" " erabili horren ordez -\n" " lerroz behin KOPURUA KOPURUA lerroz behin e" -#: src/split.c:227 +#: src/split.c:229 #, fuzzy msgid "" " --verbose print a diagnostic just before each\n" @@ -8449,7 +8792,7 @@ msgstr "" "a\n" " lehenago da e" -#: src/split.c:234 +#: src/split.c:236 msgid "" "\n" "CHUNKS may be:\n" @@ -8461,184 +8804,189 @@ msgid "" "r/K/N likewise but only output Kth of N to stdout\n" msgstr "" -#: src/split.c:352 +#: src/split.c:354 #, fuzzy, c-format msgid "output file suffixes exhausted" msgstr "Irteera" -#: src/split.c:364 +#: src/split.c:366 #, fuzzy, c-format msgid "creating file %s\n" msgstr "`%s' fitxategia sortzen\n" -#: src/split.c:377 +#: src/split.c:375 +#, c-format +msgid "%s would overwrite input; aborting" +msgstr "" + +#: src/split.c:391 #, fuzzy, c-format msgid "failed to set FILE environment variable" msgstr "huts egin da %s irekitzen" -#: src/split.c:379 +#: src/split.c:393 #, c-format msgid "executing with FILE=%s\n" msgstr "" -#: src/split.c:381 +#: src/split.c:395 #, fuzzy, c-format msgid "failed to create pipe" -msgstr "lotura" +msgstr "huts egin da %s irekitzen" -#: src/split.c:395 +#: src/split.c:409 #, fuzzy, c-format msgid "closing prior pipe" msgstr "%s direktorioa itxitzen" -#: src/split.c:397 +#: src/split.c:411 #, fuzzy, c-format msgid "closing output pipe" msgstr "%s irteera fitxategia itxitzen" -#: src/split.c:401 +#: src/split.c:415 #, fuzzy, c-format msgid "moving input pipe" msgstr "%s sarrera fitxategia itxitzen" -#: src/split.c:403 +#: src/split.c:417 #, fuzzy, c-format msgid "closing input pipe" msgstr "%s sarrera fitxategia itxitzen" -#: src/split.c:408 +#: src/split.c:422 #, fuzzy, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "huts egin da %s komandoa exekutatzen" -#: src/split.c:414 +#: src/split.c:428 #, fuzzy, c-format msgid "failed to close input pipe" -msgstr "%s: huts egin da itxitzean" +msgstr "huts egin da %s klonatzen" -#: src/split.c:450 +#: src/split.c:464 #, fuzzy, c-format msgid "waiting for child process" msgstr "%s-ra idazten" -#: src/split.c:460 +#: src/split.c:474 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "" -#: src/split.c:468 +#: src/split.c:482 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:475 src/timeout.c:449 +#: src/split.c:489 src/timeout.c:494 #, c-format msgid "unknown status from command (0x%X)" msgstr "" -#: src/split.c:1037 +#: src/split.c:1052 #, fuzzy, c-format msgid "cannot split in more than one way" msgstr "in" -#: src/split.c:1050 src/split.c:1192 src/split.c:1363 +#: src/split.c:1065 src/split.c:1205 src/split.c:1376 #, fuzzy, c-format msgid "%s: invalid number of chunks" msgstr "baliogabea - segundo" -#: src/split.c:1054 +#: src/split.c:1069 #, fuzzy, c-format msgid "%s: invalid chunk number" msgstr "%s: baliogabeko zenbakia" -#: src/split.c:1106 +#: src/split.c:1119 #, fuzzy, c-format msgid "%s: invalid suffix length" msgstr "baliogabea" -#: src/split.c:1131 src/split.c:1139 src/split.c:1162 src/split.c:1167 +#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180 #, fuzzy, c-format msgid "%s: invalid number of bytes" msgstr "baliogabea -" -#: src/split.c:1150 src/split.c:1297 +#: src/split.c:1163 src/split.c:1310 #, fuzzy, c-format msgid "%s: invalid number of lines" msgstr "baliogabea - lerroz behin" -#: src/split.c:1223 +#: src/split.c:1236 #, fuzzy, c-format msgid "line count option -%s%c... is too large" msgstr "da" -#: src/split.c:1235 +#: src/split.c:1248 #, fuzzy, c-format msgid "%s: invalid start value for numerical suffix" msgstr "baliogabea" -#: src/split.c:1263 +#: src/split.c:1276 #, fuzzy, c-format msgid "%s: invalid IO block size" msgstr "%s; fitxategi tamaina baliogabea" -#: src/split.c:1284 +#: src/split.c:1297 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1321 +#: src/split.c:1334 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1356 +#: src/split.c:1369 #, 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:169 +#: src/stat.c:173 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:838 +#: src/stat.c:857 #, fuzzy, c-format msgid "failed to canonicalize %s" msgstr "huts egin da %s klonatzen" -#: src/stat.c:1050 +#: src/stat.c:1069 #, fuzzy, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "%s: '%c%s' aukera ezezaguna\n" -#: src/stat.c:1105 +#: src/stat.c:1124 #, fuzzy, c-format msgid "%s: invalid directive" msgstr "%%%c. direktiba baliogabea" -#: src/stat.c:1151 +#: src/stat.c:1170 #, fuzzy, c-format msgid "warning: backslash at end of format" msgstr "baliogabea -" -#: src/stat.c:1182 +#: src/stat.c:1201 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" -#: src/stat.c:1189 +#: src/stat.c:1208 #, fuzzy, c-format msgid "cannot read file system information for %s" msgstr "errepikatu arte" -#: src/stat.c:1209 +#: src/stat.c:1228 #, 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:1245 +#: src/stat.c:1264 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -8649,7 +8997,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1268 +#: src/stat.c:1287 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -8657,30 +9005,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1278 +#: src/stat.c:1297 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:1286 +#: src/stat.c:1305 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:1295 +#: src/stat.c:1314 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:1305 +#: src/stat.c:1324 #, fuzzy, c-format msgid "Context: %C\n" msgstr " kontestua=%s" -#: src/stat.c:1313 +#: src/stat.c:1332 msgid "" "Access: %x\n" "Modify: %y\n" @@ -8688,15 +9036,17 @@ msgid "" " Birth: %w\n" msgstr "" -#: src/stat.c:1331 +#: src/stat.c:1350 +msgid "Display file or file system status.\n" +msgstr "" + +#: src/stat.c:1356 msgid "" -"Display file or file system status.\n" -"\n" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" -#: src/stat.c:1337 +#: src/stat.c:1360 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -8706,7 +9056,7 @@ msgid "" " -t, --terse print the information in terse form\n" msgstr "" -#: src/stat.c:1348 +#: src/stat.c:1371 #, fuzzy msgid "" "\n" @@ -8724,7 +9074,7 @@ msgstr "" " B tamaina in - bider\n" " Zenbakia - B e" -#: src/stat.c:1357 +#: src/stat.c:1380 #, fuzzy msgid "" " %d device number in decimal\n" @@ -8741,7 +9091,7 @@ msgstr "" " B Taldea - jabea\n" " Taldea IDa - jabea e" -#: src/stat.c:1365 +#: src/stat.c:1388 #, fuzzy msgid "" " %h number of hard links\n" @@ -8763,7 +9113,7 @@ msgstr "" " gailua mota in\n" " gailua mota in e" -#: src/stat.c:1376 +#: src/stat.c:1399 #, fuzzy msgid "" " %u user ID of owner\n" @@ -8787,7 +9137,7 @@ msgstr "" " Ordua - azken segundo\n" " Ordua - azken e e" -#: src/stat.c:1390 +#: src/stat.c:1413 #, fuzzy msgid "" "Valid format sequences for file systems:\n" @@ -8805,7 +9155,7 @@ msgstr "" " Libre in\n" " Libre in e" -#: src/stat.c:1399 +#: src/stat.c:1422 #, fuzzy msgid "" " %i file system ID in hex\n" @@ -8831,30 +9181,29 @@ msgstr "Erabilera: %s [AUKERA]...\n" #: src/stdbuf.c:91 msgid "" "Run COMMAND, with modified buffering operations for its standard streams.\n" -"\n" msgstr "" -#: src/stdbuf.c:98 +#: src/stdbuf.c:97 msgid "" " -i, --input=MODE adjust standard input stream buffering\n" " -o, --output=MODE adjust standard output stream buffering\n" " -e, --error=MODE adjust standard error stream buffering\n" msgstr "" -#: src/stdbuf.c:105 +#: src/stdbuf.c:104 msgid "" "\n" "If MODE is 'L' the corresponding stream will be line buffered.\n" "This option is invalid with standard input.\n" msgstr "" -#: src/stdbuf.c:108 +#: src/stdbuf.c:107 msgid "" "\n" "If MODE is '0' the corresponding stream will be unbuffered.\n" msgstr "" -#: src/stdbuf.c:111 +#: src/stdbuf.c:110 msgid "" "\n" "Otherwise MODE is a number which may be followed by one of the following:\n" @@ -8864,7 +9213,7 @@ msgid "" "size set to MODE bytes.\n" msgstr "" -#: src/stdbuf.c:117 +#: src/stdbuf.c:116 msgid "" "\n" "NOTE: If COMMAND adjusts the buffering of its standard streams ('tee' does\n" @@ -8874,22 +9223,22 @@ msgid "" "and are thus unaffected by 'stdbuf' settings.\n" msgstr "" -#: src/stdbuf.c:227 +#: src/stdbuf.c:226 #, fuzzy, c-format msgid "failed to find %s" msgstr "huts egin da %s irekitzen" -#: src/stdbuf.c:247 src/stdbuf.c:279 +#: src/stdbuf.c:246 src/stdbuf.c:278 #, c-format msgid "failed to update the environment with %s" msgstr "" -#: src/stdbuf.c:321 +#: src/stdbuf.c:320 #, c-format msgid "line buffering stdin is meaningless" msgstr "" -#: src/stty.c:509 +#: src/stty.c:513 #, fuzzy, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -8900,11 +9249,13 @@ msgstr "" " edo GAILUA GAILUA a\n" " edo GAILUA GAILUA e" -#: src/stty.c:515 +#: src/stty.c:519 +msgid "Print or change terminal characteristics.\n" +msgstr "" + +#: src/stty.c:525 #, fuzzy msgid "" -"Print or change terminal characteristics.\n" -"\n" " -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" @@ -8914,7 +9265,7 @@ msgstr "" " in a\n" " GAILUA eta erabili GAILUA horren ordez - e" -#: src/stty.c:524 +#: src/stty.c:532 #, fuzzy msgid "" "\n" @@ -8922,7 +9273,7 @@ msgid "" "settings. The underlying system defines which settings are available.\n" msgstr "lehenago e" -#: src/stty.c:529 +#: src/stty.c:537 #, fuzzy msgid "" "\n" @@ -8936,7 +9287,7 @@ msgstr "" " -\n" " e" -#: src/stty.c:536 +#: src/stty.c:544 #, fuzzy msgid "" " * eol2 CHAR alternate CHAR for ending the line\n" @@ -8949,7 +9300,7 @@ msgstr "" "\n" " e" -#: src/stty.c:542 +#: src/stty.c:550 #, fuzzy msgid "" " * lnext CHAR CHAR will enter the next character quoted\n" @@ -8962,7 +9313,7 @@ msgstr "" "\n" " hasi geroago e" -#: src/stty.c:548 +#: src/stty.c:556 #, fuzzy msgid "" " stop CHAR CHAR will stop the output\n" @@ -8975,7 +9326,7 @@ msgstr "" " a\n" " azken e" -#: src/stty.c:554 +#: src/stty.c:562 #, fuzzy msgid "" "\n" @@ -8989,7 +9340,7 @@ msgstr "" " I terminala I zutabetan\n" " zutabetan I I e" -#: src/stty.c:561 +#: src/stty.c:569 #, fuzzy msgid "" " ispeed N set the input speed to N\n" @@ -9003,7 +9354,7 @@ msgstr "" " min I honekin I gutxienekoa errepikatu arte a\n" " I I e" -#: src/stty.c:567 +#: src/stty.c:575 #, fuzzy msgid "" " * rows N tell the kernel that the terminal has N rows\n" @@ -9017,7 +9368,7 @@ msgstr "" " terminala\n" " I honekin - I - a segundo e" -#: src/stty.c:573 +#: src/stty.c:581 #, fuzzy msgid "" "\n" @@ -9025,6 +9376,7 @@ msgid "" " [-]clocal disable modem control signals\n" " [-]cread allow input to be received\n" " * [-]crtscts enable RTS/CTS handshaking\n" +" * [-]cdtrdsr enable DTR/DSR handshaking\n" " csN set character size to N bits, N in [5..8]\n" msgstr "" "\n" @@ -9033,7 +9385,7 @@ msgstr "" " gaitu\n" " tamaina I I in e" -#: src/stty.c:581 +#: src/stty.c:590 #, fuzzy msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" @@ -9041,7 +9393,7 @@ msgid "" " [-]hupcl same as [-]hup\n" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" -" [-]parodd set odd parity (even with '-')\n" +" [-]parodd set odd parity (or even parity with '-')\n" msgstr "" "erabili bikoa gelditu honekin\n" " a azken\n" @@ -9049,7 +9401,7 @@ msgstr "" " in eta in\n" " honekin e" -#: src/stty.c:588 +#: src/stty.c:597 #, fuzzy msgid "" "\n" @@ -9065,7 +9417,7 @@ msgstr "" " ez ikusi egin\n" " ez ikusi egin e" -#: src/stty.c:596 +#: src/stty.c:605 #, fuzzy msgid "" " [-]ignpar ignore characters with parity errors\n" @@ -9080,11 +9432,11 @@ msgstr "" " gaitu\n" " garbitu handia 8. - e" -#: src/stty.c:603 +#: src/stty.c:612 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr "" -#: src/stty.c:606 +#: src/stty.c:615 #, fuzzy msgid "" " * [-]iuclc translate uppercase characters to lowercase\n" @@ -9101,7 +9453,7 @@ msgstr "" " honekin a\n" " e" -#: src/stty.c:614 +#: src/stty.c:623 #, fuzzy msgid "" "\n" @@ -9117,7 +9469,7 @@ msgstr "" " I in\n" " I in e" -#: src/stty.c:622 +#: src/stty.c:631 #, fuzzy msgid "" " * [-]ocrnl translate carriage return to newline\n" @@ -9134,7 +9486,7 @@ msgstr "" "\n" " a e" -#: src/stty.c:630 +#: src/stty.c:639 #, fuzzy msgid "" " * [-]onocr do not print carriage returns in the first column\n" @@ -9151,7 +9503,7 @@ msgstr "" "\n" " I in e" -#: src/stty.c:638 +#: src/stty.c:647 #, fuzzy msgid "" "\n" @@ -9165,7 +9517,7 @@ msgstr "" " bider eta\n" " bider eta e" -#: src/stty.c:645 +#: src/stty.c:654 #, fuzzy msgid "" " * [-]ctlecho echo control characters in hat notation ('^c')\n" @@ -9180,7 +9532,7 @@ msgstr "" "\n" " a geroago a e" -#: src/stty.c:652 +#: src/stty.c:661 #, fuzzy msgid "" " * [-]echoke same as [-]crtkill\n" @@ -9195,7 +9547,7 @@ msgstr "" " gaitu eta\n" " gaitu e" -#: src/stty.c:659 +#: src/stty.c:668 #, fuzzy msgid "" " [-]isig enable interrupt, quit, and suspend special characters\n" @@ -9211,7 +9563,7 @@ msgstr "" " gelditu atzeko planoa terminala\n" " honekin honekin errepikatu arte e" -#: src/stty.c:666 +#: src/stty.c:675 #, fuzzy msgid "" "\n" @@ -9225,7 +9577,7 @@ msgstr "" "\n" " e" -#: src/stty.c:673 +#: src/stty.c:682 #, fuzzy msgid "" " cooked same as brkint ignpar istrip icrnl ixon opost isig\n" @@ -9238,7 +9590,7 @@ msgstr "" "\n" " e" -#: src/stty.c:679 +#: src/stty.c:688 #, fuzzy msgid "" " dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" @@ -9253,7 +9605,7 @@ msgstr "" " eta lehenetsia\n" " e" -#: src/stty.c:686 +#: src/stty.c:695 #, fuzzy msgid "" " -evenp same as -parenb cs8\n" @@ -9270,7 +9622,7 @@ msgstr "" "\n" " e" -#: src/stty.c:694 +#: src/stty.c:703 #, fuzzy msgid "" " oddp same as parenb parodd cs7\n" @@ -9285,7 +9637,7 @@ msgstr "" "\n" " e" -#: src/stty.c:701 +#: src/stty.c:710 #, fuzzy msgid "" " raw same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" @@ -9298,7 +9650,7 @@ msgstr "" " min\n" " e" -#: src/stty.c:707 +#: src/stty.c:716 #, fuzzy msgid "" " sane same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" @@ -9315,7 +9667,7 @@ msgstr "" "\n" " lehenetsia e" -#: src/stty.c:715 +#: src/stty.c:724 #, fuzzy msgid "" "\n" @@ -9325,135 +9677,59 @@ 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:787 +#: src/stty.c:796 #, fuzzy, c-format msgid "only one device may be specified" msgstr "gailua maiatzak" -#: src/stty.c:817 +#: src/stty.c:826 #, fuzzy, c-format msgid "" "the options for verbose and stty-readable output styles are\n" "mutually exclusive" msgstr "errepikatu arte eta" -#: src/stty.c:823 +#: src/stty.c:832 #, fuzzy, c-format msgid "when specifying an output style, modes may not be set" msgstr "maiatzak" -#: src/stty.c:838 +#: src/stty.c:847 #, fuzzy, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "berrezarri modua" -#: src/stty.c:883 src/stty.c:993 +#: src/stty.c:892 src/stty.c:1002 #, c-format msgid "invalid argument %s" msgstr "baliogabeko argumentua: %s" -#: src/stty.c:894 src/stty.c:911 src/stty.c:923 src/stty.c:936 src/stty.c:948 -#: src/stty.c:968 +#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957 +#: src/stty.c:977 #, c-format msgid "missing argument to %s" msgstr "argumentua falta da %s-(r)entzat" -#: src/stty.c:974 +#: src/stty.c:983 #, fuzzy, c-format msgid "invalid line discipline %s" msgstr "baliogabea zabalera" -#: src/stty.c:1044 +#: src/stty.c:1053 #, c-format msgid "%s: unable to perform all requested operations" msgstr "" -#: src/stty.c:1390 +#: src/stty.c:1399 #, fuzzy, c-format msgid "%s: no size information for this device" msgstr "ez tamaina errepikatu arte uneko gailua" -#: src/stty.c:1904 +#: src/stty.c:1920 #, fuzzy, c-format msgid "invalid integer argument %s" msgstr "baliogabea" -#: src/su.c:229 -msgid "Password:" -msgstr "Pasahitza:" - -#: src/su.c:232 -#, c-format -msgid "getpass: cannot open /dev/tty" -msgstr "getpass: ezin da /dev/tty ireki" - -#: src/su.c:290 -#, c-format -msgid "cannot set groups" -msgstr "ezin dira taldeak ezarri" - -#: src/su.c:294 -#, c-format -msgid "cannot set group id" -msgstr "ezin da taldearen id-a ezarri" - -#: src/su.c:296 -#, c-format -msgid "cannot set user id" -msgstr "ezin da erabiltzailearen id-a ezarri" - -#: src/su.c:371 -#, c-format -msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" -msgstr "Erabilera: %s[AUKERA]... [-][ERABILTZAILEA [ARG]...]\n" - -#: src/su.c:372 -#, 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 "" -"Aldatu eta taldea - e\n" -" a\n" -" KOMANDOA a KOMANDOA honekin\n" -" errepikatu arte edo\n" -" m berrezarri\n" -" m\n" -" e" - -#: src/su.c:384 -#, fuzzy -msgid "" -"\n" -"A mere - implies -l. If USER not given, assume root.\n" -msgstr "Baldintzak e" - -#: src/su.c:461 -#, c-format -msgid "user %s does not exist" -msgstr "%s erabiltzaileak ez du existitzen" - -#: src/su.c:484 -#, c-format -msgid "incorrect password" -msgstr "pasahitza ez da zuzena" - -#: src/su.c:501 -#, c-format -msgid "using restricted shell %s" -msgstr "" - -#: src/su.c:509 -#, c-format -msgid "warning: cannot change directory to %s" -msgstr "" - #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 msgid "Kayvan Aghaiepour" @@ -9483,7 +9759,7 @@ msgstr "Behartu e e" msgid "ignoring all arguments" msgstr "argumentu guztiak ignoratzen" -#: src/system.h:340 +#: src/system.h:343 #, c-format msgid "" "\n" @@ -9492,15 +9768,24 @@ msgid "" "for details about the options it supports.\n" msgstr "" -#: src/system.h:346 +#: src/system.h:349 msgid " --help display this help and exit\n" msgstr " --help mezu hau erakutsi eta irten\n" -#: src/system.h:348 +#: src/system.h:351 msgid " --version output version information and exit\n" msgstr " --version bertsioari buruzko informazioa atera eta irten\n" -#: src/system.h:541 +#: src/system.h:544 +#, fuzzy +msgid "" +"\n" +"Mandatory arguments to long options are mandatory for short options too.\n" +msgstr "" +"Beharrezkoak diren argumentuak aukera luzeetan, beharrezkoak dira aukera " +"txikietan ere.\n" + +#: src/system.h:552 msgid "" "\n" "SIZE is an integer and optional unit (example: 10M is 10*1024*1024). Units\n" @@ -9508,7 +9793,7 @@ msgid "" "1000).\n" msgstr "" -#: src/system.h:550 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -9517,7 +9802,7 @@ msgid "" "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n" msgstr "" -#: src/system.h:560 +#: src/system.h:571 #, c-format msgid "" "\n" @@ -9530,22 +9815,22 @@ msgstr "" #. <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:574 +#: src/system.h:585 #, c-format msgid "Report %s translation bugs to <http://translationproject.org/team/>\n" msgstr "" -#: src/system.h:578 +#: src/system.h:589 #, c-format msgid "For complete documentation, run: info coreutils '%s invocation'\n" msgstr "" -#: src/system.h:585 +#: src/system.h:596 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "Saiatu `%s --help' erabiltzen informazio gehiagorako.\n" -#: src/system.h:617 +#: src/system.h:628 #, fuzzy, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -9567,10 +9852,9 @@ msgstr "Jay Lepreau" msgid "" "Write each FILE to standard output, last line first.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "Idatzi FITXATEGIA azken lehen ez FITXATEGIA edo FITXATEGIA da e e" -#: src/tac.c:145 +#: src/tac.c:144 #, fuzzy msgid "" " -b, --before attach the separator before instead of after\n" @@ -9581,42 +9865,42 @@ msgstr "" " bereizlea a\n" " bereizlea KATEA erabili KATEA bereizlea horren ordez - e" -#: src/tac.c:235 src/tac.c:336 +#: src/tac.c:234 src/tac.c:335 #, c-format msgid "%s: seek failed" msgstr "%s: seek-ek huts egin du" -#: src/tac.c:264 +#: src/tac.c:263 #, c-format msgid "record too large" msgstr "erregistroa luzeegia da" -#: src/tac.c:451 +#: src/tac.c:450 #, fuzzy, c-format msgid "failed to create temporary file in %s" msgstr "ezin da %s esteka sortu" -#: src/tac.c:459 +#: src/tac.c:458 #, fuzzy, c-format msgid "failed to open %s for writing" msgstr "%s: huts egin da idazteko irekitzean" -#: src/tac.c:476 +#: src/tac.c:475 #, fuzzy, c-format msgid "failed to rewind stream for %s" msgstr "errepikatu arte" -#: src/tac.c:512 src/tac.c:519 +#: src/tac.c:511 src/tac.c:518 #, c-format msgid "%s: write error" msgstr "%s: idazketa errorea" -#: src/tac.c:572 +#: src/tac.c:571 #, fuzzy, c-format msgid "failed to open %s for reading" msgstr "errepikatu arte" -#: src/tac.c:630 +#: src/tac.c:629 #, c-format msgid "separator cannot be empty" msgstr "bereizlea-k ezin du hutsunea izan" @@ -9632,12 +9916,11 @@ 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" -"\n" msgstr "" "Inprimatu azken lerroz behin - FITXATEGIA FITXATEGIA honekin a goiburua ez " "FITXATEGIA edo FITXATEGIA da e e" -#: src/tail.c:271 +#: src/tail.c:270 msgid "" " -c, --bytes=K output the last K bytes; alternatively, use -c " "+K\n" @@ -9645,7 +9928,7 @@ msgid "" "file\n" msgstr "" -#: src/tail.c:275 +#: src/tail.c:274 #, fuzzy msgid "" " -f, --follow[={name|descriptor}]\n" @@ -9660,7 +9943,7 @@ msgstr "" "\n" " e" -#: src/tail.c:282 +#: src/tail.c:281 #, fuzzy, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -9680,7 +9963,7 @@ msgstr "" " edo\n" " uneko da - e" -#: src/tail.c:295 +#: src/tail.c:294 #, fuzzy msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" @@ -9695,7 +9978,7 @@ msgstr "" " lehenetsia\n" " e" -#: src/tail.c:302 +#: src/tail.c:301 #, fuzzy msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" @@ -9710,7 +9993,7 @@ msgstr "" " lehenetsia\n" " e" -#: src/tail.c:311 +#: src/tail.c:310 #, fuzzy msgid "" "\n" @@ -9724,7 +10007,7 @@ msgstr "" "lehen - I - edo lerroz behin da a honekin hasi - azken I in I maiatzak a m e " "e" -#: src/tail.c:320 +#: src/tail.c:319 #, fuzzy msgid "" "With --follow (-f), tail defaults to following the file descriptor, which\n" @@ -9735,64 +10018,64 @@ 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:379 +#: src/tail.c:378 #, c-format msgid "closing %s (fd=%d)" msgstr "%s itxitzen (fd=%d)" -#: src/tail.c:454 +#: src/tail.c:453 #, fuzzy, c-format msgid "%s: cannot seek to relative offset %s" msgstr "erlatiboa" -#: src/tail.c:458 +#: src/tail.c:457 #, fuzzy, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "erlatiboa" -#: src/tail.c:895 +#: src/tail.c:894 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "" -#: src/tail.c:907 +#: src/tail.c:906 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" msgstr "" -#: src/tail.c:964 +#: src/tail.c:963 #, c-format msgid "%s has become inaccessible" msgstr "" -#: src/tail.c:981 +#: src/tail.c:980 #, 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:990 +#: src/tail.c:989 #, 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:1011 +#: src/tail.c:1010 #, c-format msgid "%s has become accessible" msgstr "" -#: src/tail.c:1019 +#: src/tail.c:1018 #, fuzzy, c-format msgid "%s has appeared; following end of new file" msgstr "- berria" -#: src/tail.c:1030 +#: src/tail.c:1029 #, fuzzy, c-format msgid "%s has been replaced; following end of new file" msgstr "- berria" -#: src/tail.c:1131 +#: src/tail.c:1130 #, fuzzy, c-format msgid "%s: cannot change nonblocking mode" msgstr "berrezarri modua" @@ -10151,17 +10434,22 @@ msgstr "`]' falta da" msgid "extra argument %s" msgstr "argumentu gehigarria: %s" -#: src/timeout.c:124 +#: src/timeout.c:112 +#, c-format +msgid "warning: sigprocmask" +msgstr "" + +#: src/timeout.c:145 #, c-format msgid "warning: timer_settime" msgstr "" -#: src/timeout.c:129 +#: src/timeout.c:150 #, c-format msgid "warning: timer_create" msgstr "" -#: src/timeout.c:204 +#: src/timeout.c:225 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -10170,18 +10458,18 @@ msgstr "" "Erabilera: %s [AUKERA] ERRO-BERRIA [KOMANDOA [ARGUMENTUA]...]\n" " edo: %s AUKERA\n" -#: src/timeout.c:208 +#: src/timeout.c:229 #, fuzzy -msgid "" -"Start COMMAND, and kill it if still running after DURATION.\n" -"\n" -"Mandatory arguments to long options are mandatory for short options too.\n" +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:213 +#: src/timeout.c:235 msgid "" +" --preserve-status\n" +" exit with the same status as COMMAND, even when the\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 " @@ -10196,7 +10484,7 @@ msgid "" " See 'kill -l' for a list of signals\n" msgstr "" -#: src/timeout.c:229 +#: src/timeout.c:254 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -10204,25 +10492,30 @@ msgid "" "days.\n" msgstr "" -#: src/timeout.c:234 +#: src/timeout.c:259 msgid "" "\n" -"If the command times out, then exit with status 124. Otherwise, exit\n" -"with the status of COMMAND. If no signal is specified, send the TERM\n" -"signal upon timeout. The TERM signal kills any process that does not\n" -"block or catch that signal. For other processes, it may be necessary to\n" -"use the KILL (9) signal, since this signal cannot be caught. If the\n" -"KILL (9) signal is sent, the exit status is 128+9 rather than 124.\n" +"If the command times out, and --preserve-status is not set, then exit with\n" +"status 124. Otherwise, exit with the status of COMMAND. If no signal\n" +"is specified, send the TERM signal upon timeout. The TERM signal kills\n" +"any process that does not block or catch that signal. It may be necessary\n" +"to use the KILL (9) signal, since this signal cannot be caught, in which\n" +"case the exit status is 128+9 rather than 124.\n" +msgstr "" + +#: src/timeout.c:363 +#, c-format +msgid "warning: disabling core dumps failed" msgstr "" -#: src/timeout.c:419 +#: src/timeout.c:471 #, c-format msgid "error waiting for command" msgstr "errorea komandoari itxaroten" -#: src/timeout.c:441 +#: src/timeout.c:482 #, c-format -msgid "warning: disabling core dumps failed" +msgid "the monitored command dumped core" msgstr "" #. This is a proper name. See the gettext manual, section Names. @@ -10235,22 +10528,22 @@ msgstr "Jim Kingdon" msgid "Randy Smith" msgstr "Randy Smith" -#: src/touch.c:115 src/touch.c:313 +#: src/touch.c:115 src/touch.c:309 #, c-format msgid "invalid date format %s" msgstr "%s baliogabeko data formatua" -#: src/touch.c:194 +#: src/touch.c:191 #, c-format msgid "cannot touch %s" msgstr "ezin zaio %s-(e)ri touch egin" -#: src/touch.c:200 +#: src/touch.c:197 #, c-format msgid "setting times of %s" msgstr "%s-(r)en datak ezartzen" -#: src/touch.c:216 +#: src/touch.c:213 msgid "" "Update the access and modification times of each FILE to the current time.\n" "\n" @@ -10259,10 +10552,9 @@ msgid "" "\n" "A FILE argument string of - is handled specially and causes touch to\n" "change the times of the file associated with standard output.\n" -"\n" msgstr "" -#: src/touch.c:229 +#: src/touch.c:225 #, fuzzy msgid "" " -a change only the access time\n" @@ -10276,7 +10568,7 @@ msgstr "" " enoratua\n" " m e" -#: src/touch.c:235 +#: src/touch.c:231 #, fuzzy msgid "" " -h, --no-dereference affect each symbolic link instead of any " @@ -10289,12 +10581,12 @@ msgstr "" " aktibatuta\n" " - a e" -#: src/touch.c:241 +#: 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" -" --time=WORD change the specified time:\n" +" --time=WORD change the specified time:\n" " WORD is access, atime, or use: equivalent to -a\n" " WORD is modify or mtime: equivalent to -m\n" msgstr "" @@ -10303,19 +10595,19 @@ msgstr "" " bider erabili a\n" " m e" -#: src/touch.c:250 +#: src/touch.c:246 #, fuzzy msgid "" "\n" "Note that the -d and -t options accept different time-date formats.\n" msgstr "eta e" -#: src/touch.c:339 +#: src/touch.c:335 #, c-format msgid "cannot specify times from more than one source" msgstr "" -#: src/touch.c:413 +#: src/touch.c:409 #, fuzzy, c-format msgid "" "warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'" @@ -10460,9 +10752,9 @@ msgid "missing character class name '[::]'" msgstr "baliogabea" #: src/tr.c:913 -#, fuzzy, c-format +#, c-format msgid "missing equivalence class character '[==]'" -msgstr "baliogabea" +msgstr "" #: src/tr.c:928 #, fuzzy, c-format @@ -10576,25 +10868,24 @@ msgid "" "If a FILE is larger than the specified size, the extra data is lost.\n" "If a FILE is shorter, it is extended and the extended part (hole)\n" "reads as zero bytes.\n" -"\n" msgstr "" -#: src/truncate.c:110 +#: src/truncate.c:109 msgid " -c, --no-create do not create any files\n" msgstr "" -#: src/truncate.c:113 +#: src/truncate.c:112 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" -#: src/truncate.c:116 +#: 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" msgstr "" -#: src/truncate.c:122 +#: src/truncate.c:121 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -10602,57 +10893,57 @@ msgid "" "'/' round down to multiple of, '%' round up to multiple of.\n" msgstr "" -#: src/truncate.c:150 +#: src/truncate.c:149 #, c-format msgid "overflow in %<PRIdMAX> * %<PRIdMAX> byte blocks for file %s" msgstr "" -#: src/truncate.c:174 +#: src/truncate.c:173 #, fuzzy, c-format msgid "%s has unusable, apparently negative size" msgstr "%s: fitxategiak luzeera negatiboa dauka" -#: src/truncate.c:184 src/truncate.c:379 +#: src/truncate.c:183 src/truncate.c:384 #, fuzzy, c-format msgid "cannot get the size of %s" msgstr "- eguna" -#: src/truncate.c:206 +#: src/truncate.c:205 #, c-format msgid "overflow rounding up size of file %s" msgstr "" -#: src/truncate.c:216 +#: src/truncate.c:215 #, c-format msgid "overflow extending size of file %s" msgstr "" -#: src/truncate.c:231 +#: src/truncate.c:230 #, c-format msgid "failed to truncate %s at %<PRIdMAX> bytes" msgstr "" -#: src/truncate.c:305 +#: src/truncate.c:303 #, fuzzy, c-format msgid "multiple relative modifiers specified" msgstr "irteera fitxategi anitz espezifikatu dira" -#: src/truncate.c:335 +#: src/truncate.c:333 #, fuzzy, c-format msgid "you must specify either %s or %s" msgstr "a zerrenda - edo" -#: src/truncate.c:342 +#: src/truncate.c:340 #, fuzzy, c-format msgid "you must specify a relative %s with %s" msgstr "a zerrenda - edo" -#: src/truncate.c:349 +#: src/truncate.c:347 #, c-format msgid "%s was specified but %s was not" msgstr "" -#: src/truncate.c:400 +#: src/truncate.c:404 #, c-format msgid "cannot open %s for writing" msgstr "ezin da %s ireki idazketarako" @@ -10744,10 +11035,9 @@ msgstr "ezin da sistemaren izena lortu" msgid "" "Convert blanks in each FILE to tabs, writing to standard output.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "Bihurtu in FITXATEGIA ez FITXATEGIA edo FITXATEGIA da e e" -#: src/unexpand.c:125 +#: src/unexpand.c:124 #, fuzzy msgid "" " -a, --all convert all blanks, instead of just initial blanks\n" @@ -10760,12 +11050,12 @@ msgstr "" " I I horren ordez - a\n" " erabili - a e" -#: src/unexpand.c:153 +#: src/unexpand.c:152 #, c-format msgid "tabs are too far apart" msgstr "" -#: src/unexpand.c:505 +#: src/unexpand.c:504 #, fuzzy, c-format msgid "tab stop value is too large" msgstr "gelditu da" @@ -10781,10 +11071,9 @@ msgid "" "writing to OUTPUT (or standard output).\n" "\n" "With no options, matching lines are merged to the first occurrence.\n" -"\n" msgstr "" -#: src/uniq.c:148 +#: src/uniq.c:147 #, fuzzy msgid "" " -c, --count prefix lines by the number of occurrences\n" @@ -10793,7 +11082,7 @@ msgstr "" "lerroz behin bider - aldiz\n" " lerroz behin e" -#: src/uniq.c:152 +#: src/uniq.c:151 #, fuzzy msgid "" " -D, --all-repeated[=delimit-method] print all duplicate lines\n" @@ -10813,12 +11102,12 @@ msgstr "" " I lehen I\n" " esklusiboa esklusiboa lerroz behin e" -#: src/uniq.c:162 +#: src/uniq.c:161 #, 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:167 +#: src/uniq.c:166 #, fuzzy msgid "" "\n" @@ -10826,7 +11115,7 @@ msgid "" "characters. Fields are skipped before chars.\n" msgstr "da a - lehenago e" -#: src/uniq.c:172 +#: src/uniq.c:171 msgid "" "\n" "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n" @@ -10834,27 +11123,27 @@ msgid "" "Also, comparisons honor the rules specified by 'LC_COLLATE'.\n" msgstr "" -#: src/uniq.c:359 +#: src/uniq.c:358 #, c-format msgid "too many repeated lines" msgstr "errepikatutako lerro gehiegi" -#: src/uniq.c:522 +#: src/uniq.c:521 #, fuzzy msgid "invalid number of fields to skip" msgstr "baliogabea -" -#: src/uniq.c:531 +#: src/uniq.c:530 #, fuzzy msgid "invalid number of bytes to skip" msgstr "baliogabea -" -#: src/uniq.c:540 +#: src/uniq.c:539 #, fuzzy msgid "invalid number of bytes to compare" msgstr "baliogabea -" -#: src/uniq.c:559 +#: src/uniq.c:558 #, fuzzy, c-format msgid "printing all duplicated lines and repeat counts is meaningless" msgstr "lerroz behin eta da" @@ -10907,6 +11196,11 @@ msgid_plural "up %ld days %2d:%02d, " msgstr[0] "piztuta egun %ld %2d:%02d," msgstr[1] "piztuta %ld egun %2d:%02d," +#: src/uptime.c:149 +#, fuzzy, c-format +msgid "up %2d:%02d, " +msgstr "piztuta egun %ld %2d:%02d," + #: src/uptime.c:151 #, c-format msgid "%lu user" @@ -10988,39 +11282,39 @@ msgstr "" msgid " old " msgstr " zaharra " -#: src/who.c:449 +#: src/who.c:440 msgid "system boot" msgstr "sistemaren abioa" -#: src/who.c:456 src/who.c:458 +#: src/who.c:447 src/who.c:449 msgid "id=" msgstr "id=" -#: src/who.c:471 src/who.c:476 +#: src/who.c:462 src/who.c:467 msgid "term=" msgstr "terminala=" -#: src/who.c:473 src/who.c:477 +#: src/who.c:464 src/who.c:468 msgid "exit=" msgstr "irten=" -#: src/who.c:494 +#: src/who.c:485 msgid "LOGIN" msgstr "SAIO HASIERA" -#: src/who.c:514 +#: src/who.c:505 msgid "clock change" msgstr "ordu aldaketa" -#: src/who.c:526 src/who.c:527 +#: src/who.c:517 src/who.c:518 msgid "run-level" msgstr "abio-maila" -#: src/who.c:530 src/who.c:531 +#: src/who.c:521 src/who.c:522 msgid "last=" msgstr "azkena=" -#: src/who.c:562 +#: src/who.c:553 #, c-format msgid "" "\n" @@ -11029,44 +11323,44 @@ msgstr "" "\n" "# Erabiltzaile kopurua=%lu\n" -#: src/who.c:568 +#: src/who.c:559 msgid "NAME" msgstr "IZENA" -#: src/who.c:568 +#: src/who.c:559 msgid "LINE" msgstr "LERROA" -#: src/who.c:568 +#: src/who.c:559 msgid "TIME" msgstr "ORDUA" -#: src/who.c:568 +#: src/who.c:559 msgid "IDLE" msgstr "Alfer-denbora" -#: src/who.c:569 +#: src/who.c:560 msgid "PID" msgstr "PID" -#: src/who.c:569 +#: src/who.c:560 msgid "COMMENT" msgstr "AZALPENA" -#: src/who.c:569 +#: src/who.c:560 msgid "EXIT" msgstr "IRTEN" -#: src/who.c:649 +#: src/who.c:640 #, c-format msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n" msgstr "Erabilera: %s [AUKERA]... [FITXATEGIA | ARG1 ARG2 ]\n" -#: src/who.c:650 +#: src/who.c:641 msgid "Print information about users who are currently logged in.\n" msgstr "" -#: src/who.c:653 +#: src/who.c:644 msgid "" "\n" " -a, --all same as -b -d --login -p -r -t -T -u\n" @@ -11080,11 +11374,11 @@ msgstr "" " -d, --dead inprimatu hildako prozesuak\n" " -H, --heading inprimatu zutabe buruen lerroak\n" -#: src/who.c:660 +#: src/who.c:651 msgid " -l, --login print system login processes\n" msgstr "" -#: src/who.c:663 +#: src/who.c:654 #, fuzzy msgid "" " --lookup attempt to canonicalize hostnames via DNS\n" @@ -11095,7 +11389,7 @@ msgstr "" " m eta honekin\n" " bider e" -#: src/who.c:668 +#: src/who.c:659 #, fuzzy msgid "" " -q, --count all login names and number of users logged on\n" @@ -11108,7 +11402,7 @@ msgstr "" " eta lehenetsia\n" " azken e" -#: src/who.c:674 +#: src/who.c:665 #, fuzzy msgid "" " -T, -w, --mesg add user's message status as +, - or ?\n" @@ -11121,7 +11415,7 @@ msgstr "" "\n" " e" -#: src/who.c:682 +#: src/who.c:673 #, fuzzy, c-format msgid "" "\n" @@ -11161,12 +11455,31 @@ msgstr "" "\n" #, fuzzy -#~ msgid " gid=%s" -#~ msgstr " gid=%lu" +#~ msgid " returning value: '%s'\n" +#~ msgstr "`%s' fitxategia sortzen\n" + +#, fuzzy +#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n" +#~ msgstr "Erabilera: %s [AUKERA] IZENA...\n" #, fuzzy -#~ msgid " euid=%s" -#~ msgstr " euid=%lu" +#~ msgid "no valid suffix found\n" +#~ msgstr "baliogabea" + +#~ msgid "reading %s" +#~ msgstr "%s irakurtzen" + +#~ msgid "writing %s" +#~ msgstr "%s idazten" + +#~ msgid "closing %s" +#~ msgstr "%s itxitzen" + +#~ msgid "accessing %s" +#~ msgstr "%s-(r)a sartzen" + +#~ msgid "opening %s" +#~ msgstr "%s irekitzen" #~ msgid "" #~ "Usage: %s NAME\n" @@ -11175,8 +11488,103 @@ msgstr "" #~ "Erabilera: %s IZENA\n" #~ " edo: %s AUKERA\n" -#~ msgid "Usage: %s [OPTION] FILE...\n" -#~ msgstr "Erabilera: %s [AUKERA] FITXATEGIA...\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" + +#, fuzzy +#~ msgid "" +#~ "WARNING: --page-increment is deprecated; use --line-increment instead" +#~ msgstr "da erabili horren ordez" + +#, fuzzy +#~ msgid "All arguments to long options are mandatory for short options.\n" +#~ msgstr "Denak errepikatu arte 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 " +#~ "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 "" +#~ "da errepikatu arte errepikatu arte x errepikatu arte edo e errepikatu " +#~ "arte bat ere ez da honekin edo da bider bider honekin eta bider honekin m " +#~ "a mota a - - " + +#, 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 "a zabalera a lehenetsia A e" + +#~ msgid "Usage: %s [OPTION]... FILE\n" +#~ msgstr "Erabilera: %s [AUKERA]... FITXATEGIA\n" + +#~ msgid "Password:" +#~ msgstr "Pasahitza:" + +#~ msgid "getpass: cannot open /dev/tty" +#~ msgstr "getpass: ezin da /dev/tty ireki" + +#~ msgid "cannot set groups" +#~ msgstr "ezin dira taldeak ezarri" + +#~ 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" + +#, 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 "" +#~ "Aldatu eta taldea - e\n" +#~ " a\n" +#~ " KOMANDOA a KOMANDOA honekin\n" +#~ " errepikatu arte edo\n" +#~ " m berrezarri\n" +#~ " m\n" +#~ " e" + +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "A mere - implies -l. If USER not given, assume root.\n" +#~ msgstr "Baldintzak e" + +#~ msgid "user %s does not exist" +#~ msgstr "%s erabiltzaileak ez du existitzen" + +#~ msgid "incorrect password" +#~ msgstr "pasahitza ez da zuzena" #, fuzzy #~ msgid "" @@ -11185,16 +11593,22 @@ 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" +#~ " -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" @@ -11220,14 +11634,6 @@ 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" @@ -11274,15 +11680,11 @@ msgstr "" #~ " G aktibatuta eta\n" #~ " a errepikatu arte e e" -#, fuzzy -#~ msgid "Usage: %s [OPTION]... PATH START\n" -#~ msgstr "Erabilera: %s [AUKERA]... MULTZO1 [MULTZO2]\n" - #, fuzzy #~ msgid "" #~ "\n" -#~ "SIZE is an integer with an optional suffix (example: 10MB). Suffixes " -#~ "are:\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 "" @@ -11292,19 +11694,11 @@ msgstr "" #~ "kB 1000, K 1024, MB 1000*1000, M 1024*1024, edo berdina hauekin G, T, P, " #~ "E, Z, Y.\n" -#~ msgid "cannot create link %s" -#~ msgstr "ezin da %s esteka sortu" - -#, fuzzy -#~ msgid "%s: option '%s' is ambiguous\n" -#~ msgstr "%s: '-W %s' aukera anbiguoa da\n" - #~ msgid "%s" #~ msgstr "%s" -#, fuzzy -#~ msgid "invalid format width" -#~ msgstr "baliogabea zabalera" +#~ msgid "cannot create link %s" +#~ msgstr "ezin da %s esteka sortu" #, fuzzy #~ msgid "invalid format precision" @@ -11637,10 +12031,6 @@ msgstr "" #~ msgid "value %s is so large that it is not representable" #~ 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" @@ -11993,6 +12383,9 @@ msgstr "" #~ "SIZE may have a multiplier suffix: b for 512, k for 1K, m for 1 Meg.\n" #~ msgstr "maiatzak a errepikatu arte errepikatu arte m errepikatu arte e" +#~ msgid "Usage: %s [OPTION] FILE...\n" +#~ msgstr "Erabilera: %s [AUKERA] FITXATEGIA...\n" + #, fuzzy #~ msgid "" #~ "Display file or filesystem status.\n" diff --git a/po/fi.gmo b/po/fi.gmo index cb8eec4e..352284db 100644 Binary files a/po/fi.gmo and b/po/fi.gmo differ diff --git a/po/fi.po b/po/fi.po index 8bf416de..6807b1aa 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: 2012-05-10 19:35+0200\n" +"POT-Creation-Date: 2013-02-14 15:56+0000\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,19 +51,19 @@ msgstr "Kelvolliset argumentit:" msgid "error closing file" msgstr "virhe tiedoston sulkemisessa" -#: lib/closeout.c:112 src/base64.c:109 src/base64.c:121 src/base64.c:127 -#: src/base64.c:168 src/base64.c:224 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:330 src/expand.c:355 src/head.c:298 -#: src/head.c:348 src/head.c:756 src/head.c:797 src/mktemp.c:350 src/od.c:919 -#: src/paste.c:160 src/shuf.c:369 src/split.c:727 src/split.c:964 -#: src/split.c:969 src/tail.c:350 src/tail.c:1201 src/tail.c:1307 +#: 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 -#: src/unexpand.c:427 src/unexpand.c:443 +#: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "kirjoitusvirhe" -#: lib/copy-acl.c:611 src/copy.c:1160 src/copy.c:2602 +#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617 #, c-format msgid "preserving permissions for %s" msgstr "säilytettäessä tiedoston %s oikeuksia" @@ -258,18 +258,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:483 +#: lib/mkdir-p.c:196 src/install.c:484 #, c-format msgid "cannot change permissions of %s" msgstr "kohteen %s oikeuksien muuttaminen ei onnistu" -#: lib/mkdir-p.c:206 src/copy.c:2261 src/install.c:709 src/install.c:722 +#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722 #, 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:915 src/tac.c:435 +#: src/split.c:929 src/tac.c:434 #, c-format msgid "memory exhausted" msgstr "muisti loppu" @@ -318,80 +318,80 @@ msgstr "”" msgid "%s: end of file" msgstr "%s: tiedoston loppu" -#: lib/regcomp.c:130 +#: lib/regcomp.c:131 msgid "Success" msgstr "" -#: lib/regcomp.c:133 +#: lib/regcomp.c:134 msgid "No match" msgstr "" -#: lib/regcomp.c:136 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "Virheellinen säännöllinen lauseke" -#: lib/regcomp.c:139 +#: lib/regcomp.c:140 #, fuzzy msgid "Invalid collation character" msgstr "virheellinen merkkiluokka %s" -#: lib/regcomp.c:142 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "Virheellinen merkkiluokan nimi" -#: lib/regcomp.c:145 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "" -#: lib/regcomp.c:148 +#: lib/regcomp.c:149 #, fuzzy msgid "Invalid back reference" msgstr "Virheellinen sivuväli %s" -#: lib/regcomp.c:151 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "" -#: lib/regcomp.c:154 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "" -#: lib/regcomp.c:157 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "" -#: lib/regcomp.c:160 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "" -#: lib/regcomp.c:163 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "Virheellinen välin loppu" -#: lib/regcomp.c:166 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Muisti loppu" -#: lib/regcomp.c:169 +#: lib/regcomp.c:170 #, fuzzy msgid "Invalid preceding regular expression" msgstr "%s: virheellinen säännöllinen lauseke: %s" -#: lib/regcomp.c:172 +#: lib/regcomp.c:173 #, fuzzy msgid "Premature end of regular expression" msgstr "virhe säännöllisen lausekkeen haussa" -#: lib/regcomp.c:175 +#: lib/regcomp.c:176 #, fuzzy msgid "Regular expression too big" msgstr "virhe säännöllisen lausekkeen haussa" -#: lib/regcomp.c:178 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:703 +#: lib/regcomp.c:704 #, fuzzy msgid "No previous regular expression" msgstr "virhe säännöllisen lausekkeen haussa" @@ -431,7 +431,7 @@ msgstr "^[kKyY]" msgid "^[nN]" msgstr "^[eEnN]" -#: lib/set-mode-acl.c:695 src/copy.c:2284 src/cp.c:518 +#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516 #, c-format msgid "setting permissions for %s" msgstr "asetettaessa tiedoston %s oikeuksia" @@ -580,13 +580,13 @@ msgstr "outo tiedosto" msgid "Resource lost" msgstr "ennen operaattoria -lt" -#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262 -#: lib/spawn-pipe.c:265 +#: 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:232 lib/spawn-pipe.c:346 lib/wait-process.c:282 +#: 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" @@ -602,24 +602,24 @@ msgstr "ajanjakso ei kelpaa: %s" msgid "Unknown signal %d" msgstr "" -#: lib/unicodeio.c:103 +#: lib/unicodeio.c:102 msgid "iconv function not usable" msgstr "iconv-funktio ei ole käyttökelpoinen" -#: lib/unicodeio.c:105 +#: lib/unicodeio.c:104 msgid "iconv function not available" msgstr "iconv-funktio ei ole saatavilla" -#: lib/unicodeio.c:112 +#: lib/unicodeio.c:111 msgid "character out of range" msgstr "merkki sallitun välin ulkopuolella" -#: lib/unicodeio.c:182 +#: lib/unicodeio.c:181 #, c-format msgid "cannot convert U+%04X to local character set" msgstr "merkin U+%04X muunnos paikalliseen merkistöön ei onnistu" -#: lib/unicodeio.c:184 +#: lib/unicodeio.c:183 #, c-format msgid "cannot convert U+%04X to local character set: %s" msgstr "merkin U+%04X muunnos paikalliseen merkistöön ei onnistu: %s" @@ -802,7 +802,7 @@ msgstr "" "Ilmoita ohjelmistovioista (englanniksi) osoitteeseen\n" "<%s>.\n" -#: lib/version-etc.c:251 src/system.h:562 +#: lib/version-etc.c:251 src/system.h:573 #, fuzzy, c-format msgid "%s home page: <%s>\n" msgstr "Käyttö: %s\n" @@ -812,7 +812,7 @@ 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:563 +#: lib/version-etc.c:256 src/system.h:574 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" @@ -900,17 +900,16 @@ msgid "Simon Josefsson" msgstr "Simon Josefsson" #: src/base64.c:60 -#, c-format +#, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" "Base64 encode or decode FILE, or standard input, to standard output.\n" -"\n" msgstr "" "Käyttö: %s [VALITSIN]... [TIEDOSTO]\n" "Base64-koodaa tai -pura TIEDOSTO tai vakiosyöte vakiotulosteeseen.\n" "\n" -#: src/base64.c:64 +#: src/base64.c:67 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -920,7 +919,7 @@ msgid "" "\n" msgstr "" -#: src/base64.c:73 src/cat.c:110 src/fmt.c:293 src/shuf.c:71 src/sum.c:70 +#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -928,7 +927,7 @@ msgstr "" "\n" "Jos TIEDOSTOa ei ole annettu, tai se on ”-”, luetaan vakiosyötettä.\n" -#: src/base64.c:76 +#: src/base64.c:79 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -937,37 +936,37 @@ msgid "" "from any other non-alphabet bytes in the encoded stream.\n" msgstr "" -#: src/base64.c:171 src/base64.c:208 src/csplit.c:263 src/csplit.c:1435 -#: src/join.c:451 src/shuf.c:157 src/shuf.c:361 src/tac-pipe.c:74 +#: 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 #, c-format msgid "read error" msgstr "lukuvirhe" -#: src/base64.c:227 +#: src/base64.c:230 #, fuzzy, c-format msgid "invalid input" msgstr "virheellinen leveys: %s" -#: src/base64.c:264 +#: src/base64.c:267 #, fuzzy, c-format msgid "invalid wrap size: %s" msgstr "virheellinen sarkainkoko: %s" -#: src/base64.c:283 src/basename.c:173 src/comm.c:435 src/cp.c:607 -#: src/date.c:441 src/dircolors.c:447 src/du.c:894 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:169 src/install.c:929 src/join.c:961 -#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:157 src/mv.c:447 -#: src/od.c:1802 src/ptx.c:2081 src/readlink.c:154 src/seq.c:408 -#: src/shuf.c:320 src/shuf.c:339 src/sort.c:4477 src/split.c:1313 -#: src/tr.c:1797 src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:454 -#: src/uniq.c:471 src/unlink.c:81 src/uptime.c:250 src/users.c:146 -#: src/wc.c:666 src/who.c:836 src/whoami.c:79 +#: 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 #, c-format msgid "extra operand %s" msgstr "ylimääräinen operandi %s" -#: src/base64.c:315 src/cat.c:781 +#: src/base64.c:318 src/cat.c:781 #, c-format msgid "closing standard input" msgstr "suljetaan vakiosyöte" @@ -975,15 +974,15 @@ 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/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:53 src/env.c:33 +#: 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/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:65 src/su.c:88 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 +#: 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 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -997,23 +996,23 @@ msgstr "" " tai: %s VALITSIN\n" #: src/basename.c:53 +#, fuzzy msgid "" "Print NAME with any leading directory components removed.\n" "If specified, also remove a trailing SUFFIX.\n" -"\n" msgstr "" "Tulostetaan NIMI ilman edeltävää hakemistorakennetta.\n" "Poistetaan myös lopusta mahdollinen PÄÄTE.\n" "\n" -#: src/basename.c:59 +#: 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" msgstr "" -#: src/basename.c:66 +#: src/basename.c:67 #, c-format msgid "" "\n" @@ -1024,20 +1023,21 @@ msgid "" " %s -a any/str1 any/str2 -> \"str1\" followed by \"str2\"\n" msgstr "" -#: src/basename.c:167 src/chcon.c:531 src/chgrp.c:277 src/chmod.c:526 -#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1369 +#: 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:183 src/mkfifo.c:108 src/mknod.c:146 src/nohup.c:111 -#: src/pathchk.c:148 src/printf.c:674 src/readlink.c:146 src/realpath.c:236 -#: src/rm.c:314 src/rmdir.c:223 src/seq.c:402 src/setuidgid.c:137 -#: src/sleep.c:119 src/stat.c:1476 src/stdbuf.c:346 src/tr.c:1782 +#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 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 #, 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:52 src/split.c:49 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/split.c:49 msgid "Torbjorn Granlund" msgstr "Torbjörn Granlund" @@ -1047,8 +1047,8 @@ msgstr "Torbjörn Granlund" msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:846 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4720 src/nl.c:182 src/paste.c:435 src/pr.c:2768 src/sum.c:58 +#: 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/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 +1107,7 @@ msgstr "" msgid "cannot do ioctl on %s" msgstr "tiedostolle %s ei voi käyttää ioctl:ää" -#: src/cat.c:637 src/dd.c:2209 src/sort.c:379 src/tee.c:165 src/yes.c:86 +#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86 #, c-format msgid "standard output" msgstr "vakiotuloste" @@ -1124,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:55 src/head.c:46 src/hostid.c:33 +#: 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 msgid "Jim Meyering" msgstr "Jim Meyering" -#: src/chcon.c:100 src/runcon.c:203 src/runcon.c:234 +#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238 #, fuzzy, c-format msgid "failed to create security context: %s" msgstr "tiedoston %s omistajuuden muuttaminen epäonnistui\n" @@ -1141,8 +1141,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:540 src/copy.c:2222 src/runcon.c:217 -#: src/stat.c:683 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221 +#: src/stat.c:702 #, fuzzy, c-format msgid "failed to get security context of %s" msgstr "tiedoston %s ominaisuuksien hakeminen ei onnistu" @@ -1158,12 +1158,12 @@ 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:446 src/ls.c:2981 +#: src/du.c:457 src/ls.c:2981 #, 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:426 +#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437 #, c-format msgid "cannot read directory %s" msgstr "hakemistoa %s ei voi lukea" @@ -1173,13 +1173,13 @@ 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:599 +#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562 #, 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:618 -#: src/remove.c:613 +#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642 +#: src/remove.c:576 #, fuzzy, c-format msgid "fts_close failed" msgstr "sulkeminen epäonnistui" @@ -1202,7 +1202,6 @@ msgid "" "Change the security context of each FILE to CONTEXT.\n" "With --reference, change the security context of each FILE to that of " "RFILE.\n" -"\n" msgstr "" "Muuta kunkin TIEDOSTOn ryhmäksi RYHMÄ.\n" "Jos valitsin --reference on annettu, vaihda kunkin TIEDOSTOn omistajaksi\n" @@ -1213,7 +1212,7 @@ msgstr "" " --dereference muuta symbolisen linkin kohdetta, ei linkkiä\n" " itseään (tämä on oletus)\n" -#: src/chcon.c:362 src/chgrp.c:123 src/chown.c:94 +#: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94 msgid "" " --dereference affect the referent of each symbolic link (this is\n" " the default), rather than the symbolic link itself\n" @@ -1221,7 +1220,7 @@ msgid "" "file\n" msgstr "" -#: src/chcon.c:367 +#: src/chcon.c:369 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" @@ -1229,8 +1228,17 @@ 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 +#, fuzzy +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? -#: src/chcon.c:373 +#: src/chcon.c:379 #, fuzzy msgid "" " --reference=RFILE use RFILE's security context rather than " @@ -1242,15 +1250,15 @@ msgstr "" " -R, --recursive käsittele tiedostot ja hakemistot rekursiivisesti\n" " -v, --verbose näytä ilmoitus jokaisesta käsitellystä tiedostosta\n" -#: src/chcon.c:377 src/chgrp.c:140 src/chown.c:118 +#: 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:380 +#: src/chcon.c:386 msgid " -v, --verbose output a diagnostic for every file processed\n" msgstr "" -#: src/chcon.c:383 src/chgrp.c:143 src/chown.c:121 +#: src/chcon.c:389 src/chgrp.c:143 src/chown.c:121 #, fuzzy msgid "" "\n" @@ -1276,36 +1284,36 @@ msgstr "" " -P älä seuraa symbolisia linkkejä (oletus)\n" "\n" -#: src/chcon.c:512 src/chgrp.c:264 src/chown.c:267 +#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267 #, c-format msgid "-R --dereference requires either -H or -L" msgstr "-R --dereference vaatii joko -H:n tai -L:n" -#: src/chcon.c:518 +#: src/chcon.c:524 #, c-format msgid "-R -h requires -P" msgstr "-R -h vaatii -P:n" -#: src/chcon.c:533 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282 -#: src/comm.c:429 src/csplit.c:1371 src/join.c:1149 src/link.c:79 -#: src/mknod.c:148 src/setuidgid.c:139 src/tr.c:1785 +#: 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 #, c-format msgid "missing operand after %s" msgstr "%s:n jälkeen puuttuu operandi" -#: src/chcon.c:556 src/runcon.c:247 +#: src/chcon.c:562 src/runcon.c:251 #, fuzzy, c-format msgid "invalid context: %s" msgstr "virheelliset oikeudet: %s" -#: src/chcon.c:563 +#: src/chcon.c:569 #, c-format msgid "conflicting security context specifiers given" msgstr "" -#: src/chcon.c:572 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:433 src/cp.c:493 -#: src/mv.c:96 src/pwd.c:273 src/rm.c:324 src/touch.c:351 +#: 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 #, c-format msgid "failed to get attributes of %s" msgstr "tiedoston %s ominaisuuksien hakeminen ei onnistu" @@ -1359,15 +1367,6 @@ msgstr "" "joissa\n" " symlinkin omistajuutta voi muuttaa)\n" -#: src/chgrp.c:132 src/chmod.c:387 src/chown.c:110 -#, fuzzy -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" - #: src/chgrp.c:136 msgid "" " --reference=RFILE use RFILE's group rather than specifying a\n" @@ -1454,9 +1453,15 @@ 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 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 msgid " -R, --recursive change files and directories recursively\n" @@ -1622,7 +1627,7 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:97 src/install.c:575 src/setuidgid.c:110 src/setuidgid.c:120 +#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120 #, c-format msgid "invalid group %s" msgstr "virheellinen ryhmä %s" @@ -1689,8 +1694,8 @@ msgstr "tiedoston %s avaaminen epäonnistui" msgid "failed to set user-ID" msgstr "tiedoston %s avaaminen epäonnistui" -#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:213 src/stdbuf.c:366 -#: src/timeout.c:402 +#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365 +#: src/timeout.c:454 #, fuzzy, c-format msgid "failed to run command %s" msgstr "komentoa %s ei voi ajaa" @@ -1805,22 +1810,26 @@ msgstr "useita tulostiedostoja annettu" msgid "empty %s not allowed" msgstr "" -#: src/copy.c:168 src/dd.c:1609 src/dd.c:1976 +#: 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 #, c-format -msgid "reading %s" -msgstr "luettaessa tiedostoa %s" +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:426 +#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425 #, c-format msgid "cannot lseek %s" msgstr "siirtyminen tiedostossa %s ei onnistu" -#: src/copy.c:206 src/dd.c:2039 src/dd.c:2102 +#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151 #, c-format -msgid "writing %s" -msgstr "kirjoitettaessa tiedostoa %s" +msgid "error writing %s" +msgstr "virhe kirjoitettaessa tiedostoa %s" #: src/copy.c:313 #, fuzzy, c-format @@ -1842,7 +1851,7 @@ msgstr "tiedoston %s avaaminen epäonnistui" msgid "clearing permissions for %s" msgstr "asetettaessa tiedoston %s oikeuksia" -#: src/copy.c:697 src/copy.c:2470 src/cp.c:331 +#: src/copy.c:697 src/copy.c:2480 src/cp.c:329 #, c-format msgid "failed to preserve ownership for %s" msgstr "tiedoston %s omistajuuden säilytys ei onnistu" @@ -1857,16 +1866,16 @@ msgstr "tiedostoa %s ei löytynyt" msgid "failed to preserve authorship for %s" msgstr "tiedoston %s tekijän tietojen säilytys ei onnistunut" -#: src/copy.c:804 src/csplit.c:638 src/du.c:901 src/fmt.c:449 src/head.c:847 -#: src/sort.c:4489 src/split.c:1329 src/tail.c:1756 src/wc.c:678 +#: 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 "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:1546 src/dd.c:2114 src/dd.c:2252 -#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:141 +#: 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 #, c-format msgid "cannot fstat %s" msgstr "tiedoston %s tilan lukeminen ei onnistu" @@ -1888,14 +1897,14 @@ msgstr "" 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:1574 src/copy.c:1777 src/copy.c:1935 src/ln.c:314 -#: src/remove.c:267 src/remove.c:293 src/remove.c:444 src/remove.c:465 +#: 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 #, c-format msgid "cannot remove %s" msgstr "tiedostoa %s ei voi poistaa" -#: src/copy.c:886 src/copy.c:1578 src/copy.c:1772 src/copy.c:1940 -#: src/remove.c:418 +#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945 +#: src/remove.c:375 #, c-format msgid "removed %s\n" msgstr "poistettiin tiedosto %s\n" @@ -1915,190 +1924,190 @@ msgstr "tavallisen tiedoston %s luominen ei onnistu" msgid "failed to clone %s from %s" msgstr "tiedoston %s avaaminen epäonnistui" -#: src/copy.c:1098 src/copy.c:2531 +#: src/copy.c:1098 src/copy.c:2541 #, c-format msgid "preserving times for %s" msgstr "säilytettäessä tiedoston %s aikoja" -#: src/copy.c:1170 src/copy.c:1176 src/head.c:855 src/touch.c:175 -#: src/truncate.c:413 -#, c-format -msgid "closing %s" -msgstr "suljettaessa tiedostoa %s" +#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 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:1466 +#: src/copy.c:1471 #, c-format msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? " msgstr "%s: korvataanko tiedosto %s, ohittaen oikeudet %04lo (%s)? " -#: src/copy.c:1473 +#: src/copy.c:1478 #, c-format msgid "%s: overwrite %s? " msgstr "%s: korvataanko tiedosto %s? " -#: src/copy.c:1542 +#: src/copy.c:1547 #, c-format msgid " (backup: %s)" msgstr " (varmuuskopio: %s)" -#: src/copy.c:1552 +#: src/copy.c:1557 #, c-format msgid "failed to restore the default file creation context" msgstr "" -#: src/copy.c:1584 +#: src/copy.c:1589 #, c-format msgid "cannot create hard link %s to %s" msgstr "kovan linkin %s luominen tiedostoon %s ei onnistu" -#: src/copy.c:1637 src/copy.c:1689 src/copy.c:2272 src/copy.c:2589 +#: 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:1220 src/truncate.c:365 +#: src/stat.c:1239 src/truncate.c:363 #, c-format msgid "cannot stat %s" msgstr "tiedoston %s tilaa ei voi lukea" -#: src/copy.c:1645 +#: src/copy.c:1650 #, c-format msgid "omitting directory %s" msgstr "ohitetaan hakemisto %s" -#: src/copy.c:1659 +#: src/copy.c:1664 #, c-format msgid "warning: source file %s specified more than once" msgstr "varoitus: lähdetiedosto %s annettu useammin kuin kerran" -#: src/copy.c:1707 src/ln.c:246 +#: src/copy.c:1712 src/ln.c:246 #, c-format msgid "%s and %s are the same file" msgstr "%s ja %s ovat sama tiedosto" -#: src/copy.c:1806 +#: src/copy.c:1811 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "ei-hakemistoa %s ei voi korvata hakemistolla %s" -#: src/copy.c:1824 src/ln.c:214 +#: src/copy.c:1829 src/ln.c:214 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "ei korvata juuri luotua tiedostoa %s tiedostolla %s" -#: src/copy.c:1842 +#: src/copy.c:1847 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "hakemistoa %s ei voi korvata ei-hakemistolla" -#: src/copy.c:1856 +#: src/copy.c:1861 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "hakemistoa ei voi siirtää ei-hakemistoon: %s -> %s" -#: src/copy.c:1886 +#: src/copy.c:1891 #, 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:1887 +#: src/copy.c:1892 #, 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:1910 src/ln.c:276 +#: src/copy.c:1915 src/ln.c:276 #, c-format msgid "cannot backup %s" msgstr "tiedostoa %s ei voi varmuuskopioida" -#: src/copy.c:1974 +#: src/copy.c:1979 #, 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:2051 +#: src/copy.c:2056 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "hakemistoa, %s, ei voi kopioida itseensä, %s" -#: src/copy.c:2068 +#: src/copy.c:2073 #, c-format msgid "will not create hard link %s to directory %s" msgstr "ei luoda kovaa linkkiä %s hakemistoon %s" -#: src/copy.c:2118 +#: src/copy.c:2123 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "hakemistoa %s ei voi siirtää omaan alihakemistoonsa, %s" -#: src/copy.c:2161 +#: src/copy.c:2166 #, c-format msgid "cannot move %s to %s" msgstr "tiedostoa %s ei voi siirtää kohteeseen %s" -#: src/copy.c:2173 +#: src/copy.c:2178 #, 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:2207 src/install.c:905 src/mkdir.c:189 src/mkfifo.c:114 -#: src/mknod.c:167 +#: 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:2241 +#: src/copy.c:2246 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "kiertävää symbolista linkkiä %s ei voi kopioida" -#: src/copy.c:2350 +#: src/copy.c:2355 #, 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:2357 +#: src/copy.c:2362 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "kohteeseen %2$s ei voi luoda symbolista linkkiä %1$s" -#: src/copy.c:2406 src/mkfifo.c:133 +#: src/copy.c:2416 src/mkfifo.c:132 #, c-format msgid "cannot create fifo %s" msgstr "nimettyä putkea %s ei voi luoda" -#: src/copy.c:2415 +#: src/copy.c:2425 #, c-format msgid "cannot create special file %s" msgstr "erikoistiedostoa %s ei voi luoda" -#: src/copy.c:2426 src/ls.c:3191 src/stat.c:902 +#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921 #, c-format msgid "cannot read symbolic link %s" msgstr "symbolista linkkiä %s ei voi lukea" -#: src/copy.c:2453 +#: src/copy.c:2463 #, c-format msgid "cannot create symbolic link %s" msgstr "symbolisen linkin %s luominen ei onnistu" -#: src/copy.c:2485 +#: src/copy.c:2495 #, c-format msgid "%s has unknown file type" msgstr "tiedostolla %s on tuntematon tiedostotyyppi" -#: src/copy.c:2629 src/ln.c:358 +#: src/copy.c:2644 src/ln.c:358 #, c-format msgid "cannot un-backup %s" msgstr "tiedoston %s varmuuskopion palautus ei onnistu" -#: src/copy.c:2633 +#: src/copy.c:2648 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (varmuuskopion palautus)\n" -#: src/cp.c:156 src/mv.c:284 +#: src/cp.c:156 src/mv.c:286 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -2110,26 +2119,13 @@ msgstr "" " tai: %s [VALITSIN]... -t HAKEMISTO LÄHDE...\n" #: src/cp.c:162 -msgid "" -"Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" -"\n" +#, 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:166 src/csplit.c:1458 src/cut.c:197 src/df.c:852 src/du.c:268 -#: src/expand.c:112 src/fmt.c:275 src/fold.c:75 src/head.c:115 -#: src/install.c:612 src/kill.c:86 src/ln.c:392 src/ls.c:4726 src/mkdir.c:61 -#: src/mkfifo.c:56 src/mknod.c:58 src/mv.c:294 src/nl.c:191 src/paste.c:445 -#: src/pr.c:2777 src/ptx.c:1825 src/shred.c:153 src/shuf.c:58 src/sort.c:399 -#: src/split.c:211 src/stdbuf.c:95 src/tac.c:142 src/tail.c:268 -#: src/touch.c:226 src/truncate.c:107 src/unexpand.c:122 src/uniq.c:145 -msgid "" -"Mandatory arguments to long options are mandatory for short options too.\n" -msgstr "" -"Pitkien valitsinten pakolliset argumentit ovat pakollisia myös lyhyille.\n" - -#: src/cp.c:169 +#: src/cp.c:168 #, fuzzy msgid "" " -a, --archive same as -dR --preserve=all\n" @@ -2151,12 +2147,14 @@ msgstr "" " käytettäessä\n" " -d sama kuin --no-dereference --preserve=links\n" -#: src/cp.c:178 +#: src/cp.c:177 +#, fuzzy msgid "" " -f, --force if an existing destination file cannot be\n" -" opened, remove it and try again (redundant " -"if\n" -" the -n option is used)\n" +" opened, remove it and try again (this " +"option\n" +" is ignored when the -n option is also " +"used)\n" " -i, --interactive prompt before overwrite (overrides a previous " "-n\n" " option)\n" @@ -2171,7 +2169,7 @@ msgstr "" " -H seuraa komentorivillä annettuja LÄHTEEN\n" " symbolisia linkkejä\n" -#: src/cp.c:188 +#: src/cp.c:186 #, fuzzy msgid "" " -l, --link hard link files instead of copying\n" @@ -2180,7 +2178,7 @@ msgstr "" " -l, --link linkitä tiedostot kopioinnin sijaan\n" " -L, --dereference seuraa aina LÄHTEEN symbolisia linkkejä\n" -#: src/cp.c:192 +#: src/cp.c:190 msgid "" " -n, --no-clobber do not overwrite an existing file (overrides\n" " a previous -i option)\n" @@ -2191,7 +2189,7 @@ msgstr "" " -P, --no-dereference älä koskaan seuraa LÄHTEEN symbolisia " "linkkejä\n" -#: src/cp.c:197 +#: src/cp.c:195 #, fuzzy msgid "" " -p same as --preserve=mode,ownership,timestamps\n" @@ -2208,7 +2206,7 @@ msgstr "" "mahdollista,\n" " lisäominaisuudet: links, all\n" -#: src/cp.c:205 +#: src/cp.c:203 msgid "" " --no-preserve=ATTR_LIST don't preserve the specified attributes\n" " --parents use full source file name under DIRECTORY\n" @@ -2216,7 +2214,7 @@ msgstr "" " --no-preserve=OMIN.LUETT älä säilytä annettuja ominaisuuksia\n" " --parents lisää lähdepolku HAKEMISTOon\n" -#: src/cp.c:209 +#: src/cp.c:207 #, fuzzy msgid "" " -R, -r, --recursive copy directories recursively\n" @@ -2230,7 +2228,7 @@ msgstr "" " ennen avausyritystä (vertaa\n" " valitsimeen --force)\n" -#: src/cp.c:215 +#: src/cp.c:213 #, fuzzy msgid "" " --sparse=WHEN control creation of sparse files. See below\n" @@ -2245,7 +2243,7 @@ msgstr "" " perästä\n" # parempi suomennos overridelle kuin "kumoa"? -#: src/cp.c:220 +#: src/cp.c:218 msgid "" " -s, --symbolic-link make symbolic links instead of copying\n" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -2259,7 +2257,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:226 +#: src/cp.c:224 msgid "" " -u, --update copy only when the SOURCE file is newer\n" " than the destination file or when the\n" @@ -2273,7 +2271,7 @@ msgstr "" " -v, --verbose selitä mitä tapahtuu\n" " -x, --one-file-system pysy tässä tiedostojärjestelmässä\n" -#: src/cp.c:235 +#: src/cp.c:233 #, fuzzy msgid "" "\n" @@ -2298,7 +2296,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:247 src/install.c:649 src/ln.c:421 src/mv.c:321 +#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322 #, fuzzy msgid "" "\n" @@ -2315,7 +2313,7 @@ msgstr "" "ovat seuraavat:\n" "\n" -#: src/cp.c:254 src/install.c:656 src/mv.c:328 +#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329 msgid "" " none, off never make backups (even if --backup is given)\n" " numbered, t make numbered backups\n" @@ -2328,7 +2326,7 @@ msgstr "" "yksinkertaisia\n" " simple, never tee aina yksinkertaisia varmuuskopiota\n" -#: src/cp.c:260 +#: src/cp.c:258 msgid "" "\n" "As a special case, cp makes a backup of SOURCE when the force and backup\n" @@ -2340,92 +2338,92 @@ msgstr "" "valitsimet on annettu, ja LÄHDE ja KOHDE ovat sama nimi olemassaolevalle\n" "tavalliselle tiedostolle.\n" -#: src/cp.c:319 +#: src/cp.c:317 #, c-format msgid "failed to preserve times for %s" msgstr "tiedoston %s aikojen säilyttäminen ei onnistu" -#: src/cp.c:350 +#: src/cp.c:348 #, c-format msgid "failed to preserve permissions for %s" msgstr "tiedoston %s oikeuksien säilyttäminen ei onnistu" -#: src/cp.c:477 +#: src/cp.c:475 #, c-format msgid "cannot make directory %s" msgstr "hakemiston %s luominen ei onnistu" -#: src/cp.c:526 src/cp.c:545 +#: src/cp.c:524 src/cp.c:543 #, c-format msgid "%s exists but is not a directory" msgstr "%s on olemassa, mutta ei ole hakemisto" -#: src/cp.c:572 src/cp.c:1068 src/install.c:401 src/install.c:844 src/ln.c:123 -#: src/ln.c:181 src/ln.c:202 src/ln.c:516 src/mv.c:152 src/mv.c:399 -#, c-format -msgid "accessing %s" -msgstr "käytetään tiedostoa %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 +#, fuzzy, c-format +msgid "failed to access %s" +msgstr "tiedoston %s avaaminen epäonnistui" -#: src/cp.c:592 src/install.c:914 src/ln.c:546 src/mv.c:432 src/shred.c:1182 -#: src/touch.c:433 src/truncate.c:356 +#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181 +#: src/touch.c:429 src/truncate.c:354 #, c-format msgid "missing file operand" msgstr "puuttuva tiedosto-operandi" -#: src/cp.c:594 src/install.c:916 src/ln.c:560 src/mv.c:434 +#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436 #, fuzzy, c-format msgid "missing destination file operand after %s" msgstr "puuttuva kohdetiedosto" -#: src/cp.c:603 src/install.c:925 src/mv.c:443 +#: src/cp.c:601 src/install.c:926 src/mv.c:445 #, 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:619 src/cp.c:1070 src/install.c:403 src/install.c:846 -#: src/install.c:938 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:401 -#: src/mv.c:457 +#: 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 #, c-format msgid "target %s is not a directory" msgstr "kohde %s ei ole hakemisto" -#: src/cp.c:730 +#: src/cp.c:728 #, fuzzy, c-format msgid "with --parents, the destination must be a directory" msgstr "polkuja säilytettäessä kohteen on oltava hakemisto" -#: src/cp.c:1063 src/install.c:839 src/ln.c:511 src/mv.c:394 +#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395 #, fuzzy, c-format msgid "multiple target directories specified" msgstr "useita tulostiedostoja annettu" -#: src/cp.c:1108 +#: src/cp.c:1110 #, c-format msgid "cannot make both hard and symbolic links" msgstr "linkit eivät voi olla sekä kovia että symbolisia" -#: src/cp.c:1115 src/mv.c:464 +#: src/cp.c:1117 src/mv.c:466 #, fuzzy, c-format msgid "options --backup and --no-clobber are mutually exclusive" msgstr "valitsimet --string ja --check ovat toisensa poissulkevia" -#: src/cp.c:1121 +#: src/cp.c:1123 #, c-format msgid "--reflink can be used only with --sparse=auto" msgstr "" -#: src/cp.c:1129 src/install.c:899 src/ln.c:582 src/mv.c:472 +#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474 msgid "backup type" msgstr "varmuuskopiotyyppi" -#: src/cp.c:1154 +#: src/cp.c:1156 #, c-format msgid "cannot preserve security context without an SELinux-enabled kernel" msgstr "" -#: src/cp.c:1160 +#: src/cp.c:1162 #, c-format msgid "cannot preserve extended attributes, cp is built without xattr support" msgstr "" @@ -2435,138 +2433,137 @@ msgstr "" msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:529 +#: src/csplit.c:531 #, c-format msgid "input disappeared" msgstr "syöte katosi" -#: src/csplit.c:658 src/csplit.c:669 +#: src/csplit.c:660 src/csplit.c:671 #, c-format msgid "%s: line number out of range" msgstr "%s: rivinumero sallitun välin ulkopuolella" -#: src/csplit.c:698 +#: src/csplit.c:700 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: rivinumero sallitun välin ulkopuolella" -#: src/csplit.c:701 src/csplit.c:750 +#: src/csplit.c:703 src/csplit.c:752 #, c-format msgid " on repetition %s\n" msgstr " kierroksella %s\n" -#: src/csplit.c:744 +#: src/csplit.c:746 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: täsmäävyyttä ei löydy" -#: src/csplit.c:808 src/csplit.c:848 src/nl.c:359 src/tac.c:274 +#: src/csplit.c:810 src/csplit.c:850 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:981 +#: src/csplit.c:983 #, c-format msgid "write error for %s" msgstr "virhe kirjoitettaessa tiedostoa %s" -#: src/csplit.c:1057 +#: src/csplit.c:1059 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: rajoittimen jälkeen odotetaan kokonaislukua" -#: src/csplit.c:1073 +#: src/csplit.c:1075 #, fuzzy, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: toistomäärässä tarvitaan merkki ”}”" -#: src/csplit.c:1083 +#: src/csplit.c:1085 #, fuzzy, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: merkkien ”{” ja ”}” väliin tarvitaan kokonaisluku" -#: src/csplit.c:1110 +#: src/csplit.c:1112 #, fuzzy, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: sulkeva rajoitin ”%c” puuttuu" -#: src/csplit.c:1127 +#: src/csplit.c:1129 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: virheellinen säännöllinen lauseke: %s" -#: src/csplit.c:1160 +#: src/csplit.c:1162 #, c-format msgid "%s: invalid pattern" msgstr "%s: virheellinen hahmo" -#: src/csplit.c:1163 +#: src/csplit.c:1165 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: rivinumeron on oltava suurempi kuin nolla" -#: src/csplit.c:1169 +#: src/csplit.c:1171 #, 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:1175 +#: src/csplit.c:1177 #, 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:1253 +#: src/csplit.c:1255 #, c-format msgid "missing conversion specifier in suffix" msgstr "puuttuva muunnostarkennin jälkiliitteessä" -#: src/csplit.c:1259 +#: src/csplit.c:1261 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "virheellinen muunnostarkennin jälkiliitteessä: %c" -#: src/csplit.c:1262 +#: src/csplit.c:1264 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "virheellinen muunnostarkennin jälkiliitteessä: \\%.3o" -#: src/csplit.c:1267 +#: src/csplit.c:1269 #, fuzzy, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "%s: virheellinen kenttämääritys \"%s\"" -#: src/csplit.c:1284 +#: src/csplit.c:1286 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "liian monta %%-muunnosmääritystä jälkiliitteessä" -#: src/csplit.c:1298 +#: src/csplit.c:1300 #, c-format msgid "missing %% conversion specification in suffix" msgstr "puuttuva %%-muunnosmääritys jälkiliitteessä" -#: src/csplit.c:1345 +#: src/csplit.c:1347 #, c-format msgid "%s: invalid number" msgstr "%s: virheellinen luku" -#: src/csplit.c:1449 +#: src/csplit.c:1451 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Käyttö: %s [VALITSIN]... TIEDOSTO HAHMO...\n" -#: src/csplit.c:1453 +#: src/csplit.c:1455 #, 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" -"\n" msgstr "" "Tulosta TIEDOSTOn osia HAHMO(i)lla erotettuina tiedostoihin ”xx01”,\n" "”xx02”, ..., ja tulosta kunkin osan tavumäärä vakiotulosteeseen.\n" "\n" -#: src/csplit.c:1461 +#: src/csplit.c:1462 #, fuzzy, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2577,7 +2574,7 @@ msgstr "" " -f, --prefix=ETULIITE käytä ETULIITEttä ”xx”:n sijaan\n" " -k, --keep-files älä poista tulostiedostoja virhetilanteessa\n" -#: src/csplit.c:1466 +#: src/csplit.c:1467 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" @@ -2587,7 +2584,7 @@ msgstr "" " -s, --quiet, --silent älä tulosta tulostiedostojen kokoja\n" " -z, --elide-empty-files poista tyhjät tulostiedostot\n" -#: src/csplit.c:1473 +#: src/csplit.c:1474 msgid "" "\n" "Read standard input if FILE is -. Each PATTERN may be:\n" @@ -2595,7 +2592,7 @@ msgstr "" "\n" "Lue vakiosyötettä jos TIEDOSTO on -. Kukin HAHMO voi olla:\n" -#: src/csplit.c:1477 +#: src/csplit.c:1478 #, fuzzy msgid "" "\n" @@ -2623,7 +2620,7 @@ msgstr "" msgid "David M. Ihnat" msgstr "David M. Ihnat" -#: src/cut.c:64 +#: src/cut.c:64 src/cut.c:372 msgid "fields and positions are numbered from 1" msgstr "" @@ -2633,14 +2630,13 @@ msgid "Usage: %s OPTION... [FILE]...\n" msgstr "Käyttö: %s VALITSIN... [TIEDOSTO]...\n" #: src/cut.c:193 -msgid "" -"Print selected parts of lines from each FILE to standard output.\n" -"\n" +#, 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:200 +#: src/cut.c:199 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2650,7 +2646,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:205 +#: src/cut.c:204 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2662,7 +2658,7 @@ msgstr "" " annettu\n" " -n (ei huomioida)\n" -#: src/cut.c:211 +#: src/cut.c:210 #, fuzzy msgid "" " --complement complement the set of selected bytes, characters\n" @@ -2671,7 +2667,7 @@ msgstr "" " --verbose tulosta ilmoitus vakiovirhetulosteeseen juuri\n" " ennen kunkin tulostiedoston avaamista\n" -#: src/cut.c:215 +#: src/cut.c:214 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2681,7 +2677,7 @@ msgstr "" " --output-delimiter=MERKKIJ käytä MERKKIJonoa tulosteen rajoittimena\n" " oletus on käyttää syötteen rajoitinta\n" -#: src/cut.c:222 +#: src/cut.c:221 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2693,7 +2689,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:228 +#: src/cut.c:227 msgid "" "Each range is one of:\n" "\n" @@ -2715,47 +2711,49 @@ msgstr "" "\n" "Jos TIEDOSTOa ei ole annettu, tai se on ”-”, luetaan vakiosyötettä.\n" -#: src/cut.c:368 src/cut.c:489 -msgid "invalid byte or field list" +#: src/cut.c:367 src/cut.c:493 +#, fuzzy +msgid "invalid byte, character or field list" msgstr "virheellinen tavu- tai kenttälista" -#: src/cut.c:385 +#: src/cut.c:387 #, fuzzy msgid "invalid range with no endpoint: -" msgstr "virheellinen leveysvalitsin: %s" -#: src/cut.c:399 +#: src/cut.c:403 #, fuzzy msgid "invalid decreasing range" msgstr "virheellinen leveys: %s" -#: src/cut.c:478 +#: src/cut.c:482 #, c-format msgid "byte offset %s is too large" msgstr "tavusiirtymä %s on liian suuri" -#: src/cut.c:481 +#: src/cut.c:485 #, c-format msgid "field number %s is too large" msgstr "kenttänumero %s on liian suuri" -#: src/cut.c:789 src/cut.c:797 +#: src/cut.c:795 src/cut.c:803 msgid "only one type of list may be specified" msgstr "voidaan antaa vain yhden tyyppinen luettelo" -#: src/cut.c:806 +#: src/cut.c:812 src/numfmt.c:1408 +#, c-format msgid "the delimiter must be a single character" msgstr "rajoittimen on oltava yksittäinen merkki" -#: src/cut.c:841 +#: src/cut.c:847 msgid "you must specify a list of bytes, characters, or fields" msgstr "on annettava luettelo tavuista, merkeistä tai kentistä" -#: src/cut.c:844 +#: src/cut.c:850 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:848 +#: src/cut.c:854 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2763,11 +2761,11 @@ msgstr "" "ei-rajoitettujen rivien vaiennus on mahdollista\n" "\tvain käsiteltäessä kenttiä" -#: src/cut.c:864 +#: src/cut.c:870 msgid "missing list of fields" msgstr "kenttälista puuttuu" -#: src/cut.c:866 +#: src/cut.c:872 msgid "missing list of positions" msgstr "sijaintilista puuttuu" @@ -2781,10 +2779,12 @@ msgstr "" " tai: %s [-u|--utc|--universal] [KKPPttmm[[CC]VV][.ss]]\n" #: src/date.c:128 +msgid "Display the current time in the given FORMAT, or set the system date.\n" +msgstr "" + +#: src/date.c:134 #, 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" " -I[TIMESPEC], --iso-8601[=TIMESPEC] output date/time in ISO 8601 format.\n" @@ -2808,7 +2808,7 @@ msgstr "" " --iso-8601 ilman AIKAMÄÄREttä olettaa \"date\":" "n.\n" -#: src/date.c:138 +#: src/date.c:142 msgid "" " -r, --reference=FILE display the last modification time of FILE\n" " -R, --rfc-2822 output date and time in RFC 2822 format.\n" @@ -2818,7 +2818,7 @@ msgstr "" " -R, --rfc-822 näytä päiväys ja aika RFC-822-muodossa.\n" " Esimerkki: Mon, 07 Aug 2006 12:34:56 +0300\n" -#: src/date.c:143 +#: src/date.c:147 #, fuzzy msgid "" " --rfc-3339=TIMESPEC output date and time in RFC 3339 format.\n" @@ -2832,7 +2832,7 @@ msgstr "" " -s, --set=MERKKIJONO aseta MERKKIJONOn määräämä aika\n" " -u, --utc, --universal näytä tai aseta UTC-aika\n" -#: src/date.c:154 +#: src/date.c:158 #, fuzzy msgid "" "\n" @@ -2848,7 +2848,7 @@ msgstr "" " %% %-merkki\n" " %a maa-asetuksen lyhyt viikonpäivän nimi (ma-su)\n" -#: src/date.c:161 +#: src/date.c:165 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2862,7 +2862,7 @@ msgstr "" " %c maa-asetuksen päivämäärä ja aika (esim. la 3. maaliskuuta 2005 " "23:05:25)\n" -#: src/date.c:167 +#: src/date.c:171 #, fuzzy msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" @@ -2875,7 +2875,7 @@ msgstr "" " %D päivämäärä amerikkalaisessa muodossa; sama kuin %m/%d/%y\n" " %e kuukauden päivä, välilyöntitäyttö; sama kuin %_d\n" -#: src/date.c:173 +#: src/date.c:177 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -2885,7 +2885,7 @@ msgstr "" " %g ISO-viikkonumeron vuoden kaksi viimeistä numeroa (ks. %G)\n" " %G ISO-viikkonumeron vuosi (ks. %V); käytetään yleensä vain %V:n kanssa\n" -#: src/date.c:178 +#: src/date.c:182 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2897,7 +2897,7 @@ msgstr "" " %I tunti (01-12)\n" " %j vuoden päivä (001-366)\n" -#: src/date.c:184 +#: src/date.c:188 #, fuzzy msgid "" " %k hour, space padded ( 0..23); same as %_H\n" @@ -2910,7 +2910,7 @@ msgstr "" " %m kuukausi (01-12)\n" " %M minuutti (00-59)\n" -#: src/date.c:190 +#: src/date.c:194 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2928,7 +2928,7 @@ msgstr "" " %R 24-tuntinen tunti ja minuutti; sama kuin %H:%M\n" " %s sekuntimäärä ajanhetkestä 1970-01-01 00:00:00 UTC\n" -#: src/date.c:199 +#: src/date.c:203 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2940,7 +2940,7 @@ msgstr "" " %T aika; sama kuin %H:%M:%S\n" " %u viikonpäivä (1–7); 1 on maanantai\n" -#: src/date.c:205 +#: src/date.c:209 msgid "" " %U week number of year, with Sunday as first day of week (00..53)\n" " %V ISO week number, with Monday as first day of week (01..53)\n" @@ -2952,7 +2952,7 @@ msgstr "" " %w viikonpäivä (0–6); 0 on sunnuntai\n" " %W viikon numero, maanantai viikon ensimmäinen päivä (00–53)\n" -#: src/date.c:211 +#: src/date.c:215 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -2964,7 +2964,7 @@ msgstr "" " %y vuosiluvun kaksi viimeistä numeroa (00­–99)\n" " %Y vuosiluku\n" -#: src/date.c:217 +#: src/date.c:221 #, fuzzy msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" @@ -2985,7 +2985,7 @@ msgstr "" "\n" "Kentät täytetään normaalisti etunollilla.\n" -#: src/date.c:226 +#: src/date.c:230 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -2996,7 +2996,7 @@ msgid "" " # use opposite case if possible\n" msgstr "" -#: src/date.c:235 +#: src/date.c:239 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -3005,7 +3005,7 @@ msgid "" "O to use the locale's alternate numeric symbols if available.\n" msgstr "" -#: src/date.c:242 +#: src/date.c:246 msgid "" "\n" "Examples:\n" @@ -3019,35 +3019,35 @@ msgid "" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:275 src/dd.c:2193 src/head.c:838 src/md5sum.c:477 -#: src/md5sum.c:798 src/od.c:863 src/od.c:1914 src/pr.c:1176 src/pr.c:1372 -#: src/pr.c:1494 src/stty.c:842 src/tac.c:563 src/tail.c:343 src/tee.c:126 +#: 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 #, c-format msgid "standard input" msgstr "vakiosyöte" -#: src/date.c:303 src/date.c:523 +#: src/date.c:307 src/date.c:527 #, c-format msgid "invalid date %s" msgstr "virheellinen päiväys %s" -#: src/date.c:414 src/date.c:448 +#: src/date.c:418 src/date.c:452 #, c-format msgid "multiple output formats specified" msgstr "useita tulostusmuotoja annettu" -#: src/date.c:426 +#: src/date.c:430 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "päiväyksen tulostusta määräävät valitsimet ovat toisensa poissulkevia" -#: src/date.c:433 +#: src/date.c:437 #, c-format msgid "the options to print and set the time may not be used together" msgstr "ajan tulostus- ja asetusvalitsimia ei saa käyttää yhtä aikaa" -#: src/date.c:454 +#: src/date.c:458 #, fuzzy, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -3058,23 +3058,23 @@ msgstr "" "käytettäessä valitsinta päiväyksen antamiseen täytyy valitsinten,\n" "jotka eivät ole argumentteja, olla ”+”-alkuisia muotoilumerkkijonoja." -#: src/date.c:531 +#: src/date.c:535 #, c-format msgid "cannot set date" msgstr "ajan asetus ei onnistu" -#: src/date.c:554 src/du.c:360 +#: src/date.c:558 src/du.c:371 #, c-format msgid "time %s is out of range" msgstr "aika %s on sallitun välin ulkopuolella" #. This is a proper name. See the gettext manual, section Names. -#: src/dd.c:44 src/factor.c:43 src/rm.c:41 src/tail.c:69 src/touch.c:41 +#: 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 "Paul Rubin" -#: src/dd.c:517 +#: src/dd.c:521 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3083,7 +3083,7 @@ msgstr "" "Käyttö: %s [OPERANDI]...\n" " tai: %s VALITSIN\n" -#: src/dd.c:522 +#: src/dd.c:526 #, fuzzy msgid "" "Copy a file, converting and formatting according to the operands.\n" @@ -3103,7 +3103,7 @@ msgstr "" " count=LOHKOT kopioi vain LOHKOT-arvon verran lohkoja\n" " ibs=MÄÄRÄ lue MÄÄRÄ tavua kerralla\n" -#: src/dd.c:531 +#: src/dd.c:535 #, fuzzy msgid "" " if=FILE read from FILE instead of stdin\n" @@ -3113,7 +3113,8 @@ msgid "" " oflag=FLAGS write as per the comma separated symbol list\n" " seek=N skip N obs-sized blocks at start of output\n" " skip=N skip N ibs-sized blocks at start of input\n" -" status=noxfer suppress transfer statistics\n" +" status=WHICH WHICH info to suppress outputting to stderr;\n" +" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" msgstr "" " if=TIEDOSTO lue TIEDOSTOsta vakiosyötteen sijaan\n" " obs=MÄÄRÄ kirjoita MÄÄRÄ tavua kerralla\n" @@ -3121,10 +3122,11 @@ 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:541 +#: src/dd.c:546 +#, fuzzy msgid "" "\n" -"BLOCKS and BYTES may be followed by the following multiplicative suffixes:\n" +"N and BYTES may be followed by the following multiplicative suffixes:\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, and so on for T, P, E, Z, Y.\n" "\n" @@ -3139,7 +3141,7 @@ msgstr "" "Kukin MUUNNOS voi olla:\n" "\n" -#: src/dd.c:550 +#: src/dd.c:555 #, fuzzy msgid "" " ascii from EBCDIC to ASCII\n" @@ -3168,7 +3170,7 @@ msgstr "" "käytettäessä\n" " avainsanaa block tai unblock, tasataan välilyönneillä\n" -#: src/dd.c:563 +#: src/dd.c:568 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3184,7 +3186,7 @@ msgstr "" " fdatasync physically write output file data before finishing\n" " fsync likewise, but also write metadata\n" -#: src/dd.c:571 +#: src/dd.c:576 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3193,76 +3195,76 @@ msgid "" "suggested)\n" msgstr "" -#: src/dd.c:578 +#: src/dd.c:583 msgid " cio use concurrent I/O for data\n" msgstr "" -#: src/dd.c:580 +#: src/dd.c:585 msgid " direct use direct I/O for data\n" msgstr "" -#: src/dd.c:582 +#: src/dd.c:587 #, fuzzy msgid " directory fail unless a directory\n" msgstr "kohdehakemisto ei ole sallittu asennettaessa hakemistoa" -#: src/dd.c:584 +#: src/dd.c:589 msgid " dsync use synchronized I/O for data\n" msgstr "" -#: src/dd.c:586 +#: src/dd.c:591 msgid " sync likewise, but also for metadata\n" msgstr "" -#: src/dd.c:587 +#: src/dd.c:592 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr "" -#: src/dd.c:590 +#: src/dd.c:595 msgid " nonblock use non-blocking I/O\n" msgstr "" -#: src/dd.c:592 +#: src/dd.c:597 msgid " noatime do not update access time\n" msgstr "" -#: src/dd.c:595 +#: src/dd.c:600 msgid " nocache discard cached data\n" msgstr "" -#: src/dd.c:598 +#: src/dd.c:603 msgid " noctty do not assign controlling terminal from file\n" msgstr "" -#: src/dd.c:601 +#: src/dd.c:606 msgid " nofollow do not follow symlinks\n" msgstr "" -#: src/dd.c:603 +#: src/dd.c:608 msgid " nolinks fail if multiply-linked\n" msgstr "" -#: src/dd.c:605 +#: src/dd.c:610 msgid " binary use binary I/O for data\n" msgstr "" -#: src/dd.c:607 +#: src/dd.c:612 msgid " text use text I/O for data\n" msgstr "" -#: src/dd.c:609 +#: src/dd.c:614 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:612 +#: src/dd.c:617 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:615 +#: src/dd.c:620 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:620 +#: src/dd.c:625 #, fuzzy, c-format msgid "" "\n" @@ -3291,7 +3293,7 @@ msgstr "" "Valitsimet ovat:\n" "\n" -#: src/dd.c:676 +#: src/dd.c:683 #, c-format msgid "" "%<PRIuMAX>+%<PRIuMAX> records in\n" @@ -3300,21 +3302,21 @@ msgstr "" "%<PRIuMAX>+%<PRIuMAX> tietuetta sisään\n" "%<PRIuMAX>+%<PRIuMAX> tietuetta ulos\n" -#: src/dd.c:682 +#: src/dd.c:689 #, 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:694 +#: src/dd.c:701 #, 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:712 +#: src/dd.c:720 msgid "Infinity B" msgstr "" @@ -3328,86 +3330,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:725 +#: src/dd.c:733 #, c-format msgid ", %g s, %s/s\n" msgstr " %g sekunnissa, %s/s\n" -#: src/dd.c:804 +#: src/dd.c:812 #, c-format msgid "closing input file %s" msgstr "suljetaan syötetiedosto %s" -#: src/dd.c:811 +#: src/dd.c:819 #, c-format msgid "closing output file %s" msgstr "suljetaan tulostiedosto %s" -#: src/dd.c:1014 +#: src/dd.c:1022 #, fuzzy, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "siirtyminen hakemistoon %s epäonnistui" -#: src/dd.c:1085 src/dd.c:1934 +#: src/dd.c:1093 src/dd.c:1942 #, c-format msgid "writing to %s" msgstr "kirjoitettaessa tiedostoon %s" -#: src/dd.c:1199 src/dd.c:1253 +#: src/dd.c:1207 src/dd.c:1261 #, c-format msgid "unrecognized operand %s" msgstr "tunnistamaton operandi %s" -#: src/dd.c:1210 +#: src/dd.c:1218 msgid "invalid conversion" msgstr "virheellinen muunnos" -#: src/dd.c:1213 src/dd.c:1289 +#: src/dd.c:1221 src/dd.c:1297 #, fuzzy msgid "invalid input flag" msgstr "virheellinen leveys: %s" -#: src/dd.c:1216 src/dd.c:1283 src/dd.c:1295 +#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303 #, fuzzy msgid "invalid output flag" msgstr "virheellinen ryhmänimi %s" -#: src/dd.c:1219 +#: src/dd.c:1227 #, fuzzy msgid "invalid status flag" msgstr "virheellinen päiväyksen muoto %s" -#: src/dd.c:1258 src/truncate.c:312 +#: src/dd.c:1266 src/truncate.c:310 #, c-format msgid "invalid number %s" msgstr "virheellinen määrä %s" -#: src/dd.c:1340 +#: src/dd.c:1348 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "" -#: src/dd.c:1342 +#: src/dd.c:1350 #, fuzzy, c-format msgid "cannot combine block and unblock" msgstr "sekä käyttäjää että ryhmää ei voi jättää antamatta" -#: src/dd.c:1344 +#: src/dd.c:1352 #, fuzzy, c-format msgid "cannot combine lcase and ucase" msgstr "tiedostonimiä %s ja %s ei voi vertailla" -#: src/dd.c:1346 +#: src/dd.c:1354 #, fuzzy, c-format msgid "cannot combine excl and nocreat" msgstr "signaalin yhdistäminen valitsimen -l tai -t kanssa ei onnistu" -#: src/dd.c:1349 +#: src/dd.c:1357 #, fuzzy, c-format msgid "cannot combine direct and nocache" msgstr "signaalin yhdistäminen valitsimen -l tai -t kanssa ei onnistu" -#: src/dd.c:1506 +#: src/dd.c:1514 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3416,156 +3418,178 @@ msgstr "" "varoitus: ohitetaan ytimen lseek-ohjelmistovika tiedostolle (%s)\n" " mt_type=0x%0lx – katso tyyppien luettelo tiedostosta <sys/mtio.h>" -#: src/dd.c:1593 +#: src/dd.c:1601 #, fuzzy, c-format msgid "%s: cannot skip" msgstr "%s: ei voi poistaa" -#: src/dd.c:1595 src/dd.c:1614 src/dd.c:1675 +#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683 #, fuzzy, c-format msgid "%s: cannot seek" msgstr "%s: ei voi poistaa" -#: src/dd.c:1655 +#: src/dd.c:1663 #, c-format msgid "offset overflow while reading file %s" msgstr "" -#: src/dd.c:1667 +#: src/dd.c:1675 #, fuzzy, c-format msgid "warning: invalid file offset after failed read" msgstr "varoitus: lähdetiedosto %s annettu useammin kuin kerran" -#: src/dd.c:1671 +#: src/dd.c:1679 #, c-format msgid "cannot work around kernel bug after all" msgstr "" -#: src/dd.c:1814 +#: src/dd.c:1822 #, fuzzy, c-format msgid "setting flags for %s" msgstr "asetettaessa tiedoston %s lippuja" -#: src/dd.c:1867 +#: src/dd.c:1875 #, c-format msgid "memory exhausted by input buffer of size %zu bytes (%s)" msgstr "" -#: src/dd.c:1881 +#: src/dd.c:1889 #, c-format msgid "memory exhausted by output buffer of size %zu bytes (%s)" msgstr "" -#: src/dd.c:1914 +#: src/dd.c:1922 #, fuzzy, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: siirtyminen suhteelliseen siirtymään %s ei onnistu" -#: src/dd.c:2125 src/dd.c:2258 +#: src/dd.c:2133 #, fuzzy, c-format -msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" +msgid "failed to truncate to %<PRIdMAX> bytes in output file %s" msgstr "edetään %s tavun yli tulostiedostossa %s" -#: src/dd.c:2138 +#: src/dd.c:2146 #, c-format msgid "fdatasync failed for %s" msgstr "" -#: src/dd.c:2148 +#: src/dd.c:2156 #, fuzzy, c-format msgid "fsync failed for %s" msgstr "tiedoston %s avaaminen epäonnistui" -#: src/dd.c:2199 src/dd.c:2228 +#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165 #, c-format -msgid "opening %s" -msgstr "tiedoston %s avaaminen" +msgid "failed to open %s" +msgstr "tiedoston %s avaaminen epäonnistui" -#: src/dd.c:2237 +#: src/dd.c:2246 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) " "blocks" msgstr "" -#: src/dd.c:2274 src/dd.c:2280 +#: src/dd.c:2267 +#, 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 #, 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:54 src/expr.c:153 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:39 src/sleep.c:35 src/sort.c:66 +#: 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 msgid "Paul Eggert" msgstr "Paul Eggert" -#: src/df.c:140 +#: src/df.c:172 msgid "Filesystem" msgstr "Tiedostojärjestelmä" -#: src/df.c:141 +#: src/df.c:175 msgid "Type" msgstr "Tyyppi" -#: src/df.c:142 +#: src/df.c:178 src/df.c:542 msgid "blocks" msgstr "lohkot" -#: src/df.c:142 -msgid "Inodes" -msgstr "I-solmut" - -#: src/df.c:142 -msgid "Size" -msgstr "Koko" - -#: src/df.c:143 +#: src/df.c:181 msgid "Used" msgstr "Käyt" -#: src/df.c:143 -msgid "IUsed" -msgstr "IKäyt" - -#: src/df.c:144 +#: src/df.c:184 msgid "Available" msgstr "Vapaana" -#: src/df.c:144 -msgid "IFree" -msgstr "IJälj" - -#: src/df.c:144 -msgid "Avail" -msgstr "Vapaa" - -#: src/df.c:145 +#: src/df.c:187 msgid "Use%" msgstr "Käy%" -#: src/df.c:145 +#: src/df.c:190 +msgid "Inodes" +msgstr "I-solmut" + +#: src/df.c:193 +msgid "IUsed" +msgstr "IKäyt" + +#: src/df.c:196 +msgid "IFree" +msgstr "IJälj" + +#: src/df.c:199 msgid "IUse%" msgstr "IKäy%" -#: src/df.c:145 +#: src/df.c:202 +msgid "Mounted on" +msgstr "Liitospiste" + +#: src/df.c:383 +#, c-format +msgid "option --output: field '%s' unknown" +msgstr "" + +#: src/df.c:390 +#, fuzzy, c-format +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 +msgid "Size" +msgstr "Koko" + +#: src/df.c:414 src/df.c:451 +msgid "Avail" +msgstr "Vapaa" + +#: src/df.c:474 msgid "Capacity" msgstr "Käytetty" -#: src/df.c:146 -msgid "Mounted on" -msgstr "Liitospiste" +#. 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 +#, c-format +msgid "%s-%s" +msgstr "" -#: src/df.c:847 +#: src/df.c:1210 +#, fuzzy msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" -"\n" msgstr "" "Näytä tietoja tiedostojärjestelmästä, jolla kukin TIEDOSTO sijaitsee,\n" "tai oletuksena kaikista tiedostojärjestelmistä.\n" "\n" -#: src/df.c:855 +#: src/df.c:1217 #, fuzzy msgid "" " -a, --all include dummy file systems\n" @@ -3583,7 +3607,7 @@ msgstr "" "2G)\n" " -H, --si sama kuin edellä, mutta monikerta on 1000, ei 1024\n" -#: src/df.c:865 +#: src/df.c:1227 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3597,8 +3621,12 @@ msgstr "" " --no-sync älä kutsu synciä ennen tilatietojen selvittämistä " "(oletus)\n" -#: src/df.c:872 +#: src/df.c:1234 +#, fuzzy msgid "" +" --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" +" or print all fields if FIELD_LIST is " +"omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" " -t, --type=TYPE limit listing to file systems of type TYPE\n" @@ -3615,20 +3643,42 @@ msgstr "" "muunTYYPPIsiin\n" " -v (ei huomioida)\n" -#: src/df.c:1027 +#: src/df.c:1248 +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" +msgstr "" + +#: src/df.c:1285 +#, 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 #, 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:1075 +#: src/df.c:1500 msgid "Warning: " msgstr "Varoitus: " -#: src/df.c:1077 src/stat.c:795 +#: src/df.c:1502 src/stat.c:814 msgid "cannot read table of mounted file systems" msgstr "liitettyjen tiedostojärjestelmien taulua ei voi lukea" -#: src/df.c:1107 +#: src/df.c:1539 #, c-format msgid "no file systems processed" msgstr "" @@ -3741,7 +3791,7 @@ msgstr "" " %s /usr/bin/sort Tuloste: ”/usr/bin”.\n" " %s stdio.h Tuloste: ”.”.\n" -#: src/du.c:260 src/sort.c:390 src/wc.c:112 +#: src/du.c:270 src/sort.c:394 src/wc.c:112 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3750,18 +3800,19 @@ msgstr "" "Käyttö: %s [VALITSIN]... [TIEDOSTO]...\n" " tai: %s [VALITSIN]... --files0-from=T\n" -#: src/du.c:264 -msgid "" -"Summarize disk usage of each FILE, recursively for directories.\n" -"\n" +#: src/du.c:274 +#, fuzzy +msgid "Summarize disk usage of each FILE, recursively for directories.\n" msgstr "" "Tee yhteenveto kunkin TIEDOSTOn levytilan käytöstä, hakemistoille\n" "rekursiivisesti.\n" "\n" -#: src/du.c:271 +#: src/du.c:280 #, fuzzy msgid "" +" -0, --null end each output line with 0 byte rather than " +"newline\n" " -a, --all write counts for all files, not just directories\n" " --apparent-size print apparent sizes, rather than disk usage; " "although\n" @@ -3778,7 +3829,7 @@ msgstr "" "pirstoutumisesta,\n" " epäsuorista lohkoista, ym.\n" -#: src/du.c:279 +#: src/du.c:289 #, fuzzy msgid "" " -B, --block-size=SIZE scale sizes by SIZE before printing them. E.g.,\n" @@ -3788,6 +3839,11 @@ msgid "" " -c, --total produce a grand total\n" " -D, --dereference-args dereference only symlinks that are listed on the\n" " command line\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 "" " -B, --block-size=KOKO käytä KOKO-tavuisia lohkoja\n" " -b, --bytes sama kuin ”--apparent-size --block-size=1”\n" @@ -3795,7 +3851,8 @@ msgstr "" " -D, --dereference-args laske mukaan vain komentorivillä annettujen\n" " symlinkkien kohteiden koot\n" -#: src/du.c:288 +#: src/du.c:302 +#, fuzzy msgid "" " --files0-from=F summarize disk usage of the NUL-terminated file\n" " names specified in file F;\n" @@ -3803,7 +3860,6 @@ msgid "" " -H equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" --si like -h, but use powers of 1000 not 1024\n" msgstr "" " --files0-from=T tee yhteenveto tiedostossa T annetuista\n" " NUL-päätetyistä tiedostonimistä;\n" @@ -3813,9 +3869,11 @@ msgstr "" "2G)\n" " --si sama kuin -h, mutta monikerta on 1000, ei 1024\n" -#: src/du.c:297 +#: src/du.c:310 +#, fuzzy 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 "" @@ -3823,14 +3881,13 @@ msgstr "" " -l, --count-links laske kovien linkkien koot monta kertaa\n" " -m sama kuin --block-size=1M\n" -#: src/du.c:302 +#: src/du.c:316 +#, fuzzy msgid "" -" -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " "default)\n" -" -0, --null end each output line with 0 byte rather than " -"newline\n" " -S, --separate-dirs 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 seuraa kaikkia symbolisia linkkejä\n" @@ -3841,32 +3898,11 @@ msgstr "" " -S, --separate-dirs älä laske mukaan alihakemistojen kokoa\n" " -s, --summarize näytä vain kokonaismäärä jokaiselle argumentille\n" -#: src/du.c:309 -#, 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 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:318 +#: src/du.c:322 #, fuzzy msgid "" +" -t, --threshold=SIZE exclude entries smaller than SIZE if positive,\n" +" or entries greater than SIZE if negative\n" " --time show time of the last modification of any file in " "the\n" " directory, or any of its subdirectories\n" @@ -3885,64 +3921,73 @@ msgstr "" " status; annettua aikaa käytetään lajitteluun,\n" " jos --sort=time\n" -#: src/du.c:375 +#: src/du.c:333 +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 msgid "Infinity" msgstr "" -#: src/du.c:600 +#: src/du.c:507 +#, c-format +msgid "mount point %s already traversed" +msgstr "" + +#: src/du.c:624 #, fuzzy, c-format msgid "fts_read failed: %s" msgstr "fts_read epäonnistui" -#: src/du.c:724 +#: src/du.c:780 #, c-format msgid "invalid maximum depth %s" msgstr "virheellinen enimmäissyvyys %s" -#: src/du.c:817 +#: src/du.c:809 +#, fuzzy, c-format +msgid "invalid --threshold argument '-0'" +msgstr "virheellinen argumentti %s" + +#: src/du.c:887 #, 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:824 +#: src/du.c:894 #, 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:830 +#: src/du.c:900 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "" "varoitus: yhteenvedon teko on ristiriidassa valitsimen --max-depth=%lu kanssa" -#: src/du.c:896 src/sort.c:4479 src/wc.c:668 +#: src/du.c:966 src/sort.c:4533 src/wc.c:668 msgid "file operands cannot be combined with --files0-from" msgstr "" -#: src/du.c:949 src/md5sum.c:587 src/od.c:903 src/tac.c:239 src/tac.c:350 -#: src/tac.c:506 src/tac.c:586 src/wc.c:733 +#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 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:963 src/sort.c:4508 src/wc.c:747 +#: src/du.c:1040 src/sort.c:4562 src/wc.c:747 #, c-format msgid "when reading file names from stdin, no file name of %s allowed" msgstr "" -#: src/du.c:980 src/du.c:988 src/wc.c:760 src/wc.c:768 +#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768 msgid "invalid zero-length file name" msgstr "virheellinen tyhjä tiedostonimi" -#: src/du.c:1007 src/head.c:149 src/head.c:262 src/head.c:334 src/head.c:538 -#: src/head.c:620 src/head.c:692 src/head.c:750 src/head.c:774 src/tail.c:412 -#: src/tail.c:500 src/tail.c:549 src/tail.c:642 src/tail.c:770 src/tail.c:818 -#: src/tail.c:855 src/tail.c:1782 src/tail.c:1812 src/uniq.c:395 -#, c-format -msgid "error reading %s" -msgstr "virhe luettaessa tiedostoa %s" - -#: src/du.c:1010 src/ls.c:2649 src/wc.c:791 +#: src/du.c:1088 src/ls.c:2649 src/wc.c:791 msgid "total" msgstr "yhteensä" @@ -4033,10 +4078,12 @@ msgstr "" "Käyttö: %s [VALITSIN]... [-] [NIMI=ARVO]... [KOMENTO [ARGUMENTTI]...]\n" #: src/env.c:55 +msgid "Set each NAME to VALUE in the environment and run COMMAND.\n" +msgstr "" + +#: src/env.c:61 #, fuzzy msgid "" -"Set each NAME to VALUE in the environment and run COMMAND.\n" -"\n" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with 0 byte rather than newline\n" " -u, --unset=NAME remove variable from the environment\n" @@ -4046,7 +4093,7 @@ msgstr "" " -i, --ignore-environment aloita tyhjällä ympäristöllä\n" " -u, --unset=NIMI poista muuttuja ympäristöstä\n" -#: src/env.c:64 +#: src/env.c:68 msgid "" "\n" "A mere - implies -i. If no COMMAND, print the resulting environment.\n" @@ -4055,32 +4102,32 @@ msgstr "" "Pelkkä ”-” tekee saman kuin -i. Ilman KOMENTOa tulostetaan seurauksena\n" "saatava ympäristö.\n" -#: src/env.c:120 +#: src/env.c:124 #, fuzzy, c-format msgid "cannot unset %s" msgstr "ohjelmaa strip ei voi ajaa" -#: src/env.c:131 +#: src/env.c:135 #, fuzzy, c-format msgid "cannot set %s" msgstr "tiedoston %s tilaa ei voi lukea" -#: src/env.c:148 +#: src/env.c:152 #, c-format msgid "cannot specify --null (-0) with command" msgstr "" #: 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" -"\n" msgstr "" "Muunna kunkin TIEDOSTOn sisältämät sarkaimet välilyönneiksi, kirjoittaen\n" "vakiotulosteeseen. Jos TIEDOSTOa ei ole annettu, tai se on ”-”, luetaan\n" "vakiosyötettä.\n" -#: src/expand.c:115 +#: src/expand.c:114 msgid "" " -i, --initial do not convert tabs after non blanks\n" " -t, --tabs=NUMBER have tabs NUMBER characters apart, not 8\n" @@ -4088,34 +4135,34 @@ msgstr "" " -i, --initial älä muunna ei-tyhjeen jälkeisiä sarkaimia\n" " -t, --tabs=KOKO aseta sarkaimen kooksi KOKO, ei 8\n" -#: src/expand.c:119 +#: src/expand.c:118 msgid "" " -t, --tabs=LIST use comma separated list of explicit tab positions\n" msgstr "" " -t, --tabs=LUETTELO käytä pilkuilla erotettua luetteloa sarkainten " "kohdista\n" -#: src/expand.c:172 src/unexpand.c:191 +#: src/expand.c:171 src/unexpand.c:190 #, c-format msgid "tab stop is too large %s" msgstr "sarkainasetin %s on liian suuri" -#: src/expand.c:180 src/unexpand.c:199 +#: src/expand.c:179 src/unexpand.c:198 #, c-format msgid "tab size contains invalid character(s): %s" msgstr "sarkainkoko sisältää virheellisen merkin(/merkkejä): %s" -#: src/expand.c:206 src/unexpand.c:225 +#: src/expand.c:205 src/unexpand.c:224 #, c-format msgid "tab size cannot be 0" msgstr "sarkaimen koko ei voi olla 0" -#: src/expand.c:208 src/unexpand.c:227 +#: src/expand.c:207 src/unexpand.c:226 #, c-format msgid "tab sizes must be ascending" msgstr "sarkainkokojen on oltava nousevia" -#: src/expand.c:326 src/expand.c:345 src/unexpand.c:374 src/unexpand.c:419 +#: 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 "syöterivi on liian pitkä" @@ -4272,12 +4319,12 @@ msgstr "virhe säännöllisen lausekkeen haussa" msgid "non-integer argument" msgstr "ei-numeerinen argumentti" -#: src/expr.c:793 src/truncate.c:316 +#: src/expr.c:793 src/truncate.c:314 #, c-format msgid "division by zero" msgstr "nollalla jako" -#: src/expr.c:887 src/sort.c:2029 +#: src/expr.c:887 src/sort.c:2044 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "aseta LC_ALL='C' ongelman kiertämiseksi" @@ -4287,25 +4334,32 @@ msgstr "aseta LC_ALL='C' ongelman kiertämiseksi" msgid "the strings compared were %s and %s" msgstr "Vertaillut merkkijonot olivat %s ja %s." -#: src/factor.c:449 -msgid "using arbitrary-precision arithmetic" +#. This is a proper name. See the gettext manual, section Names. +#: src/factor.c:111 +msgid "Niels Moller" msgstr "" -#: src/factor.c:460 -msgid "using single-precision arithmetic" +#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459 +#, c-format +msgid "Lucas prime test failure. This should not happen" msgstr "" -#: src/factor.c:465 src/od.c:1640 src/od.c:1709 +#: src/factor.c:2092 #, c-format -msgid "%s is too large" -msgstr "%s on liian suuri" +msgid "squfof queue overflow" +msgstr "" -#: src/factor.c:469 +#: src/factor.c:2419 #, c-format msgid "%s is not a valid positive integer" msgstr "%s ei ole kelvollinen positiivinen kokonaisluku" -#: src/factor.c:494 +#: src/factor.c:2442 src/od.c:1646 src/od.c:1715 +#, c-format +msgid "%s is too large" +msgstr "%s on liian suuri" + +#: src/factor.c:2454 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4314,7 +4368,7 @@ msgstr "" "Käyttö: %s [LUKU]...\n" " tai: %s VALITSIN\n" -#: src/factor.c:499 +#: src/factor.c:2459 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" @@ -4341,21 +4395,20 @@ msgid "cannot stat current directory (now %s)" msgstr "nykyisen hakemiston (%s) tilaa ei voi lukea" #. This is a proper name. See the gettext manual, section Names. -#: src/fmt.c:37 +#: src/fmt.c:38 msgid "Ross Paterson" msgstr "Ross Paterson" -#: src/fmt.c:269 +#: src/fmt.c:270 #, c-format msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n" msgstr "Käyttö: %s [-LEVEYS] [VALITSIN]... [TIEDOSTO]...\n" -#: src/fmt.c:270 +#: 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" -"\n" msgstr "" "Muotoile kukin TIEDOSTO(je)n sisältämä kappale, kirjoittaen " "vakiotulosteeseen.\n" @@ -4374,8 +4427,8 @@ msgstr "" " -p, --prefix=MJONO yhdistä vain rivit, jotka alkavat MJONOlla\n" " -s, --split-only rivitä pitkät rivit, mutta älä täytä rivejä\n" -#: src/fmt.c:285 -#, fuzzy, c-format +#: src/fmt.c:287 +#, fuzzy, 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" @@ -4389,7 +4442,7 @@ msgstr "" " jälkeen)\n" " -w, --width=LEVEYS enimmäisrivileveys (oletus on 75 saraketta)\n" -#: src/fmt.c:357 +#: src/fmt.c:359 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -4399,22 +4452,22 @@ msgstr "" "ensimmäinen\n" "valitsin; käytä -w N sen sijaan" -#: src/fmt.c:403 src/fmt.c:414 +#: src/fmt.c:405 src/fmt.c:416 #, c-format msgid "invalid width: %s" msgstr "virheellinen leveys: %s" #: src/fold.c:70 +#, fuzzy msgid "" "Wrap input lines in each FILE (standard input by default), writing to\n" "standard output.\n" -"\n" msgstr "" "Rivitä kustakin TIEDOSTOsta (oletuksena vakiosyöte) luetut syöterivit\n" "kirjoittaen vakiotulosteeseen.\n" "\n" -#: src/fold.c:78 +#: src/fold.c:77 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4424,13 +4477,13 @@ msgstr "" " -s, --spaces katkaise välien kohdalta\n" " -w, --width=LEVEYS käytä sarakeleveytenä LEVEYttä oletusarvon 80 sijaan\n" -#: src/fold.c:289 src/pr.c:836 +#: src/fold.c:288 src/pr.c:832 #, c-format 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:75 +#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 #: src/truncate.c:37 msgid "Padraig Brady" msgstr "Padraig Brady" @@ -4446,17 +4499,17 @@ msgid "" "\n" msgstr "" -#: src/group-list.c:69 src/id.c:345 src/setuidgid.c:184 +#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184 #, 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:350 +#: src/group-list.c:74 src/id.c:370 #, fuzzy, c-format msgid "failed to get groups for the current process" msgstr "tiedoston %s ryhmän vaihtaminen arvoon %s epäonnistui\n" -#: src/group-list.c:104 +#: src/group-list.c:114 #, c-format msgid "cannot find name for group ID %lu" msgstr "ryhmä-ID:tä %lu vastaavaa nimeä ei löydy" @@ -4494,18 +4547,18 @@ msgid "%s: no such user" msgstr "%s: Käyttäjää ei ole" #: 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" -"\n" msgstr "" "Tulosta kunkin TIEDOSTOn 10 ensimmäistä riviä vakiotulosteeseen.\n" "Jos TIEDOSTOja on useampi kuin yksi, jokaista ennen näytetään tiedostonimi.\n" "Jos TIEDOSTOa ei ole annettu, tai se on ”-”, luetaan vakiosyötettä.\n" "\n" -#: src/head.c:118 +#: src/head.c:117 #, fuzzy msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" @@ -4526,7 +4579,7 @@ msgstr "" " koko tiedosto lukuun ottamatta N:ää viimeistä " "riviä\n" -#: src/head.c:126 +#: src/head.c:125 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4535,7 +4588,7 @@ msgstr "" "otsakkeita\n" " -v, --verbose tulosta aina tiedostonimen sisältävät otsakkeet\n" -#: src/head.c:132 +#: src/head.c:131 #, fuzzy msgid "" "\n" @@ -4551,58 +4604,58 @@ msgstr "" "Kukin MUUNNOS voi olla:\n" "\n" -#: src/head.c:152 -#, c-format -msgid "error writing %s" -msgstr "virhe kirjoitettaessa tiedostoa %s" - -#: src/head.c:155 +#: src/head.c:154 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: tiedosto on kutistunut liikaa" -#: src/head.c:228 src/head.c:1044 +#: src/head.c:227 src/head.c:1051 #, c-format msgid "%s: number of bytes is too large" msgstr "%s: tavumäärä on liian suuri" -#: src/head.c:441 +#: 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:613 src/head.c:684 src/tail.c:450 +#: src/head.c:612 src/head.c:691 src/tail.c:449 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: siirtyminen kohtaan %s ei onnistu" -#: src/head.c:791 +#: src/head.c:673 +#, fuzzy, c-format +msgid "%s: failed to reset file pointer" +msgstr "%s: poisto epäonnistui" + +#: src/head.c:798 #, c-format msgid "cannot reposition file pointer for %s" msgstr "tiedosto-osoitinta ei voi siirtää tiedostossa %s" -#: src/head.c:878 +#: src/head.c:885 #, 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:879 +#: src/head.c:886 msgid "number of lines" msgstr "rivimäärä" -#: src/head.c:879 +#: src/head.c:886 msgid "number of bytes" msgstr "tavumäärä" -#: src/head.c:886 src/tail.c:1947 +#: src/head.c:893 src/tail.c:1947 msgid "invalid number of lines" msgstr "virheellinen rivimäärä" -#: src/head.c:887 src/tail.c:1948 +#: src/head.c:894 src/tail.c:1948 msgid "invalid number of bytes" msgstr "virheellinen tavumäärä" -#: src/head.c:974 src/head.c:1032 +#: src/head.c:981 src/head.c:1039 #, fuzzy, c-format msgid "invalid trailing option -- %c" msgstr "virheellinen valitsin – %c" @@ -4721,86 +4774,86 @@ msgstr "" msgid "cannot get effective UID" msgstr "tiedostoa %s ei voi poistaa" -#: src/id.c:289 +#: src/id.c:311 #, fuzzy, c-format -msgid "cannot find name for user ID %lu" +msgid "cannot find name for user ID %s" msgstr "käyttäjä-ID:tä %lu vastaavaa nimeä ei löydy" -#: src/id.c:309 +#: src/id.c:329 #, fuzzy, c-format -msgid "uid=%lu" +msgid "uid=%s" msgstr "uid=%lu" -#: src/id.c:314 +#: src/id.c:334 #, fuzzy, c-format -msgid " gid=%lu" -msgstr " egid=%lu" +msgid " gid=%s" +msgstr " gid=%lu" -#: src/id.c:321 +#: src/id.c:341 #, fuzzy, c-format -msgid " euid=%lu" -msgstr " egid=%lu" +msgid " euid=%s" +msgstr " euid=%lu" -#: src/id.c:329 -#, c-format -msgid " egid=%lu" +#: src/id.c:349 +#, fuzzy, c-format +msgid " egid=%s" msgstr " egid=%lu" -#: src/id.c:357 +#: src/id.c:377 msgid " groups=" msgstr " ryhmät=" -#: src/id.c:373 +#: src/id.c:393 #, fuzzy, c-format msgid " context=%s" msgstr "virheelliset oikeudet: %s" -#: src/install.c:372 +#: src/install.c:373 #, fuzzy, c-format msgid "warning: %s: failed to change context to %s" msgstr "varoitus: ei voida siirtyä hakemistoon %s" -#: src/install.c:413 +#: src/install.c:414 #, c-format msgid "creating directory %s" msgstr "luodaan hakemisto %s" -#: src/install.c:481 +#: src/install.c:482 #, c-format msgid "cannot change ownership of %s" msgstr "tiedoston %s omistajuuden muuttaminen ei onnistu" -#: src/install.c:505 +#: src/install.c:506 #, c-format msgid "cannot set time stamps for %s" msgstr "tiedoston %s aikaleimojen asettaminen ei onnistu" -#: src/install.c:526 src/split.c:412 src/timeout.c:387 +#: src/install.c:527 src/split.c:426 src/timeout.c:439 #, c-format msgid "fork system call failed" msgstr "järjestelmäkutsu fork epäonnistui" -#: src/install.c:530 +#: src/install.c:531 #, fuzzy, c-format msgid "cannot run %s" msgstr "ohjelmaa strip ei voi ajaa" -#: src/install.c:534 +#: src/install.c:535 #, c-format msgid "waiting for strip" msgstr "odotettaessa strip-ohjelman päättymistä" -#: src/install.c:536 +#: src/install.c:537 #, c-format msgid "strip process terminated abnormally" msgstr "" -#: src/install.c:557 +#: src/install.c:558 #, c-format msgid "invalid user %s" msgstr "virheellinen käyttäjä %s" -#: src/install.c:593 +#: src/install.c:594 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -4813,7 +4866,8 @@ msgstr "" " tai: %s [VALITSIN]... -t HAKEMISTO LÄHDE...\n" " tai: %s [VALITSIN]... -d HAKEMISTO...\n" -#: src/install.c:600 +#: src/install.c:601 +#, fuzzy msgid "" "\n" "This install program copies files (often just compiled) into destination\n" @@ -4825,7 +4879,6 @@ msgid "" "In the first three forms, copy SOURCE to DEST or multiple SOURCE(s) to\n" "the existing DIRECTORY, while setting permission modes and owner/group.\n" "In the 4th form, create all components of the given DIRECTORY(ies).\n" -"\n" msgstr "" "\n" "Tämä install-ohjelma kopioi (usein juuri käännettyjä) tiedostoja " @@ -4907,53 +4960,53 @@ msgid "" "directories\n" msgstr "" -#: src/install.c:858 +#: src/install.c:859 #, c-format msgid "" "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled" msgstr "" -#: src/install.c:868 +#: src/install.c:869 #, c-format msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled" msgstr "" -#: src/install.c:885 +#: src/install.c:886 #, 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:888 +#: src/install.c:889 #, c-format msgid "target directory not allowed when installing a directory" msgstr "kohdehakemisto ei ole sallittu asennettaessa hakemistoa" -#: src/install.c:892 +#: src/install.c:893 #, c-format msgid "cannot force target context to %s and preserve it" msgstr "" -#: src/install.c:946 src/mkdir.c:202 src/stdbuf.c:327 +#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326 #, c-format msgid "invalid mode %s" msgstr "virheelliset oikeudet %s" -#: src/install.c:953 +#: src/install.c:954 #, c-format msgid "WARNING: ignoring --strip-program option as -s option was not specified" msgstr "" -#: src/install.c:958 +#: src/install.c:959 #, fuzzy, c-format msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive" msgstr "valitsimet --string ja --check ovat toisensa poissulkevia" -#: src/install.c:965 +#: src/install.c:966 #, fuzzy, c-format msgid "options --compare (-C) and --strip are mutually exclusive" msgstr "valitsimet --string ja --check ovat toisensa poissulkevia" -#: src/install.c:971 +#: src/install.c:972 #, c-format msgid "" "the --compare (-C) option is ignored when you specify a mode with non-" @@ -4961,7 +5014,7 @@ msgid "" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/join.c:40 src/sort.c:65 +#: src/join.c:40 src/sort.c:66 msgid "Mike Haertel" msgstr "Mike Haertel" @@ -5052,7 +5105,7 @@ msgstr "" #: src/join.c:403 #, c-format -msgid "%s:%ju: is not sorted: %.*s" +msgid "%s:%<PRIuMAX>: is not sorted: %.*s" msgstr "" #: src/join.c:840 src/join.c:1038 @@ -5080,12 +5133,12 @@ msgstr "epäyhteensopivat liitossarakkeet %lu, %lu" msgid "conflicting empty-field replacement strings" msgstr "" -#: src/join.c:1101 src/sort.c:4414 +#: src/join.c:1101 src/sort.c:4468 #, c-format msgid "multi-character tab %s" msgstr "monimerkkinen sarkain %s" -#: src/join.c:1105 src/sort.c:4419 +#: src/join.c:1105 src/sort.c:4473 #, c-format msgid "incompatible tabs" msgstr "epäyhteensopivat sarkaimet" @@ -5107,14 +5160,13 @@ msgstr "" " tai: %s -t [SIGNAALI]...\n" #: src/kill.c:82 -msgid "" -"Send signals to processes, or list signals.\n" -"\n" +#, fuzzy +msgid "Send signals to processes, or list signals.\n" msgstr "" "Välitä signaaleja prosesseille tai luettele signaalit.\n" "\n" -#: src/kill.c:89 +#: src/kill.c:88 msgid "" " -s, --signal=SIGNAL, -SIGNAL\n" " specify the name or number of the signal to be sent\n" @@ -5128,7 +5180,7 @@ msgstr "" "niistä numeroita\n" " -t, --table tulosta tietoja signaaleista taulukkomuodossa\n" -#: src/kill.c:97 +#: src/kill.c:96 #, fuzzy msgid "" "\n" @@ -5143,32 +5195,32 @@ msgstr "" "negatiivisena se yksilöi prosessiryhmän.\n" "\n" -#: src/kill.c:206 +#: src/kill.c:205 #, c-format msgid "%s: invalid process id" msgstr "%s: virheellinen prosessi-ID" -#: src/kill.c:260 +#: src/kill.c:259 #, c-format msgid "invalid option -- %c" msgstr "virheellinen valitsin – %c" -#: src/kill.c:269 +#: src/kill.c:268 #, c-format msgid "%s: multiple signals specified" msgstr "%s: useita signaaleja annettu" -#: src/kill.c:283 +#: src/kill.c:282 #, c-format msgid "multiple -l or -t options specified" msgstr "useita -l tai -t -valitsimia annettu" -#: src/kill.c:300 +#: src/kill.c:299 #, c-format msgid "cannot combine signal with -l or -t" msgstr "signaalin yhdistäminen valitsimen -l tai -t kanssa ei onnistu" -#: src/kill.c:306 +#: src/kill.c:305 #, c-format msgid "no process ID specified" msgstr "prosessi-ID:tä ei ole annettu" @@ -5278,7 +5330,6 @@ msgid "" "When creating hard links, each TARGET must exist. Symbolic links\n" "can hold arbitrary text; if later resolved, a relative link is\n" "interpreted in relation to its parent directory.\n" -"\n" msgstr "" "Luo linkki annettuun KOHTEeseen.\n" "Jos LINKIN_NIMEÄ ei ole annettu, luodaan nykyiseen hakemistoon linkki, " @@ -5292,7 +5343,7 @@ msgstr "" "kovia linkkejä.\n" "\n" -#: src/ln.c:395 +#: src/ln.c:394 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -5313,7 +5364,7 @@ msgstr "" " myös pääkäyttäjältä)\n" " -f, --force poista olemassaolevat kohdetiedostot\n" -#: src/ln.c:403 +#: src/ln.c:402 #, fuzzy msgid "" " -i, --interactive prompt whether to remove destinations\n" @@ -5331,7 +5382,7 @@ msgstr "" " -s, --symbolic tee symbolisia linkkejä kovien linkkien " "sijaan\n" -#: src/ln.c:412 +#: src/ln.c:411 #, fuzzy msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -5348,24 +5399,10 @@ msgstr "" " -v, --verbose näytä kunkin linkitetyn tiedoston tiedoston " "nimi\n" -#: src/ln.c:428 -#, 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 ä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" - -#: src/ln.c:435 +#: src/ln.c:433 #, 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 "" @@ -5437,7 +5474,7 @@ 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:1976 +#: src/ls.c:1750 src/ptx.c:1975 #, c-format msgid "invalid line width: %s" msgstr "virheellinen rivileveys: %s" @@ -5501,7 +5538,7 @@ msgstr "luetaan hakemistoa %s" msgid "closing directory %s" msgstr "suljetaan hakemisto %s" -#: src/ls.c:3301 +#: src/ls.c:3302 #, c-format msgid "cannot compare file names %s and %s" msgstr "tiedostonimiä %s ja %s ei voi vertailla" @@ -5511,14 +5548,13 @@ msgstr "tiedostonimiä %s ja %s ei voi vertailla" msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" -"\n" msgstr "" "Luettele TIEDOSTOjen tiedot (oletuksena nykyinen hakemisto).\n" "Lajittele merkinnät aakkosjärjestykseen ellei mitään valitsimista -cftuvSUX\n" "tai --sort ole annettu.\n" "\n" -#: src/ls.c:4729 +#: src/ls.c:4728 #, fuzzy msgid "" " -a, --all do not ignore entries starting with .\n" @@ -5534,7 +5570,7 @@ msgstr "" " -b, --escape tulosta oktaaliset suojaukset ei-graafisille\n" " merkeille\n" -#: src/ls.c:4735 +#: src/ls.c:4734 #, fuzzy msgid "" " --block-size=SIZE scale sizes by SIZE before printing them. E." @@ -5558,7 +5594,7 @@ msgstr "" " nimen mukaan\n" " muuten: lajittele ctimen mukaan\n" -#: src/ls.c:4745 +#: src/ls.c:4744 #, fuzzy msgid "" " -C list entries by columns\n" @@ -5579,7 +5615,7 @@ msgstr "" " äläkä seuraa symbolisia linkkejä\n" " -D, --dired tuota tuloste Emacsin dired-muodossa\n" -#: src/ls.c:4753 +#: src/ls.c:4752 #, fuzzy msgid "" " -f do not sort, enable -aU, disable -ls --color\n" @@ -5596,11 +5632,11 @@ msgstr "" " single-column -1, verbose -l, vertical -C\n" " --full-time kuten -l --time-style=full-iso\n" -#: src/ls.c:4761 +#: src/ls.c:4760 msgid " -g like -l, but do not list owner\n" msgstr " -g kuten -l, mutta älä näytä omistajia\n" -#: src/ls.c:4764 +#: src/ls.c:4763 msgid "" " --group-directories-first\n" " group directories before files.\n" @@ -5608,7 +5644,7 @@ msgid "" " use of --sort=none (-U) disables grouping\n" msgstr "" -#: src/ls.c:4770 +#: src/ls.c:4769 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" @@ -5621,7 +5657,7 @@ msgstr "" " --si sama kuin edellä, mutta kantalukuna 1000, ei " "1024\n" -#: src/ls.c:4776 +#: src/ls.c:4775 #, fuzzy msgid "" " -H, --dereference-command-line\n" @@ -5649,7 +5685,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:4786 +#: src/ls.c:4785 #, fuzzy msgid "" " --indicator-style=WORD append indicator with style WORD to entry " @@ -5670,7 +5706,7 @@ msgstr "" " -I, --ignore=HAHMO älä luettele HAHMOon täsmääviä merkintöjä\n" " -k sama kuin --block-size=1K\n" -#: src/ls.c:4796 +#: src/ls.c:4795 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5686,7 +5722,7 @@ msgstr "" " -m näytä tiedostonimet pilkuilla erotettuna\n" " luettelona\n" -#: src/ls.c:4804 +#: src/ls.c:4803 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. " @@ -5705,7 +5741,7 @@ msgstr "" " -p, --indicator-style=slash\n" " lisää hakemistoihin ilmaisin ”/”\n" -#: src/ls.c:4812 +#: src/ls.c:4811 #, fuzzy msgid "" " -q, --hide-control-chars print ? instead of non graphic characters\n" @@ -5726,7 +5762,7 @@ msgstr "" " literal, locale, shell, shell-always, c, " "escape\n" -#: src/ls.c:4821 +#: src/ls.c:4820 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -5737,7 +5773,7 @@ msgstr "" " -R, --recursive luettele alihakemistot rekursiivisesti\n" " -s, --size tulosta kunkin tiedoston varaama koko lohkoina\n" -#: src/ls.c:4826 +#: src/ls.c:4825 msgid "" " -S sort by file size\n" " --sort=WORD sort by WORD instead of name: none -U,\n" @@ -5758,7 +5794,7 @@ msgstr "" "käytetään\n" " lajitteluun, jos --sort=time\n" -#: src/ls.c:4836 +#: src/ls.c:4835 #, fuzzy msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" @@ -5781,7 +5817,7 @@ msgstr "" "muu\n" " kuin POSIX\n" -#: src/ls.c:4845 +#: src/ls.c:4844 #, fuzzy msgid "" " -t sort by modification time, newest first\n" @@ -5790,7 +5826,7 @@ msgstr "" " -t lajittele muutosajan mukaan\n" " -T, --tabsize=LEVEYS aseta sarkainkooksi LEVEYS, ei 8\n" -#: src/ls.c:4849 +#: src/ls.c:4848 #, fuzzy msgid "" " -u with -lt: sort by, and show, access time\n" @@ -5808,7 +5844,7 @@ msgstr "" " hakemistojärjestyksessä\n" " -v lajittele version mukaan\n" -#: src/ls.c:4856 +#: src/ls.c:4855 #, fuzzy msgid "" " -w, --width=COLS assume screen width instead of current value\n" @@ -5824,7 +5860,7 @@ msgstr "" " -X aakkosta merkinnän päätteen mukaan\n" " -1 luettele vain yksi tiedosto yhdellä rivillä\n" -#: src/ls.c:4866 +#: src/ls.c:4865 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5833,7 +5869,7 @@ msgid "" "variable can change the settings. Use the dircolors command to set it.\n" msgstr "" -#: src/ls.c:4873 +#: src/ls.c:4872 msgid "" "\n" "Exit status:\n" @@ -5857,7 +5893,7 @@ msgstr "Scott Miller" msgid "David Madore" msgstr "David Madore" -#: src/md5sum.c:162 +#: src/md5sum.c:164 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -5870,34 +5906,38 @@ msgstr "" "Jos TIEDOSTOa ei ole annettu, tai se on ”-”, luetaan vakiosyötettä.\n" "\n" -#: src/md5sum.c:172 +#: src/md5sum.c:174 #, fuzzy msgid "" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr " -b, --binary lue binäärimuodossa\n" -#: src/md5sum.c:176 +#: src/md5sum.c:178 #, fuzzy msgid " -b, --binary read in binary mode\n" msgstr " -b, --binary lue binäärimuodossa\n" -#: src/md5sum.c:179 +#: src/md5sum.c:181 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr "" -#: src/md5sum.c:183 +#: src/md5sum.c:184 +msgid " --tag create a BSD-style checksum\n" +msgstr "" + +#: src/md5sum.c:188 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" -#: src/md5sum.c:187 +#: src/md5sum.c:192 #, fuzzy msgid " -t, --text read in text mode (default)\n" msgstr " -b, --binary lue binäärimuodossa\n" -#: src/md5sum.c:190 +#: src/md5sum.c:195 #, fuzzy msgid "" "\n" @@ -5913,12 +5953,12 @@ msgstr "" " -w, --warn varoita väärin muotoilluista summariveistä\n" "\n" -#: src/md5sum.c:198 +#: src/md5sum.c:203 msgid "" " --strict with --check, exit non-zero for any invalid input\n" msgstr "" -#: src/md5sum.c:203 +#: src/md5sum.c:208 #, fuzzy, c-format msgid "" "\n" @@ -5933,49 +5973,49 @@ msgstr "" "rivi, jolla on tarkistussumma, tyyppiä ilmaiseva merkki (”*” = binääri,\n" "” ” = teksti), ja TIEDoston nimi. \n" -#: src/md5sum.c:502 +#: src/md5sum.c:523 #, c-format msgid "%s: too many checksum lines" msgstr "%s: liian monta tarkistussummariviä" -#: src/md5sum.c:526 +#: src/md5sum.c:547 #, c-format msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line" msgstr "%s: %<PRIuMAX>: väärin muotoiltu %s-tarkistussummarivi" -#: src/md5sum.c:551 +#: src/md5sum.c:572 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: avaaminen tai luku EPÄONNISTUI\n" -#: src/md5sum.c:574 +#: src/md5sum.c:595 msgid "FAILED" msgstr "EI TÄSMÄÄ" -#: src/md5sum.c:576 +#: src/md5sum.c:597 msgid "OK" msgstr "OK" -#: src/md5sum.c:600 +#: src/md5sum.c:621 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "%s: kelvollisesti muotoiltuja %s-tarkistussummarivejä ei löytynyt" -#: src/md5sum.c:610 +#: src/md5sum.c:631 #, 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:618 +#: src/md5sum.c:639 #, 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:626 +#: src/md5sum.c:647 #, fuzzy, c-format msgid "WARNING: %<PRIuMAX> computed checksum did NOT match" msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match" @@ -5984,7 +6024,19 @@ msgstr[0] "" msgstr[1] "" "VAROITUS: %<PRIuMAX> tarkistussummaa %<PRIuMAX> lasketusta EI TÄSMÄNNYT" -#: src/md5sum.c:704 +#: src/md5sum.c:760 +#, c-format +msgid "--tag does not support --text mode" +msgstr "" + +# onko verify tarkastamista, todentamista vai varmentamista? +#: src/md5sum.c:766 +#, fuzzy, c-format +msgid "the --tag option is meaningless when verifying checksums" +msgstr "" +"valitsin --status on merkityksellinen vain tarkastettaessa tarkistussummia" + +#: src/md5sum.c:773 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" @@ -5993,27 +6045,27 @@ msgstr "" "tarkistussummia" # onko verify tarkastamista, todentamista vai varmentamista? -#: src/md5sum.c:712 +#: src/md5sum.c:781 #, c-format msgid "the --status option is meaningful only when verifying checksums" msgstr "" "valitsin --status on merkityksellinen vain tarkastettaessa tarkistussummia" -#: src/md5sum.c:719 +#: src/md5sum.c:788 #, 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:726 +#: src/md5sum.c:795 #, 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:733 +#: src/md5sum.c:802 #, fuzzy, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "" @@ -6025,15 +6077,14 @@ msgid "Usage: %s [OPTION]... DIRECTORY...\n" msgstr "Käyttö: %s [VALITSIN]... HAKEMISTO...\n" #: src/mkdir.c:57 -msgid "" -"Create the DIRECTORY(ies), if they do not already exist.\n" -"\n" +#, fuzzy +msgid "Create the DIRECTORY(ies), if they do not already exist.\n" msgstr "" "Luo HAKEMISTO(t), elleivät ne ole jo olemassa.\n" "\n" # Ensimmäinen kohta on aika hämärä alkutekstissä. -#: src/mkdir.c:64 +#: src/mkdir.c:63 #, fuzzy msgid "" " -m, --mode=MODE set file mode (as in chmod), not a=rwx - umask\n" @@ -6047,7 +6098,7 @@ msgstr "" "ylähakemistot\n" " -v, --verbose näytä viesti kutakin hakemistoa luodessa\n" -#: src/mkdir.c:169 +#: src/mkdir.c:168 #, c-format msgid "created directory %s" msgstr "luotiin hakemisto %s" @@ -6058,29 +6109,28 @@ msgid "Usage: %s [OPTION]... NAME...\n" msgstr "Käyttö: %s [VALITSIN]... NIMI...\n" #: src/mkfifo.c:52 -msgid "" -"Create named pipes (FIFOs) with the given NAMEs.\n" -"\n" +#, fuzzy +msgid "Create named pipes (FIFOs) with the given NAMEs.\n" msgstr "Luo nimettyjä putkia (FIFOja) annetuilla NIMIllä.\n" -#: src/mkfifo.c:59 src/mknod.c:61 +#: src/mkfifo.c:58 src/mknod.c:60 #, 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:62 +#: src/mkfifo.c:61 msgid "" " -Z, --context=CTX set the SELinux security context of each NAME to CTX\n" msgstr "" -#: src/mkfifo.c:122 src/mknod.c:128 +#: src/mkfifo.c:121 src/mknod.c:127 #, c-format msgid "invalid mode" msgstr "virheelliset oikeudet" -#: src/mkfifo.c:127 src/mknod.c:133 +#: src/mkfifo.c:126 src/mknod.c:132 #, c-format msgid "mode must specify only file permission bits" msgstr "" @@ -6091,18 +6141,17 @@ msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n" msgstr "Käyttö: %s [VALITSIN]... NIMI TYYPPI [MAJOR MINOR]\n" #: src/mknod.c:54 -msgid "" -"Create the special file NAME of the given TYPE.\n" -"\n" +#, fuzzy +msgid "Create the special file NAME of the given TYPE.\n" msgstr "" "Luo TYYPIn mukainen erikoistiedosto NIMI.\n" "\n" -#: src/mknod.c:64 +#: src/mknod.c:63 msgid " -Z, --context=CTX set the SELinux security context of NAME to CTX\n" msgstr "" -#: src/mknod.c:69 +#: src/mknod.c:68 msgid "" "\n" "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n" @@ -6118,7 +6167,7 @@ msgstr "" "oktaaliluvuksi;\n" "muussa tapauksessa kymmenkantaiseksi luvuksi. TYYPPI voi olla:\n" -#: src/mknod.c:76 +#: src/mknod.c:75 msgid "" "\n" " b create a block (buffered) special file\n" @@ -6130,42 +6179,42 @@ msgstr "" " c, u luo merkkierikoistiedosto (puskuroimaton)\n" " p luo FIFO-putki\n" -#: src/mknod.c:151 +#: src/mknod.c:150 msgid "Special files require major and minor device numbers." msgstr "" "Major- ja minor-laitearvot on annettava luotaessa\n" "erikoistiedostoja" -#: src/mknod.c:161 +#: src/mknod.c:160 msgid "Fifos do not have major and minor device numbers." msgstr "FIFO-putkilla ei ole major- ja minor-laitearvoja." -#: src/mknod.c:177 +#: src/mknod.c:176 #, c-format msgid "block special files not supported" msgstr "lohkoerikoistiedostot eivät ole tuettuja" -#: src/mknod.c:186 +#: src/mknod.c:185 #, c-format msgid "character special files not supported" msgstr "merkkierikoistiedostot eivät ole tuettuja" -#: src/mknod.c:202 +#: src/mknod.c:201 #, c-format msgid "invalid major device number %s" msgstr "virheellinen laitteen major-arvo %s" -#: src/mknod.c:207 +#: src/mknod.c:206 #, c-format msgid "invalid minor device number %s" msgstr "virheellinen laitteen minor-arvo %s" -#: src/mknod.c:212 +#: src/mknod.c:211 #, c-format msgid "invalid device %s %s" msgstr "virheellinen laite %s %s" -#: src/mknod.c:226 +#: src/mknod.c:225 #, c-format msgid "invalid device type %s" msgstr "virheellinen laitetyyppi %s" @@ -6227,60 +6276,59 @@ msgid "" " directory specified via -p; else /tmp [deprecated]\n" msgstr "" -#: src/mktemp.c:222 +#: src/mktemp.c:223 #, fuzzy, c-format msgid "failed to redirect stderr to /dev/null" msgstr "vakiovirhetulosteen uudelleenohjaus epäonnistui" -#: src/mktemp.c:228 +#: src/mktemp.c:229 #, fuzzy, c-format msgid "too many templates" msgstr "liian monta argumenttia" -#: src/mktemp.c:248 +#: src/mktemp.c:249 #, c-format msgid "with --suffix, template %s must end in X" msgstr "" -#: src/mktemp.c:273 src/split.c:1117 +#: src/mktemp.c:274 src/split.c:1130 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "" -#: src/mktemp.c:278 +#: src/mktemp.c:279 #, c-format msgid "too few X's in template %s" msgstr "" -#: src/mktemp.c:291 +#: src/mktemp.c:292 #, c-format msgid "invalid template, %s, contains directory separator" msgstr "" -#: src/mktemp.c:305 +#: src/mktemp.c:306 #, c-format msgid "invalid template, %s; with --tmpdir, it may not be absolute" msgstr "" -#: src/mktemp.c:325 +#: src/mktemp.c:326 #, fuzzy, c-format msgid "failed to create directory via template %s" msgstr "hakemiston %s sulkeminen epäonnistui" -#: src/mktemp.c:335 +#: src/mktemp.c:336 #, fuzzy, c-format msgid "failed to create file via template %s" msgstr "tiedoston %s aikojen säilyttäminen ei onnistu" -#: src/mv.c:290 -msgid "" -"Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" -"\n" +#: src/mv.c:292 +#, 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:297 +#: src/mv.c:298 #, fuzzy msgid "" " --backup[=CONTROL] make a backup of each existing destination " @@ -6301,7 +6349,7 @@ msgstr "" " -i, --interactive kysy ennen ylikirjoitusta\n" " (vastaava kuin --reply=query)\n" -#: src/mv.c:306 +#: src/mv.c:307 msgid "" " --strip-trailing-slashes remove any trailing slashes from each " "SOURCE\n" @@ -6313,7 +6361,7 @@ msgstr "" " -S, --suffix=JÄLKILIITE korvaa tavanomainen varmuuskopioiden " "jälkiliite\n" -#: src/mv.c:311 +#: src/mv.c:312 msgid "" " -t, --target-directory=DIRECTORY move all SOURCE arguments into " "DIRECTORY\n" @@ -6340,28 +6388,30 @@ msgstr "Käyttö: %s [VALITSIN] [KOMENTO [ARG]...]\n" #, c-format msgid "" "Run COMMAND with an adjusted niceness, which affects process scheduling.\n" -"With no COMMAND, print the current niceness. Nicenesses range from\n" -"%d (most favorable scheduling) to %d (least favorable).\n" -"\n" -" -n, --adjustment=N add integer N to the niceness (default 10)\n" +"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 "" -#: src/nice.c:168 +#: src/nice.c:82 +msgid " -n, --adjustment=N add integer N to the niceness (default 10)\n" +msgstr "" + +#: src/nice.c:172 #, c-format msgid "invalid adjustment %s" msgstr "virheellinen argumentti %s" -#: src/nice.c:177 +#: src/nice.c:181 #, c-format msgid "a command must be given with an adjustment" msgstr "kun säätöarvo on annettu, on komento pakollinen" -#: src/nice.c:184 src/nice.c:195 +#: src/nice.c:188 src/nice.c:199 #, fuzzy, c-format msgid "cannot get niceness" msgstr "järjestelmän nimen haku ei onnistu" -#: src/nice.c:201 +#: src/nice.c:205 #, fuzzy, c-format msgid "cannot set niceness" msgstr "ajan asetus ei onnistu" @@ -6371,17 +6421,17 @@ msgstr "ajan asetus ei onnistu" msgid "Scott Bartram" msgstr "Scott Bartram" -#: src/nl.c:186 +#: 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" -"\n" msgstr "" "Kirjoita kukin TIEDOSTO vakiotulosteeseen rivinumerointi lisäten.\n" "Jos TIEDOSTOa ei ole annettu, tai se on ”-”, luetaan vakiosyötettä.\n" "\n" -#: src/nl.c:194 +#: src/nl.c:186 msgid "" " -b, --body-numbering=STYLE use STYLE for numbering body lines\n" " -d, --section-delimiter=CC use CC for separating logical pages\n" @@ -6393,7 +6443,7 @@ msgstr "" " -f, --footer-numbering=TYYLI käytä TYYLIä alatunnisterivien " "numerointiin\n" -#: src/nl.c:199 +#: src/nl.c:191 #, fuzzy msgid "" " -h, --header-numbering=STYLE use STYLE for numbering header lines\n" @@ -6415,7 +6465,7 @@ msgstr "" " -s, --number-separator=MJONO lisää MJONO (mahdollisen) rivinumeron " "perään\n" -#: src/nl.c:207 +#: src/nl.c:199 #, fuzzy msgid "" " -v, --starting-line-number=NUMBER first line number on each logical page\n" @@ -6425,7 +6475,7 @@ msgstr "" "loogisella sivulla\n" " -w, --number-width=MÄÄRÄ käytä MÄÄRÄ saraketta rivinumeroille\n" -#: src/nl.c:213 +#: src/nl.c:205 msgid "" "\n" "By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC are\n" @@ -6439,7 +6489,7 @@ msgstr "" "\\.\n" "TYYLI on yksi seuraavista:\n" -#: src/nl.c:219 +#: src/nl.c:211 #, fuzzy msgid "" "\n" @@ -6469,53 +6519,47 @@ msgstr "" " rz tasattu oikealle, etunollat\n" "\n" -#: src/nl.c:286 +#: src/nl.c:278 #, c-format msgid "line number overflow" msgstr "rivinumeroinnin ylivuoto" -#: src/nl.c:486 +#: src/nl.c:478 #, c-format msgid "invalid header numbering style: %s" msgstr "virheellinen otsakkeen numerointityyli: %s" -#: src/nl.c:494 +#: src/nl.c:486 #, c-format msgid "invalid body numbering style: %s" msgstr "virheellinen rungon numerointityyli: %s" -#: src/nl.c:502 +#: src/nl.c:494 #, c-format msgid "invalid footer numbering style: %s" msgstr "virheellinen alatunnisteen numerointityyli: %s" -#: src/nl.c:511 +#: src/nl.c:503 #, c-format msgid "invalid starting line number: %s" msgstr "virheellinen aloitusrivin numero: %s" -#: src/nl.c:517 -#, fuzzy, c-format -msgid "WARNING: --page-increment is deprecated; use --line-increment instead" -msgstr "" -"valitsin --reply ei ole suositeltava; käytä valitsinta -i tai -f sen sijaan" - -#: src/nl.c:524 +#: src/nl.c:512 #, c-format msgid "invalid line number increment: %s" msgstr "virheellinen rivinumeron lisäys: %s" -#: src/nl.c:536 +#: src/nl.c:524 #, c-format msgid "invalid number of blank lines: %s" msgstr "virheellinen tyhjien rivien määrä: %s" -#: src/nl.c:550 +#: src/nl.c:538 #, c-format msgid "invalid line number field width: %s" msgstr "virheellinen rivinumerokentän leveys: %s" -#: src/nl.c:569 +#: src/nl.c:557 #, c-format msgid "invalid line numbering format: %s" msgstr "virheellinen rivinumerointimuoto: %s" @@ -6558,11 +6602,6 @@ msgstr "vakiotulosteen uudelleenohjaus epäonnistui" msgid "ignoring input" msgstr "jätetään kaikki argumentit huomiotta" -#: src/nohup.c:163 src/nohup.c:165 -#, c-format -msgid "failed to open %s" -msgstr "tiedoston %s avaaminen epäonnistui" - #: src/nohup.c:175 #, fuzzy, c-format msgid "ignoring input and appending output to %s" @@ -6596,33 +6635,370 @@ msgid "failed to redirect standard error" msgstr "vakiovirhetulosteen uudelleenohjaus epäonnistui" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:32 +#: src/nproc.c:33 msgid "Giuseppe Scrivano" msgstr "" -#: src/nproc.c:56 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 +#: src/nproc.c:57 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Käyttö: %s [VALITSIN]...\n" -#: src/nproc.c:57 +#: src/nproc.c:58 msgid "" "Print the number of processing units available to the current process,\n" "which may be less than the number of online processors\n" "\n" msgstr "" -#: src/nproc.c:62 +#: src/nproc.c:63 msgid "" " --all print the number of installed processors\n" " --ignore=N if possible, exclude N processing units\n" msgstr "" -#: src/nproc.c:106 +#: src/nproc.c:107 #, fuzzy, c-format 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 +msgid "Assaf Gordon" +msgstr "" + +#: src/numfmt.c:676 +#, fuzzy, c-format +msgid "value too large to be converted: '%s'" +msgstr "%s: arvoa ei muunnettu kokonaisuudessaan" + +#: src/numfmt.c:680 +#, fuzzy, c-format +msgid "invalid number: '%s'" +msgstr "virheellinen määrä %s" + +#: src/numfmt.c:684 +#, c-format +msgid "rejecting suffix in input: '%s' (consider using --from)" +msgstr "" + +#: src/numfmt.c:688 +#, fuzzy, c-format +msgid "invalid suffix in input: '%s'" +msgstr "argumentti ”%s” ei kelpaa" + +#: src/numfmt.c:692 +#, c-format +msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)" +msgstr "" + +#: src/numfmt.c:723 +#, fuzzy, c-format +msgid "failed to prepare value '%Lf' for printing" +msgstr "%s: avaaminen kirjoitustilassa epäonnistui" + +#: src/numfmt.c:787 +#, fuzzy, c-format +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 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [NUMBER]...\n" +msgstr "Käyttö: %s [VALITSIN]... [TUNNUS]...\n" + +#: src/numfmt.c:816 +msgid "" +"Reformat NUMBER(s), or the numbers from standard input if none are " +"specified.\n" +msgstr "" + +#: src/numfmt.c:820 +msgid " --debug print warnings about invalid input\n" +msgstr "" + +#: src/numfmt.c:823 +msgid "" +" -d, --delimiter=X use X instead of whitespace for field delimiter\n" +msgstr "" + +#: src/numfmt.c:826 +msgid "" +" --field=N replace the number in input field N (default is 1)\n" +msgstr "" + +#: src/numfmt.c:829 +msgid "" +" --format=FORMAT use printf style floating-point FORMAT;\n" +" see FORMAT below for details\n" +msgstr "" + +#: src/numfmt.c:833 +msgid "" +" --from=UNIT auto-scale input numbers to UNITs; default is " +"'none';\n" +" see UNIT below\n" +msgstr "" + +#: src/numfmt.c:837 +msgid "" +" --from-unit=N specify the input unit size (instead of the default " +"1)\n" +msgstr "" + +#: src/numfmt.c:840 +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 "" + +#: src/numfmt.c:844 +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 +msgid "" +" --invalid=MODE failure mode for invalid numbers: MODE can be:\n" +" abort (default), fail, warn, ignore\n" +msgstr "" + +#: src/numfmt.c:852 +msgid "" +" --padding=N pad the output to N characters; positive N will\n" +" right-align; negative N will left-align;\n" +" padding is ignored if the output is wider than N;\n" +" the default is to automatically pad if a " +"whitespace\n" +" is found\n" +msgstr "" + +#: src/numfmt.c:859 +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 +msgid "" +" --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" +" SUFFIX in input numbers\n" +msgstr "" + +#: src/numfmt.c:867 +msgid "" +" --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" +msgstr "" + +#: src/numfmt.c:870 +msgid "" +" --to-unit=N the output unit size (instead of the default 1)\n" +msgstr "" + +#: src/numfmt.c:877 +#, fuzzy +msgid "" +"\n" +"UNIT options:\n" +msgstr "" +"Lajitteluvalitsimet:\n" +"\n" + +#: src/numfmt.c:880 +msgid " none no auto-scaling is done; suffixes will trigger an error\n" +msgstr "" + +#: src/numfmt.c:883 +msgid "" +" auto accept optional single/two letter suffix:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" +msgstr "" + +#: src/numfmt.c:889 +msgid "" +" si accept optional single letter suffix:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:894 +msgid "" +" iec accept optional single letter suffix:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:899 +msgid "" +" iec-i accept optional two-letter suffix:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:905 +#, 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" +msgstr "" + +#: src/numfmt.c:912 +#, c-format +msgid "" +"\n" +"Exit status is 0 if all input numbers were successfully converted.\n" +"By default, %s will stop at the first conversion error with exit status 2.\n" +"With --invalid='fail' a warning is printed for each conversion error\n" +"and the exit status is 2. With --invalid='warn' each conversion error is\n" +"diagnosed, but the exit status is 0. With --invalid='ignore' conversion\n" +"errors are not diagnosed and the exit status is 0.\n" +msgstr "" + +#: src/numfmt.c:921 +#, c-format +msgid "" +"\n" +"Examples:\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" +msgstr "" + +#: src/numfmt.c:974 src/seq.c:212 +#, fuzzy, c-format +msgid "format %s has no %% directive" +msgstr "kohde %s ei ole hakemisto" + +#: src/numfmt.c:990 +#, fuzzy, c-format +msgid "invalid format %s (width overflow)" +msgstr "virheellinen muodon leveys" + +#: src/numfmt.c:1007 src/seq.c:229 +#, c-format +msgid "format %s ends in %%" +msgstr "" + +#: src/numfmt.c:1010 +#, c-format +msgid "invalid format %s, directive must be %%['][-][N]f" +msgstr "" + +#: src/numfmt.c:1018 src/seq.c:236 +#, 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 "argumentti ”%s” ei kelpaa" + +#: src/numfmt.c:1092 +#, c-format +msgid "value too large to be printed: '%Lg' (consider using --to)" +msgstr "" + +#: src/numfmt.c:1100 +#, c-format +msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" +msgstr "" + +#: src/numfmt.c:1184 +#, c-format +msgid "large input value '%s': possible precision loss" +msgstr "" + +#: src/numfmt.c:1293 +#, 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 "virheellinen sivuväli %s" + +#: src/numfmt.c:1401 +#, fuzzy, c-format +msgid "invalid field value '%s'" +msgstr "virheellinen sarakenumero: \"%s\"" + +#: src/numfmt.c:1430 +#, fuzzy, c-format +msgid "invalid header value '%s'" +msgstr "virheellinen päiväys %s" + +#: src/numfmt.c:1456 +#, 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 +#, fuzzy, c-format +msgid "no conversion option specified" +msgstr "useita -l tai -t -valitsimia annettu" + +#: src/numfmt.c:1471 +#, 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 +#, c-format +msgid "grouping has no effect in this locale" +msgstr "" + +#: src/numfmt.c:1486 +#, c-format +msgid "--header ignored with command-line input" +msgstr "" + +#: src/numfmt.c:1511 +#, fuzzy, c-format +msgid "error reading input" +msgstr "virhe luettaessa tiedostoa %s" + +#: src/numfmt.c:1520 +#, fuzzy, c-format +msgid "failed to convert some of the input numbers" +msgstr "vakiotulosteen uudelleenohjaus epäonnistui" + #: src/od.c:294 #, c-format msgid "" @@ -6653,28 +7029,50 @@ msgstr "" "\n" #: src/od.c:307 -msgid "All arguments to long options are mandatory for short options.\n" +#, fuzzy +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" +"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" +"at first byte printed, incremented when dump is progressing.\n" +"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 "" -"Pitkien valitsinten pakolliset argumentit ovat pakollisia myös lyhyille.\n" +"\n" +"Vanhassa syntaksissa (toinen kutsumuoto), SIIRTYMÄ merkitsee -j SIIRTYMÄ.\n" +"NIMIÖ on ensimmäisen tulostetun tavun pseudo-osoite, joka suurenee " +"vedostuksen\n" +"edistyessä. Etuliite 0x tai 0X merkitsee SIIRTYMÄssä ja NIMIÖssä\n" +"heksadesimaaliesitystä. Jälkiliitteet voivat olla . oktaaliesitykselle, ja\n" +"b 512:lla kertomiselle.\n" +"\n" +"TYYPPI koostuu yhdestä tai useammasta seuraavista määrityksistä:\n" +"\n" +" a nimetty merkki\n" +" c ASCII-merkki tai kenoviivasuojaus\n" -#: src/od.c:310 +#: src/od.c:318 +#, fuzzy msgid "" -" -A, --address-radix=RADIX decide how file offsets are printed\n" +" -A, --address-radix=RADIX output format for file offsets. RADIX is one\n" +" of [doxn], for Decimal, Octal, Hex or None\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:314 +#: src/od.c:323 #, 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" -" --traditional accept arguments in traditional form\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=MÄÄRÄ rajoita vedos MÄÄRÄän syötetavuja\n" " -S, --strings[=MÄÄRÄ] tulosta vähintään MÄÄRÄn verran tulostuvia\n" @@ -6685,10 +7083,11 @@ msgstr "" " -w, --width[=MÄÄRÄ] tulosta MÄÄRÄ tavua kullekin tulosteriville\n" " --traditional hyväksy argumentteja perinteisessä muodossa\n" -#: src/od.c:324 +#: src/od.c:336 #, fuzzy 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" @@ -6703,7 +7102,7 @@ msgstr "" " -d sama kuin -t u2, valitse etumerkittömät 10-kantaiset lyhyet kok." "luvut\n" -#: src/od.c:332 +#: src/od.c:345 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -6719,40 +7118,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:340 -#, fuzzy +#: src/od.c:353 msgid "" "\n" -"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" -"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" -"at first byte printed, incremented when dump is progressing.\n" -"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" -"Vanhassa syntaksissa (toinen kutsumuoto), SIIRTYMÄ merkitsee -j SIIRTYMÄ.\n" -"NIMIÖ on ensimmäisen tulostetun tavun pseudo-osoite, joka suurenee " -"vedostuksen\n" -"edistyessä. Etuliite 0x tai 0X merkitsee SIIRTYMÄssä ja NIMIÖssä\n" -"heksadesimaaliesitystä. Jälkiliitteet voivat olla . oktaaliesitykselle, ja\n" -"b 512:lla kertomiselle.\n" -"\n" -"TYYPPI koostuu yhdestä tai useammasta seuraavista määrityksistä:\n" -"\n" -" a nimetty merkki\n" -" c ASCII-merkki tai kenoviivasuojaus\n" - -#: src/od.c:349 -msgid "" "\n" "TYPE is made up of one or more of these specifications:\n" -"\n" " a named character, ignoring high-order bit\n" " c ASCII character or backslash escape\n" msgstr "" -#: src/od.c:356 +#: src/od.c:360 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -6766,10 +7141,11 @@ msgstr "" " u[KOKO] etumerkitön kymmenkantainen luku, KOKO tavua/kokonaisluku\n" " x[KOKO] kuusitoistakantainen luku, KOKO tavua/kokonaisluku\n" -#: src/od.c:363 +#: src/od.c:367 +#, fuzzy msgid "" "\n" -"SIZE is a number. For TYPE in doux, SIZE may also be C for\n" +"SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" "sizeof(char), S for sizeof(short), I for sizeof(int) or L for\n" "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" @@ -6780,41 +7156,40 @@ 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:370 -#, fuzzy +#: src/od.c:374 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" +"Adding a z suffix to any type displays printable characters at the end of\n" +"each output line.\n" msgstr "" -"\n" -"KANTA on d desimaaliesitykselle, o oktaaliselle, x heksadesimaaliselle tai\n" -"n tyhjälle. TAVUT on heksadesimaalinen etuliitteen 0x tai 0X kanssa, se\n" -"kerrotaan 512:lla b-jälkiliitteen kanssa, 1024:llä k:n, ja 1048576:lla m:n\n" -"kanssa. Jälkiliitteen z lisääminen mihin tahansa tyyppiin lisää jokaisen\n" -"tulosterivin loppuun näkymän tulostuvista merkeistä. " -#: src/od.c:380 +#: src/od.c:379 #, 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" +"\n" +"\n" +"BYTES is hex with 0x or 0X prefix, and may have a multiplier suffix:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"and so on for G, T, P, E, Z, Y.\n" msgstr "" -"--string ilman lukuarvoa on 3. --width ilman lukuarvoa on 32.\n" -"Oletuksena od käyttää -A o -t d2 -w 16.\n" +"\n" +"LOHKOT- ja TAVUT-arvoihin voidaan liittää perään seuraavat kertoimet:\n" +"xM M, c 1, w 2, b 512, kB 1000, K 1024, MB 1000², M 1024²,\n" +"GB 1000³, G 1024³, ja niin edelleen kertoimet T, P, E, Z, Y.\n" +"\n" +"Kukin MUUNNOS voi olla:\n" +"\n" -#: src/od.c:633 src/od.c:753 +#: src/od.c:639 src/od.c:759 #, fuzzy, c-format msgid "invalid type string %s" msgstr "virheellinen muotoilumerkkijono %s" -#: src/od.c:643 +#: src/od.c:649 #, c-format msgid "" "invalid type string %s;\n" @@ -6823,7 +7198,7 @@ msgstr "" "virheellinen tyyppi %s;\n" "järjestelmä ei tarjoa %lu-tavuista perustyyppiä" -#: src/od.c:764 +#: src/od.c:770 #, c-format msgid "" "invalid type string %s;\n" @@ -6832,38 +7207,38 @@ msgstr "" "virheellinen tyyppi %s;\n" "järjestelmä ei tarjoa %lu-tavuista liukulukutyyppiä" -#: src/od.c:822 +#: src/od.c:828 #, fuzzy, c-format msgid "invalid character '%c' in type string %s" msgstr "virheellinen merkki ”%c” muotoilumerkkijonossa ”%s”" -#: src/od.c:1047 +#: src/od.c:1053 #, c-format msgid "cannot skip past end of combined input" msgstr "yhdistetyn syötteen lopun yli ei voi ohittaa" -#: src/od.c:1603 +#: src/od.c:1609 #, 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:1729 +#: src/od.c:1735 #, c-format msgid "no type may be specified when dumping strings" msgstr "tyyppiä ei voi antaa merkkijonoja vedostettaessa" -#: src/od.c:1804 +#: src/od.c:1810 #, fuzzy msgid "compatibility mode supports at most one file" msgstr "Yhteensopivuustila tukee vain yhtä tiedostoa." -#: src/od.c:1825 +#: src/od.c:1831 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "ohitettavat-tavut + luettavat-tavut on liian suuri" -#: src/od.c:1868 +#: src/od.c:1874 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "varoitus: virheellinen leveys %lu; käytetään arvoa %d" @@ -6879,11 +7254,11 @@ msgid "standard input is closed" msgstr "vakiosyöte on suljettu" #: 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" -"\n" msgstr "" "Kirjoita peräkkäisiä vastaavia rivejä kustakin TIEDOSTOsta " "vakiotulosteeseen,\n" @@ -6892,7 +7267,7 @@ msgstr "" "vakiosyötettä.\n" "\n" -#: src/paste.c:448 +#: 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" @@ -6902,7 +7277,7 @@ msgstr "" " -s, --serial liitä yksi tiedosto kerrallaan rinnakkaisuuden\n" " sijaan\n" -#: src/paste.c:509 +#: src/paste.c:508 #, c-format msgid "delimiter list ends with an unescaped backslash: %s" msgstr "" @@ -6957,80 +7332,80 @@ msgid "Kaveh Ghazi" msgstr "Kaveh Ghazi" #. TRANSLATORS: Real name is unknown; at most 19 characters. -#: src/pinky.c:250 +#: src/pinky.c:242 msgid " ???" msgstr "" #. TRANSLATORS: Idle time is unknown; at most 5 characters. -#: src/pinky.c:274 +#: src/pinky.c:266 msgid "?????" msgstr "?????" -#: src/pinky.c:323 +#: src/pinky.c:314 #, c-format msgid "Login name: " msgstr "Tunnus: " -#: src/pinky.c:326 +#: src/pinky.c:317 #, c-format msgid "In real life: " msgstr "Tosielämässä: " #. TRANSLATORS: Real name is unknown; no hard limit. -#: src/pinky.c:330 +#: src/pinky.c:321 msgid "???\n" msgstr "???\n" -#: src/pinky.c:350 +#: src/pinky.c:341 #, c-format msgid "Directory: " msgstr "Hakemisto: " -#: src/pinky.c:352 +#: src/pinky.c:343 #, c-format msgid "Shell: " msgstr "Kuori: " -#: src/pinky.c:371 +#: src/pinky.c:362 #, c-format msgid "Project: " msgstr "Projekti: " -#: src/pinky.c:395 +#: src/pinky.c:386 #, c-format msgid "Plan:\n" msgstr "Suunnitelma:\n" -#: src/pinky.c:414 +#: src/pinky.c:405 msgid "Login" msgstr "Tunnus" -#: src/pinky.c:416 +#: src/pinky.c:407 msgid "Name" msgstr "Nimi" -#: src/pinky.c:417 +#: src/pinky.c:408 msgid " TTY" msgstr " TTY" -#: src/pinky.c:419 +#: src/pinky.c:410 msgid "Idle" msgstr "Jouten" -#: src/pinky.c:420 +#: src/pinky.c:411 msgid "When" msgstr "Milloin" -#: src/pinky.c:423 +#: src/pinky.c:414 msgid "Where" msgstr "Missä" -#: src/pinky.c:502 +#: src/pinky.c:493 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Käyttö: %s [VALITSIN]... [TUNNUS]...\n" -#: src/pinky.c:503 +#: src/pinky.c:494 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7046,7 +7421,7 @@ msgstr "" " -p älä näytä plan-tiedostoa pitkässä mallissa\n" " -s lyhyen mallin tuloste, tämä on oletus\n" -#: src/pinky.c:511 +#: src/pinky.c:502 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7062,7 +7437,7 @@ msgstr "" "joutenoloaikaa\n" " lyhyessä mallissa\n" -#: src/pinky.c:520 +#: src/pinky.c:511 #, fuzzy, c-format msgid "" "\n" @@ -7073,7 +7448,7 @@ msgstr "" "Kevyt ”finger”-ohjelma; näyttää käyttäjätietoja.\n" "utmp-tiedostona %s.\n" -#: src/pinky.c:604 +#: src/pinky.c:595 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "" @@ -7089,90 +7464,89 @@ msgstr "Pete TerMaat" msgid "Roland Huebner" msgstr "Roland Hübner" -#: src/pr.c:912 +#: src/pr.c:908 #, fuzzy, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "" "puuttuva argumentti valitsimelle ”--pages=ENSIMMÄINEN_SIVU[:VIIMEINEN_SIVU]”" -#: src/pr.c:914 +#: src/pr.c:910 #, c-format msgid "invalid page range %s" msgstr "virheellinen sivuväli %s" -#: src/pr.c:979 +#: src/pr.c:975 #, fuzzy, c-format msgid "'-l PAGE_LENGTH' invalid number of lines: %s" msgstr "virheellinen rivimäärä valitsimelle ”-n SIVUN_PITUUS”: %s" -#: src/pr.c:1003 +#: src/pr.c:999 #, fuzzy, c-format msgid "'-N NUMBER' invalid starting line number: %s" msgstr "virheellinen aloitusrivinumero valitsimelle ”-N LUKU”: %s" -#: src/pr.c:1015 +#: src/pr.c:1011 #, fuzzy, c-format msgid "'-o MARGIN' invalid line offset: %s" msgstr "virheellinen rivisiirtymä valitsimelle ”-o MARGINAALI”: %s" -#: src/pr.c:1056 +#: src/pr.c:1052 #, fuzzy, c-format msgid "'-w PAGE_WIDTH' invalid number of characters: %s" msgstr "virheellinen merkkimäärä valitsimelle ”-w SIVUN_LEVEYS”: %s" -#: src/pr.c:1070 +#: src/pr.c:1066 #, fuzzy, c-format msgid "'-W PAGE_WIDTH' invalid number of characters: %s" msgstr "virheellinen merkkimäärä valitsimelle ”-W SIVUN_LEVEYS”: %s" -#: src/pr.c:1100 +#: src/pr.c:1096 #, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "palstojen määrää ei voi antaa tulostettaessa rinnakkain" -#: src/pr.c:1104 +#: src/pr.c:1100 #, fuzzy, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "" "Sekä tulostusta palstoittaen vaakasuunnassa että rinnakkaista tulostusta ei\n" "voi käyttää samaan aikaan." -#: src/pr.c:1200 +#: src/pr.c:1196 #, fuzzy, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "" "ylimääräisiä merkkejä tai virheellinen määrä argumentissa valitsimelle ”-" "%c”: %s" -#: src/pr.c:1304 +#: src/pr.c:1293 #, c-format msgid "page width too narrow" msgstr "sivun leveys on liian pieni" -#: src/pr.c:2369 +#: src/pr.c:2353 #, c-format msgid "starting page number %<PRIuMAX> exceeds page count %<PRIuMAX>" msgstr "" "aloitussivunumero %<PRIuMAX> on suurempi kuin sivujen kokonaismäärä " "%<PRIuMAX>" -#: src/pr.c:2396 +#: src/pr.c:2380 #, c-format msgid "page number overflow" msgstr "sivunumeroinnin ylivuoto" -#: src/pr.c:2401 +#: src/pr.c:2385 #, c-format msgid "Page %<PRIuMAX>" msgstr "Sivu %<PRIuMAX>" -#: src/pr.c:2773 -msgid "" -"Paginate or columnate FILE(s) for printing.\n" -"\n" +#: src/pr.c:2757 +#, fuzzy +msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "Numeroi sivut tai palstoita TIEDOSTO(t) tulostusta varten.\n" -#: src/pr.c:2780 +#: src/pr.c:2763 #, fuzzy msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" @@ -7192,7 +7566,7 @@ msgstr "" " ole annettu. Tasapainota kunkin sivun palstojen\n" " rivimäärä.\n" -#: src/pr.c:2788 +#: src/pr.c:2771 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7209,7 +7583,7 @@ msgstr "" " -d, --double-space\n" " tulosta käyttäen kaksinkertaista riviväliä\n" -#: src/pr.c:2796 +#: src/pr.c:2779 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7230,7 +7604,7 @@ msgstr "" " kanssa, tai 5-rivisellä ja otsakkeella ja lopukkeella\n" " ilman valitsinta -F)\n" -#: src/pr.c:2806 +#: src/pr.c:2789 #, fuzzy msgid "" " -h, --header=HEADER\n" @@ -7256,7 +7630,7 @@ msgstr "" "[=MJONO]\n" " asettaa erottimet\n" -#: src/pr.c:2815 +#: src/pr.c:2798 #, fuzzy msgid "" " -l, --length=PAGE_LENGTH\n" @@ -7274,7 +7648,7 @@ msgstr "" "rivit\n" " valitsimella -J\n" -#: src/pr.c:2822 +#: src/pr.c:2805 #, fuzzy msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" @@ -7292,7 +7666,7 @@ msgstr "" " aloita laskeminen LUVUlla ensimmäisen tulostetun sivun\n" " 1. riviltä (katso +ENSIMMÄINEN_SIVU)\n" -#: src/pr.c:2830 +#: src/pr.c:2813 #, fuzzy msgid "" " -o, --indent=MARGIN\n" @@ -7308,7 +7682,7 @@ msgstr "" " -r, --no-file-warnings\n" " älä varoita, jos tiedostoa ei voida avata\n" -#: src/pr.c:2837 +#: src/pr.c:2820 #, fuzzy msgid "" " -s[CHAR], --separator[=CHAR]\n" @@ -7325,7 +7699,7 @@ msgstr "" " kolmen sarakevalitsimen osalta (-SARAKE|-a -SARAKE|-m),\n" " paitsi jos -w on annettu\n" -#: src/pr.c:2844 +#: src/pr.c:2827 #, fuzzy msgid "" " -S[STRING], --sep-string[=STRING]\n" @@ -7342,7 +7716,7 @@ msgstr "" " sarakevalitsimiin\n" " -t, --omit-header jätä pois sivun otsakkeet ja lopukkeet\n" -#: src/pr.c:2851 +#: src/pr.c:2834 #, fuzzy msgid "" " -T, --omit-pagination\n" @@ -7367,7 +7741,7 @@ msgstr "" " SIVUN_LEVEYS (72) merkkiä, -s[merkki] ottaa pois\n" " käytöstä (72)\n" -#: src/pr.c:2861 +#: src/pr.c:2844 #, fuzzy msgid "" " -W, --page-width=PAGE_WIDTH\n" @@ -7381,7 +7755,7 @@ msgstr "" " katkaise rivit, paitsi jos valitsin -J on käytössä, ei\n" " vaikutusta valitsimen -S tai -s kanssa\n" -#: src/pr.c:2869 +#: src/pr.c:2852 #, fuzzy msgid "" "\n" @@ -7547,16 +7921,16 @@ msgstr "" " tai: %s -G [VALITSIN]... [SYÖTE [TULOSTE]]\n" #: src/ptx.c:1821 +#, fuzzy msgid "" "Output a permuted index, including context, of the words in the input " "files.\n" -"\n" msgstr "" "Tulosta kontekstin sisältävä, permutoitu luettelo syötetiedostojen " "sanoista.\n" "\n" -#: src/ptx.c:1828 +#: src/ptx.c:1827 #, fuzzy msgid "" " -A, --auto-reference output automatically generated references\n" @@ -7568,7 +7942,7 @@ msgstr "" " -F, --flag-truncation=MJONO käytä MJONOa rivinkatkaisujen " "merkitsemiseen\n" -#: src/ptx.c:1833 +#: src/ptx.c:1832 #, fuzzy msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" @@ -7585,7 +7959,7 @@ msgstr "" " -T, --format=tex tuota tuloste TeX-käskyinä\n" # Osa on aika hämäriä. -#: src/ptx.c:1840 +#: src/ptx.c:1839 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -7604,7 +7978,7 @@ msgstr "" " -o, --only-file=TIEDOSTO lue ainoiden sanojen luettelo tästä " "TIEDOSTOsta\n" -#: src/ptx.c:1848 +#: src/ptx.c:1847 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -7616,7 +7990,7 @@ msgstr "" " -w, --width=MÄÄRÄ tulosteleveys sarakkeina, viite " "poistettuna\n" -#: src/ptx.c:1855 +#: src/ptx.c:1854 #, fuzzy msgid "" "\n" @@ -7626,7 +8000,7 @@ msgstr "" "Jos TIEDOSTOA ei ole annettu, tai se on ”-”, luetaan vakiosyötettä.\n" "Oletus on ”-F /”.\n" -#: src/ptx.c:1949 +#: src/ptx.c:1948 #, fuzzy, c-format msgid "invalid gap width: %s" msgstr "virheellinen leveys: %s" @@ -7650,7 +8024,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "siirtyminen hakemistoon %s epäonnistui" -#: src/pwd.c:170 src/pwd.c:277 +#: src/pwd.c:170 src/pwd.c:277 src/split.c:373 #, fuzzy, c-format msgid "failed to stat %s" msgstr "tiedoston %s avaaminen epäonnistui" @@ -7667,14 +8041,15 @@ msgstr "jätetään huomiotta argumentit, jotka eivät ole valitsimia" # Periaatteessa voisi käyttää suomeen sopivaa translitterointia tässä. #. This is a proper name. See the gettext manual, section Names. -#: src/readlink.c:33 +#: src/readlink.c:32 msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 +#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147 +#: src/stat.c:1349 src/touch.c:212 #, c-format -msgid "Usage: %s [OPTION]... FILE\n" -msgstr "Käyttö: %s [VALITSIN]... TIEDOSTO\n" +msgid "Usage: %s [OPTION]... FILE...\n" +msgstr "Käyttö: %s [VALITSIN]... TIEDOSTO...\n" #: src/readlink.c:63 #, fuzzy @@ -7705,10 +8080,12 @@ msgid "" "recursively,\n" " without requirements on components " "existence\n" -" -n, --no-newline do not output the trailing newline\n" +" -n, --no-newline do not output the trailing delimiter\n" " -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" msgstr "" " -f, --canonicalize muunna symlinkki vakiomuotoon seuraamalla annetun\n" " polun jokaista symlinkkiä rekursiivisesti\n" @@ -7716,11 +8093,10 @@ msgstr "" " -q, --quiet, --silent vaienna useimmat virheilmoitukset\n" " -v, --verbose näytä virheilmoitukset\n" -#: src/realpath.c:71 src/rm.c:134 src/shred.c:147 src/stat.c:1330 -#: src/touch.c:215 -#, c-format -msgid "Usage: %s [OPTION]... FILE...\n" -msgstr "Käyttö: %s [VALITSIN]... TIEDOSTO...\n" +#: src/readlink.c:152 +#, fuzzy, c-format +msgid "ignoring --no-newline with multiple arguments" +msgstr "jätetään huomiotta argumentit, jotka eivät ole valitsimia" #: src/realpath.c:72 msgid "" @@ -7747,12 +8123,12 @@ msgstr "" msgid "generating relative path" msgstr "" -#: src/remove.c:286 +#: src/remove.c:273 #, c-format msgid "%s: descend into write-protected directory %s? " msgstr "%s: edetäänkö kirjoitussuojattuun hakemistoon %s? " -#: src/remove.c:287 +#: src/remove.c:274 #, c-format msgid "%s: descend into directory %s? " msgstr "%s: edetäänkö hakemistoon %s? " @@ -7761,49 +8137,49 @@ msgstr "%s: edetäänkö hakemistoon %s? " #. translate "%s: remove %s (write-protected) %s? " #. instead. It should avoid grammatical problems #. with the output of file_type. -#: src/remove.c:303 +#: src/remove.c:290 #, c-format msgid "%s: remove write-protected %s %s? " msgstr "%s: poistetaanko kirjoitussuojattu %s %s? " -#: src/remove.c:304 +#: src/remove.c:291 #, c-format msgid "%s: remove %s %s? " msgstr "%s: poistetaanko %s %s? " -#: src/remove.c:417 +#: src/remove.c:374 #, c-format msgid "removed directory: %s\n" msgstr "poistettiin hakemisto: %s\n" -#: src/remove.c:481 +#: src/remove.c:444 #, fuzzy, c-format msgid "cannot remove directory: %s" msgstr "hakemiston %s poistaminen ei onnistu" -#: src/remove.c:537 +#: src/remove.c:500 #, c-format msgid "skipping %s, since it's on a different device" msgstr "ohitetaan %s, koska se on toisella laitteella" -#: src/remove.c:557 +#: src/remove.c:520 #, fuzzy, c-format msgid "traversal failed: %s" msgstr "lukeminen epäonnistui" -#: src/remove.c:563 +#: src/remove.c:526 #, c-format msgid "" "unexpected failure: fts_info=%d: %s\n" "please report to %s" msgstr "" -#: src/rm.c:118 +#: src/rm.c:119 #, fuzzy, c-format msgid "Try '%s ./%s' to remove the file %s.\n" msgstr "Komento ”%s ./%s” poistaa tiedoston %s.\n" -#: src/rm.c:135 +#: src/rm.c:136 msgid "" "Remove (unlink) the FILE(s).\n" "\n" @@ -7812,7 +8188,7 @@ msgid "" " -i prompt before every removal\n" msgstr "" -#: src/rm.c:141 +#: src/rm.c:142 msgid "" " -I prompt once before removing more than three files, " "or\n" @@ -7824,19 +8200,20 @@ msgid "" " always (-i). Without WHEN, prompt always\n" msgstr "" -#: src/rm.c:148 +#: src/rm.c:149 msgid "" " --one-file-system when removing a hierarchy recursively, skip any\n" " directory that is on a file system different from\n" " that of the corresponding command line argument\n" msgstr "" -#: src/rm.c:153 +#: src/rm.c:154 #, fuzzy msgid "" " --no-preserve-root do not treat '/' specially\n" " --preserve-root do not remove '/' (default)\n" " -r, -R, --recursive remove directories and their contents recursively\n" +" -d, --dir remove empty directories\n" " -v, --verbose explain what is being done\n" msgstr "" " --no-preserve-root älä kohtele juurta (”/”) erityisesti (oletus)\n" @@ -7844,7 +8221,7 @@ msgstr "" " -r, -R, --recursive poista hakemistojen sisältö rekursiivisesti\n" " -v, --verbose selitä, mitä tapahtuu\n" -#: src/rm.c:161 +#: src/rm.c:163 msgid "" "\n" "By default, rm does not remove directories. Use the --recursive (-r or -R)\n" @@ -7852,7 +8229,7 @@ msgid "" "contents.\n" msgstr "" -#: src/rm.c:166 +#: src/rm.c:168 #, fuzzy, c-format msgid "" "\n" @@ -7869,7 +8246,7 @@ msgstr "" " tai\n" " %s ./-foo\n" -#: src/rm.c:175 +#: src/rm.c:177 #, fuzzy msgid "" "\n" @@ -7882,12 +8259,12 @@ msgstr "" "palauttaa. Jos palauttaminen halutaan estää, on suositeltavaa käyttää\n" "shred-komentoa.\n" -#: src/rm.c:335 +#: src/rm.c:342 #, c-format msgid "%s: remove all arguments recursively? " msgstr "" -#: src/rm.c:336 +#: src/rm.c:343 #, fuzzy, c-format msgid "%s: remove all arguments? " msgstr "%s: poistetaanko %s %s? " @@ -7946,7 +8323,10 @@ msgstr "" msgid "" "Run a program in a different security context.\n" "With neither CONTEXT nor COMMAND, print the current security context.\n" -"\n" +msgstr "" + +#: src/runcon.c:94 +msgid "" " CONTEXT Complete security context\n" " -c, --compute compute process transition context before modifying\n" " -t, --type=TYPE type (for same role as parent)\n" @@ -7956,72 +8336,72 @@ msgid "" "\n" msgstr "" -#: src/runcon.c:140 +#: src/runcon.c:144 #, c-format msgid "multiple roles" msgstr "" -#: src/runcon.c:145 +#: src/runcon.c:149 #, c-format msgid "multiple types" msgstr "" -#: src/runcon.c:150 +#: src/runcon.c:154 #, c-format msgid "multiple users" msgstr "" -#: src/runcon.c:155 +#: src/runcon.c:159 #, c-format msgid "multiple levelranges" msgstr "" -#: src/runcon.c:173 src/runcon.c:209 +#: src/runcon.c:177 src/runcon.c:213 #, fuzzy, c-format msgid "failed to get current context" msgstr "tiedoston %s ominaisuuksien hakeminen ei onnistu" -#: src/runcon.c:183 +#: src/runcon.c:187 #, c-format msgid "you must specify -c, -t, -u, -l, -r, or context" msgstr "" -#: src/runcon.c:191 +#: src/runcon.c:195 #, fuzzy, c-format msgid "no command specified" msgstr "prosessi-ID:tä ei ole annettu" -#: src/runcon.c:197 +#: src/runcon.c:201 #, c-format msgid "%s may be used only on a SELinux kernel" msgstr "" -#: src/runcon.c:223 +#: src/runcon.c:227 #, fuzzy, c-format msgid "failed to compute a new context" msgstr "tiedoston %s avaaminen epäonnistui" -#: src/runcon.c:237 +#: src/runcon.c:241 #, fuzzy, c-format msgid "failed to set new user %s" msgstr "tiedoston %s avaaminen epäonnistui" -#: src/runcon.c:239 +#: src/runcon.c:243 #, fuzzy, c-format msgid "failed to set new type %s" msgstr "tiedoston %s avaaminen epäonnistui" -#: src/runcon.c:241 +#: src/runcon.c:245 #, fuzzy, c-format msgid "failed to set new range %s" msgstr "tiedoston %s avaaminen epäonnistui" -#: src/runcon.c:243 +#: src/runcon.c:247 #, fuzzy, c-format msgid "failed to set new role %s" msgstr "tiedoston %s avaaminen epäonnistui" -#: src/runcon.c:251 +#: src/runcon.c:255 #, fuzzy, c-format msgid "unable to set security context %s" msgstr "tiedoston %s oikeuksien palauttaminen ei onnistu" @@ -8038,10 +8418,12 @@ msgstr "" " tai: %s [VALITSIN]... ALKU LISÄYS LOPPU\n" #: src/seq.c:73 +msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" +msgstr "" + +#: src/seq.c:79 #, fuzzy msgid "" -"Print numbers from FIRST to LAST, in steps of INCREMENT.\n" -"\n" " -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" @@ -8053,7 +8435,7 @@ msgstr "" " -s, --separator=MJONO käytä MJONOa erottelemaan lukuja (oletus: \\n)\n" " -w, --equal-width tasoita leveydet lisäämällä nollia lukujen eteen\n" -#: src/seq.c:82 +#: src/seq.c:86 #, fuzzy msgid "" "\n" @@ -8073,39 +8455,24 @@ msgstr "" "Jos MUOTO annetaan, sen on sisällettävä tasan yksi\n" "printf-tyylisistä liukulukuesityksistä %e, %f, %g\n" -#: src/seq.c:90 +#: src/seq.c:94 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:136 +#: src/seq.c:140 #, c-format msgid "invalid floating point argument: %s" msgstr "virheellinen liukulukuargumentti: %s" -#: src/seq.c:193 -#, fuzzy, c-format -msgid "format %s has no %% directive" -msgstr "kohde %s ei ole hakemisto" - -#: src/seq.c:210 -#, c-format -msgid "format %s ends in %%" -msgstr "" - -#: src/seq.c:213 +#: src/seq.c:232 #, fuzzy, c-format msgid "format %s has unknown %%%c directive" msgstr "tiedostolla %s on tuntematon tiedostotyyppi" -#: src/seq.c:217 -#, c-format -msgid "format %s has too many %% directives" -msgstr "" - -#: src/seq.c:431 +#: src/seq.c:555 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "muotoilua ei voi määritellä kun tulostetaan tasalevyisiä lukuja" @@ -8145,27 +8512,27 @@ msgid "" " (if specified) supplemental group IDs to GID1, ...\n" msgstr "" -#: src/setuidgid.c:163 +#: src/setuidgid.c:162 #, c-format msgid "unknown user-ID: %s" msgstr "tuntematon käyttäjä-ID: %s" -#: src/setuidgid.c:174 +#: src/setuidgid.c:173 #, c-format msgid "to use user-ID %s you need to use -g too" msgstr "" -#: src/setuidgid.c:191 +#: src/setuidgid.c:190 #, fuzzy, c-format msgid "failed to set supplemental group(s)" msgstr "lisäryhmän asetus ei onnistu" -#: src/setuidgid.c:201 +#: 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:205 +#: 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" @@ -8176,16 +8543,16 @@ msgid "Colin Plumb" msgstr "Colin Plumb" #: src/shred.c:148 +#, 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" -"\n" msgstr "" "Ylikirjoita annetut TIEDOSTO(t) toistuvasti, jotta sisällön\n" "palauttaminen olisi vaikeampaa jopa hyvin kalliilla laitteilla.\n" "\n" -#: src/shred.c:156 +#: src/shred.c:155 #, fuzzy, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -8198,7 +8565,7 @@ msgstr "" " -s, --size=N silppua näin monta tavua (jälkiliitteet kuten K, M,\n" " G hyväksytään)\n" -#: src/shred.c:162 +#: src/shred.c:161 #, fuzzy msgid "" " -u, --remove truncate and remove file after overwriting\n" @@ -8214,7 +8581,7 @@ msgstr "" " -z, --zero ylikirjoita lopuksi nollia silppuamisen kätkemiseksi\n" " - silppua vakiotuloste\n" -#: src/shred.c:171 +#: src/shred.c:170 msgid "" "\n" "If FILE is -, shred standard output.\n" @@ -8235,7 +8602,7 @@ msgstr "" "yleensä käsiteltäessä tavallisia tiedostoja.\n" "\n" -#: src/shred.c:181 +#: src/shred.c:180 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" @@ -8255,7 +8622,7 @@ msgstr "" "toimintatiloissa:\n" "\n" -#: src/shred.c:189 +#: src/shred.c:188 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -8277,7 +8644,7 @@ msgstr "" " Appliancen NFS-palvelin\n" "\n" -#: src/shred.c:199 +#: src/shred.c:198 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -8291,7 +8658,7 @@ msgstr "" "* tiivistetyt tiedostojärjestelmät\n" "\n" -#: src/shred.c:206 +#: src/shred.c:205 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" @@ -8303,7 +8670,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:216 +#: src/shred.c:215 #, fuzzy msgid "" "In addition, file system backups and remote mirrors may contain copies\n" @@ -8319,122 +8686,122 @@ msgstr "" "tiedostosta kopioita, joita ei voida poistaa, ja jotka mahdollistavat\n" "silputun tiedoston palauttamisen myöhemmin.\n" -#: src/shred.c:296 +#: src/shred.c:295 #, c-format msgid "%s: fdatasync failed" msgstr "%s: fdatasync epäonnistui" -#: src/shred.c:307 +#: src/shred.c:306 #, c-format msgid "%s: fsync failed" msgstr "%s: fsync epäonnistui" -#: src/shred.c:384 +#: src/shred.c:383 #, c-format msgid "%s: cannot rewind" msgstr "%s: taaksepäin siirtyminen ei onnistu" -#: src/shred.c:403 +#: src/shred.c:402 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: ylikirjoituskerta %lu/%lu (%s)..." -#: src/shred.c:453 +#: src/shred.c:452 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: virhe kirjoitettaessa siirtymässä %s" -#: src/shred.c:471 +#: src/shred.c:470 #, c-format msgid "%s: lseek failed" msgstr "%s: lseek epäonnistui" -#: src/shred.c:482 +#: src/shred.c:481 #, c-format msgid "%s: file too large" msgstr "%s: tiedosto on liian suuri" -#: src/shred.c:505 +#: src/shred.c:504 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: ylikirjoituskerta %lu/%lu (%s)...%s" -#: src/shred.c:521 +#: src/shred.c:520 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: ylikirjoituskerta %lu/%lu (%s)...%s/%s %d%%" -#: src/shred.c:768 +#: src/shred.c:767 #, c-format msgid "%s: fstat failed" msgstr "%s: fstat epäonnistui" -#: src/shred.c:779 +#: src/shred.c:778 #, c-format msgid "%s: invalid file type" msgstr "%s: virheellinen tiedostotyyppi" -#: src/shred.c:798 +#: src/shred.c:797 #, c-format msgid "%s: file has negative size" msgstr "%s: tiedoston koko on negatiivinen" -#: src/shred.c:865 +#: src/shred.c:864 src/sort.c:932 src/split.c:378 #, c-format msgid "%s: error truncating" msgstr "%s: virhe typistettäessä" -#: src/shred.c:881 +#: src/shred.c:880 #, c-format msgid "%s: fcntl failed" msgstr "%s: fcntl epäonnistui" -#: src/shred.c:886 +#: src/shred.c:885 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "%s: vain lisäykseen soveltuvaa tiedostokahvaa ei voi silputa" -#: src/shred.c:968 +#: src/shred.c:967 #, c-format msgid "%s: removing" msgstr "%s: poistetaan" -#: src/shred.c:992 +#: src/shred.c:991 #, c-format msgid "%s: renamed to %s" msgstr "%s: nimettiin uudelleen nimelle %s" -#: src/shred.c:1014 +#: src/shred.c:1013 #, c-format msgid "%s: failed to remove" msgstr "%s: poisto epäonnistui" -#: src/shred.c:1018 +#: src/shred.c:1017 #, c-format msgid "%s: removed" msgstr "%s: poistettu" -#: src/shred.c:1025 src/shred.c:1068 +#: src/shred.c:1024 src/shred.c:1067 #, c-format msgid "%s: failed to close" msgstr "%s: sulkeminen epäonnistui" -#: src/shred.c:1061 +#: src/shred.c:1060 #, c-format msgid "%s: failed to open for writing" msgstr "%s: avaaminen kirjoitustilassa epäonnistui" -#: src/shred.c:1126 +#: src/shred.c:1125 #, c-format msgid "%s: invalid number of passes" msgstr "%s: virheellinen ylikirjoituskertojen määrä" -#: src/shred.c:1135 src/shuf.c:291 src/sort.c:4387 +#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441 #, fuzzy, c-format msgid "multiple random sources specified" msgstr "useita tulostusmuotoja annettu" -#: src/shred.c:1149 +#: src/shred.c:1148 #, c-format msgid "%s: invalid file size" msgstr "%s: virheellinen tiedostokoko" @@ -8452,14 +8819,12 @@ msgstr "" #: src/shuf.c:54 #, fuzzy -msgid "" -"Write a random permutation of the input lines to standard output.\n" -"\n" +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:61 +#: src/shuf.c:60 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 " @@ -8470,27 +8835,27 @@ msgid "" " -z, --zero-terminated end lines with 0 byte, not newline\n" msgstr "" -#: src/shuf.c:245 +#: src/shuf.c:244 #, fuzzy, c-format msgid "multiple -i options specified" msgstr "useita -l tai -t -valitsimia annettu" -#: src/shuf.c:265 +#: src/shuf.c:264 #, fuzzy, c-format msgid "invalid input range %s" msgstr "virheellinen leveys: %s" -#: src/shuf.c:278 +#: src/shuf.c:277 #, fuzzy, c-format msgid "invalid line count %s" msgstr "virheellinen rivileveys: %s" -#: src/shuf.c:285 src/sort.c:4381 +#: src/shuf.c:284 src/sort.c:4435 #, c-format msgid "multiple output files specified" msgstr "useita tulostiedostoja annettu" -#: src/shuf.c:311 +#: src/shuf.c:310 #, c-format msgid "cannot combine -e and -i options" msgstr "valitsimia -e ja -i ei voi käyttää yhdessä" @@ -8516,7 +8881,7 @@ msgstr "" "mielivaltainen liukuluku.\n" "\n" -#: src/sleep.c:135 src/timeout.c:295 +#: src/sleep.c:135 src/timeout.c:320 #, c-format msgid "invalid time interval %s" msgstr "ajanjakso ei kelpaa: %s" @@ -8526,15 +8891,14 @@ msgstr "ajanjakso ei kelpaa: %s" msgid "cannot read realtime clock" msgstr "tosiaikaisen kellon luku ei onnistu" -#: src/sort.c:395 -msgid "" -"Write sorted concatenation of all FILE(s) to standard output.\n" -"\n" +#: src/sort.c:399 +#, 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:402 +#: src/sort.c:405 msgid "" "Ordering options:\n" "\n" @@ -8542,7 +8906,7 @@ msgstr "" "Lajitteluvalitsimet:\n" "\n" -#: src/sort.c:406 +#: src/sort.c:409 #, fuzzy msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" @@ -8555,19 +8919,19 @@ msgstr "" "merkkien mukaan\n" " -f, --ignore-case älä huomioi kirjainkokoa\n" -#: src/sort.c:412 +#: src/sort.c:415 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:417 +#: src/sort.c:420 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" -#: src/sort.c:420 +#: src/sort.c:423 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -8575,7 +8939,7 @@ msgid "" " -r, --reverse reverse the result of comparisons\n" msgstr "" -#: src/sort.c:426 +#: src/sort.c:429 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -8585,7 +8949,7 @@ msgid "" "\n" msgstr "" -#: src/sort.c:434 +#: src/sort.c:437 #, fuzzy msgid "" "Other options:\n" @@ -8594,13 +8958,13 @@ msgstr "" "Lajitteluvalitsimet:\n" "\n" -#: src/sort.c:438 +#: src/sort.c:441 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" msgstr "" -#: src/sort.c:442 +#: src/sort.c:445 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 " @@ -8609,7 +8973,7 @@ msgid "" " decompress them with PROG -d\n" msgstr "" -#: src/sort.c:449 +#: src/sort.c:452 #, fuzzy msgid "" " --debug annotate the part of the line used to sort,\n" @@ -8621,13 +8985,13 @@ msgstr "" " -L, --max-line-length näytä pisimmän rivin pituus\n" " -w, --words näytä sanamäärät\n" -#: src/sort.c:456 +#: src/sort.c:459 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:460 +#: src/sort.c:463 #, fuzzy msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" @@ -8647,7 +9011,7 @@ msgstr "" "”viimeinen oljenkorsi”-vertailu\n" " -S, --buffer-size=KOKO käytä KOKOa muistipuskurille\n" -#: src/sort.c:466 +#: src/sort.c:469 #, fuzzy, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -8672,11 +9036,11 @@ msgstr "" " ilman -c:tä: tulosta vain ensimmäinen\n" " yhtäläisten joukosta\n" -#: src/sort.c:475 +#: 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:480 +#: src/sort.c:483 #, fuzzy msgid "" "\n" @@ -8703,7 +9067,7 @@ msgstr "" "\n" "KOKOon voi liittää kertoimen:\n" -#: src/sort.c:493 +#: src/sort.c:496 msgid "" "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n" "\n" @@ -8722,269 +9086,273 @@ msgstr "" "lajittelujärjestykseen. Asettamalla LC_ALL=C otetaan käyttöön\n" "perinteinen lajittelujärjestys, joka käyttää tavujen arvoja.\n" -#: src/sort.c:694 +#: src/sort.c:697 #, fuzzy, c-format msgid "waiting for %s [-d]" msgstr "kirjoitetaan tiedostoon %s" -#: src/sort.c:699 +#: src/sort.c:702 #, c-format msgid "%s [-d] terminated abnormally" msgstr "" -#: src/sort.c:853 +#: src/sort.c:856 #, fuzzy, c-format msgid "cannot create temporary file in %s" msgstr "väliaikaistiedoston %s luominen ei onnistu" -#: src/sort.c:939 src/sort.c:2010 src/sort.c:3056 src/sort.c:3755 -#: src/sort.c:3758 +#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713 +#: src/sort.c:3804 src/sort.c:3807 msgid "open failed" msgstr "avaaminen epäonnistui" -#: src/sort.c:959 +#: src/sort.c:970 msgid "fflush failed" msgstr "puskurin tyhjennys epäonnistui" -#: src/sort.c:964 src/sort.c:2013 src/sort.c:4646 +#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706 msgid "close failed" msgstr "sulkeminen epäonnistui" -#: src/sort.c:973 +#: src/sort.c:986 #, c-format msgid "dup2 failed" msgstr "dup2 epäonnistui" -#: src/sort.c:1090 +#: src/sort.c:1103 #, c-format msgid "couldn't execute %s" msgstr "" -#: src/sort.c:1097 +#: src/sort.c:1110 #, fuzzy msgid "couldn't create temporary file" msgstr "väliaikaistiedoston luominen ei onnistu" -#: src/sort.c:1136 +#: src/sort.c:1149 #, fuzzy, c-format msgid "couldn't create process for %s -d" msgstr "hakemiston %s luominen ei onnistu" -#: src/sort.c:1150 +#: src/sort.c:1161 #, c-format msgid "couldn't execute %s -d" msgstr "" -#: src/sort.c:1209 +#: src/sort.c:1220 #, c-format msgid "warning: cannot remove: %s" msgstr "varoitus: ei voida poistaa: %s" -#: src/sort.c:1295 +#: src/sort.c:1306 #, fuzzy, c-format msgid "invalid --%s argument %s" msgstr "virheellinen argumentti %s" -#: src/sort.c:1298 +#: src/sort.c:1309 #, fuzzy, c-format msgid "minimum --%s argument is %s" msgstr "argumentti ”%s” ei kelpaa" -#: src/sort.c:1313 +#: src/sort.c:1324 #, fuzzy, c-format msgid "--%s argument %s too large" msgstr "%s: lukumäärä ”%.*s” on liian suuri" -#: src/sort.c:1316 +#: src/sort.c:1327 #, fuzzy, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "argumentti ”%s” ei kelpaa" -#: src/sort.c:1398 +#: src/sort.c:1409 #, c-format msgid "number in parallel must be nonzero" msgstr "" -#: src/sort.c:1479 +#: src/sort.c:1494 msgid "stat failed" msgstr "tiedoston tilan lukeminen epäonnistui" -#: src/sort.c:1740 +#: src/sort.c:1755 msgid "read failed" msgstr "lukeminen epäonnistui" -#: src/sort.c:2028 +#: src/sort.c:2043 #, fuzzy, c-format msgid "string transformation failed" msgstr "merkkijonovertailu epäonnistui" -#: src/sort.c:2031 +#: src/sort.c:2046 #, c-format msgid "the untransformed string was %s" msgstr "" -#: src/sort.c:2194 +#: src/sort.c:2209 #, c-format msgid "^ no match for key\n" msgstr "" -#: src/sort.c:2374 +#: src/sort.c:2389 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "" -#: src/sort.c:2380 +#: src/sort.c:2395 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "" -#: src/sort.c:2391 +#: src/sort.c:2406 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" -#: src/sort.c:2404 +#: src/sort.c:2419 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "" -#: src/sort.c:2436 +#: src/sort.c:2451 #, 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" -#: src/sort.c:2442 +#: src/sort.c:2457 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "" -#: src/sort.c:2716 src/sort.c:2725 +#: src/sort.c:2731 src/sort.c:2740 msgid "write failed" msgstr "kirjoitus epäonnistui" -#: src/sort.c:2768 +#: src/sort.c:2783 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: epäjärjestys: " -#: src/sort.c:2771 +#: src/sort.c:2786 msgid "standard error" msgstr "vakiovirhe" -#: src/sort.c:3926 +#: src/sort.c:3698 +#, fuzzy +msgid "cannot read" +msgstr "%s: taaksepäin siirtyminen ei onnistu" + +#: src/sort.c:3976 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: virheellinen kenttämääritys %s" -#: src/sort.c:3937 +#: src/sort.c:3987 #, fuzzy, c-format msgid "options '-%s' are incompatible" msgstr "%s: valitsin ”-W %s” ei ole yksiselitteinen\n" -#: src/sort.c:3988 +#: src/sort.c:4038 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s: virheellinen määrä merkkijonon %s alussa" -#: src/sort.c:4245 +#: src/sort.c:4295 #, fuzzy msgid "invalid number after '-'" msgstr "virheellinen lukuarvo merkin ”-” jälkeen" -#: src/sort.c:4248 src/sort.c:4334 src/sort.c:4362 +#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416 #, fuzzy msgid "invalid number after '.'" msgstr "virheellinen lukuarvo merkin ”.” jälkeen" -#: src/sort.c:4261 src/sort.c:4367 +#: src/sort.c:4315 src/sort.c:4421 msgid "stray character in field spec" msgstr "outo merkki kenttämäärityksessä" -#: src/sort.c:4308 +#: src/sort.c:4362 #, fuzzy, c-format msgid "multiple compress programs specified" msgstr "useita tulostusmuotoja annettu" -#: src/sort.c:4325 +#: src/sort.c:4379 msgid "invalid number at field start" msgstr "virheellinen lukuarvo kentän alussa" -#: src/sort.c:4329 src/sort.c:4357 +#: src/sort.c:4383 src/sort.c:4411 msgid "field number is zero" msgstr "kentän numero on nolla" -#: src/sort.c:4338 +#: src/sort.c:4392 msgid "character offset is zero" msgstr "merkin siirtymä on nolla" -#: src/sort.c:4353 +#: src/sort.c:4407 #, fuzzy msgid "invalid number after ','" msgstr "virheellinen lukuarvo merkin ”,” jälkeen" # Tarkoitetaanko tässä sarkainta? -#: src/sort.c:4403 +#: src/sort.c:4457 #, c-format msgid "empty tab" msgstr "tyhjä sarkain" -#: src/sort.c:4496 src/wc.c:692 +#: src/sort.c:4550 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:4518 +#: src/sort.c:4572 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s:%lu: virheellinen tyhjä tiedostonimi" -#: src/sort.c:4524 +#: src/sort.c:4578 #, fuzzy, c-format msgid "no input from %s" msgstr "suljetaan syötetiedosto %s" -#: src/sort.c:4570 +#: src/sort.c:4624 #, c-format msgid "using %s sorting rules" msgstr "" -#: src/sort.c:4573 +#: src/sort.c:4627 #, c-format msgid "using simple byte comparison" msgstr "" -#: src/sort.c:4604 +#: src/sort.c:4658 #, 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:184 +#: src/split.c:187 #, c-format msgid "the suffix length needs to be at least %zu" msgstr "" -#: src/split.c:201 +#: src/split.c:204 #, c-format msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" msgstr "Käyttö: %s [VALITSIN]... [SYÖTE [ETULIITE]]\n" -#: src/split.c:205 +#: src/split.c:208 #, fuzzy 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" -"\n" msgstr "" "Tulosta kiinteän kokoisia paloja SYÖTTEESTÄ tiedostoihin ETULIITEaa,\n" "ETULIITEab, ...; oletuskoko on 1000 riviä, ja oletusETULIITE on ”x”.\n" "Jos SYÖTEttä ei ole annettu tai se on ”-”, luetaan vakiosyötettä.\n" "\n" -#: src/split.c:214 +#: src/split.c:216 #, fuzzy, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" @@ -9009,7 +9377,7 @@ msgstr "" " -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:227 +#: src/split.c:229 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" @@ -9017,7 +9385,7 @@ msgstr "" " --verbose näytä ilmoitus juuri ennen kunkin\n" " tulostiedoston avaamista\n" -#: src/split.c:234 +#: src/split.c:236 msgid "" "\n" "CHUNKS may be:\n" @@ -9029,184 +9397,189 @@ msgid "" "r/K/N likewise but only output Kth of N to stdout\n" msgstr "" -#: src/split.c:352 +#: src/split.c:354 #, fuzzy, c-format msgid "output file suffixes exhausted" msgstr "Tulostiedostojen jälkiliitteet käytetty loppuun" -#: src/split.c:364 +#: src/split.c:366 #, c-format msgid "creating file %s\n" msgstr "luodaan tiedostoa %s\n" -#: src/split.c:377 +#: src/split.c:375 +#, c-format +msgid "%s would overwrite input; aborting" +msgstr "" + +#: src/split.c:391 #, fuzzy, c-format msgid "failed to set FILE environment variable" msgstr "tiedoston %s ryhmän vaihtaminen arvoon %s epäonnistui\n" -#: src/split.c:379 +#: src/split.c:393 #, c-format msgid "executing with FILE=%s\n" msgstr "" -#: src/split.c:381 +#: src/split.c:395 #, fuzzy, c-format msgid "failed to create pipe" -msgstr "kovan linkin %s luominen tiedostoon %s ei onnistu" +msgstr "tiedoston %s avaaminen epäonnistui" -#: src/split.c:395 +#: src/split.c:409 #, fuzzy, c-format msgid "closing prior pipe" msgstr "suljetaan hakemisto %s" -#: src/split.c:397 +#: src/split.c:411 #, fuzzy, c-format msgid "closing output pipe" msgstr "suljetaan tulostiedosto %s" -#: src/split.c:401 +#: src/split.c:415 #, fuzzy, c-format msgid "moving input pipe" msgstr "suljetaan syötetiedosto %s" -#: src/split.c:403 +#: src/split.c:417 #, fuzzy, c-format msgid "closing input pipe" msgstr "suljetaan syötetiedosto %s" -#: src/split.c:408 +#: src/split.c:422 #, fuzzy, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "komentoa %s ei voi ajaa" -#: src/split.c:414 +#: src/split.c:428 #, fuzzy, c-format msgid "failed to close input pipe" msgstr "hakemiston %s sulkeminen epäonnistui" -#: src/split.c:450 +#: src/split.c:464 #, fuzzy, c-format msgid "waiting for child process" msgstr "odotettaessa strip-ohjelman päättymistä" -#: src/split.c:460 +#: src/split.c:474 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "" -#: src/split.c:468 +#: src/split.c:482 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:475 src/timeout.c:449 +#: src/split.c:489 src/timeout.c:494 #, c-format msgid "unknown status from command (0x%X)" msgstr "" -#: src/split.c:1037 +#: src/split.c:1052 #, c-format msgid "cannot split in more than one way" msgstr "voidaan jakaa vain yhdellä tavalla" -#: src/split.c:1050 src/split.c:1192 src/split.c:1363 +#: src/split.c:1065 src/split.c:1205 src/split.c:1376 #, fuzzy, c-format msgid "%s: invalid number of chunks" msgstr "%s: virheellinen sekuntimäärä" -#: src/split.c:1054 +#: src/split.c:1069 #, fuzzy, c-format msgid "%s: invalid chunk number" msgstr "%s: virheellinen luku" -#: src/split.c:1106 +#: src/split.c:1119 #, c-format msgid "%s: invalid suffix length" msgstr "%s: virheellinen jälkiliitteen pituus" -#: src/split.c:1131 src/split.c:1139 src/split.c:1162 src/split.c:1167 +#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180 #, c-format msgid "%s: invalid number of bytes" msgstr "%s: virheellinen tavumäärä" -#: src/split.c:1150 src/split.c:1297 +#: src/split.c:1163 src/split.c:1310 #, c-format msgid "%s: invalid number of lines" msgstr "%s: virheellinen rivimäärä" -#: src/split.c:1223 +#: src/split.c:1236 #, c-format msgid "line count option -%s%c... is too large" msgstr "rivimäärävalitsin -%s%c... on liian suuri" -#: src/split.c:1235 +#: src/split.c:1248 #, fuzzy, c-format msgid "%s: invalid start value for numerical suffix" msgstr "virheellinen aloitusrivin numero: %s" -#: src/split.c:1263 +#: src/split.c:1276 #, fuzzy, c-format msgid "%s: invalid IO block size" msgstr "%s: virheellinen tiedostokoko" -#: src/split.c:1284 +#: src/split.c:1297 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1321 +#: src/split.c:1334 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1356 +#: src/split.c:1369 #, 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:169 +#: src/stat.c:173 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:838 +#: src/stat.c:857 #, fuzzy, c-format msgid "failed to canonicalize %s" msgstr "tiedoston %s avaaminen epäonnistui" -#: src/stat.c:1050 +#: src/stat.c:1069 #, fuzzy, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "varoitus: tunnistamaton suojaus ”\\%c”" -#: src/stat.c:1105 +#: src/stat.c:1124 #, c-format msgid "%s: invalid directive" msgstr "%s: säännös ei kelpaa" -#: src/stat.c:1151 +#: src/stat.c:1170 #, c-format msgid "warning: backslash at end of format" msgstr "varoitus: kenoviiva muotoilun lopussa" -#: src/stat.c:1182 +#: src/stat.c:1201 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" -#: src/stat.c:1189 +#: src/stat.c:1208 #, c-format msgid "cannot read file system information for %s" msgstr "tiedostojärjestelmän tietojen lukeminen tiedostolle %s ei onnistu" -#: src/stat.c:1209 +#: src/stat.c:1228 #, 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:1245 +#: src/stat.c:1264 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -9217,7 +9590,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1268 +#: src/stat.c:1287 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -9225,30 +9598,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1278 +#: src/stat.c:1297 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:1286 +#: src/stat.c:1305 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:1295 +#: src/stat.c:1314 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:1305 +#: src/stat.c:1324 #, fuzzy, c-format msgid "Context: %C\n" msgstr "virheelliset oikeudet: %s" -#: src/stat.c:1313 +#: src/stat.c:1332 msgid "" "Access: %x\n" "Modify: %y\n" @@ -9256,10 +9629,13 @@ msgid "" " Birth: %w\n" msgstr "" -#: src/stat.c:1331 +#: src/stat.c:1350 +msgid "Display file or file system status.\n" +msgstr "" + +#: src/stat.c:1356 +#, fuzzy msgid "" -"Display file or file system status.\n" -"\n" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" @@ -9269,7 +9645,7 @@ msgstr "" " -f, --file-system näytä tiedostojärjestelmän tila tiedoston tilan " "sijaan\n" -#: src/stat.c:1337 +#: src/stat.c:1360 #, fuzzy msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" @@ -9287,7 +9663,7 @@ msgstr "" " Rivinvaihdon saa lisäämällä MUOTOon merkintä \\n. " "-t, --terse tulosta tiedot lyhyessä muodossa\n" -#: src/stat.c:1348 +#: src/stat.c:1371 #, fuzzy msgid "" "\n" @@ -9307,7 +9683,7 @@ msgstr "" " %b Varattujen lohkojen määrä (katso myös %B)\n" " %B Kunkin ”%b”:n ilmoittaman lohkon koko tavuina\n" -#: src/stat.c:1357 +#: src/stat.c:1380 #, fuzzy msgid "" " %d device number in decimal\n" @@ -9324,7 +9700,7 @@ msgstr "" " %G Omistajan ryhmän nimi\n" " %g Omistajan ryhmä-ID\n" -#: src/stat.c:1365 +#: src/stat.c:1388 #, fuzzy msgid "" " %h number of hard links\n" @@ -9347,7 +9723,7 @@ msgstr "" " %t Major-laitetyyppi heksadesimaalimuodossa\n" " %T Minor-laitetyyppi heksadesimaalimuodossa\n" -#: src/stat.c:1376 +#: src/stat.c:1399 #, fuzzy msgid "" " %u user ID of owner\n" @@ -9372,7 +9748,7 @@ msgstr "" " %Z Viimeisen ominaisuusmuutoksen ajankohta sekunteina vuoden epookista\n" "\n" -#: src/stat.c:1390 +#: src/stat.c:1413 #, fuzzy msgid "" "Valid format sequences for file systems:\n" @@ -9391,7 +9767,7 @@ msgstr "" " %d Tiedostojärjestelmän vapaiden tiedostosolmujen määrä\n" " %f Tiedostojärjestelmän vapaiden lohkojen määrä\n" -#: src/stat.c:1399 +#: src/stat.c:1422 #, fuzzy msgid "" " %i file system ID in hex\n" @@ -9418,30 +9794,29 @@ msgstr "Käyttö: %s [VALITSIN]...\n" #: src/stdbuf.c:91 msgid "" "Run COMMAND, with modified buffering operations for its standard streams.\n" -"\n" msgstr "" -#: src/stdbuf.c:98 +#: src/stdbuf.c:97 msgid "" " -i, --input=MODE adjust standard input stream buffering\n" " -o, --output=MODE adjust standard output stream buffering\n" " -e, --error=MODE adjust standard error stream buffering\n" msgstr "" -#: src/stdbuf.c:105 +#: src/stdbuf.c:104 msgid "" "\n" "If MODE is 'L' the corresponding stream will be line buffered.\n" "This option is invalid with standard input.\n" msgstr "" -#: src/stdbuf.c:108 +#: src/stdbuf.c:107 msgid "" "\n" "If MODE is '0' the corresponding stream will be unbuffered.\n" msgstr "" -#: src/stdbuf.c:111 +#: src/stdbuf.c:110 #, fuzzy msgid "" "\n" @@ -9455,7 +9830,7 @@ 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" -#: src/stdbuf.c:117 +#: src/stdbuf.c:116 msgid "" "\n" "NOTE: If COMMAND adjusts the buffering of its standard streams ('tee' does\n" @@ -9465,22 +9840,22 @@ msgid "" "and are thus unaffected by 'stdbuf' settings.\n" msgstr "" -#: src/stdbuf.c:227 +#: src/stdbuf.c:226 #, fuzzy, c-format msgid "failed to find %s" msgstr "tiedoston %s avaaminen epäonnistui" -#: src/stdbuf.c:247 src/stdbuf.c:279 +#: src/stdbuf.c:246 src/stdbuf.c:278 #, 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:321 +#: src/stdbuf.c:320 #, c-format msgid "line buffering stdin is meaningless" msgstr "" -#: src/stty.c:509 +#: src/stty.c:513 #, fuzzy, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -9491,10 +9866,13 @@ msgstr "" " tai: %s [-F LAITE] [--file=LAITE] [-a|--all]\n" " tai: %s [-F LAITE] [--file=LAITE] [-g|--save]\n" -#: src/stty.c:515 +#: src/stty.c:519 +msgid "Print or change terminal characteristics.\n" +msgstr "" + +#: src/stty.c:525 +#, fuzzy msgid "" -"Print or change terminal characteristics.\n" -"\n" " -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" @@ -9507,7 +9885,7 @@ msgstr "" " -F, --file=LAITE avaa ja ota käyttöön määrätty LAITE vakiosyötteen " "sijaan\n" -#: src/stty.c:524 +#: src/stty.c:532 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -9517,7 +9895,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:529 +#: src/stty.c:537 msgid "" "\n" "Special characters:\n" @@ -9531,7 +9909,7 @@ msgstr "" " eof MERKKI MERKKI lähettää tiedostonlopetuksen (syöte päättyy)\n" " eol MERKKI MERKKI päättää rivin\n" -#: src/stty.c:536 +#: src/stty.c:544 msgid "" " * eol2 CHAR alternate CHAR for ending the line\n" " erase CHAR CHAR will erase the last character typed\n" @@ -9543,7 +9921,7 @@ msgstr "" " intr MERKKI MERKKI lähettää keskeytyssignaalin\n" " kill MERKKI MERKKI pyyhkii käsillä olevan rivin\n" -#: src/stty.c:542 +#: src/stty.c:550 msgid "" " * lnext CHAR CHAR will enter the next character quoted\n" " quit CHAR CHAR will send a quit signal\n" @@ -9555,7 +9933,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:548 +#: src/stty.c:556 msgid "" " stop CHAR CHAR will stop the output\n" " susp CHAR CHAR will send a terminal stop signal\n" @@ -9567,7 +9945,7 @@ msgstr "" " * swtch MERKKI MERKKI vaihtaa toiselle kuoren tasolle\n" " * werase MERKKI MERKKI pyyhkii viimeisimmän kirjoitetun sanan\n" -#: src/stty.c:554 +#: src/stty.c:562 #, fuzzy msgid "" "\n" @@ -9582,7 +9960,7 @@ msgstr "" " * cols N kerro ytimelle, että päätteen leveys on N merkkiä\n" " * columns N kuten cols N\n" -#: src/stty.c:561 +#: src/stty.c:569 msgid "" " ispeed N set the input speed to N\n" " * line N use line discipline N\n" @@ -9595,7 +9973,7 @@ msgstr "" " min N kun myös -icanon, aseta valmiin luvun merkkiminimiksi N\n" " ospeed N aseta tulostenopeudeksi N\n" -#: src/stty.c:567 +#: src/stty.c:575 msgid "" " * rows N tell the kernel that the terminal has N rows\n" " * size print the number of rows and columns according to the " @@ -9609,13 +9987,15 @@ msgstr "" " time N kun myös -icanon, aseta luvun aikarajaksi N " "kymmenesosasekuntia\n" -#: src/stty.c:573 +#: src/stty.c:581 +#, fuzzy msgid "" "\n" "Control settings:\n" " [-]clocal disable modem control signals\n" " [-]cread allow input to be received\n" " * [-]crtscts enable RTS/CTS handshaking\n" +" * [-]cdtrdsr enable DTR/DSR handshaking\n" " csN set character size to N bits, N in [5..8]\n" msgstr "" "\n" @@ -9625,7 +10005,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:581 +#: src/stty.c:590 #, fuzzy msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" @@ -9633,7 +10013,7 @@ msgid "" " [-]hupcl same as [-]hup\n" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" -" [-]parodd set odd parity (even with '-')\n" +" [-]parodd set odd parity (or even parity with '-')\n" msgstr "" " [-]cstopb käytä kahta pysäytysbittiä per merkki (”-”:lla yksi)\n" " [-]hup lähetä sulkusignaali kun viimeinen prosessi sulkee tty:n\n" @@ -9642,7 +10022,7 @@ msgstr "" "syötteessä\n" " [-]parodd aseta pariton pariteetti (myös ”-”:lla)\n" -#: src/stty.c:588 +#: src/stty.c:597 msgid "" "\n" "Input settings:\n" @@ -9658,7 +10038,7 @@ msgstr "" " [-]ignbrk jätä katkosmerkit huomiotta\n" " [-]igncr jätä vaununpalautus huomiotta\n" -#: src/stty.c:596 +#: src/stty.c:605 msgid "" " [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" @@ -9672,11 +10052,11 @@ msgstr "" " [-]inpck ota syötteen pariteettitarkistus käyttöön\n" " [-]istrip poista ylin (8:s) bitti syötteen merkeistä\n" -#: src/stty.c:603 +#: src/stty.c:612 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr " * [-]iutf8 oleta syötemerkit UTF-8-koodatuiksi\n" -#: src/stty.c:606 +#: src/stty.c:615 msgid "" " * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" @@ -9692,7 +10072,7 @@ msgstr "" " [-]parmrk merkitse pariteettivirheet (255-0-merkkisarjalla)\n" " [-]tandem kuten [-]ixoff\n" -#: src/stty.c:614 +#: src/stty.c:623 msgid "" "\n" "Output settings:\n" @@ -9708,7 +10088,7 @@ msgstr "" " * ffN arkinsyötön viivetyyli, N välillä [0..1]\n" " * nlN rivinvaihdon viivetyyli, N välillä [0..1]\n" -#: src/stty.c:622 +#: src/stty.c:631 msgid "" " * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of null characters\n" @@ -9724,7 +10104,7 @@ msgstr "" " * [-]onlcr muunna rivinvaihto vaununpalautus-rivinvaihdoksi\n" " * [-]onlret rivinvaihto suorittaa vaununpalautuksen\n" -#: src/stty.c:630 +#: src/stty.c:639 msgid "" " * [-]onocr do not print carriage returns in the first column\n" " [-]opost postprocess output\n" @@ -9740,7 +10120,7 @@ msgstr "" " * -tabs sama kuin tab3\n" " * vtN pystysarkaimen viivetyyli, N välillä [0..1]\n" -#: src/stty.c:638 +#: src/stty.c:647 msgid "" "\n" "Local settings:\n" @@ -9755,7 +10135,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:645 +#: src/stty.c:654 #, fuzzy msgid "" " * [-]ctlecho echo control characters in hat notation ('^c')\n" @@ -9770,7 +10150,7 @@ msgstr "" " [-]echoe sama kuin [-]crterase\n" " [-]echok toista rivinvaihto hävitysmerkin jälkeen\n" -#: src/stty.c:652 +#: src/stty.c:661 #, fuzzy msgid "" " * [-]echoke same as [-]crtkill\n" @@ -9786,7 +10166,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:659 +#: src/stty.c:668 #, fuzzy msgid "" " [-]isig enable interrupt, quit, and suspend special characters\n" @@ -9803,7 +10183,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:666 +#: src/stty.c:675 msgid "" "\n" "Combination settings:\n" @@ -9817,7 +10197,7 @@ msgstr "" " cbreak sama kuin -icanon\n" " -cbreak sama kuin icanon\n" -#: src/stty.c:673 +#: src/stty.c:682 msgid "" " cooked same as brkint ignpar istrip icrnl ixon opost isig\n" " icanon, eof and eol characters to their default values\n" @@ -9829,7 +10209,7 @@ msgstr "" " -cooked sama kuin raw\n" " crt sama kuin echoe echoctl echoke\n" -#: src/stty.c:679 +#: src/stty.c:688 msgid "" " dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" " kill ^u\n" @@ -9843,7 +10223,7 @@ msgstr "" " ek erase ja kill -merkit oletusarvoihinsa\n" " evenp sama kuin parenb -parodd cs7\n" -#: src/stty.c:686 +#: src/stty.c:695 msgid "" " -evenp same as -parenb cs8\n" " * [-]lcase same as xcase iuclc olcuc\n" @@ -9859,7 +10239,7 @@ msgstr "" " nl sama kuin -icrnl -onlcr\n" " -nl sama kuin icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" -#: src/stty.c:694 +#: src/stty.c:703 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -9873,7 +10253,7 @@ msgstr "" " pass8 sama kuin -parenb -istrip cs8\n" " -pass8 sama kuin parenb istrip cs7\n" -#: src/stty.c:701 +#: src/stty.c:710 msgid "" " raw same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" " -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n" @@ -9885,7 +10265,7 @@ msgstr "" " -imaxbel -opost -isig -icanon -xcase min 1 time 0\n" " -raw sama kuin cooked\n" -#: src/stty.c:707 +#: src/stty.c:716 #, fuzzy msgid "" " sane same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" @@ -9902,7 +10282,7 @@ msgstr "" " -xcase -tostop -echoprt echoctl echoke, kaikki\n" " erikoismerkit oletusarvoihinsa.\n" -#: src/stty.c:715 +#: src/stty.c:724 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -9917,12 +10297,12 @@ msgstr "" "0x37, 0177 tai 127; erikoisarvoja ”^-” ja ”undef” käytetään kun halutaan\n" "erikoismerkit pois käytöstä.\n" -#: src/stty.c:787 +#: src/stty.c:796 #, c-format msgid "only one device may be specified" msgstr "vain yhden laitteen voi määritellä" -#: src/stty.c:817 +#: src/stty.c:826 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" @@ -9931,127 +10311,47 @@ msgstr "" "valitsimet verbose ja stty-readable -tulostetyyleille\n" "ovat toisensa poissulkevat" -#: src/stty.c:823 +#: src/stty.c:832 #, 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:838 +#: src/stty.c:847 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s: ei-estävän tilan uudelleenasetus ei onnistunut" -#: src/stty.c:883 src/stty.c:993 +#: src/stty.c:892 src/stty.c:1002 #, c-format msgid "invalid argument %s" msgstr "virheellinen argumentti %s" -#: src/stty.c:894 src/stty.c:911 src/stty.c:923 src/stty.c:936 src/stty.c:948 -#: src/stty.c:968 +#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957 +#: src/stty.c:977 #, c-format msgid "missing argument to %s" msgstr "%s vaatii argumentin" -#: src/stty.c:974 +#: src/stty.c:983 #, fuzzy, c-format msgid "invalid line discipline %s" msgstr "virheellinen rivileveys: %s" -#: src/stty.c:1044 +#: src/stty.c:1053 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s: kaikkia pyydettyjä toimenpiteitä ei voida suorittaa" -#: src/stty.c:1390 +#: src/stty.c:1399 #, c-format msgid "%s: no size information for this device" msgstr "%s: ei kokotietoja tälle laitteelle" -#: src/stty.c:1904 +#: src/stty.c:1920 #, c-format msgid "invalid integer argument %s" msgstr "kokonaislukuargumentti %s ei kelpaa" -#: src/su.c:229 -msgid "Password:" -msgstr "Salasana:" - -#: src/su.c:232 -#, c-format -msgid "getpass: cannot open /dev/tty" -msgstr "getpass: laitteen /dev/tty avaaminen ei onnistu" - -#: src/su.c:290 -#, c-format -msgid "cannot set groups" -msgstr "ryhmien asetus ei onnistu" - -#: src/su.c:294 -#, c-format -msgid "cannot set group id" -msgstr "ryhmän id:n asetus ei onnistu" - -#: src/su.c:296 -#, c-format -msgid "cannot set user id" -msgstr "tunnuksen id:n asetus ei onnistu" - -#: src/su.c:371 -#, c-format -msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" -msgstr "Käyttö: %s [VALITSIN]... [-] [TUNNUS [ARG]...]\n" - -#: src/su.c:372 -#, 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 "" -"Vaihda vallitsevaksi käyttäjä- ja ryhmä-ID:ksi TUNNUSta vastaavat.\n" -"\n" -" -, -l, --login tee kuoresta kirjautumiskuori\n" -" -c, --command=KOMENTO välitä KOMENTO kuorelle valitsimella -c\n" -" -f, --fast välitä valitsin -f kuorelle (csh:lle tai tcsh:" -"lle)\n" -" -m, --preserve-environment älä uudelleenaseta ympäristömuuttujia\n" -" -p sama kuin -m\n" -" -s, --shell=KUORI aja KUORI, jos /etc/shells sallii sen\n" - -#: src/su.c:384 -msgid "" -"\n" -"A mere - implies -l. If USER not given, assume root.\n" -msgstr "" -"\n" -"Pelkkä - tekee saman kuin -l. Jos TUNNUSta ei ole annettu, sen oletetaan\n" -"olevan root.\n" - -#: src/su.c:461 -#, c-format -msgid "user %s does not exist" -msgstr "tunnusta %s ei ole olemassa" - -#: src/su.c:484 -#, c-format -msgid "incorrect password" -msgstr "väärä salasana" - -#: src/su.c:501 -#, c-format -msgid "using restricted shell %s" -msgstr "käytetään rajoitettua kuorta %s" - -#: src/su.c:509 -#, c-format -msgid "warning: cannot change directory to %s" -msgstr "varoitus: ei voida siirtyä hakemistoon %s" - #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 msgid "Kayvan Aghaiepour" @@ -10083,7 +10383,7 @@ msgstr "" msgid "ignoring all arguments" msgstr "jätetään kaikki argumentit huomiotta" -#: src/system.h:340 +#: src/system.h:343 #, c-format msgid "" "\n" @@ -10096,15 +10396,23 @@ msgstr "" "joka yleensä korvaa korvaa tässä kuvatun version. Kuoren tukemista\n" "ominaisuuksista saa lisää tietoa kuoren dokumentaatiosta.\n" -#: src/system.h:346 +#: src/system.h:349 msgid " --help display this help and exit\n" msgstr " --help näytä tämä ohje ja poistu\n" -#: src/system.h:348 +#: src/system.h:351 msgid " --version output version information and exit\n" msgstr " --version tulosta versiotiedot ja poistu\n" -#: src/system.h:541 +#: src/system.h:544 +#, fuzzy +msgid "" +"\n" +"Mandatory arguments to long options are mandatory for short options too.\n" +msgstr "" +"Pitkien valitsinten pakolliset argumentit ovat pakollisia myös lyhyille.\n" + +#: src/system.h:552 msgid "" "\n" "SIZE is an integer and optional unit (example: 10M is 10*1024*1024). Units\n" @@ -10112,7 +10420,7 @@ msgid "" "1000).\n" msgstr "" -#: src/system.h:550 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -10121,7 +10429,7 @@ msgid "" "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n" msgstr "" -#: src/system.h:560 +#: src/system.h:571 #, fuzzy, c-format msgid "" "\n" @@ -10135,22 +10443,22 @@ msgstr "" #. <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:574 +#: src/system.h:585 #, c-format msgid "Report %s translation bugs to <http://translationproject.org/team/>\n" msgstr "" -#: src/system.h:578 +#: src/system.h:589 #, c-format msgid "For complete documentation, run: info coreutils '%s invocation'\n" msgstr "" -#: src/system.h:585 +#: src/system.h:596 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "Lisätietoja komennolla ”%s --help”.\n" -#: src/system.h:617 +#: src/system.h:628 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -10171,16 +10479,16 @@ 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" -"\n" msgstr "" "Tulosta kukin TIEDOSTO vakiotulosteeseen, viimeinen rivi ensimmäisenä.\n" "Jos TIEDOSTOa ei ole annettu, tai se on ”-”, luetaan vakiosyötettä.\n" "\n" -#: src/tac.c:145 +#: src/tac.c:144 msgid "" " -b, --before attach the separator before instead of after\n" " -r, --regex interpret the separator as a regular expression\n" @@ -10190,42 +10498,42 @@ msgstr "" " -r, --regex tulkitse erotin säännöllisenä lausekkeena\n" " -s, --separator=MERKKIJ käytä MERKKIJonoa erottimena rivinvaihdon sijaan\n" -#: src/tac.c:235 src/tac.c:336 +#: src/tac.c:234 src/tac.c:335 #, c-format msgid "%s: seek failed" msgstr "%s: siirtyminen epäonnistui" -#: src/tac.c:264 +#: src/tac.c:263 #, fuzzy, c-format msgid "record too large" msgstr "%s: tiedosto on liian suuri" -#: src/tac.c:451 +#: src/tac.c:450 #, fuzzy, c-format msgid "failed to create temporary file in %s" msgstr "väliaikaistiedoston %s luominen ei onnistu" -#: src/tac.c:459 +#: src/tac.c:458 #, fuzzy, c-format msgid "failed to open %s for writing" msgstr "%s: avaaminen kirjoitustilassa epäonnistui" -#: src/tac.c:476 +#: src/tac.c:475 #, fuzzy, c-format msgid "failed to rewind stream for %s" msgstr "tiedoston %s aikojen säilyttäminen ei onnistu" -#: src/tac.c:512 src/tac.c:519 +#: src/tac.c:511 src/tac.c:518 #, c-format msgid "%s: write error" msgstr "%s: kirjoitusvirhe" -#: src/tac.c:572 +#: src/tac.c:571 #, fuzzy, c-format msgid "failed to open %s for reading" msgstr "tiedostoa %s ei voi avata lukemista varten" -#: src/tac.c:630 +#: src/tac.c:629 #, c-format msgid "separator cannot be empty" msgstr "erotin ei voi olla tyhjä" @@ -10236,19 +10544,18 @@ msgid "Ian Lance Taylor" msgstr "Ian Lance Taylor" #: src/tail.c:262 -#, c-format +#, fuzzy, 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" -"\n" msgstr "" "Tulosta kunkin TIEDOSTOn %d viimeistä riviä vakiotulosteeseen.\n" "Jos TIEDOSTOja on useampi kuin yksi, jokaista ennen näytetään tiedostonimi.\n" "Jos TIEDOSTOa ei ole annettu, tai se on ”-”, luetaan vakiosyötettä.\n" "\n" -#: src/tail.c:271 +#: src/tail.c:270 msgid "" " -c, --bytes=K output the last K bytes; alternatively, use -c " "+K\n" @@ -10256,7 +10563,7 @@ msgid "" "file\n" msgstr "" -#: src/tail.c:275 +#: src/tail.c:274 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -10270,7 +10577,7 @@ msgstr "" "asia\n" " -F sama kuin --follow=name --retry\n" -#: src/tail.c:282 +#: src/tail.c:281 #, fuzzy, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -10292,7 +10599,7 @@ msgstr "" " poistettu (tämä on yleistä syrjäytettyjen\n" " lokitiedostojen kanssa)\n" -#: src/tail.c:295 +#: src/tail.c:294 #, fuzzy msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" @@ -10309,7 +10616,7 @@ msgstr "" " (oletus 1,0) toistojen välissä.\n" " -v, --verbose tulosta aina tiedostonimen sisältävät otsakkeet\n" -#: src/tail.c:302 +#: src/tail.c:301 #, fuzzy msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" @@ -10326,7 +10633,7 @@ msgstr "" " (oletus 1,0) toistojen välissä.\n" " -v, --verbose tulosta aina tiedostonimen sisältävät otsakkeet\n" -#: src/tail.c:311 +#: src/tail.c:310 #, fuzzy msgid "" "\n" @@ -10345,7 +10652,7 @@ msgstr "" "b 512, k 1024, m 1024².\n" "\n" -#: src/tail.c:320 +#: src/tail.c:319 #, fuzzy msgid "" "With --follow (-f), tail defaults to following the file descriptor, which\n" @@ -10361,40 +10668,40 @@ msgstr "" "seurattavan nimisen tiedoston uudelleen säännöllisesti tarkistaakseen,\n" "onko jokin toinen ohjelma poistanut ja luonut sen uudelleen.\n" -#: src/tail.c:379 +#: src/tail.c:378 #, c-format msgid "closing %s (fd=%d)" msgstr "suljetaan %s (fd=%d)" -#: src/tail.c:454 +#: 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:458 +#: src/tail.c:457 #, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "%s: siirtyminen siirtymään %s suhteessa loppuun ei onnistu" -#: src/tail.c:895 +#: src/tail.c:894 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "" -#: src/tail.c:907 +#: src/tail.c:906 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" msgstr "" -#: src/tail.c:964 +#: src/tail.c:963 #, 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:981 +#: src/tail.c:980 #, c-format msgid "%s has been replaced with an untailable file; giving up on this name" msgstr "" @@ -10402,29 +10709,29 @@ msgstr "" "seuraamisesta" # Joo, untailable on vähän hankala sana. -#: src/tail.c:990 +#: src/tail.c:989 #, 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:1011 +#: src/tail.c:1010 #, c-format msgid "%s has become accessible" msgstr "%s on nyt käytettävissä" -#: src/tail.c:1019 +#: src/tail.c:1018 #, c-format msgid "%s has appeared; following end of new file" msgstr "%s on ilmaantunut; seurataan uuden tiedoston loppua" -#: src/tail.c:1030 +#: src/tail.c:1029 #, c-format msgid "%s has been replaced; following end of new file" msgstr "%s on korvattu; seurataan uuden tiedoston loppua" -#: src/tail.c:1131 +#: src/tail.c:1130 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: ei-estävän tilan muuttaminen ei onnistu" @@ -10800,17 +11107,22 @@ msgstr "puuttuva ”]”" msgid "extra argument %s" msgstr "ylimääräinen argumentti %s" -#: src/timeout.c:124 +#: src/timeout.c:112 +#, c-format +msgid "warning: sigprocmask" +msgstr "" + +#: src/timeout.c:145 #, c-format msgid "warning: timer_settime" msgstr "" -#: src/timeout.c:129 +#: src/timeout.c:150 #, c-format msgid "warning: timer_create" msgstr "" -#: src/timeout.c:204 +#: src/timeout.c:225 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -10819,17 +11131,17 @@ msgstr "" "Käyttö: %s KÄYTTÄJÄNIMI KOMENTO [ARGUMENTTI]...\n" " tai: %s VALITSIN\n" -#: src/timeout.c:208 +#: src/timeout.c:229 #, fuzzy -msgid "" -"Start COMMAND, and kill it if still running after DURATION.\n" -"\n" -"Mandatory arguments to long options are mandatory for short options too.\n" +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:213 +#: src/timeout.c:235 msgid "" +" --preserve-status\n" +" exit with the same status as COMMAND, even when the\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 " @@ -10844,7 +11156,7 @@ msgid "" " See 'kill -l' for a list of signals\n" msgstr "" -#: src/timeout.c:229 +#: src/timeout.c:254 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -10852,25 +11164,30 @@ msgid "" "days.\n" msgstr "" -#: src/timeout.c:234 +#: src/timeout.c:259 msgid "" "\n" -"If the command times out, then exit with status 124. Otherwise, exit\n" -"with the status of COMMAND. If no signal is specified, send the TERM\n" -"signal upon timeout. The TERM signal kills any process that does not\n" -"block or catch that signal. For other processes, it may be necessary to\n" -"use the KILL (9) signal, since this signal cannot be caught. If the\n" -"KILL (9) signal is sent, the exit status is 128+9 rather than 124.\n" +"If the command times out, and --preserve-status is not set, then exit with\n" +"status 124. Otherwise, exit with the status of COMMAND. If no signal\n" +"is specified, send the TERM signal upon timeout. The TERM signal kills\n" +"any process that does not block or catch that signal. It may be necessary\n" +"to use the KILL (9) signal, since this signal cannot be caught, in which\n" +"case the exit status is 128+9 rather than 124.\n" +msgstr "" + +#: src/timeout.c:363 +#, c-format +msgid "warning: disabling core dumps failed" msgstr "" -#: src/timeout.c:419 +#: src/timeout.c:471 #, fuzzy, c-format msgid "error waiting for command" msgstr "virhe kirjoitettaessa tiedostoa %s" -#: src/timeout.c:441 +#: src/timeout.c:482 #, c-format -msgid "warning: disabling core dumps failed" +msgid "the monitored command dumped core" msgstr "" #. This is a proper name. See the gettext manual, section Names. @@ -10883,22 +11200,22 @@ msgstr "Jim Kingdon" msgid "Randy Smith" msgstr "Randy Smith" -#: src/touch.c:115 src/touch.c:313 +#: src/touch.c:115 src/touch.c:309 #, c-format msgid "invalid date format %s" msgstr "virheellinen päiväyksen muoto %s" -#: src/touch.c:194 +#: src/touch.c:191 #, c-format msgid "cannot touch %s" msgstr "tiedostoa %s ei voi koskettaa" -#: src/touch.c:200 +#: src/touch.c:197 #, c-format msgid "setting times of %s" msgstr "asetettaessa tiedoston %s aikoja" -#: src/touch.c:216 +#: src/touch.c:213 msgid "" "Update the access and modification times of each FILE to the current time.\n" "\n" @@ -10907,10 +11224,9 @@ msgid "" "\n" "A FILE argument string of - is handled specially and causes touch to\n" "change the times of the file associated with standard output.\n" -"\n" msgstr "" -#: src/touch.c:229 +#: src/touch.c:225 #, fuzzy msgid "" " -a change only the access time\n" @@ -10925,7 +11241,7 @@ msgstr "" " -f (ei huomioida)\n" " -m muuta vain muutosaikaa\n" -#: src/touch.c:235 +#: src/touch.c:231 #, fuzzy msgid "" " -h, --no-dereference affect each symbolic link instead of any " @@ -10940,12 +11256,12 @@ msgstr "" "joissa\n" " symlinkin omistajuutta voi muuttaa)\n" -#: src/touch.c:241 +#: 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" -" --time=WORD change the specified time:\n" +" --time=WORD change the specified time:\n" " WORD is access, atime, or use: equivalent to -a\n" " WORD is modify or mtime: equivalent to -m\n" msgstr "" @@ -10956,7 +11272,7 @@ msgstr "" "kuin -a)\n" " muuta aikaa mtime (sama kuin -m)\n" -#: src/touch.c:250 +#: src/touch.c:246 #, fuzzy msgid "" "\n" @@ -10966,12 +11282,12 @@ msgstr "" "Huomaa, että valitsimien -d ja -t hyväksymät aika-päiväysmuodot ovat\n" "erilaisia.\n" -#: src/touch.c:339 +#: src/touch.c:335 #, c-format msgid "cannot specify times from more than one source" msgstr "aika voidaan määrittää vain yhdestä lähteestä" -#: src/touch.c:413 +#: src/touch.c:409 #, fuzzy, c-format msgid "" "warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'" @@ -11244,26 +11560,25 @@ msgid "" "If a FILE is larger than the specified size, the extra data is lost.\n" "If a FILE is shorter, it is extended and the extended part (hole)\n" "reads as zero bytes.\n" -"\n" msgstr "" -#: src/truncate.c:110 +#: src/truncate.c:109 #, fuzzy msgid " -c, --no-create do not create any files\n" msgstr "kohdehakemisto ei ole sallittu asennettaessa hakemistoa" -#: src/truncate.c:113 +#: src/truncate.c:112 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" -#: src/truncate.c:116 +#: 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" msgstr "" -#: src/truncate.c:122 +#: src/truncate.c:121 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -11271,57 +11586,57 @@ msgid "" "'/' round down to multiple of, '%' round up to multiple of.\n" msgstr "" -#: src/truncate.c:150 +#: src/truncate.c:149 #, c-format msgid "overflow in %<PRIdMAX> * %<PRIdMAX> byte blocks for file %s" msgstr "" -#: src/truncate.c:174 +#: src/truncate.c:173 #, fuzzy, c-format msgid "%s has unusable, apparently negative size" msgstr "%s: tiedoston koko on negatiivinen" -#: src/truncate.c:184 src/truncate.c:379 +#: src/truncate.c:183 src/truncate.c:384 #, fuzzy, c-format msgid "cannot get the size of %s" msgstr "ajan haku ei onnistu" -#: src/truncate.c:206 +#: src/truncate.c:205 #, c-format msgid "overflow rounding up size of file %s" msgstr "" -#: src/truncate.c:216 +#: src/truncate.c:215 #, c-format msgid "overflow extending size of file %s" msgstr "" -#: src/truncate.c:231 +#: src/truncate.c:230 #, fuzzy, c-format msgid "failed to truncate %s at %<PRIdMAX> bytes" msgstr "edetään %s tavun yli tulostiedostossa %s" -#: src/truncate.c:305 +#: src/truncate.c:303 #, fuzzy, c-format msgid "multiple relative modifiers specified" msgstr "useita tulostiedostoja annettu" -#: src/truncate.c:335 +#: src/truncate.c:333 #, fuzzy, c-format msgid "you must specify either %s or %s" msgstr "tiedoston %s ryhmän vaihtaminen arvoon %s epäonnistui\n" -#: src/truncate.c:342 +#: src/truncate.c:340 #, fuzzy, c-format msgid "you must specify a relative %s with %s" msgstr "tiedoston %s ryhmän vaihtaminen arvoon %s epäonnistui\n" -#: src/truncate.c:349 +#: src/truncate.c:347 #, c-format msgid "%s was specified but %s was not" msgstr "" -#: src/truncate.c:400 +#: src/truncate.c:404 #, c-format msgid "cannot open %s for writing" msgstr "tiedostoa %s ei voi avata kirjoitusta varten" @@ -11420,14 +11735,13 @@ msgstr "järjestelmän nimen haku ei onnistu" msgid "" "Convert blanks in each FILE to tabs, writing to standard output.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" "Muunna kunkin TIEDOSTOn sisältämät välilyönnit sarkaimiksi, kirjoittaen\n" "vakiotulosteeseen. Jos TIEDOSTOa ei anneta tai se on ”-”, luetaan " "vakiosyötettä.\n" "\n" -#: src/unexpand.c:125 +#: src/unexpand.c:124 #, fuzzy msgid "" " -a, --all convert all blanks, instead of just initial blanks\n" @@ -11444,12 +11758,12 @@ msgstr "" "(ottaa \n" " käyttöön valitsimen -a)\n" -#: src/unexpand.c:153 +#: src/unexpand.c:152 #, c-format msgid "tabs are too far apart" msgstr "" -#: src/unexpand.c:505 +#: src/unexpand.c:504 #, fuzzy, c-format msgid "tab stop value is too large" msgstr "sarkainasetin %s on liian suuri" @@ -11465,10 +11779,9 @@ msgid "" "writing to OUTPUT (or standard output).\n" "\n" "With no options, matching lines are merged to the first occurrence.\n" -"\n" msgstr "" -#: src/uniq.c:148 +#: src/uniq.c:147 msgid "" " -c, --count prefix lines by the number of occurrences\n" " -d, --repeated only print duplicate lines\n" @@ -11476,7 +11789,7 @@ msgstr "" " -c, --count liitä rivin eteen sen esiintymiskertojen määrä\n" " -d, --repeated tulosta vain useaan kertaan esiintyvät rivit\n" -#: src/uniq.c:152 +#: src/uniq.c:151 #, fuzzy msgid "" " -D, --all-repeated[=delimit-method] print all duplicate lines\n" @@ -11497,11 +11810,11 @@ msgstr "" " -s, --skip-chars=N älä vertaa N:ää ensimmäistä merkkiä\n" " -u, --unique tulosta vain ainutkertaiset rivit\n" -#: src/uniq.c:162 +#: src/uniq.c:161 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:167 +#: src/uniq.c:166 #, fuzzy msgid "" "\n" @@ -11512,7 +11825,7 @@ msgstr "" "Kenttä on joukko tyhjeitä, joita seuraa joukko ei-tyhjeitä.\n" "Kentät ohitetaan ennen merkkejä.\n" -#: src/uniq.c:172 +#: src/uniq.c:171 msgid "" "\n" "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n" @@ -11520,24 +11833,24 @@ msgid "" "Also, comparisons honor the rules specified by 'LC_COLLATE'.\n" msgstr "" -#: src/uniq.c:359 +#: src/uniq.c:358 #, fuzzy, c-format msgid "too many repeated lines" msgstr "liian monta argumenttia" -#: src/uniq.c:522 +#: src/uniq.c:521 msgid "invalid number of fields to skip" msgstr "virheellinen ohitettavien kenttien määrä" -#: src/uniq.c:531 +#: src/uniq.c:530 msgid "invalid number of bytes to skip" msgstr "virheellinen ohitettavien tavujen määrä" -#: src/uniq.c:540 +#: src/uniq.c:539 msgid "invalid number of bytes to compare" msgstr "virheellinen verrattavien tavujen määrä" -#: src/uniq.c:559 +#: src/uniq.c:558 #, c-format msgid "printing all duplicated lines and repeat counts is meaningless" msgstr "" @@ -11593,6 +11906,11 @@ msgid_plural "up %ld days %2d:%02d, " msgstr[0] "käynnissä %ld vrk %2d:%02d, " msgstr[1] "käynnissä %ld vrk %2d:%02d, " +#: src/uptime.c:149 +#, fuzzy, c-format +msgid "up %2d:%02d, " +msgstr "käynnissä %ld vrk %2d:%02d, " + #: src/uptime.c:151 #, c-format msgid "%lu user" @@ -11684,41 +12002,41 @@ msgstr "" msgid " old " msgstr "kauan" -#: src/who.c:449 +#: src/who.c:440 #, fuzzy msgid "system boot" msgstr "Järjestelmävirhe" -#: src/who.c:456 src/who.c:458 +#: src/who.c:447 src/who.c:449 msgid "id=" msgstr "id=" -#: src/who.c:471 src/who.c:476 +#: src/who.c:462 src/who.c:467 msgid "term=" msgstr "sulj=" -#: src/who.c:473 src/who.c:477 +#: src/who.c:464 src/who.c:468 msgid "exit=" msgstr "pois=" -#: src/who.c:494 +#: src/who.c:485 #, fuzzy msgid "LOGIN" msgstr "YHTEYS" -#: src/who.c:514 +#: src/who.c:505 msgid "clock change" msgstr "kellon siirto" -#: src/who.c:526 src/who.c:527 +#: src/who.c:517 src/who.c:518 msgid "run-level" msgstr "käyttötaso" -#: src/who.c:530 src/who.c:531 +#: src/who.c:521 src/who.c:522 msgid "last=" msgstr "edell=" -#: src/who.c:562 +#: src/who.c:553 #, c-format msgid "" "\n" @@ -11727,44 +12045,44 @@ msgstr "" "\n" "# käyttäjiä=%lu\n" -#: src/who.c:568 +#: src/who.c:559 msgid "NAME" msgstr "NIMI" -#: src/who.c:568 +#: src/who.c:559 msgid "LINE" msgstr "YHTEYS" -#: src/who.c:568 +#: src/who.c:559 msgid "TIME" msgstr "AIKA" -#: src/who.c:568 +#: src/who.c:559 msgid "IDLE" msgstr "JOUTEN" -#: src/who.c:569 +#: src/who.c:560 msgid "PID" msgstr "PID" -#: src/who.c:569 +#: src/who.c:560 msgid "COMMENT" msgstr "KOMMENTTI" -#: src/who.c:569 +#: src/who.c:560 msgid "EXIT" msgstr "POIS" -#: src/who.c:649 +#: src/who.c:640 #, c-format msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n" msgstr "Käyttö: %s [VALITSIN]... [ TIEDOSTO | ARG1 ARG2 ]\n" -#: src/who.c:650 +#: src/who.c:641 msgid "Print information about users who are currently logged in.\n" msgstr "Näytä tietoa kirjautuneina olevista käyttäjistä.\n" -#: src/who.c:653 +#: src/who.c:644 msgid "" "\n" " -a, --all same as -b -d --login -p -r -t -T -u\n" @@ -11778,11 +12096,11 @@ msgstr "" " -d, --dead näytä kuolleet prosessit\n" " -H, --heading näytä otsikkorivi\n" -#: src/who.c:660 +#: src/who.c:651 msgid " -l, --login print system login processes\n" msgstr "" -#: src/who.c:663 +#: src/who.c:654 msgid "" " --lookup attempt to canonicalize hostnames via DNS\n" " -m only hostname and user associated with stdin\n" @@ -11792,7 +12110,7 @@ msgstr "" " -m vain koneen nimi ja vakiosyötteeseen liittyvä tunnus\n" " -p, --process näytä aktiiviset prosessit, jotka init on käynnistänyt\n" -#: src/who.c:668 +#: src/who.c:659 msgid "" " -q, --count all login names and number of users logged on\n" " -r, --runlevel print current runlevel\n" @@ -11804,7 +12122,7 @@ msgstr "" " -s, --short näytä vain nimi, yhteys ja aika (oletus)\n" " -t, --time näytä viimeisin järjestelmäkellon muutosaika\n" -#: src/who.c:674 +#: src/who.c:665 msgid "" " -T, -w, --mesg add user's message status as +, - or ?\n" " -u, --users list users logged in\n" @@ -11816,7 +12134,7 @@ msgstr "" " --message sama kuin -T\n" " --writable sama kuin -T\n" -#: src/who.c:682 +#: src/who.c:673 #, fuzzy, c-format msgid "" "\n" @@ -11864,19 +12182,16 @@ msgstr "" "\n" #, fuzzy -#~ msgid " gid=%s" -#~ msgstr " gid=%lu" +#~ msgid " returning value: '%s'\n" +#~ msgstr "luodaan tiedostoa %s\n" #, fuzzy -#~ msgid " euid=%s" -#~ msgstr " euid=%lu" +#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n" +#~ msgstr "Käyttö: %s [VALITSIN] NIMI...\n" -#~ msgid "" -#~ "Usage: %s NAME\n" -#~ " or: %s OPTION\n" -#~ msgstr "" -#~ "Käyttö: %s NIMI\n" -#~ " tai: %s VALITSIN\n" +#, fuzzy +#~ msgid "no valid suffix found\n" +#~ msgstr "%s: virheellinen jälkiliitteen pituus" #~ msgid "" #~ "\n" @@ -11889,19 +12204,183 @@ msgstr "" #~ " %s /usr/bin/sort Tuloste: ”sort”.\n" #~ " %s include/stdio.h .h Tuloste: ”stdio”.\n" -#~ msgid "Usage: %s [OPTION] FILE...\n" -#~ msgstr "Käyttö: %s [VALITSIN] TIEDOSTO...\n" +#~ msgid "reading %s" +#~ msgstr "luettaessa tiedostoa %s" + +#~ msgid "writing %s" +#~ msgstr "kirjoitettaessa tiedostoa %s" +#~ msgid "closing %s" +#~ msgstr "suljettaessa tiedostoa %s" + +#~ msgid "accessing %s" +#~ msgstr "käytetään tiedostoa %s" + +#~ msgid "opening %s" +#~ msgstr "tiedoston %s avaaminen" + +#~ msgid "" +#~ "Usage: %s NAME\n" +#~ " or: %s OPTION\n" +#~ 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" +#~ 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" + +#, 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 ä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" + +#, fuzzy +#~ msgid "" +#~ "WARNING: --page-increment is deprecated; use --line-increment instead" +#~ msgstr "" +#~ "valitsin --reply ei ole suositeltava; käytä valitsinta -i tai -f sen " +#~ "sijaan" + +#~ msgid "All arguments to long options are mandatory for short options.\n" +#~ msgstr "" +#~ "Pitkien valitsinten pakolliset argumentit ovat pakollisia myös lyhyille.\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" +#~ "KANTA on d desimaaliesitykselle, o oktaaliselle, x heksadesimaaliselle " +#~ "tai\n" +#~ "n tyhjälle. TAVUT on heksadesimaalinen etuliitteen 0x tai 0X kanssa, se\n" +#~ "kerrotaan 512:lla b-jälkiliitteen kanssa, 1024:llä k:n, ja 1048576:lla m:" +#~ "n\n" +#~ "kanssa. Jälkiliitteen z lisääminen mihin tahansa tyyppiin lisää jokaisen\n" +#~ "tulosterivin loppuun näkymän tulostuvista merkeistä. " + +#, 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 ilman lukuarvoa on 3. --width ilman lukuarvoa on 32.\n" +#~ "Oletuksena od käyttää -A o -t d2 -w 16.\n" + +#~ msgid "Usage: %s [OPTION]... FILE\n" +#~ msgstr "Käyttö: %s [VALITSIN]... TIEDOSTO\n" + +#~ msgid "Password:" +#~ msgstr "Salasana:" + +#~ msgid "getpass: cannot open /dev/tty" +#~ msgstr "getpass: laitteen /dev/tty avaaminen ei onnistu" + +#~ msgid "cannot set groups" +#~ msgstr "ryhmien asetus ei onnistu" + +#~ 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" + +#, 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 "" +#~ "Vaihda vallitsevaksi käyttäjä- ja ryhmä-ID:ksi TUNNUSta vastaavat.\n" +#~ "\n" +#~ " -, -l, --login tee kuoresta kirjautumiskuori\n" +#~ " -c, --command=KOMENTO välitä KOMENTO kuorelle valitsimella -c\n" +#~ " -f, --fast välitä valitsin -f kuorelle (csh:lle tai " +#~ "tcsh:lle)\n" +#~ " -m, --preserve-environment älä uudelleenaseta ympäristömuuttujia\n" +#~ " -p sama kuin -m\n" +#~ " -s, --shell=KUORI aja KUORI, jos /etc/shells sallii sen\n" + +#~ msgid "" +#~ "\n" +#~ "A mere - implies -l. If USER not given, assume root.\n" +#~ msgstr "" +#~ "\n" +#~ "Pelkkä - tekee saman kuin -l. Jos TUNNUSta ei ole annettu, sen oletetaan\n" +#~ "olevan root.\n" + +#~ msgid "user %s does not exist" +#~ msgstr "tunnusta %s ei ole olemassa" + +#~ msgid "incorrect password" +#~ msgstr "väärä salasana" + +#~ msgid "using restricted shell %s" +#~ msgstr "käytetään rajoitettua kuorta %s" + +#~ msgid "warning: cannot change directory to %s" +#~ msgstr "varoitus: ei voida siirtyä hakemistoon %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" -#~ " --dereference affect the referent of each symbolic link (this " -#~ "is\n" -#~ " the default), rather than the symbolic link " -#~ "itself\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 " @@ -11914,6 +12393,13 @@ msgstr "" #~ " --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" @@ -11942,13 +12428,6 @@ msgstr "" #~ " -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" @@ -12001,32 +12480,6 @@ msgstr "" #~ "tiedostosta\n" #~ "\n" -#, fuzzy -#~ msgid "Usage: %s [OPTION]... PATH START\n" -#~ msgstr "Käyttö: %s [VALITSIN]... JOUKKO1 [JOUKKO2]\n" - -#, fuzzy -#~ msgid "" -#~ " -n, --no-newline do not output the trailing " -#~ "newline\n" -#~ " " -#~ msgstr "" -#~ "Kaiuta MERKKIJONO(t) vakiotulosteeseen.\n" -#~ "\n" -#~ " -n älä lisää rivinvaihtoa loppuun\n" - -#, fuzzy -#~ 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" -#~ "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 "" #~ "Display the current time in the given FORMAT, or set the system date.\n" #~ "\n" @@ -12040,19 +12493,17 @@ msgstr "" #~ " -f, --file=PVMTIED kuten --date, kerran kullekin PVMTIEDoston " #~ "riville\n" -#~ msgid "cannot create link %s" -#~ msgstr "linkkiä %s ei voi luoda" - -#, fuzzy -#~ msgid "%s: option '%s' is ambiguous\n" -#~ msgstr "%s: valitsin ”-W %s” ei ole yksiselitteinen\n" - #, fuzzy #~ msgid "" -#~ "WARNING: --preserve_context is deprecated; use --preserve-context instead" +#~ "\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 "" -#~ "valitsin --reply ei ole suositeltava; käytä valitsinta -i tai -f sen " -#~ "sijaan" +#~ "\n" +#~ "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" @@ -12061,12 +12512,19 @@ msgstr "" #~ msgid "truncating %s" #~ msgstr "luodaan %s" -#~ msgid "invalid format width" -#~ msgstr "virheellinen muodon leveys" +#~ 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" +#~ msgstr "" +#~ "valitsin --reply ei ole suositeltava; käytä valitsinta -i tai -f sen " +#~ "sijaan" + #~ msgid "creating symbolic link %s" #~ msgstr "luotaessa symbolista linkkiä %s" @@ -12467,6 +12925,9 @@ msgstr "" #~ msgid "Usage: %s [OPTION] DIRECTORY...\n" #~ msgstr "Käyttö: %s [VALITSIN] HAKEMISTO...\n" +#~ msgid "Usage: %s [OPTION] FILE...\n" +#~ msgstr "Käyttö: %s [VALITSIN] TIEDOSTO...\n" + #, fuzzy #~ msgid "Richard Stallman" #~ msgstr "Richard Stallman ja David MacKenzie" @@ -12876,9 +13337,6 @@ 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 57b3f9a8..34994779 100644 Binary files a/po/fr.gmo and b/po/fr.gmo differ diff --git a/po/fr.po b/po/fr.po index 75ebad5d..182609a7 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,29 +1,30 @@ # French translation of coreutils -# Copyright © 2004, 2008, 2009, 2010 Free Software Foundation, Inc. +# Copyright © 2004, 2008, 2009, 2010, 2011, 2012, 2013 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-2011. -# +# Stéphane Raimbault <stephane.raimbault@gmail.com>, 2009-2012. +# David Prévot <david@tilapin.org>, 2012, 2013. msgid "" msgstr "" -"Project-Id-Version: coreutils-8.13\n" +"Project-Id-Version: coreutils-8.20-pre3\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2012-05-10 19:35+0200\n" -"PO-Revision-Date: 2011-09-10 01:09+0200\n" -"Last-Translator: Stéphane Raimbault <stephane.raimbault@gmail.com>\n" +"POT-Creation-Date: 2013-02-14 15:56+0000\n" +"PO-Revision-Date: 2013-02-11 17:08-0400\n" +"Last-Translator: David Prévot <david@tilapin.org>\n" "Language-Team: French <traduc@traduc.org>\n" "Language: fr\n" "MIME-Version: 1.0\n" "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" #: lib/argmatch.c:133 #, c-format msgid "invalid argument %s for %s" -msgstr "argument %s non valide pour %s" +msgstr "argument %s incorrect pour %s" #: lib/argmatch.c:134 #, c-format @@ -32,28 +33,28 @@ msgstr "argument %s ambigu pour %s" #: lib/argmatch.c:153 msgid "Valid arguments are:" -msgstr "Les arguments valides sont :" +msgstr "Les arguments valables sont :" #: lib/closein.c:100 msgid "error closing file" -msgstr "erreur à la fermeture du fichier" - -#: lib/closeout.c:112 src/base64.c:109 src/base64.c:121 src/base64.c:127 -#: src/base64.c:168 src/base64.c:224 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:330 src/expand.c:355 src/head.c:298 -#: src/head.c:348 src/head.c:756 src/head.c:797 src/mktemp.c:350 src/od.c:919 -#: src/paste.c:160 src/shuf.c:369 src/split.c:727 src/split.c:964 -#: src/split.c:969 src/tail.c:350 src/tail.c:1201 src/tail.c:1307 +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 -#: src/unexpand.c:427 src/unexpand.c:443 +#: 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:1160 src/copy.c:2602 +#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617 #, c-format msgid "preserving permissions for %s" -msgstr "préserve les permissions pour %s" +msgstr "conservation des permissions de %s" #: lib/error.c:188 msgid "Unknown system error" @@ -125,7 +126,7 @@ msgstr "Valeur incorrecte pour ai_flags" #: lib/gai_strerror.c:60 msgid "Non-recoverable failure in name resolution" -msgstr "Échec non récupérable à la résolution de nom" +msgstr "Échec définitif lors de la résolution de nom" #: lib/gai_strerror.c:61 msgid "ai_family not supported" @@ -145,11 +146,11 @@ msgstr "Nom ou service inconnu" #: lib/gai_strerror.c:65 msgid "Servname not supported for ai_socktype" -msgstr "Servname n'est pas pris en charge avec ai_socktype" +msgstr "Nom de serveur non pris en charge avec ai_socktype" #: lib/gai_strerror.c:66 msgid "ai_socktype not supported" -msgstr "ai_socktype n'est pas pris en charge." +msgstr "ai_socktype n'est pas pris en charge" #: lib/gai_strerror.c:67 msgid "System error" @@ -205,7 +206,7 @@ msgstr "%s : l'option « %c%s » n'accepte pas d'argument\n" #: lib/getopt.c:685 lib/getopt.c:704 #, c-format msgid "%s: option '--%s' requires an argument\n" -msgstr "%s : l'option « --%s » requiert un argument\n" +msgstr "%s : l'option « --%s » nécessite un argument\n" #: lib/getopt.c:742 lib/getopt.c:745 #, c-format @@ -220,12 +221,12 @@ msgstr "%s : option non reconnue « %c%s »\n" #: lib/getopt.c:805 lib/getopt.c:808 #, c-format msgid "%s: invalid option -- '%c'\n" -msgstr "%s : option non valide -- %c\n" +msgstr "%s : option incorrecte — « %c »\n" #: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 #, c-format msgid "%s: option requires an argument -- '%c'\n" -msgstr "%s : l'option requiert un argument -- « %c »\n" +msgstr "%s : l'option nécessite un argument — « %c »\n" #: lib/getopt.c:934 lib/getopt.c:950 #, c-format @@ -235,25 +236,25 @@ msgstr "%s : l'option « -W %s » est ambiguë\n" #: lib/getopt.c:974 lib/getopt.c:992 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s : l'option « -W %s » ne prend pas d'argument\n" +msgstr "%s : l'option « -W %s » n'accepte pas d'argument\n" #: lib/getopt.c:1013 lib/getopt.c:1031 #, c-format msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s : l'option « -W %s » requiert un argument\n" +msgstr "%s : l'option « -W %s » nécessite un argument\n" -#: lib/mkdir-p.c:196 src/install.c:483 +#: lib/mkdir-p.c:196 src/install.c:484 #, c-format msgid "cannot change permissions of %s" -msgstr "impossible de changer les permissions de %s" +msgstr "impossible de modifier les permissions de %s" -#: lib/mkdir-p.c:206 src/copy.c:2261 src/install.c:709 src/install.c:722 +#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722 #, 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:915 src/tac.c:435 +#: src/split.c:929 src/tac.c:434 #, c-format msgid "memory exhausted" msgstr "mémoire insuffisante" @@ -302,77 +303,77 @@ msgstr " »" msgid "%s: end of file" msgstr "%s : fin de fichier" -#: lib/regcomp.c:130 +#: lib/regcomp.c:131 msgid "Success" -msgstr "Succès" +msgstr "Réussite" -#: lib/regcomp.c:133 +#: lib/regcomp.c:134 msgid "No match" msgstr "Aucune correspondance" -#: lib/regcomp.c:136 +#: lib/regcomp.c:137 msgid "Invalid regular expression" -msgstr "Expression régulière non valide" +msgstr "Expression rationnelle incorrecte" -#: lib/regcomp.c:139 +#: lib/regcomp.c:140 msgid "Invalid collation character" -msgstr "Caractère non valide dans une séquence" +msgstr "Caractère de collation incorrect" -#: lib/regcomp.c:142 +#: lib/regcomp.c:143 msgid "Invalid character class name" -msgstr "Nom de classe de caractère non valide" +msgstr "Nom de classe de caractères incorrect" -#: lib/regcomp.c:145 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "Barre oblique inverse finale" -#: lib/regcomp.c:148 +#: lib/regcomp.c:149 msgid "Invalid back reference" -msgstr "Référence de retour non valide" +msgstr "Référence arrière incorrecte" -#: lib/regcomp.c:151 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "[ ou [^ sans correspondance" -#: lib/regcomp.c:154 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "( ou \\( sans correspondance" -#: lib/regcomp.c:157 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "\\{ sans correspondance" -#: lib/regcomp.c:160 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" -msgstr "Contenu de \\{\\} non valide" +msgstr "Contenu de \\{\\} incorrect" -#: lib/regcomp.c:163 +#: lib/regcomp.c:164 msgid "Invalid range end" -msgstr "Fin d'intervalle non valide" +msgstr "Fin d'intervalle incorrecte" -#: lib/regcomp.c:166 +#: lib/regcomp.c:167 msgid "Memory exhausted" -msgstr "Mémoire insuffisante" +msgstr "Mémoire épuisée" -#: lib/regcomp.c:169 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" -msgstr "Expression régulière précédente non valide" +msgstr "Expression rationnelle précédente incorrecte" -#: lib/regcomp.c:172 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" -msgstr "Fin prématurée d'expression régulière" +msgstr "Fin prématurée d'expression rationnelle" -#: lib/regcomp.c:175 +#: lib/regcomp.c:176 msgid "Regular expression too big" -msgstr "Expression régulière trop longue" +msgstr "Expression rationnelle trop grande" -#: lib/regcomp.c:178 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr ") ou \\) sans correspondance" -#: lib/regcomp.c:703 +#: lib/regcomp.c:704 msgid "No previous regular expression" -msgstr "Pas d'expression régulière précédente" +msgstr "Pas d'expression rationnelle précédente" #: lib/root-dev-ino.h:37 #, c-format @@ -397,7 +398,7 @@ msgstr "utilisez --no-preserve-root pour inhiber cette mesure de sûreté" #. locale -k LC_MESSAGES | grep '^yesexpr=' #: lib/rpmatch.c:147 msgid "^[yY]" -msgstr "^[oOyY]" +msgstr "^[oOyY].*" #. TRANSLATORS: A regular expression testing for a negative answer #. (english: "no"). Testing the first character may be sufficient. @@ -407,9 +408,9 @@ msgstr "^[oOyY]" #. locale -k LC_MESSAGES | grep '^noexpr=' #: lib/rpmatch.c:160 msgid "^[nN]" -msgstr "^[nN]" +msgstr "^[nN].*" -#: lib/set-mode-acl.c:695 src/copy.c:2284 src/cp.c:518 +#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516 #, c-format msgid "setting permissions for %s" msgstr "initialisation des permissions de %s" @@ -428,15 +429,15 @@ msgstr "Quitté" #: lib/siglist.h:40 msgid "Illegal instruction" -msgstr "Instruction illégalle" +msgstr "Instruction illégale" #: lib/siglist.h:43 msgid "Trace/breakpoint trap" -msgstr "Trace/point d'arrêt capturé" +msgstr "Capture de trace ou point d'arrêt" #: lib/siglist.h:46 msgid "Aborted" -msgstr "Avorté" +msgstr "Abandonné" #: lib/siglist.h:49 msgid "Floating point exception" @@ -448,7 +449,7 @@ msgstr "Tué" #: lib/siglist.h:55 msgid "Bus error" -msgstr "Erreur bus" +msgstr "Erreur de bus" #: lib/siglist.h:58 msgid "Segmentation fault" @@ -460,7 +461,7 @@ msgstr "Tube brisé" #: lib/siglist.h:64 msgid "Alarm clock" -msgstr "Alarme" +msgstr "Réveil" #: lib/siglist.h:67 msgid "Terminated" @@ -484,7 +485,7 @@ msgstr "Repris" #: lib/siglist.h:82 msgid "Child exited" -msgstr "Le fils a quitté" +msgstr "Fin du processus fils" #: lib/siglist.h:85 msgid "Stopped (tty input)" @@ -500,7 +501,7 @@ msgstr "E/S possible" #: lib/siglist.h:94 msgid "CPU time limit exceeded" -msgstr "Limite de temps CPU dépassée" +msgstr "Temps limite de processeur dépassé" #: lib/siglist.h:97 msgid "File size limit exceeded" @@ -512,19 +513,19 @@ msgstr "Temps virtuel expiré" #: lib/siglist.h:103 msgid "Profiling timer expired" -msgstr "Temps de profiling expiré" +msgstr "Temporisation de profilage dépassée" #: lib/siglist.h:106 msgid "Window changed" -msgstr "Fenêtre changée" +msgstr "Fenêtre modifiée" #: lib/siglist.h:109 msgid "User defined signal 1" -msgstr "Signal 1 défini par l'utilisateur" +msgstr "Signal 1 défini par l'utilisateur" #: lib/siglist.h:112 msgid "User defined signal 2" -msgstr "Signal 2 défini par l'utilisateur" +msgstr "Signal 2 défini par l'utilisateur" #: lib/siglist.h:117 msgid "EMT trap" @@ -540,71 +541,71 @@ msgstr "Erreur de pile" #: lib/siglist.h:126 msgid "Information request" -msgstr "Requête d'information" +msgstr "Demande de renseignements" #: lib/siglist.h:128 msgid "Power failure" -msgstr "Panne d'alimentation" +msgstr "Échec d'alimentation" #: lib/siglist.h:131 msgid "Resource lost" msgstr "Ressource perdue" -#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262 -#: lib/spawn-pipe.c:265 -#, fuzzy, c-format +#: 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 la FIFO %s" +msgstr "impossible de créer un tube (« pipe »)" -#: lib/spawn-pipe.c:232 lib/spawn-pipe.c:346 lib/wait-process.c:282 +#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282 #: lib/wait-process.c:356 -#, fuzzy, c-format +#, c-format msgid "%s subprocess failed" -msgstr "%s : échec de positionnement (seek)" +msgstr "échec de sous-processus %s" #: lib/strsignal.c:114 #, c-format msgid "Real-time signal %d" -msgstr "Signal temps-réel %d" +msgstr "Signal %d en temps réel" #: lib/strsignal.c:118 #, c-format msgid "Unknown signal %d" -msgstr "Signal inconnu %d" +msgstr "Signal %d inconnu" -#: lib/unicodeio.c:103 +#: lib/unicodeio.c:102 msgid "iconv function not usable" msgstr "fonction iconv non utilisable" -#: lib/unicodeio.c:105 +#: lib/unicodeio.c:104 msgid "iconv function not available" msgstr "fonction iconv non disponible" -#: lib/unicodeio.c:112 +#: lib/unicodeio.c:111 msgid "character out of range" msgstr "caractère hors limites" -#: lib/unicodeio.c:182 +#: lib/unicodeio.c:181 #, c-format msgid "cannot convert U+%04X to local character set" -msgstr "impossible de convertir U+%04X en un jeu de caractères local" +msgstr "impossible de convertir U+%04X dans le jeu de caractères local" -#: lib/unicodeio.c:184 +#: lib/unicodeio.c:183 #, c-format msgid "cannot convert U+%04X to local character set: %s" -msgstr "impossible de convertir U+%04X au jeu de caractères local « %s »" +msgstr "impossible de convertir U+%04X dans le jeu de caractères local : %s" #: lib/userspec.c:106 msgid "invalid user" -msgstr "utilisateur non valide" +msgstr "utilisateur incorrect" #: lib/userspec.c:107 msgid "invalid group" -msgstr "groupe non valide" +msgstr "groupe incorrect" #: lib/userspec.c:108 msgid "invalid spec" -msgstr "spec non valide" +msgstr "spécification incorrecte" #: lib/verror.c:73 #, c-format @@ -638,12 +639,11 @@ msgid "" "\n" msgstr "" "\n" -"License GPLv3+ : GNU GPL version 3 ou ultérieure\n" +"License GPLv3+ : GNU GPL version 3 ou ultérieure\n" "<http://gnu.org/licenses/gpl.html>\n" -"Ceci est logiciel libre, vous êtes libre de le modifier et de le " -"redistribuer.\n" +"C'est logiciel libre, vous êtes libre de le modifier et de le redistribuer.\n" "Ce logiciel n'est accompagné d'ABSOLUMENT AUCUNE GARANTIE, dans les limites\n" -"autorisees par la loi applicable.\n" +"autorisées par la loi applicable.\n" #. TRANSLATORS: %s denotes an author name. #: lib/version-etc.c:102 @@ -672,7 +672,7 @@ msgid "" "Written by %s, %s, %s,\n" "and %s.\n" msgstr "" -"Écrit par %s, %s, %s,\n" +"Écrit par %s, %s, %s\n" "et %s.\n" #. TRANSLATORS: Each %s denotes an author name. @@ -697,7 +697,7 @@ msgid "" "%s, %s, and %s.\n" msgstr "" "Écrit par %s, %s, %s,\n" -"%s, %s, and %s.\n" +"%s, %s et %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -709,7 +709,7 @@ msgid "" "%s, %s, %s, and %s.\n" msgstr "" "Écrit par %s, %s, %s,\n" -"%s, %s, %s, and %s.\n" +"%s, %s, %s et %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -722,7 +722,7 @@ msgid "" "and %s.\n" msgstr "" "Écrit par %s, %s, %s,\n" -"%s, %s, %s, %s,\n" +"%s, %s, %s, %s\n" "et %s.\n" #. TRANSLATORS: Each %s denotes an author name. @@ -764,16 +764,15 @@ msgid "" "Report bugs to: %s\n" msgstr "" "\n" -"Signalez les anomalies : <%s>\n" -"Signalez les problèmes de traduction : <http://translationproject.org/team/" -"fr.html>\n" +"Signalez les anomalies à : <%s>\n" +"Signalez les problèmes de traduction à : <traduc@traduc.org>\n" #: lib/version-etc.c:247 #, c-format msgid "Report %s bugs to: %s\n" -msgstr "Signalez les anomalies de « %s » : <%s>\n" +msgstr "Signalez les anomalies de « %s » à : <%s>\n" -#: lib/version-etc.c:251 src/system.h:562 +#: lib/version-etc.c:251 src/system.h:573 #, c-format msgid "%s home page: <%s>\n" msgstr "Page d'accueil de « %s » : %s\n" @@ -783,41 +782,43 @@ 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:563 +#: lib/version-etc.c:256 src/system.h:574 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" -msgstr "Aide générale sur les logiciels GNU : <http://www.gnu.org/gethelp/>\n" +msgstr "" +"Aide globale sur les logiciels GNU : <http://www.gnu.org/help/gethelp>\n" #: lib/w32spawn.h:43 -#, fuzzy, c-format +#, c-format msgid "_open_osfhandle failed" -msgstr "échec d'ouverture" +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 "" +msgstr "sous-processus %s" #: lib/wait-process.c:274 lib/wait-process.c:346 #, c-format msgid "%s subprocess got fatal signal %d" -msgstr "" +msgstr "le sous-processus %s a reçu un signal fatal %d" #: lib/xfreopen.c:35 msgid "stdin" -msgstr "stdin" +msgstr "entrée standard (stdin)" #: lib/xfreopen.c:36 msgid "stdout" -msgstr "stdout" +msgstr "sortie standard (stdout)" #: lib/xfreopen.c:37 msgid "stderr" -msgstr "stderr" +msgstr "sortie d'erreur (stderr)" #: lib/xfreopen.c:38 msgid "unknown stream" @@ -826,7 +827,7 @@ msgstr "flux inconnu" #: lib/xfreopen.c:39 #, c-format msgid "failed to reopen %s with mode %s" -msgstr "impossible d'ouvrir à nouveau %s en mode %s" +msgstr "impossible de rouvrir %s en mode %s" #: lib/xmemcoll.c:39 src/expr.c:886 #, c-format @@ -850,19 +851,19 @@ msgid "cannot perform formatted output" msgstr "impossible mettre en forme la sortie formatée" #: lib/xstrtol-error.c:63 -#, fuzzy, c-format +#, c-format msgid "invalid %s%s argument '%s'" -msgstr "%s%s argument non valide « %s »" +msgstr "argument %s%s incorrect « %s »" #: lib/xstrtol-error.c:68 -#, fuzzy, c-format +#, c-format msgid "invalid suffix in %s%s argument '%s'" -msgstr "suffixe non valide dans l'argument « %s » de %s%s" +msgstr "suffixe incorrect dans l'argument %s%s « %s »" #: lib/xstrtol-error.c:72 -#, fuzzy, c-format +#, c-format msgid "%s%s argument '%s' too large" -msgstr "%s%s argument « %s » trop grand" +msgstr "argument %s%s « %s » trop grand" #. This is a proper name. See the gettext manual, section Names. #: src/base64.c:40 @@ -874,13 +875,12 @@ msgstr "Simon Josefsson" msgid "" "Usage: %s [OPTION]... [FILE]\n" "Base64 encode or decode FILE, or standard input, to standard output.\n" -"\n" msgstr "" "Utilisation : %s [OPTION]... [FILE]\n" -"Base64 code ou décode FILE, ou l'entrée standard, sur la sortie standard.\n" -"\n" +"Encoder ou décoder en base64 FILE, ou l'entrée standard, sur la sortie " +"standard.\n" -#: src/base64.c:64 +#: src/base64.c:67 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -889,23 +889,24 @@ msgid "" " Use 0 to disable line wrapping\n" "\n" msgstr "" -" -d, --decode décode les données\n" -" -i, --ignore-garbage lors du décodage, ignore les caractères non\n" -" alphabétiques\n" -" -w, --wrap=COLS effectue la césure des lignes après COLS caractères\n" -" (par défaut 76).\n" -" Utilisez 0 pour désactiver la césure\n" +" -d, --decode décoder les données\n" +" -i, --ignore-garbage lors du décodage, ignorer les caractères non\n" +" alphabétiques\n" +" -w, --wrap=COLS effectuer la césure des lignes après COLS " +"caractères\n" +" (76 par défaut). Utilisez 0 pour désactiver la " +"césure\n" "\n" -#: src/base64.c:73 src/cat.c:110 src/fmt.c:293 src/shuf.c:71 src/sum.c:70 +#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" msgstr "" "\n" -"En l'absence de FILE ou quand FILE est -, lit l'entrée standard.\n" +"Sans FILE ou quand FILE est -, lire l'entrée standard.\n" -#: src/base64.c:76 +#: src/base64.c:79 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -914,43 +915,45 @@ msgid "" "from any other non-alphabet bytes in the encoded stream.\n" msgstr "" "\n" -"Les données sont codées comme décrit par l'alphabet base64 du RFC 3548.\n" -"Lors du décodage, l'entrée peut contenir des retours à la ligne en plus des\n" +"Les données sont codées comme décrit pour l'alphabet base64 dans la " +"RFC 3548.\n" +"Lors du décodage, l'entrée peut contenir des changements de ligne en plus " +"des\n" "octets de l'alphabet base64 formel. Utilisez --ignore-garbage pour tenter " "de\n" "récupérer tout autre octet non alphabétique dans le flux codé.\n" -#: src/base64.c:171 src/base64.c:208 src/csplit.c:263 src/csplit.c:1435 -#: src/join.c:451 src/shuf.c:157 src/shuf.c:361 src/tac-pipe.c:74 +#: 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 #, c-format msgid "read error" msgstr "erreur de lecture" -#: src/base64.c:227 +#: src/base64.c:230 #, c-format msgid "invalid input" -msgstr "entrée non valide" +msgstr "entrée incorrecte" -#: src/base64.c:264 +#: src/base64.c:267 #, c-format msgid "invalid wrap size: %s" -msgstr "longueur de césure non valide : %s" - -#: src/base64.c:283 src/basename.c:173 src/comm.c:435 src/cp.c:607 -#: src/date.c:441 src/dircolors.c:447 src/du.c:894 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:169 src/install.c:929 src/join.c:961 -#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:157 src/mv.c:447 -#: src/od.c:1802 src/ptx.c:2081 src/readlink.c:154 src/seq.c:408 -#: src/shuf.c:320 src/shuf.c:339 src/sort.c:4477 src/split.c:1313 -#: src/tr.c:1797 src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:454 -#: src/uniq.c:471 src/unlink.c:81 src/uptime.c:250 src/users.c:146 -#: src/wc.c:666 src/who.c:836 src/whoami.c:79 +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 #, c-format msgid "extra operand %s" msgstr "opérande supplémentaire %s" -#: src/base64.c:315 src/cat.c:781 +#: src/base64.c:318 src/cat.c:781 #, c-format msgid "closing standard input" msgstr "fermeture de l'entrée standard" @@ -958,45 +961,48 @@ 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/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:53 src/env.c:33 +#: 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/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:65 src/su.c:88 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 +#: 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 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 "" "Utilisation : %s NAME [SUFFIX]...\n" -" ou : %s OPTION\n" +" ou : %s OPTION... NAME...\n" #: src/basename.c:53 msgid "" "Print NAME with any leading directory components removed.\n" "If specified, also remove a trailing SUFFIX.\n" -"\n" msgstr "" -"Affiche NAME sans le précéder des composants des noms de répertoires\n" -"Si spécifié, enlève aussi SUFFIX en terminaison.\n" -"\n" +"Afficher NAME sans le précéder des composants des noms de répertoires\n" +"Si indiqué, enlever aussi SUFFIX en terminaison.\n" -#: src/basename.c:59 +#: 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" 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" -#: src/basename.c:66 +#: src/basename.c:67 #, c-format msgid "" "\n" @@ -1006,22 +1012,29 @@ msgid "" " %s -s .h include/stdio.h -> \"stdio\"\n" " %s -a any/str1 any/str2 -> \"str1\" followed by \"str2\"\n" msgstr "" +"\n" +"Exemples :\n" +" %s /usr/bin/sort → « sort »\n" +" %s include/stdio.h .h → « stdio »\n" +" %s -s .h include/stdio.h → « stdio »\n" +" %s -a nimp/chaine1 nimp/chaine2 → « chaine1 » suivi par « chaine2 »\n" # Opérande est un nom masculin -#: src/basename.c:167 src/chcon.c:531 src/chgrp.c:277 src/chmod.c:526 -#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1369 +#: 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:183 src/mkfifo.c:108 src/mknod.c:146 src/nohup.c:111 -#: src/pathchk.c:148 src/printf.c:674 src/readlink.c:146 src/realpath.c:236 -#: src/rm.c:314 src/rmdir.c:223 src/seq.c:402 src/setuidgid.c:137 -#: src/sleep.c:119 src/stat.c:1476 src/stdbuf.c:346 src/tr.c:1782 +#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 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 #, 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:52 src/split.c:49 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/split.c:49 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" @@ -1031,8 +1044,8 @@ msgstr "Torbjorn Granlund" msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:846 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4720 src/nl.c:182 src/paste.c:435 src/pr.c:2768 src/sum.c:58 +#: 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/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" @@ -1049,15 +1062,15 @@ msgid "" " -n, --number number all output lines\n" " -s, --squeeze-blank suppress repeated empty output lines\n" msgstr "" -"Concatène FILE(s), ou l'entrée standard, sur la sortie standard.\n" +"Concaténer le ou les FILEs, ou l'entrée standard, vers la sortie standard.\n" "\n" " -A, --show-all équivalent à -vET\n" -" -b, --number-nonblank numérote les lignes non vides en sortie, " -"surcharge -n\n" +" -b, --number-nonblank numéroter lignes non vides en sortie, surcharge -" +"n\n" " -e équivalent à -vE\n" -" -E, --show-ends affiche $ à la fin de chaque ligne\n" -" -n, --number numérote toutes les lignes en sortie\n" -" -s, --squeeze-blank supprime les lignes vides qui se répètent en " +" -E, --show-ends afficher $ à la fin de chaque ligne\n" +" -n, --number numéroter toutes les lignes en sortie\n" +" -s, --squeeze-blank supprimer les lignes vides qui se répètent en " "sortie\n" #: src/cat.c:102 @@ -1068,12 +1081,12 @@ msgid "" " -v, --show-nonprinting use ^ and M- notation, except for LFD and TAB\n" msgstr "" " -t équivalent à -vT\n" -" -T, --show-tabs affiche les caractères TAB comme ^I\n" +" -T, --show-tabs afficher les caractères TAB comme ^I\n" " -u (ignoré)\n" -" -v, --show-nonprinting utilise la notation ^ et M-, sauf pour LFD et " +" -v, --show-nonprinting utiliser les notations ^ et M-, sauf pour LFD et " "TAB\n" -# %s est « ./cat » (5 caractères), la ligne suivante est indentée sur cette supposition (Stéphane) +# %s est « cat » (3 caractères), la ligne suivante est indentée sur cette supposition (Stéphane, David) #: src/cat.c:114 #, c-format msgid "" @@ -1084,16 +1097,16 @@ msgid "" msgstr "" "\n" "Exemples :\n" -" %s f - g affiche le contenu de f, puis l'entrée standard et ensuite le\n" -" contenu de g.\n" -" %s copie l'entrée standard vers la sortie standard.\n" +" %s f - g Afficher le contenu de f, suivi de l'entrée standard, puis du\n" +" contenu de g.\n" +" %s Copier l'entrée standard vers la sortie standard.\n" #: src/cat.c:326 #, c-format msgid "cannot do ioctl on %s" msgstr "impossible d'exécuter ioctl sur %s" -#: src/cat.c:637 src/dd.c:2209 src/sort.c:379 src/tee.c:165 src/yes.c:86 +#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86 #, c-format msgid "standard output" msgstr "sortie standard" @@ -1110,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:55 src/head.c:46 src/hostid.c:33 +#: 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 msgid "Jim Meyering" msgstr "Jim Meyering" -#: src/chcon.c:100 src/runcon.c:203 src/runcon.c:234 +#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238 #, c-format msgid "failed to create security context: %s" msgstr "impossible de créer le contexte de sécurité : %s" @@ -1127,8 +1140,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:540 src/copy.c:2222 src/runcon.c:217 -#: src/stat.c:683 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221 +#: src/stat.c:702 #, c-format msgid "failed to get security context of %s" msgstr "impossible de récupérer du contexte de sécurité de %s" @@ -1136,21 +1149,20 @@ msgstr "impossible de récupérer du contexte de sécurité de %s" #: src/chcon.c:166 #, c-format msgid "can't apply partial context to unlabeled file %s" -msgstr "" -"impossible d'appliquer un contexte partiel à un fichier non étiquetté %s" +msgstr "impossible d'appliquer un contexte partiel au fichier %s non étiqueté" #: src/chcon.c:193 #, c-format msgid "failed to change context of %s to %s" -msgstr "impossible de changer le contexte de %s à %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:446 src/ls.c:2981 +#: src/du.c:457 src/ls.c:2981 #, 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:426 +#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437 #, c-format msgid "cannot read directory %s" msgstr "impossible de lire le répertoire %s" @@ -1160,13 +1172,13 @@ 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:599 +#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562 #, 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:618 -#: src/remove.c:613 +#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642 +#: src/remove.c:576 #, c-format msgid "fts_close failed" msgstr "échec de fts_close" @@ -1184,71 +1196,75 @@ msgstr "" " ou : %s [OPTION]... --reference=RFILE FILE...\n" #: src/chcon.c:357 -#, fuzzy msgid "" "Change the security context of each FILE to CONTEXT.\n" "With --reference, change the security context of each FILE to that of " "RFILE.\n" -"\n" msgstr "" -"Change le contexte de sécurité de chaque FILE en CONTEXT.\n" -"Avec --reference, change le contexte de sécurité de chaque FILE à celui de\n" -"RFILE.\n" -"\n" -" -h, --no-dereference affecte les liens symboliques au lieu des fichiers\n" -" référencés\n" +"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" -#: src/chcon.c:362 src/chgrp.c:123 src/chown.c:94 +#: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94 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 "" +" --dereference affecter le référent de chaque lien symbolique " +"(par\n" +" défaut), au lieu du lien symbolique lui-même\n" +" -h, --no-dereference affecter les liens symboliques au lieu des " +"fichiers\n" +" référencés\n" -#: src/chcon.c:367 -#, fuzzy +#: src/chcon.c:369 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" " -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éfinit l'utilisateur USER dans le contexte de\n" -" sécurité cible\n" -" -r, --role=ROLE définit le rôle ROLE dans le contexte de sécurité " +" -u, --user=USER définir l'utilisateur USER dans le contexte de\n" +" sécurité cible\n" +" -r, --role=ROLE définir le rôle ROLE dans le contexte de sécurité " "cible\n" -" -t, --type=TYPE définit le type TYPE dans le contexte de sécurité " +" -t, --type=TYPE définir le type TYPE dans le contexte de sécurité " "cible\n" -" -l, --range=RANGE définit l'intervalle RANGE dans le contexte de " -"sécurité\n" -" cible\n" -"\n" +" -l, --range=RANGE définir l'intervalle RANGE 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 +msgid "" +" --no-preserve-root do not treat '/' specially (the default)\n" +" --preserve-root fail to operate recursively on '/'\n" +msgstr "" +" --no-preserve-root ne pas traiter « / » de manière spéciale (par " +"défaut)\n" +" --preserve-root bloquer le traitement récursif sur « / »\n" -#: src/chcon.c:373 -#, fuzzy +#: src/chcon.c:379 msgid "" " --reference=RFILE use RFILE's security context rather than " "specifying\n" " a CONTEXT value\n" msgstr "" -" --reference=RFILE utilise le contexte de sécurité de RFILE au lieu " -"de\n" -" spécifier une valeur CONTEXT\n" -" -R, --recursive opére récursivement sur les fichiers et " -"répertoires\n" -" -v, --verbose affiche un diagnostic pour chaque fichier traité\n" +" --reference=RFILE utiliser le contexte de sécurité de RFILE au lieu\n" +" d'indiquer une valeur CONTEXT\n" -#: src/chcon.c:377 src/chgrp.c:140 src/chown.c:118 +#: 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 opérer récursivement sur les fichiers et " +"répertoires\n" -#: src/chcon.c:380 +#: src/chcon.c:386 msgid " -v, --verbose output a diagnostic for every file processed\n" msgstr "" +" -v, --verbose afficher un diagnostic pour chaque fichier traité\n" -#: src/chcon.c:383 src/chgrp.c:143 src/chown.c:121 -#, fuzzy +#: src/chcon.c:389 src/chgrp.c:143 src/chown.c:121 msgid "" "\n" "The following options modify how a hierarchy is traversed when the -R\n" @@ -1262,48 +1278,49 @@ msgid "" " -P do not traverse any symbolic links (default)\n" "\n" msgstr "" -"Les options suivantes modifient la façon dont la hiérarchie est traversée\n" -"lorsque l'option -R est aussi spécifiée. Si plusieurs options sont " -"indiquées,\n" -"seule la dernière sera prise en compte.\n" "\n" -" -H si l'argument en ligne de commande est un lien \n" -" symbolique vers un répertoire alors le parcourir\n" -" -L parcourt tous les liens symboliques menant à un \n" -" répertoire\n" -" -P ne parcourt aucun lien symbolique (par défaut)\n" +"Les options suivantes modifient la façon de parcourir la hiérarchie lorsque\n" +"l'option -R est aussi indiquée. Si plusieurs options sont indiquées, seule " +"la\n" +"dernière sera prise en compte.\n" +"\n" +" -H si l'argument en ligne de commande est un lien\n" +" symbolique vers un répertoire, le parcourir\n" +" -L parcourir tous les liens symboliques menant à un\n" +" répertoire\n" +" -P ne parcourir aucun lien symbolique (par défaut)\n" "\n" -#: src/chcon.c:512 src/chgrp.c:264 src/chown.c:267 +#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267 #, c-format msgid "-R --dereference requires either -H or -L" -msgstr "-R --dereference requiert soit -H ou -L" +msgstr "-R --dereference nécessite soit -H ou -L" -#: src/chcon.c:518 +#: src/chcon.c:524 #, c-format msgid "-R -h requires -P" -msgstr "-R -h requiert -P" +msgstr "-R -h nécessite -P" -#: src/chcon.c:533 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282 -#: src/comm.c:429 src/csplit.c:1371 src/join.c:1149 src/link.c:79 -#: src/mknod.c:148 src/setuidgid.c:139 src/tr.c:1785 +#: 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 #, c-format msgid "missing operand after %s" msgstr "opérande manquant après %s" -#: src/chcon.c:556 src/runcon.c:247 +#: src/chcon.c:562 src/runcon.c:251 #, c-format msgid "invalid context: %s" -msgstr "contexte non valide : %s" +msgstr "contexte incorrect : %s" -#: src/chcon.c:563 +#: src/chcon.c:569 #, c-format msgid "conflicting security context specifiers given" msgstr "paramètres de contexte de sécurité en conflit" -#: src/chcon.c:572 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:433 src/cp.c:493 -#: src/mv.c:96 src/pwd.c:273 src/rm.c:324 src/touch.c:351 +#: 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 #, c-format msgid "failed to get attributes of %s" msgstr "impossible d'obtenir les attributs de %s" @@ -1311,7 +1328,7 @@ msgstr "impossible d'obtenir les attributs de %s" #: src/chgrp.c:92 #, c-format msgid "invalid group: %s" -msgstr "groupe non valide : %s" +msgstr "groupe incorrect : %s" #: src/chgrp.c:108 #, c-format @@ -1323,18 +1340,14 @@ msgstr "" " ou : %s [OPTION]... --reference=RFILE FILE...\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 "" -"Change le contexte de sécurité de chaque FILE en CONTEXT.\n" -"Avec --reference, change le contexte de sécurité de chaque FILE à celui de\n" -"RFILE.\n" +"Modifier le groupe de chaque FILE en GROUP.\n" +"Avec --reference, modifier le groupe de chaque FILE à celui de RFILE.\n" "\n" -" -h, --no-dereference affecte les liens symboliques au lieu des fichiers\n" -" référencés\n" #: src/chgrp.c:118 src/chmod.c:382 src/chown.c:89 msgid "" @@ -1342,33 +1355,26 @@ msgid "" " -f, --silent, --quiet suppress most error messages\n" " -v, --verbose output a diagnostic for every file processed\n" msgstr "" +" -c, --changes comme --verbose, mais seulement en cas de " +"modification\n" +" -f, --silent, --quiet supprimer la plupart des messages d'erreur\n" +" -v, --verbose afficher un diagnostic pour chaque fichier traité\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 "" -" -h, --no-dereference affecte les liens symboliques au lieu des fichiers\n" -" référencés (utile seulement sur les systèmes " -"permettant\n" -" de changer le propriétaire d'un lien symbolique)\n" - -#: src/chgrp.c:132 src/chmod.c:387 src/chown.c:110 -#, fuzzy -msgid "" -" --no-preserve-root do not treat '/' specially (the default)\n" -" --preserve-root fail to operate recursively on '/'\n" -msgstr "" -" --no-preserve-root ne traite pas « / » de manière spéciale (par " -"défaut)\n" -" --preserve-root bloque le traitement récursif sur « / »\n" +" (seulement utile sur les systèmes permettant de\n" +" modifier le propriétaire d'un lien symbolique)\n" #: src/chgrp.c:136 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" #: src/chgrp.c:158 #, c-format @@ -1380,9 +1386,8 @@ msgid "" msgstr "" "\n" "Exemples :\n" -" %s staff /u change le groupe de /u en « staff ».\n" -" %s -hR staff /u change le groupe de /u et des sous-fichiers en " -"« staff ».\n" +" %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 #, c-format @@ -1392,17 +1397,17 @@ msgstr "obtention des nouveaux attributs de %s" #: src/chmod.c:149 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 changé.\n" +msgstr "ni le lien symbolique %s ni la référence n'ont été modifiés.\n" #: src/chmod.c:163 #, 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) à %04lo (%s)\n" +msgstr "le mode de %s a été modifié de %04lo (%s) en %04lo (%s)\n" #: src/chmod.c:166 #, c-format msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n" -msgstr "impossible de changer le mode de %s de %04lo (%s) en %04lo (%s)\n" +msgstr "impossible de modifier le mode de %s de %04lo (%s) en %04lo (%s)\n" #: src/chmod.c:169 #, c-format @@ -1436,35 +1441,33 @@ msgstr "" " ou : %s [OPTION]... --reference=RFILE FILE\n" #: src/chmod.c:377 -#, fuzzy 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 "" -"Change le contexte de sécurité de chaque FILE en CONTEXT.\n" -"Avec --reference, change le contexte de sécurité de chaque FILE à celui de\n" -"RFILE.\n" -"\n" -" -h, --no-dereference affecte les liens symboliques au lieu des fichiers\n" -" référencés\n" +"Modifier le mode de chaque FILE en MODE.\n" +"Avec --reference, modifier le mode de chaque FILE à celui de RFILE.\n" #: src/chmod.c:391 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" #: src/chmod.c:394 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 -#, fuzzy msgid "" "\n" "Each MODE is of the form '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n" msgstr "" "\n" -"Chaque MODE est de la forme « [ugoa]*([-+=]([rwxXst]*|[ugo]))+ ».\n" +"Chaque MODE est de la forme « [ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=]" +"[0-7]+ ».\n" #: src/chmod.c:513 #, c-format @@ -1474,47 +1477,47 @@ msgstr "impossible de combiner les options mode et --reference" #: src/chmod.c:544 #, c-format msgid "invalid mode: %s" -msgstr "mode non valide : %s" +msgstr "mode incorrect : %s" #: src/chown-core.c:158 #, c-format msgid "changed ownership of %s from %s to %s\n" -msgstr "appartenance de %s changée de %s en %s\n" +msgstr "appartenance de %s modifiée de %s en %s\n" #: src/chown-core.c:159 #, c-format msgid "changed group of %s from %s to %s\n" -msgstr "groupe de %s changé de %s en %s\n" +msgstr "groupe de %s modifié de %s en %s\n" #: src/chown-core.c:160 #, c-format msgid "no change to ownership of %s\n" -msgstr "impossible de changer l'appartenance de %s\n" +msgstr "impossible de modifier l'appartenance de %s\n" #: src/chown-core.c:165 #, c-format msgid "failed to change ownership of %s from %s to %s\n" -msgstr "impossible de changer de l'appartenance de %s de %s en %s\n" +msgstr "impossible de modifier de l'appartenance de %s de %s en %s\n" #: src/chown-core.c:166 #, c-format msgid "failed to change group of %s from %s to %s\n" -msgstr "impossible de changer le groupe %s de %s en %s\n" +msgstr "impossible de modifier le groupe %s de %s en %s\n" #: src/chown-core.c:167 src/chown-core.c:173 #, c-format msgid "failed to change ownership of %s\n" -msgstr "impossible de changer l'appartenance de %s\n" +msgstr "impossible de modifier l'appartenance de %s\n" #: src/chown-core.c:171 #, c-format msgid "failed to change ownership of %s to %s\n" -msgstr "impossible de changer de l'appartenance de %s en %s\n" +msgstr "impossible de modifier l'appartenance de %s en %s\n" #: src/chown-core.c:172 #, c-format msgid "failed to change group of %s to %s\n" -msgstr "impossible de changer le groupe %s en %s\n" +msgstr "impossible de modifier le groupe %s en %s\n" #: src/chown-core.c:180 #, c-format @@ -1524,7 +1527,7 @@ msgstr "l'appartenance de %s a été conservée en %s\n" #: src/chown-core.c:181 #, c-format msgid "group of %s retained as %s\n" -msgstr "le groupe d'appartenance de %s qui a été retenu est %s\n" +msgstr "le groupe d'appartenance de %s retenu est %s\n" #: src/chown-core.c:182 #, c-format @@ -1539,7 +1542,7 @@ msgstr "impossible de déréférencer %s" #: src/chown-core.c:467 #, c-format msgid "changing ownership of %s" -msgstr "changement de propriétaire pour %s" +msgstr "modification du propriétaire de %s" #: src/chown-core.c:468 #, c-format @@ -1562,6 +1565,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" +"\n" #: src/chown.c:103 msgid "" @@ -1574,23 +1581,24 @@ msgid "" " is not required for the omitted attribute\n" msgstr "" " --from=CURRENT_OWNER:CURRENT_GROUP\n" -" change le propriétaire et/ou le groupe de chaque\n" -" fichier seulement si le propriétaire et/ou le " -"groupe\n" -" actuel concordent avec ceux spécifiés. S'ils sont " -"omis,\n" -" la concordance n'est pas requise pour l'argument " -"non\n" -" spécifié.\n" +" modifier le propriétaire ou le groupe de chaque " +"fichier\n" +" dont le propriétaire ou le groupe actuel " +"correspondent\n" +" à ceux indiqués. La correspondance n'est nécessaire " +"que\n" +" pour l'argument indiqué si l'autre est omis.\n" #: src/chown.c:114 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" #: src/chown.c:136 -#, fuzzy msgid "" "\n" "Owner is unchanged if missing. Group is unchanged if missing, but changed\n" @@ -1598,10 +1606,10 @@ msgid "" "OWNER and GROUP may be numeric as well as symbolic.\n" msgstr "" "\n" -"Le propriétaire n'est pas modifié si manquant. Le groupe n'est pas modifié " -"si \n" -"manquant, mais changé en groupe de connexion si un « : » suit un symbolique\n" -"OWNER (propriétaire).\n" +"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" #: src/chown.c:142 @@ -1615,25 +1623,25 @@ msgid "" msgstr "" "\n" "Exemples :\n" -" %s root /u change le propriétaire de /u en « root ».\n" -" %s root:staff /u idem mais change aussi son groupe en « staff ».\n" -" %s -hR root /u change le propriétaire de /u et des sous-fichiers en \n" -" « root ».\n" +" %s root /u Modifier le propriétaire de /u en « root ».\n" +" %s root:staff /u Idem mais modifier aussi son groupe en « staff ».\n" +" %s -hR root /u Modifier le propriétaire de /u et ses sous-fichiers\n" +" en « root ».\n" #. This is a proper name. See the gettext manual, section Names. #: src/chroot.c:34 msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:97 src/install.c:575 src/setuidgid.c:110 src/setuidgid.c:120 +#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120 #, c-format msgid "invalid group %s" -msgstr "groupe non valide %s" +msgstr "groupe %s incorrect" #: src/chroot.c:109 #, c-format msgid "invalid group list %s" -msgstr "list de groupes non valide %s" +msgstr "liste de groupes %s incorrecte" #: src/chroot.c:117 #, c-format @@ -1654,7 +1662,7 @@ msgid "" "Run COMMAND with root directory set to NEWROOT.\n" "\n" msgstr "" -"Exécute COMMAND avec le répertoire root initialisé à NEWROOT.\n" +"Exécuter COMMAND avec le répertoire racine initialisé à NEWROOT.\n" "\n" #: src/chroot.c:142 @@ -1662,25 +1670,24 @@ 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 indique l'utilisateur et le groupe (ID ou nom) à\n" -" utiliser\n" -" --groups=G_LIST indique les groupes supplémentaires tels que\n" -" g1,g2,..,gN\n" +" --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,..," +"gN\n" #: src/chroot.c:149 -#, fuzzy msgid "" "\n" "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n" msgstr "" "\n" -"Si aucune commande n'est fournie, exécute « ${SHELL} -i » (par défaut /bin/" -"sh).\n" +"Sans commande fournie, exécuter « ${SHELL} -i » (« /bin/sh -i » par " +"défaut).\n" #: src/chroot.c:202 #, c-format msgid "cannot change root directory to %s" -msgstr "impossible de changer le répertoire racine vers %s" +msgstr "impossible de modifier le répertoire racine en %s" #: src/chroot.c:206 #, c-format @@ -1690,15 +1697,15 @@ msgstr "impossible d'aller dans le répertoire racine" #: src/chroot.c:247 #, c-format msgid "failed to set group-ID" -msgstr "impossible de définir l'ID de groupe" +msgstr "impossible de définir l'identifiant de groupe" #: src/chroot.c:253 #, c-format msgid "failed to set user-ID" -msgstr "impossible de définir l'ID de l'utilisateur" +msgstr "impossible de définir l'identifiant de l'utilisateur" -#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:213 src/stdbuf.c:366 -#: src/timeout.c:402 +#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365 +#: src/timeout.c:454 #, c-format msgid "failed to run command %s" msgstr "impossible d'exécuter la commande %s" @@ -1711,7 +1718,7 @@ msgstr "Q. Frank Xia" #: src/cksum.c:216 #, c-format msgid "%s: file too long" -msgstr "%s : fichier trop long" +msgstr "%s : fichier trop grand" #: src/cksum.c:263 #, c-format @@ -1727,7 +1734,7 @@ msgid "" "Print CRC checksum and byte counts of each FILE.\n" "\n" msgstr "" -"Affiche 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 FILE.\n" "\n" #: src/comm.c:103 src/join.c:187 @@ -1737,7 +1744,7 @@ msgstr "Utilisation : %s [OPTION]... FILE1 FILE2\n" #: src/comm.c:107 msgid "Compare sorted files FILE1 and FILE2 line by line.\n" -msgstr "Compare les fichiers triés FILE1 et FILE2 ligne à ligne.\n" +msgstr "Comparer les fichiers triés FILE1 et FILE2 ligne à ligne.\n" #: src/comm.c:110 msgid "" @@ -1747,10 +1754,10 @@ msgid "" "and column three contains lines common to both files.\n" msgstr "" "\n" -"Sans option, l'affichage s'effectue sur 3 colonnes. La première colonne \n" -"contient les lignes uniques de FILE1, la seconde contient les lignes uniques " -"de\n" -"FILE2, et la troisième contient les lignes communes aux deux fichiers.\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 " +"uniques\n" +"de FILE2 et la troisième contient les lignes communes aux deux fichiers.\n" #: src/comm.c:116 msgid "" @@ -1760,10 +1767,10 @@ msgid "" " -3 suppress column 3 (lines that appear in both files)\n" msgstr "" "\n" -" -1 supprime la colonne 1 (lignes uniques de FILE1)\n" -" -2 supprime la colonne 2 (lignes uniques de FILE2)\n" -" -3 supprime la colonne 3 (lignes présentes dans les 2 " -"fichiers)\n" +" -1 supprimer la colonne 1 (lignes uniques de FILE1)\n" +" -2 supprimer la colonne 2 (lignes uniques de FILE2)\n" +" -3 supprimer la colonne 3 (lignes présentes dans les " +"2 fichiers)\n" #: src/comm.c:122 msgid "" @@ -1773,22 +1780,22 @@ msgid "" " --nocheck-order do not check that the input is correctly sorted\n" msgstr "" "\n" -" --check-order vérifie 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 vérifie pas que l'entrée est correctement triée\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" #: src/comm.c:128 msgid " --output-delimiter=STR separate columns with STR\n" -msgstr " --output-delimiter=STR sépare les colonnes avec STR\n" +msgstr " --output-delimiter=STR séparer les colonnes avec STR\n" #: src/comm.c:133 -#, fuzzy msgid "" "\n" "Note, comparisons honor the rules specified by 'LC_COLLATE'.\n" msgstr "" "\n" -"Note, les comparaisons honorent les règles définies par « LC_COLLATE ».\n" +"Remarque, les comparaisons respectent les règles définies par " +"« LC_COLLATE ».\n" #: src/comm.c:137 #, c-format @@ -1800,41 +1807,45 @@ msgid "" msgstr "" "\n" "Exemples :\n" -" %s -12 file1 file2 affiche seulement les lignes présentes à la fois dans\n" -" file1 and file2.\n" -" %s -3 file1 file2 affiche les lignes dans file1 qui ne sont pas dans " +" %s -12 file1 file2 N'afficher que les lignes présentes dans file1 et " +"file2.\n" +" %s -3 file1 file2 Afficher les lignes de file1 qui ne sont pas dans " "file2,\n" -" et vice versa.\n" +" et vice versa.\n" #: src/comm.c:222 #, c-format msgid "file %d is not in sorted order" -msgstr "fichier %d n'est pas dans l'ordre attendu" +msgstr "le fichier %d n'est pas dans l'ordre attendu" #: src/comm.c:407 #, c-format msgid "multiple delimiters specified" -msgstr "multiples délimiteurs spécifiés" +msgstr "plusieurs délimiteurs indiqués" #: src/comm.c:411 #, c-format msgid "empty %s not allowed" msgstr "%s vide n'est pas autorisé" -#: src/copy.c:168 src/dd.c:1609 src/dd.c:1976 +#: 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 #, c-format -msgid "reading %s" -msgstr "lecture de %s" +msgid "error reading %s" +msgstr "erreur de lecture %s" -#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:426 +#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425 #, c-format msgid "cannot lseek %s" -msgstr "ne peut lseek() %s" +msgstr "impossible de se positionner (lseek) dans %s" -#: src/copy.c:206 src/dd.c:2039 src/dd.c:2102 +#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151 #, c-format -msgid "writing %s" -msgstr "écriture de %s" +msgid "error writing %s" +msgstr "erreur d'écriture de %s" #: src/copy.c:313 #, c-format @@ -1856,7 +1867,7 @@ msgstr "impossible d'étendre %s" msgid "clearing permissions for %s" msgstr "réinitialisation des permissions de %s" -#: src/copy.c:697 src/copy.c:2470 src/cp.c:331 +#: src/copy.c:697 src/copy.c:2480 src/cp.c:329 #, c-format msgid "failed to preserve ownership for %s" msgstr "impossible de préserver l'appartenance pour %s" @@ -1871,22 +1882,22 @@ msgstr "impossible de repérer le fichier %s" msgid "failed to preserve authorship for %s" msgstr "impossible de préserver l'auteur pour %s" -#: src/copy.c:804 src/csplit.c:638 src/du.c:901 src/fmt.c:449 src/head.c:847 -#: src/sort.c:4489 src/split.c:1329 src/tail.c:1756 src/wc.c:678 +#: 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 "impossible d'ouvrir %s en lecture" -#: src/copy.c:810 src/copy.c:972 src/dd.c:1546 src/dd.c:2114 src/dd.c:2252 -#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:141 +#: 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 #, c-format msgid "cannot fstat %s" -msgstr "imposssible d'évaluer %s par fstat()" +msgstr "impossible d'obtenir l'état du fichier (fstat) %s" #: src/copy.c:820 #, c-format msgid "skipping file %s, as it was replaced while being copied" -msgstr "ignore le fichier %s car il a été remplacé durant la copie" +msgstr "le fichier %s est ignoré car il a été remplacé durant la copie" #: src/copy.c:850 #, c-format @@ -1898,14 +1909,14 @@ msgstr "impossible d'obtenir le contexte de création du système de fichiers" 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:1574 src/copy.c:1777 src/copy.c:1935 src/ln.c:314 -#: src/remove.c:267 src/remove.c:293 src/remove.c:444 src/remove.c:465 +#: 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 #, c-format msgid "cannot remove %s" msgstr "impossible de supprimer %s" -#: src/copy.c:886 src/copy.c:1578 src/copy.c:1772 src/copy.c:1940 -#: src/remove.c:418 +#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945 +#: src/remove.c:375 #, c-format msgid "removed %s\n" msgstr "%s supprimé\n" @@ -1913,7 +1924,7 @@ msgstr "%s supprimé\n" #: src/copy.c:926 #, c-format msgid "not writing through dangling symlink %s" -msgstr "n'écrit pas à travers le lien symbolique ballant %s" +msgstr "pas d'écriture à travers le lien symbolique ballant %s" #: src/copy.c:964 #, c-format @@ -1925,192 +1936,192 @@ msgstr "impossible de créer le fichier standard %s" msgid "failed to clone %s from %s" msgstr "impossible de cloner %s depuis %s" -#: src/copy.c:1098 src/copy.c:2531 +#: src/copy.c:1098 src/copy.c:2541 #, c-format msgid "preserving times for %s" msgstr "préservation des dates pour %s" -#: src/copy.c:1170 src/copy.c:1176 src/head.c:855 src/touch.c:175 -#: src/truncate.c:413 +#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172 +#: src/truncate.c:417 #, c-format -msgid "closing %s" -msgstr "fermeture de %s" +msgid "failed to close %s" +msgstr "impossible de fermer %s" -#: src/copy.c:1466 +#: src/copy.c:1471 #, c-format msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? " -msgstr "%s : voulez-vous écraser %s en outrepassant le mode %04lo (%s) ? " +msgstr "%s : voulez-vous écraser %s en outrepassant le mode %04lo (%s) ? " -#: src/copy.c:1473 +#: src/copy.c:1478 #, c-format msgid "%s: overwrite %s? " msgstr "%s : voulez-vous écraser %s ? " -#: src/copy.c:1542 +#: src/copy.c:1547 #, c-format msgid " (backup: %s)" -msgstr " (archive %s)" +msgstr " (archive : %s)" -#: src/copy.c:1552 +#: src/copy.c:1557 #, 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:1584 +#: src/copy.c:1589 #, c-format msgid "cannot create hard link %s to %s" msgstr "impossible de créer le lien direct %s vers %s" -#: src/copy.c:1637 src/copy.c:1689 src/copy.c:2272 src/copy.c:2589 +#: 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:1220 src/truncate.c:365 +#: src/stat.c:1239 src/truncate.c:363 #, c-format msgid "cannot stat %s" msgstr "impossible d'évaluer %s" -#: src/copy.c:1645 +#: src/copy.c:1650 #, c-format msgid "omitting directory %s" msgstr "omission du répertoire %s" -#: src/copy.c:1659 +#: src/copy.c:1664 #, c-format msgid "warning: source file %s specified more than once" msgstr "avertissement : le fichier source %s est mentionné plusieurs fois" -#: src/copy.c:1707 src/ln.c:246 +#: src/copy.c:1712 src/ln.c:246 #, c-format msgid "%s and %s are the same file" msgstr "%s et %s identifient le même fichier" -#: src/copy.c:1806 +#: src/copy.c:1811 #, 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" +msgstr "impossible d'écraser le non répertoire %s par le répertoire %s" -#: src/copy.c:1824 src/ln.c:214 +#: src/copy.c:1829 src/ln.c:214 #, 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:1842 +#: src/copy.c:1847 #, c-format msgid "cannot overwrite directory %s with non-directory" -msgstr "impossible d'écraser le répertoire %s par un non-répertoire" +msgstr "impossible d'écraser le répertoire %s par un non répertoire" -#: src/copy.c:1856 +#: src/copy.c:1861 #, 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" +msgstr "impossible de déplacer le répertoire dans un non répertoire : %s → %s" -#: src/copy.c:1886 +#: src/copy.c:1891 #, c-format msgid "backing up %s would destroy source; %s not moved" -msgstr "l'archivage de %s pourrait détruire la source ; %s n'a pas été déplacé" +msgstr "l'archivage de %s détruirait la source ; %s non déplacé" -#: src/copy.c:1887 +#: src/copy.c:1892 #, c-format msgid "backing up %s would destroy source; %s not copied" -msgstr "l'archivage de %s pourrait détruire la source ; %s n'a pas été copié" +msgstr "l'archivage de %s détruirait la source ; %s non copié" -#: src/copy.c:1910 src/ln.c:276 +#: src/copy.c:1915 src/ln.c:276 #, c-format msgid "cannot backup %s" msgstr "impossible d'archiver %s" -#: src/copy.c:1974 +#: src/copy.c:1979 #, c-format msgid "will not copy %s through just-created symlink %s" msgstr "" -"ne copiera pas %s depuis le lien symbolique qui vient juste d'être créé %s" +"ne copiera pas %s depuis le lien symbolique %s qui vient juste d'être créé" -#: src/copy.c:2051 +#: src/copy.c:2056 #, 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:2068 +#: src/copy.c:2073 #, 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:2118 +#: src/copy.c:2123 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" -msgstr "ne peut déplacer %s vers un sous-répertoire de lui-même %s" +msgstr "impossible de déplacer %s vers un sous-répertoire de lui-même, %s" -#: src/copy.c:2161 +#: src/copy.c:2166 #, c-format msgid "cannot move %s to %s" msgstr "impossible de déplacer %s vers %s" -#: src/copy.c:2173 +#: src/copy.c:2178 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" -"échec de déplacement inter-périphérique de %s vers %s ; impossible de " +"échec de déplacement interpériphérique de %s vers %s ; impossible de " "supprimer la cible" -#: src/copy.c:2207 src/install.c:905 src/mkdir.c:189 src/mkfifo.c:114 -#: src/mknod.c:167 +#: 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:2241 +#: src/copy.c:2246 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "impossible de copier liens symboliques cycliques %s" -#: src/copy.c:2350 +#: src/copy.c:2355 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "" -"%s : peut uniquement créer des liens symboliques relatifs dans le répertoire " +"%s : ne peut créer des liens symboliques relatifs que dans le répertoire " "actuel" -#: src/copy.c:2357 +#: src/copy.c:2362 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "impossible de créer le lien symbolique %s vers %s" -#: src/copy.c:2406 src/mkfifo.c:133 +#: src/copy.c:2416 src/mkfifo.c:132 #, c-format msgid "cannot create fifo %s" msgstr "impossible de créer la FIFO %s" -#: src/copy.c:2415 +#: src/copy.c:2425 #, c-format msgid "cannot create special file %s" msgstr "impossible de créer le fichier spécial %s" -#: src/copy.c:2426 src/ls.c:3191 src/stat.c:902 +#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921 #, c-format msgid "cannot read symbolic link %s" msgstr "impossible de lire le lien symbolique %s" -#: src/copy.c:2453 +#: src/copy.c:2463 #, c-format msgid "cannot create symbolic link %s" msgstr "impossible de créer le lien symbolique %s" -#: src/copy.c:2485 +#: src/copy.c:2495 #, c-format msgid "%s has unknown file type" -msgstr "%s possède un type de fichier inconnu." +msgstr "%s possède un type de fichier inconnu" -#: src/copy.c:2629 src/ln.c:358 +#: src/copy.c:2644 src/ln.c:358 #, c-format msgid "cannot un-backup %s" msgstr "impossible de désarchiver %s" -#: src/copy.c:2633 +#: src/copy.c:2648 #, c-format msgid "%s -> %s (unbackup)\n" -msgstr "%s -> %s (désarchivage)\n" +msgstr "%s → %s (désarchivage)\n" -#: src/cp.c:156 src/mv.c:284 +#: src/cp.c:156 src/mv.c:286 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -2119,30 +2130,13 @@ msgid "" msgstr "" "Utilisation : %s [OPTION]... [-T] SOURCE DEST\n" " ou : %s [OPTION]... SOURCE... DIRECTORY\n" -" ou : %s [OPTION]... --target-directory=DIRECTORY SOURCE...\n" +" ou : %s [OPTION]... -t DIRECTORY SOURCE...\n" #: src/cp.c:162 -msgid "" -"Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" -"\n" -msgstr "" -"Copie la SOURCE vers DEST, ou de multiples SOURCES vers DIRECTORY.\n" -"\n" - -#: src/cp.c:166 src/csplit.c:1458 src/cut.c:197 src/df.c:852 src/du.c:268 -#: src/expand.c:112 src/fmt.c:275 src/fold.c:75 src/head.c:115 -#: src/install.c:612 src/kill.c:86 src/ln.c:392 src/ls.c:4726 src/mkdir.c:61 -#: src/mkfifo.c:56 src/mknod.c:58 src/mv.c:294 src/nl.c:191 src/paste.c:445 -#: src/pr.c:2777 src/ptx.c:1825 src/shred.c:153 src/shuf.c:58 src/sort.c:399 -#: src/split.c:211 src/stdbuf.c:95 src/tac.c:142 src/tail.c:268 -#: src/touch.c:226 src/truncate.c:107 src/unexpand.c:122 src/uniq.c:145 -msgid "" -"Mandatory arguments to long options are mandatory for short options too.\n" -msgstr "" -"Les arguments obligatoires pour les options longues le sont aussi pour les\n" -"options courtes.\n" +msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" +msgstr "Copier la SOURCE vers DEST, ou plusieurs SOURCEs vers DIRECTORY.\n" -#: src/cp.c:169 +#: src/cp.c:168 msgid "" " -a, --archive same as -dR --preserve=all\n" " --attributes-only don't copy the file data, just the " @@ -2156,23 +2150,24 @@ msgid "" " -d same as --no-dereference --preserve=links\n" msgstr "" " -a, --archive identique à -dR --preserve=all\n" -" --attributes-only ne copie pas les données du fichier, " +" --attributes-only ne pas copier les données du fichier, " "seulement\n" -" les attributs\n" -" --backup[=CONTROL] archive chaque fichier de destination\n" +" les attributs\n" +" --backup[=CONTROL] archiver chaque fichier de destination\n" " -b comme --backup mais n'accepte pas d'argument\n" -" --copy-contents copie le contenu des fichiers spéciaux en " +" --copy-contents copier le contenu des fichiers spéciaux en " "mode\n" -" récursif\n" +" récursif\n" " -d identique à --no-dereference --" "preserve=links\n" -#: src/cp.c:178 +#: src/cp.c:177 msgid "" " -f, --force if an existing destination file cannot be\n" -" opened, remove it and try again (redundant " -"if\n" -" the -n option is used)\n" +" opened, remove it and try again (this " +"option\n" +" is ignored when the -n option is also " +"used)\n" " -i, --interactive prompt before overwrite (overrides a previous " "-n\n" " option)\n" @@ -2180,38 +2175,40 @@ msgid "" msgstr "" " -f, --force si un fichier de destination existe et ne " "peut\n" -" être ouvert alors le supprime et essaie à\n" -" nouveau (redondant si l'option -n est " -"utilisée)\n" -" -i, --interactive demande confirmation avant d'écraser " +" être ouvert alors le supprimer et " +"réessayer\n" +" (cette option est ignorée si l'option -n " +"est\n" +" aussi utilisée)\n" +" -i, --interactive demander confirmation avant d'écraser " "(surcharge\n" -" une précédente option -n)\n" -" -H suit les liens symboliques de ligne de " +" une précédente option -n)\n" +" -H suivre les liens symboliques de ligne de " "commande\n" -" dans SOURCE\n" +" dans SOURCE\n" -#: src/cp.c:188 +#: src/cp.c:186 msgid "" " -l, --link hard link files instead of copying\n" " -L, --dereference always follow symbolic links in SOURCE\n" msgstr "" -" -l, --link lie les fichiers au lieu de les copier\n" +" -l, --link lier les fichiers au lieu de les copier\n" " -L, --dereference toujours suivre les liens symboliques de " "SOURCE\n" -#: src/cp.c:192 +#: src/cp.c:190 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 n'écrase pas un ficier existant (surchage " +" -n, --no-clobber ne pas écraser de fichier existant (surchage " "une\n" -" précédente option -i)\n" -" -P, --no-deference ne jamais suivre les liens symboliques dans \n" -" SOURCE\n" +" précédente option -i)\n" +" -P, --no-deference ne jamais suivre les liens symboliques de " +"SOURCE\n" -#: src/cp.c:197 +#: src/cp.c:195 msgid "" " -p same as --preserve=mode,ownership,timestamps\n" " --preserve[=ATTR_LIST] preserve the specified attributes (default:\n" @@ -2222,23 +2219,23 @@ msgid "" msgstr "" " -p identique à --preserve=mode,ownership," "timestamps\n" -" --preserve[=ATTR_LIST] préserve les attributs spécifiés (par défaut\n" -" « mode,ownership,timestamps ») et si " -"posssible\n" -" les attributs additionels « context, links, \n" -" xattr, all »\n" +" --preserve[=ATTR_LIST] 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:205 +#: src/cp.c:203 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 préserve pas les attributs spécifiques\n" -" --parents utilise le nom de fichier source complet " -"sous\n" -" DIRECTORY\n" +" --no-preserve=ATTR_LIST ne pas préserver les attributs spécifiques\n" +" --parents utiliser le nom de fichier source complet " +"dans\n" +" DIRECTORY\n" -#: src/cp.c:209 +#: src/cp.c:207 msgid "" " -R, -r, --recursive copy directories recursively\n" " --reflink[=WHEN] control clone/CoW copies. See below\n" @@ -2246,29 +2243,27 @@ msgid "" " attempting to open it (contrast with --" "force)\n" msgstr "" -" -R, -r, --recursive copie récursivement les répertoires\n" -" --reflink[=WHEN] contrôle les copies clones/COW (Copy On " -"Write).\n" -" Voir ci-dessous.\n" -" --remove-destination supprime chaque fichier de destination " +" -R, -r, --recursive copier récursivement les répertoires\n" +" --reflink[=WHEN] contrôler les copies clones/COW (Copy On " +"Write)\n" +" --remove-destination supprimer chaque fichier de destination " "existant\n" -" avant de tenter de l'ouvrir (par opposition " -"avec\n" -" --force)\n" +" avant d'essayer de l'ouvrir (par opposition " +"à\n" +" --force)\n" -#: src/cp.c:215 +#: src/cp.c:213 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ôle la création des fichiers dispersés.\n" -" Voir ci-dessous.\n" -" --strip-trailing-slashes enlève les « / » de terminaison de chaque\n" -" argument SOURCE\n" +" --sparse=WHEN 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:220 +#: src/cp.c:218 msgid "" " -s, --symbolic-link make symbolic links instead of copying\n" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -2276,13 +2271,14 @@ msgid "" "DIRECTORY\n" " -T, --no-target-directory treat DEST as a normal file\n" msgstr "" -" -s, --symbolic-link crée des liens symboliques au lieu d'une copie\n" -" -S, --suffix=SUFFIX écrase le suffixe usuel d'archivage\n" -" --target-directory=DIRECTORY copie tous les arguments SOURCE dans \n" -" RÉPERTOIRE\n" -" -T, --no-target-directory traite DEST comme un fichier normal\n" +" -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" +" -T, --no-target-directory traiter DEST comme un fichier normal\n" -#: src/cp.c:226 +#: src/cp.c:224 msgid "" " -u, --update copy only when the SOURCE file is newer\n" " than the destination file or when the\n" @@ -2290,15 +2286,15 @@ msgid "" " -v, --verbose explain what is being done\n" " -x, --one-file-system stay on this file system\n" msgstr "" -" -u, --update copie seulement quand le fichier SOURCE est " +" -u, --update ne copier que quand le fichier SOURCE est " "plus\n" -" récent que le fichier de destination ou quand " -"le\n" -" fichier de destination est manquant\n" -" -v, --verbose explique ce qui est fait\n" -" -x, --one-file-system reste sur ce système de fichiers\n" +" récent que le fichier de destination ou " +"quand\n" +" le fichier de destination est manquant\n" +" -v, --verbose expliquer ce qui est fait\n" +" -x, --one-file-system rester sur ce système de fichiers\n" -#: src/cp.c:235 +#: src/cp.c:233 msgid "" "\n" "By default, sparse SOURCE files are detected by a crude heuristic and the\n" @@ -2314,16 +2310,23 @@ msgid "" "fails, or if --reflink=auto is specified, fall back to a standard copy.\n" msgstr "" "\n" -"Par défaut, les fichiers SOURCE dispersés sont détectés par le biais\n" -"d'une heuristique grossière et le fichier DEST correspondant est aussi\n" -"construit de façon dispersée. Il s'agit du comportement sélectionné par \n" -"l'option --sparse=auto. Spécifiez --sparse=always pour créer un fichier\n" -"DEST dispersé lorsque le fichier SOURCE contient une assez longue séquence\n" -"d'octets de valeur zéro.\n" +"Par défaut, les fichiers SOURCE dispersés sont détectés par à l'aide d'une\n" +"heuristique grossière et le fichier DEST correspondant est aussi construit " +"de\n" +"façon dispersée. C'est le comportement sélectionné par --sparse=auto. " +"Indiquez\n" +"--sparse=always pour créer un fichier DEST dispersé lorsque le fichier " +"SOURCE\n" +"contient une assez longue séquence d'octets nuls.\n" "Utilisez --sparse=never pour inhiber la création de fichiers dispersés.\n" +"\n" +"Si --reflink[=always] est indiquée, réaliser une copie légère, où les blocs " +"de\n" +"données ne sont copiés que si modifiés. Si c'est impossible, la copie " +"échoue,\n" +"ou, si --reflink=auto est indiqué, elle se rabat sur une copie classique.\n" -#: src/cp.c:247 src/install.c:649 src/ln.c:421 src/mv.c:321 -#, fuzzy +#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322 msgid "" "\n" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -2338,23 +2341,23 @@ msgstr "" "SIMPLE_BACKUP_SUFFIX. La méthode du contrôle de version peut être " "sélectionnée\n" "par l'option --backup ou par la variable d'environnement VERSION_CONTROL.\n" -"Les valeurs sont les suivantes :\n" +"Les valeurs possibles sont les suivantes :\n" "\n" -#: src/cp.c:254 src/install.c:656 src/mv.c:328 +#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329 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 n'archive jamais (même si --backup est utilisé)\n" -" numbered, t effectue des archives numérotées\n" -" existing, nil numérote si des archives numérotées existent déjà, se\n" -" comporte comme « simple » dans le cas contraire \n" -" simple, never effectue toujours des archives simples\n" +" none, off ne jamais archiver (même si --backup est utilisée)\n" +" numbered, t effectuer des archives numérotées\n" +" existing, nil numéroter si des archives numérotées existent déjà, se\n" +" comporter comme « simple » dans le cas contraire\n" +" simple, never effectuer toujours des archives simples\n" -#: src/cp.c:260 +#: src/cp.c:258 msgid "" "\n" "As a special case, cp makes a backup of SOURCE when the force and backup\n" @@ -2362,99 +2365,100 @@ msgid "" "regular file.\n" msgstr "" "\n" -"Un cas spécial où « cp » archive SOURCE lorsque les options « force » et\n" -"« backup » sont utilisées et que SOURCE et DEST portent le même nom qu'un\n" -"fichier standard existant.\n" +"cp réalise une archive de SOURCE dans le cas particulier où les options\n" +"« 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:319 +#: src/cp.c:317 #, c-format msgid "failed to preserve times for %s" msgstr "échec de préservation des dates pour %s" -#: src/cp.c:350 +#: src/cp.c:348 #, c-format msgid "failed to preserve permissions for %s" msgstr "échec de préservation des permissions de %s" -#: src/cp.c:477 +#: src/cp.c:475 #, c-format msgid "cannot make directory %s" -msgstr "ne peut créer le répertoire %s" +msgstr "impossible de créer le répertoire %s" -#: src/cp.c:526 src/cp.c:545 +#: src/cp.c:524 src/cp.c:543 #, c-format msgid "%s exists but is not a directory" msgstr "%s existe mais n'est pas un répertoire" -#: src/cp.c:572 src/cp.c:1068 src/install.c:401 src/install.c:844 src/ln.c:123 -#: src/ln.c:181 src/ln.c:202 src/ln.c:516 src/mv.c:152 src/mv.c:399 +#: 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 #, c-format -msgid "accessing %s" -msgstr "accès à %s" +msgid "failed to access %s" +msgstr "impossible d'accéder à %s" -#: src/cp.c:592 src/install.c:914 src/ln.c:546 src/mv.c:432 src/shred.c:1182 -#: src/touch.c:433 src/truncate.c:356 +#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181 +#: src/touch.c:429 src/truncate.c:354 #, c-format msgid "missing file operand" -msgstr "opérande fichier manquant" +msgstr "opérande de fichier manquant" -#: src/cp.c:594 src/install.c:916 src/ln.c:560 src/mv.c:434 +#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436 #, c-format msgid "missing destination file operand after %s" -msgstr "opérande du fichier cible manquant après %s" +msgstr "opérande de fichier cible manquant après %s" -#: src/cp.c:603 src/install.c:925 src/mv.c:443 +#: src/cp.c:601 src/install.c:926 src/mv.c:445 #, c-format msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)" msgstr "" -"ne peut pas combiner --target-directory (-t) et --no-target-directory (-T)" +"impossible de combiner --target-directory (-t) et --no-target-directory (-T)" -#: src/cp.c:619 src/cp.c:1070 src/install.c:403 src/install.c:846 -#: src/install.c:938 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:401 -#: src/mv.c:457 +#: 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 #, c-format msgid "target %s is not a directory" msgstr "la cible %s n'est pas un répertoire" -#: src/cp.c:730 +#: src/cp.c:728 #, c-format msgid "with --parents, the destination must be a directory" msgstr "avec --parents, la destination doit être un répertoire" -#: src/cp.c:1063 src/install.c:839 src/ln.c:511 src/mv.c:394 +#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395 #, c-format msgid "multiple target directories specified" -msgstr "multiples répertoires cibles spécifiés" +msgstr "plusieurs répertoires cibles indiqués" -#: src/cp.c:1108 +#: src/cp.c:1110 #, c-format msgid "cannot make both hard and symbolic links" -msgstr "ne peut pas créer à la fois un lien symbolique et direct" +msgstr "impossible de créer un lien à la fois symbolique et direct" -#: src/cp.c:1115 src/mv.c:464 +#: src/cp.c:1117 src/mv.c:466 #, c-format msgid "options --backup and --no-clobber are mutually exclusive" msgstr "les options --backup et --no-clobber sont mutuellement exclusives" -#: src/cp.c:1121 +#: src/cp.c:1123 #, c-format msgid "--reflink can be used only with --sparse=auto" -msgstr "--reflink peut seulement être utilisé avec --sparse=auto" +msgstr "--reflink ne peut être utilisé qu'avec --sparse=auto" -#: src/cp.c:1129 src/install.c:899 src/ln.c:582 src/mv.c:472 +#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474 msgid "backup type" msgstr "type d'archive" -#: src/cp.c:1154 +#: src/cp.c:1156 #, c-format msgid "cannot preserve security context without an SELinux-enabled kernel" -msgstr "ne peut préserver le contexte de sécurité en dehors d'un noyau SELinux" +msgstr "" +"impossible de préserver le contexte de sécurité en dehors d'un noyau SELinux" -#: src/cp.c:1160 +#: src/cp.c:1162 #, c-format msgid "cannot preserve extended attributes, cp is built without xattr support" msgstr "" -"ne peut pas préserver les attributs étendus, cp est compilé sans la prise en " +"impossible de préserver les attributs étendus, cp est compilé sans prise en " "charge xattr" #. This is a proper name. See the gettext manual, section Names. @@ -2462,173 +2466,172 @@ msgstr "" msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:529 +#: src/csplit.c:531 #, c-format msgid "input disappeared" -msgstr "l'entrée a disparue" +msgstr "l'entrée a disparu" -#: src/csplit.c:658 src/csplit.c:669 +#: src/csplit.c:660 src/csplit.c:671 #, c-format msgid "%s: line number out of range" msgstr "%s : numéro de ligne hors limite" -#: src/csplit.c:698 +#: src/csplit.c:700 #, c-format msgid "%s: %s: line number out of range" -msgstr "%s : %s le numéro de ligne hors limite" +msgstr "%s : %s : numéro de ligne hors limite" -#: src/csplit.c:701 src/csplit.c:750 +#: src/csplit.c:703 src/csplit.c:752 #, c-format msgid " on repetition %s\n" msgstr " par répétition %s\n" -#: src/csplit.c:744 +#: src/csplit.c:746 #, c-format msgid "%s: %s: match not found" -msgstr "%s : %s: pas de correspondance" +msgstr "%s : %s : pas de correspondance" -#: src/csplit.c:808 src/csplit.c:848 src/nl.c:359 src/tac.c:274 +#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273 #, c-format msgid "error in regular expression search" -msgstr "erreur dans la recherche de l'expression régulière" +msgstr "erreur dans la recherche de l'expression rationnelle" -#: src/csplit.c:981 +#: src/csplit.c:983 #, c-format msgid "write error for %s" msgstr "erreur d'écriture pour %s" -#: src/csplit.c:1057 +#: src/csplit.c:1059 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s : entier attendu après le délimiteur" -#: src/csplit.c:1073 -#, fuzzy, c-format +#: src/csplit.c:1075 +#, c-format msgid "%s: '}' is required in repeat count" -msgstr "%s : « } » est requis pour un compteur de répétition" +msgstr "%s : « } » est nécessaire pour un compteur de répétition" -#: src/csplit.c:1083 -#, fuzzy, c-format +#: src/csplit.c:1085 +#, c-format msgid "%s}: integer required between '{' and '}'" -msgstr "%s} : entier requis entre « { » et « } »" +msgstr "%s} : entier nécessaire entre « { » et « } »" -#: src/csplit.c:1110 -#, fuzzy, c-format +#: src/csplit.c:1112 +#, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s : délimiteur de fermeture « %c » manquant" -#: src/csplit.c:1127 +#: src/csplit.c:1129 #, c-format msgid "%s: invalid regular expression: %s" -msgstr "%s : expression régulière non valide, %s" +msgstr "%s : expression rationnelle incorrecte : %s" -#: src/csplit.c:1160 +#: src/csplit.c:1162 #, c-format msgid "%s: invalid pattern" -msgstr "%s : motif non valide" +msgstr "%s : motif incorrect" -#: src/csplit.c:1163 +#: src/csplit.c:1165 #, 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:1169 +#: src/csplit.c:1171 #, 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 précédent de ligne %s" +"le numéro de ligne %s est plus petit que le numéro de ligne précédent, %s" -#: src/csplit.c:1175 +#: src/csplit.c:1177 #, 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 précédent 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:1253 +#: src/csplit.c:1255 #, c-format msgid "missing conversion specifier in suffix" msgstr "symbole de conversion manquant dans le suffixe" -#: src/csplit.c:1259 +#: src/csplit.c:1261 #, c-format msgid "invalid conversion specifier in suffix: %c" -msgstr "le symbole de conversion %c est non valide dans le suffixe" +msgstr "le symbole de conversion %c est incorrect dans le suffixe" -#: src/csplit.c:1262 +#: src/csplit.c:1264 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" -msgstr "le symbole de conversion \\%.3o est non valide dans le suffixe" +msgstr "le symbole de conversion \\%.3o est incorrect dans le suffixe" -#: src/csplit.c:1267 +#: src/csplit.c:1269 #, c-format msgid "invalid flags in conversion specification: %%%c%c" -msgstr "drapeaux de spécification de conversion non valide : %%%c%c" +msgstr "attributs de spécification de conversion incorrects : %%%c%c" -#: src/csplit.c:1284 +#: src/csplit.c:1286 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "trop de spécifications de conversion %% dans le suffixe" -#: src/csplit.c:1298 +#: src/csplit.c:1300 #, c-format msgid "missing %% conversion specification in suffix" -msgstr "la spéfication de conversion %% est manquante dans le suffixe" +msgstr "la spécification de conversion %% est manquante dans le suffixe" -#: src/csplit.c:1345 +#: src/csplit.c:1347 #, c-format msgid "%s: invalid number" -msgstr "%s : nombre non valide" +msgstr "%s : nombre incorrect" -#: src/csplit.c:1449 +#: src/csplit.c:1451 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Utilisation : %s [OPTION]... FILE PATTERN...\n" -#: src/csplit.c:1453 -#, fuzzy +#: src/csplit.c:1455 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" -"\n" msgstr "" -"Extraire des séquences de FILE séparées par PATTERN(s) vers les fichiers\n" -"« xx01 », « xx02 », etc, ainsi que le taille en octets de chaque séquence " -"sur\n" +"Extraire des morceaux de FILE séparés par un ou des PATTERNs 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:1461 -#, fuzzy, c-format +#: src/csplit.c:1462 +#, 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 utilise le FORMAT sprintf au lieu de %02d\n" -" -f, --prefix=PREFIX utilise PREFIX au lieu de `xx'\n" -" -k, --keep-files ne supprime pas les fichiers de sortie en cas\n" -" d'erreurs\n" +" -b, --suffix-format=FORMAT utiliser le FORMAT sprintf au lieu de %02d\n" +" -f, --prefix=PREFIX utiliser PREFIX au lieu de « xx »\n" +" -k, --keep-files ne pas supprimer les fichiers de sortie en cas\n" +" d'erreurs\n" -#: src/csplit.c:1466 +#: src/csplit.c:1467 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 utilise DIGITS chiffres au lieu de 2\n" -" -s, --quiet, --silent n'affiche pas la taille des fichiers de sortie\n" -" -z, --elide-empty-files supprime les fichiers de sortie vides\n" +" -n, --digits=DIGITS utiliser DIGITS 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:1473 +#: src/csplit.c:1474 msgid "" "\n" "Read standard input if FILE is -. Each PATTERN may be:\n" msgstr "" "\n" -"Lit de l'entrée standard si le FILE est -. Chaque PATTERN peut être :\n" +"Lire l'entrée standard si le FILE est -. Chaque PATTERN peut être :\n" -#: src/csplit.c:1477 -#, fuzzy +#: src/csplit.c:1478 msgid "" "\n" " INTEGER copy up to but not including specified line number\n" @@ -2640,23 +2643,21 @@ msgid "" "A line OFFSET is a required '+' or '-' followed by a positive integer.\n" msgstr "" "\n" -" INTEGER copie jusqu'à mais sans inclure le nombre de lignes " +" INTEGER copier jusqu'à, sans inclure le nombre de lignes " "indiqué\n" -" /REGEXP/[OFFSET] copie jusqu'à mais sans inclure une ligne " -"correspondante\n" -" %%REGEXP%%[OFFSET] ignore jusqu'à, mais sans inclure une ligne " -"correspondante\n" -" {INTEGER} répéte le motif précédent un nombre de fois\n" -" {*} répéte le motif précédent le plus souvent possible\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" +" {*} répéter le motif précédent autant que possible\n" "\n" -"Une ligne OFFSET requiert un « + » ou un « - » suivi d'un entier positif.\n" +"Une ligne OFFSET 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:64 src/cut.c:372 msgid "fields and positions are numbered from 1" msgstr "champs et positions sont numérotés à partir de 1" @@ -2666,59 +2667,54 @@ msgid "Usage: %s OPTION... [FILE]...\n" msgstr "Utilisation : %s [OPTION]... [FILE]...\n" #: src/cut.c:193 -msgid "" -"Print selected parts of lines from each FILE to standard output.\n" -"\n" +msgid "Print selected parts of lines from each FILE to standard output.\n" msgstr "" -"Affiche des extraits de lignes de chaque FILE vers la sortie standard.\n" -"\n" +"Afficher des extraits de lignes de chaque FILE vers la sortie standard.\n" -#: src/cut.c:200 +#: src/cut.c:199 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=LIST sélectionne seulement ces octets\n" -" -c, --characters=LIST sélectionne seulement ces caractères\n" -" -d, --delimiter=DELIM utilise DELIM au lieu de TAB comme délimiteur de\n" -" champs\n" +" -b, --bytes=LIST ne sélectionner que ces octets\n" +" -c, --characters=LIST ne sélectionner que ces caractères\n" +" -d, --delimiter=DELIM utiliser DELIM au lieu de TAB comme délimiteur\n" +" de champ\n" -#: src/cut.c:205 +#: src/cut.c:204 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=LIST sélectionne seulement ces champs ; affiche aussi\n" -" toutes les lignes qui ne contiennent pas de " -"caractère\n" -" délimiteur, à moins que l'option -s soit " -"spécifiée\n" +" -f, --fields=LIST ne sélectionner que ces champs ; afficher aussi " +"toutes\n" +" les lignes qui ne contiennent pas de caractère\n" +" délimiteur, à moins que l'option -s soit " +"indiquée\n" " -n (ignoré)\n" -#: src/cut.c:211 +#: src/cut.c:210 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" msgstr "" -" --complement compléte le jeu des octets sélectionnés, " -"caractères\n" -" ou champs\n" +" --complement compléter le jeu d'octets, caractères ou champs\n" +" sélectionnés\n" -#: src/cut.c:215 +#: src/cut.c:214 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 n'affiche pas les lignes ne contenant pas de\n" -" délimiteurs\n" -" --output-delimiter=STRING utilise STRING comme délimiteur de sortie, " -"par défaut le délimiteur de l'entrée est utilisé\n" +" -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" -#: src/cut.c:222 +#: src/cut.c:221 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2726,13 +2722,12 @@ msgid "" "in the same order that it is read, and is written exactly once.\n" msgstr "" "\n" -"Utilisez un, et seulement un parmi -b, -c ou -f. Chaque LIST est fait d'un\n" -"intervalle, ou de plusieurs intervalles séparés par des virgules. L'entrée\n" -"sélectionnée est écrite dans le même ordre qu'elle est lue, et seulement " -"une\n" -"fois.\n" +"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" -#: src/cut.c:228 +#: src/cut.c:227 msgid "" "Each range is one of:\n" "\n" @@ -2745,65 +2740,66 @@ msgid "" msgstr "" "Chaque intervalle est l'un de :\n" "\n" -" N Ne octet, caractère ou champ, compté à partir de 1\n" -" N- du Ne octet, caractère ou champ jusqu'à la fin de la ligne\n" -" N-M du Ne au Me octets (inclus), caractère ou champ\n" -" -M du premier au Me octets (inclus), caractère ou champ\n" +" N Nième octet, caractère ou champ, compté à partir de 1\n" +" N- du Nième octet, caractère ou champ jusqu'à la fin de la ligne\n" +" 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 -, lit l'entrée standard.\n" +"Sans FILE, ou quand FILE est -, lire l'entrée standard.\n" -#: src/cut.c:368 src/cut.c:489 -msgid "invalid byte or field list" -msgstr "octet ou liste de champs non valide." +#: src/cut.c:367 src/cut.c:493 +msgid "invalid byte, character or field list" +msgstr "octet, caractère ou liste de champs incorrects" -#: src/cut.c:385 +#: src/cut.c:387 msgid "invalid range with no endpoint: -" -msgstr "intervalle non valide sans limite de fin : -" +msgstr "intervalle incorrect sans limite de fin : -" -#: src/cut.c:399 +#: src/cut.c:403 msgid "invalid decreasing range" -msgstr "intervalle décroissant non valide" +msgstr "intervalle décroissant incorrect" -#: src/cut.c:478 +#: src/cut.c:482 #, c-format msgid "byte offset %s is too large" msgstr "le décalage d'octet %s est trop grand" -#: src/cut.c:481 +#: src/cut.c:485 #, c-format msgid "field number %s is too large" msgstr "le numéro de champ %s est trop grand" -#: src/cut.c:789 src/cut.c:797 +#: src/cut.c:795 src/cut.c:803 msgid "only one type of list may be specified" -msgstr "un seul type de liste peut être spécifié" +msgstr "un seul type de liste peut être indiqué" -#: src/cut.c:806 +#: src/cut.c:812 src/numfmt.c:1408 +#, c-format msgid "the delimiter must be a single character" -msgstr "le délimiteur doit être un caractère simple" +msgstr "le délimiteur doit être un seul caractère" -#: src/cut.c:841 +#: src/cut.c:847 msgid "you must specify a list of bytes, characters, or fields" -msgstr "une liste d'octets, de caractères, ou de champs doit être spécifiée" +msgstr "une liste d'octets, de caractères ou de champs doit être indiquée" -#: src/cut.c:844 +#: src/cut.c:850 msgid "an input delimiter may be specified only when operating on fields" msgstr "" -"un délimiteur peut être spécifié seulement quand des champs sont manipulés" +"un délimiteur ne peut être indiqué que lorsque des champs sont manipulés" -#: src/cut.c:848 +#: src/cut.c:854 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" msgstr "" -"la suppression des lignes non-délimitées est permise\n" -"\tseulement lorsque des champs sont manipulés." +"la suppression des lignes non délimitées n'est permise\n" +"\tque lorsque des champs sont manipulés." -#: src/cut.c:864 +#: src/cut.c:870 msgid "missing list of fields" msgstr "liste des champs manquante" -#: src/cut.c:866 +#: src/cut.c:872 msgid "missing list of positions" msgstr "liste des positions manquante" @@ -2817,9 +2813,12 @@ msgstr "" " ou : %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 "" +"Afficher la date actuelle au FORMAT indiqué ou initialiser la date système.\n" + +#: src/date.c:134 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" " -I[TIMESPEC], --iso-8601[=TIMESPEC] output date/time in ISO 8601 format.\n" @@ -2827,21 +2826,31 @@ 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 " +"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 " +"format\n" +" ISO 8601. TIMESPEC est « date » pour la date " +"seule\n" +" (par défaut), « hours », « minutes », " +"« seconds » ou\n" +" « ns » pour indiquer la précision des date et " +"heure.\n" -#: src/date.c:138 +#: src/date.c:142 msgid "" " -r, --reference=FILE display the last modification time of FILE\n" " -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 affiche la dernière heure de modification de " +" -r, --reference=FILE afficher la dernière date de modification de " "FILE\n" -" -R, --rfc-2822 affiche la date et l'heure selon le format " -"RFC 2822.\n" -" Exemple, Mon, 07 Aug 2006 12:34:56 -0600\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" -#: src/date.c:143 -#, fuzzy +#: src/date.c:147 msgid "" " --rfc-3339=TIMESPEC output date and time in RFC 3339 format.\n" " TIMESPEC='date', 'seconds', or 'ns' for\n" @@ -2851,17 +2860,19 @@ msgid "" " -s, --set=STRING set time described by STRING\n" " -u, --utc, --universal print or set Coordinated Universal Time\n" msgstr "" -" --rfc-3339=TIMESPEC affiche la date et l'heure selon le format " -"RFC-3339.\n" -" TIMESPEC=`date', `seconds', ou `ns' pour\n" -" la date et l'heure selon la précision voulue.\n" -" Les éléments date et heure sont séparés par\n" -" une simple espace, 2006-08-07 12:34:56-06:00\n" -" -s, --set=STRING initialise la date selon STRING\n" -" -u, --utc, --universal affiche ou initialise le système de temps " +" --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" +" 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" +" -u, --utc, --universal afficher ou initialiser au système de temps " "universel\n" -#: src/date.c:154 +#: src/date.c:158 msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" @@ -2873,47 +2884,46 @@ msgstr "" "FORMAT contrôle l'affichage. Les séquences interprétées sont :\n" "\n" " %% un caractère %\n" -" %a les noms abrégés des jours de la semaine (p. ex. lun.)\n" +" %a nom abrégé localisé du jour de la semaine (par exemple dim.)\n" -#: src/date.c:161 +#: src/date.c:165 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" " %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 les noms complets localisés des jours de la semaine (p. ex. lundi)\n" -" %b les noms abrégés localisés des mois (p. ex. janv.)\n" -" %B les noms complets localisés des mois (p. ex. janvier)\n" -" %c la date et l'heure localisées (p. ex. mar. 28 avril 2009 08:37:32 " -"CEST)\n" +" %A nom complet localisé du jour de la semaine (par exemple dimanche)\n" +" %b nom abrégé localisé du mois (par exemple janv.)\n" +" %B nom complet localisé du mois (par exemple janvier)\n" +" %c date et heure localisées (par exemple jeu. 03 mars 2005 23:05:25 " +"CET)\n" -#: src/date.c:167 +#: src/date.c:171 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" " %D date; same as %m/%d/%y\n" " %e day of month, space padded; same as %_d\n" msgstr "" -" %C siècle ; comme %Y, sans les 2 derniers chiffres (p. ex. 20)\n" -" %d jour du mois (p. ex. 01)\n" +" %C siècle, comme %Y, sans les deux derniers chiffres (par exemple 20)\n" +" %d jour du mois (par exemple 01)\n" " %D date, identique à %m/%d/%y\n" -" %e jour du mois, complété avec une espace, identique à %_d\n" +" %e jour du mois, éventuellement complété par une espace, identique à " +"%_d\n" -#: src/date.c:173 +#: src/date.c:177 msgid "" " %F full date; same as %Y-%m-%d\n" " %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 la date complète, identique à %Y-%m-%d\n" -" %g les deux derniers chiffres de l'année du numéro de semaine ISO (voir " -"%G)\n" -" %G l'année correspondant au numéro de semaine ISO (voir %V) ; normalement" -"\\\n" -" utile seulement avec %V\n" +" %F date complète, identique à %Y-%m-%d\n" +" %g deux derniers chiffres de l'année du numéro de semaine ISO (voir %G)\n" +" %G année correspondant au numéro de semaine ISO (voir %V) ; normalement\n" +" seulement utile avec %V\n" -#: src/date.c:178 +#: src/date.c:182 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2925,7 +2935,7 @@ msgstr "" " %I heure (01..12)\n" " %j jour de l'année (001..366)\n" -#: src/date.c:184 +#: src/date.c:188 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -2937,7 +2947,7 @@ msgstr "" " %m mois (01..12)\n" " %M minute (00..59)\n" -#: src/date.c:190 +#: src/date.c:194 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2947,15 +2957,15 @@ 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 un retour à ligne\n" +" %n un changement de ligne\n" " %N nanosecondes (000000000..999999999)\n" " %p indicateur localisé AM ou PM en majuscules (blanc si inconnu)\n" " %P identique à %p mais en minuscules\n" -" %r heure locale au format 12-heure (p. ex. 11:11:01 PM)\n" -" %R heure en format 24-heure identique à %H:%M\n" +" %r heure locale au format 12 heures (par exemple 11:11:01 PM)\n" +" %R heure en format 24 heures identique à %H:%M\n" " %s secondes depuis 1970-01-01 00:00:00 UTC\n" -#: src/date.c:199 +#: src/date.c:203 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2965,38 +2975,35 @@ msgstr "" " %S secondes (00..60)\n" " %t une tabulation\n" " %T l'heure, identique à %H:%M:%S\n" -" %u le jour de la semaine (1..7) ; 1 représente le lundi\n" +" %u jour de la semaine (1..7) ; 1 représente le lundi\n" -#: src/date.c:205 +#: src/date.c:209 msgid "" " %U week number of year, with Sunday as first day of week (00..53)\n" " %V ISO week number, with Monday as first day of week (01..53)\n" " %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 le numéro de la semaine de l'année, avec le dimanche comme premier " -"jour\n" -" de la semaine (00..53)\n" -" %V le numéro de la semaine ISO, avec le lundi comme premier jour de la\n" -" semaine (01..53)\n" -" %w le jour de la semaine (0..6), avec 0 étant le dimanche\n" -" %W le numéro de la semaine, avec le lundi comme premier jour de la " -"semaine\n" -" (00..53)\n" +" %U numéro de la semaine de l'année, avec dimanche en premier jour de la\n" +" semaine (00..53)\n" +" %V numéro de la semaine ISO, avec lundi en premier jour de la semaine\n" +" %w jour de la semaine (0..6), 0 représente le dimanche\n" +" %W numéro de la semaine, avec lundi en premier jour de la semaine " +"(00..53)\n" -#: src/date.c:211 +#: src/date.c:215 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" " %y last two digits of year (00..99)\n" " %Y year\n" msgstr "" -" %x représentation localisée de la date (p. ex. 12/31/99)\n" -" %X représentation localisée de l'heure (p. ex. 23:13:48)\n" -" %y les deux derniers chiffres de l'année (00..99)\n" -" %Y l'année\n" +" %x représentation localisée de la date (par exemple 12/31/99)\n" +" %X représentation localisée de l'heure (par exemple 23:13:48)\n" +" %y deux derniers chiffres de l'année (00..99)\n" +" %Y année\n" -#: src/date.c:217 +#: src/date.c:221 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -3007,17 +3014,16 @@ msgid "" "\n" "By default, date pads numeric fields with zeroes.\n" msgstr "" -" %z fuseau horaire numérique +hhmm (p. ex. -0400)\n" -" %:z fuseau horaire numérique +hh:mm (p. ex. -04:00)\n" -" %::z fuseau horaire numérique +hh:mm:ss (p. ex. -04:00:00)\n" -" %:::z fuseau horaire numérique selon la précision nécessaire (p. ex. -04, " -"+05:30)\n" -" %Z abréviation alphabétique des fuseaux horaires (p. ex. EDT)\n" +" %z fuseau horaire numérique +hhmm (par exemple -0400)\n" +" %:z fuseau horaire numérique +hh:mm (par exemple -04:00)\n" +" %::z fuseau horaire numérique +hh:mm:ss (par exemple -04:00:00)\n" +" %:::z fuseau horaire numérique utilisant « : » pour la précision\n" +" (par exemple -04, +05:30)\n" +" %Z abréviation alphabétique des fuseaux horaires (par exemple EDT)\n" "\n" "Par défaut, les champs de date numériques sont remplis par des zéros.\n" -#: src/date.c:226 -#, fuzzy +#: src/date.c:230 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -3027,15 +3033,15 @@ msgid "" " ^ use upper case if possible\n" " # use opposite case if possible\n" msgstr "" -"Les drapeaux optionnels suivants peuvent suivre « % » :\n" +"Les attributs optionnels suivants peuvent suivre « % » :\n" "\n" -" - (hyphen) ne remplit pas le champs\n" -" _ (underscore) remplit avec espace\n" -" 0 (zero) remplit avec zéro\n" -" ^ emploie majuscule si possible\n" -" # emploie la casse opposée si possible\n" +" - (trait d'union) ne pas remplir le champ\n" +" _ (tiret bas) remplir avec des espaces\n" +" 0 (zéro) remplir avec des zéros\n" +" ^ utiliser des majuscules si possible\n" +" # utiliser la casse opposée si possible\n" -#: src/date.c:235 +#: src/date.c:239 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -3044,14 +3050,14 @@ msgid "" "O to use the locale's alternate numeric symbols if available.\n" msgstr "" "\n" -"Après chaque drapeau suit un champ optionnel de largeur, sous la forme \n" -"d'un nombre décimal ainsi que modificateur optionnel tel que :\n" -"E pour utiliser la représentation locale alternative si disponible, ou\n" -"O pour utiliser la représentation locale alternative de symboles numériques " -"si\n" -"disponible.\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" +"O pour utiliser la représentation localisée alternative de symboles " +"numériques\n" +"si disponible.\n" -#: src/date.c:242 +#: src/date.c:246 msgid "" "\n" "Examples:\n" @@ -3065,81 +3071,78 @@ msgid "" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" "\n" -"Exemples\n" +"Exemples :\n" "Convertir les secondes depuis Epoch (1970-01-01 UTC) en une date :\n" " $ date --date='@2147483647'\n" "\n" -"Afficher l'heure sur la côte ouest des États-Unis (utilisez tzselect(1)) " -"pour\n" -"trouver TZ) :\n" -" $ TZ='American/Los_Angeles' date\n" +"Afficher l'heure en Martinique (utilisez tzselect(1)) pour trouver TZ) :\n" +" $ TZ='America/Martinique' date\n" "\n" -"Afficher l'heure locale de 9 du matin, vendredi prochain sur la côte ouest " -"des\n" -"États-Unis :\n" -" $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" +"Afficher l'heure locale pour 9 h du matin, vendredi prochain en " +"Martinique :\n" +" $ date --date='TZ=\"America/Martinique\" 09:00 next Fri'\n" -#: src/date.c:275 src/dd.c:2193 src/head.c:838 src/md5sum.c:477 -#: src/md5sum.c:798 src/od.c:863 src/od.c:1914 src/pr.c:1176 src/pr.c:1372 -#: src/pr.c:1494 src/stty.c:842 src/tac.c:563 src/tail.c:343 src/tee.c:126 +#: 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 #, c-format msgid "standard input" msgstr "entrée standard" -#: src/date.c:303 src/date.c:523 +#: src/date.c:307 src/date.c:527 #, c-format msgid "invalid date %s" -msgstr "date non valide %s" +msgstr "date incorrecte %s" -#: src/date.c:414 src/date.c:448 +#: src/date.c:418 src/date.c:452 #, c-format msgid "multiple output formats specified" -msgstr "multiples formats de fichiers de sortie spécifiés" +msgstr "plusieurs formats de fichiers de sortie indiqués" -#: src/date.c:426 +#: src/date.c:430 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "" -"les options pour spécifier les dates pour l'impression sont mutuellement " -"exclusives" +"les options pour indiquer les dates d'impression sont mutuellement exclusives" -#: src/date.c:433 +#: src/date.c:437 #, c-format msgid "the options to print and set the time may not be used together" msgstr "" "les options pour afficher et définir la date ne peuvent être utilisées " -"ensembles." +"ensemble" -#: src/date.c:454 -#, fuzzy, c-format +#: src/date.c:458 +#, 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 "" "l'argument %s n'est pas précédé du préfixe « + ».\n" -"Lors de l'utilisation d'une option pour spécifier la date,\n" -"chaque argument qui n'est pas une option reconnue doit être\n" -"une chaîne de formatage qui débute par « + »." +"En utilisant une option d'indication de date, tous les arguments qui ne sont " +"pas\n" +"des options reconnues doivent être des chaînes de formatage commençant par " +"« + »" -#: src/date.c:531 +#: src/date.c:535 #, c-format msgid "cannot set date" -msgstr "ne peut initialiser la date." +msgstr "impossible d'initialiser la date" -#: src/date.c:554 src/du.c:360 +#: src/date.c:558 src/du.c:371 #, c-format msgid "time %s is out of range" msgstr "heure %s hors limite" #. This is a proper name. See the gettext manual, section Names. -#: src/dd.c:44 src/factor.c:43 src/rm.c:41 src/tail.c:69 src/touch.c:41 +#: 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 "Paul Rubin" -#: src/dd.c:517 +#: src/dd.c:521 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3148,8 +3151,7 @@ msgstr "" "Utilisation : %s [OPERAND]...\n" " ou : %s OPTION\n" -#: src/dd.c:522 -#, fuzzy +#: src/dd.c:526 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -3161,15 +3163,14 @@ msgid "" msgstr "" "Copie un fichier en le convertissant et le formatant selon les opérandes.\n" "\n" -" bs=BYTES lit et écrit jusqu'à BYTES à la fois\n" -" cbs=BYTES convertit BYTES octets à la fois\n" -" conv=CONVS convertit le fichier en liste de symboles séparés par une\n" -" virgule\n" -" count=BLOCKS copie seulement BLOCKS blocks d'entrée\n" -" ibs=BYTES lit jusqu'à BYTES octets à la fois (par défaut 512)\n" +" bs=BYTES lire et écrire jusqu'à BYTES octets à la fois\n" +" cbs=BYTES convertir BYTES 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" -#: src/dd.c:531 -#, fuzzy +#: src/dd.c:535 msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -3178,24 +3179,28 @@ msgid "" " oflag=FLAGS write as per the comma separated symbol list\n" " seek=N skip N obs-sized blocks at start of output\n" " skip=N skip N ibs-sized blocks at start of input\n" -" status=noxfer suppress transfer statistics\n" -msgstr "" -" if=FILE lit FILE au lieu de l'entrée standard (stdin)\n" -" iflag=FLAGS lit selon la liste de symboles séparés par des virgules\n" -" obs=BYTES écrit BYTES octets à la fois (par défaut 512)\n" -" of=FILE écrit dans FILE au lieu de la sortie standard (stdout)\n" -" oflag=FLAGS écrit selon à l'aide de LISTE de symboles séparés par des " +" 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 " "virgules\n" -" seek=BLOCKS se déplace de BLOCKS blocs de taille « obs » au début de " -"la sortie\n" -" skip=BLOCKS ignore BLOCKS blocs de taille « ibs » au début de " -"l'entrée\n" -" status=noxfer supprime les statistiques de transfert\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 " +"transfert\n" +" et « none » supprime tout\n" -#: src/dd.c:541 +#: src/dd.c:546 msgid "" "\n" -"BLOCKS and BYTES may be followed by the following multiplicative suffixes:\n" +"N and BYTES may be followed by the following multiplicative suffixes:\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, and so on for T, P, E, Z, Y.\n" "\n" @@ -3203,16 +3208,15 @@ msgid "" "\n" msgstr "" "\n" -"BLOCKS et BYTES peuvent être suivis des suffixes multiplicatifs suivants :\n" +"N et BYTES 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" +"xM = M, GB = 1000*1000*1000, G = 1024*1024*1024 et ainsi de suite pour\n" "T, P, E, Z et Y.\n" "\n" "Chaque symbole CONV peut être :\n" "\n" -#: src/dd.c:550 -#, fuzzy +#: src/dd.c:555 msgid "" " ascii from EBCDIC to ASCII\n" " ebcdic from ASCII to EBCDIC\n" @@ -3229,21 +3233,24 @@ msgstr "" " ascii de l'EBCDIC vers l'ASCII\n" " ebcdic de l'ASCII vers l'EBCDIC\n" " ibm de l'ASCII vers l'EBCDIC alternatif\n" -" block remplit les enregistrements terminés par un saut de ligne\n" -" par des espaces jusqu'à la taille « cbs »\n" -" unblock remplace les espaces à la fin des enregistrements de taille " -"« cbs »\n" -" par des sauts de ligne\n" -" lcase transforme les majuscules en minuscules\n" -" ucase transforme les minuscules en majuscules\n" -" swab inverse chaque paire d'octets en entrée\n" -" sync remplit chaque bloc lu avec des nuls jusqu'à concurrence\n" -" de la taille « ibs » ; avec « block » ou « unblock », remplit " +" block remplir les enregistrements terminés par une nouvelle ligne par " +"des\n" +" espaces jusqu'à la taille « cbs »\n" +" unblock remplacer les espaces en fin d'enregistrements de taille « cbs » " +"par\n" +" une nouvelle ligne\n" +" 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" +" swab inverser chaque paire d'octets en entrée\n" +" sync remplir chaque bloc lu avec des NUL jusqu'à la taille « ibs » ; " "avec\n" -" des espaces au lieu de nuls\n" +" « block » ou « unblock », remplir avec des espaces au lieu de " +"NUL\n" "\n" -#: src/dd.c:563 +#: src/dd.c:568 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3252,14 +3259,14 @@ msgid "" " fdatasync physically write output file data before finishing\n" " fsync likewise, but also write metadata\n" msgstr "" -" excl échoue si le fichier de sortie existe déjà\n" -" nocreat ne crée par le fichier de sortie\n" -" notrunc ne tronque par le fichier de sortie\n" -" noerror continue même après des erreurs de lecture\n" -" fdatasync écrit physiquement les données en sortie avant la fin\n" -" fsync identique, mais écrit aussi les métadonnées\n" +" excl échouer si le fichier de sortie existe déjà\n" +" nocreat ne pas créer le fichier de sortie\n" +" notrunc ne pas tronquer le fichier de sortie\n" +" noerror continuer même après des erreurs de lecture\n" +" 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:571 +#: src/dd.c:576 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3273,76 +3280,82 @@ msgstr "" " append mode d'ajout (n'a de sens que pour la sortie ; conv=notrunc " "suggéré)\n" -#: src/dd.c:578 +#: src/dd.c:583 msgid " cio use concurrent I/O for data\n" -msgstr " cio utilise des E/S simultanées pour les données\n" +msgstr " cio utiliser des E/S simultanées pour les données\n" -#: src/dd.c:580 +#: src/dd.c:585 msgid " direct use direct I/O for data\n" -msgstr " direct utilise des E/S directes pour les données\n" +msgstr " direct utiliser des E/S directes pour les données\n" -#: src/dd.c:582 +#: src/dd.c:587 msgid " directory fail unless a directory\n" -msgstr " directory échoue sauf si un répertoire\n" +msgstr " directory échouer sauf s'il s'agit d'un répertoire\n" -#: src/dd.c:584 +#: src/dd.c:589 msgid " dsync use synchronized I/O for data\n" -msgstr " dsync utilise des E/S synchronisées pour les données\n" +msgstr " dsync utiliser des E/S synchronisées pour les données\n" -#: src/dd.c:586 +#: src/dd.c:591 msgid " sync likewise, but also for metadata\n" msgstr " sync identique mais aussi pour les métadonnées\n" -#: src/dd.c:587 +#: src/dd.c:592 msgid " fullblock accumulate full blocks of input (iflag only)\n" -msgstr " fullblock accumule des blocs pleins en entrée (uniquement iflag)\n" +msgstr " fullblock accumuler des blocs pleins en entrée (uniquement iflag)\n" -#: src/dd.c:590 +#: src/dd.c:595 msgid " nonblock use non-blocking I/O\n" -msgstr " nonblock utilise des E/S non bloquantes\n" +msgstr " nonblock utiliser des E/S non bloquantes\n" -#: src/dd.c:592 +#: src/dd.c:597 msgid " noatime do not update access time\n" -msgstr " noatime ne met pas à jour la date d'accès\n" +msgstr " noatime ne pas mettre à jour la date d'accès\n" -#: src/dd.c:595 +#: src/dd.c:600 msgid " nocache discard cached data\n" -msgstr " nocache invalide les données en cache\n" +msgstr " nocache abandonner les données en cache\n" -#: src/dd.c:598 +#: src/dd.c:603 msgid " noctty do not assign controlling terminal from file\n" -msgstr " noctty n'assigne pas de terminal contrôleur depuis le fichier\n" +msgstr " noctty ne pas assigner de terminal contrôleur depuis le fichier\n" -#: src/dd.c:601 +#: src/dd.c:606 msgid " nofollow do not follow symlinks\n" -msgstr " nofollow ne suit pas les liens symboliques\n" +msgstr " nofollow ne pas suivre les liens symboliques\n" -#: src/dd.c:603 +#: src/dd.c:608 msgid " nolinks fail if multiply-linked\n" -msgstr " nolinks échoue si multiples liens\n" +msgstr " nolinks échouer en cas de liens multiples\n" -#: src/dd.c:605 +#: src/dd.c:610 msgid " binary use binary I/O for data\n" -msgstr " binary utilise des E/S binaires pour les données\n" +msgstr " binary utiliser des E/S binaires pour les données\n" -#: src/dd.c:607 +#: src/dd.c:612 msgid " text use text I/O for data\n" -msgstr " text utilise des E/S textuelles pour les données\n" +msgstr " text utiliser des E/S textuelles pour les données\n" -#: src/dd.c:609 +#: src/dd.c:614 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:612 +#: src/dd.c:617 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:615 +#: src/dd.c:620 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:620 -#, fuzzy, c-format +#: src/dd.c:625 +#, c-format msgid "" "\n" "Sending a %s signal to a running 'dd' process makes it\n" @@ -3358,42 +3371,42 @@ msgid "" "\n" msgstr "" "\n" -"L'envoi du signal %s vers le processus « dd » actif provoque\n" -"l'écriture des statistiques sur la sortie d'erreur standard\n" -"puis la copie reprend.\n" +"L'envoi du signal %s au processus « dd » actif provoque l'écriture de\n" +"statistiques sur la sortie d'erreur standard suivie de la reprise de la " +"copie.\n" "\n" " $ dd if=/dev/zero of=/dev/null& pid=$!\n" " $ kill -%s $pid; sleep 1; kill $pid\n" -" 18335302+0 enregistrements lus\n" -" 18335302+0 enregistrements écrits\n" -" 9387674624 octets (9.4 Go) copiés, 34.6279 secondes, 271 Mo/s\n" +" 18335302+0 enregistrements lus\n" +" 18335302+0 enregistrements écrits\n" +" 9387674624 octets (9.4 GB) copiés, 34.6279 s, 271 MB/s\n" "\n" "Les options sont :\n" -#: src/dd.c:676 +#: src/dd.c:683 #, c-format msgid "" "%<PRIuMAX>+%<PRIuMAX> records in\n" "%<PRIuMAX>+%<PRIuMAX> records out\n" msgstr "" -"%<PRIuMAX>+%<PRIuMAX> enregistrements lus\n" -"%<PRIuMAX>+%<PRIuMAX> enregistrements écrits\n" +"%<PRIuMAX>+%<PRIuMAX> enregistrements lus\n" +"%<PRIuMAX>+%<PRIuMAX> enregistrements écrits\n" -#: src/dd.c:682 +#: src/dd.c:689 #, 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" +msgstr[0] "%<PRIuMAX> enregistrement tronqué\n" +msgstr[1] "%<PRIuMAX> enregistrements tronqués\n" -#: src/dd.c:694 +#: src/dd.c:701 #, 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" +msgstr[0] "%<PRIuMAX> octet (%s) copié" +msgstr[1] "%<PRIuMAX> octets (%s) copiés" -#: src/dd.c:712 +#: src/dd.c:720 msgid "Infinity B" msgstr "Infinité B" @@ -3407,249 +3420,266 @@ 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:725 +#: src/dd.c:733 #, c-format msgid ", %g s, %s/s\n" -msgstr ", %g s, %s/s\n" +msgstr ", %g s, %s/s\n" -#: src/dd.c:804 +#: src/dd.c:812 #, c-format msgid "closing input file %s" msgstr "fermeture du fichier d'entrée %s" -#: src/dd.c:811 +#: src/dd.c:819 #, c-format msgid "closing output file %s" msgstr "fermeture du fichier de sortie %s" -#: src/dd.c:1014 +#: src/dd.c:1022 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "impossible de désactiver O_DIRECT : %s" -#: src/dd.c:1085 src/dd.c:1934 +#: src/dd.c:1093 src/dd.c:1942 #, c-format msgid "writing to %s" msgstr "écriture vers %s" -#: src/dd.c:1199 src/dd.c:1253 +#: src/dd.c:1207 src/dd.c:1261 #, c-format msgid "unrecognized operand %s" -msgstr "opérande non reconnu %s" +msgstr "opérande %s non reconnu" -#: src/dd.c:1210 +#: src/dd.c:1218 msgid "invalid conversion" -msgstr "conversion non valide" +msgstr "conversion incorrecte" -#: src/dd.c:1213 src/dd.c:1289 +#: src/dd.c:1221 src/dd.c:1297 msgid "invalid input flag" -msgstr "drapreau d'entrée non valide" +msgstr "attribut d'entrée incorrect" -#: src/dd.c:1216 src/dd.c:1283 src/dd.c:1295 +#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303 msgid "invalid output flag" -msgstr "drapeau de sortie non valide" +msgstr "attribut de sortie incorrect" -#: src/dd.c:1219 +#: src/dd.c:1227 msgid "invalid status flag" -msgstr "drapeau d'état non valide" +msgstr "attribut d'état incorrect" -#: src/dd.c:1258 src/truncate.c:312 +#: src/dd.c:1266 src/truncate.c:310 #, c-format msgid "invalid number %s" -msgstr "nombre non valide %s" +msgstr "nombre %s incorrect" -#: src/dd.c:1340 +#: src/dd.c:1348 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" -msgstr "ne peut pas combiner deux options parmi ascii, ebcdic et ibm" +msgstr "impossible de combiner deux options parmi ascii, ebcdic et ibm" -#: src/dd.c:1342 +#: src/dd.c:1350 #, c-format msgid "cannot combine block and unblock" -msgstr "ne peut pas combiner block et unblock" +msgstr "impossible de combiner block et unblock" -#: src/dd.c:1344 +#: src/dd.c:1352 #, c-format msgid "cannot combine lcase and ucase" -msgstr "ne peut pas combiner lcase et ucase" +msgstr "impossible de combiner lcase et ucase" -#: src/dd.c:1346 +#: src/dd.c:1354 #, c-format msgid "cannot combine excl and nocreat" -msgstr "ne peut combiner excl et nocreat" +msgstr "impossible de combiner excl et nocreat" -#: src/dd.c:1349 +#: src/dd.c:1357 #, c-format msgid "cannot combine direct and nocache" -msgstr "ne peut combiner direct et nocache" +msgstr "impossible de combiner direct et nocache" -#: src/dd.c:1506 +#: src/dd.c:1514 #, 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 : afin de contourner une anomalie 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, consultez <sys/mtio.h> pour la\n" -"liste des types" +" pour le fichier (%s) de type mt_type=0x%0lx\n" +" — consultez <sys/mtio.h> pour la liste des types" -#: src/dd.c:1593 +#: src/dd.c:1601 #, c-format msgid "%s: cannot skip" -msgstr "%s : ne peut pas ignorer" +msgstr "%s : impossible d'ignorer" -#: src/dd.c:1595 src/dd.c:1614 src/dd.c:1675 +#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683 #, c-format msgid "%s: cannot seek" -msgstr "%s : ne peut pas se déplacer" +msgstr "%s : impossible de se déplacer" -#: src/dd.c:1655 +#: src/dd.c:1663 #, c-format msgid "offset overflow while reading file %s" msgstr "débordement du décalage à la lecture du fichier %s" -#: src/dd.c:1667 +#: src/dd.c:1675 #, c-format msgid "warning: invalid file offset after failed read" msgstr "" -"avertissement : décalage de fichier non valide suite à un échec de lecture" +"avertissement : décalage de fichier incorrect suite à un échec de lecture" -#: src/dd.c:1671 +#: src/dd.c:1679 #, c-format msgid "cannot work around kernel bug after all" -msgstr "ne peut finalement pas contourner une anomalie du noyau" +msgstr "impossible de contourner une anomalie du noyau finalement" -#: src/dd.c:1814 +#: src/dd.c:1822 #, c-format msgid "setting flags for %s" -msgstr "initialisation des drapeaux pour %s" +msgstr "initialisation des attributs pour %s" -#: src/dd.c:1867 +#: 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)" +msgstr "impossible d'allouer un tampon d'entrée de %zu octets (%s)" -#: src/dd.c:1881 +#: 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)" +msgstr "impossible d'allouer un tampon de sortie de %zu octets (%s)" -#: src/dd.c:1914 +#: src/dd.c:1922 #, c-format msgid "%s: cannot skip to specified offset" -msgstr "%s : ne peut pas ignorer jusqu'au décalage indiqué" +msgstr "%s : impossible d'ignorer jusqu'au décalage indiqué" -# That form doesn't validate: -# impossible de tronquer le fichier de sortie %2%s à %1%<PRIuMAX> octets -#: src/dd.c:2125 src/dd.c:2258 +#: src/dd.c:2133 #, c-format -msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" -msgstr "impossible de tronquer à %<PRIuMAX> octets, le fichier de sortie %s" +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:2138 +#: src/dd.c:2146 #, c-format msgid "fdatasync failed for %s" msgstr "fdatasync a échoué pour %s" -#: src/dd.c:2148 +#: src/dd.c:2156 #, c-format msgid "fsync failed for %s" msgstr "fsync a échoué pour %s" -#: src/dd.c:2199 src/dd.c:2228 +#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165 #, c-format -msgid "opening %s" -msgstr "ouverture de %s" +msgid "failed to open %s" +msgstr "impossible d'ouvrir %s" -#: src/dd.c:2237 +#: src/dd.c:2246 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) " "blocks" msgstr "" -"décalage trop grand : ne peut pas tronquer à la longueur seek=%<PRIuMAX> " -"(%lu-octet) blocs" +"décalage trop grand : impossible de tronquer à la longueur seek=" +"%<PRIuMAX> blocs (de %lu octets)" + +#: src/dd.c:2267 +#, 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:2274 src/dd.c:2280 +#: src/dd.c:2283 src/dd.c:2289 #, c-format msgid "failed to discard cache for: %s" -msgstr "impossible d'invalider le cache pour %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:54 src/expr.c:153 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:39 src/sleep.c:35 src/sort.c:66 +#: 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 msgid "Paul Eggert" msgstr "Paul Eggert" -#: src/df.c:140 +#: src/df.c:172 msgid "Filesystem" -msgstr "Sys. fich." +msgstr "Sys. de fichiers" -#: src/df.c:141 +#: src/df.c:175 msgid "Type" msgstr "Type" -#: src/df.c:142 +#: src/df.c:178 src/df.c:542 msgid "blocks" -msgstr "blocks" +msgstr "blocs" -#: src/df.c:142 -msgid "Inodes" -msgstr "Inodes" +#: src/df.c:181 +msgid "Used" +msgstr "Utilisé" -#: src/df.c:142 -msgid "Size" -msgstr "Taille" +#: src/df.c:184 +msgid "Available" +msgstr "Disponible" -#: src/df.c:143 -msgid "Used" -msgstr "Util." +#: src/df.c:187 +msgid "Use%" +msgstr "Uti%" + +#: src/df.c:190 +msgid "Inodes" +msgstr "Inœuds" -#: src/df.c:143 +#: src/df.c:193 msgid "IUsed" msgstr "IUtil." -#: src/df.c:144 -msgid "Available" -msgstr "Disponible" - -#: src/df.c:144 +#: src/df.c:196 msgid "IFree" msgstr "ILibre" -#: src/df.c:144 -msgid "Avail" -msgstr "Dispo" - -#: src/df.c:145 -msgid "Use%" -msgstr "Uti%" - -#: src/df.c:145 +#: src/df.c:199 msgid "IUse%" msgstr "IUti%" -#: src/df.c:145 +#: src/df.c:202 +msgid "Mounted on" +msgstr "Monté sur" + +#: src/df.c:383 +#, c-format +msgid "option --output: field '%s' unknown" +msgstr "option --output : champ « %s » inconnu" + +#: src/df.c:390 +#, c-format +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 +msgid "Size" +msgstr "Taille" + +#: src/df.c:414 src/df.c:451 +msgid "Avail" +msgstr "Dispo" + +#: src/df.c:474 msgid "Capacity" msgstr "Capacité" -#: src/df.c:146 -msgid "Mounted on" -msgstr "Monté sur" +#. 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 +#, c-format +msgid "%s-%s" +msgstr "%2$s de %1$s" -#: src/df.c:847 +#: src/df.c:1210 msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" -"\n" msgstr "" -"Affiche des informations sur le système de fichiers sur lequel chaque\n" -"chaque FILE réside ou de tous les systèmes de fichiers par défaut.\n" -"\n" +"Afficher des renseignements sur le système de fichiers qui contient FILE,\n" +"ou sur tous les systèmes de fichiers par défaut.\n" -#: src/df.c:855 -#, fuzzy +#: src/df.c:1217 msgid "" " -a, --all include dummy file systems\n" " -B, --block-size=SIZE scale sizes by SIZE before printing them. E.g.,\n" @@ -3660,18 +3690,20 @@ msgid "" "2G)\n" " -H, --si likewise, but use powers of 1000 not 1024\n" msgstr "" -" -a, --all inclut les systèmes de fichiers factices\n" -" -B, --block-size=SIZE convertit les tailles en SIZE avant de les " +" -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 ex., « -BM » affiche les tailles en unités de\n" -" 1 048 576 octets. Voir le format SIZE ci-dessous.\n" -" --total produit un total général\n" -" -h, --human-readable affiche les tailles dans un format lisible par un " -"humain\n" -" (par ex. 1K, 234M ou 2G)\n" -" -H, --si identique avec un multiple de 1000 et non de 1024\n" +" Par exemple « -BM » affiche les tailles en unités " +"de\n" +" 1 048 576 octets. Voir le format de SIZE 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:865 +#: src/df.c:1227 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3679,16 +3711,19 @@ msgid "" " --no-sync do not invoke sync before getting usage info " "(default)\n" msgstr "" -" -i, --inodes liste les informations des « inodes » au lieu des " +" -i, --inodes afficher les renseignements des inœuds, pas des " "blocs\n" " -k identique à --block-size=1K\n" -" -l, --local limite le parcours au système des fichiers local\n" -" --no-sync n'effectue pas de synchronisation avant d'obtenir " +" -l, --local limiter le parcours aux systèmes de fichiers locaux\n" +" --no-sync ne pas réaliser de synchronisation avant d'obtenir " "les\n" -" informations d'utilisation (par défaut)\n" +" renseignements d'utilisation (par défaut)\n" -#: src/df.c:872 +#: src/df.c:1234 msgid "" +" --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" +" or print all fields if FIELD_LIST is " +"omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" " -t, --type=TYPE limit listing to file systems of type TYPE\n" @@ -3696,30 +3731,64 @@ msgid "" " -x, --exclude-type=TYPE limit listing to file systems not of type TYPE\n" " -v (ignored)\n" msgstr "" -" -P, --portability utilise le format de sortie POSIX\n" -" --sync invoque sync avant d'obtenir les informations \n" -" d'utilisation\n" -" -t, --type=TYPE limite le parcours aux systèmes de fichier de type " +" --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" +" -P, --portability utiliser le format de sortie POSIX\n" +" --sync invoquer sync avant d'obtenir les renseignements\n" +" d'utilisation\n" +" -t, --type=TYPE limiter l'affichage aux systèmes de fichier de type " "TYPE\n" -" -T, --print-type affiche le type du système de fichiers\n" -" -x, --exclude-type=TYPE limite le parcours aux systèmes de fichiers \n" -" différents du type TYPE\n" +" -T, --print-type afficher le type du système de fichiers\n" +" -x, --exclude-type=TYPE limiter l'affichage aux autres systèmes de " +"fichiers\n" +" que ceux de type TYPE\n" " -v (ignorée)\n" -#: src/df.c:1027 +#: src/df.c:1248 +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" +msgstr "" +"\n" +"FIELD_LIST 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" + +#: src/df.c:1285 +#, 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 #, 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:1075 +#: src/df.c:1500 msgid "Warning: " msgstr "Avertissement : " -#: src/df.c:1077 src/stat.c:795 +#: src/df.c:1502 src/stat.c:814 msgid "cannot read table of mounted file systems" -msgstr "ne peut pas lire la table des systèmes de fichiers montés" +msgstr "impossible de lire la table des systèmes de fichiers montés" -#: src/df.c:1107 +#: src/df.c:1539 #, c-format msgid "no file systems processed" msgstr "aucun système de fichiers traité" @@ -3746,16 +3815,15 @@ msgstr "" "Commande d'affichage pour initialiser la variable d'environnement " "LS_COLORS.\n" "\n" -"Détermine le format de sortie :\n" +"Déterminer le format de sortie :\n" " -b, --sh, --bourne-shell code de sortie pour un shell Bourne pour\n" -" initialiser la variable LS_COLORS\n" +" initialiser la variable LS_COLORS\n" " -c, --csh, --c-shell code de sortie pour un shell C pour " "initialiser\n" -" la variable LS_COLORS\n" -" -p, --print-data-base utilise les valeurs par défaut\n" +" la variable LS_COLORS\n" +" -p, --print-data-base utiliser les valeurs par défaut\n" #: src/dircolors.c:108 -#, fuzzy msgid "" "\n" "If FILE is specified, read it to determine which colors to use for which\n" @@ -3767,18 +3835,18 @@ msgstr "" "les\n" "types de fichiers et les extensions. Autrement, la base de données " "précompilée\n" -"sera utilisée. Pour les détails sur le format de ces fichiers, exécutez\n" -"« dircolors --print-database ».\n" +"sera utilisée. Pour obtenir des précisions sur le format de ces fichiers,\n" +"exécutez « dircolors --print-database ».\n" #: src/dircolors.c:286 #, c-format msgid "%s:%lu: invalid line; missing second token" -msgstr "%s:%lu : ligne non valide ; second jeton manquant" +msgstr "%s:%lu : ligne incorrecte ; second jeton manquant" #: src/dircolors.c:358 #, c-format msgid "%s:%lu: unrecognized keyword %s" -msgstr "%s:%lu : mot clé %s non reconnu" +msgstr "%s:%lu : mot clef %s non reconnu" #: src/dircolors.c:359 msgid "<internal>" @@ -3796,43 +3864,42 @@ msgstr "" #: src/dircolors.c:450 msgid "file operands cannot be combined with --print-database (-p)" msgstr "" -"les opérandes de fichier ne peuvent être combinés avec --print-database (-p)." +"les opérandes de fichier ne peuvent pas être combinés avec --print-database " +"(-p)" #: src/dircolors.c:473 #, 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 " -"spécifiée" +"donnée" #: src/dirname.c:50 -#, fuzzy, c-format +#, c-format msgid "Usage: %s [OPTION] NAME...\n" -msgstr "Utilisation : %s [OPTION]... NAME...\n" +msgstr "Utilisation : %s [OPTION] NAME...\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 "" -"Affiche NAME en supprimant son dernier composant et sa barre oblique " -"finale ; si\n" -"NAME ne contient pas de « / », la sortie sera « . » (signifiant le " -"répertoire\n" -"actuel).\n" +"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" +"le répertoire actuel).\n" "\n" #: src/dirname.c:59 -#, fuzzy msgid " -z, --zero separate output with NUL rather than newline\n" msgstr "" -" -0, --null termine les lignes avec l'octet 0 et non une nouvelle ligne\n" +" -z, --zero séparer la sortie par des NULL au lieu de changements de " +"ligne\n" #: src/dirname.c:64 -#, fuzzy, c-format +#, c-format msgid "" "\n" "Examples:\n" @@ -3842,10 +3909,11 @@ msgid "" msgstr "" "\n" "Exemples :\n" -" %s /usr/bin affiche « /usr ».\n" -" %s stdio.h affiche « . ».\n" +" %s /usr/bin → « /usr »\n" +" %s rep1/cha rep2/cha → « rep1 » suivi de « rep2 »\n" +" %s stdio.h → « . »\n" -#: src/du.c:260 src/sort.c:390 src/wc.c:112 +#: src/du.c:270 src/sort.c:394 src/wc.c:112 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3854,17 +3922,17 @@ msgstr "" "Utilisation : %s [OPTION]... [FILE]...\n" " ou : %s [OPTION]... --files0-from=F\n" -#: src/du.c:264 -msgid "" -"Summarize disk usage of each FILE, recursively for directories.\n" -"\n" +#: src/du.c:274 +msgid "Summarize disk usage of each FILE, recursively for directories.\n" msgstr "" -"Synthétise l'utilisation de l'espace disque pour chaque FILE, récursivement\n" +"Synthétiser l'utilisation de l'espace disque pour chaque FILE, " +"récursivement\n" "pour les répertoires.\n" -#: src/du.c:271 -#, fuzzy +#: src/du.c:280 msgid "" +" -0, --null end each output line with 0 byte rather than " +"newline\n" " -a, --all write counts for all files, not just directories\n" " --apparent-size print apparent sizes, rather than disk usage; " "although\n" @@ -3872,20 +3940,22 @@ msgid "" " larger due to holes in ('sparse') files, internal\n" " fragmentation, indirect blocks, and the like\n" msgstr "" -" -a, --all affiche le décompte pour tous les fichiers, pas\n" -" seulement pour les répertoires.\n" -" --apparent-size affiche les tailles apparentes, au lieu de " -"l'occupation \n" -" disque ; même si la taille apparente est " -"habituellement\n" -" plus petite, elle peut être plus grande en raison " +" -0, --null terminer chaque ligne de sortie par un octet NULL\n" +" au lieu d'un 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" +" habituellement plus petite, elle peut être plus " +"grande\n" +" en raison de trous dans les fichiers (« sparse »), " "de\n" -" trous dans les fichiers (« sparse »), de la\n" -" fragmentation, de blocs indirects et autres raisons\n" -" similaires\n" +" la fragmentation, de blocs indirects et autres " +"raisons\n" +" similaires\n" -#: src/du.c:279 -#, fuzzy +#: src/du.c:289 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" @@ -3894,17 +3964,30 @@ msgid "" " -c, --total produce a grand total\n" " -D, --dereference-args dereference only symlinks that are listed on the\n" " command line\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 "" -" -B, --block-size=SIZE convertit les tailles en SIZE avant de les " +" -B, --block-size=SIZE convertir les tailles en SIZE avant de les " "afficher.\n" -" Par ex., « -BM » affiche les tailles en unités de\n" -" 1 048 576 octets. Voir le format SIZE ci-dessous.\n" -" -b, --bytes équivalent à « --apparent-size --block-size=1 »\n" -" -c, --total produit le total général\n" -" -D, --dereference-args déréférence seulement les liens symboliques sur\n" +" Par exemple, « -BM » affiche les tailles en unités " +"de\n" +" 1 048 576 octets. Consultez le format SIZE 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" " la ligne de commande\n" +" -d, --max-depth=N afficher le total pour un répertoire (ou un " +"fichier,\n" +" avec --all) seulement s'il est à N niveaux ou " +"moins\n" +" selon les arguments de la ligne de commande ;\n" +" --max-depth=0 est identique à --summarize\n" -#: src/du.c:288 +#: src/du.c:302 msgid "" " --files0-from=F summarize disk usage of the NUL-terminated file\n" " names specified in file F;\n" @@ -3912,75 +3995,46 @@ msgid "" " -H equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" --si like -h, but use powers of 1000 not 1024\n" msgstr "" -" --files0-from=F résume l'occupation disque des noms de fichiers\n" -" terminés par NUL, listés dans le fichier F ;\n" -" Si F est -, alors les noms sont lus de l'entrée " +" --files0-from=F résumer l'occupation 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 affiche les tailles dans un format lisible par un " -"humain\\n\n" -" (par ex. 1K, 234M, ou 2G)\n" -" --si identique à -h mais utilise un multiple de 1 000 au " -"lieu\\n\n" -" de 1 024\n" +" -h, --human-readable afficher les tailles dans un format lisible\n" +" (par exemple 1K, 234M, ou 2G)\n" -#: src/du.c:297 +#: src/du.c:310 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, identique à --block-size=1K\n" -" -l, --count-links comptabilise les tailles aussi souvent qu'il y a\n" -" de liens directs\n" +" -L, --dereference déréférencer tous les liens symboliques\n" +" -l, --count-links comptabiliser les tailles de tous les liens directs\n" " -m identique à --block-size=1M\n" -#: src/du.c:302 +#: src/du.c:316 msgid "" -" -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " "default)\n" -" -0, --null end each output line with 0 byte rather than " -"newline\n" " -S, --separate-dirs 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 déréférence tous les liens symboliques\n" -" -P, --no-dereference ne suit pas les liens symboliques (par défaut)\n" -" -0, --null termine chaque ligne de sortie par un octet de\n" -" valeur 0 au lieu d'un changement de ligne\n" -" -S, --separate-dirs n'inclut pas la taille des sous-répertoires\n" -" -s, --summarize affiche seulement un total pour chaque argument\n" - -#: src/du.c:309 -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 ignore les répertoires de différents systèmes de\n" -" fichiers\n" -" -X, --exclude-from=FILE exclut les fichiers qui concordent avec un des " -"motifs\n" -" de FILE\n" -" --exclude=PATTERN exclut les fichiers qui concordent avec PATTERN\n" -" --max-depth=N affiche le total pour un répertoire (ou un " -"fichier,\n" -" avec --all) seulement si il est à N niveaux ou " -"moins\n" -" selon les arguments de la ligne de commande ;\n" -" --max-depth=0 est identique à --summarize\n" +" -P, --no-dereference ne pas suivre les liens symboliques (par défaut)\n" +" -S, --separate-dirs ne pas inclure la taille des sous-répertoires\n" +" --si identique à -h mais en multiple de 1000 au lieu de " +"1024\n" +" -s, --summarize n'afficher qu'un total pour chaque argument\n" -#: src/du.c:318 -#, fuzzy +#: src/du.c:322 msgid "" +" -t, --threshold=SIZE exclude entries smaller than SIZE if positive,\n" +" or entries greater than SIZE if negative\n" " --time show time of the last modification of any file in " "the\n" " directory, or any of its subdirectories\n" @@ -3990,75 +4044,97 @@ msgid "" " full-iso, long-iso, iso, +FORMAT\n" " FORMAT is interpreted like 'date'\n" msgstr "" -" --time affiche l'heure de la dernière modification de " -"n'importe\n" -" quel fichier du répertoire ou des sous-répertoires\n" -" --time=WORD affiche l'heure comme WORD au lieu de l'heure de\n" -" modification : atime, access, use, ctime ou status.\n" -" --time-style=STYLE affiche l'heure en utilisant STYLE :\n" +" -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" +" --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" +" 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" +" FORMAT est interprété comme « date »\n" + +#: src/du.c:333 +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, --one-file-system ignorer les répertoires de différents systèmes " +"de\n" +" fichiers\n" -#: src/du.c:375 -#, fuzzy +#: src/du.c:386 msgid "Infinity" -msgstr "Infinité B" +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:600 +#: src/du.c:624 #, c-format msgid "fts_read failed: %s" msgstr "échec de fts_read : %s" -#: src/du.c:724 +#: src/du.c:780 #, c-format msgid "invalid maximum depth %s" -msgstr "profondeur maximum %s non valide" +msgstr "profondeur maximale %s incorrecte" -#: src/du.c:817 +#: src/du.c:809 +#, c-format +msgid "invalid --threshold argument '-0'" +msgstr "argument « -0 » de --threshold incorrect" + +#: src/du.c:887 #, c-format msgid "cannot both summarize and show all entries" -msgstr "ne peut pas afficher à la fois un résumé et toutes les entrées" +msgstr "impossible d'afficher à la fois un résumé et toutes les entrées" -#: src/du.c:824 +#: src/du.c:894 #, c-format msgid "warning: summarizing is the same as using --max-depth=0" -msgstr "avertissement : résumé est la chose qu'utiliser l'option --max-depth=0" +msgstr "" +"avertissement : résumer est la même chose qu'utiliser l'option --max-depth=0" -#: src/du.c:830 +#: src/du.c:900 #, 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:896 src/sort.c:4479 src/wc.c:668 +#: src/du.c:966 src/sort.c:4533 src/wc.c:668 msgid "file operands cannot be combined with --files0-from" -msgstr "les opérandes fichier ne peuvent pas être combinés avec --files0-from" +msgstr "" +"les opérandes de fichier ne peuvent pas être combinés avec --files0-from" -#: src/du.c:949 src/md5sum.c:587 src/od.c:903 src/tac.c:239 src/tac.c:350 -#: src/tac.c:506 src/tac.c:586 src/wc.c:733 +#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 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:963 src/sort.c:4508 src/wc.c:747 +#: src/du.c:1040 src/sort.c:4562 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, " +"standard" -#: src/du.c:980 src/du.c:988 src/wc.c:760 src/wc.c:768 +#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768 msgid "invalid zero-length file name" -msgstr "nom de fichier de longueur nulle non valide" - -#: src/du.c:1007 src/head.c:149 src/head.c:262 src/head.c:334 src/head.c:538 -#: src/head.c:620 src/head.c:692 src/head.c:750 src/head.c:774 src/tail.c:412 -#: src/tail.c:500 src/tail.c:549 src/tail.c:642 src/tail.c:770 src/tail.c:818 -#: src/tail.c:855 src/tail.c:1782 src/tail.c:1812 src/uniq.c:395 -#, c-format -msgid "error reading %s" -msgstr "erreur de lecture %s" +msgstr "nom de fichier de longueur nulle incorrect" -#: src/du.c:1010 src/ls.c:2649 src/wc.c:791 +#: src/du.c:1088 src/ls.c:2649 src/wc.c:791 msgid "total" msgstr "total" @@ -4089,29 +4165,29 @@ msgid "" msgstr "" "Duplique les chaînes STRING sur la sortie standard.\n" "\n" -" -n n'affiche pas de nouvelle de ligne de terminaison\n" +" -n ne pas afficher de changement de ligne de terminaison\n" #: src/echo.c:51 msgid "" " -e enable interpretation of backslash escapes (default)\n" " -E disable interpretation of backslash escapes\n" msgstr "" -" -e active l'interprétation des échappements par barre oblique\n" -" inverse (par défaut)\n" -" -E désactive l'interprétation des échappements par barre " +" -e activer l'interprétation de protection par barre oblique\n" +" inverse (par défaut)\n" +" -E désactiver l'interprétation de protection par barre " "oblique\n" -" inverse\n" +" inverse\n" #: src/echo.c:54 msgid "" " -e enable interpretation of backslash escapes\n" " -E disable interpretation of backslash escapes (default)\n" msgstr "" -" -e active l'interprétation des échappements par barre oblique\n" -" inverse\n" -" -E désactive l'interprétation des échappements par barre " +" -e activer l'interprétation de protection par barre oblique\n" +" inverse\n" +" -E désactiver l'interprétation de protection par barre " "oblique\n" -" inverse (par défaut)\n" +" inverse (par défaut)\n" #: src/echo.c:60 msgid "" @@ -4136,13 +4212,13 @@ msgid "" " \\t horizontal tab\n" " \\v vertical tab\n" msgstr "" -" \\\\ bare oblique inverse\n" -" \\a alerte (BEL)\n" +" \\\\ barre oblique inverse\n" +" \\a alerte (SON)\n" " \\b retour arrière\n" -" \\c bloque l'affichage ultérieur\n" +" \\c bloquer l'affichage ultérieur\n" " \\e échappement\n" " \\f saut de page\n" -" \\n nouvelle ligne\n" +" \\n changement de ligne\n" " \\r retour chariot\n" " \\t tabulation horizontale\n" " \\v tabulation verticale\n" @@ -4153,8 +4229,8 @@ 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 octet avec la valeur octale NNN (1 à 4 chiffres)\n" -" \\xHH octet avec la valeur hexadécimale HH (1 à 2 chiffres)\n" +" \\0NNN octet de valeur octale NNN (1 à 4 chiffres)\n" +" \\xHH octet de valeur hexadécimale HH (1 ou 2 chiffres)\n" #. This is a proper name. See the gettext manual, section Names. #: src/env.c:32 src/printenv.c:45 src/whoami.c:35 @@ -4167,93 +4243,93 @@ msgid "Usage: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n" msgstr "Utilisation : %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [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" + +#: src/env.c:61 msgid "" -"Set each NAME to VALUE in the environment and run COMMAND.\n" -"\n" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with 0 byte rather than newline\n" " -u, --unset=NAME remove variable from the environment\n" msgstr "" -"Initialise chaque NAME à VALUE dans l'environnement et exécute COMMAND.\n" -"\n" -" -i, --ignore-environment démarre avec un environnement vide\n" -" -0, --null termine chaque ligne de sortie avec l'octet 0 " -"au\n" -" lieu d'une ligne nouvelle\n" -" -u, --unset=NAME enlève la variable de l'environment\n" +" -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" -#: src/env.c:64 +#: src/env.c:68 msgid "" "\n" "A mere - implies -i. If no COMMAND, print the resulting environment.\n" msgstr "" "\n" -"Un simple - implique -i. Si aucune COMMAND n'est fournie, affiche\n" +"Un simple - implique -i. Si aucune COMMAND n'est fournie, afficher\n" "l'environnement résultant.\n" -#: src/env.c:120 +#: src/env.c:124 #, c-format msgid "cannot unset %s" -msgstr "impossible d'indéfinir %s" +msgstr "impossible de supprimer la définition (unset) de %s" -#: src/env.c:131 +#: src/env.c:135 #, c-format msgid "cannot set %s" msgstr "impossible de définir %s" -#: src/env.c:148 +#: src/env.c:152 #, c-format msgid "cannot specify --null (-0) with command" -msgstr "impossible de spécifier --null (-0) avec command" +msgstr "impossible d'indiquer --null (-0) avec la commande" #: src/expand.c:107 msgid "" "Convert tabs in each FILE to spaces, writing to standard output.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" -"Convertit les tabulations de chaque FILE en espaces, en écrivant sur la " +"Convertir les tabulations de chaque FILE en espaces, en écrivant sur la " "sortie\n" -"standard. Sans FILE, ou quand FILE est -, lit de l'entrée standard.\n" -"\n" +"standard. Sans FILE, ou quand FILE est -, lire l'entrée standard.\n" -#: src/expand.c:115 +#: src/expand.c:114 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 ne convertit pas les tabulations après des non-blancs\n" -" -t, --tabs=N utilise des tabulations de N caractères et non 8\n" +" -i, --initial ne pas convertir les tabulations après des non blancs\n" +" -t, --tabs=N utiliser des tabulations de N caractères et non 8\n" -#: src/expand.c:119 +#: src/expand.c:118 msgid "" " -t, --tabs=LIST use comma separated list of explicit tab positions\n" msgstr "" -" -t, --tabs=LIST utilise une liste explicite de positions de " +" -t, --tabs=LIST utiliser une liste explicite de positions de " "tabulations\n" -" séparées par des virgules\n" +" séparées par des virgules\n" -#: src/expand.c:172 src/unexpand.c:191 +#: src/expand.c:171 src/unexpand.c:190 #, c-format msgid "tab stop is too large %s" msgstr "l'arrêt de tabulation %s est trop grand" -#: src/expand.c:180 src/unexpand.c:199 +#: src/expand.c:179 src/unexpand.c:198 #, c-format msgid "tab size contains invalid character(s): %s" -msgstr "la taille de la tabulation contient des caractères non valides : %s" +msgstr "" +"la taille de la tabulation contient un ou des caractères incorrects : %s" -#: src/expand.c:206 src/unexpand.c:225 +#: src/expand.c:205 src/unexpand.c:224 #, c-format msgid "tab size cannot be 0" -msgstr "la taille de la tabulation ne peut être 0" +msgstr "la taille de la tabulation ne peut pas être 0" -#: src/expand.c:208 src/unexpand.c:227 +#: src/expand.c:207 src/unexpand.c:226 #, c-format msgid "tab sizes must be ascending" msgstr "les tailles de tabulation doivent être croissantes" -#: src/expand.c:326 src/expand.c:345 src/unexpand.c:374 src/unexpand.c:419 +#: 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 "la ligne d'entrée est trop longue" @@ -4288,13 +4364,13 @@ msgid "" " ARG1 & ARG2 ARG1 if neither argument is null or 0, otherwise 0\n" msgstr "" "\n" -"Affiche la valeur de EXPRESSION sur la sortie standard. Une ligne vide en\n" +"Afficher la valeur de EXPRESSION sur la sortie standard. Une ligne vide en\n" "dessous sépare les groupes de précédence croissante. L'EXPRESSION peut " "être :\n" "\n" -" ARG1 | ARG2 ARG1 si non nul ou 0 autrement ARG2\n" +" ARG1 | ARG2 ARG1 si non nul ou 0, sinon ARG2\n" "\n" -" ARG1 & ARG2 ARG1 si aucun des arguments est nul ou 0 autrement 0\n" +" ARG1 & ARG2 ARG1 si aucun des arguments est nul ou 0, sinon 0\n" #: src/expr.c:220 msgid "" @@ -4348,28 +4424,25 @@ msgid "" " length STRING length of STRING\n" msgstr "" "\n" -" STRING : REGEXP motif d'ancrage de concordance de REGEXP dans STRING\n" +" STRING : REGEXP motif d'ancrage de correspondance de REGEXP dans STRING\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" -" sinon 0\n" +" sinon 0\n" " length STRING longueur de STRING\n" #: src/expr.c:251 -#, fuzzy 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 "" -" + TOKEN interpréte TOKEN comme une chaîne, même si " -"c'est\n" -" un mot clé comme « match » ou un opérateur " -"comme\n" -" « / »\n" +" + TOKEN interpréter TOKEN comme une chaîne, même s'il\n" +" s'agit d'un mot clef comme « match » ou d'un\n" +" opérateur comme « / »\n" "\n" " ( EXPRESSION ) valeur de l'EXPRESSION\n" @@ -4383,13 +4456,15 @@ msgid "" "0.\n" msgstr "" "\n" -"Soyez vigilent au fait que plusieurs opérateurs peuvent être neutralisés ou\n" -"commentés par certains shells.\n" -"Les comparaisons sont arithmétiques si les deux arguments sont des nombres,\n" -"sinon elles sont lexicographiques.\n" -"Les concordances de motif retournent la chaîne trouvée si elle est\n" -"encapsulée entre \\( et \\) ou nul ; si \\( et \\) ne sont pas utilisés,\n" -"le nombre de caractères qui concordent est retourné ou 0 sinon.\n" +"Soyez conscient que plusieurs opérateurs peuvent être neutralisés ou " +"commentés\n" +"par certains interpréteurs de commande. Les comparaisons sont arithmétiques " +"si\n" +"les deux arguments sont des nombres, sinon elles sont lexicographiques. Les\n" +"correspondances de motifs renvoient la chaîne trouvée si elle est " +"encapsulée\n" +"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 msgid "" @@ -4399,9 +4474,9 @@ msgid "" "or 0, 2 if EXPRESSION is syntactically invalid, and 3 if an error occurred.\n" msgstr "" "\n" -"Le code de sortie est 0 si l'EXPRESSION est soit nulle ou 0, 1 si " +"Le code de sortie est 0 si l'EXPRESSION n'est ni nulle ni 0, 1 si " "l'EXPRESSION\n" -"est nulle ou 0, 2 si l'EXPRESSION est syntaxiquement non valide et 3 si une\n" +"est nulle ou 0, 2 si l'EXPRESSION est syntaxiquement incorrecte et 3 si une\n" "erreur est survenue.\n" #: src/expr.c:278 @@ -4412,19 +4487,19 @@ msgstr "erreur de syntaxe" #: src/expr.c:599 src/ptx.c:283 #, c-format msgid "error in regular expression matcher" -msgstr "erreur dans l'expression régulière recherchée" +msgstr "erreur de correspondance d'expression rationnelle" #: src/expr.c:791 src/expr.c:828 #, c-format msgid "non-integer argument" msgstr "argument non entier" -#: src/expr.c:793 src/truncate.c:316 +#: src/expr.c:793 src/truncate.c:314 #, c-format msgid "division by zero" msgstr "division par zéro" -#: src/expr.c:887 src/sort.c:2029 +#: src/expr.c:887 src/sort.c:2044 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "définissez LC_ALL='C' pour contourner le problème" @@ -4434,25 +4509,33 @@ msgstr "définissez LC_ALL='C' pour contourner le problème" msgid "the strings compared were %s and %s" msgstr "les chaînes comparées étaient %s et %s" -#: src/factor.c:449 -msgid "using arbitrary-precision arithmetic" -msgstr "utilise une arithmétique à précision arbitraire" +#. This is a proper name. See the gettext manual, section Names. +#: src/factor.c:111 +msgid "Niels Moller" +msgstr "Niels Moller" -#: src/factor.c:460 -msgid "using single-precision arithmetic" -msgstr "utilise une arithmétique à précision simple" +#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459 +#, 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:465 src/od.c:1640 src/od.c:1709 +#: src/factor.c:2092 #, c-format -msgid "%s is too large" -msgstr "%s est trop grand" +msgid "squfof queue overflow" +msgstr "dépassement de la file de squfof" -#: src/factor.c:469 +#: src/factor.c:2419 #, c-format msgid "%s is not a valid positive integer" -msgstr "%s n'est pas un entier positif valide" +msgstr "%s n'est pas un entier positif valable" + +#: src/factor.c:2442 src/od.c:1646 src/od.c:1715 +#, c-format +msgid "%s is too large" +msgstr "%s est trop grand" -#: src/factor.c:494 +#: src/factor.c:2454 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4461,15 +4544,14 @@ msgstr "" "Utilisation : %s [NUMBER]...\n" " ou : %s OPTION\n" -#: src/factor.c:499 +#: src/factor.c:2459 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 "" -"Affiche les facteurs premiers de chaque NUMBER entiers spécifiés.\n" -"Si aucun argument n'est fourni, les nombres sont lus depuis l'entrée " -"standard.\n" +"Afficher les facteurs premiers de chaque entier NUMBER indiqué.\n" +"Sans argument fourni, les nombres sont lus depuis l'entrée standard.\n" "\n" #: src/find-mount-point.c:40 @@ -4489,24 +4571,22 @@ msgid "cannot stat current directory (now %s)" msgstr "impossible d'exécuter stat sur le répertoire actuel (%s)" #. This is a proper name. See the gettext manual, section Names. -#: src/fmt.c:37 +#: src/fmt.c:38 msgid "Ross Paterson" msgstr "Ross Paterson" -#: src/fmt.c:269 +#: src/fmt.c:270 #, c-format msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n" msgstr "Utilisation : %s [-WIDTH] [OPTION]... [FILE]...\n" -#: src/fmt.c:270 +#: 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" -"\n" msgstr "" -"Reformate chaque paragraphe de FILE, en écrivant sur la sortie standard.\n" +"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" -"\n" #: src/fmt.c:278 msgid "" @@ -4515,71 +4595,70 @@ msgid "" " reattaching the prefix to reformatted lines\n" " -s, --split-only split long lines, but do not refill\n" msgstr "" -" -c, --crown-margin préserve l'indentation des deux premières " +" -c, --crown-margin préserver l'indentation des deux premières " "lignes\n" -" -p, --prefix=CHAÎNE reformate seulement les lignes débutant par " +" -p, --prefix=CHAÎNE ne reformater que les lignes débutant par " "STRING\n" -" en attachant à nouveau le préfixe aux lignes\n" -" reformatées\n" -" -s, --split-only effectue la césure des longues lignes mais sans " -"les\n" -" remplir\n" +" en rattachant le préfixe aux lignes " +"reformatées\n" +" -s, --split-only effectuer la césure des longues lignes mais " +"sans\n" +" les remplir\n" -#: src/fmt.c:285 -#, fuzzy, c-format +#: src/fmt.c:287 +#, 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 indente différemment la première ligne de la " -"seconde\n" +" -t, --tagged-paragraph indenter différemment les deux premières lignes\n" " -u, --uniform-spacing une espace entre les mots, deux entre les " "phrases\n" -" -w, --width=N largeur de colonne maximale (par défaut 75 " -"colonnes)\n" +" -w, --width=N largeur de colonne maximale (75 colonnes par " +"défaut)\n" +" -g, --goal=N largeur désirée (93 % de la largeur par défaut)\n" -#: src/fmt.c:357 +#: src/fmt.c:359 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" "option; use -w N instead" msgstr "" -"option non valide -- %c ; -WIDTH est reconnue seulement lorsque c'est la\n" +"option incorrecte — %c ; -WIDTH n'est reconnue que si c'est la\n" "première option ; utilisez -w N à la place" -#: src/fmt.c:403 src/fmt.c:414 +#: src/fmt.c:405 src/fmt.c:416 #, c-format msgid "invalid width: %s" -msgstr "largeur non valide : %s" +msgstr "largeur incorrecte : %s" #: src/fold.c:70 msgid "" "Wrap input lines in each FILE (standard input by default), writing to\n" "standard output.\n" -"\n" msgstr "" -"Effectue 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 FILE (entrée standard par\n" "défaut), en écrivant sur la sortie standard.\n" -#: src/fold.c:78 +#: src/fold.c:77 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" " -w, --width=WIDTH use WIDTH columns instead of 80\n" msgstr "" -" -b, --bytes compte les octets au lieu des colonnes\n" +" -b, --bytes compter les octets au lieu des colonnes\n" " -s, --spaces césure aux espaces\n" -" -w, --width=WIDTH utilise WIDTH colonnes au lieu de 80\n" +" -w, --width=WIDTH utiliser WIDTH colonnes au lieu de 80\n" -#: src/fold.c:289 src/pr.c:836 +#: src/fold.c:288 src/pr.c:832 #, c-format msgid "invalid number of columns: %s" -msgstr "nombre non valide de colonnes : %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:75 +#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 #: src/truncate.c:37 msgid "Padraig Brady" msgstr "Padraig Brady" @@ -4594,24 +4673,24 @@ msgid "" "Output platform dependent limits in a format useful for shell scripts.\n" "\n" msgstr "" -"Affiche les limites de la plate-forme dans un format utiles aux scripts " +"Afficher les limites de la plate-forme dans un format utile aux scripts " "shell.\n" "\n" -#: src/group-list.c:69 src/id.c:345 src/setuidgid.c:184 +#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184 #, 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:350 +#: src/group-list.c:74 src/id.c:370 #, c-format msgid "failed to get groups for the current process" -msgstr "impossible d'obtenir les groups pour le processus actuel" +msgstr "impossible d'obtenir les groupes pour le processus actuel" -#: src/group-list.c:104 +#: src/group-list.c:114 #, c-format msgid "cannot find name for group ID %lu" -msgstr "impossible de trouver le nom du groupe avec l'ID %lu" +msgstr "impossible de trouver le nom pour le GID %lu" #: src/groups.c:53 #, c-format @@ -4624,29 +4703,29 @@ msgid "" "for\n" "the current process (which may differ if the groups database has changed).\n" msgstr "" -"Affiche l'appartenance à des groupes pour chaque USERNAME ou, pour le " -"processus\n" -"actuel (qui peut être différent si la base de données des groupes a changé) " -"si\n" -"aucun USERNAME n'est spécifié.\n" +"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" #: src/groups.c:105 src/id.c:233 -#, fuzzy, c-format +#, c-format msgid "cannot get real UID" -msgstr "impossible d'initialiser l'ID de l'utilisateur" +msgstr "impossible d'obtenir l'UID réel" #: src/groups.c:110 src/id.c:241 -#, fuzzy, c-format +#, c-format msgid "cannot get effective GID" -msgstr "impossible de déréférencer %s" +msgstr "impossible d'obtenir le GID effectif" #: src/groups.c:115 src/id.c:246 -#, fuzzy, c-format +#, c-format msgid "cannot get real GID" -msgstr "impossible d'initialiser l'ID de l'utilisateur" +msgstr "impossible d'obtenir le GID réel" #: src/groups.c:128 src/id.c:206 -#, fuzzy, c-format +#, c-format msgid "%s: no such user" msgstr "%s : utilisateur inexistant" @@ -4655,16 +4734,13 @@ 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" -"\n" msgstr "" -"Affiche les 10 premières lignes de chaque FILE sur la sortie standard.\n" -"Chaque fichier est précédé d'une en-tête avec son nom, si plusieurs " +"Afficher les dix premières lignes de chaque FILE sur la sortie standard.\n" +"Chaque fichier est précédé d'un en-tête avec son nom, si plusieurs " "fichiers.\n" -"En l'absence de FILE, ou quand FILE est -, lit de l'entrée standard.\n" -"\n" +"Sans FILE, ou quand FILE est -, lire l'entrée standard.\n" -#: src/head.c:118 -#, fuzzy +#: src/head.c:117 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -4673,28 +4749,29 @@ msgid "" " with the leading '-', print all but the last\n" " K lines of each file\n" msgstr "" -" -c, --bytes=[-]K affiche les premiers K octets de chaque fichier ;\n" -" lorsque le préfixe « - » est présent, affiche tous " +" -c, --bytes=[-]K afficher les K premiers octets de chaque " +"fichier ;\n" +" si le préfixe « - » est présent, afficher tous " "les\n" -" octets sauf les derniers K octets de chaque " -"fichier \n" -" -n, --lines=[-]K affiche les K premières lignes au lieu des 10 " -"premières ;\n" -" lorsque le préfixe « - » est présent, affiche " -"toutes\n" -" les lignes sauf les N dernières de chaque fichier\n" +" octets sauf les K derniers octets de chaque " +"fichier\n" +" -n, --lines=[-]K afficher les K premières lignes au lieu des 10\n" +" premières ; si le préfixe « - » est présent,\n" +" afficher toutes les lignes sauf les N dernières " +"de\n" +" chaque fichier\n" -#: src/head.c:126 +#: 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 n'affiche pas les en-têtes avec les noms de " +" -q, --quiet, --silent ne jamais afficher les en-têtes de noms de " +"fichier\n" +" -v, --verbose toujours afficher les en-têtes de noms de " "fichier\n" -" -v, --verbose affiche toujours les en-têtes avec les noms de\n" -" fichier\n" -#: src/head.c:132 +#: src/head.c:131 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -4704,64 +4781,64 @@ 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, Y.\n" - -#: src/head.c:152 -#, c-format -msgid "error writing %s" -msgstr "erreur à l'écriture de %s" +"GB 1000*1000*1000, G 1024*1024*1024, et ainsi de suite pour T, P, E, Z et " +"Y.\n" -#: src/head.c:155 +#: src/head.c:154 #, c-format msgid "%s: file has shrunk too much" msgstr "%s : le fichier a été trop réduit" -#: src/head.c:228 src/head.c:1044 +#: src/head.c:227 src/head.c:1051 #, c-format msgid "%s: number of bytes is too large" msgstr "%s : le nombre d'octets est trop grand" -#: src/head.c:441 +#: 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" +msgstr "%s : impossible d'utiliser lseek pour revenir à la position d'origine" -#: src/head.c:613 src/head.c:684 src/tail.c:450 +#: src/head.c:612 src/head.c:691 src/tail.c:449 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s : impossible de se déplacer à la position %s" -#: src/head.c:791 +#: src/head.c:673 +#, 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" -#: src/head.c:878 +#: src/head.c:885 #, 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:879 +#: src/head.c:886 msgid "number of lines" msgstr "le nombre de lignes" -#: src/head.c:879 +#: src/head.c:886 msgid "number of bytes" msgstr "le ombre d'octets" -#: src/head.c:886 src/tail.c:1947 +#: src/head.c:893 src/tail.c:1947 msgid "invalid number of lines" -msgstr "nombre de lignes non valide" +msgstr "nombre de lignes incorrect" -#: src/head.c:887 src/tail.c:1948 +#: src/head.c:894 src/tail.c:1948 msgid "invalid number of bytes" -msgstr "nombre d'octets non valide" +msgstr "nombre d'octets incorrect" -#: src/head.c:974 src/head.c:1032 +#: src/head.c:981 src/head.c:1039 #, c-format msgid "invalid trailing option -- %c" -msgstr "option de terminaison non valide -- %c" +msgstr "option de terminaison incorrecte — %c" #: src/hostid.c:42 #, c-format @@ -4771,7 +4848,7 @@ msgid "" "\n" msgstr "" "Utilisation : %s OPTION\n" -"Affiche l'identificateur numérique (en hexadécimal) de l'hôte actuel.\n" +"Afficher l'identificateur numérique (en hexadécimal) de l'hôte actuel.\n" "\n" #: src/hostname.c:56 @@ -4784,7 +4861,7 @@ msgid "" msgstr "" "Utilisation : %s [NOM]\n" " ou : %s OPTION\n" -"Affiche ou définit le nom d'hôte du système actuel.\n" +"Afficher ou définir le nom d'hôte du système actuel.\n" "\n" #: src/hostname.c:94 @@ -4827,18 +4904,18 @@ msgid "" " -r, --real print the real ID instead of the effective ID, with -ugG\n" " -u, --user print only the effective user ID\n" msgstr "" -"Affiche les informations d'utilisateur et de groupe pour USERNAME indiqué,\n" +"Afficher les informations d'utilisateur et de groupe du USERNAME indiqué,\n" "ou pour l'utilisateur actuel quand USERNAME est omis.\n" "\n" " -a ignorée, pour compatibilité avec les autres versions\n" -" -Z, --context affiche seulement le contexte de sécurité de " -"l'utilisateur\n" -" actuel\n" -" -g, --group affiche seulement l'ID du groupe effectif\n" -" -G, --groups affiche tous les ID de groupes\n" -" -n, --name affiche le nom au lieu du numéro, pour -ugG\n" -" -r, --real affiche l'ID réel à la place de l'ID effectif, avec -ugG\n" -" -u, --user affiche seulement l'ID effectif de l'utilisateur\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 -" +"ugG\n" +" -u, --user n'afficher que l'UID effectif\n" #: src/id.c:96 msgid "" @@ -4846,7 +4923,7 @@ msgid "" "Without any OPTION, print some useful set of identified information.\n" msgstr "" "\n" -"Sans aucune OPTION, affiche des informations utiles d'identification.\n" +"Sans aucune OPTION, afficher des informations utiles d'identification.\n" #: src/id.c:140 #, c-format @@ -4858,7 +4935,7 @@ msgstr "--context (-Z) ne fonctionne qu'avec noyau activé pour SELinux" msgid "cannot print security context when user specified" msgstr "" "impossible d'afficher le contexte de sécurité quand un utilisateur est " -"spécifié" +"indiqué" #: src/id.c:178 #, c-format @@ -4869,8 +4946,8 @@ msgstr "impossible d'afficher le « seulement » parmi plusieurs choix" #, c-format msgid "cannot print only names or real IDs in default format" msgstr "" -"impossible d'afficher seulement les noms ou les ID réels dans le format par " -"défaut" +"impossible de n'afficher que les noms ou les identifiants réels au format " +"par défaut" #: src/id.c:199 #, c-format @@ -4878,90 +4955,91 @@ msgid "can't get process context" msgstr "impossible d'obtenir le contexte de traitement" #: src/id.c:224 -#, fuzzy, c-format +#, c-format msgid "cannot get effective UID" -msgstr "impossible de déréférencer %s" +msgstr "impossible d'obtenir l'UID effectif" -#: src/id.c:289 -#, fuzzy, c-format -msgid "cannot find name for user ID %lu" -msgstr "impossible de trouver le nom de l'utilisateur pour l'ID %lu" +#: src/id.c:311 +#, 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:309 -#, fuzzy, c-format -msgid "uid=%lu" -msgstr "uid=%lu" +#: src/id.c:329 +#, c-format +msgid "uid=%s" +msgstr "uid=%s" -#: src/id.c:314 -#, fuzzy, c-format -msgid " gid=%lu" -msgstr " egid=%lu" +#: src/id.c:334 +#, c-format +msgid " gid=%s" +msgstr " gid=%s" -#: src/id.c:321 -#, fuzzy, c-format -msgid " euid=%lu" -msgstr " egid=%lu" +#: src/id.c:341 +#, c-format +msgid " euid=%s" +msgstr " euid=%s" -#: src/id.c:329 +#: src/id.c:349 #, c-format -msgid " egid=%lu" -msgstr " egid=%lu" +msgid " egid=%s" +msgstr " egid=%s" -#: src/id.c:357 +#: src/id.c:377 msgid " groups=" msgstr " groupes=" -#: src/id.c:373 +#: src/id.c:393 #, c-format msgid " context=%s" msgstr " contexte=%s" -#: src/install.c:372 +#: src/install.c:373 #, c-format msgid "warning: %s: failed to change context to %s" -msgstr "avertissement : %s : impossible de changer le contexte en %s" +msgstr "avertissement : %s : impossible de modifier le contexte en %s" -#: src/install.c:413 +#: src/install.c:414 #, c-format msgid "creating directory %s" msgstr "création du répertoire %s" -#: src/install.c:481 +#: src/install.c:482 #, c-format msgid "cannot change ownership of %s" msgstr "impossible de modifier l'appartenance de %s" -#: src/install.c:505 +#: src/install.c:506 #, c-format msgid "cannot set time stamps for %s" msgstr "impossible de définir le format horaire pour %s" -#: src/install.c:526 src/split.c:412 src/timeout.c:387 +#: src/install.c:527 src/split.c:426 src/timeout.c:439 #, c-format msgid "fork system call failed" msgstr "échec de l'appel système fork" -#: src/install.c:530 +#: src/install.c:531 #, c-format msgid "cannot run %s" msgstr "impossible d'exécuter %s" -#: src/install.c:534 +#: src/install.c:535 #, c-format msgid "waiting for strip" msgstr "en attente de strip" -#: src/install.c:536 +#: src/install.c:537 #, c-format msgid "strip process terminated abnormally" msgstr "le traitement en chaîne s'est arrêté anormalement" -#: src/install.c:557 +#: src/install.c:558 #, c-format msgid "invalid user %s" -msgstr "utilisateur non valide %s" +msgstr "utilisateur %s incorrect" -#: src/install.c:593 +#: src/install.c:594 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -4974,7 +5052,7 @@ msgstr "" " ou : %s [OPTION]... -t DIRECTORY SOURCE...\n" " ou : %s [OPTION]... -d DIRECTORY...\n" -#: src/install.c:600 +#: src/install.c:601 msgid "" "\n" "This install program copies files (often just compiled) into destination\n" @@ -4986,23 +5064,20 @@ msgid "" "In the first three forms, copy SOURCE to DEST or multiple SOURCE(s) to\n" "the existing DIRECTORY, while setting permission modes and owner/group.\n" "In the 4th form, create all components of the given DIRECTORY(ies).\n" -"\n" msgstr "" "\n" "Ce programme d'installation copie les fichiers (généralement compilés) dans " "la\n" -"destination que vous avez choisie. Si vous souhaitez télécharger et " -"installer\n" -"un paquet prêt à l'emploi sur un système GNU/Linux, vous devez plutôt " -"utiliser\n" -"un gestionnaire de paquets tel que yum (1) ou apt-get (1).\n" -"\n" -"Dans les trois premiers formats, copie SOURCE vers DEST ou de plusieurs " -"fichiers\n" -"SOURCE vers un DIRECTORY existant, tout en initialisant les modes de \n" -"protection et l'appartenance propriétaire/groupe. \n" -"Dans le 4e format, crée tous les composants des DIRECTORY spécifiés.\n" +"destination choisie. Pour télécharger et installer un paquet prêt à l'emploi " +"sur\n" +"un système GNU/Linux, vous devriez plutôt utiliser un gestionnaire de " +"paquets\n" +"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" +"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" #: src/install.c:615 msgid "" @@ -5015,18 +5090,17 @@ msgid "" " -d, --directory treat all arguments as directory names; create all\n" " components of the specified directories\n" msgstr "" -" --backup[=CONTROL] archive chaque fichier de destination\n" -" -b identique à --backup mais n'accepte pas " -"d'argument\n" -" -c (ignoré)\n" -" -C, --compare compare chaque paire de fichiers source et \n" -" destination, et dans certains cas, ne modifie pas " -"la\n" -" destination\n" -" -d, --directory traite tous les arguments comme des noms de " +" --backup[=CONTROL] archiver chaque fichier de destination\n" +" -b identique à --backup mais n'accepte pas d'argument\n" +" -c (ignoré)\n" +" -C, --compare comparer chaque paire de fichiers source et " +"destination,\n" +" et dans certains cas, ne pas modifier la " +"destination\n" +" du tout\n" +" -d, --directory traiter tous les arguments comme des noms de " "répertoire ;\n" -" crée tous les composants des répertoires " -"spécifiés\n" +" créer tous les composants des répertoires indiqués\n" #: src/install.c:624 msgid "" @@ -5039,14 +5113,14 @@ msgid "" "x\n" " -o, --owner=OWNER set ownership (super-user only)\n" msgstr "" -" -D crée tous les premiers composants de DEST excepté le\n" -" dernier, puis copie SOURCE vers DEST\n" -" -g, --group=GROUPE définit l'appartenance au GROUPE, plutôt que le " -"groupe\n" -" du processus actuel\n" -" -m, --mode=MODE définit le mode de permissions (comme chmod), au lieu\n" -" de rwxrr-xr-x\n" -" -o, --owner=OWNER définit l'appartenance (uniquement pour " +" -D créer tous les premiers composants de DEST sauf le\n" +" dernier, puis copier SOURCE vers DEST\n" +" -g, --group=GROUPE définir l'appartenance au GROUPE au lieu du groupe " +"actuel\n" +" du processus\n" +" -m, --mode=MODE définir le mode de droits (comme chmod), au lieu\n" +" de rwxrr-xr-x\n" +" -o, --owner=PROPRIO définir l'appartenance (uniquement pour " "l'administrateur)\n" #: src/install.c:631 @@ -5062,16 +5136,19 @@ 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 applique les dates d'accès/ modification\n" -" des fichiers SOURCES aux fichiers de " -"destination correspondants\n" -" -s, --strip enleve les tables des symboles\n" -" --strip-program=PROGRAMME qui enlève la table des symboles du binaire\n" -" -S, --suffix=SUFFIXE se substitue au SUFFIXE usuel d'archivage\n" -" -t, --target-directory=RÉPERTOIRE copie tous les arguments de la SOURCE " -"dans RÉPERTOIRE\n" -" -T, --no-target-directory traite DEST comme un fichier normal\n" -" -v, --verbose affiche le nom de chaque répertoire créé\n" +" -p, --preserve-timestamps appliquer les dates d'accès ou de modification " +"des\n" +" fichiers SOURCES aux fichiers de destination\n" +" correspondants\n" +" -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" +" -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 msgid "" @@ -5079,11 +5156,12 @@ msgid "" " -Z, --context=CONTEXT set SELinux security context of files and " "directories\n" msgstr "" -" --preserve-context préserve le contexte de sécurité SELinux\n" -" -Z, --context=CONTEXT établit le contexte de sécurité SELinux des " -"fichiers et répertoires\n" +" --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" -#: src/install.c:858 +#: src/install.c:859 #, c-format msgid "" "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled" @@ -5091,71 +5169,70 @@ msgstr "" "Attention : --preserve-context a été ignoré car SELinux n'est pas activé sur " "ce noyau." -#: src/install.c:868 +#: src/install.c:869 #, c-format msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled" msgstr "" "Attention : --context (-Z) a été ignoré car SELinux n'est pas activé sur ce " "noyau" -#: src/install.c:885 +#: src/install.c:886 #, 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 " +"l'option --strip ne peut pas être utilisée lors de l'installation d'un " "répertoire" -#: src/install.c:888 +#: src/install.c:889 #, c-format msgid "target directory not allowed when installing a directory" msgstr "" -"un répertoire cible n'est pas autorisé à l'installation d'un répertoire" +"un répertoire cible n'est pas autorisé lors de l'installation d'un répertoire" -#: src/install.c:892 +#: 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:946 src/mkdir.c:202 src/stdbuf.c:327 +#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326 #, c-format msgid "invalid mode %s" -msgstr "mode non valide %s" +msgstr "mode %s incorrect" -#: src/install.c:953 +#: src/install.c:954 #, 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é spécifiée" +"été indiquée" -#: src/install.c:958 +#: src/install.c:959 #, c-format msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive" msgstr "" -"les options --compate (-C) et --preserve-timestamps sont mutuellement " -"exclusifs" +"les options --compare (-C) et --preserve-timestamps sont mutuellement " +"exclusives" -#: src/install.c:965 +#: src/install.c:966 #, c-format msgid "options --compare (-C) and --strip are mutually exclusive" msgstr "les options --compare (-C) et --strip sont mutuellement exclusives" -#: src/install.c:971 +#: src/install.c:972 #, c-format msgid "" "the --compare (-C) option is ignored when you specify a mode with non-" "permission bits" msgstr "" -"l'option --compare (-C) est ignorée quand un mode sans bit de permission est " -"spécifié" +"l'option --compare (-C) est ignorée quand un mode sans bit de droits est " +"indiqué" #. This is a proper name. See the gettext manual, section Names. -#: src/join.c:40 src/sort.c:65 +#: src/join.c:40 src/sort.c:66 msgid "Mike Haertel" msgstr "Mike Haertel" #: src/join.c:191 -#, fuzzy 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" @@ -5165,32 +5242,29 @@ msgid "" " FILENUM is 1 or 2, corresponding to FILE1 or FILE2\n" " -e EMPTY replace missing input fields with EMPTY\n" msgstr "" -"Pour chaque paire de lignes en entrée ayant des champs de fusion " -"identiques,\n" -"affiche une ligne sur la sortie standard.\n" +"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 FILE1 ou FILE2 (pas les 2) est -, lit l'entrée standard.\n" +"Si soit FILE1, soit FILE2 (pas les 2) est -, lire l'entrée standard.\n" "\n" -" -a FILENUM affiche les lignes non associables provenant du fichier\n" -" FILENUM, où FILENUM est 1 ou 2, correspondant à FILE1 " -"ou\n" -" FILE2\n" -" -e EMPTY remplace les champs d'entrée manquants par EMPTY\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" #: src/join.c:200 -#, fuzzy 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 ignore la casse lors de la comparaison de champs\n" +" -i, --ignore-case ignorer la casse lors de la comparaison de champs\n" " -j FIELD équivalent à « -1 FIELD -2 FIELD »\n" -" -o FORMAT respecte FORMAT lors de la construction de la ligne\n" -" de sortie\n" -" -t CHAR utilise CHAR comme délimiteur de champs d'entrée et\n" -" de sortie\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" #: src/join.c:206 msgid "" @@ -5203,20 +5277,20 @@ 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 supprime les lignes jointes sur " -"la\n" -" sortie\n" -" -1 FIELD fusionne sur le champ FIELD du fichier 1\n" -" -2 FIELD fusionne sur le champ FIELD du fichier 2\n" -" --check-order vérifie 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 vérifie pas que l'entrée est correctement triée\n" -" --header traite la première ligne de chaque ligne comme un champ\n" -" d'en-tête de ligne et les affiche sans essayer de les\n" -" appairer\n" +" -v FILENUM comme -a FILENUM, 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" +" --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" +" --header traiter la première ligne de chaque fichier comme un " +"champ\n" +" d'en-tête de ligne et les afficher sans essayer de " +"les\n" +" appairer\n" #: src/join.c:218 -#, fuzzy msgid "" "\n" "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n" @@ -5245,33 +5319,32 @@ msgstr "" "les champs restants de FILE1 et enfin ceux de FILE2, tous séparés par CHAR.\n" "\n" "Important : FILE1 et FILE2 doivent être triés sur les champs de jointure.\n" -"Par ex., utilisez « sort -k 1b,1 » si « join » n'a pas d'option, ou " -"utilisez\n" -"« join -t '' » si « sort » n'a pas d'option.\n" -"À noter, que les comparaisons s'effectuent selon les règles définies par\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 #, c-format -msgid "%s:%ju: is not sorted: %.*s" -msgstr "%s:%ju: n'est pas trié : %.*s" +msgid "%s:%<PRIuMAX>: is not sorted: %.*s" +msgstr "%s:%<PRIuMAX> : n'est pas trié : %.*s" #: src/join.c:840 src/join.c:1038 #, c-format msgid "invalid field number: %s" -msgstr "numéro de champ non valide : %s" +msgstr "numéro de champ incorrect : %s" #: src/join.c:861 src/join.c:870 #, c-format msgid "invalid field specifier: %s" -msgstr "spécificateur de champ non valide : %s" +msgstr "spécificateur de champ incorrect : %s" #: src/join.c:877 #, c-format msgid "invalid file number in field spec: %s" -msgstr "numéro de fichier non valide le champ spécifié : %s" +msgstr "numéro de fichier incorrect dans la spécification de champ : %s" #: src/join.c:920 #, c-format @@ -5283,12 +5356,12 @@ msgstr "jonction incompatible des champs %lu, %lu" msgid "conflicting empty-field replacement strings" msgstr "chaînes de remplacement de champ vide conflictuelles" -#: src/join.c:1101 src/sort.c:4414 +#: src/join.c:1101 src/sort.c:4468 #, c-format msgid "multi-character tab %s" -msgstr "tab multi-caractères %s" +msgstr "tabulation multicaractère %s" -#: src/join.c:1105 src/sort.c:4419 +#: src/join.c:1105 src/sort.c:4473 #, c-format msgid "incompatible tabs" msgstr "tabulations incompatibles" @@ -5296,7 +5369,7 @@ msgstr "tabulations incompatibles" #: src/join.c:1174 #, c-format msgid "both files cannot be standard input" -msgstr "les deux fichiers ne peuvent pas être l'entrée standard." +msgstr "les fichiers ne peuvent pas être tous les deux l'entrée standard." #: src/kill.c:76 #, c-format @@ -5310,14 +5383,10 @@ msgstr "" " ou : %s -t [SIGNAL]...\n" #: src/kill.c:82 -msgid "" -"Send signals to processes, or list signals.\n" -"\n" -msgstr "" -"Transmet les signaux aux processus ou liste les signaux.\n" -"\n" +msgid "Send signals to processes, or list signals.\n" +msgstr "Transmettre les signaux aux processus ou afficher les signaux.\n" -#: src/kill.c:89 +#: src/kill.c:88 msgid "" " -s, --signal=SIGNAL, -SIGNAL\n" " specify the name or number of the signal to be sent\n" @@ -5326,14 +5395,12 @@ msgid "" " -t, --table print a table of signal information\n" msgstr "" " -s, --signal=SIGNAL, -SIGNAL\n" -" utilise le nom ou le numéro du signal à transmettre.\n" -" -l, --list liste les noms de signaux, ou converti les noms de " -"signaux\n" -" vers/depuis des nombres\n" -" -t, --table affiche la table d'informations sur les signaux\n" +" indiquer le nom ou le numéro du signal à transmettre.\n" +" -l, --list afficher les noms de signaux, ou convertir les noms de\n" +" signaux vers ou depuis des nombres\n" +" -t, --table afficher le tableau de renseignements sur les signaux\n" -#: src/kill.c:97 -#, fuzzy +#: src/kill.c:96 msgid "" "\n" "SIGNAL may be a signal name like 'HUP', or a signal number like '1',\n" @@ -5343,38 +5410,38 @@ msgstr "" "\n" "SIGNAL peut être un nom de signal comme « HUP » ou un numéro de signal " "comme\n" -"« 1 », ou un statut de fin d'un processus terminé par un signal.\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:206 +#: src/kill.c:205 #, c-format msgid "%s: invalid process id" -msgstr "%s : id de processus non valide" +msgstr "%s : identifiant de processus incorrect" -#: src/kill.c:260 +#: src/kill.c:259 #, c-format msgid "invalid option -- %c" -msgstr "option non valide --%c" +msgstr "option incorrecte — %c" -#: src/kill.c:269 +#: src/kill.c:268 #, c-format msgid "%s: multiple signals specified" -msgstr "%s : multiples signaux spécifiés" +msgstr "%s : plusieurs signaux indiqués" -#: src/kill.c:283 +#: src/kill.c:282 #, c-format msgid "multiple -l or -t options specified" -msgstr "multiples options -l ou -t spécifiées" +msgstr "plusieurs options -l ou -t indiquées" -#: src/kill.c:300 +#: src/kill.c:299 #, c-format msgid "cannot combine signal with -l or -t" msgstr "impossible de combiner le signal avec -l or -t" -#: src/kill.c:306 +#: src/kill.c:305 #, c-format msgid "no process ID specified" -msgstr "aucun ID de processus spécifié" +msgstr "aucun identifiant de processus indiqué" #: src/libstdbuf.c:109 #, c-format @@ -5384,7 +5451,7 @@ msgstr "impossible d'allouer un tampon stdio de %<PRIuMAX> octets\n" #: src/libstdbuf.c:116 #, c-format msgid "invalid buffering mode %s for %s\n" -msgstr "mode %s de mise en tampon pour %s non valide\n" +msgstr "mode %s de mise en tampon incorrect pour %s\n" #: src/libstdbuf.c:124 #, c-format @@ -5410,7 +5477,7 @@ msgid "" "Call the link function to create a link named FILE2 to an existing FILE1.\n" "\n" msgstr "" -"Exécute 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é FILE2 sur le FILE1\n" "existant.\n" #: src/link.c:90 @@ -5421,17 +5488,17 @@ msgstr "impossible de créer le lien %s sur %s" #: src/ln.c:190 #, c-format msgid "%s: hard link not allowed for directory" -msgstr "%s: lien direct non permis pour un répertoire" +msgstr "%s : lien direct non permis pour un répertoire" #: src/ln.c:255 #, c-format msgid "%s: cannot overwrite directory" -msgstr "%s: ne peut écraser le répertoire" +msgstr "%s : impossible d'écraser le répertoire" #: src/ln.c:260 #, c-format msgid "%s: replace %s? " -msgstr "%s: remplacer %s? " +msgstr "%s : faut-il remplacer %s ? " #: src/ln.c:345 #, c-format @@ -5441,7 +5508,7 @@ msgstr "impossible de créer le lien symbolique %s" #: src/ln.c:346 #, c-format msgid "failed to create symbolic link %s -> %s" -msgstr "impossible de créer le lien symbolique %s -> %s" +msgstr "impossible de créer le lien symbolique %s → %s" #: src/ln.c:348 #, c-format @@ -5456,7 +5523,7 @@ msgstr "impossible de créer le lien direct %s" #: src/ln.c:352 #, c-format msgid "failed to create hard link %s => %s" -msgstr "impossible de créer le lien direct %s => %s" +msgstr "impossible de créer le lien direct %s → %s" #: src/ln.c:374 #, c-format @@ -5472,7 +5539,6 @@ msgstr "" " ou : %s [OPTION]... -t DIRECTORY TARGET... (4e format)\n" #: src/ln.c:381 -#, fuzzy 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" @@ -5482,20 +5548,22 @@ msgid "" "When creating hard links, each TARGET must exist. Symbolic links\n" "can hold arbitrary text; if later resolved, a relative link is\n" "interpreted in relation to its parent directory.\n" -"\n" msgstr "" -"Dans le 1er format, crée un lien vers TARGET avec le nom LINK_NAME.\n" -"Dans le 2e format, crée un lien vers TARGET dans le répertoire actuel.\n" -"Dans le 3e et 4e format, crée des liens vers chaque TARGET dans DIRECTORY.\n" -"Crée des liens directs par défaut et des liens symboliques avec --symbolic.\n" +"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" +"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" "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" -"\n" -#: src/ln.c:395 +#: src/ln.c:394 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -5507,21 +5575,21 @@ msgid "" "superuser)\n" " -f, --force remove existing destination files\n" msgstr "" -" --backup[=CONTROL] archive chaque fichier existant de " -"destination\n" +" --backup[=CONTROL] archiver chaque fichier de destination " +"existant\n" " -b identique à --backup mais n'accepte pas " "d'argument\n" -" -d, -F, --directory permet au super utilisateur de créer des " +" -d, -F, --directory permettre au superutilisateur de créer des " "liens\n" -" directs (hard) sur des répertoires (échouera\n" -" probablement en raisons de restrictions " +" directs (hard) sur des répertoires " +"(échouera\n" +" probablement en raison de restrictions " "système\n" -" même pour le super utilisateur)\n" -" -f, --force supprime les fichiers de destination " +" même pour le superutilisateur)\n" +" -f, --force supprimer les fichiers de destination " "existants\n" -#: src/ln.c:403 -#, fuzzy +#: src/ln.c:402 msgid "" " -i, --interactive prompt whether to remove destinations\n" " -L, --logical dereference TARGETs that are symbolic links\n" @@ -5532,16 +5600,21 @@ msgid "" "location\n" " -s, --symbolic make symbolic links instead of hard links\n" msgstr "" -" -i, --interactive demande s'il faut supprimer les destinations\n" -" -L, --logical modifie les liens directs en liens " +" -i, --interactive demander s'il faut supprimer les destinations\n" +" -L, --logical déréférencer les TARGETs qui sont des liens\n" +" symboliques\n" +" -n, --no-dereference traiter LINK_NAME 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 " "symboliques\n" -" -n, --no-dereference gère la destination d'un lien symbolique vers\n" -" un répertoire comme un fichier normal \n" -" -s, --symbolic crée un lien symbolique au lieu d'un lien " +" -r, --relative créer des liens symbolique relatifs à\n" +" l'emplacement du lien\n" +" -s, --symbolic créer un lien symbolique au lieu d'un lien " "direct\n" -#: src/ln.c:412 -#, fuzzy +#: src/ln.c:411 msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" " -t, --target-directory=DIRECTORY specify the DIRECTORY in which to " @@ -5550,38 +5623,25 @@ 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 écrase le suffixe d'archivage usuel\n" -" -t, --target-directory=DIRECTORY spécifie le DIRECTORY dans lequel les " -"liens\n" -" seront créés\n" -" -T, --no-target-directory traite LINK_NAME comme un fichier normal\n" -" -v, --verbose affiche le nom de chaque fichier lié\n" +" -S, --suffix=SUFFIX écraser le suffixe d'archivage habituel\n" +" -t, --target-directory=DIRECTORY indiquer le DIRECTORY dans lequel créer\n" +" les liens\n" +" -T, --no-target-directory toujours traiter LINK_NAME comme un fichier " +"normal\n" +" -v, --verbose afficher le nom de chaque fichier lié\n" -#: src/ln.c:428 -#, fuzzy +#: src/ln.c:433 +#, c-format 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 n'archive jamais (même si --backup est utilisé)\n" -" numbered, t effectue des archives numérotées\n" -" existing, nil numérote si des archives numérotées existent déjà, se\n" -" comporte comme « simple » dans le cas contraire \n" -" simple, never effectue toujours des archives simples\n" - -#: src/ln.c:435 -#, fuzzy, c-format -msgid "" "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" "L'utilisation de -s ignore -L et -P. Autrement, la dernière option indiquée\n" -"contrôle le comportement lorsque la source est un lien symbolique, " +"contrôle le comportement lorsqu'une TARGET est un lien symbolique, " "utilisant\n" -"par défaut %s.\n" +"%s par défaut.\n" #: src/ln.c:554 #, c-format @@ -5589,14 +5649,14 @@ msgid "cannot combine --target-directory and --no-target-directory" msgstr "impossible de combiner --target-directory et --no-target-directory" #: src/ln.c:588 -#, fuzzy, c-format +#, c-format msgid "cannot do --relative without --symbolic" -msgstr "impossible de créer le lien symbolique %s" +msgstr "impossible de faire --relative sans --symbolic" #. This is a proper name. See the gettext manual, section Names. #: src/logname.c:30 msgid "FIXME: unknown" -msgstr "FIXME : inconnu" +msgstr "À corriger : inconnu" #: src/logname.c:39 src/sync.c:40 #, c-format @@ -5608,7 +5668,7 @@ msgid "" "Print the name of the current user.\n" "\n" msgstr "" -"Affiche le nom de l'utilisateur actuel.\n" +"Afficher le nom de l'utilisateur actuel.\n" "\n" #: src/logname.c:84 @@ -5638,43 +5698,42 @@ msgstr "%e %b %H:%M" #, c-format msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" msgstr "" -"ignore la valeur non valide de la variable d'environnement QUOTING_STYLE : %s" +"valeur incorrecte de la variable d'environnement QUOTING_STYLE ignorée : %s" #: src/ls.c:1599 #, c-format msgid "ignoring invalid width in environment variable COLUMNS: %s" -msgstr "" -"ignore la largeur non valide de la variable d'environnement COLUMNS : %s" +msgstr "largeur incorrecte de la variable d'environnement COLUMNS ignorée : %s" #: src/ls.c:1629 #, c-format msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "" -"ignore la la taille de tabulation de la variable d'environnement TABSIZE :%s" +"taille de tabulation incorrecte de la variable d'environnement TABSIZE " +"ignorée :%s" -#: src/ls.c:1750 src/ptx.c:1976 +#: src/ls.c:1750 src/ptx.c:1975 #, c-format msgid "invalid line width: %s" -msgstr "largeur de ligne non valide : %s" +msgstr "largeur de ligne incorrecte : %s" #: src/ls.c:1824 #, c-format msgid "invalid tab size: %s" -msgstr "taille de tabulation non valide : %s" +msgstr "taille de tabulation incorrecte : %s" #: src/ls.c:2033 #, c-format msgid "invalid time style format %s" -msgstr "format de style de temps non valide %s" +msgstr "format de style de temps %s incorrect" #: src/ls.c:2057 -#, fuzzy msgid "Valid arguments are:\n" -msgstr "Les arguments valides sont :" +msgstr "Les arguments possible sont :\n" #: src/ls.c:2061 msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" -msgstr "" +msgstr " - +FORMAT (par exemple +%H:%M) pour un format de type « date »\n" #: src/ls.c:2096 #, c-format @@ -5700,12 +5759,12 @@ msgstr "impossible d'ouvrir le répertoire %s" #: src/ls.c:2529 #, c-format msgid "cannot determine device and inode of %s" -msgstr "impossible de déterminer le périphérique et l'inode de %s" +msgstr "impossible de déterminer le périphérique et l'inœud de %s" #: src/ls.c:2538 #, c-format msgid "%s: not listing already-listed directory" -msgstr "%s : impossible de lister un répertoire déjà listé" +msgstr "%s : impossible d'afficher un répertoire déjà affiché" #: src/ls.c:2615 src/pwd.c:229 #, c-format @@ -5717,7 +5776,7 @@ msgstr "lecture du répertoire %s" msgid "closing directory %s" msgstr "fermeture du répertoire %s" -#: src/ls.c:3301 +#: src/ls.c:3302 #, c-format msgid "cannot compare file names %s and %s" msgstr "impossible de comparer les noms de fichier %s et %s" @@ -5726,14 +5785,14 @@ msgstr "impossible de comparer les noms de fichier %s et %s" msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" -"\n" msgstr "" -"Liste des informations à propos des FILE(s) (du répertoire actuel par " +"Afficher des renseignements sur les FILEs (du répertoire actuel par " "défaut).\n" -"Trie les entrées alphabétiquement si aucune des options -cftuvSUX ou --sort\n" -"n'est utilisées.\n" +"Trier les entrées alphabétiquement si aucune des options -cftuvSUX ou --" +"sort\n" +"ne sont utilisées.\n" -#: src/ls.c:4729 +#: src/ls.c:4728 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -5741,14 +5800,14 @@ msgid "" " -b, --escape print C-style escapes for nongraphic " "characters\n" msgstr "" -" -a, --all n'ignore pas les entrées débutant par .\n" -" -A, --almost-all n'inclut pas dans la liste . et ..\n" -" --author avec -l, affiche l'auteur de chaque fichier\n" -" -b, --escape affiche les caractères non-graphiques par des\n" -" échappements selon le style C\n" +" -a, --all ne pas ignorer les entrées débutant par .\n" +" -A, --almost-all ne pas inclure . ou .. dans la liste\n" +" --author avec -l, afficher l'auteur de chaque fichier\n" +" -b, --escape afficher les caractères non graphiques avec " +"des\n" +" protections selon le style C\n" -#: src/ls.c:4735 -#, fuzzy +#: src/ls.c:4734 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them. E." "g.,\n" @@ -5761,24 +5820,24 @@ msgid "" " with -l: show ctime and sort by name\n" " otherwise: sort by ctime, newest first\n" msgstr "" -" --block-size=SIZE convertit les tailles en SIZE avant de les " -"afficher.\n" -" Par ex., « --block-size=M » affiche les tailles " -"en\n" -" unités de 1 048 576 octets. Voir le format " -"SIZE\n" -" ci-dessous.\n" -" -B, --ignore-backups n'inclut pas dans la liste, les entrées se\n" -" terminant par ~\n" -" -c avec -lt : affiche et tri selon ctime (date de\n" -" dernière modification provenant des " -"informations de\n" -" statut du fichier)\n" -" avec -l : affiche ctime et tri selon le nom\n" -" autrement : tri selon ctime\n" - -#: src/ls.c:4745 -#, fuzzy +" --block-size=SIZE convertir les tailles en SIZE 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" +" -B, --ignore-backups ne pas inclure les entrées se terminant par ~ " +"dans\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" +" avec -l : afficher ctime et trier selon le " +"nom\n" +" autrement : trier selon ctime\n" + +#: src/ls.c:4744 msgid "" " -C list entries by columns\n" " --color[=WHEN] colorize the output. WHEN defaults to " @@ -5789,20 +5848,20 @@ msgid "" " and do not dereference symbolic links\n" " -D, --dired generate output designed for Emacs' dired mode\n" msgstr "" -" -C liste les noms en colonnes\n" -" --color[=WHEN] colore la sortie. Par défaut, WHEN est défini " +" -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 liste les noms de répertoires plutôt que leur\n" -" contenu et ne déréférence pas les liens " +" « 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ére une sortie adaptée pour le mode " -"« dired » de\n" -" Emacs\n" +" -D, --dired générer une sortie adaptée au mode « dired »\n" +" d'Emacs\n" -#: src/ls.c:4753 -#, fuzzy +#: src/ls.c:4752 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -5811,26 +5870,26 @@ msgid "" " single-column -1, verbose -l, vertical -C\n" " --full-time like -l --time-style=full-iso\n" msgstr "" -" -f ne trie pas, active -aU, désactive -ls --color\n" -" -F, --classify ajoute un indicateur (parmi */=>@|) aux " +" -f ne pas trier, activer -aU, désactiver -ls --" +"color\n" +" -F, --classify ajouter un indicateur (parmi */=>@|) aux " "entrées\n" " --file-type identique mais sans ajout de « * »\n" -" --format=WORD « across » -x (croisé),\n" -" « commas » -m (avec virgules),\n" -" « horizontal » -x (horizontal),\n" -" « long » -l (long),\n" -" « single-column » -1 (colonne simple),\n" -" « verbose » -l (verbeux),\n" -" « vertical » -C (vertical)\n" +" --format=WORD « across » -x (croisé), « commas » -m (avec\n" +" virgules), « horizontal » -x (horizontal),\n" +" « long » -l (long), « single-column » -1 " +"(une\n" +" seule colonne), « verbose » -l (bavard),\n" +" « vertical » -C (vertical)\n" " --full-time identique à -l --time-style=full-iso\n" -#: src/ls.c:4761 +#: src/ls.c:4760 msgid " -g like -l, but do not list owner\n" msgstr "" -" -g identique à -l mais n'affiche pas le " +" -g identique à -l mais sans afficher le " "propriétaire\n" -#: src/ls.c:4764 +#: src/ls.c:4763 msgid "" " --group-directories-first\n" " group directories before files.\n" @@ -5838,29 +5897,29 @@ msgid "" " use of --sort=none (-U) disables grouping\n" msgstr "" " --group-directories-first\n" -" regroupe les répertoires avant les fichiers.\n" -" augmente avec l'option a --sort, mais tout " -"usage\n" -" de --sort=none (-U) inhibe le regroupement\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" +" regroupement\n" -#: src/ls.c:4770 +#: src/ls.c:4769 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" " (e.g., 1K 234M 2G)\n" " --si likewise, but use powers of 1000 not 1024\n" msgstr "" -" -G, --no-group dans une longue liste, n'affiche pas les noms " +" -G, --no-group dans une longue liste, ne pas afficher les noms " "de\n" -" groupe\n" -" -h, --human-readable avec -l affiche les tailles dans un format " +" groupe\n" +" -h, --human-readable avec -l, afficher les tailles au format " "lisible\n" -" par un humain (p. ex. 1K, 234M ou 2G)\n" -" --si similaire, mais utilise une puissance de 1 000 " +" (par exemple 1K, 234M ou 2G)\n" +" --si similaire, mais utiliser une puissance de 1 000 " "au\n" -" lieu de 1 024\n" +" lieu de 1 024\n" -#: src/ls.c:4776 +#: src/ls.c:4775 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5873,18 +5932,16 @@ msgid "" " (overridden by -a or -A)\n" msgstr "" " -H, --dereference-command-line\n" -" suit les liens symboliques de la ligne de " +" suivre les liens symboliques en ligne de " "commande\n" " --dereference-command-line-symlink-to-dir\n" -" suit chaque lien symbolique de la ligne de " -"commande\n" -" qui pointe vers un répertoire\n" -" --hide=PATTERN ne liste pas les entrées implicites concordant\n" -" avec le PATTERN de shell (surdéfini par -a ou -" -"A)\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" +" (écrasé par -a ou -A)\n" -#: src/ls.c:4786 -#, fuzzy +#: src/ls.c:4785 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -5895,21 +5952,23 @@ msgid "" "PATTERN\n" " -k, --kibibytes use 1024-byte blocks\n" msgstr "" -" --indicator-style=WORD ajoute un indicateur de type à chaque entrée, " +" --indicator-style=WORD ajouter un indicateur de type à chaque entrée, " "en\n" -" respectant le style indiqué par WORD :\n" -" « none » (aucun suffixe, par défaut),\n" -" « slash » (barre oblique, comme l'option -p),\n" -" « file-type » (type de fichier, comme --file-" -"type)\n" -" ou « classify » (classé, commme l'option -F)\n" -" -i, --inode affiche le numéro d'index de chaque fichier\n" -" -I, --ignore=PATTERN ne liste pas les entrées implicites concordant " -"avec\n" -" le PATTERN du shell\n" -" -k identique à --block-size=1K\n" - -#: src/ls.c:4796 +" respectant le style indiqué par WORD : " +"« none »\n" +" (aucun suffixe, par défaut), " +"« slash » (barre\n" +" oblique, comme l'option -p), « file-" +"type » (type\n" +" de fichier, comme --file-type) ou " +"« 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" + +#: src/ls.c:4795 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5918,16 +5977,14 @@ msgid "" " -m fill width with a comma separated list of " "entries\n" msgstr "" -" -l utilise le format long d'affichage\n" -" -L, --dereference affiche les informations des fichiers " -"référencés\n" -" par les liens symboliques plutôt que sur le " -"lien\n" -" symbolique lui-même\n" -" -m remplit la largeur avec une liste d'entrées\n" -" séparées par des virgules\n" +" -l utiliser le format long d'affichage\n" +" -L, --dereference afficher les renseignements sur les fichiers\n" +" référencés par les liens symboliques plutôt\n" +" que sur les liens symboliques eux-mêmes\n" +" -m remplir la largeur avec une liste d'entrées\n" +" séparées par des virgules\n" -#: src/ls.c:4804 +#: src/ls.c:4803 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. " @@ -5937,20 +5994,17 @@ msgid "" " -p, --indicator-style=slash\n" " append / indicator to directories\n" msgstr "" -" -n, --numeric-uid-gid identique à -l mais liste les valeurs " -"numériques\n" -" des ID d'utilisateur et de groupe\n" -" -N, --literal affiche les noms bruts (sans traiter les " -"caractères\n" -" de contrôle spécialement par exemple)\n" -" -o identique à -l mais ne liste pas les " +" -n, --numeric-uid-gid identique à -l, mais afficher les valeurs\n" +" numériques des UID et GID\n" +" -N, --literal afficher les noms bruts (sans traiter " +"spécialement\n" +" les caractères de contrôle par exemple)\n" +" -o identique à -l mais sans afficher les " "informations\n" -" de groupe\n" -" -p, --indicator-style=slash\n" -" ajoute l'indicateur « / » aux répertoires\n" +" de groupe\n" +" -p, --indicator-style=slash ajouter l'indicateur « / » aux répertoires\n" -#: src/ls.c:4812 -#, fuzzy +#: src/ls.c:4811 msgid "" " -q, --hide-control-chars print ? instead of non graphic characters\n" " --show-control-chars show non graphic characters as-is (default\n" @@ -5961,31 +6015,32 @@ msgid "" " literal, locale, shell, shell-always, c, " "escape\n" msgstr "" -" -q, --hide-control-chars affiche « ? » au lieu de caractères non-" +" -q, --hide-control-chars afficher « ? » au lieu de caractères non " "graphiques\n" -" --show-control-chars affiche les caractères non graphiques tel quel " -"(par\n" -" défaut)\n" -" -Q, --quote-name encapsule chaque nom d'entrée entre guillemets\n" -" --quoting-style=WORD utilise le style d'encapsultation défini par\n" -" WORD : « literal », « shell », « shell-" +" --show-control-chars afficher les caractères non graphiques tel " +"quel\n" +" (par défaut)\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" +" « c » ou « escape »\n" -#: src/ls.c:4821 +#: src/ls.c:4820 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 inverse l'ordre de tri\n" -" -R, --recursive liste récursivement les sous-répertoires \n" -" -s, --size affiche la taille d'allocation de chaque " +" -r, --reverse inverser l'ordre de tri\n" +" -R, --recursive afficher récursivement les sous-répertoires\n" +" -s, --size afficher la taille d'allocation de chaque " "fichier,\n" -" en blocs\n" +" en bloc\n" -#: src/ls.c:4826 +#: src/ls.c:4825 msgid "" " -S sort by file size\n" " --sort=WORD sort by WORD instead of name: none -U,\n" @@ -5996,21 +6051,22 @@ msgid "" " or status -c; use specified time as sort key\n" " if --sort=time\n" msgstr "" -" -S trie selon la taille des fichiers\n" -" --sort=WORD trie selon WORD au lieu du nom :\n" -" « none » (aucun, -U),\n" -" « extension » (extension, -X),\n" -" « size » (taille, -S), « date » (date, -t),\n" -" « version » (version, -v)\n" -" --time=WORD avec -l, affiche la date selon WORD au lieu de\n" -" la date de modification :\n" -" « atime » -u, « access » -u, « use » -u,\n" -" « ctime » -c, ou « status » -c ; utilise la " -"date\n" -" spécifiée comme clé de tri si --sort=time\n" - -#: src/ls.c:4836 -#, fuzzy +" -S trier selon la taille des fichiers\n" +" --sort=WORD trier selon WORD 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" + +#: src/ls.c:4835 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, +FORMAT.\n" @@ -6021,31 +6077,30 @@ msgid "" " if STYLE is prefixed with 'posix-', STYLE\n" " takes effect only outside the POSIX locale\n" msgstr "" -" --time-style=STYLE avec -l, affiche les dates selon STYLE :\n" -" « full-iso », « long-iso », « iso », " -"« locale »,\n" -" « +FORMAT ». FORMAT est interprété comme " -"« date » ;\n" -" si FORMAT est FORMAT1<nouvelle ligne>FORMAT2,\n" -" FORMAT1 s'applique aux fichiers non récents et\n" -" FORMAT2 aux fichiers récents ;\n" -" si STYLE est préfixé par « posix- », STYLE " -"prend\n" -" seulement effet en dehors de la localisation " -"POSIX\n" +" --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" +" 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" +" préfixé par « posix- », STYLE ne prend effet\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:4845 +#: src/ls.c:4844 msgid "" " -t sort by modification time, newest first\n" " -T, --tabsize=COLS assume tab stops at each COLS instead of 8\n" msgstr "" -" -t trie selon la date de modification, récent " +" -t trier selon la date de modification, récent " "d'abord\n" -" -T, --tabsize=COLS utilise des tabulations à chaque COLS au lieu " +" -T, --tabsize=COLS utiliser des tabulations à chaque COLS au lieu " "de 8\n" -#: src/ls.c:4849 +#: src/ls.c:4848 msgid "" " -u with -lt: sort by, and show, access time\n" " with -l: show access time and sort by name\n" @@ -6053,16 +6108,18 @@ msgid "" " -U do not sort; list entries in directory order\n" " -v natural sort of (version) numbers within text\n" msgstr "" -" -u avec -lt, affiche et tri selon la date d'accès\n" -" avec -l, affiche la date d'accès et tri par " -"nom\n" -" sinon tri selon la date d'accès\n" -" -U ne trie pas, liste les entrées dans l'ordre du\n" -" répertoire\n" +" -u avec -lt, afficher et trier selon la date " +"d'accès ;\n" +" avec -l, afficher la date d'accès et trier " +"par\n" +" nom ; sinon trier selon la date d'accès\n" +" -U ne pas trier, afficher les entrées dans l'ordre " +"du\n" +" répertoire\n" " -v tri naturel des numéros (de versions) dans le " "texte\n" -#: src/ls.c:4856 +#: src/ls.c:4855 msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" @@ -6071,17 +6128,18 @@ msgid "" "file\n" " -1 list one file per line\n" msgstr "" -" -w, --width=COLS définit la largeur de l'écran au lieu de la " +" -w, --width=COLS définir la largeur de l'écran au lieu de la " "valeur\n" -" actuelle\n" -" -x liste les entrées en ligne au lieu de colonne\n" -" -X trie alphabétiquement selon les extension des\n" -" entrées\n" -" -Z, --context affiche les contextes de sécurité SELinux de\n" -" chaque fichier\n" -" -1 liste un fichier par ligne\n" +" actuelle\n" +" -x afficher les entrées en ligne au lieu de " +"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" +" -1 afficher un fichier par ligne\n" -#: src/ls.c:4866 +#: src/ls.c:4865 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -6099,7 +6157,7 @@ msgstr "" "la\n" "commande dircolors pour le définir.\n" -#: src/ls.c:4873 +#: src/ls.c:4872 msgid "" "\n" "Exit status:\n" @@ -6108,12 +6166,13 @@ msgid "" " 2 if serious trouble (e.g., cannot access command-line argument).\n" msgstr "" "\n" -"Statut de sortie :\n" -" 0 si OK,\n" -" 1 si problème mineur (p. ex. impossible d'accéder à un sous-répertoire),\n" -" 2 si problème majeur (p. ex. impossible d'accéder à un argument de ligne " -"de\n" -" commande).\n" +"État de sortie :\n" +" 0 en cas de succès,\n" +" 1 en cas de problème mineur (comme impossible d'accéder à un sous-" +"répertoire),\n" +" 2 en cas de problème majeur (comme impossible d'accéder à un argument de " +"ligne\n" +" de commande).\n" #. This is a proper name. See the gettext manual, section Names. #: src/md5sum.c:94 src/seq.c:39 @@ -6130,7 +6189,7 @@ msgstr "Scott Miller" msgid "David Madore" msgstr "David Madore" -#: src/md5sum.c:162 +#: src/md5sum.c:164 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -6139,43 +6198,48 @@ msgid "" "\n" msgstr "" "Utilisation : %s [OPTION]... [FILE]...\n" -"Affiche ou vérifie les sommes de contrôle %s (%d-bits).\n" -"Sans FILE, ou quand FILE est -, lit l'entrée standard.\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" "\n" -#: src/md5sum.c:172 +#: src/md5sum.c:174 msgid "" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr "" -" -b, --binary lit en mode binaire (par défaut sauf si en lecture " +" -b, --binary lire en mode binaire (par défaut sauf en lecture " "depuis\n" -" tty stdin)\n" +" l'entrée standard de tty)\n" -#: src/md5sum.c:176 +#: src/md5sum.c:178 msgid " -b, --binary read in binary mode\n" -msgstr " -b, --binary lit en mode binaire\n" +msgstr " -b, --binary lire en mode binaire\n" # Ajout volontaire de place pour l'argument (Stéphane) -#: src/md5sum.c:179 +#: src/md5sum.c:181 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr "" -" -c, --check lit les sommes %s à partir des FILEs et\n" -" les vérifie\n" +" -c, --check lire les sommes %s à partir des FILEs et les " +"vérifier\n" + +#: src/md5sum.c:184 +msgid " --tag create a BSD-style checksum\n" +msgstr " --tag créer une somme de contrôle de type BSD\n" -#: src/md5sum.c:183 +#: src/md5sum.c:188 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" -" -t, --text lit en mode texte (par défaut en lecture depuis tty\n" -" stdin)\n" +" -t, --text lire en mode texte (par défaut sauf en lecture " +"depuis\n" +" l'entrée standard de tty)\n" -#: src/md5sum.c:187 +#: src/md5sum.c:192 msgid " -t, --text read in text mode (default)\n" -msgstr " -t, --text lit en mode texte (par défaut)\n" +msgstr " -t, --text lire en mode texte (par défaut)\n" -#: src/md5sum.c:190 +#: src/md5sum.c:195 msgid "" "\n" "The following three options are useful only when verifying checksums:\n" @@ -6185,25 +6249,24 @@ msgid "" "\n" msgstr "" "\n" -"Les trois options suivantes sont seulement utiles lors de la vérification\n" -"des sommes de contrôle :\n" -" --quiet n'affiche pas OK à chaque vérification correcte de\n" -" fichier\n" -" --status n'affiche rien, sauf le code de statut indiquant le\n" -" succès\n" -" -w, --warn avertit en cas de lignes de contrôle mal formatées\n" +"Les trois options suivantes sont utiles qu'en vérifiant des sommes 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" +" -w, --warn avertir en cas de lignes de contrôle mal formatées\n" "\n" -#: src/md5sum.c:198 +#: src/md5sum.c:203 msgid "" " --strict with --check, exit non-zero for any invalid input\n" msgstr "" -" --strict avec --check, quitte avec non-zéro sur toute entrée " -"non valide\n" +" --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:203 -#, fuzzy, c-format +#: src/md5sum.c:208 +#, c-format msgid "" "\n" "The sums are computed as described in %s. When checking, the input\n" @@ -6216,95 +6279,105 @@ msgstr "" "devrait être formellement une sortie de ce programme. Le mode par défaut " "est\n" "d'afficher la ligne avec la somme de contrôle, un caractère indiquant le " -"type\n" -"(« * » pour binaire, « » pour texte) et un nom pour chaque FICHIER.\n" +"mode\n" +"d'entrée (« * » pour binaire, espace pour texte) et un nom pour chaque " +"FICHIER.\n" -#: src/md5sum.c:502 +#: src/md5sum.c:523 #, c-format msgid "%s: too many checksum lines" msgstr "%s : trop de lignes de somme de contrôle" -#: src/md5sum.c:526 +#: src/md5sum.c:547 #, c-format msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line" -msgstr "%s : %<PRIuMAX>: ligne de somme de contrôle %s mal formatée" +msgstr "%s : %<PRIuMAX> : ligne de somme de contrôle %s mal formatée" -#: src/md5sum.c:551 +#: src/md5sum.c:572 #, c-format msgid "%s: FAILED open or read\n" -msgstr "%s : ÉCHEC d'ouverture ou de lecture.\n" +msgstr "%s : Échec d'ouverture ou de lecture.\n" -#: src/md5sum.c:574 +#: src/md5sum.c:595 msgid "FAILED" -msgstr "ÉCHEC" +msgstr "Échec" -#: src/md5sum.c:576 +#: src/md5sum.c:597 msgid "OK" -msgstr "OK" +msgstr "Réussi" -#: src/md5sum.c:600 +#: src/md5sum.c:621 #, 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:610 +#: src/md5sum.c:631 #, c-format msgid "WARNING: %<PRIuMAX> line is improperly formatted" msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted" -msgstr[0] "AVERTISSEMENT : la ligne %<PRIuMAX> n'est pas correctement formatée" +msgstr[0] "Attention : la ligne %<PRIuMAX> n'est pas correctement formatée" msgstr[1] "" -"AVERTISSEMENT : les lignes %<PRIuMAX> ne sont pas correctement formatées" +"Attention : les lignes %<PRIuMAX> ne sont pas correctement formatées" -#: src/md5sum.c:618 +#: src/md5sum.c:639 #, c-format msgid "WARNING: %<PRIuMAX> listed file could not be read" msgid_plural "WARNING: %<PRIuMAX> listed files could not be read" -msgstr[0] "AVERTISSEMENT : le fichier listé %<PRIuMAX> n'a pas pu être lu" -msgstr[1] "" -"AVERTISSEMENT : les fichiers listés %<PRIuMAX> n'ont pas pu être lus" +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:626 +#: src/md5sum.c:647 #, c-format msgid "WARNING: %<PRIuMAX> computed checksum did NOT match" msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match" -msgstr[0] "AVERTISSEMENT : la somme de contrôle %<PRIuMAX> ne concorde pas" -msgstr[1] "AVERTISSEMENT : les sommes de contrôle %<PRIuMAX> ne concordent pas" +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 +#, c-format +msgid "--tag does not support --text mode" +msgstr "--tag ne prend pas en charge le mode --text" + +#: src/md5sum.c:766 +#, 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:704 +#: src/md5sum.c:773 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" msgstr "" "les options --binary et --text sont sans effet lors de la la vérification " -"des\n" -"sommes de contrôle" +"des sommes de contrôle" -#: src/md5sum.c:712 +#: src/md5sum.c:781 #, 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\n" +"l'option --status n'a de sens que lors de la vérification des sommes de " "contrôle" -#: src/md5sum.c:719 +#: src/md5sum.c:788 #, 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:726 +#: src/md5sum.c:795 #, 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:733 +#: src/md5sum.c:802 #, 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\n" +"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 @@ -6313,14 +6386,10 @@ msgid "Usage: %s [OPTION]... DIRECTORY...\n" msgstr "Utilisation : %s [OPTION]... DIRECTORY...\n" #: src/mkdir.c:57 -msgid "" -"Create the DIRECTORY(ies), if they do not already exist.\n" -"\n" -msgstr "" -"Crée le(s) répertoire(s) DIRECTORY s'il(s) n'existe(nt) pas.\n" -"\n" +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" -#: src/mkdir.c:64 +#: src/mkdir.c:63 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" @@ -6328,17 +6397,16 @@ msgid "" " -Z, --context=CTX set the SELinux security context of each created\n" " directory to CTX\n" msgstr "" -" -m, --mode=MODE définit l'accès fichier à MODE (comme avec chmod),\n" -" et non a=rwx - umask\n" -" -p, --parents pas d'erreur si existant, crée les répertoires parents " -"si\n" -" nécessaire\n" -" -v, --verbose affiche un message pour chaque répertoire créé\n" -" -Z, --context=CTX définit à CTX le contexte de sécurité SELinux de " +" -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" +" répertoire créé\n" -#: src/mkdir.c:169 +#: src/mkdir.c:168 #, c-format msgid "created directory %s" msgstr "création du répertoire %s" @@ -6349,55 +6417,48 @@ msgid "Usage: %s [OPTION]... NAME...\n" msgstr "Utilisation : %s [OPTION]... NAME...\n" #: src/mkfifo.c:52 -msgid "" -"Create named pipes (FIFOs) with the given NAMEs.\n" -"\n" -msgstr "Crée des tubes nommés (FIFO) avec les noms NAMEs.\n" +msgid "Create named pipes (FIFOs) with the given NAMEs.\n" +msgstr "Créer des tubes nommés (FIFO) avec les noms NAMEs.\n" -#: src/mkfifo.c:59 src/mknod.c:61 +#: src/mkfifo.c:58 src/mknod.c:60 msgid "" " -m, --mode=MODE set file permission bits to MODE, not a=rw - umask\n" msgstr "" -" -m, --mode=MODE définit les bits de permission du fichier à MODE, non " -"pas\n" -" a=rw - umask\n" +" -m, --mode=MODE définir les bits de droits du fichier à MODE,\n" +" et non a=rw - umask\n" -#: src/mkfifo.c:62 +#: src/mkfifo.c:61 msgid "" " -Z, --context=CTX set the SELinux security context of each NAME to CTX\n" msgstr "" -" -Z, --context=CTX définit le contexte de sécurité SELinux de chaque NAME " -"à CTX\n" +" -Z, --context=CTX définir à CTX le contexte de sécurité SELinux de\n" +" chaque NAME\n" -#: src/mkfifo.c:122 src/mknod.c:128 +#: src/mkfifo.c:121 src/mknod.c:127 #, c-format msgid "invalid mode" -msgstr "mode non valide" +msgstr "mode incorrect" -#: src/mkfifo.c:127 src/mknod.c:133 +#: src/mkfifo.c:126 src/mknod.c:132 #, c-format msgid "mode must specify only file permission bits" -msgstr "le mode doit seulement spécifier les bits de permission de fichier" +msgstr "le mode ne doit indiquer que les bits de droits de fichier" #: src/mknod.c:52 #, c-format msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n" -msgstr "Utilisation : %s [OPTION]... NAME TYPE [MAHOR MINOR]\n" +msgstr "Utilisation : %s [OPTION]... NAME TYPE [MAJOR MINOR]\n" #: src/mknod.c:54 -msgid "" -"Create the special file NAME of the given TYPE.\n" -"\n" -msgstr "" -"Crée le fichier spécial avec le nom NAME et le TYPE donné.\n" -"\n" +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" -#: src/mknod.c:64 +#: src/mknod.c:63 msgid " -Z, --context=CTX set the SELinux security context of NAME to CTX\n" msgstr "" -" -Z, --context=CTX établit le contexte de sécurité SELinux de NAME à CTX\n" +" -Z, --context=CTX définir à CTX le contexte de sécurité SELinux de NAME\n" -#: src/mknod.c:69 +#: src/mknod.c:68 msgid "" "\n" "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n" @@ -6406,13 +6467,13 @@ msgid "" "otherwise, as decimal. TYPE may be:\n" msgstr "" "\n" -"À la fois MAJOR et MINOR doivent être spécifié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" -"ou 0X, est fourni, ils sont interprétés en hexadécimal ; autrement, s'ils\n" -"débutent par 0, ils le sont en octal et autrement en décimal. Le TYPE peut\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" +"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:76 +#: src/mknod.c:75 msgid "" "\n" " b create a block (buffered) special file\n" @@ -6420,49 +6481,49 @@ msgid "" " p create a FIFO\n" msgstr "" "\n" -" b crée un fichier spécial de type bloc (avec tampon)\n" -" c, u crée un fichier spécial de type caractère (sans tampon) \n" -" p crée un FIFO\n" +" b créer un fichier spécial de type bloc (avec tampon)\n" +" c, u créer un fichier spécial de type caractère (sans tampon)\n" +" p créer un FIFO\n" -#: src/mknod.c:151 +#: src/mknod.c:150 msgid "Special files require major and minor device numbers." msgstr "" -"Les fichiers spéciaux requièrent les numéros majeur et mineur de " +"Les fichiers spéciaux nécessitent les numéros majeur et mineur de " "périphériques." -#: src/mknod.c:161 +#: src/mknod.c:160 msgid "Fifos do not have major and minor device numbers." -msgstr "Les FIFO n'ont pas de numéros mineur et majeur de périphérique." +msgstr "Les FIFOs n'ont pas de numéros mineur et majeur de périphérique." -#: src/mknod.c:177 +#: src/mknod.c:176 #, c-format msgid "block special files not supported" msgstr "fichier spécial de bloc non pris en charge" -#: src/mknod.c:186 +#: src/mknod.c:185 #, c-format msgid "character special files not supported" msgstr "fichier spécial de caractères non pris en charge" -#: src/mknod.c:202 +#: src/mknod.c:201 #, c-format msgid "invalid major device number %s" -msgstr "numéro majeur de périphérique non valide %s" +msgstr "numéro majeur %s de périphérique incorrect" -#: src/mknod.c:207 +#: src/mknod.c:206 #, c-format msgid "invalid minor device number %s" -msgstr "numéro mineur de périphérique non valide %s" +msgstr "numéro mineur %s de périphérique incorrect" -#: src/mknod.c:212 +#: src/mknod.c:211 #, c-format msgid "invalid device %s %s" -msgstr "périphérique non valide %s %s" +msgstr "périphérique incorrect %s %s" -#: src/mknod.c:226 +#: src/mknod.c:225 #, c-format msgid "invalid device type %s" -msgstr "type de périphérique non valide %s" +msgstr "type de périphérique %s incorrect" #. This is a proper name. See the gettext manual, section Names. #: src/mktemp.c:37 @@ -6475,21 +6536,21 @@ msgid "Usage: %s [OPTION]... [TEMPLATE]\n" msgstr "Utilisation : %s [OPTION]... [TEMPLATE]\n" #: src/mktemp.c:69 -#, fuzzy 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ée un fichier ou un répertoire temporaire, sûr, et affiche son nom.\n" -"TEMPLATE doit contenir au moins 3 « X » consécutifs dans la partie finale.\n" -"Si TEMPLATE n'est pas spécifié, tmp.XXXXXXXXXX et --tmpdir sont utilisés.\n" +"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 " +"finale.\n" +"Si TEMPLATE n'est pas indiqué, tmp.XXXXXXXXXX et --tmpdir sont utilisés.\n" #: src/mktemp.c:74 msgid "" "Files are created u+rw, and directories u+rwx, minus umask restrictions.\n" msgstr "" -"Les fichers sont créés u+rw et les répertoires u+rwx, sauf restrictions de " +"Les fichiers sont créés u+rw et les répertoires u+rwx, sauf restrictions de " "umask.\n" #: src/mktemp.c:78 @@ -6498,11 +6559,10 @@ msgid "" " -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 crée un répertoire et non un fichier\n" -" -u, --dry-run ne crée rien, affiche seulement un nom (non sûr)\n" -" -q, --quiet n'affiche pas les diagnostiques sur l'échec de " -"création\n" -" du fichier/répertoire\n" +" -d, --directory créer un répertoire et non un fichier\n" +" -u, --dry-run ne rien créer, n'afficher qu'un nom (non sûr)\n" +" -q, --quiet ne pas afficher les diagnostiques d'échec de création\n" +" des fichiers ou répertoires\n" #: src/mktemp.c:83 msgid "" @@ -6511,11 +6571,9 @@ msgid "" " This option is implied if TEMPLATE does not end in " "X.\n" msgstr "" -" --suffix=SUFF ajoute SUFF à TEMPLATE, SUFF ne doit pas contenir de " -"barre\n" -" oblique. Cette option est utilisée si TEMPLATE ne " -"termine\n" -" pas par un X.\n" +" --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" #: src/mktemp.c:87 msgid "" @@ -6525,15 +6583,15 @@ msgid "" " Unlike with -t, TEMPLATE may contain slashes, but\n" " mktemp creates only the final component\n" msgstr "" -" --tmpdir[=DIR] interprète TEMPLATE en relation avec DIR. Si DIR " +" --tmpdir[=DIR] interpréter TEMPLATE en relation avec DIR. Si DIR " "n'est\n" -" pas spécifié, utilise $TMPDIR si défini ou /tmp " +" 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 " +" Avec cette option, TEMPLATE ne doit pas être un nom\n" +" absolu. Contrairement à -t, TEMPLATE peut contenir " "des\n" -" barres obliques, mais mktemp crée seulement la partie\n" -" finale\n" +" barres obliques, mais mktemp ne crée que la partie\n" +" finale\n" #: src/mktemp.c:95 msgid "" @@ -6542,69 +6600,67 @@ msgid "" " relative to a directory: $TMPDIR, if set; else the\n" " directory specified via -p; else /tmp [deprecated]\n" msgstr "" -" -p DIR utilise DIR comme préfixe, implique -t [déconseillé]\n" -" -t interprète TEMPLATE comme un seul composant de nom de\n" -" fichier, relatif au répertoire $TMPDIR s'il est " +" -p DIR utiliser DIR comme préfixe, implique -t [déconseillé]\n" +" -t interpréter TEMPLATE 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 spécifié via -p  ou sinon /" +" ou à défaut le répertoire indiqué par -p ; ou sinon /" "tmp\n" -" [déconseillé]\n" +" [déconseillé]\n" -#: src/mktemp.c:222 +#: src/mktemp.c:223 #, c-format msgid "failed to redirect stderr to /dev/null" -msgstr "impossible de rédiriger stderr vers /dev/null" +msgstr "impossible de rediriger la sortie d'erreur standard vers /dev/null" -#: src/mktemp.c:228 +#: src/mktemp.c:229 #, c-format msgid "too many templates" msgstr "trop de modèles" -#: src/mktemp.c:248 +#: src/mktemp.c:249 #, c-format msgid "with --suffix, template %s must end in X" -msgstr "avec --suffix, le modèle %s doit terminer par un X" +msgstr "avec --suffix, le modèle %s doit se terminer par un X" -#: src/mktemp.c:273 src/split.c:1117 +#: src/mktemp.c:274 src/split.c:1130 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "" -"le suffixe %s est non valide car il contient un séparateur de répertoires" +"le suffixe %s est incorrect car il contient un séparateur de répertoires" -#: src/mktemp.c:278 +#: src/mktemp.c:279 #, c-format msgid "too few X's in template %s" msgstr "trop peu de X dans le modèle %s" -#: src/mktemp.c:291 +#: src/mktemp.c:292 #, c-format msgid "invalid template, %s, contains directory separator" -msgstr "modèle non valide, %s, contient des séparateurs de répertoires" +msgstr "modèle incorrect, %s, contient des séparateurs de répertoires" -#: src/mktemp.c:305 +#: src/mktemp.c:306 #, c-format msgid "invalid template, %s; with --tmpdir, it may not be absolute" -msgstr "modèle non valide, %s ; avec --tmpdir, peut ne pas être absolu" +msgstr "modèle incorrect, %s ; avec --tmpdir, il ne peut pas être absolu" -#: src/mktemp.c:325 +#: src/mktemp.c:326 #, 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:335 +#: src/mktemp.c:336 #, 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:290 -msgid "" -"Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" -"\n" +#: src/mv.c:292 +msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" msgstr "" -"Renomme SOURCE en DEST, ou déplace SOURCE(s) vers DIRECTORY.\n" -"\n" +"Renommer SOURCE en DEST, ou déplacer le ou les SOURCEs vers DIRECTORY.\n" -#: src/mv.c:297 +#: src/mv.c:298 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -6616,30 +6672,28 @@ msgid "" "If you specify more than one of -i, -f, -n, only the final one takes " "effect.\n" msgstr "" -" --backup[=CONTROL] archive chaque fichier de destination " +" --backup[=CONTROL] archiver chaque fichier de destination " "existant\n" -" -b identique à --backup mais n'accepte pas " -"d'argument\n" -" -f, --force ne demande pas de confirmation avant " +" -b identique à --backup mais sans argument\n" +" -f, --force ne pas demander de confirmation avant " "d'écraser\n" -" -i, --interactive demande confirmation avant d'écraser\n" -" -n, --no-clobber n'écrase pas les fichiers existants\n" -"Si vous indiquez plusieurs options parmi -i, -f, -n, seulement la dernière " -"sera\n" +" -i, --interactive demander confirmation avant d'écraser\n" +" -n, --no-clobber ne pas écraser les fichiers existants\n" +"Si vous indiquez plusieurs options parmi -i, -f, -n, seule la dernière sera\n" "effective.\n" -#: src/mv.c:306 +#: src/mv.c:307 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 enlève les « / » en suffixe de chacun\n" -" des arguments SOURCE\n" -" -S, --suffix=SUFFIX écrase le suffixe usuel d'archivage\n" +" --strip-trailing-slashes enlever les « / » en suffixe de tous les\n" +" arguments SOURCE\n" +" -S, --suffix=SUFFIX écraser le suffixe usuel d'archivage\n" -#: src/mv.c:311 +#: src/mv.c:312 msgid "" " -t, --target-directory=DIRECTORY move all SOURCE arguments into " "DIRECTORY\n" @@ -6649,15 +6703,15 @@ msgid "" " destination file is missing\n" " -v, --verbose explain what is being done\n" msgstr "" -" -t, --target-directory=DIRECTORY déplace tous les arguments SOURCE vers\n" -" DIRECTORY\n" -" -T, --no-target-directory traite DEST comme un fichier normal\n" -" -u, --update déplace uniquement si le fichier SOURCE est " +" -t, --target-directory=DIRECTORY déplacer tous les arguments SOURCE vers\n" +" DIRECTORY\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" -" récent que le fichier cible ou si aucun " +" récent que le fichier cible ou si aucun " "fichier\n" -" cible n'existe\n" -" -v, --verbose explique ce qui a été réalisé\n" +" cible n'existe\n" +" -v, --verbose expliquer ce qui est fait\n" #: src/nice.c:72 #, c-format @@ -6668,68 +6722,68 @@ msgstr "Utilisation : %s [OPTION] [COMMAND] [ARG]...\n" #, c-format msgid "" "Run COMMAND with an adjusted niceness, which affects process scheduling.\n" -"With no COMMAND, print the current niceness. Nicenesses range from\n" -"%d (most favorable scheduling) to %d (least favorable).\n" -"\n" -" -n, --adjustment=N add integer N to the niceness (default 10)\n" +"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" +"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" + +#: src/nice.c:82 +msgid " -n, --adjustment=N add integer N to the niceness (default 10)\n" msgstr "" -"Exécute COMMAND avec un niveau de priorité ajusté.\n" -"Sans COMMAND, affiche le niveau actuel de priorité. L'étendue des niveaux va " -"de\n" -"%d (priorité la plus favorable d'ordonnancement) à %d (la moins favorable).\n" -"\n" " -n, --adjustment=N ajoute la valeur entière N à la valeur de la priorité\n" -" (10 par défaut)\n" +" (10 par défaut)\n" -#: src/nice.c:168 +#: src/nice.c:172 #, c-format msgid "invalid adjustment %s" -msgstr "ajustement non valide %s" +msgstr "ajustement %s incorrect" -#: src/nice.c:177 +#: src/nice.c:181 #, c-format msgid "a command must be given with an adjustment" msgstr "une commande doit être indiquée avec un ajustement" -#: src/nice.c:184 src/nice.c:195 +#: src/nice.c:188 src/nice.c:199 #, c-format msgid "cannot get niceness" msgstr "impossible d'obtenir le niveau de priorité" -#: src/nice.c:201 +#: src/nice.c:205 #, c-format msgid "cannot set niceness" -msgstr "impossible d'obtenir le niveau de priorité" +msgstr "impossible de définir le niveau de priorité" #. This is a proper name. See the gettext manual, section Names. #: src/nl.c:40 msgid "Scott Bartram" msgstr "Scott Bartram" -#: src/nl.c:186 +#: src/nl.c:179 msgid "" "Write each FILE to standard output, with line numbers added.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" -"Affiche chaque FILE sur la sortie standard avec les numéros de ligne.\n" -"Sans FILE, ou quand FILE est -, lit l'entrée standard.\n" -"\n" +"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" -#: src/nl.c:194 +#: src/nl.c:186 msgid "" " -b, --body-numbering=STYLE use STYLE for numbering body lines\n" " -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=STYLE utilise STYLE pour numéroter les lignes\n" -" -d, --section-delimiter=CC utilise CC pour séparer les pages " +" -b, --body-numbering=STYLE utiliser STYLE pour numéroter les lignes\n" +" -d, --section-delimiter=CC utiliser CC pour séparer les pages " "logiques\n" -" -f, --footer-numbering=STYLE utilise STYLE pour numéroter les lignes " +" -f, --footer-numbering=STYLE utiliser STYLE pour numéroter les lignes " "de\n" -" bas de page\n" +" bas de page\n" -#: src/nl.c:199 +#: src/nl.c:191 msgid "" " -h, --header-numbering=STYLE use STYLE for numbering header lines\n" " -i, --line-increment=NUMBER line number increment at each line\n" @@ -6740,35 +6794,32 @@ msgid "" "pages\n" " -s, --number-separator=STRING add STRING after (possible) line number\n" msgstr "" -" -h, --header-numbering=STYLE utilise STYLE pour numéroter les lignes\n" -" d'en-tête\n" -" -i, --line-increment=NUMBER incrément en nombre de lignes à chaque " +" -h, --header-numbering=STYLE utiliser STYLE pour numéroter les lignes\n" +" d'en-tête\n" +" -i, --line-increment=N incrémenter en nombre de lignes à chaque " "ligne\n" -" -l, --join-blank-lines=NUMBER regroupe NUMBER lignes vides comme une " -"seule\n" -" ligne\n" -" -n, --number-format=FORMAT insére des numéros de ligne selon FORMAT\n" -" -p, --no-renumber ne réinitialise le nombre de lignes aux " -"pages\n" -" logiques\n" -" -s, --number-separator=STRING ajoute STRING après le numéro de ligne " +" -l, --join-blank-lines=N regrouper N lignes vides comme une seule " +"ligne\n" +" -n, --number-format=FORMAT insérer des numéros de ligne selon le " +"FORMAT\n" +" -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 " "(si\n" -" possible)\n" -" \n" +" possible)\n" -#: src/nl.c:207 +#: src/nl.c:199 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, --starting-line-number=NUMBER premier numéro de ligne sur chaque " -"page\n" -" logique\n" -" -w, --number-width=NUMBER utilise NUMBER colonnes pour les " -"numéros\n" -" de ligne\n" +" -v, --starting-line-number=N premier numéro de ligne sur toutes les\n" +" pages logiques\n" +" -w, --number-width=N utiliser N colonnes pour les numéros de " +"ligne\n" -#: src/nl.c:213 +#: src/nl.c:205 msgid "" "\n" "By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC are\n" @@ -6779,11 +6830,12 @@ msgstr "" "Par défaut, sélectionne v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn.\n" "CC se compose de deux caractères délimiteurs pour séparer les pages " "logiques,\n" -"un deuxième caractère manquant implique :.\n" -"Saisissez \\\\ pour \\. STYLE est une des options parmi :\n" +"L'absence du deuxième caractère équivaut à « : ». Saisissez « \\\\ » pour " +"« \\ ».\n" +"STYLE est une des options parmi :\n" "\n" -#: src/nl.c:219 +#: src/nl.c:211 msgid "" "\n" " a number all lines\n" @@ -6800,12 +6852,11 @@ msgid "" "\n" msgstr "" "\n" -" a numérote toutes les lignes\n" -" t numérote seulement les lignes non vides\n" -" n numérote n lignes\n" -" pBRE numérote seulement les lignes ayant une concordance avec " -"l'expression\n" -" régulière de base, BRE\n" +" a numéroter toutes les lignes\n" +" t ne numéroter que les lignes non vides\n" +" n numéroter n lignes\n" +" pBRE ne numéroter que les lignes correspondantes à l'expression\n" +" rationnelle de base, BRE\n" "\n" "FORMAT doit être choisi parmi :\n" "\n" @@ -6814,57 +6865,50 @@ msgstr "" " rz justifié à droite, avec zéros en préfixe\n" "\n" -#: src/nl.c:286 +#: src/nl.c:278 #, c-format msgid "line number overflow" msgstr "débordement du numéro de ligne" -#: src/nl.c:486 +#: src/nl.c:478 #, c-format msgid "invalid header numbering style: %s" -msgstr "le style de numérotation d'en-tête est non valide : %s" +msgstr "style de numérotation d'en-tête incorrect : %s" -#: src/nl.c:494 +#: src/nl.c:486 #, c-format msgid "invalid body numbering style: %s" -msgstr "le style de numérotation de corps est non valide : %s" +msgstr "style de numérotation de corps incorrect : %s" -#: src/nl.c:502 +#: src/nl.c:494 #, c-format msgid "invalid footer numbering style: %s" -msgstr "le style de numérotation de pied de page est non valide : %s" +msgstr "style de numérotation de pied de page incorrect : %s" -#: src/nl.c:511 +#: src/nl.c:503 #, c-format msgid "invalid starting line number: %s" -msgstr "le numéro de ligne de départ non valide : %s" - -#: src/nl.c:517 -#, c-format -msgid "WARNING: --page-increment is deprecated; use --line-increment instead" -msgstr "" -"ATTENTION : --page-increment est déconseillée, utilisez plutôt --line-" -"increment" +msgstr "numéro de ligne de départ incorrect : %s" -#: src/nl.c:524 +#: src/nl.c:512 #, c-format msgid "invalid line number increment: %s" -msgstr "l'incrément du nombre de ligne est non valide : %s" +msgstr "incrément de nombre de ligne incorrect : %s" -#: src/nl.c:536 +#: src/nl.c:524 #, c-format msgid "invalid number of blank lines: %s" -msgstr "le nombre de lignes blanches est non valide : %s" +msgstr "nombre de lignes blanches incorrect : %s" -#: src/nl.c:550 +#: src/nl.c:538 #, c-format msgid "invalid line number field width: %s" -msgstr "la largeur du champ de la numérotation de ligne non valide : %s" +msgstr "largeur du champ de numérotation de ligne incorrect : %s" -#: src/nl.c:569 +#: src/nl.c:557 #, c-format msgid "invalid line numbering format: %s" -msgstr "le format de numérotation de ligne est non valide : %s" +msgstr "format de numérotation de ligne incorrect : %s" #: src/nohup.c:53 #, c-format @@ -6880,11 +6924,11 @@ msgid "" "Run COMMAND, ignoring hangup signals.\n" "\n" msgstr "" -"Exécute COMMAND en ignorant les signaux de déconnexion.\n" +"Exécuter COMMAND en ignorant les signaux de déconnexion.\n" "\n" #: src/nohup.c:65 -#, fuzzy, c-format +#, c-format msgid "" "\n" "If standard input is a terminal, redirect it from /dev/null.\n" @@ -6894,10 +6938,10 @@ msgid "" "To save output to FILE, use '%s COMMAND > FILE'.\n" msgstr "" "\n" -"Si l'entrée standard est un terminal, la redirige depuis /dev/null.\n" -"Si l'entrée standard est un terminal, ajoute si possible la sortie à\n" +"Si l'entrée standard est un terminal, la rediriger depuis /dev/null.\n" +"Si l'entrée standard est un terminal, ajouter si possible la sortie à\n" "« nohup.out » ou à « $HOME/nohup.out » sinon.\n" -"Si le fichier standard d'erreur est un terminal, la redirige sur la sortie\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" @@ -6911,11 +6955,6 @@ msgstr "impossible de rendre inutilisable la sortie standard" msgid "ignoring input" msgstr "les entrées sont ignorées" -#: src/nohup.c:163 src/nohup.c:165 -#, c-format -msgid "failed to open %s" -msgstr "impossible d'ouvrir %s" - #: src/nohup.c:175 #, c-format msgid "ignoring input and appending output to %s" @@ -6929,161 +6968,528 @@ msgstr "la sortie est ajoutée à %s" #: src/nohup.c:193 #, c-format msgid "failed to set the copy of stderr to close on exec" -msgstr "échec de copie sur stderr lors de l'exécution de la fermeture " +msgstr "" +"échec de copie sur la sortie d'erreur standard pour terminer l'exécution" #: src/nohup.c:198 #, c-format msgid "ignoring input and redirecting stderr to stdout" -msgstr "ignore l'entrée et redirige stderr sur stdout" +msgstr "" +"entrée ignorée et sortie d'erreur standard redirigée vers la sortie standard" #: src/nohup.c:199 #, c-format msgid "redirecting stderr to stdout" -msgstr "redirige stderr sur stdout" +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 l'erreur standard" +msgstr "échec de redirection vers la sortie d'erreur standard" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:32 +#: src/nproc.c:33 msgid "Giuseppe Scrivano" msgstr "Giuseppe Scrivano" -#: src/nproc.c:56 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 +#: src/nproc.c:57 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Utilisation : %s [OPTION]...\n" -#: src/nproc.c:57 +#: src/nproc.c:58 msgid "" "Print the number of processing units available to the current process,\n" "which may be less than the number of online processors\n" "\n" msgstr "" -"Affiche le nombre d'unités de traitement disponibles pour le processus " +"Afficher le nombre d'unités de traitement disponibles pour le processus " "actuel,\n" "qui peut être inférieur au nombre de processeurs actifs\n" -#: src/nproc.c:62 +#: src/nproc.c:63 msgid "" " --all print the number of installed processors\n" " --ignore=N if possible, exclude N processing units\n" msgstr "" -" --all affiche le nombre de processeurs installés\n" -" --ignore=N si possible, exclus N unités de traitement\n" +" --all afficher le nombre de processeurs installés\n" +" --ignore=N si possible, exclure N unités de traitement\n" -#: src/nproc.c:106 +#: src/nproc.c:107 #, c-format msgid "%s: invalid number to ignore" -msgstr "%s : nombre à ignorer non valide" +msgstr "%s : nombre à ignorer incorrect" -#: src/od.c:294 +#. This is a proper name. See the gettext manual, section Names. +#: src/numfmt.c:35 +msgid "Assaf Gordon" +msgstr "Assaf Gordon" + +#: src/numfmt.c:676 +#, c-format +msgid "value too large to be converted: '%s'" +msgstr "valeur trop grande pour être convertie : « %s »" + +#: src/numfmt.c:680 +#, c-format +msgid "invalid number: '%s'" +msgstr "nombre incorrect : « %s »" + +#: src/numfmt.c:684 +#, c-format +msgid "rejecting suffix in input: '%s' (consider using --from)" +msgstr "rejet du suffixe en entrée : « %s » (songez à utiliser --from)" + +#: src/numfmt.c:688 +#, c-format +msgid "invalid suffix in input: '%s'" +msgstr "suffixe incorrect en entrée : « %s »" + +#: src/numfmt.c:692 +#, 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)" + +#: src/numfmt.c:723 +#, c-format +msgid "failed to prepare value '%Lf' for printing" +msgstr "échec de préparation de la valeur « %Lf » pour l'affichage" + +#: src/numfmt.c:787 +#, c-format +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 #, c-format +msgid "Usage: %s [OPTION]... [NUMBER]...\n" +msgstr "Utilisation : %s [OPTION]... [NUMBER]...\n" + +#: src/numfmt.c:816 msgid "" -"Usage: %s [OPTION]... [FILE]...\n" -" or: %s [-abcdfilosx]... [FILE] [[+]OFFSET[.][b]]\n" -" or: %s --traditional [OPTION]... [FILE] [[+]OFFSET[.][b] [+][LABEL][.]" -"[b]]\n" +"Reformat NUMBER(s), or the numbers from standard input if none are " +"specified.\n" msgstr "" -"Utilisation : %s [OPTION]... [FILE]...\n" -" ou : %s [-abcdfilosx]... [FILE] [[+]OFFSET[.][b]]\n" -" ou : %s --traditional [OPTION]... [FILE] [[+]OFFSET[.][b] [+][LABEL]" -"[.][b]]\n" +"Reformater le ou les NUMBERs, ou les nombres de l'entrée standard si aucun " +"n'est indiqué.\n" -#: src/od.c:300 +#: src/numfmt.c:820 +msgid " --debug print warnings about invalid input\n" +msgstr "" +" --debug afficher les avertissements en cas d'entrée " +"incorrecte\n" + +#: src/numfmt.c:823 msgid "" -"\n" -"Write an unambiguous representation, octal bytes by default,\n" -"of FILE to standard output. With more than one FILE argument,\n" -"concatenate them in the listed order to form the input.\n" -"With no FILE, or when FILE is -, read standard input.\n" -"\n" +" -d, --delimiter=X use X instead of whitespace for field delimiter\n" msgstr "" -"\n" -"Affiche le contenu de FILE, selon une représentation non ambiguë,\n" -"par un affichage, par défaut, des octets en octal sur la sortie standard.\n" -"Sans FILE, ou quand FILE est -, lit l'entrée standard.\n" -"\n" +" -d, --delimiter=X utiliser X au lieu d'un blanc comme délimiteur de " +"champ\n" -#: src/od.c:307 -msgid "All arguments to long options are mandatory for short options.\n" +#: src/numfmt.c:826 +msgid "" +" --field=N replace the number in input field N (default is 1)\n" msgstr "" -"Tous les arguments obligatoires pour les options longues le sont aussi pour\n" -"les options courtes.\n" +" --field=N remplacer le nombre dans le champs d'entrée N\n" +" (1 par défaut)\n" -#: src/od.c:310 +#: src/numfmt.c:829 msgid "" -" -A, --address-radix=RADIX decide how file offsets are printed\n" -" -j, --skip-bytes=BYTES skip BYTES input bytes first\n" +" --format=FORMAT use printf style floating-point FORMAT;\n" +" see FORMAT below for details\n" msgstr "" -" -A, --address-radix=RADIX décide comment les décalages seront affichés\n" -" -j, --skip-bytes=BYTES ignore BYTES premiers octets\n" +" --format=FORMAT utiliser le le type printf de virgule flottante " +"FORMAT ;\n" +" consultez FORMAT plus bas pour des précisions\n" -#: src/od.c:314 -#, fuzzy +#: src/numfmt.c:833 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" -" -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" -" --traditional accept arguments in traditional form\n" +" --from=UNIT auto-scale input numbers to UNITs; default is " +"'none';\n" +" see UNIT below\n" msgstr "" -" -N, --read-bytes=BYTES limite l'image à BYTES octets en entrée\n" -" -S, --strings[=BYTES] affiche les chaînes d'au moins BYTES " -"caractères\n" -" graphiques\n" -" -t, --format=TYPE sélectionne les formats d'affichage ou les " -"formats\n" -" -v, --output-duplicates n'utilise pas * pour marquer la suppression\n" -" -w, --width[=BYTES] affiche BYTES octets par ligne de sortie\n" -" --traditional accepte les arguments selon la forme " -"traditionnelle\n" +" --from=UNIT mettre automatiquement à l'échelle « UNIT » les " +"nombres\n" +" en entrée ; « none » par défaut ; consultez UNIT\n" +" plus bas\n" -#: src/od.c:324 +#: src/numfmt.c:837 msgid "" -"\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" -" -d same as -t u2, select unsigned decimal 2-byte units\n" +" --from-unit=N specify the input unit size (instead of the default " +"1)\n" msgstr "" -"\n" -"Les spécifications de format traditionnel peuvent être entremêlées;\n" -"ils s'accumulent :\n" -" -a identique à -t a, sélectionne les caractères nommés, ignore le bit " -"de\n" -" poids fort\n" -" -b identique à -t o1, sélectionne les octets en octal\n" -" -c identique à -t c, sélectionne les caractères ASCII ou les " -"échappements\n" -" par barre oblique inverses\n" -" -d identique à -t u2, sélectionne les décimales non signées sur 2 " -"octets\n" +" --from-unit=N indiquer l'unité en entrée (au lieu de 1 par défaut)\n" -#: src/od.c:332 +#: src/numfmt.c:840 msgid "" -" -f same as -t fF, select floats\n" -" -i same as -t dI, select decimal ints\n" -" -l same as -t dL, select decimal longs\n" -" -o same as -t o2, select octal 2-byte units\n" -" -s same as -t d2, select decimal 2-byte units\n" -" -x same as -t x2, select hexadecimal 2-byte units\n" +" --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 "" -" -f identique à -t fF, sélectionne les flottants\n" -" -i identique à -t dI, sélectionne les entiers décimaux\n" -" -l identique à -t dL, sélectionne les entiers décimaux longs\n" -" -o identique à -t o2, sélectionne les nombres octals sur 2 octets\n" -" -s identique à -t d2, sélectionne les nombres décimaux sur 2 octets\n" -" -x identique à -t x2, sélectionne les nombres hexadécimaux sur 2 octets\n" +" --grouping grouper les chiffres ensemble (par exemple " +"1 000 000)\n" +" en utilisant le groupement défini dans les " +"paramètres\n" +" régionaux (donc sans effet avec les locales C/" +"POSIX)\n" -#: src/od.c:340 +#: src/numfmt.c:844 msgid "" +" --header[=N] print (without converting) the first N header lines;\n" +" N defaults to 1 if not specified\n" +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 +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" + +#: src/numfmt.c:852 +msgid "" +" --padding=N pad the output to N characters; positive N will\n" +" right-align; negative N will left-align;\n" +" padding is ignored if the output is wider than N;\n" +" the default is to automatically pad if a " +"whitespace\n" +" is found\n" +msgstr "" +" --padding=N remplir la sortie avec N caractères ; N positif " +"alignera\n" +" à droite. N négatif alignera à gauche ; le " +"remplissage\n" +" est ignoré si la sortie est plus grande que N ;\n" +" le remplissage est automatique par défaut si un " +"blanc\n" +" est trouvé\n" + +#: src/numfmt.c:859 +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" +" « from-zero » (par défaut), « towards-zero » ou\n" +" « nearest »\n" + +#: src/numfmt.c:863 +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 " +"le\n" +" SUFFIX facultatif aux nombres en entrée\n" + +#: src/numfmt.c:867 +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" + +#: src/numfmt.c:870 +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" + +#: src/numfmt.c:877 +msgid "" +"\n" +"UNIT options:\n" +msgstr "" +"\n" +"Options UNIT :\n" + +#: src/numfmt.c:880 +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 +msgid "" +" auto accept optional single/two letter suffix:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" +msgstr "" +" auto accepter un suffixe facultatif d'une ou deux lettres :\n" +" 1K = 1000 ;\n" +" 1Ki = 1024 ;\n" +" 1M = 1000000 ;\n" +" 1Mi = 1048576 ;\n" +" ...\n" + +#: src/numfmt.c:889 +msgid "" +" si accept optional single letter suffix:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ...\n" +msgstr "" +" si accepter un suffixe facultatif d'une lettre :\n" +" 1K = 1000 ;\n" +" 1M = 1000000 ;\n" +" ...\n" + +#: src/numfmt.c:894 +msgid "" +" iec accept optional single letter suffix:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ...\n" +msgstr "" +" iec accepter un suffixe facultatif d'une lettre :\n" +" 1K = 1024 ;\n" +" 1M = 1048576 ;\n" +" ...\n" + +#: src/numfmt.c:899 +msgid "" +" iec-i accept optional two-letter suffix:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ...\n" +msgstr "" +" iec-i accepter un suffixe facultatif de deux lettres :\n" +" 1Ki = 1024 ;\n" +" 1Mi = 1048576 ;\n" +" ...\n" + +#: src/numfmt.c:905 +#, 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" +msgstr "" +"\n" +"FORMAT doit être adapté à l'affichage d'un argument de virgule flottante " +"« %f ».\n" +"Le guillemet facultatif (%'f) activera --grouping (si permis avec les " +"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" + +#: src/numfmt.c:912 +#, c-format +msgid "" +"\n" +"Exit status is 0 if all input numbers were successfully converted.\n" +"By default, %s will stop at the first conversion error with exit status 2.\n" +"With --invalid='fail' a warning is printed for each conversion error\n" +"and the exit status is 2. With --invalid='warn' each conversion error is\n" +"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" +"Le code de retour est 0 si tous les nombres en entrée ont été convertis\n" +"sans erreur. Par défaut, %s s'arrêtera à la première erreur de conversion\n" +"avec un code de retour de 2. Avec --invalid='fail', un avertissement est\n" +"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" + +#: src/numfmt.c:921 +#, c-format +msgid "" +"\n" +"Examples:\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" +msgstr "" +"\n" +"Exemples :\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 +#, c-format +msgid "format %s has no %% directive" +msgstr "le format %s ne contient pas de directive %%" + +#: src/numfmt.c:990 +#, c-format +msgid "invalid format %s (width overflow)" +msgstr "format %s incorrect (dépassement de largeur)" + +#: src/numfmt.c:1007 src/seq.c:229 +#, c-format +msgid "format %s ends in %%" +msgstr "le format %s termine avec %%" + +#: src/numfmt.c:1010 +#, c-format +msgid "invalid format %s, directive must be %%['][-][N]f" +msgstr "format %s incorrect, la directive doit être %%['][-][N]f" + +#: src/numfmt.c:1018 src/seq.c:236 +#, c-format +msgid "format %s has too many %% directives" +msgstr "le format %s contient trop de directives %%" + +#: src/numfmt.c:1070 +#, c-format +msgid "invalid suffix in input '%s': '%s'" +msgstr "suffixe incorrect dans l'entrée « %s » : « %s »" + +#: src/numfmt.c:1092 +#, 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 +#, 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 +#, c-format +msgid "large input value '%s': possible precision loss" +msgstr "grande valeur d'entrée « %s » : perte de précisions potentielle" + +#: src/numfmt.c:1293 +#, 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 +#, c-format +msgid "invalid padding value '%s'" +msgstr "valeur de remplissage « %s » incorrecte" + +#: src/numfmt.c:1401 +#, c-format +msgid "invalid field value '%s'" +msgstr "valeur de champ « %s » incorrecte" + +#: src/numfmt.c:1430 +#, c-format +msgid "invalid header value '%s'" +msgstr "valeur d'en-tête « %s » incorrecte" + +#: src/numfmt.c:1456 +#, 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 +#, c-format +msgid "no conversion option specified" +msgstr "aucune option de conversion indiquée" + +#: src/numfmt.c:1471 +#, c-format +msgid "grouping cannot be combined with --to" +msgstr "le groupement ne peut pas être combiné avec --format" + +#: src/numfmt.c:1473 +#, 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 +#, c-format +msgid "--header ignored with command-line input" +msgstr "--header ignoré avec l'entrée en ligne de commande" + +#: src/numfmt.c:1511 +#, c-format +msgid "error reading input" +msgstr "erreur de lecture de l'entrée" + +#: src/numfmt.c:1520 +#, 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 +#, 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 "" +"Utilisation : %s [OPTION]... [FILE]...\n" +" ou : %s [-abcdfilosx]... [FILE] [[+]OFFSET[.][b]]\n" +" ou : %s --traditional [OPTION]... [FILE] [[+]OFFSET[.][b] [+][LABEL]" +"[.][b]]\n" + +#: src/od.c:300 +msgid "" +"\n" +"Write an unambiguous representation, octal bytes by default,\n" +"of FILE to standard output. With more than one FILE argument,\n" +"concatenate them in the listed order to form the input.\n" +"With no FILE, or when FILE is -, read standard input.\n" "\n" +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" +"\n" + +#: src/od.c:307 +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" "An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" @@ -7091,31 +7497,106 @@ 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 les formats du 1er et du second appel s'appliquent, le 2e format est " -"retenu\n" -"si le dernier opérande débute par + ou (si il y a 2 opérandes) un chiffre.\n" -"Un opérande de décalage signifie -j OFFSET. LABEL est la pseudo adresse\n" -"affichée dès le 1er octet, incrémentée lorsque le vidage mémoire " -"s'effectue.\n" +"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" "les suffixes peuvent être . pour l'octal et b pour multiple de 512.\n" -#: src/od.c:349 +#: src/od.c:318 +msgid "" +" -A, --address-radix=RADIX output format for file offsets. RADIX is one\n" +" of [doxn], for Decimal, Octal, Hex or None\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" +" 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" + +#: src/od.c:323 +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" +" 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" +" 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" +" -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" +" --traditional accepter les arguments sous la troisième\n" +" forme précédente\n" + +#: src/od.c:336 +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" +" -d same as -t u2, select unsigned decimal 2-byte units\n" +msgstr "" +"\n" +"\n" +"Les spécifications de format traditionnel peuvent être entremêlées ;\n" +"elles s'accumulent :\n" +" -a identique à -t a, sélectionner les caractères nommés, en ignorant " +"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" +" -d identique à -t u2, sélectionner les décimaux non signées sur " +"2 octets\n" + +#: src/od.c:345 +msgid "" +" -f same as -t fF, select floats\n" +" -i same as -t dI, select decimal ints\n" +" -l same as -t dL, select decimal longs\n" +" -o same as -t o2, select octal 2-byte units\n" +" -s same as -t d2, select decimal 2-byte units\n" +" -x same as -t x2, select hexadecimal 2-byte units\n" +msgstr "" +" -f identique à -t fF, sélectionner les flottants\n" +" -i identique à -t dI, sélectionner les entiers décimaux\n" +" -l identique à -t dL, sélectionner les entiers décimaux longs\n" +" -o identique à -t o2, sélectionner les nombres octaux sur 2 octets\n" +" -s identique à -t d2, sélectionner les nombres décimaux sur 2 octets\n" +" -x identique à -t x2, sélectionner les nombres hexadécimaux sur " +"2 octets\n" + +#: src/od.c:353 msgid "" "\n" -"TYPE is made up of one or more of these specifications:\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" msgstr "" "\n" -"TYPE est composé d'une ou plusieurs des spécifications suivantes :\n" "\n" -" a caractère nommé, ignore le bit de poids le plus haut\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" -#: src/od.c:356 +#: src/od.c:360 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -7129,114 +7610,118 @@ msgstr "" " u[SIZE] décimal non signé SIZE octets par entier\n" " x[SIZE] hexadécimal, SIZE octets par entier\n" -#: src/od.c:363 +#: src/od.c:367 msgid "" "\n" -"SIZE is a number. For TYPE in doux, SIZE may also be C for\n" +"SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" "sizeof(char), S for sizeof(short), I for sizeof(int) or L for\n" "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" -"SIZE est un nombre. Le TYPE est soit d, o, u ou x, SIZE peut aussi être C " +"SIZE est un nombre. Si le TYPE est d, o, u ou x, SIZE 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(double) ou L pour sizeof(long double).\n" -#: src/od.c:370 +#: src/od.c:374 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" +"Adding a z suffix to any type displays printable characters at the end of\n" +"each output line.\n" msgstr "" "\n" -"RADIX est d pour décimal, o pour octal, x pour hexadécimal ou n pour aucun.\n" -"BYTES est hexadécimal préfixé par 0x ou 0X, et peut avoir un suffixe\n" -"multiplicateur :\n" -"b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n" -"L'ajout du suffixe « z » à l'un de ces types affiche des caractères " -"imprimables\n" -"à la fin de chaque ligne de résultat.\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" -#: src/od.c:380 +#: src/od.c:379 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" +"\n" +"BYTES is hex with 0x or 0X prefix, and may have a multiplier suffix:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"and so on for G, T, P, E, Z, Y.\n" msgstr "" -"L'option --string sans nombre implique 3, l'option --width sans nombre\n" -"implique 32. Par défaut, od utilise -A o -t oS -w16.\n" +"\n" +"\n" +"BYTES est hexadécimal avec un préfixe 0x ou 0X, est peut avoir un\n" +"suffixe multiplicateur :\n" +" b 512 ;\n" +" KB 1000 ;\n" +" K 1024 ;\n" +" MB 1000*1000 ;\n" +" M 1024*1024 ;\n" +"et ainsi de suite pour G, T, P, E, Z et Y.\n" -#: src/od.c:633 src/od.c:753 +#: src/od.c:639 src/od.c:759 #, c-format msgid "invalid type string %s" -msgstr "type de chaîne %s non valide" +msgstr "type de chaîne %s incorrect" -#: src/od.c:643 +#: src/od.c:649 #, c-format msgid "" "invalid type string %s;\n" "this system doesn't provide a %lu-byte integral type" msgstr "" -"type de chaîne %s non valide;\n" -"ce système ne permet pas le type entier %lu-byte" +"type de chaîne %s incorrect ;\n" +"ce système ne fournit pas de type entier sur %lu octets" -#: src/od.c:764 +#: src/od.c:770 #, c-format msgid "" "invalid type string %s;\n" "this system doesn't provide a %lu-byte floating point type" msgstr "" -"type de chaîne non valide %s;\n" -"ce système ne prend pas en charge le type en point flottant %lu-byte" +"type de chaîne %s incorrect ;\n" +"ce système ne fournit pas de type en point flottant sur %lu octets" -#: src/od.c:822 -#, fuzzy, c-format +#: src/od.c:828 +#, c-format msgid "invalid character '%c' in type string %s" -msgstr "le caractère « %c » est non valide dans le type de chaîne %s" +msgstr "caractère « %c » incorrect dans le type de chaîne %s" -#: src/od.c:1047 +#: src/od.c:1053 #, 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:1603 -#, fuzzy, c-format +#: src/od.c:1609 +#, c-format msgid "invalid output address radix '%c'; it must be one character from [doxn]" msgstr "" -"l'adresse de base « %c » est non valide, cela doit être caractère parmi " +"adresse radix de sortie « %c » incorrecte, ce doit être caractère parmi " "[doxn]" -#: src/od.c:1729 +#: src/od.c:1735 #, c-format msgid "no type may be specified when dumping strings" -msgstr "aucun type ne peut être spécifié lors de l'affichage brut des chaînes" +msgstr "aucun type ne peut être indiqué lors de l'affichage brut des chaînes" -#: src/od.c:1804 +#: src/od.c:1810 msgid "compatibility mode supports at most one file" msgstr "le mode de compatibilité ne prend pas en charge plusieurs fichiers" -#: src/od.c:1825 +#: src/od.c:1831 #, 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:1868 +#: src/od.c:1874 #, c-format msgid "warning: invalid width %lu; using %d instead" -msgstr "avertissement : largeur non valide %lu ; %d sera utilisé à la place" +msgstr "avertissement : largeur %lu incorrecte ; %d sera utilisé à la place" #: src/operand2sig.c:69 #, c-format msgid "%s: invalid signal" -msgstr "%s : signal non valide" +msgstr "%s : signal incorrect" #: src/paste.c:220 #, c-format @@ -7248,25 +7733,23 @@ 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" -"\n" msgstr "" -"Écrit séquentiellement les lignes correspondantes de chaque\n" +"É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 -, lit l'entrée standard.\n" -"\n" +"Sans FILE, ou quand FILE est -, lire l'entrée standard.\n" -#: src/paste.c:448 +#: 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=LIST utilise les caractères de LIST au lieu de " +" -d, --delimiters=LIST utiliser les caractères de LIST au lieu de " "tabulations\n" -" -s, --serial copie un seul fichier à la fois au lieu de le " +" -s, --serial copier un seul fichier à la fois au lieu de le " "faire\n" -" en parallèle\n" +" en parallèle\n" -#: src/paste.c:509 +#: src/paste.c:508 #, c-format msgid "delimiter list ends with an unescaped backslash: %s" msgstr "" @@ -7281,15 +7764,15 @@ msgid "" " -P check for empty names and leading \"-\"\n" " --portability check for all POSIX systems (equivalent to -p -P)\n" msgstr "" -"Diagnostique les noms de fichiers non valides ou non portables\n" +"Diagnostiquer les noms de fichiers incorrects ou non portables\n" "\n" -" -p vérifie pour la majorité des système POSIX\n" -" -P vérifie les noms vides et les « - » d'en-tête\n" -" --portability vérifie pour tous les systèmes POSIX (équivalent à -p -" -"P)\n" +" -p vérifier pour la majorité des système POSIX\n" +" -P vérifier les noms vides et les « - » d'en-tête\n" +" --portability vérifier pour tous les systèmes POSIX (équivalent à -p " +"-P)\n" #: src/pathchk.c:170 -#, fuzzy, c-format +#, c-format msgid "leading '-' in a component of file name %s" msgstr "« - » d'en-tête dans une partie du nom de fichier %s" @@ -7311,14 +7794,13 @@ msgstr "%s : impossible de déterminer la longueur maximale du nom de fichier" #: src/pathchk.c:325 #, c-format msgid "limit %lu exceeded by length %lu of file name %s" -msgstr "la limite %lu est dépassée par la longueur %lu du nom de fichier %s" +msgstr "limite %lu dépassée par la longueur %lu du nom de fichier %s" #: src/pathchk.c:411 #, c-format msgid "limit %lu exceeded by length %lu of file name component %s" msgstr "" -"la limite %lu est dépassée par la longueur %lu d'une partie du nom de " -"fichier %s" +"limite %lu dépassée par la longueur %lu d'une partie du nom de fichier %s" #. 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 @@ -7331,80 +7813,80 @@ msgid "Kaveh Ghazi" msgstr "Kaveh Ghazi" #. TRANSLATORS: Real name is unknown; at most 19 characters. -#: src/pinky.c:250 +#: src/pinky.c:242 msgid " ???" msgstr " ???" #. TRANSLATORS: Idle time is unknown; at most 5 characters. -#: src/pinky.c:274 +#: src/pinky.c:266 msgid "?????" msgstr "?????" -#: src/pinky.c:323 +#: src/pinky.c:314 #, c-format msgid "Login name: " msgstr "Identifiant : " -#: src/pinky.c:326 +#: src/pinky.c:317 #, c-format msgid "In real life: " msgstr "Nom réel : " #. TRANSLATORS: Real name is unknown; no hard limit. -#: src/pinky.c:330 +#: src/pinky.c:321 msgid "???\n" msgstr "???\n" -#: src/pinky.c:350 +#: src/pinky.c:341 #, c-format msgid "Directory: " -msgstr "Répertoire" +msgstr "Répertoire : " -#: src/pinky.c:352 +#: src/pinky.c:343 #, c-format msgid "Shell: " -msgstr "Shell : " +msgstr "Interpréteur : " -#: src/pinky.c:371 +#: src/pinky.c:362 #, c-format msgid "Project: " msgstr "Projet : " -#: src/pinky.c:395 +#: src/pinky.c:386 #, c-format msgid "Plan:\n" msgstr "Plan :\n" -#: src/pinky.c:414 +#: src/pinky.c:405 msgid "Login" msgstr "Identifiant" -#: src/pinky.c:416 +#: src/pinky.c:407 msgid "Name" msgstr "Nom" -#: src/pinky.c:417 +#: src/pinky.c:408 msgid " TTY" msgstr " TTY" -#: src/pinky.c:419 +#: src/pinky.c:410 msgid "Idle" msgstr "Disponible" -#: src/pinky.c:420 +#: src/pinky.c:411 msgid "When" msgstr "Quand" -#: src/pinky.c:423 +#: src/pinky.c:414 msgid "Where" msgstr "Où" -#: src/pinky.c:502 +#: src/pinky.c:493 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Utilisation : %s [OPTION]... [USER]...\n" -#: src/pinky.c:503 +#: src/pinky.c:494 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7414,15 +7896,17 @@ msgid "" " -s do short format output, this is the default\n" msgstr "" "\n" -" -l afficher en format long\n" -" -b omettre le répertoire d'attache de l'utilisateur\n" -" et son shell en format long\n" -" -h omettre le fichier de projet de l'utilisateur en\n" -" format long\n" -" -p omettre le fichier de plan de l'utilisateur en\n" -" format long\n" +" -l afficher au format long pour les USERs 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 " +"long\n" +" -p omettre le fichier de plan de l'utilisateur au format " +"long\n" +" -s afficher au format court, c'est le comportement par " +"défaut\n" -#: src/pinky.c:511 +#: src/pinky.c:502 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7430,33 +7914,31 @@ msgid "" " -q omit the user's full name, remote host and idle time\n" " in short format\n" msgstr "" -" -f omettre la ligne de l'en-tête des colonnes\n" -" en format court\n" -" -w omettre le nom complet de l'utilisateur en format court\n" +" -f omettre la ligne d'en-tête des colonnes au format court\n" +" -w omettre le nom complet de l'utilisateur au format court\n" " -i omettre le nom complet de l'utilisateur et le nom de " "l'hôte\n" -" en format court\n" +" au format court\n" " -q omettre le nom complet de l'utilisateur, le nom de l'hôte\n" -" et le temps d'inactivité en format court\n" +" et le temps d'inactivité au format court\n" -#: src/pinky.c:520 -#, fuzzy, c-format +#: src/pinky.c:511 +#, c-format msgid "" "\n" "A lightweight 'finger' program; print user information.\n" "The utmp file will be %s.\n" msgstr "" "\n" -"Une version allégée du programme « finger »; afficher les informations " -"relatives à un utilisateur.\n" -"Le fichier utmp sera %s.\n" +"Une version allégée du programme « finger » ; afficher les renseignements\n" +"relatifs à un utilisateur. Le fichier utmp sera %s.\n" -#: src/pinky.c:604 +#: src/pinky.c:595 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "" -"aucun nom d'utilisateur spécifié; au moins doit être spécifié lorsque -l est " -"utilisée" +"aucun nom d'utilisateur indiqué ; au moins un doit être indiqué lorsque -l " +"est utilisée" #. This is a proper name. See the gettext manual, section Names. #: src/pr.c:330 @@ -7468,89 +7950,84 @@ msgstr "Pete TerMaat" msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:912 -#, fuzzy, c-format +#: src/pr.c:908 +#, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" -msgstr "« --page=FIRST_PAGE[:LAST_PAGE] » argument manquant" +msgstr "argument « --page=FIRST_PAGE[:LAST_PAGE] » manquant" -#: src/pr.c:914 +#: src/pr.c:910 #, c-format msgid "invalid page range %s" -msgstr "intervalle de pages non valide %s" +msgstr "intervalle de pages %s incorrect" -#: src/pr.c:979 -#, fuzzy, c-format +#: src/pr.c:975 +#, c-format msgid "'-l PAGE_LENGTH' invalid number of lines: %s" -msgstr "« -l PAGE_LENGTH » nombre non valide de lignes : %s" +msgstr "« -l PAGE_LENGTH » nombre de lignes incorrect : %s" -#: src/pr.c:1003 -#, fuzzy, c-format +#: src/pr.c:999 +#, c-format msgid "'-N NUMBER' invalid starting line number: %s" -msgstr "« -N NUMBER » nombre de début de ligne non valide : %s" +msgstr "« -N NUMBER » numéro de ligne de début incorrect : %s" -#: src/pr.c:1015 -#, fuzzy, c-format +#: src/pr.c:1011 +#, c-format msgid "'-o MARGIN' invalid line offset: %s" -msgstr "« -o MARGIN » saut de ligne non valide : %s" +msgstr "« -o MARGIN » saut de ligne incorrect : %s" -#: src/pr.c:1056 -#, fuzzy, c-format +#: src/pr.c:1052 +#, c-format msgid "'-w PAGE_WIDTH' invalid number of characters: %s" -msgstr "« -w PAGE_WIDTH » nombre non valide de caractères : %s" +msgstr "« -w PAGE_WIDTH » nombre de caractères incorrect : %s" -#: src/pr.c:1070 -#, fuzzy, c-format +#: src/pr.c:1066 +#, c-format msgid "'-W PAGE_WIDTH' invalid number of characters: %s" -msgstr "« -W PAGE_WIDTH » nombre non valide de caractères : %s" +msgstr "« -W PAGE_WIDTH » nombre de caractères incorrect : %s" -#: src/pr.c:1100 +#: src/pr.c:1096 #, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "" -"impossible de spécifier le nombre de colonnes lors d'une impression en " +"impossible d'indiquer le nombre de colonnes lors d'une impression en " "parallèle" -#: src/pr.c:1104 +#: src/pr.c:1100 #, c-format msgid "cannot specify both printing across and printing in parallel" -msgstr "impossible de spécifier un affichage à la fois croisé et en parallèle" +msgstr "impossible d'indiquer un affichage à la fois croisé et en parallèle" -#: src/pr.c:1200 -#, fuzzy, c-format +#: src/pr.c:1196 +#, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" -msgstr "" -"« -%c' » caractères superflus ou nombre non valide dans l'argument : %s" +msgstr "caractères « -%c » superflus ou nombre incorrect dans l'argument : %s" -#: src/pr.c:1304 +#: src/pr.c:1293 #, c-format msgid "page width too narrow" msgstr "la largeur de page est trop petite" -#: src/pr.c:2369 +#: src/pr.c:2353 #, c-format msgid "starting page number %<PRIuMAX> exceeds page count %<PRIuMAX>" msgstr "" -"numéro %<PRIuMAX> de page de départ dépasse le compteur de page %<PRIuMAX>" +"le numéro %<PRIuMAX> de page de départ dépasse le décompte de page %<PRIuMAX>" -#: src/pr.c:2396 +#: src/pr.c:2380 #, c-format msgid "page number overflow" msgstr "débordement du numéro de page" -#: src/pr.c:2401 +#: src/pr.c:2385 #, c-format msgid "Page %<PRIuMAX>" msgstr "Page %<PRIuMAX>" -#: src/pr.c:2773 -msgid "" -"Paginate or columnate FILE(s) for printing.\n" -"\n" -msgstr "" -"Pagine ou met en colonne les FILE(s) pour impression.\n" -"\n" +#: 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" -#: src/pr.c:2780 +#: src/pr.c:2763 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -7560,16 +8037,16 @@ msgid "" " columns on each page\n" msgstr "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" -" débute ou termine l'impression à la page FIRST_PAGE\n" -" ou LAST_PAGE\n" +" débuter ou terminer l'impression à la page FIRST_PAGE\n" +" ou LAST_PAGE\n" " -COLUMN, --columns=COLUMN\n" -" affiche COLUMN colonnes et les représente en " +" afficher COLUMN colonnes et les représenter en " "descendant,\n" -" sauf si -a est utilisé. Équilibre le nombre de lignes " +" sauf si -a est utilisé. Équilibrer le nombre de lignes " "de\n" -" chaque colonne sur chaque page\n" +" chaque colonne sur chaque page\n" -#: src/pr.c:2788 +#: src/pr.c:2771 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7578,16 +8055,15 @@ msgid "" " -d, --double-space\n" " double space the output\n" msgstr "" -" -a, --across imprime les colonnes horizontalement au lieu de\n" -" verticalement quand utilisé avec -COLUMN\n" +" -a, --across imprimer les colonnes horizontalement au lieu de\n" +" verticalement quand utilisé avec -COLUMN\n" " -c, --show-control-chars\n" -" utilise une notation par chapeau (^G) et octale avec " +" utiliser une notation par chapeau (^G) et octale avec " "barre\n" -" oblique inverse\n" -" -d, --double-space\n" -" double les espaces à l'affichage\n" +" oblique inverse\n" +" -d, --double-space doubler les espaces à l'affichage\n" -#: src/pr.c:2796 +#: src/pr.c:2779 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7599,17 +8075,18 @@ msgid "" " and trailer without -F)\n" msgstr "" " -D, --date-format=FORMAT\n" -" utilise FORMAT pour l'en-tête de la date\n" +" utiliser le FORMAT pour l'en-tête de la date\n" " -e[CHAR[WIDTH]], --expand-tabs[=CHAR[WIDTH]]\n" -" étend les caractères CHAR en entrée (tabulations) à des\n" -" tabulations de largeur WIDTH (par défaut 8)\n" -" -F, -f,\n" -" --form-feed\n" -" utilise des sauts de page au lieu des sauts de lignes\n" -" pour séparer les pages (3 lignes par en-tête avec -F ou\n" -" 5 lignes par en-tête et bas de page sans -f) \n" +" étendre les caractères CHAR en entrée (tabulations) aux\n" +" tabulations de largeur WIDTH (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" -#: src/pr.c:2806 +#: src/pr.c:2789 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -7622,23 +8099,21 @@ msgid "" " alignment, --sep-string[=STRING] sets separators\n" msgstr "" " -h, --header=HEADER\n" -" utilise une en-tête HEADER centrée au lieu du nom de " +" utiliser un en-tête HEADER centré au lieu du nom de " "fichier\n" -" dans l'entête de page, -h \"\" imprime une ligne " +" dans l'entête de page, -h \"\" imprime une ligne " "blanche,\n" -" n'utilisez pas -h\"\"\n" +" n'utilisez pas -h\"\"\n" " -i[CHAR[WIDTH]], --output-tabs[=CHAR[WIDTH]]\n" -" remplace les espaces avec le caractères CHAR (ou\n" -" tabulations) par des tabulations de largeur WIDTH (8 " -"par\n" -" défaut)\n" -" -J, --join-lines fusionnne des lignes complètes, désactive la troncature " -"des\n" -" lignes -W, sans alignement des colonnes, --sep-string" -"[=STRING]\n" -" définit les séparateurs\n" +" remplacer les espaces avec le caractères CHAR (ou\n" +" tabulations) par des tabulations de largeur WIDTH (8\n" +" 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" -#: src/pr.c:2815 +#: src/pr.c:2798 msgid "" " -l, --length=PAGE_LENGTH\n" " set the page length to PAGE_LENGTH (66) lines\n" @@ -7647,13 +8122,16 @@ msgid "" " truncate lines, but join lines of full length with -J\n" msgstr "" " -l, --length=PAGE_LENGTH\n" -" positionne PAGE_LENGTH à 66 lignes (nombre de lignes de\n" -" texte par défaut à 56, et avec -F 63)\n" -" -m, --merge imprime tous les fichiers en parallèle, un par colonne,\n" -" tronque les lignes, mais joint les lignes de longueur\n" -" complète avec -J\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" +" -m, --merge imprimer tous les fichiers en parallèle, un par " +"colonne,\n" +" tronquer les lignes, mais joindre les lignes de " +"longueur\n" +" complète avec -J\n" -#: src/pr.c:2822 +#: src/pr.c:2805 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -7663,17 +8141,18 @@ msgid "" " page printed (see +FIRST_PAGE)\n" msgstr "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" -" numérote les lignes, par les chiffres DIGITS (5), suivi " -"du\n" -" sépaarateur SEP (TAB), par défaut le compteur débute " -"avec la\n" -" première ligne du fichier d'entrée\n" +" numéroter les lignes, en utilisant DIGITS chiffres (5 " +"par\n" +" défaut), suivi du séparateur SEP (tabulation 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ébute le compteur à NUMBER avec la 1ère ligne de la " -"1ère\n" -" page imprimée (voir +FIRST_PAGE)\n" +" débuter le compteur à NUMBER avec la première ligne de " +"la\n" +" première page imprimée (consultez +FIRST_PAGE)\n" -#: src/pr.c:2830 +#: src/pr.c:2813 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -7682,15 +8161,14 @@ msgid "" " omit warning when a file cannot be opened\n" msgstr "" " -o, --indent=MARGIN\n" -" décale chaque ligne avec MARGIN (zéro) espaces, " -"n'affecte\n" -" pas -w ou -W, MARGIN est ajouté à PAGE_WIDTH\n" +" décaler chaque ligne avec MARGIN (zéro) espaces, ne pas\n" +" affecter -w ou -W, MARGIN est ajouté à PAGE_WIDTH\n" " -r, --no-file-warnings\n" -" inhibe l'avertissement lorsqu'un fichier ne peut pas " +" inhiber l'avertissement lorsqu'un fichier ne peut pas " "être\n" -" ouvert\n" +" ouvert\n" -#: src/pr.c:2837 +#: src/pr.c:2820 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -7700,14 +8178,13 @@ msgid "" " options (-COLUMN|-a -COLUMN|-m) except -w is set\n" msgstr "" " -s[CHAR], --separator[=CHAR]\n" -" sépare les colonnes à l'aide d'un simple caractère, par\n" -" défaut le caractère de tabulation <TAB> sans -w et\n" -" « no char » avec -w et -s[CHAR] inhibe la troncature de\n" -" ligne pour les options de 3 colonnes\n" -" (-COLUMN|-a - COLUMN|-m) sauf si -w est défini\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" +" ligne pour les trois options de colonnes\n" +" (-COLUMN|-a - COLUMN|-m) sauf si -w est défini\n" -#: src/pr.c:2844 -#, fuzzy +#: src/pr.c:2827 msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" @@ -7717,14 +8194,14 @@ msgid "" " -t, --omit-header omit page headers and trailers\n" msgstr "" " -SSTRING, --sep-string[=STRING]\n" -" sépare les colonnes avec STRING,\n" -" sans -S : le séparateur par défaut est <TAB> avec -J et " -"<space>\n" -" sinon (identique à -S\" \"), aucun effet sur les " +" 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" -" -t, --omit-header n'affiche pas les en-têtes et pieds de page\n" +" -t, --omit-header ne pas afficher les en-têtes et les pieds de page\n" -#: src/pr.c:2851 +#: src/pr.c:2834 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -7738,19 +8215,21 @@ msgid "" "(72)\n" msgstr "" " -T, --omit-pagination\n" -" n'affiche pas les en-têtes et les pieds de page, élimine " -"la\n" -" pagination par saut de page indiqués dans les fichiers " -"d'entrée\n" +" ne pas afficher les en-têtes et les pieds de page, " +"éliminer\n" +" la pagination par saut de page définis dans les " +"fichiers\n" +" d'entrée\n" " -v, --show-nonprinting\n" -" utilise la notation octale avec barre oblique inverse\n" +" utiliser la notation octale avec barre oblique inverse\n" " -w, --width=PAGE_WIDTH\n" -" utilise PAGE_WIDTH (72) caractères, uniquement, pour\n" -" l'affichage de multiples colonnes de texte, -s[char] " -"inhibe\n" -" (72)\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" -#: src/pr.c:2861 +#: src/pr.c:2844 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -7759,20 +8238,20 @@ msgid "" " with -S or -s\n" msgstr "" " -W, --page-width=PAGE_WIDTH\n" -" utilise toujours une largeur PAGE_WIDTH de 72 " -"caractères,\n" -" tronque les lignes, sauf lorsque l'option -J est " -"active,\n" -" sans interférence avec -S ou -s\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" -#: src/pr.c:2869 +#: src/pr.c:2852 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 -, lit\n" +"-t est implicite si PAGE_LENGTH <= 10. Sans FILE, ou quand FILE est -, lire\n" "l'entrée standard.\n" #: src/printenv.c:62 @@ -7784,14 +8263,15 @@ msgid "" "\n" msgstr "" "Utilisation : %s [OPTION]... [VARIABLE]\n" -"Affiche les valeurs de(s) VARIABLE(s) d'environnement spécifiées.\n" -"Si aucune VARIABLE n'est spécifiée, affiche le nom et la valeur de chacune.\n" +"Afficher les valeurs de la ou des VARIABLEs d'environnement indiquées.\n" +"Sans aucune VARIABLE indiquée, afficher le nom et la valeur de chacune.\n" "\n" #: src/printenv.c:69 msgid " -0, --null end each output line with 0 byte rather than newline\n" msgstr "" -" -0, --null termine les lignes avec l'octet 0 et non une nouvelle ligne\n" +" -0, --null terminer les lignes avec l'octet 0 et non un changement de " +"ligne\n" #: src/printf.c:79 #, c-format @@ -7815,7 +8295,7 @@ msgid "" "Print ARGUMENT(s) according to FORMAT, or execute according to OPTION:\n" "\n" msgstr "" -"Affiche les ARGUMENTS selon le FORMAT, ou exécute selon OPTION :\n" +"Afficher les ARGUMENTS selon le FORMAT, ou exécuter selon OPTION :\n" "\n" #: src/printf.c:99 @@ -7829,7 +8309,7 @@ msgstr "" "FORMAT contrôle la sortie comme la fonction printf() en C. Les séquences\n" "interprétées sont :\n" "\n" -" \\\" guillemets\n" +" \\\" guillemet double\n" #: src/printf.c:117 msgid "" @@ -7838,16 +8318,14 @@ 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 octet ayant la valeur octale NNN (1 à 3 chiffres)\n" -" \\xHH octet ayant la valeur hexadécimale HH (1 à 2 chiffres)\n" -" \\uHHHH caractère Unicode (ISO/IEC 10646) ayant la valeur " -"hexadécimale\n" -" HHHH (4 chiffres)\n" +" \\NNN octet ayant la valeur octale NNN (1 à 3 chiffres)\n" +" \\xHH octet ayant la valeur hexadécimale HH (1 à 2 chiffres)\n" +" \\uHHHH caractère Unicode (ISO/IEC 10646) ayant la valeur hexadécimale\n" +" HHHH (4 chiffres)\n" " \\UHHHHHHHH caractère Unicode ayant la valeur hexadécimal HHHHHHHH\n" -" (8 chiffres)\n" +" (8 chiffres)\n" #: src/printf.c:123 -#, fuzzy msgid "" " %% a single %\n" " %b ARGUMENT as a string with '\\' escapes interpreted,\n" @@ -7856,10 +8334,10 @@ 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 "" -" %% un simple %\n" -" %b ARGUMENT en tant que chaîne avec « \\ » d'échappement " -"interprétés,\n" -" sauf que l'échappement en octal est de la forme \\0 ou \\0NNN\n" +" %% un seul %\n" +" %b ARGUMENT de type chaîne, avec les barres obliques « \\ » " +"protégées,\n" +" sauf pour les séquences en octal de la forme \\0 ou \\0NNN\n" "\n" "ainsi que toutes les spécifications de format C se terminant par une des\n" "options diouxXfeEgGcs, avec ARGUMENT converti d'abord au type approprié.\n" @@ -7878,27 +8356,27 @@ msgstr "%s : valeur non complètement convertie" #: src/printf.c:247 src/printf.c:274 #, c-format msgid "missing hexadecimal number in escape" -msgstr "nombre hexadécimal manquant dans l'échappement" +msgstr "nombre hexadécimal manquant dans la protection" #: src/printf.c:286 #, c-format msgid "invalid universal character name \\%c%0*x" -msgstr "nom de caractère universel non valide \\%c%0*x" +msgstr "nom de caractère universel \\%c%0*x incorrect" #: src/printf.c:547 #, c-format msgid "invalid field width: %s" -msgstr "largeur de champ non valide : %s" +msgstr "largeur de champ incorrecte : %s" #: src/printf.c:582 #, c-format msgid "invalid precision: %s" -msgstr "précision non valide : %s" +msgstr "précision incorrecte : %s" #: src/printf.c:609 #, c-format msgid "%.*s: invalid conversion specification" -msgstr "%.*s : spécification de conversion non valide" +msgstr "%.*s : spécification de conversion incorrecte" #: src/printf.c:692 #, c-format @@ -7911,12 +8389,12 @@ msgstr "avertissement : arguments superflus ignorés, débutant par %s" #. This is a proper name. See the gettext manual, section Names. #: src/ptx.c:42 msgid "F. Pinard" -msgstr "F. Pinard" +msgstr "François Pinard" #: src/ptx.c:419 #, c-format msgid "%s (for regexp %s)" -msgstr "%s (pour regexp %s)" +msgstr "%s (pour l'expression rationnelle %s)" #: src/ptx.c:1817 #, c-format @@ -7931,28 +8409,25 @@ msgstr "" msgid "" "Output a permuted index, including context, of the words in the input " "files.\n" -"\n" msgstr "" -"Affiche un index permuté, incluant le contexte des mots des fichiers " +"Afficher un index permuté, incluant le contexte des mots des fichiers " "d'entrée.\n" -"\n" -#: src/ptx.c:1828 -#, fuzzy +#: src/ptx.c:1827 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 affiche les références générées " +" -A, --auto-reference afficher références générées " "automatiquement\n" -" -G, --traditional se comporte plutôt comme « ptx » de System " +" -G, --traditional se comporter plutôt comme « ptx » de System " "V\n" -" -F, --flag-truncation=STRING utilise STRING pour indiquer la troncation\n" -" de ligne\n" +" -F, --flag-truncation=STRING utiliser STRING pour indiquer les " +"troncatures\n" +" de ligne\n" -#: src/ptx.c:1833 -#, fuzzy +#: src/ptx.c:1832 msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" " -O, --format=roff generate output as roff directives\n" @@ -7960,15 +8435,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 « xx " -"»\n" -" -O, --format=roff génére la sortie comme des directives roff\n" -" -R, --right-side-refs place les références à droite, sans " -"décompte -w\n" +" -M, --macro-name=STRING 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" -" -T, --format=tex génére la sortie comme des directives TeX\n" +" -T, --format=tex générer la sortie comme des directives TeX\n" -#: src/ptx.c:1840 +#: src/ptx.c:1839 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -7977,50 +8453,49 @@ 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 utilise REGEXP pour établir la concordance " -"avec chaque mot\n" -" -b, --break-file=FILE utilise les césure de mots de FILE\n" -" -f, --ignore-case convertit les minuscules en majuscules pour " -"le tri\n" -" -g, --gap-size=NUMBER espace de NUMBER blancs les colonnes entre " -"les champs\n" -" -i, --ignore-file=FILE lit la liste des mots à ignorer dans FILE\n" -" -o, --only-file=FILE lit la liste des mots à conserver dans " +" -W, --word-regexp=REGEXP utiliser REGEXP pour établir la " +"correspondance\n" +" à chaque mot\n" +" -b, --break-file=FILE utiliser les césures de mots de FILE\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" -#: src/ptx.c:1848 +#: src/ptx.c:1847 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 donne la référence du 1er champ de chaque " -"ligne\n" -" -t, --typeset-mode - option non implémentée -\n" -" -w, --width=NUMBER largeur d'affichage en colonnes, références " -"exclues\n" +" -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 " +"référence\n" -#: src/ptx.c:1855 -#, fuzzy +#: src/ptx.c:1854 msgid "" "\n" "With no FILE or if FILE is -, read Standard Input. '-F /' by default.\n" msgstr "" "\n" -"Sans FILE, ou quand FILE est -, lit l'entrée standard. « -F / » par défaut.\n" +"Sans FILE, ou quand FILE est -, lire l'entrée standard. « -F / » par " +"défaut.\n" -#: src/ptx.c:1949 +#: src/ptx.c:1948 #, c-format msgid "invalid gap width: %s" -msgstr "largeur de saut non valide : %s" +msgstr "largeur de saut incorrecte : %s" #: src/pwd.c:57 msgid "" "Print the full filename of the current working directory.\n" "\n" msgstr "" -"Affiche le nom complet du fichier du répertoire de travail actuel.\n" +"Afficher le nom complet du fichier du répertoire de travail actuel.\n" "\n" #: src/pwd.c:61 @@ -8028,26 +8503,27 @@ msgid "" " -L, --logical use PWD from environment, even if it contains symlinks\n" " -P, --physical avoid all symlinks\n" msgstr "" -" -L, --logical utilise PWD depuis l'environnement, même s'il contient " +" -L, --logical utiliser PWD depuis l'environnement, même s'il contient " "des\n" -" liens symboliques\n" -" -P, --physical évite tout lien symbolique\n" +" liens symboliques\n" +" -P, --physical éviter tout lien symbolique\n" #: src/pwd.c:166 #, c-format msgid "failed to chdir to %s" -msgstr "impossible de chdir vers %s" +msgstr "impossible de changer de répertoire vers %s" -#: src/pwd.c:170 src/pwd.c:277 +#: src/pwd.c:170 src/pwd.c:277 src/split.c:373 #, c-format msgid "failed to stat %s" -msgstr "échec d'évaluation par stat() de %s" +msgstr "échec d'obtention d'état de %s" #: src/pwd.c:235 #, 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 concordant avec l'inode" +"impossible de repérer l'entrée du répertoire dans %s avec l'inœud " +"correspondant" #: src/pwd.c:362 #, c-format @@ -8055,21 +8531,22 @@ msgid "ignoring non-option arguments" msgstr "ignore les arguments qui ne sont pas des options" #. This is a proper name. See the gettext manual, section Names. -#: src/readlink.c:33 +#: src/readlink.c:32 msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 +#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147 +#: src/stat.c:1349 src/touch.c:212 #, c-format -msgid "Usage: %s [OPTION]... FILE\n" -msgstr "Utilisation : %s [OPTION]... FILE\n" +msgid "Usage: %s [OPTION]... FILE...\n" +msgstr "Utilisation : %s [OPTION]... FILE...\n" #: src/readlink.c:63 msgid "" "Print value of a symbolic link or canonical file name\n" "\n" msgstr "" -"Affiche la valeur d'un lien symbolique ou son nom canonique\n" +"Afficher la valeur d'un lien symbolique ou son nom canonique\n" "\n" #: src/readlink.c:65 @@ -8083,14 +8560,17 @@ msgid "" "recursively,\n" " all components must exist\n" msgstr "" -" -f, --canonicalize canonise en suivant récursivement chaque " +" -f, --canonicalize canoniser en suivant récursivement chaque " +"lien\n" +" symbolique de tous les composants donnés. " +"Tous\n" +" les composant sauf le dernier doivent " +"exister\n" +" -e, --canonicalize-existing canoniser en suivant récursivement chaque " "lien\n" -" symbolique de chaque composant donné.\n" -" Au moins le dernier composant doit exister\n" -" -e, --canonicalize-existing canonise en suivant récursivement tous les\n" -" liens symboliques de chaque composant " -"donné.\n" -" Tous les composants doivent exister\n" +" symbolique de tous les composants donnés. " +"Tous\n" +" les composants doivent exister\n" #: src/readlink.c:75 msgid "" @@ -8099,25 +8579,28 @@ msgid "" "recursively,\n" " without requirements on components " "existence\n" -" -n, --no-newline do not output the trailing newline\n" +" -n, --no-newline do not output the trailing delimiter\n" " -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" msgstr "" -" -m, --canonicalize-missing canonise en suivant récursivement chaque " +" -m, --canonicalize-missing canoniser en suivant récursivement chaque " "lien\n" -" symbolique de chaque composant donné.\n" -" Aucune contrainte sur les composants.\n" -" -n, --no-newline ne génère pas une nouvelle ligne en fin\n" +" symbolique de tous les composants donnés.\n" +" Aucune contrainte sur les composants.\n" +" -n, --no-newline ne pas générer de délimiteur à la fin\n" " -q, --quiet,\n" -" -s, --silent supprime la plupart des messages d'erreur\n" -" -v, --verbose affiche les messages d'erreur\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" -#: src/realpath.c:71 src/rm.c:134 src/shred.c:147 src/stat.c:1330 -#: src/touch.c:215 +#: src/readlink.c:152 #, c-format -msgid "Usage: %s [OPTION]... FILE...\n" -msgstr "Utilisation : %s [OPTION]... FILE...\n" +msgid "ignoring --no-newline with multiple arguments" +msgstr "--no-newline ignoré avec plusieurs arguments" #: src/realpath.c:72 msgid "" @@ -8125,6 +8608,9 @@ msgid "" "all but the last component must exist\n" "\n" msgstr "" +"Afficher le nom de fichier absolu résolu ;\n" +"tous les composants sauf le dernier doivent exister\n" +"\n" #: src/realpath.c:77 msgid "" @@ -8139,71 +8625,87 @@ msgid "" " -z, --zero separate output with NUL rather than newline\n" "\n" msgstr "" +" -e, --canonicalize-existing tous les composants du chemin doivent " +"exister\n" +" -m, --canonicalize-missing aucun composant du chemin n'a besoin " +"d'exister\n" +" -L, --logical résoudre les composants « .. » avant les " +"liens\n" +" symboliques\n" +" -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" +" -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" +"\n" #: src/relpath.c:130 msgid "generating relative path" -msgstr "" +msgstr "génération de chemin relatif" -#: src/remove.c:286 +#: src/remove.c:273 #, c-format msgid "%s: descend into write-protected directory %s? " -msgstr "%s : descendre dans un répertoire protégé en écriture %s ?" +msgstr "%s : descendre dans le répertoire protégé en écriture %s ? " -#: src/remove.c:287 +#: src/remove.c:274 #, c-format msgid "%s: descend into directory %s? " -msgstr "%s : descendre dans le répertoire %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:303 +#: src/remove.c:290 #, c-format msgid "%s: remove write-protected %s %s? " msgstr "%s : supprimer %s (protégé en écriture) %s ? " -#: src/remove.c:304 +#: src/remove.c:291 #, c-format msgid "%s: remove %s %s? " msgstr "%s : supprimer %s %s ? " -#: src/remove.c:417 +#: src/remove.c:374 #, c-format msgid "removed directory: %s\n" msgstr "répertoire supprimé : %s\n" -#: src/remove.c:481 +#: src/remove.c:444 #, c-format msgid "cannot remove directory: %s" msgstr "impossible de supprimer le répertoire : %s" -#: src/remove.c:537 +#: src/remove.c:500 #, c-format msgid "skipping %s, since it's on a different device" -msgstr "ignore %s, du fait qu'il est sur un périphérique différent" +msgstr "%s est ignoré car il est sur un périphérique différent" -#: src/remove.c:557 +#: src/remove.c:520 #, c-format msgid "traversal failed: %s" msgstr "impossible de parcourir : %s" -#: src/remove.c:563 +#: src/remove.c:526 #, c-format msgid "" "unexpected failure: fts_info=%d: %s\n" "please report to %s" msgstr "" -"échec inattendu : fts_info=%d: %s\n" +"échec inattendu : fts_info=%d : %s\n" "Veuillez signaler le problème à %s" -#: src/rm.c:118 -#, fuzzy, c-format +#: src/rm.c:119 +#, c-format msgid "Try '%s ./%s' to remove the file %s.\n" -msgstr "Essayez « %s ./%s » pour supprimer le fichier %s.\n" +msgstr "Saisissez « %s ./%s » pour supprimer le fichier %s.\n" -#: src/rm.c:135 -#, fuzzy +#: src/rm.c:136 msgid "" "Remove (unlink) the FILE(s).\n" "\n" @@ -8211,12 +8713,13 @@ msgid "" "prompt\n" " -i prompt before every removal\n" msgstr "" -"Supprime (retire le lien) les fichiers FILE(s).\n" +"Supprimer (retirer le lien) le ou les fichiers FILEs.\n" "\n" -" -f, --force ignore les fichiers inexistants, ne demande jamais\n" -" -i demande confirmation avant chaque suppression\n" +" -f, --force ignorer les fichiers et arguments inexistants, ne\n" +" jamais demander\n" +" -i demander confirmation avant chaque suppression\n" -#: src/rm.c:141 +#: src/rm.c:142 msgid "" " -I prompt once before removing more than three files, " "or\n" @@ -8227,47 +8730,45 @@ msgid "" " --interactive[=WHEN] prompt according to WHEN: never, once (-I), or\n" " always (-i). Without WHEN, prompt always\n" msgstr "" -" -I demande confirmation une fois avant de supprimer " -"plus de\n" -" 3 fichiers, ou lors de suppresion recursive. Moins\n" -" intrusif que -i, tout en protégeant contre la " -"majorité\n" -" des erreurs\n" -" --interactive[=WHEN] demande confirmation selon WHEN : « never »\n" -" (jamais), « once » (une fois, -I), ou " -"« always »\n" -" (toujours, -i). Sans WHEN, pose la question à " -"chaque\n" -" fois.\n" +" -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 " +"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" -#: src/rm.c:148 +#: src/rm.c:149 msgid "" " --one-file-system when removing a hierarchy recursively, skip any\n" " directory that is on a file system different from\n" " that of the corresponding command line argument\n" msgstr "" -" --one-file-system quand une hiérarchie est supprimée récursivement, " -"ignore\n" -" tout répertoire qui est sur un système de fichiers " -"différent\n" -" de celui de l'argument en question de la ligne de " -"commande\n" +" --one-file-system quand une hiérarchie est supprimée récursivement,\n" +" ignorer tous les répertoires d'un système de\n" +" fichiers différent de celui correspondant à\n" +" l'argument de ligne de commande\n" -#: src/rm.c:153 -#, fuzzy +#: src/rm.c:154 msgid "" " --no-preserve-root do not treat '/' specially\n" " --preserve-root do not remove '/' (default)\n" " -r, -R, --recursive remove directories and their contents recursively\n" +" -d, --dir remove empty directories\n" " -v, --verbose explain what is being done\n" msgstr "" -" --no-preserve-root ne traite pas « / » de manière spécifique\n" -" --preserve-root n'escamote pas « / » (par défaut)\n" -" -r, -R, --recursive supprime les répertoires et leur contenu " +" --no-preserve-root ne pas traiter « / » de manière spécifique\n" +" --preserve-root ne pas supprimer « / » (par défaut)\n" +" -r, -R, --recursive supprimer les répertoires et leur contenu " "récursivement\n" -" -v, --verbose explique ce qui va être fait\n" +" -d, --dir supprimer les répertoires vides\n" +" -v, --verbose expliquer ce qui est fait\n" -#: src/rm.c:161 +#: src/rm.c:163 msgid "" "\n" "By default, rm does not remove directories. Use the --recursive (-r or -R)\n" @@ -8280,8 +8781,8 @@ msgstr "" "(-r ou -R) pour supprimer les répertoires, ainsi que l'intégralité de leur\n" "contenu.\n" -#: src/rm.c:166 -#, fuzzy, c-format +#: src/rm.c:168 +#, c-format msgid "" "\n" "To remove a file whose name starts with a '-', for example '-foo',\n" @@ -8292,13 +8793,13 @@ msgid "" msgstr "" "\n" "Pour supprimer un fichier dont le nom débute par « - », par exemple « -" -"foo »,\n" +"toto »,\n" "utilisez une des commandes suivantes :\n" -" %s -- -foo\n" +" %s -- -toto\n" "\n" -" %s ./-foo\n" +" %s ./-toto\n" -#: src/rm.c:175 +#: src/rm.c:177 msgid "" "\n" "Note that if you use rm to remove a file, it might be possible to recover\n" @@ -8312,12 +8813,12 @@ msgstr "" "d'expertise et de temps. Pour être certain que le contenu ne soit pas\n" "récupérable, envisagez l'utilisation de « shred ».\n" -#: src/rm.c:335 +#: src/rm.c:342 #, c-format msgid "%s: remove all arguments recursively? " -msgstr "%s : supprimer tous les arguments récursivement ? " +msgstr "%s : supprimer tous les arguments récursivement ? " -#: src/rm.c:336 +#: src/rm.c:343 #, c-format msgid "%s: remove all arguments? " msgstr "%s : supprimer tous les arguments ? " @@ -8340,25 +8841,23 @@ msgid "" " ignore each failure that is solely because a directory\n" " is non-empty\n" msgstr "" -"Supprime les répertoires DIRECTORY, s'ils sont vides.\n" +"Supprimer les répertoires DIRECTORY, s'ils sont vides.\n" "\n" " --ignore-fail-on-non-empty\n" -" ignore les échecs qui sont uniquement dûs à répertoire " -"non\n" -" vide\n" +" ignorer les échecs uniquement dus à un répertoire non " +"vide\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 supprime DIRECTORY et ses parents, p. ex. « rmdir -p a/b/" -"c »\n" -" est identique à « rmdir a/b/c a/b a »\n" -" -v, --verbose affiche un diagnostic pour chaque répertoire traité\n" +" -p, --parents supprimer DIRECTORY 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" #: src/rmdir.c:242 #, c-format @@ -8371,15 +8870,20 @@ 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 CONTEXT COMMAND [args]\n" +" ou : %s [ -c ] [-u USER] [-r ROLE] [-t TYPE] [-l RANGE] COMMAND " "[args]\n" #: src/runcon.c:87 msgid "" "Run a program in a different security context.\n" "With neither CONTEXT nor COMMAND, print the current security context.\n" -"\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" + +#: src/runcon.c:94 +msgid "" " CONTEXT Complete security context\n" " -c, --compute compute process transition context before modifying\n" " -t, --type=TYPE type (for same role as parent)\n" @@ -8388,85 +8892,82 @@ msgid "" " -l, --range=RANGE levelrange\n" "\n" msgstr "" -"Exécute un programme dans un contexte de sécurité différent.\n" -"Sans CONTEXT ni COMMAND, affiche le contexte de sécurité actuel.\n" -"\n" " CONTEXT contexte de sécurité complet\n" -" -c, --compute calcul le contexte de transition de processus avant de " -"le\n" -" modifier\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é utilisateur\n" +" -u, --user=USER identité d'utilisateur\n" " -r, --role=ROLE rôle\n" -" -l, --range=RANGE niveau\n" +" -l, --range=RANGE intervalle de niveau\n" "\n" -#: src/runcon.c:140 +#: src/runcon.c:144 #, c-format msgid "multiple roles" -msgstr "rôles multiples" +msgstr "plusieurs rôles" -#: src/runcon.c:145 +#: src/runcon.c:149 #, c-format msgid "multiple types" -msgstr "types multiples" +msgstr "plusieurs types" -#: src/runcon.c:150 +#: src/runcon.c:154 #, c-format msgid "multiple users" -msgstr "utilisateurs multiples" +msgstr "plusieurs utilisateurs" -#: src/runcon.c:155 +#: src/runcon.c:159 #, c-format msgid "multiple levelranges" -msgstr "intervalles de niveaux multiples" +msgstr "plusieurs intervalles de niveaux" -#: src/runcon.c:173 src/runcon.c:209 +#: src/runcon.c:177 src/runcon.c:213 #, c-format msgid "failed to get current context" msgstr "impossible de récupérer le contexte actuel" -#: src/runcon.c:183 +#: src/runcon.c:187 #, c-format msgid "you must specify -c, -t, -u, -l, -r, or context" -msgstr "vous devez spécifier -c, -t, -u, -l, -r ou le contexte" +msgstr "vous devez indiquer -c, -t, -u, -l, -r ou le contexte" -#: src/runcon.c:191 +#: src/runcon.c:195 #, c-format msgid "no command specified" -msgstr "aucune commande spécifiée" +msgstr "aucune commande indiquée" -#: src/runcon.c:197 +#: src/runcon.c:201 #, c-format msgid "%s may be used only on a SELinux kernel" -msgstr "%s peut seulement être utilisé sur un noyau SELinux" +msgstr "%s ne peut être utilisé que sur un noyau SELinux" -#: src/runcon.c:223 +#: src/runcon.c:227 #, c-format msgid "failed to compute a new context" msgstr "impossible de créer un nouveau contexte" -#: src/runcon.c:237 +#: src/runcon.c:241 #, c-format msgid "failed to set new user %s" msgstr "impossible de définir le nouvel utilisateur %s" -#: src/runcon.c:239 +#: src/runcon.c:243 #, c-format msgid "failed to set new type %s" msgstr "impossible de définir le nouveau type %s" -#: src/runcon.c:241 +#: src/runcon.c:245 #, c-format msgid "failed to set new range %s" -msgstr "impossible de définir le nouveau rôle %s" +msgstr "impossible de définir le nouvel intervalle %s" -#: src/runcon.c:243 +#: src/runcon.c:247 #, c-format msgid "failed to set new role %s" msgstr "impossible de définir le nouveau rôle %s" -#: src/runcon.c:251 +#: src/runcon.c:255 #, c-format msgid "unable to set security context %s" msgstr "impossible de définir le contexte de sécurité %s" @@ -8483,25 +8984,24 @@ msgstr "" " ou : %s [OPTION]... FIRST INCREMENT LAST\n" #: src/seq.c:73 +msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" +msgstr "Afficher les nombres de FIRST jusqu'à LAST, avec un pas d'INCREMENT.\n" + +#: src/seq.c:79 msgid "" -"Print numbers from FIRST to LAST, in steps of INCREMENT.\n" -"\n" " -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 "" -"Affiche les nombres de FIRST jusqu'à LAST, par pas de INCREMENT.\n" -"\n" -" -f, --format=FORMAT utilise FORMAT comme le style virgule flottante " -"de\n" -" printf\n" -" -s, --separator=STRING utilise STRING pour séparer les nombres (défaut : " -"\\n)\n" -" -w, --equal-width équilibre la largeur en remplissant l'en-tête par " -"des\n" -" zéros\n" +" -f, --format=FORMAT utiliser FORMAT comme style printf de\n" +" virgule flottante\n" +" -s, --separator=STRING utiliser STRING 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" +" des zéros\n" -#: src/seq.c:82 +#: src/seq.c:86 msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" @@ -8511,15 +9011,14 @@ msgid "" "INCREMENT is usually negative if FIRST is greater than LAST.\n" msgstr "" "\n" -"Si FIRST ou INCREMENT est omis, la valeur 1 est utilisée par défaut. La " -"valeur\n" -"INCREMENT par défaut est 1 même lorsque LAST est plus petit que FIRST.\n" +"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" "INCREMENT est habituellement négatif si FIRST est plus grand que LAST.\n" -#: src/seq.c:90 -#, fuzzy +#: src/seq.c:94 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" @@ -8527,38 +9026,23 @@ msgid "" msgstr "" "FORMAT doit permettre d'afficher un argument de type « double » ;\n" "par défaut à %.PRECf si FIRST, INCREMENT et LAST sont tous décimaux en\n" -"notation fixe avec une précision maximum PREC, et à %g sinon.\n" +"notation fixe avec une précision maximale PREC, et à %g sinon.\n" -#: src/seq.c:136 +#: src/seq.c:140 #, c-format msgid "invalid floating point argument: %s" -msgstr "argument en virgule flottante non valide : %s" - -#: src/seq.c:193 -#, c-format -msgid "format %s has no %% directive" -msgstr "le format %s ne contient pas de directive %%" +msgstr "argument en virgule flottante incorrect : %s" -#: src/seq.c:210 -#, c-format -msgid "format %s ends in %%" -msgstr "le format %s termine avec %%" - -#: src/seq.c:213 +#: src/seq.c:232 #, c-format msgid "format %s has unknown %%%c directive" msgstr "le format %s contient une directive %%%c inconnue" -#: src/seq.c:217 -#, c-format -msgid "format %s has too many %% directives" -msgstr "le format %s contient trop de directives %%" - -#: src/seq.c:431 +#: src/seq.c:555 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" -"format de chaîne ne peut pas être spécifié quand l'impression est égal à la " +"le format de chaîne ne peut pas être indiqué quand l'affichage est égal à la " "largeur des chaînes" #: src/setuidgid.c:49 @@ -8581,13 +9065,13 @@ msgid "" "This program is useful only when run by root (user ID zero).\n" "\n" msgstr "" -"Élimine tous groupes supplémentaires, utilise l'ID utilisateur et l'ID du\n" -"groupe du spécifié USER (ID numérique ou nom), et exécute COMMAND avec les\n" -"ARGUMENTs spécifiés.\n" -"Quitte avec le statut 111 s'il est impossible d'obtenir les ID de " -"l'utilisateur\n" -"et du groupe. Autrement, quitte avec le statut d'exécution de COMMAND.\n" -"Ce programme est utile lorsqu'il est exécuté par le root (ID utilisateur à\n" +"É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" @@ -8596,35 +9080,33 @@ 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éfinit aussi l'ID de groupe primaire au GID numérique, " -"et\n" -" (si spécifié) les ID de groupe supplémentaires à " -"GID1, ...\n" +" -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:163 +#: src/setuidgid.c:162 #, c-format msgid "unknown user-ID: %s" -msgstr "ID utilisateur inconnu : %s" +msgstr "UID inconnu : %s" -#: src/setuidgid.c:174 +#: src/setuidgid.c:173 #, c-format msgid "to use user-ID %s you need to use -g too" -msgstr "pour utiliser l'ID utilisateur %s vous devez aussi utiliser -g" +msgstr "pour utiliser l'UID %s, vous devez aussi utiliser -g" -#: src/setuidgid.c:191 +#: 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:201 +#: src/setuidgid.c:200 #, c-format msgid "cannot set group-ID to %lu" -msgstr "impossible de définir l'ID de groupe à %lu" +msgstr "impossible de définir le GID à %lu" -#: src/setuidgid.c:205 +#: src/setuidgid.c:204 #, c-format msgid "cannot set user-ID to %lu" -msgstr "impossible de définir l'ID utilisateur à %lu" +msgstr "impossible de définir l'UID à %lu" #. This is a proper name. See the gettext manual, section Names. #: src/shred.c:74 @@ -8635,14 +9117,12 @@ msgstr "Colin Plumb" 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" -"\n" msgstr "" -"Écrase le fichier FILE spécifié de manière répétitive, afin de rendre " +"Écraser le fichier FILE indiqué de manière répétitive, afin de rendre " "difficile\n" "toute récupération des données par du matériel même coûteux.\n" -"\n" -#: src/shred.c:156 +#: src/shred.c:155 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -8650,15 +9130,14 @@ msgid "" " --random-source=FILE get random bytes from FILE\n" " -s, --size=N shred this many bytes (suffixes like K, M, G accepted)\n" msgstr "" -" -f, --force modifie les permissions pour permettre l'écriture si\n" -" nécessaire\n" -" -n, --iterations=N écrase N fois au lieu du nombre par défaut (%d)\n" -" --random-source=FILE obtient des octets aléatoires de FILE (par " -"défaut\n" -" /dev/urandom)\n" -" -s, --size=N broie N octets (les suffixes K, M, G sont acceptés)\n" +" -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" -#: src/shred.c:162 +#: src/shred.c:161 msgid "" " -u, --remove truncate and remove file after overwriting\n" " -v, --verbose show progress\n" @@ -8666,18 +9145,18 @@ msgid "" " this is the default for non-regular files\n" " -z, --zero add a final overwrite with zeros to hide shredding\n" msgstr "" -" -u, --remove tronque et supprime le fichier après l'avoir écraser\n" -" -v, --verbose affiche un indicateur de progression\n" -" -x, --exact n'arrondit pas la taille des fichiers jusqu'au prochain " +" -u, --remove 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" -" complet ; c'est le comportement par défaut pour les " +" complet ; c'est le comportement par défaut pour les " "fichiers\n" -" non standards\n" -" -z, --zero ajoute une réécriture finale avec des zéros pour camoufler " +" non standards\n" +" -z, --zero ajouter une réécriture finale avec des zéros pour camoufler " "le\n" -" broyage du fichier\n" +" broyage du fichier\n" -#: src/shred.c:171 +#: src/shred.c:170 msgid "" "\n" "If FILE is -, shred standard output.\n" @@ -8689,17 +9168,18 @@ msgid "" "\n" msgstr "" "\n" -"Si FILE est -, broie à partir de l'entrée standard.\n" +"Si FILE est -, broyer à partir de l'entrée standard.\n" "\n" -"Supprime FILE si --remove (-u) est spécifié. Par défaut, les fichiers ne " -"sont\n" -"supprimés car il est commun d'opérer sur le fichier du périphérique tel que\n" -"/dev/hda, et habituellement ces fichiers ne sont pas supprimés. Sur des " +"Supprimer le ou les FILEs 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" -"standards, la majorité des gens utilise l'option --remove.\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" "\n" -#: src/shred.c:181 +#: src/shred.c:180 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" @@ -8709,7 +9189,7 @@ msgid "" "modes:\n" "\n" msgstr "" -"ATTENTION : notez que shred s'appuie sur l'importante supposition que le " +"Attention : notez que shred s'appuie sur l'importante supposition que le " "système\n" "de fichiers écrasera les données en place. C'est la manière usuelle de " "procéder,\n" @@ -8718,7 +9198,7 @@ msgstr "" "lesquels le broyage n'est pas effectif dans tous les modes :\n" "\n" -#: src/shred.c:189 +#: src/shred.c:188 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -8731,7 +9211,7 @@ msgid "" msgstr "" "* systèmes de fichiers journalisés ou à structure de journalisation, comme " "ceux\n" -" fournis avec AIX et Solaris (et JFS, ReiserFS, XFS, Ext3, etc.)\n" +" fournis avec AIX et Solaris (et JFS, ReiserFS, XFS, ext3, etc.)\n" "\n" "* systèmes de fichiers avec données redondantes et soutenant les écritures " "même\n" @@ -8742,7 +9222,7 @@ msgstr "" " Network Appliance\n" "\n" -#: src/shred.c:199 +#: src/shred.c:198 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -8750,13 +9230,13 @@ msgid "" "* compressed file systems\n" "\n" msgstr "" -"* systèmes de fichiers qui enregistre en cache temporairement, tels que les\n" -" clients NFS version 3\n" +"* systèmes de fichiers qui enregistrent en cache temporairement, comme les\n" +" clients NFS version 3\n" "\n" "* systèmes de fichiers compressés\n" "\n" -#: src/shred.c:206 +#: src/shred.c:205 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" @@ -8767,155 +9247,151 @@ msgid "" "as documented in the mount man page (man mount).\n" "\n" msgstr "" -"Dans le cas du système de fichier ext3, la déclaration ci-avant s'applique " -"(et\n" -"shred dispose d'une efficacité limitée) seulement en mode data=journal, " -"dans\n" +"Pour le système de fichiers ext3, la déclaration précédente ne s'applique\n" +"(et shred dispose d'une efficacité limitée) qu'en mode data=journal, dans\n" "lequel les journaux enregistrent les données en plus des métadonnées. Dans " "les\n" "deux modes data=ordered (par défaut) et data=writeback, shred travaille " "comme\n" -"d'habitude. Les modes de journalisation ext3 peuvent être changés en " +"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" -"dans le fichier /etc/fstab, tel que documenté dans la page man de mount " -"(man\n" -"mount).\n" +"dans le fichier /etc/fstab, tel que documenté dans la page man mount(8).\n" "\n" -#: src/shred.c:216 +#: src/shred.c:215 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 "" -"En plus, l'archivage des système de fichiers et les miroirs à distance " +"En plus, l'archivage des système de fichiers et les miroirs distants " "peuvent\n" "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:296 +#: src/shred.c:295 #, c-format msgid "%s: fdatasync failed" msgstr "%s : échec de fdatasync" -#: src/shred.c:307 +#: src/shred.c:306 #, c-format msgid "%s: fsync failed" msgstr "%s : échec de fsync" -#: src/shred.c:384 +#: src/shred.c:383 #, c-format msgid "%s: cannot rewind" msgstr "%s : impossible de rembobiner" -#: src/shred.c:403 +#: src/shred.c:402 #, c-format msgid "%s: pass %lu/%lu (%s)..." -msgstr "%s : passe %lu/%lu (%s)..." +msgstr "%s : passe %lu/%lu (%s)…" -#: src/shred.c:453 +#: src/shred.c:452 #, c-format msgid "%s: error writing at offset %s" msgstr "%s : erreur d'écriture au décalage %s" -#: src/shred.c:471 +#: src/shred.c:470 #, c-format msgid "%s: lseek failed" msgstr "%s : échec de lseek" -#: src/shred.c:482 +#: src/shred.c:481 #, c-format msgid "%s: file too large" msgstr "%s : fichier trop gros" -#: src/shred.c:505 +#: src/shred.c:504 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" -msgstr "%s : passe %lu/%lu (%s)...%s" +msgstr "%s : passe %lu/%lu (%s)…%s" -#: src/shred.c:521 +#: src/shred.c:520 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" -msgstr "%s : passe %lu/%lu (%s)...%s/%s %d%%" +msgstr "%s : passe %lu/%lu (%s)…%s/%s %d %%" -#: src/shred.c:768 +#: src/shred.c:767 #, c-format msgid "%s: fstat failed" msgstr "%s : échec de fstat" -#: src/shred.c:779 +#: src/shred.c:778 #, c-format msgid "%s: invalid file type" -msgstr "%s : type de fichier non valide" +msgstr "%s : type de fichier incorrect" -#: src/shred.c:798 +#: src/shred.c:797 #, c-format msgid "%s: file has negative size" msgstr "%s : le fichier a une taille négative" -#: src/shred.c:865 +#: src/shred.c:864 src/sort.c:932 src/split.c:378 #, c-format msgid "%s: error truncating" -msgstr "%s : erreur de tronquage" +msgstr "%s : erreur de troncature" -#: src/shred.c:881 +#: src/shred.c:880 #, c-format msgid "%s: fcntl failed" msgstr "%s : échec de fcntl" -#: src/shred.c:886 +#: src/shred.c:885 #, 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:968 +#: src/shred.c:967 #, c-format msgid "%s: removing" msgstr "%s : suppression" -#: src/shred.c:992 +#: src/shred.c:991 #, c-format msgid "%s: renamed to %s" msgstr "%s : renommé en %s" -#: src/shred.c:1014 +#: src/shred.c:1013 #, c-format msgid "%s: failed to remove" msgstr "%s : échec de suppression" -#: src/shred.c:1018 +#: src/shred.c:1017 #, c-format msgid "%s: removed" msgstr "%s : supprimé" -#: src/shred.c:1025 src/shred.c:1068 +#: src/shred.c:1024 src/shred.c:1067 #, c-format msgid "%s: failed to close" msgstr "%s : échec de fermeture" -#: src/shred.c:1061 +#: src/shred.c:1060 #, c-format msgid "%s: failed to open for writing" msgstr "%s : échec d'ouverture en écriture" -#: src/shred.c:1126 +#: src/shred.c:1125 #, c-format msgid "%s: invalid number of passes" -msgstr "%s : nombre de passes non valide" +msgstr "%s : nombre de passes incorrect" -#: src/shred.c:1135 src/shuf.c:291 src/sort.c:4387 +#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441 #, c-format msgid "multiple random sources specified" -msgstr "multiples sources aléatoires spécifiées" +msgstr "plusieurs sources aléatoires indiquées" -#: src/shred.c:1149 +#: src/shred.c:1148 #, c-format msgid "%s: invalid file size" -msgstr "%s : longueur de fichier non valide" +msgstr "%s : longueur de fichier incorrect" #: src/shuf.c:48 #, c-format @@ -8929,15 +9405,12 @@ msgstr "" " ou : %s -i LO-HI [OPTION]...\n" #: src/shuf.c:54 -msgid "" -"Write a random permutation of the input lines to standard output.\n" -"\n" +msgid "Write a random permutation of the input lines to standard output.\n" msgstr "" -"Affiche une permutation aléatoire des lignes entrées sur la sortie " +"Afficher une permutation aléatoire des lignes entrées sur la sortie " "standard.\n" -"\n" -#: src/shuf.c:61 +#: src/shuf.c:60 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 " @@ -8947,47 +9420,46 @@ msgid "" " --random-source=FILE get random bytes from FILE\n" " -z, --zero-terminated end lines with 0 byte, not newline\n" msgstr "" -" -e, --echo traite chaque ARG comme une ligne d'entrée\n" -" -i, --input-range=LO-HI traite chaque nombre de LO à HI comme une ligne\n" -" d'entrée\n" -" -n, --head-count=COUNT affiche au plus COUNT lignes\n" -" -o, --output=FILE écrit le résultat dans FILE au lieu de la " +" -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 " +"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 " "sortie\n" -" standard\n" -" --random-source=FILE obtient aléatoirement des octets de FILE (par " -"défaut\n" -" /dev/urandom)\n" -" -z, --zero-terminated termine les lignes avec l'octet 0, pas de " -"nouvelle\n" -" ligne\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" -#: src/shuf.c:245 +#: src/shuf.c:244 #, c-format msgid "multiple -i options specified" -msgstr "multiples options -l spécifiées" +msgstr "plusieurs options -l indiquées" -#: src/shuf.c:265 +#: src/shuf.c:264 #, c-format msgid "invalid input range %s" -msgstr "intervalle d'entrée non valide %s" +msgstr "intervalle d'entrée %s incorrect" -#: src/shuf.c:278 +#: src/shuf.c:277 #, c-format msgid "invalid line count %s" -msgstr "compteur ligne non valide %s" +msgstr "compteur de lignes %s incorrect" -#: src/shuf.c:285 src/sort.c:4381 +#: src/shuf.c:284 src/sort.c:4435 #, c-format msgid "multiple output files specified" -msgstr "options multiples fichiers de sortie spécifiées" +msgstr "plusieurs fichiers de sortie indiquées" -#: src/shuf.c:311 +#: src/shuf.c:310 #, c-format msgid "cannot combine -e and -i options" msgstr "impossible de combiner les options -e et -i" #: src/sleep.c:44 -#, fuzzy, c-format +#, c-format msgid "" "Usage: %s NUMBER[SUFFIX]...\n" " or: %s OPTION\n" @@ -9001,34 +9473,30 @@ msgid "" msgstr "" "Utilisation : %s NUMBER[SUFFIX]...\n" " ou : %s OPTION\n" -"Effectue une pause de NUMBER secondes. SUFFIX peut être « s » pour des\n" -"secondes (par défaut), « m » pour minutes, « h » pour heures ou « d »\n" -"pour des jours. Contrairement à la plupart des implémentations qui " -"requièrent un\n" -"nombre entier, ici NUMBER peut être un nombre arbitraire en virgule " -"flottante.\n" +"Effectuer une pause de NUMBER secondes. SUFFIX 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" "Avec plusieurs arguments, la pause se fait selon la somme des valeurs.\n" "\n" -#: src/sleep.c:135 src/timeout.c:295 +#: src/sleep.c:135 src/timeout.c:320 #, c-format msgid "invalid time interval %s" -msgstr "intervalle de temps non valide %s" +msgstr "intervalle de temps %s incorrect" #: src/sleep.c:146 src/tail.c:1219 #, c-format msgid "cannot read realtime clock" msgstr "impossible de lire l'horloge temps réel" -#: src/sort.c:395 -msgid "" -"Write sorted concatenation of all FILE(s) to standard output.\n" -"\n" +#: src/sort.c:399 +msgid "Write sorted concatenation of all FILE(s) to standard output.\n" msgstr "" -"Affiche la concaténation triée de tous les FILE(s) sur la sortie standard.\n" -"\n" +"Afficher la concaténation triée de tous les FILEs sur la sortie standard.\n" -#: src/sort.c:402 +#: src/sort.c:405 msgid "" "Ordering options:\n" "\n" @@ -9036,53 +9504,51 @@ msgstr "" "Options de tri :\n" "\n" -#: src/sort.c:406 +#: src/sort.c:409 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 ignore les blancs en en-tête\n" -" -d, --dictionary-order considére seulement les blancs et les " +" -b, --ignore-leading-blanks ignorer les blancs d'en-tête\n" +" -d, --dictionary-order ne considérer que les blancs et les " "caractères\n" -" alphanumériques\n" -" -f, --ignore-case transforme les caractères minuscules en " -"majuscules\n" +" alphanumériques\n" +" -f, --ignore-case transformer les minuscules en majuscules\n" -#: src/sort.c:412 -#, fuzzy +#: src/sort.c:415 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 compare selon la valeur numérique générale\n" -" -i, --ignore-nonprinting considère seulement les caractères " -"affichables\n" -" -M, --month-sort compare (inconnu) < « JANV. » < ... < " +" -g, --general-numeric-sort comparer selon la valeur numérique générale\n" +" -i, --ignore-nonprinting ne considérer que les caractères affichables\n" +" -M, --month-sort comparer (inconnu) < « JANV. » < ... < " "« DÉC. »\n" -#: src/sort.c:417 +#: src/sort.c:420 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" -" -h, --human-numeric-sort compare des chiffres humanisés (p. ex. 2K 1G)\n" +" -h, --human-numeric-sort comparer des chiffres lisibles (par exemple 2K " +"1G)\n" -#: src/sort.c:420 +#: src/sort.c:423 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 "" -" -n, --numeric-sort compare selon une valeur numérique de type " +" -n, --numeric-sort comparer selon une valeur numérique de type " "chaîne\n" -" -R, --random-sort tri par clé de hachage aléatoire\n" -" --random-source=FILE obtient des octets aléatoires depuis FILE\n" -" -r, --reverse inverse le résultat des comparaisons\n" +" -R, --random-sort trier par clef de hachage aléatoire\n" +" --random-source=FILE obtenir des octets aléatoires de FILE\n" +" -r, --reverse inverser le résultat des comparaisons\n" -#: src/sort.c:426 +#: src/sort.c:429 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -9091,16 +9557,16 @@ msgid "" " -V, --version-sort natural sort of (version) numbers within text\n" "\n" msgstr "" -" --sort=WORD tri selon WORD :\n" +" --sort=WORD trier selon WORD :\n" " general-numeric -g, human-numeric -h, month -" "M,\n" " numeric -n, random -R, version -V\n" -" -V, --version-sort tri naturel des chiffres (de version) contenu " +" -V, --version-sort tri naturel des numéros (de version) contenus " "dans\n" -" le texte\n" +" le texte\n" "\n" -#: src/sort.c:434 +#: src/sort.c:437 msgid "" "Other options:\n" "\n" @@ -9108,15 +9574,15 @@ msgstr "" "Autres Options :\n" "\n" -#: src/sort.c:438 +#: src/sort.c:441 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" msgstr "" -" --batch-size=NMERGE fusionne au plus NMERGE entréeS à la fois;\n" -" pour plus, employez des fichiers temporaires\n" +" --batch-size=NMERGE fusionner au plus NMERGE entrées à la fois ;\n" +" pour plus, employez des fichiers temporaires\n" -#: src/sort.c:442 +#: src/sort.c:445 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 " @@ -9124,16 +9590,15 @@ msgid "" " --compress-program=PROG compress temporaries with PROG;\n" " decompress them with PROG -d\n" msgstr "" -" -c, --check, --check=diagnose-first vérifie le tri de l'entrée ; ne trie " -"pas\n" -" -C, --check=quiet, --check=silent comme -c, mais n'affiche pas la " +" -c, --check, --check=diagnose-first vérifier le tri de l'entrée, sans " +"trier\n" +" -C, --check=quiet, --check=silent comme -c, mais ne pas afficher la " "première\n" " ligne erronée\n" -" --compress-program=PROG compresse les temporaires avec PROG et " -"les\n" -" décompresse avec PROG -d\n" +" --compress-program=PROG compresser les temporaires avec PROG et les\n" +" décompresser avec PROG -d\n" -#: src/sort.c:449 +#: src/sort.c:452 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -9141,44 +9606,43 @@ msgid "" " NUL-terminated names in file F;\n" " If F is - then read names from standard input\n" msgstr "" -" --debug annote la partie de la ligne à trier, et " -"avertit\n" -" en cas d'utilisation étrange sur stderr\n" -" --files0-from=F lit en entrée des fichiers spécifiés par des " +" --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 " "noms\n" -" terminés par NULL dans le fichier F.\n" -" Si F est -, lit les noms depuis l'entrée " +" terminés par NULL dans le fichier F.\n" +" Si F est -, lire les noms depuis l'entrée " "standard\n" -"\n" -#: src/sort.c:456 -#, fuzzy +#: src/sort.c:459 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] démarre la clé à POS1 (origine 1), finit à POS2\n" -" (par défault en fin de ligne). Voir la syntaxe " -"POS\n" -" ci-dessous.\n" -" -m, --merge fusionne les fichiers déjà triés ; ne trie pas\n" +" -k, --key=KEYDEF trier suivant une clef, KEYDEF indique " +"l'emplacement\n" +" et le type\n" +" -m, --merge fusionner les fichiers déjà triés ; ne pas " +"trier\n" -#: src/sort.c:460 +#: src/sort.c:463 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 écrit le résultat dans FILE au lieu de la " +" -o, --output=FILE écrire le résultat dans FILE au lieu de la " "sortie\n" -" standard\n" -" -s, --stable stabilise le tri en désactivant la comparaison " +" standard\n" +" -s, --stable stabiliser le tri en désactivant la comparaison " "de\n" -" dernier recours\n" -" -S, --buffer-size=SIZE utilise SIZE pour le tampon mémoire principal\n" +" dernier recours\n" +" -S, --buffer-size=SIZE utiliser SIZE pour le tampon mémoire principal\n" -#: src/sort.c:466 +#: src/sort.c:469 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -9192,29 +9656,26 @@ msgid "" " without -c, output only the first of an equal " "run\n" msgstr "" -" -t, --field-separator=SEP utilise SEP au lieu de non-blanc pour les\n" -" transitions d'espace\n" -" -T, --temporary-directory=DIR utilise DIR pour les fichiers temporaires, " +" -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, " "non\n" -" pas $TMPDIR ou %s ;\n" -" des options multiples spécifient de " -"multiples\n" -" répertoires\n" -" --parallel=N change le nombre de tri à lancer en " -"parallèle\n" -" à N\n" -" -u, --unique avec -c, vérifie l'ordonnancement strict\n" -" sans -c, affiche les premiers d'une passe\n" -" équivalente\n" - -#: src/sort.c:475 +" pas $TMPDIR ou %s ; plusieurs options\n" +" indiquent plusieurs répertoires\n" +" --parallel=N exécuter N tris en parallèle\n" +" -u, --unique avec -c, vérifier l'ordonnancement " +"strict ;\n" +" sans -c, n'afficher que la première " +"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 termine les lignes avec l'octet 0, \n" -" et non pas par un retour de chariot\n" +" -z, --zero-terminated terminer les lignes avec l'octet NULL, sans\n" +" changement de ligne\n" -#: src/sort.c:480 -#, fuzzy +#: src/sort.c:483 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -9233,19 +9694,18 @@ msgid "" "SIZE may be followed by the following multiplicative suffixes:\n" msgstr "" "\n" -"POS est F[.C][OPTS], où F est le numéro de champ et C la position du " -"caractère\n" -"dans le champ ;  chacun à origine 1. Si ni -t ni -b est actif, les " -"caractères d'un\n" -"champs sont comptés depuis le début de l'espace précédant. OPTS se compose " -"d'une\n" -"option de tri d'une ou plusieurs lettres simples, laquelle écrase\n" -"l'ordonnancement global pour cette clé. Si aucune clé n'est donnée,\n" -"la ligne entière est utilisée comme clé.\n" +"KEYDEF 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" +"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" -#: src/sort.c:493 +#: src/sort.c:496 msgid "" "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n" "\n" @@ -9256,284 +9716,280 @@ 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 M, G, T, " -"P,\n" -"E, Z, Y.\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 -, lit l'entrée standard.\n" +"Sans FILE, ou quand FILE est -, lire l'entrée standard.\n" "\n" -"*** AVERTISSEMENT ***\n" -"La localisation utilisée dans l'environnement affecte l'ordre du tri.\n" -"Utilisez LC_ALL=C pour obtenir un tri selon un ordre traditionnel qui " -"utilise\n" -"la valeur native des octets.\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:694 +#: src/sort.c:697 #, c-format msgid "waiting for %s [-d]" msgstr "en attente de %s [-d]" -#: src/sort.c:699 +#: src/sort.c:702 #, c-format msgid "%s [-d] terminated abnormally" msgstr "%s [-d] a terminé anormalement" -#: src/sort.c:853 +#: src/sort.c:856 #, c-format msgid "cannot create temporary file in %s" msgstr "impossible de créer le fichier temporaire dans %s" -#: src/sort.c:939 src/sort.c:2010 src/sort.c:3056 src/sort.c:3755 -#: src/sort.c:3758 +#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713 +#: src/sort.c:3804 src/sort.c:3807 msgid "open failed" msgstr "échec d'ouverture" -#: src/sort.c:959 +#: src/sort.c:970 msgid "fflush failed" msgstr "échec de fflush" -#: src/sort.c:964 src/sort.c:2013 src/sort.c:4646 +#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706 msgid "close failed" msgstr "échec de fermeture" -#: src/sort.c:973 +#: src/sort.c:986 #, c-format msgid "dup2 failed" -msgstr "dup2 a échoué" +msgstr "échec de dup2" -#: src/sort.c:1090 +#: src/sort.c:1103 #, c-format msgid "couldn't execute %s" msgstr "impossible d'exécuter %s" -#: src/sort.c:1097 +#: src/sort.c:1110 msgid "couldn't create temporary file" -msgstr "impossible de créer le fichier le fichier temporaire" +msgstr "impossible de créer le fichier temporaire" -#: src/sort.c:1136 +#: src/sort.c:1149 #, c-format msgid "couldn't create process for %s -d" msgstr "impossible de créer le processus pour %s -d" -#: src/sort.c:1150 +#: src/sort.c:1161 #, c-format msgid "couldn't execute %s -d" msgstr "impossible d'exécuter %s -d" -#: src/sort.c:1209 +#: src/sort.c:1220 #, c-format msgid "warning: cannot remove: %s" msgstr "avertissement : impossible de supprimer : %s" -#: src/sort.c:1295 +#: src/sort.c:1306 #, c-format msgid "invalid --%s argument %s" -msgstr "argument -- %s non valide %s" +msgstr "argument %2$s de --%1$s incorrect" -#: src/sort.c:1298 +#: src/sort.c:1309 #, c-format msgid "minimum --%s argument is %s" -msgstr "l'argument minimum --%s est %s" +msgstr "l'argument minimal de --%s est %s" -#: src/sort.c:1313 +#: src/sort.c:1324 #, c-format msgid "--%s argument %s too large" -msgstr "--%s argument %s trop grand" +msgstr "argument de --%s %s trop grand" -#: src/sort.c:1316 +#: src/sort.c:1327 #, c-format msgid "maximum --%s argument with current rlimit is %s" -msgstr "l'argument maximum --%s avec la rlimit actuelle est %s" +msgstr "l'argument maximal de --%s avec la rlimit actuelle est %s" -#: src/sort.c:1398 +#: src/sort.c:1409 #, c-format msgid "number in parallel must be nonzero" msgstr "le nombre en parallèle doit être non nul" -#: src/sort.c:1479 +#: src/sort.c:1494 msgid "stat failed" msgstr "échec de stat()" -#: src/sort.c:1740 +#: src/sort.c:1755 msgid "read failed" msgstr "échec de lecture" -#: src/sort.c:2028 +#: src/sort.c:2043 #, c-format msgid "string transformation failed" -msgstr "impossible de transformer la chaîne" +msgstr "échec de transformation de chaîne" -#: src/sort.c:2031 +#: src/sort.c:2046 #, c-format msgid "the untransformed string was %s" msgstr "la chaîne non transformée était %s" -#: src/sort.c:2194 +#: src/sort.c:2209 #, c-format msgid "^ no match for key\n" -msgstr "^ ne correspond à aucun mot-clé\n" +msgstr "^ ne correspond à aucun mot clef\n" -#: src/sort.c:2374 -#, fuzzy, c-format +#: src/sort.c:2389 +#, c-format msgid "obsolescent key %s used; consider %s instead" -msgstr "le mot-clé obsolète « %s » est utilisé ; considérez « %s » à la place" +msgstr "le mot clef obsolète « %s » est utilisé ; considérez « %s » à la place" -#: src/sort.c:2380 +#: src/sort.c:2395 #, c-format msgid "key %lu has zero width and will be ignored" -msgstr "le mot-cléé %lu a une largeur nulle et sera ignoré" +msgstr "le mot clef %lu a une largeur nulle et sera ignoré" -#: src/sort.c:2391 -#, fuzzy, c-format +#: src/sort.c:2406 +#, 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-clé %lu ; considérez " +"les espaces au début sont significatifs dans le mot clef %lu ; considérez " "aussi l'emploi de « b »" -#: src/sort.c:2404 +#: src/sort.c:2419 #, c-format msgid "key %lu is numeric and spans multiple fields" -msgstr "le mot-clé %lu est numérique et s'étend sur plusieurs champs" +msgstr "le mot clef %lu est numérique et s'étend sur plusieurs champs" -#: src/sort.c:2436 -#, fuzzy, c-format +#: src/sort.c:2451 +#, 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:2442 -#, fuzzy, c-format +#: src/sort.c:2457 +#, 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:2716 src/sort.c:2725 +#: src/sort.c:2731 src/sort.c:2740 msgid "write failed" msgstr "échec d'écriture" -#: src/sort.c:2768 +#: src/sort.c:2783 #, c-format msgid "%s: %s:%s: disorder: " -msgstr "%s : %s:%s: désordre : " +msgstr "%s : %s:%s : désordre : " -#: src/sort.c:2771 +#: src/sort.c:2786 msgid "standard error" msgstr "erreur standard" -#: src/sort.c:3926 +#: src/sort.c:3698 +msgid "cannot read" +msgstr "impossible de lire" + +#: src/sort.c:3976 #, c-format msgid "%s: invalid field specification %s" -msgstr "%s : spécification de champ non valide %s" +msgstr "%s : spécification de champ incorrect %s" -#: src/sort.c:3937 -#, fuzzy, c-format +#: src/sort.c:3987 +#, c-format msgid "options '-%s' are incompatible" msgstr "les options « -%s » sont incompatibles" -#: src/sort.c:3988 +#: src/sort.c:4038 #, c-format msgid "%s: invalid count at start of %s" -msgstr "%s : compteur non valide au départ de %s" +msgstr "%s : compteur incorrect au départ de %s" -#: src/sort.c:4245 -#, fuzzy +#: src/sort.c:4295 msgid "invalid number after '-'" -msgstr "nombre non valide après « - »" +msgstr "nombre incorrect après « - »" -#: src/sort.c:4248 src/sort.c:4334 src/sort.c:4362 -#, fuzzy +#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416 msgid "invalid number after '.'" -msgstr "nombre non valide après « . »" +msgstr "nombre incorrect après « . »" -#: src/sort.c:4261 src/sort.c:4367 +#: src/sort.c:4315 src/sort.c:4421 msgid "stray character in field spec" msgstr "caractère égaré dans le champ de spécification" -#: src/sort.c:4308 +#: src/sort.c:4362 #, c-format msgid "multiple compress programs specified" -msgstr "multiples programmes de compression spécifiés" +msgstr "plusieurs programmes de compression indiqués" -#: src/sort.c:4325 +#: src/sort.c:4379 msgid "invalid number at field start" -msgstr "nombre non valide dans le champ de départ" +msgstr "nombre incorrect dans le champ de départ" -#: src/sort.c:4329 src/sort.c:4357 +#: src/sort.c:4383 src/sort.c:4411 msgid "field number is zero" -msgstr "numéro de champ est zéro" +msgstr "le numéro de champ est zéro" -#: src/sort.c:4338 +#: src/sort.c:4392 msgid "character offset is zero" -msgstr "adresse relative du caractère est zéro" +msgstr "l'adresse relative du caractère est zéro" -#: src/sort.c:4353 -#, fuzzy +#: src/sort.c:4407 msgid "invalid number after ','" -msgstr "nombre non valide après « , »" +msgstr "nombre incorrect après « , »" -#: src/sort.c:4403 +#: src/sort.c:4457 #, c-format msgid "empty tab" msgstr "tabulation vide" -#: src/sort.c:4496 src/wc.c:692 +#: src/sort.c:4550 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:4518 +#: src/sort.c:4572 #, c-format msgid "%s:%lu: invalid zero-length file name" -msgstr "%s:%lu : non valide, longueur zéro du nom de fichier" +msgstr "%s:%lu : incorrect, nom de fichier de longueur nulle" -#: src/sort.c:4524 +#: src/sort.c:4578 #, c-format msgid "no input from %s" msgstr "aucune d'entrée depuis %s" -#: src/sort.c:4570 +#: src/sort.c:4624 #, c-format msgid "using %s sorting rules" -msgstr "utilse les règles de tri %s" +msgstr "utilisation des règles de tri %s" -#: src/sort.c:4573 +#: src/sort.c:4627 #, c-format msgid "using simple byte comparison" -msgstr "utilise la comparaison simple par octet" +msgstr "utilisation de la comparaison simple d'octet" -#: src/sort.c:4604 +#: src/sort.c:4658 #, c-format msgid "extra operand %s not allowed with -%c" -msgstr "opérande suplémentaire « %s » non permise avec -%c" +msgstr "opérande supplémentaire « %s » non permis avec -%c" -#: src/split.c:184 +#: src/split.c:187 #, 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:201 +#: src/split.c:204 #, c-format msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" msgstr "Utilisation : %s [OPTION]... [INPUT [PREFIX]]\n" -#: src/split.c:205 -#, fuzzy +#: src/split.c:208 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" -"\n" msgstr "" -"Affiche sur la sortie des morceaux de INPUT de taille fixe selon PREFIXaa,\n" -"PREFIXab, ... ; par défaut la taille est de 1000 lignes et le préfixe par\n" -"défaut est « x ».\n" -"Sans INPUT ou quand INPUT est -, la lecture se fait sur l'entrée standard.\n" -"\n" +"Afficher des morceaux de INPUT de taille fixe selon PREFIXaa, " +"PREFIXab, ... ;\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" -#: src/split.c:214 -#, fuzzy, c-format +#: src/split.c:216 +#, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" " --additional-suffix=SUFFIX append an additional SUFFIX to file " @@ -9550,34 +10006,36 @@ msgid "" " -n, --number=CHUNKS generate CHUNKS output files. See below\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" -" -a, --suffix-length=N utilise les suffixes de longueur N (par défaut " -"%d)\n" -" -b, --bytes=SIZE écrit SIZE octets par fichier de sortie\n" -" -C, --line-bytes=SIZE écrit au plus SIZE octets par ligne par fichier " +" -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 " "de\n" -" sortie\n" -" -d, --numeric-suffixes utilise des suffixes numériques et non " -"alphabétiques\n" -" -e, --elide-empty-files ne gènère pas de fichiers vides avec « -n »\n" -" --filter=COMMAND écrit vers la commande shell COMMAND ; le nom de\n" -" fichier est $FILE\n" -" -l, --lines=NUMBER écrit NUMBER lignes par fichier de sortie\n" -" -n, --number=CHUNKS génère CHUNKS fichiers de sortie. Voir ci-" +" 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 ; " +"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" -" -u, --unbuffered copie immédiatement l'entrée sur la sortie avec\n" -" « -n r/... »\n" +" -u, --unbuffered copier immédiatement l'entrée sur la sortie avec\n" +" « -n r/... »\n" -#: src/split.c:227 +#: src/split.c:229 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" msgstr "" -" --verbose affiche un diagnostic juste avant chaque ouverture " -"de\n" -" fichier de sortie\n" +" --verbose afficher un diagnostic juste avant l'ouverture de\n" +" chaque fichier de sortie\n" -#: src/split.c:234 -#, fuzzy +#: src/split.c:236 msgid "" "\n" "CHUNKS may be:\n" @@ -9590,193 +10048,200 @@ msgid "" msgstr "" "\n" "CHUNKS peut être :\n" -"N sépare en N fichiers selon la taille de l'entrée\n" -"K/N affiche Ke de N sur la sortie\n" -"l/N sépare en N fichiers sans couper les lignes\n" -"l/K/N affiche Ke de N sur la sortie sans couper les lignes\n" -"r/N comme « l » mais utilise une distribution « round robin »\n" -"r/K/N identique mais affiche seulement Ke de N sur la sortie\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" +"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" +"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" -#: src/split.c:352 +#: src/split.c:354 #, c-format msgid "output file suffixes exhausted" msgstr "les suffixes des fichiers de sortie sont épuisés" -#: src/split.c:364 +#: src/split.c:366 #, c-format msgid "creating file %s\n" msgstr "création du fichier %s\n" -#: src/split.c:377 +#: src/split.c:375 +#, c-format +msgid "%s would overwrite input; aborting" +msgstr "%s écraserait l'entrée ; abandon" + +#: src/split.c:391 #, c-format msgid "failed to set FILE environment variable" msgstr "impossible de définir la variable d'environnement FILE" -#: src/split.c:379 +#: src/split.c:393 #, c-format msgid "executing with FILE=%s\n" -msgstr "exécute avec FILE=%s\n" +msgstr "exécution avec FILE=%s\n" -#: src/split.c:381 +#: src/split.c:395 #, c-format msgid "failed to create pipe" msgstr "impossible de créer le tube" -#: src/split.c:395 +#: src/split.c:409 #, c-format msgid "closing prior pipe" msgstr "fermeture du tube précédent" -#: src/split.c:397 +#: src/split.c:411 #, c-format msgid "closing output pipe" msgstr "fermeture du tube de sortie" -#: src/split.c:401 +#: src/split.c:415 #, c-format msgid "moving input pipe" msgstr "déplacement du tube d'entrée" -#: src/split.c:403 +#: src/split.c:417 #, c-format msgid "closing input pipe" msgstr "fermeture du tube d'entrée" -#: src/split.c:408 +#: src/split.c:422 #, c-format msgid "failed to run command: \"%s -c %s\"" -msgstr "impossible d'exécuter la commande « %s -s %s »" +msgstr "impossible d'exécuter la commande : « %s -s %s »" -#: src/split.c:414 +#: src/split.c:428 #, c-format msgid "failed to close input pipe" msgstr "impossible de fermer le tube d'entrée" -#: src/split.c:450 +#: src/split.c:464 #, c-format msgid "waiting for child process" msgstr "en attente du processus fils" -#: src/split.c:460 +#: src/split.c:474 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "avec FILE=%s, signal %s de la commande : %s" -#: src/split.c:468 +#: src/split.c:482 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "avec FILE=%s, sortie %d de la commande : %s" -#: src/split.c:475 src/timeout.c:449 +#: src/split.c:489 src/timeout.c:494 #, c-format msgid "unknown status from command (0x%X)" -msgstr "erreur à l'attente de la commande (0x%X)" +msgstr "état inconnu de la commande (0x%X)" -#: src/split.c:1037 +#: src/split.c:1052 #, c-format msgid "cannot split in more than one way" msgstr "impossible de séparer de plusieurs manières" -#: src/split.c:1050 src/split.c:1192 src/split.c:1363 +#: src/split.c:1065 src/split.c:1205 src/split.c:1376 #, c-format msgid "%s: invalid number of chunks" -msgstr "%s : nombre de morceaux non valide" +msgstr "%s : nombre de morceaux incorrect" -#: src/split.c:1054 +#: src/split.c:1069 #, c-format msgid "%s: invalid chunk number" -msgstr "%s : numéro de morceau non valide" +msgstr "%s : numéro de morceau incorrect" -#: src/split.c:1106 +#: src/split.c:1119 #, c-format msgid "%s: invalid suffix length" -msgstr "%s : longueur de suffixe non valide" +msgstr "%s : longueur de suffixe incorrecte" -#: src/split.c:1131 src/split.c:1139 src/split.c:1162 src/split.c:1167 +#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180 #, c-format msgid "%s: invalid number of bytes" -msgstr "%s : nombre d'octets non valide" +msgstr "%s : nombre d'octets incorrect" -#: src/split.c:1150 src/split.c:1297 +#: src/split.c:1163 src/split.c:1310 #, c-format msgid "%s: invalid number of lines" -msgstr "%s : nombre de lignes non valide" +msgstr "%s : nombre de lignes incorrect" -#: src/split.c:1223 +#: src/split.c:1236 #, c-format msgid "line count option -%s%c... is too large" -msgstr "l'option compteur de ligne -%s%c est trop grande" +msgstr "l'option de décompte de ligne -%s%c... est trop grande" -#: src/split.c:1235 -#, fuzzy, c-format +#: src/split.c:1248 +#, c-format msgid "%s: invalid start value for numerical suffix" -msgstr "le numéro de ligne de départ non valide : %s" +msgstr "%s : valeur de départ incorrecte pour le suffixe numérique" -#: src/split.c:1263 +#: src/split.c:1276 #, c-format msgid "%s: invalid IO block size" -msgstr "%s : taille de bloc E/S non valide" +msgstr "%s : taille de bloc d'E/S incorrecte" -#: src/split.c:1284 +#: src/split.c:1297 #, c-format msgid "--filter does not process a chunk extracted to stdout" -msgstr "--filter ne traite pas les données extraites de stdout" +msgstr "--filter ne traite pas les morceaux extraits vers la sortie standard" -#: src/split.c:1321 +#: src/split.c:1334 #, 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:1356 +#: src/split.c:1369 #, 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:169 +#: src/stat.c:173 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:838 +#: src/stat.c:857 #, c-format msgid "failed to canonicalize %s" msgstr "impossible de canoniser %s" -#: src/stat.c:1050 -#, fuzzy, c-format +#: src/stat.c:1069 +#, c-format msgid "warning: unrecognized escape '\\%c'" -msgstr "avertissement : séquence d'échappement non reconnue « \\%c »" +msgstr "avertissement : séquence de protection « \\%c » non reconnue" -#: src/stat.c:1105 +#: src/stat.c:1124 #, c-format msgid "%s: invalid directive" -msgstr "%s : directive non valide" +msgstr "%s : directive incorrecte" -#: src/stat.c:1151 +#: src/stat.c:1170 #, c-format msgid "warning: backslash at end of format" msgstr "avertissement : barre oblique inverse à la fin du format" -#: src/stat.c:1182 +#: src/stat.c:1201 #, 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:1189 +#: src/stat.c:1208 #, c-format msgid "cannot read file system information for %s" -msgstr "impossible de lire les informations du système de fichier pour %s" +msgstr "impossible de lire les informations du système de fichiers pour %s" -#: src/stat.c:1209 +#: src/stat.c:1228 #, 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:1245 +#: src/stat.c:1264 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -9784,74 +10249,74 @@ msgid "" "Blocks: Total: %-10b Free: %-10f Available: %a\n" "Inodes: Total: %-10c Free: %d\n" msgstr "" -" Fichier : \"%d\"\n" -" ID : %-8i Longueur nom : %-7l Type : %T\\n\"\n" -"Taille bloc : %-10s Taille de bloc fondamentale : %S\\n\"\n" -" Blocs : total : %-10b libre : %-10f disponible : %a\\n\"\n" -"Inodes : total : %-10c libre : %d\n" +" Fichier : « %n »\n" +" Identif. : %-8i Longueur du nom : %-7l Type : %T\n" +"Taille de bloc : %-10s Taille de bloc fondamentale : %S\n" +" Blocs : total : %-10b libre : %-10f disponible : %a\n" +"Inœuds : total : %-10c libre : %d\n" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1268 +#: src/stat.c:1287 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" msgstr "" " Fichier : %N\n" -" Taille : %-10s\tBlocs : %-10b ES blocs : %-6o %F\n" +" Taille : %-10s\tBlocs : %-10b Blocs d'E/S : %-6o %F\n" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1278 +#: src/stat.c:1297 msgid "Device: %Dh/%dd\tInode: %-10i Links: %-5h Device type: %t,%T\n" msgstr "" -"Périphérique : %Dh/%dd\tInode : %-10i Liens : %-5h Type de périph. : %t,%T\n" +"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:1286 +#: src/stat.c:1305 msgid "Device: %Dh/%dd\tInode: %-10i Links: %h\n" -msgstr "Device : %Dh/%dd\tInode : %-10i Liens : %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:1295 +#: src/stat.c:1314 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:1305 +#: src/stat.c:1324 #, c-format msgid "Context: %C\n" msgstr "Contexte : %C\n" -#: src/stat.c:1313 +#: src/stat.c:1332 msgid "" "Access: %x\n" "Modify: %y\n" "Change: %z\n" " Birth: %w\n" msgstr "" -"Accès : %x\n" -"Modi. : %y\n" -"Chgt  : %z\n" -"Créé  : %w\n" +" Accès : %x\n" +"Modif. : %y\n" +"Changt : %z\n" +" Créé : %w\n" + +#: src/stat.c:1350 +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:1331 +#: src/stat.c:1356 msgid "" -"Display file or file system status.\n" -"\n" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" -"Affiche le statut d'un fichier ou d'un système de fichiers.\n" -"\n" -" -L, --dereference suit les liens\n" -" -f, --file-system affiche le statut du système de fichiers au lieu du\n" -" statut du fichier\n" +" -L, --dereference suivre les liens\n" +" -f, --file-system afficher l'état du système de fichiers au lieu de\n" +" l'état du fichier\n" -#: src/stat.c:1337 +#: src/stat.c:1360 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -9860,20 +10325,21 @@ msgid "" " If you want a newline, include \\n in FORMAT\n" " -t, --terse print the information in terse form\n" msgstr "" -" -c --format=FORMAT utilise le FORMAT spécifié au lieu de celui par " +" -c --format=FORMAT utiliser le FORMAT indiqué au lieu de celui par " "défaut ;\n" -" affiche un saut de ligne après l'utilisation de " -"FORMAT\n" -" --printf=FORMAT identique à --format mais interprète les séquences\n" -" d'échappements, et ne fait pas l'affichage d'un saut " +" afficher un changement de ligne après chaque\n" +" utilisation de FORMAT\n" +" --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 saut de ligne, incluez " -"« \\n »\n" -" dans FORMAT.\n" -" -t, --terse affiche l'information dans un format compréhensible\n" +" ligne. Si vous désirez un changement de ligne, " +"ajoutez\n" +" « \\n » à FORMAT.\n" +" -t, --terse afficher l'information dans un format " +"compréhensible\n" -#: src/stat.c:1348 -#, fuzzy +#: src/stat.c:1371 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -9885,16 +10351,15 @@ msgid "" " %C SELinux security context string\n" msgstr "" "\n" -"Le format valide pour les séquences de fichiers (sans --file-system) :\n" +"Format possible pour les séquences de fichiers (sans --file-system) :\n" "\n" " %a droits d'accès en octal\n" -" %A droits d'accès en format lisible par un humain\n" +" %A droits d'accès en format lisible\n" " %b nombre de blocs alloués (voir %B)\n" " %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:1357 -#, fuzzy +#: src/stat.c:1380 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -9904,14 +10369,13 @@ msgid "" " %G group name of owner\n" msgstr "" " %d numéro de périphérique en décimal\n" -" %D numéro de périphéque en hexadécimal\n" +" %D numéro de périphérique en hexadécimal\n" " %f mode brut en hexadécimal\n" " %F type de fichier\n" -" %g identificateur de groupe du propriétaire\n" +" %g GID du propriétaire\n" " %G nom de groupe du propriétaire\n" -#: src/stat.c:1365 -#, fuzzy +#: src/stat.c:1388 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -9924,17 +10388,16 @@ msgid "" " %T minor device type in hex\n" msgstr "" " %h nombre de liens directs (hard)\n" -" %i numéro d'inode\n" +" %i numéro d'inœud\n" " %m point de montage\n" " %n nom de fichier\n" " %N nom de fichier en citation avec référence si lien symbolique\n" -" %o taille de bloc d'E/S\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" -#: src/stat.c:1376 -#, fuzzy +#: src/stat.c:1399 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -9948,20 +10411,19 @@ msgid "" " %Z time of last change, seconds since Epoch\n" "\n" msgstr "" -" %u ID du propriétaire\n" +" %u UID du propriétaire\n" " %U nom d'utilisateur du propriétaire\n" -" %w date de création du fichier, lisible par un humain ; - si inconnu\n" -" %W date de création du fichier, en secondes depuis Epoch ; 0 si inconnu\n" -" %x date du dernier accès, lisible par un humain\n" -" %X date du dernier accès en secondes depuis Epoch\n" -" %y date de la dernière modification, lisible par un humain\n" -" %Y date de la dernière modification en secondes depuis l'Epoch\n" -" %z date du dernier changement, lisible par un humain\n" -" %Z date du dernier changement en secondes depuis l'Epoch\n" +" %w date de création du fichier, lisible ; - si inconnue\n" +" %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" "\n" -#: src/stat.c:1390 -#, fuzzy +#: src/stat.c:1413 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -9971,16 +10433,15 @@ msgid "" " %d free file nodes in file system\n" " %f free blocks in file system\n" msgstr "" -"Séquences valides de format pour les systèmes de fichiers :\n" +"Séquences de format possible pour les systèmes de fichiers :\n" "\n" -" %a blocs libres disponibles pour un non super-utilisateur\n" +" %a blocs libres disponibles pour un non superutilisateur\n" " %b total des blocs de données dans le système de fichiers\n" " %c total des nœuds de fichiers dans le système de fichiers\n" " %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:1399 -#, fuzzy +#: src/stat.c:1422 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -9990,13 +10451,13 @@ msgid "" " %t file system type in hex\n" " %T file system type in human readable form\n" msgstr "" -" %i ID du sytème de fichiers en hexadécimal\n" +" %i identifiant du système de fichiers en hexadécimal\n" " %l longueur maximale des noms de fichiers\n" " %n nom de fichier\n" " %s taille de bloc (pour des transferts rapides)\n" " %S taille fondamentale de bloc (pour le décompte de blocs)\n" -" %t type en hexadécimal\n" -" %T type dans un format lisible par un humain\n" +" %t type de système de fichiers en hexadécimal\n" +" %T type de système de fichiers au format lisible\n" #: src/stdbuf.c:90 #, c-format @@ -10008,24 +10469,21 @@ msgstr "" #: src/stdbuf.c:91 msgid "" "Run COMMAND, with modified buffering operations for its standard streams.\n" -"\n" msgstr "" -"Exécute COMMAND, avec des opérations de mises en tampon modifiées pour ses " -"flux\n" -"standards.\n" +"Exécuter COMMAND, avec des opérations de mises en tampon modifiées pour ses\n" +"flux standards.\n" -#: src/stdbuf.c:98 +#: src/stdbuf.c:97 msgid "" " -i, --input=MODE adjust standard input stream buffering\n" " -o, --output=MODE adjust standard output stream buffering\n" " -e, --error=MODE adjust standard error stream buffering\n" msgstr "" -" -i, --input=MODE ajuste la mise en tampon du flux d'entrée standard\n" -" -o, --output=MODE ajuste la mise en tampon du flux de sortie standard\n" -" -e, --error=MODE ajuste la mise en tampon du flux d'erreur standard\n" +" -i, --input=MODE ajuster la mise en tampon du flux d'entrée standard\n" +" -o, --output=MODE ajuster la mise en tampon du flux de sortie standard\n" +" -e, --error=MODE ajuster la mise en tampon du flux d'erreur standard\n" -#: src/stdbuf.c:105 -#, fuzzy +#: src/stdbuf.c:104 msgid "" "\n" "If MODE is 'L' the corresponding stream will be line buffered.\n" @@ -10034,10 +10492,9 @@ msgstr "" "\n" "Si MODE est « L », le flux correspondant utilisera une mise en tampon par " "ligne.\n" -"Cette option est non valide avec l'entrée standard.\n" +"Cette option est incorrecte avec l'entrée standard.\n" -#: src/stdbuf.c:108 -#, fuzzy +#: src/stdbuf.c:107 msgid "" "\n" "If MODE is '0' the corresponding stream will be unbuffered.\n" @@ -10045,7 +10502,7 @@ msgstr "" "\n" "Si MODE est « 0 », le flux correspondant ne sera pas mis en tampon.\n" -#: src/stdbuf.c:111 +#: src/stdbuf.c:110 msgid "" "\n" "Otherwise MODE is a number which may be followed by one of the following:\n" @@ -10057,12 +10514,11 @@ msgstr "" "\n" "Dans les autres cas, MODE est un nombre qui peut être suivi par KB 1000, K " "1024,\n" -"MB 1000*1000, M 1024*1024 et ainsi de suite pour G, T, P, E, Z, Y.\n" -"Dans ce cas, le flux correspondant sera complètement mis en tampon avec une\n" -"tampon définit à MODE octets.\n" +"MB 1000*1000, M 1024*1024 et ainsi de suite pour G, T, P, E, Z et Y.\n" +"Dans ce cas, le flux correspondant sera complètement mis en tampon avec un\n" +"tampon définit à MODE octets.\n" -#: src/stdbuf.c:117 -#, fuzzy +#: src/stdbuf.c:116 msgid "" "\n" "NOTE: If COMMAND adjusts the buffering of its standard streams ('tee' does\n" @@ -10072,31 +10528,29 @@ msgid "" "and are thus unaffected by 'stdbuf' settings.\n" msgstr "" "\n" -"Note : si COMMAND ajuste la mise en tampon de ses flux standard (comme " -"« tee »\n" -"par exemple) alors cela va surdéfinir les paramètres correspondant modifiés " -"par\n" -"« stdbuf ».\n" -"Certains filtres (comme « dd » ou « cat », etc) n'utilisent par les flux " +"Remarque : si COMMAND 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 donc ne sont 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:227 +#: src/stdbuf.c:226 #, c-format msgid "failed to find %s" msgstr "impossible de trouver %s" -#: src/stdbuf.c:247 src/stdbuf.c:279 +#: src/stdbuf.c:246 src/stdbuf.c:278 #, c-format msgid "failed to update the environment with %s" msgstr "impossible de mettre à jour l'environnement avec %s" -#: src/stdbuf.c:321 +#: src/stdbuf.c:320 #, c-format msgid "line buffering stdin is meaningless" -msgstr "la mise en tampon de stdin ne signifie rien" +msgstr "la mise en tampon de l'entrée standard est sans effet" -#: src/stty.c:509 +#: src/stty.c:513 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -10107,23 +10561,24 @@ msgstr "" " ou : %s [-F DEVICE | --file=DEVICE] [-a|--all]\n" " ou : %s [-F DEVICE | --file=DEVICE] [-g|--save]\n" -#: src/stty.c:515 +#: src/stty.c:519 +msgid "Print or change terminal characteristics.\n" +msgstr "Afficher ou modifier les caractéristiques du terminal.\n" + +#: src/stty.c:525 msgid "" -"Print or change terminal characteristics.\n" -"\n" " -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 "" -"Affiche ou modifie les caractéristiques du terminal.\n" -"\n" -" -a, --all affiche toutes les paramètres actuels dans un format\n" -" humainement lisible\n" -" -g, --save affiche toutes les paramètres actuels dans un format\n" -" lisible par « stty »\n" -" -F, --file=DEVICE utilise le périphérique spécifié au lieu de stdin\n" +" -a, --all afficher tous les paramètres actuels en format lisible\n" +" -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" +" l'entrée standard\n" -#: src/stty.c:524 +#: src/stty.c:532 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -10131,10 +10586,10 @@ msgid "" msgstr "" "\n" "Un « - » optionnel avant SETTINGS indique une négation. Un * indique des\n" -"paramètres non-POSIX. Le système sous-jacent détermine les paramètres\n" +"paramètres non POSIX. Le système sous-jacent détermine les paramètres\n" "applicables.\n" -#: src/stty.c:529 +#: src/stty.c:537 msgid "" "\n" "Special characters:\n" @@ -10144,49 +10599,50 @@ msgid "" msgstr "" "\n" "Caractères spéciaux :\n" -"* dsusp CHAR CHAR émettra un signal d'arrêt de terminal une fois le " +" * dsusp CHAR CHAR é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" +" 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" -#: src/stty.c:536 +#: src/stty.c:544 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 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" -#: src/stty.c:542 +#: src/stty.c:550 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 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" -#: src/stty.c:548 +#: src/stty.c:556 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 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" -#: src/stty.c:554 +#: src/stty.c:562 msgid "" "\n" "Special settings:\n" @@ -10196,11 +10652,11 @@ msgid "" msgstr "" "\n" "Paramètres spéciaux :\n" -" N initialise les vitesses d'entrée et de sortie à N bauds\n" -"* cols N indique au kernel que le terminal a N colonnes\n" -"* columns N identique à « cols N »\n" +" N initialiser les vitesses d'entrée et de sortie à N bauds\n" +" * cols N indiquer au noyau que le terminal a N colonnes\n" +" * columns N identique à « cols N »\n" -#: src/stty.c:561 +#: src/stty.c:569 msgid "" " ispeed N set the input speed to N\n" " * line N use line discipline N\n" @@ -10208,13 +10664,13 @@ msgid "" "read\n" " ospeed N set the output speed to N\n" msgstr "" -" ispeed N initialise la vitesse d'entrée à N\n" -"* line N utilise la discipline de ligne N\n" -" min N avec -icanon, initialise à N le nombre de caractères\n" -" nécessaires pour obtenir une lecture complète\n" -" ospeed N initialise la vitesse de sortie à N\n" +" ispeed N initialiser la vitesse d'entrée à N\n" +" * line N utiliser la procédure de contrôle N\n" +" min N avec -icanon, initialiser à N le nombre de caractères\n" +" nécessaires pour obtenir une lecture complète\n" +" ospeed N initialiser la vitesse de sortie à N\n" -#: src/stty.c:567 +#: src/stty.c:575 msgid "" " * rows N tell the kernel that the terminal has N rows\n" " * size print the number of rows and columns according to the " @@ -10222,52 +10678,53 @@ msgid "" " speed print the terminal speed\n" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" -"* rows N indique au kernel que le terminal a N lignes\n" -"* size affiche le nombre de lignes et de colonnes selon les " -"paramètres\n" -" du kernel\n" -" speed affiche la vitesse du terminal\n" -" time N avec -icanon, initialise le délai d'inactivité de lecture à\n" -" N dizièmes de seconde\n" +" * rows N indiquer au noyau que le terminal a N lignes\n" +" * size afficher le nombre de lignes et de colonnes selon les\n" +" paramètres du noyau\n" +" speed afficher la vitesse du terminal\n" +" time N avec -icanon, initialiser le délai d'inactivité de lecture " +"à\n" +" N dixièmes de seconde\n" -#: src/stty.c:573 +#: src/stty.c:581 msgid "" "\n" "Control settings:\n" " [-]clocal disable modem control signals\n" " [-]cread allow input to be received\n" " * [-]crtscts enable RTS/CTS handshaking\n" +" * [-]cdtrdsr enable DTR/DSR handshaking\n" " csN set character size to N bits, N in [5..8]\n" msgstr "" "\n" "Paramètres de contrôle :\n" -" [-]clocal inhibe les signaux de contrôle du modem\n" -" [-]cread autorise la réception sur l'entrée\n" -"* [-]crtscts autorise RTS/CTS handshaking\n" -" csN initialise la taille des caractères à N bits,\n" -" N variant entre [5..8]\n" +" [-]clocal désactiver les signaux de contrôle du modem\n" +" [-]cread autoriser la réception sur l'entrée\n" +" * [-]crtscts autoriser l'initialisation RTS/CTS\n" +" * [-]cdtrdsr autoriser l'initialisation DTR/DSR\n" +" csN initialiser la taille des caractères à N bits,\n" +" avec N compris entre 5 et 8\n" -#: src/stty.c:581 -#, fuzzy +#: src/stty.c:590 msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" " [-]hupcl same as [-]hup\n" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" -" [-]parodd set odd parity (even with '-')\n" -msgstr "" -" [-]cstopb utilise 2 bits d'arrêt par caractère (un avec « - »)\n" -" [-]hup émet un signal de déconnexion quand le dernier processus " -"ferme\n" -" le lien tty\n" -" [-]hupcl identique à [-]hup\n" -" [-]parenb génère le bit de parité pour la sortie et traite l'entrée " -"avec\n" -" un bit de parité implicite\n" -" [-]parodd utilise une parité impaire (paire avec « - »)\n" +" [-]parodd set odd parity (or even parity with '-')\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 " +"processus\n" +" ferme le lien tty\n" +" [-]hupcl identique à [-]hup\n" +" [-]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" -#: src/stty.c:588 +#: src/stty.c:597 msgid "" "\n" "Input settings:\n" @@ -10278,12 +10735,12 @@ msgid "" msgstr "" "\n" "Paramètres d'entrée :\n" -" [-]brkint break provoque un signal d'interruption\n" -" [-]icrnl transforme le retour de chariot en saut de ligne\n" -" [-]ignbrk ignore les caractères break\n" -" [-]igncr ignore le retour de chariot\n" +" [-]brkint les breaks provoquent un signal d'interruption\n" +" [-]icrnl transformer le retour chariot en changement de ligne\n" +" [-]ignbrk ignorer les caractères break\n" +" [-]igncr ignorer le retour chariot\n" -#: src/stty.c:596 +#: src/stty.c:605 msgid "" " [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" @@ -10291,19 +10748,20 @@ msgid "" " [-]inpck enable input parity checking\n" " [-]istrip clear high (8th) bit of input characters\n" msgstr "" -" [-]ignpar ignore les caractères ayant des erreurs de parité\n" -"* [-]imaxbel émet un bip et ne vide pas le tampon d'entrée plein lors de\n" -" l'arrivée d'un caractère\n" -" [-]inlcr transforme le saut de ligne en retour de chariot\n" -" [-]inpck autorise la vérification de la parité à l'entrée\n" -" [-]istrip met à zéro le bit haut (8e) des caractères en entrée\n" +" [-]ignpar ignorer les caractères ayant des erreurs de parité\n" +" * [-]imaxbel émettre un bip et ne pas vider le tampon d'entrée plein " +"lors\n" +" de l'arrivée d'un caractère\n" +" [-]inlcr transformer le saut de ligne en retour de chariot\n" +" [-]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:603 +#: src/stty.c:612 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr "" -" * [-]iutf8 présume que les caractères en entrée sont codés en UTF-8\n" +" * [-]iutf8 présumer que les caractères en entrée sont codés en UTF-8\n" -#: src/stty.c:606 +#: src/stty.c:615 msgid "" " * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" @@ -10312,16 +10770,18 @@ msgid "" " [-]parmrk mark parity errors (with a 255-0-character sequence)\n" " [-]tandem same as [-]ixoff\n" msgstr "" -"* [-]iuclc transforme les majuscles en minuscules\n" -"* [-]ixany permet à n'importe quel caractère de relancer l'affichage\n" -" sur la sortie, pas uniquement le caractère de redémarrage\n" -" [-]ixoff autorise l'envoi d'un caractère d'arrêt/départ\n" -" [-]ixon autorise le contrôle de flux XON/XOFF\n" -" [-]parmrk indique les erreurs de parité par une séquence de\n" -" caractères (255-0)\n" -" [-]tandem identique à [-]ixoff\n" +" * [-]iuclc transformer les majuscules en minuscules\n" +" * [-]ixany permettre à n'importe quel caractère de relancer " +"l'affichage\n" +" sur la sortie, pas uniquement le caractère de " +"redémarrage\n" +" [-]ixoff autoriser l'envoi d'un caractère d'arrêt ou de départ\n" +" [-]ixon autoriser le contrôle de flux XON/XOFF\n" +" [-]parmrk indiquer les erreurs de parité par une séquence de\n" +" caractères (255-0)\n" +" [-]tandem identique à [-]ixoff\n" -#: src/stty.c:614 +#: src/stty.c:623 msgid "" "\n" "Output settings:\n" @@ -10332,12 +10792,12 @@ msgid "" msgstr "" "\n" "Paramètres de sortie :\n" -"* bsN style du délai de retour arrière, N parmi [0..1]\n" -"* crN style du délai du retour de chariot, N parmi [0..3]\n" -"* 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" +" * bsN style du délai de retour arrière, N parmi [0..1]\n" +" * crN style du délai du retour de chariot, N parmi [0..3]\n" +" * 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:622 +#: src/stty.c:631 msgid "" " * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of null characters\n" @@ -10346,16 +10806,17 @@ msgid "" " * [-]onlcr translate newline to carriage return-newline\n" " * [-]onlret newline performs a carriage return\n" msgstr "" -"* [-]ocrnl transforme un retour de chariot par un saut de ligne\n" -"* [-]ofdel utilise des caractères d'effacement comme caractère\n" -" de remplissage au lieu de caractères nuls\n" -"* [-]ofill utilise le remplissage de caractères au lieu du délai par\n" -" minuterie\n" -"* [-]olcuc traduit les minuscules en majuscules\n" -"* [-]onlcr traduit le saut de ligne en retour de chariot-saut de ligne\n" -"* [-]onlret le saut de ligne génère un retour de chariot\n" +" * [-]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" +" * [-]ofill utiliser le remplissage de caractères au lieu du délai par\n" +" minuterie\n" +" * [-]olcuc traduire les minuscules en majuscules\n" +" * [-]onlcr traduire le saut de ligne en retour chariot-changement de " +"ligne\n" +" * [-]onlret le changement de ligne génère un retour chariot\n" -#: src/stty.c:630 +#: src/stty.c:639 msgid "" " * [-]onocr do not print carriage returns in the first column\n" " [-]opost postprocess output\n" @@ -10364,14 +10825,14 @@ msgid "" " * -tabs same as tab3\n" " * vtN vertical tab delay style, N in [0..1]\n" msgstr "" -"* [-]onocr n'affiche pas un retour chariot en première colonne\n" -" [-]opost post-traitement de sortie\n" -"* tabN style du délai de tabulation horizontale, N parmi [0..3]\n" -"* tabs identique à tab0\n" -"* -tabs identique à tab3\n" -"* vtN style du délai de tabulation verticale, N parmi [0..1]\n" +" * [-]onocr ne pas afficher de retour chariot en première colonne\n" +" [-]opost post-traitement de sortie\n" +" * tabN style du délai de tabulation horizontale, N parmi [0..3]\n" +" * tabs identique à tab0\n" +" * -tabs identique à tab3\n" +" * vtN style du délai de tabulation verticale, N parmi [0..1]\n" -#: src/stty.c:638 +#: src/stty.c:647 msgid "" "\n" "Local settings:\n" @@ -10381,17 +10842,14 @@ msgid "" msgstr "" "\n" "Paramètres locaux :\n" -" [-]crterase écho du caractère « erase » comme séquence\n" -" retour arrière-espace-retour arrière\n" -"* crtkill supprime toute ligne en respectant les paramètres " -"« echoprt » et\n" -" « echoe »\n" -"* -crtkill supprime toute ligne en respectant les paramètres " -"« echoctl » et\n" -" « echok »\n" - -#: src/stty.c:645 -#, fuzzy +" [-]crterase écho du caractère « erase » comme séquence\n" +" retour arrière-espace-retour arrière\n" +" * crtkill supprimer toute la ligne en respectant les paramètres\n" +" « echoprt » et « echoe »\n" +" * -crtkill supprimer toute la ligne en respectant les paramètres\n" +" « echoctl » et « echok »\n" + +#: src/stty.c:654 msgid "" " * [-]ctlecho echo control characters in hat notation ('^c')\n" " [-]echo echo input characters\n" @@ -10399,15 +10857,15 @@ msgid "" " [-]echoe same as [-]crterase\n" " [-]echok echo a newline after a kill character\n" msgstr "" -"* [-]ctlecho écho des caractères de contrôle par une notation en\n" -" chapeau (« ^c »)\n" -" [-]echo écho des caractères en entrée\n" -"* [-]echoctl identique à [-]ctlecho\n" -" [-]echoe identique à [-]crterase\n" -" [-]echok écho d'un saut de ligne après un caractère d'annulation\n" +" * [-]ctlecho écho des caractères de contrôle par une notation en\n" +" chapeau (« ^c »)\n" +" [-]echo écho des caractères en entrée\n" +" * [-]echoctl identique à [-]ctlecho\n" +" [-]echoe identique à [-]crterase\n" +" [-]echok écho d'un changement de ligne après un caractère " +"d'annulation\n" -#: src/stty.c:652 -#, fuzzy +#: src/stty.c:661 msgid "" " * [-]echoke same as [-]crtkill\n" " [-]echonl echo newline even if not echoing other characters\n" @@ -10415,17 +10873,16 @@ msgid "" " [-]icanon enable erase, kill, werase, and rprnt special characters\n" " [-]iexten enable non-POSIX special characters\n" msgstr "" -"* [-]echoke identique à [-]crtkill\n" -" [-]echonl écho d'un saut de ligne même s'il n'y pas d'écho des autres\n" -" caractères\n" -"* [-]echoprt écho des caractères d'effacement par retour arrière, entre\n" -" « \\ » et « / »\n" -" [-]icanon autorise les caractères spéciaux\n" -" « erase », « kill », « werase », et « rprnt »\n" -" [-]iexten autorise les caractères spéciaux non-POSIX\n" +" * [-]echoke identique à [-]crtkill\n" +" [-]echonl écho d'un changement de ligne même sans d'écho des autres\n" +" caractères\n" +" * [-]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" +" [-]iexten autoriser les caractères spéciaux non POSIX\n" -#: src/stty.c:659 -#, fuzzy +#: src/stty.c:668 msgid "" " [-]isig enable interrupt, quit, and suspend special characters\n" " [-]noflsh disable flushing after interrupt and quit special " @@ -10434,17 +10891,17 @@ msgid "" " * [-]tostop stop background jobs that try to write to the terminal\n" " * [-]xcase with icanon, escape with '\\' for uppercase characters\n" msgstr "" -" [-]isig autorise les caractères spéciaux\n" -" « interrupt », « quit », et « suspend »\n" -" [-]noflsh désactive la vidange après réception des caractères\n" -" « interrupt » et « quit »\n" -"* [-]prterase identique à [-]echoprt\n" -"* [-]tostop arrête les tâches d'arrière plan qui essaient d'écrire sur " -"le\n" -" terminal\n" -"* [-]xcase avec « icanon », protège les majuscules avec « \\ »\n" +" [-]isig autoriser les caractères spéciaux\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" +" * [-]tostop arrêter les tâches en arrière plan qui essaient d'écrire " +"sur\n" +" le terminal\n" +" * [-]xcase avec « icanon », protéger les majuscules avec « \\ »\n" -#: src/stty.c:666 +#: src/stty.c:675 msgid "" "\n" "Combination settings:\n" @@ -10454,23 +10911,23 @@ msgid "" msgstr "" "\n" "Paramètres de combinaison :\n" -"* [-]LCASE identique à [-]lcase\n" -" cbreak identique à -icanon\n" -" -cbreak identique à icanon\n" +" * [-]LCASE identique à [-]lcase\n" +" cbreak identique à -icanon\n" +" -cbreak identique à icanon\n" -#: src/stty.c:673 +#: src/stty.c:682 msgid "" " cooked same as brkint ignpar istrip icrnl ixon opost isig\n" " icanon, eof and eol characters to their default values\n" " -cooked same as raw\n" " crt same as echoe echoctl echoke\n" msgstr "" -" cooked identique à brkint ignpar istrip icrnl ixon opost isig\n" -" icanon, eof et eol selon leur valeur par défaut\n" -" -cooked identique à raw\n" -" crt identique à echoe echoctl echoke\n" +" cooked identique à brkint ignpar istrip icrnl ixon opost isig\n" +" icanon, eof et eol selon leur valeur par défaut\n" +" -cooked identique à raw\n" +" crt identique à echoe echoctl echoke\n" -#: src/stty.c:679 +#: src/stty.c:688 msgid "" " dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" " kill ^u\n" @@ -10478,14 +10935,14 @@ msgid "" " ek erase and kill characters to their default values\n" " evenp same as parenb -parodd cs7\n" msgstr "" -" dec identique à echoe echoctl echoke -ixany intr ^c erase 0177\n" -" kill ^u\n" -"* [-]decctlq identique à [-]ixany\n" -" ek réinitialiser les caractères erase et kill à leur valeur\n" -" par défaut\n" -" evenp identique à parenb -parodd cs7\n" +" dec identique à echoe echoctl echoke -ixany intr ^c erase 0177\n" +" kill ^u\n" +" * [-]decctlq identique à [-]ixany\n" +" ek réinitialiser les caractères erase et kill à leur valeur\n" +" par défaut\n" +" evenp identique à parenb -parodd cs7\n" -#: src/stty.c:686 +#: src/stty.c:695 msgid "" " -evenp same as -parenb cs8\n" " * [-]lcase same as xcase iuclc olcuc\n" @@ -10494,14 +10951,14 @@ msgid "" " nl same as -icrnl -onlcr\n" " -nl same as icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" msgstr "" -" -evenp identique à -parenb cs8\n" -"* [-]lcase identique à xcase iuclc olcuc\n" -" litout identique à -parenb -istrip -opost cs8\n" -" -litout identique à parenb istrip opost cs7\n" -" nl identique à -icrnl -onlcr\n" -" -nl identique à icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" +" -evenp identique à -parenb cs8\n" +" * [-]lcase identique à xcase iuclc olcuc\n" +" litout identique à -parenb -istrip -opost cs8\n" +" -litout identique à parenb istrip opost cs7\n" +" nl identique à -icrnl -onlcr\n" +" -nl identique à icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" -#: src/stty.c:694 +#: src/stty.c:703 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -10509,25 +10966,25 @@ msgid "" " pass8 same as -parenb -istrip cs8\n" " -pass8 same as parenb istrip cs7\n" msgstr "" -" oddp identique à parenb parodd cs7\n" -" -oddp identique à -parenb cs8\n" -" [-]parity identique à [-]evenp\n" -" pass8 identique à -parenb -istrip cs8\n" -" -pass8 identique à parenb istrip cs7\n" +" oddp identique à parenb parodd cs7\n" +" -oddp identique à -parenb cs8\n" +" [-]parity identique à [-]evenp\n" +" pass8 identique à -parenb -istrip cs8\n" +" -pass8 identique à parenb istrip cs7\n" -#: src/stty.c:701 +#: src/stty.c:710 msgid "" " raw same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" " -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n" " -imaxbel -opost -isig -icanon -xcase min 1 time 0\n" " -raw same as cooked\n" msgstr "" -" raw identique à -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" -" -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n" -" -imaxbel -opost -isig -icanon -xcase min 1 fois 0\n" -" -raw identique à cooked\n" +" raw identique à -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" +" -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n" +" -imaxbel -opost -isig -icanon -xcase min 1 time 0\n" +" -raw identique à cooked\n" -#: src/stty.c:707 +#: src/stty.c:716 msgid "" " sane same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" " -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n" @@ -10538,14 +10995,14 @@ msgid "" msgstr "" " sane identique à 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, tous les " +" -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, tous les " "caractères\n" -" spéciaux avec leur valeur par défaut.\n" +" spéciaux avec leur valeur par défaut.\n" -#: src/stty.c:715 +#: src/stty.c:724 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -10554,149 +11011,70 @@ msgid "" "127; special values ^- or undef used to disable special characters.\n" msgstr "" "\n" -"Prend en charge la ligne « tty » reliée à l'entrée standard. En l'absence\n" -"d'argument, affiche la vitesse, la discipline de ligne et les modifications\n" +"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 " "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:787 +#: src/stty.c:796 #, c-format msgid "only one device may be specified" -msgstr "un seul périphérique peut être spécifié" +msgstr "un seul périphérique peut être indiqué" -#: src/stty.c:817 +#: src/stty.c:826 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" "mutually exclusive" msgstr "" -"les options pour le mode verbeux et les styles de sortie de stty-readable\n" -"sont mutuellement exclusifs" +"les options pour le mode bavard et les styles de sortie de compatible avec " +"stty\n" +"sont mutuellement exclusives" -#: src/stty.c:823 +#: src/stty.c:832 #, c-format msgid "when specifying an output style, modes may not be set" msgstr "" -"les mode ne peuvent pas être initialisés quand le stype de sortie est " -"spécifié" +"les mode ne peuvent pas être initialisés quand le style de sortie est indiqué" -#: src/stty.c:838 +#: src/stty.c:847 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s : impossible de réinitialiser le mode non bloquant" -#: src/stty.c:883 src/stty.c:993 +#: src/stty.c:892 src/stty.c:1002 #, c-format msgid "invalid argument %s" -msgstr "argument non valide %s" +msgstr "argument %s incorrect" -#: src/stty.c:894 src/stty.c:911 src/stty.c:923 src/stty.c:936 src/stty.c:948 -#: src/stty.c:968 +#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957 +#: src/stty.c:977 #, c-format msgid "missing argument to %s" msgstr "argument manquant pour %s" -#: src/stty.c:974 +#: src/stty.c:983 #, c-format msgid "invalid line discipline %s" -msgstr "discipline de ligne non valide %s" +msgstr "procédure de contrôle %s incorrecte" -#: src/stty.c:1044 +#: src/stty.c:1053 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s : impossible d'effectuer toutes les opérations demandées" -#: src/stty.c:1390 +#: src/stty.c:1399 #, 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:1904 +#: src/stty.c:1920 #, c-format msgid "invalid integer argument %s" -msgstr "argument numérique non valide %s" - -#: src/su.c:229 -msgid "Password:" -msgstr "Mot de passe :" - -#: src/su.c:232 -#, c-format -msgid "getpass: cannot open /dev/tty" -msgstr "getpass() : impossible d'ouvrir /dev/tty" - -#: src/su.c:290 -#, c-format -msgid "cannot set groups" -msgstr "impossible d'initialiser les groupes" - -#: src/su.c:294 -#, c-format -msgid "cannot set group id" -msgstr "impossible d'initialiser l'ID du groupe" - -#: src/su.c:296 -#, c-format -msgid "cannot set user id" -msgstr "impossible d'initialiser l'ID de l'utilisateur" - -#: src/su.c:371 -#, c-format -msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" -msgstr "Utilisation : %s [OPTION]... [-] [USER [ARG]...]\n" - -#: src/su.c:372 -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 "" -"Modifie l'ID effectif de l'utilisateur et l'ID du groupe à celui de USER.\n" -"\n" -" -, -l, --login établit ce shell comme celui de la session de " -"travail\n" -" -c, --command=COMMANDE passe une seule COMMANDE au shell avec -c\n" -" -f, --fast passe -f au shell (valable pour csh ou tcsh)\n" -" -m, --preserve-environment ne réinitialise oas les variables " -"d'environnement\n" -" -p identique à -m\n" -" -s, --shell=SHELL lance le SHELL si /etc/shells le permet\n" - -#: src/su.c:384 -msgid "" -"\n" -"A mere - implies -l. If USER not given, assume root.\n" -msgstr "" -"\n" -"Un tiret - implique -l. Si l'argument USER n'est pas fourni, utilise " -"« root »\n" - -#: src/su.c:461 -#, c-format -msgid "user %s does not exist" -msgstr "l'utilisateur %s n'existe pas" - -#: src/su.c:484 -#, c-format -msgid "incorrect password" -msgstr "mot de passe incorrect" - -#: src/su.c:501 -#, c-format -msgid "using restricted shell %s" -msgstr "utilisation du shell %s restreint" - -#: src/su.c:509 -#, c-format -msgid "warning: cannot change directory to %s" -msgstr "avertissement : impossible d'aller dans le répertoire %s" +msgstr "argument numérique %s incorrect" #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 @@ -10710,29 +11088,30 @@ msgid "" " -r use BSD sum algorithm, use 1K blocks\n" " -s, --sysv use System V sum algorithm, use 512 bytes blocks\n" msgstr "" -"Affiche 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 FILE.\n" "\n" -" -r utilise l'algorithme de calcul de somme BSD avec des blocs " -"de\n" -" 1K octets\n" -" -s, --sysv utilise l'algorithme de calcul de somme de Système V avec " +" -r utiliser l'algorithme de calcul de somme BSD avec des " +"blocs de\n" +" 1K octets\n" +" -s, --sysv utiliser l'algorithme de calcul de somme de Système V avec " "des\n" -" blocs de 512 octets\n" +" blocs de 512 octets\n" #: src/sync.c:41 msgid "" "Force changed blocks to disk, update the super block.\n" "\n" msgstr "" -"Force l'écriture des blocs modifiés sur disque et la mise à jour du super " +"Forcer l'écriture des blocs modifiés sur disque et la mise à jour du super " "bloc.\n" +"\n" #: src/sync.c:69 #, c-format msgid "ignoring all arguments" -msgstr "ignore tous les arguments" +msgstr "ignorer tous les arguments" -#: src/system.h:340 +#: src/system.h:343 #, c-format msgid "" "\n" @@ -10741,29 +11120,41 @@ msgid "" "for details about the options it supports.\n" msgstr "" "\n" -"NOTE : votre shell peut avoir sa propre version de %s, lequel " -"habituellement\n" -"remplace la version décrite ici. Consultez la documentation de votre shell " -"pour\n" -"les détails concernant les options prises en charge.\n" +"Remarque : l'interpréteur de commande peut avoir sa propre version de %s,\n" +"lequel remplace habituellement la version décrite ici. Consultez la\n" +"documentation de l'interpréteur pour obtenir des précisions sur les options\n" +"prises en charge.\n" -#: src/system.h:346 +#: src/system.h:349 msgid " --help display this help and exit\n" -msgstr " --help affiche l'aide et quitte\n" +msgstr " --help afficher l'aide et quitter\n" -#: src/system.h:348 +#: src/system.h:351 msgid " --version output version information and exit\n" -msgstr " --version affiche des informations de version et quitte\n" +msgstr " --version afficher des informations de version et quitter\n" + +#: src/system.h:544 +msgid "" +"\n" +"Mandatory arguments to long options are mandatory for short options too.\n" +msgstr "" +"\n" +"Les arguments obligatoires pour les options longues le sont aussi pour les\n" +"options courtes.\n" -#: src/system.h:541 +#: src/system.h:552 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" 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" +"KB, MB, etc. (puissances de 1000).\n" -#: src/system.h:550 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -10778,7 +11169,7 @@ msgstr "" "Dans le cas contraire, les unités par défaut sont 1 024 octets (ou 512 si\n" "POSIXLY_CORRECT est défini).\n" -#: src/system.h:560 +#: src/system.h:571 #, c-format msgid "" "\n" @@ -10792,23 +11183,24 @@ msgstr "" #. <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:574 +#: src/system.h:585 #, c-format msgid "Report %s translation bugs to <http://translationproject.org/team/>\n" -msgstr "Traduction de « %s » à <http://translationproject.org/team/fr.html>\n" +msgstr "" +"Signalez les problèmes de traduction de « %s » à : <traduc@traduc.org>\n" -#: src/system.h:578 +#: src/system.h:589 #, c-format msgid "For complete documentation, run: info coreutils '%s invocation'\n" msgstr "" -"Pour une documentation complète, lancer « info coreutils '%s invocation' »\n" +"Utilisez « info coreutils '%s invocation' » pour toute la documentation\n" -#: src/system.h:585 -#, fuzzy, c-format +#: src/system.h:596 +#, c-format msgid "Try '%s --help' for more information.\n" msgstr "Saisissez « %s --help » pour plus d'informations.\n" -#: src/system.h:617 +#: src/system.h:628 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -10817,7 +11209,7 @@ msgid "" "The following directory is part of the cycle:\n" " %s\n" msgstr "" -"AVERTISSEMENT: structure de répertoire circulaire.\n" +"Attention : structure de répertoire circulaire.\n" "Cela signifie très certainement que votre système de fichiers est corrompu.\n" "AVISER VOTRE ADMINISTRATEUR SYSTÈME.\n" "Le répertoire suivant fait parti du cycle:\n" @@ -10832,60 +11224,58 @@ msgstr "Jay Lepreau" msgid "" "Write each FILE to standard output, last line first.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" -"Écrit chaque FILE sur la sortie standard, la dernière ligne en premier.\n" -"En l'absence de FILE, ou quand FILE est -, lit l'entrée standard.\n" -"\n" +"É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" -#: src/tac.c:145 +#: src/tac.c:144 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 place le séparateur avant plutôt qu'après\n" -" -r, --regex interpréte le séparateur comme une expression\n" -" régulière\n" -" -s, --separator=STRING utilise STRING comme séparateur au lieu du saut\n" -" de ligne\n" +" -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" +" changement de ligne\n" -#: src/tac.c:235 src/tac.c:336 +#: src/tac.c:234 src/tac.c:335 #, c-format msgid "%s: seek failed" msgstr "%s : échec de positionnement (seek)" -#: src/tac.c:264 +#: src/tac.c:263 #, c-format msgid "record too large" msgstr "enregistrement trop grand" -#: src/tac.c:451 -#, fuzzy, c-format +#: src/tac.c:450 +#, c-format msgid "failed to create temporary file in %s" msgstr "impossible de créer le fichier temporaire dans %s" -#: src/tac.c:459 -#, fuzzy, c-format +#: src/tac.c:458 +#, c-format msgid "failed to open %s for writing" -msgstr "%s : échec d'ouverture en écriture" +msgstr "échec d'ouverture de %s en écriture" -#: src/tac.c:476 -#, fuzzy, c-format +#: src/tac.c:475 +#, c-format msgid "failed to rewind stream for %s" -msgstr "échec de préservation des dates pour %s" +msgstr "échec de rembobinage du flux pour %s" -#: src/tac.c:512 src/tac.c:519 +#: src/tac.c:511 src/tac.c:518 #, c-format msgid "%s: write error" -msgstr "%s : erreur d'écriture." +msgstr "%s : erreur d'écriture" -#: src/tac.c:572 -#, fuzzy, c-format +#: src/tac.c:571 +#, c-format msgid "failed to open %s for reading" msgstr "impossible d'ouvrir %s en lecture" -#: src/tac.c:630 +#: src/tac.c:629 #, c-format msgid "separator cannot be empty" msgstr "le séparateur ne peut pas être vide" @@ -10901,27 +11291,25 @@ 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" -"\n" msgstr "" -"Affiche les %d dernières lignes de chaque FILE sur la sortie standard.\n" -"Avec plusieurs fichiers FILE, précéde chacun d'une en-tête donnant le nom.\n" -"En l'absence de FILE, ou quand FILE est -, lit l'entrée standard.\n" -"\n" +"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" -#: src/tail.c:271 +#: 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" msgstr "" -" -c, --bytes=K affiche les K derniers octets ; il est aussi " -"possible\n" -" d'utiliser -c pour afficher les octets débutant " -"au Ke\n" -" de chaque fichier\n" +" -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" -#: src/tail.c:275 +#: src/tail.c:274 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -10930,12 +11318,12 @@ msgid "" " -F same as --follow=name --retry\n" msgstr "" " -f, --follow[={name|descriptor}]\n" -" affiche les données ajoutées au fur et à mesure\n" -" que le fichier grandit ; -f, --follow et\n" -" --follow=descriptor sont équivalents\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" " -F identique à --follow=name --retry\n" -#: src/tail.c:282 +#: src/tail.c:281 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -10948,22 +11336,22 @@ msgid "" " (this is the usual case of rotated log files).\n" " With inotify, this option is rarely useful.\n" msgstr "" -" -n, --lines=K affiche les K dernières lignes, au lieu des %d\n" -" dernières ou utilisez -n +K pour afficher les " -"lignes\n" -" à partir de la Ne\n" +" -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" " --max-unchanged-stats=N\n" -" avec l'option --follow=name, ouvre à nouveau un " -"FILE\n" -" qui n'a pas changé de taille après N itérations " -"(par\n" -" défaut %d) afin de vérifier s'il a été délié ou\n" -" renommé (c'est le cas habituellement des " +" avec l'option --follow=name, rouvrir un FILE 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" -" rotatifs de journalisation). Cette option est\n" -" rarement utiilisée.\n" +" tournants de journalisation).\n" +" Avec inotify, cette option est rarement " +"utilisée.\n" -#: src/tail.c:295 +#: src/tail.c:294 msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" " -q, --quiet, --silent never output headers giving file names\n" @@ -10971,18 +11359,16 @@ msgid "" " becomes inaccessible; useful when following by\n" " name, i.e., with --follow=name\n" msgstr "" -" --pid=PID avec -f, termine après le processus ID, PID " -"s'arrête\n" -" -q, --quiet, --silent n'affiche jamais l'en-tête qui donne les noms de\n" -" fichiers\n" -" --retry continue d'essayer à ouvrir un fichier même quand " -"il\n" -" est ou devient inaccessible ; utile quand le " +" --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" -" s'effecture par le nom, par ex., with --" -"follow=nom\n" +" par nom, par exemple, avec --follow=nom\n" -#: src/tail.c:302 +#: src/tail.c:301 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations.\n" @@ -10990,15 +11376,16 @@ msgid "" " 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 " +" -s, --sleep-interval=N avec -f, dort environ N secondes (1.0 par " "défaut)\n" -" entre les itérations. Avec inotify and --pid=P.\n" -" cette option est rarement utilisée.\n" -" -v, --verbose affiche toujours les en-têtes des noms de " +" 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" +" -v, --verbose afficher toujours les en-têtes des noms de " "fichier\n" -#: src/tail.c:311 -#, fuzzy +#: src/tail.c:310 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -11011,15 +11398,15 @@ msgstr "" "\n" "Si le premier caractère de K (le nombre d'octets ou de lignes) est un " "« + »,\n" -"affiche à partir du Ke éléments depuis le début de chaque fichier, " +"afficher à partir du Ke éléments depuis le début de chaque fichier, " "autrement,\n" -"affiche les K derniers éléments du fichier. K peut avoir un suffixe\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, Y.\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:320 +#: src/tail.c:319 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" @@ -11034,72 +11421,73 @@ msgstr "" "de\n" "nom. Ce comportement par défaut n'est pas désirable lorsqu'on désire suivre\n" "l'évolution d'un fichier à l'aide de son nom et non via le descripteur de\n" -"fichier (par ex. lors de la rotation des journaux). Dans ce cas, utilisez\n" -"--follow=name et tail suivra l'évolution du fichier en s'accomodant des\n" +"fichier (par exemple lors de la rotation des journaux). Dans ce cas, " +"utilisez\n" +"--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:379 +#: src/tail.c:378 #, c-format msgid "closing %s (fd=%d)" -msgstr "fermeture %s (fd=%d)" +msgstr "fermeture de %s (fd=%d)" -#: src/tail.c:454 +#: src/tail.c:453 #, c-format msgid "%s: cannot seek to relative offset %s" -msgstr "%s : impossible de déplacer selon le décalage relatif %s" +msgstr "%s : impossible de se déplacer selon le décalage relatif %s" -#: src/tail.c:458 +#: src/tail.c:457 #, 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:895 +#: src/tail.c:894 #, 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:907 -#, fuzzy, c-format +#: src/tail.c:906 +#, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" msgstr "" -"impossible de déterminer l'emplacement de %s, retour à l'interrogation active" +"type 0x%08lx de système de fichiers non reconnu pour %s, veuillez signaler " +"cela à %s, retour à l'interrogation active" -#: src/tail.c:964 +#: src/tail.c:963 #, c-format msgid "%s has become inaccessible" msgstr "%s est devenu inaccessible" -#: src/tail.c:981 +#: src/tail.c:980 #, c-format msgid "%s has been replaced with an untailable file; giving up on this name" msgstr "" -"%s a été remplacé par un fichier dont on ne peut déterminer la taille ; " -"abandon sur ce nom." +"%s a été remplacé par un fichier incompatible avec tail, abandon sur ce nom" -#: src/tail.c:990 +#: src/tail.c:989 #, 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." +msgstr "%s a été remplacé par un fichier distant, abandon sur ce nom" -#: src/tail.c:1011 +#: src/tail.c:1010 #, c-format msgid "%s has become accessible" msgstr "%s est devenu accessible" -#: src/tail.c:1019 +#: src/tail.c:1018 #, c-format msgid "%s has appeared; following end of new file" -msgstr "%s est apparu ; à la fin d'un nouveau fichier" +msgstr "%s est apparu ; suivi de la fin du nouveau fichier" -#: src/tail.c:1030 +#: src/tail.c:1029 #, c-format msgid "%s has been replaced; following end of new file" -msgstr "%s a été remplacé ; à la fin d'un nouveau fichier" +msgstr "%s a été remplacé ; suivi de la fin du nouveau fichier" -#: src/tail.c:1131 +#: src/tail.c:1130 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s : impossible de modifier le mode non bloquant" @@ -11132,18 +11520,18 @@ msgstr "impossible de surveiller %s" #: src/tail.c:1473 #, c-format msgid "error monitoring inotify event" -msgstr "erreur au suivi d'un évènement inotify" +msgstr "erreur de suivi d'un événement inotify" #: src/tail.c:1493 #, c-format msgid "error reading inotify event" -msgstr "erreur à la lecture d'un évènement inotify" +msgstr "erreur de lecture d'un événement inotify" #: src/tail.c:1786 #, 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" +"%s : impossible de suivre la fin de ce type de fichier, abandon sur ce nom" #: src/tail.c:1903 #, c-format @@ -11154,22 +11542,22 @@ msgstr "le numéro dans %s est trop grand" #, c-format msgid "%s: invalid maximum number of unchanged stats between opens" msgstr "" -"%s : nombre maximum de changements d'état non valide entre les ouvertures" +"%s : nombre maximal de changements d'état incorrect entre les ouvertures" #: src/tail.c:1991 #, c-format msgid "%s: invalid PID" -msgstr "%s : PID non valide" +msgstr "%s : PID incorrect" #: src/tail.c:2010 #, c-format msgid "%s: invalid number of seconds" -msgstr "%s : nombre de secondes non valide" +msgstr "%s : nombre de secondes incorrect" #: src/tail.c:2026 #, c-format msgid "option used in invalid context -- %c" -msgstr "option utilisée dans un contexte non valide -- %c" +msgstr "option utilisée dans un contexte incorrect — %c" #: src/tail.c:2034 #, c-format @@ -11180,8 +11568,7 @@ msgstr "" #: src/tail.c:2038 #, c-format msgid "warning: PID ignored; --pid=PID is useful only when following" -msgstr "" -"avertissement : PID ignoré ; --pid=PID est utile seulement lorsqu'il suit" +msgstr "avertissement : PID ignoré ; --pid=PID n'est utile que lors du suivi" #: src/tail.c:2041 #, c-format @@ -11201,7 +11588,7 @@ msgstr "avertissement : suivre l'entrée standard indéfiniment est inefficace" #: src/tail.c:2209 #, c-format msgid "inotify cannot be used, reverting to polling" -msgstr "inotify ne peut pas être utilisé, retour à l'interrogation active" +msgstr "impossible d'utiliser inotify, retour à l'interrogation active" #: src/tee.c:63 msgid "" @@ -11210,11 +11597,11 @@ msgid "" " -a, --append append to the given FILEs, do not overwrite\n" " -i, --ignore-interrupts ignore interrupt signals\n" msgstr "" -"Copie l'entrée standard vers chaque FILE, et également vers la sortie " +"Copier l'entrée standard vers chaque FILE, et également vers la sortie " "standard.\n" "\n" -" -a, --append ajoute au(x) FILE(s), sans les écraser\n" -" -i, --ignore-interrupts ignore les signaux d'interruption\n" +" -a, --append ajouter aux FILEs, sans les écraser\n" +" -i, --ignore-interrupts ignorer les signaux d'interruption\n" #: src/tee.c:71 msgid "" @@ -11222,7 +11609,7 @@ msgid "" "If a FILE is -, copy again to standard output.\n" msgstr "" "\n" -"Si FILE est -, copie à nouveau sur la sortie standard.\n" +"Si FILE est -, recopier sur la sortie standard.\n" #: src/test.c:123 #, c-format @@ -11232,7 +11619,7 @@ msgstr "argument manquant après %s" #: src/test.c:159 #, c-format msgid "invalid integer %s" -msgstr "entier non valide %s" +msgstr "entier %s incorrect" #: src/test.c:241 msgid "')' expected" @@ -11281,14 +11668,14 @@ msgstr "" " ou : test\n" " ou : [ EXPRESSION ]\n" " ou : [ ]\n" -" ou : %s OPTION ]\n" +" ou : [ OPTION ]\n" #: src/test.c:711 msgid "" "Exit with the status determined by EXPRESSION.\n" "\n" msgstr "" -"Termine l'exécution avec l'état déterminé par EXPRESSION.\n" +"Terminer l'exécution avec l'état déterminé par EXPRESSION.\n" "\n" #: src/test.c:717 @@ -11314,9 +11701,9 @@ msgstr "" " ( EXPRESSION ) EXPRESSION est vraie\n" " ! EXPRESSION EXPRESSION est fausse\n" " EXPRESSION1 -a EXPRESSION2 si les deux EXPRESSION1 et EXPRESSION2\n" -" sont vraies\n" -" EXPRESSION1 -o EXPRESSION2 si l'une ou l'autre des expressions,\n" -" EXPRESSION1 ou EXPRESSION2 est vraie\n" +" sont vraies\n" +" EXPRESSION1 -o EXPRESSION2 si l'une des deux EXPRESSION1 ou EXPRESSION2\n" +" est vraie\n" #: src/test.c:729 msgid "" @@ -11361,7 +11748,7 @@ msgid "" msgstr "" "\n" " FILE1 -ef FILE2 FILE1 et FILE2 ont les mêmes numéros de périphérique\n" -" et d'inode\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" @@ -11388,8 +11775,8 @@ msgid "" " -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-group-ID » est initialisé\n" -" -G FILE FILE existe et appartient au groupe effectif ID\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" @@ -11402,7 +11789,7 @@ msgid "" " -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'utilisateur effectif ID\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" @@ -11417,9 +11804,11 @@ msgid "" 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-user-ID » est initialisé\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 parcourable)\n" +" -x FILE FILE existe et est exécutable (ou peut être parcouru dans le " +"cas\n" +" d'un répertoire)\n" #: src/test.c:780 msgid "" @@ -11430,10 +11819,11 @@ 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érence les\n" -"liens symboliques. Prenez soin de neutraliser les parenthèses (p. ex., avec " +"Excepté 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 shell.\n" +"barres obliques inverses) dans un interpréteur.\n" "INTEGER peut être -l STRING, qui évalue alors la longueur de la chaîne.\n" #: src/test.c:786 @@ -11443,9 +11833,9 @@ msgid "" "test treats each of those as it treats any other nonempty STRING.\n" msgstr "" "\n" -"NOTE : [ reconnaît les options --help et --version, mais test ne le fait " +"Remarque : [ respecte les options --help et --version, mais test ne le fait " "pas.\n" -"test traite chacun de ceux-ci comme il traite n'importe quelle STRING non " +"test traite chacun de ceux-là comme il traite n'importe quelle STRING non " "vide.\n" #: src/test.c:791 @@ -11463,7 +11853,6 @@ msgid "Matthew Bradburn" msgstr "Matthew Bradburn" #: src/test.c:858 -#, fuzzy msgid "missing ']'" msgstr "« ] » manquant" @@ -11472,17 +11861,22 @@ msgstr "« ] » manquant" msgid "extra argument %s" msgstr "argument surnuméraire %s" -#: src/timeout.c:124 +#: src/timeout.c:112 +#, c-format +msgid "warning: sigprocmask" +msgstr "avertissement : sigprocmask" + +#: src/timeout.c:145 #, c-format msgid "warning: timer_settime" msgstr "avertissement : timer_settime" -#: src/timeout.c:129 +#: src/timeout.c:150 #, c-format msgid "warning: timer_create" msgstr "avertissement : timer_create" -#: src/timeout.c:204 +#: src/timeout.c:225 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -11491,20 +11885,17 @@ msgstr "" "Utilisation : %s [OPTION] DURATION [COMMAND [ARG]...]\n" " ou : %s OPTION\n" -#: src/timeout.c:208 -msgid "" -"Start COMMAND, and kill it if still running after DURATION.\n" -"\n" -"Mandatory arguments to long options are mandatory for short options too.\n" +#: src/timeout.c:229 +msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "" -"Démarre COMMAND et l'arrête s'il fonctionne encore après la durée DURATION.\n" -"\n" -"Les arguments obligatoires pour les options longues le sont aussi pour les\n" -"options courtes.\n" +"Démarrer COMMAND et l'arrêter si elle fonctionne encore après la durée " +"DURATION.\n" -#: src/timeout.c:213 -#, fuzzy +#: src/timeout.c:235 msgid "" +" --preserve-status\n" +" exit with the same status as COMMAND, even when the\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 " @@ -11518,23 +11909,29 @@ msgid "" " 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 " +"commande\n" +" dépasse le temps imparti\n" " --foreground\n" -" Quand timeout ne s'exécute pas directement d'une invite\n" -" shell, permet à COMMAND de lire depuis TTY et de recevoir\n" -" les signaux TTY.\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 " +"de\n" +" COMMAND ne s'arrêteront pas à l'expiration du délai.\n" " -k, --kill-after=DURATION\n" -" envoi aussi le signal KILL if COMMAND est toujours en " +" envoyer aussi le signal KILL if COMMAND est toujours en " "cours\n" -" d'exécution bien après que le signal initial ait été " +" d'exécution bien après que le signal initial ait été " "envoyé.\n" " -s, --signal=SIGNAL\n" -" spécifie le signal à envoyer lors d'une expiration de " +" 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 la liste des signaux.\n" +" SIGNAL peut être un nom comme « HUP » ou un nombre.\n" +" Consultez « kill -l » pour une liste des signaux.\n" -#: src/timeout.c:229 -#, fuzzy +#: src/timeout.c:254 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -11542,39 +11939,44 @@ msgid "" "days.\n" msgstr "" "\n" -"DURATION est un nombre en virgule flottante avec un suffixe optionnel :\n" +"DURATION est un nombre en 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:234 -#, fuzzy +#: src/timeout.c:259 msgid "" "\n" -"If the command times out, then exit with status 124. Otherwise, exit\n" -"with the status of COMMAND. If no signal is specified, send the TERM\n" -"signal upon timeout. The TERM signal kills any process that does not\n" -"block or catch that signal. For other processes, it may be necessary to\n" -"use the KILL (9) signal, since this signal cannot be caught. If the\n" -"KILL (9) signal is sent, the exit status is 128+9 rather than 124.\n" +"If the command times out, and --preserve-status is not set, then exit with\n" +"status 124. Otherwise, exit with the status of COMMAND. If no signal\n" +"is specified, send the TERM signal upon timeout. The TERM signal kills\n" +"any process that does not block or catch that signal. It may be necessary\n" +"to use the KILL (9) signal, since this signal cannot be caught, in which\n" +"case the exit status is 128+9 rather than 124.\n" msgstr "" "\n" -"Si la commande dépasse le temps imparti, alors quitte avec le statut 124,\n" -"sinon quite avec le statut de COMMAND. Si aucun signal n'est spécifié, le\n" -"signal TERM est envoyé à l'expiration. Le signal TERM tuera tous les " -"processus\n" -"qui n'attrapent pas ce signal. Pour les autres processus, il peut être\n" -"nécessaire d'utiliser le signal KILL(9), puisque ce signal ne peut être\n" -"capturé.\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" +"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 +#, c-format +msgid "warning: disabling core dumps failed" +msgstr "avertissement : impossible de désactiver les core dumps" -#: src/timeout.c:419 +#: src/timeout.c:471 #, c-format msgid "error waiting for command" msgstr "erreur d'attente de la commande" -#: src/timeout.c:441 +#: src/timeout.c:482 #, c-format -msgid "warning: disabling core dumps failed" -msgstr "avertissement : impossible de désactiver les core dumps" +msgid "the monitored command dumped core" +msgstr "la commande surveillée a renvoyé un core dump" #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 @@ -11586,22 +11988,22 @@ msgstr "Jim Kingdon" msgid "Randy Smith" msgstr "Randy Smith" -#: src/touch.c:115 src/touch.c:313 +#: src/touch.c:115 src/touch.c:309 #, c-format msgid "invalid date format %s" -msgstr "format de date non valide %s" +msgstr "format de date %s incorrect" -#: src/touch.c:194 +#: src/touch.c:191 #, c-format msgid "cannot touch %s" msgstr "impossible de faire un touch %s" -#: src/touch.c:200 +#: src/touch.c:197 #, c-format msgid "setting times of %s" msgstr "initialisation des dates de %s" -#: src/touch.c:216 +#: src/touch.c:213 msgid "" "Update the access and modification times of each FILE to the current time.\n" "\n" @@ -11610,32 +12012,31 @@ msgid "" "\n" "A FILE argument string of - is handled specially and causes touch to\n" "change the times of the file associated with standard output.\n" -"\n" msgstr "" -"Met à jour la date d'accès et de modification de chaque FILE à l'heure " +"Mettre à jour la date d'accès et de modification de FILE à l'heure " "actuelle.\n" "\n" -"Un argument FILE qui n'existe pas est créé vide, sauf si -c ou -h est " -"spécifié.\n" +"Un argument FILE qui n'existe 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" -"change la date du fichier associé à la sortie standard.\n" -"\n" +"modifie la date du fichier associé à la sortie standard.\n" -#: src/touch.c:229 +#: src/touch.c:225 msgid "" " -a change only the access time\n" " -c, --no-create do not create any files\n" " -d, --date=STRING parse STRING and use it instead of current time\n" " -f (ignored)\n" msgstr "" -" -a modifie seulement la date d'accès\n" -" -c, --no-create ne crée aucun fichier\n" -" -d, --date=STRING analyse STRING et l'utilise au lieu de la date " -"actuelle\n" +" -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" +" date actuelle\n" " -f (ignorée)\n" -#: src/touch.c:235 +#: src/touch.c:231 msgid "" " -h, --no-dereference affect each symbolic link instead of any " "referenced\n" @@ -11643,31 +12044,33 @@ msgid "" " timestamps of a symlink)\n" " -m change only the modification time\n" msgstr "" -" -h, --no-dereference affecte les liens symboliques au lieu des fichiers\n" -" référencés (utile seulement sur les systèmes " -"permettant\n" -" de changer le propriétaire d'un lien symbolique)\n" -" -m modifie uniquement la date de modification\n" +" -h, --no-dereference affecter les liens symboliques au lieu des " +"fichiers\n" +" référencés (seulement utile sur les systèmes\n" +" permettant de modifier les dates de lien " +"symbolique)\n" +" -m ne modifier que la date de modification\n" -#: src/touch.c:241 +#: src/touch.c:237 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" -" --time=WORD change the specified time:\n" +" --time=WORD change the specified time:\n" " WORD is access, atime, or use: equivalent to -a\n" " WORD is modify or mtime: equivalent to -m\n" msgstr "" -" -r, --reference=FILE utilise la date de ce fichier au lieu de la date\n" -" actuelle\n" -" -t STAMP utilise [[CC]AA]MMJJhhmm[.ss] au lieu de la date\n" -" actuelle\n" -" --time=WORD modifie le temps indiqué :\n" -" WORD est « access », « atime » ou « use » ; " -"équivalent\n" -" à -a\n" -" WORD est « modify », « mtime » ; équivalent à -m\n" +" -r, --reference=FILE 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" +" 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" -#: src/touch.c:250 +#: src/touch.c:246 msgid "" "\n" "Note that the -d and -t options accept different time-date formats.\n" @@ -11676,13 +12079,13 @@ msgstr "" "Notez que les options -d et -t acceptent différents formats de date et " "d'heure.\n" -#: src/touch.c:339 +#: src/touch.c:335 #, c-format msgid "cannot specify times from more than one source" -msgstr "impossible de spécifier les dates pour plusieurs sources" +msgstr "impossible d'indiquer les dates pour plusieurs sources" -#: src/touch.c:413 -#, fuzzy, c-format +#: src/touch.c:409 +#, c-format msgid "" "warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'" msgstr "" @@ -11707,16 +12110,16 @@ msgid "" " of that character\n" " -t, --truncate-set1 first truncate SET1 to length of SET2\n" msgstr "" -"Converti, compresse et/ou élimine des caractères de l'entrée standard en\n" +"Convertir, compresser ou éliminer des caractères de l'entrée standard en\n" "écrivant sur la sortie standard.\n" "\n" -" -c, -C, --complement complément à un de SET1 \n" -" -d, --delete supprime les caractères de SET1, ne convertit\n" -" pas\n" -" -s, --squeeze-repeats remplace chaque séquence en entrée de caractères\n" -" répétés qui apparaît dans SET1 par une seule\n" -" occurence de ce caractère\n" -" -t, --truncate-set1 tronque d'abord SET1 à la longueur de SET2\n" +" -c, -C, --complement utiliser le complément de SET1 \n" +" -d, --delete supprimer les caractères de SET1, 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" +" occurrence de ce caractère\n" +" -t, --truncate-set1 tronquer d'abord SET1 à la longueur de SET2\n" #: src/tr.c:303 msgid "" @@ -11734,19 +12137,19 @@ msgid "" " \\t horizontal tab\n" msgstr "" "\n" -"Les ENSEMBLES sont spécifiés comme des chaînes de caractères.\n" +"Les ensembles SET 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" "\n" -" \\NNN caractère ayant la valeur octale NNN (1 à 3 chiffres " +" \\NNN caractère ayant la valeur octale NNN (1 à 3 chiffres " "octaux)\n" " \\\\ barre oblique inverse\n" -" \\a alerte sonore \n" -" \\b retour arrière\n" +" \\a sonnerie (SON)\n" +" \\b espace arrière\n" " \\f saut de page\n" -" \\n saut de ligne\n" -" \\r retour\n" -" \\t saut horizontal\n" +" \\n nouvelle ligne\n" +" \\r retour chariot\n" +" \\t tabulation horizontale\n" #: src/tr.c:317 msgid "" @@ -11804,20 +12207,19 @@ msgid "" "translation or deletion.\n" msgstr "" "\n" -"La conversion se fait si -d n'est pas donné et si à la fois, SET1 et SET2\n" -"apparaissent. -t peut être employé seulement en conversion. SET2 est adapté " -"à\n" -"la longueur de SET1 par la répétition de son dernier caractère. Les " -"caratères\n" -"en excédents de SET2 sont ignorés. Seulement [:lower:] et [:upper:] offre " -"la\n" -"garantie de l'expansion dans l'ordre ascendant ; utilisé dans SET2 durant " +"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" -"conversion, ils ne devraient être pas utilisés que par paires pour " -"spécifier\n" -"le changement de casse. -s emploie SET1 s'il n'y a pas de conversion, ni de\n" -"suppression ; sinon la compression emploie SET2 et intervient après la\n" -"conversion et la suppression.\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 " +"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" #: src/tr.c:509 #, c-format @@ -11825,53 +12227,52 @@ msgid "" "warning: the ambiguous octal escape \\%c%c%c is being\n" "\tinterpreted as the 2-byte sequence \\0%c%c, %c" msgstr "" -"avertissement : l'échappement octal ambigü \\%c%c%c a été interprété comme " -"une\n" -"séquence de 2-octets \\0%c%c, %c" +"avertissement : la protection octale ambiguë \\%c%c%c est\n" +"\tinterprété comme une séquence de 2 octets \\0%c%c, %c" #: src/tr.c:518 #, c-format msgid "warning: an unescaped backslash at end of string is not portable" msgstr "" -"avertissement : une barre oblique inverse non neutralisée à la fin d'une " -"chaîne n'est portable" +"avertissement : une barre oblique inverse non protégée à la fin d'une chaîne " +"n'est portable" #: src/tr.c:673 -#, fuzzy, c-format +#, c-format msgid "range-endpoints of '%s-%s' are in reverse collating sequence order" msgstr "" -"les limites de l'intervalle « %s-%s » sont en ordre de séquence\n" -"de comparaison inverse." +"les limites de l'intervalle « %s-%s » sont en ordre de séquence de " +"comparaison inverse" #: src/tr.c:829 #, c-format msgid "invalid repeat count %s in [c*n] construct" -msgstr "compteur de répétion %s non valide dans [c*n]" +msgstr "compteur de répétition %s incorrect dans [c*n]" #: src/tr.c:910 -#, fuzzy, c-format +#, c-format msgid "missing character class name '[::]'" msgstr "caractère de nom de classe « [::] » manquant" #: src/tr.c:913 -#, fuzzy, c-format +#, c-format msgid "missing equivalence class character '[==]'" -msgstr "caractère d'équivalence de classe « [==] » manquant" +msgstr "caractère de classe d'équivalence « [==] » manquant" #: src/tr.c:928 #, c-format msgid "invalid character class %s" -msgstr "caractère de classe non valide %s" +msgstr "caractère de classe %s incorrect" #: src/tr.c:947 #, c-format msgid "%s: equivalence class operand must be a single character" -msgstr "%s : l'opérateur d'équivalence de classe doit être un caractère simple" +msgstr "%s : l'opérateur de classe d'équivalence doit être un caractère simple" #: src/tr.c:1229 #, c-format msgid "misaligned [:upper:] and/or [:lower:] construct" -msgstr "la structure [:upper:] et/ou [:lower:] est mal alignée" +msgstr "les structures [:upper:] ou [:lower:] sont mal alignées" #: src/tr.c:1335 #, c-format @@ -11884,13 +12285,13 @@ msgid "" "when translating with string1 longer than string2,\n" "the latter string must not end with a character class" msgstr "" -"à la traduction de string1 plus longue que string2,\n" +"lors d'une conversion avec string1 plus longue que string2,\n" "cette dernière doit se terminer avec un caractère de classe" #: src/tr.c:1480 #, c-format msgid "the [c*] repeat construct may not appear in string1" -msgstr "la structure [c*] de répétition ne peut pas apparaître dans la string1" +msgstr "la structure de répétition [c*] ne peut pas apparaître dans la string1" #: src/tr.c:1490 #, c-format @@ -11901,15 +12302,17 @@ msgstr "une seule structure de répétition [c*] peut apparaître dans string2" #, c-format msgid "[=c=] expressions may not appear in string2 when translating" msgstr "" -"les expressions [=c=] ne peuvent pas apparaître dans string2 à la traduction" +"les expressions [=c=] ne peuvent pas apparaître dans string2 lors d'une " +"conversion" #: 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 "" -"à la traduction, les seules classes de caractères qui peuvent apparaître\n" +"lors d'une conversion, les seules classes de caractères qui peuvent " +"apparaître\n" "dans string2 sont « upper » ou « lower »" #: src/tr.c:1520 @@ -11923,31 +12326,30 @@ msgid "" "when translating with complemented character classes,\n" "string2 must map all characters in the domain to one" msgstr "" -"lors de convertion avec des caractères complémentés de classes,\n" +"lors d'une conversion avec des caractères complémentés de classes,\n" "string2 doit convertir tous les caractères du domaine dans un seul" #: src/tr.c:1538 #, c-format msgid "the [c*] construct may appear in string2 only when translating" msgstr "" -"la structure [c*] peut apparaître dans string2 seulement lors d'une\n" -"conversion" +"la structure [c*] ne peut apparaître dans string2 que lors d'une conversion" #: src/tr.c:1788 msgid "Two strings must be given when both deleting and squeezing repeats." msgstr "" -"Deux chaînes doivent être spécifiées quand à la fois suppression et " -"compression se répètent." +"Deux chaînes doivent être indiquées lors de suppression et compression des " +"répétitions." #: src/tr.c:1790 msgid "Two strings must be given when translating." -msgstr "Deux chaînes doivent être spécifiées lors de la conversion." +msgstr "Deux chaînes doivent être indiquées lors de la conversion." #: src/tr.c:1800 msgid "Only one string may be given when deleting without squeezing repeats." msgstr "" -"Seulement une chaîne peut être spécifiée lors d'une destruction sans\n" -"réduction des répétitions" +"Une seule chaîne peut être indiquée lors d'une destruction sans réduction " +"des répétitions." #: src/true.c:38 #, c-format @@ -11960,11 +12362,11 @@ msgstr "" #: src/true.c:45 msgid "Exit with a status code indicating success." -msgstr "Quitte avec le code de statut indiquant le succès." +msgstr "Quitter avec un code d'état indiquant le succès." #: src/true.c:46 msgid "Exit with a status code indicating failure." -msgstr "Quitte avec un code status indiquant l'échec." +msgstr "Quitter avec un code d'état indiquant l'échec." #: src/truncate.c:96 #, c-format @@ -11980,38 +12382,36 @@ msgid "" "If a FILE is larger than the specified size, the extra data is lost.\n" "If a FILE is shorter, it is extended and the extended part (hole)\n" "reads as zero bytes.\n" -"\n" msgstr "" -"Réduit ou étend la taille de chaque FILE à la taille spécifiée\n" +"Réduire ou étendre la taille de chaque FILE à la taille indiquée\n" "\n" -"Un argument FILE qui n'existe pas, est créé.\n" +"Un argument FILE qui n'existe pas est créé.\n" "\n" -"Si FILE est plus grand que la taille spécifiée, les données restantes sont\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" "(trou) contient des octets à zéro.\n" -"\n" -#: src/truncate.c:110 +#: src/truncate.c:109 msgid " -c, --no-create do not create any files\n" -msgstr " -c, --no-create ne crée pas de fichier\n" +msgstr " -c, --no-create ne pas créer de fichier\n" -#: src/truncate.c:113 +#: src/truncate.c:112 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" -" -o, --io-blocks traite SIZE comme un nombre de blocs E/S au lieu " -"d'octets\n" +" -o, --io-blocks traiter SIZE comme un nombre de blocs d'E/S au " +"lieu\n" +" d'octets\n" -#: src/truncate.c:116 +#: 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" msgstr "" -" -r, --reference=RFILE utilise la taille de RFILE\n" -" -s, --size=SIZE définit ou ajuste la taille du fichier de SIZE\n" +" -r, --reference=RFILE utiliser la taille de RFILE\n" +" -s, --size=SIZE définir ou ajuster la taille du fichier de SIZE\n" -#: src/truncate.c:122 -#, fuzzy +#: src/truncate.c:121 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -12024,60 +12424,59 @@ msgstr "" "« / » arrondi au multiple inférieur de, « % » arrondi au multiple supérieur " "de.\n" -#: src/truncate.c:150 +#: src/truncate.c:149 #, c-format msgid "overflow in %<PRIdMAX> * %<PRIdMAX> byte blocks for file %s" msgstr "" "débordement dans %<PRIdMAX> * %<PRIdMAX> blocs d'octets pour le fichier %s" -#: src/truncate.c:174 +#: src/truncate.c:173 #, c-format msgid "%s has unusable, apparently negative size" -msgstr "%s : a une taille inutilisable, apparemment négative." +msgstr "%s : a une taille inutilisable, apparemment négative" -#: src/truncate.c:184 src/truncate.c:379 +#: src/truncate.c:183 src/truncate.c:384 #, c-format msgid "cannot get the size of %s" msgstr "impossible d'obtenir la taille de %s" -#: src/truncate.c:206 +#: src/truncate.c:205 #, c-format msgid "overflow rounding up size of file %s" msgstr "débordement lors de l'arrondi supérieur de la taille du fichier %s" -#: src/truncate.c:216 +#: src/truncate.c:215 #, c-format msgid "overflow extending size of file %s" msgstr "débordement lors de l'augmentation de la taille du fichier %s" -#: src/truncate.c:231 +#: src/truncate.c:230 #, c-format msgid "failed to truncate %s at %<PRIdMAX> bytes" -msgstr "impossible de tronquer %s à %<PRIdMAX> octets" +msgstr "impossible de tronquer %s à %<PRIdMAX> octets" -#: src/truncate.c:305 +#: src/truncate.c:303 #, c-format msgid "multiple relative modifiers specified" -msgstr "plusieurs modificateurs relatifs spécifiés" +msgstr "plusieurs modificateurs relatifs indiqués" -# « une » option -#: src/truncate.c:335 +#: src/truncate.c:333 #, c-format msgid "you must specify either %s or %s" -msgstr "vous devez spécifier soit %s ou %s" +msgstr "vous devez indiquer soit %s, soit %s" # « une » option -#: src/truncate.c:342 +#: src/truncate.c:340 #, c-format msgid "you must specify a relative %s with %s" -msgstr "vous devez une %s relative avec %s" +msgstr "vous devez indiquer une %s relative avec %s" -#: src/truncate.c:349 +#: src/truncate.c:347 #, c-format msgid "%s was specified but %s was not" -msgstr "%s était spécifié mais pas %s" +msgstr "%s était indiquée mais pas %s" -#: src/truncate.c:400 +#: src/truncate.c:404 #, c-format msgid "cannot open %s for writing" msgstr "impossible d'ouvrir %s en écriture" @@ -12096,9 +12495,9 @@ msgid "" "\n" msgstr "" "Utilisation : %s [OPTION] [FILE]\n" -"Affiche une liste entièrement ordonnée en cohérence avec le tri partiel de " +"Afficher une liste entièrement ordonnée cohérente avec le tri partiel de " "FILE.\n" -"Sans FILE, ou quand FILE est -, lit l'entrée standard.\n" +"Sans FILE, ou quand FILE est -, lire l'entrée standard.\n" "\n" #: src/tsort.c:472 @@ -12117,15 +12516,14 @@ msgid "" "\n" " -s, --silent, --quiet print nothing, only return an exit status\n" msgstr "" -"Affiche le nom de fichier du terminal relié à l'entrée standard.\n" +"Afficher le nom de fichier du terminal connecté à l'entrée standard.\n" "\n" -" -s, --silent, --quiet n'affiche rien, retourne seulement un statut de " -"fin\n" -" d'exécution\n" +" -s, --silent, --quiet ne rien afficher, ne renvoyer qu'un état de " +"retour\n" #: src/tty.c:120 msgid "not a tty" -msgstr "n'est pas un tty" +msgstr "pas un tty" #: src/uname.c:124 msgid "" @@ -12137,13 +12535,14 @@ msgid "" " -n, --nodename print the network node hostname\n" " -r, --kernel-release print the kernel release\n" msgstr "" -"Affiche certaines informations système. Sans OPTION, identique à -s.\n" +"Afficher certaines informations système. Sans OPTION, identique à -s.\n" "\n" -" -a, --all affiche toutes les informations, dans l'ordre\n" -" suivant, mais sans -p et -i s'il sont inconnus :\n" -" -s, --kernel-name affiche le nom du kernel\n" -" -n, --nodename affiche le nom du noeud réseau (hostname)\n" -" -r, --kernel-release affiche la version du noyau\n" +" -a, --all afficher toutes les informations, dans l'ordre\n" +" suivant, mais sans -p ni -i s'ils sont " +"inconnus :\n" +" -s, --kernel-name afficher le nom du noyau\n" +" -n, --nodename afficher le nom du nœud réseau (hostname)\n" +" -r, --kernel-release afficher la version du noyau\n" #: src/uname.c:133 msgid "" @@ -12153,20 +12552,21 @@ msgid "" " -i, --hardware-platform print the hardware platform or \"unknown\"\n" " -o, --operating-system print the operating system\n" msgstr "" -" -v, --kernel-version affiche la version du kernel\n" -" -m, --machine affiche le nom de matériel de la machine\n" -" -p, --processor affiche le type de processeur ou " -"« unknown » (inconnu)\n" -" -i, --hardware-platform affiche la plate-forme matérielle ou " -"« unknown » (inconnu)\n" -" -o, --operating-system affiche le système d'exploitation\n" +" -v, --kernel-version afficher la version du noyau\n" +" -m, --machine afficher le nom de matériel de la machine\n" +" -p, --processor afficher le type de processeur ou « unknown »\n" +" (pour inconnu)\n" +" -i, --hardware-platform afficher la plate-forme matérielle ou " +"« unknown »\n" +" (pour inconnu)\n" +" -o, --operating-system afficher le système d'exploitation\n" #: src/uname.c:143 msgid "" "Print machine architecture.\n" "\n" msgstr "" -"Affiche l'architecture machine.\n" +"Afficher l'architecture machine.\n" "\n" #: src/uname.c:286 @@ -12178,38 +12578,37 @@ msgstr "impossible d'obtenir le nom de système" msgid "" "Convert blanks in each FILE to tabs, writing to standard output.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" -"Converti les blancs de chaque FILE par des tabulations, lors de l'écriture\n" +"Convertir les blancs de chaque FILE par des tabulations, lors de " +"l'affichage\n" "sur la sortie standard.\n" -"Sans FILE ou quand le FILE est -, lit l'entrée standard.\n" +"Sans FILE, ou quand le FILE est -, lire l'entrée standard.\n" -#: src/unexpand.c:125 +#: src/unexpand.c:124 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 convertit tous les blancs, pas seulement les blancs\n" -" initiaux\n" -" --first-only convertit seulement les séquences de blancs en tête\n" -" (surdéfini -a)\n" -" -t, --tabs=N utilise N caractères de tabulations au lieu de 8 (active " +" -a, --all convertir tous les blancs, pas que les blancs initiaux\n" +" --first-only ne convertir que les séquences de blancs en tête (écrase " "-a)\n" -" -t, --tabs=LIST utilise une liste de positions de tabulation séparées " +" -t, --tabs=N utiliser N caractères de tabulations au lieu de 8 (active " +"-a)\n" +" -t, --tabs=LIST utiliser une liste de positions de tabulation séparées " "par\n" -" des virgules (active -a)\n" +" des virgules (active -a)\n" -#: src/unexpand.c:153 +#: src/unexpand.c:152 #, c-format msgid "tabs are too far apart" msgstr "les tabulations sont trop éloignées" -#: src/unexpand.c:505 +#: src/unexpand.c:504 #, c-format msgid "tab stop value is too large" -msgstr "la valeur de l'arrêt de tabulation est trop grand" +msgstr "la valeur de l'arrêt de tabulation est trop grande" #: src/uniq.c:134 #, c-format @@ -12222,24 +12621,22 @@ msgid "" "writing to OUTPUT (or standard output).\n" "\n" "With no options, matching lines are merged to the first occurrence.\n" -"\n" msgstr "" -"Filtre les lignes adjacentes correspondantes depuis INPUT (entrée " -"standard),\n" -"en écrivant dans OUTPUT (ou la sortie standard).\n" +"Filtrer les lignes adjacentes correspondantes depuis INPUT (ou l'entrée\n" +"standard), en écrivant dans OUTPUT (ou la sortie standard).\n" "\n" "Sans option, les lignes correspondantes sont fusionnées sur la première\n" -"occurence.\n" +"occurrence.\n" -#: src/uniq.c:148 +#: src/uniq.c:147 msgid "" " -c, --count prefix lines by the number of occurrences\n" " -d, --repeated only print duplicate lines\n" msgstr "" -" -c, --count préfixe les lignes par le nombre d'occurences\n" -" -d, --repeated affiche seulement les lignes ayant des duplicatats\n" +" -c, --count préfixer les lignes par le nombre d'occurrences\n" +" -d, --repeated n'afficher que les lignes ayant des duplicatas\n" -#: src/uniq.c:152 +#: src/uniq.c:151 msgid "" " -D, --all-repeated[=delimit-method] print all duplicate lines\n" " delimit-method={none(default),prepend,separate}\n" @@ -12250,34 +12647,38 @@ msgid "" " -u, --unique only print unique lines\n" " -z, --zero-terminated end lines with 0 byte, not newline\n" msgstr "" -" -D, --all-repeated[=delimit-method] affiche toutes les lignes en double\n" -" delimit-method={none(default),prepend,separate}\n" -" La délimitation est faite avec des lignes blanches.\n" -" -f, --skip-fields=N évite de comparer les N premiers champs\n" -" -i, --ignore-case ignore les différences de casse à la comparaison\n" -" -s, --skip-chars=N évite de comparer les N premiers caractères\n" -" -u, --unique affiche seulement les lignes uniques\n" -" -z, --zero-terminated termine les lignes avec l'octet 0, sans\n" -" ligne nouvelle\n" - -#: src/uniq.c:162 +" -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" +" -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 msgid " -w, --check-chars=N compare no more than N characters in lines\n" msgstr "" -" -w, --check-chars=N ne compare pas plus de N caractères dans les lignes\n" +" -w, --check-chars=N ne pas comparer plus de N caractères dans les " +"lignes\n" -#: src/uniq.c:167 +#: src/uniq.c:166 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" -"Un champ est une suite de blancs (souvent des espaces et/ou tabulations), " -"suivi\n" -"de caractères non-blancs. Les champs avant les caractères sont ignorés.\n" +"Un champ est une suite de blancs (des espaces ou des tabulations en " +"général),\n" +"suivis de caractères non blancs. Les champs avant les caractères sont " +"ignorés.\n" -#: src/uniq.c:172 -#, fuzzy +#: src/uniq.c:171 msgid "" "\n" "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n" @@ -12285,33 +12686,35 @@ msgid "" "Also, comparisons honor the rules specified by 'LC_COLLATE'.\n" msgstr "" "\n" -"Note : « uniq » ne détecte pas les lignes répétées à moins qu'elles soient\n" -"adjacentes. Il est possible de trier l'entrée en premier, ou d'utiliser \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 " +"d'utiliser\n" "« sort -u » sans « uniq ».\n" -"Les comparaisons respectent les rêgles définies par « LC_COLLATE ».\n" +"Les comparaisons respectent les règles définies par « LC_COLLATE ».\n" -#: src/uniq.c:359 +#: src/uniq.c:358 #, c-format msgid "too many repeated lines" msgstr "trop de lignes répétées" -#: src/uniq.c:522 +#: src/uniq.c:521 msgid "invalid number of fields to skip" -msgstr "nombre de champs à ignorer non valide" +msgstr "nombre de champs à ignorer incorrect" -#: src/uniq.c:531 +#: src/uniq.c:530 msgid "invalid number of bytes to skip" -msgstr "nombre d'octets à ignorer non valide" +msgstr "nombre d'octets à ignorer incorrect" -#: src/uniq.c:540 +#: src/uniq.c:539 msgid "invalid number of bytes to compare" -msgstr "nombre d'octets à comparer non valide" +msgstr "nombre d'octets à comparer incorrect" -#: src/uniq.c:559 +#: src/uniq.c:558 #, c-format msgid "printing all duplicated lines and repeat counts is meaningless" msgstr "" -"affiche toutes les lignes dupliquées et le décompte de répétition est inutile" +"L'affichage de toutes les lignes dupliquées et le décompte de répétition est " +"sans effet" #: src/unlink.c:45 #, c-format @@ -12327,7 +12730,7 @@ msgid "" "Call the unlink function to remove the specified FILE.\n" "\n" msgstr "" -"Exécute la fonction unlink() pour supprimer le FILE spécifié.\n" +"Exécuter la fonction unlink pour supprimer le FILE indiqué.\n" "\n" #: src/unlink.c:86 @@ -12343,31 +12746,36 @@ msgstr "impossible d'obtenir la date de démarrage" #. TRANSLATORS: This prints the current clock time. #: src/uptime.c:136 msgid " %H:%M%P " -msgstr " %H:%M " +msgstr " %H:%M " #: src/uptime.c:138 #, c-format msgid " ??:???? " -msgstr " ??:???? " +msgstr " ??:?? " #: src/uptime.c:140 #, c-format msgid "up ???? days ??:??, " -msgstr "actif ???? jours ??:??, " +msgstr "actif ???? jours ??:??, " #: src/uptime.c:144 #, c-format msgid "up %ld day %2d:%02d, " msgid_plural "up %ld days %2d:%02d, " -msgstr[0] "actif %ld jour %2d:%02d, " -msgstr[1] "actif %ld jours %2d:%02d, " +msgstr[0] "actif %ld jour %2d:%02d, " +msgstr[1] "actif %ld jours %2d:%02d, " + +#: src/uptime.c:149 +#, c-format +msgid "up %2d:%02d, " +msgstr "actif %2d:%02d, " #: src/uptime.c:151 #, c-format msgid "%lu user" msgid_plural "%lu users" -msgstr[0] "%lu utilisateur" -msgstr[1] "%lu utilisateurs" +msgstr[0] "%lu utilisateur" +msgstr[1] "%lu utilisateurs" #: src/uptime.c:161 #, c-format @@ -12381,7 +12789,7 @@ msgid "" "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 "" -"Affiche la date actuelle, la durée depuis laquelle le système a été amorcé,\n" +"Afficher la date actuelle, la durée depuis laquelle le système fonctionne,\n" "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." @@ -12391,8 +12799,8 @@ msgid "" " Processes in\n" "an uninterruptible sleep state also contribute to the load average.\n" msgstr "" -" Tâches en cours\n" -"un ininterruptible état dormant contribue aussi à la charge moyenne.\n" +" Les tâches dans\n" +"un état dormant ininterruptible contribuent aussi à la charge moyenne.\n" #: src/uptime.c:210 #, c-format @@ -12405,7 +12813,7 @@ msgid "" "If FILE is not specified, use %s. %s as FILE is common.\n" "\n" msgstr "" -"Si FILE n'est pas spécifié, utilise %s. %s en tant que FILE est usuel.\n" +"Si FILE n'est pas indiqué, utiliser %s. %s en tant que FILE est usuel.\n" "\n" #: src/users.c:106 @@ -12415,8 +12823,8 @@ msgid "" "If FILE is not specified, use %s. %s as FILE is common.\n" "\n" msgstr "" -"Affiche les utilisateurs connectés selon FILE.\n" -"Si FILE est spécifié, utilise %s. %s en tant que FILE est usuel.\n" +"Afficher les utilisateurs connectés selon FILE.\n" +"Si FILE est indiqué, utiliser %s. %s en tant que FILE est usuel.\n" "\n" #: src/wc.c:117 @@ -12431,20 +12839,17 @@ msgid "" " -m, --chars print the character counts\n" " -l, --lines print the newline counts\n" msgstr "" -"Affiche le nombre de nouvelles lignes, mots et d'octets pour chaque FILE " -"ainsi\n" -"que le total des lignes si plusieurs fichiers FILE sont spécifiés. En\n" -"l'absence de FILE, ou quand FILE est -, lit l'entrée standard. Un mot est " -"une\n" -"séquence non nulle de caractères, délimitée par une espace.\n" -"Les options ci-dessous permettent de sélectionner les compteurs à afficher, " -"qui\n" -"sont toujours utilisés dans l'ordre suivant : nouvelles lignes, mots, " +"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" +"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, " "octet,\n" "longueur de ligne maximale.\n" -" -c, --bytes affiche le nombre d'octets\n" -" -m, --chars affiche le nombre de caractères\n" -" -l, --lines affiche le nombre de nouvelles lignes\n" +" -c, --bytes afficher le nombre d'octets\n" +" -m, --chars afficher le nombre de caractères\n" +" -l, --lines afficher le nombre de nouvelles lignes\n" #: src/wc.c:128 msgid "" @@ -12454,94 +12859,94 @@ msgid "" " -L, --max-line-length print the length of the longest line\n" " -w, --words print the word counts\n" msgstr "" -" --files0-from=F lit l'entrée depuis les fichiers spécifiés par\n" -" des noms terminant par NUL depuis le fichier F\n" -" -L, --max-line-length affiche la longueur de la ligne la plus longue\n" -" -w, --words affiche le nombre de mots\n" +" --files0-from=F lire l'entrée depuis les fichiers indiqués par\n" +" des noms terminant par NULL dans le fichier F\n" +" -L, --max-line-length afficher la taille de la plus longue ligne\n" +" -w, --words afficher le nombre de mots\n" #: src/who.c:210 msgid " old " msgstr " ancien " -#: src/who.c:449 +#: src/who.c:440 msgid "system boot" msgstr "démarrage système" -#: src/who.c:456 src/who.c:458 +#: src/who.c:447 src/who.c:449 msgid "id=" msgstr "id=" -#: src/who.c:471 src/who.c:476 +#: src/who.c:462 src/who.c:467 msgid "term=" msgstr "term=" -#: src/who.c:473 src/who.c:477 +#: src/who.c:464 src/who.c:468 msgid "exit=" msgstr "sortie=" -#: src/who.c:494 +#: src/who.c:485 msgid "LOGIN" msgstr "IDENTIFIANT" -#: src/who.c:514 +#: src/who.c:505 msgid "clock change" msgstr "changement d'horloge" -#: src/who.c:526 src/who.c:527 +#: src/who.c:517 src/who.c:518 msgid "run-level" msgstr "niveau d'exécution" -#: src/who.c:530 src/who.c:531 +#: src/who.c:521 src/who.c:522 msgid "last=" msgstr "dernier=" -#: src/who.c:562 +#: src/who.c:553 #, c-format msgid "" "\n" "# users=%lu\n" msgstr "" "\n" -"# utilisateurs=%lu\n" +"nombre d'utilisateurs : %lu\n" -#: src/who.c:568 +#: src/who.c:559 msgid "NAME" msgstr "NOM" -#: src/who.c:568 +#: src/who.c:559 msgid "LINE" msgstr "LIGNE" -#: src/who.c:568 +#: src/who.c:559 msgid "TIME" msgstr "HEURE" -#: src/who.c:568 +#: src/who.c:559 msgid "IDLE" msgstr "INACTIF" -#: src/who.c:569 +#: src/who.c:560 msgid "PID" msgstr "PID" -#: src/who.c:569 +#: src/who.c:560 msgid "COMMENT" msgstr "COMMENTAIRE" -#: src/who.c:569 +#: src/who.c:560 msgid "EXIT" msgstr "EXIT" -#: src/who.c:649 +#: src/who.c:640 #, c-format msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n" msgstr "Utilisation : %s [OPTION]... [ FILE | ARG1 ARG2 ]\n" -#: src/who.c:650 +#: src/who.c:641 msgid "Print information about users who are currently logged in.\n" -msgstr "Affiche des informations sur les utilisateurs connectés.\n" +msgstr "Afficher des informations sur les utilisateurs connectés.\n" -#: src/who.c:653 +#: src/who.c:644 msgid "" "\n" " -a, --all same as -b -d --login -p -r -t -T -u\n" @@ -12550,62 +12955,62 @@ msgid "" " -H, --heading print line of column headings\n" msgstr "" "\n" -" -a, --all identique à -b -d --login -p -r -t -T -u\n" -" -b, --boot affiche l'heure du dernier démarrage système\n" -" -d, --dead affiche la liste des processus morts\n" -" -H, --heading affiche les en-têtes de colonne des lignes\n" +" -a, --all identique à -b -d --login -p -r -t -T -u\n" +" -b, --boot afficher l'heure du dernier démarrage système\n" +" -d, --dead afficher la liste des processus morts\n" +" -H, --heading afficher les en-têtes de colonne des lignes\n" -#: src/who.c:660 +#: src/who.c:651 msgid " -l, --login print system login processes\n" -msgstr " -l, --login affiche le processus de login du système\n" +msgstr " -l, --login afficher le processus de connexion du système\n" -#: src/who.c:663 +#: src/who.c:654 msgid "" " --lookup attempt to canonicalize hostnames via DNS\n" " -m only hostname and user associated with stdin\n" " -p, --process print active processes spawned by init\n" msgstr "" -" --lookup utilise la forme canonique des noms d'hôte via DNS\n" -" -m seulement le nom d'hôte et d'utilisateur associé à " -"stdin\n" -" -p, --process affiche la liste des processus lancés par init\n" +" --lookup utiliser la forme canonique des noms d'hôte grâce au " +"DNS\n" +" -m nom d'hôte et d'utilisateur seulement associés à\n" +" l'entrée standard\n" +" -p, --process afficher la liste des processus lancés par init\n" -#: src/who.c:668 +#: src/who.c:659 msgid "" " -q, --count all login names and number of users logged on\n" " -r, --runlevel print current runlevel\n" " -s, --short print only name, line, and time (default)\n" " -t, --time print last system clock change\n" msgstr "" -" -q, --count affiche tous noms de connexion des utilisateurs " +" -q, --count afficher tous noms de connexion des utilisateurs " "connectés\n" -" -r, --runlevel affiche le niveau d'exécution actuel\n" -" -s, --short affiche seulement le nom, la ligne et l'heure (par " -"défaut)\n" -" -t, --time affiche le dernier changement d'heure du système\n" +" -r, --runlevel afficher le niveau d'exécution actuel\n" +" -s, --short n'afficher que le nom, la ligne et l'heure (par défaut)\n" +" -t, --time afficher le dernier changement d'heure du système\n" -#: src/who.c:674 +#: src/who.c:665 msgid "" " -T, -w, --mesg add user's message status as +, - or ?\n" " -u, --users list users logged in\n" " --message same as -T\n" " --writable same as -T\n" msgstr "" -" -T, -w, --mesg ajoute le statut du message de l'utilisateur avec +, - " +" -T, -w, --mesg ajouter l'état du message de l'utilisateur avec +, - " "ou ?\n" -" -u, --users affiche la liste des utilisateurs actifs\n" +" -u, --users afficher la liste des utilisateurs actifs\n" " --message identique à -T\n" -" --writeable identique à -T\n" +" --writable identique à -T\n" -#: src/who.c:682 -#, fuzzy, c-format +#: src/who.c:673 +#, 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" -"Si FILE n'est pas spécifié, utilise %s. %s en tant que FILE est usuel.\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" @@ -12616,14 +13021,14 @@ msgid "" "Same as id -un.\n" "\n" msgstr "" -"Affiche le nom de l'utilisateur associé à l'ID effectif actuel.\n" +"Afficher le nom d'utilisateur associé à l'UID effectif actuel.\n" "Identique à « id -un ».\n" "\n" #: src/whoami.c:91 #, c-format msgid "%s: cannot find name for user ID %lu\n" -msgstr "%s : impossible de trouver le nom de l'utilisateur ayant l'ID %lu\n" +msgstr "%s : impossible de trouver le nom associé à l'UID %lu\n" #: src/yes.c:41 #, c-format @@ -12632,31 +13037,361 @@ msgid "" " or: %s OPTION\n" msgstr "" "Utilisation : %s [STRING]...\n" -" ou : %s OPTION\n" +" ou : %s OPTION\n" #: src/yes.c:47 -#, fuzzy msgid "" "Repeatedly output a line with all specified STRING(s), or 'y'.\n" "\n" msgstr "" -"Affiche à répétition une ligne de caractères avec toutes les chaînes STRING\n" -"spécifiées, ou « y ».\n" +"Afficher à répétition une ligne de caractères avec toutes les chaînes " +"STRING\n" +"indiquées, ou « y ».\n" -#, fuzzy -#~ msgid " gid=%s" -#~ msgstr " gid=%lu" +#~ msgid "using single-precision arithmetic" +#~ msgstr "utilisation d'arithmétique à précision simple" -#, fuzzy -#~ msgid " euid=%s" -#~ msgstr " euid=%lu" +#~ msgid "using arbitrary-precision arithmetic" +#~ msgstr "utilisation d'arithmétique à précision arbitraire" #~ msgid "" -#~ "Usage: %s NAME\n" -#~ " or: %s OPTION\n" +#~ "simple_strtod_human:\n" +#~ " input string: '%s'\n" +#~ " locale decimal-point: '%s'\n" #~ msgstr "" -#~ "Utilisation : %s NAME\n" -#~ " ou : %s OPTION\n" +#~ "simple_strtod_human :\n" +#~ " chaîne d'entrée : « %s »\n" +#~ " séparateur décimal des paramètres régionaux : « %s »\n" + +#~ msgid "" +#~ " parsed numeric value: %Lf\n" +#~ " input precision = %d\n" +#~ msgstr "" +#~ " valeur numérique analysée : %Lf\n" +#~ " précision en entrée = %d\n" + +#~ msgid " Auto-scaling, found 'i', switching to base %d\n" +#~ msgstr "" +#~ " Mise à l'échelle automatique, « i » trouvé, basculement en base %d\n" + +#~ msgid " suffix power=%d^%d = %Lf\n" +#~ msgstr " suffixe de puissance=%d^%d = %Lf\n" + +#~ msgid " returning value: %Lf (%LG)\n" +#~ msgstr " valeur renvoyée : %Lf (%LG)\n" + +#~ msgid "double_to_human:\n" +#~ msgstr "double_to_human :\n" + +#~ msgid " no scaling, returning (grouped) value: %'.*Lf\n" +#~ msgstr " aucune mise à l'échelle, valeur (groupée) renvoyée : %'.*Lf\n" + +#~ msgid " no scaling, returning value: %.*Lf\n" +#~ msgstr " aucune mise à l'échelle, valeur renvoyée : %.*Lf\n" + +#~ msgid " scaled value to %Lf * %0.f ^ %d\n" +#~ msgstr " valeur mise à l'échelle à %Lf * %0.f ^ %d\n" + +#~ msgid " after rounding, value=%Lf * %0.f ^ %d\n" +#~ msgstr " après arrondi, valeur=%Lf * %0.f ^ %d\n" + +#~ msgid " returning value: '%s'\n" +#~ msgstr " valeur renvoyée : « %s »\n" + +#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n" +#~ msgstr "Utilisation : %s [OPTION] [NUMBER]\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=UNIT mettre à l'échelle automatiquement les nombres en " +#~ "entrée\n" +#~ " à « UNIT ». « none » par défaut. Consultez UNIT plus " +#~ "bas.\n" +#~ " --from-unit=N la taille d'unité en entrée (au lieu de 1 par défaut).\n" +#~ " --to=UNIT mettre à l'échelle automatiquement les nombres en " +#~ "sortie\n" +#~ " à « UNIT ». Consultez UNIT plus bas.\n" +#~ " --to-unit=N la taille d'unité en sortie (au lieu de 1 par défaut).\n" +#~ " --round=METHOD la méthode d'arrondi à utiliser lors de la mise à " +#~ "l'échelle.\n" +#~ " METHOD peut être : « up », « down », « from-" +#~ "zero » (par\n" +#~ " défaut), « towards-zero » ou « nearest ».\n" +#~ " --suffix=SUFFIX ajouter le SUFFIX aux nombres en sortie, et accepter " +#~ "le\n" +#~ " SUFFIX facultatif aux nombres en entrée.\n" +#~ " --padding=N remplir la sortie avec N caractères.\n" +#~ " N positif alignera à droite. N négatif alignera à " +#~ "gauche.\n" +#~ " Remarque : si la sortie est plus grande que N, le\n" +#~ " remplissage est ignoré. Le remplissage est " +#~ "automatique par\n" +#~ " défaut si un blanc est trouvé.\n" +#~ " --grouping grouper les chiffres ensemble (par exemple 1 000 000).\n" +#~ " Cela utilise le groupement défini dans les " +#~ "paramètres\n" +#~ " régionaux (donc sans effet avec les locales C/" +#~ "POSIX).\n" +#~ " --header[=N] afficher (sans conversion) les N premières lignes d'en-" +#~ "tête.\n" +#~ " N vaut 1 par défaut si non indiqué.\n" +#~ " --field N remplacer le nombre dans le champs d'entrée N (1 par " +#~ "défaut).\n" +#~ " -d, --delimiter=X utiliser X au lieu d'un blanc comme délimiteur de " +#~ "champ.\n" +#~ " --format=FORMAT utiliser le le type printf de virgule flottante " +#~ "FORMAT.\n" +#~ " Consultez FORMAT plus bas pour des précisions.\n" +#~ " --invalid=MODE mode d'échec pour les nombres incorrects. MODE peut " +#~ "être :\n" +#~ " « abort » (par défaut), « fail », « warn » ou " +#~ "« ignore ».\n" +#~ " --debug afficher les avertissements sur l'entrée incorrecte.\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" +#~ "Options UNIT :\n" +#~ " none Aucune mise à l'échelle automatique n'est effectuée.\n" +#~ " Les suffixes déclencheront une erreur.\n" +#~ " auto Accepter un suffixe facultatif d'une ou deux lettres :\n" +#~ " 1K = 1000\n" +#~ " 1Ki = 1024\n" +#~ " 1M = 1000000\n" +#~ " 1Mi = 1048576\n" +#~ " ...\n" +#~ " si Accepter un suffixe facultatif d'une lettre :\n" +#~ " 1K = 1000\n" +#~ " 1M = 1000000\n" +#~ " ...\n" +#~ " iec Accepter un suffixe facultatif d'une lettre :\n" +#~ " 1K = 1024\n" +#~ " 1M = 1048576\n" +#~ " ...\n" +#~ " iec-i Accepter un suffixe facultatif de deux lettres :\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 "" +#~ "Chaîne de format :\n" +#~ " entrée : %s\n" +#~ " groupement : %s\n" +#~ " largeur de remplissage : %ld\n" +#~ " alignement : %s\n" +#~ " préfixe : « %s »\n" +#~ " suffixe : « %s »\n" + +#~ msgid "" +#~ "formatting output:\n" +#~ " value: %Lf\n" +#~ " humanized: '%s'\n" +#~ msgstr "" +#~ "formatage de la sortie :\n" +#~ " valeur : %Lf\n" +#~ " lisible : « %s »\n" + +#~ msgid " After padding: '%s'\n" +#~ msgstr " Après remplissage : « %s »\n" + +#~ msgid "trimming suffix '%s'\n" +#~ msgstr "coupe du suffixe « %s »\n" + +#~ msgid "no valid suffix found\n" +#~ msgstr "aucun suffixe correct n'a été trouvé\n" + +#~ msgid "setting Auto-Padding to %ld characters\n" +#~ msgstr "réglage du remplissage automatique à %ld caractères\n" + +#~ msgid "" +#~ "extracting Fields:\n" +#~ " input: '%s'\n" +#~ " field: %d\n" +#~ msgstr "" +#~ "Champs d'extraction :\n" +#~ " entrée : « %s »\n" +#~ " champ : %d\n" + +#~ msgid "" +#~ " TOO FEW FIELDS!\n" +#~ " prefix: '%s'\n" +#~ msgstr "" +#~ " Pas suffisamment de champs\n" +#~ " préfixe : « %s »\n" + +#~ msgid "" +#~ " prefix: '%s'\n" +#~ " number: '%s'\n" +#~ " suffix: '%s'\n" +#~ msgstr "" +#~ " préfixe : « %s »\n" +#~ " nombre : « %s »\n" +#~ " suffixe : « %s »\n" + +#~ msgid "reading %s" +#~ msgstr "lecture de %s" + +#~ msgid "writing %s" +#~ msgstr "écriture de %s" + +#~ msgid "closing %s" +#~ msgstr "fermeture de %s" + +#~ msgid "accessing %s" +#~ msgstr "accès à %s" + +#~ msgid "opening %s" +#~ msgstr "ouverture 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" +#~ msgstr "" +#~ " -x, --one-file-system ignorer les répertoires de différents systèmes " +#~ "de\n" +#~ " fichiers\n" +#~ " -X, --exclude-from=FILE exclure les fichiers correspondant à un des " +#~ "motifs\n" +#~ " de FILE\n" +#~ " --exclude=PATTERN exclure les fichiers correspondant à PATTERN\n" +#~ " --max-depth=N afficher le total pour un répertoire (ou un " +#~ "fichier,\n" +#~ " avec --all) seulement s'il est à N niveaux " +#~ "ou moins\n" +#~ " selon les arguments de la ligne de " +#~ "commande ;\n" +#~ " --max-depth=0 est identique à --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 ne jamais archiver (même si --backup est utilisé)\n" +#~ " numbered, t effectuer des archives numérotées\n" +#~ " existing, nil numéroter si des archives numérotées existent déjà, se\n" +#~ " comporter comme « simple » dans le cas contraire\n" +#~ " simple, never toujours effectuer des archives simples\n" +#~ "\n" + +#~ msgid "" +#~ "WARNING: --page-increment is deprecated; use --line-increment instead" +#~ msgstr "" +#~ "Attention : --page-increment est déconseillée, utilisez plutôt --line-" +#~ "increment" + +#~ msgid "All arguments to long options are mandatory for short options.\n" +#~ msgstr "" +#~ "Tous les arguments obligatoires pour les options longues le sont aussi " +#~ "pour\n" +#~ "les options courtes.\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 est d pour décimal, o pour octal, x pour hexadécimal ou n pour " +#~ "aucun.\n" +#~ "BYTES est hexadécimal préfixé par 0x ou 0X, et 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" +#~ "L'ajout du suffixe « z » à l'un de ces types affiche des caractères " +#~ "imprimables\n" +#~ "à la fin de chaque ligne de résultat.\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 "" +#~ "L'option --string sans nombre implique 3, l'option --width sans nombre\n" +#~ "implique 32. Par défaut, od utilise -A o -t oS -w16.\n" + +#~ msgid "Usage: %s [OPTION]... FILE\n" +#~ msgstr "Utilisation : %s [OPTION]... FILE\n" #~ msgid "" #~ "\n" @@ -12669,10 +13404,6 @@ msgstr "" #~ " %s /usr/bin/sort Résultat « sort ».\n" #~ " %s include/stdio.h .h Résultat « stdio ».\n" -#, fuzzy -#~ msgid "Usage: %s [OPTION] FILE...\n" -#~ msgstr "Utilisation : %s [OPTION]... FILE...\n" - #~ msgid "" #~ "Change the group of each FILE to GROUP.\n" #~ "With --reference, change the group of each FILE to that of RFILE.\n" @@ -12787,25 +13518,90 @@ msgstr "" #~ "traité\n" #~ "\n" -#, fuzzy -#~ msgid "Usage: %s [OPTION]... PATH START\n" -#~ msgstr "Utilisation : %s [OPTION]... SET1 [SET2]\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 "" +#~ "Affiche la date actuelle selon le FORMAT spécifié ou initialise la date " +#~ "système.\n" +#~ "\n" +#~ " -d, --date=STRING affiche la date selon le format STRING, sans " +#~ "« now »\n" +#~ " -f, --file=DATEFILE identique à --date pour chaque ligne de " +#~ "DATEFILE\n" + +#~ msgid "" +#~ "Usage: %s NAME\n" +#~ " or: %s OPTION\n" +#~ msgstr "" +#~ "Utilisation : %s NAME\n" +#~ " ou : %s OPTION\n" + +#~ msgid "Password:" +#~ msgstr "Mot de passe :" + +#~ msgid "getpass: cannot open /dev/tty" +#~ msgstr "getpass() : impossible d'ouvrir /dev/tty" + +#~ msgid "cannot set groups" +#~ msgstr "impossible d'initialiser les groupes" + +#~ msgid "cannot set group id" +#~ msgstr "impossible d'initialiser l'ID du groupe" + +#~ msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" +#~ msgstr "Utilisation : %s [OPTION]... [-] [USER [ARG]...]\n" -#, fuzzy #~ msgid "" -#~ " -n, --no-newline do not output the trailing " -#~ "newline\n" -#~ " " +#~ "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 "" +#~ "Modifie l'ID effectif de l'utilisateur et l'ID du groupe à celui de " +#~ "USER.\n" +#~ "\n" +#~ " -, -l, --login établit ce shell comme celui de la session " +#~ "de travail\n" +#~ " -c, --command=COMMANDE passe une seule COMMANDE au shell avec -c\n" +#~ " -f, --fast passe -f au shell (valable pour csh ou " +#~ "tcsh)\n" +#~ " -m, --preserve-environment ne réinitialise oas les variables " +#~ "d'environnement\n" +#~ " -p identique à -m\n" +#~ " -s, --shell=SHELL lance le SHELL si /etc/shells le permet\n" + +#~ msgid "" +#~ "\n" +#~ "A mere - implies -l. If USER not given, assume root.\n" #~ msgstr "" -#~ "Duplique les chaînes STRING sur la sortie standard.\n" #~ "\n" -#~ " -n n'affiche pas de nouvelle de ligne de terminaison\n" +#~ "Un tiret - implique -l. Si l'argument USER n'est pas fourni, utilise " +#~ "« root »\n" + +#~ msgid "user %s does not exist" +#~ msgstr "l'utilisateur %s n'existe pas" + +#~ msgid "incorrect password" +#~ msgstr "mot de passe incorrect" + +#~ msgid "using restricted shell %s" +#~ msgstr "utilisation du shell %s restreint" + +#~ msgid "warning: cannot change directory to %s" +#~ msgstr "avertissement : impossible d'aller dans le répertoire %s" -#, fuzzy #~ msgid "" #~ "\n" -#~ "SIZE is an integer with an optional suffix (example: 10MB). Suffixes " -#~ "are:\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 "" @@ -12815,17 +13611,3 @@ msgstr "" #~ "suivantes : kB 1000, K 1024, MB 1000*1000, M 1024*1024 et ainsi de suite " #~ "pour\n" #~ "G, T, P, E, Z et 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 "" -#~ "Affiche la date actuelle selon le FORMAT spécifié ou initialise la date " -#~ "système.\n" -#~ "\n" -#~ " -d, --date=STRING affiche la date selon le format STRING, sans " -#~ "« now »\n" -#~ " -f, --file=DATEFILE identique à --date pour chaque ligne de " -#~ "DATEFILE\n" diff --git a/po/ga.gmo b/po/ga.gmo index 4d15db1c..2d98a385 100644 Binary files a/po/ga.gmo and b/po/ga.gmo differ diff --git a/po/ga.po b/po/ga.po index 0712bdb2..3001f3ba 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: 2012-05-10 19:35+0200\n" +"POT-Creation-Date: 2013-02-14 15:56+0000\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,19 +36,19 @@ msgstr "Na hargóintí bailí:" msgid "error closing file" msgstr "earráid agus comhad á dhúnadh" -#: lib/closeout.c:112 src/base64.c:109 src/base64.c:121 src/base64.c:127 -#: src/base64.c:168 src/base64.c:224 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:330 src/expand.c:355 src/head.c:298 -#: src/head.c:348 src/head.c:756 src/head.c:797 src/mktemp.c:350 src/od.c:919 -#: src/paste.c:160 src/shuf.c:369 src/split.c:727 src/split.c:964 -#: src/split.c:969 src/tail.c:350 src/tail.c:1201 src/tail.c:1307 +#: 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 -#: src/unexpand.c:427 src/unexpand.c:443 +#: 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:1160 src/copy.c:2602 +#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617 #, c-format msgid "preserving permissions for %s" msgstr "ceadanna ar %s á gcaomhnú" @@ -242,18 +242,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:483 +#: lib/mkdir-p.c:196 src/install.c:484 #, 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:2261 src/install.c:709 src/install.c:722 +#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722 #, 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:915 src/tac.c:435 +#: src/split.c:929 src/tac.c:434 #, c-format msgid "memory exhausted" msgstr "cuimhne ídithe" @@ -302,75 +302,75 @@ msgstr "'" msgid "%s: end of file" msgstr "%s: comhadchríoch" -#: lib/regcomp.c:130 +#: lib/regcomp.c:131 msgid "Success" msgstr "D'éirigh leis" -#: lib/regcomp.c:133 +#: lib/regcomp.c:134 msgid "No match" msgstr "Níl a leithéid ann" -#: lib/regcomp.c:136 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "Slonn ionadaíochta neamhbhailí" -#: lib/regcomp.c:139 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "Carachtar neamhbhailí comhordaithe" -#: lib/regcomp.c:142 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "Ainm neamhbhailí ar aicme charachtar" -#: lib/regcomp.c:145 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "Cúlslais chun deiridh" -#: lib/regcomp.c:148 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "Cúltagairt neamhbhailí" -#: lib/regcomp.c:151 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "[ nó [^ corr" -#: lib/regcomp.c:154 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "( nó \\( corr" -#: lib/regcomp.c:157 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "\\{ corr" -#: lib/regcomp.c:160 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "Ábhar neamhbhailí idir \\{ agus \\}" -#: lib/regcomp.c:163 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "Tá deireadh an raoin neamhbhailí" -#: lib/regcomp.c:166 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Cuimhne ídithe" -#: lib/regcomp.c:169 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "Slonn ionadaíochta neamhbhailí roimhe seo" -#: lib/regcomp.c:172 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "Deireadh an tsloinn gan choinne" -#: lib/regcomp.c:175 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "Slonn ionadaíochta rómhor" -#: lib/regcomp.c:178 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr ") nó \\) corr" -#: lib/regcomp.c:703 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "Ní raibh slonn ionadaíochta roimhe seo" @@ -412,7 +412,7 @@ msgstr "^[yYiIsS]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-mode-acl.c:695 src/copy.c:2284 src/cp.c:518 +#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516 #, c-format msgid "setting permissions for %s" msgstr "ceadanna ar %s á socrú" @@ -559,13 +559,13 @@ msgstr "theip ar oscailt" msgid "Resource lost" msgstr "" -#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262 -#: lib/spawn-pipe.c:265 +#: 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:232 lib/spawn-pipe.c:346 lib/wait-process.c:282 +#: 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" @@ -581,24 +581,24 @@ msgstr "tréimhse neamhbhailí %s" msgid "Unknown signal %d" msgstr "" -#: lib/unicodeio.c:103 +#: lib/unicodeio.c:102 msgid "iconv function not usable" msgstr "ní féidir an fheidhm iconv a úsáid" -#: lib/unicodeio.c:105 +#: lib/unicodeio.c:104 msgid "iconv function not available" msgstr "níl an fheidhm iconv ar fáil" -#: lib/unicodeio.c:112 +#: lib/unicodeio.c:111 msgid "character out of range" msgstr "carachtar as raon" -#: lib/unicodeio.c:182 +#: lib/unicodeio.c:181 #, c-format msgid "cannot convert U+%04X to local character set" msgstr "ní féidir U+%04X a thiontú chuig an fhoireann carachtar logánta" -#: lib/unicodeio.c:184 +#: lib/unicodeio.c:183 #, c-format msgid "cannot convert U+%04X to local character set: %s" msgstr "ní féidir U+%04X a thiontú chuig an fhoireann carachtar logánta: %s" @@ -782,7 +782,7 @@ msgstr "" "\n" "Seol tuairiscí fabhtanna chuig <%s>.\n" -#: lib/version-etc.c:251 src/system.h:562 +#: lib/version-etc.c:251 src/system.h:573 #, c-format msgid "%s home page: <%s>\n" msgstr "" @@ -792,7 +792,7 @@ msgstr "" msgid "%s home page: <http://www.gnu.org/software/%s/>\n" msgstr "" -#: lib/version-etc.c:256 src/system.h:563 +#: lib/version-etc.c:256 src/system.h:574 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" @@ -883,14 +883,13 @@ msgstr "Simon Josefsson" msgid "" "Usage: %s [OPTION]... [FILE]\n" "Base64 encode or decode FILE, or standard input, to standard output.\n" -"\n" msgstr "" "Úsáid: %s [ROGHA] [COMHAD]\n" "Ionchódaigh nó díchódaigh COMHAD, nó an gnáth-ionchur,\n" "le bunuimhir 64, go dtí an gnáth-aschur.\n" "\n" -#: src/base64.c:64 +#: src/base64.c:67 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -900,7 +899,7 @@ msgid "" "\n" msgstr "" -#: src/base64.c:73 src/cat.c:110 src/fmt.c:293 src/shuf.c:71 src/sum.c:70 +#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -908,7 +907,7 @@ msgstr "" "\n" "Mura bhfuil COMHAD ann, nó más '-' é, léigh ón gnáth-ionchur.\n" -#: src/base64.c:76 +#: src/base64.c:79 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -924,37 +923,37 @@ msgstr "" "iarracht a dhéanamh teacht slán ó charachtair neamhaibítreacha eile sa\n" "sruth ionchódaithe.\n" -#: src/base64.c:171 src/base64.c:208 src/csplit.c:263 src/csplit.c:1435 -#: src/join.c:451 src/shuf.c:157 src/shuf.c:361 src/tac-pipe.c:74 +#: 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 #, c-format msgid "read error" msgstr "earráid sa léamh" -#: src/base64.c:227 +#: src/base64.c:230 #, c-format msgid "invalid input" msgstr "ionchur neamhbhailí" -#: src/base64.c:264 +#: src/base64.c:267 #, c-format msgid "invalid wrap size: %s" msgstr "méid neamhbhailí timfhillte: %s" -#: src/base64.c:283 src/basename.c:173 src/comm.c:435 src/cp.c:607 -#: src/date.c:441 src/dircolors.c:447 src/du.c:894 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:169 src/install.c:929 src/join.c:961 -#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:157 src/mv.c:447 -#: src/od.c:1802 src/ptx.c:2081 src/readlink.c:154 src/seq.c:408 -#: src/shuf.c:320 src/shuf.c:339 src/sort.c:4477 src/split.c:1313 -#: src/tr.c:1797 src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:454 -#: src/uniq.c:471 src/unlink.c:81 src/uptime.c:250 src/users.c:146 -#: src/wc.c:666 src/who.c:836 src/whoami.c:79 +#: 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 #, c-format msgid "extra operand %s" msgstr "oibreann breise %s" -#: src/base64.c:315 src/cat.c:781 +#: src/base64.c:318 src/cat.c:781 #, c-format msgid "closing standard input" msgstr "gnáth-ionchur á dhúnadh" @@ -962,15 +961,15 @@ 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/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:53 src/env.c:33 +#: 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/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:65 src/su.c:88 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 +#: 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 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -984,23 +983,23 @@ msgstr "" " nó: %s ROGHA\n" #: src/basename.c:53 +#, fuzzy msgid "" "Print NAME with any leading directory components removed.\n" "If specified, also remove a trailing SUFFIX.\n" -"\n" msgstr "" "Taispeáin an tAINM agus bain amach ainmneacha comhadlainne ar tosach.\n" "Má tá IARMHÍR ann, bain é amach fosta.\n" "\n" -#: src/basename.c:59 +#: 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" msgstr "" -#: src/basename.c:66 +#: src/basename.c:67 #, c-format msgid "" "\n" @@ -1012,20 +1011,21 @@ msgid "" msgstr "" # plural above under cp.c -KPS -#: src/basename.c:167 src/chcon.c:531 src/chgrp.c:277 src/chmod.c:526 -#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1369 +#: 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:183 src/mkfifo.c:108 src/mknod.c:146 src/nohup.c:111 -#: src/pathchk.c:148 src/printf.c:674 src/readlink.c:146 src/realpath.c:236 -#: src/rm.c:314 src/rmdir.c:223 src/seq.c:402 src/setuidgid.c:137 -#: src/sleep.c:119 src/stat.c:1476 src/stdbuf.c:346 src/tr.c:1782 +#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 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 #, 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:52 src/split.c:49 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/split.c:49 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" @@ -1035,8 +1035,8 @@ msgstr "Torbjorn Granlund" msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:846 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4720 src/nl.c:182 src/paste.c:435 src/pr.c:2768 src/sum.c:58 +#: 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/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 +1093,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:2209 src/sort.c:379 src/tee.c:165 src/yes.c:86 +#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86 #, c-format msgid "standard output" msgstr "gnáth-aschur" @@ -1110,14 +1110,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:55 src/head.c:46 src/hostid.c:33 +#: 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 msgid "Jim Meyering" msgstr "Jim Meyering" -#: src/chcon.c:100 src/runcon.c:203 src/runcon.c:234 +#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238 #, c-format msgid "failed to create security context: %s" msgstr "theip ar chomhthéacs slándála a chruthú: %s" @@ -1127,8 +1127,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:540 src/copy.c:2222 src/runcon.c:217 -#: src/stat.c:683 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221 +#: src/stat.c:702 #, 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" @@ -1145,12 +1145,12 @@ 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:446 src/ls.c:2981 +#: src/du.c:457 src/ls.c:2981 #, 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:426 +#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437 #, c-format msgid "cannot read directory %s" msgstr "ní féidir comhadlann %s a léamh" @@ -1160,13 +1160,13 @@ 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:599 +#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562 #, 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:618 -#: src/remove.c:613 +#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642 +#: src/remove.c:576 #, fuzzy, c-format msgid "fts_close failed" msgstr "theip ar dhúnadh" @@ -1189,7 +1189,6 @@ msgid "" "Change the security context of each FILE to CONTEXT.\n" "With --reference, change the security context 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 " @@ -1200,7 +1199,7 @@ msgstr "" " -h, --no-dereference téigh i bhfeidhm ar naisc shiombalacha in ionad an\n" " chomhaid tagartha\n" -#: src/chcon.c:362 src/chgrp.c:123 src/chown.c:94 +#: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94 msgid "" " --dereference affect the referent of each symbolic link (this is\n" " the default), rather than the symbolic link itself\n" @@ -1208,7 +1207,7 @@ msgid "" "file\n" msgstr "" -#: src/chcon.c:367 +#: src/chcon.c:369 #, fuzzy msgid "" " -u, --user=USER set user USER in the target security context\n" @@ -1222,7 +1221,16 @@ msgstr "" " -l, --range=RAON socraigh RAON sa chomhthéacs sprice slándála\n" "\n" -#: src/chcon.c:373 +#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110 +#, fuzzy +msgid "" +" --no-preserve-root do not treat '/' specially (the default)\n" +" --preserve-root fail to operate recursively on '/'\n" +msgstr "" +" --no-preserve-root ná caith le `/' go speisialta (réamhshocrú)\n" +" --preserve-root ná hoibrigh ar `/' go hathchúrsach\n" + +#: src/chcon.c:379 #, fuzzy msgid "" " --reference=RFILE use RFILE's security context rather than " @@ -1235,15 +1243,15 @@ msgstr "" " -R, --recursive oibrigh ar chomhaid/chomhadlanna go hathchúrsach\n" " -v, --verbose taispeáin diagnóisic do gach comhad próiseáilte\n" -#: src/chcon.c:377 src/chgrp.c:140 src/chown.c:118 +#: 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:380 +#: src/chcon.c:386 msgid " -v, --verbose output a diagnostic for every file processed\n" msgstr "" -#: src/chcon.c:383 src/chgrp.c:143 src/chown.c:121 +#: src/chcon.c:389 src/chgrp.c:143 src/chown.c:121 #, fuzzy msgid "" "\n" @@ -1270,36 +1278,36 @@ msgstr "" " -P ná lean aon nasc siombalach (réamhshocrú)\n" "\n" -#: src/chcon.c:512 src/chgrp.c:264 src/chown.c:267 +#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267 #, 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:518 +#: src/chcon.c:524 #, c-format msgid "-R -h requires -P" msgstr "tá gá le -P leis na roghanna -R -h" -#: src/chcon.c:533 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282 -#: src/comm.c:429 src/csplit.c:1371 src/join.c:1149 src/link.c:79 -#: src/mknod.c:148 src/setuidgid.c:139 src/tr.c:1785 +#: 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 #, c-format msgid "missing operand after %s" msgstr "oibreann ar iarraidh i ndiaidh %s" -#: src/chcon.c:556 src/runcon.c:247 +#: src/chcon.c:562 src/runcon.c:251 #, c-format msgid "invalid context: %s" msgstr "comhthéacs neamhbhailí: %s" -#: src/chcon.c:563 +#: src/chcon.c:569 #, c-format msgid "conflicting security context specifiers given" msgstr "sonraitheoirí contrártha um chomhthéacs slándála" -#: src/chcon.c:572 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:433 src/cp.c:493 -#: src/mv.c:96 src/pwd.c:273 src/rm.c:324 src/touch.c:351 +#: 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 #, c-format msgid "failed to get attributes of %s" msgstr "níorbh fhéidir na saintréithe de %s a rochtain" @@ -1351,15 +1359,6 @@ msgstr "" " comhad tagartha ar bith (le fáil más féidir le do\n" " chóras an t-úinéir de nasc siombalach a athrú)\n" -#: src/chgrp.c:132 src/chmod.c:387 src/chown.c:110 -#, fuzzy -msgid "" -" --no-preserve-root do not treat '/' specially (the default)\n" -" --preserve-root fail to operate recursively on '/'\n" -msgstr "" -" --no-preserve-root ná caith le `/' go speisialta (réamhshocrú)\n" -" --preserve-root ná hoibrigh ar `/' go hathchúrsach\n" - #: src/chgrp.c:136 msgid "" " --reference=RFILE use RFILE's group rather than specifying a\n" @@ -1448,8 +1447,14 @@ msgstr "" " chomhaid tagartha\n" #: src/chmod.c:391 +#, fuzzy 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 msgid " -R, --recursive change files and directories recursively\n" @@ -1624,7 +1629,7 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:97 src/install.c:575 src/setuidgid.c:110 src/setuidgid.c:120 +#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120 #, c-format msgid "invalid group %s" msgstr "grúpa neamhbhailí %s" @@ -1692,8 +1697,8 @@ msgstr "theip ar ról nua %s a shocrú" 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:213 src/stdbuf.c:366 -#: src/timeout.c:402 +#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365 +#: src/timeout.c:454 #, fuzzy, c-format msgid "failed to run command %s" msgstr "ní féidir ordú %s a rith" @@ -1811,20 +1816,24 @@ msgstr "sonraíodh roghanna -i iomadúla" msgid "empty %s not allowed" msgstr "" -#: src/copy.c:168 src/dd.c:1609 src/dd.c:1976 +#: 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 #, c-format -msgid "reading %s" -msgstr "%s á léamh" +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:426 +#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425 #, c-format msgid "cannot lseek %s" msgstr "ní féidir %s a `lseek'" -#: src/copy.c:206 src/dd.c:2039 src/dd.c:2102 +#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151 #, c-format -msgid "writing %s" -msgstr "%s á scríobh" +msgid "error writing %s" +msgstr "earráid agus %s á scríobh" #: src/copy.c:313 #, fuzzy, c-format @@ -1846,7 +1855,7 @@ msgstr "Ní féidir %s a oscailt" msgid "clearing permissions for %s" msgstr "ceadanna ar %s á nglanadh" -#: src/copy.c:697 src/copy.c:2470 src/cp.c:331 +#: src/copy.c:697 src/copy.c:2480 src/cp.c:329 #, c-format msgid "failed to preserve ownership for %s" msgstr "níorbh fhéidir an úinéireacht de %s a chaomhnú" @@ -1861,14 +1870,14 @@ msgstr "theip ar luchtú an chomhaid %s" 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:638 src/du.c:901 src/fmt.c:449 src/head.c:847 -#: src/sort.c:4489 src/split.c:1329 src/tail.c:1756 src/wc.c:678 +#: 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 "ní féidir %s a oscailt chun léamh" -#: src/copy.c:810 src/copy.c:972 src/dd.c:1546 src/dd.c:2114 src/dd.c:2252 -#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:141 +#: 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 #, c-format msgid "cannot fstat %s" msgstr "ní féidir %s a `fstat'" @@ -1888,14 +1897,14 @@ msgstr "níorbh fhéidir comhthéacs chruthú an chórais comhad a fháil" 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:1574 src/copy.c:1777 src/copy.c:1935 src/ln.c:314 -#: src/remove.c:267 src/remove.c:293 src/remove.c:444 src/remove.c:465 +#: 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 #, c-format msgid "cannot remove %s" msgstr "ní féidir %s a scriosadh" -#: src/copy.c:886 src/copy.c:1578 src/copy.c:1772 src/copy.c:1940 -#: src/remove.c:418 +#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945 +#: src/remove.c:375 #, c-format msgid "removed %s\n" msgstr "%s scriosta\n" @@ -1913,196 +1922,196 @@ msgstr "ní féidir gnáthchomhad %s a chruthú" #: src/copy.c:985 #, fuzzy, c-format msgid "failed to clone %s from %s" -msgstr "Ní féidir %s a oscailt" +msgstr "theip ar dhúnadh comhadlann %s" -#: src/copy.c:1098 src/copy.c:2531 +#: src/copy.c:1098 src/copy.c:2541 #, c-format msgid "preserving times for %s" msgstr "amanna á gcaomhnú le haghaidh %s" -#: src/copy.c:1170 src/copy.c:1176 src/head.c:855 src/touch.c:175 -#: src/truncate.c:413 -#, c-format -msgid "closing %s" -msgstr "%s á dhúnadh" +#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 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:1466 +#: src/copy.c:1471 #, c-format msgid "%s: try to overwrite %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:1473 +#: src/copy.c:1478 #, c-format msgid "%s: overwrite %s? " msgstr "%s: forscríobh %s? " -#: src/copy.c:1542 +#: src/copy.c:1547 #, c-format msgid " (backup: %s)" msgstr " (cúltaca: %s)" -#: src/copy.c:1552 +#: src/copy.c:1557 #, 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:1584 +#: src/copy.c:1589 #, 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:1637 src/copy.c:1689 src/copy.c:2272 src/copy.c:2589 +#: 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:1220 src/truncate.c:365 +#: src/stat.c:1239 src/truncate.c:363 #, c-format msgid "cannot stat %s" msgstr "ní féidir %s a `stat'" -#: src/copy.c:1645 +#: src/copy.c:1650 #, c-format msgid "omitting directory %s" msgstr "comhadlann %s á fágáil ar lár" -#: src/copy.c:1659 +#: src/copy.c:1664 #, 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:1707 src/ln.c:246 +#: src/copy.c:1712 src/ln.c:246 #, c-format msgid "%s and %s are the same file" msgstr "is iad %s agus %s an comhad céanna" -#: src/copy.c:1806 +#: src/copy.c:1811 #, 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:1824 src/ln.c:214 +#: src/copy.c:1829 src/ln.c:214 #, 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:1842 +#: src/copy.c:1847 #, 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:1856 +#: src/copy.c:1861 #, 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:1886 +#: src/copy.c:1891 #, 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:1887 +#: src/copy.c:1892 #, 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:1910 src/ln.c:276 +#: src/copy.c:1915 src/ln.c:276 #, c-format msgid "cannot backup %s" msgstr "ní féidir cúltaca a dhéanamh ar %s" -#: src/copy.c:1974 +#: src/copy.c:1979 #, 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:2051 +#: src/copy.c:2056 #, 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:2068 +#: src/copy.c:2073 #, 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:2118 +#: src/copy.c:2123 #, 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:2161 +#: src/copy.c:2166 #, c-format msgid "cannot move %s to %s" msgstr "ní féidir %s a aistriú go %s" -#: src/copy.c:2173 +#: src/copy.c:2178 #, 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:2207 src/install.c:905 src/mkdir.c:189 src/mkfifo.c:114 -#: src/mknod.c:167 +#: 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:2241 +#: src/copy.c:2246 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "ní féidir nasc siombalach ciorclach %s a chóipeáil" -#: src/copy.c:2350 +#: src/copy.c:2355 #, 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:2357 +#: src/copy.c:2362 #, 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:2406 src/mkfifo.c:133 +#: src/copy.c:2416 src/mkfifo.c:132 #, c-format msgid "cannot create fifo %s" msgstr "ní féidir an `fifo' %s a chruthú" -#: src/copy.c:2415 +#: src/copy.c:2425 #, c-format msgid "cannot create special file %s" msgstr "ní féidir comhad speisialta %s a chruthú" -#: src/copy.c:2426 src/ls.c:3191 src/stat.c:902 +#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921 #, c-format msgid "cannot read symbolic link %s" msgstr "ní féidir nasc siombalach %s a léamh" -#: src/copy.c:2453 +#: src/copy.c:2463 #, c-format msgid "cannot create symbolic link %s" msgstr "ní féidir an nasc siombalach %s a chruthú" -#: src/copy.c:2485 +#: src/copy.c:2495 #, c-format msgid "%s has unknown file type" msgstr "tá %s de chineál anaithnid" # bad coinage --KPS -#: src/copy.c:2629 src/ln.c:358 +#: src/copy.c:2644 src/ln.c:358 #, c-format msgid "cannot un-backup %s" msgstr "ní féidir dí-chúltaca a dhéanamh ar %s" -#: src/copy.c:2633 +#: src/copy.c:2648 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (dí-chúltaca)\n" -#: src/cp.c:156 src/mv.c:284 +#: src/cp.c:156 src/mv.c:286 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -2114,27 +2123,13 @@ msgstr "" " nó: %s [ROGHA]... -t COMHADLANN FOINSE...\n" #: src/cp.c:162 -msgid "" -"Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" -"\n" +#, 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:166 src/csplit.c:1458 src/cut.c:197 src/df.c:852 src/du.c:268 -#: src/expand.c:112 src/fmt.c:275 src/fold.c:75 src/head.c:115 -#: src/install.c:612 src/kill.c:86 src/ln.c:392 src/ls.c:4726 src/mkdir.c:61 -#: src/mkfifo.c:56 src/mknod.c:58 src/mv.c:294 src/nl.c:191 src/paste.c:445 -#: src/pr.c:2777 src/ptx.c:1825 src/shred.c:153 src/shuf.c:58 src/sort.c:399 -#: src/split.c:211 src/stdbuf.c:95 src/tac.c:142 src/tail.c:268 -#: src/touch.c:226 src/truncate.c:107 src/unexpand.c:122 src/uniq.c:145 -msgid "" -"Mandatory arguments to long options are mandatory for short options too.\n" -msgstr "" -"Is riachtanach le rogha ghearr aon argóint atá riachtanach leis an rogha " -"fhada.\n" - -#: src/cp.c:169 +#: src/cp.c:168 #, fuzzy msgid "" " -a, --archive same as -dR --preserve=all\n" @@ -2155,13 +2150,14 @@ msgstr "" " más athchúrsach é\n" " -d == `--no-dereference --preserve=links'\n" -#: src/cp.c:178 +#: src/cp.c:177 #, fuzzy msgid "" " -f, --force if an existing destination file cannot be\n" -" opened, remove it and try again (redundant " -"if\n" -" the -n option is used)\n" +" opened, remove it and try again (this " +"option\n" +" is ignored when the -n option is also " +"used)\n" " -i, --interactive prompt before overwrite (overrides a previous " "-n\n" " option)\n" @@ -2173,7 +2169,7 @@ msgstr "" " -H lean naisc shiombalacha ar líne na n-" "orduithe\n" -#: src/cp.c:188 +#: src/cp.c:186 #, fuzzy msgid "" " -l, --link hard link files instead of copying\n" @@ -2182,7 +2178,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:192 +#: src/cp.c:190 #, fuzzy msgid "" " -n, --no-clobber do not overwrite an existing file (overrides\n" @@ -2195,7 +2191,7 @@ msgstr "" " -H lean naisc shiombalacha ar líne na n-" "orduithe\n" -#: src/cp.c:197 +#: src/cp.c:195 #, fuzzy msgid "" " -p same as --preserve=mode,ownership,timestamps\n" @@ -2210,7 +2206,7 @@ msgstr "" " mode,ownership,timestamps), más féidir\n" " tréithe eile: context, links, all\n" -#: src/cp.c:205 +#: src/cp.c:203 msgid "" " --no-preserve=ATTR_LIST don't preserve the specified attributes\n" " --parents use full source file name under DIRECTORY\n" @@ -2218,7 +2214,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:209 +#: src/cp.c:207 #, fuzzy msgid "" " -R, -r, --recursive copy directories recursively\n" @@ -2231,7 +2227,7 @@ msgstr "" " --remove-destination scrios gach sprioc-chomhad atá ann roimh\n" " oscailt (i gcodarsnacht le `--force')\n" -#: src/cp.c:215 +#: src/cp.c:213 #, fuzzy msgid "" " --sparse=WHEN control creation of sparse files. See below\n" @@ -2244,7 +2240,7 @@ msgstr "" "argóint\n" " FOINSE\n" -#: src/cp.c:220 +#: src/cp.c:218 msgid "" " -s, --symbolic-link make symbolic links instead of copying\n" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -2257,7 +2253,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:226 +#: src/cp.c:224 msgid "" " -u, --update copy only when the SOURCE file is newer\n" " than the destination file or when the\n" @@ -2272,7 +2268,7 @@ 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:235 +#: src/cp.c:233 #, fuzzy msgid "" "\n" @@ -2298,7 +2294,7 @@ msgstr "" "Bain úsáid as `--sparse=never' chun an cruthú de chomhaid thanaí a chosc.\n" "\n" -#: src/cp.c:247 src/install.c:649 src/ln.c:421 src/mv.c:321 +#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322 #, fuzzy msgid "" "\n" @@ -2315,7 +2311,7 @@ msgstr "" "thimpeallachta VERSION_CONTROL. Seo duit na luachanna bailí:\n" "\n" -#: src/cp.c:254 src/install.c:656 src/mv.c:328 +#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329 msgid "" " none, off never make backups (even if --backup is given)\n" " numbered, t make numbered backups\n" @@ -2327,7 +2323,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:260 +#: src/cp.c:258 msgid "" "\n" "As a special case, cp makes a backup of SOURCE when the force and backup\n" @@ -2340,94 +2336,94 @@ msgstr "" "agus\n" "SPRIOC ar ghnáthchomhad atá ann.\n" -#: src/cp.c:319 +#: src/cp.c:317 #, c-format msgid "failed to preserve times for %s" msgstr "níorbh fhéidir amanna a chaomhnú ar %s" -#: src/cp.c:350 +#: src/cp.c:348 #, c-format msgid "failed to preserve permissions for %s" msgstr "níorbh fhéidir ceadanna a chaomhnú ar %s" -#: src/cp.c:477 +#: src/cp.c:475 #, c-format msgid "cannot make directory %s" msgstr "ní féidir an chomhadlann %s a chruthú" -#: src/cp.c:526 src/cp.c:545 +#: src/cp.c:524 src/cp.c:543 #, c-format msgid "%s exists but is not a directory" msgstr "Tá %s ann cheana, ach ní comhadlann é" -#: src/cp.c:572 src/cp.c:1068 src/install.c:401 src/install.c:844 src/ln.c:123 -#: src/ln.c:181 src/ln.c:202 src/ln.c:516 src/mv.c:152 src/mv.c:399 -#, c-format -msgid "accessing %s" -msgstr "%s á rochtain" +#: 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 +msgid "failed to access %s" +msgstr "Ní féidir %s a oscailt" -#: src/cp.c:592 src/install.c:914 src/ln.c:546 src/mv.c:432 src/shred.c:1182 -#: src/touch.c:433 src/truncate.c:356 +#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181 +#: src/touch.c:429 src/truncate.c:354 #, c-format msgid "missing file operand" msgstr "oibreann comhaid ar iarraidh" -#: src/cp.c:594 src/install.c:916 src/ln.c:560 src/mv.c:434 +#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436 #, c-format msgid "missing destination file operand after %s" msgstr "oibreann sprioc-chomhaid ar iarraidh i ndiaidh %s" -#: src/cp.c:603 src/install.c:925 src/mv.c:443 +#: src/cp.c:601 src/install.c:926 src/mv.c:445 #, 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:619 src/cp.c:1070 src/install.c:403 src/install.c:846 -#: src/install.c:938 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:401 -#: src/mv.c:457 +#: 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 #, c-format msgid "target %s is not a directory" msgstr "ní comhadlann é an sprioc-chomhad %s" -#: src/cp.c:730 +#: src/cp.c:728 #, 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:1063 src/install.c:839 src/ln.c:511 src/mv.c:394 +#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395 #, c-format msgid "multiple target directories specified" msgstr "sonraíodh sprioc-chomhadlanna iomadúla" -#: src/cp.c:1108 +#: src/cp.c:1110 #, 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:1115 src/mv.c:464 +#: src/cp.c:1117 src/mv.c:466 #, fuzzy, c-format msgid "options --backup and --no-clobber are mutually exclusive" msgstr "is comheisiatach iad na roghanna --string agus --check" -#: src/cp.c:1121 +#: src/cp.c:1123 #, c-format msgid "--reflink can be used only with --sparse=auto" msgstr "" -#: src/cp.c:1129 src/install.c:899 src/ln.c:582 src/mv.c:472 +#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474 msgid "backup type" msgstr "cineál cúltaca" -#: src/cp.c:1154 +#: src/cp.c:1156 #, 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:1160 +#: src/cp.c:1162 #, c-format msgid "cannot preserve extended attributes, cp is built without xattr support" msgstr "" @@ -2437,139 +2433,138 @@ msgstr "" msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:529 +#: src/csplit.c:531 #, c-format msgid "input disappeared" msgstr "ionchur imithe" -#: src/csplit.c:658 src/csplit.c:669 +#: src/csplit.c:660 src/csplit.c:671 #, c-format msgid "%s: line number out of range" msgstr "%s: líne-uimhir as raon" -#: src/csplit.c:698 +#: src/csplit.c:700 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: líne-uimhir as raon" -#: src/csplit.c:701 src/csplit.c:750 +#: src/csplit.c:703 src/csplit.c:752 #, c-format msgid " on repetition %s\n" msgstr " le linn timthriall %s\n" -#: src/csplit.c:744 +#: src/csplit.c:746 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: níl a leithéid ann" -#: src/csplit.c:808 src/csplit.c:848 src/nl.c:359 src/tac.c:274 +#: src/csplit.c:810 src/csplit.c:850 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:981 +#: src/csplit.c:983 #, c-format msgid "write error for %s" msgstr "earráid sa scríobh le haghaidh %s" -#: src/csplit.c:1057 +#: src/csplit.c:1059 #, 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:1073 +#: src/csplit.c:1075 #, fuzzy, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: tá gá le `}' i líon na hathráite" -#: src/csplit.c:1083 +#: src/csplit.c:1085 #, fuzzy, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: tá gá le slánuimhir idir `{' agus `}'" -#: src/csplit.c:1110 +#: src/csplit.c:1112 #, fuzzy, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: teormharcóir foirceanta `%c' ar iarraidh" -#: src/csplit.c:1127 +#: src/csplit.c:1129 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: slonn ionadaíochta neamhbhailí: %s" -#: src/csplit.c:1160 +#: src/csplit.c:1162 #, c-format msgid "%s: invalid pattern" msgstr "%s: patrún neamhbhailí" -#: src/csplit.c:1163 +#: src/csplit.c:1165 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: ní foláir líne-uimhir dheimhneach" -#: src/csplit.c:1169 +#: src/csplit.c:1171 #, 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:1175 +#: src/csplit.c:1177 #, 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:1253 +#: src/csplit.c:1255 #, c-format msgid "missing conversion specifier in suffix" msgstr "tá sonraitheoir tiontaithe ar iarraidh in iarmhír" -#: src/csplit.c:1259 +#: src/csplit.c:1261 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "sonraitheoir tiontaithe neamhbhailí in iarmhír: %c" -#: src/csplit.c:1262 +#: src/csplit.c:1264 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "sonraitheoir tiontaithe neamhbhailí in iarmhír: \\%.3o" -#: src/csplit.c:1267 +#: src/csplit.c:1269 #, fuzzy, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "%.*s: tiontú neamhbhailí" -#: src/csplit.c:1284 +#: src/csplit.c:1286 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "an iomarca sonraitheoirí tiontaithe %% in iarmhír" -#: src/csplit.c:1298 +#: src/csplit.c:1300 #, c-format msgid "missing %% conversion specification in suffix" msgstr "sonraitheoir tiontaithe %% ar iarraidh in iarmhír" -#: src/csplit.c:1345 +#: src/csplit.c:1347 #, c-format msgid "%s: invalid number" msgstr "%s: uimhir neamhbhailí" -#: src/csplit.c:1449 +#: src/csplit.c:1451 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Úsáid: %s [ROGHA]... COMHAD PATRÚN...\n" -#: src/csplit.c:1453 +#: src/csplit.c:1455 #, 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" -"\n" msgstr "" "Scríobh píosaí de CHOMHAD, scartha le PATRÚ(I)N, i gcomhaid `xx00'," "`xx01',...\n" "agus taispeáin líon na mbeart i ngach píosa ar an gnáth-aschur.\n" "\n" -#: src/csplit.c:1461 +#: src/csplit.c:1462 #, fuzzy, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2580,7 +2575,7 @@ 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:1466 +#: src/csplit.c:1467 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" @@ -2590,7 +2585,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:1473 +#: src/csplit.c:1474 msgid "" "\n" "Read standard input if FILE is -. Each PATTERN may be:\n" @@ -2598,7 +2593,7 @@ msgstr "" "\n" "Má tá an COMHAD `-', léigh ón ghnáth-ionchur. Is féidir PATRÚN a bheith:\n" -#: src/csplit.c:1477 +#: src/csplit.c:1478 #, fuzzy msgid "" "\n" @@ -2626,7 +2621,7 @@ msgstr "" msgid "David M. Ihnat" msgstr "David M. Ihnat" -#: src/cut.c:64 +#: src/cut.c:64 src/cut.c:372 msgid "fields and positions are numbered from 1" msgstr "uimhrítear réimsí agus ionaid ó 1" @@ -2636,14 +2631,13 @@ msgid "Usage: %s OPTION... [FILE]...\n" msgstr "Úsáid: %s ROGHA... [COMHAD]...\n" #: src/cut.c:193 -msgid "" -"Print selected parts of lines from each FILE to standard output.\n" -"\n" +#, 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:200 +#: src/cut.c:199 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2654,7 +2648,7 @@ msgstr "" " -d, --delimiter=TEORAN úsáid TEORAN in ionad TAB mar theormharcóir " "réimse\n" -#: src/cut.c:205 +#: src/cut.c:204 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2667,7 +2661,7 @@ msgstr "" " rogha -s tugtha\n" " -n (gan feidhm)\n" -#: src/cut.c:211 +#: src/cut.c:210 #, fuzzy msgid "" " --complement complement the set of selected bytes, characters\n" @@ -2676,7 +2670,7 @@ msgstr "" " --complement inbhéartaigh na bearta, carachtair, nó réimsí\n" " roghnaithe.\n" -#: src/cut.c:215 +#: src/cut.c:214 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2686,7 +2680,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:222 +#: src/cut.c:221 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2698,7 +2692,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:228 +#: src/cut.c:227 msgid "" "Each range is one of:\n" "\n" @@ -2718,46 +2712,48 @@ msgstr "" "\n" "Mura bhfuil COMHAD ann, nó más '-' é, léigh ón ghnáth-ionchur.\n" -#: src/cut.c:368 src/cut.c:489 -msgid "invalid byte or field list" +#: src/cut.c:367 src/cut.c:493 +#, fuzzy +msgid "invalid byte, character or field list" msgstr "liosta bearta nó réimsí neamhbhailí" -#: src/cut.c:385 +#: src/cut.c:387 msgid "invalid range with no endpoint: -" msgstr "raon neamhbhailí gan chríoch: -" -#: src/cut.c:399 +#: src/cut.c:403 msgid "invalid decreasing range" msgstr "raon neamhbhailí laghdaitheach" -#: src/cut.c:478 +#: src/cut.c:482 #, c-format msgid "byte offset %s is too large" msgstr "tá an fritháireamh birt %s rómhór" -#: src/cut.c:481 +#: src/cut.c:485 #, c-format msgid "field number %s is too large" msgstr "tá an uimhir réimse %s rómhór" -#: src/cut.c:789 src/cut.c:797 +#: src/cut.c:795 src/cut.c:803 msgid "only one type of list may be specified" msgstr "ní cheadaítear liostaí iomadúla" -#: src/cut.c:806 +#: src/cut.c:812 src/numfmt.c:1408 +#, c-format msgid "the delimiter must be a single character" msgstr "is gá an teormharcóir a bheith ina charachtar aonarach" -#: src/cut.c:841 +#: src/cut.c:847 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:844 +#: src/cut.c:850 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:848 +#: src/cut.c:854 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2765,11 +2761,11 @@ msgstr "" "ní cheiltear línte gan teormharcóirí ach nuair\n" "\tatáthar ag oibriú le réimsí" -#: src/cut.c:864 +#: src/cut.c:870 msgid "missing list of fields" msgstr "liosta réimsí ar iarraidh" -#: src/cut.c:866 +#: src/cut.c:872 msgid "missing list of positions" msgstr "liosta ionad ar iarraidh" @@ -2783,9 +2779,11 @@ msgstr "" " nó: %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 "" + +#: src/date.c:134 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" " -I[TIMESPEC], --iso-8601[=TIMESPEC] output date/time in ISO 8601 format.\n" @@ -2794,7 +2792,7 @@ msgid "" " and time to the indicated precision.\n" msgstr "" -#: src/date.c:138 +#: src/date.c:142 msgid "" " -r, --reference=FILE display the last modification time of FILE\n" " -R, --rfc-2822 output date and time in RFC 2822 format.\n" @@ -2804,7 +2802,7 @@ msgstr "" " -R, --rfc-2822 taispeáin dáta agus am de réir RFC 2822\n" " Mar shampla: Mon, 07 Aug 2006 12:34:56 -0600\n" -#: src/date.c:143 +#: src/date.c:147 #, fuzzy msgid "" " --rfc-3339=TIMESPEC output date and time in RFC 3339 format.\n" @@ -2824,7 +2822,7 @@ msgstr "" " -s, --set=TEAGHRÁN socraigh an t-am de réir an TEAGHRÁIN\n" " -u, --utc, --universal taispeáin nó socraigh UTC\n" -#: src/date.c:154 +#: src/date.c:158 #, fuzzy msgid "" "\n" @@ -2840,7 +2838,7 @@ msgstr "" " %% '%' litriúil\n" " %a lá den tseachtain de réir an logchaighdeáin, giorraithe\n" -#: src/date.c:161 +#: src/date.c:165 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2852,7 +2850,7 @@ msgstr "" " %B an mhí ina hiomláine (m.sh. \"Eanáir\")\n" " %c an dáta agus an t-am (m.sh., Aoine 30 MFómh 2005 14:23:52 UTC)\n" -#: src/date.c:167 +#: src/date.c:171 #, fuzzy msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" @@ -2865,7 +2863,7 @@ msgstr "" " %D dáta; ar comhbhrí le %m/%d/%y\n" " %e lá den mhí, stuáilte le spásanna; ar comhbhrí le %_d\n" -#: src/date.c:173 +#: src/date.c:177 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -2876,7 +2874,7 @@ msgstr "" " %G bliain uimhir na seachtaine ISO (féach ar %V); de ghnáth úsáidtear é " "seo le %V amháin\n" -#: src/date.c:178 +#: src/date.c:182 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2888,7 +2886,7 @@ msgstr "" " %I uair (01..12)\n" " %j lá den bhliain (001..366)\n" -#: src/date.c:184 +#: src/date.c:188 #, fuzzy msgid "" " %k hour, space padded ( 0..23); same as %_H\n" @@ -2901,7 +2899,7 @@ msgstr "" " %m mí (01..12)\n" " %M nóiméad (00..59)\n" -#: src/date.c:190 +#: src/date.c:194 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2919,7 +2917,7 @@ msgstr "" " %R an t-am, ceithre huaire fichead; ar comhbhrí le %H:%M\n" " %s soicindí ó `00:00:00 1970-01-01 UTC'\n" -#: src/date.c:199 +#: src/date.c:203 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2931,7 +2929,7 @@ msgstr "" " %T an t-am; ar comhbhrí le %H:%M:%S\n" " %u lá den tseachtain (1..7); 1 = Dé Luain\n" -#: src/date.c:205 +#: src/date.c:209 msgid "" " %U week number of year, with Sunday as first day of week (00..53)\n" " %V ISO week number, with Monday as first day of week (01..53)\n" @@ -2944,7 +2942,7 @@ msgstr "" " %w lá na seachtaine (0..6); 0=Dé Domhnaigh\n" " %W uimhir na seachtaine sa bhliain, le Luan mar an chéad lá (00.53)\n" -#: src/date.c:211 +#: src/date.c:215 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -2956,7 +2954,7 @@ msgstr "" " %y dhá dhigit deiridh den bhliain (00..99)\n" " %Y an bhliain\n" -#: src/date.c:217 +#: src/date.c:221 #, fuzzy msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" @@ -2977,7 +2975,7 @@ msgstr "" "\n" "De réir réamhshocraithe, stuálann `date' réimsí uimhriúla le nialais.\n" -#: src/date.c:226 +#: src/date.c:230 #, fuzzy msgid "" "The following optional flags may follow '%':\n" @@ -2996,7 +2994,7 @@ msgstr "" " ^ úsáid an cás uachtair más féidir\n" " # úsáid an cás codarsnach más féidir\n" -#: src/date.c:235 +#: src/date.c:239 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -3012,7 +3010,7 @@ msgstr "" "O, chun siombalacha malartacha uimhriúla an logchaighdeán a úsáid, más " "féidir.\n" -#: src/date.c:242 +#: src/date.c:246 msgid "" "\n" "Examples:\n" @@ -3026,36 +3024,36 @@ msgid "" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:275 src/dd.c:2193 src/head.c:838 src/md5sum.c:477 -#: src/md5sum.c:798 src/od.c:863 src/od.c:1914 src/pr.c:1176 src/pr.c:1372 -#: src/pr.c:1494 src/stty.c:842 src/tac.c:563 src/tail.c:343 src/tee.c:126 +#: 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 #, c-format msgid "standard input" msgstr "gnáth-ionchur" -#: src/date.c:303 src/date.c:523 +#: src/date.c:307 src/date.c:527 #, c-format msgid "invalid date %s" msgstr "dáta neamhbhailí %s" -#: src/date.c:414 src/date.c:448 +#: src/date.c:418 src/date.c:452 #, c-format msgid "multiple output formats specified" msgstr "sonraíodh formáidí iomadúla aschurtha" -#: src/date.c:426 +#: src/date.c:430 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "is comheisiatach iad na roghanna chun dátaí a cheapadh le priontáil" -#: src/date.c:433 +#: src/date.c:437 #, c-format msgid "the options to print and set the time may not be used together" msgstr "" "ní cheadaítear na roghanna chun an t-am a thaispeáint agus shocrú le chéile" -#: src/date.c:454 +#: src/date.c:458 #, fuzzy, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -3066,23 +3064,23 @@ msgstr "" "Má tá tú ag baint úsáid as rogha chun dáta(í) a shocrú,\n" "ní foláir do gach rogha eile a bheith ina teaghrán formáide le `+' ar tosach." -#: src/date.c:531 +#: src/date.c:535 #, c-format msgid "cannot set date" msgstr "ní féidir an dáta a shocrú" -#: src/date.c:554 src/du.c:360 +#: src/date.c:558 src/du.c:371 #, c-format msgid "time %s is out of range" msgstr "is as raon an t-am %s" #. This is a proper name. See the gettext manual, section Names. -#: src/dd.c:44 src/factor.c:43 src/rm.c:41 src/tail.c:69 src/touch.c:41 +#: 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 "Paul Rubin" -#: src/dd.c:517 +#: src/dd.c:521 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3091,7 +3089,7 @@ msgstr "" "Úsáid: %s [OIBREANN]...\n" " nó: %s ROGHA\n" -#: src/dd.c:522 +#: src/dd.c:526 #, fuzzy msgid "" "Copy a file, converting and formatting according to the operands.\n" @@ -3110,7 +3108,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:531 +#: src/dd.c:535 #, fuzzy msgid "" " if=FILE read from FILE instead of stdin\n" @@ -3120,7 +3118,8 @@ msgid "" " oflag=FLAGS write as per the comma separated symbol list\n" " seek=N skip N obs-sized blocks at start of output\n" " skip=N skip N ibs-sized blocks at start of input\n" -" status=noxfer suppress transfer statistics\n" +" status=WHICH WHICH info to suppress outputting to stderr;\n" +" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" msgstr "" " if=COMHAD léigh ó CHOMHAD in ionad an ghnáth-ionchuir\n" " iflag=BRATACH léigh de réir an liosta siombailí, scartha le camóga\n" @@ -3132,11 +3131,11 @@ msgstr "" "ionchuir\n" " status=noxfer ná taispeáin staitistic faoin aistriú\n" -#: src/dd.c:541 +#: src/dd.c:546 #, fuzzy msgid "" "\n" -"BLOCKS and BYTES may be followed by the following multiplicative suffixes:\n" +"N and BYTES may be followed by the following multiplicative suffixes:\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, and so on for T, P, E, Z, Y.\n" "\n" @@ -3151,7 +3150,7 @@ msgstr "" "Is féidir EOCHAIRFHOCAL a bheith:\n" "\n" -#: src/dd.c:550 +#: src/dd.c:555 #, fuzzy msgid "" " ascii from EBCDIC to ASCII\n" @@ -3180,7 +3179,7 @@ msgstr "" " nuair atá `block' nó `unblock' in úsáid, stuáil le spásanna\n" " in ionad carachtair NUL\n" -#: src/dd.c:563 +#: src/dd.c:568 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3196,7 +3195,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:571 +#: src/dd.c:576 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3210,77 +3209,77 @@ msgstr "" " append mód iarcheangail (ná húsáid ach le haschur; moltar " "conv=notrunc)\n" -#: src/dd.c:578 +#: src/dd.c:583 #, 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:580 +#: src/dd.c:585 msgid " direct use direct I/O for data\n" msgstr " direct úsáid I/A díreach le haghaidh sonraí\n" -#: src/dd.c:582 +#: src/dd.c:587 #, fuzzy msgid " directory fail unless a directory\n" msgstr " directory teip mura comhadlann é\n" -#: src/dd.c:584 +#: src/dd.c:589 msgid " dsync use synchronized I/O for data\n" msgstr " dsync úsáid I/A sioncrónaithe le haghaidh sonraí\n" -#: src/dd.c:586 +#: src/dd.c:591 msgid " sync likewise, but also for metadata\n" msgstr " sync mar an gcéanna, ach le haghaidh meiteashonraí fosta\n" -#: src/dd.c:587 +#: src/dd.c:592 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr "" -#: src/dd.c:590 +#: src/dd.c:595 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock úsáid I/A gan bhacainní\n" -#: src/dd.c:592 +#: src/dd.c:597 msgid " noatime do not update access time\n" msgstr " noatime ná nuashonraigh an t-am rochtana\n" -#: src/dd.c:595 +#: src/dd.c:600 msgid " nocache discard cached data\n" msgstr "" -#: src/dd.c:598 +#: src/dd.c:603 msgid " noctty do not assign controlling terminal from file\n" msgstr " noctty ná ceap an teirminéal rialaithe ó chomhad\n" -#: src/dd.c:601 +#: src/dd.c:606 msgid " nofollow do not follow symlinks\n" msgstr " nofollow ná lean naisc shiombalacha\n" -#: src/dd.c:603 +#: src/dd.c:608 msgid " nolinks fail if multiply-linked\n" msgstr " nolinks teip má tá naisc iomadúla ann\n" -#: src/dd.c:605 +#: src/dd.c:610 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:607 +#: src/dd.c:612 msgid " text use text I/O for data\n" msgstr " text úsáid I/A téacs le haghaidh sonraí\n" -#: src/dd.c:609 +#: src/dd.c:614 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:612 +#: src/dd.c:617 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:615 +#: src/dd.c:620 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:620 +#: src/dd.c:625 #, fuzzy, c-format msgid "" "\n" @@ -3310,7 +3309,7 @@ msgstr "" "Roghanna:\n" "\n" -#: src/dd.c:676 +#: src/dd.c:683 #, c-format msgid "" "%<PRIuMAX>+%<PRIuMAX> records in\n" @@ -3319,7 +3318,7 @@ msgstr "" "%<PRIuMAX>+%<PRIuMAX> taifead isteach\n" "%<PRIuMAX>+%<PRIuMAX> taifead amach\n" -#: src/dd.c:682 +#: src/dd.c:689 #, c-format msgid "%<PRIuMAX> truncated record\n" msgid_plural "%<PRIuMAX> truncated records\n" @@ -3329,7 +3328,7 @@ msgstr[2] "%<PRIuMAX> thaifead teasctha\n" msgstr[3] "%<PRIuMAX> dtaifead teasctha\n" msgstr[4] "%<PRIuMAX> taifead teasctha\n" -#: src/dd.c:694 +#: src/dd.c:701 #, c-format msgid "%<PRIuMAX> byte (%s) copied" msgid_plural "%<PRIuMAX> bytes (%s) copied" @@ -3339,7 +3338,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:712 +#: src/dd.c:720 msgid "Infinity B" msgstr "Éigríoch B" @@ -3353,83 +3352,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:725 +#: src/dd.c:733 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g shoicind, %s/s\n" -#: src/dd.c:804 +#: src/dd.c:812 #, c-format msgid "closing input file %s" msgstr "inchomhad %s á dhúnadh" -#: src/dd.c:811 +#: src/dd.c:819 #, c-format msgid "closing output file %s" msgstr "aschomhad %s á dhúnadh" -#: src/dd.c:1014 +#: src/dd.c:1022 #, fuzzy, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "theip ar chdir go dtí an chomhadlann %s" -#: src/dd.c:1085 src/dd.c:1934 +#: src/dd.c:1093 src/dd.c:1942 #, c-format msgid "writing to %s" msgstr "á scríobh i %s" -#: src/dd.c:1199 src/dd.c:1253 +#: src/dd.c:1207 src/dd.c:1261 #, c-format msgid "unrecognized operand %s" msgstr "oibreann anaithnid %s" -#: src/dd.c:1210 +#: src/dd.c:1218 msgid "invalid conversion" msgstr "tiontú neamhbhailí" -#: src/dd.c:1213 src/dd.c:1289 +#: src/dd.c:1221 src/dd.c:1297 msgid "invalid input flag" msgstr "bratach neamhbhailí ionchurtha" -#: src/dd.c:1216 src/dd.c:1283 src/dd.c:1295 +#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303 msgid "invalid output flag" msgstr "bratach neamhbhailí aschurtha" -#: src/dd.c:1219 +#: src/dd.c:1227 msgid "invalid status flag" msgstr "bratach neamhbhailí stádais" -#: src/dd.c:1258 src/truncate.c:312 +#: src/dd.c:1266 src/truncate.c:310 #, c-format msgid "invalid number %s" msgstr "uimhir neamhbhailí %s" -#: src/dd.c:1340 +#: src/dd.c:1348 #, 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:1342 +#: src/dd.c:1350 #, c-format msgid "cannot combine block and unblock" msgstr "ní féidir `block' agus `unblock' a úsáid lena chéile" -#: src/dd.c:1344 +#: src/dd.c:1352 #, c-format msgid "cannot combine lcase and ucase" msgstr "ní féidir `lcase' agus `ucase' a úsáid lena chéile" -#: src/dd.c:1346 +#: src/dd.c:1354 #, c-format msgid "cannot combine excl and nocreat" msgstr "ní féidir `excl' agus `nocreat' a úsáid lena chéile" -#: src/dd.c:1349 +#: src/dd.c:1357 #, 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:1506 +#: src/dd.c:1514 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3438,72 +3437,72 @@ 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:1593 +#: src/dd.c:1601 #, fuzzy, c-format msgid "%s: cannot skip" msgstr "%s: ní féidir seek a dhéanamh" -#: src/dd.c:1595 src/dd.c:1614 src/dd.c:1675 +#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683 #, c-format msgid "%s: cannot seek" msgstr "%s: ní féidir seek a dhéanamh" -#: src/dd.c:1655 +#: src/dd.c:1663 #, c-format msgid "offset overflow while reading file %s" msgstr "fritháireamh thar maoil agus comhad %s á léamh" -#: src/dd.c:1667 +#: src/dd.c:1675 #, c-format msgid "warning: invalid file offset after failed read" msgstr "rabhadh: fritháireamh neamhbhailí i ndiaidh léamh teipthe" -#: src/dd.c:1671 +#: src/dd.c:1679 #, 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:1814 +#: src/dd.c:1822 #, c-format msgid "setting flags for %s" msgstr "bratacha á socraithe le haghaidh %s" -#: src/dd.c:1867 +#: src/dd.c:1875 #, c-format msgid "memory exhausted by input buffer of size %zu bytes (%s)" msgstr "" -#: src/dd.c:1881 +#: src/dd.c:1889 #, c-format msgid "memory exhausted by output buffer of size %zu bytes (%s)" msgstr "" -#: src/dd.c:1914 +#: src/dd.c:1922 #, fuzzy, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: ní féidir bogadh go fritháireamh coibhneasta %s" -#: src/dd.c:2125 src/dd.c:2258 +#: src/dd.c:2133 #, fuzzy, c-format -msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" +msgid "failed to truncate to %<PRIdMAX> bytes in output file %s" msgstr "á theascadh ag %<PRIuMAX> beart san aschomhad %s" -#: src/dd.c:2138 +#: src/dd.c:2146 #, c-format msgid "fdatasync failed for %s" msgstr "theip ar fdatasync i gcomhair %s" -#: src/dd.c:2148 +#: src/dd.c:2156 #, c-format msgid "fsync failed for %s" msgstr "theip ar fsync i gcomhair %s" -#: src/dd.c:2199 src/dd.c:2228 +#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165 #, c-format -msgid "opening %s" -msgstr "%s á oscailt" +msgid "failed to open %s" +msgstr "Ní féidir %s a oscailt" -#: src/dd.c:2237 +#: src/dd.c:2246 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) " @@ -3511,85 +3510,107 @@ msgid "" msgstr "" "fritháireamh rómhór: ní féidir teascadh go fad %<PRIuMAX> (%lu beart) bloc" -#: src/dd.c:2274 src/dd.c:2280 +#: src/dd.c:2267 +#, 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 #, 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:54 src/expr.c:153 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:39 src/sleep.c:35 src/sort.c:66 +#: 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 msgid "Paul Eggert" msgstr "Paul Eggert" -#: src/df.c:140 +#: src/df.c:172 msgid "Filesystem" msgstr "Córas comhaid" -#: src/df.c:141 +#: src/df.c:175 msgid "Type" msgstr "Cineál" -#: src/df.c:142 +#: src/df.c:178 src/df.c:542 msgid "blocks" msgstr "bloc" -#: src/df.c:142 -msgid "Inodes" -msgstr "Inóid" - -#: src/df.c:142 -msgid "Size" -msgstr "Méid" - -#: src/df.c:143 +#: src/df.c:181 msgid "Used" msgstr "Ídithe" -#: src/df.c:143 -msgid "IUsed" -msgstr "Iídithe" - -#: src/df.c:144 +#: src/df.c:184 msgid "Available" msgstr "Ar Fáil" -#: src/df.c:144 -msgid "IFree" -msgstr "Isaor" - -#: src/df.c:144 -msgid "Avail" -msgstr "ArFáil" - -#: src/df.c:145 +#: src/df.c:187 msgid "Use%" msgstr "Úsáid%" -#: src/df.c:145 +#: src/df.c:190 +msgid "Inodes" +msgstr "Inóid" + +#: src/df.c:193 +msgid "IUsed" +msgstr "Iídithe" + +#: src/df.c:196 +msgid "IFree" +msgstr "Isaor" + +#: src/df.c:199 msgid "IUse%" msgstr "IÚsáid%" -#: src/df.c:145 -msgid "Capacity" -msgstr "Iomlán" - # my coinage - cuir suas = mount in this sense --KPS -#: src/df.c:146 +#: src/df.c:202 msgid "Mounted on" msgstr "Curtha suas ar" -#: src/df.c:847 +#: src/df.c:383 +#, c-format +msgid "option --output: field '%s' unknown" +msgstr "" + +#: src/df.c:390 +#, 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 +msgid "Size" +msgstr "Méid" + +#: src/df.c:414 src/df.c:451 +msgid "Avail" +msgstr "ArFáil" + +#: src/df.c:474 +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 +#, c-format +msgid "%s-%s" +msgstr "" + +#: src/df.c:1210 +#, fuzzy msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" -"\n" msgstr "" "Taispeáin eolas faoin chóras comhaid ar a bhfuil gach COMHAD,\n" "nó faoi gach córas comhaid mar réamhshocrú.\n" "\n" -#: src/df.c:855 +#: src/df.c:1217 #, fuzzy msgid "" " -a, --all include dummy file systems\n" @@ -3607,7 +3628,7 @@ msgstr "" "srl)\n" " -H, --si mar an gcéanna, ach le 1K=1000, nach 1024\n" -#: src/df.c:865 +#: src/df.c:1227 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3620,8 +3641,12 @@ 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:872 +#: src/df.c:1234 +#, fuzzy msgid "" +" --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" +" or print all fields if FIELD_LIST is " +"omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" " -t, --type=TYPE limit listing to file systems of type TYPE\n" @@ -3636,20 +3661,42 @@ 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:1027 +#: src/df.c:1248 +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" +msgstr "" + +#: src/df.c:1285 +#, 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 "" + +#: src/df.c:1442 #, 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:1075 +#: src/df.c:1500 msgid "Warning: " msgstr "Rabhadh: " -#: src/df.c:1077 src/stat.c:795 +#: src/df.c:1502 src/stat.c:814 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:1107 +#: src/df.c:1539 #, c-format msgid "no file systems processed" msgstr "níor próiseáladh aon chórais chomhaid" @@ -3768,7 +3815,7 @@ msgstr "" " %s /usr/bin/sort Aschur \"/usr/bin\".\n" " %s stdio.h Aschur \".\".\n" -#: src/du.c:260 src/sort.c:390 src/wc.c:112 +#: src/du.c:270 src/sort.c:394 src/wc.c:112 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3777,17 +3824,18 @@ msgstr "" "Úsáid: %s [ROGHA]... [COMHAD]...\n" " nó: %s [ROGHA]... --files0-from=C\n" -#: src/du.c:264 -msgid "" -"Summarize disk usage of each FILE, recursively for directories.\n" -"\n" +#: src/du.c:274 +#, 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:271 +#: src/du.c:280 #, fuzzy msgid "" +" -0, --null end each output line with 0 byte rather than " +"newline\n" " -a, --all write counts for all files, not just directories\n" " --apparent-size print apparent sizes, rather than disk usage; " "although\n" @@ -3804,7 +3852,7 @@ msgstr "" " i gcomhaid (`tanaí), bloghadh inmheánach, bloic\n" " indíreacha agus a leithéidí\n" -#: src/du.c:279 +#: src/du.c:289 #, fuzzy msgid "" " -B, --block-size=SIZE scale sizes by SIZE before printing them. E.g.,\n" @@ -3814,6 +3862,11 @@ msgid "" " -c, --total produce a grand total\n" " -D, --dereference-args dereference only symlinks that are listed on the\n" " command line\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 "" " -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" @@ -3821,7 +3874,7 @@ msgstr "" " -D, --dereference-args dí-thagair naisc shiombalacha a thugtar ar\n" " líne na n-orduithe amháin\n" -#: src/du.c:288 +#: src/du.c:302 #, fuzzy msgid "" " --files0-from=F summarize disk usage of the NUL-terminated file\n" @@ -3830,7 +3883,6 @@ msgid "" " -H equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" --si like -h, but use powers of 1000 not 1024\n" msgstr "" " --files0-from=C achoimrigh spás diosca úsáidte ag na comhaid atá\n" " ainmnithe i gcomhad C, foirceanta le NULanna\n" @@ -3841,9 +3893,11 @@ msgstr "" "2G)\n" " --si cosúil le -h, ach le 1K=1000 in ionad 1024\n" -#: src/du.c:297 +#: src/du.c:310 +#, fuzzy 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 "" @@ -3851,14 +3905,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:302 +#: src/du.c:316 +#, fuzzy msgid "" -" -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " "default)\n" -" -0, --null end each output line with 0 byte rather than " -"newline\n" " -S, --separate-dirs 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 dí-thagair gach nasc siombalach\n" @@ -3868,35 +3921,11 @@ msgstr "" " -S, --separate-dirs ná cuir comhadlanna san áireamh\n" " -s, --summarize ná taispeáin ach an tsuim iomlán\n" -#: src/du.c:309 -#, 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" - -#: src/du.c:318 +#: src/du.c:322 #, fuzzy msgid "" +" -t, --threshold=SIZE exclude entries smaller than SIZE if positive,\n" +" or entries greater than SIZE if negative\n" " --time show time of the last modification of any file in " "the\n" " directory, or any of its subdirectories\n" @@ -3916,67 +3945,76 @@ msgstr "" " full-iso, long-iso, iso, +FORMÁID\n" " Parsáiltear FORMÁID cosúil le `date'\n" -#: src/du.c:375 +#: src/du.c:333 +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 msgid "Infinity" msgstr "Éigríoch B" -#: src/du.c:600 +#: src/du.c:507 +#, c-format +msgid "mount point %s already traversed" +msgstr "" + +#: src/du.c:624 #, fuzzy, c-format msgid "fts_read failed: %s" msgstr "theip ar fts_read" -#: src/du.c:724 +#: src/du.c:780 #, c-format msgid "invalid maximum depth %s" msgstr "doimhneacht uasta neamhbhailí %s" -#: src/du.c:817 +#: src/du.c:809 +#, fuzzy, c-format +msgid "invalid --threshold argument '-0'" +msgstr "argóint neamhbhailí %s" + +#: src/du.c:887 #, 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:824 +#: src/du.c:894 #, 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:830 +#: src/du.c:900 #, 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:896 src/sort.c:4479 src/wc.c:668 +#: src/du.c:966 src/sort.c:4533 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:949 src/md5sum.c:587 src/od.c:903 src/tac.c:239 src/tac.c:350 -#: src/tac.c:506 src/tac.c:586 src/wc.c:733 +#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 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:963 src/sort.c:4508 src/wc.c:747 +#: src/du.c:1040 src/sort.c:4562 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:980 src/du.c:988 src/wc.c:760 src/wc.c:768 +#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768 msgid "invalid zero-length file name" msgstr "ainm neamhbhailí comhaid: folamh" -#: src/du.c:1007 src/head.c:149 src/head.c:262 src/head.c:334 src/head.c:538 -#: src/head.c:620 src/head.c:692 src/head.c:750 src/head.c:774 src/tail.c:412 -#: src/tail.c:500 src/tail.c:549 src/tail.c:642 src/tail.c:770 src/tail.c:818 -#: src/tail.c:855 src/tail.c:1782 src/tail.c:1812 src/uniq.c:395 -#, c-format -msgid "error reading %s" -msgstr "earráid agus %s á léamh" - -#: src/du.c:1010 src/ls.c:2649 src/wc.c:791 +#: src/du.c:1088 src/ls.c:2649 src/wc.c:791 msgid "total" msgstr "iomlán" @@ -4070,10 +4108,12 @@ msgid "Usage: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n" msgstr "Úsáid: %s [ROGHA]... [-] [AINM=LUACH]... [ORDÚ [ARG]...]\n" #: src/env.c:55 +msgid "Set each NAME to VALUE in the environment and run COMMAND.\n" +msgstr "" + +#: src/env.c:61 #, fuzzy msgid "" -"Set each NAME to VALUE in the environment and run COMMAND.\n" -"\n" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with 0 byte rather than newline\n" " -u, --unset=NAME remove variable from the environment\n" @@ -4083,7 +4123,7 @@ msgstr "" " -i, --ignore-environment tosaigh le timpeallacht fholamh\n" " -u, --unset=AINM scrios an athróg AINM as an timpeallacht\n" -#: src/env.c:64 +#: src/env.c:68 msgid "" "\n" "A mere - implies -i. If no COMMAND, print the resulting environment.\n" @@ -4092,32 +4132,32 @@ msgstr "" "Ciallaíonn `-' lom an rogha `-i'. Mura bhfuil ORDÚ ann, taispeáin an " "timpeallacht.\n" -#: src/env.c:120 +#: src/env.c:124 #, fuzzy, c-format msgid "cannot unset %s" msgstr "ní féidir %s a `stat'" -#: src/env.c:131 +#: src/env.c:135 #, fuzzy, c-format msgid "cannot set %s" msgstr "ní féidir %s a `stat'" -#: src/env.c:148 +#: src/env.c:152 #, c-format msgid "cannot specify --null (-0) with command" msgstr "" #: 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" -"\n" msgstr "" "Tiontaigh na táib i ngach COMHAD go spásanna agus scríobh chuig an\n" "ghnáth-aschur. Mura bhfuil COMHAD ann, nó más - é, léigh ón ghnáth-ionchur.\n" "\n" -#: src/expand.c:115 +#: src/expand.c:114 msgid "" " -i, --initial do not convert tabs after non blanks\n" " -t, --tabs=NUMBER have tabs NUMBER characters apart, not 8\n" @@ -4125,33 +4165,33 @@ msgstr "" " -i, --initial ná tiontaigh TÁB i ndiaidh carachtair nach spás bán\n" " -t, --tabs=UIMHIR cuir táib UIMHIR carachtar ó chéile in ionad 8\n" -#: src/expand.c:119 +#: src/expand.c:118 msgid "" " -t, --tabs=LIST use comma separated list of explicit tab positions\n" msgstr "" " -t, --tabs=LIOSTA úsáid LIOSTA táib faoi leith, scartha le camóga\n" -#: src/expand.c:172 src/unexpand.c:191 +#: src/expand.c:171 src/unexpand.c:190 #, c-format msgid "tab stop is too large %s" msgstr "is rómhór an tábstop %s" -#: src/expand.c:180 src/unexpand.c:199 +#: src/expand.c:179 src/unexpand.c:198 #, c-format msgid "tab size contains invalid character(s): %s" msgstr "tá carachta(i)r neamhbhailí sa mhéid táib: %s" -#: src/expand.c:206 src/unexpand.c:225 +#: src/expand.c:205 src/unexpand.c:224 #, c-format msgid "tab size cannot be 0" msgstr "ní féidir méid táib nialasach" -#: src/expand.c:208 src/unexpand.c:227 +#: src/expand.c:207 src/unexpand.c:226 #, c-format msgid "tab sizes must be ascending" msgstr "caithfidh na méideanna táib a bheith ardaitheach" -#: src/expand.c:326 src/expand.c:345 src/unexpand.c:374 src/unexpand.c:419 +#: 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 "tá an líne ionchurtha rófhada" @@ -4312,12 +4352,12 @@ msgstr "earráid le linn cuardaigh ar shlonn ionadaíochta" msgid "non-integer argument" msgstr "argóint neamhuimhriúil" -#: src/expr.c:793 src/truncate.c:316 +#: src/expr.c:793 src/truncate.c:314 #, c-format msgid "division by zero" msgstr "roinnt le nialas" -#: src/expr.c:887 src/sort.c:2029 +#: src/expr.c:887 src/sort.c:2044 #, 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." @@ -4327,25 +4367,32 @@ msgstr "Cuir LC_ALL='C' ionas gur féidir an fhadhb seo a sheachaint." msgid "the strings compared were %s and %s" msgstr "Rinneadh comparáid idir na teaghráin %s agus %s." -#: src/factor.c:449 -msgid "using arbitrary-precision arithmetic" +#. This is a proper name. See the gettext manual, section Names. +#: src/factor.c:111 +msgid "Niels Moller" msgstr "" -#: src/factor.c:460 -msgid "using single-precision arithmetic" +#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459 +#, c-format +msgid "Lucas prime test failure. This should not happen" msgstr "" -#: src/factor.c:465 src/od.c:1640 src/od.c:1709 +#: src/factor.c:2092 #, c-format -msgid "%s is too large" -msgstr "tá %s rómhór" +msgid "squfof queue overflow" +msgstr "" -#: src/factor.c:469 +#: src/factor.c:2419 #, c-format msgid "%s is not a valid positive integer" msgstr "Ní slánuimhir dheimhneach bhailí é %s" -#: src/factor.c:494 +#: src/factor.c:2442 src/od.c:1646 src/od.c:1715 +#, c-format +msgid "%s is too large" +msgstr "tá %s rómhór" + +#: src/factor.c:2454 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4354,7 +4401,7 @@ msgstr "" "Úsáid: %s [UIMHIR]...\n" " nó: %s ROGHA\n" -#: src/factor.c:499 +#: src/factor.c:2459 #, fuzzy msgid "" "Print the prime factors of each specified integer NUMBER. If none\n" @@ -4382,21 +4429,20 @@ msgid "cannot stat current directory (now %s)" msgstr "níl an chomhadlann oibre ar fáil (%s anois)" #. This is a proper name. See the gettext manual, section Names. -#: src/fmt.c:37 +#: src/fmt.c:38 msgid "Ross Paterson" msgstr "Ross Paterson" -#: src/fmt.c:269 +#: src/fmt.c:270 #, fuzzy, c-format msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n" msgstr "Úsáid: %s [-DIGITÍ] [ROGHA]... [COMHAD]...\n" -#: src/fmt.c:270 +#: 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" -"\n" msgstr "" "Athdhéan an fhormáid de gach paragraf s(n)a COMHA(I)D, agus scríobh\n" "an toradh chuig an ghnáth-aschur. Mura bhfuil COMHAD ann, nó más '-' é,\n" @@ -4415,8 +4461,8 @@ msgstr "" "athfhormáidithe\n" " -s, --split-only deighil línte fada, ach ná hathlíon\n" -#: src/fmt.c:285 -#, fuzzy, c-format +#: src/fmt.c:287 +#, fuzzy, 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" @@ -4428,7 +4474,7 @@ msgstr "" "abairtí\n" " -w, --width=UIMHIR uasmhéid leithid líne (réamhshocrú 75 colún)\n" -#: src/fmt.c:357 +#: src/fmt.c:359 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -4437,22 +4483,22 @@ msgstr "" "rogha neamhbhailí -- %c; ní ghlactar le -LEITHEAD ach nuair atá sé an chéad\n" "rogha; úsáid -w N ina háit" -#: src/fmt.c:403 src/fmt.c:414 +#: src/fmt.c:405 src/fmt.c:416 #, c-format msgid "invalid width: %s" msgstr "leithead neamhbhailí: %s" #: src/fold.c:70 +#, fuzzy msgid "" "Wrap input lines in each FILE (standard input by default), writing to\n" "standard output.\n" -"\n" msgstr "" "Timfhill línte ionchurtha i ngach COMHAD (gnáth-ionchur mar réamhshocrú)\n" "agus scríobh chuig an ghnáth-aschur.\n" "\n" -#: src/fold.c:78 +#: src/fold.c:77 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4462,13 +4508,13 @@ msgstr "" " -s, --spaces bris ag spásanna\n" " -w, --width=LEITHEAD úsáid LEITHEAD colún in ionad 80\n" -#: src/fold.c:289 src/pr.c:836 +#: src/fold.c:288 src/pr.c:832 #, c-format 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:75 +#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 #: src/truncate.c:37 msgid "Padraig Brady" msgstr "" @@ -4484,17 +4530,17 @@ msgid "" "\n" msgstr "" -#: src/group-list.c:69 src/id.c:345 src/setuidgid.c:184 +#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184 #, 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:350 +#: src/group-list.c:74 src/id.c:370 #, 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" -#: src/group-list.c:104 +#: src/group-list.c:114 #, c-format msgid "cannot find name for group ID %lu" msgstr "níl aon fháil ar ainm don aitheantas grúpa %lu" @@ -4536,11 +4582,11 @@ msgid "%s: no such user" msgstr "%s: Níl a leithéid d'úsáideoir ann" #: 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" -"\n" msgstr "" "Taispeáin an chéad deich líne i ngach COMHAD chuig an ghnáth-aschur.\n" "Má tá níos mó ná COMHAD amháin, taispeáin ceanntásc leis an ainm comhaid\n" @@ -4548,7 +4594,7 @@ msgstr "" "ghnáth-ionchur.\n" "\n" -#: src/head.c:118 +#: src/head.c:117 #, fuzzy msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" @@ -4565,7 +4611,7 @@ msgstr "" " leis an `-' tosaigh, taispeáin an comhad uile\n" " seachas an N líne is déanaí ó gach comhad\n" -#: src/head.c:126 +#: src/head.c:125 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4573,7 +4619,7 @@ msgstr "" " -q, --quiet, --silent ná taispeáin ceanntásc leis an ainm comhaid\n" " -v, --verbose taispeáin an ceanntásc leis an ainm comhaid\n" -#: src/head.c:132 +#: src/head.c:131 #, fuzzy msgid "" "\n" @@ -4586,59 +4632,59 @@ 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:152 -#, c-format -msgid "error writing %s" -msgstr "earráid agus %s á scríobh" - -#: src/head.c:155 +#: src/head.c:154 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: is róchraptha an comhad" -#: src/head.c:228 src/head.c:1044 +#: src/head.c:227 src/head.c:1051 #, c-format msgid "%s: number of bytes is too large" msgstr "%s: is rómhór líon na mbeart" -#: src/head.c:441 +#: 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:613 src/head.c:684 src/tail.c:450 +#: src/head.c:612 src/head.c:691 src/tail.c:449 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: ní féidir bogadh go fritháireamh %s" -#: src/head.c:791 +#: src/head.c:673 +#, fuzzy, c-format +msgid "%s: failed to reset file pointer" +msgstr "%s: theip ar bhaint" + +#: src/head.c:798 #, c-format msgid "cannot reposition file pointer for %s" msgstr "ní féidir an pointeoir comhaid a athshocrú do %s" -#: src/head.c:878 +#: src/head.c:885 #, 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:879 +#: src/head.c:886 msgid "number of lines" msgstr "líon na línte" -#: src/head.c:879 +#: src/head.c:886 msgid "number of bytes" msgstr "líon na mbeart" -#: src/head.c:886 src/tail.c:1947 +#: src/head.c:893 src/tail.c:1947 msgid "invalid number of lines" msgstr "líon na línte neamhbhailí" -#: src/head.c:887 src/tail.c:1948 +#: src/head.c:894 src/tail.c:1948 msgid "invalid number of bytes" msgstr "líon neamhbhailí na mbeart" -#: src/head.c:974 src/head.c:1032 +#: src/head.c:981 src/head.c:1039 #, c-format msgid "invalid trailing option -- %c" msgstr "rogha neamhbhailí chun deiridh -- %c" @@ -4758,86 +4804,86 @@ msgstr "níl aon fháil ar chomhthéacs an phróisis" msgid "cannot get effective UID" msgstr "ní féidir %s a dhí-thagairt" -#: src/id.c:289 +#: src/id.c:311 #, fuzzy, c-format -msgid "cannot find name for user ID %lu" +msgid "cannot find name for user ID %s" msgstr "níl aon fháil ar ainm don aitheantas úsáideora %lu" -#: src/id.c:309 +#: src/id.c:329 #, c-format -msgid "uid=%lu" +msgid "uid=%s" msgstr "" -#: src/id.c:314 +#: src/id.c:334 #, c-format -msgid " gid=%lu" +msgid " gid=%s" msgstr "" -#: src/id.c:321 +#: src/id.c:341 #, c-format -msgid " euid=%lu" +msgid " euid=%s" msgstr "" -#: src/id.c:329 +#: src/id.c:349 #, c-format -msgid " egid=%lu" +msgid " egid=%s" msgstr "" -#: src/id.c:357 +#: src/id.c:377 msgid " groups=" msgstr " grúpaí=" -#: src/id.c:373 +#: src/id.c:393 #, fuzzy, c-format msgid " context=%s" msgstr "comhthéacs neamhbhailí: %s" -#: src/install.c:372 +#: src/install.c:373 #, 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:413 +#: src/install.c:414 #, c-format msgid "creating directory %s" msgstr "comhadlann %s á cruthú" -#: src/install.c:481 +#: src/install.c:482 #, c-format msgid "cannot change ownership of %s" msgstr "ní féidir an t-úinéir de %s a athrú" -#: src/install.c:505 +#: src/install.c:506 #, c-format msgid "cannot set time stamps for %s" msgstr "ní féidir an stampa ama a shocrú do %s" -#: src/install.c:526 src/split.c:412 src/timeout.c:387 +#: src/install.c:527 src/split.c:426 src/timeout.c:439 #, c-format msgid "fork system call failed" msgstr "theip ar ghlao córais fork()" -#: src/install.c:530 +#: src/install.c:531 #, fuzzy, c-format msgid "cannot run %s" msgstr "ní féidir \"strip\" a rith" -#: src/install.c:534 +#: src/install.c:535 #, c-format msgid "waiting for strip" msgstr "ag feitheamh le \"strip\"" -#: src/install.c:536 +#: src/install.c:537 #, c-format msgid "strip process terminated abnormally" msgstr "chríochnaigh \"strip\" gan an chúis a mhíniú" -#: src/install.c:557 +#: src/install.c:558 #, c-format msgid "invalid user %s" msgstr "úsáideoir neamhbhailí %s" -#: src/install.c:593 +#: src/install.c:594 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -4850,7 +4896,7 @@ msgstr "" " nó: %s [ROGHA]... -t COMHADLANN FOINSE...\n" " nó: %s [ROGHA]... -d COMHADLANN...\n" -#: src/install.c:600 +#: src/install.c:601 #, fuzzy msgid "" "\n" @@ -4863,7 +4909,6 @@ msgid "" "In the first three forms, copy SOURCE to DEST or multiple SOURCE(s) to\n" "the existing DIRECTORY, while setting permission modes and owner/group.\n" "In the 4th form, create all components of the given DIRECTORY(ies).\n" -"\n" msgstr "" "Sa chéad trí leagan, cóipeáil FOINSE go SPRIOC nó FOINSE/Í go COMHADLANN " "atá\n" @@ -4942,7 +4987,7 @@ msgstr "" " -Z, --context=CMHTCS socraigh comhthéacs slándála de chomhaid/" "chomhadlanna\n" -#: src/install.c:858 +#: src/install.c:859 #, fuzzy, c-format msgid "" "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled" @@ -4950,49 +4995,49 @@ msgstr "" "Rabhadh: ag déanamh neamhaird de --preserve-context; níl an eithne seo " "cumasaithe do SELinux." -#: src/install.c:868 +#: 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:885 +#: src/install.c:886 #, 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:888 +#: src/install.c:889 #, c-format msgid "target directory not allowed when installing a directory" msgstr "ní cheadaítear sprioc-chomhadlann agus comhadlann á suiteáil" -#: src/install.c:892 +#: 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:946 src/mkdir.c:202 src/stdbuf.c:327 +#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326 #, c-format msgid "invalid mode %s" msgstr "mód neamhbhailí %s" -#: src/install.c:953 +#: src/install.c:954 #, c-format msgid "WARNING: ignoring --strip-program option as -s option was not specified" msgstr "" -#: src/install.c:958 +#: src/install.c:959 #, 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:965 +#: src/install.c:966 #, 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:971 +#: src/install.c:972 #, c-format msgid "" "the --compare (-C) option is ignored when you specify a mode with non-" @@ -5000,7 +5045,7 @@ msgid "" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/join.c:40 src/sort.c:65 +#: src/join.c:40 src/sort.c:66 msgid "Mike Haertel" msgstr "Mike Haertel" @@ -5091,7 +5136,7 @@ msgstr "" #: src/join.c:403 #, c-format -msgid "%s:%ju: is not sorted: %.*s" +msgid "%s:%<PRIuMAX>: is not sorted: %.*s" msgstr "" #: src/join.c:840 src/join.c:1038 @@ -5119,12 +5164,12 @@ msgstr "réimsí neamh-chomhoiriúnacha ceangail %lu, %lu" msgid "conflicting empty-field replacement strings" msgstr "teaghrán ionaid le haghaidh réimsí folmha i gcoinbhleacht" -#: src/join.c:1101 src/sort.c:4414 +#: src/join.c:1101 src/sort.c:4468 #, c-format msgid "multi-character tab %s" msgstr "táb ilcharachtair %s" -#: src/join.c:1105 src/sort.c:4419 +#: src/join.c:1105 src/sort.c:4473 #, c-format msgid "incompatible tabs" msgstr "táib éaguibhreannacha" @@ -5146,14 +5191,13 @@ msgstr "" " nó: %s -t [COMHARTHA]...\n" #: src/kill.c:82 -msgid "" -"Send signals to processes, or list signals.\n" -"\n" +#, fuzzy +msgid "Send signals to processes, or list signals.\n" msgstr "" "Cuir comharthaí chuig próisis, nó taispeáin comharthaí.\n" "\n" -#: src/kill.c:89 +#: src/kill.c:88 msgid "" " -s, --signal=SIGNAL, -SIGNAL\n" " specify the name or number of the signal to be sent\n" @@ -5168,7 +5212,7 @@ msgstr "" " -t, --table taispeáin tábla le heolas faoi chomharthaí\n" # stádas scortha in FARF --KPS -#: src/kill.c:97 +#: src/kill.c:96 #, fuzzy msgid "" "\n" @@ -5181,32 +5225,32 @@ msgstr "" "nó stádas scortha de phróiseas a bhí scortha le comhartha.\n" "Is slánuimhir PID; más diúltach é, ciallaíonn sé grúpa próisis.\n" -#: src/kill.c:206 +#: src/kill.c:205 #, c-format msgid "%s: invalid process id" msgstr "%s: aitheantas neamhbhailí próisis" -#: src/kill.c:260 +#: src/kill.c:259 #, c-format msgid "invalid option -- %c" msgstr "rogha neamhbhailí -- %c" -#: src/kill.c:269 +#: src/kill.c:268 #, c-format msgid "%s: multiple signals specified" msgstr "%s: Tugadh comharthaí iomadúla" -#: src/kill.c:283 +#: src/kill.c:282 #, c-format msgid "multiple -l or -t options specified" msgstr "roghanna -l nó -t iomadúla" -#: src/kill.c:300 +#: src/kill.c:299 #, c-format msgid "cannot combine signal with -l or -t" msgstr "ní féidir comhartha a chumasc le -l nó -t" -#: src/kill.c:306 +#: src/kill.c:305 #, c-format msgid "no process ID specified" msgstr "níor tugadh aitheantas próisis ar bith" @@ -5317,7 +5361,6 @@ msgid "" "When creating hard links, each TARGET must exist. Symbolic links\n" "can hold arbitrary text; if later resolved, a relative link is\n" "interpreted in relation to its parent directory.\n" -"\n" msgstr "" "Sa chéad fhoirm, cruthaigh nasc le SPRIOC, darb ainm AINM_NAISC.\n" "Sa dara foirm, cruthaigh nasc le SPRIOC sa chomhadlann reatha.\n" @@ -5326,7 +5369,7 @@ msgstr "" "Ní foláir gach SPRIOC a bheith ann agus naisc chrua á gcruthú.\n" "\n" -#: src/ln.c:395 +#: src/ln.c:394 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -5347,7 +5390,7 @@ msgstr "" " don fhorúsáideoir)\n" " -f, --force scrios sprioc-chomhad má tá sé ann cheana\n" -#: src/ln.c:403 +#: src/ln.c:402 #, fuzzy msgid "" " -i, --interactive prompt whether to remove destinations\n" @@ -5363,7 +5406,7 @@ msgstr "" " -i, --interactive fiafraigh roimh sprioc-chomhaid a scriosadh\n" " -s, --symbolic naisc shiombalacha in ionad nasc crua\n" -#: src/ln.c:412 +#: src/ln.c:411 #, fuzzy msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -5380,23 +5423,10 @@ 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:428 -#, 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 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" - -#: src/ln.c:435 +#: src/ln.c:433 #, 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 "" @@ -5469,7 +5499,7 @@ msgstr "tá an athróg thimpeallachta COLUMNS neamhbhailí: %s; ag ligean thar" 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:1976 +#: src/ls.c:1750 src/ptx.c:1975 #, c-format msgid "invalid line width: %s" msgstr "leithead líne neamhbhailí: %s" @@ -5533,7 +5563,7 @@ msgstr "comhadlann %s á léamh" msgid "closing directory %s" msgstr "comhadlann %s á dúnadh" -#: src/ls.c:3301 +#: src/ls.c:3302 #, c-format msgid "cannot compare file names %s and %s" msgstr "" @@ -5544,13 +5574,12 @@ msgstr "" msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" -"\n" msgstr "" "Taispeáin eolas faoin COMHA(I)D (sa chomhadlann reatha mar réamhshocrú).\n" "Sórtáil san ord aibítre mura bhfuil --sort ná aon cheann de -cftuvSUX ann.\n" "\n" -#: src/ls.c:4729 +#: src/ls.c:4728 #, fuzzy msgid "" " -a, --all do not ignore entries starting with .\n" @@ -5564,7 +5593,7 @@ 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:4735 +#: src/ls.c:4734 #, fuzzy msgid "" " --block-size=SIZE scale sizes by SIZE before printing them. E." @@ -5585,7 +5614,7 @@ msgstr "" "ainm\n" " i ngach cás eile: sórtáil de réir ctime\n" -#: src/ls.c:4745 +#: src/ls.c:4744 #, fuzzy msgid "" " -C list entries by columns\n" @@ -5604,7 +5633,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:4753 +#: src/ls.c:4752 #, fuzzy msgid "" " -f do not sort, enable -aU, disable -ls --color\n" @@ -5621,13 +5650,13 @@ msgstr "" " single-column -1, verbose -l, vertical -C\n" " --full-time ar comhbhrí le `-l --time-style=full-iso\n" -#: src/ls.c:4761 +#: src/ls.c:4760 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:4764 +#: src/ls.c:4763 msgid "" " --group-directories-first\n" " group directories before files.\n" @@ -5640,7 +5669,7 @@ msgstr "" " grúpáil má bhaintear úsáid ar bith as\n" " --sort=none (-U)\n" -#: src/ls.c:4770 +#: src/ls.c:4769 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" @@ -5652,7 +5681,7 @@ msgstr "" " (m.sh., 1K 234M 2G srl.)\n" " --si mar an gcéanna, ach le 1K=1000, ní 1024\n" -#: src/ls.c:4776 +#: src/ls.c:4775 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5674,7 +5703,7 @@ msgstr "" "leis\n" " an PATRÚN blaoisce (sáraithe ag -a nó -A)\n" -#: src/ls.c:4786 +#: src/ls.c:4785 #, fuzzy msgid "" " --indicator-style=WORD append indicator with style WORD to entry " @@ -5695,7 +5724,7 @@ msgstr "" " comhoiriúnach le PATRÚN\n" " -k ar comhbhrí le `--block-size=1K'\n" -#: src/ls.c:4796 +#: src/ls.c:4795 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5709,7 +5738,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:4804 +#: src/ls.c:4803 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. " @@ -5727,7 +5756,7 @@ msgstr "" " -p, --indicator-style=slash\n" " cuir táscaire / le comhadlanna\n" -#: src/ls.c:4812 +#: src/ls.c:4811 #, fuzzy msgid "" " -q, --hide-control-chars print ? instead of non graphic characters\n" @@ -5749,7 +5778,7 @@ msgstr "" " literal, locale, shell, shell-always, c, " "escape\n" -#: src/ls.c:4821 +#: src/ls.c:4820 #, fuzzy msgid "" " -r, --reverse reverse order while sorting\n" @@ -5761,7 +5790,7 @@ 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:4826 +#: src/ls.c:4825 msgid "" " -S sort by file size\n" " --sort=WORD sort by WORD instead of name: none -U,\n" @@ -5783,7 +5812,7 @@ msgstr "" "sonraithe\n" " mar eochair shórtála más --sort=time\n" -#: src/ls.c:4836 +#: src/ls.c:4835 #, fuzzy msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" @@ -5803,7 +5832,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:4845 +#: src/ls.c:4844 #, fuzzy msgid "" " -t sort by modification time, newest first\n" @@ -5812,7 +5841,7 @@ 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:4849 +#: src/ls.c:4848 #, fuzzy msgid "" " -u with -lt: sort by, and show, access time\n" @@ -5829,7 +5858,7 @@ 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:4856 +#: src/ls.c:4855 msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" @@ -5846,7 +5875,7 @@ msgstr "" " comhad má tá ann\n" " -1 taispeáin aon chomhad sa líne\n" -#: src/ls.c:4866 +#: src/ls.c:4865 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5855,7 +5884,7 @@ msgid "" "variable can change the settings. Use the dircolors command to set it.\n" msgstr "" -#: src/ls.c:4873 +#: src/ls.c:4872 msgid "" "\n" "Exit status:\n" @@ -5879,7 +5908,7 @@ msgstr "Scott Miller" msgid "David Madore" msgstr "David Madore" -#: src/md5sum.c:162 +#: src/md5sum.c:164 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -5891,7 +5920,7 @@ msgstr "" "Taispeáin nó seiceáil suimeanna sheiceála %s (%d giotán).\n" "Mura bhfuil COMHAD ann, nó más '-' é, léigh ón ghnáth-ionchur.\n" -#: src/md5sum.c:172 +#: src/md5sum.c:174 #, fuzzy msgid "" " -b, --binary read in binary mode (default unless reading tty " @@ -5900,18 +5929,22 @@ msgstr "" " -b, --binary léigh sa mhód dénártha (réamhshocrú mura bhfuil sé " "ón ghnath-ionchur)\n" -#: src/md5sum.c:176 +#: src/md5sum.c:178 #, fuzzy msgid " -b, --binary read in binary mode\n" msgstr " -b, --binary léigh sa mhód dénártha\n" -#: src/md5sum.c:179 +#: src/md5sum.c:181 #, fuzzy, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr "" " -c, --check léigh %s suim ó na COMHAID agus seiceáil iad\n" -#: src/md5sum.c:183 +#: src/md5sum.c:184 +msgid " --tag create a BSD-style checksum\n" +msgstr "" + +#: src/md5sum.c:188 #, fuzzy msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" @@ -5919,12 +5952,12 @@ msgstr "" " -t, --text léigh sa mhód téacs (réamhshocrú mura bhfuil sé " "ónghnáth-ionchur)\n" -#: src/md5sum.c:187 +#: src/md5sum.c:192 #, fuzzy msgid " -t, --text read in text mode (default)\n" msgstr " -t, --text léigh sa mhód téacs (réamhshocrú)\n" -#: src/md5sum.c:190 +#: src/md5sum.c:195 #, fuzzy msgid "" "\n" @@ -5942,12 +5975,12 @@ msgstr "" " -w, --warn tabhair rabhadh má tá línte míchumtha ann\n" "\n" -#: src/md5sum.c:198 +#: src/md5sum.c:203 msgid "" " --strict with --check, exit non-zero for any invalid input\n" msgstr "" -#: src/md5sum.c:203 +#: src/md5sum.c:208 #, fuzzy, c-format msgid "" "\n" @@ -5963,35 +5996,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:502 +#: src/md5sum.c:523 #, c-format msgid "%s: too many checksum lines" msgstr "%s: an iomarca línte shuim sheiceála" -#: src/md5sum.c:526 +#: src/md5sum.c:547 #, 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:551 +#: src/md5sum.c:572 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: Theip ar oscailt nó ar léamh\n" -#: src/md5sum.c:574 +#: src/md5sum.c:595 msgid "FAILED" msgstr "TEIPTHE" -#: src/md5sum.c:576 +#: src/md5sum.c:597 msgid "OK" msgstr "OK" -#: src/md5sum.c:600 +#: src/md5sum.c:621 #, 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:610 +#: src/md5sum.c:631 #, fuzzy, c-format msgid "WARNING: %<PRIuMAX> line is improperly formatted" msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted" @@ -6001,7 +6034,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:618 +#: src/md5sum.c:639 #, fuzzy, c-format msgid "WARNING: %<PRIuMAX> listed file could not be read" msgid_plural "WARNING: %<PRIuMAX> listed files could not be read" @@ -6011,7 +6044,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:626 +#: src/md5sum.c:647 #, fuzzy, c-format msgid "WARNING: %<PRIuMAX> computed checksum did NOT match" msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match" @@ -6021,7 +6054,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:704 +#: src/md5sum.c:760 +#, c-format +msgid "--tag does not support --text mode" +msgstr "" + +#: src/md5sum.c:766 +#, 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 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" @@ -6029,28 +6074,28 @@ msgstr "" "tá na roghanna --binary agus --text gan bhrí agus suimeanna seiceála á " "bhfíorú" -#: src/md5sum.c:712 +#: src/md5sum.c:781 #, 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:719 +#: src/md5sum.c:788 #, 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:726 +#: src/md5sum.c:795 #, 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:733 +#: src/md5sum.c:802 #, fuzzy, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "" @@ -6063,14 +6108,13 @@ msgid "Usage: %s [OPTION]... DIRECTORY...\n" msgstr "Úsáid: %s [ROGHA]... COMHADLANN...\n" #: src/mkdir.c:57 -msgid "" -"Create the DIRECTORY(ies), if they do not already exist.\n" -"\n" +#, 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:64 +#: src/mkdir.c:63 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" @@ -6087,7 +6131,7 @@ msgstr "" "comhadlann\n" " a chruthaítear go CTCS\n" -#: src/mkdir.c:169 +#: src/mkdir.c:168 #, c-format msgid "created directory %s" msgstr "cruthaíodh comhadlann %s" @@ -6098,32 +6142,31 @@ msgid "Usage: %s [OPTION]... NAME...\n" msgstr "Úsáid: %s [ROGHA]... AINM...\n" #: src/mkfifo.c:52 -msgid "" -"Create named pipes (FIFOs) with the given NAMEs.\n" -"\n" +#, 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:59 src/mknod.c:61 +#: src/mkfifo.c:58 src/mknod.c:60 #, 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:62 +#: src/mkfifo.c:61 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" -#: src/mkfifo.c:122 src/mknod.c:128 +#: src/mkfifo.c:121 src/mknod.c:127 #, c-format msgid "invalid mode" msgstr "mód neamhbhailí" -#: src/mkfifo.c:127 src/mknod.c:133 +#: src/mkfifo.c:126 src/mknod.c:132 #, c-format msgid "mode must specify only file permission bits" msgstr "caithfidh an mód na giotáin cheada amháin a shonrú" @@ -6134,18 +6177,17 @@ 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 -msgid "" -"Create the special file NAME of the given TYPE.\n" -"\n" +#, 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:64 +#: 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:69 +#: src/mknod.c:68 msgid "" "\n" "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n" @@ -6161,7 +6203,7 @@ msgstr "" "ochtnártha;\n" "agus i ngach cás eile, mar deachúlach. CINEÁLacha bailí:\n" -#: src/mknod.c:76 +#: src/mknod.c:75 msgid "" "\n" " b create a block (buffered) special file\n" @@ -6173,42 +6215,42 @@ msgstr "" " c, u cruthaigh comhad speisialta den chineál `carachtar' (gan mhaolán)\n" " p cruthaigh FIFO\n" -#: src/mknod.c:151 +#: src/mknod.c:150 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:161 +#: src/mknod.c:160 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:177 +#: src/mknod.c:176 #, c-format msgid "block special files not supported" msgstr "Níl comhaid speisialta den chineál `bloc' ar fáil" -#: src/mknod.c:186 +#: src/mknod.c:185 #, c-format msgid "character special files not supported" msgstr "Níl comhaid speisialta den chineál `carachtar' ar fáil" -#: src/mknod.c:202 +#: src/mknod.c:201 #, c-format msgid "invalid major device number %s" msgstr "is neamhbhailí an phríomhuimhir ghléis %s" -#: src/mknod.c:207 +#: src/mknod.c:206 #, c-format msgid "invalid minor device number %s" msgstr "is neamhbhailí an mhionuimhir ghléis %s" -#: src/mknod.c:212 +#: src/mknod.c:211 #, c-format msgid "invalid device %s %s" msgstr "gléas neamhbhailí %s %s" -#: src/mknod.c:226 +#: src/mknod.c:225 #, c-format msgid "invalid device type %s" msgstr "gléas neamhbhailí %s" @@ -6281,62 +6323,61 @@ msgstr "" " é sin nó an chomhadlann a thugtar le -p; nó /tmp [i " "léig]\n" -#: src/mktemp.c:222 +#: 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:228 +#: src/mktemp.c:229 #, c-format msgid "too many templates" msgstr "an iomarca teimpléad" -#: src/mktemp.c:248 +#: src/mktemp.c:249 #, c-format msgid "with --suffix, template %s must end in X" msgstr "" -#: src/mktemp.c:273 src/split.c:1117 +#: src/mktemp.c:274 src/split.c:1130 #, fuzzy, c-format msgid "invalid suffix %s, contains directory separator" msgstr "teimpléad neamhbhailí, %s, tá deighilteoir comhadlainne ann" -#: src/mktemp.c:278 +#: src/mktemp.c:279 #, c-format msgid "too few X's in template %s" msgstr "easpa Xanna i dteimpléad %s" -#: src/mktemp.c:291 +#: src/mktemp.c:292 #, c-format msgid "invalid template, %s, contains directory separator" msgstr "teimpléad neamhbhailí, %s, tá deighilteoir comhadlainne ann" -#: src/mktemp.c:305 +#: src/mktemp.c:306 #, 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:325 +#: src/mktemp.c:326 #, 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:335 +#: src/mktemp.c:336 #, 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:290 -msgid "" -"Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" -"\n" +#: src/mv.c:292 +#, fuzzy +msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" msgstr "" "Athraigh ainm de FOINSE go SPRIOC, nó aistrigh FOINSE/Í go COMHADLANN.\n" "\n" # same stuff under cp, install, etc. --KPS -#: src/mv.c:297 +#: src/mv.c:298 #, fuzzy msgid "" " --backup[=CONTROL] make a backup of each existing destination " @@ -6354,7 +6395,7 @@ msgstr "" " -f, --force ná fiafraigh roimh fhorscríobh\n" " -i, --interactive fiafraigh roimh fhorscríobh\n" -#: src/mv.c:306 +#: src/mv.c:307 msgid "" " --strip-trailing-slashes remove any trailing slashes from each " "SOURCE\n" @@ -6365,7 +6406,7 @@ msgstr "" " FOINSE\n" " -S, --suffix=IARMHÍR sáraigh an gnáth-iarmhír cúltaca\n" -#: src/mv.c:311 +#: src/mv.c:312 msgid "" " -t, --target-directory=DIRECTORY move all SOURCE arguments into " "DIRECTORY\n" @@ -6390,13 +6431,11 @@ msgid "Usage: %s [OPTION] [COMMAND [ARG]...]\n" msgstr "Úsáid: %s [ROGHA] [ORDÚ [ARG]...]\n" #: src/nice.c:73 -#, c-format +#, fuzzy, c-format msgid "" "Run COMMAND with an adjusted niceness, which affects process scheduling.\n" -"With no COMMAND, print the current niceness. Nicenesses range from\n" -"%d (most favorable scheduling) to %d (least favorable).\n" -"\n" -" -n, --adjustment=N add integer N to the niceness (default 10)\n" +"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 "" "Rith ORDÚ le tosaíocht coigeartaithe chun sceidealadh na bpróiseas a athrú.\n" "Gan ORDÚ, taispeáin an tosaíocht reatha. Is féidir luachanna idir %d\n" @@ -6405,22 +6444,26 @@ msgstr "" " -n, --adjustment=N cuir an tslánuimhir N leis an tosaíocht " "(réamhshocrú=10)\n" -#: src/nice.c:168 +#: src/nice.c:82 +msgid " -n, --adjustment=N add integer N to the niceness (default 10)\n" +msgstr "" + +#: src/nice.c:172 #, c-format msgid "invalid adjustment %s" msgstr "coigeartú neamhbhailí %s" -#: src/nice.c:177 +#: src/nice.c:181 #, c-format msgid "a command must be given with an adjustment" msgstr "ní foláir ordú a thabhairt le coigeartú" -#: src/nice.c:184 src/nice.c:195 +#: src/nice.c:188 src/nice.c:199 #, c-format msgid "cannot get niceness" msgstr "níl an tosaíocht ar fáil" -#: src/nice.c:201 +#: src/nice.c:205 #, c-format msgid "cannot set niceness" msgstr "ní féidir an tosaíocht a shocrú" @@ -6430,17 +6473,17 @@ msgstr "ní féidir an tosaíocht a shocrú" msgid "Scott Bartram" msgstr "Scott Bartram" -#: src/nl.c:186 +#: 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" -"\n" msgstr "" "Scríobh gach COMHAD chuig an ghnáth-aschur, le líne-uimhreacha sa bhreis.\n" "Mura bhfuil COMHAD ann, nó más '-' é, léigh ón ghnáth-ionchur.\n" "\n" -#: src/nl.c:194 +#: src/nl.c:186 msgid "" " -b, --body-numbering=STYLE use STYLE for numbering body lines\n" " -d, --section-delimiter=CC use CC for separating logical pages\n" @@ -6450,7 +6493,7 @@ msgstr "" " -d, --section-delimiter=CAR Idirscar leathanaigh loighciúla le CAR\n" " -f, --footer-numbering=STÍL uimhrigh línte an bhuntáisc de réir STÍL\n" -#: src/nl.c:199 +#: src/nl.c:191 #, fuzzy msgid "" " -h, --header-numbering=STYLE use STYLE for numbering header lines\n" @@ -6471,7 +6514,7 @@ msgstr "" " -s, --number-separator=TEAGHRÁN cuir TEAGHRÁN isteach i ndiaidh\n" " líne-uimhir (fhéideartha)\n" -#: src/nl.c:207 +#: src/nl.c:199 #, fuzzy msgid "" " -v, --starting-line-number=NUMBER first line number on each logical page\n" @@ -6481,7 +6524,7 @@ msgstr "" " -w, --number-width=UIMHIR bain úsáid as UIMHIR colún do líne-" "uimhreacha\n" -#: src/nl.c:213 +#: src/nl.c:205 msgid "" "\n" "By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC are\n" @@ -6494,7 +6537,7 @@ msgstr "" "Má tá an dara carachtar ar iarraidh, glactar le :. Iontráil \\\\ do \\.\n" "Tá STÍL ar cheann de na roghanna seo a leanas:\n" -#: src/nl.c:219 +#: src/nl.c:211 msgid "" "\n" " a number all lines\n" @@ -6523,53 +6566,47 @@ msgstr "" " rz comhfhadaithe ar dheis, le nialais ar tosach\n" "\n" -#: src/nl.c:286 +#: src/nl.c:278 #, c-format msgid "line number overflow" msgstr "líne-uimhir thar maoil" -#: src/nl.c:486 +#: src/nl.c:478 #, c-format msgid "invalid header numbering style: %s" msgstr "stíl uimhrithe neamhbhailí do cheanntásca: %s" -#: src/nl.c:494 +#: src/nl.c:486 #, c-format msgid "invalid body numbering style: %s" msgstr "stíl uimhrithe neamhbhailí don chorp: %s" -#: src/nl.c:502 +#: src/nl.c:494 #, c-format msgid "invalid footer numbering style: %s" msgstr "stíl uimhrithe neamhbhailí do bhuntáisc: %s" -#: src/nl.c:511 +#: src/nl.c:503 #, c-format msgid "invalid starting line number: %s" msgstr "líne-uimhir imeachta neamhbhailí: %s" -#: src/nl.c:517 -#, fuzzy, c-format -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" - -#: src/nl.c:524 +#: src/nl.c:512 #, c-format msgid "invalid line number increment: %s" msgstr "incrimint líne-uimhreach neamhbhailí: %s" -#: src/nl.c:536 +#: src/nl.c:524 #, c-format msgid "invalid number of blank lines: %s" msgstr "líon na línte folmha neamhbhailí: %s" -#: src/nl.c:550 +#: src/nl.c:538 #, c-format msgid "invalid line number field width: %s" msgstr "réimseleithead líne-uimhreach neamhbhailí: %s" -#: src/nl.c:569 +#: src/nl.c:557 #, c-format msgid "invalid line numbering format: %s" msgstr "formáid líne-uimhreach neamhbhailí: %s" @@ -6620,11 +6657,6 @@ msgstr "níorbh fhéidir an gnáth-ionchur earráide a athsheoladh" msgid "ignoring input" msgstr "ag déanamh neamhshuim ar ionchur" -#: src/nohup.c:163 src/nohup.c:165 -#, c-format -msgid "failed to open %s" -msgstr "Ní féidir %s a oscailt" - #: src/nohup.c:175 #, c-format msgid "ignoring input and appending output to %s" @@ -6663,33 +6695,371 @@ msgid "failed to redirect standard error" msgstr "níorbh fhéidir an gnáth-ionchur earráide a athsheoladh" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:32 +#: src/nproc.c:33 msgid "Giuseppe Scrivano" msgstr "" -#: src/nproc.c:56 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 +#: src/nproc.c:57 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Úsáid: %s [ROGHA]...\n" -#: src/nproc.c:57 +#: src/nproc.c:58 msgid "" "Print the number of processing units available to the current process,\n" "which may be less than the number of online processors\n" "\n" msgstr "" -#: src/nproc.c:62 +#: src/nproc.c:63 msgid "" " --all print the number of installed processors\n" " --ignore=N if possible, exclude N processing units\n" msgstr "" -#: src/nproc.c:106 +#: src/nproc.c:107 #, fuzzy, c-format 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 +msgid "Assaf Gordon" +msgstr "" + +#: src/numfmt.c:676 +#, fuzzy, c-format +msgid "value too large to be converted: '%s'" +msgstr "%s: níl an luach tiontaithe ar fad" + +#: src/numfmt.c:680 +#, fuzzy, c-format +msgid "invalid number: '%s'" +msgstr "uimhir neamhbhailí %s" + +#: src/numfmt.c:684 +#, c-format +msgid "rejecting suffix in input: '%s' (consider using --from)" +msgstr "" + +#: src/numfmt.c:688 +#, fuzzy, c-format +msgid "invalid suffix in input: '%s'" +msgstr "iarmhír neamhbhailí in argóint %s%s: `%s'" + +#: src/numfmt.c:692 +#, c-format +msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)" +msgstr "" + +#: src/numfmt.c:723 +#, fuzzy, c-format +msgid "failed to prepare value '%Lf' for printing" +msgstr "%s: theip ar oscailt chun é a scríobh" + +#: src/numfmt.c:787 +#, fuzzy, c-format +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 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [NUMBER]...\n" +msgstr "Úsáid: %s [ROGHA]... [ÚSÁIDEOIR]...\n" + +#: src/numfmt.c:816 +msgid "" +"Reformat NUMBER(s), or the numbers from standard input if none are " +"specified.\n" +msgstr "" + +#: src/numfmt.c:820 +msgid " --debug print warnings about invalid input\n" +msgstr "" + +#: src/numfmt.c:823 +msgid "" +" -d, --delimiter=X use X instead of whitespace for field delimiter\n" +msgstr "" + +#: src/numfmt.c:826 +msgid "" +" --field=N replace the number in input field N (default is 1)\n" +msgstr "" + +#: src/numfmt.c:829 +msgid "" +" --format=FORMAT use printf style floating-point FORMAT;\n" +" see FORMAT below for details\n" +msgstr "" + +#: src/numfmt.c:833 +msgid "" +" --from=UNIT auto-scale input numbers to UNITs; default is " +"'none';\n" +" see UNIT below\n" +msgstr "" + +#: src/numfmt.c:837 +msgid "" +" --from-unit=N specify the input unit size (instead of the default " +"1)\n" +msgstr "" + +#: src/numfmt.c:840 +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 "" + +#: src/numfmt.c:844 +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 +msgid "" +" --invalid=MODE failure mode for invalid numbers: MODE can be:\n" +" abort (default), fail, warn, ignore\n" +msgstr "" + +#: src/numfmt.c:852 +msgid "" +" --padding=N pad the output to N characters; positive N will\n" +" right-align; negative N will left-align;\n" +" padding is ignored if the output is wider than N;\n" +" the default is to automatically pad if a " +"whitespace\n" +" is found\n" +msgstr "" + +#: src/numfmt.c:859 +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 +msgid "" +" --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" +" SUFFIX in input numbers\n" +msgstr "" + +#: src/numfmt.c:867 +msgid "" +" --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" +msgstr "" + +#: src/numfmt.c:870 +msgid "" +" --to-unit=N the output unit size (instead of the default 1)\n" +msgstr "" + +#: src/numfmt.c:877 +#, fuzzy +msgid "" +"\n" +"UNIT options:\n" +msgstr "" +"Roghanna sórtála:\n" +"\n" + +#: src/numfmt.c:880 +msgid " none no auto-scaling is done; suffixes will trigger an error\n" +msgstr "" + +#: src/numfmt.c:883 +msgid "" +" auto accept optional single/two letter suffix:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" +msgstr "" + +#: src/numfmt.c:889 +msgid "" +" si accept optional single letter suffix:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:894 +msgid "" +" iec accept optional single letter suffix:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:899 +msgid "" +" iec-i accept optional two-letter suffix:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:905 +#, 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" +msgstr "" + +#: src/numfmt.c:912 +#, c-format +msgid "" +"\n" +"Exit status is 0 if all input numbers were successfully converted.\n" +"By default, %s will stop at the first conversion error with exit status 2.\n" +"With --invalid='fail' a warning is printed for each conversion error\n" +"and the exit status is 2. With --invalid='warn' each conversion error is\n" +"diagnosed, but the exit status is 0. With --invalid='ignore' conversion\n" +"errors are not diagnosed and the exit status is 0.\n" +msgstr "" + +#: src/numfmt.c:921 +#, c-format +msgid "" +"\n" +"Examples:\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" +msgstr "" + +#: src/numfmt.c:974 src/seq.c:212 +#, 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 +#, fuzzy, c-format +msgid "invalid format %s (width overflow)" +msgstr "leithead neamhbhailí na formáide" + +#: src/numfmt.c:1007 src/seq.c:229 +#, c-format +msgid "format %s ends in %%" +msgstr "" + +#: src/numfmt.c:1010 +#, c-format +msgid "invalid format %s, directive must be %%['][-][N]f" +msgstr "" + +#: src/numfmt.c:1018 src/seq.c:236 +#, 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 "iarmhír neamhbhailí in argóint %s%s: `%s'" + +#: src/numfmt.c:1092 +#, c-format +msgid "value too large to be printed: '%Lg' (consider using --to)" +msgstr "" + +#: src/numfmt.c:1100 +#, c-format +msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" +msgstr "" + +#: src/numfmt.c:1184 +#, c-format +msgid "large input value '%s': possible precision loss" +msgstr "" + +#: src/numfmt.c:1293 +#, 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 "Raon neamhbhailí leathanach %s" + +#: src/numfmt.c:1401 +#, fuzzy, c-format +msgid "invalid field value '%s'" +msgstr "uimhir réimse neamhbhailí: `%s'" + +#: src/numfmt.c:1430 +#, fuzzy, c-format +msgid "invalid header value '%s'" +msgstr "dáta neamhbhailí %s" + +#: src/numfmt.c:1456 +#, 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 +#, fuzzy, c-format +msgid "no conversion option specified" +msgstr "sonraíodh roghanna -i iomadúla" + +#: src/numfmt.c:1471 +#, 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 +#, c-format +msgid "grouping has no effect in this locale" +msgstr "" + +#: src/numfmt.c:1486 +#, c-format +msgid "--header ignored with command-line input" +msgstr "" + +#: src/numfmt.c:1511 +#, fuzzy, c-format +msgid "error reading input" +msgstr "earráid agus %s á léamh" + +#: src/numfmt.c:1520 +#, 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" + #: src/od.c:294 #, c-format msgid "" @@ -6720,29 +7090,49 @@ msgstr "" "\n" #: src/od.c:307 -msgid "All arguments to long options are mandatory for short options.\n" +#, fuzzy +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" +"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" +"at first byte printed, incremented when dump is progressing.\n" +"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 "" -"Is riachtanach le rogha ghearr aon argóint atá riachtanach leis an rogha " -"fhada.\n" +"\n" +"Má tá an chéad fhormáid agus an dara formáid araon i bhfeidhm, glac leis\n" +"an dara ceann nuair a thosaíonn an t-oibreann deiridh le + nó (má tá dhá\n" +"oibreann ann) digit. Is ionann an t-oibreann FRITHÁIREAMH agus -j " +"FRITHÁIREAMH.\n" +"Is LIPÉAD an seoladh bréige ag an chéad bheart priontáilte, incrimintithe " +"le\n" +"linn na dumpála. Le haghaidh FRITHÁIREAMH agus LIPÉAD, comharthaíonn " +"réimír\n" +"0x nó 0X heicsidheachúlach; úsáid iarmhír `.' don ochtnártha agus `b' mar " +"512.\n" -#: src/od.c:310 +#: src/od.c:318 +#, fuzzy msgid "" -" -A, --address-radix=RADIX decide how file offsets are printed\n" +" -A, --address-radix=RADIX output format for file offsets. RADIX is one\n" +" of [doxn], for Decimal, Octal, Hex or None\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:314 +#: src/od.c:323 #, 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" -" --traditional accept arguments in traditional form\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=BEARTA teorannaigh dumpa le BEARTA beart ionchurtha\n" " -s, --strings[=BEARTA] teaghráin aschurtha le BEARTA carachtar\n" @@ -6752,9 +7142,11 @@ msgstr "" " -w, --width[=BEARTA] BEARTA beart ar líne aschuir\n" " --traditional glac le hargóintí san fhoirm thraidisiúnta\n" -#: src/od.c:324 +#: src/od.c:336 +#, fuzzy 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" @@ -6771,7 +7163,7 @@ msgstr "" " -d ar comhbhrí le `-t u2', roghnaigh aonaid dheachúlacha gan sín, 2 " "bheart\n" -#: src/od.c:332 +#: src/od.c:345 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -6788,33 +7180,12 @@ msgstr "" " -x ar comhbhrí le `-t x2', roghnaigh aonaid heicsidheachúlacha, 2 " "bheart\n" -#: src/od.c:340 +#: src/od.c:353 +#, fuzzy msgid "" "\n" -"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" -"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" -"at first byte printed, incremented when dump is progressing.\n" -"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" -"Má tá an chéad fhormáid agus an dara formáid araon i bhfeidhm, glac leis\n" -"an dara ceann nuair a thosaíonn an t-oibreann deiridh le + nó (má tá dhá\n" -"oibreann ann) digit. Is ionann an t-oibreann FRITHÁIREAMH agus -j " -"FRITHÁIREAMH.\n" -"Is LIPÉAD an seoladh bréige ag an chéad bheart priontáilte, incrimintithe " -"le\n" -"linn na dumpála. Le haghaidh FRITHÁIREAMH agus LIPÉAD, comharthaíonn " -"réimír\n" -"0x nó 0X heicsidheachúlach; úsáid iarmhír `.' don ochtnártha agus `b' mar " -"512.\n" - -#: src/od.c:349 -msgid "" "\n" "TYPE is made up of one or more of these specifications:\n" -"\n" " a named character, ignoring high-order bit\n" " c ASCII character or backslash escape\n" msgstr "" @@ -6824,7 +7195,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:356 +#: src/od.c:360 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -6838,10 +7209,11 @@ 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:363 +#: src/od.c:367 +#, fuzzy msgid "" "\n" -"SIZE is a number. For TYPE in doux, SIZE may also be C for\n" +"SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" "sizeof(char), S for sizeof(short), I for sizeof(int) or L for\n" "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" @@ -6852,44 +7224,37 @@ 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:370 -#, fuzzy +#: src/od.c:374 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" +"Adding a z suffix to any type displays printable characters at the end of\n" +"each output line.\n" 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. " -#: src/od.c:380 +#: src/od.c:379 #, 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" +"\n" +"\n" +"BYTES is hex with 0x or 0X prefix, and may have a multiplier suffix:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"and so on for G, T, P, E, Z, Y.\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" +"\n" +"Is féidir na hiarmhíreanna seo a leanas a chur i ndiaidh N:\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" -#: src/od.c:633 src/od.c:753 +#: src/od.c:639 src/od.c:759 #, c-format msgid "invalid type string %s" msgstr "teaghrán neamhbhailí cineáil %s" -#: src/od.c:643 +#: src/od.c:649 #, c-format msgid "" "invalid type string %s;\n" @@ -6898,7 +7263,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:764 +#: src/od.c:770 #, c-format msgid "" "invalid type string %s;\n" @@ -6907,37 +7272,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:822 +#: src/od.c:828 #, fuzzy, c-format msgid "invalid character '%c' in type string %s" msgstr "carachtar neamhbhailí `%c' i dteaghrán cineáil %s" -#: src/od.c:1047 +#: src/od.c:1053 #, 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:1603 +#: src/od.c:1609 #, 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:1729 +#: src/od.c:1735 #, 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:1804 +#: src/od.c:1810 #, 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:1825 +#: src/od.c:1831 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "is rómhór skip-bytes + read-bytes" -#: src/od.c:1868 +#: src/od.c:1874 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "rabhadh: leithead neamhbhailí %lu; bainfear úsáid as %d ina ionad" @@ -6953,18 +7318,18 @@ msgid "standard input is closed" msgstr "tá an gnáth-ionchur dúnta" #: 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" -"\n" msgstr "" "Scríobh, chuig an ghnáth-aschur, línte comhoiriúnacha go seicheamhach\n" "as gach COMHAD, scartha le TÁIB.\n" "Mura bhfuil COMHAD ann, nó más '-' é, léigh ón ghnáth-ionchur.\n" "\n" -#: src/paste.c:448 +#: 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" @@ -6973,7 +7338,7 @@ msgstr "" " -s, --serial greamaigh i ndiaidh a chéile, nach go " "comhuaineach\n" -#: src/paste.c:509 +#: src/paste.c:508 #, c-format msgid "delimiter list ends with an unescaped backslash: %s" msgstr "críochnaíonn liosta na dteormharcóirí le cúlslais gan éalúchán: %s" @@ -7034,80 +7399,80 @@ msgid "Kaveh Ghazi" msgstr "Kaveh Ghazi" #. TRANSLATORS: Real name is unknown; at most 19 characters. -#: src/pinky.c:250 +#: src/pinky.c:242 msgid " ???" msgstr "" #. TRANSLATORS: Idle time is unknown; at most 5 characters. -#: src/pinky.c:274 +#: src/pinky.c:266 msgid "?????" msgstr "" -#: src/pinky.c:323 +#: src/pinky.c:314 #, c-format msgid "Login name: " msgstr "Ainm logála isteach: " -#: src/pinky.c:326 +#: src/pinky.c:317 #, c-format msgid "In real life: " msgstr "I réaltacht: " #. TRANSLATORS: Real name is unknown; no hard limit. -#: src/pinky.c:330 +#: src/pinky.c:321 msgid "???\n" msgstr "???\n" -#: src/pinky.c:350 +#: src/pinky.c:341 #, c-format msgid "Directory: " msgstr "Comhadlann: " -#: src/pinky.c:352 +#: src/pinky.c:343 #, c-format msgid "Shell: " msgstr "Blaosc: " -#: src/pinky.c:371 +#: src/pinky.c:362 #, c-format msgid "Project: " msgstr "Tionscadal: " -#: src/pinky.c:395 +#: src/pinky.c:386 #, c-format msgid "Plan:\n" msgstr "Plean:\n" -#: src/pinky.c:414 +#: src/pinky.c:405 msgid "Login" msgstr "Logáil Isteach" -#: src/pinky.c:416 +#: src/pinky.c:407 msgid "Name" msgstr "Ainm" -#: src/pinky.c:417 +#: src/pinky.c:408 msgid " TTY" msgstr " TTY" -#: src/pinky.c:419 +#: src/pinky.c:410 msgid "Idle" msgstr "Díomhaoin" -#: src/pinky.c:420 +#: src/pinky.c:411 msgid "When" msgstr "Cathain" -#: src/pinky.c:423 +#: src/pinky.c:414 msgid "Where" msgstr "Cén Áit" -#: src/pinky.c:502 +#: src/pinky.c:493 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Úsáid: %s [ROGHA]... [ÚSÁIDEOIR]...\n" -#: src/pinky.c:503 +#: src/pinky.c:494 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7125,7 +7490,7 @@ msgstr "" " -p ná taispeáin an comhad plean i bhformáid fhada\n" " -s formáid achomair (réamhshocrú)\n" -#: src/pinky.c:511 +#: src/pinky.c:502 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7140,7 +7505,7 @@ msgstr "" " -q ná taispeáin ainm iomlán, cianóstach, nó am díomhaoin\n" " i bhformáid achomair\n" -#: src/pinky.c:520 +#: src/pinky.c:511 #, fuzzy, c-format msgid "" "\n" @@ -7151,7 +7516,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:604 +#: src/pinky.c:595 #, 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" @@ -7166,88 +7531,87 @@ msgstr "Pete TerMaat" msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:912 +#: src/pr.c:908 #, fuzzy, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "`--pages=AONÚ[:DEIREADH]' argóint ar iarraidh" -#: src/pr.c:914 +#: src/pr.c:910 #, fuzzy, c-format msgid "invalid page range %s" msgstr "Raon neamhbhailí leathanach %s" -#: src/pr.c:979 +#: src/pr.c:975 #, fuzzy, c-format msgid "'-l PAGE_LENGTH' invalid number of lines: %s" msgstr "`-l FAD' líon neamhbhailí na línte: %s" -#: src/pr.c:1003 +#: src/pr.c:999 #, fuzzy, c-format msgid "'-N NUMBER' invalid starting line number: %s" msgstr "`-N UIMHIR' líne-uimhir neamhbhailí thosaigh: %s" -#: src/pr.c:1015 +#: src/pr.c:1011 #, fuzzy, c-format msgid "'-o MARGIN' invalid line offset: %s" msgstr "`-o CIUMHAIS' fritháireamh neamhbhailí líne: %s" -#: src/pr.c:1056 +#: src/pr.c:1052 #, fuzzy, c-format msgid "'-w PAGE_WIDTH' invalid number of characters: %s" msgstr "`-w LEITHEAD' líon neamhbhailí carachtar: %s" -#: src/pr.c:1070 +#: src/pr.c:1066 #, fuzzy, c-format msgid "'-W PAGE_WIDTH' invalid number of characters: %s" msgstr "`-W LEITHEAD' líon neamhbhailí carachtar: %s" -#: src/pr.c:1100 +#: src/pr.c:1096 #, fuzzy, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "" "Ní cheadaítear líon na gcolún a shocrú le linn priontála go comhuaineach." -#: src/pr.c:1104 +#: src/pr.c:1100 #, fuzzy, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "Ní cheadaítear priontáil trasna agus go comhuaineach araon." -#: src/pr.c:1200 +#: src/pr.c:1196 #, fuzzy, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "`-%c' carachtair breise, nó uimhir neamhbhailí san argóint: %s" -#: src/pr.c:1304 +#: src/pr.c:1293 #, c-format msgid "page width too narrow" msgstr "leathanach róchúng" -#: src/pr.c:2369 +#: src/pr.c:2353 #, c-format msgid "starting page number %<PRIuMAX> exceeds page count %<PRIuMAX>" msgstr "" "tá an uimhir leathanach tosaigh %<PRIuMAX> níos mó ná líon na leathanach " "%<PRIuMAX>" -#: src/pr.c:2396 +#: src/pr.c:2380 #, fuzzy, c-format msgid "page number overflow" msgstr "Uimhir leathanaigh thar maoil" -#: src/pr.c:2401 +#: src/pr.c:2385 #, c-format msgid "Page %<PRIuMAX>" msgstr "Leathanach %<PRIuMAX>" -#: src/pr.c:2773 -msgid "" -"Paginate or columnate FILE(s) for printing.\n" -"\n" +#: src/pr.c:2757 +#, fuzzy +msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" "Uimhrigh leathanaigh nó colúin de CHOMHA(I)D le haghaidh priontála.\n" "\n" -#: src/pr.c:2780 +#: src/pr.c:2763 #, fuzzy msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" @@ -7264,7 +7628,7 @@ msgstr "" " mura bhfuil -a tugtha. Cothromaigh líon na línte sna\n" " colúin ar gach leathanach.\n" -#: src/pr.c:2788 +#: src/pr.c:2771 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7280,7 +7644,7 @@ msgstr "" " -d, --double-space\n" " spásáil dhúbailte\n" -#: src/pr.c:2796 +#: src/pr.c:2779 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7300,7 +7664,7 @@ msgstr "" " (le -F, úsáid ceanntásc leathanaigh de trí líne, nó,\n" " gan -F, de cúig líne agus le buntásc)\n" -#: src/pr.c:2806 +#: src/pr.c:2789 #, fuzzy msgid "" " -h, --header=HEADER\n" @@ -7324,7 +7688,7 @@ msgstr "" " colúin, socraigh deighilteoirí le --sep-string" "[=TEAGHRÁN]\n" -#: src/pr.c:2815 +#: src/pr.c:2798 #, fuzzy msgid "" " -l, --length=PAGE_LENGTH\n" @@ -7340,7 +7704,7 @@ msgstr "" " -m, --merge taispeáin na comhaid go comhuaineach, ceann sa cholún,\n" " teasc línte, ach cónaisc línte iomlána le -J\n" -#: src/pr.c:2822 +#: src/pr.c:2805 #, fuzzy msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" @@ -7358,7 +7722,7 @@ msgstr "" " crom ar áireamh le hUIMHIR ag an chéad líne den chéad\n" " leathanach priontáilte (féach ar +AONÚ)\n" -#: src/pr.c:2830 +#: src/pr.c:2813 #, fuzzy msgid "" " -o, --indent=MARGIN\n" @@ -7373,7 +7737,7 @@ msgstr "" " -r, --no-file-warnings\n" " ná taispeáin rabhadh mura féidir comhad a oscailt\n" -#: src/pr.c:2837 +#: src/pr.c:2820 #, fuzzy msgid "" " -s[CHAR], --separator[=CHAR]\n" @@ -7389,7 +7753,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:2844 +#: src/pr.c:2827 #, fuzzy msgid "" " -S[STRING], --sep-string[=STRING]\n" @@ -7406,7 +7770,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:2851 +#: src/pr.c:2834 #, fuzzy msgid "" " -T, --omit-pagination\n" @@ -7429,7 +7793,7 @@ msgstr "" " leithead an leathanaigh = LEITHEAD (72) carachtar\n" " d'aschur ilcholúnach, stopann -s[car] é seo (72)\n" -#: src/pr.c:2861 +#: src/pr.c:2844 #, fuzzy msgid "" " -W, --page-width=PAGE_WIDTH\n" @@ -7444,7 +7808,7 @@ msgstr "" "isteach\n" " ar na roghanna -S nó -s\n" -#: src/pr.c:2869 +#: src/pr.c:2852 #, fuzzy msgid "" "\n" @@ -7605,15 +7969,15 @@ msgstr "" " nó: %s -G [ROGHA]... [IONCHUR [ASCHUR]]\n" #: src/ptx.c:1821 +#, fuzzy msgid "" "Output a permuted index, including context, of the words in the input " "files.\n" -"\n" msgstr "" "Cuir as innéacs iomalartaithe, le comhthéacs, de na focail sna hinchomhaid.\n" "\n" -#: src/ptx.c:1828 +#: src/ptx.c:1827 #, fuzzy msgid "" " -A, --auto-reference output automatically generated references\n" @@ -7624,7 +7988,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:1833 +#: src/ptx.c:1832 #, fuzzy msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" @@ -7640,7 +8004,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:1840 +#: src/ptx.c:1839 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -7657,7 +8021,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:1848 +#: src/ptx.c:1847 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -7668,7 +8032,7 @@ msgstr "" " -t, --typeset-mode - neamhchríochnaithe -\n" " -w, --width=UIMHIR leithead an aschuir, gan tagairt\n" -#: src/ptx.c:1855 +#: src/ptx.c:1854 #, fuzzy msgid "" "\n" @@ -7678,7 +8042,7 @@ msgstr "" "Mura bhfuil COMHAD ann, nó más '-' é,\n" "léigh ón ghnáth-ionchur. `-F /' mar réamhshocrú.\n" -#: src/ptx.c:1949 +#: src/ptx.c:1948 #, c-format msgid "invalid gap width: %s" msgstr "leithead neamhbhailí bearna: %s" @@ -7702,7 +8066,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "theip ar chdir go dtí an chomhadlann %s" -#: src/pwd.c:170 src/pwd.c:277 +#: src/pwd.c:170 src/pwd.c:277 src/split.c:373 #, c-format msgid "failed to stat %s" msgstr "theip ar stat %s" @@ -7718,14 +8082,15 @@ msgid "ignoring non-option arguments" msgstr "ag déanamh neamhshuim ar argóintí nach roghanna iad" #. This is a proper name. See the gettext manual, section Names. -#: src/readlink.c:33 +#: src/readlink.c:32 msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 +#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147 +#: src/stat.c:1349 src/touch.c:212 #, c-format -msgid "Usage: %s [OPTION]... FILE\n" -msgstr "Úsáid: %s [ROGHA]... COMHAD\n" +msgid "Usage: %s [OPTION]... FILE...\n" +msgstr "Úsáid: %s [ROGHA]... COMHAD...\n" #: src/readlink.c:63 #, fuzzy @@ -7758,16 +8123,19 @@ msgstr "" " ní mór gach comhpháirt a bheith ann\n" #: src/readlink.c:75 +#, fuzzy msgid "" " -m, --canonicalize-missing canonicalize by following every symlink in\n" " every component of the given name " "recursively,\n" " without requirements on components " "existence\n" -" -n, --no-newline do not output the trailing newline\n" +" -n, --no-newline do not output the trailing delimiter\n" " -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" msgstr "" " -m, --canonicalize-missing caighdeánaigh trí leanúint gach nasc " "siombalach\n" @@ -7778,11 +8146,10 @@ msgstr "" " -s, --silent múch formhór na n-earráidí\n" " -v, --verbose taispeáin earráidí\n" -#: src/realpath.c:71 src/rm.c:134 src/shred.c:147 src/stat.c:1330 -#: src/touch.c:215 -#, c-format -msgid "Usage: %s [OPTION]... FILE...\n" -msgstr "Úsáid: %s [ROGHA]... COMHAD...\n" +#: src/readlink.c:152 +#, fuzzy, c-format +msgid "ignoring --no-newline with multiple arguments" +msgstr "ag déanamh neamhshuim ar argóintí nach roghanna iad" #: src/realpath.c:72 msgid "" @@ -7809,12 +8176,12 @@ msgstr "" msgid "generating relative path" msgstr "" -#: src/remove.c:286 +#: src/remove.c:273 #, c-format msgid "%s: descend into write-protected directory %s? " msgstr "%s: téigh síos isteach i gcomhadlann scríobh-bhactha %s? " -#: src/remove.c:287 +#: src/remove.c:274 #, c-format msgid "%s: descend into directory %s? " msgstr "%s: téigh síos isteach i gcomhadlann %s? " @@ -7823,49 +8190,49 @@ msgstr "%s: téigh síos isteach i gcomhadlann %s? " #. translate "%s: remove %s (write-protected) %s? " #. instead. It should avoid grammatical problems #. with the output of file_type. -#: src/remove.c:303 +#: src/remove.c:290 #, c-format msgid "%s: remove write-protected %s %s? " msgstr "%s: scrios %s scríobh-bhactha %s? " -#: src/remove.c:304 +#: src/remove.c:291 #, c-format msgid "%s: remove %s %s? " msgstr "%s: scrios %s %s? " -#: src/remove.c:417 +#: src/remove.c:374 #, c-format msgid "removed directory: %s\n" msgstr "scriosadh comhadlann %s\n" -#: src/remove.c:481 +#: src/remove.c:444 #, fuzzy, c-format msgid "cannot remove directory: %s" msgstr "ní féidir comhadlann %s a scriosadh" -#: src/remove.c:537 +#: src/remove.c:500 #, 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:557 +#: src/remove.c:520 #, fuzzy, c-format msgid "traversal failed: %s" msgstr "theip ar léamh" -#: src/remove.c:563 +#: src/remove.c:526 #, c-format msgid "" "unexpected failure: fts_info=%d: %s\n" "please report to %s" msgstr "" -#: src/rm.c:118 +#: src/rm.c:119 #, fuzzy, c-format msgid "Try '%s ./%s' to remove the file %s.\n" msgstr "Bain triail as `%s ./%s' chun an comhad %s a bhaint.\n" -#: src/rm.c:135 +#: src/rm.c:136 #, fuzzy msgid "" "Remove (unlink) the FILE(s).\n" @@ -7880,7 +8247,7 @@ msgstr "" " ná tabhair leid riamh\n" " -i tabhair leid sula mbainfear aon rud\n" -#: src/rm.c:141 +#: src/rm.c:142 msgid "" " -I prompt once before removing more than three files, " "or\n" @@ -7899,7 +8266,7 @@ msgstr "" "I), nó\n" " always (-i). Gan CATHAIN, tabhair leid i gcónaí\n" -#: src/rm.c:148 +#: src/rm.c:149 msgid "" " --one-file-system when removing a hierarchy recursively, skip any\n" " directory that is on a file system different from\n" @@ -7910,12 +8277,13 @@ msgstr "" " ionann leis an gceann a sonraíodh in argóint ar\n" " líne na n-orduithe\n" -#: src/rm.c:153 +#: src/rm.c:154 #, fuzzy msgid "" " --no-preserve-root do not treat '/' specially\n" " --preserve-root do not remove '/' (default)\n" " -r, -R, --recursive remove directories and their contents recursively\n" +" -d, --dir remove empty directories\n" " -v, --verbose explain what is being done\n" msgstr "" " --no-preserve-root ná tabhair cóir speisialta do `/'\n" @@ -7923,7 +8291,7 @@ msgstr "" " -r, -R, --recursive bain comhadlanna agus a n-inneachar go hathchúrsach\n" " -v, --verbose mínigh na rudaí atá ag tarlú\n" -#: src/rm.c:161 +#: src/rm.c:163 msgid "" "\n" "By default, rm does not remove directories. Use the --recursive (-r or -R)\n" @@ -7936,7 +8304,7 @@ msgstr "" "éineacht\n" "le gach rud atá isteach iontu.\n" -#: src/rm.c:166 +#: src/rm.c:168 #, fuzzy, c-format msgid "" "\n" @@ -7953,7 +8321,7 @@ msgstr "" "\n" " %s ./-foo\n" -#: src/rm.c:175 +#: src/rm.c:177 #, fuzzy msgid "" "\n" @@ -7966,12 +8334,12 @@ msgstr "" "scriosta le `rm'. Más mian leat na hábhair a scriosadh níos cinnte,\n" "bain úsáid as `shred'.\n" -#: src/rm.c:335 +#: src/rm.c:342 #, c-format msgid "%s: remove all arguments recursively? " msgstr "%s: bain gach argóint go hathchúrsach? " -#: src/rm.c:336 +#: src/rm.c:343 #, c-format msgid "%s: remove all arguments? " msgstr "%s: bain gach argóint? " @@ -8033,7 +8401,11 @@ msgstr "" msgid "" "Run a program in a different security context.\n" "With neither CONTEXT nor COMMAND, print the current security context.\n" -"\n" +msgstr "" + +#: src/runcon.c:94 +#, fuzzy +msgid "" " CONTEXT Complete security context\n" " -c, --compute compute process transition context before modifying\n" " -t, --type=TYPE type (for same role as parent)\n" @@ -8053,72 +8425,72 @@ msgstr "" " -l, --range=RAON raon leibhéal\n" "\n" -#: src/runcon.c:140 +#: src/runcon.c:144 #, c-format msgid "multiple roles" msgstr "il-rólanna" -#: src/runcon.c:145 +#: src/runcon.c:149 #, c-format msgid "multiple types" msgstr "ilchineálacha" -#: src/runcon.c:150 +#: src/runcon.c:154 #, c-format msgid "multiple users" msgstr "ilúsáideoirí" -#: src/runcon.c:155 +#: src/runcon.c:159 #, c-format msgid "multiple levelranges" msgstr "ilraonta leibhéil" -#: src/runcon.c:173 src/runcon.c:209 +#: src/runcon.c:177 src/runcon.c:213 #, c-format msgid "failed to get current context" msgstr "níorbh fhéidir an comhthéacs reatha a fháil" -#: src/runcon.c:183 +#: src/runcon.c:187 #, c-format msgid "you must specify -c, -t, -u, -l, -r, or context" msgstr "caithfidh tú -c, -t, -u, -l, -r, nó comhthéacs a shonrú" -#: src/runcon.c:191 +#: src/runcon.c:195 #, c-format msgid "no command specified" msgstr "níor sonraíodh ordú ar bith" -#: src/runcon.c:197 +#: src/runcon.c:201 #, 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:223 +#: src/runcon.c:227 #, c-format msgid "failed to compute a new context" msgstr "theip ar chomhthéacs nua a chruthú" -#: src/runcon.c:237 +#: src/runcon.c:241 #, c-format msgid "failed to set new user %s" msgstr "níorbh fhéidir úsáideoir nua %s a shocrú" -#: src/runcon.c:239 +#: src/runcon.c:243 #, c-format msgid "failed to set new type %s" msgstr "theip ar chineál nua %s a shocrú" -#: src/runcon.c:241 +#: src/runcon.c:245 #, c-format msgid "failed to set new range %s" msgstr "theip ar raon nua %s a shocrú" -#: src/runcon.c:243 +#: src/runcon.c:247 #, c-format msgid "failed to set new role %s" msgstr "theip ar ról nua %s a shocrú" -#: src/runcon.c:251 +#: src/runcon.c:255 #, c-format msgid "unable to set security context %s" msgstr "ní féidir comhthéacs slándála %s a shocrú" @@ -8135,9 +8507,12 @@ msgstr "" " nó: %s [ROGHA]... AONÚ INCRIMINT DEIREADH\n" #: src/seq.c:73 +msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" +msgstr "" + +#: src/seq.c:79 +#, fuzzy msgid "" -"Print numbers from FIRST to LAST, in steps of INCREMENT.\n" -"\n" " -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" @@ -8149,7 +8524,7 @@ msgstr "" "\\n)\n" " -w, --equal-width cothromaigh leithead le nialais tosaigh\n" -#: src/seq.c:82 +#: src/seq.c:86 msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" @@ -8167,7 +8542,7 @@ msgstr "" "DEIREADH, agus tá INCRIMINT diúltach de ghnáth má tá AONÚ níos mó ná " "DEIREADH.\n" -#: src/seq.c:90 +#: src/seq.c:94 #, fuzzy msgid "" "FORMAT must be suitable for printing one argument of type 'double';\n" @@ -8180,32 +8555,17 @@ 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:136 +#: src/seq.c:140 #, c-format msgid "invalid floating point argument: %s" msgstr "argóint neamhbhailí shnámhphointe: %s" -#: src/seq.c:193 -#, fuzzy, c-format -msgid "format %s has no %% directive" -msgstr "ní comhadlann é an sprioc-chomhad %s" - -#: src/seq.c:210 -#, c-format -msgid "format %s ends in %%" -msgstr "" - -#: src/seq.c:213 +#: src/seq.c:232 #, fuzzy, c-format msgid "format %s has unknown %%%c directive" msgstr "tá %s de chineál anaithnid" -#: src/seq.c:217 -#, c-format -msgid "format %s has too many %% directives" -msgstr "" - -#: src/seq.c:431 +#: src/seq.c:555 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" @@ -8249,27 +8609,27 @@ msgstr "" " agus (má thugtar iad) na haitheantais forlíontacha go " "GID1,...\n" -#: src/setuidgid.c:163 +#: src/setuidgid.c:162 #, c-format msgid "unknown user-ID: %s" msgstr "Aitheantas úsáideora anaithnid: %s" -#: src/setuidgid.c:174 +#: 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:191 +#: 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:201 +#: 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:205 +#: src/setuidgid.c:204 #, c-format msgid "cannot set user-ID to %lu" msgstr "ní féidir aitheantas úsáideora a shocrú mar %lu" @@ -8280,16 +8640,16 @@ msgid "Colin Plumb" msgstr "Colin Plumb" #: src/shred.c:148 +#, 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" -"\n" msgstr "" "Forscríobh an COMHA(I)D arís agus arís eile chun go bhfuil sé níos\n" "deacra na sonraí a fháil ar ais, fiú le crua-earraí an-chostasacha.\n" "\n" -#: src/shred.c:156 +#: src/shred.c:155 #, fuzzy, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -8303,7 +8663,7 @@ 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:162 +#: src/shred.c:161 msgid "" " -u, --remove truncate and remove file after overwriting\n" " -v, --verbose show progress\n" @@ -8317,7 +8677,7 @@ 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:171 +#: src/shred.c:170 msgid "" "\n" "If FILE is -, shred standard output.\n" @@ -8338,7 +8698,7 @@ msgstr "" "an rogha --remove go hiondúil le gnáthchomhaid.\n" "\n" -#: src/shred.c:181 +#: src/shred.c:180 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" @@ -8355,7 +8715,7 @@ msgstr "" "sé cumasach i ngach mód ar na córais a leanas:\n" "\n" -#: src/shred.c:189 +#: src/shred.c:188 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -8377,7 +8737,7 @@ msgstr "" "Network Appliances\n" "\n" -#: src/shred.c:199 +#: src/shred.c:198 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -8391,7 +8751,7 @@ msgstr "" "* córais chomhad comhbhrúite\n" "\n" -#: src/shred.c:206 +#: src/shred.c:205 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" @@ -8412,7 +8772,7 @@ msgstr "" "mount (`man mount').\n" "\n" -#: src/shred.c:216 +#: src/shred.c:215 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" @@ -8422,124 +8782,124 @@ 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:296 +#: src/shred.c:295 #, c-format msgid "%s: fdatasync failed" msgstr "%s: theip ar fdatasync" -#: src/shred.c:307 +#: src/shred.c:306 #, c-format msgid "%s: fsync failed" msgstr "%s: theip ar fsync" -#: src/shred.c:384 +#: src/shred.c:383 #, c-format msgid "%s: cannot rewind" msgstr "%s: ní féidir atochras" -#: src/shred.c:403 +#: src/shred.c:402 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: timthriall %lu/%lu (%s)..." -#: src/shred.c:453 +#: src/shred.c:452 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: earráid le linn scríobh ag fritháireamh %s" -#: src/shred.c:471 +#: src/shred.c:470 #, c-format msgid "%s: lseek failed" msgstr "%s: theip ar lseek" -#: src/shred.c:482 +#: src/shred.c:481 #, c-format msgid "%s: file too large" msgstr "%s: tá an comhad rómhór" -#: src/shred.c:505 +#: src/shred.c:504 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: timthriall %lu/%lu (%s)...%s" -#: src/shred.c:521 +#: src/shred.c:520 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: timthriall %lu/%lu (%s)...%s/%s %d%%" -#: src/shred.c:768 +#: src/shred.c:767 #, c-format msgid "%s: fstat failed" msgstr "%s: theip ar fstat" # in FARF -KPS -#: src/shred.c:779 +#: src/shred.c:778 #, c-format msgid "%s: invalid file type" msgstr "%s: cineál comhaid neamhbhailí" -#: src/shred.c:798 +#: src/shred.c:797 #, c-format msgid "%s: file has negative size" msgstr "%s: comhad de mhéid diúltach" -#: src/shred.c:865 +#: src/shred.c:864 src/sort.c:932 src/split.c:378 #, c-format msgid "%s: error truncating" msgstr "%s: earráid le linn teasctha" -#: src/shred.c:881 +#: src/shred.c:880 #, c-format msgid "%s: fcntl failed" msgstr "%s: theip ar fcntl" # file descriptor in FARF -KPS -#: src/shred.c:886 +#: src/shred.c:885 #, 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:968 +#: src/shred.c:967 #, c-format msgid "%s: removing" msgstr "%s: á scriosadh" -#: src/shred.c:992 +#: src/shred.c:991 #, c-format msgid "%s: renamed to %s" msgstr "%s: ainm nua %s" -#: src/shred.c:1014 +#: src/shred.c:1013 #, c-format msgid "%s: failed to remove" msgstr "%s: theip ar bhaint" -#: src/shred.c:1018 +#: src/shred.c:1017 #, c-format msgid "%s: removed" msgstr "%s: scriosta" -#: src/shred.c:1025 src/shred.c:1068 +#: src/shred.c:1024 src/shred.c:1067 #, c-format msgid "%s: failed to close" msgstr "%s: theip ar dhúnadh" -#: src/shred.c:1061 +#: src/shred.c:1060 #, c-format msgid "%s: failed to open for writing" msgstr "%s: theip ar oscailt chun é a scríobh" -#: src/shred.c:1126 +#: src/shred.c:1125 #, c-format msgid "%s: invalid number of passes" msgstr "%s: líon na dtimthriallta neamhbhailí" -#: src/shred.c:1135 src/shuf.c:291 src/sort.c:4387 +#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441 #, c-format msgid "multiple random sources specified" msgstr "sonraíodh foinsí iomadúla randamacha" -#: src/shred.c:1149 +#: src/shred.c:1148 #, c-format msgid "%s: invalid file size" msgstr "%s: méid comhaid neamhbhailí" @@ -8556,14 +8916,13 @@ msgstr "" " nó: %s -i ÍSEAL-ARD [ROGHA]...\n" #: src/shuf.c:54 -msgid "" -"Write a random permutation of the input lines to standard output.\n" -"\n" +#, 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:61 +#: src/shuf.c:60 #, fuzzy msgid "" " -e, --echo treat each ARG as an input line\n" @@ -8585,27 +8944,27 @@ msgstr "" " -z, --zero-terminated cuir beart nialasach ag deireadh na línte,\n" " in ionad líne nua\n" -#: src/shuf.c:245 +#: src/shuf.c:244 #, c-format msgid "multiple -i options specified" msgstr "sonraíodh roghanna -i iomadúla" -#: src/shuf.c:265 +#: src/shuf.c:264 #, c-format msgid "invalid input range %s" msgstr "raon neamhbhailí ionchurtha: %s" -#: src/shuf.c:278 +#: src/shuf.c:277 #, c-format msgid "invalid line count %s" msgstr "líon neamhbhailí línte %s" -#: src/shuf.c:285 src/sort.c:4381 +#: src/shuf.c:284 src/sort.c:4435 #, c-format msgid "multiple output files specified" msgstr "aschomhaid iomadúla" -#: src/shuf.c:311 +#: src/shuf.c:310 #, c-format msgid "cannot combine -e and -i options" msgstr "ní féidir roghanna -e agus -i a chumasc" @@ -8633,7 +8992,7 @@ msgstr "" "den luach iomlán.\n" "\n" -#: src/sleep.c:135 src/timeout.c:295 +#: src/sleep.c:135 src/timeout.c:320 #, c-format msgid "invalid time interval %s" msgstr "tréimhse neamhbhailí %s" @@ -8643,16 +9002,15 @@ msgstr "tréimhse neamhbhailí %s" msgid "cannot read realtime clock" msgstr "ní féidir an clog fhíor-ama a léamh" -#: src/sort.c:395 -msgid "" -"Write sorted concatenation of all FILE(s) to standard output.\n" -"\n" +#: src/sort.c:399 +#, fuzzy +msgid "Write sorted concatenation of all FILE(s) to standard output.\n" msgstr "" "Scríobh gach COMHAD, comhchaitéinithe agus sórtáilte, go dtí an gnáth-" "aschur.\n" "\n" -#: src/sort.c:402 +#: src/sort.c:405 msgid "" "Ordering options:\n" "\n" @@ -8660,7 +9018,7 @@ msgstr "" "Roghanna sórtála:\n" "\n" -#: src/sort.c:406 +#: src/sort.c:409 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -8672,19 +9030,19 @@ msgstr "" "uimhriúla\n" " -f, --ignore-case sórtáil an cás íochtair leis an gcás uachtair\n" -#: src/sort.c:412 +#: src/sort.c:415 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:417 +#: src/sort.c:420 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" -#: src/sort.c:420 +#: src/sort.c:423 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -8692,7 +9050,7 @@ msgid "" " -r, --reverse reverse the result of comparisons\n" msgstr "" -#: src/sort.c:426 +#: src/sort.c:429 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -8702,7 +9060,7 @@ msgid "" "\n" msgstr "" -#: src/sort.c:434 +#: src/sort.c:437 #, fuzzy msgid "" "Other options:\n" @@ -8711,13 +9069,13 @@ msgstr "" "Roghanna sórtála:\n" "\n" -#: src/sort.c:438 +#: src/sort.c:441 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" msgstr "" -#: src/sort.c:442 +#: src/sort.c:445 #, fuzzy msgid "" " -c, --check, --check=diagnose-first check for sorted input; do not sort\n" @@ -8737,7 +9095,7 @@ msgstr "" " -m, --merge cumaisc comhaid atá sórtáilte cheana; ná " "sórtáil\n" -#: src/sort.c:449 +#: src/sort.c:452 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -8746,13 +9104,13 @@ msgid "" " If F is - then read names from standard input\n" msgstr "" -#: src/sort.c:456 +#: src/sort.c:459 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:460 +#: src/sort.c:463 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -8765,7 +9123,7 @@ msgstr "" " sórtála den rogha dheireanach\n" " -S, --buffer-size=MÉID maolán príomhchuimhne = MÉID\n" -#: src/sort.c:466 +#: src/sort.c:469 #, fuzzy, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -8788,11 +9146,11 @@ 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:475 +#: 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:480 +#: src/sort.c:483 #, fuzzy msgid "" "\n" @@ -8824,7 +9182,7 @@ msgstr "" "\n" "Is féidir na hiarmhíreanna seo a leanas a chur i ndiaidh MÉID:\n" -#: src/sort.c:493 +#: src/sort.c:496 msgid "" "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n" "\n" @@ -8844,132 +9202,132 @@ 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:694 +#: src/sort.c:697 #, c-format msgid "waiting for %s [-d]" msgstr "ag feitheamh le %s [-d]" -#: src/sort.c:699 +#: src/sort.c:702 #, c-format msgid "%s [-d] terminated abnormally" msgstr "Chríochnaigh %s [-d] gan an chúis a mhíniú" -#: src/sort.c:853 +#: src/sort.c:856 #, fuzzy, c-format msgid "cannot create temporary file in %s" msgstr "ní féidir comhad sealadach %s a chruthú" -#: src/sort.c:939 src/sort.c:2010 src/sort.c:3056 src/sort.c:3755 -#: src/sort.c:3758 +#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713 +#: src/sort.c:3804 src/sort.c:3807 msgid "open failed" msgstr "theip ar oscailt" -#: src/sort.c:959 +#: src/sort.c:970 msgid "fflush failed" msgstr "theip ar fflush" -#: src/sort.c:964 src/sort.c:2013 src/sort.c:4646 +#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706 msgid "close failed" msgstr "theip ar dhúnadh" -#: src/sort.c:973 +#: src/sort.c:986 #, c-format msgid "dup2 failed" msgstr "theip ar dup2" -#: src/sort.c:1090 +#: src/sort.c:1103 #, c-format msgid "couldn't execute %s" msgstr "níorbh fhéidir %s a rith" -#: src/sort.c:1097 +#: src/sort.c:1110 msgid "couldn't create temporary file" msgstr "níorbh fhéidir comhad sealadach a chruthú" -#: src/sort.c:1136 +#: src/sort.c:1149 #, 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:1150 +#: src/sort.c:1161 #, c-format msgid "couldn't execute %s -d" msgstr "níorbh fhéidir %s -d a rith" -#: src/sort.c:1209 +#: src/sort.c:1220 #, c-format msgid "warning: cannot remove: %s" msgstr "rabhadh: ní féidir %s a scriosadh" -#: src/sort.c:1295 +#: src/sort.c:1306 #, fuzzy, c-format msgid "invalid --%s argument %s" msgstr "argóint neamhbhailí %s" -#: src/sort.c:1298 +#: src/sort.c:1309 #, fuzzy, c-format msgid "minimum --%s argument is %s" msgstr "argóint neamhbhailí %s%s: `%s'" -#: src/sort.c:1313 +#: src/sort.c:1324 #, fuzzy, c-format msgid "--%s argument %s too large" msgstr "argóint %s%s rómhór: `%s'" -#: src/sort.c:1316 +#: src/sort.c:1327 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "" -#: src/sort.c:1398 +#: src/sort.c:1409 #, c-format msgid "number in parallel must be nonzero" msgstr "" -#: src/sort.c:1479 +#: src/sort.c:1494 msgid "stat failed" msgstr "stat() teipthe" -#: src/sort.c:1740 +#: src/sort.c:1755 msgid "read failed" msgstr "theip ar léamh" -#: src/sort.c:2028 +#: src/sort.c:2043 #, c-format msgid "string transformation failed" msgstr "theip ar thiontú teaghráin" -#: src/sort.c:2031 +#: src/sort.c:2046 #, fuzzy, c-format msgid "the untransformed string was %s" msgstr "Ba é %s an teaghrán gan trasfhoirmiú." -#: src/sort.c:2194 +#: src/sort.c:2209 #, c-format msgid "^ no match for key\n" msgstr "" -#: src/sort.c:2374 +#: src/sort.c:2389 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "" -#: src/sort.c:2380 +#: src/sort.c:2395 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "" -#: src/sort.c:2391 +#: src/sort.c:2406 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" -#: src/sort.c:2404 +#: src/sort.c:2419 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "" -#: src/sort.c:2436 +#: src/sort.c:2451 #, fuzzy, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" @@ -8979,135 +9337,139 @@ 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" -#: src/sort.c:2442 +#: src/sort.c:2457 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "" -#: src/sort.c:2716 src/sort.c:2725 +#: src/sort.c:2731 src/sort.c:2740 msgid "write failed" msgstr "theip ar scríobh" -#: src/sort.c:2768 +#: src/sort.c:2783 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: mí-eagar: " -#: src/sort.c:2771 +#: src/sort.c:2786 msgid "standard error" msgstr "gnáth-aschur earráide" -#: src/sort.c:3926 +#: src/sort.c:3698 +#, fuzzy +msgid "cannot read" +msgstr "%s: ní féidir atochras" + +#: src/sort.c:3976 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: sonraíocht neamhbhailí réimse %s" -#: src/sort.c:3937 +#: src/sort.c:3987 #, fuzzy, c-format msgid "options '-%s' are incompatible" msgstr "níl na roghanna `-%s' comhoiriúnach" -#: src/sort.c:3988 +#: src/sort.c:4038 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s: áireamh neamhbhailí ag tús %s" -#: src/sort.c:4245 +#: src/sort.c:4295 #, fuzzy msgid "invalid number after '-'" msgstr "uimhir neamhbhailí i ndiaidh `-'" -#: src/sort.c:4248 src/sort.c:4334 src/sort.c:4362 +#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416 #, fuzzy msgid "invalid number after '.'" msgstr "uimhir neamhbhailí i ndiaidh `.'" -#: src/sort.c:4261 src/sort.c:4367 +#: src/sort.c:4315 src/sort.c:4421 msgid "stray character in field spec" msgstr "carachtar ar seachrán i sonrú réimse" -#: src/sort.c:4308 +#: src/sort.c:4362 #, c-format msgid "multiple compress programs specified" msgstr "sonraíodh cláir iomadúla chomhbhrúite" -#: src/sort.c:4325 +#: src/sort.c:4379 msgid "invalid number at field start" msgstr "uimhir neamhbhailí ag tús réimse" -#: src/sort.c:4329 src/sort.c:4357 +#: src/sort.c:4383 src/sort.c:4411 msgid "field number is zero" msgstr "is nialas an uimhir réimse" -#: src/sort.c:4338 +#: src/sort.c:4392 msgid "character offset is zero" msgstr "is nialas an fritháireamh carachtair" -#: src/sort.c:4353 +#: src/sort.c:4407 #, fuzzy msgid "invalid number after ','" msgstr "uimhir neamhbhailí i ndiaidh `,'" -#: src/sort.c:4403 +#: src/sort.c:4457 #, c-format msgid "empty tab" msgstr "táb folamh" -#: src/sort.c:4496 src/wc.c:692 +#: src/sort.c:4550 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:4518 +#: src/sort.c:4572 #, fuzzy, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "ainm neamhbhailí comhaid: folamh" -#: src/sort.c:4524 +#: src/sort.c:4578 #, fuzzy, c-format msgid "no input from %s" msgstr "inchomhad %s á dhúnadh" -#: src/sort.c:4570 +#: src/sort.c:4624 #, c-format msgid "using %s sorting rules" msgstr "" -#: src/sort.c:4573 +#: src/sort.c:4627 #, c-format msgid "using simple byte comparison" msgstr "" -#: src/sort.c:4604 +#: src/sort.c:4658 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "ní cheadaítear oibreann breise %s le -%c" -#: src/split.c:184 +#: src/split.c:187 #, c-format msgid "the suffix length needs to be at least %zu" msgstr "" -#: src/split.c:201 +#: src/split.c:204 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" msgstr "Úsáid: %s [ROGHA] [IONCHUR [RÉIMÍR]]\n" -#: src/split.c:205 +#: src/split.c:208 #, fuzzy 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" -"\n" msgstr "" "Scríobh píosaí de mhéid sheasta ó IONCHUR chuig RÉIMÍRaa, RÉIMÍRab, ...;\n" "Méid réamhshocraithe = 1000 líne, agus an RÉIMÍR réamhshocraithe = `x'.\n" "Mura bhfuil IONCHUR ann, nó más `-' é, léigh ón ghnáth-ionchur.\n" "\n" -#: src/split.c:214 +#: src/split.c:216 #, fuzzy, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" @@ -9132,7 +9494,7 @@ msgstr "" " -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:227 +#: src/split.c:229 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" @@ -9140,7 +9502,7 @@ msgstr "" " --verbose taispeáin diagnóisic go díreach roimh atá\n" " gach aschomhad oscailte\n" -#: src/split.c:234 +#: src/split.c:236 msgid "" "\n" "CHUNKS may be:\n" @@ -9152,184 +9514,189 @@ msgid "" "r/K/N likewise but only output Kth of N to stdout\n" msgstr "" -#: src/split.c:352 +#: src/split.c:354 #, fuzzy, c-format msgid "output file suffixes exhausted" msgstr "Iarmhíreanna don aschomhad ídithe" -#: src/split.c:364 +#: src/split.c:366 #, c-format msgid "creating file %s\n" msgstr "comhad %s á chruthú\n" -#: src/split.c:377 +#: src/split.c:375 +#, c-format +msgid "%s would overwrite input; aborting" +msgstr "" + +#: src/split.c:391 #, fuzzy, c-format msgid "failed to set FILE environment variable" -msgstr "theip ar an gcomhthéacs slándála de %s a athrú go %s" +msgstr "theip ar ról nua %s a shocrú" -#: src/split.c:379 +#: src/split.c:393 #, c-format msgid "executing with FILE=%s\n" msgstr "" -#: src/split.c:381 +#: src/split.c:395 #, fuzzy, c-format msgid "failed to create pipe" -msgstr "ní féidir nasc crua %s a chruthú go dtí %s" +msgstr "theip ar %s a bhaint" -#: src/split.c:395 +#: src/split.c:409 #, fuzzy, c-format msgid "closing prior pipe" msgstr "comhadlann %s á dúnadh" -#: src/split.c:397 +#: src/split.c:411 #, fuzzy, c-format msgid "closing output pipe" msgstr "aschomhad %s á dhúnadh" -#: src/split.c:401 +#: src/split.c:415 #, fuzzy, c-format msgid "moving input pipe" msgstr "inchomhad %s á dhúnadh" -#: src/split.c:403 +#: src/split.c:417 #, fuzzy, c-format msgid "closing input pipe" msgstr "inchomhad %s á dhúnadh" -#: src/split.c:408 +#: src/split.c:422 #, fuzzy, c-format msgid "failed to run command: \"%s -c %s\"" -msgstr "ní féidir ordú %s a rith" +msgstr "theip ar chomhthéacs de %s a athrú go %s" -#: src/split.c:414 +#: src/split.c:428 #, fuzzy, c-format msgid "failed to close input pipe" msgstr "theip ar dhúnadh comhadlann %s" -#: src/split.c:450 +#: src/split.c:464 #, fuzzy, c-format msgid "waiting for child process" msgstr "ag feitheamh le \"strip\"" -#: src/split.c:460 +#: src/split.c:474 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "" -#: src/split.c:468 +#: src/split.c:482 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:475 src/timeout.c:449 +#: src/split.c:489 src/timeout.c:494 #, c-format msgid "unknown status from command (0x%X)" msgstr "" -#: src/split.c:1037 +#: src/split.c:1052 #, 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:1050 src/split.c:1192 src/split.c:1363 +#: src/split.c:1065 src/split.c:1205 src/split.c:1376 #, fuzzy, c-format msgid "%s: invalid number of chunks" msgstr "%s: líon na soicindí neamhbhailí" -#: src/split.c:1054 +#: src/split.c:1069 #, fuzzy, c-format msgid "%s: invalid chunk number" msgstr "%s: uimhir neamhbhailí" -#: src/split.c:1106 +#: src/split.c:1119 #, c-format msgid "%s: invalid suffix length" msgstr "%s: fad iarmhíre neamhbhailí" -#: src/split.c:1131 src/split.c:1139 src/split.c:1162 src/split.c:1167 +#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180 #, c-format msgid "%s: invalid number of bytes" msgstr "%s: líon neamhbhailí na mbeart" -#: src/split.c:1150 src/split.c:1297 +#: src/split.c:1163 src/split.c:1310 #, c-format msgid "%s: invalid number of lines" msgstr "%s: líon na línte neamhbhailí" -#: src/split.c:1223 +#: src/split.c:1236 #, 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:1235 +#: src/split.c:1248 #, fuzzy, c-format msgid "%s: invalid start value for numerical suffix" msgstr "líne-uimhir imeachta neamhbhailí: %s" -#: src/split.c:1263 +#: src/split.c:1276 #, fuzzy, c-format msgid "%s: invalid IO block size" msgstr "%s: méid comhaid neamhbhailí" -#: src/split.c:1284 +#: src/split.c:1297 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1321 +#: src/split.c:1334 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1356 +#: src/split.c:1369 #, 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:169 +#: src/stat.c:173 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:838 +#: src/stat.c:857 #, fuzzy, c-format msgid "failed to canonicalize %s" msgstr "Ní féidir %s a oscailt" -#: src/stat.c:1050 +#: src/stat.c:1069 #, fuzzy, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "rabhadh: éalúchán anaithnid `\\%c'" -#: src/stat.c:1105 +#: src/stat.c:1124 #, c-format msgid "%s: invalid directive" msgstr "%s: treoir neamhbhailí" -#: src/stat.c:1151 +#: src/stat.c:1170 #, c-format msgid "warning: backslash at end of format" msgstr "rabhadh: cúlslais ag deireadh na formáide" -#: src/stat.c:1182 +#: src/stat.c:1201 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" -#: src/stat.c:1189 +#: src/stat.c:1208 #, 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:1209 +#: src/stat.c:1228 #, 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:1245 +#: src/stat.c:1264 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -9340,7 +9707,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1268 +#: src/stat.c:1287 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -9348,30 +9715,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1278 +#: src/stat.c:1297 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:1286 +#: src/stat.c:1305 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:1295 +#: src/stat.c:1314 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:1305 +#: src/stat.c:1324 #, c-format msgid "Context: %C\n" msgstr "" -#: src/stat.c:1313 +#: src/stat.c:1332 msgid "" "Access: %x\n" "Modify: %y\n" @@ -9379,10 +9746,13 @@ msgid "" " Birth: %w\n" msgstr "" -#: src/stat.c:1331 +#: src/stat.c:1350 +msgid "Display file or file system status.\n" +msgstr "" + +#: src/stat.c:1356 +#, fuzzy msgid "" -"Display file or file system status.\n" -"\n" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" @@ -9391,7 +9761,7 @@ msgstr "" " -L, --dereference lean naisc\n" " -f, --file-system taispeáin stádas de chóras in ionad comhaid\n" -#: src/stat.c:1337 +#: src/stat.c:1360 #, fuzzy msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" @@ -9408,7 +9778,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:1348 +#: src/stat.c:1371 #, fuzzy msgid "" "\n" @@ -9429,7 +9799,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:1357 +#: src/stat.c:1380 #, fuzzy msgid "" " %d device number in decimal\n" @@ -9446,7 +9816,7 @@ msgstr "" " %g Aitheantas ghrúpa den úinéir\n" " %G Ainm grúpa den úinéir\n" -#: src/stat.c:1365 +#: src/stat.c:1388 #, fuzzy msgid "" " %h number of hard links\n" @@ -9468,7 +9838,7 @@ msgstr "" " %t Cineál gléis príomha, heicsidheachúlach\n" " %T Cineál gléis mion, heicsidheachúlach\n" -#: src/stat.c:1376 +#: src/stat.c:1399 #, fuzzy msgid "" " %u user ID of owner\n" @@ -9493,7 +9863,7 @@ msgstr "" " %Z Am den athrú is déanaí, soicindí ón tSainré\n" "\n" -#: src/stat.c:1390 +#: src/stat.c:1413 #, fuzzy msgid "" "Valid format sequences for file systems:\n" @@ -9513,7 +9883,7 @@ msgstr "" " %f Bloic ar fáil sa chóras comhaid\n" " %C Comhthéacs slándála SELinux\n" -#: src/stat.c:1399 +#: src/stat.c:1422 #, fuzzy msgid "" " %i file system ID in hex\n" @@ -9540,30 +9910,29 @@ msgstr "Úsáid: %s [ROGHA]...\n" #: src/stdbuf.c:91 msgid "" "Run COMMAND, with modified buffering operations for its standard streams.\n" -"\n" msgstr "" -#: src/stdbuf.c:98 +#: src/stdbuf.c:97 msgid "" " -i, --input=MODE adjust standard input stream buffering\n" " -o, --output=MODE adjust standard output stream buffering\n" " -e, --error=MODE adjust standard error stream buffering\n" msgstr "" -#: src/stdbuf.c:105 +#: src/stdbuf.c:104 msgid "" "\n" "If MODE is 'L' the corresponding stream will be line buffered.\n" "This option is invalid with standard input.\n" msgstr "" -#: src/stdbuf.c:108 +#: src/stdbuf.c:107 msgid "" "\n" "If MODE is '0' the corresponding stream will be unbuffered.\n" msgstr "" -#: src/stdbuf.c:111 +#: src/stdbuf.c:110 msgid "" "\n" "Otherwise MODE is a number which may be followed by one of the following:\n" @@ -9573,7 +9942,7 @@ msgid "" "size set to MODE bytes.\n" msgstr "" -#: src/stdbuf.c:117 +#: src/stdbuf.c:116 msgid "" "\n" "NOTE: If COMMAND adjusts the buffering of its standard streams ('tee' does\n" @@ -9583,22 +9952,22 @@ msgid "" "and are thus unaffected by 'stdbuf' settings.\n" msgstr "" -#: src/stdbuf.c:227 +#: src/stdbuf.c:226 #, fuzzy, c-format msgid "failed to find %s" msgstr "Ní féidir %s a oscailt" -#: src/stdbuf.c:247 src/stdbuf.c:279 +#: src/stdbuf.c:246 src/stdbuf.c:278 #, 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:321 +#: src/stdbuf.c:320 #, c-format msgid "line buffering stdin is meaningless" msgstr "" -#: src/stty.c:509 +#: src/stty.c:513 #, fuzzy, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -9609,10 +9978,13 @@ 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:515 +#: src/stty.c:519 +msgid "Print or change terminal characteristics.\n" +msgstr "" + +#: src/stty.c:525 +#, fuzzy msgid "" -"Print or change terminal characteristics.\n" -"\n" " -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" @@ -9623,7 +9995,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:524 +#: src/stty.c:532 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -9634,7 +10006,7 @@ msgstr "" "roghanna neamh-POSIX le `*'. Socraíonn an córas féin na roghanna atá ar " "fáil.\n" -#: src/stty.c:529 +#: src/stty.c:537 msgid "" "\n" "Special characters:\n" @@ -9649,7 +10021,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:536 +#: src/stty.c:544 msgid "" " * eol2 CHAR alternate CHAR for ending the line\n" " erase CHAR CHAR will erase the last character typed\n" @@ -9661,7 +10033,7 @@ msgstr "" " intr CAR seolfaidh CAR comhartha idirbhriste\n" " kill CAR léirscriosfaidh CAR an líne reatha\n" -#: src/stty.c:542 +#: src/stty.c:550 msgid "" " * lnext CHAR CHAR will enter the next character quoted\n" " quit CHAR CHAR will send a quit signal\n" @@ -9673,7 +10045,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:548 +#: src/stty.c:556 msgid "" " stop CHAR CHAR will stop the output\n" " susp CHAR CHAR will send a terminal stop signal\n" @@ -9685,7 +10057,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:554 +#: src/stty.c:562 #, fuzzy msgid "" "\n" @@ -9700,7 +10072,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:561 +#: src/stty.c:569 msgid "" " ispeed N set the input speed to N\n" " * line N use line discipline N\n" @@ -9713,7 +10085,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:567 +#: src/stty.c:575 msgid "" " * rows N tell the kernel that the terminal has N rows\n" " * size print the number of rows and columns according to the " @@ -9726,13 +10098,15 @@ msgstr "" " speed taispeáin luas an teirminéil\n" " time N le -icanon, socraigh seal fanachta, N deachú soicind\n" -#: src/stty.c:573 +#: src/stty.c:581 +#, fuzzy msgid "" "\n" "Control settings:\n" " [-]clocal disable modem control signals\n" " [-]cread allow input to be received\n" " * [-]crtscts enable RTS/CTS handshaking\n" +" * [-]cdtrdsr enable DTR/DSR handshaking\n" " csN set character size to N bits, N in [5..8]\n" msgstr "" "\n" @@ -9742,7 +10116,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:581 +#: src/stty.c:590 #, fuzzy msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" @@ -9750,7 +10124,7 @@ msgid "" " [-]hupcl same as [-]hup\n" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" -" [-]parodd set odd parity (even with '-')\n" +" [-]parodd set odd parity (or even parity with '-')\n" msgstr "" " [-]cstopb dhá ghiotán stoptha an charachtair (1 le `-')\n" " [-]hup seol comhartha HUP nuair a dhúnann an tty\n" @@ -9758,7 +10132,7 @@ msgstr "" " [-]parenb gin giotán paireachta san aschur agus iarr é san ionchur\n" " [-]parodd socraigh paireacht chorr (cothrom le `-')\n" -#: src/stty.c:588 +#: src/stty.c:597 msgid "" "\n" "Input settings:\n" @@ -9774,7 +10148,7 @@ msgstr "" " [-]ignbrk déan neamhshuim ar charachtair bhriste\n" " [-]igncr déan neamhshuim ar aisfhilleadh\n" -#: src/stty.c:596 +#: src/stty.c:605 msgid "" " [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" @@ -9788,11 +10162,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:603 +#: src/stty.c:612 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr " * [-]iutf8 glac le carachtair san ionchódú UTF-8\n" -#: src/stty.c:606 +#: src/stty.c:615 msgid "" " * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" @@ -9808,7 +10182,7 @@ msgstr "" " [-]parmrk comharthaigh earráidí phaireachta (le cód 255-0-carachtar)\n" " [-]tandem ar comhbhrí le [-]ixoff\n" -#: src/stty.c:614 +#: src/stty.c:623 msgid "" "\n" "Output settings:\n" @@ -9824,7 +10198,7 @@ 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:622 +#: src/stty.c:631 msgid "" " * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of null characters\n" @@ -9840,7 +10214,7 @@ msgstr "" " * [-]onlcr tiontaigh líne nua go haisfhilleadh+líne nua\n" " * [-]onlret déan líne nua aisfhilleadh\n" -#: src/stty.c:630 +#: src/stty.c:639 msgid "" " * [-]onocr do not print carriage returns in the first column\n" " [-]opost postprocess output\n" @@ -9856,7 +10230,7 @@ msgstr "" " * -tabs ar comhbhrí le tab3\n" " * vtN mód moille do tháib ingearacha, N=0 nó 1\n" -#: src/stty.c:638 +#: src/stty.c:647 msgid "" "\n" "Local settings:\n" @@ -9873,7 +10247,7 @@ msgstr "" " * -crtkill scrios gach líne trí ghéilleadh do na roghanna echoctl/" "echok\n" -#: src/stty.c:645 +#: src/stty.c:654 #, fuzzy msgid "" " * [-]ctlecho echo control characters in hat notation ('^c')\n" @@ -9888,7 +10262,7 @@ msgstr "" " [-]echoe ar comhbhrí le [-]crterase\n" " [-]echok déan macalla de líne nua i ndiaidh carachtair maraithe\n" -#: src/stty.c:652 +#: src/stty.c:661 #, fuzzy msgid "" " * [-]echoke same as [-]crtkill\n" @@ -9905,7 +10279,7 @@ msgstr "" "rprnt\n" " [-]iexten cumasaigh carachtair speisialta neamh-POSIX\n" -#: src/stty.c:659 +#: src/stty.c:668 #, fuzzy msgid "" " [-]isig enable interrupt, quit, and suspend special characters\n" @@ -9924,7 +10298,7 @@ msgstr "" " * [-]xcase le icanon, éalúchán le `\\' do charachtair sa chás " "uachtair\n" -#: src/stty.c:666 +#: src/stty.c:675 msgid "" "\n" "Combination settings:\n" @@ -9938,7 +10312,7 @@ msgstr "" " cbreak ar comhbhrí le -icanon\n" " -cbreak ar comhbhrí le icanon\n" -#: src/stty.c:673 +#: src/stty.c:682 msgid "" " cooked same as brkint ignpar istrip icrnl ixon opost isig\n" " icanon, eof and eol characters to their default values\n" @@ -9951,7 +10325,7 @@ msgstr "" " -cooked ar comhbhrí le `raw'\n" " crt ar comhbhrí le echoe echoctl echoke\n" -#: src/stty.c:679 +#: src/stty.c:688 msgid "" " dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" " kill ^u\n" @@ -9966,7 +10340,7 @@ msgstr "" "réamhshocraithe\n" " evenp ar comhbhrí le parenb -parodd cs7\n" -#: src/stty.c:686 +#: src/stty.c:695 msgid "" " -evenp same as -parenb cs8\n" " * [-]lcase same as xcase iuclc olcuc\n" @@ -9982,7 +10356,7 @@ msgstr "" " nl ar comhbhrí le -icrnl -onlcr\n" " -nl ar comhbhrí le icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" -#: src/stty.c:694 +#: src/stty.c:703 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -9996,7 +10370,7 @@ msgstr "" " pass8 ar comhbhrí le -parenb -istrip cs8\n" " -pass8 ar comhbhrí le parenb istrip cs7\n" -#: src/stty.c:701 +#: src/stty.c:710 msgid "" " raw same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" " -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n" @@ -10009,7 +10383,7 @@ msgstr "" " -imaxbel -opost -isig -icanon -xcase min 1 time 0\n" " -raw ar comhbhrí le `cooked'\n" -#: src/stty.c:707 +#: src/stty.c:716 #, fuzzy msgid "" " sane same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" @@ -10028,7 +10402,7 @@ msgstr "" " agus glacann carachtair speisialta a luach " "réamhshocraithe.\n" -#: src/stty.c:715 +#: src/stty.c:724 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -10043,12 +10417,12 @@ msgstr "" "nó\n" "127; úsáid luachanna ^- nó undef chun carachtair speisialta a stopadh.\n" -#: src/stty.c:787 +#: src/stty.c:796 #, c-format msgid "only one device may be specified" msgstr "ní cheadaítear ach gléas amháin a bheith ceaptha" -#: src/stty.c:817 +#: src/stty.c:826 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" @@ -10057,126 +10431,47 @@ msgstr "" "is comheisiatach iad na roghanna d'aschur foclach agus\n" "d'aschur stty-inléite" -#: src/stty.c:823 +#: src/stty.c:832 #, 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:838 +#: src/stty.c:847 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s: ní féidir mód gan bacainní a athshocrú" -#: src/stty.c:883 src/stty.c:993 +#: src/stty.c:892 src/stty.c:1002 #, c-format msgid "invalid argument %s" msgstr "argóint neamhbhailí %s" -#: src/stty.c:894 src/stty.c:911 src/stty.c:923 src/stty.c:936 src/stty.c:948 -#: src/stty.c:968 +#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957 +#: src/stty.c:977 #, c-format msgid "missing argument to %s" msgstr "tá argóint de dhíth i ndiaidh na rogha %s" -#: src/stty.c:974 +#: src/stty.c:983 #, c-format msgid "invalid line discipline %s" msgstr "disciplín neamhbhailí líne %s" -#: src/stty.c:1044 +#: src/stty.c:1053 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s: ní féidir gach tasc iarrtha a dhéanamh" -#: src/stty.c:1390 +#: src/stty.c:1399 #, 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:1904 +#: src/stty.c:1920 #, c-format msgid "invalid integer argument %s" msgstr "argóint neamhbhailí shlánuimhreach %s" -#: src/su.c:229 -msgid "Password:" -msgstr "Focal faire:" - -#: src/su.c:232 -#, c-format -msgid "getpass: cannot open /dev/tty" -msgstr "getpass: ní féidir /dev/tty a oscailt" - -#: src/su.c:290 -#, c-format -msgid "cannot set groups" -msgstr "ní féidir grúpaí a shocrú" - -#: src/su.c:294 -#, c-format -msgid "cannot set group id" -msgstr "ní féidir aitheantas an ghrúpa a shocrú" - -#: src/su.c:296 -#, c-format -msgid "cannot set user id" -msgstr "ní féidir aitheantas an úsáideora a shocrú" - -#: src/su.c:371 -#, c-format -msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" -msgstr "Úsáid: %s [ROGHA]... [-] [ÚSÁIDEOIR [ARG]...]\n" - -#: src/su.c:372 -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" - -#: src/su.c:384 -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" - -#: src/su.c:461 -#, c-format -msgid "user %s does not exist" -msgstr "níl a leithéid d'úsáideoir %s" - -#: src/su.c:484 -#, c-format -msgid "incorrect password" -msgstr "focal faire mícheart" - -#: src/su.c:501 -#, c-format -msgid "using restricted shell %s" -msgstr "ag baint úsáid as blaosc shrianta %s" - -#: src/su.c:509 -#, c-format -msgid "warning: cannot change directory to %s" -msgstr "rabhadh: ní féidir an chomhadlann oibre a athrú go %s" - #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 msgid "Kayvan Aghaiepour" @@ -10208,7 +10503,7 @@ msgstr "" msgid "ignoring all arguments" msgstr "ag déanamh neamhshuim ar gach argóint" -#: src/system.h:340 +#: src/system.h:343 #, c-format msgid "" "\n" @@ -10222,15 +10517,24 @@ msgstr "" "dhoiciméadú do bhlaoisce chun tuilleadh eolais a fháil faoi na roghanna\n" "a dtacaíonn sé leo.\n" -#: src/system.h:346 +#: src/system.h:349 msgid " --help display this help and exit\n" msgstr " --help taispeáin an chabhair seo agus scoir\n" -#: src/system.h:348 +#: src/system.h:351 msgid " --version output version information and exit\n" msgstr " --version taispeáin eolas faoin leagan agus scoir\n" -#: src/system.h:541 +#: src/system.h:544 +#, fuzzy +msgid "" +"\n" +"Mandatory arguments to long options are mandatory for short options too.\n" +msgstr "" +"Is riachtanach le rogha ghearr aon argóint atá riachtanach leis an rogha " +"fhada.\n" + +#: src/system.h:552 msgid "" "\n" "SIZE is an integer and optional unit (example: 10M is 10*1024*1024). Units\n" @@ -10238,7 +10542,7 @@ msgid "" "1000).\n" msgstr "" -#: src/system.h:550 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -10247,7 +10551,7 @@ msgid "" "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n" msgstr "" -#: src/system.h:560 +#: src/system.h:571 #, fuzzy, c-format msgid "" "\n" @@ -10260,22 +10564,22 @@ msgstr "" #. <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:574 +#: src/system.h:585 #, c-format msgid "Report %s translation bugs to <http://translationproject.org/team/>\n" msgstr "" -#: src/system.h:578 +#: src/system.h:589 #, c-format msgid "For complete documentation, run: info coreutils '%s invocation'\n" msgstr "" -#: src/system.h:585 +#: src/system.h:596 #, 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:617 +#: src/system.h:628 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -10296,16 +10600,16 @@ 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" -"\n" msgstr "" "Scríobh gach COMHAD chuig an ghnáth-aschur, bun os cionn.\n" "Mura bhfuil COMHAD ann, nó más '-' é, léigh ón ghnáth-ionchur.\n" "\n" -#: src/tac.c:145 +#: src/tac.c:144 msgid "" " -b, --before attach the separator before instead of after\n" " -r, --regex interpret the separator as a regular expression\n" @@ -10318,42 +10622,42 @@ msgstr "" " -s, --separator=TEAGHRÁN úsáid TEAGHRÁN mar dheighilteoir in ionad líne " "nua\n" -#: src/tac.c:235 src/tac.c:336 +#: src/tac.c:234 src/tac.c:335 #, c-format msgid "%s: seek failed" msgstr "%s: níorbh fhéidir `seek' a dhéanamh" -#: src/tac.c:264 +#: src/tac.c:263 #, c-format msgid "record too large" msgstr "tá an taifead rómhór" -#: src/tac.c:451 +#: src/tac.c:450 #, fuzzy, c-format msgid "failed to create temporary file in %s" msgstr "ní féidir comhad sealadach %s a chruthú" -#: src/tac.c:459 +#: src/tac.c:458 #, fuzzy, c-format msgid "failed to open %s for writing" msgstr "%s: theip ar oscailt chun é a scríobh" -#: src/tac.c:476 +#: src/tac.c:475 #, fuzzy, c-format msgid "failed to rewind stream for %s" msgstr "níorbh fhéidir amanna a chaomhnú ar %s" -#: src/tac.c:512 src/tac.c:519 +#: src/tac.c:511 src/tac.c:518 #, c-format msgid "%s: write error" msgstr "%s: earráid sa scríobh" -#: src/tac.c:572 +#: src/tac.c:571 #, fuzzy, c-format msgid "failed to open %s for reading" msgstr "ní féidir %s a oscailt chun léamh" -#: src/tac.c:630 +#: src/tac.c:629 #, c-format msgid "separator cannot be empty" msgstr "ní cheadaítear deighilteoir folamh" @@ -10364,12 +10668,11 @@ msgid "Ian Lance Taylor" msgstr "Ian Lance Taylor" #: src/tail.c:262 -#, c-format +#, fuzzy, 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" -"\n" msgstr "" "Scríobh an %d líne ag an deireadh de gach COMHAD chuig an ghnáth-aschur.\n" "Má tá níos mó ná COMHAD amháin ann, cuir ceanntásc lena ainm comhaid roimh " @@ -10377,7 +10680,7 @@ msgstr "" "Mura bhfuil COMHAD ann, nó más '-' é, léigh ón ghnáth-ionchur.\n" "\n" -#: src/tail.c:271 +#: src/tail.c:270 msgid "" " -c, --bytes=K output the last K bytes; alternatively, use -c " "+K\n" @@ -10385,7 +10688,7 @@ msgid "" "file\n" msgstr "" -#: src/tail.c:275 +#: src/tail.c:274 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -10400,7 +10703,7 @@ msgstr "" "comhbhrí\n" " -F ar comhbhrí le --follow=name --retry\n" -#: src/tail.c:282 +#: src/tail.c:281 #, fuzzy, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -10423,7 +10726,7 @@ msgstr "" " féachaint an raibh sé dínasctha nó athainmnithe\n" " (mar shampla do logchomhaid uainíochta go minic)\n" -#: src/tail.c:295 +#: src/tail.c:294 #, fuzzy msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" @@ -10439,8 +10742,7 @@ msgstr "" " -v, --verbose taispeáin ceanntásca le hainmneacha comhaid i " "gcónaí\n" -#: src/tail.c:302 -#, fuzzy +#: src/tail.c:301 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations.\n" @@ -10448,14 +10750,8 @@ msgid "" " least once every N seconds.\n" " -v, --verbose always output headers giving file names\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" -" -s, --sleep-interval=N le -f, maireann gach timthriall timpeall is N\n" -" (réamhshocrú 1) soicind\n" -" -v, --verbose taispeáin ceanntásca le hainmneacha comhaid i " -"gcónaí\n" -#: src/tail.c:311 +#: src/tail.c:310 #, fuzzy msgid "" "\n" @@ -10475,7 +10771,7 @@ msgstr "" "GB 1000*1000*1000, G 1024*1024*1024, srl. le T, P, E, Z, Y.\n" "\n" -#: src/tail.c:320 +#: src/tail.c:319 #, fuzzy msgid "" "With --follow (-f), tail defaults to following the file descriptor, which\n" @@ -10492,64 +10788,64 @@ 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:379 +#: src/tail.c:378 #, c-format msgid "closing %s (fd=%d)" msgstr "%s (fd=%d) á dhúnadh" -#: src/tail.c:454 +#: 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:458 +#: src/tail.c:457 #, 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:895 +#: src/tail.c:894 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "" -#: src/tail.c:907 +#: src/tail.c:906 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" msgstr "" -#: src/tail.c:964 +#: src/tail.c:963 #, c-format msgid "%s has become inaccessible" msgstr "tá %s dorochtana anois" -#: src/tail.c:981 +#: src/tail.c:980 #, 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:990 +#: src/tail.c:989 #, 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:1011 +#: src/tail.c:1010 #, c-format msgid "%s has become accessible" msgstr "tá %s insroichte anois" -#: src/tail.c:1019 +#: src/tail.c:1018 #, 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:1030 +#: src/tail.c:1029 #, 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:1131 +#: src/tail.c:1130 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: ní féidir mód gan bacainní a athshocrú" @@ -10917,17 +11213,22 @@ msgstr "`]' ar iarraidh" msgid "extra argument %s" msgstr "argóint bhreise %s" -#: src/timeout.c:124 +#: src/timeout.c:112 +#, c-format +msgid "warning: sigprocmask" +msgstr "" + +#: src/timeout.c:145 #, c-format msgid "warning: timer_settime" msgstr "" -#: src/timeout.c:129 +#: src/timeout.c:150 #, c-format msgid "warning: timer_create" msgstr "" -#: src/timeout.c:204 +#: src/timeout.c:225 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -10936,18 +11237,18 @@ msgstr "" "Úsáid: %s ROGHA ÚSÁIDEOIR ORDÚ [ARGÓINT]...\n" " nó: %s ROGHA\n" -#: src/timeout.c:208 +#: src/timeout.c:229 #, fuzzy -msgid "" -"Start COMMAND, and kill it if still running after DURATION.\n" -"\n" -"Mandatory arguments to long options are mandatory for short options too.\n" +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:213 +#: src/timeout.c:235 msgid "" +" --preserve-status\n" +" exit with the same status as COMMAND, even when the\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 " @@ -10962,7 +11263,7 @@ msgid "" " See 'kill -l' for a list of signals\n" msgstr "" -#: src/timeout.c:229 +#: src/timeout.c:254 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -10970,25 +11271,30 @@ msgid "" "days.\n" msgstr "" -#: src/timeout.c:234 +#: src/timeout.c:259 msgid "" "\n" -"If the command times out, then exit with status 124. Otherwise, exit\n" -"with the status of COMMAND. If no signal is specified, send the TERM\n" -"signal upon timeout. The TERM signal kills any process that does not\n" -"block or catch that signal. For other processes, it may be necessary to\n" -"use the KILL (9) signal, since this signal cannot be caught. If the\n" -"KILL (9) signal is sent, the exit status is 128+9 rather than 124.\n" +"If the command times out, and --preserve-status is not set, then exit with\n" +"status 124. Otherwise, exit with the status of COMMAND. If no signal\n" +"is specified, send the TERM signal upon timeout. The TERM signal kills\n" +"any process that does not block or catch that signal. It may be necessary\n" +"to use the KILL (9) signal, since this signal cannot be caught, in which\n" +"case the exit status is 128+9 rather than 124.\n" +msgstr "" + +#: src/timeout.c:363 +#, c-format +msgid "warning: disabling core dumps failed" msgstr "" -#: src/timeout.c:419 +#: src/timeout.c:471 #, fuzzy, c-format msgid "error waiting for command" msgstr "earráid agus %s á scríobh" -#: src/timeout.c:441 +#: src/timeout.c:482 #, c-format -msgid "warning: disabling core dumps failed" +msgid "the monitored command dumped core" msgstr "" #. This is a proper name. See the gettext manual, section Names. @@ -11002,22 +11308,22 @@ msgid "Randy Smith" msgstr "Randy Smith" # similar string for time format in ls.c -KPS -#: src/touch.c:115 src/touch.c:313 +#: src/touch.c:115 src/touch.c:309 #, c-format msgid "invalid date format %s" msgstr "formáid neamhbhailí ar an dáta: %s" -#: src/touch.c:194 +#: src/touch.c:191 #, c-format msgid "cannot touch %s" msgstr "ní féidir %s a `touch'" -#: src/touch.c:200 +#: src/touch.c:197 #, c-format msgid "setting times of %s" msgstr "amanna de %s á socrú" -#: src/touch.c:216 +#: src/touch.c:213 #, fuzzy msgid "" "Update the access and modification times of each FILE to the current time.\n" @@ -11027,7 +11333,6 @@ msgid "" "\n" "A FILE argument string of - is handled specially and causes touch to\n" "change the times of the file associated with standard output.\n" -"\n" msgstr "" "Nuashonraigh na hamanna rochtana/athraithe de gach COMHAD chuig an am " "anois.\n" @@ -11039,7 +11344,7 @@ msgstr "" "an ngnáth-aschur.\n" "\n" -#: src/touch.c:229 +#: src/touch.c:225 #, fuzzy msgid "" " -a change only the access time\n" @@ -11053,7 +11358,7 @@ msgstr "" " -f (gan feidhm)\n" " -m ná hathraigh ach an t-am mionathraithe\n" -#: src/touch.c:235 +#: src/touch.c:231 #, fuzzy msgid "" " -h, --no-dereference affect each symbolic link instead of any " @@ -11066,11 +11371,12 @@ msgstr "" " comhad tagartha ar bith (le fáil más féidir le do\n" " chóras an t-úinéir de nasc siombalach a athrú)\n" -#: src/touch.c:241 +#: 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" -" --time=WORD change the specified time:\n" +" --time=WORD change the specified time:\n" " WORD is access, atime, or use: equivalent to -a\n" " WORD is modify or mtime: equivalent to -m\n" msgstr "" @@ -11081,7 +11387,7 @@ msgstr "" " FOCAL = access, atime, nó use: ar comhbhrí le -a\n" " FOCAL = modify nó mtime: ar comhbhrí le -m\n" -#: src/touch.c:250 +#: src/touch.c:246 msgid "" "\n" "Note that the -d and -t options accept different time-date formats.\n" @@ -11090,12 +11396,12 @@ msgstr "" "Tabhair faoi deara go bhfuil formáidí difriúla am-dáta\n" "ag na roghanna -d agus -t.\n" -#: src/touch.c:339 +#: src/touch.c:335 #, c-format msgid "cannot specify times from more than one source" msgstr "ní féidir amanna a shocrú ó fhoinsí iomadúla" -#: src/touch.c:413 +#: src/touch.c:409 #, fuzzy, c-format msgid "" "warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'" @@ -11368,26 +11674,25 @@ msgid "" "If a FILE is larger than the specified size, the extra data is lost.\n" "If a FILE is shorter, it is extended and the extended part (hole)\n" "reads as zero bytes.\n" -"\n" msgstr "" -#: src/truncate.c:110 +#: src/truncate.c:109 #, fuzzy msgid " -c, --no-create do not create any files\n" msgstr " -d, --directory cruthaigh comhadlann in ionad comhaid\n" -#: src/truncate.c:113 +#: src/truncate.c:112 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" -#: src/truncate.c:116 +#: 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" msgstr "" -#: src/truncate.c:122 +#: src/truncate.c:121 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -11395,57 +11700,57 @@ msgid "" "'/' round down to multiple of, '%' round up to multiple of.\n" msgstr "" -#: src/truncate.c:150 +#: src/truncate.c:149 #, c-format msgid "overflow in %<PRIdMAX> * %<PRIdMAX> byte blocks for file %s" msgstr "" -#: src/truncate.c:174 +#: src/truncate.c:173 #, fuzzy, c-format msgid "%s has unusable, apparently negative size" msgstr "%s: comhad de mhéid diúltach" -#: src/truncate.c:184 src/truncate.c:379 +#: src/truncate.c:183 src/truncate.c:384 #, fuzzy, c-format msgid "cannot get the size of %s" msgstr "níl aon fháil ar an am lae" -#: src/truncate.c:206 +#: src/truncate.c:205 #, fuzzy, c-format msgid "overflow rounding up size of file %s" msgstr "fritháireamh thar maoil agus comhad %s á léamh" -#: src/truncate.c:216 +#: src/truncate.c:215 #, fuzzy, c-format msgid "overflow extending size of file %s" msgstr "fritháireamh thar maoil agus comhad %s á léamh" -#: src/truncate.c:231 +#: src/truncate.c:230 #, c-format msgid "failed to truncate %s at %<PRIdMAX> bytes" msgstr "" -#: src/truncate.c:305 +#: src/truncate.c:303 #, fuzzy, c-format msgid "multiple relative modifiers specified" msgstr "sonraíodh sprioc-chomhadlanna iomadúla" -#: src/truncate.c:335 +#: src/truncate.c:333 #, fuzzy, c-format msgid "you must specify either %s or %s" msgstr "ní foláir duit liosta bearta, carachtair, nó réimsí a cheapadh" -#: src/truncate.c:342 +#: src/truncate.c:340 #, c-format msgid "you must specify a relative %s with %s" msgstr "" -#: src/truncate.c:349 +#: src/truncate.c:347 #, c-format msgid "%s was specified but %s was not" msgstr "" -#: src/truncate.c:400 +#: src/truncate.c:404 #, c-format msgid "cannot open %s for writing" msgstr "ní féidir %s a oscailt chun scríobh air" @@ -11542,17 +11847,17 @@ msgid "cannot get system name" msgstr "níl aon fháil ar an ainm córais" #: 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" -"\n" msgstr "" "Tiontaigh spásanna i ngach COMHAD go táib, agus scríobh ar an ngnáth-" "aschur.\n" "Mura bhfuil COMHAD ann, nó más '-' é, léigh ón ghnáth-ionchur.\n" "\n" -#: src/unexpand.c:125 +#: src/unexpand.c:124 msgid "" " -a, --all convert all blanks, instead of just initial blanks\n" " --first-only convert only leading sequences of blanks (overrides -a)\n" @@ -11565,12 +11870,12 @@ msgstr "" " -t, --tabs=N táib N carachtar óna chéile in ionad 8 (cumasaigh -a)\n" " -t, --tabs=LIOSTA liosta de tháib, scartha le camóga (cumasaigh -a)\n" -#: src/unexpand.c:153 +#: src/unexpand.c:152 #, c-format msgid "tabs are too far apart" msgstr "táib rófhada ó chéile" -#: src/unexpand.c:505 +#: src/unexpand.c:504 #, c-format msgid "tab stop value is too large" msgstr "is rómhór an luach tábstoip" @@ -11586,10 +11891,9 @@ msgid "" "writing to OUTPUT (or standard output).\n" "\n" "With no options, matching lines are merged to the first occurrence.\n" -"\n" msgstr "" -#: src/uniq.c:148 +#: src/uniq.c:147 msgid "" " -c, --count prefix lines by the number of occurrences\n" " -d, --repeated only print duplicate lines\n" @@ -11597,7 +11901,7 @@ 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:152 +#: src/uniq.c:151 #, fuzzy msgid "" " -D, --all-repeated[=delimit-method] print all duplicate lines\n" @@ -11619,11 +11923,11 @@ msgstr "" " -z, --zero-terminated cuir beart 0 ag deireadh gach líne in ionad líne " "nuaí\n" -#: src/uniq.c:162 +#: src/uniq.c:161 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:167 +#: src/uniq.c:166 msgid "" "\n" "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n" @@ -11634,7 +11938,7 @@ msgstr "" "agus\n" "ansin carachtair nach spás bán. Gabhtar thar réimsí roimh charachtair.\n" -#: src/uniq.c:172 +#: src/uniq.c:171 #, fuzzy msgid "" "\n" @@ -11647,24 +11951,24 @@ 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:359 +#: src/uniq.c:358 #, c-format msgid "too many repeated lines" msgstr "an iomarca línte dúblacha" -#: src/uniq.c:522 +#: src/uniq.c:521 msgid "invalid number of fields to skip" msgstr "is neamhbhailí líon na réimsí le ligean thar" -#: src/uniq.c:531 +#: src/uniq.c:530 msgid "invalid number of bytes to skip" msgstr "is neamhbhailí líon na mbeart le ligean thar" -#: src/uniq.c:540 +#: src/uniq.c:539 msgid "invalid number of bytes to compare" msgstr "is neamhbhailí líon na mbeart a chur i gcomparáid" -#: src/uniq.c:559 +#: src/uniq.c:558 #, 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" @@ -11721,6 +12025,11 @@ msgstr[2] "" msgstr[3] "" msgstr[4] "" +#: src/uptime.c:149 +#, fuzzy, c-format +msgid "up %2d:%02d, " +msgstr " %2d:%02d%s beo " + #: src/uptime.c:151 #, c-format msgid "%lu user" @@ -11823,40 +12132,40 @@ msgstr "" msgid " old " msgstr " sean " -#: src/who.c:449 +#: src/who.c:440 #, fuzzy msgid "system boot" msgstr "Earráid chórais" -#: src/who.c:456 src/who.c:458 +#: src/who.c:447 src/who.c:449 msgid "id=" msgstr "id=" -#: src/who.c:471 src/who.c:476 +#: src/who.c:462 src/who.c:467 msgid "term=" msgstr "teirm=" -#: src/who.c:473 src/who.c:477 +#: src/who.c:464 src/who.c:468 msgid "exit=" msgstr "stádas=" -#: src/who.c:494 +#: src/who.c:485 msgid "LOGIN" msgstr "" -#: src/who.c:514 +#: src/who.c:505 msgid "clock change" msgstr "athrú an chloig" -#: src/who.c:526 src/who.c:527 +#: src/who.c:517 src/who.c:518 msgid "run-level" msgstr "leibhéal feidhmithe" -#: src/who.c:530 src/who.c:531 +#: src/who.c:521 src/who.c:522 msgid "last=" msgstr "déanach=" -#: src/who.c:562 +#: src/who.c:553 #, c-format msgid "" "\n" @@ -11865,44 +12174,44 @@ msgstr "" "\n" "# úsáideoirí=%lu\n" -#: src/who.c:568 +#: src/who.c:559 msgid "NAME" msgstr "AINM" -#: src/who.c:568 +#: src/who.c:559 msgid "LINE" msgstr "LÍNE" -#: src/who.c:568 +#: src/who.c:559 msgid "TIME" msgstr "AM " -#: src/who.c:568 +#: src/who.c:559 msgid "IDLE" msgstr "DÍOMHAOIN" -#: src/who.c:569 +#: src/who.c:560 msgid "PID" msgstr "PID" -#: src/who.c:569 +#: src/who.c:560 msgid "COMMENT" msgstr "NÓTA" -#: src/who.c:569 +#: src/who.c:560 msgid "EXIT" msgstr "SCOIR" -#: src/who.c:649 +#: src/who.c:640 #, c-format msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n" msgstr "Úsáid: %s [ROGHA]... [ COMHAD | ARG1 ARG2 ]]\n" -#: src/who.c:650 +#: src/who.c:641 msgid "Print information about users who are currently logged in.\n" msgstr "" -#: src/who.c:653 +#: src/who.c:644 msgid "" "\n" " -a, --all same as -b -d --login -p -r -t -T -u\n" @@ -11916,11 +12225,11 @@ msgstr "" " -d, --dead taispeáin próisis mharbha\n" " -H, --heading taispeáin teidil na gcolún\n" -#: src/who.c:660 +#: src/who.c:651 msgid " -l, --login print system login processes\n" msgstr " -l, --login taispeáin próisis logála isteach an chórais\n" -#: src/who.c:663 +#: src/who.c:654 msgid "" " --lookup attempt to canonicalize hostnames via DNS\n" " -m only hostname and user associated with stdin\n" @@ -11931,7 +12240,7 @@ msgstr "" "ionchur\n" " -p, --process taispeáin próisis a chuir init ar bun\n" -#: src/who.c:668 +#: src/who.c:659 msgid "" " -q, --count all login names and number of users logged on\n" " -r, --runlevel print current runlevel\n" @@ -11944,7 +12253,7 @@ msgstr "" " -s, --short ná taispeáin ach ainm, líne, agus am (réamhshocrú)\n" " -t, --time taispeáin athrú an chloig is déanaí\n" -#: src/who.c:674 +#: src/who.c:665 msgid "" " -T, -w, --mesg add user's message status as +, - or ?\n" " -u, --users list users logged in\n" @@ -11956,7 +12265,7 @@ msgstr "" " --message ar comhbhrí le -T\n" " --writable ar comhbhrí le -T\n" -#: src/who.c:682 +#: src/who.c:673 #, fuzzy, c-format msgid "" "\n" @@ -12000,12 +12309,17 @@ msgstr "" "Priontáil líne arís agus arís le gach TEAGHRÁN ceaptha, nó `y'.\n" "\n" -#~ msgid "" -#~ "Usage: %s NAME\n" -#~ " or: %s OPTION\n" -#~ msgstr "" -#~ "Úsáid: %s AINM\n" -#~ " nó: %s ROGHA\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" + +#, fuzzy +#~ msgid "no valid suffix found\n" +#~ msgstr "%s: fad iarmhíre neamhbhailí" #~ msgid "" #~ "\n" @@ -12018,19 +12332,184 @@ msgstr "" #~ " %s /usr/bin/sort Aschur: \"sort\".\n" #~ " %s include/stdio.h .h Aschur: \"stdio\".\n" -#~ msgid "Usage: %s [OPTION] FILE...\n" -#~ msgstr "Úsáid: %s [ROGHA] COMHAD...\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" +#~ "\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 "" +#~ "\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" +#~ "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" +#~ 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" + +#~ 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" + +#, 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" -#~ " --dereference affect the referent of each symbolic link (this " -#~ "is\n" -#~ " the default), rather than the symbolic link " -#~ "itself\n" +#~ " -f, --silent, --quiet suppress most error messages\n" +#~ " -v, --verbose output a diagnostic for every file processed\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 " @@ -12042,6 +12521,14 @@ msgstr "" #~ " shiombalaigh (réamhshocrú) in ionad an naisc\n" #~ " 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" @@ -12069,14 +12556,6 @@ msgstr "" #~ " -c, --changes cosúil le `verbose' ach ná tabhair tuairisc ach " #~ "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" @@ -12130,34 +12609,6 @@ msgstr "" #~ " -v, --verbose taispeáin diagnóisic do gach comhad " #~ "próiseáilte\n" -#, fuzzy -#~ msgid "Usage: %s [OPTION]... PATH START\n" -#~ msgstr "Úsáid: %s [ROGHA]... TACAR1 [TACAR2]\n" - -#, fuzzy -#~ msgid "" -#~ " -n, --no-newline do not output the trailing " -#~ "newline\n" -#~ " " -#~ msgstr "" -#~ "Déan macalla ar an/na TEAGHRÁ(I)N chuig an ghnáth-aschur.\n" -#~ "\n" -#~ " -n ná scríobh an líne nua fhoirceanta\n" - -#, fuzzy -#~ 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" -#~ "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 "" #~ "Display the current time in the given FORMAT, or set the system date.\n" #~ "\n" @@ -12170,18 +12621,19 @@ msgstr "" #~ " -f, --file=COMHADDÁTA mar --date uair amháin sa líne de " #~ "CHOMHADDÁTA\n" -#~ msgid "cannot create link %s" -#~ msgstr "ní féidir an nasc %s a chruthú" - -#, fuzzy -#~ msgid "%s: option '%s' is ambiguous\n" -#~ msgstr "%s: Tá an rogha `-W %s' débhríoch\n" - #, fuzzy #~ msgid "" -#~ "WARNING: --preserve_context is deprecated; use --preserve-context instead" +#~ "\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 "" -#~ "tá an rogha --copyright dulta i léig; bain úsáid as --version ina háit" +#~ "\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" @@ -12235,6 +12687,9 @@ msgstr "" #~ msgid "Richard Stallman" #~ msgstr "Richard Stallman" +#~ msgid "cannot create link %s" +#~ msgstr "ní féidir an nasc %s a chruthú" + #~ msgid "" #~ " -P, --no-dereference never follow symbolic links in SOURCE\n" #~ msgstr "" @@ -12258,10 +12713,6 @@ msgstr "" #~ 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" -# similar string for time format in ls.c -KPS -#~ msgid "invalid format width" -#~ msgstr "leithead neamhbhailí na formáide" - #~ msgid "invalid format precision" #~ msgstr "beachtas neamhbhailí na formáide" @@ -12506,6 +12957,9 @@ msgstr "" #~ msgid "invalid number of lines: 0" #~ msgstr "líon na línte neamhbhailí: 0" +#~ msgid "Usage: %s [OPTION] FILE...\n" +#~ msgstr "Úsáid: %s [ROGHA] COMHAD...\n" + # French did this too -KPS #~ msgid "new_mode: mode\n" #~ msgstr "new_mode: mode\n" @@ -12593,9 +13047,6 @@ msgstr "" #~ "ón ghnáth-ionchur) agus scríobh chuig ASCHUR (nó an gnáth-aschur).\n" #~ "\n" -#~ msgid " %2d:%02d%s up " -#~ msgstr " %2d:%02d%s beo " - #~ msgid "am" #~ msgstr "am" @@ -12681,6 +13132,10 @@ msgstr "" #~ msgid "page range" #~ msgstr "raon leathanach" +#~ msgid "the --copyright option is deprecated; use --version instead" +#~ msgstr "" +#~ "tá an rogha --copyright dulta i léig; bain úsáid as --version ina háit" + #~ msgid "sort size" #~ msgstr "méid na sórtála" @@ -12968,9 +13423,6 @@ 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 62a415e6..31862663 100644 Binary files a/po/gl.gmo and b/po/gl.gmo differ diff --git a/po/gl.po b/po/gl.po index 155ea679..7497b191 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: 2012-05-10 19:35+0200\n" +"POT-Creation-Date: 2013-02-14 15:56+0000\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,19 +34,19 @@ msgstr "Os parámetros correctos son:" msgid "error closing file" msgstr "volcando o ficheiro" -#: lib/closeout.c:112 src/base64.c:109 src/base64.c:121 src/base64.c:127 -#: src/base64.c:168 src/base64.c:224 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:330 src/expand.c:355 src/head.c:298 -#: src/head.c:348 src/head.c:756 src/head.c:797 src/mktemp.c:350 src/od.c:919 -#: src/paste.c:160 src/shuf.c:369 src/split.c:727 src/split.c:964 -#: src/split.c:969 src/tail.c:350 src/tail.c:1201 src/tail.c:1307 +#: 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 -#: src/unexpand.c:427 src/unexpand.c:443 +#: 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:1160 src/copy.c:2602 +#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617 #, fuzzy, c-format msgid "preserving permissions for %s" msgstr "non se pode cambia-los permisos de %s" @@ -244,18 +244,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:483 +#: lib/mkdir-p.c:196 src/install.c:484 #, 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:2261 src/install.c:709 src/install.c:722 +#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722 #, 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:915 src/tac.c:435 +#: src/split.c:929 src/tac.c:434 #, c-format msgid "memory exhausted" msgstr "memoria esgotada" @@ -304,80 +304,80 @@ msgstr "\"" msgid "%s: end of file" msgstr "%s: erro de lectura" -#: lib/regcomp.c:130 +#: lib/regcomp.c:131 msgid "Success" msgstr "" -#: lib/regcomp.c:133 +#: lib/regcomp.c:134 msgid "No match" msgstr "" -#: lib/regcomp.c:136 +#: lib/regcomp.c:137 #, fuzzy msgid "Invalid regular expression" msgstr "%s: expresión regular incorrecta: %s" -#: lib/regcomp.c:139 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "" -#: lib/regcomp.c:142 +#: lib/regcomp.c:143 #, fuzzy msgid "Invalid character class name" msgstr "clase de caracteres \"%s\" incorrecta" -#: lib/regcomp.c:145 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "" -#: lib/regcomp.c:148 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "" -#: lib/regcomp.c:151 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "" -#: lib/regcomp.c:154 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "" -#: lib/regcomp.c:157 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "" -#: lib/regcomp.c:160 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "" -#: lib/regcomp.c:163 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "" -#: lib/regcomp.c:166 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Memoria esgotada" -#: lib/regcomp.c:169 +#: lib/regcomp.c:170 #, fuzzy msgid "Invalid preceding regular expression" msgstr "%s: expresión regular incorrecta: %s" -#: lib/regcomp.c:172 +#: lib/regcomp.c:173 #, fuzzy msgid "Premature end of regular expression" msgstr "erro ao buscar por expresións regulares" -#: lib/regcomp.c:175 +#: lib/regcomp.c:176 #, fuzzy msgid "Regular expression too big" msgstr "erro ao buscar por expresións regulares" -#: lib/regcomp.c:178 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:703 +#: lib/regcomp.c:704 #, fuzzy msgid "No previous regular expression" msgstr "erro ao buscar por expresións regulares" @@ -417,7 +417,7 @@ msgstr "^[sSyY]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-mode-acl.c:695 src/copy.c:2284 src/cp.c:518 +#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516 #, fuzzy, c-format msgid "setting permissions for %s" msgstr "non se pode cambia-los permisos de %s" @@ -565,13 +565,13 @@ msgstr "a apertura fallou" msgid "Resource lost" msgstr "" -#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262 -#: lib/spawn-pipe.c:265 +#: 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:232 lib/spawn-pipe.c:346 lib/wait-process.c:282 +#: 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" @@ -587,24 +587,24 @@ msgstr "" msgid "Unknown signal %d" msgstr "" -#: lib/unicodeio.c:103 +#: lib/unicodeio.c:102 msgid "iconv function not usable" msgstr "a función iconv non é utilizable" -#: lib/unicodeio.c:105 +#: lib/unicodeio.c:104 msgid "iconv function not available" msgstr "a función iconv non está dispoñible" -#: lib/unicodeio.c:112 +#: lib/unicodeio.c:111 msgid "character out of range" msgstr "carácter fóra de rango" -#: lib/unicodeio.c:182 +#: lib/unicodeio.c:181 #, c-format msgid "cannot convert U+%04X to local character set" msgstr "non se pode converter U+%04X ao xogo de caracteres local" -#: lib/unicodeio.c:184 +#: lib/unicodeio.c:183 #, c-format msgid "cannot convert U+%04X to local character set: %s" msgstr "non se pode converter U+%04X ao xogo de caracteres local: %s" @@ -767,7 +767,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:562 +#: lib/version-etc.c:251 src/system.h:573 #, c-format msgid "%s home page: <%s>\n" msgstr "" @@ -777,7 +777,7 @@ msgstr "" msgid "%s home page: <http://www.gnu.org/software/%s/>\n" msgstr "" -#: lib/version-etc.c:256 src/system.h:563 +#: lib/version-etc.c:256 src/system.h:574 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" @@ -864,14 +864,17 @@ msgid "Simon Josefsson" msgstr "" #: src/base64.c:60 -#, c-format +#, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" "Base64 encode or decode FILE, or standard input, to standard output.\n" -"\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:64 +#: src/base64.c:67 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -881,7 +884,7 @@ msgid "" "\n" msgstr "" -#: src/base64.c:73 src/cat.c:110 src/fmt.c:293 src/shuf.c:71 src/sum.c:70 +#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -889,7 +892,7 @@ msgstr "" "\n" "Sen FICHEIRO, ou cando o FICHEIRO é -, lese da entrada estándar.\n" -#: src/base64.c:76 +#: src/base64.c:79 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -898,37 +901,37 @@ msgid "" "from any other non-alphabet bytes in the encoded stream.\n" msgstr "" -#: src/base64.c:171 src/base64.c:208 src/csplit.c:263 src/csplit.c:1435 -#: src/join.c:451 src/shuf.c:157 src/shuf.c:361 src/tac-pipe.c:74 +#: 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 #, c-format msgid "read error" msgstr "erro de lectura" -#: src/base64.c:227 +#: src/base64.c:230 #, fuzzy, c-format msgid "invalid input" msgstr "número incorrecto" -#: src/base64.c:264 +#: src/base64.c:267 #, fuzzy, c-format msgid "invalid wrap size: %s" msgstr "cadea de tipo incorrecta \"%s\"" -#: src/base64.c:283 src/basename.c:173 src/comm.c:435 src/cp.c:607 -#: src/date.c:441 src/dircolors.c:447 src/du.c:894 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:169 src/install.c:929 src/join.c:961 -#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:157 src/mv.c:447 -#: src/od.c:1802 src/ptx.c:2081 src/readlink.c:154 src/seq.c:408 -#: src/shuf.c:320 src/shuf.c:339 src/sort.c:4477 src/split.c:1313 -#: src/tr.c:1797 src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:454 -#: src/uniq.c:471 src/unlink.c:81 src/uptime.c:250 src/users.c:146 -#: src/wc.c:666 src/who.c:836 src/whoami.c:79 +#: 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 msgid "extra operand %s" msgstr "operando \"%s\" extra" -#: src/base64.c:315 src/cat.c:781 +#: src/base64.c:318 src/cat.c:781 #, fuzzy, c-format msgid "closing standard input" msgstr "entrada estándar" @@ -936,15 +939,15 @@ 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/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:53 src/env.c:33 +#: 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/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:65 src/su.c:88 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 +#: 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 e David MacKenzie" @@ -963,7 +966,6 @@ msgstr "" msgid "" "Print NAME with any leading directory components removed.\n" "If specified, also remove a trailing SUFFIX.\n" -"\n" msgstr "" "Imprimir NOME quitando tódolos compoñentes de directorios.\n" "Se se indica, quitar tamén o SUFIXO final.\n" @@ -971,14 +973,14 @@ msgstr "" " --help amosar esta axuda e saír\n" " --version amosa-la información da versión e saír\n" -#: src/basename.c:59 +#: 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" msgstr "" -#: src/basename.c:66 +#: src/basename.c:67 #, c-format msgid "" "\n" @@ -989,20 +991,21 @@ msgid "" " %s -a any/str1 any/str2 -> \"str1\" followed by \"str2\"\n" msgstr "" -#: src/basename.c:167 src/chcon.c:531 src/chgrp.c:277 src/chmod.c:526 -#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1369 +#: 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:183 src/mkfifo.c:108 src/mknod.c:146 src/nohup.c:111 -#: src/pathchk.c:148 src/printf.c:674 src/readlink.c:146 src/realpath.c:236 -#: src/rm.c:314 src/rmdir.c:223 src/seq.c:402 src/setuidgid.c:137 -#: src/sleep.c:119 src/stat.c:1476 src/stdbuf.c:346 src/tr.c:1782 +#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 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 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:52 src/split.c:49 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/split.c:49 msgid "Torbjorn Granlund" msgstr "" @@ -1013,8 +1016,8 @@ msgstr "" msgid "Richard M. Stallman" msgstr "Torbjorn Grandlund e Richard M. Stallman" -#: src/cat.c:88 src/df.c:846 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4720 src/nl.c:182 src/paste.c:435 src/pr.c:2768 src/sum.c:58 +#: 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/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 +1070,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:2209 src/sort.c:379 src/tee.c:165 src/yes.c:86 +#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86 #, c-format msgid "standard output" msgstr "saída estándar" @@ -1084,7 +1087,7 @@ 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:55 src/head.c:46 src/hostid.c:33 +#: 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 @@ -1092,7 +1095,7 @@ msgstr "" msgid "Jim Meyering" msgstr "Mike Haertel e Paul Eggert" -#: src/chcon.c:100 src/runcon.c:203 src/runcon.c:234 +#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238 #, fuzzy, c-format msgid "failed to create security context: %s" msgstr "obtendo os atributos de %s" @@ -1102,8 +1105,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:540 src/copy.c:2222 src/runcon.c:217 -#: src/stat.c:683 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221 +#: src/stat.c:702 #, fuzzy, c-format msgid "failed to get security context of %s" msgstr "obtendo os atributos de %s" @@ -1119,12 +1122,12 @@ 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:446 src/ls.c:2981 +#: src/du.c:457 src/ls.c:2981 #, 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:426 +#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437 #, fuzzy, c-format msgid "cannot read directory %s" msgstr "non se pode crea-lo directorio %s" @@ -1134,13 +1137,13 @@ 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:599 +#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562 #, 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:618 -#: src/remove.c:613 +#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642 +#: src/remove.c:576 #, fuzzy, c-format msgid "fts_close failed" msgstr "o peche fallou" @@ -1161,10 +1164,9 @@ msgid "" "Change the security context of each FILE to CONTEXT.\n" "With --reference, change the security context of each FILE to that of " "RFILE.\n" -"\n" msgstr "" -#: src/chcon.c:362 src/chgrp.c:123 src/chown.c:94 +#: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94 msgid "" " --dereference affect the referent of each symbolic link (this is\n" " the default), rather than the symbolic link itself\n" @@ -1172,7 +1174,7 @@ msgid "" "file\n" msgstr "" -#: src/chcon.c:367 +#: src/chcon.c:369 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" @@ -1180,22 +1182,28 @@ msgid "" " -l, --range=RANGE set range RANGE in the target security context\n" msgstr "" -#: src/chcon.c:373 +#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 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 msgid "" " --reference=RFILE use RFILE's security context rather than " "specifying\n" " a CONTEXT value\n" msgstr "" -#: src/chcon.c:377 src/chgrp.c:140 src/chown.c:118 +#: 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:380 +#: src/chcon.c:386 msgid " -v, --verbose output a diagnostic for every file processed\n" msgstr "" -#: src/chcon.c:383 src/chgrp.c:143 src/chown.c:121 +#: src/chcon.c:389 src/chgrp.c:143 src/chown.c:121 msgid "" "\n" "The following options modify how a hierarchy is traversed when the -R\n" @@ -1210,36 +1218,36 @@ msgid "" "\n" msgstr "" -#: src/chcon.c:512 src/chgrp.c:264 src/chown.c:267 +#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267 #, c-format msgid "-R --dereference requires either -H or -L" msgstr "" -#: src/chcon.c:518 +#: src/chcon.c:524 #, c-format msgid "-R -h requires -P" msgstr "" -#: src/chcon.c:533 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282 -#: src/comm.c:429 src/csplit.c:1371 src/join.c:1149 src/link.c:79 -#: src/mknod.c:148 src/setuidgid.c:139 src/tr.c:1785 +#: 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 msgid "missing operand after %s" msgstr "%s: esperábase un enteiro tras \"%c\"" -#: src/chcon.c:556 src/runcon.c:247 +#: src/chcon.c:562 src/runcon.c:251 #, fuzzy, c-format msgid "invalid context: %s" msgstr "opción de anchura non válida: \"%s\"" -#: src/chcon.c:563 +#: src/chcon.c:569 #, c-format msgid "conflicting security context specifiers given" msgstr "" -#: src/chcon.c:572 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:433 src/cp.c:493 -#: src/mv.c:96 src/pwd.c:273 src/rm.c:324 src/touch.c:351 +#: 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 #, fuzzy, c-format msgid "failed to get attributes of %s" msgstr "obtendo os atributos de %s" @@ -1284,12 +1292,6 @@ msgstr "" " --help amosar esta axuda e saír\n" " --version amosar información sobre a versión e saír\n" -#: src/chgrp.c:132 src/chmod.c:387 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/chgrp.c:136 msgid "" " --reference=RFILE use RFILE's group rather than specifying a\n" @@ -1519,7 +1521,7 @@ msgstr "" msgid "Roland McGrath" msgstr "" -#: src/chroot.c:97 src/install.c:575 src/setuidgid.c:110 src/setuidgid.c:120 +#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120 #, fuzzy, c-format msgid "invalid group %s" msgstr "grupo incorrecto" @@ -1581,8 +1583,8 @@ msgstr "non se poden omiti-lo usuario e o grupo" msgid "failed to set user-ID" msgstr "" -#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:213 src/stdbuf.c:366 -#: src/timeout.c:402 +#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365 +#: src/timeout.c:454 #, fuzzy, c-format msgid "failed to run command %s" msgstr "obtendo os atributos de %s" @@ -1688,19 +1690,23 @@ msgstr "\\%c: secuencia de escape non válida" msgid "empty %s not allowed" msgstr "" -#: src/copy.c:168 src/dd.c:1609 src/dd.c:1976 -#, fuzzy, c-format -msgid "reading %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 +#, 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:426 +#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425 #, fuzzy, c-format msgid "cannot lseek %s" msgstr "non se poden cambia-los permisos de `%s'" -#: src/copy.c:206 src/dd.c:2039 src/dd.c:2102 -#, fuzzy, c-format -msgid "writing %s" +#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151 +#, c-format +msgid "error writing %s" msgstr "erro escribindo %s" #: src/copy.c:313 @@ -1723,7 +1729,7 @@ msgstr "obtendo os atributos de %s" msgid "clearing permissions for %s" msgstr "non se pode cambia-los permisos de %s" -#: src/copy.c:697 src/copy.c:2470 src/cp.c:331 +#: src/copy.c:697 src/copy.c:2480 src/cp.c:329 #, fuzzy, c-format msgid "failed to preserve ownership for %s" msgstr "mantense o dono de %s" @@ -1738,14 +1744,14 @@ msgstr "mantense a data de %s" msgid "failed to preserve authorship for %s" msgstr "mantense o dono de %s" -#: src/copy.c:804 src/csplit.c:638 src/du.c:901 src/fmt.c:449 src/head.c:847 -#: src/sort.c:4489 src/split.c:1329 src/tail.c:1756 src/wc.c:678 +#: 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 "non se pode abrir %s para lectura" -#: src/copy.c:810 src/copy.c:972 src/dd.c:1546 src/dd.c:2114 src/dd.c:2252 -#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:141 +#: 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 #, fuzzy, c-format msgid "cannot fstat %s" msgstr "non se poden cambia-los permisos de `%s'" @@ -1765,14 +1771,14 @@ msgstr "" 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:1574 src/copy.c:1777 src/copy.c:1935 src/ln.c:314 -#: src/remove.c:267 src/remove.c:293 src/remove.c:444 src/remove.c:465 +#: 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 "non se poden cambia-los permisos de `%s'" -#: src/copy.c:886 src/copy.c:1578 src/copy.c:1772 src/copy.c:1940 -#: src/remove.c:418 +#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945 +#: src/remove.c:375 #, fuzzy, c-format msgid "removed %s\n" msgstr "borrando %s\n" @@ -1792,187 +1798,187 @@ msgstr "non se pode crea-lo ficheiro temporal" 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:2531 +#: src/copy.c:1098 src/copy.c:2541 #, c-format msgid "preserving times for %s" msgstr "mantense a data de %s" -#: src/copy.c:1170 src/copy.c:1176 src/head.c:855 src/touch.c:175 -#: src/truncate.c:413 +#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172 +#: src/truncate.c:417 #, fuzzy, c-format -msgid "closing %s" -msgstr "pechando %s (fd=%d)" +msgid "failed to close %s" +msgstr "mantense a data de %s" -#: src/copy.c:1466 +#: src/copy.c:1471 #, fuzzy, c-format msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? " msgstr "%s: ¿sobrescribir %s, ignorando o modo %04lo? " -#: src/copy.c:1473 +#: src/copy.c:1478 #, fuzzy, c-format msgid "%s: overwrite %s? " msgstr "%s: erro de escritura" -#: src/copy.c:1542 +#: src/copy.c:1547 #, c-format msgid " (backup: %s)" msgstr " (copia de seguridade: %s)" -#: src/copy.c:1552 +#: src/copy.c:1557 #, c-format msgid "failed to restore the default file creation context" msgstr "" -#: src/copy.c:1584 +#: src/copy.c:1589 #, fuzzy, c-format msgid "cannot create hard link %s to %s" msgstr "non se pode crea-lo directorio %s" -#: src/copy.c:1637 src/copy.c:1689 src/copy.c:2272 src/copy.c:2589 +#: 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:1220 src/truncate.c:365 +#: src/stat.c:1239 src/truncate.c:363 #, fuzzy, c-format msgid "cannot stat %s" msgstr "non se poden cambia-los permisos de `%s'" -#: src/copy.c:1645 +#: src/copy.c:1650 #, fuzzy, c-format msgid "omitting directory %s" msgstr "non se pode crea-lo directorio %s" -#: src/copy.c:1659 +#: src/copy.c:1664 #, c-format msgid "warning: source file %s specified more than once" msgstr "" -#: src/copy.c:1707 src/ln.c:246 +#: src/copy.c:1712 src/ln.c:246 #, c-format msgid "%s and %s are the same file" msgstr "%s e %s son o mesmo ficheiro" -#: src/copy.c:1806 +#: src/copy.c:1811 #, fuzzy, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "non se pode cambiar ao directorio %s" -#: src/copy.c:1824 src/ln.c:214 +#: src/copy.c:1829 src/ln.c:214 #, 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:1842 +#: src/copy.c:1847 #, fuzzy, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "non se pode crea-lo directorio %s" -#: src/copy.c:1856 +#: src/copy.c:1861 #, fuzzy, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "non se pode cambiar ao directorio %s" -#: src/copy.c:1886 +#: src/copy.c:1891 #, 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:1887 +#: src/copy.c:1892 #, 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:1910 src/ln.c:276 +#: src/copy.c:1915 src/ln.c:276 #, fuzzy, c-format msgid "cannot backup %s" msgstr "non se poden cambia-los permisos de `%s'" -#: src/copy.c:1974 +#: src/copy.c:1979 #, 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:2051 +#: src/copy.c:2056 #, fuzzy, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "non se pode crea-lo directorio %s" -#: src/copy.c:2068 +#: src/copy.c:2073 #, fuzzy, c-format msgid "will not create hard link %s to directory %s" msgstr "non se pode cambiar ao directorio %s" -#: src/copy.c:2118 +#: src/copy.c:2123 #, fuzzy, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "non se pode cambiar ao directorio %s" -#: src/copy.c:2161 +#: src/copy.c:2166 #, fuzzy, c-format msgid "cannot move %s to %s" msgstr "non se poden cambia-los permisos de `%s'" -#: src/copy.c:2173 +#: src/copy.c:2178 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" -#: src/copy.c:2207 src/install.c:905 src/mkdir.c:189 src/mkfifo.c:114 -#: src/mknod.c:167 +#: 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:2241 +#: src/copy.c:2246 #, 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:2350 +#: src/copy.c:2355 #, 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:2357 +#: src/copy.c:2362 #, fuzzy, c-format msgid "cannot create symbolic link %s to %s" msgstr "non se pode crea-lo directorio %s" -#: src/copy.c:2406 src/mkfifo.c:133 +#: src/copy.c:2416 src/mkfifo.c:132 #, fuzzy, c-format msgid "cannot create fifo %s" msgstr "non se pode crea-lo directorio %s" -#: src/copy.c:2415 +#: src/copy.c:2425 #, fuzzy, c-format msgid "cannot create special file %s" msgstr "ficheiro especial de carácter" -#: src/copy.c:2426 src/ls.c:3191 src/stat.c:902 +#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921 #, fuzzy, c-format msgid "cannot read symbolic link %s" msgstr "ligazón simbólica" -#: src/copy.c:2453 +#: src/copy.c:2463 #, fuzzy, c-format msgid "cannot create symbolic link %s" msgstr "non se pode crea-lo directorio %s" -#: src/copy.c:2485 +#: src/copy.c:2495 #, c-format msgid "%s has unknown file type" msgstr "%s é un tipo de ficheiro descoñecido" -#: src/copy.c:2629 src/ln.c:358 +#: src/copy.c:2644 src/ln.c:358 #, fuzzy, c-format msgid "cannot un-backup %s" msgstr "non se poden cambia-los permisos de `%s'" -#: src/copy.c:2633 +#: src/copy.c:2648 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (restaurado da copia de seguridade)\n" -#: src/cp.c:156 src/mv.c:284 +#: src/cp.c:156 src/mv.c:286 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -1984,25 +1990,10 @@ msgstr "" " ou: %s [OPCIÓN]... PRIMEIRO INCREMENTO ÚLTIMO\n" #: src/cp.c:162 -msgid "" -"Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" -"\n" +msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" msgstr "" -#: src/cp.c:166 src/csplit.c:1458 src/cut.c:197 src/df.c:852 src/du.c:268 -#: src/expand.c:112 src/fmt.c:275 src/fold.c:75 src/head.c:115 -#: src/install.c:612 src/kill.c:86 src/ln.c:392 src/ls.c:4726 src/mkdir.c:61 -#: src/mkfifo.c:56 src/mknod.c:58 src/mv.c:294 src/nl.c:191 src/paste.c:445 -#: src/pr.c:2777 src/ptx.c:1825 src/shred.c:153 src/shuf.c:58 src/sort.c:399 -#: src/split.c:211 src/stdbuf.c:95 src/tac.c:142 src/tail.c:268 -#: src/touch.c:226 src/truncate.c:107 src/unexpand.c:122 src/uniq.c:145 -msgid "" -"Mandatory arguments to long options are mandatory for short options too.\n" -msgstr "" -"Os argumentos obrigatorios nas opcións longas tamén o son nas opcións " -"curtas.\n" - -#: src/cp.c:169 +#: src/cp.c:168 msgid "" " -a, --archive same as -dR --preserve=all\n" " --attributes-only don't copy the file data, just the " @@ -2016,32 +2007,33 @@ msgid "" " -d same as --no-dereference --preserve=links\n" msgstr "" -#: src/cp.c:178 +#: src/cp.c:177 msgid "" " -f, --force if an existing destination file cannot be\n" -" opened, remove it and try again (redundant " -"if\n" -" the -n option is used)\n" +" opened, remove it and try again (this " +"option\n" +" is ignored when the -n option is also " +"used)\n" " -i, --interactive prompt before overwrite (overrides a previous " "-n\n" " option)\n" " -H follow command-line symbolic links in SOURCE\n" msgstr "" -#: src/cp.c:188 +#: src/cp.c:186 msgid "" " -l, --link hard link files instead of copying\n" " -L, --dereference always follow symbolic links in SOURCE\n" msgstr "" -#: src/cp.c:192 +#: src/cp.c:190 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:197 +#: src/cp.c:195 msgid "" " -p same as --preserve=mode,ownership,timestamps\n" " --preserve[=ATTR_LIST] preserve the specified attributes (default:\n" @@ -2051,13 +2043,13 @@ msgid "" " all\n" msgstr "" -#: src/cp.c:205 +#: src/cp.c:203 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:209 +#: src/cp.c:207 msgid "" " -R, -r, --recursive copy directories recursively\n" " --reflink[=WHEN] control clone/CoW copies. See below\n" @@ -2066,7 +2058,7 @@ msgid "" "force)\n" msgstr "" -#: src/cp.c:215 +#: src/cp.c:213 #, fuzzy msgid "" " --sparse=WHEN control creation of sparse files. See below\n" @@ -2098,7 +2090,7 @@ msgstr "" "inhibi-la creación de ficheiros con ocos.\n" "\n" -#: src/cp.c:220 +#: src/cp.c:218 msgid "" " -s, --symbolic-link make symbolic links instead of copying\n" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -2107,7 +2099,7 @@ msgid "" " -T, --no-target-directory treat DEST as a normal file\n" msgstr "" -#: src/cp.c:226 +#: src/cp.c:224 #, fuzzy msgid "" " -u, --update copy only when the SOURCE file is newer\n" @@ -2136,7 +2128,7 @@ msgstr "" " --help amosar esta axuda e saír\n" " --version amosa-la información da versión e saír\n" -#: src/cp.c:235 +#: src/cp.c:233 #, fuzzy msgid "" "\n" @@ -2176,7 +2168,7 @@ msgstr "" "inhibi-la creación de ficheiros con ocos.\n" "\n" -#: src/cp.c:247 src/install.c:649 src/ln.c:421 src/mv.c:321 +#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322 #, fuzzy msgid "" "\n" @@ -2198,7 +2190,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:254 src/install.c:656 src/mv.c:328 +#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329 #, fuzzy msgid "" " none, off never make backups (even if --backup is given)\n" @@ -2218,7 +2210,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:260 +#: src/cp.c:258 msgid "" "\n" "As a special case, cp makes a backup of SOURCE when the force and backup\n" @@ -2230,90 +2222,90 @@ 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:319 +#: src/cp.c:317 #, fuzzy, c-format msgid "failed to preserve times for %s" msgstr "mantense a data de %s" -#: src/cp.c:350 +#: src/cp.c:348 #, fuzzy, c-format msgid "failed to preserve permissions for %s" msgstr "non se pode cambia-los permisos de %s" -#: src/cp.c:477 +#: src/cp.c:475 #, fuzzy, c-format msgid "cannot make directory %s" msgstr "non se pode crea-lo directorio %s" -#: src/cp.c:526 src/cp.c:545 +#: src/cp.c:524 src/cp.c:543 #, c-format msgid "%s exists but is not a directory" msgstr "%s existe pero non é un directorio" -#: src/cp.c:572 src/cp.c:1068 src/install.c:401 src/install.c:844 src/ln.c:123 -#: src/ln.c:181 src/ln.c:202 src/ln.c:516 src/mv.c:152 src/mv.c:399 -#, c-format -msgid "accessing %s" -msgstr "accediendo a %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 +#, fuzzy, c-format +msgid "failed to access %s" +msgstr "mantense a data de %s" -#: src/cp.c:592 src/install.c:914 src/ln.c:546 src/mv.c:432 src/shred.c:1182 -#: src/touch.c:433 src/truncate.c:356 +#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181 +#: src/touch.c:429 src/truncate.c:354 #, fuzzy, c-format msgid "missing file operand" msgstr "argumento de salto" -#: src/cp.c:594 src/install.c:916 src/ln.c:560 src/mv.c:434 +#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436 #, fuzzy, c-format msgid "missing destination file operand after %s" msgstr "lista de campos non atopada" -#: src/cp.c:603 src/install.c:925 src/mv.c:443 +#: src/cp.c:601 src/install.c:926 src/mv.c:445 #, 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:619 src/cp.c:1070 src/install.c:403 src/install.c:846 -#: src/install.c:938 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:401 -#: src/mv.c:457 +#: 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 msgid "target %s is not a directory" msgstr "%s existe pero non é un directorio" -#: src/cp.c:730 +#: src/cp.c:728 #, 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:1063 src/install.c:839 src/ln.c:511 src/mv.c:394 +#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395 #, fuzzy, c-format msgid "multiple target directories specified" msgstr "\\%c: secuencia de escape non válida" -#: src/cp.c:1108 +#: src/cp.c:1110 #, 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:1115 src/mv.c:464 +#: src/cp.c:1117 src/mv.c:466 #, 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:1121 +#: src/cp.c:1123 #, c-format msgid "--reflink can be used only with --sparse=auto" msgstr "" -#: src/cp.c:1129 src/install.c:899 src/ln.c:582 src/mv.c:472 +#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474 msgid "backup type" msgstr "tipo de copia de seguridade" -#: src/cp.c:1154 +#: src/cp.c:1156 #, c-format msgid "cannot preserve security context without an SELinux-enabled kernel" msgstr "" -#: src/cp.c:1160 +#: src/cp.c:1162 #, c-format msgid "cannot preserve extended attributes, cp is built without xattr support" msgstr "" @@ -2323,138 +2315,137 @@ msgstr "" msgid "Stuart Kemp" msgstr "" -#: src/csplit.c:529 +#: src/csplit.c:531 #, c-format msgid "input disappeared" msgstr "a entrada desapareceu" -#: src/csplit.c:658 src/csplit.c:669 +#: src/csplit.c:660 src/csplit.c:671 #, c-format msgid "%s: line number out of range" msgstr "%s: número de liña inexistente" -#: src/csplit.c:698 +#: src/csplit.c:700 #, 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:701 src/csplit.c:750 +#: src/csplit.c:703 src/csplit.c:752 #, fuzzy, c-format msgid " on repetition %s\n" msgstr " na repetición %d\n" -#: src/csplit.c:744 +#: src/csplit.c:746 #, fuzzy, c-format msgid "%s: %s: match not found" msgstr "%s: \"%s\": non se atopou nada que coincidira" -#: src/csplit.c:808 src/csplit.c:848 src/nl.c:359 src/tac.c:274 +#: src/csplit.c:810 src/csplit.c:850 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:981 +#: src/csplit.c:983 #, fuzzy, c-format msgid "write error for %s" msgstr "erro de escritura en \"%s\"" -#: src/csplit.c:1057 +#: src/csplit.c:1059 #, fuzzy, c-format msgid "%s: integer expected after delimiter" msgstr "%s: esperábase un enteiro tras \"%c\"" -#: src/csplit.c:1073 +#: src/csplit.c:1075 #, fuzzy, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: fai falla un \"}\" no número de repeticións" -#: src/csplit.c:1083 +#: src/csplit.c:1085 #, fuzzy, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: fai falla un enteiro entre \"{\" e \"}\"" -#: src/csplit.c:1110 +#: src/csplit.c:1112 #, fuzzy, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: delimitador de peche \"%c\" non atopado" -#: src/csplit.c:1127 +#: src/csplit.c:1129 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: expresión regular incorrecta: %s" -#: src/csplit.c:1160 +#: src/csplit.c:1162 #, c-format msgid "%s: invalid pattern" msgstr "%s: patrón incorrecto" -#: src/csplit.c:1163 +#: src/csplit.c:1165 #, 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:1169 +#: src/csplit.c:1171 #, 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:1175 +#: src/csplit.c:1177 #, 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:1253 +#: src/csplit.c:1255 #, c-format msgid "missing conversion specifier in suffix" msgstr "especificador de conversión non atopado no sufixo" -#: src/csplit.c:1259 +#: src/csplit.c:1261 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "especificador de conversión do sufixo incorrecto: %c" -#: src/csplit.c:1262 +#: src/csplit.c:1264 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "especificador de conversión do sufixo incorrecto: \\%.3o" -#: src/csplit.c:1267 +#: src/csplit.c:1269 #, fuzzy, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "especificador de conversión do sufixo incorrecto: %c" -#: src/csplit.c:1284 +#: src/csplit.c:1286 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "demasiadas especificacións de conversión %% no sufixo" -#: src/csplit.c:1298 +#: src/csplit.c:1300 #, c-format msgid "missing %% conversion specification in suffix" msgstr "especificación de conversión %% non atopada no sufixo" -#: src/csplit.c:1345 +#: src/csplit.c:1347 #, c-format msgid "%s: invalid number" msgstr "%s: número incorrecto" -#: src/csplit.c:1449 +#: src/csplit.c:1451 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Uso: %s [OPCIÓN]... FICHEIRO PATRÓN...\n" -#: src/csplit.c:1453 +#: src/csplit.c:1455 #, 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" -"\n" msgstr "" "Gravar anacos do FICHEIRO separadas polos PATRÓNs nos ficheiros \"xx01\",\n" "\"xx02\", ..., e amosa-lo número de bytes de cada anaco na saída estándar.\n" "\n" -#: src/csplit.c:1461 +#: src/csplit.c:1462 #, fuzzy, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2466,7 +2457,7 @@ msgstr "" " -k, --keep-files non elimina-los ficheiros de saída se hai " "erros\n" -#: src/csplit.c:1466 +#: src/csplit.c:1467 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" @@ -2477,7 +2468,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:1473 +#: src/csplit.c:1474 msgid "" "\n" "Read standard input if FILE is -. Each PATTERN may be:\n" @@ -2485,7 +2476,7 @@ msgstr "" "\n" "Lese da entrada estándar se o FICHEIRO é -. Cada PATRÓN pode ser:\n" -#: src/csplit.c:1477 +#: src/csplit.c:1478 #, fuzzy msgid "" "\n" @@ -2512,7 +2503,7 @@ msgstr "" msgid "David M. Ihnat" msgstr "" -#: src/cut.c:64 +#: src/cut.c:64 src/cut.c:372 msgid "fields and positions are numbered from 1" msgstr "" @@ -2522,14 +2513,13 @@ msgid "Usage: %s OPTION... [FILE]...\n" msgstr "Uso: %s [OPCIÓN]... [FICHEIRO]...\n" #: src/cut.c:193 -msgid "" -"Print selected parts of lines from each FILE to standard output.\n" -"\n" +#, 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:200 +#: src/cut.c:199 #, fuzzy msgid "" " -b, --bytes=LIST select only these bytes\n" @@ -2540,7 +2530,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:205 +#: src/cut.c:204 #, fuzzy msgid "" " -f, --fields=LIST select only these fields; also print any line\n" @@ -2553,7 +2543,7 @@ msgstr "" " se indica a opción -s\n" " -n (ignórase)\n" -#: src/cut.c:211 +#: src/cut.c:210 #, fuzzy msgid "" " --complement complement the set of selected bytes, characters\n" @@ -2562,7 +2552,7 @@ msgstr "" " --verbose amosar un diagnóstico no erro estándar antes de\n" " abrir cada ficheiro de saída\n" -#: src/cut.c:215 +#: src/cut.c:214 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2573,7 +2563,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:222 +#: src/cut.c:221 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2581,7 +2571,7 @@ msgid "" "in the same order that it is read, and is written exactly once.\n" msgstr "" -#: src/cut.c:228 +#: src/cut.c:227 #, fuzzy msgid "" "Each range is one of:\n" @@ -2605,48 +2595,50 @@ msgstr "" "\n" "Sen un FICHEIRO, ou cando o FICHEIRO é -, lese da entrada estándar.\n" -#: src/cut.c:368 src/cut.c:489 -msgid "invalid byte or field list" +#: src/cut.c:367 src/cut.c:493 +#, fuzzy +msgid "invalid byte, character or field list" msgstr "lista de bytes ou campos non correcta" -#: src/cut.c:385 +#: src/cut.c:387 #, fuzzy msgid "invalid range with no endpoint: -" msgstr "opción de anchura non válida: \"%s\"" -#: src/cut.c:399 +#: src/cut.c:403 #, fuzzy msgid "invalid decreasing range" msgstr "cadea de tipo incorrecta \"%s\"" -#: src/cut.c:478 +#: src/cut.c:482 #, fuzzy, c-format msgid "byte offset %s is too large" msgstr "%s é grande de máis" -#: src/cut.c:481 +#: src/cut.c:485 #, fuzzy, c-format msgid "field number %s is too large" msgstr "o número do campo é cero" -#: src/cut.c:789 src/cut.c:797 +#: src/cut.c:795 src/cut.c:803 msgid "only one type of list may be specified" msgstr "só se pode indicar un tipo de lista" -#: src/cut.c:806 +#: src/cut.c:812 src/numfmt.c:1408 +#, c-format msgid "the delimiter must be a single character" msgstr "o delimitador debe ser un só carácter" -#: src/cut.c:841 +#: src/cut.c:847 msgid "you must specify a list of bytes, characters, or fields" msgstr "debe especificarse unha lista de bytes, caracteres ou campos" -#: src/cut.c:844 +#: src/cut.c:850 #, 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:848 +#: src/cut.c:854 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2654,11 +2646,11 @@ msgstr "" "elimina-las liñas sen delimitadores ten sentido\n" "\tsó cando se traballa con campos" -#: src/cut.c:864 +#: src/cut.c:870 msgid "missing list of fields" msgstr "lista de campos non atopada" -#: src/cut.c:866 +#: src/cut.c:872 msgid "missing list of positions" msgstr "lista de posicións non atopada" @@ -2672,9 +2664,11 @@ msgstr "" " ou: %s [OPCIÓN] [MMDDhhmm[[SS]AA][.ss]]\n" #: src/date.c:128 +msgid "Display the current time in the given FORMAT, or set the system date.\n" +msgstr "" + +#: src/date.c:134 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" " -I[TIMESPEC], --iso-8601[=TIMESPEC] output date/time in ISO 8601 format.\n" @@ -2683,14 +2677,14 @@ msgid "" " and time to the indicated precision.\n" msgstr "" -#: src/date.c:138 +#: src/date.c:142 msgid "" " -r, --reference=FILE display the last modification time of FILE\n" " -R, --rfc-2822 output date and time in RFC 2822 format.\n" " Example: Mon, 07 Aug 2006 12:34:56 -0600\n" msgstr "" -#: src/date.c:143 +#: src/date.c:147 msgid "" " --rfc-3339=TIMESPEC output date and time in RFC 3339 format.\n" " TIMESPEC='date', 'seconds', or 'ns' for\n" @@ -2701,7 +2695,7 @@ msgid "" " -u, --utc, --universal print or set Coordinated Universal Time\n" msgstr "" -#: src/date.c:154 +#: src/date.c:158 msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" @@ -2710,7 +2704,7 @@ msgid "" " %a locale's abbreviated weekday name (e.g., Sun)\n" msgstr "" -#: src/date.c:161 +#: src/date.c:165 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2718,7 +2712,7 @@ msgid "" " %c locale's date and time (e.g., Thu Mar 3 23:05:25 2005)\n" msgstr "" -#: src/date.c:167 +#: src/date.c:171 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2726,14 +2720,14 @@ msgid "" " %e day of month, space padded; same as %_d\n" msgstr "" -#: src/date.c:173 +#: src/date.c:177 msgid "" " %F full date; same as %Y-%m-%d\n" " %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 "" -#: src/date.c:178 +#: src/date.c:182 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2741,7 +2735,7 @@ msgid "" " %j day of year (001..366)\n" msgstr "" -#: src/date.c:184 +#: src/date.c:188 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -2749,7 +2743,7 @@ msgid "" " %M minute (00..59)\n" msgstr "" -#: src/date.c:190 +#: src/date.c:194 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2760,7 +2754,7 @@ msgid "" " %s seconds since 1970-01-01 00:00:00 UTC\n" msgstr "" -#: src/date.c:199 +#: src/date.c:203 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2768,7 +2762,7 @@ msgid "" " %u day of week (1..7); 1 is Monday\n" msgstr "" -#: src/date.c:205 +#: src/date.c:209 msgid "" " %U week number of year, with Sunday as first day of week (00..53)\n" " %V ISO week number, with Monday as first day of week (01..53)\n" @@ -2776,7 +2770,7 @@ msgid "" " %W week number of year, with Monday as first day of week (00..53)\n" msgstr "" -#: src/date.c:211 +#: src/date.c:215 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -2784,7 +2778,7 @@ msgid "" " %Y year\n" msgstr "" -#: src/date.c:217 +#: src/date.c:221 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -2796,7 +2790,7 @@ msgid "" "By default, date pads numeric fields with zeroes.\n" msgstr "" -#: src/date.c:226 +#: src/date.c:230 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -2807,7 +2801,7 @@ msgid "" " # use opposite case if possible\n" msgstr "" -#: src/date.c:235 +#: src/date.c:239 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -2816,7 +2810,7 @@ msgid "" "O to use the locale's alternate numeric symbols if available.\n" msgstr "" -#: src/date.c:242 +#: src/date.c:246 msgid "" "\n" "Examples:\n" @@ -2830,35 +2824,35 @@ msgid "" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:275 src/dd.c:2193 src/head.c:838 src/md5sum.c:477 -#: src/md5sum.c:798 src/od.c:863 src/od.c:1914 src/pr.c:1176 src/pr.c:1372 -#: src/pr.c:1494 src/stty.c:842 src/tac.c:563 src/tail.c:343 src/tee.c:126 +#: 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 #, c-format msgid "standard input" msgstr "entrada estándar" -#: src/date.c:303 src/date.c:523 +#: src/date.c:307 src/date.c:527 #, fuzzy, c-format msgid "invalid date %s" msgstr "anchura non válida: \"%s\"" -#: src/date.c:414 src/date.c:448 +#: src/date.c:418 src/date.c:452 #, fuzzy, c-format msgid "multiple output formats specified" msgstr "\\%c: secuencia de escape non válida" -#: src/date.c:426 +#: src/date.c:430 #, fuzzy, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "as opcións --string e --check son mutuamente exclusivas" -#: src/date.c:433 +#: src/date.c:437 #, c-format msgid "the options to print and set the time may not be used together" msgstr "as opcións para imprimir e establece-la data non se poden usar xuntas" -#: src/date.c:454 +#: src/date.c:458 #, fuzzy, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -2870,23 +2864,23 @@ msgstr "" "argumentos que non son opcións teñen que ser unha cadea\n" "de formato comezando con `+'." -#: src/date.c:531 +#: src/date.c:535 #, c-format msgid "cannot set date" msgstr "non se pode establece-la data" -#: src/date.c:554 src/du.c:360 +#: src/date.c:558 src/du.c:371 #, fuzzy, c-format msgid "time %s is out of range" msgstr "%s: número de liña inexistente" #. This is a proper name. See the gettext manual, section Names. -#: src/dd.c:44 src/factor.c:43 src/rm.c:41 src/tail.c:69 src/touch.c:41 +#: 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 "" -#: src/dd.c:517 +#: src/dd.c:521 #, fuzzy, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -2895,7 +2889,7 @@ msgstr "" "Uso: %s [FICHEIRO]...\n" " ou: %s [OPCIÓN]\n" -#: src/dd.c:522 +#: src/dd.c:526 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -2906,7 +2900,7 @@ msgid "" " ibs=BYTES read up to BYTES bytes at a time (default: 512)\n" msgstr "" -#: src/dd.c:531 +#: src/dd.c:535 msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -2915,13 +2909,14 @@ msgid "" " oflag=FLAGS write as per the comma separated symbol list\n" " seek=N skip N obs-sized blocks at start of output\n" " skip=N skip N ibs-sized blocks at start of input\n" -" status=noxfer suppress transfer statistics\n" +" status=WHICH WHICH info to suppress outputting to stderr;\n" +" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" msgstr "" -#: src/dd.c:541 +#: src/dd.c:546 msgid "" "\n" -"BLOCKS and BYTES may be followed by the following multiplicative suffixes:\n" +"N and BYTES may be followed by the following multiplicative suffixes:\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, and so on for T, P, E, Z, Y.\n" "\n" @@ -2929,7 +2924,7 @@ msgid "" "\n" msgstr "" -#: src/dd.c:550 +#: src/dd.c:555 #, fuzzy msgid "" " ascii from EBCDIC to ASCII\n" @@ -2958,7 +2953,7 @@ msgstr "" " usalo con block e unblock, completar con espacios en vez de " "NULs\n" -#: src/dd.c:563 +#: src/dd.c:568 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -2974,7 +2969,7 @@ msgstr "" " fdatasync physically write output file data before finishing\n" " fsync likewise, but also write metadata\n" -#: src/dd.c:571 +#: src/dd.c:576 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -2983,76 +2978,76 @@ msgid "" "suggested)\n" msgstr "" -#: src/dd.c:578 +#: src/dd.c:583 msgid " cio use concurrent I/O for data\n" msgstr "" -#: src/dd.c:580 +#: src/dd.c:585 msgid " direct use direct I/O for data\n" msgstr "" -#: src/dd.c:582 +#: src/dd.c:587 #, fuzzy msgid " directory fail unless a directory\n" msgstr "%s existe pero non é un directorio" -#: src/dd.c:584 +#: src/dd.c:589 msgid " dsync use synchronized I/O for data\n" msgstr "" -#: src/dd.c:586 +#: src/dd.c:591 msgid " sync likewise, but also for metadata\n" msgstr "" -#: src/dd.c:587 +#: src/dd.c:592 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr "" -#: src/dd.c:590 +#: src/dd.c:595 msgid " nonblock use non-blocking I/O\n" msgstr "" -#: src/dd.c:592 +#: src/dd.c:597 msgid " noatime do not update access time\n" msgstr "" -#: src/dd.c:595 +#: src/dd.c:600 msgid " nocache discard cached data\n" msgstr "" -#: src/dd.c:598 +#: src/dd.c:603 msgid " noctty do not assign controlling terminal from file\n" msgstr "" -#: src/dd.c:601 +#: src/dd.c:606 msgid " nofollow do not follow symlinks\n" msgstr "" -#: src/dd.c:603 +#: src/dd.c:608 msgid " nolinks fail if multiply-linked\n" msgstr "" -#: src/dd.c:605 +#: src/dd.c:610 msgid " binary use binary I/O for data\n" msgstr "" -#: src/dd.c:607 +#: src/dd.c:612 msgid " text use text I/O for data\n" msgstr "" -#: src/dd.c:609 +#: src/dd.c:614 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:612 +#: src/dd.c:617 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:615 +#: src/dd.c:620 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:620 +#: src/dd.c:625 #, c-format msgid "" "\n" @@ -3069,28 +3064,28 @@ msgid "" "\n" msgstr "" -#: src/dd.c:676 +#: src/dd.c:683 #, c-format msgid "" "%<PRIuMAX>+%<PRIuMAX> records in\n" "%<PRIuMAX>+%<PRIuMAX> records out\n" msgstr "" -#: src/dd.c:682 +#: src/dd.c:689 #, 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:694 +#: src/dd.c:701 #, c-format msgid "%<PRIuMAX> byte (%s) copied" msgid_plural "%<PRIuMAX> bytes (%s) copied" msgstr[0] "" msgstr[1] "" -#: src/dd.c:712 +#: src/dd.c:720 msgid "Infinity B" msgstr "" @@ -3104,240 +3099,261 @@ 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:725 +#: src/dd.c:733 #, c-format msgid ", %g s, %s/s\n" msgstr "" -#: src/dd.c:804 +#: src/dd.c:812 #, fuzzy, c-format msgid "closing input file %s" msgstr "creando ficheiro \"%s\"\n" -#: src/dd.c:811 +#: src/dd.c:819 #, c-format msgid "closing output file %s" msgstr "pechando o ficheiro de saída %s" -#: src/dd.c:1014 +#: src/dd.c:1022 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "" -#: src/dd.c:1085 src/dd.c:1934 +#: src/dd.c:1093 src/dd.c:1942 #, fuzzy, c-format msgid "writing to %s" msgstr "erro escribindo %s" -#: src/dd.c:1199 src/dd.c:1253 +#: src/dd.c:1207 src/dd.c:1261 #, fuzzy, c-format msgid "unrecognized operand %s" msgstr "opción descoñecida \"-%c\"" -#: src/dd.c:1210 +#: src/dd.c:1218 #, fuzzy msgid "invalid conversion" msgstr "opción de anchura non válida: \"%s\"" -#: src/dd.c:1213 src/dd.c:1289 +#: src/dd.c:1221 src/dd.c:1297 #, fuzzy msgid "invalid input flag" msgstr "número non válido ao comezo do campo" -#: src/dd.c:1216 src/dd.c:1283 src/dd.c:1295 +#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303 #, fuzzy msgid "invalid output flag" msgstr "grupo incorrecto" -#: src/dd.c:1219 +#: src/dd.c:1227 #, fuzzy msgid "invalid status flag" msgstr "usuario incorrecto" -#: src/dd.c:1258 src/truncate.c:312 +#: src/dd.c:1266 src/truncate.c:310 #, fuzzy, c-format msgid "invalid number %s" msgstr "número incorrecto" -#: src/dd.c:1340 +#: src/dd.c:1348 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "" -#: src/dd.c:1342 +#: src/dd.c:1350 #, fuzzy, c-format msgid "cannot combine block and unblock" msgstr "non se poden omiti-lo usuario e o grupo" -#: src/dd.c:1344 +#: src/dd.c:1352 #, fuzzy, c-format msgid "cannot combine lcase and ucase" msgstr "As cadeas que se compararon foron %s e %s" -#: src/dd.c:1346 +#: src/dd.c:1354 #, fuzzy, c-format msgid "cannot combine excl and nocreat" msgstr "non se pode move-lo punteiro do ficheiro de %s" -#: src/dd.c:1349 +#: src/dd.c:1357 #, fuzzy, c-format msgid "cannot combine direct and nocache" msgstr "non se pode move-lo punteiro do ficheiro de %s" -#: src/dd.c:1506 +#: src/dd.c:1514 #, 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:1593 +#: src/dd.c:1601 #, fuzzy, c-format msgid "%s: cannot skip" msgstr "non se pode executar %s" -#: src/dd.c:1595 src/dd.c:1614 src/dd.c:1675 +#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683 #, fuzzy, c-format msgid "%s: cannot seek" msgstr "%s: non se pode borrar" -#: src/dd.c:1655 +#: src/dd.c:1663 #, c-format msgid "offset overflow while reading file %s" msgstr "" -#: src/dd.c:1667 +#: src/dd.c:1675 #, 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:1671 +#: src/dd.c:1679 #, c-format msgid "cannot work around kernel bug after all" msgstr "" -#: src/dd.c:1814 +#: src/dd.c:1822 #, fuzzy, c-format msgid "setting flags for %s" msgstr "establecendo a data de %s" -#: src/dd.c:1867 +#: src/dd.c:1875 #, c-format msgid "memory exhausted by input buffer of size %zu bytes (%s)" msgstr "" -#: src/dd.c:1881 +#: src/dd.c:1889 #, c-format msgid "memory exhausted by output buffer of size %zu bytes (%s)" msgstr "" -#: src/dd.c:1914 +#: src/dd.c:1922 #, fuzzy, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: non se pode desprazar á posición relativa %s%s" -#: src/dd.c:2125 src/dd.c:2258 +#: src/dd.c:2133 #, fuzzy, c-format -msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" +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:2138 +#: src/dd.c:2146 #, c-format msgid "fdatasync failed for %s" msgstr "" -#: src/dd.c:2148 +#: src/dd.c:2156 #, c-format msgid "fsync failed for %s" msgstr "" -#: src/dd.c:2199 src/dd.c:2228 +#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165 #, fuzzy, c-format -msgid "opening %s" -msgstr "erro lendo %s" +msgid "failed to open %s" +msgstr "mantense a data de %s" -#: src/dd.c:2237 +#: src/dd.c:2246 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) " "blocks" msgstr "" -#: src/dd.c:2274 src/dd.c:2280 +#: src/dd.c:2267 +#, 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 #, 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:54 src/expr.c:153 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:39 src/sleep.c:35 src/sort.c:66 +#: 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 msgid "Paul Eggert" msgstr "" -#: src/df.c:140 +#: src/df.c:172 msgid "Filesystem" msgstr "Sist. Fich" -#: src/df.c:141 +#: src/df.c:175 msgid "Type" msgstr "Tipo" -#: src/df.c:142 +#: src/df.c:178 src/df.c:542 msgid "blocks" msgstr "bloques" -#: src/df.c:142 -msgid "Inodes" -msgstr "Inodos" - -#: src/df.c:142 -msgid "Size" -msgstr "Tamaño" - -#: src/df.c:143 +#: src/df.c:181 msgid "Used" msgstr "Usado" -#: src/df.c:143 -msgid "IUsed" -msgstr "IUsados" - -#: src/df.c:144 +#: src/df.c:184 msgid "Available" msgstr "Dispoñib" -#: src/df.c:144 -msgid "IFree" -msgstr "ILibres" - -#: src/df.c:144 -msgid "Avail" -msgstr "Disp" - -#: src/df.c:145 +#: src/df.c:187 msgid "Use%" msgstr "Uso%" -#: src/df.c:145 +#: src/df.c:190 +msgid "Inodes" +msgstr "Inodos" + +#: src/df.c:193 +msgid "IUsed" +msgstr "IUsados" + +#: src/df.c:196 +msgid "IFree" +msgstr "ILibres" + +#: src/df.c:199 msgid "IUse%" msgstr "IUso%" -#: src/df.c:145 +#: src/df.c:202 +msgid "Mounted on" +msgstr "Montado en" + +#: src/df.c:383 +#, c-format +msgid "option --output: field '%s' unknown" +msgstr "" + +#: src/df.c:390 +#, c-format +msgid "option --output: field '%s' used more than once" +msgstr "" + +#: src/df.c:410 src/df.c:449 +msgid "Size" +msgstr "Tamaño" + +#: src/df.c:414 src/df.c:451 +msgid "Avail" +msgstr "Disp" + +#: src/df.c:474 msgid "Capacity" msgstr "Capacid" -#: src/df.c:146 -msgid "Mounted on" -msgstr "Montado en" +#. 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 +#, c-format +msgid "%s-%s" +msgstr "" -#: src/df.c:847 +#: src/df.c:1210 msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" -"\n" msgstr "" -#: src/df.c:855 +#: src/df.c:1217 msgid "" " -a, --all include dummy file systems\n" " -B, --block-size=SIZE scale sizes by SIZE before printing them. E.g.,\n" @@ -3349,7 +3365,7 @@ msgid "" " -H, --si likewise, but use powers of 1000 not 1024\n" msgstr "" -#: src/df.c:865 +#: src/df.c:1227 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3358,8 +3374,11 @@ msgid "" "(default)\n" msgstr "" -#: src/df.c:872 +#: src/df.c:1234 msgid "" +" --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" +" or print all fields if FIELD_LIST is " +"omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" " -t, --type=TYPE limit listing to file systems of type TYPE\n" @@ -3368,21 +3387,43 @@ msgid "" " -v (ignored)\n" msgstr "" -#: src/df.c:1027 +#: src/df.c:1248 +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" +msgstr "" + +#: src/df.c:1285 +#, 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 #, 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:1075 +#: src/df.c:1500 msgid "Warning: " msgstr "Aviso: " -#: src/df.c:1077 src/stat.c:795 +#: src/df.c:1502 src/stat.c:814 #, 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:1107 +#: src/df.c:1539 #, c-format msgid "no file systems processed" msgstr "" @@ -3501,7 +3542,7 @@ msgid "" " %s stdio.h -> \".\"\n" msgstr "" -#: src/du.c:260 src/sort.c:390 src/wc.c:112 +#: src/du.c:270 src/sort.c:394 src/wc.c:112 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3510,14 +3551,14 @@ msgstr "" "Uso: %s [OPCIÓN]... [FICHEIRO]...\n" " ou: %s --traditional [FICHEIRO] [[+]DESPRAZAMENTO [[+]ETIQUETA]]\n" -#: src/du.c:264 -msgid "" -"Summarize disk usage of each FILE, recursively for directories.\n" -"\n" +#: src/du.c:274 +msgid "Summarize disk usage of each FILE, recursively for directories.\n" msgstr "" -#: src/du.c:271 +#: src/du.c:280 msgid "" +" -0, --null end each output line with 0 byte rather than " +"newline\n" " -a, --all write counts for all files, not just directories\n" " --apparent-size print apparent sizes, rather than disk usage; " "although\n" @@ -3526,7 +3567,7 @@ msgid "" " fragmentation, indirect blocks, and the like\n" msgstr "" -#: src/du.c:279 +#: src/du.c:289 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" @@ -3535,9 +3576,14 @@ msgid "" " -c, --total produce a grand total\n" " -D, --dereference-args dereference only symlinks that are listed on the\n" " command line\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 "" -#: src/du.c:288 +#: src/du.c:302 msgid "" " --files0-from=F summarize disk usage of the NUL-terminated file\n" " names specified in file F;\n" @@ -3545,41 +3591,29 @@ msgid "" " -H equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" --si like -h, but use powers of 1000 not 1024\n" msgstr "" -#: src/du.c:297 +#: src/du.c:310 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 "" -#: src/du.c:302 +#: src/du.c:316 msgid "" -" -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " "default)\n" -" -0, --null end each output line with 0 byte rather than " -"newline\n" " -S, --separate-dirs 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:309 -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 "" - -#: src/du.c:318 +#: src/du.c:322 msgid "" +" -t, --threshold=SIZE exclude entries smaller than SIZE if positive,\n" +" or entries greater than SIZE if negative\n" " --time show time of the last modification of any file in " "the\n" " directory, or any of its subdirectories\n" @@ -3590,64 +3624,73 @@ msgid "" " FORMAT is interpreted like 'date'\n" msgstr "" -#: src/du.c:375 +#: src/du.c:333 +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 msgid "Infinity" msgstr "" -#: src/du.c:600 +#: src/du.c:507 +#, c-format +msgid "mount point %s already traversed" +msgstr "" + +#: src/du.c:624 #, fuzzy, c-format msgid "fts_read failed: %s" msgstr "erro de lectura" -#: src/du.c:724 +#: src/du.c:780 #, fuzzy, c-format msgid "invalid maximum depth %s" msgstr "anchura non válida: \"%s\"" -#: src/du.c:817 +#: src/du.c:809 +#, fuzzy, c-format +msgid "invalid --threshold argument '-0'" +msgstr "argumento incorrecto %s para %s" + +#: src/du.c:887 #, 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:824 +#: src/du.c:894 #, 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:830 +#: src/du.c:900 #, fuzzy, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "aviso: resumir vai en conflicto con --max-depth=%d" -#: src/du.c:896 src/sort.c:4479 src/wc.c:668 +#: src/du.c:966 src/sort.c:4533 src/wc.c:668 msgid "file operands cannot be combined with --files0-from" msgstr "" -#: src/du.c:949 src/md5sum.c:587 src/od.c:903 src/tac.c:239 src/tac.c:350 -#: src/tac.c:506 src/tac.c:586 src/wc.c:733 +#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 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:963 src/sort.c:4508 src/wc.c:747 +#: src/du.c:1040 src/sort.c:4562 src/wc.c:747 #, c-format msgid "when reading file names from stdin, no file name of %s allowed" msgstr "" -#: src/du.c:980 src/du.c:988 src/wc.c:760 src/wc.c:768 +#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768 #, fuzzy msgid "invalid zero-length file name" msgstr "grupo incorrecto" -#: src/du.c:1007 src/head.c:149 src/head.c:262 src/head.c:334 src/head.c:538 -#: src/head.c:620 src/head.c:692 src/head.c:750 src/head.c:774 src/tail.c:412 -#: src/tail.c:500 src/tail.c:549 src/tail.c:642 src/tail.c:770 src/tail.c:818 -#: src/tail.c:855 src/tail.c:1782 src/tail.c:1812 src/uniq.c:395 -#, c-format -msgid "error reading %s" -msgstr "erro lendo %s" - -#: src/du.c:1010 src/ls.c:2649 src/wc.c:791 +#: src/du.c:1088 src/ls.c:2649 src/wc.c:791 msgid "total" msgstr "total" @@ -3728,10 +3771,12 @@ msgid "Usage: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n" msgstr "Uso: %s [OPCIÓN]... [FICHEIRO]...\n" #: src/env.c:55 +msgid "Set each NAME to VALUE in the environment and run COMMAND.\n" +msgstr "" + +#: src/env.c:61 #, fuzzy msgid "" -"Set each NAME to VALUE in the environment and run COMMAND.\n" -"\n" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with 0 byte rather than newline\n" " -u, --unset=NAME remove variable from the environment\n" @@ -3743,38 +3788,38 @@ msgstr "" " --help amosar esta axuda e saír\n" " --version amosa-la información da versión e saír\n" -#: src/env.c:64 +#: src/env.c:68 msgid "" "\n" "A mere - implies -i. If no COMMAND, print the resulting environment.\n" msgstr "" -#: src/env.c:120 +#: src/env.c:124 #, fuzzy, c-format msgid "cannot unset %s" msgstr "non se poden cambia-los permisos de `%s'" -#: src/env.c:131 +#: src/env.c:135 #, fuzzy, c-format msgid "cannot set %s" msgstr "non se poden cambia-los permisos de `%s'" -#: src/env.c:148 +#: src/env.c:152 #, c-format msgid "cannot specify --null (-0) with command" msgstr "" #: 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" -"\n" msgstr "" "Converti-las tabulacións de cada FICHEIRO a espacios, gravando na saída\n" "estándar. Sen un FICHEIRO, ou se o FICHEIRO é -, lese da entrada estándar.\n" "\n" -#: src/expand.c:115 +#: src/expand.c:114 #, fuzzy msgid "" " -i, --initial do not convert tabs after non blanks\n" @@ -3784,7 +3829,7 @@ msgstr "" " a un espacio en branco\n" " -t, --tabs=NÚMERO face-las tabulacións de NÚMERO espacios, non 8\n" -#: src/expand.c:119 +#: src/expand.c:118 msgid "" " -t, --tabs=LIST use comma separated list of explicit tab positions\n" msgstr "" @@ -3792,27 +3837,27 @@ msgstr "" "posicións\n" " de tabulación\n" -#: src/expand.c:172 src/unexpand.c:191 +#: src/expand.c:171 src/unexpand.c:190 #, fuzzy, c-format msgid "tab stop is too large %s" msgstr "%s é grande de máis" -#: src/expand.c:180 src/unexpand.c:199 +#: src/expand.c:179 src/unexpand.c:198 #, fuzzy, c-format msgid "tab size contains invalid character(s): %s" msgstr "o tamaño da tabulación contén un carácter incorrecto" -#: src/expand.c:206 src/unexpand.c:225 +#: src/expand.c:205 src/unexpand.c:224 #, c-format msgid "tab size cannot be 0" msgstr "o tamaño da tabulación non pode ser 0" -#: src/expand.c:208 src/unexpand.c:227 +#: src/expand.c:207 src/unexpand.c:226 #, c-format msgid "tab sizes must be ascending" msgstr "os tamaños das tabulacións deben ser crecentes" -#: src/expand.c:326 src/expand.c:345 src/unexpand.c:374 src/unexpand.c:419 +#: src/expand.c:325 src/expand.c:344 src/unexpand.c:373 src/unexpand.c:418 #, fuzzy, c-format msgid "input line is too long" msgstr "%s: ficheiro longo de máis" @@ -3934,12 +3979,12 @@ msgstr "erro ao buscar por expresións regulares" msgid "non-integer argument" msgstr "argumento de límite" -#: src/expr.c:793 src/truncate.c:316 +#: src/expr.c:793 src/truncate.c:314 #, c-format msgid "division by zero" msgstr "" -#: src/expr.c:887 src/sort.c:2029 +#: src/expr.c:887 src/sort.c:2044 #, fuzzy, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "Estabreza LC_ALL='C' para palia-lo problema" @@ -3949,25 +3994,32 @@ msgstr "Estabreza LC_ALL='C' para palia-lo problema" msgid "the strings compared were %s and %s" msgstr "As cadeas que se compararon foron %s e %s" -#: src/factor.c:449 -msgid "using arbitrary-precision arithmetic" +#. This is a proper name. See the gettext manual, section Names. +#: src/factor.c:111 +msgid "Niels Moller" msgstr "" -#: src/factor.c:460 -msgid "using single-precision arithmetic" +#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459 +#, c-format +msgid "Lucas prime test failure. This should not happen" msgstr "" -#: src/factor.c:465 src/od.c:1640 src/od.c:1709 +#: src/factor.c:2092 #, c-format -msgid "%s is too large" -msgstr "%s é grande de máis" +msgid "squfof queue overflow" +msgstr "" -#: src/factor.c:469 +#: src/factor.c:2419 #, fuzzy, c-format msgid "%s is not a valid positive integer" msgstr "`%s' non é un enteiro positivo válido" -#: src/factor.c:494 +#: src/factor.c:2442 src/od.c:1646 src/od.c:1715 +#, c-format +msgid "%s is too large" +msgstr "%s é grande de máis" + +#: src/factor.c:2454 #, fuzzy, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -3976,7 +4028,7 @@ msgstr "" "Uso: %s [FICHEIRO]...\n" " ou: %s [OPCIÓN]\n" -#: src/factor.c:499 +#: src/factor.c:2459 #, fuzzy msgid "" "Print the prime factors of each specified integer NUMBER. If none\n" @@ -4009,21 +4061,20 @@ msgid "cannot stat current directory (now %s)" msgstr "non se pode crea-lo directorio %s" #. This is a proper name. See the gettext manual, section Names. -#: src/fmt.c:37 +#: src/fmt.c:38 msgid "Ross Paterson" msgstr "" -#: src/fmt.c:269 +#: src/fmt.c:270 #, fuzzy, c-format msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n" msgstr "Uso: %s [-DIXITOS] [OPCIÓN]... [FICHEIRO]...\n" -#: src/fmt.c:270 +#: 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" -"\n" msgstr "" "Reformatar cada parágrafo nos FICHEIROs, escribindo na saída estándar.\n" "Se non se indica un FICHEIRO ou se é \"-\", lese da entrada estándar.\n" @@ -4041,8 +4092,8 @@ msgstr "" " -p, --prefix=CADEA combinar só as liñas coa CADEA coma prefixo\n" " -s, --splitonly parti-las liñas longas, pero non encher\n" -#: src/fmt.c:285 -#, fuzzy, c-format +#: src/fmt.c:287 +#, fuzzy, 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" @@ -4054,29 +4105,29 @@ msgstr "" " -u, --uniform-spacing un espacio entre palabras, dous tralas frases\n" " -w, --width=NÚMERO ancho de liña máximo (75 columnas por defecto)\n" -#: src/fmt.c:357 +#: src/fmt.c:359 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" "option; use -w N instead" msgstr "" -#: src/fmt.c:403 src/fmt.c:414 +#: src/fmt.c:405 src/fmt.c:416 #, fuzzy, c-format msgid "invalid width: %s" msgstr "anchura non 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" -"\n" msgstr "" "Parti-las liñas de entrada de cada FICHEIRO (entrada estándar por defecto),\n" "gravando na saída estándar.\n" "\n" -#: src/fold.c:78 +#: src/fold.c:77 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4086,13 +4137,13 @@ msgstr "" " -s, --spaces partir nos espacios\n" " -w, --width=ANCHO empregar ANCHO columnas no canto de 80\n" -#: src/fold.c:289 src/pr.c:836 +#: src/fold.c:288 src/pr.c:832 #, fuzzy, c-format 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:75 +#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 #: src/truncate.c:37 msgid "Padraig Brady" msgstr "" @@ -4108,17 +4159,17 @@ msgid "" "\n" msgstr "" -#: src/group-list.c:69 src/id.c:345 src/setuidgid.c:184 +#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184 #, 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:350 +#: src/group-list.c:74 src/id.c:370 #, fuzzy, c-format msgid "failed to get groups for the current process" msgstr "non foi posible mudar o grupo de %s a %s\n" -#: src/group-list.c:104 +#: src/group-list.c:114 #, fuzzy, c-format msgid "cannot find name for group ID %lu" msgstr "non se pode cambia-lo propietario e/ou grupo de %s" @@ -4161,14 +4212,13 @@ 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" -"\n" msgstr "" "Amosa-las primeiras 10 liñas de cada FICHEIRO na saída estándar.\n" "Con máis dun FICHEIRO, preceder cada un cunha cabeceira que dá o nome do\n" "ficheiro. Sen un FICHEIRO, ou cando este é -, lese da entrada estándar.\n" "\n" -#: src/head.c:118 +#: src/head.c:117 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -4178,7 +4228,7 @@ msgid "" " K lines of each file\n" msgstr "" -#: src/head.c:126 +#: src/head.c:125 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4187,7 +4237,7 @@ msgstr "" " -v, --verbose amosar sempre as cabeceiras cos nomes dos " "ficheiros\n" -#: src/head.c:132 +#: src/head.c:131 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -4195,58 +4245,58 @@ msgid "" "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n" msgstr "" -#: src/head.c:152 -#, c-format -msgid "error writing %s" -msgstr "erro escribindo %s" - -#: src/head.c:155 +#: src/head.c:154 #, c-format msgid "%s: file has shrunk too much" msgstr "" -#: src/head.c:228 src/head.c:1044 +#: src/head.c:227 src/head.c:1051 #, fuzzy, c-format msgid "%s: number of bytes is too large" msgstr "número de bytes a comparar non válido" -#: src/head.c:441 +#: 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:613 src/head.c:684 src/tail.c:450 +#: src/head.c:612 src/head.c:691 src/tail.c:449 #, fuzzy, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: non se pode desprazar á posición %s%s" -#: src/head.c:791 +#: src/head.c:673 +#, 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" -#: src/head.c:878 +#: src/head.c:885 #, c-format msgid "%s: %s is so large that it is not representable" msgstr "%s: %s é tan grande que non é representable" -#: src/head.c:879 +#: src/head.c:886 msgid "number of lines" msgstr "número de liñas" -#: src/head.c:879 +#: src/head.c:886 msgid "number of bytes" msgstr "número de bytes" -#: src/head.c:886 src/tail.c:1947 +#: src/head.c:893 src/tail.c:1947 msgid "invalid number of lines" msgstr "número de liñas incorrecto" -#: src/head.c:887 src/tail.c:1948 +#: src/head.c:894 src/tail.c:1948 msgid "invalid number of bytes" msgstr "número de bytes incorrecto" -#: src/head.c:974 src/head.c:1032 +#: src/head.c:981 src/head.c:1039 #, fuzzy, c-format msgid "invalid trailing option -- %c" msgstr "%s: opción incorrecta -- %c\n" @@ -4371,86 +4421,86 @@ msgstr "non se pode obte-lo tipo de procesador" msgid "cannot get effective UID" msgstr "non se poden cambia-los permisos de `%s'" -#: src/id.c:289 +#: src/id.c:311 #, fuzzy, c-format -msgid "cannot find name for user ID %lu" +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:309 +#: src/id.c:329 #, c-format -msgid "uid=%lu" +msgid "uid=%s" msgstr "" -#: src/id.c:314 +#: src/id.c:334 #, c-format -msgid " gid=%lu" +msgid " gid=%s" msgstr "" -#: src/id.c:321 +#: src/id.c:341 #, c-format -msgid " euid=%lu" +msgid " euid=%s" msgstr "" -#: src/id.c:329 +#: src/id.c:349 #, c-format -msgid " egid=%lu" +msgid " egid=%s" msgstr "" -#: src/id.c:357 +#: src/id.c:377 msgid " groups=" msgstr " grupos=" -#: src/id.c:373 +#: src/id.c:393 #, c-format msgid " context=%s" msgstr "" -#: src/install.c:372 +#: src/install.c:373 #, fuzzy, c-format msgid "warning: %s: failed to change context to %s" msgstr "non se pode crea-lo directorio %s" -#: src/install.c:413 +#: src/install.c:414 #, fuzzy, c-format msgid "creating directory %s" msgstr "non se pode crea-lo directorio %s" -#: src/install.c:481 +#: src/install.c:482 #, fuzzy, c-format msgid "cannot change ownership of %s" msgstr "non se pode cambia-los permisos de %s" -#: src/install.c:505 +#: src/install.c:506 #, fuzzy, c-format msgid "cannot set time stamps for %s" msgstr "non se pode crea-lo directorio %s" -#: src/install.c:526 src/split.c:412 src/timeout.c:387 +#: src/install.c:527 src/split.c:426 src/timeout.c:439 #, fuzzy, c-format msgid "fork system call failed" msgstr "ficheiro especial de bloque" -#: src/install.c:530 +#: src/install.c:531 #, fuzzy, c-format msgid "cannot run %s" msgstr "non se poden cambia-los permisos de `%s'" -#: src/install.c:534 +#: src/install.c:535 #, fuzzy, c-format msgid "waiting for strip" msgstr "erro escribindo %s" -#: src/install.c:536 +#: src/install.c:537 #, c-format msgid "strip process terminated abnormally" msgstr "" -#: src/install.c:557 +#: src/install.c:558 #, fuzzy, c-format msgid "invalid user %s" msgstr "usuario incorrecto" -#: src/install.c:593 +#: src/install.c:594 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -4462,7 +4512,7 @@ msgstr "" " ou: %s [OPCIÓN]... PRIMEIRO ÚLTIMO\n" " ou: %s [OPCIÓN]... PRIMEIRO INCREMENTO ÚLTIMO\n" -#: src/install.c:600 +#: src/install.c:601 msgid "" "\n" "This install program copies files (often just compiled) into destination\n" @@ -4474,7 +4524,6 @@ msgid "" "In the first three forms, copy SOURCE to DEST or multiple SOURCE(s) to\n" "the existing DIRECTORY, while setting permission modes and owner/group.\n" "In the 4th form, create all components of the given DIRECTORY(ies).\n" -"\n" msgstr "" #: src/install.c:615 @@ -4522,55 +4571,55 @@ msgid "" "directories\n" msgstr "" -#: src/install.c:858 +#: src/install.c:859 #, c-format msgid "" "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled" msgstr "" -#: src/install.c:868 +#: src/install.c:869 #, c-format msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled" msgstr "" -#: src/install.c:885 +#: src/install.c:886 #, 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:888 +#: src/install.c:889 #, 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:892 +#: src/install.c:893 #, c-format msgid "cannot force target context to %s and preserve it" msgstr "" -#: src/install.c:946 src/mkdir.c:202 src/stdbuf.c:327 +#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326 #, fuzzy, c-format msgid "invalid mode %s" msgstr "anchura non válida: \"%s\"" -#: src/install.c:953 +#: src/install.c:954 #, c-format msgid "WARNING: ignoring --strip-program option as -s option was not specified" msgstr "" -#: src/install.c:958 +#: src/install.c:959 #, 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:965 +#: src/install.c:966 #, 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:971 +#: src/install.c:972 #, c-format msgid "" "the --compare (-C) option is ignored when you specify a mode with non-" @@ -4578,7 +4627,7 @@ msgid "" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/join.c:40 src/sort.c:65 +#: src/join.c:40 src/sort.c:66 #, fuzzy msgid "Mike Haertel" msgstr "Mike Haertel e Paul Eggert" @@ -4662,7 +4711,7 @@ msgstr "" #: src/join.c:403 #, c-format -msgid "%s:%ju: is not sorted: %.*s" +msgid "%s:%<PRIuMAX>: is not sorted: %.*s" msgstr "" #: src/join.c:840 src/join.c:1038 @@ -4690,12 +4739,12 @@ msgstr "" msgid "conflicting empty-field replacement strings" msgstr "" -#: src/join.c:1101 src/sort.c:4414 +#: src/join.c:1101 src/sort.c:4468 #, fuzzy, c-format msgid "multi-character tab %s" msgstr "tabulación multi-carácter \"%s\"" -#: src/join.c:1105 src/sort.c:4419 +#: src/join.c:1105 src/sort.c:4473 #, c-format msgid "incompatible tabs" msgstr "" @@ -4714,12 +4763,10 @@ msgid "" msgstr "" #: src/kill.c:82 -msgid "" -"Send signals to processes, or list signals.\n" -"\n" +msgid "Send signals to processes, or list signals.\n" msgstr "" -#: src/kill.c:89 +#: src/kill.c:88 #, fuzzy msgid "" " -s, --signal=SIGNAL, -SIGNAL\n" @@ -4736,7 +4783,7 @@ msgstr "" " --help amosar esta axuda e saír\n" " --version amosa-la información da versión e saír\n" -#: src/kill.c:97 +#: src/kill.c:96 msgid "" "\n" "SIGNAL may be a signal name like 'HUP', or a signal number like '1',\n" @@ -4744,32 +4791,32 @@ msgid "" "PID is an integer; if negative it identifies a process group.\n" msgstr "" -#: src/kill.c:206 +#: src/kill.c:205 #, fuzzy, c-format msgid "%s: invalid process id" msgstr "%s: patrón incorrecto" -#: src/kill.c:260 +#: src/kill.c:259 #, fuzzy, c-format msgid "invalid option -- %c" msgstr "%s: opción incorrecta -- %c\n" -#: src/kill.c:269 +#: src/kill.c:268 #, fuzzy, c-format msgid "%s: multiple signals specified" msgstr "\\%c: secuencia de escape non válida" -#: src/kill.c:283 +#: src/kill.c:282 #, c-format msgid "multiple -l or -t options specified" msgstr "" -#: src/kill.c:300 +#: src/kill.c:299 #, c-format msgid "cannot combine signal with -l or -t" msgstr "" -#: src/kill.c:306 +#: src/kill.c:305 #, c-format msgid "no process ID specified" msgstr "" @@ -4876,10 +4923,9 @@ msgid "" "When creating hard links, each TARGET must exist. Symbolic links\n" "can hold arbitrary text; if later resolved, a relative link is\n" "interpreted in relation to its parent directory.\n" -"\n" msgstr "" -#: src/ln.c:395 +#: src/ln.c:394 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -4892,7 +4938,7 @@ msgid "" " -f, --force remove existing destination files\n" msgstr "" -#: src/ln.c:403 +#: src/ln.c:402 msgid "" " -i, --interactive prompt whether to remove destinations\n" " -L, --logical dereference TARGETs that are symbolic links\n" @@ -4904,7 +4950,7 @@ msgid "" " -s, --symbolic make symbolic links instead of hard links\n" msgstr "" -#: src/ln.c:412 +#: src/ln.c:411 msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" " -t, --target-directory=DIRECTORY specify the DIRECTORY in which to " @@ -4914,30 +4960,10 @@ msgid "" " -v, --verbose print name of each linked file\n" msgstr "" -#: src/ln.c:428 -#, 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" - -#: src/ln.c:435 +#: src/ln.c:433 #, 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 "" @@ -5012,7 +5038,7 @@ msgstr "" "ignorando o tamaño de tabulador non válido na variable de ambiente TABSIZE: " "%s" -#: src/ls.c:1750 src/ptx.c:1976 +#: src/ls.c:1750 src/ptx.c:1975 #, fuzzy, c-format msgid "invalid line width: %s" msgstr "anchura non válida: \"%s\"" @@ -5076,7 +5102,7 @@ msgstr "non se pode crea-lo directorio %s" msgid "closing directory %s" msgstr "non se pode cambiar ao directorio %s" -#: src/ls.c:3301 +#: src/ls.c:3302 #, fuzzy, c-format msgid "cannot compare file names %s and %s" msgstr "As cadeas que se compararon foron %s e %s" @@ -5085,10 +5111,9 @@ msgstr "As cadeas que se compararon foron %s e %s" msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" -"\n" msgstr "" -#: src/ls.c:4729 +#: src/ls.c:4728 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -5097,7 +5122,7 @@ msgid "" "characters\n" msgstr "" -#: src/ls.c:4735 +#: src/ls.c:4734 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them. E." "g.,\n" @@ -5111,7 +5136,7 @@ msgid "" " otherwise: sort by ctime, newest first\n" msgstr "" -#: src/ls.c:4745 +#: src/ls.c:4744 msgid "" " -C list entries by columns\n" " --color[=WHEN] colorize the output. WHEN defaults to " @@ -5123,7 +5148,7 @@ msgid "" " -D, --dired generate output designed for Emacs' dired mode\n" msgstr "" -#: src/ls.c:4753 +#: src/ls.c:4752 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -5133,11 +5158,11 @@ msgid "" " --full-time like -l --time-style=full-iso\n" msgstr "" -#: src/ls.c:4761 +#: src/ls.c:4760 msgid " -g like -l, but do not list owner\n" msgstr "" -#: src/ls.c:4764 +#: src/ls.c:4763 msgid "" " --group-directories-first\n" " group directories before files.\n" @@ -5145,7 +5170,7 @@ msgid "" " use of --sort=none (-U) disables grouping\n" msgstr "" -#: src/ls.c:4770 +#: src/ls.c:4769 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" @@ -5153,7 +5178,7 @@ msgid "" " --si likewise, but use powers of 1000 not 1024\n" msgstr "" -#: src/ls.c:4776 +#: src/ls.c:4775 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5166,7 +5191,7 @@ msgid "" " (overridden by -a or -A)\n" msgstr "" -#: src/ls.c:4786 +#: src/ls.c:4785 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -5178,7 +5203,7 @@ msgid "" " -k, --kibibytes use 1024-byte blocks\n" msgstr "" -#: src/ls.c:4796 +#: src/ls.c:4795 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5188,7 +5213,7 @@ msgid "" "entries\n" msgstr "" -#: src/ls.c:4804 +#: src/ls.c:4803 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. " @@ -5199,7 +5224,7 @@ msgid "" " append / indicator to directories\n" msgstr "" -#: src/ls.c:4812 +#: src/ls.c:4811 #, fuzzy msgid "" " -q, --hide-control-chars print ? instead of non graphic characters\n" @@ -5255,7 +5280,7 @@ msgstr "" " -R, --recursive amosa-los subdirectorios recursivamente\n" " -s, --size escribi-lo tamaño de cada ficheiro, en bloques\n" -#: src/ls.c:4821 +#: src/ls.c:4820 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -5263,7 +5288,7 @@ msgid "" "blocks\n" msgstr "" -#: src/ls.c:4826 +#: src/ls.c:4825 msgid "" " -S sort by file size\n" " --sort=WORD sort by WORD instead of name: none -U,\n" @@ -5275,7 +5300,7 @@ msgid "" " if --sort=time\n" msgstr "" -#: src/ls.c:4836 +#: src/ls.c:4835 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, +FORMAT.\n" @@ -5287,13 +5312,13 @@ msgid "" " takes effect only outside the POSIX locale\n" msgstr "" -#: src/ls.c:4845 +#: src/ls.c:4844 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:4849 +#: src/ls.c:4848 msgid "" " -u with -lt: sort by, and show, access time\n" " with -l: show access time and sort by name\n" @@ -5302,7 +5327,7 @@ msgid "" " -v natural sort of (version) numbers within text\n" msgstr "" -#: src/ls.c:4856 +#: src/ls.c:4855 #, fuzzy msgid "" " -w, --width=COLS assume screen width instead of current value\n" @@ -5317,7 +5342,7 @@ msgstr "" " se indica a opción -s\n" " -n (ignórase)\n" -#: src/ls.c:4866 +#: src/ls.c:4865 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5326,7 +5351,7 @@ msgid "" "variable can change the settings. Use the dircolors command to set it.\n" msgstr "" -#: src/ls.c:4873 +#: src/ls.c:4872 msgid "" "\n" "Exit status:\n" @@ -5351,7 +5376,7 @@ msgstr "" msgid "David Madore" msgstr "" -#: src/md5sum.c:162 +#: src/md5sum.c:164 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -5364,13 +5389,13 @@ msgstr "" "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/md5sum.c:172 +#: src/md5sum.c:174 msgid "" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr "" -#: src/md5sum.c:176 +#: src/md5sum.c:178 #, fuzzy msgid " -b, --binary read in binary mode\n" msgstr "" @@ -5378,21 +5403,25 @@ msgstr "" " -B, --binary usar escrituras binarias á consola.\n" "\n" -#: src/md5sum.c:179 +#: src/md5sum.c:181 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr "" -#: src/md5sum.c:183 +#: src/md5sum.c:184 +msgid " --tag create a BSD-style checksum\n" +msgstr "" + +#: src/md5sum.c:188 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" -#: src/md5sum.c:187 +#: src/md5sum.c:192 msgid " -t, --text read in text mode (default)\n" msgstr "" -#: src/md5sum.c:190 +#: src/md5sum.c:195 #, fuzzy msgid "" "\n" @@ -5408,12 +5437,12 @@ msgstr "" " -w, --warn abisar das liñas mal formatadas\n" "\n" -#: src/md5sum.c:198 +#: src/md5sum.c:203 msgid "" " --strict with --check, exit non-zero for any invalid input\n" msgstr "" -#: src/md5sum.c:203 +#: src/md5sum.c:208 #, fuzzy, c-format msgid "" "\n" @@ -5428,78 +5457,88 @@ 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:502 +#: src/md5sum.c:523 #, 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:526 +#: src/md5sum.c:547 #, 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:551 +#: src/md5sum.c:572 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: apertura ou lectura FALLIDA\n" -#: src/md5sum.c:574 +#: src/md5sum.c:595 msgid "FAILED" msgstr "FALLA" -#: src/md5sum.c:576 +#: src/md5sum.c:597 msgid "OK" msgstr "OK" -#: src/md5sum.c:600 +#: src/md5sum.c:621 #, 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:610 +#: src/md5sum.c:631 #, c-format msgid "WARNING: %<PRIuMAX> line is improperly formatted" msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted" msgstr[0] "" msgstr[1] "" -#: src/md5sum.c:618 +#: src/md5sum.c:639 #, 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:626 +#: src/md5sum.c:647 #, 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:704 +#: src/md5sum.c:760 +#, c-format +msgid "--tag does not support --text mode" +msgstr "" + +#: src/md5sum.c:766 +#, 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 #, 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:712 +#: src/md5sum.c:781 #, 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:719 +#: src/md5sum.c:788 #, 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:726 +#: src/md5sum.c:795 #, 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:733 +#: src/md5sum.c:802 #, 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" @@ -5510,12 +5549,10 @@ msgid "Usage: %s [OPTION]... DIRECTORY...\n" msgstr "Uso: %s [OPCIÓN]... [FICHEIRO]...\n" #: src/mkdir.c:57 -msgid "" -"Create the DIRECTORY(ies), if they do not already exist.\n" -"\n" +msgid "Create the DIRECTORY(ies), if they do not already exist.\n" msgstr "" -#: src/mkdir.c:64 +#: src/mkdir.c:63 #, fuzzy msgid "" " -m, --mode=MODE set file mode (as in chmod), not a=rwx - umask\n" @@ -5534,7 +5571,7 @@ msgstr "" " --help amosar esta axuda e saír\n" " --version amosa-la información da versión e saír\n" -#: src/mkdir.c:169 +#: src/mkdir.c:168 #, fuzzy, c-format msgid "created directory %s" msgstr "non se pode crea-lo directorio %s" @@ -5545,12 +5582,10 @@ msgid "Usage: %s [OPTION]... NAME...\n" msgstr "Uso: %s [OPCIÓN]... [FICHEIRO]...\n" #: src/mkfifo.c:52 -msgid "" -"Create named pipes (FIFOs) with the given NAMEs.\n" -"\n" +msgid "Create named pipes (FIFOs) with the given NAMEs.\n" msgstr "" -#: src/mkfifo.c:59 src/mknod.c:61 +#: src/mkfifo.c:58 src/mknod.c:60 #, fuzzy msgid "" " -m, --mode=MODE set file permission bits to MODE, not a=rw - umask\n" @@ -5562,17 +5597,17 @@ msgstr "" " --help amosar esta axuda e saír\n" " --version amosa-la información da versión e saír\n" -#: src/mkfifo.c:62 +#: src/mkfifo.c:61 msgid "" " -Z, --context=CTX set the SELinux security context of each NAME to CTX\n" msgstr "" -#: src/mkfifo.c:122 src/mknod.c:128 +#: src/mkfifo.c:121 src/mknod.c:127 #, fuzzy, c-format msgid "invalid mode" msgstr "número incorrecto" -#: src/mkfifo.c:127 src/mknod.c:133 +#: src/mkfifo.c:126 src/mknod.c:132 #, c-format msgid "mode must specify only file permission bits" msgstr "" @@ -5583,16 +5618,14 @@ msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n" msgstr "Uso: %s [OPCIÓN]... CONXUNTO1 [CONXUNTO2]\n" #: src/mknod.c:54 -msgid "" -"Create the special file NAME of the given TYPE.\n" -"\n" +msgid "Create the special file NAME of the given TYPE.\n" msgstr "" -#: src/mknod.c:64 +#: src/mknod.c:63 msgid " -Z, --context=CTX set the SELinux security context of NAME to CTX\n" msgstr "" -#: src/mknod.c:69 +#: src/mknod.c:68 msgid "" "\n" "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n" @@ -5601,7 +5634,7 @@ msgid "" "otherwise, as decimal. TYPE may be:\n" msgstr "" -#: src/mknod.c:76 +#: src/mknod.c:75 #, fuzzy msgid "" "\n" @@ -5623,44 +5656,44 @@ msgstr "" " c, u crea un ficheiro especial de caracteres (unbuffered)\n" " p crea unha FIFO\n" -#: src/mknod.c:151 +#: src/mknod.c:150 #, 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:161 +#: src/mknod.c:160 #, fuzzy msgid "Fifos do not have major and minor device numbers." msgstr "número de liña inicial incorrecto: \"%s\"" -#: src/mknod.c:177 +#: src/mknod.c:176 #, fuzzy, c-format msgid "block special files not supported" msgstr "ficheiro especial de bloque" -#: src/mknod.c:186 +#: src/mknod.c:185 #, fuzzy, c-format msgid "character special files not supported" msgstr "ficheiro especial de carácter" -#: src/mknod.c:202 +#: src/mknod.c:201 #, fuzzy, c-format msgid "invalid major device number %s" msgstr "número de liña inicial incorrecto: \"%s\"" -#: src/mknod.c:207 +#: src/mknod.c:206 #, fuzzy, c-format msgid "invalid minor device number %s" msgstr "número de liña inicial incorrecto: \"%s\"" -#: src/mknod.c:212 +#: src/mknod.c:211 #, fuzzy, c-format msgid "invalid device %s %s" msgstr "argumento incorrecto %s para %s" -#: src/mknod.c:226 +#: src/mknod.c:225 #, fuzzy, c-format msgid "invalid device type %s" msgstr "argumento incorrecto %s para %s" @@ -5719,58 +5752,56 @@ msgid "" " directory specified via -p; else /tmp [deprecated]\n" msgstr "" -#: src/mktemp.c:222 +#: src/mktemp.c:223 #, c-format msgid "failed to redirect stderr to /dev/null" msgstr "" -#: src/mktemp.c:228 +#: src/mktemp.c:229 #, fuzzy, c-format msgid "too many templates" msgstr "demasiados argumentos" -#: src/mktemp.c:248 +#: src/mktemp.c:249 #, c-format msgid "with --suffix, template %s must end in X" msgstr "" -#: src/mktemp.c:273 src/split.c:1117 +#: src/mktemp.c:274 src/split.c:1130 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "" -#: src/mktemp.c:278 +#: src/mktemp.c:279 #, c-format msgid "too few X's in template %s" msgstr "" -#: src/mktemp.c:291 +#: src/mktemp.c:292 #, c-format msgid "invalid template, %s, contains directory separator" msgstr "" -#: src/mktemp.c:305 +#: src/mktemp.c:306 #, c-format msgid "invalid template, %s; with --tmpdir, it may not be absolute" msgstr "" -#: src/mktemp.c:325 +#: src/mktemp.c:326 #, fuzzy, c-format msgid "failed to create directory via template %s" msgstr "non se pode crea-lo directorio %s" -#: src/mktemp.c:335 +#: src/mktemp.c:336 #, fuzzy, c-format msgid "failed to create file via template %s" msgstr "mantense a data de %s" -#: src/mv.c:290 -msgid "" -"Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" -"\n" +#: src/mv.c:292 +msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" msgstr "" -#: src/mv.c:297 +#: src/mv.c:298 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -5783,7 +5814,7 @@ msgid "" "effect.\n" msgstr "" -#: src/mv.c:306 +#: src/mv.c:307 msgid "" " --strip-trailing-slashes remove any trailing slashes from each " "SOURCE\n" @@ -5791,7 +5822,7 @@ msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" msgstr "" -#: src/mv.c:311 +#: src/mv.c:312 #, fuzzy msgid "" " -t, --target-directory=DIRECTORY move all SOURCE arguments into " @@ -5831,28 +5862,30 @@ msgstr "Uso: %s [OPCIÓN] [FICHEIRO]...\n" #, c-format msgid "" "Run COMMAND with an adjusted niceness, which affects process scheduling.\n" -"With no COMMAND, print the current niceness. Nicenesses range from\n" -"%d (most favorable scheduling) to %d (least favorable).\n" -"\n" -" -n, --adjustment=N add integer N to the niceness (default 10)\n" +"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 "" + +#: src/nice.c:82 +msgid " -n, --adjustment=N add integer N to the niceness (default 10)\n" msgstr "" -#: src/nice.c:168 +#: src/nice.c:172 #, fuzzy, c-format msgid "invalid adjustment %s" msgstr "argumento incorrecto %s para %s" -#: src/nice.c:177 +#: src/nice.c:181 #, c-format msgid "a command must be given with an adjustment" msgstr "ten que se dar un comando co axuste" -#: src/nice.c:184 src/nice.c:195 +#: src/nice.c:188 src/nice.c:199 #, fuzzy, c-format msgid "cannot get niceness" msgstr "non se pode crea-lo ficheiro temporal" -#: src/nice.c:201 +#: src/nice.c:205 #, fuzzy, c-format msgid "cannot set niceness" msgstr "non se pode establece-la data" @@ -5862,17 +5895,17 @@ msgstr "non se pode establece-la data" msgid "Scott Bartram" msgstr "" -#: src/nl.c:186 +#: 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" -"\n" msgstr "" "Amosar cada FICHEIRO na saída estándar, engadindo os números de liña.\n" "Sen un FICHEIRO, ou cando este é -, lese da entrada estánda.\n" "\n" -#: src/nl.c:194 +#: src/nl.c:186 msgid "" " -b, --body-numbering=STYLE use STYLE for numbering body lines\n" " -d, --section-delimiter=CC use CC for separating logical pages\n" @@ -5884,7 +5917,7 @@ msgstr "" "lóxicas\n" " -f, --footer-numbering=ESTILO usa-lo ESTILO para numera-las liñas do pé\n" -#: src/nl.c:199 +#: src/nl.c:191 #, fuzzy msgid "" " -h, --header-numbering=STYLE use STYLE for numbering header lines\n" @@ -5908,7 +5941,7 @@ msgstr "" " páxina lóxica\n" " -s, --number-separator=CADEA engadi-la CADEA tras cada número de liña\n" -#: src/nl.c:207 +#: src/nl.c:199 #, fuzzy msgid "" " -v, --starting-line-number=NUMBER first line number on each logical page\n" @@ -5919,7 +5952,7 @@ msgstr "" " -w, --number-width=NÚMERO empregar NÚMERO columnas nos números de " "liña\n" -#: src/nl.c:213 +#: src/nl.c:205 msgid "" "\n" "By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC are\n" @@ -5932,7 +5965,7 @@ msgstr "" "indica o segundo carácter suponse :. Escriba \\\\ para obter \\.\n" "ESTILO pode ser:\n" -#: src/nl.c:219 +#: src/nl.c:211 #, fuzzy msgid "" "\n" @@ -5962,52 +5995,47 @@ msgstr "" " rz xustificado á dereita, con ceros á esquerda\n" "\n" -#: src/nl.c:286 +#: src/nl.c:278 #, fuzzy, c-format msgid "line number overflow" msgstr "o número do campo é cero" -#: src/nl.c:486 +#: src/nl.c:478 #, fuzzy, c-format msgid "invalid header numbering style: %s" msgstr "número de campo incorrecto: \"%s\"" -#: src/nl.c:494 +#: src/nl.c:486 #, fuzzy, c-format msgid "invalid body numbering style: %s" msgstr "número incorrecto" -#: src/nl.c:502 +#: src/nl.c:494 #, fuzzy, c-format msgid "invalid footer numbering style: %s" msgstr "número de ficheiro incorrecto na especificación de campos: \"%s\"" -#: src/nl.c:511 +#: src/nl.c:503 #, fuzzy, c-format msgid "invalid starting line number: %s" msgstr "número de liña inicial incorrecto: \"%s\"" -#: src/nl.c:517 -#, c-format -msgid "WARNING: --page-increment is deprecated; use --line-increment instead" -msgstr "" - -#: src/nl.c:524 +#: src/nl.c:512 #, fuzzy, c-format msgid "invalid line number increment: %s" msgstr "incremento de números de liña incorrecto: \"%s\"" -#: src/nl.c:536 +#: src/nl.c:524 #, fuzzy, c-format msgid "invalid number of blank lines: %s" msgstr "número de liñas en blanco incorrecto: \"%s\"" -#: src/nl.c:550 +#: src/nl.c:538 #, fuzzy, c-format msgid "invalid line number field width: %s" msgstr "ancho do campo do número de liña incorrecto: \"%s\"" -#: src/nl.c:569 +#: src/nl.c:557 #, fuzzy, c-format msgid "invalid line numbering format: %s" msgstr "incremento de números de liña incorrecto: \"%s\"" @@ -6048,11 +6076,6 @@ msgstr "os dous ficheiros non poden ser entrada estándar" msgid "ignoring input" msgstr "demasiados argumentos" -#: src/nohup.c:163 src/nohup.c:165 -#, fuzzy, c-format -msgid "failed to open %s" -msgstr "mantense a data de %s" - #: src/nohup.c:175 #, c-format msgid "ignoring input and appending output to %s" @@ -6084,33 +6107,367 @@ msgid "failed to redirect standard error" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:32 +#: src/nproc.c:33 msgid "Giuseppe Scrivano" msgstr "" -#: src/nproc.c:56 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 +#: src/nproc.c:57 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 #, fuzzy, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Uso: %s [OPCIÓN] [FICHEIRO]...\n" -#: src/nproc.c:57 +#: src/nproc.c:58 msgid "" "Print the number of processing units available to the current process,\n" "which may be less than the number of online processors\n" "\n" msgstr "" -#: src/nproc.c:62 +#: src/nproc.c:63 msgid "" " --all print the number of installed processors\n" " --ignore=N if possible, exclude N processing units\n" msgstr "" -#: src/nproc.c:106 +#: src/nproc.c:107 #, fuzzy, c-format 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 +msgid "Assaf Gordon" +msgstr "" + +#: src/numfmt.c:676 +#, fuzzy, c-format +msgid "value too large to be converted: '%s'" +msgstr "%s: valor non convertido por completo" + +#: src/numfmt.c:680 +#, fuzzy, c-format +msgid "invalid number: '%s'" +msgstr "número incorrecto" + +#: src/numfmt.c:684 +#, c-format +msgid "rejecting suffix in input: '%s' (consider using --from)" +msgstr "" + +#: src/numfmt.c:688 +#, fuzzy, c-format +msgid "invalid suffix in input: '%s'" +msgstr "incremento de números de liña incorrecto: \"%s\"" + +#: src/numfmt.c:692 +#, c-format +msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)" +msgstr "" + +#: src/numfmt.c:723 +#, fuzzy, c-format +msgid "failed to prepare value '%Lf' for printing" +msgstr "%s: ficheiro longo de máis" + +#: src/numfmt.c:787 +#, fuzzy, c-format +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 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [NUMBER]...\n" +msgstr "Uso: %s [OPCIÓN]... [FICHEIRO]...\n" + +#: src/numfmt.c:816 +msgid "" +"Reformat NUMBER(s), or the numbers from standard input if none are " +"specified.\n" +msgstr "" + +#: src/numfmt.c:820 +msgid " --debug print warnings about invalid input\n" +msgstr "" + +#: src/numfmt.c:823 +msgid "" +" -d, --delimiter=X use X instead of whitespace for field delimiter\n" +msgstr "" + +#: src/numfmt.c:826 +msgid "" +" --field=N replace the number in input field N (default is 1)\n" +msgstr "" + +#: src/numfmt.c:829 +msgid "" +" --format=FORMAT use printf style floating-point FORMAT;\n" +" see FORMAT below for details\n" +msgstr "" + +#: src/numfmt.c:833 +msgid "" +" --from=UNIT auto-scale input numbers to UNITs; default is " +"'none';\n" +" see UNIT below\n" +msgstr "" + +#: src/numfmt.c:837 +msgid "" +" --from-unit=N specify the input unit size (instead of the default " +"1)\n" +msgstr "" + +#: src/numfmt.c:840 +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 "" + +#: src/numfmt.c:844 +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 +msgid "" +" --invalid=MODE failure mode for invalid numbers: MODE can be:\n" +" abort (default), fail, warn, ignore\n" +msgstr "" + +#: src/numfmt.c:852 +msgid "" +" --padding=N pad the output to N characters; positive N will\n" +" right-align; negative N will left-align;\n" +" padding is ignored if the output is wider than N;\n" +" the default is to automatically pad if a " +"whitespace\n" +" is found\n" +msgstr "" + +#: src/numfmt.c:859 +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 +msgid "" +" --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" +" SUFFIX in input numbers\n" +msgstr "" + +#: src/numfmt.c:867 +msgid "" +" --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" +msgstr "" + +#: src/numfmt.c:870 +msgid "" +" --to-unit=N the output unit size (instead of the default 1)\n" +msgstr "" + +#: src/numfmt.c:877 +msgid "" +"\n" +"UNIT options:\n" +msgstr "" + +#: src/numfmt.c:880 +msgid " none no auto-scaling is done; suffixes will trigger an error\n" +msgstr "" + +#: src/numfmt.c:883 +msgid "" +" auto accept optional single/two letter suffix:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" +msgstr "" + +#: src/numfmt.c:889 +msgid "" +" si accept optional single letter suffix:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:894 +msgid "" +" iec accept optional single letter suffix:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:899 +msgid "" +" iec-i accept optional two-letter suffix:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:905 +#, 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" +msgstr "" + +#: src/numfmt.c:912 +#, c-format +msgid "" +"\n" +"Exit status is 0 if all input numbers were successfully converted.\n" +"By default, %s will stop at the first conversion error with exit status 2.\n" +"With --invalid='fail' a warning is printed for each conversion error\n" +"and the exit status is 2. With --invalid='warn' each conversion error is\n" +"diagnosed, but the exit status is 0. With --invalid='ignore' conversion\n" +"errors are not diagnosed and the exit status is 0.\n" +msgstr "" + +#: src/numfmt.c:921 +#, c-format +msgid "" +"\n" +"Examples:\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" +msgstr "" + +#: src/numfmt.c:974 src/seq.c:212 +#, c-format +msgid "format %s has no %% directive" +msgstr "" + +#: src/numfmt.c:990 +#, fuzzy, c-format +msgid "invalid format %s (width overflow)" +msgstr "argumento incorrecto %s para %s" + +#: src/numfmt.c:1007 src/seq.c:229 +#, c-format +msgid "format %s ends in %%" +msgstr "" + +#: src/numfmt.c:1010 +#, c-format +msgid "invalid format %s, directive must be %%['][-][N]f" +msgstr "" + +#: src/numfmt.c:1018 src/seq.c:236 +#, 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 "incremento de números de liña incorrecto: \"%s\"" + +#: src/numfmt.c:1092 +#, c-format +msgid "value too large to be printed: '%Lg' (consider using --to)" +msgstr "" + +#: src/numfmt.c:1100 +#, c-format +msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" +msgstr "" + +#: src/numfmt.c:1184 +#, c-format +msgid "large input value '%s': possible precision loss" +msgstr "" + +#: src/numfmt.c:1293 +#, 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 "cadea de tipo incorrecta \"%s\"" + +#: src/numfmt.c:1401 +#, fuzzy, c-format +msgid "invalid field value '%s'" +msgstr "número de campo incorrecto: \"%s\"" + +#: src/numfmt.c:1430 +#, fuzzy, c-format +msgid "invalid header value '%s'" +msgstr "anchura non válida: \"%s\"" + +#: src/numfmt.c:1456 +#, 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 +#, fuzzy, c-format +msgid "no conversion option specified" +msgstr "\\%c: secuencia de escape non válida" + +#: src/numfmt.c:1471 +#, c-format +msgid "grouping cannot be combined with --to" +msgstr "" + +#: src/numfmt.c:1473 +#, c-format +msgid "grouping has no effect in this locale" +msgstr "" + +#: src/numfmt.c:1486 +#, c-format +msgid "--header ignored with command-line input" +msgstr "" + +#: src/numfmt.c:1511 +#, fuzzy, c-format +msgid "error reading input" +msgstr "erro lendo %s" + +#: src/numfmt.c:1520 +#, fuzzy, c-format +msgid "failed to convert some of the input numbers" +msgstr "os dous ficheiros non poden ser entrada estándar" + #: src/od.c:294 #, fuzzy, c-format msgid "" @@ -6139,29 +6496,49 @@ msgstr "" "\n" #: src/od.c:307 -msgid "All arguments to long options are mandatory for short options.\n" +#, fuzzy +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" +"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" +"at first byte printed, incremented when dump is progressing.\n" +"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 "" -"Tódolos argumentos para as opcións longas son obrigatorios nas opcións " -"curtas.\n" +"\n" +"Para a sintaxe antiga (segundo formato de chamada), DESPRAZAMENTO significa\n" +"-j DESPRAZAMENTO. ETIQUETA é o pseudo-enderezo do primeiro byte imprimido,\n" +"que se incrementa segundo o envorcado progresa. Para o DESPRAZAMENTO e a\n" +"ETIQUETA, un prefixo 0x ou 0X indica hexadecimal; os sufixos poden ser .\n" +"para octal e b para multiplicar por 512.\n" +"\n" +"TIPO componse de unha ou máis destas especificacións:\n" +"\n" +" a carácter con nome\n" +" c carácter ASCII ou escapado\n" -#: src/od.c:310 +#: src/od.c:318 +#, fuzzy msgid "" -" -A, --address-radix=RADIX decide how file offsets are printed\n" +" -A, --address-radix=RADIX output format for file offsets. RADIX is one\n" +" of [doxn], for Decimal, Octal, Hex or None\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:314 +#: src/od.c:323 #, 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" -" --traditional accept arguments in traditional form\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 limita-lo envorado a BYTES bytes de entrada\n" " -s, --strings[=BYTES] usar cadeas de alomenos BYTES caracteres " @@ -6171,10 +6548,11 @@ 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:324 +#: src/od.c:336 #, fuzzy 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" @@ -6188,7 +6566,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:332 +#: src/od.c:345 #, fuzzy msgid "" " -f same as -t fF, select floats\n" @@ -6205,39 +6583,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:340 -#, fuzzy +#: src/od.c:353 msgid "" "\n" -"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" -"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" -"at first byte printed, incremented when dump is progressing.\n" -"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" -"Para a sintaxe antiga (segundo formato de chamada), DESPRAZAMENTO significa\n" -"-j DESPRAZAMENTO. ETIQUETA é o pseudo-enderezo do primeiro byte imprimido,\n" -"que se incrementa segundo o envorcado progresa. Para o DESPRAZAMENTO e a\n" -"ETIQUETA, un prefixo 0x ou 0X indica hexadecimal; os sufixos poden ser .\n" -"para octal e b para multiplicar por 512.\n" -"\n" -"TIPO componse de unha ou máis destas especificacións:\n" -"\n" -" a carácter con nome\n" -" c carácter ASCII ou escapado\n" - -#: src/od.c:349 -msgid "" "\n" "TYPE is made up of one or more of these specifications:\n" -"\n" " a named character, ignoring high-order bit\n" " c ASCII character or backslash escape\n" msgstr "" -#: src/od.c:356 +#: src/od.c:360 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -6251,10 +6606,11 @@ 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:363 +#: src/od.c:367 +#, fuzzy msgid "" "\n" -"SIZE is a number. For TYPE in doux, SIZE may also be C for\n" +"SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" "sizeof(char), S for sizeof(short), I for sizeof(int) or L for\n" "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" @@ -6265,41 +6621,32 @@ 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:370 -#, fuzzy +#: src/od.c:374 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" +"Adding a z suffix to any type displays printable characters at the end of\n" +"each 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. " -#: src/od.c:380 -#, fuzzy +#: src/od.c:379 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" +"\n" +"BYTES is hex with 0x or 0X prefix, and may have a multiplier suffix:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"and so on for G, T, P, E, Z, Y.\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" -#: src/od.c:633 src/od.c:753 +#: src/od.c:639 src/od.c:759 #, fuzzy, c-format msgid "invalid type string %s" msgstr "cadea de tipo incorrecta \"%s\"" -#: src/od.c:643 +#: src/od.c:649 #, fuzzy, c-format msgid "" "invalid type string %s;\n" @@ -6308,7 +6655,7 @@ msgstr "" "cadea de tipo incorrecta \"%s\";\n" "este sistema non proporciona un tipo integral de %lu bytes" -#: src/od.c:764 +#: src/od.c:770 #, fuzzy, c-format msgid "" "invalid type string %s;\n" @@ -6317,38 +6664,38 @@ msgstr "" "cadea de tipo incorrecta \"%s\";\n" "este sistema non proporciona un tipo de punto flotante de %lu bytes" -#: src/od.c:822 +#: src/od.c:828 #, fuzzy, c-format msgid "invalid character '%c' in type string %s" msgstr "carácter \"%c\" incorrecto na cadea de tipo \"%s\"" -#: src/od.c:1047 +#: src/od.c:1053 #, 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:1603 +#: src/od.c:1609 #, 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:1729 +#: src/od.c:1735 #, c-format msgid "no type may be specified when dumping strings" msgstr "non se pode especificar un tipo ao volcar cadeas" -#: src/od.c:1804 +#: src/od.c:1810 #, fuzzy msgid "compatibility mode supports at most one file" msgstr "o modo de compatibilidade soporta 3 argumentos como moito" -#: src/od.c:1825 +#: src/od.c:1831 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "" -#: src/od.c:1868 +#: src/od.c:1874 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "aviso: ancho %lu incorrecto; usando %d na súa vez" @@ -6364,18 +6711,18 @@ msgid "standard input is closed" msgstr "a entrada estándar está pechada" #: 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" -"\n" msgstr "" "Escribi-las liñas que consisten nas liñas correspondentes secuenciamente de\n" "cada FICHEIRO, separadas por tabulacións, na saída estándar.\n" "Sen un FICHEIRO, ou cando o FICHEIRO é -, lese da entrada estándar.\n" "\n" -#: src/paste.c:448 +#: 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" @@ -6385,7 +6732,7 @@ msgstr "" " -s, --serial pegar un ficheiro de cada vez no canto de en " "paralelo\n" -#: src/paste.c:509 +#: src/paste.c:508 #, c-format msgid "delimiter list ends with an unescaped backslash: %s" msgstr "" @@ -6441,81 +6788,81 @@ msgid "Kaveh Ghazi" msgstr "" #. TRANSLATORS: Real name is unknown; at most 19 characters. -#: src/pinky.c:250 +#: src/pinky.c:242 msgid " ???" msgstr "" #. TRANSLATORS: Idle time is unknown; at most 5 characters. -#: src/pinky.c:274 +#: src/pinky.c:266 msgid "?????" msgstr "" -#: src/pinky.c:323 +#: src/pinky.c:314 #, c-format msgid "Login name: " msgstr "Nome de usuario: " -#: src/pinky.c:326 +#: src/pinky.c:317 #, c-format msgid "In real life: " msgstr "Na vida real: " #. TRANSLATORS: Real name is unknown; no hard limit. -#: src/pinky.c:330 +#: src/pinky.c:321 msgid "???\n" msgstr "???\n" -#: src/pinky.c:350 +#: src/pinky.c:341 #, fuzzy, c-format msgid "Directory: " msgstr "directorio" -#: src/pinky.c:352 +#: src/pinky.c:343 #, c-format msgid "Shell: " msgstr "Shell: " -#: src/pinky.c:371 +#: src/pinky.c:362 #, c-format msgid "Project: " msgstr "Proxecto: " -#: src/pinky.c:395 +#: src/pinky.c:386 #, c-format msgid "Plan:\n" msgstr "Plan:\n" -#: src/pinky.c:414 +#: src/pinky.c:405 msgid "Login" msgstr "Login" -#: src/pinky.c:416 +#: src/pinky.c:407 #, fuzzy msgid "Name" msgstr " Nome" -#: src/pinky.c:417 +#: src/pinky.c:408 msgid " TTY" msgstr "" -#: src/pinky.c:419 +#: src/pinky.c:410 msgid "Idle" msgstr "Inactivo" -#: src/pinky.c:420 +#: src/pinky.c:411 msgid "When" msgstr "Cando" -#: src/pinky.c:423 +#: src/pinky.c:414 msgid "Where" msgstr "Onde" -#: src/pinky.c:502 +#: src/pinky.c:493 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Uso: %s [OPCIÓN]... [FICHEIRO]...\n" -#: src/pinky.c:503 +#: src/pinky.c:494 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -6525,7 +6872,7 @@ msgid "" " -s do short format output, this is the default\n" msgstr "" -#: src/pinky.c:511 +#: src/pinky.c:502 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -6534,7 +6881,7 @@ msgid "" " in short format\n" msgstr "" -#: src/pinky.c:520 +#: src/pinky.c:511 #, c-format msgid "" "\n" @@ -6542,7 +6889,7 @@ msgid "" "The utmp file will be %s.\n" msgstr "" -#: src/pinky.c:604 +#: src/pinky.c:595 #, 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" @@ -6558,85 +6905,84 @@ msgstr "" msgid "Roland Huebner" msgstr "Pete TerMaat e Roland Huebner" -#: src/pr.c:912 +#: src/pr.c:908 #, fuzzy, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "\"--pages=PRIMEIRA_PÁXINA[:ÚLTIMA_PÁXINA]\" falta un argumento" -#: src/pr.c:914 +#: src/pr.c:910 #, fuzzy, c-format msgid "invalid page range %s" msgstr "cadea de tipo incorrecta \"%s\"" -#: src/pr.c:979 +#: src/pr.c:975 #, fuzzy, c-format msgid "'-l PAGE_LENGTH' invalid number of lines: %s" msgstr "\"-l LONXITUDE\" número de liñas incorrecto: \"%s\"" -#: src/pr.c:1003 +#: src/pr.c:999 #, fuzzy, c-format msgid "'-N NUMBER' invalid starting line number: %s" msgstr "\"-N NÚMERO\" número de liña inicial incorrecto: \"%s\"" -#: src/pr.c:1015 +#: src/pr.c:1011 #, fuzzy, c-format msgid "'-o MARGIN' invalid line offset: %s" msgstr "\"-o MARXE\" desprazamento de liña incorrecto: \"%s\"" -#: src/pr.c:1056 +#: src/pr.c:1052 #, fuzzy, c-format msgid "'-w PAGE_WIDTH' invalid number of characters: %s" msgstr "\"-w ANCHO_PAXINA\" número de caracteres incorrecto: \"%s\"" -#: src/pr.c:1070 +#: src/pr.c:1066 #, fuzzy, c-format msgid "'-W PAGE_WIDTH' invalid number of characters: %s" msgstr "\"-W ANCHO_PAXINA\" número de caracteres incorrecto: \"%s\"" -#: src/pr.c:1100 +#: src/pr.c:1096 #, fuzzy, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "Non se pode especifica-lo número de columnas ao imprimir en paralelo." -#: src/pr.c:1104 +#: src/pr.c:1100 #, fuzzy, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "Non se pode especifica-la impresión a través e en paralelo á vez." -#: src/pr.c:1200 +#: src/pr.c:1196 #, fuzzy, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "\"-%c\" caracteres extra ou número non válido no argumento: \"%s\"" -#: src/pr.c:1304 +#: src/pr.c:1293 #, c-format msgid "page width too narrow" msgstr "páxina demasiado estreita" -#: src/pr.c:2369 +#: src/pr.c:2353 #, c-format msgid "starting page number %<PRIuMAX> exceeds page count %<PRIuMAX>" msgstr "" -#: src/pr.c:2396 +#: src/pr.c:2380 #, fuzzy, c-format msgid "page number overflow" msgstr "o número do campo é cero" -#: src/pr.c:2401 +#: src/pr.c:2385 #, c-format msgid "Page %<PRIuMAX>" msgstr "" -#: src/pr.c:2773 -msgid "" -"Paginate or columnate FILE(s) for printing.\n" -"\n" +#: src/pr.c:2757 +#, fuzzy +msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" "Paxinar ou encolumna-lo(s) FICHEIRO(s) para imprimir.\n" "\n" -#: src/pr.c:2780 +#: src/pr.c:2763 #, fuzzy msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" @@ -6654,7 +7000,7 @@ msgstr "" " columnas, agás se se emprega -a. Balancea-lo número de\n" " liñas nas columnas de cada páxina.\n" -#: src/pr.c:2788 +#: src/pr.c:2771 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -6671,7 +7017,7 @@ msgstr "" " -d, --double-space\n" " amosa-la saída a doble espacio\n" -#: src/pr.c:2796 +#: src/pr.c:2779 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -6694,7 +7040,7 @@ msgstr "" " liñas con -F ou unha cabeceira e pé de 5 liñas sen -" "F)\n" -#: src/pr.c:2806 +#: src/pr.c:2789 #, fuzzy msgid "" " -h, --header=HEADER\n" @@ -6720,7 +7066,7 @@ msgstr "" " de -W, sen aliñamento de columnas, --sep-string[=CADEA\n" " estabrece os separadores\n" -#: src/pr.c:2815 +#: src/pr.c:2798 #, fuzzy msgid "" " -l, --length=PAGE_LENGTH\n" @@ -6739,7 +7085,7 @@ msgstr "" " trunca-las liñas, pero uni-las liñas de lonxitude\n" " completa con -J\n" -#: src/pr.c:2822 +#: src/pr.c:2805 #, fuzzy msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" @@ -6759,7 +7105,7 @@ msgstr "" " comezar a contar no NÚMERO na primeira liña da primeira\n" " páxina imprimida (vexa +PRIMEIRA)\n" -#: src/pr.c:2830 +#: src/pr.c:2813 #, fuzzy msgid "" " -o, --indent=MARGIN\n" @@ -6774,7 +7120,7 @@ msgstr "" " -r, --no-file-warnings\n" " omiti-lo aviso cando non se pode abrir un ficheiro\n" -#: src/pr.c:2837 +#: src/pr.c:2820 #, fuzzy msgid "" " -s[CHAR], --separator[=CHAR]\n" @@ -6792,7 +7138,7 @@ msgstr "" " opcións de tres columnas (-COLUMNA|-a -COLUMNA|-m) agás\n" " se -w está estabrecido\n" -#: src/pr.c:2844 +#: src/pr.c:2827 #, fuzzy msgid "" " -S[STRING], --sep-string[=STRING]\n" @@ -6809,7 +7155,7 @@ msgstr "" " opcións de columnas\n" " -t, --omit-header omiti-las cabeceiras e pés de páxina\n" -#: src/pr.c:2851 +#: src/pr.c:2834 #, fuzzy msgid "" " -T, --omit-pagination\n" @@ -6834,7 +7180,7 @@ msgstr "" " para o formato de saída de varias solumnas de texto,\n" " -s[car] desactívao (72)\n" -#: src/pr.c:2861 +#: src/pr.c:2844 #, fuzzy msgid "" " -W, --page-width=PAGE_WIDTH\n" @@ -6849,7 +7195,7 @@ msgstr "" "estea\n" " estabrecida; non interfire con -S ou -s\n" -#: src/pr.c:2869 +#: src/pr.c:2852 #, fuzzy msgid "" "\n" @@ -6992,16 +7338,16 @@ msgstr "" " ou: %s -G [OPCIÓN] [ENTRADA [SAÍDA]]\n" #: src/ptx.c:1821 +#, fuzzy msgid "" "Output a permuted index, including context, of the words in the input " "files.\n" -"\n" msgstr "" "Amosar un índice permutado, incluíndo o contexto, das palabras dos ficheiros " "de entrada.\n" "\n" -#: src/ptx.c:1828 +#: src/ptx.c:1827 #, fuzzy msgid "" " -A, --auto-reference output automatically generated references\n" @@ -7015,7 +7361,7 @@ msgstr "" " -F, --flag-truncation=CADEA emprega-la CADEA para marca-las liñas " "truncadas\n" -#: src/ptx.c:1833 +#: src/ptx.c:1832 #, fuzzy msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" @@ -7032,7 +7378,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:1840 +#: src/ptx.c:1839 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -7051,7 +7397,7 @@ msgstr "" "FICHEIRO\n" " -o, --only-file=FICHEIRO le-la lista de palabras únicas do FICHEIRO\n" -#: src/ptx.c:1848 +#: src/ptx.c:1847 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -7063,7 +7409,7 @@ msgstr "" " -t, --typeset-mode - sen implementar -\n" " -w, --width=NÚMERO ancho da saída, excluíndo referencias\n" -#: src/ptx.c:1855 +#: src/ptx.c:1854 #, fuzzy msgid "" "\n" @@ -7073,7 +7419,7 @@ msgstr "" "Sen un FICHEIRO, ou se o FICHEIRO é -, lese da entrada estándar.\n" "\"-F /\" por defecto.\n" -#: src/ptx.c:1949 +#: src/ptx.c:1948 #, fuzzy, c-format msgid "invalid gap width: %s" msgstr "anchura non válida: \"%s\"" @@ -7095,7 +7441,7 @@ msgstr "" 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/pwd.c:170 src/pwd.c:277 src/split.c:373 #, fuzzy, c-format msgid "failed to stat %s" msgstr "obtendo os atributos de %s" @@ -7111,13 +7457,14 @@ msgid "ignoring non-option arguments" msgstr "demasiados argumentos" #. This is a proper name. See the gettext manual, section Names. -#: src/readlink.c:33 +#: src/readlink.c:32 msgid "Dmitry V. Levin" msgstr "" -#: src/readlink.c:62 +#: 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 -msgid "Usage: %s [OPTION]... FILE\n" +msgid "Usage: %s [OPTION]... FILE...\n" msgstr "Uso: %s [OPCIÓN]... [FICHEIRO]...\n" #: src/readlink.c:63 @@ -7145,17 +7492,18 @@ msgid "" "recursively,\n" " without requirements on components " "existence\n" -" -n, --no-newline do not output the trailing newline\n" +" -n, --no-newline do not output the trailing delimiter\n" " -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" msgstr "" -#: src/realpath.c:71 src/rm.c:134 src/shred.c:147 src/stat.c:1330 -#: src/touch.c:215 +#: src/readlink.c:152 #, fuzzy, c-format -msgid "Usage: %s [OPTION]... FILE...\n" -msgstr "Uso: %s [OPCIÓN]... [FICHEIRO]...\n" +msgid "ignoring --no-newline with multiple arguments" +msgstr "demasiados argumentos" #: src/realpath.c:72 msgid "" @@ -7182,12 +7530,12 @@ msgstr "" msgid "generating relative path" msgstr "" -#: src/remove.c:286 +#: src/remove.c:273 #, fuzzy, c-format msgid "%s: descend into write-protected directory %s? " msgstr "non se pode crea-lo directorio %s" -#: src/remove.c:287 +#: src/remove.c:274 #, fuzzy, c-format msgid "%s: descend into directory %s? " msgstr "non se pode cambiar ao directorio %s" @@ -7196,49 +7544,49 @@ msgstr "non se pode cambiar ao directorio %s" #. translate "%s: remove %s (write-protected) %s? " #. instead. It should avoid grammatical problems #. with the output of file_type. -#: src/remove.c:303 +#: src/remove.c:290 #, fuzzy, c-format msgid "%s: remove write-protected %s %s? " msgstr "%s: ¿borra-lo ficheiro protexido contra escritura %s? " -#: src/remove.c:304 +#: src/remove.c:291 #, fuzzy, c-format msgid "%s: remove %s %s? " msgstr "%s: ¿borrar %s? " -#: src/remove.c:417 +#: src/remove.c:374 #, fuzzy, c-format msgid "removed directory: %s\n" msgstr "non se pode crea-lo directorio %s" -#: src/remove.c:481 +#: src/remove.c:444 #, fuzzy, c-format msgid "cannot remove directory: %s" msgstr "non se pode crea-lo directorio %s" -#: src/remove.c:537 +#: src/remove.c:500 #, c-format msgid "skipping %s, since it's on a different device" msgstr "" -#: src/remove.c:557 +#: src/remove.c:520 #, fuzzy, c-format msgid "traversal failed: %s" msgstr "erro de lectura" -#: src/remove.c:563 +#: src/remove.c:526 #, c-format msgid "" "unexpected failure: fts_info=%d: %s\n" "please report to %s" msgstr "" -#: src/rm.c:118 +#: src/rm.c:119 #, c-format msgid "Try '%s ./%s' to remove the file %s.\n" msgstr "" -#: src/rm.c:135 +#: src/rm.c:136 msgid "" "Remove (unlink) the FILE(s).\n" "\n" @@ -7247,7 +7595,7 @@ msgid "" " -i prompt before every removal\n" msgstr "" -#: src/rm.c:141 +#: src/rm.c:142 msgid "" " -I prompt once before removing more than three files, " "or\n" @@ -7259,22 +7607,23 @@ msgid "" " always (-i). Without WHEN, prompt always\n" msgstr "" -#: src/rm.c:148 +#: src/rm.c:149 msgid "" " --one-file-system when removing a hierarchy recursively, skip any\n" " directory that is on a file system different from\n" " that of the corresponding command line argument\n" msgstr "" -#: src/rm.c:153 +#: src/rm.c:154 msgid "" " --no-preserve-root do not treat '/' specially\n" " --preserve-root do not remove '/' (default)\n" " -r, -R, --recursive remove directories and their contents recursively\n" +" -d, --dir remove empty directories\n" " -v, --verbose explain what is being done\n" msgstr "" -#: src/rm.c:161 +#: src/rm.c:163 msgid "" "\n" "By default, rm does not remove directories. Use the --recursive (-r or -R)\n" @@ -7282,7 +7631,7 @@ msgid "" "contents.\n" msgstr "" -#: src/rm.c:166 +#: src/rm.c:168 #, c-format msgid "" "\n" @@ -7293,7 +7642,7 @@ msgid "" " %s ./-foo\n" msgstr "" -#: src/rm.c:175 +#: src/rm.c:177 msgid "" "\n" "Note that if you use rm to remove a file, it might be possible to recover\n" @@ -7301,12 +7650,12 @@ msgid "" "assurance that the contents are truly unrecoverable, consider using shred.\n" msgstr "" -#: src/rm.c:335 +#: src/rm.c:342 #, c-format msgid "%s: remove all arguments recursively? " msgstr "" -#: src/rm.c:336 +#: src/rm.c:343 #, fuzzy, c-format msgid "%s: remove all arguments? " msgstr "%s: ¿borrar %s? " @@ -7366,7 +7715,10 @@ msgstr "" msgid "" "Run a program in a different security context.\n" "With neither CONTEXT nor COMMAND, print the current security context.\n" -"\n" +msgstr "" + +#: src/runcon.c:94 +msgid "" " CONTEXT Complete security context\n" " -c, --compute compute process transition context before modifying\n" " -t, --type=TYPE type (for same role as parent)\n" @@ -7376,72 +7728,72 @@ msgid "" "\n" msgstr "" -#: src/runcon.c:140 +#: src/runcon.c:144 #, c-format msgid "multiple roles" msgstr "" -#: src/runcon.c:145 +#: src/runcon.c:149 #, c-format msgid "multiple types" msgstr "" -#: src/runcon.c:150 +#: src/runcon.c:154 #, c-format msgid "multiple users" msgstr "" -#: src/runcon.c:155 +#: src/runcon.c:159 #, c-format msgid "multiple levelranges" msgstr "" -#: src/runcon.c:173 src/runcon.c:209 +#: src/runcon.c:177 src/runcon.c:213 #, fuzzy, c-format msgid "failed to get current context" msgstr "obtendo os atributos de %s" -#: src/runcon.c:183 +#: src/runcon.c:187 #, c-format msgid "you must specify -c, -t, -u, -l, -r, or context" msgstr "" -#: src/runcon.c:191 +#: src/runcon.c:195 #, fuzzy, c-format msgid "no command specified" msgstr "só se pode especificar un argumento" -#: src/runcon.c:197 +#: src/runcon.c:201 #, c-format msgid "%s may be used only on a SELinux kernel" msgstr "" -#: src/runcon.c:223 +#: src/runcon.c:227 #, c-format msgid "failed to compute a new context" msgstr "" -#: src/runcon.c:237 +#: src/runcon.c:241 #, fuzzy, c-format msgid "failed to set new user %s" msgstr "mantense a data de %s" -#: src/runcon.c:239 +#: src/runcon.c:243 #, fuzzy, c-format msgid "failed to set new type %s" msgstr "mantense a data de %s" -#: src/runcon.c:241 +#: src/runcon.c:245 #, fuzzy, c-format msgid "failed to set new range %s" msgstr "mantense a data de %s" -#: src/runcon.c:243 +#: src/runcon.c:247 #, fuzzy, c-format msgid "failed to set new role %s" msgstr "obtendo os atributos de %s" -#: src/runcon.c:251 +#: src/runcon.c:255 #, fuzzy, c-format msgid "unable to set security context %s" msgstr "non se pode cambia-los permisos de %s" @@ -7457,15 +7809,17 @@ msgstr "" " ou: %s -G [OPCIÓN] [ENTRADA [SAÍDA]]\n" #: src/seq.c:73 +msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" +msgstr "" + +#: src/seq.c:79 msgid "" -"Print numbers from FIRST to LAST, in steps of INCREMENT.\n" -"\n" " -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 "" -#: src/seq.c:82 +#: src/seq.c:86 #, fuzzy msgid "" "\n" @@ -7491,39 +7845,24 @@ msgstr "" "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:90 +#: src/seq.c:94 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:136 +#: src/seq.c:140 #, fuzzy, c-format msgid "invalid floating point argument: %s" msgstr "número de liña inicial incorrecto: \"%s\"" -#: src/seq.c:193 -#, c-format -msgid "format %s has no %% directive" -msgstr "" - -#: src/seq.c:210 -#, c-format -msgid "format %s ends in %%" -msgstr "" - -#: src/seq.c:213 +#: src/seq.c:232 #, fuzzy, c-format msgid "format %s has unknown %%%c directive" msgstr "%s é un tipo de ficheiro descoñecido" -#: src/seq.c:217 -#, c-format -msgid "format %s has too many %% directives" -msgstr "" - -#: src/seq.c:431 +#: src/seq.c:555 #, 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" @@ -7555,27 +7894,27 @@ msgid "" " (if specified) supplemental group IDs to GID1, ...\n" msgstr "" -#: src/setuidgid.c:163 +#: src/setuidgid.c:162 #, c-format msgid "unknown user-ID: %s" msgstr "" -#: src/setuidgid.c:174 +#: src/setuidgid.c:173 #, c-format msgid "to use user-ID %s you need to use -g too" msgstr "" -#: src/setuidgid.c:191 +#: 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:201 +#: 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:205 +#: src/setuidgid.c:204 #, fuzzy, c-format msgid "cannot set user-ID to %lu" msgstr "non se poden omiti-lo usuario e o grupo" @@ -7589,10 +7928,9 @@ msgstr "" 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" -"\n" msgstr "" -#: src/shred.c:156 +#: src/shred.c:155 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -7601,7 +7939,7 @@ msgid "" " -s, --size=N shred this many bytes (suffixes like K, M, G accepted)\n" msgstr "" -#: src/shred.c:162 +#: src/shred.c:161 msgid "" " -u, --remove truncate and remove file after overwriting\n" " -v, --verbose show progress\n" @@ -7610,7 +7948,7 @@ msgid "" " -z, --zero add a final overwrite with zeros to hide shredding\n" msgstr "" -#: src/shred.c:171 +#: src/shred.c:170 msgid "" "\n" "If FILE is -, shred standard output.\n" @@ -7622,7 +7960,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:181 +#: src/shred.c:180 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" @@ -7633,7 +7971,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:189 +#: src/shred.c:188 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -7645,7 +7983,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:199 +#: src/shred.c:198 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -7654,7 +7992,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:206 +#: src/shred.c:205 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" @@ -7666,131 +8004,131 @@ msgid "" "\n" msgstr "" -#: src/shred.c:216 +#: src/shred.c:215 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:296 +#: src/shred.c:295 #, fuzzy, c-format msgid "%s: fdatasync failed" msgstr "a obtención de datos do ficheiro fallou" -#: src/shred.c:307 +#: src/shred.c:306 #, c-format msgid "%s: fsync failed" msgstr "" -#: src/shred.c:384 +#: src/shred.c:383 #, fuzzy, c-format msgid "%s: cannot rewind" msgstr "non se pode executar %s" -#: src/shred.c:403 +#: src/shred.c:402 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: pasada %lu/%lu (%s)..." -#: src/shred.c:453 +#: src/shred.c:452 #, fuzzy, c-format msgid "%s: error writing at offset %s" msgstr "erro escribindo %s" -#: src/shred.c:471 +#: src/shred.c:470 #, fuzzy, c-format msgid "%s: lseek failed" msgstr "o peche fallou" -#: src/shred.c:482 +#: src/shred.c:481 #, fuzzy, c-format msgid "%s: file too large" msgstr "%s: ficheiro longo de máis" -#: src/shred.c:505 +#: src/shred.c:504 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: pasada %lu/%lu (%s)...%s" -#: src/shred.c:521 +#: src/shred.c:520 #, fuzzy, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: pasada %lu/%lu (%s)...%s/%s" -#: src/shred.c:768 +#: src/shred.c:767 #, fuzzy, c-format msgid "%s: fstat failed" msgstr "a obtención de datos do ficheiro fallou" -#: src/shred.c:779 +#: src/shred.c:778 #, fuzzy, c-format msgid "%s: invalid file type" msgstr "%s: lonxitude do sufixo non válida" -#: src/shred.c:798 +#: src/shred.c:797 #, c-format msgid "%s: file has negative size" msgstr "%s: o ficheiro ten un tamaño negativo" -#: src/shred.c:865 +#: src/shred.c:864 src/sort.c:932 src/split.c:378 #, fuzzy, c-format msgid "%s: error truncating" msgstr "%s: ficheiro truncado" -#: src/shred.c:881 +#: src/shred.c:880 #, fuzzy, c-format msgid "%s: fcntl failed" msgstr "a obtención de datos do ficheiro fallou" -#: src/shred.c:886 +#: src/shred.c:885 #, 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:968 +#: src/shred.c:967 #, c-format msgid "%s: removing" msgstr "%s: borrando" -#: src/shred.c:992 +#: src/shred.c:991 #, fuzzy, c-format msgid "%s: renamed to %s" msgstr "%s: erro de lectura" -#: src/shred.c:1014 +#: src/shred.c:1013 #, fuzzy, c-format msgid "%s: failed to remove" msgstr "%s: ficheiro longo de máis" -#: src/shred.c:1018 +#: src/shred.c:1017 #, c-format msgid "%s: removed" msgstr "%s: borrado" -#: src/shred.c:1025 src/shred.c:1068 +#: src/shred.c:1024 src/shred.c:1067 #, fuzzy, c-format msgid "%s: failed to close" msgstr "%s: ficheiro longo de máis" -#: src/shred.c:1061 +#: src/shred.c:1060 #, fuzzy, c-format msgid "%s: failed to open for writing" msgstr "%s: ficheiro longo de máis" -#: src/shred.c:1126 +#: src/shred.c:1125 #, fuzzy, c-format msgid "%s: invalid number of passes" msgstr "%s: número de segundos incorrecto" -#: src/shred.c:1135 src/shuf.c:291 src/sort.c:4387 +#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441 #, fuzzy, c-format msgid "multiple random sources specified" msgstr "\\%c: secuencia de escape non válida" -#: src/shred.c:1149 +#: src/shred.c:1148 #, fuzzy, c-format msgid "%s: invalid file size" msgstr "%s: lonxitude do sufixo non válida" @@ -7807,14 +8145,12 @@ msgstr "" #: src/shuf.c:54 #, fuzzy -msgid "" -"Write a random permutation of the input lines to standard output.\n" -"\n" +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:61 +#: src/shuf.c:60 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 " @@ -7825,27 +8161,27 @@ msgid "" " -z, --zero-terminated end lines with 0 byte, not newline\n" msgstr "" -#: src/shuf.c:245 +#: src/shuf.c:244 #, fuzzy, c-format msgid "multiple -i options specified" msgstr "\\%c: secuencia de escape non válida" -#: src/shuf.c:265 +#: src/shuf.c:264 #, fuzzy, c-format msgid "invalid input range %s" msgstr "número incorrecto" -#: src/shuf.c:278 +#: src/shuf.c:277 #, fuzzy, c-format msgid "invalid line count %s" msgstr "anchura non válida: \"%s\"" -#: src/shuf.c:285 src/sort.c:4381 +#: src/shuf.c:284 src/sort.c:4435 #, fuzzy, c-format msgid "multiple output files specified" msgstr "\\%c: secuencia de escape non válida" -#: src/shuf.c:311 +#: src/shuf.c:310 #, fuzzy, c-format msgid "cannot combine -e and -i options" msgstr "non se pode move-lo punteiro do ficheiro de %s" @@ -7876,7 +8212,7 @@ 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:295 +#: src/sleep.c:135 src/timeout.c:320 #, fuzzy, c-format msgid "invalid time interval %s" msgstr "número de campo incorrecto: \"%s\"" @@ -7886,24 +8222,22 @@ msgstr "número de campo incorrecto: \"%s\"" msgid "cannot read realtime clock" msgstr "non se pode le-lo reloxo coa hora real" -#: src/sort.c:395 +#: src/sort.c:399 #, fuzzy -msgid "" -"Write sorted concatenation of all FILE(s) to standard output.\n" -"\n" +msgid "Write sorted concatenation of all FILE(s) to standard output.\n" msgstr "" "Escribi-la concatenación ordeada de tódolos FICHEIRO(s) na saída estándar.\n" "\n" "Opcións de ordeamento:\n" "\n" -#: src/sort.c:402 +#: src/sort.c:405 msgid "" "Ordering options:\n" "\n" msgstr "" -#: src/sort.c:406 +#: src/sort.c:409 #, fuzzy msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" @@ -7916,7 +8250,7 @@ msgstr "" "alfanuméricos\n" " -f, --ignore-case ignora-las maiúsculas e minúsculas\n" -#: src/sort.c:412 +#: src/sort.c:415 #, fuzzy msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" @@ -7930,12 +8264,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:417 +#: src/sort.c:420 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" -#: src/sort.c:420 +#: src/sort.c:423 #, fuzzy msgid "" " -n, --numeric-sort compare according to string numerical value\n" @@ -7950,7 +8284,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:426 +#: src/sort.c:429 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -7960,19 +8294,19 @@ msgid "" "\n" msgstr "" -#: src/sort.c:434 +#: src/sort.c:437 msgid "" "Other options:\n" "\n" msgstr "" -#: src/sort.c:438 +#: src/sort.c:441 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" msgstr "" -#: src/sort.c:442 +#: src/sort.c:445 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 " @@ -7981,7 +8315,7 @@ msgid "" " decompress them with PROG -d\n" msgstr "" -#: src/sort.c:449 +#: src/sort.c:452 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -7990,13 +8324,13 @@ msgid "" " If F is - then read names from standard input\n" msgstr "" -#: src/sort.c:456 +#: src/sort.c:459 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:460 +#: src/sort.c:463 #, fuzzy msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" @@ -8016,7 +8350,7 @@ msgstr "" " de derradeiro recurso\n" " -S, --buffer-size=TAMAÑO empregar un buffer de memoria deste TAMAÑO\n" -#: src/sort.c:466 +#: src/sort.c:469 #, fuzzy, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -8039,13 +8373,13 @@ msgstr "" " noutro caso: amosar só o primeiro dun grupo\n" " de elementos iguais\n" -#: src/sort.c:475 +#: 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:480 +#: src/sort.c:483 #, fuzzy msgid "" "\n" @@ -8072,7 +8406,7 @@ msgstr "" "\n" "TAMAÑO pode estar seguido polos seguintes sufixos multiplicativos:\n" -#: src/sort.c:493 +#: src/sort.c:496 msgid "" "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n" "\n" @@ -8093,262 +8427,266 @@ msgstr "" "Estabreza LC_ALL=C para obte-la orde tradicional que emprega\n" "valores de byte nativos.\n" -#: src/sort.c:694 +#: src/sort.c:697 #, fuzzy, c-format msgid "waiting for %s [-d]" msgstr "erro escribindo %s" -#: src/sort.c:699 +#: src/sort.c:702 #, c-format msgid "%s [-d] terminated abnormally" msgstr "" -#: src/sort.c:853 +#: src/sort.c:856 #, fuzzy, c-format msgid "cannot create temporary file in %s" msgstr "non se pode crea-lo ficheiro temporal" -#: src/sort.c:939 src/sort.c:2010 src/sort.c:3056 src/sort.c:3755 -#: src/sort.c:3758 +#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713 +#: src/sort.c:3804 src/sort.c:3807 msgid "open failed" msgstr "a apertura fallou" -#: src/sort.c:959 +#: src/sort.c:970 #, fuzzy msgid "fflush failed" msgstr "volcando o ficheiro" -#: src/sort.c:964 src/sort.c:2013 src/sort.c:4646 +#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706 msgid "close failed" msgstr "o peche fallou" -#: src/sort.c:973 +#: src/sort.c:986 #, fuzzy, c-format msgid "dup2 failed" msgstr "a apertura fallou" -#: src/sort.c:1090 +#: src/sort.c:1103 #, fuzzy, c-format msgid "couldn't execute %s" msgstr "non se poden cambia-los permisos de `%s'" -#: src/sort.c:1097 +#: src/sort.c:1110 #, fuzzy msgid "couldn't create temporary file" msgstr "non se pode crea-lo ficheiro temporal" -#: src/sort.c:1136 +#: src/sort.c:1149 #, fuzzy, c-format msgid "couldn't create process for %s -d" msgstr "non se pode crea-lo directorio %s" -#: src/sort.c:1150 +#: 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:1209 +#: src/sort.c:1220 #, fuzzy, c-format msgid "warning: cannot remove: %s" msgstr "non se poden cambia-los permisos de `%s'" -#: src/sort.c:1295 +#: src/sort.c:1306 #, fuzzy, c-format msgid "invalid --%s argument %s" msgstr "argumento incorrecto %s para %s" -#: src/sort.c:1298 +#: src/sort.c:1309 #, fuzzy, c-format msgid "minimum --%s argument is %s" msgstr "argumento %s ambiguo para %s" -#: src/sort.c:1313 +#: src/sort.c:1324 #, fuzzy, c-format msgid "--%s argument %s too large" msgstr "%s: conta \"%.*s\" grande de máis" -#: src/sort.c:1316 +#: src/sort.c:1327 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "" -#: src/sort.c:1398 +#: src/sort.c:1409 #, c-format msgid "number in parallel must be nonzero" msgstr "" -#: src/sort.c:1479 +#: src/sort.c:1494 msgid "stat failed" msgstr "a obtención de datos do ficheiro fallou" -#: src/sort.c:1740 +#: src/sort.c:1755 msgid "read failed" msgstr "erro de lectura" -#: src/sort.c:2028 +#: src/sort.c:2043 #, fuzzy, c-format msgid "string transformation failed" msgstr "a comparación de cadeas fallou" -#: src/sort.c:2031 +#: src/sort.c:2046 #, c-format msgid "the untransformed string was %s" msgstr "" -#: src/sort.c:2194 +#: src/sort.c:2209 #, c-format msgid "^ no match for key\n" msgstr "" -#: src/sort.c:2374 +#: src/sort.c:2389 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "" -#: src/sort.c:2380 +#: src/sort.c:2395 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "" -#: src/sort.c:2391 +#: src/sort.c:2406 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" -#: src/sort.c:2404 +#: src/sort.c:2419 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "" -#: src/sort.c:2436 +#: src/sort.c:2451 #, 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" -#: src/sort.c:2442 +#: src/sort.c:2457 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "" -#: src/sort.c:2716 src/sort.c:2725 +#: src/sort.c:2731 src/sort.c:2740 msgid "write failed" msgstr "erro de escritura" -#: src/sort.c:2768 +#: src/sort.c:2783 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: desorde: " -#: src/sort.c:2771 +#: src/sort.c:2786 msgid "standard error" msgstr "erro estándar" -#: src/sort.c:3926 +#: src/sort.c:3698 +#, fuzzy +msgid "cannot read" +msgstr "non se poden cambia-los permisos de `%s'" + +#: src/sort.c:3976 #, fuzzy, c-format msgid "%s: invalid field specification %s" msgstr "%s: especificación de campo incorrecta \"%s\"" -#: src/sort.c:3937 +#: src/sort.c:3987 #, fuzzy, c-format msgid "options '-%s' are incompatible" msgstr "%s: a opción \"%s\" é ambigua\n" -#: src/sort.c:3988 +#: src/sort.c:4038 #, fuzzy, c-format msgid "%s: invalid count at start of %s" msgstr "%s: conta non válida ao principio de \"%s\"" -#: src/sort.c:4245 +#: src/sort.c:4295 #, fuzzy msgid "invalid number after '-'" msgstr "número non válido despois de \"-\"" -#: src/sort.c:4248 src/sort.c:4334 src/sort.c:4362 +#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416 #, fuzzy msgid "invalid number after '.'" msgstr "número non válido despois de \".\"" -#: src/sort.c:4261 src/sort.c:4367 +#: src/sort.c:4315 src/sort.c:4421 msgid "stray character in field spec" msgstr "carácter de sobras na especificación do campo" -#: src/sort.c:4308 +#: src/sort.c:4362 #, fuzzy, c-format msgid "multiple compress programs specified" msgstr "\\%c: secuencia de escape non válida" -#: src/sort.c:4325 +#: src/sort.c:4379 msgid "invalid number at field start" msgstr "número non válido ao comezo do campo" -#: src/sort.c:4329 src/sort.c:4357 +#: src/sort.c:4383 src/sort.c:4411 msgid "field number is zero" msgstr "o número do campo é cero" -#: src/sort.c:4338 +#: src/sort.c:4392 msgid "character offset is zero" msgstr "o desprazamento do carácter é cero" -#: src/sort.c:4353 +#: src/sort.c:4407 #, fuzzy msgid "invalid number after ','" msgstr "número non válido despois de \",\"" -#: src/sort.c:4403 +#: src/sort.c:4457 #, c-format msgid "empty tab" msgstr "" -#: src/sort.c:4496 src/wc.c:692 +#: src/sort.c:4550 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:4518 +#: src/sort.c:4572 #, fuzzy, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s: lonxitude do sufixo non válida" -#: src/sort.c:4524 +#: src/sort.c:4578 #, fuzzy, c-format msgid "no input from %s" msgstr "creando ficheiro \"%s\"\n" -#: src/sort.c:4570 +#: src/sort.c:4624 #, c-format msgid "using %s sorting rules" msgstr "" -#: src/sort.c:4573 +#: src/sort.c:4627 #, c-format msgid "using simple byte comparison" msgstr "" -#: src/sort.c:4604 +#: src/sort.c:4658 #, fuzzy, c-format msgid "extra operand %s not allowed with -%c" msgstr "operando \"%s\" extra non admitido despois de -c" -#: src/split.c:184 +#: src/split.c:187 #, c-format msgid "the suffix length needs to be at least %zu" msgstr "" -#: src/split.c:201 +#: src/split.c:204 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" msgstr "Uso: %s [OPCIÓN] [ENTRADA [PREFIXO]]\n" -#: src/split.c:205 +#: src/split.c:208 #, fuzzy 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" -"\n" msgstr "" "Gravar anacos de ENTRADA de tamaño fixo en PREFIXOaa, PREFIXOab, ...; o " "PREFIXO\n" @@ -8356,8 +8694,8 @@ msgstr "" "estándar.\n" "\n" -#: src/split.c:214 -#, fuzzy, c-format +#: src/split.c:216 +#, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" " --additional-suffix=SUFFIX append an additional SUFFIX to file " @@ -8374,13 +8712,8 @@ msgid "" " -n, --number=CHUNKS generate CHUNKS output files. See below\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" -" -a, --suffix-length=N empregar sufixos de lonxitude N (%d por defecto)\n" -" -b, --byte=TAMAÑO pór TAMAÑO bytes en cada ficheiro de saída\n" -" -C, --line-bytes=TAMAÑO pór como moito TAMAÑO bytes de liñas por ficheiro\n" -" de saída\n" -" -l, --lines=NÚMERO pór NÚMERO liñas por ficheiro de saída\n" -#: src/split.c:227 +#: src/split.c:229 #, fuzzy msgid "" " --verbose print a diagnostic just before each\n" @@ -8389,7 +8722,7 @@ msgstr "" " --verbose amosar un diagnóstico no erro estándar antes de\n" " abrir cada ficheiro de saída\n" -#: src/split.c:234 +#: src/split.c:236 msgid "" "\n" "CHUNKS may be:\n" @@ -8401,184 +8734,189 @@ msgid "" "r/K/N likewise but only output Kth of N to stdout\n" msgstr "" -#: src/split.c:352 +#: src/split.c:354 #, fuzzy, c-format msgid "output file suffixes exhausted" msgstr "Esgotáronse os sufixos de ficheiros de saída" -#: src/split.c:364 +#: src/split.c:366 #, fuzzy, c-format msgid "creating file %s\n" msgstr "creando ficheiro \"%s\"\n" -#: src/split.c:377 +#: src/split.c:375 +#, c-format +msgid "%s would overwrite input; aborting" +msgstr "" + +#: src/split.c:391 #, fuzzy, c-format msgid "failed to set FILE environment variable" -msgstr "obtendo os atributos de %s" +msgstr "a variable de ambiente LS_COLORS ten un valor ilexible" -#: src/split.c:379 +#: src/split.c:393 #, c-format msgid "executing with FILE=%s\n" msgstr "" -#: src/split.c:381 +#: src/split.c:395 #, fuzzy, c-format msgid "failed to create pipe" -msgstr "non se pode crea-lo directorio %s" +msgstr "mantense a data de %s" -#: src/split.c:395 +#: src/split.c:409 #, fuzzy, c-format msgid "closing prior pipe" msgstr "non se pode cambiar ao directorio %s" -#: src/split.c:397 +#: src/split.c:411 #, fuzzy, c-format msgid "closing output pipe" msgstr "pechando o ficheiro de saída %s" -#: src/split.c:401 +#: src/split.c:415 #, fuzzy, c-format msgid "moving input pipe" msgstr "creando ficheiro \"%s\"\n" -#: src/split.c:403 +#: src/split.c:417 #, fuzzy, c-format msgid "closing input pipe" msgstr "creando ficheiro \"%s\"\n" -#: src/split.c:408 +#: src/split.c:422 #, fuzzy, c-format msgid "failed to run command: \"%s -c %s\"" -msgstr "obtendo os atributos de %s" +msgstr "non foi posible mudar o grupo de %s a %s\n" -#: src/split.c:414 -#, fuzzy, c-format +#: src/split.c:428 +#, c-format msgid "failed to close input pipe" -msgstr "%s: ficheiro longo de máis" +msgstr "" -#: src/split.c:450 -#, fuzzy, c-format +#: src/split.c:464 +#, c-format msgid "waiting for child process" -msgstr "erro escribindo %s" +msgstr "" -#: src/split.c:460 +#: src/split.c:474 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "" -#: src/split.c:468 +#: src/split.c:482 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:475 src/timeout.c:449 +#: src/split.c:489 src/timeout.c:494 #, c-format msgid "unknown status from command (0x%X)" msgstr "" -#: src/split.c:1037 +#: src/split.c:1052 #, c-format msgid "cannot split in more than one way" msgstr "non se pode partir en máis dun xeito" -#: src/split.c:1050 src/split.c:1192 src/split.c:1363 +#: src/split.c:1065 src/split.c:1205 src/split.c:1376 #, fuzzy, c-format msgid "%s: invalid number of chunks" msgstr "%s: número de segundos incorrecto" -#: src/split.c:1054 +#: src/split.c:1069 #, fuzzy, c-format msgid "%s: invalid chunk number" msgstr "%s: número incorrecto" -#: src/split.c:1106 +#: src/split.c:1119 #, c-format msgid "%s: invalid suffix length" msgstr "%s: lonxitude do sufixo non válida" -#: src/split.c:1131 src/split.c:1139 src/split.c:1162 src/split.c:1167 +#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180 #, c-format msgid "%s: invalid number of bytes" msgstr "%s: número de bytes incorrecto" -#: src/split.c:1150 src/split.c:1297 +#: src/split.c:1163 src/split.c:1310 #, c-format msgid "%s: invalid number of lines" msgstr "%s: número de liñas incorrecto" -#: src/split.c:1223 +#: src/split.c:1236 #, fuzzy, c-format msgid "line count option -%s%c... is too large" msgstr "%s: conta \"%.*s\" grande de máis" -#: src/split.c:1235 +#: src/split.c:1248 #, fuzzy, c-format msgid "%s: invalid start value for numerical suffix" msgstr "número de liña inicial incorrecto: \"%s\"" -#: src/split.c:1263 +#: src/split.c:1276 #, fuzzy, c-format msgid "%s: invalid IO block size" msgstr "%s: lonxitude do sufixo non válida" -#: src/split.c:1284 +#: src/split.c:1297 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1321 +#: src/split.c:1334 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1356 +#: src/split.c:1369 #, 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:169 +#: src/stat.c:173 msgid "Michael Meskes" msgstr "" -#: src/stat.c:838 +#: src/stat.c:857 #, c-format msgid "failed to canonicalize %s" msgstr "" -#: src/stat.c:1050 +#: src/stat.c:1069 #, fuzzy, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "%s: opción descoñecida `-%c'\n" -#: src/stat.c:1105 +#: src/stat.c:1124 #, fuzzy, c-format msgid "%s: invalid directive" msgstr "%s: patrón incorrecto" -#: src/stat.c:1151 +#: src/stat.c:1170 #, fuzzy, c-format msgid "warning: backslash at end of format" msgstr "secuencia de escape incorrecta na fin da cadea" -#: src/stat.c:1182 +#: src/stat.c:1201 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" -#: src/stat.c:1189 +#: src/stat.c:1208 #, 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:1209 +#: src/stat.c:1228 #, 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:1245 +#: src/stat.c:1264 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -8589,7 +8927,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1268 +#: src/stat.c:1287 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -8597,30 +8935,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1278 +#: src/stat.c:1297 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:1286 +#: src/stat.c:1305 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:1295 +#: src/stat.c:1314 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:1305 +#: src/stat.c:1324 #, c-format msgid "Context: %C\n" msgstr "" -#: src/stat.c:1313 +#: src/stat.c:1332 msgid "" "Access: %x\n" "Modify: %y\n" @@ -8628,15 +8966,17 @@ msgid "" " Birth: %w\n" msgstr "" -#: src/stat.c:1331 +#: src/stat.c:1350 +msgid "Display file or file system status.\n" +msgstr "" + +#: src/stat.c:1356 msgid "" -"Display file or file system status.\n" -"\n" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" -#: src/stat.c:1337 +#: src/stat.c:1360 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -8646,7 +8986,7 @@ msgid "" " -t, --terse print the information in terse form\n" msgstr "" -#: src/stat.c:1348 +#: src/stat.c:1371 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -8658,7 +8998,7 @@ msgid "" " %C SELinux security context string\n" msgstr "" -#: src/stat.c:1357 +#: src/stat.c:1380 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -8668,7 +9008,7 @@ msgid "" " %G group name of owner\n" msgstr "" -#: src/stat.c:1365 +#: src/stat.c:1388 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -8681,7 +9021,7 @@ msgid "" " %T minor device type in hex\n" msgstr "" -#: src/stat.c:1376 +#: src/stat.c:1399 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -8696,7 +9036,7 @@ msgid "" "\n" msgstr "" -#: src/stat.c:1390 +#: src/stat.c:1413 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -8707,7 +9047,7 @@ msgid "" " %f free blocks in file system\n" msgstr "" -#: src/stat.c:1399 +#: src/stat.c:1422 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -8726,30 +9066,29 @@ msgstr "Uso: %s [OPCIÓN] [FICHEIRO]...\n" #: src/stdbuf.c:91 msgid "" "Run COMMAND, with modified buffering operations for its standard streams.\n" -"\n" msgstr "" -#: src/stdbuf.c:98 +#: src/stdbuf.c:97 msgid "" " -i, --input=MODE adjust standard input stream buffering\n" " -o, --output=MODE adjust standard output stream buffering\n" " -e, --error=MODE adjust standard error stream buffering\n" msgstr "" -#: src/stdbuf.c:105 +#: src/stdbuf.c:104 msgid "" "\n" "If MODE is 'L' the corresponding stream will be line buffered.\n" "This option is invalid with standard input.\n" msgstr "" -#: src/stdbuf.c:108 +#: src/stdbuf.c:107 msgid "" "\n" "If MODE is '0' the corresponding stream will be unbuffered.\n" msgstr "" -#: src/stdbuf.c:111 +#: src/stdbuf.c:110 msgid "" "\n" "Otherwise MODE is a number which may be followed by one of the following:\n" @@ -8759,7 +9098,7 @@ msgid "" "size set to MODE bytes.\n" msgstr "" -#: src/stdbuf.c:117 +#: src/stdbuf.c:116 msgid "" "\n" "NOTE: If COMMAND adjusts the buffering of its standard streams ('tee' does\n" @@ -8769,22 +9108,22 @@ msgid "" "and are thus unaffected by 'stdbuf' settings.\n" msgstr "" -#: src/stdbuf.c:227 +#: src/stdbuf.c:226 #, c-format msgid "failed to find %s" msgstr "" -#: src/stdbuf.c:247 src/stdbuf.c:279 +#: src/stdbuf.c:246 src/stdbuf.c:278 #, c-format msgid "failed to update the environment with %s" msgstr "" -#: src/stdbuf.c:321 +#: src/stdbuf.c:320 #, c-format msgid "line buffering stdin is meaningless" msgstr "" -#: src/stty.c:509 +#: src/stty.c:513 #, fuzzy, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -8795,11 +9134,13 @@ msgstr "" " ou: %s [-F DISPOSITIVO] [--file=DISPOSITIVO] [-a|--all]\n" " ou: %s [-F DISPOSITIVO] [--file=DISPOSITIVO] [-g|--save]\n" -#: src/stty.c:515 +#: src/stty.c:519 +msgid "Print or change terminal characteristics.\n" +msgstr "" + +#: src/stty.c:525 #, fuzzy msgid "" -"Print or change terminal characteristics.\n" -"\n" " -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" @@ -8819,14 +9160,14 @@ msgstr "" "parámetros\n" "non POSIX. O sistema presente define os parámetros que están dispoñibles.\n" -#: src/stty.c:524 +#: src/stty.c:532 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:529 +#: src/stty.c:537 msgid "" "\n" "Special characters:\n" @@ -8835,7 +9176,7 @@ msgid "" " eol CHAR CHAR will end the line\n" msgstr "" -#: src/stty.c:536 +#: src/stty.c:544 msgid "" " * eol2 CHAR alternate CHAR for ending the line\n" " erase CHAR CHAR will erase the last character typed\n" @@ -8843,7 +9184,7 @@ msgid "" " kill CHAR CHAR will erase the current line\n" msgstr "" -#: src/stty.c:542 +#: src/stty.c:550 msgid "" " * lnext CHAR CHAR will enter the next character quoted\n" " quit CHAR CHAR will send a quit signal\n" @@ -8851,7 +9192,7 @@ msgid "" " start CHAR CHAR will restart the output after stopping it\n" msgstr "" -#: src/stty.c:548 +#: src/stty.c:556 msgid "" " stop CHAR CHAR will stop the output\n" " susp CHAR CHAR will send a terminal stop signal\n" @@ -8859,7 +9200,7 @@ msgid "" " * werase CHAR CHAR will erase the last word typed\n" msgstr "" -#: src/stty.c:554 +#: src/stty.c:562 msgid "" "\n" "Special settings:\n" @@ -8868,7 +9209,7 @@ msgid "" " * columns N same as cols N\n" msgstr "" -#: src/stty.c:561 +#: src/stty.c:569 msgid "" " ispeed N set the input speed to N\n" " * line N use line discipline N\n" @@ -8877,7 +9218,7 @@ msgid "" " ospeed N set the output speed to N\n" msgstr "" -#: src/stty.c:567 +#: src/stty.c:575 msgid "" " * rows N tell the kernel that the terminal has N rows\n" " * size print the number of rows and columns according to the " @@ -8886,17 +9227,18 @@ msgid "" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" -#: src/stty.c:573 +#: src/stty.c:581 msgid "" "\n" "Control settings:\n" " [-]clocal disable modem control signals\n" " [-]cread allow input to be received\n" " * [-]crtscts enable RTS/CTS handshaking\n" +" * [-]cdtrdsr enable DTR/DSR handshaking\n" " csN set character size to N bits, N in [5..8]\n" msgstr "" -#: src/stty.c:581 +#: src/stty.c:590 #, fuzzy msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" @@ -8904,7 +9246,7 @@ msgid "" " [-]hupcl same as [-]hup\n" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" -" [-]parodd set odd parity (even with '-')\n" +" [-]parodd set odd parity (or even parity with '-')\n" msgstr "" "\n" "Parámetros de control:\n" @@ -8922,7 +9264,7 @@ msgstr "" " na entrada\n" " [-]parodd establecer paridade impar (mesmo con `-')\n" -#: src/stty.c:588 +#: src/stty.c:597 msgid "" "\n" "Input settings:\n" @@ -8932,7 +9274,7 @@ msgid "" " [-]igncr ignore carriage return\n" msgstr "" -#: src/stty.c:596 +#: src/stty.c:605 msgid "" " [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" @@ -8941,11 +9283,11 @@ msgid "" " [-]istrip clear high (8th) bit of input characters\n" msgstr "" -#: src/stty.c:603 +#: src/stty.c:612 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr "" -#: src/stty.c:606 +#: src/stty.c:615 msgid "" " * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" @@ -8955,7 +9297,7 @@ msgid "" " [-]tandem same as [-]ixoff\n" msgstr "" -#: src/stty.c:614 +#: src/stty.c:623 msgid "" "\n" "Output settings:\n" @@ -8965,7 +9307,7 @@ msgid "" " * nlN newline delay style, N in [0..1]\n" msgstr "" -#: src/stty.c:622 +#: src/stty.c:631 #, fuzzy msgid "" " * [-]ocrnl translate carriage return to newline\n" @@ -8996,7 +9338,7 @@ msgstr "" "* -tabs o mesmo que tab3\n" "* vtN estilo de retardo da tabulación vertical, N entre [0..1]\n" -#: src/stty.c:630 +#: src/stty.c:639 msgid "" " * [-]onocr do not print carriage returns in the first column\n" " [-]opost postprocess output\n" @@ -9006,7 +9348,7 @@ msgid "" " * vtN vertical tab delay style, N in [0..1]\n" msgstr "" -#: src/stty.c:638 +#: src/stty.c:647 msgid "" "\n" "Local settings:\n" @@ -9015,7 +9357,7 @@ msgid "" " * -crtkill kill all line by obeying the echoctl and echok settings\n" msgstr "" -#: src/stty.c:645 +#: src/stty.c:654 msgid "" " * [-]ctlecho echo control characters in hat notation ('^c')\n" " [-]echo echo input characters\n" @@ -9024,7 +9366,7 @@ msgid "" " [-]echok echo a newline after a kill character\n" msgstr "" -#: src/stty.c:652 +#: src/stty.c:661 msgid "" " * [-]echoke same as [-]crtkill\n" " [-]echonl echo newline even if not echoing other characters\n" @@ -9033,7 +9375,7 @@ msgid "" " [-]iexten enable non-POSIX special characters\n" msgstr "" -#: src/stty.c:659 +#: src/stty.c:668 msgid "" " [-]isig enable interrupt, quit, and suspend special characters\n" " [-]noflsh disable flushing after interrupt and quit special " @@ -9043,7 +9385,7 @@ msgid "" " * [-]xcase with icanon, escape with '\\' for uppercase characters\n" msgstr "" -#: src/stty.c:666 +#: src/stty.c:675 msgid "" "\n" "Combination settings:\n" @@ -9052,7 +9394,7 @@ msgid "" " -cbreak same as icanon\n" msgstr "" -#: src/stty.c:673 +#: src/stty.c:682 msgid "" " cooked same as brkint ignpar istrip icrnl ixon opost isig\n" " icanon, eof and eol characters to their default values\n" @@ -9060,7 +9402,7 @@ msgid "" " crt same as echoe echoctl echoke\n" msgstr "" -#: src/stty.c:679 +#: src/stty.c:688 msgid "" " dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" " kill ^u\n" @@ -9069,7 +9411,7 @@ msgid "" " evenp same as parenb -parodd cs7\n" msgstr "" -#: src/stty.c:686 +#: src/stty.c:695 msgid "" " -evenp same as -parenb cs8\n" " * [-]lcase same as xcase iuclc olcuc\n" @@ -9079,7 +9421,7 @@ msgid "" " -nl same as icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" msgstr "" -#: src/stty.c:694 +#: src/stty.c:703 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -9088,7 +9430,7 @@ msgid "" " -pass8 same as parenb istrip cs7\n" msgstr "" -#: src/stty.c:701 +#: src/stty.c:710 msgid "" " raw same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" " -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n" @@ -9096,7 +9438,7 @@ msgid "" " -raw same as cooked\n" msgstr "" -#: src/stty.c:707 +#: src/stty.c:716 msgid "" " sane same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" " -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n" @@ -9106,7 +9448,7 @@ msgid "" " characters to their default values\n" msgstr "" -#: src/stty.c:715 +#: src/stty.c:724 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -9121,138 +9463,59 @@ msgstr "" "coma en ^c, 0x37, 0177 ou 127; os valores especiais ^- ou undef úsanse para\n" "desactiva-los caracteres especiais.\n" -#: src/stty.c:787 +#: src/stty.c:796 #, fuzzy, c-format msgid "only one device may be specified" msgstr "só se pode especificar un argumento" -#: src/stty.c:817 +#: src/stty.c:826 #, 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:823 +#: src/stty.c:832 #, 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:838 +#: src/stty.c:847 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s: non se pode restablece-lo modo de non bloqueo" -#: src/stty.c:883 src/stty.c:993 +#: src/stty.c:892 src/stty.c:1002 #, fuzzy, c-format msgid "invalid argument %s" msgstr "argumento incorrecto %s para %s" -#: src/stty.c:894 src/stty.c:911 src/stty.c:923 src/stty.c:936 src/stty.c:948 -#: src/stty.c:968 +#: 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 msgid "missing argument to %s" msgstr "argumento %s ambiguo para %s" -#: src/stty.c:974 +#: src/stty.c:983 #, fuzzy, c-format msgid "invalid line discipline %s" msgstr "anchura non válida: \"%s\"" -#: src/stty.c:1044 +#: src/stty.c:1053 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s: non se poden facer tódalas operacións pedidas" -#: src/stty.c:1390 +#: src/stty.c:1399 #, 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:1904 +#: src/stty.c:1920 #, fuzzy, c-format msgid "invalid integer argument %s" msgstr "incremento de números de liña incorrecto: \"%s\"" -#: src/su.c:229 -msgid "Password:" -msgstr "Contrasinal:" - -#: src/su.c:232 -#, c-format -msgid "getpass: cannot open /dev/tty" -msgstr "getpass: non se pode abrir /dev/tty" - -#: src/su.c:290 -#, fuzzy, c-format -msgid "cannot set groups" -msgstr "non se poden omiti-lo usuario e o grupo" - -#: src/su.c:294 -#, fuzzy, c-format -msgid "cannot set group id" -msgstr "non se poden omiti-lo usuario e o grupo" - -#: src/su.c:296 -#, fuzzy, c-format -msgid "cannot set user id" -msgstr "non se poden omiti-lo usuario e o grupo" - -#: src/su.c:371 -#, fuzzy, c-format -msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" -msgstr "Uso: %s [OPCIÓN]... [FICHEIRO]...\n" - -#: src/su.c:372 -#, 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" - -#: src/su.c:384 -msgid "" -"\n" -"A mere - implies -l. If USER not given, assume root.\n" -msgstr "" - -#: src/su.c:461 -#, c-format -msgid "user %s does not exist" -msgstr "o usuario %s non existe" - -#: src/su.c:484 -#, c-format -msgid "incorrect password" -msgstr "contrasinal incorrecto" - -#: src/su.c:501 -#, c-format -msgid "using restricted shell %s" -msgstr "usando shell restrinxida %s" - -#: src/su.c:509 -#, fuzzy, c-format -msgid "warning: cannot change directory to %s" -msgstr "non se pode crea-lo directorio %s" - #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 #, fuzzy @@ -9285,7 +9548,7 @@ msgstr "" msgid "ignoring all arguments" msgstr "demasiados argumentos" -#: src/system.h:340 +#: src/system.h:343 #, c-format msgid "" "\n" @@ -9294,15 +9557,24 @@ msgid "" "for details about the options it supports.\n" msgstr "" -#: src/system.h:346 +#: src/system.h:349 msgid " --help display this help and exit\n" msgstr " --help amosar esta axuda e saír\n" -#: src/system.h:348 +#: src/system.h:351 msgid " --version output version information and exit\n" msgstr " --version amosar información da versión e saír\n" -#: src/system.h:541 +#: src/system.h:544 +#, fuzzy +msgid "" +"\n" +"Mandatory arguments to long options are mandatory for short options too.\n" +msgstr "" +"Os argumentos obrigatorios nas opcións longas tamén o son nas opcións " +"curtas.\n" + +#: src/system.h:552 msgid "" "\n" "SIZE is an integer and optional unit (example: 10M is 10*1024*1024). Units\n" @@ -9310,7 +9582,7 @@ msgid "" "1000).\n" msgstr "" -#: src/system.h:550 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -9319,7 +9591,7 @@ msgid "" "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n" msgstr "" -#: src/system.h:560 +#: src/system.h:571 #, fuzzy, c-format msgid "" "\n" @@ -9333,22 +9605,22 @@ msgstr "" #. <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:574 +#: src/system.h:585 #, c-format msgid "Report %s translation bugs to <http://translationproject.org/team/>\n" msgstr "" -#: src/system.h:578 +#: src/system.h:589 #, c-format msgid "For complete documentation, run: info coreutils '%s invocation'\n" msgstr "" -#: src/system.h:585 +#: src/system.h:596 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "Escriba \"%s --help\" para máis información.\n" -#: src/system.h:617 +#: src/system.h:628 #, fuzzy, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -9369,15 +9641,15 @@ 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" -"\n" msgstr "" "Amosar cada FICHEIRO na saída estándar, coa derradeira liña de primeira.\n" "Sen un FICHEIRO, ou cando o FICHEIRO é -, lese da entrada estándar.\n" -#: src/tac.c:145 +#: src/tac.c:144 msgid "" " -b, --before attach the separator before instead of after\n" " -r, --regex interpret the separator as a regular expression\n" @@ -9389,42 +9661,42 @@ msgstr "" " -s, --separator=CADEA usa-la CADEA coma separador na vez de salto de " "liña\n" -#: src/tac.c:235 src/tac.c:336 +#: src/tac.c:234 src/tac.c:335 #, fuzzy, c-format msgid "%s: seek failed" msgstr "o peche fallou" -#: src/tac.c:264 +#: src/tac.c:263 #, fuzzy, c-format msgid "record too large" msgstr "%s: ficheiro longo de máis" -#: src/tac.c:451 +#: src/tac.c:450 #, fuzzy, c-format msgid "failed to create temporary file in %s" msgstr "non se pode crea-lo ficheiro temporal" -#: src/tac.c:459 +#: src/tac.c:458 #, fuzzy, c-format msgid "failed to open %s for writing" msgstr "%s: ficheiro longo de máis" -#: src/tac.c:476 +#: src/tac.c:475 #, fuzzy, c-format msgid "failed to rewind stream for %s" msgstr "mantense a data de %s" -#: src/tac.c:512 src/tac.c:519 +#: src/tac.c:511 src/tac.c:518 #, fuzzy, c-format msgid "%s: write error" msgstr "erro de escritura" -#: src/tac.c:572 +#: src/tac.c:571 #, fuzzy, c-format msgid "failed to open %s for reading" msgstr "non se pode abrir %s para lectura" -#: src/tac.c:630 +#: src/tac.c:629 #, c-format msgid "separator cannot be empty" msgstr "o separador non pode estar baleiro" @@ -9435,12 +9707,11 @@ msgid "Ian Lance Taylor" msgstr "" #: src/tail.c:262 -#, c-format +#, fuzzy, 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" -"\n" msgstr "" "Amosa-las derradeiras %d liñas de cada FICHEIRO na saída estándar.\n" "Con máis dun FICHEIRO, antecédese cada un cunha cabeceira que dá o nome do\n" @@ -9448,7 +9719,7 @@ msgstr "" "estándar.\n" "\n" -#: src/tail.c:271 +#: src/tail.c:270 msgid "" " -c, --bytes=K output the last K bytes; alternatively, use -c " "+K\n" @@ -9456,7 +9727,7 @@ msgid "" "file\n" msgstr "" -#: src/tail.c:275 +#: src/tail.c:274 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -9471,7 +9742,7 @@ msgstr "" "equivalentes\n" " -F igual que --follow=name --retry\n" -#: src/tail.c:282 +#: src/tail.c:281 #, fuzzy, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -9492,7 +9763,7 @@ msgstr "" " (é o caso normal de ficheiros de rexistro " "rotados)\n" -#: src/tail.c:295 +#: src/tail.c:294 #, fuzzy msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" @@ -9507,7 +9778,7 @@ msgstr "" " -v, --verbose amosar sempre as cabeceiras cos nomes de " "ficheiro\n" -#: src/tail.c:302 +#: src/tail.c:301 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations.\n" @@ -9516,7 +9787,7 @@ msgid "" " -v, --verbose always output headers giving file names\n" msgstr "" -#: src/tail.c:311 +#: src/tail.c:310 #, fuzzy msgid "" "\n" @@ -9536,7 +9807,7 @@ msgstr "" "multiplicativo: b para 512, k para 1024, m para 1048576 (1 Mega).\n" "\n" -#: src/tail.c:320 +#: src/tail.c:319 #, fuzzy msgid "" "With --follow (-f), tail defaults to following the file descriptor, which\n" @@ -9554,68 +9825,68 @@ msgstr "" "programa\n" "o eliminou e volveu crear.\n" -#: src/tail.c:379 +#: src/tail.c:378 #, c-format msgid "closing %s (fd=%d)" msgstr "pechando %s (fd=%d)" -#: src/tail.c:454 +#: 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:458 +#: src/tail.c:457 #, 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:895 +#: src/tail.c:894 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "" -#: src/tail.c:907 +#: src/tail.c:906 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" msgstr "" -#: src/tail.c:964 +#: src/tail.c:963 #, fuzzy, c-format msgid "%s has become inaccessible" msgstr "\"%s\" volveuse inaccesible" -#: src/tail.c:981 +#: src/tail.c:980 #, 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:990 +#: src/tail.c:989 #, 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:1011 +#: src/tail.c:1010 #, fuzzy, c-format msgid "%s has become accessible" msgstr "\"%s\" volveuse accesible" -#: src/tail.c:1019 +#: src/tail.c:1018 #, fuzzy, c-format msgid "%s has appeared; following end of new file" msgstr "\"%s\" apareceu; buscando a fin do novo ficheiro" -#: src/tail.c:1030 +#: src/tail.c:1029 #, 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:1131 +#: src/tail.c:1130 #, fuzzy, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: non se pode restablece-lo modo de non bloqueo" @@ -9959,17 +10230,22 @@ msgstr "falta un `]'\n" msgid "extra argument %s" msgstr "demasiados argumentos" -#: src/timeout.c:124 +#: src/timeout.c:112 +#, c-format +msgid "warning: sigprocmask" +msgstr "" + +#: src/timeout.c:145 #, c-format msgid "warning: timer_settime" msgstr "" -#: src/timeout.c:129 +#: src/timeout.c:150 #, c-format msgid "warning: timer_create" msgstr "" -#: src/timeout.c:204 +#: src/timeout.c:225 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -9978,18 +10254,18 @@ msgstr "" "Uso: %s [FICHEIRO]...\n" " ou: %s [OPCIÓN]\n" -#: src/timeout.c:208 +#: src/timeout.c:229 #, fuzzy -msgid "" -"Start COMMAND, and kill it if still running after DURATION.\n" -"\n" -"Mandatory arguments to long options are mandatory for short options too.\n" +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:213 +#: src/timeout.c:235 msgid "" +" --preserve-status\n" +" exit with the same status as COMMAND, even when the\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 " @@ -10004,7 +10280,7 @@ msgid "" " See 'kill -l' for a list of signals\n" msgstr "" -#: src/timeout.c:229 +#: src/timeout.c:254 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -10012,25 +10288,30 @@ msgid "" "days.\n" msgstr "" -#: src/timeout.c:234 +#: src/timeout.c:259 msgid "" "\n" -"If the command times out, then exit with status 124. Otherwise, exit\n" -"with the status of COMMAND. If no signal is specified, send the TERM\n" -"signal upon timeout. The TERM signal kills any process that does not\n" -"block or catch that signal. For other processes, it may be necessary to\n" -"use the KILL (9) signal, since this signal cannot be caught. If the\n" -"KILL (9) signal is sent, the exit status is 128+9 rather than 124.\n" +"If the command times out, and --preserve-status is not set, then exit with\n" +"status 124. Otherwise, exit with the status of COMMAND. If no signal\n" +"is specified, send the TERM signal upon timeout. The TERM signal kills\n" +"any process that does not block or catch that signal. It may be necessary\n" +"to use the KILL (9) signal, since this signal cannot be caught, in which\n" +"case the exit status is 128+9 rather than 124.\n" +msgstr "" + +#: src/timeout.c:363 +#, c-format +msgid "warning: disabling core dumps failed" msgstr "" -#: src/timeout.c:419 +#: src/timeout.c:471 #, fuzzy, c-format msgid "error waiting for command" msgstr "erro escribindo %s" -#: src/timeout.c:441 +#: src/timeout.c:482 #, c-format -msgid "warning: disabling core dumps failed" +msgid "the monitored command dumped core" msgstr "" #. This is a proper name. See the gettext manual, section Names. @@ -10043,22 +10324,22 @@ msgstr "" msgid "Randy Smith" msgstr "" -#: src/touch.c:115 src/touch.c:313 +#: src/touch.c:115 src/touch.c:309 #, fuzzy, c-format msgid "invalid date format %s" msgstr "argumento incorrecto %s para %s" -#: src/touch.c:194 +#: src/touch.c:191 #, fuzzy, c-format msgid "cannot touch %s" msgstr "non se poden cambia-los permisos de `%s'" -#: src/touch.c:200 +#: src/touch.c:197 #, c-format msgid "setting times of %s" msgstr "establecendo a data de %s" -#: src/touch.c:216 +#: src/touch.c:213 msgid "" "Update the access and modification times of each FILE to the current time.\n" "\n" @@ -10067,10 +10348,9 @@ msgid "" "\n" "A FILE argument string of - is handled specially and causes touch to\n" "change the times of the file associated with standard output.\n" -"\n" msgstr "" -#: src/touch.c:229 +#: src/touch.c:225 msgid "" " -a change only the access time\n" " -c, --no-create do not create any files\n" @@ -10078,7 +10358,7 @@ msgid "" " -f (ignored)\n" msgstr "" -#: src/touch.c:235 +#: src/touch.c:231 msgid "" " -h, --no-dereference affect each symbolic link instead of any " "referenced\n" @@ -10087,27 +10367,27 @@ msgid "" " -m change only the modification time\n" msgstr "" -#: src/touch.c:241 +#: src/touch.c:237 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" -" --time=WORD change the specified time:\n" +" --time=WORD change the specified time:\n" " WORD is access, atime, or use: equivalent to -a\n" " WORD is modify or mtime: equivalent to -m\n" msgstr "" -#: src/touch.c:250 +#: src/touch.c:246 msgid "" "\n" "Note that the -d and -t options accept different time-date formats.\n" msgstr "" -#: src/touch.c:339 +#: src/touch.c:335 #, fuzzy, c-format msgid "cannot specify times from more than one source" msgstr "non se pode partir en máis dun xeito" -#: src/touch.c:413 +#: src/touch.c:409 #, c-format msgid "" "warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'" @@ -10392,25 +10672,24 @@ msgid "" "If a FILE is larger than the specified size, the extra data is lost.\n" "If a FILE is shorter, it is extended and the extended part (hole)\n" "reads as zero bytes.\n" -"\n" msgstr "" -#: src/truncate.c:110 +#: src/truncate.c:109 msgid " -c, --no-create do not create any files\n" msgstr "" -#: src/truncate.c:113 +#: src/truncate.c:112 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" -#: src/truncate.c:116 +#: 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" msgstr "" -#: src/truncate.c:122 +#: src/truncate.c:121 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -10418,57 +10697,57 @@ msgid "" "'/' round down to multiple of, '%' round up to multiple of.\n" msgstr "" -#: src/truncate.c:150 +#: src/truncate.c:149 #, c-format msgid "overflow in %<PRIdMAX> * %<PRIdMAX> byte blocks for file %s" msgstr "" -#: src/truncate.c:174 +#: src/truncate.c:173 #, fuzzy, c-format msgid "%s has unusable, apparently negative size" msgstr "%s: o ficheiro ten un tamaño negativo" -#: src/truncate.c:184 src/truncate.c:379 +#: src/truncate.c:183 src/truncate.c:384 #, fuzzy, c-format msgid "cannot get the size of %s" msgstr "non se pode partir en máis dun xeito" -#: src/truncate.c:206 +#: src/truncate.c:205 #, c-format msgid "overflow rounding up size of file %s" msgstr "" -#: src/truncate.c:216 +#: src/truncate.c:215 #, c-format msgid "overflow extending size of file %s" msgstr "" -#: src/truncate.c:231 +#: src/truncate.c:230 #, c-format msgid "failed to truncate %s at %<PRIdMAX> bytes" msgstr "" -#: src/truncate.c:305 +#: src/truncate.c:303 #, fuzzy, c-format msgid "multiple relative modifiers specified" msgstr "\\%c: secuencia de escape non válida" -#: src/truncate.c:335 +#: src/truncate.c:333 #, fuzzy, c-format msgid "you must specify either %s or %s" msgstr "debe especificarse unha lista de bytes, caracteres ou campos" -#: src/truncate.c:342 +#: src/truncate.c:340 #, c-format msgid "you must specify a relative %s with %s" msgstr "" -#: src/truncate.c:349 +#: src/truncate.c:347 #, c-format msgid "%s was specified but %s was not" msgstr "" -#: src/truncate.c:400 +#: src/truncate.c:404 #, fuzzy, c-format msgid "cannot open %s for writing" msgstr "non se pode abrir %s para lectura" @@ -10566,14 +10845,13 @@ msgstr "non se pode crea-lo ficheiro temporal" msgid "" "Convert blanks in each FILE to tabs, writing to standard output.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" "Converte-los espacios de cada FICHEIRO a tabulacións, gravando na saída\n" "estándar. Sen un FICHEIRO ou cando o FICHEIRO é -, lese da entrada " "estándar.\n" "\n" -#: src/unexpand.c:125 +#: src/unexpand.c:124 #, fuzzy msgid "" " -a, --all convert all blanks, instead of just initial blanks\n" @@ -10586,12 +10864,12 @@ msgstr "" " -t, --tabs=NÚMERO tabulacións de NÚMERO caracteres no canto de 8\n" " -t, --tabs=LISTA empregar unha lista de posicións separadas por comas\n" -#: src/unexpand.c:153 +#: src/unexpand.c:152 #, c-format msgid "tabs are too far apart" msgstr "" -#: src/unexpand.c:505 +#: src/unexpand.c:504 #, fuzzy, c-format msgid "tab stop value is too large" msgstr "%s é grande de máis" @@ -10607,10 +10885,9 @@ msgid "" "writing to OUTPUT (or standard output).\n" "\n" "With no options, matching lines are merged to the first occurrence.\n" -"\n" msgstr "" -#: src/uniq.c:148 +#: src/uniq.c:147 msgid "" " -c, --count prefix lines by the number of occurrences\n" " -d, --repeated only print duplicate lines\n" @@ -10618,7 +10895,7 @@ 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:152 +#: src/uniq.c:151 #, fuzzy msgid "" " -D, --all-repeated[=delimit-method] print all duplicate lines\n" @@ -10640,12 +10917,12 @@ msgstr "" " -s, --skip­chars=N evitar compara-los primeiros N caracteres\n" " -u, --unique amosar só as liñas únicas\n" -#: src/uniq.c:162 +#: src/uniq.c:161 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:167 +#: src/uniq.c:166 #, fuzzy msgid "" "\n" @@ -10656,7 +10933,7 @@ msgstr "" "Un campo é un grupo de espacios seguidos de varios caracteres.\n" "Os campos omítense antes dos caracteres.\n" -#: src/uniq.c:172 +#: src/uniq.c:171 msgid "" "\n" "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n" @@ -10664,24 +10941,24 @@ msgid "" "Also, comparisons honor the rules specified by 'LC_COLLATE'.\n" msgstr "" -#: src/uniq.c:359 +#: src/uniq.c:358 #, fuzzy, c-format msgid "too many repeated lines" msgstr "demasiados argumentos" -#: src/uniq.c:522 +#: src/uniq.c:521 msgid "invalid number of fields to skip" msgstr "número de campos a omitir non válido" -#: src/uniq.c:531 +#: src/uniq.c:530 msgid "invalid number of bytes to skip" msgstr "número de bytes a omitir non válido" -#: src/uniq.c:540 +#: src/uniq.c:539 msgid "invalid number of bytes to compare" msgstr "número de bytes a comparar non válido" -#: src/uniq.c:559 +#: src/uniq.c:558 #, c-format msgid "printing all duplicated lines and repeat counts is meaningless" msgstr "" @@ -10734,6 +11011,11 @@ msgid_plural "up %ld days %2d:%02d, " msgstr[0] "" msgstr[1] "" +#: src/uptime.c:149 +#, fuzzy, c-format +msgid "up %2d:%02d, " +msgstr " %2d:%02d%s funcionando " + #: src/uptime.c:151 #, fuzzy, c-format msgid "%lu user" @@ -10835,39 +11117,39 @@ msgstr "" msgid " old " msgstr " antigo " -#: src/who.c:449 +#: src/who.c:440 msgid "system boot" msgstr "" -#: src/who.c:456 src/who.c:458 +#: src/who.c:447 src/who.c:449 msgid "id=" msgstr "" -#: src/who.c:471 src/who.c:476 +#: src/who.c:462 src/who.c:467 msgid "term=" msgstr "" -#: src/who.c:473 src/who.c:477 +#: src/who.c:464 src/who.c:468 msgid "exit=" msgstr "" -#: src/who.c:494 +#: src/who.c:485 msgid "LOGIN" msgstr "" -#: src/who.c:514 +#: src/who.c:505 msgid "clock change" msgstr "" -#: src/who.c:526 src/who.c:527 +#: src/who.c:517 src/who.c:518 msgid "run-level" msgstr "" -#: src/who.c:530 src/who.c:531 +#: src/who.c:521 src/who.c:522 msgid "last=" msgstr "" -#: src/who.c:562 +#: src/who.c:553 #, fuzzy, c-format msgid "" "\n" @@ -10876,45 +11158,45 @@ msgstr "" "\n" "número de usuarios=%u\n" -#: src/who.c:568 +#: src/who.c:559 msgid "NAME" msgstr "" -#: src/who.c:568 +#: src/who.c:559 msgid "LINE" msgstr "LIÑA" -#: src/who.c:568 +#: src/who.c:559 msgid "TIME" msgstr "" -#: src/who.c:568 +#: src/who.c:559 #, fuzzy msgid "IDLE" msgstr "FALLA" -#: src/who.c:569 +#: src/who.c:560 msgid "PID" msgstr "" -#: src/who.c:569 +#: src/who.c:560 msgid "COMMENT" msgstr "" -#: src/who.c:569 +#: src/who.c:560 msgid "EXIT" msgstr "" -#: src/who.c:649 +#: src/who.c:640 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n" msgstr "Uso: %s [OPCIÓN]... FICHEIRO1 FICHEIRO2\n" -#: src/who.c:650 +#: src/who.c:641 msgid "Print information about users who are currently logged in.\n" msgstr "" -#: src/who.c:653 +#: src/who.c:644 msgid "" "\n" " -a, --all same as -b -d --login -p -r -t -T -u\n" @@ -10923,18 +11205,18 @@ msgid "" " -H, --heading print line of column headings\n" msgstr "" -#: src/who.c:660 +#: src/who.c:651 msgid " -l, --login print system login processes\n" msgstr "" -#: src/who.c:663 +#: src/who.c:654 msgid "" " --lookup attempt to canonicalize hostnames via DNS\n" " -m only hostname and user associated with stdin\n" " -p, --process print active processes spawned by init\n" msgstr "" -#: src/who.c:668 +#: src/who.c:659 msgid "" " -q, --count all login names and number of users logged on\n" " -r, --runlevel print current runlevel\n" @@ -10942,7 +11224,7 @@ msgid "" " -t, --time print last system clock change\n" msgstr "" -#: src/who.c:674 +#: src/who.c:665 msgid "" " -T, -w, --mesg add user's message status as +, - or ?\n" " -u, --users list users logged in\n" @@ -10950,7 +11232,7 @@ msgid "" " --writable same as -T\n" msgstr "" -#: src/who.c:682 +#: src/who.c:673 #, fuzzy, c-format msgid "" "\n" @@ -10998,6 +11280,40 @@ 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" @@ -11006,12 +11322,125 @@ msgstr "" #~ "Uso: %s [FICHEIRO]...\n" #~ " ou: %s [OPCIÓN]\n" -#~ msgid "Try `%s --help' for more information.\n" -#~ msgstr "Escriba \"%s --help\" para máis informació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 "Usage: %s [OPTION] FILE...\n" -#~ msgstr "Uso: %s [OPCIÓN] [FICHEIRO]...\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 é 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 "" @@ -11035,10 +11464,6 @@ msgstr "" #~ "máis\n" #~ "das letras rwxXstugo.\n" -#, fuzzy -#~ msgid "Usage: %s [OPTION]... PATH START\n" -#~ msgstr "Uso: %s [OPCIÓN]... CONXUNTO1 [CONXUNTO2]\n" - #, fuzzy #~ msgid "" #~ "Display the current time in the given FORMAT, or set the system date.\n" @@ -11069,14 +11494,6 @@ msgstr "" #~ " --help amosar esta axuda e saír\n" #~ " --version amosa-la información da versión e saír\n" -#, fuzzy -#~ msgid "cannot create link %s" -#~ msgstr "non se pode crea-lo directorio %s" - -#, fuzzy -#~ msgid "%s: option '%s' is ambiguous\n" -#~ msgstr "%s: a opción \"-W %s\" é ambigua\n" - #~ msgid "program error" #~ msgstr "erro do programa" @@ -11140,6 +11557,10 @@ msgstr "" #~ msgid "cannot overwrite directory %s" #~ msgstr "non se pode crea-lo directorio %s" +#, fuzzy +#~ msgid "cannot create link %s" +#~ msgstr "non se pode crea-lo directorio %s" + #, fuzzy #~ msgid "Torbjorn Granlund, David MacKenzie, and Jim Meyering" #~ msgstr "David Ihnat, David MacKenzie e Jim Meyering" @@ -11729,9 +12150,28 @@ msgstr "" #~ msgid "sort size" #~ msgstr "tamaño de ordeación" +#~ 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 "" +#~ " -a, --suffix-length=N empregar sufixos de lonxitude N (%d por " +#~ "defecto)\n" +#~ " -b, --byte=TAMAÑO pór TAMAÑO bytes en cada ficheiro de saída\n" +#~ " -C, --line-bytes=TAMAÑO pór como moito TAMAÑO bytes de liñas por " +#~ "ficheiro\n" +#~ " de saída\n" +#~ " -l, --lines=NÚMERO pór NÚMERO liñas por ficheiro de saída\n" + #~ msgid "`-%d' option is obsolete; use `-l %d'" #~ msgstr "a opción \"-%d\" é obsoleta; empregue \"-l %d\"" +#, fuzzy +#~ msgid "Usage: %s [OPTION] FILE...\n" +#~ msgstr "Uso: %s [OPCIÓN] [FICHEIRO]...\n" + #~ msgid "new_mode: mode\n" #~ msgstr "new_mode: modo\n" @@ -11950,9 +12390,6 @@ msgstr "" #~ msgid "`-%lu' option is obsolete; use `-f %lu'" #~ msgstr "a opción \"-%lu\" é obsoleta; empregue \"-f %lu\"" -#~ msgid " %2d:%02d%s up " -#~ msgstr " %2d:%02d%s funcionando " - #~ msgid "am" #~ msgstr "am" @@ -12010,10 +12447,6 @@ msgstr "" #~ msgid "removing the directory itself: %s\n" #~ msgstr "aviso: non se pode cambiar ó directorio %s" -#, fuzzy -#~ msgid "cannot fork" -#~ msgstr "non se poden cambia-los permisos de `%s'" - #, fuzzy #~ msgid "" #~ "ERROR: the source file %s initially had device/inode\n" diff --git a/po/hr.gmo b/po/hr.gmo new file mode 100644 index 00000000..146ecee0 Binary files /dev/null and b/po/hr.gmo differ diff --git a/po/hr.po b/po/hr.po new file mode 100644 index 00000000..f4464c4f --- /dev/null +++ b/po/hr.po @@ -0,0 +1,9995 @@ +# Translation of coreutils to Croatian. +# Copyright (C) 2012 Free Software Foundation, Inc. +# This file is distributed under the same license as the coreutils package. +# +# Tomislav Krznar <tomislav.krznar@gmail.com>, 2012. +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" +"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" +"Language: hr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"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" + +#: lib/argmatch.c:133 +#, c-format +msgid "invalid argument %s for %s" +msgstr "neispravan argument %s za %s" + +#: lib/argmatch.c:134 +#, c-format +msgid "ambiguous argument %s for %s" +msgstr "višeznačan argument %s za %s" + +#: lib/argmatch.c:153 +msgid "Valid arguments are:" +msgstr "Ispravni argumenti su:" + +#: lib/closein.c:100 +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 +#: 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 +#, c-format +msgid "preserving permissions for %s" +msgstr "čuvam dozvole za %s" + +#: lib/error.c:188 +msgid "Unknown system error" +msgstr "Nepoznata greška sustava" + +#: lib/file-type.c:38 +msgid "regular empty file" +msgstr "obična prazna datoteka" + +#: lib/file-type.c:38 +msgid "regular file" +msgstr "obična datoteka" + +#: lib/file-type.c:41 +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 +msgid "symbolic link" +msgstr "simbolička veza" + +#: lib/file-type.c:56 +msgid "socket" +msgstr "utičnica" + +#: lib/file-type.c:59 +msgid "message queue" +msgstr "red poruka" + +#: lib/file-type.c:62 +msgid "semaphore" +msgstr "semafor" + +#: lib/file-type.c:65 +msgid "shared memory object" +msgstr "dijeljeni memorijski objekt" + +#: lib/file-type.c:68 +msgid "typed memory object" +msgstr "tipizirani memorijski objekt" + +#: lib/file-type.c:70 +msgid "weird file" +msgstr "čudna datoteka" + +#: lib/gai_strerror.c:57 +msgid "Address family for hostname not supported" +msgstr "Obitelj adresa za ime računala nije podržana" + +#: lib/gai_strerror.c:58 +msgid "Temporary failure in name resolution" +msgstr "Privremena greška u rezoluciji imena" + +#: lib/gai_strerror.c:59 +msgid "Bad value for ai_flags" +msgstr "Neispravna vrijednost za ai_flags" + +#: lib/gai_strerror.c:60 +msgid "Non-recoverable failure in name resolution" +msgstr "Neoporavljiv neuspjeh u rezoluciji imena" + +#: lib/gai_strerror.c:61 +msgid "ai_family not supported" +msgstr "ai_family nije podržano" + +#: lib/gai_strerror.c:62 +msgid "Memory allocation failure" +msgstr "Neuspjeh alokacije memorije" + +#: lib/gai_strerror.c:63 +msgid "No address associated with hostname" +msgstr "Nema adrese dodijeljene imenu računala" + +#: lib/gai_strerror.c:64 +msgid "Name or service not known" +msgstr "Ime ili usluga nisu poznati" + +#: lib/gai_strerror.c:65 +msgid "Servname not supported for ai_socktype" +msgstr "Servname nije podržano za ai_socktype" + +#: lib/gai_strerror.c:66 +msgid "ai_socktype not supported" +msgstr "ai_socktype nije podržano" + +#: lib/gai_strerror.c:67 +msgid "System error" +msgstr "Greška sustava" + +#: lib/gai_strerror.c:68 +msgid "Argument buffer too small" +msgstr "Međuspremnik argumenata je premalen" + +#: lib/gai_strerror.c:70 +msgid "Processing request in progress" +msgstr "Obrada zahtjeva u tijeku" + +#: lib/gai_strerror.c:71 +msgid "Request canceled" +msgstr "Zahtjev otkazan" + +#: lib/gai_strerror.c:72 +msgid "Request not canceled" +msgstr "Zahtjev nije otkazan" + +#: lib/gai_strerror.c:73 +msgid "All requests done" +msgstr "Svi zahtjevi su obrađeni" + +#: lib/gai_strerror.c:74 +msgid "Interrupted by a signal" +msgstr "Prekinut signalom" + +#: lib/gai_strerror.c:75 +msgid "Parameter string not correctly encoded" +msgstr "Niz parametara nije pravilno kodiran" + +#: lib/gai_strerror.c:87 +msgid "Unknown error" +msgstr "Nepoznata greška" + +#: lib/getopt.c:547 lib/getopt.c:576 +#, c-format +msgid "%s: option '%s' is ambiguous; possibilities:" +msgstr "%s: opcija „%s” je višeznačna; mogućnosti:" + +#: lib/getopt.c:624 lib/getopt.c:628 +#, c-format +msgid "%s: option '--%s' doesn't allow an argument\n" +msgstr "%s: opcija „--%s” ne dozvoljava argument\n" + +#: lib/getopt.c:637 lib/getopt.c:642 +#, c-format +msgid "%s: option '%c%s' doesn't allow an argument\n" +msgstr "%s: opcija „%c%s” ne dozvoljava argument\n" + +#: lib/getopt.c:685 lib/getopt.c:704 +#, c-format +msgid "%s: option '--%s' requires an argument\n" +msgstr "%s: opcija „--%s” zahtijeva argument\n" + +#: lib/getopt.c:742 lib/getopt.c:745 +#, c-format +msgid "%s: unrecognized option '--%s'\n" +msgstr "%s: neprepoznata opcija „--%s”\n" + +#: lib/getopt.c:753 lib/getopt.c:756 +#, c-format +msgid "%s: unrecognized option '%c%s'\n" +msgstr "%s: neprepoznata opcija „%c%s”\n" + +#: lib/getopt.c:805 lib/getopt.c:808 +#, c-format +msgid "%s: invalid option -- '%c'\n" +msgstr "%s: neispravna opcija -- „%c”\n" + +#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 +#, c-format +msgid "%s: option requires an argument -- '%c'\n" +msgstr "%s: opcija zahtijeva argument -- „%c”\n" + +#: lib/getopt.c:934 lib/getopt.c:950 +#, c-format +msgid "%s: option '-W %s' is ambiguous\n" +msgstr "%s: opcija „-W %s” je višeznačna\n" + +#: lib/getopt.c:974 lib/getopt.c:992 +#, c-format +msgid "%s: option '-W %s' doesn't allow an argument\n" +msgstr "%s: opcija „-W %s” ne dozvoljava argument\n" + +#: lib/getopt.c:1013 lib/getopt.c:1031 +#, c-format +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 +#, 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 +#, 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 +#, c-format +msgid "memory exhausted" +msgstr "memorija iscrpljena" + +#: lib/openat-die.c:38 +#, c-format +msgid "unable to record current working directory" +msgstr "ne mogu zapisati trenutni radni direktorij" + +#: lib/openat-die.c:57 src/find-mount-point.c:107 +#, c-format +msgid "failed to return to initial working directory" +msgstr "nisam se uspio vratiti u početni radni direktorij" + +#. TRANSLATORS: +#. Get translations for open and closing quotation marks. +#. The message catalog should translate "`" to a left +#. quotation mark suitable for the locale, and similarly for +#. "'". For example, a French Unicode local should translate +#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), respectively. +#. +#. If the catalog has no translation, we will try to +#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and +#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK). If the +#. current locale is not Unicode, locale_quoting_style +#. will quote 'like this', and clocale_quoting_style will +#. quote "like this". You should always include translations +#. for "`" and "'" even if U+2018 and U+2019 are appropriate +#. for your locale. +#. +#. If you don't know what to put here, please see +#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> +#. and use glyphs suitable for your language. +#: lib/quotearg.c:312 +msgid "`" +msgstr "„" + +#: lib/quotearg.c:313 +msgid "'" +msgstr "”" + +#: lib/randread.c:128 +#, c-format +msgid "%s: end of file" +msgstr "%s: kraj datoteke" + +#: lib/regcomp.c:131 +msgid "Success" +msgstr "Uspjeh" + +#: lib/regcomp.c:134 +msgid "No match" +msgstr "Nema poklapanja" + +#: lib/regcomp.c:137 +msgid "Invalid regular expression" +msgstr "Neispravan regularni izraz" + +#: lib/regcomp.c:140 +msgid "Invalid collation character" +msgstr "Neispravan znak razvrstavanja" + +#: lib/regcomp.c:143 +msgid "Invalid character class name" +msgstr "Neispravno ime razreda znakova" + +#: lib/regcomp.c:146 +msgid "Trailing backslash" +msgstr "Obrnuta kosa crta na kraju" + +#: lib/regcomp.c:149 +msgid "Invalid back reference" +msgstr "Neispravna povratna referenca" + +#: lib/regcomp.c:152 +msgid "Unmatched [ or [^" +msgstr "Neuparena [ ili [^" + +#: lib/regcomp.c:155 +msgid "Unmatched ( or \\(" +msgstr "Neuparena ( ili \\(" + +#: lib/regcomp.c:158 +msgid "Unmatched \\{" +msgstr "Neuparena \\{" + +#: lib/regcomp.c:161 +msgid "Invalid content of \\{\\}" +msgstr "Neispravan sadržaj \\{\\}" + +#: lib/regcomp.c:164 +msgid "Invalid range end" +msgstr "Neispravan kraj raspona" + +#: lib/regcomp.c:167 +msgid "Memory exhausted" +msgstr "Memorija iscrpljena" + +#: lib/regcomp.c:170 +msgid "Invalid preceding regular expression" +msgstr "Neispravan prethodni regularni izraz" + +#: lib/regcomp.c:173 +msgid "Premature end of regular expression" +msgstr "Preuranjen kraj regularnog izraza" + +#: lib/regcomp.c:176 +msgid "Regular expression too big" +msgstr "Regularni izraz je prevelik" + +#: lib/regcomp.c:179 +msgid "Unmatched ) or \\)" +msgstr "Neuparena ) ili \\)" + +#: lib/regcomp.c:704 +msgid "No previous regular expression" +msgstr "Nedostaje prethodni regularni izraz" + +#: lib/root-dev-ino.h:37 +#, c-format +msgid "it is dangerous to operate recursively on %s" +msgstr "opasno je rekurzivno raditi na %s" + +#: lib/root-dev-ino.h:41 +#, c-format +msgid "it is dangerous to operate recursively on %s (same as %s)" +msgstr "opasno je rekurzivno raditi na %s (isto kao %s)" + +#: lib/root-dev-ino.h:43 +#, c-format +msgid "use --no-preserve-root to override this failsafe" +msgstr "koristite --no-preserve-root za zaobilaženje ove zaštite" + +#. TRANSLATORS: A regular expression testing for an affirmative answer +#. (english: "yes"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. 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 +msgid "^[yY]" +msgstr "^[dDyY]" + +#. TRANSLATORS: A regular expression testing for a negative answer +#. (english: "no"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. 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 +msgid "^[nN]" +msgstr "^[nN]" + +#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516 +#, c-format +msgid "setting permissions for %s" +msgstr "postavljam dozvole za %s" + +#: lib/siglist.h:31 +msgid "Hangup" +msgstr "Završetak" + +#: lib/siglist.h:34 +msgid "Interrupt" +msgstr "Prekid" + +#: lib/siglist.h:37 +msgid "Quit" +msgstr "Izađi" + +#: lib/siglist.h:40 +msgid "Illegal instruction" +msgstr "Nedozvoljena instrukcija" + +#: lib/siglist.h:43 +msgid "Trace/breakpoint trap" +msgstr "Zamka za praćenje/prekidnu točku" + +#: lib/siglist.h:46 +msgid "Aborted" +msgstr "Prekinut" + +#: lib/siglist.h:49 +msgid "Floating point exception" +msgstr "Iznimka pomičnog zareza" + +#: lib/siglist.h:52 +msgid "Killed" +msgstr "Prekinut" + +#: lib/siglist.h:55 +msgid "Bus error" +msgstr "Sabirnička greška" + +#: lib/siglist.h:58 +msgid "Segmentation fault" +msgstr "Segmentacijska greška" + +#: lib/siglist.h:61 +msgid "Broken pipe" +msgstr "Prekinut cjevovod" + +#: lib/siglist.h:64 +msgid "Alarm clock" +msgstr "Budilica" + +#: lib/siglist.h:67 +msgid "Terminated" +msgstr "Završen" + +#: lib/siglist.h:70 +msgid "Urgent I/O condition" +msgstr "Hitno U/I stanje" + +#: lib/siglist.h:73 +msgid "Stopped (signal)" +msgstr "Zaustavljen (signalom)" + +#: lib/siglist.h:76 +msgid "Stopped" +msgstr "Zaustavljen" + +#: lib/siglist.h:79 +msgid "Continued" +msgstr "Nastavljen" + +#: lib/siglist.h:82 +msgid "Child exited" +msgstr "Dijete je završilo" + +#: lib/siglist.h:85 +msgid "Stopped (tty input)" +msgstr "Zaustavljen (tty ulaz)" + +#: lib/siglist.h:88 +msgid "Stopped (tty output)" +msgstr "Zaustavljen (tty izlaz)" + +#: lib/siglist.h:91 +msgid "I/O possible" +msgstr "U/I moguć" + +#: lib/siglist.h:94 +msgid "CPU time limit exceeded" +msgstr "prekoračeno ograničenje CPU vremena" + +#: lib/siglist.h:97 +msgid "File size limit exceeded" +msgstr "Prekoračeno ograničenje veličine datoteke" + +#: lib/siglist.h:100 +msgid "Virtual timer expired" +msgstr "Virtualna štoperica istekla" + +#: lib/siglist.h:103 +msgid "Profiling timer expired" +msgstr "Štoperica profiliranja istekla" + +#: lib/siglist.h:106 +msgid "Window changed" +msgstr "Promijenjen prozor" + +#: lib/siglist.h:109 +msgid "User defined signal 1" +msgstr "Korisnički definiran signal 1" + +#: lib/siglist.h:112 +msgid "User defined signal 2" +msgstr "Korisnički definiran signal 2" + +#: lib/siglist.h:117 +msgid "EMT trap" +msgstr "EMT zamka" + +#: lib/siglist.h:120 +msgid "Bad system call" +msgstr "Neispravan sistemski poziv" + +#: lib/siglist.h:123 +msgid "Stack fault" +msgstr "Greška stoga" + +#: lib/siglist.h:126 +msgid "Information request" +msgstr "Zahtjev za informacijom" + +#: lib/siglist.h:128 +msgid "Power failure" +msgstr "Prekid napajanja" + +#: lib/siglist.h:131 +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" +msgstr "Signal u stvarnom vremenu %d" + +#: lib/strsignal.c:118 +#, c-format +msgid "Unknown signal %d" +msgstr "Nepoznat signal %d" + +#: lib/unicodeio.c:102 +msgid "iconv function not usable" +msgstr "iconv funkcija se ne može koristiti" + +#: lib/unicodeio.c:104 +msgid "iconv function not available" +msgstr "iconv funkcija nije dostupna" + +#: lib/unicodeio.c:111 +msgid "character out of range" +msgstr "znak izvan raspona" + +#: lib/unicodeio.c:181 +#, c-format +msgid "cannot convert U+%04X to local character set" +msgstr "ne mogu pretvoriti U+%04X u lokalni skup znakova" + +#: lib/unicodeio.c:183 +#, c-format +msgid "cannot convert U+%04X to local character set: %s" +msgstr "ne mogu pretvoriti U+%04X u lokalni skup znakova: %s" + +#: lib/userspec.c:106 +msgid "invalid user" +msgstr "neispravan korisnik" + +#: lib/userspec.c:107 +msgid "invalid group" +msgstr "neispravna grupa" + +#: lib/userspec.c:108 +msgid "invalid spec" +msgstr "" + +#: lib/verror.c:73 +#, c-format +msgid "unable to display error message" +msgstr "ne mogu prikazati poruku greške" + +#: lib/version-etc.c:74 +#, c-format +msgid "Packaged by %s (%s)\n" +msgstr "Pakirao %s (%s)\n" + +#: lib/version-etc.c:77 +#, c-format +msgid "Packaged by %s\n" +msgstr "Pakirao %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 "(C)" + +#: lib/version-etc.c:86 +msgid "" +"\n" +"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl." +"html>.\n" +"This is free software: you are free to change and redistribute it.\n" +"There is NO WARRANTY, to the extent permitted by law.\n" +"\n" +msgstr "" +"\n" +"Licenca GPLv3+: GNU GPL inačica 3 ili kasnija <http://gnu.org/licenses/gpl." +"html>.\n" +"Ovo je slobodan softver: slobodno ga smijete mijenjati i dijeliti.\n" +"NEMA JAMSTAVA, do krajnje mjere dozvoljene zakonom.\n" +"\n" + +#. TRANSLATORS: %s denotes an author name. +#: lib/version-etc.c:102 +#, c-format +msgid "Written by %s.\n" +msgstr "Napisao %s.\n" + +#. TRANSLATORS: Each %s denotes an author name. +#: lib/version-etc.c:106 +#, c-format +msgid "Written by %s and %s.\n" +msgstr "Napisali %s i %s.\n" + +#. TRANSLATORS: Each %s denotes an author name. +#: lib/version-etc.c:110 +#, c-format +msgid "Written by %s, %s, and %s.\n" +msgstr "Napisali %s, %s i %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 +#, c-format +msgid "" +"Written by %s, %s, %s,\n" +"and %s.\n" +msgstr "" +"Napisali %s, %s, %s\n" +"i %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 +#, c-format +msgid "" +"Written by %s, %s, %s,\n" +"%s, and %s.\n" +msgstr "" +"Napisali %s, %s, %s,\n" +"%s i %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:131 +#, c-format +msgid "" +"Written by %s, %s, %s,\n" +"%s, %s, and %s.\n" +msgstr "" +"Napisali %s, %s, %s,\n" +"%s, %s i %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:139 +#, c-format +msgid "" +"Written by %s, %s, %s,\n" +"%s, %s, %s, and %s.\n" +msgstr "" +"Napisali %s, %s, %s,\n" +"%s, %s, %s i %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:147 +#, c-format +msgid "" +"Written by %s, %s, %s,\n" +"%s, %s, %s, %s,\n" +"and %s.\n" +msgstr "" +"Napisali %s, %s, %s,\n" +"%s, %s, %s, %s\n" +"i %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:156 +#, c-format +msgid "" +"Written by %s, %s, %s,\n" +"%s, %s, %s, %s,\n" +"%s, and %s.\n" +msgstr "" +"Napisali %s, %s, %s,\n" +"%s, %s, %s, %s,\n" +"%s i %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:167 +#, c-format +msgid "" +"Written by %s, %s, %s,\n" +"%s, %s, %s, %s,\n" +"%s, %s, and others.\n" +msgstr "" +"Napisali %s, %s, %s,\n" +"%s, %s, %s, %s,\n" +"%s, %s i ostali.\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 +#, c-format +msgid "" +"\n" +"Report bugs to: %s\n" +msgstr "" +"\n" +"Prijavite greške na %s.\n" +"Prijavite greške prijevoda na <lokalizacija@linux.hr>.\n" + +#: lib/version-etc.c:247 +#, c-format +msgid "Report %s bugs to: %s\n" +msgstr "Prijavite greške %s na %s\n" + +#: lib/version-etc.c:251 src/system.h:573 +#, c-format +msgid "%s home page: <%s>\n" +msgstr "%s početna stranica: <%s>\n" + +#: lib/version-etc.c:253 +#, c-format +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 +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" + +#: lib/xfreopen.c:36 +msgid "stdout" +msgstr "standardni izlaz" + +#: lib/xfreopen.c:37 +msgid "stderr" +msgstr "standardni izlaz za greške" + +#: lib/xfreopen.c:38 +msgid "unknown stream" +msgstr "nepoznat tok podataka" + +#: lib/xfreopen.c:39 +#, c-format +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 +#, c-format +msgid "string comparison failed" +msgstr "usporedba nizova nije uspjela" + +#: lib/xmemcoll.c:40 +#, c-format +msgid "Set LC_ALL='C' to work around the problem." +msgstr "Postavite LC_ALL='C' kako biste zaobišli problem." + +#: lib/xmemcoll.c:42 +#, c-format +msgid "The strings compared were %s and %s." +msgstr "Uspoređeni nizovi su %s i %s." + +#: lib/xprintf.c:50 lib/xprintf.c:76 +#, c-format +msgid "cannot perform formatted output" +msgstr "ne mogu izvršiti oblikovani ispis" + +#: lib/xstrtol-error.c:63 +#, c-format +msgid "invalid %s%s argument '%s'" +msgstr "neispravan %s%s argument „%s”" + +#: lib/xstrtol-error.c:68 +#, c-format +msgid "invalid suffix in %s%s argument '%s'" +msgstr "neispravan sufiks u %s%s argumentu „%s”" + +#: lib/xstrtol-error.c:72 +#, c-format +msgid "%s%s argument '%s' too large" +msgstr "%s%s argument „%s” je prevelik" + +#. This is a proper name. See the gettext manual, section Names. +#: src/base64.c:40 +msgid "Simon Josefsson" +msgstr "Simon Josefsson" + +#: src/base64.c:60 +#, c-format +msgid "" +"Usage: %s [OPTION]... [FILE]\n" +"Base64 encode or decode FILE, or standard input, to standard output.\n" +msgstr "" + +#: src/base64.c:67 +msgid "" +" -d, --decode decode data\n" +" -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" +" -w, --wrap=COLS wrap encoded lines after COLS character (default " +"76).\n" +" Use 0 to disable line wrapping\n" +"\n" +msgstr "" + +#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70 +msgid "" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" +msgstr "" +"\n" +"Ako DATOTEKA nije navedena ili je „-”, čitaj standardni ulaz.\n" + +#: src/base64.c:79 +msgid "" +"\n" +"The data are encoded as described for the base64 alphabet in RFC 3548.\n" +"When decoding, the input may contain newlines in addition to the bytes of\n" +"the formal base64 alphabet. Use --ignore-garbage to attempt to recover\n" +"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 +#, c-format +msgid "read error" +msgstr "greška čitanja" + +#: src/base64.c:230 +#, c-format +msgid "invalid input" +msgstr "neispravan ulaz" + +#: src/base64.c:267 +#, 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 +#, c-format +msgid "extra operand %s" +msgstr "operand viška %s" + +#: src/base64.c:318 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/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/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 +msgid "David MacKenzie" +msgstr "David MacKenzie" + +#: src/basename.c:48 +#, c-format +msgid "" +"Usage: %s NAME [SUFFIX]\n" +" or: %s OPTION... NAME...\n" +msgstr "" +"Uporaba: %s IME [SUFIKS]\n" +" ili: %s OPCIJA... IME...\n" + +#: src/basename.c:53 +msgid "" +"Print NAME with any leading directory components removed.\n" +"If specified, also remove a trailing SUFFIX.\n" +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" +msgstr "" + +#: src/basename.c:67 +#, c-format +msgid "" +"\n" +"Examples:\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\" 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/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 +#, 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 +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/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/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 +#, c-format +msgid "Usage: %s [OPTION]... [FILE]...\n" +msgstr "Uporaba: %s [OPCIJA]... [DATOTEKA]...\n" + +#: src/cat.c:92 +msgid "" +"Concatenate FILE(s), or standard input, to standard output.\n" +"\n" +" -A, --show-all equivalent to -vET\n" +" -b, --number-nonblank number nonempty output lines, overrides -n\n" +" -e equivalent to -vE\n" +" -E, --show-ends display $ at end of each line\n" +" -n, --number number all output lines\n" +" -s, --squeeze-blank suppress repeated empty output lines\n" +msgstr "" + +#: src/cat.c:102 +msgid "" +" -t equivalent to -vT\n" +" -T, --show-tabs display TAB characters as ^I\n" +" -u (ignored)\n" +" -v, --show-nonprinting use ^ and M- notation, except for LFD and TAB\n" +msgstr "" + +#: src/cat.c:114 +#, c-format +msgid "" +"\n" +"Examples:\n" +" %s f - g Output f's contents, then standard input, then g's contents.\n" +" %s Copy standard input to standard output.\n" +msgstr "" + +#: src/cat.c:326 +#, c-format +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 +#, c-format +msgid "standard output" +msgstr "standardni izlaz" + +#: src/cat.c:716 +#, c-format +msgid "%s: input file is output file" +msgstr "%s: ulazna datoteka je izlazna datoteka" + +#. This is a proper name. See the gettext manual, section Names. +#: src/chcon.c:36 src/runcon.c:62 +msgid "Russell Coker" +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 +msgid "Jim Meyering" +msgstr "Jim Meyering" + +#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238 +#, c-format +msgid "failed to create security context: %s" +msgstr "nisam uspio napraviti sigurnosni kontekst: %s" + +#: src/chcon.c:112 +#, c-format +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 +#, c-format +msgid "failed to get security context of %s" +msgstr "nisam uspio dohvatiti sigurnosni kontekst %s" + +#: src/chcon.c:166 +#, c-format +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 +#, 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 +#, 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 +#, c-format +msgid "cannot read directory %s" +msgstr "ne mogu čitati direktorij %s" + +#: src/chcon.c:292 +#, c-format +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 +#, 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 +#, c-format +msgid "fts_close failed" +msgstr "fts_close nije uspio" + +#: src/chcon.c:351 +#, 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 "" +"Uporaba: %s [OPCIJA]... KONTEKST DATOTEKA...\n" +" ili: %s [OPCIJA]... [-u KORISNIK] [-r ULOGA] [-l RASPON] [-t VRSTA] " +"DATOTEKA...\n" +" ili: %s [OPCIJA]... --reference=REFDATOTEKA DATOTEKA...\n" + +#: src/chcon.c:357 +msgid "" +"Change the security context of each FILE to CONTEXT.\n" +"With --reference, change the security context of each FILE to that of " +"RFILE.\n" +msgstr "" + +#: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94 +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 "" + +#: src/chcon.c:369 +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" +" -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 "" + +#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 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 +msgid "" +" --reference=RFILE use RFILE's security context rather than " +"specifying\n" +" a CONTEXT value\n" +msgstr "" + +#: 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 "" + +#: src/chcon.c:389 src/chgrp.c:143 src/chown.c:121 +msgid "" +"\n" +"The following options modify how a hierarchy is traversed when the -R\n" +"option is also specified. If more than one is specified, only the final\n" +"one takes effect.\n" +"\n" +" -H if a command line argument is a symbolic link\n" +" to a directory, traverse it\n" +" -L traverse every symbolic link to a directory\n" +" encountered\n" +" -P do not traverse any symbolic links (default)\n" +"\n" +msgstr "" + +#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267 +#, c-format +msgid "-R --dereference requires either -H or -L" +msgstr "" + +#: src/chcon.c:524 +#, 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 +#, c-format +msgid "missing operand after %s" +msgstr "nedostaje operand nakon %s" + +#: src/chcon.c:562 src/runcon.c:251 +#, c-format +msgid "invalid context: %s" +msgstr "neispravan kontekst: %s" + +#: src/chcon.c:569 +#, 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 +#, c-format +msgid "failed to get attributes of %s" +msgstr "nisam uspio otkriti svojstva %s" + +#: src/chgrp.c:92 +#, c-format +msgid "invalid group: %s" +msgstr "neispravna grupa: %s" + +#: src/chgrp.c:108 +#, c-format +msgid "" +"Usage: %s [OPTION]... GROUP FILE...\n" +" or: %s [OPTION]... --reference=RFILE FILE...\n" +msgstr "" +"Uporaba: %s [OPCIJA]... GRUPA DATOTEKA...\n" +" ili: %s [OPCIJA]... --reference=REFDATOTEKA DATOTEKA...\n" + +#: src/chgrp.c:113 +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 "" + +#: src/chgrp.c:118 src/chmod.c:382 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 "" + +#: src/chgrp.c:128 src/chown.c:99 +msgid "" +" (useful only on systems that can change the\n" +" ownership of a symlink)\n" +msgstr "" + +#: src/chgrp.c:136 +msgid "" +" --reference=RFILE use RFILE's group rather than specifying a\n" +" GROUP value\n" +msgstr "" + +#: src/chgrp.c:158 +#, c-format +msgid "" +"\n" +"Examples:\n" +" %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 "" + +#: src/chmod.c:126 +#, c-format +msgid "getting new attributes of %s" +msgstr "" + +#: src/chmod.c:149 src/chown-core.c:147 +#, c-format +msgid "neither symbolic link %s nor referent has been changed\n" +msgstr "" + +#: src/chmod.c:163 +#, c-format +msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n" +msgstr "" + +#: src/chmod.c:166 +#, c-format +msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n" +msgstr "" + +#: src/chmod.c:169 +#, c-format +msgid "mode of %s retained as %04lo (%s)\n" +msgstr "" + +#: src/chmod.c:236 +#, c-format +msgid "cannot operate on dangling symlink %s" +msgstr "" + +#: src/chmod.c:276 +#, c-format +msgid "changing permissions of %s" +msgstr "mijenjam dozvole %s" + +#: src/chmod.c:311 +#, c-format +msgid "%s: new permissions are %s, not %s" +msgstr "%s: nove dozvole su %s, ne %s" + +#: src/chmod.c:371 +#, 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 "" +"Uporaba: %s [OPCIJA]... MOD[,MOD]... DATOTEKA...\n" +" ili: %s [OPCIJA]... OKTALNI-MOD DATOTEKA...\n" +" ili: %s [OPCIJA]... --reference=REFDATOTEKA DATOTEKA...\n" + +#: src/chmod.c:377 +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 +msgid " --reference=RFILE use RFILE's mode instead of MODE values\n" +msgstr "" + +#: src/chmod.c:394 +msgid " -R, --recursive change files and directories recursively\n" +msgstr "" + +#: src/chmod.c:399 +msgid "" +"\n" +"Each MODE is of the form '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n" +msgstr "" + +#: src/chmod.c:513 +#, c-format +msgid "cannot combine mode and --reference options" +msgstr "" + +#: src/chmod.c:544 +#, c-format +msgid "invalid mode: %s" +msgstr "" + +#: src/chown-core.c:158 +#, c-format +msgid "changed ownership of %s from %s to %s\n" +msgstr "" + +#: src/chown-core.c:159 +#, c-format +msgid "changed group of %s from %s to %s\n" +msgstr "" + +#: src/chown-core.c:160 +#, c-format +msgid "no change to ownership of %s\n" +msgstr "" + +#: src/chown-core.c:165 +#, c-format +msgid "failed to change ownership of %s from %s to %s\n" +msgstr "" + +#: src/chown-core.c:166 +#, c-format +msgid "failed to change group of %s from %s to %s\n" +msgstr "" + +#: src/chown-core.c:167 src/chown-core.c:173 +#, c-format +msgid "failed to change ownership of %s\n" +msgstr "" + +#: src/chown-core.c:171 +#, c-format +msgid "failed to change ownership of %s to %s\n" +msgstr "" + +#: src/chown-core.c:172 +#, c-format +msgid "failed to change group of %s to %s\n" +msgstr "" + +#: src/chown-core.c:180 +#, c-format +msgid "ownership of %s retained as %s\n" +msgstr "" + +#: src/chown-core.c:181 +#, c-format +msgid "group of %s retained as %s\n" +msgstr "" + +#: src/chown-core.c:182 +#, c-format +msgid "ownership of %s retained\n" +msgstr "" + +#: src/chown-core.c:379 +#, c-format +msgid "cannot dereference %s" +msgstr "" + +#: src/chown-core.c:467 +#, c-format +msgid "changing ownership of %s" +msgstr "" + +#: src/chown-core.c:468 +#, c-format +msgid "changing group of %s" +msgstr "" + +#: src/chown.c:79 +#, c-format +msgid "" +"Usage: %s [OPTION]... [OWNER][:[GROUP]] FILE...\n" +" or: %s [OPTION]... --reference=RFILE FILE...\n" +msgstr "" + +#: src/chown.c:84 +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" +msgstr "" + +#: src/chown.c:103 +msgid "" +" --from=CURRENT_OWNER:CURRENT_GROUP\n" +" change the owner and/or group of each file only if\n" +" its current owner and/or group match those " +"specified\n" +" here. Either may be omitted, in which case a " +"match\n" +" is not required for the omitted attribute\n" +msgstr "" + +#: src/chown.c:114 +msgid "" +" --reference=RFILE use RFILE's owner and group rather than\n" +" specifying OWNER:GROUP values\n" +msgstr "" + +#: src/chown.c:136 +msgid "" +"\n" +"Owner is unchanged if missing. Group is unchanged if missing, but changed\n" +"to login group if implied by a ':' following a symbolic OWNER.\n" +"OWNER and GROUP may be numeric as well as symbolic.\n" +msgstr "" + +#: src/chown.c:142 +#, c-format +msgid "" +"\n" +"Examples:\n" +" %s root /u Change the owner of /u to \"root\".\n" +" %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 "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/chroot.c:34 +msgid "Roland McGrath" +msgstr "" + +#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120 +#, c-format +msgid "invalid group %s" +msgstr "" + +#: src/chroot.c:109 +#, 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 +#, c-format +msgid "" +"Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" +" or: %s OPTION\n" +msgstr "" + +#: src/chroot.c:137 +msgid "" +"Run COMMAND with root directory set to NEWROOT.\n" +"\n" +msgstr "" + +#: src/chroot.c:142 +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 +msgid "" +"\n" +"If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n" +msgstr "" + +#: src/chroot.c:202 +#, c-format +msgid "cannot change root directory to %s" +msgstr "" + +#: src/chroot.c:206 +#, c-format +msgid "cannot chdir to root directory" +msgstr "" + +#: src/chroot.c:247 +#, c-format +msgid "failed to set group-ID" +msgstr "" + +#: src/chroot.c:253 +#, 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 +#, c-format +msgid "failed to run command %s" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/cksum.c:40 +msgid "Q. Frank Xia" +msgstr "" + +#: src/cksum.c:216 +#, c-format +msgid "%s: file too long" +msgstr "" + +#: src/cksum.c:263 +#, c-format +msgid "" +"Usage: %s [FILE]...\n" +" or: %s [OPTION]\n" +msgstr "" + +#: src/cksum.c:268 +msgid "" +"Print CRC checksum and byte counts of each FILE.\n" +"\n" +msgstr "" + +#: src/comm.c:103 src/join.c:187 +#, c-format +msgid "Usage: %s [OPTION]... FILE1 FILE2\n" +msgstr "" + +#: src/comm.c:107 +msgid "Compare sorted files FILE1 and FILE2 line by line.\n" +msgstr "" + +#: src/comm.c:110 +msgid "" +"\n" +"With no options, produce three-column output. Column one contains\n" +"lines unique to FILE1, column two contains lines unique to FILE2,\n" +"and column three contains lines common to both files.\n" +msgstr "" + +#: src/comm.c:116 +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 "" + +#: src/comm.c:122 +msgid "" +"\n" +" --check-order check that the input is correctly sorted, even\n" +" if all input lines are pairable\n" +" --nocheck-order do not check that the input is correctly sorted\n" +msgstr "" + +#: src/comm.c:128 +msgid " --output-delimiter=STR separate columns with STR\n" +msgstr "" + +#: src/comm.c:133 +msgid "" +"\n" +"Note, comparisons honor the rules specified by 'LC_COLLATE'.\n" +msgstr "" + +#: src/comm.c:137 +#, c-format +msgid "" +"\n" +"Examples:\n" +" %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 "" + +#: src/comm.c:222 +#, c-format +msgid "file %d is not in sorted order" +msgstr "" + +#: src/comm.c:407 +#, c-format +msgid "multiple delimiters specified" +msgstr "" + +#: src/comm.c:411 +#, c-format +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 +#, c-format +msgid "error reading %s" +msgstr "" + +#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425 +#, c-format +msgid "cannot lseek %s" +msgstr "" + +#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151 +#, c-format +msgid "error writing %s" +msgstr "" + +#: src/copy.c:313 +#, c-format +msgid "%s: failed to get extents info" +msgstr "" + +#: src/copy.c:373 +#, c-format +msgid "%s: write failed" +msgstr "" + +#: src/copy.c:442 src/copy.c:1083 +#, c-format +msgid "failed to extend %s" +msgstr "" + +#: src/copy.c:662 +#, c-format +msgid "clearing permissions for %s" +msgstr "" + +#: src/copy.c:697 src/copy.c:2480 src/cp.c:329 +#, c-format +msgid "failed to preserve ownership for %s" +msgstr "" + +#: src/copy.c:723 +#, c-format +msgid "failed to lookup file %s" +msgstr "" + +#: src/copy.c:728 +#, 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 +#, c-format +msgid "cannot fstat %s" +msgstr "" + +#: src/copy.c:820 +#, 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 +#, 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 +#, 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 +#, c-format +msgid "removed %s\n" +msgstr "" + +#: src/copy.c:926 +#, c-format +msgid "not writing through dangling symlink %s" +msgstr "" + +#: src/copy.c:964 +#, c-format +msgid "cannot create regular file %s" +msgstr "" + +#: src/copy.c:985 +#, c-format +msgid "failed to clone %s from %s" +msgstr "" + +#: src/copy.c:1098 src/copy.c:2541 +#, 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/truncate.c:417 +#, fuzzy, c-format +msgid "failed to close %s" +msgstr "nisam uspio ponovo otvoriti %s s modom %s" + +#: src/copy.c:1471 +#, c-format +msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? " +msgstr "" + +#: src/copy.c:1478 +#, c-format +msgid "%s: overwrite %s? " +msgstr "" + +#: src/copy.c:1547 +#, c-format +msgid " (backup: %s)" +msgstr "" + +#: src/copy.c:1557 +#, c-format +msgid "failed to restore the default file creation context" +msgstr "" + +#: src/copy.c:1589 +#, 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 +#, c-format +msgid "cannot stat %s" +msgstr "" + +#: src/copy.c:1650 +#, c-format +msgid "omitting directory %s" +msgstr "" + +#: src/copy.c:1664 +#, c-format +msgid "warning: source file %s specified more than once" +msgstr "" + +#: src/copy.c:1712 src/ln.c:246 +#, c-format +msgid "%s and %s are the same file" +msgstr "" + +#: src/copy.c:1811 +#, c-format +msgid "cannot overwrite non-directory %s with directory %s" +msgstr "" + +#: src/copy.c:1829 src/ln.c:214 +#, c-format +msgid "will not overwrite just-created %s with %s" +msgstr "" + +#: src/copy.c:1847 +#, c-format +msgid "cannot overwrite directory %s with non-directory" +msgstr "" + +#: src/copy.c:1861 +#, c-format +msgid "cannot move directory onto non-directory: %s -> %s" +msgstr "" + +#: src/copy.c:1891 +#, c-format +msgid "backing up %s would destroy source; %s not moved" +msgstr "" + +#: src/copy.c:1892 +#, c-format +msgid "backing up %s would destroy source; %s not copied" +msgstr "" + +#: src/copy.c:1915 src/ln.c:276 +#, c-format +msgid "cannot backup %s" +msgstr "" + +#: src/copy.c:1979 +#, c-format +msgid "will not copy %s through just-created symlink %s" +msgstr "" + +#: src/copy.c:2056 +#, c-format +msgid "cannot copy a directory, %s, into itself, %s" +msgstr "" + +#: src/copy.c:2073 +#, c-format +msgid "will not create hard link %s to directory %s" +msgstr "" + +#: src/copy.c:2123 +#, c-format +msgid "cannot move %s to a subdirectory of itself, %s" +msgstr "" + +#: src/copy.c:2166 +#, c-format +msgid "cannot move %s to %s" +msgstr "" + +#: src/copy.c:2178 +#, 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 +#, c-format +msgid "cannot copy cyclic symbolic link %s" +msgstr "" + +#: src/copy.c:2355 +#, c-format +msgid "%s: can make relative symbolic links only in current directory" +msgstr "" + +#: src/copy.c:2362 +#, c-format +msgid "cannot create symbolic link %s to %s" +msgstr "" + +#: src/copy.c:2416 src/mkfifo.c:132 +#, c-format +msgid "cannot create fifo %s" +msgstr "" + +#: src/copy.c:2425 +#, c-format +msgid "cannot create special file %s" +msgstr "" + +#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921 +#, c-format +msgid "cannot read symbolic link %s" +msgstr "" + +#: src/copy.c:2463 +#, c-format +msgid "cannot create symbolic link %s" +msgstr "" + +#: src/copy.c:2495 +#, c-format +msgid "%s has unknown file type" +msgstr "" + +#: src/copy.c:2644 src/ln.c:358 +#, c-format +msgid "cannot un-backup %s" +msgstr "" + +#: src/copy.c:2648 +#, c-format +msgid "%s -> %s (unbackup)\n" +msgstr "" + +#: src/cp.c:156 src/mv.c:286 +#, c-format +msgid "" +"Usage: %s [OPTION]... [-T] SOURCE DEST\n" +" or: %s [OPTION]... SOURCE... DIRECTORY\n" +" or: %s [OPTION]... -t DIRECTORY SOURCE...\n" +msgstr "" + +#: src/cp.c:162 +msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" +msgstr "" + +#: src/cp.c:168 +msgid "" +" -a, --archive same as -dR --preserve=all\n" +" --attributes-only don't copy the file data, just the " +"attributes\n" +" --backup[=CONTROL] make a backup of each existing destination " +"file\n" +" -b like --backup but does not accept an " +"argument\n" +" --copy-contents copy contents of special files when " +"recursive\n" +" -d same as --no-dereference --preserve=links\n" +msgstr "" + +#: src/cp.c:177 +msgid "" +" -f, --force if an existing destination file cannot be\n" +" opened, remove it and try again (this " +"option\n" +" is ignored when the -n option is also " +"used)\n" +" -i, --interactive prompt before overwrite (overrides a previous " +"-n\n" +" option)\n" +" -H follow command-line symbolic links in SOURCE\n" +msgstr "" + +#: src/cp.c:186 +msgid "" +" -l, --link hard link files instead of copying\n" +" -L, --dereference always follow symbolic links in SOURCE\n" +msgstr "" + +#: src/cp.c:190 +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 +msgid "" +" -p same as --preserve=mode,ownership,timestamps\n" +" --preserve[=ATTR_LIST] preserve the specified attributes (default:\n" +" mode,ownership,timestamps), if possible\n" +" additional attributes: context, links, " +"xattr,\n" +" all\n" +msgstr "" + +#: src/cp.c:203 +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 +msgid "" +" -R, -r, --recursive copy directories recursively\n" +" --reflink[=WHEN] control clone/CoW copies. See below\n" +" --remove-destination remove each existing destination file before\n" +" attempting to open it (contrast with --" +"force)\n" +msgstr "" + +#: src/cp.c:213 +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 "" + +#: src/cp.c:218 +msgid "" +" -s, --symbolic-link make symbolic links instead of copying\n" +" -S, --suffix=SUFFIX override the usual backup suffix\n" +" -t, --target-directory=DIRECTORY copy all SOURCE arguments into " +"DIRECTORY\n" +" -T, --no-target-directory treat DEST as a normal file\n" +msgstr "" + +#: src/cp.c:224 +msgid "" +" -u, --update copy only when the SOURCE file is newer\n" +" than the destination file or when the\n" +" destination file is missing\n" +" -v, --verbose explain what is being done\n" +" -x, --one-file-system stay on this file system\n" +msgstr "" + +#: src/cp.c:233 +msgid "" +"\n" +"By default, sparse SOURCE files are detected by a crude heuristic and the\n" +"corresponding DEST file is made sparse as well. That is the behavior\n" +"selected by --sparse=auto. Specify --sparse=always to create a sparse DEST\n" +"file whenever the SOURCE file contains a long enough sequence of zero " +"bytes.\n" +"Use --sparse=never to inhibit creation of sparse files.\n" +"\n" +"When --reflink[=always] is specified, perform a lightweight copy, where the\n" +"data blocks are copied only when modified. If this is not possible the " +"copy\n" +"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 +msgid "" +"\n" +"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 "" + +#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329 +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 "" + +#: src/cp.c:258 +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 "" + +#: src/cp.c:317 +#, c-format +msgid "failed to preserve times for %s" +msgstr "" + +#: src/cp.c:348 +#, c-format +msgid "failed to preserve permissions for %s" +msgstr "" + +#: src/cp.c:475 +#, c-format +msgid "cannot make directory %s" +msgstr "" + +#: src/cp.c:524 src/cp.c:543 +#, 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 +#, 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/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 +#, c-format +msgid "missing destination file operand after %s" +msgstr "" + +#: src/cp.c:601 src/install.c:926 src/mv.c:445 +#, 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 +#, c-format +msgid "target %s is not a directory" +msgstr "" + +#: src/cp.c:728 +#, 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 +#, c-format +msgid "multiple target directories specified" +msgstr "" + +#: src/cp.c:1110 +#, c-format +msgid "cannot make both hard and symbolic links" +msgstr "" + +#: src/cp.c:1117 src/mv.c:466 +#, c-format +msgid "options --backup and --no-clobber are mutually exclusive" +msgstr "" + +#: src/cp.c:1123 +#, 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 +msgid "backup type" +msgstr "" + +#: src/cp.c:1156 +#, c-format +msgid "cannot preserve security context without an SELinux-enabled kernel" +msgstr "" + +#: src/cp.c:1162 +#, 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 +msgid "Stuart Kemp" +msgstr "" + +#: src/csplit.c:531 +#, c-format +msgid "input disappeared" +msgstr "" + +#: src/csplit.c:660 src/csplit.c:671 +#, c-format +msgid "%s: line number out of range" +msgstr "" + +#: src/csplit.c:700 +#, c-format +msgid "%s: %s: line number out of range" +msgstr "" + +#: src/csplit.c:703 src/csplit.c:752 +#, c-format +msgid " on repetition %s\n" +msgstr "" + +#: src/csplit.c:746 +#, 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 +#, c-format +msgid "error in regular expression search" +msgstr "" + +#: src/csplit.c:983 +#, c-format +msgid "write error for %s" +msgstr "" + +#: src/csplit.c:1059 +#, c-format +msgid "%s: integer expected after delimiter" +msgstr "" + +#: src/csplit.c:1075 +#, c-format +msgid "%s: '}' is required in repeat count" +msgstr "" + +#: src/csplit.c:1085 +#, c-format +msgid "%s}: integer required between '{' and '}'" +msgstr "" + +#: src/csplit.c:1112 +#, c-format +msgid "%s: closing delimiter '%c' missing" +msgstr "" + +#: src/csplit.c:1129 +#, c-format +msgid "%s: invalid regular expression: %s" +msgstr "" + +#: src/csplit.c:1162 +#, c-format +msgid "%s: invalid pattern" +msgstr "" + +#: src/csplit.c:1165 +#, c-format +msgid "%s: line number must be greater than zero" +msgstr "" + +#: src/csplit.c:1171 +#, c-format +msgid "line number %s is smaller than preceding line number, %s" +msgstr "" + +#: src/csplit.c:1177 +#, c-format +msgid "warning: line number %s is the same as preceding line number" +msgstr "" + +#: src/csplit.c:1255 +#, c-format +msgid "missing conversion specifier in suffix" +msgstr "" + +#: src/csplit.c:1261 +#, c-format +msgid "invalid conversion specifier in suffix: %c" +msgstr "" + +#: src/csplit.c:1264 +#, c-format +msgid "invalid conversion specifier in suffix: \\%.3o" +msgstr "" + +#: src/csplit.c:1269 +#, c-format +msgid "invalid flags in conversion specification: %%%c%c" +msgstr "" + +#: src/csplit.c:1286 +#, c-format +msgid "too many %% conversion specifications in suffix" +msgstr "" + +#: src/csplit.c:1300 +#, c-format +msgid "missing %% conversion specification in suffix" +msgstr "" + +#: src/csplit.c:1347 +#, c-format +msgid "%s: invalid number" +msgstr "" + +#: src/csplit.c:1451 +#, c-format +msgid "Usage: %s [OPTION]... FILE PATTERN...\n" +msgstr "" + +#: src/csplit.c:1455 +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 +#, 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 "" + +#: src/csplit.c:1467 +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 +msgid "" +"\n" +"Read standard input if FILE is -. Each PATTERN may be:\n" +msgstr "" + +#: src/csplit.c:1478 +msgid "" +"\n" +" INTEGER copy up to but not including specified line number\n" +" /REGEXP/[OFFSET] copy up to but not including a matching line\n" +" %REGEXP%[OFFSET] skip to, but not including a matching line\n" +" {INTEGER} repeat the previous pattern specified number of times\n" +" {*} repeat the previous pattern as many times as possible\n" +"\n" +"A line OFFSET is a required '+' or '-' followed by a positive integer.\n" +msgstr "" + +#. 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 "" + +#: src/cut.c:189 +#, c-format +msgid "Usage: %s OPTION... [FILE]...\n" +msgstr "" + +#: src/cut.c:193 +msgid "Print selected parts of lines from each FILE to standard output.\n" +msgstr "" + +#: src/cut.c:199 +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 +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 "" + +#: src/cut.c:210 +msgid "" +" --complement complement the set of selected bytes, characters\n" +" or fields\n" +msgstr "" + +#: src/cut.c:214 +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 +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 "" + +#: src/cut.c:227 +msgid "" +"Each range is one of:\n" +"\n" +" N N'th byte, character or field, counted from 1\n" +" N- from N'th byte, character or field, to end of line\n" +" N-M from N'th to M'th (included) byte, character or field\n" +" -M from first to M'th (included) byte, character or field\n" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" +msgstr "" + +#: src/cut.c:367 src/cut.c:493 +msgid "invalid byte, character or field list" +msgstr "" + +#: src/cut.c:387 +msgid "invalid range with no endpoint: -" +msgstr "" + +#: src/cut.c:403 +msgid "invalid decreasing range" +msgstr "" + +#: src/cut.c:482 +#, c-format +msgid "byte offset %s is too large" +msgstr "" + +#: src/cut.c:485 +#, c-format +msgid "field number %s is too large" +msgstr "" + +#: src/cut.c:795 src/cut.c:803 +msgid "only one type of list may be specified" +msgstr "" + +#: src/cut.c:812 src/numfmt.c:1408 +#, c-format +msgid "the delimiter must be a single character" +msgstr "" + +#: src/cut.c:847 +msgid "you must specify a list of bytes, characters, or fields" +msgstr "" + +#: src/cut.c:850 +msgid "an input delimiter may be specified only when operating on fields" +msgstr "" + +#: src/cut.c:854 +msgid "" +"suppressing non-delimited lines makes sense\n" +"\tonly when operating on fields" +msgstr "" + +#: src/cut.c:870 +msgid "missing list of fields" +msgstr "" + +#: src/cut.c:872 +msgid "missing list of positions" +msgstr "" + +#: src/date.c:123 +#, c-format +msgid "" +"Usage: %s [OPTION]... [+FORMAT]\n" +" or: %s [-u|--utc|--universal] [MMDDhhmm[[CC]YY][.ss]]\n" +msgstr "" + +#: src/date.c:128 +msgid "Display the current time in the given FORMAT, or set the system date.\n" +msgstr "" + +#: src/date.c:134 +msgid "" +" -d, --date=STRING display time described by STRING, not 'now'\n" +" -f, --file=DATEFILE like --date once for each line of DATEFILE\n" +" -I[TIMESPEC], --iso-8601[=TIMESPEC] output date/time in ISO 8601 format.\n" +" TIMESPEC='date' for date only (the default),\n" +" 'hours', 'minutes', 'seconds', or 'ns' for date\n" +" and time to the indicated precision.\n" +msgstr "" + +#: src/date.c:142 +msgid "" +" -r, --reference=FILE display the last modification time of FILE\n" +" -R, --rfc-2822 output date and time in RFC 2822 format.\n" +" Example: Mon, 07 Aug 2006 12:34:56 -0600\n" +msgstr "" + +#: src/date.c:147 +msgid "" +" --rfc-3339=TIMESPEC output date and time in RFC 3339 format.\n" +" TIMESPEC='date', 'seconds', or 'ns' for\n" +" date and time to the indicated precision.\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" +msgstr "" + +#: src/date.c:158 +msgid "" +"\n" +"FORMAT controls the output. Interpreted sequences are:\n" +"\n" +" %% a literal %\n" +" %a locale's abbreviated weekday name (e.g., Sun)\n" +msgstr "" + +#: src/date.c:165 +msgid "" +" %A locale's full weekday name (e.g., Sunday)\n" +" %b locale's abbreviated month name (e.g., Jan)\n" +" %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 "" + +#: src/date.c:171 +msgid "" +" %C century; like %Y, except omit last two digits (e.g., 20)\n" +" %d day of month (e.g., 01)\n" +" %D date; same as %m/%d/%y\n" +" %e day of month, space padded; same as %_d\n" +msgstr "" + +#: src/date.c:177 +msgid "" +" %F full date; same as %Y-%m-%d\n" +" %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 "" + +#: src/date.c:182 +msgid "" +" %h same as %b\n" +" %H hour (00..23)\n" +" %I hour (01..12)\n" +" %j day of year (001..366)\n" +msgstr "" + +#: src/date.c:188 +msgid "" +" %k hour, space padded ( 0..23); same as %_H\n" +" %l hour, space padded ( 1..12); same as %_I\n" +" %m month (01..12)\n" +" %M minute (00..59)\n" +msgstr "" + +#: src/date.c:194 +msgid "" +" %n a newline\n" +" %N nanoseconds (000000000..999999999)\n" +" %p locale's equivalent of either AM or PM; blank if not known\n" +" %P like %p, but lower case\n" +" %r locale's 12-hour clock time (e.g., 11:11:04 PM)\n" +" %R 24-hour hour and minute; same as %H:%M\n" +" %s seconds since 1970-01-01 00:00:00 UTC\n" +msgstr "" + +#: src/date.c:203 +msgid "" +" %S second (00..60)\n" +" %t a tab\n" +" %T time; same as %H:%M:%S\n" +" %u day of week (1..7); 1 is Monday\n" +msgstr "" + +#: src/date.c:209 +msgid "" +" %U week number of year, with Sunday as first day of week (00..53)\n" +" %V ISO week number, with Monday as first day of week (01..53)\n" +" %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 "" + +#: src/date.c:215 +msgid "" +" %x locale's date representation (e.g., 12/31/99)\n" +" %X locale's time representation (e.g., 23:13:48)\n" +" %y last two digits of year (00..99)\n" +" %Y year\n" +msgstr "" + +#: src/date.c:221 +msgid "" +" %z +hhmm numeric time zone (e.g., -0400)\n" +" %:z +hh:mm numeric time zone (e.g., -04:00)\n" +" %::z +hh:mm:ss numeric time zone (e.g., -04:00:00)\n" +" %:::z numeric time zone with : to necessary precision (e.g., -04, " +"+05:30)\n" +" %Z alphabetic time zone abbreviation (e.g., EDT)\n" +"\n" +"By default, date pads numeric fields with zeroes.\n" +msgstr "" + +#: src/date.c:230 +msgid "" +"The following optional flags may follow '%':\n" +"\n" +" - (hyphen) do not pad the field\n" +" _ (underscore) pad with spaces\n" +" 0 (zero) pad with zeros\n" +" ^ use upper case if possible\n" +" # use opposite case if possible\n" +msgstr "" + +#: src/date.c:239 +msgid "" +"\n" +"After any flags comes an optional field width, as a decimal number;\n" +"then an optional modifier, which is either\n" +"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 "" + +#: src/date.c:246 +msgid "" +"\n" +"Examples:\n" +"Convert seconds since the epoch (1970-01-01 UTC) to a date\n" +" $ date --date='@2147483647'\n" +"\n" +"Show the time on the west coast of the US (use tzselect(1) to find TZ)\n" +" $ TZ='America/Los_Angeles' date\n" +"\n" +"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 "" + +#: 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 +#, c-format +msgid "standard input" +msgstr "" + +#: src/date.c:307 src/date.c:527 +#, c-format +msgid "invalid date %s" +msgstr "" + +#: src/date.c:418 src/date.c:452 +#, c-format +msgid "multiple output formats specified" +msgstr "" + +#: src/date.c:430 +#, c-format +msgid "the options to specify dates for printing are mutually exclusive" +msgstr "" + +#: src/date.c:437 +#, c-format +msgid "the options to print and set the time may not be used together" +msgstr "" + +#: src/date.c:458 +#, 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 "" + +#: src/date.c:535 +#, c-format +msgid "cannot set date" +msgstr "" + +#: src/date.c:558 src/du.c:371 +#, c-format +msgid "time %s is out of range" +msgstr "" + +#. 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 "" + +#: src/dd.c:521 +#, c-format +msgid "" +"Usage: %s [OPERAND]...\n" +" or: %s OPTION\n" +msgstr "" + +#: src/dd.c:526 +msgid "" +"Copy a file, converting and formatting according to the operands.\n" +"\n" +" bs=BYTES read and write up to BYTES bytes at a time\n" +" cbs=BYTES convert BYTES bytes at a time\n" +" conv=CONVS convert the file as per the comma separated symbol list\n" +" count=N copy only N input blocks\n" +" ibs=BYTES read up to BYTES bytes at a time (default: 512)\n" +msgstr "" + +#: src/dd.c:535 +msgid "" +" if=FILE read from FILE instead of stdin\n" +" iflag=FLAGS read as per the comma separated symbol list\n" +" obs=BYTES write BYTES bytes at a time (default: 512)\n" +" of=FILE write to FILE instead of stdout\n" +" oflag=FLAGS write as per the comma separated symbol list\n" +" seek=N skip N obs-sized blocks at start of output\n" +" skip=N skip N ibs-sized blocks at start of input\n" +" status=WHICH WHICH info to suppress outputting to stderr;\n" +" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" +msgstr "" + +#: src/dd.c:546 +msgid "" +"\n" +"N and BYTES may be followed by the following multiplicative suffixes:\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, and so on for T, P, E, Z, Y.\n" +"\n" +"Each CONV symbol may be:\n" +"\n" +msgstr "" + +#: src/dd.c:555 +msgid "" +" ascii from EBCDIC to ASCII\n" +" ebcdic from ASCII to EBCDIC\n" +" ibm from ASCII to alternate EBCDIC\n" +" block pad newline-terminated records with spaces to cbs-size\n" +" unblock replace trailing spaces in cbs-size records with newline\n" +" lcase change upper case to lower case\n" +" ucase change lower case to upper case\n" +" sparse try to seek rather than write the output for NUL input blocks\n" +" swab swap every pair of input bytes\n" +" 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 +msgid "" +" excl fail if the output file already exists\n" +" nocreat do not create the output file\n" +" notrunc do not truncate the output file\n" +" noerror continue after read errors\n" +" fdatasync physically write output file data before finishing\n" +" fsync likewise, but also write metadata\n" +msgstr "" + +#: src/dd.c:576 +msgid "" +"\n" +"Each FLAG symbol may be:\n" +"\n" +" append append mode (makes sense only for output; conv=notrunc " +"suggested)\n" +msgstr "" + +#: src/dd.c:583 +msgid " cio use concurrent I/O for data\n" +msgstr "" + +#: src/dd.c:585 +msgid " direct use direct I/O for data\n" +msgstr "" + +#: src/dd.c:587 +msgid " directory fail unless a directory\n" +msgstr "" + +#: src/dd.c:589 +msgid " dsync use synchronized I/O for data\n" +msgstr "" + +#: src/dd.c:591 +msgid " sync likewise, but also for metadata\n" +msgstr "" + +#: src/dd.c:592 +msgid " fullblock accumulate full blocks of input (iflag only)\n" +msgstr "" + +#: src/dd.c:595 +msgid " nonblock use non-blocking I/O\n" +msgstr "" + +#: src/dd.c:597 +msgid " noatime do not update access time\n" +msgstr "" + +#: src/dd.c:600 +msgid " nocache discard cached data\n" +msgstr "" + +#: src/dd.c:603 +msgid " noctty do not assign controlling terminal from file\n" +msgstr "" + +#: src/dd.c:606 +msgid " nofollow do not follow symlinks\n" +msgstr "" + +#: src/dd.c:608 +msgid " nolinks fail if multiply-linked\n" +msgstr "" + +#: src/dd.c:610 +msgid " binary use binary I/O for data\n" +msgstr "" + +#: src/dd.c:612 +msgid " text use text I/O for data\n" +msgstr "" + +#: src/dd.c:614 +msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" +msgstr "" + +#: src/dd.c:617 +msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" +msgstr "" + +#: src/dd.c:620 +msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" +msgstr "" + +#: src/dd.c:625 +#, c-format +msgid "" +"\n" +"Sending a %s signal to a running 'dd' process makes it\n" +"print I/O statistics to standard error and then resume copying.\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" +"Options are:\n" +"\n" +msgstr "" + +#: src/dd.c:683 +#, c-format +msgid "" +"%<PRIuMAX>+%<PRIuMAX> records in\n" +"%<PRIuMAX>+%<PRIuMAX> records out\n" +msgstr "" + +#: src/dd.c:689 +#, c-format +msgid "%<PRIuMAX> truncated record\n" +msgid_plural "%<PRIuMAX> truncated records\n" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: src/dd.c:701 +#, c-format +msgid "%<PRIuMAX> byte (%s) copied" +msgid_plural "%<PRIuMAX> bytes (%s) copied" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: src/dd.c:720 +msgid "Infinity B" +msgstr "" + +#. TRANSLATORS: The two instances of "s" in this string are the SI +#. symbol "s" (meaning second), and should not be translated. +#. +#. This format used to be: +#. +#. ngettext (", %g second, %s/s\n", ", %g seconds, %s/s\n", delta_s == 1) +#. +#. 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 +#, c-format +msgid ", %g s, %s/s\n" +msgstr "" + +#: src/dd.c:812 +#, c-format +msgid "closing input file %s" +msgstr "" + +#: src/dd.c:819 +#, c-format +msgid "closing output file %s" +msgstr "" + +#: src/dd.c:1022 +#, c-format +msgid "failed to turn off O_DIRECT: %s" +msgstr "" + +#: src/dd.c:1093 src/dd.c:1942 +#, c-format +msgid "writing to %s" +msgstr "" + +#: src/dd.c:1207 src/dd.c:1261 +#, c-format +msgid "unrecognized operand %s" +msgstr "" + +#: src/dd.c:1218 +msgid "invalid conversion" +msgstr "" + +#: src/dd.c:1221 src/dd.c:1297 +msgid "invalid input flag" +msgstr "" + +#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303 +msgid "invalid output flag" +msgstr "" + +#: src/dd.c:1227 +msgid "invalid status flag" +msgstr "" + +#: src/dd.c:1266 src/truncate.c:310 +#, c-format +msgid "invalid number %s" +msgstr "" + +#: src/dd.c:1348 +#, c-format +msgid "cannot combine any two of {ascii,ebcdic,ibm}" +msgstr "" + +#: src/dd.c:1350 +#, c-format +msgid "cannot combine block and unblock" +msgstr "" + +#: src/dd.c:1352 +#, c-format +msgid "cannot combine lcase and ucase" +msgstr "" + +#: src/dd.c:1354 +#, c-format +msgid "cannot combine excl and nocreat" +msgstr "" + +#: src/dd.c:1357 +#, c-format +msgid "cannot combine direct and nocache" +msgstr "" + +#: src/dd.c:1514 +#, 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 +#, c-format +msgid "%s: cannot skip" +msgstr "" + +#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683 +#, c-format +msgid "%s: cannot seek" +msgstr "" + +#: src/dd.c:1663 +#, c-format +msgid "offset overflow while reading file %s" +msgstr "" + +#: src/dd.c:1675 +#, c-format +msgid "warning: invalid file offset after failed read" +msgstr "" + +#: src/dd.c:1679 +#, c-format +msgid "cannot work around kernel bug after all" +msgstr "" + +#: src/dd.c:1822 +#, 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 +#, c-format +msgid "%s: cannot skip to specified offset" +msgstr "" + +#: src/dd.c:2133 +#, c-format +msgid "failed to truncate to %<PRIdMAX> bytes in output file %s" +msgstr "" + +#: src/dd.c:2146 +#, c-format +msgid "fdatasync failed for %s" +msgstr "" + +#: src/dd.c:2156 +#, c-format +msgid "fsync failed for %s" +msgstr "" + +#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165 +#, c-format +msgid "failed to open %s" +msgstr "" + +#: src/dd.c:2246 +#, c-format +msgid "" +"offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) " +"blocks" +msgstr "" + +#: src/dd.c:2267 +#, c-format +msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" +msgstr "" + +#: src/dd.c:2283 src/dd.c:2289 +#, 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 +msgid "Paul Eggert" +msgstr "" + +#: src/df.c:172 +msgid "Filesystem" +msgstr "" + +#: src/df.c:175 +msgid "Type" +msgstr "" + +#: src/df.c:178 src/df.c:542 +msgid "blocks" +msgstr "" + +#: src/df.c:181 +msgid "Used" +msgstr "" + +#: src/df.c:184 +msgid "Available" +msgstr "" + +#: src/df.c:187 +msgid "Use%" +msgstr "" + +#: src/df.c:190 +msgid "Inodes" +msgstr "" + +#: src/df.c:193 +msgid "IUsed" +msgstr "" + +#: src/df.c:196 +msgid "IFree" +msgstr "" + +#: src/df.c:199 +msgid "IUse%" +msgstr "" + +#: src/df.c:202 +msgid "Mounted on" +msgstr "" + +#: src/df.c:383 +#, c-format +msgid "option --output: field '%s' unknown" +msgstr "" + +#: src/df.c:390 +#, c-format +msgid "option --output: field '%s' used more than once" +msgstr "" + +#: src/df.c:410 src/df.c:449 +msgid "Size" +msgstr "" + +#: src/df.c:414 src/df.c:451 +msgid "Avail" +msgstr "" + +#: src/df.c:474 +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 +#, c-format +msgid "%s-%s" +msgstr "" + +#: src/df.c:1210 +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 +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" +" --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 +msgid "" +" -i, --inodes list inode information instead of block usage\n" +" -k like --block-size=1K\n" +" -l, --local limit listing to local file systems\n" +" --no-sync do not invoke sync before getting usage info " +"(default)\n" +msgstr "" + +#: src/df.c:1234 +msgid "" +" --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" +" or print all fields if FIELD_LIST is " +"omitted.\n" +" -P, --portability use the POSIX output format\n" +" --sync invoke sync before getting usage info\n" +" -t, --type=TYPE limit listing to file systems of type TYPE\n" +" -T, --print-type print file system type\n" +" -x, --exclude-type=TYPE limit listing to file systems not of type TYPE\n" +" -v (ignored)\n" +msgstr "" + +#: src/df.c:1248 +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" +msgstr "" + +#: src/df.c:1285 +#, 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 +#, c-format +msgid "file system type %s both selected and excluded" +msgstr "" + +#: src/df.c:1500 +msgid "Warning: " +msgstr "" + +#: src/df.c:1502 src/stat.c:814 +msgid "cannot read table of mounted file systems" +msgstr "" + +#: src/df.c:1539 +#, c-format +msgid "no file systems processed" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/dircolors.c:35 +msgid "H. Peter Anvin" +msgstr "" + +#: src/dircolors.c:97 src/uptime.c:196 src/users.c:105 +#, c-format +msgid "Usage: %s [OPTION]... [FILE]\n" +msgstr "" + +#: src/dircolors.c:98 +msgid "" +"Output commands to set the LS_COLORS environment variable.\n" +"\n" +"Determine format of output:\n" +" -b, --sh, --bourne-shell output Bourne shell code to set LS_COLORS\n" +" -c, --csh, --c-shell output C shell code to set LS_COLORS\n" +" -p, --print-database output defaults\n" +msgstr "" + +#: src/dircolors.c:108 +msgid "" +"\n" +"If FILE is specified, read it to determine which colors to use for which\n" +"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 "" + +#: src/dircolors.c:286 +#, c-format +msgid "%s:%lu: invalid line; missing second token" +msgstr "" + +#: src/dircolors.c:358 +#, c-format +msgid "%s:%lu: unrecognized keyword %s" +msgstr "" + +#: src/dircolors.c:359 +msgid "<internal>" +msgstr "" + +#: 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 "" + +#: src/dircolors.c:450 +msgid "file operands cannot be combined with --print-database (-p)" +msgstr "" + +#: src/dircolors.c:473 +#, c-format +msgid "no SHELL environment variable, and no shell type option given" +msgstr "" + +#: src/dirname.c:50 +#, c-format +msgid "Usage: %s [OPTION] NAME...\n" +msgstr "" + +#: src/dirname.c:54 +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 "" + +#: src/dirname.c:59 +msgid " -z, --zero separate output with NUL rather than newline\n" +msgstr "" + +#: src/dirname.c:64 +#, c-format +msgid "" +"\n" +"Examples:\n" +" %s /usr/bin/ -> \"/usr\"\n" +" %s dir1/str dir2/str -> \"dir1\" followed by \"dir2\"\n" +" %s stdio.h -> \".\"\n" +msgstr "" + +#: src/du.c:270 src/sort.c:394 src/wc.c:112 +#, c-format +msgid "" +"Usage: %s [OPTION]... [FILE]...\n" +" or: %s [OPTION]... --files0-from=F\n" +msgstr "" + +#: src/du.c:274 +msgid "Summarize disk usage of each FILE, recursively for directories.\n" +msgstr "" + +#: src/du.c:280 +msgid "" +" -0, --null end each output line with 0 byte rather than " +"newline\n" +" -a, --all write counts for all files, not just directories\n" +" --apparent-size print apparent sizes, rather than disk usage; " +"although\n" +" the apparent size is usually smaller, it may be\n" +" larger due to holes in ('sparse') files, internal\n" +" fragmentation, indirect blocks, and the like\n" +msgstr "" + +#: src/du.c:289 +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, --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" +" -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 "" + +#: 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" +" -H equivalent to --dereference-args (-D)\n" +" -h, --human-readable print sizes in human readable format (e.g., 1K 234M " +"2G)\n" +msgstr "" + +#: src/du.c:310 +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 "" + +#: src/du.c:316 +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" +" --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 +msgid "" +" -t, --threshold=SIZE exclude entries smaller than SIZE if positive,\n" +" or entries greater than SIZE if negative\n" +" --time show time of the last modification of any file in " +"the\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" +msgstr "" + +#: src/du.c:333 +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 +msgid "Infinity" +msgstr "" + +#: src/du.c:507 +#, c-format +msgid "mount point %s already traversed" +msgstr "" + +#: src/du.c:624 +#, c-format +msgid "fts_read failed: %s" +msgstr "" + +#: src/du.c:780 +#, c-format +msgid "invalid maximum depth %s" +msgstr "" + +#: src/du.c:809 +#, fuzzy, c-format +msgid "invalid --threshold argument '-0'" +msgstr "neispravan %s%s argument „%s”" + +#: src/du.c:887 +#, c-format +msgid "cannot both summarize and show all entries" +msgstr "" + +#: src/du.c:894 +#, c-format +msgid "warning: summarizing is the same as using --max-depth=0" +msgstr "" + +#: src/du.c:900 +#, c-format +msgid "warning: summarizing conflicts with --max-depth=%lu" +msgstr "" + +#: src/du.c:966 src/sort.c:4533 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/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 +#, 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 +msgid "invalid zero-length file name" +msgstr "" + +#: src/du.c:1088 src/ls.c:2649 src/wc.c:791 +msgid "total" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/echo.c:26 +msgid "Brian Fox" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/echo.c:27 +msgid "Chet Ramey" +msgstr "" + +#: src/echo.c:41 +#, c-format +msgid "" +"Usage: %s [SHORT-OPTION]... [STRING]...\n" +" or: %s LONG-OPTION\n" +msgstr "" + +#: src/echo.c:45 +msgid "" +"Echo the STRING(s) to standard output.\n" +"\n" +" -n do not output the trailing newline\n" +msgstr "" + +#: src/echo.c:51 +msgid "" +" -e enable interpretation of backslash escapes (default)\n" +" -E disable interpretation of backslash escapes\n" +msgstr "" + +#: src/echo.c:54 +msgid "" +" -e enable interpretation of backslash escapes\n" +" -E disable interpretation of backslash escapes (default)\n" +msgstr "" + +#: src/echo.c:60 +msgid "" +"\n" +"If -e is in effect, the following sequences are recognized:\n" +"\n" +msgstr "" + +#: src/echo.c:65 src/printf.c:105 +msgid "" +" \\\\ backslash\n" +" \\a alert (BEL)\n" +" \\b backspace\n" +" \\c produce no further output\n" +" \\e escape\n" +" \\f form feed\n" +" \\n new line\n" +" \\r carriage return\n" +" \\t horizontal tab\n" +" \\v vertical tab\n" +msgstr "" + +#: 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 "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/env.c:32 src/printenv.c:45 src/whoami.c:35 +msgid "Richard Mlynarik" +msgstr "" + +#: src/env.c:52 +#, c-format +msgid "Usage: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n" +msgstr "" + +#: src/env.c:55 +msgid "Set each NAME to VALUE in the environment and run COMMAND.\n" +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" +" -u, --unset=NAME remove variable from the environment\n" +msgstr "" + +#: src/env.c:68 +msgid "" +"\n" +"A mere - implies -i. If no COMMAND, print the resulting environment.\n" +msgstr "" + +#: src/env.c:124 +#, c-format +msgid "cannot unset %s" +msgstr "" + +#: src/env.c:135 +#, c-format +msgid "cannot set %s" +msgstr "" + +#: src/env.c:152 +#, c-format +msgid "cannot specify --null (-0) with command" +msgstr "" + +#: 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 "" +"\n" +"Ako DATOTEKA nije navedena ili je „-”, čitaj standardni ulaz.\n" + +#: src/expand.c:114 +msgid "" +" -i, --initial do not convert tabs after non blanks\n" +" -t, --tabs=NUMBER have tabs NUMBER characters apart, not 8\n" +msgstr "" + +#: src/expand.c:118 +msgid "" +" -t, --tabs=LIST use comma separated list of explicit tab positions\n" +msgstr "" + +#: src/expand.c:171 src/unexpand.c:190 +#, c-format +msgid "tab stop is too large %s" +msgstr "" + +#: src/expand.c:179 src/unexpand.c:198 +#, c-format +msgid "tab size contains invalid character(s): %s" +msgstr "" + +#: src/expand.c:205 src/unexpand.c:224 +#, c-format +msgid "tab size cannot be 0" +msgstr "" + +#: src/expand.c:207 src/unexpand.c:226 +#, c-format +msgid "tab sizes must be ascending" +msgstr "" + +#: 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 "" + +#. 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 +msgid "Mike Parker" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/expr.c:152 src/groups.c:36 +msgid "James Youngman" +msgstr "" + +#: src/expr.c:203 +#, c-format +msgid "" +"Usage: %s EXPRESSION\n" +" or: %s OPTION\n" +msgstr "" + +#: src/expr.c:211 +msgid "" +"\n" +"Print the value of EXPRESSION to standard output. A blank line below\n" +"separates increasing precedence groups. EXPRESSION may be:\n" +"\n" +" ARG1 | ARG2 ARG1 if it is neither null nor 0, otherwise ARG2\n" +"\n" +" ARG1 & ARG2 ARG1 if neither argument is null or 0, otherwise 0\n" +msgstr "" + +#: src/expr.c:220 +msgid "" +"\n" +" ARG1 < ARG2 ARG1 is less than ARG2\n" +" ARG1 <= ARG2 ARG1 is less than or equal to ARG2\n" +" ARG1 = ARG2 ARG1 is equal to ARG2\n" +" ARG1 != ARG2 ARG1 is unequal to ARG2\n" +" ARG1 >= ARG2 ARG1 is greater than or equal to ARG2\n" +" ARG1 > ARG2 ARG1 is greater than ARG2\n" +msgstr "" + +#: src/expr.c:229 +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 +#, no-c-format +msgid "" +"\n" +" ARG1 * ARG2 arithmetic product of ARG1 and ARG2\n" +" ARG1 / ARG2 arithmetic quotient of ARG1 divided by ARG2\n" +" ARG1 % ARG2 arithmetic remainder of ARG1 divided by ARG2\n" +msgstr "" + +#: src/expr.c:242 +msgid "" +"\n" +" STRING : REGEXP anchored pattern match of REGEXP in STRING\n" +"\n" +" match STRING REGEXP same as STRING : REGEXP\n" +" substr STRING POS LENGTH substring of STRING, POS counted from 1\n" +" index STRING CHARS index in STRING where any CHARS is found, or 0\n" +" length STRING length of STRING\n" +msgstr "" + +#: src/expr.c:251 +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 "" + +#: src/expr.c:257 +msgid "" +"\n" +"Beware that many operators need to be escaped or quoted for shells.\n" +"Comparisons are arithmetic if both ARGs are numbers, else lexicographical.\n" +"Pattern matches return the string matched between \\( and \\) or null; if\n" +"\\( and \\) are not used, they return the number of characters matched or " +"0.\n" +msgstr "" + +#: src/expr.c:264 +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 "" + +#: src/expr.c:278 +#, c-format +msgid "syntax error" +msgstr "" + +#: src/expr.c:599 src/ptx.c:283 +#, c-format +msgid "error in regular expression matcher" +msgstr "" + +#: src/expr.c:791 src/expr.c:828 +#, c-format +msgid "non-integer argument" +msgstr "" + +#: src/expr.c:793 src/truncate.c:314 +#, c-format +msgid "division by zero" +msgstr "" + +#: src/expr.c:887 src/sort.c:2044 +#, c-format +msgid "set LC_ALL='C' to work around the problem" +msgstr "" + +#: src/expr.c:889 +#, c-format +msgid "the strings compared were %s and %s" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/factor.c:111 +msgid "Niels Moller" +msgstr "" + +#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459 +#, c-format +msgid "Lucas prime test failure. This should not happen" +msgstr "" + +#: src/factor.c:2092 +#, c-format +msgid "squfof queue overflow" +msgstr "" + +#: src/factor.c:2419 +#, c-format +msgid "%s is not a valid positive integer" +msgstr "" + +#: src/factor.c:2442 src/od.c:1646 src/od.c:1715 +#, c-format +msgid "%s is too large" +msgstr "" + +#: src/factor.c:2454 +#, c-format +msgid "" +"Usage: %s [NUMBER]...\n" +" or: %s OPTION\n" +msgstr "" + +#: src/factor.c:2459 +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 "" + +#: src/find-mount-point.c:40 +#, c-format +msgid "cannot get current directory" +msgstr "" + +#: src/find-mount-point.c:50 src/find-mount-point.c:64 +#: src/find-mount-point.c:92 +#, c-format +msgid "cannot change to directory %s" +msgstr "" + +#: src/find-mount-point.c:70 +#, c-format +msgid "cannot stat current directory (now %s)" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/fmt.c:38 +msgid "Ross Paterson" +msgstr "" + +#: src/fmt.c:270 +#, c-format +msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n" +msgstr "" + +#: 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 "" + +#: src/fmt.c:278 +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 "" + +#: src/fmt.c:287 +#, 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 "" + +#: src/fmt.c:359 +#, c-format +msgid "" +"invalid option -- %c; -WIDTH is recognized only when it is the first\n" +"option; use -w N instead" +msgstr "" + +#: src/fmt.c:405 src/fmt.c:416 +#, c-format +msgid "invalid width: %s" +msgstr "" + +#: src/fold.c:70 +msgid "" +"Wrap input lines in each FILE (standard input by default), writing to\n" +"standard output.\n" +msgstr "" + +#: src/fold.c:77 +msgid "" +" -b, --bytes count bytes rather than columns\n" +" -s, --spaces break at spaces\n" +" -w, --width=WIDTH use WIDTH columns instead of 80\n" +msgstr "" + +#: src/fold.c:288 src/pr.c:832 +#, c-format +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/truncate.c:37 +msgid "Padraig Brady" +msgstr "" + +#: src/getlimits.c:65 +#, c-format +msgid "Usage: %s\n" +msgstr "" + +#: src/getlimits.c:69 +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 +#, c-format +msgid "failed to get groups for user %s" +msgstr "" + +#: src/group-list.c:74 src/id.c:370 +#, c-format +msgid "failed to get groups for the current process" +msgstr "" + +#: src/group-list.c:114 +#, c-format +msgid "cannot find name for group ID %lu" +msgstr "" + +#: src/groups.c:53 +#, c-format +msgid "Usage: %s [OPTION]... [USERNAME]...\n" +msgstr "" + +#: src/groups.c:54 +msgid "" +"Print group memberships for each USERNAME or, if no USERNAME is specified, " +"for\n" +"the current process (which may differ if the groups database has changed).\n" +msgstr "" + +#: src/groups.c:105 src/id.c:233 +#, c-format +msgid "cannot get real UID" +msgstr "" + +#: src/groups.c:110 src/id.c:241 +#, c-format +msgid "cannot get effective GID" +msgstr "" + +#: src/groups.c:115 src/id.c:246 +#, c-format +msgid "cannot get real GID" +msgstr "" + +#: src/groups.c:128 src/id.c:206 +#, c-format +msgid "%s: no such user" +msgstr "" + +#: src/head.c:109 +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 "" + +#: src/head.c:117 +msgid "" +" -c, --bytes=[-]K print the first K bytes of each file;\n" +" with the leading '-', print all but the last\n" +" K bytes of each file\n" +" -n, --lines=[-]K print the first K lines instead of the first 10;\n" +" with the leading '-', print all but the last\n" +" K lines of each file\n" +msgstr "" + +#: 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 "" + +#: src/head.c:131 +msgid "" +"\n" +"K 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 "" + +#: src/head.c:154 +#, c-format +msgid "%s: file has shrunk too much" +msgstr "" + +#: src/head.c:227 src/head.c:1051 +#, 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 +#, 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 +#, c-format +msgid "cannot reposition file pointer for %s" +msgstr "" + +#: src/head.c:885 +#, c-format +msgid "%s: %s is so large that it is not representable" +msgstr "" + +#: src/head.c:886 +msgid "number of lines" +msgstr "" + +#: src/head.c:886 +msgid "number of bytes" +msgstr "" + +#: src/head.c:893 src/tail.c:1947 +msgid "invalid number of lines" +msgstr "" + +#: src/head.c:894 src/tail.c:1948 +msgid "invalid number of bytes" +msgstr "" + +#: src/head.c:981 src/head.c:1039 +#, c-format +msgid "invalid trailing option -- %c" +msgstr "" + +#: src/hostid.c:42 +#, c-format +msgid "" +"Usage: %s [OPTION]\n" +"Print the numeric identifier (in hexadecimal) for the current host.\n" +"\n" +msgstr "" + +#: src/hostname.c:56 +#, c-format +msgid "" +"Usage: %s [NAME]\n" +" or: %s OPTION\n" +"Print or set the hostname of the current system.\n" +"\n" +msgstr "" + +#: src/hostname.c:94 +#, c-format +msgid "cannot set name to %s" +msgstr "" + +#: src/hostname.c:97 +#, c-format +msgid "cannot set hostname; this system lacks the functionality" +msgstr "" + +#: src/hostname.c:105 +#, c-format +msgid "cannot determine hostname" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/id.c:38 src/touch.c:42 +msgid "Arnold Robbins" +msgstr "" + +#: src/id.c:81 +#, c-format +msgid "Usage: %s [OPTION]... [USERNAME]\n" +msgstr "" + +#: src/id.c:82 +msgid "" +"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" +msgstr "" + +#: src/id.c:96 +msgid "" +"\n" +"Without any OPTION, print some useful set of identified information.\n" +msgstr "" + +#: src/id.c:140 +#, c-format +msgid "--context (-Z) works only on an SELinux-enabled kernel" +msgstr "" + +#: src/id.c:175 +#, c-format +msgid "cannot print security context when user specified" +msgstr "" + +#: src/id.c:178 +#, c-format +msgid "cannot print \"only\" of more than one choice" +msgstr "" + +#: src/id.c:185 +#, c-format +msgid "cannot print only names or real IDs in default format" +msgstr "" + +#: src/id.c:199 +#, c-format +msgid "can't get process context" +msgstr "" + +#: src/id.c:224 +#, c-format +msgid "cannot get effective UID" +msgstr "" + +#: src/id.c:311 +#, c-format +msgid "cannot find name for user ID %s" +msgstr "" + +#: src/id.c:329 +#, c-format +msgid "uid=%s" +msgstr "" + +#: src/id.c:334 +#, c-format +msgid " gid=%s" +msgstr "" + +#: src/id.c:341 +#, c-format +msgid " euid=%s" +msgstr "" + +#: src/id.c:349 +#, c-format +msgid " egid=%s" +msgstr "" + +#: src/id.c:377 +msgid " groups=" +msgstr "" + +#: src/id.c:393 +#, c-format +msgid " context=%s" +msgstr "" + +#: src/install.c:373 +#, c-format +msgid "warning: %s: failed to change context to %s" +msgstr "" + +#: src/install.c:414 +#, c-format +msgid "creating directory %s" +msgstr "" + +#: src/install.c:482 +#, c-format +msgid "cannot change ownership of %s" +msgstr "" + +#: src/install.c:506 +#, c-format +msgid "cannot set time stamps for %s" +msgstr "" + +#: src/install.c:527 src/split.c:426 src/timeout.c:439 +#, c-format +msgid "fork system call failed" +msgstr "" + +#: src/install.c:531 +#, c-format +msgid "cannot run %s" +msgstr "" + +#: src/install.c:535 +#, c-format +msgid "waiting for strip" +msgstr "" + +#: src/install.c:537 +#, c-format +msgid "strip process terminated abnormally" +msgstr "" + +#: src/install.c:558 +#, c-format +msgid "invalid user %s" +msgstr "" + +#: src/install.c:594 +#, 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 "" + +#: src/install.c:601 +msgid "" +"\n" +"This install program copies files (often just compiled) into destination\n" +"locations you choose. If you want to download and install a ready-to-use\n" +"package on a GNU/Linux system, you should instead be using a package " +"manager\n" +"like yum(1) or apt-get(1).\n" +"\n" +"In the first three forms, copy SOURCE to DEST or multiple SOURCE(s) to\n" +"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 "" + +#: src/install.c:615 +msgid "" +" --backup[=CONTROL] make a backup of each existing destination file\n" +" -b like --backup but does not accept an argument\n" +" -c (ignored)\n" +" -C, --compare compare each pair of source and destination files, " +"and\n" +" in some cases, do not modify the destination at all\n" +" -d, --directory treat all arguments as directory names; create all\n" +" components of the specified directories\n" +msgstr "" + +#: src/install.c:624 +msgid "" +" -D create all leading components of DEST except the " +"last,\n" +" then copy SOURCE to DEST\n" +" -g, --group=GROUP set group ownership, instead of process' current " +"group\n" +" -m, --mode=MODE set permission mode (as in chmod), instead of rwxr-xr-" +"x\n" +" -o, --owner=OWNER set ownership (super-user only)\n" +msgstr "" + +#: src/install.c:631 +msgid "" +" -p, --preserve-timestamps apply access/modification times of SOURCE " +"files\n" +" to corresponding destination files\n" +" -s, --strip strip symbol tables\n" +" --strip-program=PROGRAM program used to strip binaries\n" +" -S, --suffix=SUFFIX override the usual backup suffix\n" +" -t, --target-directory=DIRECTORY copy all SOURCE arguments into " +"DIRECTORY\n" +" -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 "" + +#: src/install.c:641 +msgid "" +" --preserve-context preserve SELinux security context\n" +" -Z, --context=CONTEXT set SELinux security context of files and " +"directories\n" +msgstr "" + +#: src/install.c:859 +#, 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 +#, c-format +msgid "the strip option may not be used when installing a directory" +msgstr "" + +#: src/install.c:889 +#, 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 +#, c-format +msgid "invalid mode %s" +msgstr "" + +#: src/install.c:954 +#, c-format +msgid "WARNING: ignoring --strip-program option as -s option was not specified" +msgstr "" + +#: src/install.c:959 +#, c-format +msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive" +msgstr "" + +#: src/install.c:966 +#, c-format +msgid "options --compare (-C) and --strip are mutually exclusive" +msgstr "" + +#: src/install.c:972 +#, c-format +msgid "" +"the --compare (-C) option is ignored when you specify a mode with non-" +"permission bits" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/join.c:40 src/sort.c:66 +msgid "Mike Haertel" +msgstr "" + +#: src/join.c:191 +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" +"by whitespace. When FILE1 or FILE2 (not both) is -, read standard input.\n" +"\n" +" -a FILENUM also print unpairable lines from file FILENUM, where\n" +" FILENUM is 1 or 2, corresponding to FILE1 or FILE2\n" +" -e EMPTY replace missing input fields with EMPTY\n" +msgstr "" + +#: src/join.c:200 +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 "" + +#: src/join.c:206 +msgid "" +" -v FILENUM like -a FILENUM, 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" +" --check-order check that the input is correctly sorted, even\n" +" if all input lines are pairable\n" +" --nocheck-order do not check that the input is correctly sorted\n" +" --header treat the first line in each file as field headers,\n" +" print them without trying to pair them\n" +msgstr "" + +#: src/join.c:218 +msgid "" +"\n" +"Unless -t CHAR is given, leading blanks separate fields and are ignored,\n" +"else fields are separated by CHAR. Any FIELD is a field number counted\n" +"from 1. FORMAT is one or more comma or blank separated specifications,\n" +"each being 'FILENUM.FIELD' or '0'. Default FORMAT outputs the join field,\n" +"the remaining fields from FILE1, the remaining fields from FILE2, all\n" +"separated by CHAR. If FORMAT is the keyword 'auto', then the first\n" +"line of each file determines the number of fields output for each line.\n" +"\n" +"Important: FILE1 and FILE2 must be sorted on the join fields.\n" +"E.g., use \"sort -k 1b,1\" if 'join' has no options,\n" +"or use \"join -t ''\" if 'sort' has no options.\n" +"Note, comparisons honor the rules specified by 'LC_COLLATE'.\n" +"If the input is not sorted and some lines cannot be joined, a\n" +"warning message will be given.\n" +msgstr "" + +#: src/join.c:403 +#, c-format +msgid "%s:%<PRIuMAX>: is not sorted: %.*s" +msgstr "" + +#: src/join.c:840 src/join.c:1038 +#, c-format +msgid "invalid field number: %s" +msgstr "" + +#: src/join.c:861 src/join.c:870 +#, c-format +msgid "invalid field specifier: %s" +msgstr "" + +#: src/join.c:877 +#, c-format +msgid "invalid file number in field spec: %s" +msgstr "" + +#: src/join.c:920 +#, c-format +msgid "incompatible join fields %lu, %lu" +msgstr "" + +#: src/join.c:1049 +#, c-format +msgid "conflicting empty-field replacement strings" +msgstr "" + +#: src/join.c:1101 src/sort.c:4468 +#, c-format +msgid "multi-character tab %s" +msgstr "" + +#: src/join.c:1105 src/sort.c:4473 +#, c-format +msgid "incompatible tabs" +msgstr "" + +#: src/join.c:1174 +#, c-format +msgid "both files cannot be standard input" +msgstr "" + +#: src/kill.c:76 +#, c-format +msgid "" +"Usage: %s [-s SIGNAL | -SIGNAL] PID...\n" +" or: %s -l [SIGNAL]...\n" +" or: %s -t [SIGNAL]...\n" +msgstr "" + +#: src/kill.c:82 +msgid "Send signals to processes, or list signals.\n" +msgstr "" + +#: src/kill.c:88 +msgid "" +" -s, --signal=SIGNAL, -SIGNAL\n" +" specify the name or number of the signal to be sent\n" +" -l, --list list signal names, or convert signal names to/from " +"numbers\n" +" -t, --table print a table of signal information\n" +msgstr "" + +#: src/kill.c:96 +msgid "" +"\n" +"SIGNAL may be a signal name like 'HUP', or a signal number like '1',\n" +"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 "" + +#: src/kill.c:205 +#, c-format +msgid "%s: invalid process id" +msgstr "" + +#: src/kill.c:259 +#, c-format +msgid "invalid option -- %c" +msgstr "" + +#: src/kill.c:268 +#, c-format +msgid "%s: multiple signals specified" +msgstr "" + +#: src/kill.c:282 +#, c-format +msgid "multiple -l or -t options specified" +msgstr "" + +#: src/kill.c:299 +#, c-format +msgid "cannot combine signal with -l or -t" +msgstr "" + +#: src/kill.c:305 +#, c-format +msgid "no process ID specified" +msgstr "" + +#: src/libstdbuf.c:109 +#, c-format +msgid "failed to allocate a %<PRIuMAX> byte stdio buffer\n" +msgstr "" + +#: src/libstdbuf.c:116 +#, c-format +msgid "invalid buffering mode %s for %s\n" +msgstr "" + +#: src/libstdbuf.c:124 +#, c-format +msgid "could not set buffering of %s to mode %s\n" +msgstr "" + +#. 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 "" + +#: src/link.c:45 +#, c-format +msgid "" +"Usage: %s FILE1 FILE2\n" +" or: %s OPTION\n" +msgstr "" + +#: src/link.c:48 +msgid "" +"Call the link function to create a link named FILE2 to an existing FILE1.\n" +"\n" +msgstr "" + +#: src/link.c:90 +#, c-format +msgid "cannot create link %s to %s" +msgstr "" + +#: src/ln.c:190 +#, c-format +msgid "%s: hard link not allowed for directory" +msgstr "" + +#: src/ln.c:255 +#, c-format +msgid "%s: cannot overwrite directory" +msgstr "" + +#: src/ln.c:260 +#, c-format +msgid "%s: replace %s? " +msgstr "" + +#: src/ln.c:345 +#, c-format +msgid "failed to create symbolic link %s" +msgstr "" + +#: src/ln.c:346 +#, c-format +msgid "failed to create symbolic link %s -> %s" +msgstr "" + +#: src/ln.c:348 +#, c-format +msgid "failed to create hard link to %.0s%s" +msgstr "" + +#: src/ln.c:351 +#, c-format +msgid "failed to create hard link %s" +msgstr "" + +#: src/ln.c:352 +#, c-format +msgid "failed to create hard link %s => %s" +msgstr "" + +#: src/ln.c:374 +#, c-format +msgid "" +"Usage: %s [OPTION]... [-T] TARGET LINK_NAME (1st form)\n" +" or: %s [OPTION]... TARGET (2nd form)\n" +" or: %s [OPTION]... TARGET... DIRECTORY (3rd form)\n" +" or: %s [OPTION]... -t DIRECTORY TARGET... (4th form)\n" +msgstr "" + +#: src/ln.c:381 +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" +"In the 3rd and 4th forms, create links to each TARGET in DIRECTORY.\n" +"Create hard links by default, symbolic links with --symbolic.\n" +"By default, each destination (name of new link) should not already exist.\n" +"When creating hard links, each TARGET must exist. Symbolic links\n" +"can hold arbitrary text; if later resolved, a relative link is\n" +"interpreted in relation to its parent directory.\n" +msgstr "" + +#: src/ln.c:394 +msgid "" +" --backup[=CONTROL] make a backup of each existing destination " +"file\n" +" -b like --backup but does not accept an argument\n" +" -d, -F, --directory allow the superuser to attempt to hard link\n" +" directories (note: will probably fail due " +"to\n" +" system restrictions, even for the " +"superuser)\n" +" -f, --force remove existing destination files\n" +msgstr "" + +#: src/ln.c:402 +msgid "" +" -i, --interactive prompt whether to remove destinations\n" +" -L, --logical dereference TARGETs that are symbolic links\n" +" -n, --no-dereference treat LINK_NAME as a normal file if\n" +" it is a symbolic link to a directory\n" +" -P, --physical make hard links directly to symbolic links\n" +" -r, --relative create symbolic links relative to link " +"location\n" +" -s, --symbolic make symbolic links instead of hard links\n" +msgstr "" + +#: src/ln.c:411 +msgid "" +" -S, --suffix=SUFFIX override the usual backup suffix\n" +" -t, --target-directory=DIRECTORY specify the DIRECTORY in which to " +"create\n" +" the links\n" +" -T, --no-target-directory treat LINK_NAME as a normal file always\n" +" -v, --verbose print name of each linked file\n" +msgstr "" + +#: src/ln.c:433 +#, 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 "" + +#: src/ln.c:554 +#, c-format +msgid "cannot combine --target-directory and --no-target-directory" +msgstr "" + +#: src/ln.c:588 +#, c-format +msgid "cannot do --relative without --symbolic" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/logname.c:30 +msgid "FIXME: unknown" +msgstr "" + +#: src/logname.c:39 src/sync.c:40 +#, c-format +msgid "Usage: %s [OPTION]\n" +msgstr "" + +#: src/logname.c:40 +msgid "" +"Print the name of the current user.\n" +"\n" +msgstr "" + +#: src/logname.c:84 +#, c-format +msgid "no login name" +msgstr "" + +#. 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 +msgid "%b %e %Y" +msgstr "" + +#. 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 +msgid "%b %e %H:%M" +msgstr "" + +#: src/ls.c:1580 +#, c-format +msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" +msgstr "" + +#: src/ls.c:1599 +#, c-format +msgid "ignoring invalid width in environment variable COLUMNS: %s" +msgstr "" + +#: src/ls.c:1629 +#, c-format +msgid "ignoring invalid tab size in environment variable TABSIZE: %s" +msgstr "" + +#: src/ls.c:1750 src/ptx.c:1975 +#, c-format +msgid "invalid line width: %s" +msgstr "" + +#: src/ls.c:1824 +#, c-format +msgid "invalid tab size: %s" +msgstr "" + +#: src/ls.c:2033 +#, c-format +msgid "invalid time style format %s" +msgstr "" + +#: src/ls.c:2057 +msgid "Valid arguments are:\n" +msgstr "" + +#: src/ls.c:2061 +msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" +msgstr "" + +#: src/ls.c:2096 +#, c-format +msgid "error initializing month strings" +msgstr "" + +#: src/ls.c:2407 +#, c-format +msgid "unrecognized prefix: %s" +msgstr "" + +#: src/ls.c:2437 +#, c-format +msgid "unparsable value for LS_COLORS environment variable" +msgstr "" + +#: src/ls.c:2514 src/pwd.c:161 +#, c-format +msgid "cannot open directory %s" +msgstr "" + +#: src/ls.c:2529 +#, c-format +msgid "cannot determine device and inode of %s" +msgstr "" + +#: src/ls.c:2538 +#, c-format +msgid "%s: not listing already-listed directory" +msgstr "" + +#: src/ls.c:2615 src/pwd.c:229 +#, c-format +msgid "reading directory %s" +msgstr "" + +#: src/ls.c:2630 +#, c-format +msgid "closing directory %s" +msgstr "" + +#: src/ls.c:3302 +#, c-format +msgid "cannot compare file names %s and %s" +msgstr "" + +#: src/ls.c:4721 +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 +msgid "" +" -a, --all do not ignore entries starting with .\n" +" -A, --almost-all do not list implied . and ..\n" +" --author with -l, print the author of each file\n" +" -b, --escape print C-style escapes for nongraphic " +"characters\n" +msgstr "" + +#: src/ls.c:4734 +msgid "" +" --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" +" -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" +" otherwise: sort by ctime, newest first\n" +msgstr "" + +#: src/ls.c:4744 +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" +" -D, --dired generate output designed for Emacs' dired mode\n" +msgstr "" + +#: src/ls.c:4752 +msgid "" +" -f do not sort, enable -aU, disable -ls --color\n" +" -F, --classify append indicator (one of */=>@|) to entries\n" +" --file-type likewise, except do not append '*'\n" +" --format=WORD across -x, commas -m, horizontal -x, long -l,\n" +" single-column -1, verbose -l, vertical -C\n" +" --full-time like -l --time-style=full-iso\n" +msgstr "" + +#: src/ls.c:4760 +msgid " -g like -l, but do not list owner\n" +msgstr "" + +#: src/ls.c:4763 +msgid "" +" --group-directories-first\n" +" group directories before files.\n" +" augment with a --sort option, but any\n" +" use of --sort=none (-U) disables grouping\n" +msgstr "" + +#: src/ls.c:4769 +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" +" (e.g., 1K 234M 2G)\n" +" --si likewise, but use powers of 1000 not 1024\n" +msgstr "" + +#: src/ls.c:4775 +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" +" --hide=PATTERN do not list implied entries matching shell " +"PATTERN\n" +" (overridden by -a or -A)\n" +msgstr "" + +#: src/ls.c:4785 +msgid "" +" --indicator-style=WORD append indicator with style WORD to entry " +"names:\n" +" none (default), slash (-p),\n" +" file-type (--file-type), classify (-F)\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" +msgstr "" + +#: src/ls.c:4795 +msgid "" +" -l use a long listing format\n" +" -L, --dereference when showing file information for a symbolic\n" +" link, show information for the file the link\n" +" references rather than for the link itself\n" +" -m fill width with a comma separated list of " +"entries\n" +msgstr "" + +#: src/ls.c:4803 +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. " +"control\n" +" characters specially)\n" +" -o like -l, but do not list group information\n" +" -p, --indicator-style=slash\n" +" append / indicator to directories\n" +msgstr "" + +#: src/ls.c:4811 +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 " +"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 "" + +#: src/ls.c:4820 +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 "" + +#: src/ls.c:4825 +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 +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 "" + +#: src/ls.c:4844 +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 +msgid "" +" -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 +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" +" -1 list one file per line\n" +msgstr "" + +#: src/ls.c:4865 +msgid "" +"\n" +"Using color to distinguish file types is disabled both by default and\n" +"with --color=never. With --color=auto, ls emits color codes only when\n" +"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 "" + +#: src/ls.c:4872 +msgid "" +"\n" +"Exit status:\n" +" 0 if OK,\n" +" 1 if minor problems (e.g., cannot access subdirectory),\n" +" 2 if serious trouble (e.g., cannot access command-line argument).\n" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/md5sum.c:94 src/seq.c:39 +msgid "Ulrich Drepper" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/md5sum.c:95 +msgid "Scott Miller" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/md5sum.c:96 +msgid "David Madore" +msgstr "" + +#: src/md5sum.c:164 +#, 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 "" + +#: src/md5sum.c:174 +msgid "" +" -b, --binary read in binary mode (default unless reading tty " +"stdin)\n" +msgstr "" + +#: src/md5sum.c:178 +msgid " -b, --binary read in binary mode\n" +msgstr "" + +#: src/md5sum.c:181 +#, c-format +msgid " -c, --check read %s sums from the FILEs and check them\n" +msgstr "" + +#: src/md5sum.c:184 +msgid " --tag create a BSD-style checksum\n" +msgstr "" + +#: src/md5sum.c:188 +msgid "" +" -t, --text read in text mode (default if reading tty stdin)\n" +msgstr "" + +#: src/md5sum.c:192 +msgid " -t, --text read in text mode (default)\n" +msgstr "" + +#: src/md5sum.c:195 +msgid "" +"\n" +"The following three 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" +" -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 +#, c-format +msgid "" +"\n" +"The sums are computed as described in %s. When checking, the input\n" +"should be a former output of this program. The default mode is to print\n" +"a line with checksum, a character indicating input mode ('*' for binary,\n" +"space for text), and name for each FILE.\n" +msgstr "" + +#: src/md5sum.c:523 +#, c-format +msgid "%s: too many checksum lines" +msgstr "" + +#: src/md5sum.c:547 +#, c-format +msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line" +msgstr "" + +#: src/md5sum.c:572 +#, c-format +msgid "%s: FAILED open or read\n" +msgstr "" + +#: src/md5sum.c:595 +msgid "FAILED" +msgstr "" + +#: src/md5sum.c:597 +msgid "OK" +msgstr "" + +#: src/md5sum.c:621 +#, c-format +msgid "%s: no properly formatted %s checksum lines found" +msgstr "" + +#: src/md5sum.c:631 +#, c-format +msgid "WARNING: %<PRIuMAX> line is improperly formatted" +msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: src/md5sum.c:639 +#, 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] "" +msgstr[2] "" + +#: src/md5sum.c:647 +#, c-format +msgid "WARNING: %<PRIuMAX> computed checksum did NOT match" +msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: src/md5sum.c:760 +#, c-format +msgid "--tag does not support --text mode" +msgstr "" + +#: src/md5sum.c:766 +#, c-format +msgid "the --tag option is meaningless when verifying checksums" +msgstr "" + +#: src/md5sum.c:773 +#, c-format +msgid "" +"the --binary and --text options are meaningless when verifying checksums" +msgstr "" + +#: src/md5sum.c:781 +#, c-format +msgid "the --status option is meaningful only when verifying checksums" +msgstr "" + +#: src/md5sum.c:788 +#, c-format +msgid "the --warn option is meaningful only when verifying checksums" +msgstr "" + +#: src/md5sum.c:795 +#, c-format +msgid "the --quiet option is meaningful only when verifying checksums" +msgstr "" + +#: src/md5sum.c:802 +#, c-format +msgid "the --strict option is meaningful only when verifying checksums" +msgstr "" + +#: src/mkdir.c:56 src/rmdir.c:164 +#, c-format +msgid "Usage: %s [OPTION]... DIRECTORY...\n" +msgstr "" + +#: src/mkdir.c:57 +msgid "Create the DIRECTORY(ies), if they do not already exist.\n" +msgstr "" + +#: src/mkdir.c:63 +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 +#, c-format +msgid "created directory %s" +msgstr "" + +#: src/mkfifo.c:51 src/pathchk.c:89 +#, c-format +msgid "Usage: %s [OPTION]... NAME...\n" +msgstr "" + +#: src/mkfifo.c:52 +msgid "Create named pipes (FIFOs) with the given NAMEs.\n" +msgstr "" + +#: src/mkfifo.c:58 src/mknod.c:60 +msgid "" +" -m, --mode=MODE set file permission bits to MODE, not a=rw - umask\n" +msgstr "" + +#: src/mkfifo.c:61 +msgid "" +" -Z, --context=CTX set the SELinux security context of each NAME to CTX\n" +msgstr "" + +#: src/mkfifo.c:121 src/mknod.c:127 +#, c-format +msgid "invalid mode" +msgstr "" + +#: src/mkfifo.c:126 src/mknod.c:132 +#, c-format +msgid "mode must specify only file permission bits" +msgstr "" + +#: src/mknod.c:52 +#, c-format +msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n" +msgstr "" + +#: src/mknod.c:54 +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 +msgid "" +"\n" +"Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n" +"must be omitted when TYPE is p. If MAJOR or MINOR begins with 0x or 0X,\n" +"it is interpreted as hexadecimal; otherwise, if it begins with 0, as octal;\n" +"otherwise, as decimal. TYPE may be:\n" +msgstr "" + +#: src/mknod.c:75 +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 "" + +#: src/mknod.c:150 +msgid "Special files require major and minor device numbers." +msgstr "" + +#: src/mknod.c:160 +msgid "Fifos do not have major and minor device numbers." +msgstr "" + +#: src/mknod.c:176 +#, c-format +msgid "block special files not supported" +msgstr "" + +#: src/mknod.c:185 +#, c-format +msgid "character special files not supported" +msgstr "" + +#: src/mknod.c:201 +#, c-format +msgid "invalid major device number %s" +msgstr "" + +#: src/mknod.c:206 +#, c-format +msgid "invalid minor device number %s" +msgstr "" + +#: src/mknod.c:211 +#, c-format +msgid "invalid device %s %s" +msgstr "" + +#: src/mknod.c:225 +#, c-format +msgid "invalid device type %s" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/mktemp.c:37 +msgid "Eric Blake" +msgstr "" + +#: src/mktemp.c:68 +#, c-format +msgid "Usage: %s [OPTION]... [TEMPLATE]\n" +msgstr "" + +#: src/mktemp.c:69 +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 +msgid "" +"Files are created u+rw, and directories u+rwx, minus umask restrictions.\n" +msgstr "" + +#: src/mktemp.c:78 +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 +msgid "" +" --suffix=SUFF append SUFF to TEMPLATE. SUFF must not contain " +"slash.\n" +" This option is implied if TEMPLATE does not end in " +"X.\n" +msgstr "" + +#: src/mktemp.c:87 +msgid "" +" --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" +" mktemp creates only the final component\n" +msgstr "" + +#: src/mktemp.c:95 +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 +#, c-format +msgid "too many templates" +msgstr "" + +#: src/mktemp.c:249 +#, c-format +msgid "with --suffix, template %s must end in X" +msgstr "" + +#: src/mktemp.c:274 src/split.c:1130 +#, c-format +msgid "invalid suffix %s, contains directory separator" +msgstr "" + +#: src/mktemp.c:279 +#, c-format +msgid "too few X's in template %s" +msgstr "" + +#: src/mktemp.c:292 +#, c-format +msgid "invalid template, %s, contains directory separator" +msgstr "" + +#: src/mktemp.c:306 +#, c-format +msgid "invalid template, %s; with --tmpdir, it may not be absolute" +msgstr "" + +#: src/mktemp.c:326 +#, c-format +msgid "failed to create directory via template %s" +msgstr "" + +#: src/mktemp.c:336 +#, c-format +msgid "failed to create file via template %s" +msgstr "" + +#: src/mv.c:292 +msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" +msgstr "" + +#: src/mv.c:298 +msgid "" +" --backup[=CONTROL] make a backup of each existing destination " +"file\n" +" -b like --backup but does not accept an " +"argument\n" +" -f, --force do not prompt before overwriting\n" +" -i, --interactive prompt before overwrite\n" +" -n, --no-clobber do not overwrite an existing file\n" +"If you specify more than one of -i, -f, -n, only the final one takes " +"effect.\n" +msgstr "" + +#: src/mv.c:307 +msgid "" +" --strip-trailing-slashes remove any trailing slashes from each " +"SOURCE\n" +" argument\n" +" -S, --suffix=SUFFIX override the usual backup suffix\n" +msgstr "" + +#: src/mv.c:312 +msgid "" +" -t, --target-directory=DIRECTORY move all SOURCE arguments into " +"DIRECTORY\n" +" -T, --no-target-directory treat DEST as a normal file\n" +" -u, --update move only when the SOURCE file is newer\n" +" than the destination file or when the\n" +" destination file is missing\n" +" -v, --verbose explain what is being done\n" +msgstr "" + +#: src/nice.c:72 +#, c-format +msgid "Usage: %s [OPTION] [COMMAND [ARG]...]\n" +msgstr "" + +#: src/nice.c:73 +#, 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" +"%d (most favorable to the process) to %d (least favorable to the process).\n" +msgstr "" + +#: src/nice.c:82 +msgid " -n, --adjustment=N add integer N to the niceness (default 10)\n" +msgstr "" + +#: src/nice.c:172 +#, c-format +msgid "invalid adjustment %s" +msgstr "" + +#: src/nice.c:181 +#, c-format +msgid "a command must be given with an adjustment" +msgstr "" + +#: src/nice.c:188 src/nice.c:199 +#, c-format +msgid "cannot get niceness" +msgstr "" + +#: src/nice.c:205 +#, c-format +msgid "cannot set niceness" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/nl.c:40 +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 "" +"\n" +"Ako DATOTEKA nije navedena ili je „-”, čitaj standardni ulaz.\n" + +#: src/nl.c:186 +msgid "" +" -b, --body-numbering=STYLE use STYLE for numbering body lines\n" +" -d, --section-delimiter=CC use CC for separating logical pages\n" +" -f, --footer-numbering=STYLE use STYLE for numbering footer lines\n" +msgstr "" + +#: src/nl.c:191 +msgid "" +" -h, --header-numbering=STYLE use STYLE for numbering header lines\n" +" -i, --line-increment=NUMBER line number increment at each line\n" +" -l, --join-blank-lines=NUMBER group of NUMBER empty lines counted as " +"one\n" +" -n, --number-format=FORMAT insert line numbers according to FORMAT\n" +" -p, --no-renumber do not reset line numbers at logical " +"pages\n" +" -s, --number-separator=STRING add STRING after (possible) line number\n" +msgstr "" + +#: src/nl.c:199 +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 "" + +#: src/nl.c:205 +msgid "" +"\n" +"By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC are\n" +"two delimiter characters for separating logical pages, a missing\n" +"second character implies :. Type \\\\ for \\. STYLE is one of:\n" +msgstr "" + +#: src/nl.c:211 +msgid "" +"\n" +" a number all lines\n" +" t number only nonempty lines\n" +" n number no lines\n" +" pBRE number only lines that contain a match for the basic regular\n" +" expression, BRE\n" +"\n" +"FORMAT is one of:\n" +"\n" +" ln left justified, no leading zeros\n" +" rn right justified, no leading zeros\n" +" rz right justified, leading zeros\n" +"\n" +msgstr "" + +#: src/nl.c:278 +#, c-format +msgid "line number overflow" +msgstr "" + +#: src/nl.c:478 +#, c-format +msgid "invalid header numbering style: %s" +msgstr "" + +#: src/nl.c:486 +#, c-format +msgid "invalid body numbering style: %s" +msgstr "" + +#: src/nl.c:494 +#, c-format +msgid "invalid footer numbering style: %s" +msgstr "" + +#: src/nl.c:503 +#, c-format +msgid "invalid starting line number: %s" +msgstr "" + +#: src/nl.c:512 +#, c-format +msgid "invalid line number increment: %s" +msgstr "" + +#: src/nl.c:524 +#, c-format +msgid "invalid number of blank lines: %s" +msgstr "" + +#: src/nl.c:538 +#, c-format +msgid "invalid line number field width: %s" +msgstr "" + +#: src/nl.c:557 +#, c-format +msgid "invalid line numbering format: %s" +msgstr "" + +#: src/nohup.c:53 +#, c-format +msgid "" +"Usage: %s COMMAND [ARG]...\n" +" or: %s OPTION\n" +msgstr "" + +#: src/nohup.c:59 +msgid "" +"Run COMMAND, ignoring hangup signals.\n" +"\n" +msgstr "" + +#: src/nohup.c:65 +#, c-format +msgid "" +"\n" +"If standard input is a terminal, redirect it from /dev/null.\n" +"If standard output is a terminal, append output to 'nohup.out' if possible,\n" +"'$HOME/nohup.out' otherwise.\n" +"If standard error is a terminal, redirect it to standard output.\n" +"To save output to FILE, use '%s COMMAND > FILE'.\n" +msgstr "" + +#: src/nohup.c:127 +#, c-format +msgid "failed to render standard input unusable" +msgstr "" + +#: src/nohup.c:131 +#, c-format +msgid "ignoring input" +msgstr "" + +#: src/nohup.c:175 +#, c-format +msgid "ignoring input and appending output to %s" +msgstr "" + +#: src/nohup.c:176 +#, c-format +msgid "appending output to %s" +msgstr "" + +#: src/nohup.c:193 +#, c-format +msgid "failed to set the copy of stderr to close on exec" +msgstr "" + +#: src/nohup.c:198 +#, c-format +msgid "ignoring input and redirecting stderr to stdout" +msgstr "" + +#: src/nohup.c:199 +#, c-format +msgid "redirecting stderr to stdout" +msgstr "" + +#: src/nohup.c:203 +#, c-format +msgid "failed to redirect standard error" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/nproc.c:33 +msgid "Giuseppe Scrivano" +msgstr "" + +#: src/nproc.c:57 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 +#, c-format +msgid "Usage: %s [OPTION]...\n" +msgstr "" + +#: src/nproc.c:58 +msgid "" +"Print the number of processing units available to the current process,\n" +"which may be less than the number of online processors\n" +"\n" +msgstr "" + +#: src/nproc.c:63 +msgid "" +" --all print the number of installed processors\n" +" --ignore=N if possible, exclude N processing units\n" +msgstr "" + +#: src/nproc.c:107 +#, c-format +msgid "%s: invalid number to ignore" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/numfmt.c:35 +msgid "Assaf Gordon" +msgstr "" + +#: src/numfmt.c:676 +#, c-format +msgid "value too large to be converted: '%s'" +msgstr "" + +#: src/numfmt.c:680 +#, fuzzy, c-format +msgid "invalid number: '%s'" +msgstr "neispravan kontekst: %s" + +#: src/numfmt.c:684 +#, c-format +msgid "rejecting suffix in input: '%s' (consider using --from)" +msgstr "" + +#: src/numfmt.c:688 +#, fuzzy, c-format +msgid "invalid suffix in input: '%s'" +msgstr "neispravan sufiks u %s%s argumentu „%s”" + +#: src/numfmt.c:692 +#, c-format +msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)" +msgstr "" + +#: src/numfmt.c:723 +#, c-format +msgid "failed to prepare value '%Lf' for printing" +msgstr "" + +#: src/numfmt.c:787 +#, fuzzy, c-format +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 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [NUMBER]...\n" +msgstr "Uporaba: %s [OPCIJA]... [DATOTEKA]...\n" + +#: src/numfmt.c:816 +msgid "" +"Reformat NUMBER(s), or the numbers from standard input if none are " +"specified.\n" +msgstr "" + +#: src/numfmt.c:820 +msgid " --debug print warnings about invalid input\n" +msgstr "" + +#: src/numfmt.c:823 +msgid "" +" -d, --delimiter=X use X instead of whitespace for field delimiter\n" +msgstr "" + +#: src/numfmt.c:826 +msgid "" +" --field=N replace the number in input field N (default is 1)\n" +msgstr "" + +#: src/numfmt.c:829 +msgid "" +" --format=FORMAT use printf style floating-point FORMAT;\n" +" see FORMAT below for details\n" +msgstr "" + +#: src/numfmt.c:833 +msgid "" +" --from=UNIT auto-scale input numbers to UNITs; default is " +"'none';\n" +" see UNIT below\n" +msgstr "" + +#: src/numfmt.c:837 +msgid "" +" --from-unit=N specify the input unit size (instead of the default " +"1)\n" +msgstr "" + +#: src/numfmt.c:840 +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 "" + +#: src/numfmt.c:844 +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 +msgid "" +" --invalid=MODE failure mode for invalid numbers: MODE can be:\n" +" abort (default), fail, warn, ignore\n" +msgstr "" + +#: src/numfmt.c:852 +msgid "" +" --padding=N pad the output to N characters; positive N will\n" +" right-align; negative N will left-align;\n" +" padding is ignored if the output is wider than N;\n" +" the default is to automatically pad if a " +"whitespace\n" +" is found\n" +msgstr "" + +#: src/numfmt.c:859 +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 +msgid "" +" --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" +" SUFFIX in input numbers\n" +msgstr "" + +#: src/numfmt.c:867 +msgid "" +" --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" +msgstr "" + +#: src/numfmt.c:870 +msgid "" +" --to-unit=N the output unit size (instead of the default 1)\n" +msgstr "" + +#: src/numfmt.c:877 +msgid "" +"\n" +"UNIT options:\n" +msgstr "" + +#: src/numfmt.c:880 +msgid " none no auto-scaling is done; suffixes will trigger an error\n" +msgstr "" + +#: src/numfmt.c:883 +msgid "" +" auto accept optional single/two letter suffix:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" +msgstr "" + +#: src/numfmt.c:889 +msgid "" +" si accept optional single letter suffix:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:894 +msgid "" +" iec accept optional single letter suffix:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:899 +msgid "" +" iec-i accept optional two-letter suffix:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:905 +#, 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" +msgstr "" + +#: src/numfmt.c:912 +#, c-format +msgid "" +"\n" +"Exit status is 0 if all input numbers were successfully converted.\n" +"By default, %s will stop at the first conversion error with exit status 2.\n" +"With --invalid='fail' a warning is printed for each conversion error\n" +"and the exit status is 2. With --invalid='warn' each conversion error is\n" +"diagnosed, but the exit status is 0. With --invalid='ignore' conversion\n" +"errors are not diagnosed and the exit status is 0.\n" +msgstr "" + +#: src/numfmt.c:921 +#, c-format +msgid "" +"\n" +"Examples:\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" +msgstr "" + +#: src/numfmt.c:974 src/seq.c:212 +#, c-format +msgid "format %s has no %% directive" +msgstr "" + +#: src/numfmt.c:990 +#, c-format +msgid "invalid format %s (width overflow)" +msgstr "" + +#: src/numfmt.c:1007 src/seq.c:229 +#, c-format +msgid "format %s ends in %%" +msgstr "" + +#: src/numfmt.c:1010 +#, c-format +msgid "invalid format %s, directive must be %%['][-][N]f" +msgstr "" + +#: src/numfmt.c:1018 src/seq.c:236 +#, 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 "neispravan sufiks u %s%s argumentu „%s”" + +#: src/numfmt.c:1092 +#, c-format +msgid "value too large to be printed: '%Lg' (consider using --to)" +msgstr "" + +#: src/numfmt.c:1100 +#, c-format +msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" +msgstr "" + +#: src/numfmt.c:1184 +#, c-format +msgid "large input value '%s': possible precision loss" +msgstr "" + +#: src/numfmt.c:1293 +#, 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 "neispravan %s%s argument „%s”" + +#: src/numfmt.c:1401 +#, fuzzy, c-format +msgid "invalid field value '%s'" +msgstr "neispravan %s%s argument „%s”" + +#: src/numfmt.c:1430 +#, fuzzy, c-format +msgid "invalid header value '%s'" +msgstr "neispravan %s%s argument „%s”" + +#: src/numfmt.c:1456 +#, 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 +#, c-format +msgid "no conversion option specified" +msgstr "" + +#: src/numfmt.c:1471 +#, c-format +msgid "grouping cannot be combined with --to" +msgstr "" + +#: src/numfmt.c:1473 +#, c-format +msgid "grouping has no effect in this locale" +msgstr "" + +#: src/numfmt.c:1486 +#, c-format +msgid "--header ignored with command-line input" +msgstr "" + +#: src/numfmt.c:1511 +#, c-format +msgid "error reading input" +msgstr "" + +#: src/numfmt.c:1520 +#, fuzzy, c-format +msgid "failed to convert some of the input numbers" +msgstr "nisam uspio promijeniti kontekst %s u %s" + +#: src/od.c:294 +#, 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 "" + +#: src/od.c:300 +msgid "" +"\n" +"Write an unambiguous representation, octal bytes by default,\n" +"of FILE to standard output. With more than one FILE argument,\n" +"concatenate them in the listed order to form the input.\n" +"With no FILE, or when FILE is -, read standard input.\n" +"\n" +msgstr "" + +#: src/od.c:307 +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" +"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" +"at first byte printed, incremented when dump is progressing.\n" +"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 "" + +#: src/od.c:318 +msgid "" +" -A, --address-radix=RADIX output format for file offsets. RADIX is one\n" +" of [doxn], for Decimal, Octal, Hex or None\n" +" -j, --skip-bytes=BYTES skip BYTES input bytes first\n" +msgstr "" + +#: src/od.c:323 +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" +" 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" +" 32 is implied when BYTES is not specified\n" +" --traditional accept arguments in third form above\n" +msgstr "" + +#: src/od.c:336 +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" +" -d same as -t u2, select unsigned decimal 2-byte units\n" +msgstr "" + +#: src/od.c:345 +msgid "" +" -f same as -t fF, select floats\n" +" -i same as -t dI, select decimal ints\n" +" -l same as -t dL, select decimal longs\n" +" -o same as -t o2, select octal 2-byte units\n" +" -s same as -t d2, select decimal 2-byte units\n" +" -x same as -t x2, select hexadecimal 2-byte units\n" +msgstr "" + +#: src/od.c:353 +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" +msgstr "" + +#: src/od.c:360 +msgid "" +" d[SIZE] signed decimal, SIZE bytes per integer\n" +" f[SIZE] floating point, SIZE bytes per integer\n" +" o[SIZE] octal, SIZE bytes per integer\n" +" u[SIZE] unsigned decimal, SIZE bytes per integer\n" +" x[SIZE] hexadecimal, SIZE bytes per integer\n" +msgstr "" + +#: src/od.c:367 +msgid "" +"\n" +"SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" +"sizeof(char), S for sizeof(short), I for sizeof(int) or L for\n" +"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 "" + +#: src/od.c:374 +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 +msgid "" +"\n" +"\n" +"BYTES is hex with 0x or 0X prefix, and may have a multiplier suffix:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"and so on for G, T, P, E, Z, Y.\n" +msgstr "" + +#: src/od.c:639 src/od.c:759 +#, c-format +msgid "invalid type string %s" +msgstr "" + +#: src/od.c:649 +#, c-format +msgid "" +"invalid type string %s;\n" +"this system doesn't provide a %lu-byte integral type" +msgstr "" + +#: src/od.c:770 +#, c-format +msgid "" +"invalid type string %s;\n" +"this system doesn't provide a %lu-byte floating point type" +msgstr "" + +#: src/od.c:828 +#, c-format +msgid "invalid character '%c' in type string %s" +msgstr "" + +#: src/od.c:1053 +#, c-format +msgid "cannot skip past end of combined input" +msgstr "" + +#: src/od.c:1609 +#, c-format +msgid "invalid output address radix '%c'; it must be one character from [doxn]" +msgstr "" + +#: src/od.c:1735 +#, c-format +msgid "no type may be specified when dumping strings" +msgstr "" + +#: src/od.c:1810 +msgid "compatibility mode supports at most one file" +msgstr "" + +#: src/od.c:1831 +#, c-format +msgid "skip-bytes + read-bytes is too large" +msgstr "" + +#: src/od.c:1874 +#, c-format +msgid "warning: invalid width %lu; using %d instead" +msgstr "" + +#: src/operand2sig.c:69 +#, c-format +msgid "%s: invalid signal" +msgstr "" + +#: src/paste.c:220 +#, c-format +msgid "standard input is closed" +msgstr "" + +#: src/paste.c:439 +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 "" + +#: 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 "" + +#: src/paste.c:508 +#, c-format +msgid "delimiter list ends with an unescaped backslash: %s" +msgstr "" + +#: src/pathchk.c:90 +msgid "" +"Diagnose invalid or unportable file names.\n" +"\n" +" -p check for most POSIX systems\n" +" -P check for empty names and leading \"-\"\n" +" --portability check for all POSIX systems (equivalent to -p -P)\n" +msgstr "" + +#: src/pathchk.c:170 +#, c-format +msgid "leading '-' in a component of file name %s" +msgstr "" + +#: src/pathchk.c:196 +#, c-format +msgid "nonportable character %s in file name %s" +msgstr "" + +#: src/pathchk.c:272 +#, c-format +msgid "empty file name" +msgstr "" + +#: src/pathchk.c:314 +#, c-format +msgid "%s: unable to determine maximum file name length" +msgstr "" + +#: src/pathchk.c:325 +#, c-format +msgid "limit %lu exceeded by length %lu of file name %s" +msgstr "" + +#: src/pathchk.c:411 +#, c-format +msgid "limit %lu exceeded by length %lu of file name component %s" +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 +msgid "Joseph Arceneaux" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/pinky.c:38 src/uptime.c:47 +msgid "Kaveh Ghazi" +msgstr "" + +#. TRANSLATORS: Real name is unknown; at most 19 characters. +#: src/pinky.c:242 +msgid " ???" +msgstr "" + +#. TRANSLATORS: Idle time is unknown; at most 5 characters. +#: src/pinky.c:266 +msgid "?????" +msgstr "" + +#: src/pinky.c:314 +#, c-format +msgid "Login name: " +msgstr "" + +#: src/pinky.c:317 +#, c-format +msgid "In real life: " +msgstr "" + +#. TRANSLATORS: Real name is unknown; no hard limit. +#: src/pinky.c:321 +msgid "???\n" +msgstr "" + +#: src/pinky.c:341 +#, c-format +msgid "Directory: " +msgstr "" + +#: src/pinky.c:343 +#, c-format +msgid "Shell: " +msgstr "" + +#: src/pinky.c:362 +#, c-format +msgid "Project: " +msgstr "" + +#: src/pinky.c:386 +#, c-format +msgid "Plan:\n" +msgstr "" + +#: src/pinky.c:405 +msgid "Login" +msgstr "" + +#: src/pinky.c:407 +msgid "Name" +msgstr "" + +#: src/pinky.c:408 +msgid " TTY" +msgstr "" + +#: src/pinky.c:410 +msgid "Idle" +msgstr "" + +#: src/pinky.c:411 +msgid "When" +msgstr "" + +#: src/pinky.c:414 +msgid "Where" +msgstr "" + +#: src/pinky.c:493 +#, c-format +msgid "Usage: %s [OPTION]... [USER]...\n" +msgstr "" + +#: src/pinky.c:494 +msgid "" +"\n" +" -l produce long format output for the specified USERs\n" +" -b omit the user's home directory and shell in long format\n" +" -h omit the user's project file in long format\n" +" -p omit the user's plan file in long format\n" +" -s do short format output, this is the default\n" +msgstr "" + +#: src/pinky.c:502 +msgid "" +" -f omit the line of column headings in short format\n" +" -w omit the user's full name in short format\n" +" -i omit the user's full name and remote host in short format\n" +" -q omit the user's full name, remote host and idle time\n" +" in short format\n" +msgstr "" + +#: src/pinky.c:511 +#, c-format +msgid "" +"\n" +"A lightweight 'finger' program; print user information.\n" +"The utmp file will be %s.\n" +msgstr "" + +#: src/pinky.c:595 +#, c-format +msgid "no username specified; at least one must be specified when using -l" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/pr.c:330 +msgid "Pete TerMaat" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/pr.c:331 +msgid "Roland Huebner" +msgstr "" + +#: src/pr.c:908 +#, c-format +msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" +msgstr "" + +#: src/pr.c:910 +#, c-format +msgid "invalid page range %s" +msgstr "" + +#: src/pr.c:975 +#, c-format +msgid "'-l PAGE_LENGTH' invalid number of lines: %s" +msgstr "" + +#: src/pr.c:999 +#, c-format +msgid "'-N NUMBER' invalid starting line number: %s" +msgstr "" + +#: src/pr.c:1011 +#, c-format +msgid "'-o MARGIN' invalid line offset: %s" +msgstr "" + +#: src/pr.c:1052 +#, c-format +msgid "'-w PAGE_WIDTH' invalid number of characters: %s" +msgstr "" + +#: src/pr.c:1066 +#, c-format +msgid "'-W PAGE_WIDTH' invalid number of characters: %s" +msgstr "" + +#: src/pr.c:1096 +#, c-format +msgid "cannot specify number of columns when printing in parallel" +msgstr "" + +#: src/pr.c:1100 +#, c-format +msgid "cannot specify both printing across and printing in parallel" +msgstr "" + +#: src/pr.c:1196 +#, c-format +msgid "'-%c' extra characters or invalid number in the argument: %s" +msgstr "" + +#: src/pr.c:1293 +#, c-format +msgid "page width too narrow" +msgstr "" + +#: src/pr.c:2353 +#, c-format +msgid "starting page number %<PRIuMAX> exceeds page count %<PRIuMAX>" +msgstr "" + +#: src/pr.c:2380 +#, c-format +msgid "page number overflow" +msgstr "" + +#: src/pr.c:2385 +#, c-format +msgid "Page %<PRIuMAX>" +msgstr "" + +#: src/pr.c:2757 +msgid "Paginate or columnate FILE(s) for printing.\n" +msgstr "" + +#: src/pr.c:2763 +msgid "" +" +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" +" begin [stop] printing with page FIRST_[LAST_]PAGE\n" +" -COLUMN, --columns=COLUMN\n" +" output COLUMN columns and print columns down,\n" +" unless -a is used. Balance number of lines in the\n" +" columns on each page\n" +msgstr "" + +#: src/pr.c:2771 +msgid "" +" -a, --across print columns across rather than down, used together\n" +" with -COLUMN\n" +" -c, --show-control-chars\n" +" use hat notation (^G) and octal backslash notation\n" +" -d, --double-space\n" +" double space the output\n" +msgstr "" + +#: src/pr.c:2779 +msgid "" +" -D, --date-format=FORMAT\n" +" use FORMAT for the header date\n" +" -e[CHAR[WIDTH]], --expand-tabs[=CHAR[WIDTH]]\n" +" expand input CHARs (TABs) to tab WIDTH (8)\n" +" -F, -f, --form-feed\n" +" use form feeds instead of newlines to separate pages\n" +" (by a 3-line page header with -F or a 5-line header\n" +" and trailer without -F)\n" +msgstr "" + +#: src/pr.c:2789 +msgid "" +" -h, --header=HEADER\n" +" use a centered HEADER instead of filename in page " +"header,\n" +" -h \"\" prints a blank line, don't use -h\"\"\n" +" -i[CHAR[WIDTH]], --output-tabs[=CHAR[WIDTH]]\n" +" replace spaces with CHARs (TABs) to tab WIDTH (8)\n" +" -J, --join-lines merge full lines, turns off -W line truncation, no " +"column\n" +" alignment, --sep-string[=STRING] sets separators\n" +msgstr "" + +#: src/pr.c:2798 +msgid "" +" -l, --length=PAGE_LENGTH\n" +" set the page length to PAGE_LENGTH (66) lines\n" +" (default number of lines of text 56, and with -F 63)\n" +" -m, --merge print all files in parallel, one in each column,\n" +" truncate lines, but join lines of full length with -J\n" +msgstr "" + +#: src/pr.c:2805 +msgid "" +" -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" +" number lines, use DIGITS (5) digits, then SEP (TAB),\n" +" default counting starts with 1st line of input file\n" +" -N, --first-line-number=NUMBER\n" +" start counting with NUMBER at 1st line of first\n" +" page printed (see +FIRST_PAGE)\n" +msgstr "" + +#: src/pr.c:2813 +msgid "" +" -o, --indent=MARGIN\n" +" offset each line with MARGIN (zero) spaces, do not\n" +" affect -w or -W, MARGIN will be added to PAGE_WIDTH\n" +" -r, --no-file-warnings\n" +" omit warning when a file cannot be opened\n" +msgstr "" + +#: 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" +" -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 +msgid "" +" -S[STRING], --sep-string[=STRING]\n" +" separate columns by STRING,\n" +" without -S: Default separator <TAB> with -J and <space>\n" +" otherwise (same as -S\" \"), no effect on column " +"options\n" +" -t, --omit-header omit page headers and trailers\n" +msgstr "" + +#: src/pr.c:2834 +msgid "" +" -T, --omit-pagination\n" +" omit page headers and trailers, eliminate any " +"pagination\n" +" by form feeds set in input files\n" +" -v, --show-nonprinting\n" +" use octal backslash notation\n" +" -w, --width=PAGE_WIDTH\n" +" set page width to PAGE_WIDTH (72) characters for\n" +" multiple text-column output only, -s[char] turns off " +"(72)\n" +msgstr "" + +#: src/pr.c:2844 +msgid "" +" -W, --page-width=PAGE_WIDTH\n" +" set page width to PAGE_WIDTH (72) characters always,\n" +" truncate lines, except -J option is set, no " +"interference\n" +" with -S or -s\n" +msgstr "" + +#: src/pr.c:2852 +msgid "" +"\n" +"-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" +"standard input.\n" +msgstr "" + +#: src/printenv.c:62 +#, c-format +msgid "" +"Usage: %s [OPTION]... [VARIABLE]...\n" +"Print the values of the specified environment VARIABLE(s).\n" +"If no VARIABLE is specified, print name and value pairs for them all.\n" +"\n" +msgstr "" + +#: src/printenv.c:69 +msgid " -0, --null end each output line with 0 byte rather than newline\n" +msgstr "" + +#: src/printf.c:79 +#, c-format +msgid "" +"warning: %s: character(s) following character constant have been ignored" +msgstr "" + +#: src/printf.c:88 +#, c-format +msgid "" +"Usage: %s FORMAT [ARGUMENT]...\n" +" or: %s OPTION\n" +msgstr "" + +#: src/printf.c:93 +msgid "" +"Print ARGUMENT(s) according to FORMAT, or execute according to OPTION:\n" +"\n" +msgstr "" + +#: src/printf.c:99 +msgid "" +"\n" +"FORMAT controls the output as in C printf. Interpreted sequences are:\n" +"\n" +" \\\" double quote\n" +msgstr "" + +#: src/printf.c:117 +msgid "" +" \\NNN byte with octal value NNN (1 to 3 digits)\n" +" \\xHH byte with hexadecimal value HH (1 to 2 digits)\n" +" \\uHHHH Unicode (ISO/IEC 10646) character with hex value HHHH (4 digits)\n" +" \\UHHHHHHHH Unicode character with hex value HHHHHHHH (8 digits)\n" +msgstr "" + +#: src/printf.c:123 +msgid "" +" %% a single %\n" +" %b ARGUMENT as a string with '\\' escapes interpreted,\n" +" except that octal escapes are of the form \\0 or \\0NNN\n" +"\n" +"and all C format specifications ending with one of diouxXfeEgGcs, with\n" +"ARGUMENTs converted to proper type first. Variable widths are handled.\n" +msgstr "" + +#: src/printf.c:148 +#, c-format +msgid "%s: expected a numeric value" +msgstr "" + +#: src/printf.c:150 +#, c-format +msgid "%s: value not completely converted" +msgstr "" + +#: src/printf.c:247 src/printf.c:274 +#, c-format +msgid "missing hexadecimal number in escape" +msgstr "" + +#: src/printf.c:286 +#, c-format +msgid "invalid universal character name \\%c%0*x" +msgstr "" + +#: src/printf.c:547 +#, c-format +msgid "invalid field width: %s" +msgstr "" + +#: src/printf.c:582 +#, c-format +msgid "invalid precision: %s" +msgstr "" + +#: src/printf.c:609 +#, c-format +msgid "%.*s: invalid conversion specification" +msgstr "" + +#: src/printf.c:692 +#, c-format +msgid "warning: ignoring excess arguments, starting with %s" +msgstr "" + +#. TRANSLATORS: Please translate "F. Pinard" to "François Pinard" +#. if "ç" (c-with-cedilla) is available in the translation's character +#. set and encoding. +#. This is a proper name. See the gettext manual, section Names. +#: src/ptx.c:42 +msgid "F. Pinard" +msgstr "" + +#: src/ptx.c:419 +#, c-format +msgid "%s (for regexp %s)" +msgstr "" + +#: src/ptx.c:1817 +#, c-format +msgid "" +"Usage: %s [OPTION]... [INPUT]... (without -G)\n" +" or: %s -G [OPTION]... [INPUT [OUTPUT]]\n" +msgstr "" + +#: src/ptx.c:1821 +msgid "" +"Output a permuted index, including context, of the words in the input " +"files.\n" +msgstr "" + +#: src/ptx.c:1827 +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 +msgid "" +" -M, --macro-name=STRING macro name to use instead of 'xx'\n" +" -O, --format=roff generate output as roff directives\n" +" -R, --right-side-refs put references at right, not counted in -w\n" +" -S, --sentence-regexp=REGEXP for end of lines or end of sentences\n" +" -T, --format=tex generate output as TeX directives\n" +msgstr "" + +#: src/ptx.c:1839 +msgid "" +" -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" +" -b, --break-file=FILE word break characters in this FILE\n" +" -f, --ignore-case fold lower case to upper case for sorting\n" +" -g, --gap-size=NUMBER gap size in columns between output fields\n" +" -i, --ignore-file=FILE read ignore word list from FILE\n" +" -o, --only-file=FILE read only word list from this FILE\n" +msgstr "" + +#: src/ptx.c:1847 +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 "" + +#: src/ptx.c:1854 +msgid "" +"\n" +"With no FILE or if FILE is -, read Standard Input. '-F /' by default.\n" +msgstr "" + +#: src/ptx.c:1948 +#, c-format +msgid "invalid gap width: %s" +msgstr "" + +#: src/pwd.c:57 +msgid "" +"Print the full filename of the current working directory.\n" +"\n" +msgstr "" + +#: src/pwd.c:61 +msgid "" +" -L, --logical use PWD from environment, even if it contains symlinks\n" +" -P, --physical avoid all symlinks\n" +msgstr "" + +#: src/pwd.c:166 +#, c-format +msgid "failed to chdir to %s" +msgstr "" + +#: src/pwd.c:170 src/pwd.c:277 src/split.c:373 +#, c-format +msgid "failed to stat %s" +msgstr "" + +#: src/pwd.c:235 +#, c-format +msgid "couldn't find directory entry in %s with matching i-node" +msgstr "" + +#: src/pwd.c:362 +#, c-format +msgid "ignoring non-option arguments" +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 +#, c-format +msgid "Usage: %s [OPTION]... FILE...\n" +msgstr "" + +#: src/readlink.c:63 +msgid "" +"Print value of a symbolic link or canonical file name\n" +"\n" +msgstr "" + +#: src/readlink.c:65 +msgid "" +" -f, --canonicalize canonicalize by following every symlink in\n" +" every component of the given name " +"recursively;\n" +" all but the last component must exist\n" +" -e, --canonicalize-existing canonicalize by following every symlink in\n" +" every component of the given name " +"recursively,\n" +" all components must exist\n" +msgstr "" + +#: src/readlink.c:75 +msgid "" +" -m, --canonicalize-missing canonicalize by following every symlink in\n" +" every component of the given name " +"recursively,\n" +" without requirements on components " +"existence\n" +" -n, --no-newline do not output the trailing delimiter\n" +" -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" +msgstr "" + +#: src/readlink.c:152 +#, c-format +msgid "ignoring --no-newline with multiple arguments" +msgstr "" + +#: src/realpath.c:72 +msgid "" +"Print the resolved absolute file name;\n" +"all but the last component must exist\n" +"\n" +msgstr "" + +#: src/realpath.c:77 +msgid "" +" -e, --canonicalize-existing all components of the path must exist\n" +" -m, --canonicalize-missing no components of the path need exist\n" +" -L, --logical resolve '..' components before symlinks\n" +" -P, --physical resolve symlinks as encountered (default)\n" +" -q, --quiet suppress most error messages\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" +"\n" +msgstr "" + +#: src/relpath.c:130 +msgid "generating relative path" +msgstr "" + +#: src/remove.c:273 +#, c-format +msgid "%s: descend into write-protected directory %s? " +msgstr "" + +#: src/remove.c:274 +#, c-format +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 +#, c-format +msgid "%s: remove write-protected %s %s? " +msgstr "" + +#: src/remove.c:291 +#, c-format +msgid "%s: remove %s %s? " +msgstr "" + +#: src/remove.c:374 +#, c-format +msgid "removed directory: %s\n" +msgstr "" + +#: src/remove.c:444 +#, c-format +msgid "cannot remove directory: %s" +msgstr "" + +#: src/remove.c:500 +#, c-format +msgid "skipping %s, since it's on a different device" +msgstr "" + +#: src/remove.c:520 +#, c-format +msgid "traversal failed: %s" +msgstr "" + +#: src/remove.c:526 +#, c-format +msgid "" +"unexpected failure: fts_info=%d: %s\n" +"please report to %s" +msgstr "" + +#: src/rm.c:119 +#, c-format +msgid "Try '%s ./%s' to remove the file %s.\n" +msgstr "" + +#: src/rm.c:136 +msgid "" +"Remove (unlink) the FILE(s).\n" +"\n" +" -f, --force ignore nonexistent files and arguments, never " +"prompt\n" +" -i prompt before every removal\n" +msgstr "" + +#: src/rm.c:142 +msgid "" +" -I prompt once before removing more than three files, " +"or\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" +msgstr "" + +#: src/rm.c:149 +msgid "" +" --one-file-system when removing a hierarchy recursively, skip any\n" +" directory that is on a file system different from\n" +" that of the corresponding command line argument\n" +msgstr "" + +#: src/rm.c:154 +msgid "" +" --no-preserve-root do not treat '/' specially\n" +" --preserve-root do not remove '/' (default)\n" +" -r, -R, --recursive remove directories and their contents recursively\n" +" -d, --dir remove empty directories\n" +" -v, --verbose explain what is being done\n" +msgstr "" + +#: src/rm.c:163 +msgid "" +"\n" +"By default, rm does not remove directories. Use the --recursive (-r or -R)\n" +"option to remove each listed directory, too, along with all of its " +"contents.\n" +msgstr "" + +#: src/rm.c:168 +#, c-format +msgid "" +"\n" +"To remove a file whose name starts with a '-', for example '-foo',\n" +"use one of these commands:\n" +" %s -- -foo\n" +"\n" +" %s ./-foo\n" +msgstr "" + +#: src/rm.c:177 +msgid "" +"\n" +"Note that if you use rm to remove a file, it might be possible to recover\n" +"some of its contents, given sufficient expertise and/or time. For greater\n" +"assurance that the contents are truly unrecoverable, consider using shred.\n" +msgstr "" + +#: src/rm.c:342 +#, c-format +msgid "%s: remove all arguments recursively? " +msgstr "" + +#: src/rm.c:343 +#, c-format +msgid "%s: remove all arguments? " +msgstr "" + +#: src/rmdir.c:134 src/rmdir.c:233 +#, c-format +msgid "removing directory, %s" +msgstr "" + +#: src/rmdir.c:148 +#, c-format +msgid "failed to remove directory %s" +msgstr "" + +#: src/rmdir.c:165 +msgid "" +"Remove the DIRECTORY(ies), if they are empty.\n" +"\n" +" --ignore-fail-on-non-empty\n" +" ignore each failure that is solely because a directory\n" +" is non-empty\n" +msgstr "" + +#: src/rmdir.c:172 +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 "" + +#: src/rmdir.c:242 +#, c-format +msgid "failed to remove %s" +msgstr "" + +#: src/runcon.c:83 +#, c-format +msgid "" +"Usage: %s CONTEXT COMMAND [args]\n" +" or: %s [ -c ] [-u USER] [-r ROLE] [-t TYPE] [-l RANGE] COMMAND [args]\n" +msgstr "" + +#: src/runcon.c:87 +msgid "" +"Run a program in a different security context.\n" +"With neither CONTEXT nor COMMAND, print the current security context.\n" +msgstr "" + +#: src/runcon.c:94 +msgid "" +" CONTEXT Complete security context\n" +" -c, --compute compute process transition context before modifying\n" +" -t, --type=TYPE type (for same role as parent)\n" +" -u, --user=USER user identity\n" +" -r, --role=ROLE role\n" +" -l, --range=RANGE levelrange\n" +"\n" +msgstr "" + +#: src/runcon.c:144 +#, c-format +msgid "multiple roles" +msgstr "" + +#: src/runcon.c:149 +#, c-format +msgid "multiple types" +msgstr "" + +#: src/runcon.c:154 +#, c-format +msgid "multiple users" +msgstr "" + +#: src/runcon.c:159 +#, c-format +msgid "multiple levelranges" +msgstr "" + +#: src/runcon.c:177 src/runcon.c:213 +#, c-format +msgid "failed to get current context" +msgstr "" + +#: src/runcon.c:187 +#, c-format +msgid "you must specify -c, -t, -u, -l, -r, or context" +msgstr "" + +#: src/runcon.c:195 +#, c-format +msgid "no command specified" +msgstr "" + +#: src/runcon.c:201 +#, c-format +msgid "%s may be used only on a SELinux kernel" +msgstr "" + +#: src/runcon.c:227 +#, c-format +msgid "failed to compute a new context" +msgstr "" + +#: src/runcon.c:241 +#, c-format +msgid "failed to set new user %s" +msgstr "" + +#: src/runcon.c:243 +#, c-format +msgid "failed to set new type %s" +msgstr "" + +#: src/runcon.c:245 +#, c-format +msgid "failed to set new range %s" +msgstr "" + +#: src/runcon.c:247 +#, c-format +msgid "failed to set new role %s" +msgstr "" + +#: src/runcon.c:255 +#, c-format +msgid "unable to set security context %s" +msgstr "" + +#: src/seq.c:68 +#, c-format +msgid "" +"Usage: %s [OPTION]... LAST\n" +" or: %s [OPTION]... FIRST LAST\n" +" or: %s [OPTION]... FIRST INCREMENT LAST\n" +msgstr "" + +#: src/seq.c:73 +msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" +msgstr "" + +#: src/seq.c:79 +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 "" + +#: src/seq.c:86 +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" +"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 +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 +#, c-format +msgid "invalid floating point argument: %s" +msgstr "" + +#: src/seq.c:232 +#, c-format +msgid "format %s has unknown %%%c directive" +msgstr "" + +#: src/seq.c:555 +#, 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 +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 +#, c-format +msgid "" +" -f, --force change permissions to allow writing if necessary\n" +" -n, --iterations=N overwrite N times instead of the default (%d)\n" +" --random-source=FILE get random bytes from FILE\n" +" -s, --size=N shred this many bytes (suffixes like K, M, G accepted)\n" +msgstr "" + +#: src/shred.c:161 +msgid "" +" -u, --remove truncate and remove file after overwriting\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 +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" +"\n" +msgstr "" + +#: src/shred.c:180 +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" +"way to do things, but many modern file system designs do not satisfy this\n" +"assumption. The following are examples of file systems on which shred is\n" +"not effective, or is not guaranteed to be effective in all file system " +"modes:\n" +"\n" +msgstr "" + +#: src/shred.c:188 +msgid "" +"* log-structured or journaled file systems, such as those supplied with\n" +"AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" +"\n" +"* file systems that write redundant data and carry on even if some writes\n" +"fail, such as RAID-based file systems\n" +"\n" +"* file systems that make snapshots, such as Network Appliance's NFS server\n" +"\n" +msgstr "" + +#: src/shred.c:198 +msgid "" +"* file systems that cache in temporary locations, such as NFS\n" +"version 3 clients\n" +"\n" +"* compressed file systems\n" +"\n" +msgstr "" + +#: src/shred.c:205 +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" +"which journals file data in addition to just metadata. In both the\n" +"data=ordered (default) and data=writeback modes, shred works as usual.\n" +"Ext3 journaling modes can be changed by adding the data=something option\n" +"to the mount options for a particular file system in the /etc/fstab file,\n" +"as documented in the mount man page (man mount).\n" +"\n" +msgstr "" + +#: src/shred.c:215 +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 +#, c-format +msgid "%s: fdatasync failed" +msgstr "" + +#: src/shred.c:306 +#, c-format +msgid "%s: fsync failed" +msgstr "" + +#: src/shred.c:383 +#, c-format +msgid "%s: cannot rewind" +msgstr "" + +#: src/shred.c:402 +#, c-format +msgid "%s: pass %lu/%lu (%s)..." +msgstr "" + +#: src/shred.c:452 +#, c-format +msgid "%s: error writing at offset %s" +msgstr "" + +#: src/shred.c:470 +#, c-format +msgid "%s: lseek failed" +msgstr "" + +#: src/shred.c:481 +#, c-format +msgid "%s: file too large" +msgstr "" + +#: src/shred.c:504 +#, c-format +msgid "%s: pass %lu/%lu (%s)...%s" +msgstr "" + +#: src/shred.c:520 +#, c-format +msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" +msgstr "" + +#: src/shred.c:767 +#, c-format +msgid "%s: fstat failed" +msgstr "" + +#: src/shred.c:778 +#, c-format +msgid "%s: invalid file type" +msgstr "" + +#: src/shred.c:797 +#, c-format +msgid "%s: file has negative size" +msgstr "" + +#: src/shred.c:864 src/sort.c:932 src/split.c:378 +#, c-format +msgid "%s: error truncating" +msgstr "" + +#: src/shred.c:880 +#, c-format +msgid "%s: fcntl failed" +msgstr "" + +#: src/shred.c:885 +#, c-format +msgid "%s: cannot shred append-only file descriptor" +msgstr "" + +#: src/shred.c:967 +#, c-format +msgid "%s: removing" +msgstr "" + +#: src/shred.c:991 +#, c-format +msgid "%s: renamed to %s" +msgstr "" + +#: src/shred.c:1013 +#, c-format +msgid "%s: failed to remove" +msgstr "" + +#: src/shred.c:1017 +#, c-format +msgid "%s: removed" +msgstr "" + +#: src/shred.c:1024 src/shred.c:1067 +#, c-format +msgid "%s: failed to close" +msgstr "" + +#: src/shred.c:1060 +#, c-format +msgid "%s: failed to open for writing" +msgstr "" + +#: src/shred.c:1125 +#, c-format +msgid "%s: invalid number of passes" +msgstr "" + +#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441 +#, c-format +msgid "multiple random sources specified" +msgstr "" + +#: src/shred.c:1148 +#, c-format +msgid "%s: invalid file size" +msgstr "" + +#: src/shuf.c:48 +#, c-format +msgid "" +"Usage: %s [OPTION]... [FILE]\n" +" or: %s -e [OPTION]... [ARG]...\n" +" or: %s -i LO-HI [OPTION]...\n" +msgstr "" + +#: src/shuf.c:54 +msgid "Write a random permutation of the input lines to standard output.\n" +msgstr "" + +#: src/shuf.c:60 +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 " +"line\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" +msgstr "" + +#: src/shuf.c:244 +#, c-format +msgid "multiple -i options specified" +msgstr "" + +#: src/shuf.c:264 +#, c-format +msgid "invalid input range %s" +msgstr "" + +#: src/shuf.c:277 +#, c-format +msgid "invalid line count %s" +msgstr "" + +#: src/shuf.c:284 src/sort.c:4435 +#, c-format +msgid "multiple output files specified" +msgstr "" + +#: src/shuf.c:310 +#, c-format +msgid "cannot combine -e and -i options" +msgstr "" + +#: src/sleep.c:44 +#, c-format +msgid "" +"Usage: %s NUMBER[SUFFIX]...\n" +" or: %s OPTION\n" +"Pause for NUMBER seconds. SUFFIX may be 's' for seconds (the default),\n" +"'m' for minutes, 'h' for hours or 'd' for days. Unlike most " +"implementations\n" +"that require NUMBER be an integer, here NUMBER may be an arbitrary floating\n" +"point number. Given two or more arguments, pause for the amount of time\n" +"specified by the sum of their values.\n" +"\n" +msgstr "" + +#: src/sleep.c:135 src/timeout.c:320 +#, c-format +msgid "invalid time interval %s" +msgstr "" + +#: src/sleep.c:146 src/tail.c:1219 +#, c-format +msgid "cannot read realtime clock" +msgstr "" + +#: src/sort.c:399 +msgid "Write sorted concatenation of all FILE(s) to standard output.\n" +msgstr "" + +#: src/sort.c:405 +msgid "" +"Ordering options:\n" +"\n" +msgstr "" + +#: src/sort.c:409 +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 "" + +#: src/sort.c:415 +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 +msgid "" +" -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" +msgstr "" + +#: src/sort.c:423 +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 "" + +#: src/sort.c:429 +msgid "" +" --sort=WORD sort according to WORD:\n" +" general-numeric -g, human-numeric -h, month -" +"M,\n" +" numeric -n, random -R, version -V\n" +" -V, --version-sort natural sort of (version) numbers within text\n" +"\n" +msgstr "" + +#: src/sort.c:437 +msgid "" +"Other options:\n" +"\n" +msgstr "" + +#: src/sort.c:441 +msgid "" +" --batch-size=NMERGE merge at most NMERGE inputs at once;\n" +" for more use temp files\n" +msgstr "" + +#: src/sort.c:445 +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 " +"line\n" +" --compress-program=PROG compress temporaries with PROG;\n" +" decompress them with PROG -d\n" +msgstr "" + +#: src/sort.c:452 +msgid "" +" --debug annotate the part of the line used to sort,\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" +msgstr "" + +#: src/sort.c:459 +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 +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 "" + +#: src/sort.c:469 +#, c-format +msgid "" +" -t, --field-separator=SEP use SEP instead of non-blank to blank " +"transition\n" +" -T, --temporary-directory=DIR use DIR for temporaries, not $TMPDIR or " +"%s;\n" +" multiple options specify multiple directories\n" +" --parallel=N change the number of sorts run concurrently to " +"N\n" +" -u, --unique with -c, check for strict ordering;\n" +" without -c, output only the first of an equal " +"run\n" +msgstr "" + +#: src/sort.c:478 +msgid " -z, --zero-terminated end lines with 0 byte, not newline\n" +msgstr "" + +#: src/sort.c:483 +msgid "" +"\n" +"KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " +"a\n" +"field number and C a character position in the field; both are origin 1, " +"and\n" +"the stop position defaults to the line's end. If neither -t nor -b is in\n" +"effect, characters in a field are counted from the beginning of the " +"preceding\n" +"whitespace. OPTS is one or more single-letter ordering options " +"[bdfgiMhnRrV],\n" +"which override global ordering options for that key. If no key is given, " +"use\n" +"the entire line as the key.\n" +"\n" +"SIZE may be followed by the following multiplicative suffixes:\n" +msgstr "" + +#: src/sort.c:496 +msgid "" +"% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" +"\n" +"*** WARNING ***\n" +"The locale specified by the environment affects sort order.\n" +"Set LC_ALL=C to get the traditional sort order that uses\n" +"native byte values.\n" +msgstr "" + +#: src/sort.c:697 +#, c-format +msgid "waiting for %s [-d]" +msgstr "" + +#: src/sort.c:702 +#, c-format +msgid "%s [-d] terminated abnormally" +msgstr "" + +#: src/sort.c:856 +#, 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 +msgid "open failed" +msgstr "" + +#: src/sort.c:970 +msgid "fflush failed" +msgstr "" + +#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706 +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 +msgid "couldn't create temporary file" +msgstr "" + +#: src/sort.c:1149 +#, 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 +#, c-format +msgid "warning: cannot remove: %s" +msgstr "" + +#: src/sort.c:1306 +#, c-format +msgid "invalid --%s argument %s" +msgstr "" + +#: src/sort.c:1309 +#, c-format +msgid "minimum --%s argument is %s" +msgstr "" + +#: src/sort.c:1324 +#, c-format +msgid "--%s argument %s too large" +msgstr "" + +#: src/sort.c:1327 +#, c-format +msgid "maximum --%s argument with current rlimit is %s" +msgstr "" + +#: src/sort.c:1409 +#, c-format +msgid "number in parallel must be nonzero" +msgstr "" + +#: src/sort.c:1494 +msgid "stat failed" +msgstr "" + +#: src/sort.c:1755 +msgid "read failed" +msgstr "" + +#: src/sort.c:2043 +#, c-format +msgid "string transformation failed" +msgstr "" + +#: src/sort.c:2046 +#, c-format +msgid "the untransformed string was %s" +msgstr "" + +#: src/sort.c:2209 +#, c-format +msgid "^ no match for key\n" +msgstr "" + +#: src/sort.c:2389 +#, c-format +msgid "obsolescent key %s used; consider %s instead" +msgstr "" + +#: src/sort.c:2395 +#, c-format +msgid "key %lu has zero width and will be ignored" +msgstr "" + +#: src/sort.c:2406 +#, c-format +msgid "leading blanks are significant in key %lu; consider also specifying 'b'" +msgstr "" + +#: src/sort.c:2419 +#, c-format +msgid "key %lu is numeric and spans multiple fields" +msgstr "" + +#: src/sort.c:2451 +#, c-format +msgid "option '-%s' is ignored" +msgid_plural "options '-%s' are ignored" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: src/sort.c:2457 +#, c-format +msgid "option '-r' only applies to last-resort comparison" +msgstr "" + +#: src/sort.c:2731 src/sort.c:2740 +msgid "write failed" +msgstr "" + +#: src/sort.c:2783 +#, c-format +msgid "%s: %s:%s: disorder: " +msgstr "" + +#: src/sort.c:2786 +msgid "standard error" +msgstr "" + +#: src/sort.c:3698 +msgid "cannot read" +msgstr "" + +#: src/sort.c:3976 +#, c-format +msgid "%s: invalid field specification %s" +msgstr "" + +#: src/sort.c:3987 +#, c-format +msgid "options '-%s' are incompatible" +msgstr "" + +#: src/sort.c:4038 +#, c-format +msgid "%s: invalid count at start of %s" +msgstr "" + +#: src/sort.c:4295 +msgid "invalid number after '-'" +msgstr "" + +#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416 +msgid "invalid number after '.'" +msgstr "" + +#: src/sort.c:4315 src/sort.c:4421 +msgid "stray character in field spec" +msgstr "" + +#: src/sort.c:4362 +#, c-format +msgid "multiple compress programs specified" +msgstr "" + +#: src/sort.c:4379 +msgid "invalid number at field start" +msgstr "" + +#: src/sort.c:4383 src/sort.c:4411 +msgid "field number is zero" +msgstr "" + +#: src/sort.c:4392 +msgid "character offset is zero" +msgstr "" + +#: src/sort.c:4407 +msgid "invalid number after ','" +msgstr "" + +#: src/sort.c:4457 +#, c-format +msgid "empty tab" +msgstr "" + +#: src/sort.c:4550 src/wc.c:692 +#, c-format +msgid "cannot read file names from %s" +msgstr "" + +#: src/sort.c:4572 +#, c-format +msgid "%s:%lu: invalid zero-length file name" +msgstr "" + +#: src/sort.c:4578 +#, c-format +msgid "no input from %s" +msgstr "" + +#: src/sort.c:4624 +#, c-format +msgid "using %s sorting rules" +msgstr "" + +#: src/sort.c:4627 +#, c-format +msgid "using simple byte comparison" +msgstr "" + +#: src/sort.c:4658 +#, c-format +msgid "extra operand %s not allowed with -%c" +msgstr "" + +#: src/split.c:187 +#, c-format +msgid "the suffix length needs to be at least %zu" +msgstr "" + +#: src/split.c:204 +#, c-format +msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" +msgstr "" + +#: src/split.c:208 +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 "" + +#: src/split.c:216 +#, 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" +" -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" +" -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" +" -u, --unbuffered immediately copy input to output with '-n r/...'\n" +msgstr "" + +#: src/split.c:229 +msgid "" +" --verbose print a diagnostic just before each\n" +" output file is opened\n" +msgstr "" + +#: src/split.c:236 +msgid "" +"\n" +"CHUNKS may be:\n" +"N split into N files based on size of input\n" +"K/N output Kth of N to stdout\n" +"l/N split into N files without splitting lines\n" +"l/K/N output Kth of N to stdout without splitting lines\n" +"r/N like 'l' but use round robin distribution\n" +"r/K/N likewise but only output Kth of N to stdout\n" +msgstr "" + +#: src/split.c:354 +#, c-format +msgid "output file suffixes exhausted" +msgstr "" + +#: src/split.c:366 +#, c-format +msgid "creating file %s\n" +msgstr "" + +#: src/split.c:375 +#, c-format +msgid "%s would overwrite input; aborting" +msgstr "" + +#: src/split.c:391 +#, c-format +msgid "failed to set FILE environment variable" +msgstr "" + +#: src/split.c:393 +#, c-format +msgid "executing with FILE=%s\n" +msgstr "" + +#: src/split.c:395 +#, c-format +msgid "failed to create pipe" +msgstr "" + +#: src/split.c:409 +#, c-format +msgid "closing prior pipe" +msgstr "" + +#: src/split.c:411 +#, c-format +msgid "closing output pipe" +msgstr "" + +#: src/split.c:415 +#, c-format +msgid "moving input pipe" +msgstr "" + +#: src/split.c:417 +#, c-format +msgid "closing input pipe" +msgstr "" + +#: src/split.c:422 +#, c-format +msgid "failed to run command: \"%s -c %s\"" +msgstr "" + +#: src/split.c:428 +#, c-format +msgid "failed to close input pipe" +msgstr "" + +#: src/split.c:464 +#, c-format +msgid "waiting for child process" +msgstr "" + +#: src/split.c:474 +#, c-format +msgid "with FILE=%s, signal %s from command: %s" +msgstr "" + +#: src/split.c:482 +#, c-format +msgid "with FILE=%s, exit %d from command: %s" +msgstr "" + +#: src/split.c:489 src/timeout.c:494 +#, c-format +msgid "unknown status from command (0x%X)" +msgstr "" + +#: src/split.c:1052 +#, c-format +msgid "cannot split in more than one way" +msgstr "" + +#: src/split.c:1065 src/split.c:1205 src/split.c:1376 +#, c-format +msgid "%s: invalid number of chunks" +msgstr "" + +#: src/split.c:1069 +#, c-format +msgid "%s: invalid chunk number" +msgstr "" + +#: src/split.c:1119 +#, c-format +msgid "%s: invalid suffix length" +msgstr "" + +#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180 +#, c-format +msgid "%s: invalid number of bytes" +msgstr "" + +#: src/split.c:1163 src/split.c:1310 +#, c-format +msgid "%s: invalid number of lines" +msgstr "" + +#: src/split.c:1236 +#, c-format +msgid "line count option -%s%c... is too large" +msgstr "" + +#: src/split.c:1248 +#, c-format +msgid "%s: invalid start value for numerical suffix" +msgstr "" + +#: src/split.c:1276 +#, c-format +msgid "%s: invalid IO block size" +msgstr "" + +#: src/split.c:1297 +#, c-format +msgid "--filter does not process a chunk extracted to stdout" +msgstr "" + +#: src/split.c:1334 +#, c-format +msgid "numerical suffix start value is too large for the suffix length" +msgstr "" + +#: src/split.c:1369 +#, c-format +msgid "%s: cannot determine file size" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/stat.c:173 +msgid "Michael Meskes" +msgstr "" + +#: src/stat.c:857 +#, c-format +msgid "failed to canonicalize %s" +msgstr "" + +#: src/stat.c:1069 +#, c-format +msgid "warning: unrecognized escape '\\%c'" +msgstr "" + +#: src/stat.c:1124 +#, c-format +msgid "%s: invalid directive" +msgstr "" + +#: src/stat.c:1170 +#, c-format +msgid "warning: backslash at end of format" +msgstr "" + +#: src/stat.c:1201 +#, c-format +msgid "using %s to denote standard input does not work in file system mode" +msgstr "" + +#: src/stat.c:1208 +#, c-format +msgid "cannot read file system information for %s" +msgstr "" + +#: src/stat.c:1228 +#, 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 +msgid "" +" File: \"%n\"\n" +" ID: %-8i Namelen: %-7l Type: %T\n" +"Block size: %-10s Fundamental block size: %S\n" +"Blocks: Total: %-10b Free: %-10f Available: %a\n" +"Inodes: Total: %-10c Free: %d\n" +msgstr "" + +#. TRANSLATORS: This string uses format specifiers from +#. 'stat --help' without --file-system, and NOT from printf. +#: src/stat.c:1287 +msgid "" +" File: %N\n" +" Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" +msgstr "" + +#. TRANSLATORS: This string uses format specifiers from +#. 'stat --help' without --file-system, and NOT from printf. +#: src/stat.c:1297 +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 +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 +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 +#, c-format +msgid "Context: %C\n" +msgstr "" + +#: src/stat.c:1332 +msgid "" +"Access: %x\n" +"Modify: %y\n" +"Change: %z\n" +" Birth: %w\n" +msgstr "" + +#: src/stat.c:1350 +msgid "Display file or file system status.\n" +msgstr "" + +#: src/stat.c:1356 +msgid "" +" -L, --dereference follow links\n" +" -f, --file-system display file system status instead of file status\n" +msgstr "" + +#: src/stat.c:1360 +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" +" -t, --terse print the information in terse form\n" +msgstr "" + +#: src/stat.c:1371 +msgid "" +"\n" +"The valid format sequences for files (without --file-system):\n" +"\n" +" %a access rights in octal\n" +" %A access rights in human readable form\n" +" %b number of blocks allocated (see %B)\n" +" %B the size in bytes of each block reported by %b\n" +" %C SELinux security context string\n" +msgstr "" + +#: src/stat.c:1380 +msgid "" +" %d device number in decimal\n" +" %D device number in hex\n" +" %f raw mode in hex\n" +" %F file type\n" +" %g group ID of owner\n" +" %G group name of owner\n" +msgstr "" + +#: src/stat.c:1388 +msgid "" +" %h number of hard links\n" +" %i inode number\n" +" %m mount point\n" +" %n file name\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" +msgstr "" + +#: src/stat.c:1399 +msgid "" +" %u user ID of owner\n" +" %U user name of owner\n" +" %w time of file birth, human-readable; - if unknown\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" +"\n" +msgstr "" + +#: src/stat.c:1413 +msgid "" +"Valid format sequences for file systems:\n" +"\n" +" %a free blocks available to non-superuser\n" +" %b total data blocks in file system\n" +" %c total file nodes in file system\n" +" %d free file nodes in file system\n" +" %f free blocks in file system\n" +msgstr "" + +#: src/stat.c:1422 +msgid "" +" %i file system ID in hex\n" +" %l maximum length of filenames\n" +" %n file name\n" +" %s block size (for faster transfers)\n" +" %S fundamental block size (for block counts)\n" +" %t file system type in hex\n" +" %T file system type in human readable form\n" +msgstr "" + +#: src/stdbuf.c:90 +#, c-format +msgid "Usage: %s OPTION... COMMAND\n" +msgstr "" + +#: src/stdbuf.c:91 +msgid "" +"Run COMMAND, with modified buffering operations for its standard streams.\n" +msgstr "" + +#: src/stdbuf.c:97 +msgid "" +" -i, --input=MODE adjust standard input stream buffering\n" +" -o, --output=MODE adjust standard output stream buffering\n" +" -e, --error=MODE adjust standard error stream buffering\n" +msgstr "" + +#: src/stdbuf.c:104 +msgid "" +"\n" +"If MODE is 'L' the corresponding stream will be line buffered.\n" +"This option is invalid with standard input.\n" +msgstr "" + +#: src/stdbuf.c:107 +msgid "" +"\n" +"If MODE is '0' the corresponding stream will be unbuffered.\n" +msgstr "" + +#: src/stdbuf.c:110 +msgid "" +"\n" +"Otherwise MODE is a number which may be followed by one of the following:\n" +"KB 1000, K 1024, MB 1000*1000, M 1024*1024, and so on for G, T, P, E, Z, Y.\n" +"In this case the corresponding stream will be fully buffered with the " +"buffer\n" +"size set to MODE bytes.\n" +msgstr "" + +#: src/stdbuf.c:116 +msgid "" +"\n" +"NOTE: If COMMAND adjusts the buffering of its standard streams ('tee' does\n" +"for e.g.) then that will override corresponding settings changed by " +"'stdbuf'.\n" +"Also some filters (like 'dd' and 'cat' etc.) don't use streams for I/O,\n" +"and are thus unaffected by 'stdbuf' settings.\n" +msgstr "" + +#: src/stdbuf.c:226 +#, c-format +msgid "failed to find %s" +msgstr "" + +#: src/stdbuf.c:246 src/stdbuf.c:278 +#, c-format +msgid "failed to update the environment with %s" +msgstr "" + +#: src/stdbuf.c:320 +#, c-format +msgid "line buffering stdin is meaningless" +msgstr "" + +#: src/stty.c:513 +#, 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 "" + +#: src/stty.c:519 +msgid "Print or change terminal characteristics.\n" +msgstr "" + +#: src/stty.c:525 +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 +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 +msgid "" +"\n" +"Special characters:\n" +" * dsusp CHAR CHAR will send a terminal stop signal once input flushed\n" +" eof CHAR CHAR will send an end of file (terminate the input)\n" +" eol CHAR CHAR will end the line\n" +msgstr "" + +#: src/stty.c:544 +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 "" + +#: src/stty.c:550 +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 "" + +#: src/stty.c:556 +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 "" + +#: src/stty.c:562 +msgid "" +"\n" +"Special settings:\n" +" N set the input and output speeds to N bauds\n" +" * cols N tell the kernel that the terminal has N columns\n" +" * columns N same as cols N\n" +msgstr "" + +#: src/stty.c:569 +msgid "" +" ispeed N set the input speed to N\n" +" * line N use line discipline N\n" +" min N with -icanon, set N characters minimum for a completed " +"read\n" +" ospeed N set the output speed to N\n" +msgstr "" + +#: src/stty.c:575 +msgid "" +" * rows N tell the kernel that the terminal has N rows\n" +" * size print the number of rows and columns according to the " +"kernel\n" +" speed print the terminal speed\n" +" time N with -icanon, set read timeout of N tenths of a second\n" +msgstr "" + +#: src/stty.c:581 +msgid "" +"\n" +"Control settings:\n" +" [-]clocal disable modem control signals\n" +" [-]cread allow input to be received\n" +" * [-]crtscts enable RTS/CTS handshaking\n" +" * [-]cdtrdsr enable DTR/DSR handshaking\n" +" csN set character size to N bits, N in [5..8]\n" +msgstr "" + +#: src/stty.c:590 +msgid "" +" [-]cstopb use two stop bits per character (one with '-')\n" +" [-]hup send a hangup signal when the last process closes the tty\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" +msgstr "" + +#: src/stty.c:597 +msgid "" +"\n" +"Input settings:\n" +" [-]brkint breaks cause an interrupt signal\n" +" [-]icrnl translate carriage return to newline\n" +" [-]ignbrk ignore break characters\n" +" [-]igncr ignore carriage return\n" +msgstr "" + +#: src/stty.c:605 +msgid "" +" [-]ignpar ignore characters with parity errors\n" +" * [-]imaxbel beep and do not flush a full input buffer on a character\n" +" [-]inlcr translate newline to carriage return\n" +" [-]inpck enable input parity checking\n" +" [-]istrip clear high (8th) bit of input characters\n" +msgstr "" + +#: src/stty.c:612 +msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" +msgstr "" + +#: src/stty.c:615 +msgid "" +" * [-]iuclc translate uppercase characters to lowercase\n" +" * [-]ixany let any character restart output, not only start character\n" +" [-]ixoff enable sending of start/stop characters\n" +" [-]ixon enable XON/XOFF flow control\n" +" [-]parmrk mark parity errors (with a 255-0-character sequence)\n" +" [-]tandem same as [-]ixoff\n" +msgstr "" + +#: src/stty.c:623 +msgid "" +"\n" +"Output settings:\n" +" * bsN backspace delay style, N in [0..1]\n" +" * crN carriage return delay style, N in [0..3]\n" +" * ffN form feed delay style, N in [0..1]\n" +" * nlN newline delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:631 +msgid "" +" * [-]ocrnl translate carriage return to newline\n" +" * [-]ofdel use delete characters for fill instead of null 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 +msgid "" +" * [-]onocr do not print carriage returns in the first column\n" +" [-]opost postprocess output\n" +" * tabN horizontal tab delay style, N in [0..3]\n" +" * tabs same as tab0\n" +" * -tabs same as tab3\n" +" * vtN vertical tab delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:647 +msgid "" +"\n" +"Local settings:\n" +" [-]crterase echo erase characters as backspace-space-backspace\n" +" * crtkill kill all line by obeying the echoprt and echoe settings\n" +" * -crtkill kill all line by obeying the echoctl and echok settings\n" +msgstr "" + +#: src/stty.c:654 +msgid "" +" * [-]ctlecho echo control characters in hat notation ('^c')\n" +" [-]echo echo input characters\n" +" * [-]echoctl same as [-]ctlecho\n" +" [-]echoe same as [-]crterase\n" +" [-]echok echo a newline after a kill character\n" +msgstr "" + +#: src/stty.c:661 +msgid "" +" * [-]echoke same as [-]crtkill\n" +" [-]echonl echo newline even if not echoing other characters\n" +" * [-]echoprt echo erased characters backward, between '\\' and '/'\n" +" [-]icanon enable erase, kill, werase, and rprnt special characters\n" +" [-]iexten enable non-POSIX special characters\n" +msgstr "" + +#: src/stty.c:668 +msgid "" +" [-]isig enable interrupt, quit, and suspend special characters\n" +" [-]noflsh disable flushing after interrupt and quit special " +"characters\n" +" * [-]prterase same as [-]echoprt\n" +" * [-]tostop stop background jobs that try to write to the terminal\n" +" * [-]xcase with icanon, escape with '\\' for uppercase characters\n" +msgstr "" + +#: src/stty.c:675 +msgid "" +"\n" +"Combination settings:\n" +" * [-]LCASE same as [-]lcase\n" +" cbreak same as -icanon\n" +" -cbreak same as icanon\n" +msgstr "" + +#: src/stty.c:682 +msgid "" +" cooked same as brkint ignpar istrip icrnl ixon opost isig\n" +" icanon, eof and eol characters to their default values\n" +" -cooked same as raw\n" +" crt same as echoe echoctl echoke\n" +msgstr "" + +#: src/stty.c:688 +msgid "" +" dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" +" kill ^u\n" +" * [-]decctlq same as [-]ixany\n" +" ek erase and kill characters to their default values\n" +" evenp same as parenb -parodd cs7\n" +msgstr "" + +#: src/stty.c:695 +msgid "" +" -evenp same as -parenb cs8\n" +" * [-]lcase same as xcase iuclc olcuc\n" +" litout same as -parenb -istrip -opost cs8\n" +" -litout same as parenb istrip opost cs7\n" +" nl same as -icrnl -onlcr\n" +" -nl same as icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" +msgstr "" + +#: src/stty.c:703 +msgid "" +" oddp same as parenb parodd cs7\n" +" -oddp same as -parenb cs8\n" +" [-]parity same as [-]evenp\n" +" pass8 same as -parenb -istrip cs8\n" +" -pass8 same as parenb istrip cs7\n" +msgstr "" + +#: src/stty.c:710 +msgid "" +" raw same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" +" -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n" +" -imaxbel -opost -isig -icanon -xcase min 1 time 0\n" +" -raw same as cooked\n" +msgstr "" + +#: src/stty.c:716 +msgid "" +" sane same as 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, all special\n" +" characters to their default values\n" +msgstr "" + +#: src/stty.c:724 +msgid "" +"\n" +"Handle the tty line connected to standard input. Without arguments,\n" +"prints baud rate, line discipline, and deviations from stty sane. In\n" +"settings, CHAR is taken literally, or coded as in ^c, 0x37, 0177 or\n" +"127; special values ^- or undef used to disable special characters.\n" +msgstr "" + +#: src/stty.c:796 +#, c-format +msgid "only one device may be specified" +msgstr "" + +#: src/stty.c:826 +#, c-format +msgid "" +"the options for verbose and stty-readable output styles are\n" +"mutually exclusive" +msgstr "" + +#: src/stty.c:832 +#, c-format +msgid "when specifying an output style, modes may not be set" +msgstr "" + +#: src/stty.c:847 +#, c-format +msgid "%s: couldn't reset non-blocking mode" +msgstr "" + +#: src/stty.c:892 src/stty.c:1002 +#, 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 +#, c-format +msgid "missing argument to %s" +msgstr "" + +#: src/stty.c:983 +#, c-format +msgid "invalid line discipline %s" +msgstr "" + +#: src/stty.c:1053 +#, c-format +msgid "%s: unable to perform all requested operations" +msgstr "" + +#: src/stty.c:1399 +#, c-format +msgid "%s: no size information for this device" +msgstr "" + +#: src/stty.c:1920 +#, c-format +msgid "invalid integer argument %s" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/sum.c:37 +msgid "Kayvan Aghaiepour" +msgstr "" + +#: src/sum.c:62 +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 "" + +#: src/sync.c:41 +msgid "" +"Force changed blocks to disk, update the super block.\n" +"\n" +msgstr "" + +#: src/sync.c:69 +#, c-format +msgid "ignoring all arguments" +msgstr "" + +#: src/system.h:343 +#, c-format +msgid "" +"\n" +"NOTE: your shell may have its own version of %s, which usually supersedes\n" +"the version described here. Please refer to your shell's documentation\n" +"for details about the options it supports.\n" +msgstr "" + +#: src/system.h:349 +msgid " --help display this help and exit\n" +msgstr "" + +#: src/system.h:351 +msgid " --version output version information and exit\n" +msgstr "" + +#: src/system.h:544 +msgid "" +"\n" +"Mandatory arguments to long options are mandatory for short options too.\n" +msgstr "" + +#: src/system.h:552 +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" +msgstr "" + +#: src/system.h:561 +#, c-format +msgid "" +"\n" +"Display values are in units of the first available SIZE from --block-size,\n" +"and the %s_BLOCK_SIZE, BLOCK_SIZE and BLOCKSIZE environment variables.\n" +"Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n" +msgstr "" + +#: src/system.h:571 +#, c-format +msgid "" +"\n" +"Report %s bugs to %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 +#, c-format +msgid "Report %s translation bugs to <http://translationproject.org/team/>\n" +msgstr "" + +#: src/system.h:589 +#, c-format +msgid "For complete documentation, run: info coreutils '%s invocation'\n" +msgstr "" + +#: src/system.h:596 +#, c-format +msgid "Try '%s --help' for more information.\n" +msgstr "" + +#: src/system.h:628 +#, c-format +msgid "" +"WARNING: Circular directory structure.\n" +"This almost certainly means that you have a corrupted file system.\n" +"NOTIFY YOUR SYSTEM MANAGER.\n" +"The following directory is part of the cycle:\n" +" %s\n" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/tac.c:58 +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 "" +"\n" +"Ako DATOTEKA nije navedena ili je „-”, čitaj standardni ulaz.\n" + +#: src/tac.c:144 +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 "" + +#: src/tac.c:234 src/tac.c:335 +#, c-format +msgid "%s: seek failed" +msgstr "" + +#: src/tac.c:263 +#, c-format +msgid "record too large" +msgstr "" + +#: src/tac.c:450 +#, c-format +msgid "failed to create temporary file in %s" +msgstr "" + +#: src/tac.c:458 +#, c-format +msgid "failed to open %s for writing" +msgstr "" + +#: src/tac.c:475 +#, c-format +msgid "failed to rewind stream for %s" +msgstr "" + +#: src/tac.c:511 src/tac.c:518 +#, c-format +msgid "%s: write error" +msgstr "" + +#: src/tac.c:571 +#, c-format +msgid "failed to open %s for reading" +msgstr "" + +#: src/tac.c:629 +#, c-format +msgid "separator cannot be empty" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/tail.c:71 +msgid "Ian Lance Taylor" +msgstr "" + +#: src/tail.c:262 +#, 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 "" + +#: 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" +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" +" -F same as --follow=name --retry\n" +msgstr "" + +#: src/tail.c:281 +#, 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" +" --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 "" + +#: src/tail.c:294 +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" +msgstr "" + +#: src/tail.c:301 +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" +" -v, --verbose always output headers giving file names\n" +msgstr "" + +#: src/tail.c:310 +msgid "" +"\n" +"If the first character of K (the number of bytes or lines) is a '+',\n" +"print beginning with the Kth item from the start of each file, otherwise,\n" +"print the last K items in the file. K 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" +"\n" +msgstr "" + +#: src/tail.c:319 +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. This default behavior is not desirable when you really want to\n" +"track the actual name of the file, not the file descriptor (e.g., log\n" +"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 "" + +#: src/tail.c:378 +#, 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 +#, c-format +msgid "%s: cannot seek to end-relative offset %s" +msgstr "" + +#: src/tail.c:894 +#, c-format +msgid "cannot determine location of %s. reverting to polling" +msgstr "" + +#: src/tail.c:906 +#, c-format +msgid "" +"unrecognized file system type 0x%08lx for %s. please report this to %s. " +"reverting to polling" +msgstr "" + +#: src/tail.c:963 +#, c-format +msgid "%s has become inaccessible" +msgstr "" + +#: src/tail.c:980 +#, c-format +msgid "%s has been replaced with an untailable file; giving up on this name" +msgstr "" + +#: src/tail.c:989 +#, c-format +msgid "%s has been replaced with a remote file. giving up on this name" +msgstr "" + +#: src/tail.c:1010 +#, c-format +msgid "%s has become accessible" +msgstr "" + +#: src/tail.c:1018 +#, c-format +msgid "%s has appeared; following end of new file" +msgstr "" + +#: src/tail.c:1029 +#, c-format +msgid "%s has been replaced; following end of new file" +msgstr "" + +#: src/tail.c:1130 +#, c-format +msgid "%s: cannot change nonblocking mode" +msgstr "" + +#: src/tail.c:1172 src/tail.c:1287 +#, c-format +msgid "%s: file truncated" +msgstr "" + +#: src/tail.c:1196 src/tail.c:1442 +#, c-format +msgid "no files remaining" +msgstr "" + +#: src/tail.c:1369 +#, c-format +msgid "cannot watch parent directory of %s" +msgstr "" + +#: src/tail.c:1372 src/tail.c:1387 +#, c-format +msgid "inotify resources exhausted" +msgstr "" + +#: src/tail.c:1390 src/tail.c:1519 +#, c-format +msgid "cannot watch %s" +msgstr "" + +#: src/tail.c:1473 +#, c-format +msgid "error monitoring inotify event" +msgstr "" + +#: src/tail.c:1493 +#, c-format +msgid "error reading inotify event" +msgstr "" + +#: src/tail.c:1786 +#, c-format +msgid "%s: cannot follow end of this type of file; giving up on this name" +msgstr "" + +#: src/tail.c:1903 +#, c-format +msgid "number in %s is too large" +msgstr "" + +#: src/tail.c:1975 +#, c-format +msgid "%s: invalid maximum number of unchanged stats between opens" +msgstr "" + +#: src/tail.c:1991 +#, c-format +msgid "%s: invalid PID" +msgstr "" + +#: src/tail.c:2010 +#, c-format +msgid "%s: invalid number of seconds" +msgstr "" + +#: src/tail.c:2026 +#, c-format +msgid "option used in invalid context -- %c" +msgstr "" + +#: src/tail.c:2034 +#, c-format +msgid "warning: --retry is useful mainly when following by name" +msgstr "" + +#: src/tail.c:2038 +#, c-format +msgid "warning: PID ignored; --pid=PID is useful only when following" +msgstr "" + +#: src/tail.c:2041 +#, c-format +msgid "warning: --pid=PID is not supported on this system" +msgstr "" + +#: src/tail.c:2142 +#, c-format +msgid "cannot follow %s by name" +msgstr "" + +#: src/tail.c:2148 +#, c-format +msgid "warning: following standard input indefinitely is ineffective" +msgstr "" + +#: src/tail.c:2209 +#, c-format +msgid "inotify cannot be used, reverting to polling" +msgstr "" + +#: src/tee.c:63 +msgid "" +"Copy standard input to each FILE, and also to standard output.\n" +"\n" +" -a, --append append to the given FILEs, do not overwrite\n" +" -i, --ignore-interrupts ignore interrupt signals\n" +msgstr "" + +#: src/tee.c:71 +msgid "" +"\n" +"If a FILE is -, copy again to standard output.\n" +msgstr "" + +#: src/test.c:123 +#, c-format +msgid "missing argument after %s" +msgstr "" + +#: src/test.c:159 +#, c-format +msgid "invalid integer %s" +msgstr "" + +#: src/test.c:241 +msgid "')' expected" +msgstr "" + +#: src/test.c:244 +#, c-format +msgid "')' expected, found %s" +msgstr "" + +#: src/test.c:260 src/test.c:618 +#, c-format +msgid "%s: unary operator expected" +msgstr "" + +#: src/test.c:329 +msgid "-nt does not accept -l" +msgstr "" + +#: src/test.c:342 +msgid "-ef does not accept -l" +msgstr "" + +#: src/test.c:358 +msgid "-ot does not accept -l" +msgstr "" + +#: src/test.c:367 +msgid "unknown binary operator" +msgstr "" + +#: src/test.c:646 +#, c-format +msgid "%s: binary operator expected" +msgstr "" + +#: src/test.c:704 +msgid "" +"Usage: test EXPRESSION\n" +" or: test\n" +" or: [ EXPRESSION ]\n" +" or: [ ]\n" +" or: [ OPTION\n" +msgstr "" + +#: src/test.c:711 +msgid "" +"Exit with the status determined by EXPRESSION.\n" +"\n" +msgstr "" + +#: src/test.c:717 +msgid "" +"\n" +"An omitted EXPRESSION defaults to false. Otherwise,\n" +"EXPRESSION is true or false and sets exit status. It is one of:\n" +msgstr "" + +#: src/test.c:722 +msgid "" +"\n" +" ( EXPRESSION ) EXPRESSION is true\n" +" ! EXPRESSION EXPRESSION is false\n" +" EXPRESSION1 -a EXPRESSION2 both EXPRESSION1 and EXPRESSION2 are true\n" +" EXPRESSION1 -o EXPRESSION2 either EXPRESSION1 or EXPRESSION2 is true\n" +msgstr "" + +#: src/test.c:729 +msgid "" +"\n" +" -n STRING the length of STRING is nonzero\n" +" STRING equivalent to -n STRING\n" +" -z STRING the length of STRING is zero\n" +" STRING1 = STRING2 the strings are equal\n" +" STRING1 != STRING2 the strings are not equal\n" +msgstr "" + +#: src/test.c:737 +msgid "" +"\n" +" INTEGER1 -eq INTEGER2 INTEGER1 is equal to INTEGER2\n" +" INTEGER1 -ge INTEGER2 INTEGER1 is greater than or equal to INTEGER2\n" +" INTEGER1 -gt INTEGER2 INTEGER1 is greater than INTEGER2\n" +" INTEGER1 -le INTEGER2 INTEGER1 is less than or equal to INTEGER2\n" +" INTEGER1 -lt INTEGER2 INTEGER1 is less than INTEGER2\n" +" INTEGER1 -ne INTEGER2 INTEGER1 is not equal to INTEGER2\n" +msgstr "" + +#: src/test.c:746 +msgid "" +"\n" +" FILE1 -ef FILE2 FILE1 and FILE2 have the same device and inode numbers\n" +" FILE1 -nt FILE2 FILE1 is newer (modification date) than FILE2\n" +" FILE1 -ot FILE2 FILE1 is older than FILE2\n" +msgstr "" + +#: src/test.c:752 +msgid "" +"\n" +" -b FILE FILE exists and is block special\n" +" -c FILE FILE exists and is character special\n" +" -d FILE FILE exists and is a directory\n" +" -e FILE FILE exists\n" +msgstr "" + +#: src/test.c:759 +msgid "" +" -f FILE FILE exists and is a regular file\n" +" -g FILE FILE exists and is set-group-ID\n" +" -G FILE FILE exists and is owned by the effective group ID\n" +" -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 "" + +#: src/test.c:766 +msgid "" +" -L FILE FILE exists and is a symbolic link (same as -h)\n" +" -O FILE FILE exists and is owned by the effective user ID\n" +" -p FILE FILE exists and is a named pipe\n" +" -r FILE FILE exists and read permission is granted\n" +" -s FILE FILE exists and has a size greater than zero\n" +msgstr "" + +#: src/test.c:773 +msgid "" +" -S FILE FILE exists and is a socket\n" +" -t FD file descriptor FD is opened on a terminal\n" +" -u FILE FILE exists and its set-user-ID bit is set\n" +" -w FILE FILE exists and write permission is granted\n" +" -x FILE FILE exists and execute (or search) permission is granted\n" +msgstr "" + +#: src/test.c:780 +msgid "" +"\n" +"Except for -h and -L, all FILE-related tests dereference symbolic links.\n" +"Beware that parentheses need to be escaped (e.g., by backslashes) for " +"shells.\n" +"INTEGER may also be -l STRING, which evaluates to the length of STRING.\n" +msgstr "" + +#: src/test.c:786 +msgid "" +"\n" +"NOTE: [ honors the --help and --version options, but test does not.\n" +"test treats each of those as it treats any other nonempty STRING.\n" +msgstr "" + +#: src/test.c:791 +msgid "test and/or [" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/test.c:803 +msgid "Kevin Braunsdorf" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/test.c:804 +msgid "Matthew Bradburn" +msgstr "" + +#: src/test.c:858 +msgid "missing ']'" +msgstr "" + +#: src/test.c:872 +#, c-format +msgid "extra argument %s" +msgstr "" + +#: src/timeout.c:112 +#, c-format +msgid "warning: sigprocmask" +msgstr "" + +#: src/timeout.c:145 +#, c-format +msgid "warning: timer_settime" +msgstr "" + +#: src/timeout.c:150 +#, c-format +msgid "warning: timer_create" +msgstr "" + +#: src/timeout.c:225 +#, c-format +msgid "" +"Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" +" or: %s [OPTION]\n" +msgstr "" + +#: src/timeout.c:229 +msgid "Start COMMAND, and kill it if still running after DURATION.\n" +msgstr "" + +#: src/timeout.c:235 +msgid "" +" --preserve-status\n" +" exit with the same status as COMMAND, even when the\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" +" -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" +" -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" +msgstr "" + +#: src/timeout.c:254 +msgid "" +"\n" +"DURATION is a floating point number with an optional suffix:\n" +"'s' for seconds (the default), 'm' for minutes, 'h' for hours or 'd' for " +"days.\n" +msgstr "" + +#: src/timeout.c:259 +msgid "" +"\n" +"If the command times out, and --preserve-status is not set, then exit with\n" +"status 124. Otherwise, exit with the status of COMMAND. If no signal\n" +"is specified, send the TERM signal upon timeout. The TERM signal kills\n" +"any process that does not block or catch that signal. It may be necessary\n" +"to use the KILL (9) signal, since this signal cannot be caught, in which\n" +"case the exit status is 128+9 rather than 124.\n" +msgstr "" + +#: src/timeout.c:363 +#, c-format +msgid "warning: disabling core dumps failed" +msgstr "" + +#: src/timeout.c:471 +#, c-format +msgid "error waiting for command" +msgstr "" + +#: src/timeout.c:482 +#, c-format +msgid "the monitored command dumped core" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/touch.c:43 +msgid "Jim Kingdon" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/touch.c:45 +msgid "Randy Smith" +msgstr "" + +#: src/touch.c:115 src/touch.c:309 +#, c-format +msgid "invalid date format %s" +msgstr "" + +#: src/touch.c:191 +#, c-format +msgid "cannot touch %s" +msgstr "" + +#: src/touch.c:197 +#, c-format +msgid "setting times of %s" +msgstr "" + +#: src/touch.c:213 +msgid "" +"Update the access and modification times of each FILE to the current time.\n" +"\n" +"A FILE argument that does not exist is created empty, unless -c or -h\n" +"is supplied.\n" +"\n" +"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 "" + +#: src/touch.c:225 +msgid "" +" -a change only the access time\n" +" -c, --no-create do not create any files\n" +" -d, --date=STRING parse STRING and use it instead of current time\n" +" -f (ignored)\n" +msgstr "" + +#: src/touch.c:231 +msgid "" +" -h, --no-dereference affect each symbolic link instead of any " +"referenced\n" +" file (useful only on systems that can change the\n" +" timestamps of a symlink)\n" +" -m change only the modification time\n" +msgstr "" + +#: src/touch.c:237 +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" +" --time=WORD change the specified time:\n" +" WORD is access, atime, or use: equivalent to -a\n" +" WORD is modify or mtime: equivalent to -m\n" +msgstr "" + +#: src/touch.c:246 +msgid "" +"\n" +"Note that the -d and -t options accept different time-date formats.\n" +msgstr "" + +#: src/touch.c:335 +#, c-format +msgid "cannot specify times from more than one source" +msgstr "" + +#: src/touch.c:409 +#, c-format +msgid "" +"warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'" +msgstr "" + +#: src/tr.c:286 +#, c-format +msgid "Usage: %s [OPTION]... SET1 [SET2]\n" +msgstr "" + +#: src/tr.c:290 +msgid "" +"Translate, squeeze, and/or delete characters from standard input,\n" +"writing to standard output.\n" +"\n" +" -c, -C, --complement use the complement of SET1\n" +" -d, --delete delete characters in SET1, do not translate\n" +" -s, --squeeze-repeats replace each input sequence of a repeated " +"character\n" +" that is listed in SET1 with a single occurrence\n" +" of that character\n" +" -t, --truncate-set1 first truncate SET1 to length of SET2\n" +msgstr "" + +#: src/tr.c:303 +msgid "" +"\n" +"SETs are specified as strings of characters. Most represent themselves.\n" +"Interpreted sequences are:\n" +"\n" +" \\NNN character with octal value NNN (1 to 3 octal digits)\n" +" \\\\ backslash\n" +" \\a audible BEL\n" +" \\b backspace\n" +" \\f form feed\n" +" \\n new line\n" +" \\r return\n" +" \\t horizontal tab\n" +msgstr "" + +#: src/tr.c:317 +msgid "" +" \\v vertical tab\n" +" CHAR1-CHAR2 all characters from CHAR1 to CHAR2 in ascending order\n" +" [CHAR*] in SET2, copies of CHAR until length of SET1\n" +" [CHAR*REPEAT] REPEAT copies of CHAR, REPEAT octal if starting with 0\n" +" [:alnum:] all letters and digits\n" +" [:alpha:] all letters\n" +" [:blank:] all horizontal whitespace\n" +" [:cntrl:] all control characters\n" +" [:digit:] all digits\n" +msgstr "" + +#: src/tr.c:328 +msgid "" +" [:graph:] all printable characters, not including space\n" +" [:lower:] all lower case letters\n" +" [:print:] all printable characters, including space\n" +" [:punct:] all punctuation characters\n" +" [:space:] all horizontal or vertical whitespace\n" +" [:upper:] all upper case letters\n" +" [:xdigit:] all hexadecimal digits\n" +" [=CHAR=] all characters which are equivalent to CHAR\n" +msgstr "" + +#: src/tr.c:338 +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. 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. -s uses SET1 if not\n" +"translating nor deleting; else squeezing uses SET2 and occurs after\n" +"translation or deletion.\n" +msgstr "" + +#: src/tr.c:509 +#, 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 "" + +#: src/tr.c:518 +#, c-format +msgid "warning: an unescaped backslash at end of string is not portable" +msgstr "" + +#: src/tr.c:673 +#, c-format +msgid "range-endpoints of '%s-%s' are in reverse collating sequence order" +msgstr "" + +#: src/tr.c:829 +#, c-format +msgid "invalid repeat count %s in [c*n] construct" +msgstr "" + +#: src/tr.c:910 +#, c-format +msgid "missing character class name '[::]'" +msgstr "" + +#: src/tr.c:913 +#, c-format +msgid "missing equivalence class character '[==]'" +msgstr "" + +#: src/tr.c:928 +#, c-format +msgid "invalid character class %s" +msgstr "" + +#: src/tr.c:947 +#, c-format +msgid "%s: equivalence class operand must be a single character" +msgstr "" + +#: src/tr.c:1229 +#, c-format +msgid "misaligned [:upper:] and/or [:lower:] construct" +msgstr "" + +#: src/tr.c:1335 +#, c-format +msgid "too many characters in set" +msgstr "" + +#: src/tr.c:1420 +#, c-format +msgid "" +"when translating with string1 longer than string2,\n" +"the latter string must not end with a character class" +msgstr "" + +#: src/tr.c:1480 +#, c-format +msgid "the [c*] repeat construct may not appear in string1" +msgstr "" + +#: src/tr.c:1490 +#, c-format +msgid "only one [c*] repeat construct may appear in string2" +msgstr "" + +#: src/tr.c:1498 +#, c-format +msgid "[=c=] expressions may not appear in string2 when translating" +msgstr "" + +#: src/tr.c:1505 +#, c-format +msgid "" +"when translating, the only character classes that may appear in\n" +"string2 are 'upper' and 'lower'" +msgstr "" + +#: src/tr.c:1520 +#, c-format +msgid "when not truncating set1, string2 must be non-empty" +msgstr "" + +#: src/tr.c:1529 +#, c-format +msgid "" +"when translating with complemented character classes,\n" +"string2 must map all characters in the domain to one" +msgstr "" + +#: src/tr.c:1538 +#, c-format +msgid "the [c*] construct may appear in string2 only when translating" +msgstr "" + +#: src/tr.c:1788 +msgid "Two strings must be given when both deleting and squeezing repeats." +msgstr "" + +#: src/tr.c:1790 +msgid "Two strings must be given when translating." +msgstr "" + +#: src/tr.c:1800 +msgid "Only one string may be given when deleting without squeezing repeats." +msgstr "" + +#: src/true.c:38 +#, c-format +msgid "" +"Usage: %s [ignored command line arguments]\n" +" or: %s OPTION\n" +msgstr "" + +#: src/true.c:45 +msgid "Exit with a status code indicating success." +msgstr "" + +#: src/true.c:46 +msgid "Exit with a status code indicating failure." +msgstr "" + +#: src/truncate.c:96 +#, c-format +msgid "Usage: %s OPTION... FILE...\n" +msgstr "" + +#: src/truncate.c:97 +msgid "" +"Shrink or extend the size of each FILE to the specified size\n" +"\n" +"A FILE argument that does not exist is created.\n" +"\n" +"If a FILE is larger than the specified size, the extra data is lost.\n" +"If a FILE is shorter, it is extended and the extended part (hole)\n" +"reads as zero bytes.\n" +msgstr "" + +#: src/truncate.c:109 +msgid " -c, --no-create do not create any files\n" +msgstr "" + +#: src/truncate.c:112 +msgid "" +" -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" +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" +msgstr "" + +#: src/truncate.c:121 +msgid "" +"\n" +"SIZE may also be prefixed by one of the following modifying characters:\n" +"'+' extend by, '-' reduce by, '<' at most, '>' at least,\n" +"'/' round down to multiple of, '%' round up to multiple of.\n" +msgstr "" + +#: src/truncate.c:149 +#, c-format +msgid "overflow in %<PRIdMAX> * %<PRIdMAX> byte blocks for file %s" +msgstr "" + +#: src/truncate.c:173 +#, c-format +msgid "%s has unusable, apparently negative size" +msgstr "" + +#: src/truncate.c:183 src/truncate.c:384 +#, c-format +msgid "cannot get the size of %s" +msgstr "" + +#: src/truncate.c:205 +#, c-format +msgid "overflow rounding up size of file %s" +msgstr "" + +#: src/truncate.c:215 +#, c-format +msgid "overflow extending size of file %s" +msgstr "" + +#: src/truncate.c:230 +#, c-format +msgid "failed to truncate %s at %<PRIdMAX> bytes" +msgstr "" + +#: src/truncate.c:303 +#, c-format +msgid "multiple relative modifiers specified" +msgstr "" + +#: src/truncate.c:333 +#, c-format +msgid "you must specify either %s or %s" +msgstr "" + +#: src/truncate.c:340 +#, c-format +msgid "you must specify a relative %s with %s" +msgstr "" + +#: src/truncate.c:347 +#, c-format +msgid "%s was specified but %s was not" +msgstr "" + +#: src/truncate.c:404 +#, c-format +msgid "cannot open %s for writing" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/tsort.c:40 +msgid "Mark Kettenis" +msgstr "" + +#: src/tsort.c:82 +#, c-format +msgid "" +"Usage: %s [OPTION] [FILE]\n" +"Write totally ordered list consistent with the partial ordering in FILE.\n" +"With no FILE, or when FILE is -, read standard input.\n" +"\n" +msgstr "" + +#: src/tsort.c:472 +#, c-format +msgid "%s: input contains an odd number of tokens" +msgstr "" + +#: src/tsort.c:518 +#, c-format +msgid "%s: input contains a loop:" +msgstr "" + +#: src/tty.c:65 +msgid "" +"Print the file name of the terminal connected to standard input.\n" +"\n" +" -s, --silent, --quiet print nothing, only return an exit status\n" +msgstr "" + +#: src/tty.c:120 +msgid "not a tty" +msgstr "" + +#: src/uname.c:124 +msgid "" +"Print certain system information. With no OPTION, same as -s.\n" +"\n" +" -a, --all print all information, in the following order,\n" +" except omit -p and -i if unknown:\n" +" -s, --kernel-name print the kernel name\n" +" -n, --nodename print the network node hostname\n" +" -r, --kernel-release print the kernel release\n" +msgstr "" + +#: src/uname.c:133 +msgid "" +" -v, --kernel-version print the kernel version\n" +" -m, --machine print the machine hardware name\n" +" -p, --processor print the processor type or \"unknown\"\n" +" -i, --hardware-platform print the hardware platform or \"unknown\"\n" +" -o, --operating-system print the operating system\n" +msgstr "" + +#: src/uname.c:143 +msgid "" +"Print machine architecture.\n" +"\n" +msgstr "" + +#: src/uname.c:286 +#, c-format +msgid "cannot get system name" +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 "" +"\n" +"Ako DATOTEKA nije navedena ili je „-”, čitaj standardni ulaz.\n" + +#: src/unexpand.c:124 +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 "" + +#: src/unexpand.c:152 +#, c-format +msgid "tabs are too far apart" +msgstr "" + +#: src/unexpand.c:504 +#, c-format +msgid "tab stop value is too large" +msgstr "" + +#: src/uniq.c:134 +#, c-format +msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n" +msgstr "" + +#: src/uniq.c:138 +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 "" + +#: src/uniq.c:147 +msgid "" +" -c, --count prefix lines by the number of occurrences\n" +" -d, --repeated only print duplicate lines\n" +msgstr "" + +#: src/uniq.c:151 +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 +msgid " -w, --check-chars=N compare no more than N characters in lines\n" +msgstr "" + +#: src/uniq.c:166 +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 +msgid "" +"\n" +"Note: 'uniq' does not detect repeated lines unless they are adjacent.\n" +"You may want to sort the input first, or use 'sort -u' without 'uniq'.\n" +"Also, comparisons honor the rules specified by 'LC_COLLATE'.\n" +msgstr "" + +#: src/uniq.c:358 +#, c-format +msgid "too many repeated lines" +msgstr "" + +#: src/uniq.c:521 +msgid "invalid number of fields to skip" +msgstr "" + +#: src/uniq.c:530 +msgid "invalid number of bytes to skip" +msgstr "" + +#: src/uniq.c:539 +msgid "invalid number of bytes to compare" +msgstr "" + +#: src/uniq.c:558 +#, c-format +msgid "printing all duplicated lines and repeat counts is meaningless" +msgstr "" + +#: src/unlink.c:45 +#, c-format +msgid "" +"Usage: %s FILE\n" +" or: %s OPTION\n" +msgstr "" + +#: src/unlink.c:48 +msgid "" +"Call the unlink function to remove the specified FILE.\n" +"\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" +msgstr "" + +#. TRANSLATORS: This prints the current clock time. +#: src/uptime.c:136 +msgid " %H:%M%P " +msgstr "" + +#: src/uptime.c:138 +#, c-format +msgid " ??:???? " +msgstr "" + +#: src/uptime.c:140 +#, c-format +msgid "up ???? days ??:??, " +msgstr "" + +#: src/uptime.c:144 +#, c-format +msgid "up %ld day %2d:%02d, " +msgid_plural "up %ld days %2d:%02d, " +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: src/uptime.c:149 +#, c-format +msgid "up %2d:%02d, " +msgstr "" + +#: src/uptime.c:151 +#, c-format +msgid "%lu user" +msgid_plural "%lu users" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: src/uptime.c:161 +#, c-format +msgid ", load average: %.2f" +msgstr "" + +#: src/uptime.c:197 +#, 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 "" + +#: src/uptime.c:206 +#, c-format +msgid "" +" Processes in\n" +"an uninterruptible sleep state also contribute to the load average.\n" +msgstr "" + +#: src/uptime.c:210 +#, c-format +msgid "\n" +msgstr "" + +#: src/uptime.c:212 +#, c-format +msgid "" +"If FILE is not specified, use %s. %s as FILE is common.\n" +"\n" +msgstr "" + +#: src/users.c:106 +#, c-format +msgid "" +"Output who is currently logged in according to FILE.\n" +"If FILE is not specified, use %s. %s as FILE is common.\n" +"\n" +msgstr "" + +#: src/wc.c:117 +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" +"read standard input. A word is a non-zero-length sequence of characters\n" +"delimited by white space.\n" +"The options below may be used to select which counts are printed, always in\n" +"the following order: newline, word, character, byte, maximum line length.\n" +" -c, --bytes print the byte counts\n" +" -m, --chars print the character counts\n" +" -l, --lines print the newline counts\n" +msgstr "" + +#: src/wc.c:128 +msgid "" +" --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" +" -L, --max-line-length print the length of the longest line\n" +" -w, --words print the word counts\n" +msgstr "" + +#: src/who.c:210 +msgid " old " +msgstr "" + +#: src/who.c:440 +msgid "system boot" +msgstr "" + +#: src/who.c:447 src/who.c:449 +msgid "id=" +msgstr "" + +#: src/who.c:462 src/who.c:467 +msgid "term=" +msgstr "" + +#: src/who.c:464 src/who.c:468 +msgid "exit=" +msgstr "" + +#: src/who.c:485 +msgid "LOGIN" +msgstr "" + +#: src/who.c:505 +msgid "clock change" +msgstr "" + +#: src/who.c:517 src/who.c:518 +msgid "run-level" +msgstr "" + +#: src/who.c:521 src/who.c:522 +msgid "last=" +msgstr "" + +#: src/who.c:553 +#, c-format +msgid "" +"\n" +"# users=%lu\n" +msgstr "" + +#: src/who.c:559 +msgid "NAME" +msgstr "" + +#: src/who.c:559 +msgid "LINE" +msgstr "" + +#: src/who.c:559 +msgid "TIME" +msgstr "" + +#: src/who.c:559 +msgid "IDLE" +msgstr "" + +#: src/who.c:560 +msgid "PID" +msgstr "" + +#: src/who.c:560 +msgid "COMMENT" +msgstr "" + +#: src/who.c:560 +msgid "EXIT" +msgstr "" + +#: src/who.c:640 +#, c-format +msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n" +msgstr "" + +#: src/who.c:641 +msgid "Print information about users who are currently logged in.\n" +msgstr "" + +#: src/who.c:644 +msgid "" +"\n" +" -a, --all same as -b -d --login -p -r -t -T -u\n" +" -b, --boot time of last system boot\n" +" -d, --dead print dead processes\n" +" -H, --heading print line of column headings\n" +msgstr "" + +#: src/who.c:651 +msgid " -l, --login print system login processes\n" +msgstr "" + +#: src/who.c:654 +msgid "" +" --lookup attempt to canonicalize hostnames via DNS\n" +" -m only hostname and user associated with stdin\n" +" -p, --process print active processes spawned by init\n" +msgstr "" + +#: src/who.c:659 +msgid "" +" -q, --count all login names and number of users logged on\n" +" -r, --runlevel print current runlevel\n" +" -s, --short print only name, line, and time (default)\n" +" -t, --time print last system clock change\n" +msgstr "" + +#: src/who.c:665 +msgid "" +" -T, -w, --mesg add user's message status as +, - or ?\n" +" -u, --users list users logged in\n" +" --message same as -T\n" +" --writable same as -T\n" +msgstr "" + +#: src/who.c:673 +#, 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 "" + +#: src/whoami.c:45 +msgid "" +"Print the user name associated with the current effective user ID.\n" +"Same as id -un.\n" +"\n" +msgstr "" + +#: src/whoami.c:91 +#, c-format +msgid "%s: cannot find name for user ID %lu\n" +msgstr "" + +#: src/yes.c:41 +#, c-format +msgid "" +"Usage: %s [STRING]...\n" +" or: %s OPTION\n" +msgstr "" + +#: src/yes.c:47 +msgid "" +"Repeatedly output a line with all specified STRING(s), or 'y'.\n" +"\n" +msgstr "" diff --git a/po/hu.gmo b/po/hu.gmo index 7a9ccb2c..ab1d6fc7 100644 Binary files a/po/hu.gmo and b/po/hu.gmo differ diff --git a/po/hu.po b/po/hu.po index 94b5b1f5..7978736f 100644 --- a/po/hu.po +++ b/po/hu.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: coreutils 8.15\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2012-05-10 19:35+0200\n" +"POT-Creation-Date: 2013-02-14 15:56+0000\n" "PO-Revision-Date: 2012-01-22 02:58+0100\n" "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n" "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n" @@ -38,19 +38,19 @@ 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:109 src/base64.c:121 src/base64.c:127 -#: src/base64.c:168 src/base64.c:224 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:330 src/expand.c:355 src/head.c:298 -#: src/head.c:348 src/head.c:756 src/head.c:797 src/mktemp.c:350 src/od.c:919 -#: src/paste.c:160 src/shuf.c:369 src/split.c:727 src/split.c:964 -#: src/split.c:969 src/tail.c:350 src/tail.c:1201 src/tail.c:1307 +#: 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 -#: src/unexpand.c:427 src/unexpand.c:443 +#: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "íráshiba" -#: lib/copy-acl.c:611 src/copy.c:1160 src/copy.c:2602 +#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617 #, c-format msgid "preserving permissions for %s" msgstr "%s jogosultságainak megtartása" @@ -242,18 +242,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:483 +#: lib/mkdir-p.c:196 src/install.c:484 #, c-format msgid "cannot change permissions of %s" msgstr "nem lehet %s jogosultságait megváltoztatni" -#: lib/mkdir-p.c:206 src/copy.c:2261 src/install.c:709 src/install.c:722 +#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722 #, 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:915 src/tac.c:435 +#: src/split.c:929 src/tac.c:434 #, c-format msgid "memory exhausted" msgstr "elfogyott a memória" @@ -302,75 +302,75 @@ msgstr "”" msgid "%s: end of file" msgstr "%s: fájl vége" -#: lib/regcomp.c:130 +#: lib/regcomp.c:131 msgid "Success" msgstr "Sikerült" -#: lib/regcomp.c:133 +#: lib/regcomp.c:134 msgid "No match" msgstr "Nincs találat" -#: lib/regcomp.c:136 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "Érvénytelen szabályos kifejezés" -#: lib/regcomp.c:139 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "Érvénytelen leválogatási karakter" -#: lib/regcomp.c:142 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "érvénytelen karakterosztálynév" -#: lib/regcomp.c:145 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "Záró visszaper" -#: lib/regcomp.c:148 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "Érvénytelen visszahivatkozás" -#: lib/regcomp.c:151 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "Pár nélküli [ vagy [^" -#: lib/regcomp.c:154 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "Pár nélküli ( vagy \\(" -#: lib/regcomp.c:157 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "Pár nélküli \\{" -#: lib/regcomp.c:160 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "A \\{\\} tartalma érvénytelen" -#: lib/regcomp.c:163 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "Érvénytelen tartományvég" -#: lib/regcomp.c:166 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Elfogyott a memória" -#: lib/regcomp.c:169 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "Érvénytelen megelőző szabályos kifejezés" -#: lib/regcomp.c:172 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "A szabályos kifejezés túl korán véget ért" -#: lib/regcomp.c:175 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "A szabályos kifejezés túl nagy" -#: lib/regcomp.c:178 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "Pár nélküli ) vagy \\)" -#: lib/regcomp.c:703 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "Nincs megelőző szabályos kifejezés" @@ -411,7 +411,7 @@ msgstr "^[iIyY]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-mode-acl.c:695 src/copy.c:2284 src/cp.c:518 +#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516 #, c-format msgid "setting permissions for %s" msgstr "%s jogosultságainak beállítása" @@ -552,13 +552,13 @@ msgstr "Tápfeszültség-kimaradás" msgid "Resource lost" msgstr "Erőforrás elveszítve" -#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262 -#: lib/spawn-pipe.c:265 +#: 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:232 lib/spawn-pipe.c:346 lib/wait-process.c:282 +#: 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" @@ -574,24 +574,24 @@ msgstr "Valós idejű szignál %d" msgid "Unknown signal %d" msgstr "Ismeretlen szignál %d" -#: lib/unicodeio.c:103 +#: lib/unicodeio.c:102 msgid "iconv function not usable" msgstr "az iconv függvény nem használható" -#: lib/unicodeio.c:105 +#: lib/unicodeio.c:104 msgid "iconv function not available" msgstr "az iconv függvény nem érhető el" -#: lib/unicodeio.c:112 +#: lib/unicodeio.c:111 msgid "character out of range" msgstr "tartományon kívüli karakter" -#: lib/unicodeio.c:182 +#: lib/unicodeio.c:181 #, c-format msgid "cannot convert U+%04X to local character set" msgstr "nem lehet helyi karakterkészletbe átalakítani a következőt: U+%04X" -#: lib/unicodeio.c:184 +#: lib/unicodeio.c:183 #, c-format msgid "cannot convert U+%04X to local character set: %s" msgstr "nem lehet a(z) U+%04X-t helyi karakterkészletbe átalakítani: %s" @@ -772,7 +772,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:562 +#: lib/version-etc.c:251 src/system.h:573 #, c-format msgid "%s home page: <%s>\n" msgstr "A(z) %s honlapja: <%s>\n" @@ -782,7 +782,7 @@ 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:563 +#: lib/version-etc.c:256 src/system.h:574 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/" @@ -871,18 +871,17 @@ msgid "Simon Josefsson" msgstr "Simon Josefsson" #: src/base64.c:60 -#, c-format +#, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" "Base64 encode or decode FILE, or standard input, to standard output.\n" -"\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" -#: src/base64.c:64 +#: src/base64.c:67 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -898,7 +897,7 @@ msgstr "" " (alapértelmezésben 76). A 0 kikapcsolja a törést\n" "\n" -#: src/base64.c:73 src/cat.c:110 src/fmt.c:293 src/shuf.c:71 src/sum.c:70 +#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -906,7 +905,7 @@ msgstr "" "\n" "Ha a FÁJL nincs megadva, vagy -, akkor a szabványos bemenetet olvassa.\n" -#: src/base64.c:76 +#: src/base64.c:79 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -923,37 +922,37 @@ msgstr "" "az\n" "ábécében nem szereplő karakterekből.\n" -#: src/base64.c:171 src/base64.c:208 src/csplit.c:263 src/csplit.c:1435 -#: src/join.c:451 src/shuf.c:157 src/shuf.c:361 src/tac-pipe.c:74 +#: 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 #, c-format msgid "read error" msgstr "olvasási hiba" -#: src/base64.c:227 +#: src/base64.c:230 #, c-format msgid "invalid input" msgstr "érvénytelen bemenet" -#: src/base64.c:264 +#: src/base64.c:267 #, c-format msgid "invalid wrap size: %s" msgstr "érvénytelen sortörésméret: %s" -#: src/base64.c:283 src/basename.c:173 src/comm.c:435 src/cp.c:607 -#: src/date.c:441 src/dircolors.c:447 src/du.c:894 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:169 src/install.c:929 src/join.c:961 -#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:157 src/mv.c:447 -#: src/od.c:1802 src/ptx.c:2081 src/readlink.c:154 src/seq.c:408 -#: src/shuf.c:320 src/shuf.c:339 src/sort.c:4477 src/split.c:1313 -#: src/tr.c:1797 src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:454 -#: src/uniq.c:471 src/unlink.c:81 src/uptime.c:250 src/users.c:146 -#: src/wc.c:666 src/who.c:836 src/whoami.c:79 +#: 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 #, c-format msgid "extra operand %s" msgstr "extra operandus: „%s”" -#: src/base64.c:315 src/cat.c:781 +#: src/base64.c:318 src/cat.c:781 #, c-format msgid "closing standard input" msgstr "a szabványos bemenet lezárása" @@ -961,15 +960,15 @@ 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/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:53 src/env.c:33 +#: 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/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:65 src/su.c:88 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 +#: 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 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -983,23 +982,23 @@ msgstr "" " vagy: %s KAPCSOLÓ\n" #: src/basename.c:53 +#, fuzzy msgid "" "Print NAME with any leading directory components removed.\n" "If specified, also remove a trailing SUFFIX.\n" -"\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:59 +#: 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" msgstr "" -#: src/basename.c:66 +#: src/basename.c:67 #, c-format msgid "" "\n" @@ -1010,20 +1009,21 @@ msgid "" " %s -a any/str1 any/str2 -> \"str1\" followed by \"str2\"\n" msgstr "" -#: src/basename.c:167 src/chcon.c:531 src/chgrp.c:277 src/chmod.c:526 -#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1369 +#: 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:183 src/mkfifo.c:108 src/mknod.c:146 src/nohup.c:111 -#: src/pathchk.c:148 src/printf.c:674 src/readlink.c:146 src/realpath.c:236 -#: src/rm.c:314 src/rmdir.c:223 src/seq.c:402 src/setuidgid.c:137 -#: src/sleep.c:119 src/stat.c:1476 src/stdbuf.c:346 src/tr.c:1782 +#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 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 #, 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:52 src/split.c:49 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/split.c:49 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" @@ -1033,8 +1033,8 @@ msgstr "Torbjorn Granlund" msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:846 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4720 src/nl.c:182 src/paste.c:435 src/pr.c:2768 src/sum.c:58 +#: 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/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 +1092,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:2209 src/sort.c:379 src/tee.c:165 src/yes.c:86 +#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86 #, c-format msgid "standard output" msgstr "szabványos kimenet" @@ -1109,14 +1109,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:55 src/head.c:46 src/hostid.c:33 +#: 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 msgid "Jim Meyering" msgstr "Jim Meyering" -#: src/chcon.c:100 src/runcon.c:203 src/runcon.c:234 +#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238 #, c-format msgid "failed to create security context: %s" msgstr "a biztonsági kontextus létrehozása meghiúsult: %s" @@ -1128,8 +1128,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:540 src/copy.c:2222 src/runcon.c:217 -#: src/stat.c:683 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221 +#: src/stat.c:702 #, c-format msgid "failed to get security context of %s" msgstr "%s biztonsági kontextusának lekérése meghiúsult" @@ -1145,12 +1145,12 @@ 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:446 src/ls.c:2981 +#: src/du.c:457 src/ls.c:2981 #, 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:426 +#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437 #, c-format msgid "cannot read directory %s" msgstr "a következő könyvtár nem olvasható: %s" @@ -1160,13 +1160,13 @@ 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:599 +#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562 #, 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:618 -#: src/remove.c:613 +#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642 +#: src/remove.c:576 #, c-format msgid "fts_close failed" msgstr "a fts_close hívás meghiúsult" @@ -1184,18 +1184,18 @@ 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" "With --reference, change the security context of each FILE to that of " "RFILE.\n" -"\n" msgstr "" "Megváltoztatja mindegyik FÁJL 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:362 src/chgrp.c:123 src/chown.c:94 +#: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94 msgid "" " --dereference affect the referent of each symbolic link (this is\n" " the default), rather than the symbolic link itself\n" @@ -1208,7 +1208,7 @@ msgstr "" "linket\n" " -h, --no-dereference a szimbolikus linket érinti, és nem a fájlt\n" -#: src/chcon.c:367 +#: src/chcon.c:369 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" @@ -1225,7 +1225,18 @@ 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:373 +#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110 +#, fuzzy +msgid "" +" --no-preserve-root do not treat '/' specially (the default)\n" +" --preserve-root fail to operate recursively on '/'\n" +msgstr "" +" --no-preserve-root a „/”-t ne kezelje speciálisan " +"(alapértelmezett)\n" +" --preserve-root a rekurzív működés visszautasítása a „/” " +"könyvtáron\n" + +#: src/chcon.c:379 msgid "" " --reference=RFILE use RFILE's security context rather than " "specifying\n" @@ -1234,18 +1245,18 @@ msgstr "" " --reference=RFÁJL a megadott RFÁJL biztonsági kontextusát használja\n" " egy KONTEXTUS érték megadása helyett\n" -#: src/chcon.c:377 src/chgrp.c:140 src/chown.c:118 +#: 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 rekurzívan működik a fájlokon és könyvtárakon\n" -#: src/chcon.c:380 +#: src/chcon.c:386 msgid " -v, --verbose output a diagnostic for every file processed\n" msgstr "" " -v, --verbose minden feldolgozott fájl után diagnosztikai\n" " üzenetet ír ki\n" -#: src/chcon.c:383 src/chgrp.c:143 src/chown.c:121 +#: src/chcon.c:389 src/chgrp.c:143 src/chown.c:121 msgid "" "\n" "The following options modify how a hierarchy is traversed when the -R\n" @@ -1271,36 +1282,36 @@ msgstr "" " (alapértelmezett)\n" "\n" -#: src/chcon.c:512 src/chgrp.c:264 src/chown.c:267 +#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267 #, 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:518 +#: src/chcon.c:524 #, c-format msgid "-R -h requires -P" msgstr "a -R -h megköveteli a -P használatát" -#: src/chcon.c:533 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282 -#: src/comm.c:429 src/csplit.c:1371 src/join.c:1149 src/link.c:79 -#: src/mknod.c:148 src/setuidgid.c:139 src/tr.c:1785 +#: 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 #, c-format msgid "missing operand after %s" msgstr "a(z) „%s” operandusa hiányzik" -#: src/chcon.c:556 src/runcon.c:247 +#: src/chcon.c:562 src/runcon.c:251 #, c-format msgid "invalid context: %s" msgstr "érvénytelen kontextus: %s" -#: src/chcon.c:563 +#: src/chcon.c:569 #, c-format msgid "conflicting security context specifiers given" msgstr "ütköző biztonságikontextus-meghatározót adott meg" -#: src/chcon.c:572 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:433 src/cp.c:493 -#: src/mv.c:96 src/pwd.c:273 src/rm.c:324 src/touch.c:351 +#: 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 #, c-format msgid "failed to get attributes of %s" msgstr "%s attribútumainak beolvasása sikertelen" @@ -1351,17 +1362,6 @@ msgstr "" "szimbolikus\n" " link tulajdonosa módosítható)\n" -#: src/chgrp.c:132 src/chmod.c:387 src/chown.c:110 -#, fuzzy -msgid "" -" --no-preserve-root do not treat '/' specially (the default)\n" -" --preserve-root fail to operate recursively on '/'\n" -msgstr "" -" --no-preserve-root a „/”-t ne kezelje speciálisan " -"(alapértelmezett)\n" -" --preserve-root a rekurzív működés visszautasítása a „/” " -"könyvtáron\n" - #: src/chgrp.c:136 msgid "" " --reference=RFILE use RFILE's group rather than specifying a\n" @@ -1634,7 +1634,7 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:97 src/install.c:575 src/setuidgid.c:110 src/setuidgid.c:120 +#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120 #, c-format msgid "invalid group %s" msgstr "érvénytelen csoport: %s" @@ -1706,8 +1706,8 @@ msgstr "a csoportazonosító beállítása meghiúsult" 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:213 src/stdbuf.c:366 -#: src/timeout.c:402 +#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365 +#: src/timeout.c:454 #, c-format msgid "failed to run command %s" msgstr "a(z) %s parancs futtatása meghiúsult" @@ -1828,20 +1828,24 @@ 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:1609 src/dd.c:1976 +#: 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 #, c-format -msgid "reading %s" -msgstr "%s olvasása" +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:426 +#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425 #, c-format msgid "cannot lseek %s" msgstr "lseek %s sikertelen" -#: src/copy.c:206 src/dd.c:2039 src/dd.c:2102 +#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151 #, c-format -msgid "writing %s" -msgstr "%s írása" +msgid "error writing %s" +msgstr "hiba %s írása közben" #: src/copy.c:313 #, c-format @@ -1863,7 +1867,7 @@ msgstr "%s kiterjesztése meghiúsult" msgid "clearing permissions for %s" msgstr "%s jogosultságainak törlése" -#: src/copy.c:697 src/copy.c:2470 src/cp.c:331 +#: src/copy.c:697 src/copy.c:2480 src/cp.c:329 #, c-format msgid "failed to preserve ownership for %s" msgstr "%s tulajdonosának megtartása meghiúsult" @@ -1878,14 +1882,14 @@ msgstr "%s fájl kikeresése meghiúsult" msgid "failed to preserve authorship for %s" msgstr "%s szerzőjének megtartása meghiúsult" -#: src/copy.c:804 src/csplit.c:638 src/du.c:901 src/fmt.c:449 src/head.c:847 -#: src/sort.c:4489 src/split.c:1329 src/tail.c:1756 src/wc.c:678 +#: 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 "%s nem nyitható meg olvasásra" -#: src/copy.c:810 src/copy.c:972 src/dd.c:1546 src/dd.c:2114 src/dd.c:2252 -#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:141 +#: 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 #, c-format msgid "cannot fstat %s" msgstr "fstat %s sikertelen" @@ -1905,14 +1909,14 @@ msgstr "a fájlrendszer létrehozási kontextusának lekérése meghiúsult" 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:1574 src/copy.c:1777 src/copy.c:1935 src/ln.c:314 -#: src/remove.c:267 src/remove.c:293 src/remove.c:444 src/remove.c:465 +#: 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 #, c-format msgid "cannot remove %s" msgstr "%s nem törölhető" -#: src/copy.c:886 src/copy.c:1578 src/copy.c:1772 src/copy.c:1940 -#: src/remove.c:418 +#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945 +#: src/remove.c:375 #, c-format msgid "removed %s\n" msgstr "%s törölve\n" @@ -1932,198 +1936,198 @@ msgstr "%s reguláris fájl nem hozható létre" msgid "failed to clone %s from %s" msgstr "%s klónozása meghiúsult innen: %s" -#: src/copy.c:1098 src/copy.c:2531 +#: src/copy.c:1098 src/copy.c:2541 #, c-format msgid "preserving times for %s" msgstr "%s összes idejének megtartása" -#: src/copy.c:1170 src/copy.c:1176 src/head.c:855 src/touch.c:175 -#: src/truncate.c:413 -#, c-format -msgid "closing %s" -msgstr "%s lezárása" +#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172 +#: src/truncate.c:417 +#, fuzzy, c-format +msgid "failed to close %s" +msgstr "%s megnyitása meghiúsult" -#: src/copy.c:1466 +#: src/copy.c:1471 #, c-format msgid "%s: try to overwrite %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:1473 +#: src/copy.c:1478 #, c-format msgid "%s: overwrite %s? " msgstr "%s: felülírod a(z) %s fájlt? " -#: src/copy.c:1542 +#: src/copy.c:1547 #, c-format msgid " (backup: %s)" msgstr " (biztonsági mentés: %s)" -#: src/copy.c:1552 +#: src/copy.c:1557 #, 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:1584 +#: src/copy.c:1589 #, 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:1637 src/copy.c:1689 src/copy.c:2272 src/copy.c:2589 +#: 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:1220 src/truncate.c:365 +#: src/stat.c:1239 src/truncate.c:363 #, c-format msgid "cannot stat %s" msgstr "stat %s sikertelen" -#: src/copy.c:1645 +#: src/copy.c:1650 #, c-format msgid "omitting directory %s" msgstr "%s könyvtár kihagyása" -#: src/copy.c:1659 +#: src/copy.c:1664 #, 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:1707 src/ln.c:246 +#: src/copy.c:1712 src/ln.c:246 #, c-format msgid "%s and %s are the same file" msgstr "%s és %s ugyanaz a fájl" -#: src/copy.c:1806 +#: src/copy.c:1811 #, 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:1824 src/ln.c:214 +#: src/copy.c:1829 src/ln.c:214 #, 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:1842 +#: src/copy.c:1847 #, 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:1856 +#: src/copy.c:1861 #, 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:1886 +#: src/copy.c:1891 #, 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:1887 +#: src/copy.c:1892 #, 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:1910 src/ln.c:276 +#: src/copy.c:1915 src/ln.c:276 #, c-format msgid "cannot backup %s" msgstr "%s biztonsági mentése sikertelen" -#: src/copy.c:1974 +#: src/copy.c:1979 #, 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:2051 +#: src/copy.c:2056 #, 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:2068 +#: src/copy.c:2073 #, 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:2118 +#: src/copy.c:2123 #, 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:2161 +#: src/copy.c:2166 #, c-format msgid "cannot move %s to %s" msgstr "%s-t nem lehet ide áthelyezni: %s" -#: src/copy.c:2173 +#: src/copy.c:2178 #, 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:2207 src/install.c:905 src/mkdir.c:189 src/mkfifo.c:114 -#: src/mknod.c:167 +#: 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:2241 +#: src/copy.c:2246 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "%s körkörös szimbolikus link nem másolható" -#: src/copy.c:2350 +#: src/copy.c:2355 #, 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:2357 +#: src/copy.c:2362 #, 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:2406 src/mkfifo.c:133 +#: src/copy.c:2416 src/mkfifo.c:132 #, c-format msgid "cannot create fifo %s" msgstr "%s fifo nem hozható létre" -#: src/copy.c:2415 +#: src/copy.c:2425 #, c-format msgid "cannot create special file %s" msgstr "%s speciális fájl nem hozható létre" -#: src/copy.c:2426 src/ls.c:3191 src/stat.c:902 +#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921 #, c-format msgid "cannot read symbolic link %s" msgstr "%s szimbolikus link nem olvasható" -#: src/copy.c:2453 +#: src/copy.c:2463 #, c-format msgid "cannot create symbolic link %s" msgstr "%s szimbolikus link nem hozható létre" -#: src/copy.c:2485 +#: src/copy.c:2495 #, c-format msgid "%s has unknown file type" msgstr "%s fájltípusa ismeretlen" -#: src/copy.c:2629 src/ln.c:358 +#: src/copy.c:2644 src/ln.c:358 #, c-format msgid "cannot un-backup %s" msgstr "%s biztonsági mentése nem állítható vissza" -#: src/copy.c:2633 +#: src/copy.c:2648 #, 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:284 +#: src/cp.c:156 src/mv.c:286 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -2135,27 +2139,13 @@ msgstr "" " vagy: %s [KAPCSOLÓ]… -t KÖNYVTÁR FORRÁS…\n" #: src/cp.c:162 -msgid "" -"Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" -"\n" +#, fuzzy +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" -#: src/cp.c:166 src/csplit.c:1458 src/cut.c:197 src/df.c:852 src/du.c:268 -#: src/expand.c:112 src/fmt.c:275 src/fold.c:75 src/head.c:115 -#: src/install.c:612 src/kill.c:86 src/ln.c:392 src/ls.c:4726 src/mkdir.c:61 -#: src/mkfifo.c:56 src/mknod.c:58 src/mv.c:294 src/nl.c:191 src/paste.c:445 -#: src/pr.c:2777 src/ptx.c:1825 src/shred.c:153 src/shuf.c:58 src/sort.c:399 -#: src/split.c:211 src/stdbuf.c:95 src/tac.c:142 src/tail.c:268 -#: src/touch.c:226 src/truncate.c:107 src/unexpand.c:122 src/uniq.c:145 -msgid "" -"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" - -#: src/cp.c:169 +#: src/cp.c:168 msgid "" " -a, --archive same as -dR --preserve=all\n" " --attributes-only don't copy the file data, just the " @@ -2179,12 +2169,14 @@ msgstr "" " másolja\n" " -d mint a --no-dereference --preserve=links\n" -#: src/cp.c:178 +#: src/cp.c:177 +#, fuzzy msgid "" " -f, --force if an existing destination file cannot be\n" -" opened, remove it and try again (redundant " -"if\n" -" the -n option is used)\n" +" opened, remove it and try again (this " +"option\n" +" is ignored when the -n option is also " +"used)\n" " -i, --interactive prompt before overwrite (overrides a previous " "-n\n" " option)\n" @@ -2198,7 +2190,7 @@ msgstr "" " -H parancssori szimbolikus linkek követése a\n" " FORRÁSBAN\n" -#: src/cp.c:188 +#: src/cp.c:186 msgid "" " -l, --link hard link files instead of copying\n" " -L, --dereference always follow symbolic links in SOURCE\n" @@ -2207,7 +2199,7 @@ msgstr "" " -L, --dereference a szimbolikus linkek követése mindig a " "FORRÁSBAN\n" -#: src/cp.c:192 +#: src/cp.c:190 msgid "" " -n, --no-clobber do not overwrite an existing file (overrides\n" " a previous -i option)\n" @@ -2218,7 +2210,7 @@ msgstr "" " -P, --no-dereference soha ne kövesse a szimbolikus linkeket a\n" " FORRÁSBAN\n" -#: src/cp.c:197 +#: src/cp.c:195 msgid "" " -p same as --preserve=mode,ownership,timestamps\n" " --preserve[=ATTR_LIST] preserve the specified attributes (default:\n" @@ -2233,7 +2225,7 @@ msgstr "" " további attribútumokat is: context, links,\n" " xattr, all\n" -#: src/cp.c:205 +#: src/cp.c:203 msgid "" " --no-preserve=ATTR_LIST don't preserve the specified attributes\n" " --parents use full source file name under DIRECTORY\n" @@ -2242,7 +2234,7 @@ msgstr "" " --parents teljes forrásfájlnév használata a KÖNYVTÁR " "alatt\n" -#: src/cp.c:209 +#: src/cp.c:207 msgid "" " -R, -r, --recursive copy directories recursively\n" " --reflink[=WHEN] control clone/CoW copies. See below\n" @@ -2257,7 +2249,7 @@ msgstr "" " megnyitni (ellentétben a --force " "kapcsolóval)\n" -#: src/cp.c:215 +#: src/cp.c:213 msgid "" " --sparse=WHEN control creation of sparse files. See below\n" " --strip-trailing-slashes remove any trailing slashes from each " @@ -2269,7 +2261,7 @@ msgstr "" " --strip-trailing-slashes eltávolítja a befejező osztásjeleket minden\n" " egyes FORRÁS argumentumról\n" -#: src/cp.c:220 +#: src/cp.c:218 msgid "" " -s, --symbolic-link make symbolic links instead of copying\n" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -2285,7 +2277,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:226 +#: src/cp.c:224 msgid "" " -u, --update copy only when the SOURCE file is newer\n" " than the destination file or when the\n" @@ -2299,7 +2291,7 @@ msgstr "" " -v, --verbose elmagyarázza, mi történik\n" " -x, --one-file-system az adott fájlrendszeren marad\n" -#: src/cp.c:235 +#: src/cp.c:233 msgid "" "\n" "By default, sparse SOURCE files are detected by a crude heuristic and the\n" @@ -2328,7 +2320,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:247 src/install.c:649 src/ln.c:421 src/mv.c:321 +#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322 #, fuzzy msgid "" "\n" @@ -2348,7 +2340,7 @@ msgstr "" "Az érvényes értékek a következők:\n" "\n" -#: src/cp.c:254 src/install.c:656 src/mv.c:328 +#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329 msgid "" " none, off never make backups (even if --backup is given)\n" " numbered, t make numbered backups\n" @@ -2361,7 +2353,7 @@ msgstr "" " egyszerű\n" " simple, never mindig egyszerű biztonsági mentés\n" -#: src/cp.c:260 +#: src/cp.c:258 msgid "" "\n" "As a special case, cp makes a backup of SOURCE when the force and backup\n" @@ -2374,92 +2366,92 @@ 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:319 +#: src/cp.c:317 #, c-format msgid "failed to preserve times for %s" msgstr "%s időinek megtartása meghiúsult" -#: src/cp.c:350 +#: src/cp.c:348 #, c-format msgid "failed to preserve permissions for %s" msgstr "%s jogosultságainak megtartása sikertelen" -#: src/cp.c:477 +#: src/cp.c:475 #, c-format msgid "cannot make directory %s" msgstr "%s könyvtár nem hozható létre" -#: src/cp.c:526 src/cp.c:545 +#: src/cp.c:524 src/cp.c:543 #, c-format msgid "%s exists but is not a directory" msgstr "%s létezik, de nem könyvtár" -#: src/cp.c:572 src/cp.c:1068 src/install.c:401 src/install.c:844 src/ln.c:123 -#: src/ln.c:181 src/ln.c:202 src/ln.c:516 src/mv.c:152 src/mv.c:399 -#, c-format -msgid "accessing %s" -msgstr "%s elérése" +#: 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 +msgid "failed to access %s" +msgstr "%s megnyitása meghiúsult" -#: src/cp.c:592 src/install.c:914 src/ln.c:546 src/mv.c:432 src/shred.c:1182 -#: src/touch.c:433 src/truncate.c:356 +#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181 +#: src/touch.c:429 src/truncate.c:354 #, c-format msgid "missing file operand" msgstr "hiányzó fájloperandus" -#: src/cp.c:594 src/install.c:916 src/ln.c:560 src/mv.c:434 +#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436 #, 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:603 src/install.c:925 src/mv.c:443 +#: src/cp.c:601 src/install.c:926 src/mv.c:445 #, 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:619 src/cp.c:1070 src/install.c:403 src/install.c:846 -#: src/install.c:938 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:401 -#: src/mv.c:457 +#: 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 #, c-format msgid "target %s is not a directory" msgstr "a megadott cél (%s) nem könyvtár" -#: src/cp.c:730 +#: src/cp.c:728 #, 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:1063 src/install.c:839 src/ln.c:511 src/mv.c:394 +#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395 #, c-format msgid "multiple target directories specified" msgstr "több kimeneti célkönyvtár van megadva" -#: src/cp.c:1108 +#: src/cp.c:1110 #, c-format msgid "cannot make both hard and symbolic links" msgstr "nem lehet egyszerre hard linket és szimbolikus linket létrehozni" -#: src/cp.c:1115 src/mv.c:464 +#: src/cp.c:1117 src/mv.c:466 #, 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:1121 +#: src/cp.c:1123 #, 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:1129 src/install.c:899 src/ln.c:582 src/mv.c:472 +#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474 msgid "backup type" msgstr "biztonsági mentés típusa" -#: src/cp.c:1154 +#: src/cp.c:1156 #, 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:1160 +#: src/cp.c:1162 #, c-format msgid "cannot preserve extended attributes, cp is built without xattr support" msgstr "" @@ -2471,138 +2463,137 @@ msgstr "" msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:529 +#: src/csplit.c:531 #, c-format msgid "input disappeared" msgstr "a bemenet eltűnt" -#: src/csplit.c:658 src/csplit.c:669 +#: src/csplit.c:660 src/csplit.c:671 #, c-format msgid "%s: line number out of range" msgstr "%s: a sorszám kívül esik a tartományon" -#: src/csplit.c:698 +#: src/csplit.c:700 #, 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:701 src/csplit.c:750 +#: src/csplit.c:703 src/csplit.c:752 #, c-format msgid " on repetition %s\n" msgstr " a(z) %s ismétlésben\n" -#: src/csplit.c:744 +#: src/csplit.c:746 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: a találat nem található" -#: src/csplit.c:808 src/csplit.c:848 src/nl.c:359 src/tac.c:274 +#: src/csplit.c:810 src/csplit.c:850 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:981 +#: src/csplit.c:983 #, c-format msgid "write error for %s" msgstr "írási hiba a következőhöz: %s" -#: src/csplit.c:1057 +#: src/csplit.c:1059 #, 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:1073 +#: src/csplit.c:1075 #, fuzzy, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: egy „}” szükséges az ismétlésszámban" -#: src/csplit.c:1083 +#: src/csplit.c:1085 #, fuzzy, 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:1110 +#: src/csplit.c:1112 #, fuzzy, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: a záró „%c” elhatároló hiányzik" -#: src/csplit.c:1127 +#: src/csplit.c:1129 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: érvénytelen szabályos kifejezés: %s" -#: src/csplit.c:1160 +#: src/csplit.c:1162 #, c-format msgid "%s: invalid pattern" msgstr "%s: érvénytelen minta" -#: src/csplit.c:1163 +#: src/csplit.c:1165 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: a sorszámnak nagyobbnak kell lennie, mint 0" -#: src/csplit.c:1169 +#: src/csplit.c:1171 #, 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:1175 +#: src/csplit.c:1177 #, 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:1253 +#: src/csplit.c:1255 #, 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:1259 +#: src/csplit.c:1261 #, 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:1262 +#: src/csplit.c:1264 #, 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:1267 +#: src/csplit.c:1269 #, 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:1284 +#: src/csplit.c:1286 #, 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:1298 +#: src/csplit.c:1300 #, 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:1345 +#: src/csplit.c:1347 #, c-format msgid "%s: invalid number" msgstr "érvénytelen szám: %s" -#: src/csplit.c:1449 +#: src/csplit.c:1451 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Használat: %s [KAPCSOLÓ]… FÁJL MINTA…\n" -#: src/csplit.c:1453 +#: src/csplit.c:1455 #, 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" -"\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:1461 +#: src/csplit.c:1462 #, fuzzy, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2614,7 +2605,7 @@ 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:1466 +#: src/csplit.c:1467 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" @@ -2626,7 +2617,7 @@ msgstr "" "összegét\n" " -z, --elide-empty-files üres kimeneti fájlok eltávolítása\n" -#: src/csplit.c:1473 +#: src/csplit.c:1474 msgid "" "\n" "Read standard input if FILE is -. Each PATTERN may be:\n" @@ -2634,7 +2625,7 @@ msgstr "" "\n" "Ha a FÁJL a -, akkor a szabványos bemenetet olvassa. A MINTA lehet:\n" -#: src/csplit.c:1477 +#: src/csplit.c:1478 #, fuzzy msgid "" "\n" @@ -2660,7 +2651,7 @@ msgstr "" msgid "David M. Ihnat" msgstr "David M. Ihnat" -#: src/cut.c:64 +#: 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" @@ -2670,14 +2661,13 @@ msgid "Usage: %s OPTION... [FILE]...\n" msgstr "Használat: %s KAPCSOLÓ… [FÁJL]…\n" #: src/cut.c:193 -msgid "" -"Print selected parts of lines from each FILE to standard output.\n" -"\n" +#, fuzzy +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:200 +#: src/cut.c:199 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2688,7 +2678,7 @@ msgstr "" " -d, --delimiter=ELHAT az ELHAT használata a TAB helyett " "mezőelválasztóként\n" -#: src/cut.c:205 +#: src/cut.c:204 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2702,7 +2692,7 @@ msgstr "" " kivéve ha a -s kapcsoló meg van adva\n" " -n (figyelmen kívül marad)\n" -#: src/cut.c:211 +#: src/cut.c:210 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" @@ -2711,7 +2701,7 @@ msgstr "" "halmazának\n" " kiegészítése.\n" -#: src/cut.c:215 +#: src/cut.c:214 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2723,7 +2713,7 @@ msgstr "" " elhatárolójaként, az alapértelmezés a bemenet\n" " elhatárolójának használata\n" -#: src/cut.c:222 +#: src/cut.c:221 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2735,7 +2725,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:228 +#: src/cut.c:227 msgid "" "Each range is one of:\n" "\n" @@ -2757,45 +2747,47 @@ msgstr "" "\n" "Ha a FÁJL nincs megadva vagy -, akkor a szabványos bemenetet olvassa.\n" -#: src/cut.c:368 src/cut.c:489 -msgid "invalid byte or field list" +#: src/cut.c:367 src/cut.c:493 +#, fuzzy +msgid "invalid byte, character or field list" msgstr "érvénytelen bájt- vagy mezőlista" -#: src/cut.c:385 +#: src/cut.c:387 msgid "invalid range with no endpoint: -" msgstr "érvénytelen tartomány végpont nélkül: -" -#: src/cut.c:399 +#: src/cut.c:403 msgid "invalid decreasing range" msgstr "érvénytelen csökkenő tartomány" -#: src/cut.c:478 +#: src/cut.c:482 #, c-format msgid "byte offset %s is too large" msgstr "a(z) %s bájteltolás túl nagy" -#: src/cut.c:481 +#: src/cut.c:485 #, c-format msgid "field number %s is too large" msgstr "a(z) %s mezőszám túl nagy" -#: src/cut.c:789 src/cut.c:797 +#: src/cut.c:795 src/cut.c:803 msgid "only one type of list may be specified" msgstr "csak egy listatípus adható meg" -#: src/cut.c:806 +#: src/cut.c:812 src/numfmt.c:1408 +#, c-format msgid "the delimiter must be a single character" msgstr "az elhatárolónak egyetlen karakternek kell lennie" -#: src/cut.c:841 +#: src/cut.c:847 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:844 +#: src/cut.c:850 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:848 +#: src/cut.c:854 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2803,11 +2795,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:864 +#: src/cut.c:870 msgid "missing list of fields" msgstr "a mezőlista hiányzik" -#: src/cut.c:866 +#: src/cut.c:872 msgid "missing list of positions" msgstr "a pozíciólista hiányzik" @@ -2821,10 +2813,12 @@ msgstr "" " vagy: %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 "" + +#: src/date.c:134 #, 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" " -I[TIMESPEC], --iso-8601[=TIMESPEC] output date/time in ISO 8601 format.\n" @@ -2845,7 +2839,7 @@ msgstr "" " vagy „hours”, „minutes”, „seconds” vagy „ns” a\n" " jelzett pontosságú dátum és idő kiírásához.\n" -#: src/date.c:138 +#: src/date.c:142 msgid "" " -r, --reference=FILE display the last modification time of FILE\n" " -R, --rfc-2822 output date and time in RFC 2822 format.\n" @@ -2856,7 +2850,7 @@ msgstr "" " -R, --rfc-2822 Időpont kiírása RFC 2822 formátumban.\n" " Például: Mon, 07 Aug 2006 12:34:56 -0600\n" -#: src/date.c:143 +#: src/date.c:147 #, fuzzy msgid "" " --rfc-3339=TIMESPEC output date and time in RFC 3339 format.\n" @@ -2876,7 +2870,7 @@ msgstr "" " -u, --utc, --universal a Koordinált világidő kiírása vagy\n" " beállítása\n" -#: src/date.c:154 +#: src/date.c:158 msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" @@ -2890,7 +2884,7 @@ msgstr "" " %% egy % jel\n" " %a a területi beállítások rövidített napneve (például: v)\n" -#: src/date.c:161 +#: src/date.c:165 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2903,7 +2897,7 @@ msgstr "" " %c a területi beállítások dátuma és ideje (2005. dec. 25., vasárnap,\n" " 15.48.38 CET)\n" -#: src/date.c:167 +#: src/date.c:171 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2915,7 +2909,7 @@ msgstr "" " %D dátum; ugyanaz, mint %m/%d/%y\n" " %e a hónap napja szóközökkel feltöltve; ugyanaz, mint a %_d\n" -#: src/date.c:173 +#: src/date.c:177 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -2925,7 +2919,7 @@ msgstr "" " %g az ISO hétszám évének utolsó két számjegye (lásd %G)\n" " %G az ISO hétszám éve (lásd %V); csak %V-vel hasznos\n" -#: src/date.c:178 +#: src/date.c:182 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2937,7 +2931,7 @@ msgstr "" " %I óra (01..12)\n" " %j az év napja (001..366)\n" -#: src/date.c:184 +#: src/date.c:188 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -2949,7 +2943,7 @@ msgstr "" " %m hónap (01..12)\n" " %M perc (00..59)\n" -#: src/date.c:190 +#: src/date.c:194 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2968,7 +2962,7 @@ msgstr "" " %R 24 órás óra és perc, ugyanaz mint a %H:%M\n" " %s a „00:00:00 1970-01-01 UTC” óta eltelt másodpercek száma\n" -#: src/date.c:199 +#: src/date.c:203 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2980,7 +2974,7 @@ msgstr "" " %T idő, ugyanaz , mint a %H:%M:%S\n" " %u a hét napja (1..7); az 1 a Hétfőt jelenti\n" -#: src/date.c:205 +#: src/date.c:209 msgid "" " %U week number of year, with Sunday as first day of week (00..53)\n" " %V ISO week number, with Monday as first day of week (01..53)\n" @@ -2992,7 +2986,7 @@ msgstr "" " %w a hét napja (0..6); a 0 Vasárnapot jelenti\n" " %W az év hetének száma, a hét első napja Hétfő (00..53)\n" -#: src/date.c:211 +#: src/date.c:215 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -3004,7 +2998,7 @@ msgstr "" " %y az év utolsó két számjegye (00..99)\n" " %Y év\n" -#: src/date.c:217 +#: src/date.c:221 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -3024,7 +3018,7 @@ msgstr "" "\n" "Alapértelmezésben a date a numerikus mezőket nullákkal tölti ki.\n" -#: src/date.c:226 +#: src/date.c:230 #, fuzzy msgid "" "The following optional flags may follow '%':\n" @@ -3043,7 +3037,7 @@ msgstr "" " ^ nagybetűk használata, ha lehetséges\n" " # ellentétes (nagy<->kis) betűk használata, ha lehetséges\n" -#: src/date.c:235 +#: src/date.c:239 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -3057,7 +3051,7 @@ msgstr "" "alternatív ábrázolásának használatához, vagy O a területi beállítások\n" "alternatív numerikus szimbólumainak használatához, ha ezek elérhetők.\n" -#: src/date.c:242 +#: src/date.c:246 msgid "" "\n" "Examples:\n" @@ -3082,38 +3076,38 @@ 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:275 src/dd.c:2193 src/head.c:838 src/md5sum.c:477 -#: src/md5sum.c:798 src/od.c:863 src/od.c:1914 src/pr.c:1176 src/pr.c:1372 -#: src/pr.c:1494 src/stty.c:842 src/tac.c:563 src/tail.c:343 src/tee.c:126 +#: 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 #, c-format msgid "standard input" msgstr "szabványos bemenet" -#: src/date.c:303 src/date.c:523 +#: src/date.c:307 src/date.c:527 #, c-format msgid "invalid date %s" msgstr "érvénytelen dátum: %s" -#: src/date.c:414 src/date.c:448 +#: src/date.c:418 src/date.c:452 #, c-format msgid "multiple output formats specified" msgstr "több kimeneti formátum van megadva" -#: src/date.c:426 +#: src/date.c:430 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "" "a dátumok megadására a kiíratáshoz használt kapcsolók egymást kölcsönösen " "kizárják" -#: src/date.c:433 +#: src/date.c:437 #, c-format msgid "the options to print and set the time may not be used together" 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:454 +#: src/date.c:458 #, fuzzy, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -3124,23 +3118,23 @@ msgstr "" "Ha kapcsolóval ad meg dátumokat, akkor minden nem kapcsoló\n" "argumentumnak „+” jellel kezdődő formátum-karakterláncnak kell lennie." -#: src/date.c:531 +#: src/date.c:535 #, c-format msgid "cannot set date" msgstr "nem állítható be a dátum" -#: src/date.c:554 src/du.c:360 +#: src/date.c:558 src/du.c:371 #, c-format msgid "time %s is out of range" msgstr "a(z)%s időpont kívül esik a tartományon" #. This is a proper name. See the gettext manual, section Names. -#: src/dd.c:44 src/factor.c:43 src/rm.c:41 src/tail.c:69 src/touch.c:41 +#: 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 "Paul Rubin" -#: src/dd.c:517 +#: src/dd.c:521 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3149,7 +3143,7 @@ msgstr "" "Használat: %s [OPERANDUS]…\n" " vagy: %s KAPCSOLÓ\n" -#: src/dd.c:522 +#: src/dd.c:526 #, fuzzy msgid "" "Copy a file, converting and formatting according to the operands.\n" @@ -3170,7 +3164,7 @@ msgstr "" " count=BLOKK csak BLOKK bemeneti blokkot másol\n" " ibs=BÁJT egyszerre BÁJT bájtot olvas be (alapérték: 512)\n" -#: src/dd.c:531 +#: src/dd.c:535 #, fuzzy msgid "" " if=FILE read from FILE instead of stdin\n" @@ -3180,7 +3174,8 @@ msgid "" " oflag=FLAGS write as per the comma separated symbol list\n" " seek=N skip N obs-sized blocks at start of output\n" " skip=N skip N ibs-sized blocks at start of input\n" -" status=noxfer suppress transfer statistics\n" +" status=WHICH WHICH info to suppress outputting to stderr;\n" +" '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 " @@ -3192,10 +3187,11 @@ msgstr "" " skip=BLOKK ennyi ibs-méretű blokkot hagy ki a bemenet elején\n" " status=noxfer átviteli statisztika elnyomása\n" -#: src/dd.c:541 +#: src/dd.c:546 +#, fuzzy msgid "" "\n" -"BLOCKS and BYTES may be followed by the following multiplicative suffixes:\n" +"N and BYTES may be followed by the following multiplicative suffixes:\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, and so on for T, P, E, Z, Y.\n" "\n" @@ -3210,7 +3206,7 @@ msgstr "" "A KULCSSZÓ szimbólumok az alábbiak lehetnek:\n" "\n" -#: src/dd.c:550 +#: src/dd.c:555 #, fuzzy msgid "" " ascii from EBCDIC to ASCII\n" @@ -3238,7 +3234,7 @@ msgstr "" " 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:563 +#: src/dd.c:568 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3254,7 +3250,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:571 +#: src/dd.c:576 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3268,76 +3264,76 @@ msgstr "" " append hozzáfűzési mód (csak kimenet esetén van értelme; javasolt a\n" " conv=notrunc)\n" -#: src/dd.c:578 +#: src/dd.c:583 msgid " cio use concurrent I/O for data\n" msgstr " cio párhuzamos I/O használata az adatokhoz\n" -#: src/dd.c:580 +#: src/dd.c:585 msgid " direct use direct I/O for data\n" msgstr " direct közvetlen I/O használata az adatokhoz\n" -#: src/dd.c:582 +#: src/dd.c:587 msgid " directory fail unless a directory\n" msgstr " directory működés csak könyvtárakon\n" -#: src/dd.c:584 +#: src/dd.c:589 msgid " dsync use synchronized I/O for data\n" msgstr " dsync szinkronizált I/O használata az adatokhoz\n" -#: src/dd.c:586 +#: src/dd.c:591 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:587 +#: src/dd.c:592 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:590 +#: src/dd.c:595 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock nem blokkoló I/O használata\n" -#: src/dd.c:592 +#: src/dd.c:597 msgid " noatime do not update access time\n" msgstr " noatime ne frissítse a hozzáférési időt\n" -#: src/dd.c:595 +#: src/dd.c:600 msgid " nocache discard cached data\n" msgstr " nocache gyorsítótárazott adatok eldobása\n" # fixme -#: src/dd.c:598 +#: src/dd.c:603 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:601 +#: src/dd.c:606 msgid " nofollow do not follow symlinks\n" msgstr " nofollow ne kövesse a szimbolikus linkeket\n" -#: src/dd.c:603 +#: src/dd.c:608 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:605 +#: src/dd.c:610 msgid " binary use binary I/O for data\n" msgstr " binary bináris I/O használata az adatokhoz\n" -#: src/dd.c:607 +#: src/dd.c:612 msgid " text use text I/O for data\n" msgstr " text szöveges I/O használata az adatokhoz\n" -#: src/dd.c:609 +#: src/dd.c:614 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:612 +#: src/dd.c:617 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:615 +#: src/dd.c:620 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:620 +#: src/dd.c:625 #, fuzzy, c-format msgid "" "\n" @@ -3367,7 +3363,7 @@ msgstr "" "A kapcsolók:\n" "\n" -#: src/dd.c:676 +#: src/dd.c:683 #, c-format msgid "" "%<PRIuMAX>+%<PRIuMAX> records in\n" @@ -3376,21 +3372,21 @@ msgstr "" "%<PRIuMAX>+%<PRIuMAX> beolvasott rekord\n" "%<PRIuMAX>+%<PRIuMAX> kiírt rekord\n" -#: src/dd.c:682 +#: src/dd.c:689 #, 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:694 +#: src/dd.c:701 #, 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:712 +#: src/dd.c:720 msgid "Infinity B" msgstr "Végtelen B" @@ -3404,83 +3400,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:725 +#: src/dd.c:733 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g mp, %s/s\n" -#: src/dd.c:804 +#: src/dd.c:812 #, c-format msgid "closing input file %s" msgstr "%s bemeneti fájl lezárása" -#: src/dd.c:811 +#: src/dd.c:819 #, c-format msgid "closing output file %s" msgstr "%s kimeneti fájl lezárása" -#: src/dd.c:1014 +#: src/dd.c:1022 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "az O_DIRECT kikapcsolása meghiúsult: %s" -#: src/dd.c:1085 src/dd.c:1934 +#: src/dd.c:1093 src/dd.c:1942 #, c-format msgid "writing to %s" msgstr "írás a következőbe: %s" -#: src/dd.c:1199 src/dd.c:1253 +#: src/dd.c:1207 src/dd.c:1261 #, c-format msgid "unrecognized operand %s" msgstr "ismeretlen operandus: %s" -#: src/dd.c:1210 +#: src/dd.c:1218 msgid "invalid conversion" msgstr "érvénytelen átalakítás" -#: src/dd.c:1213 src/dd.c:1289 +#: src/dd.c:1221 src/dd.c:1297 msgid "invalid input flag" msgstr "érvénytelen bemeneti jelölő" -#: src/dd.c:1216 src/dd.c:1283 src/dd.c:1295 +#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303 msgid "invalid output flag" msgstr "érvénytelen kimeneti jelölő" -#: src/dd.c:1219 +#: src/dd.c:1227 msgid "invalid status flag" msgstr "érvénytelen állapotjelölő" -#: src/dd.c:1258 src/truncate.c:312 +#: src/dd.c:1266 src/truncate.c:310 #, c-format msgid "invalid number %s" msgstr "érvénytelen szám: %s" -#: src/dd.c:1340 +#: src/dd.c:1348 #, 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:1342 +#: src/dd.c:1350 #, c-format msgid "cannot combine block and unblock" msgstr "a block és az unblock nem adható meg egyszerre" -#: src/dd.c:1344 +#: src/dd.c:1352 #, c-format msgid "cannot combine lcase and ucase" msgstr "az lcase és az ucase nem adható meg egyszerre" -#: src/dd.c:1346 +#: src/dd.c:1354 #, c-format msgid "cannot combine excl and nocreat" msgstr "az excl és a nocreat nem adható meg egyszerre" -#: src/dd.c:1349 +#: src/dd.c:1357 #, c-format msgid "cannot combine direct and nocache" msgstr "a direct és a nocache nem adható meg egyszerre" -#: src/dd.c:1506 +#: src/dd.c:1514 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3490,73 +3486,73 @@ msgstr "" "%s (mt_type=0x%0lx)\n" "A <sys/mtio.h> fájlban megtalálod a típusok listáját" -#: src/dd.c:1593 +#: src/dd.c:1601 #, c-format msgid "%s: cannot skip" msgstr "%s: nem lehet ugrani" -#: src/dd.c:1595 src/dd.c:1614 src/dd.c:1675 +#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683 #, c-format msgid "%s: cannot seek" msgstr "%s: nem lehet pozicionálni" -#: src/dd.c:1655 +#: src/dd.c:1663 #, 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:1667 +#: src/dd.c:1675 #, 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:1671 +#: src/dd.c:1679 #, c-format msgid "cannot work around kernel bug after all" msgstr "a kernelhiba nem kerülhető meg" -#: src/dd.c:1814 +#: src/dd.c:1822 #, c-format msgid "setting flags for %s" msgstr "%s jelölőinek beállítása" -#: src/dd.c:1867 +#: 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:1881 +#: 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:1914 +#: src/dd.c:1922 #, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: nem lehet a megadott eltolásra ugrani" -#: src/dd.c:2125 src/dd.c:2258 -#, c-format -msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" +#: src/dd.c:2133 +#, fuzzy, 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" -#: src/dd.c:2138 +#: src/dd.c:2146 #, c-format msgid "fdatasync failed for %s" msgstr "az fdatasync meghiúsult a következőhöz: %s" -#: src/dd.c:2148 +#: src/dd.c:2156 #, c-format msgid "fsync failed for %s" msgstr "az fsync meghiúsult a következőhöz: %s" -#: src/dd.c:2199 src/dd.c:2228 +#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165 #, c-format -msgid "opening %s" -msgstr "%s megnyitása" +msgid "failed to open %s" +msgstr "%s megnyitása meghiúsult" -#: src/dd.c:2237 +#: src/dd.c:2246 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) " @@ -3565,84 +3561,107 @@ msgstr "" "Az eltolás túl nagy: nem lehet seek=%<PRIuMAX> (%lu bájt) blokk\n" "hosszára csonkítani" -#: src/dd.c:2274 src/dd.c:2280 +#: src/dd.c:2267 +#, 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 #, 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:54 src/expr.c:153 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:39 src/sleep.c:35 src/sort.c:66 +#: 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 msgid "Paul Eggert" msgstr "Paul Eggert" -#: src/df.c:140 +#: src/df.c:172 msgid "Filesystem" msgstr "Fájlrendszer" -#: src/df.c:141 +#: src/df.c:175 msgid "Type" msgstr "Típ." -#: src/df.c:142 +#: src/df.c:178 src/df.c:542 msgid "blocks" msgstr "blokk" -#: src/df.c:142 -msgid "Inodes" -msgstr "Inode-ok" - -#: src/df.c:142 -msgid "Size" -msgstr "Méret" - -#: src/df.c:143 +#: src/df.c:181 msgid "Used" msgstr "Fogl." -#: src/df.c:143 -msgid "IUsed" -msgstr "IFogl" - -#: src/df.c:144 +#: src/df.c:184 msgid "Available" msgstr "Szabad" -#: src/df.c:144 -msgid "IFree" -msgstr "ISzab." - -#: src/df.c:144 -msgid "Avail" -msgstr "Szab." - -#: src/df.c:145 +#: src/df.c:187 msgid "Use%" msgstr "Fo.%" -#: src/df.c:145 +#: src/df.c:190 +msgid "Inodes" +msgstr "Inode-ok" + +#: src/df.c:193 +msgid "IUsed" +msgstr "IFogl" + +#: src/df.c:196 +msgid "IFree" +msgstr "ISzab." + +#: src/df.c:199 msgid "IUse%" msgstr "IFo.%" -#: src/df.c:145 +#: src/df.c:202 +msgid "Mounted on" +msgstr "Csatol. pont" + +#: src/df.c:383 +#, c-format +msgid "option --output: field '%s' unknown" +msgstr "" + +#: 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:410 src/df.c:449 +msgid "Size" +msgstr "Méret" + +#: src/df.c:414 src/df.c:451 +msgid "Avail" +msgstr "Szab." + +#: src/df.c:474 msgid "Capacity" msgstr "Kapacit." -#: src/df.c:146 -msgid "Mounted on" -msgstr "Csatol. pont" +#. 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 +#, c-format +msgid "%s-%s" +msgstr "" -#: src/df.c:847 +#: src/df.c:1210 +#, fuzzy msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" -"\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:855 +#: src/df.c:1217 #, fuzzy msgid "" " -a, --all include dummy file systems\n" @@ -3664,7 +3683,7 @@ msgstr "" " -H, --si ugyanaz mint előbb, de 1000-es szorzó 1024-es " "helyett\n" -#: src/df.c:865 +#: src/df.c:1227 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3679,8 +3698,12 @@ msgstr "" "információk\n" " beolvasása előtt (alapértelmezett)\n" -#: src/df.c:872 +#: src/df.c:1234 +#, fuzzy msgid "" +" --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" +" or print all fields if FIELD_LIST is " +"omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" " -t, --type=TYPE limit listing to file systems of type TYPE\n" @@ -3697,21 +3720,43 @@ msgstr "" "ki\n" " -v (figyelmen kívül marad)\n" -#: src/df.c:1027 +#: src/df.c:1248 +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" +msgstr "" + +#: src/df.c:1285 +#, fuzzy, 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: " + +#: src/df.c:1336 +msgid "long option '--megabytes' is deprecated and will soon be removed" +msgstr "" + +#: src/df.c:1442 #, 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:1075 +#: src/df.c:1500 msgid "Warning: " msgstr "Figyelmeztetés: " -#: src/df.c:1077 src/stat.c:795 +#: src/df.c:1502 src/stat.c:814 msgid "cannot read table of mounted file systems" msgstr "a csatolt fájlrendszerek táblája nem olvasható" -#: src/df.c:1107 +#: src/df.c:1539 #, c-format msgid "no file systems processed" msgstr "nem került feldolgozásra fájlrendszer" @@ -3827,7 +3872,7 @@ msgstr "" " %s /usr/bin/ A „/usr” kiírása.\n" " %s stdio.h A „.” kiírása.\n" -#: src/du.c:260 src/sort.c:390 src/wc.c:112 +#: src/du.c:270 src/sort.c:394 src/wc.c:112 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3836,17 +3881,18 @@ msgstr "" "Használat: %s [KAPCSOLÓ]… FÁJL…\n" " vagy: %s [KAPCSOLÓ]… --files0-from=F\n" -#: src/du.c:264 -msgid "" -"Summarize disk usage of each FILE, recursively for directories.\n" -"\n" +#: src/du.c:274 +#, fuzzy +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" -#: src/du.c:271 +#: src/du.c:280 #, fuzzy msgid "" +" -0, --null end each output line with 0 byte rather than " +"newline\n" " -a, --all write counts for all files, not just directories\n" " --apparent-size print apparent sizes, rather than disk usage; " "although\n" @@ -3863,7 +3909,7 @@ msgstr "" "belső\n" " töredezettség, indirekt blokkok és hasonlók miatt\n" -#: src/du.c:279 +#: src/du.c:289 #, fuzzy msgid "" " -B, --block-size=SIZE scale sizes by SIZE before printing them. E.g.,\n" @@ -3873,6 +3919,11 @@ msgid "" " -c, --total produce a grand total\n" " -D, --dereference-args dereference only symlinks that are listed on the\n" " command line\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 "" " -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" @@ -3883,7 +3934,8 @@ msgstr "" " -D, --dereference-args csak a parancssorban felsorolt szimbolikus linkek\n" " törlése\n" -#: src/du.c:288 +#: src/du.c:302 +#, fuzzy msgid "" " --files0-from=F summarize disk usage of the NUL-terminated file\n" " names specified in file F;\n" @@ -3891,7 +3943,6 @@ msgid "" " -H equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" --si like -h, but use powers of 1000 not 1024\n" msgstr "" " --files0-from=F az F fájlban megadott, NULL végű fájlnevek\n" " lemezhasználatának összegzése\n" @@ -3901,9 +3952,11 @@ msgstr "" " -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:297 +#: src/du.c:310 +#, fuzzy 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 "" @@ -3911,14 +3964,13 @@ msgstr "" " -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:302 +#: src/du.c:316 +#, fuzzy msgid "" -" -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " "default)\n" -" -0, --null end each output line with 0 byte rather than " -"newline\n" " -S, --separate-dirs 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" @@ -3929,31 +3981,11 @@ msgstr "" " -S, --separate-dirs alkönyvtárakat nem számolja bele\n" " -s, --summarize argumentumonként egy összeget mutat\n" -#: src/du.c:309 -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 a más fájlrendszeren lévő könyvtárak kihagyása\n" -" -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" -" -d --max-depth=N csak akkor írja ki az összesítést egy adott " -"könyvtárra\n" -" (vagy fájlra a --all esetén), ha az legfeljebb N\n" -" szinttel van a parancssorban megadott könyvtár " -"alatt.\n" -" A --max-depth=0 ugyanaz, mint a --summarize\n" - -#: src/du.c:318 +#: src/du.c:322 #, fuzzy msgid "" +" -t, --threshold=SIZE exclude entries smaller than SIZE if positive,\n" +" or entries greater than SIZE if negative\n" " --time show time of the last modification of any file in " "the\n" " directory, or any of its subdirectories\n" @@ -3975,70 +4007,79 @@ msgstr "" " „date” parancsnál megadottakhoz hasonlóan kerül\n" " értelmezésre\n" -#: src/du.c:375 +#: src/du.c:333 +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 msgid "Infinity" msgstr "Végtelen B" -#: src/du.c:600 +#: src/du.c:507 +#, c-format +msgid "mount point %s already traversed" +msgstr "" + +#: src/du.c:624 #, c-format msgid "fts_read failed: %s" msgstr "az fts_read sikertelen: %s" -#: src/du.c:724 +#: src/du.c:780 #, c-format msgid "invalid maximum depth %s" msgstr "érvénytelen maximális mélység: %s" -#: src/du.c:817 +#: src/du.c:809 +#, fuzzy, c-format +msgid "invalid --threshold argument '-0'" +msgstr "érvénytelen --%s argumentum: %s" + +#: src/du.c:887 #, 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:824 +#: src/du.c:894 #, 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:830 +#: src/du.c:900 #, 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:896 src/sort.c:4479 src/wc.c:668 +#: src/du.c:966 src/sort.c:4533 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:949 src/md5sum.c:587 src/od.c:903 src/tac.c:239 src/tac.c:350 -#: src/tac.c:506 src/tac.c:586 src/wc.c:733 +#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 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:963 src/sort.c:4508 src/wc.c:747 +#: src/du.c:1040 src/sort.c:4562 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:980 src/du.c:988 src/wc.c:760 src/wc.c:768 +#: src/du.c:1057 src/du.c:1065 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:1007 src/head.c:149 src/head.c:262 src/head.c:334 src/head.c:538 -#: src/head.c:620 src/head.c:692 src/head.c:750 src/head.c:774 src/tail.c:412 -#: src/tail.c:500 src/tail.c:549 src/tail.c:642 src/tail.c:770 src/tail.c:818 -#: src/tail.c:855 src/tail.c:1782 src/tail.c:1812 src/uniq.c:395 -#, c-format -msgid "error reading %s" -msgstr "hiba %s olvasása közben" - -#: src/du.c:1010 src/ls.c:2649 src/wc.c:791 +#: src/du.c:1088 src/ls.c:2649 src/wc.c:791 msgid "total" msgstr "összesen" @@ -4143,9 +4184,12 @@ msgid "Usage: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n" 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 "" + +#: src/env.c:61 +#, fuzzy msgid "" -"Set each NAME to VALUE in the environment and run COMMAND.\n" -"\n" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with 0 byte rather than newline\n" " -u, --unset=NAME remove variable from the environment\n" @@ -4158,7 +4202,7 @@ msgstr "" "bájttal\n" " -u, --unset=NÉV változó eltávolítása a környezetből\n" -#: src/env.c:64 +#: src/env.c:68 msgid "" "\n" "A mere - implies -i. If no COMMAND, print the resulting environment.\n" @@ -4168,32 +4212,32 @@ msgstr "" "akkor\n" "kiírja az eredményül kapott környezetet.\n" -#: src/env.c:120 +#: src/env.c:124 #, c-format msgid "cannot unset %s" msgstr "%s nem törölhető" -#: src/env.c:131 +#: src/env.c:135 #, c-format msgid "cannot set %s" msgstr "%s nem állítható be" -#: src/env.c:148 +#: src/env.c:152 #, c-format 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" -"\n" msgstr "" "A tabokat minden egyes FÁJLBAN szóközökké alakítja és kiírja a szabványos\n" "kimenetre. Ha a FÁJL nincs megadva, vagy -, akkor a szabványos bemenetet\n" "olvassa.\n" -#: src/expand.c:115 +#: src/expand.c:114 msgid "" " -i, --initial do not convert tabs after non blanks\n" " -t, --tabs=NUMBER have tabs NUMBER characters apart, not 8\n" @@ -4201,34 +4245,34 @@ msgstr "" " -i, --initial ne alakítsa át a tabokat nem üreshely karakterek után\n" " -t, --tabs=SZÁM a tabok SZÁM karakter szélesek legyenek, ne pedig 8\n" -#: src/expand.c:119 +#: src/expand.c:118 msgid "" " -t, --tabs=LIST use comma separated list of explicit tab positions\n" msgstr "" " -t, --tabs=LISTA az explicit tab pozíciók vesszőkkel elválasztott\n" " listájának használata\n" -#: src/expand.c:172 src/unexpand.c:191 +#: src/expand.c:171 src/unexpand.c:190 #, c-format msgid "tab stop is too large %s" msgstr "a tab méret túl nagy: %s" -#: src/expand.c:180 src/unexpand.c:199 +#: src/expand.c:179 src/unexpand.c:198 #, c-format msgid "tab size contains invalid character(s): %s" msgstr "a tabméret érvénytelen karaktereket tartalmaz: %s" -#: src/expand.c:206 src/unexpand.c:225 +#: src/expand.c:205 src/unexpand.c:224 #, c-format msgid "tab size cannot be 0" msgstr "a tabméret nem lehet 0" -#: src/expand.c:208 src/unexpand.c:227 +#: src/expand.c:207 src/unexpand.c:226 #, c-format msgid "tab sizes must be ascending" msgstr "a tabméreteknek növekedniük kell" -#: src/expand.c:326 src/expand.c:345 src/unexpand.c:374 src/unexpand.c:419 +#: 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 "a bemeneti sor túl hosszú" @@ -4395,12 +4439,12 @@ msgstr "hiba a szabályos kifejezés illesztésében" msgid "non-integer argument" msgstr "nem egész argumentum" -#: src/expr.c:793 src/truncate.c:316 +#: src/expr.c:793 src/truncate.c:314 #, c-format msgid "division by zero" msgstr "osztás nullával" -#: src/expr.c:887 src/sort.c:2029 +#: src/expr.c:887 src/sort.c:2044 #, 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" @@ -4410,25 +4454,32 @@ msgstr "állítsa be az LC_ALL='C' környezeti változót a probléma megkerül msgid "the strings compared were %s and %s" msgstr "az összehasonlított karakterláncok: %s és %s." -#: src/factor.c:449 -msgid "using arbitrary-precision arithmetic" -msgstr "tetszőleges pontosságú aritmetika használata" +#. This is a proper name. See the gettext manual, section Names. +#: src/factor.c:111 +msgid "Niels Moller" +msgstr "" -#: src/factor.c:460 -msgid "using single-precision arithmetic" -msgstr "egyszeres pontosságú aritmetika használata" +#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459 +#, c-format +msgid "Lucas prime test failure. This should not happen" +msgstr "" -#: src/factor.c:465 src/od.c:1640 src/od.c:1709 +#: src/factor.c:2092 #, c-format -msgid "%s is too large" -msgstr "a(z) %s túl nagy" +msgid "squfof queue overflow" +msgstr "" -#: src/factor.c:469 +#: src/factor.c:2419 #, c-format msgid "%s is not a valid positive integer" msgstr "%s nem egy érvényes pozitív egész" -#: src/factor.c:494 +#: src/factor.c:2442 src/od.c:1646 src/od.c:1715 +#, c-format +msgid "%s is too large" +msgstr "a(z) %s túl nagy" + +#: src/factor.c:2454 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4437,7 +4488,7 @@ msgstr "" "Használat: %s [SZÁM]…\n" " vagy: %s KAPCSOLÓ\n" -#: src/factor.c:499 +#: src/factor.c:2459 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" @@ -4466,20 +4517,20 @@ msgid "cannot stat current directory (now %s)" msgstr "nem lehet az aktuális könyvtárat elérni (most %s)" #. This is a proper name. See the gettext manual, section Names. -#: src/fmt.c:37 +#: src/fmt.c:38 msgid "Ross Paterson" msgstr "Ross Paterson" -#: src/fmt.c:269 +#: src/fmt.c:270 #, c-format msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n" msgstr "Használat: %s [-SZÉLESSÉG] [KAPCSOLÓ]… [FÁJL]…\n" -#: src/fmt.c:270 +#: 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" -"\n" msgstr "" "A FÁJLOK minden egyes bekezdésének újraformázása és szabványos kimenetre " "írása.\n" @@ -4501,8 +4552,8 @@ msgstr "" " csatolásával\n" " -s, --split-only hosszú sorok szétvágása, de újratöltés nélkül\n" -#: src/fmt.c:285 -#, fuzzy, c-format +#: src/fmt.c:287 +#, fuzzy, 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" @@ -4513,7 +4564,7 @@ msgstr "" " -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" -#: src/fmt.c:357 +#: src/fmt.c:359 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -4523,23 +4574,23 @@ msgstr "" "az \n" "első kapcsoló; használja helyette a -w N kapcsolót" -#: src/fmt.c:403 src/fmt.c:414 +#: src/fmt.c:405 src/fmt.c:416 #, c-format 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" -"\n" 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:78 +#: src/fold.c:77 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4549,13 +4600,13 @@ msgstr "" " -s, --spaces tördelés szóközöknél\n" " -w, --width=SZÉLESSÉG SZÉLESSÉG darab oszlop használata 80 helyett\n" -#: src/fold.c:289 src/pr.c:836 +#: src/fold.c:288 src/pr.c:832 #, c-format 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:75 +#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 #: src/truncate.c:37 msgid "Padraig Brady" msgstr "Padraig Brady" @@ -4574,17 +4625,17 @@ msgstr "" "formátumban.\n" "\n" -#: src/group-list.c:69 src/id.c:345 src/setuidgid.c:184 +#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184 #, 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:350 +#: src/group-list.c:74 src/id.c:370 #, c-format msgid "failed to get groups for the current process" msgstr "a jelenlegi folyamat csoportjainak lekérése meghiúsult" -#: src/group-list.c:104 +#: src/group-list.c:114 #, c-format msgid "cannot find name for group ID %lu" msgstr "nem található a név a(z) %lu csoportazonosítóhoz" @@ -4625,11 +4676,11 @@ 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" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" "Minden egyes FÁJL első 10 sorának kiírása a szabványos kimenetre.\n" "Több FÁJL esetén mindegyiket egy fejléc előzi meg, amely megadja a fájl " @@ -4637,7 +4688,7 @@ msgstr "" "Ha a FÁJL nincs megadva, vagy -, akkor a szabványos bemenetet olvassa.\n" "\n" -#: src/head.c:118 +#: src/head.c:117 #, fuzzy msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" @@ -4656,7 +4707,7 @@ msgstr "" "utolsó\n" " N sora kivételével az összeset kiírja\n" -#: src/head.c:126 +#: src/head.c:125 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4664,7 +4715,7 @@ msgstr "" " -q, --quiet, --silent soha ne írja ki a fájlneveket megadó fejléceket\n" " -v, --verbose mindig írja ki a fájlneveket megadó fejléceket\n" -#: src/head.c:132 +#: src/head.c:131 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -4676,58 +4727,58 @@ 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:152 -#, c-format -msgid "error writing %s" -msgstr "hiba %s írása közben" - -#: src/head.c:155 +#: src/head.c:154 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: a fájl túl sokat zsugorodott" -#: src/head.c:228 src/head.c:1044 +#: src/head.c:227 src/head.c:1051 #, c-format msgid "%s: number of bytes is too large" msgstr "%s: a bájtszám túl nagy" -#: src/head.c:441 +#: 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:613 src/head.c:684 src/tail.c:450 +#: src/head.c:612 src/head.c:691 src/tail.c:449 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: nem lehet a(z) %s eltolásra pozicionálni" -#: src/head.c:791 +#: 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 #, c-format msgid "cannot reposition file pointer for %s" msgstr "nem lehet újrapozicionálni %s fájlmutatóját" -#: src/head.c:878 +#: src/head.c:885 #, 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:879 +#: src/head.c:886 msgid "number of lines" msgstr "sorok száma" -#: src/head.c:879 +#: src/head.c:886 msgid "number of bytes" msgstr "bájtok száma" -#: src/head.c:886 src/tail.c:1947 +#: src/head.c:893 src/tail.c:1947 msgid "invalid number of lines" msgstr "érvénytelen sorszám" -#: src/head.c:887 src/tail.c:1948 +#: src/head.c:894 src/tail.c:1948 msgid "invalid number of bytes" msgstr "érvénytelen bájtszám" -#: src/head.c:974 src/head.c:1032 +#: src/head.c:981 src/head.c:1039 #, c-format msgid "invalid trailing option -- %c" msgstr "érvénytelen bevezető kapcsoló -- %c" @@ -4849,86 +4900,86 @@ msgstr "a kontextus nem dolgozható fel" msgid "cannot get effective UID" msgstr "a hatásos felhasználóazonosító nem kérhető le" -#: src/id.c:289 +#: src/id.c:311 #, fuzzy, c-format -msgid "cannot find name for user ID %lu" +msgid "cannot find name for user ID %s" msgstr "nem található a név a(z) %lu felhasználói azonosítóhoz" -#: src/id.c:309 +#: src/id.c:329 #, fuzzy, c-format -msgid "uid=%lu" +msgid "uid=%s" msgstr "uid=%lu" -#: src/id.c:314 +#: src/id.c:334 #, fuzzy, c-format -msgid " gid=%lu" -msgstr " egid=%lu" +msgid " gid=%s" +msgstr " gid=%lu" -#: src/id.c:321 +#: src/id.c:341 #, fuzzy, c-format -msgid " euid=%lu" -msgstr " egid=%lu" +msgid " euid=%s" +msgstr " euid=%lu" -#: src/id.c:329 -#, c-format -msgid " egid=%lu" +#: src/id.c:349 +#, fuzzy, c-format +msgid " egid=%s" msgstr " egid=%lu" -#: src/id.c:357 +#: src/id.c:377 msgid " groups=" msgstr " csoportok=" -#: src/id.c:373 +#: src/id.c:393 #, c-format msgid " context=%s" msgstr " kontextus=%s" -#: src/install.c:372 +#: src/install.c:373 #, 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:413 +#: src/install.c:414 #, c-format msgid "creating directory %s" msgstr "%s könyvtár létrehozása" -#: src/install.c:481 +#: src/install.c:482 #, c-format msgid "cannot change ownership of %s" msgstr "%s tulajdonosa nem változtatható meg" -#: src/install.c:505 +#: src/install.c:506 #, c-format msgid "cannot set time stamps for %s" msgstr "%s időbélyegei nem állíthatók be" -#: src/install.c:526 src/split.c:412 src/timeout.c:387 +#: src/install.c:527 src/split.c:426 src/timeout.c:439 #, c-format msgid "fork system call failed" msgstr "a fork() rendszerhívás sikertelen" -#: src/install.c:530 +#: src/install.c:531 #, c-format msgid "cannot run %s" msgstr "a(z) %s nem futtatható" -#: src/install.c:534 +#: src/install.c:535 #, c-format msgid "waiting for strip" msgstr "várakozás a strip programra" -#: src/install.c:536 +#: src/install.c:537 #, c-format msgid "strip process terminated abnormally" msgstr "A strip folyamat hibával fejeződött be" -#: src/install.c:557 +#: src/install.c:558 #, c-format msgid "invalid user %s" msgstr "érvénytelen felhasználó: %s" -#: src/install.c:593 +#: src/install.c:594 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -4941,7 +4992,8 @@ msgstr "" " vagy: %s [KAPCSOLÓ]… -t KÖNYVTÁR FORRÁS…\n" " vagy: %s [KAPCSOLÓ]… -d KÖNYVTÁR…\n" -#: src/install.c:600 +#: src/install.c:601 +#, fuzzy msgid "" "\n" "This install program copies files (often just compiled) into destination\n" @@ -4953,7 +5005,6 @@ msgid "" "In the first three forms, copy SOURCE to DEST or multiple SOURCE(s) to\n" "the existing DIRECTORY, while setting permission modes and owner/group.\n" "In the 4th form, create all components of the given DIRECTORY(ies).\n" -"\n" msgstr "" "\n" "Ez az install program a kiválasztott helyre másolja a (gyakran épp akkor\n" @@ -5041,7 +5092,7 @@ msgstr "" " -Z, --context=KONTEXTUS fájlok és könyvtárak SELinux biztonsági\n" " kontextusának beállítása\n" -#: src/install.c:858 +#: src/install.c:859 #, c-format msgid "" "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled" @@ -5049,54 +5100,54 @@ msgstr "" "FIGYELMEZTETÉS: a --preserve-context figyelmen kívül marad; ez a rendszermag " "nem SELinux-képes." -#: src/install.c:868 +#: 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:885 +#: src/install.c:886 #, 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:888 +#: src/install.c:889 #, 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:892 +#: 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:946 src/mkdir.c:202 src/stdbuf.c:327 +#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326 #, c-format msgid "invalid mode %s" msgstr "érvénytelen mód: %s" -#: src/install.c:953 +#: src/install.c:954 #, 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:958 +#: src/install.c:959 #, 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:965 +#: src/install.c:966 #, 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:971 +#: src/install.c:972 #, c-format msgid "" "the --compare (-C) option is ignored when you specify a mode with non-" @@ -5106,7 +5157,7 @@ msgstr "" "nélküli módot ad meg" #. This is a proper name. See the gettext manual, section Names. -#: src/join.c:40 src/sort.c:65 +#: src/join.c:40 src/sort.c:66 msgid "Mike Haertel" msgstr "Mike Haertel" @@ -5216,8 +5267,8 @@ msgstr "" "össze, akkor figyelmeztető üzenet jelenik meg.\n" #: src/join.c:403 -#, c-format -msgid "%s:%ju: is not sorted: %.*s" +#, fuzzy, c-format +msgid "%s:%<PRIuMAX>: is not sorted: %.*s" msgstr "%s:%ju: nincs rendezve: %.*s" #: src/join.c:840 src/join.c:1038 @@ -5245,12 +5296,12 @@ msgstr "inkompatibilis összekapcsolási mezők: %lu, %lu" msgid "conflicting empty-field replacement strings" msgstr "ütköző üres-mező helyettesítési karakterlánc" -#: src/join.c:1101 src/sort.c:4414 +#: src/join.c:1101 src/sort.c:4468 #, c-format msgid "multi-character tab %s" msgstr "többkarakteres tab: %s" -#: src/join.c:1105 src/sort.c:4419 +#: src/join.c:1105 src/sort.c:4473 #, c-format msgid "incompatible tabs" msgstr "nem kompatibilis tabok" @@ -5272,14 +5323,13 @@ msgstr "" " vagy: %s -t [SZIGNÁL]…\n" #: src/kill.c:82 -msgid "" -"Send signals to processes, or list signals.\n" -"\n" +#, fuzzy +msgid "Send signals to processes, or list signals.\n" msgstr "" "Szignálok küldése folyamatoknak, vagy szignálok felsorolása\n" "\n" -#: src/kill.c:89 +#: src/kill.c:88 msgid "" " -s, --signal=SIGNAL, -SIGNAL\n" " specify the name or number of the signal to be sent\n" @@ -5293,7 +5343,7 @@ msgstr "" " visszaalakítása\n" " -t, --table szignálinformációkat tartalmazó táblázat kiírása\n" -#: src/kill.c:97 +#: src/kill.c:96 #, fuzzy msgid "" "\n" @@ -5307,32 +5357,32 @@ msgstr "" "„1”, vagy egy szignál által befejeztetett folyamat kilépési állapota.\n" "A PID egy egész, ha negatív, akkor egy folyamatcsoportot azonosít.\n" -#: src/kill.c:206 +#: src/kill.c:205 #, c-format msgid "%s: invalid process id" msgstr "%s: érvénytelen folyamatazonosító" -#: src/kill.c:260 +#: src/kill.c:259 #, c-format msgid "invalid option -- %c" msgstr "érvénytelen kapcsoló -- %c" -#: src/kill.c:269 +#: src/kill.c:268 #, c-format msgid "%s: multiple signals specified" msgstr "%s: több szignált adott meg" -#: src/kill.c:283 +#: src/kill.c:282 #, c-format msgid "multiple -l or -t options specified" msgstr "több -l vagy -t kapcsolót adott meg" -#: src/kill.c:300 +#: src/kill.c:299 #, c-format msgid "cannot combine signal with -l or -t" msgstr "a szignál nem kombinálható a -l vagy -t kapcsolóval" -#: src/kill.c:306 +#: src/kill.c:305 #, c-format msgid "no process ID specified" msgstr "nincs megadva folyamatazonosító" @@ -5434,6 +5484,7 @@ msgstr "" " vagy: %s [KAPCSOLÓ]… -t KÖNYVTÁR… CÉL… (4. alak)\n" #: src/ln.c:381 +#, fuzzy 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 +5494,6 @@ msgid "" "When creating hard links, each TARGET must exist. Symbolic links\n" "can hold arbitrary text; if later resolved, a relative link is\n" "interpreted in relation to its parent directory.\n" -"\n" msgstr "" "Az 1. alakban használva linket hoz létre a megadott CÉLRA a LINK_NEVE " "néven.\n" @@ -5458,7 +5508,7 @@ msgstr "" "feloldáskor a relatív linkek szülőkönyvtárukhoz képest lesznek értelmezve.\n" "\n" -#: src/ln.c:395 +#: src/ln.c:394 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -5478,7 +5528,7 @@ msgstr "" "is)\n" " -f, --force létező célfájlok törlése\n" -#: src/ln.c:403 +#: src/ln.c:402 #, fuzzy msgid "" " -i, --interactive prompt whether to remove destinations\n" @@ -5501,7 +5551,7 @@ msgstr "" " -s, --symbolic szimbolikus linkek létrehozása hard linkek " "helyett\n" -#: src/ln.c:412 +#: src/ln.c:411 msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" " -t, --target-directory=DIRECTORY specify the DIRECTORY in which to " @@ -5519,24 +5569,10 @@ msgstr "" "fájlként\n" " -v, --verbose linkelés előtt kiírja minden fájl nevét\n" -#: src/ln.c:428 +#: src/ln.c:433 +#, fuzzy, c-format 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 nem készít mentést (még a --backup megadása esetén sem)\n" -" numbered, t számozott mentést készít\n" -" existing, nil számozott, ha már létezik számozott változat, egyébként\n" -" egyszerű\n" -" simple, never mindig egyszerű biztonsági mentés\n" -"\n" - -#: src/ln.c:435 -#, c-format -msgid "" "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 "" @@ -5617,7 +5653,7 @@ 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:1976 +#: src/ls.c:1750 src/ptx.c:1975 #, c-format msgid "invalid line width: %s" msgstr "érvénytelen sorhossz: %s" @@ -5681,23 +5717,23 @@ msgstr "%s könyvtár olvasása" msgid "closing directory %s" msgstr "%s könyvtár bezárása" -#: src/ls.c:3301 +#: src/ls.c:3302 #, 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 msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" -"\n" 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:4729 +#: src/ls.c:4728 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -5712,7 +5748,7 @@ msgstr "" " -b, --escape C-stílusú escape karaktereket jelenít meg\n" " a nem-grafikus karakterek helyett\n" -#: src/ls.c:4735 +#: src/ls.c:4734 #, fuzzy msgid "" " --block-size=SIZE scale sizes by SIZE before printing them. E." @@ -5739,7 +5775,7 @@ msgstr "" " szerint, egyébként: rendezés ctime szerint,\n" " legújabb előre\n" -#: src/ls.c:4745 +#: src/ls.c:4744 #, fuzzy msgid "" " -C list entries by columns\n" @@ -5761,7 +5797,7 @@ msgstr "" " és ne kövesse a szimbolikus linkeket\n" " -D, --dired az Emacs dired módja által használt kimenet\n" -#: src/ls.c:4753 +#: src/ls.c:4752 #, fuzzy msgid "" " -f do not sort, enable -aU, disable -ls --color\n" @@ -5784,11 +5820,11 @@ msgstr "" " vertical: -C\n" " --full-time mint a -l --time-style=full-iso\n" -#: src/ls.c:4761 +#: src/ls.c:4760 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:4764 +#: src/ls.c:4763 msgid "" " --group-directories-first\n" " group directories before files.\n" @@ -5801,7 +5837,7 @@ msgstr "" " --sort=none (-U) használata letiltja a\n" " csoportosítást\n" -#: src/ls.c:4770 +#: src/ls.c:4769 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" @@ -5814,7 +5850,7 @@ msgstr "" " -H, --si ugyanaz mint előbb, de a szorzó 1024 helyett " "1000\n" -#: src/ls.c:4776 +#: src/ls.c:4775 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5836,7 +5872,7 @@ msgstr "" "illeszkedő\n" " bejegyzéseket (a -a vagy -A felülbírálja)\n" -#: src/ls.c:4786 +#: src/ls.c:4785 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -5856,7 +5892,7 @@ msgstr "" " bejegyzéseket\n" " -k, --kibibytes 1024 bájtos blokkok használata\n" -#: src/ls.c:4796 +#: src/ls.c:4795 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5873,7 +5909,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:4804 +#: src/ls.c:4803 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. " @@ -5893,7 +5929,7 @@ msgstr "" " -p, --indicator-style=slash\n" " egy / jelet fűz a könyvtárakhoz\n" -#: src/ls.c:4812 +#: src/ls.c:4811 #, fuzzy msgid "" " -q, --hide-control-chars print ? instead of non graphic characters\n" @@ -5915,7 +5951,7 @@ msgstr "" " literal, locale, shell, shell-always, c, " "escape\n" -#: src/ls.c:4821 +#: src/ls.c:4820 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -5926,7 +5962,7 @@ 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:4826 +#: src/ls.c:4825 msgid "" " -S sort by file size\n" " --sort=WORD sort by WORD instead of name: none -U,\n" @@ -5951,7 +5987,7 @@ msgstr "" " status: -c; a megadott idő alapján rendez,\n" " ha a --sort=time kapcsoló meg van adva\n" -#: src/ls.c:4836 +#: src/ls.c:4835 #, fuzzy msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" @@ -5977,7 +6013,7 @@ msgstr "" " csak a POSIX területi beállításokon kívül\n" " lép életbe.\n" -#: src/ls.c:4845 +#: src/ls.c:4844 msgid "" " -t sort by modification time, newest first\n" " -T, --tabsize=COLS assume tab stops at each COLS instead of 8\n" @@ -5986,7 +6022,7 @@ msgstr "" "előre\n" " -T, --tabsize=OSZL tabulátor minden OSZL-nál, 8 helyett\n" -#: src/ls.c:4849 +#: src/ls.c:4848 msgid "" " -u with -lt: sort by, and show, access time\n" " with -l: show access time and sort by name\n" @@ -6005,7 +6041,7 @@ msgstr "" " -v rendezés a szövegben lévő (verzió)számok " "szerint\n" -#: src/ls.c:4856 +#: src/ls.c:4855 msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" @@ -6022,7 +6058,7 @@ msgstr "" " kontextusának kiírása\n" " -1 soronként egy fájlnevet ír ki\n" -#: src/ls.c:4866 +#: src/ls.c:4865 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -6038,7 +6074,7 @@ msgstr "" "változóval módosíthatók a beállítások, ehhez a dircolors parancs " "használható.\n" -#: src/ls.c:4873 +#: src/ls.c:4872 msgid "" "\n" "Exit status:\n" @@ -6068,7 +6104,7 @@ msgstr "Scott Miller" msgid "David Madore" msgstr "David Madore" -#: src/md5sum.c:162 +#: src/md5sum.c:164 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -6081,7 +6117,7 @@ msgstr "" "Ha a FÁJL nincs megadva, vagy -, akkor a szabványos bemenetet olvassa.\n" "\n" -#: src/md5sum.c:172 +#: src/md5sum.c:174 msgid "" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" @@ -6089,29 +6125,33 @@ msgstr "" " -b, --binary olvasás bináris módban (alapértelmezett, ha nem\n" " terminál szabványos bemenetet olvas)\n" -#: src/md5sum.c:176 +#: src/md5sum.c:178 msgid " -b, --binary read in binary mode\n" msgstr " -b, --binary bináris módú olvasás\n" -#: src/md5sum.c:179 +#: src/md5sum.c:181 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr "" " -c, --check %s összegek olvasása a FÁJLOKBÓL, és\n" " azok ellenőrzése\n" -#: src/md5sum.c:183 +#: src/md5sum.c:184 +msgid " --tag create a BSD-style checksum\n" +msgstr "" + +#: src/md5sum.c:188 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" " -t, --text olvasás szöveges módban (alapértelmezett, ha\n" " terminál szabványos bemenetet olvas)\n" -#: src/md5sum.c:187 +#: src/md5sum.c:192 msgid " -t, --text read in text mode (default)\n" msgstr " -t, --text olvasás szöveges módban (alapértelmezett)\n" -#: src/md5sum.c:190 +#: src/md5sum.c:195 msgid "" "\n" "The following three options are useful only when verifying checksums:\n" @@ -6128,7 +6168,7 @@ msgstr "" " ellenőrzőösszeg-sorokra\n" "\n" -#: src/md5sum.c:198 +#: src/md5sum.c:203 msgid "" " --strict with --check, exit non-zero for any invalid input\n" msgstr "" @@ -6136,7 +6176,7 @@ msgstr "" "minden\n" " érvénytelen bemenet esetén\n" -#: src/md5sum.c:203 +#: src/md5sum.c:208 #, fuzzy, c-format msgid "" "\n" @@ -6152,78 +6192,88 @@ msgstr "" "karakter („*” = bináris, szóköz = szöveg) és egy név kiírása minden egyes " "FÁJLHOZ.\n" -#: src/md5sum.c:502 +#: src/md5sum.c:523 #, c-format msgid "%s: too many checksum lines" msgstr "%s: túl sok ellenőrzőösszeg-sor" -#: src/md5sum.c:526 +#: src/md5sum.c:547 #, 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:551 +#: src/md5sum.c:572 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: a megnyitás vagy olvasás meghiúsult\n" -#: src/md5sum.c:574 +#: src/md5sum.c:595 msgid "FAILED" msgstr "HIBÁS" -#: src/md5sum.c:576 +#: src/md5sum.c:597 msgid "OK" msgstr "RENDBEN" -#: src/md5sum.c:600 +#: src/md5sum.c:621 #, 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:610 +#: src/md5sum.c:631 #, 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:618 +#: src/md5sum.c:639 #, 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:626 +#: src/md5sum.c:647 #, 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:704 +#: src/md5sum.c:760 +#, c-format +msgid "--tag does not support --text mode" +msgstr "" + +#: src/md5sum.c:766 +#, fuzzy, c-format +msgid "the --tag option is meaningless when verifying checksums" +msgstr "a --status kapcsoló csak ellenőrzőösszegek ellenőrzésekor értelmes" + +#: src/md5sum.c:773 #, 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:712 +#: src/md5sum.c:781 #, 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:719 +#: src/md5sum.c:788 #, 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:726 +#: src/md5sum.c:795 #, 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:733 +#: src/md5sum.c:802 #, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "a --strict kapcsoló csak ellenőrzőösszegek ellenőrzésekor értelmes" @@ -6234,12 +6284,11 @@ msgid "Usage: %s [OPTION]... DIRECTORY...\n" msgstr "Használat: %s [KAPCSOLÓ]… KÖNYVTÁR…\n" #: src/mkdir.c:57 -msgid "" -"Create the DIRECTORY(ies), if they do not already exist.\n" -"\n" +#, fuzzy +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:64 +#: src/mkdir.c:63 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" @@ -6254,7 +6303,7 @@ msgstr "" " -Z, --context=KTX minden létrehozott könyvtár SELinux biztonsági\n" " kontextusának beállítása a KTX-re\n" -#: src/mkdir.c:169 +#: src/mkdir.c:168 #, c-format msgid "created directory %s" msgstr "%s könyvtár létrejött" @@ -6265,20 +6314,19 @@ msgid "Usage: %s [OPTION]... NAME...\n" msgstr "Használat: %s [KAPCSOLÓ] NÉV…\n" #: src/mkfifo.c:52 -msgid "" -"Create named pipes (FIFOs) with the given NAMEs.\n" -"\n" +#, fuzzy +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" -#: src/mkfifo.c:59 src/mknod.c:61 +#: src/mkfifo.c:58 src/mknod.c:60 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:62 +#: src/mkfifo.c:61 msgid "" " -Z, --context=CTX set the SELinux security context of each NAME to CTX\n" msgstr "" @@ -6286,12 +6334,12 @@ msgstr "" "a\n" " KTX-re\n" -#: src/mkfifo.c:122 src/mknod.c:128 +#: src/mkfifo.c:121 src/mknod.c:127 #, c-format msgid "invalid mode" msgstr "érvénytelen mód" -#: src/mkfifo.c:127 src/mknod.c:133 +#: src/mkfifo.c:126 src/mknod.c:132 #, c-format msgid "mode must specify only file permission bits" msgstr "a mód csak fájljogosultságbiteket adhat meg" @@ -6302,20 +6350,19 @@ 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 -msgid "" -"Create the special file NAME of the given TYPE.\n" -"\n" +#, fuzzy +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:64 +#: 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" -#: src/mknod.c:69 +#: src/mknod.c:68 msgid "" "\n" "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n" @@ -6332,7 +6379,7 @@ msgstr "" "egyébként\n" "decimálisan. A TÍPUS az alábbiak egyike lehet:\n" -#: src/mknod.c:76 +#: src/mknod.c:75 msgid "" "\n" " b create a block (buffered) special file\n" @@ -6344,42 +6391,42 @@ msgstr "" " c, u speciális karakterfájl (nem-pufferelt) létrehozása\n" " p FIFO létrehozása\n" -#: src/mknod.c:151 +#: src/mknod.c:150 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:161 +#: src/mknod.c:160 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:177 +#: src/mknod.c:176 #, c-format msgid "block special files not supported" msgstr "a speciális blokkfájl nem támogatott" -#: src/mknod.c:186 +#: src/mknod.c:185 #, c-format msgid "character special files not supported" msgstr "a speciális karakterfájl nem támogatott" -#: src/mknod.c:202 +#: src/mknod.c:201 #, c-format msgid "invalid major device number %s" msgstr "érvénytelen major eszközszám: %s" -#: src/mknod.c:207 +#: src/mknod.c:206 #, c-format msgid "invalid minor device number %s" msgstr "érvénytelen minor eszközszám: %s" -#: src/mknod.c:212 +#: src/mknod.c:211 #, c-format msgid "invalid device %s %s" msgstr "érvénytelen eszköz %s %s" -#: src/mknod.c:226 +#: src/mknod.c:225 #, c-format msgid "invalid device type %s" msgstr "érvénytelen eszköztípus: %s" @@ -6469,61 +6516,60 @@ msgstr "" " különben a -p segítségével megadott könyvtár, különben\n" " /tmp [elavult]\n" -#: src/mktemp.c:222 +#: 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:228 +#: src/mktemp.c:229 #, c-format msgid "too many templates" msgstr "túl sok sablon" -#: src/mktemp.c:248 +#: src/mktemp.c:249 #, 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:273 src/split.c:1117 +#: src/mktemp.c:274 src/split.c:1130 #, 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:278 +#: src/mktemp.c:279 #, c-format msgid "too few X's in template %s" msgstr "túl kevés X a következő sablonban: %s" -#: src/mktemp.c:291 +#: src/mktemp.c:292 #, 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:305 +#: src/mktemp.c:306 #, 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:325 +#: src/mktemp.c:326 #, 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:335 +#: src/mktemp.c:336 #, 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:290 -msgid "" -"Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" -"\n" +#: src/mv.c:292 +#, fuzzy +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:297 +#: src/mv.c:298 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -6544,7 +6590,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:306 +#: src/mv.c:307 msgid "" " --strip-trailing-slashes remove any trailing slashes from each " "SOURCE\n" @@ -6557,7 +6603,7 @@ msgstr "" "kiterjesztésének\n" " felülbírálása\n" -#: src/mv.c:311 +#: src/mv.c:312 msgid "" " -t, --target-directory=DIRECTORY move all SOURCE arguments into " "DIRECTORY\n" @@ -6581,13 +6627,11 @@ msgid "Usage: %s [OPTION] [COMMAND [ARG]...]\n" msgstr "Használat: %s [KAPCSOLÓ] [PARANCS [ARG]…]\n" #: src/nice.c:73 -#, c-format +#, fuzzy, c-format msgid "" "Run COMMAND with an adjusted niceness, which affects process scheduling.\n" -"With no COMMAND, print the current niceness. Nicenesses range from\n" -"%d (most favorable scheduling) to %d (least favorable).\n" -"\n" -" -n, --adjustment=N add integer N to the niceness (default 10)\n" +"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 "" "A PARANCS futtatása módosított nice értékkel, amely a folyamatütemezést " "érinti.\n" @@ -6598,22 +6642,26 @@ msgstr "" " -n, --adjustment=N az N egész szám hozzáadása a nice értékhez\n" " (az alapértelmezett: 10)\n" -#: src/nice.c:168 +#: src/nice.c:82 +msgid " -n, --adjustment=N add integer N to the niceness (default 10)\n" +msgstr "" + +#: src/nice.c:172 #, c-format msgid "invalid adjustment %s" msgstr "érvénytelen módosítás: %s" -#: src/nice.c:177 +#: src/nice.c:181 #, c-format msgid "a command must be given with an adjustment" msgstr "meg kell adni egy parancsot a módosítással" -#: src/nice.c:184 src/nice.c:195 +#: src/nice.c:188 src/nice.c:199 #, c-format msgid "cannot get niceness" msgstr "nem kérhető le a nice érték" -#: src/nice.c:201 +#: src/nice.c:205 #, c-format msgid "cannot set niceness" msgstr "nem állítható be a nice érték" @@ -6623,17 +6671,17 @@ msgstr "nem állítható be a nice érték" msgid "Scott Bartram" msgstr "Scott Bartram" -#: src/nl.c:186 +#: 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" -"\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:194 +#: src/nl.c:186 msgid "" " -b, --body-numbering=STYLE use STYLE for numbering body lines\n" " -d, --section-delimiter=CC use CC for separating logical pages\n" @@ -6646,7 +6694,7 @@ msgstr "" " -f, --footer-numbering=STÍLUS a STÍLUS használata a lábléc sorainak\n" " számozásához\n" -#: src/nl.c:199 +#: src/nl.c:191 msgid "" " -h, --header-numbering=STYLE use STYLE for numbering header lines\n" " -i, --line-increment=NUMBER line number increment at each line\n" @@ -6669,7 +6717,7 @@ msgstr "" "(lehetséges)\n" " sorszámnál\n" -#: src/nl.c:207 +#: src/nl.c:199 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" @@ -6678,7 +6726,7 @@ msgstr "" " -w, --number-width=SZÁM SZÁM darab oszlop használata a " "sorszámokhoz\n" -#: src/nl.c:213 +#: src/nl.c:205 msgid "" "\n" "By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC are\n" @@ -6692,7 +6740,7 @@ msgstr "" "akkor : kerül felhasználásra. A \\\\ beírásával kapható a \\ jel. A STÍLUS\n" "az alábbiak egyike:\n" -#: src/nl.c:219 +#: src/nl.c:211 msgid "" "\n" " a number all lines\n" @@ -6723,54 +6771,47 @@ msgstr "" " rz jobbra igazított, kezdő nullákkal\n" "\n" -#: src/nl.c:286 +#: src/nl.c:278 #, c-format msgid "line number overflow" msgstr "sorszámtúlcsordulás" -#: src/nl.c:486 +#: src/nl.c:478 #, c-format msgid "invalid header numbering style: %s" msgstr "érvénytelen fejlécszámozási stílus: %s" -#: src/nl.c:494 +#: src/nl.c:486 #, c-format msgid "invalid body numbering style: %s" msgstr "érvénytelen törzsszámozási stílus: %s" -#: src/nl.c:502 +#: src/nl.c:494 #, c-format msgid "invalid footer numbering style: %s" msgstr "érvénytelen láblécszámozási stílus: %s" -#: src/nl.c:511 +#: src/nl.c:503 #, c-format msgid "invalid starting line number: %s" msgstr "érvénytelen kezdősorszám: %s" -#: src/nl.c:517 -#, c-format -msgid "WARNING: --page-increment is deprecated; use --line-increment instead" -msgstr "" -"FIGYELMEZTETÉS: a --page-increment kapcsoló elavult, használja a --line-" -"increment kapcsolót helyette" - -#: src/nl.c:524 +#: src/nl.c:512 #, c-format msgid "invalid line number increment: %s" msgstr "érvénytelen sorszámnövekmény: %s" -#: src/nl.c:536 +#: src/nl.c:524 #, c-format msgid "invalid number of blank lines: %s" msgstr "érvénytelen üressorszám: %s" -#: src/nl.c:550 +#: src/nl.c:538 #, c-format msgid "invalid line number field width: %s" msgstr "érvénytelen sorszámmező szélesség: %s" -#: src/nl.c:569 +#: src/nl.c:557 #, c-format msgid "invalid line numbering format: %s" msgstr "érvénytelen sorszámozási formátum: %s" @@ -6822,11 +6863,6 @@ msgstr "a szabványos hibakimenet használhatatlanná tétele meghiúsult" msgid "ignoring input" msgstr "bemenet figyelmen kívül hagyása" -#: src/nohup.c:163 src/nohup.c:165 -#, c-format -msgid "failed to open %s" -msgstr "%s megnyitása meghiúsult" - #: src/nohup.c:175 #, c-format msgid "ignoring input and appending output to %s" @@ -6863,16 +6899,16 @@ msgid "failed to redirect standard error" msgstr "a szabványos hibakimenet átirányítása meghiúsult" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:32 +#: src/nproc.c:33 msgid "Giuseppe Scrivano" msgstr "Giuseppe Scrivano" -#: src/nproc.c:56 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 +#: src/nproc.c:57 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Használat: %s [KAPCSOLÓ]…\n" -#: src/nproc.c:57 +#: src/nproc.c:58 msgid "" "Print the number of processing units available to the current process,\n" "which may be less than the number of online processors\n" @@ -6882,7 +6918,7 @@ msgstr "" "ez kisebb lehet az elérhető processzorok számánál\n" "\n" -#: src/nproc.c:62 +#: src/nproc.c:63 msgid "" " --all print the number of installed processors\n" " --ignore=N if possible, exclude N processing units\n" @@ -6890,11 +6926,352 @@ msgstr "" " --all a beépített processzorok számának kiírása\n" " --ignore=N ha lehetséges, N feldolgozóegység figyelmen kívül hagyása\n" -#: src/nproc.c:106 +#: src/nproc.c:107 #, c-format 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 +msgid "Assaf Gordon" +msgstr "" + +#: 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:680 +#, fuzzy, c-format +msgid "invalid number: '%s'" +msgstr "érvénytelen szám: %s" + +#: src/numfmt.c:684 +#, c-format +msgid "rejecting suffix in input: '%s' (consider using --from)" +msgstr "" + +#: 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:692 +#, c-format +msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)" +msgstr "" + +#: src/numfmt.c:723 +#, fuzzy, c-format +msgid "failed to prepare value '%Lf' for printing" +msgstr "%s megnyitása í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 +#, c-format +msgid "out of memory (requested %zu bytes)" +msgstr "" + +#: src/numfmt.c:813 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [NUMBER]...\n" +msgstr "Használat: %s [KAPCSOLÓ]… [FELHASZNÁLÓ]…\n" + +#: src/numfmt.c:816 +msgid "" +"Reformat NUMBER(s), or the numbers from standard input if none are " +"specified.\n" +msgstr "" + +#: src/numfmt.c:820 +#, fuzzy +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" + +#: src/numfmt.c:823 +msgid "" +" -d, --delimiter=X use X instead of whitespace for field delimiter\n" +msgstr "" + +#: src/numfmt.c:826 +msgid "" +" --field=N replace the number in input field N (default is 1)\n" +msgstr "" + +#: src/numfmt.c:829 +msgid "" +" --format=FORMAT use printf style floating-point FORMAT;\n" +" see FORMAT below for details\n" +msgstr "" + +#: src/numfmt.c:833 +msgid "" +" --from=UNIT auto-scale input numbers to UNITs; default is " +"'none';\n" +" see UNIT below\n" +msgstr "" + +#: src/numfmt.c:837 +msgid "" +" --from-unit=N specify the input unit size (instead of the default " +"1)\n" +msgstr "" + +#: src/numfmt.c:840 +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 "" + +#: src/numfmt.c:844 +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 +msgid "" +" --invalid=MODE failure mode for invalid numbers: MODE can be:\n" +" abort (default), fail, warn, ignore\n" +msgstr "" + +#: src/numfmt.c:852 +msgid "" +" --padding=N pad the output to N characters; positive N will\n" +" right-align; negative N will left-align;\n" +" padding is ignored if the output is wider than N;\n" +" the default is to automatically pad if a " +"whitespace\n" +" is found\n" +msgstr "" + +#: src/numfmt.c:859 +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 +msgid "" +" --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" +" SUFFIX in input numbers\n" +msgstr "" + +#: src/numfmt.c:867 +msgid "" +" --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" +msgstr "" + +#: src/numfmt.c:870 +msgid "" +" --to-unit=N the output unit size (instead of the default 1)\n" +msgstr "" + +#: src/numfmt.c:877 +#, fuzzy +msgid "" +"\n" +"UNIT options:\n" +msgstr "" +"Egyéb kapcsolók:\n" +"\n" + +#: src/numfmt.c:880 +msgid " none no auto-scaling is done; suffixes will trigger an error\n" +msgstr "" + +#: src/numfmt.c:883 +msgid "" +" auto accept optional single/two letter suffix:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" +msgstr "" + +#: src/numfmt.c:889 +msgid "" +" si accept optional single letter suffix:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:894 +msgid "" +" iec accept optional single letter suffix:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:899 +msgid "" +" iec-i accept optional two-letter suffix:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:905 +#, 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" +msgstr "" + +#: src/numfmt.c:912 +#, c-format +msgid "" +"\n" +"Exit status is 0 if all input numbers were successfully converted.\n" +"By default, %s will stop at the first conversion error with exit status 2.\n" +"With --invalid='fail' a warning is printed for each conversion error\n" +"and the exit status is 2. With --invalid='warn' each conversion error is\n" +"diagnosed, but the exit status is 0. With --invalid='ignore' conversion\n" +"errors are not diagnosed and the exit status is 0.\n" +msgstr "" + +#: src/numfmt.c:921 +#, c-format +msgid "" +"\n" +"Examples:\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" +msgstr "" + +#: src/numfmt.c:974 src/seq.c:212 +#, 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 +msgid "invalid format %s (width overflow)" +msgstr "érvénytelen dátumformátum: %s" + +#: src/numfmt.c:1007 src/seq.c:229 +#, 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" +msgstr "" + +#: src/numfmt.c:1018 src/seq.c:236 +#, 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:1092 +#, c-format +msgid "value too large to be printed: '%Lg' (consider using --to)" +msgstr "" + +#: src/numfmt.c:1100 +#, c-format +msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" +msgstr "" + +#: src/numfmt.c:1184 +#, c-format +msgid "large input value '%s': possible precision loss" +msgstr "" + +#: src/numfmt.c:1293 +#, 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 "érvénytelen oldaltartomány: %s" + +#: src/numfmt.c:1401 +#, fuzzy, c-format +msgid "invalid field value '%s'" +msgstr "érvénytelen mezőszám: %s" + +#: src/numfmt.c:1430 +#, fuzzy, c-format +msgid "invalid header value '%s'" +msgstr "érvénytelen dátum: %s" + +#: src/numfmt.c:1456 +#, fuzzy, c-format +msgid "--grouping cannot be combined with --format" +msgstr "a fájloperandusok nem kombinálhatók a --files0-from 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 +msgid "no conversion option specified" +msgstr "több -i kapcsolót adott meg" + +#: src/numfmt.c:1471 +#, fuzzy, c-format +msgid "grouping cannot be combined with --to" +msgstr "a fájloperandusok nem kombinálhatók a --files0-from kapcsolóval" + +#: src/numfmt.c:1473 +#, c-format +msgid "grouping has no effect in this locale" +msgstr "" + +#: src/numfmt.c:1486 +#, c-format +msgid "--header ignored with command-line input" +msgstr "" + +#: src/numfmt.c:1511 +#, fuzzy, c-format +msgid "error reading input" +msgstr "hiba %s olvasása közben" + +#: src/numfmt.c:1520 +#, fuzzy, c-format +msgid "failed to convert some of the input numbers" +msgstr "a szabványos hibakimenet használhatatlanná tétele meghiúsult" + #: src/od.c:294 #, c-format msgid "" @@ -6926,29 +7303,48 @@ msgstr "" "\n" #: src/od.c:307 -msgid "All arguments to long options are mandatory for short options.\n" +#, fuzzy +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" +"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" +"at first byte printed, incremented when dump is progressing.\n" +"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 "" -"Ha egy hosszú kapcsolóhoz kötelező argumentumot megadni, akkor ez a \n" -"megfelelő rövid kapcsolónál is kötelező.\n" +"\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" +"kezdődik. Az ELTOLÁS operandus a -j ELTOLÁS kapcsolót jelenti. A CÍMKE az " +"első\n" +"kiírandó bájt pszeudo-címe, amely a kiíratás előrehaladásával növekszik. Az\n" +"ELTOLÁS és a CÍMKE esetén egy 0x vagy 0X előtag hexadecimális ábrázolást " +"jelez;\n" +"az utótagok a . (oktális) és b (szorzás 512-vel) lehetnek.\n" -#: src/od.c:310 +#: src/od.c:318 +#, fuzzy msgid "" -" -A, --address-radix=RADIX decide how file offsets are printed\n" +" -A, --address-radix=RADIX output format for file offsets. RADIX is one\n" +" of [doxn], for Decimal, Octal, Hex or None\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" " -j, --skip-bytes=BÁJT BÁJT darab bemeneti bájt kihagyása először\n" -#: src/od.c:314 +#: src/od.c:323 #, 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" -" --traditional accept arguments in traditional form\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=BÁJT a kiíratás korlátozása BÁJT darab bemeneti " "bájtra\n" @@ -6962,9 +7358,11 @@ msgstr "" " --traditional argumentumok elfogadása a hagyományos " "formában\n" -#: src/od.c:324 +#: src/od.c:336 +#, fuzzy 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" @@ -6981,7 +7379,7 @@ msgstr "" " -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:332 +#: src/od.c:345 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -6997,32 +7395,12 @@ 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:340 +#: src/od.c:353 +#, fuzzy msgid "" "\n" -"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" -"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" -"at first byte printed, incremented when dump is progressing.\n" -"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" -"kezdődik. Az ELTOLÁS operandus a -j ELTOLÁS kapcsolót jelenti. A CÍMKE az " -"első\n" -"kiírandó bájt pszeudo-címe, amely a kiíratás előrehaladásával növekszik. Az\n" -"ELTOLÁS és a CÍMKE esetén egy 0x vagy 0X előtag hexadecimális ábrázolást " -"jelez;\n" -"az utótagok a . (oktális) és b (szorzás 512-vel) lehetnek.\n" - -#: src/od.c:349 -msgid "" "\n" "TYPE is made up of one or more of these specifications:\n" -"\n" " a named character, ignoring high-order bit\n" " c ASCII character or backslash escape\n" msgstr "" @@ -7033,7 +7411,7 @@ msgstr "" "hagyása\n" " c ASCII karakter vagy visszaper escape\n" -#: src/od.c:356 +#: src/od.c:360 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -7047,10 +7425,11 @@ 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:363 +#: src/od.c:367 +#, fuzzy msgid "" "\n" -"SIZE is a number. For TYPE in doux, SIZE may also be C for\n" +"SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" "sizeof(char), S for sizeof(short), I for sizeof(int) or L for\n" "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" @@ -7061,42 +7440,37 @@ msgstr "" "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:370 +#: src/od.c:374 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" +"Adding a z suffix to any type displays printable characters at the end of\n" +"each output line.\n" msgstr "" -"\n" -"Az ALAP d, ha decimális, o ha oktális, x ha hexadecimális vagy n, ha nincs.\n" -"A BÁJT hexadecimális a 0x vagy 0X előtaggal és a következő szorzó-" -"utótagokkal\n" -"rendelkezhet: 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 esetén.\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:380 +#: src/od.c:379 +#, 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" +"\n" +"\n" +"BYTES is hex with 0x or 0X prefix, and may have a multiplier suffix:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"and so on for G, T, P, E, Z, Y.\n" msgstr "" -"A --string kapcsoló szám nélkül 3-at jelent. A --width szám nélkül 32-t.\n" -"Alapértelmezésben az od a következőket használja: -A o -t oS -w16.\n" +"\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" -#: src/od.c:633 src/od.c:753 +#: src/od.c:639 src/od.c:759 #, c-format msgid "invalid type string %s" msgstr "érvénytelen típus-karakterlánc: %s" -#: src/od.c:643 +#: src/od.c:649 #, c-format msgid "" "invalid type string %s;\n" @@ -7105,7 +7479,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:764 +#: src/od.c:770 #, c-format msgid "" "invalid type string %s;\n" @@ -7114,38 +7488,38 @@ 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:822 +#: src/od.c:828 #, fuzzy, c-format msgid "invalid character '%c' in type string %s" msgstr "a(z) %c karakter érvénytelen a(z) %s típus-karakterláncban" -#: src/od.c:1047 +#: src/od.c:1053 #, 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:1603 +#: src/od.c:1609 #, fuzzy, 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" -#: src/od.c:1729 +#: src/od.c:1735 #, 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:1804 +#: src/od.c:1810 msgid "compatibility mode supports at most one file" msgstr "a kompatibilitási mód legfeljebb egy fájlt támogat" -#: src/od.c:1825 +#: src/od.c:1831 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "a kihagyandó és beolvasandó bájtok összege túl nagy" -#: src/od.c:1868 +#: src/od.c:1874 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "" @@ -7162,18 +7536,18 @@ 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" "With no FILE, or when FILE is -, read standard input.\n" -"\n" 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:448 +#: 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" @@ -7183,7 +7557,7 @@ msgstr "" " -s, --serial egyszerre egy fájl beillesztése párhuzamos\n" " feldolgozás helyett\n" -#: src/paste.c:509 +#: src/paste.c:508 #, c-format msgid "delimiter list ends with an unescaped backslash: %s" msgstr "az elválasztólista nem escapelt visszaperre végződik: %s" @@ -7245,80 +7619,80 @@ msgid "Kaveh Ghazi" msgstr "Kaveh Ghazi" #. TRANSLATORS: Real name is unknown; at most 19 characters. -#: src/pinky.c:250 +#: src/pinky.c:242 msgid " ???" msgstr " ???" #. TRANSLATORS: Idle time is unknown; at most 5 characters. -#: src/pinky.c:274 +#: src/pinky.c:266 msgid "?????" msgstr "?????" -#: src/pinky.c:323 +#: src/pinky.c:314 #, c-format msgid "Login name: " msgstr "Bejelentkezési név: " -#: src/pinky.c:326 +#: src/pinky.c:317 #, c-format msgid "In real life: " msgstr "Valójában: " #. TRANSLATORS: Real name is unknown; no hard limit. -#: src/pinky.c:330 +#: src/pinky.c:321 msgid "???\n" msgstr "???\n" -#: src/pinky.c:350 +#: src/pinky.c:341 #, c-format msgid "Directory: " msgstr "Könyvtár: " -#: src/pinky.c:352 +#: src/pinky.c:343 #, c-format msgid "Shell: " msgstr "Parancsértelmező: " -#: src/pinky.c:371 +#: src/pinky.c:362 #, c-format msgid "Project: " msgstr "Projekt: " -#: src/pinky.c:395 +#: src/pinky.c:386 #, c-format msgid "Plan:\n" msgstr "Terv:\n" -#: src/pinky.c:414 +#: src/pinky.c:405 msgid "Login" msgstr "Bejel." -#: src/pinky.c:416 +#: src/pinky.c:407 msgid "Name" msgstr "Név" -#: src/pinky.c:417 +#: src/pinky.c:408 msgid " TTY" msgstr " TTY" -#: src/pinky.c:419 +#: src/pinky.c:410 msgid "Idle" msgstr "Üresj." -#: src/pinky.c:420 +#: src/pinky.c:411 msgid "When" msgstr "Mikor" -#: src/pinky.c:423 +#: src/pinky.c:414 msgid "Where" msgstr "Hol" -#: src/pinky.c:502 +#: src/pinky.c:493 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Használat: %s [KAPCSOLÓ]… [FELHASZNÁLÓ]…\n" -#: src/pinky.c:503 +#: src/pinky.c:494 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7339,7 +7713,7 @@ msgstr "" " -s rövid formátumú kimenet előállítása, ez az " "alapértelmezett\n" -#: src/pinky.c:511 +#: src/pinky.c:502 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7355,7 +7729,7 @@ 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:520 +#: src/pinky.c:511 #, fuzzy, c-format msgid "" "\n" @@ -7366,7 +7740,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:604 +#: src/pinky.c:595 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "" @@ -7383,88 +7757,87 @@ msgstr "Pete TerMaat" msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:912 +#: src/pr.c:908 #, fuzzy, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "„--pages=ELSŐ_OLDAL[:UTOLSÓ_OLDAL]” hiányzó argumentum" -#: src/pr.c:914 +#: src/pr.c:910 #, c-format msgid "invalid page range %s" msgstr "érvénytelen oldaltartomány: %s" -#: src/pr.c:979 +#: src/pr.c:975 #, fuzzy, c-format msgid "'-l PAGE_LENGTH' invalid number of lines: %s" msgstr "„-l OLDALHOSSZ” érvénytelen sorszám: %s" -#: src/pr.c:1003 +#: src/pr.c:999 #, fuzzy, c-format msgid "'-N NUMBER' invalid starting line number: %s" msgstr "„-N SZÁM” érvénytelen kezdő sorszám: %s" -#: src/pr.c:1015 +#: src/pr.c:1011 #, fuzzy, c-format msgid "'-o MARGIN' invalid line offset: %s" msgstr "„-o MARGÓ” érvénytelen soreltolás: %s" -#: src/pr.c:1056 +#: src/pr.c:1052 #, fuzzy, 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:1070 +#: src/pr.c:1066 #, fuzzy, 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:1100 +#: src/pr.c:1096 #, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "nem adható meg az oszlopok száma párhuzamos nyomtatás esetén" -#: src/pr.c:1104 +#: src/pr.c:1100 #, c-format 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:1200 +#: src/pr.c:1196 #, fuzzy, 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" "%s" -#: src/pr.c:1304 +#: src/pr.c:1293 #, c-format msgid "page width too narrow" msgstr "az oldalszélesség túl keskeny" -#: src/pr.c:2369 +#: src/pr.c:2353 #, c-format msgid "starting page number %<PRIuMAX> exceeds page count %<PRIuMAX>" msgstr "a(z) %<PRIuMAX> kezdő oldalszám meghaladja a(z) %<PRIuMAX> oldalszámot" -#: src/pr.c:2396 +#: src/pr.c:2380 #, c-format msgid "page number overflow" msgstr "oldalszám-túlcsordulás" -#: src/pr.c:2401 +#: src/pr.c:2385 #, c-format msgid "Page %<PRIuMAX>" msgstr "%<PRIuMAX>. oldal" -#: src/pr.c:2773 -msgid "" -"Paginate or columnate FILE(s) for printing.\n" -"\n" +#: 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:2780 +#: src/pr.c:2763 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -7482,7 +7855,7 @@ msgstr "" " lefelé, hacsak a -a nincs megadva. A sorok számának\n" " kiegyensúlyozása az oszlopokban minden egyes oldalon.\n" -#: src/pr.c:2788 +#: src/pr.c:2771 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7498,7 +7871,7 @@ msgstr "" " -d, --double-space\n" " a kimenet dupla kitöltése\n" -#: src/pr.c:2796 +#: src/pr.c:2779 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7520,7 +7893,7 @@ msgstr "" " (egy 3 soros oldalfejléccel a -F vagy egy 5 soros\n" " fejléccel és bevezetővel az -F nélkül)\n" -#: src/pr.c:2806 +#: src/pr.c:2789 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -7545,7 +7918,7 @@ msgstr "" " nincs oszlopigazítás, a --sep-string[=KARAKTERLÁNC]\n" " beállítja az elválasztókat\n" -#: src/pr.c:2815 +#: src/pr.c:2798 msgid "" " -l, --length=PAGE_LENGTH\n" " set the page length to PAGE_LENGTH (66) lines\n" @@ -7561,7 +7934,7 @@ msgstr "" " oszlopba, a sorokat csonkítja, de a teljes hosszúságú\n" " sorokat a -J használatakor összekapcsolja\n" -#: src/pr.c:2822 +#: src/pr.c:2805 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -7579,7 +7952,7 @@ msgstr "" " a számolás kezdése a SZÁMMAL az első kinyomtatott oldal\n" " első sorában (lásd +ELSŐ_OLDAL)\n" -#: src/pr.c:2830 +#: src/pr.c:2813 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -7595,7 +7968,7 @@ msgstr "" " -r, --no-file-warnings\n" " figyelmeztetés kihagyása, ha egy fájl nem nyitható meg\n" -#: src/pr.c:2837 +#: src/pr.c:2820 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -7612,7 +7985,7 @@ msgstr "" "kivéve\n" " ha a -w be van állítva\n" -#: src/pr.c:2844 +#: src/pr.c:2827 #, fuzzy msgid "" " -S[STRING], --sep-string[=STRING]\n" @@ -7630,7 +8003,7 @@ msgstr "" " nincs hatással az oszlopkapcsolókra\n" " -t, --omit-header oldalfejlécek és befejezők kihagyása\n" -#: src/pr.c:2851 +#: src/pr.c:2834 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -7656,7 +8029,7 @@ msgstr "" " karakterre, csak több szöveges oszlopot tartalmazó\n" " kimenethez, az s[karakter] kikapcsolja (72)\n" -#: src/pr.c:2861 +#: src/pr.c:2844 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -7671,7 +8044,7 @@ msgstr "" "s\n" " kapcsolókkal\n" -#: src/pr.c:2869 +#: src/pr.c:2852 msgid "" "\n" "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" @@ -7834,16 +8207,16 @@ msgstr "" " vagy: %s -G [KAPCSOLÓ]… [BEMENET [KIMENET]]\n" #: src/ptx.c:1821 +#, fuzzy msgid "" "Output a permuted index, including context, of the words in the input " "files.\n" -"\n" msgstr "" "A bemeneti fájlok szavai permutált indexének kiírása a kontextust is " "beleértve.\n" "\n" -#: src/ptx.c:1828 +#: src/ptx.c:1827 #, fuzzy msgid "" " -A, --auto-reference output automatically generated references\n" @@ -7856,7 +8229,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:1833 +#: src/ptx.c:1832 #, fuzzy msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" @@ -7872,7 +8245,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:1840 +#: src/ptx.c:1839 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -7892,7 +8265,7 @@ msgstr "" " -o, --only-file=FÁJL az egyedüli szólista olvasása ebből a " "FÁJLBÓL\n" -#: src/ptx.c:1848 +#: src/ptx.c:1847 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -7905,7 +8278,7 @@ msgstr "" " -w, --width=SZÁM a kimenet szélessége oszlopokban, a \n" " hivatkozások kihagyásával\n" -#: src/ptx.c:1855 +#: src/ptx.c:1854 #, fuzzy msgid "" "\n" @@ -7915,7 +8288,7 @@ msgstr "" "Ha a FÁJL nincs megadva, vagy -, akkor a szabványos bemenetet olvassa.\n" "A „-F /” az alapértelmezés.\n" -#: src/ptx.c:1949 +#: src/ptx.c:1948 #, c-format msgid "invalid gap width: %s" msgstr "érvénytelen résszélesség: %s" @@ -7942,7 +8315,7 @@ msgstr "" 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/pwd.c:170 src/pwd.c:277 src/split.c:373 #, c-format msgid "failed to stat %s" msgstr "%s elérése meghiúsult" @@ -7961,14 +8334,15 @@ msgid "ignoring non-option arguments" msgstr "a nem kapcsoló argumentumok figyelmen kívül hagyva" #. This is a proper name. See the gettext manual, section Names. -#: src/readlink.c:33 +#: src/readlink.c:32 msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 +#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147 +#: src/stat.c:1349 src/touch.c:212 #, c-format -msgid "Usage: %s [OPTION]... FILE\n" -msgstr "Használat: %s [KAPCSOLÓ]… [FÁJL]\n" +msgid "Usage: %s [OPTION]... FILE...\n" +msgstr "Használat: %s [KAPCSOLÓ]… FÁJL…\n" #: src/readlink.c:63 msgid "" @@ -8002,16 +8376,19 @@ msgstr "" " minden összetevőnek léteznie kell\n" #: src/readlink.c:75 +#, fuzzy msgid "" " -m, --canonicalize-missing canonicalize by following every symlink in\n" " every component of the given name " "recursively,\n" " without requirements on components " "existence\n" -" -n, --no-newline do not output the trailing newline\n" +" -n, --no-newline do not output the trailing delimiter\n" " -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" msgstr "" " -m, --canonicalize-missing egyszerűsítés minden szimbolikus link " "rekurzív\n" @@ -8023,11 +8400,10 @@ msgstr "" " -s, --silent megszünteti a legtöbb hibaüzenetet\n" " -v, --verbose hibaüzenetek kiírása\n" -#: src/realpath.c:71 src/rm.c:134 src/shred.c:147 src/stat.c:1330 -#: src/touch.c:215 -#, c-format -msgid "Usage: %s [OPTION]... FILE...\n" -msgstr "Használat: %s [KAPCSOLÓ]… FÁJL…\n" +#: src/readlink.c:152 +#, fuzzy, c-format +msgid "ignoring --no-newline with multiple arguments" +msgstr "a nem kapcsoló argumentumok figyelmen kívül hagyva" #: src/realpath.c:72 msgid "" @@ -8075,12 +8451,12 @@ msgstr "" msgid "generating relative path" msgstr "" -#: src/remove.c:286 +#: src/remove.c:273 #, c-format msgid "%s: descend into write-protected directory %s? " msgstr "%s: belép a(z) %s írásvédett könyvtárba? " -#: src/remove.c:287 +#: src/remove.c:274 #, c-format msgid "%s: descend into directory %s? " msgstr "%s: belép a(z) %s könyvtárba? " @@ -8089,37 +8465,37 @@ msgstr "%s: belép a(z) %s könyvtárba? " #. translate "%s: remove %s (write-protected) %s? " #. instead. It should avoid grammatical problems #. with the output of file_type. -#: src/remove.c:303 +#: src/remove.c:290 #, 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:304 +#: src/remove.c:291 #, 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:417 +#: src/remove.c:374 #, c-format msgid "removed directory: %s\n" msgstr "%s könyvtár törölve\n" -#: src/remove.c:481 +#: src/remove.c:444 #, c-format msgid "cannot remove directory: %s" msgstr "nem törölhető a következő könyvtár: %s" -#: src/remove.c:537 +#: src/remove.c:500 #, 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:557 +#: src/remove.c:520 #, c-format msgid "traversal failed: %s" msgstr "a bejárás meghiúsult: %s" -#: src/remove.c:563 +#: src/remove.c:526 #, c-format msgid "" "unexpected failure: fts_info=%d: %s\n" @@ -8128,12 +8504,12 @@ msgstr "" "váratlan hiba: fts_info=%d: %s\n" "jelentse a következő címen: %s" -#: src/rm.c:118 +#: src/rm.c:119 #, fuzzy, 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:135 +#: src/rm.c:136 #, fuzzy msgid "" "Remove (unlink) the FILE(s).\n" @@ -8149,7 +8525,7 @@ msgstr "" " -i kérdés minden eltávolítás előtt\n" # rc/rm.c:166 -#: src/rm.c:141 +#: src/rm.c:142 msgid "" " -I prompt once before removing more than three files, " "or\n" @@ -8170,7 +8546,7 @@ msgstr "" "mint\n" " a -i). A MIKOR megadása nélkül mindig kérdez\n" -#: src/rm.c:148 +#: src/rm.c:149 msgid "" " --one-file-system when removing a hierarchy recursively, skip any\n" " directory that is on a file system different from\n" @@ -8180,12 +8556,13 @@ msgstr "" " könyvtár kihagyása, amely a megfelelő parancssori\n" " kapcsoló ban megadottól eltérő fájlrendszeren van\n" -#: src/rm.c:153 +#: src/rm.c:154 #, fuzzy msgid "" " --no-preserve-root do not treat '/' specially\n" " --preserve-root do not remove '/' (default)\n" " -r, -R, --recursive remove directories and their contents recursively\n" +" -d, --dir remove empty directories\n" " -v, --verbose explain what is being done\n" msgstr "" " --no-preserve-root ne kezelje a „/” könyvtárat különlegesen\n" @@ -8194,7 +8571,7 @@ msgstr "" " -r, -R, --recursive könyvtárak és tartalmuk rekurzív törlése\n" " -v, --verbose elmagyarázza, mi történik\n" -#: src/rm.c:161 +#: src/rm.c:163 msgid "" "\n" "By default, rm does not remove directories. Use the --recursive (-r or -R)\n" @@ -8206,7 +8583,7 @@ msgstr "" "használatával minden egyes felsorolt könyvtár és azok tartalma is " "törölhető.\n" -#: src/rm.c:166 +#: src/rm.c:168 #, fuzzy, c-format msgid "" "\n" @@ -8223,7 +8600,7 @@ msgstr "" "\n" " %s ./-foo\n" -#: src/rm.c:175 +#: src/rm.c:177 msgid "" "\n" "Note that if you use rm to remove a file, it might be possible to recover\n" @@ -8237,12 +8614,12 @@ msgstr "" "fontolja\n" "meg a shred parancs használatát.\n" -#: src/rm.c:335 +#: src/rm.c:342 #, c-format msgid "%s: remove all arguments recursively? " msgstr "%s: rekurzívan eltávolítja az összes argumentumot? " -#: src/rm.c:336 +#: src/rm.c:343 #, c-format msgid "%s: remove all arguments? " msgstr "%s: eltávolítja az összes argumentumot? " @@ -8304,7 +8681,11 @@ msgstr "" msgid "" "Run a program in a different security context.\n" "With neither CONTEXT nor COMMAND, print the current security context.\n" -"\n" +msgstr "" + +#: src/runcon.c:94 +#, fuzzy +msgid "" " CONTEXT Complete security context\n" " -c, --compute compute process transition context before modifying\n" " -t, --type=TYPE type (for same role as parent)\n" @@ -8326,72 +8707,72 @@ msgstr "" " -l, --range=TARTOMÁNY szinttartomány\n" "\n" -#: src/runcon.c:140 +#: src/runcon.c:144 #, c-format msgid "multiple roles" msgstr "több szerep" -#: src/runcon.c:145 +#: src/runcon.c:149 #, c-format msgid "multiple types" msgstr "több típus" -#: src/runcon.c:150 +#: src/runcon.c:154 #, c-format msgid "multiple users" msgstr "több felhasználó" -#: src/runcon.c:155 +#: src/runcon.c:159 #, c-format msgid "multiple levelranges" msgstr "több szinttartomány" -#: src/runcon.c:173 src/runcon.c:209 +#: src/runcon.c:177 src/runcon.c:213 #, c-format msgid "failed to get current context" msgstr "a jelenlegi kontextus lekérése meghiúsult" -#: src/runcon.c:183 +#: src/runcon.c:187 #, c-format msgid "you must specify -c, -t, -u, -l, -r, or context" msgstr "meg kell adnia a -c, -t, -u, -l, -r egyikét vagy a kontextust" -#: src/runcon.c:191 +#: src/runcon.c:195 #, c-format msgid "no command specified" msgstr "nincs megadva parancs" -#: src/runcon.c:197 +#: src/runcon.c:201 #, c-format msgid "%s may be used only on a SELinux kernel" msgstr "a(z) %s csak SELinux rendszermagon használható" -#: src/runcon.c:223 +#: src/runcon.c:227 #, c-format msgid "failed to compute a new context" msgstr "az új kontextus kiszámítása meghiúsult" -#: src/runcon.c:237 +#: src/runcon.c:241 #, c-format msgid "failed to set new user %s" msgstr "%s új felhasználó beállítása meghiúsult" -#: src/runcon.c:239 +#: src/runcon.c:243 #, c-format msgid "failed to set new type %s" msgstr "%s új típus beállítása meghiúsult" -#: src/runcon.c:241 +#: src/runcon.c:245 #, c-format msgid "failed to set new range %s" msgstr "%s új tartomány beállítása meghiúsult" -#: src/runcon.c:243 +#: src/runcon.c:247 #, c-format msgid "failed to set new role %s" msgstr "%s új szerep beállítása meghiúsult" -#: src/runcon.c:251 +#: src/runcon.c:255 #, c-format msgid "unable to set security context %s" msgstr "%s biztonsági kontextus nem állítható be" @@ -8408,9 +8789,12 @@ msgstr "" " vagy: %s [KAPCSOLÓ]… ELSŐ NÖVEKMÉNY UTOLSÓ\n" #: src/seq.c:73 +msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" +msgstr "" + +#: src/seq.c:79 +#, fuzzy msgid "" -"Print numbers from FIRST to LAST, in steps of INCREMENT.\n" -"\n" " -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" @@ -8423,7 +8807,7 @@ msgstr "" " -w, --equal-width szélesség kiegyenlítése bevezető nullákkal való\n" " kitöltéssel.\n" -#: src/seq.c:82 +#: src/seq.c:86 msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" @@ -8443,7 +8827,7 @@ msgstr "" "kisebb, mint az UTOLSÓ, és általában negatív, ha az ELSŐ nagyobb, mint az \n" "UTOLSÓ.\n" -#: src/seq.c:90 +#: src/seq.c:94 #, fuzzy msgid "" "FORMAT must be suitable for printing one argument of type 'double';\n" @@ -8456,32 +8840,17 @@ msgstr "" "PONTOSSÁG,\n" "ellenkező esetben %g\n" -#: src/seq.c:136 +#: src/seq.c:140 #, c-format msgid "invalid floating point argument: %s" msgstr "érvénytelen lebegőpontos argumentum: %s" -#: src/seq.c:193 -#, c-format -msgid "format %s has no %% directive" -msgstr "a formátum (%s) nem tartalmaz %% direktívát" - -#: src/seq.c:210 -#, c-format -msgid "format %s ends in %%" -msgstr "a formátum (%s) vége %%" - -#: src/seq.c:213 +#: src/seq.c:232 #, c-format msgid "format %s has unknown %%%c directive" msgstr "a formátum (%s) ismeretlen %%%c direktívát tartalmaz" -#: src/seq.c:217 -#, c-format -msgid "format %s has too many %% directives" -msgstr "a formátum (%s) túl sok %% direktívát tartalmaz" - -#: src/seq.c:431 +#: src/seq.c:555 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" @@ -8528,29 +8897,29 @@ msgstr "" "csoportazonosítók\n" " beállítása a GID1, … értékeire\n" -#: src/setuidgid.c:163 +#: src/setuidgid.c:162 #, c-format msgid "unknown user-ID: %s" msgstr "ismeretlen felhasználói azonosító: %s" -#: src/setuidgid.c:174 +#: 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:191 +#: 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:201 +#: 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:205 +#: 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" @@ -8561,16 +8930,16 @@ msgid "Colin Plumb" msgstr "Colin Plumb" #: src/shred.c:148 +#, 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" -"\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:156 +#: src/shred.c:155 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -8584,7 +8953,7 @@ msgstr "" " -s, --size=N ennyi bájt megsemmisítése (a k, M, G utótagok " "megengedettek)\n" -#: src/shred.c:162 +#: src/shred.c:161 msgid "" " -u, --remove truncate and remove file after overwriting\n" " -v, --verbose show progress\n" @@ -8599,7 +8968,7 @@ msgstr "" " -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:171 +#: src/shred.c:170 msgid "" "\n" "If FILE is -, shred standard output.\n" @@ -8620,7 +8989,7 @@ msgstr "" "kapcsolót.\n" "\n" -#: src/shred.c:181 +#: src/shred.c:180 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" @@ -8638,7 +9007,7 @@ msgstr "" "hatásossága:\n" "\n" -#: src/shred.c:189 +#: src/shred.c:188 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -8660,7 +9029,7 @@ msgstr "" " NFS kiszolgálója\n" "\n" -#: src/shred.c:199 +#: src/shred.c:198 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -8674,7 +9043,7 @@ msgstr "" "* tömörített fájlrendszerek\n" "\n" -#: src/shred.c:206 +#: src/shred.c:205 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" @@ -8697,7 +9066,7 @@ msgstr "" "ahogyan az a mount kézikönyvoldalában dokumentálva van (man mount).\n" "\n" -#: src/shred.c:216 +#: src/shred.c:215 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" @@ -8708,123 +9077,123 @@ 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:296 +#: src/shred.c:295 #, c-format msgid "%s: fdatasync failed" msgstr "%s: az fdatasync meghiúsult" -#: src/shred.c:307 +#: src/shred.c:306 #, c-format msgid "%s: fsync failed" msgstr "%s: az fsync meghiúsult" -#: src/shred.c:384 +#: src/shred.c:383 #, c-format msgid "%s: cannot rewind" msgstr "%s: nem lehet visszacsévélni" -#: src/shred.c:403 +#: src/shred.c:402 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: %lu/%lu menet (%s)…" -#: src/shred.c:453 +#: src/shred.c:452 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: írási hiba a következő eltolásnál: %s" -#: src/shred.c:471 +#: src/shred.c:470 #, c-format msgid "%s: lseek failed" msgstr "%s: az lseek meghiúsult" -#: src/shred.c:482 +#: src/shred.c:481 #, c-format msgid "%s: file too large" msgstr "%s: a fájl túl nagy" -#: src/shred.c:505 +#: src/shred.c:504 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: %lu/%lu menet (%s)…%s" -#: src/shred.c:521 +#: src/shred.c:520 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: %lu/%lu menet (%s)…%s/%s %d%%" -#: src/shred.c:768 +#: src/shred.c:767 #, c-format msgid "%s: fstat failed" msgstr "%s: az elérés meghiúsult" -#: src/shred.c:779 +#: src/shred.c:778 #, c-format msgid "%s: invalid file type" msgstr "%s: érvénytelen fájltípus" -#: src/shred.c:798 +#: src/shred.c:797 #, c-format msgid "%s: file has negative size" msgstr "%s: a fájl mérete negatív" -#: src/shred.c:865 +#: src/shred.c:864 src/sort.c:932 src/split.c:378 #, c-format msgid "%s: error truncating" msgstr "%s: hiba a csonkításnál" -#: src/shred.c:881 +#: src/shred.c:880 #, c-format msgid "%s: fcntl failed" msgstr "%s: az fcntl meghiúsult" -#: src/shred.c:886 +#: src/shred.c:885 #, 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:968 +#: src/shred.c:967 #, c-format msgid "%s: removing" msgstr "%s: törlés alatt" -#: src/shred.c:992 +#: src/shred.c:991 #, c-format msgid "%s: renamed to %s" msgstr "%s: átnevezve a következőre: %s" -#: src/shred.c:1014 +#: src/shred.c:1013 #, c-format msgid "%s: failed to remove" msgstr "%s: az eltávolítás meghiúsult" -#: src/shred.c:1018 +#: src/shred.c:1017 #, c-format msgid "%s: removed" msgstr "%s: törölve" -#: src/shred.c:1025 src/shred.c:1068 +#: src/shred.c:1024 src/shred.c:1067 #, c-format msgid "%s: failed to close" msgstr "%s: a bezárás meghiúsult" -#: src/shred.c:1061 +#: src/shred.c:1060 #, c-format msgid "%s: failed to open for writing" msgstr "%s: az írásra megnyitás meghiúsult" -#: src/shred.c:1126 +#: src/shred.c:1125 #, c-format msgid "%s: invalid number of passes" msgstr "%s: érvénytelen menetszám" -#: src/shred.c:1135 src/shuf.c:291 src/sort.c:4387 +#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441 #, c-format msgid "multiple random sources specified" msgstr "több véletlen forrás van megadva" -#: src/shred.c:1149 +#: src/shred.c:1148 #, c-format msgid "%s: invalid file size" msgstr "%s: érvénytelen fájlméret" @@ -8841,14 +9210,13 @@ msgstr "" " vagy: %s -i LO-HI [KAPCSOLÓ]…\n" #: src/shuf.c:54 -msgid "" -"Write a random permutation of the input lines to standard output.\n" -"\n" +#, fuzzy +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:61 +#: src/shuf.c:60 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 " @@ -8868,27 +9236,27 @@ msgstr "" " --random-source=FÁJL véletlen bájtok olvasása a FÁJLBÓL\n" " -z, --zero-terminated a sorok lezárása a 0 bájttal az új sor helyett\n" -#: src/shuf.c:245 +#: src/shuf.c:244 #, c-format msgid "multiple -i options specified" msgstr "több -i kapcsolót adott meg" -#: src/shuf.c:265 +#: src/shuf.c:264 #, c-format msgid "invalid input range %s" msgstr "érvénytelen bemeneti tartomány: %s" -#: src/shuf.c:278 +#: src/shuf.c:277 #, c-format msgid "invalid line count %s" msgstr "érvénytelen sorszám: %s" -#: src/shuf.c:285 src/sort.c:4381 +#: src/shuf.c:284 src/sort.c:4435 #, c-format msgid "multiple output files specified" msgstr "több kimeneti fájl van megadva" -#: src/shuf.c:311 +#: src/shuf.c:310 #, c-format msgid "cannot combine -e and -i options" msgstr "a -e és -i kapcsolók nem kombinálhatók" @@ -8917,7 +9285,7 @@ msgstr "" "tart\n" "\n" -#: src/sleep.c:135 src/timeout.c:295 +#: src/sleep.c:135 src/timeout.c:320 #, c-format msgid "invalid time interval %s" msgstr "érvénytelen időtartam: %s" @@ -8927,15 +9295,14 @@ msgstr "érvénytelen időtartam: %s" msgid "cannot read realtime clock" msgstr "a valósidejű óra nem olvasható" -#: src/sort.c:395 -msgid "" -"Write sorted concatenation of all FILE(s) to standard output.\n" -"\n" +#: src/sort.c:399 +#, fuzzy +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:402 +#: src/sort.c:405 msgid "" "Ordering options:\n" "\n" @@ -8943,7 +9310,7 @@ msgstr "" "Rendezési lehetőségek:\n" "\n" -#: src/sort.c:406 +#: src/sort.c:409 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -8956,7 +9323,7 @@ msgstr "" " vétele\n" " -f, --ignore-case kisbetűk nagybetűkké alakítása\n" -#: src/sort.c:412 +#: src/sort.c:415 #, fuzzy msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" @@ -8969,14 +9336,14 @@ msgstr "" " -M, --month-sort összehasonlítás: (ismeretlen) < „JAN” < … < " "„DEC”\n" -#: src/sort.c:417 +#: src/sort.c:420 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:420 +#: src/sort.c:423 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -8990,7 +9357,7 @@ msgstr "" " -r, --reverse az összehasonlítások eredményének " "megfordítása\n" -#: src/sort.c:426 +#: src/sort.c:429 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -9008,7 +9375,7 @@ msgstr "" " belül\n" "\n" -#: src/sort.c:434 +#: src/sort.c:437 msgid "" "Other options:\n" "\n" @@ -9016,7 +9383,7 @@ msgstr "" "Egyéb kapcsolók:\n" "\n" -#: src/sort.c:438 +#: src/sort.c:441 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" @@ -9025,7 +9392,7 @@ msgstr "" "összefésülése,\n" " többhöz használjon ideiglenes fájlokat\n" -#: src/sort.c:442 +#: src/sort.c:445 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 " @@ -9041,7 +9408,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:449 +#: src/sort.c:452 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -9059,7 +9426,7 @@ msgstr "" " Ha az F a -, akkor a szabványos bemenetről " "olvas\n" -#: src/sort.c:456 +#: src/sort.c:459 msgid "" " -k, --key=KEYDEF sort via a key; KEYDEF gives location and type\n" " -m, --merge merge already sorted files; do not sort\n" @@ -9070,7 +9437,7 @@ msgstr "" " -m, --merge a már rendezett fájlok összefésülése; ne " "rendezzen\n" -#: src/sort.c:460 +#: src/sort.c:463 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -9084,7 +9451,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:466 +#: src/sort.c:469 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -9111,12 +9478,12 @@ msgstr "" " -c nélkül csak az elsőt írja ki egy egyenlő\n" " menetből\n" -#: src/sort.c:475 +#: 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:480 +#: src/sort.c:483 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -9149,7 +9516,7 @@ msgstr "" "\n" "A MÉRETET a következő többszöröző utótagok követhetik:\n" -#: src/sort.c:493 +#: src/sort.c:496 msgid "" "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n" "\n" @@ -9170,263 +9537,267 @@ 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:694 +#: src/sort.c:697 #, c-format msgid "waiting for %s [-d]" msgstr "várakozás a következőre: %s [-d]" -#: src/sort.c:699 +#: src/sort.c:702 #, c-format msgid "%s [-d] terminated abnormally" msgstr "A(z) %s [-d] váratlanul befejeződött" -#: src/sort.c:853 +#: src/sort.c:856 #, c-format msgid "cannot create temporary file in %s" msgstr "nem hozható létre ideiglenes fájl itt: %s" -#: src/sort.c:939 src/sort.c:2010 src/sort.c:3056 src/sort.c:3755 -#: src/sort.c:3758 +#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713 +#: src/sort.c:3804 src/sort.c:3807 msgid "open failed" msgstr "a megnyitás meghiúsult" -#: src/sort.c:959 +#: src/sort.c:970 msgid "fflush failed" msgstr "az fflush meghiúsult" -#: src/sort.c:964 src/sort.c:2013 src/sort.c:4646 +#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706 msgid "close failed" msgstr "a lezárás meghiúsult" -#: src/sort.c:973 +#: src/sort.c:986 #, c-format msgid "dup2 failed" msgstr "a dup2 meghiúsult" -#: src/sort.c:1090 +#: src/sort.c:1103 #, c-format msgid "couldn't execute %s" msgstr "nem hajtható végre: %s" -#: src/sort.c:1097 +#: src/sort.c:1110 msgid "couldn't create temporary file" msgstr "nem hozható létre ideiglenes fájl" -#: src/sort.c:1136 +#: src/sort.c:1149 #, 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:1150 +#: src/sort.c:1161 #, c-format msgid "couldn't execute %s -d" msgstr "nem hajtható végre: %s -d" -#: src/sort.c:1209 +#: src/sort.c:1220 #, c-format msgid "warning: cannot remove: %s" msgstr "figyelmeztetés: a(z) %s nem távolítható el" -#: src/sort.c:1295 +#: src/sort.c:1306 #, c-format msgid "invalid --%s argument %s" msgstr "érvénytelen --%s argumentum: %s" -#: src/sort.c:1298 +#: src/sort.c:1309 #, c-format msgid "minimum --%s argument is %s" msgstr "a minimális --%s argumentum: %s" -#: src/sort.c:1313 +#: src/sort.c:1324 #, c-format msgid "--%s argument %s too large" msgstr "a --%s %s argumentuma túl nagy" -#: src/sort.c:1316 +#: src/sort.c:1327 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "a minimális --%s argumentum a jelenlegi rlimittel: %s" -#: src/sort.c:1398 +#: src/sort.c:1409 #, c-format msgid "number in parallel must be nonzero" msgstr "a párhuzamos rendezések száma nem lehet nulla" -#: src/sort.c:1479 +#: src/sort.c:1494 msgid "stat failed" msgstr "az elérés meghiúsult" -#: src/sort.c:1740 +#: src/sort.c:1755 msgid "read failed" msgstr "az olvasás meghiúsult" -#: src/sort.c:2028 +#: src/sort.c:2043 #, c-format msgid "string transformation failed" msgstr "a karakterlánc-átalakítás sikertelen" -#: src/sort.c:2031 +#: src/sort.c:2046 #, c-format msgid "the untransformed string was %s" msgstr "az átalakítatlan karakterlánc: %s" -#: src/sort.c:2194 +#: src/sort.c:2209 #, c-format msgid "^ no match for key\n" msgstr "^ nincs illeszkedés a kulcsra\n" -#: src/sort.c:2374 +#: src/sort.c:2389 #, fuzzy, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "a használt „%s” kulcs elavult, használja inkább ezt: „%s”" -#: src/sort.c:2380 +#: src/sort.c:2395 #, 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:2391 +#: src/sort.c:2406 #, fuzzy, 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:2404 +#: src/sort.c:2419 #, 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:2436 +#: src/sort.c:2451 #, fuzzy, 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:2442 +#: src/sort.c:2457 #, fuzzy, 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:2716 src/sort.c:2725 +#: src/sort.c:2731 src/sort.c:2740 msgid "write failed" msgstr "az írás meghiúsult" -#: src/sort.c:2768 +#: src/sort.c:2783 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: rendezetlenség: " -#: src/sort.c:2771 +#: src/sort.c:2786 msgid "standard error" msgstr "szabványos hibakimenet" -#: src/sort.c:3926 +#: src/sort.c:3698 +#, fuzzy +msgid "cannot read" +msgstr "%s: nem lehet visszacsévélni" + +#: src/sort.c:3976 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: érvénytelen mezőspecifikáció: %s" -#: src/sort.c:3937 +#: src/sort.c:3987 #, fuzzy, c-format msgid "options '-%s' are incompatible" msgstr "a következő kapcsolók inkompatibilisak: „-%s”" -#: src/sort.c:3988 +#: src/sort.c:4038 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s: érvénytelen szám a(z) %s kezdetén" -#: src/sort.c:4245 +#: src/sort.c:4295 #, fuzzy msgid "invalid number after '-'" msgstr "érvénytelen szám a „-” után" -#: src/sort.c:4248 src/sort.c:4334 src/sort.c:4362 +#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416 #, fuzzy msgid "invalid number after '.'" msgstr "érvénytelen szám a „.” után" -#: src/sort.c:4261 src/sort.c:4367 +#: src/sort.c:4315 src/sort.c:4421 msgid "stray character in field spec" msgstr "véletlen karakter a mezőspecifikációban" -#: src/sort.c:4308 +#: src/sort.c:4362 #, c-format msgid "multiple compress programs specified" msgstr "több tömörítőprogram van megadva" -#: src/sort.c:4325 +#: src/sort.c:4379 msgid "invalid number at field start" msgstr "érvénytelen szám a mező kezdeténél" -#: src/sort.c:4329 src/sort.c:4357 +#: src/sort.c:4383 src/sort.c:4411 msgid "field number is zero" msgstr "a mezőszám nulla" -#: src/sort.c:4338 +#: src/sort.c:4392 msgid "character offset is zero" msgstr "karaktereltolás nulla" -#: src/sort.c:4353 +#: src/sort.c:4407 #, fuzzy msgid "invalid number after ','" msgstr "érvénytelen szám a „,” után" -#: src/sort.c:4403 +#: src/sort.c:4457 #, c-format msgid "empty tab" msgstr "üres tab" -#: src/sort.c:4496 src/wc.c:692 +#: src/sort.c:4550 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:4518 +#: src/sort.c:4572 #, 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:4524 +#: src/sort.c:4578 #, c-format msgid "no input from %s" msgstr "nincs bemenet ebből: %s" -#: src/sort.c:4570 +#: src/sort.c:4624 #, c-format msgid "using %s sorting rules" msgstr "%s rendezési szabályok használata" -#: src/sort.c:4573 +#: src/sort.c:4627 #, c-format msgid "using simple byte comparison" msgstr "egyszerű bájtösszehasonlítás használata" -#: src/sort.c:4604 +#: src/sort.c:4658 #, 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:184 +#: src/split.c:187 #, 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:201 +#: src/split.c:204 #, c-format msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" msgstr "Használat: %s [KAPCSOLÓ]… [BEMENET [ELŐTAG]]\n" -#: src/split.c:205 +#: src/split.c:208 #, fuzzy 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" -"\n" msgstr "" "A BEMENET rögzített méretű darabjainak kiírása az ELŐTAGaa, ELŐTAGab, …;\n" "fájlokba, az alapértelmezett méret az 1000, és az alapértelmezett ELŐTAG az\n" @@ -9434,7 +9805,7 @@ msgstr "" "olvassa.\n" "\n" -#: src/split.c:214 +#: src/split.c:216 #, fuzzy, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" @@ -9467,7 +9838,7 @@ msgstr "" " -u, --unbuffered bemenet azonnali kimenetre másolása a „-n r/...”\n" " használatával\n" -#: src/split.c:227 +#: src/split.c:229 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" @@ -9476,7 +9847,7 @@ msgstr "" "kimeneti\n" " fájl megnyitása előtt\n" -#: src/split.c:234 +#: src/split.c:236 #, fuzzy msgid "" "\n" @@ -9498,186 +9869,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:352 +#: src/split.c:354 #, c-format msgid "output file suffixes exhausted" msgstr "a kimenetifájl-utótagok elfogytak" -#: src/split.c:364 +#: src/split.c:366 #, c-format msgid "creating file %s\n" msgstr "%s fájl létrehozása\n" -#: src/split.c:377 +#: src/split.c:375 +#, c-format +msgid "%s would overwrite input; aborting" +msgstr "" + +#: src/split.c:391 #, 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:379 +#: src/split.c:393 #, c-format msgid "executing with FILE=%s\n" msgstr "végrehajtás a FÁJL=%s használatával\n" -#: src/split.c:381 +#: src/split.c:395 #, c-format msgid "failed to create pipe" msgstr "az adatcsatorna létrehozása meghiúsult" -#: src/split.c:395 +#: src/split.c:409 #, c-format msgid "closing prior pipe" msgstr "korábbi adatcsatorna bezárása" -#: src/split.c:397 +#: src/split.c:411 #, c-format msgid "closing output pipe" msgstr "kimeneti adatcsatorna lezárása" -#: src/split.c:401 +#: src/split.c:415 #, c-format msgid "moving input pipe" msgstr "bemeneti adatcsatorna mozgatása" -#: src/split.c:403 +#: src/split.c:417 #, c-format msgid "closing input pipe" msgstr "bemeneti adatcsatorna lezárása" -#: src/split.c:408 +#: src/split.c:422 #, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "a parancs futtatása meghiúsult: „%s -c %s”" -#: src/split.c:414 +#: src/split.c:428 #, c-format msgid "failed to close input pipe" msgstr "a bemeneti adatcsatorna bezárása meghiúsult" -#: src/split.c:450 +#: src/split.c:464 #, c-format msgid "waiting for child process" msgstr "várakozás a gyermekfolyamatra" -#: src/split.c:460 +#: src/split.c:474 #, 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:468 +#: src/split.c:482 #, 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:475 src/timeout.c:449 +#: src/split.c:489 src/timeout.c:494 #, c-format msgid "unknown status from command (0x%X)" msgstr "ismeretlen állapot a parancstól (0x%X)" -#: src/split.c:1037 +#: src/split.c:1052 #, c-format msgid "cannot split in more than one way" msgstr "egynél több módon nem lehet darabolni" -#: src/split.c:1050 src/split.c:1192 src/split.c:1363 +#: src/split.c:1065 src/split.c:1205 src/split.c:1376 #, c-format msgid "%s: invalid number of chunks" msgstr "%s: a darabok száma érvénytelen" -#: src/split.c:1054 +#: src/split.c:1069 #, c-format msgid "%s: invalid chunk number" msgstr "%s: érvénytelen darabszám" -#: src/split.c:1106 +#: src/split.c:1119 #, c-format msgid "%s: invalid suffix length" msgstr "%s: érvénytelen utótaghossz" -#: src/split.c:1131 src/split.c:1139 src/split.c:1162 src/split.c:1167 +#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180 #, c-format msgid "%s: invalid number of bytes" msgstr "%s: érvénytelen bájtszám" -#: src/split.c:1150 src/split.c:1297 +#: src/split.c:1163 src/split.c:1310 #, c-format msgid "%s: invalid number of lines" msgstr "%s: érvénytelen sorszám" -#: src/split.c:1223 +#: src/split.c:1236 #, 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:1235 +#: src/split.c:1248 #, fuzzy, c-format msgid "%s: invalid start value for numerical suffix" msgstr "érvénytelen kezdősorszám: %s" -#: src/split.c:1263 +#: src/split.c:1276 #, c-format msgid "%s: invalid IO block size" msgstr "%s: érvénytelen IO-blokkméret" -#: src/split.c:1284 +#: src/split.c:1297 #, 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:1321 +#: src/split.c:1334 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1356 +#: src/split.c:1369 #, 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:169 +#: src/stat.c:173 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:838 +#: src/stat.c:857 #, c-format msgid "failed to canonicalize %s" msgstr "%s kanonikalizálása meghiúsult" -#: src/stat.c:1050 +#: src/stat.c:1069 #, fuzzy, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "figyelmeztetés: fel nem ismert védés „\\%c”" -#: src/stat.c:1105 +#: src/stat.c:1124 #, c-format msgid "%s: invalid directive" msgstr "%s: érvénytelen direktíva" -#: src/stat.c:1151 +#: src/stat.c:1170 #, 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:1182 +#: src/stat.c:1201 #, 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:1189 +#: src/stat.c:1208 #, 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:1209 +#: src/stat.c:1228 #, 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:1245 +#: src/stat.c:1264 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -9693,7 +10069,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1268 +#: src/stat.c:1287 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -9703,30 +10079,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1278 +#: src/stat.c:1297 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:1286 +#: src/stat.c:1305 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:1295 +#: src/stat.c:1314 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:1305 +#: src/stat.c:1324 #, c-format msgid "Context: %C\n" msgstr "Kontextus: %C\n" -#: src/stat.c:1313 +#: src/stat.c:1332 msgid "" "Access: %x\n" "Modify: %y\n" @@ -9738,10 +10114,13 @@ msgstr "" " Változás: %z\n" " Születés: %w\n" -#: src/stat.c:1331 +#: src/stat.c:1350 +msgid "Display file or file system status.\n" +msgstr "" + +#: src/stat.c:1356 +#, fuzzy msgid "" -"Display file or file system status.\n" -"\n" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" @@ -9750,7 +10129,7 @@ msgstr "" " -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:1337 +#: src/stat.c:1360 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -9768,7 +10147,7 @@ msgstr "" " Ú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:1348 +#: src/stat.c:1371 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -9788,7 +10167,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:1357 +#: src/stat.c:1380 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -9804,7 +10183,7 @@ msgstr "" " %g a tulajdonos csoportazonosítója\n" " %G a tulajdonos csoportneve\n" -#: src/stat.c:1365 +#: src/stat.c:1388 #, fuzzy msgid "" " %h number of hard links\n" @@ -9827,7 +10206,7 @@ msgstr "" " %t major eszköztípus hexadecimálisan\n" " %T minor eszköztípus hexadecimálisan\n" -#: src/stat.c:1376 +#: src/stat.c:1399 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -9854,7 +10233,7 @@ msgstr "" " %Z utolsó változtatás ideje az Epoch óta eltelt másodpercekként\n" "\n" -#: src/stat.c:1390 +#: src/stat.c:1413 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -9872,7 +10251,7 @@ msgstr "" " %d szabad fájlcsomópontok a fájlrendszeren\n" " %f szabad blokkok a fájlrendszeren\n" -#: src/stat.c:1399 +#: src/stat.c:1422 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -9896,15 +10275,15 @@ 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" -"\n" msgstr "" "A PARANCS futtatása módosított pufferelési műveletekkel a szabványos " "adatfolyamaihoz.\n" "\n" -#: src/stdbuf.c:98 +#: src/stdbuf.c:97 msgid "" " -i, --input=MODE adjust standard input stream buffering\n" " -o, --output=MODE adjust standard output stream buffering\n" @@ -9915,7 +10294,7 @@ msgstr "" " -e, --error=MÓD Szabványos hibakimenet adatfolyam pufferelésének " "módosítása\n" -#: src/stdbuf.c:105 +#: src/stdbuf.c:104 #, fuzzy msgid "" "\n" @@ -9926,7 +10305,7 @@ msgstr "" "Ha a MÓD az „L”, akkor a megfelelő adatfolyam sorpufferelt lesz.\n" "Ez a beállítás érvénytelen a szabványos bemenettel.\n" -#: src/stdbuf.c:108 +#: src/stdbuf.c:107 #, fuzzy msgid "" "\n" @@ -9935,7 +10314,7 @@ msgstr "" "\n" "Ha a MÓD „0”, akkor a megfelelő adatfolyam nem lesz pufferelve.\n" -#: src/stdbuf.c:111 +#: src/stdbuf.c:110 msgid "" "\n" "Otherwise MODE is a number which may be followed by one of the following:\n" @@ -9950,7 +10329,7 @@ msgstr "" "Ebben az esetben a megfelelő adatfolyam teljesen pufferelt lesz, MÓD bájt\n" "méretű puffer használatával.\n" -#: src/stdbuf.c:117 +#: src/stdbuf.c:116 #, fuzzy msgid "" "\n" @@ -9966,22 +10345,22 @@ 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:227 +#: src/stdbuf.c:226 #, c-format msgid "failed to find %s" msgstr "%s keresése meghiúsult" -#: src/stdbuf.c:247 src/stdbuf.c:279 +#: src/stdbuf.c:246 src/stdbuf.c:278 #, 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:321 +#: src/stdbuf.c:320 #, c-format msgid "line buffering stdin is meaningless" msgstr "a szabványos bemenet sorpufferelése értelmetlen" -#: src/stty.c:509 +#: src/stty.c:513 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -9992,10 +10371,13 @@ 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:515 +#: src/stty.c:519 +msgid "Print or change terminal characteristics.\n" +msgstr "" + +#: src/stty.c:525 +#, fuzzy msgid "" -"Print or change terminal characteristics.\n" -"\n" " -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" @@ -10010,7 +10392,7 @@ msgstr "" " -F, --file=ESZKÖZ a megadott ESZKÖZ használata a szabványos bemenet " "helyett\n" -#: src/stty.c:524 +#: src/stty.c:532 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -10021,7 +10403,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:529 +#: src/stty.c:537 msgid "" "\n" "Special characters:\n" @@ -10037,7 +10419,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:536 +#: src/stty.c:544 msgid "" " * eol2 CHAR alternate CHAR for ending the line\n" " erase CHAR CHAR will erase the last character typed\n" @@ -10049,7 +10431,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:542 +#: src/stty.c:550 msgid "" " * lnext CHAR CHAR will enter the next character quoted\n" " quit CHAR CHAR will send a quit signal\n" @@ -10062,7 +10444,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:548 +#: src/stty.c:556 msgid "" " stop CHAR CHAR will stop the output\n" " susp CHAR CHAR will send a terminal stop signal\n" @@ -10074,7 +10456,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:554 +#: src/stty.c:562 msgid "" "\n" "Special settings:\n" @@ -10089,7 +10471,7 @@ msgstr "" " * columns N ugyanaz, mint a cols N\n" # fixme line discipline??? -#: src/stty.c:561 +#: src/stty.c:569 msgid "" " ispeed N set the input speed to N\n" " * line N use line discipline N\n" @@ -10104,7 +10486,7 @@ msgstr "" " befejezett olvasáshoz\n" " ospeed N beállítja a kimeneti sebességet N-re\n" -#: src/stty.c:567 +#: src/stty.c:575 msgid "" " * rows N tell the kernel that the terminal has N rows\n" " * size print the number of rows and columns according to the " @@ -10119,13 +10501,15 @@ msgstr "" "N\n" " tizedmásodpercre\n" -#: src/stty.c:573 +#: src/stty.c:581 +#, fuzzy msgid "" "\n" "Control settings:\n" " [-]clocal disable modem control signals\n" " [-]cread allow input to be received\n" " * [-]crtscts enable RTS/CTS handshaking\n" +" * [-]cdtrdsr enable DTR/DSR handshaking\n" " csN set character size to N bits, N in [5..8]\n" msgstr "" "\n" @@ -10135,7 +10519,7 @@ msgstr "" " * [-]crtscts engedélyezi az RTS/CTS kézfogást\n" " csN beállítja a karakterméretet N bitre, N értéke [5..8] lehet\n" -#: src/stty.c:581 +#: src/stty.c:590 #, fuzzy msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" @@ -10143,7 +10527,7 @@ msgid "" " [-]hupcl same as [-]hup\n" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" -" [-]parodd set odd parity (even with '-')\n" +" [-]parodd set odd parity (or even parity with '-')\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 " @@ -10154,7 +10538,7 @@ msgstr "" " feltételezése a bemenetben\n" " [-]parodd páratlan paritás beállítása (páros, ha „-”)\n" -#: src/stty.c:588 +#: src/stty.c:597 msgid "" "\n" "Input settings:\n" @@ -10170,7 +10554,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:596 +#: src/stty.c:605 msgid "" " [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" @@ -10185,12 +10569,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:603 +#: src/stty.c:612 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:606 +#: src/stty.c:615 msgid "" " * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" @@ -10207,7 +10591,7 @@ msgstr "" " [-]parmrk paritáshibák jelölése (egy 255-0 karaktersorozattal)\n" " [-]tandem ugyanaz, mint a [-]ixoff\n" -#: src/stty.c:614 +#: src/stty.c:623 msgid "" "\n" "Output settings:\n" @@ -10223,7 +10607,7 @@ 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:622 +#: src/stty.c:631 msgid "" " * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of null characters\n" @@ -10241,7 +10625,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:630 +#: src/stty.c:639 msgid "" " * [-]onocr do not print carriage returns in the first column\n" " [-]opost postprocess output\n" @@ -10257,7 +10641,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:638 +#: src/stty.c:647 msgid "" "\n" "Local settings:\n" @@ -10274,7 +10658,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:645 +#: src/stty.c:654 #, fuzzy msgid "" " * [-]ctlecho echo control characters in hat notation ('^c')\n" @@ -10289,7 +10673,7 @@ msgstr "" " [-]echoe ugyanaz, mint a [-]crterase\n" " [-]echok új sor visszaadása egy kill karakter után\n" -#: src/stty.c:652 +#: src/stty.c:661 #, fuzzy msgid "" " * [-]echoke same as [-]crtkill\n" @@ -10307,7 +10691,7 @@ msgstr "" " bekapcsolása\n" " [-]iexten a nem POSIX különleges karakterek bekapcsolása\n" -#: src/stty.c:659 +#: src/stty.c:668 #, fuzzy msgid "" " [-]isig enable interrupt, quit, and suspend special characters\n" @@ -10327,7 +10711,7 @@ msgstr "" " * [-]xcase az icanon használatakor escape-elés a „\\” karakterekkel\n" " nagybetűs karakterekhez\n" -#: src/stty.c:666 +#: src/stty.c:675 msgid "" "\n" "Combination settings:\n" @@ -10341,7 +10725,7 @@ msgstr "" " cbreak ugyanaz, mint a -icanon\n" " -cbreak ugyanaz, mint az icanon\n" -#: src/stty.c:673 +#: src/stty.c:682 msgid "" " cooked same as brkint ignpar istrip icrnl ixon opost isig\n" " icanon, eof and eol characters to their default values\n" @@ -10355,7 +10739,7 @@ msgstr "" " -cooked ugyanaz, mint a raw\n" " crt ugyanaz, mint az echoe echoctl echoke\n" -#: src/stty.c:679 +#: src/stty.c:688 msgid "" " dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" " kill ^u\n" @@ -10371,7 +10755,7 @@ msgstr "" " értékeikre\n" " evenp ugyanaz, mint a parenb -parodd cs7\n" -#: src/stty.c:686 +#: src/stty.c:695 msgid "" " -evenp same as -parenb cs8\n" " * [-]lcase same as xcase iuclc olcuc\n" @@ -10387,7 +10771,7 @@ msgstr "" " nl ugyanaz, mint az -icrnl -onlcr\n" " -nl ugyanaz, mint az icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" -#: src/stty.c:694 +#: src/stty.c:703 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -10401,7 +10785,7 @@ msgstr "" " pass8 ugyanaz, mint a -parenb -istrip cs8\n" " -pass8 ugyanaz, mint a parenb istrip cs7\n" -#: src/stty.c:701 +#: src/stty.c:710 msgid "" " raw same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" " -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n" @@ -10414,7 +10798,7 @@ msgstr "" " -imaxbel -opost -isig -icanon -xcase min 1 time 0\n" " -raw ugyanaz, mint a cooked\n" -#: src/stty.c:707 +#: src/stty.c:716 msgid "" " sane same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" " -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n" @@ -10432,7 +10816,7 @@ msgstr "" "különleges\n" " karakter beállítása az alapértelmezett értékeikre\n" -#: src/stty.c:715 +#: src/stty.c:724 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -10450,12 +10834,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:787 +#: src/stty.c:796 #, c-format msgid "only one device may be specified" msgstr "csak egyetlen eszköz adható meg" -#: src/stty.c:817 +#: src/stty.c:826 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" @@ -10464,132 +10848,47 @@ 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:823 +#: src/stty.c:832 #, 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:838 +#: src/stty.c:847 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s: nem állítható vissza a nem blokkoló mód" -#: src/stty.c:883 src/stty.c:993 +#: src/stty.c:892 src/stty.c:1002 #, c-format msgid "invalid argument %s" msgstr "érvénytelen argumentum: %s" -#: src/stty.c:894 src/stty.c:911 src/stty.c:923 src/stty.c:936 src/stty.c:948 -#: src/stty.c:968 +#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957 +#: src/stty.c:977 #, c-format msgid "missing argument to %s" msgstr "a(z) %s argumentuma hiányzik" -#: src/stty.c:974 +#: src/stty.c:983 #, c-format msgid "invalid line discipline %s" msgstr "érvénytelen vonalmódszer: %s" -#: src/stty.c:1044 +#: src/stty.c:1053 #, 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:1390 +#: src/stty.c:1399 #, 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:1904 +#: src/stty.c:1920 #, c-format msgid "invalid integer argument %s" msgstr "érvénytelen egész argumentum: %s" -#: src/su.c:229 -msgid "Password:" -msgstr "Jelszó:" - -#: src/su.c:232 -#, c-format -msgid "getpass: cannot open /dev/tty" -msgstr "getpass: a /dev/tty nem nyitható meg" - -#: src/su.c:290 -#, c-format -msgid "cannot set groups" -msgstr "a csoportok nem állíthatók be" - -#: src/su.c:294 -#, c-format -msgid "cannot set group id" -msgstr "a csoportazonosító nem állítható be" - -#: src/su.c:296 -#, c-format -msgid "cannot set user id" -msgstr "a felhasználóazonosító nem állítható be" - -#: src/su.c:371 -#, c-format -msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" -msgstr "Használat: %s [KAPCSOLÓ]… [-] [FELHASZNÁLÓ [ARGUMENTUM]…]\n" - -#: src/su.c:372 -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 "" -"A hatásos felhasználói azonosító és csoportazonosító megváltoztatása a\n" -"FELHASZNÁLÓÉRA.\n" -"\n" -" -, -l, --login a parancsértelmező legyen bejelentkezési\n" -" parancsértelmező\n" -" -c, --command=PARANCS egyetlen PARANCS átadása a " -"parancsértelmezőnek\n" -" -f, --fast a -f átadása a parancsértelmezőnek (csh vagy\n" -" tcsh esetén)\n" -" -m, --preserve-environment ne állítsa vissza a környezeti változókat\n" -" -p ugyanaz, mint a -m\n" -" -s, --shell=PARANCSÉRTELMEZŐ a PARANCSÉRTELMEZŐ futtatása, ha az /etc/" -"shells\n" -" engedélyezi\n" - -#: src/su.c:384 -msgid "" -"\n" -"A mere - implies -l. If USER not given, assume root.\n" -msgstr "" -"\n" -"egy egyszerű - a -l kapcsolót jelenti. Ha a FELHASZNÁLÓ nincs megadva, akkor " -"a\n" -"root az alapértelmezés.\n" - -#: src/su.c:461 -#, c-format -msgid "user %s does not exist" -msgstr "a(z) %s felhasználó nem létezik" - -#: src/su.c:484 -#, c-format -msgid "incorrect password" -msgstr "helytelen jelszó" - -#: src/su.c:501 -#, c-format -msgid "using restricted shell %s" -msgstr "a(z) %s korlátozott parancsértelmező használata" - -#: src/su.c:509 -#, c-format -msgid "warning: cannot change directory to %s" -msgstr "figyelmeztetés: nem lehet a következő könyvtárba lépni: %s" - #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 msgid "Kayvan Aghaiepour" @@ -10621,7 +10920,7 @@ msgstr "" msgid "ignoring all arguments" msgstr "minden argumentum figyelmen kívül marad" -#: src/system.h:340 +#: src/system.h:343 #, c-format msgid "" "\n" @@ -10637,15 +10936,24 @@ msgstr "" "parancsértelmező\n" "dokumentációjához.\n" -#: src/system.h:346 +#: src/system.h:349 msgid " --help display this help and exit\n" msgstr " --help ezen súgó megjelenítése és kilépés\n" -#: src/system.h:348 +#: src/system.h:351 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:541 +#: src/system.h:544 +#, fuzzy +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" + +#: src/system.h:552 msgid "" "\n" "SIZE is an integer and optional unit (example: 10M is 10*1024*1024). Units\n" @@ -10657,7 +10965,7 @@ msgstr "" "egységek K, M, G, T, P, E, Z, Y (1024 hatványai) vagy KB, MB, … (1000 " "hatványai)\n" -#: src/system.h:550 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -10672,7 +10980,7 @@ 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:560 +#: src/system.h:571 #, c-format msgid "" "\n" @@ -10685,25 +10993,25 @@ msgstr "" #. <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:574 +#: src/system.h:585 #, 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:578 +#: src/system.h:589 #, 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:585 +#: src/system.h:596 #, fuzzy, 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:617 +#: src/system.h:628 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -10724,16 +11032,16 @@ 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" -"\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:145 +#: src/tac.c:144 msgid "" " -b, --before attach the separator before instead of after\n" " -r, --regex interpret the separator as a regular expression\n" @@ -10745,42 +11053,42 @@ msgstr "" " -s, --separator=KARAKTERLÁNC a KARAKTERLÁNC használata elválasztóként az\n" " új sor helyett\n" -#: src/tac.c:235 src/tac.c:336 +#: src/tac.c:234 src/tac.c:335 #, c-format msgid "%s: seek failed" msgstr "%s: a keresés meghiúsult" -#: src/tac.c:264 +#: src/tac.c:263 #, c-format msgid "record too large" msgstr "a rekord túl nagy" -#: src/tac.c:451 +#: src/tac.c:450 #, c-format msgid "failed to create temporary file in %s" msgstr "nem hozható létre ideiglenes fájl itt: %s" -#: src/tac.c:459 +#: src/tac.c:458 #, c-format msgid "failed to open %s for writing" msgstr "%s megnyitása írásra meghiúsult" -#: src/tac.c:476 +#: src/tac.c:475 #, c-format msgid "failed to rewind stream for %s" msgstr "az adatfolyam visszaállítása meghiúsult erre: %s" -#: src/tac.c:512 src/tac.c:519 +#: src/tac.c:511 src/tac.c:518 #, c-format msgid "%s: write error" msgstr "%s: íráshiba" -#: src/tac.c:572 +#: src/tac.c:571 #, c-format msgid "failed to open %s for reading" msgstr "%s megnyitása olvasásra meghiúsult" -#: src/tac.c:630 +#: src/tac.c:629 #, c-format msgid "separator cannot be empty" msgstr "az elválasztó nem lehet üres" @@ -10791,19 +11099,18 @@ msgid "Ian Lance Taylor" msgstr "Ian Lance Taylor" #: src/tail.c:262 -#, c-format +#, fuzzy, 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" -"\n" msgstr "" "Minden egyes FÁJL utolsó %d sorának kiírása a szabványos kimenetre.\n" "Több FÁJL esetén mindegyiket megelőzi egy fejléc, amely megadja a " "fájlnevet.\n" "Ha a FÁJL nincs megadva, vagy -, akkor a szabványos bemenetet olvassa.\n" -#: src/tail.c:271 +#: src/tail.c:270 msgid "" " -c, --bytes=K output the last K bytes; alternatively, use -c " "+K\n" @@ -10815,7 +11122,7 @@ msgstr "" " a bájtok kiíratására minden fájl K. bájtjától " "kezdve\n" -#: src/tail.c:275 +#: src/tail.c:274 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -10830,7 +11137,7 @@ msgstr "" "megegyeznek\n" " -F ugyanaz, mint a --follow=name --retry\n" -#: src/tail.c:282 +#: src/tail.c:281 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -10857,7 +11164,7 @@ msgstr "" " eset forgatott naplófájlok esetén).\n" " Az inotify használatakor ez ritkán hasznos.\n" -#: src/tail.c:295 +#: src/tail.c:294 msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" " -q, --quiet, --silent never output headers giving file names\n" @@ -10873,7 +11180,7 @@ msgstr "" " nem érhető el; hasznos név szerinti követéskor\n" " azaz a --follow=name kapcsolóval\n" -#: src/tail.c:302 +#: src/tail.c:301 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations.\n" @@ -10890,7 +11197,7 @@ msgstr "" "egyszer.\n" " -v, --verbose mindig írja ki a fájlneveket megadó fejléceket\n" -#: src/tail.c:311 +#: src/tail.c:310 #, fuzzy msgid "" "\n" @@ -10908,7 +11215,7 @@ 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/tail.c:320 +#: src/tail.c:319 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" @@ -10927,27 +11234,27 @@ msgstr "" "nevű fájlt úgy követi, hogy az átnevezést, eltávolítást és létrehozást " "kezelje.\n" -#: src/tail.c:379 +#: src/tail.c:378 #, c-format msgid "closing %s (fd=%d)" msgstr "%s lezárása (fd=%d)" -#: src/tail.c:454 +#: 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:458 +#: src/tail.c:457 #, 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:895 +#: src/tail.c:894 #, 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:907 +#: src/tail.c:906 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " @@ -10956,41 +11263,41 @@ 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:964 +#: src/tail.c:963 #, c-format msgid "%s has become inaccessible" msgstr "%s elérhetetlenné vált" -#: src/tail.c:981 +#: src/tail.c:980 #, 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:990 +#: src/tail.c:989 #, 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:1011 +#: src/tail.c:1010 #, c-format msgid "%s has become accessible" msgstr "%s elérhetővé vált" -#: src/tail.c:1019 +#: src/tail.c:1018 #, 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:1030 +#: src/tail.c:1029 #, 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:1131 +#: src/tail.c:1130 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: nem módosítható a nem blokkoló mód" @@ -11366,17 +11673,22 @@ msgstr "hiányzó „]”" msgid "extra argument %s" msgstr "extra argumentum: %s" -#: src/timeout.c:124 +#: src/timeout.c:112 +#, fuzzy, c-format +msgid "warning: sigprocmask" +msgstr "figyelmeztetés: timer_create" + +#: src/timeout.c:145 #, c-format msgid "warning: timer_settime" msgstr "figyelmeztetés: timer_settime" -#: src/timeout.c:129 +#: src/timeout.c:150 #, c-format msgid "warning: timer_create" msgstr "figyelmeztetés: timer_create" -#: src/timeout.c:204 +#: src/timeout.c:225 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -11385,11 +11697,9 @@ msgstr "" "Használat: %s [KAPCSOLÓ] IDŐTARTAM PARANCS [ARGUMENTUM]…\n" " vagy: %s [KAPCSOLÓ]\n" -#: src/timeout.c:208 -msgid "" -"Start COMMAND, and kill it if still running after DURATION.\n" -"\n" -"Mandatory arguments to long options are mandatory for short options too.\n" +#: src/timeout.c:229 +#, fuzzy +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" @@ -11397,9 +11707,12 @@ msgstr "" "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:213 +#: src/timeout.c:235 #, fuzzy msgid "" +" --preserve-status\n" +" exit with the same status as COMMAND, even when the\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 " @@ -11429,7 +11742,7 @@ msgstr "" " 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:229 +#: src/timeout.c:254 #, fuzzy msgid "" "\n" @@ -11441,16 +11754,16 @@ 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:234 +#: src/timeout.c:259 #, fuzzy msgid "" "\n" -"If the command times out, then exit with status 124. Otherwise, exit\n" -"with the status of COMMAND. If no signal is specified, send the TERM\n" -"signal upon timeout. The TERM signal kills any process that does not\n" -"block or catch that signal. For other processes, it may be necessary to\n" -"use the KILL (9) signal, since this signal cannot be caught. If the\n" -"KILL (9) signal is sent, the exit status is 128+9 rather than 124.\n" +"If the command times out, and --preserve-status is not set, then exit with\n" +"status 124. Otherwise, exit with the status of COMMAND. If no signal\n" +"is specified, send the TERM signal upon timeout. The TERM signal kills\n" +"any process that does not block or catch that signal. It may be necessary\n" +"to use the KILL (9) signal, since this signal cannot be caught, in which\n" +"case the exit status is 128+9 rather than 124.\n" msgstr "" "\n" "Ha a parancs túllépi az időkorlátot, akkor a 124-es állapottal lép ki.\n" @@ -11461,15 +11774,20 @@ msgstr "" "vagy el nem kapó folyamatokat. Más folyamatok esetén a KILL (9) szignál\n" "használandó, mivel ez nem kapható el.\n" -#: src/timeout.c:419 +#: src/timeout.c:363 +#, c-format +msgid "warning: disabling core dumps failed" +msgstr "figyelmeztetés: a magkiíratások letiltása meghiúsult" + +#: src/timeout.c:471 #, c-format msgid "error waiting for command" msgstr "hiba a parancsra várakozás közben" -#: src/timeout.c:441 +#: src/timeout.c:482 #, c-format -msgid "warning: disabling core dumps failed" -msgstr "figyelmeztetés: a magkiíratások letiltása meghiúsult" +msgid "the monitored command dumped core" +msgstr "" #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 @@ -11481,22 +11799,23 @@ msgstr "Jim Kingdon" msgid "Randy Smith" msgstr "Randy Smith" -#: src/touch.c:115 src/touch.c:313 +#: src/touch.c:115 src/touch.c:309 #, c-format msgid "invalid date format %s" msgstr "érvénytelen dátumformátum: %s" -#: src/touch.c:194 +#: src/touch.c:191 #, c-format msgid "cannot touch %s" msgstr "%s elérése sikertelen" -#: src/touch.c:200 +#: src/touch.c:197 #, c-format msgid "setting times of %s" msgstr "%s idejének beállítása" -#: src/touch.c:216 +#: src/touch.c:213 +#, fuzzy msgid "" "Update the access and modification times of each FILE to the current time.\n" "\n" @@ -11505,7 +11824,6 @@ msgid "" "\n" "A FILE argument string of - is handled specially and causes touch to\n" "change the times of the file associated with standard output.\n" -"\n" msgstr "" "Frissíti mindegyik FÁJL elérési és módosítási idejét a jelenlegi időre.\n" "\n" @@ -11516,7 +11834,7 @@ msgstr "" "a szabványos kimenethez társított fájl időit módosítja.\n" "\n" -#: src/touch.c:229 +#: src/touch.c:225 msgid "" " -a change only the access time\n" " -c, --no-create do not create any files\n" @@ -11529,7 +11847,7 @@ msgstr "" " jelenlegi idő helyett\n" " -f (figyelmen kívül marad)\n" -#: src/touch.c:235 +#: src/touch.c:231 msgid "" " -h, --no-dereference affect each symbolic link instead of any " "referenced\n" @@ -11542,11 +11860,12 @@ msgstr "" " ahol a szimbolikus link időbélyege módosítható)\n" " -m csak a módosítási időt módosítja\n" -#: src/touch.c:241 +#: 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" -" --time=WORD change the specified time:\n" +" --time=WORD change the specified time:\n" " WORD is access, atime, or use: equivalent to -a\n" " WORD is modify or mtime: equivalent to -m\n" msgstr "" @@ -11557,7 +11876,7 @@ msgstr "" " access atime use: ugyanaz, mint a -a\n" " modify mtime: ugyanaz, mint a -m\n" -#: src/touch.c:250 +#: src/touch.c:246 msgid "" "\n" "Note that the -d and -t options accept different time-date formats.\n" @@ -11566,12 +11885,12 @@ msgstr "" "Megjegyzés: a -d és -t kapcsolókhoz megadandó dátum- és időformátumok\n" "különböznek.\n" -#: src/touch.c:339 +#: src/touch.c:335 #, c-format 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:413 +#: src/touch.c:409 #, fuzzy, c-format msgid "" "warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'" @@ -11852,6 +12171,7 @@ 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" @@ -11860,7 +12180,6 @@ msgid "" "If a FILE is larger than the specified size, the extra data is lost.\n" "If a FILE is shorter, it is extended and the extended part (hole)\n" "reads as zero bytes.\n" -"\n" msgstr "" "Az egyes FÁJLOK méretének csökkentése vagy növelése a megadott méretre\n" "\n" @@ -11870,18 +12189,18 @@ msgstr "" "Ha egy FÁJL kisebb, akkor nulla bájtokkal megnövelésre kerül.\n" "\n" -#: src/truncate.c:110 +#: src/truncate.c:109 msgid " -c, --no-create do not create any files\n" msgstr " -c, --no-create ne hozzon létre fájlokat\n" -#: src/truncate.c:113 +#: src/truncate.c:112 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" " -o, --io-blocks A MÉRET bájtok helyett IO blokkok számaként való " "kezelése\n" -#: src/truncate.c:116 +#: 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" @@ -11889,7 +12208,7 @@ 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" -#: src/truncate.c:122 +#: src/truncate.c:121 #, fuzzy msgid "" "\n" @@ -11902,57 +12221,57 @@ msgstr "" "„+” növelés, „-” csökkentés, „<” legfeljebb, „>” legalább,\n" "„/” lekerekítés a többszörösére, „%” felkerekítés a többszörösére.\n" -#: src/truncate.c:150 +#: src/truncate.c:149 #, c-format msgid "overflow in %<PRIdMAX> * %<PRIdMAX> byte blocks for file %s" msgstr "túlcsordulás %<PRIdMAX> * %<PRIdMAX> bájtos blokkokban a(z) %s fájlhoz" -#: src/truncate.c:174 +#: src/truncate.c:173 #, c-format msgid "%s has unusable, apparently negative size" msgstr "%s használhatatlan, nyilvánvalóan negatív mérettel rendelkezik" -#: src/truncate.c:184 src/truncate.c:379 +#: src/truncate.c:183 src/truncate.c:384 #, c-format msgid "cannot get the size of %s" msgstr "%s mérete nem kérhető le" -#: src/truncate.c:206 +#: src/truncate.c:205 #, c-format msgid "overflow rounding up size of file %s" msgstr "túlcsordulás a(z) %s fájl méretének felkerekítése közben" -#: src/truncate.c:216 +#: src/truncate.c:215 #, c-format msgid "overflow extending size of file %s" msgstr "túlcsordulás a(z) %s fájl méretének növelése közben" -#: src/truncate.c:231 +#: src/truncate.c:230 #, c-format msgid "failed to truncate %s at %<PRIdMAX> bytes" msgstr "%s csonkítása meghiúsult a(z) %<PRIdMAX>. bájtnál" -#: src/truncate.c:305 +#: src/truncate.c:303 #, c-format msgid "multiple relative modifiers specified" msgstr "több relatív módosító van megadva" -#: src/truncate.c:335 +#: src/truncate.c:333 #, c-format msgid "you must specify either %s or %s" msgstr "meg kell adnia a következők egyikét: %s vagy %s" -#: src/truncate.c:342 +#: src/truncate.c:340 #, c-format msgid "you must specify a relative %s with %s" msgstr "meg kell adnia egy relatív %s értéket ezzel: %s" -#: src/truncate.c:349 +#: src/truncate.c:347 #, c-format msgid "%s was specified but %s was not" msgstr "%s meg lett adva, de %s nem" -#: src/truncate.c:400 +#: src/truncate.c:404 #, c-format msgid "cannot open %s for writing" msgstr "%s nem nyitható meg olvasásra" @@ -12051,17 +12370,17 @@ 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" -"\n" 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:125 +#: src/unexpand.c:124 msgid "" " -a, --all convert all blanks, instead of just initial blanks\n" " --first-only convert only leading sequences of blanks (overrides -a)\n" @@ -12078,12 +12397,12 @@ msgstr "" "használata\n" " (bekapcsolja a -a kapcsolót)\n" -#: src/unexpand.c:153 +#: src/unexpand.c:152 #, c-format msgid "tabs are too far apart" msgstr "a tabok túl messze vannak egymástól" -#: src/unexpand.c:505 +#: src/unexpand.c:504 #, c-format msgid "tab stop value is too large" msgstr "a tab méret túl nagy" @@ -12094,12 +12413,12 @@ msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n" msgstr "Használat: %s [KAPCSOLÓ]… [BEMENET [KIMENET]]\n" #: src/uniq.c:138 +#, fuzzy 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" -"\n" msgstr "" "Szomszédos egyező sorok szűrése a BEMENETBŐL (vagy szabványos bemenetből),\n" "kiírás a KIMENETRE (vagy szabványos kimenetre).\n" @@ -12107,7 +12426,7 @@ msgstr "" "Kapcsolók nélkül az egyező sorok az első előfordulásba lesznek egyesítve.\n" "\n" -#: src/uniq.c:148 +#: src/uniq.c:147 msgid "" " -c, --count prefix lines by the number of occurrences\n" " -d, --repeated only print duplicate lines\n" @@ -12115,7 +12434,7 @@ 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" -#: src/uniq.c:152 +#: src/uniq.c:151 msgid "" " -D, --all-repeated[=delimit-method] print all duplicate lines\n" " delimit-method={none(default),prepend,separate}\n" @@ -12136,13 +12455,13 @@ msgstr "" " -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:162 +#: src/uniq.c:161 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:167 +#: src/uniq.c:166 msgid "" "\n" "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n" @@ -12153,7 +12472,7 @@ msgstr "" "üreshely karakterek követnek. A mezők karakterek előtti része ki lesz " "hagyva.\n" -#: src/uniq.c:172 +#: src/uniq.c:171 #, fuzzy msgid "" "\n" @@ -12167,24 +12486,24 @@ 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:359 +#: src/uniq.c:358 #, c-format msgid "too many repeated lines" msgstr "túl sok ismétlődő sor" -#: src/uniq.c:522 +#: src/uniq.c:521 msgid "invalid number of fields to skip" msgstr "a kihagyandó mezők száma érvénytelen" -#: src/uniq.c:531 +#: src/uniq.c:530 msgid "invalid number of bytes to skip" msgstr "a kihagyandó bájtok száma érvénytelen" -#: src/uniq.c:540 +#: src/uniq.c:539 msgid "invalid number of bytes to compare" msgstr "az összehasonlítandó bájtok száma érvénytelen" -#: src/uniq.c:559 +#: src/uniq.c:558 #, 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" @@ -12238,6 +12557,11 @@ msgid_plural "up %ld days %2d:%02d, " msgstr[0] "fut %ld nap %2d.%02d, " msgstr[1] "fut %ld nap %2d.%02d, " +#: src/uptime.c:149 +#, fuzzy, c-format +msgid "up %2d:%02d, " +msgstr "fut %ld nap %2d.%02d, " + #: src/uptime.c:151 #, c-format msgid "%lu user" @@ -12341,39 +12665,39 @@ msgstr "" msgid " old " msgstr " régi " -#: src/who.c:449 +#: src/who.c:440 msgid "system boot" msgstr "rendszerindulás" -#: src/who.c:456 src/who.c:458 +#: src/who.c:447 src/who.c:449 msgid "id=" msgstr "id=" -#: src/who.c:471 src/who.c:476 +#: src/who.c:462 src/who.c:467 msgid "term=" msgstr "term=" -#: src/who.c:473 src/who.c:477 +#: src/who.c:464 src/who.c:468 msgid "exit=" msgstr "kilép=" -#: src/who.c:494 +#: src/who.c:485 msgid "LOGIN" msgstr "BEJELENTKEZÉS" -#: src/who.c:514 +#: src/who.c:505 msgid "clock change" msgstr "óraváltozás" -#: src/who.c:526 src/who.c:527 +#: src/who.c:517 src/who.c:518 msgid "run-level" msgstr "futási szint" -#: src/who.c:530 src/who.c:531 +#: src/who.c:521 src/who.c:522 msgid "last=" msgstr "utolsó=" -#: src/who.c:562 +#: src/who.c:553 #, c-format msgid "" "\n" @@ -12382,44 +12706,44 @@ msgstr "" "\n" "# felhasználók=%lu\n" -#: src/who.c:568 +#: src/who.c:559 msgid "NAME" msgstr "NÉV" -#: src/who.c:568 +#: src/who.c:559 msgid "LINE" msgstr "VONAL" -#: src/who.c:568 +#: src/who.c:559 msgid "TIME" msgstr "IDŐ" -#: src/who.c:568 +#: src/who.c:559 msgid "IDLE" msgstr "ÜRES" -#: src/who.c:569 +#: src/who.c:560 msgid "PID" msgstr "PID" -#: src/who.c:569 +#: src/who.c:560 msgid "COMMENT" msgstr "MEGJEGYZÉS" -#: src/who.c:569 +#: src/who.c:560 msgid "EXIT" msgstr "KILÉP" -#: src/who.c:649 +#: src/who.c:640 #, c-format msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n" msgstr "Használat: %s [KAPCSOLÓ]… [ FÁJL | ARG1 ARG2 ]\n" -#: src/who.c:650 +#: src/who.c:641 msgid "Print information about users who are currently logged in.\n" msgstr "Információk kiírása az éppen bejelentkezett felhasználókról.\n" -#: src/who.c:653 +#: src/who.c:644 msgid "" "\n" " -a, --all same as -b -d --login -p -r -t -T -u\n" @@ -12433,11 +12757,11 @@ msgstr "" " -d, --dead döglött folyamatok kiírása\n" " -H, --heading oszlopfejléceket tartalmazó sor kiírása\n" -#: src/who.c:660 +#: src/who.c:651 msgid " -l, --login print system login processes\n" msgstr " -l, --login kiírja a rendszer bejelentkezési folyamatait\n" -#: src/who.c:663 +#: src/who.c:654 msgid "" " --lookup attempt to canonicalize hostnames via DNS\n" " -m only hostname and user associated with stdin\n" @@ -12449,7 +12773,7 @@ msgstr "" "felhasználó\n" " -p, --process az init által indított aktív folyamatok kiírása\n" -#: src/who.c:668 +#: src/who.c:659 msgid "" " -q, --count all login names and number of users logged on\n" " -r, --runlevel print current runlevel\n" @@ -12462,7 +12786,7 @@ msgstr "" " -s, --short csak a név, vonal és idő kiírása (alapértelmezett)\n" " -t, --time az utolsó rendszeróra-változás kiírása\n" -#: src/who.c:674 +#: src/who.c:665 msgid "" " -T, -w, --mesg add user's message status as +, - or ?\n" " -u, --users list users logged in\n" @@ -12475,7 +12799,7 @@ msgstr "" " --message ugyanaz, mint a -T\n" " --writable ugyanaz, mint a -T\n" -#: src/who.c:682 +#: src/who.c:673 #, fuzzy, c-format msgid "" "\n" @@ -12523,13 +12847,49 @@ msgstr "" "kiírása.\n" "\n" +#~ 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 " returning value: '%s'\n" +#~ msgstr "%s fájl létrehozása\n" + #, fuzzy -#~ msgid " gid=%s" -#~ msgstr " gid=%lu" +#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n" +#~ msgstr "Használat: %s [KAPCSOLÓ]… [FELHASZNÁLÓ]…\n" #, fuzzy -#~ msgid " euid=%s" -#~ msgstr " euid=%lu" +#~ msgid "no valid suffix found\n" +#~ msgstr "%s: érvénytelen utótaghossz" + +#~ msgid "" +#~ "\n" +#~ "Examples:\n" +#~ " %s /usr/bin/sort Output \"sort\".\n" +#~ " %s include/stdio.h .h Output \"stdio\".\n" +#~ msgstr "" +#~ "\n" +#~ "Példák::\n" +#~ " %s /usr/bin/sort A kimenet: „sort”.\n" +#~ " %s include/stdio.h .h A kimenet: „stdio”.\n" + +#~ msgid "reading %s" +#~ msgstr "%s olvasása" + +#~ msgid "writing %s" +#~ msgstr "%s írása" + +#~ msgid "closing %s" +#~ msgstr "%s lezárása" + +#~ msgid "accessing %s" +#~ msgstr "%s elérése" + +#~ msgid "opening %s" +#~ msgstr "%s megnyitása" #~ msgid "" #~ "Usage: %s NAME\n" @@ -12538,19 +12898,157 @@ msgstr "" #~ "Használat: %s NÉV\n" #~ " vagy: %s KAPCSOLÓ\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 a más fájlrendszeren lévő könyvtárak kihagyása\n" +#~ " -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" +#~ " -d --max-depth=N csak akkor írja ki az összesítést egy adott " +#~ "könyvtárra\n" +#~ " (vagy fájlra a --all esetén), ha az legfeljebb " +#~ "N\n" +#~ " szinttel van a parancssorban megadott könyvtár " +#~ "alatt.\n" +#~ " A --max-depth=0 ugyanaz, mint a --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 nem készít mentést (még a --backup megadása esetén " +#~ "sem)\n" +#~ " numbered, t számozott mentést készít\n" +#~ " existing, nil számozott, ha már létezik számozott változat, " +#~ "egyébként\n" +#~ " egyszerű\n" +#~ " simple, never mindig egyszerű biztonsági mentés\n" +#~ "\n" + +#~ msgid "" +#~ "WARNING: --page-increment is deprecated; use --line-increment instead" +#~ msgstr "" +#~ "FIGYELMEZTETÉS: a --page-increment kapcsoló elavult, használja a --line-" +#~ "increment kapcsolót helyette" + +#~ msgid "All arguments to long options are mandatory for short options.\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" + +#~ 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" +#~ "Az ALAP d, ha decimális, o ha oktális, x ha hexadecimális vagy n, ha " +#~ "nincs.\n" +#~ "A BÁJT hexadecimális a 0x vagy 0X előtaggal és a következő szorzó-" +#~ "utótagokkal\n" +#~ "rendelkezhet: 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 esetén.\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" + +#~ 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 "" +#~ "A --string kapcsoló szám nélkül 3-at jelent. A --width szám nélkül 32-t.\n" +#~ "Alapértelmezésben az od a következőket használja: -A o -t oS -w16.\n" + +#~ msgid "Usage: %s [OPTION]... FILE\n" +#~ msgstr "Használat: %s [KAPCSOLÓ]… [FÁJL]\n" + #~ msgid "--relative-base requires --relative-to" #~ msgstr "a --relative-base megköveteli a --relative-to megadását is" +#~ msgid "Password:" +#~ msgstr "Jelszó:" + +#~ msgid "getpass: cannot open /dev/tty" +#~ msgstr "getpass: a /dev/tty nem nyitható meg" + +#~ msgid "cannot set groups" +#~ msgstr "a csoportok nem állíthatók be" + +#~ msgid "cannot set group id" +#~ msgstr "a csoportazonosító nem állítható be" + +#~ msgid "cannot set user id" +#~ msgstr "a felhasználóazonosító nem állítható be" + +#~ msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" +#~ msgstr "Használat: %s [KAPCSOLÓ]… [-] [FELHASZNÁLÓ [ARGUMENTUM]…]\n" + #~ msgid "" +#~ "Change the effective user id and group id to that of USER.\n" #~ "\n" -#~ "Examples:\n" -#~ " %s /usr/bin/sort Output \"sort\".\n" -#~ " %s include/stdio.h .h Output \"stdio\".\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 "" +#~ "A hatásos felhasználói azonosító és csoportazonosító megváltoztatása a\n" +#~ "FELHASZNÁLÓÉRA.\n" #~ "\n" -#~ "Példák::\n" -#~ " %s /usr/bin/sort A kimenet: „sort”.\n" -#~ " %s include/stdio.h .h A kimenet: „stdio”.\n" +#~ " -, -l, --login a parancsértelmező legyen bejelentkezési\n" +#~ " parancsértelmező\n" +#~ " -c, --command=PARANCS egyetlen PARANCS átadása a " +#~ "parancsértelmezőnek\n" +#~ " -f, --fast a -f átadása a parancsértelmezőnek (csh " +#~ "vagy\n" +#~ " tcsh esetén)\n" +#~ " -m, --preserve-environment ne állítsa vissza a környezeti változókat\n" +#~ " -p ugyanaz, mint a -m\n" +#~ " -s, --shell=PARANCSÉRTELMEZŐ a PARANCSÉRTELMEZŐ futtatása, ha az /etc/" +#~ "shells\n" +#~ " engedélyezi\n" + +#~ msgid "" +#~ "\n" +#~ "A mere - implies -l. If USER not given, assume root.\n" +#~ msgstr "" +#~ "\n" +#~ "egy egyszerű - a -l kapcsolót jelenti. Ha a FELHASZNÁLÓ nincs megadva, " +#~ "akkor a\n" +#~ "root az alapértelmezés.\n" + +#~ msgid "user %s does not exist" +#~ msgstr "a(z) %s felhasználó nem létezik" + +#~ msgid "incorrect password" +#~ msgstr "helytelen jelszó" + +#~ msgid "using restricted shell %s" +#~ msgstr "a(z) %s korlátozott parancsértelmező használata" + +#~ msgid "warning: cannot change directory to %s" +#~ msgstr "figyelmeztetés: nem lehet a következő könyvtárba lépni: %s" #~ msgid "" #~ "Change the group of each FILE to GROUP.\n" diff --git a/po/ia.gmo b/po/ia.gmo new file mode 100644 index 00000000..c4c808b3 Binary files /dev/null and b/po/ia.gmo differ diff --git a/po/ia.po b/po/ia.po new file mode 100644 index 00000000..92b801ff --- /dev/null +++ b/po/ia.po @@ -0,0 +1,9933 @@ +# Interlingua translations for GNU coreutils package. +# Copyright (C) 2012 Free Software Foundation, Inc. +# This file is distributed under the same license as the coreutils package. +# Nik Kalach <nik.kalach@inbox.ru>, 2012. +# +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" +"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" +"Language: ia\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: lib/argmatch.c:133 +#, c-format +msgid "invalid argument %s for %s" +msgstr "argumento %s invalide pro %s" + +#: lib/argmatch.c:134 +#, c-format +msgid "ambiguous argument %s for %s" +msgstr "argumento %s ambigue pro %s" + +#: lib/argmatch.c:153 +msgid "Valid arguments are:" +msgstr "Le argumentos valide es:" + +#: lib/closein.c:100 +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 +#: 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 +#, c-format +msgid "preserving permissions for %s" +msgstr "preservation del permissiones pro %s" + +#: lib/error.c:188 +msgid "Unknown system error" +msgstr "Error del systema incognite" + +#: lib/file-type.c:38 +msgid "regular empty file" +msgstr "file regular vacue" + +#: lib/file-type.c:38 +msgid "regular file" +msgstr "file regular" + +#: lib/file-type.c:41 +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 +msgid "symbolic link" +msgstr "ligamine symbolic" + +#: lib/file-type.c:56 +msgid "socket" +msgstr "socket" + +#: lib/file-type.c:59 +msgid "message queue" +msgstr "cauda de messages" + +#: lib/file-type.c:62 +msgid "semaphore" +msgstr "semaphoro" + +#: lib/file-type.c:65 +msgid "shared memory object" +msgstr "objecto de memoria condivise" + +#: lib/file-type.c:68 +msgid "typed memory object" +msgstr "objecto de memoria con typo" + +#: lib/file-type.c:70 +msgid "weird file" +msgstr "file estranie" + +#: lib/gai_strerror.c:57 +msgid "Address family for hostname not supported" +msgstr "Le familia de adresses pro le nomine de host non es supportate" + +#: lib/gai_strerror.c:58 +msgid "Temporary failure in name resolution" +msgstr "Insuccesso temporanee in le resolution de nomine" + +#: lib/gai_strerror.c:59 +msgid "Bad value for ai_flags" +msgstr "Valor incorrecte pro ai_flags" + +#: lib/gai_strerror.c:60 +msgid "Non-recoverable failure in name resolution" +msgstr "Insuccesso irrecuperabile in le resolution de nomine" + +#: lib/gai_strerror.c:61 +msgid "ai_family not supported" +msgstr "ai_family non supportate" + +#: lib/gai_strerror.c:62 +msgid "Memory allocation failure" +msgstr "Insuccesso de allocation de momoria" + +#: lib/gai_strerror.c:63 +msgid "No address associated with hostname" +msgstr "Necun adresse associate al nomine de host" + +#: lib/gai_strerror.c:64 +msgid "Name or service not known" +msgstr "Nomine o servicio incognite" + +#: lib/gai_strerror.c:65 +msgid "Servname not supported for ai_socktype" +msgstr "Servname non supportate pro ai_socktype" + +#: lib/gai_strerror.c:66 +msgid "ai_socktype not supported" +msgstr "ai_socktype non supportate" + +#: lib/gai_strerror.c:67 +msgid "System error" +msgstr "Error de systema" + +#: lib/gai_strerror.c:68 +msgid "Argument buffer too small" +msgstr "Le buffer del argumento es troppo parve" + +#: lib/gai_strerror.c:70 +msgid "Processing request in progress" +msgstr "Processamento del requesta in curso" + +#: lib/gai_strerror.c:71 +msgid "Request canceled" +msgstr "Requesta annullate" + +#: lib/gai_strerror.c:72 +msgid "Request not canceled" +msgstr "Requesta non annullate" + +#: lib/gai_strerror.c:73 +msgid "All requests done" +msgstr "Tote le requestas completate" + +#: lib/gai_strerror.c:74 +msgid "Interrupted by a signal" +msgstr "Interrumpite per un signal" + +#: lib/gai_strerror.c:75 +msgid "Parameter string not correctly encoded" +msgstr "Catena de parametros codificate incorrectemente" + +#: lib/gai_strerror.c:87 +msgid "Unknown error" +msgstr "Error incognite" + +#: lib/getopt.c:547 lib/getopt.c:576 +#, c-format +msgid "%s: option '%s' is ambiguous; possibilities:" +msgstr "%s: le option '%s' es ambigue; possibilitates:" + +#: lib/getopt.c:624 lib/getopt.c:628 +#, c-format +msgid "%s: option '--%s' doesn't allow an argument\n" +msgstr "%s: le option '--%s' non accepta necun argumento\n" + +#: lib/getopt.c:637 lib/getopt.c:642 +#, c-format +msgid "%s: option '%c%s' doesn't allow an argument\n" +msgstr "%s: le option '%c%s' non accepta necun argumento\n" + +#: lib/getopt.c:685 lib/getopt.c:704 +#, c-format +msgid "%s: option '--%s' requires an argument\n" +msgstr "%s: le option '--%s' require un argumento\n" + +#: lib/getopt.c:742 lib/getopt.c:745 +#, c-format +msgid "%s: unrecognized option '--%s'\n" +msgstr "%s: option non recognoscite '--%s'\n" + +#: lib/getopt.c:753 lib/getopt.c:756 +#, c-format +msgid "%s: unrecognized option '%c%s'\n" +msgstr "%s: option non recognoscite '%c%s'\n" + +#: lib/getopt.c:805 lib/getopt.c:808 +#, c-format +msgid "%s: invalid option -- '%c'\n" +msgstr "%s: option invalide -- '%c'\n" + +#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 +#, c-format +msgid "%s: option requires an argument -- '%c'\n" +msgstr "%s: le option require un argumento -- '%c'\n" + +#: lib/getopt.c:934 lib/getopt.c:950 +#, c-format +msgid "%s: option '-W %s' is ambiguous\n" +msgstr "%s: le option '-W %s' es ambigue\n" + +#: lib/getopt.c:974 lib/getopt.c:992 +#, c-format +msgid "%s: option '-W %s' doesn't allow an argument\n" +msgstr "%s: le option '-W %s' non accepta necun argumento\n" + +#: lib/getopt.c:1013 lib/getopt.c:1031 +#, c-format +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 +#, 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 +#, 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 +#, c-format +msgid "memory exhausted" +msgstr "memoria exhauste" + +#: lib/openat-die.c:38 +#, c-format +msgid "unable to record current working directory" +msgstr "impossibile de registrar le directorio de travalio actual" + +#: lib/openat-die.c:57 src/find-mount-point.c:107 +#, c-format +msgid "failed to return to initial working directory" +msgstr "impossibile de revenir al directorio de travalio initial" + +#. TRANSLATORS: +#. Get translations for open and closing quotation marks. +#. The message catalog should translate "`" to a left +#. quotation mark suitable for the locale, and similarly for +#. "'". For example, a French Unicode local should translate +#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), respectively. +#. +#. If the catalog has no translation, we will try to +#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and +#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK). If the +#. current locale is not Unicode, locale_quoting_style +#. will quote 'like this', and clocale_quoting_style will +#. quote "like this". You should always include translations +#. for "`" and "'" even if U+2018 and U+2019 are appropriate +#. for your locale. +#. +#. If you don't know what to put here, please see +#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> +#. and use glyphs suitable for your language. +#: lib/quotearg.c:312 +msgid "`" +msgstr "`" + +#: lib/quotearg.c:313 +msgid "'" +msgstr "'" + +#: lib/randread.c:128 +#, c-format +msgid "%s: end of file" +msgstr "%s: fin de file" + +#: lib/regcomp.c:131 +msgid "Success" +msgstr "Successo" + +#: lib/regcomp.c:134 +msgid "No match" +msgstr "Nulle correspondentia" + +#: lib/regcomp.c:137 +msgid "Invalid regular expression" +msgstr "Expression regular incorrecte" + +#: lib/regcomp.c:140 +msgid "Invalid collation character" +msgstr "Character de collation incorrecte" + +#: lib/regcomp.c:143 +msgid "Invalid character class name" +msgstr "Nomine de classe de characteres incorrecte" + +#: lib/regcomp.c:146 +msgid "Trailing backslash" +msgstr "Barra oblique inverse final" + +#: lib/regcomp.c:149 +msgid "Invalid back reference" +msgstr "Referentia a retro incorrecte" + +#: lib/regcomp.c:152 +msgid "Unmatched [ or [^" +msgstr "[ o [^ non accopulate" + +#: lib/regcomp.c:155 +msgid "Unmatched ( or \\(" +msgstr "( o \\( non accopulate" + +#: lib/regcomp.c:158 +msgid "Unmatched \\{" +msgstr "\\{ non accopulate" + +#: lib/regcomp.c:161 +msgid "Invalid content of \\{\\}" +msgstr "Contento de \\{\\} incorrecte" + +#: lib/regcomp.c:164 +msgid "Invalid range end" +msgstr "Fin de intervallo incorrecte" + +#: lib/regcomp.c:167 +msgid "Memory exhausted" +msgstr "Memoria exhaurite" + +#: lib/regcomp.c:170 +msgid "Invalid preceding regular expression" +msgstr "Expression regular precedente incorrecte" + +#: lib/regcomp.c:173 +msgid "Premature end of regular expression" +msgstr "Fin prematur del expression regular" + +#: lib/regcomp.c:176 +msgid "Regular expression too big" +msgstr "Expression regular es troppo grande" + +#: lib/regcomp.c:179 +msgid "Unmatched ) or \\)" +msgstr ") o \\) non accopulate" + +#: lib/regcomp.c:704 +msgid "No previous regular expression" +msgstr "Nulle expression regular previe" + +#: lib/root-dev-ino.h:37 +#, c-format +msgid "it is dangerous to operate recursively on %s" +msgstr "il es periculose operar recursivemente sur %s" + +#: lib/root-dev-ino.h:41 +#, c-format +msgid "it is dangerous to operate recursively on %s (same as %s)" +msgstr "il es periculose operar recursivemente sur %s (identic a %s)" + +#: lib/root-dev-ino.h:43 +#, c-format +msgid "use --no-preserve-root to override this failsafe" +msgstr "utilisa --no-preserve-root pro inhibir iste mesura de securitate" + +#. TRANSLATORS: A regular expression testing for an affirmative answer +#. (english: "yes"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. 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 +msgid "^[yY]" +msgstr "^[sSyY]" + +#. TRANSLATORS: A regular expression testing for a negative answer +#. (english: "no"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. 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 +msgid "^[nN]" +msgstr "^[nN]" + +#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516 +#, c-format +msgid "setting permissions for %s" +msgstr "initiation de permissiones de %s" + +#: lib/siglist.h:31 +msgid "Hangup" +msgstr "Clausura de terminal" + +#: lib/siglist.h:34 +msgid "Interrupt" +msgstr "Requesta de interrumper" + +#: lib/siglist.h:37 +msgid "Quit" +msgstr "Requesta de quitar" + +#: lib/siglist.h:40 +msgid "Illegal instruction" +msgstr "Instruction malformate" + +#: lib/siglist.h:43 +msgid "Trace/breakpoint trap" +msgstr "Trappa al puncto de traciage o suspension" + +#: lib/siglist.h:46 +msgid "Aborted" +msgstr "Termination anormal" + +#: lib/siglist.h:49 +msgid "Floating point exception" +msgstr "Exception al calculation con virgula flottante" + +#: lib/siglist.h:52 +msgid "Killed" +msgstr "Termination immediate" + +#: lib/siglist.h:55 +msgid "Bus error" +msgstr "Violation de accesso a memoria" + +#: lib/siglist.h:58 +msgid "Segmentation fault" +msgstr "Violation de segmentation" + +#: lib/siglist.h:61 +msgid "Broken pipe" +msgstr "Conducto rupte" + +#: lib/siglist.h:64 +msgid "Alarm clock" +msgstr "Eveliator" + +#: lib/siglist.h:67 +msgid "Terminated" +msgstr "Requesta de termination" + +#: lib/siglist.h:70 +msgid "Urgent I/O condition" +msgstr "Condition de I/O urgente" + +#: lib/siglist.h:73 +msgid "Stopped (signal)" +msgstr "Suspender un processo" + +#: lib/siglist.h:76 +msgid "Stopped" +msgstr "Requesta de suspension" + +#: lib/siglist.h:79 +msgid "Continued" +msgstr "Continuar un processo" + +#: lib/siglist.h:82 +msgid "Child exited" +msgstr "" + +#: lib/siglist.h:85 +msgid "Stopped (tty input)" +msgstr "" + +#: lib/siglist.h:88 +msgid "Stopped (tty output)" +msgstr "" + +#: lib/siglist.h:91 +msgid "I/O possible" +msgstr "" + +#: lib/siglist.h:94 +msgid "CPU time limit exceeded" +msgstr "" + +#: lib/siglist.h:97 +msgid "File size limit exceeded" +msgstr "" + +#: lib/siglist.h:100 +msgid "Virtual timer expired" +msgstr "" + +#: lib/siglist.h:103 +msgid "Profiling timer expired" +msgstr "" + +#: lib/siglist.h:106 +msgid "Window changed" +msgstr "" + +#: lib/siglist.h:109 +msgid "User defined signal 1" +msgstr "" + +#: lib/siglist.h:112 +msgid "User defined signal 2" +msgstr "" + +#: lib/siglist.h:117 +msgid "EMT trap" +msgstr "" + +#: lib/siglist.h:120 +msgid "Bad system call" +msgstr "" + +#: lib/siglist.h:123 +msgid "Stack fault" +msgstr "" + +#: lib/siglist.h:126 +msgid "Information request" +msgstr "" + +#: lib/siglist.h:128 +msgid "Power failure" +msgstr "" + +#: 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 +#, 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" +msgstr "" + +#: lib/strsignal.c:118 +#, c-format +msgid "Unknown signal %d" +msgstr "" + +#: lib/unicodeio.c:102 +msgid "iconv function not usable" +msgstr "" + +#: lib/unicodeio.c:104 +msgid "iconv function not available" +msgstr "" + +#: lib/unicodeio.c:111 +msgid "character out of range" +msgstr "" + +#: lib/unicodeio.c:181 +#, c-format +msgid "cannot convert U+%04X to local character set" +msgstr "" + +#: lib/unicodeio.c:183 +#, c-format +msgid "cannot convert U+%04X to local character set: %s" +msgstr "" + +#: lib/userspec.c:106 +msgid "invalid user" +msgstr "" + +#: lib/userspec.c:107 +msgid "invalid group" +msgstr "" + +#: lib/userspec.c:108 +msgid "invalid spec" +msgstr "" + +#: lib/verror.c:73 +#, c-format +msgid "unable to display error message" +msgstr "" + +#: lib/version-etc.c:74 +#, c-format +msgid "Packaged by %s (%s)\n" +msgstr "" + +#: lib/version-etc.c:77 +#, c-format +msgid "Packaged by %s\n" +msgstr "" + +#. 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 "" + +#: lib/version-etc.c:86 +msgid "" +"\n" +"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl." +"html>.\n" +"This is free software: you are free to change and redistribute it.\n" +"There is NO WARRANTY, to the extent permitted by law.\n" +"\n" +msgstr "" + +#. TRANSLATORS: %s denotes an author name. +#: lib/version-etc.c:102 +#, c-format +msgid "Written by %s.\n" +msgstr "" + +#. TRANSLATORS: Each %s denotes an author name. +#: lib/version-etc.c:106 +#, c-format +msgid "Written by %s and %s.\n" +msgstr "" + +#. TRANSLATORS: Each %s denotes an author name. +#: lib/version-etc.c:110 +#, c-format +msgid "Written by %s, %s, and %s.\n" +msgstr "" + +#. 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 +#, c-format +msgid "" +"Written by %s, %s, %s,\n" +"and %s.\n" +msgstr "" + +#. 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 +#, c-format +msgid "" +"Written by %s, %s, %s,\n" +"%s, and %s.\n" +msgstr "" + +#. 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:131 +#, c-format +msgid "" +"Written by %s, %s, %s,\n" +"%s, %s, and %s.\n" +msgstr "" + +#. 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:139 +#, c-format +msgid "" +"Written by %s, %s, %s,\n" +"%s, %s, %s, and %s.\n" +msgstr "" + +#. 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:147 +#, c-format +msgid "" +"Written by %s, %s, %s,\n" +"%s, %s, %s, %s,\n" +"and %s.\n" +msgstr "" + +#. 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:156 +#, c-format +msgid "" +"Written by %s, %s, %s,\n" +"%s, %s, %s, %s,\n" +"%s, and %s.\n" +msgstr "" + +#. 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:167 +#, c-format +msgid "" +"Written by %s, %s, %s,\n" +"%s, %s, %s, %s,\n" +"%s, %s, and others.\n" +msgstr "" + +#. 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 +#, c-format +msgid "" +"\n" +"Report bugs to: %s\n" +msgstr "" + +#: lib/version-etc.c:247 +#, c-format +msgid "Report %s bugs to: %s\n" +msgstr "" + +#: lib/version-etc.c:251 src/system.h:573 +#, c-format +msgid "%s home page: <%s>\n" +msgstr "" + +#: lib/version-etc.c:253 +#, c-format +msgid "%s home page: <http://www.gnu.org/software/%s/>\n" +msgstr "" + +#: lib/version-etc.c:256 src/system.h:574 +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 "" + +#: lib/xfreopen.c:36 +msgid "stdout" +msgstr "" + +#: lib/xfreopen.c:37 +msgid "stderr" +msgstr "" + +#: lib/xfreopen.c:38 +msgid "unknown stream" +msgstr "" + +#: lib/xfreopen.c:39 +#, c-format +msgid "failed to reopen %s with mode %s" +msgstr "" + +#: lib/xmemcoll.c:39 src/expr.c:886 +#, c-format +msgid "string comparison failed" +msgstr "" + +#: lib/xmemcoll.c:40 +#, c-format +msgid "Set LC_ALL='C' to work around the problem." +msgstr "" + +#: lib/xmemcoll.c:42 +#, c-format +msgid "The strings compared were %s and %s." +msgstr "" + +#: lib/xprintf.c:50 lib/xprintf.c:76 +#, c-format +msgid "cannot perform formatted output" +msgstr "" + +#: lib/xstrtol-error.c:63 +#, c-format +msgid "invalid %s%s argument '%s'" +msgstr "" + +#: lib/xstrtol-error.c:68 +#, c-format +msgid "invalid suffix in %s%s argument '%s'" +msgstr "" + +#: lib/xstrtol-error.c:72 +#, c-format +msgid "%s%s argument '%s' too large" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/base64.c:40 +msgid "Simon Josefsson" +msgstr "" + +#: src/base64.c:60 +#, c-format +msgid "" +"Usage: %s [OPTION]... [FILE]\n" +"Base64 encode or decode FILE, or standard input, to standard output.\n" +msgstr "" + +#: src/base64.c:67 +msgid "" +" -d, --decode decode data\n" +" -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" +" -w, --wrap=COLS wrap encoded lines after COLS character (default " +"76).\n" +" Use 0 to disable line wrapping\n" +"\n" +msgstr "" + +#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70 +msgid "" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" +msgstr "" + +#: src/base64.c:79 +msgid "" +"\n" +"The data are encoded as described for the base64 alphabet in RFC 3548.\n" +"When decoding, the input may contain newlines in addition to the bytes of\n" +"the formal base64 alphabet. Use --ignore-garbage to attempt to recover\n" +"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 +#, c-format +msgid "read error" +msgstr "" + +#: src/base64.c:230 +#, c-format +msgid "invalid input" +msgstr "" + +#: src/base64.c:267 +#, 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 +#, c-format +msgid "extra operand %s" +msgstr "" + +#: src/base64.c:318 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/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/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 +msgid "David MacKenzie" +msgstr "" + +#: src/basename.c:48 +#, c-format +msgid "" +"Usage: %s NAME [SUFFIX]\n" +" or: %s OPTION... NAME...\n" +msgstr "" + +#: src/basename.c:53 +msgid "" +"Print NAME with any leading directory components removed.\n" +"If specified, also remove a trailing SUFFIX.\n" +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" +msgstr "" + +#: src/basename.c:67 +#, c-format +msgid "" +"\n" +"Examples:\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\" 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/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 +#, 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 +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/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/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 +#, c-format +msgid "Usage: %s [OPTION]... [FILE]...\n" +msgstr "" + +#: src/cat.c:92 +msgid "" +"Concatenate FILE(s), or standard input, to standard output.\n" +"\n" +" -A, --show-all equivalent to -vET\n" +" -b, --number-nonblank number nonempty output lines, overrides -n\n" +" -e equivalent to -vE\n" +" -E, --show-ends display $ at end of each line\n" +" -n, --number number all output lines\n" +" -s, --squeeze-blank suppress repeated empty output lines\n" +msgstr "" + +#: src/cat.c:102 +msgid "" +" -t equivalent to -vT\n" +" -T, --show-tabs display TAB characters as ^I\n" +" -u (ignored)\n" +" -v, --show-nonprinting use ^ and M- notation, except for LFD and TAB\n" +msgstr "" + +#: src/cat.c:114 +#, c-format +msgid "" +"\n" +"Examples:\n" +" %s f - g Output f's contents, then standard input, then g's contents.\n" +" %s Copy standard input to standard output.\n" +msgstr "" + +#: src/cat.c:326 +#, c-format +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 +#, c-format +msgid "standard output" +msgstr "" + +#: src/cat.c:716 +#, c-format +msgid "%s: input file is output file" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/chcon.c:36 src/runcon.c:62 +msgid "Russell Coker" +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 +msgid "Jim Meyering" +msgstr "" + +#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238 +#, c-format +msgid "failed to create security context: %s" +msgstr "" + +#: src/chcon.c:112 +#, c-format +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 +#, c-format +msgid "failed to get security context of %s" +msgstr "" + +#: src/chcon.c:166 +#, c-format +msgid "can't apply partial context to unlabeled file %s" +msgstr "" + +#: src/chcon.c:193 +#, 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 +#, c-format +msgid "cannot access %s" +msgstr "" + +#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437 +#, c-format +msgid "cannot read directory %s" +msgstr "" + +#: src/chcon.c:292 +#, c-format +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 +#, 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 +#, c-format +msgid "fts_close failed" +msgstr "" + +#: src/chcon.c:351 +#, 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 "" + +#: src/chcon.c:357 +msgid "" +"Change the security context of each FILE to CONTEXT.\n" +"With --reference, change the security context of each FILE to that of " +"RFILE.\n" +msgstr "" + +#: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94 +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 "" + +#: src/chcon.c:369 +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" +" -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 "" + +#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 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 +msgid "" +" --reference=RFILE use RFILE's security context rather than " +"specifying\n" +" a CONTEXT value\n" +msgstr "" + +#: 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 "" + +#: src/chcon.c:389 src/chgrp.c:143 src/chown.c:121 +msgid "" +"\n" +"The following options modify how a hierarchy is traversed when the -R\n" +"option is also specified. If more than one is specified, only the final\n" +"one takes effect.\n" +"\n" +" -H if a command line argument is a symbolic link\n" +" to a directory, traverse it\n" +" -L traverse every symbolic link to a directory\n" +" encountered\n" +" -P do not traverse any symbolic links (default)\n" +"\n" +msgstr "" + +#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267 +#, c-format +msgid "-R --dereference requires either -H or -L" +msgstr "" + +#: src/chcon.c:524 +#, 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 +#, c-format +msgid "missing operand after %s" +msgstr "" + +#: src/chcon.c:562 src/runcon.c:251 +#, c-format +msgid "invalid context: %s" +msgstr "" + +#: src/chcon.c:569 +#, 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 +#, c-format +msgid "failed to get attributes of %s" +msgstr "" + +#: src/chgrp.c:92 +#, c-format +msgid "invalid group: %s" +msgstr "" + +#: src/chgrp.c:108 +#, c-format +msgid "" +"Usage: %s [OPTION]... GROUP FILE...\n" +" or: %s [OPTION]... --reference=RFILE FILE...\n" +msgstr "" + +#: src/chgrp.c:113 +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 "" + +#: src/chgrp.c:118 src/chmod.c:382 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 "" + +#: src/chgrp.c:128 src/chown.c:99 +msgid "" +" (useful only on systems that can change the\n" +" ownership of a symlink)\n" +msgstr "" + +#: src/chgrp.c:136 +msgid "" +" --reference=RFILE use RFILE's group rather than specifying a\n" +" GROUP value\n" +msgstr "" + +#: src/chgrp.c:158 +#, c-format +msgid "" +"\n" +"Examples:\n" +" %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 "" + +#: src/chmod.c:126 +#, c-format +msgid "getting new attributes of %s" +msgstr "" + +#: src/chmod.c:149 src/chown-core.c:147 +#, c-format +msgid "neither symbolic link %s nor referent has been changed\n" +msgstr "" + +#: src/chmod.c:163 +#, c-format +msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n" +msgstr "" + +#: src/chmod.c:166 +#, c-format +msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n" +msgstr "" + +#: src/chmod.c:169 +#, c-format +msgid "mode of %s retained as %04lo (%s)\n" +msgstr "" + +#: src/chmod.c:236 +#, c-format +msgid "cannot operate on dangling symlink %s" +msgstr "" + +#: src/chmod.c:276 +#, c-format +msgid "changing permissions of %s" +msgstr "" + +#: src/chmod.c:311 +#, c-format +msgid "%s: new permissions are %s, not %s" +msgstr "" + +#: src/chmod.c:371 +#, 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 "" + +#: src/chmod.c:377 +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 +msgid " --reference=RFILE use RFILE's mode instead of MODE values\n" +msgstr "" + +#: src/chmod.c:394 +msgid " -R, --recursive change files and directories recursively\n" +msgstr "" + +#: src/chmod.c:399 +msgid "" +"\n" +"Each MODE is of the form '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n" +msgstr "" + +#: src/chmod.c:513 +#, c-format +msgid "cannot combine mode and --reference options" +msgstr "" + +#: src/chmod.c:544 +#, c-format +msgid "invalid mode: %s" +msgstr "" + +#: src/chown-core.c:158 +#, c-format +msgid "changed ownership of %s from %s to %s\n" +msgstr "" + +#: src/chown-core.c:159 +#, c-format +msgid "changed group of %s from %s to %s\n" +msgstr "" + +#: src/chown-core.c:160 +#, c-format +msgid "no change to ownership of %s\n" +msgstr "" + +#: src/chown-core.c:165 +#, c-format +msgid "failed to change ownership of %s from %s to %s\n" +msgstr "" + +#: src/chown-core.c:166 +#, c-format +msgid "failed to change group of %s from %s to %s\n" +msgstr "" + +#: src/chown-core.c:167 src/chown-core.c:173 +#, c-format +msgid "failed to change ownership of %s\n" +msgstr "" + +#: src/chown-core.c:171 +#, c-format +msgid "failed to change ownership of %s to %s\n" +msgstr "" + +#: src/chown-core.c:172 +#, c-format +msgid "failed to change group of %s to %s\n" +msgstr "" + +#: src/chown-core.c:180 +#, c-format +msgid "ownership of %s retained as %s\n" +msgstr "" + +#: src/chown-core.c:181 +#, c-format +msgid "group of %s retained as %s\n" +msgstr "" + +#: src/chown-core.c:182 +#, c-format +msgid "ownership of %s retained\n" +msgstr "" + +#: src/chown-core.c:379 +#, c-format +msgid "cannot dereference %s" +msgstr "" + +#: src/chown-core.c:467 +#, c-format +msgid "changing ownership of %s" +msgstr "" + +#: src/chown-core.c:468 +#, c-format +msgid "changing group of %s" +msgstr "" + +#: src/chown.c:79 +#, c-format +msgid "" +"Usage: %s [OPTION]... [OWNER][:[GROUP]] FILE...\n" +" or: %s [OPTION]... --reference=RFILE FILE...\n" +msgstr "" + +#: src/chown.c:84 +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" +msgstr "" + +#: src/chown.c:103 +msgid "" +" --from=CURRENT_OWNER:CURRENT_GROUP\n" +" change the owner and/or group of each file only if\n" +" its current owner and/or group match those " +"specified\n" +" here. Either may be omitted, in which case a " +"match\n" +" is not required for the omitted attribute\n" +msgstr "" + +#: src/chown.c:114 +msgid "" +" --reference=RFILE use RFILE's owner and group rather than\n" +" specifying OWNER:GROUP values\n" +msgstr "" + +#: src/chown.c:136 +msgid "" +"\n" +"Owner is unchanged if missing. Group is unchanged if missing, but changed\n" +"to login group if implied by a ':' following a symbolic OWNER.\n" +"OWNER and GROUP may be numeric as well as symbolic.\n" +msgstr "" + +#: src/chown.c:142 +#, c-format +msgid "" +"\n" +"Examples:\n" +" %s root /u Change the owner of /u to \"root\".\n" +" %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 "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/chroot.c:34 +msgid "Roland McGrath" +msgstr "" + +#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120 +#, c-format +msgid "invalid group %s" +msgstr "" + +#: src/chroot.c:109 +#, 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 +#, c-format +msgid "" +"Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" +" or: %s OPTION\n" +msgstr "" + +#: src/chroot.c:137 +msgid "" +"Run COMMAND with root directory set to NEWROOT.\n" +"\n" +msgstr "" + +#: src/chroot.c:142 +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 +msgid "" +"\n" +"If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n" +msgstr "" + +#: src/chroot.c:202 +#, c-format +msgid "cannot change root directory to %s" +msgstr "" + +#: src/chroot.c:206 +#, c-format +msgid "cannot chdir to root directory" +msgstr "" + +#: src/chroot.c:247 +#, c-format +msgid "failed to set group-ID" +msgstr "" + +#: src/chroot.c:253 +#, 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 +#, c-format +msgid "failed to run command %s" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/cksum.c:40 +msgid "Q. Frank Xia" +msgstr "" + +#: src/cksum.c:216 +#, c-format +msgid "%s: file too long" +msgstr "" + +#: src/cksum.c:263 +#, c-format +msgid "" +"Usage: %s [FILE]...\n" +" or: %s [OPTION]\n" +msgstr "" + +#: src/cksum.c:268 +msgid "" +"Print CRC checksum and byte counts of each FILE.\n" +"\n" +msgstr "" + +#: src/comm.c:103 src/join.c:187 +#, c-format +msgid "Usage: %s [OPTION]... FILE1 FILE2\n" +msgstr "" + +#: src/comm.c:107 +msgid "Compare sorted files FILE1 and FILE2 line by line.\n" +msgstr "" + +#: src/comm.c:110 +msgid "" +"\n" +"With no options, produce three-column output. Column one contains\n" +"lines unique to FILE1, column two contains lines unique to FILE2,\n" +"and column three contains lines common to both files.\n" +msgstr "" + +#: src/comm.c:116 +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 "" + +#: src/comm.c:122 +msgid "" +"\n" +" --check-order check that the input is correctly sorted, even\n" +" if all input lines are pairable\n" +" --nocheck-order do not check that the input is correctly sorted\n" +msgstr "" + +#: src/comm.c:128 +msgid " --output-delimiter=STR separate columns with STR\n" +msgstr "" + +#: src/comm.c:133 +msgid "" +"\n" +"Note, comparisons honor the rules specified by 'LC_COLLATE'.\n" +msgstr "" + +#: src/comm.c:137 +#, c-format +msgid "" +"\n" +"Examples:\n" +" %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 "" + +#: src/comm.c:222 +#, c-format +msgid "file %d is not in sorted order" +msgstr "" + +#: src/comm.c:407 +#, c-format +msgid "multiple delimiters specified" +msgstr "" + +#: src/comm.c:411 +#, c-format +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 +#, c-format +msgid "error reading %s" +msgstr "" + +#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425 +#, c-format +msgid "cannot lseek %s" +msgstr "" + +#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151 +#, c-format +msgid "error writing %s" +msgstr "" + +#: src/copy.c:313 +#, c-format +msgid "%s: failed to get extents info" +msgstr "" + +#: src/copy.c:373 +#, c-format +msgid "%s: write failed" +msgstr "" + +#: src/copy.c:442 src/copy.c:1083 +#, c-format +msgid "failed to extend %s" +msgstr "" + +#: src/copy.c:662 +#, c-format +msgid "clearing permissions for %s" +msgstr "" + +#: src/copy.c:697 src/copy.c:2480 src/cp.c:329 +#, c-format +msgid "failed to preserve ownership for %s" +msgstr "" + +#: src/copy.c:723 +#, c-format +msgid "failed to lookup file %s" +msgstr "" + +#: src/copy.c:728 +#, 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 +#, c-format +msgid "cannot fstat %s" +msgstr "" + +#: src/copy.c:820 +#, 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 +#, 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 +#, 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 +#, c-format +msgid "removed %s\n" +msgstr "" + +#: src/copy.c:926 +#, c-format +msgid "not writing through dangling symlink %s" +msgstr "" + +#: src/copy.c:964 +#, c-format +msgid "cannot create regular file %s" +msgstr "" + +#: src/copy.c:985 +#, c-format +msgid "failed to clone %s from %s" +msgstr "" + +#: src/copy.c:1098 src/copy.c:2541 +#, 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/truncate.c:417 +#, c-format +msgid "failed to close %s" +msgstr "" + +#: src/copy.c:1471 +#, c-format +msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? " +msgstr "" + +#: src/copy.c:1478 +#, c-format +msgid "%s: overwrite %s? " +msgstr "" + +#: src/copy.c:1547 +#, c-format +msgid " (backup: %s)" +msgstr "" + +#: src/copy.c:1557 +#, c-format +msgid "failed to restore the default file creation context" +msgstr "" + +#: src/copy.c:1589 +#, 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 +#, c-format +msgid "cannot stat %s" +msgstr "" + +#: src/copy.c:1650 +#, c-format +msgid "omitting directory %s" +msgstr "" + +#: src/copy.c:1664 +#, c-format +msgid "warning: source file %s specified more than once" +msgstr "" + +#: src/copy.c:1712 src/ln.c:246 +#, c-format +msgid "%s and %s are the same file" +msgstr "" + +#: src/copy.c:1811 +#, c-format +msgid "cannot overwrite non-directory %s with directory %s" +msgstr "" + +#: src/copy.c:1829 src/ln.c:214 +#, c-format +msgid "will not overwrite just-created %s with %s" +msgstr "" + +#: src/copy.c:1847 +#, c-format +msgid "cannot overwrite directory %s with non-directory" +msgstr "" + +#: src/copy.c:1861 +#, c-format +msgid "cannot move directory onto non-directory: %s -> %s" +msgstr "" + +#: src/copy.c:1891 +#, c-format +msgid "backing up %s would destroy source; %s not moved" +msgstr "" + +#: src/copy.c:1892 +#, c-format +msgid "backing up %s would destroy source; %s not copied" +msgstr "" + +#: src/copy.c:1915 src/ln.c:276 +#, c-format +msgid "cannot backup %s" +msgstr "" + +#: src/copy.c:1979 +#, c-format +msgid "will not copy %s through just-created symlink %s" +msgstr "" + +#: src/copy.c:2056 +#, c-format +msgid "cannot copy a directory, %s, into itself, %s" +msgstr "" + +#: src/copy.c:2073 +#, c-format +msgid "will not create hard link %s to directory %s" +msgstr "" + +#: src/copy.c:2123 +#, c-format +msgid "cannot move %s to a subdirectory of itself, %s" +msgstr "" + +#: src/copy.c:2166 +#, c-format +msgid "cannot move %s to %s" +msgstr "" + +#: src/copy.c:2178 +#, 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 +#, c-format +msgid "cannot copy cyclic symbolic link %s" +msgstr "" + +#: src/copy.c:2355 +#, c-format +msgid "%s: can make relative symbolic links only in current directory" +msgstr "" + +#: src/copy.c:2362 +#, c-format +msgid "cannot create symbolic link %s to %s" +msgstr "" + +#: src/copy.c:2416 src/mkfifo.c:132 +#, c-format +msgid "cannot create fifo %s" +msgstr "" + +#: src/copy.c:2425 +#, c-format +msgid "cannot create special file %s" +msgstr "" + +#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921 +#, c-format +msgid "cannot read symbolic link %s" +msgstr "" + +#: src/copy.c:2463 +#, c-format +msgid "cannot create symbolic link %s" +msgstr "" + +#: src/copy.c:2495 +#, c-format +msgid "%s has unknown file type" +msgstr "" + +#: src/copy.c:2644 src/ln.c:358 +#, c-format +msgid "cannot un-backup %s" +msgstr "" + +#: src/copy.c:2648 +#, c-format +msgid "%s -> %s (unbackup)\n" +msgstr "" + +#: src/cp.c:156 src/mv.c:286 +#, c-format +msgid "" +"Usage: %s [OPTION]... [-T] SOURCE DEST\n" +" or: %s [OPTION]... SOURCE... DIRECTORY\n" +" or: %s [OPTION]... -t DIRECTORY SOURCE...\n" +msgstr "" + +#: src/cp.c:162 +msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" +msgstr "" + +#: src/cp.c:168 +msgid "" +" -a, --archive same as -dR --preserve=all\n" +" --attributes-only don't copy the file data, just the " +"attributes\n" +" --backup[=CONTROL] make a backup of each existing destination " +"file\n" +" -b like --backup but does not accept an " +"argument\n" +" --copy-contents copy contents of special files when " +"recursive\n" +" -d same as --no-dereference --preserve=links\n" +msgstr "" + +#: src/cp.c:177 +msgid "" +" -f, --force if an existing destination file cannot be\n" +" opened, remove it and try again (this " +"option\n" +" is ignored when the -n option is also " +"used)\n" +" -i, --interactive prompt before overwrite (overrides a previous " +"-n\n" +" option)\n" +" -H follow command-line symbolic links in SOURCE\n" +msgstr "" + +#: src/cp.c:186 +msgid "" +" -l, --link hard link files instead of copying\n" +" -L, --dereference always follow symbolic links in SOURCE\n" +msgstr "" + +#: src/cp.c:190 +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 +msgid "" +" -p same as --preserve=mode,ownership,timestamps\n" +" --preserve[=ATTR_LIST] preserve the specified attributes (default:\n" +" mode,ownership,timestamps), if possible\n" +" additional attributes: context, links, " +"xattr,\n" +" all\n" +msgstr "" + +#: src/cp.c:203 +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 +msgid "" +" -R, -r, --recursive copy directories recursively\n" +" --reflink[=WHEN] control clone/CoW copies. See below\n" +" --remove-destination remove each existing destination file before\n" +" attempting to open it (contrast with --" +"force)\n" +msgstr "" + +#: src/cp.c:213 +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 "" + +#: src/cp.c:218 +msgid "" +" -s, --symbolic-link make symbolic links instead of copying\n" +" -S, --suffix=SUFFIX override the usual backup suffix\n" +" -t, --target-directory=DIRECTORY copy all SOURCE arguments into " +"DIRECTORY\n" +" -T, --no-target-directory treat DEST as a normal file\n" +msgstr "" + +#: src/cp.c:224 +msgid "" +" -u, --update copy only when the SOURCE file is newer\n" +" than the destination file or when the\n" +" destination file is missing\n" +" -v, --verbose explain what is being done\n" +" -x, --one-file-system stay on this file system\n" +msgstr "" + +#: src/cp.c:233 +msgid "" +"\n" +"By default, sparse SOURCE files are detected by a crude heuristic and the\n" +"corresponding DEST file is made sparse as well. That is the behavior\n" +"selected by --sparse=auto. Specify --sparse=always to create a sparse DEST\n" +"file whenever the SOURCE file contains a long enough sequence of zero " +"bytes.\n" +"Use --sparse=never to inhibit creation of sparse files.\n" +"\n" +"When --reflink[=always] is specified, perform a lightweight copy, where the\n" +"data blocks are copied only when modified. If this is not possible the " +"copy\n" +"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 +msgid "" +"\n" +"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 "" + +#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329 +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 "" + +#: src/cp.c:258 +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 "" + +#: src/cp.c:317 +#, c-format +msgid "failed to preserve times for %s" +msgstr "" + +#: src/cp.c:348 +#, c-format +msgid "failed to preserve permissions for %s" +msgstr "" + +#: src/cp.c:475 +#, c-format +msgid "cannot make directory %s" +msgstr "" + +#: src/cp.c:524 src/cp.c:543 +#, 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 +#, 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/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 +#, c-format +msgid "missing destination file operand after %s" +msgstr "" + +#: src/cp.c:601 src/install.c:926 src/mv.c:445 +#, 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 +#, c-format +msgid "target %s is not a directory" +msgstr "" + +#: src/cp.c:728 +#, 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 +#, c-format +msgid "multiple target directories specified" +msgstr "" + +#: src/cp.c:1110 +#, c-format +msgid "cannot make both hard and symbolic links" +msgstr "" + +#: src/cp.c:1117 src/mv.c:466 +#, c-format +msgid "options --backup and --no-clobber are mutually exclusive" +msgstr "" + +#: src/cp.c:1123 +#, 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 +msgid "backup type" +msgstr "" + +#: src/cp.c:1156 +#, c-format +msgid "cannot preserve security context without an SELinux-enabled kernel" +msgstr "" + +#: src/cp.c:1162 +#, 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 +msgid "Stuart Kemp" +msgstr "" + +#: src/csplit.c:531 +#, c-format +msgid "input disappeared" +msgstr "" + +#: src/csplit.c:660 src/csplit.c:671 +#, c-format +msgid "%s: line number out of range" +msgstr "" + +#: src/csplit.c:700 +#, c-format +msgid "%s: %s: line number out of range" +msgstr "" + +#: src/csplit.c:703 src/csplit.c:752 +#, c-format +msgid " on repetition %s\n" +msgstr "" + +#: src/csplit.c:746 +#, 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 +#, c-format +msgid "error in regular expression search" +msgstr "" + +#: src/csplit.c:983 +#, c-format +msgid "write error for %s" +msgstr "" + +#: src/csplit.c:1059 +#, c-format +msgid "%s: integer expected after delimiter" +msgstr "" + +#: src/csplit.c:1075 +#, c-format +msgid "%s: '}' is required in repeat count" +msgstr "" + +#: src/csplit.c:1085 +#, c-format +msgid "%s}: integer required between '{' and '}'" +msgstr "" + +#: src/csplit.c:1112 +#, c-format +msgid "%s: closing delimiter '%c' missing" +msgstr "" + +#: src/csplit.c:1129 +#, c-format +msgid "%s: invalid regular expression: %s" +msgstr "" + +#: src/csplit.c:1162 +#, c-format +msgid "%s: invalid pattern" +msgstr "" + +#: src/csplit.c:1165 +#, c-format +msgid "%s: line number must be greater than zero" +msgstr "" + +#: src/csplit.c:1171 +#, c-format +msgid "line number %s is smaller than preceding line number, %s" +msgstr "" + +#: src/csplit.c:1177 +#, c-format +msgid "warning: line number %s is the same as preceding line number" +msgstr "" + +#: src/csplit.c:1255 +#, c-format +msgid "missing conversion specifier in suffix" +msgstr "" + +#: src/csplit.c:1261 +#, c-format +msgid "invalid conversion specifier in suffix: %c" +msgstr "" + +#: src/csplit.c:1264 +#, c-format +msgid "invalid conversion specifier in suffix: \\%.3o" +msgstr "" + +#: src/csplit.c:1269 +#, c-format +msgid "invalid flags in conversion specification: %%%c%c" +msgstr "" + +#: src/csplit.c:1286 +#, c-format +msgid "too many %% conversion specifications in suffix" +msgstr "" + +#: src/csplit.c:1300 +#, c-format +msgid "missing %% conversion specification in suffix" +msgstr "" + +#: src/csplit.c:1347 +#, c-format +msgid "%s: invalid number" +msgstr "" + +#: src/csplit.c:1451 +#, c-format +msgid "Usage: %s [OPTION]... FILE PATTERN...\n" +msgstr "" + +#: src/csplit.c:1455 +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 +#, 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 "" + +#: src/csplit.c:1467 +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 +msgid "" +"\n" +"Read standard input if FILE is -. Each PATTERN may be:\n" +msgstr "" + +#: src/csplit.c:1478 +msgid "" +"\n" +" INTEGER copy up to but not including specified line number\n" +" /REGEXP/[OFFSET] copy up to but not including a matching line\n" +" %REGEXP%[OFFSET] skip to, but not including a matching line\n" +" {INTEGER} repeat the previous pattern specified number of times\n" +" {*} repeat the previous pattern as many times as possible\n" +"\n" +"A line OFFSET is a required '+' or '-' followed by a positive integer.\n" +msgstr "" + +#. 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 "" + +#: src/cut.c:189 +#, c-format +msgid "Usage: %s OPTION... [FILE]...\n" +msgstr "" + +#: src/cut.c:193 +msgid "Print selected parts of lines from each FILE to standard output.\n" +msgstr "" + +#: src/cut.c:199 +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 +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 "" + +#: src/cut.c:210 +msgid "" +" --complement complement the set of selected bytes, characters\n" +" or fields\n" +msgstr "" + +#: src/cut.c:214 +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 +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 "" + +#: src/cut.c:227 +msgid "" +"Each range is one of:\n" +"\n" +" N N'th byte, character or field, counted from 1\n" +" N- from N'th byte, character or field, to end of line\n" +" N-M from N'th to M'th (included) byte, character or field\n" +" -M from first to M'th (included) byte, character or field\n" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" +msgstr "" + +#: src/cut.c:367 src/cut.c:493 +msgid "invalid byte, character or field list" +msgstr "" + +#: src/cut.c:387 +msgid "invalid range with no endpoint: -" +msgstr "" + +#: src/cut.c:403 +msgid "invalid decreasing range" +msgstr "" + +#: src/cut.c:482 +#, c-format +msgid "byte offset %s is too large" +msgstr "" + +#: src/cut.c:485 +#, c-format +msgid "field number %s is too large" +msgstr "" + +#: src/cut.c:795 src/cut.c:803 +msgid "only one type of list may be specified" +msgstr "" + +#: src/cut.c:812 src/numfmt.c:1408 +#, c-format +msgid "the delimiter must be a single character" +msgstr "" + +#: src/cut.c:847 +msgid "you must specify a list of bytes, characters, or fields" +msgstr "" + +#: src/cut.c:850 +msgid "an input delimiter may be specified only when operating on fields" +msgstr "" + +#: src/cut.c:854 +msgid "" +"suppressing non-delimited lines makes sense\n" +"\tonly when operating on fields" +msgstr "" + +#: src/cut.c:870 +msgid "missing list of fields" +msgstr "" + +#: src/cut.c:872 +msgid "missing list of positions" +msgstr "" + +#: src/date.c:123 +#, c-format +msgid "" +"Usage: %s [OPTION]... [+FORMAT]\n" +" or: %s [-u|--utc|--universal] [MMDDhhmm[[CC]YY][.ss]]\n" +msgstr "" + +#: src/date.c:128 +msgid "Display the current time in the given FORMAT, or set the system date.\n" +msgstr "" + +#: src/date.c:134 +msgid "" +" -d, --date=STRING display time described by STRING, not 'now'\n" +" -f, --file=DATEFILE like --date once for each line of DATEFILE\n" +" -I[TIMESPEC], --iso-8601[=TIMESPEC] output date/time in ISO 8601 format.\n" +" TIMESPEC='date' for date only (the default),\n" +" 'hours', 'minutes', 'seconds', or 'ns' for date\n" +" and time to the indicated precision.\n" +msgstr "" + +#: src/date.c:142 +msgid "" +" -r, --reference=FILE display the last modification time of FILE\n" +" -R, --rfc-2822 output date and time in RFC 2822 format.\n" +" Example: Mon, 07 Aug 2006 12:34:56 -0600\n" +msgstr "" + +#: src/date.c:147 +msgid "" +" --rfc-3339=TIMESPEC output date and time in RFC 3339 format.\n" +" TIMESPEC='date', 'seconds', or 'ns' for\n" +" date and time to the indicated precision.\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" +msgstr "" + +#: src/date.c:158 +msgid "" +"\n" +"FORMAT controls the output. Interpreted sequences are:\n" +"\n" +" %% a literal %\n" +" %a locale's abbreviated weekday name (e.g., Sun)\n" +msgstr "" + +#: src/date.c:165 +msgid "" +" %A locale's full weekday name (e.g., Sunday)\n" +" %b locale's abbreviated month name (e.g., Jan)\n" +" %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 "" + +#: src/date.c:171 +msgid "" +" %C century; like %Y, except omit last two digits (e.g., 20)\n" +" %d day of month (e.g., 01)\n" +" %D date; same as %m/%d/%y\n" +" %e day of month, space padded; same as %_d\n" +msgstr "" + +#: src/date.c:177 +msgid "" +" %F full date; same as %Y-%m-%d\n" +" %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 "" + +#: src/date.c:182 +msgid "" +" %h same as %b\n" +" %H hour (00..23)\n" +" %I hour (01..12)\n" +" %j day of year (001..366)\n" +msgstr "" + +#: src/date.c:188 +msgid "" +" %k hour, space padded ( 0..23); same as %_H\n" +" %l hour, space padded ( 1..12); same as %_I\n" +" %m month (01..12)\n" +" %M minute (00..59)\n" +msgstr "" + +#: src/date.c:194 +msgid "" +" %n a newline\n" +" %N nanoseconds (000000000..999999999)\n" +" %p locale's equivalent of either AM or PM; blank if not known\n" +" %P like %p, but lower case\n" +" %r locale's 12-hour clock time (e.g., 11:11:04 PM)\n" +" %R 24-hour hour and minute; same as %H:%M\n" +" %s seconds since 1970-01-01 00:00:00 UTC\n" +msgstr "" + +#: src/date.c:203 +msgid "" +" %S second (00..60)\n" +" %t a tab\n" +" %T time; same as %H:%M:%S\n" +" %u day of week (1..7); 1 is Monday\n" +msgstr "" + +#: src/date.c:209 +msgid "" +" %U week number of year, with Sunday as first day of week (00..53)\n" +" %V ISO week number, with Monday as first day of week (01..53)\n" +" %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 "" + +#: src/date.c:215 +msgid "" +" %x locale's date representation (e.g., 12/31/99)\n" +" %X locale's time representation (e.g., 23:13:48)\n" +" %y last two digits of year (00..99)\n" +" %Y year\n" +msgstr "" + +#: src/date.c:221 +msgid "" +" %z +hhmm numeric time zone (e.g., -0400)\n" +" %:z +hh:mm numeric time zone (e.g., -04:00)\n" +" %::z +hh:mm:ss numeric time zone (e.g., -04:00:00)\n" +" %:::z numeric time zone with : to necessary precision (e.g., -04, " +"+05:30)\n" +" %Z alphabetic time zone abbreviation (e.g., EDT)\n" +"\n" +"By default, date pads numeric fields with zeroes.\n" +msgstr "" + +#: src/date.c:230 +msgid "" +"The following optional flags may follow '%':\n" +"\n" +" - (hyphen) do not pad the field\n" +" _ (underscore) pad with spaces\n" +" 0 (zero) pad with zeros\n" +" ^ use upper case if possible\n" +" # use opposite case if possible\n" +msgstr "" + +#: src/date.c:239 +msgid "" +"\n" +"After any flags comes an optional field width, as a decimal number;\n" +"then an optional modifier, which is either\n" +"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 "" + +#: src/date.c:246 +msgid "" +"\n" +"Examples:\n" +"Convert seconds since the epoch (1970-01-01 UTC) to a date\n" +" $ date --date='@2147483647'\n" +"\n" +"Show the time on the west coast of the US (use tzselect(1) to find TZ)\n" +" $ TZ='America/Los_Angeles' date\n" +"\n" +"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 "" + +#: 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 +#, c-format +msgid "standard input" +msgstr "" + +#: src/date.c:307 src/date.c:527 +#, c-format +msgid "invalid date %s" +msgstr "" + +#: src/date.c:418 src/date.c:452 +#, c-format +msgid "multiple output formats specified" +msgstr "" + +#: src/date.c:430 +#, c-format +msgid "the options to specify dates for printing are mutually exclusive" +msgstr "" + +#: src/date.c:437 +#, c-format +msgid "the options to print and set the time may not be used together" +msgstr "" + +#: src/date.c:458 +#, 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 "" + +#: src/date.c:535 +#, c-format +msgid "cannot set date" +msgstr "" + +#: src/date.c:558 src/du.c:371 +#, c-format +msgid "time %s is out of range" +msgstr "" + +#. 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 "" + +#: src/dd.c:521 +#, c-format +msgid "" +"Usage: %s [OPERAND]...\n" +" or: %s OPTION\n" +msgstr "" + +#: src/dd.c:526 +msgid "" +"Copy a file, converting and formatting according to the operands.\n" +"\n" +" bs=BYTES read and write up to BYTES bytes at a time\n" +" cbs=BYTES convert BYTES bytes at a time\n" +" conv=CONVS convert the file as per the comma separated symbol list\n" +" count=N copy only N input blocks\n" +" ibs=BYTES read up to BYTES bytes at a time (default: 512)\n" +msgstr "" + +#: src/dd.c:535 +msgid "" +" if=FILE read from FILE instead of stdin\n" +" iflag=FLAGS read as per the comma separated symbol list\n" +" obs=BYTES write BYTES bytes at a time (default: 512)\n" +" of=FILE write to FILE instead of stdout\n" +" oflag=FLAGS write as per the comma separated symbol list\n" +" seek=N skip N obs-sized blocks at start of output\n" +" skip=N skip N ibs-sized blocks at start of input\n" +" status=WHICH WHICH info to suppress outputting to stderr;\n" +" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" +msgstr "" + +#: src/dd.c:546 +msgid "" +"\n" +"N and BYTES may be followed by the following multiplicative suffixes:\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, and so on for T, P, E, Z, Y.\n" +"\n" +"Each CONV symbol may be:\n" +"\n" +msgstr "" + +#: src/dd.c:555 +msgid "" +" ascii from EBCDIC to ASCII\n" +" ebcdic from ASCII to EBCDIC\n" +" ibm from ASCII to alternate EBCDIC\n" +" block pad newline-terminated records with spaces to cbs-size\n" +" unblock replace trailing spaces in cbs-size records with newline\n" +" lcase change upper case to lower case\n" +" ucase change lower case to upper case\n" +" sparse try to seek rather than write the output for NUL input blocks\n" +" swab swap every pair of input bytes\n" +" 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 +msgid "" +" excl fail if the output file already exists\n" +" nocreat do not create the output file\n" +" notrunc do not truncate the output file\n" +" noerror continue after read errors\n" +" fdatasync physically write output file data before finishing\n" +" fsync likewise, but also write metadata\n" +msgstr "" + +#: src/dd.c:576 +msgid "" +"\n" +"Each FLAG symbol may be:\n" +"\n" +" append append mode (makes sense only for output; conv=notrunc " +"suggested)\n" +msgstr "" + +#: src/dd.c:583 +msgid " cio use concurrent I/O for data\n" +msgstr "" + +#: src/dd.c:585 +msgid " direct use direct I/O for data\n" +msgstr "" + +#: src/dd.c:587 +msgid " directory fail unless a directory\n" +msgstr "" + +#: src/dd.c:589 +msgid " dsync use synchronized I/O for data\n" +msgstr "" + +#: src/dd.c:591 +msgid " sync likewise, but also for metadata\n" +msgstr "" + +#: src/dd.c:592 +msgid " fullblock accumulate full blocks of input (iflag only)\n" +msgstr "" + +#: src/dd.c:595 +msgid " nonblock use non-blocking I/O\n" +msgstr "" + +#: src/dd.c:597 +msgid " noatime do not update access time\n" +msgstr "" + +#: src/dd.c:600 +msgid " nocache discard cached data\n" +msgstr "" + +#: src/dd.c:603 +msgid " noctty do not assign controlling terminal from file\n" +msgstr "" + +#: src/dd.c:606 +msgid " nofollow do not follow symlinks\n" +msgstr "" + +#: src/dd.c:608 +msgid " nolinks fail if multiply-linked\n" +msgstr "" + +#: src/dd.c:610 +msgid " binary use binary I/O for data\n" +msgstr "" + +#: src/dd.c:612 +msgid " text use text I/O for data\n" +msgstr "" + +#: src/dd.c:614 +msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" +msgstr "" + +#: src/dd.c:617 +msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" +msgstr "" + +#: src/dd.c:620 +msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" +msgstr "" + +#: src/dd.c:625 +#, c-format +msgid "" +"\n" +"Sending a %s signal to a running 'dd' process makes it\n" +"print I/O statistics to standard error and then resume copying.\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" +"Options are:\n" +"\n" +msgstr "" + +#: src/dd.c:683 +#, c-format +msgid "" +"%<PRIuMAX>+%<PRIuMAX> records in\n" +"%<PRIuMAX>+%<PRIuMAX> records out\n" +msgstr "" + +#: src/dd.c:689 +#, c-format +msgid "%<PRIuMAX> truncated record\n" +msgid_plural "%<PRIuMAX> truncated records\n" +msgstr[0] "" +msgstr[1] "" + +#: src/dd.c:701 +#, c-format +msgid "%<PRIuMAX> byte (%s) copied" +msgid_plural "%<PRIuMAX> bytes (%s) copied" +msgstr[0] "" +msgstr[1] "" + +#: src/dd.c:720 +msgid "Infinity B" +msgstr "" + +#. TRANSLATORS: The two instances of "s" in this string are the SI +#. symbol "s" (meaning second), and should not be translated. +#. +#. This format used to be: +#. +#. ngettext (", %g second, %s/s\n", ", %g seconds, %s/s\n", delta_s == 1) +#. +#. 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 +#, c-format +msgid ", %g s, %s/s\n" +msgstr "" + +#: src/dd.c:812 +#, c-format +msgid "closing input file %s" +msgstr "" + +#: src/dd.c:819 +#, c-format +msgid "closing output file %s" +msgstr "" + +#: src/dd.c:1022 +#, c-format +msgid "failed to turn off O_DIRECT: %s" +msgstr "" + +#: src/dd.c:1093 src/dd.c:1942 +#, c-format +msgid "writing to %s" +msgstr "" + +#: src/dd.c:1207 src/dd.c:1261 +#, c-format +msgid "unrecognized operand %s" +msgstr "" + +#: src/dd.c:1218 +msgid "invalid conversion" +msgstr "" + +#: src/dd.c:1221 src/dd.c:1297 +msgid "invalid input flag" +msgstr "" + +#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303 +msgid "invalid output flag" +msgstr "" + +#: src/dd.c:1227 +msgid "invalid status flag" +msgstr "" + +#: src/dd.c:1266 src/truncate.c:310 +#, c-format +msgid "invalid number %s" +msgstr "" + +#: src/dd.c:1348 +#, c-format +msgid "cannot combine any two of {ascii,ebcdic,ibm}" +msgstr "" + +#: src/dd.c:1350 +#, c-format +msgid "cannot combine block and unblock" +msgstr "" + +#: src/dd.c:1352 +#, c-format +msgid "cannot combine lcase and ucase" +msgstr "" + +#: src/dd.c:1354 +#, c-format +msgid "cannot combine excl and nocreat" +msgstr "" + +#: src/dd.c:1357 +#, c-format +msgid "cannot combine direct and nocache" +msgstr "" + +#: src/dd.c:1514 +#, 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 +#, c-format +msgid "%s: cannot skip" +msgstr "" + +#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683 +#, c-format +msgid "%s: cannot seek" +msgstr "" + +#: src/dd.c:1663 +#, c-format +msgid "offset overflow while reading file %s" +msgstr "" + +#: src/dd.c:1675 +#, c-format +msgid "warning: invalid file offset after failed read" +msgstr "" + +#: src/dd.c:1679 +#, c-format +msgid "cannot work around kernel bug after all" +msgstr "" + +#: src/dd.c:1822 +#, 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 +#, c-format +msgid "%s: cannot skip to specified offset" +msgstr "" + +#: src/dd.c:2133 +#, c-format +msgid "failed to truncate to %<PRIdMAX> bytes in output file %s" +msgstr "" + +#: src/dd.c:2146 +#, c-format +msgid "fdatasync failed for %s" +msgstr "" + +#: src/dd.c:2156 +#, c-format +msgid "fsync failed for %s" +msgstr "" + +#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165 +#, c-format +msgid "failed to open %s" +msgstr "" + +#: src/dd.c:2246 +#, c-format +msgid "" +"offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) " +"blocks" +msgstr "" + +#: src/dd.c:2267 +#, c-format +msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" +msgstr "" + +#: src/dd.c:2283 src/dd.c:2289 +#, 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 +msgid "Paul Eggert" +msgstr "" + +#: src/df.c:172 +msgid "Filesystem" +msgstr "" + +#: src/df.c:175 +msgid "Type" +msgstr "" + +#: src/df.c:178 src/df.c:542 +msgid "blocks" +msgstr "" + +#: src/df.c:181 +msgid "Used" +msgstr "" + +#: src/df.c:184 +msgid "Available" +msgstr "" + +#: src/df.c:187 +msgid "Use%" +msgstr "" + +#: src/df.c:190 +msgid "Inodes" +msgstr "" + +#: src/df.c:193 +msgid "IUsed" +msgstr "" + +#: src/df.c:196 +msgid "IFree" +msgstr "" + +#: src/df.c:199 +msgid "IUse%" +msgstr "" + +#: src/df.c:202 +msgid "Mounted on" +msgstr "" + +#: src/df.c:383 +#, c-format +msgid "option --output: field '%s' unknown" +msgstr "" + +#: src/df.c:390 +#, c-format +msgid "option --output: field '%s' used more than once" +msgstr "" + +#: src/df.c:410 src/df.c:449 +msgid "Size" +msgstr "" + +#: src/df.c:414 src/df.c:451 +msgid "Avail" +msgstr "" + +#: src/df.c:474 +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 +#, c-format +msgid "%s-%s" +msgstr "" + +#: src/df.c:1210 +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 +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" +" --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 +msgid "" +" -i, --inodes list inode information instead of block usage\n" +" -k like --block-size=1K\n" +" -l, --local limit listing to local file systems\n" +" --no-sync do not invoke sync before getting usage info " +"(default)\n" +msgstr "" + +#: src/df.c:1234 +msgid "" +" --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" +" or print all fields if FIELD_LIST is " +"omitted.\n" +" -P, --portability use the POSIX output format\n" +" --sync invoke sync before getting usage info\n" +" -t, --type=TYPE limit listing to file systems of type TYPE\n" +" -T, --print-type print file system type\n" +" -x, --exclude-type=TYPE limit listing to file systems not of type TYPE\n" +" -v (ignored)\n" +msgstr "" + +#: src/df.c:1248 +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" +msgstr "" + +#: src/df.c:1285 +#, 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 +#, c-format +msgid "file system type %s both selected and excluded" +msgstr "" + +#: src/df.c:1500 +msgid "Warning: " +msgstr "" + +#: src/df.c:1502 src/stat.c:814 +msgid "cannot read table of mounted file systems" +msgstr "" + +#: src/df.c:1539 +#, c-format +msgid "no file systems processed" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/dircolors.c:35 +msgid "H. Peter Anvin" +msgstr "" + +#: src/dircolors.c:97 src/uptime.c:196 src/users.c:105 +#, c-format +msgid "Usage: %s [OPTION]... [FILE]\n" +msgstr "" + +#: src/dircolors.c:98 +msgid "" +"Output commands to set the LS_COLORS environment variable.\n" +"\n" +"Determine format of output:\n" +" -b, --sh, --bourne-shell output Bourne shell code to set LS_COLORS\n" +" -c, --csh, --c-shell output C shell code to set LS_COLORS\n" +" -p, --print-database output defaults\n" +msgstr "" + +#: src/dircolors.c:108 +msgid "" +"\n" +"If FILE is specified, read it to determine which colors to use for which\n" +"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 "" + +#: src/dircolors.c:286 +#, c-format +msgid "%s:%lu: invalid line; missing second token" +msgstr "" + +#: src/dircolors.c:358 +#, c-format +msgid "%s:%lu: unrecognized keyword %s" +msgstr "" + +#: src/dircolors.c:359 +msgid "<internal>" +msgstr "" + +#: 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 "" + +#: src/dircolors.c:450 +msgid "file operands cannot be combined with --print-database (-p)" +msgstr "" + +#: src/dircolors.c:473 +#, c-format +msgid "no SHELL environment variable, and no shell type option given" +msgstr "" + +#: src/dirname.c:50 +#, c-format +msgid "Usage: %s [OPTION] NAME...\n" +msgstr "" + +#: src/dirname.c:54 +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 "" + +#: src/dirname.c:59 +msgid " -z, --zero separate output with NUL rather than newline\n" +msgstr "" + +#: src/dirname.c:64 +#, c-format +msgid "" +"\n" +"Examples:\n" +" %s /usr/bin/ -> \"/usr\"\n" +" %s dir1/str dir2/str -> \"dir1\" followed by \"dir2\"\n" +" %s stdio.h -> \".\"\n" +msgstr "" + +#: src/du.c:270 src/sort.c:394 src/wc.c:112 +#, c-format +msgid "" +"Usage: %s [OPTION]... [FILE]...\n" +" or: %s [OPTION]... --files0-from=F\n" +msgstr "" + +#: src/du.c:274 +msgid "Summarize disk usage of each FILE, recursively for directories.\n" +msgstr "" + +#: src/du.c:280 +msgid "" +" -0, --null end each output line with 0 byte rather than " +"newline\n" +" -a, --all write counts for all files, not just directories\n" +" --apparent-size print apparent sizes, rather than disk usage; " +"although\n" +" the apparent size is usually smaller, it may be\n" +" larger due to holes in ('sparse') files, internal\n" +" fragmentation, indirect blocks, and the like\n" +msgstr "" + +#: src/du.c:289 +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, --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" +" -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 "" + +#: 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" +" -H equivalent to --dereference-args (-D)\n" +" -h, --human-readable print sizes in human readable format (e.g., 1K 234M " +"2G)\n" +msgstr "" + +#: src/du.c:310 +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 "" + +#: src/du.c:316 +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" +" --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 +msgid "" +" -t, --threshold=SIZE exclude entries smaller than SIZE if positive,\n" +" or entries greater than SIZE if negative\n" +" --time show time of the last modification of any file in " +"the\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" +msgstr "" + +#: src/du.c:333 +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 +msgid "Infinity" +msgstr "" + +#: src/du.c:507 +#, c-format +msgid "mount point %s already traversed" +msgstr "" + +#: src/du.c:624 +#, c-format +msgid "fts_read failed: %s" +msgstr "" + +#: src/du.c:780 +#, c-format +msgid "invalid maximum depth %s" +msgstr "" + +#: src/du.c:809 +#, c-format +msgid "invalid --threshold argument '-0'" +msgstr "" + +#: src/du.c:887 +#, c-format +msgid "cannot both summarize and show all entries" +msgstr "" + +#: src/du.c:894 +#, c-format +msgid "warning: summarizing is the same as using --max-depth=0" +msgstr "" + +#: src/du.c:900 +#, c-format +msgid "warning: summarizing conflicts with --max-depth=%lu" +msgstr "" + +#: src/du.c:966 src/sort.c:4533 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/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 +#, 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 +msgid "invalid zero-length file name" +msgstr "" + +#: src/du.c:1088 src/ls.c:2649 src/wc.c:791 +msgid "total" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/echo.c:26 +msgid "Brian Fox" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/echo.c:27 +msgid "Chet Ramey" +msgstr "" + +#: src/echo.c:41 +#, c-format +msgid "" +"Usage: %s [SHORT-OPTION]... [STRING]...\n" +" or: %s LONG-OPTION\n" +msgstr "" + +#: src/echo.c:45 +msgid "" +"Echo the STRING(s) to standard output.\n" +"\n" +" -n do not output the trailing newline\n" +msgstr "" + +#: src/echo.c:51 +msgid "" +" -e enable interpretation of backslash escapes (default)\n" +" -E disable interpretation of backslash escapes\n" +msgstr "" + +#: src/echo.c:54 +msgid "" +" -e enable interpretation of backslash escapes\n" +" -E disable interpretation of backslash escapes (default)\n" +msgstr "" + +#: src/echo.c:60 +msgid "" +"\n" +"If -e is in effect, the following sequences are recognized:\n" +"\n" +msgstr "" + +#: src/echo.c:65 src/printf.c:105 +msgid "" +" \\\\ backslash\n" +" \\a alert (BEL)\n" +" \\b backspace\n" +" \\c produce no further output\n" +" \\e escape\n" +" \\f form feed\n" +" \\n new line\n" +" \\r carriage return\n" +" \\t horizontal tab\n" +" \\v vertical tab\n" +msgstr "" + +#: 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 "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/env.c:32 src/printenv.c:45 src/whoami.c:35 +msgid "Richard Mlynarik" +msgstr "" + +#: src/env.c:52 +#, c-format +msgid "Usage: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n" +msgstr "" + +#: src/env.c:55 +msgid "Set each NAME to VALUE in the environment and run COMMAND.\n" +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" +" -u, --unset=NAME remove variable from the environment\n" +msgstr "" + +#: src/env.c:68 +msgid "" +"\n" +"A mere - implies -i. If no COMMAND, print the resulting environment.\n" +msgstr "" + +#: src/env.c:124 +#, c-format +msgid "cannot unset %s" +msgstr "" + +#: src/env.c:135 +#, c-format +msgid "cannot set %s" +msgstr "" + +#: src/env.c:152 +#, c-format +msgid "cannot specify --null (-0) with command" +msgstr "" + +#: src/expand.c:107 +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 "" + +#: src/expand.c:114 +msgid "" +" -i, --initial do not convert tabs after non blanks\n" +" -t, --tabs=NUMBER have tabs NUMBER characters apart, not 8\n" +msgstr "" + +#: src/expand.c:118 +msgid "" +" -t, --tabs=LIST use comma separated list of explicit tab positions\n" +msgstr "" + +#: src/expand.c:171 src/unexpand.c:190 +#, c-format +msgid "tab stop is too large %s" +msgstr "" + +#: src/expand.c:179 src/unexpand.c:198 +#, c-format +msgid "tab size contains invalid character(s): %s" +msgstr "" + +#: src/expand.c:205 src/unexpand.c:224 +#, c-format +msgid "tab size cannot be 0" +msgstr "" + +#: src/expand.c:207 src/unexpand.c:226 +#, c-format +msgid "tab sizes must be ascending" +msgstr "" + +#: 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 "" + +#. 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 +msgid "Mike Parker" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/expr.c:152 src/groups.c:36 +msgid "James Youngman" +msgstr "" + +#: src/expr.c:203 +#, c-format +msgid "" +"Usage: %s EXPRESSION\n" +" or: %s OPTION\n" +msgstr "" + +#: src/expr.c:211 +msgid "" +"\n" +"Print the value of EXPRESSION to standard output. A blank line below\n" +"separates increasing precedence groups. EXPRESSION may be:\n" +"\n" +" ARG1 | ARG2 ARG1 if it is neither null nor 0, otherwise ARG2\n" +"\n" +" ARG1 & ARG2 ARG1 if neither argument is null or 0, otherwise 0\n" +msgstr "" + +#: src/expr.c:220 +msgid "" +"\n" +" ARG1 < ARG2 ARG1 is less than ARG2\n" +" ARG1 <= ARG2 ARG1 is less than or equal to ARG2\n" +" ARG1 = ARG2 ARG1 is equal to ARG2\n" +" ARG1 != ARG2 ARG1 is unequal to ARG2\n" +" ARG1 >= ARG2 ARG1 is greater than or equal to ARG2\n" +" ARG1 > ARG2 ARG1 is greater than ARG2\n" +msgstr "" + +#: src/expr.c:229 +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 +#, no-c-format +msgid "" +"\n" +" ARG1 * ARG2 arithmetic product of ARG1 and ARG2\n" +" ARG1 / ARG2 arithmetic quotient of ARG1 divided by ARG2\n" +" ARG1 % ARG2 arithmetic remainder of ARG1 divided by ARG2\n" +msgstr "" + +#: src/expr.c:242 +msgid "" +"\n" +" STRING : REGEXP anchored pattern match of REGEXP in STRING\n" +"\n" +" match STRING REGEXP same as STRING : REGEXP\n" +" substr STRING POS LENGTH substring of STRING, POS counted from 1\n" +" index STRING CHARS index in STRING where any CHARS is found, or 0\n" +" length STRING length of STRING\n" +msgstr "" + +#: src/expr.c:251 +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 "" + +#: src/expr.c:257 +msgid "" +"\n" +"Beware that many operators need to be escaped or quoted for shells.\n" +"Comparisons are arithmetic if both ARGs are numbers, else lexicographical.\n" +"Pattern matches return the string matched between \\( and \\) or null; if\n" +"\\( and \\) are not used, they return the number of characters matched or " +"0.\n" +msgstr "" + +#: src/expr.c:264 +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 "" + +#: src/expr.c:278 +#, c-format +msgid "syntax error" +msgstr "" + +#: src/expr.c:599 src/ptx.c:283 +#, c-format +msgid "error in regular expression matcher" +msgstr "" + +#: src/expr.c:791 src/expr.c:828 +#, c-format +msgid "non-integer argument" +msgstr "" + +#: src/expr.c:793 src/truncate.c:314 +#, c-format +msgid "division by zero" +msgstr "" + +#: src/expr.c:887 src/sort.c:2044 +#, c-format +msgid "set LC_ALL='C' to work around the problem" +msgstr "" + +#: src/expr.c:889 +#, c-format +msgid "the strings compared were %s and %s" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/factor.c:111 +msgid "Niels Moller" +msgstr "" + +#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459 +#, c-format +msgid "Lucas prime test failure. This should not happen" +msgstr "" + +#: src/factor.c:2092 +#, c-format +msgid "squfof queue overflow" +msgstr "" + +#: src/factor.c:2419 +#, c-format +msgid "%s is not a valid positive integer" +msgstr "" + +#: src/factor.c:2442 src/od.c:1646 src/od.c:1715 +#, c-format +msgid "%s is too large" +msgstr "" + +#: src/factor.c:2454 +#, c-format +msgid "" +"Usage: %s [NUMBER]...\n" +" or: %s OPTION\n" +msgstr "" + +#: src/factor.c:2459 +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 "" + +#: src/find-mount-point.c:40 +#, c-format +msgid "cannot get current directory" +msgstr "" + +#: src/find-mount-point.c:50 src/find-mount-point.c:64 +#: src/find-mount-point.c:92 +#, c-format +msgid "cannot change to directory %s" +msgstr "" + +#: src/find-mount-point.c:70 +#, c-format +msgid "cannot stat current directory (now %s)" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/fmt.c:38 +msgid "Ross Paterson" +msgstr "" + +#: src/fmt.c:270 +#, c-format +msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n" +msgstr "" + +#: 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 "" + +#: src/fmt.c:278 +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 "" + +#: src/fmt.c:287 +#, 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 "" + +#: src/fmt.c:359 +#, c-format +msgid "" +"invalid option -- %c; -WIDTH is recognized only when it is the first\n" +"option; use -w N instead" +msgstr "" + +#: src/fmt.c:405 src/fmt.c:416 +#, c-format +msgid "invalid width: %s" +msgstr "" + +#: src/fold.c:70 +msgid "" +"Wrap input lines in each FILE (standard input by default), writing to\n" +"standard output.\n" +msgstr "" + +#: src/fold.c:77 +msgid "" +" -b, --bytes count bytes rather than columns\n" +" -s, --spaces break at spaces\n" +" -w, --width=WIDTH use WIDTH columns instead of 80\n" +msgstr "" + +#: src/fold.c:288 src/pr.c:832 +#, c-format +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/truncate.c:37 +msgid "Padraig Brady" +msgstr "" + +#: src/getlimits.c:65 +#, c-format +msgid "Usage: %s\n" +msgstr "" + +#: src/getlimits.c:69 +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 +#, c-format +msgid "failed to get groups for user %s" +msgstr "" + +#: src/group-list.c:74 src/id.c:370 +#, c-format +msgid "failed to get groups for the current process" +msgstr "" + +#: src/group-list.c:114 +#, c-format +msgid "cannot find name for group ID %lu" +msgstr "" + +#: src/groups.c:53 +#, c-format +msgid "Usage: %s [OPTION]... [USERNAME]...\n" +msgstr "" + +#: src/groups.c:54 +msgid "" +"Print group memberships for each USERNAME or, if no USERNAME is specified, " +"for\n" +"the current process (which may differ if the groups database has changed).\n" +msgstr "" + +#: src/groups.c:105 src/id.c:233 +#, c-format +msgid "cannot get real UID" +msgstr "" + +#: src/groups.c:110 src/id.c:241 +#, c-format +msgid "cannot get effective GID" +msgstr "" + +#: src/groups.c:115 src/id.c:246 +#, c-format +msgid "cannot get real GID" +msgstr "" + +#: src/groups.c:128 src/id.c:206 +#, c-format +msgid "%s: no such user" +msgstr "" + +#: src/head.c:109 +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 "" + +#: src/head.c:117 +msgid "" +" -c, --bytes=[-]K print the first K bytes of each file;\n" +" with the leading '-', print all but the last\n" +" K bytes of each file\n" +" -n, --lines=[-]K print the first K lines instead of the first 10;\n" +" with the leading '-', print all but the last\n" +" K lines of each file\n" +msgstr "" + +#: 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 "" + +#: src/head.c:131 +msgid "" +"\n" +"K 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 "" + +#: src/head.c:154 +#, c-format +msgid "%s: file has shrunk too much" +msgstr "" + +#: src/head.c:227 src/head.c:1051 +#, 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 +#, 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 +#, c-format +msgid "cannot reposition file pointer for %s" +msgstr "" + +#: src/head.c:885 +#, c-format +msgid "%s: %s is so large that it is not representable" +msgstr "" + +#: src/head.c:886 +msgid "number of lines" +msgstr "" + +#: src/head.c:886 +msgid "number of bytes" +msgstr "" + +#: src/head.c:893 src/tail.c:1947 +msgid "invalid number of lines" +msgstr "" + +#: src/head.c:894 src/tail.c:1948 +msgid "invalid number of bytes" +msgstr "" + +#: src/head.c:981 src/head.c:1039 +#, c-format +msgid "invalid trailing option -- %c" +msgstr "" + +#: src/hostid.c:42 +#, c-format +msgid "" +"Usage: %s [OPTION]\n" +"Print the numeric identifier (in hexadecimal) for the current host.\n" +"\n" +msgstr "" + +#: src/hostname.c:56 +#, c-format +msgid "" +"Usage: %s [NAME]\n" +" or: %s OPTION\n" +"Print or set the hostname of the current system.\n" +"\n" +msgstr "" + +#: src/hostname.c:94 +#, c-format +msgid "cannot set name to %s" +msgstr "" + +#: src/hostname.c:97 +#, c-format +msgid "cannot set hostname; this system lacks the functionality" +msgstr "" + +#: src/hostname.c:105 +#, c-format +msgid "cannot determine hostname" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/id.c:38 src/touch.c:42 +msgid "Arnold Robbins" +msgstr "" + +#: src/id.c:81 +#, c-format +msgid "Usage: %s [OPTION]... [USERNAME]\n" +msgstr "" + +#: src/id.c:82 +msgid "" +"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" +msgstr "" + +#: src/id.c:96 +msgid "" +"\n" +"Without any OPTION, print some useful set of identified information.\n" +msgstr "" + +#: src/id.c:140 +#, c-format +msgid "--context (-Z) works only on an SELinux-enabled kernel" +msgstr "" + +#: src/id.c:175 +#, c-format +msgid "cannot print security context when user specified" +msgstr "" + +#: src/id.c:178 +#, c-format +msgid "cannot print \"only\" of more than one choice" +msgstr "" + +#: src/id.c:185 +#, c-format +msgid "cannot print only names or real IDs in default format" +msgstr "" + +#: src/id.c:199 +#, c-format +msgid "can't get process context" +msgstr "" + +#: src/id.c:224 +#, c-format +msgid "cannot get effective UID" +msgstr "" + +#: src/id.c:311 +#, c-format +msgid "cannot find name for user ID %s" +msgstr "" + +#: src/id.c:329 +#, c-format +msgid "uid=%s" +msgstr "" + +#: src/id.c:334 +#, c-format +msgid " gid=%s" +msgstr "" + +#: src/id.c:341 +#, c-format +msgid " euid=%s" +msgstr "" + +#: src/id.c:349 +#, c-format +msgid " egid=%s" +msgstr "" + +#: src/id.c:377 +msgid " groups=" +msgstr "" + +#: src/id.c:393 +#, c-format +msgid " context=%s" +msgstr "" + +#: src/install.c:373 +#, c-format +msgid "warning: %s: failed to change context to %s" +msgstr "" + +#: src/install.c:414 +#, c-format +msgid "creating directory %s" +msgstr "" + +#: src/install.c:482 +#, c-format +msgid "cannot change ownership of %s" +msgstr "" + +#: src/install.c:506 +#, c-format +msgid "cannot set time stamps for %s" +msgstr "" + +#: src/install.c:527 src/split.c:426 src/timeout.c:439 +#, c-format +msgid "fork system call failed" +msgstr "" + +#: src/install.c:531 +#, c-format +msgid "cannot run %s" +msgstr "" + +#: src/install.c:535 +#, c-format +msgid "waiting for strip" +msgstr "" + +#: src/install.c:537 +#, c-format +msgid "strip process terminated abnormally" +msgstr "" + +#: src/install.c:558 +#, c-format +msgid "invalid user %s" +msgstr "" + +#: src/install.c:594 +#, 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 "" + +#: src/install.c:601 +msgid "" +"\n" +"This install program copies files (often just compiled) into destination\n" +"locations you choose. If you want to download and install a ready-to-use\n" +"package on a GNU/Linux system, you should instead be using a package " +"manager\n" +"like yum(1) or apt-get(1).\n" +"\n" +"In the first three forms, copy SOURCE to DEST or multiple SOURCE(s) to\n" +"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 "" + +#: src/install.c:615 +msgid "" +" --backup[=CONTROL] make a backup of each existing destination file\n" +" -b like --backup but does not accept an argument\n" +" -c (ignored)\n" +" -C, --compare compare each pair of source and destination files, " +"and\n" +" in some cases, do not modify the destination at all\n" +" -d, --directory treat all arguments as directory names; create all\n" +" components of the specified directories\n" +msgstr "" + +#: src/install.c:624 +msgid "" +" -D create all leading components of DEST except the " +"last,\n" +" then copy SOURCE to DEST\n" +" -g, --group=GROUP set group ownership, instead of process' current " +"group\n" +" -m, --mode=MODE set permission mode (as in chmod), instead of rwxr-xr-" +"x\n" +" -o, --owner=OWNER set ownership (super-user only)\n" +msgstr "" + +#: src/install.c:631 +msgid "" +" -p, --preserve-timestamps apply access/modification times of SOURCE " +"files\n" +" to corresponding destination files\n" +" -s, --strip strip symbol tables\n" +" --strip-program=PROGRAM program used to strip binaries\n" +" -S, --suffix=SUFFIX override the usual backup suffix\n" +" -t, --target-directory=DIRECTORY copy all SOURCE arguments into " +"DIRECTORY\n" +" -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 "" + +#: src/install.c:641 +msgid "" +" --preserve-context preserve SELinux security context\n" +" -Z, --context=CONTEXT set SELinux security context of files and " +"directories\n" +msgstr "" + +#: src/install.c:859 +#, 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 +#, c-format +msgid "the strip option may not be used when installing a directory" +msgstr "" + +#: src/install.c:889 +#, 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 +#, c-format +msgid "invalid mode %s" +msgstr "" + +#: src/install.c:954 +#, c-format +msgid "WARNING: ignoring --strip-program option as -s option was not specified" +msgstr "" + +#: src/install.c:959 +#, c-format +msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive" +msgstr "" + +#: src/install.c:966 +#, c-format +msgid "options --compare (-C) and --strip are mutually exclusive" +msgstr "" + +#: src/install.c:972 +#, c-format +msgid "" +"the --compare (-C) option is ignored when you specify a mode with non-" +"permission bits" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/join.c:40 src/sort.c:66 +msgid "Mike Haertel" +msgstr "" + +#: src/join.c:191 +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" +"by whitespace. When FILE1 or FILE2 (not both) is -, read standard input.\n" +"\n" +" -a FILENUM also print unpairable lines from file FILENUM, where\n" +" FILENUM is 1 or 2, corresponding to FILE1 or FILE2\n" +" -e EMPTY replace missing input fields with EMPTY\n" +msgstr "" + +#: src/join.c:200 +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 "" + +#: src/join.c:206 +msgid "" +" -v FILENUM like -a FILENUM, 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" +" --check-order check that the input is correctly sorted, even\n" +" if all input lines are pairable\n" +" --nocheck-order do not check that the input is correctly sorted\n" +" --header treat the first line in each file as field headers,\n" +" print them without trying to pair them\n" +msgstr "" + +#: src/join.c:218 +msgid "" +"\n" +"Unless -t CHAR is given, leading blanks separate fields and are ignored,\n" +"else fields are separated by CHAR. Any FIELD is a field number counted\n" +"from 1. FORMAT is one or more comma or blank separated specifications,\n" +"each being 'FILENUM.FIELD' or '0'. Default FORMAT outputs the join field,\n" +"the remaining fields from FILE1, the remaining fields from FILE2, all\n" +"separated by CHAR. If FORMAT is the keyword 'auto', then the first\n" +"line of each file determines the number of fields output for each line.\n" +"\n" +"Important: FILE1 and FILE2 must be sorted on the join fields.\n" +"E.g., use \"sort -k 1b,1\" if 'join' has no options,\n" +"or use \"join -t ''\" if 'sort' has no options.\n" +"Note, comparisons honor the rules specified by 'LC_COLLATE'.\n" +"If the input is not sorted and some lines cannot be joined, a\n" +"warning message will be given.\n" +msgstr "" + +#: src/join.c:403 +#, c-format +msgid "%s:%<PRIuMAX>: is not sorted: %.*s" +msgstr "" + +#: src/join.c:840 src/join.c:1038 +#, c-format +msgid "invalid field number: %s" +msgstr "" + +#: src/join.c:861 src/join.c:870 +#, c-format +msgid "invalid field specifier: %s" +msgstr "" + +#: src/join.c:877 +#, c-format +msgid "invalid file number in field spec: %s" +msgstr "" + +#: src/join.c:920 +#, c-format +msgid "incompatible join fields %lu, %lu" +msgstr "" + +#: src/join.c:1049 +#, c-format +msgid "conflicting empty-field replacement strings" +msgstr "" + +#: src/join.c:1101 src/sort.c:4468 +#, c-format +msgid "multi-character tab %s" +msgstr "" + +#: src/join.c:1105 src/sort.c:4473 +#, c-format +msgid "incompatible tabs" +msgstr "" + +#: src/join.c:1174 +#, c-format +msgid "both files cannot be standard input" +msgstr "" + +#: src/kill.c:76 +#, c-format +msgid "" +"Usage: %s [-s SIGNAL | -SIGNAL] PID...\n" +" or: %s -l [SIGNAL]...\n" +" or: %s -t [SIGNAL]...\n" +msgstr "" + +#: src/kill.c:82 +msgid "Send signals to processes, or list signals.\n" +msgstr "" + +#: src/kill.c:88 +msgid "" +" -s, --signal=SIGNAL, -SIGNAL\n" +" specify the name or number of the signal to be sent\n" +" -l, --list list signal names, or convert signal names to/from " +"numbers\n" +" -t, --table print a table of signal information\n" +msgstr "" + +#: src/kill.c:96 +msgid "" +"\n" +"SIGNAL may be a signal name like 'HUP', or a signal number like '1',\n" +"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 "" + +#: src/kill.c:205 +#, c-format +msgid "%s: invalid process id" +msgstr "" + +#: src/kill.c:259 +#, c-format +msgid "invalid option -- %c" +msgstr "" + +#: src/kill.c:268 +#, c-format +msgid "%s: multiple signals specified" +msgstr "" + +#: src/kill.c:282 +#, c-format +msgid "multiple -l or -t options specified" +msgstr "" + +#: src/kill.c:299 +#, c-format +msgid "cannot combine signal with -l or -t" +msgstr "" + +#: src/kill.c:305 +#, c-format +msgid "no process ID specified" +msgstr "" + +#: src/libstdbuf.c:109 +#, c-format +msgid "failed to allocate a %<PRIuMAX> byte stdio buffer\n" +msgstr "" + +#: src/libstdbuf.c:116 +#, c-format +msgid "invalid buffering mode %s for %s\n" +msgstr "" + +#: src/libstdbuf.c:124 +#, c-format +msgid "could not set buffering of %s to mode %s\n" +msgstr "" + +#. 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 "" + +#: src/link.c:45 +#, c-format +msgid "" +"Usage: %s FILE1 FILE2\n" +" or: %s OPTION\n" +msgstr "" + +#: src/link.c:48 +msgid "" +"Call the link function to create a link named FILE2 to an existing FILE1.\n" +"\n" +msgstr "" + +#: src/link.c:90 +#, c-format +msgid "cannot create link %s to %s" +msgstr "" + +#: src/ln.c:190 +#, c-format +msgid "%s: hard link not allowed for directory" +msgstr "" + +#: src/ln.c:255 +#, c-format +msgid "%s: cannot overwrite directory" +msgstr "" + +#: src/ln.c:260 +#, c-format +msgid "%s: replace %s? " +msgstr "" + +#: src/ln.c:345 +#, c-format +msgid "failed to create symbolic link %s" +msgstr "" + +#: src/ln.c:346 +#, c-format +msgid "failed to create symbolic link %s -> %s" +msgstr "" + +#: src/ln.c:348 +#, c-format +msgid "failed to create hard link to %.0s%s" +msgstr "" + +#: src/ln.c:351 +#, c-format +msgid "failed to create hard link %s" +msgstr "" + +#: src/ln.c:352 +#, c-format +msgid "failed to create hard link %s => %s" +msgstr "" + +#: src/ln.c:374 +#, c-format +msgid "" +"Usage: %s [OPTION]... [-T] TARGET LINK_NAME (1st form)\n" +" or: %s [OPTION]... TARGET (2nd form)\n" +" or: %s [OPTION]... TARGET... DIRECTORY (3rd form)\n" +" or: %s [OPTION]... -t DIRECTORY TARGET... (4th form)\n" +msgstr "" + +#: src/ln.c:381 +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" +"In the 3rd and 4th forms, create links to each TARGET in DIRECTORY.\n" +"Create hard links by default, symbolic links with --symbolic.\n" +"By default, each destination (name of new link) should not already exist.\n" +"When creating hard links, each TARGET must exist. Symbolic links\n" +"can hold arbitrary text; if later resolved, a relative link is\n" +"interpreted in relation to its parent directory.\n" +msgstr "" + +#: src/ln.c:394 +msgid "" +" --backup[=CONTROL] make a backup of each existing destination " +"file\n" +" -b like --backup but does not accept an argument\n" +" -d, -F, --directory allow the superuser to attempt to hard link\n" +" directories (note: will probably fail due " +"to\n" +" system restrictions, even for the " +"superuser)\n" +" -f, --force remove existing destination files\n" +msgstr "" + +#: src/ln.c:402 +msgid "" +" -i, --interactive prompt whether to remove destinations\n" +" -L, --logical dereference TARGETs that are symbolic links\n" +" -n, --no-dereference treat LINK_NAME as a normal file if\n" +" it is a symbolic link to a directory\n" +" -P, --physical make hard links directly to symbolic links\n" +" -r, --relative create symbolic links relative to link " +"location\n" +" -s, --symbolic make symbolic links instead of hard links\n" +msgstr "" + +#: src/ln.c:411 +msgid "" +" -S, --suffix=SUFFIX override the usual backup suffix\n" +" -t, --target-directory=DIRECTORY specify the DIRECTORY in which to " +"create\n" +" the links\n" +" -T, --no-target-directory treat LINK_NAME as a normal file always\n" +" -v, --verbose print name of each linked file\n" +msgstr "" + +#: src/ln.c:433 +#, 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 "" + +#: src/ln.c:554 +#, c-format +msgid "cannot combine --target-directory and --no-target-directory" +msgstr "" + +#: src/ln.c:588 +#, c-format +msgid "cannot do --relative without --symbolic" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/logname.c:30 +msgid "FIXME: unknown" +msgstr "" + +#: src/logname.c:39 src/sync.c:40 +#, c-format +msgid "Usage: %s [OPTION]\n" +msgstr "" + +#: src/logname.c:40 +msgid "" +"Print the name of the current user.\n" +"\n" +msgstr "" + +#: src/logname.c:84 +#, c-format +msgid "no login name" +msgstr "" + +#. 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 +msgid "%b %e %Y" +msgstr "" + +#. 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 +msgid "%b %e %H:%M" +msgstr "" + +#: src/ls.c:1580 +#, c-format +msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" +msgstr "" + +#: src/ls.c:1599 +#, c-format +msgid "ignoring invalid width in environment variable COLUMNS: %s" +msgstr "" + +#: src/ls.c:1629 +#, c-format +msgid "ignoring invalid tab size in environment variable TABSIZE: %s" +msgstr "" + +#: src/ls.c:1750 src/ptx.c:1975 +#, c-format +msgid "invalid line width: %s" +msgstr "" + +#: src/ls.c:1824 +#, c-format +msgid "invalid tab size: %s" +msgstr "" + +#: src/ls.c:2033 +#, c-format +msgid "invalid time style format %s" +msgstr "" + +#: src/ls.c:2057 +msgid "Valid arguments are:\n" +msgstr "" + +#: src/ls.c:2061 +msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" +msgstr "" + +#: src/ls.c:2096 +#, c-format +msgid "error initializing month strings" +msgstr "" + +#: src/ls.c:2407 +#, c-format +msgid "unrecognized prefix: %s" +msgstr "" + +#: src/ls.c:2437 +#, c-format +msgid "unparsable value for LS_COLORS environment variable" +msgstr "" + +#: src/ls.c:2514 src/pwd.c:161 +#, c-format +msgid "cannot open directory %s" +msgstr "" + +#: src/ls.c:2529 +#, c-format +msgid "cannot determine device and inode of %s" +msgstr "" + +#: src/ls.c:2538 +#, c-format +msgid "%s: not listing already-listed directory" +msgstr "" + +#: src/ls.c:2615 src/pwd.c:229 +#, c-format +msgid "reading directory %s" +msgstr "" + +#: src/ls.c:2630 +#, c-format +msgid "closing directory %s" +msgstr "" + +#: src/ls.c:3302 +#, c-format +msgid "cannot compare file names %s and %s" +msgstr "" + +#: src/ls.c:4721 +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 +msgid "" +" -a, --all do not ignore entries starting with .\n" +" -A, --almost-all do not list implied . and ..\n" +" --author with -l, print the author of each file\n" +" -b, --escape print C-style escapes for nongraphic " +"characters\n" +msgstr "" + +#: src/ls.c:4734 +msgid "" +" --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" +" -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" +" otherwise: sort by ctime, newest first\n" +msgstr "" + +#: src/ls.c:4744 +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" +" -D, --dired generate output designed for Emacs' dired mode\n" +msgstr "" + +#: src/ls.c:4752 +msgid "" +" -f do not sort, enable -aU, disable -ls --color\n" +" -F, --classify append indicator (one of */=>@|) to entries\n" +" --file-type likewise, except do not append '*'\n" +" --format=WORD across -x, commas -m, horizontal -x, long -l,\n" +" single-column -1, verbose -l, vertical -C\n" +" --full-time like -l --time-style=full-iso\n" +msgstr "" + +#: src/ls.c:4760 +msgid " -g like -l, but do not list owner\n" +msgstr "" + +#: src/ls.c:4763 +msgid "" +" --group-directories-first\n" +" group directories before files.\n" +" augment with a --sort option, but any\n" +" use of --sort=none (-U) disables grouping\n" +msgstr "" + +#: src/ls.c:4769 +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" +" (e.g., 1K 234M 2G)\n" +" --si likewise, but use powers of 1000 not 1024\n" +msgstr "" + +#: src/ls.c:4775 +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" +" --hide=PATTERN do not list implied entries matching shell " +"PATTERN\n" +" (overridden by -a or -A)\n" +msgstr "" + +#: src/ls.c:4785 +msgid "" +" --indicator-style=WORD append indicator with style WORD to entry " +"names:\n" +" none (default), slash (-p),\n" +" file-type (--file-type), classify (-F)\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" +msgstr "" + +#: src/ls.c:4795 +msgid "" +" -l use a long listing format\n" +" -L, --dereference when showing file information for a symbolic\n" +" link, show information for the file the link\n" +" references rather than for the link itself\n" +" -m fill width with a comma separated list of " +"entries\n" +msgstr "" + +#: src/ls.c:4803 +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. " +"control\n" +" characters specially)\n" +" -o like -l, but do not list group information\n" +" -p, --indicator-style=slash\n" +" append / indicator to directories\n" +msgstr "" + +#: src/ls.c:4811 +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 " +"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 "" + +#: src/ls.c:4820 +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 "" + +#: src/ls.c:4825 +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 +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 "" + +#: src/ls.c:4844 +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 +msgid "" +" -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 +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" +" -1 list one file per line\n" +msgstr "" + +#: src/ls.c:4865 +msgid "" +"\n" +"Using color to distinguish file types is disabled both by default and\n" +"with --color=never. With --color=auto, ls emits color codes only when\n" +"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 "" + +#: src/ls.c:4872 +msgid "" +"\n" +"Exit status:\n" +" 0 if OK,\n" +" 1 if minor problems (e.g., cannot access subdirectory),\n" +" 2 if serious trouble (e.g., cannot access command-line argument).\n" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/md5sum.c:94 src/seq.c:39 +msgid "Ulrich Drepper" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/md5sum.c:95 +msgid "Scott Miller" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/md5sum.c:96 +msgid "David Madore" +msgstr "" + +#: src/md5sum.c:164 +#, 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 "" + +#: src/md5sum.c:174 +msgid "" +" -b, --binary read in binary mode (default unless reading tty " +"stdin)\n" +msgstr "" + +#: src/md5sum.c:178 +msgid " -b, --binary read in binary mode\n" +msgstr "" + +#: src/md5sum.c:181 +#, c-format +msgid " -c, --check read %s sums from the FILEs and check them\n" +msgstr "" + +#: src/md5sum.c:184 +msgid " --tag create a BSD-style checksum\n" +msgstr "" + +#: src/md5sum.c:188 +msgid "" +" -t, --text read in text mode (default if reading tty stdin)\n" +msgstr "" + +#: src/md5sum.c:192 +msgid " -t, --text read in text mode (default)\n" +msgstr "" + +#: src/md5sum.c:195 +msgid "" +"\n" +"The following three 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" +" -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 +#, c-format +msgid "" +"\n" +"The sums are computed as described in %s. When checking, the input\n" +"should be a former output of this program. The default mode is to print\n" +"a line with checksum, a character indicating input mode ('*' for binary,\n" +"space for text), and name for each FILE.\n" +msgstr "" + +#: src/md5sum.c:523 +#, c-format +msgid "%s: too many checksum lines" +msgstr "" + +#: src/md5sum.c:547 +#, c-format +msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line" +msgstr "" + +#: src/md5sum.c:572 +#, c-format +msgid "%s: FAILED open or read\n" +msgstr "" + +#: src/md5sum.c:595 +msgid "FAILED" +msgstr "" + +#: src/md5sum.c:597 +msgid "OK" +msgstr "" + +#: src/md5sum.c:621 +#, c-format +msgid "%s: no properly formatted %s checksum lines found" +msgstr "" + +#: src/md5sum.c:631 +#, 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 +#, 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 +#, 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 +#, c-format +msgid "--tag does not support --text mode" +msgstr "" + +#: src/md5sum.c:766 +#, c-format +msgid "the --tag option is meaningless when verifying checksums" +msgstr "" + +#: src/md5sum.c:773 +#, c-format +msgid "" +"the --binary and --text options are meaningless when verifying checksums" +msgstr "" + +#: src/md5sum.c:781 +#, c-format +msgid "the --status option is meaningful only when verifying checksums" +msgstr "" + +#: src/md5sum.c:788 +#, c-format +msgid "the --warn option is meaningful only when verifying checksums" +msgstr "" + +#: src/md5sum.c:795 +#, c-format +msgid "the --quiet option is meaningful only when verifying checksums" +msgstr "" + +#: src/md5sum.c:802 +#, c-format +msgid "the --strict option is meaningful only when verifying checksums" +msgstr "" + +#: src/mkdir.c:56 src/rmdir.c:164 +#, c-format +msgid "Usage: %s [OPTION]... DIRECTORY...\n" +msgstr "" + +#: src/mkdir.c:57 +msgid "Create the DIRECTORY(ies), if they do not already exist.\n" +msgstr "" + +#: src/mkdir.c:63 +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 +#, c-format +msgid "created directory %s" +msgstr "" + +#: src/mkfifo.c:51 src/pathchk.c:89 +#, c-format +msgid "Usage: %s [OPTION]... NAME...\n" +msgstr "" + +#: src/mkfifo.c:52 +msgid "Create named pipes (FIFOs) with the given NAMEs.\n" +msgstr "" + +#: src/mkfifo.c:58 src/mknod.c:60 +msgid "" +" -m, --mode=MODE set file permission bits to MODE, not a=rw - umask\n" +msgstr "" + +#: src/mkfifo.c:61 +msgid "" +" -Z, --context=CTX set the SELinux security context of each NAME to CTX\n" +msgstr "" + +#: src/mkfifo.c:121 src/mknod.c:127 +#, c-format +msgid "invalid mode" +msgstr "" + +#: src/mkfifo.c:126 src/mknod.c:132 +#, c-format +msgid "mode must specify only file permission bits" +msgstr "" + +#: src/mknod.c:52 +#, c-format +msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n" +msgstr "" + +#: src/mknod.c:54 +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 +msgid "" +"\n" +"Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n" +"must be omitted when TYPE is p. If MAJOR or MINOR begins with 0x or 0X,\n" +"it is interpreted as hexadecimal; otherwise, if it begins with 0, as octal;\n" +"otherwise, as decimal. TYPE may be:\n" +msgstr "" + +#: src/mknod.c:75 +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 "" + +#: src/mknod.c:150 +msgid "Special files require major and minor device numbers." +msgstr "" + +#: src/mknod.c:160 +msgid "Fifos do not have major and minor device numbers." +msgstr "" + +#: src/mknod.c:176 +#, c-format +msgid "block special files not supported" +msgstr "" + +#: src/mknod.c:185 +#, c-format +msgid "character special files not supported" +msgstr "" + +#: src/mknod.c:201 +#, c-format +msgid "invalid major device number %s" +msgstr "" + +#: src/mknod.c:206 +#, c-format +msgid "invalid minor device number %s" +msgstr "" + +#: src/mknod.c:211 +#, c-format +msgid "invalid device %s %s" +msgstr "" + +#: src/mknod.c:225 +#, c-format +msgid "invalid device type %s" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/mktemp.c:37 +msgid "Eric Blake" +msgstr "" + +#: src/mktemp.c:68 +#, c-format +msgid "Usage: %s [OPTION]... [TEMPLATE]\n" +msgstr "" + +#: src/mktemp.c:69 +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 +msgid "" +"Files are created u+rw, and directories u+rwx, minus umask restrictions.\n" +msgstr "" + +#: src/mktemp.c:78 +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 +msgid "" +" --suffix=SUFF append SUFF to TEMPLATE. SUFF must not contain " +"slash.\n" +" This option is implied if TEMPLATE does not end in " +"X.\n" +msgstr "" + +#: src/mktemp.c:87 +msgid "" +" --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" +" mktemp creates only the final component\n" +msgstr "" + +#: src/mktemp.c:95 +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 +#, c-format +msgid "too many templates" +msgstr "" + +#: src/mktemp.c:249 +#, c-format +msgid "with --suffix, template %s must end in X" +msgstr "" + +#: src/mktemp.c:274 src/split.c:1130 +#, c-format +msgid "invalid suffix %s, contains directory separator" +msgstr "" + +#: src/mktemp.c:279 +#, c-format +msgid "too few X's in template %s" +msgstr "" + +#: src/mktemp.c:292 +#, c-format +msgid "invalid template, %s, contains directory separator" +msgstr "" + +#: src/mktemp.c:306 +#, c-format +msgid "invalid template, %s; with --tmpdir, it may not be absolute" +msgstr "" + +#: src/mktemp.c:326 +#, c-format +msgid "failed to create directory via template %s" +msgstr "" + +#: src/mktemp.c:336 +#, c-format +msgid "failed to create file via template %s" +msgstr "" + +#: src/mv.c:292 +msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" +msgstr "" + +#: src/mv.c:298 +msgid "" +" --backup[=CONTROL] make a backup of each existing destination " +"file\n" +" -b like --backup but does not accept an " +"argument\n" +" -f, --force do not prompt before overwriting\n" +" -i, --interactive prompt before overwrite\n" +" -n, --no-clobber do not overwrite an existing file\n" +"If you specify more than one of -i, -f, -n, only the final one takes " +"effect.\n" +msgstr "" + +#: src/mv.c:307 +msgid "" +" --strip-trailing-slashes remove any trailing slashes from each " +"SOURCE\n" +" argument\n" +" -S, --suffix=SUFFIX override the usual backup suffix\n" +msgstr "" + +#: src/mv.c:312 +msgid "" +" -t, --target-directory=DIRECTORY move all SOURCE arguments into " +"DIRECTORY\n" +" -T, --no-target-directory treat DEST as a normal file\n" +" -u, --update move only when the SOURCE file is newer\n" +" than the destination file or when the\n" +" destination file is missing\n" +" -v, --verbose explain what is being done\n" +msgstr "" + +#: src/nice.c:72 +#, c-format +msgid "Usage: %s [OPTION] [COMMAND [ARG]...]\n" +msgstr "" + +#: src/nice.c:73 +#, 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" +"%d (most favorable to the process) to %d (least favorable to the process).\n" +msgstr "" + +#: src/nice.c:82 +msgid " -n, --adjustment=N add integer N to the niceness (default 10)\n" +msgstr "" + +#: src/nice.c:172 +#, c-format +msgid "invalid adjustment %s" +msgstr "" + +#: src/nice.c:181 +#, c-format +msgid "a command must be given with an adjustment" +msgstr "" + +#: src/nice.c:188 src/nice.c:199 +#, c-format +msgid "cannot get niceness" +msgstr "" + +#: src/nice.c:205 +#, c-format +msgid "cannot set niceness" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/nl.c:40 +msgid "Scott Bartram" +msgstr "" + +#: src/nl.c:179 +msgid "" +"Write each FILE to standard output, with line numbers added.\n" +"With no FILE, or when FILE is -, read standard input.\n" +msgstr "" + +#: src/nl.c:186 +msgid "" +" -b, --body-numbering=STYLE use STYLE for numbering body lines\n" +" -d, --section-delimiter=CC use CC for separating logical pages\n" +" -f, --footer-numbering=STYLE use STYLE for numbering footer lines\n" +msgstr "" + +#: src/nl.c:191 +msgid "" +" -h, --header-numbering=STYLE use STYLE for numbering header lines\n" +" -i, --line-increment=NUMBER line number increment at each line\n" +" -l, --join-blank-lines=NUMBER group of NUMBER empty lines counted as " +"one\n" +" -n, --number-format=FORMAT insert line numbers according to FORMAT\n" +" -p, --no-renumber do not reset line numbers at logical " +"pages\n" +" -s, --number-separator=STRING add STRING after (possible) line number\n" +msgstr "" + +#: src/nl.c:199 +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 "" + +#: src/nl.c:205 +msgid "" +"\n" +"By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC are\n" +"two delimiter characters for separating logical pages, a missing\n" +"second character implies :. Type \\\\ for \\. STYLE is one of:\n" +msgstr "" + +#: src/nl.c:211 +msgid "" +"\n" +" a number all lines\n" +" t number only nonempty lines\n" +" n number no lines\n" +" pBRE number only lines that contain a match for the basic regular\n" +" expression, BRE\n" +"\n" +"FORMAT is one of:\n" +"\n" +" ln left justified, no leading zeros\n" +" rn right justified, no leading zeros\n" +" rz right justified, leading zeros\n" +"\n" +msgstr "" + +#: src/nl.c:278 +#, c-format +msgid "line number overflow" +msgstr "" + +#: src/nl.c:478 +#, c-format +msgid "invalid header numbering style: %s" +msgstr "" + +#: src/nl.c:486 +#, c-format +msgid "invalid body numbering style: %s" +msgstr "" + +#: src/nl.c:494 +#, c-format +msgid "invalid footer numbering style: %s" +msgstr "" + +#: src/nl.c:503 +#, c-format +msgid "invalid starting line number: %s" +msgstr "" + +#: src/nl.c:512 +#, c-format +msgid "invalid line number increment: %s" +msgstr "" + +#: src/nl.c:524 +#, c-format +msgid "invalid number of blank lines: %s" +msgstr "" + +#: src/nl.c:538 +#, c-format +msgid "invalid line number field width: %s" +msgstr "" + +#: src/nl.c:557 +#, c-format +msgid "invalid line numbering format: %s" +msgstr "" + +#: src/nohup.c:53 +#, c-format +msgid "" +"Usage: %s COMMAND [ARG]...\n" +" or: %s OPTION\n" +msgstr "" + +#: src/nohup.c:59 +msgid "" +"Run COMMAND, ignoring hangup signals.\n" +"\n" +msgstr "" + +#: src/nohup.c:65 +#, c-format +msgid "" +"\n" +"If standard input is a terminal, redirect it from /dev/null.\n" +"If standard output is a terminal, append output to 'nohup.out' if possible,\n" +"'$HOME/nohup.out' otherwise.\n" +"If standard error is a terminal, redirect it to standard output.\n" +"To save output to FILE, use '%s COMMAND > FILE'.\n" +msgstr "" + +#: src/nohup.c:127 +#, c-format +msgid "failed to render standard input unusable" +msgstr "" + +#: src/nohup.c:131 +#, c-format +msgid "ignoring input" +msgstr "" + +#: src/nohup.c:175 +#, c-format +msgid "ignoring input and appending output to %s" +msgstr "" + +#: src/nohup.c:176 +#, c-format +msgid "appending output to %s" +msgstr "" + +#: src/nohup.c:193 +#, c-format +msgid "failed to set the copy of stderr to close on exec" +msgstr "" + +#: src/nohup.c:198 +#, c-format +msgid "ignoring input and redirecting stderr to stdout" +msgstr "" + +#: src/nohup.c:199 +#, c-format +msgid "redirecting stderr to stdout" +msgstr "" + +#: src/nohup.c:203 +#, c-format +msgid "failed to redirect standard error" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/nproc.c:33 +msgid "Giuseppe Scrivano" +msgstr "" + +#: src/nproc.c:57 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 +#, c-format +msgid "Usage: %s [OPTION]...\n" +msgstr "" + +#: src/nproc.c:58 +msgid "" +"Print the number of processing units available to the current process,\n" +"which may be less than the number of online processors\n" +"\n" +msgstr "" + +#: src/nproc.c:63 +msgid "" +" --all print the number of installed processors\n" +" --ignore=N if possible, exclude N processing units\n" +msgstr "" + +#: src/nproc.c:107 +#, c-format +msgid "%s: invalid number to ignore" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/numfmt.c:35 +msgid "Assaf Gordon" +msgstr "" + +#: src/numfmt.c:676 +#, c-format +msgid "value too large to be converted: '%s'" +msgstr "" + +#: src/numfmt.c:680 +#, fuzzy, c-format +msgid "invalid number: '%s'" +msgstr "argumento %s invalide pro %s" + +#: src/numfmt.c:684 +#, c-format +msgid "rejecting suffix in input: '%s' (consider using --from)" +msgstr "" + +#: src/numfmt.c:688 +#, c-format +msgid "invalid suffix in input: '%s'" +msgstr "" + +#: src/numfmt.c:692 +#, c-format +msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)" +msgstr "" + +#: src/numfmt.c:723 +#, c-format +msgid "failed to prepare value '%Lf' for printing" +msgstr "" + +#: src/numfmt.c:787 +#, fuzzy, c-format +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 +#, c-format +msgid "Usage: %s [OPTION]... [NUMBER]...\n" +msgstr "" + +#: src/numfmt.c:816 +msgid "" +"Reformat NUMBER(s), or the numbers from standard input if none are " +"specified.\n" +msgstr "" + +#: src/numfmt.c:820 +msgid " --debug print warnings about invalid input\n" +msgstr "" + +#: src/numfmt.c:823 +msgid "" +" -d, --delimiter=X use X instead of whitespace for field delimiter\n" +msgstr "" + +#: src/numfmt.c:826 +msgid "" +" --field=N replace the number in input field N (default is 1)\n" +msgstr "" + +#: src/numfmt.c:829 +msgid "" +" --format=FORMAT use printf style floating-point FORMAT;\n" +" see FORMAT below for details\n" +msgstr "" + +#: src/numfmt.c:833 +msgid "" +" --from=UNIT auto-scale input numbers to UNITs; default is " +"'none';\n" +" see UNIT below\n" +msgstr "" + +#: src/numfmt.c:837 +msgid "" +" --from-unit=N specify the input unit size (instead of the default " +"1)\n" +msgstr "" + +#: src/numfmt.c:840 +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 "" + +#: src/numfmt.c:844 +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 +msgid "" +" --invalid=MODE failure mode for invalid numbers: MODE can be:\n" +" abort (default), fail, warn, ignore\n" +msgstr "" + +#: src/numfmt.c:852 +msgid "" +" --padding=N pad the output to N characters; positive N will\n" +" right-align; negative N will left-align;\n" +" padding is ignored if the output is wider than N;\n" +" the default is to automatically pad if a " +"whitespace\n" +" is found\n" +msgstr "" + +#: src/numfmt.c:859 +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 +msgid "" +" --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" +" SUFFIX in input numbers\n" +msgstr "" + +#: src/numfmt.c:867 +msgid "" +" --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" +msgstr "" + +#: src/numfmt.c:870 +msgid "" +" --to-unit=N the output unit size (instead of the default 1)\n" +msgstr "" + +#: src/numfmt.c:877 +msgid "" +"\n" +"UNIT options:\n" +msgstr "" + +#: src/numfmt.c:880 +msgid " none no auto-scaling is done; suffixes will trigger an error\n" +msgstr "" + +#: src/numfmt.c:883 +msgid "" +" auto accept optional single/two letter suffix:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" +msgstr "" + +#: src/numfmt.c:889 +msgid "" +" si accept optional single letter suffix:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:894 +msgid "" +" iec accept optional single letter suffix:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:899 +msgid "" +" iec-i accept optional two-letter suffix:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:905 +#, 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" +msgstr "" + +#: src/numfmt.c:912 +#, c-format +msgid "" +"\n" +"Exit status is 0 if all input numbers were successfully converted.\n" +"By default, %s will stop at the first conversion error with exit status 2.\n" +"With --invalid='fail' a warning is printed for each conversion error\n" +"and the exit status is 2. With --invalid='warn' each conversion error is\n" +"diagnosed, but the exit status is 0. With --invalid='ignore' conversion\n" +"errors are not diagnosed and the exit status is 0.\n" +msgstr "" + +#: src/numfmt.c:921 +#, c-format +msgid "" +"\n" +"Examples:\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" +msgstr "" + +#: src/numfmt.c:974 src/seq.c:212 +#, c-format +msgid "format %s has no %% directive" +msgstr "" + +#: src/numfmt.c:990 +#, c-format +msgid "invalid format %s (width overflow)" +msgstr "" + +#: src/numfmt.c:1007 src/seq.c:229 +#, c-format +msgid "format %s ends in %%" +msgstr "" + +#: src/numfmt.c:1010 +#, c-format +msgid "invalid format %s, directive must be %%['][-][N]f" +msgstr "" + +#: src/numfmt.c:1018 src/seq.c:236 +#, c-format +msgid "format %s has too many %% directives" +msgstr "" + +#: src/numfmt.c:1070 +#, c-format +msgid "invalid suffix in input '%s': '%s'" +msgstr "" + +#: src/numfmt.c:1092 +#, c-format +msgid "value too large to be printed: '%Lg' (consider using --to)" +msgstr "" + +#: src/numfmt.c:1100 +#, c-format +msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" +msgstr "" + +#: src/numfmt.c:1184 +#, c-format +msgid "large input value '%s': possible precision loss" +msgstr "" + +#: src/numfmt.c:1293 +#, 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 "%s: option invalide -- '%c'\n" + +#: src/numfmt.c:1401 +#, c-format +msgid "invalid field value '%s'" +msgstr "" + +#: src/numfmt.c:1430 +#, c-format +msgid "invalid header value '%s'" +msgstr "" + +#: src/numfmt.c:1456 +#, 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 +#, c-format +msgid "no conversion option specified" +msgstr "" + +#: src/numfmt.c:1471 +#, c-format +msgid "grouping cannot be combined with --to" +msgstr "" + +#: src/numfmt.c:1473 +#, c-format +msgid "grouping has no effect in this locale" +msgstr "" + +#: src/numfmt.c:1486 +#, c-format +msgid "--header ignored with command-line input" +msgstr "" + +#: src/numfmt.c:1511 +#, c-format +msgid "error reading input" +msgstr "" + +#: src/numfmt.c:1520 +#, c-format +msgid "failed to convert some of the input numbers" +msgstr "" + +#: src/od.c:294 +#, 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 "" + +#: src/od.c:300 +msgid "" +"\n" +"Write an unambiguous representation, octal bytes by default,\n" +"of FILE to standard output. With more than one FILE argument,\n" +"concatenate them in the listed order to form the input.\n" +"With no FILE, or when FILE is -, read standard input.\n" +"\n" +msgstr "" + +#: src/od.c:307 +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" +"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" +"at first byte printed, incremented when dump is progressing.\n" +"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 "" + +#: src/od.c:318 +msgid "" +" -A, --address-radix=RADIX output format for file offsets. RADIX is one\n" +" of [doxn], for Decimal, Octal, Hex or None\n" +" -j, --skip-bytes=BYTES skip BYTES input bytes first\n" +msgstr "" + +#: src/od.c:323 +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" +" 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" +" 32 is implied when BYTES is not specified\n" +" --traditional accept arguments in third form above\n" +msgstr "" + +#: src/od.c:336 +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" +" -d same as -t u2, select unsigned decimal 2-byte units\n" +msgstr "" + +#: src/od.c:345 +msgid "" +" -f same as -t fF, select floats\n" +" -i same as -t dI, select decimal ints\n" +" -l same as -t dL, select decimal longs\n" +" -o same as -t o2, select octal 2-byte units\n" +" -s same as -t d2, select decimal 2-byte units\n" +" -x same as -t x2, select hexadecimal 2-byte units\n" +msgstr "" + +#: src/od.c:353 +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" +msgstr "" + +#: src/od.c:360 +msgid "" +" d[SIZE] signed decimal, SIZE bytes per integer\n" +" f[SIZE] floating point, SIZE bytes per integer\n" +" o[SIZE] octal, SIZE bytes per integer\n" +" u[SIZE] unsigned decimal, SIZE bytes per integer\n" +" x[SIZE] hexadecimal, SIZE bytes per integer\n" +msgstr "" + +#: src/od.c:367 +msgid "" +"\n" +"SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" +"sizeof(char), S for sizeof(short), I for sizeof(int) or L for\n" +"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 "" + +#: src/od.c:374 +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 +msgid "" +"\n" +"\n" +"BYTES is hex with 0x or 0X prefix, and may have a multiplier suffix:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"and so on for G, T, P, E, Z, Y.\n" +msgstr "" + +#: src/od.c:639 src/od.c:759 +#, c-format +msgid "invalid type string %s" +msgstr "" + +#: src/od.c:649 +#, c-format +msgid "" +"invalid type string %s;\n" +"this system doesn't provide a %lu-byte integral type" +msgstr "" + +#: src/od.c:770 +#, c-format +msgid "" +"invalid type string %s;\n" +"this system doesn't provide a %lu-byte floating point type" +msgstr "" + +#: src/od.c:828 +#, c-format +msgid "invalid character '%c' in type string %s" +msgstr "" + +#: src/od.c:1053 +#, c-format +msgid "cannot skip past end of combined input" +msgstr "" + +#: src/od.c:1609 +#, c-format +msgid "invalid output address radix '%c'; it must be one character from [doxn]" +msgstr "" + +#: src/od.c:1735 +#, c-format +msgid "no type may be specified when dumping strings" +msgstr "" + +#: src/od.c:1810 +msgid "compatibility mode supports at most one file" +msgstr "" + +#: src/od.c:1831 +#, c-format +msgid "skip-bytes + read-bytes is too large" +msgstr "" + +#: src/od.c:1874 +#, c-format +msgid "warning: invalid width %lu; using %d instead" +msgstr "" + +#: src/operand2sig.c:69 +#, c-format +msgid "%s: invalid signal" +msgstr "" + +#: src/paste.c:220 +#, c-format +msgid "standard input is closed" +msgstr "" + +#: src/paste.c:439 +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 "" + +#: 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 "" + +#: src/paste.c:508 +#, c-format +msgid "delimiter list ends with an unescaped backslash: %s" +msgstr "" + +#: src/pathchk.c:90 +msgid "" +"Diagnose invalid or unportable file names.\n" +"\n" +" -p check for most POSIX systems\n" +" -P check for empty names and leading \"-\"\n" +" --portability check for all POSIX systems (equivalent to -p -P)\n" +msgstr "" + +#: src/pathchk.c:170 +#, c-format +msgid "leading '-' in a component of file name %s" +msgstr "" + +#: src/pathchk.c:196 +#, c-format +msgid "nonportable character %s in file name %s" +msgstr "" + +#: src/pathchk.c:272 +#, c-format +msgid "empty file name" +msgstr "" + +#: src/pathchk.c:314 +#, c-format +msgid "%s: unable to determine maximum file name length" +msgstr "" + +#: src/pathchk.c:325 +#, c-format +msgid "limit %lu exceeded by length %lu of file name %s" +msgstr "" + +#: src/pathchk.c:411 +#, c-format +msgid "limit %lu exceeded by length %lu of file name component %s" +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 +msgid "Joseph Arceneaux" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/pinky.c:38 src/uptime.c:47 +msgid "Kaveh Ghazi" +msgstr "" + +#. TRANSLATORS: Real name is unknown; at most 19 characters. +#: src/pinky.c:242 +msgid " ???" +msgstr "" + +#. TRANSLATORS: Idle time is unknown; at most 5 characters. +#: src/pinky.c:266 +msgid "?????" +msgstr "" + +#: src/pinky.c:314 +#, c-format +msgid "Login name: " +msgstr "" + +#: src/pinky.c:317 +#, c-format +msgid "In real life: " +msgstr "" + +#. TRANSLATORS: Real name is unknown; no hard limit. +#: src/pinky.c:321 +msgid "???\n" +msgstr "" + +#: src/pinky.c:341 +#, c-format +msgid "Directory: " +msgstr "" + +#: src/pinky.c:343 +#, c-format +msgid "Shell: " +msgstr "" + +#: src/pinky.c:362 +#, c-format +msgid "Project: " +msgstr "" + +#: src/pinky.c:386 +#, c-format +msgid "Plan:\n" +msgstr "" + +#: src/pinky.c:405 +msgid "Login" +msgstr "" + +#: src/pinky.c:407 +msgid "Name" +msgstr "" + +#: src/pinky.c:408 +msgid " TTY" +msgstr "" + +#: src/pinky.c:410 +msgid "Idle" +msgstr "" + +#: src/pinky.c:411 +msgid "When" +msgstr "" + +#: src/pinky.c:414 +msgid "Where" +msgstr "" + +#: src/pinky.c:493 +#, c-format +msgid "Usage: %s [OPTION]... [USER]...\n" +msgstr "" + +#: src/pinky.c:494 +msgid "" +"\n" +" -l produce long format output for the specified USERs\n" +" -b omit the user's home directory and shell in long format\n" +" -h omit the user's project file in long format\n" +" -p omit the user's plan file in long format\n" +" -s do short format output, this is the default\n" +msgstr "" + +#: src/pinky.c:502 +msgid "" +" -f omit the line of column headings in short format\n" +" -w omit the user's full name in short format\n" +" -i omit the user's full name and remote host in short format\n" +" -q omit the user's full name, remote host and idle time\n" +" in short format\n" +msgstr "" + +#: src/pinky.c:511 +#, c-format +msgid "" +"\n" +"A lightweight 'finger' program; print user information.\n" +"The utmp file will be %s.\n" +msgstr "" + +#: src/pinky.c:595 +#, c-format +msgid "no username specified; at least one must be specified when using -l" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/pr.c:330 +msgid "Pete TerMaat" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/pr.c:331 +msgid "Roland Huebner" +msgstr "" + +#: src/pr.c:908 +#, c-format +msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" +msgstr "" + +#: src/pr.c:910 +#, c-format +msgid "invalid page range %s" +msgstr "" + +#: src/pr.c:975 +#, c-format +msgid "'-l PAGE_LENGTH' invalid number of lines: %s" +msgstr "" + +#: src/pr.c:999 +#, c-format +msgid "'-N NUMBER' invalid starting line number: %s" +msgstr "" + +#: src/pr.c:1011 +#, c-format +msgid "'-o MARGIN' invalid line offset: %s" +msgstr "" + +#: src/pr.c:1052 +#, c-format +msgid "'-w PAGE_WIDTH' invalid number of characters: %s" +msgstr "" + +#: src/pr.c:1066 +#, c-format +msgid "'-W PAGE_WIDTH' invalid number of characters: %s" +msgstr "" + +#: src/pr.c:1096 +#, c-format +msgid "cannot specify number of columns when printing in parallel" +msgstr "" + +#: src/pr.c:1100 +#, c-format +msgid "cannot specify both printing across and printing in parallel" +msgstr "" + +#: src/pr.c:1196 +#, c-format +msgid "'-%c' extra characters or invalid number in the argument: %s" +msgstr "" + +#: src/pr.c:1293 +#, c-format +msgid "page width too narrow" +msgstr "" + +#: src/pr.c:2353 +#, c-format +msgid "starting page number %<PRIuMAX> exceeds page count %<PRIuMAX>" +msgstr "" + +#: src/pr.c:2380 +#, c-format +msgid "page number overflow" +msgstr "" + +#: src/pr.c:2385 +#, c-format +msgid "Page %<PRIuMAX>" +msgstr "" + +#: src/pr.c:2757 +msgid "Paginate or columnate FILE(s) for printing.\n" +msgstr "" + +#: src/pr.c:2763 +msgid "" +" +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" +" begin [stop] printing with page FIRST_[LAST_]PAGE\n" +" -COLUMN, --columns=COLUMN\n" +" output COLUMN columns and print columns down,\n" +" unless -a is used. Balance number of lines in the\n" +" columns on each page\n" +msgstr "" + +#: src/pr.c:2771 +msgid "" +" -a, --across print columns across rather than down, used together\n" +" with -COLUMN\n" +" -c, --show-control-chars\n" +" use hat notation (^G) and octal backslash notation\n" +" -d, --double-space\n" +" double space the output\n" +msgstr "" + +#: src/pr.c:2779 +msgid "" +" -D, --date-format=FORMAT\n" +" use FORMAT for the header date\n" +" -e[CHAR[WIDTH]], --expand-tabs[=CHAR[WIDTH]]\n" +" expand input CHARs (TABs) to tab WIDTH (8)\n" +" -F, -f, --form-feed\n" +" use form feeds instead of newlines to separate pages\n" +" (by a 3-line page header with -F or a 5-line header\n" +" and trailer without -F)\n" +msgstr "" + +#: src/pr.c:2789 +msgid "" +" -h, --header=HEADER\n" +" use a centered HEADER instead of filename in page " +"header,\n" +" -h \"\" prints a blank line, don't use -h\"\"\n" +" -i[CHAR[WIDTH]], --output-tabs[=CHAR[WIDTH]]\n" +" replace spaces with CHARs (TABs) to tab WIDTH (8)\n" +" -J, --join-lines merge full lines, turns off -W line truncation, no " +"column\n" +" alignment, --sep-string[=STRING] sets separators\n" +msgstr "" + +#: src/pr.c:2798 +msgid "" +" -l, --length=PAGE_LENGTH\n" +" set the page length to PAGE_LENGTH (66) lines\n" +" (default number of lines of text 56, and with -F 63)\n" +" -m, --merge print all files in parallel, one in each column,\n" +" truncate lines, but join lines of full length with -J\n" +msgstr "" + +#: src/pr.c:2805 +msgid "" +" -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" +" number lines, use DIGITS (5) digits, then SEP (TAB),\n" +" default counting starts with 1st line of input file\n" +" -N, --first-line-number=NUMBER\n" +" start counting with NUMBER at 1st line of first\n" +" page printed (see +FIRST_PAGE)\n" +msgstr "" + +#: src/pr.c:2813 +msgid "" +" -o, --indent=MARGIN\n" +" offset each line with MARGIN (zero) spaces, do not\n" +" affect -w or -W, MARGIN will be added to PAGE_WIDTH\n" +" -r, --no-file-warnings\n" +" omit warning when a file cannot be opened\n" +msgstr "" + +#: 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" +" -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 +msgid "" +" -S[STRING], --sep-string[=STRING]\n" +" separate columns by STRING,\n" +" without -S: Default separator <TAB> with -J and <space>\n" +" otherwise (same as -S\" \"), no effect on column " +"options\n" +" -t, --omit-header omit page headers and trailers\n" +msgstr "" + +#: src/pr.c:2834 +msgid "" +" -T, --omit-pagination\n" +" omit page headers and trailers, eliminate any " +"pagination\n" +" by form feeds set in input files\n" +" -v, --show-nonprinting\n" +" use octal backslash notation\n" +" -w, --width=PAGE_WIDTH\n" +" set page width to PAGE_WIDTH (72) characters for\n" +" multiple text-column output only, -s[char] turns off " +"(72)\n" +msgstr "" + +#: src/pr.c:2844 +msgid "" +" -W, --page-width=PAGE_WIDTH\n" +" set page width to PAGE_WIDTH (72) characters always,\n" +" truncate lines, except -J option is set, no " +"interference\n" +" with -S or -s\n" +msgstr "" + +#: src/pr.c:2852 +msgid "" +"\n" +"-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" +"standard input.\n" +msgstr "" + +#: src/printenv.c:62 +#, c-format +msgid "" +"Usage: %s [OPTION]... [VARIABLE]...\n" +"Print the values of the specified environment VARIABLE(s).\n" +"If no VARIABLE is specified, print name and value pairs for them all.\n" +"\n" +msgstr "" + +#: src/printenv.c:69 +msgid " -0, --null end each output line with 0 byte rather than newline\n" +msgstr "" + +#: src/printf.c:79 +#, c-format +msgid "" +"warning: %s: character(s) following character constant have been ignored" +msgstr "" + +#: src/printf.c:88 +#, c-format +msgid "" +"Usage: %s FORMAT [ARGUMENT]...\n" +" or: %s OPTION\n" +msgstr "" + +#: src/printf.c:93 +msgid "" +"Print ARGUMENT(s) according to FORMAT, or execute according to OPTION:\n" +"\n" +msgstr "" + +#: src/printf.c:99 +msgid "" +"\n" +"FORMAT controls the output as in C printf. Interpreted sequences are:\n" +"\n" +" \\\" double quote\n" +msgstr "" + +#: src/printf.c:117 +msgid "" +" \\NNN byte with octal value NNN (1 to 3 digits)\n" +" \\xHH byte with hexadecimal value HH (1 to 2 digits)\n" +" \\uHHHH Unicode (ISO/IEC 10646) character with hex value HHHH (4 digits)\n" +" \\UHHHHHHHH Unicode character with hex value HHHHHHHH (8 digits)\n" +msgstr "" + +#: src/printf.c:123 +msgid "" +" %% a single %\n" +" %b ARGUMENT as a string with '\\' escapes interpreted,\n" +" except that octal escapes are of the form \\0 or \\0NNN\n" +"\n" +"and all C format specifications ending with one of diouxXfeEgGcs, with\n" +"ARGUMENTs converted to proper type first. Variable widths are handled.\n" +msgstr "" + +#: src/printf.c:148 +#, c-format +msgid "%s: expected a numeric value" +msgstr "" + +#: src/printf.c:150 +#, c-format +msgid "%s: value not completely converted" +msgstr "" + +#: src/printf.c:247 src/printf.c:274 +#, c-format +msgid "missing hexadecimal number in escape" +msgstr "" + +#: src/printf.c:286 +#, c-format +msgid "invalid universal character name \\%c%0*x" +msgstr "" + +#: src/printf.c:547 +#, c-format +msgid "invalid field width: %s" +msgstr "" + +#: src/printf.c:582 +#, c-format +msgid "invalid precision: %s" +msgstr "" + +#: src/printf.c:609 +#, c-format +msgid "%.*s: invalid conversion specification" +msgstr "" + +#: src/printf.c:692 +#, c-format +msgid "warning: ignoring excess arguments, starting with %s" +msgstr "" + +#. TRANSLATORS: Please translate "F. Pinard" to "François Pinard" +#. if "ç" (c-with-cedilla) is available in the translation's character +#. set and encoding. +#. This is a proper name. See the gettext manual, section Names. +#: src/ptx.c:42 +msgid "F. Pinard" +msgstr "" + +#: src/ptx.c:419 +#, c-format +msgid "%s (for regexp %s)" +msgstr "" + +#: src/ptx.c:1817 +#, c-format +msgid "" +"Usage: %s [OPTION]... [INPUT]... (without -G)\n" +" or: %s -G [OPTION]... [INPUT [OUTPUT]]\n" +msgstr "" + +#: src/ptx.c:1821 +msgid "" +"Output a permuted index, including context, of the words in the input " +"files.\n" +msgstr "" + +#: src/ptx.c:1827 +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 +msgid "" +" -M, --macro-name=STRING macro name to use instead of 'xx'\n" +" -O, --format=roff generate output as roff directives\n" +" -R, --right-side-refs put references at right, not counted in -w\n" +" -S, --sentence-regexp=REGEXP for end of lines or end of sentences\n" +" -T, --format=tex generate output as TeX directives\n" +msgstr "" + +#: src/ptx.c:1839 +msgid "" +" -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" +" -b, --break-file=FILE word break characters in this FILE\n" +" -f, --ignore-case fold lower case to upper case for sorting\n" +" -g, --gap-size=NUMBER gap size in columns between output fields\n" +" -i, --ignore-file=FILE read ignore word list from FILE\n" +" -o, --only-file=FILE read only word list from this FILE\n" +msgstr "" + +#: src/ptx.c:1847 +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 "" + +#: src/ptx.c:1854 +msgid "" +"\n" +"With no FILE or if FILE is -, read Standard Input. '-F /' by default.\n" +msgstr "" + +#: src/ptx.c:1948 +#, c-format +msgid "invalid gap width: %s" +msgstr "" + +#: src/pwd.c:57 +msgid "" +"Print the full filename of the current working directory.\n" +"\n" +msgstr "" + +#: src/pwd.c:61 +msgid "" +" -L, --logical use PWD from environment, even if it contains symlinks\n" +" -P, --physical avoid all symlinks\n" +msgstr "" + +#: src/pwd.c:166 +#, c-format +msgid "failed to chdir to %s" +msgstr "" + +#: src/pwd.c:170 src/pwd.c:277 src/split.c:373 +#, c-format +msgid "failed to stat %s" +msgstr "" + +#: src/pwd.c:235 +#, c-format +msgid "couldn't find directory entry in %s with matching i-node" +msgstr "" + +#: src/pwd.c:362 +#, c-format +msgid "ignoring non-option arguments" +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 +#, c-format +msgid "Usage: %s [OPTION]... FILE...\n" +msgstr "" + +#: src/readlink.c:63 +msgid "" +"Print value of a symbolic link or canonical file name\n" +"\n" +msgstr "" + +#: src/readlink.c:65 +msgid "" +" -f, --canonicalize canonicalize by following every symlink in\n" +" every component of the given name " +"recursively;\n" +" all but the last component must exist\n" +" -e, --canonicalize-existing canonicalize by following every symlink in\n" +" every component of the given name " +"recursively,\n" +" all components must exist\n" +msgstr "" + +#: src/readlink.c:75 +msgid "" +" -m, --canonicalize-missing canonicalize by following every symlink in\n" +" every component of the given name " +"recursively,\n" +" without requirements on components " +"existence\n" +" -n, --no-newline do not output the trailing delimiter\n" +" -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" +msgstr "" + +#: src/readlink.c:152 +#, c-format +msgid "ignoring --no-newline with multiple arguments" +msgstr "" + +#: src/realpath.c:72 +msgid "" +"Print the resolved absolute file name;\n" +"all but the last component must exist\n" +"\n" +msgstr "" + +#: src/realpath.c:77 +msgid "" +" -e, --canonicalize-existing all components of the path must exist\n" +" -m, --canonicalize-missing no components of the path need exist\n" +" -L, --logical resolve '..' components before symlinks\n" +" -P, --physical resolve symlinks as encountered (default)\n" +" -q, --quiet suppress most error messages\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" +"\n" +msgstr "" + +#: src/relpath.c:130 +msgid "generating relative path" +msgstr "" + +#: src/remove.c:273 +#, c-format +msgid "%s: descend into write-protected directory %s? " +msgstr "" + +#: src/remove.c:274 +#, c-format +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 +#, c-format +msgid "%s: remove write-protected %s %s? " +msgstr "" + +#: src/remove.c:291 +#, c-format +msgid "%s: remove %s %s? " +msgstr "" + +#: src/remove.c:374 +#, c-format +msgid "removed directory: %s\n" +msgstr "" + +#: src/remove.c:444 +#, c-format +msgid "cannot remove directory: %s" +msgstr "" + +#: src/remove.c:500 +#, c-format +msgid "skipping %s, since it's on a different device" +msgstr "" + +#: src/remove.c:520 +#, c-format +msgid "traversal failed: %s" +msgstr "" + +#: src/remove.c:526 +#, c-format +msgid "" +"unexpected failure: fts_info=%d: %s\n" +"please report to %s" +msgstr "" + +#: src/rm.c:119 +#, c-format +msgid "Try '%s ./%s' to remove the file %s.\n" +msgstr "" + +#: src/rm.c:136 +msgid "" +"Remove (unlink) the FILE(s).\n" +"\n" +" -f, --force ignore nonexistent files and arguments, never " +"prompt\n" +" -i prompt before every removal\n" +msgstr "" + +#: src/rm.c:142 +msgid "" +" -I prompt once before removing more than three files, " +"or\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" +msgstr "" + +#: src/rm.c:149 +msgid "" +" --one-file-system when removing a hierarchy recursively, skip any\n" +" directory that is on a file system different from\n" +" that of the corresponding command line argument\n" +msgstr "" + +#: src/rm.c:154 +msgid "" +" --no-preserve-root do not treat '/' specially\n" +" --preserve-root do not remove '/' (default)\n" +" -r, -R, --recursive remove directories and their contents recursively\n" +" -d, --dir remove empty directories\n" +" -v, --verbose explain what is being done\n" +msgstr "" + +#: src/rm.c:163 +msgid "" +"\n" +"By default, rm does not remove directories. Use the --recursive (-r or -R)\n" +"option to remove each listed directory, too, along with all of its " +"contents.\n" +msgstr "" + +#: src/rm.c:168 +#, c-format +msgid "" +"\n" +"To remove a file whose name starts with a '-', for example '-foo',\n" +"use one of these commands:\n" +" %s -- -foo\n" +"\n" +" %s ./-foo\n" +msgstr "" + +#: src/rm.c:177 +msgid "" +"\n" +"Note that if you use rm to remove a file, it might be possible to recover\n" +"some of its contents, given sufficient expertise and/or time. For greater\n" +"assurance that the contents are truly unrecoverable, consider using shred.\n" +msgstr "" + +#: src/rm.c:342 +#, c-format +msgid "%s: remove all arguments recursively? " +msgstr "" + +#: src/rm.c:343 +#, c-format +msgid "%s: remove all arguments? " +msgstr "" + +#: src/rmdir.c:134 src/rmdir.c:233 +#, c-format +msgid "removing directory, %s" +msgstr "" + +#: src/rmdir.c:148 +#, c-format +msgid "failed to remove directory %s" +msgstr "" + +#: src/rmdir.c:165 +msgid "" +"Remove the DIRECTORY(ies), if they are empty.\n" +"\n" +" --ignore-fail-on-non-empty\n" +" ignore each failure that is solely because a directory\n" +" is non-empty\n" +msgstr "" + +#: src/rmdir.c:172 +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 "" + +#: src/rmdir.c:242 +#, c-format +msgid "failed to remove %s" +msgstr "" + +#: src/runcon.c:83 +#, c-format +msgid "" +"Usage: %s CONTEXT COMMAND [args]\n" +" or: %s [ -c ] [-u USER] [-r ROLE] [-t TYPE] [-l RANGE] COMMAND [args]\n" +msgstr "" + +#: src/runcon.c:87 +msgid "" +"Run a program in a different security context.\n" +"With neither CONTEXT nor COMMAND, print the current security context.\n" +msgstr "" + +#: src/runcon.c:94 +msgid "" +" CONTEXT Complete security context\n" +" -c, --compute compute process transition context before modifying\n" +" -t, --type=TYPE type (for same role as parent)\n" +" -u, --user=USER user identity\n" +" -r, --role=ROLE role\n" +" -l, --range=RANGE levelrange\n" +"\n" +msgstr "" + +#: src/runcon.c:144 +#, c-format +msgid "multiple roles" +msgstr "" + +#: src/runcon.c:149 +#, c-format +msgid "multiple types" +msgstr "" + +#: src/runcon.c:154 +#, c-format +msgid "multiple users" +msgstr "" + +#: src/runcon.c:159 +#, c-format +msgid "multiple levelranges" +msgstr "" + +#: src/runcon.c:177 src/runcon.c:213 +#, c-format +msgid "failed to get current context" +msgstr "" + +#: src/runcon.c:187 +#, c-format +msgid "you must specify -c, -t, -u, -l, -r, or context" +msgstr "" + +#: src/runcon.c:195 +#, c-format +msgid "no command specified" +msgstr "" + +#: src/runcon.c:201 +#, c-format +msgid "%s may be used only on a SELinux kernel" +msgstr "" + +#: src/runcon.c:227 +#, c-format +msgid "failed to compute a new context" +msgstr "" + +#: src/runcon.c:241 +#, c-format +msgid "failed to set new user %s" +msgstr "" + +#: src/runcon.c:243 +#, c-format +msgid "failed to set new type %s" +msgstr "" + +#: src/runcon.c:245 +#, c-format +msgid "failed to set new range %s" +msgstr "" + +#: src/runcon.c:247 +#, c-format +msgid "failed to set new role %s" +msgstr "" + +#: src/runcon.c:255 +#, c-format +msgid "unable to set security context %s" +msgstr "" + +#: src/seq.c:68 +#, c-format +msgid "" +"Usage: %s [OPTION]... LAST\n" +" or: %s [OPTION]... FIRST LAST\n" +" or: %s [OPTION]... FIRST INCREMENT LAST\n" +msgstr "" + +#: src/seq.c:73 +msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" +msgstr "" + +#: src/seq.c:79 +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 "" + +#: src/seq.c:86 +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" +"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 +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 +#, c-format +msgid "invalid floating point argument: %s" +msgstr "" + +#: src/seq.c:232 +#, c-format +msgid "format %s has unknown %%%c directive" +msgstr "" + +#: src/seq.c:555 +#, 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 +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 +#, c-format +msgid "" +" -f, --force change permissions to allow writing if necessary\n" +" -n, --iterations=N overwrite N times instead of the default (%d)\n" +" --random-source=FILE get random bytes from FILE\n" +" -s, --size=N shred this many bytes (suffixes like K, M, G accepted)\n" +msgstr "" + +#: src/shred.c:161 +msgid "" +" -u, --remove truncate and remove file after overwriting\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 +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" +"\n" +msgstr "" + +#: src/shred.c:180 +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" +"way to do things, but many modern file system designs do not satisfy this\n" +"assumption. The following are examples of file systems on which shred is\n" +"not effective, or is not guaranteed to be effective in all file system " +"modes:\n" +"\n" +msgstr "" + +#: src/shred.c:188 +msgid "" +"* log-structured or journaled file systems, such as those supplied with\n" +"AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" +"\n" +"* file systems that write redundant data and carry on even if some writes\n" +"fail, such as RAID-based file systems\n" +"\n" +"* file systems that make snapshots, such as Network Appliance's NFS server\n" +"\n" +msgstr "" + +#: src/shred.c:198 +msgid "" +"* file systems that cache in temporary locations, such as NFS\n" +"version 3 clients\n" +"\n" +"* compressed file systems\n" +"\n" +msgstr "" + +#: src/shred.c:205 +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" +"which journals file data in addition to just metadata. In both the\n" +"data=ordered (default) and data=writeback modes, shred works as usual.\n" +"Ext3 journaling modes can be changed by adding the data=something option\n" +"to the mount options for a particular file system in the /etc/fstab file,\n" +"as documented in the mount man page (man mount).\n" +"\n" +msgstr "" + +#: src/shred.c:215 +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 +#, c-format +msgid "%s: fdatasync failed" +msgstr "" + +#: src/shred.c:306 +#, c-format +msgid "%s: fsync failed" +msgstr "" + +#: src/shred.c:383 +#, c-format +msgid "%s: cannot rewind" +msgstr "" + +#: src/shred.c:402 +#, c-format +msgid "%s: pass %lu/%lu (%s)..." +msgstr "" + +#: src/shred.c:452 +#, c-format +msgid "%s: error writing at offset %s" +msgstr "" + +#: src/shred.c:470 +#, c-format +msgid "%s: lseek failed" +msgstr "" + +#: src/shred.c:481 +#, c-format +msgid "%s: file too large" +msgstr "" + +#: src/shred.c:504 +#, c-format +msgid "%s: pass %lu/%lu (%s)...%s" +msgstr "" + +#: src/shred.c:520 +#, c-format +msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" +msgstr "" + +#: src/shred.c:767 +#, c-format +msgid "%s: fstat failed" +msgstr "" + +#: src/shred.c:778 +#, c-format +msgid "%s: invalid file type" +msgstr "" + +#: src/shred.c:797 +#, c-format +msgid "%s: file has negative size" +msgstr "" + +#: src/shred.c:864 src/sort.c:932 src/split.c:378 +#, c-format +msgid "%s: error truncating" +msgstr "" + +#: src/shred.c:880 +#, c-format +msgid "%s: fcntl failed" +msgstr "" + +#: src/shred.c:885 +#, c-format +msgid "%s: cannot shred append-only file descriptor" +msgstr "" + +#: src/shred.c:967 +#, c-format +msgid "%s: removing" +msgstr "" + +#: src/shred.c:991 +#, c-format +msgid "%s: renamed to %s" +msgstr "" + +#: src/shred.c:1013 +#, c-format +msgid "%s: failed to remove" +msgstr "" + +#: src/shred.c:1017 +#, c-format +msgid "%s: removed" +msgstr "" + +#: src/shred.c:1024 src/shred.c:1067 +#, c-format +msgid "%s: failed to close" +msgstr "" + +#: src/shred.c:1060 +#, c-format +msgid "%s: failed to open for writing" +msgstr "" + +#: src/shred.c:1125 +#, c-format +msgid "%s: invalid number of passes" +msgstr "" + +#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441 +#, c-format +msgid "multiple random sources specified" +msgstr "" + +#: src/shred.c:1148 +#, c-format +msgid "%s: invalid file size" +msgstr "" + +#: src/shuf.c:48 +#, c-format +msgid "" +"Usage: %s [OPTION]... [FILE]\n" +" or: %s -e [OPTION]... [ARG]...\n" +" or: %s -i LO-HI [OPTION]...\n" +msgstr "" + +#: src/shuf.c:54 +msgid "Write a random permutation of the input lines to standard output.\n" +msgstr "" + +#: src/shuf.c:60 +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 " +"line\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" +msgstr "" + +#: src/shuf.c:244 +#, c-format +msgid "multiple -i options specified" +msgstr "" + +#: src/shuf.c:264 +#, c-format +msgid "invalid input range %s" +msgstr "" + +#: src/shuf.c:277 +#, c-format +msgid "invalid line count %s" +msgstr "" + +#: src/shuf.c:284 src/sort.c:4435 +#, c-format +msgid "multiple output files specified" +msgstr "" + +#: src/shuf.c:310 +#, c-format +msgid "cannot combine -e and -i options" +msgstr "" + +#: src/sleep.c:44 +#, c-format +msgid "" +"Usage: %s NUMBER[SUFFIX]...\n" +" or: %s OPTION\n" +"Pause for NUMBER seconds. SUFFIX may be 's' for seconds (the default),\n" +"'m' for minutes, 'h' for hours or 'd' for days. Unlike most " +"implementations\n" +"that require NUMBER be an integer, here NUMBER may be an arbitrary floating\n" +"point number. Given two or more arguments, pause for the amount of time\n" +"specified by the sum of their values.\n" +"\n" +msgstr "" + +#: src/sleep.c:135 src/timeout.c:320 +#, c-format +msgid "invalid time interval %s" +msgstr "" + +#: src/sleep.c:146 src/tail.c:1219 +#, c-format +msgid "cannot read realtime clock" +msgstr "" + +#: src/sort.c:399 +msgid "Write sorted concatenation of all FILE(s) to standard output.\n" +msgstr "" + +#: src/sort.c:405 +msgid "" +"Ordering options:\n" +"\n" +msgstr "" + +#: src/sort.c:409 +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 "" + +#: src/sort.c:415 +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 +msgid "" +" -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" +msgstr "" + +#: src/sort.c:423 +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 "" + +#: src/sort.c:429 +msgid "" +" --sort=WORD sort according to WORD:\n" +" general-numeric -g, human-numeric -h, month -" +"M,\n" +" numeric -n, random -R, version -V\n" +" -V, --version-sort natural sort of (version) numbers within text\n" +"\n" +msgstr "" + +#: src/sort.c:437 +msgid "" +"Other options:\n" +"\n" +msgstr "" + +#: src/sort.c:441 +msgid "" +" --batch-size=NMERGE merge at most NMERGE inputs at once;\n" +" for more use temp files\n" +msgstr "" + +#: src/sort.c:445 +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 " +"line\n" +" --compress-program=PROG compress temporaries with PROG;\n" +" decompress them with PROG -d\n" +msgstr "" + +#: src/sort.c:452 +msgid "" +" --debug annotate the part of the line used to sort,\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" +msgstr "" + +#: src/sort.c:459 +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 +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 "" + +#: src/sort.c:469 +#, c-format +msgid "" +" -t, --field-separator=SEP use SEP instead of non-blank to blank " +"transition\n" +" -T, --temporary-directory=DIR use DIR for temporaries, not $TMPDIR or " +"%s;\n" +" multiple options specify multiple directories\n" +" --parallel=N change the number of sorts run concurrently to " +"N\n" +" -u, --unique with -c, check for strict ordering;\n" +" without -c, output only the first of an equal " +"run\n" +msgstr "" + +#: src/sort.c:478 +msgid " -z, --zero-terminated end lines with 0 byte, not newline\n" +msgstr "" + +#: src/sort.c:483 +msgid "" +"\n" +"KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " +"a\n" +"field number and C a character position in the field; both are origin 1, " +"and\n" +"the stop position defaults to the line's end. If neither -t nor -b is in\n" +"effect, characters in a field are counted from the beginning of the " +"preceding\n" +"whitespace. OPTS is one or more single-letter ordering options " +"[bdfgiMhnRrV],\n" +"which override global ordering options for that key. If no key is given, " +"use\n" +"the entire line as the key.\n" +"\n" +"SIZE may be followed by the following multiplicative suffixes:\n" +msgstr "" + +#: src/sort.c:496 +msgid "" +"% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" +"\n" +"*** WARNING ***\n" +"The locale specified by the environment affects sort order.\n" +"Set LC_ALL=C to get the traditional sort order that uses\n" +"native byte values.\n" +msgstr "" + +#: src/sort.c:697 +#, c-format +msgid "waiting for %s [-d]" +msgstr "" + +#: src/sort.c:702 +#, c-format +msgid "%s [-d] terminated abnormally" +msgstr "" + +#: src/sort.c:856 +#, 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 +msgid "open failed" +msgstr "" + +#: src/sort.c:970 +msgid "fflush failed" +msgstr "" + +#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706 +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 +msgid "couldn't create temporary file" +msgstr "" + +#: src/sort.c:1149 +#, 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 +#, c-format +msgid "warning: cannot remove: %s" +msgstr "" + +#: src/sort.c:1306 +#, c-format +msgid "invalid --%s argument %s" +msgstr "" + +#: src/sort.c:1309 +#, c-format +msgid "minimum --%s argument is %s" +msgstr "" + +#: src/sort.c:1324 +#, c-format +msgid "--%s argument %s too large" +msgstr "" + +#: src/sort.c:1327 +#, c-format +msgid "maximum --%s argument with current rlimit is %s" +msgstr "" + +#: src/sort.c:1409 +#, c-format +msgid "number in parallel must be nonzero" +msgstr "" + +#: src/sort.c:1494 +msgid "stat failed" +msgstr "" + +#: src/sort.c:1755 +msgid "read failed" +msgstr "" + +#: src/sort.c:2043 +#, c-format +msgid "string transformation failed" +msgstr "" + +#: src/sort.c:2046 +#, c-format +msgid "the untransformed string was %s" +msgstr "" + +#: src/sort.c:2209 +#, c-format +msgid "^ no match for key\n" +msgstr "" + +#: src/sort.c:2389 +#, c-format +msgid "obsolescent key %s used; consider %s instead" +msgstr "" + +#: src/sort.c:2395 +#, c-format +msgid "key %lu has zero width and will be ignored" +msgstr "" + +#: src/sort.c:2406 +#, c-format +msgid "leading blanks are significant in key %lu; consider also specifying 'b'" +msgstr "" + +#: src/sort.c:2419 +#, c-format +msgid "key %lu is numeric and spans multiple fields" +msgstr "" + +#: src/sort.c:2451 +#, c-format +msgid "option '-%s' is ignored" +msgid_plural "options '-%s' are ignored" +msgstr[0] "" +msgstr[1] "" + +#: src/sort.c:2457 +#, c-format +msgid "option '-r' only applies to last-resort comparison" +msgstr "" + +#: src/sort.c:2731 src/sort.c:2740 +msgid "write failed" +msgstr "" + +#: src/sort.c:2783 +#, c-format +msgid "%s: %s:%s: disorder: " +msgstr "" + +#: src/sort.c:2786 +msgid "standard error" +msgstr "" + +#: src/sort.c:3698 +msgid "cannot read" +msgstr "" + +#: src/sort.c:3976 +#, c-format +msgid "%s: invalid field specification %s" +msgstr "" + +#: src/sort.c:3987 +#, c-format +msgid "options '-%s' are incompatible" +msgstr "" + +#: src/sort.c:4038 +#, c-format +msgid "%s: invalid count at start of %s" +msgstr "" + +#: src/sort.c:4295 +msgid "invalid number after '-'" +msgstr "" + +#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416 +msgid "invalid number after '.'" +msgstr "" + +#: src/sort.c:4315 src/sort.c:4421 +msgid "stray character in field spec" +msgstr "" + +#: src/sort.c:4362 +#, c-format +msgid "multiple compress programs specified" +msgstr "" + +#: src/sort.c:4379 +msgid "invalid number at field start" +msgstr "" + +#: src/sort.c:4383 src/sort.c:4411 +msgid "field number is zero" +msgstr "" + +#: src/sort.c:4392 +msgid "character offset is zero" +msgstr "" + +#: src/sort.c:4407 +msgid "invalid number after ','" +msgstr "" + +#: src/sort.c:4457 +#, c-format +msgid "empty tab" +msgstr "" + +#: src/sort.c:4550 src/wc.c:692 +#, c-format +msgid "cannot read file names from %s" +msgstr "" + +#: src/sort.c:4572 +#, c-format +msgid "%s:%lu: invalid zero-length file name" +msgstr "" + +#: src/sort.c:4578 +#, c-format +msgid "no input from %s" +msgstr "" + +#: src/sort.c:4624 +#, c-format +msgid "using %s sorting rules" +msgstr "" + +#: src/sort.c:4627 +#, c-format +msgid "using simple byte comparison" +msgstr "" + +#: src/sort.c:4658 +#, c-format +msgid "extra operand %s not allowed with -%c" +msgstr "" + +#: src/split.c:187 +#, c-format +msgid "the suffix length needs to be at least %zu" +msgstr "" + +#: src/split.c:204 +#, c-format +msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" +msgstr "" + +#: src/split.c:208 +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 "" + +#: src/split.c:216 +#, 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" +" -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" +" -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" +" -u, --unbuffered immediately copy input to output with '-n r/...'\n" +msgstr "" + +#: src/split.c:229 +msgid "" +" --verbose print a diagnostic just before each\n" +" output file is opened\n" +msgstr "" + +#: src/split.c:236 +msgid "" +"\n" +"CHUNKS may be:\n" +"N split into N files based on size of input\n" +"K/N output Kth of N to stdout\n" +"l/N split into N files without splitting lines\n" +"l/K/N output Kth of N to stdout without splitting lines\n" +"r/N like 'l' but use round robin distribution\n" +"r/K/N likewise but only output Kth of N to stdout\n" +msgstr "" + +#: src/split.c:354 +#, c-format +msgid "output file suffixes exhausted" +msgstr "" + +#: src/split.c:366 +#, c-format +msgid "creating file %s\n" +msgstr "" + +#: src/split.c:375 +#, c-format +msgid "%s would overwrite input; aborting" +msgstr "" + +#: src/split.c:391 +#, c-format +msgid "failed to set FILE environment variable" +msgstr "" + +#: src/split.c:393 +#, c-format +msgid "executing with FILE=%s\n" +msgstr "" + +#: src/split.c:395 +#, c-format +msgid "failed to create pipe" +msgstr "" + +#: src/split.c:409 +#, c-format +msgid "closing prior pipe" +msgstr "" + +#: src/split.c:411 +#, c-format +msgid "closing output pipe" +msgstr "" + +#: src/split.c:415 +#, c-format +msgid "moving input pipe" +msgstr "" + +#: src/split.c:417 +#, c-format +msgid "closing input pipe" +msgstr "" + +#: src/split.c:422 +#, c-format +msgid "failed to run command: \"%s -c %s\"" +msgstr "" + +#: src/split.c:428 +#, c-format +msgid "failed to close input pipe" +msgstr "" + +#: src/split.c:464 +#, c-format +msgid "waiting for child process" +msgstr "" + +#: src/split.c:474 +#, c-format +msgid "with FILE=%s, signal %s from command: %s" +msgstr "" + +#: src/split.c:482 +#, c-format +msgid "with FILE=%s, exit %d from command: %s" +msgstr "" + +#: src/split.c:489 src/timeout.c:494 +#, c-format +msgid "unknown status from command (0x%X)" +msgstr "" + +#: src/split.c:1052 +#, c-format +msgid "cannot split in more than one way" +msgstr "" + +#: src/split.c:1065 src/split.c:1205 src/split.c:1376 +#, c-format +msgid "%s: invalid number of chunks" +msgstr "" + +#: src/split.c:1069 +#, c-format +msgid "%s: invalid chunk number" +msgstr "" + +#: src/split.c:1119 +#, c-format +msgid "%s: invalid suffix length" +msgstr "" + +#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180 +#, c-format +msgid "%s: invalid number of bytes" +msgstr "" + +#: src/split.c:1163 src/split.c:1310 +#, c-format +msgid "%s: invalid number of lines" +msgstr "" + +#: src/split.c:1236 +#, c-format +msgid "line count option -%s%c... is too large" +msgstr "" + +#: src/split.c:1248 +#, c-format +msgid "%s: invalid start value for numerical suffix" +msgstr "" + +#: src/split.c:1276 +#, c-format +msgid "%s: invalid IO block size" +msgstr "" + +#: src/split.c:1297 +#, c-format +msgid "--filter does not process a chunk extracted to stdout" +msgstr "" + +#: src/split.c:1334 +#, c-format +msgid "numerical suffix start value is too large for the suffix length" +msgstr "" + +#: src/split.c:1369 +#, c-format +msgid "%s: cannot determine file size" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/stat.c:173 +msgid "Michael Meskes" +msgstr "" + +#: src/stat.c:857 +#, c-format +msgid "failed to canonicalize %s" +msgstr "" + +#: src/stat.c:1069 +#, c-format +msgid "warning: unrecognized escape '\\%c'" +msgstr "" + +#: src/stat.c:1124 +#, c-format +msgid "%s: invalid directive" +msgstr "" + +#: src/stat.c:1170 +#, c-format +msgid "warning: backslash at end of format" +msgstr "" + +#: src/stat.c:1201 +#, c-format +msgid "using %s to denote standard input does not work in file system mode" +msgstr "" + +#: src/stat.c:1208 +#, c-format +msgid "cannot read file system information for %s" +msgstr "" + +#: src/stat.c:1228 +#, 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 +msgid "" +" File: \"%n\"\n" +" ID: %-8i Namelen: %-7l Type: %T\n" +"Block size: %-10s Fundamental block size: %S\n" +"Blocks: Total: %-10b Free: %-10f Available: %a\n" +"Inodes: Total: %-10c Free: %d\n" +msgstr "" + +#. TRANSLATORS: This string uses format specifiers from +#. 'stat --help' without --file-system, and NOT from printf. +#: src/stat.c:1287 +msgid "" +" File: %N\n" +" Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" +msgstr "" + +#. TRANSLATORS: This string uses format specifiers from +#. 'stat --help' without --file-system, and NOT from printf. +#: src/stat.c:1297 +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 +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 +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 +#, c-format +msgid "Context: %C\n" +msgstr "" + +#: src/stat.c:1332 +msgid "" +"Access: %x\n" +"Modify: %y\n" +"Change: %z\n" +" Birth: %w\n" +msgstr "" + +#: src/stat.c:1350 +msgid "Display file or file system status.\n" +msgstr "" + +#: src/stat.c:1356 +msgid "" +" -L, --dereference follow links\n" +" -f, --file-system display file system status instead of file status\n" +msgstr "" + +#: src/stat.c:1360 +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" +" -t, --terse print the information in terse form\n" +msgstr "" + +#: src/stat.c:1371 +msgid "" +"\n" +"The valid format sequences for files (without --file-system):\n" +"\n" +" %a access rights in octal\n" +" %A access rights in human readable form\n" +" %b number of blocks allocated (see %B)\n" +" %B the size in bytes of each block reported by %b\n" +" %C SELinux security context string\n" +msgstr "" + +#: src/stat.c:1380 +msgid "" +" %d device number in decimal\n" +" %D device number in hex\n" +" %f raw mode in hex\n" +" %F file type\n" +" %g group ID of owner\n" +" %G group name of owner\n" +msgstr "" + +#: src/stat.c:1388 +msgid "" +" %h number of hard links\n" +" %i inode number\n" +" %m mount point\n" +" %n file name\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" +msgstr "" + +#: src/stat.c:1399 +msgid "" +" %u user ID of owner\n" +" %U user name of owner\n" +" %w time of file birth, human-readable; - if unknown\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" +"\n" +msgstr "" + +#: src/stat.c:1413 +msgid "" +"Valid format sequences for file systems:\n" +"\n" +" %a free blocks available to non-superuser\n" +" %b total data blocks in file system\n" +" %c total file nodes in file system\n" +" %d free file nodes in file system\n" +" %f free blocks in file system\n" +msgstr "" + +#: src/stat.c:1422 +msgid "" +" %i file system ID in hex\n" +" %l maximum length of filenames\n" +" %n file name\n" +" %s block size (for faster transfers)\n" +" %S fundamental block size (for block counts)\n" +" %t file system type in hex\n" +" %T file system type in human readable form\n" +msgstr "" + +#: src/stdbuf.c:90 +#, c-format +msgid "Usage: %s OPTION... COMMAND\n" +msgstr "" + +#: src/stdbuf.c:91 +msgid "" +"Run COMMAND, with modified buffering operations for its standard streams.\n" +msgstr "" + +#: src/stdbuf.c:97 +msgid "" +" -i, --input=MODE adjust standard input stream buffering\n" +" -o, --output=MODE adjust standard output stream buffering\n" +" -e, --error=MODE adjust standard error stream buffering\n" +msgstr "" + +#: src/stdbuf.c:104 +msgid "" +"\n" +"If MODE is 'L' the corresponding stream will be line buffered.\n" +"This option is invalid with standard input.\n" +msgstr "" + +#: src/stdbuf.c:107 +msgid "" +"\n" +"If MODE is '0' the corresponding stream will be unbuffered.\n" +msgstr "" + +#: src/stdbuf.c:110 +msgid "" +"\n" +"Otherwise MODE is a number which may be followed by one of the following:\n" +"KB 1000, K 1024, MB 1000*1000, M 1024*1024, and so on for G, T, P, E, Z, Y.\n" +"In this case the corresponding stream will be fully buffered with the " +"buffer\n" +"size set to MODE bytes.\n" +msgstr "" + +#: src/stdbuf.c:116 +msgid "" +"\n" +"NOTE: If COMMAND adjusts the buffering of its standard streams ('tee' does\n" +"for e.g.) then that will override corresponding settings changed by " +"'stdbuf'.\n" +"Also some filters (like 'dd' and 'cat' etc.) don't use streams for I/O,\n" +"and are thus unaffected by 'stdbuf' settings.\n" +msgstr "" + +#: src/stdbuf.c:226 +#, c-format +msgid "failed to find %s" +msgstr "" + +#: src/stdbuf.c:246 src/stdbuf.c:278 +#, c-format +msgid "failed to update the environment with %s" +msgstr "" + +#: src/stdbuf.c:320 +#, c-format +msgid "line buffering stdin is meaningless" +msgstr "" + +#: src/stty.c:513 +#, 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 "" + +#: src/stty.c:519 +msgid "Print or change terminal characteristics.\n" +msgstr "" + +#: src/stty.c:525 +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 +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 +msgid "" +"\n" +"Special characters:\n" +" * dsusp CHAR CHAR will send a terminal stop signal once input flushed\n" +" eof CHAR CHAR will send an end of file (terminate the input)\n" +" eol CHAR CHAR will end the line\n" +msgstr "" + +#: src/stty.c:544 +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 "" + +#: src/stty.c:550 +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 "" + +#: src/stty.c:556 +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 "" + +#: src/stty.c:562 +msgid "" +"\n" +"Special settings:\n" +" N set the input and output speeds to N bauds\n" +" * cols N tell the kernel that the terminal has N columns\n" +" * columns N same as cols N\n" +msgstr "" + +#: src/stty.c:569 +msgid "" +" ispeed N set the input speed to N\n" +" * line N use line discipline N\n" +" min N with -icanon, set N characters minimum for a completed " +"read\n" +" ospeed N set the output speed to N\n" +msgstr "" + +#: src/stty.c:575 +msgid "" +" * rows N tell the kernel that the terminal has N rows\n" +" * size print the number of rows and columns according to the " +"kernel\n" +" speed print the terminal speed\n" +" time N with -icanon, set read timeout of N tenths of a second\n" +msgstr "" + +#: src/stty.c:581 +msgid "" +"\n" +"Control settings:\n" +" [-]clocal disable modem control signals\n" +" [-]cread allow input to be received\n" +" * [-]crtscts enable RTS/CTS handshaking\n" +" * [-]cdtrdsr enable DTR/DSR handshaking\n" +" csN set character size to N bits, N in [5..8]\n" +msgstr "" + +#: src/stty.c:590 +msgid "" +" [-]cstopb use two stop bits per character (one with '-')\n" +" [-]hup send a hangup signal when the last process closes the tty\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" +msgstr "" + +#: src/stty.c:597 +msgid "" +"\n" +"Input settings:\n" +" [-]brkint breaks cause an interrupt signal\n" +" [-]icrnl translate carriage return to newline\n" +" [-]ignbrk ignore break characters\n" +" [-]igncr ignore carriage return\n" +msgstr "" + +#: src/stty.c:605 +msgid "" +" [-]ignpar ignore characters with parity errors\n" +" * [-]imaxbel beep and do not flush a full input buffer on a character\n" +" [-]inlcr translate newline to carriage return\n" +" [-]inpck enable input parity checking\n" +" [-]istrip clear high (8th) bit of input characters\n" +msgstr "" + +#: src/stty.c:612 +msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" +msgstr "" + +#: src/stty.c:615 +msgid "" +" * [-]iuclc translate uppercase characters to lowercase\n" +" * [-]ixany let any character restart output, not only start character\n" +" [-]ixoff enable sending of start/stop characters\n" +" [-]ixon enable XON/XOFF flow control\n" +" [-]parmrk mark parity errors (with a 255-0-character sequence)\n" +" [-]tandem same as [-]ixoff\n" +msgstr "" + +#: src/stty.c:623 +msgid "" +"\n" +"Output settings:\n" +" * bsN backspace delay style, N in [0..1]\n" +" * crN carriage return delay style, N in [0..3]\n" +" * ffN form feed delay style, N in [0..1]\n" +" * nlN newline delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:631 +msgid "" +" * [-]ocrnl translate carriage return to newline\n" +" * [-]ofdel use delete characters for fill instead of null 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 +msgid "" +" * [-]onocr do not print carriage returns in the first column\n" +" [-]opost postprocess output\n" +" * tabN horizontal tab delay style, N in [0..3]\n" +" * tabs same as tab0\n" +" * -tabs same as tab3\n" +" * vtN vertical tab delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:647 +msgid "" +"\n" +"Local settings:\n" +" [-]crterase echo erase characters as backspace-space-backspace\n" +" * crtkill kill all line by obeying the echoprt and echoe settings\n" +" * -crtkill kill all line by obeying the echoctl and echok settings\n" +msgstr "" + +#: src/stty.c:654 +msgid "" +" * [-]ctlecho echo control characters in hat notation ('^c')\n" +" [-]echo echo input characters\n" +" * [-]echoctl same as [-]ctlecho\n" +" [-]echoe same as [-]crterase\n" +" [-]echok echo a newline after a kill character\n" +msgstr "" + +#: src/stty.c:661 +msgid "" +" * [-]echoke same as [-]crtkill\n" +" [-]echonl echo newline even if not echoing other characters\n" +" * [-]echoprt echo erased characters backward, between '\\' and '/'\n" +" [-]icanon enable erase, kill, werase, and rprnt special characters\n" +" [-]iexten enable non-POSIX special characters\n" +msgstr "" + +#: src/stty.c:668 +msgid "" +" [-]isig enable interrupt, quit, and suspend special characters\n" +" [-]noflsh disable flushing after interrupt and quit special " +"characters\n" +" * [-]prterase same as [-]echoprt\n" +" * [-]tostop stop background jobs that try to write to the terminal\n" +" * [-]xcase with icanon, escape with '\\' for uppercase characters\n" +msgstr "" + +#: src/stty.c:675 +msgid "" +"\n" +"Combination settings:\n" +" * [-]LCASE same as [-]lcase\n" +" cbreak same as -icanon\n" +" -cbreak same as icanon\n" +msgstr "" + +#: src/stty.c:682 +msgid "" +" cooked same as brkint ignpar istrip icrnl ixon opost isig\n" +" icanon, eof and eol characters to their default values\n" +" -cooked same as raw\n" +" crt same as echoe echoctl echoke\n" +msgstr "" + +#: src/stty.c:688 +msgid "" +" dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" +" kill ^u\n" +" * [-]decctlq same as [-]ixany\n" +" ek erase and kill characters to their default values\n" +" evenp same as parenb -parodd cs7\n" +msgstr "" + +#: src/stty.c:695 +msgid "" +" -evenp same as -parenb cs8\n" +" * [-]lcase same as xcase iuclc olcuc\n" +" litout same as -parenb -istrip -opost cs8\n" +" -litout same as parenb istrip opost cs7\n" +" nl same as -icrnl -onlcr\n" +" -nl same as icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" +msgstr "" + +#: src/stty.c:703 +msgid "" +" oddp same as parenb parodd cs7\n" +" -oddp same as -parenb cs8\n" +" [-]parity same as [-]evenp\n" +" pass8 same as -parenb -istrip cs8\n" +" -pass8 same as parenb istrip cs7\n" +msgstr "" + +#: src/stty.c:710 +msgid "" +" raw same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" +" -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n" +" -imaxbel -opost -isig -icanon -xcase min 1 time 0\n" +" -raw same as cooked\n" +msgstr "" + +#: src/stty.c:716 +msgid "" +" sane same as 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, all special\n" +" characters to their default values\n" +msgstr "" + +#: src/stty.c:724 +msgid "" +"\n" +"Handle the tty line connected to standard input. Without arguments,\n" +"prints baud rate, line discipline, and deviations from stty sane. In\n" +"settings, CHAR is taken literally, or coded as in ^c, 0x37, 0177 or\n" +"127; special values ^- or undef used to disable special characters.\n" +msgstr "" + +#: src/stty.c:796 +#, c-format +msgid "only one device may be specified" +msgstr "" + +#: src/stty.c:826 +#, c-format +msgid "" +"the options for verbose and stty-readable output styles are\n" +"mutually exclusive" +msgstr "" + +#: src/stty.c:832 +#, c-format +msgid "when specifying an output style, modes may not be set" +msgstr "" + +#: src/stty.c:847 +#, c-format +msgid "%s: couldn't reset non-blocking mode" +msgstr "" + +#: src/stty.c:892 src/stty.c:1002 +#, 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 +#, c-format +msgid "missing argument to %s" +msgstr "" + +#: src/stty.c:983 +#, c-format +msgid "invalid line discipline %s" +msgstr "" + +#: src/stty.c:1053 +#, c-format +msgid "%s: unable to perform all requested operations" +msgstr "" + +#: src/stty.c:1399 +#, c-format +msgid "%s: no size information for this device" +msgstr "" + +#: src/stty.c:1920 +#, c-format +msgid "invalid integer argument %s" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/sum.c:37 +msgid "Kayvan Aghaiepour" +msgstr "" + +#: src/sum.c:62 +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 "" + +#: src/sync.c:41 +msgid "" +"Force changed blocks to disk, update the super block.\n" +"\n" +msgstr "" + +#: src/sync.c:69 +#, c-format +msgid "ignoring all arguments" +msgstr "" + +#: src/system.h:343 +#, c-format +msgid "" +"\n" +"NOTE: your shell may have its own version of %s, which usually supersedes\n" +"the version described here. Please refer to your shell's documentation\n" +"for details about the options it supports.\n" +msgstr "" + +#: src/system.h:349 +msgid " --help display this help and exit\n" +msgstr "" + +#: src/system.h:351 +msgid " --version output version information and exit\n" +msgstr "" + +#: src/system.h:544 +msgid "" +"\n" +"Mandatory arguments to long options are mandatory for short options too.\n" +msgstr "" + +#: src/system.h:552 +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" +msgstr "" + +#: src/system.h:561 +#, c-format +msgid "" +"\n" +"Display values are in units of the first available SIZE from --block-size,\n" +"and the %s_BLOCK_SIZE, BLOCK_SIZE and BLOCKSIZE environment variables.\n" +"Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n" +msgstr "" + +#: src/system.h:571 +#, c-format +msgid "" +"\n" +"Report %s bugs to %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 +#, c-format +msgid "Report %s translation bugs to <http://translationproject.org/team/>\n" +msgstr "" + +#: src/system.h:589 +#, c-format +msgid "For complete documentation, run: info coreutils '%s invocation'\n" +msgstr "" + +#: src/system.h:596 +#, c-format +msgid "Try '%s --help' for more information.\n" +msgstr "" + +#: src/system.h:628 +#, c-format +msgid "" +"WARNING: Circular directory structure.\n" +"This almost certainly means that you have a corrupted file system.\n" +"NOTIFY YOUR SYSTEM MANAGER.\n" +"The following directory is part of the cycle:\n" +" %s\n" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/tac.c:58 +msgid "Jay Lepreau" +msgstr "" + +#: src/tac.c:137 +msgid "" +"Write each FILE to standard output, last line first.\n" +"With no FILE, or when FILE is -, read standard input.\n" +msgstr "" + +#: src/tac.c:144 +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 "" + +#: src/tac.c:234 src/tac.c:335 +#, c-format +msgid "%s: seek failed" +msgstr "" + +#: src/tac.c:263 +#, c-format +msgid "record too large" +msgstr "" + +#: src/tac.c:450 +#, c-format +msgid "failed to create temporary file in %s" +msgstr "" + +#: src/tac.c:458 +#, c-format +msgid "failed to open %s for writing" +msgstr "" + +#: src/tac.c:475 +#, c-format +msgid "failed to rewind stream for %s" +msgstr "" + +#: src/tac.c:511 src/tac.c:518 +#, c-format +msgid "%s: write error" +msgstr "" + +#: src/tac.c:571 +#, c-format +msgid "failed to open %s for reading" +msgstr "" + +#: src/tac.c:629 +#, c-format +msgid "separator cannot be empty" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/tail.c:71 +msgid "Ian Lance Taylor" +msgstr "" + +#: src/tail.c:262 +#, 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 "" + +#: 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" +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" +" -F same as --follow=name --retry\n" +msgstr "" + +#: src/tail.c:281 +#, 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" +" --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 "" + +#: src/tail.c:294 +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" +msgstr "" + +#: src/tail.c:301 +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" +" -v, --verbose always output headers giving file names\n" +msgstr "" + +#: src/tail.c:310 +msgid "" +"\n" +"If the first character of K (the number of bytes or lines) is a '+',\n" +"print beginning with the Kth item from the start of each file, otherwise,\n" +"print the last K items in the file. K 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" +"\n" +msgstr "" + +#: src/tail.c:319 +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. This default behavior is not desirable when you really want to\n" +"track the actual name of the file, not the file descriptor (e.g., log\n" +"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 "" + +#: src/tail.c:378 +#, 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 +#, c-format +msgid "%s: cannot seek to end-relative offset %s" +msgstr "" + +#: src/tail.c:894 +#, c-format +msgid "cannot determine location of %s. reverting to polling" +msgstr "" + +#: src/tail.c:906 +#, c-format +msgid "" +"unrecognized file system type 0x%08lx for %s. please report this to %s. " +"reverting to polling" +msgstr "" + +#: src/tail.c:963 +#, c-format +msgid "%s has become inaccessible" +msgstr "" + +#: src/tail.c:980 +#, c-format +msgid "%s has been replaced with an untailable file; giving up on this name" +msgstr "" + +#: src/tail.c:989 +#, c-format +msgid "%s has been replaced with a remote file. giving up on this name" +msgstr "" + +#: src/tail.c:1010 +#, c-format +msgid "%s has become accessible" +msgstr "" + +#: src/tail.c:1018 +#, c-format +msgid "%s has appeared; following end of new file" +msgstr "" + +#: src/tail.c:1029 +#, c-format +msgid "%s has been replaced; following end of new file" +msgstr "" + +#: src/tail.c:1130 +#, c-format +msgid "%s: cannot change nonblocking mode" +msgstr "" + +#: src/tail.c:1172 src/tail.c:1287 +#, c-format +msgid "%s: file truncated" +msgstr "" + +#: src/tail.c:1196 src/tail.c:1442 +#, c-format +msgid "no files remaining" +msgstr "" + +#: src/tail.c:1369 +#, c-format +msgid "cannot watch parent directory of %s" +msgstr "" + +#: src/tail.c:1372 src/tail.c:1387 +#, c-format +msgid "inotify resources exhausted" +msgstr "" + +#: src/tail.c:1390 src/tail.c:1519 +#, c-format +msgid "cannot watch %s" +msgstr "" + +#: src/tail.c:1473 +#, c-format +msgid "error monitoring inotify event" +msgstr "" + +#: src/tail.c:1493 +#, c-format +msgid "error reading inotify event" +msgstr "" + +#: src/tail.c:1786 +#, c-format +msgid "%s: cannot follow end of this type of file; giving up on this name" +msgstr "" + +#: src/tail.c:1903 +#, c-format +msgid "number in %s is too large" +msgstr "" + +#: src/tail.c:1975 +#, c-format +msgid "%s: invalid maximum number of unchanged stats between opens" +msgstr "" + +#: src/tail.c:1991 +#, c-format +msgid "%s: invalid PID" +msgstr "" + +#: src/tail.c:2010 +#, c-format +msgid "%s: invalid number of seconds" +msgstr "" + +#: src/tail.c:2026 +#, c-format +msgid "option used in invalid context -- %c" +msgstr "" + +#: src/tail.c:2034 +#, c-format +msgid "warning: --retry is useful mainly when following by name" +msgstr "" + +#: src/tail.c:2038 +#, c-format +msgid "warning: PID ignored; --pid=PID is useful only when following" +msgstr "" + +#: src/tail.c:2041 +#, c-format +msgid "warning: --pid=PID is not supported on this system" +msgstr "" + +#: src/tail.c:2142 +#, c-format +msgid "cannot follow %s by name" +msgstr "" + +#: src/tail.c:2148 +#, c-format +msgid "warning: following standard input indefinitely is ineffective" +msgstr "" + +#: src/tail.c:2209 +#, c-format +msgid "inotify cannot be used, reverting to polling" +msgstr "" + +#: src/tee.c:63 +msgid "" +"Copy standard input to each FILE, and also to standard output.\n" +"\n" +" -a, --append append to the given FILEs, do not overwrite\n" +" -i, --ignore-interrupts ignore interrupt signals\n" +msgstr "" + +#: src/tee.c:71 +msgid "" +"\n" +"If a FILE is -, copy again to standard output.\n" +msgstr "" + +#: src/test.c:123 +#, c-format +msgid "missing argument after %s" +msgstr "" + +#: src/test.c:159 +#, c-format +msgid "invalid integer %s" +msgstr "" + +#: src/test.c:241 +msgid "')' expected" +msgstr "" + +#: src/test.c:244 +#, c-format +msgid "')' expected, found %s" +msgstr "" + +#: src/test.c:260 src/test.c:618 +#, c-format +msgid "%s: unary operator expected" +msgstr "" + +#: src/test.c:329 +msgid "-nt does not accept -l" +msgstr "" + +#: src/test.c:342 +msgid "-ef does not accept -l" +msgstr "" + +#: src/test.c:358 +msgid "-ot does not accept -l" +msgstr "" + +#: src/test.c:367 +msgid "unknown binary operator" +msgstr "" + +#: src/test.c:646 +#, c-format +msgid "%s: binary operator expected" +msgstr "" + +#: src/test.c:704 +msgid "" +"Usage: test EXPRESSION\n" +" or: test\n" +" or: [ EXPRESSION ]\n" +" or: [ ]\n" +" or: [ OPTION\n" +msgstr "" + +#: src/test.c:711 +msgid "" +"Exit with the status determined by EXPRESSION.\n" +"\n" +msgstr "" + +#: src/test.c:717 +msgid "" +"\n" +"An omitted EXPRESSION defaults to false. Otherwise,\n" +"EXPRESSION is true or false and sets exit status. It is one of:\n" +msgstr "" + +#: src/test.c:722 +msgid "" +"\n" +" ( EXPRESSION ) EXPRESSION is true\n" +" ! EXPRESSION EXPRESSION is false\n" +" EXPRESSION1 -a EXPRESSION2 both EXPRESSION1 and EXPRESSION2 are true\n" +" EXPRESSION1 -o EXPRESSION2 either EXPRESSION1 or EXPRESSION2 is true\n" +msgstr "" + +#: src/test.c:729 +msgid "" +"\n" +" -n STRING the length of STRING is nonzero\n" +" STRING equivalent to -n STRING\n" +" -z STRING the length of STRING is zero\n" +" STRING1 = STRING2 the strings are equal\n" +" STRING1 != STRING2 the strings are not equal\n" +msgstr "" + +#: src/test.c:737 +msgid "" +"\n" +" INTEGER1 -eq INTEGER2 INTEGER1 is equal to INTEGER2\n" +" INTEGER1 -ge INTEGER2 INTEGER1 is greater than or equal to INTEGER2\n" +" INTEGER1 -gt INTEGER2 INTEGER1 is greater than INTEGER2\n" +" INTEGER1 -le INTEGER2 INTEGER1 is less than or equal to INTEGER2\n" +" INTEGER1 -lt INTEGER2 INTEGER1 is less than INTEGER2\n" +" INTEGER1 -ne INTEGER2 INTEGER1 is not equal to INTEGER2\n" +msgstr "" + +#: src/test.c:746 +msgid "" +"\n" +" FILE1 -ef FILE2 FILE1 and FILE2 have the same device and inode numbers\n" +" FILE1 -nt FILE2 FILE1 is newer (modification date) than FILE2\n" +" FILE1 -ot FILE2 FILE1 is older than FILE2\n" +msgstr "" + +#: src/test.c:752 +msgid "" +"\n" +" -b FILE FILE exists and is block special\n" +" -c FILE FILE exists and is character special\n" +" -d FILE FILE exists and is a directory\n" +" -e FILE FILE exists\n" +msgstr "" + +#: src/test.c:759 +msgid "" +" -f FILE FILE exists and is a regular file\n" +" -g FILE FILE exists and is set-group-ID\n" +" -G FILE FILE exists and is owned by the effective group ID\n" +" -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 "" + +#: src/test.c:766 +msgid "" +" -L FILE FILE exists and is a symbolic link (same as -h)\n" +" -O FILE FILE exists and is owned by the effective user ID\n" +" -p FILE FILE exists and is a named pipe\n" +" -r FILE FILE exists and read permission is granted\n" +" -s FILE FILE exists and has a size greater than zero\n" +msgstr "" + +#: src/test.c:773 +msgid "" +" -S FILE FILE exists and is a socket\n" +" -t FD file descriptor FD is opened on a terminal\n" +" -u FILE FILE exists and its set-user-ID bit is set\n" +" -w FILE FILE exists and write permission is granted\n" +" -x FILE FILE exists and execute (or search) permission is granted\n" +msgstr "" + +#: src/test.c:780 +msgid "" +"\n" +"Except for -h and -L, all FILE-related tests dereference symbolic links.\n" +"Beware that parentheses need to be escaped (e.g., by backslashes) for " +"shells.\n" +"INTEGER may also be -l STRING, which evaluates to the length of STRING.\n" +msgstr "" + +#: src/test.c:786 +msgid "" +"\n" +"NOTE: [ honors the --help and --version options, but test does not.\n" +"test treats each of those as it treats any other nonempty STRING.\n" +msgstr "" + +#: src/test.c:791 +msgid "test and/or [" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/test.c:803 +msgid "Kevin Braunsdorf" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/test.c:804 +msgid "Matthew Bradburn" +msgstr "" + +#: src/test.c:858 +msgid "missing ']'" +msgstr "" + +#: src/test.c:872 +#, c-format +msgid "extra argument %s" +msgstr "" + +#: src/timeout.c:112 +#, c-format +msgid "warning: sigprocmask" +msgstr "" + +#: src/timeout.c:145 +#, c-format +msgid "warning: timer_settime" +msgstr "" + +#: src/timeout.c:150 +#, c-format +msgid "warning: timer_create" +msgstr "" + +#: src/timeout.c:225 +#, c-format +msgid "" +"Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" +" or: %s [OPTION]\n" +msgstr "" + +#: src/timeout.c:229 +msgid "Start COMMAND, and kill it if still running after DURATION.\n" +msgstr "" + +#: src/timeout.c:235 +msgid "" +" --preserve-status\n" +" exit with the same status as COMMAND, even when the\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" +" -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" +" -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" +msgstr "" + +#: src/timeout.c:254 +msgid "" +"\n" +"DURATION is a floating point number with an optional suffix:\n" +"'s' for seconds (the default), 'm' for minutes, 'h' for hours or 'd' for " +"days.\n" +msgstr "" + +#: src/timeout.c:259 +msgid "" +"\n" +"If the command times out, and --preserve-status is not set, then exit with\n" +"status 124. Otherwise, exit with the status of COMMAND. If no signal\n" +"is specified, send the TERM signal upon timeout. The TERM signal kills\n" +"any process that does not block or catch that signal. It may be necessary\n" +"to use the KILL (9) signal, since this signal cannot be caught, in which\n" +"case the exit status is 128+9 rather than 124.\n" +msgstr "" + +#: src/timeout.c:363 +#, c-format +msgid "warning: disabling core dumps failed" +msgstr "" + +#: src/timeout.c:471 +#, c-format +msgid "error waiting for command" +msgstr "" + +#: src/timeout.c:482 +#, c-format +msgid "the monitored command dumped core" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/touch.c:43 +msgid "Jim Kingdon" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/touch.c:45 +msgid "Randy Smith" +msgstr "" + +#: src/touch.c:115 src/touch.c:309 +#, c-format +msgid "invalid date format %s" +msgstr "" + +#: src/touch.c:191 +#, c-format +msgid "cannot touch %s" +msgstr "" + +#: src/touch.c:197 +#, c-format +msgid "setting times of %s" +msgstr "" + +#: src/touch.c:213 +msgid "" +"Update the access and modification times of each FILE to the current time.\n" +"\n" +"A FILE argument that does not exist is created empty, unless -c or -h\n" +"is supplied.\n" +"\n" +"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 "" + +#: src/touch.c:225 +msgid "" +" -a change only the access time\n" +" -c, --no-create do not create any files\n" +" -d, --date=STRING parse STRING and use it instead of current time\n" +" -f (ignored)\n" +msgstr "" + +#: src/touch.c:231 +msgid "" +" -h, --no-dereference affect each symbolic link instead of any " +"referenced\n" +" file (useful only on systems that can change the\n" +" timestamps of a symlink)\n" +" -m change only the modification time\n" +msgstr "" + +#: src/touch.c:237 +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" +" --time=WORD change the specified time:\n" +" WORD is access, atime, or use: equivalent to -a\n" +" WORD is modify or mtime: equivalent to -m\n" +msgstr "" + +#: src/touch.c:246 +msgid "" +"\n" +"Note that the -d and -t options accept different time-date formats.\n" +msgstr "" + +#: src/touch.c:335 +#, c-format +msgid "cannot specify times from more than one source" +msgstr "" + +#: src/touch.c:409 +#, c-format +msgid "" +"warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'" +msgstr "" + +#: src/tr.c:286 +#, c-format +msgid "Usage: %s [OPTION]... SET1 [SET2]\n" +msgstr "" + +#: src/tr.c:290 +msgid "" +"Translate, squeeze, and/or delete characters from standard input,\n" +"writing to standard output.\n" +"\n" +" -c, -C, --complement use the complement of SET1\n" +" -d, --delete delete characters in SET1, do not translate\n" +" -s, --squeeze-repeats replace each input sequence of a repeated " +"character\n" +" that is listed in SET1 with a single occurrence\n" +" of that character\n" +" -t, --truncate-set1 first truncate SET1 to length of SET2\n" +msgstr "" + +#: src/tr.c:303 +msgid "" +"\n" +"SETs are specified as strings of characters. Most represent themselves.\n" +"Interpreted sequences are:\n" +"\n" +" \\NNN character with octal value NNN (1 to 3 octal digits)\n" +" \\\\ backslash\n" +" \\a audible BEL\n" +" \\b backspace\n" +" \\f form feed\n" +" \\n new line\n" +" \\r return\n" +" \\t horizontal tab\n" +msgstr "" + +#: src/tr.c:317 +msgid "" +" \\v vertical tab\n" +" CHAR1-CHAR2 all characters from CHAR1 to CHAR2 in ascending order\n" +" [CHAR*] in SET2, copies of CHAR until length of SET1\n" +" [CHAR*REPEAT] REPEAT copies of CHAR, REPEAT octal if starting with 0\n" +" [:alnum:] all letters and digits\n" +" [:alpha:] all letters\n" +" [:blank:] all horizontal whitespace\n" +" [:cntrl:] all control characters\n" +" [:digit:] all digits\n" +msgstr "" + +#: src/tr.c:328 +msgid "" +" [:graph:] all printable characters, not including space\n" +" [:lower:] all lower case letters\n" +" [:print:] all printable characters, including space\n" +" [:punct:] all punctuation characters\n" +" [:space:] all horizontal or vertical whitespace\n" +" [:upper:] all upper case letters\n" +" [:xdigit:] all hexadecimal digits\n" +" [=CHAR=] all characters which are equivalent to CHAR\n" +msgstr "" + +#: src/tr.c:338 +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. 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. -s uses SET1 if not\n" +"translating nor deleting; else squeezing uses SET2 and occurs after\n" +"translation or deletion.\n" +msgstr "" + +#: src/tr.c:509 +#, 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 "" + +#: src/tr.c:518 +#, c-format +msgid "warning: an unescaped backslash at end of string is not portable" +msgstr "" + +#: src/tr.c:673 +#, c-format +msgid "range-endpoints of '%s-%s' are in reverse collating sequence order" +msgstr "" + +#: src/tr.c:829 +#, c-format +msgid "invalid repeat count %s in [c*n] construct" +msgstr "" + +#: src/tr.c:910 +#, c-format +msgid "missing character class name '[::]'" +msgstr "" + +#: src/tr.c:913 +#, c-format +msgid "missing equivalence class character '[==]'" +msgstr "" + +#: src/tr.c:928 +#, c-format +msgid "invalid character class %s" +msgstr "" + +#: src/tr.c:947 +#, c-format +msgid "%s: equivalence class operand must be a single character" +msgstr "" + +#: src/tr.c:1229 +#, c-format +msgid "misaligned [:upper:] and/or [:lower:] construct" +msgstr "" + +#: src/tr.c:1335 +#, c-format +msgid "too many characters in set" +msgstr "" + +#: src/tr.c:1420 +#, c-format +msgid "" +"when translating with string1 longer than string2,\n" +"the latter string must not end with a character class" +msgstr "" + +#: src/tr.c:1480 +#, c-format +msgid "the [c*] repeat construct may not appear in string1" +msgstr "" + +#: src/tr.c:1490 +#, c-format +msgid "only one [c*] repeat construct may appear in string2" +msgstr "" + +#: src/tr.c:1498 +#, c-format +msgid "[=c=] expressions may not appear in string2 when translating" +msgstr "" + +#: src/tr.c:1505 +#, c-format +msgid "" +"when translating, the only character classes that may appear in\n" +"string2 are 'upper' and 'lower'" +msgstr "" + +#: src/tr.c:1520 +#, c-format +msgid "when not truncating set1, string2 must be non-empty" +msgstr "" + +#: src/tr.c:1529 +#, c-format +msgid "" +"when translating with complemented character classes,\n" +"string2 must map all characters in the domain to one" +msgstr "" + +#: src/tr.c:1538 +#, c-format +msgid "the [c*] construct may appear in string2 only when translating" +msgstr "" + +#: src/tr.c:1788 +msgid "Two strings must be given when both deleting and squeezing repeats." +msgstr "" + +#: src/tr.c:1790 +msgid "Two strings must be given when translating." +msgstr "" + +#: src/tr.c:1800 +msgid "Only one string may be given when deleting without squeezing repeats." +msgstr "" + +#: src/true.c:38 +#, c-format +msgid "" +"Usage: %s [ignored command line arguments]\n" +" or: %s OPTION\n" +msgstr "" + +#: src/true.c:45 +msgid "Exit with a status code indicating success." +msgstr "" + +#: src/true.c:46 +msgid "Exit with a status code indicating failure." +msgstr "" + +#: src/truncate.c:96 +#, c-format +msgid "Usage: %s OPTION... FILE...\n" +msgstr "" + +#: src/truncate.c:97 +msgid "" +"Shrink or extend the size of each FILE to the specified size\n" +"\n" +"A FILE argument that does not exist is created.\n" +"\n" +"If a FILE is larger than the specified size, the extra data is lost.\n" +"If a FILE is shorter, it is extended and the extended part (hole)\n" +"reads as zero bytes.\n" +msgstr "" + +#: src/truncate.c:109 +msgid " -c, --no-create do not create any files\n" +msgstr "" + +#: src/truncate.c:112 +msgid "" +" -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" +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" +msgstr "" + +#: src/truncate.c:121 +msgid "" +"\n" +"SIZE may also be prefixed by one of the following modifying characters:\n" +"'+' extend by, '-' reduce by, '<' at most, '>' at least,\n" +"'/' round down to multiple of, '%' round up to multiple of.\n" +msgstr "" + +#: src/truncate.c:149 +#, c-format +msgid "overflow in %<PRIdMAX> * %<PRIdMAX> byte blocks for file %s" +msgstr "" + +#: src/truncate.c:173 +#, c-format +msgid "%s has unusable, apparently negative size" +msgstr "" + +#: src/truncate.c:183 src/truncate.c:384 +#, c-format +msgid "cannot get the size of %s" +msgstr "" + +#: src/truncate.c:205 +#, c-format +msgid "overflow rounding up size of file %s" +msgstr "" + +#: src/truncate.c:215 +#, c-format +msgid "overflow extending size of file %s" +msgstr "" + +#: src/truncate.c:230 +#, c-format +msgid "failed to truncate %s at %<PRIdMAX> bytes" +msgstr "" + +#: src/truncate.c:303 +#, c-format +msgid "multiple relative modifiers specified" +msgstr "" + +#: src/truncate.c:333 +#, c-format +msgid "you must specify either %s or %s" +msgstr "" + +#: src/truncate.c:340 +#, c-format +msgid "you must specify a relative %s with %s" +msgstr "" + +#: src/truncate.c:347 +#, c-format +msgid "%s was specified but %s was not" +msgstr "" + +#: src/truncate.c:404 +#, c-format +msgid "cannot open %s for writing" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/tsort.c:40 +msgid "Mark Kettenis" +msgstr "" + +#: src/tsort.c:82 +#, c-format +msgid "" +"Usage: %s [OPTION] [FILE]\n" +"Write totally ordered list consistent with the partial ordering in FILE.\n" +"With no FILE, or when FILE is -, read standard input.\n" +"\n" +msgstr "" + +#: src/tsort.c:472 +#, c-format +msgid "%s: input contains an odd number of tokens" +msgstr "" + +#: src/tsort.c:518 +#, c-format +msgid "%s: input contains a loop:" +msgstr "" + +#: src/tty.c:65 +msgid "" +"Print the file name of the terminal connected to standard input.\n" +"\n" +" -s, --silent, --quiet print nothing, only return an exit status\n" +msgstr "" + +#: src/tty.c:120 +msgid "not a tty" +msgstr "" + +#: src/uname.c:124 +msgid "" +"Print certain system information. With no OPTION, same as -s.\n" +"\n" +" -a, --all print all information, in the following order,\n" +" except omit -p and -i if unknown:\n" +" -s, --kernel-name print the kernel name\n" +" -n, --nodename print the network node hostname\n" +" -r, --kernel-release print the kernel release\n" +msgstr "" + +#: src/uname.c:133 +msgid "" +" -v, --kernel-version print the kernel version\n" +" -m, --machine print the machine hardware name\n" +" -p, --processor print the processor type or \"unknown\"\n" +" -i, --hardware-platform print the hardware platform or \"unknown\"\n" +" -o, --operating-system print the operating system\n" +msgstr "" + +#: src/uname.c:143 +msgid "" +"Print machine architecture.\n" +"\n" +msgstr "" + +#: src/uname.c:286 +#, c-format +msgid "cannot get system name" +msgstr "" + +#: src/unexpand.c:117 +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 "" + +#: src/unexpand.c:124 +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 "" + +#: src/unexpand.c:152 +#, c-format +msgid "tabs are too far apart" +msgstr "" + +#: src/unexpand.c:504 +#, c-format +msgid "tab stop value is too large" +msgstr "" + +#: src/uniq.c:134 +#, c-format +msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n" +msgstr "" + +#: src/uniq.c:138 +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 "" + +#: src/uniq.c:147 +msgid "" +" -c, --count prefix lines by the number of occurrences\n" +" -d, --repeated only print duplicate lines\n" +msgstr "" + +#: src/uniq.c:151 +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 +msgid " -w, --check-chars=N compare no more than N characters in lines\n" +msgstr "" + +#: src/uniq.c:166 +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 +msgid "" +"\n" +"Note: 'uniq' does not detect repeated lines unless they are adjacent.\n" +"You may want to sort the input first, or use 'sort -u' without 'uniq'.\n" +"Also, comparisons honor the rules specified by 'LC_COLLATE'.\n" +msgstr "" + +#: src/uniq.c:358 +#, c-format +msgid "too many repeated lines" +msgstr "" + +#: src/uniq.c:521 +msgid "invalid number of fields to skip" +msgstr "" + +#: src/uniq.c:530 +msgid "invalid number of bytes to skip" +msgstr "" + +#: src/uniq.c:539 +msgid "invalid number of bytes to compare" +msgstr "" + +#: src/uniq.c:558 +#, c-format +msgid "printing all duplicated lines and repeat counts is meaningless" +msgstr "" + +#: src/unlink.c:45 +#, c-format +msgid "" +"Usage: %s FILE\n" +" or: %s OPTION\n" +msgstr "" + +#: src/unlink.c:48 +msgid "" +"Call the unlink function to remove the specified FILE.\n" +"\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" +msgstr "" + +#. TRANSLATORS: This prints the current clock time. +#: src/uptime.c:136 +msgid " %H:%M%P " +msgstr "" + +#: src/uptime.c:138 +#, c-format +msgid " ??:???? " +msgstr "" + +#: src/uptime.c:140 +#, c-format +msgid "up ???? days ??:??, " +msgstr "" + +#: src/uptime.c:144 +#, c-format +msgid "up %ld day %2d:%02d, " +msgid_plural "up %ld days %2d:%02d, " +msgstr[0] "" +msgstr[1] "" + +#: src/uptime.c:149 +#, c-format +msgid "up %2d:%02d, " +msgstr "" + +#: src/uptime.c:151 +#, c-format +msgid "%lu user" +msgid_plural "%lu users" +msgstr[0] "" +msgstr[1] "" + +#: src/uptime.c:161 +#, c-format +msgid ", load average: %.2f" +msgstr "" + +#: src/uptime.c:197 +#, 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 "" + +#: src/uptime.c:206 +#, c-format +msgid "" +" Processes in\n" +"an uninterruptible sleep state also contribute to the load average.\n" +msgstr "" + +#: src/uptime.c:210 +#, c-format +msgid "\n" +msgstr "" + +#: src/uptime.c:212 +#, c-format +msgid "" +"If FILE is not specified, use %s. %s as FILE is common.\n" +"\n" +msgstr "" + +#: src/users.c:106 +#, c-format +msgid "" +"Output who is currently logged in according to FILE.\n" +"If FILE is not specified, use %s. %s as FILE is common.\n" +"\n" +msgstr "" + +#: src/wc.c:117 +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" +"read standard input. A word is a non-zero-length sequence of characters\n" +"delimited by white space.\n" +"The options below may be used to select which counts are printed, always in\n" +"the following order: newline, word, character, byte, maximum line length.\n" +" -c, --bytes print the byte counts\n" +" -m, --chars print the character counts\n" +" -l, --lines print the newline counts\n" +msgstr "" + +#: src/wc.c:128 +msgid "" +" --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" +" -L, --max-line-length print the length of the longest line\n" +" -w, --words print the word counts\n" +msgstr "" + +#: src/who.c:210 +msgid " old " +msgstr "" + +#: src/who.c:440 +msgid "system boot" +msgstr "" + +#: src/who.c:447 src/who.c:449 +msgid "id=" +msgstr "" + +#: src/who.c:462 src/who.c:467 +msgid "term=" +msgstr "" + +#: src/who.c:464 src/who.c:468 +msgid "exit=" +msgstr "" + +#: src/who.c:485 +msgid "LOGIN" +msgstr "" + +#: src/who.c:505 +msgid "clock change" +msgstr "" + +#: src/who.c:517 src/who.c:518 +msgid "run-level" +msgstr "" + +#: src/who.c:521 src/who.c:522 +msgid "last=" +msgstr "" + +#: src/who.c:553 +#, c-format +msgid "" +"\n" +"# users=%lu\n" +msgstr "" + +#: src/who.c:559 +msgid "NAME" +msgstr "" + +#: src/who.c:559 +msgid "LINE" +msgstr "" + +#: src/who.c:559 +msgid "TIME" +msgstr "" + +#: src/who.c:559 +msgid "IDLE" +msgstr "" + +#: src/who.c:560 +msgid "PID" +msgstr "" + +#: src/who.c:560 +msgid "COMMENT" +msgstr "" + +#: src/who.c:560 +msgid "EXIT" +msgstr "" + +#: src/who.c:640 +#, c-format +msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n" +msgstr "" + +#: src/who.c:641 +msgid "Print information about users who are currently logged in.\n" +msgstr "" + +#: src/who.c:644 +msgid "" +"\n" +" -a, --all same as -b -d --login -p -r -t -T -u\n" +" -b, --boot time of last system boot\n" +" -d, --dead print dead processes\n" +" -H, --heading print line of column headings\n" +msgstr "" + +#: src/who.c:651 +msgid " -l, --login print system login processes\n" +msgstr "" + +#: src/who.c:654 +msgid "" +" --lookup attempt to canonicalize hostnames via DNS\n" +" -m only hostname and user associated with stdin\n" +" -p, --process print active processes spawned by init\n" +msgstr "" + +#: src/who.c:659 +msgid "" +" -q, --count all login names and number of users logged on\n" +" -r, --runlevel print current runlevel\n" +" -s, --short print only name, line, and time (default)\n" +" -t, --time print last system clock change\n" +msgstr "" + +#: src/who.c:665 +msgid "" +" -T, -w, --mesg add user's message status as +, - or ?\n" +" -u, --users list users logged in\n" +" --message same as -T\n" +" --writable same as -T\n" +msgstr "" + +#: src/who.c:673 +#, 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 "" + +#: src/whoami.c:45 +msgid "" +"Print the user name associated with the current effective user ID.\n" +"Same as id -un.\n" +"\n" +msgstr "" + +#: src/whoami.c:91 +#, c-format +msgid "%s: cannot find name for user ID %lu\n" +msgstr "" + +#: src/yes.c:41 +#, c-format +msgid "" +"Usage: %s [STRING]...\n" +" or: %s OPTION\n" +msgstr "" + +#: src/yes.c:47 +msgid "" +"Repeatedly output a line with all specified STRING(s), or 'y'.\n" +"\n" +msgstr "" diff --git a/po/id.gmo b/po/id.gmo index 7a6567d4..22497b91 100644 Binary files a/po/id.gmo and b/po/id.gmo differ diff --git a/po/id.po b/po/id.po index 67ff1943..a60864f0 100644 --- a/po/id.po +++ b/po/id.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: coreutils 8.4\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2012-05-10 19:35+0200\n" +"POT-Creation-Date: 2013-02-14 15:56+0000\n" "PO-Revision-Date: 2010-01-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" @@ -35,19 +35,19 @@ msgstr "Argumen yang valid adalah:" msgid "error closing file" msgstr "error menutup berkas" -#: lib/closeout.c:112 src/base64.c:109 src/base64.c:121 src/base64.c:127 -#: src/base64.c:168 src/base64.c:224 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:330 src/expand.c:355 src/head.c:298 -#: src/head.c:348 src/head.c:756 src/head.c:797 src/mktemp.c:350 src/od.c:919 -#: src/paste.c:160 src/shuf.c:369 src/split.c:727 src/split.c:964 -#: src/split.c:969 src/tail.c:350 src/tail.c:1201 src/tail.c:1307 +#: 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 -#: src/unexpand.c:427 src/unexpand.c:443 +#: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "error menulis" -#: lib/copy-acl.c:611 src/copy.c:1160 src/copy.c:2602 +#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617 #, c-format msgid "preserving permissions for %s" msgstr "menyimpan permission untuk %s" @@ -239,18 +239,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:483 +#: lib/mkdir-p.c:196 src/install.c:484 #, c-format msgid "cannot change permissions of %s" msgstr "tidak dapat merubah ijin dari %s" -#: lib/mkdir-p.c:206 src/copy.c:2261 src/install.c:709 src/install.c:722 +#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722 #, 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:915 src/tac.c:435 +#: src/split.c:929 src/tac.c:434 #, c-format msgid "memory exhausted" msgstr "kehabisan memori" @@ -299,75 +299,75 @@ msgstr "'" msgid "%s: end of file" msgstr "%s: akhir dari berkas" -#: lib/regcomp.c:130 +#: lib/regcomp.c:131 msgid "Success" msgstr "Sukses" -#: lib/regcomp.c:133 +#: lib/regcomp.c:134 msgid "No match" msgstr "Tidak cocok" -#: lib/regcomp.c:136 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "Ekspresi regular tidak valid" -#: lib/regcomp.c:139 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "Karakter kolasi tidak valid" -#: lib/regcomp.c:142 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "Nama kelas karakter tidak valid" -#: lib/regcomp.c:145 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "Tambahan backslash" -#: lib/regcomp.c:148 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "Referensi kembali tidak valid" -#: lib/regcomp.c:151 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "Tidak cocok [ atau [^" -#: lib/regcomp.c:154 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "Tidak cocok ( atau \\(" -#: lib/regcomp.c:157 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "Tidak cocok \\{" -#: lib/regcomp.c:160 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "Isi dari \\{\\} tidak valid" -#: lib/regcomp.c:163 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "Jangkauan akhir tidak valid" -#: lib/regcomp.c:166 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Kehabisan memori" -#: lib/regcomp.c:169 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "Ekspresi regular awal tidak valid" -#: lib/regcomp.c:172 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "Akhir dari ekspresi regular prematur" -#: lib/regcomp.c:175 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "Ekspresi regular terlalu besar" -#: lib/regcomp.c:178 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "Tidak cocok ) atau \\)" -#: lib/regcomp.c:703 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "Tidak ada ekspresi regular sebelumnya" @@ -407,7 +407,7 @@ msgstr "^[yY]" msgid "^[nN]" msgstr "^[tT]" -#: lib/set-mode-acl.c:695 src/copy.c:2284 src/cp.c:518 +#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516 #, c-format msgid "setting permissions for %s" msgstr "menset ijin untuk %s" @@ -548,13 +548,13 @@ msgstr "Kegagalan penyuplai listrik" msgid "Resource lost" msgstr "Kehilangan sumber daya" -#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262 -#: lib/spawn-pipe.c:265 +#: 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:232 lib/spawn-pipe.c:346 lib/wait-process.c:282 +#: 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" @@ -570,24 +570,24 @@ msgstr "Sinyal waktu-nyata %d" msgid "Unknown signal %d" msgstr "Sinyal %d tidak diketahui" -#: lib/unicodeio.c:103 +#: lib/unicodeio.c:102 msgid "iconv function not usable" msgstr "fungsi iconv tidak berguna" -#: lib/unicodeio.c:105 +#: lib/unicodeio.c:104 msgid "iconv function not available" msgstr "fungsi iconv tidak tersedia" -#: lib/unicodeio.c:112 +#: lib/unicodeio.c:111 msgid "character out of range" msgstr "karakter diluar dari jangkauan" -#: lib/unicodeio.c:182 +#: lib/unicodeio.c:181 #, c-format msgid "cannot convert U+%04X to local character set" msgstr "tidak dapat mengubah U+%04X ke karakter set lokal" -#: lib/unicodeio.c:184 +#: lib/unicodeio.c:183 #, c-format msgid "cannot convert U+%04X to local character set: %s" msgstr "tidak dapat mengubah U+%04X ke karakter set lokal: %s" @@ -769,7 +769,7 @@ msgstr "" msgid "Report %s bugs to: %s\n" msgstr "Laporkan %s bugs ke: %s\n" -#: lib/version-etc.c:251 src/system.h:562 +#: lib/version-etc.c:251 src/system.h:573 #, c-format msgid "%s home page: <%s>\n" msgstr "%s halaman rumah: <%s>\n" @@ -779,7 +779,7 @@ 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:563 +#: lib/version-etc.c:256 src/system.h:574 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "Bantuan umum menggunakan aplikasi GNU: <http://www.gnu.org/gethelp/>\n" @@ -865,18 +865,17 @@ msgid "Simon Josefsson" msgstr "Simon Josefsson" #: src/base64.c:60 -#, c-format +#, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" "Base64 encode or decode FILE, or standard input, to standard output.\n" -"\n" msgstr "" "Penggunaan: %s [PILIHAN] [BERKAS]\n" "Base64 enkode atau dekode BERKAS, atau masukan standar, ke keluaran " "standar.\n" "\n" -#: src/base64.c:64 +#: src/base64.c:67 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -886,7 +885,7 @@ msgid "" "\n" msgstr "" -#: src/base64.c:73 src/cat.c:110 src/fmt.c:293 src/shuf.c:71 src/sum.c:70 +#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -894,7 +893,7 @@ msgstr "" "\n" "Tanpa BERKAS, atau ketika BERKAS adalah -, baca masukan standar.\n" -#: src/base64.c:76 +#: src/base64.c:79 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -911,37 +910,37 @@ msgstr "" "merekover\n" "dari karakter bukan alphabet bytes dalam stream yang dienkode.\n" -#: src/base64.c:171 src/base64.c:208 src/csplit.c:263 src/csplit.c:1435 -#: src/join.c:451 src/shuf.c:157 src/shuf.c:361 src/tac-pipe.c:74 +#: 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 #, c-format msgid "read error" msgstr "error baca" -#: src/base64.c:227 +#: src/base64.c:230 #, c-format msgid "invalid input" msgstr "masukan tidak valid" -#: src/base64.c:264 +#: src/base64.c:267 #, c-format msgid "invalid wrap size: %s" msgstr "ukuran wrap tidak valid: %s" -#: src/base64.c:283 src/basename.c:173 src/comm.c:435 src/cp.c:607 -#: src/date.c:441 src/dircolors.c:447 src/du.c:894 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:169 src/install.c:929 src/join.c:961 -#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:157 src/mv.c:447 -#: src/od.c:1802 src/ptx.c:2081 src/readlink.c:154 src/seq.c:408 -#: src/shuf.c:320 src/shuf.c:339 src/sort.c:4477 src/split.c:1313 -#: src/tr.c:1797 src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:454 -#: src/uniq.c:471 src/unlink.c:81 src/uptime.c:250 src/users.c:146 -#: src/wc.c:666 src/who.c:836 src/whoami.c:79 +#: 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 #, c-format msgid "extra operand %s" msgstr "extra operand %s" -#: src/base64.c:315 src/cat.c:781 +#: src/base64.c:318 src/cat.c:781 #, c-format msgid "closing standard input" msgstr "menutup masukan standar" @@ -949,15 +948,15 @@ 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/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:53 src/env.c:33 +#: 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/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:65 src/su.c:88 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 +#: 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 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -971,22 +970,22 @@ msgstr "" " atau: %s PILIHAN\n" #: src/basename.c:53 +#, fuzzy msgid "" "Print NAME with any leading directory components removed.\n" "If specified, also remove a trailing SUFFIX.\n" -"\n" msgstr "" "Tampilkan NAMA dengan komponen awal direktori dihilangkan.\n" "Jika dispesifikasikan, juga hapus sebuah akhiran SUFFIX.\n" -#: src/basename.c:59 +#: 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" msgstr "" -#: src/basename.c:66 +#: src/basename.c:67 #, c-format msgid "" "\n" @@ -997,20 +996,21 @@ msgid "" " %s -a any/str1 any/str2 -> \"str1\" followed by \"str2\"\n" msgstr "" -#: src/basename.c:167 src/chcon.c:531 src/chgrp.c:277 src/chmod.c:526 -#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1369 +#: 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:183 src/mkfifo.c:108 src/mknod.c:146 src/nohup.c:111 -#: src/pathchk.c:148 src/printf.c:674 src/readlink.c:146 src/realpath.c:236 -#: src/rm.c:314 src/rmdir.c:223 src/seq.c:402 src/setuidgid.c:137 -#: src/sleep.c:119 src/stat.c:1476 src/stdbuf.c:346 src/tr.c:1782 +#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 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 #, 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:52 src/split.c:49 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/split.c:49 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" @@ -1020,8 +1020,8 @@ msgstr "Torbjorn Granlund" msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:846 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4720 src/nl.c:182 src/paste.c:435 src/pr.c:2768 src/sum.c:58 +#: 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/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 +1079,7 @@ msgstr "" msgid "cannot do ioctl on %s" msgstr "tidak dapat melakukan ioctl di %s" -#: src/cat.c:637 src/dd.c:2209 src/sort.c:379 src/tee.c:165 src/yes.c:86 +#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86 #, c-format msgid "standard output" msgstr "keluaran standar" @@ -1096,14 +1096,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:55 src/head.c:46 src/hostid.c:33 +#: 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 msgid "Jim Meyering" msgstr "Jim Meyering" -#: src/chcon.c:100 src/runcon.c:203 src/runcon.c:234 +#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238 #, c-format msgid "failed to create security context: %s" msgstr "gagal untuk membuat konteks keamanan: %s" @@ -1113,8 +1113,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:540 src/copy.c:2222 src/runcon.c:217 -#: src/stat.c:683 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221 +#: src/stat.c:702 #, c-format msgid "failed to get security context of %s" msgstr "gagal untuk memperoleh konteks keamanan dari %s" @@ -1130,12 +1130,12 @@ 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:446 src/ls.c:2981 +#: src/du.c:457 src/ls.c:2981 #, 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:426 +#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437 #, c-format msgid "cannot read directory %s" msgstr "tidak dapat membaca direktori %s" @@ -1145,13 +1145,13 @@ 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:599 +#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562 #, 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:618 -#: src/remove.c:613 +#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642 +#: src/remove.c:576 #, c-format msgid "fts_close failed" msgstr "fts_close gagal" @@ -1174,7 +1174,6 @@ msgid "" "Change the security context of each FILE to CONTEXT.\n" "With --reference, change the security context of each FILE to that of " "RFILE.\n" -"\n" msgstr "" "Ubah konteks keamanan dari setiap BERKAS ke KONTEKS.\n" "Dengan --reference, ubah konteks keamanan dari setiap BERKAS ke RFILE.\n" @@ -1182,7 +1181,7 @@ msgstr "" " -h, --no-dereference mempengaruhi sambungan simbolik daripada referensi " "ke berkas apapun\n" -#: src/chcon.c:362 src/chgrp.c:123 src/chown.c:94 +#: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94 msgid "" " --dereference affect the referent of each symbolic link (this is\n" " the default), rather than the symbolic link itself\n" @@ -1190,7 +1189,7 @@ msgid "" "file\n" msgstr "" -#: src/chcon.c:367 +#: src/chcon.c:369 #, fuzzy msgid "" " -u, --user=USER set user USER in the target security context\n" @@ -1203,7 +1202,16 @@ 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:373 +#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110 +#, fuzzy +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 `/' spesial (default)\n" +" --preserve-root gagal beroperasi secara rekursif di `/'\n" + +#: src/chcon.c:379 #, fuzzy msgid "" " --reference=RFILE use RFILE's security context rather than " @@ -1217,15 +1225,15 @@ msgstr "" " -v, --verbose mengeluarkan sebuah diagnosa untuk setiap berkas " "yang diproses\n" -#: src/chcon.c:377 src/chgrp.c:140 src/chown.c:118 +#: 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:380 +#: src/chcon.c:386 msgid " -v, --verbose output a diagnostic for every file processed\n" msgstr "" -#: src/chcon.c:383 src/chgrp.c:143 src/chown.c:121 +#: src/chcon.c:389 src/chgrp.c:143 src/chown.c:121 #, fuzzy msgid "" "\n" @@ -1254,36 +1262,36 @@ msgstr "" " -P jangan menelusuri link simbolik apapun (default)\n" "\n" -#: src/chcon.c:512 src/chgrp.c:264 src/chown.c:267 +#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267 #, c-format msgid "-R --dereference requires either -H or -L" msgstr "-R --dereference membutuhkan baik -H atau -L" -#: src/chcon.c:518 +#: src/chcon.c:524 #, c-format msgid "-R -h requires -P" msgstr "-R -h membutuhkan -P" -#: src/chcon.c:533 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282 -#: src/comm.c:429 src/csplit.c:1371 src/join.c:1149 src/link.c:79 -#: src/mknod.c:148 src/setuidgid.c:139 src/tr.c:1785 +#: 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 #, c-format msgid "missing operand after %s" msgstr "hilang operand setelah %s" -#: src/chcon.c:556 src/runcon.c:247 +#: src/chcon.c:562 src/runcon.c:251 #, c-format msgid "invalid context: %s" msgstr "konteks tidak valid: %s" -#: src/chcon.c:563 +#: src/chcon.c:569 #, c-format msgid "conflicting security context specifiers given" msgstr "konteks keamanan konflik dengan spesifikasi yang diberikan" -#: src/chcon.c:572 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:433 src/cp.c:493 -#: src/mv.c:96 src/pwd.c:273 src/rm.c:324 src/touch.c:351 +#: 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 #, c-format msgid "failed to get attributes of %s" msgstr "gagal untuk memperoleh atribut dari %s" @@ -1333,15 +1341,6 @@ msgstr "" " berkas (hanya berguna di sistem yang dapat merubah\n" " kepemilikan dari link simbolik)\n" -#: src/chgrp.c:132 src/chmod.c:387 src/chown.c:110 -#, fuzzy -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 `/' spesial (default)\n" -" --preserve-root gagal beroperasi secara rekursif di `/'\n" - #: src/chgrp.c:136 msgid "" " --reference=RFILE use RFILE's group rather than specifying a\n" @@ -1426,8 +1425,15 @@ msgstr "" "ke berkas apapun\n" #: src/chmod.c:391 +#, fuzzy 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 msgid " -R, --recursive change files and directories recursively\n" @@ -1599,7 +1605,7 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:97 src/install.c:575 src/setuidgid.c:110 src/setuidgid.c:120 +#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120 #, c-format msgid "invalid group %s" msgstr "grup tidak valid %s" @@ -1670,8 +1676,8 @@ msgstr "gagal untuk menset ID grup" msgid "failed to set user-ID" msgstr "gagal untuk menset ID pengguna" -#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:213 src/stdbuf.c:366 -#: src/timeout.c:402 +#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365 +#: src/timeout.c:454 #, c-format msgid "failed to run command %s" msgstr "gagal menjalankan perintah %s" @@ -1792,20 +1798,24 @@ msgstr "banyak pembatas dispesifikasikan" msgid "empty %s not allowed" msgstr "kosong %s tidak diperbolehkan" -#: src/copy.c:168 src/dd.c:1609 src/dd.c:1976 +#: 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 #, c-format -msgid "reading %s" -msgstr "membaca %s" +msgid "error reading %s" +msgstr "error membaca %s" -#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:426 +#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425 #, c-format msgid "cannot lseek %s" msgstr "tidak dapat lseek %s" -#: src/copy.c:206 src/dd.c:2039 src/dd.c:2102 +#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151 #, c-format -msgid "writing %s" -msgstr "menulis %s" +msgid "error writing %s" +msgstr "error menulis %s" #: src/copy.c:313 #, fuzzy, c-format @@ -1827,7 +1837,7 @@ msgstr "gagal untuk membuka %s" msgid "clearing permissions for %s" msgstr "menghapus ijin untuk %s" -#: src/copy.c:697 src/copy.c:2470 src/cp.c:331 +#: src/copy.c:697 src/copy.c:2480 src/cp.c:329 #, c-format msgid "failed to preserve ownership for %s" msgstr "gagal untuk menjaga kepemilikan untuk %s" @@ -1842,14 +1852,14 @@ msgstr "gagal untuk menlookup berkas %s" msgid "failed to preserve authorship for %s" msgstr "gagal untuk menjaga kepengarangan untuk %s" -#: src/copy.c:804 src/csplit.c:638 src/du.c:901 src/fmt.c:449 src/head.c:847 -#: src/sort.c:4489 src/split.c:1329 src/tail.c:1756 src/wc.c:678 +#: 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 "tidak dapat membuka %s untuk dibaca" -#: src/copy.c:810 src/copy.c:972 src/dd.c:1546 src/dd.c:2114 src/dd.c:2252 -#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:141 +#: 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 #, c-format msgid "cannot fstat %s" msgstr "tidak dapat fstat %s" @@ -1869,14 +1879,14 @@ msgstr "gagal memperoleh file sysmte create context" 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:1574 src/copy.c:1777 src/copy.c:1935 src/ln.c:314 -#: src/remove.c:267 src/remove.c:293 src/remove.c:444 src/remove.c:465 +#: 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 #, c-format msgid "cannot remove %s" msgstr "tidak dapat menghapus %s" -#: src/copy.c:886 src/copy.c:1578 src/copy.c:1772 src/copy.c:1940 -#: src/remove.c:418 +#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945 +#: src/remove.c:375 #, c-format msgid "removed %s\n" msgstr "menghapus %s\n" @@ -1896,189 +1906,189 @@ msgstr "tidak dapat membuat berkas regular %s" msgid "failed to clone %s from %s" msgstr "gagal untuk menutup %s" -#: src/copy.c:1098 src/copy.c:2531 +#: src/copy.c:1098 src/copy.c:2541 #, c-format msgid "preserving times for %s" msgstr "menjaga waktu untuk %s" -#: src/copy.c:1170 src/copy.c:1176 src/head.c:855 src/touch.c:175 -#: src/truncate.c:413 -#, c-format -msgid "closing %s" -msgstr "menutup %s" +#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172 +#: src/truncate.c:417 +#, fuzzy, c-format +msgid "failed to close %s" +msgstr "gagal untuk membuka %s" -#: src/copy.c:1466 +#: src/copy.c:1471 #, c-format msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? " msgstr "%s: mencoba untuk menulis %s, mengoveride mode %04lo (%s)? " -#: src/copy.c:1473 +#: src/copy.c:1478 #, c-format msgid "%s: overwrite %s? " msgstr "%s: menimpa %s? " -#: src/copy.c:1542 +#: src/copy.c:1547 #, c-format msgid " (backup: %s)" msgstr " (backup: %s)" -#: src/copy.c:1552 +#: src/copy.c:1557 #, c-format msgid "failed to restore the default file creation context" msgstr "gagal merestore ke default berkas konteks pembuatan" -#: src/copy.c:1584 +#: src/copy.c:1589 #, c-format msgid "cannot create hard link %s to %s" msgstr "tidak dapat membuah link keras %s ke %s" -#: src/copy.c:1637 src/copy.c:1689 src/copy.c:2272 src/copy.c:2589 +#: 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:1220 src/truncate.c:365 +#: src/stat.c:1239 src/truncate.c:363 #, c-format msgid "cannot stat %s" msgstr "tidak dapat memperoleh statistik %s" -#: src/copy.c:1645 +#: src/copy.c:1650 #, c-format msgid "omitting directory %s" msgstr "mengabaikan direktori %s" -#: src/copy.c:1659 +#: src/copy.c:1664 #, c-format msgid "warning: source file %s specified more than once" msgstr "peringatan: berkas sumber %s dispesifikasikan lebih dari sekali" -#: src/copy.c:1707 src/ln.c:246 +#: src/copy.c:1712 src/ln.c:246 #, c-format msgid "%s and %s are the same file" msgstr "%s dan %s adalah berkas yang sama" -#: src/copy.c:1806 +#: src/copy.c:1811 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "tidak dapat menimpa bukan-direktori %s dengan direktori %s" -#: src/copy.c:1824 src/ln.c:214 +#: src/copy.c:1829 src/ln.c:214 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "tidak akan menimpa baru dibuat %s dengan %s" -#: src/copy.c:1842 +#: src/copy.c:1847 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "tidak dapat menimpa direktori %s dengan bukan-direktori" -#: src/copy.c:1856 +#: src/copy.c:1861 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "tidak dapat memindahkan direktori ke bukan-direktori: %s -> %s" -#: src/copy.c:1886 +#: src/copy.c:1891 #, 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:1887 +#: src/copy.c:1892 #, 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:1910 src/ln.c:276 +#: src/copy.c:1915 src/ln.c:276 #, c-format msgid "cannot backup %s" msgstr "tidak dapat membackup %s" -#: src/copy.c:1974 +#: src/copy.c:1979 #, 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:2051 +#: src/copy.c:2056 #, 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:2068 +#: src/copy.c:2073 #, 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:2118 +#: src/copy.c:2123 #, 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:2161 +#: src/copy.c:2166 #, c-format msgid "cannot move %s to %s" msgstr "tidak dapat memindahkan %s ke %s" -#: src/copy.c:2173 +#: src/copy.c:2178 #, 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:2207 src/install.c:905 src/mkdir.c:189 src/mkfifo.c:114 -#: src/mknod.c:167 +#: 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:2241 +#: src/copy.c:2246 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "tidak dapat menyalin cyclic link simbolik %s" -#: src/copy.c:2350 +#: src/copy.c:2355 #, 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:2357 +#: src/copy.c:2362 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "tidak dapat membuat link simbolik %s ke %s" -#: src/copy.c:2406 src/mkfifo.c:133 +#: src/copy.c:2416 src/mkfifo.c:132 #, c-format msgid "cannot create fifo %s" msgstr "tidak dapat membuat fifo %s" -#: src/copy.c:2415 +#: src/copy.c:2425 #, c-format msgid "cannot create special file %s" msgstr "tidak dapat membuah berkas spesial %s" -#: src/copy.c:2426 src/ls.c:3191 src/stat.c:902 +#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921 #, c-format msgid "cannot read symbolic link %s" msgstr "tidak dapat membaca link simbolik %s" -#: src/copy.c:2453 +#: src/copy.c:2463 #, c-format msgid "cannot create symbolic link %s" msgstr "tidak dapat membuat link simbolik %s" -#: src/copy.c:2485 +#: src/copy.c:2495 #, c-format msgid "%s has unknown file type" msgstr "%s memiliki tipe berkas tidak diketahui" -#: src/copy.c:2629 src/ln.c:358 +#: src/copy.c:2644 src/ln.c:358 #, c-format msgid "cannot un-backup %s" msgstr "tidak dapat un-backup %s" -#: src/copy.c:2633 +#: src/copy.c:2648 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (unbackup)\n" -#: src/cp.c:156 src/mv.c:284 +#: src/cp.c:156 src/mv.c:286 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -2090,26 +2100,13 @@ msgstr "" " atau: %s [PILIHAN]... -t DIREKTORI SUMBER...\n" #: src/cp.c:162 -msgid "" -"Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" -"\n" +#, 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:166 src/csplit.c:1458 src/cut.c:197 src/df.c:852 src/du.c:268 -#: src/expand.c:112 src/fmt.c:275 src/fold.c:75 src/head.c:115 -#: src/install.c:612 src/kill.c:86 src/ln.c:392 src/ls.c:4726 src/mkdir.c:61 -#: src/mkfifo.c:56 src/mknod.c:58 src/mv.c:294 src/nl.c:191 src/paste.c:445 -#: src/pr.c:2777 src/ptx.c:1825 src/shred.c:153 src/shuf.c:58 src/sort.c:399 -#: src/split.c:211 src/stdbuf.c:95 src/tac.c:142 src/tail.c:268 -#: src/touch.c:226 src/truncate.c:107 src/unexpand.c:122 src/uniq.c:145 -msgid "" -"Mandatory arguments to long options are mandatory for short options too.\n" -msgstr "" -"Argumen wajib untuk pilihan panjang adalah wajib untuk pilihan pendek juga.\n" - -#: src/cp.c:169 +#: src/cp.c:168 #, fuzzy msgid "" " -a, --archive same as -dR --preserve=all\n" @@ -2133,12 +2130,14 @@ msgstr "" " -d sama seperti --no-dereference --" "preserve=links\n" -#: src/cp.c:178 +#: src/cp.c:177 +#, fuzzy msgid "" " -f, --force if an existing destination file cannot be\n" -" opened, remove it and try again (redundant " -"if\n" -" the -n option is used)\n" +" opened, remove it and try again (this " +"option\n" +" is ignored when the -n option is also " +"used)\n" " -i, --interactive prompt before overwrite (overrides a previous " "-n\n" " option)\n" @@ -2153,7 +2152,7 @@ msgstr "" " -H ikuti baris-perintah link simbolik dalam " "SUMBER\n" -#: src/cp.c:188 +#: src/cp.c:186 #, fuzzy msgid "" " -l, --link hard link files instead of copying\n" @@ -2162,7 +2161,7 @@ msgstr "" " -l, --link berkas link daripada menyalin\n" " -L, --dereference selalu mengikuti link simbolik dalam SUMBER\n" -#: src/cp.c:192 +#: src/cp.c:190 msgid "" " -n, --no-clobber do not overwrite an existing file (overrides\n" " a previous -i option)\n" @@ -2172,7 +2171,7 @@ msgstr "" " (memaksa pilihan -i sebelumnya)\n" " -P, --no-dereference jangan ikuti link simbolik dalam SUMBER\n" -#: src/cp.c:197 +#: src/cp.c:195 msgid "" " -p same as --preserve=mode,ownership,timestamps\n" " --preserve[=ATTR_LIST] preserve the specified attributes (default:\n" @@ -2189,7 +2188,7 @@ msgstr "" " atribut tambahan: context, links, xattr\n" " all\n" -#: src/cp.c:205 +#: src/cp.c:203 msgid "" " --no-preserve=ATTR_LIST don't preserve the specified attributes\n" " --parents use full source file name under DIRECTORY\n" @@ -2198,7 +2197,7 @@ msgstr "" " --parents gunakan full nama berkas sumber dibawah " "DIREKTORI\n" -#: src/cp.c:209 +#: src/cp.c:207 #, fuzzy msgid "" " -R, -r, --recursive copy directories recursively\n" @@ -2214,7 +2213,7 @@ msgstr "" " mencoba untuk membukanya (kebalikan dengan --" "force)\n" -#: src/cp.c:215 +#: src/cp.c:213 #, fuzzy msgid "" " --sparse=WHEN control creation of sparse files. See below\n" @@ -2227,7 +2226,7 @@ msgstr "" " --strip-trailing-slashes hapus akhiran slashes dari setiap SUMBER\n" " argumen\n" -#: src/cp.c:220 +#: src/cp.c:218 msgid "" " -s, --symbolic-link make symbolic links instead of copying\n" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -2242,7 +2241,7 @@ msgstr "" " -T, --no-target-directory perlakukan TUJUAN sebagai sebuah berkas " "normal\n" -#: src/cp.c:226 +#: src/cp.c:224 msgid "" " -u, --update copy only when the SOURCE file is newer\n" " than the destination file or when the\n" @@ -2256,7 +2255,7 @@ msgstr "" " -v, --verbose jelaskan apa yang sedang dilakukan\n" " -x, --one-file-system tetap di sistem berkas ini\n" -#: src/cp.c:235 +#: src/cp.c:233 msgid "" "\n" "By default, sparse SOURCE files are detected by a crude heuristic and the\n" @@ -2287,7 +2286,7 @@ msgstr "" "penyalinan akan gagal, atau jika --reflink=auto dispesifikasikan, kembali ke " "standar penyalinan.\n" -#: src/cp.c:247 src/install.c:649 src/ln.c:421 src/mv.c:321 +#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322 #, fuzzy msgid "" "\n" @@ -2304,7 +2303,7 @@ msgstr "" "melalui variabel lingkungan VERSION_CONTROL. Ini adalah nilainya:\n" "\n" -#: src/cp.c:254 src/install.c:656 src/mv.c:328 +#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329 msgid "" " none, off never make backups (even if --backup is given)\n" " numbered, t make numbered backups\n" @@ -2317,7 +2316,7 @@ msgstr "" " existing, nil bernomor jika backup bernomor ada, simple jika tidak\n" " simple, never selalu membuat backup sederhana\n" -#: src/cp.c:260 +#: src/cp.c:258 msgid "" "\n" "As a special case, cp makes a backup of SOURCE when the force and backup\n" @@ -2330,93 +2329,93 @@ msgstr "" "pilihan diberikan dan SOURCE dan DEST memiliki nama sama untuk sebuah\n" "berkas regular yang telah ada.\n" -#: src/cp.c:319 +#: src/cp.c:317 #, c-format msgid "failed to preserve times for %s" msgstr "gagal untuk menjaga waktu untuk %s" -#: src/cp.c:350 +#: src/cp.c:348 #, c-format msgid "failed to preserve permissions for %s" msgstr "gagal untuk menjaga ijin untuk %s" -#: src/cp.c:477 +#: src/cp.c:475 #, c-format msgid "cannot make directory %s" msgstr "tidak dapat membuat direktori %s" -#: src/cp.c:526 src/cp.c:545 +#: src/cp.c:524 src/cp.c:543 #, c-format msgid "%s exists but is not a directory" msgstr "%s ada tetapi bukan sebuah direktori" -#: src/cp.c:572 src/cp.c:1068 src/install.c:401 src/install.c:844 src/ln.c:123 -#: src/ln.c:181 src/ln.c:202 src/ln.c:516 src/mv.c:152 src/mv.c:399 -#, c-format -msgid "accessing %s" -msgstr "mengakses %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 +#, fuzzy, c-format +msgid "failed to access %s" +msgstr "gagal untuk membuka %s" -#: src/cp.c:592 src/install.c:914 src/ln.c:546 src/mv.c:432 src/shred.c:1182 -#: src/touch.c:433 src/truncate.c:356 +#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181 +#: src/touch.c:429 src/truncate.c:354 #, c-format msgid "missing file operand" msgstr "operand berkas hilang" -#: src/cp.c:594 src/install.c:916 src/ln.c:560 src/mv.c:434 +#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436 #, c-format msgid "missing destination file operand after %s" msgstr "berkas tujuan operand hilang setelah %s" -#: src/cp.c:603 src/install.c:925 src/mv.c:443 +#: src/cp.c:601 src/install.c:926 src/mv.c:445 #, 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:619 src/cp.c:1070 src/install.c:403 src/install.c:846 -#: src/install.c:938 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:401 -#: src/mv.c:457 +#: 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 #, c-format msgid "target %s is not a directory" msgstr "target %s bukan sebuah direktori" -#: src/cp.c:730 +#: src/cp.c:728 #, c-format msgid "with --parents, the destination must be a directory" msgstr "dengan --parents, tujuan harus berupa sebuah direktori" -#: src/cp.c:1063 src/install.c:839 src/ln.c:511 src/mv.c:394 +#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395 #, c-format msgid "multiple target directories specified" msgstr "multiple target direktori dispesifikasikan" -#: src/cp.c:1108 +#: src/cp.c:1110 #, c-format msgid "cannot make both hard and symbolic links" msgstr "tidak dapat membuat hard dan simbolik link" -#: src/cp.c:1115 src/mv.c:464 +#: src/cp.c:1117 src/mv.c:466 #, c-format msgid "options --backup and --no-clobber are mutually exclusive" msgstr "pilihan --backup dan --no-clobber adalah mutually ekslusif" -#: src/cp.c:1121 +#: src/cp.c:1123 #, c-format msgid "--reflink can be used only with --sparse=auto" msgstr "--reflink hanya dapat digunakan dengan --sparse=auto" -#: src/cp.c:1129 src/install.c:899 src/ln.c:582 src/mv.c:472 +#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474 msgid "backup type" msgstr "tipe backup" -#: src/cp.c:1154 +#: src/cp.c:1156 #, 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:1160 +#: src/cp.c:1162 #, c-format msgid "cannot preserve extended attributes, cp is built without xattr support" msgstr "tidak dapat menjaga atribut ekstensi, cp dibuat tanpa dukungan xattr" @@ -2426,139 +2425,138 @@ msgstr "tidak dapat menjaga atribut ekstensi, cp dibuat tanpa dukungan xattr" msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:529 +#: src/csplit.c:531 #, c-format msgid "input disappeared" msgstr "masukan hilang" -#: src/csplit.c:658 src/csplit.c:669 +#: src/csplit.c:660 src/csplit.c:671 #, c-format msgid "%s: line number out of range" msgstr "%s: nomor baris hilang dari jangkauan" -#: src/csplit.c:698 +#: src/csplit.c:700 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: nomor baris hilang dari jangkauan" -#: src/csplit.c:701 src/csplit.c:750 +#: src/csplit.c:703 src/csplit.c:752 #, c-format msgid " on repetition %s\n" msgstr " repetisi di %s\n" -#: src/csplit.c:744 +#: src/csplit.c:746 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: cocok tidak ditemukan" -#: src/csplit.c:808 src/csplit.c:848 src/nl.c:359 src/tac.c:274 +#: src/csplit.c:810 src/csplit.c:850 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:981 +#: src/csplit.c:983 #, c-format msgid "write error for %s" msgstr "error dalam penulisan untuk %s" -#: src/csplit.c:1057 +#: src/csplit.c:1059 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: integer diperkirakan setelah delimiter" -#: src/csplit.c:1073 +#: src/csplit.c:1075 #, fuzzy, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: `}' dibutuhkan dalam jumlah berulang" -#: src/csplit.c:1083 +#: src/csplit.c:1085 #, fuzzy, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: integer dibutuhkan diantara `{' dan `}'" -#: src/csplit.c:1110 +#: src/csplit.c:1112 #, fuzzy, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: menutup delimiter `%c' hilang" -#: src/csplit.c:1127 +#: src/csplit.c:1129 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: ekspresi regular tidak valid: %s" -#: src/csplit.c:1160 +#: src/csplit.c:1162 #, c-format msgid "%s: invalid pattern" msgstr "%s: pola tidak valid" -#: src/csplit.c:1163 +#: src/csplit.c:1165 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: nomor baris harus lebih besar dari nol" -#: src/csplit.c:1169 +#: src/csplit.c:1171 #, 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:1175 +#: src/csplit.c:1177 #, 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:1253 +#: src/csplit.c:1255 #, c-format msgid "missing conversion specifier in suffix" msgstr "hilang spesifikasi konversi dalam akhiran" -#: src/csplit.c:1259 +#: src/csplit.c:1261 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "spesifikasi konversi tidak valid dalam akhiran: %c" -#: src/csplit.c:1262 +#: src/csplit.c:1264 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "spesifikasi konversi tidak valid dalam akhiran: \\%.3o" -#: src/csplit.c:1267 +#: src/csplit.c:1269 #, fuzzy, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "%.*s: spesifikasi konversi tidak valid" -#: src/csplit.c:1284 +#: src/csplit.c:1286 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "terlalu banyak %% spesifikasi konversi dalam akhiran" -#: src/csplit.c:1298 +#: src/csplit.c:1300 #, c-format msgid "missing %% conversion specification in suffix" msgstr "hilang %% spesifikasi konversi di akhiran" -#: src/csplit.c:1345 +#: src/csplit.c:1347 #, c-format msgid "%s: invalid number" msgstr "%s: nomor tidak valid" -#: src/csplit.c:1449 +#: src/csplit.c:1451 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Penggunaan: %s [PILIHAN]... BERKAS POLA...\n" -#: src/csplit.c:1453 +#: src/csplit.c:1455 #, 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" -"\n" msgstr "" "Mengeluarkan bagian dari BERKAS dipisahkan dengan POLA ke berkas `xx00', " "`xx01', ...,\n" "dan jumlah keluaran byte dari setiap potongan ke keluaran standar.\n" "\n" -#: src/csplit.c:1461 +#: src/csplit.c:1462 #, fuzzy, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2569,7 +2567,7 @@ msgstr "" " -f, --prefix=PREFIX gunakan PREFIX daripada `xx'\n" " -k, --keep-files jangan menghapus berkas keluaran di errors\n" -#: src/csplit.c:1466 +#: src/csplit.c:1467 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" @@ -2581,7 +2579,7 @@ msgstr "" "keluaran\n" " -z, --elide-empty-files hapus keluaran berkas kosong\n" -#: src/csplit.c:1473 +#: src/csplit.c:1474 msgid "" "\n" "Read standard input if FILE is -. Each PATTERN may be:\n" @@ -2589,7 +2587,7 @@ msgstr "" "\n" "Baca standard masukan jika BERKAS adalah -. Setiap POLA mungkin:\n" -#: src/csplit.c:1477 +#: src/csplit.c:1478 #, fuzzy msgid "" "\n" @@ -2616,7 +2614,7 @@ msgstr "" msgid "David M. Ihnat" msgstr "David M. Ihnat" -#: src/cut.c:64 +#: src/cut.c:64 src/cut.c:372 msgid "fields and positions are numbered from 1" msgstr "fields dan posisi dinomori dari 1" @@ -2626,15 +2624,14 @@ msgid "Usage: %s OPTION... [FILE]...\n" msgstr "Penggunaan: %s PILIHAN... [BERKAS]...\n" #: src/cut.c:193 -msgid "" -"Print selected parts of lines from each FILE to standard output.\n" -"\n" +#, fuzzy +msgid "Print selected parts of lines from each FILE to standard output.\n" msgstr "" "Tampilkan bagian dari baris yang dipilih dari setiap BERKAS ke keluaran " "standar.\n" "\n" -#: src/cut.c:200 +#: src/cut.c:199 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2644,7 +2641,7 @@ msgstr "" " -c, --character=LIST pilih hanya karakter ini\n" " -d, --delimiter=DELIM gunakan DELIM daripada TAB untuk bagian pembatas\n" -#: src/cut.c:205 +#: src/cut.c:204 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2657,7 +2654,7 @@ msgstr "" " pilihan -s dispesifikasikan\n" " -n (diabaikan)\n" -#: src/cut.c:211 +#: src/cut.c:210 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" @@ -2666,7 +2663,7 @@ msgstr "" "yang\n" " dipilih\n" -#: src/cut.c:215 +#: src/cut.c:214 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2677,7 +2674,7 @@ msgstr "" " sebagai default yang digunakan sebagai masukan " "delimiter\n" -#: src/cut.c:222 +#: src/cut.c:221 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2691,7 +2688,7 @@ msgstr "" "ditulis\n" "dalam urutan yang sama dengan waktu dibaca, dan ditulis tepat sekali.\n" -#: src/cut.c:228 +#: src/cut.c:227 msgid "" "Each range is one of:\n" "\n" @@ -2709,48 +2706,50 @@ 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:368 src/cut.c:489 -msgid "invalid byte or field list" +#: src/cut.c:367 src/cut.c:493 +#, fuzzy +msgid "invalid byte, character or field list" msgstr "byte tidak valid atau daftar field" -#: src/cut.c:385 +#: src/cut.c:387 msgid "invalid range with no endpoint: -" msgstr "jangkauan tidak valid dengan tidak ada endpoint: -" -#: src/cut.c:399 +#: src/cut.c:403 msgid "invalid decreasing range" msgstr "jangkauan berkurang tidak valid" -#: src/cut.c:478 +#: src/cut.c:482 #, c-format msgid "byte offset %s is too large" msgstr "byte offset %s terlalu besar" -#: src/cut.c:481 +#: src/cut.c:485 #, c-format msgid "field number %s is too large" msgstr "nomor field %s terlalu besar" -#: src/cut.c:789 src/cut.c:797 +#: src/cut.c:795 src/cut.c:803 msgid "only one type of list may be specified" msgstr "hanya satu tipe dari daftar yang boleh dispesifikasikan" -#: src/cut.c:806 +#: src/cut.c:812 src/numfmt.c:1408 +#, c-format msgid "the delimiter must be a single character" msgstr "pembatas harus berupa sebuah karakter" -#: src/cut.c:841 +#: src/cut.c:847 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:844 +#: src/cut.c:850 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:848 +#: src/cut.c:854 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2758,11 +2757,11 @@ msgstr "" "menekan non-delimited baris membuat masuk akal\n" "\thanya ketika beroperasi di fields" -#: src/cut.c:864 +#: src/cut.c:870 msgid "missing list of fields" msgstr "hilang daftar dari fields" -#: src/cut.c:866 +#: src/cut.c:872 msgid "missing list of positions" msgstr "hilang daftar dari posisi" @@ -2776,9 +2775,11 @@ msgstr "" " atau: %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 "" + +#: src/date.c:134 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" " -I[TIMESPEC], --iso-8601[=TIMESPEC] output date/time in ISO 8601 format.\n" @@ -2787,7 +2788,7 @@ msgid "" " and time to the indicated precision.\n" msgstr "" -#: src/date.c:138 +#: src/date.c:142 msgid "" " -r, --reference=FILE display the last modification time of FILE\n" " -R, --rfc-2822 output date and time in RFC 2822 format.\n" @@ -2797,7 +2798,7 @@ msgstr "" " -R, --rfc-2822 keluaran tanggal dan waktu di RFC 2822 format.\n" " Contoh: Mon, 07 Aug 2006 12:34:56 +0700\n" -#: src/date.c:143 +#: src/date.c:147 #, fuzzy msgid "" " --rfc-3339=TIMESPEC output date and time in RFC 3339 format.\n" @@ -2818,7 +2819,7 @@ msgstr "" " -u, --utc, --universal menampilkan atau menset Coordinated Universal " "Time\n" -#: src/date.c:154 +#: src/date.c:158 msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" @@ -2832,7 +2833,7 @@ msgstr "" " %% sebuah literal %\n" " %a locale penyingkatan nama weekday (contoh, Sun)\n" -#: src/date.c:161 +#: src/date.c:165 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2844,7 +2845,7 @@ msgstr "" " %B locale's nama lengkap bulan (contoh, Januari)\n" " %c locale's tanggal dan waktu (contoh, Thu Mar 3 23:05:25 2005)\n" -#: src/date.c:167 +#: src/date.c:171 #, fuzzy msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" @@ -2858,7 +2859,7 @@ msgstr "" " %D tanggal; sama seperti %m/%d/%y\n" " %e hari dari bulan, spasi dipadded; sama seperti %_d\n" -#: src/date.c:173 +#: src/date.c:177 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -2869,7 +2870,7 @@ msgstr "" " %G tahun dari ISO nomor minggu (lihat %V); biasanya berguna hanya dengan " "%V\n" -#: src/date.c:178 +#: src/date.c:182 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2881,7 +2882,7 @@ msgstr "" " %I jam (01...12)\n" " %j hari dari tahun (001...366)\n" -#: src/date.c:184 +#: src/date.c:188 #, fuzzy msgid "" " %k hour, space padded ( 0..23); same as %_H\n" @@ -2894,7 +2895,7 @@ msgstr "" " %m bulan (01..12)\n" " %M menit (00..59)\n" -#: src/date.c:190 +#: src/date.c:194 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2912,7 +2913,7 @@ msgstr "" " %R 24-jam jam dan menit; sama seperti %H:%M\n" " %s detik sejak 1970-01-01 00:00:00 UTC\n" -#: src/date.c:199 +#: src/date.c:203 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2924,7 +2925,7 @@ msgstr "" " %T waktu; sama seperti %H:%M:%S\n" " %u hari dari minggu (1..7); 1 adalah Senin\n" -#: src/date.c:205 +#: src/date.c:209 msgid "" " %U week number of year, with Sunday as first day of week (00..53)\n" " %V ISO week number, with Monday as first day of week (01..53)\n" @@ -2939,7 +2940,7 @@ msgstr "" " %W nomor minggu dari tahun, dengan Senin sebagai hari pertama dari " "minggu (00..53)\n" -#: src/date.c:211 +#: src/date.c:215 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -2951,7 +2952,7 @@ msgstr "" " %y dua digit terakhir dari tahun (00..99)\n" " %Y tahun\n" -#: src/date.c:217 +#: src/date.c:221 #, fuzzy msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" @@ -2971,7 +2972,7 @@ msgstr "" " %Z singkatan daerah waktu alphabet (contoh, WIT)\n" "\n" -#: src/date.c:226 +#: src/date.c:230 #, fuzzy msgid "" "The following optional flags may follow '%':\n" @@ -2990,7 +2991,7 @@ msgstr "" " ^ gunakan huruf besar jika mungkin\n" " # gunakan kasus sebalik jika mungkin\n" -#: src/date.c:235 +#: src/date.c:239 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -3005,7 +3006,7 @@ msgstr "" "E untuk menggunakan locale's alternatif representasi jika tersedia, atau\n" "0 untuk menggunakan locale's alternatif simbol numerik jika tersedia.\n" -#: src/date.c:242 +#: src/date.c:246 msgid "" "\n" "Examples:\n" @@ -3019,37 +3020,37 @@ msgid "" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:275 src/dd.c:2193 src/head.c:838 src/md5sum.c:477 -#: src/md5sum.c:798 src/od.c:863 src/od.c:1914 src/pr.c:1176 src/pr.c:1372 -#: src/pr.c:1494 src/stty.c:842 src/tac.c:563 src/tail.c:343 src/tee.c:126 +#: 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 #, c-format msgid "standard input" msgstr "standar masukan" -#: src/date.c:303 src/date.c:523 +#: src/date.c:307 src/date.c:527 #, c-format msgid "invalid date %s" msgstr "tanggal tidak valid %s" -#: src/date.c:414 src/date.c:448 +#: src/date.c:418 src/date.c:452 #, c-format msgid "multiple output formats specified" msgstr "multiple format keluaran dispesifikasikan" -#: src/date.c:426 +#: src/date.c:430 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "" "Pilihan untuk menspesifikasikan tanggal untuk pencetakan adalah mutually " "exclusive" -#: src/date.c:433 +#: src/date.c:437 #, c-format msgid "the options to print and set the time may not be used together" msgstr "Pilihan untuk mencetak dan menset waktu mungkin bisa digunakan bersama" -#: src/date.c:454 +#: src/date.c:458 #, fuzzy, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -3060,23 +3061,23 @@ msgstr "" "ketika menggunakan sebuah pilihan untuk menspesifikasikan tanggal, argumen\n" "bukan pilihan apapun harus dalam sebuah format string yang diawali dengan `+'" -#: src/date.c:531 +#: src/date.c:535 #, c-format msgid "cannot set date" msgstr "tidak dapat menset tanggal" -#: src/date.c:554 src/du.c:360 +#: src/date.c:558 src/du.c:371 #, c-format msgid "time %s is out of range" msgstr "jam %s adalah diluar jangkauan" #. This is a proper name. See the gettext manual, section Names. -#: src/dd.c:44 src/factor.c:43 src/rm.c:41 src/tail.c:69 src/touch.c:41 +#: 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 "Paul Rubin" -#: src/dd.c:517 +#: src/dd.c:521 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3085,7 +3086,7 @@ msgstr "" "Penggunaan: %s [OPERAND]...\n" " atau: %s PILIHAN\n" -#: src/dd.c:522 +#: src/dd.c:526 #, fuzzy msgid "" "Copy a file, converting and formatting according to the operands.\n" @@ -3106,7 +3107,7 @@ msgstr "" " count=BLOCKS salin hanya BLOK input blok\n" " ibs=BYTES baca BYTES byte dalam satu waktu\n" -#: src/dd.c:531 +#: src/dd.c:535 #, fuzzy msgid "" " if=FILE read from FILE instead of stdin\n" @@ -3116,7 +3117,8 @@ msgid "" " oflag=FLAGS write as per the comma separated symbol list\n" " seek=N skip N obs-sized blocks at start of output\n" " skip=N skip N ibs-sized blocks at start of input\n" -" status=noxfer suppress transfer statistics\n" +" status=WHICH WHICH info to suppress outputting to stderr;\n" +" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" msgstr "" " if=FILE baca dari BERKAS daripada dari stdin\n" " iflag=FLAGS baca sebagai daftar simbol yang dipisahkan dengan koma\n" @@ -3127,10 +3129,11 @@ msgstr "" " skip=BLOK lewati BLOK sebesar ibs blok di awal dari masukan\n" " status=noxfer tekan statistik transfer\n" -#: src/dd.c:541 +#: src/dd.c:546 +#, fuzzy msgid "" "\n" -"BLOCKS and BYTES may be followed by the following multiplicative suffixes:\n" +"N and BYTES may be followed by the following multiplicative suffixes:\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, and so on for T, P, E, Z, Y.\n" "\n" @@ -3145,7 +3148,7 @@ msgstr "" "Setiap simbol CONV bisa berupa:\n" "\n" -#: src/dd.c:550 +#: src/dd.c:555 #, fuzzy msgid "" " ascii from EBCDIC to ASCII\n" @@ -3173,7 +3176,7 @@ msgstr "" "digunakan\n" " dengan blok atau unblok, pad dengan spasi daripada dengan NUL\n" -#: src/dd.c:563 +#: src/dd.c:568 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3189,7 +3192,7 @@ msgstr "" " fdatasync secara fisik tulis berkas keluaran data sebelum selesai\n" " fsync sama seperti, tetapi juga tulis metadata\n" -#: src/dd.c:571 +#: src/dd.c:576 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3203,75 +3206,75 @@ msgstr "" " append mode append (berguna hanya untuk keluaran; conv=notrunc " "disarankan)\n" -#: src/dd.c:578 +#: src/dd.c:583 msgid " cio use concurrent I/O for data\n" msgstr " cio gunakan I/O bersamaan untuk data\n" -#: src/dd.c:580 +#: src/dd.c:585 msgid " direct use direct I/O for data\n" msgstr " direct gunakan I/O langsung untuk data\n" -#: src/dd.c:582 +#: src/dd.c:587 msgid " directory fail unless a directory\n" msgstr " direktori gagal kecuali sebuah direktori\n" -#: src/dd.c:584 +#: src/dd.c:589 msgid " dsync use synchronized I/O for data\n" msgstr " dsync gunakan I/O tersinkron untuk data\n" -#: src/dd.c:586 +#: src/dd.c:591 msgid " sync likewise, but also for metadata\n" msgstr " sync sama seperti itu, tetapi juga untuk metadata\n" -#: src/dd.c:587 +#: src/dd.c:592 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr " fullblock akumulasikan blok penuh dari masukan (hanya iflag)\n" -#: src/dd.c:590 +#: src/dd.c:595 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock gunakan I/O non-blok\n" -#: src/dd.c:592 +#: src/dd.c:597 msgid " noatime do not update access time\n" msgstr " noatime jangan perbaharui waktu akses\n" -#: src/dd.c:595 +#: src/dd.c:600 msgid " nocache discard cached data\n" msgstr "" -#: src/dd.c:598 +#: src/dd.c:603 msgid " noctty do not assign controlling terminal from file\n" msgstr " noctty jangan assign pengontrol terminal dari berkas\n" -#: src/dd.c:601 +#: src/dd.c:606 msgid " nofollow do not follow symlinks\n" msgstr " nofollow jangan ikuti symlinks\n" -#: src/dd.c:603 +#: src/dd.c:608 msgid " nolinks fail if multiply-linked\n" msgstr " nolinks gagal jika multiply-linked\n" -#: src/dd.c:605 +#: src/dd.c:610 msgid " binary use binary I/O for data\n" msgstr " binary gunakan binary I/O untuk data\n" -#: src/dd.c:607 +#: src/dd.c:612 msgid " text use text I/O for data\n" msgstr " text gunakan teks I/O untuk data\n" -#: src/dd.c:609 +#: src/dd.c:614 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:612 +#: src/dd.c:617 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:615 +#: src/dd.c:620 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:620 +#: src/dd.c:625 #, fuzzy, c-format msgid "" "\n" @@ -3301,7 +3304,7 @@ msgstr "" "Pilihan adalah:\n" "\n" -#: src/dd.c:676 +#: src/dd.c:683 #, c-format msgid "" "%<PRIuMAX>+%<PRIuMAX> records in\n" @@ -3310,21 +3313,21 @@ msgstr "" "%<PRIuMAX>+%<PRIuMAX> catatan masuk\n" "%<PRIuMAX>+%<PRIuMAX> catatan keluar\n" -#: src/dd.c:682 +#: src/dd.c:689 #, 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:694 +#: src/dd.c:701 #, 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:712 +#: src/dd.c:720 msgid "Infinity B" msgstr "Tak terhingga B" @@ -3338,83 +3341,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:725 +#: src/dd.c:733 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g s, %s/s\n" -#: src/dd.c:804 +#: src/dd.c:812 #, c-format msgid "closing input file %s" msgstr "menutup berkas masukan %s" -#: src/dd.c:811 +#: src/dd.c:819 #, c-format msgid "closing output file %s" msgstr "menutup berkas keluaran %s" -#: src/dd.c:1014 +#: src/dd.c:1022 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "gagal untuk mematikan O_DIRECT: %s" -#: src/dd.c:1085 src/dd.c:1934 +#: src/dd.c:1093 src/dd.c:1942 #, c-format msgid "writing to %s" msgstr "menulis ke %s" -#: src/dd.c:1199 src/dd.c:1253 +#: src/dd.c:1207 src/dd.c:1261 #, c-format msgid "unrecognized operand %s" msgstr "operand %s tidak dikenal" -#: src/dd.c:1210 +#: src/dd.c:1218 msgid "invalid conversion" msgstr "konversi tidak valid" -#: src/dd.c:1213 src/dd.c:1289 +#: src/dd.c:1221 src/dd.c:1297 msgid "invalid input flag" msgstr "masukan flag tidak valid" -#: src/dd.c:1216 src/dd.c:1283 src/dd.c:1295 +#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303 msgid "invalid output flag" msgstr "keluaran flag tidak valid" -#: src/dd.c:1219 +#: src/dd.c:1227 msgid "invalid status flag" msgstr "statu flag tidak valid" -#: src/dd.c:1258 src/truncate.c:312 +#: src/dd.c:1266 src/truncate.c:310 #, c-format msgid "invalid number %s" msgstr "nomor %s tidak valid" -#: src/dd.c:1340 +#: src/dd.c:1348 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "tidak dapat mengkombinasikan dua dari {ascii, ebcdic, ibm}" -#: src/dd.c:1342 +#: src/dd.c:1350 #, c-format msgid "cannot combine block and unblock" msgstr "tidak dapat mengkombinasikan blok dan unblok" -#: src/dd.c:1344 +#: src/dd.c:1352 #, c-format msgid "cannot combine lcase and ucase" msgstr "tidak dapat mengkombinasikan huruf kecil dan huruf besar" -#: src/dd.c:1346 +#: src/dd.c:1354 #, c-format msgid "cannot combine excl and nocreat" msgstr "tidak dapat mengkombinasikan excl dan nocreat" -#: src/dd.c:1349 +#: src/dd.c:1357 #, fuzzy, c-format msgid "cannot combine direct and nocache" msgstr "tidak dapat mengkombinasikan excl dan nocreat" -#: src/dd.c:1506 +#: src/dd.c:1514 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3423,72 +3426,72 @@ 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:1593 +#: src/dd.c:1601 #, c-format msgid "%s: cannot skip" msgstr "%s: tidak dapat melewati" -#: src/dd.c:1595 src/dd.c:1614 src/dd.c:1675 +#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683 #, c-format msgid "%s: cannot seek" msgstr "%s: tidak dapat mencari" -#: src/dd.c:1655 +#: src/dd.c:1663 #, c-format msgid "offset overflow while reading file %s" msgstr "offset overflow ketika membaca berkas %s" -#: src/dd.c:1667 +#: src/dd.c:1675 #, c-format msgid "warning: invalid file offset after failed read" msgstr "peringatan: berkas ofset tidak valid setelah gagal baca" -#: src/dd.c:1671 +#: src/dd.c:1679 #, c-format msgid "cannot work around kernel bug after all" msgstr "tidak dapat bekerja dalam kernel bug ternyata" -#: src/dd.c:1814 +#: src/dd.c:1822 #, c-format msgid "setting flags for %s" msgstr "menset flag untuk %s" -#: src/dd.c:1867 +#: src/dd.c:1875 #, c-format msgid "memory exhausted by input buffer of size %zu bytes (%s)" msgstr "" -#: src/dd.c:1881 +#: src/dd.c:1889 #, c-format msgid "memory exhausted by output buffer of size %zu bytes (%s)" msgstr "" -#: src/dd.c:1914 +#: src/dd.c:1922 #, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: tidak dapat melewati ofset yang dispesifikasikan" -#: src/dd.c:2125 src/dd.c:2258 -#, c-format -msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" +#: src/dd.c:2133 +#, 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:2138 +#: src/dd.c:2146 #, c-format msgid "fdatasync failed for %s" msgstr "fdatasync gagal untuk %s" -#: src/dd.c:2148 +#: src/dd.c:2156 #, c-format msgid "fsync failed for %s" msgstr "fsync gagal untuk %s" -#: src/dd.c:2199 src/dd.c:2228 +#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165 #, c-format -msgid "opening %s" -msgstr "membuka %s" +msgid "failed to open %s" +msgstr "gagal untuk membuka %s" -#: src/dd.c:2237 +#: src/dd.c:2246 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) " @@ -3497,84 +3500,106 @@ msgstr "" "ofset terlalu besar: tidak dapat memotong ke panjang dari seek=%<PRIuMAX> " "(%lu-byte) blok" -#: src/dd.c:2274 src/dd.c:2280 +#: src/dd.c:2267 +#, 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 #, 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:54 src/expr.c:153 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:39 src/sleep.c:35 src/sort.c:66 +#: 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 msgid "Paul Eggert" msgstr "Paul Eggert" -#: src/df.c:140 +#: src/df.c:172 msgid "Filesystem" msgstr "Sistem Berkas" -#: src/df.c:141 +#: src/df.c:175 msgid "Type" msgstr "Tipe" -#: src/df.c:142 +#: src/df.c:178 src/df.c:542 msgid "blocks" msgstr "blok" -#: src/df.c:142 -msgid "Inodes" -msgstr "Inode" - -#: src/df.c:142 -msgid "Size" -msgstr "Besar" - -#: src/df.c:143 +#: src/df.c:181 msgid "Used" msgstr "Isi" -#: src/df.c:143 -msgid "IUsed" -msgstr "IIsi" - -#: src/df.c:144 +#: src/df.c:184 msgid "Available" msgstr "Sisa" -#: src/df.c:144 -msgid "IFree" -msgstr "Ibebas" - -#: src/df.c:144 -msgid "Avail" -msgstr "Sisa" - -#: src/df.c:145 +#: src/df.c:187 msgid "Use%" msgstr "Isi%" -#: src/df.c:145 +#: src/df.c:190 +msgid "Inodes" +msgstr "Inode" + +#: src/df.c:193 +msgid "IUsed" +msgstr "IIsi" + +#: src/df.c:196 +msgid "IFree" +msgstr "Ibebas" + +#: src/df.c:199 msgid "IUse%" msgstr "IIsi%" -#: src/df.c:145 +#: src/df.c:202 +msgid "Mounted on" +msgstr "Dipasang di" + +#: src/df.c:383 +#, c-format +msgid "option --output: field '%s' unknown" +msgstr "" + +#: src/df.c:390 +#, fuzzy, c-format +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 +msgid "Size" +msgstr "Besar" + +#: src/df.c:414 src/df.c:451 +msgid "Avail" +msgstr "Sisa" + +#: src/df.c:474 msgid "Capacity" msgstr "Kapasita" -#: src/df.c:146 -msgid "Mounted on" -msgstr "Dipasang di" +#. 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 +#, c-format +msgid "%s-%s" +msgstr "" -#: src/df.c:847 +#: src/df.c:1210 +#, fuzzy msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" -"\n" msgstr "" "Menampilkan informasi mengenai sistem berkas dimana setiap BERKAS berada,\n" "atau seluruh sistem berkas dengan default.\n" "\n" -#: src/df.c:855 +#: src/df.c:1217 #, fuzzy msgid "" " -a, --all include dummy file systems\n" @@ -3593,7 +3618,7 @@ msgstr "" " -H, --si sama seperti itu, tetapi menggunakan kelipatan dari " "1000 bukan 1024\n" -#: src/df.c:865 +#: src/df.c:1227 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3607,8 +3632,12 @@ msgstr "" " --no-sync jangan menjalankan sync sebelum memperoleh informasi " "penggunaan (default)\n" -#: src/df.c:872 +#: src/df.c:1234 +#, fuzzy msgid "" +" --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" +" or print all fields if FIELD_LIST is " +"omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" " -t, --type=TYPE limit listing to file systems of type TYPE\n" @@ -3625,20 +3654,42 @@ msgstr "" "tipe TIPE\n" " -v (diabaikan)\n" -#: src/df.c:1027 +#: src/df.c:1248 +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" +msgstr "" + +#: src/df.c:1285 +#, 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 #, c-format msgid "file system type %s both selected and excluded" msgstr "sistem berkas tipe %s keduanyan dipilih dan diexclude" -#: src/df.c:1075 +#: src/df.c:1500 msgid "Warning: " msgstr "Peringatan: " -#: src/df.c:1077 src/stat.c:795 +#: src/df.c:1502 src/stat.c:814 msgid "cannot read table of mounted file systems" msgstr "tidak dapat membaca tabel dari sistem berkas yang terpasang" -#: src/df.c:1107 +#: src/df.c:1539 #, c-format msgid "no file systems processed" msgstr "tidak ada sistem berkas yang diproses" @@ -3758,7 +3809,7 @@ msgstr "" " %s /usr/bin/sort Keluar \"/usr/bin\".\n" " %s stdio.h Keluar \".\".\n" -#: src/du.c:260 src/sort.c:390 src/wc.c:112 +#: src/du.c:270 src/sort.c:394 src/wc.c:112 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3767,18 +3818,19 @@ msgstr "" "Penggunaan: %s [PILIHAN]... [BERKAS]...\n" " atau: %s [PILIHAN]... --files0-from=F\n" -#: src/du.c:264 -msgid "" -"Summarize disk usage of each FILE, recursively for directories.\n" -"\n" +#: src/du.c:274 +#, fuzzy +msgid "Summarize disk usage of each FILE, recursively for directories.\n" msgstr "" "Ringkas penggunaan disk dari setiap BERKAS, secara rekursif untuk " "direktori.\n" "\n" -#: src/du.c:271 +#: src/du.c:280 #, fuzzy msgid "" +" -0, --null end each output line with 0 byte rather than " +"newline\n" " -a, --all write counts for all files, not just directories\n" " --apparent-size print apparent sizes, rather than disk usage; " "although\n" @@ -3796,7 +3848,7 @@ msgstr "" "berkas, internal\n" " fragmentasi, blok tidak langsung, dan seperti itu\n" -#: src/du.c:279 +#: src/du.c:289 #, fuzzy msgid "" " -B, --block-size=SIZE scale sizes by SIZE before printing them. E.g.,\n" @@ -3806,6 +3858,11 @@ msgid "" " -c, --total produce a grand total\n" " -D, --dereference-args dereference only symlinks that are listed on the\n" " command line\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 "" " -B, --block-size=SIZE gunakan SIZE-byte blok\n" " -b, --bytes sama seperti `--apparent-size --block-size=1'\n" @@ -3813,7 +3870,8 @@ msgstr "" " -D, --dereference-args dereference hanya symlink yang terdaftar di\n" " baris perintah\n" -#: src/du.c:288 +#: src/du.c:302 +#, fuzzy msgid "" " --files0-from=F summarize disk usage of the NUL-terminated file\n" " names specified in file F;\n" @@ -3821,7 +3879,6 @@ msgid "" " -H equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" --si like -h, but use powers of 1000 not 1024\n" msgstr "" " --files0-from=F ringkas penggunaan disk dari NUL-terminated berkas\n" " nama dispesifikasikan dalam berkas F\n" @@ -3832,9 +3889,11 @@ msgstr "" " --si seperti -h, tetapi menggunakan kelipatan 1000 bukan " "1024\n" -#: src/du.c:297 +#: src/du.c:310 +#, fuzzy 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 "" @@ -3842,14 +3901,13 @@ msgstr "" " -l, --count-links hitung ukuran beberapa kali jika hard linked\n" " -m seperti --block-size=1M\n" -#: src/du.c:302 +#: src/du.c:316 +#, fuzzy msgid "" -" -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " "default)\n" -" -0, --null end each output line with 0 byte rather than " -"newline\n" " -S, --separate-dirs 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 dereferensikan seluruh link simbolik\n" @@ -3859,32 +3917,11 @@ msgstr "" " -S, --separate-dirs jangan memasukan ukuran dari subdirektori\n" " -s, --summarize tampilkan hanya sebuah total dari setiap argumen\n" -#: src/du.c:309 -#, 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-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:318 +#: src/du.c:322 #, fuzzy msgid "" +" -t, --threshold=SIZE exclude entries smaller than SIZE if positive,\n" +" or entries greater than SIZE if negative\n" " --time show time of the last modification of any file in " "the\n" " directory, or any of its subdirectories\n" @@ -3904,66 +3941,75 @@ msgstr "" " full-iso, long-iso, iso, +FORMAT\n" " FORMAT diinterpretasikan seperti `date'\n" -#: src/du.c:375 +#: src/du.c:333 +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 msgid "Infinity" msgstr "Tak terhingga B" -#: src/du.c:600 +#: src/du.c:507 +#, c-format +msgid "mount point %s already traversed" +msgstr "" + +#: src/du.c:624 #, fuzzy, c-format msgid "fts_read failed: %s" msgstr "fts_read gagal" -#: src/du.c:724 +#: src/du.c:780 #, c-format msgid "invalid maximum depth %s" msgstr "kedalaman maksimal %s tidak valid" -#: src/du.c:817 +#: src/du.c:809 +#, fuzzy, c-format +msgid "invalid --threshold argument '-0'" +msgstr "argumen --%s tidak valid %s" + +#: src/du.c:887 #, c-format msgid "cannot both summarize and show all entries" msgstr "tidak dapat meringkas dan menampilkan seluruh masukan bersamaan" -#: src/du.c:824 +#: src/du.c:894 #, 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:830 +#: src/du.c:900 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "peringatan: meringkas konflik dengan --max-depth=%lu" -#: src/du.c:896 src/sort.c:4479 src/wc.c:668 +#: src/du.c:966 src/sort.c:4533 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:949 src/md5sum.c:587 src/od.c:903 src/tac.c:239 src/tac.c:350 -#: src/tac.c:506 src/tac.c:586 src/wc.c:733 +#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 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:963 src/sort.c:4508 src/wc.c:747 +#: src/du.c:1040 src/sort.c:4562 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:980 src/du.c:988 src/wc.c:760 src/wc.c:768 +#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768 msgid "invalid zero-length file name" msgstr "nama berkas panjang-nol tidak valid" -#: src/du.c:1007 src/head.c:149 src/head.c:262 src/head.c:334 src/head.c:538 -#: src/head.c:620 src/head.c:692 src/head.c:750 src/head.c:774 src/tail.c:412 -#: src/tail.c:500 src/tail.c:549 src/tail.c:642 src/tail.c:770 src/tail.c:818 -#: src/tail.c:855 src/tail.c:1782 src/tail.c:1812 src/uniq.c:395 -#, c-format -msgid "error reading %s" -msgstr "error membaca %s" - -#: src/du.c:1010 src/ls.c:2649 src/wc.c:791 +#: src/du.c:1088 src/ls.c:2649 src/wc.c:791 msgid "total" msgstr "total" @@ -4065,9 +4111,12 @@ msgid "Usage: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n" msgstr "Penggunaan: %s [PILIHAN]... [-] [NAMA=NILAI]... [PERINTAH [ARG]...]\n" #: src/env.c:55 +msgid "Set each NAME to VALUE in the environment and run COMMAND.\n" +msgstr "" + +#: src/env.c:61 +#, fuzzy msgid "" -"Set each NAME to VALUE in the environment and run COMMAND.\n" -"\n" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with 0 byte rather than newline\n" " -u, --unset=NAME remove variable from the environment\n" @@ -4079,7 +4128,7 @@ msgstr "" "baris baru\n" " -u, --unset=NAMA hapus variabel dari environment\n" -#: src/env.c:64 +#: src/env.c:68 msgid "" "\n" "A mere - implies -i. If no COMMAND, print the resulting environment.\n" @@ -4088,32 +4137,32 @@ msgstr "" "Hanya - mengindikasikan -i. Jika tidak ada PERINTAH, menampilkan environment " "yang dihasilkan.\n" -#: src/env.c:120 +#: src/env.c:124 #, c-format msgid "cannot unset %s" msgstr "tidak dapat unset %s" -#: src/env.c:131 +#: src/env.c:135 #, c-format msgid "cannot set %s" msgstr "tidak dapat menset %s" -#: src/env.c:148 +#: src/env.c:152 #, c-format msgid "cannot specify --null (-0) with command" msgstr "tidak dapat menspesifikasikan --null (-0) dengan perintah" #: 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" -"\n" msgstr "" "Mengubah tabs di setiap BERKAS ke spasi, menulis ke standard keluaran.\n" "Dengan tidak ada BERKAS, atau ketika BERKAS adalah -, baca standar masukan.\n" "\n" -#: src/expand.c:115 +#: src/expand.c:114 msgid "" " -i, --initial do not convert tabs after non blanks\n" " -t, --tabs=NUMBER have tabs NUMBER characters apart, not 8\n" @@ -4121,34 +4170,34 @@ msgstr "" " -i, --initial jangan mengubah tabs setelah bukan kosong\n" " -t, --tabs=NOMOR jangan tabs NOMOR karakter apart bukan 8\n" -#: src/expand.c:119 +#: src/expand.c:118 msgid "" " -t, --tabs=LIST use comma separated list of explicit tab positions\n" msgstr "" " -t, --tabs=LIST gunakan daftar dipisahkan dengan koma dari posisi tab " "explicit\n" -#: src/expand.c:172 src/unexpand.c:191 +#: src/expand.c:171 src/unexpand.c:190 #, c-format msgid "tab stop is too large %s" msgstr "tab stop terlalu besar %s" -#: src/expand.c:180 src/unexpand.c:199 +#: src/expand.c:179 src/unexpand.c:198 #, c-format msgid "tab size contains invalid character(s): %s" msgstr "ukuran tab berisi karakter tidak valid: %s" -#: src/expand.c:206 src/unexpand.c:225 +#: src/expand.c:205 src/unexpand.c:224 #, c-format msgid "tab size cannot be 0" msgstr "ukuran tab tidak bisa 0" -#: src/expand.c:208 src/unexpand.c:227 +#: src/expand.c:207 src/unexpand.c:226 #, c-format msgid "tab sizes must be ascending" msgstr "ukuran tab harus ascending" -#: src/expand.c:326 src/expand.c:345 src/unexpand.c:374 src/unexpand.c:419 +#: 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 "baris masukan terlalu panjang" @@ -4310,12 +4359,12 @@ msgstr "error dalam pencocokan ekspresi regular" msgid "non-integer argument" msgstr "argumen tidak numeric" -#: src/expr.c:793 src/truncate.c:316 +#: src/expr.c:793 src/truncate.c:314 #, c-format msgid "division by zero" msgstr "pembagian dengan nol" -#: src/expr.c:887 src/sort.c:2029 +#: src/expr.c:887 src/sort.c:2044 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "set LC_ALL='C' untuk memperbaiki masalah" @@ -4325,25 +4374,32 @@ msgstr "set LC_ALL='C' untuk memperbaiki masalah" msgid "the strings compared were %s and %s" msgstr "string yang dibandingkan adalah %s dan %s" -#: src/factor.c:449 -msgid "using arbitrary-precision arithmetic" -msgstr "menggunakan aritmetik arbitrary-precision" +#. This is a proper name. See the gettext manual, section Names. +#: src/factor.c:111 +msgid "Niels Moller" +msgstr "" -#: src/factor.c:460 -msgid "using single-precision arithmetic" -msgstr "menggunakan aritmetik single-precision" +#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459 +#, c-format +msgid "Lucas prime test failure. This should not happen" +msgstr "" -#: src/factor.c:465 src/od.c:1640 src/od.c:1709 +#: src/factor.c:2092 #, c-format -msgid "%s is too large" -msgstr "%s terlalu besar" +msgid "squfof queue overflow" +msgstr "" -#: src/factor.c:469 +#: src/factor.c:2419 #, c-format msgid "%s is not a valid positive integer" msgstr "%s bukan sebuah valid positif integer" -#: src/factor.c:494 +#: src/factor.c:2442 src/od.c:1646 src/od.c:1715 +#, c-format +msgid "%s is too large" +msgstr "%s terlalu besar" + +#: src/factor.c:2454 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4352,7 +4408,7 @@ msgstr "" "Penggunaan: %s [NOMOR]...\n" " atau: %s PILIHAN\n" -#: src/factor.c:499 +#: src/factor.c:2459 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" @@ -4381,20 +4437,20 @@ msgid "cannot stat current directory (now %s)" msgstr "tidak dapat memperoleh statistik direktori sekarang (sekarang %s)" #. This is a proper name. See the gettext manual, section Names. -#: src/fmt.c:37 +#: src/fmt.c:38 msgid "Ross Paterson" msgstr "Ross Paterson" -#: src/fmt.c:269 +#: src/fmt.c:270 #, c-format msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n" msgstr "Penggunaan: %s [-WIDTH] [PILIHAN]... [BERKAS]...\n" -#: src/fmt.c:270 +#: 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" -"\n" msgstr "" "Reformat setiap paragrap dalam BERKAS, tulis ke standar keluaran.\n" "Pilihan -WIDTH adalah kependekan dari bentuk --width=DIGITS.\n" @@ -4413,8 +4469,8 @@ msgstr "" " reattaching prefix ke baris yang diformat\n" " -s, --split-only split baris panjang, tetapi jangan refill\n" -#: src/fmt.c:285 -#, fuzzy, c-format +#: src/fmt.c:287 +#, fuzzy, 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" @@ -4425,7 +4481,7 @@ msgstr "" " -u, --uniform-spacing satu spasi diantara words, dua setelah kalimat\n" " -w, --width=WIDTH lebar baris maksimal (default 75 kolom)\n" -#: src/fmt.c:357 +#: src/fmt.c:359 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -4435,23 +4491,23 @@ msgstr "" "pilihan\n" "pertama; gunakan -w N daripada" -#: src/fmt.c:403 src/fmt.c:414 +#: src/fmt.c:405 src/fmt.c:416 #, c-format msgid "invalid width: %s" msgstr "lebar tidak valid: %s" #: src/fold.c:70 +#, fuzzy msgid "" "Wrap input lines in each FILE (standard input by default), writing to\n" "standard output.\n" -"\n" msgstr "" "Wrap baris masukan dalam setiap BERKAS (standar masukan secara default), " "tulis ke\n" "standar keluaran.\n" "\n" -#: src/fold.c:78 +#: src/fold.c:77 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4461,13 +4517,13 @@ msgstr "" " -s, --spaces break di spaces\n" " -w, --width=WIDTH gunakan WIDTH kolom daripada 80\n" -#: src/fold.c:289 src/pr.c:836 +#: src/fold.c:288 src/pr.c:832 #, c-format 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:75 +#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 #: src/truncate.c:37 msgid "Padraig Brady" msgstr "Padraig Brady" @@ -4486,17 +4542,17 @@ msgstr "" "untuk shell scripts.\n" "\n" -#: src/group-list.c:69 src/id.c:345 src/setuidgid.c:184 +#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184 #, 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:350 +#: src/group-list.c:74 src/id.c:370 #, c-format msgid "failed to get groups for the current process" msgstr "gagal memperoleh grup untuk proses sekarang" -#: src/group-list.c:104 +#: src/group-list.c:114 #, c-format msgid "cannot find name for group ID %lu" msgstr "tidak dapat menemukan nama untuk grup ID %lu" @@ -4537,11 +4593,11 @@ msgid "%s: no such user" msgstr "%s: Tidak ada pengguna seperti itu" #: 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" -"\n" msgstr "" "Tampilkan 10 baris pertama dari setiap BERKAS ke standar keluaran.\n" "Dengan lebih dari satu BERKAS, awali setiap dengan sebuah header memberikan " @@ -4549,7 +4605,7 @@ msgstr "" "Dengan tidak ada BERKAS, atau ketika BERKAS adalah -, baca standar masukan.\n" "\n" -#: src/head.c:118 +#: src/head.c:117 #, fuzzy msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" @@ -4568,7 +4624,7 @@ msgstr "" "baris\n" " terakhir dari setiap berkas\n" -#: src/head.c:126 +#: src/head.c:125 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4577,7 +4633,7 @@ msgstr "" "berkas\n" " -v, --verbose selalu menampilkan header memberikan nama berkas\n" -#: src/head.c:132 +#: src/head.c:131 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -4589,58 +4645,58 @@ 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:152 -#, c-format -msgid "error writing %s" -msgstr "error menulis %s" - -#: src/head.c:155 +#: src/head.c:154 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: berkas telah mengecil terlalu banyak" -#: src/head.c:228 src/head.c:1044 +#: src/head.c:227 src/head.c:1051 #, c-format msgid "%s: number of bytes is too large" msgstr "%s: jumlah dari byte terlalu besar" -#: src/head.c:441 +#: 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:613 src/head.c:684 src/tail.c:450 +#: src/head.c:612 src/head.c:691 src/tail.c:449 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: tidak dapat mencari ofset %s" -#: src/head.c:791 +#: src/head.c:673 +#, fuzzy, c-format +msgid "%s: failed to reset file pointer" +msgstr "%s: gagal untuk menghapus" + +#: src/head.c:798 #, c-format msgid "cannot reposition file pointer for %s" msgstr "tidak dapat mereposisi berkas penunjuk untuk %s" -#: src/head.c:878 +#: src/head.c:885 #, 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:879 +#: src/head.c:886 msgid "number of lines" msgstr "jumlah dari baris" -#: src/head.c:879 +#: src/head.c:886 msgid "number of bytes" msgstr "jumlah dari byte" -#: src/head.c:886 src/tail.c:1947 +#: src/head.c:893 src/tail.c:1947 msgid "invalid number of lines" msgstr "jumlah dari baris tidak valid" -#: src/head.c:887 src/tail.c:1948 +#: src/head.c:894 src/tail.c:1948 msgid "invalid number of bytes" msgstr "jumlah dari byte tidak valid" -#: src/head.c:974 src/head.c:1032 +#: src/head.c:981 src/head.c:1039 #, c-format msgid "invalid trailing option -- %c" msgstr "akhiran pilihan tidak valid -- %c" @@ -4759,86 +4815,86 @@ msgstr "tidak dapat memperoleh konteks proses" msgid "cannot get effective UID" msgstr "tidak dapat dereferensi %s" -#: src/id.c:289 +#: src/id.c:311 #, fuzzy, c-format -msgid "cannot find name for user ID %lu" +msgid "cannot find name for user ID %s" msgstr "tidak dapat menemukan nama untuk pengguna ID %lu" -#: src/id.c:309 +#: src/id.c:329 #, fuzzy, c-format -msgid "uid=%lu" +msgid "uid=%s" msgstr "uid=%lu" -#: src/id.c:314 +#: src/id.c:334 #, fuzzy, c-format -msgid " gid=%lu" -msgstr " egid=%lu" +msgid " gid=%s" +msgstr " gid=%lu" -#: src/id.c:321 +#: src/id.c:341 #, fuzzy, c-format -msgid " euid=%lu" -msgstr " egid=%lu" +msgid " euid=%s" +msgstr " euid=%lu" -#: src/id.c:329 -#, c-format -msgid " egid=%lu" +#: src/id.c:349 +#, fuzzy, c-format +msgid " egid=%s" msgstr " egid=%lu" -#: src/id.c:357 +#: src/id.c:377 msgid " groups=" msgstr " groups=" -#: src/id.c:373 +#: src/id.c:393 #, c-format msgid " context=%s" msgstr " konteks=%s" -#: src/install.c:372 +#: src/install.c:373 #, c-format msgid "warning: %s: failed to change context to %s" msgstr "peringatan: %s: gagal untuk mengubah konteks ke %s" -#: src/install.c:413 +#: src/install.c:414 #, c-format msgid "creating directory %s" msgstr "membuat direktori %s" -#: src/install.c:481 +#: src/install.c:482 #, c-format msgid "cannot change ownership of %s" msgstr "tidak dapat mengubah kepemilikan dari %s" -#: src/install.c:505 +#: src/install.c:506 #, c-format msgid "cannot set time stamps for %s" msgstr "tidak dapat menset time stamps untuk %s" -#: src/install.c:526 src/split.c:412 src/timeout.c:387 +#: src/install.c:527 src/split.c:426 src/timeout.c:439 #, c-format msgid "fork system call failed" msgstr "fork system call gagal" -#: src/install.c:530 +#: src/install.c:531 #, c-format msgid "cannot run %s" msgstr "tidak dapat menjalankan %s" -#: src/install.c:534 +#: src/install.c:535 #, c-format msgid "waiting for strip" msgstr "menunggu untuk strip" -#: src/install.c:536 +#: src/install.c:537 #, c-format msgid "strip process terminated abnormally" msgstr "strip proses berakhir abnormal" -#: src/install.c:557 +#: src/install.c:558 #, c-format msgid "invalid user %s" msgstr "pengguna tidak valid %s" -#: src/install.c:593 +#: src/install.c:594 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -4851,7 +4907,8 @@ msgstr "" " atau: %s [PILIHAN]... -t DIREKTORI ASAL...\n" " atau: %s [PILIHAN]... -d DIREKTORI...\n" -#: src/install.c:600 +#: src/install.c:601 +#, fuzzy msgid "" "\n" "This install program copies files (often just compiled) into destination\n" @@ -4863,7 +4920,6 @@ msgid "" "In the first three forms, copy SOURCE to DEST or multiple SOURCE(s) to\n" "the existing DIRECTORY, while setting permission modes and owner/group.\n" "In the 4th form, create all components of the given DIRECTORY(ies).\n" -"\n" msgstr "" "\n" "Aplikasi pemasangan ini menyalin berkas (sering hanya kompilasi) kedalam\n" @@ -4952,57 +5008,57 @@ msgstr "" " -Z, --context=CONTEXT set SELinux konteks keamanan dari berkas dan " "direktori\n" -#: src/install.c:858 +#: src/install.c:859 #, 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:868 +#: 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:885 +#: src/install.c:886 #, 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:888 +#: src/install.c:889 #, c-format msgid "target directory not allowed when installing a directory" msgstr "direktori tujuan tidak memperbolehkan ketika memasang sebuah direktori" -#: src/install.c:892 +#: 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:946 src/mkdir.c:202 src/stdbuf.c:327 +#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326 #, c-format msgid "invalid mode %s" msgstr "mode tidak valid %s" -#: src/install.c:953 +#: src/install.c:954 #, 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:958 +#: src/install.c:959 #, 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:965 +#: src/install.c:966 #, c-format msgid "options --compare (-C) and --strip are mutually exclusive" msgstr "pilihan --compare (C) dan --strip adalah mutually exclusive" -#: src/install.c:971 +#: src/install.c:972 #, c-format msgid "" "the --compare (-C) option is ignored when you specify a mode with non-" @@ -5012,7 +5068,7 @@ msgstr "" "dengan bit tanpa-ijin" #. This is a proper name. See the gettext manual, section Names. -#: src/join.c:40 src/sort.c:65 +#: src/join.c:40 src/sort.c:66 msgid "Mike Haertel" msgstr "Mike Haertel" @@ -5113,7 +5169,7 @@ msgstr "" #: src/join.c:403 #, c-format -msgid "%s:%ju: is not sorted: %.*s" +msgid "%s:%<PRIuMAX>: is not sorted: %.*s" msgstr "" #: src/join.c:840 src/join.c:1038 @@ -5141,12 +5197,12 @@ msgstr "join field tidak kompatible %lu, %lu" msgid "conflicting empty-field replacement strings" msgstr "konflik penggantian string empty-field" -#: src/join.c:1101 src/sort.c:4414 +#: src/join.c:1101 src/sort.c:4468 #, c-format msgid "multi-character tab %s" msgstr "multi-character tab %s" -#: src/join.c:1105 src/sort.c:4419 +#: src/join.c:1105 src/sort.c:4473 #, c-format msgid "incompatible tabs" msgstr "incompatible tabs" @@ -5168,14 +5224,13 @@ msgstr "" " atau: %s -t [SINYAL]...\n" #: src/kill.c:82 -msgid "" -"Send signals to processes, or list signals.\n" -"\n" +#, fuzzy +msgid "Send signals to processes, or list signals.\n" msgstr "" "Mengirim sinyal ke proses, atau daftar sinyal.\n" "\n" -#: src/kill.c:89 +#: src/kill.c:88 msgid "" " -s, --signal=SIGNAL, -SIGNAL\n" " specify the name or number of the signal to be sent\n" @@ -5188,7 +5243,7 @@ msgstr "" " -l, --list daftar nama sinyal, atau ubah nama sinyal ke/dari nomor\n" " -t, --table tampilkan sebuah tabel dari informasi sinyal\n" -#: src/kill.c:97 +#: src/kill.c:96 #, fuzzy msgid "" "\n" @@ -5203,32 +5258,32 @@ msgstr "" "PID adalah sebuah integer; Jika negatif ini diidentifikasikan sebuah proses " "grup.\n" -#: src/kill.c:206 +#: src/kill.c:205 #, c-format msgid "%s: invalid process id" msgstr "%s: proses id tidak valid" -#: src/kill.c:260 +#: src/kill.c:259 #, c-format msgid "invalid option -- %c" msgstr "pilihan tidak valid -- %c" -#: src/kill.c:269 +#: src/kill.c:268 #, c-format msgid "%s: multiple signals specified" msgstr "%s: multiple sinyal dispesifikasikan" -#: src/kill.c:283 +#: src/kill.c:282 #, c-format msgid "multiple -l or -t options specified" msgstr "multiple pilihan -l atau -t dispesifikasikan" -#: src/kill.c:300 +#: src/kill.c:299 #, c-format msgid "cannot combine signal with -l or -t" msgstr "tidak dapat mengkombinasikan sinyal dengan -l atau -t" -#: src/kill.c:306 +#: src/kill.c:305 #, c-format msgid "no process ID specified" msgstr "tidak ada proses ID dispesifikasikan" @@ -5340,7 +5395,6 @@ msgid "" "When creating hard links, each TARGET must exist. Symbolic links\n" "can hold arbitrary text; if later resolved, a relative link is\n" "interpreted in relation to its parent directory.\n" -"\n" msgstr "" "Dalam bentuk pertama, buat sebuah link ke TARGET dengan nama LINK_NAME.\n" "Dalam bentuk kedua, buat sebuah link ke TARGET di direktori sekarang.\n" @@ -5350,7 +5404,7 @@ msgstr "" "Ketika membuat link keras, setiap TARGET harus ada. Link simbolik\n" "diinterpretasikan dalam hubungan dengan direktori atasnya.\n" -#: src/ln.c:395 +#: src/ln.c:394 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -5373,7 +5427,7 @@ msgstr "" " pembatasan sistem, bahkan untuk superuser)\n" " -f, --force hapus berkas tujuan yang sudah ada\n" -#: src/ln.c:403 +#: src/ln.c:402 #, fuzzy msgid "" " -i, --interactive prompt whether to remove destinations\n" @@ -5396,7 +5450,7 @@ msgstr "" "sambungan simbolik\n" " -s, --symbolic buat link simbolik daripada link keras\n" -#: src/ln.c:412 +#: src/ln.c:411 #, fuzzy msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -5415,24 +5469,10 @@ msgstr "" " -v, --verbose menampilkan nama dari setiap berkas yang " "terhubung\n" -#: src/ln.c:428 -#, 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 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" - -#: src/ln.c:435 +#: src/ln.c:433 #, fuzzy, 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 "" @@ -5509,7 +5549,7 @@ 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:1976 +#: src/ls.c:1750 src/ptx.c:1975 #, c-format msgid "invalid line width: %s" msgstr "lebar baris tidak valid: %s" @@ -5573,7 +5613,7 @@ msgstr "membaca direktori %s" msgid "closing directory %s" msgstr "menutup direktori %s" -#: src/ls.c:3301 +#: src/ls.c:3302 #, c-format msgid "cannot compare file names %s and %s" msgstr "tidak dapat membandingkan nama berkas %s dan %s" @@ -5583,13 +5623,12 @@ msgstr "tidak dapat membandingkan nama berkas %s dan %s" msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" -"\n" msgstr "" "Daftar informasi mengenai BERKAS (direktori sekarang secara default).\n" "Urutkan masukan secara alphabet jika tidak ada dari -cftuvSUX atau --sort.\n" "\n" -#: src/ls.c:4729 +#: src/ls.c:4728 #, fuzzy msgid "" " -a, --all do not ignore entries starting with .\n" @@ -5605,7 +5644,7 @@ msgstr "" " -b, --escape menampilkan oktal escape untuk karakter bukan " "bergambar\n" -#: src/ls.c:4735 +#: src/ls.c:4734 #, fuzzy msgid "" " --block-size=SIZE scale sizes by SIZE before printing them. E." @@ -5630,7 +5669,7 @@ msgstr "" "nama\n" " jika tidak; urutkan dengan ctime\n" -#: src/ls.c:4745 +#: src/ls.c:4744 #, fuzzy msgid "" " -C list entries by columns\n" @@ -5652,7 +5691,7 @@ msgstr "" " -D, --dired menghasilkan keluarkan didesign untuk Emacs' " "dired mode\n" -#: src/ls.c:4753 +#: src/ls.c:4752 #, fuzzy msgid "" " -f do not sort, enable -aU, disable -ls --color\n" @@ -5673,12 +5712,12 @@ msgstr "" " satu-kolom -1, verbose -l, vertikal -C\n" " --full-time seperti -l --time-style=full-iso\n" -#: src/ls.c:4761 +#: src/ls.c:4760 msgid " -g like -l, but do not list owner\n" msgstr "" " -g seperti -l, tetapi jangan mendaftar pemilik\n" -#: src/ls.c:4764 +#: src/ls.c:4763 msgid "" " --group-directories-first\n" " group directories before files.\n" @@ -5692,7 +5731,7 @@ msgstr "" " penggunaan apapun dari --sort=none (-U) " "menonaktifkan grup\n" -#: src/ls.c:4770 +#: src/ls.c:4769 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" @@ -5707,7 +5746,7 @@ msgstr "" " --si sama seperti diatas, tetapi menggunakan " "kelipatan 1000 bukan 1024\n" -#: src/ls.c:4776 +#: src/ls.c:4775 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5729,7 +5768,7 @@ msgstr "" "POLA\n" " (overriden dengan -a atau -A)\n" -#: src/ls.c:4786 +#: src/ls.c:4785 #, fuzzy msgid "" " --indicator-style=WORD append indicator with style WORD to entry " @@ -5750,7 +5789,7 @@ msgstr "" "POLA\n" " -k seperti --block-size=1K\n" -#: src/ls.c:4796 +#: src/ls.c:4795 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5768,7 +5807,7 @@ msgstr "" " -m isi lebar dengan sebuah masukan yang " "dipisahkan dengan koma\n" -#: src/ls.c:4804 +#: src/ls.c:4803 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. " @@ -5788,7 +5827,7 @@ msgstr "" " -p, --indicator-style=slash\n" " menambahkan / indikator ke direktori\n" -#: src/ls.c:4812 +#: src/ls.c:4811 #, fuzzy msgid "" " -q, --hide-control-chars print ? instead of non graphic characters\n" @@ -5809,7 +5848,7 @@ msgstr "" " --quoting-style-chars gunakan quoting style KATA untuk masukan nama:\n" " literal, local, shell, shell-always, c, escape\n" -#: src/ls.c:4821 +#: src/ls.c:4820 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -5821,7 +5860,7 @@ msgstr "" " -s, --size tampilkan ukuran dari setiap berkas yang " "dialokasikan, dalam blok\n" -#: src/ls.c:4826 +#: src/ls.c:4825 msgid "" " -S sort by file size\n" " --sort=WORD sort by WORD instead of name: none -U,\n" @@ -5843,7 +5882,7 @@ msgstr "" "sebagai kunci pengurut\n" " jika --sort=time\n" -#: src/ls.c:4836 +#: src/ls.c:4835 #, fuzzy msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" @@ -5866,7 +5905,7 @@ msgstr "" " jika STYLE di awali dengan `posix-', STYLE\n" " berpengaruh hanya diluar POSIX locale\n" -#: src/ls.c:4845 +#: src/ls.c:4844 #, fuzzy msgid "" " -t sort by modification time, newest first\n" @@ -5876,7 +5915,7 @@ msgstr "" " -T, --tabsize=COLS asumsikan tab stops ada di setiap COLS " "daripada 8\n" -#: src/ls.c:4849 +#: src/ls.c:4848 msgid "" " -u with -lt: sort by, and show, access time\n" " with -l: show access time and sort by name\n" @@ -5893,7 +5932,7 @@ msgstr "" "direktori\n" " -v urutkan sesuai dengan versi\n" -#: src/ls.c:4856 +#: src/ls.c:4855 msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" @@ -5911,7 +5950,7 @@ msgstr "" "untuk setiap berkas\n" " -1 tampilkan sat berkas per baris\n" -#: src/ls.c:4866 +#: src/ls.c:4865 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5928,7 +5967,7 @@ msgstr "" "dapat mengubah konfigurasi ini. Gunakan perintah dircolors untuk " "mengubahnya.\n" -#: src/ls.c:4873 +#: src/ls.c:4872 msgid "" "\n" "Exit status:\n" @@ -5959,7 +5998,7 @@ msgstr "Scott Miller" msgid "David Madore" msgstr "David Madore" -#: src/md5sum.c:162 +#: src/md5sum.c:164 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -5972,7 +6011,7 @@ msgstr "" "dengan tanpa BERKAS, atau ketika BERKAS adalah -, baca standar masukan.\n" "\n" -#: src/md5sum.c:172 +#: src/md5sum.c:174 #, fuzzy msgid "" " -b, --binary read in binary mode (default unless reading tty " @@ -5981,18 +6020,22 @@ msgstr "" " -b, --binary baca dalam mode binary (default kecuali membaca " "tty stdin)\n" -#: src/md5sum.c:176 +#: src/md5sum.c:178 #, fuzzy msgid " -b, --binary read in binary mode\n" msgstr " -b, --binary baca dalam mode binary\n" -#: src/md5sum.c:179 +#: src/md5sum.c:181 #, fuzzy, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr "" " -c, --check baca %s sums dari BERKAS dan periksa mereka\n" -#: src/md5sum.c:183 +#: src/md5sum.c:184 +msgid " --tag create a BSD-style checksum\n" +msgstr "" + +#: src/md5sum.c:188 #, fuzzy msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" @@ -6000,12 +6043,12 @@ msgstr "" " -t, --text baca dalam mode text (default jika membaca tty " "stdin)\n" -#: src/md5sum.c:187 +#: src/md5sum.c:192 #, fuzzy msgid " -t, --text read in text mode (default)\n" msgstr " -t, --text baca dalam mode text (default)\n" -#: src/md5sum.c:190 +#: src/md5sum.c:195 #, fuzzy msgid "" "\n" @@ -6025,12 +6068,12 @@ msgstr "" "dengan baris checksum\n" "\n" -#: src/md5sum.c:198 +#: src/md5sum.c:203 msgid "" " --strict with --check, exit non-zero for any invalid input\n" msgstr "" -#: src/md5sum.c:203 +#: src/md5sum.c:208 #, fuzzy, c-format msgid "" "\n" @@ -6047,42 +6090,42 @@ msgstr "" "untuk binary, ` ' untuk \n" "text), dan nama untuk setiap BERKAS.\n" -#: src/md5sum.c:502 +#: src/md5sum.c:523 #, c-format msgid "%s: too many checksum lines" msgstr "%s: terlalu banyak baris checksum" -#: src/md5sum.c:526 +#: src/md5sum.c:547 #, c-format msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line" msgstr "%s: %<PRIuMAX>: baris checksum %s terformat secara tidak benar" -#: src/md5sum.c:551 +#: src/md5sum.c:572 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: GAGAL membuka atau membaca\n" -#: src/md5sum.c:574 +#: src/md5sum.c:595 msgid "FAILED" msgstr "GAGAL" -#: src/md5sum.c:576 +#: src/md5sum.c:597 msgid "OK" msgstr "OK" -#: src/md5sum.c:600 +#: src/md5sum.c:621 #, 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:610 +#: src/md5sum.c:631 #, 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:618 +#: src/md5sum.c:639 #, fuzzy, c-format msgid "WARNING: %<PRIuMAX> listed file could not be read" msgid_plural "WARNING: %<PRIuMAX> listed files could not be read" @@ -6091,7 +6134,7 @@ msgstr[0] "" msgstr[1] "" "PERINGATAN: %<PRIuMAX> dari %<PRIuMAX> daftar berkas tidak dapat dibaca" -#: src/md5sum.c:626 +#: src/md5sum.c:647 #, fuzzy, c-format msgid "WARNING: %<PRIuMAX> computed checksum did NOT match" msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match" @@ -6100,29 +6143,39 @@ msgstr[0] "" msgstr[1] "" "PERINGATAN: %<PRIuMAX> dari %<PRIuMAX> checksum yang terhitung TIDAK cocok" -#: src/md5sum.c:704 +#: src/md5sum.c:760 #, c-format -msgid "" -"the --binary and --text options are meaningless when verifying checksums" +msgid "--tag does not support --text mode" msgstr "" -"Pilihan --binary dan --text tidak berarti ketika memverifikasikan checksum" -#: src/md5sum.c:712 -#, c-format +#: src/md5sum.c:766 +#, fuzzy, c-format +msgid "the --tag option is meaningless when verifying checksums" +msgstr "pilihan --status hanya berguna ketika memverifikasikan checksum" + +#: src/md5sum.c:773 +#, 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 +#, c-format msgid "the --status option is meaningful only when verifying checksums" msgstr "pilihan --status hanya berguna ketika memverifikasikan checksum" -#: src/md5sum.c:719 +#: src/md5sum.c:788 #, c-format msgid "the --warn option is meaningful only when verifying checksums" msgstr "pilihan --warn hanya berguna ketika memverifikasikan checksum" -#: src/md5sum.c:726 +#: src/md5sum.c:795 #, c-format msgid "the --quiet option is meaningful only when verifying checksums" msgstr "pilihan --quiet hanya berguna ketika memverifikasikan checksum" -#: src/md5sum.c:733 +#: src/md5sum.c:802 #, fuzzy, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "pilihan --status hanya berguna ketika memverifikasikan checksum" @@ -6133,14 +6186,13 @@ msgid "Usage: %s [OPTION]... DIRECTORY...\n" msgstr "Penggunaan: %s [PILIHAN]... DIREKTORI...\n" #: src/mkdir.c:57 -msgid "" -"Create the DIRECTORY(ies), if they do not already exist.\n" -"\n" +#, 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:64 +#: src/mkdir.c:63 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" @@ -6157,7 +6209,7 @@ msgstr "" " -Z, --context=CTX set konteks keamanan SELinux dari setiap direktori\n" " yang dibuat ke CTX\n" -#: src/mkdir.c:169 +#: src/mkdir.c:168 #, c-format msgid "created directory %s" msgstr "direktori %s dibuat" @@ -6168,30 +6220,29 @@ msgid "Usage: %s [OPTION]... NAME...\n" msgstr "Penggunaan: %s [PILIHAN]... NAMA...\n" #: src/mkfifo.c:52 -msgid "" -"Create named pipes (FIFOs) with the given NAMEs.\n" -"\n" +#, 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:59 src/mknod.c:61 +#: src/mkfifo.c:58 src/mknod.c:60 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:62 +#: src/mkfifo.c:61 msgid "" " -Z, --context=CTX set the SELinux security context of each NAME to CTX\n" msgstr "" " -Z, --context=CTX set konteks keamanan SELinux dari setiap NAMA ke CTX\n" -#: src/mkfifo.c:122 src/mknod.c:128 +#: src/mkfifo.c:121 src/mknod.c:127 #, c-format msgid "invalid mode" msgstr "mode tidak valid" -#: src/mkfifo.c:127 src/mknod.c:133 +#: src/mkfifo.c:126 src/mknod.c:132 #, c-format msgid "mode must specify only file permission bits" msgstr "mode seharusnya menspesifikasikan hanya berkas ijin bits" @@ -6202,18 +6253,17 @@ msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n" msgstr "Penggunaan: %s [PILIHAN]... NAMA TIPE [MAJOR MINOR]\n" #: src/mknod.c:54 -msgid "" -"Create the special file NAME of the given TYPE.\n" -"\n" +#, 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:64 +#: 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:69 +#: src/mknod.c:68 msgid "" "\n" "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n" @@ -6230,7 +6280,7 @@ msgstr "" "dengan 0, seperti oktal;\n" "jika tidak, sebagai desimal. TIPE mungkin juga:\n" -#: src/mknod.c:76 +#: src/mknod.c:75 msgid "" "\n" " b create a block (buffered) special file\n" @@ -6242,40 +6292,40 @@ msgstr "" " c, u buat sebuah berkas spesial karakter (unbuffered)\n" " p membuat sebuah FIFO\n" -#: src/mknod.c:151 +#: src/mknod.c:150 msgid "Special files require major and minor device numbers." msgstr "Berkas spesial membutuhkan nomor perangkat major dan minor." -#: src/mknod.c:161 +#: src/mknod.c:160 msgid "Fifos do not have major and minor device numbers." msgstr "FIFO tidak memiliki nomor perangkat major dan minor." -#: src/mknod.c:177 +#: src/mknod.c:176 #, c-format msgid "block special files not supported" msgstr "blok berkas spesial tidak didukung" -#: src/mknod.c:186 +#: src/mknod.c:185 #, c-format msgid "character special files not supported" msgstr "karakter berkas spesial tidak didukung" -#: src/mknod.c:202 +#: src/mknod.c:201 #, c-format msgid "invalid major device number %s" msgstr "nomor perangkat major tidak valid %s" -#: src/mknod.c:207 +#: src/mknod.c:206 #, c-format msgid "invalid minor device number %s" msgstr "nomor perangkat minor tidak valid %s" -#: src/mknod.c:212 +#: src/mknod.c:211 #, c-format msgid "invalid device %s %s" msgstr "perangkat %s %s tidak valid" -#: src/mknod.c:226 +#: src/mknod.c:225 #, c-format msgid "invalid device type %s" msgstr "tipe perangkat %s tidak valid" @@ -6367,60 +6417,59 @@ msgstr "" " direktori relatif melalui -p; selain itu /tmp " "[ditinggalkan]\n" -#: src/mktemp.c:222 +#: 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:228 +#: src/mktemp.c:229 #, c-format msgid "too many templates" msgstr "terlalu banyak template" -#: src/mktemp.c:248 +#: src/mktemp.c:249 #, c-format msgid "with --suffix, template %s must end in X" msgstr "dengan --suffix, template %s harus berakhir dalam X" -#: src/mktemp.c:273 src/split.c:1117 +#: src/mktemp.c:274 src/split.c:1130 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "akhiran tidak valid %s, berisi pemisah direktori" -#: src/mktemp.c:278 +#: src/mktemp.c:279 #, c-format msgid "too few X's in template %s" msgstr "terlalu sedikit X dalam template %s" -#: src/mktemp.c:291 +#: src/mktemp.c:292 #, c-format msgid "invalid template, %s, contains directory separator" msgstr "template tidak valid, %s, berisi pemisah direktori" -#: src/mktemp.c:305 +#: src/mktemp.c:306 #, 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:325 +#: src/mktemp.c:326 #, c-format msgid "failed to create directory via template %s" msgstr "gagal untuk membuat direktori melalui template %s" -#: src/mktemp.c:335 +#: src/mktemp.c:336 #, c-format msgid "failed to create file via template %s" msgstr "gagal untuk membuat berkas melalui template %s" -#: src/mv.c:290 -msgid "" -"Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" -"\n" +#: src/mv.c:292 +#, 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:297 +#: src/mv.c:298 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -6442,7 +6491,7 @@ msgstr "" "Jika anda menspesifikasikan lebih dari salah satu dari -i, -f, -n, hanya " "yang terakhir yang berpengaruh.\n" -#: src/mv.c:306 +#: src/mv.c:307 msgid "" " --strip-trailing-slashes remove any trailing slashes from each " "SOURCE\n" @@ -6454,7 +6503,7 @@ msgstr "" " argumen\n" " -S, --suffix=SUFFIX memaksa akhiran backup biasa\n" -#: src/mv.c:311 +#: src/mv.c:312 msgid "" " -t, --target-directory=DIRECTORY move all SOURCE arguments into " "DIRECTORY\n" @@ -6480,13 +6529,11 @@ msgid "Usage: %s [OPTION] [COMMAND [ARG]...]\n" msgstr "Penggunaan: %s [PILIHAN] [PERINTAH [ARG]...]\n" #: src/nice.c:73 -#, c-format +#, fuzzy, c-format msgid "" "Run COMMAND with an adjusted niceness, which affects process scheduling.\n" -"With no COMMAND, print the current niceness. Nicenesses range from\n" -"%d (most favorable scheduling) to %d (least favorable).\n" -"\n" -" -n, --adjustment=N add integer N to the niceness (default 10)\n" +"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 "" "Jalankan PERINTAH dengan niceness yang telah disesuaikan, yang berpengaruh " "ke penjadwalan proses.\n" @@ -6496,22 +6543,26 @@ msgstr "" "\n" " -n, --adjustment=N tambahkan integer N ke niceness (default 10)\n" -#: src/nice.c:168 +#: src/nice.c:82 +msgid " -n, --adjustment=N add integer N to the niceness (default 10)\n" +msgstr "" + +#: src/nice.c:172 #, c-format msgid "invalid adjustment %s" msgstr "adjustmen %s tidak valid" -#: src/nice.c:177 +#: src/nice.c:181 #, c-format msgid "a command must be given with an adjustment" msgstr "sebuah perintah harus diberikan dengan sebuah adjustmen" -#: src/nice.c:184 src/nice.c:195 +#: src/nice.c:188 src/nice.c:199 #, c-format msgid "cannot get niceness" msgstr "tidak dapat memperoleh niceness" -#: src/nice.c:201 +#: src/nice.c:205 #, c-format msgid "cannot set niceness" msgstr "tidak dapat menset niceness" @@ -6521,17 +6572,17 @@ msgstr "tidak dapat menset niceness" msgid "Scott Bartram" msgstr "Scott Bartram" -#: src/nl.c:186 +#: 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" -"\n" msgstr "" "Tulis setiap BERKAS ke standar keluaran, dengan ditambahkan nomor baris.\n" "Dengan tidak ada BERKAS, atau ketika BERKAS adalah -, baca standar masukan.\n" "\n" -#: src/nl.c:194 +#: src/nl.c:186 msgid "" " -b, --body-numbering=STYLE use STYLE for numbering body lines\n" " -d, --section-delimiter=CC use CC for separating logical pages\n" @@ -6543,7 +6594,7 @@ msgstr "" " -f, --footer-numbering=STYLE gunakan STYLE untuk penomoran baris " "footer\n" -#: src/nl.c:199 +#: src/nl.c:191 msgid "" " -h, --header-numbering=STYLE use STYLE for numbering header lines\n" " -i, --line-increment=NUMBER line number increment at each line\n" @@ -6565,7 +6616,7 @@ msgstr "" " -s, --number-separator=STRING tambahkan STRING sesudah (yang mungkin) " "nomor baris\n" -#: src/nl.c:207 +#: src/nl.c:199 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" @@ -6575,7 +6626,7 @@ msgstr "" " -w, --number-width=NOMOR gunakan NOMOR kolom untuk setiap nomor " "baris\n" -#: src/nl.c:213 +#: src/nl.c:205 msgid "" "\n" "By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC are\n" @@ -6587,7 +6638,7 @@ msgstr "" "dua pembatas karakter untuk memisahkan halaman logikal, sebuah karakter\n" "yang hilang menandakan : Tipe \\\\ untuk \\. STYLE adalah satu dari:\n" -#: src/nl.c:219 +#: src/nl.c:211 msgid "" "\n" " a number all lines\n" @@ -6617,54 +6668,47 @@ msgstr "" " rz dirapatkan ke kanan, diawali nol\n" "\n" -#: src/nl.c:286 +#: src/nl.c:278 #, c-format msgid "line number overflow" msgstr "nomor baris overflow" -#: src/nl.c:486 +#: src/nl.c:478 #, c-format msgid "invalid header numbering style: %s" msgstr "gaya penomoran header: %s tidak valid" -#: src/nl.c:494 +#: src/nl.c:486 #, c-format msgid "invalid body numbering style: %s" msgstr "gaya penomoran body: %s tidak valid" -#: src/nl.c:502 +#: src/nl.c:494 #, c-format msgid "invalid footer numbering style: %s" msgstr "gaya penomoran footer: %s tidak valid" -#: src/nl.c:511 +#: src/nl.c:503 #, c-format msgid "invalid starting line number: %s" msgstr "awalan nomor baris: %s tidak valid" -#: src/nl.c:517 -#, c-format -msgid "WARNING: --page-increment is deprecated; use --line-increment instead" -msgstr "" -"PERINGATAN: --page-increment sudah ditinggalkan; lebih baik gunakan --line-" -"increment" - -#: src/nl.c:524 +#: src/nl.c:512 #, c-format msgid "invalid line number increment: %s" msgstr "nomor baris increment: %s tidak valid" -#: src/nl.c:536 +#: src/nl.c:524 #, c-format msgid "invalid number of blank lines: %s" msgstr "jumlah dari baris kosong: %s tidak valid" -#: src/nl.c:550 +#: src/nl.c:538 #, c-format msgid "invalid line number field width: %s" msgstr "lebar field nomor baris: %s tidak valid" -#: src/nl.c:569 +#: src/nl.c:557 #, c-format msgid "invalid line numbering format: %s" msgstr "format penomoran baris: %s tidak valid" @@ -6715,11 +6759,6 @@ msgstr "gagal untuk me-'render' masukan baku yang tidak berguna" msgid "ignoring input" msgstr "mengabaikan masukan" -#: src/nohup.c:163 src/nohup.c:165 -#, c-format -msgid "failed to open %s" -msgstr "gagal untuk membuka %s" - #: src/nohup.c:175 #, c-format msgid "ignoring input and appending output to %s" @@ -6751,16 +6790,16 @@ msgid "failed to redirect standard error" msgstr "gagal untuk meredirect standar error" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:32 +#: src/nproc.c:33 msgid "Giuseppe Scrivano" msgstr "Giuseppe Scrivano" -#: src/nproc.c:56 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 +#: src/nproc.c:57 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Penggunaan: %s [PILIHAN]...\n" -#: src/nproc.c:57 +#: src/nproc.c:58 msgid "" "Print the number of processing units available to the current process,\n" "which may be less than the number of online processors\n" @@ -6770,7 +6809,7 @@ msgstr "" "yang mungkin lebih kecil dari jumlah prosesor online\n" "\n" -#: src/nproc.c:62 +#: src/nproc.c:63 msgid "" " --all print the number of installed processors\n" " --ignore=N if possible, exclude N processing units\n" @@ -6778,11 +6817,348 @@ msgstr "" " --all tampilkan jumlah dari prosesor yang terpasang\n" " --ignore=N jika memungkinkan, abaikan N satuan pemrosesan\n" -#: src/nproc.c:106 +#: src/nproc.c:107 #, c-format 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 +msgid "Assaf Gordon" +msgstr "" + +#: src/numfmt.c:676 +#, fuzzy, c-format +msgid "value too large to be converted: '%s'" +msgstr "%s: nilai tidak secara lengkap diubah" + +#: src/numfmt.c:680 +#, fuzzy, c-format +msgid "invalid number: '%s'" +msgstr "nomor %s tidak valid" + +#: src/numfmt.c:684 +#, c-format +msgid "rejecting suffix in input: '%s' (consider using --from)" +msgstr "" + +#: src/numfmt.c:688 +#, fuzzy, c-format +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:723 +#, fuzzy, c-format +msgid "failed to prepare value '%Lf' for printing" +msgstr "%s: gagal untuk membuka untuk menulis" + +#: src/numfmt.c:787 +#, fuzzy, c-format +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 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [NUMBER]...\n" +msgstr "Penggunaan: %s [PILIHAN]... [PENGGUNA]...\n" + +#: src/numfmt.c:816 +msgid "" +"Reformat NUMBER(s), or the numbers from standard input if none are " +"specified.\n" +msgstr "" + +#: src/numfmt.c:820 +msgid " --debug print warnings about invalid input\n" +msgstr "" + +#: src/numfmt.c:823 +msgid "" +" -d, --delimiter=X use X instead of whitespace for field delimiter\n" +msgstr "" + +#: src/numfmt.c:826 +msgid "" +" --field=N replace the number in input field N (default is 1)\n" +msgstr "" + +#: src/numfmt.c:829 +msgid "" +" --format=FORMAT use printf style floating-point FORMAT;\n" +" see FORMAT below for details\n" +msgstr "" + +#: src/numfmt.c:833 +msgid "" +" --from=UNIT auto-scale input numbers to UNITs; default is " +"'none';\n" +" see UNIT below\n" +msgstr "" + +#: src/numfmt.c:837 +msgid "" +" --from-unit=N specify the input unit size (instead of the default " +"1)\n" +msgstr "" + +#: src/numfmt.c:840 +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 "" + +#: src/numfmt.c:844 +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 +msgid "" +" --invalid=MODE failure mode for invalid numbers: MODE can be:\n" +" abort (default), fail, warn, ignore\n" +msgstr "" + +#: src/numfmt.c:852 +msgid "" +" --padding=N pad the output to N characters; positive N will\n" +" right-align; negative N will left-align;\n" +" padding is ignored if the output is wider than N;\n" +" the default is to automatically pad if a " +"whitespace\n" +" is found\n" +msgstr "" + +#: src/numfmt.c:859 +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 +msgid "" +" --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" +" SUFFIX in input numbers\n" +msgstr "" + +#: src/numfmt.c:867 +msgid "" +" --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" +msgstr "" + +#: src/numfmt.c:870 +msgid "" +" --to-unit=N the output unit size (instead of the default 1)\n" +msgstr "" + +#: src/numfmt.c:877 +#, fuzzy +msgid "" +"\n" +"UNIT options:\n" +msgstr "" +"Pilihan lain:\n" +"\n" + +#: src/numfmt.c:880 +msgid " none no auto-scaling is done; suffixes will trigger an error\n" +msgstr "" + +#: src/numfmt.c:883 +msgid "" +" auto accept optional single/two letter suffix:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" +msgstr "" + +#: src/numfmt.c:889 +msgid "" +" si accept optional single letter suffix:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:894 +msgid "" +" iec accept optional single letter suffix:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:899 +msgid "" +" iec-i accept optional two-letter suffix:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:905 +#, 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" +msgstr "" + +#: src/numfmt.c:912 +#, c-format +msgid "" +"\n" +"Exit status is 0 if all input numbers were successfully converted.\n" +"By default, %s will stop at the first conversion error with exit status 2.\n" +"With --invalid='fail' a warning is printed for each conversion error\n" +"and the exit status is 2. With --invalid='warn' each conversion error is\n" +"diagnosed, but the exit status is 0. With --invalid='ignore' conversion\n" +"errors are not diagnosed and the exit status is 0.\n" +msgstr "" + +#: src/numfmt.c:921 +#, c-format +msgid "" +"\n" +"Examples:\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" +msgstr "" + +#: src/numfmt.c:974 src/seq.c:212 +#, c-format +msgid "format %s has no %% directive" +msgstr "format %s tidak memiliki %% direktif" + +#: src/numfmt.c:990 +#, fuzzy, c-format +msgid "invalid format %s (width overflow)" +msgstr "format lebar tidak valid" + +#: src/numfmt.c:1007 src/seq.c:229 +#, c-format +msgid "format %s ends in %%" +msgstr "format %s berakhir dalam %%" + +#: src/numfmt.c:1010 +#, c-format +msgid "invalid format %s, directive must be %%['][-][N]f" +msgstr "" + +#: src/numfmt.c:1018 src/seq.c:236 +#, c-format +msgid "format %s has too many %% directives" +msgstr "format %s memiliki terlalu banyak %% direktif" + +#: src/numfmt.c:1070 +#, fuzzy, c-format +msgid "invalid suffix in input '%s': '%s'" +msgstr "akhiran dalam %s%s tidak valid argumen `%s'" + +#: src/numfmt.c:1092 +#, c-format +msgid "value too large to be printed: '%Lg' (consider using --to)" +msgstr "" + +#: src/numfmt.c:1100 +#, c-format +msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" +msgstr "" + +#: src/numfmt.c:1184 +#, c-format +msgid "large input value '%s': possible precision loss" +msgstr "" + +#: src/numfmt.c:1293 +#, 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 "jangkauan halaman %s tidak valid" + +#: src/numfmt.c:1401 +#, fuzzy, c-format +msgid "invalid field value '%s'" +msgstr "nomor field tidak valid: %s" + +#: src/numfmt.c:1430 +#, fuzzy, c-format +msgid "invalid header value '%s'" +msgstr "tanggal tidak valid %s" + +#: src/numfmt.c:1456 +#, 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 +#, fuzzy, c-format +msgid "no conversion option specified" +msgstr "banyak pilihan -i dispesifikasikan" + +#: src/numfmt.c:1471 +#, fuzzy, c-format +msgid "grouping cannot be combined with --to" +msgstr "berkas operand tidak dapat dikombinasikan dengan --files0-from." + +#: src/numfmt.c:1473 +#, c-format +msgid "grouping has no effect in this locale" +msgstr "" + +#: src/numfmt.c:1486 +#, c-format +msgid "--header ignored with command-line input" +msgstr "" + +#: src/numfmt.c:1511 +#, fuzzy, c-format +msgid "error reading input" +msgstr "error membaca %s" + +#: src/numfmt.c:1520 +#, 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 #, c-format msgid "" @@ -6813,27 +7189,48 @@ msgstr "" "\n" #: src/od.c:307 -msgid "All arguments to long options are mandatory for short options.\n" -msgstr "Semua argumen ke pilihan panjang adalah wajib untuk pilihan pendek.\n" +#, fuzzy +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" +"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" +"at first byte printed, incremented when dump is progressing.\n" +"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" +"Jika format pemanggilan pertama dan kedua kedua diaplikasikan, format kedua " +"diasumsikan\n" +"jika operand terakhir diawali dengan + atau (jika disana ada 2 operand) " +"sebuah digit.\n" +"Sebuah OFSET operand berarti -j OFSET. LABEL adalah pseudo-address\n" +"di byte pertama yang ditampilkan, naikan ketika dump berjalan.\n" +"Untuk OFFSET dan LABEL, sebuah awalan 0x atau 0X mengindikasikan " +"hexadesimal;\n" +"akhiran mungkin . untuk oktal dan b untuk kelipatan dari 512.\n" -#: src/od.c:310 +#: src/od.c:318 +#, fuzzy msgid "" -" -A, --address-radix=RADIX decide how file offsets are printed\n" +" -A, --address-radix=RADIX output format for file offsets. RADIX is one\n" +" of [doxn], for Decimal, Octal, Hex or None\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:314 +#: src/od.c:323 #, 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" -" --traditional accept arguments in traditional form\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 batasi dump ke BYTE masukan byte\n" " -S, --strings[=BYTES] keluarkan string dari paling tidak karakter " @@ -6844,9 +7241,11 @@ msgstr "" " -w, --width[=BYTES] keluarkan byte BYTES per baris keluaran\n" " --traditional menerima argumen dalam format tradisional\n" -#: src/od.c:324 +#: src/od.c:336 +#, fuzzy 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" @@ -6861,7 +7260,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:332 +#: src/od.c:345 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -6877,32 +7276,12 @@ 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:340 +#: src/od.c:353 +#, fuzzy msgid "" "\n" -"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" -"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" -"at first byte printed, incremented when dump is progressing.\n" -"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" -"Jika format pemanggilan pertama dan kedua kedua diaplikasikan, format kedua " -"diasumsikan\n" -"jika operand terakhir diawali dengan + atau (jika disana ada 2 operand) " -"sebuah digit.\n" -"Sebuah OFSET operand berarti -j OFSET. LABEL adalah pseudo-address\n" -"di byte pertama yang ditampilkan, naikan ketika dump berjalan.\n" -"Untuk OFFSET dan LABEL, sebuah awalan 0x atau 0X mengindikasikan " -"hexadesimal;\n" -"akhiran mungkin . untuk oktal dan b untuk kelipatan dari 512.\n" - -#: src/od.c:349 -msgid "" "\n" "TYPE is made up of one or more of these specifications:\n" -"\n" " a named character, ignoring high-order bit\n" " c ASCII character or backslash escape\n" msgstr "" @@ -6912,7 +7291,7 @@ msgstr "" " a karakter bernama, mengabaikan high-order bit\n" " c karakter ASCII atau backslash escape\n" -#: src/od.c:356 +#: src/od.c:360 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -6926,10 +7305,11 @@ msgstr "" " u[SIZE] unsigned desimal, SIZE bytes per integer\n" " x[SIZE] hexadesimal, SIZE bytes per integer\n" -#: src/od.c:363 +#: src/od.c:367 +#, fuzzy msgid "" "\n" -"SIZE is a number. For TYPE in doux, SIZE may also be C for\n" +"SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" "sizeof(char), S for sizeof(short), I for sizeof(int) or L for\n" "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" @@ -6941,43 +7321,37 @@ msgstr "" "D\n" "untuk sizeof (double) atau L untuk sizeof(long double).\n" -#: src/od.c:370 +#: src/od.c:374 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" +"Adding a z suffix to any type displays printable characters at the end of\n" +"each 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" -#: src/od.c:380 +#: src/od.c:379 +#, 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" +"\n" +"\n" +"BYTES is hex with 0x or 0X prefix, and may have a multiplier suffix:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"and so on for G, T, P, E, Z, Y.\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" +"\n" +"K 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" -#: src/od.c:633 src/od.c:753 +#: src/od.c:639 src/od.c:759 #, c-format msgid "invalid type string %s" msgstr "tipe string %s tidak valid" -#: src/od.c:643 +#: src/od.c:649 #, c-format msgid "" "invalid type string %s;\n" @@ -6986,7 +7360,7 @@ msgstr "" "tipe string %s tidak valid;\n" "Sistem ini tidak memberikan sebuah tipe %lu-byte integral" -#: src/od.c:764 +#: src/od.c:770 #, c-format msgid "" "invalid type string %s;\n" @@ -6995,38 +7369,38 @@ msgstr "" "Tipe string %s tidak valid;\n" "Sistem ini tidak memberikan sebuah %lu-byte tipe floating point" -#: src/od.c:822 +#: src/od.c:828 #, fuzzy, c-format msgid "invalid character '%c' in type string %s" msgstr "karakter `%c' tidak valid dalam tipe string %s" -#: src/od.c:1047 +#: src/od.c:1053 #, c-format msgid "cannot skip past end of combined input" msgstr "tidak dapat melewatkan akhir dari kombinasi masukan" -#: src/od.c:1603 +#: src/od.c:1609 #, 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:1729 +#: src/od.c:1735 #, c-format msgid "no type may be specified when dumping strings" msgstr "tidak ada tipe yang bisa dispesikasikan ketika mendump strings" -#: src/od.c:1804 +#: src/od.c:1810 msgid "compatibility mode supports at most one file" msgstr "mode kompabilitas melayani di setiap berkas." -#: src/od.c:1825 +#: src/od.c:1831 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "Skip-bytes + read-bytes terlalu besar" -#: src/od.c:1868 +#: src/od.c:1874 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "peringatan: lebar tidak valid %lu; menggunakan %d" @@ -7042,18 +7416,18 @@ msgid "standard input is closed" msgstr "standar masukan telah ditutup" #: 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" -"\n" msgstr "" "Tulis baris berisi dari baris berurut dari\n" "setiap BERKAS, dipisahkan dengan TAB, ke standar keluaran.\n" "Dengan tidak ada BERKAS, atau ketika BERKAS adalah -, baca standar masukan.\n" "\n" -#: src/paste.c:448 +#: 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" @@ -7062,7 +7436,7 @@ msgstr "" " -s, --serial paste satu berkas di satu waktu daripada secara " "paralel\n" -#: src/paste.c:509 +#: src/paste.c:508 #, c-format msgid "delimiter list ends with an unescaped backslash: %s" msgstr "daftar pembatas berakhir dengan sebuah unescaped backslash: %s" @@ -7123,80 +7497,80 @@ msgid "Kaveh Ghazi" msgstr "Kaveh Ghazi" #. TRANSLATORS: Real name is unknown; at most 19 characters. -#: src/pinky.c:250 +#: src/pinky.c:242 msgid " ???" msgstr " ???" #. TRANSLATORS: Idle time is unknown; at most 5 characters. -#: src/pinky.c:274 +#: src/pinky.c:266 msgid "?????" msgstr "?????" -#: src/pinky.c:323 +#: src/pinky.c:314 #, c-format msgid "Login name: " msgstr "Nama login: " -#: src/pinky.c:326 +#: src/pinky.c:317 #, c-format msgid "In real life: " msgstr "Dalam kehidupan nyata: " #. TRANSLATORS: Real name is unknown; no hard limit. -#: src/pinky.c:330 +#: src/pinky.c:321 msgid "???\n" msgstr "???\n" -#: src/pinky.c:350 +#: src/pinky.c:341 #, c-format msgid "Directory: " msgstr "Direktori: " -#: src/pinky.c:352 +#: src/pinky.c:343 #, c-format msgid "Shell: " msgstr "Shell: " -#: src/pinky.c:371 +#: src/pinky.c:362 #, c-format msgid "Project: " msgstr "Projek: " -#: src/pinky.c:395 +#: src/pinky.c:386 #, c-format msgid "Plan:\n" msgstr "Rencana:\n" -#: src/pinky.c:414 +#: src/pinky.c:405 msgid "Login" msgstr "Login" -#: src/pinky.c:416 +#: src/pinky.c:407 msgid "Name" msgstr "Nama" -#: src/pinky.c:417 +#: src/pinky.c:408 msgid " TTY" msgstr " TTY" -#: src/pinky.c:419 +#: src/pinky.c:410 msgid "Idle" msgstr "Idle" -#: src/pinky.c:420 +#: src/pinky.c:411 msgid "When" msgstr "Ketika" -#: src/pinky.c:423 +#: src/pinky.c:414 msgid "Where" msgstr "Dimana" -#: src/pinky.c:502 +#: src/pinky.c:493 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Penggunaan: %s [PILIHAN]... [PENGGUNA]...\n" -#: src/pinky.c:503 +#: src/pinky.c:494 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7214,7 +7588,7 @@ msgstr "" " -p mengabaikan berkas rencana pengguna dalam format panjang\n" " -s jangan memendekan format keluaran, ini adalah default\n" -#: src/pinky.c:511 +#: src/pinky.c:502 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7230,7 +7604,7 @@ msgstr "" "idle\n" " dalam format pendek\n" -#: src/pinky.c:520 +#: src/pinky.c:511 #, fuzzy, c-format msgid "" "\n" @@ -7241,7 +7615,7 @@ msgstr "" "Sebuah aplikasi ringan `finger'; menampilkan informasi pengguna.\n" "Berkas utmp akan berada %s.\n" -#: src/pinky.c:604 +#: src/pinky.c:595 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "" @@ -7258,89 +7632,88 @@ msgstr "Pete TerMaat" msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:912 +#: src/pr.c:908 #, fuzzy, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "`--pages=FIRST_PAGE[:LAST_PAGE]' argumen hilang" -#: src/pr.c:914 +#: src/pr.c:910 #, c-format msgid "invalid page range %s" msgstr "jangkauan halaman %s tidak valid" -#: src/pr.c:979 +#: src/pr.c:975 #, fuzzy, c-format msgid "'-l PAGE_LENGTH' invalid number of lines: %s" msgstr "`-l PAGE_LENGTH' nomor baris tidak valid: %s" -#: src/pr.c:1003 +#: src/pr.c:999 #, fuzzy, c-format msgid "'-N NUMBER' invalid starting line number: %s" msgstr "`-N NOMOR' tidak valid dimulai dibaris nomor: %s" -#: src/pr.c:1015 +#: src/pr.c:1011 #, fuzzy, c-format msgid "'-o MARGIN' invalid line offset: %s" msgstr "`-o MARGIN' tidak valid di baris ofset: %s" -#: src/pr.c:1056 +#: src/pr.c:1052 #, fuzzy, c-format msgid "'-w PAGE_WIDTH' invalid number of characters: %s" msgstr "`-w PAGE_WIDTH' tidak valid jumlah dari karakter: %s" -#: src/pr.c:1070 +#: src/pr.c:1066 #, fuzzy, c-format msgid "'-W PAGE_WIDTH' invalid number of characters: %s" msgstr "`-W PAGE_WIDTH' tidak valid jumlah dari karakter: %s" -#: src/pr.c:1100 +#: src/pr.c:1096 #, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "" "tidak dapat menspesifikasikan jumlah dari kolom ketika menampilkan dalam " "paralel" -#: src/pr.c:1104 +#: src/pr.c:1100 #, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "" "tidak dapat menspesifikasikan baik mencetak across dan mencetak dalam paralel" -#: src/pr.c:1200 +#: src/pr.c:1196 #, fuzzy, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "`-%c' kelebihan karakter atau jumlah tida valid dalam argumen: %s" -#: src/pr.c:1304 +#: src/pr.c:1293 #, c-format msgid "page width too narrow" msgstr "lebar halaman terlalu kecil" -#: src/pr.c:2369 +#: src/pr.c:2353 #, c-format msgid "starting page number %<PRIuMAX> exceeds page count %<PRIuMAX>" msgstr "" "nomor halaman dimulai dari %<PRIuMAX> melebihi jumlah halaman %<PRIuMAX>" -#: src/pr.c:2396 +#: src/pr.c:2380 #, c-format msgid "page number overflow" msgstr "jumlah halaman berlebihan" -#: src/pr.c:2401 +#: src/pr.c:2385 #, c-format msgid "Page %<PRIuMAX>" msgstr "Halaman %<PRIuMAX>" -#: src/pr.c:2773 -msgid "" -"Paginate or columnate FILE(s) for printing.\n" -"\n" +#: src/pr.c:2757 +#, fuzzy +msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" "Paginate atau columnate BERKAS untuk dicetak.\n" "\n" -#: src/pr.c:2780 +#: src/pr.c:2763 #, fuzzy msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" @@ -7358,7 +7731,7 @@ msgstr "" "dalam\n" " kolom disetiap halaman.\n" -#: src/pr.c:2788 +#: src/pr.c:2771 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7375,7 +7748,7 @@ msgstr "" " -d, --double-space\n" " keluaran menggunakan dua spasi\n" -#: src/pr.c:2796 +#: src/pr.c:2779 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7397,7 +7770,7 @@ msgstr "" "5 baris header\n" " dan trailer tanpat -F)\n" -#: src/pr.c:2806 +#: src/pr.c:2789 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -7420,7 +7793,7 @@ msgstr "" "ada kolom\n" " penyesuaian, --sep-string[=STRING] set pemisah\n" -#: src/pr.c:2815 +#: src/pr.c:2798 msgid "" " -l, --length=PAGE_LENGTH\n" " set the page length to PAGE_LENGTH (66) lines\n" @@ -7436,7 +7809,7 @@ msgstr "" " truncate baris, tetapi gabungkan baris dari lebar " "panjang lengkap dengan -J\n" -#: src/pr.c:2822 +#: src/pr.c:2805 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -7455,7 +7828,7 @@ msgstr "" "berkas\n" " pertama yang ditampilkan (lihat +FIRST_PAGE)\n" -#: src/pr.c:2830 +#: src/pr.c:2813 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -7471,7 +7844,7 @@ msgstr "" " abaikan peringatan ketika sebuah berkas tidak dapat " "dibuka\n" -#: src/pr.c:2837 +#: src/pr.c:2820 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -7488,7 +7861,7 @@ msgstr "" "kolom\n" " pilihan (-COLUMN|-a -COLUMN|-m) kecuali -w diset\n" -#: src/pr.c:2844 +#: src/pr.c:2827 #, fuzzy msgid "" " -S[STRING], --sep-string[=STRING]\n" @@ -7505,7 +7878,7 @@ msgstr "" "pilihan kolom\n" " -t, --omit-header abaikan header halaman dan akhiran\n" -#: src/pr.c:2851 +#: src/pr.c:2834 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -7529,7 +7902,7 @@ msgstr "" " keluaran multiple text-kolom saja, -s[char] matikan " "(72)\n" -#: src/pr.c:2861 +#: src/pr.c:2844 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -7543,7 +7916,7 @@ msgstr "" "interference\n" " dengan -S atau -s\n" -#: src/pr.c:2869 +#: src/pr.c:2852 msgid "" "\n" "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" @@ -7708,16 +8081,16 @@ msgstr "" " atau: %s -G [PILIHAN]... [INPUT [OUTPUT]]\n" #: src/ptx.c:1821 +#, fuzzy msgid "" "Output a permuted index, including context, of the words in the input " "files.\n" -"\n" msgstr "" "Keluarkan sebuah index yang termutasi, termasuk konteks, dari kata dalam " "berkas masukan.\n" "\n" -#: src/ptx.c:1828 +#: src/ptx.c:1827 #, fuzzy msgid "" " -A, --auto-reference output automatically generated references\n" @@ -7730,7 +8103,7 @@ msgstr "" " -F, --flag-truncation=STRING gunakan STRING untuk flagging pemotongan " "baris\n" -#: src/ptx.c:1833 +#: src/ptx.c:1832 #, fuzzy msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" @@ -7748,7 +8121,7 @@ msgstr "" "kalimat\n" " -T, --format=tex menghasilkan keluaran seperti direktif Tex\n" -#: src/ptx.c:1840 +#: src/ptx.c:1839 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -7769,7 +8142,7 @@ msgstr "" " -o, --only-file=FILE baca hanya daftar kata saja dari BERKAS " "ini\n" -#: src/ptx.c:1848 +#: src/ptx.c:1847 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -7782,7 +8155,7 @@ msgstr "" " -w, --width=NUMBER lebar keluaran dalam kolom, referensi " "diabaikan\n" -#: src/ptx.c:1855 +#: src/ptx.c:1854 #, fuzzy msgid "" "\n" @@ -7792,7 +8165,7 @@ msgstr "" "Dengan tanpa BERKAS atau jika BERKAS adalah -, baca Standar Masukan. `-F /' " "secara default.\n" -#: src/ptx.c:1949 +#: src/ptx.c:1948 #, c-format msgid "invalid gap width: %s" msgstr "lebar gap tidak valid: %s" @@ -7819,7 +8192,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "gagal untuk chdir ke %s" -#: src/pwd.c:170 src/pwd.c:277 +#: src/pwd.c:170 src/pwd.c:277 src/split.c:373 #, c-format msgid "failed to stat %s" msgstr "gagal memperoleh statistik %s" @@ -7835,14 +8208,15 @@ msgid "ignoring non-option arguments" msgstr "mengabaikan argumen bukan pilihan" #. This is a proper name. See the gettext manual, section Names. -#: src/readlink.c:33 +#: src/readlink.c:32 msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 +#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147 +#: src/stat.c:1349 src/touch.c:212 #, c-format -msgid "Usage: %s [OPTION]... FILE\n" -msgstr "Penggunaan: %s [PILIHAN]... BERKAS\n" +msgid "Usage: %s [OPTION]... FILE...\n" +msgstr "Penggunaan: %s [PILIHAN]... BERKAS...\n" #: src/readlink.c:63 msgid "" @@ -7875,16 +8249,19 @@ msgstr "" " semua komponen harus ada\n" #: src/readlink.c:75 +#, fuzzy msgid "" " -m, --canonicalize-missing canonicalize by following every symlink in\n" " every component of the given name " "recursively,\n" " without requirements on components " "existence\n" -" -n, --no-newline do not output the trailing newline\n" +" -n, --no-newline do not output the trailing delimiter\n" " -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" msgstr "" " -m, --canonicalize-missing canonicalize dengan mengikuti setiap symlink " "dalam\n" @@ -7896,11 +8273,10 @@ msgstr "" " -s, --silent menekan hampir seluruh pesan error\n" " -v, --verbose melaporkan pesan error\n" -#: src/realpath.c:71 src/rm.c:134 src/shred.c:147 src/stat.c:1330 -#: src/touch.c:215 -#, c-format -msgid "Usage: %s [OPTION]... FILE...\n" -msgstr "Penggunaan: %s [PILIHAN]... BERKAS...\n" +#: src/readlink.c:152 +#, fuzzy, c-format +msgid "ignoring --no-newline with multiple arguments" +msgstr "mengabaikan argumen bukan pilihan" #: src/realpath.c:72 msgid "" @@ -7927,12 +8303,12 @@ msgstr "" msgid "generating relative path" msgstr "" -#: src/remove.c:286 +#: src/remove.c:273 #, c-format msgid "%s: descend into write-protected directory %s? " msgstr "%s: descend ke write-protected direktori %s? " -#: src/remove.c:287 +#: src/remove.c:274 #, c-format msgid "%s: descend into directory %s? " msgstr "%s: berlanjut ke direktori %s? " @@ -7941,37 +8317,37 @@ msgstr "%s: berlanjut ke direktori %s? " #. translate "%s: remove %s (write-protected) %s? " #. instead. It should avoid grammatical problems #. with the output of file_type. -#: src/remove.c:303 +#: src/remove.c:290 #, c-format msgid "%s: remove write-protected %s %s? " msgstr "%s: menghapus write-protected %s %s? " -#: src/remove.c:304 +#: src/remove.c:291 #, c-format msgid "%s: remove %s %s? " msgstr "%s: menghapus %s %s? " -#: src/remove.c:417 +#: src/remove.c:374 #, c-format msgid "removed directory: %s\n" msgstr "menghapus direktori: %s\n" -#: src/remove.c:481 +#: src/remove.c:444 #, c-format msgid "cannot remove directory: %s" msgstr "tidak dapat menghapus direktori: %s" -#: src/remove.c:537 +#: src/remove.c:500 #, c-format msgid "skipping %s, since it's on a different device" msgstr "melewatkan %s, karena ini ada di perangkat berbeda" -#: src/remove.c:557 +#: src/remove.c:520 #, c-format msgid "traversal failed: %s" msgstr "traversal gagal: %s" -#: src/remove.c:563 +#: src/remove.c:526 #, c-format msgid "" "unexpected failure: fts_info=%d: %s\n" @@ -7980,12 +8356,12 @@ msgstr "" "kegagalan tidak terduga: fts_info=%d: %s\n" "mohon laporkan ke %s" -#: src/rm.c:118 +#: src/rm.c:119 #, fuzzy, c-format msgid "Try '%s ./%s' to remove the file %s.\n" msgstr "Coba `%s ./%s' untuk menghapus berkas %s.\n" -#: src/rm.c:135 +#: src/rm.c:136 #, fuzzy msgid "" "Remove (unlink) the FILE(s).\n" @@ -7999,7 +8375,7 @@ msgstr "" " -f, --force abaikan berkas yang tidak ada, jangan menanyakan\n" " -i tanya setiap akan menghapus\n" -#: src/rm.c:141 +#: src/rm.c:142 msgid "" " -I prompt once before removing more than three files, " "or\n" @@ -8019,7 +8395,7 @@ msgstr "" " --interactive[=WHEN] tanya menurut WHEN: never, once (-I), atau\n" " always (-i). Tanpa WHEN, selalu bertanya\n" -#: src/rm.c:148 +#: src/rm.c:149 msgid "" " --one-file-system when removing a hierarchy recursively, skip any\n" " directory that is on a file system different from\n" @@ -8031,12 +8407,13 @@ msgstr "" "berbeda dari\n" " yang berhubungan dengan argumen baris perintah\n" -#: src/rm.c:153 +#: src/rm.c:154 #, fuzzy msgid "" " --no-preserve-root do not treat '/' specially\n" " --preserve-root do not remove '/' (default)\n" " -r, -R, --recursive remove directories and their contents recursively\n" +" -d, --dir remove empty directories\n" " -v, --verbose explain what is being done\n" msgstr "" " --no-preserve-root jangan perlakukan `/' secara spesial\n" @@ -8044,7 +8421,7 @@ msgstr "" " -r, -R, --recursive hapus direktori dan isinya secara rekursif\n" " -v, --verbose jelaskan apa yang sedang dilakukan\n" -#: src/rm.c:161 +#: src/rm.c:163 msgid "" "\n" "By default, rm does not remove directories. Use the --recursive (-r or -R)\n" @@ -8056,7 +8433,7 @@ msgstr "" "R)\n" "untuk menghapus direktori, juga, sesuai dengan seluruh isinya.\n" -#: src/rm.c:166 +#: src/rm.c:168 #, fuzzy, c-format msgid "" "\n" @@ -8074,7 +8451,7 @@ msgstr "" "\n" " %s ./-foo\n" -#: src/rm.c:175 +#: src/rm.c:177 #, fuzzy msgid "" "\n" @@ -8089,12 +8466,12 @@ msgstr "" "lebih lanjut mengenai isi yang\n" "benar benar tidak dapat diselamatkan, pertimbangkan menggunakan shred.\n" -#: src/rm.c:335 +#: src/rm.c:342 #, c-format msgid "%s: remove all arguments recursively? " msgstr "%s: hapus seluruh argumen rekursif? " -#: src/rm.c:336 +#: src/rm.c:343 #, c-format msgid "%s: remove all arguments? " msgstr "%s: hapus seluruh argumen? " @@ -8157,7 +8534,11 @@ msgstr "" msgid "" "Run a program in a different security context.\n" "With neither CONTEXT nor COMMAND, print the current security context.\n" -"\n" +msgstr "" + +#: src/runcon.c:94 +#, fuzzy +msgid "" " CONTEXT Complete security context\n" " -c, --compute compute process transition context before modifying\n" " -t, --type=TYPE type (for same role as parent)\n" @@ -8177,72 +8558,72 @@ msgstr "" " -r, --role=ROLE peran\n" " -l, --range=RANGE tingkatjangkauan\n" -#: src/runcon.c:140 +#: src/runcon.c:144 #, c-format msgid "multiple roles" msgstr "banyak peran" -#: src/runcon.c:145 +#: src/runcon.c:149 #, c-format msgid "multiple types" msgstr "banyak tipe" -#: src/runcon.c:150 +#: src/runcon.c:154 #, c-format msgid "multiple users" msgstr "banyak pengguna" -#: src/runcon.c:155 +#: src/runcon.c:159 #, c-format msgid "multiple levelranges" msgstr "banyak tingkat jangkauan" -#: src/runcon.c:173 src/runcon.c:209 +#: src/runcon.c:177 src/runcon.c:213 #, c-format msgid "failed to get current context" msgstr "gagal memperolek konteks sekarang" -#: src/runcon.c:183 +#: src/runcon.c:187 #, c-format msgid "you must specify -c, -t, -u, -l, -r, or context" msgstr "anda harus menspesifikasikan -c, -t, -u, -l, -r, atau konteks" -#: src/runcon.c:191 +#: src/runcon.c:195 #, c-format msgid "no command specified" msgstr "tidak ada perintah yang dispesifikasikan" -#: src/runcon.c:197 +#: src/runcon.c:201 #, c-format msgid "%s may be used only on a SELinux kernel" msgstr "%s mungkin hanya bisa digunakan dalam kernel SELinux" -#: src/runcon.c:223 +#: src/runcon.c:227 #, c-format msgid "failed to compute a new context" msgstr "gagal untuk menghitung konteks baru" -#: src/runcon.c:237 +#: src/runcon.c:241 #, c-format msgid "failed to set new user %s" msgstr "gagal untuk menset pengguna baru %s" -#: src/runcon.c:239 +#: src/runcon.c:243 #, c-format msgid "failed to set new type %s" msgstr "gagal untuk menset tipe baru %s" -#: src/runcon.c:241 +#: src/runcon.c:245 #, c-format msgid "failed to set new range %s" msgstr "gagal untuk menset jangkauan baru %s" -#: src/runcon.c:243 +#: src/runcon.c:247 #, c-format msgid "failed to set new role %s" msgstr "gagal untuk menset peran baru %s" -#: src/runcon.c:251 +#: src/runcon.c:255 #, c-format msgid "unable to set security context %s" msgstr "gagal untuk menset konteks keamanan %s" @@ -8259,9 +8640,12 @@ msgstr "" " atau: %s [PILIHAN]... PERTAMA PENINGKATAN TERAKHIR\n" #: src/seq.c:73 +msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" +msgstr "" + +#: src/seq.c:79 +#, fuzzy msgid "" -"Print numbers from FIRST to LAST, in steps of INCREMENT.\n" -"\n" " -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" @@ -8275,7 +8659,7 @@ msgstr "" " -w, --equal-width samakan lebar dengan menambahkan dengan awalan " "nol\n" -#: src/seq.c:82 +#: src/seq.c:86 msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" @@ -8294,7 +8678,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:90 +#: src/seq.c:94 #, fuzzy msgid "" "FORMAT must be suitable for printing one argument of type 'double';\n" @@ -8306,32 +8690,17 @@ msgstr "" "bilangan bulat desimal dengam maksimal presisi PREC, dan sampai %g jika " "tidak.\n" -#: src/seq.c:136 +#: src/seq.c:140 #, c-format msgid "invalid floating point argument: %s" msgstr "argumen floating point tidak valid: %s" -#: src/seq.c:193 -#, c-format -msgid "format %s has no %% directive" -msgstr "format %s tidak memiliki %% direktif" - -#: src/seq.c:210 -#, c-format -msgid "format %s ends in %%" -msgstr "format %s berakhir dalam %%" - -#: src/seq.c:213 +#: src/seq.c:232 #, c-format msgid "format %s has unknown %%%c directive" msgstr "format %s memiliki %%%c direktif tidak diketahui" -#: src/seq.c:217 -#, c-format -msgid "format %s has too many %% directives" -msgstr "format %s memiliki terlalu banyak %% direktif" - -#: src/seq.c:431 +#: src/seq.c:555 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" @@ -8376,28 +8745,28 @@ 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:163 +#: src/setuidgid.c:162 #, c-format msgid "unknown user-ID: %s" msgstr "ID pengguna tidak diketahui: %s" -#: src/setuidgid.c:174 +#: 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:191 +#: src/setuidgid.c:190 #, c-format msgid "failed to set supplemental group(s)" msgstr "gagal untuk menset grup tambahan" -#: src/setuidgid.c:201 +#: src/setuidgid.c:200 #, c-format msgid "cannot set group-ID to %lu" msgstr "tidak dapat menset ID grup ke %lu" -#: src/setuidgid.c:205 +#: src/setuidgid.c:204 #, c-format msgid "cannot set user-ID to %lu" msgstr "tidak dapat menset ID pengguna ke %lu" @@ -8408,17 +8777,17 @@ msgid "Colin Plumb" msgstr "Colin Plumb" #: src/shred.c:148 +#, 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" -"\n" msgstr "" "Overwrite BERKAS yang dispesifikasikan secara berulang, dengan tujuan untuk " "membuatnya susah\n" "untuk bahkan perangkat mahal probing untuk menyelematkan data.\n" "\n" -#: src/shred.c:156 +#: src/shred.c:155 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -8432,7 +8801,7 @@ msgstr "" " -s, --size=N shred sebanyak bytes ini (akhiran seperti K, M, G " "diterima)\n" -#: src/shred.c:162 +#: src/shred.c:161 msgid "" " -u, --remove truncate and remove file after overwriting\n" " -v, --verbose show progress\n" @@ -8447,7 +8816,7 @@ msgstr "" " -z, --zero tambahkan sebuah akhir paksa tulis dengan nol untuk " "menyembunyikan shredding\n" -#: src/shred.c:171 +#: src/shred.c:170 msgid "" "\n" "If FILE is -, shred standard output.\n" @@ -8470,7 +8839,7 @@ msgstr "" "umum, kebanyakan orang menggunakan pilihan --remove.\n" "\n" -#: src/shred.c:181 +#: src/shred.c:180 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" @@ -8489,7 +8858,7 @@ msgstr "" "berkas:\n" "\n" -#: src/shred.c:189 +#: src/shred.c:188 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -8512,7 +8881,7 @@ msgstr "" "server\n" "\n" -#: src/shred.c:199 +#: src/shred.c:198 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -8526,7 +8895,7 @@ msgstr "" "* sistem berkas terkompres\n" "\n" -#: src/shred.c:206 +#: src/shred.c:205 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" @@ -8549,7 +8918,7 @@ msgstr "" "seperti yang terdokumentasi dalam halaman manual mount (man mount).\n" "\n" -#: src/shred.c:216 +#: src/shred.c:215 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" @@ -8561,122 +8930,122 @@ msgstr "" "berkas yang tershred untuk\n" "diselamatkan nanti.\n" -#: src/shred.c:296 +#: src/shred.c:295 #, c-format msgid "%s: fdatasync failed" msgstr "%s: fdatasync gagal" -#: src/shred.c:307 +#: src/shred.c:306 #, c-format msgid "%s: fsync failed" msgstr "%s: fsync gagal" -#: src/shred.c:384 +#: src/shred.c:383 #, c-format msgid "%s: cannot rewind" msgstr "%s: gagal rewind" -#: src/shred.c:403 +#: src/shred.c:402 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: tahap %lu/%lu (%s)..." -#: src/shred.c:453 +#: src/shred.c:452 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: error menulis di ofset %s" -#: src/shred.c:471 +#: src/shred.c:470 #, c-format msgid "%s: lseek failed" msgstr "%s: lseek gagal" -#: src/shred.c:482 +#: src/shred.c:481 #, c-format msgid "%s: file too large" msgstr "%s: berkas terlalu besar" -#: src/shred.c:505 +#: src/shred.c:504 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: tahap %lu/%lu (%s)...%s" -#: src/shred.c:521 +#: src/shred.c:520 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: tahap %lu/%lu (%s)...%s/%s %d%%" -#: src/shred.c:768 +#: src/shred.c:767 #, c-format msgid "%s: fstat failed" msgstr "%s: fstat gagal" -#: src/shred.c:779 +#: src/shred.c:778 #, c-format msgid "%s: invalid file type" msgstr "%s: tipe berkas tidak valid" -#: src/shred.c:798 +#: src/shred.c:797 #, c-format msgid "%s: file has negative size" msgstr "%s: berkas memilik ukuran negatif" -#: src/shred.c:865 +#: src/shred.c:864 src/sort.c:932 src/split.c:378 #, c-format msgid "%s: error truncating" msgstr "%s: error memotong" -#: src/shred.c:881 +#: src/shred.c:880 #, c-format msgid "%s: fcntl failed" msgstr "%s: fcntl gagal" -#: src/shred.c:886 +#: src/shred.c:885 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "%s: tidak dapat menshred tambah-saja berkas deskripsi" -#: src/shred.c:968 +#: src/shred.c:967 #, c-format msgid "%s: removing" msgstr "%s: menghapus" -#: src/shred.c:992 +#: src/shred.c:991 #, c-format msgid "%s: renamed to %s" msgstr "%s: diubah namanya menjadi %s" -#: src/shred.c:1014 +#: src/shred.c:1013 #, c-format msgid "%s: failed to remove" msgstr "%s: gagal untuk menghapus" -#: src/shred.c:1018 +#: src/shred.c:1017 #, c-format msgid "%s: removed" msgstr "%s: dihapus" -#: src/shred.c:1025 src/shred.c:1068 +#: src/shred.c:1024 src/shred.c:1067 #, c-format msgid "%s: failed to close" msgstr "%s: gagal untuk menutup" -#: src/shred.c:1061 +#: src/shred.c:1060 #, c-format msgid "%s: failed to open for writing" msgstr "%s: gagal untuk membuka untuk menulis" -#: src/shred.c:1126 +#: src/shred.c:1125 #, c-format msgid "%s: invalid number of passes" msgstr "%s: jumlah tahap tidak valid" -#: src/shred.c:1135 src/shuf.c:291 src/sort.c:4387 +#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441 #, c-format msgid "multiple random sources specified" msgstr "banyak sumber random dispesifikasikan" -#: src/shred.c:1149 +#: src/shred.c:1148 #, c-format msgid "%s: invalid file size" msgstr "%s: ukuran berkas tidak valid" @@ -8693,14 +9062,13 @@ msgstr "" " atau: %s -i LO-HI [PILIHAN]...\n" #: src/shuf.c:54 -msgid "" -"Write a random permutation of the input lines to standard output.\n" -"\n" +#, 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:61 +#: src/shuf.c:60 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 " @@ -8719,27 +9087,27 @@ 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:245 +#: src/shuf.c:244 #, c-format msgid "multiple -i options specified" msgstr "banyak pilihan -i dispesifikasikan" -#: src/shuf.c:265 +#: src/shuf.c:264 #, c-format msgid "invalid input range %s" msgstr "jangkauan masukan %s tidak valid" -#: src/shuf.c:278 +#: src/shuf.c:277 #, c-format msgid "invalid line count %s" msgstr "jumlah baris %s tidak valid" -#: src/shuf.c:285 src/sort.c:4381 +#: src/shuf.c:284 src/sort.c:4435 #, c-format msgid "multiple output files specified" msgstr "banyak berkas keluaran dispesifikasikan" -#: src/shuf.c:311 +#: src/shuf.c:310 #, c-format msgid "cannot combine -e and -i options" msgstr "tidak dapat mengkombinasikan pilihan -e dan -i" @@ -8769,7 +9137,7 @@ msgstr "" "yang dispesifikasikan oleh jumlah dari nilainya.\n" "\n" -#: src/sleep.c:135 src/timeout.c:295 +#: src/sleep.c:135 src/timeout.c:320 #, c-format msgid "invalid time interval %s" msgstr "jangka waktu %s tidak valid" @@ -8779,15 +9147,14 @@ msgstr "jangka waktu %s tidak valid" msgid "cannot read realtime clock" msgstr "tidak dapat membaca realtime clock" -#: src/sort.c:395 -msgid "" -"Write sorted concatenation of all FILE(s) to standard output.\n" -"\n" +#: src/sort.c:399 +#, 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:402 +#: src/sort.c:405 msgid "" "Ordering options:\n" "\n" @@ -8795,7 +9162,7 @@ msgstr "" "Pilihan pengurutan:\n" "\n" -#: src/sort.c:406 +#: src/sort.c:409 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -8807,7 +9174,7 @@ msgstr "" "dan angka\n" " -f, --ignore-case ubah karakter huruf kecil ke huruf besar\n" -#: src/sort.c:412 +#: src/sort.c:415 #, fuzzy msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" @@ -8820,14 +9187,14 @@ msgstr "" " -M, --month-sort bandingkan (tidak diketahui) < `JAN' < ... < " "`DEC'\n" -#: src/sort.c:417 +#: src/sort.c:420 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:420 +#: src/sort.c:423 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -8839,7 +9206,7 @@ msgstr "" " --random-source=BERKAS dapatkan random bytes dari BERKAS\n" " -r, --reverse balik hasil dari komparasi\n" -#: src/sort.c:426 +#: src/sort.c:429 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -8855,7 +9222,7 @@ msgstr "" " -V, --version-sort urutan alami dari nomor versi dalam teks\n" "\n" -#: src/sort.c:434 +#: src/sort.c:437 msgid "" "Other options:\n" "\n" @@ -8863,7 +9230,7 @@ msgstr "" "Pilihan lain:\n" "\n" -#: src/sort.c:438 +#: src/sort.c:441 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" @@ -8871,7 +9238,7 @@ msgstr "" " --batch-size=NMERGE gabungkan di NMERGE masukan dalam satu waktu;\n" " untuk penggunaan lebih berkas sementara\n" -#: src/sort.c:442 +#: src/sort.c:445 #, fuzzy msgid "" " -c, --check, --check=diagnose-first check for sorted input; do not sort\n" @@ -8890,7 +9257,7 @@ msgstr "" "oleh\n" " nama yang diakhiri NUL dalam berkas F\n" -#: src/sort.c:449 +#: src/sort.c:452 #, fuzzy msgid "" " --debug annotate the part of the line used to sort,\n" @@ -8909,7 +9276,7 @@ msgstr "" "oleh\n" " nama yang diakhiri NUL dalam berkas F\n" -#: src/sort.c:456 +#: src/sort.c:459 #, fuzzy msgid "" " -k, --key=KEYDEF sort via a key; KEYDEF gives location and type\n" @@ -8921,7 +9288,7 @@ msgstr "" " -m, --merge gabungkan berkas yang sudah diurutkan, jangan " "urutkan\n" -#: src/sort.c:460 +#: src/sort.c:463 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -8934,7 +9301,7 @@ msgstr "" "perbandingan terakhir\n" " -S, --buffer-size=SIZE gunakan SIZE untuk buffer memori utama\n" -#: src/sort.c:466 +#: src/sort.c:469 #, fuzzy, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -8958,12 +9325,12 @@ msgstr "" " tanpa -c, keluarkan hanya pertama dari sebuah " "jalan pertama\n" -#: src/sort.c:475 +#: 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:480 +#: src/sort.c:483 #, fuzzy msgid "" "\n" @@ -8996,7 +9363,7 @@ msgstr "" "\n" "UKURAN mungkin diikuti dengan akhiran pengali berikut:\n" -#: src/sort.c:493 +#: src/sort.c:496 msgid "" "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n" "\n" @@ -9017,260 +9384,264 @@ msgstr "" "Set LC_ALL=C untuk memperoleh cara pengurutan tradisional yang menggunakan\n" "nilai byte asli.\n" -#: src/sort.c:694 +#: src/sort.c:697 #, c-format msgid "waiting for %s [-d]" msgstr "menunggu untuk %s [-d]" -#: src/sort.c:699 +#: src/sort.c:702 #, c-format msgid "%s [-d] terminated abnormally" msgstr "%s [-d] berakhir secara tidak normal" -#: src/sort.c:853 +#: src/sort.c:856 #, c-format msgid "cannot create temporary file in %s" msgstr "tidak dapat membuat berkas sementara dalam %s" -#: src/sort.c:939 src/sort.c:2010 src/sort.c:3056 src/sort.c:3755 -#: src/sort.c:3758 +#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713 +#: src/sort.c:3804 src/sort.c:3807 msgid "open failed" msgstr "gagal membuka" -#: src/sort.c:959 +#: src/sort.c:970 msgid "fflush failed" msgstr "fflush gagal" -#: src/sort.c:964 src/sort.c:2013 src/sort.c:4646 +#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706 msgid "close failed" msgstr "gagal menutup" -#: src/sort.c:973 +#: src/sort.c:986 #, c-format msgid "dup2 failed" msgstr "dup2 gagal" -#: src/sort.c:1090 +#: src/sort.c:1103 #, c-format msgid "couldn't execute %s" msgstr "tidak dapat menjalankan %s" -#: src/sort.c:1097 +#: src/sort.c:1110 msgid "couldn't create temporary file" msgstr "tidak dapat membuat berkas sementara" -#: src/sort.c:1136 +#: src/sort.c:1149 #, c-format msgid "couldn't create process for %s -d" msgstr "tidak dapat membuat proses untuk %s -d" -#: src/sort.c:1150 +#: src/sort.c:1161 #, c-format msgid "couldn't execute %s -d" msgstr "tidak dapat menjalankan %s -d" -#: src/sort.c:1209 +#: src/sort.c:1220 #, c-format msgid "warning: cannot remove: %s" msgstr "peringatan: tidak dapat menghapus: %s" -#: src/sort.c:1295 +#: src/sort.c:1306 #, c-format msgid "invalid --%s argument %s" msgstr "argumen --%s tidak valid %s" -#: src/sort.c:1298 +#: src/sort.c:1309 #, c-format msgid "minimum --%s argument is %s" msgstr "argumen %s minimum --%s" -#: src/sort.c:1313 +#: src/sort.c:1324 #, c-format msgid "--%s argument %s too large" msgstr "--%s argumen %s terlalu besar" -#: src/sort.c:1316 +#: src/sort.c:1327 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "maksimal --%s argumen dengan rlimit sekarang adalah %s" -#: src/sort.c:1398 +#: src/sort.c:1409 #, c-format msgid "number in parallel must be nonzero" msgstr "" -#: src/sort.c:1479 +#: src/sort.c:1494 msgid "stat failed" msgstr "stat gagal" -#: src/sort.c:1740 +#: src/sort.c:1755 msgid "read failed" msgstr "baca gagal" -#: src/sort.c:2028 +#: src/sort.c:2043 #, c-format msgid "string transformation failed" msgstr "Transformasi string gagal" -#: src/sort.c:2031 +#: src/sort.c:2046 #, c-format msgid "the untransformed string was %s" msgstr "untransformasi string adalah %s" -#: src/sort.c:2194 +#: src/sort.c:2209 #, c-format msgid "^ no match for key\n" msgstr "" -#: src/sort.c:2374 +#: src/sort.c:2389 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "" -#: src/sort.c:2380 +#: src/sort.c:2395 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "" -#: src/sort.c:2391 +#: src/sort.c:2406 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" -#: src/sort.c:2404 +#: src/sort.c:2419 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "" -#: src/sort.c:2436 +#: src/sort.c:2451 #, 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" -#: src/sort.c:2442 +#: src/sort.c:2457 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "" -#: src/sort.c:2716 src/sort.c:2725 +#: src/sort.c:2731 src/sort.c:2740 msgid "write failed" msgstr "tulis gagal" -#: src/sort.c:2768 +#: src/sort.c:2783 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: tidak terurut: " -#: src/sort.c:2771 +#: src/sort.c:2786 msgid "standard error" msgstr "standar error" -#: src/sort.c:3926 +#: src/sort.c:3698 +#, fuzzy +msgid "cannot read" +msgstr "%s: gagal rewind" + +#: src/sort.c:3976 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: spesifikasi field %s tidak valid" -#: src/sort.c:3937 +#: src/sort.c:3987 #, fuzzy, c-format msgid "options '-%s' are incompatible" msgstr "pilihan `-%s' tidak kompatibel" -#: src/sort.c:3988 +#: src/sort.c:4038 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s: jumlah tidak valid di awal dari %s" -#: src/sort.c:4245 +#: src/sort.c:4295 #, fuzzy msgid "invalid number after '-'" msgstr "jumlah tidak valid setelah `-'" -#: src/sort.c:4248 src/sort.c:4334 src/sort.c:4362 +#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416 #, fuzzy msgid "invalid number after '.'" msgstr "jumlah tidak valid setelah `.'" -#: src/sort.c:4261 src/sort.c:4367 +#: src/sort.c:4315 src/sort.c:4421 msgid "stray character in field spec" msgstr "karakter sisa dalam spesifikasi field" -#: src/sort.c:4308 +#: src/sort.c:4362 #, c-format msgid "multiple compress programs specified" msgstr "banyak aplikasi kompresi dispesifikasikan" -#: src/sort.c:4325 +#: src/sort.c:4379 msgid "invalid number at field start" msgstr "jumlah tidak valid di awal field" -#: src/sort.c:4329 src/sort.c:4357 +#: src/sort.c:4383 src/sort.c:4411 msgid "field number is zero" msgstr "jumlah field adalah nol" -#: src/sort.c:4338 +#: src/sort.c:4392 msgid "character offset is zero" msgstr "karakter ofset adalah nol" -#: src/sort.c:4353 +#: src/sort.c:4407 #, fuzzy msgid "invalid number after ','" msgstr "jumlah tidak valid setelah `,'" -#: src/sort.c:4403 +#: src/sort.c:4457 #, c-format msgid "empty tab" msgstr "empty tab" -#: src/sort.c:4496 src/wc.c:692 +#: src/sort.c:4550 src/wc.c:692 #, c-format msgid "cannot read file names from %s" msgstr "tidak dapat membaca nama berkas dari %s" -#: src/sort.c:4518 +#: src/sort.c:4572 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s:%lu: nama berkas panjang-nol tidak valid" -#: src/sort.c:4524 +#: src/sort.c:4578 #, c-format msgid "no input from %s" msgstr "tidak ada masukan masukan dari %s" -#: src/sort.c:4570 +#: src/sort.c:4624 #, c-format msgid "using %s sorting rules" msgstr "" -#: src/sort.c:4573 +#: src/sort.c:4627 #, c-format msgid "using simple byte comparison" msgstr "" -#: src/sort.c:4604 +#: src/sort.c:4658 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "kelebihan operan %s tidak dibolehkan dengan -%c" -#: src/split.c:184 +#: src/split.c:187 #, c-format msgid "the suffix length needs to be at least %zu" msgstr "" -#: src/split.c:201 +#: src/split.c:204 #, c-format msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" msgstr "Penggunaan: %s [PILIHAN]... [MASUKAN [PREFIX]]\n" -#: src/split.c:205 +#: src/split.c:208 #, fuzzy 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" -"\n" msgstr "" "Keluarkan fixed-size pieces dari MASUKAN ke AWALAHaa, AWALANab, ...; " "default\n" @@ -9279,7 +9650,7 @@ msgstr "" "adalah -, baca standar masukan.\n" "\n" -#: src/split.c:214 +#: src/split.c:216 #, fuzzy, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" @@ -9304,7 +9675,7 @@ msgstr "" " -d, --numeric-suffixes gunakan akhiran numerik daripada alphabet\n" " -l, --lines=NUMBER pakai JUMLAH baris setiap berkas keluaran\n" -#: src/split.c:227 +#: src/split.c:229 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" @@ -9312,7 +9683,7 @@ msgstr "" " --verbose tampilkan sebuah diagnosa tepat sebelum setiap\n" " berkas keluaran dibuka\n" -#: src/split.c:234 +#: src/split.c:236 msgid "" "\n" "CHUNKS may be:\n" @@ -9324,186 +9695,191 @@ msgid "" "r/K/N likewise but only output Kth of N to stdout\n" msgstr "" -#: src/split.c:352 +#: src/split.c:354 #, c-format msgid "output file suffixes exhausted" msgstr "Kehabisan akhiran berkas keluaran" -#: src/split.c:364 +#: src/split.c:366 #, c-format msgid "creating file %s\n" msgstr "membuat berkas %s\n" -#: src/split.c:377 +#: src/split.c:375 +#, c-format +msgid "%s would overwrite input; aborting" +msgstr "" + +#: src/split.c:391 #, fuzzy, c-format msgid "failed to set FILE environment variable" msgstr "gagal untuk memperbarui lingkungan dengan %s" -#: src/split.c:379 +#: src/split.c:393 #, c-format msgid "executing with FILE=%s\n" msgstr "" -#: src/split.c:381 +#: src/split.c:395 #, fuzzy, c-format msgid "failed to create pipe" -msgstr "tidak dapat membuah link keras %s ke %s" +msgstr "gagal untuk menghapus %s" -#: src/split.c:395 +#: src/split.c:409 #, fuzzy, c-format msgid "closing prior pipe" msgstr "menutup direktori %s" -#: src/split.c:397 +#: src/split.c:411 #, fuzzy, c-format msgid "closing output pipe" msgstr "menutup berkas keluaran %s" -#: src/split.c:401 +#: src/split.c:415 #, fuzzy, c-format msgid "moving input pipe" msgstr "menutup berkas masukan %s" -#: src/split.c:403 +#: src/split.c:417 #, fuzzy, c-format msgid "closing input pipe" msgstr "menutup berkas masukan %s" -#: src/split.c:408 +#: src/split.c:422 #, fuzzy, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "gagal menjalankan perintah %s" -#: src/split.c:414 +#: src/split.c:428 #, fuzzy, c-format msgid "failed to close input pipe" msgstr "gagal menutup direktori %s" -#: src/split.c:450 +#: src/split.c:464 #, fuzzy, c-format msgid "waiting for child process" msgstr "menunggu untuk strip" -#: src/split.c:460 +#: src/split.c:474 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "" -#: src/split.c:468 +#: src/split.c:482 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:475 src/timeout.c:449 +#: src/split.c:489 src/timeout.c:494 #, c-format msgid "unknown status from command (0x%X)" msgstr "status dari perintah (0x%X) tidak diketahui" -#: src/split.c:1037 +#: src/split.c:1052 #, c-format msgid "cannot split in more than one way" msgstr "tidak dapat memisahkan lebih dari satu cara" -#: src/split.c:1050 src/split.c:1192 src/split.c:1363 +#: src/split.c:1065 src/split.c:1205 src/split.c:1376 #, fuzzy, c-format msgid "%s: invalid number of chunks" msgstr "%s: jumlah detik tidak valid" -#: src/split.c:1054 +#: src/split.c:1069 #, fuzzy, c-format msgid "%s: invalid chunk number" msgstr "%s: nomor tidak valid" -#: src/split.c:1106 +#: src/split.c:1119 #, c-format msgid "%s: invalid suffix length" msgstr "%s: panjang akhiran tidak valid" -#: src/split.c:1131 src/split.c:1139 src/split.c:1162 src/split.c:1167 +#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180 #, c-format msgid "%s: invalid number of bytes" msgstr "%s: jumlah dari bytes tidak valid" -#: src/split.c:1150 src/split.c:1297 +#: src/split.c:1163 src/split.c:1310 #, c-format msgid "%s: invalid number of lines" msgstr "%s: jumlah dari baris tidak valid" -#: src/split.c:1223 +#: src/split.c:1236 #, c-format msgid "line count option -%s%c... is too large" msgstr "jumlah baris pilihan -%s%c... terlalu besar" -#: src/split.c:1235 +#: src/split.c:1248 #, fuzzy, c-format msgid "%s: invalid start value for numerical suffix" msgstr "awalan nomor baris: %s tidak valid" -#: src/split.c:1263 +#: src/split.c:1276 #, fuzzy, c-format msgid "%s: invalid IO block size" msgstr "%s: ukuran berkas tidak valid" -#: src/split.c:1284 +#: src/split.c:1297 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1321 +#: src/split.c:1334 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1356 +#: src/split.c:1369 #, 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:169 +#: src/stat.c:173 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:838 +#: src/stat.c:857 #, fuzzy, c-format msgid "failed to canonicalize %s" msgstr "gagal untuk menutup %s" -#: src/stat.c:1050 +#: src/stat.c:1069 #, fuzzy, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "peringatan: escape tidak dikenal `\\%c'" -#: src/stat.c:1105 +#: src/stat.c:1124 #, c-format msgid "%s: invalid directive" msgstr "%s: direktif tidak valid" -#: src/stat.c:1151 +#: src/stat.c:1170 #, c-format msgid "warning: backslash at end of format" msgstr "peringatan: backslash di akhir dari format" -#: src/stat.c:1182 +#: src/stat.c:1201 #, 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:1189 +#: src/stat.c:1208 #, c-format msgid "cannot read file system information for %s" msgstr "tidak dapat membaca informasi sistem berkas untuk %s" -#: src/stat.c:1209 +#: src/stat.c:1228 #, 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:1245 +#: src/stat.c:1264 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -9514,7 +9890,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1268 +#: src/stat.c:1287 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -9522,30 +9898,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1278 +#: src/stat.c:1297 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:1286 +#: src/stat.c:1305 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:1295 +#: src/stat.c:1314 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:1305 +#: src/stat.c:1324 #, fuzzy, c-format msgid "Context: %C\n" msgstr " konteks=%s" -#: src/stat.c:1313 +#: src/stat.c:1332 msgid "" "Access: %x\n" "Modify: %y\n" @@ -9553,10 +9929,13 @@ msgid "" " Birth: %w\n" msgstr "" -#: src/stat.c:1331 +#: src/stat.c:1350 +msgid "Display file or file system status.\n" +msgstr "" + +#: src/stat.c:1356 +#, fuzzy msgid "" -"Display file or file system status.\n" -"\n" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" @@ -9566,7 +9945,7 @@ msgstr "" " -f, --file-system tampilkan status sistem berkas dari pada status " "berkas\n" -#: src/stat.c:1337 +#: src/stat.c:1360 #, fuzzy msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" @@ -9587,7 +9966,7 @@ msgstr "" "FORMAT.\n" " -t, --terse tampilkan informasi dalam format lengkap\n" -#: src/stat.c:1348 +#: src/stat.c:1371 #, fuzzy msgid "" "\n" @@ -9608,7 +9987,7 @@ msgstr "" " %B Jumlah dalam bytes untuk setiap blok yang dilaporkan oleh %b\n" " %C String konteks keamanan SELinux\n" -#: src/stat.c:1357 +#: src/stat.c:1380 #, fuzzy msgid "" " %d device number in decimal\n" @@ -9625,7 +10004,7 @@ msgstr "" " %g Grup ID dari pemilik\n" " %G Nama ID dari pemilik\n" -#: src/stat.c:1365 +#: src/stat.c:1388 #, fuzzy msgid "" " %h number of hard links\n" @@ -9647,7 +10026,7 @@ msgstr "" " %t Tipe perangkat major dalam heksadesimal\n" " %T Tipe perangkat minor dalam heksadesimal\n" -#: src/stat.c:1376 +#: src/stat.c:1399 #, fuzzy msgid "" " %u user ID of owner\n" @@ -9671,7 +10050,7 @@ msgstr "" " %z Waktu terakhir diubah\n" " %Z Waktu terakhir diubah sebagai detik sejak Epoch\n" -#: src/stat.c:1390 +#: src/stat.c:1413 #, fuzzy msgid "" "Valid format sequences for file systems:\n" @@ -9691,7 +10070,7 @@ msgstr "" " %f Blok bebas dalam sistem berkas\n" " %C String konteks keamanan SELinux\n" -#: src/stat.c:1399 +#: src/stat.c:1422 #, fuzzy msgid "" " %i file system ID in hex\n" @@ -9716,15 +10095,15 @@ msgid "Usage: %s OPTION... COMMAND\n" msgstr "Penggunaan: %s [PILIHAN]... PERINTAH\n" #: src/stdbuf.c:91 +#, fuzzy msgid "" "Run COMMAND, with modified buffering operations for its standard streams.\n" -"\n" msgstr "" "Jalankan PERINTAH, dengan operasi penyanggaan yang dimodifikasi untuk aliran " "standar.\n" "\n" -#: src/stdbuf.c:98 +#: src/stdbuf.c:97 #, fuzzy msgid "" " -i, --input=MODE adjust standard input stream buffering\n" @@ -9735,7 +10114,7 @@ msgstr "" " -o, --output=MODE Sesuaikan penyangga aliran keluaran standar\n" " -e, --error=MODE Sesuaikan penyangga aliran error standar\n" -#: src/stdbuf.c:105 +#: src/stdbuf.c:104 #, fuzzy msgid "" "\n" @@ -9747,7 +10126,7 @@ msgstr "" "bersangga.\n" "Pilihan ini tidak valid dengan standar masukan.\n" -#: src/stdbuf.c:108 +#: src/stdbuf.c:107 #, fuzzy msgid "" "\n" @@ -9756,7 +10135,7 @@ msgstr "" "\n" "Jika MODE adalah `0' maka aliran yang berhubungan tidak akan disangga.\n" -#: src/stdbuf.c:111 +#: src/stdbuf.c:110 msgid "" "\n" "Otherwise MODE is a number which may be followed by one of the following:\n" @@ -9774,7 +10153,7 @@ msgstr "" "ukuran\n" "penyangga di set ke MODE bytes.\n" -#: src/stdbuf.c:117 +#: src/stdbuf.c:116 #, fuzzy msgid "" "\n" @@ -9793,22 +10172,22 @@ msgstr "" "gunakan aliran untuk I/O,\n" "dan sehingga tidak terpengaruh oleh konfigurasi `stdbuf'.\n" -#: src/stdbuf.c:227 +#: src/stdbuf.c:226 #, fuzzy, c-format msgid "failed to find %s" msgstr "gagal untuk membuka %s" -#: src/stdbuf.c:247 src/stdbuf.c:279 +#: src/stdbuf.c:246 src/stdbuf.c:278 #, c-format msgid "failed to update the environment with %s" msgstr "gagal untuk memperbarui lingkungan dengan %s" -#: src/stdbuf.c:321 +#: src/stdbuf.c:320 #, c-format msgid "line buffering stdin is meaningless" msgstr "baris penyangga stdin tidak berarti" -#: src/stty.c:509 +#: src/stty.c:513 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -9819,10 +10198,13 @@ msgstr "" " atau: %s [-F PERANGKAT] [--file=PERANGKAT] [-a|-all]\n" " atau: %s [-F PERANGKAT] [--file=PERANGKAT] [-g|--save]\n" -#: src/stty.c:515 +#: src/stty.c:519 +msgid "Print or change terminal characteristics.\n" +msgstr "" + +#: src/stty.c:525 +#, fuzzy msgid "" -"Print or change terminal characteristics.\n" -"\n" " -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" @@ -9836,7 +10218,7 @@ msgstr "" " -F, --file=DEVICE buka dan gunakan PERANGKAT yang dispesifikasikan " "daripada stdin\n" -#: src/stty.c:524 +#: src/stty.c:532 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -9848,7 +10230,7 @@ msgstr "" "non-POSIX. Sistem yang berjalan mendefinisikan dimana konfigurasi yang " "tersedia.\n" -#: src/stty.c:529 +#: src/stty.c:537 msgid "" "\n" "Special characters:\n" @@ -9864,7 +10246,7 @@ msgstr "" "masukan)\n" " eof CHAR CHAR akan akhir dari baris\n" -#: src/stty.c:536 +#: src/stty.c:544 msgid "" " * eol2 CHAR alternate CHAR for ending the line\n" " erase CHAR CHAR will erase the last character typed\n" @@ -9877,7 +10259,7 @@ msgstr "" " intr CHAR CHAR akan mengirim sinyal interupsi\n" " kill CHAR CHAR akan menghapus baris sekarang\n" -#: src/stty.c:542 +#: src/stty.c:550 msgid "" " * lnext CHAR CHAR will enter the next character quoted\n" " quit CHAR CHAR will send a quit signal\n" @@ -9889,7 +10271,7 @@ msgstr "" " * rprnt CHAR CHAR akan menggambar ulang baris sekarang\n" " start CHAR CHAR akan mengulang keluaran setelah menyetopnya\n" -#: src/stty.c:548 +#: src/stty.c:556 msgid "" " stop CHAR CHAR will stop the output\n" " susp CHAR CHAR will send a terminal stop signal\n" @@ -9901,7 +10283,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:554 +#: src/stty.c:562 msgid "" "\n" "Special settings:\n" @@ -9915,7 +10297,7 @@ msgstr "" " * cols N beritahu kernel bahwa terminal memilik N kolom\n" " * columns N sama seperti cols N\n" -#: src/stty.c:561 +#: src/stty.c:569 msgid "" " ispeed N set the input speed to N\n" " * line N use line discipline N\n" @@ -9929,7 +10311,7 @@ msgstr "" "pembacaan selesai\n" " ospeed N set kecepatan keluaran ke N\n" -#: src/stty.c:567 +#: src/stty.c:575 msgid "" " * rows N tell the kernel that the terminal has N rows\n" " * size print the number of rows and columns according to the " @@ -9944,13 +10326,15 @@ msgstr "" " time N Dengan -icanon, set timeout baca untuk N persepuluh dari " "detik\n" -#: src/stty.c:573 +#: src/stty.c:581 +#, fuzzy msgid "" "\n" "Control settings:\n" " [-]clocal disable modem control signals\n" " [-]cread allow input to be received\n" " * [-]crtscts enable RTS/CTS handshaking\n" +" * [-]cdtrdsr enable DTR/DSR handshaking\n" " csN set character size to N bits, N in [5..8]\n" msgstr "" "\n" @@ -9960,7 +10344,7 @@ msgstr "" " * [-]crtscts aktifkan RTS/CTS handshaking\n" " csN set ukuran karakter ke N bits, N dalam [5..8]\n" -#: src/stty.c:581 +#: src/stty.c:590 #, fuzzy msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" @@ -9968,7 +10352,7 @@ msgid "" " [-]hupcl same as [-]hup\n" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" -" [-]parodd set odd parity (even with '-')\n" +" [-]parodd set odd parity (or even parity with '-')\n" msgstr "" " [-]cstopb gunakan dua stop bit per karakter (satu dengan `-')\n" " [-]hup kirim sebuah sinyal hangup ketika proses terakhir tutup " @@ -9978,7 +10362,7 @@ msgstr "" "dalam masukan\n" " [-]parodd set odd parity (bahkan dengan `-')\n" -#: src/stty.c:588 +#: src/stty.c:597 msgid "" "\n" "Input settings:\n" @@ -9994,7 +10378,7 @@ msgstr "" " [-]ignbrk abaikan karakter break\n" " [-]igncr abaikan carriage return\n" -#: src/stty.c:596 +#: src/stty.c:605 msgid "" " [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" @@ -10009,12 +10393,12 @@ msgstr "" " [-]inpck aktifkan pengecheckan masukan parity\n" " [-]istrip hapus atas (ke 8) bit dari karakter masukan\n" -#: src/stty.c:603 +#: src/stty.c:612 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr "" " * [-]iutf8 asumsikan karakter masukan adalah terenkode dalam UTF-8\n" -#: src/stty.c:606 +#: src/stty.c:615 msgid "" " * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" @@ -10031,7 +10415,7 @@ msgstr "" " [-]parmrk tandai parity error (dengan sebuah urutan 255-0-karakter)\n" " [-]tandem sama seperti [-]ixoff\n" -#: src/stty.c:614 +#: src/stty.c:623 msgid "" "\n" "Output settings:\n" @@ -10047,7 +10431,7 @@ msgstr "" " * ffN gaya form feed delay, N dalam [0..1]\n" " * nlN gayal baris baru delay, N dalam [0..1]\n" -#: src/stty.c:622 +#: src/stty.c:631 msgid "" " * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of null characters\n" @@ -10064,7 +10448,7 @@ msgstr "" " * [-]onlcr translasikan baris baru ke carriage return-baris baru\n" " * [-]onlret baris baru menperformasikan sebuah carriage return\n" -#: src/stty.c:630 +#: src/stty.c:639 msgid "" " * [-]onocr do not print carriage returns in the first column\n" " [-]opost postprocess output\n" @@ -10080,7 +10464,7 @@ msgstr "" " * -tabs sama seperti tab3\n" " * vtN gaya vertikal tab delay, N dalam [0..1]\n" -#: src/stty.c:638 +#: src/stty.c:647 msgid "" "\n" "Local settings:\n" @@ -10096,7 +10480,7 @@ msgstr "" " * -crtkill hapus seluruh baris dengan mengikuti konfigurasi echoctl " "dan echok\n" -#: src/stty.c:645 +#: src/stty.c:654 #, fuzzy msgid "" " * [-]ctlecho echo control characters in hat notation ('^c')\n" @@ -10111,7 +10495,7 @@ msgstr "" " [-]echoe sama seperti [-]crterase\n" " [-]echok echo sebuah baris baru sesudah karakter hapus\n" -#: src/stty.c:652 +#: src/stty.c:661 #, fuzzy msgid "" " * [-]echoke same as [-]crtkill\n" @@ -10126,7 +10510,7 @@ msgstr "" " [-]icanon aktifkan erase, kill, werase, dan rprnt karakter spesial\n" " [-]iexten aktifkan karakter spesial non-POSIX\n" -#: src/stty.c:659 +#: src/stty.c:668 #, fuzzy msgid "" " [-]isig enable interrupt, quit, and suspend special characters\n" @@ -10145,7 +10529,7 @@ msgstr "" " * [-]xcase dengan icanon, escape dengan `\\' untuk karakter huruf " "besar\n" -#: src/stty.c:666 +#: src/stty.c:675 msgid "" "\n" "Combination settings:\n" @@ -10159,7 +10543,7 @@ msgstr "" " cbreak sama seperti -icanon\n" " -cbreak sama seperti icanon\n" -#: src/stty.c:673 +#: src/stty.c:682 msgid "" " cooked same as brkint ignpar istrip icrnl ixon opost isig\n" " icanon, eof and eol characters to their default values\n" @@ -10171,7 +10555,7 @@ msgstr "" " -cooked sama seperti mentah\n" " crt sama seperti echoe echoctl echoke\n" -#: src/stty.c:679 +#: src/stty.c:688 msgid "" " dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" " kill ^u\n" @@ -10185,7 +10569,7 @@ msgstr "" " ek erase dan kill karakter ke nilai defaultnya\n" " evenp sama seperti parenb -parodd cs7\n" -#: src/stty.c:686 +#: src/stty.c:695 msgid "" " -evenp same as -parenb cs8\n" " * [-]lcase same as xcase iuclc olcuc\n" @@ -10201,7 +10585,7 @@ msgstr "" " nl sama seperti -icrnl -onlcr\n" " -nl sama seperti icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" -#: src/stty.c:694 +#: src/stty.c:703 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -10215,7 +10599,7 @@ msgstr "" " pass8 sama seperti -parenb -istrip cs8\n" " -pass8 sama seperti parenb istrip cs7\n" -#: src/stty.c:701 +#: src/stty.c:710 msgid "" " raw same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" " -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n" @@ -10228,7 +10612,7 @@ msgstr "" " -imaxbel -opost -isig -icanon -xcase min 1 time 0\n" " -raw sama seperti cooked\n" -#: src/stty.c:707 +#: src/stty.c:716 msgid "" " sane same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" " -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n" @@ -10245,7 +10629,7 @@ msgstr "" " -xcase -tostop -echoprt echoctl echoke, semua karakter\n" " spesial ke nilai defaultnya.\n" -#: src/stty.c:715 +#: src/stty.c:724 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -10261,12 +10645,12 @@ msgstr "" "127; nilai spesial ^- atau undef digunakan untuk menonaktifkan karakter " "spesial.\n" -#: src/stty.c:787 +#: src/stty.c:796 #, c-format msgid "only one device may be specified" msgstr "hanya sebuah perangkat yang dispesifikasikan" -#: src/stty.c:817 +#: src/stty.c:826 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" @@ -10275,126 +10659,47 @@ msgstr "" "pilihan untuk gaya verbose dan stty-readable keluaran adalah\n" "mutualy exclusive" -#: src/stty.c:823 +#: src/stty.c:832 #, 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:838 +#: src/stty.c:847 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s: tidak dapat mereset mode non-blocking" -#: src/stty.c:883 src/stty.c:993 +#: src/stty.c:892 src/stty.c:1002 #, c-format msgid "invalid argument %s" msgstr "argumen tidak valid %s" -#: src/stty.c:894 src/stty.c:911 src/stty.c:923 src/stty.c:936 src/stty.c:948 -#: src/stty.c:968 +#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957 +#: src/stty.c:977 #, c-format msgid "missing argument to %s" msgstr "argumen ke %s hilang" -#: src/stty.c:974 +#: src/stty.c:983 #, c-format msgid "invalid line discipline %s" msgstr "baris disiplin %s tidak valid" -#: src/stty.c:1044 +#: src/stty.c:1053 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s: tidak dapat melakukan seluruh operasi yang diminta" -#: src/stty.c:1390 +#: src/stty.c:1399 #, c-format msgid "%s: no size information for this device" msgstr "%s: tidak ada informasi ukuran untuk perangkat ini" -#: src/stty.c:1904 +#: src/stty.c:1920 #, c-format msgid "invalid integer argument %s" msgstr "integer argumen %s tidak valid" -#: src/su.c:229 -msgid "Password:" -msgstr "Kata sandi:" - -#: src/su.c:232 -#, c-format -msgid "getpass: cannot open /dev/tty" -msgstr "getpass: tidak dapat membuka /dev/tty" - -#: src/su.c:290 -#, c-format -msgid "cannot set groups" -msgstr "tidak dapat menset grup" - -#: src/su.c:294 -#, c-format -msgid "cannot set group id" -msgstr "tidak dapat menset id grup" - -#: src/su.c:296 -#, c-format -msgid "cannot set user id" -msgstr "tidak dapat menset id pengguna" - -#: src/su.c:371 -#, c-format -msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" -msgstr "Penggunaan: %s [PILIHAN]... [-] [PENGGUNA [ARG]...]\n" - -#: src/su.c:372 -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" - -#: src/su.c:384 -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" - -#: src/su.c:461 -#, c-format -msgid "user %s does not exist" -msgstr "pengguna %s tidak ada" - -#: src/su.c:484 -#, c-format -msgid "incorrect password" -msgstr "kata kunci tidak benar" - -#: src/su.c:501 -#, c-format -msgid "using restricted shell %s" -msgstr "menggunakan shell %s terbatas" - -#: src/su.c:509 -#, c-format -msgid "warning: cannot change directory to %s" -msgstr "peringatan: tidak dapat pindah ke direktori %s" - #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 msgid "Kayvan Aghaiepour" @@ -10425,7 +10730,7 @@ msgstr "" msgid "ignoring all arguments" msgstr "mengabaikan seluruh argumen" -#: src/system.h:340 +#: src/system.h:343 #, c-format msgid "" "\n" @@ -10439,15 +10744,23 @@ msgstr "" "dari versi yang dijelaskan disini. Tolong lihat ke dokumentasi shell anda\n" "untuk detail mengenai pilihan yang didukung.\n" -#: src/system.h:346 +#: src/system.h:349 msgid " --help display this help and exit\n" msgstr " --help tampilkan bantuan ini dan keluar\n" -#: src/system.h:348 +#: src/system.h:351 msgid " --version output version information and exit\n" msgstr " --version keluarkan informasi versi dan keluar\n" -#: src/system.h:541 +#: src/system.h:544 +#, fuzzy +msgid "" +"\n" +"Mandatory arguments to long options are mandatory for short options too.\n" +msgstr "" +"Argumen wajib untuk pilihan panjang adalah wajib untuk pilihan pendek juga.\n" + +#: src/system.h:552 msgid "" "\n" "SIZE is an integer and optional unit (example: 10M is 10*1024*1024). Units\n" @@ -10455,7 +10768,7 @@ msgid "" "1000).\n" msgstr "" -#: src/system.h:550 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -10470,7 +10783,7 @@ msgstr "" "Jika tidak, satuan baku ke 1024 bytes (atau 512 jika POSIXLY_CORRECT " "diset).\n" -#: src/system.h:560 +#: src/system.h:571 #, c-format msgid "" "\n" @@ -10483,22 +10796,22 @@ msgstr "" #. <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:574 +#: src/system.h:585 #, 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:578 +#: src/system.h:589 #, 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:585 +#: src/system.h:596 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "Coba `%s --help' untuk informasi lebih lanjut.\n" -#: src/system.h:617 +#: src/system.h:628 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -10520,16 +10833,16 @@ 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" -"\n" msgstr "" "Tulis setiap BERKAS ke standar keluaran, baris terakhir pertama.\n" "Tanpa BERKAS, atau ketika BERKAS adalah -, baca standar masukan.\n" "\n" -#: src/tac.c:145 +#: src/tac.c:144 msgid "" " -b, --before attach the separator before instead of after\n" " -r, --regex interpret the separator as a regular expression\n" @@ -10541,42 +10854,42 @@ msgstr "" " -s, --separator=STRING gunakan STRING sebagai pemisah daripada baris " "baru\n" -#: src/tac.c:235 src/tac.c:336 +#: src/tac.c:234 src/tac.c:335 #, c-format msgid "%s: seek failed" msgstr "%s: gagal mencari" -#: src/tac.c:264 +#: src/tac.c:263 #, c-format msgid "record too large" msgstr "rekaman terlalu besar" -#: src/tac.c:451 +#: src/tac.c:450 #, fuzzy, c-format msgid "failed to create temporary file in %s" msgstr "tidak dapat membuat berkas sementara dalam %s" -#: src/tac.c:459 +#: src/tac.c:458 #, fuzzy, c-format msgid "failed to open %s for writing" msgstr "%s: gagal untuk membuka untuk menulis" -#: src/tac.c:476 +#: src/tac.c:475 #, fuzzy, c-format msgid "failed to rewind stream for %s" msgstr "gagal untuk menjaga waktu untuk %s" -#: src/tac.c:512 src/tac.c:519 +#: src/tac.c:511 src/tac.c:518 #, c-format msgid "%s: write error" msgstr "%s: tulis error" -#: src/tac.c:572 +#: src/tac.c:571 #, fuzzy, c-format msgid "failed to open %s for reading" msgstr "tidak dapat membuka %s untuk dibaca" -#: src/tac.c:630 +#: src/tac.c:629 #, c-format msgid "separator cannot be empty" msgstr "pemisah tidak dapat kosong" @@ -10587,12 +10900,11 @@ msgid "Ian Lance Taylor" msgstr "Ian Lance Taylor" #: src/tail.c:262 -#, c-format +#, fuzzy, 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" -"\n" msgstr "" "Tampilkan akhir %d baris dari setiap BERKAS ke standar keluaran.\n" "Dengan lebih dari satu BERKAS, awali setiap dengan sebuah header memberikan " @@ -10600,7 +10912,7 @@ msgstr "" "Tanpa BERKAS, atau ketika BERKAS adalah -, baca standar masukan.\n" "\n" -#: src/tail.c:271 +#: src/tail.c:270 msgid "" " -c, --bytes=K output the last K bytes; alternatively, use -c " "+K\n" @@ -10612,7 +10924,7 @@ msgstr "" " mengeluarkan bytes dimulai dengan ke K dari " "setiap berkas\n" -#: src/tail.c:275 +#: src/tail.c:274 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -10627,7 +10939,7 @@ msgstr "" " sama\n" " -F sama seperti --follow=name --retry\n" -#: src/tail.c:282 +#: src/tail.c:281 #, fuzzy, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -10652,7 +10964,7 @@ msgstr "" "diubah nama\n" " (ini biasa untuk berkas log terotasi)\n" -#: src/tail.c:295 +#: src/tail.c:294 msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" " -q, --quiet, --silent never output headers giving file names\n" @@ -10668,7 +10980,7 @@ msgstr "" "mengikuti\n" " nama, contoh, dengan --follow=name\n" -#: src/tail.c:302 +#: src/tail.c:301 #, fuzzy msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" @@ -10681,7 +10993,7 @@ msgstr "" " (baku 1.0) diantara interasi.\n" " -v, --verbose selalu mengeluarkan header diberikan nama berkas\n" -#: src/tail.c:311 +#: src/tail.c:310 #, fuzzy msgid "" "\n" @@ -10702,7 +11014,7 @@ msgstr "" "GB 1000*1000*1000, G 1024*1024*1024, dan seterusnya untuk T, P, E, Z, Y.\n" "\n" -#: src/tail.c:320 +#: src/tail.c:319 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" @@ -10723,67 +11035,67 @@ msgstr "" "telah dihapus dan\n" "dibuat kembali oleh aplikasi lain.\n" -#: src/tail.c:379 +#: src/tail.c:378 #, c-format msgid "closing %s (fd=%d)" msgstr "menutup %s (fd=%d)" -#: src/tail.c:454 +#: 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:458 +#: src/tail.c:457 #, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "%s: tidak dapat mencari ofset akhir-relatif %s" -#: src/tail.c:895 +#: src/tail.c:894 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "tidak dapat menentukan lokasi dari %s. kembali ke polling" -#: src/tail.c:907 -#, fuzzy, c-format +#: src/tail.c:906 +#, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" -msgstr "tidak dapat menentukan lokasi dari %s. kembali ke polling" +msgstr "" -#: src/tail.c:964 +#: src/tail.c:963 #, c-format msgid "%s has become inaccessible" msgstr "%s telah menjadi tidak dapat diakses" -#: src/tail.c:981 +#: src/tail.c:980 #, 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:990 +#: src/tail.c:989 #, 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:1011 +#: src/tail.c:1010 #, c-format msgid "%s has become accessible" msgstr "%s telah menjadi dapat diakses" -#: src/tail.c:1019 +#: src/tail.c:1018 #, c-format msgid "%s has appeared; following end of new file" msgstr "%s telah muncul; mengikuti akhir dari berkas baru" -#: src/tail.c:1030 +#: src/tail.c:1029 #, c-format msgid "%s has been replaced; following end of new file" msgstr "%s telah diganti; mengikuti akhir dari berkas baru" -#: src/tail.c:1131 +#: src/tail.c:1130 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: tidak dapat mengubah mode nonblocking" @@ -11156,17 +11468,22 @@ msgstr "hilang `]'" msgid "extra argument %s" msgstr "kelebihan argumen %s" -#: src/timeout.c:124 +#: src/timeout.c:112 +#, c-format +msgid "warning: sigprocmask" +msgstr "" + +#: src/timeout.c:145 #, c-format msgid "warning: timer_settime" msgstr "" -#: src/timeout.c:129 +#: src/timeout.c:150 #, c-format msgid "warning: timer_create" msgstr "" -#: src/timeout.c:204 +#: src/timeout.c:225 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -11175,18 +11492,17 @@ msgstr "" "Penggunaan: %s [PILIHAN] NEWROOT [PERINTAH [ARG]...]\n" " atau: %s PILIHAN\n" -#: src/timeout.c:208 +#: src/timeout.c:229 #, fuzzy -msgid "" -"Start COMMAND, and kill it if still running after DURATION.\n" -"\n" -"Mandatory arguments to long options are mandatory for short options too.\n" +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:213 -#, fuzzy +#: src/timeout.c:235 msgid "" +" --preserve-status\n" +" exit with the same status as COMMAND, even when the\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 " @@ -11200,14 +11516,8 @@ msgid "" " SIGNAL may be a name like 'HUP' or a number.\n" " See 'kill -l' for a list of signals\n" msgstr "" -" -s, --signal=SIGNAL\n" -" spesifikasikan sinyal yang akan dikirim ketika kehabisan " -"waktu.\n" -" SIGNAL mungkin sebuah nama seperti `HUP' atau sebuah " -"nomor.\n" -" lihat `kill -l' untuk daftar dari sinyal\n" -#: src/timeout.c:229 +#: src/timeout.c:254 #, fuzzy msgid "" "\n" @@ -11220,16 +11530,16 @@ msgstr "" "`h' untuk jam atau `d' untuk hari.\n" "\n" -#: src/timeout.c:234 +#: src/timeout.c:259 #, fuzzy msgid "" "\n" -"If the command times out, then exit with status 124. Otherwise, exit\n" -"with the status of COMMAND. If no signal is specified, send the TERM\n" -"signal upon timeout. The TERM signal kills any process that does not\n" -"block or catch that signal. For other processes, it may be necessary to\n" -"use the KILL (9) signal, since this signal cannot be caught. If the\n" -"KILL (9) signal is sent, the exit status is 128+9 rather than 124.\n" +"If the command times out, and --preserve-status is not set, then exit with\n" +"status 124. Otherwise, exit with the status of COMMAND. If no signal\n" +"is specified, send the TERM signal upon timeout. The TERM signal kills\n" +"any process that does not block or catch that signal. It may be necessary\n" +"to use the KILL (9) signal, since this signal cannot be caught, in which\n" +"case the exit status is 128+9 rather than 124.\n" msgstr "" "\n" "Jika perintah kehabisan waktu, ketika kita keluar dengan status 124,\n" @@ -11241,14 +11551,19 @@ msgstr "" "ini mungkin perlu menggunakan sinyal KILL(9), karena sinyal ini tidak dapat\n" "ditangkap.\n" -#: src/timeout.c:419 +#: src/timeout.c:363 +#, c-format +msgid "warning: disabling core dumps failed" +msgstr "" + +#: src/timeout.c:471 #, c-format msgid "error waiting for command" msgstr "error dalam menunggu perintah" -#: src/timeout.c:441 +#: src/timeout.c:482 #, c-format -msgid "warning: disabling core dumps failed" +msgid "the monitored command dumped core" msgstr "" #. This is a proper name. See the gettext manual, section Names. @@ -11261,22 +11576,23 @@ msgstr "Jim Kingdon" msgid "Randy Smith" msgstr "Randy Smith" -#: src/touch.c:115 src/touch.c:313 +#: src/touch.c:115 src/touch.c:309 #, c-format msgid "invalid date format %s" msgstr "format tanggal %s tidak valid" -#: src/touch.c:194 +#: src/touch.c:191 #, c-format msgid "cannot touch %s" msgstr "tidak dapat menyentuh %s" -#: src/touch.c:200 +#: src/touch.c:197 #, c-format msgid "setting times of %s" msgstr "menset waktu dari %s" -#: src/touch.c:216 +#: src/touch.c:213 +#, fuzzy msgid "" "Update the access and modification times of each FILE to the current time.\n" "\n" @@ -11285,7 +11601,6 @@ msgid "" "\n" "A FILE argument string of - is handled specially and causes touch to\n" "change the times of the file associated with standard output.\n" -"\n" msgstr "" "Perbarui waktu akses dan modifikasi dari setiap BERKAS ke waktu sekarang.\n" "\n" @@ -11297,7 +11612,7 @@ msgstr "" "mengubah waktu dari berkas yang berasosiasi dengan standar keluaran.\n" "\n" -#: src/touch.c:229 +#: src/touch.c:225 msgid "" " -a change only the access time\n" " -c, --no-create do not create any files\n" @@ -11310,7 +11625,7 @@ msgstr "" "sekarang\n" " -f (diabaikan)\n" -#: src/touch.c:235 +#: src/touch.c:231 msgid "" " -h, --no-dereference affect each symbolic link instead of any " "referenced\n" @@ -11324,11 +11639,12 @@ msgstr "" " kepemilikan dari link simbolik)\n" " -m ubah hanya waktu modifikasi\n" -#: src/touch.c:241 +#: 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" -" --time=WORD change the specified time:\n" +" --time=WORD change the specified time:\n" " WORD is access, atime, or use: equivalent to -a\n" " WORD is modify or mtime: equivalent to -m\n" msgstr "" @@ -11339,7 +11655,7 @@ msgstr "" " WORD adalah akses, atime, atau use; sama dengan -a\n" " WORD adalah modify atau mtime: sama dengan -m\n" -#: src/touch.c:250 +#: src/touch.c:246 msgid "" "\n" "Note that the -d and -t options accept different time-date formats.\n" @@ -11347,12 +11663,12 @@ msgstr "" "\n" "Catat bahwa pilihan -d dan -t menerima format waktu-tanggal berbeda.\n" -#: src/touch.c:339 +#: src/touch.c:335 #, c-format msgid "cannot specify times from more than one source" msgstr "tidak dapat menspesifikasikan waktu dari lebih dari satu sumber" -#: src/touch.c:413 +#: src/touch.c:409 #, fuzzy, c-format msgid "" "warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'" @@ -11635,6 +11951,7 @@ msgid "Usage: %s OPTION... FILE...\n" msgstr "Penggunaan: %s PILIHAN... BERKAS...\n" #: src/truncate.c:97 +#, fuzzy msgid "" "Shrink or extend the size of each FILE to the specified size\n" "\n" @@ -11643,7 +11960,6 @@ msgid "" "If a FILE is larger than the specified size, the extra data is lost.\n" "If a FILE is shorter, it is extended and the extended part (hole)\n" "reads as zero bytes.\n" -"\n" msgstr "" "Kecilkan atau lebarkan ukuran dari setiap BERKAS ke ukuran yang " "dispesifikasikan\n" @@ -11657,11 +11973,11 @@ msgstr "" "dibaca sebagai byte nol.\n" "\n" -#: src/truncate.c:110 +#: src/truncate.c:109 msgid " -c, --no-create do not create any files\n" msgstr " -c, --no-create jangan buat berkas apapun\n" -#: src/truncate.c:113 +#: src/truncate.c:112 #, fuzzy msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" @@ -11669,7 +11985,7 @@ msgstr "" " -o, --io-blocks Perlakukan UKURAN sebagai sebuah nomor dari IO blok " "daripada bytes\n" -#: src/truncate.c:116 +#: src/truncate.c:115 #, fuzzy msgid "" " -r, --reference=RFILE base size on RFILE\n" @@ -11678,7 +11994,7 @@ msgstr "" " -r, --reference=BERKAS gunakan ukuran BERKAS ini\n" " -s, --size=SIZE gunakan UKURAN ini\n" -#: src/truncate.c:122 +#: src/truncate.c:121 #, fuzzy msgid "" "\n" @@ -11692,57 +12008,57 @@ msgstr "" "`/' membulatkan kebawah ke kelipatan dari, `%' membulatkan keatas ke " "kelipatan dari.\n" -#: src/truncate.c:150 +#: src/truncate.c:149 #, c-format msgid "overflow in %<PRIdMAX> * %<PRIdMAX> byte blocks for file %s" msgstr "overflow dalam %<PRIdMAX> * %<PRIdMAX> byte blok untuk berkas %s" -#: src/truncate.c:174 +#: src/truncate.c:173 #, c-format msgid "%s has unusable, apparently negative size" msgstr "%s adalah tidak berguna, kelihatannya memiliki ukuran negatif" -#: src/truncate.c:184 src/truncate.c:379 +#: src/truncate.c:183 src/truncate.c:384 #, fuzzy, c-format msgid "cannot get the size of %s" msgstr "tidak dapat mengubah kepemilikan dari %s" -#: src/truncate.c:206 +#: src/truncate.c:205 #, c-format msgid "overflow rounding up size of file %s" msgstr "pembulatan overflow dari ukuran berkas %s" -#: src/truncate.c:216 +#: src/truncate.c:215 #, c-format msgid "overflow extending size of file %s" msgstr "extending overflow dari ukuran berkas %s" -#: src/truncate.c:231 +#: src/truncate.c:230 #, fuzzy, c-format msgid "failed to truncate %s at %<PRIdMAX> bytes" msgstr "memotong %s di %<PRIdMAX> byte" -#: src/truncate.c:305 +#: src/truncate.c:303 #, c-format msgid "multiple relative modifiers specified" msgstr "multiple relatif pengubah dispesifikasikan" -#: src/truncate.c:335 +#: src/truncate.c:333 #, fuzzy, c-format msgid "you must specify either %s or %s" msgstr "anda harus menspesifikasikan satu dari %s atau %s" -#: src/truncate.c:342 +#: src/truncate.c:340 #, fuzzy, c-format msgid "you must specify a relative %s with %s" msgstr "anda harus menspesifikasikan satu dari %s atau %s" -#: src/truncate.c:349 +#: src/truncate.c:347 #, c-format msgid "%s was specified but %s was not" msgstr "%s telah dispesifikasikan tetapi %s belum" -#: src/truncate.c:400 +#: src/truncate.c:404 #, c-format msgid "cannot open %s for writing" msgstr "tidak dapat membuka %s untuk ditulis" @@ -11839,16 +12155,16 @@ msgid "cannot get system name" msgstr "tidak dapat memperoleh nama sistem" #: 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" -"\n" msgstr "" "Mengubah blank dalam setiap BERKAS ke tabs, menulis ke standar keluaran.\n" "Tanpa BERKAS, atau ketika BERKAS adalah -, baca standar masukan.\n" "\n" -#: src/unexpand.c:125 +#: src/unexpand.c:124 msgid "" " -a, --all convert all blanks, instead of just initial blanks\n" " --first-only convert only leading sequences of blanks (overrides -a)\n" @@ -11862,12 +12178,12 @@ msgstr "" " -t, --tabs=LIST menggunakan DAFTAR dipisahkan koma dari posisi tab " "(aktifkan -a)\n" -#: src/unexpand.c:153 +#: src/unexpand.c:152 #, c-format msgid "tabs are too far apart" msgstr "tabs terlalu jauh dipisahkan" -#: src/unexpand.c:505 +#: src/unexpand.c:504 #, c-format msgid "tab stop value is too large" msgstr "nilai tab stop terlalu besar" @@ -11878,12 +12194,12 @@ msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n" msgstr "Penggunaan: %s [PILIHAN]... [INPUT [OUTPUT]]\n" #: src/uniq.c:138 +#, fuzzy 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" -"\n" msgstr "" "Penyaring selanjutnya mencocokan baris dari MASUKAN (atau standar masukan),\n" "menulis ke KELUARAN (atau standar keluaran).\n" @@ -11892,7 +12208,7 @@ msgstr "" "pertama.\n" "\n" -#: src/uniq.c:148 +#: src/uniq.c:147 msgid "" " -c, --count prefix lines by the number of occurrences\n" " -d, --repeated only print duplicate lines\n" @@ -11900,7 +12216,7 @@ msgstr "" " -c, --count awali baris dengan jumlah kejadian\n" " -d, --repeated hanya menampilkan baris duplikasi\n" -#: src/uniq.c:152 +#: src/uniq.c:151 #, fuzzy msgid "" " -D, --all-repeated[=delimit-method] print all duplicate lines\n" @@ -11921,12 +12237,12 @@ msgstr "" " -u, --unique hanya menampilkan baris unik\n" " -z, --zero-termintaed akhir baris dengan 0 byte, bukan baris baru\n" -#: src/uniq.c:162 +#: src/uniq.c:161 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:167 +#: src/uniq.c:166 msgid "" "\n" "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n" @@ -11937,7 +12253,7 @@ msgstr "" "bukan-kosong\n" "karakter. Fields dilewati sebelum karakter.\n" -#: src/uniq.c:172 +#: src/uniq.c:171 #, fuzzy msgid "" "\n" @@ -11952,24 +12268,24 @@ msgstr "" "Juga, perbandingan menghargain aturan yang dispesifikasikan oleh " "`LC_COLLATE'.\n" -#: src/uniq.c:359 +#: src/uniq.c:358 #, c-format msgid "too many repeated lines" msgstr "terlalu banyak pengulangan baris" -#: src/uniq.c:522 +#: src/uniq.c:521 msgid "invalid number of fields to skip" msgstr "jumlah bagian yang dilewati tidak valid" -#: src/uniq.c:531 +#: src/uniq.c:530 msgid "invalid number of bytes to skip" msgstr "jumlah bytes yang dilewati tidak valid" -#: src/uniq.c:540 +#: src/uniq.c:539 msgid "invalid number of bytes to compare" msgstr "jumlah bytes yang dibandingkan tidak valid" -#: src/uniq.c:559 +#: src/uniq.c:558 #, c-format msgid "printing all duplicated lines and repeat counts is meaningless" msgstr "" @@ -12025,6 +12341,11 @@ msgid_plural "up %ld days %2d:%02d, " msgstr[0] "nyala %ld hari %2d:%02d, " msgstr[1] "nyala %ld hari %2d:%02d, " +#: src/uptime.c:149 +#, fuzzy, c-format +msgid "up %2d:%02d, " +msgstr "nyala %ld hari %2d:%02d, " + #: src/uptime.c:151 #, c-format msgid "%lu user" @@ -12127,39 +12448,39 @@ msgstr "" msgid " old " msgstr " lama " -#: src/who.c:449 +#: src/who.c:440 msgid "system boot" msgstr "sistem boot" -#: src/who.c:456 src/who.c:458 +#: src/who.c:447 src/who.c:449 msgid "id=" msgstr "id=" -#: src/who.c:471 src/who.c:476 +#: src/who.c:462 src/who.c:467 msgid "term=" msgstr "term=" -#: src/who.c:473 src/who.c:477 +#: src/who.c:464 src/who.c:468 msgid "exit=" msgstr "keluar=" -#: src/who.c:494 +#: src/who.c:485 msgid "LOGIN" msgstr "LOGIN" -#: src/who.c:514 +#: src/who.c:505 msgid "clock change" msgstr "jam berubah" -#: src/who.c:526 src/who.c:527 +#: src/who.c:517 src/who.c:518 msgid "run-level" msgstr "tingkat-proses" -#: src/who.c:530 src/who.c:531 +#: src/who.c:521 src/who.c:522 msgid "last=" msgstr "terakhir=" -#: src/who.c:562 +#: src/who.c:553 #, c-format msgid "" "\n" @@ -12168,45 +12489,45 @@ msgstr "" "\n" "# pengguna=%lu\n" -#: src/who.c:568 +#: src/who.c:559 msgid "NAME" msgstr "NAMA" -#: src/who.c:568 +#: src/who.c:559 msgid "LINE" msgstr "BARIS" -#: src/who.c:568 +#: src/who.c:559 msgid "TIME" msgstr "WAKTU" -#: src/who.c:568 +#: src/who.c:559 msgid "IDLE" msgstr "IDLE" -#: src/who.c:569 +#: src/who.c:560 msgid "PID" msgstr "PID" -#: src/who.c:569 +#: src/who.c:560 msgid "COMMENT" msgstr "KOMENTAR" -#: src/who.c:569 +#: src/who.c:560 msgid "EXIT" msgstr "KELUAR" -#: src/who.c:649 +#: src/who.c:640 #, c-format msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n" msgstr "Penggunaan: %s [PILIHAN]... [ BERKAS | ARG1 ARG2 ]\n" -#: src/who.c:650 +#: src/who.c:641 msgid "Print information about users who are currently logged in.\n" msgstr "" "Menampilkan informasi mengenai pengguna yang saat ini sedang logged in.\n" -#: src/who.c:653 +#: src/who.c:644 msgid "" "\n" " -a, --all same as -b -d --login -p -r -t -T -u\n" @@ -12220,11 +12541,11 @@ msgstr "" " -d, --dead menampilkan proses mati\n" " -H, --heading menampilkan baris dari heading kolom\n" -#: src/who.c:660 +#: src/who.c:651 msgid " -l, --login print system login processes\n" msgstr " -l, --login menampilkan proses sistem login\n" -#: src/who.c:663 +#: src/who.c:654 msgid "" " --lookup attempt to canonicalize hostnames via DNS\n" " -m only hostname and user associated with stdin\n" @@ -12235,7 +12556,7 @@ msgstr "" "stdin\n" " -p, --process menampilkan aktif proses dispawn oleh init\n" -#: src/who.c:668 +#: src/who.c:659 msgid "" " -q, --count all login names and number of users logged on\n" " -r, --runlevel print current runlevel\n" @@ -12248,7 +12569,7 @@ msgstr "" " -s, --short menampilkan hanya nama, baris, dan waktu (default)\n" " -t, --time menampilkan terakhir waktu sistem berubah\n" -#: src/who.c:674 +#: src/who.c:665 msgid "" " -T, -w, --mesg add user's message status as +, - or ?\n" " -u, --users list users logged in\n" @@ -12260,7 +12581,7 @@ msgstr "" " --message sama seperti -T\n" " --writable sama seperti -T\n" -#: src/who.c:682 +#: src/who.c:673 #, fuzzy, c-format msgid "" "\n" @@ -12307,20 +12628,23 @@ 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 " gid=%s" -#~ msgstr " gid=%lu" +#~ msgid " returning value: '%s'\n" +#~ msgstr "membuat berkas %s\n" #, fuzzy -#~ msgid " euid=%s" -#~ msgstr " euid=%lu" +#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n" +#~ msgstr "Penggunaan: %s [PILIHAN] NAMA...\n" -#~ msgid "" -#~ "Usage: %s NAME\n" -#~ " or: %s OPTION\n" -#~ msgstr "" -#~ "Penggunaan: %s NAMA\n" -#~ " atau: %s PILIHAN\n" +#, fuzzy +#~ msgid "no valid suffix found\n" +#~ msgstr "%s: panjang akhiran tidak valid" #~ msgid "" #~ "\n" @@ -12333,19 +12657,178 @@ msgstr "" #~ " %s /usr/bin/sort Keluaran \"sort\".\n" #~ " %s include/stdio.h Keluaran \"stdio\".\n" -#~ msgid "Usage: %s [OPTION] FILE...\n" -#~ msgstr "Penggunaan: %s [PILIHAN] BERKAS...\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 "opening %s" +#~ msgstr "membuka %s" + +#~ msgid "" +#~ "Usage: %s NAME\n" +#~ " or: %s OPTION\n" +#~ msgstr "" +#~ "Penggunaan: %s NAMA\n" +#~ " atau: %s PILIHAN\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-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" + +#, 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 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" + +#~ 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 "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 "cannot set user id" +#~ msgstr "tidak dapat menset id pengguna" + +#~ 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" + +#, 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" -#~ " --dereference affect the referent of each symbolic link (this " -#~ "is\n" -#~ " the default), rather than the symbolic link " -#~ "itself\n" +#~ " -f, --silent, --quiet suppress most error messages\n" +#~ " -v, --verbose output a diagnostic for every file processed\n" #~ msgstr "" #~ "Ubah grup dari setiap BERKAS ke GRUP.\n" #~ "Dengan --reference, ubah grup dari setiap BERKAS ke RFILE.\n" @@ -12355,6 +12838,13 @@ msgstr "" #~ " --dereference affek referensi untuk setiap link simbolik (ini\n" #~ " 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" @@ -12384,13 +12874,6 @@ msgstr "" #~ " -c, --ubag seperti verbose tetapi hanya melaporkan ketika " #~ "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" @@ -12441,33 +12924,19 @@ msgstr "" #~ "berkas yang diproses\n" #~ "\n" -#, fuzzy -#~ msgid "Usage: %s [OPTION]... PATH START\n" -#~ msgstr "Penggunaan: %s [PILIHAN]... SET1 [SET2]\n" - -#, fuzzy -#~ msgid "" -#~ " -n, --no-newline do not output the trailing " -#~ "newline\n" -#~ " " -#~ msgstr "" -#~ "Echo STRING ke keluaran standar.\n" -#~ "\n" -#~ " -n jangan mengeluarkan akhiran baris baru\n" - -#, fuzzy #~ msgid "" +#~ "Display the current time in the given FORMAT, or set the system date.\n" #~ "\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" +#~ " -d, --date=STRING display time described by STRING, not `now'\n" +#~ " -f, --file=DATEFILE like --date once for each line of DATEFILE\n" #~ msgstr "" +#~ "Menampilkan waktu sekarang dalam FORMAT yang diberikan, atau menset waktu " +#~ "sistem.\n" #~ "\n" -#~ "SIZE adalah sebuah angka yang mungkin diikuti oleh salah sati dari " -#~ "akhiran berikut:\n" -#~ "kB 1000, K 1024, MB 1000*1000, M 1024*1024, dan selanjutnya untuk G, T, " -#~ "P, E, Z, Y.\n" +#~ " -d, --date=STRING menampilkan waktu dijelaskan oleh STIRNG, " +#~ "bukan `now'\n" +#~ " -f, --file=DATEFILE seperti --date sekali untuk setiap baris dari " +#~ "DATEFILE\n" #~ msgid "" #~ "\n" @@ -12482,33 +12951,6 @@ msgstr "" #~ "KB 1000, K 1024, MB 1000*1000, M 1024*1024, dan selanjutnya untuk 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 "" -#~ "Menampilkan waktu sekarang dalam FORMAT yang diberikan, atau menset waktu " -#~ "sistem.\n" -#~ "\n" -#~ " -d, --date=STRING menampilkan waktu dijelaskan oleh STIRNG, " -#~ "bukan `now'\n" -#~ " -f, --file=DATEFILE seperti --date sekali untuk setiap baris dari " -#~ "DATEFILE\n" - -#~ msgid "cannot create link %s" -#~ msgstr "tidak dapat membuat link %s" - -#, fuzzy -#~ msgid "%s: option '%s' is ambiguous\n" -#~ msgstr "%s: pilihan '-W %s' adalah ambigu\n" - -#~ msgid "" -#~ "WARNING: --preserve_context is deprecated; use --preserve-context instead" -#~ msgstr "" -#~ "PERINGATAN: --preserve_context sudah ditinggalkan; lebih baik gunakan --" -#~ "preserve-context" - #~ msgid "" #~ " -w, --wrap=COLS Wrap encoded lines after COLS character (default " #~ "76).\n" @@ -12530,12 +12972,18 @@ msgstr "" #~ msgid "%s" #~ msgstr "%s" -#~ msgid "invalid format width" -#~ msgstr "format lebar tidak valid" +#~ msgid "cannot create link %s" +#~ msgstr "tidak dapat membuat link %s" #~ msgid "invalid format precision" #~ msgstr "format presisi tidak valid" +#~ msgid "" +#~ "WARNING: --preserve_context is deprecated; use --preserve-context instead" +#~ msgstr "" +#~ "PERINGATAN: --preserve_context sudah ditinggalkan; lebih baik gunakan --" +#~ "preserve-context" + #~ msgid "creating symbolic link %s" #~ msgstr "membuat link simbolik %s" @@ -12571,6 +13019,19 @@ msgstr "" #~ "Penggunaan: %s [PILIHAN] JUMLAH[AKHIRAN] PERINTAH [ARGUMEN]...\n" #~ " atau: %s [PILIHAN]\n" +#~ msgid "" +#~ " -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" +#~ msgstr "" +#~ " -s, --signal=SIGNAL\n" +#~ " spesifikasikan sinyal yang akan dikirim ketika " +#~ "kehabisan waktu.\n" +#~ " SIGNAL mungkin sebuah nama seperti `HUP' atau sebuah " +#~ "nomor.\n" +#~ " lihat `kill -l' untuk daftar dari sinyal\n" + #~ msgid "warning: the --%s option is obsolete; use --reference" #~ msgstr "peringatan: pilihan --%s sudah ditinggalkan; gunakan --reference" @@ -12758,6 +13219,18 @@ 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" +#~ msgid "" +#~ "\n" +#~ "SIZE is a number which may be followed by one of the following suffixes:\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 adalah sebuah angka yang mungkin diikuti oleh salah sati dari " +#~ "akhiran berikut:\n" +#~ "kB 1000, K 1024, MB 1000*1000, M 1024*1024, dan selanjutnya untuk G, 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" @@ -12927,6 +13400,9 @@ msgstr "" #~ msgid "cannot create temporary file" #~ msgstr "tidak dapat membuat berkas sementara" +#~ msgid "Usage: %s [OPTION] FILE...\n" +#~ msgstr "Penggunaan: %s [PILIHAN] BERKAS...\n" + #~ msgid "new_mode: mode\n" #~ msgstr "new_mode: mode\n" diff --git a/po/it.gmo b/po/it.gmo index 94fd9f91..78432bfb 100644 Binary files a/po/it.gmo and b/po/it.gmo differ diff --git a/po/it.po b/po/it.po index f2430def..a49ac9a5 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: 2012-05-10 19:35+0200\n" +"POT-Creation-Date: 2013-02-14 15:56+0000\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,19 +47,19 @@ msgstr "Sono argomenti validi:" msgid "error closing file" msgstr "errore nel chiudere il file" -#: lib/closeout.c:112 src/base64.c:109 src/base64.c:121 src/base64.c:127 -#: src/base64.c:168 src/base64.c:224 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:330 src/expand.c:355 src/head.c:298 -#: src/head.c:348 src/head.c:756 src/head.c:797 src/mktemp.c:350 src/od.c:919 -#: src/paste.c:160 src/shuf.c:369 src/split.c:727 src/split.c:964 -#: src/split.c:969 src/tail.c:350 src/tail.c:1201 src/tail.c:1307 +#: 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 -#: src/unexpand.c:427 src/unexpand.c:443 +#: 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:1160 src/copy.c:2602 +#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617 #, c-format msgid "preserving permissions for %s" msgstr "preservazione dei permessi per %s" @@ -251,18 +251,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:483 +#: lib/mkdir-p.c:196 src/install.c:484 #, c-format msgid "cannot change permissions of %s" msgstr "impossibile cambiare i permessi di %s" -#: lib/mkdir-p.c:206 src/copy.c:2261 src/install.c:709 src/install.c:722 +#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722 #, 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:915 src/tac.c:435 +#: src/split.c:929 src/tac.c:434 #, c-format msgid "memory exhausted" msgstr "memoria esaurita" @@ -311,75 +311,75 @@ msgstr "\"" msgid "%s: end of file" msgstr "%s: fine del file" -#: lib/regcomp.c:130 +#: lib/regcomp.c:131 msgid "Success" msgstr "Successo" -#: lib/regcomp.c:133 +#: lib/regcomp.c:134 msgid "No match" msgstr "Nessuna corrispondenza" -#: lib/regcomp.c:136 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "Espressione regolare non valida" -#: lib/regcomp.c:139 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "Carattere di collazione non valido" -#: lib/regcomp.c:142 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "Nome della classe di caratteri non valido" -#: lib/regcomp.c:145 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "Backslash finale" -#: lib/regcomp.c:148 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "Riferimento all'indietro non valido" -#: lib/regcomp.c:151 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "[ o [^ non accoppiata" -#: lib/regcomp.c:154 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "( o \\( non accoppiata" -#: lib/regcomp.c:157 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "\\{ non accoppiata" -#: lib/regcomp.c:160 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "Contenuto di \\{\\} non valido" -#: lib/regcomp.c:163 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "Fine dell'intervallo non valida" -#: lib/regcomp.c:166 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Memoria esaurita" -#: lib/regcomp.c:169 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "Espressione regolare precedente non valida" -#: lib/regcomp.c:172 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "Fine prematura dell'espressione regolare" -#: lib/regcomp.c:175 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "Espressione regolare troppo grande" -#: lib/regcomp.c:178 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr ") o \\) non accoppiata" -#: lib/regcomp.c:703 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "Nessuna espressione regolare precedente" @@ -418,7 +418,7 @@ msgstr "^[sSyY]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-mode-acl.c:695 src/copy.c:2284 src/cp.c:518 +#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516 #, c-format msgid "setting permissions for %s" msgstr "impostazione dei permessi per %s" @@ -596,13 +596,13 @@ msgstr "Mancanza alimentazione elettrica" msgid "Resource lost" msgstr "Risorsa persa" -#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262 -#: lib/spawn-pipe.c:265 +#: 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:232 lib/spawn-pipe.c:346 lib/wait-process.c:282 +#: 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" @@ -618,24 +618,24 @@ msgstr "Segnale in tempo reale %d" msgid "Unknown signal %d" msgstr "Segnale sconosciuto %d" -#: lib/unicodeio.c:103 +#: lib/unicodeio.c:102 msgid "iconv function not usable" msgstr "funzione iconv non utilizzabile" -#: lib/unicodeio.c:105 +#: lib/unicodeio.c:104 msgid "iconv function not available" msgstr "funzione iconv non disponibile" -#: lib/unicodeio.c:112 +#: lib/unicodeio.c:111 msgid "character out of range" msgstr "carattere fuori dall'intervallo" -#: lib/unicodeio.c:182 +#: lib/unicodeio.c:181 #, c-format msgid "cannot convert U+%04X to local character set" msgstr "impossibile convertire U+%04X nell'insieme di caratteri locale" -#: lib/unicodeio.c:184 +#: lib/unicodeio.c:183 #, c-format msgid "cannot convert U+%04X to local character set: %s" msgstr "impossibile convertire U+%04X nell'insieme di caratteri locale: %s" @@ -819,7 +819,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:562 +#: lib/version-etc.c:251 src/system.h:573 #, c-format msgid "%s home page: <%s>\n" msgstr "Sito web di %s: <%s>\n" @@ -829,7 +829,7 @@ 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:563 +#: lib/version-etc.c:256 src/system.h:574 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" @@ -918,18 +918,17 @@ msgid "Simon Josefsson" msgstr "Simon Josefsson" #: src/base64.c:60 -#, c-format +#, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" "Base64 encode or decode FILE, or standard input, to standard output.\n" -"\n" msgstr "" "Uso: %s [OPZIONE]... [FILE]\n" "Codifica o decodifica in base64 FILE, o lo standard input, sullo standard " "output.\n" "\n" -#: src/base64.c:64 +#: src/base64.c:67 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -946,7 +945,7 @@ msgstr "" " Usare 0 per disabilitare l'andata a capo\n" "\n" -#: src/base64.c:73 src/cat.c:110 src/fmt.c:293 src/shuf.c:71 src/sum.c:70 +#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -954,7 +953,7 @@ msgstr "" "\n" "Senza FILE, o quando FILE è -, legge lo standard input.\n" -#: src/base64.c:76 +#: src/base64.c:79 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -968,37 +967,37 @@ 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:171 src/base64.c:208 src/csplit.c:263 src/csplit.c:1435 -#: src/join.c:451 src/shuf.c:157 src/shuf.c:361 src/tac-pipe.c:74 +#: 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 #, c-format msgid "read error" msgstr "errore di lettura" -#: src/base64.c:227 +#: src/base64.c:230 #, c-format msgid "invalid input" msgstr "input non valido" -#: src/base64.c:264 +#: src/base64.c:267 #, c-format msgid "invalid wrap size: %s" msgstr "dimensione di ritorno a capo non valida: %s" -#: src/base64.c:283 src/basename.c:173 src/comm.c:435 src/cp.c:607 -#: src/date.c:441 src/dircolors.c:447 src/du.c:894 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:169 src/install.c:929 src/join.c:961 -#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:157 src/mv.c:447 -#: src/od.c:1802 src/ptx.c:2081 src/readlink.c:154 src/seq.c:408 -#: src/shuf.c:320 src/shuf.c:339 src/sort.c:4477 src/split.c:1313 -#: src/tr.c:1797 src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:454 -#: src/uniq.c:471 src/unlink.c:81 src/uptime.c:250 src/users.c:146 -#: src/wc.c:666 src/who.c:836 src/whoami.c:79 +#: 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 #, c-format msgid "extra operand %s" msgstr "operando %s in più" -#: src/base64.c:315 src/cat.c:781 +#: src/base64.c:318 src/cat.c:781 #, c-format msgid "closing standard input" msgstr "chiusura dello standard input" @@ -1006,15 +1005,15 @@ 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/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:53 src/env.c:33 +#: 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/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:65 src/su.c:88 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 +#: 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 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -1028,23 +1027,23 @@ msgstr "" " o: %s OPZIONE\n" #: src/basename.c:53 +#, fuzzy msgid "" "Print NAME with any leading directory components removed.\n" "If specified, also remove a trailing SUFFIX.\n" -"\n" msgstr "" "Stampa NOME rimuovendo tutte le componenti di directory iniziali.\n" "Se specificato, rimuove anche un SUFFISSO finale.\n" "\n" -#: src/basename.c:59 +#: 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" msgstr "" -#: src/basename.c:66 +#: src/basename.c:67 #, c-format msgid "" "\n" @@ -1055,20 +1054,21 @@ msgid "" " %s -a any/str1 any/str2 -> \"str1\" followed by \"str2\"\n" msgstr "" -#: src/basename.c:167 src/chcon.c:531 src/chgrp.c:277 src/chmod.c:526 -#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1369 +#: 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:183 src/mkfifo.c:108 src/mknod.c:146 src/nohup.c:111 -#: src/pathchk.c:148 src/printf.c:674 src/readlink.c:146 src/realpath.c:236 -#: src/rm.c:314 src/rmdir.c:223 src/seq.c:402 src/setuidgid.c:137 -#: src/sleep.c:119 src/stat.c:1476 src/stdbuf.c:346 src/tr.c:1782 +#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 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 #, 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:52 src/split.c:49 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/split.c:49 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" @@ -1078,8 +1078,8 @@ msgstr "Torbjorn Granlund" msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:846 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4720 src/nl.c:182 src/paste.c:435 src/pr.c:2768 src/sum.c:58 +#: 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/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 +1138,7 @@ msgstr "" msgid "cannot do ioctl on %s" msgstr "impossibile eseguire ioctl su %s" -#: src/cat.c:637 src/dd.c:2209 src/sort.c:379 src/tee.c:165 src/yes.c:86 +#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86 #, c-format msgid "standard output" msgstr "standard output" @@ -1155,14 +1155,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:55 src/head.c:46 src/hostid.c:33 +#: 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 msgid "Jim Meyering" msgstr "Jim Meyering" -#: src/chcon.c:100 src/runcon.c:203 src/runcon.c:234 +#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238 #, c-format msgid "failed to create security context: %s" msgstr "creazione del contesto di sicurezza %s non riuscita" @@ -1173,8 +1173,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:540 src/copy.c:2222 src/runcon.c:217 -#: src/stat.c:683 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221 +#: src/stat.c:702 #, c-format msgid "failed to get security context of %s" msgstr "recupero del contesto di sicurezza di %s non riuscito" @@ -1191,12 +1191,12 @@ 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:446 src/ls.c:2981 +#: src/du.c:457 src/ls.c:2981 #, 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:426 +#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437 #, c-format msgid "cannot read directory %s" msgstr "impossibile leggere la directory %s" @@ -1206,13 +1206,13 @@ 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:599 +#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562 #, 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:618 -#: src/remove.c:613 +#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642 +#: src/remove.c:576 #, c-format msgid "fts_close failed" msgstr "fts_close non riuscita" @@ -1235,7 +1235,6 @@ msgid "" "Change the security context of each FILE to CONTEXT.\n" "With --reference, change the security context of each FILE to that of " "RFILE.\n" -"\n" msgstr "" "Cambia il contesto di sicurezza di ciascun FILE in CONTESTO.\n" "Con --reference, cambia il contesto di sicurezza di ciascun FILE in quello " @@ -1244,7 +1243,7 @@ msgstr "" " -h, --no-dereference interessa i collegamenti simbolici invece di ogni " "file referenziato\n" -#: src/chcon.c:362 src/chgrp.c:123 src/chown.c:94 +#: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94 msgid "" " --dereference affect the referent of each symbolic link (this is\n" " the default), rather than the symbolic link itself\n" @@ -1252,7 +1251,7 @@ msgid "" "file\n" msgstr "" -#: src/chcon.c:367 +#: src/chcon.c:369 #, fuzzy msgid "" " -u, --user=USER set user USER in the target security context\n" @@ -1270,7 +1269,17 @@ msgstr "" "destinazione\n" "\n" -#: src/chcon.c:373 +#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110 +#, fuzzy +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" + +#: src/chcon.c:379 #, fuzzy msgid "" " --reference=RFILE use RFILE's security context rather than " @@ -1283,15 +1292,15 @@ msgstr "" " -R, --recursive opera ricorsivamente su file e directory\n" " -v, --verbose mostra una diagnostica per ogni file elaborato\n" -#: src/chcon.c:377 src/chgrp.c:140 src/chown.c:118 +#: 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:380 +#: src/chcon.c:386 msgid " -v, --verbose output a diagnostic for every file processed\n" msgstr "" -#: src/chcon.c:383 src/chgrp.c:143 src/chown.c:121 +#: src/chcon.c:389 src/chgrp.c:143 src/chown.c:121 #, fuzzy msgid "" "\n" @@ -1322,36 +1331,36 @@ msgstr "" "(predefinito)\n" "\n" -#: src/chcon.c:512 src/chgrp.c:264 src/chown.c:267 +#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267 #, c-format msgid "-R --dereference requires either -H or -L" msgstr "-R --dereference richiede -H o -L" -#: src/chcon.c:518 +#: src/chcon.c:524 #, c-format msgid "-R -h requires -P" msgstr "-R -h richiede -P" -#: src/chcon.c:533 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282 -#: src/comm.c:429 src/csplit.c:1371 src/join.c:1149 src/link.c:79 -#: src/mknod.c:148 src/setuidgid.c:139 src/tr.c:1785 +#: 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 #, c-format msgid "missing operand after %s" msgstr "manca l'operando dopo %s" -#: src/chcon.c:556 src/runcon.c:247 +#: src/chcon.c:562 src/runcon.c:251 #, c-format msgid "invalid context: %s" msgstr "contesto non valido: %s" -#: src/chcon.c:563 +#: src/chcon.c:569 #, c-format msgid "conflicting security context specifiers given" msgstr "forniti specificatori di contesto di sicurezza in conflitto" -#: src/chcon.c:572 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:433 src/cp.c:493 -#: src/mv.c:96 src/pwd.c:273 src/rm.c:324 src/touch.c:351 +#: 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 #, c-format msgid "failed to get attributes of %s" msgstr "recupero degli attributi di %s non riuscito" @@ -1404,16 +1413,6 @@ msgstr "" "collegamento\n" " simbolico)\n" -#: src/chgrp.c:132 src/chmod.c:387 src/chown.c:110 -#, fuzzy -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" - #: src/chgrp.c:136 msgid "" " --reference=RFILE use RFILE's group rather than specifying a\n" @@ -1502,8 +1501,14 @@ msgstr "" "file referenziato\n" #: src/chmod.c:391 +#, fuzzy 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 msgid " -R, --recursive change files and directories recursively\n" @@ -1673,7 +1678,7 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:97 src/install.c:575 src/setuidgid.c:110 src/setuidgid.c:120 +#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120 #, c-format msgid "invalid group %s" msgstr "gruppo %s non valido" @@ -1743,8 +1748,8 @@ msgstr "impostazione dell'id di gruppo non riuscita" msgid "failed to set user-ID" msgstr "impostazione dell'id utente non riuscita" -#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:213 src/stdbuf.c:366 -#: src/timeout.c:402 +#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365 +#: src/timeout.c:454 #, c-format msgid "failed to run command %s" msgstr "impossibile eseguire il comando %s" @@ -1865,20 +1870,24 @@ msgstr "specificati delimitatori multipli" msgid "empty %s not allowed" msgstr "%s vuoto non permesso" -#: src/copy.c:168 src/dd.c:1609 src/dd.c:1976 +#: 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 #, c-format -msgid "reading %s" -msgstr "lettura di %s" +msgid "error reading %s" +msgstr "errore leggendo %s" -#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:426 +#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425 #, c-format msgid "cannot lseek %s" msgstr "impossibile fare lseek in %s" -#: src/copy.c:206 src/dd.c:2039 src/dd.c:2102 +#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151 #, c-format -msgid "writing %s" -msgstr "scrittura di %s" +msgid "error writing %s" +msgstr "errore scrivendo %s" # http://it.wikipedia.org/wiki/Extent # http://it.wikipedia.org/wiki/Ext4#Extent @@ -1902,7 +1911,7 @@ msgstr "creazione dell'extent di %s non riuscita" msgid "clearing permissions for %s" msgstr "azzeramento dei permessi per %s" -#: src/copy.c:697 src/copy.c:2470 src/cp.c:331 +#: src/copy.c:697 src/copy.c:2480 src/cp.c:329 #, c-format msgid "failed to preserve ownership for %s" msgstr "impossibile preservare il proprietario di %s" @@ -1917,14 +1926,14 @@ msgstr "lookup del file %s non riuscito" msgid "failed to preserve authorship for %s" msgstr "preservazione dei diritti di %s non riuscita" -#: src/copy.c:804 src/csplit.c:638 src/du.c:901 src/fmt.c:449 src/head.c:847 -#: src/sort.c:4489 src/split.c:1329 src/tail.c:1756 src/wc.c:678 +#: 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 "impossibile aprire %s per la lettura" -#: src/copy.c:810 src/copy.c:972 src/dd.c:1546 src/dd.c:2114 src/dd.c:2252 -#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:141 +#: 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 #, c-format msgid "cannot fstat %s" msgstr "impossibile fare fstat di %s" @@ -1944,14 +1953,14 @@ msgstr "recupero del contesto di creazione del file system non riuscito" 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:1574 src/copy.c:1777 src/copy.c:1935 src/ln.c:314 -#: src/remove.c:267 src/remove.c:293 src/remove.c:444 src/remove.c:465 +#: 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 #, c-format msgid "cannot remove %s" msgstr "impossibile rimuovere %s" -#: src/copy.c:886 src/copy.c:1578 src/copy.c:1772 src/copy.c:1940 -#: src/remove.c:418 +#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945 +#: src/remove.c:375 #, c-format msgid "removed %s\n" msgstr "%s rimosso\n" @@ -1973,193 +1982,193 @@ msgstr "impossibile creare il file regolare %s" msgid "failed to clone %s from %s" msgstr "clonazione di %s da %s non riuscita" -#: src/copy.c:1098 src/copy.c:2531 +#: src/copy.c:1098 src/copy.c:2541 #, c-format msgid "preserving times for %s" msgstr "preservati gli orari di %s" -#: src/copy.c:1170 src/copy.c:1176 src/head.c:855 src/touch.c:175 -#: src/truncate.c:413 -#, c-format -msgid "closing %s" -msgstr "chiusura di %s" +#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 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:1466 +#: src/copy.c:1471 #, c-format msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? " msgstr "%s: provare a sovrascrivere %s, ignorando il modo %04lo (%s)? " -#: src/copy.c:1473 +#: src/copy.c:1478 #, c-format msgid "%s: overwrite %s? " msgstr "%s: sovrascrivere %s? " -#: src/copy.c:1542 +#: src/copy.c:1547 #, c-format msgid " (backup: %s)" msgstr " (backup: %s)" -#: src/copy.c:1552 +#: src/copy.c:1557 #, 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:1584 +#: src/copy.c:1589 #, c-format msgid "cannot create hard link %s to %s" msgstr "impossibile creare il collegamento fisico %s a %s" -#: src/copy.c:1637 src/copy.c:1689 src/copy.c:2272 src/copy.c:2589 +#: 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:1220 src/truncate.c:365 +#: src/stat.c:1239 src/truncate.c:363 #, c-format msgid "cannot stat %s" msgstr "impossibile eseguire stat di %s" -#: src/copy.c:1645 +#: src/copy.c:1650 #, c-format msgid "omitting directory %s" msgstr "directory %s omessa" -#: src/copy.c:1659 +#: src/copy.c:1664 #, 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:1707 src/ln.c:246 +#: src/copy.c:1712 src/ln.c:246 #, c-format msgid "%s and %s are the same file" msgstr "%s e %s sono lo stesso file" -#: src/copy.c:1806 +#: src/copy.c:1811 #, 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:1824 src/ln.c:214 +#: src/copy.c:1829 src/ln.c:214 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "%s appena creato non sarà sovrascritto da %s" -#: src/copy.c:1842 +#: src/copy.c:1847 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "impossibile sovrascrivere la directory %s con una non-directory" -#: src/copy.c:1856 +#: src/copy.c:1861 #, 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:1886 +#: src/copy.c:1891 #, 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:1887 +#: src/copy.c:1892 #, 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:1910 src/ln.c:276 +#: src/copy.c:1915 src/ln.c:276 #, c-format msgid "cannot backup %s" msgstr "impossibile fare il backup di %s" -#: src/copy.c:1974 +#: src/copy.c:1979 #, 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:2051 +#: src/copy.c:2056 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "impossibile copiare una directory, %s, dentro sé stessa, %s" -#: src/copy.c:2068 +#: src/copy.c:2073 #, 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:2118 +#: src/copy.c:2123 #, 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:2161 +#: src/copy.c:2166 #, c-format msgid "cannot move %s to %s" msgstr "impossibile spostare %s in %s" -#: src/copy.c:2173 +#: src/copy.c:2178 #, 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:2207 src/install.c:905 src/mkdir.c:189 src/mkfifo.c:114 -#: src/mknod.c:167 +#: 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:2241 +#: src/copy.c:2246 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "impossibile copiare il collegamento simbolico ciclico %s" -#: src/copy.c:2350 +#: src/copy.c:2355 #, 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:2357 +#: src/copy.c:2362 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "impossibile creare il collegamento simbolico %s a %s" -#: src/copy.c:2406 src/mkfifo.c:133 +#: src/copy.c:2416 src/mkfifo.c:132 #, c-format msgid "cannot create fifo %s" msgstr "impossibile creare il fifo %s" -#: src/copy.c:2415 +#: src/copy.c:2425 #, c-format msgid "cannot create special file %s" msgstr "impossibile creare il file speciale %s" -#: src/copy.c:2426 src/ls.c:3191 src/stat.c:902 +#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921 #, c-format msgid "cannot read symbolic link %s" msgstr "impossibile leggere il collegamento simbolico %s" -#: src/copy.c:2453 +#: src/copy.c:2463 #, c-format msgid "cannot create symbolic link %s" msgstr "impossibile creare il collegamento simbolico %s" -#: src/copy.c:2485 +#: src/copy.c:2495 #, c-format msgid "%s has unknown file type" msgstr "%s presenta un tipo di file sconosciuto" -#: src/copy.c:2629 src/ln.c:358 +#: src/copy.c:2644 src/ln.c:358 #, c-format msgid "cannot un-backup %s" msgstr "impossibile annullare il backup di %s" -#: src/copy.c:2633 +#: src/copy.c:2648 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (annullamento backup)\n" -#: src/cp.c:156 src/mv.c:284 +#: src/cp.c:156 src/mv.c:286 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -2171,27 +2180,13 @@ msgstr "" " o: %s [OPZIONE]... -t DIRECTORY ORIGINE...\n" #: src/cp.c:162 -msgid "" -"Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" -"\n" +#, 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:166 src/csplit.c:1458 src/cut.c:197 src/df.c:852 src/du.c:268 -#: src/expand.c:112 src/fmt.c:275 src/fold.c:75 src/head.c:115 -#: src/install.c:612 src/kill.c:86 src/ln.c:392 src/ls.c:4726 src/mkdir.c:61 -#: src/mkfifo.c:56 src/mknod.c:58 src/mv.c:294 src/nl.c:191 src/paste.c:445 -#: src/pr.c:2777 src/ptx.c:1825 src/shred.c:153 src/shuf.c:58 src/sort.c:399 -#: src/split.c:211 src/stdbuf.c:95 src/tac.c:142 src/tail.c:268 -#: src/touch.c:226 src/truncate.c:107 src/unexpand.c:122 src/uniq.c:145 -msgid "" -"Mandatory arguments to long options are mandatory for short options too.\n" -msgstr "" -"Gli argomenti obbligatori per le opzioni lunghe lo sono anche per quelle " -"brevi.\n" - -#: src/cp.c:169 +#: src/cp.c:168 msgid "" " -a, --archive same as -dR --preserve=all\n" " --attributes-only don't copy the file data, just the " @@ -2214,12 +2209,14 @@ msgstr "" "contenuto dei file speciali\n" " -d come --no-dereference --preserve=links\n" -#: src/cp.c:178 +#: src/cp.c:177 +#, fuzzy msgid "" " -f, --force if an existing destination file cannot be\n" -" opened, remove it and try again (redundant " -"if\n" -" the -n option is used)\n" +" opened, remove it and try again (this " +"option\n" +" is ignored when the -n option is also " +"used)\n" " -i, --interactive prompt before overwrite (overrides a previous " "-n\n" " option)\n" @@ -2235,7 +2232,7 @@ msgstr "" " -H segue i collegamenti simbolici sulla riga di " "comando in ORIGINE\n" -#: src/cp.c:188 +#: src/cp.c:186 msgid "" " -l, --link hard link files instead of copying\n" " -L, --dereference always follow symbolic links in SOURCE\n" @@ -2245,7 +2242,7 @@ msgstr "" " -L, --dereference segue sempre i collegamenti simbolici in " "ORIGINE\n" -#: src/cp.c:192 +#: src/cp.c:190 msgid "" " -n, --no-clobber do not overwrite an existing file (overrides\n" " a previous -i option)\n" @@ -2257,7 +2254,7 @@ msgstr "" " -P, --no-dereference non segue mai i collegamenti simbolici in " "ORIGINE\n" -#: src/cp.c:197 +#: src/cp.c:195 msgid "" " -p same as --preserve=mode,ownership,timestamps\n" " --preserve[=ATTR_LIST] preserve the specified attributes (default:\n" @@ -2273,7 +2270,7 @@ msgstr "" " gli attributi addizionali: context, links, " "xattr, all\n" -#: src/cp.c:205 +#: src/cp.c:203 msgid "" " --no-preserve=ATTR_LIST don't preserve the specified attributes\n" " --parents use full source file name under DIRECTORY\n" @@ -2282,7 +2279,7 @@ msgstr "" " --parents utilizza il nome completo della sorgente " "sotto DIRECTORY\n" -#: src/cp.c:209 +#: src/cp.c:207 msgid "" " -R, -r, --recursive copy directories recursively\n" " --reflink[=WHEN] control clone/CoW copies. See below\n" @@ -2297,7 +2294,7 @@ msgstr "" " prima di cercare di aprirlo (al contrario\n" " con --force)\n" -#: src/cp.c:215 +#: src/cp.c:213 msgid "" " --sparse=WHEN control creation of sparse files. See below\n" " --strip-trailing-slashes remove any trailing slashes from each " @@ -2310,7 +2307,7 @@ msgstr "" "parametro\n" " ORIGINE\n" -#: src/cp.c:220 +#: src/cp.c:218 msgid "" " -s, --symbolic-link make symbolic links instead of copying\n" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -2324,7 +2321,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:226 +#: src/cp.c:224 msgid "" " -u, --update copy only when the SOURCE file is newer\n" " than the destination file or when the\n" @@ -2337,7 +2334,7 @@ msgstr "" " -v, --verbose spiega cosa sta facendo\n" " -x, --one-file-system rimane su questo file system\n" -#: src/cp.c:235 +#: src/cp.c:233 msgid "" "\n" "By default, sparse SOURCE files are detected by a crude heuristic and the\n" @@ -2365,7 +2362,7 @@ msgstr "" "la copia\n" "fallisce o, se è specificato --reflink=auto, ritorna a una copia standard.\n" -#: src/cp.c:247 src/install.c:649 src/ln.c:421 src/mv.c:321 +#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322 #, fuzzy msgid "" "\n" @@ -2383,7 +2380,7 @@ msgstr "" "sono:\n" "\n" -#: src/cp.c:254 src/install.c:656 src/mv.c:328 +#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329 msgid "" " none, off never make backups (even if --backup is given)\n" " numbered, t make numbered backups\n" @@ -2395,7 +2392,7 @@ msgstr "" " existing, nil numerati se esistono backup numerati, altrimenti semplici\n" " simple, never fa sempre backup semplici\n" -#: src/cp.c:260 +#: src/cp.c:258 msgid "" "\n" "As a special case, cp makes a backup of SOURCE when the force and backup\n" @@ -2408,93 +2405,93 @@ msgstr "" "force e backup e ORIGINE e DEST sono lo stesso nome di un file regolare già\n" "esistente.\n" -#: src/cp.c:319 +#: src/cp.c:317 #, c-format msgid "failed to preserve times for %s" msgstr "impossibile preservare gli orari di %s" -#: src/cp.c:350 +#: src/cp.c:348 #, c-format msgid "failed to preserve permissions for %s" msgstr "impossibile preservare i permessi di %s" -#: src/cp.c:477 +#: src/cp.c:475 #, c-format msgid "cannot make directory %s" msgstr "impossibile creare la directory %s" -#: src/cp.c:526 src/cp.c:545 +#: src/cp.c:524 src/cp.c:543 #, c-format msgid "%s exists but is not a directory" msgstr "%s esiste ma non è una directory" -#: src/cp.c:572 src/cp.c:1068 src/install.c:401 src/install.c:844 src/ln.c:123 -#: src/ln.c:181 src/ln.c:202 src/ln.c:516 src/mv.c:152 src/mv.c:399 -#, c-format -msgid "accessing %s" -msgstr "accesso a %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 +#, fuzzy, c-format +msgid "failed to access %s" +msgstr "apertura di %s non riuscita" -#: src/cp.c:592 src/install.c:914 src/ln.c:546 src/mv.c:432 src/shred.c:1182 -#: src/touch.c:433 src/truncate.c:356 +#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181 +#: src/touch.c:429 src/truncate.c:354 #, c-format msgid "missing file operand" msgstr "manca il file operando" -#: src/cp.c:594 src/install.c:916 src/ln.c:560 src/mv.c:434 +#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436 #, c-format msgid "missing destination file operand after %s" msgstr "manca l'operando per il file di destinazione dopo %s" -#: src/cp.c:603 src/install.c:925 src/mv.c:443 +#: src/cp.c:601 src/install.c:926 src/mv.c:445 #, 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:619 src/cp.c:1070 src/install.c:403 src/install.c:846 -#: src/install.c:938 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:401 -#: src/mv.c:457 +#: 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 #, c-format msgid "target %s is not a directory" msgstr "l'obiettivo %s non è una directory" -#: src/cp.c:730 +#: src/cp.c:728 #, c-format msgid "with --parents, the destination must be a directory" msgstr "con --parents, la destinazione deve essere una directory" -#: src/cp.c:1063 src/install.c:839 src/ln.c:511 src/mv.c:394 +#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395 #, c-format msgid "multiple target directories specified" msgstr "specificate directory multiple di destinazione" -#: src/cp.c:1108 +#: src/cp.c:1110 #, c-format msgid "cannot make both hard and symbolic links" msgstr "impossibile creare contemporaneamente collegamenti fisici e simbolici" -#: src/cp.c:1115 src/mv.c:464 +#: src/cp.c:1117 src/mv.c:466 #, c-format msgid "options --backup and --no-clobber are mutually exclusive" msgstr "le opzioni --backup e --no-clobber sono mutualmente esclusive" -#: src/cp.c:1121 +#: src/cp.c:1123 #, c-format msgid "--reflink can be used only with --sparse=auto" msgstr "--reflink può essere usato solo con --sparse=auto" -#: src/cp.c:1129 src/install.c:899 src/ln.c:582 src/mv.c:472 +#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474 msgid "backup type" msgstr "tipo di backup" -#: src/cp.c:1154 +#: src/cp.c:1156 #, 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:1160 +#: src/cp.c:1162 #, c-format msgid "cannot preserve extended attributes, cp is built without xattr support" msgstr "" @@ -2506,139 +2503,138 @@ msgstr "" msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:529 +#: src/csplit.c:531 #, c-format msgid "input disappeared" msgstr "l'input è scomparso" -#: src/csplit.c:658 src/csplit.c:669 +#: src/csplit.c:660 src/csplit.c:671 #, c-format msgid "%s: line number out of range" msgstr "%s: numero di riga fuori dall'intervallo" -#: src/csplit.c:698 +#: src/csplit.c:700 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: numero di riga fuori dall'intervallo" -#: src/csplit.c:701 src/csplit.c:750 +#: src/csplit.c:703 src/csplit.c:752 #, c-format msgid " on repetition %s\n" msgstr " su ripetizione %s\n" -#: src/csplit.c:744 +#: src/csplit.c:746 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: corrispondenza non trovata" -#: src/csplit.c:808 src/csplit.c:848 src/nl.c:359 src/tac.c:274 +#: src/csplit.c:810 src/csplit.c:850 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:981 +#: src/csplit.c:983 #, c-format msgid "write error for %s" msgstr "errore di scrittura per %s" -#: src/csplit.c:1057 +#: src/csplit.c:1059 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: intero atteso dopo il delimitatore" -#: src/csplit.c:1073 +#: src/csplit.c:1075 #, fuzzy, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: \"}\" è richiesto nel conteggio delle ripetizioni" -#: src/csplit.c:1083 +#: src/csplit.c:1085 #, fuzzy, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: intero richiesto tra \"{\" e \"}\"" -#: src/csplit.c:1110 +#: src/csplit.c:1112 #, fuzzy, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: manca il delimitatore di chiusura \"%c\"" -#: src/csplit.c:1127 +#: src/csplit.c:1129 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: espressione regolare non valida: %s" -#: src/csplit.c:1160 +#: src/csplit.c:1162 #, c-format msgid "%s: invalid pattern" msgstr "%s: modello non valido" -#: src/csplit.c:1163 +#: src/csplit.c:1165 #, 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:1169 +#: src/csplit.c:1171 #, 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:1175 +#: src/csplit.c:1177 #, 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:1253 +#: src/csplit.c:1255 #, c-format msgid "missing conversion specifier in suffix" msgstr "manca lo specificatore di conversione nel suffisso" -#: src/csplit.c:1259 +#: src/csplit.c:1261 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "specificatore di conversione non valido nel suffisso: %c" -#: src/csplit.c:1262 +#: src/csplit.c:1264 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "specificatore di conversione non valido nel suffisso: \\%.3o" -#: src/csplit.c:1267 +#: src/csplit.c:1269 #, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "flag non validi nella specifica di conversione: %%%c%c" -#: src/csplit.c:1284 +#: src/csplit.c:1286 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "troppe specifiche di conversione %% nel suffisso" -#: src/csplit.c:1298 +#: src/csplit.c:1300 #, c-format msgid "missing %% conversion specification in suffix" msgstr "manca la specifica di conversione %% nel suffisso" -#: src/csplit.c:1345 +#: src/csplit.c:1347 #, c-format msgid "%s: invalid number" msgstr "%s: numero non valido" -#: src/csplit.c:1449 +#: src/csplit.c:1451 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Uso: %s [OPZIONE]... FILE MODELLO...\n" -#: src/csplit.c:1453 +#: src/csplit.c:1455 #, 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" -"\n" msgstr "" "Stampa parti di FILE separate dal/i MODELLO/I sui file \"xx00\", " "\"xx01\", ...,\n" "e stampa su stdout la dimensione in byte di ogni parte.\n" "\n" -#: src/csplit.c:1461 +#: src/csplit.c:1462 #, fuzzy, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2650,7 +2646,7 @@ 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:1466 +#: src/csplit.c:1467 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 +2658,7 @@ msgstr "" "file di output\n" " -z, --elide-empty-files rimuove i file di output vuoti\n" -#: src/csplit.c:1473 +#: src/csplit.c:1474 msgid "" "\n" "Read standard input if FILE is -. Each PATTERN may be:\n" @@ -2670,7 +2666,7 @@ msgstr "" "\n" "Legge da standard input se FILE è -. Ogni MODELLO può essere:\n" -#: src/csplit.c:1477 +#: src/csplit.c:1478 #, fuzzy msgid "" "\n" @@ -2700,7 +2696,7 @@ msgstr "" msgid "David M. Ihnat" msgstr "David M. Ihnat" -#: src/cut.c:64 +#: src/cut.c:64 src/cut.c:372 msgid "fields and positions are numbered from 1" msgstr "campi e posizioni sono numerati da 1" @@ -2710,14 +2706,13 @@ msgid "Usage: %s OPTION... [FILE]...\n" msgstr "Uso: %s [OPZIONE]... [FILE]...\n" #: src/cut.c:193 -msgid "" -"Print selected parts of lines from each FILE to standard output.\n" -"\n" +#, 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:200 +#: src/cut.c:199 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2728,7 +2723,7 @@ msgstr "" " -d, --delimiter=DELIM usa DELIM invece di TAB come delimitatore di " "campo\n" -#: src/cut.c:205 +#: src/cut.c:204 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2742,7 +2737,7 @@ msgstr "" " meno che non sia specificata l'opzione -s\n" " -n (ignorato)\n" -#: src/cut.c:211 +#: src/cut.c:210 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" @@ -2750,7 +2745,7 @@ msgstr "" " --complement complementa l'insieme dei byte, caratteri\n" " o campi selezionati\n" -#: src/cut.c:215 +#: src/cut.c:214 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2762,7 +2757,7 @@ msgstr "" " il comportamento predefinito è di utilizzare il " "delimitatore di input\n" -#: src/cut.c:222 +#: src/cut.c:221 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2775,7 +2770,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:228 +#: src/cut.c:227 msgid "" "Each range is one of:\n" "\n" @@ -2795,47 +2790,49 @@ msgstr "" "\n" "Senza FILE, o quando FILE è -, legge lo standard input.\n" -#: src/cut.c:368 src/cut.c:489 -msgid "invalid byte or field list" +#: src/cut.c:367 src/cut.c:493 +#, fuzzy +msgid "invalid byte, character or field list" msgstr "elenco di campi o byte non valido" -#: src/cut.c:385 +#: src/cut.c:387 msgid "invalid range with no endpoint: -" msgstr "intervallo non valido senza punto finale: -" -#: src/cut.c:399 +#: src/cut.c:403 msgid "invalid decreasing range" msgstr "intervallo decrescente non valido" -#: src/cut.c:478 +#: src/cut.c:482 #, c-format msgid "byte offset %s is too large" msgstr "l'offset in byte %s è troppo grande" -#: src/cut.c:481 +#: src/cut.c:485 #, c-format msgid "field number %s is too large" msgstr "il numero di campo %s è troppo grande" -#: src/cut.c:789 src/cut.c:797 +#: src/cut.c:795 src/cut.c:803 msgid "only one type of list may be specified" msgstr "può essere specificato solo un tipo di elenco" -#: src/cut.c:806 +#: src/cut.c:812 src/numfmt.c:1408 +#, c-format msgid "the delimiter must be a single character" msgstr "il delimitatore deve essere un singolo carattere" -#: src/cut.c:841 +#: src/cut.c:847 msgid "you must specify a list of bytes, characters, or fields" msgstr "è necessario specificare una elenco di byte, caratteri o campi" -#: src/cut.c:844 +#: src/cut.c:850 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:848 +#: src/cut.c:854 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2843,11 +2840,11 @@ msgstr "" "eliminare le righe non delimitate ha senso\n" "\tsolo quando si sta operando sui campi" -#: src/cut.c:864 +#: src/cut.c:870 msgid "missing list of fields" msgstr "manca l'elenco dei campi" -#: src/cut.c:866 +#: src/cut.c:872 msgid "missing list of positions" msgstr "manca l'elenco delle posizioni" @@ -2861,9 +2858,11 @@ msgstr "" " o: %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 "" + +#: src/date.c:134 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" " -I[TIMESPEC], --iso-8601[=TIMESPEC] output date/time in ISO 8601 format.\n" @@ -2872,7 +2871,7 @@ msgid "" " and time to the indicated precision.\n" msgstr "" -#: src/date.c:138 +#: src/date.c:142 msgid "" " -r, --reference=FILE display the last modification time of FILE\n" " -R, --rfc-2822 output date and time in RFC 2822 format.\n" @@ -2883,7 +2882,7 @@ msgstr "" " -R, --rfc-2822 stampa data e ora conforme al formato RFC 2822.\n" " Esempio: Mon, 07 Aug 2006 12:34:56 +0200\n" -#: src/date.c:143 +#: src/date.c:147 #, fuzzy msgid "" " --rfc-3339=TIMESPEC output date and time in RFC 3339 format.\n" @@ -2903,7 +2902,7 @@ msgstr "" " -u, --utc, --universal stampa o imposta il Tempo Coordinato Universale " "(UTC)\n" -#: src/date.c:154 +#: src/date.c:158 msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" @@ -2917,7 +2916,7 @@ msgstr "" " %% un % letterale\n" " %a nome localizzato abbreviato del giorno della settimana (es.: dom)\n" -#: src/date.c:161 +#: src/date.c:165 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2930,7 +2929,7 @@ msgstr "" " %B nome localizzato completo del mese (es.: gennaio)\n" " %c data e orario localizzate (es.: gio 3 mar 2005 12:02:33 CET)\n" -#: src/date.c:167 +#: src/date.c:171 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2943,7 +2942,7 @@ msgstr "" " %D data; equivalente a %m/%d/%y\n" " %e giorno del mese, con spazi; equivalente a %_d\n" -#: src/date.c:173 +#: src/date.c:177 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -2955,7 +2954,7 @@ msgstr "" " %G anno del numero ISO della settimana (consultare %V); in genere utile " "solo con %V\n" -#: src/date.c:178 +#: src/date.c:182 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2967,7 +2966,7 @@ msgstr "" " %I ora (01..12)\n" " %j giorno dell'anno (001..366)\n" -#: src/date.c:184 +#: src/date.c:188 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -2979,7 +2978,7 @@ msgstr "" " %m mese (01..12)\n" " %M minuto (00..59)\n" -#: src/date.c:190 +#: src/date.c:194 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2997,7 +2996,7 @@ msgstr "" " %R ora, 24-ore; equivalente a %H:%M\n" " %s secondi passati dalle 00:00:00 del 1 gen 1970\n" -#: src/date.c:199 +#: src/date.c:203 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -3009,7 +3008,7 @@ msgstr "" " %T ora; come %H:%M:%S\n" " %u giorno della settimana (1..7); 1 rappresenta lunedì\n" -#: src/date.c:205 +#: src/date.c:209 msgid "" " %U week number of year, with Sunday as first day of week (00..53)\n" " %V ISO week number, with Monday as first day of week (01..53)\n" @@ -3025,7 +3024,7 @@ msgstr "" " %W numero della settimana dell'anno con lunedì come primo giorno della\n" " settimana (00..53)\n" -#: src/date.c:211 +#: src/date.c:215 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -3037,7 +3036,7 @@ msgstr "" " %y ultime due cifre dell'anno (00..99)\n" " %Y anno\n" -#: src/date.c:217 +#: src/date.c:221 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -3057,7 +3056,7 @@ msgstr "" "\n" "In modo predefinito, date riempie i campi numerici con zeri.\n" -#: src/date.c:226 +#: src/date.c:230 #, fuzzy msgid "" "The following optional flags may follow '%':\n" @@ -3076,7 +3075,7 @@ msgstr "" " ^ usa la maiuscola se possibile\n" " # usa l'opposto se possibile\n" -#: src/date.c:235 +#: src/date.c:239 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -3092,7 +3091,7 @@ msgstr "" "O per usare la rappresentazione localizzata alternativa per i simboli " "numerici, se definita.\n" -#: src/date.c:242 +#: src/date.c:246 msgid "" "\n" "Examples:\n" @@ -3118,37 +3117,37 @@ msgstr "" "degli USA\n" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" -#: src/date.c:275 src/dd.c:2193 src/head.c:838 src/md5sum.c:477 -#: src/md5sum.c:798 src/od.c:863 src/od.c:1914 src/pr.c:1176 src/pr.c:1372 -#: src/pr.c:1494 src/stty.c:842 src/tac.c:563 src/tail.c:343 src/tee.c:126 +#: 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 #, c-format msgid "standard input" msgstr "standard input" -#: src/date.c:303 src/date.c:523 +#: src/date.c:307 src/date.c:527 #, c-format msgid "invalid date %s" msgstr "data %s non valida" -#: src/date.c:414 src/date.c:448 +#: src/date.c:418 src/date.c:452 #, c-format msgid "multiple output formats specified" msgstr "specificati formati di output multipli" -#: src/date.c:426 +#: src/date.c:430 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "" "le opzioni per specificare la stampa di date sono mutualmente esclusive" -#: src/date.c:433 +#: src/date.c:437 #, c-format msgid "the options to print and set the time may not be used together" msgstr "" "le opzioni per stampare e impostare l'orario non possono essere usate insieme" -#: src/date.c:454 +#: src/date.c:458 #, fuzzy, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -3160,23 +3159,23 @@ msgstr "" "argomento\n" "che non sia un'opzione deve essere una stringa di formato che inizia con «+»" -#: src/date.c:531 +#: src/date.c:535 #, c-format msgid "cannot set date" msgstr "impossibile impostare la data" -#: src/date.c:554 src/du.c:360 +#: src/date.c:558 src/du.c:371 #, c-format msgid "time %s is out of range" msgstr "l'orario %s è fuori dal limite" #. This is a proper name. See the gettext manual, section Names. -#: src/dd.c:44 src/factor.c:43 src/rm.c:41 src/tail.c:69 src/touch.c:41 +#: 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 "Paul Rubin" -#: src/dd.c:517 +#: src/dd.c:521 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3185,7 +3184,7 @@ msgstr "" "Uso: %s [OPERANDO]...\n" " o: %s OPZIONE\n" -#: src/dd.c:522 +#: src/dd.c:526 #, fuzzy msgid "" "Copy a file, converting and formatting according to the operands.\n" @@ -3205,7 +3204,7 @@ msgstr "" " count=BLOCCHI copia dall'input solo BLOCCHI blocchi\n" " ibs=BYTE legge BYTE byte per volta (predefinito: 512)\n" -#: src/dd.c:531 +#: src/dd.c:535 #, fuzzy msgid "" " if=FILE read from FILE instead of stdin\n" @@ -3215,7 +3214,8 @@ msgid "" " oflag=FLAGS write as per the comma separated symbol list\n" " seek=N skip N obs-sized blocks at start of output\n" " skip=N skip N ibs-sized blocks at start of input\n" -" status=noxfer suppress transfer statistics\n" +" status=WHICH WHICH info to suppress outputting to stderr;\n" +" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" msgstr "" " if=FILE legge da FILE invece che da stdin\n" " iflag=FLAGS legge come dall'elenco di simboli separati da virgole\n" @@ -3228,10 +3228,11 @@ msgstr "" "dell'input\n" " status=noxfer nasconde le statistiche di trasferimento\n" -#: src/dd.c:541 +#: src/dd.c:546 +#, fuzzy msgid "" "\n" -"BLOCKS and BYTES may be followed by the following multiplicative suffixes:\n" +"N and BYTES may be followed by the following multiplicative suffixes:\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, and so on for T, P, E, Z, Y.\n" "\n" @@ -3247,7 +3248,7 @@ msgstr "" "Ogni simbolo CONV può essere:\n" "\n" -#: src/dd.c:550 +#: src/dd.c:555 #, fuzzy msgid "" " ascii from EBCDIC to ASCII\n" @@ -3275,7 +3276,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:563 +#: src/dd.c:568 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3291,7 +3292,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:571 +#: src/dd.c:576 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3305,75 +3306,75 @@ msgstr "" " append modalità append (ha senso solo per l'output; suggerito " "conv=notrunc)\n" -#: src/dd.c:578 +#: src/dd.c:583 msgid " cio use concurrent I/O for data\n" msgstr " cio utilizza I/O concorrente per i dati\n" -#: src/dd.c:580 +#: src/dd.c:585 msgid " direct use direct I/O for data\n" msgstr " direct utilizza I/O diretto per i dati\n" -#: src/dd.c:582 +#: src/dd.c:587 msgid " directory fail unless a directory\n" msgstr " directory fallisce a meno che non sia una directory\n" -#: src/dd.c:584 +#: src/dd.c:589 msgid " dsync use synchronized I/O for data\n" msgstr " dsync utilizza I/O sincronizzato per i dati\n" -#: src/dd.c:586 +#: src/dd.c:591 msgid " sync likewise, but also for metadata\n" msgstr " sync similmente, ma anche per metadati\n" -#: src/dd.c:587 +#: src/dd.c:592 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr " fullblock accumula blocchi pieni di input (solo iflag)\n" -#: src/dd.c:590 +#: src/dd.c:595 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock utilizza I/O non bloccante\n" -#: src/dd.c:592 +#: src/dd.c:597 msgid " noatime do not update access time\n" msgstr " noatime non aggiorna l'orario di accesso\n" -#: src/dd.c:595 +#: src/dd.c:600 msgid " nocache discard cached data\n" msgstr " nocache scarta i dati nella cache\n" -#: src/dd.c:598 +#: src/dd.c:603 msgid " noctty do not assign controlling terminal from file\n" msgstr " noctty non assegna il controllo del terminale da file\n" -#: src/dd.c:601 +#: src/dd.c:606 msgid " nofollow do not follow symlinks\n" msgstr " nofollow non segue i collegamenti simbolici\n" -#: src/dd.c:603 +#: src/dd.c:608 msgid " nolinks fail if multiply-linked\n" msgstr " nolinks fallisce per collegamenti multipli\n" -#: src/dd.c:605 +#: src/dd.c:610 msgid " binary use binary I/O for data\n" msgstr " binary utilizza I/O binario per i dati\n" -#: src/dd.c:607 +#: src/dd.c:612 msgid " text use text I/O for data\n" msgstr " text utilizza I/O testuale per i dati\n" -#: src/dd.c:609 +#: src/dd.c:614 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:612 +#: src/dd.c:617 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:615 +#: src/dd.c:620 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:620 +#: src/dd.c:625 #, fuzzy, c-format msgid "" "\n" @@ -3402,7 +3403,7 @@ msgstr "" "Le opzioni sono:\n" "\n" -#: src/dd.c:676 +#: src/dd.c:683 #, c-format msgid "" "%<PRIuMAX>+%<PRIuMAX> records in\n" @@ -3411,21 +3412,21 @@ msgstr "" "%<PRIuMAX>+%<PRIuMAX> record dentro\n" "%<PRIuMAX>+%<PRIuMAX> record fuori\n" -#: src/dd.c:682 +#: src/dd.c:689 #, 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:694 +#: src/dd.c:701 #, 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:712 +#: src/dd.c:720 msgid "Infinity B" msgstr "B illimitato" @@ -3439,83 +3440,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:725 +#: src/dd.c:733 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g s, %s/s\n" -#: src/dd.c:804 +#: src/dd.c:812 #, c-format msgid "closing input file %s" msgstr "chiusura del file di input %s" -#: src/dd.c:811 +#: src/dd.c:819 #, c-format msgid "closing output file %s" msgstr "chiusura del file di output %s" -#: src/dd.c:1014 +#: src/dd.c:1022 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "disattivazione di O_DIRECT non riuscita: %s" -#: src/dd.c:1085 src/dd.c:1934 +#: src/dd.c:1093 src/dd.c:1942 #, c-format msgid "writing to %s" msgstr "scrittura di %s" -#: src/dd.c:1199 src/dd.c:1253 +#: src/dd.c:1207 src/dd.c:1261 #, c-format msgid "unrecognized operand %s" msgstr "operando %s non riconosciuto" -#: src/dd.c:1210 +#: src/dd.c:1218 msgid "invalid conversion" msgstr "conversione non valida" -#: src/dd.c:1213 src/dd.c:1289 +#: src/dd.c:1221 src/dd.c:1297 msgid "invalid input flag" msgstr "flag di input non valido" -#: src/dd.c:1216 src/dd.c:1283 src/dd.c:1295 +#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303 msgid "invalid output flag" msgstr "flag di output non valido" -#: src/dd.c:1219 +#: src/dd.c:1227 msgid "invalid status flag" msgstr "flag di stato non valido" -#: src/dd.c:1258 src/truncate.c:312 +#: src/dd.c:1266 src/truncate.c:310 #, c-format msgid "invalid number %s" msgstr "numero %s non valido" -#: src/dd.c:1340 +#: src/dd.c:1348 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "non è possibile combinare qualunque coppia di {ascii,ebcdic,ibm}" -#: src/dd.c:1342 +#: src/dd.c:1350 #, c-format msgid "cannot combine block and unblock" msgstr "non è possibile combinare block e unblock" -#: src/dd.c:1344 +#: src/dd.c:1352 #, c-format msgid "cannot combine lcase and ucase" msgstr "non è possibile combinare lcase e ucase" -#: src/dd.c:1346 +#: src/dd.c:1354 #, c-format msgid "cannot combine excl and nocreat" msgstr "non è possibile combinare excl e nocreat" -#: src/dd.c:1349 +#: src/dd.c:1357 #, c-format msgid "cannot combine direct and nocache" msgstr "non è possibile combinare direct e nocache" -#: src/dd.c:1506 +#: src/dd.c:1514 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3524,72 +3525,72 @@ 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:1593 +#: src/dd.c:1601 #, c-format msgid "%s: cannot skip" msgstr "%s: impossibile saltare" -#: src/dd.c:1595 src/dd.c:1614 src/dd.c:1675 +#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683 #, c-format msgid "%s: cannot seek" msgstr "%s: impossibile fare il seek" -#: src/dd.c:1655 +#: src/dd.c:1663 #, c-format msgid "offset overflow while reading file %s" msgstr "offset eccessivo leggendo il file %s" -#: src/dd.c:1667 +#: src/dd.c:1675 #, 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:1671 +#: src/dd.c:1679 #, c-format msgid "cannot work around kernel bug after all" msgstr "non si può aggirare il bug del kernel, dopo tutto" -#: src/dd.c:1814 +#: src/dd.c:1822 #, c-format msgid "setting flags for %s" msgstr "impostazione dei flag %s" -#: src/dd.c:1867 +#: 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:1881 +#: 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:1914 +#: src/dd.c:1922 #, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: impossibile saltare all'offset specificato" -#: src/dd.c:2125 src/dd.c:2258 -#, c-format -msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" +#: src/dd.c:2133 +#, 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:2138 +#: src/dd.c:2146 #, c-format msgid "fdatasync failed for %s" msgstr "fdatasync non riuscita per %s" -#: src/dd.c:2148 +#: src/dd.c:2156 #, c-format msgid "fsync failed for %s" msgstr "fsync non riuscita per %s" -#: src/dd.c:2199 src/dd.c:2228 +#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165 #, c-format -msgid "opening %s" -msgstr "apertura di %s" +msgid "failed to open %s" +msgstr "apertura di %s non riuscita" -#: src/dd.c:2237 +#: src/dd.c:2246 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) " @@ -3598,85 +3599,107 @@ msgstr "" "offset troppo grande: impossibile interrompere a una lunghezza di seek=" "%<PRIuMAX> (%lu-byte) blocchi" -#: src/dd.c:2274 src/dd.c:2280 +#: src/dd.c:2267 +#, 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 #, 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:54 src/expr.c:153 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:39 src/sleep.c:35 src/sort.c:66 +#: 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 msgid "Paul Eggert" msgstr "Paul Eggert" -#: src/df.c:140 +#: src/df.c:172 msgid "Filesystem" msgstr "File system" -#: src/df.c:141 +#: src/df.c:175 msgid "Type" msgstr "Tipo" -#: src/df.c:142 +#: src/df.c:178 src/df.c:542 msgid "blocks" msgstr "blocchi" -#: src/df.c:142 -msgid "Inodes" -msgstr "Inode" - -#: src/df.c:142 -msgid "Size" -msgstr "Dim." - -#: src/df.c:143 +#: src/df.c:181 msgid "Used" msgstr "Usati" -#: src/df.c:143 -msgid "IUsed" -msgstr "IUsati" - -#: src/df.c:144 +#: src/df.c:184 msgid "Available" msgstr "Disponib." -#: src/df.c:144 -msgid "IFree" -msgstr "ILiberi" - -#: src/df.c:144 -msgid "Avail" -msgstr "Dispon." - -#: src/df.c:145 +#: src/df.c:187 msgid "Use%" msgstr "Uso%" -#: src/df.c:145 +#: src/df.c:190 +msgid "Inodes" +msgstr "Inode" + +#: src/df.c:193 +msgid "IUsed" +msgstr "IUsati" + +#: src/df.c:196 +msgid "IFree" +msgstr "ILiberi" + +#: src/df.c:199 msgid "IUse%" msgstr "IUso%" -#: src/df.c:145 +#: src/df.c:202 +msgid "Mounted on" +msgstr "Montato su" + +#: src/df.c:383 +#, c-format +msgid "option --output: field '%s' unknown" +msgstr "" + +#: src/df.c:390 +#, 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 +msgid "Size" +msgstr "Dim." + +#: src/df.c:414 src/df.c:451 +msgid "Avail" +msgstr "Dispon." + +#: src/df.c:474 msgid "Capacity" msgstr "Capacità" -#: src/df.c:146 -msgid "Mounted on" -msgstr "Montato su" +#. 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 +#, c-format +msgid "%s-%s" +msgstr "" -#: src/df.c:847 +#: src/df.c:1210 +#, fuzzy msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" -"\n" msgstr "" "Mostra informazioni sul file system su cui risiede ogni FILE,\n" "oppure in modo predefinito su tutti i file system.\n" "\n" # (ndt) ho tolto il punto finale in -B per uniformità -#: src/df.c:855 +#: src/df.c:1217 #, fuzzy msgid "" " -a, --all include dummy file systems\n" @@ -3700,7 +3723,7 @@ msgstr "" " -H, --si similmente, ma usa multipli di 1000 invece che di " "1024\n" -#: src/df.c:865 +#: src/df.c:1227 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3715,8 +3738,12 @@ msgstr "" " --no-sync non fa sync prima di recuperare le informazioni " "(predefinito)\n" -#: src/df.c:872 +#: src/df.c:1234 +#, fuzzy msgid "" +" --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" +" or print all fields if FIELD_LIST is " +"omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" " -t, --type=TYPE limit listing to file systems of type TYPE\n" @@ -3732,20 +3759,42 @@ msgstr "" " -x, --exclude-type=TIPO limita l'elenco ai file system non di tipo TIPO\n" " -v (ignorato)\n" -#: src/df.c:1027 +#: src/df.c:1248 +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" +msgstr "" + +#: src/df.c:1285 +#, 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 #, 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:1075 +#: src/df.c:1500 msgid "Warning: " msgstr "Attenzione: " -#: src/df.c:1077 src/stat.c:795 +#: src/df.c:1502 src/stat.c:814 msgid "cannot read table of mounted file systems" msgstr "impossibile leggere la tabella dei file system montati" -#: src/df.c:1107 +#: src/df.c:1539 #, c-format msgid "no file systems processed" msgstr "nessun file system elaborato" @@ -3864,7 +3913,7 @@ msgstr "" " %s /usr/bin/ stampa \"/usr\".\n" " %s stdio.h stampa \".\".\n" -#: src/du.c:260 src/sort.c:390 src/wc.c:112 +#: src/du.c:270 src/sort.c:394 src/wc.c:112 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3873,17 +3922,18 @@ msgstr "" "Uso: %s [OPZIONE]... [FILE]...\n" " o: %s [OPZIONE]... --files0-from=F\n" -#: src/du.c:264 -msgid "" -"Summarize disk usage of each FILE, recursively for directories.\n" -"\n" +#: src/du.c:274 +#, 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:271 +#: src/du.c:280 #, fuzzy msgid "" +" -0, --null end each output line with 0 byte rather than " +"newline\n" " -a, --all write counts for all files, not just directories\n" " --apparent-size print apparent sizes, rather than disk usage; " "although\n" @@ -3902,7 +3952,7 @@ msgstr "" " interna, blocchi indiretti e simili.\n" # (ndt) anche qui ho tolto il punto finale in -B per uniformità -#: src/du.c:279 +#: src/du.c:289 #, fuzzy msgid "" " -B, --block-size=SIZE scale sizes by SIZE before printing them. E.g.,\n" @@ -3912,6 +3962,11 @@ msgid "" " -c, --total produce a grand total\n" " -D, --dereference-args dereference only symlinks that are listed on the\n" " command line\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 "" " -B, --block-size=DIM scala le dimensioni di DIM prima di stamparle. Ad " "es.,\n" @@ -3924,7 +3979,8 @@ msgstr "" "sono elencati\n" " sulla riga di comando\n" -#: src/du.c:288 +#: src/du.c:302 +#, fuzzy msgid "" " --files0-from=F summarize disk usage of the NUL-terminated file\n" " names specified in file F;\n" @@ -3932,7 +3988,6 @@ msgid "" " -H equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" --si like -h, but use powers of 1000 not 1024\n" msgstr "" " --files0-from=F riassume l'uso del disco dei file specificati\n" " nel file F (terminati con NUL);\n" @@ -3942,9 +3997,11 @@ msgstr "" "234M 2G)\n" " --si come -h, ma usa potenze di 1000 non 1024\n" -#: src/du.c:297 +#: src/du.c:310 +#, fuzzy 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 "" @@ -3953,14 +4010,13 @@ msgstr "" "collegamenti fisici\n" " -m come --block-size=1M\n" -#: src/du.c:302 +#: src/du.c:316 +#, fuzzy msgid "" -" -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " "default)\n" -" -0, --null end each output line with 0 byte rather than " -"newline\n" " -S, --separate-dirs 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 dereferenzia tutti i collegamenti simbolici\n" @@ -3971,31 +4027,11 @@ msgstr "" " -S, --separate-dirs non include la dimensione delle sottodirectory\n" " -s, --summarize mostra solo il totale di ogni argomento\n" -#: src/du.c:309 -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 salta le directory su file system diversi\n" -" -X, --exclude-from=FILE esclude i file che corrispondono a uno qualsiasi " -"dei modelli in FILE\n" -" --exclude=MODELLO esclude i file che corrispondono a MODELLO\n" -" -d, --max-depth=N stampa il totale per una directory (o file, con --" -"all)\n" -" solo se è N o meno livelli sotto l'argomento della " -"riga\n" -" di comando; --max-depth=0 è lo stesso che --" -"summarize\n" - -#: src/du.c:318 +#: src/du.c:322 #, fuzzy msgid "" +" -t, --threshold=SIZE exclude entries smaller than SIZE if positive,\n" +" or entries greater than SIZE if negative\n" " --time show time of the last modification of any file in " "the\n" " directory, or any of its subdirectories\n" @@ -4015,65 +4051,74 @@ msgstr "" " full-iso, long-iso, iso, +FORMATO\n" " FORMATO è interpretato come «date»\n" -#: src/du.c:375 +#: src/du.c:333 +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 msgid "Infinity" msgstr "B illimitato" -#: src/du.c:600 +#: src/du.c:507 +#, c-format +msgid "mount point %s already traversed" +msgstr "" + +#: src/du.c:624 #, c-format msgid "fts_read failed: %s" msgstr "fts_read non riuscita: %s" -#: src/du.c:724 +#: src/du.c:780 #, c-format msgid "invalid maximum depth %s" msgstr "profondità massima %s non valida" -#: src/du.c:817 +#: src/du.c:809 +#, fuzzy, c-format +msgid "invalid --threshold argument '-0'" +msgstr "l'argomento %2$s di --%1$s non è valido" + +#: src/du.c:887 #, c-format msgid "cannot both summarize and show all entries" msgstr "impossibile riassumere e contemporaneamente mostrare tutte le voci" -#: src/du.c:824 +#: src/du.c:894 #, 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:830 +#: src/du.c:900 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "attenzione: riassumere è in conflitto con --max-depth=%lu" -#: src/du.c:896 src/sort.c:4479 src/wc.c:668 +#: src/du.c:966 src/sort.c:4533 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:949 src/md5sum.c:587 src/od.c:903 src/tac.c:239 src/tac.c:350 -#: src/tac.c:506 src/tac.c:586 src/wc.c:733 +#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 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:963 src/sort.c:4508 src/wc.c:747 +#: src/du.c:1040 src/sort.c:4562 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:980 src/du.c:988 src/wc.c:760 src/wc.c:768 +#: src/du.c:1057 src/du.c:1065 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:1007 src/head.c:149 src/head.c:262 src/head.c:334 src/head.c:538 -#: src/head.c:620 src/head.c:692 src/head.c:750 src/head.c:774 src/tail.c:412 -#: src/tail.c:500 src/tail.c:549 src/tail.c:642 src/tail.c:770 src/tail.c:818 -#: src/tail.c:855 src/tail.c:1782 src/tail.c:1812 src/uniq.c:395 -#, c-format -msgid "error reading %s" -msgstr "errore leggendo %s" - -#: src/du.c:1010 src/ls.c:2649 src/wc.c:791 +#: src/du.c:1088 src/ls.c:2649 src/wc.c:791 msgid "total" msgstr "totale" @@ -4179,9 +4224,12 @@ msgid "Usage: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n" msgstr "Uso: %s [OPZIONE]... [-] [NOME=VALORE]... [COMANDO [ARG]...]\n" #: src/env.c:55 +msgid "Set each NAME to VALUE in the environment and run COMMAND.\n" +msgstr "" + +#: src/env.c:61 +#, fuzzy msgid "" -"Set each NAME to VALUE in the environment and run COMMAND.\n" -"\n" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with 0 byte rather than newline\n" " -u, --unset=NAME remove variable from the environment\n" @@ -4193,7 +4241,7 @@ msgstr "" "un ritorno a capo\n" " -u, --unset=NOME rimuove la variabile dall'ambiente\n" -#: src/env.c:64 +#: src/env.c:68 msgid "" "\n" "A mere - implies -i. If no COMMAND, print the resulting environment.\n" @@ -4201,33 +4249,33 @@ msgstr "" "\n" "Un semplice - implica -i. Se manca COMANDO, stampa l'ambiente risultante.\n" -#: src/env.c:120 +#: src/env.c:124 #, c-format msgid "cannot unset %s" msgstr "impossibile azzerare %s" -#: src/env.c:131 +#: src/env.c:135 #, c-format msgid "cannot set %s" msgstr "impossibile impostare %s" -#: src/env.c:148 +#: src/env.c:152 #, c-format msgid "cannot specify --null (-0) with command" msgstr "impossibile specificare --null (-0) con un comando" #: 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" -"\n" msgstr "" "Converte i tabulatori in spazi in ogni FILE, scrivendo sullo standard " "output.\n" "Senza FILE, o quando FILE è -, legge lo standard input.\n" "\n" -#: src/expand.c:115 +#: src/expand.c:114 msgid "" " -i, --initial do not convert tabs after non blanks\n" " -t, --tabs=NUMBER have tabs NUMBER characters apart, not 8\n" @@ -4237,34 +4285,34 @@ msgstr "" " -t, --tabs=NUM imposta le tabulazioni a distanza di NUM caratteri, " "non 8\n" -#: src/expand.c:119 +#: src/expand.c:118 msgid "" " -t, --tabs=LIST use comma separated list of explicit tab positions\n" msgstr "" " -t, --tabs=ELENCO usa un ELENCO di posizioni esplicite di tabulatori " "separata da virgole\n" -#: src/expand.c:172 src/unexpand.c:191 +#: src/expand.c:171 src/unexpand.c:190 #, c-format msgid "tab stop is too large %s" msgstr "%s: posizione del tabulatore troppo grande" -#: src/expand.c:180 src/unexpand.c:199 +#: src/expand.c:179 src/unexpand.c:198 #, c-format msgid "tab size contains invalid character(s): %s" msgstr "la grandezza del tabulatore contiene caratteri non validi: %s" -#: src/expand.c:206 src/unexpand.c:225 +#: src/expand.c:205 src/unexpand.c:224 #, c-format msgid "tab size cannot be 0" msgstr "la grandezza del tabulatore non può essere 0" -#: src/expand.c:208 src/unexpand.c:227 +#: src/expand.c:207 src/unexpand.c:226 #, c-format msgid "tab sizes must be ascending" msgstr "le grandezze dei tabulatori devono essere crescenti" -#: src/expand.c:326 src/expand.c:345 src/unexpand.c:374 src/unexpand.c:419 +#: 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 "la riga di input è troppo lunga" @@ -4429,12 +4477,12 @@ msgstr "errore nel controllo dell'espressione regolare" msgid "non-integer argument" msgstr "argomento non intero" -#: src/expr.c:793 src/truncate.c:316 +#: src/expr.c:793 src/truncate.c:314 #, c-format msgid "division by zero" msgstr "divisione per zero" -#: src/expr.c:887 src/sort.c:2029 +#: src/expr.c:887 src/sort.c:2044 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "impostare LC_ALL='C' per aggirare il problema" @@ -4444,25 +4492,32 @@ msgstr "impostare LC_ALL='C' per aggirare il problema" msgid "the strings compared were %s and %s" msgstr "le stringhe confrontate erano %s e %s" -#: src/factor.c:449 -msgid "using arbitrary-precision arithmetic" -msgstr "è in uso l'aritmetica con precisione arbitraria" +#. This is a proper name. See the gettext manual, section Names. +#: src/factor.c:111 +msgid "Niels Moller" +msgstr "" -#: src/factor.c:460 -msgid "using single-precision arithmetic" -msgstr "è in uso l'aritmetica con precisione singola" +#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459 +#, c-format +msgid "Lucas prime test failure. This should not happen" +msgstr "" -#: src/factor.c:465 src/od.c:1640 src/od.c:1709 +#: src/factor.c:2092 #, c-format -msgid "%s is too large" -msgstr "%s è troppo grande" +msgid "squfof queue overflow" +msgstr "" -#: src/factor.c:469 +#: src/factor.c:2419 #, c-format msgid "%s is not a valid positive integer" msgstr "%s non è un intero positivo valido" -#: src/factor.c:494 +#: src/factor.c:2442 src/od.c:1646 src/od.c:1715 +#, c-format +msgid "%s is too large" +msgstr "%s è troppo grande" + +#: src/factor.c:2454 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4471,7 +4526,7 @@ msgstr "" "Uso: %s [NUMERO]...\n" " o: %s OPZIONE\n" -#: src/factor.c:499 +#: src/factor.c:2459 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" @@ -4498,20 +4553,20 @@ msgid "cannot stat current directory (now %s)" msgstr "impossibile determinare la directory corrente (ora %s)" #. This is a proper name. See the gettext manual, section Names. -#: src/fmt.c:37 +#: src/fmt.c:38 msgid "Ross Paterson" msgstr "Ross Paterson" -#: src/fmt.c:269 +#: src/fmt.c:270 #, c-format msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n" msgstr "Uso: %s [-LARGH] [OPZIONE]... [FILE]...\n" -#: src/fmt.c:270 +#: 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" -"\n" msgstr "" "Riformatta ogni paragrafo nei FILE, scrivendo sullo standard output.\n" "L'opzione -LARGH è una forma abbreviata di --width=NUMERI.\n" @@ -4531,8 +4586,8 @@ msgstr "" " -s, --split-only divide le righe lunghe, ma non le riempie " "nuovamente\n" -#: src/fmt.c:285 -#, fuzzy, c-format +#: src/fmt.c:287 +#, fuzzy, 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" @@ -4544,7 +4599,7 @@ msgstr "" " -w, --width=AMPIEZZA larghezza massima della riga (predefinita a 75 " "colonne)\n" -#: src/fmt.c:357 +#: src/fmt.c:359 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -4553,23 +4608,23 @@ msgstr "" "opzione non valida -- %c; -WIDTH è riconosciuto solo quando è la prima " "opzione; utilizzare -w N" -#: src/fmt.c:403 src/fmt.c:414 +#: src/fmt.c:405 src/fmt.c:416 #, c-format msgid "invalid width: %s" msgstr "larghezza non valida: %s" #: src/fold.c:70 +#, fuzzy msgid "" "Wrap input lines in each FILE (standard input by default), writing to\n" "standard output.\n" -"\n" msgstr "" "Manda a capo le righe lette in ogni FILE (lo standard input come " "predefinito),\n" "scrivendo sullo standard output.\n" "\n" -#: src/fold.c:78 +#: src/fold.c:77 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4579,13 +4634,13 @@ msgstr "" " -s, --spaces interrompe se si incontrano spazi\n" " -w, --width=LARG usa LARG colonne invece di 80\n" -#: src/fold.c:289 src/pr.c:836 +#: src/fold.c:288 src/pr.c:832 #, c-format 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:75 +#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 #: src/truncate.c:37 msgid "Padraig Brady" msgstr "Padraig Brady" @@ -4604,17 +4659,17 @@ msgstr "" "script di shell.\n" "\n" -#: src/group-list.c:69 src/id.c:345 src/setuidgid.c:184 +#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184 #, 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:350 +#: src/group-list.c:74 src/id.c:370 #, c-format msgid "failed to get groups for the current process" msgstr "recupero dei gruppi per il processo corrente non riuscito" -#: src/group-list.c:104 +#: src/group-list.c:114 #, c-format msgid "cannot find name for group ID %lu" msgstr "impossibile trovare il nome del gruppo con id %lu" @@ -4657,11 +4712,11 @@ msgid "%s: no such user" msgstr "%s: questo utente non esiste" #: 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" -"\n" msgstr "" "Stampa le prime 10 righe di ogni FILE sullo standard output.\n" "Con più di un FILE, le fa precedere da una intestazione riportante il nome " @@ -4669,7 +4724,7 @@ msgstr "" "Senza FILE, o quando FILE è -, legge lo standard input.\n" "\n" -#: src/head.c:118 +#: src/head.c:117 #, fuzzy msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" @@ -4686,7 +4741,7 @@ msgstr "" " con \"-\", le stampa tutte a parte le ultime\n" " K di ogni file\n" -#: src/head.c:126 +#: src/head.c:125 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4696,7 +4751,7 @@ msgstr "" " -v, --verbose stampa sempre le intestazioni che riportano i " "nomi dei file\n" -#: src/head.c:132 +#: src/head.c:131 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -4708,58 +4763,58 @@ 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:152 -#, c-format -msgid "error writing %s" -msgstr "errore scrivendo %s" - -#: src/head.c:155 +#: src/head.c:154 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: il file si è ridotto eccessivamente" -#: src/head.c:228 src/head.c:1044 +#: src/head.c:227 src/head.c:1051 #, c-format msgid "%s: number of bytes is too large" msgstr "%s: il numero di byte è troppo grande" -#: src/head.c:441 +#: 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:613 src/head.c:684 src/tail.c:450 +#: src/head.c:612 src/head.c:691 src/tail.c:449 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: impossibile posizionarsi all'offset %s" -#: src/head.c:791 +#: src/head.c:673 +#, fuzzy, c-format +msgid "%s: failed to reset file pointer" +msgstr "%s: rimozione non riuscita" + +#: src/head.c:798 #, c-format msgid "cannot reposition file pointer for %s" msgstr "impossibile reimpostare la posizione del file per %s" -#: src/head.c:878 +#: src/head.c:885 #, c-format msgid "%s: %s is so large that it is not representable" msgstr "%s: %s è così grande che è impossibile rappresentarlo" -#: src/head.c:879 +#: src/head.c:886 msgid "number of lines" msgstr "numero di righe" -#: src/head.c:879 +#: src/head.c:886 msgid "number of bytes" msgstr "numero di byte" -#: src/head.c:886 src/tail.c:1947 +#: src/head.c:893 src/tail.c:1947 msgid "invalid number of lines" msgstr "numero di righe non valido" -#: src/head.c:887 src/tail.c:1948 +#: src/head.c:894 src/tail.c:1948 msgid "invalid number of bytes" msgstr "numero di byte non valido" -#: src/head.c:974 src/head.c:1032 +#: src/head.c:981 src/head.c:1039 #, c-format msgid "invalid trailing option -- %c" msgstr "opzione finale non valida -- %c" @@ -4879,86 +4934,86 @@ msgstr "impossibile recuperare il contesto del processo" msgid "cannot get effective UID" msgstr "impossibile dereferenziare %s" -#: src/id.c:289 +#: src/id.c:311 #, fuzzy, c-format -msgid "cannot find name for user ID %lu" +msgid "cannot find name for user ID %s" msgstr "impossibile trovare il nome dell'utente con id %lu" -#: src/id.c:309 +#: src/id.c:329 #, fuzzy, c-format -msgid "uid=%lu" +msgid "uid=%s" msgstr "uid=%lu" -#: src/id.c:314 +#: src/id.c:334 #, fuzzy, c-format -msgid " gid=%lu" -msgstr " egid=%lu" +msgid " gid=%s" +msgstr " gid=%lu" -#: src/id.c:321 +#: src/id.c:341 #, fuzzy, c-format -msgid " euid=%lu" -msgstr " egid=%lu" +msgid " euid=%s" +msgstr " euid=%lu" -#: src/id.c:329 -#, c-format -msgid " egid=%lu" +#: src/id.c:349 +#, fuzzy, c-format +msgid " egid=%s" msgstr " egid=%lu" -#: src/id.c:357 +#: src/id.c:377 msgid " groups=" msgstr " gruppi=" -#: src/id.c:373 +#: src/id.c:393 #, c-format msgid " context=%s" msgstr " contesto=%s" -#: src/install.c:372 +#: src/install.c:373 #, c-format msgid "warning: %s: failed to change context to %s" msgstr "attenzione: %s: cambio del contesto in %s non riuscito" -#: src/install.c:413 +#: src/install.c:414 #, c-format msgid "creating directory %s" msgstr "creazione della directory %s" -#: src/install.c:481 +#: src/install.c:482 #, c-format msgid "cannot change ownership of %s" msgstr "impossibile cambiare il proprietario di %s" -#: src/install.c:505 +#: src/install.c:506 #, c-format msgid "cannot set time stamps for %s" msgstr "impossibile impostare l'orario di %s" -#: src/install.c:526 src/split.c:412 src/timeout.c:387 +#: src/install.c:527 src/split.c:426 src/timeout.c:439 #, c-format msgid "fork system call failed" msgstr "chiamata di sistema fork non riuscita" -#: src/install.c:530 +#: src/install.c:531 #, c-format msgid "cannot run %s" msgstr "impossibile eseguire %s" -#: src/install.c:534 +#: src/install.c:535 #, c-format msgid "waiting for strip" msgstr "in attesa dello strip" -#: src/install.c:536 +#: src/install.c:537 #, c-format msgid "strip process terminated abnormally" msgstr "processo di strip terminato in modo anomalo" -#: src/install.c:557 +#: src/install.c:558 #, c-format msgid "invalid user %s" msgstr "utente %s non valido" -#: src/install.c:593 +#: src/install.c:594 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -4971,7 +5026,8 @@ msgstr "" " o: %s [OPZIONE]... -t DIRECTORY ORIGINE...\n" " o: %s [OPZIONE]... -d DIRECTORY...\n" -#: src/install.c:600 +#: src/install.c:601 +#, fuzzy msgid "" "\n" "This install program copies files (often just compiled) into destination\n" @@ -4983,7 +5039,6 @@ msgid "" "In the first three forms, copy SOURCE to DEST or multiple SOURCE(s) to\n" "the existing DIRECTORY, while setting permission modes and owner/group.\n" "In the 4th form, create all components of the given DIRECTORY(ies).\n" -"\n" msgstr "" "\n" "Questo programma di installazione copia i file (spesso appena compilati)\n" @@ -5075,7 +5130,7 @@ msgstr "" " -Z, --context=CONTEXT imposta il contesto di sicurezza SELinux di file e " "directory\n" -#: src/install.c:858 +#: src/install.c:859 #, c-format msgid "" "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled" @@ -5083,54 +5138,54 @@ msgstr "" "ATTENZIONE: ignorato --preserve-context; questo non è un kernel con SELinux " "abilitato" -#: src/install.c:868 +#: 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:885 +#: src/install.c:886 #, 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:888 +#: src/install.c:889 #, 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:892 +#: 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:946 src/mkdir.c:202 src/stdbuf.c:327 +#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326 #, c-format msgid "invalid mode %s" msgstr "modo %s non valido" -#: src/install.c:953 +#: src/install.c:954 #, 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:958 +#: src/install.c:959 #, 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:965 +#: src/install.c:966 #, c-format msgid "options --compare (-C) and --strip are mutually exclusive" msgstr "le opzioni --compare (-C) e --strip sono mutualmente esclusive" -#: src/install.c:971 +#: src/install.c:972 #, c-format msgid "" "the --compare (-C) option is ignored when you specify a mode with non-" @@ -5140,7 +5195,7 @@ msgstr "" "permesso" #. This is a proper name. See the gettext manual, section Names. -#: src/join.c:40 src/sort.c:65 +#: src/join.c:40 src/sort.c:66 msgid "Mike Haertel" msgstr "Mike Haertel" @@ -5239,8 +5294,8 @@ msgstr "" "restituito un messaggio di avviso.\n" #: src/join.c:403 -#, c-format -msgid "%s:%ju: is not sorted: %.*s" +#, fuzzy, c-format +msgid "%s:%<PRIuMAX>: is not sorted: %.*s" msgstr "%s:%ju: non è ordinato: %.*s" #: src/join.c:840 src/join.c:1038 @@ -5268,12 +5323,12 @@ msgstr "campi di unione incompatibili %lu, %lu" msgid "conflicting empty-field replacement strings" msgstr "conflitto fra le stringhe di sostituzione per i campi vuoti" -#: src/join.c:1101 src/sort.c:4414 +#: src/join.c:1101 src/sort.c:4468 #, c-format msgid "multi-character tab %s" msgstr "tabulatore multicarattere %s" -#: src/join.c:1105 src/sort.c:4419 +#: src/join.c:1105 src/sort.c:4473 #, c-format msgid "incompatible tabs" msgstr "tabulatori incompatibili" @@ -5295,14 +5350,13 @@ msgstr "" " o: %s -t [SEGNALE]...\n" #: src/kill.c:82 -msgid "" -"Send signals to processes, or list signals.\n" -"\n" +#, fuzzy +msgid "Send signals to processes, or list signals.\n" msgstr "" "Manda segnali ai processi o elenca i segnali.\n" "\n" -#: src/kill.c:89 +#: src/kill.c:88 msgid "" " -s, --signal=SIGNAL, -SIGNAL\n" " specify the name or number of the signal to be sent\n" @@ -5315,7 +5369,7 @@ msgstr "" " -l, --list elenca i nomi dei segnali, o li converte da/in numeri\n" " -t, --table stampa una tabella di informazioni sui segnali\n" -#: src/kill.c:97 +#: src/kill.c:96 #, fuzzy msgid "" "\n" @@ -5330,32 +5384,32 @@ msgstr "" "segnale.\n" "PID è un intero; se è negativo indica un gruppo di processi.\n" -#: src/kill.c:206 +#: src/kill.c:205 #, c-format msgid "%s: invalid process id" msgstr "%s: id del processo non valido" -#: src/kill.c:260 +#: src/kill.c:259 #, c-format msgid "invalid option -- %c" msgstr "opzione non valida -- %c" -#: src/kill.c:269 +#: src/kill.c:268 #, c-format msgid "%s: multiple signals specified" msgstr "%s: sono stati specificati segnali multipli" -#: src/kill.c:283 +#: src/kill.c:282 #, c-format msgid "multiple -l or -t options specified" msgstr "sono state specificate opzioni -l o -t multiple" -#: src/kill.c:300 +#: src/kill.c:299 #, c-format msgid "cannot combine signal with -l or -t" msgstr "non è possibile combinare un segnale con -l o -t" -#: src/kill.c:306 +#: src/kill.c:305 #, c-format msgid "no process ID specified" msgstr "nessun id del processo specificato" @@ -5467,7 +5521,6 @@ msgid "" "When creating hard links, each TARGET must exist. Symbolic links\n" "can hold arbitrary text; if later resolved, a relative link is\n" "interpreted in relation to its parent directory.\n" -"\n" msgstr "" "Nella prima forma, crea un collegamento a DEST con il nome NOME_COLL.\n" "Nella seconda forma, crea un collegamento a DEST nella directory corrente.\n" @@ -5482,7 +5535,7 @@ msgstr "" "interpretato in relazione alla sua directory padre.\n" "\n" -#: src/ln.c:395 +#: src/ln.c:394 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -5504,7 +5557,7 @@ msgstr "" " può fallire anche all'amministratore)\n" " -f, --force rimuove i file di destinazione esistenti\n" -#: src/ln.c:403 +#: src/ln.c:402 #, fuzzy msgid "" " -i, --interactive prompt whether to remove destinations\n" @@ -5528,7 +5581,7 @@ msgstr "" " -s, --symbolic crea collegamenti simbolici invece di " "collegamenti fisici\n" -#: src/ln.c:412 +#: src/ln.c:411 #, fuzzy msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -5544,23 +5597,10 @@ 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:428 -#, 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 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" - -#: src/ln.c:435 +#: src/ln.c:433 #, fuzzy, 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 "" @@ -5641,7 +5681,7 @@ msgstr "" "ignorata la larghezza del tabulatore non valida nella variabile di ambiente " "TABSIZE: %s" -#: src/ls.c:1750 src/ptx.c:1976 +#: src/ls.c:1750 src/ptx.c:1975 #, c-format msgid "invalid line width: %s" msgstr "larghezza della riga non valida: %s" @@ -5705,23 +5745,23 @@ msgstr "lettura della directory %s" msgid "closing directory %s" msgstr "chiusura della directory %s" -#: src/ls.c:3301 +#: src/ls.c:3302 #, c-format msgid "cannot compare file names %s and %s" msgstr "impossibile confrontare i nomi dei file %s e %s" #: src/ls.c:4721 +#, 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" -"\n" msgstr "" "Elenca informazioni sui FILE (predefinito: la directory corrente).\n" "Ordina alfabeticamente le voci se non è usato uno di -cftuvSUX oppure --" "sort.\n" "\n" -#: src/ls.c:4729 +#: src/ls.c:4728 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -5736,7 +5776,7 @@ msgstr "" "grafici\n" # (ndt) anche qui ho tolto il punto finale alla -B per uniformità -#: src/ls.c:4735 +#: src/ls.c:4734 #, fuzzy msgid "" " --block-size=SIZE scale sizes by SIZE before printing them. E." @@ -5765,7 +5805,7 @@ msgstr "" " altrimenti: ordina secondo il ctime, prima il " "più recente\n" -#: src/ls.c:4745 +#: src/ls.c:4744 #, fuzzy msgid "" " -C list entries by columns\n" @@ -5787,7 +5827,7 @@ msgstr "" " e non segue i collegamenti simbolici\n" " -D, --dired genera un output adatto al modo dired di Emacs\n" -#: src/ls.c:4753 +#: src/ls.c:4752 #, fuzzy msgid "" " -f do not sort, enable -aU, disable -ls --color\n" @@ -5806,11 +5846,11 @@ msgstr "" " single-column -1, verbose -l, vertical -C\n" " --full-time come -l --time-style=full-iso\n" -#: src/ls.c:4761 +#: src/ls.c:4760 msgid " -g like -l, but do not list owner\n" msgstr " -g come -l, ma non elenca il proprietario\n" -#: src/ls.c:4764 +#: src/ls.c:4763 msgid "" " --group-directories-first\n" " group directories before files.\n" @@ -5823,7 +5863,7 @@ msgstr "" " di --sort=none (-U) disabilita il " "raggruppamento\n" -#: src/ls.c:4770 +#: src/ls.c:4769 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" @@ -5837,7 +5877,7 @@ msgstr "" " (es.: 1K 234M 2G)\n" " --si similmente, ma usa multipli di 1000, non 1024\n" -#: src/ls.c:4776 +#: src/ls.c:4775 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5860,7 +5900,7 @@ msgstr "" "della shell\n" " (annullato da -a o -A)\n" -#: src/ls.c:4786 +#: src/ls.c:4785 #, fuzzy msgid "" " --indicator-style=WORD append indicator with style WORD to entry " @@ -5881,7 +5921,7 @@ msgstr "" "della shell\n" " -k come --block-size=1K\n" -#: src/ls.c:4796 +#: src/ls.c:4795 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5898,7 +5938,7 @@ msgstr "" " riferisce invece che sul collegamento stesso\n" " -m elenca le voci separandole con virgole\n" -#: src/ls.c:4804 +#: src/ls.c:4803 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. " @@ -5916,7 +5956,7 @@ msgstr "" " -p, --indicator-style=slash\n" " appende / come indicatore alle directory\n" -#: src/ls.c:4812 +#: src/ls.c:4811 #, fuzzy msgid "" " -q, --hide-control-chars print ? instead of non graphic characters\n" @@ -5938,7 +5978,7 @@ msgstr "" " literal, locale, shell, shell-always, c, " "escape\n" -#: src/ls.c:4821 +#: src/ls.c:4820 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -5950,7 +5990,7 @@ msgstr "" " -s, --size stampa la dimensione allocata in blocchi di " "ogni file\n" -#: src/ls.c:4826 +#: src/ls.c:4825 msgid "" " -S sort by file size\n" " --sort=WORD sort by WORD instead of name: none -U,\n" @@ -5972,7 +6012,7 @@ msgstr "" "specificato come\n" " chiave di ordinamento\n" -#: src/ls.c:4836 +#: src/ls.c:4835 #, fuzzy msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" @@ -5996,7 +6036,7 @@ msgstr "" "effetto\n" " solo fuori dal locale POSIX\n" -#: src/ls.c:4845 +#: src/ls.c:4844 msgid "" " -t sort by modification time, newest first\n" " -T, --tabsize=COLS assume tab stops at each COLS instead of 8\n" @@ -6006,7 +6046,7 @@ msgstr "" " -T, --tabsize=COL assume che le tabulazioni siano ad ogni COL " "invece di 8\n" -#: src/ls.c:4849 +#: src/ls.c:4848 msgid "" " -u with -lt: sort by, and show, access time\n" " with -l: show access time and sort by name\n" @@ -6025,7 +6065,7 @@ msgstr "" " -v ordina naturalmente secondo i numeri (di " "versione) nel testo\n" -#: src/ls.c:4856 +#: src/ls.c:4855 msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" @@ -6043,7 +6083,7 @@ msgstr "" "file\n" " -1 elenca un file per riga\n" -#: src/ls.c:4866 +#: src/ls.c:4865 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -6061,7 +6101,7 @@ msgstr "" "può cambiare queste impostazioni. Usare il comando dircolors per " "impostarla.\n" -#: src/ls.c:4873 +#: src/ls.c:4872 msgid "" "\n" "Exit status:\n" @@ -6091,7 +6131,7 @@ msgstr "Scott Miller" msgid "David Madore" msgstr "David Madore" -#: src/md5sum.c:162 +#: src/md5sum.c:164 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -6104,7 +6144,7 @@ msgstr "" "Senza FILE, o quando FILE è -, legge lo standard input.\n" "\n" -#: src/md5sum.c:172 +#: src/md5sum.c:174 msgid "" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" @@ -6112,27 +6152,31 @@ msgstr "" " -b, --binary legge in modalità binaria (predefinito se non si " "legge dal tty stdin)\n" -#: src/md5sum.c:176 +#: src/md5sum.c:178 msgid " -b, --binary read in binary mode\n" msgstr " -b, --binary legge in modalità binaria\n" -#: src/md5sum.c:179 +#: src/md5sum.c:181 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr " -c, --check legge le somme %s dai FILE e le controlla\n" -#: src/md5sum.c:183 +#: src/md5sum.c:184 +msgid " --tag create a BSD-style checksum\n" +msgstr "" + +#: src/md5sum.c:188 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" " -t, --text legge in modalità testo (predefinito leggendo da tty " "stdin)\n" -#: src/md5sum.c:187 +#: src/md5sum.c:192 msgid " -t, --text read in text mode (default)\n" msgstr " -t, --text legge in modalità testo (predefinito)\n" -#: src/md5sum.c:190 +#: src/md5sum.c:195 msgid "" "\n" "The following three options are useful only when verifying checksums:\n" @@ -6151,14 +6195,14 @@ msgstr "" "codice di controllo\n" "\n" -#: src/md5sum.c:198 +#: 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:203 +#: src/md5sum.c:208 #, fuzzy, c-format msgid "" "\n" @@ -6175,52 +6219,52 @@ msgstr "" "per binario, spazio per\n" "testo) e il nome per ogni FILE.\n" -#: src/md5sum.c:502 +#: src/md5sum.c:523 #, c-format msgid "%s: too many checksum lines" msgstr "%s: troppe righe del codice di controllo" -#: src/md5sum.c:526 +#: src/md5sum.c:547 #, 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:551 +#: src/md5sum.c:572 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: apertura o lettura NON RIUSCITA\n" -#: src/md5sum.c:574 +#: src/md5sum.c:595 msgid "FAILED" msgstr "NON RIUSCITO" -#: src/md5sum.c:576 +#: src/md5sum.c:597 msgid "OK" msgstr "OK" -#: src/md5sum.c:600 +#: src/md5sum.c:621 #, 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:610 +#: src/md5sum.c:631 #, 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:618 +#: src/md5sum.c:639 #, 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:626 +#: src/md5sum.c:647 #, c-format msgid "WARNING: %<PRIuMAX> computed checksum did NOT match" msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match" @@ -6229,7 +6273,19 @@ msgstr[0] "" msgstr[1] "" "ATTENZIONE: %<PRIuMAX> codici di controllo calcolati NON corrispondono" -#: src/md5sum.c:704 +#: src/md5sum.c:760 +#, c-format +msgid "--tag does not support --text mode" +msgstr "" + +#: src/md5sum.c:766 +#, 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 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" @@ -6237,28 +6293,28 @@ msgstr "" "le opzioni --binary e --text non hanno significato quando si stanno " "verificando i codici di controllo" -#: src/md5sum.c:712 +#: src/md5sum.c:781 #, 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:719 +#: src/md5sum.c:788 #, 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:726 +#: src/md5sum.c:795 #, 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:733 +#: src/md5sum.c:802 #, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "" @@ -6271,14 +6327,13 @@ msgid "Usage: %s [OPTION]... DIRECTORY...\n" msgstr "Uso: %s [OPZIONE]... DIRECTORY...\n" #: src/mkdir.c:57 -msgid "" -"Create the DIRECTORY(ies), if they do not already exist.\n" -"\n" +#, 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:64 +#: src/mkdir.c:63 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" @@ -6294,7 +6349,7 @@ msgstr "" "directory\n" " creata a CTX\n" -#: src/mkdir.c:169 +#: src/mkdir.c:168 #, c-format msgid "created directory %s" msgstr "directory %s creata" @@ -6305,33 +6360,32 @@ msgid "Usage: %s [OPTION]... NAME...\n" msgstr "Uso: %s [OPZIONE]... NOME...\n" #: src/mkfifo.c:52 -msgid "" -"Create named pipes (FIFOs) with the given NAMEs.\n" -"\n" +#, 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:59 src/mknod.c:61 +#: src/mkfifo.c:58 src/mknod.c:60 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:62 +#: src/mkfifo.c:61 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" -#: src/mkfifo.c:122 src/mknod.c:128 +#: src/mkfifo.c:121 src/mknod.c:127 #, c-format msgid "invalid mode" msgstr "modo non valido" -#: src/mkfifo.c:127 src/mknod.c:133 +#: src/mkfifo.c:126 src/mknod.c:132 #, c-format msgid "mode must specify only file permission bits" msgstr "il modo deve specificare solo i bit di permesso del file" @@ -6342,20 +6396,19 @@ msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n" msgstr "Uso: %s [OPZIONE]... NOME TIPO [MAJOR MINOR]\n" #: src/mknod.c:54 -msgid "" -"Create the special file NAME of the given TYPE.\n" -"\n" +#, 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:64 +#: 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:69 +#: src/mknod.c:68 msgid "" "\n" "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n" @@ -6369,7 +6422,7 @@ msgstr "" "è interpretato come esadecimale; altrimenti, se inizia con 0, come ottale;\n" "altrimenti, come decimale. TIPO può essere:\n" -#: src/mknod.c:76 +#: src/mknod.c:75 msgid "" "\n" " b create a block (buffered) special file\n" @@ -6381,40 +6434,40 @@ msgstr "" " c, u crea un file speciale a caratteri (non bufferizzato)\n" " p crea un FIFO\n" -#: src/mknod.c:151 +#: src/mknod.c:150 msgid "Special files require major and minor device numbers." msgstr "I file speciali richiedono i numeri major e minor del dispositivo" -#: src/mknod.c:161 +#: src/mknod.c:160 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:177 +#: src/mknod.c:176 #, c-format msgid "block special files not supported" msgstr "i file speciali a blocchi non sono supportati" -#: src/mknod.c:186 +#: src/mknod.c:185 #, c-format msgid "character special files not supported" msgstr "i file speciali a caratteri non sono supportati" -#: src/mknod.c:202 +#: src/mknod.c:201 #, c-format msgid "invalid major device number %s" msgstr "major number del dispositivo %s non valido" -#: src/mknod.c:207 +#: src/mknod.c:206 #, c-format msgid "invalid minor device number %s" msgstr "minor number del dispositivo %s non valido" -#: src/mknod.c:212 +#: src/mknod.c:211 #, c-format msgid "invalid device %s %s" msgstr "dispositivo %s %s non valido" -#: src/mknod.c:226 +#: src/mknod.c:225 #, c-format msgid "invalid device type %s" msgstr "tipo del dispositivo %s non valido" @@ -6503,60 +6556,59 @@ msgstr "" " directory specificata con -p, altrimenti /tmp " "[deprecato]\n" -#: src/mktemp.c:222 +#: 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:228 +#: src/mktemp.c:229 #, c-format msgid "too many templates" msgstr "troppi modelli" -#: src/mktemp.c:248 +#: src/mktemp.c:249 #, c-format msgid "with --suffix, template %s must end in X" msgstr "con --suffix, il modello %s deve terminare con X" -#: src/mktemp.c:273 src/split.c:1117 +#: src/mktemp.c:274 src/split.c:1130 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "suffisso %s non valido, contiene separatori di directory" -#: src/mktemp.c:278 +#: src/mktemp.c:279 #, c-format msgid "too few X's in template %s" msgstr "poche X nel modello %s" -#: src/mktemp.c:291 +#: src/mktemp.c:292 #, c-format msgid "invalid template, %s, contains directory separator" msgstr "modello non valido, %s, contiene separatori di directory" -#: src/mktemp.c:305 +#: src/mktemp.c:306 #, 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:325 +#: src/mktemp.c:326 #, c-format msgid "failed to create directory via template %s" msgstr "creazione della directory con il modello %s non riuscita" -#: src/mktemp.c:335 +#: src/mktemp.c:336 #, c-format msgid "failed to create file via template %s" msgstr "creazione del file con il modello %s non riuscita" -#: src/mv.c:290 -msgid "" -"Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" -"\n" +#: src/mv.c:292 +#, 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:297 +#: src/mv.c:298 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -6577,7 +6629,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:306 +#: src/mv.c:307 msgid "" " --strip-trailing-slashes remove any trailing slashes from each " "SOURCE\n" @@ -6589,7 +6641,7 @@ msgstr "" " ORIGINE\n" " -S, --suffix=SUFFISSO cambia il normale suffisso dei backup\n" -#: src/mv.c:311 +#: src/mv.c:312 msgid "" " -t, --target-directory=DIRECTORY move all SOURCE arguments into " "DIRECTORY\n" @@ -6611,13 +6663,11 @@ msgid "Usage: %s [OPTION] [COMMAND [ARG]...]\n" msgstr "Uso: %s [OPZIONE] [[COMANDO [ARG]...]\n" #: src/nice.c:73 -#, c-format +#, fuzzy, c-format msgid "" "Run COMMAND with an adjusted niceness, which affects process scheduling.\n" -"With no COMMAND, print the current niceness. Nicenesses range from\n" -"%d (most favorable scheduling) to %d (least favorable).\n" -"\n" -" -n, --adjustment=N add integer N to the niceness (default 10)\n" +"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 "" "Esegue il COMANDO con una priorità di scheduling (nice) modificata.\n" "Se il COMANDO manca, stampa la priorità di scheduling corrente. " @@ -6626,22 +6676,26 @@ msgstr "" "\n" " -n, --adjustment=N aggiunge l'intero N alla priorità (predefinito 10)\n" -#: src/nice.c:168 +#: src/nice.c:82 +msgid " -n, --adjustment=N add integer N to the niceness (default 10)\n" +msgstr "" + +#: src/nice.c:172 #, c-format msgid "invalid adjustment %s" msgstr "variazione %s non valida" -#: src/nice.c:177 +#: src/nice.c:181 #, c-format msgid "a command must be given with an adjustment" msgstr "un comando deve essere specificato con una variazione" -#: src/nice.c:184 src/nice.c:195 +#: src/nice.c:188 src/nice.c:199 #, c-format msgid "cannot get niceness" msgstr "impossibile determinare la priorità di scheduling" -#: src/nice.c:201 +#: src/nice.c:205 #, c-format msgid "cannot set niceness" msgstr "impossibile impostare la priorità di scheduling" @@ -6651,17 +6705,17 @@ msgstr "impossibile impostare la priorità di scheduling" msgid "Scott Bartram" msgstr "Scott Bartram" -#: src/nl.c:186 +#: 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" -"\n" msgstr "" "Scrive ogni FILE sullo standard output aggiungendo i numeri di riga.\n" "Senza FILE, o quando FILE è -, legge lo standard input.\n" "\n" -#: src/nl.c:194 +#: src/nl.c:186 msgid "" " -b, --body-numbering=STYLE use STYLE for numbering body lines\n" " -d, --section-delimiter=CC use CC for separating logical pages\n" @@ -6672,7 +6726,7 @@ msgstr "" " -f, --footer-numbering=STILE usa STILE per numerare le righe dei piè di " "pagina\n" -#: src/nl.c:199 +#: src/nl.c:191 msgid "" " -h, --header-numbering=STYLE use STYLE for numbering header lines\n" " -i, --line-increment=NUMBER line number increment at each line\n" @@ -6694,7 +6748,7 @@ msgstr "" " -s, --number-separator=STRINGA aggiunge STRINGA dopo l'eventuale numero " "di riga\n" -#: src/nl.c:207 +#: src/nl.c:199 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" @@ -6704,7 +6758,7 @@ msgstr "" " -w, --number-width=NUMERO utilizza NUMERO colonne per i numeri di " "riga\n" -#: src/nl.c:213 +#: src/nl.c:205 msgid "" "\n" "By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC are\n" @@ -6717,7 +6771,7 @@ msgstr "" "due caratteri di delimitazione per separare le pagine logiche, un secondo\n" "carattere mancante implica :. Digitare \\\\ per \\. STILE è uno di:\n" -#: src/nl.c:219 +#: src/nl.c:211 msgid "" "\n" " a number all lines\n" @@ -6747,53 +6801,47 @@ msgstr "" " rz giustificato a destra, con zeri iniziali\n" "\n" -#: src/nl.c:286 +#: src/nl.c:278 #, c-format msgid "line number overflow" msgstr "numero di riga eccessivo" -#: src/nl.c:486 +#: src/nl.c:478 #, c-format msgid "invalid header numbering style: %s" msgstr "stile di numerazione dell'intestazione non valido: %s" -#: src/nl.c:494 +#: src/nl.c:486 #, c-format msgid "invalid body numbering style: %s" msgstr "stile di numerazione del corpo non valido: %s" -#: src/nl.c:502 +#: src/nl.c:494 #, c-format msgid "invalid footer numbering style: %s" msgstr "stile di numerazione del piè di pagina non valido: %s" -#: src/nl.c:511 +#: src/nl.c:503 #, c-format msgid "invalid starting line number: %s" msgstr "numero di riga iniziale non valido: %s" -#: src/nl.c:517 -#, c-format -msgid "WARNING: --page-increment is deprecated; use --line-increment instead" -msgstr "" -"ATTENZIONE: --page-increment è deprecato; usare invece --line-increment" - -#: src/nl.c:524 +#: src/nl.c:512 #, c-format msgid "invalid line number increment: %s" msgstr "incremento del numero di riga non valido: %s" -#: src/nl.c:536 +#: src/nl.c:524 #, c-format msgid "invalid number of blank lines: %s" msgstr "numero di righe vuote non valido: %s" -#: src/nl.c:550 +#: src/nl.c:538 #, c-format msgid "invalid line number field width: %s" msgstr "larghezza del campo numero riga non valida: %s" -#: src/nl.c:569 +#: src/nl.c:557 #, c-format msgid "invalid line numbering format: %s" msgstr "formato del numero di righe non valido: %s" @@ -6843,11 +6891,6 @@ msgstr "rendere inutilizzabile lo standard input non riuscito" msgid "ignoring input" msgstr "input ignorato" -#: src/nohup.c:163 src/nohup.c:165 -#, c-format -msgid "failed to open %s" -msgstr "apertura di %s non riuscita" - #: src/nohup.c:175 #, c-format msgid "ignoring input and appending output to %s" @@ -6880,16 +6923,16 @@ msgid "failed to redirect standard error" msgstr "reindirizzamento dello standard error non riuscito" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:32 +#: src/nproc.c:33 msgid "Giuseppe Scrivano" msgstr "Giuseppe Scrivano" -#: src/nproc.c:56 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 +#: src/nproc.c:57 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Uso: %s [OPZIONE]...\n" -#: src/nproc.c:57 +#: src/nproc.c:58 msgid "" "Print the number of processing units available to the current process,\n" "which may be less than the number of online processors\n" @@ -6900,7 +6943,7 @@ msgstr "" "che può essere inferiore al numero dei processori disponibili\n" "\n" -#: src/nproc.c:62 +#: src/nproc.c:63 msgid "" " --all print the number of installed processors\n" " --ignore=N if possible, exclude N processing units\n" @@ -6908,11 +6951,353 @@ msgstr "" " --all stampa il numero dei processori installati\n" " --ignore=N se possibile, esclude N unità di elaborazione\n" -#: src/nproc.c:106 +#: src/nproc.c:107 #, c-format 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 +msgid "Assaf Gordon" +msgstr "" + +#: src/numfmt.c:676 +#, fuzzy, c-format +msgid "value too large to be converted: '%s'" +msgstr "%s: valore non completamente convertito" + +#: src/numfmt.c:680 +#, fuzzy, c-format +msgid "invalid number: '%s'" +msgstr "numero %s non valido" + +#: src/numfmt.c:684 +#, c-format +msgid "rejecting suffix in input: '%s' (consider using --from)" +msgstr "" + +# (ndt) - es: df -B 2a - Giorgio +#: src/numfmt.c:688 +#, fuzzy, c-format +msgid "invalid suffix in input: '%s'" +msgstr "il suffisso nell'argomento «%3$s» di %1$s%2$s non è valido" + +#: src/numfmt.c:692 +#, c-format +msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)" +msgstr "" + +#: src/numfmt.c:723 +#, fuzzy, c-format +msgid "failed to prepare value '%Lf' for printing" +msgstr "%s: apertura per la scrittura non riuscita" + +#: src/numfmt.c:787 +#, fuzzy, c-format +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 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [NUMBER]...\n" +msgstr "Uso: %s [OPZIONE]... [UTENTE]...\n" + +#: src/numfmt.c:816 +msgid "" +"Reformat NUMBER(s), or the numbers from standard input if none are " +"specified.\n" +msgstr "" + +#: src/numfmt.c:820 +#, 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 +msgid "" +" -d, --delimiter=X use X instead of whitespace for field delimiter\n" +msgstr "" + +#: src/numfmt.c:826 +msgid "" +" --field=N replace the number in input field N (default is 1)\n" +msgstr "" + +#: src/numfmt.c:829 +msgid "" +" --format=FORMAT use printf style floating-point FORMAT;\n" +" see FORMAT below for details\n" +msgstr "" + +#: src/numfmt.c:833 +msgid "" +" --from=UNIT auto-scale input numbers to UNITs; default is " +"'none';\n" +" see UNIT below\n" +msgstr "" + +#: src/numfmt.c:837 +msgid "" +" --from-unit=N specify the input unit size (instead of the default " +"1)\n" +msgstr "" + +#: src/numfmt.c:840 +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 "" + +#: src/numfmt.c:844 +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 +msgid "" +" --invalid=MODE failure mode for invalid numbers: MODE can be:\n" +" abort (default), fail, warn, ignore\n" +msgstr "" + +#: src/numfmt.c:852 +msgid "" +" --padding=N pad the output to N characters; positive N will\n" +" right-align; negative N will left-align;\n" +" padding is ignored if the output is wider than N;\n" +" the default is to automatically pad if a " +"whitespace\n" +" is found\n" +msgstr "" + +#: src/numfmt.c:859 +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 +msgid "" +" --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" +" SUFFIX in input numbers\n" +msgstr "" + +#: src/numfmt.c:867 +msgid "" +" --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" +msgstr "" + +#: src/numfmt.c:870 +msgid "" +" --to-unit=N the output unit size (instead of the default 1)\n" +msgstr "" + +#: src/numfmt.c:877 +#, fuzzy +msgid "" +"\n" +"UNIT options:\n" +msgstr "" +"Altre opzioni:\n" +"\n" + +#: src/numfmt.c:880 +msgid " none no auto-scaling is done; suffixes will trigger an error\n" +msgstr "" + +#: src/numfmt.c:883 +msgid "" +" auto accept optional single/two letter suffix:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" +msgstr "" + +#: src/numfmt.c:889 +msgid "" +" si accept optional single letter suffix:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:894 +msgid "" +" iec accept optional single letter suffix:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:899 +msgid "" +" iec-i accept optional two-letter suffix:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:905 +#, 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" +msgstr "" + +#: src/numfmt.c:912 +#, c-format +msgid "" +"\n" +"Exit status is 0 if all input numbers were successfully converted.\n" +"By default, %s will stop at the first conversion error with exit status 2.\n" +"With --invalid='fail' a warning is printed for each conversion error\n" +"and the exit status is 2. With --invalid='warn' each conversion error is\n" +"diagnosed, but the exit status is 0. With --invalid='ignore' conversion\n" +"errors are not diagnosed and the exit status is 0.\n" +msgstr "" + +#: src/numfmt.c:921 +#, c-format +msgid "" +"\n" +"Examples:\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" +msgstr "" + +#: src/numfmt.c:974 src/seq.c:212 +#, c-format +msgid "format %s has no %% directive" +msgstr "il formato %s non ha una direttiva %%" + +#: src/numfmt.c:990 +#, fuzzy, c-format +msgid "invalid format %s (width overflow)" +msgstr "formato di data %s non valido" + +#: src/numfmt.c:1007 src/seq.c:229 +#, c-format +msgid "format %s ends in %%" +msgstr "il formato %s termina in %%" + +#: src/numfmt.c:1010 +#, c-format +msgid "invalid format %s, directive must be %%['][-][N]f" +msgstr "" + +#: src/numfmt.c:1018 src/seq.c:236 +#, 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 +#, fuzzy, c-format +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 +#, c-format +msgid "value too large to be printed: '%Lg' (consider using --to)" +msgstr "" + +#: src/numfmt.c:1100 +#, c-format +msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" +msgstr "" + +#: src/numfmt.c:1184 +#, c-format +msgid "large input value '%s': possible precision loss" +msgstr "" + +#: src/numfmt.c:1293 +#, 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 "intervallo di pagine non valido %s" + +#: src/numfmt.c:1401 +#, fuzzy, c-format +msgid "invalid field value '%s'" +msgstr "numero di campo non valido: %s" + +#: src/numfmt.c:1430 +#, fuzzy, c-format +msgid "invalid header value '%s'" +msgstr "data %s non valida" + +#: src/numfmt.c:1456 +#, 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 +#, fuzzy, c-format +msgid "no conversion option specified" +msgstr "specificate opzioni -i multiple" + +#: src/numfmt.c:1471 +#, 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 +#, c-format +msgid "grouping has no effect in this locale" +msgstr "" + +#: src/numfmt.c:1486 +#, c-format +msgid "--header ignored with command-line input" +msgstr "" + +#: src/numfmt.c:1511 +#, fuzzy, c-format +msgid "error reading input" +msgstr "errore leggendo %s" + +#: src/numfmt.c:1520 +#, fuzzy, c-format +msgid "failed to convert some of the input numbers" +msgstr "rendere inutilizzabile lo standard input non riuscito" + #: src/od.c:294 #, c-format msgid "" @@ -6944,29 +7329,47 @@ msgstr "" "\n" #: src/od.c:307 -msgid "All arguments to long options are mandatory for short options.\n" +#, fuzzy +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" +"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" +"at first byte printed, incremented when dump is progressing.\n" +"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 "" -"Tutti gli argomenti per le opzioni lunghe sono obbligatori per quelle " -"corte.\n" +"\n" +"Se sono applicabili sia il primo che il secondo formato di chiamata, si " +"assume il secondo\n" +"se l'ultimo operando inizia con un + o (se ci sono due operandi) con una " +"cifra.\n" +"Un operando OFFSET significa -j OFFSET. ETICH è lo pseudo-indirizzo\n" +"al primo byte stampato, incrementato quando il dump è in corso.\n" +"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:310 +#: src/od.c:318 +#, fuzzy msgid "" -" -A, --address-radix=RADIX decide how file offsets are printed\n" +" -A, --address-radix=RADIX output format for file offsets. RADIX is one\n" +" of [doxn], for Decimal, Octal, Hex or None\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:314 +#: src/od.c:323 #, 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" -" --traditional accept arguments in traditional form\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 limita il dump alla lettura di BYTE byte\n" " -S, --strings[=BYTE] stampa stringhe di almeno BYTE caratteri " @@ -6978,9 +7381,11 @@ msgstr "" " --traditional accetta gli argomenti nella forma " "tradizionale\n" -#: src/od.c:324 +#: src/od.c:336 +#, fuzzy 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" @@ -6996,7 +7401,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:332 +#: src/od.c:345 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -7012,31 +7417,12 @@ 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:340 +#: src/od.c:353 +#, fuzzy msgid "" "\n" -"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" -"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" -"at first byte printed, incremented when dump is progressing.\n" -"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" -"Se sono applicabili sia il primo che il secondo formato di chiamata, si " -"assume il secondo\n" -"se l'ultimo operando inizia con un + o (se ci sono due operandi) con una " -"cifra.\n" -"Un operando OFFSET significa -j OFFSET. ETICH è lo pseudo-indirizzo\n" -"al primo byte stampato, incrementato quando il dump è in corso.\n" -"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:349 -msgid "" "\n" "TYPE is made up of one or more of these specifications:\n" -"\n" " a named character, ignoring high-order bit\n" " c ASCII character or backslash escape\n" msgstr "" @@ -7046,7 +7432,7 @@ msgstr "" " a carattere con nome, ignorando il bit più alto\n" " c carattere ASCII o protetto da backslash\n" -#: src/od.c:356 +#: src/od.c:360 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -7060,10 +7446,11 @@ msgstr "" " u[DIM] decimale senza segno, DIM byte per intero\n" " x[DIM] esadecimale, DIM byte per intero\n" -#: src/od.c:363 +#: src/od.c:367 +#, fuzzy msgid "" "\n" -"SIZE is a number. For TYPE in doux, SIZE may also be C for\n" +"SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" "sizeof(char), S for sizeof(short), I for sizeof(int) or L for\n" "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" @@ -7074,44 +7461,38 @@ 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:370 +#: src/od.c:374 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" +"Adding a z suffix to any type displays printable characters at the end of\n" +"each output line.\n" msgstr "" -"\n" -"RADICE è d per decimale, o per ottale, x per esadecimale o n per nessuna.\n" -"BYTE è esadecimale con il prefisso 0x or 0X, e può avere un suffisso " -"moltiplicatore:\n" -"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" -"Aggiungendo un suffisso z a ogni tipo mostra i caratteri stampabili alla " -"fine di ciascuna\n" -"riga di output.\n" -#: src/od.c:380 +#: src/od.c:379 +#, 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" +"\n" +"\n" +"BYTES is hex with 0x or 0X prefix, and may have a multiplier suffix:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"and so on for G, T, P, E, Z, Y.\n" msgstr "" -"L'opzione --string senza un numero implica 3; l'opzione --width senza un " -"numero\n" -"implica 32. In modo predefinito, od usa -A o -t d2 -w16.\n" +"\n" +"K può avere un suffisso moltiplicatore:\n" +"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:633 src/od.c:753 +#: src/od.c:639 src/od.c:759 #, c-format msgid "invalid type string %s" msgstr "stringa di tipo non valida: %s" # (ndt) error generated by «od -t3 filename» -#: src/od.c:643 +#: src/od.c:649 #, c-format msgid "" "invalid type string %s;\n" @@ -7120,7 +7501,7 @@ msgstr "" "stringa di tipo non valida %s;\n" "questo sistema non fornisce un tipo intero a %lu byte" -#: src/od.c:764 +#: src/od.c:770 #, c-format msgid "" "invalid type string %s;\n" @@ -7129,38 +7510,38 @@ msgstr "" "stringa di tipo non valida %s;\n" "questo sistema non fornisce un tipo a virgola mobile a %lu byte" -#: src/od.c:822 +#: src/od.c:828 #, fuzzy, c-format msgid "invalid character '%c' in type string %s" msgstr "carattere \"%c\" non valido nella stringa di tipo %s" -#: src/od.c:1047 +#: src/od.c:1053 #, c-format msgid "cannot skip past end of combined input" msgstr "impossibile saltare oltre la fine di un input combinato" -#: src/od.c:1603 +#: src/od.c:1609 #, 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:1729 +#: src/od.c:1735 #, 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:1804 +#: src/od.c:1810 msgid "compatibility mode supports at most one file" msgstr "la modalità compatibile supporta al massimo un file" -#: src/od.c:1825 +#: src/od.c:1831 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "il numero di byte saltati + byte letti è troppo grande" -#: src/od.c:1868 +#: src/od.c:1874 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "attenzione: larghezza %lu non valida; usare invece %d" @@ -7176,18 +7557,18 @@ msgid "standard input is closed" msgstr "lo standard input è chiuso" #: 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" -"\n" msgstr "" "Scrive le righe che corrispondono sequenzialmente a ciascun FILE,\n" "separate da TAB, sullo standard output.\n" "Senza FILE, o quando FILE è -, legge dallo standard input.\n" "\n" -#: src/paste.c:448 +#: 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" @@ -7197,7 +7578,7 @@ msgstr "" " -s, --serial incolla un file alla volta invece che in " "parallelo\n" -#: src/paste.c:509 +#: src/paste.c:508 #, c-format msgid "delimiter list ends with an unescaped backslash: %s" msgstr "l'elenco dei delimitatori termina con un backslash non protetto: %s" @@ -7260,80 +7641,80 @@ msgid "Kaveh Ghazi" msgstr "Kaveh Ghazi" #. TRANSLATORS: Real name is unknown; at most 19 characters. -#: src/pinky.c:250 +#: src/pinky.c:242 msgid " ???" msgstr " ???" #. TRANSLATORS: Idle time is unknown; at most 5 characters. -#: src/pinky.c:274 +#: src/pinky.c:266 msgid "?????" msgstr "?????" -#: src/pinky.c:323 +#: src/pinky.c:314 #, c-format msgid "Login name: " msgstr "Nome di accesso: " -#: src/pinky.c:326 +#: src/pinky.c:317 #, c-format msgid "In real life: " msgstr "Nella vita reale: " #. TRANSLATORS: Real name is unknown; no hard limit. -#: src/pinky.c:330 +#: src/pinky.c:321 msgid "???\n" msgstr "???\n" -#: src/pinky.c:350 +#: src/pinky.c:341 #, c-format msgid "Directory: " msgstr "Directory: " -#: src/pinky.c:352 +#: src/pinky.c:343 #, c-format msgid "Shell: " msgstr "Shell: " -#: src/pinky.c:371 +#: src/pinky.c:362 #, c-format msgid "Project: " msgstr "Progetto: " -#: src/pinky.c:395 +#: src/pinky.c:386 #, c-format msgid "Plan:\n" msgstr "Piano:\n" -#: src/pinky.c:414 +#: src/pinky.c:405 msgid "Login" msgstr "Accesso" -#: src/pinky.c:416 +#: src/pinky.c:407 msgid "Name" msgstr "Nome" -#: src/pinky.c:417 +#: src/pinky.c:408 msgid " TTY" msgstr " TTY" -#: src/pinky.c:419 +#: src/pinky.c:410 msgid "Idle" msgstr "Inatt." -#: src/pinky.c:420 +#: src/pinky.c:411 msgid "When" msgstr "Quando" -#: src/pinky.c:423 +#: src/pinky.c:414 msgid "Where" msgstr "Dove" -#: src/pinky.c:502 +#: src/pinky.c:493 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Uso: %s [OPZIONE]... [UTENTE]...\n" -#: src/pinky.c:503 +#: src/pinky.c:494 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7349,7 +7730,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:511 +#: src/pinky.c:502 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7363,7 +7744,7 @@ msgstr "" " -q omette il nome completo, l'host remoto e il tempo di\n" " inattività nel formato breve\n" -#: src/pinky.c:520 +#: src/pinky.c:511 #, fuzzy, c-format msgid "" "\n" @@ -7374,7 +7755,7 @@ msgstr "" "Una versione leggera di «finger»; stampa informazioni sugli utenti.\n" "Il file utmp sarà %s.\n" -#: src/pinky.c:604 +#: src/pinky.c:595 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "" @@ -7391,88 +7772,87 @@ msgstr "Pete TerMaat" msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:912 +#: src/pr.c:908 #, fuzzy, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "«--pages=PRIMA_PAG[:ULTIMA_PAG]» argomento mancante" -#: src/pr.c:914 +#: src/pr.c:910 #, c-format msgid "invalid page range %s" msgstr "intervallo di pagine non valido %s" -#: src/pr.c:979 +#: src/pr.c:975 #, fuzzy, c-format msgid "'-l PAGE_LENGTH' invalid number of lines: %s" msgstr "«-l LUNGH_PAG» numero di righe non valido: %s" -#: src/pr.c:1003 +#: src/pr.c:999 #, fuzzy, c-format msgid "'-N NUMBER' invalid starting line number: %s" msgstr "«-N NUMERO» numero della riga iniziale non valido: %s" -#: src/pr.c:1015 +#: src/pr.c:1011 #, fuzzy, c-format msgid "'-o MARGIN' invalid line offset: %s" msgstr "«-o MARGINE» offset di riga non valido: %s" -#: src/pr.c:1056 +#: src/pr.c:1052 #, fuzzy, c-format msgid "'-w PAGE_WIDTH' invalid number of characters: %s" msgstr "«-w LARGH_PAGINA» numero di caratteri non valido: %s" -#: src/pr.c:1070 +#: src/pr.c:1066 #, fuzzy, c-format msgid "'-W PAGE_WIDTH' invalid number of characters: %s" msgstr "«-W LARGH_PAGINA» numero di caratteri non valido: %s" -#: src/pr.c:1100 +#: src/pr.c:1096 #, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "" "impossibile specificare il numero di colonne quando si stampa in parallelo" -#: src/pr.c:1104 +#: src/pr.c:1100 #, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "impossibile specificare sia la stampa verticale che in parallelo" -#: src/pr.c:1200 +#: src/pr.c:1196 #, fuzzy, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "«-%c» caratteri in più o numero non valido nell'argomento: %s" -#: src/pr.c:1304 +#: src/pr.c:1293 #, c-format msgid "page width too narrow" msgstr "larghezza della pagina troppo stretta" -#: src/pr.c:2369 +#: src/pr.c:2353 #, c-format msgid "starting page number %<PRIuMAX> exceeds page count %<PRIuMAX>" msgstr "" "il numero della pagina iniziale %<PRIuMAX> supera il numero di pagine " "%<PRIuMAX>" -#: src/pr.c:2396 +#: src/pr.c:2380 #, c-format msgid "page number overflow" msgstr "overflow del numero di pagina" -#: src/pr.c:2401 +#: src/pr.c:2385 #, c-format msgid "Page %<PRIuMAX>" msgstr "Pagina %<PRIuMAX>" -#: src/pr.c:2773 -msgid "" -"Paginate or columnate FILE(s) for printing.\n" -"\n" +#: src/pr.c:2757 +#, fuzzy +msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" "Impagina o incolonna i FILE per la stampa.\n" "\n" -#: src/pr.c:2780 +#: src/pr.c:2763 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -7489,7 +7869,7 @@ msgstr "" " specificata l'opzione -a. Bilancia il numero\n" " di righe nelle colonne di ciascuna pagina\n" -#: src/pr.c:2788 +#: src/pr.c:2771 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7506,7 +7886,7 @@ msgstr "" " -d, --double-space\n" " raddoppia l'interlinea nell'output\n" -#: src/pr.c:2796 +#: src/pr.c:2779 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7530,7 +7910,7 @@ msgstr "" "5 righe\n" " e trailer senza -F)\n" -#: src/pr.c:2806 +#: src/pr.c:2789 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -7554,7 +7934,7 @@ msgstr "" " non allinea le colonne, --sep-string[=STRINGA] imposta i " "separatori\n" -#: src/pr.c:2815 +#: src/pr.c:2798 msgid "" " -l, --length=PAGE_LENGTH\n" " set the page length to PAGE_LENGTH (66) lines\n" @@ -7571,7 +7951,7 @@ msgstr "" " tronca le righe, ma unisce le righe di lunghezza piena " "con -J\n" -#: src/pr.c:2822 +#: src/pr.c:2805 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -7589,7 +7969,7 @@ msgstr "" "prima\n" " pagina stampata (consultare +FIRST_PAGE)\n" -#: src/pr.c:2830 +#: src/pr.c:2813 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -7603,7 +7983,7 @@ msgstr "" " -r, --no-file-warnings\n" " omette l'avviso quando un file non può essere aperto\n" -#: src/pr.c:2837 +#: src/pr.c:2820 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -7622,7 +8002,7 @@ msgstr "" "impostato -w\n" # (ndt) messa la minuscola dopo i : per uniformità -#: src/pr.c:2844 +#: src/pr.c:2827 #, fuzzy msgid "" " -S[STRING], --sep-string[=STRING]\n" @@ -7640,7 +8020,7 @@ msgstr "" "opzioni delle colonne\n" " -t, --omit-header omette intestazioni e piè di pagina\n" -#: src/pr.c:2851 +#: src/pr.c:2834 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -7666,7 +8046,7 @@ msgstr "" " output multipli testo-colonna, -s[char] la disattiva " "(72)\n" -#: src/pr.c:2861 +#: src/pr.c:2844 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -7681,7 +8061,7 @@ msgstr "" "l'opzione -J,\n" " non interferisce con -S o -s\n" -#: src/pr.c:2869 +#: src/pr.c:2852 msgid "" "\n" "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" @@ -7845,16 +8225,16 @@ msgstr "" " o: %s -G [OPZIONE]... [INPUT [OUTPUT]]\n" #: src/ptx.c:1821 +#, fuzzy msgid "" "Output a permuted index, including context, of the words in the input " "files.\n" -"\n" msgstr "" "Restituisce un indice permutato, incluso il contesto, delle parole nei file " "di input.\n" "\n" -#: src/ptx.c:1828 +#: src/ptx.c:1827 #, fuzzy msgid "" " -A, --auto-reference output automatically generated references\n" @@ -7867,7 +8247,7 @@ msgstr "" " -F, --flag-truncation=STRINGA usa STRINGA per indicare il troncamento di " "riga\n" -#: src/ptx.c:1833 +#: src/ptx.c:1832 #, fuzzy msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" @@ -7883,7 +8263,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:1840 +#: src/ptx.c:1839 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -7904,7 +8284,7 @@ msgstr "" " -o, --only-file=FILE legge l'elenco delle parole da considerare " "da questo FILE\n" -#: src/ptx.c:1848 +#: src/ptx.c:1847 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -7917,7 +8297,7 @@ msgstr "" " -w, --width=NUMERO stampa la larghezza in colonne, esclusi i " "riferimenti\n" -#: src/ptx.c:1855 +#: src/ptx.c:1854 #, fuzzy msgid "" "\n" @@ -7927,7 +8307,7 @@ msgstr "" "Se FILE non è specificato o se FILE è -, legge lo standard input. «-F /» è " "il predefinito.\n" -#: src/ptx.c:1949 +#: src/ptx.c:1948 #, c-format msgid "invalid gap width: %s" msgstr "larghezza dello spazio non valida: %s" @@ -7954,7 +8334,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "cambio della directory in %s non riuscito" -#: src/pwd.c:170 src/pwd.c:277 +#: src/pwd.c:170 src/pwd.c:277 src/split.c:373 #, c-format msgid "failed to stat %s" msgstr "stat di %s non riuscito" @@ -7970,14 +8350,15 @@ msgid "ignoring non-option arguments" msgstr "gli argomenti che non sono opzioni sono stati ignorati" #. This is a proper name. See the gettext manual, section Names. -#: src/readlink.c:33 +#: src/readlink.c:32 msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 +#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147 +#: src/stat.c:1349 src/touch.c:212 #, c-format -msgid "Usage: %s [OPTION]... FILE\n" -msgstr "Uso: %s [OPZIONE]... FILE\n" +msgid "Usage: %s [OPTION]... FILE...\n" +msgstr "Uso: %s [OPZIONE]... FILE...\n" #: src/readlink.c:63 msgid "" @@ -8011,16 +8392,19 @@ msgstr "" " tutti i componenti devono esistere\n" #: src/readlink.c:75 +#, fuzzy msgid "" " -m, --canonicalize-missing canonicalize by following every symlink in\n" " every component of the given name " "recursively,\n" " without requirements on components " "existence\n" -" -n, --no-newline do not output the trailing newline\n" +" -n, --no-newline do not output the trailing delimiter\n" " -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" msgstr "" " -m, --canonicalize-missing mette in forma canonica seguendo ogni " "collegamento simbolico\n" @@ -8034,11 +8418,10 @@ msgstr "" "errore\n" " -v, --verbose riporta i messaggi di errore\n" -#: src/realpath.c:71 src/rm.c:134 src/shred.c:147 src/stat.c:1330 -#: src/touch.c:215 -#, c-format -msgid "Usage: %s [OPTION]... FILE...\n" -msgstr "Uso: %s [OPZIONE]... FILE...\n" +#: src/readlink.c:152 +#, fuzzy, c-format +msgid "ignoring --no-newline with multiple arguments" +msgstr "gli argomenti che non sono opzioni sono stati ignorati" #: src/realpath.c:72 msgid "" @@ -8065,12 +8448,12 @@ msgstr "" msgid "generating relative path" msgstr "" -#: src/remove.c:286 +#: src/remove.c:273 #, c-format msgid "%s: descend into write-protected directory %s? " msgstr "%s: entrare nella directory protetta dalla scrittura %s? " -#: src/remove.c:287 +#: src/remove.c:274 #, c-format msgid "%s: descend into directory %s? " msgstr "%s: entrare nella directory %s? " @@ -8080,37 +8463,37 @@ msgstr "%s: entrare nella directory %s? " #. translate "%s: remove %s (write-protected) %s? " #. instead. It should avoid grammatical problems #. with the output of file_type. -#: src/remove.c:303 +#: src/remove.c:290 #, c-format msgid "%s: remove write-protected %s %s? " msgstr "%s: rimuovere il %s protetto dalla scrittura %s? " -#: src/remove.c:304 +#: src/remove.c:291 #, c-format msgid "%s: remove %s %s? " msgstr "%s: rimuovere %s %s? " -#: src/remove.c:417 +#: src/remove.c:374 #, c-format msgid "removed directory: %s\n" msgstr "directory rimossa: %s\n" -#: src/remove.c:481 +#: src/remove.c:444 #, c-format msgid "cannot remove directory: %s" msgstr "impossibile rimuovere la directory: %s" -#: src/remove.c:537 +#: src/remove.c:500 #, c-format msgid "skipping %s, since it's on a different device" msgstr "saltato %s, dato che è su un dispositivo diverso" -#: src/remove.c:557 +#: src/remove.c:520 #, c-format msgid "traversal failed: %s" msgstr "traversamento non riuscito: %s" -#: src/remove.c:563 +#: src/remove.c:526 #, c-format msgid "" "unexpected failure: fts_info=%d: %s\n" @@ -8119,12 +8502,12 @@ msgstr "" "fallimento non atteso: fts_info=%d: %s\n" "segnalare a %s" -#: src/rm.c:118 +#: src/rm.c:119 #, fuzzy, c-format msgid "Try '%s ./%s' to remove the file %s.\n" msgstr "Usare «%s ./%s» per rimuovere il file %s.\n" -#: src/rm.c:135 +#: src/rm.c:136 #, fuzzy msgid "" "Remove (unlink) the FILE(s).\n" @@ -8138,7 +8521,7 @@ msgstr "" " -f, --force ignora file non esistenti, non chiede mai conferma\n" " -i chiede conferma prima di ogni rimozione\n" -#: src/rm.c:141 +#: src/rm.c:142 msgid "" " -I prompt once before removing more than three files, " "or\n" @@ -8158,7 +8541,7 @@ msgstr "" " --interactive[=QUANDO] chiede secondo QUANDO: mai, una volta (-I), o\n" " sempre (-i). Senza QUANDO, chiede sempre\n" -#: src/rm.c:148 +#: src/rm.c:149 msgid "" " --one-file-system when removing a hierarchy recursively, skip any\n" " directory that is on a file system different from\n" @@ -8171,12 +8554,13 @@ msgstr "" " indicato dall'argomento corrispondente della riga " "di comando\n" -#: src/rm.c:153 +#: src/rm.c:154 #, fuzzy msgid "" " --no-preserve-root do not treat '/' specially\n" " --preserve-root do not remove '/' (default)\n" " -r, -R, --recursive remove directories and their contents recursively\n" +" -d, --dir remove empty directories\n" " -v, --verbose explain what is being done\n" msgstr "" " --no-preserve-root non tratta \"/\" in modo speciale\n" @@ -8185,7 +8569,7 @@ msgstr "" "contenuti\n" " -v, --verbose spiega cosa sta facendo\n" -#: src/rm.c:161 +#: src/rm.c:163 msgid "" "\n" "By default, rm does not remove directories. Use the --recursive (-r or -R)\n" @@ -8197,7 +8581,7 @@ msgstr "" "recursive\n" "(-r o -R) per rimuovere ogni directory elencata, insieme ai suoi contenuti.\n" -#: src/rm.c:166 +#: src/rm.c:168 #, fuzzy, c-format msgid "" "\n" @@ -8214,7 +8598,7 @@ msgstr "" "\n" " %s ./-foo\n" -#: src/rm.c:175 +#: src/rm.c:177 msgid "" "\n" "Note that if you use rm to remove a file, it might be possible to recover\n" @@ -8228,12 +8612,12 @@ msgstr "" "maggiori garanzie\n" "che il contenuto sia veramente irrecuperabile, si valuti l'uso di shred.\n" -#: src/rm.c:335 +#: src/rm.c:342 #, c-format msgid "%s: remove all arguments recursively? " msgstr "%s: rimuovere ricorsivamente tutti gli argomenti? " -#: src/rm.c:336 +#: src/rm.c:343 #, c-format msgid "%s: remove all arguments? " msgstr "%s: rimuovere tutti gli argomenti? " @@ -8294,7 +8678,11 @@ msgstr "" msgid "" "Run a program in a different security context.\n" "With neither CONTEXT nor COMMAND, print the current security context.\n" -"\n" +msgstr "" + +#: src/runcon.c:94 +#, fuzzy +msgid "" " CONTEXT Complete security context\n" " -c, --compute compute process transition context before modifying\n" " -t, --type=TYPE type (for same role as parent)\n" @@ -8315,72 +8703,72 @@ msgstr "" " -l, --range=INTERVALLO intervallo del livello\n" "\n" -#: src/runcon.c:140 +#: src/runcon.c:144 #, c-format msgid "multiple roles" msgstr "ruoli multipli" -#: src/runcon.c:145 +#: src/runcon.c:149 #, c-format msgid "multiple types" msgstr "tipi multipli" -#: src/runcon.c:150 +#: src/runcon.c:154 #, c-format msgid "multiple users" msgstr "utenti multipli" -#: src/runcon.c:155 +#: src/runcon.c:159 #, c-format msgid "multiple levelranges" msgstr "levelrange multipli" -#: src/runcon.c:173 src/runcon.c:209 +#: src/runcon.c:177 src/runcon.c:213 #, c-format msgid "failed to get current context" msgstr "recupero del contesto corrente non riuscito" -#: src/runcon.c:183 +#: src/runcon.c:187 #, c-format msgid "you must specify -c, -t, -u, -l, -r, or context" msgstr "deve essere specificato -c, -t, -u, -l, -r, o il contesto" -#: src/runcon.c:191 +#: src/runcon.c:195 #, c-format msgid "no command specified" msgstr "nessun comando specificato" -#: src/runcon.c:197 +#: src/runcon.c:201 #, 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:223 +#: src/runcon.c:227 #, c-format msgid "failed to compute a new context" msgstr "calcolo di un nuovo contesto non riuscito" -#: src/runcon.c:237 +#: src/runcon.c:241 #, c-format msgid "failed to set new user %s" msgstr "impostazione del nuovo utente %s non riuscita" -#: src/runcon.c:239 +#: src/runcon.c:243 #, c-format msgid "failed to set new type %s" msgstr "impostazione del nuovo tipo %s non riuscita" -#: src/runcon.c:241 +#: src/runcon.c:245 #, c-format msgid "failed to set new range %s" msgstr "impostazione del nuovo intervallo %s non riuscita" -#: src/runcon.c:243 +#: src/runcon.c:247 #, c-format msgid "failed to set new role %s" msgstr "impostazione del nuovo ruolo %s non riuscita" -#: src/runcon.c:251 +#: src/runcon.c:255 #, c-format msgid "unable to set security context %s" msgstr "impossibile impostare il contesto di sicurezza %s" @@ -8397,9 +8785,12 @@ msgstr "" " o: %s [OPZIONE]... PRIMO INCREMENTO ULTIMO\n" #: src/seq.c:73 +msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" +msgstr "" + +#: src/seq.c:79 +#, fuzzy msgid "" -"Print numbers from FIRST to LAST, in steps of INCREMENT.\n" -"\n" " -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" @@ -8412,7 +8803,7 @@ msgstr "" " -w, --equal-width rende uguale la larghezza riempiendo con zeri " "iniziali\n" -#: src/seq.c:82 +#: src/seq.c:86 msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" @@ -8429,7 +8820,7 @@ msgstr "" "INCREMENTO è normalmente positivo se PRIMO è minore di ULTIMO, e\n" "INCREMENTO è normalmente negativo se PRIMO è maggiore di ULTIMO.\n" -#: src/seq.c:90 +#: src/seq.c:94 #, fuzzy msgid "" "FORMAT must be suitable for printing one argument of type 'double';\n" @@ -8440,32 +8831,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:136 +#: src/seq.c:140 #, c-format msgid "invalid floating point argument: %s" msgstr "argomento in virgola mobile non valido: %s" -#: src/seq.c:193 -#, c-format -msgid "format %s has no %% directive" -msgstr "il formato %s non ha una direttiva %%" - -#: src/seq.c:210 -#, c-format -msgid "format %s ends in %%" -msgstr "il formato %s termina in %%" - -#: src/seq.c:213 +#: src/seq.c:232 #, c-format msgid "format %s has unknown %%%c directive" msgstr "il formato %s ha una direttiva %%%c sconosciuta" -#: src/seq.c:217 -#, c-format -msgid "format %s has too many %% directives" -msgstr "il formato %s ha troppe direttive %%" - -#: src/seq.c:431 +#: src/seq.c:555 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" @@ -8513,27 +8889,27 @@ msgstr "" " (se specificati) gli ID dei gruppi supplementari come " "GID1, ...\n" -#: src/setuidgid.c:163 +#: src/setuidgid.c:162 #, c-format msgid "unknown user-ID: %s" msgstr "id utente sconosciuto: %s" -#: src/setuidgid.c:174 +#: 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:191 +#: src/setuidgid.c:190 #, c-format msgid "failed to set supplemental group(s)" msgstr "impostazione del gruppo supplementare non riuscita" -#: src/setuidgid.c:201 +#: 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:205 +#: src/setuidgid.c:204 #, c-format msgid "cannot set user-ID to %lu" msgstr "impossibile impostare l'id utente a %lu" @@ -8544,17 +8920,17 @@ msgid "Colin Plumb" msgstr "Colin Plumb" #: src/shred.c:148 +#, 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" -"\n" msgstr "" "Sovrascrive ripetutamente i FILE specificati in modo da rendere più " "difficile\n" "recuperare i dati anche con indagini hardware molto costose.\n" "\n" -#: src/shred.c:156 +#: src/shred.c:155 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -8569,7 +8945,7 @@ msgstr "" " -s, --size=N distrugge solo N byte (sono accettati suffissi come K, M e " "G)\n" -#: src/shred.c:162 +#: src/shred.c:161 msgid "" " -u, --remove truncate and remove file after overwriting\n" " -v, --verbose show progress\n" @@ -8585,7 +8961,7 @@ msgstr "" " -z, --zero aggiunge una sovrascrittura finale con zeri per nascondere\n" " la distruzione\n" -#: src/shred.c:171 +#: src/shred.c:170 msgid "" "\n" "If FILE is -, shred standard output.\n" @@ -8607,7 +8983,7 @@ msgstr "" "persone usano l'opzione --remove.\n" "\n" -#: src/shred.c:181 +#: src/shred.c:180 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" @@ -8624,7 +9000,7 @@ msgstr "" "garantito che sia efficace:\n" "\n" -#: src/shred.c:189 +#: src/shred.c:188 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -8646,7 +9022,7 @@ msgstr "" " Appliance\n" "\n" -#: src/shred.c:199 +#: src/shred.c:198 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -8660,7 +9036,7 @@ msgstr "" "* file system compressi\n" "\n" -#: src/shred.c:206 +#: src/shred.c:205 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" @@ -8683,7 +9059,7 @@ msgstr "" "come documentato nella pagina del manuale di mount (man mount).\n" "\n" -#: src/shred.c:216 +#: src/shred.c:215 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" @@ -8693,122 +9069,122 @@ msgstr "" "del file impossibili da rimuovere e che permetterebbero di recuperare un\n" "file distrutto.\n" -#: src/shred.c:296 +#: src/shred.c:295 #, c-format msgid "%s: fdatasync failed" msgstr "%s: fdatasync non riuscito" -#: src/shred.c:307 +#: src/shred.c:306 #, c-format msgid "%s: fsync failed" msgstr "%s: fsync non riuscito" -#: src/shred.c:384 +#: src/shred.c:383 #, c-format msgid "%s: cannot rewind" msgstr "%s: impossibile riavvolgere" -#: src/shred.c:403 +#: src/shred.c:402 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: passo %lu/%lu (%s)..." -#: src/shred.c:453 +#: src/shred.c:452 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: errore di scrittura all'offset %s" -#: src/shred.c:471 +#: src/shred.c:470 #, c-format msgid "%s: lseek failed" msgstr "%s: lseek non riuscito" -#: src/shred.c:482 +#: src/shred.c:481 #, c-format msgid "%s: file too large" msgstr "%s: file troppo grande" -#: src/shred.c:505 +#: src/shred.c:504 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: passo %lu/%lu (%s)...%s" -#: src/shred.c:521 +#: src/shred.c:520 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: passo %lu/%lu (%s)...%s/%s %d%%" -#: src/shred.c:768 +#: src/shred.c:767 #, c-format msgid "%s: fstat failed" msgstr "%s: fstat non riuscito" -#: src/shred.c:779 +#: src/shred.c:778 #, c-format msgid "%s: invalid file type" msgstr "%s: tipo di file non valido" -#: src/shred.c:798 +#: src/shred.c:797 #, c-format msgid "%s: file has negative size" msgstr "%s: il file ha dimensioni negative" -#: src/shred.c:865 +#: src/shred.c:864 src/sort.c:932 src/split.c:378 #, c-format msgid "%s: error truncating" msgstr "%s: errore durante il troncamento" -#: src/shred.c:881 +#: src/shred.c:880 #, c-format msgid "%s: fcntl failed" msgstr "%s: fcntl non riuscito" -#: src/shred.c:886 +#: src/shred.c:885 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "%s: impossibile distruggere un descrittore di file append only" -#: src/shred.c:968 +#: src/shred.c:967 #, c-format msgid "%s: removing" msgstr "%s: rimozione" -#: src/shred.c:992 +#: src/shred.c:991 #, c-format msgid "%s: renamed to %s" msgstr "%s: rinominato in %s" -#: src/shred.c:1014 +#: src/shred.c:1013 #, c-format msgid "%s: failed to remove" msgstr "%s: rimozione non riuscita" -#: src/shred.c:1018 +#: src/shred.c:1017 #, c-format msgid "%s: removed" msgstr "%s: rimosso" -#: src/shred.c:1025 src/shred.c:1068 +#: src/shred.c:1024 src/shred.c:1067 #, c-format msgid "%s: failed to close" msgstr "%s: chiusura non riuscita" -#: src/shred.c:1061 +#: src/shred.c:1060 #, c-format msgid "%s: failed to open for writing" msgstr "%s: apertura per la scrittura non riuscita" -#: src/shred.c:1126 +#: src/shred.c:1125 #, c-format msgid "%s: invalid number of passes" msgstr "%s: numero di passi non valido" -#: src/shred.c:1135 src/shuf.c:291 src/sort.c:4387 +#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441 #, c-format msgid "multiple random sources specified" msgstr "sono state specificate sorgenti casuali multiple" -#: src/shred.c:1149 +#: src/shred.c:1148 #, c-format msgid "%s: invalid file size" msgstr "%s: dimensione del file non valida" @@ -8825,15 +9201,14 @@ msgstr "" " o: %s -i BASSO-ALTO [OPZIONE]...\n" #: src/shuf.c:54 -msgid "" -"Write a random permutation of the input lines to standard output.\n" -"\n" +#, fuzzy +msgid "Write a random permutation of the input lines to standard output.\n" msgstr "" "Scrive una permutazione casuale delle righe di ingresso nello standard " "output.\n" "\n" -#: src/shuf.c:61 +#: src/shuf.c:60 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 " @@ -8853,27 +9228,27 @@ msgstr "" " -z, --zero-terminated termina le righe con il byte 0, non con il " "ritorno a capo\n" -#: src/shuf.c:245 +#: src/shuf.c:244 #, c-format msgid "multiple -i options specified" msgstr "specificate opzioni -i multiple" -#: src/shuf.c:265 +#: src/shuf.c:264 #, c-format msgid "invalid input range %s" msgstr "intervallo di input %s non valido" -#: src/shuf.c:278 +#: src/shuf.c:277 #, c-format msgid "invalid line count %s" msgstr "numero di riga %s non valido" -#: src/shuf.c:285 src/sort.c:4381 +#: src/shuf.c:284 src/sort.c:4435 #, c-format msgid "multiple output files specified" msgstr "è stato specificato più di un file di output" -#: src/shuf.c:311 +#: src/shuf.c:310 #, c-format msgid "cannot combine -e and -i options" msgstr "non è possibile combinare le opzioni -e e -i" @@ -8903,7 +9278,7 @@ msgstr "" "quantità di tempo data dalla somma dei loro valori.\n" "\n" -#: src/sleep.c:135 src/timeout.c:295 +#: src/sleep.c:135 src/timeout.c:320 #, c-format msgid "invalid time interval %s" msgstr "intervallo di tempo non valido: %s" @@ -8913,15 +9288,14 @@ msgstr "intervallo di tempo non valido: %s" msgid "cannot read realtime clock" msgstr "impossibile leggere l'orologio realtime" -#: src/sort.c:395 -msgid "" -"Write sorted concatenation of all FILE(s) to standard output.\n" -"\n" +#: src/sort.c:399 +#, 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:402 +#: src/sort.c:405 msgid "" "Ordering options:\n" "\n" @@ -8929,7 +9303,7 @@ msgstr "" "Opzioni di ordinamento:\n" "\n" -#: src/sort.c:406 +#: src/sort.c:409 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -8941,7 +9315,7 @@ msgstr "" " -f, --ignore-case ignora le differenze tra caratteri minuscoli e " "maiuscoli\n" -#: src/sort.c:412 +#: src/sort.c:415 #, fuzzy msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" @@ -8953,14 +9327,14 @@ msgstr "" " -M, --month-sort confronta (sconosciuto) < \"GEN\" < ... < \"DIC" "\"\n" -#: src/sort.c:417 +#: src/sort.c:420 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:420 +#: src/sort.c:423 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -8974,7 +9348,7 @@ msgstr "" " -r, --reverse inverte il risultato dei confronti\n" "\n" -#: src/sort.c:426 +#: src/sort.c:429 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -8991,7 +9365,7 @@ msgstr "" "versione) nel testo\n" "\n" -#: src/sort.c:434 +#: src/sort.c:437 msgid "" "Other options:\n" "\n" @@ -8999,7 +9373,7 @@ msgstr "" "Altre opzioni:\n" "\n" -#: src/sort.c:438 +#: src/sort.c:441 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" @@ -9007,7 +9381,7 @@ msgstr "" " --batch-size=NUM unisce al massimo NUM input contemporaneamente;\n" " per un numero maggiore usare file temporanei\n" -#: src/sort.c:442 +#: src/sort.c:445 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 " @@ -9023,7 +9397,7 @@ msgstr "" " li decomprime con PROG -d\n" # (ndt) idee su questionable??? -#: src/sort.c:449 +#: src/sort.c:452 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -9037,7 +9411,7 @@ msgstr "" " dai nomi nel file F (terminati con NUL);\n" " se F è -, legge i nomi dallo standard input\n" -#: src/sort.c:456 +#: src/sort.c:459 #, fuzzy msgid "" " -k, --key=KEYDEF sort via a key; KEYDEF gives location and type\n" @@ -9049,7 +9423,7 @@ msgstr "" "di POS in basso\n" " -m, --merge unisce file già ordinati; non ordina\n" -#: src/sort.c:460 +#: src/sort.c:463 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -9062,7 +9436,7 @@ msgstr "" "\"last-resort\"\n" " -S, --buffer-size=DIM usa DIM per il buffer della memoria principale\n" -#: src/sort.c:466 +#: src/sort.c:469 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -9088,13 +9462,13 @@ msgstr "" " senza -c, mostra solo il primo di una sequenza " "uguale\n" -#: src/sort.c:475 +#: 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:480 +#: src/sort.c:483 #, fuzzy msgid "" "\n" @@ -9126,7 +9500,7 @@ msgstr "" "\n" "DIM può essere seguita dai seguenti suffissi moltiplicativi:\n" -#: src/sort.c:493 +#: src/sort.c:496 msgid "" "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n" "\n" @@ -9147,262 +9521,266 @@ msgstr "" "Impostare LC_ALL=C per avere l'ordinamento tradizionale che usa\n" "i valori nativi dei byte.\n" -#: src/sort.c:694 +#: src/sort.c:697 #, c-format msgid "waiting for %s [-d]" msgstr "attesa di %s [-d]" -#: src/sort.c:699 +#: src/sort.c:702 #, c-format msgid "%s [-d] terminated abnormally" msgstr "%s [-d] terminato in modo anomalo" -#: src/sort.c:853 +#: src/sort.c:856 #, c-format msgid "cannot create temporary file in %s" msgstr "impossibile creare il file temporaneo in %s" -#: src/sort.c:939 src/sort.c:2010 src/sort.c:3056 src/sort.c:3755 -#: src/sort.c:3758 +#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713 +#: src/sort.c:3804 src/sort.c:3807 msgid "open failed" msgstr "open non riuscita" -#: src/sort.c:959 +#: src/sort.c:970 msgid "fflush failed" msgstr "fflush non riuscita" -#: src/sort.c:964 src/sort.c:2013 src/sort.c:4646 +#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706 msgid "close failed" msgstr "close non riuscita" -#: src/sort.c:973 +#: src/sort.c:986 #, c-format msgid "dup2 failed" msgstr "dup2 non riuscita" -#: src/sort.c:1090 +#: src/sort.c:1103 #, c-format msgid "couldn't execute %s" msgstr "impossibile eseguire %s" -#: src/sort.c:1097 +#: src/sort.c:1110 msgid "couldn't create temporary file" msgstr "impossibile creare il file temporaneo" -#: src/sort.c:1136 +#: src/sort.c:1149 #, c-format msgid "couldn't create process for %s -d" msgstr "impossibile creare il processo per %s -d" -#: src/sort.c:1150 +#: src/sort.c:1161 #, c-format msgid "couldn't execute %s -d" msgstr "impossibile eseguire %s -d" -#: src/sort.c:1209 +#: src/sort.c:1220 #, c-format msgid "warning: cannot remove: %s" msgstr "attenzione: impossibile rimuovere %s" -#: src/sort.c:1295 +#: src/sort.c:1306 #, c-format msgid "invalid --%s argument %s" msgstr "l'argomento %2$s di --%1$s non è valido" -#: src/sort.c:1298 +#: src/sort.c:1309 #, c-format msgid "minimum --%s argument is %s" msgstr "il minimo dell'argomento --%s è %s" -#: src/sort.c:1313 +#: src/sort.c:1324 #, c-format msgid "--%s argument %s too large" msgstr "l'argomento %2$s di --%1$s è troppo grande" -#: src/sort.c:1316 +#: src/sort.c:1327 #, 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:1398 +#: src/sort.c:1409 #, c-format msgid "number in parallel must be nonzero" msgstr "numero in parallelo non deve essere zero" -#: src/sort.c:1479 +#: src/sort.c:1494 msgid "stat failed" msgstr "stat non riuscita" -#: src/sort.c:1740 +#: src/sort.c:1755 msgid "read failed" msgstr "read non riuscita" -#: src/sort.c:2028 +#: src/sort.c:2043 #, c-format msgid "string transformation failed" msgstr "trasformazione stringa non riuscita" -#: src/sort.c:2031 +#: src/sort.c:2046 #, c-format msgid "the untransformed string was %s" msgstr "la stringa non trasformata era %s" -#: src/sort.c:2194 +#: src/sort.c:2209 #, c-format msgid "^ no match for key\n" msgstr "^ nessuna corrispondenza per la chiave\n" -#: src/sort.c:2374 +#: src/sort.c:2389 #, fuzzy, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "usata la chiave obsoleta \"%s\"; considerare invece \"%s\"" -#: src/sort.c:2380 +#: src/sort.c:2395 #, 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:2391 +#: src/sort.c:2406 #, 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:2404 +#: src/sort.c:2419 #, 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:2436 +#: src/sort.c:2451 #, 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:2442 +#: src/sort.c:2457 #, 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:2716 src/sort.c:2725 +#: src/sort.c:2731 src/sort.c:2740 msgid "write failed" msgstr "write non riuscita" -#: src/sort.c:2768 +#: src/sort.c:2783 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: fuori ordine: " -#: src/sort.c:2771 +#: src/sort.c:2786 msgid "standard error" msgstr "standard error" -#: src/sort.c:3926 +#: src/sort.c:3698 +#, fuzzy +msgid "cannot read" +msgstr "%s: impossibile riavvolgere" + +#: src/sort.c:3976 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: specifica di campo %s non valida" -#: src/sort.c:3937 +#: src/sort.c:3987 #, fuzzy, c-format msgid "options '-%s' are incompatible" msgstr "le opzioni «-%s» sono incompatibili" -#: src/sort.c:3988 +#: src/sort.c:4038 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s: conteggio non valido all'inizio di %s" -#: src/sort.c:4245 +#: src/sort.c:4295 #, fuzzy msgid "invalid number after '-'" msgstr "numero non valido dopo \"-\"" -#: src/sort.c:4248 src/sort.c:4334 src/sort.c:4362 +#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416 #, fuzzy msgid "invalid number after '.'" msgstr "numero non valido dopo \".\"" -#: src/sort.c:4261 src/sort.c:4367 +#: src/sort.c:4315 src/sort.c:4421 msgid "stray character in field spec" msgstr "carattere estraneo nella specifica del campo" -#: src/sort.c:4308 +#: src/sort.c:4362 #, c-format msgid "multiple compress programs specified" msgstr "è stato specificato più di un programma di compressione" -#: src/sort.c:4325 +#: src/sort.c:4379 msgid "invalid number at field start" msgstr "numero non valido all'inizio del campo" -#: src/sort.c:4329 src/sort.c:4357 +#: src/sort.c:4383 src/sort.c:4411 msgid "field number is zero" msgstr "il numero del campo è zero" -#: src/sort.c:4338 +#: src/sort.c:4392 msgid "character offset is zero" msgstr "l'offset del carattere è zero" -#: src/sort.c:4353 +#: src/sort.c:4407 #, fuzzy msgid "invalid number after ','" msgstr "numero non valido dopo \",\"" -#: src/sort.c:4403 +#: src/sort.c:4457 #, c-format msgid "empty tab" msgstr "tabulatore vuoto" -#: src/sort.c:4496 src/wc.c:692 +#: src/sort.c:4550 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:4518 +#: src/sort.c:4572 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s:%lu: nome di file di lunghezza nulla non valido" -#: src/sort.c:4524 +#: src/sort.c:4578 #, c-format msgid "no input from %s" msgstr "nessun input da %s" -#: src/sort.c:4570 +#: src/sort.c:4624 #, c-format msgid "using %s sorting rules" msgstr "usate le regole di ordinamento %s" -#: src/sort.c:4573 +#: src/sort.c:4627 #, c-format msgid "using simple byte comparison" msgstr "usato il confronto a singolo byte" -#: src/sort.c:4604 +#: src/sort.c:4658 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "operando %s in più non permesso con -%c" -#: src/split.c:184 +#: src/split.c:187 #, c-format msgid "the suffix length needs to be at least %zu" msgstr "la lunghezza del suffisso deve essere almeno %zu" -#: src/split.c:201 +#: src/split.c:204 #, c-format msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" msgstr "Uso: %s [OPZIONE]... [INPUT [PREFISSO]]\n" -#: src/split.c:205 +#: src/split.c:208 #, fuzzy 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" -"\n" msgstr "" "Trasforma l'INPUT in parti con lunghezza fissa del tipo PREFISSOaa, " "PREFISSOab, ...; la dimensione\n" @@ -9411,7 +9789,7 @@ msgstr "" "è -, legge dallo standard input.\n" "\n" -#: src/split.c:214 +#: src/split.c:216 #, fuzzy, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" @@ -9442,7 +9820,7 @@ msgstr "" " -u, --unbuffered copia immediatamente l'input in output con «-n " "r/...»\n" -#: src/split.c:227 +#: src/split.c:229 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" @@ -9450,7 +9828,7 @@ msgstr "" " --verbose stampa una diagnostica prima\n" " dell'apertura di ciascun file di output\n" -#: src/split.c:234 +#: src/split.c:236 #, fuzzy msgid "" "\n" @@ -9471,187 +9849,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:352 +#: src/split.c:354 #, c-format msgid "output file suffixes exhausted" msgstr "i suffissi dei file di output sono esauriti" -#: src/split.c:364 +#: src/split.c:366 #, c-format msgid "creating file %s\n" msgstr "creazione di %s\n" -#: src/split.c:377 +#: src/split.c:375 +#, c-format +msgid "%s would overwrite input; aborting" +msgstr "" + +#: src/split.c:391 #, c-format msgid "failed to set FILE environment variable" msgstr "impostazione della variabile di ambiente FILE non riuscita" -#: src/split.c:379 +#: src/split.c:393 #, c-format msgid "executing with FILE=%s\n" msgstr "esecuzione con FILE=%s\n" -#: src/split.c:381 +#: src/split.c:395 #, c-format msgid "failed to create pipe" msgstr "creazione della pipe non riuscita" -#: src/split.c:395 +#: src/split.c:409 #, c-format msgid "closing prior pipe" msgstr "chiusura della pipe precedente" -#: src/split.c:397 +#: src/split.c:411 #, c-format msgid "closing output pipe" msgstr "chiusura della pipe di output" -#: src/split.c:401 +#: src/split.c:415 #, c-format msgid "moving input pipe" msgstr "spostamento della pipe di input" -#: src/split.c:403 +#: src/split.c:417 #, c-format msgid "closing input pipe" msgstr "chiusura della pipe di input" -#: src/split.c:408 +#: src/split.c:422 #, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "impossibile eseguire il comando: «%s -c %s»" -#: src/split.c:414 +#: src/split.c:428 #, c-format msgid "failed to close input pipe" msgstr "chiusura della pipe di input non riuscita" -#: src/split.c:450 +#: src/split.c:464 #, c-format msgid "waiting for child process" msgstr "in attesa del processo figlio" -#: src/split.c:460 +#: src/split.c:474 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "con FILE=%s, segnale %s dal comando: %s" -#: src/split.c:468 +#: src/split.c:482 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "con FILE=%s, uscita %d dal comando: %s" -#: src/split.c:475 src/timeout.c:449 +#: src/split.c:489 src/timeout.c:494 #, c-format msgid "unknown status from command (0x%X)" msgstr "stato sconosciuto dal comando (0x%X)" -#: src/split.c:1037 +#: src/split.c:1052 #, c-format msgid "cannot split in more than one way" msgstr "impossibile suddividere in più di un modo" -#: src/split.c:1050 src/split.c:1192 src/split.c:1363 +#: src/split.c:1065 src/split.c:1205 src/split.c:1376 #, c-format msgid "%s: invalid number of chunks" msgstr "%s: numero di parti non valido" -#: src/split.c:1054 +#: src/split.c:1069 #, c-format msgid "%s: invalid chunk number" msgstr "%s: numero di parte non valido" -#: src/split.c:1106 +#: src/split.c:1119 #, c-format msgid "%s: invalid suffix length" msgstr "%s: lunghezza del suffisso non valida" -#: src/split.c:1131 src/split.c:1139 src/split.c:1162 src/split.c:1167 +#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180 #, c-format msgid "%s: invalid number of bytes" msgstr "%s: numero di byte non valido" -#: src/split.c:1150 src/split.c:1297 +#: src/split.c:1163 src/split.c:1310 #, c-format msgid "%s: invalid number of lines" msgstr "%s: numero di righe non valido" -#: src/split.c:1223 +#: src/split.c:1236 #, 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:1235 +#: src/split.c:1248 #, fuzzy, c-format msgid "%s: invalid start value for numerical suffix" msgstr "numero di riga iniziale non valido: %s" -#: src/split.c:1263 +#: src/split.c:1276 #, c-format msgid "%s: invalid IO block size" msgstr "%s: dimensione del blocco di IO non valida" -#: src/split.c:1284 +#: src/split.c:1297 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "--filter non processa una parte estratta in stdout" -#: src/split.c:1321 +#: src/split.c:1334 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1356 +#: src/split.c:1369 #, 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:169 +#: src/stat.c:173 msgid "Michael Meskes" msgstr "Michael Meskes" # (ndt) ??? -#: src/stat.c:838 +#: src/stat.c:857 #, c-format msgid "failed to canonicalize %s" msgstr "trasformazione di %s in forma canonica non riuscita" -#: src/stat.c:1050 +#: src/stat.c:1069 #, fuzzy, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "attenzione: sequenza di escape «\\%c» non riconosciuta" -#: src/stat.c:1105 +#: src/stat.c:1124 #, c-format msgid "%s: invalid directive" msgstr "%s: direttiva non valida" -#: src/stat.c:1151 +#: src/stat.c:1170 #, c-format msgid "warning: backslash at end of format" msgstr "attenzione: backslash alla fine del formato" -#: src/stat.c:1182 +#: src/stat.c:1201 #, 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:1189 +#: src/stat.c:1208 #, c-format msgid "cannot read file system information for %s" msgstr "impossibile leggere le informazioni del file system per %s" -#: src/stat.c:1209 +#: src/stat.c:1228 #, 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:1245 +#: src/stat.c:1264 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -9667,7 +10050,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1268 +#: src/stat.c:1287 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -9677,30 +10060,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1278 +#: src/stat.c:1297 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:1286 +#: src/stat.c:1305 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:1295 +#: src/stat.c:1314 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:1305 +#: src/stat.c:1324 #, c-format msgid "Context: %C\n" msgstr "Contesto: %C\n" -#: src/stat.c:1313 +#: src/stat.c:1332 msgid "" "Access: %x\n" "Modify: %y\n" @@ -9712,10 +10095,13 @@ msgstr "" "Cambio : %z\n" "Creazione: %w\n" -#: src/stat.c:1331 +#: src/stat.c:1350 +msgid "Display file or file system status.\n" +msgstr "" + +#: src/stat.c:1356 +#, fuzzy msgid "" -"Display file or file system status.\n" -"\n" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" @@ -9725,7 +10111,7 @@ msgstr "" " -f, --file-system visualizza lo stato del file system invece di quello " "del file\n" -#: src/stat.c:1337 +#: src/stat.c:1360 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -9746,7 +10132,7 @@ msgstr "" "FORMATO\n" " -t, --terse stampa le informazioni in modo conciso\n" -#: src/stat.c:1348 +#: src/stat.c:1371 #, fuzzy msgid "" "\n" @@ -9767,7 +10153,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:1357 +#: src/stat.c:1380 #, fuzzy msgid "" " %d device number in decimal\n" @@ -9784,7 +10170,7 @@ msgstr "" " %g Id del gruppo del proprietario\n" " %G Nome del gruppo del proprietario\n" -#: src/stat.c:1365 +#: src/stat.c:1388 #, fuzzy msgid "" " %h number of hard links\n" @@ -9808,7 +10194,7 @@ msgstr "" " %t Major number del device in esadecimale\n" " %T Minor number del device in esadecimale\n" -#: src/stat.c:1376 +#: src/stat.c:1399 #, fuzzy msgid "" " %u user ID of owner\n" @@ -9835,7 +10221,7 @@ msgstr "" " %Z Orario dell'ultimo cambiamento in secondi dall'Epoca\n" "\n" -#: src/stat.c:1390 +#: src/stat.c:1413 #, fuzzy msgid "" "Valid format sequences for file systems:\n" @@ -9854,7 +10240,7 @@ msgstr "" " %d Numero di inode liberi nel file system\n" " %f Numero di blocchi liberi file system\n" -#: src/stat.c:1399 +#: src/stat.c:1422 #, fuzzy msgid "" " %i file system ID in hex\n" @@ -9879,15 +10265,15 @@ msgid "Usage: %s OPTION... COMMAND\n" msgstr "Uso: %s [OPZIONE]... COMANDO\n" #: src/stdbuf.c:91 +#, fuzzy msgid "" "Run COMMAND, with modified buffering operations for its standard streams.\n" -"\n" msgstr "" "Esegue COMANDO, con operazioni di buffering modificate per i suoi flussi " "standard.\n" "\n" -#: src/stdbuf.c:98 +#: src/stdbuf.c:97 msgid "" " -i, --input=MODE adjust standard input stream buffering\n" " -o, --output=MODE adjust standard output stream buffering\n" @@ -9898,7 +10284,7 @@ msgstr "" " -e, --error=MODO modifica il buffering del flusso standard error\n" # (ndt) - questa e la successiva leggermente girata per evitare termini come "bufferato" -#: src/stdbuf.c:105 +#: src/stdbuf.c:104 #, fuzzy msgid "" "\n" @@ -9909,7 +10295,7 @@ msgstr "" "Se MODO è \"L\" verrà eseguito il buffering sul flusso corrispondente.\n" "L'opzione non è valida per lo standard input.\n" -#: src/stdbuf.c:108 +#: src/stdbuf.c:107 #, fuzzy msgid "" "\n" @@ -9918,7 +10304,7 @@ msgstr "" "\n" "Se MODE è \"0\" non sarà eseguito il buffering sul flusso corrispondente.\n" -#: src/stdbuf.c:111 +#: src/stdbuf.c:110 msgid "" "\n" "Otherwise MODE is a number which may be followed by one of the following:\n" @@ -9937,7 +10323,7 @@ msgstr "" "un buffer di dimensione MODO byte.\n" # (ndt) Messo minuscolo dopo i : per uniformità -#: src/stdbuf.c:117 +#: src/stdbuf.c:116 #, fuzzy msgid "" "\n" @@ -9954,22 +10340,22 @@ 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:227 +#: src/stdbuf.c:226 #, c-format msgid "failed to find %s" msgstr "ricerca di %s non riuscita" -#: src/stdbuf.c:247 src/stdbuf.c:279 +#: src/stdbuf.c:246 src/stdbuf.c:278 #, c-format msgid "failed to update the environment with %s" msgstr "aggiornamento dell'ambiente con %s non riuscito" -#: src/stdbuf.c:321 +#: src/stdbuf.c:320 #, c-format msgid "line buffering stdin is meaningless" msgstr "il buffering di righe su stdin non ha significato" -#: src/stty.c:509 +#: src/stty.c:513 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -9980,10 +10366,13 @@ msgstr "" " or: %s [-F DEVICE] | --file=DEVICE] [-a|--all]\n" " or: %s [-F DEVICE] | --file=DEVICE] [-g|--save]\n" -#: src/stty.c:515 +#: src/stty.c:519 +msgid "Print or change terminal characteristics.\n" +msgstr "" + +#: src/stty.c:525 +#, fuzzy msgid "" -"Print or change terminal characteristics.\n" -"\n" " -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" @@ -9996,7 +10385,7 @@ msgstr "" " leggibile da stty\n" " -F, --file=DEVICE apre e usa il DEVICE specificato invece di stdin\n" -#: src/stty.c:524 +#: src/stty.c:532 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -10007,7 +10396,7 @@ msgstr "" "impostazioni non POSIX. Il sistema sottostante definisce quali impostazioni\n" "sono disponibili.\n" -#: src/stty.c:529 +#: src/stty.c:537 msgid "" "\n" "Special characters:\n" @@ -10022,7 +10411,7 @@ msgstr "" " eof CAR CAR invierà un fine file (termina l'input)\n" " eol CAR CAR terminerà la riga\n" -#: src/stty.c:536 +#: src/stty.c:544 msgid "" " * eol2 CHAR alternate CHAR for ending the line\n" " erase CHAR CHAR will erase the last character typed\n" @@ -10034,7 +10423,7 @@ msgstr "" " intr CAR CAR invierà un segnale di interrupt\n" " kill CAR CAR cancellerà la riga corrente\n" -#: src/stty.c:542 +#: src/stty.c:550 msgid "" " * lnext CHAR CHAR will enter the next character quoted\n" " quit CHAR CHAR will send a quit signal\n" @@ -10046,7 +10435,7 @@ msgstr "" " * rprnt CAR CAR ridisegnerà la riga corrente\n" " start CAR CAR farà ripartire l'output dopo averlo fermato\n" -#: src/stty.c:548 +#: src/stty.c:556 msgid "" " stop CHAR CHAR will stop the output\n" " susp CHAR CHAR will send a terminal stop signal\n" @@ -10058,7 +10447,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:554 +#: src/stty.c:562 msgid "" "\n" "Special settings:\n" @@ -10072,7 +10461,7 @@ msgstr "" " * cols N dice al kernel che il terminale ha N colonne\n" " * columns N come cols N\n" -#: src/stty.c:561 +#: src/stty.c:569 msgid "" " ispeed N set the input speed to N\n" " * line N use line discipline N\n" @@ -10086,7 +10475,7 @@ msgstr "" "lettura completa\n" " ospeed N imposta a N la velocità di output\n" -#: src/stty.c:567 +#: src/stty.c:575 msgid "" " * rows N tell the kernel that the terminal has N rows\n" " * size print the number of rows and columns according to the " @@ -10100,13 +10489,15 @@ msgstr "" " time N con -icanon, imposta a N decimi di secondo il timeout in " "lettura\n" -#: src/stty.c:573 +#: src/stty.c:581 +#, fuzzy msgid "" "\n" "Control settings:\n" " [-]clocal disable modem control signals\n" " [-]cread allow input to be received\n" " * [-]crtscts enable RTS/CTS handshaking\n" +" * [-]cdtrdsr enable DTR/DSR handshaking\n" " csN set character size to N bits, N in [5..8]\n" msgstr "" "\n" @@ -10117,7 +10508,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:581 +#: src/stty.c:590 #, fuzzy msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" @@ -10125,7 +10516,7 @@ msgid "" " [-]hupcl same as [-]hup\n" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" -" [-]parodd set odd parity (even with '-')\n" +" [-]parodd set odd parity (or even parity with '-')\n" msgstr "" " [-]cstopb usa due bit di stop per carattere (uno con \"-\")\n" " [-]hup invia un signal di hangup quando l'ultimo processo chiude " @@ -10135,7 +10526,7 @@ msgstr "" "parità in input\n" " [-]parodd imposta la parità dispari (pari con \"-\")\n" -#: src/stty.c:588 +#: src/stty.c:597 msgid "" "\n" "Input settings:\n" @@ -10152,7 +10543,7 @@ msgstr "" " [-]ignbrk ignora i caratteri di break\n" " [-]igncr ignora i ritorno carrello\n" -#: src/stty.c:596 +#: src/stty.c:605 msgid "" " [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" @@ -10167,12 +10558,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:603 +#: src/stty.c:612 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:606 +#: src/stty.c:615 msgid "" " * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" @@ -10190,7 +10581,7 @@ msgstr "" "carattere)\n" " [-]tandem come [-]ixoff\n" -#: src/stty.c:614 +#: src/stty.c:623 msgid "" "\n" "Output settings:\n" @@ -10206,7 +10597,7 @@ 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:622 +#: src/stty.c:631 msgid "" " * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of null characters\n" @@ -10223,7 +10614,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:630 +#: src/stty.c:639 msgid "" " * [-]onocr do not print carriage returns in the first column\n" " [-]opost postprocess output\n" @@ -10239,7 +10630,7 @@ msgstr "" " * -tabs come tab3\n" " * vtN stile del ritardo del tabulatore verticale, N in [0..1]\n" -#: src/stty.c:638 +#: src/stty.c:647 msgid "" "\n" "Local settings:\n" @@ -10256,7 +10647,7 @@ msgstr "" " * -crtkill cancella tutte le righe obbedendo alle impostazioni\n" " echoctl e echok\n" -#: src/stty.c:645 +#: src/stty.c:654 #, fuzzy msgid "" " * [-]ctlecho echo control characters in hat notation ('^c')\n" @@ -10272,7 +10663,7 @@ msgstr "" " [-]echoe come [-]crterase\n" " [-]echok fa l'echo di un ritorno a capo dopo un carattere di kill\n" -#: src/stty.c:652 +#: src/stty.c:661 #, fuzzy msgid "" " * [-]echoke same as [-]crtkill\n" @@ -10289,7 +10680,7 @@ msgstr "" " [-]icanon abilita i caratteri speciali erase, kill, werase, e rprnt\n" " [-]iexten abilita i caratteri speciali non POSIX\n" -#: src/stty.c:659 +#: src/stty.c:668 #, fuzzy msgid "" " [-]isig enable interrupt, quit, and suspend special characters\n" @@ -10308,7 +10699,7 @@ msgstr "" " * [-]xcase con icanon, fa l'escape con \"\\\" per i caratteri " "maiuscoli\n" -#: src/stty.c:666 +#: src/stty.c:675 msgid "" "\n" "Combination settings:\n" @@ -10322,7 +10713,7 @@ msgstr "" " cbreak come -icanon\n" " -cbreak come icanon\n" -#: src/stty.c:673 +#: src/stty.c:682 msgid "" " cooked same as brkint ignpar istrip icrnl ixon opost isig\n" " icanon, eof and eol characters to their default values\n" @@ -10334,7 +10725,7 @@ msgstr "" " -cooked come raw\n" " crt come echoe echoctl echoke\n" -#: src/stty.c:679 +#: src/stty.c:688 msgid "" " dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" " kill ^u\n" @@ -10348,7 +10739,7 @@ msgstr "" " ek caratteri di erase e kill ai loro valori predefiniti\n" " evenp come parenb -parodd cs7\n" -#: src/stty.c:686 +#: src/stty.c:695 msgid "" " -evenp same as -parenb cs8\n" " * [-]lcase same as xcase iuclc olcuc\n" @@ -10364,7 +10755,7 @@ msgstr "" " nl come -icrnl -onlcr\n" " -nl come icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" -#: src/stty.c:694 +#: src/stty.c:703 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -10378,7 +10769,7 @@ msgstr "" " pass8 come -parenb -istrip cs8\n" " -pass8 come parenb istrip cs7\n" -#: src/stty.c:701 +#: src/stty.c:710 msgid "" " raw same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" " -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n" @@ -10390,7 +10781,7 @@ msgstr "" " -imaxbel -opost -isig -icanon -xcase min 1 time 0\n" " -raw come cooked\n" -#: src/stty.c:707 +#: src/stty.c:716 msgid "" " sane same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" " -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n" @@ -10406,7 +10797,7 @@ msgstr "" " -xcase -tostop -echoprt echoctl echoke, tutti i caratteri\n" " speciali ai loro valori predefiniti\n" -#: src/stty.c:715 +#: src/stty.c:724 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -10421,12 +10812,12 @@ msgstr "" "o 127; i valori speciali ^- o undef sono usati per disabilitare i caratteri\n" "speciali.\n" -#: src/stty.c:787 +#: src/stty.c:796 #, c-format msgid "only one device may be specified" msgstr "può essere specificato un solo dispositivo" -#: src/stty.c:817 +#: src/stty.c:826 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" @@ -10435,125 +10826,48 @@ msgstr "" "le opzioni per gli stili dell'output \"verbose\" e \"stty-readable\" sono " "mutualmente esclusive" -#: src/stty.c:823 +#: src/stty.c:832 #, 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:838 +#: src/stty.c:847 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s: impossibile azzerare il modo non bloccante" -#: src/stty.c:883 src/stty.c:993 +#: src/stty.c:892 src/stty.c:1002 #, c-format msgid "invalid argument %s" msgstr "argomento %s non valido" -#: src/stty.c:894 src/stty.c:911 src/stty.c:923 src/stty.c:936 src/stty.c:948 -#: src/stty.c:968 +#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957 +#: src/stty.c:977 #, c-format msgid "missing argument to %s" msgstr "manca l'argomento per %s" -#: src/stty.c:974 +#: src/stty.c:983 #, c-format msgid "invalid line discipline %s" msgstr "disciplina di riga non valida %s" -#: src/stty.c:1044 +#: src/stty.c:1053 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s: impossibile eseguire tutte le operazioni richieste" -#: src/stty.c:1390 +#: src/stty.c:1399 #, c-format msgid "%s: no size information for this device" msgstr "%s: non ci sono informazioni sulle dimensioni di questo dispositivo" -#: src/stty.c:1904 +#: src/stty.c:1920 #, c-format msgid "invalid integer argument %s" msgstr "argomento intero %s non valido" -#: src/su.c:229 -msgid "Password:" -msgstr "Password:" - -#: src/su.c:232 -#, c-format -msgid "getpass: cannot open /dev/tty" -msgstr "getpass: impossibile aprire /dev/tty" - -#: src/su.c:290 -#, c-format -msgid "cannot set groups" -msgstr "impossibile impostare i gruppi" - -#: src/su.c:294 -#, c-format -msgid "cannot set group id" -msgstr "impossibile impostare l'id del gruppo" - -#: src/su.c:296 -#, c-format -msgid "cannot set user id" -msgstr "impossibile impostare l'id utente" - -#: src/su.c:371 -#, c-format -msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" -msgstr "Uso: %s [OPZIONE]... [-] [UTENTE [ARG]...]\n" - -#: src/su.c:372 -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 gli id utente e di gruppo efficaci in quelli di UTENTE.\n" -"\n" -" -, -l, --login rende la shell una shell di accesso\n" -" -c, --commmand=COMANDO passa con -c un COMANDO singolo alla shell\n" -" -f, --fast passa -f alla shell (per csh o tcsh)\n" -" -m, --preserve-environment non reinizializza le variabili d'ambiente\n" -" -p come -m\n" -" -s, --shell=SHELL esegue SHELL se /etc/shells lo permette\n" - -#: src/su.c:384 -msgid "" -"\n" -"A mere - implies -l. If USER not given, assume root.\n" -msgstr "" -"\n" -"Un semplice - implica -l. Se UTENTE non è specificato, assume root.\n" - -#: src/su.c:461 -#, c-format -msgid "user %s does not exist" -msgstr "l'utente %s non esiste" - -#: src/su.c:484 -#, c-format -msgid "incorrect password" -msgstr "password sbagliata" - -#: src/su.c:501 -#, c-format -msgid "using restricted shell %s" -msgstr "viene usata la shell ristretta %s" - -#: src/su.c:509 -#, c-format -msgid "warning: cannot change directory to %s" -msgstr "attenzione: impossibile cambiare la directory in %s" - #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 msgid "Kayvan Aghaiepour" @@ -10585,7 +10899,7 @@ msgstr "" msgid "ignoring all arguments" msgstr "ignorati tutti gli argomenti" -#: src/system.h:340 +#: src/system.h:343 #, c-format msgid "" "\n" @@ -10598,15 +10912,24 @@ msgstr "" "la versione descritta qui. Fare riferimento alla documentazione della shell\n" "per i dettagli sulle opzioni supportate.\n" -#: src/system.h:346 +#: src/system.h:349 msgid " --help display this help and exit\n" msgstr " --help mostra questo aiuto ed esce\n" -#: src/system.h:348 +#: src/system.h:351 msgid " --version output version information and exit\n" msgstr " --version stampa le informazioni sulla versione ed esce\n" -#: src/system.h:541 +#: src/system.h:544 +#, fuzzy +msgid "" +"\n" +"Mandatory arguments to long options are mandatory for short options too.\n" +msgstr "" +"Gli argomenti obbligatori per le opzioni lunghe lo sono anche per quelle " +"brevi.\n" + +#: src/system.h:552 msgid "" "\n" "SIZE is an integer and optional unit (example: 10M is 10*1024*1024). Units\n" @@ -10614,7 +10937,7 @@ msgid "" "1000).\n" msgstr "" -#: src/system.h:550 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -10630,7 +10953,7 @@ msgstr "" "POSIXLY_CORRECT).\n" # (ndt) - aggiunte le <> per uniformità alle successive -#: src/system.h:560 +#: src/system.h:571 #, c-format msgid "" "\n" @@ -10643,23 +10966,23 @@ msgstr "" #. <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:574 +#: src/system.h:585 #, 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:578 +#: src/system.h:589 #, 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:585 +#: src/system.h:596 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "Usare «%s --help» per ulteriori informazioni.\n" -#: src/system.h:617 +#: src/system.h:628 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -10680,16 +11003,16 @@ 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" -"\n" msgstr "" "Scrive ogni FILE nello standard output, dall'ultima riga alla prima.\n" "Senza FILE, o quando FILE è -, legge lo standard input.\n" "\n" -#: src/tac.c:145 +#: src/tac.c:144 msgid "" " -b, --before attach the separator before instead of after\n" " -r, --regex interpret the separator as a regular expression\n" @@ -10701,42 +11024,42 @@ msgstr "" " -s, --separator=STRINGA utilizza STRINGA come separatore anziché il " "carattere di ritorno a capo\n" -#: src/tac.c:235 src/tac.c:336 +#: src/tac.c:234 src/tac.c:335 #, c-format msgid "%s: seek failed" msgstr "%s: seek non riuscito" -#: src/tac.c:264 +#: src/tac.c:263 #, c-format msgid "record too large" msgstr "record troppo grande" -#: src/tac.c:451 +#: src/tac.c:450 #, fuzzy, c-format msgid "failed to create temporary file in %s" msgstr "impossibile creare il file temporaneo in %s" -#: src/tac.c:459 +#: src/tac.c:458 #, fuzzy, c-format msgid "failed to open %s for writing" msgstr "%s: apertura per la scrittura non riuscita" -#: src/tac.c:476 +#: src/tac.c:475 #, fuzzy, c-format msgid "failed to rewind stream for %s" msgstr "impossibile preservare gli orari di %s" -#: src/tac.c:512 src/tac.c:519 +#: src/tac.c:511 src/tac.c:518 #, c-format msgid "%s: write error" msgstr "%s: errore di scrittura" -#: src/tac.c:572 +#: src/tac.c:571 #, fuzzy, c-format msgid "failed to open %s for reading" msgstr "impossibile aprire %s per la lettura" -#: src/tac.c:630 +#: src/tac.c:629 #, c-format msgid "separator cannot be empty" msgstr "il separatore non può essere vuoto" @@ -10747,12 +11070,11 @@ msgid "Ian Lance Taylor" msgstr "Ian Lance Taylor" #: src/tail.c:262 -#, c-format +#, fuzzy, 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" -"\n" msgstr "" "Stampa le ultime %d righe di ogni FILE sullo standard output.\n" "Con più di un FILE, ciascuno viene preceduto da un'intestazione che riporta " @@ -10760,7 +11082,7 @@ msgstr "" "Con nessun FILE, o quando il FILE è -, legge lo standard input.\n" "\n" -#: src/tail.c:271 +#: src/tail.c:270 msgid "" " -c, --bytes=K output the last K bytes; alternatively, use -c " "+K\n" @@ -10772,7 +11094,7 @@ msgstr "" " stampare i byte che iniziano con il K-esimo di " "ciascun file\n" -#: src/tail.c:275 +#: src/tail.c:274 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -10788,7 +11110,7 @@ msgstr "" " -F lo stesso di --follow=name --retry\n" # (ndt) ho tolto il punto finale in -max-unchanged-stats per uniformità -#: src/tail.c:282 +#: src/tail.c:281 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -10812,7 +11134,7 @@ msgstr "" "ruotano).\n" " Con inotify, questa opzione è raramente utile\n" -#: src/tail.c:295 +#: src/tail.c:294 msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" " -q, --quiet, --silent never output headers giving file names\n" @@ -10829,7 +11151,7 @@ msgstr "" "follow=nome\n" # (ndt) ho tolto il punto finale in -s per uniformità -#: src/tail.c:302 +#: src/tail.c:301 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations.\n" @@ -10844,7 +11166,7 @@ msgstr "" " -v, --verbose stampa sempre le intestazioni fornendo i nomi dei " "file\n" -#: src/tail.c:311 +#: src/tail.c:310 #, fuzzy msgid "" "\n" @@ -10865,7 +11187,7 @@ msgstr "" "GB 1000*1000*1000, G 1024*1024*1024, e così via per T, P, E, Z, Y.\n" "\n" -#: src/tail.c:320 +#: src/tail.c:319 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" @@ -10886,68 +11208,68 @@ msgstr "" "conto\n" "di operazione di rinomina, rimozione e creazione.\n" -#: src/tail.c:379 +#: src/tail.c:378 #, c-format msgid "closing %s (fd=%d)" msgstr "chiusura di %s (fd=%d)" -#: src/tail.c:454 +#: 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:458 +#: src/tail.c:457 #, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "%s: impossibile posizionarsi all'offset %s relativo alla fine" -#: src/tail.c:895 +#: src/tail.c:894 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "impossibile determinare la posizione di %s, ritorno al polling" -#: src/tail.c:907 -#, fuzzy, c-format +#: src/tail.c:906 +#, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" -msgstr "impossibile determinare la posizione di %s, ritorno al polling" +msgstr "" -#: src/tail.c:964 +#: src/tail.c:963 #, c-format msgid "%s has become inaccessible" msgstr "%s è diventato inaccessibile" -#: src/tail.c:981 +#: src/tail.c:980 #, 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:990 +#: src/tail.c:989 #, 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:1011 +#: src/tail.c:1010 #, c-format msgid "%s has become accessible" msgstr "%s è divenuto accessibile" -#: src/tail.c:1019 +#: src/tail.c:1018 #, 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:1030 +#: src/tail.c:1029 #, 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:1131 +#: src/tail.c:1130 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: impossibile cambiare il modo non bloccante" @@ -11314,17 +11636,22 @@ msgstr "manca un \"]\"" msgid "extra argument %s" msgstr "argomento %s in più" -#: src/timeout.c:124 +#: src/timeout.c:112 +#, fuzzy, c-format +msgid "warning: sigprocmask" +msgstr "attenzione: timer_create" + +#: src/timeout.c:145 #, c-format msgid "warning: timer_settime" msgstr "attenzione: timer_settime" -#: src/timeout.c:129 +#: src/timeout.c:150 #, c-format msgid "warning: timer_create" msgstr "attenzione: timer_create" -#: src/timeout.c:204 +#: src/timeout.c:225 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -11333,20 +11660,21 @@ msgstr "" "Uso: %s [OPZIONE] DURATA COMANDO [ARG]...\n" " o: %s [OPZIONE]\n" -#: src/timeout.c:208 -msgid "" -"Start COMMAND, and kill it if still running after DURATION.\n" -"\n" -"Mandatory arguments to long options are mandatory for short options too.\n" +#: src/timeout.c:229 +#, fuzzy +msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "" "Avvia COMANDO e lo uccide se è ancora in esecuzione dopo DURATA.\n" "\n" "Gli argomenti obbligatori per le opzioni lunghe lo sono anche per quelle " "brevi.\n" -#: src/timeout.c:213 +#: src/timeout.c:235 #, fuzzy msgid "" +" --preserve-status\n" +" exit with the same status as COMMAND, even when the\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 " @@ -11376,7 +11704,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:229 +#: src/timeout.c:254 #, fuzzy msgid "" "\n" @@ -11389,16 +11717,16 @@ msgstr "" "\"s\" per secondi (predefinito), \"m\" per minuti, \"h\" per ore o \"d\" per " "giorni.\n" -#: src/timeout.c:234 +#: src/timeout.c:259 #, fuzzy msgid "" "\n" -"If the command times out, then exit with status 124. Otherwise, exit\n" -"with the status of COMMAND. If no signal is specified, send the TERM\n" -"signal upon timeout. The TERM signal kills any process that does not\n" -"block or catch that signal. For other processes, it may be necessary to\n" -"use the KILL (9) signal, since this signal cannot be caught. If the\n" -"KILL (9) signal is sent, the exit status is 128+9 rather than 124.\n" +"If the command times out, and --preserve-status is not set, then exit with\n" +"status 124. Otherwise, exit with the status of COMMAND. If no signal\n" +"is specified, send the TERM signal upon timeout. The TERM signal kills\n" +"any process that does not block or catch that signal. It may be necessary\n" +"to use the KILL (9) signal, since this signal cannot be caught, in which\n" +"case the exit status is 128+9 rather than 124.\n" msgstr "" "\n" "Se scade il tempo del comando, allora esce con lo stato 124,\n" @@ -11409,15 +11737,20 @@ msgstr "" "usare il segnale KILL (9), dato che questo segnale non può essere " "catturato.\n" -#: src/timeout.c:419 +#: src/timeout.c:363 +#, c-format +msgid "warning: disabling core dumps failed" +msgstr "attenzione: disabilitazione dei dump di core non riuscita" + +#: src/timeout.c:471 #, c-format msgid "error waiting for command" msgstr "errore aspettando il comando" -#: src/timeout.c:441 +#: src/timeout.c:482 #, c-format -msgid "warning: disabling core dumps failed" -msgstr "attenzione: disabilitazione dei dump di core non riuscita" +msgid "the monitored command dumped core" +msgstr "" #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 @@ -11429,22 +11762,23 @@ msgstr "Jim Kingdon" msgid "Randy Smith" msgstr "Randy Smith" -#: src/touch.c:115 src/touch.c:313 +#: src/touch.c:115 src/touch.c:309 #, c-format msgid "invalid date format %s" msgstr "formato di data %s non valido" -#: src/touch.c:194 +#: src/touch.c:191 #, c-format msgid "cannot touch %s" msgstr "impossibile fare touch di %s" -#: src/touch.c:200 +#: src/touch.c:197 #, c-format msgid "setting times of %s" msgstr "impostazione degli orari di %s" -#: src/touch.c:216 +#: src/touch.c:213 +#, fuzzy msgid "" "Update the access and modification times of each FILE to the current time.\n" "\n" @@ -11453,7 +11787,6 @@ msgid "" "\n" "A FILE argument string of - is handled specially and causes touch to\n" "change the times of the file associated with standard output.\n" -"\n" msgstr "" "Aggiorna gli orari di accesso e modifica di ogni FILE a quello attuale.\n" "\n" @@ -11464,7 +11797,7 @@ msgstr "" "cambiare gli orari del file associato allo standard output.\n" "\n" -#: src/touch.c:229 +#: src/touch.c:225 msgid "" " -a change only the access time\n" " -c, --no-create do not create any files\n" @@ -11476,7 +11809,7 @@ msgstr "" " -d, --date=STRINGA usa STRINGA invece che l'orario attuale\n" " -f (ignorato)\n" -#: src/touch.c:235 +#: src/touch.c:231 msgid "" " -h, --no-dereference affect each symbolic link instead of any " "referenced\n" @@ -11491,11 +11824,12 @@ msgstr "" " simbolico)\n" " -m cambia solo l'orario di modifica\n" -#: src/touch.c:241 +#: 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" -" --time=WORD change the specified time:\n" +" --time=WORD change the specified time:\n" " WORD is access, atime, or use: equivalent to -a\n" " WORD is modify or mtime: equivalent to -m\n" msgstr "" @@ -11507,7 +11841,7 @@ msgstr "" " se TIPO è access, atime o use: come -a\n" " se TIPO è mtime o modify: come -m\n" -#: src/touch.c:250 +#: src/touch.c:246 msgid "" "\n" "Note that the -d and -t options accept different time-date formats.\n" @@ -11516,12 +11850,12 @@ msgstr "" "Notare che le opzioni -d e -t accettano differenti formati di orario e " "data.\n" -#: src/touch.c:339 +#: src/touch.c:335 #, c-format msgid "cannot specify times from more than one source" msgstr "impossibile specificare l'orario da più di una fonte" -#: src/touch.c:413 +#: src/touch.c:409 #, fuzzy, c-format msgid "" "warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'" @@ -11802,6 +12136,7 @@ msgid "Usage: %s OPTION... FILE...\n" msgstr "Uso: %s OPZIONE... [FILE]...\n" #: src/truncate.c:97 +#, fuzzy msgid "" "Shrink or extend the size of each FILE to the specified size\n" "\n" @@ -11810,7 +12145,6 @@ msgid "" "If a FILE is larger than the specified size, the extra data is lost.\n" "If a FILE is shorter, it is extended and the extended part (hole)\n" "reads as zero bytes.\n" -"\n" msgstr "" "Riduce o estende la dimensione di ciascun FILE alla dimensione specificata\n" "\n" @@ -11822,18 +12156,18 @@ msgstr "" "viene letta come byte zero.\n" "\n" -#: src/truncate.c:110 +#: src/truncate.c:109 msgid " -c, --no-create do not create any files\n" msgstr " -c, --no-create non crea alcun file\n" -#: src/truncate.c:113 +#: src/truncate.c:112 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" " -o, --io-blocks tratta DIM come un numero di blocchi di IO invece " "di byte\n" -#: src/truncate.c:116 +#: 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" @@ -11842,7 +12176,7 @@ msgstr "" " -s, --size=DIM imposta o modifica la dimensione del file a questa " "DIMensione\n" -#: src/truncate.c:122 +#: src/truncate.c:121 #, fuzzy msgid "" "\n" @@ -11856,57 +12190,57 @@ msgstr "" "\"/\" arrotondato in difetto a multipli di, \"%\" arrotondato in eccesso a " "multipli di.\n" -#: src/truncate.c:150 +#: src/truncate.c:149 #, c-format msgid "overflow in %<PRIdMAX> * %<PRIdMAX> byte blocks for file %s" msgstr "overflow in %<PRIdMAX> * %<PRIdMAX> blocchi di byte per il file %s" -#: src/truncate.c:174 +#: src/truncate.c:173 #, c-format msgid "%s has unusable, apparently negative size" msgstr "%s non è usabile, apparentemente ha dimensioni negative" -#: src/truncate.c:184 src/truncate.c:379 +#: src/truncate.c:183 src/truncate.c:384 #, c-format msgid "cannot get the size of %s" msgstr "impossibile ottenere la dimensione di %s" -#: src/truncate.c:206 +#: src/truncate.c:205 #, c-format msgid "overflow rounding up size of file %s" msgstr "overflow arrotondando la dimensione del file %s" -#: src/truncate.c:216 +#: src/truncate.c:215 #, c-format msgid "overflow extending size of file %s" msgstr "overflow estendendo la dimensione del file %s" -#: src/truncate.c:231 +#: src/truncate.c:230 #, c-format msgid "failed to truncate %s at %<PRIdMAX> bytes" msgstr "troncamento di %s a %<PRIdMAX> byte non riuscito" -#: src/truncate.c:305 +#: src/truncate.c:303 #, c-format msgid "multiple relative modifiers specified" msgstr "specificati modificatori multipli relativi" -#: src/truncate.c:335 +#: src/truncate.c:333 #, c-format msgid "you must specify either %s or %s" msgstr "è necessario specificare uno tra %s o %s" -#: src/truncate.c:342 +#: src/truncate.c:340 #, c-format msgid "you must specify a relative %s with %s" msgstr "è necessario specificare un %s relativo con %s" -#: src/truncate.c:349 +#: src/truncate.c:347 #, c-format msgid "%s was specified but %s was not" msgstr "era specificato %s ma non %s" -#: src/truncate.c:400 +#: src/truncate.c:404 #, c-format msgid "cannot open %s for writing" msgstr "impossibile aprire %s per la scrittura" @@ -12002,17 +12336,17 @@ msgid "cannot get system name" msgstr "impossibile recuperare il nome 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" -"\n" msgstr "" "Converte gli spazi in tabulazioni in ogni FILE e scrive sullo standard " "output.\n" "Senza FILE, o quando FILE è -, legge lo standard input.\n" "\n" -#: src/unexpand.c:125 +#: src/unexpand.c:124 msgid "" " -a, --all convert all blanks, instead of just initial blanks\n" " --first-only convert only leading sequences of blanks (overrides -a)\n" @@ -12028,12 +12362,12 @@ msgstr "" " -t, --tabs=ELENCO usa un ELENCO di posizioni di tabulazione separate da " "virgola (abilita -a)\n" -#: src/unexpand.c:153 +#: src/unexpand.c:152 #, c-format msgid "tabs are too far apart" msgstr "i tabulatori sono troppo grandi" -#: src/unexpand.c:505 +#: src/unexpand.c:504 #, c-format msgid "tab stop value is too large" msgstr "il valore della posizione del tabulatore è troppo grande" @@ -12044,12 +12378,12 @@ msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n" msgstr "Uso: %s [OPZIONE]... [INPUT [OUTPUT]]\n" #: src/uniq.c:138 +#, fuzzy 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" -"\n" msgstr "" "Filtra righe adiacenti corrispondenti da INPUT (o dallo standard input),\n" "scrivendo su OUTPUT (o sullo standard output).\n" @@ -12057,7 +12391,7 @@ msgstr "" "Senza opzioni, le righe corrispondenti sono unite alla prima occorrenza.\n" "\n" -#: src/uniq.c:148 +#: src/uniq.c:147 msgid "" " -c, --count prefix lines by the number of occurrences\n" " -d, --repeated only print duplicate lines\n" @@ -12066,7 +12400,7 @@ msgstr "" "riga\n" " -d, --repeated stampa solo le righe duplicate\n" -#: src/uniq.c:152 +#: src/uniq.c:151 msgid "" " -D, --all-repeated[=delimit-method] print all duplicate lines\n" " delimit-method={none(default),prepend,separate}\n" @@ -12088,11 +12422,11 @@ msgstr "" " -z, --zero-terminated termina le righe con il byte \"0\", non con il " "ritorno a capo\n" -#: src/uniq.c:162 +#: src/uniq.c:161 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:167 +#: src/uniq.c:166 msgid "" "\n" "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n" @@ -12103,7 +12437,7 @@ msgstr "" "caratteri\n" "non spazi. I campi vengono saltati prima dei caratteri.\n" -#: src/uniq.c:172 +#: src/uniq.c:171 #, fuzzy msgid "" "\n" @@ -12116,24 +12450,24 @@ 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:359 +#: src/uniq.c:358 #, c-format msgid "too many repeated lines" msgstr "troppe righe ripetute" -#: src/uniq.c:522 +#: src/uniq.c:521 msgid "invalid number of fields to skip" msgstr "numero di campi da saltare non valido" -#: src/uniq.c:531 +#: src/uniq.c:530 msgid "invalid number of bytes to skip" msgstr "numero di byte da saltare non valido" -#: src/uniq.c:540 +#: src/uniq.c:539 msgid "invalid number of bytes to compare" msgstr "numero di byte da confrontare non valido" -#: src/uniq.c:559 +#: src/uniq.c:558 #, c-format msgid "printing all duplicated lines and repeat counts is meaningless" msgstr "" @@ -12188,6 +12522,11 @@ msgid_plural "up %ld days %2d:%02d, " msgstr[0] "attivo %ld giorno %2d.%02d, " msgstr[1] "attivo %ld giorni %2d.%02d, " +#: src/uptime.c:149 +#, fuzzy, c-format +msgid "up %2d:%02d, " +msgstr "attivo %ld giorno %2d.%02d, " + #: src/uptime.c:151 #, c-format msgid "%lu user" @@ -12289,39 +12628,39 @@ msgstr "" msgid " old " msgstr " fa " -#: src/who.c:449 +#: src/who.c:440 msgid "system boot" msgstr "avvio di sistema" -#: src/who.c:456 src/who.c:458 +#: src/who.c:447 src/who.c:449 msgid "id=" msgstr "id=" -#: src/who.c:471 src/who.c:476 +#: src/who.c:462 src/who.c:467 msgid "term=" msgstr "term=" -#: src/who.c:473 src/who.c:477 +#: src/who.c:464 src/who.c:468 msgid "exit=" msgstr "exit=" -#: src/who.c:494 +#: src/who.c:485 msgid "LOGIN" msgstr "ACCESSO" -#: src/who.c:514 +#: src/who.c:505 msgid "clock change" msgstr "cambio orario" -#: src/who.c:526 src/who.c:527 +#: src/who.c:517 src/who.c:518 msgid "run-level" msgstr "run-level" -#: src/who.c:530 src/who.c:531 +#: src/who.c:521 src/who.c:522 msgid "last=" msgstr "last=" -#: src/who.c:562 +#: src/who.c:553 #, c-format msgid "" "\n" @@ -12330,45 +12669,45 @@ msgstr "" "\n" "# utenti=%lu\n" -#: src/who.c:568 +#: src/who.c:559 msgid "NAME" msgstr "NOME" -#: src/who.c:568 +#: src/who.c:559 msgid "LINE" msgstr "LINEA" -#: src/who.c:568 +#: src/who.c:559 msgid "TIME" msgstr "ORA" -#: src/who.c:568 +#: src/who.c:559 msgid "IDLE" msgstr "INATTIVO" -#: src/who.c:569 +#: src/who.c:560 msgid "PID" msgstr "PID" -#: src/who.c:569 +#: src/who.c:560 msgid "COMMENT" msgstr "COMMENTO" -#: src/who.c:569 +#: src/who.c:560 msgid "EXIT" msgstr "USCITA" -#: src/who.c:649 +#: src/who.c:640 #, c-format msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n" msgstr "Uso: %s [OPZIONE]... [ FILE | ARG1 ARG2 ]\n" -#: src/who.c:650 +#: src/who.c:641 msgid "Print information about users who are currently logged in.\n" msgstr "" "Stampa le informazioni sugli utenti che sono attualmente nel sistema.\n" -#: src/who.c:653 +#: src/who.c:644 msgid "" "\n" " -a, --all same as -b -d --login -p -r -t -T -u\n" @@ -12382,11 +12721,11 @@ msgstr "" " -d, --dead stampa i processi morti\n" " -H, --heading stampa la riga di intestazione delle colonne\n" -#: src/who.c:660 +#: src/who.c:651 msgid " -l, --login print system login processes\n" msgstr " -l, --login stampa i processi di accesso del sistema\n" -#: src/who.c:663 +#: src/who.c:654 msgid "" " --lookup attempt to canonicalize hostnames via DNS\n" " -m only hostname and user associated with stdin\n" @@ -12396,7 +12735,7 @@ msgstr "" " -m solo il nome host e l'utente associato a stdin\n" " -p, --process stampa i processi attivi figli di init\n" -#: src/who.c:668 +#: src/who.c:659 msgid "" " -q, --count all login names and number of users logged on\n" " -r, --runlevel print current runlevel\n" @@ -12408,7 +12747,7 @@ msgstr "" " -s, --short stampa solo il nome, la riga e l'orario (predefinito)\n" " -t, --time stampa l'ultima modifica dell'orologio di sistema\n" -#: src/who.c:674 +#: src/who.c:665 msgid "" " -T, -w, --mesg add user's message status as +, - or ?\n" " -u, --users list users logged in\n" @@ -12421,7 +12760,7 @@ msgstr "" " --message come -T\n" " --writable come -T\n" -#: src/who.c:682 +#: src/who.c:673 #, fuzzy, c-format msgid "" "\n" @@ -12466,20 +12805,23 @@ 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 " gid=%s" -#~ msgstr " gid=%lu" +#~ msgid " returning value: '%s'\n" +#~ msgstr "creazione di %s\n" #, fuzzy -#~ msgid " euid=%s" -#~ msgstr " euid=%lu" +#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n" +#~ msgstr "Uso: %s [OPZIONE]... [UTENTE]...\n" -#~ msgid "" -#~ "Usage: %s NAME\n" -#~ " or: %s OPTION\n" -#~ msgstr "" -#~ "Uso: %s NOME\n" -#~ " o: %s OPZIONE\n" +#, fuzzy +#~ msgid "no valid suffix found\n" +#~ msgstr "%s: lunghezza del suffisso non valida" #~ msgid "" #~ "\n" @@ -12492,20 +12834,175 @@ msgstr "" #~ " %s /usr/bin/sort Stampa \"sort\".\n" #~ " %s include/stdio.h .h Stampa \"stdio\".\n" +#~ msgid "reading %s" +#~ msgstr "lettura di %s" + +#~ msgid "writing %s" +#~ msgstr "scrittura di %s" + +#~ msgid "closing %s" +#~ msgstr "chiusura di %s" + +#~ msgid "accessing %s" +#~ msgstr "accesso a %s" + +#~ msgid "opening %s" +#~ msgstr "apertura di %s" + +#~ msgid "" +#~ "Usage: %s NAME\n" +#~ " or: %s OPTION\n" +#~ msgstr "" +#~ "Uso: %s NOME\n" +#~ " o: %s OPZIONE\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 salta le directory su file system diversi\n" +#~ " -X, --exclude-from=FILE esclude i file che corrispondono a uno " +#~ "qualsiasi dei modelli in FILE\n" +#~ " --exclude=MODELLO esclude i file che corrispondono a MODELLO\n" +#~ " -d, --max-depth=N stampa il totale per una directory (o file, con --" +#~ "all)\n" +#~ " solo se è N o meno livelli sotto l'argomento " +#~ "della riga\n" +#~ " di comando; --max-depth=0 è lo stesso che --" +#~ "summarize\n" + #, fuzzy -#~ msgid "Usage: %s [OPTION] FILE...\n" -#~ msgstr "Uso: %s [OPZIONE]... FILE...\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 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" + +#~ msgid "" +#~ "WARNING: --page-increment is deprecated; use --line-increment instead" +#~ msgstr "" +#~ "ATTENZIONE: --page-increment è deprecato; usare invece --line-increment" + +#~ msgid "All arguments to long options are mandatory for short options.\n" +#~ msgstr "" +#~ "Tutti gli argomenti per le opzioni lunghe sono obbligatori per quelle " +#~ "corte.\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" +#~ "RADICE è d per decimale, o per ottale, x per esadecimale o n per " +#~ "nessuna.\n" +#~ "BYTE è esadecimale con il prefisso 0x or 0X, e può avere un suffisso " +#~ "moltiplicatore:\n" +#~ "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" +#~ "Aggiungendo un suffisso z a ogni tipo mostra i caratteri stampabili alla " +#~ "fine di ciascuna\n" +#~ "riga di output.\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 "" +#~ "L'opzione --string senza un numero implica 3; l'opzione --width senza un " +#~ "numero\n" +#~ "implica 32. In modo predefinito, od usa -A o -t d2 -w16.\n" + +#~ msgid "Usage: %s [OPTION]... FILE\n" +#~ msgstr "Uso: %s [OPZIONE]... FILE\n" + +#~ msgid "Password:" +#~ msgstr "Password:" + +#~ msgid "getpass: cannot open /dev/tty" +#~ msgstr "getpass: impossibile aprire /dev/tty" + +#~ msgid "cannot set groups" +#~ msgstr "impossibile impostare i gruppi" + +#~ 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" + +#~ 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 gli id utente e di gruppo efficaci in quelli di UTENTE.\n" +#~ "\n" +#~ " -, -l, --login rende la shell una shell di accesso\n" +#~ " -c, --commmand=COMANDO passa con -c un COMANDO singolo alla " +#~ "shell\n" +#~ " -f, --fast passa -f alla shell (per csh o tcsh)\n" +#~ " -m, --preserve-environment non reinizializza le variabili d'ambiente\n" +#~ " -p come -m\n" +#~ " -s, --shell=SHELL esegue SHELL se /etc/shells lo permette\n" + +#~ msgid "" +#~ "\n" +#~ "A mere - implies -l. If USER not given, assume root.\n" +#~ msgstr "" +#~ "\n" +#~ "Un semplice - implica -l. Se UTENTE non è specificato, assume root.\n" + +#~ msgid "user %s does not exist" +#~ msgstr "l'utente %s non esiste" + +#~ msgid "incorrect password" +#~ msgstr "password sbagliata" + +#~ msgid "using restricted shell %s" +#~ msgstr "viene usata la shell ristretta %s" + +#~ 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" -#~ " --dereference affect the referent of each symbolic link (this " -#~ "is\n" -#~ " the default), rather than the symbolic link " -#~ "itself\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 " @@ -12517,6 +13014,14 @@ msgstr "" #~ " 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" @@ -12544,14 +13049,6 @@ msgstr "" #~ " -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" @@ -12606,25 +13103,23 @@ msgstr "" #~ " -v, --verbose mostra una diagnostica per ogni file elaborato\n" #~ "\n" -#, fuzzy -#~ msgid "Usage: %s [OPTION]... PATH START\n" -#~ msgstr "Uso: %s [OPZIONE]... SET1 [SET2]\n" - -#, fuzzy #~ msgid "" -#~ " -n, --no-newline do not output the trailing " -#~ "newline\n" -#~ " " +#~ "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 "" -#~ "Stampa la STRINGA (o le stringhe) sullo standard output.\n" +#~ "Visualizza l'orario corrente nel FORMATO dato, o imposta la data di " +#~ "sistema.\n" #~ "\n" -#~ " -n non stampa il ritorno a capo finale\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" -#, fuzzy #~ msgid "" #~ "\n" -#~ "SIZE is an integer with an optional suffix (example: 10MB). Suffixes " -#~ "are:\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 "" @@ -12633,18 +13128,5 @@ msgstr "" #~ "KB 1000, K 1024, MB 1000*1000, M 1024*1024, e così via per G, T, P, E, Z " #~ "e 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 "" -#~ "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 "cannot create link %s" #~ msgstr "impossibile creare il collegamento %s" diff --git a/po/ja.gmo b/po/ja.gmo index 7e698af6..be439979 100644 Binary files a/po/ja.gmo and b/po/ja.gmo differ diff --git a/po/ja.po b/po/ja.po index d76b1fb1..e8c99452 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: 2012-05-10 19:35+0200\n" +"POT-Creation-Date: 2013-02-14 15:56+0000\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,19 +38,19 @@ msgstr "有効な引数:" msgid "error closing file" msgstr "ファイルクローズエラー" -#: lib/closeout.c:112 src/base64.c:109 src/base64.c:121 src/base64.c:127 -#: src/base64.c:168 src/base64.c:224 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:330 src/expand.c:355 src/head.c:298 -#: src/head.c:348 src/head.c:756 src/head.c:797 src/mktemp.c:350 src/od.c:919 -#: src/paste.c:160 src/shuf.c:369 src/split.c:727 src/split.c:964 -#: src/split.c:969 src/tail.c:350 src/tail.c:1201 src/tail.c:1307 +#: 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 -#: src/unexpand.c:427 src/unexpand.c:443 +#: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "書き込みエラー" -#: lib/copy-acl.c:611 src/copy.c:1160 src/copy.c:2602 +#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617 #, c-format msgid "preserving permissions for %s" msgstr "%s のパーミッションを保存しています" @@ -242,18 +242,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:483 +#: lib/mkdir-p.c:196 src/install.c:484 #, c-format msgid "cannot change permissions of %s" msgstr "%s のパーミッションを変更できません" -#: lib/mkdir-p.c:206 src/copy.c:2261 src/install.c:709 src/install.c:722 +#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722 #, 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:915 src/tac.c:435 +#: src/split.c:929 src/tac.c:434 #, c-format msgid "memory exhausted" msgstr "メモリを使い果たしました" @@ -302,75 +302,75 @@ msgstr "'" msgid "%s: end of file" msgstr "%s: ファイル終了 (EOF)" -#: lib/regcomp.c:130 +#: lib/regcomp.c:131 msgid "Success" msgstr "成功" -#: lib/regcomp.c:133 +#: lib/regcomp.c:134 msgid "No match" msgstr "一致しません" -#: lib/regcomp.c:136 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "無効な正規表現です" -#: lib/regcomp.c:139 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "無効な照合文字です" -#: lib/regcomp.c:142 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "無効な文字クラス名です" -#: lib/regcomp.c:145 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "終端のバックスラッシュ" -#: lib/regcomp.c:148 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "無効な前方参照です" -#: lib/regcomp.c:151 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "[ または [^ が不一致です" -#: lib/regcomp.c:154 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "( または \\( が不一致です" -#: lib/regcomp.c:157 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "\\{ が不一致です" -#: lib/regcomp.c:160 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "\\{\\} の中身が無効です" -#: lib/regcomp.c:163 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "無効な範囲終了です" -#: lib/regcomp.c:166 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "メモリを使い果たしました" -#: lib/regcomp.c:169 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "無効な前方正規表現です" -#: lib/regcomp.c:172 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "正規表現が途中で終了しました" -#: lib/regcomp.c:175 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "正規表現が大きすぎます" -#: lib/regcomp.c:178 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr ") または \\) が不一致です" -#: lib/regcomp.c:703 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "以前に正規表現がありません" @@ -410,7 +410,7 @@ msgstr "^[yY]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-mode-acl.c:695 src/copy.c:2284 src/cp.c:518 +#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516 #, c-format msgid "setting permissions for %s" msgstr "%s のパーミッションを設定します" @@ -551,13 +551,13 @@ msgstr "電源エラー" msgid "Resource lost" msgstr "リソースが無くなりました" -#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262 -#: lib/spawn-pipe.c:265 +#: 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:232 lib/spawn-pipe.c:346 lib/wait-process.c:282 +#: 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" @@ -573,24 +573,24 @@ msgstr "リアルタイムシグナル %d" msgid "Unknown signal %d" msgstr "不明なシグナル %d" -#: lib/unicodeio.c:103 +#: lib/unicodeio.c:102 msgid "iconv function not usable" msgstr "iconv 関数が使えません" -#: lib/unicodeio.c:105 +#: lib/unicodeio.c:104 msgid "iconv function not available" msgstr "iconv 関数が有効ではありません" -#: lib/unicodeio.c:112 +#: lib/unicodeio.c:111 msgid "character out of range" msgstr "範囲外の文字" -#: lib/unicodeio.c:182 +#: lib/unicodeio.c:181 #, c-format msgid "cannot convert U+%04X to local character set" msgstr "U+%04X をローカル文字セットに変換できません" -#: lib/unicodeio.c:184 +#: lib/unicodeio.c:183 #, c-format msgid "cannot convert U+%04X to local character set: %s" msgstr "U+%04X をローカル文字セット %s に変換できません" @@ -773,7 +773,7 @@ msgstr "" msgid "Report %s bugs to: %s\n" msgstr "%s のバグは <%s> に報告してください。\n" -#: lib/version-etc.c:251 src/system.h:562 +#: lib/version-etc.c:251 src/system.h:573 #, c-format msgid "%s home page: <%s>\n" msgstr "%s のホームページ: <%s>\n" @@ -783,7 +783,7 @@ 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:563 +#: lib/version-etc.c:256 src/system.h:574 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" "GNU ソフトウェアを使用する際の一般的なヘルプ: <http://www.gnu.org/gethelp/>\n" @@ -870,18 +870,17 @@ msgid "Simon Josefsson" msgstr "Simon Josefsson" #: src/base64.c:60 -#, c-format +#, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" "Base64 encode or decode FILE, or standard input, to standard output.\n" -"\n" msgstr "" "使用法: %s [オプション]... [ファイル]\n" "ファイルまたは標準入力を Base64 エンコード・デコードして標準出力に出力しま" "す。\n" "\n" -#: src/base64.c:64 +#: src/base64.c:67 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -896,7 +895,7 @@ msgstr "" " 0 を指定した場合、改行を行わない\n" "\n" -#: src/base64.c:73 src/cat.c:110 src/fmt.c:293 src/shuf.c:71 src/sum.c:70 +#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -904,7 +903,7 @@ msgstr "" "\n" "ファイルの指定がなかったり, - であった場合, 標準入力から読み込みます.\n" -#: src/base64.c:76 +#: src/base64.c:79 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -918,37 +917,37 @@ msgstr "" "場合があります。入力ストリームに他の非英字バイトが含まれていて回復\n" "したい場合は --ignore-garbage を使用してください。\n" -#: src/base64.c:171 src/base64.c:208 src/csplit.c:263 src/csplit.c:1435 -#: src/join.c:451 src/shuf.c:157 src/shuf.c:361 src/tac-pipe.c:74 +#: 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 #, c-format msgid "read error" msgstr "読み込みエラー" -#: src/base64.c:227 +#: src/base64.c:230 #, c-format msgid "invalid input" msgstr "無効な入力" -#: src/base64.c:264 +#: src/base64.c:267 #, c-format msgid "invalid wrap size: %s" msgstr "無効な折り返し列数: %s" -#: src/base64.c:283 src/basename.c:173 src/comm.c:435 src/cp.c:607 -#: src/date.c:441 src/dircolors.c:447 src/du.c:894 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:169 src/install.c:929 src/join.c:961 -#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:157 src/mv.c:447 -#: src/od.c:1802 src/ptx.c:2081 src/readlink.c:154 src/seq.c:408 -#: src/shuf.c:320 src/shuf.c:339 src/sort.c:4477 src/split.c:1313 -#: src/tr.c:1797 src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:454 -#: src/uniq.c:471 src/unlink.c:81 src/uptime.c:250 src/users.c:146 -#: src/wc.c:666 src/who.c:836 src/whoami.c:79 +#: 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 #, c-format msgid "extra operand %s" msgstr "余分な演算子 %s" -#: src/base64.c:315 src/cat.c:781 +#: src/base64.c:318 src/cat.c:781 #, c-format msgid "closing standard input" msgstr "標準入力を閉じています" @@ -956,15 +955,15 @@ 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/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:53 src/env.c:33 +#: 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/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:65 src/su.c:88 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 +#: 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 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -978,23 +977,23 @@ msgstr "" "または: %s オプション\n" #: src/basename.c:53 +#, fuzzy msgid "" "Print NAME with any leading directory components removed.\n" "If specified, also remove a trailing SUFFIX.\n" -"\n" msgstr "" "パス名からディレクトリ部分を取りのぞいた名前を表示します。\n" "指定があれば、末尾の接尾辞も取り除きます。\n" "\n" -#: src/basename.c:59 +#: 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" msgstr "" -#: src/basename.c:66 +#: src/basename.c:67 #, c-format msgid "" "\n" @@ -1005,20 +1004,21 @@ msgid "" " %s -a any/str1 any/str2 -> \"str1\" followed by \"str2\"\n" msgstr "" -#: src/basename.c:167 src/chcon.c:531 src/chgrp.c:277 src/chmod.c:526 -#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1369 +#: 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:183 src/mkfifo.c:108 src/mknod.c:146 src/nohup.c:111 -#: src/pathchk.c:148 src/printf.c:674 src/readlink.c:146 src/realpath.c:236 -#: src/rm.c:314 src/rmdir.c:223 src/seq.c:402 src/setuidgid.c:137 -#: src/sleep.c:119 src/stat.c:1476 src/stdbuf.c:346 src/tr.c:1782 +#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 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 #, 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:52 src/split.c:49 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/split.c:49 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" @@ -1028,8 +1028,8 @@ msgstr "Torbjorn Granlund" msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:846 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4720 src/nl.c:182 src/paste.c:435 src/pr.c:2768 src/sum.c:58 +#: 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/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 +1088,7 @@ msgstr "" msgid "cannot do ioctl on %s" msgstr "%s で ioctl を実行できません" -#: src/cat.c:637 src/dd.c:2209 src/sort.c:379 src/tee.c:165 src/yes.c:86 +#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86 #, c-format msgid "standard output" msgstr "標準出力" @@ -1105,14 +1105,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:55 src/head.c:46 src/hostid.c:33 +#: 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 msgid "Jim Meyering" msgstr "Jim Meyering" -#: src/chcon.c:100 src/runcon.c:203 src/runcon.c:234 +#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238 #, c-format msgid "failed to create security context: %s" msgstr "セキュリティコンテキストの作成に失敗しました: %s" @@ -1122,8 +1122,8 @@ msgstr "セキュリティコンテキストの作成に失敗しました: %s" msgid "failed to set %s security context component to %s" msgstr "%s セキュリティコンテキストコンポーネントを %s に設定出来ませんでした" -#: src/chcon.c:156 src/chcon.c:540 src/copy.c:2222 src/runcon.c:217 -#: src/stat.c:683 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221 +#: src/stat.c:702 #, c-format msgid "failed to get security context of %s" msgstr "%s のセキュリティコンテキストを取得できませんでした" @@ -1140,12 +1140,12 @@ 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:446 src/ls.c:2981 +#: src/du.c:457 src/ls.c:2981 #, c-format msgid "cannot access %s" msgstr "%s にアクセスできません" -#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:426 +#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437 #, c-format msgid "cannot read directory %s" msgstr "ディレクトリ %s を読み込めません" @@ -1155,13 +1155,13 @@ 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:599 +#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562 #, 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:618 -#: src/remove.c:613 +#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642 +#: src/remove.c:576 #, c-format msgid "fts_close failed" msgstr "fts_close に失敗しました" @@ -1183,7 +1183,6 @@ msgid "" "Change the security context of each FILE to CONTEXT.\n" "With --reference, change the security context of each FILE to that of " "RFILE.\n" -"\n" msgstr "" "各 FILE のセキュリティコンテキストを CONTEXT に変更します。\n" "--reference がある場合、各 FILE のセキュリティコンテキストを RFILE のものに\n" @@ -1192,7 +1191,7 @@ msgstr "" " -h, --no-dereference 参照先のファイルの代わりにシンボリックリンクに適用す" "る\n" -#: src/chcon.c:362 src/chgrp.c:123 src/chown.c:94 +#: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94 msgid "" " --dereference affect the referent of each symbolic link (this is\n" " the default), rather than the symbolic link itself\n" @@ -1200,7 +1199,7 @@ msgid "" "file\n" msgstr "" -#: src/chcon.c:367 +#: src/chcon.c:369 #, fuzzy msgid "" " -u, --user=USER set user USER in the target security context\n" @@ -1218,7 +1217,16 @@ msgstr "" " RANGE に設定する\n" "\n" -#: src/chcon.c:373 +#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110 +#, fuzzy +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" + +#: src/chcon.c:379 #, fuzzy msgid "" " --reference=RFILE use RFILE's security context rather than " @@ -1230,15 +1238,15 @@ msgstr "" " -R, --recursive ファイルとディレクトリを再帰的に操作する\n" " -v, --verbose 各ファイルを処理した時の診断を出力する\n" -#: src/chcon.c:377 src/chgrp.c:140 src/chown.c:118 +#: 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:380 +#: src/chcon.c:386 msgid " -v, --verbose output a diagnostic for every file processed\n" msgstr "" -#: src/chcon.c:383 src/chgrp.c:143 src/chown.c:121 +#: src/chcon.c:389 src/chgrp.c:143 src/chown.c:121 #, fuzzy msgid "" "\n" @@ -1264,36 +1272,36 @@ msgstr "" " -P シンボリックリンクを辿らない (デフォルト)\n" "\n" -#: src/chcon.c:512 src/chgrp.c:264 src/chown.c:267 +#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267 #, c-format msgid "-R --dereference requires either -H or -L" msgstr "-R --dereference は -H または -L のいずれかが必要です" -#: src/chcon.c:518 +#: src/chcon.c:524 #, c-format msgid "-R -h requires -P" msgstr "-R -h は -P が必要です" -#: src/chcon.c:533 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282 -#: src/comm.c:429 src/csplit.c:1371 src/join.c:1149 src/link.c:79 -#: src/mknod.c:148 src/setuidgid.c:139 src/tr.c:1785 +#: 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 #, c-format msgid "missing operand after %s" msgstr "%s の後にオペランドがありません" -#: src/chcon.c:556 src/runcon.c:247 +#: src/chcon.c:562 src/runcon.c:251 #, c-format msgid "invalid context: %s" msgstr "無効なコンテキスト: %s" -#: src/chcon.c:563 +#: src/chcon.c:569 #, c-format msgid "conflicting security context specifiers given" msgstr "与えられたセキュリティコンテキスト指定が競合しています" -#: src/chcon.c:572 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:433 src/cp.c:493 -#: src/mv.c:96 src/pwd.c:273 src/rm.c:324 src/touch.c:351 +#: 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 #, c-format msgid "failed to get attributes of %s" msgstr "%s の属性情報を取得できませんでした" @@ -1343,15 +1351,6 @@ msgstr "" " 効果を与える (シンボリックリンクの所有権を変更でき\n" " るシステムでのみ利用可能)\n" -#: src/chgrp.c:132 src/chmod.c:387 src/chown.c:110 -#, fuzzy -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" - #: src/chgrp.c:136 msgid "" " --reference=RFILE use RFILE's group rather than specifying a\n" @@ -1438,8 +1437,13 @@ msgstr "" "る\n" #: src/chmod.c:391 +#, fuzzy 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 msgid " -R, --recursive change files and directories recursively\n" @@ -1610,7 +1614,7 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:97 src/install.c:575 src/setuidgid.c:110 src/setuidgid.c:120 +#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120 #, c-format msgid "invalid group %s" msgstr "無効なグループ %s" @@ -1681,8 +1685,8 @@ msgstr "グループ ID の設定に失敗しました" msgid "failed to set user-ID" msgstr "ユーザー ID の設定に失敗しました" -#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:213 src/stdbuf.c:366 -#: src/timeout.c:402 +#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365 +#: src/timeout.c:454 #, c-format msgid "failed to run command %s" msgstr "コマンド %s の実行に失敗しました" @@ -1801,20 +1805,24 @@ msgstr "複数の区切り文字が指定されました" msgid "empty %s not allowed" msgstr "空の %s は許可されていません" -#: src/copy.c:168 src/dd.c:1609 src/dd.c:1976 +#: 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 #, c-format -msgid "reading %s" -msgstr "%s を読み込んでいます" +msgid "error reading %s" +msgstr "%s の読み込みエラー" -#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:426 +#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425 #, c-format msgid "cannot lseek %s" msgstr "lseek %s をすることができません" -#: src/copy.c:206 src/dd.c:2039 src/dd.c:2102 +#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151 #, c-format -msgid "writing %s" -msgstr "%s を書き込んでいます" +msgid "error writing %s" +msgstr "%s の書き込みエラー" #: src/copy.c:313 #, c-format @@ -1836,7 +1844,7 @@ msgstr "%s の拡張に失敗しました" msgid "clearing permissions for %s" msgstr "%s のパーミッションを消去しています" -#: src/copy.c:697 src/copy.c:2470 src/cp.c:331 +#: src/copy.c:697 src/copy.c:2480 src/cp.c:329 #, c-format msgid "failed to preserve ownership for %s" msgstr "%s の所有者の保護に失敗しました" @@ -1851,14 +1859,14 @@ msgstr "ファイル %s が見つかりませんでした" msgid "failed to preserve authorship for %s" msgstr "%s の作成者の保護に失敗しました" -#: src/copy.c:804 src/csplit.c:638 src/du.c:901 src/fmt.c:449 src/head.c:847 -#: src/sort.c:4489 src/split.c:1329 src/tail.c:1756 src/wc.c:678 +#: 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 "%s を 読み込み用に開くことが出来ません" -#: src/copy.c:810 src/copy.c:972 src/dd.c:1546 src/dd.c:2114 src/dd.c:2252 -#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:141 +#: 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 #, c-format msgid "cannot fstat %s" msgstr "%s を fstat することができません" @@ -1878,14 +1886,14 @@ msgstr "ファイルシステム作成コンテキストの取得に失敗しま msgid "failed to set the security context of %s to %s" msgstr "%s のセキュリティコンテキストを %s に設定できませんでした" -#: src/copy.c:881 src/copy.c:1574 src/copy.c:1777 src/copy.c:1935 src/ln.c:314 -#: src/remove.c:267 src/remove.c:293 src/remove.c:444 src/remove.c:465 +#: 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 #, c-format msgid "cannot remove %s" msgstr "%s を削除できません" -#: src/copy.c:886 src/copy.c:1578 src/copy.c:1772 src/copy.c:1940 -#: src/remove.c:418 +#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945 +#: src/remove.c:375 #, c-format msgid "removed %s\n" msgstr "%s を削除しました\n" @@ -1905,189 +1913,189 @@ msgstr "通常ファイル %s を作成できません" msgid "failed to clone %s from %s" msgstr "%2$s から %1$s への複製に失敗しました" -#: src/copy.c:1098 src/copy.c:2531 +#: src/copy.c:1098 src/copy.c:2541 #, c-format msgid "preserving times for %s" msgstr "%s のタイムスタンプを保存中" -#: src/copy.c:1170 src/copy.c:1176 src/head.c:855 src/touch.c:175 -#: src/truncate.c:413 -#, c-format -msgid "closing %s" -msgstr "%s を閉じています" +#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172 +#: src/truncate.c:417 +#, fuzzy, c-format +msgid "failed to close %s" +msgstr "%s を開けませんでした" -#: src/copy.c:1466 +#: src/copy.c:1471 #, c-format msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? " msgstr "" "%s: %s を上書きしようとしています。モード %04lo (%s) を上書きしますか? " -#: src/copy.c:1473 +#: src/copy.c:1478 #, c-format msgid "%s: overwrite %s? " msgstr "%s: %s を上書きしますか? " -#: src/copy.c:1542 +#: src/copy.c:1547 #, c-format msgid " (backup: %s)" msgstr " (バックアップ: %s)" -#: src/copy.c:1552 +#: src/copy.c:1557 #, c-format msgid "failed to restore the default file creation context" msgstr "デフォルトのファイル作成コンテキストの復元に失敗しました" -#: src/copy.c:1584 +#: src/copy.c:1589 #, c-format msgid "cannot create hard link %s to %s" msgstr "%s から %s へのハードリンクを作成できません" -#: src/copy.c:1637 src/copy.c:1689 src/copy.c:2272 src/copy.c:2589 +#: 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:1220 src/truncate.c:365 +#: src/stat.c:1239 src/truncate.c:363 #, c-format msgid "cannot stat %s" msgstr "%s を stat できません" -#: src/copy.c:1645 +#: src/copy.c:1650 #, c-format msgid "omitting directory %s" msgstr "ディレクトリ %s を省略しています" -#: src/copy.c:1659 +#: src/copy.c:1664 #, c-format msgid "warning: source file %s specified more than once" msgstr "警告: コピー元ファイル %s が複数指定されました" -#: src/copy.c:1707 src/ln.c:246 +#: src/copy.c:1712 src/ln.c:246 #, c-format msgid "%s and %s are the same file" msgstr "%s と %s は同じファイルです" -#: src/copy.c:1806 +#: src/copy.c:1811 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "ディレクトリではない %s をディレクトリ %s で上書きすることはできません" -#: src/copy.c:1824 src/ln.c:214 +#: src/copy.c:1829 src/ln.c:214 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "たった今作成した %s には %s で上書きしません" -#: src/copy.c:1842 +#: src/copy.c:1847 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "ディレクトリ %s をディレクトリ以外で上書きできません" -#: src/copy.c:1856 +#: src/copy.c:1861 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "ディレクトリをディレクトリ以外に移動できません: %s -> %s" -#: src/copy.c:1886 +#: src/copy.c:1891 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "%s をバックアップすると元ファイルが壊れます -- %s を移動しませんでした" -#: src/copy.c:1887 +#: src/copy.c:1892 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "" "%s をバックアップすると元ファイルが壊れます -- %s をコピーしませんでした" -#: src/copy.c:1910 src/ln.c:276 +#: src/copy.c:1915 src/ln.c:276 #, c-format msgid "cannot backup %s" msgstr "%s をバックアップできません" -#: src/copy.c:1974 +#: src/copy.c:1979 #, c-format msgid "will not copy %s through just-created symlink %s" msgstr "" "たった今作成したシンボリックリンク %2$s を通して %1$s をコピーできません" -#: src/copy.c:2051 +#: src/copy.c:2056 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "ディレクトリ %s を自分自身 %s にコピーできません" -#: src/copy.c:2068 +#: src/copy.c:2073 #, c-format msgid "will not create hard link %s to directory %s" msgstr "%s からディレクトリ %s へのハードリンクを作成できません" -#: src/copy.c:2118 +#: src/copy.c:2123 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "%s を自分自身のサブディレクトリ %s に移動できません" -#: src/copy.c:2161 +#: src/copy.c:2166 #, c-format msgid "cannot move %s to %s" msgstr "%s から %s へ移動できません" -#: src/copy.c:2173 +#: src/copy.c:2178 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "デバイス間移動失敗: %s から %s 。移動先を削除できません" -#: src/copy.c:2207 src/install.c:905 src/mkdir.c:189 src/mkfifo.c:114 -#: src/mknod.c:167 +#: 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:2241 +#: src/copy.c:2246 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "循環するシンボリックリンク %s はコピーできません" -#: src/copy.c:2350 +#: src/copy.c:2355 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "%s: カレントディレクトリ上でのみ相対シンボリックリンクができます" -#: src/copy.c:2357 +#: src/copy.c:2362 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "%s から %s へのシンボリックリンクを作成できません" -#: src/copy.c:2406 src/mkfifo.c:133 +#: src/copy.c:2416 src/mkfifo.c:132 #, c-format msgid "cannot create fifo %s" msgstr "fifo %s を作成できません" -#: src/copy.c:2415 +#: src/copy.c:2425 #, c-format msgid "cannot create special file %s" msgstr "特殊ファイル %s を作成できません" -#: src/copy.c:2426 src/ls.c:3191 src/stat.c:902 +#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921 #, c-format msgid "cannot read symbolic link %s" msgstr "シンボリックリンク %s を読み込めません" -#: src/copy.c:2453 +#: src/copy.c:2463 #, c-format msgid "cannot create symbolic link %s" msgstr "シンボリックリンク %s を作成できません" -#: src/copy.c:2485 +#: src/copy.c:2495 #, c-format msgid "%s has unknown file type" msgstr "%s のファイルタイプが不明です" -#: src/copy.c:2629 src/ln.c:358 +#: src/copy.c:2644 src/ln.c:358 #, c-format msgid "cannot un-backup %s" msgstr "%s を復元できません" -#: src/copy.c:2633 +#: src/copy.c:2648 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (復元)\n" -#: src/cp.c:156 src/mv.c:284 +#: src/cp.c:156 src/mv.c:286 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -2099,25 +2107,13 @@ msgstr "" "または: %s [OPTION]... -t DIRECTORY SOURCE...\n" #: src/cp.c:162 -msgid "" -"Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" -"\n" +#, fuzzy +msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" msgstr "" "SOURCE から DEST へ、または複数の SOURCE を DIRECTORY へコピーします。\n" "\n" -#: src/cp.c:166 src/csplit.c:1458 src/cut.c:197 src/df.c:852 src/du.c:268 -#: src/expand.c:112 src/fmt.c:275 src/fold.c:75 src/head.c:115 -#: src/install.c:612 src/kill.c:86 src/ln.c:392 src/ls.c:4726 src/mkdir.c:61 -#: src/mkfifo.c:56 src/mknod.c:58 src/mv.c:294 src/nl.c:191 src/paste.c:445 -#: src/pr.c:2777 src/ptx.c:1825 src/shred.c:153 src/shuf.c:58 src/sort.c:399 -#: src/split.c:211 src/stdbuf.c:95 src/tac.c:142 src/tail.c:268 -#: src/touch.c:226 src/truncate.c:107 src/unexpand.c:122 src/uniq.c:145 -msgid "" -"Mandatory arguments to long options are mandatory for short options too.\n" -msgstr "長いオプションに必須の引数は短いオプションにも必須です。\n" - -#: src/cp.c:169 +#: src/cp.c:168 msgid "" " -a, --archive same as -dR --preserve=all\n" " --attributes-only don't copy the file data, just the " @@ -2139,12 +2135,14 @@ msgstr "" " --copy-contents 再帰時に特殊ファイルの内容をコピーする\n" " -d --no-dereference --preserve=links と同様\n" -#: src/cp.c:178 +#: src/cp.c:177 +#, fuzzy msgid "" " -f, --force if an existing destination file cannot be\n" -" opened, remove it and try again (redundant " -"if\n" -" the -n option is used)\n" +" opened, remove it and try again (this " +"option\n" +" is ignored when the -n option is also " +"used)\n" " -i, --interactive prompt before overwrite (overrides a previous " "-n\n" " option)\n" @@ -2161,7 +2159,7 @@ msgstr "" " -H SOURCE にあるコマンド行のシンボリックリンクを" "たどる\n" -#: src/cp.c:188 +#: src/cp.c:186 msgid "" " -l, --link hard link files instead of copying\n" " -L, --dereference always follow symbolic links in SOURCE\n" @@ -2170,7 +2168,7 @@ msgstr "" "る\n" " -L, --dereference SOURCE にあるシンボリックリンクを常にたどる\n" -#: src/cp.c:192 +#: src/cp.c:190 msgid "" " -n, --no-clobber do not overwrite an existing file (overrides\n" " a previous -i option)\n" @@ -2181,7 +2179,7 @@ msgstr "" " -P, --no-dereference SOURCE にあるシンボリックリンクを決してたどら" "ない\n" -#: src/cp.c:197 +#: src/cp.c:195 msgid "" " -p same as --preserve=mode,ownership,timestamps\n" " --preserve[=ATTR_LIST] preserve the specified attributes (default:\n" @@ -2197,7 +2195,7 @@ msgstr "" "links, \n" " xattr, all\n" -#: src/cp.c:205 +#: src/cp.c:203 msgid "" " --no-preserve=ATTR_LIST don't preserve the specified attributes\n" " --parents use full source file name under DIRECTORY\n" @@ -2206,7 +2204,7 @@ msgstr "" " --parents DIRECTORY 配下で SOURCE ファイルのフルパス名を" "使用する\n" -#: src/cp.c:209 +#: src/cp.c:207 msgid "" " -R, -r, --recursive copy directories recursively\n" " --reflink[=WHEN] control clone/CoW copies. See below\n" @@ -2220,7 +2218,7 @@ msgstr "" "する\n" " (--force と対照的)\n" -#: src/cp.c:215 +#: src/cp.c:213 msgid "" " --sparse=WHEN control creation of sparse files. See below\n" " --strip-trailing-slashes remove any trailing slashes from each " @@ -2232,7 +2230,7 @@ msgstr "" "除\n" " する\n" -#: src/cp.c:220 +#: src/cp.c:218 msgid "" " -s, --symbolic-link make symbolic links instead of copying\n" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -2246,7 +2244,7 @@ msgstr "" "る\n" " -T, --no-target-directory DEST を通常ファイルとして扱う\n" -#: src/cp.c:226 +#: src/cp.c:224 msgid "" " -u, --update copy only when the SOURCE file is newer\n" " than the destination file or when the\n" @@ -2260,7 +2258,7 @@ msgstr "" " -v, --verbose 実行していることを説明する\n" " -x, --one-file-system このファイルシステムだけで実行する\n" -#: src/cp.c:235 +#: src/cp.c:233 msgid "" "\n" "By default, sparse SOURCE files are detected by a crude heuristic and the\n" @@ -2288,7 +2286,7 @@ msgstr "" "場合、または --reflink=auto が指定された場合、通常のコピーにフェイル\n" "バックされます。\n" -#: src/cp.c:247 src/install.c:649 src/ln.c:421 src/mv.c:321 +#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322 #, fuzzy msgid "" "\n" @@ -2306,7 +2304,7 @@ msgstr "" "を通して選択できます。以下がその際の値です:\n" "\n" -#: src/cp.c:254 src/install.c:656 src/mv.c:328 +#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329 msgid "" " none, off never make backups (even if --backup is given)\n" " numbered, t make numbered backups\n" @@ -2319,7 +2317,7 @@ msgstr "" " そうでなければ、simple で作成する\n" " simple, never 常に簡易バックアップを作成\n" -#: src/cp.c:260 +#: src/cp.c:258 msgid "" "\n" "As a special case, cp makes a backup of SOURCE when the force and backup\n" @@ -2330,92 +2328,92 @@ msgstr "" "特別な場合として、cp は -f と -b オプションが与えられ、SOURCE と DEST が\n" "同一ファイルである時は、SOURCE のバックアップを作成します。\n" -#: src/cp.c:319 +#: src/cp.c:317 #, c-format msgid "failed to preserve times for %s" msgstr "%s のタイムスタンプの保護に失敗しました" -#: src/cp.c:350 +#: src/cp.c:348 #, c-format msgid "failed to preserve permissions for %s" msgstr "%s のパーミッションの保護に失敗しました" -#: src/cp.c:477 +#: src/cp.c:475 #, c-format msgid "cannot make directory %s" msgstr "ディレクトリ %s を作成できません" -#: src/cp.c:526 src/cp.c:545 +#: src/cp.c:524 src/cp.c:543 #, c-format msgid "%s exists but is not a directory" msgstr "%s は存在しますがディレクトリではありません" -#: src/cp.c:572 src/cp.c:1068 src/install.c:401 src/install.c:844 src/ln.c:123 -#: src/ln.c:181 src/ln.c:202 src/ln.c:516 src/mv.c:152 src/mv.c:399 -#, c-format -msgid "accessing %s" -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 +#, fuzzy, c-format +msgid "failed to access %s" +msgstr "%s を開けませんでした" -#: src/cp.c:592 src/install.c:914 src/ln.c:546 src/mv.c:432 src/shred.c:1182 -#: src/touch.c:433 src/truncate.c:356 +#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181 +#: src/touch.c:429 src/truncate.c:354 #, c-format msgid "missing file operand" msgstr "ファイルオペランドがありません" -#: src/cp.c:594 src/install.c:916 src/ln.c:560 src/mv.c:434 +#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436 #, c-format msgid "missing destination file operand after %s" msgstr "%s の後に宛先のファイルオペランドがありません" -#: src/cp.c:603 src/install.c:925 src/mv.c:443 +#: src/cp.c:601 src/install.c:926 src/mv.c:445 #, c-format msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)" msgstr "" "--target-directory (-t) と --no-target-directory (-T) を同時に指定できません" -#: src/cp.c:619 src/cp.c:1070 src/install.c:403 src/install.c:846 -#: src/install.c:938 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:401 -#: src/mv.c:457 +#: 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 #, c-format msgid "target %s is not a directory" msgstr "宛先の %s はディレクトリではありません" -#: src/cp.c:730 +#: src/cp.c:728 #, c-format msgid "with --parents, the destination must be a directory" msgstr "--parents がある場合、宛先はディレクトリでなければなりません" -#: src/cp.c:1063 src/install.c:839 src/ln.c:511 src/mv.c:394 +#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395 #, c-format msgid "multiple target directories specified" msgstr "複数の宛先ディレクトリが指定されています" -#: src/cp.c:1108 +#: src/cp.c:1110 #, c-format msgid "cannot make both hard and symbolic links" msgstr "ハードリンクもシンボリックリンクも作成できません" -#: src/cp.c:1115 src/mv.c:464 +#: src/cp.c:1117 src/mv.c:466 #, c-format msgid "options --backup and --no-clobber are mutually exclusive" msgstr "オプション --backup と --no-clobber は相互排他的です" -#: src/cp.c:1121 +#: src/cp.c:1123 #, c-format msgid "--reflink can be used only with --sparse=auto" msgstr "--reflink は --sparse=auto のみと合わせて使用できます" -#: src/cp.c:1129 src/install.c:899 src/ln.c:582 src/mv.c:472 +#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474 msgid "backup type" msgstr "バックアップタイプ" -#: src/cp.c:1154 +#: src/cp.c:1156 #, c-format msgid "cannot preserve security context without an SELinux-enabled kernel" msgstr "" "SELinux が有効なカーネル以外ではセキュリティコンテキストを保護できません" -#: src/cp.c:1160 +#: src/cp.c:1162 #, c-format msgid "cannot preserve extended attributes, cp is built without xattr support" msgstr "拡張属性を保護できません。cp が xattr サポートなしで作成されています" @@ -2425,137 +2423,136 @@ msgstr "拡張属性を保護できません。cp が xattr サポートなし msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:529 +#: src/csplit.c:531 #, c-format msgid "input disappeared" msgstr "入力が無くなりました" -#: src/csplit.c:658 src/csplit.c:669 +#: src/csplit.c:660 src/csplit.c:671 #, c-format msgid "%s: line number out of range" msgstr "%s: 範囲外の行番号" -#: src/csplit.c:698 +#: src/csplit.c:700 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: 範囲外の行番号" -#: src/csplit.c:701 src/csplit.c:750 +#: src/csplit.c:703 src/csplit.c:752 #, c-format msgid " on repetition %s\n" msgstr " 繰り返し %s 回目\n" -#: src/csplit.c:744 +#: src/csplit.c:746 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: 一致しているものが見つかりません" -#: src/csplit.c:808 src/csplit.c:848 src/nl.c:359 src/tac.c:274 +#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273 #, c-format msgid "error in regular expression search" msgstr "正規表現による検索中のエラー" -#: src/csplit.c:981 +#: src/csplit.c:983 #, c-format msgid "write error for %s" msgstr "%s への書き込みエラー" -#: src/csplit.c:1057 +#: src/csplit.c:1059 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: 区切り文字の後には整数が予期されます" -#: src/csplit.c:1073 +#: src/csplit.c:1075 #, fuzzy, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: 繰り返しカウントには `}' が必要です" -#: src/csplit.c:1083 +#: src/csplit.c:1085 #, fuzzy, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: `{' と `}' の間には整数値が必要です" -#: src/csplit.c:1110 +#: src/csplit.c:1112 #, fuzzy, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: 終了の区切り文字 `%c' がありません" -#: src/csplit.c:1127 +#: src/csplit.c:1129 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: 無効な正規表現です: %s" -#: src/csplit.c:1160 +#: src/csplit.c:1162 #, c-format msgid "%s: invalid pattern" msgstr "%s: 無効なパターン指定です" -#: src/csplit.c:1163 +#: src/csplit.c:1165 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: 行番号はゼロより大きい数でなければなりません" -#: src/csplit.c:1169 +#: src/csplit.c:1171 #, c-format msgid "line number %s is smaller than preceding line number, %s" msgstr "行番号 %s が前に出現した行番号 %s より小さい値です" -#: src/csplit.c:1175 +#: src/csplit.c:1177 #, c-format msgid "warning: line number %s is the same as preceding line number" msgstr "警告: 行番号 %s が前に出現した行番号と同じ値です" -#: src/csplit.c:1253 +#: src/csplit.c:1255 #, c-format msgid "missing conversion specifier in suffix" msgstr "末尾の変換修飾子が指定されていません" -#: src/csplit.c:1259 +#: src/csplit.c:1261 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "末尾の変換修飾子が無効です: %c" -#: src/csplit.c:1262 +#: src/csplit.c:1264 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "末尾の変換修飾子が無効です: \\%.3o" -#: src/csplit.c:1267 +#: src/csplit.c:1269 #, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "変換修飾子に無効なフラグがあります: %%%c%c" -#: src/csplit.c:1284 +#: src/csplit.c:1286 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "末尾の %% 変換修飾子が多すぎます" -#: src/csplit.c:1298 +#: src/csplit.c:1300 #, c-format msgid "missing %% conversion specification in suffix" msgstr "末尾の %% 変換修飾子が無効です" -#: src/csplit.c:1345 +#: src/csplit.c:1347 #, c-format msgid "%s: invalid number" msgstr "%s: 無効な番号です" -#: src/csplit.c:1449 +#: src/csplit.c:1451 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "使用法: %s [OPTION]... FILE PATTERN...\n" -#: src/csplit.c:1453 +#: src/csplit.c:1455 #, 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" -"\n" msgstr "" "PATTERN によって区切られたファイルの断片をファイル `xx00'、 `xx01'、 ...\n" "に出力し、各断片のバイト数を標準出力に表示します。\n" -#: src/csplit.c:1461 +#: src/csplit.c:1462 #, fuzzy, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2566,7 +2563,7 @@ msgstr "" " -f, --prefix=PREFIX 接頭辞として `xx' の代わりに PREFIX を使用する\n" " -k, --keep-files エラー発生時に出力ファイルを削除しない\n" -#: src/csplit.c:1466 +#: src/csplit.c:1467 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 +2573,7 @@ msgstr "" " -s, --quiet, --silent 出力ファイルの大きさを表示しない\n" " -z, --elide-empty-files 空の出力ファイルを削除する\n" -#: src/csplit.c:1473 +#: src/csplit.c:1474 msgid "" "\n" "Read standard input if FILE is -. Each PATTERN may be:\n" @@ -2585,7 +2582,7 @@ msgstr "" "ファイルが - ならば標準入力から読み込みます。 各々のパターンは\n" "次のようになります:\n" -#: src/csplit.c:1477 +#: src/csplit.c:1478 #, fuzzy msgid "" "\n" @@ -2611,7 +2608,7 @@ msgstr "" msgid "David M. Ihnat" msgstr "David M. Ihnat" -#: src/cut.c:64 +#: src/cut.c:64 src/cut.c:372 msgid "fields and positions are numbered from 1" msgstr "フィールドと位置は1から始まる番号です" @@ -2621,14 +2618,13 @@ msgid "Usage: %s OPTION... [FILE]...\n" msgstr "使用法: %s OPTION... [FILE]...\n" #: src/cut.c:193 -msgid "" -"Print selected parts of lines from each FILE to standard output.\n" -"\n" +#, fuzzy +msgid "Print selected parts of lines from each FILE to standard output.\n" msgstr "" "ファイルの各行から選択した部分だけを切り出し、標準出力に表示します。\n" "\n" -#: src/cut.c:200 +#: src/cut.c:199 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2639,7 +2635,7 @@ msgstr "" " -d, --delimiter=DELIM フィールドの区切り文字として TAB の代わりに DELIM\n" " を使用する \n" -#: src/cut.c:205 +#: src/cut.c:204 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2651,7 +2647,7 @@ msgstr "" " する\n" " -n (無視される)\n" -#: src/cut.c:211 +#: src/cut.c:210 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" @@ -2659,7 +2655,7 @@ msgstr "" " --complement 選択されたバイト数、文字数またはフィールド数の\n" " 組を補足する\n" -#: src/cut.c:215 +#: src/cut.c:214 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2669,7 +2665,7 @@ msgstr "" " --output-delimiter=STRING 出力の区切り文字として STRING を使用\n" " デフォルトでは入力の区切り文字を使用\n" -#: src/cut.c:222 +#: src/cut.c:221 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2681,7 +2677,7 @@ msgstr "" "LIST はコンマで区切られた単一または複数の範囲で構成されます。選択\n" "した入力は読み込まれた順番でただ一度だけ出力されます。\n" -#: src/cut.c:228 +#: src/cut.c:227 msgid "" "Each range is one of:\n" "\n" @@ -2700,45 +2696,47 @@ msgstr "" "\n" "FILE が無いまたは - の場合は標準入力から読み込みます。\n" -#: src/cut.c:368 src/cut.c:489 -msgid "invalid byte or field list" +#: src/cut.c:367 src/cut.c:493 +#, fuzzy +msgid "invalid byte, character or field list" msgstr "無効なバイトまたはフィールド指定です" -#: src/cut.c:385 +#: src/cut.c:387 msgid "invalid range with no endpoint: -" msgstr "端点が無い無効な範囲です: -" -#: src/cut.c:399 +#: src/cut.c:403 msgid "invalid decreasing range" msgstr "無効な降順の範囲です" -#: src/cut.c:478 +#: src/cut.c:482 #, c-format msgid "byte offset %s is too large" msgstr "バイトオフセット %s が大きすぎます" -#: src/cut.c:481 +#: src/cut.c:485 #, c-format msgid "field number %s is too large" msgstr "フィールド番号 %s が大きすぎます" -#: src/cut.c:789 src/cut.c:797 +#: src/cut.c:795 src/cut.c:803 msgid "only one type of list may be specified" msgstr "切り出し方として指定できるのは 1 種類だけです" -#: src/cut.c:806 +#: src/cut.c:812 src/numfmt.c:1408 +#, c-format msgid "the delimiter must be a single character" msgstr "区切り文字に指定できるのは 1 文字だけです" -#: src/cut.c:841 +#: src/cut.c:847 msgid "you must specify a list of bytes, characters, or fields" msgstr "バイト, 文字, もしくはフィールドのリストを指定してください" -#: src/cut.c:844 +#: src/cut.c:850 msgid "an input delimiter may be specified only when operating on fields" msgstr "フィールドを操作する場合のみ入力区切り文字を指定できます" -#: src/cut.c:848 +#: src/cut.c:854 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2746,11 +2744,11 @@ msgstr "" "区切られていない行の抑制が有効なのは, \n" "\tフィールドを操作する場合のみです" -#: src/cut.c:864 +#: src/cut.c:870 msgid "missing list of fields" msgstr "フィールドのリストがありません" -#: src/cut.c:866 +#: src/cut.c:872 msgid "missing list of positions" msgstr "位置指定リストがありません" @@ -2764,9 +2762,11 @@ msgstr "" "または: %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 "" + +#: src/date.c:134 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" " -I[TIMESPEC], --iso-8601[=TIMESPEC] output date/time in ISO 8601 format.\n" @@ -2775,7 +2775,7 @@ msgid "" " and time to the indicated precision.\n" msgstr "" -#: src/date.c:138 +#: src/date.c:142 msgid "" " -r, --reference=FILE display the last modification time of FILE\n" " -R, --rfc-2822 output date and time in RFC 2822 format.\n" @@ -2785,7 +2785,7 @@ msgstr "" " -R, --rfc-2822 RFC 2822 形式で日付と時刻を出力する\n" " 例: Mon, 07 Aug 2006 12:34:56 -0600\n" -#: src/date.c:143 +#: src/date.c:147 #, fuzzy msgid "" " --rfc-3339=TIMESPEC output date and time in RFC 3339 format.\n" @@ -2804,7 +2804,7 @@ msgstr "" " -s, --set=STRING STRING で記述される時間に設定する\n" " -u, --utc, --universal UTC (協定世界時) 時間を表示または設定する\n" -#: src/date.c:154 +#: src/date.c:158 msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" @@ -2818,7 +2818,7 @@ msgstr "" " %% 文字 %\n" " %a ロケール表示による曜日の省略名 (例: Sun、日)\n" -#: src/date.c:161 +#: src/date.c:165 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2830,7 +2830,7 @@ msgstr "" " %B ロケール表示での月の完全名 (例: January)\n" " %c ロケール表示での日付と時刻 (例: Thu Mar 3 23:05:25 2005)\n" -#: src/date.c:167 +#: src/date.c:171 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2842,7 +2842,7 @@ msgstr "" " %D 日付。 %m/%d/%y と同様\n" " %e スペースで字幅調整された月の中の何日目かを表す値。%_d と同様\n" -#: src/date.c:173 +#: src/date.c:177 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -2852,7 +2852,7 @@ msgstr "" " %g ISO 週番号の最後の2桁 (%G 参照)\n" " %G ISO 週番号の年部分 (%V 参照)。通常は %V と同時に使用される\n" -#: src/date.c:178 +#: src/date.c:182 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2864,7 +2864,7 @@ msgstr "" " %I 時 (01..12)\n" " %j 年の開始日からの日数 (001..366)\n" -#: src/date.c:184 +#: src/date.c:188 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -2876,7 +2876,7 @@ msgstr "" " %m 月 (01..12)\n" " %M 分 (00..59)\n" -#: src/date.c:190 +#: src/date.c:194 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2894,7 +2894,7 @@ msgstr "" " %R 24時間表示での時および分。%H:%M と同様\n" " %s 1970-01-01 00:00:00 UTC からの秒数\n" -#: src/date.c:199 +#: src/date.c:203 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2906,7 +2906,7 @@ msgstr "" " %T 時刻。%H:%M:%S と同様\n" " %u 週の何日目かを表す値 (1..7); 1 が月曜日\n" -#: src/date.c:205 +#: src/date.c:209 msgid "" " %U week number of year, with Sunday as first day of week (00..53)\n" " %V ISO week number, with Monday as first day of week (01..53)\n" @@ -2918,7 +2918,7 @@ msgstr "" " %w 週の何日目かを表す値 (0..6); 0 を日曜日とする\n" " %W 月曜日を週初めとした週番号 (00..53)\n" -#: src/date.c:211 +#: src/date.c:215 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -2930,7 +2930,7 @@ msgstr "" " %y 西暦での年の下2桁 (00..99)\n" " %Y 年\n" -#: src/date.c:217 +#: src/date.c:221 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -2950,7 +2950,7 @@ msgstr "" "\n" "デフォルトでは0で日付の空白部分が埋められます。\n" -#: src/date.c:226 +#: src/date.c:230 #, fuzzy msgid "" "The following optional flags may follow '%':\n" @@ -2969,7 +2969,7 @@ msgstr "" " ^ 可能な場合は大文字を使用する\n" " # 可能な場合は小文字を使用する\n" -#: src/date.c:235 +#: src/date.c:239 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -2984,7 +2984,7 @@ msgstr "" "E はロケールで代替の表記をが利用可能な時には代替表記を利用します。\n" "O はロケールで代替の数字が利用可能なときには代替数字を利用します。\n" -#: src/date.c:242 +#: src/date.c:246 msgid "" "\n" "Examples:\n" @@ -3009,35 +3009,35 @@ msgstr "" "ローカル時間の次の金曜日午前9時を米国西海岸のタイムゾーンで表示する場合\n" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" -#: src/date.c:275 src/dd.c:2193 src/head.c:838 src/md5sum.c:477 -#: src/md5sum.c:798 src/od.c:863 src/od.c:1914 src/pr.c:1176 src/pr.c:1372 -#: src/pr.c:1494 src/stty.c:842 src/tac.c:563 src/tail.c:343 src/tee.c:126 +#: 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 #, c-format msgid "standard input" msgstr "標準入力" -#: src/date.c:303 src/date.c:523 +#: src/date.c:307 src/date.c:527 #, c-format msgid "invalid date %s" msgstr "%s は無効な日付です" -#: src/date.c:414 src/date.c:448 +#: src/date.c:418 src/date.c:452 #, c-format msgid "multiple output formats specified" msgstr "複数の出力形式が指定されています" -#: src/date.c:426 +#: src/date.c:430 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "日付表示を指定するオプションが相互に排他的です" -#: src/date.c:433 +#: src/date.c:437 #, c-format msgid "the options to print and set the time may not be used together" msgstr "表示オプションと設定オプションは同時に指定できません" -#: src/date.c:454 +#: src/date.c:458 #, fuzzy, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -3048,23 +3048,23 @@ msgstr "" "日付を指定するオプションを使用する場合、オプションでない引数\n" "は `+' で始まる書式文字列でなければいけません。" -#: src/date.c:531 +#: src/date.c:535 #, c-format msgid "cannot set date" msgstr "日時を設定できません" -#: src/date.c:554 src/du.c:360 +#: src/date.c:558 src/du.c:371 #, c-format msgid "time %s is out of range" msgstr "時間 %s が範囲外です" #. This is a proper name. See the gettext manual, section Names. -#: src/dd.c:44 src/factor.c:43 src/rm.c:41 src/tail.c:69 src/touch.c:41 +#: 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 "Paul Rubin" -#: src/dd.c:517 +#: src/dd.c:521 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3073,7 +3073,7 @@ msgstr "" "使用法: %s [OPERAND]...\n" "または: %s OPTION\n" -#: src/dd.c:522 +#: src/dd.c:526 #, fuzzy msgid "" "Copy a file, converting and formatting according to the operands.\n" @@ -3092,7 +3092,7 @@ msgstr "" " count=BLOCKS 入力ブロック BLOCKS 個分だけコピーする\n" " ibs=BYTES 一回に BYTES バイトずつ読み込む (デフォルト: 512)\n" -#: src/dd.c:531 +#: src/dd.c:535 #, fuzzy msgid "" " if=FILE read from FILE instead of stdin\n" @@ -3102,7 +3102,8 @@ msgid "" " oflag=FLAGS write as per the comma separated symbol list\n" " seek=N skip N obs-sized blocks at start of output\n" " skip=N skip N ibs-sized blocks at start of input\n" -" status=noxfer suppress transfer statistics\n" +" status=WHICH WHICH info to suppress outputting to stderr;\n" +" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" msgstr "" " if=FILE 標準入力の代わりに FILE から読み込む\n" " iflag=FLAGS コンマで区切られたシンボルリストとして読み込む\n" @@ -3115,10 +3116,11 @@ msgstr "" "る\n" " status=noxfer 転送ステータス表示を抑止する\n" -#: src/dd.c:541 +#: src/dd.c:546 +#, fuzzy msgid "" "\n" -"BLOCKS and BYTES may be followed by the following multiplicative suffixes:\n" +"N and BYTES may be followed by the following multiplicative suffixes:\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, and so on for T, P, E, Z, Y.\n" "\n" @@ -3133,7 +3135,7 @@ msgstr "" "各 CONV シンボルは以下の通りです:\n" "\n" -#: src/dd.c:550 +#: src/dd.c:555 #, fuzzy msgid "" " ascii from EBCDIC to ASCII\n" @@ -3160,7 +3162,7 @@ msgstr "" " または unblock と一緒に利用された場合 NUL でなくスペースで埋め" "る\n" -#: src/dd.c:563 +#: src/dd.c:568 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3176,7 +3178,7 @@ msgstr "" " fdatasync 終了前に出力ファイルデータを物理的に書き込む\n" " fsync 上と同様だがメタデータに対しても使用する\n" -#: src/dd.c:571 +#: src/dd.c:576 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3189,75 +3191,75 @@ msgstr "" "\n" " append 追加モード (出力に対してのみ意味がある。 conv=notrunc を推奨)\n" -#: src/dd.c:578 +#: src/dd.c:583 msgid " cio use concurrent I/O for data\n" msgstr " cio データに対して同時 I/O を使用する\n" -#: src/dd.c:580 +#: src/dd.c:585 msgid " direct use direct I/O for data\n" msgstr " direct データに対して直接 I/O を使用する\n" -#: src/dd.c:582 +#: src/dd.c:587 msgid " directory fail unless a directory\n" msgstr " directory ディレクトリで無い場合に失敗させる\n" -#: src/dd.c:584 +#: src/dd.c:589 msgid " dsync use synchronized I/O for data\n" msgstr " dsync データに対して同期 I/O を使用する\n" -#: src/dd.c:586 +#: src/dd.c:591 msgid " sync likewise, but also for metadata\n" msgstr " sync 上と同様だがメタデータに対しても使用する\n" -#: src/dd.c:587 +#: src/dd.c:592 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr " fullblock 入力のブロックがいっぱいになるまで蓄積する (iflag のみ)\n" -#: src/dd.c:590 +#: src/dd.c:595 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock 非ブロック I/O を使用する\n" -#: src/dd.c:592 +#: src/dd.c:597 msgid " noatime do not update access time\n" msgstr " noatime アクセス時間を更新しない\n" -#: src/dd.c:595 +#: src/dd.c:600 msgid " nocache discard cached data\n" msgstr " nocache キャッシュデータを破棄する\n" -#: src/dd.c:598 +#: src/dd.c:603 msgid " noctty do not assign controlling terminal from file\n" msgstr " noctty ファイルからの制御端末を割り当てない\n" -#: src/dd.c:601 +#: src/dd.c:606 msgid " nofollow do not follow symlinks\n" msgstr " nofollow シンボリックリンクをたどらない\n" -#: src/dd.c:603 +#: src/dd.c:608 msgid " nolinks fail if multiply-linked\n" msgstr " nolinks 複数リンクされている場合に失敗させる\n" -#: src/dd.c:605 +#: src/dd.c:610 msgid " binary use binary I/O for data\n" msgstr " binary データに対してバイナリー I/O を使用する\n" -#: src/dd.c:607 +#: src/dd.c:612 msgid " text use text I/O for data\n" msgstr " text データに対してテキスト I/O を使用する\n" -#: src/dd.c:609 +#: src/dd.c:614 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:612 +#: src/dd.c:617 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:615 +#: src/dd.c:620 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:620 +#: src/dd.c:625 #, fuzzy, c-format msgid "" "\n" @@ -3286,7 +3288,7 @@ msgstr "" "オプションは次の通りです:\n" "\n" -#: src/dd.c:676 +#: src/dd.c:683 #, c-format msgid "" "%<PRIuMAX>+%<PRIuMAX> records in\n" @@ -3295,19 +3297,19 @@ msgstr "" "%<PRIuMAX>+%<PRIuMAX> レコード入力\n" "%<PRIuMAX>+%<PRIuMAX> レコード出力\n" -#: src/dd.c:682 +#: src/dd.c:689 #, c-format msgid "%<PRIuMAX> truncated record\n" msgid_plural "%<PRIuMAX> truncated records\n" msgstr[0] "%<PRIuMAX> 切り詰められたレコード\n" -#: src/dd.c:694 +#: src/dd.c:701 #, c-format msgid "%<PRIuMAX> byte (%s) copied" msgid_plural "%<PRIuMAX> bytes (%s) copied" msgstr[0] "%<PRIuMAX> バイト (%s) コピーされました" -#: src/dd.c:712 +#: src/dd.c:720 msgid "Infinity B" msgstr "無限 B" @@ -3321,83 +3323,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:725 +#: src/dd.c:733 #, c-format msgid ", %g s, %s/s\n" msgstr "、 %g 秒、 %s/秒\n" -#: src/dd.c:804 +#: src/dd.c:812 #, c-format msgid "closing input file %s" msgstr "入力ファイル %s を閉じています" -#: src/dd.c:811 +#: src/dd.c:819 #, c-format msgid "closing output file %s" msgstr "出力ファイル %s を閉じています" -#: src/dd.c:1014 +#: src/dd.c:1022 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "O_DIRECT をオフにできませんでした : %s" -#: src/dd.c:1085 src/dd.c:1934 +#: src/dd.c:1093 src/dd.c:1942 #, c-format msgid "writing to %s" msgstr "%s に書き込み中です" -#: src/dd.c:1199 src/dd.c:1253 +#: src/dd.c:1207 src/dd.c:1261 #, c-format msgid "unrecognized operand %s" msgstr "%s : 認識できないオペランドです" -#: src/dd.c:1210 +#: src/dd.c:1218 msgid "invalid conversion" msgstr "無効な変換です" -#: src/dd.c:1213 src/dd.c:1289 +#: src/dd.c:1221 src/dd.c:1297 msgid "invalid input flag" msgstr "無効な入力フラグです" -#: src/dd.c:1216 src/dd.c:1283 src/dd.c:1295 +#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303 msgid "invalid output flag" msgstr "無効な出力フラグです" -#: src/dd.c:1219 +#: src/dd.c:1227 msgid "invalid status flag" msgstr "無効なステータスフラグです" -#: src/dd.c:1258 src/truncate.c:312 +#: src/dd.c:1266 src/truncate.c:310 #, c-format msgid "invalid number %s" msgstr "%s : 無効な数字です" -#: src/dd.c:1340 +#: src/dd.c:1348 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "ascii、ebcdic、ibm のどの2個も組み合わせることはできません" -#: src/dd.c:1342 +#: src/dd.c:1350 #, c-format msgid "cannot combine block and unblock" msgstr "block と unblock を組み合わせることはできません" -#: src/dd.c:1344 +#: src/dd.c:1352 #, c-format msgid "cannot combine lcase and ucase" msgstr "lcase と ucase を組み合わせることはできません" -#: src/dd.c:1346 +#: src/dd.c:1354 #, c-format msgid "cannot combine excl and nocreat" msgstr "excl と nocreat を組み合わせることはできません" -#: src/dd.c:1349 +#: src/dd.c:1357 #, c-format msgid "cannot combine direct and nocache" msgstr "direct と nocache を組み合わせることはできません" -#: src/dd.c:1506 +#: src/dd.c:1514 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3406,72 +3408,72 @@ msgstr "" "警告: lseek のカーネルバグに対処します。\n" " ファイル (%s) の mt_type=0x%0lx -- <sys/mtio.h> のタイプリストを見て下さい" -#: src/dd.c:1593 +#: src/dd.c:1601 #, c-format msgid "%s: cannot skip" msgstr "%s: スキップできません" -#: src/dd.c:1595 src/dd.c:1614 src/dd.c:1675 +#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683 #, c-format msgid "%s: cannot seek" msgstr "%s: seek できません" -#: src/dd.c:1655 +#: src/dd.c:1663 #, c-format msgid "offset overflow while reading file %s" msgstr "ファイル %s を読み込み中にオフセットがオーバーフローしました" -#: src/dd.c:1667 +#: src/dd.c:1675 #, c-format msgid "warning: invalid file offset after failed read" msgstr "警告: 読み込み失敗後の無効なファイルオフセットです" -#: src/dd.c:1671 +#: src/dd.c:1679 #, c-format msgid "cannot work around kernel bug after all" msgstr "最終的にカーネルバグを回避できません" -#: src/dd.c:1814 +#: src/dd.c:1822 #, c-format msgid "setting flags for %s" msgstr "%s のフラグを設定中" -#: src/dd.c:1867 +#: src/dd.c:1875 #, c-format msgid "memory exhausted by input buffer of size %zu bytes (%s)" msgstr "大きさ %zu バイトの入力バッファによりメモリを使い果たしました (%s)" -#: src/dd.c:1881 +#: src/dd.c:1889 #, c-format msgid "memory exhausted by output buffer of size %zu bytes (%s)" msgstr "大きさ %zu バイトの出力バッファによりメモリを使い果たしました (%s)" -#: src/dd.c:1914 +#: src/dd.c:1922 #, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: 指定されたオフセットまでスキップできません" -#: src/dd.c:2125 src/dd.c:2258 -#, c-format -msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" +#: src/dd.c:2133 +#, fuzzy, c-format +msgid "failed to truncate to %<PRIdMAX> bytes in output file %s" msgstr "%<PRIuMAX> バイトに出力ファイル %s を切り詰めることに失敗しました" -#: src/dd.c:2138 +#: src/dd.c:2146 #, c-format msgid "fdatasync failed for %s" msgstr "%s に対する fdatasync に失敗しました" -#: src/dd.c:2148 +#: src/dd.c:2156 #, c-format msgid "fsync failed for %s" msgstr "%s に対する fsync に失敗しました" -#: src/dd.c:2199 src/dd.c:2228 +#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165 #, c-format -msgid "opening %s" -msgstr "%s を開いています" +msgid "failed to open %s" +msgstr "%s を開けませんでした" -#: src/dd.c:2237 +#: src/dd.c:2246 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) " @@ -3480,84 +3482,106 @@ msgstr "" "オフセット過大: seek=%<PRIuMAX> (%lu バイト) ブロックの長さまで切り詰めること" "ができません" -#: src/dd.c:2274 src/dd.c:2280 +#: src/dd.c:2267 +#, c-format +msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" +msgstr "%<PRIuMAX> バイトに出力ファイル %s を切り詰めることに失敗しました" + +#: src/dd.c:2283 src/dd.c:2289 #, 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:54 src/expr.c:153 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:39 src/sleep.c:35 src/sort.c:66 +#: 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 msgid "Paul Eggert" msgstr "Paul Eggert" -#: src/df.c:140 +#: src/df.c:172 msgid "Filesystem" msgstr "ファイルシス" -#: src/df.c:141 +#: src/df.c:175 msgid "Type" msgstr "タイプ" -#: src/df.c:142 +#: src/df.c:178 src/df.c:542 msgid "blocks" msgstr "ブロック" -#: src/df.c:142 -msgid "Inodes" -msgstr "Iノード" - -#: src/df.c:142 -msgid "Size" -msgstr "サイズ" - -#: src/df.c:143 +#: src/df.c:181 msgid "Used" msgstr "使用" -#: src/df.c:143 -msgid "IUsed" -msgstr "I使用" - -#: src/df.c:144 +#: src/df.c:184 msgid "Available" msgstr "使用可" -#: src/df.c:144 -msgid "IFree" -msgstr "I残り" - -#: src/df.c:144 -msgid "Avail" -msgstr "残り" - -#: src/df.c:145 +#: src/df.c:187 msgid "Use%" msgstr "使用%" -#: src/df.c:145 +#: src/df.c:190 +msgid "Inodes" +msgstr "Iノード" + +#: src/df.c:193 +msgid "IUsed" +msgstr "I使用" + +#: src/df.c:196 +msgid "IFree" +msgstr "I残り" + +#: src/df.c:199 msgid "IUse%" msgstr "I使用%" -#: src/df.c:145 +#: src/df.c:202 +msgid "Mounted on" +msgstr "マウント位置" + +#: src/df.c:383 +#, c-format +msgid "option --output: field '%s' unknown" +msgstr "" + +#: src/df.c:390 +#, fuzzy, c-format +msgid "option --output: field '%s' used more than once" +msgstr "警告: コピー元ファイル %s が複数指定されました" + +#: src/df.c:410 src/df.c:449 +msgid "Size" +msgstr "サイズ" + +#: src/df.c:414 src/df.c:451 +msgid "Avail" +msgstr "残り" + +#: src/df.c:474 msgid "Capacity" msgstr "容量" -#: src/df.c:146 -msgid "Mounted on" -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 +#, c-format +msgid "%s-%s" +msgstr "" -#: src/df.c:847 +#: src/df.c:1210 +#, fuzzy msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" -"\n" msgstr "" "各 FILE が存在するファイルシステムに関する情報を表示します。\n" "または、デフォルトでは全てのファイルシステムについて表示します。\n" "\n" -#: src/df.c:855 +#: src/df.c:1217 #, fuzzy msgid "" " -a, --all include dummy file systems\n" @@ -3578,7 +3602,7 @@ msgstr "" "2G)\n" " -H, --si 同様だが、1024 倍ではなく 1000 倍の値を使用する\n" -#: src/df.c:865 +#: src/df.c:1227 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3591,8 +3615,12 @@ msgstr "" " -l, --local ローカルファイルシステムのみ表示するように制限する\n" " --no-sync 使用量の情報を得る前に sync を行わない (デフォルト)\n" -#: src/df.c:872 +#: src/df.c:1234 +#, fuzzy msgid "" +" --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" +" or print all fields if FIELD_LIST is " +"omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" " -t, --type=TYPE limit listing to file systems of type TYPE\n" @@ -3608,20 +3636,42 @@ msgstr "" "る\n" " -v (無視される)\n" -#: src/df.c:1027 +#: src/df.c:1248 +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" +msgstr "" + +#: src/df.c:1285 +#, 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 #, c-format msgid "file system type %s both selected and excluded" msgstr "%s 形式ファイルシステムが選択/非選択の両方で指定されました" -#: src/df.c:1075 +#: src/df.c:1500 msgid "Warning: " msgstr "警告: " -#: src/df.c:1077 src/stat.c:795 +#: src/df.c:1502 src/stat.c:814 msgid "cannot read table of mounted file systems" msgstr "マウントされているファイルシステムのテーブルを読めません" -#: src/df.c:1107 +#: src/df.c:1539 #, c-format msgid "no file systems processed" msgstr "ファイルシステムが処理されませんでした" @@ -3739,7 +3789,7 @@ msgstr "" " %s /usr/bin/ 出力 \"/usr\"\n" " %s stdio.h 出力 \".\"\n" -#: src/du.c:260 src/sort.c:390 src/wc.c:112 +#: src/du.c:270 src/sort.c:394 src/wc.c:112 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3748,17 +3798,18 @@ msgstr "" "使用法: %s [OPTION]... [FILE]...\n" "または: %s [OPTION]... --files0-from=F\n" -#: src/du.c:264 -msgid "" -"Summarize disk usage of each FILE, recursively for directories.\n" -"\n" +#: src/du.c:274 +#, fuzzy +msgid "Summarize disk usage of each FILE, recursively for directories.\n" msgstr "" "各ファイルのディスク使用量を集計します。ディレクトリは再帰的に処理します。\n" "\n" -#: src/du.c:271 +#: src/du.c:280 #, fuzzy msgid "" +" -0, --null end each output line with 0 byte rather than " +"newline\n" " -a, --all write counts for all files, not just directories\n" " --apparent-size print apparent sizes, rather than disk usage; " "although\n" @@ -3776,7 +3827,7 @@ msgstr "" "る\n" " こともある。\n" -#: src/du.c:279 +#: src/du.c:289 #, fuzzy msgid "" " -B, --block-size=SIZE scale sizes by SIZE before printing them. E.g.,\n" @@ -3786,6 +3837,11 @@ msgid "" " -c, --total produce a grand total\n" " -D, --dereference-args dereference only symlinks that are listed on the\n" " command line\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 "" " -B, --block-size=SIZE SIZE の倍数として表示する。例: `-BM' は表示する時" "に\n" @@ -3795,7 +3851,8 @@ msgstr "" " -D, --dereference-args コマンドラインで指定されたシンボリック\n" " のみをたどる\n" -#: src/du.c:288 +#: src/du.c:302 +#, fuzzy msgid "" " --files0-from=F summarize disk usage of the NUL-terminated file\n" " names specified in file F;\n" @@ -3803,7 +3860,6 @@ msgid "" " -H equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" --si like -h, but use powers of 1000 not 1024\n" msgstr "" " --files0-from=F F の中で指定された NUL で区切られた名前のファイルか" "ら\n" @@ -3815,9 +3871,11 @@ msgstr "" " --si -h と同様だが、1024 倍ではなく 1000 倍の値を使用す" "る\n" -#: src/du.c:297 +#: src/du.c:310 +#, fuzzy 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 "" @@ -3825,14 +3883,13 @@ msgstr "" " -l, --count-links ハードリンクされた場合その個数分サイズを数える\n" " -m --block-size=1M と同様\n" -#: src/du.c:302 +#: src/du.c:316 +#, fuzzy msgid "" -" -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " "default)\n" -" -0, --null end each output line with 0 byte rather than " -"newline\n" " -S, --separate-dirs 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 全てのシンボリックリンクをたどる\n" @@ -3842,31 +3899,11 @@ msgstr "" " -S, --separate-dirs 子ディレクトリのサイズを含めない\n" " -s, --summarize 各引数の合計容量のみ表示する\n" -#: src/du.c:309 -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 異なるファイルシステムにあるディレクトリをスキップ" -"する\n" -" -X, --exclude-from=FILE FILE 内に含まれるパターンに一致するファイルを含め" -"ない\n" -" --exclude=PATTERN PATTERN に一致するファイルを含めない\n" -" -d, --max-depth=N コマンドライン引数から数えて深さが N 以下ディレクトリ" -"階層の\n" -" 合計のみ表示する (--all を指定した時はファイルも含" -"める)。\n" -" --max-depth=0 は --summarize と等価になる\n" - -#: src/du.c:318 +#: src/du.c:322 #, fuzzy msgid "" +" -t, --threshold=SIZE exclude entries smaller than SIZE if positive,\n" +" or entries greater than SIZE if negative\n" " --time show time of the last modification of any file in " "the\n" " directory, or any of its subdirectories\n" @@ -3886,65 +3923,74 @@ msgstr "" " full-iso、long-iso、iso、+FORMAT\n" " FORMAT は `date' と同様に解釈される\n" -#: src/du.c:375 +#: src/du.c:333 +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 msgid "Infinity" msgstr "無限 B" -#: src/du.c:600 +#: src/du.c:507 +#, c-format +msgid "mount point %s already traversed" +msgstr "" + +#: src/du.c:624 #, c-format msgid "fts_read failed: %s" msgstr "fts_read に失敗しました: %s" -#: src/du.c:724 +#: src/du.c:780 #, c-format msgid "invalid maximum depth %s" msgstr "無効な最大の深さ %s です" -#: src/du.c:817 +#: src/du.c:809 +#, fuzzy, c-format +msgid "invalid --threshold argument '-0'" +msgstr "--%s の引数 %s が無効です" + +#: src/du.c:887 #, c-format msgid "cannot both summarize and show all entries" msgstr "合計と全エントリの表示の両方を、一度に指定することはできません" -#: src/du.c:824 +#: src/du.c:894 #, c-format msgid "warning: summarizing is the same as using --max-depth=0" msgstr "警告: 統計(-s)と --max-depth=0 は同じ用法です" -#: src/du.c:830 +#: src/du.c:900 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "警告: 統計(-s)と --max-depth=%lu の指定が競合しています" -#: src/du.c:896 src/sort.c:4479 src/wc.c:668 +#: src/du.c:966 src/sort.c:4533 src/wc.c:668 msgid "file operands cannot be combined with --files0-from" msgstr "ファイルオペランドと --files0-from を同時に使用できません" -#: src/du.c:949 src/md5sum.c:587 src/od.c:903 src/tac.c:239 src/tac.c:350 -#: src/tac.c:506 src/tac.c:586 src/wc.c:733 +#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 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:963 src/sort.c:4508 src/wc.c:747 +#: src/du.c:1040 src/sort.c:4562 src/wc.c:747 #, c-format msgid "when reading file names from stdin, no file name of %s allowed" msgstr "" "ファイル名を標準入力から読み込んでいる場合に、ファイル名 %s を指定できません" -#: src/du.c:980 src/du.c:988 src/wc.c:760 src/wc.c:768 +#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768 msgid "invalid zero-length file name" msgstr "無効な長さが0のファイル名です" -#: src/du.c:1007 src/head.c:149 src/head.c:262 src/head.c:334 src/head.c:538 -#: src/head.c:620 src/head.c:692 src/head.c:750 src/head.c:774 src/tail.c:412 -#: src/tail.c:500 src/tail.c:549 src/tail.c:642 src/tail.c:770 src/tail.c:818 -#: src/tail.c:855 src/tail.c:1782 src/tail.c:1812 src/uniq.c:395 -#, c-format -msgid "error reading %s" -msgstr "%s の読み込みエラー" - -#: src/du.c:1010 src/ls.c:2649 src/wc.c:791 +#: src/du.c:1088 src/ls.c:2649 src/wc.c:791 msgid "total" msgstr "合計" @@ -4046,9 +4092,12 @@ msgid "Usage: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n" msgstr "使用法: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n" #: src/env.c:55 +msgid "Set each NAME to VALUE in the environment and run COMMAND.\n" +msgstr "" + +#: src/env.c:61 +#, fuzzy msgid "" -"Set each NAME to VALUE in the environment and run COMMAND.\n" -"\n" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with 0 byte rather than newline\n" " -u, --unset=NAME remove variable from the environment\n" @@ -4059,7 +4108,7 @@ msgstr "" " -0, --null 出力する行の終端を改行ではなく値が 0 のバイトにする\n" " -u, --unset=NAME 環境変数から変数を削除する\n" -#: src/env.c:64 +#: src/env.c:68 msgid "" "\n" "A mere - implies -i. If no COMMAND, print the resulting environment.\n" @@ -4068,32 +4117,32 @@ msgstr "" "- だけを指定した場合は -i を指定したことになります。COMMAND が指定されなけれ" "ば最終的な環境変数を表示します。\n" -#: src/env.c:120 +#: src/env.c:124 #, c-format msgid "cannot unset %s" msgstr "%s を非設定にできません" -#: src/env.c:131 +#: src/env.c:135 #, c-format msgid "cannot set %s" msgstr "%s を設定できません" -#: src/env.c:148 +#: src/env.c:152 #, c-format msgid "cannot specify --null (-0) with command" msgstr "COMMAND と --null (-0) を同時に使用することはできません" #: 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" -"\n" msgstr "" "各 FILE のタブをスペースに変換し、標準出力に書き出します。 FILE が指定\n" "されていないか `-' の場合は標準入力から読み込みます。\n" "\n" -#: src/expand.c:115 +#: src/expand.c:114 msgid "" " -i, --initial do not convert tabs after non blanks\n" " -t, --tabs=NUMBER have tabs NUMBER characters apart, not 8\n" @@ -4101,32 +4150,32 @@ msgstr "" " -i, --initial 非空白類文字の後にあるタブを変換しない\n" " -t, --tabs=NUMBER タブの文字数を 8 個ではなく NUMBER 個にする\n" -#: src/expand.c:119 +#: src/expand.c:118 msgid "" " -t, --tabs=LIST use comma separated list of explicit tab positions\n" msgstr " -t, --tabs=LIST コンマ(,)で区切られた LIST にタブ位置を設定する\n" -#: src/expand.c:172 src/unexpand.c:191 +#: src/expand.c:171 src/unexpand.c:190 #, c-format msgid "tab stop is too large %s" msgstr "タブの位置 %s が大きすぎます" -#: src/expand.c:180 src/unexpand.c:199 +#: src/expand.c:179 src/unexpand.c:198 #, c-format msgid "tab size contains invalid character(s): %s" msgstr "タブサイズに無効な文字が含まれています: %s" -#: src/expand.c:206 src/unexpand.c:225 +#: src/expand.c:205 src/unexpand.c:224 #, c-format msgid "tab size cannot be 0" msgstr "タブサイズは0(ゼロ)にできません" -#: src/expand.c:208 src/unexpand.c:227 +#: src/expand.c:207 src/unexpand.c:226 #, c-format msgid "tab sizes must be ascending" msgstr "タブサイズの指定は昇順でなければなりません" -#: src/expand.c:326 src/expand.c:345 src/unexpand.c:374 src/unexpand.c:419 +#: 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 "入力ファイルが長すぎます" @@ -4283,12 +4332,12 @@ msgstr "正規表現検索中のエラー" msgid "non-integer argument" msgstr "整数でない引数" -#: src/expr.c:793 src/truncate.c:316 +#: src/expr.c:793 src/truncate.c:314 #, c-format msgid "division by zero" msgstr "ゼロでの割り算" -#: src/expr.c:887 src/sort.c:2029 +#: src/expr.c:887 src/sort.c:2044 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "問題を回避するために LC_ALL='C' を指定してください。" @@ -4298,25 +4347,32 @@ msgstr "問題を回避するために LC_ALL='C' を指定してください。 msgid "the strings compared were %s and %s" msgstr "比較した文字列は %s と %s です" -#: src/factor.c:449 -msgid "using arbitrary-precision arithmetic" -msgstr "任意精度の演算を使用します" +#. This is a proper name. See the gettext manual, section Names. +#: src/factor.c:111 +msgid "Niels Moller" +msgstr "" -#: src/factor.c:460 -msgid "using single-precision arithmetic" -msgstr "固定制度の演算を使用します" +#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459 +#, c-format +msgid "Lucas prime test failure. This should not happen" +msgstr "" -#: src/factor.c:465 src/od.c:1640 src/od.c:1709 +#: src/factor.c:2092 #, c-format -msgid "%s is too large" -msgstr "%s は長すぎます" +msgid "squfof queue overflow" +msgstr "" -#: src/factor.c:469 +#: src/factor.c:2419 #, c-format msgid "%s is not a valid positive integer" msgstr "%s は有効な正の整数ではありません" -#: src/factor.c:494 +#: src/factor.c:2442 src/od.c:1646 src/od.c:1715 +#, c-format +msgid "%s is too large" +msgstr "%s は長すぎます" + +#: src/factor.c:2454 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4325,7 +4381,7 @@ msgstr "" "使用法: %s [NUMBER]...\n" "または: %s OPTION\n" -#: src/factor.c:499 +#: src/factor.c:2459 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" @@ -4352,20 +4408,20 @@ msgid "cannot stat current directory (now %s)" msgstr "カレントディレクトリを stat できません (現在 %s )" #. This is a proper name. See the gettext manual, section Names. -#: src/fmt.c:37 +#: src/fmt.c:38 msgid "Ross Paterson" msgstr "Ross Paterson" -#: src/fmt.c:269 +#: src/fmt.c:270 #, c-format msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n" msgstr "使用法: %s [-WIDTH] [OPTION]... [FILE]...\n" -#: src/fmt.c:270 +#: 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" -"\n" msgstr "" "FILE 内の各段落を再整形して標準出力に出力します。オプション -WIDTH は\n" "--width=DIGITS の省略形です。\n" @@ -4383,8 +4439,8 @@ msgstr "" " 再整形した行には先頭に STRING をつける\n" " -s, --split-only 長い行を分割する。ただしインデントは行わない\n" -#: src/fmt.c:285 -#, fuzzy, c-format +#: src/fmt.c:287 +#, fuzzy, 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" @@ -4395,7 +4451,7 @@ msgstr "" " -u, --uniform-spacing 単語の間には 1つ, 文の間には 2 つの空白を置く\n" " -w, --width=NUMBER 最大行幅 (標準 75文字) を指定\n" -#: src/fmt.c:357 +#: src/fmt.c:359 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -4405,22 +4461,22 @@ msgstr "" "以外では\n" " -w N を使用してください。" -#: src/fmt.c:403 src/fmt.c:414 +#: src/fmt.c:405 src/fmt.c:416 #, c-format msgid "invalid width: %s" msgstr "無効な幅: %s" #: src/fold.c:70 +#, fuzzy msgid "" "Wrap input lines in each FILE (standard input by default), writing to\n" "standard output.\n" -"\n" msgstr "" "各 FILE (デフォルトは標準入力) の入力行を折り返し、標準出力に書き\n" "込みます。\n" "\n" -#: src/fold.c:78 +#: src/fold.c:77 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4430,13 +4486,13 @@ msgstr "" " -s, --spaces 空白の位置で折り返す\n" " -w, --width=WIDTH 80 の代わりに幅を WIDTH で指定する\n" -#: src/fold.c:289 src/pr.c:836 +#: src/fold.c:288 src/pr.c:832 #, c-format 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:75 +#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 #: src/truncate.c:37 msgid "Padraig Brady" msgstr "Padraig Brady" @@ -4455,17 +4511,17 @@ msgstr "" "す。\n" "\n" -#: src/group-list.c:69 src/id.c:345 src/setuidgid.c:184 +#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184 #, c-format msgid "failed to get groups for user %s" msgstr "ユーザー %s のグループ取得に失敗しました" -#: src/group-list.c:74 src/id.c:350 +#: src/group-list.c:74 src/id.c:370 #, c-format msgid "failed to get groups for the current process" msgstr "現在のプロセスのグループ取得に失敗しました" -#: src/group-list.c:104 +#: src/group-list.c:114 #, c-format msgid "cannot find name for group ID %lu" msgstr "グループ ID %lu のグループ名がみつかりません" @@ -4506,18 +4562,18 @@ msgid "%s: no such user" msgstr "%s: そのようなユーザは存在しません" #: 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" -"\n" msgstr "" "各 FILE の先頭 10 行を標準出力に出力します。FILE が2個以上指定された場合は\n" "ヘッダーとしてファイル名が内容の前に出力されます。FILE が指定されない場合、\n" "または FILE に - が指定された場合は標準入力から読み込みます。\n" "\n" -#: src/head.c:118 +#: src/head.c:117 #, fuzzy msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" @@ -4537,7 +4593,7 @@ msgstr "" "全てを\n" " 表示する\n" -#: src/head.c:126 +#: src/head.c:125 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4545,7 +4601,7 @@ msgstr "" " -q, --quiet, --silent ファイル毎のヘッダー出力を行わない\n" " -v, --verbose 常にファイル毎のヘッダー出力を行う\n" -#: src/head.c:132 +#: src/head.c:131 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -4557,58 +4613,58 @@ 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:152 -#, c-format -msgid "error writing %s" -msgstr "%s の書き込みエラー" - -#: src/head.c:155 +#: src/head.c:154 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: ファイルが小さく縮められすぎています" -#: src/head.c:228 src/head.c:1044 +#: src/head.c:227 src/head.c:1051 #, c-format msgid "%s: number of bytes is too large" msgstr "%s: バイト数が大きすぎます" -#: src/head.c:441 +#: src/head.c:440 #, c-format msgid "%s: cannot lseek back to original position" msgstr "%s: 元の位置に lseek で戻ることができません" -#: src/head.c:613 src/head.c:684 src/tail.c:450 +#: src/head.c:612 src/head.c:691 src/tail.c:449 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: オフセット %s まで seek できません" -#: src/head.c:791 +#: src/head.c:673 +#, 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 に対するファイルポインタを再配置できません" -#: src/head.c:878 +#: src/head.c:885 #, c-format msgid "%s: %s is so large that it is not representable" msgstr "%s: %s は大きすぎて表示できません" -#: src/head.c:879 +#: src/head.c:886 msgid "number of lines" msgstr "行数" -#: src/head.c:879 +#: src/head.c:886 msgid "number of bytes" msgstr "バイト数" -#: src/head.c:886 src/tail.c:1947 +#: src/head.c:893 src/tail.c:1947 msgid "invalid number of lines" msgstr "無効な行数です" -#: src/head.c:887 src/tail.c:1948 +#: src/head.c:894 src/tail.c:1948 msgid "invalid number of bytes" msgstr "無効なバイト数です" -#: src/head.c:974 src/head.c:1032 +#: src/head.c:981 src/head.c:1039 #, c-format msgid "invalid trailing option -- %c" msgstr "無効な後続のオプションです -- %c" @@ -4726,86 +4782,86 @@ msgstr "プロセスのコンテキストを取得できません" msgid "cannot get effective UID" msgstr "%s を参照できません" -#: src/id.c:289 +#: src/id.c:311 #, fuzzy, c-format -msgid "cannot find name for user ID %lu" +msgid "cannot find name for user ID %s" msgstr "ユーザー ID %lu に対するユーザー名が見つかりません" -#: src/id.c:309 +#: src/id.c:329 #, fuzzy, c-format -msgid "uid=%lu" +msgid "uid=%s" msgstr "uid=%lu" -#: src/id.c:314 +#: src/id.c:334 #, fuzzy, c-format -msgid " gid=%lu" -msgstr " egid=%lu" +msgid " gid=%s" +msgstr " gid=%lu" -#: src/id.c:321 +#: src/id.c:341 #, fuzzy, c-format -msgid " euid=%lu" -msgstr " egid=%lu" +msgid " euid=%s" +msgstr " euid=%lu" -#: src/id.c:329 -#, c-format -msgid " egid=%lu" +#: src/id.c:349 +#, fuzzy, c-format +msgid " egid=%s" msgstr " egid=%lu" -#: src/id.c:357 +#: src/id.c:377 msgid " groups=" msgstr " groups=" -#: src/id.c:373 +#: src/id.c:393 #, c-format msgid " context=%s" msgstr " context=%s" -#: src/install.c:372 +#: src/install.c:373 #, c-format msgid "warning: %s: failed to change context to %s" msgstr "警告: %s: コンテキスト %s への変更に失敗しました" -#: src/install.c:413 +#: src/install.c:414 #, c-format msgid "creating directory %s" msgstr "ディレクトリ %s を作成しています" -#: src/install.c:481 +#: src/install.c:482 #, c-format msgid "cannot change ownership of %s" msgstr "%s の所有権を変更できません" -#: src/install.c:505 +#: src/install.c:506 #, c-format msgid "cannot set time stamps for %s" msgstr "%s の時刻を設定できません" -#: src/install.c:526 src/split.c:412 src/timeout.c:387 +#: src/install.c:527 src/split.c:426 src/timeout.c:439 #, c-format msgid "fork system call failed" msgstr "fork システムコールが失敗しました" -#: src/install.c:530 +#: src/install.c:531 #, c-format msgid "cannot run %s" msgstr "%s を実行できません" -#: src/install.c:534 +#: src/install.c:535 #, c-format msgid "waiting for strip" msgstr "strip を待っています" -#: src/install.c:536 +#: src/install.c:537 #, c-format msgid "strip process terminated abnormally" msgstr "strip プロセスが異常終了しました" -#: src/install.c:557 +#: src/install.c:558 #, c-format msgid "invalid user %s" msgstr "無効なユーザー: %s" -#: src/install.c:593 +#: src/install.c:594 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -4818,7 +4874,8 @@ msgstr "" "または: %s [OPTION]... -t DIRECTORY SOURCE...\n" "または: %s [OPTION]... -d DIRECTORY...\n" -#: src/install.c:600 +#: src/install.c:601 +#, fuzzy msgid "" "\n" "This install program copies files (often just compiled) into destination\n" @@ -4830,7 +4887,6 @@ msgid "" "In the first three forms, copy SOURCE to DEST or multiple SOURCE(s) to\n" "the existing DIRECTORY, while setting permission modes and owner/group.\n" "In the 4th form, create all components of the given DIRECTORY(ies).\n" -"\n" msgstr "" "\n" "install プログラムは選択したコピー先にファイルをコピーします (通常は直前に\n" @@ -4922,7 +4978,7 @@ msgstr "" " -Z, --context=CONTEXT ファイルおよびディレクトリの SELinux セキュリティ\n" " コンテキストを CONTEXT に設定する\n" -#: src/install.c:858 +#: src/install.c:859 #, c-format msgid "" "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled" @@ -4930,54 +4986,54 @@ msgstr "" "警告: --preserve-context は無視されました。カーネルで SELinux が有効ではあり" "ません" -#: src/install.c:868 +#: src/install.c:869 #, c-format msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled" msgstr "" "警告: --context (-Z) は無視されました。カーネルで SELinux が有効ではありませ" "ん" -#: src/install.c:885 +#: src/install.c:886 #, c-format msgid "the strip option may not be used when installing a directory" msgstr "strip オプションはディレクトリをインストールする際には使用できません" -#: src/install.c:888 +#: src/install.c:889 #, c-format msgid "target directory not allowed when installing a directory" msgstr "" "ディレクトリをインストールする際にターゲットディレクトリを指定できません" -#: src/install.c:892 +#: src/install.c:893 #, c-format msgid "cannot force target context to %s and preserve it" msgstr "" "ターゲットのコンテキストを %s に強制的に設定できません。そのまま維持\n" "されます" -#: src/install.c:946 src/mkdir.c:202 src/stdbuf.c:327 +#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326 #, c-format msgid "invalid mode %s" msgstr "無効なモード: %s" -#: src/install.c:953 +#: src/install.c:954 #, c-format msgid "WARNING: ignoring --strip-program option as -s option was not specified" msgstr "" "警告: -s オプションが指定されていないため --strip-program オプションは\n" "無視されます" -#: src/install.c:958 +#: src/install.c:959 #, c-format msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive" msgstr "オプション --compare (-C) および --preserve-timestamps は排他的です" -#: src/install.c:965 +#: src/install.c:966 #, c-format msgid "options --compare (-C) and --strip are mutually exclusive" msgstr "オプション --compare (-C) および --strip は排他的です" -#: src/install.c:971 +#: src/install.c:972 #, c-format msgid "" "the --compare (-C) option is ignored when you specify a mode with non-" @@ -4987,7 +5043,7 @@ msgstr "" "には無視されます" #. This is a proper name. See the gettext manual, section Names. -#: src/join.c:40 src/sort.c:65 +#: src/join.c:40 src/sort.c:66 msgid "Mike Haertel" msgstr "Mike Haertel" @@ -5090,8 +5146,8 @@ msgstr "" "表示されます。\n" #: src/join.c:403 -#, c-format -msgid "%s:%ju: is not sorted: %.*s" +#, fuzzy, c-format +msgid "%s:%<PRIuMAX>: is not sorted: %.*s" msgstr "%s:%ju: ソートされていません: %.*s" #: src/join.c:840 src/join.c:1038 @@ -5119,12 +5175,12 @@ msgstr "結合するフィールドが不完全です %lu、%lu" msgid "conflicting empty-field replacement strings" msgstr "空の文字列を置換する文字列が競合しています" -#: src/join.c:1101 src/sort.c:4414 +#: src/join.c:1101 src/sort.c:4468 #, c-format msgid "multi-character tab %s" msgstr "複数文字のタブ %s" -#: src/join.c:1105 src/sort.c:4419 +#: src/join.c:1105 src/sort.c:4473 #, c-format msgid "incompatible tabs" msgstr "互換性のないタブです" @@ -5146,12 +5202,11 @@ msgstr "" "または: %s -t [SIGNAL]...\n" #: src/kill.c:82 -msgid "" -"Send signals to processes, or list signals.\n" -"\n" +#, fuzzy +msgid "Send signals to processes, or list signals.\n" msgstr "プロセスにシグナルを送信するか、シグナル一覧を表示します。\n" -#: src/kill.c:89 +#: src/kill.c:88 msgid "" " -s, --signal=SIGNAL, -SIGNAL\n" " specify the name or number of the signal to be sent\n" @@ -5163,7 +5218,7 @@ msgstr "" " -l, --list シグナル名および番号の一覧\n" " -t, --table シグナル情報の一覧表を表示\n" -#: src/kill.c:97 +#: src/kill.c:96 #, fuzzy msgid "" "\n" @@ -5176,32 +5231,32 @@ msgstr "" "シグナルによって終了されたプロセスの終了状態です。\n" "PID は整数です。負の場合はプロセスグループを示します。\n" -#: src/kill.c:206 +#: src/kill.c:205 #, c-format msgid "%s: invalid process id" msgstr "%s: 無効なプロセスID" -#: src/kill.c:260 +#: src/kill.c:259 #, c-format msgid "invalid option -- %c" msgstr "無効なオプション -- %c" -#: src/kill.c:269 +#: src/kill.c:268 #, c-format msgid "%s: multiple signals specified" msgstr "%s: 複数のシグナルが指定されています" -#: src/kill.c:283 +#: src/kill.c:282 #, c-format msgid "multiple -l or -t options specified" msgstr "-l または -t オプションが複数指定されています" -#: src/kill.c:300 +#: src/kill.c:299 #, c-format msgid "cannot combine signal with -l or -t" msgstr "-l または -t とシグナルを組み合わせることができません" -#: src/kill.c:306 +#: src/kill.c:305 #, c-format msgid "no process ID specified" msgstr "プロセス ID が指定されていません" @@ -5313,7 +5368,6 @@ msgid "" "When creating hard links, each TARGET must exist. Symbolic links\n" "can hold arbitrary text; if later resolved, a relative link is\n" "interpreted in relation to its parent directory.\n" -"\n" msgstr "" "1番目の形式では TARGET に対する LINK_NAME という名前のリンクを作成します。\n" "2番目の形式では TARGET に対するリンクを現在のディレクトリに作成します。\n" @@ -5326,7 +5380,7 @@ msgstr "" "す。\n" "\n" -#: src/ln.c:395 +#: src/ln.c:394 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -5349,7 +5403,7 @@ msgstr "" "る)\n" " -f, --force 対象ファイルが存在する時に削除する\n" -#: src/ln.c:403 +#: src/ln.c:402 #, fuzzy msgid "" " -i, --interactive prompt whether to remove destinations\n" @@ -5373,7 +5427,7 @@ msgstr "" " -s, --symbolic ハードリンクの代わりにシンボリックリンクを作成" "する\n" -#: src/ln.c:412 +#: src/ln.c:411 #, fuzzy msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -5390,24 +5444,10 @@ msgstr "" " -T, --no-target-directory LINK_NAME を通常ファイルとして扱う\n" " -v, --verbose リンクを作成した時にファイル名を表示する\n" -#: src/ln.c:428 -#, 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 で作成する\n" -" simple, never 常に簡易バックアップを作成\n" - -#: src/ln.c:435 +#: src/ln.c:433 #, fuzzy, 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 "" @@ -5482,7 +5522,7 @@ msgstr "環境変数 COLUMNS の値(%s) が不適切な行幅なので無視し msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "環境変数 TABSIZE の値(%s) が不適切なタブサイズなので無視します" -#: src/ls.c:1750 src/ptx.c:1976 +#: src/ls.c:1750 src/ptx.c:1975 #, c-format msgid "invalid line width: %s" msgstr "無効な行幅です: %s" @@ -5546,23 +5586,23 @@ msgstr "ディレクトリ %s を読み込んでいます" msgid "closing directory %s" msgstr "ディレクトリ %s を閉じています" -#: src/ls.c:3301 +#: src/ls.c:3302 #, c-format msgid "cannot compare file names %s and %s" msgstr "ファイル名 %s および %s を比較できません" #: src/ls.c:4721 +#, 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" -"\n" msgstr "" "FILE に関する情報を一覧表示します (デフォルトは現在のディレクトリ)。\n" "-cftuvSUX または --sort が指定されない限り、要素はアルファベット順で並べ替え" "られます。\n" "\n" -#: src/ls.c:4729 +#: src/ls.c:4728 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -5577,7 +5617,7 @@ msgstr "" " -b, --escape 表示不可能な文字の場合に C 形式のエスケープ文字" "を表示する\n" -#: src/ls.c:4735 +#: src/ls.c:4734 #, fuzzy msgid "" " --block-size=SIZE scale sizes by SIZE before printing them. E." @@ -5604,7 +5644,7 @@ msgstr "" "示する\n" " それ以外: ctime で新しい順に並べ替える\n" -#: src/ls.c:4745 +#: src/ls.c:4744 #, fuzzy msgid "" " -C list entries by columns\n" @@ -5626,7 +5666,7 @@ msgstr "" " -D, --dired Emacs の dired モード用に設計された出力を生成す" "る\n" -#: src/ls.c:4753 +#: src/ls.c:4752 #, fuzzy msgid "" " -f do not sort, enable -aU, disable -ls --color\n" @@ -5647,11 +5687,11 @@ msgstr "" "vertical は -C\n" " --full-time -l --time-style=full-iso と同様\n" -#: src/ls.c:4761 +#: src/ls.c:4760 msgid " -g like -l, but do not list owner\n" msgstr " -g -l と同様だがファイル所有者を表示しない\n" -#: src/ls.c:4764 +#: src/ls.c:4763 msgid "" " --group-directories-first\n" " group directories before files.\n" @@ -5665,7 +5705,7 @@ msgstr "" " --sort=none (-U) と併せたときはグループ化しな" "い\n" -#: src/ls.c:4770 +#: src/ls.c:4769 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" @@ -5679,7 +5719,7 @@ msgstr "" " --si 上と同様だが乗数の単位に 1024 の代わりに 1000 を" "使用する\n" -#: src/ls.c:4776 +#: src/ls.c:4775 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5702,7 +5742,7 @@ msgstr "" "い\n" " (-a または -A で上書きされる)\n" -#: src/ls.c:4786 +#: src/ls.c:4785 #, fuzzy msgid "" " --indicator-style=WORD append indicator with style WORD to entry " @@ -5722,7 +5762,7 @@ msgstr "" "い\n" " -k --block-size=1K と同様\n" -#: src/ls.c:4796 +#: src/ls.c:4795 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5738,7 +5778,7 @@ msgstr "" " 情報を表示する\n" " -m 要素のリストをカンマで区切り、一行に詰め込む\n" -#: src/ls.c:4804 +#: src/ls.c:4803 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. " @@ -5755,7 +5795,7 @@ msgstr "" " -p, --indicator-style=slash\n" " ディレクトリに対して識別子 / を加えて表示する\n" -#: src/ls.c:4812 +#: src/ls.c:4811 #, fuzzy msgid "" " -q, --hide-control-chars print ? instead of non graphic characters\n" @@ -5776,7 +5816,7 @@ msgstr "" " literal, locale, shell, shell-always, c, " "escape\n" -#: src/ls.c:4821 +#: src/ls.c:4820 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -5787,7 +5827,7 @@ msgstr "" " -R, --recursive 子ディレクトリを再帰的に一覧表示する\n" " -s, --size ブロック単位で各ファイルサイズを表示する\n" -#: src/ls.c:4826 +#: src/ls.c:4825 msgid "" " -S sort by file size\n" " --sort=WORD sort by WORD instead of name: none -U,\n" @@ -5810,7 +5850,7 @@ msgstr "" " --sort=time を指定した場合はソートのキーとして\n" " 指定した時間が使用される\n" -#: src/ls.c:4836 +#: src/ls.c:4835 #, fuzzy msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" @@ -5834,7 +5874,7 @@ msgstr "" "は POSIX ロケール\n" " では無い場合にのみ効果がある\n" -#: src/ls.c:4845 +#: src/ls.c:4844 msgid "" " -t sort by modification time, newest first\n" " -T, --tabsize=COLS assume tab stops at each COLS instead of 8\n" @@ -5842,7 +5882,7 @@ msgstr "" " -t ファイル更新時間で新しい順にソートする\n" " -T, --tabsize=COLS タブ幅を 8 の代わりに COLS にする\n" -#: src/ls.c:4849 +#: src/ls.c:4848 msgid "" " -u with -lt: sort by, and show, access time\n" " with -l: show access time and sort by name\n" @@ -5858,7 +5898,7 @@ msgstr "" "で表示する\n" " -v 自然な (バージョン) 数字順でソートする\n" -#: src/ls.c:4856 +#: src/ls.c:4855 msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" @@ -5875,7 +5915,7 @@ msgstr "" "表示する\n" " -1 1 ファイル 1 行で表示する\n" -#: src/ls.c:4866 +#: src/ls.c:4865 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5891,7 +5931,7 @@ msgstr "" "されている場合のみカラーコードを出力します。LS_COLORS 環境変数によって動作\n" "を設定できます。LS_COLORS を設定する場合は dircolors を使用してください。\n" -#: src/ls.c:4873 +#: src/ls.c:4872 msgid "" "\n" "Exit status:\n" @@ -5920,7 +5960,7 @@ msgstr "Scott Miller" msgid "David Madore" msgstr "David Madore" -#: src/md5sum.c:162 +#: src/md5sum.c:164 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -5933,7 +5973,7 @@ msgstr "" "FILE の指定が無いか、 - が指定された場合、標準入力から読み込みます。\n" "\n" -#: src/md5sum.c:172 +#: src/md5sum.c:174 msgid "" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" @@ -5941,27 +5981,31 @@ msgstr "" " -b, --binary バイナリモードで読み込む (tty 標準入力以外から読み込む" "時のデフォルト)\n" -#: src/md5sum.c:176 +#: src/md5sum.c:178 msgid " -b, --binary read in binary mode\n" msgstr " -b, --binary バイナリモードで読み込む\n" -#: src/md5sum.c:179 +#: src/md5sum.c:181 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr " -c, --check FILE から %s チェックサムを読み込み、照合する\n" -#: src/md5sum.c:183 +#: src/md5sum.c:184 +msgid " --tag create a BSD-style checksum\n" +msgstr "" + +#: src/md5sum.c:188 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" " -t, --text テキストモードで読み込む (tty 標準入力から読み込む時の" "デフォルト)\n" -#: src/md5sum.c:187 +#: src/md5sum.c:192 msgid " -t, --text read in text mode (default)\n" msgstr " -t, --text テキストモードで読み込む (デフォルト)\n" -#: src/md5sum.c:190 +#: src/md5sum.c:195 msgid "" "\n" "The following three options are useful only when verifying checksums:\n" @@ -5978,14 +6022,14 @@ msgstr "" " -w, --warn チェックサム行の書式が不正な場合に警告を行う\n" "\n" -#: src/md5sum.c:198 +#: src/md5sum.c:203 msgid "" " --strict with --check, exit non-zero for any invalid input\n" msgstr "" " --strict --check と併せて使用し、無効な入力がある場合に 0 以外" "で終了する\n" -#: src/md5sum.c:203 +#: src/md5sum.c:208 #, fuzzy, c-format msgid "" "\n" @@ -6001,74 +6045,84 @@ msgstr "" "チェックサム、入力モードの印(バイナリには `*', テキストには ` ')、 \n" "およびファイル名を表示します。\n" -#: src/md5sum.c:502 +#: src/md5sum.c:523 #, c-format msgid "%s: too many checksum lines" msgstr "%s: チェックサム行が多すぎます" -#: src/md5sum.c:526 +#: src/md5sum.c:547 #, c-format msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line" msgstr "%s: %<PRIuMAX>: %s チェックサム行として不適切な書式です" -#: src/md5sum.c:551 +#: src/md5sum.c:572 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: オープンまたは読み込みに失敗しました\n" -#: src/md5sum.c:574 +#: src/md5sum.c:595 msgid "FAILED" msgstr "失敗" -#: src/md5sum.c:576 +#: src/md5sum.c:597 msgid "OK" msgstr "完了" -#: src/md5sum.c:600 +#: src/md5sum.c:621 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "%s: %s チェックサムとして適切な書式の行がありませんでした" -#: src/md5sum.c:610 +#: src/md5sum.c:631 #, c-format msgid "WARNING: %<PRIuMAX> line is improperly formatted" msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted" msgstr[0] "警告: 書式が不適切な行が %<PRIuMAX> 行あります" -#: src/md5sum.c:618 +#: src/md5sum.c:639 #, 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:626 +#: src/md5sum.c:647 #, 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:704 +#: src/md5sum.c:760 #, c-format -msgid "" -"the --binary and --text options are meaningless when verifying checksums" -msgstr "チェックサムの照合時には --binary および --text オプションは無意味です" +msgid "--tag does not support --text mode" +msgstr "" -#: src/md5sum.c:712 +#: src/md5sum.c:766 +#, fuzzy, c-format +msgid "the --tag option is meaningless when verifying checksums" +msgstr "--status オプションはチェックサムの照合時のみ意味を持ちます" + +#: src/md5sum.c:773 +#, c-format +msgid "" +"the --binary and --text options are meaningless when verifying checksums" +msgstr "チェックサムの照合時には --binary および --text オプションは無意味です" + +#: src/md5sum.c:781 #, c-format msgid "the --status option is meaningful only when verifying checksums" msgstr "--status オプションはチェックサムの照合時のみ意味を持ちます" -#: src/md5sum.c:719 +#: src/md5sum.c:788 #, c-format msgid "the --warn option is meaningful only when verifying checksums" msgstr "--warn オプションはチェックサムの照合時のみ意味を持ちます" -#: src/md5sum.c:726 +#: src/md5sum.c:795 #, c-format msgid "the --quiet option is meaningful only when verifying checksums" msgstr "--quiet オプションはチェックサムの照合時のみ意味を持ちます" -#: src/md5sum.c:733 +#: src/md5sum.c:802 #, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "--strict オプションはチェックサムの照合時のみ意味を持ちます" @@ -6079,14 +6133,13 @@ msgid "Usage: %s [OPTION]... DIRECTORY...\n" msgstr "使用法: %s [OPTION]... DIRECTORY...\n" #: src/mkdir.c:57 -msgid "" -"Create the DIRECTORY(ies), if they do not already exist.\n" -"\n" +#, fuzzy +msgid "Create the DIRECTORY(ies), if they do not already exist.\n" msgstr "" "ディレクトリが存在しない場合に、ディレクトリを作成します。\n" "\n" -#: src/mkdir.c:64 +#: src/mkdir.c:63 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" @@ -6103,7 +6156,7 @@ msgstr "" "ト CTX \n" " を設定する\n" -#: src/mkdir.c:169 +#: src/mkdir.c:168 #, c-format msgid "created directory %s" msgstr "ディレクトリ %s を作成しました" @@ -6114,33 +6167,32 @@ msgid "Usage: %s [OPTION]... NAME...\n" msgstr "使用法: %s [OPTION]... NAME...\n" #: src/mkfifo.c:52 -msgid "" -"Create named pipes (FIFOs) with the given NAMEs.\n" -"\n" +#, fuzzy +msgid "Create named pipes (FIFOs) with the given NAMEs.\n" msgstr "" "NAME という名前の名前付きパイプ (FIFO) を作成します。\n" "\n" -#: src/mkfifo.c:59 src/mknod.c:61 +#: src/mkfifo.c:58 src/mknod.c:60 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:62 +#: src/mkfifo.c:61 msgid "" " -Z, --context=CTX set the SELinux security context of each NAME to CTX\n" msgstr "" " -Z, --context=CTX 作成した各 NAME に SELinux セキュリティコンテキスト CTX " "を設定する\n" -#: src/mkfifo.c:122 src/mknod.c:128 +#: src/mkfifo.c:121 src/mknod.c:127 #, c-format msgid "invalid mode" msgstr "無効なモード" -#: src/mkfifo.c:127 src/mknod.c:133 +#: src/mkfifo.c:126 src/mknod.c:132 #, c-format msgid "mode must specify only file permission bits" msgstr "モードにはファイルパーミッションのビットのみ指定できます" @@ -6151,20 +6203,19 @@ msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n" msgstr "使用法: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n" #: src/mknod.c:54 -msgid "" -"Create the special file NAME of the given TYPE.\n" -"\n" +#, fuzzy +msgid "Create the special file NAME of the given TYPE.\n" msgstr "" "スペシャルファイル NAME をタイプ TYPE で作成します。\n" "\n" -#: src/mknod.c:64 +#: 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:69 +#: src/mknod.c:68 msgid "" "\n" "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n" @@ -6181,7 +6232,7 @@ msgstr "" "解釈\n" "されます。 TYPE は次の通りです:\n" -#: src/mknod.c:76 +#: src/mknod.c:75 msgid "" "\n" " b create a block (buffered) special file\n" @@ -6193,42 +6244,42 @@ msgstr "" " c, u キャラクタ型(バッファリングされない)スペシャルファイルを作成\n" " p 名前つきパイプを作成\n" -#: src/mknod.c:151 +#: src/mknod.c:150 msgid "Special files require major and minor device numbers." msgstr "" "スペシャルファイルを作成する時は、MAJOR および MINOR デバイス番号を\n" "指定しなければなりません。" -#: src/mknod.c:161 +#: src/mknod.c:160 msgid "Fifos do not have major and minor device numbers." msgstr "FIFO に MAJOR および MINOR デバイス番号を指定してはいけません。" -#: src/mknod.c:177 +#: src/mknod.c:176 #, c-format msgid "block special files not supported" msgstr "ブロックスペシャルファイルはサポートされていません" -#: src/mknod.c:186 +#: src/mknod.c:185 #, c-format msgid "character special files not supported" msgstr "キャラクタスペシャルファイルはサポートされていません" -#: src/mknod.c:202 +#: src/mknod.c:201 #, c-format msgid "invalid major device number %s" msgstr "無効な MAJOR デバイス番号です: %s" -#: src/mknod.c:207 +#: src/mknod.c:206 #, c-format msgid "invalid minor device number %s" msgstr "無効な MINOR デバイス番号です: %s" -#: src/mknod.c:212 +#: src/mknod.c:211 #, c-format msgid "invalid device %s %s" msgstr "無効なデバイス番号です: %s %s" -#: src/mknod.c:226 +#: src/mknod.c:225 #, c-format msgid "invalid device type %s" msgstr "無効なデバイスタイプです: %s" @@ -6324,63 +6375,62 @@ msgstr "" "スの単一\n" " ファイル名要素として解釈する (非推奨)\n" -#: src/mktemp.c:222 +#: src/mktemp.c:223 #, c-format msgid "failed to redirect stderr to /dev/null" msgstr "標準エラー出力を /dev/null にリダイレクト出来ませんでした" -#: src/mktemp.c:228 +#: src/mktemp.c:229 #, c-format msgid "too many templates" msgstr "TEMPLATE が多すぎます" -#: src/mktemp.c:248 +#: src/mktemp.c:249 #, c-format msgid "with --suffix, template %s must end in X" msgstr "" "--suffix を使用する場合、テンプレート %s は X で終了しなければいけません" -#: src/mktemp.c:273 src/split.c:1117 +#: src/mktemp.c:274 src/split.c:1130 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "%s: 無効な接尾辞です。ディレクトリ区切り文字が含まれています" -#: src/mktemp.c:278 +#: src/mktemp.c:279 #, c-format msgid "too few X's in template %s" msgstr "テンプレート %s に含まれている X の数が少なすぎます" -#: src/mktemp.c:291 +#: src/mktemp.c:292 #, c-format msgid "invalid template, %s, contains directory separator" msgstr "%s: 無効なテンプレートです。ディレクトリ区切り文字が含まれています" -#: src/mktemp.c:305 +#: src/mktemp.c:306 #, c-format msgid "invalid template, %s; with --tmpdir, it may not be absolute" msgstr "" "%s: 無効なテンプレートです。 --tmpdir を使用する場合、絶対パスで無いかもしれ" "ません" -#: src/mktemp.c:325 +#: src/mktemp.c:326 #, c-format msgid "failed to create directory via template %s" msgstr "テンプレート %s からディレクトリを作成できません" -#: src/mktemp.c:335 +#: src/mktemp.c:336 #, c-format msgid "failed to create file via template %s" msgstr "テンプレート %s からファイルを作成できません" -#: src/mv.c:290 -msgid "" -"Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" -"\n" +#: src/mv.c:292 +#, fuzzy +msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" msgstr "" "ファイル名の変更、もしくは複数のファイルをディレクトリへ移動します。\n" "\n" -#: src/mv.c:297 +#: src/mv.c:298 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -6400,7 +6450,7 @@ msgstr "" " -n, --no-clobber 既存のファイルを上書きしない\n" "-i, -f, -n を一つ以上使用した場合、最後のオプションが使用されます。\n" -#: src/mv.c:306 +#: src/mv.c:307 msgid "" " --strip-trailing-slashes remove any trailing slashes from each " "SOURCE\n" @@ -6412,7 +6462,7 @@ msgstr "" " -S, --suffix=SUFFIX 通常のバックアップ接尾辞を SUFFIX で上書きす" "る\n" -#: src/mv.c:311 +#: src/mv.c:312 msgid "" " -t, --target-directory=DIRECTORY move all SOURCE arguments into " "DIRECTORY\n" @@ -6436,13 +6486,11 @@ msgid "Usage: %s [OPTION] [COMMAND [ARG]...]\n" msgstr "使用法: %s [OPTION] [COMMAND [ARG]...]\n" #: src/nice.c:73 -#, c-format +#, fuzzy, c-format msgid "" "Run COMMAND with an adjusted niceness, which affects process scheduling.\n" -"With no COMMAND, print the current niceness. Nicenesses range from\n" -"%d (most favorable scheduling) to %d (least favorable).\n" -"\n" -" -n, --adjustment=N add integer N to the niceness (default 10)\n" +"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 "" "優先度を指定して COMMAND を実行します。これはプロセススケジュールに\n" "影響をあたえます。COMMAND を指定しない場合、現在の優先度を表示します。\n" @@ -6450,22 +6498,26 @@ msgstr "" "\n" " -n, --adjustment=N 整数値 N を優先度に加える (デフォルト: 10)\n" -#: src/nice.c:168 +#: src/nice.c:82 +msgid " -n, --adjustment=N add integer N to the niceness (default 10)\n" +msgstr "" + +#: src/nice.c:172 #, c-format msgid "invalid adjustment %s" msgstr "%s: 無効な優先度です" -#: src/nice.c:177 +#: src/nice.c:181 #, c-format msgid "a command must be given with an adjustment" msgstr "優先度を指定するコマンドを与えなくてはいけません" -#: src/nice.c:184 src/nice.c:195 +#: src/nice.c:188 src/nice.c:199 #, c-format msgid "cannot get niceness" msgstr "優先度を取得できません" -#: src/nice.c:201 +#: src/nice.c:205 #, c-format msgid "cannot set niceness" msgstr "優先度を設定できません" @@ -6475,17 +6527,17 @@ msgstr "優先度を設定できません" msgid "Scott Bartram" msgstr "Scott Bartram" -#: src/nl.c:186 +#: 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" -"\n" msgstr "" "指定したそれぞれのファイルに行番号を付け足して標準出力に書き込みます。\n" "ファイルを指定しないか `-' を指定した場合には標準入力から読み込みます。\n" "\n" -#: src/nl.c:194 +#: src/nl.c:186 msgid "" " -b, --body-numbering=STYLE use STYLE for numbering body lines\n" " -d, --section-delimiter=CC use CC for separating logical pages\n" @@ -6495,7 +6547,7 @@ msgstr "" " -d, --section-delimiter=CC 論理ページの区切り記号に CC を利用する\n" " -f, --footer-numbering=STYLE フッタの行番号を STYLE の形式にする\n" -#: src/nl.c:199 +#: src/nl.c:191 msgid "" " -h, --header-numbering=STYLE use STYLE for numbering header lines\n" " -i, --line-increment=NUMBER line number increment at each line\n" @@ -6514,7 +6566,7 @@ msgstr "" " -s, --number-separator=STRING 行番号の後ろに STRING を加える (可能な場" "合)\n" -#: src/nl.c:207 +#: src/nl.c:199 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" @@ -6523,7 +6575,7 @@ msgstr "" "る\n" " -w, --number-width=NUMBER 行番号を表示する列幅を NUMBER にする\n" -#: src/nl.c:213 +#: src/nl.c:205 msgid "" "\n" "By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC are\n" @@ -6537,7 +6589,7 @@ msgstr "" "`\\\\' を 指定したければ, `\\\\' を使うようにしてください。\n" "STYLE は以下のうちの 1 つを指定します。\n" -#: src/nl.c:219 +#: src/nl.c:211 msgid "" "\n" " a number all lines\n" @@ -6566,53 +6618,47 @@ msgstr "" " rz 右揃え、0で埋める\n" "\n" -#: src/nl.c:286 +#: src/nl.c:278 #, c-format msgid "line number overflow" msgstr "行番号が溢れました" -#: src/nl.c:486 +#: src/nl.c:478 #, c-format msgid "invalid header numbering style: %s" msgstr "無効なヘッダ番号書式です: %s" -#: src/nl.c:494 +#: src/nl.c:486 #, c-format msgid "invalid body numbering style: %s" msgstr "無効な本文番号書式です: %s" -#: src/nl.c:502 +#: src/nl.c:494 #, c-format msgid "invalid footer numbering style: %s" msgstr "無効な振った番号書式です: %s" -#: src/nl.c:511 +#: src/nl.c:503 #, c-format msgid "invalid starting line number: %s" msgstr "開始行番号が正しくありません: %s" -#: src/nl.c:517 -#, c-format -msgid "WARNING: --page-increment is deprecated; use --line-increment instead" -msgstr "" -"警告: --page-increment は非推奨です。 --line-increment を使用してください" - -#: src/nl.c:524 +#: src/nl.c:512 #, c-format msgid "invalid line number increment: %s" msgstr "行番号の増分が正しくありません: %s" -#: src/nl.c:536 +#: src/nl.c:524 #, c-format msgid "invalid number of blank lines: %s" msgstr "空行の行番号が正しくありません: %s" -#: src/nl.c:550 +#: src/nl.c:538 #, c-format msgid "invalid line number field width: %s" msgstr "無効な行番号幅の指定です: %s" -#: src/nl.c:569 +#: src/nl.c:557 #, c-format msgid "invalid line numbering format: %s" msgstr "無効な行番号書式です: %s" @@ -6663,11 +6709,6 @@ msgstr "標準入力が使用できないため取り込むことに失敗しま msgid "ignoring input" msgstr "入力を無視します" -#: src/nohup.c:163 src/nohup.c:165 -#, c-format -msgid "failed to open %s" -msgstr "%s を開けませんでした" - #: src/nohup.c:175 #, c-format msgid "ignoring input and appending output to %s" @@ -6699,16 +6740,16 @@ msgid "failed to redirect standard error" msgstr "標準エラー出力のリダイレクトに失敗しました" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:32 +#: src/nproc.c:33 msgid "Giuseppe Scrivano" msgstr "Giuseppe Scrivano" -#: src/nproc.c:56 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 +#: src/nproc.c:57 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "使用法: %s [OPTION]...\n" -#: src/nproc.c:57 +#: src/nproc.c:58 msgid "" "Print the number of processing units available to the current process,\n" "which may be less than the number of online processors\n" @@ -6718,7 +6759,7 @@ msgstr "" "オンラインになっているプロセッサ数より少ないかもしれません。\n" "\n" -#: src/nproc.c:62 +#: src/nproc.c:63 msgid "" " --all print the number of installed processors\n" " --ignore=N if possible, exclude N processing units\n" @@ -6726,11 +6767,351 @@ msgstr "" " --all 導入されているプロセッサの数を表示する\n" " --ignore=N 可能であれば N 個のプロセスユニットを無視する\n" -#: src/nproc.c:106 +#: src/nproc.c:107 #, c-format msgid "%s: invalid number to ignore" msgstr "%s: 無視する数が無効です" +#. This is a proper name. See the gettext manual, section Names. +#: src/numfmt.c:35 +msgid "Assaf Gordon" +msgstr "" + +#: src/numfmt.c:676 +#, fuzzy, c-format +msgid "value too large to be converted: '%s'" +msgstr "%s: 値は完全には変換されていません" + +#: src/numfmt.c:680 +#, fuzzy, c-format +msgid "invalid number: '%s'" +msgstr "%s : 無効な数字です" + +#: src/numfmt.c:684 +#, c-format +msgid "rejecting suffix in input: '%s' (consider using --from)" +msgstr "" + +#: src/numfmt.c:688 +#, fuzzy, c-format +msgid "invalid suffix in input: '%s'" +msgstr "引数 `%3$s' に対して無効な接尾辞 %1$s%2$s です" + +#: src/numfmt.c:692 +#, c-format +msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)" +msgstr "" + +#: src/numfmt.c:723 +#, fuzzy, c-format +msgid "failed to prepare value '%Lf' for printing" +msgstr "%s: 書き込み用に開くことに失敗しました" + +#: src/numfmt.c:787 +#, fuzzy, c-format +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 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [NUMBER]...\n" +msgstr "使用法: %s [OPTION]... [USER]...\n" + +#: src/numfmt.c:816 +msgid "" +"Reformat NUMBER(s), or the numbers from standard input if none are " +"specified.\n" +msgstr "" + +#: src/numfmt.c:820 +#, fuzzy +msgid " --debug print warnings about invalid input\n" +msgstr "" +" --strict --check と併せて使用し、無効な入力がある場合に 0 以外" +"で終了する\n" + +#: src/numfmt.c:823 +msgid "" +" -d, --delimiter=X use X instead of whitespace for field delimiter\n" +msgstr "" + +#: src/numfmt.c:826 +msgid "" +" --field=N replace the number in input field N (default is 1)\n" +msgstr "" + +#: src/numfmt.c:829 +msgid "" +" --format=FORMAT use printf style floating-point FORMAT;\n" +" see FORMAT below for details\n" +msgstr "" + +#: src/numfmt.c:833 +msgid "" +" --from=UNIT auto-scale input numbers to UNITs; default is " +"'none';\n" +" see UNIT below\n" +msgstr "" + +#: src/numfmt.c:837 +msgid "" +" --from-unit=N specify the input unit size (instead of the default " +"1)\n" +msgstr "" + +#: src/numfmt.c:840 +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 "" + +#: src/numfmt.c:844 +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 +msgid "" +" --invalid=MODE failure mode for invalid numbers: MODE can be:\n" +" abort (default), fail, warn, ignore\n" +msgstr "" + +#: src/numfmt.c:852 +msgid "" +" --padding=N pad the output to N characters; positive N will\n" +" right-align; negative N will left-align;\n" +" padding is ignored if the output is wider than N;\n" +" the default is to automatically pad if a " +"whitespace\n" +" is found\n" +msgstr "" + +#: src/numfmt.c:859 +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 +msgid "" +" --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" +" SUFFIX in input numbers\n" +msgstr "" + +#: src/numfmt.c:867 +msgid "" +" --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" +msgstr "" + +#: src/numfmt.c:870 +msgid "" +" --to-unit=N the output unit size (instead of the default 1)\n" +msgstr "" + +#: src/numfmt.c:877 +#, fuzzy +msgid "" +"\n" +"UNIT options:\n" +msgstr "" +"そのほかのオプション:\n" +"\n" + +#: src/numfmt.c:880 +msgid " none no auto-scaling is done; suffixes will trigger an error\n" +msgstr "" + +#: src/numfmt.c:883 +msgid "" +" auto accept optional single/two letter suffix:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" +msgstr "" + +#: src/numfmt.c:889 +msgid "" +" si accept optional single letter suffix:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:894 +msgid "" +" iec accept optional single letter suffix:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:899 +msgid "" +" iec-i accept optional two-letter suffix:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:905 +#, 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" +msgstr "" + +#: src/numfmt.c:912 +#, c-format +msgid "" +"\n" +"Exit status is 0 if all input numbers were successfully converted.\n" +"By default, %s will stop at the first conversion error with exit status 2.\n" +"With --invalid='fail' a warning is printed for each conversion error\n" +"and the exit status is 2. With --invalid='warn' each conversion error is\n" +"diagnosed, but the exit status is 0. With --invalid='ignore' conversion\n" +"errors are not diagnosed and the exit status is 0.\n" +msgstr "" + +#: src/numfmt.c:921 +#, c-format +msgid "" +"\n" +"Examples:\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" +msgstr "" + +#: src/numfmt.c:974 src/seq.c:212 +#, c-format +msgid "format %s has no %% directive" +msgstr "FORMAT %s に %% 指定がありません" + +#: src/numfmt.c:990 +#, fuzzy, c-format +msgid "invalid format %s (width overflow)" +msgstr "無効な書式幅です" + +#: src/numfmt.c:1007 src/seq.c:229 +#, c-format +msgid "format %s ends in %%" +msgstr "FORMAT %s が %% で終了しています" + +#: src/numfmt.c:1010 +#, c-format +msgid "invalid format %s, directive must be %%['][-][N]f" +msgstr "" + +#: src/numfmt.c:1018 src/seq.c:236 +#, c-format +msgid "format %s has too many %% directives" +msgstr "FORMAT %s に %% 指定が多すぎます" + +#: src/numfmt.c:1070 +#, fuzzy, c-format +msgid "invalid suffix in input '%s': '%s'" +msgstr "引数 `%3$s' に対して無効な接尾辞 %1$s%2$s です" + +#: src/numfmt.c:1092 +#, c-format +msgid "value too large to be printed: '%Lg' (consider using --to)" +msgstr "" + +#: src/numfmt.c:1100 +#, c-format +msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" +msgstr "" + +#: src/numfmt.c:1184 +#, c-format +msgid "large input value '%s': possible precision loss" +msgstr "" + +#: src/numfmt.c:1293 +#, 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 "無効なページ範囲です %s" + +#: src/numfmt.c:1401 +#, fuzzy, c-format +msgid "invalid field value '%s'" +msgstr "無効なフィールド番号です: %s" + +#: src/numfmt.c:1430 +#, fuzzy, c-format +msgid "invalid header value '%s'" +msgstr "%s は無効な日付です" + +#: src/numfmt.c:1456 +#, 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 +#, fuzzy, c-format +msgid "no conversion option specified" +msgstr "複数の -i オプションが指定されています" + +#: src/numfmt.c:1471 +#, fuzzy, c-format +msgid "grouping cannot be combined with --to" +msgstr "ファイルオペランドと --files0-from を同時に使用できません" + +#: src/numfmt.c:1473 +#, c-format +msgid "grouping has no effect in this locale" +msgstr "" + +#: src/numfmt.c:1486 +#, c-format +msgid "--header ignored with command-line input" +msgstr "" + +#: src/numfmt.c:1511 +#, fuzzy, c-format +msgid "error reading input" +msgstr "%s の読み込みエラー" + +#: src/numfmt.c:1520 +#, fuzzy, c-format +msgid "failed to convert some of the input numbers" +msgstr "標準入力が使用できないため取り込むことに失敗しました" + #: src/od.c:294 #, c-format msgid "" @@ -6760,27 +7141,45 @@ msgstr "" "\n" #: src/od.c:307 -msgid "All arguments to long options are mandatory for short options.\n" -msgstr "長いオプションに必須の引数は短いオプションにも必須です。\n" +#, fuzzy +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" +"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" +"at first byte printed, incremented when dump is progressing.\n" +"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" +"(オペランドが2個で) 数字の場合には二番目の使用法と見なされます。\n" +"OFFSET オペランドは -j OFFSET と同じです。LABEL は表示される最初のバイトの\n" +"仮想的なアドレスで、ダンプ処理されるにつれて増加します。\n" +"OFFSET および LABEL に 0x または 0X 接頭辞をつけると十六進数を表します。\n" +"接尾子 . は八進数を表します。接尾子 b は 512 倍を表します。\n" -#: src/od.c:310 +#: src/od.c:318 +#, fuzzy msgid "" -" -A, --address-radix=RADIX decide how file offsets are printed\n" +" -A, --address-radix=RADIX output format for file offsets. RADIX is one\n" +" of [doxn], for Decimal, Octal, Hex or None\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:314 +#: src/od.c:323 #, 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" -" --traditional accept arguments in traditional form\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 ダンプするファイルの大きさを BYTES に制限する\n" " -S, --strings[=BYTES] 表示可能な BYTES 以上の長さを持つ文字列を出力す" @@ -6790,9 +7189,11 @@ msgstr "" " -w, --width[=BYTES] 一行あたりの出力バイト数を BYTES バイトにする\n" " --traditional 古い POSIX の形式の引数を受け付ける\n" -#: src/od.c:324 +#: src/od.c:336 +#, fuzzy 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" @@ -6806,7 +7207,7 @@ msgstr "" " -c -t c と同様。 ASCII 文字または \\ エスケープ文字で表示する\n" " -d -t u2と同様。符号なし十進数2バイトで表示する\n" -#: src/od.c:332 +#: src/od.c:345 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -6822,29 +7223,12 @@ msgstr "" " -s -t d2と同様。十進数2バイトで表示する\n" " -x -t x2と同様。十六進数2バイトで表示する\n" -#: src/od.c:340 +#: src/od.c:353 +#, fuzzy msgid "" "\n" -"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" -"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" -"at first byte printed, incremented when dump is progressing.\n" -"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" -"(オペランドが2個で) 数字の場合には二番目の使用法と見なされます。\n" -"OFFSET オペランドは -j OFFSET と同じです。LABEL は表示される最初のバイトの\n" -"仮想的なアドレスで、ダンプ処理されるにつれて増加します。\n" -"OFFSET および LABEL に 0x または 0X 接頭辞をつけると十六進数を表します。\n" -"接尾子 . は八進数を表します。接尾子 b は 512 倍を表します。\n" - -#: src/od.c:349 -msgid "" "\n" "TYPE is made up of one or more of these specifications:\n" -"\n" " a named character, ignoring high-order bit\n" " c ASCII character or backslash escape\n" msgstr "" @@ -6854,7 +7238,7 @@ msgstr "" " a 文字名。最上位ビットは無視される\n" " c ASCII 文字または \\ エスケープ文字\n" -#: src/od.c:356 +#: src/od.c:360 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -6868,10 +7252,11 @@ msgstr "" " u[サイズ] 符号なし10進数 1 整数(integer)のサイズ指定\n" " x[サイズ] 16進数 1 整数(integer)のサイズ指定\n" -#: src/od.c:363 +#: src/od.c:367 +#, fuzzy msgid "" "\n" -"SIZE is a number. For TYPE in doux, SIZE may also be C for\n" +"SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" "sizeof(char), S for sizeof(short), I for sizeof(int) or L for\n" "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" @@ -6883,48 +7268,37 @@ msgstr "" "F は sizeof(float) として, D は sizeof(double) として, または \n" "L は sizeof(long double) として指定できます.\n" -#: src/od.c:370 +#: src/od.c:374 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" +"Adding a z suffix to any type displays printable characters at the end of\n" +"each output line.\n" msgstr "" -"\n" -"RADIX にはアドレスの基数を指定します。d は十進数を、 o は八進数を、x は十六進" -"数です。\n" -"n を指定したときにはアドレスを表示しません。\n" -"BYTES の接頭辞に 0x または 0X をつけると十六進数として扱われます。また、次の" -"倍数接尾辞\n" -"を指定できます:\n" -"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" -"全ての TYPE 指定で z 接尾辞をつけると各出力行の最後にの表示可能な文字を出力し" -"ます。\n" -#: src/od.c:380 +#: src/od.c:379 +#, 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" +"\n" +"\n" +"BYTES is hex with 0x or 0X prefix, and may have a multiplier suffix:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"and so on for G, T, P, E, Z, Y.\n" msgstr "" -"--string オプションに数値を指定しない場合は 3 とみなされます。--width オプ" -"ションに\n" -"数値を指定しないと 32 とみなされます。デフォルトでは -A o -t oS -w16 オプショ" -"ンが\n" -"使用されます。\n" +"\n" +"K には以下の倍数接尾子を続けることが出来ます:\n" +"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:633 src/od.c:753 +#: src/od.c:639 src/od.c:759 #, c-format msgid "invalid type string %s" msgstr "無効な TYPE 指定文字列です: %s" -#: src/od.c:643 +#: src/od.c:649 #, c-format msgid "" "invalid type string %s;\n" @@ -6933,7 +7307,7 @@ msgstr "" "無効な TYPE 指定文字列です: %s;\n" "このシステムでは %lu バイト整数型を扱えません" -#: src/od.c:764 +#: src/od.c:770 #, c-format msgid "" "invalid type string %s;\n" @@ -6942,38 +7316,38 @@ msgstr "" "無効な TYPE 指定文字列です: %s;\n" "このシステムでは %lu バイト浮動小数点型を扱えません" -#: src/od.c:822 +#: src/od.c:828 #, fuzzy, c-format msgid "invalid character '%c' in type string %s" msgstr "型指定文字列 %2$s に無効な文字 `%1$c' が含まれています" -#: src/od.c:1047 +#: src/od.c:1053 #, c-format msgid "cannot skip past end of combined input" msgstr "入力の終端を越えて読みとばす事はできません" -#: src/od.c:1603 +#: src/od.c:1609 #, fuzzy, c-format msgid "invalid output address radix '%c'; it must be one character from [doxn]" msgstr "" "無効な出力アドレスの基数 `%c' が指定されました\n" " -- doxn のいずれかを指定してください" -#: src/od.c:1729 +#: src/od.c:1735 #, c-format msgid "no type may be specified when dumping strings" msgstr "文字列ダンプ時の型は指定できません" -#: src/od.c:1804 +#: src/od.c:1810 msgid "compatibility mode supports at most one file" msgstr "互換モードでは 1 個のファイルしか使用できません" -#: src/od.c:1825 +#: src/od.c:1831 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "スキップバイト数と読み込みバイト数の和が大きすぎます" -#: src/od.c:1868 +#: src/od.c:1874 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "警告: 幅 %lu は無効な値です。代わりに %d を使用します" @@ -6989,17 +7363,17 @@ msgid "standard input is closed" 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" -"\n" msgstr "" "FILE の各行から, 一致する行をタブ文字で区切り, 順に標準出力に書き込みます.\n" "FILE が指定されない, あるいは `-' を指定した場合には標準入力を読み込みます.\n" "\n" -#: src/paste.c:448 +#: 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" @@ -7007,7 +7381,7 @@ msgstr "" " -d, --delimiters=LIST タブ文字の代わりに, LIST の文字を区切りとして使用\n" " -s, --serial 一行毎ではなく, 一度に 1 つのファイルを貼付ける\n" -#: src/paste.c:509 +#: src/paste.c:508 #, c-format msgid "delimiter list ends with an unescaped backslash: %s" msgstr "" @@ -7069,80 +7443,80 @@ msgid "Kaveh Ghazi" msgstr "Kaveh Ghazi" #. TRANSLATORS: Real name is unknown; at most 19 characters. -#: src/pinky.c:250 +#: src/pinky.c:242 msgid " ???" msgstr " (不明)" #. TRANSLATORS: Idle time is unknown; at most 5 characters. -#: src/pinky.c:274 +#: src/pinky.c:266 msgid "?????" msgstr " 不明" -#: src/pinky.c:323 +#: src/pinky.c:314 #, c-format msgid "Login name: " msgstr "ログイン名: " -#: src/pinky.c:326 +#: src/pinky.c:317 #, c-format msgid "In real life: " msgstr "実名: " #. TRANSLATORS: Real name is unknown; no hard limit. -#: src/pinky.c:330 +#: src/pinky.c:321 msgid "???\n" msgstr "(不明)\n" -#: src/pinky.c:350 +#: src/pinky.c:341 #, c-format msgid "Directory: " msgstr "ディレクトリ" -#: src/pinky.c:352 +#: src/pinky.c:343 #, c-format msgid "Shell: " msgstr "シェル: " -#: src/pinky.c:371 +#: src/pinky.c:362 #, c-format msgid "Project: " msgstr "プロジェクト: " -#: src/pinky.c:395 +#: src/pinky.c:386 #, c-format msgid "Plan:\n" msgstr "プラン:\n" -#: src/pinky.c:414 +#: src/pinky.c:405 msgid "Login" msgstr "ログイン" -#: src/pinky.c:416 +#: src/pinky.c:407 msgid "Name" msgstr "名前" -#: src/pinky.c:417 +#: src/pinky.c:408 msgid " TTY" msgstr "端末" -#: src/pinky.c:419 +#: src/pinky.c:410 msgid "Idle" msgstr "待機" -#: src/pinky.c:420 +#: src/pinky.c:411 msgid "When" msgstr "開始時刻" -#: src/pinky.c:423 +#: src/pinky.c:414 msgid "Where" msgstr "ログイン元" -#: src/pinky.c:502 +#: src/pinky.c:493 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "使用法: %s [OPTION]... [USER]...\n" -#: src/pinky.c:503 +#: src/pinky.c:494 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7158,7 +7532,7 @@ msgstr "" " -p 長形式でユーザのプランファイルを省略\n" " -s 短形式で出力 (標準)\n" -#: src/pinky.c:511 +#: src/pinky.c:502 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7172,7 +7546,7 @@ msgstr "" " -q 短形式でユーザのフルネーム, ログイン元および待機時間を省" "略\n" -#: src/pinky.c:520 +#: src/pinky.c:511 #, fuzzy, c-format msgid "" "\n" @@ -7183,7 +7557,7 @@ msgstr "" "軽量 `finger' プログラムです。ユーザ情報を表示します。\n" "utmp ファイルは %s が使用されます。\n" -#: src/pinky.c:604 +#: src/pinky.c:595 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "" @@ -7200,85 +7574,84 @@ msgstr "Pete TerMaat" msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:912 +#: src/pr.c:908 #, fuzzy, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "`--pages=FIRST_PAGE[:LAST_PAGE]' 引数がありません" -#: src/pr.c:914 +#: src/pr.c:910 #, c-format msgid "invalid page range %s" msgstr "無効なページ範囲です %s" -#: src/pr.c:979 +#: src/pr.c:975 #, fuzzy, c-format msgid "'-l PAGE_LENGTH' invalid number of lines: %s" msgstr "`-l PAGE_LENGTH' 無効な行数です: %s" -#: src/pr.c:1003 +#: src/pr.c:999 #, fuzzy, c-format msgid "'-N NUMBER' invalid starting line number: %s" msgstr "`-N NUMBER' 無効な開始行番号です: %s" -#: src/pr.c:1015 +#: src/pr.c:1011 #, fuzzy, c-format msgid "'-o MARGIN' invalid line offset: %s" msgstr "`-o MARGIN' 無効な行オフセットです: %s" -#: src/pr.c:1056 +#: src/pr.c:1052 #, fuzzy, c-format msgid "'-w PAGE_WIDTH' invalid number of characters: %s" msgstr "`-w PAGE_WIDTH' 無効な文字数です: %s" -#: src/pr.c:1070 +#: src/pr.c:1066 #, fuzzy, c-format msgid "'-W PAGE_WIDTH' invalid number of characters: %s" msgstr "`-W PAGE_WIDTH' 無効な文字数です: %s" -#: src/pr.c:1100 +#: src/pr.c:1096 #, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "並列に印刷するときには列数を指定できません" -#: src/pr.c:1104 +#: src/pr.c:1100 #, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "段組の横方向印刷(-a)と並列印刷を同時指定できません." -#: src/pr.c:1200 +#: src/pr.c:1196 #, fuzzy, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "`-%c' 余分な文字が付いているか引数の数字が無効です: %s" -#: src/pr.c:1304 +#: src/pr.c:1293 #, c-format msgid "page width too narrow" msgstr "ページ幅が狭すぎます" -#: src/pr.c:2369 +#: src/pr.c:2353 #, c-format msgid "starting page number %<PRIuMAX> exceeds page count %<PRIuMAX>" msgstr "開始ページ番号 %<PRIuMAX> は総ページ番号 %<PRIuMAX> を超過しています" -#: src/pr.c:2396 +#: src/pr.c:2380 #, c-format msgid "page number overflow" msgstr "ページ番号が溢れました" -#: src/pr.c:2401 +#: src/pr.c:2385 #, c-format msgid "Page %<PRIuMAX>" msgstr "%<PRIuMAX> ページ" -#: src/pr.c:2773 -msgid "" -"Paginate or columnate FILE(s) for printing.\n" -"\n" +#: src/pr.c:2757 +#, fuzzy +msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" "印字のために、ページ付けや段組を行ないます。\n" "\n" -#: src/pr.c:2780 +#: src/pr.c:2763 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -7295,7 +7668,7 @@ msgstr "" "に\n" " 向けて出力する。ページ毎にカラム内の行数を調整する\n" -#: src/pr.c:2788 +#: src/pr.c:2771 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7313,7 +7686,7 @@ msgstr "" " -d, --double-space\n" " 行間に空行を挿入する\n" -#: src/pr.c:2796 +#: src/pr.c:2779 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7335,7 +7708,7 @@ msgstr "" " (-f と共に 3行分, -f を指定しない場合 5行分のヘッダを出" "力)\n" -#: src/pr.c:2806 +#: src/pr.c:2789 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -7358,7 +7731,7 @@ msgstr "" "効、区切り\n" " 文字を --sep-string[=STRING] に設定する\n" -#: src/pr.c:2815 +#: src/pr.c:2798 msgid "" " -l, --length=PAGE_LENGTH\n" " set the page length to PAGE_LENGTH (66) lines\n" @@ -7372,7 +7745,7 @@ msgstr "" " -m, --merge 全てのファイルを並列に印刷する。 1 ファイル 1 列とし、\n" " -J オプションで行を結合した場合を除き、行を切り詰める。\n" -#: src/pr.c:2822 +#: src/pr.c:2805 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -7389,7 +7762,7 @@ msgstr "" " 表示した最初のページの1行目を NUMBER として数え始め\n" " る (+FIRST_PAGE を参照)\n" -#: src/pr.c:2830 +#: src/pr.c:2813 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -7404,7 +7777,7 @@ msgstr "" " -r, --no-file-warnings\n" " ファイルを開けなかったときに警告を表示しない\n" -#: src/pr.c:2837 +#: src/pr.c:2820 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -7424,7 +7797,7 @@ msgstr "" "り詰\n" " めが無効となる\n" -#: src/pr.c:2844 +#: src/pr.c:2827 #, fuzzy msgid "" " -S[STRING], --sep-string[=STRING]\n" @@ -7442,7 +7815,7 @@ msgstr "" " 列オプションには影響を及ぼさない\n" " -t, --omit-header ページのヘッダーとフッターを表示しない\n" -#: src/pr.c:2851 +#: src/pr.c:2834 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -7464,7 +7837,7 @@ msgstr "" " 複数列の出力時のみページ幅を PAGE_WIDTH (72)\n" " 文字に設定する。 -s[char] は無効になる\n" -#: src/pr.c:2861 +#: src/pr.c:2844 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -7477,7 +7850,7 @@ msgstr "" " PAGE_WIDTH (72) 文字に設定し、行を切り詰める。-S ま\n" " たは -s オプションには影響しない\n" -#: src/pr.c:2869 +#: src/pr.c:2852 msgid "" "\n" "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" @@ -7635,15 +8008,15 @@ msgstr "" "または: %s -G [OPTION]... [INPUT [OUTPUT]]\n" #: src/ptx.c:1821 +#, fuzzy msgid "" "Output a permuted index, including context, of the words in the input " "files.\n" -"\n" msgstr "" "入力ファイルに含まれる単語の索引を並べ替え、前後を含めて出力します。\n" "\n" -#: src/ptx.c:1828 +#: src/ptx.c:1827 #, fuzzy msgid "" " -A, --auto-reference output automatically generated references\n" @@ -7654,7 +8027,7 @@ msgstr "" " -G, --traditional System V の `ptx' により近い動作を行う\n" " -F, --flag-truncation=STRING 行の切り詰めの目印に STRING を使用する\n" -#: src/ptx.c:1833 +#: src/ptx.c:1832 #, fuzzy msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" @@ -7669,7 +8042,7 @@ msgstr "" " -S, --sentence-regexp=REGEXP 行末または文末を表現する正規表現を指定\n" " -T, --format=tex TeX 命令で出力を生成\n" -#: src/ptx.c:1840 +#: src/ptx.c:1839 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -7685,7 +8058,7 @@ msgstr "" " -i, --ignore-file=FILE FILE から無視する単語一覧を読み込む\n" " -o, --only-file=FILE この FILE から単語一覧のみを読み込む\n" -#: src/ptx.c:1848 +#: src/ptx.c:1847 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -7696,7 +8069,7 @@ msgstr "" " -t, --typeset-mode - 未実装 -\n" " -w, --width=NUMBER 列の出力幅を指定. 参照文を除いて数える\n" -#: src/ptx.c:1855 +#: src/ptx.c:1854 #, fuzzy msgid "" "\n" @@ -7705,7 +8078,7 @@ msgstr "" "\n" "FILE を指定しない、または FILE が - の場合は標準入力から読み込まれます。\n" -#: src/ptx.c:1949 +#: src/ptx.c:1948 #, c-format msgid "invalid gap width: %s" msgstr "無効な隙間の幅です: %s" @@ -7732,7 +8105,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "%s にディレクトリを変更 (chdir) できませんでした" -#: src/pwd.c:170 src/pwd.c:277 +#: src/pwd.c:170 src/pwd.c:277 src/split.c:373 #, c-format msgid "failed to stat %s" msgstr "%s の属性情報を取得 (stat) できませんでした" @@ -7748,14 +8121,15 @@ msgid "ignoring non-option arguments" msgstr "非オプション引数を無視します" #. This is a proper name. See the gettext manual, section Names. -#: src/readlink.c:33 +#: src/readlink.c:32 msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 +#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147 +#: src/stat.c:1349 src/touch.c:212 #, c-format -msgid "Usage: %s [OPTION]... FILE\n" -msgstr "使用法: %s [OPTION]... FILE\n" +msgid "Usage: %s [OPTION]... FILE...\n" +msgstr "使用法: %s [OPTION]... FILE...\n" #: src/readlink.c:63 msgid "" @@ -7788,16 +8162,19 @@ msgstr "" " ばいけない\n" #: src/readlink.c:75 +#, fuzzy msgid "" " -m, --canonicalize-missing canonicalize by following every symlink in\n" " every component of the given name " "recursively,\n" " without requirements on components " "existence\n" -" -n, --no-newline do not output the trailing newline\n" +" -n, --no-newline do not output the trailing delimiter\n" " -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" msgstr "" " -m, --canonicalize-missing 与えられた名前の要素中に存在するシンボリック" "リンクを\n" @@ -7807,11 +8184,10 @@ msgstr "" " -s, --silent ほとんどのエラーメッセージ出力を抑止する\n" " -v, --verbose エラーメッセージを報告する\n" -#: src/realpath.c:71 src/rm.c:134 src/shred.c:147 src/stat.c:1330 -#: src/touch.c:215 -#, c-format -msgid "Usage: %s [OPTION]... FILE...\n" -msgstr "使用法: %s [OPTION]... FILE...\n" +#: src/readlink.c:152 +#, fuzzy, c-format +msgid "ignoring --no-newline with multiple arguments" +msgstr "非オプション引数を無視します" #: src/realpath.c:72 msgid "" @@ -7838,12 +8214,12 @@ msgstr "" msgid "generating relative path" msgstr "" -#: src/remove.c:286 +#: src/remove.c:273 #, c-format msgid "%s: descend into write-protected directory %s? " msgstr "%s: 書き込み保護されたディレクトリ %s 配下を削除しますか? " -#: src/remove.c:287 +#: src/remove.c:274 #, c-format msgid "%s: descend into directory %s? " msgstr "%s: ディレクトリ %s 配下に入りますか? " @@ -7852,37 +8228,37 @@ msgstr "%s: ディレクトリ %s 配下に入りますか? " #. translate "%s: remove %s (write-protected) %s? " #. instead. It should avoid grammatical problems #. with the output of file_type. -#: src/remove.c:303 +#: src/remove.c:290 #, c-format msgid "%s: remove write-protected %s %s? " msgstr "%s: 書き込み保護されたファイル %s %s を削除しますか?" -#: src/remove.c:304 +#: src/remove.c:291 #, c-format msgid "%s: remove %s %s? " msgstr "%s: %s %s を削除しますか? " -#: src/remove.c:417 +#: src/remove.c:374 #, c-format msgid "removed directory: %s\n" msgstr "ディレクトリを削除しました: %s\n" -#: src/remove.c:481 +#: src/remove.c:444 #, c-format msgid "cannot remove directory: %s" msgstr "ディレクトリを削除できません: %s" -#: src/remove.c:537 +#: src/remove.c:500 #, c-format msgid "skipping %s, since it's on a different device" msgstr "異なるデバイス上にあるため %s をスキップします" -#: src/remove.c:557 +#: src/remove.c:520 #, c-format msgid "traversal failed: %s" msgstr "横断失敗: %s" -#: src/remove.c:563 +#: src/remove.c:526 #, c-format msgid "" "unexpected failure: fts_info=%d: %s\n" @@ -7891,12 +8267,12 @@ msgstr "" "予期しないエラー: fts_info=%d: %s\n" "%s に報告してください" -#: src/rm.c:118 +#: src/rm.c:119 #, fuzzy, c-format msgid "Try '%s ./%s' to remove the file %s.\n" msgstr "ファイル %3$s を削除するためには `%1$s ./%2$s' を行ってください。\n" -#: src/rm.c:135 +#: src/rm.c:136 #, fuzzy msgid "" "Remove (unlink) the FILE(s).\n" @@ -7910,7 +8286,7 @@ msgstr "" " -f, --force 存在しないファイルを無視する。確認を行わない\n" " -i 削除を行うときに確認を行う\n" -#: src/rm.c:141 +#: src/rm.c:142 msgid "" " -I prompt once before removing more than three files, " "or\n" @@ -7931,7 +8307,7 @@ msgstr "" "した\n" " 場合は always とみなす\n" -#: src/rm.c:148 +#: src/rm.c:149 msgid "" " --one-file-system when removing a hierarchy recursively, skip any\n" " directory that is on a file system different from\n" @@ -7941,12 +8317,13 @@ msgstr "" " 異なったファイルシステムにあるディレクトリをス\n" " キップする\n" -#: src/rm.c:153 +#: src/rm.c:154 #, fuzzy msgid "" " --no-preserve-root do not treat '/' specially\n" " --preserve-root do not remove '/' (default)\n" " -r, -R, --recursive remove directories and their contents recursively\n" +" -d, --dir remove empty directories\n" " -v, --verbose explain what is being done\n" msgstr "" " --no-preserve-root `/' を特別なものとして扱わない\n" @@ -7954,7 +8331,7 @@ msgstr "" " -r, -R, --recursive ディレクトリとその中身を再帰的に削除する\n" " -v, --verbose 何を行っているかを表示する\n" -#: src/rm.c:161 +#: src/rm.c:163 msgid "" "\n" "By default, rm does not remove directories. Use the --recursive (-r or -R)\n" @@ -7967,7 +8344,7 @@ msgstr "" "含めて削除するときには --recursive (-r または -R) オプションを使用してくださ" "い。\n" -#: src/rm.c:166 +#: src/rm.c:168 #, fuzzy, c-format msgid "" "\n" @@ -7984,7 +8361,7 @@ msgstr "" "\n" " %s ./-foo\n" -#: src/rm.c:175 +#: src/rm.c:177 msgid "" "\n" "Note that if you use rm to remove a file, it might be possible to recover\n" @@ -7997,12 +8374,12 @@ msgstr "" "内容を本当に復元不可能にする保証を得たければ、shred の利用を考えてくださ" "い。\n" -#: src/rm.c:335 +#: src/rm.c:342 #, c-format msgid "%s: remove all arguments recursively? " msgstr "%s: 全ての引数を再帰的に削除しますか? " -#: src/rm.c:336 +#: src/rm.c:343 #, c-format msgid "%s: remove all arguments? " msgstr "%s: 全ての引数を削除しますか? " @@ -8061,7 +8438,11 @@ msgstr "" msgid "" "Run a program in a different security context.\n" "With neither CONTEXT nor COMMAND, print the current security context.\n" -"\n" +msgstr "" + +#: src/runcon.c:94 +#, fuzzy +msgid "" " CONTEXT Complete security context\n" " -c, --compute compute process transition context before modifying\n" " -t, --type=TYPE type (for same role as parent)\n" @@ -8082,72 +8463,72 @@ msgstr "" " -l, --range=RANGE レバレッジ\n" "\n" -#: src/runcon.c:140 +#: src/runcon.c:144 #, c-format msgid "multiple roles" msgstr "複数のロール" -#: src/runcon.c:145 +#: src/runcon.c:149 #, c-format msgid "multiple types" msgstr "複数のタイプ" -#: src/runcon.c:150 +#: src/runcon.c:154 #, c-format msgid "multiple users" msgstr "複数のユーザ" -#: src/runcon.c:155 +#: src/runcon.c:159 #, c-format msgid "multiple levelranges" msgstr "複数のレバレッジ" -#: src/runcon.c:173 src/runcon.c:209 +#: src/runcon.c:177 src/runcon.c:213 #, c-format msgid "failed to get current context" msgstr "現在のコンテキストを取得できませんでした" -#: src/runcon.c:183 +#: src/runcon.c:187 #, c-format msgid "you must specify -c, -t, -u, -l, -r, or context" msgstr "-c, -t, -u, -l, -r, またはコンテキストを指定しなければいけません" -#: src/runcon.c:191 +#: src/runcon.c:195 #, c-format msgid "no command specified" msgstr "コマンドが指定されていません" -#: src/runcon.c:197 +#: src/runcon.c:201 #, c-format msgid "%s may be used only on a SELinux kernel" msgstr "%s は SELinux kernel でのみ使用できます" -#: src/runcon.c:223 +#: src/runcon.c:227 #, c-format msgid "failed to compute a new context" msgstr "新しいコンテキストを計算できませんでした" -#: src/runcon.c:237 +#: src/runcon.c:241 #, c-format msgid "failed to set new user %s" msgstr "新しいユーザ %s に設定できませんでした" -#: src/runcon.c:239 +#: src/runcon.c:243 #, c-format msgid "failed to set new type %s" msgstr "新しいタイプ %s に設定できませんでした" -#: src/runcon.c:241 +#: src/runcon.c:245 #, c-format msgid "failed to set new range %s" msgstr "新しいレンジ %s に設定できませんでした" -#: src/runcon.c:243 +#: src/runcon.c:247 #, c-format msgid "failed to set new role %s" msgstr "新しいロール %s に設定できませんでした" -#: src/runcon.c:251 +#: src/runcon.c:255 #, c-format msgid "unable to set security context %s" msgstr "セキュリティコンテキスト %s を設定できません" @@ -8164,9 +8545,12 @@ msgstr "" "または: %s [OPTION]... FIRST INCREMENT LAST\n" #: src/seq.c:73 +msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" +msgstr "" + +#: src/seq.c:79 +#, fuzzy msgid "" -"Print numbers from FIRST to LAST, in steps of INCREMENT.\n" -"\n" " -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" @@ -8178,7 +8562,7 @@ msgstr "" "\\n)\n" " -w, --equal-width 先頭を 0 で埋めて幅が等しくなるようにする\n" -#: src/seq.c:82 +#: src/seq.c:86 msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" @@ -8195,7 +8579,7 @@ msgstr "" "FIRST が LAST より小さい場合、通常 INCREMENT を正にします。また、\n" "FIRST が LAST より大きい場合、通常 INCREMENT を府にします。\n" -#: src/seq.c:90 +#: src/seq.c:94 #, fuzzy msgid "" "FORMAT must be suitable for printing one argument of type 'double';\n" @@ -8207,32 +8591,17 @@ msgstr "" "合、\n" "デフォルトは %.PRECf になります。それ以外は %g になります。\n" -#: src/seq.c:136 +#: src/seq.c:140 #, c-format msgid "invalid floating point argument: %s" msgstr "引数の浮動小数が無効です: %s" -#: src/seq.c:193 -#, c-format -msgid "format %s has no %% directive" -msgstr "FORMAT %s に %% 指定がありません" - -#: src/seq.c:210 -#, c-format -msgid "format %s ends in %%" -msgstr "FORMAT %s が %% で終了しています" - -#: src/seq.c:213 +#: src/seq.c:232 #, c-format msgid "format %s has unknown %%%c directive" msgstr "FORMAT %s に不明な %%%c 指定があります" -#: src/seq.c:217 -#, c-format -msgid "format %s has too many %% directives" -msgstr "FORMAT %s に %% 指定が多すぎます" - -#: src/seq.c:431 +#: src/seq.c:555 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" @@ -8275,27 +8644,27 @@ msgstr "" " -g GID[,GID1...] 主グループ ID を数値 GID に設定する。追加グループ ID を\n" " GID1, ... に設定する (指定されていた場合)\n" -#: src/setuidgid.c:163 +#: src/setuidgid.c:162 #, c-format msgid "unknown user-ID: %s" msgstr "不明なユーザ ID です: %s" -#: src/setuidgid.c:174 +#: 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:191 +#: src/setuidgid.c:190 #, c-format msgid "failed to set supplemental group(s)" msgstr "追加グループの設定に失敗しました" -#: src/setuidgid.c:201 +#: src/setuidgid.c:200 #, c-format msgid "cannot set group-ID to %lu" msgstr "グループ ID を %lu に設定できません" -#: src/setuidgid.c:205 +#: src/setuidgid.c:204 #, c-format msgid "cannot set user-ID to %lu" msgstr "ユーザ ID を %lu に設定できません" @@ -8306,16 +8675,16 @@ msgid "Colin Plumb" msgstr "Colin Plumb" #: src/shred.c:148 +#, 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" -"\n" msgstr "" "指定されたファイルに対して上書きを繰り返し、非常に高価な機械でさえも\n" "データ復元の為の調査を行う事が非常に困難となるようにします。\n" "\n" -#: src/shred.c:156 +#: src/shred.c:155 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -8330,7 +8699,7 @@ msgstr "" "ど\n" " が使用可能)\n" -#: src/shred.c:162 +#: src/shred.c:161 msgid "" " -u, --remove truncate and remove file after overwriting\n" " -v, --verbose show progress\n" @@ -8344,7 +8713,7 @@ msgstr "" " ファイル以外ではこれがデフォルトの動作\n" " -z, --zero shred を行ったことを隠すために最後に 0 で上書きする\n" -#: src/shred.c:171 +#: src/shred.c:170 msgid "" "\n" "If FILE is -, shred standard output.\n" @@ -8364,7 +8733,7 @@ msgstr "" "操作する時は、ほとんどの人が --remove オプションを使用します。\n" "\n" -#: src/shred.c:181 +#: src/shred.c:180 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" @@ -8381,7 +8750,7 @@ msgstr "" "のモードで shred が効果的であることを保証できないファイルシステムの例です。\n" "\n" -#: src/shred.c:189 +#: src/shred.c:188 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -8401,7 +8770,7 @@ msgstr "" "ム\n" "\n" -#: src/shred.c:199 +#: src/shred.c:198 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -8415,7 +8784,7 @@ msgstr "" "* 圧縮ファイルシステム\n" "\n" -#: src/shred.c:206 +#: src/shred.c:205 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" @@ -8437,7 +8806,7 @@ msgstr "" "に記述されます。詳細はマニュアル (man mount) に記述されています。\n" "\n" -#: src/shred.c:216 +#: src/shred.c:215 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" @@ -8447,122 +8816,122 @@ msgstr "" "ファイルのコピーが含まれている場合があります。これにより shred したファイル\n" "が後で復元できるかもしれません。\n" -#: src/shred.c:296 +#: src/shred.c:295 #, c-format msgid "%s: fdatasync failed" msgstr "%s: ファイルデータ同期 (fdatasync) に失敗しました" -#: src/shred.c:307 +#: src/shred.c:306 #, c-format msgid "%s: fsync failed" msgstr "%s: ファイル同期 (fsync) に失敗しました" -#: src/shred.c:384 +#: src/shred.c:383 #, c-format msgid "%s: cannot rewind" msgstr "%s: 巻き戻しできません" -#: src/shred.c:403 +#: src/shred.c:402 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: 経過 %lu/%lu (%s)..." -#: src/shred.c:453 +#: src/shred.c:452 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: オフセット %s で書き込みエラーが発生しました" -#: src/shred.c:471 +#: src/shred.c:470 #, c-format msgid "%s: lseek failed" msgstr "%s: ファイル走査 (lseek) に失敗しました" -#: src/shred.c:482 +#: src/shred.c:481 #, c-format msgid "%s: file too large" msgstr "%s: ファイルが大きすぎます" -#: src/shred.c:505 +#: src/shred.c:504 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: 経過 %lu/%lu (%s)...%s" -#: src/shred.c:521 +#: src/shred.c:520 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: 経過 %lu/%lu (%s)...%s/%s %d%%" -#: src/shred.c:768 +#: src/shred.c:767 #, c-format msgid "%s: fstat failed" msgstr "%s: ファイル状態取得 (fstat) に失敗しました" -#: src/shred.c:779 +#: src/shred.c:778 #, c-format msgid "%s: invalid file type" msgstr "%s: 無効なファイルの種類です" -#: src/shred.c:798 +#: src/shred.c:797 #, c-format msgid "%s: file has negative size" msgstr "%s: ファイルが負の大きさになっています" -#: src/shred.c:865 +#: src/shred.c:864 src/sort.c:932 src/split.c:378 #, c-format msgid "%s: error truncating" msgstr "%s: ファイル切り詰め時にエラーが発生しました" -#: src/shred.c:881 +#: src/shred.c:880 #, c-format msgid "%s: fcntl failed" msgstr "%s: ファイル記述子操作 (fcntl) に失敗しました" -#: src/shred.c:886 +#: src/shred.c:885 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "%s: 追加用ファイル記述子には shred できません" -#: src/shred.c:968 +#: src/shred.c:967 #, c-format msgid "%s: removing" msgstr "%s: 削除しています" -#: src/shred.c:992 +#: src/shred.c:991 #, c-format msgid "%s: renamed to %s" msgstr "%s: %s に名前が変更されました" -#: src/shred.c:1014 +#: src/shred.c:1013 #, c-format msgid "%s: failed to remove" msgstr "%s: 削除に失敗しました" -#: src/shred.c:1018 +#: src/shred.c:1017 #, c-format msgid "%s: removed" msgstr "%s: 削除しました" -#: src/shred.c:1025 src/shred.c:1068 +#: src/shred.c:1024 src/shred.c:1067 #, c-format msgid "%s: failed to close" msgstr "%s: 閉じるのに失敗しました" -#: src/shred.c:1061 +#: src/shred.c:1060 #, c-format msgid "%s: failed to open for writing" msgstr "%s: 書き込み用に開くことに失敗しました" -#: src/shred.c:1126 +#: src/shred.c:1125 #, c-format msgid "%s: invalid number of passes" msgstr "%s: 無効な繰り返し回数です" -#: src/shred.c:1135 src/shuf.c:291 src/sort.c:4387 +#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441 #, c-format msgid "multiple random sources specified" msgstr "複数のランダムソースが指定されました" -#: src/shred.c:1149 +#: src/shred.c:1148 #, c-format msgid "%s: invalid file size" msgstr "%s: 無効なファイルサイズです" @@ -8579,14 +8948,13 @@ msgstr "" "または: %s -i LO-HI [OPTION]...\n" #: src/shuf.c:54 -msgid "" -"Write a random permutation of the input lines to standard output.\n" -"\n" +#, fuzzy +msgid "Write a random permutation of the input lines to standard output.\n" msgstr "" "入力行をランダムに並べ替えて標準出力に書き込みます。\n" "\n" -#: src/shuf.c:61 +#: src/shuf.c:60 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 " @@ -8603,27 +8971,27 @@ msgstr "" " --random-source=FILE ランダムバイトのソースを FILE にする\n" " -z, --zero-terminated 行末を改行文字ではなく NULL 文字にする\n" -#: src/shuf.c:245 +#: src/shuf.c:244 #, c-format msgid "multiple -i options specified" msgstr "複数の -i オプションが指定されています" -#: src/shuf.c:265 +#: src/shuf.c:264 #, c-format msgid "invalid input range %s" msgstr "%s: 無効な入力範囲です" -#: src/shuf.c:278 +#: src/shuf.c:277 #, c-format msgid "invalid line count %s" msgstr "%s: 無効な行数です" -#: src/shuf.c:285 src/sort.c:4381 +#: src/shuf.c:284 src/sort.c:4435 #, c-format msgid "multiple output files specified" msgstr "複数の出力ファイルが指定されています" -#: src/shuf.c:311 +#: src/shuf.c:310 #, c-format msgid "cannot combine -e and -i options" msgstr "-e と -i オプションを同時に使用することはできません" @@ -8650,7 +9018,7 @@ msgstr "" "停止します。\n" "\n" -#: src/sleep.c:135 src/timeout.c:295 +#: src/sleep.c:135 src/timeout.c:320 #, c-format msgid "invalid time interval %s" msgstr "%s: 無効な時間間隔です" @@ -8660,17 +9028,16 @@ msgstr "%s: 無効な時間間隔です" msgid "cannot read realtime clock" msgstr "実時間の時計を読み取ることができません" -#: src/sort.c:395 -msgid "" -"Write sorted concatenation of all FILE(s) to standard output.\n" -"\n" +#: src/sort.c:399 +#, fuzzy +msgid "Write sorted concatenation of all FILE(s) to standard output.\n" msgstr "" "ファイルの内容をソートして標準出力に書き込みます。入力ファイルが複数の場" "合、\n" "連結して出力します。\n" "\n" -#: src/sort.c:402 +#: src/sort.c:405 msgid "" "Ordering options:\n" "\n" @@ -8678,7 +9045,7 @@ msgstr "" "並び替えオプション:\n" "\n" -#: src/sort.c:406 +#: src/sort.c:409 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -8689,7 +9056,7 @@ msgstr "" " -d, --dictionary-order 空白および英数字のみ含まれていると仮定する\n" " -f, --ignore-case 大文字・小文字を区別しない\n" -#: src/sort.c:412 +#: src/sort.c:415 #, fuzzy msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" @@ -8700,14 +9067,14 @@ msgstr "" " -i, --ignore-nonprinting 表示可能な文字のみ比較を行う\n" " -M, --month-sort 月名でソートする (不明) < `JAN' < ... < `DEC'\n" -#: src/sort.c:417 +#: src/sort.c:420 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:420 +#: src/sort.c:423 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -8719,7 +9086,7 @@ msgstr "" " --random-source=FILE ランダムソースを FILE に設定する\n" " -r, --reverse 逆順にソートを行う\n" -#: src/sort.c:426 +#: src/sort.c:429 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -8736,7 +9103,7 @@ msgstr "" " -V, --version-sort 自然な (バージョン) 数字順でソートする\n" "\n" -#: src/sort.c:434 +#: src/sort.c:437 msgid "" "Other options:\n" "\n" @@ -8744,7 +9111,7 @@ msgstr "" "そのほかのオプション:\n" "\n" -#: src/sort.c:438 +#: src/sort.c:441 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" @@ -8753,7 +9120,7 @@ msgstr "" "合\n" " は一時ファイルが使用される\n" -#: src/sort.c:442 +#: src/sort.c:445 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 " @@ -8771,7 +9138,7 @@ msgstr "" "を\n" " 使用して展開する\n" -#: src/sort.c:449 +#: src/sort.c:452 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -8791,7 +9158,7 @@ msgstr "" "ファ\n" " イル名を標準入力から読み込む\n" -#: src/sort.c:456 +#: src/sort.c:459 #, fuzzy msgid "" " -k, --key=KEYDEF sort via a key; KEYDEF gives location and type\n" @@ -8804,7 +9171,7 @@ msgstr "" " -m, --merge ソートされたファイルを併合する。ソート自体は行わ" "ない\n" -#: src/sort.c:460 +#: src/sort.c:463 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -8815,7 +9182,7 @@ msgstr "" " -s, --stable 前の比較結果に頼らない安定的な並び替えを行う\n" " -S, --buffer-size=SIZE 主記憶のバッファの大きさとして SIZE を使用する\n" -#: src/sort.c:466 +#: src/sort.c:469 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -8841,12 +9208,12 @@ msgstr "" "c を付け\n" " ずに使用した場合、最初の同一行のみ出力する\n" -#: src/sort.c:475 +#: 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:480 +#: src/sort.c:483 #, fuzzy msgid "" "\n" @@ -8880,7 +9247,7 @@ msgstr "" "SIZE の後には以下の倍数などを指定する接尾辞を続けることが出来ます:\n" "\n" -#: src/sort.c:493 +#: src/sort.c:496 msgid "" "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n" "\n" @@ -8900,267 +9267,271 @@ msgstr "" "本来のバイト単位の値を使用した伝統的な並び替え順にしたい場合、\n" "LC_ALL=C を指定してください。\n" -#: src/sort.c:694 +#: src/sort.c:697 #, c-format msgid "waiting for %s [-d]" msgstr "%s [-d] を待っています" -#: src/sort.c:699 +#: src/sort.c:702 #, c-format msgid "%s [-d] terminated abnormally" msgstr "%s [-d] が異常終了しました" -#: src/sort.c:853 +#: src/sort.c:856 #, c-format msgid "cannot create temporary file in %s" msgstr "一時ファイルを %s 内に作成できません" -#: src/sort.c:939 src/sort.c:2010 src/sort.c:3056 src/sort.c:3755 -#: src/sort.c:3758 +#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713 +#: src/sort.c:3804 src/sort.c:3807 msgid "open failed" msgstr "オープンに失敗しました" -#: src/sort.c:959 +#: src/sort.c:970 msgid "fflush failed" msgstr "fflush に失敗しました" -#: src/sort.c:964 src/sort.c:2013 src/sort.c:4646 +#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706 msgid "close failed" msgstr "クローズに失敗しました" -#: src/sort.c:973 +#: src/sort.c:986 #, c-format msgid "dup2 failed" msgstr "dup2 に失敗しました" -#: src/sort.c:1090 +#: src/sort.c:1103 #, c-format msgid "couldn't execute %s" msgstr "%s を実行することが出来ませんでした" -#: src/sort.c:1097 +#: src/sort.c:1110 msgid "couldn't create temporary file" msgstr "一時ファイルを作成することが出来ませんでした" -#: src/sort.c:1136 +#: src/sort.c:1149 #, c-format msgid "couldn't create process for %s -d" msgstr "プロセス %s -d を作成することが出来ませんでした" -#: src/sort.c:1150 +#: src/sort.c:1161 #, c-format msgid "couldn't execute %s -d" msgstr "%s -d を実行することが出来ませんでした" -#: src/sort.c:1209 +#: src/sort.c:1220 #, c-format msgid "warning: cannot remove: %s" msgstr "待機中: 削除できません: %s" -#: src/sort.c:1295 +#: src/sort.c:1306 #, c-format msgid "invalid --%s argument %s" msgstr "--%s の引数 %s が無効です" -#: src/sort.c:1298 +#: src/sort.c:1309 #, c-format msgid "minimum --%s argument is %s" msgstr "--%s の引数の最小値は %s です。" -#: src/sort.c:1313 +#: src/sort.c:1324 #, c-format msgid "--%s argument %s too large" msgstr "--%s の引数の値 %s は大きすぎます" -#: src/sort.c:1316 +#: src/sort.c:1327 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "現在の rlimit に基づいた --%s の引数の最大値は %s です" -#: src/sort.c:1398 +#: src/sort.c:1409 #, c-format msgid "number in parallel must be nonzero" msgstr "parallel の引数は 0 ではいけません" -#: src/sort.c:1479 +#: src/sort.c:1494 msgid "stat failed" msgstr "状態取得 (stat) に失敗しました" -#: src/sort.c:1740 +#: src/sort.c:1755 msgid "read failed" msgstr "読み込みに失敗しました" -#: src/sort.c:2028 +#: src/sort.c:2043 #, c-format msgid "string transformation failed" msgstr "文字列の変換に失敗しました" -#: src/sort.c:2031 +#: src/sort.c:2046 #, c-format msgid "the untransformed string was %s" msgstr "変換前の文字列は %s です" -#: src/sort.c:2194 +#: src/sort.c:2209 #, c-format msgid "^ no match for key\n" msgstr "キーに対して ^ が一致しません\n" -#: src/sort.c:2374 +#: src/sort.c:2389 #, fuzzy, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "非推奨なキー `%s' が使用されています。代わりに `%s' を使用してください" -#: src/sort.c:2380 +#: src/sort.c:2395 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "キー %lu の幅は 0 のため無視されます" -#: src/sort.c:2391 +#: src/sort.c:2406 #, fuzzy, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" "キー %lu において先頭の空白類文字は意味を持ちます。`b' も指定することを検討し" "てください" -#: src/sort.c:2404 +#: src/sort.c:2419 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "キー %lu が数値のため複数のフィールドに展開されます" -#: src/sort.c:2436 +#: src/sort.c:2451 #, fuzzy, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" msgstr[0] "オプション `-%s' は無視されます" -#: src/sort.c:2442 +#: src/sort.c:2457 #, fuzzy, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "オプション `-r' は最後の比較のみに適用されます" -#: src/sort.c:2716 src/sort.c:2725 +#: src/sort.c:2731 src/sort.c:2740 msgid "write failed" msgstr "書き込みに失敗しました" -#: src/sort.c:2768 +#: src/sort.c:2783 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: 順序が不規則: " -#: src/sort.c:2771 +#: src/sort.c:2786 msgid "standard error" msgstr "標準エラー" -#: src/sort.c:3926 +#: src/sort.c:3698 +#, fuzzy +msgid "cannot read" +msgstr "%s: 巻き戻しできません" + +#: src/sort.c:3976 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: 無効なフィールド指定です: %s" -#: src/sort.c:3937 +#: src/sort.c:3987 #, fuzzy, c-format msgid "options '-%s' are incompatible" msgstr "オプション `-%s' は両立しません" -#: src/sort.c:3988 +#: src/sort.c:4038 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s: %s の開始番号が無効です" -#: src/sort.c:4245 +#: src/sort.c:4295 #, fuzzy msgid "invalid number after '-'" msgstr "`-' の後の数字が正しくありません" -#: src/sort.c:4248 src/sort.c:4334 src/sort.c:4362 +#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416 #, fuzzy msgid "invalid number after '.'" msgstr "`.' の後の数字が正しくありません" -#: src/sort.c:4261 src/sort.c:4367 +#: src/sort.c:4315 src/sort.c:4421 msgid "stray character in field spec" msgstr "フィールド指定に使えない文字があります" -#: src/sort.c:4308 +#: src/sort.c:4362 #, c-format msgid "multiple compress programs specified" msgstr "複数の圧縮プログラムが指定されています" -#: src/sort.c:4325 +#: src/sort.c:4379 msgid "invalid number at field start" msgstr "フィールド開始番号が無効です" -#: src/sort.c:4329 src/sort.c:4357 +#: src/sort.c:4383 src/sort.c:4411 msgid "field number is zero" msgstr "フィールド番号がゼロです" -#: src/sort.c:4338 +#: src/sort.c:4392 msgid "character offset is zero" msgstr "文字のオフセットがゼロです" -#: src/sort.c:4353 +#: src/sort.c:4407 #, fuzzy msgid "invalid number after ','" msgstr "`,' の後の数字が正しくありません" -#: src/sort.c:4403 +#: src/sort.c:4457 #, c-format msgid "empty tab" msgstr "タブが空です" -#: src/sort.c:4496 src/wc.c:692 +#: src/sort.c:4550 src/wc.c:692 #, c-format msgid "cannot read file names from %s" msgstr "ファイル名を %s から読み込むことが出来ません" -#: src/sort.c:4518 +#: src/sort.c:4572 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s:%lu: 長さが 0 のファイル名は無効です" -#: src/sort.c:4524 +#: src/sort.c:4578 #, c-format msgid "no input from %s" msgstr "%s からの入力がありません" -#: src/sort.c:4570 +#: src/sort.c:4624 #, c-format msgid "using %s sorting rules" msgstr "%s ソートルールを使用しています" -#: src/sort.c:4573 +#: src/sort.c:4627 #, c-format msgid "using simple byte comparison" msgstr "単なるバイト比較を使用しています" -#: src/sort.c:4604 +#: src/sort.c:4658 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "追加のオペランド %s は -%c と併せて使用できません" -#: src/split.c:184 +#: src/split.c:187 #, c-format msgid "the suffix length needs to be at least %zu" msgstr "接尾辞の長さは最低 %zu 必要です" -#: src/split.c:201 +#: src/split.c:204 #, c-format msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" msgstr "使用法: %s [OPTION]... [INPUT [PREFIX]]\n" -#: src/split.c:205 +#: src/split.c:208 #, fuzzy 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" -"\n" msgstr "" "INPUT を PREFIXaa, PREFIXab, ... という固定サイズのファイルに分割します。\n" "デフォルトの大きさは 1000 行です。デフォルトの PREFIX は `x' です。 INPUT\n" "が指定されないか、INPUT に - を指定した場合は標準入力から読み込まれます。\n" -#: src/split.c:214 +#: src/split.c:216 #, fuzzy, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" @@ -9192,7 +9563,7 @@ msgstr "" " -u, --unbuffered `-n r/...' を使用した時にすぐに入力を出力にコピーす" "る\n" -#: src/split.c:227 +#: src/split.c:229 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" @@ -9200,7 +9571,7 @@ msgstr "" " --verbose 各出力ファイルを開く前に診断メッセージを\n" " 表示する\n" -#: src/split.c:234 +#: src/split.c:236 #, fuzzy msgid "" "\n" @@ -9221,185 +9592,190 @@ msgstr "" "r/N `l' と同様だがラウンドロビン分割をする\n" "r/K/N 上記と同様だが N 個中 K 番目を標準出力に出力する\n" -#: src/split.c:352 +#: src/split.c:354 #, c-format msgid "output file suffixes exhausted" msgstr "出力ファイルの接尾辞を使い果たしました" -#: src/split.c:364 +#: src/split.c:366 #, c-format msgid "creating file %s\n" msgstr "ファイル %s を作成しています\n" -#: src/split.c:377 +#: src/split.c:375 +#, c-format +msgid "%s would overwrite input; aborting" +msgstr "" + +#: src/split.c:391 #, c-format msgid "failed to set FILE environment variable" msgstr "環境変数 FILE の設定に失敗しました" -#: src/split.c:379 +#: src/split.c:393 #, c-format msgid "executing with FILE=%s\n" msgstr "FILE=%s で実行しています\n" -#: src/split.c:381 +#: src/split.c:395 #, c-format msgid "failed to create pipe" msgstr "パイプの作成に失敗しました" -#: src/split.c:395 +#: src/split.c:409 #, c-format msgid "closing prior pipe" msgstr "以前のパイプを閉じています" -#: src/split.c:397 +#: src/split.c:411 #, c-format msgid "closing output pipe" msgstr "出力パイプを閉じています" -#: src/split.c:401 +#: src/split.c:415 #, c-format msgid "moving input pipe" msgstr "入力パイプを移動しています" -#: src/split.c:403 +#: src/split.c:417 #, c-format msgid "closing input pipe" msgstr "入力パイプを閉じています" -#: src/split.c:408 +#: src/split.c:422 #, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "コマンド実行に失敗しました: \"%s -c %s\"" -#: src/split.c:414 +#: src/split.c:428 #, c-format msgid "failed to close input pipe" msgstr "入力パイプを閉じるのに失敗しました" -#: src/split.c:450 +#: src/split.c:464 #, c-format msgid "waiting for child process" msgstr "子プロセスを待機しています" -#: src/split.c:460 +#: src/split.c:474 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "FILE=%s で次のコマンドからシグナル %s を受け取りました: %s" -#: src/split.c:468 +#: src/split.c:482 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "FILE=%s で 次のコマンドが終了ステータス %d で終了しました: %s" -#: src/split.c:475 src/timeout.c:449 +#: src/split.c:489 src/timeout.c:494 #, c-format msgid "unknown status from command (0x%X)" msgstr "不明なコマンドの終了ステータスです (0x%X)" -#: src/split.c:1037 +#: src/split.c:1052 #, c-format msgid "cannot split in more than one way" msgstr "複数の分割方法は指定できません" -#: src/split.c:1050 src/split.c:1192 src/split.c:1363 +#: src/split.c:1065 src/split.c:1205 src/split.c:1376 #, c-format msgid "%s: invalid number of chunks" msgstr "%s: 無効な塊の数です" -#: src/split.c:1054 +#: src/split.c:1069 #, c-format msgid "%s: invalid chunk number" msgstr "%s: 無効な塊の番号です" -#: src/split.c:1106 +#: src/split.c:1119 #, c-format msgid "%s: invalid suffix length" msgstr "%s: 接尾辞の長さが正しくありません" -#: src/split.c:1131 src/split.c:1139 src/split.c:1162 src/split.c:1167 +#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180 #, c-format msgid "%s: invalid number of bytes" msgstr "%s: 無効なバイト数表記です" -#: src/split.c:1150 src/split.c:1297 +#: src/split.c:1163 src/split.c:1310 #, c-format msgid "%s: invalid number of lines" msgstr "%s: 無効な行数表記です" -#: src/split.c:1223 +#: src/split.c:1236 #, c-format msgid "line count option -%s%c... is too large" msgstr "行数を指定するオプション -%s%c が大きすぎます" -#: src/split.c:1235 +#: src/split.c:1248 #, fuzzy, c-format msgid "%s: invalid start value for numerical suffix" msgstr "開始行番号が正しくありません: %s" -#: src/split.c:1263 +#: src/split.c:1276 #, c-format msgid "%s: invalid IO block size" msgstr "%s: 無効な IO ブロックサイズです" -#: src/split.c:1284 +#: src/split.c:1297 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "--filter は標準出力に出力された塊を処理しません" -#: src/split.c:1321 +#: src/split.c:1334 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1356 +#: src/split.c:1369 #, c-format msgid "%s: cannot determine file size" msgstr "%s: ファイルサイズを決定できません" #. This is a proper name. See the gettext manual, section Names. -#: src/stat.c:169 +#: src/stat.c:173 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:838 +#: src/stat.c:857 #, c-format msgid "failed to canonicalize %s" msgstr "%s の正規化に失敗しました" -#: src/stat.c:1050 +#: src/stat.c:1069 #, fuzzy, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "警告: 認識できないエスケープです: `\\%c'" -#: src/stat.c:1105 +#: src/stat.c:1124 #, c-format msgid "%s: invalid directive" msgstr "%s: 無効な指定です" -#: src/stat.c:1151 +#: src/stat.c:1170 #, c-format msgid "warning: backslash at end of format" msgstr "警告: 書式文字列の終端にバックスラッシュがあります" -#: src/stat.c:1182 +#: src/stat.c:1201 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" "ファイルシステムモードでは %s を使用して標準入力を指定することはできません" -#: src/stat.c:1189 +#: src/stat.c:1208 #, c-format msgid "cannot read file system information for %s" msgstr "%s に関するファイルシステム情報を読み込むことができません" -#: src/stat.c:1209 +#: src/stat.c:1228 #, 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:1245 +#: src/stat.c:1264 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -9415,7 +9791,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1268 +#: src/stat.c:1287 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -9425,30 +9801,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1278 +#: src/stat.c:1297 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:1286 +#: src/stat.c:1305 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:1295 +#: src/stat.c:1314 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:1305 +#: src/stat.c:1324 #, c-format msgid "Context: %C\n" msgstr "Context: %C\n" -#: src/stat.c:1313 +#: src/stat.c:1332 msgid "" "Access: %x\n" "Modify: %y\n" @@ -9460,10 +9836,13 @@ msgstr "" "Change: %z\n" " Birth: %w\n" -#: src/stat.c:1331 +#: src/stat.c:1350 +msgid "Display file or file system status.\n" +msgstr "" + +#: src/stat.c:1356 +#, fuzzy msgid "" -"Display file or file system status.\n" -"\n" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" @@ -9473,7 +9852,7 @@ msgstr "" " -f, --file-system ファイル情報の代わりにファイルシステム情報を表示す" "る\n" -#: src/stat.c:1337 +#: src/stat.c:1360 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -9492,7 +9871,7 @@ msgstr "" " FORMAT に \\n を含める必要がある\n" " -t, --terse 簡潔な形式で情報を表示する\n" -#: src/stat.c:1348 +#: src/stat.c:1371 #, fuzzy msgid "" "\n" @@ -9513,7 +9892,7 @@ msgstr "" " %B %b によって報告された各ブロックのバイト数\n" " %C SELinux のセキュリティコンテキスト文字列\n" -#: src/stat.c:1357 +#: src/stat.c:1380 #, fuzzy msgid "" " %d device number in decimal\n" @@ -9530,7 +9909,7 @@ msgstr "" " %g 所有者のグループ ID\n" " %G 所有者のグループ名\n" -#: src/stat.c:1365 +#: src/stat.c:1388 #, fuzzy msgid "" " %h number of hard links\n" @@ -9553,7 +9932,7 @@ msgstr "" " %t メジャーデバイス番号の十六進数表記\n" " %T マイナーデバイス番号の十六進数表記\n" -#: src/stat.c:1376 +#: src/stat.c:1399 #, fuzzy msgid "" " %u user ID of owner\n" @@ -9580,7 +9959,7 @@ msgstr "" " %Z 最終変更日時 (Epoch からの秒数)\n" "\n" -#: src/stat.c:1390 +#: src/stat.c:1413 #, fuzzy msgid "" "Valid format sequences for file systems:\n" @@ -9599,7 +9978,7 @@ msgstr "" " %d ファイルシステムの空きファイルノード数\n" " %f ファイルシステムの空きブロック数\n" -#: src/stat.c:1399 +#: src/stat.c:1422 #, fuzzy msgid "" " %i file system ID in hex\n" @@ -9624,14 +10003,14 @@ msgid "Usage: %s OPTION... COMMAND\n" msgstr "使用法: %s OPTION... COMMAND\n" #: src/stdbuf.c:91 +#, fuzzy msgid "" "Run COMMAND, with modified buffering operations for its standard streams.\n" -"\n" msgstr "" "標準入出力ストリームのバッファ動作を変更して COMMAND を実行します。\n" "\n" -#: src/stdbuf.c:98 +#: src/stdbuf.c:97 msgid "" " -i, --input=MODE adjust standard input stream buffering\n" " -o, --output=MODE adjust standard output stream buffering\n" @@ -9641,7 +10020,7 @@ msgstr "" " -o, --output=MODE 標準出力のバッファ動作を変更する\n" " -e, --error=MODE 標準エラー出力のバッファ動作を変更する\n" -#: src/stdbuf.c:105 +#: src/stdbuf.c:104 #, fuzzy msgid "" "\n" @@ -9652,7 +10031,7 @@ msgstr "" "MODE に `L' を指定した場合、行単位でバッファされます。このオプションは\n" "標準入力に対しては無効です。\n" -#: src/stdbuf.c:108 +#: src/stdbuf.c:107 #, fuzzy msgid "" "\n" @@ -9662,7 +10041,7 @@ msgstr "" "MODE に `0' を指定すると、対応したストリームでバッファ動作が無効になりま" "す。\n" -#: src/stdbuf.c:111 +#: src/stdbuf.c:110 msgid "" "\n" "Otherwise MODE is a number which may be followed by one of the following:\n" @@ -9679,7 +10058,7 @@ msgstr "" "す。\n" "\n" -#: src/stdbuf.c:117 +#: src/stdbuf.c:116 #, fuzzy msgid "" "\n" @@ -9696,22 +10075,22 @@ msgstr "" "(`dd', `cat' 等) は入出力にストリームを使用しないため、 `stdbuf' 設定の影響\n" "を受けません。\n" -#: src/stdbuf.c:227 +#: src/stdbuf.c:226 #, c-format msgid "failed to find %s" msgstr "%s が見つかりませんでした" -#: src/stdbuf.c:247 src/stdbuf.c:279 +#: src/stdbuf.c:246 src/stdbuf.c:278 #, c-format msgid "failed to update the environment with %s" msgstr "環境を %s に更新することができませんでした" -#: src/stdbuf.c:321 +#: src/stdbuf.c:320 #, c-format msgid "line buffering stdin is meaningless" msgstr "標準入力に対する行モードのバッファ設定は意味がありません" -#: src/stty.c:509 +#: src/stty.c:513 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -9722,10 +10101,13 @@ msgstr "" "または: %s [-F DEVICE | --file=DEVICE] [-a|--all]\n" "または: %s [-F DEVICE | --file=DEVICE] [-g|--save]\n" -#: src/stty.c:515 +#: src/stty.c:519 +msgid "Print or change terminal characteristics.\n" +msgstr "" + +#: src/stty.c:525 +#, fuzzy msgid "" -"Print or change terminal characteristics.\n" -"\n" " -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" @@ -9737,7 +10119,7 @@ msgstr "" " -F, --file=DEVICE 標準入力の代わりに DEVICE で指定されたデバイスを使用す" "る\n" -#: src/stty.c:524 +#: src/stty.c:532 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -9750,7 +10132,7 @@ msgstr "" "が決まります。\n" "\n" -#: src/stty.c:529 +#: src/stty.c:537 msgid "" "\n" "Special characters:\n" @@ -9764,7 +10146,7 @@ msgstr "" " eof CHAR CHAR はファイル終端を送信 (入力の終了)\n" " eol CHAR CHAR は行末\n" -#: src/stty.c:536 +#: src/stty.c:544 msgid "" " * eol2 CHAR alternate CHAR for ending the line\n" " erase CHAR CHAR will erase the last character typed\n" @@ -9776,7 +10158,7 @@ msgstr "" " intr CHAR CHAR は割り込みシグナルを送信\n" " kill CHAR CHAR は現在の行を削除\n" -#: src/stty.c:542 +#: src/stty.c:550 msgid "" " * lnext CHAR CHAR will enter the next character quoted\n" " quit CHAR CHAR will send a quit signal\n" @@ -9788,7 +10170,7 @@ msgstr "" " * rprnt CHAR CHAR は現在の行を再表示\n" " start CHAR CHAR は停止した出力を再開\n" -#: src/stty.c:548 +#: src/stty.c:556 msgid "" " stop CHAR CHAR will stop the output\n" " susp CHAR CHAR will send a terminal stop signal\n" @@ -9800,7 +10182,7 @@ msgstr "" " * swtch CHAR CHAR は別のシェル層に切り替え\n" " * werase CHAR CHAR は最後にタイプされた単語を削除\n" -#: src/stty.c:554 +#: src/stty.c:562 msgid "" "\n" "Special settings:\n" @@ -9814,7 +10196,7 @@ msgstr "" " * cols N ターミナルが N 桁であることをカーネルに通知\n" " * columns N cols N と同じ\n" -#: src/stty.c:561 +#: src/stty.c:569 msgid "" " ispeed N set the input speed to N\n" " * line N use line discipline N\n" @@ -9827,7 +10209,7 @@ msgstr "" " min N -icanon と共に使い, 完全な読込みに対して最低 N 文字を設定\n" " ospeed N 出力速度を N に設定\n" -#: src/stty.c:567 +#: src/stty.c:575 msgid "" " * rows N tell the kernel that the terminal has N rows\n" " * size print the number of rows and columns according to the " @@ -9841,13 +10223,15 @@ msgstr "" " time N -icanon と共に使い, 読込みのタイムアウトを 10 分の N 秒に設" "定\n" -#: src/stty.c:573 +#: src/stty.c:581 +#, fuzzy msgid "" "\n" "Control settings:\n" " [-]clocal disable modem control signals\n" " [-]cread allow input to be received\n" " * [-]crtscts enable RTS/CTS handshaking\n" +" * [-]cdtrdsr enable DTR/DSR handshaking\n" " csN set character size to N bits, N in [5..8]\n" msgstr "" "\n" @@ -9857,7 +10241,7 @@ msgstr "" " * [-]crtscts RTS/CTS ハンドシェイクを有効に\n" " csN 文字の大きさを N ビットに設定, N の範囲は [5..8]\n" -#: src/stty.c:581 +#: src/stty.c:590 #, fuzzy msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" @@ -9865,7 +10249,7 @@ msgid "" " [-]hupcl same as [-]hup\n" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" -" [-]parodd set odd parity (even with '-')\n" +" [-]parodd set odd parity (or even parity with '-')\n" msgstr "" " [-]cstopb 1文字あたり 2ストップビットを使用 (1 の場合は `-' を付け" "る)\n" @@ -9874,7 +10258,7 @@ msgstr "" " [-]parenb パリティビットを出力し, 入力にパリティビットがあるとする\n" " [-]parodd 奇パリティを設定 (偶は `-')\n" -#: src/stty.c:588 +#: src/stty.c:597 msgid "" "\n" "Input settings:\n" @@ -9890,7 +10274,7 @@ msgstr "" " [-]ignbrk ブレイク文字を無視\n" " [-]igncr 復帰 (CR) を無視\n" -#: src/stty.c:596 +#: src/stty.c:605 msgid "" " [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" @@ -9904,11 +10288,11 @@ msgstr "" " [-]inpck 入力パリティのチェックを可能に\n" " [-]istrip 入力文字の最上位 (第8) ビットを落とす\n" -#: src/stty.c:603 +#: src/stty.c:612 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr " * [-]iutf8 入力文字を UTF-8 と見なす\n" -#: src/stty.c:606 +#: src/stty.c:615 msgid "" " * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" @@ -9924,7 +10308,7 @@ msgstr "" " [-]parmrk パリティーエラーをマーク (255-0 文字のシーケンスで)\n" " [-]tandem [-]ixoff と同じ\n" -#: src/stty.c:614 +#: src/stty.c:623 msgid "" "\n" "Output settings:\n" @@ -9940,7 +10324,7 @@ msgstr "" " * ffN 用紙送り遅延スタイル. N の範囲は [0..1]\n" " * nlN 改行 (LF) 遅延スタイル. N の範囲は [0..1]\n" -#: src/stty.c:622 +#: src/stty.c:631 msgid "" " * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of null characters\n" @@ -9956,7 +10340,7 @@ msgstr "" " * [-]onlcr 改行 (LF) を復帰改行 (CR-LF) に翻訳\n" " * [-]onlret 改行 (LF) が復帰 (CR) として振舞う\n" -#: src/stty.c:630 +#: src/stty.c:639 msgid "" " * [-]onocr do not print carriage returns in the first column\n" " [-]opost postprocess output\n" @@ -9972,7 +10356,7 @@ msgstr "" " * -tabs tab3 と同じ\n" " * vtN 垂直タブ遅延スタイル. N の範囲は [0..1]\n" -#: src/stty.c:638 +#: src/stty.c:647 msgid "" "\n" "Local settings:\n" @@ -9986,7 +10370,7 @@ msgstr "" " * crtkill echoprt と echoe の設定にしたがって全ての行を削除\n" " * -crtkill echoctl と echok の設定にしたがって全ての行を削除\n" -#: src/stty.c:645 +#: src/stty.c:654 #, fuzzy msgid "" " * [-]ctlecho echo control characters in hat notation ('^c')\n" @@ -10001,7 +10385,7 @@ msgstr "" " [-]echoe [-]crterase と同じ\n" " [-]echok 削除文字の後で改行をエコー\n" -#: src/stty.c:652 +#: src/stty.c:661 #, fuzzy msgid "" " * [-]echoke same as [-]crtkill\n" @@ -10016,7 +10400,7 @@ msgstr "" " [-]icanon erase, kill, werase および rprnt 特殊文字を使用可能に\n" " [-]iexten 非 POSIX 特殊文字を使用可能に\n" -#: src/stty.c:659 +#: src/stty.c:668 #, fuzzy msgid "" " [-]isig enable interrupt, quit, and suspend special characters\n" @@ -10034,7 +10418,7 @@ msgstr "" " * [-]tostop 端末に書き込もうとするバックグラウンドジョブを停止\n" " * [-]xcase icanon と共に使い, 大文字に対して `\\' でエスケープ\n" -#: src/stty.c:666 +#: src/stty.c:675 msgid "" "\n" "Combination settings:\n" @@ -10048,7 +10432,7 @@ msgstr "" " cbreak -icanon と同じ\n" " -cbreak icanon と同じ\n" -#: src/stty.c:673 +#: src/stty.c:682 msgid "" " cooked same as brkint ignpar istrip icrnl ixon opost isig\n" " icanon, eof and eol characters to their default values\n" @@ -10060,7 +10444,7 @@ msgstr "" " -cooked raw と同じ\n" " crt echoe echoctl echoke と同じ\n" -#: src/stty.c:679 +#: src/stty.c:688 msgid "" " dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" " kill ^u\n" @@ -10074,7 +10458,7 @@ msgstr "" " ek erase と kill 文字を標準の値に\n" " evenp parenb -parodd cs7 と同じ\n" -#: src/stty.c:686 +#: src/stty.c:695 msgid "" " -evenp same as -parenb cs8\n" " * [-]lcase same as xcase iuclc olcuc\n" @@ -10090,7 +10474,7 @@ msgstr "" " nl -icrnl -onlcr と同じ\n" " -nl icrnl -inlcr -igncr onlcr -ocrnl -onlret と同じ\n" -#: src/stty.c:694 +#: src/stty.c:703 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -10104,7 +10488,7 @@ msgstr "" " pass8 -parenb -istrip cs8 と同じ\n" " -pass8 parenb istrip cs7 と同じ\n" -#: src/stty.c:701 +#: src/stty.c:710 msgid "" " raw same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" " -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n" @@ -10116,7 +10500,7 @@ msgstr "" " -imaxbel -opost -isig -icanon -xcase min 1 time 0 と同じ\n" " -raw cooked と同じ\n" -#: src/stty.c:707 +#: src/stty.c:716 msgid "" " sane same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" " -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n" @@ -10132,7 +10516,7 @@ msgstr "" " -xcase -tostop -echoprt echoctl echoke と同じ,\n" " 全ての特殊文字は標準の値.\n" -#: src/stty.c:715 +#: src/stty.c:724 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -10147,138 +10531,59 @@ msgstr "" "のようにコード化されます。特別な値 ^- または undef は特殊文字を無効に\n" "するのに使用されます。\n" -#: src/stty.c:787 +#: src/stty.c:796 #, c-format msgid "only one device may be specified" msgstr "DEVICE は一つだけ指定できます" -#: src/stty.c:817 +#: src/stty.c:826 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" "mutually exclusive" msgstr "冗長出力と stty が解釈できる出力形式のオプションは排他的です" -#: src/stty.c:823 +#: src/stty.c:832 #, c-format msgid "when specifying an output style, modes may not be set" msgstr "出力形式を指定した場合、モードを設定してはいけません" -#: src/stty.c:838 +#: src/stty.c:847 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s: 非ブロッキングモードを再設定できませんでした" -#: src/stty.c:883 src/stty.c:993 +#: src/stty.c:892 src/stty.c:1002 #, c-format msgid "invalid argument %s" msgstr "%s: 無効な引数です" -#: src/stty.c:894 src/stty.c:911 src/stty.c:923 src/stty.c:936 src/stty.c:948 -#: src/stty.c:968 +#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957 +#: src/stty.c:977 #, c-format msgid "missing argument to %s" msgstr "%s に対する引数がありません" -#: src/stty.c:974 +#: src/stty.c:983 #, c-format msgid "invalid line discipline %s" msgstr "%s: 無効な回線制御規則です" -#: src/stty.c:1044 +#: src/stty.c:1053 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s: 要求された処理の全てを実行することができません" -#: src/stty.c:1390 +#: src/stty.c:1399 #, c-format msgid "%s: no size information for this device" msgstr "%s: このデバイスのサイズ情報がありません" -#: src/stty.c:1904 +#: src/stty.c:1920 #, c-format msgid "invalid integer argument %s" msgstr "%s: 無効な整数の引数です" -#: src/su.c:229 -msgid "Password:" -msgstr "パスワード:" - -#: src/su.c:232 -#, c-format -msgid "getpass: cannot open /dev/tty" -msgstr "getpass: /dev/tty を開けません" - -#: src/su.c:290 -#, c-format -msgid "cannot set groups" -msgstr "グループを設定できません" - -#: src/su.c:294 -#, c-format -msgid "cannot set group id" -msgstr "グループ ID を設定できません" - -#: src/su.c:296 -#, c-format -msgid "cannot set user id" -msgstr "ユーザ ID を設定できません" - -#: src/su.c:371 -#, c-format -msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" -msgstr "使用法: %s [OPTION]... [-] [USER [ARG]...]\n" - -#: src/su.c:372 -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 "" -"実効ユーザ ID およびグループ ID を USER に変更します。\n" -"\n" -" -, -l, --login シェルをログインシェルにする\n" -" -c, --command=COMMAND 単一の COMMAND を -c を付けてシェルに渡す\n" -" -f, --fast -f をシェルに渡す (csh または tcsh 用)\n" -" -m, --preserve-environment 環境変数を再設定しない\n" -" -p -m と同じ\n" -" -s, --shell=SHELL /etc/shells で許可されていれば SHELL を実行す" -"る\n" - -#: src/su.c:384 -msgid "" -"\n" -"A mere - implies -l. If USER not given, assume root.\n" -msgstr "" -"\n" -"- だけを指定した場合は -l と見なされます。USER を指定しなければ、root である" -"と見なされます。\n" - -#: src/su.c:461 -#, c-format -msgid "user %s does not exist" -msgstr "%s というユーザは存在しません" - -#: src/su.c:484 -#, c-format -msgid "incorrect password" -msgstr "パスワードが違います" - -#: src/su.c:501 -#, c-format -msgid "using restricted shell %s" -msgstr "制限付きシェル %s を使います" - -#: src/su.c:509 -#, c-format -msgid "warning: cannot change directory to %s" -msgstr "注意: ディレクトリ %s に移動できません" - #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 msgid "Kayvan Aghaiepour" @@ -10311,7 +10616,7 @@ msgstr "" msgid "ignoring all arguments" msgstr "全ての引数を無視します" -#: src/system.h:340 +#: src/system.h:343 #, c-format msgid "" "\n" @@ -10326,15 +10631,22 @@ msgstr "" "の\n" "文書を参照してオプションなどの詳細を確認してください。\n" -#: src/system.h:346 +#: src/system.h:349 msgid " --help display this help and exit\n" msgstr " --help この使い方を表示して終了する\n" -#: src/system.h:348 +#: src/system.h:351 msgid " --version output version information and exit\n" msgstr " --version バージョン情報を表示して終了する\n" -#: src/system.h:541 +#: src/system.h:544 +#, fuzzy +msgid "" +"\n" +"Mandatory arguments to long options are mandatory for short options too.\n" +msgstr "長いオプションに必須の引数は短いオプションにも必須です。\n" + +#: src/system.h:552 msgid "" "\n" "SIZE is an integer and optional unit (example: 10M is 10*1024*1024). Units\n" @@ -10342,7 +10654,7 @@ msgid "" "1000).\n" msgstr "" -#: src/system.h:550 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -10359,7 +10671,7 @@ msgstr "" "バ\n" "イト)。\n" -#: src/system.h:560 +#: src/system.h:571 #, c-format msgid "" "\n" @@ -10372,26 +10684,26 @@ msgstr "" #. <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:574 +#: src/system.h:585 #, 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:578 +#: src/system.h:589 #, c-format msgid "For complete documentation, run: info coreutils '%s invocation'\n" msgstr "" "完全な文書を参照する場合は info coreutils '%s invocation' を実行してくださ" "い。\n" -#: src/system.h:585 +#: src/system.h:596 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "詳しくは `%s --help' を実行して下さい。\n" -#: src/system.h:617 +#: src/system.h:628 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -10412,16 +10724,16 @@ 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" -"\n" msgstr "" "ファイル毎に行を逆順にして標準出力に書き込みます。FILE が指定されないか\n" "FILE として - が指定された場合、標準入力から読み込みます。\n" "\n" -#: src/tac.c:145 +#: src/tac.c:144 msgid "" " -b, --before attach the separator before instead of after\n" " -r, --regex interpret the separator as a regular expression\n" @@ -10431,42 +10743,42 @@ msgstr "" " -r, --regex 区切り文字列を正規表現として解釈する\n" " -s, --separator=STRING 改行文字の代わりに STRING を区切り文字列にする\n" -#: src/tac.c:235 src/tac.c:336 +#: src/tac.c:234 src/tac.c:335 #, c-format msgid "%s: seek failed" msgstr "%s: ファイル探査 (seek) に失敗しました" -#: src/tac.c:264 +#: src/tac.c:263 #, c-format msgid "record too large" msgstr "レコードが大きすぎます" -#: src/tac.c:451 +#: src/tac.c:450 #, fuzzy, c-format msgid "failed to create temporary file in %s" msgstr "一時ファイルを %s 内に作成できません" -#: src/tac.c:459 +#: src/tac.c:458 #, fuzzy, c-format msgid "failed to open %s for writing" msgstr "%s: 書き込み用に開くことに失敗しました" -#: src/tac.c:476 +#: src/tac.c:475 #, fuzzy, c-format msgid "failed to rewind stream for %s" msgstr "%s のタイムスタンプの保護に失敗しました" -#: src/tac.c:512 src/tac.c:519 +#: src/tac.c:511 src/tac.c:518 #, c-format msgid "%s: write error" msgstr "%s: 書き込みエラー" -#: src/tac.c:572 +#: src/tac.c:571 #, fuzzy, c-format msgid "failed to open %s for reading" msgstr "%s を 読み込み用に開くことが出来ません" -#: src/tac.c:630 +#: src/tac.c:629 #, c-format msgid "separator cannot be empty" msgstr "区切り文字が空であってはなりません" @@ -10477,18 +10789,17 @@ msgid "Ian Lance Taylor" msgstr "Ian Lance Taylor" #: src/tail.c:262 -#, c-format +#, fuzzy, 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" -"\n" msgstr "" "各々の FILE の最後の %d 行を標準出力に書き込みます。複数の FILE が指定され\n" "た場合、ファイル名がヘッダ情報として出力されます。FILE が指定されないか、\n" "FILE が - の場合は、標準入力から読み込まれます。\n" -#: src/tail.c:271 +#: src/tail.c:270 msgid "" " -c, --bytes=K output the last K bytes; alternatively, use -c " "+K\n" @@ -10500,7 +10811,7 @@ msgstr "" " 場合は各ファイルの先頭から K 番目のバイト以降を出" "力する\n" -#: src/tail.c:275 +#: src/tail.c:274 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -10515,7 +10826,7 @@ msgstr "" " は等価になる\n" " -F --follow=name --retry と等価\n" -#: src/tail.c:282 +#: src/tail.c:281 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -10544,7 +10855,7 @@ msgstr "" " inotify と併せて使用した場合はほとんど有効ではな" "い\n" -#: src/tail.c:295 +#: src/tail.c:294 msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" " -q, --quiet, --silent never output headers giving file names\n" @@ -10561,7 +10872,7 @@ msgstr "" "し、\n" " ファイル名で追跡するときに役に立つ\n" -#: src/tail.c:302 +#: src/tail.c:301 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations.\n" @@ -10575,7 +10886,7 @@ msgstr "" " 最低 N 秒間に 1 回、プロセス P の確認を行う。\n" " -v, --verbose ファイル名を表すヘッダを常に出力する\n" -#: src/tail.c:311 +#: src/tail.c:310 #, fuzzy msgid "" "\n" @@ -10595,7 +10906,7 @@ msgstr "" "G 1024*1024*1024, その他 T, P, E, Z, Y など。\n" "\n" -#: src/tail.c:320 +#: src/tail.c:319 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" @@ -10612,68 +10923,68 @@ msgstr "" "用してください。これにより名前の変更、削除、作成などにあわせて名前のついた\n" "ファイルの末尾を追跡するようになります。\n" -#: src/tail.c:379 +#: src/tail.c:378 #, c-format msgid "closing %s (fd=%d)" msgstr "%s (fd=%d) を閉じています" -#: src/tail.c:454 +#: src/tail.c:453 #, c-format msgid "%s: cannot seek to relative offset %s" msgstr "%s: 相対オフセット %s まで探査 (seek) できません" -#: src/tail.c:458 +#: src/tail.c:457 #, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "%s: ファイル終端からの相対オフセット %s まで探査 (seek) できません" -#: src/tail.c:895 +#: src/tail.c:894 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "%s の位置が決定できません。ポーリングに戻ります" -#: src/tail.c:907 -#, fuzzy, c-format +#: src/tail.c:906 +#, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" -msgstr "%s の位置が決定できません。ポーリングに戻ります" +msgstr "" -#: src/tail.c:964 +#: src/tail.c:963 #, c-format msgid "%s has become inaccessible" msgstr "%s はアクセス不能になりました" -#: src/tail.c:981 +#: src/tail.c:980 #, c-format msgid "%s has been replaced with an untailable file; giving up on this name" msgstr "" "%s は終端を追跡できないファイルに置き換えられました。このファイル名については" "処理を終了します" -#: src/tail.c:990 +#: src/tail.c:989 #, c-format msgid "%s has been replaced with a remote file. giving up on this name" msgstr "" "%s はリモートファイルに置き換えられました。このファイル名については処理を終了" "します" -#: src/tail.c:1011 +#: src/tail.c:1010 #, c-format msgid "%s has become accessible" msgstr "%s はアクセス可能になりました" -#: src/tail.c:1019 +#: src/tail.c:1018 #, c-format msgid "%s has appeared; following end of new file" msgstr "%s が現れました。新しいファイルの終端を追跡します" -#: src/tail.c:1030 +#: src/tail.c:1029 #, c-format msgid "%s has been replaced; following end of new file" msgstr "%s は置き換えられました。新しいファイルの終端を追跡します" -#: src/tail.c:1131 +#: src/tail.c:1130 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: 非ブロッキングモードに変更できませんでした" @@ -11039,17 +11350,22 @@ msgstr "`]' がありません" msgid "extra argument %s" msgstr "%s: 余分な引数です" -#: src/timeout.c:124 +#: src/timeout.c:112 +#, fuzzy, c-format +msgid "warning: sigprocmask" +msgstr "警告: timer_create" + +#: src/timeout.c:145 #, c-format msgid "warning: timer_settime" msgstr "警告: timer_settime" -#: src/timeout.c:129 +#: src/timeout.c:150 #, c-format msgid "warning: timer_create" msgstr "警告: timer_create" -#: src/timeout.c:204 +#: src/timeout.c:225 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -11058,19 +11374,20 @@ msgstr "" "使用法: %s [OPTION] DURATION COMMAND [ARG]...\n" "または: %s [OPTION]\n" -#: src/timeout.c:208 -msgid "" -"Start COMMAND, and kill it if still running after DURATION.\n" -"\n" -"Mandatory arguments to long options are mandatory for short options too.\n" +#: src/timeout.c:229 +#, fuzzy +msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "" "COMMAND を開始し、DURATION 経過後も実行中の場合は終了させます。\n" "\n" "長いオプションに必須の引数は短いオプションにも必須です。\n" -#: src/timeout.c:213 +#: src/timeout.c:235 #, fuzzy msgid "" +" --preserve-status\n" +" exit with the same status as COMMAND, even when the\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 " @@ -11101,7 +11418,7 @@ msgstr "" " は`HUP' のような名前か番号を使用する。シグナル\n" " 一覧については `kill -l` を参照\n" -#: src/timeout.c:229 +#: src/timeout.c:254 #, fuzzy msgid "" "\n" @@ -11113,16 +11430,16 @@ msgstr "" "DURATION は浮動小数で指定し、次の接尾辞を追加できます:\n" "`s' は秒 (デフォルト)、 `m' は分、`h' は時、`d' は日。\n" -#: src/timeout.c:234 +#: src/timeout.c:259 #, fuzzy msgid "" "\n" -"If the command times out, then exit with status 124. Otherwise, exit\n" -"with the status of COMMAND. If no signal is specified, send the TERM\n" -"signal upon timeout. The TERM signal kills any process that does not\n" -"block or catch that signal. For other processes, it may be necessary to\n" -"use the KILL (9) signal, since this signal cannot be caught. If the\n" -"KILL (9) signal is sent, the exit status is 128+9 rather than 124.\n" +"If the command times out, and --preserve-status is not set, then exit with\n" +"status 124. Otherwise, exit with the status of COMMAND. If no signal\n" +"is specified, send the TERM signal upon timeout. The TERM signal kills\n" +"any process that does not block or catch that signal. It may be necessary\n" +"to use the KILL (9) signal, since this signal cannot be caught, in which\n" +"case the exit status is 128+9 rather than 124.\n" msgstr "" "\n" "コマンドがタイムアウトした場合、終了ステータスは 124 になります。それ以外\n" @@ -11131,15 +11448,20 @@ msgstr "" "は、プロセスでブロックか捕捉されない限りプロセスを終了させます。TERM で終\n" "了できないプロセスを終了させるためには KILL (9) シグナルが必要です。\n" -#: src/timeout.c:419 +#: src/timeout.c:363 +#, c-format +msgid "warning: disabling core dumps failed" +msgstr "警告: コアダンプの無効化に失敗しました" + +#: src/timeout.c:471 #, c-format msgid "error waiting for command" msgstr "コマンド待機中にエラーが発生しました" -#: src/timeout.c:441 +#: src/timeout.c:482 #, c-format -msgid "warning: disabling core dumps failed" -msgstr "警告: コアダンプの無効化に失敗しました" +msgid "the monitored command dumped core" +msgstr "" #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 @@ -11151,22 +11473,23 @@ msgstr "Jim Kingdon" msgid "Randy Smith" msgstr "Randy Smith" -#: src/touch.c:115 src/touch.c:313 +#: src/touch.c:115 src/touch.c:309 #, c-format msgid "invalid date format %s" msgstr "%s: 無効な日付の書式です" -#: src/touch.c:194 +#: src/touch.c:191 #, c-format msgid "cannot touch %s" msgstr "%s に touch できません" -#: src/touch.c:200 +#: src/touch.c:197 #, c-format msgid "setting times of %s" msgstr "%s のタイムスタンプを設定中です" -#: src/touch.c:216 +#: src/touch.c:213 +#, fuzzy msgid "" "Update the access and modification times of each FILE to the current time.\n" "\n" @@ -11175,7 +11498,6 @@ msgid "" "\n" "A FILE argument string of - is handled specially and causes touch to\n" "change the times of the file associated with standard output.\n" -"\n" msgstr "" "各 FILE のアクセス日時と更新日時を現在時刻に更新します。\n" "\n" @@ -11186,7 +11508,7 @@ msgstr "" "ファイルの日時を変更します。\n" "\n" -#: src/touch.c:229 +#: src/touch.c:225 msgid "" " -a change only the access time\n" " -c, --no-create do not create any files\n" @@ -11198,7 +11520,7 @@ msgstr "" " -d, --date=STRING 現在時刻の代わりに STRING を解釈して使用する\n" " -f (無視される)\n" -#: src/touch.c:235 +#: src/touch.c:231 msgid "" " -h, --no-dereference affect each symbolic link instead of any " "referenced\n" @@ -11211,11 +11533,12 @@ msgstr "" " 変更できるシステムのみ有効)\n" " -m 更新日時のみ変更する\n" -#: src/touch.c:241 +#: 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" -" --time=WORD change the specified time:\n" +" --time=WORD change the specified time:\n" " WORD is access, atime, or use: equivalent to -a\n" " WORD is modify or mtime: equivalent to -m\n" msgstr "" @@ -11226,7 +11549,7 @@ msgstr "" " WORD が access, atime, use の場合は -a と等価\n" " WORD が modify, mtime の場合は -m と等価\n" -#: src/touch.c:250 +#: src/touch.c:246 msgid "" "\n" "Note that the -d and -t options accept different time-date formats.\n" @@ -11235,12 +11558,12 @@ msgstr "" "-d と -t オプションでは異なった日時の形式を受け付けることに注意してくださ" "い。\n" -#: src/touch.c:339 +#: src/touch.c:335 #, c-format msgid "cannot specify times from more than one source" msgstr "時刻を2カ所以上から取得するようには指定できません" -#: src/touch.c:413 +#: src/touch.c:409 #, fuzzy, c-format msgid "" "warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'" @@ -11518,6 +11841,7 @@ msgid "Usage: %s OPTION... FILE...\n" msgstr "使用法: %s OPTION... FILE...\n" #: src/truncate.c:97 +#, fuzzy msgid "" "Shrink or extend the size of each FILE to the specified size\n" "\n" @@ -11526,7 +11850,6 @@ msgid "" "If a FILE is larger than the specified size, the extra data is lost.\n" "If a FILE is shorter, it is extended and the extended part (hole)\n" "reads as zero bytes.\n" -"\n" msgstr "" "各 FILE を指定した大きさまで拡張または切り詰めを行います。\n" "\n" @@ -11537,17 +11860,17 @@ msgstr "" "拡張した部分 (hole になる) を読み込んだときは値が 0 のバイトとなります。\n" "\n" -#: src/truncate.c:110 +#: src/truncate.c:109 msgid " -c, --no-create do not create any files\n" msgstr " -c, --no-create ファイルを作成しない\n" -#: src/truncate.c:113 +#: src/truncate.c:112 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" " -o, --io-blocks SIZE をバイトではなく I/O ブロックとして扱う\n" -#: src/truncate.c:116 +#: 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" @@ -11555,7 +11878,7 @@ msgstr "" " -r, --reference=RFILE サイズとして RFILE のサイズを使用する\n" " -s, --size=SIZE ファイルサイズを SIZE に設定・調整する\n" -#: src/truncate.c:122 +#: src/truncate.c:121 #, fuzzy msgid "" "\n" @@ -11568,59 +11891,59 @@ msgstr "" "`+' 拡大する、 `-' 切り詰める、 `<' 最大、`>' 最小、\n" "`/' 倍数まで切り捨てる, `%' 倍数まで切り上げる。\n" -#: src/truncate.c:150 +#: src/truncate.c:149 #, c-format msgid "overflow in %<PRIdMAX> * %<PRIdMAX> byte blocks for file %s" msgstr "" "%<PRIdMAX> * %<PRIdMAX> バイトのブロックはファイル %s に対してオーバーフロー" "しています" -#: src/truncate.c:174 +#: src/truncate.c:173 #, c-format msgid "%s has unusable, apparently negative size" msgstr "%s: は使用できません。負の大きさになっているようです" -#: src/truncate.c:184 src/truncate.c:379 +#: src/truncate.c:183 src/truncate.c:384 #, c-format msgid "cannot get the size of %s" msgstr "%s ののサイズを取得できません" -#: src/truncate.c:206 +#: src/truncate.c:205 #, c-format msgid "overflow rounding up size of file %s" msgstr "ファイル %s の切り上げ時にオーバーフローが発生しました" -#: src/truncate.c:216 +#: src/truncate.c:215 #, c-format msgid "overflow extending size of file %s" msgstr "ファイル %s の拡大時にオーバーフローが発生しました" -#: src/truncate.c:231 +#: src/truncate.c:230 #, c-format msgid "failed to truncate %s at %<PRIdMAX> bytes" msgstr "ファイル %s を %<PRIdMAX> バイトへ切り詰めるのに失敗しました" -#: src/truncate.c:305 +#: src/truncate.c:303 #, c-format msgid "multiple relative modifiers specified" msgstr "複数の相対位置を表すオプションが指定されています" -#: src/truncate.c:335 +#: src/truncate.c:333 #, c-format msgid "you must specify either %s or %s" msgstr "%s または %s のいずれかを指定しなければいけません" -#: src/truncate.c:342 +#: src/truncate.c:340 #, c-format msgid "you must specify a relative %s with %s" msgstr "%2$s と併せて相対的な %1$s を指定しなければいけません" -#: src/truncate.c:349 +#: src/truncate.c:347 #, c-format msgid "%s was specified but %s was not" msgstr "%s が指定されていますが %s が指定されていません" -#: src/truncate.c:400 +#: src/truncate.c:404 #, c-format msgid "cannot open %s for writing" msgstr "%s を書き込み用に開くことができません" @@ -11718,16 +12041,16 @@ msgid "cannot get system name" 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" -"\n" msgstr "" "各 FILE に含まれている空白をタブに変換して標準出力に書き込みます。\n" "FILE が指定されないか、 - が指定された場合、標準入力から読み込みます。\n" "\n" -#: src/unexpand.c:125 +#: src/unexpand.c:124 msgid "" " -a, --all convert all blanks, instead of just initial blanks\n" " --first-only convert only leading sequences of blanks (overrides -a)\n" @@ -11741,12 +12064,12 @@ msgstr "" " -t, --tabs=LIST タブ位置をコンマで区切られた LIST に設定する (-a が有効に" "なる)\n" -#: src/unexpand.c:153 +#: src/unexpand.c:152 #, c-format msgid "tabs are too far apart" msgstr "タブが離れすぎています" -#: src/unexpand.c:505 +#: src/unexpand.c:504 #, c-format msgid "tab stop value is too large" msgstr "タブ幅が大きすぎます" @@ -11757,12 +12080,12 @@ msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n" msgstr "使用法: %s [OPTION]... [INPUT [OUTPUT]]\n" #: src/uniq.c:138 +#, fuzzy 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" -"\n" msgstr "" "INPUT (または標準入力) で連続して同じ行があれば フィルタをして OUTPUT\n" "(または標準出力) に書き込みます。\n" @@ -11770,7 +12093,7 @@ msgstr "" "オプションが指定されない場合、同じ行は一つにまとめられます。\n" "\n" -#: src/uniq.c:148 +#: src/uniq.c:147 msgid "" " -c, --count prefix lines by the number of occurrences\n" " -d, --repeated only print duplicate lines\n" @@ -11778,7 +12101,7 @@ msgstr "" " -c, --count 行の前に発生回数を出力する\n" " -d, --repeated 重複した行のみ出力する\n" -#: src/uniq.c:152 +#: src/uniq.c:151 msgid "" " -D, --all-repeated[=delimit-method] print all duplicate lines\n" " delimit-method={none(default),prepend,separate}\n" @@ -11798,11 +12121,11 @@ msgstr "" " -u, --unique 重複していない行のみ出力する\n" " -z, --zero-terminated 行の終わりを (改行ではなく) 0 とする\n" -#: src/uniq.c:162 +#: src/uniq.c:161 msgid " -w, --check-chars=N compare no more than N characters in lines\n" msgstr " -w, --check-chars=N 行の中で N 文字以上を比較しない\n" -#: src/uniq.c:167 +#: src/uniq.c:166 msgid "" "\n" "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n" @@ -11813,7 +12136,7 @@ msgstr "" "空白類文字\n" "があるものです。文字の前のフィールドはスキップされます。\n" -#: src/uniq.c:172 +#: src/uniq.c:171 #, fuzzy msgid "" "\n" @@ -11827,24 +12150,24 @@ msgstr "" "もできます。また、比較の優先順位は `LC_COLLATE' で指定された規則に\n" "基づきます。\n" -#: src/uniq.c:359 +#: src/uniq.c:358 #, c-format msgid "too many repeated lines" msgstr "重複した行が多すぎます" -#: src/uniq.c:522 +#: src/uniq.c:521 msgid "invalid number of fields to skip" msgstr "スキップするフィールド数の指定が無効です" -#: src/uniq.c:531 +#: src/uniq.c:530 msgid "invalid number of bytes to skip" msgstr "スキップするバイト数の指定が無効です" -#: src/uniq.c:540 +#: src/uniq.c:539 msgid "invalid number of bytes to compare" msgstr "比較するバイト数の指定が無効です" -#: src/uniq.c:559 +#: src/uniq.c:558 #, c-format msgid "printing all duplicated lines and repeat counts is meaningless" msgstr "全ての重複行と繰り返し回数を表示することに意味がありません" @@ -11897,6 +12220,11 @@ msgid "up %ld day %2d:%02d, " msgid_plural "up %ld days %2d:%02d, " msgstr[0] "稼働時間 %ld 日 %2d:%02d " +#: src/uptime.c:149 +#, fuzzy, c-format +msgid "up %2d:%02d, " +msgstr "稼働時間 %ld 日 %2d:%02d " + #: src/uptime.c:151 #, c-format msgid "%lu user" @@ -11991,39 +12319,39 @@ msgstr "" msgid " old " msgstr " 昔 " -#: src/who.c:449 +#: src/who.c:440 msgid "system boot" msgstr "システム起動" -#: src/who.c:456 src/who.c:458 +#: src/who.c:447 src/who.c:449 msgid "id=" msgstr "ID=" -#: src/who.c:471 src/who.c:476 +#: src/who.c:462 src/who.c:467 msgid "term=" msgstr "端末=" -#: src/who.c:473 src/who.c:477 +#: src/who.c:464 src/who.c:468 msgid "exit=" msgstr "終了=" -#: src/who.c:494 +#: src/who.c:485 msgid "LOGIN" msgstr "LOGIN" -#: src/who.c:514 +#: src/who.c:505 msgid "clock change" msgstr "時刻の変更" -#: src/who.c:526 src/who.c:527 +#: src/who.c:517 src/who.c:518 msgid "run-level" msgstr "run-level" -#: src/who.c:530 src/who.c:531 +#: src/who.c:521 src/who.c:522 msgid "last=" msgstr "最後=" -#: src/who.c:562 +#: src/who.c:553 #, c-format msgid "" "\n" @@ -12032,44 +12360,44 @@ msgstr "" "\n" "ユーザ数=%lu\n" -#: src/who.c:568 +#: src/who.c:559 msgid "NAME" msgstr "名前" -#: src/who.c:568 +#: src/who.c:559 msgid "LINE" msgstr "端末" -#: src/who.c:568 +#: src/who.c:559 msgid "TIME" msgstr "時間" -#: src/who.c:568 +#: src/who.c:559 msgid "IDLE" msgstr "IDLE" -#: src/who.c:569 +#: src/who.c:560 msgid "PID" msgstr "PID" -#: src/who.c:569 +#: src/who.c:560 msgid "COMMENT" msgstr "コメント" -#: src/who.c:569 +#: src/who.c:560 msgid "EXIT" msgstr "終了" -#: src/who.c:649 +#: src/who.c:640 #, c-format msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n" msgstr "使用法: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n" -#: src/who.c:650 +#: src/who.c:641 msgid "Print information about users who are currently logged in.\n" msgstr "現在ログインしているユーザに関する情報を表示します。\n" -#: src/who.c:653 +#: src/who.c:644 msgid "" "\n" " -a, --all same as -b -d --login -p -r -t -T -u\n" @@ -12083,11 +12411,11 @@ msgstr "" " -d, --dead 終了したプロセスを表示\n" " -H, --heading ヘッダ行を表示\n" -#: src/who.c:660 +#: src/who.c:651 msgid " -l, --login print system login processes\n" msgstr " -l, --login システムのログインプロセスを表示する\n" -#: src/who.c:663 +#: src/who.c:654 msgid "" " --lookup attempt to canonicalize hostnames via DNS\n" " -m only hostname and user associated with stdin\n" @@ -12097,7 +12425,7 @@ msgstr "" " -m 標準入力に関連づけられたホスト名とユーザのみを表示する\n" " -p, --process init によって起動されたアクティブプロセスを表示する\n" -#: src/who.c:668 +#: src/who.c:659 msgid "" " -q, --count all login names and number of users logged on\n" " -r, --runlevel print current runlevel\n" @@ -12109,7 +12437,7 @@ msgstr "" " -s, --short 名前, 行および時間のみを表示 (標準)\n" " -t, --time 最後にシステムの時刻が変更された時刻を表示\n" -#: src/who.c:674 +#: src/who.c:665 msgid "" " -T, -w, --mesg add user's message status as +, - or ?\n" " -u, --users list users logged in\n" @@ -12121,7 +12449,7 @@ msgstr "" " --message -T と同じ\n" " --writable -T と同じ\n" -#: src/who.c:682 +#: src/who.c:673 #, fuzzy, c-format msgid "" "\n" @@ -12165,20 +12493,23 @@ msgstr "" "指定された全ての STRING または `y' からなる行を繰り返し出力します。\n" "\n" +#~ msgid "using single-precision arithmetic" +#~ msgstr "固定制度の演算を使用します" + +#~ msgid "using arbitrary-precision arithmetic" +#~ msgstr "任意精度の演算を使用します" + #, fuzzy -#~ msgid " gid=%s" -#~ msgstr " gid=%lu" +#~ msgid " returning value: '%s'\n" +#~ msgstr "ファイル %s を作成しています\n" #, fuzzy -#~ msgid " euid=%s" -#~ msgstr " euid=%lu" +#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n" +#~ msgstr "使用法: %s [OPTION]... [USER]...\n" -#~ msgid "" -#~ "Usage: %s NAME\n" -#~ " or: %s OPTION\n" -#~ msgstr "" -#~ "使用法: %s NAME\n" -#~ "または: %s OPTION\n" +#, fuzzy +#~ msgid "no valid suffix found\n" +#~ msgstr "%s: 接尾辞の長さが正しくありません" #~ msgid "" #~ "\n" @@ -12191,20 +12522,178 @@ 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 NAME\n" +#~ "または: %s OPTION\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 異なるファイルシステムにあるディレクトリをス" +#~ "キップする\n" +#~ " -X, --exclude-from=FILE FILE 内に含まれるパターンに一致するファイルを含" +#~ "めない\n" +#~ " --exclude=PATTERN PATTERN に一致するファイルを含めない\n" +#~ " -d, --max-depth=N コマンドライン引数から数えて深さが N 以下ディレク" +#~ "トリ階層の\n" +#~ " 合計のみ表示する (--all を指定した時はファイルも" +#~ "含める)。\n" +#~ " --max-depth=0 は --summarize と等価になる\n" + #, fuzzy -#~ msgid "Usage: %s [OPTION] FILE...\n" -#~ msgstr "使用法: %s [OPTION]... FILE...\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 バックアップを作成しない (--backup を付けた時でも)\n" +#~ " numbered, t 番号付きバックアップを作成する\n" +#~ " existing, nil 番号付きバックアップがあれば番号付き、\n" +#~ " そうでなければ、simple で作成する\n" +#~ " simple, never 常に簡易バックアップを作成\n" + +#~ msgid "" +#~ "WARNING: --page-increment is deprecated; use --line-increment instead" +#~ msgstr "" +#~ "警告: --page-increment は非推奨です。 --line-increment を使用してください" + +#~ msgid "All arguments to long options are mandatory for short options.\n" +#~ msgstr "長いオプションに必須の引数は短いオプションにも必須です。\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 にはアドレスの基数を指定します。d は十進数を、 o は八進数を、x は十" +#~ "六進数です。\n" +#~ "n を指定したときにはアドレスを表示しません。\n" +#~ "BYTES の接頭辞に 0x または 0X をつけると十六進数として扱われます。また、次" +#~ "の倍数接尾辞\n" +#~ "を指定できます:\n" +#~ "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" +#~ "全ての TYPE 指定で z 接尾辞をつけると各出力行の最後にの表示可能な文字を出" +#~ "力します。\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 オプションに数値を指定しない場合は 3 とみなされます。--width オプ" +#~ "ションに\n" +#~ "数値を指定しないと 32 とみなされます。デフォルトでは -A o -t oS -w16 オプ" +#~ "ションが\n" +#~ "使用されます。\n" + +#~ msgid "Usage: %s [OPTION]... FILE\n" +#~ msgstr "使用法: %s [OPTION]... FILE\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 [OPTION]... [-] [USER [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 "" +#~ "実効ユーザ ID およびグループ ID を USER に変更します。\n" +#~ "\n" +#~ " -, -l, --login シェルをログインシェルにする\n" +#~ " -c, --command=COMMAND 単一の COMMAND を -c を付けてシェルに渡す\n" +#~ " -f, --fast -f をシェルに渡す (csh または tcsh 用)\n" +#~ " -m, --preserve-environment 環境変数を再設定しない\n" +#~ " -p -m と同じ\n" +#~ " -s, --shell=SHELL /etc/shells で許可されていれば SHELL を実行" +#~ "する\n" + +#~ msgid "" +#~ "\n" +#~ "A mere - implies -l. If USER not given, assume root.\n" +#~ msgstr "" +#~ "\n" +#~ "- だけを指定した場合は -l と見なされます。USER を指定しなければ、root であ" +#~ "ると見なされます。\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" -#~ " --dereference affect the referent of each symbolic link (this " -#~ "is\n" -#~ " the default), rather than the symbolic link " -#~ "itself\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 のものに変更しま" @@ -12215,6 +12704,13 @@ msgstr "" #~ "クの\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" @@ -12240,13 +12736,6 @@ msgstr "" #~ "\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" @@ -12296,33 +12785,6 @@ msgstr "" #~ " -v, --verbose 各ファイルが処理されるたびに診断メッセージを出力" #~ "する\n" -#, fuzzy -#~ msgid "Usage: %s [OPTION]... PATH START\n" -#~ msgstr "使用法: %s [OPTION]... SET1 [SET2]\n" - -#, fuzzy -#~ msgid "" -#~ " -n, --no-newline do not output the trailing " -#~ "newline\n" -#~ " " -#~ msgstr "" -#~ "STRING を標準出力に出力する\n" -#~ "\n" -#~ " -n 最後に改行を出力しない\n" - -#, fuzzy -#~ 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" -#~ "SIZE は次のうちの一つです (整数の後に付加されるかもしれません):\n" -#~ "KB 1000, K 1024, MB 1000*1000, M 1024*1024, その他 G, T, P, E, Z, Y な" -#~ "ど。\n" - #~ msgid "" #~ "Display the current time in the given FORMAT, or set the system date.\n" #~ "\n" @@ -12337,6 +12799,18 @@ msgstr "" #~ " -f, --file=DATEFILE DATEFILE の各行に対して --date と同様に動作す" #~ "る\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" +#~ "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 を作成できません" @@ -12352,9 +12826,6 @@ msgstr "" #~ msgid "invalid number of lines: 0" #~ msgstr "無効な行数です: 0" -#~ msgid "invalid format width" -#~ msgstr "無効な書式幅です" - #~ msgid "invalid format precision" #~ msgstr "無効な書式精度です" diff --git a/po/kk.gmo b/po/kk.gmo index c9d3ba45..6a5b3113 100644 Binary files a/po/kk.gmo and b/po/kk.gmo differ diff --git a/po/kk.po b/po/kk.po index 3e4e5555..2bf5fd39 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: 2012-05-10 19:35+0200\n" +"POT-Creation-Date: 2013-02-14 15:56+0000\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,19 +38,19 @@ msgstr "" msgid "error closing file" msgstr "Файлды жабу қатесі: %s" -#: lib/closeout.c:112 src/base64.c:109 src/base64.c:121 src/base64.c:127 -#: src/base64.c:168 src/base64.c:224 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:330 src/expand.c:355 src/head.c:298 -#: src/head.c:348 src/head.c:756 src/head.c:797 src/mktemp.c:350 src/od.c:919 -#: src/paste.c:160 src/shuf.c:369 src/split.c:727 src/split.c:964 -#: src/split.c:969 src/tail.c:350 src/tail.c:1201 src/tail.c:1307 +#: 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 -#: src/unexpand.c:427 src/unexpand.c:443 +#: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "жазу қатесі" -#: lib/copy-acl.c:611 src/copy.c:1160 src/copy.c:2602 +#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617 #, c-format msgid "preserving permissions for %s" msgstr "" @@ -248,18 +248,18 @@ msgstr "" msgid "%s: option '-W %s' requires an argument\n" msgstr "" -#: lib/mkdir-p.c:196 src/install.c:483 +#: lib/mkdir-p.c:196 src/install.c:484 #, c-format msgid "cannot change permissions of %s" msgstr "" -#: lib/mkdir-p.c:206 src/copy.c:2261 src/install.c:709 src/install.c:722 +#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722 #, 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:915 src/tac.c:435 +#: src/split.c:929 src/tac.c:434 #, c-format msgid "memory exhausted" msgstr "" @@ -308,77 +308,77 @@ msgstr "" msgid "%s: end of file" msgstr "" -#: lib/regcomp.c:130 +#: lib/regcomp.c:131 #, fuzzy msgid "Success" msgstr "Сәтті" -#: lib/regcomp.c:133 +#: lib/regcomp.c:134 #, fuzzy msgid "No match" msgstr "Сәйкестік жоқ" -#: lib/regcomp.c:136 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "" -#: lib/regcomp.c:139 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "" -#: lib/regcomp.c:142 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "" -#: lib/regcomp.c:145 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "" -#: lib/regcomp.c:148 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "" -#: lib/regcomp.c:151 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "" -#: lib/regcomp.c:154 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "" -#: lib/regcomp.c:157 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "" -#: lib/regcomp.c:160 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "" -#: lib/regcomp.c:163 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "" -#: lib/regcomp.c:166 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "" -#: lib/regcomp.c:169 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "" -#: lib/regcomp.c:172 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "" -#: lib/regcomp.c:175 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "" -#: lib/regcomp.c:178 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:703 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "" @@ -417,7 +417,7 @@ msgstr "" msgid "^[nN]" msgstr "" -#: lib/set-mode-acl.c:695 src/copy.c:2284 src/cp.c:518 +#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516 #, c-format msgid "setting permissions for %s" msgstr "" @@ -564,13 +564,13 @@ msgstr "" msgid "Resource lost" msgstr "" -#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262 -#: lib/spawn-pipe.c:265 +#: 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:232 lib/spawn-pipe.c:346 lib/wait-process.c:282 +#: 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" @@ -586,24 +586,24 @@ msgstr "" msgid "Unknown signal %d" msgstr "" -#: lib/unicodeio.c:103 +#: lib/unicodeio.c:102 msgid "iconv function not usable" msgstr "" -#: lib/unicodeio.c:105 +#: lib/unicodeio.c:104 msgid "iconv function not available" msgstr "" -#: lib/unicodeio.c:112 +#: lib/unicodeio.c:111 msgid "character out of range" msgstr "" -#: lib/unicodeio.c:182 +#: lib/unicodeio.c:181 #, c-format msgid "cannot convert U+%04X to local character set" msgstr "" -#: lib/unicodeio.c:184 +#: lib/unicodeio.c:183 #, c-format msgid "cannot convert U+%04X to local character set: %s" msgstr "" @@ -759,7 +759,7 @@ msgstr "" msgid "Report %s bugs to: %s\n" msgstr "" -#: lib/version-etc.c:251 src/system.h:562 +#: lib/version-etc.c:251 src/system.h:573 #, c-format msgid "%s home page: <%s>\n" msgstr "" @@ -769,7 +769,7 @@ msgstr "" msgid "%s home page: <http://www.gnu.org/software/%s/>\n" msgstr "" -#: lib/version-etc.c:256 src/system.h:563 +#: lib/version-etc.c:256 src/system.h:574 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" @@ -859,10 +859,9 @@ msgstr "" msgid "" "Usage: %s [OPTION]... [FILE]\n" "Base64 encode or decode FILE, or standard input, to standard output.\n" -"\n" msgstr "" -#: src/base64.c:64 +#: src/base64.c:67 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -872,13 +871,13 @@ msgid "" "\n" msgstr "" -#: src/base64.c:73 src/cat.c:110 src/fmt.c:293 src/shuf.c:71 src/sum.c:70 +#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" msgstr "" -#: src/base64.c:76 +#: src/base64.c:79 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -887,37 +886,37 @@ msgid "" "from any other non-alphabet bytes in the encoded stream.\n" msgstr "" -#: src/base64.c:171 src/base64.c:208 src/csplit.c:263 src/csplit.c:1435 -#: src/join.c:451 src/shuf.c:157 src/shuf.c:361 src/tac-pipe.c:74 +#: 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 #, c-format msgid "read error" msgstr "" -#: src/base64.c:227 +#: src/base64.c:230 #, fuzzy, c-format msgid "invalid input" msgstr "Енгізу қате" -#: src/base64.c:264 +#: src/base64.c:267 #, c-format msgid "invalid wrap size: %s" msgstr "" -#: src/base64.c:283 src/basename.c:173 src/comm.c:435 src/cp.c:607 -#: src/date.c:441 src/dircolors.c:447 src/du.c:894 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:169 src/install.c:929 src/join.c:961 -#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:157 src/mv.c:447 -#: src/od.c:1802 src/ptx.c:2081 src/readlink.c:154 src/seq.c:408 -#: src/shuf.c:320 src/shuf.c:339 src/sort.c:4477 src/split.c:1313 -#: src/tr.c:1797 src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:454 -#: src/uniq.c:471 src/unlink.c:81 src/uptime.c:250 src/users.c:146 -#: src/wc.c:666 src/who.c:836 src/whoami.c:79 +#: 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 #, c-format msgid "extra operand %s" msgstr "" -#: src/base64.c:315 src/cat.c:781 +#: src/base64.c:318 src/cat.c:781 #, c-format msgid "closing standard input" msgstr "" @@ -925,15 +924,15 @@ 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/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:53 src/env.c:33 +#: 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/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:65 src/su.c:88 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 +#: 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 msgid "David MacKenzie" msgstr "" @@ -948,17 +947,16 @@ msgstr "" msgid "" "Print NAME with any leading directory components removed.\n" "If specified, also remove a trailing SUFFIX.\n" -"\n" msgstr "" -#: src/basename.c:59 +#: 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" msgstr "" -#: src/basename.c:66 +#: src/basename.c:67 #, c-format msgid "" "\n" @@ -969,20 +967,21 @@ msgid "" " %s -a any/str1 any/str2 -> \"str1\" followed by \"str2\"\n" msgstr "" -#: src/basename.c:167 src/chcon.c:531 src/chgrp.c:277 src/chmod.c:526 -#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1369 +#: 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:183 src/mkfifo.c:108 src/mknod.c:146 src/nohup.c:111 -#: src/pathchk.c:148 src/printf.c:674 src/readlink.c:146 src/realpath.c:236 -#: src/rm.c:314 src/rmdir.c:223 src/seq.c:402 src/setuidgid.c:137 -#: src/sleep.c:119 src/stat.c:1476 src/stdbuf.c:346 src/tr.c:1782 +#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 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 #, 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:52 src/split.c:49 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/split.c:49 msgid "Torbjorn Granlund" msgstr "" @@ -992,8 +991,8 @@ msgstr "" msgid "Richard M. Stallman" msgstr "" -#: src/cat.c:88 src/df.c:846 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4720 src/nl.c:182 src/paste.c:435 src/pr.c:2768 src/sum.c:58 +#: 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/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" @@ -1033,7 +1032,7 @@ msgstr "" msgid "cannot do ioctl on %s" msgstr "" -#: src/cat.c:637 src/dd.c:2209 src/sort.c:379 src/tee.c:165 src/yes.c:86 +#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86 #, c-format msgid "standard output" msgstr "" @@ -1050,14 +1049,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:55 src/head.c:46 src/hostid.c:33 +#: 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 msgid "Jim Meyering" msgstr "" -#: src/chcon.c:100 src/runcon.c:203 src/runcon.c:234 +#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238 #, c-format msgid "failed to create security context: %s" msgstr "" @@ -1067,8 +1066,8 @@ msgstr "" msgid "failed to set %s security context component to %s" msgstr "" -#: src/chcon.c:156 src/chcon.c:540 src/copy.c:2222 src/runcon.c:217 -#: src/stat.c:683 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221 +#: src/stat.c:702 #, c-format msgid "failed to get security context of %s" msgstr "" @@ -1084,12 +1083,12 @@ 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:446 src/ls.c:2981 +#: src/du.c:457 src/ls.c:2981 #, c-format msgid "cannot access %s" msgstr "" -#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:426 +#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437 #, c-format msgid "cannot read directory %s" msgstr "" @@ -1099,13 +1098,13 @@ 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:599 +#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562 #, c-format msgid "fts_read failed" msgstr "" -#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:618 -#: src/remove.c:613 +#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642 +#: src/remove.c:576 #, c-format msgid "fts_close failed" msgstr "" @@ -1123,10 +1122,9 @@ msgid "" "Change the security context of each FILE to CONTEXT.\n" "With --reference, change the security context of each FILE to that of " "RFILE.\n" -"\n" msgstr "" -#: src/chcon.c:362 src/chgrp.c:123 src/chown.c:94 +#: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94 msgid "" " --dereference affect the referent of each symbolic link (this is\n" " the default), rather than the symbolic link itself\n" @@ -1134,7 +1132,7 @@ msgid "" "file\n" msgstr "" -#: src/chcon.c:367 +#: src/chcon.c:369 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" @@ -1142,22 +1140,28 @@ msgid "" " -l, --range=RANGE set range RANGE in the target security context\n" msgstr "" -#: src/chcon.c:373 +#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 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 msgid "" " --reference=RFILE use RFILE's security context rather than " "specifying\n" " a CONTEXT value\n" msgstr "" -#: src/chcon.c:377 src/chgrp.c:140 src/chown.c:118 +#: 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:380 +#: src/chcon.c:386 msgid " -v, --verbose output a diagnostic for every file processed\n" msgstr "" -#: src/chcon.c:383 src/chgrp.c:143 src/chown.c:121 +#: src/chcon.c:389 src/chgrp.c:143 src/chown.c:121 msgid "" "\n" "The following options modify how a hierarchy is traversed when the -R\n" @@ -1172,36 +1176,36 @@ msgid "" "\n" msgstr "" -#: src/chcon.c:512 src/chgrp.c:264 src/chown.c:267 +#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267 #, c-format msgid "-R --dereference requires either -H or -L" msgstr "" -#: src/chcon.c:518 +#: src/chcon.c:524 #, c-format msgid "-R -h requires -P" msgstr "" -#: src/chcon.c:533 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282 -#: src/comm.c:429 src/csplit.c:1371 src/join.c:1149 src/link.c:79 -#: src/mknod.c:148 src/setuidgid.c:139 src/tr.c:1785 +#: 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 #, c-format msgid "missing operand after %s" msgstr "" -#: src/chcon.c:556 src/runcon.c:247 +#: src/chcon.c:562 src/runcon.c:251 #, c-format msgid "invalid context: %s" msgstr "" -#: src/chcon.c:563 +#: src/chcon.c:569 #, c-format msgid "conflicting security context specifiers given" msgstr "" -#: src/chcon.c:572 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:433 src/cp.c:493 -#: src/mv.c:96 src/pwd.c:273 src/rm.c:324 src/touch.c:351 +#: 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 #, c-format msgid "failed to get attributes of %s" msgstr "" @@ -1238,12 +1242,6 @@ msgid "" " ownership of a symlink)\n" msgstr "" -#: src/chgrp.c:132 src/chmod.c:387 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/chgrp.c:136 msgid "" " --reference=RFILE use RFILE's group rather than specifying a\n" @@ -1344,9 +1342,9 @@ msgid "changed ownership of %s from %s to %s\n" msgstr "" #: src/chown-core.c:159 -#, fuzzy, c-format +#, c-format msgid "changed group of %s from %s to %s\n" -msgstr "\"%s\" ашу сәтсіз аяқталды " +msgstr "" #: src/chown-core.c:160 #, c-format @@ -1354,14 +1352,14 @@ msgid "no change to ownership of %s\n" msgstr "" #: src/chown-core.c:165 -#, fuzzy, c-format +#, c-format msgid "failed to change ownership of %s from %s to %s\n" -msgstr "\"%s\" ашу сәтсіз аяқталды " +msgstr "" #: src/chown-core.c:166 -#, fuzzy, c-format +#, c-format msgid "failed to change group of %s from %s to %s\n" -msgstr "\"%s\" ашу сәтсіз аяқталды " +msgstr "" #: src/chown-core.c:167 src/chown-core.c:173 #, c-format @@ -1463,7 +1461,7 @@ msgstr "" msgid "Roland McGrath" msgstr "" -#: src/chroot.c:97 src/install.c:575 src/setuidgid.c:110 src/setuidgid.c:120 +#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120 #, c-format msgid "invalid group %s" msgstr "" @@ -1523,8 +1521,8 @@ msgstr "" msgid "failed to set user-ID" msgstr "" -#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:213 src/stdbuf.c:366 -#: src/timeout.c:402 +#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365 +#: src/timeout.c:454 #, c-format msgid "failed to run command %s" msgstr "" @@ -1619,20 +1617,24 @@ msgstr "" msgid "empty %s not allowed" msgstr "" -#: src/copy.c:168 src/dd.c:1609 src/dd.c:1976 +#: 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 #, fuzzy, c-format -msgid "reading %s" -msgstr "Оқуда" +msgid "error reading %s" +msgstr "%s: %s: оқу қатесі: %s\n" -#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:426 +#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425 #, c-format msgid "cannot lseek %s" msgstr "" -#: src/copy.c:206 src/dd.c:2039 src/dd.c:2102 +#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151 #, fuzzy, c-format -msgid "writing %s" -msgstr "Жазуда" +msgid "error writing %s" +msgstr "\"%s\" жазу қатесі: %s" #: src/copy.c:313 #, fuzzy, c-format @@ -1654,7 +1656,7 @@ msgstr "\"%s\" ашу сәтсіз аяқталды " msgid "clearing permissions for %s" msgstr "" -#: src/copy.c:697 src/copy.c:2470 src/cp.c:331 +#: src/copy.c:697 src/copy.c:2480 src/cp.c:329 #, c-format msgid "failed to preserve ownership for %s" msgstr "" @@ -1669,14 +1671,14 @@ msgstr "" msgid "failed to preserve authorship for %s" msgstr "" -#: src/copy.c:804 src/csplit.c:638 src/du.c:901 src/fmt.c:449 src/head.c:847 -#: src/sort.c:4489 src/split.c:1329 src/tail.c:1756 src/wc.c:678 +#: 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:1546 src/dd.c:2114 src/dd.c:2252 -#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:141 +#: 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 #, c-format msgid "cannot fstat %s" msgstr "" @@ -1696,14 +1698,14 @@ msgstr "" msgid "failed to set the security context of %s to %s" msgstr "" -#: src/copy.c:881 src/copy.c:1574 src/copy.c:1777 src/copy.c:1935 src/ln.c:314 -#: src/remove.c:267 src/remove.c:293 src/remove.c:444 src/remove.c:465 +#: 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 #, c-format msgid "cannot remove %s" msgstr "" -#: src/copy.c:886 src/copy.c:1578 src/copy.c:1772 src/copy.c:1940 -#: src/remove.c:418 +#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945 +#: src/remove.c:375 #, c-format msgid "removed %s\n" msgstr "" @@ -1723,186 +1725,186 @@ msgstr "" msgid "failed to clone %s from %s" msgstr "\"%s\" ашу сәтсіз аяқталды " -#: src/copy.c:1098 src/copy.c:2531 +#: src/copy.c:1098 src/copy.c:2541 #, c-format msgid "preserving times for %s" msgstr "" -#: src/copy.c:1170 src/copy.c:1176 src/head.c:855 src/touch.c:175 -#: src/truncate.c:413 +#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172 +#: src/truncate.c:417 #, fuzzy, c-format -msgid "closing %s" -msgstr "Жабылуда %s" +msgid "failed to close %s" +msgstr "\"%s\" ашу сәтсіз аяқталды " -#: src/copy.c:1466 +#: src/copy.c:1471 #, c-format msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? " msgstr "" -#: src/copy.c:1473 +#: src/copy.c:1478 #, fuzzy, c-format msgid "%s: overwrite %s? " msgstr "Үстінен жазу ма?" -#: src/copy.c:1542 +#: src/copy.c:1547 #, c-format msgid " (backup: %s)" msgstr "" -#: src/copy.c:1552 +#: src/copy.c:1557 #, c-format msgid "failed to restore the default file creation context" msgstr "" -#: src/copy.c:1584 +#: src/copy.c:1589 #, c-format msgid "cannot create hard link %s to %s" msgstr "" -#: src/copy.c:1637 src/copy.c:1689 src/copy.c:2272 src/copy.c:2589 +#: 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:1220 src/truncate.c:365 +#: src/stat.c:1239 src/truncate.c:363 #, c-format msgid "cannot stat %s" msgstr "" -#: src/copy.c:1645 +#: src/copy.c:1650 #, c-format msgid "omitting directory %s" msgstr "" -#: src/copy.c:1659 +#: src/copy.c:1664 #, c-format msgid "warning: source file %s specified more than once" msgstr "" -#: src/copy.c:1707 src/ln.c:246 +#: src/copy.c:1712 src/ln.c:246 #, c-format msgid "%s and %s are the same file" msgstr "" -#: src/copy.c:1806 +#: src/copy.c:1811 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "" -#: src/copy.c:1824 src/ln.c:214 +#: src/copy.c:1829 src/ln.c:214 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "" -#: src/copy.c:1842 +#: src/copy.c:1847 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "" -#: src/copy.c:1856 +#: src/copy.c:1861 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "" -#: src/copy.c:1886 +#: src/copy.c:1891 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "" -#: src/copy.c:1887 +#: src/copy.c:1892 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "" -#: src/copy.c:1910 src/ln.c:276 +#: src/copy.c:1915 src/ln.c:276 #, c-format msgid "cannot backup %s" msgstr "" -#: src/copy.c:1974 +#: src/copy.c:1979 #, c-format msgid "will not copy %s through just-created symlink %s" msgstr "" -#: src/copy.c:2051 +#: src/copy.c:2056 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "" -#: src/copy.c:2068 +#: src/copy.c:2073 #, c-format msgid "will not create hard link %s to directory %s" msgstr "" -#: src/copy.c:2118 +#: src/copy.c:2123 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "" -#: src/copy.c:2161 +#: src/copy.c:2166 #, c-format msgid "cannot move %s to %s" msgstr "" -#: src/copy.c:2173 +#: src/copy.c:2178 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" -#: src/copy.c:2207 src/install.c:905 src/mkdir.c:189 src/mkfifo.c:114 -#: src/mknod.c:167 +#: 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:2241 +#: src/copy.c:2246 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "" -#: src/copy.c:2350 +#: src/copy.c:2355 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "" -#: src/copy.c:2357 +#: src/copy.c:2362 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "" -#: src/copy.c:2406 src/mkfifo.c:133 +#: src/copy.c:2416 src/mkfifo.c:132 #, c-format msgid "cannot create fifo %s" msgstr "" -#: src/copy.c:2415 +#: src/copy.c:2425 #, c-format msgid "cannot create special file %s" msgstr "" -#: src/copy.c:2426 src/ls.c:3191 src/stat.c:902 +#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921 #, c-format msgid "cannot read symbolic link %s" msgstr "" -#: src/copy.c:2453 +#: src/copy.c:2463 #, c-format msgid "cannot create symbolic link %s" msgstr "" -#: src/copy.c:2485 +#: src/copy.c:2495 #, c-format msgid "%s has unknown file type" msgstr "" -#: src/copy.c:2629 src/ln.c:358 +#: src/copy.c:2644 src/ln.c:358 #, c-format msgid "cannot un-backup %s" msgstr "" -#: src/copy.c:2633 +#: src/copy.c:2648 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "" -#: src/cp.c:156 src/mv.c:284 +#: src/cp.c:156 src/mv.c:286 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -1911,23 +1913,10 @@ msgid "" msgstr "" #: src/cp.c:162 -msgid "" -"Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" -"\n" +msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" msgstr "" -#: src/cp.c:166 src/csplit.c:1458 src/cut.c:197 src/df.c:852 src/du.c:268 -#: src/expand.c:112 src/fmt.c:275 src/fold.c:75 src/head.c:115 -#: src/install.c:612 src/kill.c:86 src/ln.c:392 src/ls.c:4726 src/mkdir.c:61 -#: src/mkfifo.c:56 src/mknod.c:58 src/mv.c:294 src/nl.c:191 src/paste.c:445 -#: src/pr.c:2777 src/ptx.c:1825 src/shred.c:153 src/shuf.c:58 src/sort.c:399 -#: src/split.c:211 src/stdbuf.c:95 src/tac.c:142 src/tail.c:268 -#: src/touch.c:226 src/truncate.c:107 src/unexpand.c:122 src/uniq.c:145 -msgid "" -"Mandatory arguments to long options are mandatory for short options too.\n" -msgstr "" - -#: src/cp.c:169 +#: src/cp.c:168 msgid "" " -a, --archive same as -dR --preserve=all\n" " --attributes-only don't copy the file data, just the " @@ -1941,32 +1930,33 @@ msgid "" " -d same as --no-dereference --preserve=links\n" msgstr "" -#: src/cp.c:178 +#: src/cp.c:177 msgid "" " -f, --force if an existing destination file cannot be\n" -" opened, remove it and try again (redundant " -"if\n" -" the -n option is used)\n" +" opened, remove it and try again (this " +"option\n" +" is ignored when the -n option is also " +"used)\n" " -i, --interactive prompt before overwrite (overrides a previous " "-n\n" " option)\n" " -H follow command-line symbolic links in SOURCE\n" msgstr "" -#: src/cp.c:188 +#: src/cp.c:186 msgid "" " -l, --link hard link files instead of copying\n" " -L, --dereference always follow symbolic links in SOURCE\n" msgstr "" -#: src/cp.c:192 +#: src/cp.c:190 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:197 +#: src/cp.c:195 msgid "" " -p same as --preserve=mode,ownership,timestamps\n" " --preserve[=ATTR_LIST] preserve the specified attributes (default:\n" @@ -1976,13 +1966,13 @@ msgid "" " all\n" msgstr "" -#: src/cp.c:205 +#: src/cp.c:203 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:209 +#: src/cp.c:207 msgid "" " -R, -r, --recursive copy directories recursively\n" " --reflink[=WHEN] control clone/CoW copies. See below\n" @@ -1991,7 +1981,7 @@ msgid "" "force)\n" msgstr "" -#: src/cp.c:215 +#: src/cp.c:213 msgid "" " --sparse=WHEN control creation of sparse files. See below\n" " --strip-trailing-slashes remove any trailing slashes from each " @@ -1999,7 +1989,7 @@ msgid "" " argument\n" msgstr "" -#: src/cp.c:220 +#: src/cp.c:218 msgid "" " -s, --symbolic-link make symbolic links instead of copying\n" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -2008,7 +1998,7 @@ msgid "" " -T, --no-target-directory treat DEST as a normal file\n" msgstr "" -#: src/cp.c:226 +#: src/cp.c:224 msgid "" " -u, --update copy only when the SOURCE file is newer\n" " than the destination file or when the\n" @@ -2017,7 +2007,7 @@ msgid "" " -x, --one-file-system stay on this file system\n" msgstr "" -#: src/cp.c:235 +#: src/cp.c:233 msgid "" "\n" "By default, sparse SOURCE files are detected by a crude heuristic and the\n" @@ -2033,7 +2023,7 @@ msgid "" "fails, or if --reflink=auto is specified, fall back to a standard copy.\n" msgstr "" -#: src/cp.c:247 src/install.c:649 src/ln.c:421 src/mv.c:321 +#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322 msgid "" "\n" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -2043,7 +2033,7 @@ msgid "" "\n" msgstr "" -#: src/cp.c:254 src/install.c:656 src/mv.c:328 +#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329 msgid "" " none, off never make backups (even if --backup is given)\n" " numbered, t make numbered backups\n" @@ -2051,7 +2041,7 @@ msgid "" " simple, never always make simple backups\n" msgstr "" -#: src/cp.c:260 +#: src/cp.c:258 msgid "" "\n" "As a special case, cp makes a backup of SOURCE when the force and backup\n" @@ -2059,90 +2049,90 @@ msgid "" "regular file.\n" msgstr "" -#: src/cp.c:319 +#: src/cp.c:317 #, c-format msgid "failed to preserve times for %s" msgstr "" -#: src/cp.c:350 +#: src/cp.c:348 #, c-format msgid "failed to preserve permissions for %s" msgstr "" -#: src/cp.c:477 +#: src/cp.c:475 #, c-format msgid "cannot make directory %s" msgstr "" -#: src/cp.c:526 src/cp.c:545 +#: src/cp.c:524 src/cp.c:543 #, c-format msgid "%s exists but is not a directory" msgstr "" -#: src/cp.c:572 src/cp.c:1068 src/install.c:401 src/install.c:844 src/ln.c:123 -#: src/ln.c:181 src/ln.c:202 src/ln.c:516 src/mv.c:152 src/mv.c:399 -#, c-format -msgid "accessing %s" -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 +#, fuzzy, c-format +msgid "failed to access %s" +msgstr "\"%s\" ашу сәтсіз аяқталды " -#: src/cp.c:592 src/install.c:914 src/ln.c:546 src/mv.c:432 src/shred.c:1182 -#: src/touch.c:433 src/truncate.c:356 +#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181 +#: src/touch.c:429 src/truncate.c:354 #, c-format msgid "missing file operand" msgstr "" -#: src/cp.c:594 src/install.c:916 src/ln.c:560 src/mv.c:434 +#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436 #, c-format msgid "missing destination file operand after %s" msgstr "" -#: src/cp.c:603 src/install.c:925 src/mv.c:443 +#: src/cp.c:601 src/install.c:926 src/mv.c:445 #, c-format msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)" msgstr "" -#: src/cp.c:619 src/cp.c:1070 src/install.c:403 src/install.c:846 -#: src/install.c:938 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:401 -#: src/mv.c:457 +#: 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 msgid "target %s is not a directory" msgstr "%s мақсаты бума емес\n" -#: src/cp.c:730 +#: src/cp.c:728 #, c-format msgid "with --parents, the destination must be a directory" msgstr "" -#: src/cp.c:1063 src/install.c:839 src/ln.c:511 src/mv.c:394 +#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395 #, c-format msgid "multiple target directories specified" msgstr "" -#: src/cp.c:1108 +#: src/cp.c:1110 #, c-format msgid "cannot make both hard and symbolic links" msgstr "" -#: src/cp.c:1115 src/mv.c:464 +#: src/cp.c:1117 src/mv.c:466 #, c-format msgid "options --backup and --no-clobber are mutually exclusive" msgstr "" -#: src/cp.c:1121 +#: src/cp.c:1123 #, c-format msgid "--reflink can be used only with --sparse=auto" msgstr "" -#: src/cp.c:1129 src/install.c:899 src/ln.c:582 src/mv.c:472 +#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474 msgid "backup type" msgstr "" -#: src/cp.c:1154 +#: src/cp.c:1156 #, c-format msgid "cannot preserve security context without an SELinux-enabled kernel" msgstr "" -#: src/cp.c:1160 +#: src/cp.c:1162 #, c-format msgid "cannot preserve extended attributes, cp is built without xattr support" msgstr "" @@ -2152,134 +2142,133 @@ msgstr "" msgid "Stuart Kemp" msgstr "" -#: src/csplit.c:529 +#: src/csplit.c:531 #, c-format msgid "input disappeared" msgstr "" -#: src/csplit.c:658 src/csplit.c:669 +#: src/csplit.c:660 src/csplit.c:671 #, c-format msgid "%s: line number out of range" msgstr "" -#: src/csplit.c:698 +#: src/csplit.c:700 #, c-format msgid "%s: %s: line number out of range" msgstr "" -#: src/csplit.c:701 src/csplit.c:750 +#: src/csplit.c:703 src/csplit.c:752 #, c-format msgid " on repetition %s\n" msgstr "" -#: src/csplit.c:744 +#: src/csplit.c:746 #, c-format msgid "%s: %s: match not found" msgstr "" -#: src/csplit.c:808 src/csplit.c:848 src/nl.c:359 src/tac.c:274 +#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273 #, c-format msgid "error in regular expression search" msgstr "" -#: src/csplit.c:981 +#: src/csplit.c:983 #, c-format msgid "write error for %s" msgstr "" -#: src/csplit.c:1057 +#: src/csplit.c:1059 #, c-format msgid "%s: integer expected after delimiter" msgstr "" -#: src/csplit.c:1073 +#: src/csplit.c:1075 #, c-format msgid "%s: '}' is required in repeat count" msgstr "" -#: src/csplit.c:1083 +#: src/csplit.c:1085 #, c-format msgid "%s}: integer required between '{' and '}'" msgstr "" -#: src/csplit.c:1110 +#: src/csplit.c:1112 #, c-format msgid "%s: closing delimiter '%c' missing" msgstr "" -#: src/csplit.c:1127 +#: src/csplit.c:1129 #, c-format msgid "%s: invalid regular expression: %s" msgstr "" -#: src/csplit.c:1160 +#: src/csplit.c:1162 #, c-format msgid "%s: invalid pattern" msgstr "" -#: src/csplit.c:1163 +#: src/csplit.c:1165 #, c-format msgid "%s: line number must be greater than zero" msgstr "" -#: src/csplit.c:1169 +#: src/csplit.c:1171 #, c-format msgid "line number %s is smaller than preceding line number, %s" msgstr "" -#: src/csplit.c:1175 +#: src/csplit.c:1177 #, c-format msgid "warning: line number %s is the same as preceding line number" msgstr "" -#: src/csplit.c:1253 +#: src/csplit.c:1255 #, c-format msgid "missing conversion specifier in suffix" msgstr "" -#: src/csplit.c:1259 +#: src/csplit.c:1261 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "" -#: src/csplit.c:1262 +#: src/csplit.c:1264 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "" -#: src/csplit.c:1267 +#: src/csplit.c:1269 #, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "" -#: src/csplit.c:1284 +#: src/csplit.c:1286 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "" -#: src/csplit.c:1298 +#: src/csplit.c:1300 #, c-format msgid "missing %% conversion specification in suffix" msgstr "" -#: src/csplit.c:1345 +#: src/csplit.c:1347 #, c-format msgid "%s: invalid number" msgstr "" -#: src/csplit.c:1449 +#: src/csplit.c:1451 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "" -#: src/csplit.c:1453 +#: src/csplit.c:1455 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" -"\n" msgstr "" -#: src/csplit.c:1461 +#: src/csplit.c:1462 #, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2287,20 +2276,20 @@ msgid "" " -k, --keep-files do not remove output files on errors\n" msgstr "" -#: src/csplit.c:1466 +#: src/csplit.c:1467 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:1473 +#: src/csplit.c:1474 msgid "" "\n" "Read standard input if FILE is -. Each PATTERN may be:\n" msgstr "" -#: src/csplit.c:1477 +#: src/csplit.c:1478 msgid "" "\n" " INTEGER copy up to but not including specified line number\n" @@ -2317,7 +2306,7 @@ msgstr "" msgid "David M. Ihnat" msgstr "" -#: src/cut.c:64 +#: src/cut.c:64 src/cut.c:372 msgid "fields and positions are numbered from 1" msgstr "" @@ -2327,19 +2316,17 @@ msgid "Usage: %s OPTION... [FILE]...\n" msgstr "" #: src/cut.c:193 -msgid "" -"Print selected parts of lines from each FILE to standard output.\n" -"\n" +msgid "Print selected parts of lines from each FILE to standard output.\n" msgstr "" -#: src/cut.c:200 +#: src/cut.c:199 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:205 +#: src/cut.c:204 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2347,20 +2334,20 @@ msgid "" " -n (ignored)\n" msgstr "" -#: src/cut.c:211 +#: src/cut.c:210 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" msgstr "" -#: src/cut.c:215 +#: src/cut.c:214 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:222 +#: src/cut.c:221 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2368,7 +2355,7 @@ msgid "" "in the same order that it is read, and is written exactly once.\n" msgstr "" -#: src/cut.c:228 +#: src/cut.c:227 msgid "" "Each range is one of:\n" "\n" @@ -2380,55 +2367,56 @@ msgid "" "With no FILE, or when FILE is -, read standard input.\n" msgstr "" -#: src/cut.c:368 src/cut.c:489 -msgid "invalid byte or field list" +#: src/cut.c:367 src/cut.c:493 +msgid "invalid byte, character or field list" msgstr "" -#: src/cut.c:385 +#: src/cut.c:387 msgid "invalid range with no endpoint: -" msgstr "" -#: src/cut.c:399 +#: src/cut.c:403 msgid "invalid decreasing range" msgstr "" -#: src/cut.c:478 +#: src/cut.c:482 #, c-format msgid "byte offset %s is too large" msgstr "" -#: src/cut.c:481 +#: src/cut.c:485 #, c-format msgid "field number %s is too large" msgstr "" -#: src/cut.c:789 src/cut.c:797 +#: src/cut.c:795 src/cut.c:803 msgid "only one type of list may be specified" msgstr "" -#: src/cut.c:806 +#: src/cut.c:812 src/numfmt.c:1408 +#, c-format msgid "the delimiter must be a single character" msgstr "" -#: src/cut.c:841 +#: src/cut.c:847 msgid "you must specify a list of bytes, characters, or fields" msgstr "" -#: src/cut.c:844 +#: src/cut.c:850 msgid "an input delimiter may be specified only when operating on fields" msgstr "" -#: src/cut.c:848 +#: src/cut.c:854 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" msgstr "" -#: src/cut.c:864 +#: src/cut.c:870 msgid "missing list of fields" msgstr "" -#: src/cut.c:866 +#: src/cut.c:872 msgid "missing list of positions" msgstr "" @@ -2440,9 +2428,11 @@ msgid "" msgstr "" #: src/date.c:128 +msgid "Display the current time in the given FORMAT, or set the system date.\n" +msgstr "" + +#: src/date.c:134 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" " -I[TIMESPEC], --iso-8601[=TIMESPEC] output date/time in ISO 8601 format.\n" @@ -2451,14 +2441,14 @@ msgid "" " and time to the indicated precision.\n" msgstr "" -#: src/date.c:138 +#: src/date.c:142 msgid "" " -r, --reference=FILE display the last modification time of FILE\n" " -R, --rfc-2822 output date and time in RFC 2822 format.\n" " Example: Mon, 07 Aug 2006 12:34:56 -0600\n" msgstr "" -#: src/date.c:143 +#: src/date.c:147 msgid "" " --rfc-3339=TIMESPEC output date and time in RFC 3339 format.\n" " TIMESPEC='date', 'seconds', or 'ns' for\n" @@ -2469,7 +2459,7 @@ msgid "" " -u, --utc, --universal print or set Coordinated Universal Time\n" msgstr "" -#: src/date.c:154 +#: src/date.c:158 msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" @@ -2478,7 +2468,7 @@ msgid "" " %a locale's abbreviated weekday name (e.g., Sun)\n" msgstr "" -#: src/date.c:161 +#: src/date.c:165 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2486,7 +2476,7 @@ msgid "" " %c locale's date and time (e.g., Thu Mar 3 23:05:25 2005)\n" msgstr "" -#: src/date.c:167 +#: src/date.c:171 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2494,14 +2484,14 @@ msgid "" " %e day of month, space padded; same as %_d\n" msgstr "" -#: src/date.c:173 +#: src/date.c:177 msgid "" " %F full date; same as %Y-%m-%d\n" " %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 "" -#: src/date.c:178 +#: src/date.c:182 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2509,7 +2499,7 @@ msgid "" " %j day of year (001..366)\n" msgstr "" -#: src/date.c:184 +#: src/date.c:188 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -2517,7 +2507,7 @@ msgid "" " %M minute (00..59)\n" msgstr "" -#: src/date.c:190 +#: src/date.c:194 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2528,7 +2518,7 @@ msgid "" " %s seconds since 1970-01-01 00:00:00 UTC\n" msgstr "" -#: src/date.c:199 +#: src/date.c:203 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2536,7 +2526,7 @@ msgid "" " %u day of week (1..7); 1 is Monday\n" msgstr "" -#: src/date.c:205 +#: src/date.c:209 msgid "" " %U week number of year, with Sunday as first day of week (00..53)\n" " %V ISO week number, with Monday as first day of week (01..53)\n" @@ -2544,7 +2534,7 @@ msgid "" " %W week number of year, with Monday as first day of week (00..53)\n" msgstr "" -#: src/date.c:211 +#: src/date.c:215 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -2552,7 +2542,7 @@ msgid "" " %Y year\n" msgstr "" -#: src/date.c:217 +#: src/date.c:221 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -2564,7 +2554,7 @@ msgid "" "By default, date pads numeric fields with zeroes.\n" msgstr "" -#: src/date.c:226 +#: src/date.c:230 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -2575,7 +2565,7 @@ msgid "" " # use opposite case if possible\n" msgstr "" -#: src/date.c:235 +#: src/date.c:239 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -2584,7 +2574,7 @@ msgid "" "O to use the locale's alternate numeric symbols if available.\n" msgstr "" -#: src/date.c:242 +#: src/date.c:246 msgid "" "\n" "Examples:\n" @@ -2598,35 +2588,35 @@ msgid "" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:275 src/dd.c:2193 src/head.c:838 src/md5sum.c:477 -#: src/md5sum.c:798 src/od.c:863 src/od.c:1914 src/pr.c:1176 src/pr.c:1372 -#: src/pr.c:1494 src/stty.c:842 src/tac.c:563 src/tail.c:343 src/tee.c:126 +#: 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 #, c-format msgid "standard input" msgstr "" -#: src/date.c:303 src/date.c:523 +#: src/date.c:307 src/date.c:527 #, fuzzy, c-format msgid "invalid date %s" msgstr "%s: '%s' күні қате\n" -#: src/date.c:414 src/date.c:448 +#: src/date.c:418 src/date.c:452 #, c-format msgid "multiple output formats specified" msgstr "" -#: src/date.c:426 +#: src/date.c:430 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "" -#: src/date.c:433 +#: src/date.c:437 #, c-format msgid "the options to print and set the time may not be used together" msgstr "" -#: src/date.c:454 +#: src/date.c:458 #, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -2634,30 +2624,30 @@ msgid "" "argument must be a format string beginning with '+'" msgstr "" -#: src/date.c:531 +#: src/date.c:535 #, c-format msgid "cannot set date" msgstr "" -#: src/date.c:554 src/du.c:360 +#: src/date.c:558 src/du.c:371 #, c-format msgid "time %s is out of range" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/dd.c:44 src/factor.c:43 src/rm.c:41 src/tail.c:69 src/touch.c:41 +#: 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 "" -#: src/dd.c:517 +#: src/dd.c:521 #, c-format msgid "" "Usage: %s [OPERAND]...\n" " or: %s OPTION\n" msgstr "" -#: src/dd.c:522 +#: src/dd.c:526 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -2668,7 +2658,7 @@ msgid "" " ibs=BYTES read up to BYTES bytes at a time (default: 512)\n" msgstr "" -#: src/dd.c:531 +#: src/dd.c:535 msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -2677,13 +2667,14 @@ msgid "" " oflag=FLAGS write as per the comma separated symbol list\n" " seek=N skip N obs-sized blocks at start of output\n" " skip=N skip N ibs-sized blocks at start of input\n" -" status=noxfer suppress transfer statistics\n" +" status=WHICH WHICH info to suppress outputting to stderr;\n" +" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" msgstr "" -#: src/dd.c:541 +#: src/dd.c:546 msgid "" "\n" -"BLOCKS and BYTES may be followed by the following multiplicative suffixes:\n" +"N and BYTES may be followed by the following multiplicative suffixes:\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, and so on for T, P, E, Z, Y.\n" "\n" @@ -2691,7 +2682,7 @@ msgid "" "\n" msgstr "" -#: src/dd.c:550 +#: src/dd.c:555 msgid "" " ascii from EBCDIC to ASCII\n" " ebcdic from ASCII to EBCDIC\n" @@ -2706,7 +2697,7 @@ msgid "" " with block or unblock, pad with spaces rather than NULs\n" msgstr "" -#: src/dd.c:563 +#: src/dd.c:568 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -2716,7 +2707,7 @@ msgid "" " fsync likewise, but also write metadata\n" msgstr "" -#: src/dd.c:571 +#: src/dd.c:576 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -2725,75 +2716,75 @@ msgid "" "suggested)\n" msgstr "" -#: src/dd.c:578 +#: src/dd.c:583 msgid " cio use concurrent I/O for data\n" msgstr "" -#: src/dd.c:580 +#: src/dd.c:585 msgid " direct use direct I/O for data\n" msgstr "" -#: src/dd.c:582 +#: src/dd.c:587 msgid " directory fail unless a directory\n" msgstr "" -#: src/dd.c:584 +#: src/dd.c:589 msgid " dsync use synchronized I/O for data\n" msgstr "" -#: src/dd.c:586 +#: src/dd.c:591 msgid " sync likewise, but also for metadata\n" msgstr "" -#: src/dd.c:587 +#: src/dd.c:592 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr "" -#: src/dd.c:590 +#: src/dd.c:595 msgid " nonblock use non-blocking I/O\n" msgstr "" -#: src/dd.c:592 +#: src/dd.c:597 msgid " noatime do not update access time\n" msgstr "" -#: src/dd.c:595 +#: src/dd.c:600 msgid " nocache discard cached data\n" msgstr "" -#: src/dd.c:598 +#: src/dd.c:603 msgid " noctty do not assign controlling terminal from file\n" msgstr "" -#: src/dd.c:601 +#: src/dd.c:606 msgid " nofollow do not follow symlinks\n" msgstr "" -#: src/dd.c:603 +#: src/dd.c:608 msgid " nolinks fail if multiply-linked\n" msgstr "" -#: src/dd.c:605 +#: src/dd.c:610 msgid " binary use binary I/O for data\n" msgstr "" -#: src/dd.c:607 +#: src/dd.c:612 msgid " text use text I/O for data\n" msgstr "" -#: src/dd.c:609 +#: src/dd.c:614 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:612 +#: src/dd.c:617 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:615 +#: src/dd.c:620 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:620 +#: src/dd.c:625 #, c-format msgid "" "\n" @@ -2810,28 +2801,28 @@ msgid "" "\n" msgstr "" -#: src/dd.c:676 +#: src/dd.c:683 #, c-format msgid "" "%<PRIuMAX>+%<PRIuMAX> records in\n" "%<PRIuMAX>+%<PRIuMAX> records out\n" msgstr "" -#: src/dd.c:682 +#: src/dd.c:689 #, c-format msgid "%<PRIuMAX> truncated record\n" msgid_plural "%<PRIuMAX> truncated records\n" msgstr[0] "" msgstr[1] "" -#: src/dd.c:694 +#: src/dd.c:701 #, c-format msgid "%<PRIuMAX> byte (%s) copied" msgid_plural "%<PRIuMAX> bytes (%s) copied" msgstr[0] "" msgstr[1] "" -#: src/dd.c:712 +#: src/dd.c:720 msgid "Infinity B" msgstr "" @@ -2845,236 +2836,257 @@ 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:725 +#: src/dd.c:733 #, c-format msgid ", %g s, %s/s\n" msgstr "" -#: src/dd.c:804 +#: src/dd.c:812 #, c-format msgid "closing input file %s" msgstr "" -#: src/dd.c:811 +#: src/dd.c:819 #, c-format msgid "closing output file %s" msgstr "" -#: src/dd.c:1014 +#: src/dd.c:1022 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "" -#: src/dd.c:1085 src/dd.c:1934 +#: src/dd.c:1093 src/dd.c:1942 #, c-format msgid "writing to %s" msgstr "" -#: src/dd.c:1199 src/dd.c:1253 +#: src/dd.c:1207 src/dd.c:1261 #, c-format msgid "unrecognized operand %s" msgstr "" -#: src/dd.c:1210 +#: src/dd.c:1218 msgid "invalid conversion" msgstr "" -#: src/dd.c:1213 src/dd.c:1289 +#: src/dd.c:1221 src/dd.c:1297 msgid "invalid input flag" msgstr "" -#: src/dd.c:1216 src/dd.c:1283 src/dd.c:1295 +#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303 msgid "invalid output flag" msgstr "" -#: src/dd.c:1219 +#: src/dd.c:1227 msgid "invalid status flag" msgstr "" -#: src/dd.c:1258 src/truncate.c:312 +#: src/dd.c:1266 src/truncate.c:310 #, c-format msgid "invalid number %s" msgstr "" -#: src/dd.c:1340 +#: src/dd.c:1348 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "" -#: src/dd.c:1342 +#: src/dd.c:1350 #, c-format msgid "cannot combine block and unblock" msgstr "" -#: src/dd.c:1344 +#: src/dd.c:1352 #, c-format msgid "cannot combine lcase and ucase" msgstr "" -#: src/dd.c:1346 +#: src/dd.c:1354 #, c-format msgid "cannot combine excl and nocreat" msgstr "" -#: src/dd.c:1349 +#: src/dd.c:1357 #, c-format msgid "cannot combine direct and nocache" msgstr "" -#: src/dd.c:1506 +#: src/dd.c:1514 #, 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:1593 +#: src/dd.c:1601 #, c-format msgid "%s: cannot skip" msgstr "" -#: src/dd.c:1595 src/dd.c:1614 src/dd.c:1675 +#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683 #, c-format msgid "%s: cannot seek" msgstr "" -#: src/dd.c:1655 +#: src/dd.c:1663 #, c-format msgid "offset overflow while reading file %s" msgstr "" -#: src/dd.c:1667 +#: src/dd.c:1675 #, c-format msgid "warning: invalid file offset after failed read" msgstr "" -#: src/dd.c:1671 +#: src/dd.c:1679 #, c-format msgid "cannot work around kernel bug after all" msgstr "" -#: src/dd.c:1814 +#: src/dd.c:1822 #, c-format msgid "setting flags for %s" msgstr "" -#: src/dd.c:1867 +#: src/dd.c:1875 #, c-format msgid "memory exhausted by input buffer of size %zu bytes (%s)" msgstr "" -#: src/dd.c:1881 +#: src/dd.c:1889 #, c-format msgid "memory exhausted by output buffer of size %zu bytes (%s)" msgstr "" -#: src/dd.c:1914 +#: src/dd.c:1922 #, c-format msgid "%s: cannot skip to specified offset" msgstr "" -#: src/dd.c:2125 src/dd.c:2258 +#: src/dd.c:2133 #, c-format -msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" +msgid "failed to truncate to %<PRIdMAX> bytes in output file %s" msgstr "" -#: src/dd.c:2138 +#: src/dd.c:2146 #, c-format msgid "fdatasync failed for %s" msgstr "" -#: src/dd.c:2148 +#: src/dd.c:2156 #, c-format msgid "fsync failed for %s" msgstr "" -#: src/dd.c:2199 src/dd.c:2228 +#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165 #, fuzzy, c-format -msgid "opening %s" -msgstr "%s ашу" +msgid "failed to open %s" +msgstr "\"%s\" ашу сәтсіз аяқталды " -#: src/dd.c:2237 +#: src/dd.c:2246 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) " "blocks" msgstr "" -#: src/dd.c:2274 src/dd.c:2280 +#: src/dd.c:2267 +#, c-format +msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" +msgstr "" + +#: src/dd.c:2283 src/dd.c:2289 #, 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:54 src/expr.c:153 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:39 src/sleep.c:35 src/sort.c:66 +#: 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 msgid "Paul Eggert" msgstr "" -#: src/df.c:140 +#: src/df.c:172 msgid "Filesystem" msgstr "Файлдық жүйе" -#: src/df.c:141 +#: src/df.c:175 msgid "Type" msgstr "Түрі" -#: src/df.c:142 +#: src/df.c:178 src/df.c:542 msgid "blocks" msgstr "блок" -#: src/df.c:142 -msgid "Inodes" -msgstr "" - -#: src/df.c:142 -msgid "Size" -msgstr "Өлшемі" - -#: src/df.c:143 +#: src/df.c:181 msgid "Used" msgstr "Қолд" -#: src/df.c:143 -msgid "IUsed" -msgstr "" - -#: src/df.c:144 +#: src/df.c:184 msgid "Available" msgstr "Қолжетерлік" -#: src/df.c:144 -msgid "IFree" +#: src/df.c:187 +msgid "Use%" +msgstr "Пайд%" + +#: src/df.c:190 +msgid "Inodes" msgstr "" -#: src/df.c:144 -msgid "Avail" -msgstr "Қолж" +#: src/df.c:193 +msgid "IUsed" +msgstr "" -#: src/df.c:145 -msgid "Use%" -msgstr "Пайд%" +#: src/df.c:196 +msgid "IFree" +msgstr "" -#: src/df.c:145 +#: src/df.c:199 msgid "IUse%" msgstr "" -#: src/df.c:145 +#: src/df.c:202 +msgid "Mounted on" +msgstr "Тіркелген жері" + +#: src/df.c:383 +#, c-format +msgid "option --output: field '%s' unknown" +msgstr "" + +#: src/df.c:390 +#, c-format +msgid "option --output: field '%s' used more than once" +msgstr "" + +#: src/df.c:410 src/df.c:449 +msgid "Size" +msgstr "Өлшемі" + +#: src/df.c:414 src/df.c:451 +msgid "Avail" +msgstr "Қолж" + +#: src/df.c:474 msgid "Capacity" msgstr "Сыйымдылығы" -#: src/df.c:146 -msgid "Mounted on" -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 +#, c-format +msgid "%s-%s" +msgstr "" -#: src/df.c:847 +#: src/df.c:1210 msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" -"\n" msgstr "" -#: src/df.c:855 +#: src/df.c:1217 msgid "" " -a, --all include dummy file systems\n" " -B, --block-size=SIZE scale sizes by SIZE before printing them. E.g.,\n" @@ -3086,7 +3098,7 @@ msgid "" " -H, --si likewise, but use powers of 1000 not 1024\n" msgstr "" -#: src/df.c:865 +#: src/df.c:1227 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3095,8 +3107,11 @@ msgid "" "(default)\n" msgstr "" -#: src/df.c:872 +#: src/df.c:1234 msgid "" +" --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" +" or print all fields if FIELD_LIST is " +"omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" " -t, --type=TYPE limit listing to file systems of type TYPE\n" @@ -3105,20 +3120,42 @@ msgid "" " -v (ignored)\n" msgstr "" -#: src/df.c:1027 +#: src/df.c:1248 +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" +msgstr "" + +#: src/df.c:1285 +#, 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 #, c-format msgid "file system type %s both selected and excluded" msgstr "" -#: src/df.c:1075 +#: src/df.c:1500 msgid "Warning: " msgstr "Ескерту:" -#: src/df.c:1077 src/stat.c:795 +#: src/df.c:1502 src/stat.c:814 msgid "cannot read table of mounted file systems" msgstr "" -#: src/df.c:1107 +#: src/df.c:1539 #, c-format msgid "no file systems processed" msgstr "" @@ -3208,21 +3245,21 @@ msgid "" " %s stdio.h -> \".\"\n" msgstr "" -#: src/du.c:260 src/sort.c:390 src/wc.c:112 +#: src/du.c:270 src/sort.c:394 src/wc.c:112 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" " or: %s [OPTION]... --files0-from=F\n" msgstr "" -#: src/du.c:264 -msgid "" -"Summarize disk usage of each FILE, recursively for directories.\n" -"\n" +#: src/du.c:274 +msgid "Summarize disk usage of each FILE, recursively for directories.\n" msgstr "" -#: src/du.c:271 +#: src/du.c:280 msgid "" +" -0, --null end each output line with 0 byte rather than " +"newline\n" " -a, --all write counts for all files, not just directories\n" " --apparent-size print apparent sizes, rather than disk usage; " "although\n" @@ -3231,7 +3268,7 @@ msgid "" " fragmentation, indirect blocks, and the like\n" msgstr "" -#: src/du.c:279 +#: src/du.c:289 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" @@ -3240,9 +3277,14 @@ msgid "" " -c, --total produce a grand total\n" " -D, --dereference-args dereference only symlinks that are listed on the\n" " command line\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 "" -#: src/du.c:288 +#: src/du.c:302 msgid "" " --files0-from=F summarize disk usage of the NUL-terminated file\n" " names specified in file F;\n" @@ -3250,41 +3292,29 @@ msgid "" " -H equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" --si like -h, but use powers of 1000 not 1024\n" msgstr "" -#: src/du.c:297 +#: src/du.c:310 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 "" -#: src/du.c:302 +#: src/du.c:316 msgid "" -" -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " "default)\n" -" -0, --null end each output line with 0 byte rather than " -"newline\n" " -S, --separate-dirs 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:309 -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 "" - -#: src/du.c:318 +#: src/du.c:322 msgid "" +" -t, --threshold=SIZE exclude entries smaller than SIZE if positive,\n" +" or entries greater than SIZE if negative\n" " --time show time of the last modification of any file in " "the\n" " directory, or any of its subdirectories\n" @@ -3295,63 +3325,72 @@ msgid "" " FORMAT is interpreted like 'date'\n" msgstr "" -#: src/du.c:375 +#: src/du.c:333 +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 msgid "Infinity" msgstr "" -#: src/du.c:600 +#: src/du.c:507 +#, c-format +msgid "mount point %s already traversed" +msgstr "" + +#: src/du.c:624 #, c-format msgid "fts_read failed: %s" msgstr "" -#: src/du.c:724 +#: src/du.c:780 #, c-format msgid "invalid maximum depth %s" msgstr "" -#: src/du.c:817 +#: src/du.c:809 +#, c-format +msgid "invalid --threshold argument '-0'" +msgstr "" + +#: src/du.c:887 #, c-format msgid "cannot both summarize and show all entries" msgstr "" -#: src/du.c:824 +#: src/du.c:894 #, c-format msgid "warning: summarizing is the same as using --max-depth=0" msgstr "" -#: src/du.c:830 +#: src/du.c:900 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "" -#: src/du.c:896 src/sort.c:4479 src/wc.c:668 +#: src/du.c:966 src/sort.c:4533 src/wc.c:668 msgid "file operands cannot be combined with --files0-from" msgstr "" -#: src/du.c:949 src/md5sum.c:587 src/od.c:903 src/tac.c:239 src/tac.c:350 -#: src/tac.c:506 src/tac.c:586 src/wc.c:733 +#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 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:963 src/sort.c:4508 src/wc.c:747 +#: src/du.c:1040 src/sort.c:4562 src/wc.c:747 #, c-format msgid "when reading file names from stdin, no file name of %s allowed" msgstr "" -#: src/du.c:980 src/du.c:988 src/wc.c:760 src/wc.c:768 +#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768 msgid "invalid zero-length file name" msgstr "" -#: src/du.c:1007 src/head.c:149 src/head.c:262 src/head.c:334 src/head.c:538 -#: src/head.c:620 src/head.c:692 src/head.c:750 src/head.c:774 src/tail.c:412 -#: src/tail.c:500 src/tail.c:549 src/tail.c:642 src/tail.c:770 src/tail.c:818 -#: src/tail.c:855 src/tail.c:1782 src/tail.c:1812 src/uniq.c:395 -#, fuzzy, c-format -msgid "error reading %s" -msgstr "%s: %s: оқу қатесі: %s\n" - -#: src/du.c:1010 src/ls.c:2649 src/wc.c:791 +#: src/du.c:1088 src/ls.c:2649 src/wc.c:791 #, fuzzy msgid "total" msgstr "Жалпы" @@ -3430,31 +3469,33 @@ msgid "Usage: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n" msgstr "" #: src/env.c:55 +msgid "Set each NAME to VALUE in the environment and run COMMAND.\n" +msgstr "" + +#: src/env.c:61 msgid "" -"Set each NAME to VALUE in the environment and run COMMAND.\n" -"\n" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with 0 byte rather than newline\n" " -u, --unset=NAME remove variable from the environment\n" msgstr "" -#: src/env.c:64 +#: src/env.c:68 msgid "" "\n" "A mere - implies -i. If no COMMAND, print the resulting environment.\n" msgstr "" -#: src/env.c:120 +#: src/env.c:124 #, c-format msgid "cannot unset %s" msgstr "" -#: src/env.c:131 +#: src/env.c:135 #, c-format msgid "cannot set %s" msgstr "" -#: src/env.c:148 +#: src/env.c:152 #, c-format msgid "cannot specify --null (-0) with command" msgstr "" @@ -3463,41 +3504,40 @@ msgstr "" msgid "" "Convert tabs in each FILE to spaces, writing to standard output.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" -#: src/expand.c:115 +#: src/expand.c:114 msgid "" " -i, --initial do not convert tabs after non blanks\n" " -t, --tabs=NUMBER have tabs NUMBER characters apart, not 8\n" msgstr "" -#: src/expand.c:119 +#: src/expand.c:118 msgid "" " -t, --tabs=LIST use comma separated list of explicit tab positions\n" msgstr "" -#: src/expand.c:172 src/unexpand.c:191 +#: src/expand.c:171 src/unexpand.c:190 #, c-format msgid "tab stop is too large %s" msgstr "" -#: src/expand.c:180 src/unexpand.c:199 +#: src/expand.c:179 src/unexpand.c:198 #, c-format msgid "tab size contains invalid character(s): %s" msgstr "" -#: src/expand.c:206 src/unexpand.c:225 +#: src/expand.c:205 src/unexpand.c:224 #, c-format msgid "tab size cannot be 0" msgstr "" -#: src/expand.c:208 src/unexpand.c:227 +#: src/expand.c:207 src/unexpand.c:226 #, c-format msgid "tab sizes must be ascending" msgstr "" -#: src/expand.c:326 src/expand.c:345 src/unexpand.c:374 src/unexpand.c:419 +#: 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 "" @@ -3609,12 +3649,12 @@ msgstr "" msgid "non-integer argument" msgstr "" -#: src/expr.c:793 src/truncate.c:316 +#: src/expr.c:793 src/truncate.c:314 #, c-format msgid "division by zero" msgstr "" -#: src/expr.c:887 src/sort.c:2029 +#: src/expr.c:887 src/sort.c:2044 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "" @@ -3624,32 +3664,39 @@ msgstr "" msgid "the strings compared were %s and %s" msgstr "" -#: src/factor.c:449 -msgid "using arbitrary-precision arithmetic" +#. This is a proper name. See the gettext manual, section Names. +#: src/factor.c:111 +msgid "Niels Moller" msgstr "" -#: src/factor.c:460 -msgid "using single-precision arithmetic" +#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459 +#, c-format +msgid "Lucas prime test failure. This should not happen" msgstr "" -#: src/factor.c:465 src/od.c:1640 src/od.c:1709 +#: src/factor.c:2092 #, c-format -msgid "%s is too large" +msgid "squfof queue overflow" msgstr "" -#: src/factor.c:469 +#: src/factor.c:2419 #, c-format msgid "%s is not a valid positive integer" msgstr "" -#: src/factor.c:494 +#: src/factor.c:2442 src/od.c:1646 src/od.c:1715 +#, c-format +msgid "%s is too large" +msgstr "" + +#: src/factor.c:2454 #, c-format msgid "" "Usage: %s [NUMBER]...\n" " or: %s OPTION\n" msgstr "" -#: src/factor.c:499 +#: src/factor.c:2459 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" @@ -3673,20 +3720,19 @@ msgid "cannot stat current directory (now %s)" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/fmt.c:37 +#: src/fmt.c:38 msgid "Ross Paterson" msgstr "" -#: src/fmt.c:269 +#: src/fmt.c:270 #, c-format msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n" msgstr "" -#: src/fmt.c:270 +#: 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" -"\n" msgstr "" #: src/fmt.c:278 @@ -3697,8 +3743,8 @@ msgid "" " -s, --split-only split long lines, but do not refill\n" msgstr "" -#: src/fmt.c:285 -#, c-format +#: src/fmt.c:287 +#, 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" @@ -3706,14 +3752,14 @@ msgid "" " -g, --goal=WIDTH goal width (default of 93% of width)\n" msgstr "" -#: src/fmt.c:357 +#: src/fmt.c:359 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" "option; use -w N instead" msgstr "" -#: src/fmt.c:403 src/fmt.c:414 +#: src/fmt.c:405 src/fmt.c:416 #, c-format msgid "invalid width: %s" msgstr "" @@ -3722,23 +3768,22 @@ msgstr "" msgid "" "Wrap input lines in each FILE (standard input by default), writing to\n" "standard output.\n" -"\n" msgstr "" -#: src/fold.c:78 +#: src/fold.c:77 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" " -w, --width=WIDTH use WIDTH columns instead of 80\n" msgstr "" -#: src/fold.c:289 src/pr.c:836 +#: src/fold.c:288 src/pr.c:832 #, c-format 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:75 +#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 #: src/truncate.c:37 msgid "Padraig Brady" msgstr "" @@ -3754,17 +3799,17 @@ msgid "" "\n" msgstr "" -#: src/group-list.c:69 src/id.c:345 src/setuidgid.c:184 +#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184 #, c-format msgid "failed to get groups for user %s" msgstr "" -#: src/group-list.c:74 src/id.c:350 +#: src/group-list.c:74 src/id.c:370 #, c-format msgid "failed to get groups for the current process" msgstr "" -#: src/group-list.c:104 +#: src/group-list.c:114 #, c-format msgid "cannot find name for group ID %lu" msgstr "" @@ -3806,10 +3851,9 @@ 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" -"\n" msgstr "" -#: src/head.c:118 +#: src/head.c:117 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -3819,13 +3863,13 @@ msgid "" " K lines of each file\n" msgstr "" -#: src/head.c:126 +#: 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 "" -#: src/head.c:132 +#: src/head.c:131 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -3833,58 +3877,58 @@ msgid "" "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n" msgstr "" -#: src/head.c:152 -#, fuzzy, c-format -msgid "error writing %s" -msgstr "\"%s\" жазу қатесі: %s" - -#: src/head.c:155 +#: src/head.c:154 #, c-format msgid "%s: file has shrunk too much" msgstr "" -#: src/head.c:228 src/head.c:1044 +#: src/head.c:227 src/head.c:1051 #, c-format msgid "%s: number of bytes is too large" msgstr "" -#: src/head.c:441 +#: src/head.c:440 #, c-format msgid "%s: cannot lseek back to original position" msgstr "" -#: src/head.c:613 src/head.c:684 src/tail.c:450 +#: src/head.c:612 src/head.c:691 src/tail.c:449 #, c-format msgid "%s: cannot seek to offset %s" msgstr "" -#: src/head.c:791 +#: src/head.c:673 +#, fuzzy, c-format +msgid "%s: failed to reset file pointer" +msgstr "%s: %s өшіру сәтсіз аяқталды\n" + +#: src/head.c:798 #, c-format msgid "cannot reposition file pointer for %s" msgstr "" -#: src/head.c:878 +#: src/head.c:885 #, c-format msgid "%s: %s is so large that it is not representable" msgstr "" -#: src/head.c:879 +#: src/head.c:886 msgid "number of lines" msgstr "" -#: src/head.c:879 +#: src/head.c:886 msgid "number of bytes" msgstr "" -#: src/head.c:886 src/tail.c:1947 +#: src/head.c:893 src/tail.c:1947 msgid "invalid number of lines" msgstr "" -#: src/head.c:887 src/tail.c:1948 +#: src/head.c:894 src/tail.c:1948 msgid "invalid number of bytes" msgstr "" -#: src/head.c:974 src/head.c:1032 +#: src/head.c:981 src/head.c:1039 #, c-format msgid "invalid trailing option -- %c" msgstr "" @@ -3981,87 +4025,87 @@ msgstr "" msgid "cannot get effective UID" msgstr "" -#: src/id.c:289 +#: src/id.c:311 #, c-format -msgid "cannot find name for user ID %lu" +msgid "cannot find name for user ID %s" msgstr "" -#: src/id.c:309 +#: src/id.c:329 #, c-format -msgid "uid=%lu" +msgid "uid=%s" msgstr "" -#: src/id.c:314 +#: src/id.c:334 #, c-format -msgid " gid=%lu" +msgid " gid=%s" msgstr "" -#: src/id.c:321 +#: src/id.c:341 #, c-format -msgid " euid=%lu" +msgid " euid=%s" msgstr "" -#: src/id.c:329 +#: src/id.c:349 #, c-format -msgid " egid=%lu" +msgid " egid=%s" msgstr "" -#: src/id.c:357 +#: src/id.c:377 #, fuzzy msgid " groups=" msgstr " топтар=" -#: src/id.c:373 +#: src/id.c:393 #, c-format msgid " context=%s" msgstr "" -#: src/install.c:372 +#: src/install.c:373 #, c-format msgid "warning: %s: failed to change context to %s" msgstr "" -#: src/install.c:413 +#: src/install.c:414 #, fuzzy, c-format msgid "creating directory %s" msgstr "'%s' бумасын жасау" -#: src/install.c:481 +#: src/install.c:482 #, c-format msgid "cannot change ownership of %s" msgstr "" -#: src/install.c:505 +#: src/install.c:506 #, c-format msgid "cannot set time stamps for %s" msgstr "" -#: src/install.c:526 src/split.c:412 src/timeout.c:387 +#: src/install.c:527 src/split.c:426 src/timeout.c:439 #, c-format msgid "fork system call failed" msgstr "" -#: src/install.c:530 +#: src/install.c:531 #, c-format msgid "cannot run %s" msgstr "" -#: src/install.c:534 +#: src/install.c:535 #, c-format msgid "waiting for strip" msgstr "" -#: src/install.c:536 +#: src/install.c:537 #, c-format msgid "strip process terminated abnormally" msgstr "" -#: src/install.c:557 +#: src/install.c:558 #, c-format msgid "invalid user %s" msgstr "" -#: src/install.c:593 +#: src/install.c:594 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -4070,7 +4114,7 @@ msgid "" " or: %s [OPTION]... -d DIRECTORY...\n" msgstr "" -#: src/install.c:600 +#: src/install.c:601 msgid "" "\n" "This install program copies files (often just compiled) into destination\n" @@ -4082,7 +4126,6 @@ msgid "" "In the first three forms, copy SOURCE to DEST or multiple SOURCE(s) to\n" "the existing DIRECTORY, while setting permission modes and owner/group.\n" "In the 4th form, create all components of the given DIRECTORY(ies).\n" -"\n" msgstr "" #: src/install.c:615 @@ -4130,53 +4173,53 @@ msgid "" "directories\n" msgstr "" -#: src/install.c:858 +#: src/install.c:859 #, c-format msgid "" "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled" msgstr "" -#: src/install.c:868 +#: src/install.c:869 #, c-format msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled" msgstr "" -#: src/install.c:885 +#: src/install.c:886 #, c-format msgid "the strip option may not be used when installing a directory" msgstr "" -#: src/install.c:888 +#: src/install.c:889 #, c-format msgid "target directory not allowed when installing a directory" msgstr "" -#: src/install.c:892 +#: src/install.c:893 #, c-format msgid "cannot force target context to %s and preserve it" msgstr "" -#: src/install.c:946 src/mkdir.c:202 src/stdbuf.c:327 +#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326 #, c-format msgid "invalid mode %s" msgstr "" -#: src/install.c:953 +#: src/install.c:954 #, c-format msgid "WARNING: ignoring --strip-program option as -s option was not specified" msgstr "" -#: src/install.c:958 +#: src/install.c:959 #, c-format msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive" msgstr "" -#: src/install.c:965 +#: src/install.c:966 #, c-format msgid "options --compare (-C) and --strip are mutually exclusive" msgstr "" -#: src/install.c:971 +#: src/install.c:972 #, c-format msgid "" "the --compare (-C) option is ignored when you specify a mode with non-" @@ -4184,7 +4227,7 @@ msgid "" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/join.c:40 src/sort.c:65 +#: src/join.c:40 src/sort.c:66 msgid "Mike Haertel" msgstr "" @@ -4240,7 +4283,7 @@ msgstr "" #: src/join.c:403 #, c-format -msgid "%s:%ju: is not sorted: %.*s" +msgid "%s:%<PRIuMAX>: is not sorted: %.*s" msgstr "" #: src/join.c:840 src/join.c:1038 @@ -4268,12 +4311,12 @@ msgstr "" msgid "conflicting empty-field replacement strings" msgstr "" -#: src/join.c:1101 src/sort.c:4414 +#: src/join.c:1101 src/sort.c:4468 #, c-format msgid "multi-character tab %s" msgstr "" -#: src/join.c:1105 src/sort.c:4419 +#: src/join.c:1105 src/sort.c:4473 #, c-format msgid "incompatible tabs" msgstr "" @@ -4292,12 +4335,10 @@ msgid "" msgstr "" #: src/kill.c:82 -msgid "" -"Send signals to processes, or list signals.\n" -"\n" +msgid "Send signals to processes, or list signals.\n" msgstr "" -#: src/kill.c:89 +#: src/kill.c:88 msgid "" " -s, --signal=SIGNAL, -SIGNAL\n" " specify the name or number of the signal to be sent\n" @@ -4306,7 +4347,7 @@ msgid "" " -t, --table print a table of signal information\n" msgstr "" -#: src/kill.c:97 +#: src/kill.c:96 msgid "" "\n" "SIGNAL may be a signal name like 'HUP', or a signal number like '1',\n" @@ -4314,32 +4355,32 @@ msgid "" "PID is an integer; if negative it identifies a process group.\n" msgstr "" -#: src/kill.c:206 +#: src/kill.c:205 #, c-format msgid "%s: invalid process id" msgstr "" -#: src/kill.c:260 +#: src/kill.c:259 #, c-format msgid "invalid option -- %c" msgstr "" -#: src/kill.c:269 +#: src/kill.c:268 #, c-format msgid "%s: multiple signals specified" msgstr "" -#: src/kill.c:283 +#: src/kill.c:282 #, c-format msgid "multiple -l or -t options specified" msgstr "" -#: src/kill.c:300 +#: src/kill.c:299 #, c-format msgid "cannot combine signal with -l or -t" msgstr "" -#: src/kill.c:306 +#: src/kill.c:305 #, c-format msgid "no process ID specified" msgstr "" @@ -4441,10 +4482,9 @@ msgid "" "When creating hard links, each TARGET must exist. Symbolic links\n" "can hold arbitrary text; if later resolved, a relative link is\n" "interpreted in relation to its parent directory.\n" -"\n" msgstr "" -#: src/ln.c:395 +#: src/ln.c:394 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -4457,7 +4497,7 @@ msgid "" " -f, --force remove existing destination files\n" msgstr "" -#: src/ln.c:403 +#: src/ln.c:402 msgid "" " -i, --interactive prompt whether to remove destinations\n" " -L, --logical dereference TARGETs that are symbolic links\n" @@ -4469,7 +4509,7 @@ msgid "" " -s, --symbolic make symbolic links instead of hard links\n" msgstr "" -#: src/ln.c:412 +#: src/ln.c:411 msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" " -t, --target-directory=DIRECTORY specify the DIRECTORY in which to " @@ -4479,18 +4519,10 @@ msgid "" " -v, --verbose print name of each linked file\n" msgstr "" -#: src/ln.c:428 -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 "" - -#: src/ln.c:435 +#: src/ln.c:433 #, 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 "" @@ -4559,7 +4591,7 @@ msgstr "" msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "" -#: src/ls.c:1750 src/ptx.c:1976 +#: src/ls.c:1750 src/ptx.c:1975 #, c-format msgid "invalid line width: %s" msgstr "" @@ -4622,7 +4654,7 @@ msgstr "" msgid "closing directory %s" msgstr "" -#: src/ls.c:3301 +#: src/ls.c:3302 #, c-format msgid "cannot compare file names %s and %s" msgstr "" @@ -4631,10 +4663,9 @@ msgstr "" msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" -"\n" msgstr "" -#: src/ls.c:4729 +#: src/ls.c:4728 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -4643,7 +4674,7 @@ msgid "" "characters\n" msgstr "" -#: src/ls.c:4735 +#: src/ls.c:4734 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them. E." "g.,\n" @@ -4657,7 +4688,7 @@ msgid "" " otherwise: sort by ctime, newest first\n" msgstr "" -#: src/ls.c:4745 +#: src/ls.c:4744 msgid "" " -C list entries by columns\n" " --color[=WHEN] colorize the output. WHEN defaults to " @@ -4669,7 +4700,7 @@ msgid "" " -D, --dired generate output designed for Emacs' dired mode\n" msgstr "" -#: src/ls.c:4753 +#: src/ls.c:4752 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -4679,11 +4710,11 @@ msgid "" " --full-time like -l --time-style=full-iso\n" msgstr "" -#: src/ls.c:4761 +#: src/ls.c:4760 msgid " -g like -l, but do not list owner\n" msgstr "" -#: src/ls.c:4764 +#: src/ls.c:4763 msgid "" " --group-directories-first\n" " group directories before files.\n" @@ -4691,7 +4722,7 @@ msgid "" " use of --sort=none (-U) disables grouping\n" msgstr "" -#: src/ls.c:4770 +#: src/ls.c:4769 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" @@ -4699,7 +4730,7 @@ msgid "" " --si likewise, but use powers of 1000 not 1024\n" msgstr "" -#: src/ls.c:4776 +#: src/ls.c:4775 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -4712,7 +4743,7 @@ msgid "" " (overridden by -a or -A)\n" msgstr "" -#: src/ls.c:4786 +#: src/ls.c:4785 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -4724,7 +4755,7 @@ msgid "" " -k, --kibibytes use 1024-byte blocks\n" msgstr "" -#: src/ls.c:4796 +#: src/ls.c:4795 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -4734,7 +4765,7 @@ msgid "" "entries\n" msgstr "" -#: src/ls.c:4804 +#: src/ls.c:4803 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. " @@ -4745,7 +4776,7 @@ msgid "" " append / indicator to directories\n" msgstr "" -#: src/ls.c:4812 +#: src/ls.c:4811 msgid "" " -q, --hide-control-chars print ? instead of non graphic characters\n" " --show-control-chars show non graphic characters as-is (default\n" @@ -4757,7 +4788,7 @@ msgid "" "escape\n" msgstr "" -#: src/ls.c:4821 +#: src/ls.c:4820 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -4765,7 +4796,7 @@ msgid "" "blocks\n" msgstr "" -#: src/ls.c:4826 +#: src/ls.c:4825 msgid "" " -S sort by file size\n" " --sort=WORD sort by WORD instead of name: none -U,\n" @@ -4777,7 +4808,7 @@ msgid "" " if --sort=time\n" msgstr "" -#: src/ls.c:4836 +#: src/ls.c:4835 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, +FORMAT.\n" @@ -4789,13 +4820,13 @@ msgid "" " takes effect only outside the POSIX locale\n" msgstr "" -#: src/ls.c:4845 +#: src/ls.c:4844 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:4849 +#: src/ls.c:4848 msgid "" " -u with -lt: sort by, and show, access time\n" " with -l: show access time and sort by name\n" @@ -4804,7 +4835,7 @@ msgid "" " -v natural sort of (version) numbers within text\n" msgstr "" -#: src/ls.c:4856 +#: src/ls.c:4855 msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" @@ -4814,7 +4845,7 @@ msgid "" " -1 list one file per line\n" msgstr "" -#: src/ls.c:4866 +#: src/ls.c:4865 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -4823,7 +4854,7 @@ msgid "" "variable can change the settings. Use the dircolors command to set it.\n" msgstr "" -#: src/ls.c:4873 +#: src/ls.c:4872 msgid "" "\n" "Exit status:\n" @@ -4847,7 +4878,7 @@ msgstr "" msgid "David Madore" msgstr "" -#: src/md5sum.c:162 +#: src/md5sum.c:164 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -4856,31 +4887,35 @@ msgid "" "\n" msgstr "" -#: src/md5sum.c:172 +#: src/md5sum.c:174 msgid "" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr "" -#: src/md5sum.c:176 +#: src/md5sum.c:178 msgid " -b, --binary read in binary mode\n" msgstr "" -#: src/md5sum.c:179 +#: src/md5sum.c:181 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr "" -#: src/md5sum.c:183 +#: src/md5sum.c:184 +msgid " --tag create a BSD-style checksum\n" +msgstr "" + +#: src/md5sum.c:188 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" -#: src/md5sum.c:187 +#: src/md5sum.c:192 msgid " -t, --text read in text mode (default)\n" msgstr "" -#: src/md5sum.c:190 +#: src/md5sum.c:195 msgid "" "\n" "The following three options are useful only when verifying checksums:\n" @@ -4890,12 +4925,12 @@ msgid "" "\n" msgstr "" -#: src/md5sum.c:198 +#: src/md5sum.c:203 msgid "" " --strict with --check, exit non-zero for any invalid input\n" msgstr "" -#: src/md5sum.c:203 +#: src/md5sum.c:208 #, c-format msgid "" "\n" @@ -4905,76 +4940,86 @@ msgid "" "space for text), and name for each FILE.\n" msgstr "" -#: src/md5sum.c:502 +#: src/md5sum.c:523 #, c-format msgid "%s: too many checksum lines" msgstr "" -#: src/md5sum.c:526 +#: src/md5sum.c:547 #, c-format msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line" msgstr "" -#: src/md5sum.c:551 +#: src/md5sum.c:572 #, c-format msgid "%s: FAILED open or read\n" msgstr "" -#: src/md5sum.c:574 +#: src/md5sum.c:595 #, fuzzy msgid "FAILED" msgstr "Сәтсіз аяқталды!" -#: src/md5sum.c:576 +#: src/md5sum.c:597 #, fuzzy msgid "OK" msgstr "ОК" -#: src/md5sum.c:600 +#: src/md5sum.c:621 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "" -#: src/md5sum.c:610 +#: src/md5sum.c:631 #, c-format msgid "WARNING: %<PRIuMAX> line is improperly formatted" msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted" msgstr[0] "" -#: src/md5sum.c:618 +#: src/md5sum.c:639 #, 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:626 +#: src/md5sum.c:647 #, c-format msgid "WARNING: %<PRIuMAX> computed checksum did NOT match" msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match" msgstr[0] "" -#: src/md5sum.c:704 +#: src/md5sum.c:760 +#, c-format +msgid "--tag does not support --text mode" +msgstr "" + +#: src/md5sum.c:766 +#, c-format +msgid "the --tag option is meaningless when verifying checksums" +msgstr "" + +#: src/md5sum.c:773 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" msgstr "" -#: src/md5sum.c:712 +#: src/md5sum.c:781 #, c-format msgid "the --status option is meaningful only when verifying checksums" msgstr "" -#: src/md5sum.c:719 +#: src/md5sum.c:788 #, c-format msgid "the --warn option is meaningful only when verifying checksums" msgstr "" -#: src/md5sum.c:726 +#: src/md5sum.c:795 #, c-format msgid "the --quiet option is meaningful only when verifying checksums" msgstr "" -#: src/md5sum.c:733 +#: src/md5sum.c:802 #, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "" @@ -4985,12 +5030,10 @@ msgid "Usage: %s [OPTION]... DIRECTORY...\n" msgstr "" #: src/mkdir.c:57 -msgid "" -"Create the DIRECTORY(ies), if they do not already exist.\n" -"\n" +msgid "Create the DIRECTORY(ies), if they do not already exist.\n" msgstr "" -#: src/mkdir.c:64 +#: src/mkdir.c:63 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" @@ -4999,7 +5042,7 @@ msgid "" " directory to CTX\n" msgstr "" -#: src/mkdir.c:169 +#: src/mkdir.c:168 #, c-format msgid "created directory %s" msgstr "" @@ -5010,27 +5053,25 @@ msgid "Usage: %s [OPTION]... NAME...\n" msgstr "" #: src/mkfifo.c:52 -msgid "" -"Create named pipes (FIFOs) with the given NAMEs.\n" -"\n" +msgid "Create named pipes (FIFOs) with the given NAMEs.\n" msgstr "" -#: src/mkfifo.c:59 src/mknod.c:61 +#: src/mkfifo.c:58 src/mknod.c:60 msgid "" " -m, --mode=MODE set file permission bits to MODE, not a=rw - umask\n" msgstr "" -#: src/mkfifo.c:62 +#: src/mkfifo.c:61 msgid "" " -Z, --context=CTX set the SELinux security context of each NAME to CTX\n" msgstr "" -#: src/mkfifo.c:122 src/mknod.c:128 +#: src/mkfifo.c:121 src/mknod.c:127 #, c-format msgid "invalid mode" msgstr "" -#: src/mkfifo.c:127 src/mknod.c:133 +#: src/mkfifo.c:126 src/mknod.c:132 #, c-format msgid "mode must specify only file permission bits" msgstr "" @@ -5041,16 +5082,14 @@ msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n" msgstr "" #: src/mknod.c:54 -msgid "" -"Create the special file NAME of the given TYPE.\n" -"\n" +msgid "Create the special file NAME of the given TYPE.\n" msgstr "" -#: src/mknod.c:64 +#: src/mknod.c:63 msgid " -Z, --context=CTX set the SELinux security context of NAME to CTX\n" msgstr "" -#: src/mknod.c:69 +#: src/mknod.c:68 msgid "" "\n" "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n" @@ -5059,7 +5098,7 @@ msgid "" "otherwise, as decimal. TYPE may be:\n" msgstr "" -#: src/mknod.c:76 +#: src/mknod.c:75 msgid "" "\n" " b create a block (buffered) special file\n" @@ -5067,40 +5106,40 @@ msgid "" " p create a FIFO\n" msgstr "" -#: src/mknod.c:151 +#: src/mknod.c:150 msgid "Special files require major and minor device numbers." msgstr "" -#: src/mknod.c:161 +#: src/mknod.c:160 msgid "Fifos do not have major and minor device numbers." msgstr "" -#: src/mknod.c:177 +#: src/mknod.c:176 #, c-format msgid "block special files not supported" msgstr "" -#: src/mknod.c:186 +#: src/mknod.c:185 #, c-format msgid "character special files not supported" msgstr "" -#: src/mknod.c:202 +#: src/mknod.c:201 #, c-format msgid "invalid major device number %s" msgstr "" -#: src/mknod.c:207 +#: src/mknod.c:206 #, c-format msgid "invalid minor device number %s" msgstr "" -#: src/mknod.c:212 +#: src/mknod.c:211 #, fuzzy, c-format msgid "invalid device %s %s" msgstr "Қате құрылғы" -#: src/mknod.c:226 +#: src/mknod.c:225 #, c-format msgid "invalid device type %s" msgstr "" @@ -5159,58 +5198,56 @@ msgid "" " directory specified via -p; else /tmp [deprecated]\n" msgstr "" -#: src/mktemp.c:222 +#: src/mktemp.c:223 #, c-format msgid "failed to redirect stderr to /dev/null" msgstr "" -#: src/mktemp.c:228 +#: src/mktemp.c:229 #, c-format msgid "too many templates" msgstr "" -#: src/mktemp.c:248 +#: src/mktemp.c:249 #, c-format msgid "with --suffix, template %s must end in X" msgstr "" -#: src/mktemp.c:273 src/split.c:1117 +#: src/mktemp.c:274 src/split.c:1130 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "" -#: src/mktemp.c:278 +#: src/mktemp.c:279 #, c-format msgid "too few X's in template %s" msgstr "" -#: src/mktemp.c:291 +#: src/mktemp.c:292 #, c-format msgid "invalid template, %s, contains directory separator" msgstr "" -#: src/mktemp.c:305 +#: src/mktemp.c:306 #, c-format msgid "invalid template, %s; with --tmpdir, it may not be absolute" msgstr "" -#: src/mktemp.c:325 +#: src/mktemp.c:326 #, c-format msgid "failed to create directory via template %s" msgstr "" -#: src/mktemp.c:335 +#: src/mktemp.c:336 #, c-format msgid "failed to create file via template %s" msgstr "" -#: src/mv.c:290 -msgid "" -"Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" -"\n" +#: src/mv.c:292 +msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" msgstr "" -#: src/mv.c:297 +#: src/mv.c:298 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -5223,7 +5260,7 @@ msgid "" "effect.\n" msgstr "" -#: src/mv.c:306 +#: src/mv.c:307 msgid "" " --strip-trailing-slashes remove any trailing slashes from each " "SOURCE\n" @@ -5231,7 +5268,7 @@ msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" msgstr "" -#: src/mv.c:311 +#: src/mv.c:312 msgid "" " -t, --target-directory=DIRECTORY move all SOURCE arguments into " "DIRECTORY\n" @@ -5251,28 +5288,30 @@ msgstr "" #, c-format msgid "" "Run COMMAND with an adjusted niceness, which affects process scheduling.\n" -"With no COMMAND, print the current niceness. Nicenesses range from\n" -"%d (most favorable scheduling) to %d (least favorable).\n" -"\n" -" -n, --adjustment=N add integer N to the niceness (default 10)\n" +"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 "" -#: src/nice.c:168 +#: src/nice.c:82 +msgid " -n, --adjustment=N add integer N to the niceness (default 10)\n" +msgstr "" + +#: src/nice.c:172 #, c-format msgid "invalid adjustment %s" msgstr "" -#: src/nice.c:177 +#: src/nice.c:181 #, c-format msgid "a command must be given with an adjustment" msgstr "" -#: src/nice.c:184 src/nice.c:195 +#: src/nice.c:188 src/nice.c:199 #, c-format msgid "cannot get niceness" msgstr "" -#: src/nice.c:201 +#: src/nice.c:205 #, c-format msgid "cannot set niceness" msgstr "" @@ -5282,21 +5321,20 @@ msgstr "" msgid "Scott Bartram" msgstr "" -#: src/nl.c:186 +#: src/nl.c:179 msgid "" "Write each FILE to standard output, with line numbers added.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" -#: src/nl.c:194 +#: src/nl.c:186 msgid "" " -b, --body-numbering=STYLE use STYLE for numbering body lines\n" " -d, --section-delimiter=CC use CC for separating logical pages\n" " -f, --footer-numbering=STYLE use STYLE for numbering footer lines\n" msgstr "" -#: src/nl.c:199 +#: src/nl.c:191 msgid "" " -h, --header-numbering=STYLE use STYLE for numbering header lines\n" " -i, --line-increment=NUMBER line number increment at each line\n" @@ -5308,13 +5346,13 @@ msgid "" " -s, --number-separator=STRING add STRING after (possible) line number\n" msgstr "" -#: src/nl.c:207 +#: src/nl.c:199 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 "" -#: src/nl.c:213 +#: src/nl.c:205 msgid "" "\n" "By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC are\n" @@ -5322,7 +5360,7 @@ msgid "" "second character implies :. Type \\\\ for \\. STYLE is one of:\n" msgstr "" -#: src/nl.c:219 +#: src/nl.c:211 msgid "" "\n" " a number all lines\n" @@ -5339,52 +5377,47 @@ msgid "" "\n" msgstr "" -#: src/nl.c:286 +#: src/nl.c:278 #, c-format msgid "line number overflow" msgstr "" -#: src/nl.c:486 +#: src/nl.c:478 #, c-format msgid "invalid header numbering style: %s" msgstr "" -#: src/nl.c:494 +#: src/nl.c:486 #, c-format msgid "invalid body numbering style: %s" msgstr "" -#: src/nl.c:502 +#: src/nl.c:494 #, c-format msgid "invalid footer numbering style: %s" msgstr "" -#: src/nl.c:511 +#: src/nl.c:503 #, c-format msgid "invalid starting line number: %s" msgstr "" -#: src/nl.c:517 -#, c-format -msgid "WARNING: --page-increment is deprecated; use --line-increment instead" -msgstr "" - -#: src/nl.c:524 +#: src/nl.c:512 #, c-format msgid "invalid line number increment: %s" msgstr "" -#: src/nl.c:536 +#: src/nl.c:524 #, c-format msgid "invalid number of blank lines: %s" msgstr "" -#: src/nl.c:550 +#: src/nl.c:538 #, c-format msgid "invalid line number field width: %s" msgstr "" -#: src/nl.c:569 +#: src/nl.c:557 #, c-format msgid "invalid line numbering format: %s" msgstr "" @@ -5423,11 +5456,6 @@ msgstr "" msgid "ignoring input" msgstr "" -#: src/nohup.c:163 src/nohup.c:165 -#, fuzzy, c-format -msgid "failed to open %s" -msgstr "\"%s\" ашу сәтсіз аяқталды " - #: src/nohup.c:175 #, c-format msgid "ignoring input and appending output to %s" @@ -5459,45 +5487,382 @@ msgid "failed to redirect standard error" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:32 +#: src/nproc.c:33 msgid "Giuseppe Scrivano" msgstr "" -#: src/nproc.c:56 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 +#: src/nproc.c:57 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "" -#: src/nproc.c:57 +#: src/nproc.c:58 msgid "" "Print the number of processing units available to the current process,\n" "which may be less than the number of online processors\n" "\n" msgstr "" -#: src/nproc.c:62 +#: src/nproc.c:63 msgid "" " --all print the number of installed processors\n" " --ignore=N if possible, exclude N processing units\n" msgstr "" -#: src/nproc.c:106 +#: src/nproc.c:107 #, c-format msgid "%s: invalid number to ignore" msgstr "" -#: src/od.c:294 +#. This is a proper name. See the gettext manual, section Names. +#: src/numfmt.c:35 +msgid "Assaf Gordon" +msgstr "" + +#: src/numfmt.c:676 #, 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" +msgid "value too large to be converted: '%s'" msgstr "" -#: src/od.c:300 -msgid "" -"\n" +#: src/numfmt.c:680 +#, fuzzy, c-format +msgid "invalid number: '%s'" +msgstr "%s: '%s' күні қате\n" + +#: src/numfmt.c:684 +#, c-format +msgid "rejecting suffix in input: '%s' (consider using --from)" +msgstr "" + +#: src/numfmt.c:688 +#, fuzzy, c-format +msgid "invalid suffix in input: '%s'" +msgstr "Енгізу қате" + +#: src/numfmt.c:692 +#, c-format +msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)" +msgstr "" + +#: src/numfmt.c:723 +#, fuzzy, c-format +msgid "failed to prepare value '%Lf' for printing" +msgstr "Жазу үшін '%s' ашу сәтсіз: %s" + +#: src/numfmt.c:787 +#, fuzzy, c-format +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 +#, c-format +msgid "Usage: %s [OPTION]... [NUMBER]...\n" +msgstr "" + +#: src/numfmt.c:816 +msgid "" +"Reformat NUMBER(s), or the numbers from standard input if none are " +"specified.\n" +msgstr "" + +#: src/numfmt.c:820 +msgid " --debug print warnings about invalid input\n" +msgstr "" + +#: src/numfmt.c:823 +msgid "" +" -d, --delimiter=X use X instead of whitespace for field delimiter\n" +msgstr "" + +#: src/numfmt.c:826 +msgid "" +" --field=N replace the number in input field N (default is 1)\n" +msgstr "" + +#: src/numfmt.c:829 +msgid "" +" --format=FORMAT use printf style floating-point FORMAT;\n" +" see FORMAT below for details\n" +msgstr "" + +#: src/numfmt.c:833 +msgid "" +" --from=UNIT auto-scale input numbers to UNITs; default is " +"'none';\n" +" see UNIT below\n" +msgstr "" + +#: src/numfmt.c:837 +msgid "" +" --from-unit=N specify the input unit size (instead of the default " +"1)\n" +msgstr "" + +#: src/numfmt.c:840 +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 "" + +#: src/numfmt.c:844 +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 +msgid "" +" --invalid=MODE failure mode for invalid numbers: MODE can be:\n" +" abort (default), fail, warn, ignore\n" +msgstr "" + +#: src/numfmt.c:852 +msgid "" +" --padding=N pad the output to N characters; positive N will\n" +" right-align; negative N will left-align;\n" +" padding is ignored if the output is wider than N;\n" +" the default is to automatically pad if a " +"whitespace\n" +" is found\n" +msgstr "" + +#: src/numfmt.c:859 +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 +msgid "" +" --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" +" SUFFIX in input numbers\n" +msgstr "" + +#: src/numfmt.c:867 +msgid "" +" --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" +msgstr "" + +#: src/numfmt.c:870 +msgid "" +" --to-unit=N the output unit size (instead of the default 1)\n" +msgstr "" + +#: src/numfmt.c:877 +#, fuzzy +msgid "" +"\n" +"UNIT options:\n" +msgstr "" +"Басқа опциялар:\n" +"\n" + +#: src/numfmt.c:880 +msgid " none no auto-scaling is done; suffixes will trigger an error\n" +msgstr "" + +#: src/numfmt.c:883 +msgid "" +" auto accept optional single/two letter suffix:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" +msgstr "" + +#: src/numfmt.c:889 +msgid "" +" si accept optional single letter suffix:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:894 +msgid "" +" iec accept optional single letter suffix:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:899 +msgid "" +" iec-i accept optional two-letter suffix:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:905 +#, 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" +msgstr "" + +#: src/numfmt.c:912 +#, c-format +msgid "" +"\n" +"Exit status is 0 if all input numbers were successfully converted.\n" +"By default, %s will stop at the first conversion error with exit status 2.\n" +"With --invalid='fail' a warning is printed for each conversion error\n" +"and the exit status is 2. With --invalid='warn' each conversion error is\n" +"diagnosed, but the exit status is 0. With --invalid='ignore' conversion\n" +"errors are not diagnosed and the exit status is 0.\n" +msgstr "" + +#: src/numfmt.c:921 +#, c-format +msgid "" +"\n" +"Examples:\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" +msgstr "" + +#: src/numfmt.c:974 src/seq.c:212 +#, c-format +msgid "format %s has no %% directive" +msgstr "" + +#: src/numfmt.c:990 +#, c-format +msgid "invalid format %s (width overflow)" +msgstr "" + +#: src/numfmt.c:1007 src/seq.c:229 +#, c-format +msgid "format %s ends in %%" +msgstr "" + +#: src/numfmt.c:1010 +#, c-format +msgid "invalid format %s, directive must be %%['][-][N]f" +msgstr "" + +#: src/numfmt.c:1018 src/seq.c:236 +#, c-format +msgid "format %s has too many %% directives" +msgstr "" + +#: src/numfmt.c:1070 +#, c-format +msgid "invalid suffix in input '%s': '%s'" +msgstr "" + +#: src/numfmt.c:1092 +#, c-format +msgid "value too large to be printed: '%Lg' (consider using --to)" +msgstr "" + +#: src/numfmt.c:1100 +#, c-format +msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" +msgstr "" + +#: src/numfmt.c:1184 +#, c-format +msgid "large input value '%s': possible precision loss" +msgstr "" + +#: src/numfmt.c:1293 +#, 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 "%s: '%s' күні қате\n" + +#: src/numfmt.c:1401 +#, fuzzy, c-format +msgid "invalid field value '%s'" +msgstr "%s: '%s' күні қате\n" + +#: src/numfmt.c:1430 +#, fuzzy, c-format +msgid "invalid header value '%s'" +msgstr "%s: '%s' күні қате\n" + +#: src/numfmt.c:1456 +#, 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 +#, fuzzy, c-format +msgid "no conversion option specified" +msgstr "Команда көрсетілмеген" + +#: src/numfmt.c:1471 +#, c-format +msgid "grouping cannot be combined with --to" +msgstr "" + +#: src/numfmt.c:1473 +#, c-format +msgid "grouping has no effect in this locale" +msgstr "" + +#: src/numfmt.c:1486 +#, c-format +msgid "--header ignored with command-line input" +msgstr "" + +#: src/numfmt.c:1511 +#, fuzzy, c-format +msgid "error reading input" +msgstr "%s: %s: оқу қатесі: %s\n" + +#: src/numfmt.c:1520 +#, fuzzy, c-format +msgid "failed to convert some of the input numbers" +msgstr "\"%s\" ашу сәтсіз аяқталды " + +#: src/od.c:294 +#, 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 "" + +#: src/od.c:300 +msgid "" +"\n" "Write an unambiguous representation, octal bytes by default,\n" "of FILE to standard output. With more than one FILE argument,\n" "concatenate them in the listed order to form the input.\n" @@ -5506,29 +5871,39 @@ msgid "" msgstr "" #: src/od.c:307 -msgid "All arguments to long options are mandatory for short options.\n" +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" +"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" +"at first byte printed, incremented when dump is progressing.\n" +"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 "" -#: src/od.c:310 +#: src/od.c:318 msgid "" -" -A, --address-radix=RADIX decide how file offsets are printed\n" +" -A, --address-radix=RADIX output format for file offsets. RADIX is one\n" +" of [doxn], for Decimal, Octal, Hex or None\n" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" -#: src/od.c:314 +#: src/od.c:323 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" -" --traditional accept arguments in traditional form\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:324 +#: src/od.c:336 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" @@ -5536,7 +5911,7 @@ msgid "" " -d same as -t u2, select unsigned decimal 2-byte units\n" msgstr "" -#: src/od.c:332 +#: src/od.c:345 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -5546,27 +5921,16 @@ msgid "" " -x same as -t x2, select hexadecimal 2-byte units\n" msgstr "" -#: src/od.c:340 +#: src/od.c:353 msgid "" "\n" -"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" -"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" -"at first byte printed, incremented when dump is progressing.\n" -"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 "" - -#: src/od.c:349 -msgid "" "\n" "TYPE is made up of one or more of these specifications:\n" -"\n" " a named character, ignoring high-order bit\n" " c ASCII character or backslash escape\n" msgstr "" -#: src/od.c:356 +#: src/od.c:360 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -5575,83 +5939,84 @@ msgid "" " x[SIZE] hexadecimal, SIZE bytes per integer\n" msgstr "" -#: src/od.c:363 +#: src/od.c:367 msgid "" "\n" -"SIZE is a number. For TYPE in doux, SIZE may also be C for\n" +"SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" "sizeof(char), S for sizeof(short), I for sizeof(int) or L for\n" "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 "" -#: src/od.c:370 +#: src/od.c:374 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" +"Adding a z suffix to any type displays printable characters at the end of\n" +"each output line.\n" msgstr "" -#: src/od.c:380 +#: src/od.c:379 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" +"\n" +"BYTES is hex with 0x or 0X prefix, and may have a multiplier suffix:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"and so on for G, T, P, E, Z, Y.\n" msgstr "" -#: src/od.c:633 src/od.c:753 +#: src/od.c:639 src/od.c:759 #, c-format msgid "invalid type string %s" msgstr "" -#: src/od.c:643 +#: src/od.c:649 #, c-format msgid "" "invalid type string %s;\n" "this system doesn't provide a %lu-byte integral type" msgstr "" -#: src/od.c:764 +#: src/od.c:770 #, c-format msgid "" "invalid type string %s;\n" "this system doesn't provide a %lu-byte floating point type" msgstr "" -#: src/od.c:822 +#: src/od.c:828 #, c-format msgid "invalid character '%c' in type string %s" msgstr "" -#: src/od.c:1047 +#: src/od.c:1053 #, c-format msgid "cannot skip past end of combined input" msgstr "" -#: src/od.c:1603 +#: src/od.c:1609 #, c-format msgid "invalid output address radix '%c'; it must be one character from [doxn]" msgstr "" -#: src/od.c:1729 +#: src/od.c:1735 #, c-format msgid "no type may be specified when dumping strings" msgstr "" -#: src/od.c:1804 +#: src/od.c:1810 msgid "compatibility mode supports at most one file" msgstr "" -#: src/od.c:1825 +#: src/od.c:1831 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "" -#: src/od.c:1868 +#: src/od.c:1874 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "" @@ -5671,16 +6036,15 @@ 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" -"\n" msgstr "" -#: src/paste.c:448 +#: 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 "" -#: src/paste.c:509 +#: src/paste.c:508 #, c-format msgid "delimiter list ends with an unescaped backslash: %s" msgstr "" @@ -5735,84 +6099,84 @@ msgid "Kaveh Ghazi" msgstr "" #. TRANSLATORS: Real name is unknown; at most 19 characters. -#: src/pinky.c:250 +#: src/pinky.c:242 msgid " ???" msgstr "" #. TRANSLATORS: Idle time is unknown; at most 5 characters. -#: src/pinky.c:274 +#: src/pinky.c:266 msgid "?????" msgstr "" -#: src/pinky.c:323 +#: src/pinky.c:314 #, c-format msgid "Login name: " msgstr "" -#: src/pinky.c:326 +#: src/pinky.c:317 #, fuzzy, c-format msgid "In real life: " msgstr "Шын өмірде" #. TRANSLATORS: Real name is unknown; no hard limit. -#: src/pinky.c:330 +#: src/pinky.c:321 msgid "???\n" msgstr "" -#: src/pinky.c:350 +#: src/pinky.c:341 #, fuzzy, c-format msgid "Directory: " msgstr "_Бума:" -#: src/pinky.c:352 +#: src/pinky.c:343 #, fuzzy, c-format msgid "Shell: " msgstr "Қоршам:" -#: src/pinky.c:371 +#: src/pinky.c:362 #, fuzzy, c-format msgid "Project: " msgstr "Жо_ба" -#: src/pinky.c:395 +#: src/pinky.c:386 #, c-format msgid "Plan:\n" msgstr "" -#: src/pinky.c:414 +#: src/pinky.c:405 #, fuzzy msgid "Login" msgstr "Тіркелгі" -#: src/pinky.c:416 +#: src/pinky.c:407 #, fuzzy msgid "Name" msgstr "Аты" -#: src/pinky.c:417 +#: src/pinky.c:408 msgid " TTY" msgstr "" -#: src/pinky.c:419 +#: src/pinky.c:410 #, fuzzy msgid "Idle" msgstr "Іссіз" -#: src/pinky.c:420 +#: src/pinky.c:411 #, fuzzy msgid "When" msgstr "Қашан" -#: src/pinky.c:423 +#: src/pinky.c:414 msgid "Where" msgstr "" -#: src/pinky.c:502 +#: src/pinky.c:493 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "" -#: src/pinky.c:503 +#: src/pinky.c:494 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -5822,7 +6186,7 @@ msgid "" " -s do short format output, this is the default\n" msgstr "" -#: src/pinky.c:511 +#: src/pinky.c:502 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -5831,7 +6195,7 @@ msgid "" " in short format\n" msgstr "" -#: src/pinky.c:520 +#: src/pinky.c:511 #, c-format msgid "" "\n" @@ -5839,7 +6203,7 @@ msgid "" "The utmp file will be %s.\n" msgstr "" -#: src/pinky.c:604 +#: src/pinky.c:595 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "" @@ -5854,83 +6218,81 @@ msgstr "" msgid "Roland Huebner" msgstr "" -#: src/pr.c:912 +#: src/pr.c:908 #, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "" -#: src/pr.c:914 +#: src/pr.c:910 #, c-format msgid "invalid page range %s" msgstr "" -#: src/pr.c:979 +#: src/pr.c:975 #, c-format msgid "'-l PAGE_LENGTH' invalid number of lines: %s" msgstr "" -#: src/pr.c:1003 +#: src/pr.c:999 #, c-format msgid "'-N NUMBER' invalid starting line number: %s" msgstr "" -#: src/pr.c:1015 +#: src/pr.c:1011 #, c-format msgid "'-o MARGIN' invalid line offset: %s" msgstr "" -#: src/pr.c:1056 +#: src/pr.c:1052 #, c-format msgid "'-w PAGE_WIDTH' invalid number of characters: %s" msgstr "" -#: src/pr.c:1070 +#: src/pr.c:1066 #, c-format msgid "'-W PAGE_WIDTH' invalid number of characters: %s" msgstr "" -#: src/pr.c:1100 +#: src/pr.c:1096 #, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "" -#: src/pr.c:1104 +#: src/pr.c:1100 #, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "" -#: src/pr.c:1200 +#: src/pr.c:1196 #, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "" -#: src/pr.c:1304 +#: src/pr.c:1293 #, c-format msgid "page width too narrow" msgstr "" -#: src/pr.c:2369 +#: src/pr.c:2353 #, c-format msgid "starting page number %<PRIuMAX> exceeds page count %<PRIuMAX>" msgstr "" -#: src/pr.c:2396 +#: src/pr.c:2380 #, c-format msgid "page number overflow" msgstr "" -#: src/pr.c:2401 +#: src/pr.c:2385 #, c-format msgid "Page %<PRIuMAX>" msgstr "" -#: src/pr.c:2773 -msgid "" -"Paginate or columnate FILE(s) for printing.\n" -"\n" +#: src/pr.c:2757 +msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" -#: src/pr.c:2780 +#: src/pr.c:2763 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -5940,7 +6302,7 @@ msgid "" " columns on each page\n" msgstr "" -#: src/pr.c:2788 +#: src/pr.c:2771 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -5950,7 +6312,7 @@ msgid "" " double space the output\n" msgstr "" -#: src/pr.c:2796 +#: src/pr.c:2779 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -5962,7 +6324,7 @@ msgid "" " and trailer without -F)\n" msgstr "" -#: src/pr.c:2806 +#: src/pr.c:2789 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -5975,7 +6337,7 @@ msgid "" " alignment, --sep-string[=STRING] sets separators\n" msgstr "" -#: src/pr.c:2815 +#: src/pr.c:2798 msgid "" " -l, --length=PAGE_LENGTH\n" " set the page length to PAGE_LENGTH (66) lines\n" @@ -5984,7 +6346,7 @@ msgid "" " truncate lines, but join lines of full length with -J\n" msgstr "" -#: src/pr.c:2822 +#: src/pr.c:2805 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -5994,7 +6356,7 @@ msgid "" " page printed (see +FIRST_PAGE)\n" msgstr "" -#: src/pr.c:2830 +#: src/pr.c:2813 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -6003,7 +6365,7 @@ msgid "" " omit warning when a file cannot be opened\n" msgstr "" -#: src/pr.c:2837 +#: src/pr.c:2820 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -6013,7 +6375,7 @@ msgid "" " options (-COLUMN|-a -COLUMN|-m) except -w is set\n" msgstr "" -#: src/pr.c:2844 +#: src/pr.c:2827 msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" @@ -6023,7 +6385,7 @@ msgid "" " -t, --omit-header omit page headers and trailers\n" msgstr "" -#: src/pr.c:2851 +#: src/pr.c:2834 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -6037,7 +6399,7 @@ msgid "" "(72)\n" msgstr "" -#: src/pr.c:2861 +#: src/pr.c:2844 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -6046,7 +6408,7 @@ msgid "" " with -S or -s\n" msgstr "" -#: src/pr.c:2869 +#: src/pr.c:2852 msgid "" "\n" "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" @@ -6175,17 +6537,16 @@ msgstr "" msgid "" "Output a permuted index, including context, of the words in the input " "files.\n" -"\n" msgstr "" -#: src/ptx.c:1828 +#: src/ptx.c:1827 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:1833 +#: src/ptx.c:1832 msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" " -O, --format=roff generate output as roff directives\n" @@ -6194,7 +6555,7 @@ msgid "" " -T, --format=tex generate output as TeX directives\n" msgstr "" -#: src/ptx.c:1840 +#: src/ptx.c:1839 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -6204,7 +6565,7 @@ msgid "" " -o, --only-file=FILE read only word list from this FILE\n" msgstr "" -#: src/ptx.c:1848 +#: src/ptx.c:1847 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -6212,13 +6573,13 @@ msgid "" "excluded\n" msgstr "" -#: src/ptx.c:1855 +#: src/ptx.c:1854 msgid "" "\n" "With no FILE or if FILE is -, read Standard Input. '-F /' by default.\n" msgstr "" -#: src/ptx.c:1949 +#: src/ptx.c:1948 #, c-format msgid "invalid gap width: %s" msgstr "" @@ -6240,7 +6601,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "" -#: src/pwd.c:170 src/pwd.c:277 +#: src/pwd.c:170 src/pwd.c:277 src/split.c:373 #, c-format msgid "failed to stat %s" msgstr "" @@ -6256,13 +6617,14 @@ msgid "ignoring non-option arguments" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/readlink.c:33 +#: src/readlink.c:32 msgid "Dmitry V. Levin" msgstr "" -#: src/readlink.c:62 +#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147 +#: src/stat.c:1349 src/touch.c:212 #, c-format -msgid "Usage: %s [OPTION]... FILE\n" +msgid "Usage: %s [OPTION]... FILE...\n" msgstr "" #: src/readlink.c:63 @@ -6290,16 +6652,17 @@ msgid "" "recursively,\n" " without requirements on components " "existence\n" -" -n, --no-newline do not output the trailing newline\n" +" -n, --no-newline do not output the trailing delimiter\n" " -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" msgstr "" -#: src/realpath.c:71 src/rm.c:134 src/shred.c:147 src/stat.c:1330 -#: src/touch.c:215 +#: src/readlink.c:152 #, c-format -msgid "Usage: %s [OPTION]... FILE...\n" +msgid "ignoring --no-newline with multiple arguments" msgstr "" #: src/realpath.c:72 @@ -6327,12 +6690,12 @@ msgstr "" msgid "generating relative path" msgstr "" -#: src/remove.c:286 +#: src/remove.c:273 #, c-format msgid "%s: descend into write-protected directory %s? " msgstr "" -#: src/remove.c:287 +#: src/remove.c:274 #, c-format msgid "%s: descend into directory %s? " msgstr "" @@ -6341,49 +6704,49 @@ msgstr "" #. translate "%s: remove %s (write-protected) %s? " #. instead. It should avoid grammatical problems #. with the output of file_type. -#: src/remove.c:303 +#: src/remove.c:290 #, c-format msgid "%s: remove write-protected %s %s? " msgstr "" -#: src/remove.c:304 +#: src/remove.c:291 #, fuzzy, c-format msgid "%s: remove %s %s? " msgstr "Өшіру" -#: src/remove.c:417 +#: src/remove.c:374 #, c-format msgid "removed directory: %s\n" msgstr "" -#: src/remove.c:481 +#: src/remove.c:444 #, c-format msgid "cannot remove directory: %s" msgstr "" -#: src/remove.c:537 +#: src/remove.c:500 #, c-format msgid "skipping %s, since it's on a different device" msgstr "" -#: src/remove.c:557 +#: src/remove.c:520 #, c-format msgid "traversal failed: %s" msgstr "" -#: src/remove.c:563 +#: src/remove.c:526 #, c-format msgid "" "unexpected failure: fts_info=%d: %s\n" "please report to %s" msgstr "" -#: src/rm.c:118 +#: src/rm.c:119 #, c-format msgid "Try '%s ./%s' to remove the file %s.\n" msgstr "" -#: src/rm.c:135 +#: src/rm.c:136 msgid "" "Remove (unlink) the FILE(s).\n" "\n" @@ -6392,7 +6755,7 @@ msgid "" " -i prompt before every removal\n" msgstr "" -#: src/rm.c:141 +#: src/rm.c:142 msgid "" " -I prompt once before removing more than three files, " "or\n" @@ -6404,22 +6767,23 @@ msgid "" " always (-i). Without WHEN, prompt always\n" msgstr "" -#: src/rm.c:148 +#: src/rm.c:149 msgid "" " --one-file-system when removing a hierarchy recursively, skip any\n" " directory that is on a file system different from\n" " that of the corresponding command line argument\n" msgstr "" -#: src/rm.c:153 +#: src/rm.c:154 msgid "" " --no-preserve-root do not treat '/' specially\n" " --preserve-root do not remove '/' (default)\n" " -r, -R, --recursive remove directories and their contents recursively\n" +" -d, --dir remove empty directories\n" " -v, --verbose explain what is being done\n" msgstr "" -#: src/rm.c:161 +#: src/rm.c:163 msgid "" "\n" "By default, rm does not remove directories. Use the --recursive (-r or -R)\n" @@ -6427,7 +6791,7 @@ msgid "" "contents.\n" msgstr "" -#: src/rm.c:166 +#: src/rm.c:168 #, c-format msgid "" "\n" @@ -6438,7 +6802,7 @@ msgid "" " %s ./-foo\n" msgstr "" -#: src/rm.c:175 +#: src/rm.c:177 msgid "" "\n" "Note that if you use rm to remove a file, it might be possible to recover\n" @@ -6446,12 +6810,12 @@ msgid "" "assurance that the contents are truly unrecoverable, consider using shred.\n" msgstr "" -#: src/rm.c:335 +#: src/rm.c:342 #, c-format msgid "%s: remove all arguments recursively? " msgstr "" -#: src/rm.c:336 +#: src/rm.c:343 #, c-format msgid "%s: remove all arguments? " msgstr "" @@ -6499,7 +6863,10 @@ msgstr "" msgid "" "Run a program in a different security context.\n" "With neither CONTEXT nor COMMAND, print the current security context.\n" -"\n" +msgstr "" + +#: src/runcon.c:94 +msgid "" " CONTEXT Complete security context\n" " -c, --compute compute process transition context before modifying\n" " -t, --type=TYPE type (for same role as parent)\n" @@ -6509,72 +6876,72 @@ msgid "" "\n" msgstr "" -#: src/runcon.c:140 +#: src/runcon.c:144 #, c-format msgid "multiple roles" msgstr "" -#: src/runcon.c:145 +#: src/runcon.c:149 #, c-format msgid "multiple types" msgstr "" -#: src/runcon.c:150 +#: src/runcon.c:154 #, c-format msgid "multiple users" msgstr "" -#: src/runcon.c:155 +#: src/runcon.c:159 #, c-format msgid "multiple levelranges" msgstr "" -#: src/runcon.c:173 src/runcon.c:209 +#: src/runcon.c:177 src/runcon.c:213 #, c-format msgid "failed to get current context" msgstr "" -#: src/runcon.c:183 +#: src/runcon.c:187 #, c-format msgid "you must specify -c, -t, -u, -l, -r, or context" msgstr "" -#: src/runcon.c:191 +#: src/runcon.c:195 #, fuzzy, c-format msgid "no command specified" msgstr "Команда көрсетілмеген" -#: src/runcon.c:197 +#: src/runcon.c:201 #, c-format msgid "%s may be used only on a SELinux kernel" msgstr "" -#: src/runcon.c:223 +#: src/runcon.c:227 #, c-format msgid "failed to compute a new context" msgstr "" -#: src/runcon.c:237 +#: src/runcon.c:241 #, c-format msgid "failed to set new user %s" msgstr "" -#: src/runcon.c:239 +#: src/runcon.c:243 #, c-format msgid "failed to set new type %s" msgstr "" -#: src/runcon.c:241 +#: src/runcon.c:245 #, c-format msgid "failed to set new range %s" msgstr "" -#: src/runcon.c:243 +#: src/runcon.c:247 #, c-format msgid "failed to set new role %s" msgstr "" -#: src/runcon.c:251 +#: src/runcon.c:255 #, c-format msgid "unable to set security context %s" msgstr "" @@ -6588,15 +6955,17 @@ msgid "" msgstr "" #: src/seq.c:73 +msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" +msgstr "" + +#: src/seq.c:79 msgid "" -"Print numbers from FIRST to LAST, in steps of INCREMENT.\n" -"\n" " -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 "" -#: src/seq.c:82 +#: src/seq.c:86 msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" @@ -6606,39 +6975,24 @@ msgid "" "INCREMENT is usually negative if FIRST is greater than LAST.\n" msgstr "" -#: src/seq.c:90 +#: src/seq.c:94 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:136 +#: src/seq.c:140 #, c-format msgid "invalid floating point argument: %s" msgstr "" -#: src/seq.c:193 -#, c-format -msgid "format %s has no %% directive" -msgstr "" - -#: src/seq.c:210 -#, c-format -msgid "format %s ends in %%" -msgstr "" - -#: src/seq.c:213 +#: src/seq.c:232 #, c-format msgid "format %s has unknown %%%c directive" msgstr "" -#: src/seq.c:217 -#, c-format -msgid "format %s has too many %% directives" -msgstr "" - -#: src/seq.c:431 +#: src/seq.c:555 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" @@ -6668,27 +7022,27 @@ msgid "" " (if specified) supplemental group IDs to GID1, ...\n" msgstr "" -#: src/setuidgid.c:163 +#: src/setuidgid.c:162 #, c-format msgid "unknown user-ID: %s" msgstr "" -#: src/setuidgid.c:174 +#: src/setuidgid.c:173 #, c-format msgid "to use user-ID %s you need to use -g too" msgstr "" -#: src/setuidgid.c:191 +#: src/setuidgid.c:190 #, c-format msgid "failed to set supplemental group(s)" msgstr "" -#: src/setuidgid.c:201 +#: src/setuidgid.c:200 #, c-format msgid "cannot set group-ID to %lu" msgstr "" -#: src/setuidgid.c:205 +#: src/setuidgid.c:204 #, c-format msgid "cannot set user-ID to %lu" msgstr "" @@ -6702,10 +7056,9 @@ msgstr "" 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" -"\n" msgstr "" -#: src/shred.c:156 +#: src/shred.c:155 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -6714,7 +7067,7 @@ msgid "" " -s, --size=N shred this many bytes (suffixes like K, M, G accepted)\n" msgstr "" -#: src/shred.c:162 +#: src/shred.c:161 msgid "" " -u, --remove truncate and remove file after overwriting\n" " -v, --verbose show progress\n" @@ -6723,7 +7076,7 @@ msgid "" " -z, --zero add a final overwrite with zeros to hide shredding\n" msgstr "" -#: src/shred.c:171 +#: src/shred.c:170 msgid "" "\n" "If FILE is -, shred standard output.\n" @@ -6735,7 +7088,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:181 +#: src/shred.c:180 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" @@ -6746,7 +7099,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:189 +#: src/shred.c:188 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -6758,7 +7111,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:199 +#: src/shred.c:198 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -6767,7 +7120,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:206 +#: src/shred.c:205 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" @@ -6779,129 +7132,129 @@ msgid "" "\n" msgstr "" -#: src/shred.c:216 +#: src/shred.c:215 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:296 +#: src/shred.c:295 #, c-format msgid "%s: fdatasync failed" msgstr "" -#: src/shred.c:307 +#: src/shred.c:306 #, c-format msgid "%s: fsync failed" msgstr "" -#: src/shred.c:384 +#: src/shred.c:383 #, c-format msgid "%s: cannot rewind" msgstr "" -#: src/shred.c:403 +#: src/shred.c:402 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "" -#: src/shred.c:453 +#: src/shred.c:452 #, c-format msgid "%s: error writing at offset %s" msgstr "" -#: src/shred.c:471 +#: src/shred.c:470 #, c-format msgid "%s: lseek failed" msgstr "" -#: src/shred.c:482 +#: src/shred.c:481 #, c-format msgid "%s: file too large" msgstr "" -#: src/shred.c:505 +#: src/shred.c:504 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "" -#: src/shred.c:521 +#: src/shred.c:520 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "" -#: src/shred.c:768 +#: src/shred.c:767 #, c-format msgid "%s: fstat failed" msgstr "" -#: src/shred.c:779 +#: src/shred.c:778 #, c-format msgid "%s: invalid file type" msgstr "" -#: src/shred.c:798 +#: src/shred.c:797 #, c-format msgid "%s: file has negative size" msgstr "" -#: src/shred.c:865 +#: src/shred.c:864 src/sort.c:932 src/split.c:378 #, c-format msgid "%s: error truncating" msgstr "" -#: src/shred.c:881 +#: src/shred.c:880 #, c-format msgid "%s: fcntl failed" msgstr "" -#: src/shred.c:886 +#: src/shred.c:885 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "" -#: src/shred.c:968 +#: src/shred.c:967 #, fuzzy, c-format msgid "%s: removing" msgstr "Өшірілуде %1..." -#: src/shred.c:992 +#: src/shred.c:991 #, c-format msgid "%s: renamed to %s" msgstr "" -#: src/shred.c:1014 +#: src/shred.c:1013 #, fuzzy, c-format msgid "%s: failed to remove" msgstr "%s: %s өшіру сәтсіз аяқталды\n" -#: src/shred.c:1018 +#: src/shred.c:1017 #, c-format msgid "%s: removed" msgstr "" -#: src/shred.c:1025 src/shred.c:1068 +#: src/shred.c:1024 src/shred.c:1067 #, c-format msgid "%s: failed to close" msgstr "" -#: src/shred.c:1061 +#: src/shred.c:1060 #, fuzzy, c-format msgid "%s: failed to open for writing" msgstr "Жазу үшін '%s' ашу сәтсіз: %s" -#: src/shred.c:1126 +#: src/shred.c:1125 #, c-format msgid "%s: invalid number of passes" msgstr "" -#: src/shred.c:1135 src/shuf.c:291 src/sort.c:4387 +#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441 #, c-format msgid "multiple random sources specified" msgstr "" -#: src/shred.c:1149 +#: src/shred.c:1148 #, c-format msgid "%s: invalid file size" msgstr "" @@ -6915,12 +7268,10 @@ msgid "" msgstr "" #: src/shuf.c:54 -msgid "" -"Write a random permutation of the input lines to standard output.\n" -"\n" +msgid "Write a random permutation of the input lines to standard output.\n" msgstr "" -#: src/shuf.c:61 +#: src/shuf.c:60 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 " @@ -6931,27 +7282,27 @@ msgid "" " -z, --zero-terminated end lines with 0 byte, not newline\n" msgstr "" -#: src/shuf.c:245 +#: src/shuf.c:244 #, c-format msgid "multiple -i options specified" msgstr "" -#: src/shuf.c:265 +#: src/shuf.c:264 #, c-format msgid "invalid input range %s" msgstr "" -#: src/shuf.c:278 +#: src/shuf.c:277 #, c-format msgid "invalid line count %s" msgstr "" -#: src/shuf.c:285 src/sort.c:4381 +#: src/shuf.c:284 src/sort.c:4435 #, c-format msgid "multiple output files specified" msgstr "" -#: src/shuf.c:311 +#: src/shuf.c:310 #, c-format msgid "cannot combine -e and -i options" msgstr "" @@ -6970,7 +7321,7 @@ msgid "" "\n" msgstr "" -#: src/sleep.c:135 src/timeout.c:295 +#: src/sleep.c:135 src/timeout.c:320 #, c-format msgid "invalid time interval %s" msgstr "" @@ -6980,19 +7331,17 @@ msgstr "" msgid "cannot read realtime clock" msgstr "" -#: src/sort.c:395 -msgid "" -"Write sorted concatenation of all FILE(s) to standard output.\n" -"\n" +#: src/sort.c:399 +msgid "Write sorted concatenation of all FILE(s) to standard output.\n" msgstr "" -#: src/sort.c:402 +#: src/sort.c:405 msgid "" "Ordering options:\n" "\n" msgstr "" -#: src/sort.c:406 +#: src/sort.c:409 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -7000,19 +7349,19 @@ msgid "" " -f, --ignore-case fold lower case to upper case characters\n" msgstr "" -#: src/sort.c:412 +#: src/sort.c:415 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:417 +#: src/sort.c:420 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" -#: src/sort.c:420 +#: src/sort.c:423 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -7020,7 +7369,7 @@ msgid "" " -r, --reverse reverse the result of comparisons\n" msgstr "" -#: src/sort.c:426 +#: src/sort.c:429 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -7030,7 +7379,7 @@ msgid "" "\n" msgstr "" -#: src/sort.c:434 +#: src/sort.c:437 msgid "" "Other options:\n" "\n" @@ -7038,13 +7387,13 @@ msgstr "" "Басқа опциялар:\n" "\n" -#: src/sort.c:438 +#: src/sort.c:441 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" msgstr "" -#: src/sort.c:442 +#: src/sort.c:445 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 " @@ -7053,7 +7402,7 @@ msgid "" " decompress them with PROG -d\n" msgstr "" -#: src/sort.c:449 +#: src/sort.c:452 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -7062,13 +7411,13 @@ msgid "" " If F is - then read names from standard input\n" msgstr "" -#: src/sort.c:456 +#: src/sort.c:459 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:460 +#: src/sort.c:463 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -7076,7 +7425,7 @@ msgid "" " -S, --buffer-size=SIZE use SIZE for main memory buffer\n" msgstr "" -#: src/sort.c:466 +#: src/sort.c:469 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -7091,11 +7440,11 @@ msgid "" "run\n" msgstr "" -#: src/sort.c:475 +#: src/sort.c:478 msgid " -z, --zero-terminated end lines with 0 byte, not newline\n" msgstr "" -#: src/sort.c:480 +#: src/sort.c:483 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -7114,7 +7463,7 @@ msgid "" "SIZE may be followed by the following multiplicative suffixes:\n" msgstr "" -#: src/sort.c:493 +#: src/sort.c:496 msgid "" "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n" "\n" @@ -7126,261 +7475,264 @@ msgid "" "native byte values.\n" msgstr "" -#: src/sort.c:694 +#: src/sort.c:697 #, c-format msgid "waiting for %s [-d]" msgstr "" -#: src/sort.c:699 +#: src/sort.c:702 #, c-format msgid "%s [-d] terminated abnormally" msgstr "" -#: src/sort.c:853 +#: src/sort.c:856 #, c-format msgid "cannot create temporary file in %s" msgstr "" -#: src/sort.c:939 src/sort.c:2010 src/sort.c:3056 src/sort.c:3755 -#: src/sort.c:3758 +#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713 +#: src/sort.c:3804 src/sort.c:3807 msgid "open failed" msgstr "" -#: src/sort.c:959 +#: src/sort.c:970 msgid "fflush failed" msgstr "" -#: src/sort.c:964 src/sort.c:2013 src/sort.c:4646 +#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706 msgid "close failed" msgstr "жабу сәтсіз" -#: src/sort.c:973 +#: src/sort.c:986 #, c-format msgid "dup2 failed" msgstr "" -#: src/sort.c:1090 +#: src/sort.c:1103 #, c-format msgid "couldn't execute %s" msgstr "" -#: src/sort.c:1097 +#: src/sort.c:1110 msgid "couldn't create temporary file" msgstr "" -#: src/sort.c:1136 +#: src/sort.c:1149 #, c-format msgid "couldn't create process for %s -d" msgstr "" -#: src/sort.c:1150 +#: src/sort.c:1161 #, c-format msgid "couldn't execute %s -d" msgstr "" -#: src/sort.c:1209 +#: src/sort.c:1220 #, c-format msgid "warning: cannot remove: %s" msgstr "" -#: src/sort.c:1295 +#: src/sort.c:1306 #, c-format msgid "invalid --%s argument %s" msgstr "" -#: src/sort.c:1298 +#: src/sort.c:1309 #, c-format msgid "minimum --%s argument is %s" msgstr "" -#: src/sort.c:1313 +#: src/sort.c:1324 #, c-format msgid "--%s argument %s too large" msgstr "" -#: src/sort.c:1316 +#: src/sort.c:1327 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "" -#: src/sort.c:1398 +#: src/sort.c:1409 #, c-format msgid "number in parallel must be nonzero" msgstr "" -#: src/sort.c:1479 +#: src/sort.c:1494 msgid "stat failed" msgstr "" -#: src/sort.c:1740 +#: src/sort.c:1755 msgid "read failed" msgstr "" -#: src/sort.c:2028 +#: src/sort.c:2043 #, c-format msgid "string transformation failed" msgstr "" -#: src/sort.c:2031 +#: src/sort.c:2046 #, c-format msgid "the untransformed string was %s" msgstr "" -#: src/sort.c:2194 +#: src/sort.c:2209 #, c-format msgid "^ no match for key\n" msgstr "" -#: src/sort.c:2374 +#: src/sort.c:2389 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "" -#: src/sort.c:2380 +#: src/sort.c:2395 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "" -#: src/sort.c:2391 +#: src/sort.c:2406 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" -#: src/sort.c:2404 +#: src/sort.c:2419 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "" -#: src/sort.c:2436 +#: src/sort.c:2451 #, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" msgstr[0] "" -#: src/sort.c:2442 +#: src/sort.c:2457 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "" -#: src/sort.c:2716 src/sort.c:2725 +#: src/sort.c:2731 src/sort.c:2740 msgid "write failed" msgstr "" -#: src/sort.c:2768 +#: src/sort.c:2783 #, c-format msgid "%s: %s:%s: disorder: " msgstr "" -#: src/sort.c:2771 +#: src/sort.c:2786 msgid "standard error" msgstr "" -#: src/sort.c:3926 +#: src/sort.c:3698 +msgid "cannot read" +msgstr "" + +#: src/sort.c:3976 #, c-format msgid "%s: invalid field specification %s" msgstr "" -#: src/sort.c:3937 +#: src/sort.c:3987 #, c-format msgid "options '-%s' are incompatible" msgstr "" -#: src/sort.c:3988 +#: src/sort.c:4038 #, c-format msgid "%s: invalid count at start of %s" msgstr "" -#: src/sort.c:4245 +#: src/sort.c:4295 #, fuzzy msgid "invalid number after '-'" msgstr "%s: '%s' күні қате\n" -#: src/sort.c:4248 src/sort.c:4334 src/sort.c:4362 +#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416 #, fuzzy msgid "invalid number after '.'" msgstr "%s: '%s' күні қате\n" -#: src/sort.c:4261 src/sort.c:4367 +#: src/sort.c:4315 src/sort.c:4421 msgid "stray character in field spec" msgstr "" -#: src/sort.c:4308 +#: src/sort.c:4362 #, c-format msgid "multiple compress programs specified" msgstr "" -#: src/sort.c:4325 +#: src/sort.c:4379 msgid "invalid number at field start" msgstr "" -#: src/sort.c:4329 src/sort.c:4357 +#: src/sort.c:4383 src/sort.c:4411 msgid "field number is zero" msgstr "" -#: src/sort.c:4338 +#: src/sort.c:4392 msgid "character offset is zero" msgstr "" -#: src/sort.c:4353 +#: src/sort.c:4407 #, fuzzy msgid "invalid number after ','" msgstr "%s: '%s' күні қате\n" -#: src/sort.c:4403 +#: src/sort.c:4457 #, c-format msgid "empty tab" msgstr "" -#: src/sort.c:4496 src/wc.c:692 +#: src/sort.c:4550 src/wc.c:692 #, c-format msgid "cannot read file names from %s" msgstr "" -#: src/sort.c:4518 +#: src/sort.c:4572 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "" -#: src/sort.c:4524 +#: src/sort.c:4578 #, c-format msgid "no input from %s" msgstr "" -#: src/sort.c:4570 +#: src/sort.c:4624 #, c-format msgid "using %s sorting rules" msgstr "" -#: src/sort.c:4573 +#: src/sort.c:4627 #, c-format msgid "using simple byte comparison" msgstr "" -#: src/sort.c:4604 +#: src/sort.c:4658 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "" -#: src/split.c:184 +#: src/split.c:187 #, c-format msgid "the suffix length needs to be at least %zu" msgstr "" -#: src/split.c:201 +#: src/split.c:204 #, c-format msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" msgstr "" -#: src/split.c:205 +#: src/split.c:208 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" -"\n" msgstr "" -#: src/split.c:214 +#: src/split.c:216 #, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" @@ -7399,13 +7751,13 @@ msgid "" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" -#: src/split.c:227 +#: src/split.c:229 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" msgstr "" -#: src/split.c:234 +#: src/split.c:236 msgid "" "\n" "CHUNKS may be:\n" @@ -7417,184 +7769,189 @@ msgid "" "r/K/N likewise but only output Kth of N to stdout\n" msgstr "" -#: src/split.c:352 +#: src/split.c:354 #, c-format msgid "output file suffixes exhausted" msgstr "" -#: src/split.c:364 +#: src/split.c:366 #, c-format msgid "creating file %s\n" msgstr "" -#: src/split.c:377 +#: src/split.c:375 +#, c-format +msgid "%s would overwrite input; aborting" +msgstr "" + +#: src/split.c:391 #, c-format msgid "failed to set FILE environment variable" msgstr "" -#: src/split.c:379 +#: src/split.c:393 #, c-format msgid "executing with FILE=%s\n" msgstr "" -#: src/split.c:381 +#: src/split.c:395 #, fuzzy, c-format msgid "failed to create pipe" -msgstr "\"%s\" ашу сәтсіз аяқталды " +msgstr "%s: %s өшіру сәтсіз аяқталды\n" -#: src/split.c:395 -#, fuzzy, c-format +#: src/split.c:409 +#, c-format msgid "closing prior pipe" -msgstr "\"%s\" ашу сәтсіз аяқталды " +msgstr "" -#: src/split.c:397 -#, fuzzy, c-format +#: src/split.c:411 +#, c-format msgid "closing output pipe" -msgstr "\"%s\" ашу сәтсіз аяқталды " +msgstr "" -#: src/split.c:401 -#, fuzzy, c-format +#: src/split.c:415 +#, c-format msgid "moving input pipe" -msgstr "\"%s\" ашу сәтсіз аяқталды " +msgstr "" -#: src/split.c:403 -#, fuzzy, c-format +#: src/split.c:417 +#, c-format msgid "closing input pipe" -msgstr "\"%s\" ашу сәтсіз аяқталды " +msgstr "" -#: src/split.c:408 +#: src/split.c:422 #, fuzzy, c-format msgid "failed to run command: \"%s -c %s\"" -msgstr "\"%s\" ашу сәтсіз аяқталды " +msgstr "\"%s\" символдық сілтемесін жасау сәтсіз аяқталды" -#: src/split.c:414 +#: src/split.c:428 #, fuzzy, c-format msgid "failed to close input pipe" msgstr "\"%s\" ашу сәтсіз аяқталды " -#: src/split.c:450 +#: src/split.c:464 #, c-format msgid "waiting for child process" msgstr "" -#: src/split.c:460 +#: src/split.c:474 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "" -#: src/split.c:468 +#: src/split.c:482 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:475 src/timeout.c:449 +#: src/split.c:489 src/timeout.c:494 #, c-format msgid "unknown status from command (0x%X)" msgstr "" -#: src/split.c:1037 +#: src/split.c:1052 #, c-format msgid "cannot split in more than one way" msgstr "" -#: src/split.c:1050 src/split.c:1192 src/split.c:1363 +#: src/split.c:1065 src/split.c:1205 src/split.c:1376 #, c-format msgid "%s: invalid number of chunks" msgstr "" -#: src/split.c:1054 +#: src/split.c:1069 #, c-format msgid "%s: invalid chunk number" msgstr "" -#: src/split.c:1106 +#: src/split.c:1119 #, c-format msgid "%s: invalid suffix length" msgstr "" -#: src/split.c:1131 src/split.c:1139 src/split.c:1162 src/split.c:1167 +#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180 #, c-format msgid "%s: invalid number of bytes" msgstr "" -#: src/split.c:1150 src/split.c:1297 +#: src/split.c:1163 src/split.c:1310 #, c-format msgid "%s: invalid number of lines" msgstr "" -#: src/split.c:1223 +#: src/split.c:1236 #, c-format msgid "line count option -%s%c... is too large" msgstr "" -#: src/split.c:1235 +#: src/split.c:1248 #, c-format msgid "%s: invalid start value for numerical suffix" msgstr "" -#: src/split.c:1263 +#: src/split.c:1276 #, c-format msgid "%s: invalid IO block size" msgstr "" -#: src/split.c:1284 +#: src/split.c:1297 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1321 +#: src/split.c:1334 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1356 +#: src/split.c:1369 #, c-format msgid "%s: cannot determine file size" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/stat.c:169 +#: src/stat.c:173 msgid "Michael Meskes" msgstr "" -#: src/stat.c:838 +#: src/stat.c:857 #, c-format msgid "failed to canonicalize %s" msgstr "" -#: src/stat.c:1050 +#: src/stat.c:1069 #, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "" -#: src/stat.c:1105 +#: src/stat.c:1124 #, c-format msgid "%s: invalid directive" msgstr "" -#: src/stat.c:1151 +#: src/stat.c:1170 #, c-format msgid "warning: backslash at end of format" msgstr "" -#: src/stat.c:1182 +#: src/stat.c:1201 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" -#: src/stat.c:1189 +#: src/stat.c:1208 #, c-format msgid "cannot read file system information for %s" msgstr "" -#: src/stat.c:1209 +#: src/stat.c:1228 #, 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:1245 +#: src/stat.c:1264 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -7605,7 +7962,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1268 +#: src/stat.c:1287 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -7613,30 +7970,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1278 +#: src/stat.c:1297 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:1286 +#: src/stat.c:1305 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:1295 +#: src/stat.c:1314 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:1305 +#: src/stat.c:1324 #, c-format msgid "Context: %C\n" msgstr "" -#: src/stat.c:1313 +#: src/stat.c:1332 msgid "" "Access: %x\n" "Modify: %y\n" @@ -7644,15 +8001,17 @@ msgid "" " Birth: %w\n" msgstr "" -#: src/stat.c:1331 +#: src/stat.c:1350 +msgid "Display file or file system status.\n" +msgstr "" + +#: src/stat.c:1356 msgid "" -"Display file or file system status.\n" -"\n" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" -#: src/stat.c:1337 +#: src/stat.c:1360 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -7662,7 +8021,7 @@ msgid "" " -t, --terse print the information in terse form\n" msgstr "" -#: src/stat.c:1348 +#: src/stat.c:1371 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -7674,7 +8033,7 @@ msgid "" " %C SELinux security context string\n" msgstr "" -#: src/stat.c:1357 +#: src/stat.c:1380 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -7684,7 +8043,7 @@ msgid "" " %G group name of owner\n" msgstr "" -#: src/stat.c:1365 +#: src/stat.c:1388 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -7697,7 +8056,7 @@ msgid "" " %T minor device type in hex\n" msgstr "" -#: src/stat.c:1376 +#: src/stat.c:1399 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -7712,7 +8071,7 @@ msgid "" "\n" msgstr "" -#: src/stat.c:1390 +#: src/stat.c:1413 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -7723,7 +8082,7 @@ msgid "" " %f free blocks in file system\n" msgstr "" -#: src/stat.c:1399 +#: src/stat.c:1422 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -7742,30 +8101,29 @@ msgstr "" #: src/stdbuf.c:91 msgid "" "Run COMMAND, with modified buffering operations for its standard streams.\n" -"\n" msgstr "" -#: src/stdbuf.c:98 +#: src/stdbuf.c:97 msgid "" " -i, --input=MODE adjust standard input stream buffering\n" " -o, --output=MODE adjust standard output stream buffering\n" " -e, --error=MODE adjust standard error stream buffering\n" msgstr "" -#: src/stdbuf.c:105 +#: src/stdbuf.c:104 msgid "" "\n" "If MODE is 'L' the corresponding stream will be line buffered.\n" "This option is invalid with standard input.\n" msgstr "" -#: src/stdbuf.c:108 +#: src/stdbuf.c:107 msgid "" "\n" "If MODE is '0' the corresponding stream will be unbuffered.\n" msgstr "" -#: src/stdbuf.c:111 +#: src/stdbuf.c:110 msgid "" "\n" "Otherwise MODE is a number which may be followed by one of the following:\n" @@ -7775,7 +8133,7 @@ msgid "" "size set to MODE bytes.\n" msgstr "" -#: src/stdbuf.c:117 +#: src/stdbuf.c:116 msgid "" "\n" "NOTE: If COMMAND adjusts the buffering of its standard streams ('tee' does\n" @@ -7785,22 +8143,22 @@ msgid "" "and are thus unaffected by 'stdbuf' settings.\n" msgstr "" -#: src/stdbuf.c:227 +#: src/stdbuf.c:226 #, fuzzy, c-format msgid "failed to find %s" msgstr "\"%s\" ашу сәтсіз аяқталды " -#: src/stdbuf.c:247 src/stdbuf.c:279 +#: src/stdbuf.c:246 src/stdbuf.c:278 #, c-format msgid "failed to update the environment with %s" msgstr "" -#: src/stdbuf.c:321 +#: src/stdbuf.c:320 #, c-format msgid "line buffering stdin is meaningless" msgstr "" -#: src/stty.c:509 +#: src/stty.c:513 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -7808,23 +8166,25 @@ msgid "" " or: %s [-F DEVICE | --file=DEVICE] [-g|--save]\n" msgstr "" -#: src/stty.c:515 +#: src/stty.c:519 +msgid "Print or change terminal characteristics.\n" +msgstr "" + +#: src/stty.c:525 msgid "" -"Print or change terminal characteristics.\n" -"\n" " -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:524 +#: src/stty.c:532 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:529 +#: src/stty.c:537 msgid "" "\n" "Special characters:\n" @@ -7833,7 +8193,7 @@ msgid "" " eol CHAR CHAR will end the line\n" msgstr "" -#: src/stty.c:536 +#: src/stty.c:544 msgid "" " * eol2 CHAR alternate CHAR for ending the line\n" " erase CHAR CHAR will erase the last character typed\n" @@ -7841,7 +8201,7 @@ msgid "" " kill CHAR CHAR will erase the current line\n" msgstr "" -#: src/stty.c:542 +#: src/stty.c:550 msgid "" " * lnext CHAR CHAR will enter the next character quoted\n" " quit CHAR CHAR will send a quit signal\n" @@ -7849,7 +8209,7 @@ msgid "" " start CHAR CHAR will restart the output after stopping it\n" msgstr "" -#: src/stty.c:548 +#: src/stty.c:556 msgid "" " stop CHAR CHAR will stop the output\n" " susp CHAR CHAR will send a terminal stop signal\n" @@ -7857,7 +8217,7 @@ msgid "" " * werase CHAR CHAR will erase the last word typed\n" msgstr "" -#: src/stty.c:554 +#: src/stty.c:562 msgid "" "\n" "Special settings:\n" @@ -7866,7 +8226,7 @@ msgid "" " * columns N same as cols N\n" msgstr "" -#: src/stty.c:561 +#: src/stty.c:569 msgid "" " ispeed N set the input speed to N\n" " * line N use line discipline N\n" @@ -7875,7 +8235,7 @@ msgid "" " ospeed N set the output speed to N\n" msgstr "" -#: src/stty.c:567 +#: src/stty.c:575 msgid "" " * rows N tell the kernel that the terminal has N rows\n" " * size print the number of rows and columns according to the " @@ -7884,27 +8244,28 @@ msgid "" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" -#: src/stty.c:573 +#: src/stty.c:581 msgid "" "\n" "Control settings:\n" " [-]clocal disable modem control signals\n" " [-]cread allow input to be received\n" " * [-]crtscts enable RTS/CTS handshaking\n" +" * [-]cdtrdsr enable DTR/DSR handshaking\n" " csN set character size to N bits, N in [5..8]\n" msgstr "" -#: src/stty.c:581 +#: src/stty.c:590 msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" " [-]hupcl same as [-]hup\n" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" -" [-]parodd set odd parity (even with '-')\n" +" [-]parodd set odd parity (or even parity with '-')\n" msgstr "" -#: src/stty.c:588 +#: src/stty.c:597 msgid "" "\n" "Input settings:\n" @@ -7914,7 +8275,7 @@ msgid "" " [-]igncr ignore carriage return\n" msgstr "" -#: src/stty.c:596 +#: src/stty.c:605 msgid "" " [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" @@ -7923,11 +8284,11 @@ msgid "" " [-]istrip clear high (8th) bit of input characters\n" msgstr "" -#: src/stty.c:603 +#: src/stty.c:612 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr "" -#: src/stty.c:606 +#: src/stty.c:615 msgid "" " * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" @@ -7937,7 +8298,7 @@ msgid "" " [-]tandem same as [-]ixoff\n" msgstr "" -#: src/stty.c:614 +#: src/stty.c:623 msgid "" "\n" "Output settings:\n" @@ -7947,7 +8308,7 @@ msgid "" " * nlN newline delay style, N in [0..1]\n" msgstr "" -#: src/stty.c:622 +#: src/stty.c:631 msgid "" " * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of null characters\n" @@ -7957,7 +8318,7 @@ msgid "" " * [-]onlret newline performs a carriage return\n" msgstr "" -#: src/stty.c:630 +#: src/stty.c:639 msgid "" " * [-]onocr do not print carriage returns in the first column\n" " [-]opost postprocess output\n" @@ -7967,7 +8328,7 @@ msgid "" " * vtN vertical tab delay style, N in [0..1]\n" msgstr "" -#: src/stty.c:638 +#: src/stty.c:647 msgid "" "\n" "Local settings:\n" @@ -7976,7 +8337,7 @@ msgid "" " * -crtkill kill all line by obeying the echoctl and echok settings\n" msgstr "" -#: src/stty.c:645 +#: src/stty.c:654 msgid "" " * [-]ctlecho echo control characters in hat notation ('^c')\n" " [-]echo echo input characters\n" @@ -7985,7 +8346,7 @@ msgid "" " [-]echok echo a newline after a kill character\n" msgstr "" -#: src/stty.c:652 +#: src/stty.c:661 msgid "" " * [-]echoke same as [-]crtkill\n" " [-]echonl echo newline even if not echoing other characters\n" @@ -7994,7 +8355,7 @@ msgid "" " [-]iexten enable non-POSIX special characters\n" msgstr "" -#: src/stty.c:659 +#: src/stty.c:668 msgid "" " [-]isig enable interrupt, quit, and suspend special characters\n" " [-]noflsh disable flushing after interrupt and quit special " @@ -8004,7 +8365,7 @@ msgid "" " * [-]xcase with icanon, escape with '\\' for uppercase characters\n" msgstr "" -#: src/stty.c:666 +#: src/stty.c:675 msgid "" "\n" "Combination settings:\n" @@ -8013,7 +8374,7 @@ msgid "" " -cbreak same as icanon\n" msgstr "" -#: src/stty.c:673 +#: src/stty.c:682 msgid "" " cooked same as brkint ignpar istrip icrnl ixon opost isig\n" " icanon, eof and eol characters to their default values\n" @@ -8021,7 +8382,7 @@ msgid "" " crt same as echoe echoctl echoke\n" msgstr "" -#: src/stty.c:679 +#: src/stty.c:688 msgid "" " dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" " kill ^u\n" @@ -8030,7 +8391,7 @@ msgid "" " evenp same as parenb -parodd cs7\n" msgstr "" -#: src/stty.c:686 +#: src/stty.c:695 msgid "" " -evenp same as -parenb cs8\n" " * [-]lcase same as xcase iuclc olcuc\n" @@ -8040,7 +8401,7 @@ msgid "" " -nl same as icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" msgstr "" -#: src/stty.c:694 +#: src/stty.c:703 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -8049,7 +8410,7 @@ msgid "" " -pass8 same as parenb istrip cs7\n" msgstr "" -#: src/stty.c:701 +#: src/stty.c:710 msgid "" " raw same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" " -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n" @@ -8057,7 +8418,7 @@ msgid "" " -raw same as cooked\n" msgstr "" -#: src/stty.c:707 +#: src/stty.c:716 msgid "" " sane same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" " -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n" @@ -8067,7 +8428,7 @@ msgid "" " characters to their default values\n" msgstr "" -#: src/stty.c:715 +#: src/stty.c:724 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -8076,126 +8437,59 @@ msgid "" "127; special values ^- or undef used to disable special characters.\n" msgstr "" -#: src/stty.c:787 +#: src/stty.c:796 #, c-format msgid "only one device may be specified" msgstr "" -#: src/stty.c:817 +#: src/stty.c:826 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" "mutually exclusive" msgstr "" -#: src/stty.c:823 +#: src/stty.c:832 #, c-format msgid "when specifying an output style, modes may not be set" msgstr "" -#: src/stty.c:838 +#: src/stty.c:847 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "" -#: src/stty.c:883 src/stty.c:993 +#: src/stty.c:892 src/stty.c:1002 #, c-format msgid "invalid argument %s" msgstr "" -#: src/stty.c:894 src/stty.c:911 src/stty.c:923 src/stty.c:936 src/stty.c:948 -#: src/stty.c:968 +#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957 +#: src/stty.c:977 #, c-format msgid "missing argument to %s" msgstr "" -#: src/stty.c:974 +#: src/stty.c:983 #, c-format msgid "invalid line discipline %s" msgstr "" -#: src/stty.c:1044 +#: src/stty.c:1053 #, c-format msgid "%s: unable to perform all requested operations" msgstr "" -#: src/stty.c:1390 +#: src/stty.c:1399 #, c-format msgid "%s: no size information for this device" msgstr "" -#: src/stty.c:1904 +#: src/stty.c:1920 #, c-format msgid "invalid integer argument %s" msgstr "" -#: src/su.c:229 -msgid "Password:" -msgstr "Пароль:" - -#: src/su.c:232 -#, c-format -msgid "getpass: cannot open /dev/tty" -msgstr "" - -#: src/su.c:290 -#, c-format -msgid "cannot set groups" -msgstr "" - -#: src/su.c:294 -#, c-format -msgid "cannot set group id" -msgstr "" - -#: src/su.c:296 -#, c-format -msgid "cannot set user id" -msgstr "" - -#: src/su.c:371 -#, c-format -msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" -msgstr "" - -#: src/su.c:372 -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 "" - -#: src/su.c:384 -msgid "" -"\n" -"A mere - implies -l. If USER not given, assume root.\n" -msgstr "" - -#: src/su.c:461 -#, c-format -msgid "user %s does not exist" -msgstr "%s пайдаланушысы жоқ" - -#: src/su.c:484 -#, c-format -msgid "incorrect password" -msgstr "пароль қате" - -#: src/su.c:501 -#, c-format -msgid "using restricted shell %s" -msgstr "" - -#: src/su.c:509 -#, c-format -msgid "warning: cannot change directory to %s" -msgstr "" - #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 msgid "Kayvan Aghaiepour" @@ -8220,7 +8514,7 @@ msgstr "" msgid "ignoring all arguments" msgstr "" -#: src/system.h:340 +#: src/system.h:343 #, c-format msgid "" "\n" @@ -8229,15 +8523,21 @@ msgid "" "for details about the options it supports.\n" msgstr "" -#: src/system.h:346 +#: src/system.h:349 msgid " --help display this help and exit\n" msgstr "" -#: src/system.h:348 +#: src/system.h:351 msgid " --version output version information and exit\n" msgstr "" -#: src/system.h:541 +#: src/system.h:544 +msgid "" +"\n" +"Mandatory arguments to long options are mandatory for short options too.\n" +msgstr "" + +#: src/system.h:552 msgid "" "\n" "SIZE is an integer and optional unit (example: 10M is 10*1024*1024). Units\n" @@ -8245,7 +8545,7 @@ msgid "" "1000).\n" msgstr "" -#: src/system.h:550 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -8254,7 +8554,7 @@ msgid "" "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n" msgstr "" -#: src/system.h:560 +#: src/system.h:571 #, c-format msgid "" "\n" @@ -8265,22 +8565,22 @@ msgstr "" #. <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:574 +#: src/system.h:585 #, c-format msgid "Report %s translation bugs to <http://translationproject.org/team/>\n" msgstr "" -#: src/system.h:578 +#: src/system.h:589 #, c-format msgid "For complete documentation, run: info coreutils '%s invocation'\n" msgstr "" -#: src/system.h:585 +#: src/system.h:596 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "Көбірек білу үшін \"%s --help\" көріңіз." -#: src/system.h:617 +#: src/system.h:628 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -8299,52 +8599,51 @@ msgstr "" msgid "" "Write each FILE to standard output, last line first.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" -#: src/tac.c:145 +#: src/tac.c:144 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 "" -#: src/tac.c:235 src/tac.c:336 +#: src/tac.c:234 src/tac.c:335 #, c-format msgid "%s: seek failed" msgstr "" -#: src/tac.c:264 +#: src/tac.c:263 #, c-format msgid "record too large" msgstr "" -#: src/tac.c:451 +#: src/tac.c:450 #, fuzzy, c-format msgid "failed to create temporary file in %s" msgstr "\"%s\" символдық сілтемесін жасау сәтсіз аяқталды" -#: src/tac.c:459 +#: src/tac.c:458 #, fuzzy, c-format msgid "failed to open %s for writing" msgstr "Жазу үшін '%s' ашу сәтсіз: %s" -#: src/tac.c:476 +#: src/tac.c:475 #, fuzzy, c-format msgid "failed to rewind stream for %s" msgstr "%s: %s өшіру сәтсіз аяқталды\n" -#: src/tac.c:512 src/tac.c:519 +#: src/tac.c:511 src/tac.c:518 #, c-format msgid "%s: write error" msgstr "" -#: src/tac.c:572 +#: src/tac.c:571 #, fuzzy, c-format msgid "failed to open %s for reading" msgstr "Жазу үшін '%s' ашу сәтсіз: %s" -#: src/tac.c:630 +#: src/tac.c:629 #, c-format msgid "separator cannot be empty" msgstr "" @@ -8360,10 +8659,9 @@ 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" -"\n" msgstr "" -#: src/tail.c:271 +#: src/tail.c:270 msgid "" " -c, --bytes=K output the last K bytes; alternatively, use -c " "+K\n" @@ -8371,7 +8669,7 @@ msgid "" "file\n" msgstr "" -#: src/tail.c:275 +#: src/tail.c:274 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -8380,7 +8678,7 @@ msgid "" " -F same as --follow=name --retry\n" msgstr "" -#: src/tail.c:282 +#: src/tail.c:281 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -8394,7 +8692,7 @@ msgid "" " With inotify, this option is rarely useful.\n" msgstr "" -#: src/tail.c:295 +#: src/tail.c:294 msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" " -q, --quiet, --silent never output headers giving file names\n" @@ -8403,7 +8701,7 @@ msgid "" " name, i.e., with --follow=name\n" msgstr "" -#: src/tail.c:302 +#: src/tail.c:301 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations.\n" @@ -8412,7 +8710,7 @@ msgid "" " -v, --verbose always output headers giving file names\n" msgstr "" -#: src/tail.c:311 +#: src/tail.c:310 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -8423,7 +8721,7 @@ msgid "" "\n" msgstr "" -#: src/tail.c:320 +#: src/tail.c:319 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" @@ -8433,64 +8731,64 @@ msgid "" "named file in a way that accommodates renaming, removal and creation.\n" msgstr "" -#: src/tail.c:379 +#: src/tail.c:378 #, c-format msgid "closing %s (fd=%d)" msgstr "" -#: src/tail.c:454 +#: src/tail.c:453 #, c-format msgid "%s: cannot seek to relative offset %s" msgstr "" -#: src/tail.c:458 +#: src/tail.c:457 #, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "" -#: src/tail.c:895 +#: src/tail.c:894 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "" -#: src/tail.c:907 +#: src/tail.c:906 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" msgstr "" -#: src/tail.c:964 +#: src/tail.c:963 #, c-format msgid "%s has become inaccessible" msgstr "" -#: src/tail.c:981 +#: src/tail.c:980 #, c-format msgid "%s has been replaced with an untailable file; giving up on this name" msgstr "" -#: src/tail.c:990 +#: src/tail.c:989 #, c-format msgid "%s has been replaced with a remote file. giving up on this name" msgstr "" -#: src/tail.c:1011 +#: src/tail.c:1010 #, c-format msgid "%s has become accessible" msgstr "" -#: src/tail.c:1019 +#: src/tail.c:1018 #, c-format msgid "%s has appeared; following end of new file" msgstr "" -#: src/tail.c:1030 +#: src/tail.c:1029 #, c-format msgid "%s has been replaced; following end of new file" msgstr "" -#: src/tail.c:1131 +#: src/tail.c:1130 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "" @@ -8785,32 +9083,37 @@ msgstr "`]' жетіспейді" msgid "extra argument %s" msgstr "" -#: src/timeout.c:124 +#: src/timeout.c:112 +#, c-format +msgid "warning: sigprocmask" +msgstr "" + +#: src/timeout.c:145 #, c-format msgid "warning: timer_settime" msgstr "" -#: src/timeout.c:129 +#: src/timeout.c:150 #, c-format msgid "warning: timer_create" msgstr "" -#: src/timeout.c:204 +#: src/timeout.c:225 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" " or: %s [OPTION]\n" msgstr "" -#: src/timeout.c:208 -msgid "" -"Start COMMAND, and kill it if still running after DURATION.\n" -"\n" -"Mandatory arguments to long options are mandatory for short options too.\n" +#: src/timeout.c:229 +msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "" -#: src/timeout.c:213 +#: src/timeout.c:235 msgid "" +" --preserve-status\n" +" exit with the same status as COMMAND, even when the\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 " @@ -8825,7 +9128,7 @@ msgid "" " See 'kill -l' for a list of signals\n" msgstr "" -#: src/timeout.c:229 +#: src/timeout.c:254 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -8833,25 +9136,30 @@ msgid "" "days.\n" msgstr "" -#: src/timeout.c:234 +#: src/timeout.c:259 msgid "" "\n" -"If the command times out, then exit with status 124. Otherwise, exit\n" -"with the status of COMMAND. If no signal is specified, send the TERM\n" -"signal upon timeout. The TERM signal kills any process that does not\n" -"block or catch that signal. For other processes, it may be necessary to\n" -"use the KILL (9) signal, since this signal cannot be caught. If the\n" -"KILL (9) signal is sent, the exit status is 128+9 rather than 124.\n" +"If the command times out, and --preserve-status is not set, then exit with\n" +"status 124. Otherwise, exit with the status of COMMAND. If no signal\n" +"is specified, send the TERM signal upon timeout. The TERM signal kills\n" +"any process that does not block or catch that signal. It may be necessary\n" +"to use the KILL (9) signal, since this signal cannot be caught, in which\n" +"case the exit status is 128+9 rather than 124.\n" msgstr "" -#: src/timeout.c:419 +#: src/timeout.c:363 +#, c-format +msgid "warning: disabling core dumps failed" +msgstr "" + +#: src/timeout.c:471 #, c-format msgid "error waiting for command" msgstr "" -#: src/timeout.c:441 +#: src/timeout.c:482 #, c-format -msgid "warning: disabling core dumps failed" +msgid "the monitored command dumped core" msgstr "" #. This is a proper name. See the gettext manual, section Names. @@ -8864,22 +9172,22 @@ msgstr "" msgid "Randy Smith" msgstr "" -#: src/touch.c:115 src/touch.c:313 +#: src/touch.c:115 src/touch.c:309 #, c-format msgid "invalid date format %s" msgstr "" -#: src/touch.c:194 +#: src/touch.c:191 #, c-format msgid "cannot touch %s" msgstr "" -#: src/touch.c:200 +#: src/touch.c:197 #, c-format msgid "setting times of %s" msgstr "" -#: src/touch.c:216 +#: src/touch.c:213 msgid "" "Update the access and modification times of each FILE to the current time.\n" "\n" @@ -8888,10 +9196,9 @@ msgid "" "\n" "A FILE argument string of - is handled specially and causes touch to\n" "change the times of the file associated with standard output.\n" -"\n" msgstr "" -#: src/touch.c:229 +#: src/touch.c:225 msgid "" " -a change only the access time\n" " -c, --no-create do not create any files\n" @@ -8899,7 +9206,7 @@ msgid "" " -f (ignored)\n" msgstr "" -#: src/touch.c:235 +#: src/touch.c:231 msgid "" " -h, --no-dereference affect each symbolic link instead of any " "referenced\n" @@ -8908,27 +9215,27 @@ msgid "" " -m change only the modification time\n" msgstr "" -#: src/touch.c:241 +#: src/touch.c:237 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" -" --time=WORD change the specified time:\n" +" --time=WORD change the specified time:\n" " WORD is access, atime, or use: equivalent to -a\n" " WORD is modify or mtime: equivalent to -m\n" msgstr "" -#: src/touch.c:250 +#: src/touch.c:246 msgid "" "\n" "Note that the -d and -t options accept different time-date formats.\n" msgstr "" -#: src/touch.c:339 +#: src/touch.c:335 #, c-format msgid "cannot specify times from more than one source" msgstr "" -#: src/touch.c:413 +#: src/touch.c:409 #, c-format msgid "" "warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'" @@ -9146,25 +9453,24 @@ msgid "" "If a FILE is larger than the specified size, the extra data is lost.\n" "If a FILE is shorter, it is extended and the extended part (hole)\n" "reads as zero bytes.\n" -"\n" msgstr "" -#: src/truncate.c:110 +#: src/truncate.c:109 msgid " -c, --no-create do not create any files\n" msgstr "" -#: src/truncate.c:113 +#: src/truncate.c:112 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" -#: src/truncate.c:116 +#: 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" msgstr "" -#: src/truncate.c:122 +#: src/truncate.c:121 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -9172,57 +9478,57 @@ msgid "" "'/' round down to multiple of, '%' round up to multiple of.\n" msgstr "" -#: src/truncate.c:150 +#: src/truncate.c:149 #, c-format msgid "overflow in %<PRIdMAX> * %<PRIdMAX> byte blocks for file %s" msgstr "" -#: src/truncate.c:174 +#: src/truncate.c:173 #, c-format msgid "%s has unusable, apparently negative size" msgstr "" -#: src/truncate.c:184 src/truncate.c:379 +#: src/truncate.c:183 src/truncate.c:384 #, c-format msgid "cannot get the size of %s" msgstr "" -#: src/truncate.c:206 +#: src/truncate.c:205 #, c-format msgid "overflow rounding up size of file %s" msgstr "" -#: src/truncate.c:216 +#: src/truncate.c:215 #, c-format msgid "overflow extending size of file %s" msgstr "" -#: src/truncate.c:231 +#: src/truncate.c:230 #, c-format msgid "failed to truncate %s at %<PRIdMAX> bytes" msgstr "" -#: src/truncate.c:305 +#: src/truncate.c:303 #, c-format msgid "multiple relative modifiers specified" msgstr "" -#: src/truncate.c:335 +#: src/truncate.c:333 #, c-format msgid "you must specify either %s or %s" msgstr "" -#: src/truncate.c:342 +#: src/truncate.c:340 #, c-format msgid "you must specify a relative %s with %s" msgstr "" -#: src/truncate.c:349 +#: src/truncate.c:347 #, c-format msgid "%s was specified but %s was not" msgstr "" -#: src/truncate.c:400 +#: src/truncate.c:404 #, c-format msgid "cannot open %s for writing" msgstr "" @@ -9298,10 +9604,9 @@ msgstr "" msgid "" "Convert blanks in each FILE to tabs, writing to standard output.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" -#: src/unexpand.c:125 +#: src/unexpand.c:124 msgid "" " -a, --all convert all blanks, instead of just initial blanks\n" " --first-only convert only leading sequences of blanks (overrides -a)\n" @@ -9309,12 +9614,12 @@ msgid "" " -t, --tabs=LIST use comma separated LIST of tab positions (enables -a)\n" msgstr "" -#: src/unexpand.c:153 +#: src/unexpand.c:152 #, c-format msgid "tabs are too far apart" msgstr "" -#: src/unexpand.c:505 +#: src/unexpand.c:504 #, c-format msgid "tab stop value is too large" msgstr "" @@ -9330,16 +9635,15 @@ msgid "" "writing to OUTPUT (or standard output).\n" "\n" "With no options, matching lines are merged to the first occurrence.\n" -"\n" msgstr "" -#: src/uniq.c:148 +#: src/uniq.c:147 msgid "" " -c, --count prefix lines by the number of occurrences\n" " -d, --repeated only print duplicate lines\n" msgstr "" -#: src/uniq.c:152 +#: src/uniq.c:151 msgid "" " -D, --all-repeated[=delimit-method] print all duplicate lines\n" " delimit-method={none(default),prepend,separate}\n" @@ -9351,18 +9655,18 @@ msgid "" " -z, --zero-terminated end lines with 0 byte, not newline\n" msgstr "" -#: src/uniq.c:162 +#: src/uniq.c:161 msgid " -w, --check-chars=N compare no more than N characters in lines\n" msgstr "" -#: src/uniq.c:167 +#: src/uniq.c:166 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:172 +#: src/uniq.c:171 msgid "" "\n" "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n" @@ -9370,24 +9674,24 @@ msgid "" "Also, comparisons honor the rules specified by 'LC_COLLATE'.\n" msgstr "" -#: src/uniq.c:359 +#: src/uniq.c:358 #, c-format msgid "too many repeated lines" msgstr "" -#: src/uniq.c:522 +#: src/uniq.c:521 msgid "invalid number of fields to skip" msgstr "" -#: src/uniq.c:531 +#: src/uniq.c:530 msgid "invalid number of bytes to skip" msgstr "" -#: src/uniq.c:540 +#: src/uniq.c:539 msgid "invalid number of bytes to compare" msgstr "" -#: src/uniq.c:559 +#: src/uniq.c:558 #, c-format msgid "printing all duplicated lines and repeat counts is meaningless" msgstr "" @@ -9437,6 +9741,11 @@ msgid_plural "up %ld days %2d:%02d, " msgstr[0] "" msgstr[1] "" +#: src/uptime.c:149 +#, c-format +msgid "up %2d:%02d, " +msgstr "" + #: src/uptime.c:151 #, c-format msgid "%lu user" @@ -9510,95 +9819,95 @@ msgstr "" msgid " old " msgstr "Ескі" -#: src/who.c:449 +#: src/who.c:440 msgid "system boot" msgstr "" -#: src/who.c:456 src/who.c:458 +#: src/who.c:447 src/who.c:449 #, fuzzy msgid "id=" msgstr "Id" -#: src/who.c:471 src/who.c:476 +#: src/who.c:462 src/who.c:467 #, fuzzy msgid "term=" msgstr "Аяқтау" -#: src/who.c:473 src/who.c:477 +#: src/who.c:464 src/who.c:468 #, fuzzy msgid "exit=" msgstr "шығу" -#: src/who.c:494 +#: src/who.c:485 #, fuzzy msgid "LOGIN" msgstr "Тіркелгі" -#: src/who.c:514 +#: src/who.c:505 msgid "clock change" msgstr "" -#: src/who.c:526 src/who.c:527 +#: src/who.c:517 src/who.c:518 msgid "run-level" msgstr "" -#: src/who.c:530 src/who.c:531 +#: src/who.c:521 src/who.c:522 #, fuzzy msgid "last=" msgstr "_Соңғы" -#: src/who.c:562 +#: src/who.c:553 #, c-format msgid "" "\n" "# users=%lu\n" msgstr "" -#: src/who.c:568 +#: src/who.c:559 #, fuzzy msgid "NAME" msgstr "АТЫ" -#: src/who.c:568 +#: src/who.c:559 #, fuzzy msgid "LINE" msgstr "Жол" -#: src/who.c:568 +#: src/who.c:559 #, fuzzy msgid "TIME" msgstr "Уақыт" -#: src/who.c:568 +#: src/who.c:559 #, fuzzy msgid "IDLE" msgstr "Іссіз" -#: src/who.c:569 +#: src/who.c:560 #, fuzzy msgid "PID" msgstr "PID" -#: src/who.c:569 +#: src/who.c:560 #, fuzzy msgid "COMMENT" msgstr "Түсіндірме: %s" -#: src/who.c:569 +#: src/who.c:560 #, fuzzy msgid "EXIT" msgstr "шығу" -#: src/who.c:649 +#: src/who.c:640 #, c-format msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n" msgstr "" -#: src/who.c:650 +#: src/who.c:641 msgid "Print information about users who are currently logged in.\n" msgstr "" -#: src/who.c:653 +#: src/who.c:644 msgid "" "\n" " -a, --all same as -b -d --login -p -r -t -T -u\n" @@ -9607,18 +9916,18 @@ msgid "" " -H, --heading print line of column headings\n" msgstr "" -#: src/who.c:660 +#: src/who.c:651 msgid " -l, --login print system login processes\n" msgstr "" -#: src/who.c:663 +#: src/who.c:654 msgid "" " --lookup attempt to canonicalize hostnames via DNS\n" " -m only hostname and user associated with stdin\n" " -p, --process print active processes spawned by init\n" msgstr "" -#: src/who.c:668 +#: src/who.c:659 msgid "" " -q, --count all login names and number of users logged on\n" " -r, --runlevel print current runlevel\n" @@ -9626,7 +9935,7 @@ msgid "" " -t, --time print last system clock change\n" msgstr "" -#: src/who.c:674 +#: src/who.c:665 msgid "" " -T, -w, --mesg add user's message status as +, - or ?\n" " -u, --users list users logged in\n" @@ -9634,7 +9943,7 @@ msgid "" " --writable same as -T\n" msgstr "" -#: src/who.c:682 +#: src/who.c:673 #, c-format msgid "" "\n" @@ -9666,3 +9975,28 @@ msgid "" "Repeatedly output a line with all specified STRING(s), or 'y'.\n" "\n" msgstr "" + +#, fuzzy +#~ msgid "reading %s" +#~ msgstr "Оқуда" + +#, fuzzy +#~ msgid "writing %s" +#~ msgstr "Жазуда" + +#, fuzzy +#~ msgid "closing %s" +#~ msgstr "Жабылуда %s" + +#, fuzzy +#~ msgid "opening %s" +#~ msgstr "%s ашу" + +#~ msgid "Password:" +#~ msgstr "Пароль:" + +#~ msgid "user %s does not exist" +#~ msgstr "%s пайдаланушысы жоқ" + +#~ msgid "incorrect password" +#~ msgstr "пароль қате" diff --git a/po/ko.gmo b/po/ko.gmo index 20328578..09a26396 100644 Binary files a/po/ko.gmo and b/po/ko.gmo differ diff --git a/po/ko.po b/po/ko.po index 779fae3d..7721c963 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: 2012-05-10 19:35+0200\n" +"POT-Creation-Date: 2013-02-14 15:56+0000\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,19 +35,19 @@ msgstr "올바른 인자는:" msgid "error closing file" msgstr "파일 `%s'을(를) 만듦\n" -#: lib/closeout.c:112 src/base64.c:109 src/base64.c:121 src/base64.c:127 -#: src/base64.c:168 src/base64.c:224 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:330 src/expand.c:355 src/head.c:298 -#: src/head.c:348 src/head.c:756 src/head.c:797 src/mktemp.c:350 src/od.c:919 -#: src/paste.c:160 src/shuf.c:369 src/split.c:727 src/split.c:964 -#: src/split.c:969 src/tail.c:350 src/tail.c:1201 src/tail.c:1307 +#: 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 -#: src/unexpand.c:427 src/unexpand.c:443 +#: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "쓰기 오류" -#: lib/copy-acl.c:611 src/copy.c:1160 src/copy.c:2602 +#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617 #, fuzzy, c-format msgid "preserving permissions for %s" msgstr "%s의 허가를 바꿀 수 없습니다" @@ -245,18 +245,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:483 +#: lib/mkdir-p.c:196 src/install.c:484 #, c-format msgid "cannot change permissions of %s" msgstr "%s의 허가를 바꿀 수 없습니다" -#: lib/mkdir-p.c:206 src/copy.c:2261 src/install.c:709 src/install.c:722 +#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722 #, 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:915 src/tac.c:435 +#: src/split.c:929 src/tac.c:434 #, c-format msgid "memory exhausted" msgstr "메모리가 바닥남" @@ -305,81 +305,81 @@ msgstr "'" msgid "%s: end of file" msgstr "%s: 읽기 오류" -#: lib/regcomp.c:130 +#: lib/regcomp.c:131 msgid "Success" msgstr "" -#: lib/regcomp.c:133 +#: lib/regcomp.c:134 msgid "No match" msgstr "" -#: lib/regcomp.c:136 +#: lib/regcomp.c:137 #, fuzzy msgid "Invalid regular expression" msgstr "%s: 부적절한 정규식: %s" -#: lib/regcomp.c:139 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "" -#: lib/regcomp.c:142 +#: lib/regcomp.c:143 #, fuzzy msgid "Invalid character class name" msgstr "부적절한 문자 클래스 `%s'" -#: lib/regcomp.c:145 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "" -#: lib/regcomp.c:148 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "" -#: lib/regcomp.c:151 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "" -#: lib/regcomp.c:154 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "" -#: lib/regcomp.c:157 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "" -#: lib/regcomp.c:160 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "" -#: lib/regcomp.c:163 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "" -#: lib/regcomp.c:166 +#: lib/regcomp.c:167 #, fuzzy msgid "Memory exhausted" msgstr "메모리가 바닥남" -#: lib/regcomp.c:169 +#: lib/regcomp.c:170 #, fuzzy msgid "Invalid preceding regular expression" msgstr "%s: 부적절한 정규식: %s" -#: lib/regcomp.c:172 +#: lib/regcomp.c:173 #, fuzzy msgid "Premature end of regular expression" msgstr "정규식 탐색에 오류 발생" -#: lib/regcomp.c:175 +#: lib/regcomp.c:176 #, fuzzy msgid "Regular expression too big" msgstr "정규식 탐색에 오류 발생" -#: lib/regcomp.c:178 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:703 +#: lib/regcomp.c:704 #, fuzzy msgid "No previous regular expression" msgstr "정규식 탐색에 오류 발생" @@ -419,7 +419,7 @@ msgstr "^[yY]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-mode-acl.c:695 src/copy.c:2284 src/cp.c:518 +#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516 #, fuzzy, c-format msgid "setting permissions for %s" msgstr "%s의 허가를 바꿀 수 없습니다" @@ -567,13 +567,13 @@ msgstr "파일 열기 실패" msgid "Resource lost" msgstr "" -#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262 -#: lib/spawn-pipe.c:265 +#: 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:232 lib/spawn-pipe.c:346 lib/wait-process.c:282 +#: 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" @@ -589,25 +589,25 @@ msgstr "" msgid "Unknown signal %d" msgstr "" -#: lib/unicodeio.c:103 +#: lib/unicodeio.c:102 msgid "iconv function not usable" msgstr "iconv 함수를 사용할 수 없습니다" # not usable과 not available의 차이는? -#: lib/unicodeio.c:105 +#: lib/unicodeio.c:104 msgid "iconv function not available" msgstr "iconv 함수를 사용할 수 없습니다" -#: lib/unicodeio.c:112 +#: lib/unicodeio.c:111 msgid "character out of range" msgstr "범위를 벗어난 문자" -#: lib/unicodeio.c:182 +#: lib/unicodeio.c:181 #, c-format msgid "cannot convert U+%04X to local character set" msgstr "U+%04X을(를) 로칼 문자셋으로 변환할 수 없습니다" -#: lib/unicodeio.c:184 +#: lib/unicodeio.c:183 #, c-format msgid "cannot convert U+%04X to local character set: %s" msgstr "U+%04X을(를) 로칼 문자셋으로 변환할 수 없습니다: %s" @@ -768,7 +768,7 @@ msgstr "" "\n" "<%s>(으)로 버그를 알려 주십시오.\n" -#: lib/version-etc.c:251 src/system.h:562 +#: lib/version-etc.c:251 src/system.h:573 #, c-format msgid "%s home page: <%s>\n" msgstr "" @@ -778,7 +778,7 @@ msgstr "" msgid "%s home page: <http://www.gnu.org/software/%s/>\n" msgstr "" -#: lib/version-etc.c:256 src/system.h:563 +#: lib/version-etc.c:256 src/system.h:574 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" @@ -865,14 +865,17 @@ msgid "Simon Josefsson" msgstr "" #: src/base64.c:60 -#, c-format +#, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" "Base64 encode or decode FILE, or standard input, to standard output.\n" -"\n" msgstr "" +"사용법: %s [<옵션>] [<파일>]...\n" +" 혹은: %s [<옵션>] --check [<파일>]\n" +"%s (%d비트) 체크섬을 표시하거나 검사합니다.\n" +"<파일>이 주어지지 않거나, <파일>이 `-'이면, 표준 입력을 읽습니다.\n" -#: src/base64.c:64 +#: src/base64.c:67 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -882,7 +885,7 @@ msgid "" "\n" msgstr "" -#: src/base64.c:73 src/cat.c:110 src/fmt.c:293 src/shuf.c:71 src/sum.c:70 +#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -890,7 +893,7 @@ msgstr "" "\n" "<파일>이 주어지지 않거나 - 이면 표준 입력을 읽습니다.\n" -#: src/base64.c:76 +#: src/base64.c:79 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -899,37 +902,37 @@ msgid "" "from any other non-alphabet bytes in the encoded stream.\n" msgstr "" -#: src/base64.c:171 src/base64.c:208 src/csplit.c:263 src/csplit.c:1435 -#: src/join.c:451 src/shuf.c:157 src/shuf.c:361 src/tac-pipe.c:74 +#: 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 #, c-format msgid "read error" msgstr "읽기 오류" -#: src/base64.c:227 +#: src/base64.c:230 #, fuzzy, c-format msgid "invalid input" msgstr "부적절한 숫자" -#: src/base64.c:264 +#: src/base64.c:267 #, fuzzy, c-format msgid "invalid wrap size: %s" msgstr "부적절한 타입의 문자열 `%s'" -#: src/base64.c:283 src/basename.c:173 src/comm.c:435 src/cp.c:607 -#: src/date.c:441 src/dircolors.c:447 src/du.c:894 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:169 src/install.c:929 src/join.c:961 -#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:157 src/mv.c:447 -#: src/od.c:1802 src/ptx.c:2081 src/readlink.c:154 src/seq.c:408 -#: src/shuf.c:320 src/shuf.c:339 src/sort.c:4477 src/split.c:1313 -#: src/tr.c:1797 src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:454 -#: src/uniq.c:471 src/unlink.c:81 src/uptime.c:250 src/users.c:146 -#: src/wc.c:666 src/who.c:836 src/whoami.c:79 +#: 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 msgid "extra operand %s" msgstr "불필요한 피연산자 `%s'" -#: src/base64.c:315 src/cat.c:781 +#: src/base64.c:318 src/cat.c:781 #, fuzzy, c-format msgid "closing standard input" msgstr "표준 입력" @@ -937,15 +940,15 @@ 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/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:53 src/env.c:33 +#: 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/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:65 src/su.c:88 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 +#: 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 그리고 David MacKenzie" @@ -963,17 +966,16 @@ msgstr "" msgid "" "Print NAME with any leading directory components removed.\n" "If specified, also remove a trailing SUFFIX.\n" -"\n" msgstr "" -#: src/basename.c:59 +#: 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" msgstr "" -#: src/basename.c:66 +#: src/basename.c:67 #, c-format msgid "" "\n" @@ -984,20 +986,21 @@ msgid "" " %s -a any/str1 any/str2 -> \"str1\" followed by \"str2\"\n" msgstr "" -#: src/basename.c:167 src/chcon.c:531 src/chgrp.c:277 src/chmod.c:526 -#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1369 +#: 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:183 src/mkfifo.c:108 src/mknod.c:146 src/nohup.c:111 -#: src/pathchk.c:148 src/printf.c:674 src/readlink.c:146 src/realpath.c:236 -#: src/rm.c:314 src/rmdir.c:223 src/seq.c:402 src/setuidgid.c:137 -#: src/sleep.c:119 src/stat.c:1476 src/stdbuf.c:346 src/tr.c:1782 +#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 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 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:52 src/split.c:49 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/split.c:49 msgid "Torbjorn Granlund" msgstr "" @@ -1008,8 +1011,8 @@ msgstr "" msgid "Richard M. Stallman" msgstr "Torbjorn Granlund 그리고 Richard M. Stallman" -#: src/cat.c:88 src/df.c:846 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4720 src/nl.c:182 src/paste.c:435 src/pr.c:2768 src/sum.c:58 +#: 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/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" @@ -1062,7 +1065,7 @@ msgstr "" msgid "cannot do ioctl on %s" msgstr "`%s'에서 ioctl을 할 수 없습니다" -#: src/cat.c:637 src/dd.c:2209 src/sort.c:379 src/tee.c:165 src/yes.c:86 +#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86 #, c-format msgid "standard output" msgstr "표준 출력" @@ -1079,7 +1082,7 @@ 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:55 src/head.c:46 src/hostid.c:33 +#: 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 @@ -1087,7 +1090,7 @@ msgstr "" msgid "Jim Meyering" msgstr "Mike Haertel 그리고 Paul Eggert" -#: src/chcon.c:100 src/runcon.c:203 src/runcon.c:234 +#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238 #, fuzzy, c-format msgid "failed to create security context: %s" msgstr "%s의 시간을 유지합니다" @@ -1097,8 +1100,8 @@ msgstr "%s의 시간을 유지합니다" msgid "failed to set %s security context component to %s" msgstr "" -#: src/chcon.c:156 src/chcon.c:540 src/copy.c:2222 src/runcon.c:217 -#: src/stat.c:683 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221 +#: src/stat.c:702 #, fuzzy, c-format msgid "failed to get security context of %s" msgstr "%s의 시간을 유지합니다" @@ -1114,12 +1117,12 @@ 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:446 src/ls.c:2981 +#: src/du.c:457 src/ls.c:2981 #, 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:426 +#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437 #, fuzzy, c-format msgid "cannot read directory %s" msgstr "%s 디렉토리를 만들 수 없습니다" @@ -1129,13 +1132,13 @@ 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:599 +#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562 #, fuzzy, c-format msgid "fts_read failed" msgstr "파일 읽기 실패" -#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:618 -#: src/remove.c:613 +#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642 +#: src/remove.c:576 #, fuzzy, c-format msgid "fts_close failed" msgstr "파일 닫기 실패" @@ -1156,10 +1159,9 @@ msgid "" "Change the security context of each FILE to CONTEXT.\n" "With --reference, change the security context of each FILE to that of " "RFILE.\n" -"\n" msgstr "" -#: src/chcon.c:362 src/chgrp.c:123 src/chown.c:94 +#: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94 msgid "" " --dereference affect the referent of each symbolic link (this is\n" " the default), rather than the symbolic link itself\n" @@ -1167,7 +1169,7 @@ msgid "" "file\n" msgstr "" -#: src/chcon.c:367 +#: src/chcon.c:369 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" @@ -1175,22 +1177,28 @@ msgid "" " -l, --range=RANGE set range RANGE in the target security context\n" msgstr "" -#: src/chcon.c:373 +#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 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 msgid "" " --reference=RFILE use RFILE's security context rather than " "specifying\n" " a CONTEXT value\n" msgstr "" -#: src/chcon.c:377 src/chgrp.c:140 src/chown.c:118 +#: 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:380 +#: src/chcon.c:386 msgid " -v, --verbose output a diagnostic for every file processed\n" msgstr "" -#: src/chcon.c:383 src/chgrp.c:143 src/chown.c:121 +#: src/chcon.c:389 src/chgrp.c:143 src/chown.c:121 msgid "" "\n" "The following options modify how a hierarchy is traversed when the -R\n" @@ -1205,36 +1213,36 @@ msgid "" "\n" msgstr "" -#: src/chcon.c:512 src/chgrp.c:264 src/chown.c:267 +#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267 #, c-format msgid "-R --dereference requires either -H or -L" msgstr "" -#: src/chcon.c:518 +#: src/chcon.c:524 #, c-format msgid "-R -h requires -P" msgstr "" -#: src/chcon.c:533 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282 -#: src/comm.c:429 src/csplit.c:1371 src/join.c:1149 src/link.c:79 -#: src/mknod.c:148 src/setuidgid.c:139 src/tr.c:1785 +#: 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 msgid "missing operand after %s" msgstr "%s: `%c' 뒤에 정수가 와야함" -#: src/chcon.c:556 src/runcon.c:247 +#: src/chcon.c:562 src/runcon.c:251 #, fuzzy, c-format msgid "invalid context: %s" msgstr "부적절한 폭 옵션 `%s'" -#: src/chcon.c:563 +#: src/chcon.c:569 #, c-format msgid "conflicting security context specifiers given" msgstr "" -#: src/chcon.c:572 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:433 src/cp.c:493 -#: src/mv.c:96 src/pwd.c:273 src/rm.c:324 src/touch.c:351 +#: 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 #, fuzzy, c-format msgid "failed to get attributes of %s" msgstr "%s의 시간을 유지합니다" @@ -1278,12 +1286,6 @@ msgstr "" " --help 이 도움말을 표시하고 종료합니다\n" " --version 버전 정보를 표시하고 종료합니다\n" -#: src/chgrp.c:132 src/chmod.c:387 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/chgrp.c:136 msgid "" " --reference=RFILE use RFILE's group rather than specifying a\n" @@ -1508,7 +1510,7 @@ msgstr "" msgid "Roland McGrath" msgstr "" -#: src/chroot.c:97 src/install.c:575 src/setuidgid.c:110 src/setuidgid.c:120 +#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120 #, fuzzy, c-format msgid "invalid group %s" msgstr "잘못된 그룹" @@ -1570,8 +1572,8 @@ msgstr "사용자와 그룹을 모두 생략할 수는 없습니다" msgid "failed to set user-ID" msgstr "" -#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:213 src/stdbuf.c:366 -#: src/timeout.c:402 +#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365 +#: src/timeout.c:454 #, fuzzy, c-format msgid "failed to run command %s" msgstr "%s의 시간을 유지합니다" @@ -1676,19 +1678,23 @@ msgstr "" msgid "empty %s not allowed" msgstr "" -#: src/copy.c:168 src/dd.c:1609 src/dd.c:1976 -#, fuzzy, c-format -msgid "reading %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 +#, c-format +msgid "error reading %s" msgstr "%s을(를) 읽는 도중 오류 발생" -#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:426 +#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425 #, fuzzy, c-format msgid "cannot lseek %s" msgstr "%s: 오프셋 %s%s로(으로) 갈 수 없습니다" -#: src/copy.c:206 src/dd.c:2039 src/dd.c:2102 -#, fuzzy, c-format -msgid "writing %s" +#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151 +#, c-format +msgid "error writing %s" msgstr "%s에 쓰는 도중 오류 발생" #: src/copy.c:313 @@ -1711,7 +1717,7 @@ msgstr "%s의 시간을 유지합니다" msgid "clearing permissions for %s" msgstr "%s의 허가를 바꿀 수 없습니다" -#: src/copy.c:697 src/copy.c:2470 src/cp.c:331 +#: src/copy.c:697 src/copy.c:2480 src/cp.c:329 #, fuzzy, c-format msgid "failed to preserve ownership for %s" msgstr "%s의 소유권을 유지합니다" @@ -1726,14 +1732,14 @@ msgstr "%s의 시간을 유지합니다" msgid "failed to preserve authorship for %s" msgstr "%s의 소유권을 유지합니다" -#: src/copy.c:804 src/csplit.c:638 src/du.c:901 src/fmt.c:449 src/head.c:847 -#: src/sort.c:4489 src/split.c:1329 src/tail.c:1756 src/wc.c:678 +#: 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 #, fuzzy, c-format msgid "cannot open %s for reading" msgstr "`%s'를 `%s'로 이동할 수 없습니다" -#: src/copy.c:810 src/copy.c:972 src/dd.c:1546 src/dd.c:2114 src/dd.c:2252 -#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:141 +#: 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 #, fuzzy, c-format msgid "cannot fstat %s" msgstr "`%s'의 정보(stat)를 얻을 수 없습니다" @@ -1753,14 +1759,14 @@ msgstr "" msgid "failed to set the security context of %s to %s" msgstr "%s의 그룹을 %s로 바꾸는데 실패했습니다\n" -#: src/copy.c:881 src/copy.c:1574 src/copy.c:1777 src/copy.c:1935 src/ln.c:314 -#: src/remove.c:267 src/remove.c:293 src/remove.c:444 src/remove.c:465 +#: 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 "%s 디렉토리를 만들 수 없습니다" -#: src/copy.c:886 src/copy.c:1578 src/copy.c:1772 src/copy.c:1940 -#: src/remove.c:418 +#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945 +#: src/remove.c:375 #, fuzzy, c-format msgid "removed %s\n" msgstr "%s를 지웁니다\n" @@ -1780,186 +1786,186 @@ msgstr "임시 파일을 만들 수 없습니다" msgid "failed to clone %s from %s" msgstr "%s의 그룹을 %s로 바꾸는데 실패했습니다\n" -#: src/copy.c:1098 src/copy.c:2531 +#: src/copy.c:1098 src/copy.c:2541 #, c-format msgid "preserving times for %s" msgstr "%s의 시간을 유지합니다" -#: src/copy.c:1170 src/copy.c:1176 src/head.c:855 src/touch.c:175 -#: src/truncate.c:413 +#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172 +#: src/truncate.c:417 #, fuzzy, c-format -msgid "closing %s" -msgstr "%s(fd=%d)을(를) 닫습니다 " +msgid "failed to close %s" +msgstr "%s의 시간을 유지합니다" -#: src/copy.c:1466 +#: src/copy.c:1471 #, fuzzy, c-format msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? " msgstr "%s: `%s'에 모드 %04lo으로 겹쳐쓰겠습니까? " -#: src/copy.c:1473 +#: src/copy.c:1478 #, fuzzy, c-format msgid "%s: overwrite %s? " msgstr "%s: `%s'를 겹쳐씁니까? " -#: src/copy.c:1542 +#: src/copy.c:1547 #, c-format msgid " (backup: %s)" msgstr " (백업: %s)" -#: src/copy.c:1552 +#: src/copy.c:1557 #, c-format msgid "failed to restore the default file creation context" msgstr "" -#: src/copy.c:1584 +#: src/copy.c:1589 #, fuzzy, c-format msgid "cannot create hard link %s to %s" msgstr "%s 디렉토리를 만들 수 없습니다" -#: src/copy.c:1637 src/copy.c:1689 src/copy.c:2272 src/copy.c:2589 +#: 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:1220 src/truncate.c:365 +#: src/stat.c:1239 src/truncate.c:363 #, fuzzy, c-format msgid "cannot stat %s" msgstr "%s 디렉토리를 만들 수 없습니다" -#: src/copy.c:1645 +#: src/copy.c:1650 #, fuzzy, c-format msgid "omitting directory %s" msgstr "%s 디렉토리를 만들 수 없습니다" -#: src/copy.c:1659 +#: src/copy.c:1664 #, c-format msgid "warning: source file %s specified more than once" msgstr "" -#: src/copy.c:1707 src/ln.c:246 +#: src/copy.c:1712 src/ln.c:246 #, fuzzy, c-format msgid "%s and %s are the same file" msgstr "`%s'와 `%s'는 같은 파일입니다" -#: src/copy.c:1806 +#: src/copy.c:1811 #, fuzzy, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "%s 디렉토리로 chdir할 수 없습니다" -#: src/copy.c:1824 src/ln.c:214 +#: src/copy.c:1829 src/ln.c:214 #, fuzzy, c-format msgid "will not overwrite just-created %s with %s" msgstr "%s: 디렉토리가 아닌 곳에 디렉토리를 겹쳐쓸 수 없습니다" -#: src/copy.c:1842 +#: src/copy.c:1847 #, fuzzy, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "%s 디렉토리를 만들 수 없습니다" -#: src/copy.c:1856 +#: src/copy.c:1861 #, fuzzy, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "%s 디렉토리로 chdir할 수 없습니다" -#: src/copy.c:1886 +#: src/copy.c:1891 #, fuzzy, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "`%s'의 백업은 원래 파일을 손상할 것입니다; `%s'는 이동되지 않습니다" -#: src/copy.c:1887 +#: src/copy.c:1892 #, fuzzy, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "`%s'의 백업은 원래 파일을 손상할 것입니다; `%s'는 복사되지 않습니다" -#: src/copy.c:1910 src/ln.c:276 +#: src/copy.c:1915 src/ln.c:276 #, fuzzy, c-format msgid "cannot backup %s" msgstr "`%s'를 백업할 수 없습니다" -#: src/copy.c:1974 +#: src/copy.c:1979 #, fuzzy, c-format msgid "will not copy %s through just-created symlink %s" msgstr "%s: 디렉토리가 아닌 곳에 디렉토리를 겹쳐쓸 수 없습니다" -#: src/copy.c:2051 +#: src/copy.c:2056 #, fuzzy, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "%s 디렉토리를 만들 수 없습니다" -#: src/copy.c:2068 +#: src/copy.c:2073 #, fuzzy, c-format msgid "will not create hard link %s to directory %s" msgstr "%s 디렉토리로 chdir할 수 없습니다" -#: src/copy.c:2118 +#: src/copy.c:2123 #, fuzzy, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "%s 디렉토리로 chdir할 수 없습니다" -#: src/copy.c:2161 +#: src/copy.c:2166 #, fuzzy, c-format msgid "cannot move %s to %s" msgstr "`%s'에서 ioctl을 할 수 없습니다" -#: src/copy.c:2173 +#: src/copy.c:2178 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" -#: src/copy.c:2207 src/install.c:905 src/mkdir.c:189 src/mkfifo.c:114 -#: src/mknod.c:167 +#: 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:2241 +#: src/copy.c:2246 #, fuzzy, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "%s: 심볼릭 링크의 사이클은 복사할 수 없습니다" -#: src/copy.c:2350 +#: src/copy.c:2355 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "%s: 현재 디렉토리 안에서만 상대적인 심볼릭 링크를 만들 수 있습니다" -#: src/copy.c:2357 +#: src/copy.c:2362 #, fuzzy, c-format msgid "cannot create symbolic link %s to %s" msgstr "%s 디렉토리를 만들 수 없습니다" -#: src/copy.c:2406 src/mkfifo.c:133 +#: src/copy.c:2416 src/mkfifo.c:132 #, fuzzy, c-format msgid "cannot create fifo %s" msgstr "%s 디렉토리를 만들 수 없습니다" -#: src/copy.c:2415 +#: src/copy.c:2425 #, fuzzy, c-format msgid "cannot create special file %s" msgstr "문자 특수 파일" -#: src/copy.c:2426 src/ls.c:3191 src/stat.c:902 +#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921 #, fuzzy, c-format msgid "cannot read symbolic link %s" msgstr "심볼릭 링크" -#: src/copy.c:2453 +#: src/copy.c:2463 #, fuzzy, c-format msgid "cannot create symbolic link %s" msgstr "%s 디렉토리를 만들 수 없습니다" -#: src/copy.c:2485 +#: src/copy.c:2495 #, fuzzy, c-format msgid "%s has unknown file type" msgstr "%s: 알 수 없는 파일형" -#: src/copy.c:2629 src/ln.c:358 +#: src/copy.c:2644 src/ln.c:358 #, fuzzy, c-format msgid "cannot un-backup %s" msgstr "`%s'의 백업을 되돌릴 수 없습니다" -#: src/copy.c:2633 +#: src/copy.c:2648 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (백업 해제)\n" -#: src/cp.c:156 src/mv.c:284 +#: src/cp.c:156 src/mv.c:286 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -1971,23 +1977,10 @@ msgstr "" " 또는: %s -d [OPTION]... --target-directory=DIRECTORY SOURCE...\n" #: src/cp.c:162 -msgid "" -"Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" -"\n" +msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" msgstr "" -#: src/cp.c:166 src/csplit.c:1458 src/cut.c:197 src/df.c:852 src/du.c:268 -#: src/expand.c:112 src/fmt.c:275 src/fold.c:75 src/head.c:115 -#: src/install.c:612 src/kill.c:86 src/ln.c:392 src/ls.c:4726 src/mkdir.c:61 -#: src/mkfifo.c:56 src/mknod.c:58 src/mv.c:294 src/nl.c:191 src/paste.c:445 -#: src/pr.c:2777 src/ptx.c:1825 src/shred.c:153 src/shuf.c:58 src/sort.c:399 -#: src/split.c:211 src/stdbuf.c:95 src/tac.c:142 src/tail.c:268 -#: src/touch.c:226 src/truncate.c:107 src/unexpand.c:122 src/uniq.c:145 -msgid "" -"Mandatory arguments to long options are mandatory for short options too.\n" -msgstr "긴 옵션에서 꼭 필요한 인수는 짧은 옵션에도 꼭 필요합니다.\n" - -#: src/cp.c:169 +#: src/cp.c:168 msgid "" " -a, --archive same as -dR --preserve=all\n" " --attributes-only don't copy the file data, just the " @@ -2001,32 +1994,33 @@ msgid "" " -d same as --no-dereference --preserve=links\n" msgstr "" -#: src/cp.c:178 +#: src/cp.c:177 msgid "" " -f, --force if an existing destination file cannot be\n" -" opened, remove it and try again (redundant " -"if\n" -" the -n option is used)\n" +" opened, remove it and try again (this " +"option\n" +" is ignored when the -n option is also " +"used)\n" " -i, --interactive prompt before overwrite (overrides a previous " "-n\n" " option)\n" " -H follow command-line symbolic links in SOURCE\n" msgstr "" -#: src/cp.c:188 +#: src/cp.c:186 msgid "" " -l, --link hard link files instead of copying\n" " -L, --dereference always follow symbolic links in SOURCE\n" msgstr "" -#: src/cp.c:192 +#: src/cp.c:190 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:197 +#: src/cp.c:195 msgid "" " -p same as --preserve=mode,ownership,timestamps\n" " --preserve[=ATTR_LIST] preserve the specified attributes (default:\n" @@ -2036,13 +2030,13 @@ msgid "" " all\n" msgstr "" -#: src/cp.c:205 +#: src/cp.c:203 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:209 +#: src/cp.c:207 msgid "" " -R, -r, --recursive copy directories recursively\n" " --reflink[=WHEN] control clone/CoW copies. See below\n" @@ -2051,7 +2045,7 @@ msgid "" "force)\n" msgstr "" -#: src/cp.c:215 +#: src/cp.c:213 #, fuzzy msgid "" " --sparse=WHEN control creation of sparse files. See below\n" @@ -2097,7 +2091,7 @@ msgstr "" "--sparse=never라고 지정하면 성긴 파일을 생성하지 못하게 합니다.\n" "\n" -#: src/cp.c:220 +#: src/cp.c:218 msgid "" " -s, --symbolic-link make symbolic links instead of copying\n" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -2106,7 +2100,7 @@ msgid "" " -T, --no-target-directory treat DEST as a normal file\n" msgstr "" -#: src/cp.c:226 +#: src/cp.c:224 #, fuzzy msgid "" " -u, --update copy only when the SOURCE file is newer\n" @@ -2133,7 +2127,7 @@ msgstr "" " --version 버전 정보를 표시하고 종료합니다\n" "\n" -#: src/cp.c:235 +#: src/cp.c:233 #, fuzzy msgid "" "\n" @@ -2187,7 +2181,7 @@ msgstr "" "--sparse=never라고 지정하면 성긴 파일을 생성하지 못하게 합니다.\n" "\n" -#: src/cp.c:247 src/install.c:649 src/ln.c:421 src/mv.c:321 +#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322 #, fuzzy msgid "" "\n" @@ -2208,7 +2202,7 @@ msgstr "" " 단순하게 합니다\n" " simple, never 항상 단순 백업을 합니다\n" -#: src/cp.c:254 src/install.c:656 src/mv.c:328 +#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329 #, fuzzy msgid "" " none, off never make backups (even if --backup is given)\n" @@ -2227,7 +2221,7 @@ msgstr "" " 단순하게 합니다\n" " simple, never 항상 단순 백업을 합니다\n" -#: src/cp.c:260 +#: src/cp.c:258 msgid "" "\n" "As a special case, cp makes a backup of SOURCE when the force and backup\n" @@ -2238,90 +2232,90 @@ msgstr "" "특별한 경우로, 강제와 백업 옵션이 주어지며 SOURCE와 DEST가 이름이 같고,\n" "존재하는 일반 파일일 때 cp는 SOURCE의 백업을 만듭니다.\n" -#: src/cp.c:319 +#: src/cp.c:317 #, fuzzy, c-format msgid "failed to preserve times for %s" msgstr "%s의 시간을 유지합니다" -#: src/cp.c:350 +#: src/cp.c:348 #, fuzzy, c-format msgid "failed to preserve permissions for %s" msgstr "%s의 허가를 바꿀 수 없습니다" -#: src/cp.c:477 +#: src/cp.c:475 #, fuzzy, c-format msgid "cannot make directory %s" msgstr "%s 디렉토리를 만들 수 없습니다" -#: src/cp.c:526 src/cp.c:545 +#: src/cp.c:524 src/cp.c:543 #, c-format msgid "%s exists but is not a directory" msgstr "%s이(가) 존재하지만 디렉토리가 아닙니다" -#: src/cp.c:572 src/cp.c:1068 src/install.c:401 src/install.c:844 src/ln.c:123 -#: src/ln.c:181 src/ln.c:202 src/ln.c:516 src/mv.c:152 src/mv.c:399 +#: 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 -msgid "accessing %s" -msgstr "%s를 지웁니다\n" +msgid "failed to access %s" +msgstr "%s의 시간을 유지합니다" -#: src/cp.c:592 src/install.c:914 src/ln.c:546 src/mv.c:432 src/shred.c:1182 -#: src/touch.c:433 src/truncate.c:356 +#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181 +#: src/touch.c:429 src/truncate.c:354 #, fuzzy, c-format msgid "missing file operand" msgstr "인수를 건너 뜀" -#: src/cp.c:594 src/install.c:916 src/ln.c:560 src/mv.c:434 +#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436 #, fuzzy, c-format msgid "missing destination file operand after %s" msgstr "필드의 목록이 빠졌음" -#: src/cp.c:603 src/install.c:925 src/mv.c:443 +#: src/cp.c:601 src/install.c:926 src/mv.c:445 #, fuzzy, c-format msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)" msgstr "%s 디렉토리로 chdir할 수 없습니다" -#: src/cp.c:619 src/cp.c:1070 src/install.c:403 src/install.c:846 -#: src/install.c:938 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:401 -#: src/mv.c:457 +#: 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 msgid "target %s is not a directory" msgstr "%s이(가) 존재하지만 디렉토리가 아닙니다" -#: src/cp.c:730 +#: src/cp.c:728 #, fuzzy, c-format msgid "with --parents, the destination must be a directory" msgstr "패스를 유지할 때 마지막 인수는 디렉토리여야 합니다" -#: src/cp.c:1063 src/install.c:839 src/ln.c:511 src/mv.c:394 +#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395 #, c-format msgid "multiple target directories specified" msgstr "" -#: src/cp.c:1108 +#: src/cp.c:1110 #, c-format msgid "cannot make both hard and symbolic links" msgstr "하드링크와 심볼릭 링크를 동시에 만들 수 없습니다" -#: src/cp.c:1115 src/mv.c:464 +#: src/cp.c:1117 src/mv.c:466 #, fuzzy, c-format msgid "options --backup and --no-clobber are mutually exclusive" msgstr "--string과 --check 옵션은 상호 배타적입니다" -#: src/cp.c:1121 +#: src/cp.c:1123 #, c-format msgid "--reflink can be used only with --sparse=auto" msgstr "" -#: src/cp.c:1129 src/install.c:899 src/ln.c:582 src/mv.c:472 +#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474 msgid "backup type" msgstr "백업 종류" -#: src/cp.c:1154 +#: src/cp.c:1156 #, c-format msgid "cannot preserve security context without an SELinux-enabled kernel" msgstr "" -#: src/cp.c:1160 +#: src/cp.c:1162 #, c-format msgid "cannot preserve extended attributes, cp is built without xattr support" msgstr "" @@ -2331,138 +2325,137 @@ msgstr "" msgid "Stuart Kemp" msgstr "" -#: src/csplit.c:529 +#: src/csplit.c:531 #, c-format msgid "input disappeared" msgstr "입력이 사라짐" -#: src/csplit.c:658 src/csplit.c:669 +#: src/csplit.c:660 src/csplit.c:671 #, c-format msgid "%s: line number out of range" msgstr "%s: 범위를 벗어난 행 번호" -#: src/csplit.c:698 +#: src/csplit.c:700 #, fuzzy, c-format msgid "%s: %s: line number out of range" msgstr "%s: `%s': 범위를 벗어난 행 번호" -#: src/csplit.c:701 src/csplit.c:750 +#: src/csplit.c:703 src/csplit.c:752 #, fuzzy, c-format msgid " on repetition %s\n" msgstr " %d 번째 반복중\n" -#: src/csplit.c:744 +#: src/csplit.c:746 #, fuzzy, c-format msgid "%s: %s: match not found" msgstr "%s: `%s': 맞는 짝을 찾지 못했음" -#: src/csplit.c:808 src/csplit.c:848 src/nl.c:359 src/tac.c:274 +#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273 #, c-format msgid "error in regular expression search" msgstr "정규식 탐색에 오류 발생" -#: src/csplit.c:981 +#: src/csplit.c:983 #, fuzzy, c-format msgid "write error for %s" msgstr "`%s'에 쓰기 오류" -#: src/csplit.c:1057 +#: src/csplit.c:1059 #, fuzzy, c-format msgid "%s: integer expected after delimiter" msgstr "%s: `%c' 뒤에 정수가 와야함" -#: src/csplit.c:1073 +#: src/csplit.c:1075 #, fuzzy, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: 반복 횟수에 `}'가 필요합니다" -#: src/csplit.c:1083 +#: src/csplit.c:1085 #, fuzzy, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: `{'과 `}' 사이에 정수가 필요함" -#: src/csplit.c:1110 +#: src/csplit.c:1112 #, fuzzy, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: 닫는 구분자 `%c'이(가) 없습니다" -#: src/csplit.c:1127 +#: src/csplit.c:1129 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: 부적절한 정규식: %s" -#: src/csplit.c:1160 +#: src/csplit.c:1162 #, c-format msgid "%s: invalid pattern" msgstr "%s: 부적절한 패턴" -#: src/csplit.c:1163 +#: src/csplit.c:1165 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: 행번호는 영보다 커야 합니다" -#: src/csplit.c:1169 +#: src/csplit.c:1171 #, fuzzy, c-format msgid "line number %s is smaller than preceding line number, %s" msgstr "행번호 `%s'이(가) 앞선 행번호 %s보다 작습니다" -#: src/csplit.c:1175 +#: src/csplit.c:1177 #, fuzzy, c-format msgid "warning: line number %s is the same as preceding line number" msgstr "경고: 행번호 `%s'이(가) 앞선 행번호와 같습니다" -#: src/csplit.c:1253 +#: src/csplit.c:1255 #, c-format msgid "missing conversion specifier in suffix" msgstr "접미사에 변환 지정자가 빠졌음" -#: src/csplit.c:1259 +#: src/csplit.c:1261 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "접미사에 부적절한 변환 지정자: %c" -#: src/csplit.c:1262 +#: src/csplit.c:1264 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "접미사에 부적절한 변환 지정자: \\%.3o" -#: src/csplit.c:1267 +#: src/csplit.c:1269 #, fuzzy, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "접미사에 부적절한 변환 지정자: %c" -#: src/csplit.c:1284 +#: src/csplit.c:1286 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "접미사에 %% 변환 지정자가 너무 많음" -#: src/csplit.c:1298 +#: src/csplit.c:1300 #, c-format msgid "missing %% conversion specification in suffix" msgstr "접미사에 %% 변환 지정자가 빠졌음" -#: src/csplit.c:1345 +#: src/csplit.c:1347 #, c-format msgid "%s: invalid number" msgstr "%s: 부적절한 숫자" -#: src/csplit.c:1449 +#: src/csplit.c:1451 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "사용법: %s [<옵션>]... <파일> <패턴>...\n" -#: src/csplit.c:1453 +#: src/csplit.c:1455 #, 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" -"\n" msgstr "" "<파일>을, <패턴>을 기준으로 나눈 다음, 그 조각들을 `xx01', `xx02', ... 파일들" "에\n" "출력하고, 각 조각들의 바이트 수를 표준 출력으로 출력합니다.\n" -#: src/csplit.c:1461 +#: src/csplit.c:1462 #, fuzzy, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2473,7 +2466,7 @@ msgstr "" " -f, --prefix=<접두어> `xx' 대신에 <접두어>를 씁니다\n" " -k, --keep-files 오류 발생시에도 출력 파일들을 지우지 않습니다\n" -#: src/csplit.c:1466 +#: src/csplit.c:1467 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" @@ -2483,7 +2476,7 @@ msgstr "" " -s, --quiet, --silent 출력 파일의 크기를 표시하지 않습니다\n" " -z, --elide-empty-files 빈 출력 파일을 지웁니다\n" -#: src/csplit.c:1473 +#: src/csplit.c:1474 msgid "" "\n" "Read standard input if FILE is -. Each PATTERN may be:\n" @@ -2492,7 +2485,7 @@ msgstr "" "<파일>이 `-'이면 표준 입력을 읽습니다. 각 <패턴>에는 다음을 쓸 수 있습니" "다:\n" -#: src/csplit.c:1477 +#: src/csplit.c:1478 #, fuzzy msgid "" "\n" @@ -2518,7 +2511,7 @@ msgstr "" msgid "David M. Ihnat" msgstr "" -#: src/cut.c:64 +#: src/cut.c:64 src/cut.c:372 msgid "fields and positions are numbered from 1" msgstr "" @@ -2528,14 +2521,13 @@ msgid "Usage: %s OPTION... [FILE]...\n" msgstr "사용법: %s [<옵션>]... [<파일>]...\n" #: src/cut.c:193 -msgid "" -"Print selected parts of lines from each FILE to standard output.\n" -"\n" +#, fuzzy +msgid "Print selected parts of lines from each FILE to standard output.\n" msgstr "" "각 <파일>에서 선택한 줄들만 표준 출력에 표시합니다.\n" "\n" -#: src/cut.c:200 +#: src/cut.c:199 #, fuzzy msgid "" " -b, --bytes=LIST select only these bytes\n" @@ -2546,7 +2538,7 @@ msgstr "" " -c, --characters=<리스트> 이 문자들만을 표시합니다\n" " -d, --delimiter=<구분자> 필드 구분자로 탭 대신에 <구분자>를 씁니다\n" -#: src/cut.c:205 +#: src/cut.c:204 #, fuzzy msgid "" " -f, --fields=LIST select only these fields; also print any line\n" @@ -2559,7 +2551,7 @@ msgstr "" " 출력합니다\n" " -n (무시됨)\n" -#: src/cut.c:211 +#: src/cut.c:210 #, fuzzy msgid "" " --complement complement the set of selected bytes, characters\n" @@ -2569,7 +2561,7 @@ msgstr "" "로\n" " 출력합니다\n" -#: src/cut.c:215 +#: src/cut.c:214 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2579,7 +2571,7 @@ msgstr "" " --output-delimiter=<문자열> <문자열>을 출력 구분자로 사용합니다\n" " 기본값은 입력 구분자로 사용하는 것입니다\n" -#: src/cut.c:222 +#: src/cut.c:221 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2587,7 +2579,7 @@ msgid "" "in the same order that it is read, and is written exactly once.\n" msgstr "" -#: src/cut.c:228 +#: src/cut.c:227 #, fuzzy msgid "" "Each range is one of:\n" @@ -2610,48 +2602,50 @@ msgstr "" "\n" "<파일>이 주어지지 않거나, <파일>이 `-'이면, 표준 입력을 읽습니다.\n" -#: src/cut.c:368 src/cut.c:489 -msgid "invalid byte or field list" +#: src/cut.c:367 src/cut.c:493 +#, fuzzy +msgid "invalid byte, character or field list" msgstr "부적절한 바이트나 필드 목록" -#: src/cut.c:385 +#: src/cut.c:387 #, fuzzy msgid "invalid range with no endpoint: -" msgstr "부적절한 폭 옵션 `%s'" -#: src/cut.c:399 +#: src/cut.c:403 #, fuzzy msgid "invalid decreasing range" msgstr "부적절한 타입의 문자열 `%s'" -#: src/cut.c:478 +#: src/cut.c:482 #, fuzzy, c-format msgid "byte offset %s is too large" msgstr "%s은(는) 너무 큽니다" -#: src/cut.c:481 +#: src/cut.c:485 #, fuzzy, c-format msgid "field number %s is too large" msgstr "필드 개수가 0입니다" -#: src/cut.c:789 src/cut.c:797 +#: src/cut.c:795 src/cut.c:803 msgid "only one type of list may be specified" msgstr "오직 한가지 형태의 목록만이 지정될 수 있습니다" -#: src/cut.c:806 +#: src/cut.c:812 src/numfmt.c:1408 +#, c-format msgid "the delimiter must be a single character" msgstr "구획 문자는 단일 문자여야 합니다" -#: src/cut.c:841 +#: src/cut.c:847 msgid "you must specify a list of bytes, characters, or fields" msgstr "바이트, 문자, 또는 필드로 된 목록을 지정해야 합니다" -#: src/cut.c:844 +#: src/cut.c:850 #, fuzzy msgid "an input delimiter may be specified only when operating on fields" msgstr "필드에 대해 연산할 때에만 구획 문자가 지정될 수 있습니다" -#: src/cut.c:848 +#: src/cut.c:854 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2659,11 +2653,11 @@ msgstr "" "구분자가 없는 줄을 무시하는 것은\n" "\t필드에 관해 동작하는 경우에만 이치에 맞습니다" -#: src/cut.c:864 +#: src/cut.c:870 msgid "missing list of fields" msgstr "필드의 목록이 빠졌음" -#: src/cut.c:866 +#: src/cut.c:872 msgid "missing list of positions" msgstr "위치의 목록이 빠졌음" @@ -2675,9 +2669,11 @@ msgid "" msgstr "" #: src/date.c:128 +msgid "Display the current time in the given FORMAT, or set the system date.\n" +msgstr "" + +#: src/date.c:134 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" " -I[TIMESPEC], --iso-8601[=TIMESPEC] output date/time in ISO 8601 format.\n" @@ -2686,14 +2682,14 @@ msgid "" " and time to the indicated precision.\n" msgstr "" -#: src/date.c:138 +#: src/date.c:142 msgid "" " -r, --reference=FILE display the last modification time of FILE\n" " -R, --rfc-2822 output date and time in RFC 2822 format.\n" " Example: Mon, 07 Aug 2006 12:34:56 -0600\n" msgstr "" -#: src/date.c:143 +#: src/date.c:147 msgid "" " --rfc-3339=TIMESPEC output date and time in RFC 3339 format.\n" " TIMESPEC='date', 'seconds', or 'ns' for\n" @@ -2704,7 +2700,7 @@ msgid "" " -u, --utc, --universal print or set Coordinated Universal Time\n" msgstr "" -#: src/date.c:154 +#: src/date.c:158 msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" @@ -2713,7 +2709,7 @@ msgid "" " %a locale's abbreviated weekday name (e.g., Sun)\n" msgstr "" -#: src/date.c:161 +#: src/date.c:165 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2721,7 +2717,7 @@ msgid "" " %c locale's date and time (e.g., Thu Mar 3 23:05:25 2005)\n" msgstr "" -#: src/date.c:167 +#: src/date.c:171 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2729,14 +2725,14 @@ msgid "" " %e day of month, space padded; same as %_d\n" msgstr "" -#: src/date.c:173 +#: src/date.c:177 msgid "" " %F full date; same as %Y-%m-%d\n" " %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 "" -#: src/date.c:178 +#: src/date.c:182 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2744,7 +2740,7 @@ msgid "" " %j day of year (001..366)\n" msgstr "" -#: src/date.c:184 +#: src/date.c:188 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -2752,7 +2748,7 @@ msgid "" " %M minute (00..59)\n" msgstr "" -#: src/date.c:190 +#: src/date.c:194 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2763,7 +2759,7 @@ msgid "" " %s seconds since 1970-01-01 00:00:00 UTC\n" msgstr "" -#: src/date.c:199 +#: src/date.c:203 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2771,7 +2767,7 @@ msgid "" " %u day of week (1..7); 1 is Monday\n" msgstr "" -#: src/date.c:205 +#: src/date.c:209 msgid "" " %U week number of year, with Sunday as first day of week (00..53)\n" " %V ISO week number, with Monday as first day of week (01..53)\n" @@ -2779,7 +2775,7 @@ msgid "" " %W week number of year, with Monday as first day of week (00..53)\n" msgstr "" -#: src/date.c:211 +#: src/date.c:215 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -2787,7 +2783,7 @@ msgid "" " %Y year\n" msgstr "" -#: src/date.c:217 +#: src/date.c:221 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -2799,7 +2795,7 @@ msgid "" "By default, date pads numeric fields with zeroes.\n" msgstr "" -#: src/date.c:226 +#: src/date.c:230 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -2810,7 +2806,7 @@ msgid "" " # use opposite case if possible\n" msgstr "" -#: src/date.c:235 +#: src/date.c:239 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -2819,7 +2815,7 @@ msgid "" "O to use the locale's alternate numeric symbols if available.\n" msgstr "" -#: src/date.c:242 +#: src/date.c:246 msgid "" "\n" "Examples:\n" @@ -2833,35 +2829,35 @@ msgid "" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:275 src/dd.c:2193 src/head.c:838 src/md5sum.c:477 -#: src/md5sum.c:798 src/od.c:863 src/od.c:1914 src/pr.c:1176 src/pr.c:1372 -#: src/pr.c:1494 src/stty.c:842 src/tac.c:563 src/tail.c:343 src/tee.c:126 +#: 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 #, c-format msgid "standard input" msgstr "표준 입력" -#: src/date.c:303 src/date.c:523 +#: src/date.c:307 src/date.c:527 #, fuzzy, c-format msgid "invalid date %s" msgstr "부적절한 폭: `%s'" -#: src/date.c:414 src/date.c:448 +#: src/date.c:418 src/date.c:452 #, c-format msgid "multiple output formats specified" msgstr "" -#: src/date.c:426 +#: src/date.c:430 #, fuzzy, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "--string과 --check 옵션은 상호 배타적입니다" -#: src/date.c:433 +#: src/date.c:437 #, c-format msgid "the options to print and set the time may not be used together" msgstr "" -#: src/date.c:454 +#: src/date.c:458 #, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -2869,23 +2865,23 @@ msgid "" "argument must be a format string beginning with '+'" msgstr "" -#: src/date.c:531 +#: src/date.c:535 #, fuzzy, c-format msgid "cannot set date" msgstr "`%s'의 정보(stat)를 얻을 수 없습니다" -#: src/date.c:554 src/du.c:360 +#: src/date.c:558 src/du.c:371 #, fuzzy, c-format msgid "time %s is out of range" msgstr "%s: 범위를 벗어난 행 번호" #. This is a proper name. See the gettext manual, section Names. -#: src/dd.c:44 src/factor.c:43 src/rm.c:41 src/tail.c:69 src/touch.c:41 +#: 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 "" -#: src/dd.c:517 +#: src/dd.c:521 #, fuzzy, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -2894,7 +2890,7 @@ msgstr "" "사용법: %s [<파일>]...\n" " 혹은: %s [<옵션>]\n" -#: src/dd.c:522 +#: src/dd.c:526 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -2905,7 +2901,7 @@ msgid "" " ibs=BYTES read up to BYTES bytes at a time (default: 512)\n" msgstr "" -#: src/dd.c:531 +#: src/dd.c:535 msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -2914,13 +2910,14 @@ msgid "" " oflag=FLAGS write as per the comma separated symbol list\n" " seek=N skip N obs-sized blocks at start of output\n" " skip=N skip N ibs-sized blocks at start of input\n" -" status=noxfer suppress transfer statistics\n" +" status=WHICH WHICH info to suppress outputting to stderr;\n" +" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" msgstr "" -#: src/dd.c:541 +#: src/dd.c:546 msgid "" "\n" -"BLOCKS and BYTES may be followed by the following multiplicative suffixes:\n" +"N and BYTES may be followed by the following multiplicative suffixes:\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, and so on for T, P, E, Z, Y.\n" "\n" @@ -2928,7 +2925,7 @@ msgid "" "\n" msgstr "" -#: src/dd.c:550 +#: src/dd.c:555 #, fuzzy msgid "" " ascii from EBCDIC to ASCII\n" @@ -2953,7 +2950,7 @@ msgstr "" " swab 입력하는 두 바이트의 순서를 바꿉니다\n" " sync ibs크기의 입력 레코드를 크기가 맞지 않으면 NUL로 채웁니다\n" -#: src/dd.c:563 +#: src/dd.c:568 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -2969,7 +2966,7 @@ msgstr "" " fdatasync physically write output file data before finishing\n" " fsync likewise, but also write metadata\n" -#: src/dd.c:571 +#: src/dd.c:576 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -2978,76 +2975,76 @@ msgid "" "suggested)\n" msgstr "" -#: src/dd.c:578 +#: src/dd.c:583 msgid " cio use concurrent I/O for data\n" msgstr "" -#: src/dd.c:580 +#: src/dd.c:585 msgid " direct use direct I/O for data\n" msgstr "" -#: src/dd.c:582 +#: src/dd.c:587 #, fuzzy msgid " directory fail unless a directory\n" msgstr "%s이(가) 존재하지만 디렉토리가 아닙니다" -#: src/dd.c:584 +#: src/dd.c:589 msgid " dsync use synchronized I/O for data\n" msgstr "" -#: src/dd.c:586 +#: src/dd.c:591 msgid " sync likewise, but also for metadata\n" msgstr "" -#: src/dd.c:587 +#: src/dd.c:592 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr "" -#: src/dd.c:590 +#: src/dd.c:595 msgid " nonblock use non-blocking I/O\n" msgstr "" -#: src/dd.c:592 +#: src/dd.c:597 msgid " noatime do not update access time\n" msgstr "" -#: src/dd.c:595 +#: src/dd.c:600 msgid " nocache discard cached data\n" msgstr "" -#: src/dd.c:598 +#: src/dd.c:603 msgid " noctty do not assign controlling terminal from file\n" msgstr "" -#: src/dd.c:601 +#: src/dd.c:606 msgid " nofollow do not follow symlinks\n" msgstr "" -#: src/dd.c:603 +#: src/dd.c:608 msgid " nolinks fail if multiply-linked\n" msgstr "" -#: src/dd.c:605 +#: src/dd.c:610 msgid " binary use binary I/O for data\n" msgstr "" -#: src/dd.c:607 +#: src/dd.c:612 msgid " text use text I/O for data\n" msgstr "" -#: src/dd.c:609 +#: src/dd.c:614 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:612 +#: src/dd.c:617 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:615 +#: src/dd.c:620 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:620 +#: src/dd.c:625 #, c-format msgid "" "\n" @@ -3064,28 +3061,28 @@ msgid "" "\n" msgstr "" -#: src/dd.c:676 +#: src/dd.c:683 #, c-format msgid "" "%<PRIuMAX>+%<PRIuMAX> records in\n" "%<PRIuMAX>+%<PRIuMAX> records out\n" msgstr "" -#: src/dd.c:682 +#: src/dd.c:689 #, fuzzy, c-format msgid "%<PRIuMAX> truncated record\n" msgid_plural "%<PRIuMAX> truncated records\n" msgstr[0] "잘린 레코드" msgstr[1] "잘린 레코드" -#: src/dd.c:694 +#: src/dd.c:701 #, c-format msgid "%<PRIuMAX> byte (%s) copied" msgid_plural "%<PRIuMAX> bytes (%s) copied" msgstr[0] "" msgstr[1] "" -#: src/dd.c:712 +#: src/dd.c:720 msgid "Infinity B" msgstr "" @@ -3099,240 +3096,261 @@ 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:725 +#: src/dd.c:733 #, c-format msgid ", %g s, %s/s\n" msgstr "" -#: src/dd.c:804 +#: src/dd.c:812 #, fuzzy, c-format msgid "closing input file %s" msgstr "파일 `%s'을(를) 만듦\n" -#: src/dd.c:811 +#: src/dd.c:819 #, fuzzy, c-format msgid "closing output file %s" msgstr "%s를 지웁니다\n" -#: src/dd.c:1014 +#: src/dd.c:1022 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "" -#: src/dd.c:1085 src/dd.c:1934 +#: src/dd.c:1093 src/dd.c:1942 #, fuzzy, c-format msgid "writing to %s" msgstr "%s에 쓰는 도중 오류 발생" -#: src/dd.c:1199 src/dd.c:1253 +#: src/dd.c:1207 src/dd.c:1261 #, fuzzy, c-format msgid "unrecognized operand %s" msgstr "인식할 수 없는 옵션 `-%c'" -#: src/dd.c:1210 +#: src/dd.c:1218 #, fuzzy msgid "invalid conversion" msgstr "부적절한 폭 옵션 `%s'" -#: src/dd.c:1213 src/dd.c:1289 +#: src/dd.c:1221 src/dd.c:1297 #, fuzzy msgid "invalid input flag" msgstr "필드 처음에 부적절한 숫자" -#: src/dd.c:1216 src/dd.c:1283 src/dd.c:1295 +#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303 #, fuzzy msgid "invalid output flag" msgstr "잘못된 그룹" -#: src/dd.c:1219 +#: src/dd.c:1227 #, fuzzy msgid "invalid status flag" msgstr "잘못된 사용자" -#: src/dd.c:1258 src/truncate.c:312 +#: src/dd.c:1266 src/truncate.c:310 #, fuzzy, c-format msgid "invalid number %s" msgstr "부적절한 숫자" -#: src/dd.c:1340 +#: src/dd.c:1348 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "" -#: src/dd.c:1342 +#: src/dd.c:1350 #, fuzzy, c-format msgid "cannot combine block and unblock" msgstr "사용자와 그룹을 모두 생략할 수는 없습니다" -#: src/dd.c:1344 +#: src/dd.c:1352 #, fuzzy, c-format msgid "cannot combine lcase and ucase" msgstr "비교한 문자열은 %s과(와) %s입니다." -#: src/dd.c:1346 +#: src/dd.c:1354 #, fuzzy, c-format msgid "cannot combine excl and nocreat" msgstr "%s에 대한 파일 포인터를 재위치할 수 없습니다" -#: src/dd.c:1349 +#: src/dd.c:1357 #, fuzzy, c-format msgid "cannot combine direct and nocache" msgstr "%s에 대한 파일 포인터를 재위치할 수 없습니다" -#: src/dd.c:1506 +#: src/dd.c:1514 #, 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:1593 +#: src/dd.c:1601 #, fuzzy, c-format msgid "%s: cannot skip" msgstr "%s: 돌아갈 수 없습니다" -#: src/dd.c:1595 src/dd.c:1614 src/dd.c:1675 +#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683 #, fuzzy, c-format msgid "%s: cannot seek" msgstr "%s: 지울 수 없습니다" -#: src/dd.c:1655 +#: src/dd.c:1663 #, c-format msgid "offset overflow while reading file %s" msgstr "" -#: src/dd.c:1667 +#: src/dd.c:1675 #, fuzzy, c-format msgid "warning: invalid file offset after failed read" msgstr "경고: 부적절한 폭 %lu; 대신 %d을(를) 사용함" -#: src/dd.c:1671 +#: src/dd.c:1679 #, c-format msgid "cannot work around kernel bug after all" msgstr "" -#: src/dd.c:1814 +#: src/dd.c:1822 #, fuzzy, c-format msgid "setting flags for %s" msgstr "%s의 시간을 유지합니다" -#: src/dd.c:1867 +#: src/dd.c:1875 #, c-format msgid "memory exhausted by input buffer of size %zu bytes (%s)" msgstr "" -#: src/dd.c:1881 +#: src/dd.c:1889 #, c-format msgid "memory exhausted by output buffer of size %zu bytes (%s)" msgstr "" -#: src/dd.c:1914 +#: src/dd.c:1922 #, fuzzy, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: 상대 오프셋 %s%s로(으로) 갈 수 없습니다" -#: src/dd.c:2125 src/dd.c:2258 +#: src/dd.c:2133 #, fuzzy, c-format -msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" +msgid "failed to truncate to %<PRIdMAX> bytes in output file %s" msgstr "%s를 지웁니다\n" -#: src/dd.c:2138 +#: src/dd.c:2146 #, c-format msgid "fdatasync failed for %s" msgstr "" -#: src/dd.c:2148 +#: src/dd.c:2156 #, c-format msgid "fsync failed for %s" msgstr "" -#: src/dd.c:2199 src/dd.c:2228 +#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165 #, fuzzy, c-format -msgid "opening %s" -msgstr "%s을(를) 읽는 도중 오류 발생" +msgid "failed to open %s" +msgstr "%s의 시간을 유지합니다" -#: src/dd.c:2237 +#: src/dd.c:2246 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) " "blocks" msgstr "" -#: src/dd.c:2274 src/dd.c:2280 +#: src/dd.c:2267 +#, 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 #, 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:54 src/expr.c:153 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:39 src/sleep.c:35 src/sort.c:66 +#: 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 msgid "Paul Eggert" msgstr "" -#: src/df.c:140 +#: src/df.c:172 msgid "Filesystem" msgstr "" -#: src/df.c:141 +#: src/df.c:175 msgid "Type" msgstr "" -#: src/df.c:142 +#: src/df.c:178 src/df.c:542 msgid "blocks" msgstr "" -#: src/df.c:142 -msgid "Inodes" +#: src/df.c:181 +msgid "Used" msgstr "" -#: src/df.c:142 -msgid "Size" +#: src/df.c:184 +msgid "Available" msgstr "" -#: src/df.c:143 -msgid "Used" +#: src/df.c:187 +msgid "Use%" msgstr "" -#: src/df.c:143 -msgid "IUsed" +#: src/df.c:190 +msgid "Inodes" msgstr "" -#: src/df.c:144 -msgid "Available" +#: src/df.c:193 +msgid "IUsed" msgstr "" -#: src/df.c:144 +#: src/df.c:196 msgid "IFree" msgstr "" -#: src/df.c:144 -msgid "Avail" +#: src/df.c:199 +msgid "IUse%" msgstr "" -#: src/df.c:145 -msgid "Use%" +#: src/df.c:202 +msgid "Mounted on" msgstr "" -#: src/df.c:145 -msgid "IUse%" +#: src/df.c:383 +#, c-format +msgid "option --output: field '%s' unknown" +msgstr "" + +#: src/df.c:390 +#, c-format +msgid "option --output: field '%s' used more than once" +msgstr "" + +#: src/df.c:410 src/df.c:449 +msgid "Size" +msgstr "" + +#: src/df.c:414 src/df.c:451 +msgid "Avail" msgstr "" -#: src/df.c:145 +#: src/df.c:474 msgid "Capacity" msgstr "" -#: src/df.c:146 -msgid "Mounted on" +#. 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 +#, c-format +msgid "%s-%s" msgstr "" -#: src/df.c:847 +#: src/df.c:1210 msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" -"\n" msgstr "" -#: src/df.c:855 +#: src/df.c:1217 msgid "" " -a, --all include dummy file systems\n" " -B, --block-size=SIZE scale sizes by SIZE before printing them. E.g.,\n" @@ -3344,7 +3362,7 @@ msgid "" " -H, --si likewise, but use powers of 1000 not 1024\n" msgstr "" -#: src/df.c:865 +#: src/df.c:1227 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3353,8 +3371,11 @@ msgid "" "(default)\n" msgstr "" -#: src/df.c:872 +#: src/df.c:1234 msgid "" +" --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" +" or print all fields if FIELD_LIST is " +"omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" " -t, --type=TYPE limit listing to file systems of type TYPE\n" @@ -3363,21 +3384,43 @@ msgid "" " -v (ignored)\n" msgstr "" -#: src/df.c:1027 +#: src/df.c:1248 +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" +msgstr "" + +#: src/df.c:1285 +#, 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 #, fuzzy, c-format msgid "file system type %s both selected and excluded" msgstr "파일시스템 `%s'를 동시에 선택하고 제외할 수 없습니다" -#: src/df.c:1075 +#: src/df.c:1500 msgid "Warning: " msgstr "경고: " -#: src/df.c:1077 src/stat.c:795 +#: src/df.c:1502 src/stat.c:814 #, fuzzy msgid "cannot read table of mounted file systems" msgstr "%s: 마운트된 파일시스템의 테이블은 읽을 수 없습니다" -#: src/df.c:1107 +#: src/df.c:1539 #, c-format msgid "no file systems processed" msgstr "" @@ -3484,7 +3527,7 @@ msgid "" " %s stdio.h -> \".\"\n" msgstr "" -#: src/du.c:260 src/sort.c:390 src/wc.c:112 +#: src/du.c:270 src/sort.c:394 src/wc.c:112 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3493,14 +3536,14 @@ msgstr "" "사용법: %s [<옵션>]... [<파일>]...\n" " 또는: %s --traditional [<파일>] [[+]<옵셋> [[+]<레이블>]]\n" -#: src/du.c:264 -msgid "" -"Summarize disk usage of each FILE, recursively for directories.\n" -"\n" +#: src/du.c:274 +msgid "Summarize disk usage of each FILE, recursively for directories.\n" msgstr "" -#: src/du.c:271 +#: src/du.c:280 msgid "" +" -0, --null end each output line with 0 byte rather than " +"newline\n" " -a, --all write counts for all files, not just directories\n" " --apparent-size print apparent sizes, rather than disk usage; " "although\n" @@ -3509,7 +3552,7 @@ msgid "" " fragmentation, indirect blocks, and the like\n" msgstr "" -#: src/du.c:279 +#: src/du.c:289 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" @@ -3518,9 +3561,14 @@ msgid "" " -c, --total produce a grand total\n" " -D, --dereference-args dereference only symlinks that are listed on the\n" " command line\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 "" -#: src/du.c:288 +#: src/du.c:302 msgid "" " --files0-from=F summarize disk usage of the NUL-terminated file\n" " names specified in file F;\n" @@ -3528,41 +3576,29 @@ msgid "" " -H equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" --si like -h, but use powers of 1000 not 1024\n" msgstr "" -#: src/du.c:297 +#: src/du.c:310 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 "" -#: src/du.c:302 +#: src/du.c:316 msgid "" -" -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " "default)\n" -" -0, --null end each output line with 0 byte rather than " -"newline\n" " -S, --separate-dirs 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:309 -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 "" - -#: src/du.c:318 +#: src/du.c:322 msgid "" +" -t, --threshold=SIZE exclude entries smaller than SIZE if positive,\n" +" or entries greater than SIZE if negative\n" " --time show time of the last modification of any file in " "the\n" " directory, or any of its subdirectories\n" @@ -3573,64 +3609,73 @@ msgid "" " FORMAT is interpreted like 'date'\n" msgstr "" -#: src/du.c:375 +#: src/du.c:333 +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 msgid "Infinity" msgstr "" -#: src/du.c:600 +#: src/du.c:507 +#, c-format +msgid "mount point %s already traversed" +msgstr "" + +#: src/du.c:624 #, fuzzy, c-format msgid "fts_read failed: %s" msgstr "파일 읽기 실패" -#: src/du.c:724 +#: src/du.c:780 #, fuzzy, c-format msgid "invalid maximum depth %s" msgstr "부적절한 폭: `%s'" -#: src/du.c:817 +#: src/du.c:809 +#, fuzzy, c-format +msgid "invalid --threshold argument '-0'" +msgstr "%2$s에 대해 부적절한 인자 %1$s" + +#: src/du.c:887 #, c-format msgid "cannot both summarize and show all entries" msgstr "모든 디렉토리 내용을 표시하면서 요약할 수는 없습니다" -#: src/du.c:824 +#: src/du.c:894 #, c-format msgid "warning: summarizing is the same as using --max-depth=0" msgstr "경고: 요약은 --max-depth=0을 사용하는 것과 같습니다" -#: src/du.c:830 +#: src/du.c:900 #, fuzzy, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "경고: --max-depth=%d는 요약 옵션과 충돌합니다" -#: src/du.c:896 src/sort.c:4479 src/wc.c:668 +#: src/du.c:966 src/sort.c:4533 src/wc.c:668 msgid "file operands cannot be combined with --files0-from" msgstr "" -#: src/du.c:949 src/md5sum.c:587 src/od.c:903 src/tac.c:239 src/tac.c:350 -#: src/tac.c:506 src/tac.c:586 src/wc.c:733 +#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 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:963 src/sort.c:4508 src/wc.c:747 +#: src/du.c:1040 src/sort.c:4562 src/wc.c:747 #, c-format msgid "when reading file names from stdin, no file name of %s allowed" msgstr "" -#: src/du.c:980 src/du.c:988 src/wc.c:760 src/wc.c:768 +#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768 #, fuzzy msgid "invalid zero-length file name" msgstr "잘못된 그룹" -#: src/du.c:1007 src/head.c:149 src/head.c:262 src/head.c:334 src/head.c:538 -#: src/head.c:620 src/head.c:692 src/head.c:750 src/head.c:774 src/tail.c:412 -#: src/tail.c:500 src/tail.c:549 src/tail.c:642 src/tail.c:770 src/tail.c:818 -#: src/tail.c:855 src/tail.c:1782 src/tail.c:1812 src/uniq.c:395 -#, c-format -msgid "error reading %s" -msgstr "%s을(를) 읽는 도중 오류 발생" - -#: src/du.c:1010 src/ls.c:2649 src/wc.c:791 +#: src/du.c:1088 src/ls.c:2649 src/wc.c:791 msgid "total" msgstr "합계" @@ -3711,45 +3756,47 @@ msgid "Usage: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n" msgstr "사용법: %s [<옵션>]... [<파일>]...\n" #: src/env.c:55 +msgid "Set each NAME to VALUE in the environment and run COMMAND.\n" +msgstr "" + +#: src/env.c:61 msgid "" -"Set each NAME to VALUE in the environment and run COMMAND.\n" -"\n" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with 0 byte rather than newline\n" " -u, --unset=NAME remove variable from the environment\n" msgstr "" -#: src/env.c:64 +#: src/env.c:68 msgid "" "\n" "A mere - implies -i. If no COMMAND, print the resulting environment.\n" msgstr "" -#: src/env.c:120 +#: src/env.c:124 #, fuzzy, c-format msgid "cannot unset %s" msgstr "`%s'에서 ioctl을 할 수 없습니다" -#: src/env.c:131 +#: src/env.c:135 #, fuzzy, c-format msgid "cannot set %s" msgstr "%s 디렉토리를 만들 수 없습니다" -#: src/env.c:148 +#: src/env.c:152 #, c-format msgid "cannot specify --null (-0) with command" msgstr "" #: 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" -"\n" msgstr "" "각 <파일>들의 탭을 공백으로 바꾸고, 표준 출력에 씁니다.\n" "<파일>이 주어지지 않거나, <파일>이 `-'이면, 표준 입력을 읽습니다.\n" -#: src/expand.c:115 +#: src/expand.c:114 #, fuzzy msgid "" " -i, --initial do not convert tabs after non blanks\n" @@ -3759,33 +3806,33 @@ msgstr "" " -t, --tabs=<개수> 탭을 8이 아닌 <개수>만큼의 문자크기의 공백으로 취급합니" "다\n" -#: src/expand.c:119 +#: src/expand.c:118 msgid "" " -t, --tabs=LIST use comma separated list of explicit tab positions\n" msgstr "" " -t, --tabs=리스트 탭 위치를 직접 쉼표로 구분한 리스트로 나타냅니다\n" -#: src/expand.c:172 src/unexpand.c:191 +#: src/expand.c:171 src/unexpand.c:190 #, fuzzy, c-format msgid "tab stop is too large %s" msgstr "%s은(는) 너무 큽니다" -#: src/expand.c:180 src/unexpand.c:199 +#: src/expand.c:179 src/unexpand.c:198 #, fuzzy, c-format msgid "tab size contains invalid character(s): %s" msgstr "탭 크기에 부적절한 문자가 지정되어 있습니다" -#: src/expand.c:206 src/unexpand.c:225 +#: src/expand.c:205 src/unexpand.c:224 #, c-format msgid "tab size cannot be 0" msgstr "탭 크기는 0이 될 수 없습니다" -#: src/expand.c:208 src/unexpand.c:227 +#: src/expand.c:207 src/unexpand.c:226 #, c-format msgid "tab sizes must be ascending" msgstr "탭 크기들은 점점 커져야 합니다" -#: src/expand.c:326 src/expand.c:345 src/unexpand.c:374 src/unexpand.c:419 +#: src/expand.c:325 src/expand.c:344 src/unexpand.c:373 src/unexpand.c:418 #, fuzzy, c-format msgid "input line is too long" msgstr "%s: 파일이 너무 깁니다" @@ -3899,12 +3946,12 @@ msgstr "정규식 탐색에 오류 발생" msgid "non-integer argument" msgstr "인수 제한" -#: src/expr.c:793 src/truncate.c:316 +#: src/expr.c:793 src/truncate.c:314 #, c-format msgid "division by zero" msgstr "" -#: src/expr.c:887 src/sort.c:2029 +#: src/expr.c:887 src/sort.c:2044 #, fuzzy, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "이 문제를 피해 가려면 LC_ALL='C'하십시오." @@ -3914,25 +3961,32 @@ msgstr "이 문제를 피해 가려면 LC_ALL='C'하십시오." msgid "the strings compared were %s and %s" msgstr "비교한 문자열은 %s과(와) %s입니다." -#: src/factor.c:449 -msgid "using arbitrary-precision arithmetic" +#. This is a proper name. See the gettext manual, section Names. +#: src/factor.c:111 +msgid "Niels Moller" msgstr "" -#: src/factor.c:460 -msgid "using single-precision arithmetic" +#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459 +#, c-format +msgid "Lucas prime test failure. This should not happen" msgstr "" -#: src/factor.c:465 src/od.c:1640 src/od.c:1709 +#: src/factor.c:2092 #, c-format -msgid "%s is too large" -msgstr "%s은(는) 너무 큽니다" +msgid "squfof queue overflow" +msgstr "" -#: src/factor.c:469 +#: src/factor.c:2419 #, fuzzy, c-format msgid "%s is not a valid positive integer" msgstr "%s: 부적절한 패턴" -#: src/factor.c:494 +#: src/factor.c:2442 src/od.c:1646 src/od.c:1715 +#, c-format +msgid "%s is too large" +msgstr "%s은(는) 너무 큽니다" + +#: src/factor.c:2454 #, fuzzy, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -3941,7 +3995,7 @@ msgstr "" "사용법: %s [<파일>]...\n" " 혹은: %s [<옵션>]\n" -#: src/factor.c:499 +#: src/factor.c:2459 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" @@ -3965,21 +4019,20 @@ msgid "cannot stat current directory (now %s)" msgstr "%s 디렉토리를 만들 수 없습니다" #. This is a proper name. See the gettext manual, section Names. -#: src/fmt.c:37 +#: src/fmt.c:38 msgid "Ross Paterson" msgstr "" -#: src/fmt.c:269 +#: src/fmt.c:270 #, fuzzy, c-format msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n" msgstr "사용법: %s [-<숫자>] [<옵션>]... [<파일>]...\n" -#: src/fmt.c:270 +#: 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" -"\n" msgstr "" "<파일>의 각 문단을 다시 구성해, 표준 출력에 씁니다.\n" "<파일>이 없거나 <파일>이 `-'이면, 표준 입력을 읽습니다.\n" @@ -3998,8 +4051,8 @@ msgstr "" " -p, --prefix=<문자열> <문자열>을 접두어로 가진 줄만을 결합합니다\n" " -s, --split-only 긴 줄을 나누되, 채워 넣지는 않습니다\n" -#: src/fmt.c:285 -#, fuzzy, c-format +#: src/fmt.c:287 +#, fuzzy, 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" @@ -4011,30 +4064,30 @@ msgstr "" "백\n" " -w, --width=<개수> 한 줄의 최대 폭 (기본값은 75열)\n" -#: src/fmt.c:357 +#: src/fmt.c:359 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" "option; use -w N instead" msgstr "" -#: src/fmt.c:403 src/fmt.c:414 +#: src/fmt.c:405 src/fmt.c:416 #, fuzzy, c-format msgid "invalid width: %s" msgstr "부적절한 폭: `%s'" # wrap을 뭐라고 한다? #: src/fold.c:70 +#, fuzzy msgid "" "Wrap input lines in each FILE (standard input by default), writing to\n" "standard output.\n" -"\n" msgstr "" "각 <파일>에서 (기본값은 표준입력에서) 입력된 줄을 나눠서, 표준 출력에\n" "씁니다.\n" "\n" -#: src/fold.c:78 +#: src/fold.c:77 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4044,13 +4097,13 @@ msgstr "" " -s, --spaces 공백에서 줄을 나눕니다\n" " -w, --width=<폭> 80열 대신에 <폭>열을 이용합니다\n" -#: src/fold.c:289 src/pr.c:836 +#: src/fold.c:288 src/pr.c:832 #, fuzzy, c-format 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:75 +#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 #: src/truncate.c:37 msgid "Padraig Brady" msgstr "" @@ -4066,17 +4119,17 @@ msgid "" "\n" msgstr "" -#: src/group-list.c:69 src/id.c:345 src/setuidgid.c:184 +#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184 #, fuzzy, c-format msgid "failed to get groups for user %s" msgstr "%s의 그룹을 %s로 바꾸는데 실패했습니다\n" -#: src/group-list.c:74 src/id.c:350 +#: src/group-list.c:74 src/id.c:370 #, fuzzy, c-format msgid "failed to get groups for the current process" msgstr "%s의 그룹을 %s로 바꾸는데 실패했습니다\n" -#: src/group-list.c:104 +#: src/group-list.c:114 #, fuzzy, c-format msgid "cannot find name for group ID %lu" msgstr "%s의 소유자 그리고/혹은 그룹을 바꿀 수 없습니다" @@ -4119,7 +4172,6 @@ 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" -"\n" msgstr "" "각 <파일>의 맨 첫 10줄을 표준 출력에 표시합니다.\n" "두 개 이상의 <파일>의 경우, 각각의 파일마다 파일이름을 나타내는 헤더를 먼" @@ -4128,7 +4180,7 @@ msgstr "" "다.\n" "\n" -#: src/head.c:118 +#: src/head.c:117 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -4138,7 +4190,7 @@ msgid "" " K lines of each file\n" msgstr "" -#: src/head.c:126 +#: src/head.c:125 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4146,7 +4198,7 @@ msgstr "" " -q, --quiet, --silent 파일이름을 나타내는 헤더를 표시하지 않습니다\n" " -v, --verbose 언제나 파일이름을 나타내는 헤더를 표시합니다\n" -#: src/head.c:132 +#: src/head.c:131 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -4154,58 +4206,58 @@ msgid "" "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n" msgstr "" -#: src/head.c:152 -#, c-format -msgid "error writing %s" -msgstr "%s에 쓰는 도중 오류 발생" - -#: src/head.c:155 +#: src/head.c:154 #, c-format msgid "%s: file has shrunk too much" msgstr "" -#: src/head.c:228 src/head.c:1044 +#: src/head.c:227 src/head.c:1051 #, fuzzy, c-format msgid "%s: number of bytes is too large" msgstr "비교할 바이트의 개수가 부적절합니다" -#: src/head.c:441 +#: src/head.c:440 #, fuzzy, c-format msgid "%s: cannot lseek back to original position" msgstr "%s: 상대 오프셋 %s%s로(으로) 갈 수 없습니다" -#: src/head.c:613 src/head.c:684 src/tail.c:450 +#: src/head.c:612 src/head.c:691 src/tail.c:449 #, fuzzy, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: 오프셋 %s%s로(으로) 갈 수 없습니다" -#: src/head.c:791 +#: src/head.c:673 +#, 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에 대한 파일 포인터를 재위치할 수 없습니다" -#: src/head.c:878 +#: src/head.c:885 #, c-format msgid "%s: %s is so large that it is not representable" msgstr "%s: %s은(는) 너무 커서 표시할 수 없습니다" -#: src/head.c:879 +#: src/head.c:886 msgid "number of lines" msgstr "행의 개수" -#: src/head.c:879 +#: src/head.c:886 msgid "number of bytes" msgstr "바이트 수" -#: src/head.c:886 src/tail.c:1947 +#: src/head.c:893 src/tail.c:1947 msgid "invalid number of lines" msgstr "부적절한 행의 개수" -#: src/head.c:887 src/tail.c:1948 +#: src/head.c:894 src/tail.c:1948 msgid "invalid number of bytes" msgstr "%s: 부적절한 바이트 수" -#: src/head.c:974 src/head.c:1032 +#: src/head.c:981 src/head.c:1039 #, fuzzy, c-format msgid "invalid trailing option -- %c" msgstr "%s: 부적절한 옵션 -- %c\n" @@ -4302,86 +4354,86 @@ msgstr "" msgid "cannot get effective UID" msgstr "%s 디렉토리를 만들 수 없습니다" -#: src/id.c:289 +#: src/id.c:311 #, fuzzy, c-format -msgid "cannot find name for user ID %lu" +msgid "cannot find name for user ID %s" msgstr "%s의 소유자 그리고/혹은 그룹을 바꿀 수 없습니다" -#: src/id.c:309 +#: src/id.c:329 #, c-format -msgid "uid=%lu" +msgid "uid=%s" msgstr "" -#: src/id.c:314 +#: src/id.c:334 #, c-format -msgid " gid=%lu" +msgid " gid=%s" msgstr "" -#: src/id.c:321 +#: src/id.c:341 #, c-format -msgid " euid=%lu" +msgid " euid=%s" msgstr "" -#: src/id.c:329 +#: src/id.c:349 #, c-format -msgid " egid=%lu" +msgid " egid=%s" msgstr "" -#: src/id.c:357 +#: src/id.c:377 msgid " groups=" msgstr "" -#: src/id.c:373 +#: src/id.c:393 #, c-format msgid " context=%s" msgstr "" -#: src/install.c:372 +#: src/install.c:373 #, fuzzy, c-format msgid "warning: %s: failed to change context to %s" msgstr "%s 디렉토리를 만들 수 없습니다" -#: src/install.c:413 +#: src/install.c:414 #, fuzzy, c-format msgid "creating directory %s" msgstr "%s 디렉토리를 만들 수 없습니다" -#: src/install.c:481 +#: src/install.c:482 #, fuzzy, c-format msgid "cannot change ownership of %s" msgstr "%s의 허가를 바꿀 수 없습니다" -#: src/install.c:505 +#: src/install.c:506 #, fuzzy, c-format msgid "cannot set time stamps for %s" msgstr "%s 디렉토리를 만들 수 없습니다" -#: src/install.c:526 src/split.c:412 src/timeout.c:387 +#: src/install.c:527 src/split.c:426 src/timeout.c:439 #, fuzzy, c-format msgid "fork system call failed" msgstr "블록 특수 파일" -#: src/install.c:530 +#: src/install.c:531 #, fuzzy, c-format msgid "cannot run %s" msgstr "`%s'에서 ioctl을 할 수 없습니다" -#: src/install.c:534 +#: src/install.c:535 #, fuzzy, c-format msgid "waiting for strip" msgstr "%s에 쓰는 도중 오류 발생" -#: src/install.c:536 +#: src/install.c:537 #, c-format msgid "strip process terminated abnormally" msgstr "" -#: src/install.c:557 +#: src/install.c:558 #, fuzzy, c-format msgid "invalid user %s" msgstr "잘못된 사용자" -#: src/install.c:593 +#: src/install.c:594 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -4393,7 +4445,7 @@ msgstr "" " 또는: %s [OPTION]... SOURCE... DIRECTORY\n" " 또는: %s -d [OPTION]... --target-directory=DIRECTORY SOURCE...\n" -#: src/install.c:600 +#: src/install.c:601 msgid "" "\n" "This install program copies files (often just compiled) into destination\n" @@ -4405,7 +4457,6 @@ msgid "" "In the first three forms, copy SOURCE to DEST or multiple SOURCE(s) to\n" "the existing DIRECTORY, while setting permission modes and owner/group.\n" "In the 4th form, create all components of the given DIRECTORY(ies).\n" -"\n" msgstr "" #: src/install.c:615 @@ -4453,53 +4504,53 @@ msgid "" "directories\n" msgstr "" -#: src/install.c:858 +#: src/install.c:859 #, c-format msgid "" "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled" msgstr "" -#: src/install.c:868 +#: src/install.c:869 #, c-format msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled" msgstr "" -#: src/install.c:885 +#: src/install.c:886 #, c-format msgid "the strip option may not be used when installing a directory" msgstr "strip옵션은 디렉토리를 설치할 때는 쓸 수 없습니다" -#: src/install.c:888 +#: src/install.c:889 #, fuzzy, c-format msgid "target directory not allowed when installing a directory" msgstr "strip옵션은 디렉토리를 설치할 때는 쓸 수 없습니다" -#: src/install.c:892 +#: src/install.c:893 #, c-format msgid "cannot force target context to %s and preserve it" msgstr "" -#: src/install.c:946 src/mkdir.c:202 src/stdbuf.c:327 +#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326 #, fuzzy, c-format msgid "invalid mode %s" msgstr "부적절한 폭: `%s'" -#: src/install.c:953 +#: src/install.c:954 #, c-format msgid "WARNING: ignoring --strip-program option as -s option was not specified" msgstr "" -#: src/install.c:958 +#: src/install.c:959 #, fuzzy, c-format msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive" msgstr "--string과 --check 옵션은 상호 배타적입니다" -#: src/install.c:965 +#: src/install.c:966 #, fuzzy, c-format msgid "options --compare (-C) and --strip are mutually exclusive" msgstr "--string과 --check 옵션은 상호 배타적입니다" -#: src/install.c:971 +#: src/install.c:972 #, c-format msgid "" "the --compare (-C) option is ignored when you specify a mode with non-" @@ -4507,7 +4558,7 @@ msgid "" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/join.c:40 src/sort.c:65 +#: src/join.c:40 src/sort.c:66 #, fuzzy msgid "Mike Haertel" msgstr "Mike Haertel 그리고 Paul Eggert" @@ -4589,7 +4640,7 @@ msgstr "" #: src/join.c:403 #, c-format -msgid "%s:%ju: is not sorted: %.*s" +msgid "%s:%<PRIuMAX>: is not sorted: %.*s" msgstr "" #: src/join.c:840 src/join.c:1038 @@ -4617,12 +4668,12 @@ msgstr "" msgid "conflicting empty-field replacement strings" msgstr "" -#: src/join.c:1101 src/sort.c:4414 +#: src/join.c:1101 src/sort.c:4468 #, fuzzy, c-format msgid "multi-character tab %s" msgstr "여러 문자로 된 탭 `%s'" -#: src/join.c:1105 src/sort.c:4419 +#: src/join.c:1105 src/sort.c:4473 #, c-format msgid "incompatible tabs" msgstr "" @@ -4641,12 +4692,10 @@ msgid "" msgstr "" #: src/kill.c:82 -msgid "" -"Send signals to processes, or list signals.\n" -"\n" +msgid "Send signals to processes, or list signals.\n" msgstr "" -#: src/kill.c:89 +#: src/kill.c:88 msgid "" " -s, --signal=SIGNAL, -SIGNAL\n" " specify the name or number of the signal to be sent\n" @@ -4655,7 +4704,7 @@ msgid "" " -t, --table print a table of signal information\n" msgstr "" -#: src/kill.c:97 +#: src/kill.c:96 msgid "" "\n" "SIGNAL may be a signal name like 'HUP', or a signal number like '1',\n" @@ -4663,32 +4712,32 @@ msgid "" "PID is an integer; if negative it identifies a process group.\n" msgstr "" -#: src/kill.c:206 +#: src/kill.c:205 #, fuzzy, c-format msgid "%s: invalid process id" msgstr "%s: 부적절한 패턴" -#: src/kill.c:260 +#: src/kill.c:259 #, fuzzy, c-format msgid "invalid option -- %c" msgstr "%s: 부적절한 옵션 -- %c\n" -#: src/kill.c:269 +#: src/kill.c:268 #, c-format msgid "%s: multiple signals specified" msgstr "" -#: src/kill.c:283 +#: src/kill.c:282 #, c-format msgid "multiple -l or -t options specified" msgstr "" -#: src/kill.c:300 +#: src/kill.c:299 #, c-format msgid "cannot combine signal with -l or -t" msgstr "" -#: src/kill.c:306 +#: src/kill.c:305 #, c-format msgid "no process ID specified" msgstr "" @@ -4795,10 +4844,9 @@ msgid "" "When creating hard links, each TARGET must exist. Symbolic links\n" "can hold arbitrary text; if later resolved, a relative link is\n" "interpreted in relation to its parent directory.\n" -"\n" msgstr "" -#: src/ln.c:395 +#: src/ln.c:394 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -4811,7 +4859,7 @@ msgid "" " -f, --force remove existing destination files\n" msgstr "" -#: src/ln.c:403 +#: src/ln.c:402 msgid "" " -i, --interactive prompt whether to remove destinations\n" " -L, --logical dereference TARGETs that are symbolic links\n" @@ -4823,7 +4871,7 @@ msgid "" " -s, --symbolic make symbolic links instead of hard links\n" msgstr "" -#: src/ln.c:412 +#: src/ln.c:411 msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" " -t, --target-directory=DIRECTORY specify the DIRECTORY in which to " @@ -4833,29 +4881,10 @@ msgid "" " -v, --verbose print name of each linked file\n" msgstr "" -#: src/ln.c:428 -#, 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" - -#: src/ln.c:435 +#: src/ln.c:433 #, 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 "" @@ -4926,7 +4955,7 @@ msgstr "환경변수 COLUMNS의 값에 다음의 잘못된 폭이 지정되었 msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "환경변수 TABSIZE의 값에 다음의 잘못된 탭 크기가 지정되었습니다: %s" -#: src/ls.c:1750 src/ptx.c:1976 +#: src/ls.c:1750 src/ptx.c:1975 #, fuzzy, c-format msgid "invalid line width: %s" msgstr "부적절한 폭: `%s'" @@ -4990,7 +5019,7 @@ msgstr "%s 디렉토리를 만들 수 없습니다" msgid "closing directory %s" msgstr "%s 디렉토리로 chdir할 수 없습니다" -#: src/ls.c:3301 +#: src/ls.c:3302 #, fuzzy, c-format msgid "cannot compare file names %s and %s" msgstr "비교한 문자열은 %s과(와) %s입니다." @@ -4999,10 +5028,9 @@ msgstr "비교한 문자열은 %s과(와) %s입니다." msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" -"\n" msgstr "" -#: src/ls.c:4729 +#: src/ls.c:4728 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -5011,7 +5039,7 @@ msgid "" "characters\n" msgstr "" -#: src/ls.c:4735 +#: src/ls.c:4734 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them. E." "g.,\n" @@ -5025,7 +5053,7 @@ msgid "" " otherwise: sort by ctime, newest first\n" msgstr "" -#: src/ls.c:4745 +#: src/ls.c:4744 msgid "" " -C list entries by columns\n" " --color[=WHEN] colorize the output. WHEN defaults to " @@ -5037,7 +5065,7 @@ msgid "" " -D, --dired generate output designed for Emacs' dired mode\n" msgstr "" -#: src/ls.c:4753 +#: src/ls.c:4752 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -5047,11 +5075,11 @@ msgid "" " --full-time like -l --time-style=full-iso\n" msgstr "" -#: src/ls.c:4761 +#: src/ls.c:4760 msgid " -g like -l, but do not list owner\n" msgstr "" -#: src/ls.c:4764 +#: src/ls.c:4763 msgid "" " --group-directories-first\n" " group directories before files.\n" @@ -5059,7 +5087,7 @@ msgid "" " use of --sort=none (-U) disables grouping\n" msgstr "" -#: src/ls.c:4770 +#: src/ls.c:4769 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" @@ -5067,7 +5095,7 @@ msgid "" " --si likewise, but use powers of 1000 not 1024\n" msgstr "" -#: src/ls.c:4776 +#: src/ls.c:4775 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5080,7 +5108,7 @@ msgid "" " (overridden by -a or -A)\n" msgstr "" -#: src/ls.c:4786 +#: src/ls.c:4785 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -5092,7 +5120,7 @@ msgid "" " -k, --kibibytes use 1024-byte blocks\n" msgstr "" -#: src/ls.c:4796 +#: src/ls.c:4795 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5102,7 +5130,7 @@ msgid "" "entries\n" msgstr "" -#: src/ls.c:4804 +#: src/ls.c:4803 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. " @@ -5113,7 +5141,7 @@ msgid "" " append / indicator to directories\n" msgstr "" -#: src/ls.c:4812 +#: src/ls.c:4811 #, fuzzy msgid "" " -q, --hide-control-chars print ? instead of non graphic characters\n" @@ -5156,7 +5184,7 @@ msgstr "" " -R, --recursive 서브디렉토리까지 출력합니다\n" " -s, --size 각 파일의 블록 크기를 출력합니다\n" -#: src/ls.c:4821 +#: src/ls.c:4820 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -5164,7 +5192,7 @@ msgid "" "blocks\n" msgstr "" -#: src/ls.c:4826 +#: src/ls.c:4825 msgid "" " -S sort by file size\n" " --sort=WORD sort by WORD instead of name: none -U,\n" @@ -5176,7 +5204,7 @@ msgid "" " if --sort=time\n" msgstr "" -#: src/ls.c:4836 +#: src/ls.c:4835 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, +FORMAT.\n" @@ -5188,13 +5216,13 @@ msgid "" " takes effect only outside the POSIX locale\n" msgstr "" -#: src/ls.c:4845 +#: src/ls.c:4844 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:4849 +#: src/ls.c:4848 msgid "" " -u with -lt: sort by, and show, access time\n" " with -l: show access time and sort by name\n" @@ -5203,7 +5231,7 @@ msgid "" " -v natural sort of (version) numbers within text\n" msgstr "" -#: src/ls.c:4856 +#: src/ls.c:4855 #, fuzzy msgid "" " -w, --width=COLS assume screen width instead of current value\n" @@ -5218,7 +5246,7 @@ msgstr "" " 출력합니다\n" " -n (무시됨)\n" -#: src/ls.c:4866 +#: src/ls.c:4865 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5227,7 +5255,7 @@ msgid "" "variable can change the settings. Use the dircolors command to set it.\n" msgstr "" -#: src/ls.c:4873 +#: src/ls.c:4872 msgid "" "\n" "Exit status:\n" @@ -5252,7 +5280,7 @@ msgstr "" msgid "David Madore" msgstr "" -#: src/md5sum.c:162 +#: src/md5sum.c:164 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -5265,13 +5293,13 @@ msgstr "" "%s (%d비트) 체크섬을 표시하거나 검사합니다.\n" "<파일>이 주어지지 않거나, <파일>이 `-'이면, 표준 입력을 읽습니다.\n" -#: src/md5sum.c:172 +#: src/md5sum.c:174 msgid "" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr "" -#: src/md5sum.c:176 +#: src/md5sum.c:178 #, fuzzy msgid " -b, --binary read in binary mode\n" msgstr "" @@ -5279,21 +5307,25 @@ msgstr "" " -B, --binary 콘솔 장치에 이진 데이타를 씁니다\n" "\n" -#: src/md5sum.c:179 +#: src/md5sum.c:181 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr "" -#: src/md5sum.c:183 +#: src/md5sum.c:184 +msgid " --tag create a BSD-style checksum\n" +msgstr "" + +#: src/md5sum.c:188 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" -#: src/md5sum.c:187 +#: src/md5sum.c:192 msgid " -t, --text read in text mode (default)\n" msgstr "" -#: src/md5sum.c:190 +#: src/md5sum.c:195 #, fuzzy msgid "" "\n" @@ -5309,12 +5341,12 @@ msgstr "" " -w, --warn 틀린 형식의 체크섬 줄에 대해 경고합니다\n" "\n" -#: src/md5sum.c:198 +#: src/md5sum.c:203 msgid "" " --strict with --check, exit non-zero for any invalid input\n" msgstr "" -#: src/md5sum.c:203 +#: src/md5sum.c:208 #, fuzzy, c-format msgid "" "\n" @@ -5329,77 +5361,87 @@ msgstr "" "나타내는 문자 (이진 파일은 `*', 문서 파일은 ` '), 그리고 각 <파일>의 \n" "이름입니다.\n" -#: src/md5sum.c:502 +#: src/md5sum.c:523 #, fuzzy, c-format msgid "%s: too many checksum lines" msgstr "%s: 올바른 형식을 갖춘 %s 체크섬 행을 찾지 못했음" -#: src/md5sum.c:526 +#: src/md5sum.c:547 #, fuzzy, c-format msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line" msgstr "%s: %lu: 올바르지 않은 형식을 갖춘 %s 체크섬 행" -#: src/md5sum.c:551 +#: src/md5sum.c:572 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: 열기 또는 읽기 실패\n" -#: src/md5sum.c:574 +#: src/md5sum.c:595 msgid "FAILED" msgstr "실패" -#: src/md5sum.c:576 +#: src/md5sum.c:597 msgid "OK" msgstr "성공" -#: src/md5sum.c:600 +#: src/md5sum.c:621 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "%s: 올바른 형식을 갖춘 %s 체크섬 행을 찾지 못했음" -#: src/md5sum.c:610 +#: src/md5sum.c:631 #, c-format msgid "WARNING: %<PRIuMAX> line is improperly formatted" msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted" msgstr[0] "" msgstr[1] "" -#: src/md5sum.c:618 +#: src/md5sum.c:639 #, 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:626 +#: src/md5sum.c:647 #, 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:704 +#: src/md5sum.c:760 +#, c-format +msgid "--tag does not support --text mode" +msgstr "" + +#: src/md5sum.c:766 +#, fuzzy, c-format +msgid "the --tag option is meaningless when verifying checksums" +msgstr "--status 옵션은 오직 체크섬을 검사할 때만 의미가 있습니다" + +#: src/md5sum.c:773 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" msgstr "--binary와 --text 옵션은 오직 체크섬을 검사할 때만 의미가 있습니다" -#: src/md5sum.c:712 +#: src/md5sum.c:781 #, c-format msgid "the --status option is meaningful only when verifying checksums" msgstr "--status 옵션은 오직 체크섬을 검사할 때만 의미가 있습니다" -#: src/md5sum.c:719 +#: src/md5sum.c:788 #, c-format msgid "the --warn option is meaningful only when verifying checksums" msgstr "--warn 옵션은 오직 체크섬을 검사할 때만 의미가 있습니다" -#: src/md5sum.c:726 +#: src/md5sum.c:795 #, fuzzy, c-format msgid "the --quiet option is meaningful only when verifying checksums" msgstr "--status 옵션은 오직 체크섬을 검사할 때만 의미가 있습니다" -#: src/md5sum.c:733 +#: src/md5sum.c:802 #, fuzzy, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "--status 옵션은 오직 체크섬을 검사할 때만 의미가 있습니다" @@ -5410,12 +5452,10 @@ msgid "Usage: %s [OPTION]... DIRECTORY...\n" msgstr "사용법: %s [<옵션>]... [<파일>]...\n" #: src/mkdir.c:57 -msgid "" -"Create the DIRECTORY(ies), if they do not already exist.\n" -"\n" +msgid "Create the DIRECTORY(ies), if they do not already exist.\n" msgstr "" -#: src/mkdir.c:64 +#: src/mkdir.c:63 #, fuzzy msgid "" " -m, --mode=MODE set file mode (as in chmod), not a=rwx - umask\n" @@ -5433,7 +5473,7 @@ msgstr "" " --help 이 도움말을 표시하고 종료합니다\n" " --version 버전 정보를 표시하고 종료합니다\n" -#: src/mkdir.c:169 +#: src/mkdir.c:168 #, fuzzy, c-format msgid "created directory %s" msgstr "%s 디렉토리를 만들 수 없습니다" @@ -5444,12 +5484,10 @@ msgid "Usage: %s [OPTION]... NAME...\n" msgstr "사용법: %s [<옵션>]... [<파일>]...\n" #: src/mkfifo.c:52 -msgid "" -"Create named pipes (FIFOs) with the given NAMEs.\n" -"\n" +msgid "Create named pipes (FIFOs) with the given NAMEs.\n" msgstr "" -#: src/mkfifo.c:59 src/mknod.c:61 +#: src/mkfifo.c:58 src/mknod.c:60 #, fuzzy msgid "" " -m, --mode=MODE set file permission bits to MODE, not a=rw - umask\n" @@ -5460,17 +5498,17 @@ msgstr "" " --help 이 도움말을 표시하고 종료합니다\n" " --version 버전 정보를 표시하고 종료합니다\n" -#: src/mkfifo.c:62 +#: src/mkfifo.c:61 msgid "" " -Z, --context=CTX set the SELinux security context of each NAME to CTX\n" msgstr "" -#: src/mkfifo.c:122 src/mknod.c:128 +#: src/mkfifo.c:121 src/mknod.c:127 #, fuzzy, c-format msgid "invalid mode" msgstr "부적절한 숫자" -#: src/mkfifo.c:127 src/mknod.c:133 +#: src/mkfifo.c:126 src/mknod.c:132 #, c-format msgid "mode must specify only file permission bits" msgstr "" @@ -5481,16 +5519,14 @@ msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n" msgstr "사용법: %s [<옵션>]... <집합1> [<집합2>]\n" #: src/mknod.c:54 -msgid "" -"Create the special file NAME of the given TYPE.\n" -"\n" +msgid "Create the special file NAME of the given TYPE.\n" msgstr "" -#: src/mknod.c:64 +#: src/mknod.c:63 msgid " -Z, --context=CTX set the SELinux security context of NAME to CTX\n" msgstr "" -#: src/mknod.c:69 +#: src/mknod.c:68 msgid "" "\n" "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n" @@ -5499,7 +5535,7 @@ msgid "" "otherwise, as decimal. TYPE may be:\n" msgstr "" -#: src/mknod.c:76 +#: src/mknod.c:75 #, fuzzy msgid "" "\n" @@ -5520,44 +5556,44 @@ msgstr "" " c, u 캐릭터(버퍼링 없는) 특별 파일을 만듭니다.\n" " p FIFO를 만듭니다\n" -#: src/mknod.c:151 +#: src/mknod.c:150 #, fuzzy msgid "Special files require major and minor device numbers." msgstr "" "블럭 특별 파일을 만들 때에는, major와 minor장치 번호를\n" "지정해야 합니다" -#: src/mknod.c:161 +#: src/mknod.c:160 #, fuzzy msgid "Fifos do not have major and minor device numbers." msgstr "부적절한 시작 행번호: `%s'" -#: src/mknod.c:177 +#: src/mknod.c:176 #, fuzzy, c-format msgid "block special files not supported" msgstr "블록 특수 파일" -#: src/mknod.c:186 +#: src/mknod.c:185 #, fuzzy, c-format msgid "character special files not supported" msgstr "문자 특수 파일" -#: src/mknod.c:202 +#: src/mknod.c:201 #, fuzzy, c-format msgid "invalid major device number %s" msgstr "부적절한 시작 행번호: `%s'" -#: src/mknod.c:207 +#: src/mknod.c:206 #, fuzzy, c-format msgid "invalid minor device number %s" msgstr "부적절한 시작 행번호: `%s'" -#: src/mknod.c:212 +#: src/mknod.c:211 #, fuzzy, c-format msgid "invalid device %s %s" msgstr "%2$s에 대해 부적절한 인자 %1$s" -#: src/mknod.c:226 +#: src/mknod.c:225 #, fuzzy, c-format msgid "invalid device type %s" msgstr "%2$s에 대해 부적절한 인자 %1$s" @@ -5616,58 +5652,56 @@ msgid "" " directory specified via -p; else /tmp [deprecated]\n" msgstr "" -#: src/mktemp.c:222 +#: src/mktemp.c:223 #, c-format msgid "failed to redirect stderr to /dev/null" msgstr "" -#: src/mktemp.c:228 +#: src/mktemp.c:229 #, fuzzy, c-format msgid "too many templates" msgstr "인수가 너무 많음" -#: src/mktemp.c:248 +#: src/mktemp.c:249 #, c-format msgid "with --suffix, template %s must end in X" msgstr "" -#: src/mktemp.c:273 src/split.c:1117 +#: src/mktemp.c:274 src/split.c:1130 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "" -#: src/mktemp.c:278 +#: src/mktemp.c:279 #, c-format msgid "too few X's in template %s" msgstr "" -#: src/mktemp.c:291 +#: src/mktemp.c:292 #, c-format msgid "invalid template, %s, contains directory separator" msgstr "" -#: src/mktemp.c:305 +#: src/mktemp.c:306 #, c-format msgid "invalid template, %s; with --tmpdir, it may not be absolute" msgstr "" -#: src/mktemp.c:325 +#: src/mktemp.c:326 #, fuzzy, c-format msgid "failed to create directory via template %s" msgstr "%s 디렉토리를 만들 수 없습니다" -#: src/mktemp.c:335 +#: src/mktemp.c:336 #, fuzzy, c-format msgid "failed to create file via template %s" msgstr "%s의 시간을 유지합니다" -#: src/mv.c:290 -msgid "" -"Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" -"\n" +#: src/mv.c:292 +msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" msgstr "" -#: src/mv.c:297 +#: src/mv.c:298 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -5680,7 +5714,7 @@ msgid "" "effect.\n" msgstr "" -#: src/mv.c:306 +#: src/mv.c:307 msgid "" " --strip-trailing-slashes remove any trailing slashes from each " "SOURCE\n" @@ -5688,7 +5722,7 @@ msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" msgstr "" -#: src/mv.c:311 +#: src/mv.c:312 #, fuzzy msgid "" " -t, --target-directory=DIRECTORY move all SOURCE arguments into " @@ -5726,28 +5760,30 @@ msgstr "사용법: %s [<옵션>] [<파일>]...\n" #, c-format msgid "" "Run COMMAND with an adjusted niceness, which affects process scheduling.\n" -"With no COMMAND, print the current niceness. Nicenesses range from\n" -"%d (most favorable scheduling) to %d (least favorable).\n" -"\n" -" -n, --adjustment=N add integer N to the niceness (default 10)\n" +"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 "" + +#: src/nice.c:82 +msgid " -n, --adjustment=N add integer N to the niceness (default 10)\n" msgstr "" -#: src/nice.c:168 +#: src/nice.c:172 #, fuzzy, c-format msgid "invalid adjustment %s" msgstr "%2$s에 대해 부적절한 인자 %1$s" -#: src/nice.c:177 +#: src/nice.c:181 #, c-format msgid "a command must be given with an adjustment" msgstr "" -#: src/nice.c:184 src/nice.c:195 +#: src/nice.c:188 src/nice.c:199 #, fuzzy, c-format msgid "cannot get niceness" msgstr "임시 파일을 만들 수 없습니다" -#: src/nice.c:201 +#: src/nice.c:205 #, fuzzy, c-format msgid "cannot set niceness" msgstr "`%s'의 정보(stat)를 얻을 수 없습니다" @@ -5757,16 +5793,16 @@ msgstr "`%s'의 정보(stat)를 얻을 수 없습니다" msgid "Scott Bartram" msgstr "" -#: src/nl.c:186 +#: 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" -"\n" msgstr "" "각 <파일>을 줄번호를 붙여서 표준 출력에 씁니다.\n" "<파일>이 주어지지 않거나, <파일>이 `-'이면, 표준 입력을 읽습니다.\n" -#: src/nl.c:194 +#: src/nl.c:186 msgid "" " -b, --body-numbering=STYLE use STYLE for numbering body lines\n" " -d, --section-delimiter=CC use CC for separating logical pages\n" @@ -5778,7 +5814,7 @@ msgstr "" " -f, --footer-numbering=<스타일> 아래단에 번호를 붙이는 데 <스타일>을 씁니" "다\n" -#: src/nl.c:199 +#: src/nl.c:191 #, fuzzy msgid "" " -h, --header-numbering=STYLE use STYLE for numbering header lines\n" @@ -5798,7 +5834,7 @@ msgstr "" "다\n" " -s, --number-separator=<문자열> 줄 번호 다음에 <문자열>을 추가합니다\n" -#: src/nl.c:207 +#: src/nl.c:199 #, fuzzy msgid "" " -v, --starting-line-number=NUMBER first line number on each logical page\n" @@ -5807,7 +5843,7 @@ msgstr "" " -v, --first-page=<개수> 각 논리적 페이지에서 첫번째 줄번호\n" " -w, --number-width=<개수> 줄번호를 <개수>열에 씁니다\n" -#: src/nl.c:213 +#: src/nl.c:205 msgid "" "\n" "By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC are\n" @@ -5820,7 +5856,7 @@ msgstr "" "페이지를 구분하는 데 쓰이는 두 개의 문자이고, 두 번째 문자가 없다면 `.'이 \n" "쓰입니다: `.'을 쓰려면 `\\\\'라고 쓰십시오. <스타일>은 다음 중 하나입니다.\n" -#: src/nl.c:219 +#: src/nl.c:211 #, fuzzy msgid "" "\n" @@ -5850,52 +5886,47 @@ msgstr "" " rz 오른쪽 정렬, 앞에 0을 붙입니다\n" "\n" -#: src/nl.c:286 +#: src/nl.c:278 #, fuzzy, c-format msgid "line number overflow" msgstr "필드 개수가 0입니다" -#: src/nl.c:486 +#: src/nl.c:478 #, fuzzy, c-format msgid "invalid header numbering style: %s" msgstr "부적절한 필드 번호: `%s'" -#: src/nl.c:494 +#: src/nl.c:486 #, fuzzy, c-format msgid "invalid body numbering style: %s" msgstr "부적절한 숫자" -#: src/nl.c:502 +#: src/nl.c:494 #, fuzzy, c-format msgid "invalid footer numbering style: %s" msgstr "필드 지정에 부적절한 파일 번호: `%s'" -#: src/nl.c:511 +#: src/nl.c:503 #, fuzzy, c-format msgid "invalid starting line number: %s" msgstr "부적절한 시작 행번호: `%s'" -#: src/nl.c:517 -#, c-format -msgid "WARNING: --page-increment is deprecated; use --line-increment instead" -msgstr "" - -#: src/nl.c:524 +#: src/nl.c:512 #, fuzzy, c-format msgid "invalid line number increment: %s" msgstr "부적절한 행번호 증가: `%s'" -#: src/nl.c:536 +#: src/nl.c:524 #, fuzzy, c-format msgid "invalid number of blank lines: %s" msgstr "부적절한 빈줄의 개수: `%s'" -#: src/nl.c:550 +#: src/nl.c:538 #, fuzzy, c-format msgid "invalid line number field width: %s" msgstr "부적절한 행번호 필드 폭: `%s'" -#: src/nl.c:569 +#: src/nl.c:557 #, fuzzy, c-format msgid "invalid line numbering format: %s" msgstr "부적절한 행번호 증가: `%s'" @@ -5936,11 +5967,6 @@ msgstr "두 파일이 모두 표준 입력이면 안 됩니다" msgid "ignoring input" msgstr "인수가 너무 많음" -#: src/nohup.c:163 src/nohup.c:165 -#, fuzzy, c-format -msgid "failed to open %s" -msgstr "%s의 시간을 유지합니다" - #: src/nohup.c:175 #, c-format msgid "ignoring input and appending output to %s" @@ -5972,33 +5998,367 @@ msgid "failed to redirect standard error" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:32 +#: src/nproc.c:33 msgid "Giuseppe Scrivano" msgstr "" -#: src/nproc.c:56 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 +#: src/nproc.c:57 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 #, fuzzy, c-format msgid "Usage: %s [OPTION]...\n" msgstr "사용법: %s [<옵션>] [<파일>]...\n" -#: src/nproc.c:57 +#: src/nproc.c:58 msgid "" "Print the number of processing units available to the current process,\n" "which may be less than the number of online processors\n" "\n" msgstr "" -#: src/nproc.c:62 +#: src/nproc.c:63 msgid "" " --all print the number of installed processors\n" " --ignore=N if possible, exclude N processing units\n" msgstr "" -#: src/nproc.c:106 +#: src/nproc.c:107 #, fuzzy, c-format msgid "%s: invalid number to ignore" msgstr "%s: 부적절한 행의 개수" +#. This is a proper name. See the gettext manual, section Names. +#: src/numfmt.c:35 +msgid "Assaf Gordon" +msgstr "" + +#: src/numfmt.c:676 +#, c-format +msgid "value too large to be converted: '%s'" +msgstr "" + +#: src/numfmt.c:680 +#, fuzzy, c-format +msgid "invalid number: '%s'" +msgstr "부적절한 숫자" + +#: src/numfmt.c:684 +#, c-format +msgid "rejecting suffix in input: '%s' (consider using --from)" +msgstr "" + +#: src/numfmt.c:688 +#, fuzzy, c-format +msgid "invalid suffix in input: '%s'" +msgstr "부적절한 행번호 증가: `%s'" + +#: src/numfmt.c:692 +#, c-format +msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)" +msgstr "" + +#: src/numfmt.c:723 +#, fuzzy, c-format +msgid "failed to prepare value '%Lf' for printing" +msgstr "%s: 파일이 너무 깁니다" + +#: src/numfmt.c:787 +#, fuzzy, c-format +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 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [NUMBER]...\n" +msgstr "사용법: %s [<옵션>]... [<파일>]...\n" + +#: src/numfmt.c:816 +msgid "" +"Reformat NUMBER(s), or the numbers from standard input if none are " +"specified.\n" +msgstr "" + +#: src/numfmt.c:820 +msgid " --debug print warnings about invalid input\n" +msgstr "" + +#: src/numfmt.c:823 +msgid "" +" -d, --delimiter=X use X instead of whitespace for field delimiter\n" +msgstr "" + +#: src/numfmt.c:826 +msgid "" +" --field=N replace the number in input field N (default is 1)\n" +msgstr "" + +#: src/numfmt.c:829 +msgid "" +" --format=FORMAT use printf style floating-point FORMAT;\n" +" see FORMAT below for details\n" +msgstr "" + +#: src/numfmt.c:833 +msgid "" +" --from=UNIT auto-scale input numbers to UNITs; default is " +"'none';\n" +" see UNIT below\n" +msgstr "" + +#: src/numfmt.c:837 +msgid "" +" --from-unit=N specify the input unit size (instead of the default " +"1)\n" +msgstr "" + +#: src/numfmt.c:840 +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 "" + +#: src/numfmt.c:844 +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 +msgid "" +" --invalid=MODE failure mode for invalid numbers: MODE can be:\n" +" abort (default), fail, warn, ignore\n" +msgstr "" + +#: src/numfmt.c:852 +msgid "" +" --padding=N pad the output to N characters; positive N will\n" +" right-align; negative N will left-align;\n" +" padding is ignored if the output is wider than N;\n" +" the default is to automatically pad if a " +"whitespace\n" +" is found\n" +msgstr "" + +#: src/numfmt.c:859 +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 +msgid "" +" --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" +" SUFFIX in input numbers\n" +msgstr "" + +#: src/numfmt.c:867 +msgid "" +" --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" +msgstr "" + +#: src/numfmt.c:870 +msgid "" +" --to-unit=N the output unit size (instead of the default 1)\n" +msgstr "" + +#: src/numfmt.c:877 +msgid "" +"\n" +"UNIT options:\n" +msgstr "" + +#: src/numfmt.c:880 +msgid " none no auto-scaling is done; suffixes will trigger an error\n" +msgstr "" + +#: src/numfmt.c:883 +msgid "" +" auto accept optional single/two letter suffix:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" +msgstr "" + +#: src/numfmt.c:889 +msgid "" +" si accept optional single letter suffix:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:894 +msgid "" +" iec accept optional single letter suffix:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:899 +msgid "" +" iec-i accept optional two-letter suffix:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:905 +#, 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" +msgstr "" + +#: src/numfmt.c:912 +#, c-format +msgid "" +"\n" +"Exit status is 0 if all input numbers were successfully converted.\n" +"By default, %s will stop at the first conversion error with exit status 2.\n" +"With --invalid='fail' a warning is printed for each conversion error\n" +"and the exit status is 2. With --invalid='warn' each conversion error is\n" +"diagnosed, but the exit status is 0. With --invalid='ignore' conversion\n" +"errors are not diagnosed and the exit status is 0.\n" +msgstr "" + +#: src/numfmt.c:921 +#, c-format +msgid "" +"\n" +"Examples:\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" +msgstr "" + +#: src/numfmt.c:974 src/seq.c:212 +#, c-format +msgid "format %s has no %% directive" +msgstr "" + +#: src/numfmt.c:990 +#, fuzzy, c-format +msgid "invalid format %s (width overflow)" +msgstr "%2$s에 대해 부적절한 인자 %1$s" + +#: src/numfmt.c:1007 src/seq.c:229 +#, c-format +msgid "format %s ends in %%" +msgstr "" + +#: src/numfmt.c:1010 +#, c-format +msgid "invalid format %s, directive must be %%['][-][N]f" +msgstr "" + +#: src/numfmt.c:1018 src/seq.c:236 +#, 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 "부적절한 행번호 증가: `%s'" + +#: src/numfmt.c:1092 +#, c-format +msgid "value too large to be printed: '%Lg' (consider using --to)" +msgstr "" + +#: src/numfmt.c:1100 +#, c-format +msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" +msgstr "" + +#: src/numfmt.c:1184 +#, c-format +msgid "large input value '%s': possible precision loss" +msgstr "" + +#: src/numfmt.c:1293 +#, 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 "부적절한 타입의 문자열 `%s'" + +#: src/numfmt.c:1401 +#, fuzzy, c-format +msgid "invalid field value '%s'" +msgstr "부적절한 필드 번호: `%s'" + +#: src/numfmt.c:1430 +#, fuzzy, c-format +msgid "invalid header value '%s'" +msgstr "부적절한 폭: `%s'" + +#: src/numfmt.c:1456 +#, 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 +#, fuzzy, c-format +msgid "no conversion option specified" +msgstr "오직 한 개의 인수만 지정할 수 있습니다" + +#: src/numfmt.c:1471 +#, c-format +msgid "grouping cannot be combined with --to" +msgstr "" + +#: src/numfmt.c:1473 +#, c-format +msgid "grouping has no effect in this locale" +msgstr "" + +#: src/numfmt.c:1486 +#, c-format +msgid "--header ignored with command-line input" +msgstr "" + +#: src/numfmt.c:1511 +#, fuzzy, c-format +msgid "error reading input" +msgstr "%s을(를) 읽는 도중 오류 발생" + +#: src/numfmt.c:1520 +#, fuzzy, c-format +msgid "failed to convert some of the input numbers" +msgstr "두 파일이 모두 표준 입력이면 안 됩니다" + #: src/od.c:294 #, fuzzy, c-format msgid "" @@ -6026,28 +6386,51 @@ msgstr "" "<파일>이 주어지지 않거나, <파일>이 `-'이면, 표준 입력을 읽습니다.\n" "\n" +# 8진수 suffix에 대해서 좀 이상하다 #: src/od.c:307 -msgid "All arguments to long options are mandatory for short options.\n" -msgstr "긴 옵션의 인수는 짧은 옵션에도 꼭 필요합니다.\n" +#, fuzzy +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" +"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" +"at first byte printed, incremented when dump is progressing.\n" +"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" +"(두번째에 형식이 오는) 과거의 문법에서, <오프셋>은 `-j <오프셋>'을 뜻합니" +"다.\n" +"<레이블>은 출력할 첫 번째 바이트의 주소를 뜻하고, 내용을 표시할 때마다 그\n" +"주소에서 증가됩니다. <오프셋>과 <레이블>에서, 0x나 0X 접두어가 붙으면\n" +"16진수를 말하며, `.' 접미어는 8진수를 말하고, b는 512를 곱한다는 뜻입니다.\n" +"\n" +"<타입>은 다음중 한 개 이상으로 만들어 집니다:\n" +"\n" +" a 문자 이름\n" +" c ASCII 문자 혹은 백슬래쉬 이스케이프\n" -#: src/od.c:310 +#: src/od.c:318 +#, fuzzy msgid "" -" -A, --address-radix=RADIX decide how file offsets are printed\n" +" -A, --address-radix=RADIX output format for file offsets. RADIX is one\n" +" of [doxn], for Decimal, Octal, Hex or None\n" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" " -A, --address-radix=<기수> 파일 오프셋을 출력하는 방법을 지정합니다\n" " -j, --skip-bytes=<바이트> 입력의 첫 번째 <바이트> 바이트를 건너 뜁니다\n" -#: src/od.c:314 +#: src/od.c:323 #, 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" -" --traditional accept arguments in traditional form\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" @@ -6058,10 +6441,11 @@ msgstr "" " -w, --width[=<바이트>] 출력의 한 줄에 <바이트> 바이트를 출력합니다\n" " --traditional 고전적인 형식으로 인자를 받습니다\n" -#: src/od.c:324 +#: src/od.c:336 #, fuzzy 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" @@ -6075,7 +6459,7 @@ msgstr "" " -c `-t c'와 동일하고, ASCII 문자 혹은 백슬래쉬 이스케이프로 지정합니다\n" " -d `-t u2'와 동일하고, 10진수 unsigned short로 지정합니다\n" -#: src/od.c:332 +#: src/od.c:345 #, fuzzy msgid "" " -f same as -t fF, select floats\n" @@ -6092,40 +6476,16 @@ msgstr "" " -o -t o2와 동일하고, 8진수 short를 선택합니다\n" " -x -t x2와 동일하고, 16진수 short를 선택합니다\n" -# 8진수 suffix에 대해서 좀 이상하다 -#: src/od.c:340 -#, fuzzy +#: src/od.c:353 msgid "" "\n" -"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" -"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" -"at first byte printed, incremented when dump is progressing.\n" -"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" -"(두번째에 형식이 오는) 과거의 문법에서, <오프셋>은 `-j <오프셋>'을 뜻합니" -"다.\n" -"<레이블>은 출력할 첫 번째 바이트의 주소를 뜻하고, 내용을 표시할 때마다 그\n" -"주소에서 증가됩니다. <오프셋>과 <레이블>에서, 0x나 0X 접두어가 붙으면\n" -"16진수를 말하며, `.' 접미어는 8진수를 말하고, b는 512를 곱한다는 뜻입니다.\n" -"\n" -"<타입>은 다음중 한 개 이상으로 만들어 집니다:\n" -"\n" -" a 문자 이름\n" -" c ASCII 문자 혹은 백슬래쉬 이스케이프\n" - -#: src/od.c:349 -msgid "" "\n" "TYPE is made up of one or more of these specifications:\n" -"\n" " a named character, ignoring high-order bit\n" " c ASCII character or backslash escape\n" msgstr "" -#: src/od.c:356 +#: src/od.c:360 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -6139,10 +6499,11 @@ msgstr "" " u[<크기>] 부호없는 10진수, 각 숫자마다 <크기> 바이트\n" " x[<크기>] 16진수, 각 숫자마다 <크기> 바이트\n" -#: src/od.c:363 +#: src/od.c:367 +#, fuzzy msgid "" "\n" -"SIZE is a number. For TYPE in doux, SIZE may also be C for\n" +"SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" "sizeof(char), S for sizeof(short), I for sizeof(int) or L for\n" "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" @@ -6153,40 +6514,32 @@ msgstr "" "<타입>이 f인 경우 <크기>는 sizeof(float)이 되고, D는 sizeof(double), L은\n" "(long double)이 됩니다.\n" -#: src/od.c:370 -#, 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 "" +#: src/od.c:374 +msgid "" "\n" -"<기수>는 십진수의 경우 d, 8진수는 o, 16진수는 x, 아무것도 아니면 n입니다.\n" -"<바이트>는 0x나 0X를 붙인 16진수이며, b 접미어가 붙으면, 512가 곱해 지고,\n" -"k는 1024, m은 1048576이 곱해 집니다. 어떤 타입이라도 z 접미어를 덧붙이면\n" -"출력 줄의 끝에 표시 가능한 문자들을 표시하게 됩니다. " +"Adding a z suffix to any type displays printable characters at the end of\n" +"each output line.\n" +msgstr "" -#: src/od.c:380 -#, fuzzy +#: src/od.c:379 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" +"\n" +"BYTES is hex with 0x or 0X prefix, and may have a multiplier suffix:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"and so on for G, T, P, E, Z, Y.\n" msgstr "" -"-string을 숫자 없이 쓰면 3이라고 가정합니다. --width를 숫자 없이 쓰면 32를\n" -"가정합니다. 기본값으로 od는 `-A -o -t d2 -w 16'을 씁니다.\n" -#: src/od.c:633 src/od.c:753 +#: src/od.c:639 src/od.c:759 #, fuzzy, c-format msgid "invalid type string %s" msgstr "부적절한 타입의 문자열 `%s'" -#: src/od.c:643 +#: src/od.c:649 #, fuzzy, c-format msgid "" "invalid type string %s;\n" @@ -6195,7 +6548,7 @@ msgstr "" "부적절한 형 문자열 `%s';\n" "이 시스템은 %lu 바이트 정수형을 제공하지 않습니다" -#: src/od.c:764 +#: src/od.c:770 #, fuzzy, c-format msgid "" "invalid type string %s;\n" @@ -6204,39 +6557,39 @@ msgstr "" "부적절한 형 문자열 `%s';\n" "이 시스템은 %lu 바이트 부동소수점형을 제공하지 않습니다" -#: src/od.c:822 +#: src/od.c:828 #, fuzzy, c-format msgid "invalid character '%c' in type string %s" msgstr "부적절한 문자 %c' -- 형 문자열 `%s'" # combined input 번역 개선 -#: src/od.c:1047 +#: src/od.c:1053 #, c-format msgid "cannot skip past end of combined input" msgstr "결합된 입력의 끝을 넘어갈 수는 없습니다." -#: src/od.c:1603 +#: src/od.c:1609 #, fuzzy, c-format msgid "invalid output address radix '%c'; it must be one character from [doxn]" msgstr "" "출력 주소 기수 `%c'이(가) 부적절합니다; [odxn]중의 하나의 문자이어야 합니다" -#: src/od.c:1729 +#: src/od.c:1735 #, c-format msgid "no type may be specified when dumping strings" msgstr "문자열을 덤프할 때에는 타입이 지정되면 안됩니다" -#: src/od.c:1804 +#: src/od.c:1810 #, fuzzy msgid "compatibility mode supports at most one file" msgstr "호환 모드에서는 최대 셋까지의 인수만을 지정할 수 있습니다" -#: src/od.c:1825 +#: src/od.c:1831 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "" -#: src/od.c:1868 +#: src/od.c:1874 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "경고: 부적절한 폭 %lu; 대신 %d을(를) 사용함" @@ -6252,18 +6605,18 @@ msgid "standard input is closed" 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" -"\n" msgstr "" "순서대로 각 <파일>에서 대응되는 줄들을, TAB으로 구분되어 구성해, 표준\n" "출력으로 출력합니다.\n" "<파일>이 주어지지 않거나, <파일>이 `-'이면, 표준 입력을 읽습니다.\n" "\n" -#: src/paste.c:448 +#: 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" @@ -6272,7 +6625,7 @@ msgstr "" "다\n" " -s, --serial 동시에 하지 않고 한 번에 한 개의 파일을 씁니다\n" -#: src/paste.c:509 +#: src/paste.c:508 #, c-format msgid "delimiter list ends with an unescaped backslash: %s" msgstr "" @@ -6328,80 +6681,80 @@ msgid "Kaveh Ghazi" msgstr "" #. TRANSLATORS: Real name is unknown; at most 19 characters. -#: src/pinky.c:250 +#: src/pinky.c:242 msgid " ???" msgstr "" #. TRANSLATORS: Idle time is unknown; at most 5 characters. -#: src/pinky.c:274 +#: src/pinky.c:266 msgid "?????" msgstr "" -#: src/pinky.c:323 +#: src/pinky.c:314 #, c-format msgid "Login name: " msgstr "" -#: src/pinky.c:326 +#: src/pinky.c:317 #, c-format msgid "In real life: " msgstr "" #. TRANSLATORS: Real name is unknown; no hard limit. -#: src/pinky.c:330 +#: src/pinky.c:321 msgid "???\n" msgstr "" -#: src/pinky.c:350 +#: src/pinky.c:341 #, fuzzy, c-format msgid "Directory: " msgstr "디렉토리" -#: src/pinky.c:352 +#: src/pinky.c:343 #, c-format msgid "Shell: " msgstr "" -#: src/pinky.c:371 +#: src/pinky.c:362 #, c-format msgid "Project: " msgstr "" -#: src/pinky.c:395 +#: src/pinky.c:386 #, c-format msgid "Plan:\n" msgstr "" -#: src/pinky.c:414 +#: src/pinky.c:405 msgid "Login" msgstr "" -#: src/pinky.c:416 +#: src/pinky.c:407 msgid "Name" msgstr "" -#: src/pinky.c:417 +#: src/pinky.c:408 msgid " TTY" msgstr "" -#: src/pinky.c:419 +#: src/pinky.c:410 msgid "Idle" msgstr "" -#: src/pinky.c:420 +#: src/pinky.c:411 msgid "When" msgstr "" -#: src/pinky.c:423 +#: src/pinky.c:414 msgid "Where" msgstr "" -#: src/pinky.c:502 +#: src/pinky.c:493 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "사용법: %s [<옵션>]... [<파일>]...\n" -#: src/pinky.c:503 +#: src/pinky.c:494 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -6411,7 +6764,7 @@ msgid "" " -s do short format output, this is the default\n" msgstr "" -#: src/pinky.c:511 +#: src/pinky.c:502 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -6420,7 +6773,7 @@ msgid "" " in short format\n" msgstr "" -#: src/pinky.c:520 +#: src/pinky.c:511 #, c-format msgid "" "\n" @@ -6428,7 +6781,7 @@ msgid "" "The utmp file will be %s.\n" msgstr "" -#: src/pinky.c:604 +#: src/pinky.c:595 #, fuzzy, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "--string을 사용할 땐 파일이 지정될 수 없습니다" @@ -6444,85 +6797,84 @@ msgstr "" msgid "Roland Huebner" msgstr "Pete TerMaat 그리고 Roland Huebner" -#: src/pr.c:912 +#: src/pr.c:908 #, fuzzy, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "`--pages=<첫_페이지>[:<끝_페이지>]' 인수가 없습니다" -#: src/pr.c:914 +#: src/pr.c:910 #, fuzzy, c-format msgid "invalid page range %s" msgstr "부적절한 타입의 문자열 `%s'" -#: src/pr.c:979 +#: src/pr.c:975 #, fuzzy, c-format msgid "'-l PAGE_LENGTH' invalid number of lines: %s" msgstr "`-l 페이지_길이' 부적절한 행의 개수: `%s'" -#: src/pr.c:1003 +#: src/pr.c:999 #, fuzzy, c-format msgid "'-N NUMBER' invalid starting line number: %s" msgstr "`-N 번호' 부적절한 시작 행 번호: `%s'" -#: src/pr.c:1015 +#: src/pr.c:1011 #, fuzzy, c-format msgid "'-o MARGIN' invalid line offset: %s" msgstr "`-o 여백' 부적절한 행 옵셋: `%s'" -#: src/pr.c:1056 +#: src/pr.c:1052 #, fuzzy, c-format msgid "'-w PAGE_WIDTH' invalid number of characters: %s" msgstr "`-l 페이지_폭' 부적절한 문자 개수: `%s'" -#: src/pr.c:1070 +#: src/pr.c:1066 #, fuzzy, c-format msgid "'-W PAGE_WIDTH' invalid number of characters: %s" msgstr "`-l 페이지_폭' 부적절한 문자 개수: `%s'" -#: src/pr.c:1100 +#: src/pr.c:1096 #, fuzzy, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "병렬로 인쇄할 때에는 열의 개수를 지정할 수 없습니다." -#: src/pr.c:1104 +#: src/pr.c:1100 #, fuzzy, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "병렬 인쇄와 열에 걸쳐서 인쇄하는 것을 동시에 지정할 수는 없습니다>" -#: src/pr.c:1200 +#: src/pr.c:1196 #, fuzzy, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "`-%c' 인자에서 불필요한 문자 혹은 부적절한 숫자가 들어 있습니다: `%s'" -#: src/pr.c:1304 +#: src/pr.c:1293 #, c-format msgid "page width too narrow" msgstr "페이지 폭이 너무 좁음" -#: src/pr.c:2369 +#: src/pr.c:2353 #, c-format msgid "starting page number %<PRIuMAX> exceeds page count %<PRIuMAX>" msgstr "" -#: src/pr.c:2396 +#: src/pr.c:2380 #, fuzzy, c-format msgid "page number overflow" msgstr "필드 개수가 0입니다" -#: src/pr.c:2401 +#: src/pr.c:2385 #, c-format msgid "Page %<PRIuMAX>" msgstr "" -#: src/pr.c:2773 -msgid "" -"Paginate or columnate FILE(s) for printing.\n" -"\n" +#: src/pr.c:2757 +#, fuzzy +msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" "<파일>(들)을 페이지별로 나누거나 여러 열로 나누어 인쇄하기 좋도록 만듭니다.\n" "\n" -#: src/pr.c:2780 +#: src/pr.c:2763 #, fuzzy msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" @@ -6540,7 +6892,7 @@ msgstr "" " 인쇄합니다 (-a 옵션이 사용되지 않는다면). 페이지에서 \n" " 각각의 열에 들어 있는 줄 수가 같게 유지합니다.\n" -#: src/pr.c:2788 +#: src/pr.c:2771 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -6558,7 +6910,7 @@ msgstr "" " -d, --double-space\n" " 한 줄씩 띄워서 인쇄합니다\n" -#: src/pr.c:2796 +#: src/pr.c:2779 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -6578,7 +6930,7 @@ msgstr "" " (-F는 3줄의 페이지 헤더, -F 없이는 5줄의 헤더와 \n" " trailer)\n" -#: src/pr.c:2806 +#: src/pr.c:2789 #, fuzzy msgid "" " -h, --header=HEADER\n" @@ -6602,7 +6954,7 @@ msgstr "" " 정렬도 없습니다. --sep-string=[<문자열>]은 구분자를 지정" "합니다\n" -#: src/pr.c:2815 +#: src/pr.c:2798 #, fuzzy msgid "" " -l, --length=PAGE_LENGTH\n" @@ -6618,7 +6970,7 @@ msgstr "" " 줄을 자르지만, -J 옵션으로 여러 줄을 합쳐서 줄을 채웁니" "다\n" -#: src/pr.c:2822 +#: src/pr.c:2805 #, fuzzy msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" @@ -6635,7 +6987,7 @@ msgstr "" " 첫 번째 페이지의 첫 번째 줄을 <개수>로 해서 줄 번호를\n" " 세어 나갑니다 (+<첫_페이지> 참고)\n" -#: src/pr.c:2830 +#: src/pr.c:2813 #, fuzzy msgid "" " -o, --indent=MARGIN\n" @@ -6651,7 +7003,7 @@ msgstr "" " -r, --no-file-warnings\n" " 파일을 열 수 없을 때 경고를 생략합니다.\n" -#: src/pr.c:2837 +#: src/pr.c:2820 #, fuzzy msgid "" " -s[CHAR], --separator[=CHAR]\n" @@ -6669,7 +7021,7 @@ msgstr "" " -s[<문자>]는 모든 3열 옵션들의 (-<열>|-a -<열>|-m) \n" " 넘어가는 줄 자르기 기능을 (-w가 없으면) 끕니다.\n" -#: src/pr.c:2844 +#: src/pr.c:2827 #, fuzzy msgid "" " -S[STRING], --sep-string[=STRING]\n" @@ -6685,7 +7037,7 @@ msgstr "" " (-S\" \"와 동일). 열 관련 옵션에 영향을 주지 않습니다\n" " -t, --omit-header 페이지 헤더와 트레일러를 생략합니다\n" -#: src/pr.c:2851 +#: src/pr.c:2834 #, fuzzy msgid "" " -T, --omit-pagination\n" @@ -6709,7 +7061,7 @@ msgstr "" " 텍스트-열 출력에서, -s[<문자>]를 쓰지 않았을 경우에\n" " 페이지 폭을 <페이지_폭>(72)으로 합니다\n" -#: src/pr.c:2861 +#: src/pr.c:2844 #, fuzzy msgid "" " -W, --page-width=PAGE_WIDTH\n" @@ -6724,7 +7076,7 @@ msgstr "" "면, \n" " -S나 -s에 영향을 받지 않습니다.\n" -#: src/pr.c:2869 +#: src/pr.c:2852 #, fuzzy msgid "" "\n" @@ -6859,15 +7211,15 @@ msgstr "" "\n" #: src/ptx.c:1821 +#, fuzzy msgid "" "Output a permuted index, including context, of the words in the input " "files.\n" -"\n" msgstr "" "입력 파일에 들어 있는 단어들의 permuated 인덱스를 그 문맥과 함께 출력합니다\n" "\n" -#: src/ptx.c:1828 +#: src/ptx.c:1827 #, fuzzy msgid "" " -A, --auto-reference output automatically generated references\n" @@ -6879,7 +7231,7 @@ msgstr "" " -G, --traditional System V `ptx'와 더 비슷하게 동작합니다\n" " -F, --flag-truncation=<문자열> 넘어간 줄을 자를때 <문자열>로 표시합니다\n" -#: src/ptx.c:1833 +#: src/ptx.c:1832 #, fuzzy msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" @@ -6895,7 +7247,7 @@ msgstr "" " -S, --sentence-regexp=<정규식> 줄의 끝이나 문자의 끝을 나타내는 정규식\n" " -T, --format=tex 출력을 TeX으로 합니다\n" -#: src/ptx.c:1840 +#: src/ptx.c:1839 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -6912,7 +7264,7 @@ msgstr "" " -i, --ignore-file=<파일> 이 <파일>에 들어 있는 단어들을 무시합니다\n" " -o, --only-file=<파일> 이 <파일>에 들어 있는 단어들만 읽습니다\n" -#: src/ptx.c:1848 +#: src/ptx.c:1847 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -6923,7 +7275,7 @@ msgstr "" " -t, --typeset-mode - 구현되지 않았음 -\n" " -w, --width=<개수> 출력할 열의 폭 (참조는 제외하고)\n" -#: src/ptx.c:1855 +#: src/ptx.c:1854 #, fuzzy msgid "" "\n" @@ -6933,7 +7285,7 @@ msgstr "" "<파일>이 주어지지 않거나, <파일>이 `-'이면, 표준 입력을 읽습니다. `-F /'가 " "기본값입니다.\n" -#: src/ptx.c:1949 +#: src/ptx.c:1948 #, fuzzy, c-format msgid "invalid gap width: %s" msgstr "부적절한 폭: `%s'" @@ -6955,7 +7307,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "%s의 그룹을 %s로 바꾸는데 실패했습니다\n" -#: src/pwd.c:170 src/pwd.c:277 +#: src/pwd.c:170 src/pwd.c:277 src/split.c:373 #, fuzzy, c-format msgid "failed to stat %s" msgstr "%s의 시간을 유지합니다" @@ -6971,13 +7323,14 @@ msgid "ignoring non-option arguments" msgstr "옵션아닌 인수가 너무 많음" #. This is a proper name. See the gettext manual, section Names. -#: src/readlink.c:33 +#: src/readlink.c:32 msgid "Dmitry V. Levin" msgstr "" -#: src/readlink.c:62 +#: 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 -msgid "Usage: %s [OPTION]... FILE\n" +msgid "Usage: %s [OPTION]... FILE...\n" msgstr "사용법: %s [<옵션>]... [<파일>]...\n" #: src/readlink.c:63 @@ -7005,17 +7358,18 @@ msgid "" "recursively,\n" " without requirements on components " "existence\n" -" -n, --no-newline do not output the trailing newline\n" +" -n, --no-newline do not output the trailing delimiter\n" " -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" msgstr "" -#: src/realpath.c:71 src/rm.c:134 src/shred.c:147 src/stat.c:1330 -#: src/touch.c:215 +#: src/readlink.c:152 #, fuzzy, c-format -msgid "Usage: %s [OPTION]... FILE...\n" -msgstr "사용법: %s [<옵션>]... [<파일>]...\n" +msgid "ignoring --no-newline with multiple arguments" +msgstr "옵션아닌 인수가 너무 많음" #: src/realpath.c:72 msgid "" @@ -7042,12 +7396,12 @@ msgstr "" msgid "generating relative path" msgstr "" -#: src/remove.c:286 +#: src/remove.c:273 #, fuzzy, c-format msgid "%s: descend into write-protected directory %s? " msgstr "%s 디렉토리를 만들 수 없습니다" -#: src/remove.c:287 +#: src/remove.c:274 #, fuzzy, c-format msgid "%s: descend into directory %s? " msgstr "%s 디렉토리로 chdir할 수 없습니다" @@ -7056,49 +7410,49 @@ msgstr "%s 디렉토리로 chdir할 수 없습니다" #. translate "%s: remove %s (write-protected) %s? " #. instead. It should avoid grammatical problems #. with the output of file_type. -#: src/remove.c:303 +#: src/remove.c:290 #, fuzzy, c-format msgid "%s: remove write-protected %s %s? " msgstr "%s: 쓰기 보호된 `%s'파일을 지울까요? " -#: src/remove.c:304 +#: src/remove.c:291 #, fuzzy, c-format msgid "%s: remove %s %s? " msgstr "%s: `%s'를 지울까요? " -#: src/remove.c:417 +#: src/remove.c:374 #, fuzzy, c-format msgid "removed directory: %s\n" msgstr "%s 디렉토리를 만들 수 없습니다" -#: src/remove.c:481 +#: src/remove.c:444 #, fuzzy, c-format msgid "cannot remove directory: %s" msgstr "%s 디렉토리를 만들 수 없습니다" -#: src/remove.c:537 +#: src/remove.c:500 #, c-format msgid "skipping %s, since it's on a different device" msgstr "" -#: src/remove.c:557 +#: src/remove.c:520 #, fuzzy, c-format msgid "traversal failed: %s" msgstr "파일 읽기 실패" -#: src/remove.c:563 +#: src/remove.c:526 #, c-format msgid "" "unexpected failure: fts_info=%d: %s\n" "please report to %s" msgstr "" -#: src/rm.c:118 +#: src/rm.c:119 #, c-format msgid "Try '%s ./%s' to remove the file %s.\n" msgstr "" -#: src/rm.c:135 +#: src/rm.c:136 msgid "" "Remove (unlink) the FILE(s).\n" "\n" @@ -7107,7 +7461,7 @@ msgid "" " -i prompt before every removal\n" msgstr "" -#: src/rm.c:141 +#: src/rm.c:142 msgid "" " -I prompt once before removing more than three files, " "or\n" @@ -7119,22 +7473,23 @@ msgid "" " always (-i). Without WHEN, prompt always\n" msgstr "" -#: src/rm.c:148 +#: src/rm.c:149 msgid "" " --one-file-system when removing a hierarchy recursively, skip any\n" " directory that is on a file system different from\n" " that of the corresponding command line argument\n" msgstr "" -#: src/rm.c:153 +#: src/rm.c:154 msgid "" " --no-preserve-root do not treat '/' specially\n" " --preserve-root do not remove '/' (default)\n" " -r, -R, --recursive remove directories and their contents recursively\n" +" -d, --dir remove empty directories\n" " -v, --verbose explain what is being done\n" msgstr "" -#: src/rm.c:161 +#: src/rm.c:163 msgid "" "\n" "By default, rm does not remove directories. Use the --recursive (-r or -R)\n" @@ -7142,7 +7497,7 @@ msgid "" "contents.\n" msgstr "" -#: src/rm.c:166 +#: src/rm.c:168 #, c-format msgid "" "\n" @@ -7153,7 +7508,7 @@ msgid "" " %s ./-foo\n" msgstr "" -#: src/rm.c:175 +#: src/rm.c:177 msgid "" "\n" "Note that if you use rm to remove a file, it might be possible to recover\n" @@ -7161,12 +7516,12 @@ msgid "" "assurance that the contents are truly unrecoverable, consider using shred.\n" msgstr "" -#: src/rm.c:335 +#: src/rm.c:342 #, c-format msgid "%s: remove all arguments recursively? " msgstr "" -#: src/rm.c:336 +#: src/rm.c:343 #, fuzzy, c-format msgid "%s: remove all arguments? " msgstr "%s: `%s'를 지울까요? " @@ -7225,7 +7580,10 @@ msgstr "" msgid "" "Run a program in a different security context.\n" "With neither CONTEXT nor COMMAND, print the current security context.\n" -"\n" +msgstr "" + +#: src/runcon.c:94 +msgid "" " CONTEXT Complete security context\n" " -c, --compute compute process transition context before modifying\n" " -t, --type=TYPE type (for same role as parent)\n" @@ -7235,72 +7593,72 @@ msgid "" "\n" msgstr "" -#: src/runcon.c:140 +#: src/runcon.c:144 #, c-format msgid "multiple roles" msgstr "" -#: src/runcon.c:145 +#: src/runcon.c:149 #, c-format msgid "multiple types" msgstr "" -#: src/runcon.c:150 +#: src/runcon.c:154 #, c-format msgid "multiple users" msgstr "" -#: src/runcon.c:155 +#: src/runcon.c:159 #, c-format msgid "multiple levelranges" msgstr "" -#: src/runcon.c:173 src/runcon.c:209 +#: src/runcon.c:177 src/runcon.c:213 #, fuzzy, c-format msgid "failed to get current context" msgstr "%s의 시간을 유지합니다" -#: src/runcon.c:183 +#: src/runcon.c:187 #, c-format msgid "you must specify -c, -t, -u, -l, -r, or context" msgstr "" -#: src/runcon.c:191 +#: src/runcon.c:195 #, fuzzy, c-format msgid "no command specified" msgstr "오직 한 개의 인수만 지정할 수 있습니다" -#: src/runcon.c:197 +#: src/runcon.c:201 #, c-format msgid "%s may be used only on a SELinux kernel" msgstr "" -#: src/runcon.c:223 +#: src/runcon.c:227 #, c-format msgid "failed to compute a new context" msgstr "" -#: src/runcon.c:237 +#: src/runcon.c:241 #, fuzzy, c-format msgid "failed to set new user %s" msgstr "%s의 시간을 유지합니다" -#: src/runcon.c:239 +#: src/runcon.c:243 #, fuzzy, c-format msgid "failed to set new type %s" msgstr "%s의 시간을 유지합니다" -#: src/runcon.c:241 +#: src/runcon.c:245 #, fuzzy, c-format msgid "failed to set new range %s" msgstr "%s의 시간을 유지합니다" -#: src/runcon.c:243 +#: src/runcon.c:247 #, fuzzy, c-format msgid "failed to set new role %s" msgstr "%s의 시간을 유지합니다" -#: src/runcon.c:251 +#: src/runcon.c:255 #, fuzzy, c-format msgid "unable to set security context %s" msgstr "%s의 허가를 바꿀 수 없습니다" @@ -7317,15 +7675,17 @@ msgstr "" "\n" #: src/seq.c:73 +msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" +msgstr "" + +#: src/seq.c:79 msgid "" -"Print numbers from FIRST to LAST, in steps of INCREMENT.\n" -"\n" " -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 "" -#: src/seq.c:82 +#: src/seq.c:86 msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" @@ -7335,39 +7695,24 @@ msgid "" "INCREMENT is usually negative if FIRST is greater than LAST.\n" msgstr "" -#: src/seq.c:90 +#: src/seq.c:94 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:136 +#: src/seq.c:140 #, fuzzy, c-format msgid "invalid floating point argument: %s" msgstr "부적절한 시작 행번호: `%s'" -#: src/seq.c:193 -#, c-format -msgid "format %s has no %% directive" -msgstr "" - -#: src/seq.c:210 -#, c-format -msgid "format %s ends in %%" -msgstr "" - -#: src/seq.c:213 +#: src/seq.c:232 #, fuzzy, c-format msgid "format %s has unknown %%%c directive" msgstr "%s: 알 수 없는 파일형" -#: src/seq.c:217 -#, c-format -msgid "format %s has too many %% directives" -msgstr "" - -#: src/seq.c:431 +#: src/seq.c:555 #, fuzzy, c-format msgid "format string may not be specified when printing equal width strings" msgstr "문자열을 덤프할 때에는 타입이 지정되면 안됩니다" @@ -7399,27 +7744,27 @@ msgid "" " (if specified) supplemental group IDs to GID1, ...\n" msgstr "" -#: src/setuidgid.c:163 +#: src/setuidgid.c:162 #, c-format msgid "unknown user-ID: %s" msgstr "" -#: src/setuidgid.c:174 +#: src/setuidgid.c:173 #, c-format msgid "to use user-ID %s you need to use -g too" msgstr "" -#: src/setuidgid.c:191 +#: src/setuidgid.c:190 #, fuzzy, c-format msgid "failed to set supplemental group(s)" msgstr "null 그룹으로 바꿀 수 없습니다" -#: src/setuidgid.c:201 +#: src/setuidgid.c:200 #, fuzzy, c-format msgid "cannot set group-ID to %lu" msgstr "사용자와 그룹을 모두 생략할 수는 없습니다" -#: src/setuidgid.c:205 +#: src/setuidgid.c:204 #, fuzzy, c-format msgid "cannot set user-ID to %lu" msgstr "사용자와 그룹을 모두 생략할 수는 없습니다" @@ -7433,10 +7778,9 @@ msgstr "" 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" -"\n" msgstr "" -#: src/shred.c:156 +#: src/shred.c:155 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -7445,7 +7789,7 @@ msgid "" " -s, --size=N shred this many bytes (suffixes like K, M, G accepted)\n" msgstr "" -#: src/shred.c:162 +#: src/shred.c:161 msgid "" " -u, --remove truncate and remove file after overwriting\n" " -v, --verbose show progress\n" @@ -7454,7 +7798,7 @@ msgid "" " -z, --zero add a final overwrite with zeros to hide shredding\n" msgstr "" -#: src/shred.c:171 +#: src/shred.c:170 msgid "" "\n" "If FILE is -, shred standard output.\n" @@ -7466,7 +7810,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:181 +#: src/shred.c:180 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" @@ -7477,7 +7821,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:189 +#: src/shred.c:188 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -7489,7 +7833,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:199 +#: src/shred.c:198 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -7498,7 +7842,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:206 +#: src/shred.c:205 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" @@ -7510,129 +7854,129 @@ msgid "" "\n" msgstr "" -#: src/shred.c:216 +#: src/shred.c:215 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:296 +#: src/shred.c:295 #, fuzzy, c-format msgid "%s: fdatasync failed" msgstr "stat 실패" -#: src/shred.c:307 +#: src/shred.c:306 #, c-format msgid "%s: fsync failed" msgstr "" -#: src/shred.c:384 +#: src/shred.c:383 #, c-format msgid "%s: cannot rewind" msgstr "%s: 돌아갈 수 없습니다" -#: src/shred.c:403 +#: src/shred.c:402 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: 진행중 %lu/%lu (%s)..." -#: src/shred.c:453 +#: src/shred.c:452 #, fuzzy, c-format msgid "%s: error writing at offset %s" msgstr "%s에 쓰는 도중 오류 발생" -#: src/shred.c:471 +#: src/shred.c:470 #, fuzzy, c-format msgid "%s: lseek failed" msgstr "파일 닫기 실패" -#: src/shred.c:482 +#: src/shred.c:481 #, fuzzy, c-format msgid "%s: file too large" msgstr "%s: 파일이 너무 깁니다" -#: src/shred.c:505 +#: src/shred.c:504 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: 진행중 %lu/%lu (%s)...%s" -#: src/shred.c:521 +#: src/shred.c:520 #, fuzzy, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: 진행중 %lu/%lu (%s)...%s/%s" -#: src/shred.c:768 +#: src/shred.c:767 #, fuzzy, c-format msgid "%s: fstat failed" msgstr "stat 실패" -#: src/shred.c:779 +#: src/shred.c:778 #, fuzzy, c-format msgid "%s: invalid file type" msgstr "%s: 부적절한 접미어 길이" -#: src/shred.c:798 +#: src/shred.c:797 #, c-format msgid "%s: file has negative size" msgstr "%s: 파일이 음의 크기를 갖습니다" -#: src/shred.c:865 +#: src/shred.c:864 src/sort.c:932 src/split.c:378 #, fuzzy, c-format msgid "%s: error truncating" msgstr "%s: 파일이 잘렸음" -#: src/shred.c:881 +#: src/shred.c:880 #, fuzzy, c-format msgid "%s: fcntl failed" msgstr "stat 실패" -#: src/shred.c:886 +#: src/shred.c:885 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "%s: 쓰기 전용 파일 디스크립터는 파기할 수 없습니다" -#: src/shred.c:968 +#: src/shred.c:967 #, c-format msgid "%s: removing" msgstr "%s: 삭제중" -#: src/shred.c:992 +#: src/shred.c:991 #, fuzzy, c-format msgid "%s: renamed to %s" msgstr "%s: 읽기 오류" -#: src/shred.c:1014 +#: src/shred.c:1013 #, fuzzy, c-format msgid "%s: failed to remove" msgstr "%s: 파일이 너무 깁니다" -#: src/shred.c:1018 +#: src/shred.c:1017 #, c-format msgid "%s: removed" msgstr "%s: 삭제되었음" -#: src/shred.c:1025 src/shred.c:1068 +#: src/shred.c:1024 src/shred.c:1067 #, fuzzy, c-format msgid "%s: failed to close" msgstr "%s: 파일이 너무 깁니다" -#: src/shred.c:1061 +#: src/shred.c:1060 #, fuzzy, c-format msgid "%s: failed to open for writing" msgstr "%s: 파일이 너무 깁니다" -#: src/shred.c:1126 +#: src/shred.c:1125 #, fuzzy, c-format msgid "%s: invalid number of passes" msgstr "%s: 부적절한 초" -#: src/shred.c:1135 src/shuf.c:291 src/sort.c:4387 +#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441 #, c-format msgid "multiple random sources specified" msgstr "" -#: src/shred.c:1149 +#: src/shred.c:1148 #, fuzzy, c-format msgid "%s: invalid file size" msgstr "%s: 부적절한 접미어 길이" @@ -7650,14 +7994,12 @@ msgstr "" #: src/shuf.c:54 #, fuzzy -msgid "" -"Write a random permutation of the input lines to standard output.\n" -"\n" +msgid "Write a random permutation of the input lines to standard output.\n" msgstr "" "각 <파일>에서 선택한 줄들만 표준 출력에 표시합니다.\n" "\n" -#: src/shuf.c:61 +#: src/shuf.c:60 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 " @@ -7668,27 +8010,27 @@ msgid "" " -z, --zero-terminated end lines with 0 byte, not newline\n" msgstr "" -#: src/shuf.c:245 +#: src/shuf.c:244 #, c-format msgid "multiple -i options specified" msgstr "" -#: src/shuf.c:265 +#: src/shuf.c:264 #, fuzzy, c-format msgid "invalid input range %s" msgstr "부적절한 숫자" -#: src/shuf.c:278 +#: src/shuf.c:277 #, fuzzy, c-format msgid "invalid line count %s" msgstr "부적절한 폭: `%s'" -#: src/shuf.c:285 src/sort.c:4381 +#: src/shuf.c:284 src/sort.c:4435 #, fuzzy, c-format msgid "multiple output files specified" msgstr "%s를 지웁니다\n" -#: src/shuf.c:311 +#: src/shuf.c:310 #, fuzzy, c-format msgid "cannot combine -e and -i options" msgstr "%s에 대한 파일 포인터를 재위치할 수 없습니다" @@ -7707,7 +8049,7 @@ msgid "" "\n" msgstr "" -#: src/sleep.c:135 src/timeout.c:295 +#: src/sleep.c:135 src/timeout.c:320 #, fuzzy, c-format msgid "invalid time interval %s" msgstr "부적절한 필드 번호: `%s'" @@ -7717,24 +8059,22 @@ msgstr "부적절한 필드 번호: `%s'" msgid "cannot read realtime clock" msgstr "링크 `%s'를 만들 수 없습니다" -#: src/sort.c:395 +#: src/sort.c:399 #, fuzzy -msgid "" -"Write sorted concatenation of all FILE(s) to standard output.\n" -"\n" +msgid "Write sorted concatenation of all FILE(s) to standard output.\n" msgstr "" "모든 <파일>(들)을 연결해서 정렬한 결과를 표준 출력에 씁니다.\n" "\n" "정렬 옵션은 다음과 같습니다:\n" "\n" -#: src/sort.c:402 +#: src/sort.c:405 msgid "" "Ordering options:\n" "\n" msgstr "" -#: src/sort.c:406 +#: src/sort.c:409 #, fuzzy msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" @@ -7746,7 +8086,7 @@ msgstr "" " -d, --dictionary-order 공백, 알파벳, 숫자만을 고려합니다\n" " -f, --ignore-case 소문자와 대문자를 구별하지 않습니다\n" -#: src/sort.c:412 +#: src/sort.c:415 #, fuzzy msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" @@ -7760,12 +8100,12 @@ msgstr "" " -r, --reverse 비교의 결과를 뒤바꿉니다\n" "\n" -#: src/sort.c:417 +#: src/sort.c:420 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" -#: src/sort.c:420 +#: src/sort.c:423 #, fuzzy msgid "" " -n, --numeric-sort compare according to string numerical value\n" @@ -7780,7 +8120,7 @@ msgstr "" " -r, --reverse 비교의 결과를 뒤바꿉니다\n" "\n" -#: src/sort.c:426 +#: src/sort.c:429 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -7790,19 +8130,19 @@ msgid "" "\n" msgstr "" -#: src/sort.c:434 +#: src/sort.c:437 msgid "" "Other options:\n" "\n" msgstr "" -#: src/sort.c:438 +#: src/sort.c:441 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" msgstr "" -#: src/sort.c:442 +#: src/sort.c:445 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 " @@ -7811,7 +8151,7 @@ msgid "" " decompress them with PROG -d\n" msgstr "" -#: src/sort.c:449 +#: src/sort.c:452 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -7820,14 +8160,14 @@ msgid "" " If F is - then read names from standard input\n" msgstr "" -#: src/sort.c:456 +#: src/sort.c:459 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:460 +#: src/sort.c:463 #, fuzzy msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" @@ -7848,7 +8188,7 @@ msgstr "" "다\n" " -S, --buffer-size=<크기> 메인 메모리 버퍼를 <크기>만큼 씁니다\n" -#: src/sort.c:466 +#: src/sort.c:469 #, fuzzy, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -7872,11 +8212,11 @@ msgstr "" "다:\n" " 동일한 것중 첫 번째만 출력합니다\n" -#: src/sort.c:475 +#: 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:480 +#: src/sort.c:483 #, fuzzy msgid "" "\n" @@ -7903,7 +8243,7 @@ msgstr "" "\n" "<크기> 다음에는 다음 곱하기 접미어가 따라올 수 있습니다:\n" -#: src/sort.c:493 +#: src/sort.c:496 msgid "" "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n" "\n" @@ -7924,264 +8264,268 @@ msgstr "" "바이트값에 따라 정렬된 전통적인 정렬 방식을 원한다면 \"LC_ALL=C\"로\n" "환경변수를 세팅하십시오\n" -#: src/sort.c:694 +#: src/sort.c:697 #, fuzzy, c-format msgid "waiting for %s [-d]" msgstr "%s에 쓰는 도중 오류 발생" -#: src/sort.c:699 +#: src/sort.c:702 #, c-format msgid "%s [-d] terminated abnormally" msgstr "" -#: src/sort.c:853 +#: src/sort.c:856 #, fuzzy, c-format msgid "cannot create temporary file in %s" msgstr "임시 파일을 만들 수 없습니다" -#: src/sort.c:939 src/sort.c:2010 src/sort.c:3056 src/sort.c:3755 -#: src/sort.c:3758 +#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713 +#: src/sort.c:3804 src/sort.c:3807 msgid "open failed" msgstr "파일 열기 실패" -#: src/sort.c:959 +#: src/sort.c:970 #, fuzzy msgid "fflush failed" msgstr "파일 닫기 실패" -#: src/sort.c:964 src/sort.c:2013 src/sort.c:4646 +#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706 msgid "close failed" msgstr "파일 닫기 실패" -#: src/sort.c:973 +#: src/sort.c:986 #, fuzzy, c-format msgid "dup2 failed" msgstr "파일 열기 실패" -#: src/sort.c:1090 +#: src/sort.c:1103 #, fuzzy, c-format msgid "couldn't execute %s" msgstr "%s 디렉토리를 만들 수 없습니다" -#: src/sort.c:1097 +#: src/sort.c:1110 #, fuzzy msgid "couldn't create temporary file" msgstr "임시 파일을 만들 수 없습니다" -#: src/sort.c:1136 +#: src/sort.c:1149 #, fuzzy, c-format msgid "couldn't create process for %s -d" msgstr "%s 디렉토리를 만들 수 없습니다" -#: src/sort.c:1150 +#: src/sort.c:1161 #, fuzzy, c-format msgid "couldn't execute %s -d" msgstr "%s 디렉토리를 만들 수 없습니다" -#: src/sort.c:1209 +#: src/sort.c:1220 #, fuzzy, c-format msgid "warning: cannot remove: %s" msgstr "%s 디렉토리를 만들 수 없습니다" -#: src/sort.c:1295 +#: src/sort.c:1306 #, fuzzy, c-format msgid "invalid --%s argument %s" msgstr "%2$s에 대해 부적절한 인자 %1$s" -#: src/sort.c:1298 +#: src/sort.c:1309 #, fuzzy, c-format msgid "minimum --%s argument is %s" msgstr "%2$s에 대해 애매한 인자 %1$s" -#: src/sort.c:1313 +#: src/sort.c:1324 #, fuzzy, c-format msgid "--%s argument %s too large" msgstr "%s: 일련번호 `%.*s'은(는) 너무 큽니다" -#: src/sort.c:1316 +#: src/sort.c:1327 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "" -#: src/sort.c:1398 +#: src/sort.c:1409 #, c-format msgid "number in parallel must be nonzero" msgstr "" -#: src/sort.c:1479 +#: src/sort.c:1494 msgid "stat failed" msgstr "stat 실패" -#: src/sort.c:1740 +#: src/sort.c:1755 msgid "read failed" msgstr "파일 읽기 실패" -#: src/sort.c:2028 +#: src/sort.c:2043 #, fuzzy, c-format msgid "string transformation failed" msgstr "문자열 비교가 실패했습니다" -#: src/sort.c:2031 +#: src/sort.c:2046 #, c-format msgid "the untransformed string was %s" msgstr "" -#: src/sort.c:2194 +#: src/sort.c:2209 #, c-format msgid "^ no match for key\n" msgstr "" -#: src/sort.c:2374 +#: src/sort.c:2389 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "" -#: src/sort.c:2380 +#: src/sort.c:2395 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "" -#: src/sort.c:2391 +#: src/sort.c:2406 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" -#: src/sort.c:2404 +#: src/sort.c:2419 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "" -#: src/sort.c:2436 +#: src/sort.c:2451 #, fuzzy, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" msgstr[0] "%s: `%s'은(는) 모호한 옵션입니다\n" msgstr[1] "%s: `%s'은(는) 모호한 옵션입니다\n" -#: src/sort.c:2442 +#: src/sort.c:2457 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "" -#: src/sort.c:2716 src/sort.c:2725 +#: src/sort.c:2731 src/sort.c:2740 msgid "write failed" msgstr "파일 쓰기 실패" -#: src/sort.c:2768 +#: src/sort.c:2783 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: 순서가 맞지 않음: " -#: src/sort.c:2771 +#: src/sort.c:2786 msgid "standard error" msgstr "표준 오류" -#: src/sort.c:3926 +#: src/sort.c:3698 +#, fuzzy +msgid "cannot read" +msgstr "fork() 할 수 없습니다" + +#: src/sort.c:3976 #, fuzzy, c-format msgid "%s: invalid field specification %s" msgstr "%s: 부적절한 필드 지정 `%s'" -#: src/sort.c:3937 +#: src/sort.c:3987 #, fuzzy, c-format msgid "options '-%s' are incompatible" msgstr "%s: `%s'은(는) 모호한 옵션입니다\n" # count? -#: src/sort.c:3988 +#: src/sort.c:4038 #, fuzzy, c-format msgid "%s: invalid count at start of %s" msgstr "%s: `%s' 시작 부분에 부적절한 갯수" -#: src/sort.c:4245 +#: src/sort.c:4295 #, fuzzy msgid "invalid number after '-'" msgstr "`-' 다음에 부적절한 숫자" -#: src/sort.c:4248 src/sort.c:4334 src/sort.c:4362 +#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416 #, fuzzy msgid "invalid number after '.'" msgstr "`.' 다음에 부적절한 숫자" -#: src/sort.c:4261 src/sort.c:4367 +#: src/sort.c:4315 src/sort.c:4421 msgid "stray character in field spec" msgstr "필드 스펙에 벗어난 문자" -#: src/sort.c:4308 +#: src/sort.c:4362 #, c-format msgid "multiple compress programs specified" msgstr "" -#: src/sort.c:4325 +#: src/sort.c:4379 msgid "invalid number at field start" msgstr "필드 처음에 부적절한 숫자" -#: src/sort.c:4329 src/sort.c:4357 +#: src/sort.c:4383 src/sort.c:4411 msgid "field number is zero" msgstr "필드 개수가 0입니다" -#: src/sort.c:4338 +#: src/sort.c:4392 msgid "character offset is zero" msgstr "문자 오프셋이 0입니다" -#: src/sort.c:4353 +#: src/sort.c:4407 #, fuzzy msgid "invalid number after ','" msgstr "`,' 다음에 부적절한 숫자" -#: src/sort.c:4403 +#: src/sort.c:4457 #, c-format msgid "empty tab" msgstr "" -#: src/sort.c:4496 src/wc.c:692 +#: src/sort.c:4550 src/wc.c:692 #, fuzzy, c-format msgid "cannot read file names from %s" msgstr "비교한 문자열은 %s과(와) %s입니다." -#: src/sort.c:4518 +#: src/sort.c:4572 #, fuzzy, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s: 부적절한 접미어 길이" -#: src/sort.c:4524 +#: src/sort.c:4578 #, fuzzy, c-format msgid "no input from %s" msgstr "파일 `%s'을(를) 만듦\n" -#: src/sort.c:4570 +#: src/sort.c:4624 #, c-format msgid "using %s sorting rules" msgstr "" -#: src/sort.c:4573 +#: src/sort.c:4627 #, c-format msgid "using simple byte comparison" msgstr "" # extra operand? 뭔 소리야? -#: src/sort.c:4604 +#: src/sort.c:4658 #, fuzzy, c-format msgid "extra operand %s not allowed with -%c" msgstr "-c 옵션에서는 추가 피연산자 `%s'을(를) 쓸 수 없습니다" -#: src/split.c:184 +#: src/split.c:187 #, c-format msgid "the suffix length needs to be at least %zu" msgstr "" -#: src/split.c:201 +#: src/split.c:204 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" msgstr "사용법: %s [<옵션>] [<입력> [<접두어>]]\n" -#: src/split.c:205 +#: src/split.c:208 #, fuzzy 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" -"\n" msgstr "" "입력을 고정된 크기의 조각 <접두어>aa, <접두어>ab, ... 으로 나누어 씁니다; 기" "본\n" @@ -8189,8 +8533,8 @@ msgstr "" "을\n" "읽습니다.\n" -#: src/split.c:214 -#, fuzzy, c-format +#: src/split.c:216 +#, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" " --additional-suffix=SUFFIX append an additional SUFFIX to file " @@ -8207,12 +8551,8 @@ msgid "" " -n, --number=CHUNKS generate CHUNKS output files. See 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" -" -l, --lines=<개수> 출력 파일당 <개수> 줄만큼의 줄을 씁니다\n" -#: src/split.c:227 +#: src/split.c:229 #, fuzzy msgid "" " --verbose print a diagnostic just before each\n" @@ -8222,7 +8562,7 @@ msgstr "" "로\n" " 출력합니다\n" -#: src/split.c:234 +#: src/split.c:236 msgid "" "\n" "CHUNKS may be:\n" @@ -8234,184 +8574,189 @@ msgid "" "r/K/N likewise but only output Kth of N to stdout\n" msgstr "" -#: src/split.c:352 +#: src/split.c:354 #, fuzzy, c-format msgid "output file suffixes exhausted" msgstr "출력파일 접미어를 다 썼습니다" -#: src/split.c:364 +#: src/split.c:366 #, fuzzy, c-format msgid "creating file %s\n" msgstr "파일 `%s'을(를) 만듦\n" -#: src/split.c:377 +#: src/split.c:375 +#, c-format +msgid "%s would overwrite input; aborting" +msgstr "" + +#: src/split.c:391 #, fuzzy, c-format msgid "failed to set FILE environment variable" -msgstr "%s의 시간을 유지합니다" +msgstr "LS_COLORS환경변수의 해석할 수 없는 값" -#: src/split.c:379 +#: src/split.c:393 #, c-format msgid "executing with FILE=%s\n" msgstr "" -#: src/split.c:381 +#: src/split.c:395 #, fuzzy, c-format msgid "failed to create pipe" -msgstr "%s 디렉토리를 만들 수 없습니다" +msgstr "%s의 시간을 유지합니다" -#: src/split.c:395 +#: src/split.c:409 #, fuzzy, c-format msgid "closing prior pipe" msgstr "%s 디렉토리로 chdir할 수 없습니다" -#: src/split.c:397 +#: src/split.c:411 #, fuzzy, c-format msgid "closing output pipe" msgstr "%s를 지웁니다\n" -#: src/split.c:401 +#: src/split.c:415 #, fuzzy, c-format msgid "moving input pipe" msgstr "파일 `%s'을(를) 만듦\n" -#: src/split.c:403 +#: src/split.c:417 #, fuzzy, c-format msgid "closing input pipe" msgstr "파일 `%s'을(를) 만듦\n" -#: src/split.c:408 +#: src/split.c:422 #, fuzzy, c-format msgid "failed to run command: \"%s -c %s\"" -msgstr "%s의 시간을 유지합니다" +msgstr "%s의 그룹을 %s로 바꾸는데 실패했습니다\n" -#: src/split.c:414 -#, fuzzy, c-format +#: src/split.c:428 +#, c-format msgid "failed to close input pipe" -msgstr "%s: 파일이 너무 깁니다" +msgstr "" -#: src/split.c:450 -#, fuzzy, c-format +#: src/split.c:464 +#, c-format msgid "waiting for child process" -msgstr "%s에 쓰는 도중 오류 발생" +msgstr "" -#: src/split.c:460 +#: src/split.c:474 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "" -#: src/split.c:468 +#: src/split.c:482 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:475 src/timeout.c:449 +#: src/split.c:489 src/timeout.c:494 #, c-format msgid "unknown status from command (0x%X)" msgstr "" -#: src/split.c:1037 +#: src/split.c:1052 #, c-format msgid "cannot split in more than one way" msgstr "한 가지 이상의 방법으로 분할할 수 없습니다" -#: src/split.c:1050 src/split.c:1192 src/split.c:1363 +#: src/split.c:1065 src/split.c:1205 src/split.c:1376 #, fuzzy, c-format msgid "%s: invalid number of chunks" msgstr "%s: 부적절한 초" -#: src/split.c:1054 +#: src/split.c:1069 #, fuzzy, c-format msgid "%s: invalid chunk number" msgstr "%s: 부적절한 숫자" -#: src/split.c:1106 +#: src/split.c:1119 #, c-format msgid "%s: invalid suffix length" msgstr "%s: 부적절한 접미어 길이" -#: src/split.c:1131 src/split.c:1139 src/split.c:1162 src/split.c:1167 +#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180 #, c-format msgid "%s: invalid number of bytes" msgstr "%s: 부적절한 바이트의 개수" -#: src/split.c:1150 src/split.c:1297 +#: src/split.c:1163 src/split.c:1310 #, c-format msgid "%s: invalid number of lines" msgstr "%s: 부적절한 행의 개수" -#: src/split.c:1223 +#: src/split.c:1236 #, fuzzy, c-format msgid "line count option -%s%c... is too large" msgstr "%s: 일련번호 `%.*s'은(는) 너무 큽니다" -#: src/split.c:1235 +#: src/split.c:1248 #, fuzzy, c-format msgid "%s: invalid start value for numerical suffix" msgstr "부적절한 시작 행번호: `%s'" -#: src/split.c:1263 +#: src/split.c:1276 #, fuzzy, c-format msgid "%s: invalid IO block size" msgstr "%s: 부적절한 접미어 길이" -#: src/split.c:1284 +#: src/split.c:1297 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1321 +#: src/split.c:1334 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1356 +#: src/split.c:1369 #, 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:169 +#: src/stat.c:173 msgid "Michael Meskes" msgstr "" -#: src/stat.c:838 +#: src/stat.c:857 #, c-format msgid "failed to canonicalize %s" msgstr "" -#: src/stat.c:1050 +#: src/stat.c:1069 #, fuzzy, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "%s: 인식할 수 없는 옵션 `%c%s'\n" -#: src/stat.c:1105 +#: src/stat.c:1124 #, fuzzy, c-format msgid "%s: invalid directive" msgstr "%s: 부적절한 패턴" -#: src/stat.c:1151 +#: src/stat.c:1170 #, fuzzy, c-format msgid "warning: backslash at end of format" msgstr "문자열 끝에 부적절한 역슬래쉬 이스케이프" -#: src/stat.c:1182 +#: src/stat.c:1201 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" -#: src/stat.c:1189 +#: src/stat.c:1208 #, fuzzy, c-format msgid "cannot read file system information for %s" msgstr "%s에 대한 파일 포인터를 재위치할 수 없습니다" -#: src/stat.c:1209 +#: src/stat.c:1228 #, 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:1245 +#: src/stat.c:1264 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -8422,7 +8767,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1268 +#: src/stat.c:1287 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -8430,30 +8775,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1278 +#: src/stat.c:1297 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:1286 +#: src/stat.c:1305 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:1295 +#: src/stat.c:1314 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:1305 +#: src/stat.c:1324 #, c-format msgid "Context: %C\n" msgstr "" -#: src/stat.c:1313 +#: src/stat.c:1332 msgid "" "Access: %x\n" "Modify: %y\n" @@ -8461,15 +8806,17 @@ msgid "" " Birth: %w\n" msgstr "" -#: src/stat.c:1331 +#: src/stat.c:1350 +msgid "Display file or file system status.\n" +msgstr "" + +#: src/stat.c:1356 msgid "" -"Display file or file system status.\n" -"\n" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" -#: src/stat.c:1337 +#: src/stat.c:1360 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -8479,7 +8826,7 @@ msgid "" " -t, --terse print the information in terse form\n" msgstr "" -#: src/stat.c:1348 +#: src/stat.c:1371 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -8491,7 +8838,7 @@ msgid "" " %C SELinux security context string\n" msgstr "" -#: src/stat.c:1357 +#: src/stat.c:1380 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -8501,7 +8848,7 @@ msgid "" " %G group name of owner\n" msgstr "" -#: src/stat.c:1365 +#: src/stat.c:1388 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -8514,7 +8861,7 @@ msgid "" " %T minor device type in hex\n" msgstr "" -#: src/stat.c:1376 +#: src/stat.c:1399 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -8529,7 +8876,7 @@ msgid "" "\n" msgstr "" -#: src/stat.c:1390 +#: src/stat.c:1413 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -8540,7 +8887,7 @@ msgid "" " %f free blocks in file system\n" msgstr "" -#: src/stat.c:1399 +#: src/stat.c:1422 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -8559,30 +8906,29 @@ msgstr "사용법: %s [<옵션>] [<파일>]...\n" #: src/stdbuf.c:91 msgid "" "Run COMMAND, with modified buffering operations for its standard streams.\n" -"\n" msgstr "" -#: src/stdbuf.c:98 +#: src/stdbuf.c:97 msgid "" " -i, --input=MODE adjust standard input stream buffering\n" " -o, --output=MODE adjust standard output stream buffering\n" " -e, --error=MODE adjust standard error stream buffering\n" msgstr "" -#: src/stdbuf.c:105 +#: src/stdbuf.c:104 msgid "" "\n" "If MODE is 'L' the corresponding stream will be line buffered.\n" "This option is invalid with standard input.\n" msgstr "" -#: src/stdbuf.c:108 +#: src/stdbuf.c:107 msgid "" "\n" "If MODE is '0' the corresponding stream will be unbuffered.\n" msgstr "" -#: src/stdbuf.c:111 +#: src/stdbuf.c:110 msgid "" "\n" "Otherwise MODE is a number which may be followed by one of the following:\n" @@ -8592,7 +8938,7 @@ msgid "" "size set to MODE bytes.\n" msgstr "" -#: src/stdbuf.c:117 +#: src/stdbuf.c:116 msgid "" "\n" "NOTE: If COMMAND adjusts the buffering of its standard streams ('tee' does\n" @@ -8602,22 +8948,22 @@ msgid "" "and are thus unaffected by 'stdbuf' settings.\n" msgstr "" -#: src/stdbuf.c:227 +#: src/stdbuf.c:226 #, c-format msgid "failed to find %s" msgstr "" -#: src/stdbuf.c:247 src/stdbuf.c:279 +#: src/stdbuf.c:246 src/stdbuf.c:278 #, c-format msgid "failed to update the environment with %s" msgstr "" -#: src/stdbuf.c:321 +#: src/stdbuf.c:320 #, c-format msgid "line buffering stdin is meaningless" msgstr "" -#: src/stty.c:509 +#: src/stty.c:513 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -8625,23 +8971,25 @@ msgid "" " or: %s [-F DEVICE | --file=DEVICE] [-g|--save]\n" msgstr "" -#: src/stty.c:515 +#: src/stty.c:519 +msgid "Print or change terminal characteristics.\n" +msgstr "" + +#: src/stty.c:525 msgid "" -"Print or change terminal characteristics.\n" -"\n" " -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:524 +#: src/stty.c:532 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:529 +#: src/stty.c:537 msgid "" "\n" "Special characters:\n" @@ -8650,7 +8998,7 @@ msgid "" " eol CHAR CHAR will end the line\n" msgstr "" -#: src/stty.c:536 +#: src/stty.c:544 msgid "" " * eol2 CHAR alternate CHAR for ending the line\n" " erase CHAR CHAR will erase the last character typed\n" @@ -8658,7 +9006,7 @@ msgid "" " kill CHAR CHAR will erase the current line\n" msgstr "" -#: src/stty.c:542 +#: src/stty.c:550 msgid "" " * lnext CHAR CHAR will enter the next character quoted\n" " quit CHAR CHAR will send a quit signal\n" @@ -8666,7 +9014,7 @@ msgid "" " start CHAR CHAR will restart the output after stopping it\n" msgstr "" -#: src/stty.c:548 +#: src/stty.c:556 msgid "" " stop CHAR CHAR will stop the output\n" " susp CHAR CHAR will send a terminal stop signal\n" @@ -8674,7 +9022,7 @@ msgid "" " * werase CHAR CHAR will erase the last word typed\n" msgstr "" -#: src/stty.c:554 +#: src/stty.c:562 msgid "" "\n" "Special settings:\n" @@ -8683,7 +9031,7 @@ msgid "" " * columns N same as cols N\n" msgstr "" -#: src/stty.c:561 +#: src/stty.c:569 msgid "" " ispeed N set the input speed to N\n" " * line N use line discipline N\n" @@ -8692,7 +9040,7 @@ msgid "" " ospeed N set the output speed to N\n" msgstr "" -#: src/stty.c:567 +#: src/stty.c:575 msgid "" " * rows N tell the kernel that the terminal has N rows\n" " * size print the number of rows and columns according to the " @@ -8701,27 +9049,28 @@ msgid "" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" -#: src/stty.c:573 +#: src/stty.c:581 msgid "" "\n" "Control settings:\n" " [-]clocal disable modem control signals\n" " [-]cread allow input to be received\n" " * [-]crtscts enable RTS/CTS handshaking\n" +" * [-]cdtrdsr enable DTR/DSR handshaking\n" " csN set character size to N bits, N in [5..8]\n" msgstr "" -#: src/stty.c:581 +#: src/stty.c:590 msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" " [-]hupcl same as [-]hup\n" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" -" [-]parodd set odd parity (even with '-')\n" +" [-]parodd set odd parity (or even parity with '-')\n" msgstr "" -#: src/stty.c:588 +#: src/stty.c:597 msgid "" "\n" "Input settings:\n" @@ -8731,7 +9080,7 @@ msgid "" " [-]igncr ignore carriage return\n" msgstr "" -#: src/stty.c:596 +#: src/stty.c:605 msgid "" " [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" @@ -8740,11 +9089,11 @@ msgid "" " [-]istrip clear high (8th) bit of input characters\n" msgstr "" -#: src/stty.c:603 +#: src/stty.c:612 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr "" -#: src/stty.c:606 +#: src/stty.c:615 msgid "" " * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" @@ -8754,7 +9103,7 @@ msgid "" " [-]tandem same as [-]ixoff\n" msgstr "" -#: src/stty.c:614 +#: src/stty.c:623 msgid "" "\n" "Output settings:\n" @@ -8764,7 +9113,7 @@ msgid "" " * nlN newline delay style, N in [0..1]\n" msgstr "" -#: src/stty.c:622 +#: src/stty.c:631 msgid "" " * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of null characters\n" @@ -8774,7 +9123,7 @@ msgid "" " * [-]onlret newline performs a carriage return\n" msgstr "" -#: src/stty.c:630 +#: src/stty.c:639 msgid "" " * [-]onocr do not print carriage returns in the first column\n" " [-]opost postprocess output\n" @@ -8784,7 +9133,7 @@ msgid "" " * vtN vertical tab delay style, N in [0..1]\n" msgstr "" -#: src/stty.c:638 +#: src/stty.c:647 msgid "" "\n" "Local settings:\n" @@ -8793,7 +9142,7 @@ msgid "" " * -crtkill kill all line by obeying the echoctl and echok settings\n" msgstr "" -#: src/stty.c:645 +#: src/stty.c:654 msgid "" " * [-]ctlecho echo control characters in hat notation ('^c')\n" " [-]echo echo input characters\n" @@ -8802,7 +9151,7 @@ msgid "" " [-]echok echo a newline after a kill character\n" msgstr "" -#: src/stty.c:652 +#: src/stty.c:661 msgid "" " * [-]echoke same as [-]crtkill\n" " [-]echonl echo newline even if not echoing other characters\n" @@ -8811,7 +9160,7 @@ msgid "" " [-]iexten enable non-POSIX special characters\n" msgstr "" -#: src/stty.c:659 +#: src/stty.c:668 msgid "" " [-]isig enable interrupt, quit, and suspend special characters\n" " [-]noflsh disable flushing after interrupt and quit special " @@ -8821,7 +9170,7 @@ msgid "" " * [-]xcase with icanon, escape with '\\' for uppercase characters\n" msgstr "" -#: src/stty.c:666 +#: src/stty.c:675 msgid "" "\n" "Combination settings:\n" @@ -8830,7 +9179,7 @@ msgid "" " -cbreak same as icanon\n" msgstr "" -#: src/stty.c:673 +#: src/stty.c:682 msgid "" " cooked same as brkint ignpar istrip icrnl ixon opost isig\n" " icanon, eof and eol characters to their default values\n" @@ -8838,7 +9187,7 @@ msgid "" " crt same as echoe echoctl echoke\n" msgstr "" -#: src/stty.c:679 +#: src/stty.c:688 msgid "" " dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" " kill ^u\n" @@ -8847,7 +9196,7 @@ msgid "" " evenp same as parenb -parodd cs7\n" msgstr "" -#: src/stty.c:686 +#: src/stty.c:695 msgid "" " -evenp same as -parenb cs8\n" " * [-]lcase same as xcase iuclc olcuc\n" @@ -8857,7 +9206,7 @@ msgid "" " -nl same as icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" msgstr "" -#: src/stty.c:694 +#: src/stty.c:703 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -8866,7 +9215,7 @@ msgid "" " -pass8 same as parenb istrip cs7\n" msgstr "" -#: src/stty.c:701 +#: src/stty.c:710 msgid "" " raw same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" " -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n" @@ -8874,7 +9223,7 @@ msgid "" " -raw same as cooked\n" msgstr "" -#: src/stty.c:707 +#: src/stty.c:716 msgid "" " sane same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" " -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n" @@ -8884,7 +9233,7 @@ msgid "" " characters to their default values\n" msgstr "" -#: src/stty.c:715 +#: src/stty.c:724 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -8893,126 +9242,59 @@ msgid "" "127; special values ^- or undef used to disable special characters.\n" msgstr "" -#: src/stty.c:787 +#: src/stty.c:796 #, fuzzy, c-format msgid "only one device may be specified" msgstr "오직 한 개의 인수만 지정할 수 있습니다" -#: src/stty.c:817 +#: src/stty.c:826 #, fuzzy, c-format msgid "" "the options for verbose and stty-readable output styles are\n" "mutually exclusive" msgstr "--string과 --check 옵션은 상호 배타적입니다" -#: src/stty.c:823 +#: src/stty.c:832 #, c-format msgid "when specifying an output style, modes may not be set" msgstr "" -#: src/stty.c:838 +#: src/stty.c:847 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "" -#: src/stty.c:883 src/stty.c:993 +#: src/stty.c:892 src/stty.c:1002 #, fuzzy, c-format msgid "invalid argument %s" msgstr "%2$s에 대해 부적절한 인자 %1$s" -#: src/stty.c:894 src/stty.c:911 src/stty.c:923 src/stty.c:936 src/stty.c:948 -#: src/stty.c:968 +#: 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 msgid "missing argument to %s" msgstr "%2$s에 대해 애매한 인자 %1$s" -#: src/stty.c:974 +#: src/stty.c:983 #, fuzzy, c-format msgid "invalid line discipline %s" msgstr "부적절한 폭: `%s'" -#: src/stty.c:1044 +#: src/stty.c:1053 #, c-format msgid "%s: unable to perform all requested operations" msgstr "" -#: src/stty.c:1390 +#: src/stty.c:1399 #, c-format msgid "%s: no size information for this device" msgstr "" -#: src/stty.c:1904 +#: src/stty.c:1920 #, fuzzy, c-format msgid "invalid integer argument %s" msgstr "부적절한 행번호 증가: `%s'" -#: src/su.c:229 -msgid "Password:" -msgstr "" - -#: src/su.c:232 -#, fuzzy, c-format -msgid "getpass: cannot open /dev/tty" -msgstr "`%s'디렉토리를 지울 수 없습니다" - -#: src/su.c:290 -#, fuzzy, c-format -msgid "cannot set groups" -msgstr "사용자와 그룹을 모두 생략할 수는 없습니다" - -#: src/su.c:294 -#, fuzzy, c-format -msgid "cannot set group id" -msgstr "사용자와 그룹을 모두 생략할 수는 없습니다" - -#: src/su.c:296 -#, fuzzy, c-format -msgid "cannot set user id" -msgstr "사용자와 그룹을 모두 생략할 수는 없습니다" - -#: src/su.c:371 -#, fuzzy, c-format -msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" -msgstr "사용법: %s [<옵션>]... [<파일>]...\n" - -#: src/su.c:372 -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 "" - -#: src/su.c:384 -msgid "" -"\n" -"A mere - implies -l. If USER not given, assume root.\n" -msgstr "" - -#: src/su.c:461 -#, c-format -msgid "user %s does not exist" -msgstr "" - -#: src/su.c:484 -#, c-format -msgid "incorrect password" -msgstr "" - -#: src/su.c:501 -#, c-format -msgid "using restricted shell %s" -msgstr "" - -#: src/su.c:509 -#, fuzzy, c-format -msgid "warning: cannot change directory to %s" -msgstr "%s 디렉토리를 만들 수 없습니다" - #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 #, fuzzy @@ -9043,7 +9325,7 @@ msgstr "" msgid "ignoring all arguments" msgstr "인수가 너무 많음" -#: src/system.h:340 +#: src/system.h:343 #, c-format msgid "" "\n" @@ -9052,15 +9334,22 @@ msgid "" "for details about the options it supports.\n" msgstr "" -#: src/system.h:346 +#: src/system.h:349 msgid " --help display this help and exit\n" msgstr " --help 이 도움말을 표시하고 끝냅니다\n" -#: src/system.h:348 +#: src/system.h:351 msgid " --version output version information and exit\n" msgstr " --version 버전 정보를 출력하고 끝냅니다\n" -#: src/system.h:541 +#: src/system.h:544 +#, fuzzy +msgid "" +"\n" +"Mandatory arguments to long options are mandatory for short options too.\n" +msgstr "긴 옵션에서 꼭 필요한 인수는 짧은 옵션에도 꼭 필요합니다.\n" + +#: src/system.h:552 msgid "" "\n" "SIZE is an integer and optional unit (example: 10M is 10*1024*1024). Units\n" @@ -9068,7 +9357,7 @@ msgid "" "1000).\n" msgstr "" -#: src/system.h:550 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -9077,7 +9366,7 @@ msgid "" "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n" msgstr "" -#: src/system.h:560 +#: src/system.h:571 #, fuzzy, c-format msgid "" "\n" @@ -9090,22 +9379,22 @@ msgstr "" #. <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:574 +#: src/system.h:585 #, c-format msgid "Report %s translation bugs to <http://translationproject.org/team/>\n" msgstr "" -#: src/system.h:578 +#: src/system.h:589 #, c-format msgid "For complete documentation, run: info coreutils '%s invocation'\n" msgstr "" -#: src/system.h:585 +#: src/system.h:596 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "더 많은 정보를 보려면 `%s --help' 하십시오.\n" -#: src/system.h:617 +#: src/system.h:628 #, fuzzy, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -9125,16 +9414,16 @@ 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" -"\n" msgstr "" "각 <파일>을 마지막 줄부터 표준 출력에 씁니다.\n" "<파일>이 주어지지 않거나, <파일>이 `-'이면, 표준 입력을 읽습니다.\n" "\n" -#: src/tac.c:145 +#: src/tac.c:144 msgid "" " -b, --before attach the separator before instead of after\n" " -r, --regex interpret the separator as a regular expression\n" @@ -9144,42 +9433,42 @@ msgstr "" " -r, --regex 구분자를 정규식으로 생각합니다\n" " -s, --separator=<문자열> 줄바꿈 대신에 <문자열>을 구분자로 씁니다\n" -#: src/tac.c:235 src/tac.c:336 +#: src/tac.c:234 src/tac.c:335 #, fuzzy, c-format msgid "%s: seek failed" msgstr "파일 닫기 실패" -#: src/tac.c:264 +#: src/tac.c:263 #, fuzzy, c-format msgid "record too large" msgstr "%s: 파일이 너무 깁니다" -#: src/tac.c:451 +#: src/tac.c:450 #, fuzzy, c-format msgid "failed to create temporary file in %s" msgstr "임시 파일을 만들 수 없습니다" -#: src/tac.c:459 +#: src/tac.c:458 #, fuzzy, c-format msgid "failed to open %s for writing" msgstr "%s: 파일이 너무 깁니다" -#: src/tac.c:476 +#: src/tac.c:475 #, fuzzy, c-format msgid "failed to rewind stream for %s" msgstr "%s의 시간을 유지합니다" -#: src/tac.c:512 src/tac.c:519 +#: src/tac.c:511 src/tac.c:518 #, fuzzy, c-format msgid "%s: write error" msgstr "쓰기 오류" -#: src/tac.c:572 +#: src/tac.c:571 #, fuzzy, c-format msgid "failed to open %s for reading" msgstr "`%s'를 `%s'로 이동할 수 없습니다" -#: src/tac.c:630 +#: src/tac.c:629 #, c-format msgid "separator cannot be empty" msgstr "구분 단위가 빈 문자열이 될 수는 없습니다" @@ -9190,12 +9479,11 @@ msgid "Ian Lance Taylor" msgstr "" #: src/tail.c:262 -#, c-format +#, fuzzy, 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" -"\n" msgstr "" "각 <파일>의 맨 마지막 %d줄을 표준 출력에 표시합니다.\n" "두 개 이상의 <파일>의 경우, 각각의 파일마다 파일이름을 나타내는 헤더를 먼" @@ -9204,7 +9492,7 @@ msgstr "" "다.\n" "\n" -#: src/tail.c:271 +#: src/tail.c:270 msgid "" " -c, --bytes=K output the last K bytes; alternatively, use -c " "+K\n" @@ -9212,7 +9500,7 @@ msgid "" "file\n" msgstr "" -#: src/tail.c:275 +#: src/tail.c:274 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -9226,7 +9514,7 @@ msgstr "" " 같은 기능을 합니다\n" " -F --follow=name --retry와 같습니다\n" -#: src/tail.c:282 +#: src/tail.c:281 #, fuzzy, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -9247,7 +9535,7 @@ msgstr "" "다\n" " (회전된 로그 파일의 경우 이러합니다)\n" -#: src/tail.c:295 +#: src/tail.c:294 #, fuzzy msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" @@ -9263,7 +9551,7 @@ msgstr "" " S초(기본값 1초)만큼 지속되도록 합니다\n" " -v, --verbose 언제나 파일이름이 들어 있는 헤더를 출력합니다\n" -#: src/tail.c:302 +#: src/tail.c:301 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations.\n" @@ -9272,7 +9560,7 @@ msgid "" " -v, --verbose always output headers giving file names\n" msgstr "" -#: src/tail.c:311 +#: src/tail.c:310 #, fuzzy msgid "" "\n" @@ -9289,7 +9577,7 @@ msgstr "" "표시합니다. N 뒤에 곱하기 접미어가 올 수 있습니다: b는 512, k는 1024, m은 \n" "1048576 (1메가)입니다.\n" -#: src/tail.c:320 +#: src/tail.c:319 #, fuzzy msgid "" "With --follow (-f), tail defaults to following the file descriptor, which\n" @@ -9306,70 +9594,70 @@ msgstr "" "파일을 다시 열어 지워졌거나 다른 프로그램에 의해 다시 만들어 졌는지 여부를 \n" "검사하게 될 것입니다.\n" -#: src/tail.c:379 +#: src/tail.c:378 #, c-format msgid "closing %s (fd=%d)" msgstr "%s(fd=%d)을(를) 닫습니다 " -#: src/tail.c:454 +#: src/tail.c:453 #, fuzzy, c-format msgid "%s: cannot seek to relative offset %s" msgstr "%s: 상대 오프셋 %s%s로(으로) 갈 수 없습니다" -#: src/tail.c:458 +#: src/tail.c:457 #, fuzzy, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "%s: 끝 상대 오프셋 %s%s로(으로) 갈 수 없습니다" -#: src/tail.c:895 +#: src/tail.c:894 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "" -#: src/tail.c:907 +#: src/tail.c:906 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" msgstr "" -#: src/tail.c:964 +#: src/tail.c:963 #, fuzzy, c-format msgid "%s has become inaccessible" msgstr "`%s'이(가) 접근 불가능하게 되었습니다" # 좀 더 자연스럽게 -#: src/tail.c:981 +#: src/tail.c:980 #, fuzzy, c-format msgid "%s has been replaced with an untailable file; giving up on this name" msgstr "" "`%s'이(가) tail을 실행할 수 없는 파일로 대체되었습니다; 이 이름은 포기합니다" # 좀 더 자연스럽게 -#: src/tail.c:990 +#: src/tail.c:989 #, fuzzy, c-format msgid "%s has been replaced with a remote file. giving up on this name" msgstr "" "`%s'이(가) tail을 실행할 수 없는 파일로 대체되었습니다; 이 이름은 포기합니다" -#: src/tail.c:1011 +#: src/tail.c:1010 #, fuzzy, c-format msgid "%s has become accessible" msgstr "`%s'이(가) 접근 가능하게 되었습니다" # 좀 더 자연스럽게 -#: src/tail.c:1019 +#: src/tail.c:1018 #, fuzzy, c-format msgid "%s has appeared; following end of new file" msgstr "`%s'이(가) 나타났습니다; 새로운 파일의 끝에 이어서 나타났습니다" # 좀 더 자연스럽게 -#: src/tail.c:1030 +#: src/tail.c:1029 #, fuzzy, c-format msgid "%s has been replaced; following end of new file" msgstr "`%s'이(가) 대체되었습니다; 새로운 파일의 끝에 이어서 대체되었습니다" -#: src/tail.c:1131 +#: src/tail.c:1130 #, fuzzy, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s의 소유자 그리고/혹은 그룹을 바꿀 수 없습니다" @@ -9674,17 +9962,22 @@ msgstr "%s: `%c' 뒤에 정수가 와야함" msgid "extra argument %s" msgstr "인수가 너무 많음" -#: src/timeout.c:124 +#: src/timeout.c:112 +#, c-format +msgid "warning: sigprocmask" +msgstr "" + +#: src/timeout.c:145 #, c-format msgid "warning: timer_settime" msgstr "" -#: src/timeout.c:129 +#: src/timeout.c:150 #, c-format msgid "warning: timer_create" msgstr "" -#: src/timeout.c:204 +#: src/timeout.c:225 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -9693,16 +9986,16 @@ msgstr "" "사용법: %s [<파일>]...\n" " 혹은: %s [<옵션>]\n" -#: src/timeout.c:208 +#: src/timeout.c:229 #, fuzzy -msgid "" -"Start COMMAND, and kill it if still running after DURATION.\n" -"\n" -"Mandatory arguments to long options are mandatory for short options too.\n" +msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "긴 옵션에서 꼭 필요한 인수는 짧은 옵션에도 꼭 필요합니다.\n" -#: src/timeout.c:213 +#: src/timeout.c:235 msgid "" +" --preserve-status\n" +" exit with the same status as COMMAND, even when the\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 " @@ -9717,7 +10010,7 @@ msgid "" " See 'kill -l' for a list of signals\n" msgstr "" -#: src/timeout.c:229 +#: src/timeout.c:254 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -9725,25 +10018,30 @@ msgid "" "days.\n" msgstr "" -#: src/timeout.c:234 +#: src/timeout.c:259 msgid "" "\n" -"If the command times out, then exit with status 124. Otherwise, exit\n" -"with the status of COMMAND. If no signal is specified, send the TERM\n" -"signal upon timeout. The TERM signal kills any process that does not\n" -"block or catch that signal. For other processes, it may be necessary to\n" -"use the KILL (9) signal, since this signal cannot be caught. If the\n" -"KILL (9) signal is sent, the exit status is 128+9 rather than 124.\n" +"If the command times out, and --preserve-status is not set, then exit with\n" +"status 124. Otherwise, exit with the status of COMMAND. If no signal\n" +"is specified, send the TERM signal upon timeout. The TERM signal kills\n" +"any process that does not block or catch that signal. It may be necessary\n" +"to use the KILL (9) signal, since this signal cannot be caught, in which\n" +"case the exit status is 128+9 rather than 124.\n" +msgstr "" + +#: src/timeout.c:363 +#, c-format +msgid "warning: disabling core dumps failed" msgstr "" -#: src/timeout.c:419 +#: src/timeout.c:471 #, fuzzy, c-format msgid "error waiting for command" msgstr "%s에 쓰는 도중 오류 발생" -#: src/timeout.c:441 +#: src/timeout.c:482 #, c-format -msgid "warning: disabling core dumps failed" +msgid "the monitored command dumped core" msgstr "" #. This is a proper name. See the gettext manual, section Names. @@ -9756,22 +10054,22 @@ msgstr "" msgid "Randy Smith" msgstr "" -#: src/touch.c:115 src/touch.c:313 +#: src/touch.c:115 src/touch.c:309 #, fuzzy, c-format msgid "invalid date format %s" msgstr "%2$s에 대해 부적절한 인자 %1$s" -#: src/touch.c:194 +#: src/touch.c:191 #, fuzzy, c-format msgid "cannot touch %s" msgstr "`%s'에서 ioctl을 할 수 없습니다" -#: src/touch.c:200 +#: src/touch.c:197 #, fuzzy, c-format msgid "setting times of %s" msgstr "%s의 시간을 유지합니다" -#: src/touch.c:216 +#: src/touch.c:213 msgid "" "Update the access and modification times of each FILE to the current time.\n" "\n" @@ -9780,10 +10078,9 @@ msgid "" "\n" "A FILE argument string of - is handled specially and causes touch to\n" "change the times of the file associated with standard output.\n" -"\n" msgstr "" -#: src/touch.c:229 +#: src/touch.c:225 msgid "" " -a change only the access time\n" " -c, --no-create do not create any files\n" @@ -9791,7 +10088,7 @@ msgid "" " -f (ignored)\n" msgstr "" -#: src/touch.c:235 +#: src/touch.c:231 msgid "" " -h, --no-dereference affect each symbolic link instead of any " "referenced\n" @@ -9800,27 +10097,27 @@ msgid "" " -m change only the modification time\n" msgstr "" -#: src/touch.c:241 +#: src/touch.c:237 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" -" --time=WORD change the specified time:\n" +" --time=WORD change the specified time:\n" " WORD is access, atime, or use: equivalent to -a\n" " WORD is modify or mtime: equivalent to -m\n" msgstr "" -#: src/touch.c:250 +#: src/touch.c:246 msgid "" "\n" "Note that the -d and -t options accept different time-date formats.\n" msgstr "" -#: src/touch.c:339 +#: src/touch.c:335 #, fuzzy, c-format msgid "cannot specify times from more than one source" msgstr "한 가지 이상의 방법으로 분할할 수 없습니다" -#: src/touch.c:413 +#: src/touch.c:409 #, c-format msgid "" "warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'" @@ -10089,25 +10386,24 @@ msgid "" "If a FILE is larger than the specified size, the extra data is lost.\n" "If a FILE is shorter, it is extended and the extended part (hole)\n" "reads as zero bytes.\n" -"\n" msgstr "" -#: src/truncate.c:110 +#: src/truncate.c:109 msgid " -c, --no-create do not create any files\n" msgstr "" -#: src/truncate.c:113 +#: src/truncate.c:112 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" -#: src/truncate.c:116 +#: 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" msgstr "" -#: src/truncate.c:122 +#: src/truncate.c:121 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -10115,57 +10411,57 @@ msgid "" "'/' round down to multiple of, '%' round up to multiple of.\n" msgstr "" -#: src/truncate.c:150 +#: src/truncate.c:149 #, c-format msgid "overflow in %<PRIdMAX> * %<PRIdMAX> byte blocks for file %s" msgstr "" -#: src/truncate.c:174 +#: src/truncate.c:173 #, fuzzy, c-format msgid "%s has unusable, apparently negative size" msgstr "%s: 파일이 음의 크기를 갖습니다" -#: src/truncate.c:184 src/truncate.c:379 +#: src/truncate.c:183 src/truncate.c:384 #, fuzzy, c-format msgid "cannot get the size of %s" msgstr "한 가지 이상의 방법으로 분할할 수 없습니다" -#: src/truncate.c:206 +#: src/truncate.c:205 #, c-format msgid "overflow rounding up size of file %s" msgstr "" -#: src/truncate.c:216 +#: src/truncate.c:215 #, c-format msgid "overflow extending size of file %s" msgstr "" -#: src/truncate.c:231 +#: src/truncate.c:230 #, c-format msgid "failed to truncate %s at %<PRIdMAX> bytes" msgstr "" -#: src/truncate.c:305 +#: src/truncate.c:303 #, c-format msgid "multiple relative modifiers specified" msgstr "" -#: src/truncate.c:335 +#: src/truncate.c:333 #, fuzzy, c-format msgid "you must specify either %s or %s" msgstr "바이트, 문자, 또는 필드로 된 목록을 지정해야 합니다" -#: src/truncate.c:342 +#: src/truncate.c:340 #, c-format msgid "you must specify a relative %s with %s" msgstr "" -#: src/truncate.c:349 +#: src/truncate.c:347 #, c-format msgid "%s was specified but %s was not" msgstr "" -#: src/truncate.c:400 +#: src/truncate.c:404 #, fuzzy, c-format msgid "cannot open %s for writing" msgstr "`%s'를 `%s'로 이동할 수 없습니다" @@ -10245,13 +10541,12 @@ msgstr "임시 파일을 만들 수 없습니다" msgid "" "Convert blanks in each FILE to tabs, writing to standard output.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" "각 <파일>의 탭을 공백문자로 변환하여, 표준 출력에 씁니다.\n" "<파일>이 주어지지 않거나, <파일>이 `-'이면, 표준 입력을 읽습니다.\n" "\n" -#: src/unexpand.c:125 +#: src/unexpand.c:124 #, fuzzy msgid "" " -a, --all convert all blanks, instead of just initial blanks\n" @@ -10263,12 +10558,12 @@ msgstr "" " -t, --tabs=<개수> 탭이 <개수>만큼의 문자만큼 떨어지게 만듭니다\n" " -t, --tabs=<리스트> 명시적으로 탭 위치를 쉼표로 구분해 지정합니다\n" -#: src/unexpand.c:153 +#: src/unexpand.c:152 #, c-format msgid "tabs are too far apart" msgstr "" -#: src/unexpand.c:505 +#: src/unexpand.c:504 #, fuzzy, c-format msgid "tab stop value is too large" msgstr "%s은(는) 너무 큽니다" @@ -10284,10 +10579,9 @@ msgid "" "writing to OUTPUT (or standard output).\n" "\n" "With no options, matching lines are merged to the first occurrence.\n" -"\n" msgstr "" -#: src/uniq.c:148 +#: src/uniq.c:147 msgid "" " -c, --count prefix lines by the number of occurrences\n" " -d, --repeated only print duplicate lines\n" @@ -10295,7 +10589,7 @@ msgstr "" " -c, --count 줄 앞에 반복된 회수를 씁니다\n" " -d, --repeated 반복된 줄만 표시합니다\n" -#: src/uniq.c:152 +#: src/uniq.c:151 #, fuzzy msgid "" " -D, --all-repeated[=delimit-method] print all duplicate lines\n" @@ -10315,12 +10609,12 @@ msgstr "" " -s, --skip-chars=N 첫번째 N개의 문자를 비교하지 않습니다\n" " -u, --unique 유일한 줄만을 표시합니다\n" -#: src/uniq.c:162 +#: src/uniq.c:161 msgid " -w, --check-chars=N compare no more than N characters in lines\n" msgstr " -w, --check-chars=N 한 줄에 N개의 문자까지만 비교합니다\n" # ?? -#: src/uniq.c:167 +#: src/uniq.c:166 #, fuzzy msgid "" "\n" @@ -10331,7 +10625,7 @@ msgstr "" "한 필드는 공백뿐이고, 그 다음에 공백문자가 아닌 문자들이 있습니다.\n" "문자가 나오기 전에 필드는 건너 뜁니다\n" -#: src/uniq.c:172 +#: src/uniq.c:171 msgid "" "\n" "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n" @@ -10339,24 +10633,24 @@ msgid "" "Also, comparisons honor the rules specified by 'LC_COLLATE'.\n" msgstr "" -#: src/uniq.c:359 +#: src/uniq.c:358 #, fuzzy, c-format msgid "too many repeated lines" msgstr "인수가 너무 많음" -#: src/uniq.c:522 +#: src/uniq.c:521 msgid "invalid number of fields to skip" msgstr "건너 뛸 필드의 개수가 부적절합니다" -#: src/uniq.c:531 +#: src/uniq.c:530 msgid "invalid number of bytes to skip" msgstr "건너 뛸 바이트 수가 부적절합니다" -#: src/uniq.c:540 +#: src/uniq.c:539 msgid "invalid number of bytes to compare" msgstr "비교할 바이트의 개수가 부적절합니다" -#: src/uniq.c:559 +#: src/uniq.c:558 #, c-format msgid "printing all duplicated lines and repeat counts is meaningless" msgstr "반복된 줄을 표시하고 회수를 세는 것은 무의미합니다" @@ -10408,6 +10702,11 @@ msgid_plural "up %ld days %2d:%02d, " msgstr[0] "" msgstr[1] "" +#: src/uptime.c:149 +#, c-format +msgid "up %2d:%02d, " +msgstr "" + #: src/uptime.c:151 #, fuzzy, c-format msgid "%lu user" @@ -10488,84 +10787,84 @@ msgstr "" msgid " old " msgstr "" -#: src/who.c:449 +#: src/who.c:440 msgid "system boot" msgstr "" -#: src/who.c:456 src/who.c:458 +#: src/who.c:447 src/who.c:449 msgid "id=" msgstr "" -#: src/who.c:471 src/who.c:476 +#: src/who.c:462 src/who.c:467 msgid "term=" msgstr "" -#: src/who.c:473 src/who.c:477 +#: src/who.c:464 src/who.c:468 msgid "exit=" msgstr "" -#: src/who.c:494 +#: src/who.c:485 msgid "LOGIN" msgstr "" -#: src/who.c:514 +#: src/who.c:505 msgid "clock change" msgstr "" -#: src/who.c:526 src/who.c:527 +#: src/who.c:517 src/who.c:518 msgid "run-level" msgstr "" -#: src/who.c:530 src/who.c:531 +#: src/who.c:521 src/who.c:522 msgid "last=" msgstr "" -#: src/who.c:562 +#: src/who.c:553 #, c-format msgid "" "\n" "# users=%lu\n" msgstr "" -#: src/who.c:568 +#: src/who.c:559 msgid "NAME" msgstr "" -#: src/who.c:568 +#: src/who.c:559 msgid "LINE" msgstr "" -#: src/who.c:568 +#: src/who.c:559 msgid "TIME" msgstr "" -#: src/who.c:568 +#: src/who.c:559 #, fuzzy msgid "IDLE" msgstr "실패" -#: src/who.c:569 +#: src/who.c:560 msgid "PID" msgstr "" -#: src/who.c:569 +#: src/who.c:560 msgid "COMMENT" msgstr "" -#: src/who.c:569 +#: src/who.c:560 msgid "EXIT" msgstr "" -#: src/who.c:649 +#: src/who.c:640 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n" msgstr "사용법: %s [<옵션>]... <파일1> <파일2>\n" -#: src/who.c:650 +#: src/who.c:641 msgid "Print information about users who are currently logged in.\n" msgstr "" -#: src/who.c:653 +#: src/who.c:644 msgid "" "\n" " -a, --all same as -b -d --login -p -r -t -T -u\n" @@ -10574,18 +10873,18 @@ msgid "" " -H, --heading print line of column headings\n" msgstr "" -#: src/who.c:660 +#: src/who.c:651 msgid " -l, --login print system login processes\n" msgstr "" -#: src/who.c:663 +#: src/who.c:654 msgid "" " --lookup attempt to canonicalize hostnames via DNS\n" " -m only hostname and user associated with stdin\n" " -p, --process print active processes spawned by init\n" msgstr "" -#: src/who.c:668 +#: src/who.c:659 msgid "" " -q, --count all login names and number of users logged on\n" " -r, --runlevel print current runlevel\n" @@ -10593,7 +10892,7 @@ msgid "" " -t, --time print last system clock change\n" msgstr "" -#: src/who.c:674 +#: src/who.c:665 msgid "" " -T, -w, --mesg add user's message status as +, - or ?\n" " -u, --users list users logged in\n" @@ -10601,7 +10900,7 @@ msgid "" " --writable same as -T\n" msgstr "" -#: src/who.c:682 +#: src/who.c:673 #, c-format msgid "" "\n" @@ -10636,6 +10935,41 @@ 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" @@ -10644,12 +10978,86 @@ msgstr "" #~ "사용법: %s [<파일>]...\n" #~ " 혹은: %s [<옵션>]\n" -#~ msgid "Try `%s --help' for more information.\n" -#~ msgstr "더 많은 정보를 보려면 `%s --help' 하십시오.\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 "Usage: %s [OPTION] FILE...\n" -#~ msgstr "사용법: %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.\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 "" @@ -10672,18 +11080,6 @@ msgstr "" #~ "각 MODE는 하나 이상의 u,g,o,a문자 다음에 +,-,=중의 하나의 기호와\n" #~ "그 다음의 r,w,x,X,s,t,u,g,o중 하나의 문자로 구성됩니다.\n" -#, fuzzy -#~ msgid "Usage: %s [OPTION]... PATH START\n" -#~ msgstr "사용법: %s [<옵션>]... <집합1> [<집합2>]\n" - -#, fuzzy -#~ msgid "cannot create link %s" -#~ msgstr "%s 디렉토리를 만들 수 없습니다" - -#, fuzzy -#~ msgid "%s: option '%s' is ambiguous\n" -#~ msgstr "%s: `-W %s'은(는) 모호한 옵션입니다\n" - #~ msgid "program error" #~ msgstr "프로그램 오류" @@ -10742,6 +11138,10 @@ msgstr "" #~ msgid "cannot overwrite directory %s" #~ msgstr "%s 디렉토리를 만들 수 없습니다" +#, fuzzy +#~ msgid "cannot create link %s" +#~ msgstr "%s 디렉토리를 만들 수 없습니다" + #, fuzzy #~ msgid "Torbjorn Granlund, David MacKenzie, and Jim Meyering" #~ msgstr "David Ihnat, David MacKenzie, 그리고 Jim Meyering" @@ -11226,9 +11626,26 @@ msgstr "" #~ msgid "sort size" #~ 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" +#~ " -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" +#~ " -l, --lines=<개수> 출력 파일당 <개수> 줄만큼의 줄을 씁니다\n" + #~ msgid "`-%d' option is obsolete; use `-l %d'" #~ msgstr "`-%d' 옵션은 없어졌습니다; `-l %d'을(를) 사용하십시오" +#, fuzzy +#~ msgid "Usage: %s [OPTION] FILE...\n" +#~ msgstr "사용법: %s [<옵션>] [<파일>]...\n" + #~ msgid "Jay Lepreau and David MacKenzie" #~ msgstr "Jay Lepreau 그리고 David MacKenzie" @@ -11422,9 +11839,6 @@ msgstr "" #~ msgid "removing the directory itself: %s\n" #~ msgstr "%s 디렉토리 자신을 지웁니다\n" -#~ msgid "cannot fork" -#~ msgstr "fork() 할 수 없습니다" - #, fuzzy #~ msgid "" #~ "ERROR: the source file %s initially had device/inode\n" diff --git a/po/lg.gmo b/po/lg.gmo index c506086b..955fa18a 100644 Binary files a/po/lg.gmo and b/po/lg.gmo differ diff --git a/po/lg.po b/po/lg.po index d3ba75bb..15580557 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: 2012-05-10 19:35+0200\n" +"POT-Creation-Date: 2013-02-14 15:56+0000\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,19 +37,19 @@ msgstr "Augumenti z'oyinza okuwa ziri:" msgid "error closing file" msgstr "wazzewo kiremya mu kubikka fayiro" -#: lib/closeout.c:112 src/base64.c:109 src/base64.c:121 src/base64.c:127 -#: src/base64.c:168 src/base64.c:224 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:330 src/expand.c:355 src/head.c:298 -#: src/head.c:348 src/head.c:756 src/head.c:797 src/mktemp.c:350 src/od.c:919 -#: src/paste.c:160 src/shuf.c:369 src/split.c:727 src/split.c:964 -#: src/split.c:969 src/tail.c:350 src/tail.c:1201 src/tail.c:1307 +#: 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 -#: src/unexpand.c:427 src/unexpand.c:443 +#: 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:1160 src/copy.c:2602 +#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617 #, c-format msgid "preserving permissions for %s" msgstr "endukusa ez'oku %s tezikyusidwa" @@ -267,18 +267,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:483 +#: lib/mkdir-p.c:196 src/install.c:484 #, c-format msgid "cannot change permissions of %s" msgstr "nnemedwa okukyusa obuyinza obw'oku %s" -#: lib/mkdir-p.c:206 src/copy.c:2261 src/install.c:709 src/install.c:722 +#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722 #, 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:915 src/tac.c:435 +#: src/split.c:929 src/tac.c:434 #, c-format msgid "memory exhausted" msgstr "ggwanika lijjudde" @@ -327,77 +327,77 @@ msgstr "'" msgid "%s: end of file" msgstr "%s: nkomerero ya fayiro" -#: lib/regcomp.c:130 +#: lib/regcomp.c:131 msgid "Success" msgstr "Omulimu gumalirizidwa bulungi" -#: lib/regcomp.c:133 +#: lib/regcomp.c:134 msgid "No match" msgstr "Tewali kifaanagana" -#: lib/regcomp.c:136 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "Emboozi enoonya ebifaanagana etakola" -#: lib/regcomp.c:139 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "Nsanze ennukuta etasobola okweyambisibwa mu kusengeka nkalala" -#: lib/regcomp.c:142 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "Linnya lya kika eky'ennukuta telikola" -#: lib/regcomp.c:145 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "Waliwo akasazze akaddanyuma nga ke kakomekkerezza" -#: lib/regcomp.c:148 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "" "Waliwo ekiragiro ekinoonya ebifaanagana\n" "n'ennukuta ezikikulembedde ekitakola wano" -#: lib/regcomp.c:151 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "Waliwo [ oba [^ ebula ko ginne wa yo" -#: lib/regcomp.c:154 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "Waliwo ( oba \\( ebulako ginne wa yo" -#: lib/regcomp.c:157 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "Waliwo \\{ ebulako ginne wa yo" -#: lib/regcomp.c:160 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "Ebiri wakati wa \\{\\} tebikola wano" -#: lib/regcomp.c:163 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "olubu gye lukomekkerezedwa tewakkirizibwa" -#: lib/regcomp.c:166 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Ggwanika lijjudde" -#: lib/regcomp.c:169 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "Emboozi enoonya ebifaanagana ekulembedde tekola wano" -#: lib/regcomp.c:172 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "Emboozi enoonya ebifaanagana ekomekkerezedwa bubi" -#: lib/regcomp.c:175 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "Emboozi enoonya ebifaanagana eyitiridde obunene" -#: lib/regcomp.c:178 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "Waliwo ) oba \\) ebulako ginne wa yo" -#: lib/regcomp.c:703 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "Emabega tewali yo mboozi enoonya ebifaanagana" @@ -437,7 +437,7 @@ msgstr "^[yY]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-mode-acl.c:695 src/copy.c:2284 src/cp.c:518 +#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516 #, c-format msgid "setting permissions for %s" msgstr "ntegeka endukusa ez'oku %s" @@ -636,13 +636,13 @@ msgstr "" " singa fayiro gye kikozesa erekerawo okugaana emirimu\n" " emirala okugikozesa mu kiseera kyekimu nayo" -#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262 -#: lib/spawn-pipe.c:265 +#: 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:232 lib/spawn-pipe.c:346 lib/wait-process.c:282 +#: 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" @@ -658,24 +658,24 @@ msgstr "%d kiragiro kya sistemu ekikolerwako mbagirawo" msgid "Unknown signal %d" msgstr "%d tekimanyidwa ng'ekiragiro kya sisitemu" -#: lib/unicodeio.c:103 +#: lib/unicodeio.c:102 msgid "iconv function not usable" msgstr "omukolo 'iconv' tegukozeseka" -#: lib/unicodeio.c:105 +#: lib/unicodeio.c:104 msgid "iconv function not available" msgstr "omukolo iconv teguliwo" -#: lib/unicodeio.c:112 +#: lib/unicodeio.c:111 msgid "character out of range" msgstr "akabonero tekali ku lukalala" -#: lib/unicodeio.c:182 +#: lib/unicodeio.c:181 #, c-format msgid "cannot convert U+%04X to local character set" msgstr "nemedwa okukyusa U+%04X okudda mu bubonero obukozesebwa wano" -#: lib/unicodeio.c:184 +#: lib/unicodeio.c:183 #, c-format msgid "cannot convert U+%04X to local character set: %s" msgstr "nemedwa okukyusa U+%04X okudda mu bubonero obukozesebwa wano: %s" @@ -860,7 +860,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:562 +#: lib/version-etc.c:251 src/system.h:573 #, c-format msgid "%s home page: <%s>\n" msgstr "Enfo ey'oku neti eya %s esangibwa ku: <%s>\n" @@ -870,7 +870,7 @@ 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:563 +#: lib/version-etc.c:256 src/system.h:574 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" "Osobola okufuna ebikuyamba okutegeera enkozesa\n" @@ -958,11 +958,10 @@ msgid "Simon Josefsson" msgstr "Simon Josefsson" #: src/base64.c:60 -#, c-format +#, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" "Base64 encode or decode FILE, or standard input, to standard output.\n" -"\n" msgstr "" "Enkozesa entuufu: %s [KAWAYIRO]... [FAYIRO]\n" "Ekiragiro kino kirina emirimu ebiri:1- Kusoma data ey'omu FAYIRO ne " @@ -974,7 +973,7 @@ msgstr "" "bulijjo.\n" "\n" -#: src/base64.c:64 +#: src/base64.c:67 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -984,7 +983,7 @@ msgid "" "\n" msgstr "" -#: src/base64.c:73 src/cat.c:110 src/fmt.c:293 src/shuf.c:71 src/sum.c:70 +#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -993,7 +992,7 @@ msgstr "" "Bw'oba towadde FAYIRO, oba nga FAYIRO ogiwadde nga '-', ekiragiro kisoma\n" "ebiva ku nnono eya bulijjo.\n" -#: src/base64.c:76 +#: src/base64.c:79 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -1009,37 +1008,37 @@ 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:171 src/base64.c:208 src/csplit.c:263 src/csplit.c:1435 -#: src/join.c:451 src/shuf.c:157 src/shuf.c:361 src/tac-pipe.c:74 +#: 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 #, c-format msgid "read error" msgstr "wazzewo kiremya mu kusoma" -#: src/base64.c:227 +#: src/base64.c:230 #, c-format msgid "invalid input" msgstr "ebiyingizibwa tebikkirizibwa" -#: src/base64.c:264 +#: src/base64.c:267 #, c-format msgid "invalid wrap size: %s" msgstr "ebifo by'ogambye ekiragiro okuwandika mu nnyiriri tebisoboka: %s" -#: src/base64.c:283 src/basename.c:173 src/comm.c:435 src/cp.c:607 -#: src/date.c:441 src/dircolors.c:447 src/du.c:894 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:169 src/install.c:929 src/join.c:961 -#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:157 src/mv.c:447 -#: src/od.c:1802 src/ptx.c:2081 src/readlink.c:154 src/seq.c:408 -#: src/shuf.c:320 src/shuf.c:339 src/sort.c:4477 src/split.c:1313 -#: src/tr.c:1797 src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:454 -#: src/uniq.c:471 src/unlink.c:81 src/uptime.c:250 src/users.c:146 -#: src/wc.c:666 src/who.c:836 src/whoami.c:79 +#: 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 #, c-format msgid "extra operand %s" msgstr "waliwo ekifuulibwa eky'enfissi %s" -#: src/base64.c:315 src/cat.c:781 +#: src/base64.c:318 src/cat.c:781 #, c-format msgid "closing standard input" msgstr "nsibako awayingizibwa awa bulijjo" @@ -1047,15 +1046,15 @@ 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/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:53 src/env.c:33 +#: 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/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:65 src/su.c:88 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 +#: 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 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -1069,24 +1068,24 @@ msgstr "" "oba: %s KAWAYIRO\n" #: src/basename.c:53 +#, fuzzy msgid "" "Print NAME with any leading directory components removed.\n" "If specified, also remove a trailing SUFFIX.\n" -"\n" msgstr "" "Ekiragiro kino kiwandika LINNYA lya fayiro nga amannya ag'amaterekero\n" "agakola ekkubo erigiggukako okuva ku musingi gaggyidwako. Bwe kiba\n" "nga nakyo kiragidwa, kiggyako n'aKAFUNDIKWA ku LINNYA lya fayiro.\n" "\n" -#: src/basename.c:59 +#: 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" msgstr "" -#: src/basename.c:66 +#: src/basename.c:67 #, c-format msgid "" "\n" @@ -1097,20 +1096,21 @@ msgid "" " %s -a any/str1 any/str2 -> \"str1\" followed by \"str2\"\n" msgstr "" -#: src/basename.c:167 src/chcon.c:531 src/chgrp.c:277 src/chmod.c:526 -#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1369 +#: 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:183 src/mkfifo.c:108 src/mknod.c:146 src/nohup.c:111 -#: src/pathchk.c:148 src/printf.c:674 src/readlink.c:146 src/realpath.c:236 -#: src/rm.c:314 src/rmdir.c:223 src/seq.c:402 src/setuidgid.c:137 -#: src/sleep.c:119 src/stat.c:1476 src/stdbuf.c:346 src/tr.c:1782 +#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 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 #, 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:52 src/split.c:49 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/split.c:49 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" @@ -1120,8 +1120,8 @@ msgstr "Torbjorn Granlund" msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:846 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4720 src/nl.c:182 src/paste.c:435 src/pr.c:2768 src/sum.c:58 +#: 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/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 +1192,7 @@ msgstr "" msgid "cannot do ioctl on %s" msgstr "nemedwa okukola ioctl ku %s" -#: src/cat.c:637 src/dd.c:2209 src/sort.c:379 src/tee.c:165 src/yes.c:86 +#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86 #, c-format msgid "standard output" msgstr "awateekebwa ebiva mu zipulogulamu awa bulijjo" @@ -1209,14 +1209,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:55 src/head.c:46 src/hostid.c:33 +#: 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 msgid "Jim Meyering" msgstr "Jim Meyering" -#: src/chcon.c:100 src/runcon.c:203 src/runcon.c:234 +#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238 #, c-format msgid "failed to create security context: %s" msgstr "nnemedwa okukolawo endukusa eza SELinux: %s" @@ -1226,8 +1226,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:540 src/copy.c:2222 src/runcon.c:217 -#: src/stat.c:683 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221 +#: src/stat.c:702 #, c-format msgid "failed to get security context of %s" msgstr "nnemedwa okukebera endukusa eza SELinux eza %s" @@ -1247,12 +1247,12 @@ msgstr "" "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:446 src/ls.c:2981 +#: src/du.c:457 src/ls.c:2981 #, 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:426 +#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437 #, c-format msgid "cannot read directory %s" msgstr "nemedwa okusoma mu tterekero %s" @@ -1262,13 +1262,13 @@ 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:599 +#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562 #, 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:618 -#: src/remove.c:613 +#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642 +#: src/remove.c:576 #, c-format msgid "fts_close failed" msgstr "omulimu 'fts_close' gugaanye" @@ -1290,7 +1290,6 @@ msgid "" "Change the security context of each FILE to CONTEXT.\n" "With --reference, change the security context of each FILE to that of " "RFILE.\n" -"\n" msgstr "" "Ekiragiro kino kikyusa endukusa eza SELinux ez'oku buli\n" "FAYIRO zibeere NDUKUSA. Bw'oba otaddeko akawayiro\n" @@ -1302,7 +1301,7 @@ msgstr "" " kizikolako naye fayiro ze ziggukako zo kizereka nga\n" "bwe zibadde.\n" -#: src/chcon.c:362 src/chgrp.c:123 src/chown.c:94 +#: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94 msgid "" " --dereference affect the referent of each symbolic link (this is\n" " the default), rather than the symbolic link itself\n" @@ -1310,7 +1309,7 @@ msgid "" "file\n" msgstr "" -#: src/chcon.c:367 +#: src/chcon.c:369 #, fuzzy msgid "" " -u, --user=USER set user USER in the target security context\n" @@ -1331,7 +1330,20 @@ msgstr "" " ekikola ku lubu ne kiba LUBU\n" "\n" -#: src/chcon.c:373 +#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110 +#, fuzzy +msgid "" +" --no-preserve-root do not treat '/' specially (the default)\n" +" --preserve-root fail to operate recursively on '/'\n" +msgstr "" +" --no-preserve-root Kano kaleetera kiragiro etterekero erya ku " +"musingi,\n" +" '/', butaliyisa mu ngeri ey'enjawulo\n" +" (y'enkola eya bulijjo)\n" +" --preserve-root Kano kaleetera ekiragiro butakola ku biri munda\n" +" w'etterekero ery'oku musingi, '/'\n" + +#: src/chcon.c:379 #, fuzzy msgid "" " --reference=RFILE use RFILE's security context rather than " @@ -1345,15 +1357,15 @@ msgstr "" " -v, --verbose Buno bwo bukireetera okuwandika ebiva mu kukola ku\n" " buli fayiro\n" -#: src/chcon.c:377 src/chgrp.c:140 src/chown.c:118 +#: 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:380 +#: src/chcon.c:386 msgid " -v, --verbose output a diagnostic for every file processed\n" msgstr "" -#: src/chcon.c:383 src/chgrp.c:143 src/chown.c:121 +#: src/chcon.c:389 src/chgrp.c:143 src/chown.c:121 #, fuzzy msgid "" "\n" @@ -1382,40 +1394,40 @@ msgstr "" " ez'eyawudde (y'enkola eya bulijjo)\n" "\n" -#: src/chcon.c:512 src/chgrp.c:264 src/chown.c:267 +#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267 #, 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:518 +#: src/chcon.c:524 #, c-format msgid "-R -h requires -P" msgstr "" "Obuwayiro obwa '-R' ne '-h' tebukola\n" "okujjako nga kuliko n'aka '-P'" -#: src/chcon.c:533 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282 -#: src/comm.c:429 src/csplit.c:1371 src/join.c:1149 src/link.c:79 -#: src/mknod.c:148 src/setuidgid.c:139 src/tr.c:1785 +#: 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 #, c-format msgid "missing operand after %s" msgstr "kubulako ekifuulibwa luvanyuma lwa %s" -#: src/chcon.c:556 src/runcon.c:247 +#: src/chcon.c:562 src/runcon.c:251 #, c-format msgid "invalid context: %s" msgstr "luno olukusa ssi lutuufu: %s" -#: src/chcon.c:563 +#: src/chcon.c:569 #, c-format msgid "conflicting security context specifiers given" msgstr "owaddeyo ebitundu eby'endukusa ebitakolagana" -#: src/chcon.c:572 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:433 src/cp.c:493 -#: src/mv.c:96 src/pwd.c:273 src/rm.c:324 src/touch.c:351 +#: 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 #, c-format msgid "failed to get attributes of %s" msgstr "nemedwa okufuna atiributo eza %s" @@ -1471,19 +1483,6 @@ msgstr "" " kwe kisobokera okukyusa obwa nannyini ku nyunzi\n" " ez'eyawudde)\n" -#: src/chgrp.c:132 src/chmod.c:387 src/chown.c:110 -#, fuzzy -msgid "" -" --no-preserve-root do not treat '/' specially (the default)\n" -" --preserve-root fail to operate recursively on '/'\n" -msgstr "" -" --no-preserve-root Kano kaleetera kiragiro etterekero erya ku " -"musingi,\n" -" '/', butaliyisa mu ngeri ey'enjawulo\n" -" (y'enkola eya bulijjo)\n" -" --preserve-root Kano kaleetera ekiragiro butakola ku biri munda\n" -" w'etterekero ery'oku musingi, '/'\n" - #: src/chgrp.c:136 msgid "" " --reference=RFILE use RFILE's group rather than specifying a\n" @@ -1575,8 +1574,15 @@ msgstr "" "bwe zibadde.\n" #: src/chmod.c:391 +#, fuzzy 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 msgid " -R, --recursive change files and directories recursively\n" @@ -1751,7 +1757,7 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:97 src/install.c:575 src/setuidgid.c:110 src/setuidgid.c:120 +#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120 #, c-format msgid "invalid group %s" msgstr "tewali guluupu eyitibwa %s" @@ -1827,8 +1833,8 @@ msgstr "nnemedwa okutegeka namba ya guluupu" msgid "failed to set user-ID" msgstr "nnemedwa okutegeka namba ya mukozesa" -#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:213 src/stdbuf.c:366 -#: src/timeout.c:402 +#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365 +#: src/timeout.c:454 #, c-format msgid "failed to run command %s" msgstr "nnemedwa okutandika ekiragiro %s" @@ -1965,20 +1971,24 @@ 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:1609 src/dd.c:1976 +#: 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 #, c-format -msgid "reading %s" -msgstr "nsoma %s" +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:426 +#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425 #, c-format msgid "cannot lseek %s" msgstr "nnemedwa okukola lseek ku %s" -#: src/copy.c:206 src/dd.c:2039 src/dd.c:2102 +#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151 #, c-format -msgid "writing %s" -msgstr "mpandikira mu %s" +msgid "error writing %s" +msgstr "wazzewo kiremya nga mpandikira mu %s" #: src/copy.c:313 #, fuzzy, c-format @@ -2000,7 +2010,7 @@ msgstr "nemedwa okubikkula %s" msgid "clearing permissions for %s" msgstr "nziramu endukusa ez'oku %s" -#: src/copy.c:697 src/copy.c:2470 src/cp.c:331 +#: src/copy.c:697 src/copy.c:2480 src/cp.c:329 #, c-format msgid "failed to preserve ownership for %s" msgstr "nnemedwa okukuuma obwa nannyini ku %s" @@ -2015,14 +2025,14 @@ msgstr "nemedwa okuzuula fayiro %s" msgid "failed to preserve authorship for %s" msgstr "nnemedwa okusigaza obuwandisi obw'oku %s" -#: src/copy.c:804 src/csplit.c:638 src/du.c:901 src/fmt.c:449 src/head.c:847 -#: src/sort.c:4489 src/split.c:1329 src/tail.c:1756 src/wc.c:678 +#: 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 "sisobodde okubikkula %s kugisoma" -#: src/copy.c:810 src/copy.c:972 src/dd.c:1546 src/dd.c:2114 src/dd.c:2252 -#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:141 +#: 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 #, c-format msgid "cannot fstat %s" msgstr "fstat eremedwa okuzuula ebikwata ku %s" @@ -2046,14 +2056,14 @@ msgstr "" 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:1574 src/copy.c:1777 src/copy.c:1935 src/ln.c:314 -#: src/remove.c:267 src/remove.c:293 src/remove.c:444 src/remove.c:465 +#: 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 #, c-format msgid "cannot remove %s" msgstr "sisobola okuggyawo %s" -#: src/copy.c:886 src/copy.c:1578 src/copy.c:1772 src/copy.c:1940 -#: src/remove.c:418 +#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945 +#: src/remove.c:375 #, c-format msgid "removed %s\n" msgstr "%s egyidwawo\n" @@ -2073,154 +2083,154 @@ msgstr "nnemedwa okukolawo fayiro eya bulijjo %s" msgid "failed to clone %s from %s" msgstr "nnemedwa okugya koppi mu %s" -#: src/copy.c:1098 src/copy.c:2531 +#: src/copy.c:1098 src/copy.c:2541 #, c-format msgid "preserving times for %s" msgstr "essawa %s z'ebadde erambidwa nazo zigenda okusigazibwa" -#: src/copy.c:1170 src/copy.c:1176 src/head.c:855 src/touch.c:175 -#: src/truncate.c:413 -#, c-format -msgid "closing %s" -msgstr "mbikka %s" +#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172 +#: src/truncate.c:417 +#, fuzzy, c-format +msgid "failed to close %s" +msgstr "nemedwa okubikkula %s" -#: src/copy.c:1466 +#: src/copy.c:1471 #, c-format msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? " msgstr "" "%s: oyagala okugezako okuwandika ku %s, enkola eya %04lo (%s) nga " "tegobererwa?" -#: src/copy.c:1473 +#: src/copy.c:1478 #, c-format msgid "%s: overwrite %s? " msgstr "%s: %s ngiwandikeko ng'empya? " -#: src/copy.c:1542 +#: src/copy.c:1547 #, c-format msgid " (backup: %s)" msgstr " (kkopi ey'okwerinda: %s)" -#: src/copy.c:1552 +#: src/copy.c:1557 #, 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:1584 +#: src/copy.c:1589 #, c-format msgid "cannot create hard link %s to %s" msgstr "sisobola okukolawo enyunzi et'eyawudde %s egguka ku %s" -#: src/copy.c:1637 src/copy.c:1689 src/copy.c:2272 src/copy.c:2589 +#: 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:1220 src/truncate.c:365 +#: src/stat.c:1239 src/truncate.c:363 #, c-format msgid "cannot stat %s" msgstr "stat eremedwa okuzuula ebikwata ku fayiro %s" -#: src/copy.c:1645 +#: src/copy.c:1650 #, c-format msgid "omitting directory %s" msgstr "etterekero %s ndibuuka" -#: src/copy.c:1659 +#: src/copy.c:1664 #, 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:1707 src/ln.c:246 +#: src/copy.c:1712 src/ln.c:246 #, c-format msgid "%s and %s are the same file" msgstr "fayiro %s ne %s fayiro y'emu" -#: src/copy.c:1806 +#: src/copy.c:1811 #, 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:1824 src/ln.c:214 +#: src/copy.c:1829 src/ln.c:214 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "%s eyakakolebwawo sijja okugiwandikako ebiri mu %s" -#: src/copy.c:1842 +#: src/copy.c:1847 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "%s tterekero, sisobola okugiwandikako ebivudde mu etali tterekero" -#: src/copy.c:1856 +#: src/copy.c:1861 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "sisobola okusimbuliza tterekero ku etali tterekero: %s -> %s" -#: src/copy.c:1886 +#: src/copy.c:1891 #, 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:1887 +#: src/copy.c:1892 #, 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:1910 src/ln.c:276 +#: src/copy.c:1915 src/ln.c:276 #, c-format msgid "cannot backup %s" msgstr "%s nnemedwa okugiggyamu kkopi ey'okwerinda" -#: src/copy.c:1974 +#: src/copy.c:1979 #, 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:2051 +#: src/copy.c:2056 #, 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:2068 +#: src/copy.c:2073 #, 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:2118 +#: src/copy.c:2123 #, 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:2161 +#: src/copy.c:2166 #, c-format msgid "cannot move %s to %s" msgstr "sisobola okusimbuliza %s egende ku %s" -#: src/copy.c:2173 +#: src/copy.c:2178 #, 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:2207 src/install.c:905 src/mkdir.c:189 src/mkfifo.c:114 -#: src/mknod.c:167 +#: 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:2241 +#: src/copy.c:2246 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "sisobola okuggya kkopi mu nyunzi ey'eyawudde eyeggukako %s" -#: src/copy.c:2350 +#: src/copy.c:2355 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "" @@ -2228,47 +2238,47 @@ msgstr "" "ga fayiro kwe zigguka gajja okulaga etterekero lino nga\n" "y'entandikwa yago" -#: src/copy.c:2357 +#: src/copy.c:2362 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "sisobola okukolawo enyunzi eyeyawudde %s egguka ku %s" -#: src/copy.c:2406 src/mkfifo.c:133 +#: src/copy.c:2416 src/mkfifo.c:132 #, c-format msgid "cannot create fifo %s" msgstr "sisobola okukolawo fifo %s" -#: src/copy.c:2415 +#: src/copy.c:2425 #, c-format msgid "cannot create special file %s" msgstr "sisobola okukolawo fayiro ey'enjawulo %s" -#: src/copy.c:2426 src/ls.c:3191 src/stat.c:902 +#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921 #, c-format msgid "cannot read symbolic link %s" msgstr "sisobola okusoma enyunzi eyeyawudde %s" -#: src/copy.c:2453 +#: src/copy.c:2463 #, c-format msgid "cannot create symbolic link %s" msgstr "sisobola okukolawo enyunzi eyeyawudde %s" -#: src/copy.c:2485 +#: src/copy.c:2495 #, c-format msgid "%s has unknown file type" msgstr "fayiro %s ya kika ekitamanyidwa" -#: src/copy.c:2629 src/ln.c:358 +#: src/copy.c:2644 src/ln.c:358 #, c-format msgid "cannot un-backup %s" msgstr "sisobola okuggyawo kkopi ey'okwerinda eya %s" -#: src/copy.c:2633 +#: src/copy.c:2648 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (ggyawo kkopi ey'okwerinda)\n" -#: src/cp.c:156 src/mv.c:284 +#: src/cp.c:156 src/mv.c:286 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -2280,28 +2290,14 @@ msgstr "" " oba: %s [KAWAYIRO]... -t TTEREKERO NNONO...\n" #: src/cp.c:162 -msgid "" -"Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" -"\n" +#, fuzzy +msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" msgstr "" "Ekiragiro kino kikoppa NNONO, koppi eyo ne kigiyita KOPPI, oba\n" "NNONO bwe zisukka mu emu koppi zaazo ziteekebwe mu TTEREKERO.\n" "\n" -#: src/cp.c:166 src/csplit.c:1458 src/cut.c:197 src/df.c:852 src/du.c:268 -#: src/expand.c:112 src/fmt.c:275 src/fold.c:75 src/head.c:115 -#: src/install.c:612 src/kill.c:86 src/ln.c:392 src/ls.c:4726 src/mkdir.c:61 -#: src/mkfifo.c:56 src/mknod.c:58 src/mv.c:294 src/nl.c:191 src/paste.c:445 -#: src/pr.c:2777 src/ptx.c:1825 src/shred.c:153 src/shuf.c:58 src/sort.c:399 -#: src/split.c:211 src/stdbuf.c:95 src/tac.c:142 src/tail.c:268 -#: src/touch.c:226 src/truncate.c:107 src/unexpand.c:122 src/uniq.c:145 -msgid "" -"Mandatory arguments to long options are mandatory for short options too.\n" -msgstr "" -"Agumenti ezibeera ez'etteeka ku buwayiro obujjuvu era ziba za tteeka ne\n" -"ku buwayiro obufunze.\n" - -#: src/cp.c:169 +#: src/cp.c:168 msgid "" " -a, --archive same as -dR --preserve=all\n" " --attributes-only don't copy the file data, just the " @@ -2333,12 +2329,14 @@ msgstr "" " -d Bw'ossawo kano obeera nga eyataddewo\n" " '--no-deference --preserve=links'\n" -#: src/cp.c:178 +#: src/cp.c:177 +#, fuzzy msgid "" " -f, --force if an existing destination file cannot be\n" -" opened, remove it and try again (redundant " -"if\n" -" the -n option is used)\n" +" opened, remove it and try again (this " +"option\n" +" is ignored when the -n option is also " +"used)\n" " -i, --interactive prompt before overwrite (overrides a previous " "-n\n" " option)\n" @@ -2354,7 +2352,7 @@ msgstr "" " ez'eyawudde singa amannya gaazo gaba mu\n" " agumenti yakyo\n" -#: src/cp.c:188 +#: src/cp.c:186 #, fuzzy msgid "" " -l, --link hard link files instead of copying\n" @@ -2365,7 +2363,7 @@ msgstr "" " -L, --dereference Kamu ku buno bwe kabaako kilondoola enyunzi\n" " ez'eyawudde\n" -#: src/cp.c:192 +#: src/cp.c:190 msgid "" " -n, --no-clobber do not overwrite an existing file (overrides\n" " a previous -i option)\n" @@ -2378,7 +2376,7 @@ msgstr "" " kkopi mu fayiro ennyunzi eziri mu NNONO kwe\n" " zigguka\n" -#: src/cp.c:197 +#: src/cp.c:195 msgid "" " -p same as --preserve=mode,ownership,timestamps\n" " --preserve[=ATTR_LIST] preserve the specified attributes (default:\n" @@ -2396,7 +2394,7 @@ msgstr "" " '--preserve=mode,ownership,timestamps')\n" " atiributi endala ziri: links, xattr, all\n" -#: src/cp.c:205 +#: src/cp.c:203 msgid "" " --no-preserve=ATTR_LIST don't preserve the specified attributes\n" " --parents use full source file name under DIRECTORY\n" @@ -2406,7 +2404,7 @@ msgstr "" " --parents Kano kakireetera okusoosako ekkubo erigguka\n" " ku nsibuko ku linnya lya TTEREKERO\n" -#: src/cp.c:209 +#: src/cp.c:207 msgid "" " -R, -r, --recursive copy directories recursively\n" " --reflink[=WHEN] control clone/CoW copies. See below\n" @@ -2426,7 +2424,7 @@ msgstr "" " kigigyawobugya koppi n'eddawo nga fayiro " "empya\n" -#: src/cp.c:215 +#: src/cp.c:213 msgid "" " --sparse=WHEN control creation of sparse files. See below\n" " --strip-trailing-slashes remove any trailing slashes from each " @@ -2440,7 +2438,7 @@ msgstr "" " ndagiriro za fayiro eza NNONO ezisangibwa\n" " mu agumenti\n" -#: src/cp.c:220 +#: src/cp.c:218 msgid "" " -s, --symbolic-link make symbolic links instead of copying\n" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -2461,7 +2459,7 @@ msgstr "" "KIGENDERWA\n" " fayiro bufayiro sso ssi tterekero\n" -#: src/cp.c:226 +#: src/cp.c:224 msgid "" " -u, --update copy only when the SOURCE file is newer\n" " than the destination file or when the\n" @@ -2481,7 +2479,7 @@ msgstr "" "eya\n" " fayiro eno kwe kiyisidwa yokka\n" -#: src/cp.c:235 +#: src/cp.c:233 msgid "" "\n" "By default, sparse SOURCE files are detected by a crude heuristic and the\n" @@ -2512,7 +2510,7 @@ msgstr "" "'cp' gugaana. Singa enyunzi eyo tesoboka ate nga wataddeko akawayiro aka\n" "'--reflink=auto', 'cp' kikolawo koppi ennetongovu.\n" -#: src/cp.c:247 src/install.c:649 src/ln.c:421 src/mv.c:321 +#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322 #, fuzzy msgid "" "\n" @@ -2533,7 +2531,7 @@ msgstr "" "otegeka ekigambo ekikongozzi VERSION_CONTROL.\n" "Obwayiro n'ebigambo ebyo bisobola okubeera bino ebiddako:\n" -#: src/cp.c:254 src/install.c:656 src/mv.c:328 +#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329 msgid "" " none, off never make backups (even if --backup is given)\n" " numbered, t make numbered backups\n" @@ -2555,7 +2553,7 @@ msgstr "" " simple, never Buno bukireetera kkopi ez'okwerinda\n" " butaziteekangako nnamba\n" -#: src/cp.c:260 +#: src/cp.c:258 msgid "" "\n" "As a special case, cp makes a backup of SOURCE when the force and backup\n" @@ -2567,93 +2565,93 @@ 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:319 +#: src/cp.c:317 #, c-format msgid "failed to preserve times for %s" msgstr "nemedwa okukuuma `saawa' ez'oku %s" -#: src/cp.c:350 +#: src/cp.c:348 #, c-format msgid "failed to preserve permissions for %s" msgstr "nemedwa okukuuma endukusa ez'oku %s" -#: src/cp.c:477 +#: src/cp.c:475 #, c-format msgid "cannot make directory %s" msgstr "sisobola okukolawo etterekero %s" -#: src/cp.c:526 src/cp.c:545 +#: src/cp.c:524 src/cp.c:543 #, c-format msgid "%s exists but is not a directory" msgstr "%s gy'eri nayi ssi tterekero" -#: src/cp.c:572 src/cp.c:1068 src/install.c:401 src/install.c:844 src/ln.c:123 -#: src/ln.c:181 src/ln.c:202 src/ln.c:516 src/mv.c:152 src/mv.c:399 -#, c-format -msgid "accessing %s" -msgstr "n'etuusako %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 +#, fuzzy, c-format +msgid "failed to access %s" +msgstr "nemedwa okubikkula %s" -#: src/cp.c:592 src/install.c:914 src/ln.c:546 src/mv.c:432 src/shred.c:1182 -#: src/touch.c:433 src/truncate.c:356 +#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181 +#: src/touch.c:429 src/truncate.c:354 #, c-format msgid "missing file operand" msgstr "kubulako fayiro ey'okukolako" -#: src/cp.c:594 src/install.c:916 src/ln.c:560 src/mv.c:434 +#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436 #, c-format msgid "missing destination file operand after %s" msgstr "%s yetaaga kugobererwa fayiro egendererwa" -#: src/cp.c:603 src/install.c:925 src/mv.c:443 +#: src/cp.c:601 src/install.c:926 src/mv.c:445 #, 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:619 src/cp.c:1070 src/install.c:403 src/install.c:846 -#: src/install.c:938 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:401 -#: src/mv.c:457 +#: 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 #, c-format msgid "target %s is not a directory" msgstr "ekigenderwa %s ssi tterekero" -#: src/cp.c:730 +#: src/cp.c:728 #, c-format msgid "with --parents, the destination must be a directory" msgstr "bwe kubaako aka --parents, ekigenderwa kiteekwa kuba tterekero" -#: src/cp.c:1063 src/install.c:839 src/ln.c:511 src/mv.c:394 +#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395 #, c-format msgid "multiple target directories specified" msgstr "olaze ekigenderwa eky'amaterekero agasukka mu limu" -#: src/cp.c:1108 +#: src/cp.c:1110 #, 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:1115 src/mv.c:464 +#: src/cp.c:1117 src/mv.c:466 #, c-format msgid "options --backup and --no-clobber are mutually exclusive" msgstr "obuwayiro --backup ne --no-clobber bukontana" -#: src/cp.c:1121 +#: src/cp.c:1123 #, c-format msgid "--reflink can be used only with --sparse=auto" msgstr "okukozesa --reflink oteekwa n'okukozesa --sparse=auto" -#: src/cp.c:1129 src/install.c:899 src/ln.c:582 src/mv.c:472 +#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474 msgid "backup type" msgstr "ekika ekya kkopi ey'okwerinda" -#: src/cp.c:1154 +#: src/cp.c:1156 #, 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:1160 +#: src/cp.c:1162 #, c-format msgid "cannot preserve extended attributes, cp is built without xattr support" msgstr "" @@ -2665,149 +2663,148 @@ msgstr "" msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:529 +#: src/csplit.c:531 #, c-format msgid "input disappeared" msgstr "ennono ebuzewo" -#: src/csplit.c:658 src/csplit.c:669 +#: src/csplit.c:660 src/csplit.c:671 #, c-format msgid "%s: line number out of range" msgstr "%s: eno namba esinga obungi bw'ennyiriri mu fayiro" -#: src/csplit.c:698 +#: src/csplit.c:700 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: eno namba esinga obungi bw'ennyiriri mu fayiro" -#: src/csplit.c:701 src/csplit.c:750 +#: src/csplit.c:703 src/csplit.c:752 #, c-format msgid " on repetition %s\n" msgstr " ku miku egiddinngana %s\n" -#: src/csplit.c:744 +#: src/csplit.c:746 #, c-format msgid "%s: %s: match not found" msgstr "%s: nnoonyezza %s ne sigiraba" -#: src/csplit.c:808 src/csplit.c:848 src/nl.c:359 src/tac.c:274 +#: src/csplit.c:810 src/csplit.c:850 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:981 +#: src/csplit.c:983 #, c-format msgid "write error for %s" msgstr "%s ezzeko kiremya mu kuwandika" -#: src/csplit.c:1057 +#: src/csplit.c:1059 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: akabonero ak'awuzi kateekwa okuddibwako ennamba enzijjuvu" -#: src/csplit.c:1073 +#: src/csplit.c:1075 #, 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:1083 +#: src/csplit.c:1085 #, fuzzy, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: wateekwa okubaawo ennamba enzijjuvu wakati wa '{' ne '}'" -#: src/csplit.c:1110 +#: src/csplit.c:1112 #, fuzzy, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: kubulako akabonero ak'awuzi '%c' akaggalawo" -#: src/csplit.c:1127 +#: src/csplit.c:1129 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: eno emboozi enoonya ebifaanagana tekola: %s" -#: src/csplit.c:1160 +#: src/csplit.c:1162 #, c-format msgid "%s: invalid pattern" msgstr "%s: kino ekigambo tekikola" -#: src/csplit.c:1163 +#: src/csplit.c:1165 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: ennamba ey'olunnyiriri eteekwa okusukka ku zeero" -#: src/csplit.c:1169 +#: src/csplit.c:1171 #, 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:1175 +#: src/csplit.c:1177 #, 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:1253 +#: src/csplit.c:1255 #, c-format msgid "missing conversion specifier in suffix" msgstr "" "ekiweredwa nga akafundikwa kibuzeeko\n" "akabonero akalaga kye kinaafuulibwa" -#: src/csplit.c:1259 +#: src/csplit.c:1261 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "" "akafundikwa kalimu akabonero akalaga\n" "kye kanaafuulibwa akatakola: %c" -#: src/csplit.c:1262 +#: src/csplit.c:1264 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "" "akafundikwa kalimu akabonero akalaga\n" "kye kanaafuulibwa akatakola: \\%.3o" -#: src/csplit.c:1267 +#: src/csplit.c:1269 #, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "ekigambo ekifuga okufuulibwa kirimu obubonero obutakola: %%%c%c" -#: src/csplit.c:1284 +#: src/csplit.c:1286 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "" "akafundikwa kalimu obubonero obulaga\n" "kye kanaafuulibwa %% obuyitiridde obungi" -#: src/csplit.c:1298 +#: src/csplit.c:1300 #, c-format msgid "missing %% conversion specification in suffix" msgstr "" "akafundikwa kabulamu akabonero akalaga\n" "kye kanaafuulibwa %%" -#: src/csplit.c:1345 +#: src/csplit.c:1347 #, c-format msgid "%s: invalid number" msgstr "%s: eno namba tekola wano" -#: src/csplit.c:1449 +#: src/csplit.c:1451 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Enkozesa entuufu eri: %s [KAWAYIRO]... FAYIRO KIGAMBO...\n" -#: src/csplit.c:1453 +#: src/csplit.c:1455 #, 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" -"\n" msgstr "" "Ekiragiro kino kikolawo fayiro 'xx00', 'xx01',..., nga zirimu ebitundu ebya\n" "FAYIRO ebireetedwawo okugyawuluzaamu buli awasangibwa (zi)KIGAMBO.\n" "Era kiwandika, awateekebwa ebivaamu ebya zipulogulamu mu ebya bulijjo,\n" "obungi bwa bayiti eziri mu buli kitundu.\n" -#: src/csplit.c:1461 +#: src/csplit.c:1462 #, fuzzy, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2822,7 +2819,7 @@ msgstr "" " -k, --keep-files Buno bwo bukireetera butagyawo fayiro ze\n" " kyakakolawo bwe waba nga wazzewo kiremya\n" -#: src/csplit.c:1466 +#: src/csplit.c:1467 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" @@ -2837,7 +2834,7 @@ msgstr "" " -z, --elide-empty-files Buno bwo bukireetera okugyawo fayiro ze\n" " kikozewo bwe ziba njereere\n" -#: src/csplit.c:1473 +#: src/csplit.c:1474 msgid "" "\n" "Read standard input if FILE is -. Each PATTERN may be:\n" @@ -2846,7 +2843,7 @@ msgstr "" "FAYIRO bwe kiba - , ekiragiro kisoma ebiva ku nnono eya\n" "bulijjo. Zi KIGAMBO zisobola okubeera:\n" -#: src/csplit.c:1477 +#: src/csplit.c:1478 #, fuzzy msgid "" "\n" @@ -2883,7 +2880,7 @@ msgstr "" msgid "David M. Ihnat" msgstr "David M. Ihnat" -#: src/cut.c:64 +#: 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" @@ -2893,14 +2890,13 @@ msgid "Usage: %s OPTION... [FILE]...\n" msgstr "Enkozesa entuufu eri: %s KAWAYIRO... [FAYIRO]...\n" #: src/cut.c:193 -msgid "" -"Print selected parts of lines from each FILE to standard output.\n" -"\n" +#, 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:200 +#: src/cut.c:199 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2913,7 +2909,7 @@ msgstr "" " -d, --delimiter=K'AWULUZI Ebitundu eby'emoboozi kikozese K'AWULUZI \n" " okubyawuluzaamu mu kifo eky'oluseetuka\n" -#: src/cut.c:205 +#: src/cut.c:204 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2926,7 +2922,7 @@ msgstr "" " okuggyako nga akawayiro -s kwekali\n" " -n (Kano tekalina kye kakola)\n" -#: src/cut.c:211 +#: src/cut.c:210 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" @@ -2934,7 +2930,7 @@ msgstr "" " --complement Kano kaleetera ekiragiro okukola ku bayiti,\n" " bubonero oba firidi ebitali ebyo ebikiragidwa\n" -#: src/cut.c:215 +#: src/cut.c:214 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2948,7 +2944,7 @@ msgstr "" " kweyambisa akabonero akakozesedwa mu ebiva ku\n" " nnono\n" -#: src/cut.c:222 +#: src/cut.c:221 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2960,7 +2956,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:228 +#: src/cut.c:227 msgid "" "Each range is one of:\n" "\n" @@ -2986,48 +2982,50 @@ msgstr "" "Bw'oba towadde FAYIRO, oba FAYIRO bw'eba '-' , 'cut' esoma okuva\n" "ku nyingiza eya bulijjo.\n" -#: src/cut.c:368 src/cut.c:489 -msgid "invalid byte or field list" +#: src/cut.c:367 src/cut.c:493 +#, fuzzy +msgid "invalid byte, character or field list" msgstr "olukalala olwa bayiti oba ebitundu eby'emboozi ssi lutuufu" -#: src/cut.c:385 +#: src/cut.c:387 msgid "invalid range with no endpoint: -" msgstr "olubu olutaliko kkomo terukkirizibwa: -" -#: src/cut.c:399 +#: src/cut.c:403 msgid "invalid decreasing range" msgstr "olubu olw'ebigenda bikendeera terukkirizibwa" -#: src/cut.c:478 +#: src/cut.c:482 #, c-format msgid "byte offset %s is too large" msgstr "bayiti ey'okutandikirako %s eyitiridde okubeera ewala" -#: src/cut.c:481 +#: src/cut.c:485 #, c-format msgid "field number %s is too large" msgstr "ekitundu eky'emboozi eky'okutandikirako %s kiyitiridde okubeera ewala" -#: src/cut.c:789 src/cut.c:797 +#: src/cut.c:795 src/cut.c:803 msgid "only one type of list may be specified" msgstr "okkirizibwa okulagira ekika eky'olukalala kimu kyokka" -#: src/cut.c:806 +#: src/cut.c:812 src/numfmt.c:1408 +#, c-format msgid "the delimiter must be a single character" msgstr "akabonero akaawuluzi kateekwa okubeera ennukuta emu" -#: src/cut.c:841 +#: src/cut.c:847 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:844 +#: src/cut.c:850 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:848 +#: src/cut.c:854 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -3035,11 +3033,11 @@ msgstr "" "tekigassa okulagira enyiriri ezit'awuluzidwamu zireme okulagibwa,\n" "okuggyako nga okola ku firidi" -#: src/cut.c:864 +#: src/cut.c:870 msgid "missing list of fields" msgstr "kubuzzeeko olukalala lwa firidi" -#: src/cut.c:866 +#: src/cut.c:872 msgid "missing list of positions" msgstr "kubuzzeeko olukalala olw'ebifo" @@ -3053,9 +3051,11 @@ msgstr "" " oba: %s [-u|--utc|--universal] [MMLLssdd[[KK]MkMk][.sksk]]\n" #: src/date.c:128 +msgid "Display the current time in the given FORMAT, or set the system date.\n" +msgstr "" + +#: src/date.c:134 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" " -I[TIMESPEC], --iso-8601[=TIMESPEC] output date/time in ISO 8601 format.\n" @@ -3064,7 +3064,7 @@ msgid "" " and time to the indicated precision.\n" msgstr "" -#: src/date.c:138 +#: src/date.c:142 msgid "" " -r, --reference=FILE display the last modification time of FILE\n" " -R, --rfc-2822 output date and time in RFC 2822 format.\n" @@ -3076,7 +3076,7 @@ msgstr "" " eya RFC-2822\n" " Okugeza: Bal, 07 Agu 2006 12:34:56 -0600\n" -#: src/date.c:143 +#: src/date.c:147 #, fuzzy msgid "" " --rfc-3339=TIMESPEC output date and time in RFC 3339 format.\n" @@ -3098,7 +3098,7 @@ msgstr "" "ku\n" " budde obwa UTC\n" -#: src/date.c:154 +#: src/date.c:158 msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" @@ -3115,7 +3115,7 @@ msgstr "" " %a Kiwandike ekifunze eky'olunaku olwa mu sande\n" " (San..Lw6)\n" -#: src/date.c:161 +#: src/date.c:165 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -3132,7 +3132,7 @@ msgstr "" " %c Ennaku ez'omwezi n'obudde\n" " (Lw6 Nov 04 12:02:33 EST 1989)\n" -#: src/date.c:167 +#: src/date.c:171 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -3148,7 +3148,7 @@ msgstr "" " %e Ennaku ez'omwezi, nga awandibadde zeero\n" " ezikulembedde waliwo mabanga ( 1..31)\n" -#: src/date.c:173 +#: src/date.c:177 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -3163,7 +3163,7 @@ msgstr "" "ogugendana\n" " ne sande eya kakano okubeera eya %V mu mwaka\n" -#: src/date.c:178 +#: src/date.c:182 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -3175,7 +3175,7 @@ msgstr "" " %I Essaawa (01..12)\n" " %j Olunaku lwakumeka mu mwaka (001..366)\n" -#: src/date.c:184 +#: src/date.c:188 #, fuzzy msgid "" " %k hour, space padded ( 0..23); same as %_H\n" @@ -3188,7 +3188,7 @@ msgstr "" " %m Omwezi (01..12)\n" " %M Dakiika (00..59)\n" -#: src/date.c:190 +#: src/date.c:194 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -3215,7 +3215,7 @@ msgstr "" "buleetedwa\n" " aba GNU)\n" -#: src/date.c:199 +#: src/date.c:203 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -3232,7 +3232,7 @@ msgstr "" " %T Obudde, mu mbala eya ssaawa 24 (SS:dd:ss)\n" " %u Olunaku olwa sande (1..7); 1 kitegeeza Balaza\n" -#: src/date.c:205 +#: src/date.c:209 msgid "" " %U week number of year, with Sunday as first day of week (00..53)\n" " %V ISO week number, with Monday as first day of week (01..53)\n" @@ -3250,7 +3250,7 @@ msgstr "" "ebalibwa\n" " nga etandikira ku lwa Balaza (00..53)\n" -#: src/date.c:211 +#: src/date.c:215 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -3264,7 +3264,7 @@ msgstr "" " %y Digiti ez'omwaka ezisembayo (00..99)\n" " %Y Omwaka (1970...)\n" -#: src/date.c:217 +#: src/date.c:221 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -3297,7 +3297,7 @@ msgstr "" "'date', mu ebya bulijjo, bw'ebeera ewandika obudde ennamba ezisookerwako " "digiti emu yokka ez'ongerako zeero ekulembedde.\n" -#: src/date.c:226 +#: src/date.c:230 #, fuzzy msgid "" "The following optional flags may follow '%':\n" @@ -3324,7 +3324,7 @@ msgstr "" " kyanditadde ntono ate ne kiteekawo ntono we kyanditadde\n" " nnene\n" -#: src/date.c:235 +#: src/date.c:239 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -3340,7 +3340,7 @@ msgstr "" "'E' ekukkiriza okukozesa empandika ez'ennamba lokale yo z'etegeera.\n" "'O' ekukkiriza obubonero obw'ennamba obw'enjawulo obuli mu lokale yo.\n" -#: src/date.c:242 +#: src/date.c:246 msgid "" "\n" "Examples:\n" @@ -3354,38 +3354,38 @@ msgid "" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:275 src/dd.c:2193 src/head.c:838 src/md5sum.c:477 -#: src/md5sum.c:798 src/od.c:863 src/od.c:1914 src/pr.c:1176 src/pr.c:1372 -#: src/pr.c:1494 src/stty.c:842 src/tac.c:563 src/tail.c:343 src/tee.c:126 +#: 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 #, c-format msgid "standard input" msgstr "ennono eya bulijjo" -#: src/date.c:303 src/date.c:523 +#: src/date.c:307 src/date.c:527 #, c-format msgid "invalid date %s" msgstr "obudde, %s, tebukkirizibwa" -#: src/date.c:414 src/date.c:448 +#: src/date.c:418 src/date.c:452 #, c-format msgid "multiple output formats specified" msgstr "olagide empandika z'ebivaamu ezisoba mu emu" -#: src/date.c:426 +#: src/date.c:430 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "" "pulogulamu ekukkiriza okuwa akawayiro akalonda ennaku zennyini\n" "ez'okulaga kamu kokka" -#: src/date.c:433 +#: src/date.c:437 #, c-format msgid "the options to print and set the time may not be used together" msgstr "" "tekikkirizibwa okuweera awamu obuwayiro obuteeka obudde n'obwo obulaga obudde" -#: src/date.c:454 +#: src/date.c:458 #, fuzzy, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -3397,23 +3397,23 @@ msgstr "" "y'ebiseera, agumenti endala ezitali buwayiro ziteekwa\n" "kusookerwako ka '+'" -#: src/date.c:531 +#: src/date.c:535 #, c-format msgid "cannot set date" msgstr "nemedwa okuteeka ennaku" -#: src/date.c:554 src/du.c:360 +#: src/date.c:558 src/du.c:371 #, c-format msgid "time %s is out of range" msgstr "obudde %s tebumanyidwa" #. This is a proper name. See the gettext manual, section Names. -#: src/dd.c:44 src/factor.c:43 src/rm.c:41 src/tail.c:69 src/touch.c:41 +#: 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 "Paul Rubin" -#: src/dd.c:517 +#: src/dd.c:521 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3422,7 +3422,7 @@ msgstr "" "Enkozesa entuufu eri: %s [EKIKOLEBWAKO]...\n" " oba: %s KAWAYIRO\n" -#: src/dd.c:522 +#: src/dd.c:526 #, fuzzy msgid "" "Copy a file, converting and formatting according to the operands.\n" @@ -3453,7 +3453,7 @@ msgstr "" " ibs=BAYITI Kano kakireetera okusomanga bayiti BAYITI ku\n" " buli muku\n" -#: src/dd.c:531 +#: src/dd.c:535 #, fuzzy msgid "" " if=FILE read from FILE instead of stdin\n" @@ -3463,7 +3463,8 @@ msgid "" " oflag=FLAGS write as per the comma separated symbol list\n" " seek=N skip N obs-sized blocks at start of output\n" " skip=N skip N ibs-sized blocks at start of input\n" -" status=noxfer suppress transfer statistics\n" +" status=WHICH WHICH info to suppress outputting to stderr;\n" +" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" msgstr "" " if=FAYIRO Kano kakireetera okusoma mu FAYIRO mu kifo ekya\n" " kulinda ebiva ku 'stdin'\n" @@ -3485,10 +3486,11 @@ msgstr "" " status=noxfer Kano kakireetera butalaga bifa ku mulimu\n" " ogw'okukola koppi\n" -#: src/dd.c:541 +#: src/dd.c:546 +#, fuzzy msgid "" "\n" -"BLOCKS and BYTES may be followed by the following multiplicative suffixes:\n" +"N and BYTES may be followed by the following multiplicative suffixes:\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, and so on for T, P, E, Z, Y.\n" "\n" @@ -3503,7 +3505,7 @@ msgstr "" "BIGAMBO_BYAWULE bisobola okubeera:\n" "\n" -#: src/dd.c:550 +#: src/dd.c:555 #, fuzzy msgid "" " ascii from EBCDIC to ASCII\n" @@ -3537,7 +3539,7 @@ msgstr "" " 'block' oba 'unblock', kikozeseemu\n" " mabangirizi mu kifo ekya zi NUL\n" -#: src/dd.c:563 +#: src/dd.c:568 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3558,7 +3560,7 @@ msgstr "" " zzibizi nga kigenda kumala omulimu. Kigattako\n" " n'okukaza meta-data wakwo.\n" -#: src/dd.c:571 +#: src/dd.c:576 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3574,27 +3576,27 @@ msgstr "" " Tekagasa ku mirimu egikola ku biyingizibwa.\n" " Kusaana kubaako n'akawayiro conv=notrunc.\n" -#: src/dd.c:578 +#: src/dd.c:583 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:580 +#: src/dd.c:585 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:582 +#: src/dd.c:587 msgid " directory fail unless a directory\n" msgstr "" " directory Kano kaleetera omulimu okugaana\n" " ekikolebwako bwe litaba tterekero\n" -#: src/dd.c:584 +#: src/dd.c:589 msgid " dsync use synchronized I/O for data\n" msgstr "" " dsync Kano kaleetera data okukolebwako\n" @@ -3603,20 +3605,20 @@ msgstr "" " oba ebiwandikibwa lwe biggwa mu\n" " ggwanika zzibizi\n" -#: src/dd.c:586 +#: src/dd.c:591 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:587 +#: src/dd.c:592 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:590 +#: src/dd.c:595 msgid " nonblock use non-blocking I/O\n" msgstr "" " nonblock Kano kaleetera data okukolebwako\n" @@ -3624,7 +3626,7 @@ msgstr "" " birala nga ebisomebwa oba ebiwandikibwa\n" " tebinnaba kuggwa mu ggwanika zzibizi\n" -#: src/dd.c:592 +#: src/dd.c:597 msgid " noatime do not update access time\n" msgstr "" " noatime Kano kaleetera omulimu\n" @@ -3633,25 +3635,25 @@ msgstr "" " ebiraga obudde lwe\n" " byasemba kukeberwa\n" -#: src/dd.c:595 +#: src/dd.c:600 msgid " nocache discard cached data\n" msgstr "" -#: src/dd.c:598 +#: src/dd.c:603 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:601 +#: src/dd.c:606 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:603 +#: src/dd.c:608 msgid " nolinks fail if multiply-linked\n" msgstr "" " nolinks Kano kaleetera omulimu kugaana\n" @@ -3659,31 +3661,31 @@ msgstr "" " egguka ku fayiro ezisukka mu\n" " emu nga tez'eyawuddeko\n" -#: src/dd.c:605 +#: src/dd.c:610 msgid " binary use binary I/O for data\n" msgstr "" " binary Kano kakireetera kuyisa data\n" " nga ebya binariyo\n" -#: src/dd.c:607 +#: src/dd.c:612 msgid " text use text I/O for data\n" msgstr "" " text Kano kakireetera kuyisa data\n" " nga ebitegeereka bantu\n" -#: src/dd.c:609 +#: src/dd.c:614 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:612 +#: src/dd.c:617 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:615 +#: src/dd.c:620 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:620 +#: src/dd.c:625 #, fuzzy, c-format msgid "" "\n" @@ -3714,7 +3716,7 @@ msgstr "" "Obuwayiro buno bwe bukkirizibwa:\n" "\n" -#: src/dd.c:676 +#: src/dd.c:683 #, c-format msgid "" "%<PRIuMAX>+%<PRIuMAX> records in\n" @@ -3723,21 +3725,21 @@ msgstr "" "ebiwandise %<PRIuMAX>+%<PRIuMAX> bisomedwa\n" "ebiwandise %<PRIuMAX>+%<PRIuMAX> biwandikidwa\n" -#: src/dd.c:682 +#: src/dd.c:689 #, 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:694 +#: src/dd.c:701 #, 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:712 +#: src/dd.c:720 msgid "Infinity B" msgstr "Infinity B" @@ -3751,83 +3753,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:725 +#: src/dd.c:733 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g s, %s/s\n" -#: src/dd.c:804 +#: src/dd.c:812 #, c-format msgid "closing input file %s" msgstr "mbikka fayiro egyibwamu ebiyingizibwa %s" -#: src/dd.c:811 +#: src/dd.c:819 #, c-format msgid "closing output file %s" msgstr "mbikka fayiro egenzemu ebizzibwa %s" -#: src/dd.c:1014 +#: src/dd.c:1022 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "nnemedwa okuyimiriza O_DIRECT: %s" -#: src/dd.c:1085 src/dd.c:1934 +#: src/dd.c:1093 src/dd.c:1942 #, c-format msgid "writing to %s" msgstr "mpandika mu %s" -#: src/dd.c:1199 src/dd.c:1253 +#: src/dd.c:1207 src/dd.c:1261 #, c-format msgid "unrecognized operand %s" msgstr "ekikolebwako %s tekimanyidwa" -#: src/dd.c:1210 +#: src/dd.c:1218 msgid "invalid conversion" msgstr "okufuula kuno tekukkirizibwa" -#: src/dd.c:1213 src/dd.c:1289 +#: src/dd.c:1221 src/dd.c:1297 msgid "invalid input flag" msgstr "akatuuti akafuga ebiyingizibwa tekakkirizibwa" -#: src/dd.c:1216 src/dd.c:1283 src/dd.c:1295 +#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303 msgid "invalid output flag" msgstr "akatuuti akafuga ebivaamu tekakkirizibwa" -#: src/dd.c:1219 +#: src/dd.c:1227 msgid "invalid status flag" msgstr "akatuuti akalaga embeera tekakkirizibwa" -#: src/dd.c:1258 src/truncate.c:312 +#: src/dd.c:1266 src/truncate.c:310 #, c-format msgid "invalid number %s" msgstr "namba %s tekkirizibwa" -#: src/dd.c:1340 +#: src/dd.c:1348 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "tekisoboka okugattika ebibiri ku {ascii,ebcdic,ibm}" -#: src/dd.c:1342 +#: src/dd.c:1350 #, c-format msgid "cannot combine block and unblock" msgstr "tekisoboka okugattika block ne unblock" -#: src/dd.c:1344 +#: src/dd.c:1352 #, c-format msgid "cannot combine lcase and ucase" msgstr "tekisoboka kugattika lcase ne ucase" -#: src/dd.c:1346 +#: src/dd.c:1354 #, c-format msgid "cannot combine excl and nocreat" msgstr "tekisoboka kugattika excl ne nocreat" -#: src/dd.c:1349 +#: src/dd.c:1357 #, fuzzy, c-format msgid "cannot combine direct and nocache" msgstr "tekisoboka kugattika excl ne nocreat" -#: src/dd.c:1506 +#: src/dd.c:1514 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3837,78 +3839,78 @@ 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:1593 +#: src/dd.c:1601 #, c-format msgid "%s: cannot skip" msgstr "%s: sisobola kubuuka" -#: src/dd.c:1595 src/dd.c:1614 src/dd.c:1675 +#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683 #, c-format msgid "%s: cannot seek" msgstr "%s: sisobola kufuna aw'okutandika kusoma" -#: src/dd.c:1655 +#: src/dd.c:1663 #, c-format msgid "offset overflow while reading file %s" msgstr "" "ennamba eraga ow'okutandika okusoma fayiro %s tejja mu ggwanika zzibizi" -#: src/dd.c:1667 +#: src/dd.c:1675 #, 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:1671 +#: src/dd.c:1679 #, c-format msgid "cannot work around kernel bug after all" msgstr "tekisobose okuvvuunuka ekitali kituufu mu nnombe" -#: src/dd.c:1814 +#: src/dd.c:1822 #, c-format msgid "setting flags for %s" msgstr "ntegeka obutuuti obwa %s" -#: src/dd.c:1867 +#: src/dd.c:1875 #, c-format msgid "memory exhausted by input buffer of size %zu bytes (%s)" msgstr "" -#: src/dd.c:1881 +#: src/dd.c:1889 #, c-format msgid "memory exhausted by output buffer of size %zu bytes (%s)" msgstr "" -#: src/dd.c:1914 +#: src/dd.c:1922 #, c-format msgid "%s: cannot skip to specified offset" msgstr "" "%s: tekisobose okugenda ennamba\n" "eraga aw'okusoma w'egamba" -#: src/dd.c:2125 src/dd.c:2258 -#, c-format -msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" +#: src/dd.c:2133 +#, 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:2138 +#: src/dd.c:2146 #, c-format msgid "fdatasync failed for %s" msgstr "ku %s enkola eya fdatasync egaanye" -#: src/dd.c:2148 +#: src/dd.c:2156 #, c-format msgid "fsync failed for %s" msgstr "ku %s enkola eya sync egaanye" -#: src/dd.c:2199 src/dd.c:2228 +#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165 #, c-format -msgid "opening %s" -msgstr "mbikkula %s" +msgid "failed to open %s" +msgstr "nemedwa okubikkula %s" -#: src/dd.c:2237 +#: src/dd.c:2246 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) " @@ -3917,84 +3919,107 @@ msgstr "" "ennamba eraga aw'okusoma eyitiridde obunene: sisobola kutemamu okutuuka ku\n" "buloka eya seek=%<PRIuMAX> (bayiti-%lu)" -#: src/dd.c:2274 src/dd.c:2280 +#: src/dd.c:2267 +#, 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 #, 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:54 src/expr.c:153 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:39 src/sleep.c:35 src/sort.c:66 +#: 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 msgid "Paul Eggert" msgstr "Paul Eggert" -#: src/df.c:140 +#: src/df.c:172 msgid "Filesystem" msgstr "Sisitemu eya fayiro" -#: src/df.c:141 +#: src/df.c:175 msgid "Type" msgstr "Kika" -#: src/df.c:142 +#: src/df.c:178 src/df.c:542 msgid "blocks" msgstr "buloka" -#: src/df.c:142 -msgid "Inodes" -msgstr "Inodi" - -#: src/df.c:142 -msgid "Size" -msgstr "Bunene" - -#: src/df.c:143 +#: src/df.c:181 msgid "Used" msgstr "Awakozese" -#: src/df.c:143 -msgid "IUsed" -msgstr "Ezikozesedwa" - -#: src/df.c:144 +#: src/df.c:184 msgid "Available" msgstr "Awate" -#: src/df.c:144 -msgid "IFree" -msgstr "Ente" - -#: src/df.c:144 -msgid "Avail" -msgstr "Awate" - -#: src/df.c:145 +#: src/df.c:187 msgid "Use%" msgstr "Enkozesa%" -#: src/df.c:145 +#: src/df.c:190 +msgid "Inodes" +msgstr "Inodi" + +#: src/df.c:193 +msgid "IUsed" +msgstr "Ezikozesedwa" + +#: src/df.c:196 +msgid "IFree" +msgstr "Ente" + +#: src/df.c:199 msgid "IUse%" msgstr "Enkozesa%" -#: src/df.c:145 +#: src/df.c:202 +msgid "Mounted on" +msgstr "Kiwangidwa ku" + +#: src/df.c:383 +#, c-format +msgid "option --output: field '%s' unknown" +msgstr "" + +#: src/df.c:390 +#, fuzzy, c-format +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 +msgid "Size" +msgstr "Bunene" + +#: src/df.c:414 src/df.c:451 +msgid "Avail" +msgstr "Awate" + +#: src/df.c:474 msgid "Capacity" msgstr "eziriwo" -#: src/df.c:146 -msgid "Mounted on" -msgstr "Kiwangidwa ku" +#. 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 +#, c-format +msgid "%s-%s" +msgstr "" -#: src/df.c:847 +#: src/df.c:1210 +#, fuzzy msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" -"\n" msgstr "" "Ekiragiro kino kiwandika ebifa ku sisiemu eya fayiro FAYIRO kweri,\n" "oba ebifa ku sistemu eza fayiro zonna.\n" "\n" -#: src/df.c:855 +#: src/df.c:1217 #, fuzzy msgid "" " -a, --all include dummy file systems\n" @@ -4026,7 +4051,7 @@ msgstr "" "mu\n" " kifo kya bya 1024\n" -#: src/df.c:865 +#: src/df.c:1227 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -4044,8 +4069,12 @@ msgstr "" "'sync',\n" " (eno y'enkola eya bulijjo)\n" -#: src/df.c:872 +#: src/df.c:1234 +#, fuzzy msgid "" +" --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" +" or print all fields if FIELD_LIST is " +"omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" " -t, --type=TYPE limit listing to file systems of type TYPE\n" @@ -4065,22 +4094,44 @@ msgstr "" " fayiro zo zokka ezitali za kika kya KIKA\n" " -v (Kano tekakolebwako)\n" -#: src/df.c:1027 +#: src/df.c:1248 +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" +msgstr "" + +#: src/df.c:1285 +#, 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 #, 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:1075 +#: src/df.c:1500 msgid "Warning: " msgstr "Kulabula: " -#: src/df.c:1077 src/stat.c:795 +#: src/df.c:1502 src/stat.c:814 msgid "cannot read table of mounted file systems" msgstr "nnemedwa okusoma endagiriro eya sistemu eza fayiro eziwangidwa" -#: src/df.c:1107 +#: src/df.c:1539 #, c-format msgid "no file systems processed" msgstr "tewali sisitemu eya fayiro ekoledwako" @@ -4210,7 +4261,7 @@ msgstr "" " %s /usr/bin/ kivaamu \"/usr\".\n" " %s stdio.h kivaamu \".\".\n" -#: src/du.c:260 src/sort.c:390 src/wc.c:112 +#: src/du.c:270 src/sort.c:394 src/wc.c:112 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -4219,18 +4270,19 @@ msgstr "" "Enkozesa entuufu eri: %s [KAWAYIRO]... [FAYIRO]...\n" " oba: %s [KAWAYIRO]... --files0-from=F\n" -#: src/du.c:264 -msgid "" -"Summarize disk usage of each FILE, recursively for directories.\n" -"\n" +#: src/du.c:274 +#, fuzzy +msgid "Summarize disk usage of each FILE, recursively for directories.\n" msgstr "" "Ekiragiro kino kiwandika, mu bufunze, ekitundu ekya disiki buli\n" "FAYIRO ky'emalawo. Bwe liba ttereko ekiragiro kikebera ne fayiro ezilirimu.\n" "\n" -#: src/du.c:271 +#: src/du.c:280 #, fuzzy msgid "" +" -0, --null end each output line with 0 byte rather than " +"newline\n" " -a, --all write counts for all files, not just directories\n" " --apparent-size print apparent sizes, rather than disk usage; " "although\n" @@ -4247,7 +4299,7 @@ msgstr "" " ky'etwala. Wabula ku fayiro ez'empewo buyinza\n" " okuba nga bwe businga.\n" -#: src/du.c:279 +#: src/du.c:289 #, fuzzy msgid "" " -B, --block-size=SIZE scale sizes by SIZE before printing them. E.g.,\n" @@ -4257,6 +4309,11 @@ msgid "" " -c, --total produce a grand total\n" " -D, --dereference-args dereference only symlinks that are listed on the\n" " command line\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 "" " -B, --block-size=BUNENE Kamu ku buno bw'okassaako kikozesa buloka eziri\n" " mu bayiti BUNENE. Okugeza, '-BM' kakireetera\n" @@ -4269,7 +4326,8 @@ msgstr "" " -c, --total Kiraga omugatte\n" " -D, --dereference-args Ku nyunzi ez'eyawudde, kizzawo makubo genyini\n" -#: src/du.c:288 +#: src/du.c:302 +#, fuzzy msgid "" " --files0-from=F summarize disk usage of the NUL-terminated file\n" " names specified in file F;\n" @@ -4277,7 +4335,6 @@ msgid "" " -H equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" --si like -h, but use powers of 1000 not 1024\n" msgstr "" " --files0-from=F Kano kaleetera ekiragiro okukola ku fayiro eziri\n" " ku lukalala mu fayiro F. Mu lukalala olwo, " @@ -4293,9 +4350,11 @@ msgstr "" " --si Kano kakola nga -h naye emirengo gib gya 1000 mu\n" " kifo kya 1024\n" -#: src/du.c:297 +#: src/du.c:310 +#, fuzzy 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 "" @@ -4304,14 +4363,13 @@ msgstr "" " nga fayiro ezisoba mu emu\n" " -m Kye kimu ne --block-size=1M\n" -#: src/du.c:302 +#: src/du.c:316 +#, fuzzy msgid "" -" -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " "default)\n" -" -0, --null end each output line with 0 byte rather than " -"newline\n" " -S, --separate-dirs 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 Buno bukireetera okulondoolanga nnyunzi\n" @@ -4328,36 +4386,11 @@ msgstr "" "fayiro\n" " ezimenyedwa mu agumenti\n" -#: src/du.c:309 -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 Ssaawo kamu ku buno okukireetera okubuuka\n" -" amaterekero agali ku sisitemu eza fayiro endala\n" -" -X, --exclude-from=FAYIRO Fayiro erinnya lya yo bwe libeera nga\n" -" liri ku lukalala oluli mu FAYIRO, kigibuuka.\n" -" --exclude=KIGAMBO Kano kakireetera okubuuka oba okugyamu fayiro\n" -" ezirina KIGAMBO mu mannya ga zo\n" -" -d, --max-depth=N Buno bukireetera okulaga emigatte egifunidwa ku\n" -" materekero (agumenti --all nayo bw'ebaako " -"kikola\n" -" ne ku fayiro ezitali materekero). Kikoma ku ezo\n" -" fayiro n'amaterekero ezitasukka emitendera N " -"wansi\n" -" w'eryo ekiragiro kwe kiweredwa;\n" -" Okussawo '--max-depth=0' kye kimu n'okussawo\n" -" '--summarize'\n" - -#: src/du.c:318 +#: src/du.c:322 #, fuzzy msgid "" +" -t, --threshold=SIZE exclude entries smaller than SIZE if positive,\n" +" or entries greater than SIZE if negative\n" " --time show time of the last modification of any file in " "the\n" " directory, or any of its subdirectories\n" @@ -4380,68 +4413,77 @@ msgstr "" " EMPANDIKA kikitegeera nga ekiragiro 'date' bwe\n" " kikitegeera\n" -#: src/du.c:375 +#: src/du.c:333 +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 msgid "Infinity" msgstr "Infinity B" -#: src/du.c:600 +#: src/du.c:507 +#, c-format +msgid "mount point %s already traversed" +msgstr "" + +#: src/du.c:624 #, fuzzy, c-format msgid "fts_read failed: %s" msgstr "fts_read eremedwa okuzuula ebikwata ku fayiro" -#: src/du.c:724 +#: src/du.c:780 #, c-format msgid "invalid maximum depth %s" msgstr "tekikkirizibwa okukka ku mutendera %s gw'oyagala" -#: src/du.c:817 +#: src/du.c:809 +#, fuzzy, c-format +msgid "invalid --threshold argument '-0'" +msgstr "agumenti eya --%s, %s tekkirizibwa" + +#: src/du.c:887 #, 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:824 +#: src/du.c:894 #, 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:830 +#: src/du.c:900 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "Kulabula: okulagira kuwandika mu bufunze kikontana ne --max-depth=%lu" -#: src/du.c:896 src/sort.c:4479 src/wc.c:668 +#: src/du.c:966 src/sort.c:4533 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:949 src/md5sum.c:587 src/od.c:903 src/tac.c:239 src/tac.c:350 -#: src/tac.c:506 src/tac.c:586 src/wc.c:733 +#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 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:963 src/sort.c:4508 src/wc.c:747 +#: src/du.c:1040 src/sort.c:4562 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:980 src/du.c:988 src/wc.c:760 src/wc.c:768 +#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768 msgid "invalid zero-length file name" msgstr "erinnya lya fayiro terikkirizibwa kusigala lyereere" -#: src/du.c:1007 src/head.c:149 src/head.c:262 src/head.c:334 src/head.c:538 -#: src/head.c:620 src/head.c:692 src/head.c:750 src/head.c:774 src/tail.c:412 -#: src/tail.c:500 src/tail.c:549 src/tail.c:642 src/tail.c:770 src/tail.c:818 -#: src/tail.c:855 src/tail.c:1782 src/tail.c:1812 src/uniq.c:395 -#, c-format -msgid "error reading %s" -msgstr "wazzewo kiremya mu kusoma %s" - -#: src/du.c:1010 src/ls.c:2649 src/wc.c:791 +#: src/du.c:1088 src/ls.c:2649 src/wc.c:791 msgid "total" msgstr "omugatte" @@ -4558,9 +4600,12 @@ msgstr "" "%s [KAWAYIRO]... [-] [KIGAMBO=EKIKONGOJJEDWA]... [KIRAGIRO [AGU]...]\n" #: src/env.c:55 +msgid "Set each NAME to VALUE in the environment and run COMMAND.\n" +msgstr "" + +#: src/env.c:61 +#, fuzzy msgid "" -"Set each NAME to VALUE in the environment and run COMMAND.\n" -"\n" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with 0 byte rather than newline\n" " -u, --unset=NAME remove variable from the environment\n" @@ -4579,7 +4624,7 @@ msgstr "" " nviromenti - ekigambo ekyo kibe nga tekirina\n" " bye kikongojja\n" -#: src/env.c:64 +#: src/env.c:68 msgid "" "\n" "A mere - implies -i. If no COMMAND, print the resulting environment.\n" @@ -4589,26 +4634,26 @@ msgstr "" "Bw'otoyongerako KIRAGIRO, env ewandika ebifa ku enviromenti\n" "ekoledwawo.\n" -#: src/env.c:120 +#: src/env.c:124 #, c-format msgid "cannot unset %s" msgstr "sisobola okugyamu ekigambo %s mu nviromenti" -#: src/env.c:131 +#: src/env.c:135 #, c-format msgid "cannot set %s" msgstr "sisobodde okutegeka kigambo %s" -#: src/env.c:148 +#: src/env.c:152 #, c-format msgid "cannot specify --null (-0) with command" msgstr "aka '--null' ( oba '-0') takgendera ku kiragiro" #: 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" -"\n" msgstr "" "Ekiragiro kino, ebiri mu buli FAYIRO ekiweredwa, kibiwandikira awateekebwa\n" "ebiva mu pulogulamu mu ebya bulijjo nga bwe kisangamu enseetuka kizifuula\n" @@ -4616,7 +4661,7 @@ msgstr "" "ku nyingiza eya bulijjo.\n" "\n" -#: src/expand.c:115 +#: src/expand.c:114 msgid "" " -i, --initial do not convert tabs after non blanks\n" " -t, --tabs=NUMBER have tabs NUMBER characters apart, not 8\n" @@ -4628,7 +4673,7 @@ msgstr "" " okubw'enkanya obubonero BUNGI mu kifo kya 8 eza\n" " bulijjo\n" -#: src/expand.c:119 +#: src/expand.c:118 msgid "" " -t, --tabs=LIST use comma separated list of explicit tab positions\n" msgstr "" @@ -4636,30 +4681,30 @@ msgstr "" " eziddirinngana okubeera nseetuka, obuwanvu bwazo\n" " nga ze nnamba ez'omu LUKALALA ez'awuludwa zi ','\n" -#: src/expand.c:172 src/unexpand.c:191 +#: src/expand.c:171 src/unexpand.c:190 #, c-format msgid "tab stop is too large %s" msgstr "obunene, %s, obw'oluseetuka buyitiridde" -#: src/expand.c:180 src/unexpand.c:199 +#: src/expand.c:179 src/unexpand.c:198 #, c-format msgid "tab size contains invalid character(s): %s" msgstr "" "ekiweredwa nga obuwanvu obw'oluseetuka kirimu\n" "akabonero oba bubonero obutakkirizibwa: %s" -#: src/expand.c:206 src/unexpand.c:225 +#: src/expand.c:205 src/unexpand.c:224 #, c-format msgid "tab size cannot be 0" msgstr "oluseetuka telukkirizibwa okubeera ng'obuwanvu bwalwo buli 0" -#: src/expand.c:208 src/unexpand.c:227 +#: src/expand.c:207 src/unexpand.c:226 #, c-format msgid "tab sizes must be ascending" msgstr "" "ennamba ez'obuwanvu obw'enseetuka zisengeke nga zigenda z'eyongera obunene" -#: src/expand.c:326 src/expand.c:345 src/unexpand.c:374 src/unexpand.c:419 +#: 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 "ebiyingizibwa birimu olunyiriri oluyitiridde obuwanvu" @@ -4861,12 +4906,12 @@ msgstr "emboozi enoonya zinnewayo erimu ensobi" msgid "non-integer argument" msgstr "agumenti ssi namba nzijjuvu" -#: src/expr.c:793 src/truncate.c:316 +#: src/expr.c:793 src/truncate.c:314 #, c-format msgid "division by zero" msgstr "waliwo okugabiza mu zero" -#: src/expr.c:887 src/sort.c:2029 +#: src/expr.c:887 src/sort.c:2044 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "okuvvuunuka kiremy'ono, tegeka nti LC_ALL='C'" @@ -4876,28 +4921,32 @@ msgstr "okuvvuunuka kiremy'ono, tegeka nti LC_ALL='C'" msgid "the strings compared were %s and %s" msgstr "ebigambo ebigerageranyizidwa biri %s ne %s." -#: src/factor.c:449 -msgid "using arbitrary-precision arithmetic" +#. This is a proper name. See the gettext manual, section Names. +#: src/factor.c:111 +msgid "Niels Moller" msgstr "" -"nkozesa okubala okweyambisa ettuuso\n" -"erikomezebwako obunene bw'eggwanika\n" -"lya kompyuta bwokka" -#: src/factor.c:460 -msgid "using single-precision arithmetic" -msgstr "nkozesa ennamba ezikongojjebwa mu bbiti 32" +#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459 +#, c-format +msgid "Lucas prime test failure. This should not happen" +msgstr "" -#: src/factor.c:465 src/od.c:1640 src/od.c:1709 +#: src/factor.c:2092 #, c-format -msgid "%s is too large" -msgstr "%s: kiyitiridde obunene" +msgid "squfof queue overflow" +msgstr "" -#: src/factor.c:469 +#: src/factor.c:2419 #, c-format msgid "%s is not a valid positive integer" msgstr "%s tekkirizibwa nga ennamba esukka ku 0 etakolebwa ndala" -#: src/factor.c:494 +#: src/factor.c:2442 src/od.c:1646 src/od.c:1715 +#, c-format +msgid "%s is too large" +msgstr "%s: kiyitiridde obunene" + +#: src/factor.c:2454 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4906,7 +4955,7 @@ msgstr "" "Enkozesa entuufu eri: %s [NAMBA]\n" " oba: %s KAWAYIRO\n" -#: src/factor.c:499 +#: src/factor.c:2459 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" @@ -4935,20 +4984,20 @@ msgid "cannot stat current directory (now %s)" msgstr "nemedwa okukola stat ku etterekero ekiragiro mwe kiweredwa (%s)" #. This is a proper name. See the gettext manual, section Names. -#: src/fmt.c:37 +#: src/fmt.c:38 msgid "Ross Paterson" msgstr "Ross Paterson" -#: src/fmt.c:269 +#: src/fmt.c:270 #, c-format msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n" msgstr "Enkozesa entuufu eri: %s [-BUWANVU] [KAWAYIRO]... [FAYIRO]...\n" -#: src/fmt.c:270 +#: 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" -"\n" msgstr "" "Ekiragiro kiwandika ebiri mu (zi)FAYIRO awalagibwa ebva mu pulogulamu\n" "awa bulijjo nga kisoose okukyusakyusa entereeza eya buli muko.\n" @@ -4971,8 +5020,8 @@ msgstr "" " ate bwe wasigalawo ebbanga ddene ne " "kitalijjuzamu\n" -#: src/fmt.c:285 -#, fuzzy, c-format +#: src/fmt.c:287 +#, fuzzy, 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" @@ -4991,7 +5040,7 @@ msgstr "" "tezikkirizibwa\n" " okusukka BUWANVU (mu ebya bulijjo by'ebifo 75)\n" -#: src/fmt.c:357 +#: src/fmt.c:359 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -5000,23 +5049,23 @@ msgstr "" "akawayiro --%c tekakola; okutegeera ekya -BUWANVU, kiteekwa okuba nga\n" "ke kawayiro akasooka. Kozesaamu -w N, nga N bwe buwanvu bwe wetaaga." -#: src/fmt.c:403 src/fmt.c:414 +#: src/fmt.c:405 src/fmt.c:416 #, c-format msgid "invalid width: %s" msgstr "obuwanvu obuweeredwa bulimu ensobi: %s" #: src/fold.c:70 +#, fuzzy msgid "" "Wrap input lines in each FILE (standard input by default), writing to\n" "standard output.\n" -"\n" msgstr "" "Ekiragiro kino kiwandika enyiriri ez'omu FAYIRO awateekebwa ebiva mu\n" "pulogulamu awa bulijjo, nga empanvu kizikutulamu.\n" "Bw'otokiraga FAYIRO, ekiragiro kiwandika ebiva awayingizibwa awa bulijjo.\n" "\n" -#: src/fold.c:78 +#: src/fold.c:77 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -5030,13 +5079,13 @@ msgstr "" " obustasukka ebifo BUWANVU, mu kifo kya\n" " 80 obwa bulijjo\n" -#: src/fold.c:289 src/pr.c:836 +#: src/fold.c:288 src/pr.c:832 #, c-format 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:75 +#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 #: src/truncate.c:37 msgid "Padraig Brady" msgstr "Padraig Brady" @@ -5052,17 +5101,17 @@ msgid "" "\n" msgstr "" -#: src/group-list.c:69 src/id.c:345 src/setuidgid.c:184 +#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184 #, 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:350 +#: src/group-list.c:74 src/id.c:370 #, c-format msgid "failed to get groups for the current process" msgstr "nnemedwa okufuna guluupu ez'omulimu ogubindabinda" -#: src/group-list.c:104 +#: src/group-list.c:114 #, c-format msgid "cannot find name for group ID %lu" msgstr "" @@ -5109,11 +5158,11 @@ msgid "%s: no such user" msgstr "%s: omukozesa ono taliyo" #: 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" -"\n" msgstr "" "Ekiragiro kino kiwandika, awateekebwa ebivaamu ebya pulogulamu nu ebya\n" "bulijjo, ennyiriri 10 ezisooka eza mu buli FAYIRO.\n" @@ -5123,7 +5172,7 @@ msgstr "" "bivudde awayingizibwa awa bulijjo.\n" "\n" -#: src/head.c:118 +#: src/head.c:117 #, fuzzy msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" @@ -5142,7 +5191,7 @@ msgstr "" " K bw'ekulemberwa '-', kiwandika nnyiriri zonna\n" " okuggyako K ezisembayo\n" -#: src/head.c:126 +#: src/head.c:125 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -5153,7 +5202,7 @@ msgstr "" " kubikulembezenga obutundu oulimu amannya\n" " gaazo\n" -#: src/head.c:132 +#: src/head.c:131 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -5165,60 +5214,60 @@ 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:152 -#, c-format -msgid "error writing %s" -msgstr "wazzewo kiremya nga mpandikira mu %s" - -#: src/head.c:155 +#: src/head.c:154 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: fayiro ekendedde ekiyitiridde" -#: src/head.c:228 src/head.c:1044 +#: src/head.c:227 src/head.c:1051 #, c-format msgid "%s: number of bytes is too large" msgstr "%s: bayiti ziyitiridde obungi" -#: src/head.c:441 +#: src/head.c:440 #, c-format msgid "%s: cannot lseek back to original position" msgstr "%s: nnemedwa okukola lseek okudda awatandikidwa" -#: src/head.c:613 src/head.c:684 src/tail.c:450 +#: src/head.c:612 src/head.c:691 src/tail.c:449 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: nnemedwa okukola lseek okudda ku awandikirwa awajjulule %s" -#: src/head.c:791 +#: src/head.c:673 +#, fuzzy, c-format +msgid "%s: failed to reset file pointer" +msgstr "nnemedwa okugyawo %s" + +#: src/head.c:798 #, c-format msgid "cannot reposition file pointer for %s" msgstr "" "sisobola kukyusa kifo ekikongojjedwa mu kigambo ekikwata ekifo mu fayiro " "kifuuke %s" -#: src/head.c:878 +#: src/head.c:885 #, 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:879 +#: src/head.c:886 msgid "number of lines" msgstr "obungi bw'ennyiriri" -#: src/head.c:879 +#: src/head.c:886 msgid "number of bytes" msgstr "obungi obwa bayiti" -#: src/head.c:886 src/tail.c:1947 +#: src/head.c:893 src/tail.c:1947 msgid "invalid number of lines" msgstr "obungi obw'ennyiriri tebukkirizibwa" -#: src/head.c:887 src/tail.c:1948 +#: src/head.c:894 src/tail.c:1948 msgid "invalid number of bytes" msgstr "obungi obwa bayiti tebukkirizibwa" -#: src/head.c:974 src/head.c:1032 +#: src/head.c:981 src/head.c:1039 #, c-format msgid "invalid trailing option -- %c" msgstr "akawayiro -%c tekategreese" @@ -5359,86 +5408,86 @@ msgstr "omulimu nnemedwa okutegeera endukusa eza SELinux zagwo" msgid "cannot get effective UID" msgstr "nnemedwa okukola ku fayiro %s kw'egguka" -#: src/id.c:289 +#: src/id.c:311 #, fuzzy, c-format -msgid "cannot find name for user ID %lu" +msgid "cannot find name for user ID %s" msgstr "erinnya ery'omukozesa ow'ennamba %lu linnemye okuzuula" -#: src/id.c:309 +#: src/id.c:329 #, fuzzy, c-format -msgid "uid=%lu" +msgid "uid=%s" msgstr "ennamba y'omukozesa=%lu" -#: src/id.c:314 +#: src/id.c:334 #, fuzzy, c-format -msgid " gid=%lu" -msgstr "ennamba eya guluupu ekolerwako=%lu" +msgid " gid=%s" +msgstr "ennamba ya guluupu=%lu" -#: src/id.c:321 +#: src/id.c:341 #, fuzzy, c-format -msgid " euid=%lu" -msgstr "ennamba eya guluupu ekolerwako=%lu" +msgid " euid=%s" +msgstr "ennamba omukozesa gyakolerako=%lu" -#: src/id.c:329 -#, c-format -msgid " egid=%lu" +#: src/id.c:349 +#, fuzzy, c-format +msgid " egid=%s" msgstr "ennamba eya guluupu ekolerwako=%lu" -#: src/id.c:357 +#: src/id.c:377 msgid " groups=" msgstr " guluupu=" -#: src/id.c:373 +#: src/id.c:393 #, c-format msgid " context=%s" msgstr " olukusa olwa SELinux=%s" -#: src/install.c:372 +#: src/install.c:373 #, c-format msgid "warning: %s: failed to change context to %s" msgstr "kulabula: %s: nnemedwa okukyusa olukusa lwa SELinux lufuuke %s" -#: src/install.c:413 +#: src/install.c:414 #, c-format msgid "creating directory %s" msgstr "nkolawo etterekero %s" -#: src/install.c:481 +#: src/install.c:482 #, c-format msgid "cannot change ownership of %s" msgstr "sisobola okukyusa obwanannyini ku %s" -#: src/install.c:505 +#: src/install.c:506 #, c-format msgid "cannot set time stamps for %s" msgstr "sisobola okuteeka wo ebilambe ebiraga %s we yakolebwawo" -#: src/install.c:526 src/split.c:412 src/timeout.c:387 +#: src/install.c:527 src/split.c:426 src/timeout.c:439 #, c-format msgid "fork system call failed" msgstr "ekiragiro ekya sisitemu ekya \"fork\" kigaanye" -#: src/install.c:530 +#: src/install.c:531 #, c-format msgid "cannot run %s" msgstr "nnemedwa okutandika ogwa %s" -#: src/install.c:534 +#: src/install.c:535 #, c-format msgid "waiting for strip" msgstr "nnindirira mulimu ogwa strip" -#: src/install.c:536 +#: src/install.c:537 #, c-format msgid "strip process terminated abnormally" msgstr "omulimu ogwa strip gukomye mu ngeri etali ya bulijjo" -#: src/install.c:557 +#: src/install.c:558 #, c-format msgid "invalid user %s" msgstr "tewali akozesa gwe bayita %s" -#: src/install.c:593 +#: src/install.c:594 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -5451,7 +5500,8 @@ msgstr "" " oba: %s [KAWAYIRO]... -t TTEREKERO NNONO...\n" " oba: %s [KAWAYIRO]... -d TTEREKERO...\n" -#: src/install.c:600 +#: src/install.c:601 +#, fuzzy msgid "" "\n" "This install program copies files (often just compiled) into destination\n" @@ -5463,7 +5513,6 @@ msgid "" "In the first three forms, copy SOURCE to DEST or multiple SOURCE(s) to\n" "the existing DIRECTORY, while setting permission modes and owner/group.\n" "In the 4th form, create all components of the given DIRECTORY(ies).\n" -"\n" msgstr "" "\n" "Ekiragiro kino kikoppa fayiro koppi ezo ne kizissa gy'oba oyagadde. Kitera\n" @@ -5581,7 +5630,7 @@ msgstr "" " eza SELinux ez'oku koppi ze kikolawo\n" " zibe NDUKUSA\n" -#: src/install.c:858 +#: src/install.c:859 #, c-format msgid "" "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled" @@ -5589,55 +5638,55 @@ msgstr "" "KULABULA: aka -preserve-context tekagenda kukolerwako; ennombe ya kuno\n" "tetegeera SELinux" -#: src/install.c:868 +#: 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:885 +#: src/install.c:886 #, 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:888 +#: src/install.c:889 #, 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:892 +#: 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:946 src/mkdir.c:202 src/stdbuf.c:327 +#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326 #, c-format msgid "invalid mode %s" msgstr "enkola %s wano teja wo" -#: src/install.c:953 +#: src/install.c:954 #, 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:958 +#: src/install.c:959 #, c-format msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive" msgstr "obuwayiro --compare (-C) ne --preserve-timestamps tebukolagana" -#: src/install.c:965 +#: src/install.c:966 #, c-format msgid "options --compare (-C) and --strip are mutually exclusive" msgstr "obuwayiro --compare (-C) ne --strip tebukolagana" -#: src/install.c:971 +#: src/install.c:972 #, c-format msgid "" "the --compare (-C) option is ignored when you specify a mode with non-" @@ -5647,7 +5696,7 @@ msgstr "" "ku kawayiro aka --compare (-C)" #. This is a proper name. See the gettext manual, section Names. -#: src/join.c:40 src/sort.c:65 +#: src/join.c:40 src/sort.c:66 msgid "Mike Haertel" msgstr "Mike Haertel" @@ -5766,7 +5815,7 @@ msgstr "" #: src/join.c:403 #, c-format -msgid "%s:%ju: is not sorted: %.*s" +msgid "%s:%<PRIuMAX>: is not sorted: %.*s" msgstr "" #: src/join.c:840 src/join.c:1038 @@ -5796,13 +5845,13 @@ msgstr "ebitundu eby'ennyiriri %lu ne %lu tebisobola kukozesebwa kugatta" msgid "conflicting empty-field replacement strings" msgstr "embigambo ebiy'okujuza mu bitundu eby'ennyiriri ebyereere tebikolagana" -#: src/join.c:1101 src/sort.c:4414 +#: src/join.c:1101 src/sort.c:4468 #, 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:4419 +#: src/join.c:1105 src/sort.c:4473 #, c-format msgid "incompatible tabs" msgstr "akabonero ak'awuzi kasobaganye" @@ -5824,15 +5873,14 @@ msgstr "" " oba: %s -t [KIRAGIRO]...\n" #: src/kill.c:82 -msgid "" -"Send signals to processes, or list signals.\n" -"\n" +#, fuzzy +msgid "Send signals to processes, or list signals.\n" msgstr "" "Ekiragiro kino kisindika ebiragiro ebifuga emirimu egya zipulogulamu\n" "egibindabinda. Kisobola ate n'okuwandika olukalala olw'ebiragiro\n" "ebisobola okusindikibwa.\n" -#: src/kill.c:89 +#: src/kill.c:88 msgid "" " -s, --signal=SIGNAL, -SIGNAL\n" " specify the name or number of the signal to be sent\n" @@ -5848,7 +5896,7 @@ msgstr "" " ennamba oba ennamba zaabyo zifuuke mannya\n" " -t, --table Buno bukireetera okuwandika ebikwata ku biragiro\n" -#: src/kill.c:97 +#: src/kill.c:96 #, fuzzy msgid "" "\n" @@ -5862,32 +5910,32 @@ msgstr "" "singa gubeera gumazisidwa ekiragiro. PID ebeera ennamba enzijjuvu.\n" "Bw'ebeera wansi wa zero ebeera ennamba ey'emirimu egy'awamu.\n" -#: src/kill.c:206 +#: src/kill.c:205 #, c-format msgid "%s: invalid process id" msgstr "%s: ennamba ey'omulimu ssi ntuufu" -#: src/kill.c:260 +#: src/kill.c:259 #, c-format msgid "invalid option -- %c" msgstr "akawayiro --%c tekakola" -#: src/kill.c:269 +#: src/kill.c:268 #, c-format msgid "%s: multiple signals specified" msgstr "%s: waweredwa ebiragiro ebisukka mu kimu" -#: src/kill.c:283 +#: src/kill.c:282 #, c-format msgid "multiple -l or -t options specified" msgstr "akawayiro -l oba -t kaweredwa emirundi egisoba mu gumu" -#: src/kill.c:300 +#: src/kill.c:299 #, c-format msgid "cannot combine signal with -l or -t" msgstr "ekiragiro tekisobola okugattibwa n'akawayiro -l oba -t" -#: src/kill.c:306 +#: src/kill.c:305 #, c-format msgid "no process ID specified" msgstr "ennamba ey'omulimu teweredwa" @@ -6007,7 +6055,6 @@ msgid "" "When creating hard links, each TARGET must exist. Symbolic links\n" "can hold arbitrary text; if later resolved, a relative link is\n" "interpreted in relation to its parent directory.\n" -"\n" msgstr "" "Mu mpandika 1, ekiragiro kino kikolawo ennyunzi egguka\n" "ku KIGENDERWA nga ennyunzi eyo etuumidwa LINNYA.\n" @@ -6023,7 +6070,7 @@ msgstr "" "kukola kasita fayiro eyo emala n'ekolebwawo.\n" "\n" -#: src/ln.c:395 +#: src/ln.c:394 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -6050,7 +6097,7 @@ msgstr "" "zidde\n" " mu kifo kyazo\n" -#: src/ln.c:403 +#: src/ln.c:402 #, fuzzy msgid "" " -i, --interactive prompt whether to remove destinations\n" @@ -6079,7 +6126,7 @@ msgstr "" " -s, --symbolic Buno bwo bukireetera okukolawo nyunzi\n" " ez'eyawudde mu kifo eky'ezit'eyawudde\n" -#: src/ln.c:412 +#: src/ln.c:411 #, fuzzy msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -6101,35 +6148,12 @@ msgstr "" " enyunzi, kisooka kuwandika linnya lya fayiro\n" " kw'egguka\n" -#: src/ln.c:428 -#, fuzzy +#: src/ln.c:433 +#, fuzzy, c-format 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 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" - -#: src/ln.c:435 -#, fuzzy, c-format -msgid "" -"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" +"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 "" "Bw'obanga ogeza okukolawo enyunzi egguka ku nyunzi ey'eyawudde\n" "n'ossawo obuwayiro bwombi, aka '-L' n'aka '-P', ekiragiro kikolera ku\n" @@ -6210,7 +6234,7 @@ msgstr "" "omuwendo ogukongojjedwa mu kigambo TABSIZE tegukkirizibwa: %s era tegugenda\n" "kukozesebwa" -#: src/ls.c:1750 src/ptx.c:1976 +#: src/ls.c:1750 src/ptx.c:1975 #, c-format msgid "invalid line width: %s" msgstr "obuwanvu obw'emboozi obuweeredwa: %s tebukkirizibwa" @@ -6274,7 +6298,7 @@ msgstr "nsoma mu etterekero %s" msgid "closing directory %s" msgstr "mbikka tterekero %s" -#: src/ls.c:3301 +#: src/ls.c:3302 #, c-format msgid "cannot compare file names %s and %s" msgstr "tekisobose okunoonya njawulo wakati wa mannya aga fayiro gano:%s ne %s" @@ -6284,7 +6308,6 @@ msgstr "tekisobose okunoonya njawulo wakati wa mannya aga fayiro gano:%s ne %s" msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" -"\n" msgstr "" "Kino kiraga ebikwata ku zi FAYIRO (kompyuta bw'otogigamba kirala ejja\n" "kukulaga ebikwata ku fayiro eza mu tterekero mw'oweerede ekiragiro).\n" @@ -6293,7 +6316,7 @@ msgstr "" "mannya ga fayiro ezo nga egoberera walifu.\n" "\n" -#: src/ls.c:4729 +#: src/ls.c:4728 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -6312,7 +6335,7 @@ msgstr "" " obw'enkola eyomu lulimi lwa C obufuga enneyisa\n" " ey'obubonero obutalabika\n" -#: src/ls.c:4735 +#: src/ls.c:4734 #, fuzzy msgid "" " --block-size=SIZE scale sizes by SIZE before printing them. E." @@ -6348,7 +6371,7 @@ msgstr "" "ge\n" " gasooka\n" -#: src/ls.c:4745 +#: src/ls.c:4744 #, fuzzy msgid "" " -C list entries by columns\n" @@ -6371,7 +6394,7 @@ msgstr "" " etabagana ne Emacs ekolera mu nkola yayo\n" " eya \"dired\"\n" -#: src/ls.c:4753 +#: src/ls.c:4752 #, fuzzy msgid "" " -f do not sort, enable -aU, disable -ls --color\n" @@ -6402,13 +6425,13 @@ msgstr "" " 'vertical' kyekimu n'akawayiro -C\n" " --full-time Kyekimu ne -l --time-style=full-iso\n" -#: src/ls.c:4761 +#: src/ls.c:4760 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:4764 +#: src/ls.c:4763 msgid "" " --group-directories-first\n" " group directories before files.\n" @@ -6425,7 +6448,7 @@ msgstr "" " ekiragiro n'eby'okusooka kuwandika materekero\n" " tekibikola\n" -#: src/ls.c:4770 +#: src/ls.c:4769 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" @@ -6439,7 +6462,7 @@ msgstr "" "readable',\n" " naye nga birengo bya 1000 mu kifo ekya 1024\n" -#: src/ls.c:4776 +#: src/ls.c:4775 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -6469,7 +6492,7 @@ msgstr "" " aka -a oba -A, ekiragiro fayiro ezo ate " "kiziraga\n" -#: src/ls.c:4786 +#: src/ls.c:4785 #, fuzzy msgid "" " --indicator-style=WORD append indicator with style WORD to entry " @@ -6493,7 +6516,7 @@ msgstr "" " kigambo eky'omu nzivvuunuzi KIGAMBO\n" " -k Kye kimu ne --block-size=1K\n" -#: src/ls.c:4796 +#: src/ls.c:4795 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -6509,7 +6532,7 @@ msgstr "" " ekiwandikiro ate nga amannya aga fayiro\n" " g'awulibwa zi \",\"\n" -#: src/ls.c:4804 +#: src/ls.c:4803 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. " @@ -6531,7 +6554,7 @@ msgstr "" " Buno bukireetera okuwayira akabonero aka / ku\n" " mannya ag'amaterekero ge kiba kiwandisewo\n" -#: src/ls.c:4812 +#: src/ls.c:4811 #, fuzzy msgid "" " -q, --hide-control-chars print ? instead of non graphic characters\n" @@ -6556,7 +6579,7 @@ msgstr "" " literal, locale, shell, shell-always, c, ne " "escape\n" -#: src/ls.c:4821 +#: src/ls.c:4820 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -6570,7 +6593,7 @@ msgstr "" " -s, --size Buno bukireetera okulaga buloka buli\n" " fayiro gye kisanga ze kikozesa\n" -#: src/ls.c:4826 +#: src/ls.c:4825 msgid "" " -S sort by file size\n" " --sort=WORD sort by WORD instead of name: none -U,\n" @@ -6604,7 +6627,7 @@ msgstr "" " kakireetera n'okusengeka amannya okusinzira\n" " ku fayiro esinga okubeera n'obudde obw'okumpi\n" -#: src/ls.c:4836 +#: src/ls.c:4835 #, fuzzy msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" @@ -6633,7 +6656,7 @@ msgstr "" "MUSONO\n" " tekikola ku ebyo ebitali mu lokale eya POSIX\n" -#: src/ls.c:4845 +#: src/ls.c:4844 #, fuzzy msgid "" " -t sort by modification time, newest first\n" @@ -6644,7 +6667,7 @@ msgstr "" " -T, --tabsize=BIFO Buno bukireetera okubala nti oluseetuka\n" " lumalawo ebifo BIFO, sso ssi 8\n" -#: src/ls.c:4849 +#: src/ls.c:4848 msgid "" " -u with -lt: sort by, and show, access time\n" " with -l: show access time and sort by name\n" @@ -6666,7 +6689,7 @@ msgstr "" " fayiro ezirin'amannya agalimu ennamba mu ngeri\n" " egoberera ennamba ezo\n" -#: src/ls.c:4856 +#: src/ls.c:4855 msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" @@ -6687,7 +6710,7 @@ msgstr "" " -1 Kano kakireetera okuwandika buli linnya lya\n" " fayiro ku lunyiriri lwa lyo\n" -#: src/ls.c:4866 +#: src/ls.c:4865 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -6706,7 +6729,7 @@ msgstr "" "y'ekiragiro ku nsonga ya kuwandika mu langi. Ekiragiro ekya 'dircolors' kye\n" "kitegeka ekigambo kino\n" -#: src/ls.c:4873 +#: src/ls.c:4872 msgid "" "\n" "Exit status:\n" @@ -6735,7 +6758,7 @@ msgstr "Scott Miller" msgid "David Madore" msgstr "David Madore" -#: src/md5sum.c:162 +#: src/md5sum.c:164 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -6751,7 +6774,7 @@ msgstr "" "awa bulijjo.\n" "\n" -#: src/md5sum.c:172 +#: src/md5sum.c:174 #, fuzzy msgid "" " -b, --binary read in binary mode (default unless reading tty " @@ -6763,7 +6786,7 @@ msgstr "" " y'enkola eya bulijjo okujjako nga\n" " stdin kiwandikirio)\n" -#: src/md5sum.c:176 +#: src/md5sum.c:178 #, fuzzy msgid " -b, --binary read in binary mode\n" msgstr "" @@ -6771,7 +6794,7 @@ msgstr "" " nti data ey'omu fayiro eterekedwa\n" " mu ntereeza eya binariyo\n" -#: src/md5sum.c:179 +#: src/md5sum.c:181 #, fuzzy, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr "" @@ -6779,7 +6802,11 @@ msgstr "" " ez'ekika kya %s kizigeraageranye n'eziri\n" " mu lukalala olukiweredwa\n" -#: src/md5sum.c:183 +#: src/md5sum.c:184 +msgid " --tag create a BSD-style checksum\n" +msgstr "" + +#: src/md5sum.c:188 #, fuzzy msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" @@ -6788,14 +6815,14 @@ msgstr "" " fayiro teyetaaga kuvvuunulwa (y'enkola eya\n" " bulijjo)\n" -#: src/md5sum.c:187 +#: src/md5sum.c:192 #, fuzzy msgid " -t, --text read in text mode (default)\n" msgstr "" " -t, --text Buno bukireetera okukitwala nti data eri mu\n" " fayiro teyetaaga kuvvuunulwa\n" -#: src/md5sum.c:190 +#: src/md5sum.c:195 #, fuzzy msgid "" "\n" @@ -6818,12 +6845,12 @@ msgstr "" " zaazo enkuumi\n" "\n" -#: src/md5sum.c:198 +#: src/md5sum.c:203 msgid "" " --strict with --check, exit non-zero for any invalid input\n" msgstr "" -#: src/md5sum.c:203 +#: src/md5sum.c:208 #, fuzzy, c-format msgid "" "\n" @@ -6841,58 +6868,68 @@ msgstr "" "bantu),\n" "n'erinnya erya FAYIRO\n" -#: src/md5sum.c:502 +#: src/md5sum.c:523 #, c-format msgid "%s: too many checksum lines" msgstr "%s: ennyiriri mu namba enkuumi zisukkiridde obungi" -#: src/md5sum.c:526 +#: src/md5sum.c:547 #, 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:551 +#: src/md5sum.c:572 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: okubikkula oba okusoma KUGAANYE\n" -#: src/md5sum.c:574 +#: src/md5sum.c:595 msgid "FAILED" msgstr "KIGAANYE" -#: src/md5sum.c:576 +#: src/md5sum.c:597 msgid "OK" msgstr "KALE" -#: src/md5sum.c:600 +#: src/md5sum.c:621 #, 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:610 +#: src/md5sum.c:631 #, 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:618 +#: src/md5sum.c:639 #, 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:626 +#: src/md5sum.c:647 #, 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:704 +#: src/md5sum.c:760 +#, c-format +msgid "--tag does not support --text mode" +msgstr "" + +#: src/md5sum.c:766 +#, 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 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" @@ -6900,22 +6937,22 @@ msgstr "" "bw'obeera okukakasabukakasa ennamba enkuumi, obuwayiro --binary ne --text\n" "tebulina kye bukolawo" -#: src/md5sum.c:712 +#: src/md5sum.c:781 #, 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:719 +#: src/md5sum.c:788 #, 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:726 +#: src/md5sum.c:795 #, c-format msgid "the --quiet option is meaningful only when verifying checksums" msgstr "akawayiro --quiet kagasa mu kukakasa nnamba nkuumi wokka" -#: src/md5sum.c:733 +#: src/md5sum.c:802 #, fuzzy, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "omugaso ogw'akawayiro --status gukoma ku kukakasa ennamba enkuumi" @@ -6926,14 +6963,13 @@ msgid "Usage: %s [OPTION]... DIRECTORY...\n" msgstr "Enkozesa entuufu eri: %s [KAWAYIRO]... TTEREKERO...\n" #: src/mkdir.c:57 -msgid "" -"Create the DIRECTORY(ies), if they do not already exist.\n" -"\n" +#, 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:64 +#: src/mkdir.c:63 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" @@ -6952,7 +6988,7 @@ msgstr "" " -Z, --context=NDUKUSA Buno bukireetera okutegeka ndukusa eza SELinux\n" " ez'oku buli tterekero erikolebwawo zibe NDUKUSA\n" -#: src/mkdir.c:169 +#: src/mkdir.c:168 #, c-format msgid "created directory %s" msgstr "nkozewo tterekero eliyitibwa %s" @@ -6963,16 +6999,15 @@ msgid "Usage: %s [OPTION]... NAME...\n" msgstr "Enkozesa entuufu eri: %s [KAWAYIRO]... LINNYA...\n" #: src/mkfifo.c:52 -msgid "" -"Create named pipes (FIFOs) with the given NAMEs.\n" -"\n" +#, fuzzy +msgid "Create named pipes (FIFOs) with the given NAMEs.\n" msgstr "" "Ekiragiro kino kikolawo omikutu omitume (FIFO) nga gutumidwa LINNYA.\n" "LINNYA bwe luba lukalala lw'amannya ekiragiro buli linnya kirikolerawo\n" "omukutu omutume\n" "\n" -#: src/mkfifo.c:59 src/mknod.c:61 +#: src/mkfifo.c:58 src/mknod.c:60 msgid "" " -m, --mode=MODE set file permission bits to MODE, not a=rw - umask\n" msgstr "" @@ -6980,19 +7015,19 @@ msgstr "" " okutegeka ndukusa (nga empandika eya NDUKUSA y'emu\n" " n'ekozesebwa ku kiragiro ekya 'chmod')\n" -#: src/mkfifo.c:62 +#: src/mkfifo.c:61 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" -#: src/mkfifo.c:122 src/mknod.c:128 +#: src/mkfifo.c:121 src/mknod.c:127 #, c-format msgid "invalid mode" msgstr "enkola eno tekkirizibwa" -#: src/mkfifo.c:127 src/mknod.c:133 +#: src/mkfifo.c:126 src/mknod.c:132 #, c-format msgid "mode must specify only file permission bits" msgstr "eno attiributo eteekwa kukoma ku kutegeka bbiti ezikola ku ndukusa" @@ -7003,20 +7038,19 @@ msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n" msgstr "Enkozesa entuufu eri: %s [KAWAYIRO]... LINNYA KIKA [NKULU NTO]\n" #: src/mknod.c:54 -msgid "" -"Create the special file NAME of the given TYPE.\n" -"\n" +#, fuzzy +msgid "Create the special file NAME of the given TYPE.\n" msgstr "" "Ekiragiro kino kikolawo fayiro ey'enjawulo nga eyitibwa LINNYA ate nga ya " "KIKA.\n" "\n" -#: src/mknod.c:64 +#: 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:69 +#: src/mknod.c:68 msgid "" "\n" "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n" @@ -7032,7 +7066,7 @@ msgstr "" "n'ekirala kyonna kitwalibwa nga ennamba eya bulijjo (eya mu dekanariyo).\n" "KIKA kisobola okuba:\n" -#: src/mknod.c:76 +#: src/mknod.c:75 msgid "" "\n" " b create a block (buffered) special file\n" @@ -7046,40 +7080,40 @@ msgstr "" " nukututa (ekisangibwamu kye kisomebwa)\n" " p Kano kaireetera okuolawo FIFO\n" -#: src/mknod.c:151 +#: src/mknod.c:150 msgid "Special files require major and minor device numbers." msgstr "Fayiro enjawulemu z'etaagako ennamba y'ekyuma enkulu n'ento" -#: src/mknod.c:161 +#: src/mknod.c:160 msgid "Fifos do not have major and minor device numbers." msgstr "FIFO tezibaako nnamba ya kyuma nkulu n'ento." -#: src/mknod.c:177 +#: src/mknod.c:176 #, c-format msgid "block special files not supported" msgstr "fayiro ez'enjawulo eza kika kya bulooka tezikola wano" -#: src/mknod.c:186 +#: src/mknod.c:185 #, c-format msgid "character special files not supported" msgstr "fayiro ez'enjawulo eza kika kya nukuta tezikola wano" -#: src/mknod.c:202 +#: src/mknod.c:201 #, c-format msgid "invalid major device number %s" msgstr "ennamba y'ekyuma enkulu %s tekkirizibwa" -#: src/mknod.c:207 +#: src/mknod.c:206 #, c-format msgid "invalid minor device number %s" msgstr "ennamba y'ekyuma ento %s tekkirizibwa" -#: src/mknod.c:212 +#: src/mknod.c:211 #, c-format msgid "invalid device %s %s" msgstr "ekyuma %s %s tekikkirizibwa" -#: src/mknod.c:226 +#: src/mknod.c:225 #, c-format msgid "invalid device type %s" msgstr "ekika eky'ekyuma %s tekikkirizibwa" @@ -7191,34 +7225,34 @@ msgstr "" " ate nga n'ekigambo eky'omu nviromenti TMPDIR nakyo\n" " tekitegekedwa.\n" -#: src/mktemp.c:222 +#: 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:228 +#: src/mktemp.c:229 #, c-format msgid "too many templates" msgstr "" "ebigambo ebifuga entuma ya fayiro\n" "ezikolebwawo biyitiridde obungi" -#: src/mktemp.c:248 +#: src/mktemp.c:249 #, 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:273 src/split.c:1117 +#: src/mktemp.c:274 src/split.c:1130 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "akafundikwa %s kasobu, kalimu akasaze" -#: src/mktemp.c:278 +#: src/mktemp.c:279 #, c-format msgid "too few X's in template %s" msgstr "'X' eziri mu kigambo %s ziyitiridde obungi" -#: src/mktemp.c:291 +#: src/mktemp.c:292 #, c-format msgid "invalid template, %s, contains directory separator" msgstr "" @@ -7227,7 +7261,7 @@ msgstr "" "ak'awula wakati w'amannya ag'amaterekero\n" "(akasaze ak'akaddanyuma)" -#: src/mktemp.c:305 +#: src/mktemp.c:306 #, c-format msgid "invalid template, %s; with --tmpdir, it may not be absolute" msgstr "" @@ -7235,30 +7269,29 @@ msgstr "" "bw'obanga otaddewo n'akawayiro aka --tmpdir. Ekikigaanisa?\n" "Kuba nga kkubo eritandikira ku tterekero ery'okumusingi" -#: src/mktemp.c:325 +#: src/mktemp.c:326 #, 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:335 +#: src/mktemp.c:336 #, 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:290 -msgid "" -"Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" -"\n" +#: src/mv.c:292 +#, fuzzy +msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" msgstr "" "Kino kikyusa erinnya erya NONO ne libeera KIGENDERERWA.\n" "Era kisimbuliza NONO e/zirage mu TTEREKERO.\n" "\n" -#: src/mv.c:297 +#: src/mv.c:298 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -7287,7 +7320,7 @@ msgstr "" "Bw'oteekawo akasoba mu kamu ku buwayiro -i, -n ne -f k'osembyayo\n" "kokka ke kakola.\n" -#: src/mv.c:306 +#: src/mv.c:307 msgid "" " --strip-trailing-slashes remove any trailing slashes from each " "SOURCE\n" @@ -7302,7 +7335,7 @@ msgstr "" " ku linnya lyya kkopi ey'okwerinda, mu kifo\n" " eky'aka bulijjo\n" -#: src/mv.c:311 +#: src/mv.c:312 msgid "" " -t, --target-directory=DIRECTORY move all SOURCE arguments into " "DIRECTORY\n" @@ -7331,13 +7364,11 @@ msgid "Usage: %s [OPTION] [COMMAND [ARG]...]\n" msgstr "Enkozesa entuufu eri: %s [KAWAYIRO] [KIRAGIRO [FAYIRO]...]\n" #: src/nice.c:73 -#, c-format +#, fuzzy, c-format msgid "" "Run COMMAND with an adjusted niceness, which affects process scheduling.\n" -"With no COMMAND, print the current niceness. Nicenesses range from\n" -"%d (most favorable scheduling) to %d (least favorable).\n" -"\n" -" -n, --adjustment=N add integer N to the niceness (default 10)\n" +"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 "" "Ekiragiro kino kireetera sisitemu okukola ku KIRAGIRO nga obusengeke\n" "bwa kyo busoose okukyusibwa.\n" @@ -7352,22 +7383,26 @@ msgstr "" "Ekiragiro bwe kitalagirwa okukozesa kirala kikitwala nti ENKYUKA\n" "kiri 10.\n" -#: src/nice.c:168 +#: src/nice.c:82 +msgid " -n, --adjustment=N add integer N to the niceness (default 10)\n" +msgstr "" + +#: src/nice.c:172 #, c-format msgid "invalid adjustment %s" msgstr "enkyuka mu busengeke %s tesoboka" -#: src/nice.c:177 +#: src/nice.c:181 #, c-format msgid "a command must be given with an adjustment" msgstr "bw'oteekako ekiragiro oteekwa okulaga n'enkyuuka mu busengeke bwakyo" -#: src/nice.c:184 src/nice.c:195 +#: src/nice.c:188 src/nice.c:199 #, c-format msgid "cannot get niceness" msgstr "nnemedwa kutegeera obusengeke" -#: src/nice.c:201 +#: src/nice.c:205 #, c-format msgid "cannot set niceness" msgstr "nnemedwa okutegeka obusengeke" @@ -7377,11 +7412,11 @@ msgstr "nnemedwa okutegeka obusengeke" msgid "Scott Bartram" msgstr "Scott Bartram" -#: src/nl.c:186 +#: 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" -"\n" msgstr "" "Kino buli FAYIRO ebigirimu kibiwandika awateekebwa ebivaamu ebya \n" "zipuloguramu mu ebya bulijjo, nga kuliko n'ennamba ez'ennyiriri.\n" @@ -7389,7 +7424,7 @@ msgstr "" "nnono eya bulijjo.\n" "\n" -#: src/nl.c:194 +#: src/nl.c:186 msgid "" " -b, --body-numbering=STYLE use STYLE for numbering body lines\n" " -d, --section-delimiter=CC use CC for separating logical pages\n" @@ -7404,7 +7439,7 @@ msgstr "" " -f, --footer-numbering=MPANDIKA Buno bwo bukireetera nnamba ez'ennyiriri\n" " enzibizi okuzitereeza mu MPANDIKA\n" -#: src/nl.c:199 +#: src/nl.c:191 msgid "" " -h, --header-numbering=STYLE use STYLE for numbering header lines\n" " -i, --line-increment=NUMBER line number increment at each line\n" @@ -7432,7 +7467,7 @@ msgstr "" " -s, --number-separater=KIGAMBO Buno ate bukireetera ennamba ez'ennyiriri\n" " okuzigoberezanga KIGAMBO\n" -#: src/nl.c:207 +#: src/nl.c:199 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" @@ -7445,7 +7480,7 @@ msgstr "" " okumalangawo ebifo NAMBA mu buli " "lunyiriri\n" -#: src/nl.c:213 +#: src/nl.c:205 msgid "" "\n" "By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC are\n" @@ -7460,7 +7495,7 @@ msgstr "" " ez'omu kiwandike. Ennukuta eyokubiri bw'etabeerako kiba kitegeeza nti:. \n" "wawandikibweewo \\\\ mu kifo ekya \\. MPANDIKA kibeera kimu ku:\n" -#: src/nl.c:219 +#: src/nl.c:211 msgid "" "\n" " a number all lines\n" @@ -7493,54 +7528,47 @@ msgstr "" " ne kizijjuzisamu zi-zero\n" "\n" -#: src/nl.c:286 +#: src/nl.c:278 #, c-format msgid "line number overflow" msgstr "ennamba ey'ennyiriri tejjaamu mu ggwanika zzibizi" -#: src/nl.c:486 +#: src/nl.c:478 #, c-format msgid "invalid header numbering style: %s" msgstr "omusono ogw'ennamba eza ku nnyiriri eza mu bikulembera ssi ntuufu: %s" -#: src/nl.c:494 +#: src/nl.c:486 #, c-format msgid "invalid body numbering style: %s" msgstr "omusono ogw'ennamba eza ku nnyiriri eza mu kiwandike ssi ntuufu: %s" -#: src/nl.c:502 +#: src/nl.c:494 #, c-format msgid "invalid footer numbering style: %s" msgstr "empandika y'ennamba eza ku nnyiriri eza mu bizibirizi ssi ntuufu: %s" -#: src/nl.c:511 +#: src/nl.c:503 #, c-format msgid "invalid starting line number: %s" msgstr "ennamba ey'olunyiriri tekkirizibwa: %s" -#: src/nl.c:517 -#, c-format -msgid "WARNING: --page-increment is deprecated; use --line-increment instead" -msgstr "" -"KULABULA: akawayiro aka --page-increment kadibizidwa;\n" -"kozesaamu aka -line-increment instead" - -#: src/nl.c:524 +#: src/nl.c:512 #, c-format msgid "invalid line number increment: %s" msgstr "enjawulo mu nnamba ez'ennyiriri ezigobereragana tekkirizibwa: %s" -#: src/nl.c:536 +#: src/nl.c:524 #, c-format msgid "invalid number of blank lines: %s" msgstr "obungi obw'ennyiriri enjereere tebukkirizibwa: %s" -#: src/nl.c:550 +#: src/nl.c:538 #, c-format msgid "invalid line number field width: %s" msgstr "obungi obw'ebifo ebiweredwa ennamba ez'ennyiriri tebukkirizibwa: %s" -#: src/nl.c:569 +#: src/nl.c:557 #, c-format msgid "invalid line numbering format: %s" msgstr "entereeza eya namba ez'ennyiriri tekkirizibwa: %s" @@ -7594,11 +7622,6 @@ msgstr "sisobodde okulemesa bintu kuva awayingizibwa awa bulijjo" msgid "ignoring input" msgstr "ebiyigizibwa tebigenda kufiibwako" -#: src/nohup.c:163 src/nohup.c:165 -#, c-format -msgid "failed to open %s" -msgstr "nemedwa okubikkula %s" - #: src/nohup.c:175 #, c-format msgid "ignoring input and appending output to %s" @@ -7634,16 +7657,16 @@ msgid "failed to redirect standard error" msgstr "Ebifa ku mitawana nemedwa okukyusa gye biwandikibwa" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:32 +#: src/nproc.c:33 msgid "Giuseppe Scrivano" msgstr "Giuseppe Scrivano" -#: src/nproc.c:56 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 +#: src/nproc.c:57 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Enkozesa entuufu eri: %s [KAWAYIRO]...\n" -#: src/nproc.c:57 +#: src/nproc.c:58 msgid "" "Print the number of processing units available to the current process,\n" "which may be less than the number of online processors\n" @@ -7654,7 +7677,7 @@ msgstr "" "ebisingawo obungi\n" "\n" -#: src/nproc.c:62 +#: src/nproc.c:63 msgid "" " --all print the number of installed processors\n" " --ignore=N if possible, exclude N processing units\n" @@ -7664,11 +7687,351 @@ msgstr "" " --ignore=N Bwe kiba kibala ebitundu ebibazi ebiri mu kompyuta,\n" " kano kakireetera kubuukako N, ebyo ne kitabibalirimu\n" -#: src/nproc.c:106 +#: src/nproc.c:107 #, c-format 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 +msgid "Assaf Gordon" +msgstr "" + +#: src/numfmt.c:676 +#, fuzzy, c-format +msgid "value too large to be converted: '%s'" +msgstr "%s: obubonero bumu bwokka bwe bukoledwako" + +#: src/numfmt.c:680 +#, fuzzy, c-format +msgid "invalid number: '%s'" +msgstr "namba %s tekkirizibwa" + +#: src/numfmt.c:684 +#, c-format +msgid "rejecting suffix in input: '%s' (consider using --from)" +msgstr "" + +#: src/numfmt.c:688 +#, fuzzy, c-format +msgid "invalid suffix in input: '%s'" +msgstr "agumenti %s%s erina akatandikwa '%s' akatakoler'awo" + +#: src/numfmt.c:692 +#, c-format +msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)" +msgstr "" + +#: src/numfmt.c:723 +#, fuzzy, c-format +msgid "failed to prepare value '%Lf' for printing" +msgstr "%s nnemedwa okugibikkula kugiwandikamu" + +#: src/numfmt.c:787 +#, fuzzy, c-format +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 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [NUMBER]...\n" +msgstr "Enkozesa entuufu eri: %s [KAWAYIRO]... [AKOZESA]...\n" + +#: src/numfmt.c:816 +msgid "" +"Reformat NUMBER(s), or the numbers from standard input if none are " +"specified.\n" +msgstr "" + +#: src/numfmt.c:820 +msgid " --debug print warnings about invalid input\n" +msgstr "" + +#: src/numfmt.c:823 +msgid "" +" -d, --delimiter=X use X instead of whitespace for field delimiter\n" +msgstr "" + +#: src/numfmt.c:826 +msgid "" +" --field=N replace the number in input field N (default is 1)\n" +msgstr "" + +#: src/numfmt.c:829 +msgid "" +" --format=FORMAT use printf style floating-point FORMAT;\n" +" see FORMAT below for details\n" +msgstr "" + +#: src/numfmt.c:833 +msgid "" +" --from=UNIT auto-scale input numbers to UNITs; default is " +"'none';\n" +" see UNIT below\n" +msgstr "" + +#: src/numfmt.c:837 +msgid "" +" --from-unit=N specify the input unit size (instead of the default " +"1)\n" +msgstr "" + +#: src/numfmt.c:840 +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 "" + +#: src/numfmt.c:844 +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 +msgid "" +" --invalid=MODE failure mode for invalid numbers: MODE can be:\n" +" abort (default), fail, warn, ignore\n" +msgstr "" + +#: src/numfmt.c:852 +msgid "" +" --padding=N pad the output to N characters; positive N will\n" +" right-align; negative N will left-align;\n" +" padding is ignored if the output is wider than N;\n" +" the default is to automatically pad if a " +"whitespace\n" +" is found\n" +msgstr "" + +#: src/numfmt.c:859 +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 +msgid "" +" --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" +" SUFFIX in input numbers\n" +msgstr "" + +#: src/numfmt.c:867 +msgid "" +" --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" +msgstr "" + +#: src/numfmt.c:870 +msgid "" +" --to-unit=N the output unit size (instead of the default 1)\n" +msgstr "" + +#: src/numfmt.c:877 +#, fuzzy +msgid "" +"\n" +"UNIT options:\n" +msgstr "" +"Obuwayiro obulala:\n" +"\n" + +#: src/numfmt.c:880 +msgid " none no auto-scaling is done; suffixes will trigger an error\n" +msgstr "" + +#: src/numfmt.c:883 +msgid "" +" auto accept optional single/two letter suffix:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" +msgstr "" + +#: src/numfmt.c:889 +msgid "" +" si accept optional single letter suffix:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:894 +msgid "" +" iec accept optional single letter suffix:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:899 +msgid "" +" iec-i accept optional two-letter suffix:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:905 +#, 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" +msgstr "" + +#: src/numfmt.c:912 +#, c-format +msgid "" +"\n" +"Exit status is 0 if all input numbers were successfully converted.\n" +"By default, %s will stop at the first conversion error with exit status 2.\n" +"With --invalid='fail' a warning is printed for each conversion error\n" +"and the exit status is 2. With --invalid='warn' each conversion error is\n" +"diagnosed, but the exit status is 0. With --invalid='ignore' conversion\n" +"errors are not diagnosed and the exit status is 0.\n" +msgstr "" + +#: src/numfmt.c:921 +#, c-format +msgid "" +"\n" +"Examples:\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" +msgstr "" + +#: src/numfmt.c:974 src/seq.c:212 +#, c-format +msgid "format %s has no %% directive" +msgstr "empandika %s ebulako ekitundu ekya %%" + +#: src/numfmt.c:990 +#, fuzzy, c-format +msgid "invalid format %s (width overflow)" +msgstr "entereeza ey'obudde, %s, tekkirizibwa" + +#: src/numfmt.c:1007 src/seq.c:229 +#, c-format +msgid "format %s ends in %%" +msgstr "empandika %s ekomekkerezedwa %%" + +#: src/numfmt.c:1010 +#, c-format +msgid "invalid format %s, directive must be %%['][-][N]f" +msgstr "" + +#: src/numfmt.c:1018 src/seq.c:236 +#, c-format +msgid "format %s has too many %% directives" +msgstr "empandika %s erimu ebitundu ebya %% ebiyitiridde obungi" + +#: src/numfmt.c:1070 +#, fuzzy, c-format +msgid "invalid suffix in input '%s': '%s'" +msgstr "agumenti %s%s erina akatandikwa '%s' akatakoler'awo" + +#: src/numfmt.c:1092 +#, c-format +msgid "value too large to be printed: '%Lg' (consider using --to)" +msgstr "" + +#: src/numfmt.c:1100 +#, c-format +msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" +msgstr "" + +#: src/numfmt.c:1184 +#, c-format +msgid "large input value '%s': possible precision loss" +msgstr "" + +#: src/numfmt.c:1293 +#, 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 "olubu lw'empapula %s terusoboka" + +#: src/numfmt.c:1401 +#, fuzzy, c-format +msgid "invalid field value '%s'" +msgstr "ennamba ey'ekitundu eky'olunyiriri ekikolebwako: `%s', tekola" + +#: src/numfmt.c:1430 +#, fuzzy, c-format +msgid "invalid header value '%s'" +msgstr "obudde, %s, tebukkirizibwa" + +#: src/numfmt.c:1456 +#, 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 +#, fuzzy, c-format +msgid "no conversion option specified" +msgstr "obuwayiro obwa -i buyitiridde obungi" + +#: src/numfmt.c:1471 +#, 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 +#, c-format +msgid "grouping has no effect in this locale" +msgstr "" + +#: src/numfmt.c:1486 +#, c-format +msgid "--header ignored with command-line input" +msgstr "" + +#: src/numfmt.c:1511 +#, fuzzy, c-format +msgid "error reading input" +msgstr "wazzewo kiremya mu kusoma %s" + +#: src/numfmt.c:1520 +#, fuzzy, c-format +msgid "failed to convert some of the input numbers" +msgstr "sisobodde okulemesa bintu kuva awayingizibwa awa bulijjo" + #: src/od.c:294 #, c-format msgid "" @@ -7704,14 +8067,33 @@ msgstr "" "\n" #: src/od.c:307 -msgid "All arguments to long options are mandatory for short options.\n" +#, fuzzy +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" +"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" +"at first byte printed, incremented when dump is progressing.\n" +"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 "" -"Agumenti ezibeera ku buwayiro obujjuvu era ziteekwa okubeerawo ne ku\n" -"buwayiro obufunze.\n" +"\n" +"Ekiragiro kino bwe kiba nga kisobola okukolera ku mateeka ag'okukiyisa\n" +"ag'engeri esooka n'eyokubiri, ekikolebwako ekisembayo ne kiba nga\n" +"kisookako ka '+' oba digiti ekiragiro kikolera ku mateeka ag'engeri\n" +"ey'okubiri. Ekikolebwako ekimu bwe kiba 'AWATANDIKIRWA', kiba kyekimu\n" +"n'okussawo nti '-j AWATANDIKIRWA'. KIPANDE y'endagiriro en'efaanayirize\n" +"eya bayiti en'esooka okuwandikibwa. Eno endagiriro eyongerwayo buli lwe\n" +"wabeerawo ebirala ebiwandikibwa. AWATANDIKIRWA ne KIPANDE, bwe\n" +"bikulemberwa 0x oba 0X kitegeeza nti bibalibwa mu mbala eya\n" +"hekisadekanariyo. AWATANDIKIRWA ne KIPANDE bisobola okukomekkerezesebwa\n" +"'.' ekitegeeza ntibinaabalibwa mu okitariyo, oba 'b', ekitegeeza nti\n" +"ennamba zikubisibwamu 512.\n" -#: src/od.c:310 +#: src/od.c:318 +#, fuzzy msgid "" -" -A, --address-radix=RADIX decide how file offsets are printed\n" +" -A, --address-radix=RADIX output format for file offsets. RADIX is one\n" +" of [doxn], for Decimal, Octal, Hex or None\n" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" " -A, --address-radix=RADIKISI Bw'ossaako kamu ku buwayiro buno, kategeka\n" @@ -7725,16 +8107,18 @@ msgstr "" " zikola ennamba eziraga olunyiriri we\n" " lutandikira mu fayiro\n" -#: src/od.c:314 +#: src/od.c:323 #, 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" -" --traditional accept arguments in traditional form\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=BAYITI Buno bwo bukireetera okukola ku bayiti\n" " BAYITI ezisooka eza mu fayiro eziweeredwa\n" @@ -7755,9 +8139,11 @@ msgstr "" " --traditional Kano kakireetera okukolera ne ku agumenti\n" " ez'enkola eyasookawo\n" -#: src/od.c:324 +#: src/od.c:336 +#, fuzzy 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" @@ -7776,7 +8162,7 @@ msgstr "" " -d Kye kimu ne -t u2, kano kakireetera okukozesa nnamba eza\n" " dekanariyo enfunze\n" -#: src/od.c:332 +#: src/od.c:345 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -7796,34 +8182,12 @@ msgstr "" " -x Kyekimu ne -t x2, kaleetera ekiragiro okuwandika ennamba mu\n" " mpandiika eya namba enzijjuvu enfunda eza mu hekisadekanariyo\n" -#: src/od.c:340 +#: src/od.c:353 +#, fuzzy msgid "" "\n" -"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" -"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" -"at first byte printed, incremented when dump is progressing.\n" -"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" -"Ekiragiro kino bwe kiba nga kisobola okukolera ku mateeka ag'okukiyisa\n" -"ag'engeri esooka n'eyokubiri, ekikolebwako ekisembayo ne kiba nga\n" -"kisookako ka '+' oba digiti ekiragiro kikolera ku mateeka ag'engeri\n" -"ey'okubiri. Ekikolebwako ekimu bwe kiba 'AWATANDIKIRWA', kiba kyekimu\n" -"n'okussawo nti '-j AWATANDIKIRWA'. KIPANDE y'endagiriro en'efaanayirize\n" -"eya bayiti en'esooka okuwandikibwa. Eno endagiriro eyongerwayo buli lwe\n" -"wabeerawo ebirala ebiwandikibwa. AWATANDIKIRWA ne KIPANDE, bwe\n" -"bikulemberwa 0x oba 0X kitegeeza nti bibalibwa mu mbala eya\n" -"hekisadekanariyo. AWATANDIKIRWA ne KIPANDE bisobola okukomekkerezesebwa\n" -"'.' ekitegeeza ntibinaabalibwa mu okitariyo, oba 'b', ekitegeeza nti\n" -"ennamba zikubisibwamu 512.\n" - -#: src/od.c:349 -msgid "" "\n" "TYPE is made up of one or more of these specifications:\n" -"\n" " a named character, ignoring high-order bit\n" " c ASCII character or backslash escape\n" msgstr "" @@ -7835,7 +8199,7 @@ msgstr "" "akasumulula\n" " ebikagoberera okuva mu nkola yaabyo eya bulijjo\n" -#: src/od.c:356 +#: src/od.c:360 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -7855,10 +8219,11 @@ msgstr "" " x[BUNGI] Ennamba eya hekisadekanariyo. Buli digiti ya mu etwala bayiti\n" " BUNGI\n" -#: src/od.c:363 +#: src/od.c:367 +#, fuzzy msgid "" "\n" -"SIZE is a number. For TYPE in doux, SIZE may also be C for\n" +"SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" "sizeof(char), S for sizeof(short), I for sizeof(int) or L for\n" "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" @@ -7874,46 +8239,37 @@ msgstr "" "ne\n" "sizeof(long double).\n" -#: src/od.c:370 +#: src/od.c:374 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" +"Adding a z suffix to any type displays printable characters at the end of\n" +"each output line.\n" msgstr "" -"\n" -"RADIKISI bwe kibeera d, kitegeeza dekanariyo, bw'ebeera o kitegeeza\n" -"okitariyo, x kitegeeza hekisadekanariyo ate bw'ebeera n kitegeeza\n" -"tekuli radikisi.\n" -"BAYITI bw'ekulembekkerezebwa 0x oba 0X ebeera ya mu hekisadakanariyo,\n" -"ate esobola okubaako kamu ku bubonero buno obu komekkereza:\n" -"b akategeeza nti ennamba eyo ekubisibwamu 512, kB nti ekubisibwamu 1000,\n" -"K ye 1024, MB 1000*1000, M 1024*1024, GB 1000*1000*1000, G 1024*1024*1024,\n" -"n'obubonero T, P, E, Z, Y bweyongera mu ngeri eyo.\n" -"Bw'oyongerako ate akawayiro z, ekiragiro buli lunyiriri olw'ebivamu\n" -"kirukomekkereza n'olukalala olw'obubonero bwamu obutali bukusike.\n" -#: src/od.c:380 +#: src/od.c:379 +#, 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" +"\n" +"\n" +"BYTES is hex with 0x or 0X prefix, and may have a multiplier suffix:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"and so on for G, T, P, E, Z, Y.\n" msgstr "" -"Akawyiro '--string' bwe kabulako ennamba, ekiragiro kikozesa '3'. \n" -"Akawayiro '--width' bwe kabulako ennamba, ekiragiro kikozesa '32'. \n" -"Ekiragiro kino 'od' bwe kutabeerako akawayiro, kikola ng'eyataddewo\n" -" '-A o -t d2 -w 16'.\n" +"\n" +"Ku K osobola okuwayirako akafundikwa akagibazzaamu:\n" +"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:633 src/od.c:753 +#: src/od.c:639 src/od.c:759 #, c-format msgid "invalid type string %s" msgstr "%s tekikkirizibwa kukola ng'ekigambo ekifuga 'kika'" -#: src/od.c:643 +#: src/od.c:649 #, c-format msgid "" "invalid type string %s;\n" @@ -7922,7 +8278,7 @@ msgstr "" "%s tekikkirizibwa kukola ng'ekiganbo ekifuga 'kika';\n" "anti sisitemu eno tekozesa namba nzijuvu eza bayiti %lu" -#: src/od.c:764 +#: src/od.c:770 #, c-format msgid "" "invalid type string %s;\n" @@ -7931,19 +8287,19 @@ msgstr "" "%s tekikkirizibwa kukola ng'ekiganbo ekifuga 'kika';\n" "anti sisitemu eno tekozesa namba nzijuvu eza bayiti %lu" -#: src/od.c:822 +#: src/od.c:828 #, 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:1047 +#: src/od.c:1053 #, 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:1603 +#: src/od.c:1609 #, fuzzy, c-format msgid "invalid output address radix '%c'; it must be one character from [doxn]" msgstr "" @@ -7951,27 +8307,27 @@ msgstr "" "fayiro\n" "kw'etandikira; kozesa kamu ku buno obubonero obuna: d o x n" -#: src/od.c:1729 +#: src/od.c:1735 #, 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:1804 +#: src/od.c:1810 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:1825 +#: src/od.c:1831 #, 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:1868 +#: src/od.c:1874 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "kulabula: obuwanvu %lu tebusoboka; 'od' egenda kukozesaamu %d" @@ -7987,11 +8343,11 @@ msgid "standard input is closed" msgstr "awayingizibwa awa bulijjo wabikkidwa" #: 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" -"\n" msgstr "" "Ekiragiro kino ebivaamu byakyo kibiwandika awateekebwa ebiva mu " "zipuloguramu\n" @@ -8005,7 +8361,7 @@ msgstr "" "awayingizibwa awa bulijjo.\n" "\n" -#: src/paste.c:448 +#: 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" @@ -8018,7 +8374,7 @@ msgstr "" "ewandike\n" " ez'omu egiddako\n" -#: src/paste.c:509 +#: src/paste.c:508 #, c-format msgid "delimiter list ends with an unescaped backslash: %s" msgstr "" @@ -8087,80 +8443,80 @@ msgid "Kaveh Ghazi" msgstr "Kaveh Ghazi" #. TRANSLATORS: Real name is unknown; at most 19 characters. -#: src/pinky.c:250 +#: src/pinky.c:242 msgid " ???" msgstr " ???" #. TRANSLATORS: Idle time is unknown; at most 5 characters. -#: src/pinky.c:274 +#: src/pinky.c:266 msgid "?????" msgstr "?????" -#: src/pinky.c:323 +#: src/pinky.c:314 #, c-format msgid "Login name: " msgstr "Erinnya ery'oku sisitemu: " -#: src/pinky.c:326 +#: src/pinky.c:317 #, c-format msgid "In real life: " msgstr "Erinnya erijjuvu: " #. TRANSLATORS: Real name is unknown; no hard limit. -#: src/pinky.c:330 +#: src/pinky.c:321 msgid "???\n" msgstr "???\n" -#: src/pinky.c:350 +#: src/pinky.c:341 #, c-format msgid "Directory: " msgstr "Terekero: " -#: src/pinky.c:352 +#: src/pinky.c:343 #, c-format msgid "Shell: " msgstr "Nzivvuunuzi: " -#: src/pinky.c:371 +#: src/pinky.c:362 #, c-format msgid "Project: " msgstr "Pulojekiti: " -#: src/pinky.c:395 +#: src/pinky.c:386 #, c-format msgid "Plan:\n" msgstr "Entegeka:\n" -#: src/pinky.c:414 +#: src/pinky.c:405 msgid "Login" msgstr "Lyakusisitemu" -#: src/pinky.c:416 +#: src/pinky.c:407 msgid "Name" msgstr "Linnya" -#: src/pinky.c:417 +#: src/pinky.c:408 msgid " TTY" msgstr " TTY" -#: src/pinky.c:419 +#: src/pinky.c:410 msgid "Idle" msgstr "Kasirikiriro" -#: src/pinky.c:420 +#: src/pinky.c:411 msgid "When" msgstr "Ddi" -#: src/pinky.c:423 +#: src/pinky.c:414 msgid "Where" msgstr "Wa" -#: src/pinky.c:502 +#: src/pinky.c:493 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Enkozesa entuufu eri: %s [KAWAYIRO]... [AKOZESA]...\n" -#: src/pinky.c:503 +#: src/pinky.c:494 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -8184,7 +8540,7 @@ msgstr "" " MUKOZESA mu bufunze, eno y'enkola yakyo eya bulijjo ne\n" " bw'otateekawo akawayiro kano\n" -#: src/pinky.c:511 +#: src/pinky.c:502 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -8208,7 +8564,7 @@ msgstr "" " n'obudde bw'amaze ng'asirikiriridde bwe kiba nga\n" " kiwandika eby'omubufunze\n" -#: src/pinky.c:520 +#: src/pinky.c:511 #, fuzzy, c-format msgid "" "\n" @@ -8220,7 +8576,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:604 +#: src/pinky.c:595 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "" @@ -8237,53 +8593,53 @@ msgstr "Pete TerMaat" msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:912 +#: src/pr.c:908 #, fuzzy, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "'--pages=OLUSOOKERWAKO[:OLUMALIRWAKO]'kukyabulako agumenti" -#: src/pr.c:914 +#: src/pr.c:910 #, c-format msgid "invalid page range %s" msgstr "olubu lw'empapula %s terusoboka" -#: src/pr.c:979 +#: src/pr.c:975 #, fuzzy, c-format msgid "'-l PAGE_LENGTH' invalid number of lines: %s" msgstr "" "'-l BUNGI_BW'ENNYIRIRI' obungi obw'ennyiriri ku\n" "lupapula, %s, tebusoboka" -#: src/pr.c:1003 +#: src/pr.c:999 #, fuzzy, c-format msgid "'-N NUMBER' invalid starting line number: %s" msgstr "'-N LUNYIRIRI' okutandikira ku lunyiriri olwo tekisoboka: %s" -#: src/pr.c:1015 +#: src/pr.c:1011 #, fuzzy, c-format msgid "'-o MARGIN' invalid line offset: %s" msgstr "" "'-o' BBANGA eryo ebbanga ery'okulekangawo\n" "ku ntandikwa z'ennyiriri terisoboka: %s" -#: src/pr.c:1056 +#: src/pr.c:1052 #, fuzzy, c-format msgid "'-w PAGE_WIDTH' invalid number of characters: %s" msgstr "'-w BUGAZI_BW'OLUPAPULA' obuwo obungi bw'obubonero tebusoboka: %s" -#: src/pr.c:1070 +#: src/pr.c:1066 #, fuzzy, c-format msgid "'-W PAGE_WIDTH' invalid number of characters: %s" msgstr "'-W BUGAZI_BW'OLUPAPULA' obuwo obungi bw'obubonero tebusoboka: %s" -#: src/pr.c:1100 +#: src/pr.c:1096 #, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "" "tokkirizibwa okutegeka obungi bw'enkumbo bw'obanga ate\n" "otegese ekiragiro buli fayiro kigiwandikire mu lukumbo lwa yo" -#: src/pr.c:1104 +#: src/pr.c:1100 #, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "" @@ -8291,45 +8647,44 @@ msgstr "" "nga buli emu ebigirimu kibiteeka mu lukumbo lwa byo, tosobola\n" "kufuga bungi bw'enkumbo ezikolebwawo." -#: src/pr.c:1200 +#: src/pr.c:1196 #, fuzzy, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "" "'-%c' agumenti erimu obubonero obuyitiridde obungi, oba\n" "omuwendo gw'otaddewo tegukkirizibwa: %s" -#: src/pr.c:1304 +#: src/pr.c:1293 #, c-format msgid "page width too narrow" msgstr "olupapula lujjakuyitirira okufunda" -#: src/pr.c:2369 +#: src/pr.c:2353 #, c-format msgid "starting page number %<PRIuMAX> exceeds page count %<PRIuMAX>" msgstr "" "olupapula lw'ogambye okutandikirako, %<PRIuMAX>,\n" "eziri mu fayiro, %<PRIuMAX>, zo tezituukayo" -#: src/pr.c:2396 +#: src/pr.c:2380 #, c-format msgid "page number overflow" msgstr "ennamba y'olupapula tejja mu ggwanika zzibizi" -#: src/pr.c:2401 +#: src/pr.c:2385 #, c-format msgid "Page %<PRIuMAX>" msgstr "Lupapula %<PRIuMAX>" -#: src/pr.c:2773 -msgid "" -"Paginate or columnate FILE(s) for printing.\n" -"\n" +#: src/pr.c:2757 +#, fuzzy +msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" "Ekiragiro kino ebiri mu FAYIRO kibitegeka ng'empapula z'ekitabo oba ne mu\n" "nkumbo bisobole okulabika obulungi na bikubisidwa ku kyapa (pulinta).\n" "\n" -#: src/pr.c:2780 +#: src/pr.c:2763 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -8349,7 +8704,7 @@ msgstr "" " Era kigezako okulaba nti ku lupapula enkumbo zonna\n" " z'enkanyankanya obungi bw'ennyiriri ezizirimu\n" -#: src/pr.c:2788 +#: src/pr.c:2771 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -8371,7 +8726,7 @@ msgstr "" " olunyiriri olwereere wakati w'ennyiriri ezidirinngana\n" " eziva mu FAYIRO\n" -#: src/pr.c:2796 +#: src/pr.c:2779 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -8418,7 +8773,7 @@ msgstr "" " eky'obulagira kutandika lunyiriri lupya obw'emirundi\n" " esatu\n" -#: src/pr.c:2806 +#: src/pr.c:2789 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -8459,7 +8814,7 @@ msgstr "" " agandibadde g'awula nkumbo zazo. Akawayiro kano\n" " kasobola okukozesebwa n'aka '--sep-string'\n" -#: src/pr.c:2815 +#: src/pr.c:2798 msgid "" " -l, --length=PAGE_LENGTH\n" " set the page length to PAGE_LENGTH (66) lines\n" @@ -8486,7 +8841,7 @@ msgstr "" " ebitundu ebiyitamu ne bitawandikibwa. Akawayiro kano\n" " kasobola kukolagana n'aka '-J'\n" -#: src/pr.c:2822 +#: src/pr.c:2805 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -8519,7 +8874,7 @@ msgstr "" " ennamba kiziwandika ne ku nnyiriri ezikulembera\n" " n'ezigoberera ezo eziriko ebiva mu FAYIRO ekolebwako\n" -#: src/pr.c:2830 +#: src/pr.c:2813 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -8537,7 +8892,7 @@ msgstr "" " Buno obukozesa nga toyagala ekiragiro kikulabule nga\n" " kiremedwa okuggula FAYIRO\n" -#: src/pr.c:2837 +#: src/pr.c:2820 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -8565,7 +8920,7 @@ msgstr "" " okuzigyisa mu nkumbo. Bwe kubaako n'aka -w ate\n" " ekiragiro kisigala ennyiriri kizitemamu\n" -#: src/pr.c:2844 +#: src/pr.c:2827 #, fuzzy msgid "" " -S[STRING], --sep-string[=STRING]\n" @@ -8585,7 +8940,7 @@ msgstr "" " -t, --omit-header Buno bwo bukireetera butawandikawo mitwe n'obugambo\n" " obuba ku nkomerero ez'empapula\n" -#: src/pr.c:2851 +#: src/pr.c:2834 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -8617,7 +8972,7 @@ msgstr "" "Olukumbo\n" " bwe luba lumu obuwayiro buno tebulina kye bukolawo\n" -#: src/pr.c:2861 +#: src/pr.c:2844 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -8640,7 +8995,7 @@ msgstr "" " ekiragoro ennyiriri tekizitemamu. Bwo obuwayiro '-s'\n" " ne '-S' tebulina kye bukyusa ku nkola eya buno\n" -#: src/pr.c:2869 +#: src/pr.c:2852 msgid "" "\n" "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" @@ -8816,10 +9171,10 @@ msgstr "" " oba: %s -G [KAWAYIRO]... [EBY'OKUKOLAKO [EBIVAAMU]]\n" #: src/ptx.c:1821 +#, fuzzy msgid "" "Output a permuted index, including context, of the words in the input " "files.\n" -"\n" msgstr "" "Ekiragiro kino kisoma by'okiwadde okukolako ne kisengeka buli kigambo\n" "okukolamu olukalala olulaga buli ekigambo ekyo we kirabikira. Ekigambo buli\n" @@ -8842,7 +9197,7 @@ msgstr "" " omosonso nnungi sso/ mese nsolima ssi nnungi naye mese ey'\n" "\n" -#: src/ptx.c:1828 +#: src/ptx.c:1827 #, fuzzy msgid "" " -A, --auto-reference output automatically generated references\n" @@ -8861,7 +9216,7 @@ msgstr "" " we kiba kitemyemu olunyiriri " "olw'ebikolebwako\n" -#: src/ptx.c:1833 +#: src/ptx.c:1832 #, fuzzy msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" @@ -8896,7 +9251,7 @@ msgstr "" " bisobole okukozesebwa mu puloguramu eya " "'TeX'\n" -#: src/ptx.c:1840 +#: src/ptx.c:1839 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -8946,7 +9301,7 @@ msgstr "" "tekikikolako\n" " era mu lukalala olukolebwawo tekibaamu\n" -#: src/ptx.c:1848 +#: src/ptx.c:1847 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -8967,7 +9322,7 @@ msgstr "" " obukola ebigambo ebikozesebwa okulamba\n" " ennyiriri ezo\n" -#: src/ptx.c:1855 +#: src/ptx.c:1854 #, fuzzy msgid "" "\n" @@ -8978,7 +9333,7 @@ msgstr "" "FAYIRO kirinda kusoma ebiva awayingizibwa awa bulijjo. Ekiragiro kikola\n" "nga eyataddewo akawayiro '-F /' okugyako ng'otaddewo ekirala.\n" -#: src/ptx.c:1949 +#: src/ptx.c:1948 #, c-format msgid "invalid gap width: %s" msgstr "obunene obw'ekibangirizi, %s, tebukkirizibwa" @@ -9007,7 +9362,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "nnemedwa kukyusa kudda mu tterekero %s" -#: src/pwd.c:170 src/pwd.c:277 +#: src/pwd.c:170 src/pwd.c:277 src/split.c:373 #, c-format msgid "failed to stat %s" msgstr "nnemedwa okufuna ebifa ku %s" @@ -9023,14 +9378,15 @@ msgid "ignoring non-option arguments" msgstr "agumenti ezitafuula eneyisa ey'ebiragiro tezikoledwako" #. This is a proper name. See the gettext manual, section Names. -#: src/readlink.c:33 +#: src/readlink.c:32 msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 +#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147 +#: src/stat.c:1349 src/touch.c:212 #, c-format -msgid "Usage: %s [OPTION]... FILE\n" -msgstr "Enkozesa entuufu eri: %s [KAWAYIRO]... FAYIRO\n" +msgid "Usage: %s [OPTION]... FILE...\n" +msgstr "Enkozesa entuufu eri: %s [KAWAYIRO]... FAYIRO...\n" #: src/readlink.c:63 msgid "" @@ -9071,16 +9427,19 @@ msgstr "" " ekyo bwe kitatuukirira wabawo kiremya\n" #: src/readlink.c:75 +#, fuzzy msgid "" " -m, --canonicalize-missing canonicalize by following every symlink in\n" " every component of the given name " "recursively,\n" " without requirements on components " "existence\n" -" -n, --no-newline do not output the trailing newline\n" +" -n, --no-newline do not output the trailing delimiter\n" " -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" msgstr "" " -m, --canonicalize-missing Buno bwo buleetera ekiragiro okuwandika\n" " erinnya mu bujjuvu nga ekkubo lyonna okuva " @@ -9102,11 +9461,10 @@ msgstr "" "kiremya\n" " aba azzewo\n" -#: src/realpath.c:71 src/rm.c:134 src/shred.c:147 src/stat.c:1330 -#: src/touch.c:215 -#, c-format -msgid "Usage: %s [OPTION]... FILE...\n" -msgstr "Enkozesa entuufu eri: %s [KAWAYIRO]... FAYIRO...\n" +#: src/readlink.c:152 +#, fuzzy, c-format +msgid "ignoring --no-newline with multiple arguments" +msgstr "agumenti ezitafuula eneyisa ey'ebiragiro tezikoledwako" #: src/realpath.c:72 msgid "" @@ -9133,12 +9491,12 @@ msgstr "" msgid "generating relative path" msgstr "" -#: src/remove.c:286 +#: src/remove.c:273 #, c-format msgid "%s: descend into write-protected directory %s? " msgstr "%s: nyingire mu tterekero %s etakkirizibwa okuwandikibwa mu? " -#: src/remove.c:287 +#: src/remove.c:274 #, c-format msgid "%s: descend into directory %s? " msgstr "%s: nyingire mu tterekero %s? " @@ -9147,37 +9505,37 @@ msgstr "%s: nyingire mu tterekero %s? " #. translate "%s: remove %s (write-protected) %s? " #. instead. It should avoid grammatical problems #. with the output of file_type. -#: src/remove.c:303 +#: src/remove.c:290 #, c-format msgid "%s: remove write-protected %s %s? " msgstr "%s: nzigyewo %s %s etakkirizibwa okuwandikibwa mu? " -#: src/remove.c:304 +#: src/remove.c:291 #, c-format msgid "%s: remove %s %s? " msgstr "%s: nzigyewo %s %s? " -#: src/remove.c:417 +#: src/remove.c:374 #, c-format msgid "removed directory: %s\n" msgstr "tterekero %s ligyidwa wo\n" -#: src/remove.c:481 +#: src/remove.c:444 #, c-format msgid "cannot remove directory: %s" msgstr "nemedwa okugyawo tterekero: %s" -#: src/remove.c:537 +#: src/remove.c:500 #, c-format msgid "skipping %s, since it's on a different device" msgstr "%s ngibuuka kubanga eri ku kyuma kirala" -#: src/remove.c:557 +#: src/remove.c:520 #, c-format msgid "traversal failed: %s" msgstr "wazzewo kiremya mu kukebera tterekero: %s" -#: src/remove.c:563 +#: src/remove.c:526 #, c-format msgid "" "unexpected failure: fts_info=%d: %s\n" @@ -9186,12 +9544,12 @@ msgstr "" "waliwo kiremya atalabwangako: fts_info=%d: %s\n" "tegeeza %s" -#: src/rm.c:118 +#: src/rm.c:119 #, fuzzy, c-format msgid "Try '%s ./%s' to remove the file %s.\n" msgstr "Gezako '%s ./%s' okugyawo fayiro %s.\n" -#: src/rm.c:135 +#: src/rm.c:136 #, fuzzy msgid "" "Remove (unlink) the FILE(s).\n" @@ -9209,7 +9567,7 @@ msgstr "" "akiyisizza\n" " buli lwe kibeera kigenda okuggyawo fayiro\n" -#: src/rm.c:141 +#: src/rm.c:142 msgid "" " -I prompt once before removing more than three files, " "or\n" @@ -9235,7 +9593,7 @@ msgstr "" " Ate bw'otateekawo DDI, era ekiragiro kikwebuuzaako\n" " ku buli fayiro gye kigyawo.\n" -#: src/rm.c:148 +#: src/rm.c:149 msgid "" " --one-file-system when removing a hierarchy recursively, skip any\n" " directory that is on a file system different from\n" @@ -9247,12 +9605,13 @@ msgstr "" " ku sisitemu ya fayiro etali y'emu n'etterekero " "eryo\n" -#: src/rm.c:153 +#: src/rm.c:154 #, fuzzy msgid "" " --no-preserve-root do not treat '/' specially\n" " --preserve-root do not remove '/' (default)\n" " -r, -R, --recursive remove directories and their contents recursively\n" +" -d, --dir remove empty directories\n" " -v, --verbose explain what is being done\n" msgstr "" " --no-preserve-root Kano kakireetera obutayisa '/' mu ngeri " @@ -9265,7 +9624,7 @@ msgstr "" " -v, --verbose Buno bukireetera okukola nga bwe kinnyonyola\n" " bye kikola\n" -#: src/rm.c:161 +#: src/rm.c:163 msgid "" "\n" "By default, rm does not remove directories. Use the --recursive (-r or -R)\n" @@ -9277,7 +9636,7 @@ msgstr "" "okukiwayirako\n" " --recursive oba -r oba -R.\n" -#: src/rm.c:166 +#: src/rm.c:168 #, fuzzy, c-format msgid "" "\n" @@ -9294,7 +9653,7 @@ msgstr "" "\n" " %s ./-foo\n" -#: src/rm.c:175 +#: src/rm.c:177 msgid "" "\n" "Note that if you use rm to remove a file, it might be possible to recover\n" @@ -9307,12 +9666,12 @@ msgstr "" "okukakasa nti fayiro gy'oggyeewo tewali kisobolaokugikomyawo, lowoza ku\n" "kukozesa ekiragiro ekya shred.\n" -#: src/rm.c:335 +#: src/rm.c:342 #, c-format msgid "%s: remove all arguments recursively? " msgstr "%s: ameterekero agali mu agumenti n'ebigalimu mbigyewo? " -#: src/rm.c:336 +#: src/rm.c:343 #, c-format msgid "%s: remove all arguments? " msgstr "%s: byonna ebimenyedwa mu agumenti mbigyewo? " @@ -9378,7 +9737,11 @@ msgstr "" msgid "" "Run a program in a different security context.\n" "With neither CONTEXT nor COMMAND, print the current security context.\n" -"\n" +msgstr "" + +#: src/runcon.c:94 +#, fuzzy +msgid "" " CONTEXT Complete security context\n" " -c, --compute compute process transition context before modifying\n" " -t, --type=TYPE type (for same role as parent)\n" @@ -9404,73 +9767,73 @@ msgstr "" " -l, --range=LUBU Buno ate bwo butegekako olukalala lw'amasa ga SELinux\n" "\n" -#: src/runcon.c:140 +#: src/runcon.c:144 #, c-format msgid "multiple roles" msgstr "amatuluba g'abakozesa gasukka ku limu" -#: src/runcon.c:145 +#: src/runcon.c:149 #, c-format msgid "multiple types" msgstr "amatuluba g'ebikolebwako gasukka ku limu" -#: src/runcon.c:150 +#: src/runcon.c:154 #, c-format msgid "multiple users" msgstr "abakozesa basukka mu omu" -#: src/runcon.c:155 +#: src/runcon.c:159 #, c-format msgid "multiple levelranges" msgstr "otegese embu za SELinux ezisoba mu lumu" -#: src/runcon.c:173 src/runcon.c:209 +#: src/runcon.c:177 src/runcon.c:213 #, c-format msgid "failed to get current context" msgstr "nnemedwa okutegeera endukusa eza SELinux ezisangidwawo" -#: src/runcon.c:183 +#: src/runcon.c:187 #, c-format msgid "you must specify -c, -t, -u, -l, -r, or context" msgstr "" "oteekwa okuwayirako -c, -t, -u, -l, -r, oba okussawo endukusa ez'etaagibwa" -#: src/runcon.c:191 +#: src/runcon.c:195 #, c-format msgid "no command specified" msgstr "totaddewo kiragiro" -#: src/runcon.c:197 +#: src/runcon.c:201 #, c-format msgid "%s may be used only on a SELinux kernel" msgstr "%s kyetaagisa ennombe ebe nga etegeera SELinux" -#: src/runcon.c:223 +#: src/runcon.c:227 #, c-format msgid "failed to compute a new context" msgstr "nnemedwa okuzuula endukusa eza SELinux empya" -#: src/runcon.c:237 +#: src/runcon.c:241 #, c-format msgid "failed to set new user %s" msgstr "nnemedwa okutegeka omukozesa omupya %s" -#: src/runcon.c:239 +#: src/runcon.c:243 #, c-format msgid "failed to set new type %s" msgstr "nnemedwa okutegeka ettuluba ery'ebikolebwako eppya %s" -#: src/runcon.c:241 +#: src/runcon.c:245 #, c-format msgid "failed to set new range %s" msgstr "nnemedwa okutegeka olubu olupya %s" -#: src/runcon.c:243 +#: src/runcon.c:247 #, c-format msgid "failed to set new role %s" msgstr "nnemedwa okutegeka ettuluba ly'abakozesa eppya %s" -#: src/runcon.c:251 +#: src/runcon.c:255 #, c-format msgid "unable to set security context %s" msgstr "nnemedwa okutegeka endukusa eza SELinux %s" @@ -9487,9 +9850,12 @@ msgstr "" " oba: %s [KAWAYIRO]... ESOOKA EKYONGEZEBWAKO ESEMBAYO\n" #: src/seq.c:73 +msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" +msgstr "" + +#: src/seq.c:79 +#, fuzzy msgid "" -"Print numbers from FIRST to LAST, in steps of INCREMENT.\n" -"\n" " -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" @@ -9512,7 +9878,7 @@ msgstr "" " ezitaweza digiti kyongerawo zi zero mu maaso " "gazo\n" -#: src/seq.c:82 +#: src/seq.c:86 msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" @@ -9532,7 +9898,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:90 +#: src/seq.c:94 #, fuzzy msgid "" "FORMAT must be suitable for printing one argument of type 'double';\n" @@ -9547,33 +9913,18 @@ msgstr "" "eritasussa\n" "TTUUSO, ekiragiro kikozesaamu empandika %g.\n" -#: src/seq.c:136 +#: src/seq.c:140 #, c-format msgid "invalid floating point argument: %s" msgstr "" "agument: %s tekkirizibwa ku nnamba ey'ekika ekifunzidwa mu bitundu bisatu" -#: src/seq.c:193 -#, c-format -msgid "format %s has no %% directive" -msgstr "empandika %s ebulako ekitundu ekya %%" - -#: src/seq.c:210 -#, c-format -msgid "format %s ends in %%" -msgstr "empandika %s ekomekkerezedwa %%" - -#: src/seq.c:213 +#: src/seq.c:232 #, c-format msgid "format %s has unknown %%%c directive" msgstr "empandika %s erimu ekitundu %%%c ekitategeereka" -#: src/seq.c:217 -#, c-format -msgid "format %s has too many %% directives" -msgstr "empandika %s erimu ebitundu ebya %% ebiyitiridde obungi" - -#: src/seq.c:431 +#: src/seq.c:555 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" @@ -9622,29 +9973,29 @@ msgstr "" "n'eba NG, ate bw'oba nazo ozetaaze, ennamba eza guluupu ez'enyongeza\n" "kazikutegekera ne ziba NG1, ...\n" -#: src/setuidgid.c:163 +#: src/setuidgid.c:162 #, c-format msgid "unknown user-ID: %s" msgstr "ennamba-ya-mukozesa eno sigimanyi: %s" -#: src/setuidgid.c:174 +#: 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:191 +#: src/setuidgid.c:190 #, c-format msgid "failed to set supplemental group(s)" msgstr "tekisobose okwongerako guluupu ey'enyongeza" -#: src/setuidgid.c:201 +#: src/setuidgid.c:200 #, c-format msgid "cannot set group-ID to %lu" msgstr "tekisobose okukola ennamba-ya-guluupu ebe %lu" -#: src/setuidgid.c:205 +#: src/setuidgid.c:204 #, c-format msgid "cannot set user-ID to %lu" msgstr "tekisobose okukola namba-ya-mukozesa eba %lu" @@ -9655,16 +10006,16 @@ msgid "Colin Plumb" msgstr "Colin Plumb" #: src/shred.c:148 +#, 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" -"\n" msgstr "" "Ekiragiro kino kiddinngana okuwandika ku FAYIRO ezimenyedwa,\n" "kibeere kizibu nnyo okuzikomyawo, ne bwe babeera bakozesezza\n" "sofitiweya eyenkana wa.\n" -#: src/shred.c:156 +#: src/shred.c:155 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -9683,7 +10034,7 @@ msgstr "" " okussaako obukulembekkereza obulaga ebirengo,\n" " nga K, M, ne G)\n" -#: src/shred.c:162 +#: src/shred.c:161 msgid "" " -u, --remove truncate and remove file after overwriting\n" " -v, --verbose show progress\n" @@ -9704,7 +10055,7 @@ msgstr "" " w'ebadde kiwandikawo mazero, waleme okulabika nga we\n" " bakozesezza ekiragiro ekya shred ekyo. Ebivaamu\n" -#: src/shred.c:171 +#: src/shred.c:170 msgid "" "\n" "If FILE is -, shred standard output.\n" @@ -9726,7 +10077,7 @@ msgstr "" "bakola ku fayiro eza bulijjo.\n" "\n" -#: src/shred.c:181 +#: src/shred.c:180 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" @@ -9744,7 +10095,7 @@ msgstr "" "ku ezo shred kwayinza obutabeera na mugaso:\n" "\n" -#: src/shred.c:189 +#: src/shred.c:188 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -9767,7 +10118,7 @@ msgstr "" " ekiwereza ekya NFS ekikolebwa ba Network Appliance\n" "\n" -#: src/shred.c:199 +#: src/shred.c:198 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -9781,7 +10132,7 @@ msgstr "" "* sisitemu eza fayiro ezifunzidwa\n" "\n" -#: src/shred.c:206 +#: src/shred.c:205 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" @@ -9804,7 +10155,7 @@ msgstr "" "mount).\n" "\n" -#: src/shred.c:216 +#: src/shred.c:215 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" @@ -9815,124 +10166,124 @@ msgstr "" "eya fayiro gy'oyagala okukolako shred. Olwo fayiro eyo ebeera\n" "ekyayinza okukomezebwawo.\n" -#: src/shred.c:296 +#: src/shred.c:295 #, c-format msgid "%s: fdatasync failed" msgstr "ku %s enkola eya fdatasync egaanye" -#: src/shred.c:307 +#: src/shred.c:306 #, c-format msgid "%s: fsync failed" msgstr "ku %s enkola eya fsync egaanye" -#: src/shred.c:384 +#: src/shred.c:383 #, c-format msgid "%s: cannot rewind" msgstr "%s: sisobola okudda mabega" -#: src/shred.c:403 +#: src/shred.c:402 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: muku %lu/%lu (%s)..." -#: src/shred.c:453 +#: src/shred.c:452 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: kiremya mu kuwandikira ku bujjulule obwa %s" -#: src/shred.c:471 +#: src/shred.c:470 #, c-format msgid "%s: lseek failed" msgstr "ku %s enkola eya lseek egaanye" -#: src/shred.c:482 +#: src/shred.c:481 #, c-format msgid "%s: file too large" msgstr "%s: fayiro eyitiridde obunene" -#: src/shred.c:505 +#: src/shred.c:504 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: muku %lu/%lu (%s)...%s" -#: src/shred.c:521 +#: src/shred.c:520 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: muku %lu/%lu (%s)...%s/%s %d%%" -#: src/shred.c:768 +#: src/shred.c:767 #, c-format msgid "%s: fstat failed" msgstr "%s: fstat eremedwa okugikebera ebigikwatako" -#: src/shred.c:779 +#: src/shred.c:778 #, c-format msgid "%s: invalid file type" msgstr "%s: kino ekika kya fayiro tekikkirizibwa" -#: src/shred.c:798 +#: src/shred.c:797 #, c-format msgid "%s: file has negative size" msgstr "%s: obunene obwa fayiro eno buli wansi wa zero" -#: src/shred.c:865 +#: src/shred.c:864 src/sort.c:932 src/split.c:378 #, c-format msgid "%s: error truncating" msgstr "%s: wazzewo kiremya mu kusalako fayiro" -#: src/shred.c:881 +#: src/shred.c:880 #, c-format msgid "%s: fcntl failed" msgstr "%s: emirimu egya 'fcntl' gizzeko kiremya" -#: src/shred.c:886 +#: src/shred.c:885 #, 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:968 +#: src/shred.c:967 #, c-format msgid "%s: removing" msgstr "%s: ngigyawo" -#: src/shred.c:992 +#: src/shred.c:991 #, c-format msgid "%s: renamed to %s" msgstr "%s: erinnya lyayo ndikyusiza libeere %s" -#: src/shred.c:1014 +#: src/shred.c:1013 #, c-format msgid "%s: failed to remove" msgstr "nnemedwa okugyawo %s" -#: src/shred.c:1018 +#: src/shred.c:1017 #, c-format msgid "%s: removed" msgstr "%s: egyidwawo" -#: src/shred.c:1025 src/shred.c:1068 +#: src/shred.c:1024 src/shred.c:1067 #, c-format msgid "%s: failed to close" msgstr "nnemedwa okubika %s" -#: src/shred.c:1061 +#: src/shred.c:1060 #, c-format msgid "%s: failed to open for writing" msgstr "%s nnemedwa okugibikkula kugiwandikamu" -#: src/shred.c:1126 +#: src/shred.c:1125 #, c-format msgid "%s: invalid number of passes" msgstr "%s: obwo obungi bw'emiku tebusoboka" -#: src/shred.c:1135 src/shuf.c:291 src/sort.c:4387 +#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441 #, c-format msgid "multiple random sources specified" msgstr "otegese ennono eza data eya muwawa ezisoba mu emu" -#: src/shred.c:1149 +#: src/shred.c:1148 #, c-format msgid "%s: invalid file size" msgstr "%s: buno obunene bwa fayiro tebukkirizibwa" @@ -9949,15 +10300,14 @@ msgstr "" " oba: %s -i ESOOKA-ESEMBA [KAWAYIRO]...\n" #: src/shuf.c:54 -msgid "" -"Write a random permutation of the input lines to standard output.\n" -"\n" +#, fuzzy +msgid "Write a random permutation of the input lines to standard output.\n" msgstr "" "Ekiragiro kino kiwandika ebintu bye kiba kisomye nga ennyiriri zaamu\n" "kikyusakyusizza engobereragana yazo mu ngeri eya muwawa.\n" "\n" -#: src/shuf.c:61 +#: src/shuf.c:60 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 " @@ -10000,27 +10350,27 @@ msgstr "" " eya zero eyo mu kifo eky'akabonero aka bulijjo\n" " akalaga enkomerero y'olunyiriri\n" -#: src/shuf.c:245 +#: src/shuf.c:244 #, c-format msgid "multiple -i options specified" msgstr "obuwayiro obwa -i buyitiridde obungi" -#: src/shuf.c:265 +#: src/shuf.c:264 #, c-format msgid "invalid input range %s" msgstr "olubu lw'ebiyingizibwa %s terukkirizibwa" -#: src/shuf.c:278 +#: src/shuf.c:277 #, c-format msgid "invalid line count %s" msgstr "obungi bw'ennyiriri %s tebusoboka" -#: src/shuf.c:285 src/sort.c:4381 +#: src/shuf.c:284 src/sort.c:4435 #, c-format msgid "multiple output files specified" msgstr "ebivaamu bigambidwa okugenda mu fayiro ezisukka mu emu" -#: src/shuf.c:311 +#: src/shuf.c:310 #, c-format msgid "cannot combine -e and -i options" msgstr "obuwayiro -e ne -i tebukolagana" @@ -10054,7 +10404,7 @@ msgstr "" "ne bubeera obudde enzivvunuzi bw'en'esirikirira.\n" "\n" -#: src/sleep.c:135 src/timeout.c:295 +#: src/sleep.c:135 src/timeout.c:320 #, c-format msgid "invalid time interval %s" msgstr "ekiseera %s tekisoboka" @@ -10064,16 +10414,15 @@ msgstr "ekiseera %s tekisoboka" msgid "cannot read realtime clock" msgstr "nnemedwa okusoma essawa ebalirawo" -#: src/sort.c:395 -msgid "" -"Write sorted concatenation of all FILE(s) to standard output.\n" -"\n" +#: src/sort.c:399 +#, fuzzy +msgid "Write sorted concatenation of all FILE(s) to standard output.\n" msgstr "" "Ekiragiro kino kisoma (zi)FAYIRO ne kiwandika ennyinyiri zaamu\n" "mu ngeri ensengeke awateekebwa ebivaamu awa bulijjo.\n" "\n" -#: src/sort.c:402 +#: src/sort.c:405 msgid "" "Ordering options:\n" "\n" @@ -10081,7 +10430,7 @@ msgstr "" "Buno bwe buwayiro obufuga engeri gye kisengekamu ennyiriri ezo:\n" "\n" -#: src/sort.c:406 +#: src/sort.c:409 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -10100,7 +10449,7 @@ msgstr "" " -f, --ignore-case Buno bukireetera obutawula mu nnukuta nnene\n" " n'entono bwe kiba kisengeka\n" -#: src/sort.c:412 +#: src/sort.c:415 #, fuzzy msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" @@ -10125,7 +10474,7 @@ msgstr "" "engobereragana\n" " y'emyezi < 'JAN' < .. < 'DES'\n" -#: src/sort.c:417 +#: src/sort.c:420 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" @@ -10147,7 +10496,7 @@ msgstr "" " y'olunyiriri, olwo kirutwala ng'olutandise ne\n" " nnamba 0\n" -#: src/sort.c:420 +#: src/sort.c:423 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -10177,7 +10526,7 @@ msgstr "" "ya\n" " bye kimaz'okusengeka\n" -#: src/sort.c:426 +#: src/sort.c:429 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -10196,7 +10545,7 @@ msgstr "" " ntandikwa yazo\n" "\n" -#: src/sort.c:434 +#: src/sort.c:437 msgid "" "Other options:\n" "\n" @@ -10204,7 +10553,7 @@ msgstr "" "Obuwayiro obulala:\n" "\n" -#: src/sort.c:438 +#: src/sort.c:441 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" @@ -10214,7 +10563,7 @@ msgstr "" " nga tekyetaaze kukolawo fayiro " "ez'ekiseerabuseera\n" -#: src/sort.c:442 +#: src/sort.c:445 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 " @@ -10236,7 +10585,7 @@ msgstr "" " puloguramu PULOG. Kizipakuluza ekiragiro kya\n" " 'PULOG -d'\n" -#: src/sort.c:449 +#: src/sort.c:452 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -10257,7 +10606,7 @@ msgstr "" "awayingizibwa\n" " awa bulijjo\n" -#: src/sort.c:456 +#: src/sort.c:459 #, fuzzy msgid "" " -k, --key=KEYDEF sort via a key; KEYDEF gives location and type\n" @@ -10278,7 +10627,7 @@ msgstr "" " Ebivaamu bibeera wamu nga ebivudde mu fayiro\n" " emu.\n" -#: src/sort.c:460 +#: src/sort.c:463 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -10295,7 +10644,7 @@ msgstr "" " ggwanika lya kompyuta ekiragiro mwe kisobola\n" " okuteraka bye kikolako\n" -#: src/sort.c:466 +#: src/sort.c:469 #, fuzzy, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -10332,7 +10681,7 @@ msgstr "" " fayiro nesengeke n'okulaba oba mulimu ennyiriri\n" " ezifaanagana\n" -#: src/sort.c:475 +#: 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" @@ -10340,7 +10689,7 @@ msgstr "" " ebyawulaganidwa akabonero akategeeza\n" " bayiti 0\n" -#: src/sort.c:480 +#: src/sort.c:483 #, fuzzy msgid "" "\n" @@ -10376,7 +10725,7 @@ msgstr "" "Ku namba 'BUNENE' osobola okusembyako kamu ku bukomekkereza buno\n" "obuddako:\n" -#: src/sort.c:493 +#: src/sort.c:496 msgid "" "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n" "\n" @@ -10407,269 +10756,273 @@ msgstr "" "gifuule\n" "eya C (mu enviromenti LC_ALL=C).\n" -#: src/sort.c:694 +#: src/sort.c:697 #, c-format msgid "waiting for %s [-d]" msgstr "nninda %s [-d]" -#: src/sort.c:699 +#: src/sort.c:702 #, c-format msgid "%s [-d] terminated abnormally" msgstr "%s [-d] gukomye mu ngeri etali ya bulijjo" -#: src/sort.c:853 +#: src/sort.c:856 #, c-format msgid "cannot create temporary file in %s" msgstr "sisobola okukolawo fayiro ey'ekiseerabuseera mu %s" -#: src/sort.c:939 src/sort.c:2010 src/sort.c:3056 src/sort.c:3755 -#: src/sort.c:3758 +#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713 +#: src/sort.c:3804 src/sort.c:3807 msgid "open failed" msgstr "sisobodde okubikkula fayiro" -#: src/sort.c:959 +#: src/sort.c:970 msgid "fflush failed" msgstr "ogwa fflush gugaanye" -#: src/sort.c:964 src/sort.c:2013 src/sort.c:4646 +#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706 msgid "close failed" msgstr "sisobodde okubikka fayiro" -#: src/sort.c:973 +#: src/sort.c:986 #, c-format msgid "dup2 failed" msgstr "ogwa dup2 gugaanye" -#: src/sort.c:1090 +#: src/sort.c:1103 #, c-format msgid "couldn't execute %s" msgstr "nnemedwa okutandika ogwa %s" -#: src/sort.c:1097 +#: src/sort.c:1110 msgid "couldn't create temporary file" msgstr "nnemedwa okukolawo fayiro ey'ekiseerabuseera" -#: src/sort.c:1136 +#: src/sort.c:1149 #, c-format msgid "couldn't create process for %s -d" msgstr "nnemedwa okutandika omulimu ogwa %s -d" -#: src/sort.c:1150 +#: src/sort.c:1161 #, c-format msgid "couldn't execute %s -d" msgstr "nnemedwa okutandika ogwa %s -d" -#: src/sort.c:1209 +#: src/sort.c:1220 #, c-format msgid "warning: cannot remove: %s" msgstr "kulabula: sisobola kuggyawo %s" -#: src/sort.c:1295 +#: src/sort.c:1306 #, c-format msgid "invalid --%s argument %s" msgstr "agumenti eya --%s, %s tekkirizibwa" -#: src/sort.c:1298 +#: src/sort.c:1309 #, c-format msgid "minimum --%s argument is %s" msgstr "agumenti eya --%s esembayo obutono ekkirizibwa eri %s" -#: src/sort.c:1313 +#: src/sort.c:1324 #, c-format msgid "--%s argument %s too large" msgstr "agumenti eya --%s, %s, eyitiridde obunene" -#: src/sort.c:1316 +#: src/sort.c:1327 #, 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:1398 +#: src/sort.c:1409 #, c-format msgid "number in parallel must be nonzero" msgstr "" -#: src/sort.c:1479 +#: src/sort.c:1494 msgid "stat failed" msgstr "stat tesobode okuzza ebifa ku fayiro" -#: src/sort.c:1740 +#: src/sort.c:1755 msgid "read failed" msgstr "sisobodde okusoma fayiro" -#: src/sort.c:2028 +#: src/sort.c:2043 #, c-format msgid "string transformation failed" msgstr "waliwo ekigambo ekitafuulise" -#: src/sort.c:2031 +#: src/sort.c:2046 #, c-format msgid "the untransformed string was %s" msgstr "%s kye kyagaanye okufuulibwa" -#: src/sort.c:2194 +#: src/sort.c:2209 #, c-format msgid "^ no match for key\n" msgstr "" -#: src/sort.c:2374 +#: src/sort.c:2389 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "" -#: src/sort.c:2380 +#: src/sort.c:2395 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "" -#: src/sort.c:2391 +#: src/sort.c:2406 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" -#: src/sort.c:2404 +#: src/sort.c:2419 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "" -#: src/sort.c:2436 +#: src/sort.c:2451 #, 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:2442 +#: src/sort.c:2457 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "" -#: src/sort.c:2716 src/sort.c:2725 +#: src/sort.c:2731 src/sort.c:2740 msgid "write failed" msgstr "sisobode okuwandika" -#: src/sort.c:2768 +#: src/sort.c:2783 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: wano ssi nsengeke" -#: src/sort.c:2771 +#: src/sort.c:2786 msgid "standard error" msgstr "awateekebwa ebivaamu awa bulijjo" -#: src/sort.c:3926 +#: src/sort.c:3698 +#, fuzzy +msgid "cannot read" +msgstr "%s: sisobola okudda mabega" + +#: src/sort.c:3976 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: %s tekisobola kukozesebwa okulaga ekitundu ky'olunyiriri" -#: src/sort.c:3937 +#: src/sort.c:3987 #, fuzzy, c-format msgid "options '-%s' are incompatible" msgstr "obuwayiro '-%s' tebukolagana" -#: src/sort.c:3988 +#: src/sort.c:4038 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s: entandikwa ya %s eriko ennamba etakkirizibwa" -#: src/sort.c:4245 +#: src/sort.c:4295 #, fuzzy msgid "invalid number after '-'" msgstr "ennamba eddirira '-' tekkirizibwa" -#: src/sort.c:4248 src/sort.c:4334 src/sort.c:4362 +#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416 #, fuzzy msgid "invalid number after '.'" msgstr "ennamba eddirira '.' tekkirizibwa" -#: src/sort.c:4261 src/sort.c:4367 +#: src/sort.c:4315 src/sort.c:4421 msgid "stray character in field spec" msgstr "" "ebiraga ekitundu eky'ennyiriri ekiba kikolebwako\n" "birimu akabonero akatandibaddemu" -#: src/sort.c:4308 +#: src/sort.c:4362 #, c-format msgid "multiple compress programs specified" msgstr "otegese puloguramu ezipakirisibwa ezisukka mu emu" -#: src/sort.c:4325 +#: src/sort.c:4379 msgid "invalid number at field start" msgstr "" "ekitundu eky'olunyiriri kiriko ennamba etakkirizibwa ku ntandikwa yakyo" -#: src/sort.c:4329 src/sort.c:4357 +#: src/sort.c:4383 src/sort.c:4411 msgid "field number is zero" msgstr "ennamba ey'ekitundu ky'olunyiriri eri zero" -#: src/sort.c:4338 +#: src/sort.c:4392 msgid "character offset is zero" msgstr "" "ogambye okutandikira ku kabonero namba 0 -\n" "akasembayo mu kitundu ekitandikirwako" -#: src/sort.c:4353 +#: src/sort.c:4407 #, fuzzy msgid "invalid number after ','" msgstr "ennamba eddirira ',' tekkirizibwa" -#: src/sort.c:4403 +#: src/sort.c:4457 #, c-format msgid "empty tab" msgstr "tewalaze kabonero ak'awuzi akaba kadda mu kifo eky'akabulijjo" -#: src/sort.c:4496 src/wc.c:692 +#: src/sort.c:4550 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:4518 +#: src/sort.c:4572 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s:%lu: tekisoboka kuba na linnya lya fayiro eritalina buwanvu" -#: src/sort.c:4524 +#: src/sort.c:4578 #, c-format msgid "no input from %s" msgstr "tewali biyingizibwa biva ku %s" -#: src/sort.c:4570 +#: src/sort.c:4624 #, c-format msgid "using %s sorting rules" msgstr "" -#: src/sort.c:4573 +#: src/sort.c:4627 #, c-format msgid "using simple byte comparison" msgstr "" -#: src/sort.c:4604 +#: src/sort.c:4658 #, 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:184 +#: src/split.c:187 #, c-format msgid "the suffix length needs to be at least %zu" msgstr "" -#: src/split.c:201 +#: src/split.c:204 #, c-format msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" msgstr "Enkozesa entuufu eri: %s [KAWAYIRO]... [EBIKOLEBWAKO [KATANDIKWA]]\n" -#: src/split.c:205 +#: src/split.c:208 #, fuzzy 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" -"\n" msgstr "" "Ekiragiro ekya `split' kimenya mu EBIKOLEBWAKO ebitundu ne\n" "kibikolamu zi-fayiro ezituumidwa amanya nga KATANDIKWAaa,\n" @@ -10680,7 +11033,7 @@ msgstr "" "kikola ku by'owandika awayingizibwa awa bulijjo.\n" "\n" -#: src/split.c:214 +#: src/split.c:216 #, fuzzy, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" @@ -10712,7 +11065,7 @@ msgstr "" " -l, --lines=BUNGI Buno ate bwe buleetera ekiragiro buli fayiro gye\n" " kikolawo butasukka mu nnyiriri BUNGI obuwanvu\n" -#: src/split.c:227 +#: src/split.c:229 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" @@ -10721,7 +11074,7 @@ msgstr "" " ebikwata ku mulimu buli lwe kiba kigenda\n" " kutandika fayiro ey'ekikoledwa empya\n" -#: src/split.c:234 +#: src/split.c:236 msgid "" "\n" "CHUNKS may be:\n" @@ -10733,189 +11086,194 @@ msgid "" "r/K/N likewise but only output Kth of N to stdout\n" msgstr "" -#: src/split.c:352 +#: src/split.c:354 #, c-format msgid "output file suffixes exhausted" msgstr "Obukomekkereza bwakuteeka ku zi-fayiro ze nkolawo buweddeyo" -#: src/split.c:364 +#: src/split.c:366 #, c-format msgid "creating file %s\n" msgstr "nkolawo fayiro %s\n" -#: src/split.c:377 +#: src/split.c:375 +#, c-format +msgid "%s would overwrite input; aborting" +msgstr "" + +#: src/split.c:391 #, fuzzy, c-format msgid "failed to set FILE environment variable" msgstr "nnemedwa okwongera %s ku nviromenti" -#: src/split.c:379 +#: src/split.c:393 #, c-format msgid "executing with FILE=%s\n" msgstr "" -#: src/split.c:381 +#: src/split.c:395 #, fuzzy, c-format msgid "failed to create pipe" msgstr "nnemedwa okukolawo enyunzi et'eyawudde %s" -#: src/split.c:395 +#: src/split.c:409 #, fuzzy, c-format msgid "closing prior pipe" msgstr "mbikka tterekero %s" -#: src/split.c:397 +#: src/split.c:411 #, fuzzy, c-format msgid "closing output pipe" msgstr "mbikka fayiro egenzemu ebizzibwa %s" -#: src/split.c:401 +#: src/split.c:415 #, fuzzy, c-format msgid "moving input pipe" msgstr "mbikka fayiro egyibwamu ebiyingizibwa %s" -#: src/split.c:403 +#: src/split.c:417 #, fuzzy, c-format msgid "closing input pipe" msgstr "mbikka fayiro egyibwamu ebiyingizibwa %s" -#: src/split.c:408 +#: src/split.c:422 #, fuzzy, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "nnemedwa okutandika ekiragiro %s" -#: src/split.c:414 +#: src/split.c:428 #, fuzzy, c-format msgid "failed to close input pipe" -msgstr "nnemedwa okubika %s" +msgstr "nnemedwa okugya koppi mu %s" -#: src/split.c:450 +#: src/split.c:464 #, fuzzy, c-format msgid "waiting for child process" msgstr "nnindirira mulimu ogwa strip" -#: src/split.c:460 +#: src/split.c:474 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "" -#: src/split.c:468 +#: src/split.c:482 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:475 src/timeout.c:449 +#: src/split.c:489 src/timeout.c:494 #, c-format msgid "unknown status from command (0x%X)" msgstr "ekiragiro kiraze ennamba y'embeera etategeereka (0x%X)" -#: src/split.c:1037 +#: src/split.c:1052 #, c-format msgid "cannot split in more than one way" msgstr "tekisoboka okumenyamu mu ngeri esukka mu emu" -#: src/split.c:1050 src/split.c:1192 src/split.c:1363 +#: src/split.c:1065 src/split.c:1205 src/split.c:1376 #, fuzzy, c-format msgid "%s: invalid number of chunks" msgstr "%s: buno obungi bwa sikonda tebukkirizibwa" -#: src/split.c:1054 +#: src/split.c:1069 #, fuzzy, c-format msgid "%s: invalid chunk number" msgstr "%s: eno namba tekola wano" -#: src/split.c:1106 +#: src/split.c:1119 #, c-format msgid "%s: invalid suffix length" msgstr "%s: akafundikwa tekakkirizibwa kwenkan'awo" -#: src/split.c:1131 src/split.c:1139 src/split.c:1162 src/split.c:1167 +#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180 #, c-format msgid "%s: invalid number of bytes" msgstr "%s: obwo obungi bwa bayiti tebusoboka" -#: src/split.c:1150 src/split.c:1297 +#: src/split.c:1163 src/split.c:1310 #, c-format msgid "%s: invalid number of lines" msgstr "%s: obwo obungi bw'ennyiriri tebusoboka" -#: src/split.c:1223 +#: src/split.c:1236 #, c-format msgid "line count option -%s%c... is too large" msgstr "akawayiro -%s%c... kateeka nyiriri eziyitiridde obungi" -#: src/split.c:1235 +#: src/split.c:1248 #, fuzzy, c-format msgid "%s: invalid start value for numerical suffix" msgstr "ennamba ey'olunyiriri tekkirizibwa: %s" -#: src/split.c:1263 +#: src/split.c:1276 #, fuzzy, c-format msgid "%s: invalid IO block size" msgstr "%s: buno obunene bwa fayiro tebukkirizibwa" -#: src/split.c:1284 +#: src/split.c:1297 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1321 +#: src/split.c:1334 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1356 +#: src/split.c:1369 #, 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:169 +#: src/stat.c:173 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:838 +#: src/stat.c:857 #, c-format msgid "failed to canonicalize %s" msgstr "nnemedwa okuzza %s mu mpandika eya bulijjo" -#: src/stat.c:1050 +#: src/stat.c:1069 #, fuzzy, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "" "kulabula: akabonero akufuula enneyisa ya bunnaako, '\\%c', tekategeerekese" -#: src/stat.c:1105 +#: src/stat.c:1124 #, c-format msgid "%s: invalid directive" msgstr "%s: okulagira kuno tekukola" -#: src/stat.c:1151 +#: src/stat.c:1170 #, c-format msgid "warning: backslash at end of format" msgstr "" "kulabula: ekigambo ekifuga empandika\n" "kikomekkerezedwa akasaze ak'akaddanyuma" -#: src/stat.c:1182 +#: src/stat.c:1201 #, 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:1189 +#: src/stat.c:1208 #, c-format msgid "cannot read file system information for %s" msgstr "sisbola okusoma embuulire ekwata ku %s mu sisitemu eya fayiro" -#: src/stat.c:1209 +#: src/stat.c:1228 #, 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:1245 +#: src/stat.c:1264 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -10926,7 +11284,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1268 +#: src/stat.c:1287 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -10934,30 +11292,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1278 +#: src/stat.c:1297 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:1286 +#: src/stat.c:1305 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:1295 +#: src/stat.c:1314 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:1305 +#: src/stat.c:1324 #, c-format msgid "Context: %C\n" msgstr "Olukusa lwa SELinux: %C\n" -#: src/stat.c:1313 +#: src/stat.c:1332 msgid "" "Access: %x\n" "Modify: %y\n" @@ -10965,10 +11323,13 @@ msgid "" " Birth: %w\n" msgstr "" -#: src/stat.c:1331 +#: src/stat.c:1350 +msgid "Display file or file system status.\n" +msgstr "" + +#: src/stat.c:1356 +#, fuzzy msgid "" -"Display file or file system status.\n" -"\n" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" @@ -10980,7 +11341,7 @@ msgstr "" " embeera eya fayiro, ekiragiro kiraga eya sisitemu\n" " eya fayiro yonna\n" -#: src/stat.c:1337 +#: src/stat.c:1360 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -11006,7 +11367,7 @@ msgstr "" "Ate kamu ku buno bwe kabaako, ekiragiro ebivaamu\n" " kibwandika mu bufunze\n" -#: src/stat.c:1348 +#: src/stat.c:1371 #, fuzzy msgid "" "\n" @@ -11029,7 +11390,7 @@ msgstr "" " bayiti\n" " %C - Kirage n'endukusa eza SELinux\n" -#: src/stat.c:1357 +#: src/stat.c:1380 #, fuzzy msgid "" " %d device number in decimal\n" @@ -11046,7 +11407,7 @@ msgstr "" " %g - ID eya guluupu nanyini gy'ali mu\n" " %G - Linnya lya guluupu nanyini gy'ali mu\n" -#: src/stat.c:1365 +#: src/stat.c:1388 #, fuzzy msgid "" " %h number of hard links\n" @@ -11070,7 +11431,7 @@ msgstr "" " %t - Kika ekikulu ekya kyuma, mu ki-hekisi\n" " %T - Kika ekito ekya kyuma, mu ki-hekisi\n" -#: src/stat.c:1376 +#: src/stat.c:1399 #, fuzzy msgid "" " %u user ID of owner\n" @@ -11101,7 +11462,7 @@ msgstr "" " okukyuka mu\n" "\n" -#: src/stat.c:1390 +#: src/stat.c:1413 #, fuzzy msgid "" "Valid format sequences for file systems:\n" @@ -11123,7 +11484,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:1399 +#: src/stat.c:1422 #, fuzzy msgid "" " %i file system ID in hex\n" @@ -11149,16 +11510,16 @@ msgid "Usage: %s OPTION... COMMAND\n" msgstr "Enkozesa entuufu eri: %s KAWAYIRO... KIRAGIRO\n" #: src/stdbuf.c:91 +#, fuzzy msgid "" "Run COMMAND, with modified buffering operations for its standard streams.\n" -"\n" msgstr "" "Ekiragiro kino kikozesebwa okutandika puloguramu oba okuyisa\n" "KIRAGIRO nga okyusizza n'engeri data gye bitambuza gy'eyitamu\n" "mu ggwanika zzibizi.\n" "\n" -#: src/stdbuf.c:98 +#: src/stdbuf.c:97 msgid "" " -i, --input=MODE adjust standard input stream buffering\n" " -o, --output=MODE adjust standard output stream buffering\n" @@ -11171,7 +11532,7 @@ msgstr "" " -e, --error=NGERI Kano kakyusa ngeri obubaka obufa ku kiremya\n" " gye buyitamu mu ggwanika zzibiza, n'eba NGERI\n" -#: src/stdbuf.c:105 +#: src/stdbuf.c:104 #, fuzzy msgid "" "\n" @@ -11183,7 +11544,7 @@ msgstr "" "okutuusa lwe muyingiramu ne bayiti etegeeza nti nkomerero y'olunyiriri.\n" "Akawayiro kano tekalina kye kakola ku biva awayingizibwa awa bulijjo.\n" -#: src/stdbuf.c:108 +#: src/stdbuf.c:107 #, fuzzy msgid "" "\n" @@ -11192,7 +11553,7 @@ msgstr "" "\n" "NGERI bwe kiba '0', data etambuzibwa teyita yo mu ggwanika zzibizi.\n" -#: src/stdbuf.c:111 +#: src/stdbuf.c:110 msgid "" "\n" "Otherwise MODE is a number which may be followed by one of the following:\n" @@ -11211,7 +11572,7 @@ msgstr "" "1024*1024,\n" "era ne G, T, P, E, Z ne Y bweyongera bwebutyo.\n" -#: src/stdbuf.c:117 +#: src/stdbuf.c:116 #, fuzzy msgid "" "\n" @@ -11231,17 +11592,17 @@ msgstr "" "mu\n" "ggwanika zzibizi n'olumu. Olw'ensonga eyo 'stdbuf' terina ky'egikolako.\n" -#: src/stdbuf.c:227 +#: src/stdbuf.c:226 #, fuzzy, c-format msgid "failed to find %s" msgstr "nemedwa okubikkula %s" -#: src/stdbuf.c:247 src/stdbuf.c:279 +#: src/stdbuf.c:246 src/stdbuf.c:278 #, c-format msgid "failed to update the environment with %s" msgstr "nnemedwa okwongera %s ku nviromenti" -#: src/stdbuf.c:321 +#: src/stdbuf.c:320 #, c-format msgid "line buffering stdin is meaningless" msgstr "" @@ -11249,7 +11610,7 @@ msgstr "" " awa bulijjo bisigalenga mu ggwanika zzibizi okutuusa\n" "lwe muyingiramu bayiti etegeeza nti nkomerero y'olunyiriri" -#: src/stty.c:509 +#: src/stty.c:513 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -11260,10 +11621,13 @@ msgstr "" " oba: %s [-F KYUMA | --file=KYUMA] [-a|--all]\n" " oba: %s [-F KYUMA | --file=KYUMA] [-g|--save]\n" -#: src/stty.c:515 +#: src/stty.c:519 +msgid "Print or change terminal characteristics.\n" +msgstr "" + +#: src/stty.c:525 +#, fuzzy msgid "" -"Print or change terminal characteristics.\n" -"\n" " -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" @@ -11280,7 +11644,7 @@ msgstr "" " KYUUMA mu kifo eky'ekiwandikiro oba omutwe ogwa\n" " bulijjo\n" -#: src/stty.c:524 +#: src/stty.c:532 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -11296,7 +11660,7 @@ msgstr "" "z'osobola kulonda kisinzira ku sisitemu ey'oku kompyuta yo\n" "\n" -#: src/stty.c:529 +#: src/stty.c:537 msgid "" "\n" "Special characters:\n" @@ -11322,7 +11686,7 @@ msgstr "" " kifuga, KABONERO ke kalaga awali enkomerero " "y'olunyiriri\n" -#: src/stty.c:536 +#: src/stty.c:544 msgid "" " * eol2 CHAR alternate CHAR for ending the line\n" " erase CHAR CHAR will erase the last character typed\n" @@ -11341,7 +11705,7 @@ msgstr "" " kill KABONERO Bino bitegeka nti bw'oyingiza KABONERO, olunyiriri\n" " lw'oliko lwonna lugibwawo\n" -#: src/stty.c:542 +#: src/stty.c:550 msgid "" " * lnext CHAR CHAR will enter the next character quoted\n" " quit CHAR CHAR will send a quit signal\n" @@ -11359,7 +11723,7 @@ msgstr "" " mu mulimu ogwa pulogulamu efugibwa ekiwandikiro kyo,\n" " bw'oyingiza KABONERO ebivaamu ebyo biddamu okukolebwa\n" -#: src/stty.c:548 +#: src/stty.c:556 msgid "" " stop CHAR CHAR will stop the output\n" " susp CHAR CHAR will send a terminal stop signal\n" @@ -11378,7 +11742,7 @@ msgstr "" " * werase KABONERO Bino byo bitegeka nti bw'oyingiza KABONERO, ekigambo\n" " kyewasembye kuwandika kigibwawo\n" -#: src/stty.c:554 +#: src/stty.c:562 msgid "" "\n" "Special settings:\n" @@ -11395,7 +11759,7 @@ msgstr "" " bikolera ku nkumbo N\n" " * columns N Kino kyekimu ne cols N\n" -#: src/stty.c:561 +#: src/stty.c:569 msgid "" " ispeed N set the input speed to N\n" " * line N use line discipline N\n" @@ -11414,7 +11778,7 @@ msgstr "" " ospeed N Kino kitegeka nti ekiwandikiro oba omutwe biwereza\n" " ebivaamu ku bwangu obwa N\n" -#: src/stty.c:567 +#: src/stty.c:575 msgid "" " * rows N tell the kernel that the terminal has N rows\n" " * size print the number of rows and columns according to the " @@ -11435,13 +11799,15 @@ msgstr "" " nga tekinnawerezebwa bubonero obulala, bwe kirinawo\n" " kibusindika ku kigendererwa kya bwo\n" -#: src/stty.c:573 +#: src/stty.c:581 +#, fuzzy msgid "" "\n" "Control settings:\n" " [-]clocal disable modem control signals\n" " [-]cread allow input to be received\n" " * [-]crtscts enable RTS/CTS handshaking\n" +" * [-]cdtrdsr enable DTR/DSR handshaking\n" " csN set character size to N bits, N in [5..8]\n" msgstr "" "\n" @@ -11454,7 +11820,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:581 +#: src/stty.c:590 #, fuzzy msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" @@ -11462,7 +11828,7 @@ msgid "" " [-]hupcl same as [-]hup\n" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" -" [-]parodd set odd parity (even with '-')\n" +" [-]parodd set odd parity (or even parity with '-')\n" msgstr "" " [-]cstopb Kino kitegeka nti buli kabonero akawerezebwa " "kagenderako\n" @@ -11481,7 +11847,7 @@ msgstr "" " ezikozesebwa kukakasa obutuufu bwabyo zigifuula\n" " etagabanizika mu bbiri\n" -#: src/stty.c:588 +#: src/stty.c:597 msgid "" "\n" "Input settings:\n" @@ -11504,7 +11870,7 @@ msgstr "" " [-]igncr Kino kitegeka nti tty tegoberera kiragiro eky'akabonero\n" " akalagira akasonga okudda ku ntandikwa y'olunyiriri\n" -#: src/stty.c:596 +#: src/stty.c:605 msgid "" " [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" @@ -11531,14 +11897,14 @@ msgstr "" " bigyamu biti ey'omanaana ey'oku buli kabonero\n" " akabiwerezebwa\n" -#: src/stty.c:603 +#: src/stty.c:612 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:606 +#: src/stty.c:615 msgid "" " * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" @@ -11569,7 +11935,7 @@ msgstr "" " endala bbiri ez'okukalamba\n" " [-]tandem Kino kyekimu ne [-]ixoff\n" -#: src/stty.c:614 +#: src/stty.c:623 msgid "" "\n" "Output settings:\n" @@ -11604,7 +11970,7 @@ msgstr "" "kikasindika\n" " ku kigenderwa ekirala. N esobola okuba 0 oba 1\n" -#: src/stty.c:622 +#: src/stty.c:631 msgid "" " * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of null characters\n" @@ -11638,7 +12004,7 @@ msgstr "" " lunyiriri lupya kava ku nkola eyo ne kaba nga kalagira\n" " akasonga kudda ku ntandikwa y'olunyiriri\n" -#: src/stty.c:630 +#: src/stty.c:639 msgid "" " * [-]onocr do not print carriage returns in the first column\n" " [-]opost postprocess output\n" @@ -11666,7 +12032,7 @@ msgstr "" " olw'omubusimba ne lwe kituukiriza ekiragiro ekyo oba\n" " akabonero ne kikasindika. N esobola kuba 0 oba 1\n" -#: src/stty.c:638 +#: src/stty.c:647 msgid "" "\n" "Local settings:\n" @@ -11687,7 +12053,7 @@ msgstr "" " olunyiriri lwonna kituukirizibwa ku nkola eleetebwawo\n" " 'echoctl' ne 'echok'\n" -#: src/stty.c:645 +#: src/stty.c:654 #, fuzzy msgid "" " * [-]ctlecho echo control characters in hat notation ('^c')\n" @@ -11710,7 +12076,7 @@ msgstr "" "akalagira\n" " kutandika lunyiriri lupya\n" -#: src/stty.c:652 +#: src/stty.c:661 #, fuzzy msgid "" " * [-]echoke same as [-]crtkill\n" @@ -11735,7 +12101,7 @@ msgstr "" " [-]iexten Kino kyo kitegeka nti osobola okukozesa obubonero\n" " obutagoberera mutindo ogwa POSIX\n" -#: src/stty.c:659 +#: src/stty.c:668 #, fuzzy msgid "" " [-]isig enable interrupt, quit, and suspend special characters\n" @@ -11763,7 +12129,7 @@ msgstr "" " okozesa obubonero `\\' okukyusa enkola y'obubonero\n" " obukozesa ennukuta ennene okuva ku eya bulijjo\n" -#: src/stty.c:666 +#: src/stty.c:675 msgid "" "\n" "Combination settings:\n" @@ -11777,7 +12143,7 @@ msgstr "" " cbreak Kino kikola kimu ne '-icanon'\n" " -cbreak Kino kikola kimu ne 'icanon'\n" -#: src/stty.c:673 +#: src/stty.c:682 msgid "" " cooked same as brkint ignpar istrip icrnl ixon opost isig\n" " icanon, eof and eol characters to their default values\n" @@ -11792,7 +12158,7 @@ msgstr "" " -cooked Kino kikola kimu ne 'raw'\n" " crt Kino kikola ng'eyagattise 'echoe echoctl echoke'\n" -#: src/stty.c:679 +#: src/stty.c:688 msgid "" " dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" " kill ^u\n" @@ -11810,7 +12176,7 @@ msgstr "" " obubireetawo obwa bulijjo\n" " evenp Kino kikola ng'eyagattise 'parenb -parodd cs7'\n" -#: src/stty.c:686 +#: src/stty.c:695 msgid "" " -evenp same as -parenb cs8\n" " * [-]lcase same as xcase iuclc olcuc\n" @@ -11827,7 +12193,7 @@ msgstr "" " -nl Kino kikola ng'eyagattise 'icrnl -inlcr -igncr onlcr\n" " -ocrnl -onlret'\n" -#: src/stty.c:694 +#: src/stty.c:703 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -11841,7 +12207,7 @@ msgstr "" " pass8 Kino kikola ng'eyagattise '-parenb -istrip cs8'\n" " -pass8 Kino kikola ng'eyagattise 'parenb istrip cs7'\n" -#: src/stty.c:701 +#: src/stty.c:710 msgid "" " raw same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" " -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n" @@ -11854,7 +12220,7 @@ msgstr "" " -imaxbel -opost -isig -icanon -xcase min 1 time 0'\n" " -raw Kino kikola kimu ne 'cooked'\n" -#: src/stty.c:707 +#: src/stty.c:716 msgid "" " sane same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" " -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n" @@ -11871,7 +12237,7 @@ msgstr "" " ate kizz'ebiragiro ebirala ebireetebwa ku bubonero\n" " obwayawulwamu ku bubonero bwa byo obwa bulijjo.\n" -#: src/stty.c:715 +#: src/stty.c:724 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -11898,12 +12264,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:787 +#: src/stty.c:796 #, c-format msgid "only one device may be specified" msgstr "Oteekangawo linnya lya kyuma kimu kyokka" -#: src/stty.c:817 +#: src/stty.c:826 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" @@ -11912,156 +12278,51 @@ msgstr "" "akawayiro ak'okuwandika mu ngeri etegeereka bantu n'ak'okuwandika\n" "mu ngeri esobola okukozesebwa nga agumenti tebukukozesebwa wamu" -#: src/stty.c:823 +#: src/stty.c:832 #, 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:838 +#: src/stty.c:847 #, 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:883 src/stty.c:993 +#: src/stty.c:892 src/stty.c:1002 #, c-format msgid "invalid argument %s" msgstr "agumenti %s tekola wano" -#: src/stty.c:894 src/stty.c:911 src/stty.c:923 src/stty.c:936 src/stty.c:948 -#: src/stty.c:968 +#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957 +#: src/stty.c:977 #, c-format msgid "missing argument to %s" msgstr "agumenti %s tekola wano" -#: src/stty.c:974 +#: src/stty.c:983 #, c-format msgid "invalid line discipline %s" msgstr "entegeka ey'ebisindikibwa, %s, tekola" -#: src/stty.c:1044 +#: src/stty.c:1053 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s: tekisobose okukola emikolo gyonna egisabidwa" -#: src/stty.c:1390 +#: src/stty.c:1399 #, c-format msgid "%s: no size information for this device" msgstr "%s: tewali biraga ebifa ku bunene obw'ekyuma kino" -#: src/stty.c:1904 +#: src/stty.c:1920 #, c-format msgid "invalid integer argument %s" msgstr "'%s' tekkirizibwa nga agumenti ey'ekika kya nnamba enzijivu" -#: src/su.c:229 -msgid "Password:" -msgstr "Kigambo ekikuumi:" - -#: src/su.c:232 -#, c-format -msgid "getpass: cannot open /dev/tty" -msgstr "getpass: tekisobose kubikkula /dev/tty" - -#: src/su.c:290 -#, c-format -msgid "cannot set groups" -msgstr "nnemedwa okutegeka guluupu" - -#: src/su.c:294 -#, c-format -msgid "cannot set group id" -msgstr "nnemedwa okutegeka ennamba eya guluupu" - -#: src/su.c:296 -#, c-format -msgid "cannot set user id" -msgstr "nnemedwa okutegeka ennamba ey'omukozesa" - -#: src/su.c:371 -#, c-format -msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" -msgstr "Enkozesa entuufu eri: %s [KAWAYIRO]... [-] [MUKOZESA [AGUMENTI]...]\n" - -#: src/su.c:372 -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 "" -"Ekiragiro kino bw'okiyisa by'oddako okukolera mu\n" -"kiwandikiro mw'okiyisizza biba n'obuyinza obujjira\n" -"ku namba-ya-mukozesa ne-namba-ya-guluupu ebya MUKOZESA\n" -"\n" -" -, -l, --login Buno obuwayiro bukufuula nga MUKOZESA ye\n" -" yaggudewo ekiwandikiro ekipya.\n" -" Enviromenti ofuna eyategekebwa MUKOZESA,\n" -" ebigambo ebifuga enviromenti ebibaddewo\n" -" nga tonnayisa ekiragiro byo ne birekerawo\n" -" okukola ebya MUKOZESA byo ne biba nga bye\n" -" bikola\n" -" -c, --commmand=KIRAGIRO Ekiragiro bw'okiyisa ne kamu ku buno, ozuukusa\n" -" enzivvunuzi n'esobozesa KIRAGIRO okukola " -"omulimu\n" -" gwakyo. Tewajjawo kiwandikiro kipya\n" -" -f, --fast Bw'okozesa kamu ku buno nga okolera ku " -"nzivvunuzi\n" -" ey'ekika kya 'csh' oba 'tcsh', enzivvunuzi " -"empya\n" -" gy'ofuna okolere ku buyinza obwa MUKOZESA " -"tekisooka\n" -" kusoma fayiro ye eya .cshrc\n" -" -m, --preserve-environment Bw'okozesa kamu ku buno ate, enviromenti " -"tekyuka\n" -" ng'otandise okukolera ku buyinza bwa MUKOZESA,\n" -" esigala nga bweyabadde nga tonnayisa kiragiro\n" -" -p Kino kikola kimu ne '-m'\n" -" -s, --shell=NZIVVUNUZI Bw'okozesa ku buwayiro buno, bw'otandika " -"kukolera\n" -" ku buyinza obupya obeera okulera ku nzivvunuzi\n" -" eya kika kya NZUVVUNUZI, singa eyo kweri ku\n" -" lukalala '/etc/shells'\n" - -#: src/su.c:384 -msgid "" -"\n" -"A mere - implies -l. If USER not given, assume root.\n" -msgstr "" -"\n" -"Ekiragiro bw'okiwerekezako ka '-' kokka, kiba kyekimu n'okussawo\n" -"akawayiro '-l'. Bw'otateekako agumenti ey'erinnya lya mukozesa, ekiragiro\n" -"kikuwa buyinza obwa root - omuteesiteesi wa sisitemu.\n" - -#: src/su.c:461 -#, c-format -msgid "user %s does not exist" -msgstr "tewali mukozesa ayitibwa %s" - -#: src/su.c:484 -#, c-format -msgid "incorrect password" -msgstr "ekigambo ekikuumi ky'owandise kisobu" - -#: src/su.c:501 -#, c-format -msgid "using restricted shell %s" -msgstr "" -"kakati okozesa enzivvunuzi ey'ekika kya %s etali mu nkalala ez'oku sisitemu " -"eno" - -#: src/su.c:509 -#, c-format -msgid "warning: cannot change directory to %s" -msgstr "kulabula: sisobala okubuuka kuyingira mu tterekero %s" - #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 msgid "Kayvan Aghaiepour" @@ -12099,7 +12360,7 @@ msgstr "" msgid "ignoring all arguments" msgstr "agumenti zonna nzibodde" -#: src/system.h:340 +#: src/system.h:343 #, c-format msgid "" "\n" @@ -12116,19 +12377,28 @@ msgstr "" "kebera ebiwandiko ebikwata ku nzivvuunuzi okumanya obuwayiro " "obugigenderako.\n" -#: src/system.h:346 +#: src/system.h:349 msgid " --help display this help and exit\n" msgstr "" " --help Kano kaleetera ekiragiro okukoma ku kulaga okunnyonyola " "kuno\n" -#: src/system.h:348 +#: src/system.h:351 msgid " --version output version information and exit\n" msgstr "" " --version Kano ko kakireetera okukoma ku kulaga ebifa ku mutindo gwa " "kyo\n" -#: src/system.h:541 +#: src/system.h:544 +#, fuzzy +msgid "" +"\n" +"Mandatory arguments to long options are mandatory for short options too.\n" +msgstr "" +"Agumenti ezibeera ez'etteeka ku buwayiro obujjuvu era ziba za tteeka ne\n" +"ku buwayiro obufunze.\n" + +#: src/system.h:552 msgid "" "\n" "SIZE is an integer and optional unit (example: 10M is 10*1024*1024). Units\n" @@ -12136,7 +12406,7 @@ msgid "" "1000).\n" msgstr "" -#: src/system.h:550 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -12152,7 +12422,7 @@ 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:560 +#: src/system.h:571 #, c-format msgid "" "\n" @@ -12165,25 +12435,25 @@ msgstr "" #. <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:574 +#: src/system.h:585 #, 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:578 +#: src/system.h:589 #, 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:585 +#: src/system.h:596 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "Wandika '%s --help' oyongere okuwebwa amagezi.\n" -#: src/system.h:617 +#: src/system.h:628 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -12204,10 +12474,10 @@ 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" -"\n" msgstr "" "Ekiragiro kino kisoma zi FAYIRO, buli emu ebigirimu ne kibiwandikira\n" "awateekebwa ebivaamu awa bulijjo. Ebiri mu FAYIRO ekiragiro bwe " @@ -12218,7 +12488,7 @@ msgstr "" "ekiragiro kirinda kukola ku biva awayingizibwa awa bulijjo.\n" "\n" -#: src/tac.c:145 +#: src/tac.c:144 msgid "" " -b, --before attach the separator before instead of after\n" " -r, --regex interpret the separator as a regular expression\n" @@ -12240,42 +12510,42 @@ msgstr "" " y'ekiwandise, mu kifo eky'obubonero obulagira\n" " kutandika lunyiriri olupya\n" -#: src/tac.c:235 src/tac.c:336 +#: src/tac.c:234 src/tac.c:335 #, c-format msgid "%s: seek failed" msgstr "%s: tekisobose kutereeza aw'okusoma mu fayiro" -#: src/tac.c:264 +#: src/tac.c:263 #, c-format msgid "record too large" msgstr "ekiwandise kiyitiridde obunene" -#: src/tac.c:451 +#: src/tac.c:450 #, fuzzy, c-format msgid "failed to create temporary file in %s" msgstr "sisobola okukolawo fayiro ey'ekiseerabuseera mu %s" -#: src/tac.c:459 +#: src/tac.c:458 #, fuzzy, c-format msgid "failed to open %s for writing" msgstr "%s nnemedwa okugibikkula kugiwandikamu" -#: src/tac.c:476 +#: src/tac.c:475 #, fuzzy, c-format msgid "failed to rewind stream for %s" msgstr "nemedwa okukuuma `saawa' ez'oku %s" -#: src/tac.c:512 src/tac.c:519 +#: src/tac.c:511 src/tac.c:518 #, c-format msgid "%s: write error" msgstr "%s: wazzewo kiremya mu kuwandika" -#: src/tac.c:572 +#: src/tac.c:571 #, fuzzy, c-format msgid "failed to open %s for reading" msgstr "sisobodde okubikkula %s kugisoma" -#: src/tac.c:630 +#: src/tac.c:629 #, c-format msgid "separator cannot be empty" msgstr "tekikkirizibwa butaba na kabonero k'awula mu biwandise" @@ -12286,12 +12556,11 @@ msgid "Ian Lance Taylor" msgstr "Ian Lance Taylor" #: src/tail.c:262 -#, c-format +#, fuzzy, 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" -"\n" msgstr "" "Ekiragiro kino kiwandika ennyiriri %d ezisembayo ez'omu buli FAYIRO, nga\n" "kiwandikira awateekebwa ebivaamu awa bulijjo.\n" @@ -12302,7 +12571,7 @@ msgstr "" "olwo kirinda ebiva awayingizibwa awa bulijjo\n" "\n" -#: src/tail.c:271 +#: src/tail.c:270 msgid "" " -c, --bytes=K output the last K bytes; alternatively, use -c " "+K\n" @@ -12316,7 +12585,7 @@ msgstr "" " bayiti K okuva ku ntandikwa ya yo ne kiwandika\n" " ebigirimu okuva awo\n" -#: src/tail.c:275 +#: src/tail.c:274 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -12339,7 +12608,7 @@ msgstr "" " kyeyongere okukikolako. Kino kye kimu n'okussawo\n" " --follow=name --retry\n" -#: src/tail.c:282 +#: src/tail.c:281 #, fuzzy, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -12367,7 +12636,7 @@ msgstr "" " linnya, oba, bw'eba nga nnyunzi kw'ebadde egguka\n" " evuddewo.\n" -#: src/tail.c:295 +#: src/tail.c:294 msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" " -q, --quiet, --silent never output headers giving file names\n" @@ -12387,7 +12656,7 @@ msgstr "" " bw'egira n'eba nga evuddewoko. Kano tekagasa\n" " okugyako nga kuliko n'akawayiro '--follow=name'\n" -#: src/tail.c:302 +#: src/tail.c:301 #, fuzzy msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" @@ -12404,7 +12673,7 @@ msgstr "" " okuwandikangawo emitwe egiraga zifayiro\n" " ebintu mwe biva\n" -#: src/tail.c:311 +#: src/tail.c:310 #, fuzzy msgid "" "\n" @@ -12427,7 +12696,7 @@ msgstr "" "n'obubonero T, P, E, Z, Y bweyongera mu ngeri eyo.\n" "\n" -#: src/tail.c:320 +#: src/tail.c:319 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" @@ -12443,71 +12712,71 @@ msgstr "" "fayiro kigera ebiseera ne kigibikka ate ne kiddamu okugibikkula kisobola\n" "okutegeera oba erinnya eryo litwalidwa ku fayiro endala.\n" -#: src/tail.c:379 +#: src/tail.c:378 #, c-format msgid "closing %s (fd=%d)" msgstr "mbikka %s (fd=%d)" -#: src/tail.c:454 +#: 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:458 +#: src/tail.c:457 #, 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:895 +#: src/tail.c:894 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "%s sigirabye. kati ngirindirira okulabika" -#: src/tail.c:907 -#, fuzzy, c-format +#: src/tail.c:906 +#, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" -msgstr "%s sigirabye. kati ngirindirira okulabika" +msgstr "" -#: src/tail.c:964 +#: src/tail.c:963 #, c-format msgid "%s has become inaccessible" msgstr "%s tekyatuukikako" -#: src/tail.c:981 +#: src/tail.c:980 #, 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:990 +#: src/tail.c:989 #, 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:1011 +#: src/tail.c:1010 #, c-format msgid "%s has become accessible" msgstr "%s tekyatuukikako" -#: src/tail.c:1019 +#: src/tail.c:1018 #, c-format msgid "%s has appeared; following end of new file" msgstr "%s erabise; ntadise kugoberera ebigyongerwako" -#: src/tail.c:1030 +#: src/tail.c:1029 #, 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:1131 +#: src/tail.c:1130 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "" @@ -12951,17 +13220,22 @@ msgstr "kubulako ka ']'" msgid "extra argument %s" msgstr "%s agumenti ya nfissi" -#: src/timeout.c:124 +#: src/timeout.c:112 +#, c-format +msgid "warning: sigprocmask" +msgstr "" + +#: src/timeout.c:145 #, c-format msgid "warning: timer_settime" msgstr "" -#: src/timeout.c:129 +#: src/timeout.c:150 #, c-format msgid "warning: timer_create" msgstr "" -#: src/timeout.c:204 +#: src/timeout.c:225 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -12970,11 +13244,9 @@ msgstr "" "Enkozesa entuufu eri: %s [KAWAYIRO] KISEERA KIRAGIRO [AGUMENTI]...]\n" " oba: %s [KAWAYIRO]\n" -#: src/timeout.c:208 -msgid "" -"Start COMMAND, and kill it if still running after DURATION.\n" -"\n" -"Mandatory arguments to long options are mandatory for short options too.\n" +#: src/timeout.c:229 +#, fuzzy +msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "" "Ekiragiro kino kitandika MULIMU ne kitagukkiriza kubumbujjira ekiseera\n" "ekisukka mu KISEERA.\n" @@ -12982,9 +13254,12 @@ msgstr "" "Agumenti ezibeera ez'etteeka ku buwayiro obujjuvu era ziba za tteeka ne\n" "ku buwayiro obufunze.\n" -#: src/timeout.c:213 +#: src/timeout.c:235 #, fuzzy msgid "" +" --preserve-status\n" +" exit with the same status as COMMAND, even when the\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 " @@ -13016,7 +13291,7 @@ msgstr "" " Ob'oyagala kulaba olukalala lw'ebiragiro ebya sisitemu,\n" " tandika omulimu ogwa 'kill -l'.\n" -#: src/timeout.c:229 +#: src/timeout.c:254 #, fuzzy msgid "" "\n" @@ -13034,16 +13309,16 @@ msgstr "" "Bw'otossawo KATANDIKWA, KISEERA ziba sikonda.\n" "\n" -#: src/timeout.c:234 +#: src/timeout.c:259 #, fuzzy msgid "" "\n" -"If the command times out, then exit with status 124. Otherwise, exit\n" -"with the status of COMMAND. If no signal is specified, send the TERM\n" -"signal upon timeout. The TERM signal kills any process that does not\n" -"block or catch that signal. For other processes, it may be necessary to\n" -"use the KILL (9) signal, since this signal cannot be caught. If the\n" -"KILL (9) signal is sent, the exit status is 128+9 rather than 124.\n" +"If the command times out, and --preserve-status is not set, then exit with\n" +"status 124. Otherwise, exit with the status of COMMAND. If no signal\n" +"is specified, send the TERM signal upon timeout. The TERM signal kills\n" +"any process that does not block or catch that signal. It may be necessary\n" +"to use the KILL (9) signal, since this signal cannot be caught, in which\n" +"case the exit status is 128+9 rather than 124.\n" msgstr "" "\n" "MULIMU bwe gukomekkerezebwa olw'okutuuka ku kkomo ly'obudde lye\n" @@ -13051,14 +13326,19 @@ msgstr "" "terinnatuuka, emmala yagwo eba yagwo eya bulijjo. Emirimu egimu\n" "tegiwulira 'TERM' era gyo gyetaaga kugisindikira ekya KILL (9).\n" -#: src/timeout.c:419 +#: src/timeout.c:363 +#, c-format +msgid "warning: disabling core dumps failed" +msgstr "" + +#: src/timeout.c:471 #, c-format msgid "error waiting for command" msgstr "wazzewo kiremya mu kulindirira kiragiro" -#: src/timeout.c:441 +#: src/timeout.c:482 #, c-format -msgid "warning: disabling core dumps failed" +msgid "the monitored command dumped core" msgstr "" #. This is a proper name. See the gettext manual, section Names. @@ -13071,22 +13351,23 @@ msgstr "Jim Kingdon" msgid "Randy Smith" msgstr "Randy Smith" -#: src/touch.c:115 src/touch.c:313 +#: src/touch.c:115 src/touch.c:309 #, c-format msgid "invalid date format %s" msgstr "entereeza ey'obudde, %s, tekkirizibwa" -#: src/touch.c:194 +#: src/touch.c:191 #, c-format msgid "cannot touch %s" msgstr "nnemedwa okukola ku %s" -#: src/touch.c:200 +#: src/touch.c:197 #, c-format msgid "setting times of %s" msgstr "nteeka ebiseera eby'oku %s" -#: src/touch.c:216 +#: src/touch.c:213 +#, fuzzy msgid "" "Update the access and modification times of each FILE to the current time.\n" "\n" @@ -13095,7 +13376,6 @@ msgid "" "\n" "A FILE argument string of - is handled specially and causes touch to\n" "change the times of the file associated with standard output.\n" -"\n" msgstr "" "Ekiragiro kino kiyita mu buli FAYIRO nga kitumbula obulambe bwayo\n" "obulaga ebiseera kwe yasembera okubikkulwa ne kwe yasembera okukyusibwamu\n" @@ -13110,7 +13390,7 @@ msgstr "" "ebivaamu awa bulijjo\n" "\n" -#: src/touch.c:229 +#: src/touch.c:225 msgid "" " -a change only the access time\n" " -c, --no-create do not create any files\n" @@ -13125,7 +13405,7 @@ msgstr "" " obudde BUDDE\n" " -f (Kano kaadibizibwa, tekakyakola)\n" -#: src/touch.c:235 +#: src/touch.c:231 msgid "" " -h, --no-dereference affect each symbolic link instead of any " "referenced\n" @@ -13142,11 +13422,12 @@ msgstr "" " -m Kano ate kakireetera okukyusako obudde fayiro\n" " kwe yasembera okukyusibwaamu bwokka\n" -#: src/touch.c:241 +#: 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" -" --time=WORD change the specified time:\n" +" --time=WORD change the specified time:\n" " WORD is access, atime, or use: equivalent to -a\n" " WORD is modify or mtime: equivalent to -m\n" msgstr "" @@ -13161,7 +13442,7 @@ msgstr "" " modify (ekivaamu kiba kimu ne 'touch -m')\n" " mtime (ekivaamu kiba kimu ne 'touch -m')\n" -#: src/touch.c:250 +#: src/touch.c:246 msgid "" "\n" "Note that the -d and -t options accept different time-date formats.\n" @@ -13170,12 +13451,12 @@ msgstr "" "Genderera nti empandika ey'obudde akawayiro -d gye kakozesa ssi y'emu n'eyo\n" "akawayiro -t gye kakozesa.\n" -#: src/touch.c:339 +#: src/touch.c:335 #, c-format msgid "cannot specify times from more than one source" msgstr "sisobola obudda okubugya mu bifo ebisukka mu kimu" -#: src/touch.c:413 +#: src/touch.c:409 #, fuzzy, c-format msgid "" "warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'" @@ -13538,6 +13819,7 @@ msgid "Usage: %s OPTION... FILE...\n" msgstr "Enkozesa entuufu eri: %s KAWAYIRO... FAYIRO...\n" #: src/truncate.c:97 +#, fuzzy msgid "" "Shrink or extend the size of each FILE to the specified size\n" "\n" @@ -13546,7 +13828,6 @@ msgid "" "If a FILE is larger than the specified size, the extra data is lost.\n" "If a FILE is shorter, it is extended and the extended part (hole)\n" "reads as zero bytes.\n" -"\n" msgstr "" "Ekiragiro kino kikozesebwa okwongera oba\n" "okukendeeza obunene obwa FAYIRO\n" @@ -13558,13 +13839,13 @@ msgstr "" "Ekitundu ekyongedwamu kiba kyereere.\n" "\n" -#: src/truncate.c:110 +#: src/truncate.c:109 msgid " -c, --no-create do not create any files\n" msgstr "" " -c, --no-create Kamu ku buno bwe kabako ekiragiro tekikolawo\n" " fayiro\n" -#: src/truncate.c:113 +#: src/truncate.c:112 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" @@ -13572,7 +13853,7 @@ msgstr "" "ennamba\n" " kigitwala nga obungi bwa buloka mu kifo kya bayiti\n" -#: src/truncate.c:116 +#: 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" @@ -13583,7 +13864,7 @@ msgstr "" " -s, --size=BUNENE Buno bwo bukireetera okutegeka\n" " obunene obwa fayiro ne buba BUNENE\n" -#: src/truncate.c:122 +#: src/truncate.c:121 #, fuzzy msgid "" "\n" @@ -13604,65 +13885,65 @@ msgstr "" " gy'osobola okugabizaamu BUNENE. Bw'ebulako oba bw'esukkako ku BUNENE,\n" " eyongezebwko okutuusa lw'esobola okugabizibwamu BUNENE.\n" -#: src/truncate.c:150 +#: src/truncate.c:149 #, c-format msgid "overflow in %<PRIdMAX> * %<PRIdMAX> byte blocks for file %s" msgstr "" "obungi bwa bayiti, %<PRIdMAX> * %<PRIdMAX>, ez'oku\n" "fayiro %s nnamba etajja mu ggwanika zzibizi" -#: src/truncate.c:174 +#: src/truncate.c:173 #, c-format msgid "%s has unusable, apparently negative size" msgstr "obunene obwa %s buliko kiremya, bulabika ng'ennamba ey'ebbanja" -#: src/truncate.c:184 src/truncate.c:379 +#: src/truncate.c:183 src/truncate.c:384 #, c-format msgid "cannot get the size of %s" msgstr "sisobola okuzuula obunene obwa %s" -#: src/truncate.c:206 +#: src/truncate.c:205 #, c-format msgid "overflow rounding up size of file %s" msgstr "" "okwongerako katono ku bunene obwa fayiro %s kuleesewo\n" "ennamba etajja mu ggwanika zzibizi" -#: src/truncate.c:216 +#: src/truncate.c:215 #, c-format msgid "overflow extending size of file %s" msgstr "" "okwongera ku bunene obwa fayiro %s kuleesewo\n" "ennamba etajja mu ggwanika zzibizi" -#: src/truncate.c:231 +#: src/truncate.c:230 #, c-format msgid "failed to truncate %s at %<PRIdMAX> bytes" msgstr "nnemedwa %s okugitemamu esigalemu bayiti %<PRIdMAX>" -#: src/truncate.c:305 +#: src/truncate.c:303 #, c-format msgid "multiple relative modifiers specified" msgstr "" "fayiro ezifuga enkyuka mu bunene bwa\n" "zinnaazo otegese esukka mu emu" -#: src/truncate.c:335 +#: src/truncate.c:333 #, c-format msgid "you must specify either %s or %s" msgstr "oteekwa okutegekawo kimu ku %s oba %s" -#: src/truncate.c:342 +#: src/truncate.c:340 #, c-format msgid "you must specify a relative %s with %s" msgstr "oteekwa okutegekawo %s awali %s" -#: src/truncate.c:349 +#: src/truncate.c:347 #, c-format msgid "%s was specified but %s was not" msgstr "%s kitegekedwa naye %s kyo tekitegekedwa" -#: src/truncate.c:400 +#: src/truncate.c:404 #, c-format msgid "cannot open %s for writing" msgstr "nnemedwa okubikkula %s ngiwandikemu" @@ -13776,10 +14057,10 @@ msgid "cannot get system name" msgstr "nnemedwa okufuna erinnya lya sistemu eno" #: 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" -"\n" msgstr "" "Ekiragiro kino buli we kisanga akabonero akategeeza akabanga akatwala\n" "ekifo ekimu mu FAYIRO kizzawo akategeeza oluseetuka.\n" @@ -13787,7 +14068,7 @@ msgstr "" "by'oteeka awateekebwa ebiyingizibwa awa bulijjo.\n" "\n" -#: src/unexpand.c:125 +#: src/unexpand.c:124 msgid "" " -a, --all convert all blanks, instead of just initial blanks\n" " --first-only convert only leading sequences of blanks (overrides -a)\n" @@ -13818,12 +14099,12 @@ msgstr "" " nga gigenda gy'eyongera bunene. (buno nabwo bukireetera\n" " okukola nga eyataddewo aka '-a')\n" -#: src/unexpand.c:153 +#: src/unexpand.c:152 #, c-format msgid "tabs are too far apart" msgstr "enseetuka ziyitiridde okwesuulagana" -#: src/unexpand.c:505 +#: src/unexpand.c:504 #, c-format msgid "tab stop value is too large" msgstr "obuwanvu bw'enseetuka buyitiridde obunene" @@ -13834,12 +14115,12 @@ msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n" msgstr "Enkozesa entuufu eri: %s [KAWAYIRO]... [EBIYINGIZIBWA [EBIVAAMU]]\n" #: src/uniq.c:138 +#, fuzzy 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" -"\n" msgstr "" "Ekiragiro kino kisoma mu fayiro EBIYINGIZIBWA (oba bye\n" "kisanga awayingizibwa awa bulijjo), buli lwe kituuka ku nnyiriri\n" @@ -13850,7 +14131,7 @@ msgstr "" "ng'ate ziriraanaganye ekiragiro kiwandikako koppi emu yokka.\n" "\n" -#: src/uniq.c:148 +#: src/uniq.c:147 msgid "" " -c, --count prefix lines by the number of occurrences\n" " -d, --repeated only print duplicate lines\n" @@ -13862,7 +14143,7 @@ msgstr "" " -d, --repeated Ate bw'ossawo kamu ku buno ekiragiro tekiwandika\n" " nnyiriri ezitalina zifaanagana nazo eziriraanaganye\n" -#: src/uniq.c:152 +#: src/uniq.c:151 msgid "" " -D, --all-repeated[=delimit-method] print all duplicate lines\n" " delimit-method={none(default),prepend,separate}\n" @@ -13905,7 +14186,7 @@ msgstr "" "akalagira\n" " kutandika lupya, kiteekawo bayiti eya 0.\n" -#: src/uniq.c:162 +#: src/uniq.c:161 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" @@ -13913,7 +14194,7 @@ msgstr "" " N obusooka ku buli lunyiriri bwe kiba\n" " kizigerageranya\n" -#: src/uniq.c:167 +#: src/uniq.c:166 msgid "" "\n" "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n" @@ -13926,7 +14207,7 @@ msgstr "" "ekimu, ne bwe biba nga byegasse bingi. Bino tekibikozesa bwe kiba nga\n" "kigerageranya nnyiriri.\n" -#: src/uniq.c:172 +#: src/uniq.c:171 #, fuzzy msgid "" "\n" @@ -13943,24 +14224,24 @@ msgstr "" "Ekiragiro kino bwe kiba gerageranya ennyiriri, kigoberera ensengeka\n" "etegekedwa mu kigambo eky'omunviromenti 'LC_COLLATE'.\n" -#: src/uniq.c:359 +#: src/uniq.c:358 #, c-format msgid "too many repeated lines" msgstr "ennyiriri ezifaanagana ziyitiridde obungi" -#: src/uniq.c:522 +#: src/uniq.c:521 msgid "invalid number of fields to skip" msgstr "tekisoboka okubuukamu firidi ez'enkan'awo obungi" -#: src/uniq.c:531 +#: src/uniq.c:530 msgid "invalid number of bytes to skip" msgstr "tekisoboka okubuukamu bayiti ez'enkan'awo obungi" -#: src/uniq.c:540 +#: src/uniq.c:539 msgid "invalid number of bytes to compare" msgstr "tekisoboka okugerageranyako bayiti ez'enkan'awo obungi" -#: src/uniq.c:559 +#: src/uniq.c:558 #, c-format msgid "printing all duplicated lines and repeat counts is meaningless" msgstr "" @@ -14018,6 +14299,11 @@ msgid_plural "up %ld days %2d:%02d, " msgstr[0] "sisitemu yakakolera olunaku %ld n'essaawa %2d:%02d, " msgstr[1] "sisitemu yakakolera nnaku %ld n'essaawa %2d:%02d, " +#: src/uptime.c:149 +#, fuzzy, c-format +msgid "up %2d:%02d, " +msgstr "sisitemu yakakolera olunaku %ld n'essaawa %2d:%02d, " + #: src/uptime.c:151 #, c-format msgid "%lu user" @@ -14131,39 +14417,39 @@ msgstr "" msgid " old " msgstr " mawolu" -#: src/who.c:449 +#: src/who.c:440 msgid "system boot" msgstr "kukoleeza sisitemu" -#: src/who.c:456 src/who.c:458 +#: src/who.c:447 src/who.c:449 msgid "id=" msgstr "na=" -#: src/who.c:471 src/who.c:476 +#: src/who.c:462 src/who.c:467 msgid "term=" msgstr "mutwe=" -#: src/who.c:473 src/who.c:477 +#: src/who.c:464 src/who.c:468 msgid "exit=" msgstr "emmala=" -#: src/who.c:494 +#: src/who.c:485 msgid "LOGIN" msgstr "KWEWANDISAAKO" -#: src/who.c:514 +#: src/who.c:505 msgid "clock change" msgstr "amakyusa ssaawa" -#: src/who.c:526 src/who.c:527 +#: src/who.c:517 src/who.c:518 msgid "run-level" msgstr "namba y'enkola eya sisitemu" -#: src/who.c:530 src/who.c:531 +#: src/who.c:521 src/who.c:522 msgid "last=" msgstr "?sembayo=" -#: src/who.c:562 +#: src/who.c:553 #, c-format msgid "" "\n" @@ -14172,45 +14458,45 @@ msgstr "" "\n" "# abakozesa abaliko=%lu\n" -#: src/who.c:568 +#: src/who.c:559 msgid "NAME" msgstr "ANI" -#: src/who.c:568 +#: src/who.c:559 msgid "LINE" msgstr "MUKUTU" -#: src/who.c:568 +#: src/who.c:559 msgid "TIME" msgstr "DDI" -#: src/who.c:568 +#: src/who.c:559 msgid "IDLE" msgstr "OKUSIRIIKIRIRA" -#: src/who.c:569 +#: src/who.c:560 msgid "PID" msgstr "NAMBA Y'OMULIMU" -#: src/who.c:569 +#: src/who.c:560 msgid "COMMENT" msgstr "BIGAMBO" -#: src/who.c:569 +#: src/who.c:560 msgid "EXIT" msgstr "EMMALA" -#: src/who.c:649 +#: src/who.c:640 #, c-format msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n" msgstr "Enkozesa entuufu eri: %s [KAWAYIRO]... [ FAYIRO | AGU1 AGU2 ]\n" -#: src/who.c:650 +#: src/who.c:641 msgid "Print information about users who are currently logged in.\n" msgstr "" "Ekiragiro kino kiwandikawo ebifa ku bakozesa ab'ewandisizza ku sisitemu.\n" -#: src/who.c:653 +#: src/who.c:644 msgid "" "\n" " -a, --all same as -b -d --login -p -r -t -T -u\n" @@ -14227,13 +14513,13 @@ msgstr "" " -H, --heading Ssaawo kamu ku buno kiryoke kiteekewo n'emitwe ku bye\n" " kiwandika\n" -#: src/who.c:660 +#: src/who.c:651 msgid " -l, --login print system login processes\n" msgstr "" " -l, --login Buno bukireetera okulaga emirimu egikola ku\n" " kwewandisa ku sisitemu\n" -#: src/who.c:663 +#: src/who.c:654 msgid "" " --lookup attempt to canonicalize hostnames via DNS\n" " -m only hostname and user associated with stdin\n" @@ -14246,7 +14532,7 @@ msgstr "" " -p, --process Buno bukireetera okulaga emirimu egibindabinda\n" " egyatandikibwa omulimu ogwa init\n" -#: src/who.c:668 +#: src/who.c:659 msgid "" " -q, --count all login names and number of users logged on\n" " -r, --runlevel print current runlevel\n" @@ -14265,7 +14551,7 @@ msgstr "" " -t, --time Buno bukireetera okukoma ku kuwandika obudde essaawa ya\n" " sisitemu kwe yasemba okukyusibwako\n" -#: src/who.c:674 +#: src/who.c:665 msgid "" " -T, -w, --mesg add user's message status as +, - or ?\n" " -u, --users list users logged in\n" @@ -14284,7 +14570,7 @@ msgstr "" " --writable Akawayiro kano nako kafuula enkola y'ekiragiro mu ngeri\n" " y'emu n'aka '-T'\n" -#: src/who.c:682 +#: src/who.c:673 #, fuzzy, c-format msgid "" "\n" @@ -14333,20 +14619,26 @@ 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 " gid=%s" -#~ msgstr "ennamba ya guluupu=%lu" +#~ msgid " returning value: '%s'\n" +#~ msgstr "nkolawo fayiro %s\n" #, fuzzy -#~ msgid " euid=%s" -#~ msgstr "ennamba omukozesa gyakolerako=%lu" +#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n" +#~ msgstr "Enkozesa entuufu eri: %s [KAWAYIRO]... [AKOZESA]...\n" -#~ msgid "" -#~ "Usage: %s NAME\n" -#~ " or: %s OPTION\n" -#~ msgstr "" -#~ "Enkozesa entuufu eri: %s FAYIRO\n" -#~ " oba: %s KAWAYIRO\n" +#, fuzzy +#~ msgid "no valid suffix found\n" +#~ msgstr "%s: akafundikwa tekakkirizibwa kwenkan'awo" #~ msgid "" #~ "\n" @@ -14359,20 +14651,232 @@ msgstr "" #~ " %s /usr/bin/sort Ebivaamu: \"sort\".\n" #~ " %s include/stdio.h .h Ebivaamu: \"stdio\".\n" +#~ msgid "reading %s" +#~ msgstr "nsoma %s" + +#~ msgid "writing %s" +#~ msgstr "mpandikira mu %s" + +#~ msgid "closing %s" +#~ msgstr "mbikka %s" + +#~ msgid "accessing %s" +#~ msgstr "n'etuusako %s" + +#~ msgid "opening %s" +#~ msgstr "mbikkula %s" + +#~ msgid "" +#~ "Usage: %s NAME\n" +#~ " or: %s OPTION\n" +#~ msgstr "" +#~ "Enkozesa entuufu eri: %s FAYIRO\n" +#~ " oba: %s KAWAYIRO\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 Ssaawo kamu ku buno okukireetera okubuuka\n" +#~ " amaterekero agali ku sisitemu eza fayiro " +#~ "endala\n" +#~ " -X, --exclude-from=FAYIRO Fayiro erinnya lya yo bwe libeera nga\n" +#~ " liri ku lukalala oluli mu FAYIRO, kigibuuka.\n" +#~ " --exclude=KIGAMBO Kano kakireetera okubuuka oba okugyamu fayiro\n" +#~ " ezirina KIGAMBO mu mannya ga zo\n" +#~ " -d, --max-depth=N Buno bukireetera okulaga emigatte egifunidwa " +#~ "ku\n" +#~ " materekero (agumenti --all nayo bw'ebaako " +#~ "kikola\n" +#~ " ne ku fayiro ezitali materekero). Kikoma ku " +#~ "ezo\n" +#~ " fayiro n'amaterekero ezitasukka emitendera N " +#~ "wansi\n" +#~ " w'eryo ekiragiro kwe kiweredwa;\n" +#~ " Okussawo '--max-depth=0' kye kimu n'okussawo\n" +#~ " '--summarize'\n" + #, fuzzy -#~ msgid "Usage: %s [OPTION] FILE...\n" -#~ msgstr "Enkozesa entuufu eri: %s [KAWAYIRO]... FAYIRO...\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 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" + +#~ msgid "" +#~ "WARNING: --page-increment is deprecated; use --line-increment instead" +#~ msgstr "" +#~ "KULABULA: akawayiro aka --page-increment kadibizidwa;\n" +#~ "kozesaamu aka -line-increment instead" + +#~ msgid "All arguments to long options are mandatory for short options.\n" +#~ msgstr "" +#~ "Agumenti ezibeera ku buwayiro obujjuvu era ziteekwa okubeerawo ne ku\n" +#~ "buwayiro obufunze.\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" +#~ "RADIKISI bwe kibeera d, kitegeeza dekanariyo, bw'ebeera o kitegeeza\n" +#~ "okitariyo, x kitegeeza hekisadekanariyo ate bw'ebeera n kitegeeza\n" +#~ "tekuli radikisi.\n" +#~ "BAYITI bw'ekulembekkerezebwa 0x oba 0X ebeera ya mu hekisadakanariyo,\n" +#~ "ate esobola okubaako kamu ku bubonero buno obu komekkereza:\n" +#~ "b akategeeza nti ennamba eyo ekubisibwamu 512, kB nti ekubisibwamu 1000,\n" +#~ "K ye 1024, MB 1000*1000, M 1024*1024, GB 1000*1000*1000, G " +#~ "1024*1024*1024,\n" +#~ "n'obubonero T, P, E, Z, Y bweyongera mu ngeri eyo.\n" +#~ "Bw'oyongerako ate akawayiro z, ekiragiro buli lunyiriri olw'ebivamu\n" +#~ "kirukomekkereza n'olukalala olw'obubonero bwamu obutali bukusike.\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 "" +#~ "Akawyiro '--string' bwe kabulako ennamba, ekiragiro kikozesa '3'. \n" +#~ "Akawayiro '--width' bwe kabulako ennamba, ekiragiro kikozesa '32'. \n" +#~ "Ekiragiro kino 'od' bwe kutabeerako akawayiro, kikola ng'eyataddewo\n" +#~ " '-A o -t d2 -w 16'.\n" + +#~ msgid "Usage: %s [OPTION]... FILE\n" +#~ msgstr "Enkozesa entuufu eri: %s [KAWAYIRO]... FAYIRO\n" + +#~ msgid "Password:" +#~ msgstr "Kigambo ekikuumi:" + +#~ msgid "getpass: cannot open /dev/tty" +#~ msgstr "getpass: tekisobose kubikkula /dev/tty" + +#~ msgid "cannot set groups" +#~ msgstr "nnemedwa okutegeka guluupu" + +#~ 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" + +#~ 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 "" +#~ "Ekiragiro kino bw'okiyisa by'oddako okukolera mu\n" +#~ "kiwandikiro mw'okiyisizza biba n'obuyinza obujjira\n" +#~ "ku namba-ya-mukozesa ne-namba-ya-guluupu ebya MUKOZESA\n" +#~ "\n" +#~ " -, -l, --login Buno obuwayiro bukufuula nga MUKOZESA ye\n" +#~ " yaggudewo ekiwandikiro ekipya.\n" +#~ " Enviromenti ofuna eyategekebwa MUKOZESA,\n" +#~ " ebigambo ebifuga enviromenti ebibaddewo\n" +#~ " nga tonnayisa ekiragiro byo ne birekerawo\n" +#~ " okukola ebya MUKOZESA byo ne biba nga bye\n" +#~ " bikola\n" +#~ " -c, --commmand=KIRAGIRO Ekiragiro bw'okiyisa ne kamu ku buno, " +#~ "ozuukusa\n" +#~ " enzivvunuzi n'esobozesa KIRAGIRO okukola " +#~ "omulimu\n" +#~ " gwakyo. Tewajjawo kiwandikiro kipya\n" +#~ " -f, --fast Bw'okozesa kamu ku buno nga okolera ku " +#~ "nzivvunuzi\n" +#~ " ey'ekika kya 'csh' oba 'tcsh', enzivvunuzi " +#~ "empya\n" +#~ " gy'ofuna okolere ku buyinza obwa MUKOZESA " +#~ "tekisooka\n" +#~ " kusoma fayiro ye eya .cshrc\n" +#~ " -m, --preserve-environment Bw'okozesa kamu ku buno ate, enviromenti " +#~ "tekyuka\n" +#~ " ng'otandise okukolera ku buyinza bwa " +#~ "MUKOZESA,\n" +#~ " esigala nga bweyabadde nga tonnayisa " +#~ "kiragiro\n" +#~ " -p Kino kikola kimu ne '-m'\n" +#~ " -s, --shell=NZIVVUNUZI Bw'okozesa ku buwayiro buno, bw'otandika " +#~ "kukolera\n" +#~ " ku buyinza obupya obeera okulera ku " +#~ "nzivvunuzi\n" +#~ " eya kika kya NZUVVUNUZI, singa eyo kweri ku\n" +#~ " lukalala '/etc/shells'\n" + +#~ msgid "" +#~ "\n" +#~ "A mere - implies -l. If USER not given, assume root.\n" +#~ msgstr "" +#~ "\n" +#~ "Ekiragiro bw'okiwerekezako ka '-' kokka, kiba kyekimu n'okussawo\n" +#~ "akawayiro '-l'. Bw'otateekako agumenti ey'erinnya lya mukozesa, " +#~ "ekiragiro\n" +#~ "kikuwa buyinza obwa root - omuteesiteesi wa sisitemu.\n" + +#~ msgid "user %s does not exist" +#~ msgstr "tewali mukozesa ayitibwa %s" + +#~ msgid "incorrect password" +#~ msgstr "ekigambo ekikuumi ky'owandise kisobu" + +#~ msgid "using restricted shell %s" +#~ msgstr "" +#~ "kakati okozesa enzivvunuzi ey'ekika kya %s etali mu nkalala ez'oku " +#~ "sisitemu eno" + +#~ 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" -#~ " --dereference affect the referent of each symbolic link (this " -#~ "is\n" -#~ " the default), rather than the symbolic link " -#~ "itself\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" @@ -14387,6 +14891,16 @@ msgstr "" #~ " 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" @@ -14421,16 +14935,6 @@ msgstr "" #~ " 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" @@ -14496,38 +15000,6 @@ msgstr "" #~ " -v, --verbose Buno buleetera ekiragiro okuwandika ebiva mu\n" #~ " kukebera buli fayiro ekolebwako\n" -#, fuzzy -#~ msgid "Usage: %s [OPTION]... PATH START\n" -#~ msgstr "Enkozesa entuufu eri: %s [KAWAYIRO]... BUBONERO-1 [BUBONERO-2]\n" - -#, fuzzy -#~ msgid "" -#~ " -n, --no-newline do not output the trailing " -#~ "newline\n" -#~ " " -#~ msgstr "" -#~ "Ekiragiro kino kiwandika buli KIGAMBO awateekebwa\n" -#~ "ebivaamu ebya pulogulamu mu ebya bulijjo.\n" -#~ "\n" -#~ " -n Kano kakireetera obutassangawo nnukuta elagira\n" -#~ " okukolawo olunyiriri olupya ku nkomerero z'ennyiriri\n" - -#, fuzzy -#~ 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" -#~ "BUNENE obuteeka mu bipimo bino:\n" -#~ "kB (ebirengo ebya 1,000), K-(bya 1,024), MB (bya 1,000,000),\n" -#~ "M (bya 1,048,576) ko n'ebyeyongera waggula G, T, P, E, Z ne Y.\n" -#~ "Zino ennukuta zisobola okubeera zokka oba nga zikulemberwa\n" -#~ "omuwendo ogutali mu butundutundu - okugeza 15kB oba 2M naye ssi\n" -#~ "5.5M.\n" - #~ msgid "" #~ "Display the current time in the given FORMAT, or set the system date.\n" #~ "\n" @@ -14550,21 +15022,32 @@ msgstr "" #~ "eya\n" #~ " bulijjo\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" +#~ "BUNENE obuteeka mu bipimo bino:\n" +#~ "kB (ebirengo ebya 1,000), K-(bya 1,024), MB (bya 1,000,000),\n" +#~ "M (bya 1,048,576) ko n'ebyeyongera waggula G, T, P, E, Z ne Y.\n" +#~ "Zino ennukuta zisobola okubeera zokka oba nga zikulemberwa\n" +#~ "omuwendo ogutali mu butundutundu - okugeza 15kB oba 2M naye ssi\n" +#~ "5.5M.\n" + +#~ msgid "truncating %s" +#~ msgstr "%s ngikolako omulimu ogwa 'truncate'" + #~ msgid "cannot create link %s" #~ msgstr "sisobola okukolawo enyunzi %s" -#, fuzzy -#~ msgid "%s: option '%s' is ambiguous\n" -#~ msgstr "%s: akawayiro '-W %s' kabuzabuza\n" - #~ msgid "" #~ "WARNING: --preserve_context is deprecated; use --preserve-context instead" #~ msgstr "" #~ "KULABULA: akawayiro --preserve_context kadibizidwa;\n" #~ "kozesaamu aka --preserve-context" -#~ msgid "truncating %s" -#~ msgstr "%s ngikolako omulimu ogwa 'truncate'" - #~ msgid "invalid number of lines: 0" #~ msgstr "buno obungi bw'ennyiriri tebukkirizibwa: 0" diff --git a/po/lt.gmo b/po/lt.gmo index 49638d50..6f548f7f 100644 Binary files a/po/lt.gmo and b/po/lt.gmo differ diff --git a/po/lt.po b/po/lt.po index 3fa54ec5..00988676 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: 2012-05-10 19:35+0200\n" +"POT-Creation-Date: 2013-02-14 15:56+0000\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,19 +37,19 @@ msgstr "Galimi argumentai:" msgid "error closing file" msgstr "klaida užveriant failą" -#: lib/closeout.c:112 src/base64.c:109 src/base64.c:121 src/base64.c:127 -#: src/base64.c:168 src/base64.c:224 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:330 src/expand.c:355 src/head.c:298 -#: src/head.c:348 src/head.c:756 src/head.c:797 src/mktemp.c:350 src/od.c:919 -#: src/paste.c:160 src/shuf.c:369 src/split.c:727 src/split.c:964 -#: src/split.c:969 src/tail.c:350 src/tail.c:1201 src/tail.c:1307 +#: 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 -#: src/unexpand.c:427 src/unexpand.c:443 +#: 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:1160 src/copy.c:2602 +#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617 #, c-format msgid "preserving permissions for %s" msgstr "" @@ -241,18 +241,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:483 +#: lib/mkdir-p.c:196 src/install.c:484 #, c-format msgid "cannot change permissions of %s" msgstr "neįmanoma pakeisti %s teisių" -#: lib/mkdir-p.c:206 src/copy.c:2261 src/install.c:709 src/install.c:722 +#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722 #, 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:915 src/tac.c:435 +#: src/split.c:929 src/tac.c:434 #, c-format msgid "memory exhausted" msgstr "baigėsi atmintis" @@ -301,75 +301,75 @@ msgstr "“" msgid "%s: end of file" msgstr "%s: failo pabaiga" -#: lib/regcomp.c:130 +#: lib/regcomp.c:131 msgid "Success" msgstr "Sėkmė" -#: lib/regcomp.c:133 +#: lib/regcomp.c:134 msgid "No match" msgstr "" -#: lib/regcomp.c:136 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "Netaisyklinga reguliarioji išraiška" -#: lib/regcomp.c:139 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "" -#: lib/regcomp.c:142 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "" -#: lib/regcomp.c:145 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "" -#: lib/regcomp.c:148 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "" -#: lib/regcomp.c:151 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "Nesuderintas [ arba [^" -#: lib/regcomp.c:154 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "Nesuderintas ( arba \\(" -#: lib/regcomp.c:157 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "Nesuderintas \\{" -#: lib/regcomp.c:160 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "Netinkamas \\{\\} turinys" -#: lib/regcomp.c:163 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "" -#: lib/regcomp.c:166 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Baigėsi atmintis" -#: lib/regcomp.c:169 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "" -#: lib/regcomp.c:172 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "" -#: lib/regcomp.c:175 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "" -#: lib/regcomp.c:178 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "Nesuderintas ) arba \\)" -#: lib/regcomp.c:703 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "" @@ -408,7 +408,7 @@ msgstr "^[yYtT]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-mode-acl.c:695 src/copy.c:2284 src/cp.c:518 +#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516 #, c-format msgid "setting permissions for %s" msgstr "nustatomos %s teisės" @@ -550,13 +550,13 @@ msgstr "" msgid "Resource lost" msgstr "" -#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262 -#: lib/spawn-pipe.c:265 +#: 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:232 lib/spawn-pipe.c:346 lib/wait-process.c:282 +#: 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" @@ -572,24 +572,24 @@ msgstr "" msgid "Unknown signal %d" msgstr "" -#: lib/unicodeio.c:103 +#: lib/unicodeio.c:102 msgid "iconv function not usable" msgstr "iconv funkcija nepanaudojama" -#: lib/unicodeio.c:105 +#: lib/unicodeio.c:104 msgid "iconv function not available" msgstr "nėra iconv funkcijos" -#: lib/unicodeio.c:112 +#: lib/unicodeio.c:111 msgid "character out of range" msgstr "simbolis už intervalo ribų" -#: lib/unicodeio.c:182 +#: lib/unicodeio.c:181 #, c-format msgid "cannot convert U+%04X to local character set" msgstr "negalima paversti U+%04X į vietinį simbolių rinkinį" -#: lib/unicodeio.c:184 +#: lib/unicodeio.c:183 #, c-format msgid "cannot convert U+%04X to local character set: %s" msgstr "negalima paversti U+%04X į vietinį simbolių rinkinį: %s" @@ -772,7 +772,7 @@ msgstr "" "\n" "Apie %s klaidas praneškite adresu %s\n" -#: lib/version-etc.c:251 src/system.h:562 +#: lib/version-etc.c:251 src/system.h:573 #, fuzzy, c-format msgid "%s home page: <%s>\n" msgstr "Naudojimas: %s\n" @@ -782,7 +782,7 @@ msgstr "Naudojimas: %s\n" msgid "%s home page: <http://www.gnu.org/software/%s/>\n" msgstr "" -#: lib/version-etc.c:256 src/system.h:563 +#: lib/version-etc.c:256 src/system.h:574 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" @@ -868,14 +868,15 @@ msgid "Simon Josefsson" msgstr "Simon Josefsson" #: src/base64.c:60 -#, c-format +#, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" "Base64 encode or decode FILE, or standard input, to standard output.\n" -"\n" msgstr "" +"\n" +"Kai nenurodytas FAILAS, arba FAILAS yra -, nuskaityti standartinę įvestį.\n" -#: src/base64.c:64 +#: src/base64.c:67 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -885,7 +886,7 @@ msgid "" "\n" msgstr "" -#: src/base64.c:73 src/cat.c:110 src/fmt.c:293 src/shuf.c:71 src/sum.c:70 +#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -893,7 +894,7 @@ msgstr "" "\n" "Kai nenurodytas FAILAS, arba FAILAS yra -, nuskaityti standartinę įvestį.\n" -#: src/base64.c:76 +#: src/base64.c:79 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -902,37 +903,37 @@ msgid "" "from any other non-alphabet bytes in the encoded stream.\n" msgstr "" -#: src/base64.c:171 src/base64.c:208 src/csplit.c:263 src/csplit.c:1435 -#: src/join.c:451 src/shuf.c:157 src/shuf.c:361 src/tac-pipe.c:74 +#: 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 #, c-format msgid "read error" msgstr "skaitymo klaida" -#: src/base64.c:227 +#: src/base64.c:230 #, c-format msgid "invalid input" msgstr "netinkama įvestis" -#: src/base64.c:264 +#: src/base64.c:267 #, c-format msgid "invalid wrap size: %s" msgstr "" -#: src/base64.c:283 src/basename.c:173 src/comm.c:435 src/cp.c:607 -#: src/date.c:441 src/dircolors.c:447 src/du.c:894 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:169 src/install.c:929 src/join.c:961 -#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:157 src/mv.c:447 -#: src/od.c:1802 src/ptx.c:2081 src/readlink.c:154 src/seq.c:408 -#: src/shuf.c:320 src/shuf.c:339 src/sort.c:4477 src/split.c:1313 -#: src/tr.c:1797 src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:454 -#: src/uniq.c:471 src/unlink.c:81 src/uptime.c:250 src/users.c:146 -#: src/wc.c:666 src/who.c:836 src/whoami.c:79 +#: 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 #, c-format msgid "extra operand %s" msgstr "papildomas operandas %s" -#: src/base64.c:315 src/cat.c:781 +#: src/base64.c:318 src/cat.c:781 #, c-format msgid "closing standard input" msgstr "užveriama standartinė įvestis" @@ -940,15 +941,15 @@ 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/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:53 src/env.c:33 +#: 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/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:65 src/su.c:88 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 +#: 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 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -962,23 +963,23 @@ msgstr "" " arba: %s PARINKTIS\n" #: src/basename.c:53 +#, fuzzy msgid "" "Print NAME with any leading directory components removed.\n" "If specified, also remove a trailing SUFFIX.\n" -"\n" msgstr "" "Spausdinti VARDĄ su pašalintais aplankų komponentais.\n" "Jei nurodyta, taip pat pašalinti SUFIKSĄ.\n" "\n" -#: src/basename.c:59 +#: 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" msgstr "" -#: src/basename.c:66 +#: src/basename.c:67 #, c-format msgid "" "\n" @@ -989,20 +990,21 @@ msgid "" " %s -a any/str1 any/str2 -> \"str1\" followed by \"str2\"\n" msgstr "" -#: src/basename.c:167 src/chcon.c:531 src/chgrp.c:277 src/chmod.c:526 -#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1369 +#: 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:183 src/mkfifo.c:108 src/mknod.c:146 src/nohup.c:111 -#: src/pathchk.c:148 src/printf.c:674 src/readlink.c:146 src/realpath.c:236 -#: src/rm.c:314 src/rmdir.c:223 src/seq.c:402 src/setuidgid.c:137 -#: src/sleep.c:119 src/stat.c:1476 src/stdbuf.c:346 src/tr.c:1782 +#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 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 #, 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:52 src/split.c:49 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/split.c:49 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" @@ -1012,8 +1014,8 @@ msgstr "Torbjorn Granlund" msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:846 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4720 src/nl.c:182 src/paste.c:435 src/pr.c:2768 src/sum.c:58 +#: 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/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 +1063,7 @@ msgstr "" msgid "cannot do ioctl on %s" msgstr "negaliu įvykdyti ioctl %s" -#: src/cat.c:637 src/dd.c:2209 src/sort.c:379 src/tee.c:165 src/yes.c:86 +#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86 #, c-format msgid "standard output" msgstr "standartinė išvestis" @@ -1078,14 +1080,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:55 src/head.c:46 src/hostid.c:33 +#: 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 msgid "Jim Meyering" msgstr "Jim Meyering" -#: src/chcon.c:100 src/runcon.c:203 src/runcon.c:234 +#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238 #, c-format msgid "failed to create security context: %s" msgstr "" @@ -1095,8 +1097,8 @@ msgstr "" msgid "failed to set %s security context component to %s" msgstr "" -#: src/chcon.c:156 src/chcon.c:540 src/copy.c:2222 src/runcon.c:217 -#: src/stat.c:683 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221 +#: src/stat.c:702 #, c-format msgid "failed to get security context of %s" msgstr "" @@ -1112,12 +1114,12 @@ 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:446 src/ls.c:2981 +#: src/du.c:457 src/ls.c:2981 #, 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:426 +#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437 #, c-format msgid "cannot read directory %s" msgstr "negaliu perskaityti %s aplanko turinio" @@ -1127,13 +1129,13 @@ 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:599 +#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562 #, 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:618 -#: src/remove.c:613 +#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642 +#: src/remove.c:576 #, fuzzy, c-format msgid "fts_close failed" msgstr "nepavyko fts_read" @@ -1151,10 +1153,9 @@ msgid "" "Change the security context of each FILE to CONTEXT.\n" "With --reference, change the security context of each FILE to that of " "RFILE.\n" -"\n" msgstr "" -#: src/chcon.c:362 src/chgrp.c:123 src/chown.c:94 +#: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94 msgid "" " --dereference affect the referent of each symbolic link (this is\n" " the default), rather than the symbolic link itself\n" @@ -1162,7 +1163,7 @@ msgid "" "file\n" msgstr "" -#: src/chcon.c:367 +#: src/chcon.c:369 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" @@ -1170,22 +1171,28 @@ msgid "" " -l, --range=RANGE set range RANGE in the target security context\n" msgstr "" -#: src/chcon.c:373 +#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 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 msgid "" " --reference=RFILE use RFILE's security context rather than " "specifying\n" " a CONTEXT value\n" msgstr "" -#: src/chcon.c:377 src/chgrp.c:140 src/chown.c:118 +#: 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:380 +#: src/chcon.c:386 msgid " -v, --verbose output a diagnostic for every file processed\n" msgstr "" -#: src/chcon.c:383 src/chgrp.c:143 src/chown.c:121 +#: src/chcon.c:389 src/chgrp.c:143 src/chown.c:121 #, fuzzy msgid "" "\n" @@ -1210,36 +1217,36 @@ msgstr "" " -P be simbolinių nuorodų pakeitimų (nutylint)\n" "\n" -#: src/chcon.c:512 src/chgrp.c:264 src/chown.c:267 +#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267 #, c-format msgid "-R --dereference requires either -H or -L" msgstr "-R --dereference reikalauja bent -H arba -L" -#: src/chcon.c:518 +#: src/chcon.c:524 #, c-format msgid "-R -h requires -P" msgstr "-R -h reikalauja -P" -#: src/chcon.c:533 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282 -#: src/comm.c:429 src/csplit.c:1371 src/join.c:1149 src/link.c:79 -#: src/mknod.c:148 src/setuidgid.c:139 src/tr.c:1785 +#: 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 #, c-format msgid "missing operand after %s" msgstr "po %s trūksta operando" -#: src/chcon.c:556 src/runcon.c:247 +#: src/chcon.c:562 src/runcon.c:251 #, c-format msgid "invalid context: %s" msgstr "" -#: src/chcon.c:563 +#: src/chcon.c:569 #, c-format msgid "conflicting security context specifiers given" msgstr "" -#: src/chcon.c:572 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:433 src/cp.c:493 -#: src/mv.c:96 src/pwd.c:273 src/rm.c:324 src/touch.c:351 +#: 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 #, c-format msgid "failed to get attributes of %s" msgstr "nepavyko gauti %s parametrų" @@ -1276,12 +1283,6 @@ msgid "" " ownership of a symlink)\n" msgstr "" -#: src/chgrp.c:132 src/chmod.c:387 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/chgrp.c:136 msgid "" " --reference=RFILE use RFILE's group rather than specifying a\n" @@ -1521,7 +1522,7 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:97 src/install.c:575 src/setuidgid.c:110 src/setuidgid.c:120 +#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120 #, c-format msgid "invalid group %s" msgstr "netinkama grupė %s" @@ -1588,8 +1589,8 @@ msgstr "nepavyko atverti %s" msgid "failed to set user-ID" msgstr "nepavyko atverti %s" -#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:213 src/stdbuf.c:366 -#: src/timeout.c:402 +#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365 +#: src/timeout.c:454 #, fuzzy, c-format msgid "failed to run command %s" msgstr "nepavyko įvykdyti komandos %s" @@ -1689,20 +1690,24 @@ msgstr "" msgid "empty %s not allowed" msgstr "neleidžiamas tuščias %s" -#: src/copy.c:168 src/dd.c:1609 src/dd.c:1976 +#: 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 #, c-format -msgid "reading %s" -msgstr "skaitoma %s" +msgid "error reading %s" +msgstr "klaida skaitant %s" -#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:426 +#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425 #, c-format msgid "cannot lseek %s" msgstr "nepavyko įvykdyti lseek failui %s" -#: src/copy.c:206 src/dd.c:2039 src/dd.c:2102 +#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151 #, c-format -msgid "writing %s" -msgstr "rašoma %s" +msgid "error writing %s" +msgstr "klaida rašant %s" #: src/copy.c:313 #, fuzzy, c-format @@ -1724,7 +1729,7 @@ msgstr "nepavyko atverti %s" msgid "clearing permissions for %s" msgstr "" -#: src/copy.c:697 src/copy.c:2470 src/cp.c:331 +#: src/copy.c:697 src/copy.c:2480 src/cp.c:329 #, c-format msgid "failed to preserve ownership for %s" msgstr "nepavyko išlaikyti %s savininko" @@ -1739,14 +1744,14 @@ msgstr "nepavyko rasti failo %s" msgid "failed to preserve authorship for %s" msgstr "nepavyko išlaikyti %s autoriaus" -#: src/copy.c:804 src/csplit.c:638 src/du.c:901 src/fmt.c:449 src/head.c:847 -#: src/sort.c:4489 src/split.c:1329 src/tail.c:1756 src/wc.c:678 +#: 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 "nepavyksta atverti skaitymui %s" -#: src/copy.c:810 src/copy.c:972 src/dd.c:1546 src/dd.c:2114 src/dd.c:2252 -#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:141 +#: 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 #, c-format msgid "cannot fstat %s" msgstr "nepavyksta įvykdyti fstat %s" @@ -1766,14 +1771,14 @@ msgstr "" msgid "failed to set the security context of %s to %s" msgstr "" -#: src/copy.c:881 src/copy.c:1574 src/copy.c:1777 src/copy.c:1935 src/ln.c:314 -#: src/remove.c:267 src/remove.c:293 src/remove.c:444 src/remove.c:465 +#: 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 #, c-format msgid "cannot remove %s" msgstr "nepavyko pašalinti %s" -#: src/copy.c:886 src/copy.c:1578 src/copy.c:1772 src/copy.c:1940 -#: src/remove.c:418 +#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945 +#: src/remove.c:375 #, c-format msgid "removed %s\n" msgstr "pašalintas %s\n" @@ -1791,189 +1796,189 @@ msgstr "nepavyko sukurti paprasto failo %s" #: src/copy.c:985 #, fuzzy, c-format msgid "failed to clone %s from %s" -msgstr "nepavyko atverti %s" +msgstr "nepavyko užverti aplanko %s" -#: src/copy.c:1098 src/copy.c:2531 +#: src/copy.c:1098 src/copy.c:2541 #, c-format msgid "preserving times for %s" msgstr "išlaikomos %s datos" -#: src/copy.c:1170 src/copy.c:1176 src/head.c:855 src/touch.c:175 -#: src/truncate.c:413 -#, c-format -msgid "closing %s" -msgstr "uždaroma %s" +#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172 +#: src/truncate.c:417 +#, fuzzy, c-format +msgid "failed to close %s" +msgstr "nepavyko atverti %s" -#: src/copy.c:1466 +#: src/copy.c:1471 #, c-format msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? " msgstr "" -#: src/copy.c:1473 +#: src/copy.c:1478 #, c-format msgid "%s: overwrite %s? " msgstr "%s: perrašyti %s? " -#: src/copy.c:1542 +#: src/copy.c:1547 #, c-format msgid " (backup: %s)" msgstr " (atsarginė kopija: %s)" -#: src/copy.c:1552 +#: src/copy.c:1557 #, c-format msgid "failed to restore the default file creation context" msgstr "" -#: src/copy.c:1584 +#: src/copy.c:1589 #, c-format msgid "cannot create hard link %s to %s" msgstr "nepavyko sukurti kietosios nuorodos %s į %s" -#: src/copy.c:1637 src/copy.c:1689 src/copy.c:2272 src/copy.c:2589 +#: 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:1220 src/truncate.c:365 +#: src/stat.c:1239 src/truncate.c:363 #, c-format msgid "cannot stat %s" msgstr "nepavyksta patikrinti %s" -#: src/copy.c:1645 +#: src/copy.c:1650 #, c-format msgid "omitting directory %s" msgstr "praleidžiamas aplankas %s" -#: src/copy.c:1659 +#: src/copy.c:1664 #, c-format msgid "warning: source file %s specified more than once" msgstr "perspėjimas: išeities failas %s nurodytas kelis kartus" -#: src/copy.c:1707 src/ln.c:246 +#: src/copy.c:1712 src/ln.c:246 #, c-format msgid "%s and %s are the same file" msgstr "%s ir %s yra tas pats failas" -#: src/copy.c:1806 +#: src/copy.c:1811 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "nepavyksta perrašyti ne aplanką %s naudojant aplanką %s" -#: src/copy.c:1824 src/ln.c:214 +#: src/copy.c:1829 src/ln.c:214 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "nebus perrašoma, tik sukuriama %s su %s" -#: src/copy.c:1842 +#: src/copy.c:1847 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "nepavyko pakeisti aplanko %s su ne aplanku" -#: src/copy.c:1856 +#: src/copy.c:1861 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "nepavyko perkelti aplanko ant ne aplanko: %s -> %s" -#: src/copy.c:1886 +#: src/copy.c:1891 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "saugojant %s būtų sunaikinta šaltinis; %s neperkelta" -#: src/copy.c:1887 +#: src/copy.c:1892 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "saugojant %s būtų sunaikintas šaltinis; %s nenukopijuota" -#: src/copy.c:1910 src/ln.c:276 +#: src/copy.c:1915 src/ln.c:276 #, c-format msgid "cannot backup %s" msgstr "nepavyko padaryti atsarginės %s kopijos" -#: src/copy.c:1974 +#: src/copy.c:1979 #, c-format msgid "will not copy %s through just-created symlink %s" msgstr "" -#: src/copy.c:2051 +#: src/copy.c:2056 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "negalima kopijuoti aplanko %s į patį save, %s" -#: src/copy.c:2068 +#: src/copy.c:2073 #, c-format msgid "will not create hard link %s to directory %s" msgstr "nepavyko sukurti kietosios nuorodos %s į aplanką %s" -#: src/copy.c:2118 +#: src/copy.c:2123 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "nepavyko perkelti %s į žemiau esantį savo aplanką, %s" -#: src/copy.c:2161 +#: src/copy.c:2166 #, c-format msgid "cannot move %s to %s" msgstr "negaliu perkelti %s į %s" -#: src/copy.c:2173 +#: src/copy.c:2178 #, 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:2207 src/install.c:905 src/mkdir.c:189 src/mkfifo.c:114 -#: src/mknod.c:167 +#: 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:2241 +#: src/copy.c:2246 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "negalima nukopijuoti cikliškos simbolines nuorodos %s" -#: src/copy.c:2350 +#: src/copy.c:2355 #, 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:2357 +#: src/copy.c:2362 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "nepavyksta susieti %s su %s" -#: src/copy.c:2406 src/mkfifo.c:133 +#: src/copy.c:2416 src/mkfifo.c:132 #, c-format msgid "cannot create fifo %s" msgstr "negalima sukūrti fifo %s" -#: src/copy.c:2415 +#: src/copy.c:2425 #, c-format msgid "cannot create special file %s" msgstr "nepavyksta sukurti specialaus failo %s" -#: src/copy.c:2426 src/ls.c:3191 src/stat.c:902 +#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921 #, c-format msgid "cannot read symbolic link %s" msgstr "negaliu perskaityti simbolinės nuorodos %s" -#: src/copy.c:2453 +#: src/copy.c:2463 #, c-format msgid "cannot create symbolic link %s" msgstr "negaliu sukurti simbolinės nuorodos %s" -#: src/copy.c:2485 +#: src/copy.c:2495 #, c-format msgid "%s has unknown file type" msgstr "%s yra nežinomo tipo failas" -#: src/copy.c:2629 src/ln.c:358 +#: src/copy.c:2644 src/ln.c:358 #, c-format msgid "cannot un-backup %s" msgstr "nepavyko atkurti %s" -#: src/copy.c:2633 +#: src/copy.c:2648 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (atkurti)\n" -#: src/cp.c:156 src/mv.c:284 +#: src/cp.c:156 src/mv.c:286 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -1982,23 +1987,10 @@ msgid "" msgstr "" #: src/cp.c:162 -msgid "" -"Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" -"\n" -msgstr "" - -#: src/cp.c:166 src/csplit.c:1458 src/cut.c:197 src/df.c:852 src/du.c:268 -#: src/expand.c:112 src/fmt.c:275 src/fold.c:75 src/head.c:115 -#: src/install.c:612 src/kill.c:86 src/ln.c:392 src/ls.c:4726 src/mkdir.c:61 -#: src/mkfifo.c:56 src/mknod.c:58 src/mv.c:294 src/nl.c:191 src/paste.c:445 -#: src/pr.c:2777 src/ptx.c:1825 src/shred.c:153 src/shuf.c:58 src/sort.c:399 -#: src/split.c:211 src/stdbuf.c:95 src/tac.c:142 src/tail.c:268 -#: src/touch.c:226 src/truncate.c:107 src/unexpand.c:122 src/uniq.c:145 -msgid "" -"Mandatory arguments to long options are mandatory for short options too.\n" +msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" msgstr "" -#: src/cp.c:169 +#: src/cp.c:168 msgid "" " -a, --archive same as -dR --preserve=all\n" " --attributes-only don't copy the file data, just the " @@ -2012,32 +2004,33 @@ msgid "" " -d same as --no-dereference --preserve=links\n" msgstr "" -#: src/cp.c:178 +#: src/cp.c:177 msgid "" " -f, --force if an existing destination file cannot be\n" -" opened, remove it and try again (redundant " -"if\n" -" the -n option is used)\n" +" opened, remove it and try again (this " +"option\n" +" is ignored when the -n option is also " +"used)\n" " -i, --interactive prompt before overwrite (overrides a previous " "-n\n" " option)\n" " -H follow command-line symbolic links in SOURCE\n" msgstr "" -#: src/cp.c:188 +#: src/cp.c:186 msgid "" " -l, --link hard link files instead of copying\n" " -L, --dereference always follow symbolic links in SOURCE\n" msgstr "" -#: src/cp.c:192 +#: src/cp.c:190 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:197 +#: src/cp.c:195 msgid "" " -p same as --preserve=mode,ownership,timestamps\n" " --preserve[=ATTR_LIST] preserve the specified attributes (default:\n" @@ -2047,13 +2040,13 @@ msgid "" " all\n" msgstr "" -#: src/cp.c:205 +#: src/cp.c:203 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:209 +#: src/cp.c:207 msgid "" " -R, -r, --recursive copy directories recursively\n" " --reflink[=WHEN] control clone/CoW copies. See below\n" @@ -2062,7 +2055,7 @@ msgid "" "force)\n" msgstr "" -#: src/cp.c:215 +#: src/cp.c:213 msgid "" " --sparse=WHEN control creation of sparse files. See below\n" " --strip-trailing-slashes remove any trailing slashes from each " @@ -2070,7 +2063,7 @@ msgid "" " argument\n" msgstr "" -#: src/cp.c:220 +#: src/cp.c:218 msgid "" " -s, --symbolic-link make symbolic links instead of copying\n" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -2079,7 +2072,7 @@ msgid "" " -T, --no-target-directory treat DEST as a normal file\n" msgstr "" -#: src/cp.c:226 +#: src/cp.c:224 msgid "" " -u, --update copy only when the SOURCE file is newer\n" " than the destination file or when the\n" @@ -2088,7 +2081,7 @@ msgid "" " -x, --one-file-system stay on this file system\n" msgstr "" -#: src/cp.c:235 +#: src/cp.c:233 msgid "" "\n" "By default, sparse SOURCE files are detected by a crude heuristic and the\n" @@ -2104,7 +2097,7 @@ msgid "" "fails, or if --reflink=auto is specified, fall back to a standard copy.\n" msgstr "" -#: src/cp.c:247 src/install.c:649 src/ln.c:421 src/mv.c:321 +#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322 msgid "" "\n" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -2114,7 +2107,7 @@ msgid "" "\n" msgstr "" -#: src/cp.c:254 src/install.c:656 src/mv.c:328 +#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329 msgid "" " none, off never make backups (even if --backup is given)\n" " numbered, t make numbered backups\n" @@ -2122,7 +2115,7 @@ msgid "" " simple, never always make simple backups\n" msgstr "" -#: src/cp.c:260 +#: src/cp.c:258 msgid "" "\n" "As a special case, cp makes a backup of SOURCE when the force and backup\n" @@ -2130,91 +2123,91 @@ msgid "" "regular file.\n" msgstr "" -#: src/cp.c:319 +#: src/cp.c:317 #, c-format msgid "failed to preserve times for %s" msgstr "nepavyko išlaikyti %s laikų" -#: src/cp.c:350 +#: src/cp.c:348 #, c-format msgid "failed to preserve permissions for %s" msgstr "nepavyko išlaikyti %s teisių" -#: src/cp.c:477 +#: src/cp.c:475 #, c-format msgid "cannot make directory %s" msgstr "negalima sukerti %s aplanko" -#: src/cp.c:526 src/cp.c:545 +#: src/cp.c:524 src/cp.c:543 #, c-format msgid "%s exists but is not a directory" msgstr "%s jau yra, bet nėra aplankas" -#: src/cp.c:572 src/cp.c:1068 src/install.c:401 src/install.c:844 src/ln.c:123 -#: src/ln.c:181 src/ln.c:202 src/ln.c:516 src/mv.c:152 src/mv.c:399 -#, c-format -msgid "accessing %s" -msgstr "dirbama su %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 +#, fuzzy, c-format +msgid "failed to access %s" +msgstr "nepavyko atverti %s" -#: src/cp.c:592 src/install.c:914 src/ln.c:546 src/mv.c:432 src/shred.c:1182 -#: src/touch.c:433 src/truncate.c:356 +#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181 +#: src/touch.c:429 src/truncate.c:354 #, c-format msgid "missing file operand" msgstr "trūksta failo operando" -#: src/cp.c:594 src/install.c:916 src/ln.c:560 src/mv.c:434 +#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436 #, c-format msgid "missing destination file operand after %s" msgstr "trūksta paskirties failo operando po %s" -#: src/cp.c:603 src/install.c:925 src/mv.c:443 +#: src/cp.c:601 src/install.c:926 src/mv.c:445 #, 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:619 src/cp.c:1070 src/install.c:403 src/install.c:846 -#: src/install.c:938 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:401 -#: src/mv.c:457 +#: 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 #, c-format msgid "target %s is not a directory" msgstr "paskirties vieta %s yra ne aplankas" -#: src/cp.c:730 +#: src/cp.c:728 #, c-format msgid "with --parents, the destination must be a directory" msgstr "naudojant --parents parametrą, paskirties vieta privalo būti aplankas" -#: src/cp.c:1063 src/install.c:839 src/ln.c:511 src/mv.c:394 +#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395 #, c-format msgid "multiple target directories specified" msgstr "nurodyta keletas tikslo aplankų" -#: src/cp.c:1108 +#: src/cp.c:1110 #, c-format msgid "cannot make both hard and symbolic links" msgstr "nepavyksta sukurti simbolinių bei kietųjų saitų" -#: src/cp.c:1115 src/mv.c:464 +#: src/cp.c:1117 src/mv.c:466 #, 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:1121 +#: src/cp.c:1123 #, c-format msgid "--reflink can be used only with --sparse=auto" msgstr "" -#: src/cp.c:1129 src/install.c:899 src/ln.c:582 src/mv.c:472 +#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474 msgid "backup type" msgstr "atsarginės kopijos tipas" -#: src/cp.c:1154 +#: src/cp.c:1156 #, c-format msgid "cannot preserve security context without an SELinux-enabled kernel" msgstr "" -#: src/cp.c:1160 +#: src/cp.c:1162 #, c-format msgid "cannot preserve extended attributes, cp is built without xattr support" msgstr "" @@ -2224,139 +2217,138 @@ msgstr "" msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:529 +#: src/csplit.c:531 #, c-format msgid "input disappeared" msgstr "" -#: src/csplit.c:658 src/csplit.c:669 +#: src/csplit.c:660 src/csplit.c:671 #, c-format msgid "%s: line number out of range" msgstr "%s: eilutės numeris už ribų" -#: src/csplit.c:698 +#: src/csplit.c:700 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: eilutės numeris už ribų" -#: src/csplit.c:701 src/csplit.c:750 +#: src/csplit.c:703 src/csplit.c:752 #, c-format msgid " on repetition %s\n" msgstr "" -#: src/csplit.c:744 +#: src/csplit.c:746 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: nerasta atitikimų" -#: src/csplit.c:808 src/csplit.c:848 src/nl.c:359 src/tac.c:274 +#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273 #, c-format msgid "error in regular expression search" msgstr "" -#: src/csplit.c:981 +#: src/csplit.c:983 #, c-format msgid "write error for %s" msgstr "%s rašymo klaida" -#: src/csplit.c:1057 +#: src/csplit.c:1059 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: po skirtuko tikimasi rasti sveikąjį skaičių" -#: src/csplit.c:1073 +#: src/csplit.c:1075 #, fuzzy, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: „}“ yra privalomas kartojimo skaičiavime" -#: src/csplit.c:1083 +#: src/csplit.c:1085 #, fuzzy, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: tarp „{“ ir „}“ reikalingas sveikas skaičius" -#: src/csplit.c:1110 +#: src/csplit.c:1112 #, fuzzy, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: trūksta „%c“ uždarančiojo skirtuko" -#: src/csplit.c:1127 +#: src/csplit.c:1129 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: netaisyklinga paprasta išraiška: %s" -#: src/csplit.c:1160 +#: src/csplit.c:1162 #, c-format msgid "%s: invalid pattern" msgstr "%s: netaisyklingas šablonas" -#: src/csplit.c:1163 +#: src/csplit.c:1165 #, 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:1169 +#: src/csplit.c:1171 #, 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:1175 +#: src/csplit.c:1177 #, 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:1253 +#: src/csplit.c:1255 #, c-format msgid "missing conversion specifier in suffix" msgstr "" -#: src/csplit.c:1259 +#: src/csplit.c:1261 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "" -#: src/csplit.c:1262 +#: src/csplit.c:1264 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "" -#: src/csplit.c:1267 +#: src/csplit.c:1269 #, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "" -#: src/csplit.c:1284 +#: src/csplit.c:1286 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "" -#: src/csplit.c:1298 +#: src/csplit.c:1300 #, c-format msgid "missing %% conversion specification in suffix" msgstr "" -#: src/csplit.c:1345 +#: src/csplit.c:1347 #, c-format msgid "%s: invalid number" msgstr "%s: netaisyklingas skaičius" -#: src/csplit.c:1449 +#: src/csplit.c:1451 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Naudojimas: %s [PARAMETRAS]... FAILŲ ŠABLONAS...\n" -#: src/csplit.c:1453 +#: src/csplit.c:1455 #, 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" -"\n" msgstr "" "Išvedamos FAILO dalių, atskirtų ŠABLONU, į failus „xx00“, „xx01“, ...,\n" "ir į standartinę išvestį išvedamas baitų skaičius kiekvienoje dalyje.\n" "\n" -#: src/csplit.c:1461 +#: src/csplit.c:1462 #, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2364,7 +2356,7 @@ msgid "" " -k, --keep-files do not remove output files on errors\n" msgstr "" -#: src/csplit.c:1466 +#: src/csplit.c:1467 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" @@ -2374,7 +2366,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:1473 +#: src/csplit.c:1474 msgid "" "\n" "Read standard input if FILE is -. Each PATTERN may be:\n" @@ -2382,7 +2374,7 @@ msgstr "" "\n" "Jeigu FAILAS yra -, skaityti iš standartinės įvesties. Galimi ŠABLONAI:\n" -#: src/csplit.c:1477 +#: src/csplit.c:1478 #, fuzzy msgid "" "\n" @@ -2412,7 +2404,7 @@ msgstr "" msgid "David M. Ihnat" msgstr "David M. Ihnat" -#: src/cut.c:64 +#: src/cut.c:64 src/cut.c:372 msgid "fields and positions are numbered from 1" msgstr "" @@ -2422,14 +2414,13 @@ msgid "Usage: %s OPTION... [FILE]...\n" msgstr "Naudojimas: %s PARAMETRAS... [FAILAS]...\n" #: src/cut.c:193 -msgid "" -"Print selected parts of lines from each FILE to standard output.\n" -"\n" +#, 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:200 +#: src/cut.c:199 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2440,7 +2431,7 @@ msgstr "" " -d, --delimiter=SKIRTUKAS panaudoti SKIRTUKĄ vietoj TABo kaip laukų " "skirtuką.\n" -#: src/cut.c:205 +#: src/cut.c:204 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2453,7 +2444,7 @@ msgstr "" " -s parametras yra apibrėžtas\n" " -n (ignoruojama)\n" -#: src/cut.c:211 +#: src/cut.c:210 #, fuzzy msgid "" " --complement complement the set of selected bytes, characters\n" @@ -2462,14 +2453,14 @@ msgstr "" " --complement rinkinio papildymas pasirinktais baitais, ženklais\n" " arba laukais\n" -#: src/cut.c:215 +#: src/cut.c:214 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:222 +#: src/cut.c:221 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2477,7 +2468,7 @@ msgid "" "in the same order that it is read, and is written exactly once.\n" msgstr "" -#: src/cut.c:228 +#: src/cut.c:227 msgid "" "Each range is one of:\n" "\n" @@ -2489,45 +2480,47 @@ msgid "" "With no FILE, or when FILE is -, read standard input.\n" msgstr "" -#: src/cut.c:368 src/cut.c:489 -msgid "invalid byte or field list" -msgstr "" +#: src/cut.c:367 src/cut.c:493 +#, fuzzy +msgid "invalid byte, character or field list" +msgstr "turite pateikti baitų, ženklų ar laukų sąrašą" -#: src/cut.c:385 +#: src/cut.c:387 msgid "invalid range with no endpoint: -" msgstr "" -#: src/cut.c:399 +#: src/cut.c:403 msgid "invalid decreasing range" msgstr "" -#: src/cut.c:478 +#: src/cut.c:482 #, c-format msgid "byte offset %s is too large" msgstr "" -#: src/cut.c:481 +#: src/cut.c:485 #, c-format msgid "field number %s is too large" msgstr "laukelio numeris %s per didelis" -#: src/cut.c:789 src/cut.c:797 +#: src/cut.c:795 src/cut.c:803 msgid "only one type of list may be specified" msgstr "gali būti nurodytas tik vienas sąrašo tipas" -#: src/cut.c:806 +#: src/cut.c:812 src/numfmt.c:1408 +#, c-format msgid "the delimiter must be a single character" msgstr "skirtukas turi būti vienas simbolis" -#: src/cut.c:841 +#: src/cut.c:847 msgid "you must specify a list of bytes, characters, or fields" msgstr "turite pateikti baitų, ženklų ar laukų sąrašą" -#: src/cut.c:844 +#: src/cut.c:850 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:848 +#: src/cut.c:854 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2535,11 +2528,11 @@ msgstr "" "linijų be skirtukų rodymo blokavimas yra prasmingas\n" "\ttik operacijoms su laukais" -#: src/cut.c:864 +#: src/cut.c:870 msgid "missing list of fields" msgstr "trūksta laukų sąrašo" -#: src/cut.c:866 +#: src/cut.c:872 msgid "missing list of positions" msgstr "trūksta pozicijų sąrašo" @@ -2553,9 +2546,11 @@ msgstr "" " arba: %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 "" + +#: src/date.c:134 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" " -I[TIMESPEC], --iso-8601[=TIMESPEC] output date/time in ISO 8601 format.\n" @@ -2564,14 +2559,14 @@ msgid "" " and time to the indicated precision.\n" msgstr "" -#: src/date.c:138 +#: src/date.c:142 msgid "" " -r, --reference=FILE display the last modification time of FILE\n" " -R, --rfc-2822 output date and time in RFC 2822 format.\n" " Example: Mon, 07 Aug 2006 12:34:56 -0600\n" msgstr "" -#: src/date.c:143 +#: src/date.c:147 msgid "" " --rfc-3339=TIMESPEC output date and time in RFC 3339 format.\n" " TIMESPEC='date', 'seconds', or 'ns' for\n" @@ -2582,7 +2577,7 @@ msgid "" " -u, --utc, --universal print or set Coordinated Universal Time\n" msgstr "" -#: src/date.c:154 +#: src/date.c:158 #, fuzzy msgid "" "\n" @@ -2599,7 +2594,7 @@ msgstr "" " %% procento ženklas %\n" " %a lokalusis savaitės dienos sutrumpinimas (pvz., pirm)\n" -#: src/date.c:161 +#: src/date.c:165 #, fuzzy msgid "" " %A locale's full weekday name (e.g., Sunday)\n" @@ -2612,7 +2607,7 @@ msgstr "" " %B lokalusis mėnesio pilnas vardas (pvz., Sausis)\n" " %c lokalioji data ir laikas (pvz., antr Kov 3 23:05:25 2005)\n" -#: src/date.c:167 +#: src/date.c:171 #, fuzzy msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" @@ -2625,7 +2620,7 @@ msgstr "" " %D data; tas pats kaip %m/%d/%y\n" " %e mėnesio diena papildyta tarpais; tas pats kaip $_d\n" -#: src/date.c:173 +#: src/date.c:177 #, fuzzy msgid "" " %F full date; same as %Y-%m-%d\n" @@ -2638,7 +2633,7 @@ msgstr "" " %G metai atitinkantys ISO savaitės numeriui (žiūrėkite %V); įprastai " "naudinga tik su %V\n" -#: src/date.c:178 +#: src/date.c:182 #, fuzzy msgid "" " %h same as %b\n" @@ -2651,7 +2646,7 @@ msgstr "" " %I valanda (01...12)\n" " %j metų diena (001...366)\n" -#: src/date.c:184 +#: src/date.c:188 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -2659,7 +2654,7 @@ msgid "" " %M minute (00..59)\n" msgstr "" -#: src/date.c:190 +#: src/date.c:194 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2670,7 +2665,7 @@ msgid "" " %s seconds since 1970-01-01 00:00:00 UTC\n" msgstr "" -#: src/date.c:199 +#: src/date.c:203 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2678,7 +2673,7 @@ msgid "" " %u day of week (1..7); 1 is Monday\n" msgstr "" -#: src/date.c:205 +#: src/date.c:209 msgid "" " %U week number of year, with Sunday as first day of week (00..53)\n" " %V ISO week number, with Monday as first day of week (01..53)\n" @@ -2686,7 +2681,7 @@ msgid "" " %W week number of year, with Monday as first day of week (00..53)\n" msgstr "" -#: src/date.c:211 +#: src/date.c:215 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -2694,7 +2689,7 @@ msgid "" " %Y year\n" msgstr "" -#: src/date.c:217 +#: src/date.c:221 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -2706,7 +2701,7 @@ msgid "" "By default, date pads numeric fields with zeroes.\n" msgstr "" -#: src/date.c:226 +#: src/date.c:230 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -2717,7 +2712,7 @@ msgid "" " # use opposite case if possible\n" msgstr "" -#: src/date.c:235 +#: src/date.c:239 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -2726,7 +2721,7 @@ msgid "" "O to use the locale's alternate numeric symbols if available.\n" msgstr "" -#: src/date.c:242 +#: src/date.c:246 msgid "" "\n" "Examples:\n" @@ -2740,35 +2735,35 @@ msgid "" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:275 src/dd.c:2193 src/head.c:838 src/md5sum.c:477 -#: src/md5sum.c:798 src/od.c:863 src/od.c:1914 src/pr.c:1176 src/pr.c:1372 -#: src/pr.c:1494 src/stty.c:842 src/tac.c:563 src/tail.c:343 src/tee.c:126 +#: 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 #, c-format msgid "standard input" msgstr "standartinė įvestis" -#: src/date.c:303 src/date.c:523 +#: src/date.c:307 src/date.c:527 #, c-format msgid "invalid date %s" msgstr "klaidinga data %s" -#: src/date.c:414 src/date.c:448 +#: src/date.c:418 src/date.c:452 #, c-format msgid "multiple output formats specified" msgstr "buvo pateikta daug išeities formatų" -#: src/date.c:426 +#: src/date.c:430 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "parametrai specifikuojantys datas spausdinimui išskiria vieni kitus" -#: src/date.c:433 +#: src/date.c:437 #, c-format msgid "the options to print and set the time may not be used together" msgstr "parametrai datos ir laiko spausdinimui negali būti naudojami kartu" -#: src/date.c:454 +#: src/date.c:458 #, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -2776,30 +2771,30 @@ msgid "" "argument must be a format string beginning with '+'" msgstr "" -#: src/date.c:531 +#: src/date.c:535 #, c-format msgid "cannot set date" msgstr "negalima nustatyti datos" -#: src/date.c:554 src/du.c:360 +#: src/date.c:558 src/du.c:371 #, c-format msgid "time %s is out of range" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/dd.c:44 src/factor.c:43 src/rm.c:41 src/tail.c:69 src/touch.c:41 +#: 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 "Paul Rubin" -#: src/dd.c:517 +#: src/dd.c:521 #, c-format msgid "" "Usage: %s [OPERAND]...\n" " or: %s OPTION\n" msgstr "" -#: src/dd.c:522 +#: src/dd.c:526 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -2810,7 +2805,7 @@ msgid "" " ibs=BYTES read up to BYTES bytes at a time (default: 512)\n" msgstr "" -#: src/dd.c:531 +#: src/dd.c:535 msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -2819,13 +2814,14 @@ msgid "" " oflag=FLAGS write as per the comma separated symbol list\n" " seek=N skip N obs-sized blocks at start of output\n" " skip=N skip N ibs-sized blocks at start of input\n" -" status=noxfer suppress transfer statistics\n" +" status=WHICH WHICH info to suppress outputting to stderr;\n" +" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" msgstr "" -#: src/dd.c:541 +#: src/dd.c:546 msgid "" "\n" -"BLOCKS and BYTES may be followed by the following multiplicative suffixes:\n" +"N and BYTES may be followed by the following multiplicative suffixes:\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, and so on for T, P, E, Z, Y.\n" "\n" @@ -2833,7 +2829,7 @@ msgid "" "\n" msgstr "" -#: src/dd.c:550 +#: src/dd.c:555 msgid "" " ascii from EBCDIC to ASCII\n" " ebcdic from ASCII to EBCDIC\n" @@ -2848,7 +2844,7 @@ msgid "" " with block or unblock, pad with spaces rather than NULs\n" msgstr "" -#: src/dd.c:563 +#: src/dd.c:568 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -2858,7 +2854,7 @@ msgid "" " fsync likewise, but also write metadata\n" msgstr "" -#: src/dd.c:571 +#: src/dd.c:576 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -2867,75 +2863,75 @@ msgid "" "suggested)\n" msgstr "" -#: src/dd.c:578 +#: src/dd.c:583 msgid " cio use concurrent I/O for data\n" msgstr "" -#: src/dd.c:580 +#: src/dd.c:585 msgid " direct use direct I/O for data\n" msgstr "" -#: src/dd.c:582 +#: src/dd.c:587 msgid " directory fail unless a directory\n" msgstr "" -#: src/dd.c:584 +#: src/dd.c:589 msgid " dsync use synchronized I/O for data\n" msgstr "" -#: src/dd.c:586 +#: src/dd.c:591 msgid " sync likewise, but also for metadata\n" msgstr "" -#: src/dd.c:587 +#: src/dd.c:592 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr "" -#: src/dd.c:590 +#: src/dd.c:595 msgid " nonblock use non-blocking I/O\n" msgstr "" -#: src/dd.c:592 +#: src/dd.c:597 msgid " noatime do not update access time\n" msgstr "" -#: src/dd.c:595 +#: src/dd.c:600 msgid " nocache discard cached data\n" msgstr "" -#: src/dd.c:598 +#: src/dd.c:603 msgid " noctty do not assign controlling terminal from file\n" msgstr "" -#: src/dd.c:601 +#: src/dd.c:606 msgid " nofollow do not follow symlinks\n" msgstr "" -#: src/dd.c:603 +#: src/dd.c:608 msgid " nolinks fail if multiply-linked\n" msgstr "" -#: src/dd.c:605 +#: src/dd.c:610 msgid " binary use binary I/O for data\n" msgstr "" -#: src/dd.c:607 +#: src/dd.c:612 msgid " text use text I/O for data\n" msgstr "" -#: src/dd.c:609 +#: src/dd.c:614 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:612 +#: src/dd.c:617 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:615 +#: src/dd.c:620 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:620 +#: src/dd.c:625 #, c-format msgid "" "\n" @@ -2952,28 +2948,28 @@ msgid "" "\n" msgstr "" -#: src/dd.c:676 +#: src/dd.c:683 #, c-format msgid "" "%<PRIuMAX>+%<PRIuMAX> records in\n" "%<PRIuMAX>+%<PRIuMAX> records out\n" msgstr "" -#: src/dd.c:682 +#: src/dd.c:689 #, c-format msgid "%<PRIuMAX> truncated record\n" msgid_plural "%<PRIuMAX> truncated records\n" msgstr[0] "" msgstr[1] "" -#: src/dd.c:694 +#: src/dd.c:701 #, c-format msgid "%<PRIuMAX> byte (%s) copied" msgid_plural "%<PRIuMAX> bytes (%s) copied" msgstr[0] "" msgstr[1] "" -#: src/dd.c:712 +#: src/dd.c:720 msgid "Infinity B" msgstr "" @@ -2987,240 +2983,261 @@ 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:725 +#: src/dd.c:733 #, c-format msgid ", %g s, %s/s\n" msgstr "" -#: src/dd.c:804 +#: src/dd.c:812 #, c-format msgid "closing input file %s" msgstr "" -#: src/dd.c:811 +#: src/dd.c:819 #, c-format msgid "closing output file %s" msgstr "" -#: src/dd.c:1014 +#: src/dd.c:1022 #, fuzzy, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "nepavyko pašalinti %s" -#: src/dd.c:1085 src/dd.c:1934 +#: src/dd.c:1093 src/dd.c:1942 #, c-format msgid "writing to %s" msgstr "rašoma į %s" -#: src/dd.c:1199 src/dd.c:1253 +#: src/dd.c:1207 src/dd.c:1261 #, c-format msgid "unrecognized operand %s" msgstr "" -#: src/dd.c:1210 +#: src/dd.c:1218 #, fuzzy msgid "invalid conversion" msgstr "nesamas naudotojas" -#: src/dd.c:1213 src/dd.c:1289 +#: src/dd.c:1221 src/dd.c:1297 #, fuzzy msgid "invalid input flag" msgstr "klaidinga data %s" -#: src/dd.c:1216 src/dd.c:1283 src/dd.c:1295 +#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303 #, fuzzy msgid "invalid output flag" msgstr "nesama grupė" -#: src/dd.c:1219 +#: src/dd.c:1227 #, fuzzy msgid "invalid status flag" msgstr "klaidinga data %s" -#: src/dd.c:1258 src/truncate.c:312 +#: src/dd.c:1266 src/truncate.c:310 #, c-format msgid "invalid number %s" msgstr "" -#: src/dd.c:1340 +#: src/dd.c:1348 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "" -#: src/dd.c:1342 +#: src/dd.c:1350 #, c-format msgid "cannot combine block and unblock" msgstr "" -#: src/dd.c:1344 +#: src/dd.c:1352 #, c-format msgid "cannot combine lcase and ucase" msgstr "" -#: src/dd.c:1346 +#: src/dd.c:1354 #, c-format msgid "cannot combine excl and nocreat" msgstr "" -#: src/dd.c:1349 +#: src/dd.c:1357 #, fuzzy, c-format msgid "cannot combine direct and nocache" msgstr "nepavyksta suderinti režimo ir --reference parametro" -#: src/dd.c:1506 +#: src/dd.c:1514 #, 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:1593 +#: src/dd.c:1601 #, c-format msgid "%s: cannot skip" msgstr "%s: nepavyksta praleisti" -#: src/dd.c:1595 src/dd.c:1614 src/dd.c:1675 +#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683 #, c-format msgid "%s: cannot seek" msgstr "" -#: src/dd.c:1655 +#: src/dd.c:1663 #, c-format msgid "offset overflow while reading file %s" msgstr "" -#: src/dd.c:1667 +#: src/dd.c:1675 #, c-format msgid "warning: invalid file offset after failed read" msgstr "" -#: src/dd.c:1671 +#: src/dd.c:1679 #, c-format msgid "cannot work around kernel bug after all" msgstr "" -#: src/dd.c:1814 +#: src/dd.c:1822 #, c-format msgid "setting flags for %s" msgstr "" -#: src/dd.c:1867 +#: src/dd.c:1875 #, c-format msgid "memory exhausted by input buffer of size %zu bytes (%s)" msgstr "" -#: src/dd.c:1881 +#: src/dd.c:1889 #, c-format msgid "memory exhausted by output buffer of size %zu bytes (%s)" msgstr "" -#: src/dd.c:1914 +#: src/dd.c:1922 #, c-format msgid "%s: cannot skip to specified offset" msgstr "" -#: src/dd.c:2125 src/dd.c:2258 +#: src/dd.c:2133 #, c-format -msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" +msgid "failed to truncate to %<PRIdMAX> bytes in output file %s" msgstr "" -#: src/dd.c:2138 +#: src/dd.c:2146 #, c-format msgid "fdatasync failed for %s" msgstr "" -#: src/dd.c:2148 +#: src/dd.c:2156 #, c-format msgid "fsync failed for %s" msgstr "" -#: src/dd.c:2199 src/dd.c:2228 +#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165 #, c-format -msgid "opening %s" -msgstr "atveriamas %s" +msgid "failed to open %s" +msgstr "nepavyko atverti %s" -#: src/dd.c:2237 +#: src/dd.c:2246 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) " "blocks" msgstr "" -#: src/dd.c:2274 src/dd.c:2280 +#: src/dd.c:2267 +#, c-format +msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" +msgstr "" + +#: src/dd.c:2283 src/dd.c:2289 #, 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:54 src/expr.c:153 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:39 src/sleep.c:35 src/sort.c:66 +#: 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 msgid "Paul Eggert" msgstr "Paul Eggert" -#: src/df.c:140 +#: src/df.c:172 msgid "Filesystem" msgstr "Failų sistema" -#: src/df.c:141 +#: src/df.c:175 msgid "Type" msgstr "Tipas" -#: src/df.c:142 +#: src/df.c:178 src/df.c:542 msgid "blocks" msgstr "blokų" -#: src/df.c:142 -msgid "Inodes" -msgstr "Inodes" - -#: src/df.c:142 -msgid "Size" -msgstr "" - -#: src/df.c:143 +#: src/df.c:181 msgid "Used" msgstr "Naud" -#: src/df.c:143 -msgid "IUsed" -msgstr "INaud" - -#: src/df.c:144 +#: src/df.c:184 msgid "Available" msgstr "Laisva" -#: src/df.c:144 -msgid "IFree" -msgstr "ILsv" - -#: src/df.c:144 -msgid "Avail" -msgstr "Laisva" - -#: src/df.c:145 +#: src/df.c:187 msgid "Use%" msgstr "Nd %" -#: src/df.c:145 +#: src/df.c:190 +msgid "Inodes" +msgstr "Inodes" + +#: src/df.c:193 +msgid "IUsed" +msgstr "INaud" + +#: src/df.c:196 +msgid "IFree" +msgstr "ILsv" + +#: src/df.c:199 msgid "IUse%" msgstr "INd %" -#: src/df.c:145 +#: src/df.c:202 +msgid "Mounted on" +msgstr "Prijungta prie" + +#: src/df.c:383 +#, c-format +msgid "option --output: field '%s' unknown" +msgstr "" + +#: src/df.c:390 +#, fuzzy, c-format +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 +msgid "Size" +msgstr "" + +#: src/df.c:414 src/df.c:451 +msgid "Avail" +msgstr "Laisva" + +#: src/df.c:474 msgid "Capacity" msgstr "" -#: src/df.c:146 -msgid "Mounted on" -msgstr "Prijungta prie" +#. 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 +#, c-format +msgid "%s-%s" +msgstr "" -#: src/df.c:847 +#: src/df.c:1210 msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" -"\n" msgstr "" -#: src/df.c:855 +#: src/df.c:1217 msgid "" " -a, --all include dummy file systems\n" " -B, --block-size=SIZE scale sizes by SIZE before printing them. E.g.,\n" @@ -3232,7 +3249,7 @@ msgid "" " -H, --si likewise, but use powers of 1000 not 1024\n" msgstr "" -#: src/df.c:865 +#: src/df.c:1227 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3241,8 +3258,11 @@ msgid "" "(default)\n" msgstr "" -#: src/df.c:872 +#: src/df.c:1234 msgid "" +" --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" +" or print all fields if FIELD_LIST is " +"omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" " -t, --type=TYPE limit listing to file systems of type TYPE\n" @@ -3251,20 +3271,42 @@ msgid "" " -v (ignored)\n" msgstr "" -#: src/df.c:1027 +#: src/df.c:1248 +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" +msgstr "" + +#: src/df.c:1285 +#, 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 #, c-format msgid "file system type %s both selected and excluded" msgstr "" -#: src/df.c:1075 +#: src/df.c:1500 msgid "Warning: " msgstr "Dėmesio: " -#: src/df.c:1077 src/stat.c:795 +#: src/df.c:1502 src/stat.c:814 msgid "cannot read table of mounted file systems" msgstr "" -#: src/df.c:1107 +#: src/df.c:1539 #, c-format msgid "no file systems processed" msgstr "" @@ -3358,21 +3400,21 @@ msgstr "" " %s /usr/bin/sort Išvedimas „sort“.\n" " %s include/stdio.h .h Išvedimas „stdio“.\n" -#: src/du.c:260 src/sort.c:390 src/wc.c:112 +#: src/du.c:270 src/sort.c:394 src/wc.c:112 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" " or: %s [OPTION]... --files0-from=F\n" msgstr "" -#: src/du.c:264 -msgid "" -"Summarize disk usage of each FILE, recursively for directories.\n" -"\n" +#: src/du.c:274 +msgid "Summarize disk usage of each FILE, recursively for directories.\n" msgstr "" -#: src/du.c:271 +#: src/du.c:280 msgid "" +" -0, --null end each output line with 0 byte rather than " +"newline\n" " -a, --all write counts for all files, not just directories\n" " --apparent-size print apparent sizes, rather than disk usage; " "although\n" @@ -3381,7 +3423,7 @@ msgid "" " fragmentation, indirect blocks, and the like\n" msgstr "" -#: src/du.c:279 +#: src/du.c:289 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" @@ -3390,9 +3432,14 @@ msgid "" " -c, --total produce a grand total\n" " -D, --dereference-args dereference only symlinks that are listed on the\n" " command line\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 "" -#: src/du.c:288 +#: src/du.c:302 msgid "" " --files0-from=F summarize disk usage of the NUL-terminated file\n" " names specified in file F;\n" @@ -3400,41 +3447,29 @@ msgid "" " -H equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" --si like -h, but use powers of 1000 not 1024\n" msgstr "" -#: src/du.c:297 +#: src/du.c:310 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 "" -#: src/du.c:302 +#: src/du.c:316 msgid "" -" -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " "default)\n" -" -0, --null end each output line with 0 byte rather than " -"newline\n" " -S, --separate-dirs 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:309 -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 "" - -#: src/du.c:318 +#: src/du.c:322 msgid "" +" -t, --threshold=SIZE exclude entries smaller than SIZE if positive,\n" +" or entries greater than SIZE if negative\n" " --time show time of the last modification of any file in " "the\n" " directory, or any of its subdirectories\n" @@ -3445,63 +3480,72 @@ msgid "" " FORMAT is interpreted like 'date'\n" msgstr "" -#: src/du.c:375 +#: src/du.c:333 +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 msgid "Infinity" msgstr "" -#: src/du.c:600 +#: src/du.c:507 +#, c-format +msgid "mount point %s already traversed" +msgstr "" + +#: src/du.c:624 #, fuzzy, c-format msgid "fts_read failed: %s" msgstr "nepavyko fts_read" -#: src/du.c:724 +#: src/du.c:780 #, c-format msgid "invalid maximum depth %s" msgstr "" -#: src/du.c:817 +#: src/du.c:809 +#, fuzzy, c-format +msgid "invalid --threshold argument '-0'" +msgstr "netinkamas argumentas %s" + +#: src/du.c:887 #, c-format msgid "cannot both summarize and show all entries" msgstr "" -#: src/du.c:824 +#: src/du.c:894 #, c-format msgid "warning: summarizing is the same as using --max-depth=0" msgstr "" -#: src/du.c:830 +#: src/du.c:900 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "" -#: src/du.c:896 src/sort.c:4479 src/wc.c:668 +#: src/du.c:966 src/sort.c:4533 src/wc.c:668 msgid "file operands cannot be combined with --files0-from" msgstr "" -#: src/du.c:949 src/md5sum.c:587 src/od.c:903 src/tac.c:239 src/tac.c:350 -#: src/tac.c:506 src/tac.c:586 src/wc.c:733 +#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 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:963 src/sort.c:4508 src/wc.c:747 +#: src/du.c:1040 src/sort.c:4562 src/wc.c:747 #, c-format msgid "when reading file names from stdin, no file name of %s allowed" msgstr "" -#: src/du.c:980 src/du.c:988 src/wc.c:760 src/wc.c:768 +#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768 msgid "invalid zero-length file name" msgstr "" -#: src/du.c:1007 src/head.c:149 src/head.c:262 src/head.c:334 src/head.c:538 -#: src/head.c:620 src/head.c:692 src/head.c:750 src/head.c:774 src/tail.c:412 -#: src/tail.c:500 src/tail.c:549 src/tail.c:642 src/tail.c:770 src/tail.c:818 -#: src/tail.c:855 src/tail.c:1782 src/tail.c:1812 src/uniq.c:395 -#, c-format -msgid "error reading %s" -msgstr "klaida skaitant %s" - -#: src/du.c:1010 src/ls.c:2649 src/wc.c:791 +#: src/du.c:1088 src/ls.c:2649 src/wc.c:791 msgid "total" msgstr "viso" @@ -3581,74 +3625,78 @@ msgid "Usage: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n" msgstr "" #: src/env.c:55 +msgid "Set each NAME to VALUE in the environment and run COMMAND.\n" +msgstr "" + +#: src/env.c:61 msgid "" -"Set each NAME to VALUE in the environment and run COMMAND.\n" -"\n" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with 0 byte rather than newline\n" " -u, --unset=NAME remove variable from the environment\n" msgstr "" -#: src/env.c:64 +#: src/env.c:68 msgid "" "\n" "A mere - implies -i. If no COMMAND, print the resulting environment.\n" msgstr "" -#: src/env.c:120 +#: src/env.c:124 #, fuzzy, c-format msgid "cannot unset %s" msgstr "nepavyksta paleisti %s" -#: src/env.c:131 +#: src/env.c:135 #, fuzzy, c-format msgid "cannot set %s" msgstr "nepavyksta patikrinti %s" -#: src/env.c:148 +#: src/env.c:152 #, c-format msgid "cannot specify --null (-0) with command" msgstr "" #: 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" -"\n" msgstr "" +"\n" +"Kai nenurodytas FAILAS, arba FAILAS yra -, nuskaityti standartinę įvestį.\n" -#: src/expand.c:115 +#: src/expand.c:114 msgid "" " -i, --initial do not convert tabs after non blanks\n" " -t, --tabs=NUMBER have tabs NUMBER characters apart, not 8\n" msgstr "" -#: src/expand.c:119 +#: src/expand.c:118 msgid "" " -t, --tabs=LIST use comma separated list of explicit tab positions\n" msgstr "" -#: src/expand.c:172 src/unexpand.c:191 +#: src/expand.c:171 src/unexpand.c:190 #, c-format msgid "tab stop is too large %s" msgstr "" -#: src/expand.c:180 src/unexpand.c:199 +#: src/expand.c:179 src/unexpand.c:198 #, c-format msgid "tab size contains invalid character(s): %s" msgstr "" -#: src/expand.c:206 src/unexpand.c:225 +#: src/expand.c:205 src/unexpand.c:224 #, c-format msgid "tab size cannot be 0" msgstr "" -#: src/expand.c:208 src/unexpand.c:227 +#: src/expand.c:207 src/unexpand.c:226 #, c-format msgid "tab sizes must be ascending" msgstr "" -#: src/expand.c:326 src/expand.c:345 src/unexpand.c:374 src/unexpand.c:419 +#: 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 "įvesties eilutė per ilga" @@ -3760,12 +3808,12 @@ msgstr "" msgid "non-integer argument" msgstr "ne skaitinis argumentas" -#: src/expr.c:793 src/truncate.c:316 +#: src/expr.c:793 src/truncate.c:314 #, c-format msgid "division by zero" msgstr "dalyba iš nulio" -#: src/expr.c:887 src/sort.c:2029 +#: src/expr.c:887 src/sort.c:2044 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "nustatykite LC_ALL='C', kad išvengtumėte problemos" @@ -3775,25 +3823,32 @@ msgstr "nustatykite LC_ALL='C', kad išvengtumėte problemos" msgid "the strings compared were %s and %s" msgstr "buvo palygintos eilutės %s ir %s" -#: src/factor.c:449 -msgid "using arbitrary-precision arithmetic" +#. This is a proper name. See the gettext manual, section Names. +#: src/factor.c:111 +msgid "Niels Moller" msgstr "" -#: src/factor.c:460 -msgid "using single-precision arithmetic" +#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459 +#, c-format +msgid "Lucas prime test failure. This should not happen" msgstr "" -#: src/factor.c:465 src/od.c:1640 src/od.c:1709 +#: src/factor.c:2092 #, c-format -msgid "%s is too large" -msgstr "%s yra per didelis" +msgid "squfof queue overflow" +msgstr "" -#: src/factor.c:469 +#: src/factor.c:2419 #, c-format msgid "%s is not a valid positive integer" msgstr "" -#: src/factor.c:494 +#: src/factor.c:2442 src/od.c:1646 src/od.c:1715 +#, c-format +msgid "%s is too large" +msgstr "%s yra per didelis" + +#: src/factor.c:2454 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -3802,7 +3857,7 @@ msgstr "" "Naudojimas: %s [SKAIČIUS]...\n" " arba: %s PARAMETRAS\n" -#: src/factor.c:499 +#: src/factor.c:2459 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" @@ -3826,20 +3881,19 @@ msgid "cannot stat current directory (now %s)" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/fmt.c:37 +#: src/fmt.c:38 msgid "Ross Paterson" msgstr "Ross Paterson" -#: src/fmt.c:269 +#: src/fmt.c:270 #, c-format msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n" msgstr "Naudojimas: %s [-PLOTIS] [PARAMETRAS]... [FAILAS]...\n" -#: src/fmt.c:270 +#: 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" -"\n" msgstr "" #: src/fmt.c:278 @@ -3850,8 +3904,8 @@ msgid "" " -s, --split-only split long lines, but do not refill\n" msgstr "" -#: src/fmt.c:285 -#, c-format +#: src/fmt.c:287 +#, 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" @@ -3859,14 +3913,14 @@ msgid "" " -g, --goal=WIDTH goal width (default of 93% of width)\n" msgstr "" -#: src/fmt.c:357 +#: src/fmt.c:359 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" "option; use -w N instead" msgstr "" -#: src/fmt.c:403 src/fmt.c:414 +#: src/fmt.c:405 src/fmt.c:416 #, c-format msgid "invalid width: %s" msgstr "netinkamas plotis: %s" @@ -3875,23 +3929,22 @@ msgstr "netinkamas plotis: %s" msgid "" "Wrap input lines in each FILE (standard input by default), writing to\n" "standard output.\n" -"\n" msgstr "" -#: src/fold.c:78 +#: src/fold.c:77 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" " -w, --width=WIDTH use WIDTH columns instead of 80\n" msgstr "" -#: src/fold.c:289 src/pr.c:836 +#: src/fold.c:288 src/pr.c:832 #, c-format 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:75 +#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 #: src/truncate.c:37 msgid "Padraig Brady" msgstr "Padraig Brady" @@ -3907,17 +3960,17 @@ msgid "" "\n" msgstr "" -#: src/group-list.c:69 src/id.c:345 src/setuidgid.c:184 +#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184 #, c-format msgid "failed to get groups for user %s" msgstr "" -#: src/group-list.c:74 src/id.c:350 +#: src/group-list.c:74 src/id.c:370 #, fuzzy, c-format msgid "failed to get groups for the current process" msgstr "Nepavyko pakeisti %s grupės į %s\n" -#: src/group-list.c:104 +#: src/group-list.c:114 #, c-format msgid "cannot find name for group ID %lu" msgstr "" @@ -3959,10 +4012,9 @@ 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" -"\n" msgstr "" -#: src/head.c:118 +#: src/head.c:117 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -3972,13 +4024,13 @@ msgid "" " K lines of each file\n" msgstr "" -#: src/head.c:126 +#: 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 "" -#: src/head.c:132 +#: src/head.c:131 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -3986,58 +4038,58 @@ msgid "" "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n" msgstr "" -#: src/head.c:152 -#, c-format -msgid "error writing %s" -msgstr "klaida rašant %s" - -#: src/head.c:155 +#: src/head.c:154 #, c-format msgid "%s: file has shrunk too much" msgstr "" -#: src/head.c:228 src/head.c:1044 +#: src/head.c:227 src/head.c:1051 #, c-format msgid "%s: number of bytes is too large" msgstr "" -#: src/head.c:441 +#: src/head.c:440 #, c-format msgid "%s: cannot lseek back to original position" msgstr "" -#: src/head.c:613 src/head.c:684 src/tail.c:450 +#: src/head.c:612 src/head.c:691 src/tail.c:449 #, c-format msgid "%s: cannot seek to offset %s" msgstr "" -#: src/head.c:791 +#: src/head.c:673 +#, fuzzy, c-format +msgid "%s: failed to reset file pointer" +msgstr "nepavyko pašalinti %s" + +#: src/head.c:798 #, c-format msgid "cannot reposition file pointer for %s" msgstr "" -#: src/head.c:878 +#: src/head.c:885 #, c-format msgid "%s: %s is so large that it is not representable" msgstr "" -#: src/head.c:879 +#: src/head.c:886 msgid "number of lines" msgstr "eilučių skaičius" -#: src/head.c:879 +#: src/head.c:886 msgid "number of bytes" msgstr "baitų skaičius" -#: src/head.c:886 src/tail.c:1947 +#: src/head.c:893 src/tail.c:1947 msgid "invalid number of lines" msgstr "" -#: src/head.c:887 src/tail.c:1948 +#: src/head.c:894 src/tail.c:1948 msgid "invalid number of bytes" msgstr "" -#: src/head.c:974 src/head.c:1032 +#: src/head.c:981 src/head.c:1039 #, c-format msgid "invalid trailing option -- %c" msgstr "" @@ -4134,87 +4186,87 @@ msgstr "" msgid "cannot get effective UID" msgstr "negalima nuimti rodyklės nuo %s" -#: src/id.c:289 +#: src/id.c:311 #, fuzzy, c-format -msgid "cannot find name for user ID %lu" +msgid "cannot find name for user ID %s" msgstr "negalima palyginti failų vardų %s ir %s" -#: src/id.c:309 +#: src/id.c:329 #, fuzzy, c-format -msgid "uid=%lu" +msgid "uid=%s" msgstr "uid=%lu" -#: src/id.c:314 -#, fuzzy, c-format -msgid " gid=%lu" -msgstr "uid=%lu" +#: src/id.c:334 +#, c-format +msgid " gid=%s" +msgstr "" -#: src/id.c:321 +#: src/id.c:341 #, fuzzy, c-format -msgid " euid=%lu" +msgid " euid=%s" msgstr "uid=%lu" -#: src/id.c:329 +#: src/id.c:349 #, c-format -msgid " egid=%lu" +msgid " egid=%s" msgstr "" -#: src/id.c:357 +#: src/id.c:377 #, fuzzy msgid " groups=" msgstr " grupės=" -#: src/id.c:373 +#: src/id.c:393 #, fuzzy, c-format msgid " context=%s" msgstr "nepavyksta įvykdyti %s" -#: src/install.c:372 +#: src/install.c:373 #, c-format msgid "warning: %s: failed to change context to %s" msgstr "" -#: src/install.c:413 +#: src/install.c:414 #, c-format msgid "creating directory %s" msgstr "kuriamas aplankas %s" -#: src/install.c:481 +#: src/install.c:482 #, c-format msgid "cannot change ownership of %s" msgstr "" -#: src/install.c:505 +#: src/install.c:506 #, c-format msgid "cannot set time stamps for %s" msgstr "" -#: src/install.c:526 src/split.c:412 src/timeout.c:387 +#: src/install.c:527 src/split.c:426 src/timeout.c:439 #, c-format msgid "fork system call failed" msgstr "" -#: src/install.c:530 +#: src/install.c:531 #, c-format msgid "cannot run %s" msgstr "nepavyksta paleisti %s" -#: src/install.c:534 +#: src/install.c:535 #, c-format msgid "waiting for strip" msgstr "" -#: src/install.c:536 +#: src/install.c:537 #, c-format msgid "strip process terminated abnormally" msgstr "" -#: src/install.c:557 +#: src/install.c:558 #, c-format msgid "invalid user %s" msgstr "netinkamas naudotojas %s" -#: src/install.c:593 +#: src/install.c:594 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -4223,7 +4275,7 @@ msgid "" " or: %s [OPTION]... -d DIRECTORY...\n" msgstr "" -#: src/install.c:600 +#: src/install.c:601 msgid "" "\n" "This install program copies files (often just compiled) into destination\n" @@ -4235,7 +4287,6 @@ msgid "" "In the first three forms, copy SOURCE to DEST or multiple SOURCE(s) to\n" "the existing DIRECTORY, while setting permission modes and owner/group.\n" "In the 4th form, create all components of the given DIRECTORY(ies).\n" -"\n" msgstr "" #: src/install.c:615 @@ -4283,53 +4334,53 @@ msgid "" "directories\n" msgstr "" -#: src/install.c:858 +#: src/install.c:859 #, c-format msgid "" "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled" msgstr "" -#: src/install.c:868 +#: src/install.c:869 #, c-format msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled" msgstr "" -#: src/install.c:885 +#: src/install.c:886 #, c-format msgid "the strip option may not be used when installing a directory" msgstr "" -#: src/install.c:888 +#: src/install.c:889 #, c-format msgid "target directory not allowed when installing a directory" msgstr "" -#: src/install.c:892 +#: src/install.c:893 #, c-format msgid "cannot force target context to %s and preserve it" msgstr "" -#: src/install.c:946 src/mkdir.c:202 src/stdbuf.c:327 +#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326 #, c-format msgid "invalid mode %s" msgstr "netinkamos teisės %s" -#: src/install.c:953 +#: src/install.c:954 #, c-format msgid "WARNING: ignoring --strip-program option as -s option was not specified" msgstr "" -#: src/install.c:958 +#: src/install.c:959 #, 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:965 +#: src/install.c:966 #, fuzzy, c-format msgid "options --compare (-C) and --strip are mutually exclusive" msgstr "parametrai specifikuojantys datas spausdinimui išskiria vieni kitus" -#: src/install.c:971 +#: src/install.c:972 #, c-format msgid "" "the --compare (-C) option is ignored when you specify a mode with non-" @@ -4337,7 +4388,7 @@ msgid "" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/join.c:40 src/sort.c:65 +#: src/join.c:40 src/sort.c:66 msgid "Mike Haertel" msgstr "Mike Haertel" @@ -4393,7 +4444,7 @@ msgstr "" #: src/join.c:403 #, c-format -msgid "%s:%ju: is not sorted: %.*s" +msgid "%s:%<PRIuMAX>: is not sorted: %.*s" msgstr "" #: src/join.c:840 src/join.c:1038 @@ -4421,12 +4472,12 @@ msgstr "" msgid "conflicting empty-field replacement strings" msgstr "" -#: src/join.c:1101 src/sort.c:4414 +#: src/join.c:1101 src/sort.c:4468 #, c-format msgid "multi-character tab %s" msgstr "" -#: src/join.c:1105 src/sort.c:4419 +#: src/join.c:1105 src/sort.c:4473 #, c-format msgid "incompatible tabs" msgstr "" @@ -4445,12 +4496,10 @@ msgid "" msgstr "" #: src/kill.c:82 -msgid "" -"Send signals to processes, or list signals.\n" -"\n" +msgid "Send signals to processes, or list signals.\n" msgstr "" -#: src/kill.c:89 +#: src/kill.c:88 msgid "" " -s, --signal=SIGNAL, -SIGNAL\n" " specify the name or number of the signal to be sent\n" @@ -4459,7 +4508,7 @@ msgid "" " -t, --table print a table of signal information\n" msgstr "" -#: src/kill.c:97 +#: src/kill.c:96 msgid "" "\n" "SIGNAL may be a signal name like 'HUP', or a signal number like '1',\n" @@ -4467,32 +4516,32 @@ msgid "" "PID is an integer; if negative it identifies a process group.\n" msgstr "" -#: src/kill.c:206 +#: src/kill.c:205 #, c-format msgid "%s: invalid process id" msgstr "" -#: src/kill.c:260 +#: src/kill.c:259 #, c-format msgid "invalid option -- %c" msgstr "" -#: src/kill.c:269 +#: src/kill.c:268 #, c-format msgid "%s: multiple signals specified" msgstr "" -#: src/kill.c:283 +#: src/kill.c:282 #, c-format msgid "multiple -l or -t options specified" msgstr "" -#: src/kill.c:300 +#: src/kill.c:299 #, c-format msgid "cannot combine signal with -l or -t" msgstr "" -#: src/kill.c:306 +#: src/kill.c:305 #, c-format msgid "no process ID specified" msgstr "" @@ -4594,10 +4643,9 @@ msgid "" "When creating hard links, each TARGET must exist. Symbolic links\n" "can hold arbitrary text; if later resolved, a relative link is\n" "interpreted in relation to its parent directory.\n" -"\n" msgstr "" -#: src/ln.c:395 +#: src/ln.c:394 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -4610,7 +4658,7 @@ msgid "" " -f, --force remove existing destination files\n" msgstr "" -#: src/ln.c:403 +#: src/ln.c:402 msgid "" " -i, --interactive prompt whether to remove destinations\n" " -L, --logical dereference TARGETs that are symbolic links\n" @@ -4622,7 +4670,7 @@ msgid "" " -s, --symbolic make symbolic links instead of hard links\n" msgstr "" -#: src/ln.c:412 +#: src/ln.c:411 msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" " -t, --target-directory=DIRECTORY specify the DIRECTORY in which to " @@ -4632,18 +4680,10 @@ msgid "" " -v, --verbose print name of each linked file\n" msgstr "" -#: src/ln.c:428 -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 "" - -#: src/ln.c:435 +#: src/ln.c:433 #, 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 "" @@ -4715,7 +4755,7 @@ msgstr "" msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "" -#: src/ls.c:1750 src/ptx.c:1976 +#: src/ls.c:1750 src/ptx.c:1975 #, c-format msgid "invalid line width: %s" msgstr "" @@ -4779,7 +4819,7 @@ msgstr "skaitomas aplankas %s" msgid "closing directory %s" msgstr "užveriamas aplankas %s" -#: src/ls.c:3301 +#: src/ls.c:3302 #, c-format msgid "cannot compare file names %s and %s" msgstr "negalima palyginti failų vardų %s ir %s" @@ -4788,10 +4828,9 @@ msgstr "negalima palyginti failų vardų %s ir %s" msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" -"\n" msgstr "" -#: src/ls.c:4729 +#: src/ls.c:4728 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -4800,7 +4839,7 @@ msgid "" "characters\n" msgstr "" -#: src/ls.c:4735 +#: src/ls.c:4734 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them. E." "g.,\n" @@ -4814,7 +4853,7 @@ msgid "" " otherwise: sort by ctime, newest first\n" msgstr "" -#: src/ls.c:4745 +#: src/ls.c:4744 msgid "" " -C list entries by columns\n" " --color[=WHEN] colorize the output. WHEN defaults to " @@ -4826,7 +4865,7 @@ msgid "" " -D, --dired generate output designed for Emacs' dired mode\n" msgstr "" -#: src/ls.c:4753 +#: src/ls.c:4752 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -4836,11 +4875,11 @@ msgid "" " --full-time like -l --time-style=full-iso\n" msgstr "" -#: src/ls.c:4761 +#: src/ls.c:4760 msgid " -g like -l, but do not list owner\n" msgstr "" -#: src/ls.c:4764 +#: src/ls.c:4763 msgid "" " --group-directories-first\n" " group directories before files.\n" @@ -4848,7 +4887,7 @@ msgid "" " use of --sort=none (-U) disables grouping\n" msgstr "" -#: src/ls.c:4770 +#: src/ls.c:4769 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" @@ -4856,7 +4895,7 @@ msgid "" " --si likewise, but use powers of 1000 not 1024\n" msgstr "" -#: src/ls.c:4776 +#: src/ls.c:4775 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -4869,7 +4908,7 @@ msgid "" " (overridden by -a or -A)\n" msgstr "" -#: src/ls.c:4786 +#: src/ls.c:4785 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -4881,7 +4920,7 @@ msgid "" " -k, --kibibytes use 1024-byte blocks\n" msgstr "" -#: src/ls.c:4796 +#: src/ls.c:4795 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -4891,7 +4930,7 @@ msgid "" "entries\n" msgstr "" -#: src/ls.c:4804 +#: src/ls.c:4803 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. " @@ -4902,7 +4941,7 @@ msgid "" " append / indicator to directories\n" msgstr "" -#: src/ls.c:4812 +#: src/ls.c:4811 msgid "" " -q, --hide-control-chars print ? instead of non graphic characters\n" " --show-control-chars show non graphic characters as-is (default\n" @@ -4914,7 +4953,7 @@ msgid "" "escape\n" msgstr "" -#: src/ls.c:4821 +#: src/ls.c:4820 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -4922,7 +4961,7 @@ msgid "" "blocks\n" msgstr "" -#: src/ls.c:4826 +#: src/ls.c:4825 msgid "" " -S sort by file size\n" " --sort=WORD sort by WORD instead of name: none -U,\n" @@ -4934,7 +4973,7 @@ msgid "" " if --sort=time\n" msgstr "" -#: src/ls.c:4836 +#: src/ls.c:4835 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, +FORMAT.\n" @@ -4946,13 +4985,13 @@ msgid "" " takes effect only outside the POSIX locale\n" msgstr "" -#: src/ls.c:4845 +#: src/ls.c:4844 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:4849 +#: src/ls.c:4848 msgid "" " -u with -lt: sort by, and show, access time\n" " with -l: show access time and sort by name\n" @@ -4961,7 +5000,7 @@ msgid "" " -v natural sort of (version) numbers within text\n" msgstr "" -#: src/ls.c:4856 +#: src/ls.c:4855 msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" @@ -4971,7 +5010,7 @@ msgid "" " -1 list one file per line\n" msgstr "" -#: src/ls.c:4866 +#: src/ls.c:4865 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -4980,7 +5019,7 @@ msgid "" "variable can change the settings. Use the dircolors command to set it.\n" msgstr "" -#: src/ls.c:4873 +#: src/ls.c:4872 msgid "" "\n" "Exit status:\n" @@ -5004,7 +5043,7 @@ msgstr "Scott Miller" msgid "David Madore" msgstr "David Madore" -#: src/md5sum.c:162 +#: src/md5sum.c:164 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -5015,31 +5054,35 @@ msgstr "" "\n" "Kai nenurodytas FAILAS, arba FAILAS yra -, nuskaityti standartinę įvestį.\n" -#: src/md5sum.c:172 +#: src/md5sum.c:174 msgid "" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr "" -#: src/md5sum.c:176 +#: src/md5sum.c:178 msgid " -b, --binary read in binary mode\n" msgstr "" -#: src/md5sum.c:179 +#: src/md5sum.c:181 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr "" -#: src/md5sum.c:183 +#: src/md5sum.c:184 +msgid " --tag create a BSD-style checksum\n" +msgstr "" + +#: src/md5sum.c:188 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" -#: src/md5sum.c:187 +#: src/md5sum.c:192 msgid " -t, --text read in text mode (default)\n" msgstr "" -#: src/md5sum.c:190 +#: src/md5sum.c:195 msgid "" "\n" "The following three options are useful only when verifying checksums:\n" @@ -5049,12 +5092,12 @@ msgid "" "\n" msgstr "" -#: src/md5sum.c:198 +#: src/md5sum.c:203 msgid "" " --strict with --check, exit non-zero for any invalid input\n" msgstr "" -#: src/md5sum.c:203 +#: src/md5sum.c:208 #, c-format msgid "" "\n" @@ -5064,35 +5107,35 @@ msgid "" "space for text), and name for each FILE.\n" msgstr "" -#: src/md5sum.c:502 +#: src/md5sum.c:523 #, c-format msgid "%s: too many checksum lines" msgstr "" -#: src/md5sum.c:526 +#: src/md5sum.c:547 #, c-format msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line" msgstr "" -#: src/md5sum.c:551 +#: src/md5sum.c:572 #, c-format msgid "%s: FAILED open or read\n" msgstr "" -#: src/md5sum.c:574 +#: src/md5sum.c:595 msgid "FAILED" msgstr "NEPAVYKO" -#: src/md5sum.c:576 +#: src/md5sum.c:597 msgid "OK" msgstr "OK" -#: src/md5sum.c:600 +#: src/md5sum.c:621 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "" -#: src/md5sum.c:610 +#: src/md5sum.c:631 #, c-format msgid "WARNING: %<PRIuMAX> line is improperly formatted" msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted" @@ -5100,7 +5143,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/md5sum.c:618 +#: src/md5sum.c:639 #, c-format msgid "WARNING: %<PRIuMAX> listed file could not be read" msgid_plural "WARNING: %<PRIuMAX> listed files could not be read" @@ -5108,7 +5151,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/md5sum.c:626 +#: src/md5sum.c:647 #, c-format msgid "WARNING: %<PRIuMAX> computed checksum did NOT match" msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match" @@ -5116,28 +5159,38 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/md5sum.c:704 +#: src/md5sum.c:760 +#, c-format +msgid "--tag does not support --text mode" +msgstr "" + +#: src/md5sum.c:766 +#, c-format +msgid "the --tag option is meaningless when verifying checksums" +msgstr "" + +#: src/md5sum.c:773 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" msgstr "" -#: src/md5sum.c:712 +#: src/md5sum.c:781 #, c-format msgid "the --status option is meaningful only when verifying checksums" msgstr "" -#: src/md5sum.c:719 +#: src/md5sum.c:788 #, c-format msgid "the --warn option is meaningful only when verifying checksums" msgstr "" -#: src/md5sum.c:726 +#: src/md5sum.c:795 #, c-format msgid "the --quiet option is meaningful only when verifying checksums" msgstr "" -#: src/md5sum.c:733 +#: src/md5sum.c:802 #, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "" @@ -5148,12 +5201,10 @@ msgid "Usage: %s [OPTION]... DIRECTORY...\n" msgstr "Naudojimas: %s [PARAMETRAS]... APLANKAS...\n" #: src/mkdir.c:57 -msgid "" -"Create the DIRECTORY(ies), if they do not already exist.\n" -"\n" +msgid "Create the DIRECTORY(ies), if they do not already exist.\n" msgstr "" -#: src/mkdir.c:64 +#: src/mkdir.c:63 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" @@ -5162,7 +5213,7 @@ msgid "" " directory to CTX\n" msgstr "" -#: src/mkdir.c:169 +#: src/mkdir.c:168 #, c-format msgid "created directory %s" msgstr "sukurtas aplankas %s" @@ -5173,27 +5224,25 @@ msgid "Usage: %s [OPTION]... NAME...\n" msgstr "Naudojimas: %s [PARAMETRAS]... PAVADINIMAS?...\n" #: src/mkfifo.c:52 -msgid "" -"Create named pipes (FIFOs) with the given NAMEs.\n" -"\n" +msgid "Create named pipes (FIFOs) with the given NAMEs.\n" msgstr "" -#: src/mkfifo.c:59 src/mknod.c:61 +#: src/mkfifo.c:58 src/mknod.c:60 msgid "" " -m, --mode=MODE set file permission bits to MODE, not a=rw - umask\n" msgstr "" -#: src/mkfifo.c:62 +#: src/mkfifo.c:61 msgid "" " -Z, --context=CTX set the SELinux security context of each NAME to CTX\n" msgstr "" -#: src/mkfifo.c:122 src/mknod.c:128 +#: src/mkfifo.c:121 src/mknod.c:127 #, c-format msgid "invalid mode" msgstr "netaisyklinga veiksena" -#: src/mkfifo.c:127 src/mknod.c:133 +#: src/mkfifo.c:126 src/mknod.c:132 #, c-format msgid "mode must specify only file permission bits" msgstr "" @@ -5204,16 +5253,14 @@ msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n" msgstr "" #: src/mknod.c:54 -msgid "" -"Create the special file NAME of the given TYPE.\n" -"\n" +msgid "Create the special file NAME of the given TYPE.\n" msgstr "" -#: src/mknod.c:64 +#: src/mknod.c:63 msgid " -Z, --context=CTX set the SELinux security context of NAME to CTX\n" msgstr "" -#: src/mknod.c:69 +#: src/mknod.c:68 msgid "" "\n" "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n" @@ -5222,7 +5269,7 @@ msgid "" "otherwise, as decimal. TYPE may be:\n" msgstr "" -#: src/mknod.c:76 +#: src/mknod.c:75 msgid "" "\n" " b create a block (buffered) special file\n" @@ -5230,40 +5277,40 @@ msgid "" " p create a FIFO\n" msgstr "" -#: src/mknod.c:151 +#: src/mknod.c:150 msgid "Special files require major and minor device numbers." msgstr "" -#: src/mknod.c:161 +#: src/mknod.c:160 msgid "Fifos do not have major and minor device numbers." msgstr "" -#: src/mknod.c:177 +#: src/mknod.c:176 #, c-format msgid "block special files not supported" msgstr "" -#: src/mknod.c:186 +#: src/mknod.c:185 #, c-format msgid "character special files not supported" msgstr "" -#: src/mknod.c:202 +#: src/mknod.c:201 #, c-format msgid "invalid major device number %s" msgstr "" -#: src/mknod.c:207 +#: src/mknod.c:206 #, c-format msgid "invalid minor device number %s" msgstr "" -#: src/mknod.c:212 +#: src/mknod.c:211 #, c-format msgid "invalid device %s %s" msgstr "" -#: src/mknod.c:226 +#: src/mknod.c:225 #, c-format msgid "invalid device type %s" msgstr "" @@ -5322,58 +5369,56 @@ msgid "" " directory specified via -p; else /tmp [deprecated]\n" msgstr "" -#: src/mktemp.c:222 +#: src/mktemp.c:223 #, c-format msgid "failed to redirect stderr to /dev/null" msgstr "" -#: src/mktemp.c:228 +#: src/mktemp.c:229 #, c-format msgid "too many templates" msgstr "per daug šablonų" -#: src/mktemp.c:248 +#: src/mktemp.c:249 #, c-format msgid "with --suffix, template %s must end in X" msgstr "" -#: src/mktemp.c:273 src/split.c:1117 +#: src/mktemp.c:274 src/split.c:1130 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "" -#: src/mktemp.c:278 +#: src/mktemp.c:279 #, c-format msgid "too few X's in template %s" msgstr "" -#: src/mktemp.c:291 +#: src/mktemp.c:292 #, c-format msgid "invalid template, %s, contains directory separator" msgstr "" -#: src/mktemp.c:305 +#: src/mktemp.c:306 #, c-format msgid "invalid template, %s; with --tmpdir, it may not be absolute" msgstr "" -#: src/mktemp.c:325 +#: src/mktemp.c:326 #, c-format msgid "failed to create directory via template %s" msgstr "" -#: src/mktemp.c:335 +#: src/mktemp.c:336 #, c-format msgid "failed to create file via template %s" msgstr "" -#: src/mv.c:290 -msgid "" -"Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" -"\n" +#: src/mv.c:292 +msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" msgstr "" -#: src/mv.c:297 +#: src/mv.c:298 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -5386,7 +5431,7 @@ msgid "" "effect.\n" msgstr "" -#: src/mv.c:306 +#: src/mv.c:307 msgid "" " --strip-trailing-slashes remove any trailing slashes from each " "SOURCE\n" @@ -5394,7 +5439,7 @@ msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" msgstr "" -#: src/mv.c:311 +#: src/mv.c:312 msgid "" " -t, --target-directory=DIRECTORY move all SOURCE arguments into " "DIRECTORY\n" @@ -5414,28 +5459,30 @@ msgstr "Naudojimas: %s [PARAMETRAS] [KOMANDA [ARG]...]\n" #, c-format msgid "" "Run COMMAND with an adjusted niceness, which affects process scheduling.\n" -"With no COMMAND, print the current niceness. Nicenesses range from\n" -"%d (most favorable scheduling) to %d (least favorable).\n" -"\n" -" -n, --adjustment=N add integer N to the niceness (default 10)\n" +"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 "" + +#: src/nice.c:82 +msgid " -n, --adjustment=N add integer N to the niceness (default 10)\n" msgstr "" -#: src/nice.c:168 +#: src/nice.c:172 #, c-format msgid "invalid adjustment %s" msgstr "" -#: src/nice.c:177 +#: src/nice.c:181 #, c-format msgid "a command must be given with an adjustment" msgstr "" -#: src/nice.c:184 src/nice.c:195 +#: src/nice.c:188 src/nice.c:199 #, c-format msgid "cannot get niceness" msgstr "" -#: src/nice.c:201 +#: src/nice.c:205 #, c-format msgid "cannot set niceness" msgstr "" @@ -5445,21 +5492,23 @@ msgstr "" msgid "Scott Bartram" msgstr "Scott Bartram" -#: src/nl.c:186 +#: 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" -"\n" msgstr "" +"\n" +"Kai nenurodytas FAILAS, arba FAILAS yra -, nuskaityti standartinę įvestį.\n" -#: src/nl.c:194 +#: src/nl.c:186 msgid "" " -b, --body-numbering=STYLE use STYLE for numbering body lines\n" " -d, --section-delimiter=CC use CC for separating logical pages\n" " -f, --footer-numbering=STYLE use STYLE for numbering footer lines\n" msgstr "" -#: src/nl.c:199 +#: src/nl.c:191 msgid "" " -h, --header-numbering=STYLE use STYLE for numbering header lines\n" " -i, --line-increment=NUMBER line number increment at each line\n" @@ -5471,13 +5520,13 @@ msgid "" " -s, --number-separator=STRING add STRING after (possible) line number\n" msgstr "" -#: src/nl.c:207 +#: src/nl.c:199 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 "" -#: src/nl.c:213 +#: src/nl.c:205 msgid "" "\n" "By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC are\n" @@ -5485,7 +5534,7 @@ msgid "" "second character implies :. Type \\\\ for \\. STYLE is one of:\n" msgstr "" -#: src/nl.c:219 +#: src/nl.c:211 msgid "" "\n" " a number all lines\n" @@ -5502,52 +5551,47 @@ msgid "" "\n" msgstr "" -#: src/nl.c:286 +#: src/nl.c:278 #, c-format msgid "line number overflow" msgstr "" -#: src/nl.c:486 +#: src/nl.c:478 #, c-format msgid "invalid header numbering style: %s" msgstr "" -#: src/nl.c:494 +#: src/nl.c:486 #, c-format msgid "invalid body numbering style: %s" msgstr "" -#: src/nl.c:502 +#: src/nl.c:494 #, c-format msgid "invalid footer numbering style: %s" msgstr "" -#: src/nl.c:511 +#: src/nl.c:503 #, c-format msgid "invalid starting line number: %s" msgstr "" -#: src/nl.c:517 -#, fuzzy, c-format -msgid "WARNING: --page-increment is deprecated; use --line-increment instead" -msgstr "--reply parametras nebenaudojamas; vietoj jo naudokite -i arba -f" - -#: src/nl.c:524 +#: src/nl.c:512 #, c-format msgid "invalid line number increment: %s" msgstr "" -#: src/nl.c:536 +#: src/nl.c:524 #, c-format msgid "invalid number of blank lines: %s" msgstr "" -#: src/nl.c:550 +#: src/nl.c:538 #, c-format msgid "invalid line number field width: %s" msgstr "" -#: src/nl.c:569 +#: src/nl.c:557 #, c-format msgid "invalid line numbering format: %s" msgstr "" @@ -5588,12 +5632,7 @@ msgstr "" msgid "ignoring input" msgstr "" -#: src/nohup.c:163 src/nohup.c:165 -#, c-format -msgid "failed to open %s" -msgstr "nepavyko atverti %s" - -#: src/nohup.c:175 +#: src/nohup.c:175 #, c-format msgid "ignoring input and appending output to %s" msgstr "" @@ -5624,33 +5663,367 @@ msgid "failed to redirect standard error" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:32 +#: src/nproc.c:33 msgid "Giuseppe Scrivano" msgstr "" -#: src/nproc.c:56 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 +#: src/nproc.c:57 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Naudojimas: %s [PARAMETRAS]...\n" -#: src/nproc.c:57 +#: src/nproc.c:58 msgid "" "Print the number of processing units available to the current process,\n" "which may be less than the number of online processors\n" "\n" msgstr "" -#: src/nproc.c:62 +#: src/nproc.c:63 msgid "" " --all print the number of installed processors\n" " --ignore=N if possible, exclude N processing units\n" msgstr "" -#: src/nproc.c:106 +#: src/nproc.c:107 #, fuzzy, c-format 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 +msgid "Assaf Gordon" +msgstr "" + +#: src/numfmt.c:676 +#, c-format +msgid "value too large to be converted: '%s'" +msgstr "" + +#: src/numfmt.c:680 +#, fuzzy, c-format +msgid "invalid number: '%s'" +msgstr "netinkamas naudotojas %s" + +#: src/numfmt.c:684 +#, c-format +msgid "rejecting suffix in input: '%s' (consider using --from)" +msgstr "" + +#: src/numfmt.c:688 +#, fuzzy, c-format +msgid "invalid suffix in input: '%s'" +msgstr "netinkama įvestis" + +#: src/numfmt.c:692 +#, c-format +msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)" +msgstr "" + +#: src/numfmt.c:723 +#, fuzzy, c-format +msgid "failed to prepare value '%Lf' for printing" +msgstr "nepavyksta atverti %s rašymui" + +#: src/numfmt.c:787 +#, fuzzy, c-format +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 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [NUMBER]...\n" +msgstr "Naudojimas: %s [PARAMETRAS]... [NAUDOTOJAS]...\n" + +#: src/numfmt.c:816 +msgid "" +"Reformat NUMBER(s), or the numbers from standard input if none are " +"specified.\n" +msgstr "" + +#: src/numfmt.c:820 +msgid " --debug print warnings about invalid input\n" +msgstr "" + +#: src/numfmt.c:823 +msgid "" +" -d, --delimiter=X use X instead of whitespace for field delimiter\n" +msgstr "" + +#: src/numfmt.c:826 +msgid "" +" --field=N replace the number in input field N (default is 1)\n" +msgstr "" + +#: src/numfmt.c:829 +msgid "" +" --format=FORMAT use printf style floating-point FORMAT;\n" +" see FORMAT below for details\n" +msgstr "" + +#: src/numfmt.c:833 +msgid "" +" --from=UNIT auto-scale input numbers to UNITs; default is " +"'none';\n" +" see UNIT below\n" +msgstr "" + +#: src/numfmt.c:837 +msgid "" +" --from-unit=N specify the input unit size (instead of the default " +"1)\n" +msgstr "" + +#: src/numfmt.c:840 +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 "" + +#: src/numfmt.c:844 +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 +msgid "" +" --invalid=MODE failure mode for invalid numbers: MODE can be:\n" +" abort (default), fail, warn, ignore\n" +msgstr "" + +#: src/numfmt.c:852 +msgid "" +" --padding=N pad the output to N characters; positive N will\n" +" right-align; negative N will left-align;\n" +" padding is ignored if the output is wider than N;\n" +" the default is to automatically pad if a " +"whitespace\n" +" is found\n" +msgstr "" + +#: src/numfmt.c:859 +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 +msgid "" +" --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" +" SUFFIX in input numbers\n" +msgstr "" + +#: src/numfmt.c:867 +msgid "" +" --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" +msgstr "" + +#: src/numfmt.c:870 +msgid "" +" --to-unit=N the output unit size (instead of the default 1)\n" +msgstr "" + +#: src/numfmt.c:877 +msgid "" +"\n" +"UNIT options:\n" +msgstr "" + +#: src/numfmt.c:880 +msgid " none no auto-scaling is done; suffixes will trigger an error\n" +msgstr "" + +#: src/numfmt.c:883 +msgid "" +" auto accept optional single/two letter suffix:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" +msgstr "" + +#: src/numfmt.c:889 +msgid "" +" si accept optional single letter suffix:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:894 +msgid "" +" iec accept optional single letter suffix:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:899 +msgid "" +" iec-i accept optional two-letter suffix:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:905 +#, 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" +msgstr "" + +#: src/numfmt.c:912 +#, c-format +msgid "" +"\n" +"Exit status is 0 if all input numbers were successfully converted.\n" +"By default, %s will stop at the first conversion error with exit status 2.\n" +"With --invalid='fail' a warning is printed for each conversion error\n" +"and the exit status is 2. With --invalid='warn' each conversion error is\n" +"diagnosed, but the exit status is 0. With --invalid='ignore' conversion\n" +"errors are not diagnosed and the exit status is 0.\n" +msgstr "" + +#: src/numfmt.c:921 +#, c-format +msgid "" +"\n" +"Examples:\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" +msgstr "" + +#: src/numfmt.c:974 src/seq.c:212 +#, c-format +msgid "format %s has no %% directive" +msgstr "formatas %s neturi %% direktyvos" + +#: src/numfmt.c:990 +#, fuzzy, c-format +msgid "invalid format %s (width overflow)" +msgstr "netaisyklingas datos formatas %s" + +#: src/numfmt.c:1007 src/seq.c:229 +#, c-format +msgid "format %s ends in %%" +msgstr "" + +#: src/numfmt.c:1010 +#, c-format +msgid "invalid format %s, directive must be %%['][-][N]f" +msgstr "" + +#: src/numfmt.c:1018 src/seq.c:236 +#, c-format +msgid "format %s has too many %% directives" +msgstr "" + +#: src/numfmt.c:1070 +#, c-format +msgid "invalid suffix in input '%s': '%s'" +msgstr "" + +#: src/numfmt.c:1092 +#, c-format +msgid "value too large to be printed: '%Lg' (consider using --to)" +msgstr "" + +#: src/numfmt.c:1100 +#, c-format +msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" +msgstr "" + +#: src/numfmt.c:1184 +#, c-format +msgid "large input value '%s': possible precision loss" +msgstr "" + +#: src/numfmt.c:1293 +#, 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 "netinkamas argumentas %s" + +#: src/numfmt.c:1401 +#, fuzzy, c-format +msgid "invalid field value '%s'" +msgstr "klaidinga data %s" + +#: src/numfmt.c:1430 +#, fuzzy, c-format +msgid "invalid header value '%s'" +msgstr "klaidinga data %s" + +#: src/numfmt.c:1456 +#, 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 +#, c-format +msgid "no conversion option specified" +msgstr "" + +#: src/numfmt.c:1471 +#, c-format +msgid "grouping cannot be combined with --to" +msgstr "" + +#: src/numfmt.c:1473 +#, c-format +msgid "grouping has no effect in this locale" +msgstr "" + +#: src/numfmt.c:1486 +#, c-format +msgid "--header ignored with command-line input" +msgstr "" + +#: src/numfmt.c:1511 +#, fuzzy, c-format +msgid "error reading input" +msgstr "klaida skaitant %s" + +#: src/numfmt.c:1520 +#, fuzzy, c-format +msgid "failed to convert some of the input numbers" +msgstr "nepavyko užverti aplanko %s" + #: src/od.c:294 #, c-format msgid "" @@ -5671,29 +6044,39 @@ msgid "" msgstr "" #: src/od.c:307 -msgid "All arguments to long options are mandatory for short options.\n" +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" +"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" +"at first byte printed, incremented when dump is progressing.\n" +"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 "" -#: src/od.c:310 +#: src/od.c:318 msgid "" -" -A, --address-radix=RADIX decide how file offsets are printed\n" +" -A, --address-radix=RADIX output format for file offsets. RADIX is one\n" +" of [doxn], for Decimal, Octal, Hex or None\n" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" -#: src/od.c:314 +#: src/od.c:323 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" -" --traditional accept arguments in traditional form\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:324 +#: src/od.c:336 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" @@ -5701,7 +6084,7 @@ msgid "" " -d same as -t u2, select unsigned decimal 2-byte units\n" msgstr "" -#: src/od.c:332 +#: src/od.c:345 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -5711,27 +6094,16 @@ msgid "" " -x same as -t x2, select hexadecimal 2-byte units\n" msgstr "" -#: src/od.c:340 +#: src/od.c:353 msgid "" "\n" -"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" -"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" -"at first byte printed, incremented when dump is progressing.\n" -"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 "" - -#: src/od.c:349 -msgid "" "\n" "TYPE is made up of one or more of these specifications:\n" -"\n" " a named character, ignoring high-order bit\n" " c ASCII character or backslash escape\n" msgstr "" -#: src/od.c:356 +#: src/od.c:360 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -5740,83 +6112,84 @@ msgid "" " x[SIZE] hexadecimal, SIZE bytes per integer\n" msgstr "" -#: src/od.c:363 +#: src/od.c:367 msgid "" "\n" -"SIZE is a number. For TYPE in doux, SIZE may also be C for\n" +"SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" "sizeof(char), S for sizeof(short), I for sizeof(int) or L for\n" "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 "" -#: src/od.c:370 +#: src/od.c:374 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" +"Adding a z suffix to any type displays printable characters at the end of\n" +"each output line.\n" msgstr "" -#: src/od.c:380 +#: src/od.c:379 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" +"\n" +"BYTES is hex with 0x or 0X prefix, and may have a multiplier suffix:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"and so on for G, T, P, E, Z, Y.\n" msgstr "" -#: src/od.c:633 src/od.c:753 +#: src/od.c:639 src/od.c:759 #, c-format msgid "invalid type string %s" msgstr "" -#: src/od.c:643 +#: src/od.c:649 #, c-format msgid "" "invalid type string %s;\n" "this system doesn't provide a %lu-byte integral type" msgstr "" -#: src/od.c:764 +#: src/od.c:770 #, c-format msgid "" "invalid type string %s;\n" "this system doesn't provide a %lu-byte floating point type" msgstr "" -#: src/od.c:822 +#: src/od.c:828 #, c-format msgid "invalid character '%c' in type string %s" msgstr "" -#: src/od.c:1047 +#: src/od.c:1053 #, c-format msgid "cannot skip past end of combined input" msgstr "" -#: src/od.c:1603 +#: src/od.c:1609 #, c-format msgid "invalid output address radix '%c'; it must be one character from [doxn]" msgstr "" -#: src/od.c:1729 +#: src/od.c:1735 #, c-format msgid "no type may be specified when dumping strings" msgstr "" -#: src/od.c:1804 +#: src/od.c:1810 msgid "compatibility mode supports at most one file" msgstr "" -#: src/od.c:1825 +#: src/od.c:1831 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "" -#: src/od.c:1868 +#: src/od.c:1874 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "" @@ -5836,16 +6209,15 @@ 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" -"\n" msgstr "" -#: src/paste.c:448 +#: 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 "" -#: src/paste.c:509 +#: src/paste.c:508 #, c-format msgid "delimiter list ends with an unescaped backslash: %s" msgstr "" @@ -5900,80 +6272,80 @@ msgid "Kaveh Ghazi" msgstr "Kaveh Ghazi" #. TRANSLATORS: Real name is unknown; at most 19 characters. -#: src/pinky.c:250 +#: src/pinky.c:242 msgid " ???" msgstr " ???" #. TRANSLATORS: Idle time is unknown; at most 5 characters. -#: src/pinky.c:274 +#: src/pinky.c:266 msgid "?????" msgstr "?????" -#: src/pinky.c:323 +#: src/pinky.c:314 #, c-format msgid "Login name: " msgstr "" -#: src/pinky.c:326 +#: src/pinky.c:317 #, c-format msgid "In real life: " msgstr "Tikrame gyvenime: " #. TRANSLATORS: Real name is unknown; no hard limit. -#: src/pinky.c:330 +#: src/pinky.c:321 msgid "???\n" msgstr "???\n" -#: src/pinky.c:350 +#: src/pinky.c:341 #, c-format msgid "Directory: " msgstr "" -#: src/pinky.c:352 +#: src/pinky.c:343 #, c-format msgid "Shell: " msgstr "" -#: src/pinky.c:371 +#: src/pinky.c:362 #, c-format msgid "Project: " msgstr "Projektas: " -#: src/pinky.c:395 +#: src/pinky.c:386 #, c-format msgid "Plan:\n" msgstr "" -#: src/pinky.c:414 +#: src/pinky.c:405 msgid "Login" msgstr "" -#: src/pinky.c:416 +#: src/pinky.c:407 msgid "Name" msgstr "Vardas" -#: src/pinky.c:417 +#: src/pinky.c:408 msgid " TTY" msgstr " TTY" -#: src/pinky.c:419 +#: src/pinky.c:410 msgid "Idle" msgstr "Laisvas" -#: src/pinky.c:420 +#: src/pinky.c:411 msgid "When" msgstr "Kada" -#: src/pinky.c:423 +#: src/pinky.c:414 msgid "Where" msgstr "Kur" -#: src/pinky.c:502 +#: src/pinky.c:493 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Naudojimas: %s [PARAMETRAS]... [NAUDOTOJAS]...\n" -#: src/pinky.c:503 +#: src/pinky.c:494 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -5983,7 +6355,7 @@ msgid "" " -s do short format output, this is the default\n" msgstr "" -#: src/pinky.c:511 +#: src/pinky.c:502 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -5992,7 +6364,7 @@ msgid "" " in short format\n" msgstr "" -#: src/pinky.c:520 +#: src/pinky.c:511 #, c-format msgid "" "\n" @@ -6000,7 +6372,7 @@ msgid "" "The utmp file will be %s.\n" msgstr "" -#: src/pinky.c:604 +#: src/pinky.c:595 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "" @@ -6015,83 +6387,81 @@ msgstr "" msgid "Roland Huebner" msgstr "" -#: src/pr.c:912 +#: src/pr.c:908 #, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "" -#: src/pr.c:914 +#: src/pr.c:910 #, fuzzy, c-format msgid "invalid page range %s" msgstr "netinkamas argumentas %s" -#: src/pr.c:979 +#: src/pr.c:975 #, c-format msgid "'-l PAGE_LENGTH' invalid number of lines: %s" msgstr "" -#: src/pr.c:1003 +#: src/pr.c:999 #, c-format msgid "'-N NUMBER' invalid starting line number: %s" msgstr "" -#: src/pr.c:1015 +#: src/pr.c:1011 #, c-format msgid "'-o MARGIN' invalid line offset: %s" msgstr "" -#: src/pr.c:1056 +#: src/pr.c:1052 #, c-format msgid "'-w PAGE_WIDTH' invalid number of characters: %s" msgstr "" -#: src/pr.c:1070 +#: src/pr.c:1066 #, c-format msgid "'-W PAGE_WIDTH' invalid number of characters: %s" msgstr "" -#: src/pr.c:1100 +#: src/pr.c:1096 #, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "" -#: src/pr.c:1104 +#: src/pr.c:1100 #, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "" -#: src/pr.c:1200 +#: src/pr.c:1196 #, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "" -#: src/pr.c:1304 +#: src/pr.c:1293 #, c-format msgid "page width too narrow" msgstr "" -#: src/pr.c:2369 +#: src/pr.c:2353 #, c-format msgid "starting page number %<PRIuMAX> exceeds page count %<PRIuMAX>" msgstr "" -#: src/pr.c:2396 +#: src/pr.c:2380 #, c-format msgid "page number overflow" msgstr "" -#: src/pr.c:2401 +#: src/pr.c:2385 #, c-format msgid "Page %<PRIuMAX>" msgstr "" -#: src/pr.c:2773 -msgid "" -"Paginate or columnate FILE(s) for printing.\n" -"\n" +#: src/pr.c:2757 +msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" -#: src/pr.c:2780 +#: src/pr.c:2763 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -6101,7 +6471,7 @@ msgid "" " columns on each page\n" msgstr "" -#: src/pr.c:2788 +#: src/pr.c:2771 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -6111,7 +6481,7 @@ msgid "" " double space the output\n" msgstr "" -#: src/pr.c:2796 +#: src/pr.c:2779 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -6123,7 +6493,7 @@ msgid "" " and trailer without -F)\n" msgstr "" -#: src/pr.c:2806 +#: src/pr.c:2789 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -6136,7 +6506,7 @@ msgid "" " alignment, --sep-string[=STRING] sets separators\n" msgstr "" -#: src/pr.c:2815 +#: src/pr.c:2798 msgid "" " -l, --length=PAGE_LENGTH\n" " set the page length to PAGE_LENGTH (66) lines\n" @@ -6145,7 +6515,7 @@ msgid "" " truncate lines, but join lines of full length with -J\n" msgstr "" -#: src/pr.c:2822 +#: src/pr.c:2805 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -6155,7 +6525,7 @@ msgid "" " page printed (see +FIRST_PAGE)\n" msgstr "" -#: src/pr.c:2830 +#: src/pr.c:2813 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -6164,7 +6534,7 @@ msgid "" " omit warning when a file cannot be opened\n" msgstr "" -#: src/pr.c:2837 +#: src/pr.c:2820 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -6174,7 +6544,7 @@ msgid "" " options (-COLUMN|-a -COLUMN|-m) except -w is set\n" msgstr "" -#: src/pr.c:2844 +#: src/pr.c:2827 msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" @@ -6184,7 +6554,7 @@ msgid "" " -t, --omit-header omit page headers and trailers\n" msgstr "" -#: src/pr.c:2851 +#: src/pr.c:2834 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -6198,7 +6568,7 @@ msgid "" "(72)\n" msgstr "" -#: src/pr.c:2861 +#: src/pr.c:2844 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -6207,7 +6577,7 @@ msgid "" " with -S or -s\n" msgstr "" -#: src/pr.c:2869 +#: src/pr.c:2852 #, fuzzy msgid "" "\n" @@ -6347,17 +6717,16 @@ msgstr "" msgid "" "Output a permuted index, including context, of the words in the input " "files.\n" -"\n" msgstr "" -#: src/ptx.c:1828 +#: src/ptx.c:1827 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:1833 +#: src/ptx.c:1832 msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" " -O, --format=roff generate output as roff directives\n" @@ -6366,7 +6735,7 @@ msgid "" " -T, --format=tex generate output as TeX directives\n" msgstr "" -#: src/ptx.c:1840 +#: src/ptx.c:1839 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -6376,7 +6745,7 @@ msgid "" " -o, --only-file=FILE read only word list from this FILE\n" msgstr "" -#: src/ptx.c:1848 +#: src/ptx.c:1847 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -6384,7 +6753,7 @@ msgid "" "excluded\n" msgstr "" -#: src/ptx.c:1855 +#: src/ptx.c:1854 #, fuzzy msgid "" "\n" @@ -6393,7 +6762,7 @@ msgstr "" "\n" "Kai nenurodytas FAILAS, arba FAILAS yra -, nuskaityti standartinę įvestį.\n" -#: src/ptx.c:1949 +#: src/ptx.c:1948 #, c-format msgid "invalid gap width: %s" msgstr "" @@ -6415,7 +6784,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "" -#: src/pwd.c:170 src/pwd.c:277 +#: src/pwd.c:170 src/pwd.c:277 src/split.c:373 #, c-format msgid "failed to stat %s" msgstr "" @@ -6431,14 +6800,15 @@ msgid "ignoring non-option arguments" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/readlink.c:33 +#: src/readlink.c:32 msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 +#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147 +#: src/stat.c:1349 src/touch.c:212 #, c-format -msgid "Usage: %s [OPTION]... FILE\n" -msgstr "Naudojimas: %s [PARAMETRAS]... FAILAS\n" +msgid "Usage: %s [OPTION]... FILE...\n" +msgstr "Naudojimas: %s [PARAMETRAS]... FAILAS...\n" #: src/readlink.c:63 msgid "" @@ -6465,17 +6835,18 @@ msgid "" "recursively,\n" " without requirements on components " "existence\n" -" -n, --no-newline do not output the trailing newline\n" +" -n, --no-newline do not output the trailing delimiter\n" " -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" msgstr "" -#: src/realpath.c:71 src/rm.c:134 src/shred.c:147 src/stat.c:1330 -#: src/touch.c:215 -#, c-format -msgid "Usage: %s [OPTION]... FILE...\n" -msgstr "Naudojimas: %s [PARAMETRAS]... FAILAS...\n" +#: src/readlink.c:152 +#, fuzzy, c-format +msgid "ignoring --no-newline with multiple arguments" +msgstr "ignoruojami visi argumentai" #: src/realpath.c:72 msgid "" @@ -6502,12 +6873,12 @@ msgstr "" msgid "generating relative path" msgstr "" -#: src/remove.c:286 +#: src/remove.c:273 #, c-format msgid "%s: descend into write-protected directory %s? " msgstr "" -#: src/remove.c:287 +#: src/remove.c:274 #, c-format msgid "%s: descend into directory %s? " msgstr "" @@ -6516,49 +6887,49 @@ msgstr "" #. translate "%s: remove %s (write-protected) %s? " #. instead. It should avoid grammatical problems #. with the output of file_type. -#: src/remove.c:303 +#: src/remove.c:290 #, c-format msgid "%s: remove write-protected %s %s? " msgstr "%s: pašalinti apsaugotą nuo rašymo %s %s? " -#: src/remove.c:304 +#: src/remove.c:291 #, c-format msgid "%s: remove %s %s? " msgstr "%s: pašalinti %s %s? " -#: src/remove.c:417 +#: src/remove.c:374 #, c-format msgid "removed directory: %s\n" msgstr "šalinamas aplankas: %s\n" -#: src/remove.c:481 +#: src/remove.c:444 #, fuzzy, c-format msgid "cannot remove directory: %s" msgstr "nepavyko pašalinti aplanko %s" -#: src/remove.c:537 +#: src/remove.c:500 #, c-format msgid "skipping %s, since it's on a different device" msgstr "" -#: src/remove.c:557 +#: src/remove.c:520 #, fuzzy, c-format msgid "traversal failed: %s" msgstr "nepavyko fts_read" -#: src/remove.c:563 +#: src/remove.c:526 #, c-format msgid "" "unexpected failure: fts_info=%d: %s\n" "please report to %s" msgstr "" -#: src/rm.c:118 +#: src/rm.c:119 #, c-format msgid "Try '%s ./%s' to remove the file %s.\n" msgstr "" -#: src/rm.c:135 +#: src/rm.c:136 msgid "" "Remove (unlink) the FILE(s).\n" "\n" @@ -6567,7 +6938,7 @@ msgid "" " -i prompt before every removal\n" msgstr "" -#: src/rm.c:141 +#: src/rm.c:142 msgid "" " -I prompt once before removing more than three files, " "or\n" @@ -6579,22 +6950,23 @@ msgid "" " always (-i). Without WHEN, prompt always\n" msgstr "" -#: src/rm.c:148 +#: src/rm.c:149 msgid "" " --one-file-system when removing a hierarchy recursively, skip any\n" " directory that is on a file system different from\n" " that of the corresponding command line argument\n" msgstr "" -#: src/rm.c:153 +#: src/rm.c:154 msgid "" " --no-preserve-root do not treat '/' specially\n" " --preserve-root do not remove '/' (default)\n" " -r, -R, --recursive remove directories and their contents recursively\n" +" -d, --dir remove empty directories\n" " -v, --verbose explain what is being done\n" msgstr "" -#: src/rm.c:161 +#: src/rm.c:163 msgid "" "\n" "By default, rm does not remove directories. Use the --recursive (-r or -R)\n" @@ -6602,7 +6974,7 @@ msgid "" "contents.\n" msgstr "" -#: src/rm.c:166 +#: src/rm.c:168 #, c-format msgid "" "\n" @@ -6613,7 +6985,7 @@ msgid "" " %s ./-foo\n" msgstr "" -#: src/rm.c:175 +#: src/rm.c:177 msgid "" "\n" "Note that if you use rm to remove a file, it might be possible to recover\n" @@ -6621,12 +6993,12 @@ msgid "" "assurance that the contents are truly unrecoverable, consider using shred.\n" msgstr "" -#: src/rm.c:335 +#: src/rm.c:342 #, c-format msgid "%s: remove all arguments recursively? " msgstr "%s: rekursyviai pašalinti visus argumentus? " -#: src/rm.c:336 +#: src/rm.c:343 #, c-format msgid "%s: remove all arguments? " msgstr "%s: pašalinti visus argumentus? " @@ -6674,7 +7046,10 @@ msgstr "" msgid "" "Run a program in a different security context.\n" "With neither CONTEXT nor COMMAND, print the current security context.\n" -"\n" +msgstr "" + +#: src/runcon.c:94 +msgid "" " CONTEXT Complete security context\n" " -c, --compute compute process transition context before modifying\n" " -t, --type=TYPE type (for same role as parent)\n" @@ -6684,72 +7059,72 @@ msgid "" "\n" msgstr "" -#: src/runcon.c:140 +#: src/runcon.c:144 #, c-format msgid "multiple roles" msgstr "" -#: src/runcon.c:145 +#: src/runcon.c:149 #, c-format msgid "multiple types" msgstr "" -#: src/runcon.c:150 +#: src/runcon.c:154 #, c-format msgid "multiple users" msgstr "" -#: src/runcon.c:155 +#: src/runcon.c:159 #, c-format msgid "multiple levelranges" msgstr "" -#: src/runcon.c:173 src/runcon.c:209 +#: src/runcon.c:177 src/runcon.c:213 #, c-format msgid "failed to get current context" msgstr "" -#: src/runcon.c:183 +#: src/runcon.c:187 #, c-format msgid "you must specify -c, -t, -u, -l, -r, or context" msgstr "" -#: src/runcon.c:191 +#: src/runcon.c:195 #, c-format msgid "no command specified" msgstr "" -#: src/runcon.c:197 +#: src/runcon.c:201 #, c-format msgid "%s may be used only on a SELinux kernel" msgstr "" -#: src/runcon.c:223 +#: src/runcon.c:227 #, c-format msgid "failed to compute a new context" msgstr "" -#: src/runcon.c:237 +#: src/runcon.c:241 #, c-format msgid "failed to set new user %s" msgstr "" -#: src/runcon.c:239 +#: src/runcon.c:243 #, c-format msgid "failed to set new type %s" msgstr "" -#: src/runcon.c:241 +#: src/runcon.c:245 #, c-format msgid "failed to set new range %s" msgstr "" -#: src/runcon.c:243 +#: src/runcon.c:247 #, c-format msgid "failed to set new role %s" msgstr "" -#: src/runcon.c:251 +#: src/runcon.c:255 #, c-format msgid "unable to set security context %s" msgstr "" @@ -6763,15 +7138,17 @@ msgid "" msgstr "" #: src/seq.c:73 +msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" +msgstr "" + +#: src/seq.c:79 msgid "" -"Print numbers from FIRST to LAST, in steps of INCREMENT.\n" -"\n" " -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 "" -#: src/seq.c:82 +#: src/seq.c:86 msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" @@ -6781,39 +7158,24 @@ msgid "" "INCREMENT is usually negative if FIRST is greater than LAST.\n" msgstr "" -#: src/seq.c:90 +#: src/seq.c:94 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:136 +#: src/seq.c:140 #, c-format msgid "invalid floating point argument: %s" msgstr "" -#: src/seq.c:193 -#, c-format -msgid "format %s has no %% directive" -msgstr "formatas %s neturi %% direktyvos" - -#: src/seq.c:210 -#, c-format -msgid "format %s ends in %%" -msgstr "" - -#: src/seq.c:213 +#: src/seq.c:232 #, c-format msgid "format %s has unknown %%%c directive" msgstr "formatas %s turi nežinomą %%%c direktyvą" -#: src/seq.c:217 -#, c-format -msgid "format %s has too many %% directives" -msgstr "" - -#: src/seq.c:431 +#: src/seq.c:555 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" @@ -6845,27 +7207,27 @@ msgid "" " (if specified) supplemental group IDs to GID1, ...\n" msgstr "" -#: src/setuidgid.c:163 +#: src/setuidgid.c:162 #, c-format msgid "unknown user-ID: %s" msgstr "nežinomas naudotojo-ID: %s" -#: src/setuidgid.c:174 +#: src/setuidgid.c:173 #, c-format msgid "to use user-ID %s you need to use -g too" msgstr "" -#: src/setuidgid.c:191 +#: src/setuidgid.c:190 #, c-format msgid "failed to set supplemental group(s)" msgstr "" -#: src/setuidgid.c:201 +#: src/setuidgid.c:200 #, c-format msgid "cannot set group-ID to %lu" msgstr "" -#: src/setuidgid.c:205 +#: src/setuidgid.c:204 #, c-format msgid "cannot set user-ID to %lu" msgstr "" @@ -6879,10 +7241,9 @@ msgstr "Colin Plumb" 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" -"\n" msgstr "" -#: src/shred.c:156 +#: src/shred.c:155 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -6891,7 +7252,7 @@ msgid "" " -s, --size=N shred this many bytes (suffixes like K, M, G accepted)\n" msgstr "" -#: src/shred.c:162 +#: src/shred.c:161 msgid "" " -u, --remove truncate and remove file after overwriting\n" " -v, --verbose show progress\n" @@ -6900,7 +7261,7 @@ msgid "" " -z, --zero add a final overwrite with zeros to hide shredding\n" msgstr "" -#: src/shred.c:171 +#: src/shred.c:170 msgid "" "\n" "If FILE is -, shred standard output.\n" @@ -6912,7 +7273,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:181 +#: src/shred.c:180 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" @@ -6923,7 +7284,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:189 +#: src/shred.c:188 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -6935,7 +7296,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:199 +#: src/shred.c:198 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -6944,7 +7305,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:206 +#: src/shred.c:205 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" @@ -6956,129 +7317,129 @@ msgid "" "\n" msgstr "" -#: src/shred.c:216 +#: src/shred.c:215 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:296 +#: src/shred.c:295 #, c-format msgid "%s: fdatasync failed" msgstr "" -#: src/shred.c:307 +#: src/shred.c:306 #, c-format msgid "%s: fsync failed" msgstr "" -#: src/shred.c:384 +#: src/shred.c:383 #, c-format msgid "%s: cannot rewind" msgstr "" -#: src/shred.c:403 +#: src/shred.c:402 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "" -#: src/shred.c:453 +#: src/shred.c:452 #, c-format msgid "%s: error writing at offset %s" msgstr "" -#: src/shred.c:471 +#: src/shred.c:470 #, c-format msgid "%s: lseek failed" msgstr "" -#: src/shred.c:482 +#: src/shred.c:481 #, c-format msgid "%s: file too large" msgstr "%s: failas per didelis" -#: src/shred.c:505 +#: src/shred.c:504 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "" -#: src/shred.c:521 +#: src/shred.c:520 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "" -#: src/shred.c:768 +#: src/shred.c:767 #, c-format msgid "%s: fstat failed" msgstr "" -#: src/shred.c:779 +#: src/shred.c:778 #, c-format msgid "%s: invalid file type" msgstr "" -#: src/shred.c:798 +#: src/shred.c:797 #, c-format msgid "%s: file has negative size" msgstr "" -#: src/shred.c:865 +#: src/shred.c:864 src/sort.c:932 src/split.c:378 #, c-format msgid "%s: error truncating" msgstr "" -#: src/shred.c:881 +#: src/shred.c:880 #, c-format msgid "%s: fcntl failed" msgstr "" -#: src/shred.c:886 +#: src/shred.c:885 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "" -#: src/shred.c:968 +#: src/shred.c:967 #, c-format msgid "%s: removing" msgstr "%s: šalinama" -#: src/shred.c:992 +#: src/shred.c:991 #, c-format msgid "%s: renamed to %s" msgstr "" -#: src/shred.c:1014 +#: src/shred.c:1013 #, c-format msgid "%s: failed to remove" msgstr "" -#: src/shred.c:1018 +#: src/shred.c:1017 #, c-format msgid "%s: removed" msgstr "%s: pašalinta" -#: src/shred.c:1025 src/shred.c:1068 +#: src/shred.c:1024 src/shred.c:1067 #, c-format msgid "%s: failed to close" msgstr "" -#: src/shred.c:1061 +#: src/shred.c:1060 #, c-format msgid "%s: failed to open for writing" msgstr "" -#: src/shred.c:1126 +#: src/shred.c:1125 #, c-format msgid "%s: invalid number of passes" msgstr "" -#: src/shred.c:1135 src/shuf.c:291 src/sort.c:4387 +#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441 #, c-format msgid "multiple random sources specified" msgstr "" -#: src/shred.c:1149 +#: src/shred.c:1148 #, c-format msgid "%s: invalid file size" msgstr "%s: blogas failo dydis" @@ -7092,12 +7453,10 @@ msgid "" msgstr "" #: src/shuf.c:54 -msgid "" -"Write a random permutation of the input lines to standard output.\n" -"\n" +msgid "Write a random permutation of the input lines to standard output.\n" msgstr "" -#: src/shuf.c:61 +#: src/shuf.c:60 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 " @@ -7108,27 +7467,27 @@ msgid "" " -z, --zero-terminated end lines with 0 byte, not newline\n" msgstr "" -#: src/shuf.c:245 +#: src/shuf.c:244 #, c-format msgid "multiple -i options specified" msgstr "" -#: src/shuf.c:265 +#: src/shuf.c:264 #, c-format msgid "invalid input range %s" msgstr "" -#: src/shuf.c:278 +#: src/shuf.c:277 #, c-format msgid "invalid line count %s" msgstr "" -#: src/shuf.c:285 src/sort.c:4381 +#: src/shuf.c:284 src/sort.c:4435 #, c-format msgid "multiple output files specified" msgstr "" -#: src/shuf.c:311 +#: src/shuf.c:310 #, c-format msgid "cannot combine -e and -i options" msgstr "" @@ -7147,7 +7506,7 @@ msgid "" "\n" msgstr "" -#: src/sleep.c:135 src/timeout.c:295 +#: src/sleep.c:135 src/timeout.c:320 #, c-format msgid "invalid time interval %s" msgstr "" @@ -7157,19 +7516,20 @@ msgstr "" msgid "cannot read realtime clock" msgstr "" -#: src/sort.c:395 -msgid "" -"Write sorted concatenation of all FILE(s) to standard output.\n" -"\n" +#: src/sort.c:399 +#, 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:402 +#: src/sort.c:405 msgid "" "Ordering options:\n" "\n" msgstr "" -#: src/sort.c:406 +#: src/sort.c:409 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -7177,19 +7537,19 @@ msgid "" " -f, --ignore-case fold lower case to upper case characters\n" msgstr "" -#: src/sort.c:412 +#: src/sort.c:415 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:417 +#: src/sort.c:420 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" -#: src/sort.c:420 +#: src/sort.c:423 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -7197,7 +7557,7 @@ msgid "" " -r, --reverse reverse the result of comparisons\n" msgstr "" -#: src/sort.c:426 +#: src/sort.c:429 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -7207,19 +7567,19 @@ msgid "" "\n" msgstr "" -#: src/sort.c:434 +#: src/sort.c:437 msgid "" "Other options:\n" "\n" msgstr "" -#: src/sort.c:438 +#: src/sort.c:441 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" msgstr "" -#: src/sort.c:442 +#: src/sort.c:445 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 " @@ -7228,7 +7588,7 @@ msgid "" " decompress them with PROG -d\n" msgstr "" -#: src/sort.c:449 +#: src/sort.c:452 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -7237,13 +7597,13 @@ msgid "" " If F is - then read names from standard input\n" msgstr "" -#: src/sort.c:456 +#: src/sort.c:459 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:460 +#: src/sort.c:463 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -7251,7 +7611,7 @@ msgid "" " -S, --buffer-size=SIZE use SIZE for main memory buffer\n" msgstr "" -#: src/sort.c:466 +#: src/sort.c:469 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -7266,11 +7626,11 @@ msgid "" "run\n" msgstr "" -#: src/sort.c:475 +#: src/sort.c:478 msgid " -z, --zero-terminated end lines with 0 byte, not newline\n" msgstr "" -#: src/sort.c:480 +#: src/sort.c:483 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -7289,7 +7649,7 @@ msgid "" "SIZE may be followed by the following multiplicative suffixes:\n" msgstr "" -#: src/sort.c:493 +#: src/sort.c:496 msgid "" "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n" "\n" @@ -7301,132 +7661,132 @@ msgid "" "native byte values.\n" msgstr "" -#: src/sort.c:694 +#: src/sort.c:697 #, c-format msgid "waiting for %s [-d]" msgstr "" -#: src/sort.c:699 +#: src/sort.c:702 #, c-format msgid "%s [-d] terminated abnormally" msgstr "" -#: src/sort.c:853 +#: src/sort.c:856 #, fuzzy, c-format msgid "cannot create temporary file in %s" msgstr "nepavyksta sukurti laikino failo %s" -#: src/sort.c:939 src/sort.c:2010 src/sort.c:3056 src/sort.c:3755 -#: src/sort.c:3758 +#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713 +#: src/sort.c:3804 src/sort.c:3807 msgid "open failed" msgstr "" -#: src/sort.c:959 +#: src/sort.c:970 msgid "fflush failed" msgstr "" -#: src/sort.c:964 src/sort.c:2013 src/sort.c:4646 +#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706 msgid "close failed" msgstr "" -#: src/sort.c:973 +#: src/sort.c:986 #, c-format msgid "dup2 failed" msgstr "" -#: src/sort.c:1090 +#: src/sort.c:1103 #, c-format msgid "couldn't execute %s" msgstr "nepavyksta įvykdyti %s" -#: src/sort.c:1097 +#: src/sort.c:1110 msgid "couldn't create temporary file" msgstr "" -#: src/sort.c:1136 +#: src/sort.c:1149 #, c-format msgid "couldn't create process for %s -d" msgstr "" -#: src/sort.c:1150 +#: src/sort.c:1161 #, c-format msgid "couldn't execute %s -d" msgstr "nepavyksta įvykdyti %s -d" -#: src/sort.c:1209 +#: src/sort.c:1220 #, c-format msgid "warning: cannot remove: %s" msgstr "" -#: src/sort.c:1295 +#: src/sort.c:1306 #, fuzzy, c-format msgid "invalid --%s argument %s" msgstr "netinkamas argumentas %s" -#: src/sort.c:1298 +#: src/sort.c:1309 #, fuzzy, c-format msgid "minimum --%s argument is %s" msgstr "dviprasmis argumentas %s %s" -#: src/sort.c:1313 +#: src/sort.c:1324 #, fuzzy, c-format msgid "--%s argument %s too large" msgstr "%s yra per didelis" -#: src/sort.c:1316 +#: src/sort.c:1327 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "" -#: src/sort.c:1398 +#: src/sort.c:1409 #, c-format msgid "number in parallel must be nonzero" msgstr "" -#: src/sort.c:1479 +#: src/sort.c:1494 msgid "stat failed" msgstr "" -#: src/sort.c:1740 +#: src/sort.c:1755 msgid "read failed" msgstr "" -#: src/sort.c:2028 +#: src/sort.c:2043 #, c-format msgid "string transformation failed" msgstr "" -#: src/sort.c:2031 +#: src/sort.c:2046 #, c-format msgid "the untransformed string was %s" msgstr "" -#: src/sort.c:2194 +#: src/sort.c:2209 #, c-format msgid "^ no match for key\n" msgstr "" -#: src/sort.c:2374 +#: src/sort.c:2389 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "" -#: src/sort.c:2380 +#: src/sort.c:2395 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "" -#: src/sort.c:2391 +#: src/sort.c:2406 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" -#: src/sort.c:2404 +#: src/sort.c:2419 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "" -#: src/sort.c:2436 +#: src/sort.c:2451 #, fuzzy, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" @@ -7434,130 +7794,134 @@ msgstr[0] "%s: parametras `%s' dviprasmis\n" msgstr[1] "%s: parametras `%s' dviprasmis\n" msgstr[2] "%s: parametras `%s' dviprasmis\n" -#: src/sort.c:2442 +#: src/sort.c:2457 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "" -#: src/sort.c:2716 src/sort.c:2725 +#: src/sort.c:2731 src/sort.c:2740 msgid "write failed" msgstr "" -#: src/sort.c:2768 +#: src/sort.c:2783 #, c-format msgid "%s: %s:%s: disorder: " msgstr "" -#: src/sort.c:2771 +#: src/sort.c:2786 msgid "standard error" msgstr "standartinė klaida" -#: src/sort.c:3926 +#: src/sort.c:3698 +#, fuzzy +msgid "cannot read" +msgstr "negalima nustatyti datos" + +#: src/sort.c:3976 #, c-format msgid "%s: invalid field specification %s" msgstr "" -#: src/sort.c:3937 +#: src/sort.c:3987 #, fuzzy, c-format msgid "options '-%s' are incompatible" msgstr "%s: parametras `%s' dviprasmis\n" -#: src/sort.c:3988 +#: src/sort.c:4038 #, c-format msgid "%s: invalid count at start of %s" msgstr "" -#: src/sort.c:4245 +#: src/sort.c:4295 #, fuzzy msgid "invalid number after '-'" msgstr "%s: netaisyklingas skaičius" -#: src/sort.c:4248 src/sort.c:4334 src/sort.c:4362 +#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416 #, fuzzy msgid "invalid number after '.'" msgstr "%s: netaisyklingas skaičius" -#: src/sort.c:4261 src/sort.c:4367 +#: src/sort.c:4315 src/sort.c:4421 msgid "stray character in field spec" msgstr "" -#: src/sort.c:4308 +#: src/sort.c:4362 #, c-format msgid "multiple compress programs specified" msgstr "" -#: src/sort.c:4325 +#: src/sort.c:4379 msgid "invalid number at field start" msgstr "" -#: src/sort.c:4329 src/sort.c:4357 +#: src/sort.c:4383 src/sort.c:4411 msgid "field number is zero" msgstr "" -#: src/sort.c:4338 +#: src/sort.c:4392 msgid "character offset is zero" msgstr "" -#: src/sort.c:4353 +#: src/sort.c:4407 #, fuzzy msgid "invalid number after ','" msgstr "%s: netaisyklingas skaičius" -#: src/sort.c:4403 +#: src/sort.c:4457 #, c-format msgid "empty tab" msgstr "" -#: src/sort.c:4496 src/wc.c:692 +#: src/sort.c:4550 src/wc.c:692 #, c-format msgid "cannot read file names from %s" msgstr "" -#: src/sort.c:4518 +#: src/sort.c:4572 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "" -#: src/sort.c:4524 +#: src/sort.c:4578 #, c-format msgid "no input from %s" msgstr "" -#: src/sort.c:4570 +#: src/sort.c:4624 #, c-format msgid "using %s sorting rules" msgstr "" -#: src/sort.c:4573 +#: src/sort.c:4627 #, c-format msgid "using simple byte comparison" msgstr "" -#: src/sort.c:4604 +#: src/sort.c:4658 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "" -#: src/split.c:184 +#: src/split.c:187 #, c-format msgid "the suffix length needs to be at least %zu" msgstr "" -#: src/split.c:201 +#: src/split.c:204 #, c-format msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" msgstr "Naudojimas: %s [PARAMETRAS]... [ĮVESTIS [PRIEŠDĖLIS]]\n" -#: src/split.c:205 +#: src/split.c:208 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" -"\n" msgstr "" -#: src/split.c:214 +#: src/split.c:216 #, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" @@ -7576,7 +7940,7 @@ msgid "" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" -#: src/split.c:227 +#: src/split.c:229 #, fuzzy msgid "" " --verbose print a diagnostic just before each\n" @@ -7585,7 +7949,7 @@ msgstr "" " --complement rinkinio papildymas pasirinktais baitais, ženklais\n" " arba laukais\n" -#: src/split.c:234 +#: src/split.c:236 msgid "" "\n" "CHUNKS may be:\n" @@ -7597,184 +7961,189 @@ msgid "" "r/K/N likewise but only output Kth of N to stdout\n" msgstr "" -#: src/split.c:352 +#: src/split.c:354 #, c-format msgid "output file suffixes exhausted" msgstr "" -#: src/split.c:364 +#: src/split.c:366 #, c-format msgid "creating file %s\n" msgstr "kuriamas failas %s\n" -#: src/split.c:377 -#, fuzzy, c-format +#: src/split.c:375 +#, c-format +msgid "%s would overwrite input; aborting" +msgstr "" + +#: src/split.c:391 +#, c-format msgid "failed to set FILE environment variable" -msgstr "nepavyko pašalinti %s" +msgstr "" -#: src/split.c:379 +#: src/split.c:393 #, c-format msgid "executing with FILE=%s\n" msgstr "" -#: src/split.c:381 +#: src/split.c:395 #, fuzzy, c-format msgid "failed to create pipe" -msgstr "nepavyko sukurti kietosios nuorodos %s į %s" +msgstr "nepavyko pašalinti %s" -#: src/split.c:395 +#: src/split.c:409 #, fuzzy, c-format msgid "closing prior pipe" msgstr "užveriamas aplankas %s" -#: src/split.c:397 -#, fuzzy, c-format +#: src/split.c:411 +#, c-format msgid "closing output pipe" -msgstr "užveriama standartinė įvestis" +msgstr "" -#: src/split.c:401 -#, fuzzy, c-format +#: src/split.c:415 +#, c-format msgid "moving input pipe" -msgstr "užveriama standartinė įvestis" +msgstr "" -#: src/split.c:403 +#: src/split.c:417 #, fuzzy, c-format msgid "closing input pipe" msgstr "užveriama standartinė įvestis" -#: src/split.c:408 +#: src/split.c:422 #, fuzzy, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "nepavyko įvykdyti komandos %s" -#: src/split.c:414 +#: src/split.c:428 #, fuzzy, c-format msgid "failed to close input pipe" -msgstr "nepavyko atverti %s" +msgstr "nepavyko užverti aplanko %s" -#: src/split.c:450 +#: src/split.c:464 #, c-format msgid "waiting for child process" msgstr "" -#: src/split.c:460 +#: src/split.c:474 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "" -#: src/split.c:468 +#: src/split.c:482 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:475 src/timeout.c:449 +#: src/split.c:489 src/timeout.c:494 #, c-format msgid "unknown status from command (0x%X)" msgstr "" -#: src/split.c:1037 +#: src/split.c:1052 #, c-format msgid "cannot split in more than one way" msgstr "" -#: src/split.c:1050 src/split.c:1192 src/split.c:1363 +#: src/split.c:1065 src/split.c:1205 src/split.c:1376 #, fuzzy, c-format msgid "%s: invalid number of chunks" msgstr "%s: netaisyklingas skaičius" -#: src/split.c:1054 +#: src/split.c:1069 #, fuzzy, c-format msgid "%s: invalid chunk number" msgstr "%s: netaisyklingas skaičius" -#: src/split.c:1106 +#: src/split.c:1119 #, c-format msgid "%s: invalid suffix length" msgstr "" -#: src/split.c:1131 src/split.c:1139 src/split.c:1162 src/split.c:1167 +#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180 #, c-format msgid "%s: invalid number of bytes" msgstr "" -#: src/split.c:1150 src/split.c:1297 +#: src/split.c:1163 src/split.c:1310 #, c-format msgid "%s: invalid number of lines" msgstr "" -#: src/split.c:1223 +#: src/split.c:1236 #, c-format msgid "line count option -%s%c... is too large" msgstr "" -#: src/split.c:1235 +#: src/split.c:1248 #, c-format msgid "%s: invalid start value for numerical suffix" msgstr "" -#: src/split.c:1263 +#: src/split.c:1276 #, fuzzy, c-format msgid "%s: invalid IO block size" msgstr "%s: blogas failo dydis" -#: src/split.c:1284 +#: src/split.c:1297 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1321 +#: src/split.c:1334 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1356 +#: src/split.c:1369 #, 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:169 +#: src/stat.c:173 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:838 +#: src/stat.c:857 #, fuzzy, c-format msgid "failed to canonicalize %s" msgstr "nepavyko atverti %s" -#: src/stat.c:1050 +#: src/stat.c:1069 #, fuzzy, c-format msgid "warning: unrecognized escape '\\%c'" -msgstr "neatpažintas priešdėlis: %s" +msgstr "%s: neatpažintas argumentas „%c%s“\n" -#: src/stat.c:1105 +#: src/stat.c:1124 #, c-format msgid "%s: invalid directive" msgstr "%s: netinkama direktyva" -#: src/stat.c:1151 +#: src/stat.c:1170 #, c-format msgid "warning: backslash at end of format" msgstr "" -#: src/stat.c:1182 +#: src/stat.c:1201 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" -#: src/stat.c:1189 +#: src/stat.c:1208 #, c-format msgid "cannot read file system information for %s" msgstr "" -#: src/stat.c:1209 +#: src/stat.c:1228 #, 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:1245 +#: src/stat.c:1264 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -7785,7 +8154,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1268 +#: src/stat.c:1287 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -7793,30 +8162,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1278 +#: src/stat.c:1297 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:1286 +#: src/stat.c:1305 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:1295 +#: src/stat.c:1314 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:1305 +#: src/stat.c:1324 #, fuzzy, c-format msgid "Context: %C\n" msgstr "nepavyksta įvykdyti %s" -#: src/stat.c:1313 +#: src/stat.c:1332 msgid "" "Access: %x\n" "Modify: %y\n" @@ -7824,15 +8193,17 @@ msgid "" " Birth: %w\n" msgstr "" -#: src/stat.c:1331 +#: src/stat.c:1350 +msgid "Display file or file system status.\n" +msgstr "" + +#: src/stat.c:1356 msgid "" -"Display file or file system status.\n" -"\n" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" -#: src/stat.c:1337 +#: src/stat.c:1360 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -7842,7 +8213,7 @@ msgid "" " -t, --terse print the information in terse form\n" msgstr "" -#: src/stat.c:1348 +#: src/stat.c:1371 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -7854,7 +8225,7 @@ msgid "" " %C SELinux security context string\n" msgstr "" -#: src/stat.c:1357 +#: src/stat.c:1380 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -7864,7 +8235,7 @@ msgid "" " %G group name of owner\n" msgstr "" -#: src/stat.c:1365 +#: src/stat.c:1388 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -7877,7 +8248,7 @@ msgid "" " %T minor device type in hex\n" msgstr "" -#: src/stat.c:1376 +#: src/stat.c:1399 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -7892,7 +8263,7 @@ msgid "" "\n" msgstr "" -#: src/stat.c:1390 +#: src/stat.c:1413 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -7903,7 +8274,7 @@ msgid "" " %f free blocks in file system\n" msgstr "" -#: src/stat.c:1399 +#: src/stat.c:1422 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -7922,30 +8293,29 @@ msgstr "Naudojimas: %s [PARAMETRAS]...\n" #: src/stdbuf.c:91 msgid "" "Run COMMAND, with modified buffering operations for its standard streams.\n" -"\n" msgstr "" -#: src/stdbuf.c:98 +#: src/stdbuf.c:97 msgid "" " -i, --input=MODE adjust standard input stream buffering\n" " -o, --output=MODE adjust standard output stream buffering\n" " -e, --error=MODE adjust standard error stream buffering\n" msgstr "" -#: src/stdbuf.c:105 +#: src/stdbuf.c:104 msgid "" "\n" "If MODE is 'L' the corresponding stream will be line buffered.\n" "This option is invalid with standard input.\n" msgstr "" -#: src/stdbuf.c:108 +#: src/stdbuf.c:107 msgid "" "\n" "If MODE is '0' the corresponding stream will be unbuffered.\n" msgstr "" -#: src/stdbuf.c:111 +#: src/stdbuf.c:110 msgid "" "\n" "Otherwise MODE is a number which may be followed by one of the following:\n" @@ -7955,7 +8325,7 @@ msgid "" "size set to MODE bytes.\n" msgstr "" -#: src/stdbuf.c:117 +#: src/stdbuf.c:116 msgid "" "\n" "NOTE: If COMMAND adjusts the buffering of its standard streams ('tee' does\n" @@ -7965,22 +8335,22 @@ msgid "" "and are thus unaffected by 'stdbuf' settings.\n" msgstr "" -#: src/stdbuf.c:227 +#: src/stdbuf.c:226 #, fuzzy, c-format msgid "failed to find %s" msgstr "nepavyko atverti %s" -#: src/stdbuf.c:247 src/stdbuf.c:279 +#: src/stdbuf.c:246 src/stdbuf.c:278 #, fuzzy, c-format msgid "failed to update the environment with %s" msgstr "nepavyko pašalinti %s" -#: src/stdbuf.c:321 +#: src/stdbuf.c:320 #, c-format msgid "line buffering stdin is meaningless" msgstr "" -#: src/stty.c:509 +#: src/stty.c:513 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -7988,23 +8358,25 @@ msgid "" " or: %s [-F DEVICE | --file=DEVICE] [-g|--save]\n" msgstr "" -#: src/stty.c:515 +#: src/stty.c:519 +msgid "Print or change terminal characteristics.\n" +msgstr "" + +#: src/stty.c:525 msgid "" -"Print or change terminal characteristics.\n" -"\n" " -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:524 +#: src/stty.c:532 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:529 +#: src/stty.c:537 msgid "" "\n" "Special characters:\n" @@ -8013,7 +8385,7 @@ msgid "" " eol CHAR CHAR will end the line\n" msgstr "" -#: src/stty.c:536 +#: src/stty.c:544 msgid "" " * eol2 CHAR alternate CHAR for ending the line\n" " erase CHAR CHAR will erase the last character typed\n" @@ -8021,7 +8393,7 @@ msgid "" " kill CHAR CHAR will erase the current line\n" msgstr "" -#: src/stty.c:542 +#: src/stty.c:550 msgid "" " * lnext CHAR CHAR will enter the next character quoted\n" " quit CHAR CHAR will send a quit signal\n" @@ -8029,7 +8401,7 @@ msgid "" " start CHAR CHAR will restart the output after stopping it\n" msgstr "" -#: src/stty.c:548 +#: src/stty.c:556 msgid "" " stop CHAR CHAR will stop the output\n" " susp CHAR CHAR will send a terminal stop signal\n" @@ -8037,7 +8409,7 @@ msgid "" " * werase CHAR CHAR will erase the last word typed\n" msgstr "" -#: src/stty.c:554 +#: src/stty.c:562 msgid "" "\n" "Special settings:\n" @@ -8046,7 +8418,7 @@ msgid "" " * columns N same as cols N\n" msgstr "" -#: src/stty.c:561 +#: src/stty.c:569 msgid "" " ispeed N set the input speed to N\n" " * line N use line discipline N\n" @@ -8055,7 +8427,7 @@ msgid "" " ospeed N set the output speed to N\n" msgstr "" -#: src/stty.c:567 +#: src/stty.c:575 msgid "" " * rows N tell the kernel that the terminal has N rows\n" " * size print the number of rows and columns according to the " @@ -8064,27 +8436,28 @@ msgid "" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" -#: src/stty.c:573 +#: src/stty.c:581 msgid "" "\n" "Control settings:\n" " [-]clocal disable modem control signals\n" " [-]cread allow input to be received\n" " * [-]crtscts enable RTS/CTS handshaking\n" +" * [-]cdtrdsr enable DTR/DSR handshaking\n" " csN set character size to N bits, N in [5..8]\n" msgstr "" -#: src/stty.c:581 +#: src/stty.c:590 msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" " [-]hupcl same as [-]hup\n" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" -" [-]parodd set odd parity (even with '-')\n" +" [-]parodd set odd parity (or even parity with '-')\n" msgstr "" -#: src/stty.c:588 +#: src/stty.c:597 msgid "" "\n" "Input settings:\n" @@ -8094,7 +8467,7 @@ msgid "" " [-]igncr ignore carriage return\n" msgstr "" -#: src/stty.c:596 +#: src/stty.c:605 msgid "" " [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" @@ -8103,11 +8476,11 @@ msgid "" " [-]istrip clear high (8th) bit of input characters\n" msgstr "" -#: src/stty.c:603 +#: src/stty.c:612 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr "" -#: src/stty.c:606 +#: src/stty.c:615 msgid "" " * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" @@ -8117,7 +8490,7 @@ msgid "" " [-]tandem same as [-]ixoff\n" msgstr "" -#: src/stty.c:614 +#: src/stty.c:623 msgid "" "\n" "Output settings:\n" @@ -8127,7 +8500,7 @@ msgid "" " * nlN newline delay style, N in [0..1]\n" msgstr "" -#: src/stty.c:622 +#: src/stty.c:631 msgid "" " * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of null characters\n" @@ -8137,7 +8510,7 @@ msgid "" " * [-]onlret newline performs a carriage return\n" msgstr "" -#: src/stty.c:630 +#: src/stty.c:639 msgid "" " * [-]onocr do not print carriage returns in the first column\n" " [-]opost postprocess output\n" @@ -8147,7 +8520,7 @@ msgid "" " * vtN vertical tab delay style, N in [0..1]\n" msgstr "" -#: src/stty.c:638 +#: src/stty.c:647 msgid "" "\n" "Local settings:\n" @@ -8156,7 +8529,7 @@ msgid "" " * -crtkill kill all line by obeying the echoctl and echok settings\n" msgstr "" -#: src/stty.c:645 +#: src/stty.c:654 msgid "" " * [-]ctlecho echo control characters in hat notation ('^c')\n" " [-]echo echo input characters\n" @@ -8165,7 +8538,7 @@ msgid "" " [-]echok echo a newline after a kill character\n" msgstr "" -#: src/stty.c:652 +#: src/stty.c:661 msgid "" " * [-]echoke same as [-]crtkill\n" " [-]echonl echo newline even if not echoing other characters\n" @@ -8174,7 +8547,7 @@ msgid "" " [-]iexten enable non-POSIX special characters\n" msgstr "" -#: src/stty.c:659 +#: src/stty.c:668 msgid "" " [-]isig enable interrupt, quit, and suspend special characters\n" " [-]noflsh disable flushing after interrupt and quit special " @@ -8184,7 +8557,7 @@ msgid "" " * [-]xcase with icanon, escape with '\\' for uppercase characters\n" msgstr "" -#: src/stty.c:666 +#: src/stty.c:675 msgid "" "\n" "Combination settings:\n" @@ -8193,7 +8566,7 @@ msgid "" " -cbreak same as icanon\n" msgstr "" -#: src/stty.c:673 +#: src/stty.c:682 msgid "" " cooked same as brkint ignpar istrip icrnl ixon opost isig\n" " icanon, eof and eol characters to their default values\n" @@ -8201,7 +8574,7 @@ msgid "" " crt same as echoe echoctl echoke\n" msgstr "" -#: src/stty.c:679 +#: src/stty.c:688 msgid "" " dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" " kill ^u\n" @@ -8210,7 +8583,7 @@ msgid "" " evenp same as parenb -parodd cs7\n" msgstr "" -#: src/stty.c:686 +#: src/stty.c:695 msgid "" " -evenp same as -parenb cs8\n" " * [-]lcase same as xcase iuclc olcuc\n" @@ -8220,7 +8593,7 @@ msgid "" " -nl same as icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" msgstr "" -#: src/stty.c:694 +#: src/stty.c:703 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -8229,7 +8602,7 @@ msgid "" " -pass8 same as parenb istrip cs7\n" msgstr "" -#: src/stty.c:701 +#: src/stty.c:710 msgid "" " raw same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" " -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n" @@ -8237,7 +8610,7 @@ msgid "" " -raw same as cooked\n" msgstr "" -#: src/stty.c:707 +#: src/stty.c:716 msgid "" " sane same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" " -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n" @@ -8247,7 +8620,7 @@ msgid "" " characters to their default values\n" msgstr "" -#: src/stty.c:715 +#: src/stty.c:724 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -8256,126 +8629,59 @@ msgid "" "127; special values ^- or undef used to disable special characters.\n" msgstr "" -#: src/stty.c:787 +#: src/stty.c:796 #, c-format msgid "only one device may be specified" msgstr "" -#: src/stty.c:817 +#: src/stty.c:826 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" "mutually exclusive" msgstr "" -#: src/stty.c:823 +#: src/stty.c:832 #, c-format msgid "when specifying an output style, modes may not be set" msgstr "" -#: src/stty.c:838 +#: src/stty.c:847 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "" -#: src/stty.c:883 src/stty.c:993 +#: src/stty.c:892 src/stty.c:1002 #, c-format msgid "invalid argument %s" msgstr "netinkamas argumentas %s" -#: src/stty.c:894 src/stty.c:911 src/stty.c:923 src/stty.c:936 src/stty.c:948 -#: src/stty.c:968 +#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957 +#: src/stty.c:977 #, c-format msgid "missing argument to %s" msgstr "" -#: src/stty.c:974 +#: src/stty.c:983 #, c-format msgid "invalid line discipline %s" msgstr "" -#: src/stty.c:1044 +#: src/stty.c:1053 #, c-format msgid "%s: unable to perform all requested operations" msgstr "" -#: src/stty.c:1390 +#: src/stty.c:1399 #, c-format msgid "%s: no size information for this device" msgstr "" -#: src/stty.c:1904 +#: src/stty.c:1920 #, c-format msgid "invalid integer argument %s" msgstr "" -#: src/su.c:229 -msgid "Password:" -msgstr "Slaptažodis:" - -#: src/su.c:232 -#, c-format -msgid "getpass: cannot open /dev/tty" -msgstr "" - -#: src/su.c:290 -#, c-format -msgid "cannot set groups" -msgstr "" - -#: src/su.c:294 -#, c-format -msgid "cannot set group id" -msgstr "" - -#: src/su.c:296 -#, c-format -msgid "cannot set user id" -msgstr "" - -#: src/su.c:371 -#, c-format -msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" -msgstr "Naudojimas: %s [PARAMETRAS]... [-] [NAUDOTOJAS [ARG]...]\n" - -#: src/su.c:372 -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 "" - -#: src/su.c:384 -msgid "" -"\n" -"A mere - implies -l. If USER not given, assume root.\n" -msgstr "" - -#: src/su.c:461 -#, c-format -msgid "user %s does not exist" -msgstr "naudotojas %s nerastas" - -#: src/su.c:484 -#, c-format -msgid "incorrect password" -msgstr "neteisingas slaptažodis" - -#: src/su.c:501 -#, c-format -msgid "using restricted shell %s" -msgstr "" - -#: src/su.c:509 -#, c-format -msgid "warning: cannot change directory to %s" -msgstr "dėmesio: nepavyko pakeisti aplanko į %s" - #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 msgid "Kayvan Aghaiepour" @@ -8400,7 +8706,7 @@ msgstr "" msgid "ignoring all arguments" msgstr "ignoruojami visi argumentai" -#: src/system.h:340 +#: src/system.h:343 #, c-format msgid "" "\n" @@ -8409,15 +8715,21 @@ msgid "" "for details about the options it supports.\n" msgstr "" -#: src/system.h:346 +#: src/system.h:349 msgid " --help display this help and exit\n" msgstr " --help parodyti šią pagalbą ir išeiti\n" -#: src/system.h:348 +#: src/system.h:351 msgid " --version output version information and exit\n" msgstr " --version išvesti informaciją apie versiją ir išeiti\n" -#: src/system.h:541 +#: src/system.h:544 +msgid "" +"\n" +"Mandatory arguments to long options are mandatory for short options too.\n" +msgstr "" + +#: src/system.h:552 msgid "" "\n" "SIZE is an integer and optional unit (example: 10M is 10*1024*1024). Units\n" @@ -8425,7 +8737,7 @@ msgid "" "1000).\n" msgstr "" -#: src/system.h:550 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -8434,7 +8746,7 @@ msgid "" "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n" msgstr "" -#: src/system.h:560 +#: src/system.h:571 #, c-format msgid "" "\n" @@ -8447,22 +8759,22 @@ msgstr "" #. <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:574 +#: src/system.h:585 #, c-format msgid "Report %s translation bugs to <http://translationproject.org/team/>\n" msgstr "" -#: src/system.h:578 +#: src/system.h:589 #, c-format msgid "For complete documentation, run: info coreutils '%s invocation'\n" msgstr "" -#: src/system.h:585 +#: src/system.h:596 #, 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:617 +#: src/system.h:628 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -8478,55 +8790,57 @@ 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" -"\n" msgstr "" +"\n" +"Kai nenurodytas FAILAS, arba FAILAS yra -, nuskaityti standartinę įvestį.\n" -#: src/tac.c:145 +#: src/tac.c:144 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 "" -#: src/tac.c:235 src/tac.c:336 +#: src/tac.c:234 src/tac.c:335 #, c-format msgid "%s: seek failed" msgstr "" -#: src/tac.c:264 +#: src/tac.c:263 #, c-format msgid "record too large" msgstr "įrašas per didelis" -#: src/tac.c:451 +#: src/tac.c:450 #, fuzzy, c-format msgid "failed to create temporary file in %s" msgstr "nepavyksta sukurti laikino failo %s" -#: src/tac.c:459 +#: src/tac.c:458 #, fuzzy, c-format msgid "failed to open %s for writing" msgstr "nepavyksta atverti %s rašymui" -#: src/tac.c:476 +#: src/tac.c:475 #, fuzzy, c-format msgid "failed to rewind stream for %s" msgstr "nepavyko išlaikyti %s laikų" -#: src/tac.c:512 src/tac.c:519 +#: src/tac.c:511 src/tac.c:518 #, c-format msgid "%s: write error" msgstr "%s: rašymo klaida" -#: src/tac.c:572 +#: src/tac.c:571 #, fuzzy, c-format msgid "failed to open %s for reading" msgstr "nepavyksta atverti skaitymui %s" -#: src/tac.c:630 +#: src/tac.c:629 #, c-format msgid "separator cannot be empty" msgstr "atskyriklis negali būti tuščias" @@ -8542,10 +8856,9 @@ 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" -"\n" msgstr "" -#: src/tail.c:271 +#: src/tail.c:270 msgid "" " -c, --bytes=K output the last K bytes; alternatively, use -c " "+K\n" @@ -8553,7 +8866,7 @@ msgid "" "file\n" msgstr "" -#: src/tail.c:275 +#: src/tail.c:274 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -8562,7 +8875,7 @@ msgid "" " -F same as --follow=name --retry\n" msgstr "" -#: src/tail.c:282 +#: src/tail.c:281 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -8576,7 +8889,7 @@ msgid "" " With inotify, this option is rarely useful.\n" msgstr "" -#: src/tail.c:295 +#: src/tail.c:294 msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" " -q, --quiet, --silent never output headers giving file names\n" @@ -8585,7 +8898,7 @@ msgid "" " name, i.e., with --follow=name\n" msgstr "" -#: src/tail.c:302 +#: src/tail.c:301 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations.\n" @@ -8594,7 +8907,7 @@ msgid "" " -v, --verbose always output headers giving file names\n" msgstr "" -#: src/tail.c:311 +#: src/tail.c:310 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -8605,7 +8918,7 @@ msgid "" "\n" msgstr "" -#: src/tail.c:320 +#: src/tail.c:319 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" @@ -8615,64 +8928,64 @@ msgid "" "named file in a way that accommodates renaming, removal and creation.\n" msgstr "" -#: src/tail.c:379 +#: src/tail.c:378 #, c-format msgid "closing %s (fd=%d)" msgstr "" -#: src/tail.c:454 +#: src/tail.c:453 #, c-format msgid "%s: cannot seek to relative offset %s" msgstr "" -#: src/tail.c:458 +#: src/tail.c:457 #, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "" -#: src/tail.c:895 +#: src/tail.c:894 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "" -#: src/tail.c:907 +#: src/tail.c:906 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" msgstr "" -#: src/tail.c:964 +#: src/tail.c:963 #, c-format msgid "%s has become inaccessible" msgstr "" -#: src/tail.c:981 +#: src/tail.c:980 #, c-format msgid "%s has been replaced with an untailable file; giving up on this name" msgstr "" -#: src/tail.c:990 +#: src/tail.c:989 #, c-format msgid "%s has been replaced with a remote file. giving up on this name" msgstr "" -#: src/tail.c:1011 +#: src/tail.c:1010 #, c-format msgid "%s has become accessible" msgstr "" -#: src/tail.c:1019 +#: src/tail.c:1018 #, c-format msgid "%s has appeared; following end of new file" msgstr "" -#: src/tail.c:1030 +#: src/tail.c:1029 #, c-format msgid "%s has been replaced; following end of new file" msgstr "" -#: src/tail.c:1131 +#: src/tail.c:1130 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "" @@ -8967,17 +9280,22 @@ msgstr "trūksta „]“" msgid "extra argument %s" msgstr "" -#: src/timeout.c:124 +#: src/timeout.c:112 +#, c-format +msgid "warning: sigprocmask" +msgstr "" + +#: src/timeout.c:145 #, c-format msgid "warning: timer_settime" msgstr "" -#: src/timeout.c:129 +#: src/timeout.c:150 #, c-format msgid "warning: timer_create" msgstr "" -#: src/timeout.c:204 +#: src/timeout.c:225 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -8986,15 +9304,15 @@ msgstr "" "Naudojimas: %s KOMANDA [ARG]...\n" " arba: %s PARAMETRAS\n" -#: src/timeout.c:208 -msgid "" -"Start COMMAND, and kill it if still running after DURATION.\n" -"\n" -"Mandatory arguments to long options are mandatory for short options too.\n" +#: src/timeout.c:229 +msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "" -#: src/timeout.c:213 +#: src/timeout.c:235 msgid "" +" --preserve-status\n" +" exit with the same status as COMMAND, even when the\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 " @@ -9009,7 +9327,7 @@ msgid "" " See 'kill -l' for a list of signals\n" msgstr "" -#: src/timeout.c:229 +#: src/timeout.c:254 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -9017,25 +9335,30 @@ msgid "" "days.\n" msgstr "" -#: src/timeout.c:234 +#: src/timeout.c:259 msgid "" "\n" -"If the command times out, then exit with status 124. Otherwise, exit\n" -"with the status of COMMAND. If no signal is specified, send the TERM\n" -"signal upon timeout. The TERM signal kills any process that does not\n" -"block or catch that signal. For other processes, it may be necessary to\n" -"use the KILL (9) signal, since this signal cannot be caught. If the\n" -"KILL (9) signal is sent, the exit status is 128+9 rather than 124.\n" +"If the command times out, and --preserve-status is not set, then exit with\n" +"status 124. Otherwise, exit with the status of COMMAND. If no signal\n" +"is specified, send the TERM signal upon timeout. The TERM signal kills\n" +"any process that does not block or catch that signal. It may be necessary\n" +"to use the KILL (9) signal, since this signal cannot be caught, in which\n" +"case the exit status is 128+9 rather than 124.\n" +msgstr "" + +#: src/timeout.c:363 +#, c-format +msgid "warning: disabling core dumps failed" msgstr "" -#: src/timeout.c:419 +#: src/timeout.c:471 #, fuzzy, c-format msgid "error waiting for command" msgstr "klaida rašant %s" -#: src/timeout.c:441 +#: src/timeout.c:482 #, c-format -msgid "warning: disabling core dumps failed" +msgid "the monitored command dumped core" msgstr "" #. This is a proper name. See the gettext manual, section Names. @@ -9048,22 +9371,22 @@ msgstr "Jim Kingdon" msgid "Randy Smith" msgstr "Randy Smith" -#: src/touch.c:115 src/touch.c:313 +#: src/touch.c:115 src/touch.c:309 #, c-format msgid "invalid date format %s" msgstr "netaisyklingas datos formatas %s" -#: src/touch.c:194 +#: src/touch.c:191 #, c-format msgid "cannot touch %s" msgstr "" -#: src/touch.c:200 +#: src/touch.c:197 #, c-format msgid "setting times of %s" msgstr "" -#: src/touch.c:216 +#: src/touch.c:213 msgid "" "Update the access and modification times of each FILE to the current time.\n" "\n" @@ -9072,10 +9395,9 @@ msgid "" "\n" "A FILE argument string of - is handled specially and causes touch to\n" "change the times of the file associated with standard output.\n" -"\n" msgstr "" -#: src/touch.c:229 +#: src/touch.c:225 msgid "" " -a change only the access time\n" " -c, --no-create do not create any files\n" @@ -9083,7 +9405,7 @@ msgid "" " -f (ignored)\n" msgstr "" -#: src/touch.c:235 +#: src/touch.c:231 msgid "" " -h, --no-dereference affect each symbolic link instead of any " "referenced\n" @@ -9092,27 +9414,27 @@ msgid "" " -m change only the modification time\n" msgstr "" -#: src/touch.c:241 +#: src/touch.c:237 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" -" --time=WORD change the specified time:\n" +" --time=WORD change the specified time:\n" " WORD is access, atime, or use: equivalent to -a\n" " WORD is modify or mtime: equivalent to -m\n" msgstr "" -#: src/touch.c:250 +#: src/touch.c:246 msgid "" "\n" "Note that the -d and -t options accept different time-date formats.\n" msgstr "" -#: src/touch.c:339 +#: src/touch.c:335 #, c-format msgid "cannot specify times from more than one source" msgstr "" -#: src/touch.c:413 +#: src/touch.c:409 #, c-format msgid "" "warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'" @@ -9330,25 +9652,24 @@ msgid "" "If a FILE is larger than the specified size, the extra data is lost.\n" "If a FILE is shorter, it is extended and the extended part (hole)\n" "reads as zero bytes.\n" -"\n" msgstr "" -#: src/truncate.c:110 +#: src/truncate.c:109 msgid " -c, --no-create do not create any files\n" msgstr "" -#: src/truncate.c:113 +#: src/truncate.c:112 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" -#: src/truncate.c:116 +#: 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" msgstr "" -#: src/truncate.c:122 +#: src/truncate.c:121 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -9356,57 +9677,57 @@ msgid "" "'/' round down to multiple of, '%' round up to multiple of.\n" msgstr "" -#: src/truncate.c:150 +#: src/truncate.c:149 #, c-format msgid "overflow in %<PRIdMAX> * %<PRIdMAX> byte blocks for file %s" msgstr "" -#: src/truncate.c:174 +#: src/truncate.c:173 #, c-format msgid "%s has unusable, apparently negative size" msgstr "" -#: src/truncate.c:184 src/truncate.c:379 +#: src/truncate.c:183 src/truncate.c:384 #, fuzzy, c-format msgid "cannot get the size of %s" msgstr "negalima sukūrti fifo %s" -#: src/truncate.c:206 +#: src/truncate.c:205 #, c-format msgid "overflow rounding up size of file %s" msgstr "" -#: src/truncate.c:216 +#: src/truncate.c:215 #, c-format msgid "overflow extending size of file %s" msgstr "" -#: src/truncate.c:231 +#: src/truncate.c:230 #, c-format msgid "failed to truncate %s at %<PRIdMAX> bytes" msgstr "" -#: src/truncate.c:305 +#: src/truncate.c:303 #, fuzzy, c-format msgid "multiple relative modifiers specified" msgstr "nurodyta keletas tikslo aplankų" -#: src/truncate.c:335 +#: src/truncate.c:333 #, fuzzy, c-format msgid "you must specify either %s or %s" msgstr "privalote nurodyti vieną iš %s arba %s" -#: src/truncate.c:342 +#: src/truncate.c:340 #, fuzzy, c-format msgid "you must specify a relative %s with %s" msgstr "privalote nurodyti vieną iš %s arba %s" -#: src/truncate.c:349 +#: src/truncate.c:347 #, c-format msgid "%s was specified but %s was not" msgstr "" -#: src/truncate.c:400 +#: src/truncate.c:404 #, c-format msgid "cannot open %s for writing" msgstr "nepavyksta atverti %s rašymui" @@ -9478,13 +9799,15 @@ msgid "cannot get system name" 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" -"\n" msgstr "" +"\n" +"Kai nenurodytas FAILAS, arba FAILAS yra -, nuskaityti standartinę įvestį.\n" -#: src/unexpand.c:125 +#: src/unexpand.c:124 msgid "" " -a, --all convert all blanks, instead of just initial blanks\n" " --first-only convert only leading sequences of blanks (overrides -a)\n" @@ -9492,12 +9815,12 @@ msgid "" " -t, --tabs=LIST use comma separated LIST of tab positions (enables -a)\n" msgstr "" -#: src/unexpand.c:153 +#: src/unexpand.c:152 #, c-format msgid "tabs are too far apart" msgstr "" -#: src/unexpand.c:505 +#: src/unexpand.c:504 #, c-format msgid "tab stop value is too large" msgstr "" @@ -9513,16 +9836,15 @@ msgid "" "writing to OUTPUT (or standard output).\n" "\n" "With no options, matching lines are merged to the first occurrence.\n" -"\n" msgstr "" -#: src/uniq.c:148 +#: src/uniq.c:147 msgid "" " -c, --count prefix lines by the number of occurrences\n" " -d, --repeated only print duplicate lines\n" msgstr "" -#: src/uniq.c:152 +#: src/uniq.c:151 msgid "" " -D, --all-repeated[=delimit-method] print all duplicate lines\n" " delimit-method={none(default),prepend,separate}\n" @@ -9534,18 +9856,18 @@ msgid "" " -z, --zero-terminated end lines with 0 byte, not newline\n" msgstr "" -#: src/uniq.c:162 +#: src/uniq.c:161 msgid " -w, --check-chars=N compare no more than N characters in lines\n" msgstr "" -#: src/uniq.c:167 +#: src/uniq.c:166 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:172 +#: src/uniq.c:171 msgid "" "\n" "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n" @@ -9553,24 +9875,24 @@ msgid "" "Also, comparisons honor the rules specified by 'LC_COLLATE'.\n" msgstr "" -#: src/uniq.c:359 +#: src/uniq.c:358 #, c-format msgid "too many repeated lines" msgstr "" -#: src/uniq.c:522 +#: src/uniq.c:521 msgid "invalid number of fields to skip" msgstr "" -#: src/uniq.c:531 +#: src/uniq.c:530 msgid "invalid number of bytes to skip" msgstr "" -#: src/uniq.c:540 +#: src/uniq.c:539 msgid "invalid number of bytes to compare" msgstr "" -#: src/uniq.c:559 +#: src/uniq.c:558 #, c-format msgid "printing all duplicated lines and repeat counts is meaningless" msgstr "" @@ -9621,6 +9943,11 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" +#: src/uptime.c:149 +#, c-format +msgid "up %2d:%02d, " +msgstr "" + #: src/uptime.c:151 #, c-format msgid "%lu user" @@ -9695,83 +10022,83 @@ msgstr "" msgid " old " msgstr "" -#: src/who.c:449 +#: src/who.c:440 msgid "system boot" msgstr "sistemos įkrova" -#: src/who.c:456 src/who.c:458 +#: src/who.c:447 src/who.c:449 msgid "id=" msgstr "id=" -#: src/who.c:471 src/who.c:476 +#: src/who.c:462 src/who.c:467 msgid "term=" msgstr "" -#: src/who.c:473 src/who.c:477 +#: src/who.c:464 src/who.c:468 msgid "exit=" msgstr "" -#: src/who.c:494 +#: src/who.c:485 msgid "LOGIN" msgstr "" -#: src/who.c:514 +#: src/who.c:505 msgid "clock change" msgstr "" -#: src/who.c:526 src/who.c:527 +#: src/who.c:517 src/who.c:518 msgid "run-level" msgstr "" -#: src/who.c:530 src/who.c:531 +#: src/who.c:521 src/who.c:522 msgid "last=" msgstr "" -#: src/who.c:562 +#: src/who.c:553 #, c-format msgid "" "\n" "# users=%lu\n" msgstr "" -#: src/who.c:568 +#: src/who.c:559 msgid "NAME" msgstr "PAVADINIMAS" -#: src/who.c:568 +#: src/who.c:559 msgid "LINE" msgstr "EILUTĖ" -#: src/who.c:568 +#: src/who.c:559 msgid "TIME" msgstr "LAIKAS" -#: src/who.c:568 +#: src/who.c:559 msgid "IDLE" msgstr "LAISVA" -#: src/who.c:569 +#: src/who.c:560 msgid "PID" msgstr "PID" -#: src/who.c:569 +#: src/who.c:560 msgid "COMMENT" msgstr "KOMENTARAS" -#: src/who.c:569 +#: src/who.c:560 msgid "EXIT" msgstr "IŠEITI" -#: src/who.c:649 +#: src/who.c:640 #, c-format msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n" msgstr "Naudojimas: %s [PARAMETRAS]... [ FAILAS | ARG1 ARG2 ]\n" -#: src/who.c:650 +#: src/who.c:641 msgid "Print information about users who are currently logged in.\n" msgstr "Išvesti informaciją apie šiuo metu prisijungusius naudotojus.\n" -#: src/who.c:653 +#: src/who.c:644 msgid "" "\n" " -a, --all same as -b -d --login -p -r -t -T -u\n" @@ -9780,18 +10107,18 @@ msgid "" " -H, --heading print line of column headings\n" msgstr "" -#: src/who.c:660 +#: src/who.c:651 msgid " -l, --login print system login processes\n" msgstr "" -#: src/who.c:663 +#: src/who.c:654 msgid "" " --lookup attempt to canonicalize hostnames via DNS\n" " -m only hostname and user associated with stdin\n" " -p, --process print active processes spawned by init\n" msgstr "" -#: src/who.c:668 +#: src/who.c:659 msgid "" " -q, --count all login names and number of users logged on\n" " -r, --runlevel print current runlevel\n" @@ -9799,7 +10126,7 @@ msgid "" " -t, --time print last system clock change\n" msgstr "" -#: src/who.c:674 +#: src/who.c:665 msgid "" " -T, -w, --mesg add user's message status as +, - or ?\n" " -u, --users list users logged in\n" @@ -9807,7 +10134,7 @@ msgid "" " --writable same as -T\n" msgstr "" -#: src/who.c:682 +#: src/who.c:673 #, c-format msgid "" "\n" @@ -9845,12 +10172,13 @@ msgstr "" "Pakartotinai išvesti eilutę su nurodyta EILUTĖ(čių) reikšme, arba `y'.\n" "\n" -#~ msgid "" -#~ "Usage: %s NAME\n" -#~ " or: %s OPTION\n" -#~ msgstr "" -#~ "Naudojimas: %s PAVADINIMAS\n" -#~ " arba: %s PARAMETRAS\n" +#, fuzzy +#~ msgid " returning value: '%s'\n" +#~ msgstr "kuriamas failas %s\n" + +#, fuzzy +#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n" +#~ msgstr "Naudojimas: %s [PARAMETRAS]... [NAUDOTOJAS]...\n" #~ msgid "" #~ "\n" @@ -9863,8 +10191,50 @@ msgstr "" #~ " %s /usr/bin/sort Išvedimas „sort“.\n" #~ " %s include/stdio.h .h Išvedimas „stdio“.\n" -#~ msgid "Usage: %s [OPTION] FILE...\n" -#~ msgstr "Naudojimas: %s [PARAMETRAS] FAILAS...\n" +#~ msgid "reading %s" +#~ msgstr "skaitoma %s" + +#~ msgid "writing %s" +#~ msgstr "rašoma %s" + +#~ msgid "closing %s" +#~ msgstr "uždaroma %s" + +#~ msgid "accessing %s" +#~ msgstr "dirbama su %s" + +#~ msgid "opening %s" +#~ msgstr "atveriamas %s" + +#~ msgid "" +#~ "Usage: %s NAME\n" +#~ " or: %s OPTION\n" +#~ 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]... FILE\n" +#~ msgstr "Naudojimas: %s [PARAMETRAS]... FAILAS\n" + +#~ msgid "Password:" +#~ msgstr "Slaptažodis:" + +#~ msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" +#~ msgstr "Naudojimas: %s [PARAMETRAS]... [-] [NAUDOTOJAS [ARG]...]\n" + +#~ msgid "user %s does not exist" +#~ msgstr "naudotojas %s nerastas" + +#~ msgid "incorrect password" +#~ msgstr "neteisingas slaptažodis" + +#~ msgid "warning: cannot change directory to %s" +#~ msgstr "dėmesio: nepavyko pakeisti aplanko į %s" #~ msgid "" #~ "Change the mode of each FILE to MODE.\n" @@ -9877,10 +10247,6 @@ msgstr "" #~ " -c, --changes kaip verbose, bet pranešti tik kai atliktas " #~ "pakeitimas\n" -#, fuzzy -#~ msgid "Usage: %s [OPTION]... PATH START\n" -#~ msgstr "Naudojimas: %s [PARAMETRAS]...\n" - #, fuzzy #~ msgid "" #~ "Display the current time in the given FORMAT, or set the system date.\n" @@ -9893,13 +10259,6 @@ msgstr "" #~ " -f, --file=DATAFILE kaip --date, vieną kartą kiekvienai linijai " #~ "DATAFILE faile\n" -#~ msgid "cannot create link %s" -#~ msgstr "negaliu sukurti nuorodos %s" - -#, fuzzy -#~ msgid "%s: option '%s' is ambiguous\n" -#~ msgstr "%s: parametras „-W %s“ dviprasmis\n" - #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s: neleistinas parametras – %c\n" @@ -9909,6 +10268,9 @@ msgstr "" #~ 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" @@ -9931,6 +10293,9 @@ msgstr "" #~ msgid "cannot create temporary file" #~ msgstr "nepavyko sukurti laikino failo" +#~ msgid "Usage: %s [OPTION] FILE...\n" +#~ msgstr "Naudojimas: %s [PARAMETRAS] FAILAS...\n" + #~ msgid "%ld day" #~ msgid_plural "%ld days" #~ msgstr[0] "%ld diena" diff --git a/po/ms.gmo b/po/ms.gmo index cc734d8a..b5f24750 100644 Binary files a/po/ms.gmo and b/po/ms.gmo differ diff --git a/po/ms.po b/po/ms.po index 4d09b5f6..813a0128 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: 2012-05-10 19:35+0200\n" +"POT-Creation-Date: 2013-02-14 15:56+0000\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,19 +34,19 @@ msgstr "Hujah sah adalah:" msgid "error closing file" msgstr "menutup fail input %s" -#: lib/closeout.c:112 src/base64.c:109 src/base64.c:121 src/base64.c:127 -#: src/base64.c:168 src/base64.c:224 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:330 src/expand.c:355 src/head.c:298 -#: src/head.c:348 src/head.c:756 src/head.c:797 src/mktemp.c:350 src/od.c:919 -#: src/paste.c:160 src/shuf.c:369 src/split.c:727 src/split.c:964 -#: src/split.c:969 src/tail.c:350 src/tail.c:1201 src/tail.c:1307 +#: 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 -#: src/unexpand.c:427 src/unexpand.c:443 +#: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "ralat menulis" -#: lib/copy-acl.c:611 src/copy.c:1160 src/copy.c:2602 +#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617 #, fuzzy, c-format msgid "preserving permissions for %s" msgstr "menetapkan keizinan pada %s" @@ -244,18 +244,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:483 +#: lib/mkdir-p.c:196 src/install.c:484 #, c-format msgid "cannot change permissions of %s" msgstr "tak dapat menukar keizinan %s" -#: lib/mkdir-p.c:206 src/copy.c:2261 src/install.c:709 src/install.c:722 +#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722 #, 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:915 src/tac.c:435 +#: src/split.c:929 src/tac.c:434 #, c-format msgid "memory exhausted" msgstr "memori keletihan" @@ -304,81 +304,81 @@ msgstr "`" msgid "%s: end of file" msgstr "fail istimewa blok" -#: lib/regcomp.c:130 +#: lib/regcomp.c:131 msgid "Success" msgstr "" -#: lib/regcomp.c:133 +#: lib/regcomp.c:134 msgid "No match" msgstr "" -#: lib/regcomp.c:136 +#: lib/regcomp.c:137 #, fuzzy msgid "Invalid regular expression" msgstr "%s: ungkapan biasa (regexp) tidak sah: %s" -#: lib/regcomp.c:139 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "" -#: lib/regcomp.c:142 +#: lib/regcomp.c:143 #, fuzzy msgid "Invalid character class name" msgstr "aksara tidak sah pada %s pada rentetan mod %s" -#: lib/regcomp.c:145 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "" -#: lib/regcomp.c:148 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "" -#: lib/regcomp.c:151 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "" -#: lib/regcomp.c:154 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "" -#: lib/regcomp.c:157 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "" -#: lib/regcomp.c:160 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "" -#: lib/regcomp.c:163 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "" -#: lib/regcomp.c:166 +#: lib/regcomp.c:167 #, fuzzy msgid "Memory exhausted" msgstr "memori keletihan" -#: lib/regcomp.c:169 +#: lib/regcomp.c:170 #, fuzzy msgid "Invalid preceding regular expression" msgstr "%s: ungkapan biasa (regexp) tidak sah: %s" -#: lib/regcomp.c:172 +#: lib/regcomp.c:173 #, fuzzy msgid "Premature end of regular expression" msgstr "ralat pada carian ungkapan biasa (regexp)" -#: lib/regcomp.c:175 +#: lib/regcomp.c:176 #, fuzzy msgid "Regular expression too big" msgstr "ralat pada carian ungkapan biasa (regexp)" -#: lib/regcomp.c:178 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:703 +#: lib/regcomp.c:704 #, fuzzy msgid "No previous regular expression" msgstr "ralat pada carian ungkapan biasa (regexp)" @@ -418,7 +418,7 @@ msgstr "^[yY]" msgid "^[nN]" msgstr "^[tT]" -#: lib/set-mode-acl.c:695 src/copy.c:2284 src/cp.c:518 +#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516 #, c-format msgid "setting permissions for %s" msgstr "menetapkan keizinan pada %s" @@ -564,13 +564,13 @@ msgstr "pembukaan gagal" msgid "Resource lost" msgstr "" -#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262 -#: lib/spawn-pipe.c:265 +#: 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:232 lib/spawn-pipe.c:346 lib/wait-process.c:282 +#: 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" @@ -586,24 +586,24 @@ msgstr "" msgid "Unknown signal %d" msgstr "" -#: lib/unicodeio.c:103 +#: lib/unicodeio.c:102 msgid "iconv function not usable" msgstr "fungsi iconv tak boleh digunakan" -#: lib/unicodeio.c:105 +#: lib/unicodeio.c:104 msgid "iconv function not available" msgstr "fungsi iconv tidak ada" -#: lib/unicodeio.c:112 +#: lib/unicodeio.c:111 msgid "character out of range" msgstr "aksara di luar julat" -#: lib/unicodeio.c:182 +#: lib/unicodeio.c:181 #, c-format msgid "cannot convert U+%04X to local character set" msgstr "tak dapat menukar U+%04X ke set aksara lokal" -#: lib/unicodeio.c:184 +#: lib/unicodeio.c:183 #, c-format msgid "cannot convert U+%04X to local character set: %s" msgstr "tak dapat menukar U+%04X ke set aksara lokal: %s" @@ -764,7 +764,7 @@ msgstr "" "\n" "Lapor pepijat ke <%s>.\n" -#: lib/version-etc.c:251 src/system.h:562 +#: lib/version-etc.c:251 src/system.h:573 #, c-format msgid "%s home page: <%s>\n" msgstr "" @@ -774,7 +774,7 @@ msgstr "" msgid "%s home page: <http://www.gnu.org/software/%s/>\n" msgstr "" -#: lib/version-etc.c:256 src/system.h:563 +#: lib/version-etc.c:256 src/system.h:574 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" @@ -861,14 +861,15 @@ msgid "Simon Josefsson" msgstr "" #: src/base64.c:60 -#, c-format +#, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" "Base64 encode or decode FILE, or standard input, to standard output.\n" -"\n" msgstr "" +"\n" +"Dengan tiada FAIL, atau bila FAIL adalah -, baca input piawai.\n" -#: src/base64.c:64 +#: src/base64.c:67 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -878,7 +879,7 @@ msgid "" "\n" msgstr "" -#: src/base64.c:73 src/cat.c:110 src/fmt.c:293 src/shuf.c:71 src/sum.c:70 +#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -886,7 +887,7 @@ msgstr "" "\n" "Dengan tiada FAIL, atau bila FAIL adalah -, baca input piawai.\n" -#: src/base64.c:76 +#: src/base64.c:79 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -895,37 +896,37 @@ msgid "" "from any other non-alphabet bytes in the encoded stream.\n" msgstr "" -#: src/base64.c:171 src/base64.c:208 src/csplit.c:263 src/csplit.c:1435 -#: src/join.c:451 src/shuf.c:157 src/shuf.c:361 src/tac-pipe.c:74 +#: 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 #, c-format msgid "read error" msgstr "ralat membaca" -#: src/base64.c:227 +#: src/base64.c:230 #, fuzzy, c-format msgid "invalid input" msgstr "pengguna tidak sah" -#: src/base64.c:264 +#: src/base64.c:267 #, fuzzy, c-format msgid "invalid wrap size: %s" msgstr "saiz tab tidak sah: %s" -#: src/base64.c:283 src/basename.c:173 src/comm.c:435 src/cp.c:607 -#: src/date.c:441 src/dircolors.c:447 src/du.c:894 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:169 src/install.c:929 src/join.c:961 -#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:157 src/mv.c:447 -#: src/od.c:1802 src/ptx.c:2081 src/readlink.c:154 src/seq.c:408 -#: src/shuf.c:320 src/shuf.c:339 src/sort.c:4477 src/split.c:1313 -#: src/tr.c:1797 src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:454 -#: src/uniq.c:471 src/unlink.c:81 src/uptime.c:250 src/users.c:146 -#: src/wc.c:666 src/who.c:836 src/whoami.c:79 +#: 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 msgid "extra operand %s" msgstr "gagal mengekalkan masa bagi %s" -#: src/base64.c:315 src/cat.c:781 +#: src/base64.c:318 src/cat.c:781 #, c-format msgid "closing standard input" msgstr "menutup input piawai" @@ -933,15 +934,15 @@ 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/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:53 src/env.c:33 +#: 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/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:65 src/su.c:88 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 +#: 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 "Mike Parker and David MacKenzie" @@ -956,22 +957,22 @@ msgstr "" " atau: %s OPSYEN\n" #: src/basename.c:53 +#, fuzzy msgid "" "Print NAME with any leading directory components removed.\n" "If specified, also remove a trailing SUFFIX.\n" -"\n" msgstr "" "Cetak NAMA dengan komponen direktori awalan telah dibuang.\n" "Jika dinyatakan, juga akan membuang DUFFIKS ekoran.\n" -#: src/basename.c:59 +#: 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" msgstr "" -#: src/basename.c:66 +#: src/basename.c:67 #, c-format msgid "" "\n" @@ -982,20 +983,21 @@ msgid "" " %s -a any/str1 any/str2 -> \"str1\" followed by \"str2\"\n" msgstr "" -#: src/basename.c:167 src/chcon.c:531 src/chgrp.c:277 src/chmod.c:526 -#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1369 +#: 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:183 src/mkfifo.c:108 src/mknod.c:146 src/nohup.c:111 -#: src/pathchk.c:148 src/printf.c:674 src/readlink.c:146 src/realpath.c:236 -#: src/rm.c:314 src/rmdir.c:223 src/seq.c:402 src/setuidgid.c:137 -#: src/sleep.c:119 src/stat.c:1476 src/stdbuf.c:346 src/tr.c:1782 +#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 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 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:52 src/split.c:49 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/split.c:49 msgid "Torbjorn Granlund" msgstr "" @@ -1006,8 +1008,8 @@ msgstr "" msgid "Richard M. Stallman" msgstr "Torbjorn Granlund and Richard M. Stallman" -#: src/cat.c:88 src/df.c:846 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4720 src/nl.c:182 src/paste.c:435 src/pr.c:2768 src/sum.c:58 +#: 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/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" @@ -1051,7 +1053,7 @@ msgstr "" msgid "cannot do ioctl on %s" msgstr "tak dapat ioctl pada `%s'" -#: src/cat.c:637 src/dd.c:2209 src/sort.c:379 src/tee.c:165 src/yes.c:86 +#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86 #, c-format msgid "standard output" msgstr "output standard" @@ -1068,14 +1070,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:55 src/head.c:46 src/hostid.c:33 +#: 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 msgid "Jim Meyering" msgstr "" -#: src/chcon.c:100 src/runcon.c:203 src/runcon.c:234 +#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238 #, fuzzy, c-format msgid "failed to create security context: %s" msgstr "gagal mendapatkan atribut bagi %s" @@ -1085,8 +1087,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:540 src/copy.c:2222 src/runcon.c:217 -#: src/stat.c:683 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221 +#: src/stat.c:702 #, fuzzy, c-format msgid "failed to get security context of %s" msgstr "gagal mendapatkan atribut bagi %s" @@ -1102,12 +1104,12 @@ 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:446 src/ls.c:2981 +#: src/du.c:457 src/ls.c:2981 #, 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:426 +#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437 #, c-format msgid "cannot read directory %s" msgstr "tak dapat membaca direktori %s" @@ -1117,13 +1119,13 @@ 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:599 +#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562 #, 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:618 -#: src/remove.c:613 +#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642 +#: src/remove.c:576 #, fuzzy, c-format msgid "fts_close failed" msgstr "fail istimewa blok" @@ -1144,10 +1146,9 @@ msgid "" "Change the security context of each FILE to CONTEXT.\n" "With --reference, change the security context of each FILE to that of " "RFILE.\n" -"\n" msgstr "" -#: src/chcon.c:362 src/chgrp.c:123 src/chown.c:94 +#: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94 msgid "" " --dereference affect the referent of each symbolic link (this is\n" " the default), rather than the symbolic link itself\n" @@ -1155,7 +1156,7 @@ msgid "" "file\n" msgstr "" -#: src/chcon.c:367 +#: src/chcon.c:369 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" @@ -1163,7 +1164,13 @@ msgid "" " -l, --range=RANGE set range RANGE in the target security context\n" msgstr "" -#: src/chcon.c:373 +#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 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 " @@ -1176,15 +1183,15 @@ msgstr "" " -R, --recursive beroperasi pada fail dan direktori secara rekursif\n" " -v, --verbose output diagnostik bagi setiap fail yg diproses\n" -#: src/chcon.c:377 src/chgrp.c:140 src/chown.c:118 +#: 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:380 +#: src/chcon.c:386 msgid " -v, --verbose output a diagnostic for every file processed\n" msgstr "" -#: src/chcon.c:383 src/chgrp.c:143 src/chown.c:121 +#: src/chcon.c:389 src/chgrp.c:143 src/chown.c:121 msgid "" "\n" "The following options modify how a hierarchy is traversed when the -R\n" @@ -1199,36 +1206,36 @@ msgid "" "\n" msgstr "" -#: src/chcon.c:512 src/chgrp.c:264 src/chown.c:267 +#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267 #, c-format msgid "-R --dereference requires either -H or -L" msgstr "" -#: src/chcon.c:518 +#: src/chcon.c:524 #, c-format msgid "-R -h requires -P" msgstr "" -#: src/chcon.c:533 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282 -#: src/comm.c:429 src/csplit.c:1371 src/join.c:1149 src/link.c:79 -#: src/mknod.c:148 src/setuidgid.c:139 src/tr.c:1785 +#: 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 msgid "missing operand after %s" msgstr "kehilangan hujah fail" -#: src/chcon.c:556 src/runcon.c:247 +#: src/chcon.c:562 src/runcon.c:251 #, fuzzy, c-format msgid "invalid context: %s" msgstr "penukaran tidak sah: %s" -#: src/chcon.c:563 +#: src/chcon.c:569 #, c-format msgid "conflicting security context specifiers given" msgstr "" -#: src/chcon.c:572 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:433 src/cp.c:493 -#: src/mv.c:96 src/pwd.c:273 src/rm.c:324 src/touch.c:351 +#: 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 #, c-format msgid "failed to get attributes of %s" msgstr "gagal mendapatkan atribut bagi %s" @@ -1272,12 +1279,6 @@ msgstr "" " (hanya boleh pada sistem yang boleh menukar\n" " pemilikan bagi pautan simbolik)\n" -#: src/chgrp.c:132 src/chmod.c:387 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/chgrp.c:136 msgid "" " --reference=RFILE use RFILE's group rather than specifying a\n" @@ -1352,8 +1353,14 @@ msgid "" msgstr "" #: src/chmod.c:391 +#, fuzzy 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 msgid " -R, --recursive change files and directories recursively\n" @@ -1502,7 +1509,7 @@ msgstr "" msgid "Roland McGrath" msgstr "" -#: src/chroot.c:97 src/install.c:575 src/setuidgid.c:110 src/setuidgid.c:120 +#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120 #, c-format msgid "invalid group %s" msgstr "kumpulan tidak sah %s" @@ -1566,8 +1573,8 @@ msgstr "tak dapat menukar ke kumpulan null" msgid "failed to set user-ID" msgstr "gagal mengekalkan masa bagi %s" -#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:213 src/stdbuf.c:366 -#: src/timeout.c:402 +#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365 +#: src/timeout.c:454 #, fuzzy, c-format msgid "failed to run command %s" msgstr "takboleh nyahpaut %s" @@ -1664,19 +1671,23 @@ msgstr "%s: banyak isyarat dinyatakan" msgid "empty %s not allowed" msgstr "" -#: src/copy.c:168 src/dd.c:1609 src/dd.c:1976 -#, c-format -msgid "reading %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 +#, 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:426 +#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425 #, c-format msgid "cannot lseek %s" msgstr "tak dapat lseek %s" -#: src/copy.c:206 src/dd.c:2039 src/dd.c:2102 -#, c-format -msgid "writing %s" +#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151 +#, fuzzy, c-format +msgid "error writing %s" msgstr "menulis %s" #: src/copy.c:313 @@ -1699,7 +1710,7 @@ msgstr "gagal mengekalkan masa bagi %s" msgid "clearing permissions for %s" msgstr "menetapkan keizinan pada %s" -#: src/copy.c:697 src/copy.c:2470 src/cp.c:331 +#: src/copy.c:697 src/copy.c:2480 src/cp.c:329 #, c-format msgid "failed to preserve ownership for %s" msgstr "gagal mengekalkan hakmilik bagi %s" @@ -1714,14 +1725,14 @@ msgstr "gagal mencari fail %s" msgid "failed to preserve authorship for %s" msgstr "gagal mengekalkan hakmilik bagi %s" -#: src/copy.c:804 src/csplit.c:638 src/du.c:901 src/fmt.c:449 src/head.c:847 -#: src/sort.c:4489 src/split.c:1329 src/tail.c:1756 src/wc.c:678 +#: 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 "tak dapat buka %s untuk dibaca" -#: src/copy.c:810 src/copy.c:972 src/dd.c:1546 src/dd.c:2114 src/dd.c:2252 -#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:141 +#: 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 #, c-format msgid "cannot fstat %s" msgstr "tak dapat fstat %s" @@ -1741,14 +1752,14 @@ msgstr "" 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:1574 src/copy.c:1777 src/copy.c:1935 src/ln.c:314 -#: src/remove.c:267 src/remove.c:293 src/remove.c:444 src/remove.c:465 +#: 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 #, c-format msgid "cannot remove %s" msgstr "tak dapat membuang %s" -#: src/copy.c:886 src/copy.c:1578 src/copy.c:1772 src/copy.c:1940 -#: src/remove.c:418 +#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945 +#: src/remove.c:375 #, c-format msgid "removed %s\n" msgstr "%s dibuang \n" @@ -1768,186 +1779,186 @@ msgstr "tak dapat memcipta fail biasa %s" msgid "failed to clone %s from %s" msgstr "gagal mengekalkan masa bagi %s" -#: src/copy.c:1098 src/copy.c:2531 +#: src/copy.c:1098 src/copy.c:2541 #, c-format msgid "preserving times for %s" msgstr "mengekalkan masa pada %s" -#: src/copy.c:1170 src/copy.c:1176 src/head.c:855 src/touch.c:175 -#: src/truncate.c:413 -#, c-format -msgid "closing %s" -msgstr "menutup %s" +#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 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:1466 +#: src/copy.c:1471 #, fuzzy, c-format msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? " msgstr "%s: menindih %s, menindih mod %04lo? " -#: src/copy.c:1473 +#: src/copy.c:1478 #, c-format msgid "%s: overwrite %s? " msgstr "%s: tindih %s? " -#: src/copy.c:1542 +#: src/copy.c:1547 #, c-format msgid " (backup: %s)" msgstr " (backup: %s)" -#: src/copy.c:1552 +#: src/copy.c:1557 #, c-format msgid "failed to restore the default file creation context" msgstr "" -#: src/copy.c:1584 +#: src/copy.c:1589 #, c-format msgid "cannot create hard link %s to %s" msgstr "tak dapat mencipta pautan keras %s ke %s" -#: src/copy.c:1637 src/copy.c:1689 src/copy.c:2272 src/copy.c:2589 +#: 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:1220 src/truncate.c:365 +#: src/stat.c:1239 src/truncate.c:363 #, c-format msgid "cannot stat %s" msgstr "tak dapat stat %s" -#: src/copy.c:1645 +#: src/copy.c:1650 #, c-format msgid "omitting directory %s" msgstr "" -#: src/copy.c:1659 +#: src/copy.c:1664 #, c-format msgid "warning: source file %s specified more than once" msgstr "Amaran: fail sumber %s dinyatakan lebih drpd sekali" -#: src/copy.c:1707 src/ln.c:246 +#: src/copy.c:1712 src/ln.c:246 #, c-format msgid "%s and %s are the same file" msgstr "%s dan %s adalah fail yang sama" -#: src/copy.c:1806 +#: src/copy.c:1811 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "tak boleh menindih bukan-direktori %s dengan direktori %s" -#: src/copy.c:1824 src/ln.c:214 +#: src/copy.c:1829 src/ln.c:214 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "tak akan menindih baru-dicipta %s dengan %s" -#: src/copy.c:1842 +#: src/copy.c:1847 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "tak boleh menindih direktori %s dengan direktori" -#: src/copy.c:1856 +#: src/copy.c:1861 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "tak dapat pindah direktori ke bukan-direktori: %s -> %s" -#: src/copy.c:1886 +#: src/copy.c:1891 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "backup %s akan memusnahkan sumber; %s tidak dipindahkan" -#: src/copy.c:1887 +#: src/copy.c:1892 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "backup %s akan memusnahkan sumber; %s tidak disalin" -#: src/copy.c:1910 src/ln.c:276 +#: src/copy.c:1915 src/ln.c:276 #, c-format msgid "cannot backup %s" msgstr "tak dapat backup %s" -#: src/copy.c:1974 +#: src/copy.c:1979 #, 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:2051 +#: src/copy.c:2056 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "tak dapat salin direktori, %s ke dirinya, %s" -#: src/copy.c:2068 +#: src/copy.c:2073 #, 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:2118 +#: src/copy.c:2123 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "tak dapat pindahkan %s ke subdirektori dirinya, %s" -#: src/copy.c:2161 +#: src/copy.c:2166 #, c-format msgid "cannot move %s to %s" msgstr "tak dapat pindahkan %s ke %s" -#: src/copy.c:2173 +#: src/copy.c:2178 #, 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:2207 src/install.c:905 src/mkdir.c:189 src/mkfifo.c:114 -#: src/mknod.c:167 +#: 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:2241 +#: src/copy.c:2246 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "tak boleh salin pautan simbolik cyclic %s" -#: src/copy.c:2350 +#: src/copy.c:2355 #, 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:2357 +#: src/copy.c:2362 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "tak dapat mencipta pautan simbolik %s ke %s" -#: src/copy.c:2406 src/mkfifo.c:133 +#: src/copy.c:2416 src/mkfifo.c:132 #, c-format msgid "cannot create fifo %s" msgstr "tak boleh mencipta fifo %s" -#: src/copy.c:2415 +#: src/copy.c:2425 #, c-format msgid "cannot create special file %s" msgstr "tak boleh mencipta fail istimewa %s" -#: src/copy.c:2426 src/ls.c:3191 src/stat.c:902 +#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921 #, c-format msgid "cannot read symbolic link %s" msgstr "tak dapat membaca pautan simbolik %s" -#: src/copy.c:2453 +#: src/copy.c:2463 #, c-format msgid "cannot create symbolic link %s" msgstr "tak dapat mencipta pautan simbolik %s" -#: src/copy.c:2485 +#: src/copy.c:2495 #, c-format msgid "%s has unknown file type" msgstr "%s mempunyai jenis fail yang tidak diketahui" -#: src/copy.c:2629 src/ln.c:358 +#: src/copy.c:2644 src/ln.c:358 #, c-format msgid "cannot un-backup %s" msgstr "tak dapat nyahbackup %s" -#: src/copy.c:2633 +#: src/copy.c:2648 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (nyahbackup)\n" -#: src/cp.c:156 src/mv.c:284 +#: src/cp.c:156 src/mv.c:286 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -1959,27 +1970,13 @@ msgstr "" " atau: %s [OPSYEN]... --target-directory=DIREKTORI SUMBER...\n" #: src/cp.c:162 -msgid "" -"Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" -"\n" +#, 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:166 src/csplit.c:1458 src/cut.c:197 src/df.c:852 src/du.c:268 -#: src/expand.c:112 src/fmt.c:275 src/fold.c:75 src/head.c:115 -#: src/install.c:612 src/kill.c:86 src/ln.c:392 src/ls.c:4726 src/mkdir.c:61 -#: src/mkfifo.c:56 src/mknod.c:58 src/mv.c:294 src/nl.c:191 src/paste.c:445 -#: src/pr.c:2777 src/ptx.c:1825 src/shred.c:153 src/shuf.c:58 src/sort.c:399 -#: src/split.c:211 src/stdbuf.c:95 src/tac.c:142 src/tail.c:268 -#: src/touch.c:226 src/truncate.c:107 src/unexpand.c:122 src/uniq.c:145 -msgid "" -"Mandatory arguments to long options are mandatory for short options too.\n" -msgstr "" -"Hujah mandatori kepada opsyen panjang andalah mandatori bagi opsyen pendek " -"juga.\n" - -#: src/cp.c:169 +#: src/cp.c:168 #, fuzzy msgid "" " -a, --archive same as -dR --preserve=all\n" @@ -2001,32 +1998,33 @@ msgstr "" " -d sama seperti --no-dereference --" "preserve=link\n" -#: src/cp.c:178 +#: src/cp.c:177 msgid "" " -f, --force if an existing destination file cannot be\n" -" opened, remove it and try again (redundant " -"if\n" -" the -n option is used)\n" +" opened, remove it and try again (this " +"option\n" +" is ignored when the -n option is also " +"used)\n" " -i, --interactive prompt before overwrite (overrides a previous " "-n\n" " option)\n" " -H follow command-line symbolic links in SOURCE\n" msgstr "" -#: src/cp.c:188 +#: src/cp.c:186 msgid "" " -l, --link hard link files instead of copying\n" " -L, --dereference always follow symbolic links in SOURCE\n" msgstr "" -#: src/cp.c:192 +#: src/cp.c:190 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:197 +#: src/cp.c:195 msgid "" " -p same as --preserve=mode,ownership,timestamps\n" " --preserve[=ATTR_LIST] preserve the specified attributes (default:\n" @@ -2036,13 +2034,13 @@ msgid "" " all\n" msgstr "" -#: src/cp.c:205 +#: src/cp.c:203 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:209 +#: src/cp.c:207 msgid "" " -R, -r, --recursive copy directories recursively\n" " --reflink[=WHEN] control clone/CoW copies. See below\n" @@ -2051,7 +2049,7 @@ msgid "" "force)\n" msgstr "" -#: src/cp.c:215 +#: src/cp.c:213 msgid "" " --sparse=WHEN control creation of sparse files. See below\n" " --strip-trailing-slashes remove any trailing slashes from each " @@ -2059,7 +2057,7 @@ msgid "" " argument\n" msgstr "" -#: src/cp.c:220 +#: src/cp.c:218 msgid "" " -s, --symbolic-link make symbolic links instead of copying\n" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -2068,7 +2066,7 @@ msgid "" " -T, --no-target-directory treat DEST as a normal file\n" msgstr "" -#: src/cp.c:226 +#: src/cp.c:224 msgid "" " -u, --update copy only when the SOURCE file is newer\n" " than the destination file or when the\n" @@ -2077,7 +2075,7 @@ msgid "" " -x, --one-file-system stay on this file system\n" msgstr "" -#: src/cp.c:235 +#: src/cp.c:233 msgid "" "\n" "By default, sparse SOURCE files are detected by a crude heuristic and the\n" @@ -2093,7 +2091,7 @@ msgid "" "fails, or if --reflink=auto is specified, fall back to a standard copy.\n" msgstr "" -#: src/cp.c:247 src/install.c:649 src/ln.c:421 src/mv.c:321 +#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322 msgid "" "\n" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -2103,7 +2101,7 @@ msgid "" "\n" msgstr "" -#: src/cp.c:254 src/install.c:656 src/mv.c:328 +#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329 msgid "" " none, off never make backups (even if --backup is given)\n" " numbered, t make numbered backups\n" @@ -2111,7 +2109,7 @@ msgid "" " simple, never always make simple backups\n" msgstr "" -#: src/cp.c:260 +#: src/cp.c:258 msgid "" "\n" "As a special case, cp makes a backup of SOURCE when the force and backup\n" @@ -2119,90 +2117,90 @@ msgid "" "regular file.\n" msgstr "" -#: src/cp.c:319 +#: src/cp.c:317 #, c-format msgid "failed to preserve times for %s" msgstr "gagal mengekalkan masa bagi %s" -#: src/cp.c:350 +#: src/cp.c:348 #, c-format msgid "failed to preserve permissions for %s" msgstr "gagal mengekalkan keizinan bagi %s" -#: src/cp.c:477 +#: src/cp.c:475 #, c-format msgid "cannot make directory %s" msgstr "tak dapat cipta direktori %s" -#: src/cp.c:526 src/cp.c:545 +#: src/cp.c:524 src/cp.c:543 #, c-format msgid "%s exists but is not a directory" msgstr "%s wujud tapi ianya bukan direktori" -#: src/cp.c:572 src/cp.c:1068 src/install.c:401 src/install.c:844 src/ln.c:123 -#: src/ln.c:181 src/ln.c:202 src/ln.c:516 src/mv.c:152 src/mv.c:399 -#, c-format -msgid "accessing %s" -msgstr "mengakses %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 +#, fuzzy, c-format +msgid "failed to access %s" +msgstr "gagal mengekalkan masa bagi %s" -#: src/cp.c:592 src/install.c:914 src/ln.c:546 src/mv.c:432 src/shred.c:1182 -#: src/touch.c:433 src/truncate.c:356 +#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181 +#: src/touch.c:429 src/truncate.c:354 #, fuzzy, c-format msgid "missing file operand" msgstr "kehilangan hujah fail" -#: src/cp.c:594 src/install.c:916 src/ln.c:560 src/mv.c:434 +#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436 #, fuzzy, c-format msgid "missing destination file operand after %s" msgstr "kehilangan fail destinasi" -#: src/cp.c:603 src/install.c:925 src/mv.c:443 +#: src/cp.c:601 src/install.c:926 src/mv.c:445 #, 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:619 src/cp.c:1070 src/install.c:403 src/install.c:846 -#: src/install.c:938 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:401 -#: src/mv.c:457 +#: 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 msgid "target %s is not a directory" msgstr "Sasaran yang dinyatakan, %s adalah bukan direktori" -#: src/cp.c:730 +#: src/cp.c:728 #, fuzzy, c-format msgid "with --parents, the destination must be a directory" msgstr "bila mengekalkan path, destinasi mestilah direktori" -#: src/cp.c:1063 src/install.c:839 src/ln.c:511 src/mv.c:394 +#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395 #, fuzzy, c-format msgid "multiple target directories specified" msgstr "banyak opsyen -l or -t dinyatakan" -#: src/cp.c:1108 +#: src/cp.c:1110 #, c-format msgid "cannot make both hard and symbolic links" msgstr "tak dapat buat kecua-dua pautan simbolik dan keras" -#: src/cp.c:1115 src/mv.c:464 +#: src/cp.c:1117 src/mv.c:466 #, fuzzy, c-format msgid "options --backup and --no-clobber are mutually exclusive" msgstr "opseyn untuk menyatakan tarikh untuk dicetak adalah eksklusif" -#: src/cp.c:1121 +#: src/cp.c:1123 #, c-format msgid "--reflink can be used only with --sparse=auto" msgstr "" -#: src/cp.c:1129 src/install.c:899 src/ln.c:582 src/mv.c:472 +#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474 msgid "backup type" msgstr "jenis backup" -#: src/cp.c:1154 +#: src/cp.c:1156 #, c-format msgid "cannot preserve security context without an SELinux-enabled kernel" msgstr "" -#: src/cp.c:1160 +#: src/cp.c:1162 #, c-format msgid "cannot preserve extended attributes, cp is built without xattr support" msgstr "" @@ -2212,134 +2210,133 @@ msgstr "" msgid "Stuart Kemp" msgstr "" -#: src/csplit.c:529 +#: src/csplit.c:531 #, c-format msgid "input disappeared" msgstr "input menghilang" -#: src/csplit.c:658 src/csplit.c:669 +#: src/csplit.c:660 src/csplit.c:671 #, c-format msgid "%s: line number out of range" msgstr "%s: bilangan baris di luar julat" -#: src/csplit.c:698 +#: src/csplit.c:700 #, fuzzy, c-format msgid "%s: %s: line number out of range" msgstr "%s: `%s': bilangan baris di luar julat" -#: src/csplit.c:701 src/csplit.c:750 +#: src/csplit.c:703 src/csplit.c:752 #, fuzzy, c-format msgid " on repetition %s\n" msgstr " pada ulangan %d\n" -#: src/csplit.c:744 +#: src/csplit.c:746 #, fuzzy, c-format msgid "%s: %s: match not found" msgstr "%s: `%s': padanan tak dijumpai" -#: src/csplit.c:808 src/csplit.c:848 src/nl.c:359 src/tac.c:274 +#: src/csplit.c:810 src/csplit.c:850 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:981 +#: src/csplit.c:983 #, fuzzy, c-format msgid "write error for %s" msgstr "ralat menulis bagi `%s'" -#: src/csplit.c:1057 +#: src/csplit.c:1059 #, fuzzy, c-format msgid "%s: integer expected after delimiter" msgstr "%s: integer dijangka selepas `%c'" -#: src/csplit.c:1073 +#: src/csplit.c:1075 #, fuzzy, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: `}' diperluka untuk kiraan ulangan" -#: src/csplit.c:1083 +#: src/csplit.c:1085 #, fuzzy, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: integer diperlukan diantara `{' dan `}'" -#: src/csplit.c:1110 +#: src/csplit.c:1112 #, fuzzy, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: pemisah penutup `%c' hilang" -#: src/csplit.c:1127 +#: src/csplit.c:1129 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: ungkapan biasa (regexp) tidak sah: %s" -#: src/csplit.c:1160 +#: src/csplit.c:1162 #, c-format msgid "%s: invalid pattern" msgstr "%s: corak tidak sah" -#: src/csplit.c:1163 +#: src/csplit.c:1165 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: bilangan baris mesti lebih besar drpd sifar" -#: src/csplit.c:1169 +#: src/csplit.c:1171 #, c-format msgid "line number %s is smaller than preceding line number, %s" msgstr "" -#: src/csplit.c:1175 +#: src/csplit.c:1177 #, c-format msgid "warning: line number %s is the same as preceding line number" msgstr "" -#: src/csplit.c:1253 +#: src/csplit.c:1255 #, c-format msgid "missing conversion specifier in suffix" msgstr "" -#: src/csplit.c:1259 +#: src/csplit.c:1261 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "Pengspesifikasi penukaran tidak sah pada suffiks: %c" -#: src/csplit.c:1262 +#: src/csplit.c:1264 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "pengspesifikasi penukaran tidak sah pada suffiks: \\%.3o" -#: src/csplit.c:1267 +#: src/csplit.c:1269 #, fuzzy, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "Pengspesifikasi penukaran tidak sah pada suffiks: %c" -#: src/csplit.c:1284 +#: src/csplit.c:1286 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "terlalu banyak spesifikasi penukaran %% pada suffiks" -#: src/csplit.c:1298 +#: src/csplit.c:1300 #, c-format msgid "missing %% conversion specification in suffix" msgstr "kehilangan spesifikasi penukaran %% pada suffiks" -#: src/csplit.c:1345 +#: src/csplit.c:1347 #, c-format msgid "%s: invalid number" msgstr "%s: nombor tidak sah" -#: src/csplit.c:1449 +#: src/csplit.c:1451 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Penggunaan: %s [OPSYEN]... FAIL CORAK...\n" -#: src/csplit.c:1453 +#: src/csplit.c:1455 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" -"\n" msgstr "" -#: src/csplit.c:1461 +#: src/csplit.c:1462 #, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2347,20 +2344,20 @@ msgid "" " -k, --keep-files do not remove output files on errors\n" msgstr "" -#: src/csplit.c:1466 +#: src/csplit.c:1467 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:1473 +#: src/csplit.c:1474 msgid "" "\n" "Read standard input if FILE is -. Each PATTERN may be:\n" msgstr "" -#: src/csplit.c:1477 +#: src/csplit.c:1478 msgid "" "\n" " INTEGER copy up to but not including specified line number\n" @@ -2377,7 +2374,7 @@ msgstr "" msgid "David M. Ihnat" msgstr "" -#: src/cut.c:64 +#: src/cut.c:64 src/cut.c:372 msgid "fields and positions are numbered from 1" msgstr "" @@ -2387,21 +2384,20 @@ msgid "Usage: %s OPTION... [FILE]...\n" msgstr "Penggunaan: %s [OPSYEN]...[FAIL]...\n" #: src/cut.c:193 -msgid "" -"Print selected parts of lines from each FILE to standard output.\n" -"\n" +#, 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:200 +#: src/cut.c:199 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:205 +#: src/cut.c:204 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2409,20 +2405,20 @@ msgid "" " -n (ignored)\n" msgstr "" -#: src/cut.c:211 +#: src/cut.c:210 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" msgstr "" -#: src/cut.c:215 +#: src/cut.c:214 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:222 +#: src/cut.c:221 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2430,7 +2426,7 @@ msgid "" "in the same order that it is read, and is written exactly once.\n" msgstr "" -#: src/cut.c:228 +#: src/cut.c:227 msgid "" "Each range is one of:\n" "\n" @@ -2442,57 +2438,59 @@ msgid "" "With no FILE, or when FILE is -, read standard input.\n" msgstr "" -#: src/cut.c:368 src/cut.c:489 -msgid "invalid byte or field list" +#: src/cut.c:367 src/cut.c:493 +#, fuzzy +msgid "invalid byte, character or field list" msgstr "byte atau senarai medan tidak sah" -#: src/cut.c:385 +#: src/cut.c:387 #, fuzzy msgid "invalid range with no endpoint: -" msgstr "opsyen lebar tidak sah: `%s'" -#: src/cut.c:399 +#: src/cut.c:403 #, fuzzy msgid "invalid decreasing range" msgstr "rentetan mod tidak sah: %s" -#: src/cut.c:478 +#: src/cut.c:482 #, fuzzy, c-format msgid "byte offset %s is too large" msgstr "%s adalah terlalu besar" -#: src/cut.c:481 +#: src/cut.c:485 #, fuzzy, c-format msgid "field number %s is too large" msgstr "nombor tidak sah %s" -#: src/cut.c:789 src/cut.c:797 +#: src/cut.c:795 src/cut.c:803 msgid "only one type of list may be specified" msgstr "hanya satu jenis senarai boleh dinyatakan" -#: src/cut.c:806 +#: src/cut.c:812 src/numfmt.c:1408 +#, c-format msgid "the delimiter must be a single character" msgstr "pemisah mestilah aksara tunggal" -#: src/cut.c:841 +#: src/cut.c:847 msgid "you must specify a list of bytes, characters, or fields" msgstr "anda mesti nyatakan senarai byte, aksara, atau medan" -#: src/cut.c:844 +#: src/cut.c:850 msgid "an input delimiter may be specified only when operating on fields" msgstr "" -#: src/cut.c:848 +#: src/cut.c:854 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" msgstr "" -#: src/cut.c:864 +#: src/cut.c:870 msgid "missing list of fields" msgstr "kehilangan senarai medan" -#: src/cut.c:866 +#: src/cut.c:872 msgid "missing list of positions" msgstr "kehilangan senarai posisi" @@ -2506,10 +2504,12 @@ msgstr "" " atau: %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 "" + +#: src/date.c:134 #, 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" " -I[TIMESPEC], --iso-8601[=TIMESPEC] output date/time in ISO 8601 format.\n" @@ -2531,7 +2531,7 @@ msgstr "" " --iso-8601 tanpa TIMESPEC default kepada " "`date'.\n" -#: src/date.c:138 +#: src/date.c:142 #, fuzzy msgid "" " -r, --reference=FILE display the last modification time of FILE\n" @@ -2543,7 +2543,7 @@ msgstr "" " -s, --set=RENTETAN tetapkan masa dihuraikan oleh RENTETAN\n" " -u, --utc, --universal cetak atau tetapkan Coordinated Universal Time\n" -#: src/date.c:143 +#: src/date.c:147 msgid "" " --rfc-3339=TIMESPEC output date and time in RFC 3339 format.\n" " TIMESPEC='date', 'seconds', or 'ns' for\n" @@ -2554,7 +2554,7 @@ msgid "" " -u, --utc, --universal print or set Coordinated Universal Time\n" msgstr "" -#: src/date.c:154 +#: src/date.c:158 msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" @@ -2563,7 +2563,7 @@ msgid "" " %a locale's abbreviated weekday name (e.g., Sun)\n" msgstr "" -#: src/date.c:161 +#: src/date.c:165 #, fuzzy msgid "" " %A locale's full weekday name (e.g., Sunday)\n" @@ -2576,7 +2576,7 @@ msgstr "" " %B nama penuh bulan lokaliti, panjang berubah (Januari..Disember)\n" " %c tarikh dan masa lokaliti (Jum Dis 19 10:02:33 MYT 1975)\n" -#: src/date.c:167 +#: src/date.c:171 #, fuzzy msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" @@ -2589,14 +2589,14 @@ msgstr "" " %D tarikh (bb/hh/tt)\n" " %e hari drpd bulan, ruang kosong ditambah ( 1..31)\n" -#: src/date.c:173 +#: src/date.c:177 msgid "" " %F full date; same as %Y-%m-%d\n" " %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 "" -#: src/date.c:178 +#: src/date.c:182 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2608,7 +2608,7 @@ msgstr "" " %I jam (01..12)\n" " %j hari dalam tahun (001..366)\n" -#: src/date.c:184 +#: src/date.c:188 #, fuzzy msgid "" " %k hour, space padded ( 0..23); same as %_H\n" @@ -2621,7 +2621,7 @@ msgstr "" " %m bulan (01..12)\n" " %M minit (00..59)\n" -#: src/date.c:190 +#: src/date.c:194 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2632,7 +2632,7 @@ msgid "" " %s seconds since 1970-01-01 00:00:00 UTC\n" msgstr "" -#: src/date.c:199 +#: src/date.c:203 #, fuzzy msgid "" " %S second (00..60)\n" @@ -2645,7 +2645,7 @@ msgstr "" " %T masa, 24-jam (jj:mm:ss)\n" " %u hari dalam minggu (1..7); 1 mewakili Isnin\n" -#: src/date.c:205 +#: src/date.c:209 #, fuzzy msgid "" " %U week number of year, with Sunday as first day of week (00..53)\n" @@ -2661,7 +2661,7 @@ msgstr "" " %W nombor minggu drpd tahun dengan Isnin sebagai hari pertama dlm minggu " "(00..53)\n" -#: src/date.c:211 +#: src/date.c:215 #, fuzzy msgid "" " %x locale's date representation (e.g., 12/31/99)\n" @@ -2674,7 +2674,7 @@ msgstr "" " %y dua digit akhir bagi tahun (00..99)\n" " %Y tahun (1975...)\n" -#: src/date.c:217 +#: src/date.c:221 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -2686,7 +2686,7 @@ msgid "" "By default, date pads numeric fields with zeroes.\n" msgstr "" -#: src/date.c:226 +#: src/date.c:230 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -2697,7 +2697,7 @@ msgid "" " # use opposite case if possible\n" msgstr "" -#: src/date.c:235 +#: src/date.c:239 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -2706,7 +2706,7 @@ msgid "" "O to use the locale's alternate numeric symbols if available.\n" msgstr "" -#: src/date.c:242 +#: src/date.c:246 msgid "" "\n" "Examples:\n" @@ -2720,35 +2720,35 @@ msgid "" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:275 src/dd.c:2193 src/head.c:838 src/md5sum.c:477 -#: src/md5sum.c:798 src/od.c:863 src/od.c:1914 src/pr.c:1176 src/pr.c:1372 -#: src/pr.c:1494 src/stty.c:842 src/tac.c:563 src/tail.c:343 src/tee.c:126 +#: 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 #, c-format msgid "standard input" msgstr "input piawai" -#: src/date.c:303 src/date.c:523 +#: src/date.c:307 src/date.c:527 #, fuzzy, c-format msgid "invalid date %s" msgstr "tarikh tak sah `%s'" -#: src/date.c:414 src/date.c:448 +#: src/date.c:418 src/date.c:452 #, fuzzy, c-format msgid "multiple output formats specified" msgstr "banyak opsyen -l or -t dinyatakan" -#: src/date.c:426 +#: src/date.c:430 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "opseyn untuk menyatakan tarikh untuk dicetak adalah eksklusif" -#: src/date.c:433 +#: src/date.c:437 #, c-format msgid "the options to print and set the time may not be used together" msgstr "opsyen untuk mencetak dan menetapkan masa tak boleh digunakan bersama" -#: src/date.c:454 +#: src/date.c:458 #, fuzzy, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -2759,23 +2759,23 @@ msgstr "" "Bila menggunakan satu opsyen untuk menyatakan tarikh, sebarang\n" "hujah bukan-opsyen mesti dalam rentetan format bermula dengan`+'." -#: src/date.c:531 +#: src/date.c:535 #, c-format msgid "cannot set date" msgstr "tak dapat menetapkan tarikh" -#: src/date.c:554 src/du.c:360 +#: src/date.c:558 src/du.c:371 #, fuzzy, c-format msgid "time %s is out of range" msgstr "aksara di luar julat" #. This is a proper name. See the gettext manual, section Names. -#: src/dd.c:44 src/factor.c:43 src/rm.c:41 src/tail.c:69 src/touch.c:41 +#: 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 "" -#: src/dd.c:517 +#: src/dd.c:521 #, fuzzy, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -2784,7 +2784,7 @@ msgstr "" "Pengunaan: %s [NOMBOR]...\n" " atau: %s OPSYEN\n" -#: src/dd.c:522 +#: src/dd.c:526 #, fuzzy msgid "" "Copy a file, converting and formatting according to the operands.\n" @@ -2803,7 +2803,7 @@ msgstr "" " count=BLOK salin hanya BLOK blok input\n" " ibs=BAIT baca BAIT bait dlm satu masa\n" -#: src/dd.c:531 +#: src/dd.c:535 msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -2812,21 +2812,27 @@ msgid "" " oflag=FLAGS write as per the comma separated symbol list\n" " seek=N skip N obs-sized blocks at start of output\n" " skip=N skip N ibs-sized blocks at start of input\n" -" status=noxfer suppress transfer statistics\n" +" status=WHICH WHICH info to suppress outputting to stderr;\n" +" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" msgstr "" -#: src/dd.c:541 +#: src/dd.c:546 +#, fuzzy msgid "" "\n" -"BLOCKS and BYTES may be followed by the following multiplicative suffixes:\n" +"N and BYTES may be followed by the following multiplicative suffixes:\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, and so on for T, P, E, Z, Y.\n" "\n" "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:550 +#: src/dd.c:555 msgid "" " ascii from EBCDIC to ASCII\n" " ebcdic from ASCII to EBCDIC\n" @@ -2841,7 +2847,7 @@ msgid "" " with block or unblock, pad with spaces rather than NULs\n" msgstr "" -#: src/dd.c:563 +#: src/dd.c:568 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -2851,7 +2857,7 @@ msgid "" " fsync likewise, but also write metadata\n" msgstr "" -#: src/dd.c:571 +#: src/dd.c:576 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -2860,76 +2866,76 @@ msgid "" "suggested)\n" msgstr "" -#: src/dd.c:578 +#: src/dd.c:583 msgid " cio use concurrent I/O for data\n" msgstr "" -#: src/dd.c:580 +#: src/dd.c:585 msgid " direct use direct I/O for data\n" msgstr "" -#: src/dd.c:582 +#: src/dd.c:587 #, fuzzy msgid " directory fail unless a directory\n" msgstr "%s: Direktori sasaran yang dinyatakan adalah bukan direktori" -#: src/dd.c:584 +#: src/dd.c:589 msgid " dsync use synchronized I/O for data\n" msgstr "" -#: src/dd.c:586 +#: src/dd.c:591 msgid " sync likewise, but also for metadata\n" msgstr "" -#: src/dd.c:587 +#: src/dd.c:592 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr "" -#: src/dd.c:590 +#: src/dd.c:595 msgid " nonblock use non-blocking I/O\n" msgstr "" -#: src/dd.c:592 +#: src/dd.c:597 msgid " noatime do not update access time\n" msgstr "" -#: src/dd.c:595 +#: src/dd.c:600 msgid " nocache discard cached data\n" msgstr "" -#: src/dd.c:598 +#: src/dd.c:603 msgid " noctty do not assign controlling terminal from file\n" msgstr "" -#: src/dd.c:601 +#: src/dd.c:606 msgid " nofollow do not follow symlinks\n" msgstr "" -#: src/dd.c:603 +#: src/dd.c:608 msgid " nolinks fail if multiply-linked\n" msgstr "" -#: src/dd.c:605 +#: src/dd.c:610 msgid " binary use binary I/O for data\n" msgstr "" -#: src/dd.c:607 +#: src/dd.c:612 msgid " text use text I/O for data\n" msgstr "" -#: src/dd.c:609 +#: src/dd.c:614 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:612 +#: src/dd.c:617 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:615 +#: src/dd.c:620 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:620 +#: src/dd.c:625 #, c-format msgid "" "\n" @@ -2946,28 +2952,28 @@ msgid "" "\n" msgstr "" -#: src/dd.c:676 +#: src/dd.c:683 #, c-format msgid "" "%<PRIuMAX>+%<PRIuMAX> records in\n" "%<PRIuMAX>+%<PRIuMAX> records out\n" msgstr "" -#: src/dd.c:682 +#: src/dd.c:689 #, c-format msgid "%<PRIuMAX> truncated record\n" msgid_plural "%<PRIuMAX> truncated records\n" msgstr[0] "" msgstr[1] "" -#: src/dd.c:694 +#: src/dd.c:701 #, c-format msgid "%<PRIuMAX> byte (%s) copied" msgid_plural "%<PRIuMAX> bytes (%s) copied" msgstr[0] "" msgstr[1] "" -#: src/dd.c:712 +#: src/dd.c:720 msgid "Infinity B" msgstr "" @@ -2981,240 +2987,261 @@ 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:725 +#: src/dd.c:733 #, c-format msgid ", %g s, %s/s\n" msgstr "" -#: src/dd.c:804 +#: src/dd.c:812 #, c-format msgid "closing input file %s" msgstr "menutup fail input %s" -#: src/dd.c:811 +#: src/dd.c:819 #, c-format msgid "closing output file %s" msgstr "menutup fail output %s" -#: src/dd.c:1014 +#: src/dd.c:1022 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "" -#: src/dd.c:1085 src/dd.c:1934 +#: src/dd.c:1093 src/dd.c:1942 #, c-format msgid "writing to %s" msgstr "Menulis ke %s." -#: src/dd.c:1199 src/dd.c:1253 +#: src/dd.c:1207 src/dd.c:1261 #, fuzzy, c-format msgid "unrecognized operand %s" msgstr "opsyen tidak dikenali %s" -#: src/dd.c:1210 +#: src/dd.c:1218 #, fuzzy msgid "invalid conversion" msgstr "penukaran tidak sah: %s" -#: src/dd.c:1213 src/dd.c:1289 +#: src/dd.c:1221 src/dd.c:1297 #, fuzzy msgid "invalid input flag" msgstr "nombor tidak sah %s" -#: src/dd.c:1216 src/dd.c:1283 src/dd.c:1295 +#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303 #, fuzzy msgid "invalid output flag" msgstr "kumpulan tidak sah" -#: src/dd.c:1219 +#: src/dd.c:1227 #, fuzzy msgid "invalid status flag" msgstr "pengguna tidak sah %s" -#: src/dd.c:1258 src/truncate.c:312 +#: src/dd.c:1266 src/truncate.c:310 #, c-format msgid "invalid number %s" msgstr "nombor tidak sah %s" -#: src/dd.c:1340 +#: src/dd.c:1348 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "" -#: src/dd.c:1342 +#: src/dd.c:1350 #, fuzzy, c-format msgid "cannot combine block and unblock" msgstr "tak dapat omit kedua-dua pengguna dan kumpulan" -#: src/dd.c:1344 +#: src/dd.c:1352 #, fuzzy, c-format msgid "cannot combine lcase and ucase" msgstr "tak boleh banding nama fail %s dan %s" -#: src/dd.c:1346 +#: src/dd.c:1354 #, fuzzy, c-format msgid "cannot combine excl and nocreat" msgstr "tak boleh gabungkan isyarat dengan -l atau -t" -#: src/dd.c:1349 +#: src/dd.c:1357 #, fuzzy, c-format msgid "cannot combine direct and nocache" msgstr "tak dapat menentukan peranti dan inod bagi %s" -#: src/dd.c:1506 +#: src/dd.c:1514 #, 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:1593 +#: src/dd.c:1601 #, fuzzy, c-format msgid "%s: cannot skip" msgstr "%s: tak dapat buang" -#: src/dd.c:1595 src/dd.c:1614 src/dd.c:1675 +#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683 #, fuzzy, c-format msgid "%s: cannot seek" msgstr "%s: tak dapat buang" -#: src/dd.c:1655 +#: src/dd.c:1663 #, c-format msgid "offset overflow while reading file %s" msgstr "" -#: src/dd.c:1667 +#: src/dd.c:1675 #, c-format msgid "warning: invalid file offset after failed read" msgstr "" -#: src/dd.c:1671 +#: src/dd.c:1679 #, c-format msgid "cannot work around kernel bug after all" msgstr "" -#: src/dd.c:1814 +#: src/dd.c:1822 #, fuzzy, c-format msgid "setting flags for %s" msgstr "menetapkan masa untuk %s" -#: src/dd.c:1867 +#: src/dd.c:1875 #, c-format msgid "memory exhausted by input buffer of size %zu bytes (%s)" msgstr "" -#: src/dd.c:1881 +#: src/dd.c:1889 #, c-format msgid "memory exhausted by output buffer of size %zu bytes (%s)" msgstr "" -#: src/dd.c:1914 +#: src/dd.c:1922 #, fuzzy, c-format msgid "%s: cannot skip to specified offset" msgstr "tak boleh mencipta fifo %s" -#: src/dd.c:2125 src/dd.c:2258 +#: src/dd.c:2133 #, c-format -msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" +msgid "failed to truncate to %<PRIdMAX> bytes in output file %s" msgstr "" -#: src/dd.c:2138 +#: src/dd.c:2146 #, c-format msgid "fdatasync failed for %s" msgstr "" -#: src/dd.c:2148 +#: src/dd.c:2156 #, fuzzy, c-format msgid "fsync failed for %s" msgstr "gagal mengekalkan masa bagi %s" -#: src/dd.c:2199 src/dd.c:2228 -#, c-format -msgid "opening %s" -msgstr "Membuka %s" +#: src/dd.c:2207 src/dd.c:2236 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:2237 +#: src/dd.c:2246 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) " "blocks" msgstr "" -#: src/dd.c:2274 src/dd.c:2280 +#: src/dd.c:2267 +#, c-format +msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" +msgstr "" + +#: src/dd.c:2283 src/dd.c:2289 #, 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:54 src/expr.c:153 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:39 src/sleep.c:35 src/sort.c:66 +#: 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 msgid "Paul Eggert" msgstr "" -#: src/df.c:140 +#: src/df.c:172 msgid "Filesystem" msgstr "Sistem fail" -#: src/df.c:141 +#: src/df.c:175 msgid "Type" msgstr "Jenis" -#: src/df.c:142 +#: src/df.c:178 src/df.c:542 msgid "blocks" msgstr "blok" -#: src/df.c:142 -msgid "Inodes" -msgstr "Inod" - -#: src/df.c:142 -msgid "Size" -msgstr "Saiz" - -#: src/df.c:143 +#: src/df.c:181 msgid "Used" msgstr "Diguna" -#: src/df.c:143 -msgid "IUsed" -msgstr "IDiguna" - -#: src/df.c:144 +#: src/df.c:184 msgid "Available" msgstr "Ada" -#: src/df.c:144 -msgid "IFree" -msgstr "IBebas" - -#: src/df.c:144 -msgid "Avail" -msgstr "Ada" - -#: src/df.c:145 +#: src/df.c:187 msgid "Use%" msgstr "Guna%" -#: src/df.c:145 +#: src/df.c:190 +msgid "Inodes" +msgstr "Inod" + +#: src/df.c:193 +msgid "IUsed" +msgstr "IDiguna" + +#: src/df.c:196 +msgid "IFree" +msgstr "IBebas" + +#: src/df.c:199 msgid "IUse%" msgstr "IGuna%" -#: src/df.c:145 +#: src/df.c:202 +msgid "Mounted on" +msgstr "Dilekapkan pada" + +#: src/df.c:383 +#, c-format +msgid "option --output: field '%s' unknown" +msgstr "" + +#: src/df.c:390 +#, 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 +msgid "Size" +msgstr "Saiz" + +#: src/df.c:414 src/df.c:451 +msgid "Avail" +msgstr "Ada" + +#: src/df.c:474 msgid "Capacity" msgstr "Kapasiti" -#: src/df.c:146 -msgid "Mounted on" -msgstr "Dilekapkan pada" +#. 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 +#, c-format +msgid "%s-%s" +msgstr "" -#: src/df.c:847 +#: src/df.c:1210 msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" -"\n" msgstr "" -#: src/df.c:855 +#: src/df.c:1217 #, fuzzy msgid "" " -a, --all include dummy file systems\n" @@ -3232,7 +3259,7 @@ msgstr "" "1K 234M 2G)\n" " -H, --si sebaliknya, guna kuasa 1000 bukannya 1024\n" -#: src/df.c:865 +#: src/df.c:1227 #, fuzzy msgid "" " -i, --inodes list inode information instead of block usage\n" @@ -3247,9 +3274,12 @@ msgstr "" " --no-sync jangan panggil sync sebelum mendapat maklumat " "penggunaan (default)\n" -#: src/df.c:872 +#: src/df.c:1234 #, fuzzy msgid "" +" --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" +" or print all fields if FIELD_LIST is " +"omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" " -t, --type=TYPE limit listing to file systems of type TYPE\n" @@ -3266,21 +3296,43 @@ msgstr "" "JENIS\n" " -v (diabaikan)\n" -#: src/df.c:1027 +#: src/df.c:1248 +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" +msgstr "" + +#: src/df.c:1285 +#, 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 #, c-format msgid "file system type %s both selected and excluded" msgstr "" -#: src/df.c:1075 +#: src/df.c:1500 msgid "Warning: " msgstr "Amaran: " -#: src/df.c:1077 src/stat.c:795 +#: src/df.c:1502 src/stat.c:814 #, fuzzy msgid "cannot read table of mounted file systems" msgstr "%stak dapat membaca jadual sistemfail dilekapkan" -#: src/df.c:1107 +#: src/df.c:1539 #, c-format msgid "no file systems processed" msgstr "" @@ -3378,7 +3430,7 @@ msgid "" " %s stdio.h -> \".\"\n" msgstr "" -#: src/du.c:260 src/sort.c:390 src/wc.c:112 +#: src/du.c:270 src/sort.c:394 src/wc.c:112 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3387,16 +3439,17 @@ msgstr "" "Penggunaan: %s [OPTION]... GROUP FILE...\n" " atau: %s [OPTION]... --reference=RFILE FILE...\n" -#: src/du.c:264 -msgid "" -"Summarize disk usage of each FILE, recursively for directories.\n" -"\n" +#: src/du.c:274 +#, 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:271 +#: src/du.c:280 msgid "" +" -0, --null end each output line with 0 byte rather than " +"newline\n" " -a, --all write counts for all files, not just directories\n" " --apparent-size print apparent sizes, rather than disk usage; " "although\n" @@ -3405,7 +3458,7 @@ msgid "" " fragmentation, indirect blocks, and the like\n" msgstr "" -#: src/du.c:279 +#: src/du.c:289 #, fuzzy msgid "" " -B, --block-size=SIZE scale sizes by SIZE before printing them. E.g.,\n" @@ -3415,14 +3468,23 @@ msgid "" " -c, --total produce a grand total\n" " -D, --dereference-args dereference only symlinks that are listed on the\n" " command line\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 "" -" -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" +" --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:288 +#: src/du.c:302 msgid "" " --files0-from=F summarize disk usage of the NUL-terminated file\n" " names specified in file F;\n" @@ -3430,41 +3492,29 @@ msgid "" " -H equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" --si like -h, but use powers of 1000 not 1024\n" msgstr "" -#: src/du.c:297 +#: src/du.c:310 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 "" -#: src/du.c:302 +#: src/du.c:316 msgid "" -" -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " "default)\n" -" -0, --null end each output line with 0 byte rather than " -"newline\n" " -S, --separate-dirs 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:309 -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 "" - -#: src/du.c:318 +#: src/du.c:322 msgid "" +" -t, --threshold=SIZE exclude entries smaller than SIZE if positive,\n" +" or entries greater than SIZE if negative\n" " --time show time of the last modification of any file in " "the\n" " directory, or any of its subdirectories\n" @@ -3475,64 +3525,73 @@ msgid "" " FORMAT is interpreted like 'date'\n" msgstr "" -#: src/du.c:375 +#: src/du.c:333 +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 msgid "Infinity" msgstr "" -#: src/du.c:600 +#: src/du.c:507 +#, c-format +msgid "mount point %s already traversed" +msgstr "" + +#: src/du.c:624 #, fuzzy, c-format msgid "fts_read failed: %s" msgstr "fail biasa" -#: src/du.c:724 +#: src/du.c:780 #, c-format msgid "invalid maximum depth %s" msgstr "Kedalaman maksimum %s" -#: src/du.c:817 +#: src/du.c:809 +#, fuzzy, c-format +msgid "invalid --threshold argument '-0'" +msgstr "hujah tidak sah %s bagi %s" + +#: src/du.c:887 #, c-format msgid "cannot both summarize and show all entries" msgstr "tak dapat meringkaskan dan menunjukkan semua kemasukan" -#: src/du.c:824 +#: src/du.c:894 #, 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:830 +#: src/du.c:900 #, fuzzy, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "amaran: peringkasan konflik dengan --max-depth=%d" -#: src/du.c:896 src/sort.c:4479 src/wc.c:668 +#: src/du.c:966 src/sort.c:4533 src/wc.c:668 msgid "file operands cannot be combined with --files0-from" msgstr "" -#: src/du.c:949 src/md5sum.c:587 src/od.c:903 src/tac.c:239 src/tac.c:350 -#: src/tac.c:506 src/tac.c:586 src/wc.c:733 +#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 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:963 src/sort.c:4508 src/wc.c:747 +#: src/du.c:1040 src/sort.c:4562 src/wc.c:747 #, c-format msgid "when reading file names from stdin, no file name of %s allowed" msgstr "" -#: src/du.c:980 src/du.c:988 src/wc.c:760 src/wc.c:768 +#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768 #, fuzzy msgid "invalid zero-length file name" msgstr "nama kumpulan tak dah %s" -#: src/du.c:1007 src/head.c:149 src/head.c:262 src/head.c:334 src/head.c:538 -#: src/head.c:620 src/head.c:692 src/head.c:750 src/head.c:774 src/tail.c:412 -#: src/tail.c:500 src/tail.c:549 src/tail.c:642 src/tail.c:770 src/tail.c:818 -#: src/tail.c:855 src/tail.c:1782 src/tail.c:1812 src/uniq.c:395 -#, fuzzy, c-format -msgid "error reading %s" -msgstr "membaca %s" - -#: src/du.c:1010 src/ls.c:2649 src/wc.c:791 +#: src/du.c:1088 src/ls.c:2649 src/wc.c:791 msgid "total" msgstr "jumlah" @@ -3613,74 +3672,78 @@ msgid "Usage: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n" msgstr "Penggunaan: %s [OPSYEN]... [-] [NAMA=NILAI]...[ARAHAN [HUJAH]...]\n" #: src/env.c:55 +msgid "Set each NAME to VALUE in the environment and run COMMAND.\n" +msgstr "" + +#: src/env.c:61 msgid "" -"Set each NAME to VALUE in the environment and run COMMAND.\n" -"\n" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with 0 byte rather than newline\n" " -u, --unset=NAME remove variable from the environment\n" msgstr "" -#: src/env.c:64 +#: src/env.c:68 msgid "" "\n" "A mere - implies -i. If no COMMAND, print the resulting environment.\n" msgstr "" -#: src/env.c:120 +#: src/env.c:124 #, fuzzy, c-format msgid "cannot unset %s" msgstr "tak dapat stat %s" -#: src/env.c:131 +#: src/env.c:135 #, fuzzy, c-format msgid "cannot set %s" msgstr "tak dapat stat %s" -#: src/env.c:148 +#: src/env.c:152 #, c-format msgid "cannot specify --null (-0) with command" msgstr "" #: 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" -"\n" msgstr "" +"\n" +"Dengan tiada FAIL, atau bila FAIL adalah -, baca input piawai.\n" -#: src/expand.c:115 +#: src/expand.c:114 msgid "" " -i, --initial do not convert tabs after non blanks\n" " -t, --tabs=NUMBER have tabs NUMBER characters apart, not 8\n" msgstr "" -#: src/expand.c:119 +#: src/expand.c:118 msgid "" " -t, --tabs=LIST use comma separated list of explicit tab positions\n" msgstr "" -#: src/expand.c:172 src/unexpand.c:191 +#: src/expand.c:171 src/unexpand.c:190 #, fuzzy, c-format msgid "tab stop is too large %s" msgstr "%s adalah terlalu besar" -#: src/expand.c:180 src/unexpand.c:199 +#: src/expand.c:179 src/unexpand.c:198 #, c-format msgid "tab size contains invalid character(s): %s" msgstr "" -#: src/expand.c:206 src/unexpand.c:225 +#: src/expand.c:205 src/unexpand.c:224 #, c-format msgid "tab size cannot be 0" msgstr "" -#: src/expand.c:208 src/unexpand.c:227 +#: src/expand.c:207 src/unexpand.c:226 #, c-format msgid "tab sizes must be ascending" msgstr "" -#: src/expand.c:326 src/expand.c:345 src/unexpand.c:374 src/unexpand.c:419 +#: src/expand.c:325 src/expand.c:344 src/unexpand.c:373 src/unexpand.c:418 #, fuzzy, c-format msgid "input line is too long" msgstr "%s: fail terlalu panjang" @@ -3794,12 +3857,12 @@ msgstr "ralat pada carian ungkapan biasa (regexp)" msgid "non-integer argument" msgstr "hujah bukan-numerik" -#: src/expr.c:793 src/truncate.c:316 +#: src/expr.c:793 src/truncate.c:314 #, c-format msgid "division by zero" msgstr "dibahagi dengan sifar" -#: src/expr.c:887 src/sort.c:2029 +#: src/expr.c:887 src/sort.c:2044 #, fuzzy, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "Tetapkan LC_ALL='C' untuk mengatasi masalah." @@ -3809,25 +3872,32 @@ msgstr "Tetapkan LC_ALL='C' untuk mengatasi masalah." msgid "the strings compared were %s and %s" msgstr "Rentetan dibandingkan adalah %s dan %s." -#: src/factor.c:449 -msgid "using arbitrary-precision arithmetic" +#. This is a proper name. See the gettext manual, section Names. +#: src/factor.c:111 +msgid "Niels Moller" msgstr "" -#: src/factor.c:460 -msgid "using single-precision arithmetic" +#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459 +#, c-format +msgid "Lucas prime test failure. This should not happen" msgstr "" -#: src/factor.c:465 src/od.c:1640 src/od.c:1709 +#: src/factor.c:2092 #, c-format -msgid "%s is too large" -msgstr "%s adalah terlalu besar" +msgid "squfof queue overflow" +msgstr "" -#: src/factor.c:469 +#: src/factor.c:2419 #, fuzzy, c-format msgid "%s is not a valid positive integer" msgstr "`%s' adalah bukan integer positif yang sah" -#: src/factor.c:494 +#: src/factor.c:2442 src/od.c:1646 src/od.c:1715 +#, c-format +msgid "%s is too large" +msgstr "%s adalah terlalu besar" + +#: src/factor.c:2454 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -3836,7 +3906,7 @@ msgstr "" "Pengunaan: %s [NOMBOR]...\n" " atau: %s OPSYEN\n" -#: src/factor.c:499 +#: src/factor.c:2459 #, fuzzy msgid "" "Print the prime factors of each specified integer NUMBER. If none\n" @@ -3864,20 +3934,19 @@ msgid "cannot stat current directory (now %s)" msgstr "tak dapat mencipta direktori %s" #. This is a proper name. See the gettext manual, section Names. -#: src/fmt.c:37 +#: src/fmt.c:38 msgid "Ross Paterson" msgstr "" -#: src/fmt.c:269 +#: src/fmt.c:270 #, fuzzy, c-format msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n" msgstr "Penggunaan: %s [-DIGIT][OPSYEN]...[FAIL]...\n" -#: src/fmt.c:270 +#: 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" -"\n" msgstr "" #: src/fmt.c:278 @@ -3888,8 +3957,8 @@ msgid "" " -s, --split-only split long lines, but do not refill\n" msgstr "" -#: src/fmt.c:285 -#, c-format +#: src/fmt.c:287 +#, 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" @@ -3897,42 +3966,42 @@ msgid "" " -g, --goal=WIDTH goal width (default of 93% of width)\n" msgstr "" -#: src/fmt.c:357 +#: src/fmt.c:359 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" "option; use -w N instead" msgstr "" -#: src/fmt.c:403 src/fmt.c:414 +#: src/fmt.c:405 src/fmt.c:416 #, fuzzy, c-format msgid "invalid width: %s" msgstr "lebar tidak sah: `%s'" #: src/fold.c:70 +#, fuzzy msgid "" "Wrap input lines in each FILE (standard input by default), writing to\n" "standard output.\n" -"\n" msgstr "" "Balut baris input pada setiap FAIL (pinput piawai secara default),\n" " menulis keoutput piawai.\n" "\n" -#: src/fold.c:78 +#: src/fold.c:77 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" " -w, --width=WIDTH use WIDTH columns instead of 80\n" msgstr "" -#: src/fold.c:289 src/pr.c:836 +#: src/fold.c:288 src/pr.c:832 #, fuzzy, c-format 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:75 +#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 #: src/truncate.c:37 msgid "Padraig Brady" msgstr "" @@ -3948,17 +4017,17 @@ msgid "" "\n" msgstr "" -#: src/group-list.c:69 src/id.c:345 src/setuidgid.c:184 +#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184 #, 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:350 +#: src/group-list.c:74 src/id.c:370 #, fuzzy, c-format msgid "failed to get groups for the current process" msgstr "gagal menukar kumpulan %s ke %s\n" -#: src/group-list.c:104 +#: src/group-list.c:114 #, fuzzy, c-format msgid "cannot find name for group ID %lu" msgstr "tak dapat menjumpai nama atau ID kumpulan %u" @@ -3996,14 +4065,16 @@ 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" -"\n" msgstr "" +"\n" +"Dengan tiada FAIL, atau bila FAIL adalah -, baca input piawai.\n" -#: src/head.c:118 +#: src/head.c:117 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -4013,7 +4084,7 @@ msgid "" " K lines of each file\n" msgstr "" -#: src/head.c:126 +#: src/head.c:125 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4021,7 +4092,7 @@ msgstr "" " -q, --quiet, --silent tidak cetak pengepala nama fail diberi\n" " -v, --verbose sentiasa cetak pengepala nama fail diberi\n" -#: src/head.c:132 +#: src/head.c:131 #, fuzzy msgid "" "\n" @@ -4034,58 +4105,58 @@ 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:152 -#, fuzzy, c-format -msgid "error writing %s" -msgstr "menulis %s" - -#: src/head.c:155 +#: src/head.c:154 #, c-format msgid "%s: file has shrunk too much" msgstr "" -#: src/head.c:228 src/head.c:1044 +#: src/head.c:227 src/head.c:1051 #, fuzzy, c-format msgid "%s: number of bytes is too large" msgstr "nombor tidak sah %s" -#: src/head.c:441 +#: src/head.c:440 #, fuzzy, c-format msgid "%s: cannot lseek back to original position" msgstr "tak boleh mencipta fifo %s" -#: src/head.c:613 src/head.c:684 src/tail.c:450 +#: src/head.c:612 src/head.c:691 src/tail.c:449 #, fuzzy, c-format msgid "%s: cannot seek to offset %s" msgstr "tak dapat lseek %s" -#: src/head.c:791 +#: src/head.c:673 +#, fuzzy, c-format +msgid "%s: failed to reset file pointer" +msgstr "%s: tak dapat buang" + +#: src/head.c:798 #, fuzzy, c-format msgid "cannot reposition file pointer for %s" msgstr "tak memperolehi setem masa bagi %s" -#: src/head.c:878 +#: src/head.c:885 #, 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:879 +#: src/head.c:886 msgid "number of lines" msgstr "bilangan baris" -#: src/head.c:879 +#: src/head.c:886 msgid "number of bytes" msgstr "bilangan byte" -#: src/head.c:886 src/tail.c:1947 +#: src/head.c:893 src/tail.c:1947 msgid "invalid number of lines" msgstr "bilangan baris tidak sah" -#: src/head.c:887 src/tail.c:1948 +#: src/head.c:894 src/tail.c:1948 msgid "invalid number of bytes" msgstr "bilangan byte tidak sah" -#: src/head.c:974 src/head.c:1032 +#: src/head.c:981 src/head.c:1039 #, fuzzy, c-format msgid "invalid trailing option -- %c" msgstr "opsyen tidak sah -- %c" @@ -4202,86 +4273,86 @@ msgstr "" msgid "cannot get effective UID" msgstr "tak dapat membuang %s" -#: src/id.c:289 +#: src/id.c:311 #, fuzzy, c-format -msgid "cannot find name for user ID %lu" +msgid "cannot find name for user ID %s" msgstr "tak dapat menjumpai nama bagi ID pengguna %u" -#: src/id.c:309 +#: src/id.c:329 #, c-format -msgid "uid=%lu" +msgid "uid=%s" msgstr "" -#: src/id.c:314 +#: src/id.c:334 #, c-format -msgid " gid=%lu" +msgid " gid=%s" msgstr "" -#: src/id.c:321 +#: src/id.c:341 #, c-format -msgid " euid=%lu" +msgid " euid=%s" msgstr "" -#: src/id.c:329 +#: src/id.c:349 #, c-format -msgid " egid=%lu" +msgid " egid=%s" msgstr "" -#: src/id.c:357 +#: src/id.c:377 msgid " groups=" msgstr " kumpulan=" -#: src/id.c:373 +#: src/id.c:393 #, c-format msgid " context=%s" msgstr "" -#: src/install.c:372 +#: src/install.c:373 #, fuzzy, c-format msgid "warning: %s: failed to change context to %s" msgstr "Gagal menukar direktori %s " -#: src/install.c:413 +#: src/install.c:414 #, c-format msgid "creating directory %s" msgstr "mencipta direktori %s" -#: src/install.c:481 +#: src/install.c:482 #, fuzzy, c-format msgid "cannot change ownership of %s" msgstr "tak dapat menukar keizinan %s" -#: src/install.c:505 +#: src/install.c:506 #, c-format msgid "cannot set time stamps for %s" msgstr "Tak dapat tetapkan setem masa bagi %s" -#: src/install.c:526 src/split.c:412 src/timeout.c:387 +#: src/install.c:527 src/split.c:426 src/timeout.c:439 #, c-format msgid "fork system call failed" msgstr "panggilan sistem fork() gagal" -#: src/install.c:530 +#: src/install.c:531 #, fuzzy, c-format msgid "cannot run %s" msgstr "takboleh nyahpaut %s" -#: src/install.c:534 +#: src/install.c:535 #, fuzzy, c-format msgid "waiting for strip" msgstr "Menulis ke %s." -#: src/install.c:536 +#: src/install.c:537 #, c-format msgid "strip process terminated abnormally" msgstr "" -#: src/install.c:557 +#: src/install.c:558 #, c-format msgid "invalid user %s" msgstr "pengguna tidak sah %s" -#: src/install.c:593 +#: src/install.c:594 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -4293,7 +4364,7 @@ msgstr "" " atau: %s [OPSYEN]... SUMBER... DIREKTORI\n" " atau: %s [OPSYEN]... --target-directory=DIREKTORI SUMBER...\n" -#: src/install.c:600 +#: src/install.c:601 #, fuzzy msgid "" "\n" @@ -4306,7 +4377,6 @@ msgid "" "In the first three forms, copy SOURCE to DEST or multiple SOURCE(s) to\n" "the existing DIRECTORY, while setting permission modes and owner/group.\n" "In the 4th form, create all components of the given DIRECTORY(ies).\n" -"\n" msgstr "" "Dalam dua format pertama, salin SUMBER ke DEST atau banyak SUMBER ke\n" "DIREKTORI sesia ada , sekaligus menetapkan mod keizinan dan pemilik/" @@ -4376,53 +4446,53 @@ msgid "" "directories\n" msgstr "" -#: src/install.c:858 +#: src/install.c:859 #, c-format msgid "" "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled" msgstr "" -#: src/install.c:868 +#: src/install.c:869 #, c-format msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled" msgstr "" -#: src/install.c:885 +#: src/install.c:886 #, 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:888 +#: src/install.c:889 #, fuzzy, c-format msgid "target directory not allowed when installing a directory" msgstr "opsyen dikikis tak boleh digunakan bila memasang direktori" -#: src/install.c:892 +#: src/install.c:893 #, c-format msgid "cannot force target context to %s and preserve it" msgstr "" -#: src/install.c:946 src/mkdir.c:202 src/stdbuf.c:327 +#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326 #, c-format msgid "invalid mode %s" msgstr "mod tak sah %s" -#: src/install.c:953 +#: src/install.c:954 #, c-format msgid "WARNING: ignoring --strip-program option as -s option was not specified" msgstr "" -#: src/install.c:958 +#: src/install.c:959 #, 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:965 +#: src/install.c:966 #, fuzzy, c-format msgid "options --compare (-C) and --strip are mutually exclusive" msgstr "opseyn untuk menyatakan tarikh untuk dicetak adalah eksklusif" -#: src/install.c:971 +#: src/install.c:972 #, c-format msgid "" "the --compare (-C) option is ignored when you specify a mode with non-" @@ -4430,7 +4500,7 @@ msgid "" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/join.c:40 src/sort.c:65 +#: src/join.c:40 src/sort.c:66 msgid "Mike Haertel" msgstr "" @@ -4486,7 +4556,7 @@ msgstr "" #: src/join.c:403 #, c-format -msgid "%s:%ju: is not sorted: %.*s" +msgid "%s:%<PRIuMAX>: is not sorted: %.*s" msgstr "" #: src/join.c:840 src/join.c:1038 @@ -4514,12 +4584,12 @@ msgstr "" msgid "conflicting empty-field replacement strings" msgstr "" -#: src/join.c:1101 src/sort.c:4414 +#: src/join.c:1101 src/sort.c:4468 #, 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:4419 +#: src/join.c:1105 src/sort.c:4473 #, c-format msgid "incompatible tabs" msgstr "" @@ -4541,14 +4611,13 @@ msgstr "" " atau: %s -t [ISYARAT]...\n" #: src/kill.c:82 -msgid "" -"Send signals to processes, or list signals.\n" -"\n" +#, fuzzy +msgid "Send signals to processes, or list signals.\n" msgstr "" "Menghantar isyarat ke proses, atau senaraikan isyarat.\n" "\n" -#: src/kill.c:89 +#: src/kill.c:88 msgid "" " -s, --signal=SIGNAL, -SIGNAL\n" " specify the name or number of the signal to be sent\n" @@ -4557,7 +4626,7 @@ msgid "" " -t, --table print a table of signal information\n" msgstr "" -#: src/kill.c:97 +#: src/kill.c:96 msgid "" "\n" "SIGNAL may be a signal name like 'HUP', or a signal number like '1',\n" @@ -4565,32 +4634,32 @@ msgid "" "PID is an integer; if negative it identifies a process group.\n" msgstr "" -#: src/kill.c:206 +#: src/kill.c:205 #, c-format msgid "%s: invalid process id" msgstr "%s: id proses tidak sah" -#: src/kill.c:260 +#: src/kill.c:259 #, c-format msgid "invalid option -- %c" msgstr "opsyen tidak sah -- %c" -#: src/kill.c:269 +#: src/kill.c:268 #, c-format msgid "%s: multiple signals specified" msgstr "%s: banyak isyarat dinyatakan" -#: src/kill.c:283 +#: src/kill.c:282 #, c-format msgid "multiple -l or -t options specified" msgstr "banyak opsyen -l or -t dinyatakan" -#: src/kill.c:300 +#: src/kill.c:299 #, c-format msgid "cannot combine signal with -l or -t" msgstr "tak boleh gabungkan isyarat dengan -l atau -t" -#: src/kill.c:306 +#: src/kill.c:305 #, c-format msgid "no process ID specified" msgstr "tiada ID proses dinyatakan" @@ -4700,10 +4769,9 @@ msgid "" "When creating hard links, each TARGET must exist. Symbolic links\n" "can hold arbitrary text; if later resolved, a relative link is\n" "interpreted in relation to its parent directory.\n" -"\n" msgstr "" -#: src/ln.c:395 +#: src/ln.c:394 #, fuzzy msgid "" " --backup[=CONTROL] make a backup of each existing destination " @@ -4724,7 +4792,7 @@ msgstr "" " -d sama seperti --no-dereference --" "preserve=link\n" -#: src/ln.c:403 +#: src/ln.c:402 msgid "" " -i, --interactive prompt whether to remove destinations\n" " -L, --logical dereference TARGETs that are symbolic links\n" @@ -4736,7 +4804,7 @@ msgid "" " -s, --symbolic make symbolic links instead of hard links\n" msgstr "" -#: src/ln.c:412 +#: src/ln.c:411 msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" " -t, --target-directory=DIRECTORY specify the DIRECTORY in which to " @@ -4746,18 +4814,10 @@ msgid "" " -v, --verbose print name of each linked file\n" msgstr "" -#: src/ln.c:428 -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 "" - -#: src/ln.c:435 +#: src/ln.c:433 #, 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 "" @@ -4830,7 +4890,7 @@ 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:1976 +#: src/ls.c:1750 src/ptx.c:1975 #, c-format msgid "invalid line width: %s" msgstr "lebar baris tidak sah: %s" @@ -4894,7 +4954,7 @@ msgstr "membaca direktori %s" msgid "closing directory %s" msgstr "mencipta direktori %s" -#: src/ls.c:3301 +#: src/ls.c:3302 #, c-format msgid "cannot compare file names %s and %s" msgstr "tak boleh banding nama fail %s dan %s" @@ -4904,13 +4964,12 @@ msgstr "tak boleh banding nama fail %s dan %s" msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" -"\n" msgstr "" "Senarai maklumat tentang FAIL (direktori semasa secara default).\n" "Inih semasukan mengikut abjad jika tiada -cftuSUX atau --sort.\n" "\n" -#: src/ls.c:4729 +#: src/ls.c:4728 #, fuzzy msgid "" " -a, --all do not ignore entries starting with .\n" @@ -4924,7 +4983,7 @@ msgstr "" " --author cetak penulis bagi setiap fail\n" " -b, --escape cetak escape oktal bagi aksara bukangrafik\n" -#: src/ls.c:4735 +#: src/ls.c:4734 #, fuzzy msgid "" " --block-size=SIZE scale sizes by SIZE before printing them. E." @@ -4948,7 +5007,7 @@ msgstr "" "nama\n" " sebaliknya: isih mengikut ctime\n" -#: src/ls.c:4745 +#: src/ls.c:4744 #, fuzzy msgid "" " -C list entries by columns\n" @@ -4968,7 +5027,7 @@ msgstr "" "kandungannya\n" " -D, --dired jana output direka untuk mod dired Emacs\n" -#: src/ls.c:4753 +#: src/ls.c:4752 #, fuzzy msgid "" " -f do not sort, enable -aU, disable -ls --color\n" @@ -4984,11 +5043,11 @@ msgstr "" " kolum-tunggal -1, verbose -l, menegak -C\n" " --full-time seperti -l --time-style=full-iso\n" -#: src/ls.c:4761 +#: src/ls.c:4760 msgid " -g like -l, but do not list owner\n" msgstr "" -#: src/ls.c:4764 +#: src/ls.c:4763 msgid "" " --group-directories-first\n" " group directories before files.\n" @@ -4996,7 +5055,7 @@ msgid "" " use of --sort=none (-U) disables grouping\n" msgstr "" -#: src/ls.c:4770 +#: src/ls.c:4769 #, fuzzy msgid "" " -G, --no-group in a long listing, don't print group names\n" @@ -5010,7 +5069,7 @@ msgstr "" "1K 234M 2G)\n" " -H, --si sebaliknya, guna kuasa 1000 bukannya 1024\n" -#: src/ls.c:4776 +#: src/ls.c:4775 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5023,7 +5082,7 @@ msgid "" " (overridden by -a or -A)\n" msgstr "" -#: src/ls.c:4786 +#: src/ls.c:4785 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -5035,7 +5094,7 @@ msgid "" " -k, --kibibytes use 1024-byte blocks\n" msgstr "" -#: src/ls.c:4796 +#: src/ls.c:4795 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5045,7 +5104,7 @@ msgid "" "entries\n" msgstr "" -#: src/ls.c:4804 +#: src/ls.c:4803 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. " @@ -5056,7 +5115,7 @@ msgid "" " append / indicator to directories\n" msgstr "" -#: src/ls.c:4812 +#: src/ls.c:4811 msgid "" " -q, --hide-control-chars print ? instead of non graphic characters\n" " --show-control-chars show non graphic characters as-is (default\n" @@ -5068,7 +5127,7 @@ msgid "" "escape\n" msgstr "" -#: src/ls.c:4821 +#: src/ls.c:4820 #, fuzzy msgid "" " -r, --reverse reverse order while sorting\n" @@ -5080,7 +5139,7 @@ msgstr "" " -R, --recursive senarai subdirektori secara rekursif\n" " -s, --size cetak saiz bagi setiap fail, dalam blok\n" -#: src/ls.c:4826 +#: src/ls.c:4825 msgid "" " -S sort by file size\n" " --sort=WORD sort by WORD instead of name: none -U,\n" @@ -5092,7 +5151,7 @@ msgid "" " if --sort=time\n" msgstr "" -#: src/ls.c:4836 +#: src/ls.c:4835 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, +FORMAT.\n" @@ -5104,13 +5163,13 @@ msgid "" " takes effect only outside the POSIX locale\n" msgstr "" -#: src/ls.c:4845 +#: src/ls.c:4844 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:4849 +#: src/ls.c:4848 msgid "" " -u with -lt: sort by, and show, access time\n" " with -l: show access time and sort by name\n" @@ -5119,7 +5178,7 @@ msgid "" " -v natural sort of (version) numbers within text\n" msgstr "" -#: src/ls.c:4856 +#: src/ls.c:4855 msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" @@ -5129,7 +5188,7 @@ msgid "" " -1 list one file per line\n" msgstr "" -#: src/ls.c:4866 +#: src/ls.c:4865 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5138,7 +5197,7 @@ msgid "" "variable can change the settings. Use the dircolors command to set it.\n" msgstr "" -#: src/ls.c:4873 +#: src/ls.c:4872 msgid "" "\n" "Exit status:\n" @@ -5163,7 +5222,7 @@ msgstr "" msgid "David Madore" msgstr "" -#: src/md5sum.c:162 +#: src/md5sum.c:164 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -5174,13 +5233,13 @@ msgstr "" "\n" "Dengan tiada FAIL, atau bila FAIL adalah -, baca input piawai.\n" -#: src/md5sum.c:172 +#: src/md5sum.c:174 msgid "" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr "" -#: src/md5sum.c:176 +#: src/md5sum.c:178 #, fuzzy msgid " -b, --binary read in binary mode\n" msgstr "" @@ -5188,21 +5247,25 @@ msgstr "" " -B, --binary menggunakan penulisan binari ke peranti okonsol.\n" "\n" -#: src/md5sum.c:179 +#: src/md5sum.c:181 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr "" -#: src/md5sum.c:183 +#: src/md5sum.c:184 +msgid " --tag create a BSD-style checksum\n" +msgstr "" + +#: src/md5sum.c:188 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" -#: src/md5sum.c:187 +#: src/md5sum.c:192 msgid " -t, --text read in text mode (default)\n" msgstr "" -#: src/md5sum.c:190 +#: src/md5sum.c:195 msgid "" "\n" "The following three options are useful only when verifying checksums:\n" @@ -5212,12 +5275,12 @@ msgid "" "\n" msgstr "" -#: src/md5sum.c:198 +#: src/md5sum.c:203 msgid "" " --strict with --check, exit non-zero for any invalid input\n" msgstr "" -#: src/md5sum.c:203 +#: src/md5sum.c:208 #, c-format msgid "" "\n" @@ -5227,77 +5290,87 @@ msgid "" "space for text), and name for each FILE.\n" msgstr "" -#: src/md5sum.c:502 +#: src/md5sum.c:523 #, c-format msgid "%s: too many checksum lines" msgstr "" -#: src/md5sum.c:526 +#: src/md5sum.c:547 #, c-format msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line" msgstr "" -#: src/md5sum.c:551 +#: src/md5sum.c:572 #, c-format msgid "%s: FAILED open or read\n" msgstr "" -#: src/md5sum.c:574 +#: src/md5sum.c:595 msgid "FAILED" msgstr "GAGAL" -#: src/md5sum.c:576 +#: src/md5sum.c:597 msgid "OK" msgstr "OK" -#: src/md5sum.c:600 +#: src/md5sum.c:621 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "" -#: src/md5sum.c:610 +#: src/md5sum.c:631 #, c-format msgid "WARNING: %<PRIuMAX> line is improperly formatted" msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted" msgstr[0] "" msgstr[1] "" -#: src/md5sum.c:618 +#: src/md5sum.c:639 #, 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:626 +#: src/md5sum.c:647 #, 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:704 +#: src/md5sum.c:760 +#, c-format +msgid "--tag does not support --text mode" +msgstr "" + +#: src/md5sum.c:766 +#, c-format +msgid "the --tag option is meaningless when verifying checksums" +msgstr "" + +#: src/md5sum.c:773 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" msgstr "" -#: src/md5sum.c:712 +#: src/md5sum.c:781 #, c-format msgid "the --status option is meaningful only when verifying checksums" msgstr "" -#: src/md5sum.c:719 +#: src/md5sum.c:788 #, c-format msgid "the --warn option is meaningful only when verifying checksums" msgstr "" -#: src/md5sum.c:726 +#: src/md5sum.c:795 #, c-format msgid "the --quiet option is meaningful only when verifying checksums" msgstr "" -#: src/md5sum.c:733 +#: src/md5sum.c:802 #, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "" @@ -5308,14 +5381,13 @@ msgid "Usage: %s [OPTION]... DIRECTORY...\n" msgstr "Penggunaan: %s [OPSYEN]... DIREKTORI...\n" #: src/mkdir.c:57 -msgid "" -"Create the DIRECTORY(ies), if they do not already exist.\n" -"\n" +#, 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:64 +#: src/mkdir.c:63 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" @@ -5324,7 +5396,7 @@ msgid "" " directory to CTX\n" msgstr "" -#: src/mkdir.c:169 +#: src/mkdir.c:168 #, c-format msgid "created directory %s" msgstr "direktori %s dicipta" @@ -5335,14 +5407,13 @@ msgid "Usage: %s [OPTION]... NAME...\n" msgstr "Penggunaan: %s [OPSYEN] NAMA...\n" #: src/mkfifo.c:52 -msgid "" -"Create named pipes (FIFOs) with the given NAMEs.\n" -"\n" +#, fuzzy +msgid "Create named pipes (FIFOs) with the given NAMEs.\n" msgstr "" "Cipta paip bernama (FIFO) dengan NAMA diberi.\n" "\n" -#: src/mkfifo.c:59 src/mknod.c:61 +#: src/mkfifo.c:58 src/mknod.c:60 #, fuzzy msgid "" " -m, --mode=MODE set file permission bits to MODE, not a=rw - umask\n" @@ -5350,17 +5421,17 @@ msgstr "" " -m, --mode=MOD tetapkan mod keizinan (seperti dlm chmod), bukan umask " "a=rw\n" -#: src/mkfifo.c:62 +#: src/mkfifo.c:61 msgid "" " -Z, --context=CTX set the SELinux security context of each NAME to CTX\n" msgstr "" -#: src/mkfifo.c:122 src/mknod.c:128 +#: src/mkfifo.c:121 src/mknod.c:127 #, c-format msgid "invalid mode" msgstr "mod tak sah" -#: src/mkfifo.c:127 src/mknod.c:133 +#: src/mkfifo.c:126 src/mknod.c:132 #, c-format msgid "mode must specify only file permission bits" msgstr "" @@ -5371,18 +5442,17 @@ msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n" msgstr "Penggunaan: %s [OPSYEN]... NAMA JENIS [MAJOR MINOR]\n" #: src/mknod.c:54 -msgid "" -"Create the special file NAME of the given TYPE.\n" -"\n" +#, 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:64 +#: src/mknod.c:63 msgid " -Z, --context=CTX set the SELinux security context of NAME to CTX\n" msgstr "" -#: src/mknod.c:69 +#: src/mknod.c:68 msgid "" "\n" "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n" @@ -5391,7 +5461,7 @@ msgid "" "otherwise, as decimal. TYPE may be:\n" msgstr "" -#: src/mknod.c:76 +#: src/mknod.c:75 msgid "" "\n" " b create a block (buffered) special file\n" @@ -5399,44 +5469,44 @@ msgid "" " p create a FIFO\n" msgstr "" -#: src/mknod.c:151 +#: src/mknod.c:150 #, 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:161 +#: src/mknod.c:160 #, fuzzy msgid "Fifos do not have major and minor device numbers." msgstr "nombor peranti minor tidak sah %s" -#: src/mknod.c:177 +#: src/mknod.c:176 #, c-format msgid "block special files not supported" msgstr "fail istimewa blok tidak disokong" -#: src/mknod.c:186 +#: src/mknod.c:185 #, c-format msgid "character special files not supported" msgstr "fail istimewa aksara tidak disokong" -#: src/mknod.c:202 +#: src/mknod.c:201 #, c-format msgid "invalid major device number %s" msgstr "nombor peranti major tidak sah %s" -#: src/mknod.c:207 +#: src/mknod.c:206 #, c-format msgid "invalid minor device number %s" msgstr "nombor peranti minor tidak sah %s" -#: src/mknod.c:212 +#: src/mknod.c:211 #, c-format msgid "invalid device %s %s" msgstr "peranti tidak sah %s %s" -#: src/mknod.c:226 +#: src/mknod.c:225 #, fuzzy, c-format msgid "invalid device type %s" msgstr "peranti tidak sah %s %s" @@ -5495,60 +5565,59 @@ msgid "" " directory specified via -p; else /tmp [deprecated]\n" msgstr "" -#: src/mktemp.c:222 +#: src/mktemp.c:223 #, fuzzy, c-format msgid "failed to redirect stderr to /dev/null" msgstr "menutup output piawai" -#: src/mktemp.c:228 +#: src/mktemp.c:229 #, fuzzy, c-format msgid "too many templates" msgstr "terlalu banyak hujah" -#: src/mktemp.c:248 +#: src/mktemp.c:249 #, c-format msgid "with --suffix, template %s must end in X" msgstr "" -#: src/mktemp.c:273 src/split.c:1117 +#: src/mktemp.c:274 src/split.c:1130 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "" -#: src/mktemp.c:278 +#: src/mktemp.c:279 #, c-format msgid "too few X's in template %s" msgstr "" -#: src/mktemp.c:291 +#: src/mktemp.c:292 #, c-format msgid "invalid template, %s, contains directory separator" msgstr "" -#: src/mktemp.c:305 +#: src/mktemp.c:306 #, c-format msgid "invalid template, %s; with --tmpdir, it may not be absolute" msgstr "" -#: src/mktemp.c:325 +#: src/mktemp.c:326 #, fuzzy, c-format msgid "failed to create directory via template %s" msgstr "tak dapat mencipta direktori %s" -#: src/mktemp.c:335 +#: src/mktemp.c:336 #, fuzzy, c-format msgid "failed to create file via template %s" msgstr "gagal mengekalkan masa bagi %s" -#: src/mv.c:290 -msgid "" -"Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" -"\n" +#: src/mv.c:292 +#, 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:297 +#: src/mv.c:298 #, fuzzy msgid "" " --backup[=CONTROL] make a backup of each existing destination " @@ -5569,7 +5638,7 @@ msgstr "" " -d sama seperti --no-dereference --" "preserve=link\n" -#: src/mv.c:306 +#: src/mv.c:307 msgid "" " --strip-trailing-slashes remove any trailing slashes from each " "SOURCE\n" @@ -5577,7 +5646,7 @@ msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" msgstr "" -#: src/mv.c:311 +#: src/mv.c:312 msgid "" " -t, --target-directory=DIRECTORY move all SOURCE arguments into " "DIRECTORY\n" @@ -5597,28 +5666,30 @@ msgstr "Penggunaan: %s [OPSYEN] NAMA...\n" #, c-format msgid "" "Run COMMAND with an adjusted niceness, which affects process scheduling.\n" -"With no COMMAND, print the current niceness. Nicenesses range from\n" -"%d (most favorable scheduling) to %d (least favorable).\n" -"\n" -" -n, --adjustment=N add integer N to the niceness (default 10)\n" +"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 "" + +#: src/nice.c:82 +msgid " -n, --adjustment=N add integer N to the niceness (default 10)\n" msgstr "" -#: src/nice.c:168 +#: src/nice.c:172 #, fuzzy, c-format msgid "invalid adjustment %s" msgstr "hujah tidak sah %s bagi %s" -#: src/nice.c:177 +#: src/nice.c:181 #, c-format msgid "a command must be given with an adjustment" msgstr "arahan mesti diberi dengan satu penyesuaian" -#: src/nice.c:184 src/nice.c:195 +#: src/nice.c:188 src/nice.c:199 #, fuzzy, c-format msgid "cannot get niceness" msgstr "tak dapat perolehi nama sistem" -#: src/nice.c:201 +#: src/nice.c:205 #, fuzzy, c-format msgid "cannot set niceness" msgstr "tak dapat menetapkan tarikh" @@ -5628,21 +5699,23 @@ msgstr "tak dapat menetapkan tarikh" msgid "Scott Bartram" msgstr "" -#: src/nl.c:186 +#: 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" -"\n" msgstr "" +"\n" +"Dengan tiada FAIL, atau bila FAIL adalah -, baca input piawai.\n" -#: src/nl.c:194 +#: src/nl.c:186 msgid "" " -b, --body-numbering=STYLE use STYLE for numbering body lines\n" " -d, --section-delimiter=CC use CC for separating logical pages\n" " -f, --footer-numbering=STYLE use STYLE for numbering footer lines\n" msgstr "" -#: src/nl.c:199 +#: src/nl.c:191 msgid "" " -h, --header-numbering=STYLE use STYLE for numbering header lines\n" " -i, --line-increment=NUMBER line number increment at each line\n" @@ -5654,13 +5727,13 @@ msgid "" " -s, --number-separator=STRING add STRING after (possible) line number\n" msgstr "" -#: src/nl.c:207 +#: src/nl.c:199 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 "" -#: src/nl.c:213 +#: src/nl.c:205 msgid "" "\n" "By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC are\n" @@ -5668,7 +5741,7 @@ msgid "" "second character implies :. Type \\\\ for \\. STYLE is one of:\n" msgstr "" -#: src/nl.c:219 +#: src/nl.c:211 msgid "" "\n" " a number all lines\n" @@ -5685,52 +5758,47 @@ msgid "" "\n" msgstr "" -#: src/nl.c:286 +#: src/nl.c:278 #, fuzzy, c-format msgid "line number overflow" msgstr "nombor tidak sah %s" -#: src/nl.c:486 +#: src/nl.c:478 #, fuzzy, c-format msgid "invalid header numbering style: %s" msgstr "bilangan medan tidak sah: `%s'" -#: src/nl.c:494 +#: src/nl.c:486 #, fuzzy, c-format msgid "invalid body numbering style: %s" msgstr "nombor tidak sah %s" -#: src/nl.c:502 +#: src/nl.c:494 #, fuzzy, c-format msgid "invalid footer numbering style: %s" msgstr "nombor tidak sah %s" -#: src/nl.c:511 +#: src/nl.c:503 #, fuzzy, c-format msgid "invalid starting line number: %s" msgstr "nombor baris permulaan tidak sah `%s'" -#: src/nl.c:517 -#, c-format -msgid "WARNING: --page-increment is deprecated; use --line-increment instead" -msgstr "" - -#: src/nl.c:524 +#: src/nl.c:512 #, fuzzy, c-format msgid "invalid line number increment: %s" msgstr "lebar baris tidak sah: %s" -#: src/nl.c:536 +#: src/nl.c:524 #, fuzzy, c-format msgid "invalid number of blank lines: %s" msgstr "nombor tidak sah %s" -#: src/nl.c:550 +#: src/nl.c:538 #, fuzzy, c-format msgid "invalid line number field width: %s" msgstr "lebar baris tidak sah: %s" -#: src/nl.c:569 +#: src/nl.c:557 #, fuzzy, c-format msgid "invalid line numbering format: %s" msgstr "lebar baris tidak sah: %s" @@ -5771,11 +5839,6 @@ msgstr "menutup output piawai" msgid "ignoring input" msgstr "mengabaikan segala hujah" -#: src/nohup.c:163 src/nohup.c:165 -#, fuzzy, c-format -msgid "failed to open %s" -msgstr "gagal mengekalkan masa bagi %s" - #: src/nohup.c:175 #, fuzzy, c-format msgid "ignoring input and appending output to %s" @@ -5807,33 +5870,367 @@ msgid "failed to redirect standard error" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:32 +#: src/nproc.c:33 msgid "Giuseppe Scrivano" msgstr "" -#: src/nproc.c:56 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 +#: src/nproc.c:57 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Pengunaan: %s [OPSYEN]...\n" -#: src/nproc.c:57 +#: src/nproc.c:58 msgid "" "Print the number of processing units available to the current process,\n" "which may be less than the number of online processors\n" "\n" msgstr "" -#: src/nproc.c:62 +#: src/nproc.c:63 msgid "" " --all print the number of installed processors\n" " --ignore=N if possible, exclude N processing units\n" msgstr "" -#: src/nproc.c:106 +#: src/nproc.c:107 #, fuzzy, c-format 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 +msgid "Assaf Gordon" +msgstr "" + +#: src/numfmt.c:676 +#, c-format +msgid "value too large to be converted: '%s'" +msgstr "" + +#: src/numfmt.c:680 +#, fuzzy, c-format +msgid "invalid number: '%s'" +msgstr "nombor tidak sah %s" + +#: src/numfmt.c:684 +#, c-format +msgid "rejecting suffix in input: '%s' (consider using --from)" +msgstr "" + +#: src/numfmt.c:688 +#, fuzzy, c-format +msgid "invalid suffix in input: '%s'" +msgstr "hujah tidak sah %s bagi %s" + +#: src/numfmt.c:692 +#, c-format +msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)" +msgstr "" + +#: src/numfmt.c:723 +#, fuzzy, c-format +msgid "failed to prepare value '%Lf' for printing" +msgstr "%s: fail terlalu panjang" + +#: src/numfmt.c:787 +#, fuzzy, c-format +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 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [NUMBER]...\n" +msgstr "Penggunaan: %s [OPSYEN]...[FAIL]...\n" + +#: src/numfmt.c:816 +msgid "" +"Reformat NUMBER(s), or the numbers from standard input if none are " +"specified.\n" +msgstr "" + +#: src/numfmt.c:820 +msgid " --debug print warnings about invalid input\n" +msgstr "" + +#: src/numfmt.c:823 +msgid "" +" -d, --delimiter=X use X instead of whitespace for field delimiter\n" +msgstr "" + +#: src/numfmt.c:826 +msgid "" +" --field=N replace the number in input field N (default is 1)\n" +msgstr "" + +#: src/numfmt.c:829 +msgid "" +" --format=FORMAT use printf style floating-point FORMAT;\n" +" see FORMAT below for details\n" +msgstr "" + +#: src/numfmt.c:833 +msgid "" +" --from=UNIT auto-scale input numbers to UNITs; default is " +"'none';\n" +" see UNIT below\n" +msgstr "" + +#: src/numfmt.c:837 +msgid "" +" --from-unit=N specify the input unit size (instead of the default " +"1)\n" +msgstr "" + +#: src/numfmt.c:840 +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 "" + +#: src/numfmt.c:844 +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 +msgid "" +" --invalid=MODE failure mode for invalid numbers: MODE can be:\n" +" abort (default), fail, warn, ignore\n" +msgstr "" + +#: src/numfmt.c:852 +msgid "" +" --padding=N pad the output to N characters; positive N will\n" +" right-align; negative N will left-align;\n" +" padding is ignored if the output is wider than N;\n" +" the default is to automatically pad if a " +"whitespace\n" +" is found\n" +msgstr "" + +#: src/numfmt.c:859 +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 +msgid "" +" --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" +" SUFFIX in input numbers\n" +msgstr "" + +#: src/numfmt.c:867 +msgid "" +" --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" +msgstr "" + +#: src/numfmt.c:870 +msgid "" +" --to-unit=N the output unit size (instead of the default 1)\n" +msgstr "" + +#: src/numfmt.c:877 +msgid "" +"\n" +"UNIT options:\n" +msgstr "" + +#: src/numfmt.c:880 +msgid " none no auto-scaling is done; suffixes will trigger an error\n" +msgstr "" + +#: src/numfmt.c:883 +msgid "" +" auto accept optional single/two letter suffix:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" +msgstr "" + +#: src/numfmt.c:889 +msgid "" +" si accept optional single letter suffix:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:894 +msgid "" +" iec accept optional single letter suffix:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:899 +msgid "" +" iec-i accept optional two-letter suffix:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:905 +#, 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" +msgstr "" + +#: src/numfmt.c:912 +#, c-format +msgid "" +"\n" +"Exit status is 0 if all input numbers were successfully converted.\n" +"By default, %s will stop at the first conversion error with exit status 2.\n" +"With --invalid='fail' a warning is printed for each conversion error\n" +"and the exit status is 2. With --invalid='warn' each conversion error is\n" +"diagnosed, but the exit status is 0. With --invalid='ignore' conversion\n" +"errors are not diagnosed and the exit status is 0.\n" +msgstr "" + +#: src/numfmt.c:921 +#, c-format +msgid "" +"\n" +"Examples:\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" +msgstr "" + +#: src/numfmt.c:974 src/seq.c:212 +#, c-format +msgid "format %s has no %% directive" +msgstr "" + +#: src/numfmt.c:990 +#, fuzzy, c-format +msgid "invalid format %s (width overflow)" +msgstr "format tarikh tidak sah %s" + +#: src/numfmt.c:1007 src/seq.c:229 +#, c-format +msgid "format %s ends in %%" +msgstr "" + +#: src/numfmt.c:1010 +#, c-format +msgid "invalid format %s, directive must be %%['][-][N]f" +msgstr "" + +#: src/numfmt.c:1018 src/seq.c:236 +#, 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 "hujah tidak sah %s bagi %s" + +#: src/numfmt.c:1092 +#, c-format +msgid "value too large to be printed: '%Lg' (consider using --to)" +msgstr "" + +#: src/numfmt.c:1100 +#, c-format +msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" +msgstr "" + +#: src/numfmt.c:1184 +#, c-format +msgid "large input value '%s': possible precision loss" +msgstr "" + +#: src/numfmt.c:1293 +#, 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 "jenis rentetan m tidak sah `%s'" + +#: src/numfmt.c:1401 +#, fuzzy, c-format +msgid "invalid field value '%s'" +msgstr "bilangan medan tidak sah: `%s'" + +#: src/numfmt.c:1430 +#, fuzzy, c-format +msgid "invalid header value '%s'" +msgstr "tarikh tak sah `%s'" + +#: src/numfmt.c:1456 +#, 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 +#, fuzzy, c-format +msgid "no conversion option specified" +msgstr "banyak opsyen -l or -t dinyatakan" + +#: src/numfmt.c:1471 +#, fuzzy, c-format +msgid "grouping cannot be combined with --to" +msgstr "tak boleh gabungkan isyarat dengan -l atau -t" + +#: src/numfmt.c:1473 +#, c-format +msgid "grouping has no effect in this locale" +msgstr "" + +#: src/numfmt.c:1486 +#, c-format +msgid "--header ignored with command-line input" +msgstr "" + +#: src/numfmt.c:1511 +#, fuzzy, c-format +msgid "error reading input" +msgstr "membaca %s" + +#: src/numfmt.c:1520 +#, fuzzy, c-format +msgid "failed to convert some of the input numbers" +msgstr "menutup output piawai" + #: src/od.c:294 #, fuzzy, c-format msgid "" @@ -5856,32 +6253,39 @@ msgid "" msgstr "" #: src/od.c:307 -#, fuzzy -msgid "All arguments to long options are mandatory for short options.\n" +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" +"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" +"at first byte printed, incremented when dump is progressing.\n" +"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 "" -"Hujah mandatori kepada opsyen panjang andalah mandatori bagi opsyen pendek " -"juga.\n" -#: src/od.c:310 +#: src/od.c:318 msgid "" -" -A, --address-radix=RADIX decide how file offsets are printed\n" +" -A, --address-radix=RADIX output format for file offsets. RADIX is one\n" +" of [doxn], for Decimal, Octal, Hex or None\n" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" -#: src/od.c:314 +#: src/od.c:323 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" -" --traditional accept arguments in traditional form\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:324 +#: src/od.c:336 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" @@ -5889,7 +6293,7 @@ msgid "" " -d same as -t u2, select unsigned decimal 2-byte units\n" msgstr "" -#: src/od.c:332 +#: src/od.c:345 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -5899,27 +6303,16 @@ msgid "" " -x same as -t x2, select hexadecimal 2-byte units\n" msgstr "" -#: src/od.c:340 +#: src/od.c:353 msgid "" "\n" -"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" -"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" -"at first byte printed, incremented when dump is progressing.\n" -"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 "" - -#: src/od.c:349 -msgid "" "\n" "TYPE is made up of one or more of these specifications:\n" -"\n" " a named character, ignoring high-order bit\n" " c ASCII character or backslash escape\n" msgstr "" -#: src/od.c:356 +#: src/od.c:360 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -5928,83 +6321,89 @@ msgid "" " x[SIZE] hexadecimal, SIZE bytes per integer\n" msgstr "" -#: src/od.c:363 +#: src/od.c:367 msgid "" "\n" -"SIZE is a number. For TYPE in doux, SIZE may also be C for\n" +"SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" "sizeof(char), S for sizeof(short), I for sizeof(int) or L for\n" "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 "" -#: src/od.c:370 +#: src/od.c:374 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" +"Adding a z suffix to any type displays printable characters at the end of\n" +"each output line.\n" msgstr "" -#: src/od.c:380 +#: src/od.c:379 +#, 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" +"\n" +"\n" +"BYTES is hex with 0x or 0X prefix, and may have a multiplier suffix:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"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" -#: src/od.c:633 src/od.c:753 +#: src/od.c:639 src/od.c:759 #, fuzzy, c-format msgid "invalid type string %s" msgstr "jenis rentetan m tidak sah `%s'" -#: src/od.c:643 +#: src/od.c:649 #, c-format msgid "" "invalid type string %s;\n" "this system doesn't provide a %lu-byte integral type" msgstr "" -#: src/od.c:764 +#: src/od.c:770 #, c-format msgid "" "invalid type string %s;\n" "this system doesn't provide a %lu-byte floating point type" msgstr "" -#: src/od.c:822 +#: src/od.c:828 #, fuzzy, c-format msgid "invalid character '%c' in type string %s" msgstr "aksara tidak sah pada %s pada rentetan mod %s" -#: src/od.c:1047 +#: src/od.c:1053 #, c-format msgid "cannot skip past end of combined input" msgstr "" -#: src/od.c:1603 +#: src/od.c:1609 #, c-format msgid "invalid output address radix '%c'; it must be one character from [doxn]" msgstr "" -#: src/od.c:1729 +#: src/od.c:1735 #, c-format msgid "no type may be specified when dumping strings" msgstr "" -#: src/od.c:1804 +#: src/od.c:1810 msgid "compatibility mode supports at most one file" msgstr "" -#: src/od.c:1825 +#: src/od.c:1831 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "" -#: src/od.c:1868 +#: src/od.c:1874 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "" @@ -6020,20 +6419,22 @@ 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" -"\n" msgstr "" +"\n" +"Dengan tiada FAIL, atau bila FAIL adalah -, baca input piawai.\n" -#: src/paste.c:448 +#: 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 "" -#: src/paste.c:509 +#: src/paste.c:508 #, c-format msgid "delimiter list ends with an unescaped backslash: %s" msgstr "" @@ -6089,80 +6490,80 @@ msgid "Kaveh Ghazi" msgstr "" #. TRANSLATORS: Real name is unknown; at most 19 characters. -#: src/pinky.c:250 +#: src/pinky.c:242 msgid " ???" msgstr "" #. TRANSLATORS: Idle time is unknown; at most 5 characters. -#: src/pinky.c:274 +#: src/pinky.c:266 msgid "?????" msgstr "" -#: src/pinky.c:323 +#: src/pinky.c:314 #, c-format msgid "Login name: " msgstr "" -#: src/pinky.c:326 +#: src/pinky.c:317 #, c-format msgid "In real life: " msgstr "" #. TRANSLATORS: Real name is unknown; no hard limit. -#: src/pinky.c:330 +#: src/pinky.c:321 msgid "???\n" msgstr "" -#: src/pinky.c:350 +#: src/pinky.c:341 #, fuzzy, c-format msgid "Directory: " msgstr "direktori" -#: src/pinky.c:352 +#: src/pinky.c:343 #, c-format msgid "Shell: " msgstr "" -#: src/pinky.c:371 +#: src/pinky.c:362 #, c-format msgid "Project: " msgstr "" -#: src/pinky.c:395 +#: src/pinky.c:386 #, c-format msgid "Plan:\n" msgstr "" -#: src/pinky.c:414 +#: src/pinky.c:405 msgid "Login" msgstr "" -#: src/pinky.c:416 +#: src/pinky.c:407 msgid "Name" msgstr "" -#: src/pinky.c:417 +#: src/pinky.c:408 msgid " TTY" msgstr "" -#: src/pinky.c:419 +#: src/pinky.c:410 msgid "Idle" msgstr "" -#: src/pinky.c:420 +#: src/pinky.c:411 msgid "When" msgstr "" -#: src/pinky.c:423 +#: src/pinky.c:414 msgid "Where" msgstr "" -#: src/pinky.c:502 +#: src/pinky.c:493 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Penggunaan: %s [OPSYEN]...[FAIL]...\n" -#: src/pinky.c:503 +#: src/pinky.c:494 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -6172,7 +6573,7 @@ msgid "" " -s do short format output, this is the default\n" msgstr "" -#: src/pinky.c:511 +#: src/pinky.c:502 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -6181,7 +6582,7 @@ msgid "" " in short format\n" msgstr "" -#: src/pinky.c:520 +#: src/pinky.c:511 #, c-format msgid "" "\n" @@ -6189,7 +6590,7 @@ msgid "" "The utmp file will be %s.\n" msgstr "" -#: src/pinky.c:604 +#: src/pinky.c:595 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "" @@ -6204,83 +6605,81 @@ msgstr "" msgid "Roland Huebner" msgstr "" -#: src/pr.c:912 +#: src/pr.c:908 #, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "" -#: src/pr.c:914 +#: src/pr.c:910 #, fuzzy, c-format msgid "invalid page range %s" msgstr "jenis rentetan m tidak sah `%s'" -#: src/pr.c:979 +#: src/pr.c:975 #, fuzzy, c-format msgid "'-l PAGE_LENGTH' invalid number of lines: %s" msgstr "bilangan baris tidak sah" -#: src/pr.c:1003 +#: src/pr.c:999 #, fuzzy, c-format msgid "'-N NUMBER' invalid starting line number: %s" msgstr "nombor peranti minor tidak sah %s" -#: src/pr.c:1015 +#: src/pr.c:1011 #, fuzzy, c-format msgid "'-o MARGIN' invalid line offset: %s" msgstr "lebar baris tidak sah: %s" -#: src/pr.c:1056 +#: src/pr.c:1052 #, fuzzy, c-format msgid "'-w PAGE_WIDTH' invalid number of characters: %s" msgstr "nombor tidak sah %s" -#: src/pr.c:1070 +#: src/pr.c:1066 #, fuzzy, c-format msgid "'-W PAGE_WIDTH' invalid number of characters: %s" msgstr "nombor tidak sah %s" -#: src/pr.c:1100 +#: src/pr.c:1096 #, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "" -#: src/pr.c:1104 +#: src/pr.c:1100 #, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "" -#: src/pr.c:1200 +#: src/pr.c:1196 #, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "" -#: src/pr.c:1304 +#: src/pr.c:1293 #, c-format msgid "page width too narrow" msgstr "Lebar halaman terlalu sempit" -#: src/pr.c:2369 +#: src/pr.c:2353 #, c-format msgid "starting page number %<PRIuMAX> exceeds page count %<PRIuMAX>" msgstr "" -#: src/pr.c:2396 +#: src/pr.c:2380 #, fuzzy, c-format msgid "page number overflow" msgstr "nombor tidak sah %s" -#: src/pr.c:2401 +#: src/pr.c:2385 #, c-format msgid "Page %<PRIuMAX>" msgstr "" -#: src/pr.c:2773 -msgid "" -"Paginate or columnate FILE(s) for printing.\n" -"\n" +#: src/pr.c:2757 +msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" -#: src/pr.c:2780 +#: src/pr.c:2763 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -6290,7 +6689,7 @@ msgid "" " columns on each page\n" msgstr "" -#: src/pr.c:2788 +#: src/pr.c:2771 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -6300,7 +6699,7 @@ msgid "" " double space the output\n" msgstr "" -#: src/pr.c:2796 +#: src/pr.c:2779 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -6312,7 +6711,7 @@ msgid "" " and trailer without -F)\n" msgstr "" -#: src/pr.c:2806 +#: src/pr.c:2789 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -6325,7 +6724,7 @@ msgid "" " alignment, --sep-string[=STRING] sets separators\n" msgstr "" -#: src/pr.c:2815 +#: src/pr.c:2798 msgid "" " -l, --length=PAGE_LENGTH\n" " set the page length to PAGE_LENGTH (66) lines\n" @@ -6334,7 +6733,7 @@ msgid "" " truncate lines, but join lines of full length with -J\n" msgstr "" -#: src/pr.c:2822 +#: src/pr.c:2805 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -6344,7 +6743,7 @@ msgid "" " page printed (see +FIRST_PAGE)\n" msgstr "" -#: src/pr.c:2830 +#: src/pr.c:2813 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -6353,7 +6752,7 @@ msgid "" " omit warning when a file cannot be opened\n" msgstr "" -#: src/pr.c:2837 +#: src/pr.c:2820 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -6363,7 +6762,7 @@ msgid "" " options (-COLUMN|-a -COLUMN|-m) except -w is set\n" msgstr "" -#: src/pr.c:2844 +#: src/pr.c:2827 msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" @@ -6373,7 +6772,7 @@ msgid "" " -t, --omit-header omit page headers and trailers\n" msgstr "" -#: src/pr.c:2851 +#: src/pr.c:2834 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -6387,7 +6786,7 @@ msgid "" "(72)\n" msgstr "" -#: src/pr.c:2861 +#: src/pr.c:2844 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -6396,7 +6795,7 @@ msgid "" " with -S or -s\n" msgstr "" -#: src/pr.c:2869 +#: src/pr.c:2852 #, fuzzy msgid "" "\n" @@ -6530,17 +6929,16 @@ msgstr "" msgid "" "Output a permuted index, including context, of the words in the input " "files.\n" -"\n" msgstr "" -#: src/ptx.c:1828 +#: src/ptx.c:1827 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:1833 +#: src/ptx.c:1832 msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" " -O, --format=roff generate output as roff directives\n" @@ -6549,7 +6947,7 @@ msgid "" " -T, --format=tex generate output as TeX directives\n" msgstr "" -#: src/ptx.c:1840 +#: src/ptx.c:1839 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -6559,7 +6957,7 @@ msgid "" " -o, --only-file=FILE read only word list from this FILE\n" msgstr "" -#: src/ptx.c:1848 +#: src/ptx.c:1847 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -6567,7 +6965,7 @@ msgid "" "excluded\n" msgstr "" -#: src/ptx.c:1855 +#: src/ptx.c:1854 #, fuzzy msgid "" "\n" @@ -6576,7 +6974,7 @@ msgstr "" "\n" "Dengan tiada FAIL, atau bila FAIL adalah -, baca input piawai.\n" -#: src/ptx.c:1949 +#: src/ptx.c:1948 #, fuzzy, c-format msgid "invalid gap width: %s" msgstr "lebar tidak sah: `%s'" @@ -6598,7 +6996,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "gagal mengekalkan masa bagi %s" -#: src/pwd.c:170 src/pwd.c:277 +#: src/pwd.c:170 src/pwd.c:277 src/split.c:373 #, fuzzy, c-format msgid "failed to stat %s" msgstr "gagal mengekalkan masa bagi %s" @@ -6614,14 +7012,15 @@ msgid "ignoring non-option arguments" msgstr "mengabaikan segala hujah" #. This is a proper name. See the gettext manual, section Names. -#: src/readlink.c:33 +#: src/readlink.c:32 msgid "Dmitry V. Levin" msgstr "" -#: src/readlink.c:62 -#, fuzzy, c-format -msgid "Usage: %s [OPTION]... FILE\n" -msgstr "Penggunaan: %s [OPSYEN]...[FAIL]...\n" +#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147 +#: src/stat.c:1349 src/touch.c:212 +#, c-format +msgid "Usage: %s [OPTION]... FILE...\n" +msgstr "Penggunaan: %s [OPSYEN]... FAIL...\n" #: src/readlink.c:63 msgid "" @@ -6648,17 +7047,18 @@ msgid "" "recursively,\n" " without requirements on components " "existence\n" -" -n, --no-newline do not output the trailing newline\n" +" -n, --no-newline do not output the trailing delimiter\n" " -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" msgstr "" -#: src/realpath.c:71 src/rm.c:134 src/shred.c:147 src/stat.c:1330 -#: src/touch.c:215 -#, c-format -msgid "Usage: %s [OPTION]... FILE...\n" -msgstr "Penggunaan: %s [OPSYEN]... FAIL...\n" +#: src/readlink.c:152 +#, fuzzy, c-format +msgid "ignoring --no-newline with multiple arguments" +msgstr "mengabaikan segala hujah" #: src/realpath.c:72 msgid "" @@ -6685,12 +7085,12 @@ msgstr "" msgid "generating relative path" msgstr "" -#: src/remove.c:286 +#: src/remove.c:273 #, fuzzy, c-format msgid "%s: descend into write-protected directory %s? " msgstr "%s: buang direktori write-protected %s? " -#: src/remove.c:287 +#: src/remove.c:274 #, c-format msgid "%s: descend into directory %s? " msgstr "" @@ -6699,49 +7099,49 @@ msgstr "" #. translate "%s: remove %s (write-protected) %s? " #. instead. It should avoid grammatical problems #. with the output of file_type. -#: src/remove.c:303 +#: src/remove.c:290 #, c-format msgid "%s: remove write-protected %s %s? " msgstr "%s: buang write-protected %s %s? " -#: src/remove.c:304 +#: src/remove.c:291 #, c-format msgid "%s: remove %s %s? " msgstr "%s: buang %s %s? " -#: src/remove.c:417 +#: src/remove.c:374 #, c-format msgid "removed directory: %s\n" msgstr "direktori dibuang: %s\n" -#: src/remove.c:481 +#: src/remove.c:444 #, fuzzy, c-format msgid "cannot remove directory: %s" msgstr "tak dapat membuang direktori %s" -#: src/remove.c:537 +#: src/remove.c:500 #, c-format msgid "skipping %s, since it's on a different device" msgstr "" -#: src/remove.c:557 +#: src/remove.c:520 #, fuzzy, c-format msgid "traversal failed: %s" msgstr "fail biasa" -#: src/remove.c:563 +#: src/remove.c:526 #, c-format msgid "" "unexpected failure: fts_info=%d: %s\n" "please report to %s" msgstr "" -#: src/rm.c:118 +#: src/rm.c:119 #, c-format msgid "Try '%s ./%s' to remove the file %s.\n" msgstr "" -#: src/rm.c:135 +#: src/rm.c:136 msgid "" "Remove (unlink) the FILE(s).\n" "\n" @@ -6750,7 +7150,7 @@ msgid "" " -i prompt before every removal\n" msgstr "" -#: src/rm.c:141 +#: src/rm.c:142 msgid "" " -I prompt once before removing more than three files, " "or\n" @@ -6762,22 +7162,23 @@ msgid "" " always (-i). Without WHEN, prompt always\n" msgstr "" -#: src/rm.c:148 +#: src/rm.c:149 msgid "" " --one-file-system when removing a hierarchy recursively, skip any\n" " directory that is on a file system different from\n" " that of the corresponding command line argument\n" msgstr "" -#: src/rm.c:153 +#: src/rm.c:154 msgid "" " --no-preserve-root do not treat '/' specially\n" " --preserve-root do not remove '/' (default)\n" " -r, -R, --recursive remove directories and their contents recursively\n" +" -d, --dir remove empty directories\n" " -v, --verbose explain what is being done\n" msgstr "" -#: src/rm.c:161 +#: src/rm.c:163 msgid "" "\n" "By default, rm does not remove directories. Use the --recursive (-r or -R)\n" @@ -6785,7 +7186,7 @@ msgid "" "contents.\n" msgstr "" -#: src/rm.c:166 +#: src/rm.c:168 #, c-format msgid "" "\n" @@ -6796,7 +7197,7 @@ msgid "" " %s ./-foo\n" msgstr "" -#: src/rm.c:175 +#: src/rm.c:177 msgid "" "\n" "Note that if you use rm to remove a file, it might be possible to recover\n" @@ -6804,12 +7205,12 @@ msgid "" "assurance that the contents are truly unrecoverable, consider using shred.\n" msgstr "" -#: src/rm.c:335 +#: src/rm.c:342 #, c-format msgid "%s: remove all arguments recursively? " msgstr "" -#: src/rm.c:336 +#: src/rm.c:343 #, fuzzy, c-format msgid "%s: remove all arguments? " msgstr "%s: buang %s %s? " @@ -6868,7 +7269,10 @@ msgstr "" msgid "" "Run a program in a different security context.\n" "With neither CONTEXT nor COMMAND, print the current security context.\n" -"\n" +msgstr "" + +#: src/runcon.c:94 +msgid "" " CONTEXT Complete security context\n" " -c, --compute compute process transition context before modifying\n" " -t, --type=TYPE type (for same role as parent)\n" @@ -6878,72 +7282,72 @@ msgid "" "\n" msgstr "" -#: src/runcon.c:140 +#: src/runcon.c:144 #, c-format msgid "multiple roles" msgstr "" -#: src/runcon.c:145 +#: src/runcon.c:149 #, c-format msgid "multiple types" msgstr "" -#: src/runcon.c:150 +#: src/runcon.c:154 #, c-format msgid "multiple users" msgstr "" -#: src/runcon.c:155 +#: src/runcon.c:159 #, c-format msgid "multiple levelranges" msgstr "" -#: src/runcon.c:173 src/runcon.c:209 +#: src/runcon.c:177 src/runcon.c:213 #, fuzzy, c-format msgid "failed to get current context" msgstr "gagal mendapatkan atribut bagi %s" -#: src/runcon.c:183 +#: src/runcon.c:187 #, c-format msgid "you must specify -c, -t, -u, -l, -r, or context" msgstr "" -#: src/runcon.c:191 +#: src/runcon.c:195 #, fuzzy, c-format msgid "no command specified" msgstr "tiada ID proses dinyatakan" -#: src/runcon.c:197 +#: src/runcon.c:201 #, c-format msgid "%s may be used only on a SELinux kernel" msgstr "" -#: src/runcon.c:223 +#: src/runcon.c:227 #, fuzzy, c-format msgid "failed to compute a new context" msgstr "gagal mengekalkan masa bagi %s" -#: src/runcon.c:237 +#: src/runcon.c:241 #, fuzzy, c-format msgid "failed to set new user %s" msgstr "gagal mengekalkan masa bagi %s" -#: src/runcon.c:239 +#: src/runcon.c:243 #, fuzzy, c-format msgid "failed to set new type %s" msgstr "gagal mengekalkan masa bagi %s" -#: src/runcon.c:241 +#: src/runcon.c:245 #, fuzzy, c-format msgid "failed to set new range %s" msgstr "gagal mengekalkan masa bagi %s" -#: src/runcon.c:243 +#: src/runcon.c:247 #, fuzzy, c-format msgid "failed to set new role %s" msgstr "gagal mengekalkan masa bagi %s" -#: src/runcon.c:251 +#: src/runcon.c:255 #, c-format msgid "unable to set security context %s" msgstr "" @@ -6960,15 +7364,17 @@ msgstr "" " atau: %s [OPSYEN]... --target-directory=DIREKTORI SUMBER...\n" #: src/seq.c:73 +msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" +msgstr "" + +#: src/seq.c:79 msgid "" -"Print numbers from FIRST to LAST, in steps of INCREMENT.\n" -"\n" " -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 "" -#: src/seq.c:82 +#: src/seq.c:86 msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" @@ -6978,39 +7384,24 @@ msgid "" "INCREMENT is usually negative if FIRST is greater than LAST.\n" msgstr "" -#: src/seq.c:90 +#: src/seq.c:94 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:136 +#: src/seq.c:140 #, fuzzy, c-format msgid "invalid floating point argument: %s" msgstr "format tarikh tidak sah %s" -#: src/seq.c:193 -#, c-format -msgid "format %s has no %% directive" -msgstr "" - -#: src/seq.c:210 -#, c-format -msgid "format %s ends in %%" -msgstr "" - -#: src/seq.c:213 +#: src/seq.c:232 #, fuzzy, c-format msgid "format %s has unknown %%%c directive" msgstr "%s mempunyai jenis fail yang tidak diketahui" -#: src/seq.c:217 -#, c-format -msgid "format %s has too many %% directives" -msgstr "" - -#: src/seq.c:431 +#: src/seq.c:555 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" @@ -7042,27 +7433,27 @@ msgid "" " (if specified) supplemental group IDs to GID1, ...\n" msgstr "" -#: src/setuidgid.c:163 +#: src/setuidgid.c:162 #, c-format msgid "unknown user-ID: %s" msgstr "" -#: src/setuidgid.c:174 +#: src/setuidgid.c:173 #, c-format msgid "to use user-ID %s you need to use -g too" msgstr "" -#: src/setuidgid.c:191 +#: src/setuidgid.c:190 #, fuzzy, c-format msgid "failed to set supplemental group(s)" msgstr "tak dapat perolehi senarai kumpulan tambahan" -#: src/setuidgid.c:201 +#: src/setuidgid.c:200 #, fuzzy, c-format msgid "cannot set group-ID to %lu" msgstr "tak dapat menukar ke kumpulan null" -#: src/setuidgid.c:205 +#: src/setuidgid.c:204 #, fuzzy, c-format msgid "cannot set user-ID to %lu" msgstr "tak dapat stat %s" @@ -7076,10 +7467,9 @@ msgstr "" 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" -"\n" msgstr "" -#: src/shred.c:156 +#: src/shred.c:155 #, fuzzy, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -7091,7 +7481,7 @@ 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:162 +#: src/shred.c:161 msgid "" " -u, --remove truncate and remove file after overwriting\n" " -v, --verbose show progress\n" @@ -7100,7 +7490,7 @@ msgid "" " -z, --zero add a final overwrite with zeros to hide shredding\n" msgstr "" -#: src/shred.c:171 +#: src/shred.c:170 msgid "" "\n" "If FILE is -, shred standard output.\n" @@ -7112,7 +7502,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:181 +#: src/shred.c:180 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" @@ -7123,7 +7513,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:189 +#: src/shred.c:188 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -7135,7 +7525,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:199 +#: src/shred.c:198 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -7144,7 +7534,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:206 +#: src/shred.c:205 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" @@ -7156,129 +7546,129 @@ msgid "" "\n" msgstr "" -#: src/shred.c:216 +#: src/shred.c:215 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:296 +#: src/shred.c:295 #, fuzzy, c-format msgid "%s: fdatasync failed" msgstr "fail istimewa blok" -#: src/shred.c:307 +#: src/shred.c:306 #, fuzzy, c-format msgid "%s: fsync failed" msgstr "fail istimewa blok" -#: src/shred.c:384 +#: src/shred.c:383 #, c-format msgid "%s: cannot rewind" msgstr "" -#: src/shred.c:403 +#: src/shred.c:402 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "" -#: src/shred.c:453 +#: src/shred.c:452 #, c-format msgid "%s: error writing at offset %s" msgstr "" -#: src/shred.c:471 +#: src/shred.c:470 #, fuzzy, c-format msgid "%s: lseek failed" msgstr "fail istimewa blok" -#: src/shred.c:482 +#: src/shred.c:481 #, c-format msgid "%s: file too large" msgstr "" -#: src/shred.c:505 +#: src/shred.c:504 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "" -#: src/shred.c:521 +#: src/shred.c:520 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "" -#: src/shred.c:768 +#: src/shred.c:767 #, fuzzy, c-format msgid "%s: fstat failed" msgstr "stat gagal" -#: src/shred.c:779 +#: src/shred.c:778 #, c-format msgid "%s: invalid file type" msgstr "%s: jenis fail tidak sah" -#: src/shred.c:798 +#: src/shred.c:797 #, c-format msgid "%s: file has negative size" msgstr "%s: fail mempunya saiz negatif" -#: src/shred.c:865 +#: src/shred.c:864 src/sort.c:932 src/split.c:378 #, c-format msgid "%s: error truncating" msgstr "" -#: src/shred.c:881 +#: src/shred.c:880 #, fuzzy, c-format msgid "%s: fcntl failed" msgstr "fail istimewa blok" -#: src/shred.c:886 +#: src/shred.c:885 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "" -#: src/shred.c:968 +#: src/shred.c:967 #, c-format msgid "%s: removing" msgstr "%s: membuang" -#: src/shred.c:992 +#: src/shred.c:991 #, c-format msgid "%s: renamed to %s" msgstr "%s: ditukarnama ke %s" -#: src/shred.c:1014 +#: src/shred.c:1013 #, fuzzy, c-format msgid "%s: failed to remove" msgstr "%s: tak dapat buang" -#: src/shred.c:1018 +#: src/shred.c:1017 #, c-format msgid "%s: removed" msgstr "%s: dibuang" -#: src/shred.c:1025 src/shred.c:1068 +#: src/shred.c:1024 src/shred.c:1067 #, fuzzy, c-format msgid "%s: failed to close" msgstr "%s: fail terlalu panjang" -#: src/shred.c:1061 +#: src/shred.c:1060 #, fuzzy, c-format msgid "%s: failed to open for writing" msgstr "%s: fail terlalu panjang" -#: src/shred.c:1126 +#: src/shred.c:1125 #, c-format msgid "%s: invalid number of passes" msgstr "" -#: src/shred.c:1135 src/shuf.c:291 src/sort.c:4387 +#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441 #, fuzzy, c-format msgid "multiple random sources specified" msgstr "banyak opsyen -l or -t dinyatakan" -#: src/shred.c:1149 +#: src/shred.c:1148 #, c-format msgid "%s: invalid file size" msgstr "%s: fail saiz tidak sah" @@ -7296,14 +7686,12 @@ msgstr "" #: src/shuf.c:54 #, fuzzy -msgid "" -"Write a random permutation of the input lines to standard output.\n" -"\n" +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:61 +#: src/shuf.c:60 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 " @@ -7314,27 +7702,27 @@ msgid "" " -z, --zero-terminated end lines with 0 byte, not newline\n" msgstr "" -#: src/shuf.c:245 +#: src/shuf.c:244 #, fuzzy, c-format msgid "multiple -i options specified" msgstr "banyak opsyen -l or -t dinyatakan" -#: src/shuf.c:265 +#: src/shuf.c:264 #, fuzzy, c-format msgid "invalid input range %s" msgstr "nombor tidak sah %s" -#: src/shuf.c:278 +#: src/shuf.c:277 #, fuzzy, c-format msgid "invalid line count %s" msgstr "lebar baris tidak sah: %s" -#: src/shuf.c:285 src/sort.c:4381 +#: src/shuf.c:284 src/sort.c:4435 #, fuzzy, c-format msgid "multiple output files specified" msgstr "banyak opsyen -l or -t dinyatakan" -#: src/shuf.c:311 +#: src/shuf.c:310 #, fuzzy, c-format msgid "cannot combine -e and -i options" msgstr "tak boleh gabungkan isyarat dengan -l atau -t" @@ -7353,7 +7741,7 @@ msgid "" "\n" msgstr "" -#: src/sleep.c:135 src/timeout.c:295 +#: src/sleep.c:135 src/timeout.c:320 #, fuzzy, c-format msgid "invalid time interval %s" msgstr "format gaya tarikh tidak sah %s" @@ -7363,22 +7751,20 @@ msgstr "format gaya tarikh tidak sah %s" msgid "cannot read realtime clock" msgstr "tak boleh mencipta pautan %s" -#: src/sort.c:395 +#: src/sort.c:399 #, fuzzy -msgid "" -"Write sorted concatenation of all FILE(s) to standard output.\n" -"\n" +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:402 +#: src/sort.c:405 msgid "" "Ordering options:\n" "\n" msgstr "" -#: src/sort.c:406 +#: src/sort.c:409 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -7386,19 +7772,19 @@ msgid "" " -f, --ignore-case fold lower case to upper case characters\n" msgstr "" -#: src/sort.c:412 +#: src/sort.c:415 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:417 +#: src/sort.c:420 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" -#: src/sort.c:420 +#: src/sort.c:423 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -7406,7 +7792,7 @@ msgid "" " -r, --reverse reverse the result of comparisons\n" msgstr "" -#: src/sort.c:426 +#: src/sort.c:429 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -7416,19 +7802,19 @@ msgid "" "\n" msgstr "" -#: src/sort.c:434 +#: src/sort.c:437 msgid "" "Other options:\n" "\n" msgstr "" -#: src/sort.c:438 +#: src/sort.c:441 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" msgstr "" -#: src/sort.c:442 +#: src/sort.c:445 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 " @@ -7437,7 +7823,7 @@ msgid "" " decompress them with PROG -d\n" msgstr "" -#: src/sort.c:449 +#: src/sort.c:452 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -7446,13 +7832,13 @@ msgid "" " If F is - then read names from standard input\n" msgstr "" -#: src/sort.c:456 +#: src/sort.c:459 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:460 +#: src/sort.c:463 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -7460,7 +7846,7 @@ msgid "" " -S, --buffer-size=SIZE use SIZE for main memory buffer\n" msgstr "" -#: src/sort.c:466 +#: src/sort.c:469 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -7475,11 +7861,11 @@ msgid "" "run\n" msgstr "" -#: src/sort.c:475 +#: src/sort.c:478 msgid " -z, --zero-terminated end lines with 0 byte, not newline\n" msgstr "" -#: src/sort.c:480 +#: src/sort.c:483 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -7498,7 +7884,7 @@ msgid "" "SIZE may be followed by the following multiplicative suffixes:\n" msgstr "" -#: src/sort.c:493 +#: src/sort.c:496 msgid "" "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n" "\n" @@ -7510,272 +7896,276 @@ msgid "" "native byte values.\n" msgstr "" -#: src/sort.c:694 +#: src/sort.c:697 #, fuzzy, c-format msgid "waiting for %s [-d]" msgstr "Menulis ke %s." -#: src/sort.c:699 +#: src/sort.c:702 #, c-format msgid "%s [-d] terminated abnormally" msgstr "" -#: src/sort.c:853 +#: src/sort.c:856 #, fuzzy, c-format msgid "cannot create temporary file in %s" msgstr "tak dapat memcipta fail biasa %s" -#: src/sort.c:939 src/sort.c:2010 src/sort.c:3056 src/sort.c:3755 -#: src/sort.c:3758 +#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713 +#: src/sort.c:3804 src/sort.c:3807 msgid "open failed" msgstr "pembukaan gagal" -#: src/sort.c:959 +#: src/sort.c:970 #, fuzzy msgid "fflush failed" msgstr "fail istimewa blok" -#: src/sort.c:964 src/sort.c:2013 src/sort.c:4646 +#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706 #, fuzzy msgid "close failed" msgstr "fail istimewa blok" -#: src/sort.c:973 +#: src/sort.c:986 #, fuzzy, c-format msgid "dup2 failed" msgstr "pembukaan gagal" -#: src/sort.c:1090 +#: src/sort.c:1103 #, c-format msgid "couldn't execute %s" msgstr "" -#: src/sort.c:1097 +#: src/sort.c:1110 #, fuzzy msgid "couldn't create temporary file" msgstr "tak dapat memcipta fail biasa %s" -#: src/sort.c:1136 +#: src/sort.c:1149 #, fuzzy, c-format msgid "couldn't create process for %s -d" msgstr "tak dapat mencipta direktori %s" -#: src/sort.c:1150 +#: src/sort.c:1161 #, c-format msgid "couldn't execute %s -d" msgstr "" -#: src/sort.c:1209 +#: src/sort.c:1220 #, fuzzy, c-format msgid "warning: cannot remove: %s" msgstr "tak dapat membuang %s" -#: src/sort.c:1295 +#: src/sort.c:1306 #, fuzzy, c-format msgid "invalid --%s argument %s" msgstr "hujah tidak sah %s bagi %s" -#: src/sort.c:1298 +#: src/sort.c:1309 #, fuzzy, c-format msgid "minimum --%s argument is %s" msgstr "hujah ambiguous %s bagi %s" -#: src/sort.c:1313 +#: src/sort.c:1324 #, fuzzy, c-format msgid "--%s argument %s too large" msgstr "%s adalah terlalu besar" -#: src/sort.c:1316 +#: src/sort.c:1327 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "" -#: src/sort.c:1398 +#: src/sort.c:1409 #, c-format msgid "number in parallel must be nonzero" msgstr "" -#: src/sort.c:1479 +#: src/sort.c:1494 msgid "stat failed" msgstr "stat gagal" -#: src/sort.c:1740 +#: src/sort.c:1755 #, fuzzy msgid "read failed" msgstr "fail biasa" -#: src/sort.c:2028 +#: src/sort.c:2043 #, fuzzy, c-format msgid "string transformation failed" msgstr "perbandingan rentetan gagal" -#: src/sort.c:2031 +#: src/sort.c:2046 #, c-format msgid "the untransformed string was %s" msgstr "" -#: src/sort.c:2194 +#: src/sort.c:2209 #, c-format msgid "^ no match for key\n" msgstr "" -#: src/sort.c:2374 +#: src/sort.c:2389 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "" -#: src/sort.c:2380 +#: src/sort.c:2395 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "" -#: src/sort.c:2391 +#: src/sort.c:2406 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" -#: src/sort.c:2404 +#: src/sort.c:2419 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "" -#: src/sort.c:2436 +#: src/sort.c:2451 #, 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" -#: src/sort.c:2442 +#: src/sort.c:2457 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "" -#: src/sort.c:2716 src/sort.c:2725 +#: src/sort.c:2731 src/sort.c:2740 #, fuzzy msgid "write failed" msgstr "fail pelik" -#: src/sort.c:2768 +#: src/sort.c:2783 #, c-format msgid "%s: %s:%s: disorder: " msgstr "" -#: src/sort.c:2771 +#: src/sort.c:2786 #, fuzzy msgid "standard error" msgstr "output standard" -#: src/sort.c:3926 +#: src/sort.c:3698 +#, fuzzy +msgid "cannot read" +msgstr "tak dapat menetapkan tarikh" + +#: src/sort.c:3976 #, fuzzy, c-format msgid "%s: invalid field specification %s" msgstr "%s: fail saiz tidak sah" -#: src/sort.c:3937 +#: src/sort.c:3987 #, fuzzy, c-format msgid "options '-%s' are incompatible" msgstr "%s: opsyen `%s' adalah ambiguous\n" -#: src/sort.c:3988 +#: src/sort.c:4038 #, fuzzy, c-format msgid "%s: invalid count at start of %s" msgstr "hujah tidak sah %s bagi %s" -#: src/sort.c:4245 +#: src/sort.c:4295 #, fuzzy msgid "invalid number after '-'" msgstr "nombor tidak sah %s" -#: src/sort.c:4248 src/sort.c:4334 src/sort.c:4362 +#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416 #, fuzzy msgid "invalid number after '.'" msgstr "nombor tidak sah %s" -#: src/sort.c:4261 src/sort.c:4367 +#: src/sort.c:4315 src/sort.c:4421 #, fuzzy msgid "stray character in field spec" msgstr "fail istimewa aksara" -#: src/sort.c:4308 +#: src/sort.c:4362 #, fuzzy, c-format msgid "multiple compress programs specified" msgstr "banyak opsyen -l or -t dinyatakan" -#: src/sort.c:4325 +#: src/sort.c:4379 #, fuzzy msgid "invalid number at field start" msgstr "nombor tidak sah %s" -#: src/sort.c:4329 src/sort.c:4357 +#: src/sort.c:4383 src/sort.c:4411 #, fuzzy msgid "field number is zero" msgstr "nombor tidak sah %s" -#: src/sort.c:4338 +#: src/sort.c:4392 #, fuzzy msgid "character offset is zero" msgstr "fail istimewa aksara" -#: src/sort.c:4353 +#: src/sort.c:4407 #, fuzzy msgid "invalid number after ','" msgstr "nombor tidak sah %s" -#: src/sort.c:4403 +#: src/sort.c:4457 #, c-format msgid "empty tab" msgstr "" -#: src/sort.c:4496 src/wc.c:692 +#: src/sort.c:4550 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:4518 +#: src/sort.c:4572 #, fuzzy, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s: jenis fail tidak sah" -#: src/sort.c:4524 +#: src/sort.c:4578 #, fuzzy, c-format msgid "no input from %s" msgstr "menutup fail input %s" -#: src/sort.c:4570 +#: src/sort.c:4624 #, c-format msgid "using %s sorting rules" msgstr "" -#: src/sort.c:4573 +#: src/sort.c:4627 #, c-format msgid "using simple byte comparison" msgstr "" -#: src/sort.c:4604 +#: src/sort.c:4658 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "" -#: src/split.c:184 +#: src/split.c:187 #, c-format msgid "the suffix length needs to be at least %zu" msgstr "" -#: src/split.c:201 +#: src/split.c:204 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" msgstr "Penggunaan: %s [OPSYEN]...[FAIL]...\n" -#: src/split.c:205 +#: src/split.c:208 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" -"\n" msgstr "" -#: src/split.c:214 +#: src/split.c:216 #, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" @@ -7794,13 +8184,13 @@ msgid "" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" -#: src/split.c:227 +#: src/split.c:229 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" msgstr "" -#: src/split.c:234 +#: src/split.c:236 msgid "" "\n" "CHUNKS may be:\n" @@ -7812,184 +8202,189 @@ msgid "" "r/K/N likewise but only output Kth of N to stdout\n" msgstr "" -#: src/split.c:352 +#: src/split.c:354 #, c-format msgid "output file suffixes exhausted" msgstr "" -#: src/split.c:364 +#: src/split.c:366 #, fuzzy, c-format msgid "creating file %s\n" msgstr "mencipta %s" -#: src/split.c:377 +#: src/split.c:375 +#, c-format +msgid "%s would overwrite input; aborting" +msgstr "" + +#: src/split.c:391 #, fuzzy, c-format msgid "failed to set FILE environment variable" -msgstr "gagal mengekalkan masa bagi %s" +msgstr "nilai pembolehubah persekitaran LS_COLORS tidak boleh dihantar" -#: src/split.c:379 +#: src/split.c:393 #, c-format msgid "executing with FILE=%s\n" msgstr "" -#: src/split.c:381 +#: src/split.c:395 #, fuzzy, c-format msgid "failed to create pipe" -msgstr "tak dapat mencipta pautan keras %s ke %s" +msgstr "gagal mengekalkan masa bagi %s" -#: src/split.c:395 +#: src/split.c:409 #, fuzzy, c-format msgid "closing prior pipe" -msgstr "mencipta direktori %s" +msgstr "menutup fail input %s" -#: src/split.c:397 +#: src/split.c:411 #, fuzzy, c-format msgid "closing output pipe" msgstr "menutup fail output %s" -#: src/split.c:401 +#: src/split.c:415 #, fuzzy, c-format msgid "moving input pipe" msgstr "menutup fail input %s" -#: src/split.c:403 +#: src/split.c:417 #, fuzzy, c-format msgid "closing input pipe" msgstr "menutup fail input %s" -#: src/split.c:408 +#: src/split.c:422 #, fuzzy, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "takboleh nyahpaut %s" -#: src/split.c:414 +#: src/split.c:428 #, fuzzy, c-format msgid "failed to close input pipe" -msgstr "%s: fail terlalu panjang" +msgstr "gagal mengekalkan masa bagi %s" -#: src/split.c:450 -#, fuzzy, c-format +#: src/split.c:464 +#, c-format msgid "waiting for child process" -msgstr "Menulis ke %s." +msgstr "" -#: src/split.c:460 +#: src/split.c:474 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "" -#: src/split.c:468 +#: src/split.c:482 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:475 src/timeout.c:449 +#: src/split.c:489 src/timeout.c:494 #, c-format msgid "unknown status from command (0x%X)" msgstr "" -#: src/split.c:1037 +#: src/split.c:1052 #, fuzzy, c-format msgid "cannot split in more than one way" msgstr "tak boleh nyatakan masa lebih daripada satu sumber" -#: src/split.c:1050 src/split.c:1192 src/split.c:1363 +#: src/split.c:1065 src/split.c:1205 src/split.c:1376 #, fuzzy, c-format msgid "%s: invalid number of chunks" msgstr "nombor tidak sah %s" -#: src/split.c:1054 +#: src/split.c:1069 #, fuzzy, c-format msgid "%s: invalid chunk number" msgstr "%s: nombor tidak sah" -#: src/split.c:1106 +#: src/split.c:1119 #, fuzzy, c-format msgid "%s: invalid suffix length" msgstr "%s: fail saiz tidak sah" -#: src/split.c:1131 src/split.c:1139 src/split.c:1162 src/split.c:1167 +#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180 #, fuzzy, c-format msgid "%s: invalid number of bytes" msgstr "nombor tidak sah %s" -#: src/split.c:1150 src/split.c:1297 +#: src/split.c:1163 src/split.c:1310 #, fuzzy, c-format msgid "%s: invalid number of lines" msgstr "nombor tidak sah %s" -#: src/split.c:1223 +#: src/split.c:1236 #, c-format msgid "line count option -%s%c... is too large" msgstr "" -#: src/split.c:1235 +#: src/split.c:1248 #, fuzzy, c-format msgid "%s: invalid start value for numerical suffix" msgstr "nombor baris permulaan tidak sah `%s'" -#: src/split.c:1263 +#: src/split.c:1276 #, fuzzy, c-format msgid "%s: invalid IO block size" msgstr "%s: fail saiz tidak sah" -#: src/split.c:1284 +#: src/split.c:1297 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1321 +#: src/split.c:1334 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1356 +#: src/split.c:1369 #, 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:169 +#: src/stat.c:173 msgid "Michael Meskes" msgstr "" -#: src/stat.c:838 +#: src/stat.c:857 #, fuzzy, c-format msgid "failed to canonicalize %s" msgstr "gagal mengekalkan masa bagi %s" -#: src/stat.c:1050 +#: src/stat.c:1069 #, fuzzy, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "%s: opensyen tidak dikenali `%c%s'\n" -#: src/stat.c:1105 +#: src/stat.c:1124 #, fuzzy, c-format msgid "%s: invalid directive" msgstr "%s: fail saiz tidak sah" -#: src/stat.c:1151 +#: src/stat.c:1170 #, fuzzy, c-format msgid "warning: backslash at end of format" msgstr "aksara tidak sah pada %s pada rentetan mod %s" -#: src/stat.c:1182 +#: src/stat.c:1201 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" -#: src/stat.c:1189 +#: src/stat.c:1208 #, c-format msgid "cannot read file system information for %s" msgstr "tak dapat membaca maklumat sistem fail bagi %s" -#: src/stat.c:1209 +#: src/stat.c:1228 #, 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:1245 +#: src/stat.c:1264 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -8000,7 +8395,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1268 +#: src/stat.c:1287 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -8008,30 +8403,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1278 +#: src/stat.c:1297 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:1286 +#: src/stat.c:1305 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:1295 +#: src/stat.c:1314 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:1305 +#: src/stat.c:1324 #, c-format msgid "Context: %C\n" msgstr "" -#: src/stat.c:1313 +#: src/stat.c:1332 msgid "" "Access: %x\n" "Modify: %y\n" @@ -8039,15 +8434,17 @@ msgid "" " Birth: %w\n" msgstr "" -#: src/stat.c:1331 +#: src/stat.c:1350 +msgid "Display file or file system status.\n" +msgstr "" + +#: src/stat.c:1356 msgid "" -"Display file or file system status.\n" -"\n" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" -#: src/stat.c:1337 +#: src/stat.c:1360 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -8057,7 +8454,7 @@ msgid "" " -t, --terse print the information in terse form\n" msgstr "" -#: src/stat.c:1348 +#: src/stat.c:1371 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -8069,7 +8466,7 @@ msgid "" " %C SELinux security context string\n" msgstr "" -#: src/stat.c:1357 +#: src/stat.c:1380 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -8079,7 +8476,7 @@ msgid "" " %G group name of owner\n" msgstr "" -#: src/stat.c:1365 +#: src/stat.c:1388 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -8092,7 +8489,7 @@ msgid "" " %T minor device type in hex\n" msgstr "" -#: src/stat.c:1376 +#: src/stat.c:1399 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -8107,7 +8504,7 @@ msgid "" "\n" msgstr "" -#: src/stat.c:1390 +#: src/stat.c:1413 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -8118,7 +8515,7 @@ msgid "" " %f free blocks in file system\n" msgstr "" -#: src/stat.c:1399 +#: src/stat.c:1422 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -8137,30 +8534,29 @@ msgstr "Pengunaan: %s [OPSYEN]...\n" #: src/stdbuf.c:91 msgid "" "Run COMMAND, with modified buffering operations for its standard streams.\n" -"\n" msgstr "" -#: src/stdbuf.c:98 +#: src/stdbuf.c:97 msgid "" " -i, --input=MODE adjust standard input stream buffering\n" " -o, --output=MODE adjust standard output stream buffering\n" " -e, --error=MODE adjust standard error stream buffering\n" msgstr "" -#: src/stdbuf.c:105 +#: src/stdbuf.c:104 msgid "" "\n" "If MODE is 'L' the corresponding stream will be line buffered.\n" "This option is invalid with standard input.\n" msgstr "" -#: src/stdbuf.c:108 +#: src/stdbuf.c:107 msgid "" "\n" "If MODE is '0' the corresponding stream will be unbuffered.\n" msgstr "" -#: src/stdbuf.c:111 +#: src/stdbuf.c:110 msgid "" "\n" "Otherwise MODE is a number which may be followed by one of the following:\n" @@ -8170,7 +8566,7 @@ msgid "" "size set to MODE bytes.\n" msgstr "" -#: src/stdbuf.c:117 +#: src/stdbuf.c:116 msgid "" "\n" "NOTE: If COMMAND adjusts the buffering of its standard streams ('tee' does\n" @@ -8180,22 +8576,22 @@ msgid "" "and are thus unaffected by 'stdbuf' settings.\n" msgstr "" -#: src/stdbuf.c:227 +#: src/stdbuf.c:226 #, fuzzy, c-format msgid "failed to find %s" msgstr "gagal mengekalkan masa bagi %s" -#: src/stdbuf.c:247 src/stdbuf.c:279 +#: src/stdbuf.c:246 src/stdbuf.c:278 #, c-format msgid "failed to update the environment with %s" msgstr "" -#: src/stdbuf.c:321 +#: src/stdbuf.c:320 #, c-format msgid "line buffering stdin is meaningless" msgstr "" -#: src/stty.c:509 +#: src/stty.c:513 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -8203,23 +8599,25 @@ msgid "" " or: %s [-F DEVICE | --file=DEVICE] [-g|--save]\n" msgstr "" -#: src/stty.c:515 +#: src/stty.c:519 +msgid "Print or change terminal characteristics.\n" +msgstr "" + +#: src/stty.c:525 msgid "" -"Print or change terminal characteristics.\n" -"\n" " -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:524 +#: src/stty.c:532 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:529 +#: src/stty.c:537 msgid "" "\n" "Special characters:\n" @@ -8228,7 +8626,7 @@ msgid "" " eol CHAR CHAR will end the line\n" msgstr "" -#: src/stty.c:536 +#: src/stty.c:544 msgid "" " * eol2 CHAR alternate CHAR for ending the line\n" " erase CHAR CHAR will erase the last character typed\n" @@ -8236,7 +8634,7 @@ msgid "" " kill CHAR CHAR will erase the current line\n" msgstr "" -#: src/stty.c:542 +#: src/stty.c:550 msgid "" " * lnext CHAR CHAR will enter the next character quoted\n" " quit CHAR CHAR will send a quit signal\n" @@ -8244,7 +8642,7 @@ msgid "" " start CHAR CHAR will restart the output after stopping it\n" msgstr "" -#: src/stty.c:548 +#: src/stty.c:556 msgid "" " stop CHAR CHAR will stop the output\n" " susp CHAR CHAR will send a terminal stop signal\n" @@ -8252,7 +8650,7 @@ msgid "" " * werase CHAR CHAR will erase the last word typed\n" msgstr "" -#: src/stty.c:554 +#: src/stty.c:562 msgid "" "\n" "Special settings:\n" @@ -8261,7 +8659,7 @@ msgid "" " * columns N same as cols N\n" msgstr "" -#: src/stty.c:561 +#: src/stty.c:569 msgid "" " ispeed N set the input speed to N\n" " * line N use line discipline N\n" @@ -8270,7 +8668,7 @@ msgid "" " ospeed N set the output speed to N\n" msgstr "" -#: src/stty.c:567 +#: src/stty.c:575 msgid "" " * rows N tell the kernel that the terminal has N rows\n" " * size print the number of rows and columns according to the " @@ -8279,27 +8677,28 @@ msgid "" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" -#: src/stty.c:573 +#: src/stty.c:581 msgid "" "\n" "Control settings:\n" " [-]clocal disable modem control signals\n" " [-]cread allow input to be received\n" " * [-]crtscts enable RTS/CTS handshaking\n" +" * [-]cdtrdsr enable DTR/DSR handshaking\n" " csN set character size to N bits, N in [5..8]\n" msgstr "" -#: src/stty.c:581 +#: src/stty.c:590 msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" " [-]hupcl same as [-]hup\n" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" -" [-]parodd set odd parity (even with '-')\n" +" [-]parodd set odd parity (or even parity with '-')\n" msgstr "" -#: src/stty.c:588 +#: src/stty.c:597 msgid "" "\n" "Input settings:\n" @@ -8309,7 +8708,7 @@ msgid "" " [-]igncr ignore carriage return\n" msgstr "" -#: src/stty.c:596 +#: src/stty.c:605 msgid "" " [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" @@ -8318,11 +8717,11 @@ msgid "" " [-]istrip clear high (8th) bit of input characters\n" msgstr "" -#: src/stty.c:603 +#: src/stty.c:612 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr "" -#: src/stty.c:606 +#: src/stty.c:615 msgid "" " * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" @@ -8332,7 +8731,7 @@ msgid "" " [-]tandem same as [-]ixoff\n" msgstr "" -#: src/stty.c:614 +#: src/stty.c:623 msgid "" "\n" "Output settings:\n" @@ -8342,7 +8741,7 @@ msgid "" " * nlN newline delay style, N in [0..1]\n" msgstr "" -#: src/stty.c:622 +#: src/stty.c:631 msgid "" " * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of null characters\n" @@ -8352,7 +8751,7 @@ msgid "" " * [-]onlret newline performs a carriage return\n" msgstr "" -#: src/stty.c:630 +#: src/stty.c:639 msgid "" " * [-]onocr do not print carriage returns in the first column\n" " [-]opost postprocess output\n" @@ -8362,7 +8761,7 @@ msgid "" " * vtN vertical tab delay style, N in [0..1]\n" msgstr "" -#: src/stty.c:638 +#: src/stty.c:647 msgid "" "\n" "Local settings:\n" @@ -8371,7 +8770,7 @@ msgid "" " * -crtkill kill all line by obeying the echoctl and echok settings\n" msgstr "" -#: src/stty.c:645 +#: src/stty.c:654 msgid "" " * [-]ctlecho echo control characters in hat notation ('^c')\n" " [-]echo echo input characters\n" @@ -8380,7 +8779,7 @@ msgid "" " [-]echok echo a newline after a kill character\n" msgstr "" -#: src/stty.c:652 +#: src/stty.c:661 msgid "" " * [-]echoke same as [-]crtkill\n" " [-]echonl echo newline even if not echoing other characters\n" @@ -8389,7 +8788,7 @@ msgid "" " [-]iexten enable non-POSIX special characters\n" msgstr "" -#: src/stty.c:659 +#: src/stty.c:668 msgid "" " [-]isig enable interrupt, quit, and suspend special characters\n" " [-]noflsh disable flushing after interrupt and quit special " @@ -8399,7 +8798,7 @@ msgid "" " * [-]xcase with icanon, escape with '\\' for uppercase characters\n" msgstr "" -#: src/stty.c:666 +#: src/stty.c:675 msgid "" "\n" "Combination settings:\n" @@ -8408,7 +8807,7 @@ msgid "" " -cbreak same as icanon\n" msgstr "" -#: src/stty.c:673 +#: src/stty.c:682 msgid "" " cooked same as brkint ignpar istrip icrnl ixon opost isig\n" " icanon, eof and eol characters to their default values\n" @@ -8416,7 +8815,7 @@ msgid "" " crt same as echoe echoctl echoke\n" msgstr "" -#: src/stty.c:679 +#: src/stty.c:688 msgid "" " dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" " kill ^u\n" @@ -8425,7 +8824,7 @@ msgid "" " evenp same as parenb -parodd cs7\n" msgstr "" -#: src/stty.c:686 +#: src/stty.c:695 msgid "" " -evenp same as -parenb cs8\n" " * [-]lcase same as xcase iuclc olcuc\n" @@ -8435,7 +8834,7 @@ msgid "" " -nl same as icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" msgstr "" -#: src/stty.c:694 +#: src/stty.c:703 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -8444,7 +8843,7 @@ msgid "" " -pass8 same as parenb istrip cs7\n" msgstr "" -#: src/stty.c:701 +#: src/stty.c:710 msgid "" " raw same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" " -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n" @@ -8452,7 +8851,7 @@ msgid "" " -raw same as cooked\n" msgstr "" -#: src/stty.c:707 +#: src/stty.c:716 msgid "" " sane same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" " -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n" @@ -8462,7 +8861,7 @@ msgid "" " characters to their default values\n" msgstr "" -#: src/stty.c:715 +#: src/stty.c:724 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -8471,126 +8870,59 @@ msgid "" "127; special values ^- or undef used to disable special characters.\n" msgstr "" -#: src/stty.c:787 +#: src/stty.c:796 #, c-format msgid "only one device may be specified" msgstr "" -#: src/stty.c:817 +#: src/stty.c:826 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" "mutually exclusive" msgstr "" -#: src/stty.c:823 +#: src/stty.c:832 #, 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:838 +#: src/stty.c:847 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "" -#: src/stty.c:883 src/stty.c:993 +#: src/stty.c:892 src/stty.c:1002 #, fuzzy, c-format msgid "invalid argument %s" msgstr "hujah tidak sah %s bagi %s" -#: src/stty.c:894 src/stty.c:911 src/stty.c:923 src/stty.c:936 src/stty.c:948 -#: src/stty.c:968 +#: 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 msgid "missing argument to %s" msgstr "kehilangan hujah fail" -#: src/stty.c:974 +#: src/stty.c:983 #, fuzzy, c-format msgid "invalid line discipline %s" msgstr "lebar baris tidak sah: %s" -#: src/stty.c:1044 +#: src/stty.c:1053 #, c-format msgid "%s: unable to perform all requested operations" msgstr "" -#: src/stty.c:1390 +#: src/stty.c:1399 #, c-format msgid "%s: no size information for this device" msgstr "%s: tiada maklumat saiz bagi peranti ini" -#: src/stty.c:1904 +#: src/stty.c:1920 #, fuzzy, c-format msgid "invalid integer argument %s" msgstr "hujah tidak sah %s bagi %s" -#: src/su.c:229 -msgid "Password:" -msgstr "Katalaluan:" - -#: src/su.c:232 -#, fuzzy, c-format -msgid "getpass: cannot open /dev/tty" -msgstr "tak dapat membuka direktori %s" - -#: src/su.c:290 -#, fuzzy, c-format -msgid "cannot set groups" -msgstr "tak dapat stat %s" - -#: src/su.c:294 -#, fuzzy, c-format -msgid "cannot set group id" -msgstr "tak dapat menukar ke kumpulan null" - -#: src/su.c:296 -#, fuzzy, c-format -msgid "cannot set user id" -msgstr "tak dapat stat %s" - -#: src/su.c:371 -#, fuzzy, c-format -msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" -msgstr "Penggunaan: %s [OPSYEN]...[FAIL]...\n" - -#: src/su.c:372 -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 "" - -#: src/su.c:384 -msgid "" -"\n" -"A mere - implies -l. If USER not given, assume root.\n" -msgstr "" - -#: src/su.c:461 -#, c-format -msgid "user %s does not exist" -msgstr "pengguna %s tidak wujud" - -#: src/su.c:484 -#, c-format -msgid "incorrect password" -msgstr "katalaluan salah" - -#: src/su.c:501 -#, c-format -msgid "using restricted shell %s" -msgstr "" - -#: src/su.c:509 -#, fuzzy, c-format -msgid "warning: cannot change directory to %s" -msgstr "Gagal menukar direktori %s " - #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 #, fuzzy @@ -8616,7 +8948,7 @@ msgstr "" msgid "ignoring all arguments" msgstr "mengabaikan segala hujah" -#: src/system.h:340 +#: src/system.h:343 #, c-format msgid "" "\n" @@ -8625,15 +8957,24 @@ msgid "" "for details about the options it supports.\n" msgstr "" -#: src/system.h:346 +#: src/system.h:349 msgid " --help display this help and exit\n" msgstr "" -#: src/system.h:348 +#: src/system.h:351 msgid " --version output version information and exit\n" msgstr "" -#: src/system.h:541 +#: src/system.h:544 +#, fuzzy +msgid "" +"\n" +"Mandatory arguments to long options are mandatory for short options too.\n" +msgstr "" +"Hujah mandatori kepada opsyen panjang andalah mandatori bagi opsyen pendek " +"juga.\n" + +#: src/system.h:552 msgid "" "\n" "SIZE is an integer and optional unit (example: 10M is 10*1024*1024). Units\n" @@ -8641,7 +8982,7 @@ msgid "" "1000).\n" msgstr "" -#: src/system.h:550 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -8650,7 +8991,7 @@ msgid "" "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n" msgstr "" -#: src/system.h:560 +#: src/system.h:571 #, fuzzy, c-format msgid "" "\n" @@ -8663,22 +9004,22 @@ msgstr "" #. <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:574 +#: src/system.h:585 #, c-format msgid "Report %s translation bugs to <http://translationproject.org/team/>\n" msgstr "" -#: src/system.h:578 +#: src/system.h:589 #, c-format msgid "For complete documentation, run: info coreutils '%s invocation'\n" msgstr "" -#: src/system.h:585 +#: src/system.h:596 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "Cuba `%s --help' untuk maklumat lanjut .\n" -#: src/system.h:617 +#: src/system.h:628 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -8694,55 +9035,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" -"\n" msgstr "" +"\n" +"Dengan tiada FAIL, atau bila FAIL adalah -, baca input piawai.\n" -#: src/tac.c:145 +#: src/tac.c:144 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 "" -#: src/tac.c:235 src/tac.c:336 +#: src/tac.c:234 src/tac.c:335 #, fuzzy, c-format msgid "%s: seek failed" msgstr "fail istimewa blok" -#: src/tac.c:264 +#: src/tac.c:263 #, fuzzy, c-format msgid "record too large" msgstr "%s adalah terlalu besar" -#: src/tac.c:451 +#: src/tac.c:450 #, fuzzy, c-format msgid "failed to create temporary file in %s" msgstr "tak dapat memcipta fail biasa %s" -#: src/tac.c:459 +#: src/tac.c:458 #, fuzzy, c-format msgid "failed to open %s for writing" msgstr "%s: fail terlalu panjang" -#: src/tac.c:476 +#: src/tac.c:475 #, fuzzy, c-format msgid "failed to rewind stream for %s" msgstr "gagal mengekalkan masa bagi %s" -#: src/tac.c:512 src/tac.c:519 +#: src/tac.c:511 src/tac.c:518 #, fuzzy, c-format msgid "%s: write error" msgstr "ralat menulis" -#: src/tac.c:572 +#: src/tac.c:571 #, fuzzy, c-format msgid "failed to open %s for reading" msgstr "tak dapat buka %s untuk dibaca" -#: src/tac.c:630 +#: src/tac.c:629 #, c-format msgid "separator cannot be empty" msgstr "pemisah tak boleh kosong" @@ -8753,15 +9096,16 @@ msgid "Ian Lance Taylor" msgstr "" #: src/tail.c:262 -#, c-format +#, fuzzy, 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" -"\n" msgstr "" +"\n" +"Dengan tiada FAIL, atau bila FAIL adalah -, baca input piawai.\n" -#: src/tail.c:271 +#: src/tail.c:270 msgid "" " -c, --bytes=K output the last K bytes; alternatively, use -c " "+K\n" @@ -8769,7 +9113,7 @@ msgid "" "file\n" msgstr "" -#: src/tail.c:275 +#: src/tail.c:274 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -8778,7 +9122,7 @@ msgid "" " -F same as --follow=name --retry\n" msgstr "" -#: src/tail.c:282 +#: src/tail.c:281 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -8792,7 +9136,7 @@ msgid "" " With inotify, this option is rarely useful.\n" msgstr "" -#: src/tail.c:295 +#: src/tail.c:294 msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" " -q, --quiet, --silent never output headers giving file names\n" @@ -8801,7 +9145,7 @@ msgid "" " name, i.e., with --follow=name\n" msgstr "" -#: src/tail.c:302 +#: src/tail.c:301 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations.\n" @@ -8810,7 +9154,7 @@ msgid "" " -v, --verbose always output headers giving file names\n" msgstr "" -#: src/tail.c:311 +#: src/tail.c:310 #, fuzzy msgid "" "\n" @@ -8826,7 +9170,7 @@ 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/tail.c:320 +#: src/tail.c:319 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" @@ -8836,64 +9180,64 @@ msgid "" "named file in a way that accommodates renaming, removal and creation.\n" msgstr "" -#: src/tail.c:379 +#: src/tail.c:378 #, fuzzy, c-format msgid "closing %s (fd=%d)" msgstr "menutup %s" -#: src/tail.c:454 +#: src/tail.c:453 #, fuzzy, c-format msgid "%s: cannot seek to relative offset %s" msgstr "tak boleh mencipta fifo %s" -#: src/tail.c:458 +#: src/tail.c:457 #, fuzzy, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "tak boleh mencipta fifo %s" -#: src/tail.c:895 +#: src/tail.c:894 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "" -#: src/tail.c:907 +#: src/tail.c:906 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" msgstr "" -#: src/tail.c:964 +#: src/tail.c:963 #, fuzzy, c-format msgid "%s has become inaccessible" msgstr "`%s' menjadi tidak boleh diakses" -#: src/tail.c:981 +#: src/tail.c:980 #, c-format msgid "%s has been replaced with an untailable file; giving up on this name" msgstr "" -#: src/tail.c:990 +#: src/tail.c:989 #, c-format msgid "%s has been replaced with a remote file. giving up on this name" msgstr "" -#: src/tail.c:1011 +#: src/tail.c:1010 #, fuzzy, c-format msgid "%s has become accessible" msgstr "`%s' menjadi boleh diakses" -#: src/tail.c:1019 +#: src/tail.c:1018 #, c-format msgid "%s has appeared; following end of new file" msgstr "" -#: src/tail.c:1030 +#: src/tail.c:1029 #, c-format msgid "%s has been replaced; following end of new file" msgstr "" -#: src/tail.c:1131 +#: src/tail.c:1130 #, fuzzy, c-format msgid "%s: cannot change nonblocking mode" msgstr "tak dapat menukar ke kumpulan null" @@ -9202,17 +9546,22 @@ msgstr "kehilangan hujah fail" msgid "extra argument %s" msgstr "terlalu banyak hujah" -#: src/timeout.c:124 +#: src/timeout.c:112 +#, c-format +msgid "warning: sigprocmask" +msgstr "" + +#: src/timeout.c:145 #, c-format msgid "warning: timer_settime" msgstr "" -#: src/timeout.c:129 +#: src/timeout.c:150 #, c-format msgid "warning: timer_create" msgstr "" -#: src/timeout.c:204 +#: src/timeout.c:225 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -9221,18 +9570,18 @@ msgstr "" "Pengunaan: %s FAIL\n" " atau: %s OPSYEN\n" -#: src/timeout.c:208 +#: src/timeout.c:229 #, fuzzy -msgid "" -"Start COMMAND, and kill it if still running after DURATION.\n" -"\n" -"Mandatory arguments to long options are mandatory for short options too.\n" +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:213 +#: src/timeout.c:235 msgid "" +" --preserve-status\n" +" exit with the same status as COMMAND, even when the\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 " @@ -9247,7 +9596,7 @@ msgid "" " See 'kill -l' for a list of signals\n" msgstr "" -#: src/timeout.c:229 +#: src/timeout.c:254 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -9255,25 +9604,30 @@ msgid "" "days.\n" msgstr "" -#: src/timeout.c:234 +#: src/timeout.c:259 msgid "" "\n" -"If the command times out, then exit with status 124. Otherwise, exit\n" -"with the status of COMMAND. If no signal is specified, send the TERM\n" -"signal upon timeout. The TERM signal kills any process that does not\n" -"block or catch that signal. For other processes, it may be necessary to\n" -"use the KILL (9) signal, since this signal cannot be caught. If the\n" -"KILL (9) signal is sent, the exit status is 128+9 rather than 124.\n" +"If the command times out, and --preserve-status is not set, then exit with\n" +"status 124. Otherwise, exit with the status of COMMAND. If no signal\n" +"is specified, send the TERM signal upon timeout. The TERM signal kills\n" +"any process that does not block or catch that signal. It may be necessary\n" +"to use the KILL (9) signal, since this signal cannot be caught, in which\n" +"case the exit status is 128+9 rather than 124.\n" msgstr "" -#: src/timeout.c:419 +#: src/timeout.c:363 +#, c-format +msgid "warning: disabling core dumps failed" +msgstr "" + +#: src/timeout.c:471 #, fuzzy, c-format msgid "error waiting for command" msgstr "menulis %s" -#: src/timeout.c:441 +#: src/timeout.c:482 #, c-format -msgid "warning: disabling core dumps failed" +msgid "the monitored command dumped core" msgstr "" #. This is a proper name. See the gettext manual, section Names. @@ -9286,22 +9640,22 @@ msgstr "" msgid "Randy Smith" msgstr "" -#: src/touch.c:115 src/touch.c:313 +#: src/touch.c:115 src/touch.c:309 #, c-format msgid "invalid date format %s" msgstr "format tarikh tidak sah %s" -#: src/touch.c:194 +#: src/touch.c:191 #, fuzzy, c-format msgid "cannot touch %s" msgstr "tak dapat stat %s" -#: src/touch.c:200 +#: src/touch.c:197 #, c-format msgid "setting times of %s" msgstr "menetapkan masa untuk %s" -#: src/touch.c:216 +#: src/touch.c:213 msgid "" "Update the access and modification times of each FILE to the current time.\n" "\n" @@ -9310,10 +9664,9 @@ msgid "" "\n" "A FILE argument string of - is handled specially and causes touch to\n" "change the times of the file associated with standard output.\n" -"\n" msgstr "" -#: src/touch.c:229 +#: src/touch.c:225 msgid "" " -a change only the access time\n" " -c, --no-create do not create any files\n" @@ -9321,7 +9674,7 @@ msgid "" " -f (ignored)\n" msgstr "" -#: src/touch.c:235 +#: src/touch.c:231 #, fuzzy msgid "" " -h, --no-dereference affect each symbolic link instead of any " @@ -9335,27 +9688,27 @@ msgstr "" " (hanya boleh pada sistem yang boleh menukar\n" " pemilikan bagi pautan simbolik)\n" -#: src/touch.c:241 +#: src/touch.c:237 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" -" --time=WORD change the specified time:\n" +" --time=WORD change the specified time:\n" " WORD is access, atime, or use: equivalent to -a\n" " WORD is modify or mtime: equivalent to -m\n" msgstr "" -#: src/touch.c:250 +#: src/touch.c:246 msgid "" "\n" "Note that the -d and -t options accept different time-date formats.\n" msgstr "" -#: src/touch.c:339 +#: src/touch.c:335 #, c-format msgid "cannot specify times from more than one source" msgstr "tak boleh nyatakan masa lebih daripada satu sumber" -#: src/touch.c:413 +#: src/touch.c:409 #, c-format msgid "" "warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'" @@ -9463,9 +9816,9 @@ msgid "missing character class name '[::]'" msgstr "aksara tidak sah pada %s pada rentetan mod %s" #: src/tr.c:913 -#, fuzzy, c-format +#, c-format msgid "missing equivalence class character '[==]'" -msgstr "aksara tidak sah pada %s pada rentetan mod %s" +msgstr "" #: src/tr.c:928 #, fuzzy, c-format @@ -9576,25 +9929,24 @@ msgid "" "If a FILE is larger than the specified size, the extra data is lost.\n" "If a FILE is shorter, it is extended and the extended part (hole)\n" "reads as zero bytes.\n" -"\n" msgstr "" -#: src/truncate.c:110 +#: src/truncate.c:109 msgid " -c, --no-create do not create any files\n" msgstr "" -#: src/truncate.c:113 +#: src/truncate.c:112 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" -#: src/truncate.c:116 +#: 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" msgstr "" -#: src/truncate.c:122 +#: src/truncate.c:121 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -9602,57 +9954,57 @@ msgid "" "'/' round down to multiple of, '%' round up to multiple of.\n" msgstr "" -#: src/truncate.c:150 +#: src/truncate.c:149 #, c-format msgid "overflow in %<PRIdMAX> * %<PRIdMAX> byte blocks for file %s" msgstr "" -#: src/truncate.c:174 +#: src/truncate.c:173 #, fuzzy, c-format msgid "%s has unusable, apparently negative size" msgstr "%s: fail mempunya saiz negatif" -#: src/truncate.c:184 src/truncate.c:379 +#: src/truncate.c:183 src/truncate.c:384 #, fuzzy, c-format msgid "cannot get the size of %s" msgstr "Tak dapat perolehi masa bagi hari" -#: src/truncate.c:206 +#: src/truncate.c:205 #, c-format msgid "overflow rounding up size of file %s" msgstr "" -#: src/truncate.c:216 +#: src/truncate.c:215 #, c-format msgid "overflow extending size of file %s" msgstr "" -#: src/truncate.c:231 +#: src/truncate.c:230 #, c-format msgid "failed to truncate %s at %<PRIdMAX> bytes" msgstr "" -#: src/truncate.c:305 +#: src/truncate.c:303 #, fuzzy, c-format msgid "multiple relative modifiers specified" msgstr "banyak opsyen -l or -t dinyatakan" -#: src/truncate.c:335 +#: src/truncate.c:333 #, fuzzy, c-format msgid "you must specify either %s or %s" msgstr "anda mesti nyatakan senarai byte, aksara, atau medan" -#: src/truncate.c:342 +#: src/truncate.c:340 #, c-format msgid "you must specify a relative %s with %s" msgstr "" -#: src/truncate.c:349 +#: src/truncate.c:347 #, c-format msgid "%s was specified but %s was not" msgstr "" -#: src/truncate.c:400 +#: src/truncate.c:404 #, fuzzy, c-format msgid "cannot open %s for writing" msgstr "tak dapat buka %s untuk dibaca" @@ -9734,12 +10086,11 @@ msgstr "tak dapat perolehi nama sistem" msgid "" "Convert blanks in each FILE to tabs, writing to standard output.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" "\n" "Dengan tiada FAIL, atau bila FAIL adalah -, baca input piawai.\n" -#: src/unexpand.c:125 +#: src/unexpand.c:124 msgid "" " -a, --all convert all blanks, instead of just initial blanks\n" " --first-only convert only leading sequences of blanks (overrides -a)\n" @@ -9747,12 +10098,12 @@ msgid "" " -t, --tabs=LIST use comma separated LIST of tab positions (enables -a)\n" msgstr "" -#: src/unexpand.c:153 +#: src/unexpand.c:152 #, c-format msgid "tabs are too far apart" msgstr "" -#: src/unexpand.c:505 +#: src/unexpand.c:504 #, fuzzy, c-format msgid "tab stop value is too large" msgstr "%s adalah terlalu besar" @@ -9768,16 +10119,15 @@ msgid "" "writing to OUTPUT (or standard output).\n" "\n" "With no options, matching lines are merged to the first occurrence.\n" -"\n" msgstr "" -#: src/uniq.c:148 +#: src/uniq.c:147 msgid "" " -c, --count prefix lines by the number of occurrences\n" " -d, --repeated only print duplicate lines\n" msgstr "" -#: src/uniq.c:152 +#: src/uniq.c:151 msgid "" " -D, --all-repeated[=delimit-method] print all duplicate lines\n" " delimit-method={none(default),prepend,separate}\n" @@ -9789,18 +10139,18 @@ msgid "" " -z, --zero-terminated end lines with 0 byte, not newline\n" msgstr "" -#: src/uniq.c:162 +#: src/uniq.c:161 msgid " -w, --check-chars=N compare no more than N characters in lines\n" msgstr "" -#: src/uniq.c:167 +#: src/uniq.c:166 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:172 +#: src/uniq.c:171 msgid "" "\n" "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n" @@ -9808,27 +10158,27 @@ msgid "" "Also, comparisons honor the rules specified by 'LC_COLLATE'.\n" msgstr "" -#: src/uniq.c:359 +#: src/uniq.c:358 #, fuzzy, c-format msgid "too many repeated lines" msgstr "terlalu banyak hujah" -#: src/uniq.c:522 +#: src/uniq.c:521 #, fuzzy msgid "invalid number of fields to skip" msgstr "nombor tidak sah %s" -#: src/uniq.c:531 +#: src/uniq.c:530 #, fuzzy msgid "invalid number of bytes to skip" msgstr "nombor tidak sah %s" -#: src/uniq.c:540 +#: src/uniq.c:539 #, fuzzy msgid "invalid number of bytes to compare" msgstr "nombor tidak sah %s" -#: src/uniq.c:559 +#: src/uniq.c:558 #, c-format msgid "printing all duplicated lines and repeat counts is meaningless" msgstr "" @@ -9880,6 +10230,11 @@ msgid_plural "up %ld days %2d:%02d, " msgstr[0] "" msgstr[1] "" +#: src/uptime.c:149 +#, fuzzy, c-format +msgid "up %2d:%02d, " +msgstr " %2d:%02d%s naik " + #: src/uptime.c:151 #, fuzzy, c-format msgid "%lu user" @@ -9953,39 +10308,39 @@ msgstr "" msgid " old " msgstr " tua " -#: src/who.c:449 +#: src/who.c:440 msgid "system boot" msgstr "" -#: src/who.c:456 src/who.c:458 +#: src/who.c:447 src/who.c:449 msgid "id=" msgstr "id=" -#: src/who.c:471 src/who.c:476 +#: src/who.c:462 src/who.c:467 msgid "term=" msgstr "term=" -#: src/who.c:473 src/who.c:477 +#: src/who.c:464 src/who.c:468 msgid "exit=" msgstr "" -#: src/who.c:494 +#: src/who.c:485 msgid "LOGIN" msgstr "" -#: src/who.c:514 +#: src/who.c:505 msgid "clock change" msgstr "" -#: src/who.c:526 src/who.c:527 +#: src/who.c:517 src/who.c:518 msgid "run-level" msgstr "" -#: src/who.c:530 src/who.c:531 +#: src/who.c:521 src/who.c:522 msgid "last=" msgstr "terkahir=" -#: src/who.c:562 +#: src/who.c:553 #, fuzzy, c-format msgid "" "\n" @@ -9994,44 +10349,44 @@ msgstr "" "\n" "# pengguna=%u\n" -#: src/who.c:568 +#: src/who.c:559 msgid "NAME" msgstr "NAMA" -#: src/who.c:568 +#: src/who.c:559 msgid "LINE" msgstr "BARIS" -#: src/who.c:568 +#: src/who.c:559 msgid "TIME" msgstr "MASA" -#: src/who.c:568 +#: src/who.c:559 msgid "IDLE" msgstr "LEKA" -#: src/who.c:569 +#: src/who.c:560 msgid "PID" msgstr "PID" -#: src/who.c:569 +#: src/who.c:560 msgid "COMMENT" msgstr "KOMEN" -#: src/who.c:569 +#: src/who.c:560 msgid "EXIT" msgstr "KELUAR" -#: src/who.c:649 +#: src/who.c:640 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n" msgstr "Penggunaan: %s [OPSYEN]...[FAIL]...\n" -#: src/who.c:650 +#: src/who.c:641 msgid "Print information about users who are currently logged in.\n" msgstr "" -#: src/who.c:653 +#: src/who.c:644 msgid "" "\n" " -a, --all same as -b -d --login -p -r -t -T -u\n" @@ -10040,18 +10395,18 @@ msgid "" " -H, --heading print line of column headings\n" msgstr "" -#: src/who.c:660 +#: src/who.c:651 msgid " -l, --login print system login processes\n" msgstr "" -#: src/who.c:663 +#: src/who.c:654 msgid "" " --lookup attempt to canonicalize hostnames via DNS\n" " -m only hostname and user associated with stdin\n" " -p, --process print active processes spawned by init\n" msgstr "" -#: src/who.c:668 +#: src/who.c:659 msgid "" " -q, --count all login names and number of users logged on\n" " -r, --runlevel print current runlevel\n" @@ -10059,7 +10414,7 @@ msgid "" " -t, --time print last system clock change\n" msgstr "" -#: src/who.c:674 +#: src/who.c:665 msgid "" " -T, -w, --mesg add user's message status as +, - or ?\n" " -u, --users list users logged in\n" @@ -10067,7 +10422,7 @@ msgid "" " --writable same as -T\n" msgstr "" -#: src/who.c:682 +#: src/who.c:673 #, c-format msgid "" "\n" @@ -10102,6 +10457,33 @@ 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 "closing %s" +#~ msgstr "menutup %s" + +#~ msgid "accessing %s" +#~ msgstr "mengakses %s" + +#~ msgid "opening %s" +#~ msgstr "Membuka %s" + #~ msgid "" #~ "Usage: %s NAME\n" #~ " or: %s OPTION\n" @@ -10109,8 +10491,48 @@ msgstr "" #~ "Pengunaan: %s FAIL\n" #~ " atau: %s OPSYEN\n" -#~ msgid "Usage: %s [OPTION] FILE...\n" -#~ msgstr "Penggunaan: %s [OPSYEN] FAIL...\n" +#, 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" + +#, 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" + +#, fuzzy +#~ msgid "cannot set user id" +#~ msgstr "tak dapat stat %s" + +#, 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 "warning: cannot change directory to %s" +#~ msgstr "Gagal menukar direktori %s " #, fuzzy #~ msgid "" @@ -10119,10 +10541,8 @@ 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" +#~ " -f, --silent, --quiet suppress most error messages\n" +#~ " -v, --verbose output a diagnostic for every file processed\n" #~ msgstr "" #~ "Tukar keahlian kumpulan bagi setiap FAIL ke KUMPULAN.\n" #~ "\n" @@ -10198,15 +10618,11 @@ msgstr "" #~ "rekursif\n" #~ " -v, --verbose output diagnostik bagi setiap fail yg diproses\n" -#, fuzzy -#~ msgid "Usage: %s [OPTION]... PATH START\n" -#~ msgstr "Penggunaan: %s [OPSYEN]...[FAIL]...\n" - #, fuzzy #~ msgid "" #~ "\n" -#~ "SIZE is an integer with an optional suffix (example: 10MB). Suffixes " -#~ "are:\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 "" @@ -10216,13 +10632,6 @@ msgstr "" #~ "kB 1000, K 1024, MB 1,000,000, M 1,048,576, dan lagi bagi G, T, P, E, Z, " #~ "Y.\n" -#~ msgid "cannot create link %s" -#~ msgstr "tak boleh mencipta pautan %s" - -#, fuzzy -#~ msgid "%s: option '%s' is ambiguous\n" -#~ msgstr "%s: opsyen `-W %s' adalah ambiguous\n" - #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s: opsyen tidak dibenarkan -- %c\n" @@ -10273,6 +10682,9 @@ msgstr "" #~ msgid "cannot overwrite directory %s" #~ msgstr "tak boleh menindih direktori %s" +#~ msgid "cannot create link %s" +#~ msgstr "tak boleh mencipta pautan %s" + #~ msgid "Torbjorn Granlund, David MacKenzie, and Jim Meyering" #~ msgstr "Torbjorn Granlund, David MacKenzie, dan Jim Meyering" @@ -10594,6 +11006,9 @@ msgstr "" #~ msgid "*** invalid date/time ***" #~ msgstr "mod tak sah %s" +#~ msgid "Usage: %s [OPTION] FILE...\n" +#~ msgstr "Penggunaan: %s [OPSYEN] FAIL...\n" + #~ msgid "new_mode: mode\n" #~ msgstr "new_mode: mod\n" @@ -10668,9 +11083,6 @@ msgstr "" #~ msgid "`-LIST' option is obsolete; use `--first-only -t LIST'" #~ msgstr "Opsyen `-LIST' sudah luput; guna `--first-only -t LIST'" -#~ msgid " %2d:%02d%s up " -#~ msgstr " %2d:%02d%s naik " - #~ msgid "am" #~ msgstr "am" diff --git a/po/nb.gmo b/po/nb.gmo index e8a66186..5c195a0e 100644 Binary files a/po/nb.gmo and b/po/nb.gmo differ diff --git a/po/nb.po b/po/nb.po index 52a2b252..219cc886 100644 --- a/po/nb.po +++ b/po/nb.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU textutils 2.0.20\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2012-05-10 19:35+0200\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" @@ -34,19 +34,19 @@ msgstr "Gyldige argument er:" msgid "error closing file" msgstr "lager filen «%s»\n" -#: lib/closeout.c:112 src/base64.c:109 src/base64.c:121 src/base64.c:127 -#: src/base64.c:168 src/base64.c:224 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:330 src/expand.c:355 src/head.c:298 -#: src/head.c:348 src/head.c:756 src/head.c:797 src/mktemp.c:350 src/od.c:919 -#: src/paste.c:160 src/shuf.c:369 src/split.c:727 src/split.c:964 -#: src/split.c:969 src/tail.c:350 src/tail.c:1201 src/tail.c:1307 +#: 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 -#: src/unexpand.c:427 src/unexpand.c:443 +#: 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:1160 src/copy.c:2602 +#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617 #, fuzzy, c-format msgid "preserving permissions for %s" msgstr "kan ikke endre rettigheter til %s" @@ -246,18 +246,18 @@ msgstr "%s: flagget «-W %s» tillater ikke et argument\n" msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: flagget «%s» trenger et argument\n" -#: lib/mkdir-p.c:196 src/install.c:483 +#: lib/mkdir-p.c:196 src/install.c:484 #, c-format msgid "cannot change permissions of %s" msgstr "kan ikke endre rettigheter til %s" -#: lib/mkdir-p.c:206 src/copy.c:2261 src/install.c:709 src/install.c:722 +#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722 #, c-format msgid "cannot create directory %s" msgstr "kan ikke opprette katalog %s" #: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 src/csplit.c:219 -#: src/split.c:915 src/tac.c:435 +#: src/split.c:929 src/tac.c:434 #, c-format msgid "memory exhausted" msgstr "virtuelt minne oppbrukt" @@ -306,81 +306,81 @@ msgstr "»" msgid "%s: end of file" msgstr "%s: lesefeil" -#: lib/regcomp.c:130 +#: lib/regcomp.c:131 msgid "Success" msgstr "" -#: lib/regcomp.c:133 +#: lib/regcomp.c:134 msgid "No match" msgstr "" -#: lib/regcomp.c:136 +#: lib/regcomp.c:137 #, fuzzy msgid "Invalid regular expression" msgstr "%s: ugyldig regulært uttrykk: %s" -#: lib/regcomp.c:139 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "" -#: lib/regcomp.c:142 +#: lib/regcomp.c:143 #, fuzzy msgid "Invalid character class name" msgstr "ugyldig tegn-klasse «%s»" -#: lib/regcomp.c:145 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "" -#: lib/regcomp.c:148 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "" -#: lib/regcomp.c:151 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "" -#: lib/regcomp.c:154 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "" -#: lib/regcomp.c:157 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "" -#: lib/regcomp.c:160 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "" -#: lib/regcomp.c:163 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "" -#: lib/regcomp.c:166 +#: lib/regcomp.c:167 #, fuzzy msgid "Memory exhausted" msgstr "virtuelt minne oppbrukt" -#: lib/regcomp.c:169 +#: lib/regcomp.c:170 #, fuzzy msgid "Invalid preceding regular expression" msgstr "%s: ugyldig regulært uttrykk: %s" -#: lib/regcomp.c:172 +#: lib/regcomp.c:173 #, fuzzy msgid "Premature end of regular expression" msgstr "feil i søk med regulært uttrykk" -#: lib/regcomp.c:175 +#: lib/regcomp.c:176 #, fuzzy msgid "Regular expression too big" msgstr "feil i søk med regulært uttrykk" -#: lib/regcomp.c:178 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:703 +#: lib/regcomp.c:704 #, fuzzy msgid "No previous regular expression" msgstr "feil i søk med regulært uttrykk" @@ -421,7 +421,7 @@ msgstr "^[jJ]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-mode-acl.c:695 src/copy.c:2284 src/cp.c:518 +#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516 #, fuzzy, c-format msgid "setting permissions for %s" msgstr "kan ikke endre rettigheter til %s" @@ -567,13 +567,13 @@ msgstr "åpning av fil feilet" msgid "Resource lost" msgstr "" -#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262 -#: lib/spawn-pipe.c:265 +#: 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:232 lib/spawn-pipe.c:346 lib/wait-process.c:282 +#: 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" @@ -589,27 +589,27 @@ msgstr "" msgid "Unknown signal %d" msgstr "" -#: lib/unicodeio.c:103 +#: lib/unicodeio.c:102 #, fuzzy msgid "iconv function not usable" msgstr "kan ikke skrive ut U+%04X: iconv-funksjonen er ikke brukbar" -#: lib/unicodeio.c:105 +#: lib/unicodeio.c:104 #, fuzzy msgid "iconv function not available" msgstr "kan ikke skrive ut U+%04X: iconv-funksjon er ikke tilgjengelig" -#: lib/unicodeio.c:112 +#: lib/unicodeio.c:111 #, fuzzy msgid "character out of range" msgstr "U+%04X: tegn utenfor tillatte verdier" -#: lib/unicodeio.c:182 +#: lib/unicodeio.c:181 #, c-format msgid "cannot convert U+%04X to local character set" msgstr "kan ikke konvertere U+%04X til lokalt tegnsett" -#: lib/unicodeio.c:184 +#: lib/unicodeio.c:183 #, fuzzy, c-format msgid "cannot convert U+%04X to local character set: %s" msgstr "kan ikke konvertere U+%04X til lokalt tegnsett" @@ -770,7 +770,7 @@ msgstr "" "\n" "Rapportér feil til <bug-textutils@gnu.org>." -#: lib/version-etc.c:251 src/system.h:562 +#: lib/version-etc.c:251 src/system.h:573 #, c-format msgid "%s home page: <%s>\n" msgstr "" @@ -780,7 +780,7 @@ msgstr "" msgid "%s home page: <http://www.gnu.org/software/%s/>\n" msgstr "" -#: lib/version-etc.c:256 src/system.h:563 +#: lib/version-etc.c:256 src/system.h:574 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" @@ -867,14 +867,17 @@ msgid "Simon Josefsson" msgstr "" #: src/base64.c:60 -#, c-format +#, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" "Base64 encode or decode FILE, or standard input, to standard output.\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" -#: src/base64.c:64 +#: src/base64.c:67 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -884,7 +887,7 @@ msgid "" "\n" msgstr "" -#: src/base64.c:73 src/cat.c:110 src/fmt.c:293 src/shuf.c:71 src/sum.c:70 +#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -892,7 +895,7 @@ msgstr "" "\n" "Når ingen FIL eller når FIL er -, les fra standard inn.\n" -#: src/base64.c:76 +#: src/base64.c:79 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -901,37 +904,37 @@ msgid "" "from any other non-alphabet bytes in the encoded stream.\n" msgstr "" -#: src/base64.c:171 src/base64.c:208 src/csplit.c:263 src/csplit.c:1435 -#: src/join.c:451 src/shuf.c:157 src/shuf.c:361 src/tac-pipe.c:74 +#: 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 #, c-format msgid "read error" msgstr "lesefeil" -#: src/base64.c:227 +#: src/base64.c:230 #, fuzzy, c-format msgid "invalid input" msgstr "ugyldig antall" -#: src/base64.c:264 +#: src/base64.c:267 #, fuzzy, c-format msgid "invalid wrap size: %s" msgstr "ugyldig type-streng «%s»" -#: src/base64.c:283 src/basename.c:173 src/comm.c:435 src/cp.c:607 -#: src/date.c:441 src/dircolors.c:447 src/du.c:894 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:169 src/install.c:929 src/join.c:961 -#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:157 src/mv.c:447 -#: src/od.c:1802 src/ptx.c:2081 src/readlink.c:154 src/seq.c:408 -#: src/shuf.c:320 src/shuf.c:339 src/sort.c:4477 src/split.c:1313 -#: src/tr.c:1797 src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:454 -#: src/uniq.c:471 src/unlink.c:81 src/uptime.c:250 src/users.c:146 -#: src/wc.c:666 src/who.c:836 src/whoami.c:79 +#: 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 msgid "extra operand %s" msgstr "ekstra operator «%s»" -#: src/base64.c:315 src/cat.c:781 +#: src/base64.c:318 src/cat.c:781 #, fuzzy, c-format msgid "closing standard input" msgstr "standard inn" @@ -939,15 +942,15 @@ msgstr "standard inn" #. 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/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:53 src/env.c:33 +#: 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/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:65 src/su.c:88 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 +#: 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" @@ -965,17 +968,16 @@ msgstr "" msgid "" "Print NAME with any leading directory components removed.\n" "If specified, also remove a trailing SUFFIX.\n" -"\n" msgstr "" -#: src/basename.c:59 +#: 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" msgstr "" -#: src/basename.c:66 +#: src/basename.c:67 #, c-format msgid "" "\n" @@ -986,20 +988,21 @@ msgid "" " %s -a any/str1 any/str2 -> \"str1\" followed by \"str2\"\n" msgstr "" -#: src/basename.c:167 src/chcon.c:531 src/chgrp.c:277 src/chmod.c:526 -#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1369 +#: 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:183 src/mkfifo.c:108 src/mknod.c:146 src/nohup.c:111 -#: src/pathchk.c:148 src/printf.c:674 src/readlink.c:146 src/realpath.c:236 -#: src/rm.c:314 src/rmdir.c:223 src/seq.c:402 src/setuidgid.c:137 -#: src/sleep.c:119 src/stat.c:1476 src/stdbuf.c:346 src/tr.c:1782 +#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 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 msgid "missing operand" msgstr "%s: heltall forventet etter «%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:52 src/split.c:49 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/split.c:49 msgid "Torbjorn Granlund" msgstr "" @@ -1010,8 +1013,8 @@ msgstr "" msgid "Richard M. Stallman" msgstr "Torbjorn Granlund og Richard M. Stallman" -#: src/cat.c:88 src/df.c:846 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4720 src/nl.c:182 src/paste.c:435 src/pr.c:2768 src/sum.c:58 +#: 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/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" @@ -1064,7 +1067,7 @@ msgstr "" msgid "cannot do ioctl on %s" msgstr "kan ikke utføre ioctl på «%s»" -#: src/cat.c:637 src/dd.c:2209 src/sort.c:379 src/tee.c:165 src/yes.c:86 +#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86 #, c-format msgid "standard output" msgstr "standard ut" @@ -1081,7 +1084,7 @@ 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:55 src/head.c:46 src/hostid.c:33 +#: 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 @@ -1089,7 +1092,7 @@ msgstr "" msgid "Jim Meyering" msgstr "Mike Haertel og Paul Eggert" -#: src/chcon.c:100 src/runcon.c:203 src/runcon.c:234 +#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238 #, fuzzy, c-format msgid "failed to create security context: %s" msgstr "kan ikke endre rettigheter til %s" @@ -1099,8 +1102,8 @@ msgstr "kan ikke endre rettigheter til %s" msgid "failed to set %s security context component to %s" msgstr "" -#: src/chcon.c:156 src/chcon.c:540 src/copy.c:2222 src/runcon.c:217 -#: src/stat.c:683 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221 +#: src/stat.c:702 #, fuzzy, c-format msgid "failed to get security context of %s" msgstr "kan ikke endre rettigheter til %s" @@ -1116,12 +1119,12 @@ msgid "failed to change context of %s to %s" msgstr "kan ikke endre rettigheter til %s" #: src/chcon.c:255 src/chmod.c:216 src/chown-core.c:325 src/copy.c:581 -#: src/du.c:446 src/ls.c:2981 +#: src/du.c:457 src/ls.c:2981 #, c-format msgid "cannot access %s" msgstr "" -#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:426 +#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437 #, fuzzy, c-format msgid "cannot read directory %s" msgstr "kan ikke opprette katalog %s" @@ -1131,13 +1134,13 @@ msgstr "kan ikke opprette katalog %s" msgid "changing security context of %s\n" msgstr "kan ikke endre rettigheter til %s" -#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:599 +#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562 #, fuzzy, c-format msgid "fts_read failed" msgstr "feil ved lesing" -#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:618 -#: src/remove.c:613 +#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642 +#: src/remove.c:576 #, fuzzy, c-format msgid "fts_close failed" msgstr "feil ved lukking av fil" @@ -1157,10 +1160,9 @@ msgid "" "Change the security context of each FILE to CONTEXT.\n" "With --reference, change the security context of each FILE to that of " "RFILE.\n" -"\n" msgstr "" -#: src/chcon.c:362 src/chgrp.c:123 src/chown.c:94 +#: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94 msgid "" " --dereference affect the referent of each symbolic link (this is\n" " the default), rather than the symbolic link itself\n" @@ -1168,7 +1170,7 @@ msgid "" "file\n" msgstr "" -#: src/chcon.c:367 +#: src/chcon.c:369 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" @@ -1176,22 +1178,28 @@ msgid "" " -l, --range=RANGE set range RANGE in the target security context\n" msgstr "" -#: src/chcon.c:373 +#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 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 msgid "" " --reference=RFILE use RFILE's security context rather than " "specifying\n" " a CONTEXT value\n" msgstr "" -#: src/chcon.c:377 src/chgrp.c:140 src/chown.c:118 +#: 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:380 +#: src/chcon.c:386 msgid " -v, --verbose output a diagnostic for every file processed\n" msgstr "" -#: src/chcon.c:383 src/chgrp.c:143 src/chown.c:121 +#: src/chcon.c:389 src/chgrp.c:143 src/chown.c:121 msgid "" "\n" "The following options modify how a hierarchy is traversed when the -R\n" @@ -1206,36 +1214,36 @@ msgid "" "\n" msgstr "" -#: src/chcon.c:512 src/chgrp.c:264 src/chown.c:267 +#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267 #, c-format msgid "-R --dereference requires either -H or -L" msgstr "" -#: src/chcon.c:518 +#: src/chcon.c:524 #, c-format msgid "-R -h requires -P" msgstr "" -#: src/chcon.c:533 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282 -#: src/comm.c:429 src/csplit.c:1371 src/join.c:1149 src/link.c:79 -#: src/mknod.c:148 src/setuidgid.c:139 src/tr.c:1785 +#: 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 msgid "missing operand after %s" msgstr "%s: heltall forventet etter «%c»" -#: src/chcon.c:556 src/runcon.c:247 +#: src/chcon.c:562 src/runcon.c:251 #, fuzzy, c-format msgid "invalid context: %s" msgstr "ugyldig breddespesifikasjon «%s»" -#: src/chcon.c:563 +#: src/chcon.c:569 #, c-format msgid "conflicting security context specifiers given" msgstr "" -#: src/chcon.c:572 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:433 src/cp.c:493 -#: src/mv.c:96 src/pwd.c:273 src/rm.c:324 src/touch.c:351 +#: 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 #, c-format msgid "failed to get attributes of %s" msgstr "" @@ -1276,12 +1284,6 @@ msgid "" msgstr "" " +N samme som -s N (avleggs, vil bli tilbaketrukket)\n" -#: src/chgrp.c:132 src/chmod.c:387 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/chgrp.c:136 msgid "" " --reference=RFILE use RFILE's group rather than specifying a\n" @@ -1503,7 +1505,7 @@ msgstr "" msgid "Roland McGrath" msgstr "" -#: src/chroot.c:97 src/install.c:575 src/setuidgid.c:110 src/setuidgid.c:120 +#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120 #, fuzzy, c-format msgid "invalid group %s" msgstr "ugyldig gruppe" @@ -1565,8 +1567,8 @@ msgstr "kan ikke utelate både bruker og gruppe" msgid "failed to set user-ID" msgstr "" -#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:213 src/stdbuf.c:366 -#: src/timeout.c:402 +#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365 +#: src/timeout.c:454 #, c-format msgid "failed to run command %s" msgstr "" @@ -1671,19 +1673,23 @@ msgstr "" msgid "empty %s not allowed" msgstr "" -#: src/copy.c:168 src/dd.c:1609 src/dd.c:1976 -#, fuzzy, c-format -msgid "reading %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 +#, c-format +msgid "error reading %s" msgstr "feil ved lesing av %s" -#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:426 +#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425 #, fuzzy, c-format msgid "cannot lseek %s" msgstr "%s: kan ikke søke til posisjon %s%s" -#: src/copy.c:206 src/dd.c:2039 src/dd.c:2102 -#, fuzzy, c-format -msgid "writing %s" +#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151 +#, c-format +msgid "error writing %s" msgstr "feil ved skriving til %s" #: src/copy.c:313 @@ -1706,7 +1712,7 @@ msgstr "" msgid "clearing permissions for %s" msgstr "kan ikke endre rettigheter til %s" -#: src/copy.c:697 src/copy.c:2470 src/cp.c:331 +#: src/copy.c:697 src/copy.c:2480 src/cp.c:329 #, c-format msgid "failed to preserve ownership for %s" msgstr "" @@ -1721,14 +1727,14 @@ msgstr "" msgid "failed to preserve authorship for %s" msgstr "" -#: src/copy.c:804 src/csplit.c:638 src/du.c:901 src/fmt.c:449 src/head.c:847 -#: src/sort.c:4489 src/split.c:1329 src/tail.c:1756 src/wc.c:678 +#: 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:1546 src/dd.c:2114 src/dd.c:2252 -#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:141 +#: 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 #, c-format msgid "cannot fstat %s" msgstr "" @@ -1748,14 +1754,14 @@ msgstr "" 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:1574 src/copy.c:1777 src/copy.c:1935 src/ln.c:314 -#: src/remove.c:267 src/remove.c:293 src/remove.c:444 src/remove.c:465 +#: 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" -#: src/copy.c:886 src/copy.c:1578 src/copy.c:1772 src/copy.c:1940 -#: src/remove.c:418 +#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945 +#: src/remove.c:375 #, c-format msgid "removed %s\n" msgstr "" @@ -1775,186 +1781,186 @@ msgstr "kan ikke opprette midlertidig fil" msgid "failed to clone %s from %s" msgstr "kan ikke endre rettigheter til %s" -#: src/copy.c:1098 src/copy.c:2531 +#: src/copy.c:1098 src/copy.c:2541 #, c-format msgid "preserving times for %s" msgstr "" -#: src/copy.c:1170 src/copy.c:1176 src/head.c:855 src/touch.c:175 -#: src/truncate.c:413 +#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172 +#: src/truncate.c:417 #, fuzzy, c-format -msgid "closing %s" -msgstr "lukker %s (fd=%d)" +msgid "failed to close %s" +msgstr "%s: fil for lang" -#: src/copy.c:1466 +#: src/copy.c:1471 #, c-format msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? " msgstr "" -#: src/copy.c:1473 +#: src/copy.c:1478 #, c-format msgid "%s: overwrite %s? " msgstr "" -#: src/copy.c:1542 +#: src/copy.c:1547 #, c-format msgid " (backup: %s)" msgstr "" -#: src/copy.c:1552 +#: src/copy.c:1557 #, c-format msgid "failed to restore the default file creation context" msgstr "" -#: src/copy.c:1584 +#: src/copy.c:1589 #, fuzzy, c-format msgid "cannot create hard link %s to %s" msgstr "kan ikke opprette katalog %s" -#: src/copy.c:1637 src/copy.c:1689 src/copy.c:2272 src/copy.c:2589 +#: 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:1220 src/truncate.c:365 +#: src/stat.c:1239 src/truncate.c:363 #, fuzzy, c-format msgid "cannot stat %s" msgstr "kan ikke opprette katalog %s" -#: src/copy.c:1645 +#: src/copy.c:1650 #, fuzzy, c-format msgid "omitting directory %s" msgstr "kan ikke opprette katalog %s" -#: src/copy.c:1659 +#: src/copy.c:1664 #, c-format msgid "warning: source file %s specified more than once" msgstr "" -#: src/copy.c:1707 src/ln.c:246 +#: src/copy.c:1712 src/ln.c:246 #, c-format msgid "%s and %s are the same file" msgstr "" -#: src/copy.c:1806 +#: src/copy.c:1811 #, fuzzy, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "kan ikke skifte til katalog, %s" -#: src/copy.c:1824 src/ln.c:214 +#: src/copy.c:1829 src/ln.c:214 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "" -#: src/copy.c:1842 +#: src/copy.c:1847 #, fuzzy, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "kan ikke opprette katalog %s" -#: src/copy.c:1856 +#: src/copy.c:1861 #, fuzzy, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "kan ikke skifte til katalog, %s" -#: src/copy.c:1886 +#: src/copy.c:1891 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "" -#: src/copy.c:1887 +#: src/copy.c:1892 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "" -#: src/copy.c:1910 src/ln.c:276 +#: src/copy.c:1915 src/ln.c:276 #, c-format msgid "cannot backup %s" msgstr "" -#: src/copy.c:1974 +#: src/copy.c:1979 #, c-format msgid "will not copy %s through just-created symlink %s" msgstr "" -#: src/copy.c:2051 +#: src/copy.c:2056 #, fuzzy, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "kan ikke opprette katalog %s" -#: src/copy.c:2068 +#: src/copy.c:2073 #, fuzzy, c-format msgid "will not create hard link %s to directory %s" msgstr "kan ikke skifte til katalog, %s" -#: src/copy.c:2118 +#: src/copy.c:2123 #, fuzzy, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "kan ikke skifte til katalog, %s" -#: src/copy.c:2161 +#: src/copy.c:2166 #, fuzzy, c-format msgid "cannot move %s to %s" msgstr "kan ikke utføre ioctl på «%s»" -#: src/copy.c:2173 +#: src/copy.c:2178 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" -#: src/copy.c:2207 src/install.c:905 src/mkdir.c:189 src/mkfifo.c:114 -#: src/mknod.c:167 +#: 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:2241 +#: src/copy.c:2246 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "" -#: src/copy.c:2350 +#: src/copy.c:2355 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "" -#: src/copy.c:2357 +#: src/copy.c:2362 #, fuzzy, c-format msgid "cannot create symbolic link %s to %s" msgstr "kan ikke opprette katalog %s" -#: src/copy.c:2406 src/mkfifo.c:133 +#: src/copy.c:2416 src/mkfifo.c:132 #, fuzzy, c-format msgid "cannot create fifo %s" msgstr "kan ikke opprette katalog %s" -#: src/copy.c:2415 +#: src/copy.c:2425 #, fuzzy, c-format msgid "cannot create special file %s" msgstr "tegn-posisjon er null" -#: src/copy.c:2426 src/ls.c:3191 src/stat.c:902 +#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921 #, fuzzy, c-format msgid "cannot read symbolic link %s" msgstr "kan ikke utføre ioctl på «%s»" -#: src/copy.c:2453 +#: src/copy.c:2463 #, fuzzy, c-format msgid "cannot create symbolic link %s" msgstr "kan ikke opprette katalog %s" -#: src/copy.c:2485 +#: src/copy.c:2495 #, c-format msgid "%s has unknown file type" msgstr "" -#: src/copy.c:2629 src/ln.c:358 +#: src/copy.c:2644 src/ln.c:358 #, c-format msgid "cannot un-backup %s" msgstr "" -#: src/copy.c:2633 +#: src/copy.c:2648 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "" -#: src/cp.c:156 src/mv.c:284 +#: src/cp.c:156 src/mv.c:286 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -1965,24 +1971,10 @@ msgstr "" "eller: %s -G [FLAGG]... [INN [UT]]\n" #: src/cp.c:162 -msgid "" -"Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" -"\n" +msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" msgstr "" -#: src/cp.c:166 src/csplit.c:1458 src/cut.c:197 src/df.c:852 src/du.c:268 -#: src/expand.c:112 src/fmt.c:275 src/fold.c:75 src/head.c:115 -#: src/install.c:612 src/kill.c:86 src/ln.c:392 src/ls.c:4726 src/mkdir.c:61 -#: src/mkfifo.c:56 src/mknod.c:58 src/mv.c:294 src/nl.c:191 src/paste.c:445 -#: src/pr.c:2777 src/ptx.c:1825 src/shred.c:153 src/shuf.c:58 src/sort.c:399 -#: src/split.c:211 src/stdbuf.c:95 src/tac.c:142 src/tail.c:268 -#: src/touch.c:226 src/truncate.c:107 src/unexpand.c:122 src/uniq.c:145 -msgid "" -"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/cp.c:169 +#: src/cp.c:168 msgid "" " -a, --archive same as -dR --preserve=all\n" " --attributes-only don't copy the file data, just the " @@ -1996,32 +1988,33 @@ msgid "" " -d same as --no-dereference --preserve=links\n" msgstr "" -#: src/cp.c:178 +#: src/cp.c:177 msgid "" " -f, --force if an existing destination file cannot be\n" -" opened, remove it and try again (redundant " -"if\n" -" the -n option is used)\n" +" opened, remove it and try again (this " +"option\n" +" is ignored when the -n option is also " +"used)\n" " -i, --interactive prompt before overwrite (overrides a previous " "-n\n" " option)\n" " -H follow command-line symbolic links in SOURCE\n" msgstr "" -#: src/cp.c:188 +#: src/cp.c:186 msgid "" " -l, --link hard link files instead of copying\n" " -L, --dereference always follow symbolic links in SOURCE\n" msgstr "" -#: src/cp.c:192 +#: src/cp.c:190 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:197 +#: src/cp.c:195 msgid "" " -p same as --preserve=mode,ownership,timestamps\n" " --preserve[=ATTR_LIST] preserve the specified attributes (default:\n" @@ -2031,13 +2024,13 @@ msgid "" " all\n" msgstr "" -#: src/cp.c:205 +#: src/cp.c:203 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:209 +#: src/cp.c:207 msgid "" " -R, -r, --recursive copy directories recursively\n" " --reflink[=WHEN] control clone/CoW copies. See below\n" @@ -2046,7 +2039,7 @@ msgid "" "force)\n" msgstr "" -#: src/cp.c:215 +#: src/cp.c:213 msgid "" " --sparse=WHEN control creation of sparse files. See below\n" " --strip-trailing-slashes remove any trailing slashes from each " @@ -2054,7 +2047,7 @@ msgid "" " argument\n" msgstr "" -#: src/cp.c:220 +#: src/cp.c:218 msgid "" " -s, --symbolic-link make symbolic links instead of copying\n" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -2063,7 +2056,7 @@ msgid "" " -T, --no-target-directory treat DEST as a normal file\n" msgstr "" -#: src/cp.c:226 +#: src/cp.c:224 msgid "" " -u, --update copy only when the SOURCE file is newer\n" " than the destination file or when the\n" @@ -2072,7 +2065,7 @@ msgid "" " -x, --one-file-system stay on this file system\n" msgstr "" -#: src/cp.c:235 +#: src/cp.c:233 msgid "" "\n" "By default, sparse SOURCE files are detected by a crude heuristic and the\n" @@ -2088,7 +2081,7 @@ msgid "" "fails, or if --reflink=auto is specified, fall back to a standard copy.\n" msgstr "" -#: src/cp.c:247 src/install.c:649 src/ln.c:421 src/mv.c:321 +#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322 msgid "" "\n" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -2098,7 +2091,7 @@ msgid "" "\n" msgstr "" -#: src/cp.c:254 src/install.c:656 src/mv.c:328 +#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329 msgid "" " none, off never make backups (even if --backup is given)\n" " numbered, t make numbered backups\n" @@ -2106,7 +2099,7 @@ msgid "" " simple, never always make simple backups\n" msgstr "" -#: src/cp.c:260 +#: src/cp.c:258 msgid "" "\n" "As a special case, cp makes a backup of SOURCE when the force and backup\n" @@ -2114,90 +2107,90 @@ msgid "" "regular file.\n" msgstr "" -#: src/cp.c:319 +#: src/cp.c:317 #, c-format msgid "failed to preserve times for %s" msgstr "" -#: src/cp.c:350 +#: src/cp.c:348 #, fuzzy, c-format msgid "failed to preserve permissions for %s" msgstr "kan ikke endre rettigheter til %s" -#: src/cp.c:477 +#: src/cp.c:475 #, fuzzy, c-format msgid "cannot make directory %s" msgstr "kan ikke opprette katalog %s" -#: src/cp.c:526 src/cp.c:545 +#: src/cp.c:524 src/cp.c:543 #, c-format msgid "%s exists but is not a directory" msgstr "%s eksisterer men er ikke en katalog" -#: src/cp.c:572 src/cp.c:1068 src/install.c:401 src/install.c:844 src/ln.c:123 -#: src/ln.c:181 src/ln.c:202 src/ln.c:516 src/mv.c:152 src/mv.c:399 -#, c-format -msgid "accessing %s" -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 +#, fuzzy, c-format +msgid "failed to access %s" +msgstr "kan ikke opprette katalog %s" -#: src/cp.c:592 src/install.c:914 src/ln.c:546 src/mv.c:432 src/shred.c:1182 -#: src/touch.c:433 src/truncate.c:356 +#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181 +#: src/touch.c:429 src/truncate.c:354 #, fuzzy, c-format msgid "missing file operand" msgstr "hopp over argument" -#: src/cp.c:594 src/install.c:916 src/ln.c:560 src/mv.c:434 +#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436 #, fuzzy, c-format msgid "missing destination file operand after %s" msgstr "feltliste mangler" -#: src/cp.c:603 src/install.c:925 src/mv.c:443 +#: src/cp.c:601 src/install.c:926 src/mv.c:445 #, fuzzy, c-format msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)" msgstr "kan ikke skifte til katalog, %s" -#: src/cp.c:619 src/cp.c:1070 src/install.c:403 src/install.c:846 -#: src/install.c:938 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:401 -#: src/mv.c:457 +#: 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 msgid "target %s is not a directory" msgstr "%s eksisterer men er ikke en katalog" -#: src/cp.c:730 +#: src/cp.c:728 #, c-format msgid "with --parents, the destination must be a directory" msgstr "" -#: src/cp.c:1063 src/install.c:839 src/ln.c:511 src/mv.c:394 +#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395 #, c-format msgid "multiple target directories specified" msgstr "" -#: src/cp.c:1108 +#: src/cp.c:1110 #, c-format msgid "cannot make both hard and symbolic links" msgstr "" -#: src/cp.c:1115 src/mv.c:464 +#: src/cp.c:1117 src/mv.c:466 #, fuzzy, c-format msgid "options --backup and --no-clobber are mutually exclusive" msgstr "flaggene --string og --check kan ikke brukes samtidig" -#: src/cp.c:1121 +#: src/cp.c:1123 #, c-format msgid "--reflink can be used only with --sparse=auto" msgstr "" -#: src/cp.c:1129 src/install.c:899 src/ln.c:582 src/mv.c:472 +#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474 msgid "backup type" msgstr "" -#: src/cp.c:1154 +#: src/cp.c:1156 #, c-format msgid "cannot preserve security context without an SELinux-enabled kernel" msgstr "" -#: src/cp.c:1160 +#: src/cp.c:1162 #, c-format msgid "cannot preserve extended attributes, cp is built without xattr support" msgstr "" @@ -2207,137 +2200,136 @@ msgstr "" msgid "Stuart Kemp" msgstr "" -#: src/csplit.c:529 +#: src/csplit.c:531 #, c-format msgid "input disappeared" msgstr "input forsvant" -#: src/csplit.c:658 src/csplit.c:669 +#: src/csplit.c:660 src/csplit.c:671 #, c-format msgid "%s: line number out of range" msgstr "%s: linjenummer utenfor tillatte verdier" -#: src/csplit.c:698 +#: src/csplit.c:700 #, fuzzy, c-format msgid "%s: %s: line number out of range" msgstr "%s: «%s»: linjenummer utenfor tillatte verdier" -#: src/csplit.c:701 src/csplit.c:750 +#: src/csplit.c:703 src/csplit.c:752 #, fuzzy, c-format msgid " on repetition %s\n" msgstr " ved %d. repetisjon\n" -#: src/csplit.c:744 +#: src/csplit.c:746 #, fuzzy, c-format msgid "%s: %s: match not found" msgstr "%s: «%s»: ingen treff funnet" -#: src/csplit.c:808 src/csplit.c:848 src/nl.c:359 src/tac.c:274 +#: src/csplit.c:810 src/csplit.c:850 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:981 +#: src/csplit.c:983 #, fuzzy, c-format msgid "write error for %s" msgstr "skrivefeil for «%s»" -#: src/csplit.c:1057 +#: src/csplit.c:1059 #, fuzzy, c-format msgid "%s: integer expected after delimiter" msgstr "%s: heltall forventet etter «%c»" -#: src/csplit.c:1073 +#: src/csplit.c:1075 #, fuzzy, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: «}» er nødvendig i gjentagelsesantall" -#: src/csplit.c:1083 +#: src/csplit.c:1085 #, fuzzy, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: heltall kreves mellom «{» og «}»" -#: src/csplit.c:1110 +#: src/csplit.c:1112 #, fuzzy, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: avsluttende skilletegn «%c» mangler" -#: src/csplit.c:1127 +#: src/csplit.c:1129 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: ugyldig regulært uttrykk: %s" -#: src/csplit.c:1160 +#: src/csplit.c:1162 #, c-format msgid "%s: invalid pattern" msgstr "%s: ugyldig mønster" -#: src/csplit.c:1163 +#: src/csplit.c:1165 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: linjenummeret må være større enn null" -#: src/csplit.c:1169 +#: src/csplit.c:1171 #, fuzzy, c-format msgid "line number %s is smaller than preceding line number, %s" msgstr "linjenummer «%s» er mindre enn foregående linjenummer, %s" -#: src/csplit.c:1175 +#: src/csplit.c:1177 #, fuzzy, 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:1253 +#: src/csplit.c:1255 #, c-format msgid "missing conversion specifier in suffix" msgstr "manglende konverteringsspesifikator i suffiks" -#: src/csplit.c:1259 +#: src/csplit.c:1261 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "ugyldig konvertingsspesifikator i suffiks: %c" -#: src/csplit.c:1262 +#: src/csplit.c:1264 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "ugyldig konverteringsspesifikator i suffiks: \\%.3o" -#: src/csplit.c:1267 +#: src/csplit.c:1269 #, fuzzy, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "ugyldig konvertingsspesifikator i suffiks: %c" -#: src/csplit.c:1284 +#: src/csplit.c:1286 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "for mange %%-konverteringsspesifikasjoner i suffiks" -#: src/csplit.c:1298 +#: src/csplit.c:1300 #, c-format msgid "missing %% conversion specification in suffix" msgstr "manglende %%-konverteringsspesifikasjon i suffiks" -#: src/csplit.c:1345 +#: src/csplit.c:1347 #, c-format msgid "%s: invalid number" msgstr "%s: ugyldig nummer" -#: src/csplit.c:1449 +#: src/csplit.c:1451 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Bruk: %s [FLAGG]... FIL MØNSTER...\n" -#: src/csplit.c:1453 +#: src/csplit.c:1455 #, 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" -"\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" -#: src/csplit.c:1461 +#: src/csplit.c:1462 #, fuzzy, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2348,7 +2340,7 @@ msgstr "" " -f, --prefix=PREFIX bruk PREFIX isteden for «xx»\n" " -k, --keep-files ikke fjern utfiler ved feil\n" -#: src/csplit.c:1466 +#: src/csplit.c:1467 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" @@ -2358,7 +2350,7 @@ msgstr "" " -s, --quiet, --silent ikke skriv ut utfil-størrelser\n" " -z, --elide-empty-files fjern tomme ut-filer\n" -#: src/csplit.c:1473 +#: src/csplit.c:1474 msgid "" "\n" "Read standard input if FILE is -. Each PATTERN may be:\n" @@ -2366,7 +2358,7 @@ msgstr "" "\n" "Les standard inn hvis FIL er -. Hvert MØNSTER må være:\n" -#: src/csplit.c:1477 +#: src/csplit.c:1478 #, fuzzy msgid "" "\n" @@ -2393,7 +2385,7 @@ msgstr "" msgid "David M. Ihnat" msgstr "" -#: src/cut.c:64 +#: src/cut.c:64 src/cut.c:372 msgid "fields and positions are numbered from 1" msgstr "" @@ -2403,14 +2395,13 @@ msgid "Usage: %s OPTION... [FILE]...\n" msgstr "Bruk: %s [FLAGG]... [FIL]...\n" #: src/cut.c:193 -msgid "" -"Print selected parts of lines from each FILE to standard output.\n" -"\n" +#, fuzzy +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" -#: src/cut.c:200 +#: src/cut.c:199 #, fuzzy msgid "" " -b, --bytes=LIST select only these bytes\n" @@ -2421,7 +2412,7 @@ msgstr "" " -c, --characters=LISTE skriv bare ut disse tegnene\n" " -d, --delimiter=SKILLE bruk SKILLE isteden for TAB som skilletegn\n" -#: src/cut.c:205 +#: src/cut.c:204 #, fuzzy msgid "" " -f, --fields=LIST select only these fields; also print any line\n" @@ -2434,13 +2425,13 @@ msgstr "" " med mindre flagget -s er spesifisert\n" " -n (ignorert)\n" -#: src/cut.c:211 +#: src/cut.c:210 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" msgstr "" -#: src/cut.c:215 +#: src/cut.c:214 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2451,7 +2442,7 @@ msgstr "" " --output-delimiter=STRENG bruk STRENG som ut-skilletegn\n" " forvalgt er å bruke inn-skilletegnet\n" -#: src/cut.c:222 +#: src/cut.c:221 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2459,7 +2450,7 @@ msgid "" "in the same order that it is read, and is written exactly once.\n" msgstr "" -#: src/cut.c:228 +#: src/cut.c:227 #, fuzzy msgid "" "Each range is one of:\n" @@ -2482,48 +2473,50 @@ msgstr "" "\n" "Uten FIL, eller når FIL er -, leses fra standard inn.\n" -#: src/cut.c:368 src/cut.c:489 -msgid "invalid byte or field list" +#: src/cut.c:367 src/cut.c:493 +#, fuzzy +msgid "invalid byte, character or field list" msgstr "ugyldig byte- eller felt-liste" -#: src/cut.c:385 +#: src/cut.c:387 #, fuzzy msgid "invalid range with no endpoint: -" msgstr "ugyldig breddespesifikasjon «%s»" -#: src/cut.c:399 +#: src/cut.c:403 #, fuzzy msgid "invalid decreasing range" msgstr "ugyldig type-streng «%s»" -#: src/cut.c:478 +#: src/cut.c:482 #, fuzzy, c-format msgid "byte offset %s is too large" msgstr "%s er for stor" -#: src/cut.c:481 +#: src/cut.c:485 #, fuzzy, c-format msgid "field number %s is too large" msgstr "felt-nummer er null" -#: src/cut.c:789 src/cut.c:797 +#: src/cut.c:795 src/cut.c:803 msgid "only one type of list may be specified" msgstr "bare en liste-type kan spesifiseres" -#: src/cut.c:806 +#: src/cut.c:812 src/numfmt.c:1408 +#, c-format msgid "the delimiter must be a single character" msgstr "skilletegnet må være ett enkelt tegn" -#: src/cut.c:841 +#: src/cut.c:847 msgid "you must specify a list of bytes, characters, or fields" msgstr "du må spesifisere en liste av bytes, tegn eller felt" -#: src/cut.c:844 +#: src/cut.c:850 #, fuzzy msgid "an input delimiter may be specified only when operating on fields" msgstr "et skilletegn kan bare spesifiseres når en opererer med felt" -#: src/cut.c:848 +#: src/cut.c:854 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2531,11 +2524,11 @@ msgstr "" "fjerning av linjer uten skilletegn er meningsløst dersom en ikke opererer\n" "\tmed felt" -#: src/cut.c:864 +#: src/cut.c:870 msgid "missing list of fields" msgstr "feltliste mangler" -#: src/cut.c:866 +#: src/cut.c:872 msgid "missing list of positions" msgstr "posisjonsliste mangler" @@ -2547,9 +2540,11 @@ msgid "" msgstr "" #: src/date.c:128 +msgid "Display the current time in the given FORMAT, or set the system date.\n" +msgstr "" + +#: src/date.c:134 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" " -I[TIMESPEC], --iso-8601[=TIMESPEC] output date/time in ISO 8601 format.\n" @@ -2558,14 +2553,14 @@ msgid "" " and time to the indicated precision.\n" msgstr "" -#: src/date.c:138 +#: src/date.c:142 msgid "" " -r, --reference=FILE display the last modification time of FILE\n" " -R, --rfc-2822 output date and time in RFC 2822 format.\n" " Example: Mon, 07 Aug 2006 12:34:56 -0600\n" msgstr "" -#: src/date.c:143 +#: src/date.c:147 msgid "" " --rfc-3339=TIMESPEC output date and time in RFC 3339 format.\n" " TIMESPEC='date', 'seconds', or 'ns' for\n" @@ -2576,7 +2571,7 @@ msgid "" " -u, --utc, --universal print or set Coordinated Universal Time\n" msgstr "" -#: src/date.c:154 +#: src/date.c:158 msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" @@ -2585,7 +2580,7 @@ msgid "" " %a locale's abbreviated weekday name (e.g., Sun)\n" msgstr "" -#: src/date.c:161 +#: src/date.c:165 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2593,7 +2588,7 @@ msgid "" " %c locale's date and time (e.g., Thu Mar 3 23:05:25 2005)\n" msgstr "" -#: src/date.c:167 +#: src/date.c:171 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2601,14 +2596,14 @@ msgid "" " %e day of month, space padded; same as %_d\n" msgstr "" -#: src/date.c:173 +#: src/date.c:177 msgid "" " %F full date; same as %Y-%m-%d\n" " %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 "" -#: src/date.c:178 +#: src/date.c:182 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2616,7 +2611,7 @@ msgid "" " %j day of year (001..366)\n" msgstr "" -#: src/date.c:184 +#: src/date.c:188 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -2624,7 +2619,7 @@ msgid "" " %M minute (00..59)\n" msgstr "" -#: src/date.c:190 +#: src/date.c:194 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2635,7 +2630,7 @@ msgid "" " %s seconds since 1970-01-01 00:00:00 UTC\n" msgstr "" -#: src/date.c:199 +#: src/date.c:203 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2643,7 +2638,7 @@ msgid "" " %u day of week (1..7); 1 is Monday\n" msgstr "" -#: src/date.c:205 +#: src/date.c:209 msgid "" " %U week number of year, with Sunday as first day of week (00..53)\n" " %V ISO week number, with Monday as first day of week (01..53)\n" @@ -2651,7 +2646,7 @@ msgid "" " %W week number of year, with Monday as first day of week (00..53)\n" msgstr "" -#: src/date.c:211 +#: src/date.c:215 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -2659,7 +2654,7 @@ msgid "" " %Y year\n" msgstr "" -#: src/date.c:217 +#: src/date.c:221 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -2671,7 +2666,7 @@ msgid "" "By default, date pads numeric fields with zeroes.\n" msgstr "" -#: src/date.c:226 +#: src/date.c:230 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -2682,7 +2677,7 @@ msgid "" " # use opposite case if possible\n" msgstr "" -#: src/date.c:235 +#: src/date.c:239 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -2691,7 +2686,7 @@ msgid "" "O to use the locale's alternate numeric symbols if available.\n" msgstr "" -#: src/date.c:242 +#: src/date.c:246 msgid "" "\n" "Examples:\n" @@ -2705,35 +2700,35 @@ msgid "" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:275 src/dd.c:2193 src/head.c:838 src/md5sum.c:477 -#: src/md5sum.c:798 src/od.c:863 src/od.c:1914 src/pr.c:1176 src/pr.c:1372 -#: src/pr.c:1494 src/stty.c:842 src/tac.c:563 src/tail.c:343 src/tee.c:126 +#: 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 #, c-format msgid "standard input" msgstr "standard inn" -#: src/date.c:303 src/date.c:523 +#: src/date.c:307 src/date.c:527 #, fuzzy, c-format msgid "invalid date %s" msgstr "ugyldig bredde: «%s»" -#: src/date.c:414 src/date.c:448 +#: src/date.c:418 src/date.c:452 #, c-format msgid "multiple output formats specified" msgstr "" -#: src/date.c:426 +#: src/date.c:430 #, fuzzy, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "flaggene --string og --check kan ikke brukes samtidig" -#: src/date.c:433 +#: src/date.c:437 #, c-format msgid "the options to print and set the time may not be used together" msgstr "" -#: src/date.c:454 +#: src/date.c:458 #, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -2741,23 +2736,23 @@ msgid "" "argument must be a format string beginning with '+'" msgstr "" -#: src/date.c:531 +#: src/date.c:535 #, c-format msgid "cannot set date" msgstr "" -#: src/date.c:554 src/du.c:360 +#: src/date.c:558 src/du.c:371 #, fuzzy, c-format msgid "time %s is out of range" msgstr "%s: linjenummer utenfor tillatte verdier" #. This is a proper name. See the gettext manual, section Names. -#: src/dd.c:44 src/factor.c:43 src/rm.c:41 src/tail.c:69 src/touch.c:41 +#: 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 "" -#: src/dd.c:517 +#: src/dd.c:521 #, fuzzy, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -2766,7 +2761,7 @@ msgstr "" "Bruk: %s [FIL]...\n" "eller: %s [FLAGG]\n" -#: src/dd.c:522 +#: src/dd.c:526 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -2777,7 +2772,7 @@ msgid "" " ibs=BYTES read up to BYTES bytes at a time (default: 512)\n" msgstr "" -#: src/dd.c:531 +#: src/dd.c:535 msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -2786,13 +2781,14 @@ msgid "" " oflag=FLAGS write as per the comma separated symbol list\n" " seek=N skip N obs-sized blocks at start of output\n" " skip=N skip N ibs-sized blocks at start of input\n" -" status=noxfer suppress transfer statistics\n" +" status=WHICH WHICH info to suppress outputting to stderr;\n" +" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" msgstr "" -#: src/dd.c:541 +#: src/dd.c:546 msgid "" "\n" -"BLOCKS and BYTES may be followed by the following multiplicative suffixes:\n" +"N and BYTES may be followed by the following multiplicative suffixes:\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, and so on for T, P, E, Z, Y.\n" "\n" @@ -2800,7 +2796,7 @@ msgid "" "\n" msgstr "" -#: src/dd.c:550 +#: src/dd.c:555 msgid "" " ascii from EBCDIC to ASCII\n" " ebcdic from ASCII to EBCDIC\n" @@ -2815,7 +2811,7 @@ msgid "" " with block or unblock, pad with spaces rather than NULs\n" msgstr "" -#: src/dd.c:563 +#: src/dd.c:568 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -2825,7 +2821,7 @@ msgid "" " fsync likewise, but also write metadata\n" msgstr "" -#: src/dd.c:571 +#: src/dd.c:576 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -2834,76 +2830,76 @@ msgid "" "suggested)\n" msgstr "" -#: src/dd.c:578 +#: src/dd.c:583 msgid " cio use concurrent I/O for data\n" msgstr "" -#: src/dd.c:580 +#: src/dd.c:585 msgid " direct use direct I/O for data\n" msgstr "" -#: src/dd.c:582 +#: src/dd.c:587 #, fuzzy msgid " directory fail unless a directory\n" msgstr "%s eksisterer men er ikke en katalog" -#: src/dd.c:584 +#: src/dd.c:589 msgid " dsync use synchronized I/O for data\n" msgstr "" -#: src/dd.c:586 +#: src/dd.c:591 msgid " sync likewise, but also for metadata\n" msgstr "" -#: src/dd.c:587 +#: src/dd.c:592 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr "" -#: src/dd.c:590 +#: src/dd.c:595 msgid " nonblock use non-blocking I/O\n" msgstr "" -#: src/dd.c:592 +#: src/dd.c:597 msgid " noatime do not update access time\n" msgstr "" -#: src/dd.c:595 +#: src/dd.c:600 msgid " nocache discard cached data\n" msgstr "" -#: src/dd.c:598 +#: src/dd.c:603 msgid " noctty do not assign controlling terminal from file\n" msgstr "" -#: src/dd.c:601 +#: src/dd.c:606 msgid " nofollow do not follow symlinks\n" msgstr "" -#: src/dd.c:603 +#: src/dd.c:608 msgid " nolinks fail if multiply-linked\n" msgstr "" -#: src/dd.c:605 +#: src/dd.c:610 msgid " binary use binary I/O for data\n" msgstr "" -#: src/dd.c:607 +#: src/dd.c:612 msgid " text use text I/O for data\n" msgstr "" -#: src/dd.c:609 +#: src/dd.c:614 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:612 +#: src/dd.c:617 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:615 +#: src/dd.c:620 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:620 +#: src/dd.c:625 #, c-format msgid "" "\n" @@ -2920,28 +2916,28 @@ msgid "" "\n" msgstr "" -#: src/dd.c:676 +#: src/dd.c:683 #, c-format msgid "" "%<PRIuMAX>+%<PRIuMAX> records in\n" "%<PRIuMAX>+%<PRIuMAX> records out\n" msgstr "" -#: src/dd.c:682 +#: src/dd.c:689 #, c-format msgid "%<PRIuMAX> truncated record\n" msgid_plural "%<PRIuMAX> truncated records\n" msgstr[0] "" msgstr[1] "" -#: src/dd.c:694 +#: src/dd.c:701 #, c-format msgid "%<PRIuMAX> byte (%s) copied" msgid_plural "%<PRIuMAX> bytes (%s) copied" msgstr[0] "" msgstr[1] "" -#: src/dd.c:712 +#: src/dd.c:720 msgid "Infinity B" msgstr "" @@ -2955,240 +2951,261 @@ 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:725 +#: src/dd.c:733 #, c-format msgid ", %g s, %s/s\n" msgstr "" -#: src/dd.c:804 +#: src/dd.c:812 #, fuzzy, c-format msgid "closing input file %s" msgstr "lager filen «%s»\n" -#: src/dd.c:811 +#: src/dd.c:819 #, c-format msgid "closing output file %s" msgstr "" -#: src/dd.c:1014 +#: src/dd.c:1022 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "" -#: src/dd.c:1085 src/dd.c:1934 +#: src/dd.c:1093 src/dd.c:1942 #, fuzzy, c-format msgid "writing to %s" msgstr "feil ved skriving til %s" -#: src/dd.c:1199 src/dd.c:1253 +#: src/dd.c:1207 src/dd.c:1261 #, fuzzy, c-format msgid "unrecognized operand %s" msgstr "ukjent flagg «-%c»" -#: src/dd.c:1210 +#: src/dd.c:1218 #, fuzzy msgid "invalid conversion" msgstr "ugyldig breddespesifikasjon «%s»" -#: src/dd.c:1213 src/dd.c:1289 +#: src/dd.c:1221 src/dd.c:1297 #, fuzzy msgid "invalid input flag" msgstr "ugyldig tall i feltstart" -#: src/dd.c:1216 src/dd.c:1283 src/dd.c:1295 +#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303 #, fuzzy msgid "invalid output flag" msgstr "ugyldig gruppe" -#: src/dd.c:1219 +#: src/dd.c:1227 #, fuzzy msgid "invalid status flag" msgstr "ugyldig bruker" -#: src/dd.c:1258 src/truncate.c:312 +#: src/dd.c:1266 src/truncate.c:310 #, fuzzy, c-format msgid "invalid number %s" msgstr "ugyldig antall" -#: src/dd.c:1340 +#: src/dd.c:1348 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "" -#: src/dd.c:1342 +#: src/dd.c:1350 #, fuzzy, c-format msgid "cannot combine block and unblock" msgstr "kan ikke utelate både bruker og gruppe" -#: src/dd.c:1344 +#: src/dd.c:1352 #, fuzzy, c-format msgid "cannot combine lcase and ucase" msgstr "Strengene som ble sammenlignet var «%s» og «%s»." -#: src/dd.c:1346 +#: src/dd.c:1354 #, fuzzy, c-format msgid "cannot combine excl and nocreat" msgstr "kan ikke opprette katalog %s" -#: src/dd.c:1349 +#: src/dd.c:1357 #, fuzzy, c-format msgid "cannot combine direct and nocache" msgstr "kan ikke opprette katalog %s" -#: src/dd.c:1506 +#: src/dd.c:1514 #, 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:1593 +#: src/dd.c:1601 #, fuzzy, c-format msgid "%s: cannot skip" msgstr "%s: kan ikke søke til posisjon %s%s" -#: src/dd.c:1595 src/dd.c:1614 src/dd.c:1675 +#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683 #, fuzzy, c-format msgid "%s: cannot seek" msgstr "%s: kan ikke søke til posisjon %s%s" -#: src/dd.c:1655 +#: src/dd.c:1663 #, c-format msgid "offset overflow while reading file %s" msgstr "" -#: src/dd.c:1667 +#: src/dd.c:1675 #, fuzzy, c-format msgid "warning: invalid file offset after failed read" msgstr "advarsel: ugyldig bredde %lu; bruker %d istedet" -#: src/dd.c:1671 +#: src/dd.c:1679 #, c-format msgid "cannot work around kernel bug after all" msgstr "" -#: src/dd.c:1814 +#: src/dd.c:1822 #, fuzzy, c-format msgid "setting flags for %s" msgstr "kan ikke endre rettigheter til %s" -#: src/dd.c:1867 +#: src/dd.c:1875 #, c-format msgid "memory exhausted by input buffer of size %zu bytes (%s)" msgstr "" -#: src/dd.c:1881 +#: src/dd.c:1889 #, c-format msgid "memory exhausted by output buffer of size %zu bytes (%s)" msgstr "" -#: src/dd.c:1914 +#: 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" -#: src/dd.c:2125 src/dd.c:2258 +#: src/dd.c:2133 #, c-format -msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" +msgid "failed to truncate to %<PRIdMAX> bytes in output file %s" msgstr "" -#: src/dd.c:2138 +#: src/dd.c:2146 #, c-format msgid "fdatasync failed for %s" msgstr "" -#: src/dd.c:2148 +#: src/dd.c:2156 #, c-format msgid "fsync failed for %s" msgstr "" -#: src/dd.c:2199 src/dd.c:2228 -#, fuzzy, c-format -msgid "opening %s" -msgstr "feil ved lesing av %s" +#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165 +#, c-format +msgid "failed to open %s" +msgstr "" -#: src/dd.c:2237 +#: src/dd.c:2246 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) " "blocks" msgstr "" -#: src/dd.c:2274 src/dd.c:2280 +#: src/dd.c:2267 +#, c-format +msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" +msgstr "" + +#: src/dd.c:2283 src/dd.c:2289 #, fuzzy, c-format msgid "failed to discard cache for: %s" msgstr "kan ikke endre rettigheter til %s" #. This is a proper name. See the gettext manual, section Names. -#: src/df.c:44 src/du.c:54 src/expr.c:153 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:39 src/sleep.c:35 src/sort.c:66 +#: 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 msgid "Paul Eggert" msgstr "" -#: src/df.c:140 +#: src/df.c:172 msgid "Filesystem" msgstr "" -#: src/df.c:141 +#: src/df.c:175 msgid "Type" msgstr "" -#: src/df.c:142 +#: src/df.c:178 src/df.c:542 msgid "blocks" msgstr "" -#: src/df.c:142 -msgid "Inodes" +#: src/df.c:181 +msgid "Used" msgstr "" -#: src/df.c:142 -msgid "Size" +#: src/df.c:184 +msgid "Available" msgstr "" -#: src/df.c:143 -msgid "Used" +#: src/df.c:187 +msgid "Use%" msgstr "" -#: src/df.c:143 -msgid "IUsed" +#: src/df.c:190 +msgid "Inodes" msgstr "" -#: src/df.c:144 -msgid "Available" +#: src/df.c:193 +msgid "IUsed" msgstr "" -#: src/df.c:144 +#: src/df.c:196 msgid "IFree" msgstr "" -#: src/df.c:144 -msgid "Avail" +#: src/df.c:199 +msgid "IUse%" msgstr "" -#: src/df.c:145 -msgid "Use%" +#: src/df.c:202 +msgid "Mounted on" msgstr "" -#: src/df.c:145 -msgid "IUse%" +#: src/df.c:383 +#, c-format +msgid "option --output: field '%s' unknown" +msgstr "" + +#: src/df.c:390 +#, c-format +msgid "option --output: field '%s' used more than once" +msgstr "" + +#: src/df.c:410 src/df.c:449 +msgid "Size" +msgstr "" + +#: src/df.c:414 src/df.c:451 +msgid "Avail" msgstr "" -#: src/df.c:145 +#: src/df.c:474 msgid "Capacity" msgstr "" -#: src/df.c:146 -msgid "Mounted on" +#. 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 +#, c-format +msgid "%s-%s" msgstr "" -#: src/df.c:847 +#: src/df.c:1210 msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" -"\n" msgstr "" -#: src/df.c:855 +#: src/df.c:1217 msgid "" " -a, --all include dummy file systems\n" " -B, --block-size=SIZE scale sizes by SIZE before printing them. E.g.,\n" @@ -3200,7 +3217,7 @@ msgid "" " -H, --si likewise, but use powers of 1000 not 1024\n" msgstr "" -#: src/df.c:865 +#: src/df.c:1227 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3209,8 +3226,11 @@ msgid "" "(default)\n" msgstr "" -#: src/df.c:872 +#: src/df.c:1234 msgid "" +" --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" +" or print all fields if FIELD_LIST is " +"omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" " -t, --type=TYPE limit listing to file systems of type TYPE\n" @@ -3219,21 +3239,42 @@ msgid "" " -v (ignored)\n" msgstr "" -#: src/df.c:1027 +#: src/df.c:1248 +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" +msgstr "" + +#: src/df.c:1285 +#, fuzzy, 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 "" + +#: src/df.c:1442 #, c-format msgid "file system type %s both selected and excluded" msgstr "" -#: src/df.c:1075 +#: src/df.c:1500 msgid "Warning: " msgstr "" -#: src/df.c:1077 src/stat.c:795 +#: src/df.c:1502 src/stat.c:814 #, fuzzy msgid "cannot read table of mounted file systems" msgstr "kan ikke opprette midlertidig fil" -#: src/df.c:1107 +#: src/df.c:1539 #, c-format msgid "no file systems processed" msgstr "" @@ -3325,7 +3366,7 @@ msgid "" " %s stdio.h -> \".\"\n" msgstr "" -#: src/du.c:260 src/sort.c:390 src/wc.c:112 +#: src/du.c:270 src/sort.c:394 src/wc.c:112 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3334,14 +3375,14 @@ msgstr "" "Bruk: %s [FLAGG]... [FIL]...\n" " eller: %s --traditional [FIL] [[+]POSISJON [[+]MERKE]]\n" -#: src/du.c:264 -msgid "" -"Summarize disk usage of each FILE, recursively for directories.\n" -"\n" +#: src/du.c:274 +msgid "Summarize disk usage of each FILE, recursively for directories.\n" msgstr "" -#: src/du.c:271 +#: src/du.c:280 msgid "" +" -0, --null end each output line with 0 byte rather than " +"newline\n" " -a, --all write counts for all files, not just directories\n" " --apparent-size print apparent sizes, rather than disk usage; " "although\n" @@ -3350,7 +3391,7 @@ msgid "" " fragmentation, indirect blocks, and the like\n" msgstr "" -#: src/du.c:279 +#: src/du.c:289 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" @@ -3359,9 +3400,14 @@ msgid "" " -c, --total produce a grand total\n" " -D, --dereference-args dereference only symlinks that are listed on the\n" " command line\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 "" -#: src/du.c:288 +#: src/du.c:302 msgid "" " --files0-from=F summarize disk usage of the NUL-terminated file\n" " names specified in file F;\n" @@ -3369,41 +3415,29 @@ msgid "" " -H equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" --si like -h, but use powers of 1000 not 1024\n" msgstr "" -#: src/du.c:297 +#: src/du.c:310 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 "" -#: src/du.c:302 +#: src/du.c:316 msgid "" -" -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " "default)\n" -" -0, --null end each output line with 0 byte rather than " -"newline\n" " -S, --separate-dirs 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:309 -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 "" - -#: src/du.c:318 +#: src/du.c:322 msgid "" +" -t, --threshold=SIZE exclude entries smaller than SIZE if positive,\n" +" or entries greater than SIZE if negative\n" " --time show time of the last modification of any file in " "the\n" " directory, or any of its subdirectories\n" @@ -3414,64 +3448,73 @@ msgid "" " FORMAT is interpreted like 'date'\n" msgstr "" -#: src/du.c:375 +#: src/du.c:333 +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 msgid "Infinity" msgstr "" -#: src/du.c:600 +#: src/du.c:507 +#, 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" -#: src/du.c:724 +#: src/du.c:780 #, fuzzy, c-format msgid "invalid maximum depth %s" msgstr "ugyldig bredde: «%s»" -#: src/du.c:817 +#: src/du.c:809 +#, fuzzy, c-format +msgid "invalid --threshold argument '-0'" +msgstr "ugyldig argument %s for %s" + +#: src/du.c:887 #, c-format msgid "cannot both summarize and show all entries" msgstr "" -#: src/du.c:824 +#: src/du.c:894 #, c-format msgid "warning: summarizing is the same as using --max-depth=0" msgstr "" -#: src/du.c:830 +#: src/du.c:900 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "" -#: src/du.c:896 src/sort.c:4479 src/wc.c:668 +#: src/du.c:966 src/sort.c:4533 src/wc.c:668 msgid "file operands cannot be combined with --files0-from" msgstr "" -#: src/du.c:949 src/md5sum.c:587 src/od.c:903 src/tac.c:239 src/tac.c:350 -#: src/tac.c:506 src/tac.c:586 src/wc.c:733 +#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 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:963 src/sort.c:4508 src/wc.c:747 +#: src/du.c:1040 src/sort.c:4562 src/wc.c:747 #, c-format msgid "when reading file names from stdin, no file name of %s allowed" msgstr "" -#: src/du.c:980 src/du.c:988 src/wc.c:760 src/wc.c:768 +#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768 #, fuzzy msgid "invalid zero-length file name" msgstr "ugyldig gruppe" -#: src/du.c:1007 src/head.c:149 src/head.c:262 src/head.c:334 src/head.c:538 -#: src/head.c:620 src/head.c:692 src/head.c:750 src/head.c:774 src/tail.c:412 -#: src/tail.c:500 src/tail.c:549 src/tail.c:642 src/tail.c:770 src/tail.c:818 -#: src/tail.c:855 src/tail.c:1782 src/tail.c:1812 src/uniq.c:395 -#, c-format -msgid "error reading %s" -msgstr "feil ved lesing av %s" - -#: src/du.c:1010 src/ls.c:2649 src/wc.c:791 +#: src/du.c:1088 src/ls.c:2649 src/wc.c:791 msgid "total" msgstr "totalt" @@ -3552,47 +3595,49 @@ msgid "Usage: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n" msgstr "Bruk: %s [FLAGG]... [FIL]...\n" #: src/env.c:55 +msgid "Set each NAME to VALUE in the environment and run COMMAND.\n" +msgstr "" + +#: src/env.c:61 msgid "" -"Set each NAME to VALUE in the environment and run COMMAND.\n" -"\n" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with 0 byte rather than newline\n" " -u, --unset=NAME remove variable from the environment\n" msgstr "" -#: src/env.c:64 +#: src/env.c:68 msgid "" "\n" "A mere - implies -i. If no COMMAND, print the resulting environment.\n" msgstr "" -#: src/env.c:120 +#: src/env.c:124 #, fuzzy, c-format msgid "cannot unset %s" msgstr "kan ikke utføre ioctl på «%s»" -#: src/env.c:131 +#: src/env.c:135 #, fuzzy, c-format msgid "cannot set %s" msgstr "kan ikke opprette katalog %s" -#: src/env.c:148 +#: src/env.c:152 #, c-format msgid "cannot specify --null (-0) with command" msgstr "" #: 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" -"\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" -#: src/expand.c:115 +#: src/expand.c:114 #, fuzzy msgid "" " -i, --initial do not convert tabs after non blanks\n" @@ -3601,32 +3646,32 @@ msgstr "" " -i, --initial ikke konverter tabulatorer etter ikke-blanke tegn\n" " -t, --tabs=TALL ha tabulatorer TALL tegn fra hverandre, ikke 8\n" -#: src/expand.c:119 +#: src/expand.c:118 msgid "" " -t, --tabs=LIST use comma separated list of explicit tab positions\n" msgstr " -t, --tabs=LISTE bruk komma-separert LISTE med tab-posisjoner\n" -#: src/expand.c:172 src/unexpand.c:191 +#: src/expand.c:171 src/unexpand.c:190 #, fuzzy, c-format msgid "tab stop is too large %s" msgstr "%s er for stor" -#: src/expand.c:180 src/unexpand.c:199 +#: src/expand.c:179 src/unexpand.c:198 #, fuzzy, c-format msgid "tab size contains invalid character(s): %s" msgstr "tabulatorstørrelse inneholder et ugyldig tegn" -#: src/expand.c:206 src/unexpand.c:225 +#: src/expand.c:205 src/unexpand.c:224 #, c-format msgid "tab size cannot be 0" msgstr "tabulatorstørrelse kan ikke være 0" -#: src/expand.c:208 src/unexpand.c:227 +#: src/expand.c:207 src/unexpand.c:226 #, c-format msgid "tab sizes must be ascending" msgstr "tabulatorstørrelser må være stigende" -#: src/expand.c:326 src/expand.c:345 src/unexpand.c:374 src/unexpand.c:419 +#: src/expand.c:325 src/expand.c:344 src/unexpand.c:373 src/unexpand.c:418 #, fuzzy, c-format msgid "input line is too long" msgstr "%s: fil for lang" @@ -3740,12 +3785,12 @@ msgstr "feil i søk med regulært uttrykk" msgid "non-integer argument" msgstr "begrens argument" -#: src/expr.c:793 src/truncate.c:316 +#: src/expr.c:793 src/truncate.c:314 #, c-format msgid "division by zero" msgstr "" -#: src/expr.c:887 src/sort.c:2029 +#: src/expr.c:887 src/sort.c:2044 #, fuzzy, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "Sett LC_ALL='C' for å omgå problemet." @@ -3755,25 +3800,32 @@ msgstr "Sett LC_ALL='C' for å omgå problemet." msgid "the strings compared were %s and %s" msgstr "Strengene som ble sammenlignet var «%s» og «%s»." -#: src/factor.c:449 -msgid "using arbitrary-precision arithmetic" +#. This is a proper name. See the gettext manual, section Names. +#: src/factor.c:111 +msgid "Niels Moller" msgstr "" -#: src/factor.c:460 -msgid "using single-precision arithmetic" +#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459 +#, c-format +msgid "Lucas prime test failure. This should not happen" msgstr "" -#: src/factor.c:465 src/od.c:1640 src/od.c:1709 +#: src/factor.c:2092 #, c-format -msgid "%s is too large" -msgstr "%s er for stor" +msgid "squfof queue overflow" +msgstr "" -#: src/factor.c:469 +#: src/factor.c:2419 #, fuzzy, c-format msgid "%s is not a valid positive integer" msgstr "%s: ugyldig mønster" -#: src/factor.c:494 +#: src/factor.c:2442 src/od.c:1646 src/od.c:1715 +#, c-format +msgid "%s is too large" +msgstr "%s er for stor" + +#: src/factor.c:2454 #, fuzzy, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -3782,7 +3834,7 @@ msgstr "" "Bruk: %s [FIL]...\n" "eller: %s [FLAGG]\n" -#: src/factor.c:499 +#: src/factor.c:2459 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" @@ -3806,21 +3858,20 @@ msgid "cannot stat current directory (now %s)" msgstr "kan ikke opprette katalog %s" #. This is a proper name. See the gettext manual, section Names. -#: src/fmt.c:37 +#: src/fmt.c:38 msgid "Ross Paterson" msgstr "" -#: src/fmt.c:269 +#: src/fmt.c:270 #, fuzzy, c-format msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n" msgstr "Bruk: %s [-SIFFER] [FLAGG]... [FIL]...\n" -#: src/fmt.c:270 +#: 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" -"\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 " @@ -3839,8 +3890,8 @@ msgstr "" " forstavelse\n" " -s, --split-only del opp lange linjer, men ikke fyll opp\n" -#: src/fmt.c:285 -#, fuzzy, c-format +#: src/fmt.c:287 +#, fuzzy, 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" @@ -3852,28 +3903,28 @@ msgstr "" " -u, --uniform-spacing ett mellomrom mellom ord, to etter setninger\n" " -w, --width=TALL maksimal linjelengde (ellers 75 kolonner)\n" -#: src/fmt.c:357 +#: src/fmt.c:359 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" "option; use -w N instead" msgstr "" -#: src/fmt.c:403 src/fmt.c:414 +#: src/fmt.c:405 src/fmt.c:416 #, fuzzy, c-format 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" -"\n" msgstr "" "Brekk om linjene i hver FIL (standard inn), skriv til standard ut\n" "\n" -#: src/fold.c:78 +#: src/fold.c:77 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -3883,13 +3934,13 @@ msgstr "" " -s, --spaces brekk om ved mellomrom\n" " -w, --width=BREDDE bruk BREDDE kolonner istedet for 80\n" -#: src/fold.c:289 src/pr.c:836 +#: src/fold.c:288 src/pr.c:832 #, fuzzy, c-format msgid "invalid number of columns: %s" msgstr "ugyldig antall 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:75 +#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 #: src/truncate.c:37 msgid "Padraig Brady" msgstr "" @@ -3905,17 +3956,17 @@ msgid "" "\n" msgstr "" -#: src/group-list.c:69 src/id.c:345 src/setuidgid.c:184 +#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184 #, fuzzy, c-format msgid "failed to get groups for user %s" msgstr "kan ikke endre rettigheter til %s" -#: src/group-list.c:74 src/id.c:350 +#: src/group-list.c:74 src/id.c:370 #, c-format msgid "failed to get groups for the current process" msgstr "" -#: src/group-list.c:104 +#: src/group-list.c:114 #, fuzzy, c-format msgid "cannot find name for group ID %lu" msgstr "kan ikke endre eier og/eller gruppe for %s" @@ -3958,7 +4009,6 @@ 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" -"\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" @@ -3966,7 +4016,7 @@ msgstr "" "inn.\n" "\n" -#: src/head.c:118 +#: src/head.c:117 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -3976,7 +4026,7 @@ msgid "" " K lines of each file\n" msgstr "" -#: src/head.c:126 +#: src/head.c:125 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -3984,7 +4034,7 @@ msgstr "" " -q, --quiet, --silent ikke skriv ut filnavnene først\n" " -v, --verbose skriv alltid filnavnene først\n" -#: src/head.c:132 +#: src/head.c:131 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -3992,58 +4042,58 @@ msgid "" "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n" msgstr "" -#: src/head.c:152 -#, c-format -msgid "error writing %s" -msgstr "feil ved skriving til %s" - -#: src/head.c:155 +#: src/head.c:154 #, c-format msgid "%s: file has shrunk too much" msgstr "" -#: src/head.c:228 src/head.c:1044 +#: src/head.c:227 src/head.c:1051 #, fuzzy, c-format msgid "%s: number of bytes is too large" msgstr "ugyldig antall oktetter å sammenligne" -#: src/head.c:441 +#: 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" -#: src/head.c:613 src/head.c:684 src/tail.c:450 +#: src/head.c:612 src/head.c:691 src/tail.c:449 #, fuzzy, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: kan ikke søke til posisjon %s%s" -#: src/head.c:791 +#: 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:878 +#: src/head.c:885 #, c-format msgid "%s: %s is so large that it is not representable" msgstr "%s: %s er så stor at den ikke kan representeres" -#: src/head.c:879 +#: src/head.c:886 msgid "number of lines" msgstr "antall linjer" -#: src/head.c:879 +#: src/head.c:886 msgid "number of bytes" msgstr "antall bytes" -#: src/head.c:886 src/tail.c:1947 +#: src/head.c:893 src/tail.c:1947 msgid "invalid number of lines" msgstr "ugyldig antall linjer" -#: src/head.c:887 src/tail.c:1948 +#: src/head.c:894 src/tail.c:1948 msgid "invalid number of bytes" msgstr "ugyldig antall bytes" -#: src/head.c:974 src/head.c:1032 +#: src/head.c:981 src/head.c:1039 #, fuzzy, c-format msgid "invalid trailing option -- %c" msgstr "%s: ukjent flagg -- %c\n" @@ -4140,86 +4190,86 @@ msgstr "" msgid "cannot get effective UID" msgstr "kan ikke opprette katalog %s" -#: src/id.c:289 +#: src/id.c:311 #, fuzzy, c-format -msgid "cannot find name for user ID %lu" +msgid "cannot find name for user ID %s" msgstr "kan ikke endre eier og/eller gruppe for %s" -#: src/id.c:309 +#: src/id.c:329 #, c-format -msgid "uid=%lu" +msgid "uid=%s" msgstr "" -#: src/id.c:314 +#: src/id.c:334 #, c-format -msgid " gid=%lu" +msgid " gid=%s" msgstr "" -#: src/id.c:321 +#: src/id.c:341 #, c-format -msgid " euid=%lu" +msgid " euid=%s" msgstr "" -#: src/id.c:329 +#: src/id.c:349 #, c-format -msgid " egid=%lu" +msgid " egid=%s" msgstr "" -#: src/id.c:357 +#: src/id.c:377 msgid " groups=" msgstr "" -#: src/id.c:373 +#: src/id.c:393 #, c-format msgid " context=%s" msgstr "" -#: src/install.c:372 +#: src/install.c:373 #, fuzzy, c-format msgid "warning: %s: failed to change context to %s" msgstr "kan ikke opprette katalog %s" -#: src/install.c:413 +#: src/install.c:414 #, fuzzy, c-format msgid "creating directory %s" msgstr "kan ikke opprette katalog %s" -#: src/install.c:481 +#: src/install.c:482 #, fuzzy, c-format msgid "cannot change ownership of %s" msgstr "kan ikke endre rettigheter til %s" -#: src/install.c:505 +#: src/install.c:506 #, fuzzy, c-format msgid "cannot set time stamps for %s" msgstr "kan ikke opprette katalog %s" -#: src/install.c:526 src/split.c:412 src/timeout.c:387 +#: src/install.c:527 src/split.c:426 src/timeout.c:439 #, fuzzy, c-format msgid "fork system call failed" msgstr "blokkstørrelse" -#: src/install.c:530 +#: src/install.c:531 #, fuzzy, c-format msgid "cannot run %s" msgstr "kan ikke utføre ioctl på «%s»" -#: src/install.c:534 +#: src/install.c:535 #, fuzzy, c-format msgid "waiting for strip" msgstr "feil ved skriving til %s" -#: src/install.c:536 +#: src/install.c:537 #, c-format msgid "strip process terminated abnormally" msgstr "" -#: src/install.c:557 +#: src/install.c:558 #, fuzzy, c-format msgid "invalid user %s" msgstr "ugyldig bruker" -#: src/install.c:593 +#: src/install.c:594 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -4230,7 +4280,7 @@ msgstr "" "Bruk : %s [FLAGG]... [INN]... (uten -G)\n" "eller: %s -G [FLAGG]... [INN [UT]]\n" -#: src/install.c:600 +#: src/install.c:601 msgid "" "\n" "This install program copies files (often just compiled) into destination\n" @@ -4242,7 +4292,6 @@ msgid "" "In the first three forms, copy SOURCE to DEST or multiple SOURCE(s) to\n" "the existing DIRECTORY, while setting permission modes and owner/group.\n" "In the 4th form, create all components of the given DIRECTORY(ies).\n" -"\n" msgstr "" #: src/install.c:615 @@ -4290,53 +4339,53 @@ msgid "" "directories\n" msgstr "" -#: src/install.c:858 +#: src/install.c:859 #, c-format msgid "" "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled" msgstr "" -#: src/install.c:868 +#: src/install.c:869 #, c-format msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled" msgstr "" -#: src/install.c:885 +#: src/install.c:886 #, c-format msgid "the strip option may not be used when installing a directory" msgstr "" -#: src/install.c:888 +#: src/install.c:889 #, fuzzy, c-format msgid "target directory not allowed when installing a directory" msgstr "%s eksisterer men er ikke en katalog" -#: src/install.c:892 +#: src/install.c:893 #, c-format msgid "cannot force target context to %s and preserve it" msgstr "" -#: src/install.c:946 src/mkdir.c:202 src/stdbuf.c:327 +#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326 #, fuzzy, c-format msgid "invalid mode %s" msgstr "ugyldig bredde: «%s»" -#: src/install.c:953 +#: src/install.c:954 #, c-format msgid "WARNING: ignoring --strip-program option as -s option was not specified" msgstr "" -#: src/install.c:958 +#: src/install.c:959 #, fuzzy, c-format msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive" msgstr "flaggene --string og --check kan ikke brukes samtidig" -#: src/install.c:965 +#: src/install.c:966 #, fuzzy, c-format msgid "options --compare (-C) and --strip are mutually exclusive" msgstr "flaggene --string og --check kan ikke brukes samtidig" -#: src/install.c:971 +#: src/install.c:972 #, c-format msgid "" "the --compare (-C) option is ignored when you specify a mode with non-" @@ -4344,7 +4393,7 @@ msgid "" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/join.c:40 src/sort.c:65 +#: src/join.c:40 src/sort.c:66 #, fuzzy msgid "Mike Haertel" msgstr "Mike Haertel og Paul Eggert" @@ -4426,7 +4475,7 @@ msgstr "" #: src/join.c:403 #, c-format -msgid "%s:%ju: is not sorted: %.*s" +msgid "%s:%<PRIuMAX>: is not sorted: %.*s" msgstr "" #: src/join.c:840 src/join.c:1038 @@ -4454,12 +4503,12 @@ msgstr "" msgid "conflicting empty-field replacement strings" msgstr "" -#: src/join.c:1101 src/sort.c:4414 +#: src/join.c:1101 src/sort.c:4468 #, fuzzy, c-format msgid "multi-character tab %s" msgstr "flertegnstabulator «%s»" -#: src/join.c:1105 src/sort.c:4419 +#: src/join.c:1105 src/sort.c:4473 #, c-format msgid "incompatible tabs" msgstr "" @@ -4478,12 +4527,10 @@ msgid "" msgstr "" #: src/kill.c:82 -msgid "" -"Send signals to processes, or list signals.\n" -"\n" +msgid "Send signals to processes, or list signals.\n" msgstr "" -#: src/kill.c:89 +#: src/kill.c:88 msgid "" " -s, --signal=SIGNAL, -SIGNAL\n" " specify the name or number of the signal to be sent\n" @@ -4492,7 +4539,7 @@ msgid "" " -t, --table print a table of signal information\n" msgstr "" -#: src/kill.c:97 +#: src/kill.c:96 msgid "" "\n" "SIGNAL may be a signal name like 'HUP', or a signal number like '1',\n" @@ -4500,32 +4547,32 @@ msgid "" "PID is an integer; if negative it identifies a process group.\n" msgstr "" -#: src/kill.c:206 +#: src/kill.c:205 #, fuzzy, c-format msgid "%s: invalid process id" msgstr "%s: ugyldig mønster" -#: src/kill.c:260 +#: src/kill.c:259 #, fuzzy, c-format msgid "invalid option -- %c" msgstr "%s: ukjent flagg -- %c\n" -#: src/kill.c:269 +#: src/kill.c:268 #, c-format msgid "%s: multiple signals specified" msgstr "" -#: src/kill.c:283 +#: src/kill.c:282 #, c-format msgid "multiple -l or -t options specified" msgstr "" -#: src/kill.c:300 +#: src/kill.c:299 #, c-format msgid "cannot combine signal with -l or -t" msgstr "" -#: src/kill.c:306 +#: src/kill.c:305 #, c-format msgid "no process ID specified" msgstr "" @@ -4629,10 +4676,9 @@ msgid "" "When creating hard links, each TARGET must exist. Symbolic links\n" "can hold arbitrary text; if later resolved, a relative link is\n" "interpreted in relation to its parent directory.\n" -"\n" msgstr "" -#: src/ln.c:395 +#: src/ln.c:394 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -4645,7 +4691,7 @@ msgid "" " -f, --force remove existing destination files\n" msgstr "" -#: src/ln.c:403 +#: src/ln.c:402 msgid "" " -i, --interactive prompt whether to remove destinations\n" " -L, --logical dereference TARGETs that are symbolic links\n" @@ -4657,7 +4703,7 @@ msgid "" " -s, --symbolic make symbolic links instead of hard links\n" msgstr "" -#: src/ln.c:412 +#: src/ln.c:411 msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" " -t, --target-directory=DIRECTORY specify the DIRECTORY in which to " @@ -4667,18 +4713,10 @@ msgid "" " -v, --verbose print name of each linked file\n" msgstr "" -#: src/ln.c:428 -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 "" - -#: src/ln.c:435 +#: src/ln.c:433 #, 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 "" @@ -4749,7 +4787,7 @@ msgstr "" msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "" -#: src/ls.c:1750 src/ptx.c:1976 +#: src/ls.c:1750 src/ptx.c:1975 #, fuzzy, c-format msgid "invalid line width: %s" msgstr "ugyldig bredde: «%s»" @@ -4813,7 +4851,7 @@ msgstr "kan ikke opprette katalog %s" msgid "closing directory %s" msgstr "kan ikke opprette katalog %s" -#: src/ls.c:3301 +#: src/ls.c:3302 #, fuzzy, c-format msgid "cannot compare file names %s and %s" msgstr "Strengene som ble sammenlignet var «%s» og «%s»." @@ -4822,10 +4860,9 @@ msgstr "Strengene som ble sammenlignet var «%s» og «%s»." msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" -"\n" msgstr "" -#: src/ls.c:4729 +#: src/ls.c:4728 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -4834,7 +4871,7 @@ msgid "" "characters\n" msgstr "" -#: src/ls.c:4735 +#: src/ls.c:4734 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them. E." "g.,\n" @@ -4848,7 +4885,7 @@ msgid "" " otherwise: sort by ctime, newest first\n" msgstr "" -#: src/ls.c:4745 +#: src/ls.c:4744 msgid "" " -C list entries by columns\n" " --color[=WHEN] colorize the output. WHEN defaults to " @@ -4860,7 +4897,7 @@ msgid "" " -D, --dired generate output designed for Emacs' dired mode\n" msgstr "" -#: src/ls.c:4753 +#: src/ls.c:4752 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -4870,11 +4907,11 @@ msgid "" " --full-time like -l --time-style=full-iso\n" msgstr "" -#: src/ls.c:4761 +#: src/ls.c:4760 msgid " -g like -l, but do not list owner\n" msgstr "" -#: src/ls.c:4764 +#: src/ls.c:4763 msgid "" " --group-directories-first\n" " group directories before files.\n" @@ -4882,7 +4919,7 @@ msgid "" " use of --sort=none (-U) disables grouping\n" msgstr "" -#: src/ls.c:4770 +#: src/ls.c:4769 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" @@ -4890,7 +4927,7 @@ msgid "" " --si likewise, but use powers of 1000 not 1024\n" msgstr "" -#: src/ls.c:4776 +#: src/ls.c:4775 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -4903,7 +4940,7 @@ msgid "" " (overridden by -a or -A)\n" msgstr "" -#: src/ls.c:4786 +#: src/ls.c:4785 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -4915,7 +4952,7 @@ msgid "" " -k, --kibibytes use 1024-byte blocks\n" msgstr "" -#: src/ls.c:4796 +#: src/ls.c:4795 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -4925,7 +4962,7 @@ msgid "" "entries\n" msgstr "" -#: src/ls.c:4804 +#: src/ls.c:4803 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. " @@ -4936,7 +4973,7 @@ msgid "" " append / indicator to directories\n" msgstr "" -#: src/ls.c:4812 +#: src/ls.c:4811 msgid "" " -q, --hide-control-chars print ? instead of non graphic characters\n" " --show-control-chars show non graphic characters as-is (default\n" @@ -4948,7 +4985,7 @@ msgid "" "escape\n" msgstr "" -#: src/ls.c:4821 +#: src/ls.c:4820 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -4956,7 +4993,7 @@ msgid "" "blocks\n" msgstr "" -#: src/ls.c:4826 +#: src/ls.c:4825 msgid "" " -S sort by file size\n" " --sort=WORD sort by WORD instead of name: none -U,\n" @@ -4968,7 +5005,7 @@ msgid "" " if --sort=time\n" msgstr "" -#: src/ls.c:4836 +#: src/ls.c:4835 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, +FORMAT.\n" @@ -4980,13 +5017,13 @@ msgid "" " takes effect only outside the POSIX locale\n" msgstr "" -#: src/ls.c:4845 +#: src/ls.c:4844 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:4849 +#: src/ls.c:4848 msgid "" " -u with -lt: sort by, and show, access time\n" " with -l: show access time and sort by name\n" @@ -4995,7 +5032,7 @@ msgid "" " -v natural sort of (version) numbers within text\n" msgstr "" -#: src/ls.c:4856 +#: src/ls.c:4855 #, fuzzy msgid "" " -w, --width=COLS assume screen width instead of current value\n" @@ -5010,7 +5047,7 @@ msgstr "" " med mindre flagget -s er spesifisert\n" " -n (ignorert)\n" -#: src/ls.c:4866 +#: src/ls.c:4865 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5019,7 +5056,7 @@ msgid "" "variable can change the settings. Use the dircolors command to set it.\n" msgstr "" -#: src/ls.c:4873 +#: src/ls.c:4872 msgid "" "\n" "Exit status:\n" @@ -5044,7 +5081,7 @@ msgstr "" msgid "David Madore" msgstr "" -#: src/md5sum.c:162 +#: src/md5sum.c:164 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -5057,13 +5094,13 @@ msgstr "" "Skriv eller sjekk %s-sjekksummer (%d-bit).\n" "Dersom ingen FIL er spesifisert eller FIL er -, leses det fra standard inn.\n" -#: src/md5sum.c:172 +#: src/md5sum.c:174 msgid "" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr "" -#: src/md5sum.c:176 +#: src/md5sum.c:178 #, fuzzy msgid " -b, --binary read in binary mode\n" msgstr "" @@ -5071,21 +5108,25 @@ msgstr "" " -B, --binary skriv binært til konsollenheten.\n" "\n" -#: src/md5sum.c:179 +#: src/md5sum.c:181 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr "" -#: src/md5sum.c:183 +#: src/md5sum.c:184 +msgid " --tag create a BSD-style checksum\n" +msgstr "" + +#: src/md5sum.c:188 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" -#: src/md5sum.c:187 +#: src/md5sum.c:192 msgid " -t, --text read in text mode (default)\n" msgstr "" -#: src/md5sum.c:190 +#: src/md5sum.c:195 #, fuzzy msgid "" "\n" @@ -5100,12 +5141,12 @@ msgstr "" " -w, --warn advar mot feilformatterte MD5-sjekksum-linjer\n" "\n" -#: src/md5sum.c:198 +#: src/md5sum.c:203 msgid "" " --strict with --check, exit non-zero for any invalid input\n" msgstr "" -#: src/md5sum.c:203 +#: src/md5sum.c:208 #, fuzzy, c-format msgid "" "\n" @@ -5120,78 +5161,88 @@ msgstr "" "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" -#: src/md5sum.c:502 +#: src/md5sum.c:523 #, fuzzy, c-format msgid "%s: too many checksum lines" msgstr "%s: ingen riktig formatterte %s-sjekksumlinjer funnet" -#: src/md5sum.c:526 +#: src/md5sum.c:547 #, fuzzy, c-format msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line" msgstr "%s: %lu: ukorrekt formattert %s-sjekksumlinje" -#: src/md5sum.c:551 +#: src/md5sum.c:572 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: FEIL ved åpning eller lesing\n" -#: src/md5sum.c:574 +#: src/md5sum.c:595 msgid "FAILED" msgstr "FEIL" -#: src/md5sum.c:576 +#: src/md5sum.c:597 msgid "OK" msgstr "OK" -#: src/md5sum.c:600 +#: src/md5sum.c:621 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "%s: ingen riktig formatterte %s-sjekksumlinjer funnet" -#: src/md5sum.c:610 +#: src/md5sum.c:631 #, c-format msgid "WARNING: %<PRIuMAX> line is improperly formatted" msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted" msgstr[0] "" msgstr[1] "" -#: src/md5sum.c:618 +#: src/md5sum.c:639 #, fuzzy, 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" -#: src/md5sum.c:626 +#: src/md5sum.c:647 #, fuzzy, 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" -#: src/md5sum.c:704 +#: src/md5sum.c:760 +#, c-format +msgid "--tag does not support --text mode" +msgstr "" + +#: src/md5sum.c:766 +#, fuzzy, c-format +msgid "the --tag option is meaningless when verifying checksums" +msgstr "flagget --status har bare betydning ved sjekking av sjekksummer" + +#: src/md5sum.c:773 #, 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" -#: src/md5sum.c:712 +#: src/md5sum.c:781 #, c-format msgid "the --status option is meaningful only when verifying checksums" msgstr "flagget --status har bare betydning ved sjekking av sjekksummer" -#: src/md5sum.c:719 +#: src/md5sum.c:788 #, c-format msgid "the --warn option is meaningful only when verifying checksums" msgstr "flagget --warn har bare betydning ved sjekking av sjekksummer" -#: src/md5sum.c:726 +#: src/md5sum.c:795 #, fuzzy, c-format msgid "the --quiet option is meaningful only when verifying checksums" msgstr "flagget --status har bare betydning ved sjekking av sjekksummer" -#: src/md5sum.c:733 +#: src/md5sum.c:802 #, fuzzy, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "flagget --status har bare betydning ved sjekking av sjekksummer" @@ -5202,12 +5253,10 @@ msgid "Usage: %s [OPTION]... DIRECTORY...\n" msgstr "Bruk: %s [FLAGG]... [FIL]...\n" #: src/mkdir.c:57 -msgid "" -"Create the DIRECTORY(ies), if they do not already exist.\n" -"\n" +msgid "Create the DIRECTORY(ies), if they do not already exist.\n" msgstr "" -#: src/mkdir.c:64 +#: src/mkdir.c:63 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" @@ -5216,7 +5265,7 @@ msgid "" " directory to CTX\n" msgstr "" -#: src/mkdir.c:169 +#: src/mkdir.c:168 #, fuzzy, c-format msgid "created directory %s" msgstr "kan ikke opprette katalog %s" @@ -5227,27 +5276,25 @@ msgid "Usage: %s [OPTION]... NAME...\n" msgstr "Bruk: %s [FLAGG]... [FIL]...\n" #: src/mkfifo.c:52 -msgid "" -"Create named pipes (FIFOs) with the given NAMEs.\n" -"\n" +msgid "Create named pipes (FIFOs) with the given NAMEs.\n" msgstr "" -#: src/mkfifo.c:59 src/mknod.c:61 +#: src/mkfifo.c:58 src/mknod.c:60 msgid "" " -m, --mode=MODE set file permission bits to MODE, not a=rw - umask\n" msgstr "" -#: src/mkfifo.c:62 +#: src/mkfifo.c:61 msgid "" " -Z, --context=CTX set the SELinux security context of each NAME to CTX\n" msgstr "" -#: src/mkfifo.c:122 src/mknod.c:128 +#: src/mkfifo.c:121 src/mknod.c:127 #, fuzzy, c-format msgid "invalid mode" msgstr "ugyldig antall" -#: src/mkfifo.c:127 src/mknod.c:133 +#: src/mkfifo.c:126 src/mknod.c:132 #, c-format msgid "mode must specify only file permission bits" msgstr "" @@ -5258,16 +5305,14 @@ msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n" msgstr "Bruk: %s [FLAGG]... SETT1 [SETT2]\n" #: src/mknod.c:54 -msgid "" -"Create the special file NAME of the given TYPE.\n" -"\n" +msgid "Create the special file NAME of the given TYPE.\n" msgstr "" -#: src/mknod.c:64 +#: src/mknod.c:63 msgid " -Z, --context=CTX set the SELinux security context of NAME to CTX\n" msgstr "" -#: src/mknod.c:69 +#: src/mknod.c:68 msgid "" "\n" "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n" @@ -5276,7 +5321,7 @@ msgid "" "otherwise, as decimal. TYPE may be:\n" msgstr "" -#: src/mknod.c:76 +#: src/mknod.c:75 msgid "" "\n" " b create a block (buffered) special file\n" @@ -5284,42 +5329,42 @@ msgid "" " p create a FIFO\n" msgstr "" -#: src/mknod.c:151 +#: src/mknod.c:150 #, fuzzy msgid "Special files require major and minor device numbers." msgstr "ugyldig startlinjenummer: «%s»" -#: src/mknod.c:161 +#: src/mknod.c:160 #, fuzzy msgid "Fifos do not have major and minor device numbers." msgstr "ugyldig startlinjenummer: «%s»" -#: src/mknod.c:177 +#: src/mknod.c:176 #, fuzzy, c-format msgid "block special files not supported" msgstr "blokkstørrelse" -#: src/mknod.c:186 +#: src/mknod.c:185 #, fuzzy, c-format msgid "character special files not supported" msgstr "tegn-posisjon er null" -#: src/mknod.c:202 +#: src/mknod.c:201 #, fuzzy, c-format msgid "invalid major device number %s" msgstr "ugyldig startlinjenummer: «%s»" -#: src/mknod.c:207 +#: src/mknod.c:206 #, fuzzy, c-format msgid "invalid minor device number %s" msgstr "ugyldig startlinjenummer: «%s»" -#: src/mknod.c:212 +#: src/mknod.c:211 #, fuzzy, c-format msgid "invalid device %s %s" msgstr "ugyldig argument %s for %s" -#: src/mknod.c:226 +#: src/mknod.c:225 #, fuzzy, c-format msgid "invalid device type %s" msgstr "ugyldig argument %s for %s" @@ -5378,58 +5423,56 @@ msgid "" " directory specified via -p; else /tmp [deprecated]\n" msgstr "" -#: src/mktemp.c:222 +#: src/mktemp.c:223 #, c-format msgid "failed to redirect stderr to /dev/null" msgstr "" -#: src/mktemp.c:228 +#: src/mktemp.c:229 #, fuzzy, c-format msgid "too many templates" msgstr "for mange argumenter" -#: src/mktemp.c:248 +#: src/mktemp.c:249 #, c-format msgid "with --suffix, template %s must end in X" msgstr "" -#: src/mktemp.c:273 src/split.c:1117 +#: src/mktemp.c:274 src/split.c:1130 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "" -#: src/mktemp.c:278 +#: src/mktemp.c:279 #, c-format msgid "too few X's in template %s" msgstr "" -#: src/mktemp.c:291 +#: src/mktemp.c:292 #, c-format msgid "invalid template, %s, contains directory separator" msgstr "" -#: src/mktemp.c:305 +#: src/mktemp.c:306 #, c-format msgid "invalid template, %s; with --tmpdir, it may not be absolute" msgstr "" -#: src/mktemp.c:325 +#: src/mktemp.c:326 #, fuzzy, c-format msgid "failed to create directory via template %s" msgstr "kan ikke opprette katalog %s" -#: src/mktemp.c:335 +#: src/mktemp.c:336 #, c-format msgid "failed to create file via template %s" msgstr "" -#: src/mv.c:290 -msgid "" -"Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" -"\n" +#: src/mv.c:292 +msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" msgstr "" -#: src/mv.c:297 +#: src/mv.c:298 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -5442,7 +5485,7 @@ msgid "" "effect.\n" msgstr "" -#: src/mv.c:306 +#: src/mv.c:307 msgid "" " --strip-trailing-slashes remove any trailing slashes from each " "SOURCE\n" @@ -5450,7 +5493,7 @@ msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" msgstr "" -#: src/mv.c:311 +#: src/mv.c:312 msgid "" " -t, --target-directory=DIRECTORY move all SOURCE arguments into " "DIRECTORY\n" @@ -5470,28 +5513,30 @@ msgstr "Bruk: %s [FLAGG] [FIL]...\n" #, c-format msgid "" "Run COMMAND with an adjusted niceness, which affects process scheduling.\n" -"With no COMMAND, print the current niceness. Nicenesses range from\n" -"%d (most favorable scheduling) to %d (least favorable).\n" -"\n" -" -n, --adjustment=N add integer N to the niceness (default 10)\n" +"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 "" + +#: src/nice.c:82 +msgid " -n, --adjustment=N add integer N to the niceness (default 10)\n" msgstr "" -#: src/nice.c:168 +#: src/nice.c:172 #, fuzzy, c-format msgid "invalid adjustment %s" msgstr "ugyldig argument %s for %s" -#: src/nice.c:177 +#: src/nice.c:181 #, c-format msgid "a command must be given with an adjustment" msgstr "" -#: src/nice.c:184 src/nice.c:195 +#: src/nice.c:188 src/nice.c:199 #, fuzzy, c-format msgid "cannot get niceness" msgstr "kan ikke opprette midlertidig fil" -#: src/nice.c:201 +#: src/nice.c:205 #, fuzzy, c-format msgid "cannot set niceness" msgstr "kan ikke utelate både bruker og gruppe" @@ -5501,18 +5546,18 @@ msgstr "kan ikke utelate både bruker og gruppe" msgid "Scott Bartram" msgstr "" -#: src/nl.c:186 +#: 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" -"\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:194 +#: src/nl.c:186 msgid "" " -b, --body-numbering=STYLE use STYLE for numbering body lines\n" " -d, --section-delimiter=CC use CC for separating logical pages\n" @@ -5522,7 +5567,7 @@ msgstr "" " -d, --section-delimiter=CC bruk CC for å skille logiske sider\n" " -f, --footer-numbering=STIL bruk STIL for å nummerere bunntekst\n" -#: src/nl.c:199 +#: src/nl.c:191 #, fuzzy msgid "" " -h, --header-numbering=STYLE use STYLE for numbering header lines\n" @@ -5543,7 +5588,7 @@ msgstr "" " sider\n" " -s, --number-separator=STRENG legg til STRENG etter (mulig) linjenummer\n" -#: src/nl.c:207 +#: src/nl.c:199 #, fuzzy msgid "" " -v, --starting-line-number=NUMBER first line number on each logical page\n" @@ -5552,7 +5597,7 @@ 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:213 +#: src/nl.c:205 msgid "" "\n" "By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC are\n" @@ -5564,7 +5609,7 @@ msgstr "" "to skilletegn for å skille logiske sider, et manglende andretegn\n" "impliserer «:». Bruk \\\\ for \\. STIL er en av:\n" -#: src/nl.c:219 +#: src/nl.c:211 #, fuzzy msgid "" "\n" @@ -5594,52 +5639,47 @@ msgstr "" " rz høyrejustert, ledende nuller\n" "\n" -#: src/nl.c:286 +#: src/nl.c:278 #, fuzzy, c-format msgid "line number overflow" msgstr "felt-nummer er null" -#: src/nl.c:486 +#: src/nl.c:478 #, fuzzy, c-format msgid "invalid header numbering style: %s" msgstr "ugyldig felt-nummer: «%s»" -#: src/nl.c:494 +#: src/nl.c:486 #, fuzzy, c-format msgid "invalid body numbering style: %s" msgstr "ugyldig antall" -#: src/nl.c:502 +#: src/nl.c:494 #, fuzzy, c-format msgid "invalid footer numbering style: %s" msgstr "ugyldig filnummer i felt-spesifikator: «%s»" -#: src/nl.c:511 +#: src/nl.c:503 #, fuzzy, c-format msgid "invalid starting line number: %s" msgstr "ugyldig startlinjenummer: «%s»" -#: src/nl.c:517 -#, c-format -msgid "WARNING: --page-increment is deprecated; use --line-increment instead" -msgstr "" - -#: src/nl.c:524 +#: src/nl.c:512 #, fuzzy, c-format msgid "invalid line number increment: %s" msgstr "ugyldig linjenummer-økning: «%s»" -#: src/nl.c:536 +#: src/nl.c:524 #, fuzzy, c-format msgid "invalid number of blank lines: %s" msgstr "ugyldig antall blanke linjer: «%s»" -#: src/nl.c:550 +#: src/nl.c:538 #, fuzzy, c-format msgid "invalid line number field width: %s" msgstr "ugyldig linjenummer-feltbredde: «%s»" -#: src/nl.c:569 +#: src/nl.c:557 #, fuzzy, c-format msgid "invalid line numbering format: %s" msgstr "ugyldig linjenummer-økning: «%s»" @@ -5680,11 +5720,6 @@ msgstr "begge filene kan ikke være standard inn" msgid "ignoring input" msgstr "for mange argumenter" -#: src/nohup.c:163 src/nohup.c:165 -#, c-format -msgid "failed to open %s" -msgstr "" - #: src/nohup.c:175 #, c-format msgid "ignoring input and appending output to %s" @@ -5716,33 +5751,367 @@ msgid "failed to redirect standard error" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:32 +#: src/nproc.c:33 msgid "Giuseppe Scrivano" msgstr "" -#: src/nproc.c:56 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 +#: src/nproc.c:57 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 #, fuzzy, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Bruk: %s [FLAGG] [FIL]...\n" -#: src/nproc.c:57 +#: src/nproc.c:58 msgid "" "Print the number of processing units available to the current process,\n" "which may be less than the number of online processors\n" "\n" msgstr "" -#: src/nproc.c:62 +#: src/nproc.c:63 msgid "" " --all print the number of installed processors\n" " --ignore=N if possible, exclude N processing units\n" msgstr "" -#: src/nproc.c:106 +#: src/nproc.c:107 #, fuzzy, c-format msgid "%s: invalid number to ignore" msgstr "%s: ugyldig antall linjer" +#. This is a proper name. See the gettext manual, section Names. +#: src/numfmt.c:35 +msgid "Assaf Gordon" +msgstr "" + +#: src/numfmt.c:676 +#, c-format +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:684 +#, c-format +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:692 +#, c-format +msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)" +msgstr "" + +#: src/numfmt.c:723 +#, fuzzy, 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»" + +#: 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 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [NUMBER]...\n" +msgstr "Bruk: %s [FLAGG]... [FIL]...\n" + +#: src/numfmt.c:816 +msgid "" +"Reformat NUMBER(s), or the numbers from standard input if none are " +"specified.\n" +msgstr "" + +#: src/numfmt.c:820 +msgid " --debug print warnings about invalid input\n" +msgstr "" + +#: src/numfmt.c:823 +msgid "" +" -d, --delimiter=X use X instead of whitespace for field delimiter\n" +msgstr "" + +#: src/numfmt.c:826 +msgid "" +" --field=N replace the number in input field N (default is 1)\n" +msgstr "" + +#: src/numfmt.c:829 +msgid "" +" --format=FORMAT use printf style floating-point FORMAT;\n" +" see FORMAT below for details\n" +msgstr "" + +#: src/numfmt.c:833 +msgid "" +" --from=UNIT auto-scale input numbers to UNITs; default is " +"'none';\n" +" see UNIT below\n" +msgstr "" + +#: src/numfmt.c:837 +msgid "" +" --from-unit=N specify the input unit size (instead of the default " +"1)\n" +msgstr "" + +#: src/numfmt.c:840 +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 "" + +#: src/numfmt.c:844 +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 +msgid "" +" --invalid=MODE failure mode for invalid numbers: MODE can be:\n" +" abort (default), fail, warn, ignore\n" +msgstr "" + +#: src/numfmt.c:852 +msgid "" +" --padding=N pad the output to N characters; positive N will\n" +" right-align; negative N will left-align;\n" +" padding is ignored if the output is wider than N;\n" +" the default is to automatically pad if a " +"whitespace\n" +" is found\n" +msgstr "" + +#: src/numfmt.c:859 +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 +msgid "" +" --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" +" SUFFIX in input numbers\n" +msgstr "" + +#: src/numfmt.c:867 +msgid "" +" --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" +msgstr "" + +#: src/numfmt.c:870 +msgid "" +" --to-unit=N the output unit size (instead of the default 1)\n" +msgstr "" + +#: src/numfmt.c:877 +msgid "" +"\n" +"UNIT options:\n" +msgstr "" + +#: src/numfmt.c:880 +msgid " none no auto-scaling is done; suffixes will trigger an error\n" +msgstr "" + +#: src/numfmt.c:883 +msgid "" +" auto accept optional single/two letter suffix:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" +msgstr "" + +#: src/numfmt.c:889 +msgid "" +" si accept optional single letter suffix:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:894 +msgid "" +" iec accept optional single letter suffix:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:899 +msgid "" +" iec-i accept optional two-letter suffix:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:905 +#, 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" +msgstr "" + +#: src/numfmt.c:912 +#, c-format +msgid "" +"\n" +"Exit status is 0 if all input numbers were successfully converted.\n" +"By default, %s will stop at the first conversion error with exit status 2.\n" +"With --invalid='fail' a warning is printed for each conversion error\n" +"and the exit status is 2. With --invalid='warn' each conversion error is\n" +"diagnosed, but the exit status is 0. With --invalid='ignore' conversion\n" +"errors are not diagnosed and the exit status is 0.\n" +msgstr "" + +#: src/numfmt.c:921 +#, c-format +msgid "" +"\n" +"Examples:\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" +msgstr "" + +#: src/numfmt.c:974 src/seq.c:212 +#, c-format +msgid "format %s has no %% directive" +msgstr "" + +#: src/numfmt.c:990 +#, fuzzy, c-format +msgid "invalid format %s (width overflow)" +msgstr "ugyldig argument %s for %s" + +#: src/numfmt.c:1007 src/seq.c:229 +#, c-format +msgid "format %s ends in %%" +msgstr "" + +#: src/numfmt.c:1010 +#, c-format +msgid "invalid format %s, directive must be %%['][-][N]f" +msgstr "" + +#: src/numfmt.c:1018 src/seq.c:236 +#, 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:1092 +#, c-format +msgid "value too large to be printed: '%Lg' (consider using --to)" +msgstr "" + +#: src/numfmt.c:1100 +#, c-format +msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" +msgstr "" + +#: src/numfmt.c:1184 +#, c-format +msgid "large input value '%s': possible precision loss" +msgstr "" + +#: src/numfmt.c:1293 +#, 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:1430 +#, fuzzy, c-format +msgid "invalid header value '%s'" +msgstr "ugyldig bredde: «%s»" + +#: src/numfmt.c:1456 +#, 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 +#, fuzzy, c-format +msgid "no conversion option specified" +msgstr "kun ett argument kan spesifiseres" + +#: src/numfmt.c:1471 +#, c-format +msgid "grouping cannot be combined with --to" +msgstr "" + +#: src/numfmt.c:1473 +#, c-format +msgid "grouping has no effect in this locale" +msgstr "" + +#: src/numfmt.c:1486 +#, c-format +msgid "--header ignored with command-line input" +msgstr "" + +#: src/numfmt.c:1511 +#, fuzzy, c-format +msgid "error reading input" +msgstr "feil ved lesing av %s" + +#: src/numfmt.c:1520 +#, fuzzy, c-format +msgid "failed to convert some of the input numbers" +msgstr "begge filene kan ikke være standard inn" + #: src/od.c:294 #, fuzzy, c-format msgid "" @@ -5771,28 +6140,48 @@ msgstr "" #: src/od.c:307 #, fuzzy -msgid "All arguments to long options are mandatory for short options.\n" +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" +"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" +"at first byte printed, incremented when dump is progressing.\n" +"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 "" -"Obligatoriske argmenter til lange flagg er obligatoriske også for korte.\n" +"\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:310 +#: src/od.c:318 +#, fuzzy msgid "" -" -A, --address-radix=RADIX decide how file offsets are printed\n" +" -A, --address-radix=RADIX output format for file offsets. RADIX is one\n" +" of [doxn], for Decimal, Octal, Hex or None\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:314 +#: src/od.c:323 #, 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" -" --traditional accept arguments in traditional form\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" @@ -5802,10 +6191,11 @@ msgstr "" " -v, --output-duplicates ikke bruk * for å markere linjefjerning\n" " -w, --width[=BYTES] skriv BYTES bytes per utlinje\n" -#: src/od.c:324 +#: src/od.c:336 #, fuzzy 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" @@ -5820,7 +6210,7 @@ msgstr "" " -d samme som -t u2, velg korte desimaler uten fortegn\n" "\n" -#: src/od.c:332 +#: src/od.c:345 #, fuzzy msgid "" " -f same as -t fF, select floats\n" @@ -5837,39 +6227,16 @@ msgstr "" " -o samme som -t o2, velg korte oktaler\n" " -x samme som -t x2, velg korte hexadesimaler\n" -#: src/od.c:340 -#, fuzzy +#: src/od.c:353 msgid "" "\n" -"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" -"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" -"at first byte printed, incremented when dump is progressing.\n" -"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:349 -msgid "" "\n" "TYPE is made up of one or more of these specifications:\n" -"\n" " a named character, ignoring high-order bit\n" " c ASCII character or backslash escape\n" msgstr "" -#: src/od.c:356 +#: src/od.c:360 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -5883,10 +6250,11 @@ msgstr "" " 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:363 +#: src/od.c:367 +#, fuzzy msgid "" "\n" -"SIZE is a number. For TYPE in doux, SIZE may also be C for\n" +"SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" "sizeof(char), S for sizeof(short), I for sizeof(int) or L for\n" "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" @@ -5897,41 +6265,32 @@ msgstr "" "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:370 -#, fuzzy +#: src/od.c:374 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" +"Adding a z suffix to any type displays printable characters at the end of\n" +"each 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. " -#: src/od.c:380 -#, fuzzy +#: src/od.c:379 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" +"\n" +"BYTES is hex with 0x or 0X prefix, and may have a multiplier suffix:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"and so on for G, T, P, E, Z, Y.\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" -#: src/od.c:633 src/od.c:753 +#: src/od.c:639 src/od.c:759 #, fuzzy, c-format msgid "invalid type string %s" msgstr "ugyldig type-streng «%s»" -#: src/od.c:643 +#: src/od.c:649 #, fuzzy, c-format msgid "" "invalid type string %s;\n" @@ -5940,7 +6299,7 @@ msgstr "" "ugyldig type-streng «%s»;\n" "dette systemet støtter ikke en %lu-byte heltallstype" -#: src/od.c:764 +#: src/od.c:770 #, fuzzy, c-format msgid "" "invalid type string %s;\n" @@ -5949,37 +6308,37 @@ msgstr "" "ugyldig type-streng «%s»;\n" "dette systemet støtter ikke en %lu-byte flyttallstype" -#: src/od.c:822 +#: src/od.c:828 #, fuzzy, c-format msgid "invalid character '%c' in type string %s" msgstr "ugyldig tegn «%c» i type-streng «%s»" -#: src/od.c:1047 +#: src/od.c:1053 #, c-format msgid "cannot skip past end of combined input" msgstr "kan ikke hoppe til bak slutten av kombinert inndata" -#: src/od.c:1603 +#: src/od.c:1609 #, fuzzy, 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]" -#: src/od.c:1729 +#: src/od.c:1735 #, c-format msgid "no type may be specified when dumping strings" msgstr "ingen type kan spesifiseres ved dumping av strenger" -#: src/od.c:1804 +#: src/od.c:1810 #, fuzzy msgid "compatibility mode supports at most one file" msgstr "kompatibilitetsmodus støtter maksimum tre argumenter" -#: src/od.c:1825 +#: src/od.c:1831 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "" -#: src/od.c:1868 +#: src/od.c:1874 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "advarsel: ugyldig bredde %lu; bruker %d istedet" @@ -5995,11 +6354,11 @@ msgid "standard input is closed" msgstr "standard inn 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" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" "Skriv linjer som består av de sekvensielt tilsvarende linjene fra hver\n" "FIL separert med tabulatorer til standard ut.\n" @@ -6007,7 +6366,7 @@ msgstr "" "inn.\n" "\n" -#: src/paste.c:448 +#: 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" @@ -6015,7 +6374,7 @@ 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:509 +#: src/paste.c:508 #, c-format msgid "delimiter list ends with an unescaped backslash: %s" msgstr "" @@ -6071,80 +6430,80 @@ msgid "Kaveh Ghazi" msgstr "" #. TRANSLATORS: Real name is unknown; at most 19 characters. -#: src/pinky.c:250 +#: src/pinky.c:242 msgid " ???" msgstr "" #. TRANSLATORS: Idle time is unknown; at most 5 characters. -#: src/pinky.c:274 +#: src/pinky.c:266 msgid "?????" msgstr "" -#: src/pinky.c:323 +#: src/pinky.c:314 #, c-format msgid "Login name: " msgstr "" -#: src/pinky.c:326 +#: src/pinky.c:317 #, c-format msgid "In real life: " msgstr "" #. TRANSLATORS: Real name is unknown; no hard limit. -#: src/pinky.c:330 +#: src/pinky.c:321 msgid "???\n" msgstr "" -#: src/pinky.c:350 +#: src/pinky.c:341 #, c-format msgid "Directory: " msgstr "" -#: src/pinky.c:352 +#: src/pinky.c:343 #, c-format msgid "Shell: " msgstr "" -#: src/pinky.c:371 +#: src/pinky.c:362 #, c-format msgid "Project: " msgstr "" -#: src/pinky.c:395 +#: src/pinky.c:386 #, c-format msgid "Plan:\n" msgstr "" -#: src/pinky.c:414 +#: src/pinky.c:405 msgid "Login" msgstr "" -#: src/pinky.c:416 +#: src/pinky.c:407 msgid "Name" msgstr "" -#: src/pinky.c:417 +#: src/pinky.c:408 msgid " TTY" msgstr "" -#: src/pinky.c:419 +#: src/pinky.c:410 msgid "Idle" msgstr "" -#: src/pinky.c:420 +#: src/pinky.c:411 msgid "When" msgstr "" -#: src/pinky.c:423 +#: src/pinky.c:414 msgid "Where" msgstr "" -#: src/pinky.c:502 +#: src/pinky.c:493 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Bruk: %s [FLAGG]... [FIL]...\n" -#: src/pinky.c:503 +#: src/pinky.c:494 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -6154,7 +6513,7 @@ msgid "" " -s do short format output, this is the default\n" msgstr "" -#: src/pinky.c:511 +#: src/pinky.c:502 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -6163,7 +6522,7 @@ msgid "" " in short format\n" msgstr "" -#: src/pinky.c:520 +#: src/pinky.c:511 #, c-format msgid "" "\n" @@ -6171,7 +6530,7 @@ msgid "" "The utmp file will be %s.\n" msgstr "" -#: src/pinky.c:604 +#: src/pinky.c:595 #, fuzzy, 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" @@ -6187,86 +6546,84 @@ msgstr "" msgid "Roland Huebner" msgstr "Pete TerMaat og Roland Huebner" -#: src/pr.c:912 +#: src/pr.c:908 #, fuzzy, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "«--pages=FØRSTE_SIZE[:SISTE_SIDE]» mangler argument" -#: src/pr.c:914 +#: src/pr.c:910 #, fuzzy, c-format msgid "invalid page range %s" msgstr "ugyldig type-streng «%s»" -#: src/pr.c:979 +#: src/pr.c:975 #, fuzzy, c-format msgid "'-l PAGE_LENGTH' invalid number of lines: %s" msgstr "«-l SIDE_LENGDE» igyldig antall linjer: «%s»" -#: src/pr.c:1003 +#: src/pr.c:999 #, fuzzy, c-format msgid "'-N NUMBER' invalid starting line number: %s" msgstr "«-N TALL» ugyldig start-linjenummer: «%s»" -#: src/pr.c:1015 +#: src/pr.c:1011 #, fuzzy, c-format msgid "'-o MARGIN' invalid line offset: %s" msgstr "«-o MARG» ugyldig linje-offset: «%s»" -#: src/pr.c:1056 +#: src/pr.c:1052 #, fuzzy, c-format msgid "'-w PAGE_WIDTH' invalid number of characters: %s" msgstr "«-w SIDE_BREDDE» igyldig antall tegn: «%s»" -#: src/pr.c:1070 +#: src/pr.c:1066 #, fuzzy, c-format msgid "'-W PAGE_WIDTH' invalid number of characters: %s" msgstr "«-W SIDE_BREDDE» ugyldig antall tegn: «%s»" -#: src/pr.c:1100 +#: src/pr.c:1096 #, fuzzy, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "Kan ikke spesifisere antall kolonner når det skrives i parallell." -#: src/pr.c:1104 +#: src/pr.c:1100 #, fuzzy, 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" -#: src/pr.c:1200 +#: src/pr.c:1196 #, fuzzy, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "«-%c» ekstra tegn eller ugyldig tall i argumentet: «%s»" -#: src/pr.c:1304 +#: src/pr.c:1293 #, c-format msgid "page width too narrow" msgstr "sidebredde for smal" -#: src/pr.c:2369 +#: src/pr.c:2353 #, c-format msgid "starting page number %<PRIuMAX> exceeds page count %<PRIuMAX>" msgstr "" -#: src/pr.c:2396 +#: src/pr.c:2380 #, fuzzy, c-format msgid "page number overflow" msgstr "felt-nummer er null" -#: src/pr.c:2401 +#: src/pr.c:2385 #, c-format msgid "Page %<PRIuMAX>" msgstr "" -#: src/pr.c:2773 +#: src/pr.c:2757 #, fuzzy -msgid "" -"Paginate or columnate FILE(s) for printing.\n" -"\n" +msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" "Paginér eller kolumnér FIL(er) for utskrift.\n" "\n" -#: src/pr.c:2780 +#: src/pr.c:2763 #, fuzzy msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" @@ -6284,7 +6641,7 @@ msgstr "" " med mindre -a brukes. Balansér antall linjer i\n" " kolonnene på hver side\n" -#: src/pr.c:2788 +#: src/pr.c:2771 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -6301,7 +6658,7 @@ msgstr "" " -d, --double-space\n" " bruk dobbel linjeavstand\n" -#: src/pr.c:2796 +#: src/pr.c:2779 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -6321,7 +6678,7 @@ msgstr "" " sider. (ved en 3-linjers topptekst med -F eller en\n" " 5-linjers topptekst og bunntekst uten -F)\n" -#: src/pr.c:2806 +#: src/pr.c:2789 #, fuzzy msgid "" " -h, --header=HEADER\n" @@ -6345,7 +6702,7 @@ msgstr "" "trunkering,\n" " ingen kolonnejustering, -S[STRENG] setter skilletegn\n" -#: src/pr.c:2815 +#: src/pr.c:2798 #, fuzzy msgid "" " -l, --length=PAGE_LENGTH\n" @@ -6360,7 +6717,7 @@ msgstr "" " -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:2822 +#: src/pr.c:2805 #, fuzzy msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" @@ -6377,7 +6734,7 @@ msgstr "" " start telling med NUMMER ved første linje av første\n" " side skrevet ut (se +FØRSTE_SIDE)\n" -#: src/pr.c:2830 +#: src/pr.c:2813 #, fuzzy msgid "" " -o, --indent=MARGIN\n" @@ -6393,7 +6750,7 @@ msgstr "" " -r, --no-file-warnings\n" " ikke advar når fil ikke kan åpnes\n" -#: src/pr.c:2837 +#: src/pr.c:2820 #, fuzzy msgid "" " -s[CHAR], --separator[=CHAR]\n" @@ -6409,7 +6766,7 @@ msgstr "" " -s[TEGN] skrur av linjetrunkering av alle 3 kolonne-\n" " flaggene (-KOLONNE|-a -KOLONNE|-m) hvis ikke -w er satt\n" -#: src/pr.c:2844 +#: src/pr.c:2827 #, fuzzy msgid "" " -S[STRING], --sep-string[=STRING]\n" @@ -6427,7 +6784,7 @@ msgstr "" "flagg\n" " -t, --omit-header ikke ta med topptekst og bunntekst\n" -#: src/pr.c:2851 +#: src/pr.c:2834 #, fuzzy msgid "" " -T, --omit-pagination\n" @@ -6451,7 +6808,7 @@ msgstr "" " sett sidebredde til SIDEBREDDE (72) tegn for\n" " flerkolonners tekstutskrift. -s[tegn] skrur av (72)\n" -#: src/pr.c:2861 +#: src/pr.c:2844 #, fuzzy msgid "" " -W, --page-width=PAGE_WIDTH\n" @@ -6465,7 +6822,7 @@ msgstr "" " trunkér linjer hvis ikke -J er satt. Ingen påvirkning\n" " med -S eller -s\n" -#: src/pr.c:2869 +#: src/pr.c:2852 #, fuzzy msgid "" "\n" @@ -6600,15 +6957,15 @@ msgstr "" "eller: %s -G [FLAGG]... [INN [UT]]\n" #: src/ptx.c:1821 +#, fuzzy msgid "" "Output a permuted index, including context, of the words in the input " "files.\n" -"\n" msgstr "" "Skriv ut en permutert indeks, inkludert kontekst, av ordene i innfilene\n" "\n" -#: src/ptx.c:1828 +#: src/ptx.c:1827 #, fuzzy msgid "" " -A, --auto-reference output automatically generated references\n" @@ -6620,7 +6977,7 @@ msgstr "" " -G, --traditional vær mer som System Vs «ptx»\n" " -F, --flag-truncation=STRENG bruk STRENG for å markere linjetrunkering\n" -#: src/ptx.c:1833 +#: src/ptx.c:1832 #, fuzzy msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" @@ -6637,7 +6994,7 @@ msgstr "" " setninger\n" " -T, --format=tex generer utskrift som TeX-direktiver\n" -#: src/ptx.c:1840 +#: src/ptx.c:1839 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -6658,7 +7015,7 @@ msgstr "" "ignoreres\n" " fra FIL\n" -#: src/ptx.c:1848 +#: src/ptx.c:1847 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -6670,7 +7027,7 @@ msgstr "" " -w, --width=BREDDE utskriftbredde for spalter, eksklusive\n" " referanser\n" -#: src/ptx.c:1855 +#: src/ptx.c:1854 #, fuzzy msgid "" "\n" @@ -6680,7 +7037,7 @@ msgstr "" "Ved ingen FIL eller hvis FIL er -, leses det fra standard inn. «-F /» er\n" "forvalgt.\n" -#: src/ptx.c:1949 +#: src/ptx.c:1948 #, fuzzy, c-format msgid "invalid gap width: %s" msgstr "ugyldig bredde: «%s»" @@ -6702,7 +7059,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "kan ikke endre rettigheter til %s" -#: src/pwd.c:170 src/pwd.c:277 +#: src/pwd.c:170 src/pwd.c:277 src/split.c:373 #, fuzzy, c-format msgid "failed to stat %s" msgstr "kan ikke opprette katalog %s" @@ -6718,13 +7075,14 @@ msgid "ignoring non-option arguments" msgstr "for mange ikke-flagg-argumenter" #. This is a proper name. See the gettext manual, section Names. -#: src/readlink.c:33 +#: src/readlink.c:32 msgid "Dmitry V. Levin" msgstr "" -#: src/readlink.c:62 +#: 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 -msgid "Usage: %s [OPTION]... FILE\n" +msgid "Usage: %s [OPTION]... FILE...\n" msgstr "Bruk: %s [FLAGG]... [FIL]...\n" #: src/readlink.c:63 @@ -6752,17 +7110,18 @@ msgid "" "recursively,\n" " without requirements on components " "existence\n" -" -n, --no-newline do not output the trailing newline\n" +" -n, --no-newline do not output the trailing delimiter\n" " -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" msgstr "" -#: src/realpath.c:71 src/rm.c:134 src/shred.c:147 src/stat.c:1330 -#: src/touch.c:215 +#: src/readlink.c:152 #, fuzzy, c-format -msgid "Usage: %s [OPTION]... FILE...\n" -msgstr "Bruk: %s [FLAGG]... [FIL]...\n" +msgid "ignoring --no-newline with multiple arguments" +msgstr "for mange ikke-flagg-argumenter" #: src/realpath.c:72 msgid "" @@ -6789,12 +7148,12 @@ msgstr "" msgid "generating relative path" msgstr "" -#: src/remove.c:286 +#: src/remove.c:273 #, fuzzy, c-format msgid "%s: descend into write-protected directory %s? " msgstr "kan ikke opprette katalog %s" -#: src/remove.c:287 +#: src/remove.c:274 #, fuzzy, c-format msgid "%s: descend into directory %s? " msgstr "kan ikke skifte til katalog, %s" @@ -6803,49 +7162,49 @@ msgstr "kan ikke skifte til katalog, %s" #. translate "%s: remove %s (write-protected) %s? " #. instead. It should avoid grammatical problems #. with the output of file_type. -#: src/remove.c:303 +#: src/remove.c:290 #, c-format msgid "%s: remove write-protected %s %s? " msgstr "" -#: src/remove.c:304 +#: src/remove.c:291 #, c-format msgid "%s: remove %s %s? " msgstr "" -#: src/remove.c:417 +#: src/remove.c:374 #, fuzzy, c-format msgid "removed directory: %s\n" msgstr "kan ikke opprette katalog %s" -#: src/remove.c:481 +#: src/remove.c:444 #, fuzzy, c-format msgid "cannot remove directory: %s" msgstr "kan ikke opprette katalog %s" -#: src/remove.c:537 +#: src/remove.c:500 #, c-format msgid "skipping %s, since it's on a different device" msgstr "" -#: src/remove.c:557 +#: src/remove.c:520 #, fuzzy, c-format msgid "traversal failed: %s" msgstr "feil ved lesing" -#: src/remove.c:563 +#: src/remove.c:526 #, c-format msgid "" "unexpected failure: fts_info=%d: %s\n" "please report to %s" msgstr "" -#: src/rm.c:118 +#: src/rm.c:119 #, c-format msgid "Try '%s ./%s' to remove the file %s.\n" msgstr "" -#: src/rm.c:135 +#: src/rm.c:136 msgid "" "Remove (unlink) the FILE(s).\n" "\n" @@ -6854,7 +7213,7 @@ msgid "" " -i prompt before every removal\n" msgstr "" -#: src/rm.c:141 +#: src/rm.c:142 msgid "" " -I prompt once before removing more than three files, " "or\n" @@ -6866,22 +7225,23 @@ msgid "" " always (-i). Without WHEN, prompt always\n" msgstr "" -#: src/rm.c:148 +#: src/rm.c:149 msgid "" " --one-file-system when removing a hierarchy recursively, skip any\n" " directory that is on a file system different from\n" " that of the corresponding command line argument\n" msgstr "" -#: src/rm.c:153 +#: src/rm.c:154 msgid "" " --no-preserve-root do not treat '/' specially\n" " --preserve-root do not remove '/' (default)\n" " -r, -R, --recursive remove directories and their contents recursively\n" +" -d, --dir remove empty directories\n" " -v, --verbose explain what is being done\n" msgstr "" -#: src/rm.c:161 +#: src/rm.c:163 msgid "" "\n" "By default, rm does not remove directories. Use the --recursive (-r or -R)\n" @@ -6889,7 +7249,7 @@ msgid "" "contents.\n" msgstr "" -#: src/rm.c:166 +#: src/rm.c:168 #, c-format msgid "" "\n" @@ -6900,7 +7260,7 @@ msgid "" " %s ./-foo\n" msgstr "" -#: src/rm.c:175 +#: src/rm.c:177 msgid "" "\n" "Note that if you use rm to remove a file, it might be possible to recover\n" @@ -6908,12 +7268,12 @@ msgid "" "assurance that the contents are truly unrecoverable, consider using shred.\n" msgstr "" -#: src/rm.c:335 +#: src/rm.c:342 #, c-format msgid "%s: remove all arguments recursively? " msgstr "" -#: src/rm.c:336 +#: src/rm.c:343 #, fuzzy, c-format msgid "%s: remove all arguments? " msgstr "for mange argumenter" @@ -6961,7 +7321,10 @@ msgstr "" msgid "" "Run a program in a different security context.\n" "With neither CONTEXT nor COMMAND, print the current security context.\n" -"\n" +msgstr "" + +#: src/runcon.c:94 +msgid "" " CONTEXT Complete security context\n" " -c, --compute compute process transition context before modifying\n" " -t, --type=TYPE type (for same role as parent)\n" @@ -6971,72 +7334,72 @@ msgid "" "\n" msgstr "" -#: src/runcon.c:140 +#: src/runcon.c:144 #, c-format msgid "multiple roles" msgstr "" -#: src/runcon.c:145 +#: src/runcon.c:149 #, c-format msgid "multiple types" msgstr "" -#: src/runcon.c:150 +#: src/runcon.c:154 #, c-format msgid "multiple users" msgstr "" -#: src/runcon.c:155 +#: src/runcon.c:159 #, c-format msgid "multiple levelranges" msgstr "" -#: src/runcon.c:173 src/runcon.c:209 +#: src/runcon.c:177 src/runcon.c:213 #, c-format msgid "failed to get current context" msgstr "" -#: src/runcon.c:183 +#: src/runcon.c:187 #, c-format msgid "you must specify -c, -t, -u, -l, -r, or context" msgstr "" -#: src/runcon.c:191 +#: src/runcon.c:195 #, fuzzy, c-format msgid "no command specified" msgstr "kun ett argument kan spesifiseres" -#: src/runcon.c:197 +#: src/runcon.c:201 #, c-format msgid "%s may be used only on a SELinux kernel" msgstr "" -#: src/runcon.c:223 +#: src/runcon.c:227 #, c-format msgid "failed to compute a new context" msgstr "" -#: src/runcon.c:237 +#: src/runcon.c:241 #, fuzzy, c-format msgid "failed to set new user %s" msgstr "kan ikke endre rettigheter til %s" -#: src/runcon.c:239 +#: src/runcon.c:243 #, fuzzy, c-format msgid "failed to set new type %s" msgstr "kan ikke endre rettigheter til %s" -#: src/runcon.c:241 +#: src/runcon.c:245 #, fuzzy, c-format msgid "failed to set new range %s" msgstr "%s: linjenummer utenfor tillatte verdier" -#: src/runcon.c:243 +#: src/runcon.c:247 #, fuzzy, c-format msgid "failed to set new role %s" msgstr "kan ikke endre rettigheter til %s" -#: src/runcon.c:251 +#: src/runcon.c:255 #, fuzzy, c-format msgid "unable to set security context %s" msgstr "kan ikke endre rettigheter til %s" @@ -7052,15 +7415,17 @@ msgstr "" "eller: %s -G [FLAGG]... [INN [UT]]\n" #: src/seq.c:73 +msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" +msgstr "" + +#: src/seq.c:79 msgid "" -"Print numbers from FIRST to LAST, in steps of INCREMENT.\n" -"\n" " -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 "" -#: src/seq.c:82 +#: src/seq.c:86 msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" @@ -7070,39 +7435,24 @@ msgid "" "INCREMENT is usually negative if FIRST is greater than LAST.\n" msgstr "" -#: src/seq.c:90 +#: src/seq.c:94 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:136 +#: src/seq.c:140 #, fuzzy, c-format msgid "invalid floating point argument: %s" msgstr "ugyldig startlinjenummer: «%s»" -#: src/seq.c:193 -#, c-format -msgid "format %s has no %% directive" -msgstr "" - -#: src/seq.c:210 -#, c-format -msgid "format %s ends in %%" -msgstr "" - -#: src/seq.c:213 +#: src/seq.c:232 #, c-format msgid "format %s has unknown %%%c directive" msgstr "" -#: src/seq.c:217 -#, c-format -msgid "format %s has too many %% directives" -msgstr "" - -#: src/seq.c:431 +#: 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" @@ -7134,27 +7484,27 @@ msgid "" " (if specified) supplemental group IDs to GID1, ...\n" msgstr "" -#: src/setuidgid.c:163 +#: src/setuidgid.c:162 #, c-format msgid "unknown user-ID: %s" msgstr "" -#: src/setuidgid.c:174 +#: src/setuidgid.c:173 #, c-format msgid "to use user-ID %s you need to use -g too" msgstr "" -#: src/setuidgid.c:191 +#: src/setuidgid.c:190 #, c-format msgid "failed to set supplemental group(s)" msgstr "" -#: src/setuidgid.c:201 +#: 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:205 +#: src/setuidgid.c:204 #, fuzzy, c-format msgid "cannot set user-ID to %lu" msgstr "kan ikke utelate både bruker og gruppe" @@ -7168,10 +7518,9 @@ msgstr "" 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" -"\n" msgstr "" -#: src/shred.c:156 +#: src/shred.c:155 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -7180,7 +7529,7 @@ msgid "" " -s, --size=N shred this many bytes (suffixes like K, M, G accepted)\n" msgstr "" -#: src/shred.c:162 +#: src/shred.c:161 msgid "" " -u, --remove truncate and remove file after overwriting\n" " -v, --verbose show progress\n" @@ -7189,7 +7538,7 @@ msgid "" " -z, --zero add a final overwrite with zeros to hide shredding\n" msgstr "" -#: src/shred.c:171 +#: src/shred.c:170 msgid "" "\n" "If FILE is -, shred standard output.\n" @@ -7201,7 +7550,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:181 +#: src/shred.c:180 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" @@ -7212,7 +7561,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:189 +#: src/shred.c:188 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -7224,7 +7573,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:199 +#: src/shred.c:198 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -7233,7 +7582,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:206 +#: src/shred.c:205 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" @@ -7245,129 +7594,129 @@ msgid "" "\n" msgstr "" -#: src/shred.c:216 +#: src/shred.c:215 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:296 +#: src/shred.c:295 #, fuzzy, c-format msgid "%s: fdatasync failed" msgstr "stat feilet" -#: src/shred.c:307 +#: src/shred.c:306 #, c-format msgid "%s: fsync failed" msgstr "" -#: src/shred.c:384 +#: src/shred.c:383 #, c-format msgid "%s: cannot rewind" msgstr "" -#: src/shred.c:403 +#: src/shred.c:402 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "" -#: src/shred.c:453 +#: src/shred.c:452 #, fuzzy, c-format msgid "%s: error writing at offset %s" msgstr "feil ved skriving til %s" -#: src/shred.c:471 +#: src/shred.c:470 #, fuzzy, c-format msgid "%s: lseek failed" msgstr "feil ved lukking av fil" -#: src/shred.c:482 +#: src/shred.c:481 #, fuzzy, c-format msgid "%s: file too large" msgstr "%s: fil for lang" -#: src/shred.c:505 +#: src/shred.c:504 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "" -#: src/shred.c:521 +#: src/shred.c:520 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "" -#: src/shred.c:768 +#: src/shred.c:767 #, fuzzy, c-format msgid "%s: fstat failed" msgstr "stat feilet" -#: src/shred.c:779 +#: src/shred.c:778 #, fuzzy, c-format msgid "%s: invalid file type" msgstr "%s: ugyldig antall linjer" -#: src/shred.c:798 +#: src/shred.c:797 #, c-format msgid "%s: file has negative size" msgstr "" -#: src/shred.c:865 +#: src/shred.c:864 src/sort.c:932 src/split.c:378 #, fuzzy, c-format msgid "%s: error truncating" msgstr "%s: fil trunkert" -#: src/shred.c:881 +#: src/shred.c:880 #, fuzzy, c-format msgid "%s: fcntl failed" msgstr "stat feilet" -#: src/shred.c:886 +#: src/shred.c:885 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "" -#: src/shred.c:968 +#: src/shred.c:967 #, c-format msgid "%s: removing" msgstr "" -#: src/shred.c:992 +#: src/shred.c:991 #, fuzzy, c-format msgid "%s: renamed to %s" msgstr "%s: lesefeil" -#: src/shred.c:1014 +#: src/shred.c:1013 #, fuzzy, c-format msgid "%s: failed to remove" msgstr "%s: fil for lang" -#: src/shred.c:1018 +#: src/shred.c:1017 #, c-format msgid "%s: removed" msgstr "" -#: src/shred.c:1025 src/shred.c:1068 +#: src/shred.c:1024 src/shred.c:1067 #, fuzzy, c-format msgid "%s: failed to close" msgstr "%s: fil for lang" -#: src/shred.c:1061 +#: src/shred.c:1060 #, fuzzy, c-format msgid "%s: failed to open for writing" msgstr "%s: fil for lang" -#: src/shred.c:1126 +#: src/shred.c:1125 #, fuzzy, c-format msgid "%s: invalid number of passes" msgstr "%s: ugyldig antall sekunder" -#: src/shred.c:1135 src/shuf.c:291 src/sort.c:4387 +#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441 #, c-format msgid "multiple random sources specified" msgstr "" -#: src/shred.c:1149 +#: src/shred.c:1148 #, fuzzy, c-format msgid "%s: invalid file size" msgstr "%s: ugyldig antall linjer" @@ -7384,14 +7733,12 @@ msgstr "" #: src/shuf.c:54 #, fuzzy -msgid "" -"Write a random permutation of the input lines to standard output.\n" -"\n" +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:61 +#: src/shuf.c:60 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 " @@ -7402,27 +7749,27 @@ msgid "" " -z, --zero-terminated end lines with 0 byte, not newline\n" msgstr "" -#: src/shuf.c:245 +#: src/shuf.c:244 #, c-format msgid "multiple -i options specified" msgstr "" -#: src/shuf.c:265 +#: src/shuf.c:264 #, fuzzy, c-format msgid "invalid input range %s" msgstr "ugyldig antall" -#: src/shuf.c:278 +#: src/shuf.c:277 #, fuzzy, c-format msgid "invalid line count %s" msgstr "ugyldig bredde: «%s»" -#: src/shuf.c:285 src/sort.c:4381 +#: src/shuf.c:284 src/sort.c:4435 #, c-format msgid "multiple output files specified" msgstr "" -#: src/shuf.c:311 +#: src/shuf.c:310 #, fuzzy, c-format msgid "cannot combine -e and -i options" msgstr "kan ikke opprette katalog %s" @@ -7441,7 +7788,7 @@ msgid "" "\n" msgstr "" -#: src/sleep.c:135 src/timeout.c:295 +#: src/sleep.c:135 src/timeout.c:320 #, fuzzy, c-format msgid "invalid time interval %s" msgstr "ugyldig felt-nummer: «%s»" @@ -7451,24 +7798,22 @@ msgstr "ugyldig felt-nummer: «%s»" msgid "cannot read realtime clock" msgstr "" -#: src/sort.c:395 +#: src/sort.c:399 #, fuzzy -msgid "" -"Write sorted concatenation of all FILE(s) to standard output.\n" -"\n" +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:402 +#: src/sort.c:405 msgid "" "Ordering options:\n" "\n" msgstr "" -#: src/sort.c:406 +#: src/sort.c:409 #, fuzzy msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" @@ -7480,7 +7825,7 @@ msgstr "" " -d, --dictionary-order behandle bare blanke og alfanumeriske tegn\n" " -f, --ignore-case konverter små bokstaver til store\n" -#: src/sort.c:412 +#: src/sort.c:415 #, fuzzy msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" @@ -7494,12 +7839,12 @@ msgstr "" " -n, --numeric-sort sammenlign i henhold til nummériske verdier\n" " -r, --reverse reversér resultatet av sammenligningene\n" -#: src/sort.c:417 +#: src/sort.c:420 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" -#: src/sort.c:420 +#: src/sort.c:423 #, fuzzy msgid "" " -n, --numeric-sort compare according to string numerical value\n" @@ -7514,7 +7859,7 @@ msgstr "" " -n, --numeric-sort sammenlign i henhold til nummériske verdier\n" " -r, --reverse reversér resultatet av sammenligningene\n" -#: src/sort.c:426 +#: src/sort.c:429 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -7524,19 +7869,19 @@ msgid "" "\n" msgstr "" -#: src/sort.c:434 +#: src/sort.c:437 msgid "" "Other options:\n" "\n" msgstr "" -#: src/sort.c:438 +#: src/sort.c:441 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" msgstr "" -#: src/sort.c:442 +#: src/sort.c:445 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 " @@ -7545,7 +7890,7 @@ msgid "" " decompress them with PROG -d\n" msgstr "" -#: src/sort.c:449 +#: src/sort.c:452 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -7554,13 +7899,13 @@ msgid "" " If F is - then read names from standard input\n" msgstr "" -#: src/sort.c:456 +#: src/sort.c:459 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:460 +#: src/sort.c:463 #, fuzzy msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" @@ -7581,7 +7926,7 @@ msgstr "" " sammenligning\n" " -S, --buffer-size=STØRR bruk STØRRelse stort minne-buffer\n" -#: src/sort.c:466 +#: src/sort.c:469 #, fuzzy, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -7603,12 +7948,12 @@ msgstr "" " -u, --unique med -c: sjekk for streng sortering\n" " ellers, bare skriv ut det første av to like\n" -#: src/sort.c:475 +#: 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:480 +#: src/sort.c:483 #, fuzzy msgid "" "\n" @@ -7635,7 +7980,7 @@ msgstr "" "\n" "STØRRELSE kan være fulgt av de følgende multiplikator-endelsene:\n" -#: src/sort.c:493 +#: src/sort.c:496 msgid "" "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n" "\n" @@ -7655,262 +8000,266 @@ msgstr "" "Sett LC_ALL=C for å få den tradisjonelle sorteringsrekkefølgen som\n" "bruker negative oktett-verdier.\n" -#: src/sort.c:694 +#: src/sort.c:697 #, fuzzy, c-format msgid "waiting for %s [-d]" msgstr "feil ved skriving til %s" -#: src/sort.c:699 +#: src/sort.c:702 #, c-format msgid "%s [-d] terminated abnormally" msgstr "" -#: src/sort.c:853 +#: src/sort.c:856 #, fuzzy, c-format msgid "cannot create temporary file in %s" msgstr "kan ikke opprette midlertidig fil" -#: src/sort.c:939 src/sort.c:2010 src/sort.c:3056 src/sort.c:3755 -#: src/sort.c:3758 +#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713 +#: src/sort.c:3804 src/sort.c:3807 msgid "open failed" msgstr "åpning av fil feilet" -#: src/sort.c:959 +#: src/sort.c:970 #, fuzzy msgid "fflush failed" msgstr "feil ved lukking av fil" -#: src/sort.c:964 src/sort.c:2013 src/sort.c:4646 +#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706 msgid "close failed" msgstr "feil ved lukking av fil" -#: src/sort.c:973 +#: src/sort.c:986 #, fuzzy, c-format msgid "dup2 failed" msgstr "åpning av fil feilet" -#: src/sort.c:1090 +#: src/sort.c:1103 #, fuzzy, c-format msgid "couldn't execute %s" msgstr "kan ikke opprette katalog %s" -#: src/sort.c:1097 +#: src/sort.c:1110 #, fuzzy msgid "couldn't create temporary file" msgstr "kan ikke opprette midlertidig fil" -#: src/sort.c:1136 +#: src/sort.c:1149 #, fuzzy, c-format msgid "couldn't create process for %s -d" msgstr "kan ikke opprette katalog %s" -#: src/sort.c:1150 +#: src/sort.c:1161 #, fuzzy, c-format msgid "couldn't execute %s -d" msgstr "kan ikke opprette katalog %s" -#: src/sort.c:1209 +#: src/sort.c:1220 #, fuzzy, c-format msgid "warning: cannot remove: %s" msgstr "kan ikke opprette katalog %s" -#: src/sort.c:1295 +#: src/sort.c:1306 #, fuzzy, c-format msgid "invalid --%s argument %s" msgstr "ugyldig argument %s for %s" -#: src/sort.c:1298 +#: src/sort.c:1309 #, fuzzy, c-format msgid "minimum --%s argument is %s" msgstr "flertydig argument %s for %s" -#: src/sort.c:1313 +#: src/sort.c:1324 #, fuzzy, c-format msgid "--%s argument %s too large" msgstr "%s: tall «%.*s» for stort" -#: src/sort.c:1316 +#: src/sort.c:1327 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "" -#: src/sort.c:1398 +#: src/sort.c:1409 #, c-format msgid "number in parallel must be nonzero" msgstr "" -#: src/sort.c:1479 +#: src/sort.c:1494 msgid "stat failed" msgstr "stat feilet" -#: src/sort.c:1740 +#: src/sort.c:1755 msgid "read failed" msgstr "feil ved lesing" -#: src/sort.c:2028 +#: src/sort.c:2043 #, fuzzy, c-format msgid "string transformation failed" msgstr "strengsammenligning feilet" -#: src/sort.c:2031 +#: src/sort.c:2046 #, c-format msgid "the untransformed string was %s" msgstr "" -#: src/sort.c:2194 +#: src/sort.c:2209 #, c-format msgid "^ no match for key\n" msgstr "" -#: src/sort.c:2374 +#: src/sort.c:2389 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "" -#: src/sort.c:2380 +#: src/sort.c:2395 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "" -#: src/sort.c:2391 +#: src/sort.c:2406 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" -#: src/sort.c:2404 +#: src/sort.c:2419 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "" -#: src/sort.c:2436 +#: src/sort.c:2451 #, fuzzy, 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" -#: src/sort.c:2442 +#: src/sort.c:2457 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "" -#: src/sort.c:2716 src/sort.c:2725 +#: src/sort.c:2731 src/sort.c:2740 msgid "write failed" msgstr "feil ved skriving" -#: src/sort.c:2768 +#: src/sort.c:2783 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: uorden: " -#: src/sort.c:2771 +#: src/sort.c:2786 msgid "standard error" msgstr "standard feilkanal" -#: src/sort.c:3926 +#: src/sort.c:3698 +#, fuzzy +msgid "cannot read" +msgstr "kan ikke opprette katalog %s" + +#: src/sort.c:3976 #, fuzzy, c-format msgid "%s: invalid field specification %s" msgstr "%s: ugyldig feltspesifikasjon «%s»" -#: src/sort.c:3937 +#: src/sort.c:3987 #, fuzzy, c-format msgid "options '-%s' are incompatible" msgstr "%s: flagget «%s» er flertydig\n" -#: src/sort.c:3988 +#: src/sort.c:4038 #, fuzzy, c-format msgid "%s: invalid count at start of %s" msgstr "%s: ugyldig tall på starten av «%s»" -#: src/sort.c:4245 +#: src/sort.c:4295 #, fuzzy msgid "invalid number after '-'" msgstr "ugyldig tall etter «-»" -#: src/sort.c:4248 src/sort.c:4334 src/sort.c:4362 +#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416 #, fuzzy msgid "invalid number after '.'" msgstr "ugyldig tall etter «.»" -#: src/sort.c:4261 src/sort.c:4367 +#: src/sort.c:4315 src/sort.c:4421 msgid "stray character in field spec" msgstr "ugyldig tegn i feltspesifikasjon" -#: src/sort.c:4308 +#: src/sort.c:4362 #, c-format msgid "multiple compress programs specified" msgstr "" -#: src/sort.c:4325 +#: src/sort.c:4379 msgid "invalid number at field start" msgstr "ugyldig tall i feltstart" -#: src/sort.c:4329 src/sort.c:4357 +#: src/sort.c:4383 src/sort.c:4411 msgid "field number is zero" msgstr "felt-nummer er null" -#: src/sort.c:4338 +#: src/sort.c:4392 msgid "character offset is zero" msgstr "tegn-posisjon er null" -#: src/sort.c:4353 +#: src/sort.c:4407 #, fuzzy msgid "invalid number after ','" msgstr "ugyldig tall etter «,»" -#: src/sort.c:4403 +#: src/sort.c:4457 #, c-format msgid "empty tab" msgstr "" -#: src/sort.c:4496 src/wc.c:692 +#: src/sort.c:4550 src/wc.c:692 #, fuzzy, c-format msgid "cannot read file names from %s" msgstr "Strengene som ble sammenlignet var «%s» og «%s»." -#: src/sort.c:4518 +#: src/sort.c:4572 #, fuzzy, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s: ugyldig antall linjer" -#: src/sort.c:4524 +#: src/sort.c:4578 #, fuzzy, c-format msgid "no input from %s" msgstr "lager filen «%s»\n" -#: src/sort.c:4570 +#: src/sort.c:4624 #, c-format msgid "using %s sorting rules" msgstr "" -#: src/sort.c:4573 +#: src/sort.c:4627 #, c-format msgid "using simple byte comparison" msgstr "" -#: src/sort.c:4604 +#: src/sort.c:4658 #, fuzzy, c-format msgid "extra operand %s not allowed with -%c" msgstr "ekstra operator «%s» ikke tillatt med -c" -#: src/split.c:184 +#: src/split.c:187 #, c-format msgid "the suffix length needs to be at least %zu" msgstr "" -#: src/split.c:201 +#: src/split.c:204 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" msgstr "Bruk: %s [FLAGG] [INPUT [PREFIKS]]\n" -#: src/split.c:205 +#: src/split.c:208 #, fuzzy 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" -"\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 " @@ -7918,8 +8267,8 @@ msgstr "" "leses det fra standard inn.\n" "\n" -#: src/split.c:214 -#, fuzzy, c-format +#: src/split.c:216 +#, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" " --additional-suffix=SUFFIX append an additional SUFFIX to file " @@ -7936,21 +8285,14 @@ msgid "" " -n, --number=CHUNKS generate CHUNKS output files. See below\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\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" -#: src/split.c:227 +#: src/split.c:229 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" msgstr "" -#: src/split.c:234 +#: src/split.c:236 msgid "" "\n" "CHUNKS may be:\n" @@ -7962,184 +8304,189 @@ msgid "" "r/K/N likewise but only output Kth of N to stdout\n" msgstr "" -#: src/split.c:352 +#: src/split.c:354 #, c-format msgid "output file suffixes exhausted" msgstr "" -#: src/split.c:364 +#: src/split.c:366 #, fuzzy, c-format msgid "creating file %s\n" msgstr "lager filen «%s»\n" -#: src/split.c:377 -#, fuzzy, c-format +#: src/split.c:375 +#, c-format +msgid "%s would overwrite input; aborting" +msgstr "" + +#: src/split.c:391 +#, c-format msgid "failed to set FILE environment variable" -msgstr "kan ikke endre rettigheter til %s" +msgstr "" -#: src/split.c:379 +#: src/split.c:393 #, c-format msgid "executing with FILE=%s\n" msgstr "" -#: src/split.c:381 -#, fuzzy, c-format +#: src/split.c:395 +#, c-format msgid "failed to create pipe" -msgstr "kan ikke opprette katalog %s" +msgstr "" -#: src/split.c:395 +#: src/split.c:409 #, fuzzy, c-format msgid "closing prior pipe" -msgstr "kan ikke opprette katalog %s" +msgstr "lager filen «%s»\n" -#: src/split.c:397 +#: src/split.c:411 #, fuzzy, c-format msgid "closing output pipe" msgstr "lager filen «%s»\n" -#: src/split.c:401 +#: src/split.c:415 #, fuzzy, c-format msgid "moving input pipe" msgstr "lager filen «%s»\n" -#: src/split.c:403 +#: src/split.c:417 #, fuzzy, c-format msgid "closing input pipe" msgstr "lager filen «%s»\n" -#: src/split.c:408 -#, fuzzy, c-format +#: src/split.c:422 +#, c-format msgid "failed to run command: \"%s -c %s\"" -msgstr "kan ikke endre rettigheter til %s" +msgstr "" -#: src/split.c:414 -#, fuzzy, c-format +#: src/split.c:428 +#, c-format msgid "failed to close input pipe" -msgstr "%s: fil for lang" +msgstr "" -#: src/split.c:450 -#, fuzzy, c-format +#: src/split.c:464 +#, c-format msgid "waiting for child process" -msgstr "feil ved skriving til %s" +msgstr "" -#: src/split.c:460 +#: src/split.c:474 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "" -#: src/split.c:468 +#: src/split.c:482 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:475 src/timeout.c:449 +#: src/split.c:489 src/timeout.c:494 #, c-format msgid "unknown status from command (0x%X)" msgstr "" -#: src/split.c:1037 +#: src/split.c:1052 #, c-format msgid "cannot split in more than one way" msgstr "kan ikke dele opp på mer enn én måte" -#: src/split.c:1050 src/split.c:1192 src/split.c:1363 +#: src/split.c:1065 src/split.c:1205 src/split.c:1376 #, fuzzy, c-format msgid "%s: invalid number of chunks" msgstr "%s: ugyldig antall sekunder" -#: src/split.c:1054 +#: src/split.c:1069 #, fuzzy, c-format msgid "%s: invalid chunk number" msgstr "%s: ugyldig nummer" -#: src/split.c:1106 +#: src/split.c:1119 #, fuzzy, c-format msgid "%s: invalid suffix length" msgstr "%s: ugyldig antall linjer" -#: src/split.c:1131 src/split.c:1139 src/split.c:1162 src/split.c:1167 +#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180 #, c-format msgid "%s: invalid number of bytes" msgstr "%s: ugyldig antall bytes" -#: src/split.c:1150 src/split.c:1297 +#: src/split.c:1163 src/split.c:1310 #, c-format msgid "%s: invalid number of lines" msgstr "%s: ugyldig antall linjer" -#: src/split.c:1223 +#: src/split.c:1236 #, fuzzy, c-format msgid "line count option -%s%c... is too large" msgstr "%s: tall «%.*s» for stort" -#: src/split.c:1235 +#: src/split.c:1248 #, fuzzy, c-format msgid "%s: invalid start value for numerical suffix" msgstr "ugyldig startlinjenummer: «%s»" -#: src/split.c:1263 +#: src/split.c:1276 #, fuzzy, c-format msgid "%s: invalid IO block size" msgstr "%s: ugyldig antall linjer" -#: src/split.c:1284 +#: src/split.c:1297 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1321 +#: src/split.c:1334 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1356 +#: src/split.c:1369 #, fuzzy, c-format msgid "%s: cannot determine file size" msgstr "kan ikke opprette midlertidig fil" #. This is a proper name. See the gettext manual, section Names. -#: src/stat.c:169 +#: src/stat.c:173 msgid "Michael Meskes" msgstr "" -#: src/stat.c:838 +#: src/stat.c:857 #, c-format msgid "failed to canonicalize %s" msgstr "" -#: src/stat.c:1050 +#: src/stat.c:1069 #, fuzzy, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "%s: ukjent flagg «%c%s»\n" -#: src/stat.c:1105 +#: src/stat.c:1124 #, fuzzy, c-format msgid "%s: invalid directive" msgstr "%s: ugyldig mønster" -#: src/stat.c:1151 +#: src/stat.c:1170 #, fuzzy, c-format msgid "warning: backslash at end of format" msgstr "ugyldig backslash-beskyttelse ved slutten av streng" -#: src/stat.c:1182 +#: src/stat.c:1201 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" -#: src/stat.c:1189 +#: src/stat.c:1208 #, fuzzy, c-format msgid "cannot read file system information for %s" msgstr "kan ikke opprette katalog %s" -#: src/stat.c:1209 +#: src/stat.c:1228 #, fuzzy, c-format msgid "cannot stat standard input" msgstr "standard inn" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' with --file-system, and NOT from printf. -#: src/stat.c:1245 +#: src/stat.c:1264 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -8150,7 +8497,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1268 +#: src/stat.c:1287 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -8158,30 +8505,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1278 +#: src/stat.c:1297 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:1286 +#: src/stat.c:1305 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:1295 +#: src/stat.c:1314 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:1305 +#: src/stat.c:1324 #, c-format msgid "Context: %C\n" msgstr "" -#: src/stat.c:1313 +#: src/stat.c:1332 msgid "" "Access: %x\n" "Modify: %y\n" @@ -8189,15 +8536,17 @@ msgid "" " Birth: %w\n" msgstr "" -#: src/stat.c:1331 +#: src/stat.c:1350 +msgid "Display file or file system status.\n" +msgstr "" + +#: src/stat.c:1356 msgid "" -"Display file or file system status.\n" -"\n" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" -#: src/stat.c:1337 +#: src/stat.c:1360 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -8207,7 +8556,7 @@ msgid "" " -t, --terse print the information in terse form\n" msgstr "" -#: src/stat.c:1348 +#: src/stat.c:1371 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -8219,7 +8568,7 @@ msgid "" " %C SELinux security context string\n" msgstr "" -#: src/stat.c:1357 +#: src/stat.c:1380 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -8229,7 +8578,7 @@ msgid "" " %G group name of owner\n" msgstr "" -#: src/stat.c:1365 +#: src/stat.c:1388 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -8242,7 +8591,7 @@ msgid "" " %T minor device type in hex\n" msgstr "" -#: src/stat.c:1376 +#: src/stat.c:1399 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -8257,7 +8606,7 @@ msgid "" "\n" msgstr "" -#: src/stat.c:1390 +#: src/stat.c:1413 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -8268,7 +8617,7 @@ msgid "" " %f free blocks in file system\n" msgstr "" -#: src/stat.c:1399 +#: src/stat.c:1422 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -8287,30 +8636,29 @@ msgstr "Bruk: %s [FLAGG] [FIL]...\n" #: src/stdbuf.c:91 msgid "" "Run COMMAND, with modified buffering operations for its standard streams.\n" -"\n" msgstr "" -#: src/stdbuf.c:98 +#: src/stdbuf.c:97 msgid "" " -i, --input=MODE adjust standard input stream buffering\n" " -o, --output=MODE adjust standard output stream buffering\n" " -e, --error=MODE adjust standard error stream buffering\n" msgstr "" -#: src/stdbuf.c:105 +#: src/stdbuf.c:104 msgid "" "\n" "If MODE is 'L' the corresponding stream will be line buffered.\n" "This option is invalid with standard input.\n" msgstr "" -#: src/stdbuf.c:108 +#: src/stdbuf.c:107 msgid "" "\n" "If MODE is '0' the corresponding stream will be unbuffered.\n" msgstr "" -#: src/stdbuf.c:111 +#: src/stdbuf.c:110 msgid "" "\n" "Otherwise MODE is a number which may be followed by one of the following:\n" @@ -8320,7 +8668,7 @@ msgid "" "size set to MODE bytes.\n" msgstr "" -#: src/stdbuf.c:117 +#: src/stdbuf.c:116 msgid "" "\n" "NOTE: If COMMAND adjusts the buffering of its standard streams ('tee' does\n" @@ -8330,22 +8678,22 @@ msgid "" "and are thus unaffected by 'stdbuf' settings.\n" msgstr "" -#: src/stdbuf.c:227 +#: src/stdbuf.c:226 #, c-format msgid "failed to find %s" msgstr "" -#: src/stdbuf.c:247 src/stdbuf.c:279 +#: src/stdbuf.c:246 src/stdbuf.c:278 #, c-format msgid "failed to update the environment with %s" msgstr "" -#: src/stdbuf.c:321 +#: src/stdbuf.c:320 #, c-format msgid "line buffering stdin is meaningless" msgstr "" -#: src/stty.c:509 +#: src/stty.c:513 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -8353,23 +8701,25 @@ msgid "" " or: %s [-F DEVICE | --file=DEVICE] [-g|--save]\n" msgstr "" -#: src/stty.c:515 +#: src/stty.c:519 +msgid "Print or change terminal characteristics.\n" +msgstr "" + +#: src/stty.c:525 msgid "" -"Print or change terminal characteristics.\n" -"\n" " -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:524 +#: src/stty.c:532 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:529 +#: src/stty.c:537 msgid "" "\n" "Special characters:\n" @@ -8378,7 +8728,7 @@ msgid "" " eol CHAR CHAR will end the line\n" msgstr "" -#: src/stty.c:536 +#: src/stty.c:544 msgid "" " * eol2 CHAR alternate CHAR for ending the line\n" " erase CHAR CHAR will erase the last character typed\n" @@ -8386,7 +8736,7 @@ msgid "" " kill CHAR CHAR will erase the current line\n" msgstr "" -#: src/stty.c:542 +#: src/stty.c:550 msgid "" " * lnext CHAR CHAR will enter the next character quoted\n" " quit CHAR CHAR will send a quit signal\n" @@ -8394,7 +8744,7 @@ msgid "" " start CHAR CHAR will restart the output after stopping it\n" msgstr "" -#: src/stty.c:548 +#: src/stty.c:556 msgid "" " stop CHAR CHAR will stop the output\n" " susp CHAR CHAR will send a terminal stop signal\n" @@ -8402,7 +8752,7 @@ msgid "" " * werase CHAR CHAR will erase the last word typed\n" msgstr "" -#: src/stty.c:554 +#: src/stty.c:562 msgid "" "\n" "Special settings:\n" @@ -8411,7 +8761,7 @@ msgid "" " * columns N same as cols N\n" msgstr "" -#: src/stty.c:561 +#: src/stty.c:569 msgid "" " ispeed N set the input speed to N\n" " * line N use line discipline N\n" @@ -8420,7 +8770,7 @@ msgid "" " ospeed N set the output speed to N\n" msgstr "" -#: src/stty.c:567 +#: src/stty.c:575 msgid "" " * rows N tell the kernel that the terminal has N rows\n" " * size print the number of rows and columns according to the " @@ -8429,27 +8779,28 @@ msgid "" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" -#: src/stty.c:573 +#: src/stty.c:581 msgid "" "\n" "Control settings:\n" " [-]clocal disable modem control signals\n" " [-]cread allow input to be received\n" " * [-]crtscts enable RTS/CTS handshaking\n" +" * [-]cdtrdsr enable DTR/DSR handshaking\n" " csN set character size to N bits, N in [5..8]\n" msgstr "" -#: src/stty.c:581 +#: src/stty.c:590 msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" " [-]hupcl same as [-]hup\n" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" -" [-]parodd set odd parity (even with '-')\n" +" [-]parodd set odd parity (or even parity with '-')\n" msgstr "" -#: src/stty.c:588 +#: src/stty.c:597 msgid "" "\n" "Input settings:\n" @@ -8459,7 +8810,7 @@ msgid "" " [-]igncr ignore carriage return\n" msgstr "" -#: src/stty.c:596 +#: src/stty.c:605 msgid "" " [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" @@ -8468,11 +8819,11 @@ msgid "" " [-]istrip clear high (8th) bit of input characters\n" msgstr "" -#: src/stty.c:603 +#: src/stty.c:612 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr "" -#: src/stty.c:606 +#: src/stty.c:615 msgid "" " * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" @@ -8482,7 +8833,7 @@ msgid "" " [-]tandem same as [-]ixoff\n" msgstr "" -#: src/stty.c:614 +#: src/stty.c:623 msgid "" "\n" "Output settings:\n" @@ -8492,7 +8843,7 @@ msgid "" " * nlN newline delay style, N in [0..1]\n" msgstr "" -#: src/stty.c:622 +#: src/stty.c:631 msgid "" " * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of null characters\n" @@ -8502,7 +8853,7 @@ msgid "" " * [-]onlret newline performs a carriage return\n" msgstr "" -#: src/stty.c:630 +#: src/stty.c:639 msgid "" " * [-]onocr do not print carriage returns in the first column\n" " [-]opost postprocess output\n" @@ -8512,7 +8863,7 @@ msgid "" " * vtN vertical tab delay style, N in [0..1]\n" msgstr "" -#: src/stty.c:638 +#: src/stty.c:647 msgid "" "\n" "Local settings:\n" @@ -8521,7 +8872,7 @@ msgid "" " * -crtkill kill all line by obeying the echoctl and echok settings\n" msgstr "" -#: src/stty.c:645 +#: src/stty.c:654 msgid "" " * [-]ctlecho echo control characters in hat notation ('^c')\n" " [-]echo echo input characters\n" @@ -8530,7 +8881,7 @@ msgid "" " [-]echok echo a newline after a kill character\n" msgstr "" -#: src/stty.c:652 +#: src/stty.c:661 msgid "" " * [-]echoke same as [-]crtkill\n" " [-]echonl echo newline even if not echoing other characters\n" @@ -8539,7 +8890,7 @@ msgid "" " [-]iexten enable non-POSIX special characters\n" msgstr "" -#: src/stty.c:659 +#: src/stty.c:668 msgid "" " [-]isig enable interrupt, quit, and suspend special characters\n" " [-]noflsh disable flushing after interrupt and quit special " @@ -8549,7 +8900,7 @@ msgid "" " * [-]xcase with icanon, escape with '\\' for uppercase characters\n" msgstr "" -#: src/stty.c:666 +#: src/stty.c:675 msgid "" "\n" "Combination settings:\n" @@ -8558,7 +8909,7 @@ msgid "" " -cbreak same as icanon\n" msgstr "" -#: src/stty.c:673 +#: src/stty.c:682 msgid "" " cooked same as brkint ignpar istrip icrnl ixon opost isig\n" " icanon, eof and eol characters to their default values\n" @@ -8566,7 +8917,7 @@ msgid "" " crt same as echoe echoctl echoke\n" msgstr "" -#: src/stty.c:679 +#: src/stty.c:688 msgid "" " dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" " kill ^u\n" @@ -8575,7 +8926,7 @@ msgid "" " evenp same as parenb -parodd cs7\n" msgstr "" -#: src/stty.c:686 +#: src/stty.c:695 msgid "" " -evenp same as -parenb cs8\n" " * [-]lcase same as xcase iuclc olcuc\n" @@ -8585,7 +8936,7 @@ msgid "" " -nl same as icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" msgstr "" -#: src/stty.c:694 +#: src/stty.c:703 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -8594,7 +8945,7 @@ msgid "" " -pass8 same as parenb istrip cs7\n" msgstr "" -#: src/stty.c:701 +#: src/stty.c:710 msgid "" " raw same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" " -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n" @@ -8602,7 +8953,7 @@ msgid "" " -raw same as cooked\n" msgstr "" -#: src/stty.c:707 +#: src/stty.c:716 msgid "" " sane same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" " -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n" @@ -8612,7 +8963,7 @@ msgid "" " characters to their default values\n" msgstr "" -#: src/stty.c:715 +#: src/stty.c:724 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -8621,126 +8972,59 @@ msgid "" "127; special values ^- or undef used to disable special characters.\n" msgstr "" -#: src/stty.c:787 +#: src/stty.c:796 #, fuzzy, c-format msgid "only one device may be specified" msgstr "kun ett argument kan spesifiseres" -#: src/stty.c:817 +#: src/stty.c:826 #, fuzzy, 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" -#: src/stty.c:823 +#: src/stty.c:832 #, c-format msgid "when specifying an output style, modes may not be set" msgstr "" -#: src/stty.c:838 +#: src/stty.c:847 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "" -#: src/stty.c:883 src/stty.c:993 +#: src/stty.c:892 src/stty.c:1002 #, fuzzy, c-format msgid "invalid argument %s" msgstr "ugyldig argument %s for %s" -#: src/stty.c:894 src/stty.c:911 src/stty.c:923 src/stty.c:936 src/stty.c:948 -#: src/stty.c:968 +#: 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 msgid "missing argument to %s" msgstr "flertydig argument %s for %s" -#: src/stty.c:974 +#: src/stty.c:983 #, fuzzy, c-format msgid "invalid line discipline %s" msgstr "ugyldig bredde: «%s»" -#: src/stty.c:1044 +#: src/stty.c:1053 #, c-format msgid "%s: unable to perform all requested operations" msgstr "" -#: src/stty.c:1390 +#: src/stty.c:1399 #, c-format msgid "%s: no size information for this device" msgstr "" -#: src/stty.c:1904 +#: src/stty.c:1920 #, fuzzy, c-format msgid "invalid integer argument %s" msgstr "ugyldig linjenummer-økning: «%s»" -#: src/su.c:229 -msgid "Password:" -msgstr "" - -#: src/su.c:232 -#, c-format -msgid "getpass: cannot open /dev/tty" -msgstr "" - -#: src/su.c:290 -#, fuzzy, c-format -msgid "cannot set groups" -msgstr "kan ikke utelate både bruker og gruppe" - -#: src/su.c:294 -#, fuzzy, c-format -msgid "cannot set group id" -msgstr "kan ikke utelate både bruker og gruppe" - -#: src/su.c:296 -#, fuzzy, c-format -msgid "cannot set user id" -msgstr "kan ikke utelate både bruker og gruppe" - -#: src/su.c:371 -#, fuzzy, c-format -msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" -msgstr "Bruk: %s [FLAGG]... [FIL]...\n" - -#: src/su.c:372 -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 "" - -#: src/su.c:384 -msgid "" -"\n" -"A mere - implies -l. If USER not given, assume root.\n" -msgstr "" - -#: src/su.c:461 -#, c-format -msgid "user %s does not exist" -msgstr "" - -#: src/su.c:484 -#, c-format -msgid "incorrect password" -msgstr "" - -#: src/su.c:501 -#, c-format -msgid "using restricted shell %s" -msgstr "" - -#: src/su.c:509 -#, fuzzy, c-format -msgid "warning: cannot change directory to %s" -msgstr "kan ikke opprette katalog %s" - #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 #, fuzzy @@ -8771,7 +9055,7 @@ msgstr "" msgid "ignoring all arguments" msgstr "for mange argumenter" -#: src/system.h:340 +#: src/system.h:343 #, c-format msgid "" "\n" @@ -8780,15 +9064,23 @@ msgid "" "for details about the options it supports.\n" msgstr "" -#: src/system.h:346 +#: src/system.h:349 msgid " --help display this help and exit\n" msgstr " --help vis denne hjelpteksten og avslutt\n" -#: src/system.h:348 +#: src/system.h:351 msgid " --version output version information and exit\n" msgstr " --version vis programversjon og avslutt\n" -#: src/system.h:541 +#: src/system.h:544 +#, fuzzy +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 msgid "" "\n" "SIZE is an integer and optional unit (example: 10M is 10*1024*1024). Units\n" @@ -8796,7 +9088,7 @@ msgid "" "1000).\n" msgstr "" -#: src/system.h:550 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -8805,7 +9097,7 @@ msgid "" "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n" msgstr "" -#: src/system.h:560 +#: src/system.h:571 #, fuzzy, c-format msgid "" "\n" @@ -8818,22 +9110,22 @@ msgstr "" #. <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:574 +#: src/system.h:585 #, c-format msgid "Report %s translation bugs to <http://translationproject.org/team/>\n" msgstr "" -#: src/system.h:578 +#: src/system.h:589 #, c-format msgid "For complete documentation, run: info coreutils '%s invocation'\n" msgstr "" -#: src/system.h:585 +#: src/system.h:596 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "Prøv med «%s --help» for mer informasjon.\n" -#: src/system.h:617 +#: src/system.h:628 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -8849,17 +9141,17 @@ 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" -"\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:145 +#: src/tac.c:144 #, fuzzy msgid "" " -b, --before attach the separator before instead of after\n" @@ -8870,42 +9162,42 @@ msgstr "" " -r, --regex tolk separatoren som et regulært uttrykk\n" " -s, --separator=STRENG bruk STRENG som separator istedet for linjeskift\n" -#: src/tac.c:235 src/tac.c:336 +#: src/tac.c:234 src/tac.c:335 #, fuzzy, c-format msgid "%s: seek failed" msgstr "feil ved lukking av fil" -#: src/tac.c:264 +#: src/tac.c:263 #, fuzzy, c-format msgid "record too large" msgstr "%s: fil for lang" -#: src/tac.c:451 +#: src/tac.c:450 #, fuzzy, c-format msgid "failed to create temporary file in %s" msgstr "kan ikke opprette midlertidig fil" -#: src/tac.c:459 +#: src/tac.c:458 #, fuzzy, c-format msgid "failed to open %s for writing" msgstr "%s: fil for lang" -#: src/tac.c:476 +#: src/tac.c:475 #, fuzzy, c-format msgid "failed to rewind stream for %s" msgstr "kan ikke opprette katalog %s" -#: src/tac.c:512 src/tac.c:519 +#: src/tac.c:511 src/tac.c:518 #, fuzzy, c-format msgid "%s: write error" msgstr "feil ved skriving" -#: src/tac.c:572 +#: src/tac.c:571 #, fuzzy, c-format msgid "failed to open %s for reading" msgstr "%s: fil for lang" -#: src/tac.c:630 +#: src/tac.c:629 #, c-format msgid "separator cannot be empty" msgstr "separatoren kan ikke være tom" @@ -8916,19 +9208,18 @@ msgid "Ian Lance Taylor" msgstr "" #: src/tail.c:262 -#, c-format +#, fuzzy, 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" -"\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:271 +#: src/tail.c:270 msgid "" " -c, --bytes=K output the last K bytes; alternatively, use -c " "+K\n" @@ -8936,7 +9227,7 @@ msgid "" "file\n" msgstr "" -#: src/tail.c:275 +#: src/tail.c:274 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -8949,7 +9240,7 @@ msgstr "" " -f, --follow og --follow=descriptot er de samme\n" " -F samme som --follow=name --retry\n" -#: src/tail.c:282 +#: src/tail.c:281 #, fuzzy, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -8972,7 +9263,7 @@ msgstr "" " (dette er det vanlige tilfellet for roterte\n" " logg-filer\n" -#: src/tail.c:295 +#: src/tail.c:294 #, fuzzy msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" @@ -8987,7 +9278,7 @@ msgstr "" "sekunder\n" " -v, --verbose skriv alltid topptekster med filnavn\n" -#: src/tail.c:302 +#: src/tail.c:301 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations.\n" @@ -8996,7 +9287,7 @@ msgid "" " -v, --verbose always output headers giving file names\n" msgstr "" -#: src/tail.c:311 +#: src/tail.c:310 #, fuzzy msgid "" "\n" @@ -9013,7 +9304,7 @@ msgstr "" "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:320 +#: src/tail.c:319 #, fuzzy msgid "" "With --follow (-f), tail defaults to following the file descriptor, which\n" @@ -9029,66 +9320,66 @@ msgstr "" "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:379 +#: src/tail.c:378 #, c-format msgid "closing %s (fd=%d)" msgstr "lukker %s (fd=%d)" -#: src/tail.c:454 +#: 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" -#: src/tail.c:458 +#: src/tail.c:457 #, fuzzy, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "%s: kan ikke søke til posisjon %s%s relativ til slutten" -#: src/tail.c:895 +#: src/tail.c:894 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "" -#: src/tail.c:907 +#: src/tail.c:906 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" msgstr "" -#: src/tail.c:964 +#: src/tail.c:963 #, fuzzy, c-format msgid "%s has become inaccessible" msgstr "«%s» har blitt utilgjengelig" -#: src/tail.c:981 +#: src/tail.c:980 #, fuzzy, 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:990 +#: src/tail.c:989 #, fuzzy, 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:1011 +#: src/tail.c:1010 #, fuzzy, c-format msgid "%s has become accessible" msgstr "«%s» har blitt utilgjengelig" -#: src/tail.c:1019 +#: src/tail.c:1018 #, fuzzy, c-format msgid "%s has appeared; following end of new file" msgstr "«%s» har blitt opprettet. Følger etter slutten av ny fil" -#: src/tail.c:1030 +#: src/tail.c:1029 #, fuzzy, c-format msgid "%s has been replaced; following end of new file" msgstr "«%s» har blitt erstattet. Følger etter slutten av ny fil" -#: src/tail.c:1131 +#: src/tail.c:1130 #, fuzzy, c-format msgid "%s: cannot change nonblocking mode" msgstr "kan ikke endre eier og/eller gruppe for %s" @@ -9392,17 +9683,22 @@ msgstr "%s: heltall forventet etter «%c»" msgid "extra argument %s" msgstr "for mange argumenter" -#: src/timeout.c:124 +#: src/timeout.c:112 +#, c-format +msgid "warning: sigprocmask" +msgstr "" + +#: src/timeout.c:145 #, c-format msgid "warning: timer_settime" msgstr "" -#: src/timeout.c:129 +#: src/timeout.c:150 #, c-format msgid "warning: timer_create" msgstr "" -#: src/timeout.c:204 +#: src/timeout.c:225 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -9411,17 +9707,17 @@ msgstr "" "Bruk: %s [FIL]...\n" "eller: %s [FLAGG]\n" -#: src/timeout.c:208 +#: src/timeout.c:229 #, fuzzy -msgid "" -"Start COMMAND, and kill it if still running after DURATION.\n" -"\n" -"Mandatory arguments to long options are mandatory for short options too.\n" +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:213 +#: src/timeout.c:235 msgid "" +" --preserve-status\n" +" exit with the same status as COMMAND, even when the\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 " @@ -9436,7 +9732,7 @@ msgid "" " See 'kill -l' for a list of signals\n" msgstr "" -#: src/timeout.c:229 +#: src/timeout.c:254 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -9444,25 +9740,30 @@ msgid "" "days.\n" msgstr "" -#: src/timeout.c:234 +#: src/timeout.c:259 msgid "" "\n" -"If the command times out, then exit with status 124. Otherwise, exit\n" -"with the status of COMMAND. If no signal is specified, send the TERM\n" -"signal upon timeout. The TERM signal kills any process that does not\n" -"block or catch that signal. For other processes, it may be necessary to\n" -"use the KILL (9) signal, since this signal cannot be caught. If the\n" -"KILL (9) signal is sent, the exit status is 128+9 rather than 124.\n" +"If the command times out, and --preserve-status is not set, then exit with\n" +"status 124. Otherwise, exit with the status of COMMAND. If no signal\n" +"is specified, send the TERM signal upon timeout. The TERM signal kills\n" +"any process that does not block or catch that signal. It may be necessary\n" +"to use the KILL (9) signal, since this signal cannot be caught, in which\n" +"case the exit status is 128+9 rather than 124.\n" +msgstr "" + +#: src/timeout.c:363 +#, c-format +msgid "warning: disabling core dumps failed" msgstr "" -#: src/timeout.c:419 +#: src/timeout.c:471 #, fuzzy, c-format msgid "error waiting for command" msgstr "feil ved skriving til %s" -#: src/timeout.c:441 +#: src/timeout.c:482 #, c-format -msgid "warning: disabling core dumps failed" +msgid "the monitored command dumped core" msgstr "" #. This is a proper name. See the gettext manual, section Names. @@ -9475,22 +9776,22 @@ msgstr "" msgid "Randy Smith" msgstr "" -#: src/touch.c:115 src/touch.c:313 +#: src/touch.c:115 src/touch.c:309 #, fuzzy, c-format msgid "invalid date format %s" msgstr "ugyldig argument %s for %s" -#: src/touch.c:194 +#: src/touch.c:191 #, fuzzy, c-format msgid "cannot touch %s" msgstr "kan ikke utføre ioctl på «%s»" -#: src/touch.c:200 +#: src/touch.c:197 #, c-format msgid "setting times of %s" msgstr "" -#: src/touch.c:216 +#: src/touch.c:213 msgid "" "Update the access and modification times of each FILE to the current time.\n" "\n" @@ -9499,10 +9800,9 @@ msgid "" "\n" "A FILE argument string of - is handled specially and causes touch to\n" "change the times of the file associated with standard output.\n" -"\n" msgstr "" -#: src/touch.c:229 +#: src/touch.c:225 msgid "" " -a change only the access time\n" " -c, --no-create do not create any files\n" @@ -9510,7 +9810,7 @@ msgid "" " -f (ignored)\n" msgstr "" -#: src/touch.c:235 +#: src/touch.c:231 msgid "" " -h, --no-dereference affect each symbolic link instead of any " "referenced\n" @@ -9519,27 +9819,27 @@ msgid "" " -m change only the modification time\n" msgstr "" -#: src/touch.c:241 +#: src/touch.c:237 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" -" --time=WORD change the specified time:\n" +" --time=WORD change the specified time:\n" " WORD is access, atime, or use: equivalent to -a\n" " WORD is modify or mtime: equivalent to -m\n" msgstr "" -#: src/touch.c:250 +#: src/touch.c:246 msgid "" "\n" "Note that the -d and -t options accept different time-date formats.\n" msgstr "" -#: src/touch.c:339 +#: src/touch.c:335 #, fuzzy, c-format msgid "cannot specify times from more than one source" msgstr "kan ikke dele opp på mer enn én måte" -#: src/touch.c:413 +#: src/touch.c:409 #, fuzzy, c-format msgid "" "warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'" @@ -9808,25 +10108,24 @@ msgid "" "If a FILE is larger than the specified size, the extra data is lost.\n" "If a FILE is shorter, it is extended and the extended part (hole)\n" "reads as zero bytes.\n" -"\n" msgstr "" -#: src/truncate.c:110 +#: src/truncate.c:109 msgid " -c, --no-create do not create any files\n" msgstr "" -#: src/truncate.c:113 +#: src/truncate.c:112 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" -#: src/truncate.c:116 +#: 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" msgstr "" -#: src/truncate.c:122 +#: src/truncate.c:121 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -9834,57 +10133,57 @@ msgid "" "'/' round down to multiple of, '%' round up to multiple of.\n" msgstr "" -#: src/truncate.c:150 +#: src/truncate.c:149 #, c-format msgid "overflow in %<PRIdMAX> * %<PRIdMAX> byte blocks for file %s" msgstr "" -#: src/truncate.c:174 +#: src/truncate.c:173 #, c-format msgid "%s has unusable, apparently negative size" msgstr "" -#: src/truncate.c:184 src/truncate.c:379 +#: src/truncate.c:183 src/truncate.c:384 #, fuzzy, c-format msgid "cannot get the size of %s" msgstr "kan ikke dele opp på mer enn én måte" -#: src/truncate.c:206 +#: src/truncate.c:205 #, c-format msgid "overflow rounding up size of file %s" msgstr "" -#: src/truncate.c:216 +#: src/truncate.c:215 #, c-format msgid "overflow extending size of file %s" msgstr "" -#: src/truncate.c:231 +#: src/truncate.c:230 #, c-format msgid "failed to truncate %s at %<PRIdMAX> bytes" msgstr "" -#: src/truncate.c:305 +#: src/truncate.c:303 #, c-format msgid "multiple relative modifiers specified" msgstr "" -#: src/truncate.c:335 +#: src/truncate.c:333 #, fuzzy, c-format msgid "you must specify either %s or %s" msgstr "du må spesifisere en liste av bytes, tegn eller felt" -#: src/truncate.c:342 +#: src/truncate.c:340 #, c-format msgid "you must specify a relative %s with %s" msgstr "" -#: src/truncate.c:349 +#: src/truncate.c:347 #, c-format msgid "%s was specified but %s was not" msgstr "" -#: src/truncate.c:400 +#: src/truncate.c:404 #, fuzzy, c-format msgid "cannot open %s for writing" msgstr "kan ikke utføre ioctl på «%s»" @@ -9964,14 +10263,13 @@ msgstr "kan ikke opprette midlertidig fil" msgid "" "Convert blanks in each FILE to tabs, writing to standard output.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\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:125 +#: src/unexpand.c:124 #, fuzzy msgid "" " -a, --all convert all blanks, instead of just initial blanks\n" @@ -9985,12 +10283,12 @@ msgstr "" "8\n" " -t, --tabs=LISTE bruk komma-separert LISTE med tabulatorposisjoner.\n" -#: src/unexpand.c:153 +#: src/unexpand.c:152 #, c-format msgid "tabs are too far apart" msgstr "" -#: src/unexpand.c:505 +#: src/unexpand.c:504 #, fuzzy, c-format msgid "tab stop value is too large" msgstr "%s er for stor" @@ -10006,10 +10304,9 @@ msgid "" "writing to OUTPUT (or standard output).\n" "\n" "With no options, matching lines are merged to the first occurrence.\n" -"\n" msgstr "" -#: src/uniq.c:148 +#: src/uniq.c:147 msgid "" " -c, --count prefix lines by the number of occurrences\n" " -d, --repeated only print duplicate lines\n" @@ -10017,7 +10314,7 @@ msgstr "" " -c, --count begynn linjer med antall forekomster\n" " -d, --repeated skriv bare ut linjer det er flere av\n" -#: src/uniq.c:152 +#: src/uniq.c:151 #, fuzzy msgid "" " -D, --all-repeated[=delimit-method] print all duplicate lines\n" @@ -10036,14 +10333,14 @@ msgstr "" " -s, --skip-chars=N ikke sammenlign de første N tegnene\n" " -u, --unique skriv bare ut unike linjer\n" -#: src/uniq.c:162 +#: src/uniq.c:161 #, fuzzy 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:167 +#: src/uniq.c:166 #, fuzzy msgid "" "\n" @@ -10053,7 +10350,7 @@ msgstr "" "\n" "Et felt er en rekke blanke tegn, så andre tegn. Felt hoppes over før tegn.\n" -#: src/uniq.c:172 +#: src/uniq.c:171 msgid "" "\n" "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n" @@ -10061,25 +10358,25 @@ msgid "" "Also, comparisons honor the rules specified by 'LC_COLLATE'.\n" msgstr "" -#: src/uniq.c:359 +#: src/uniq.c:358 #, fuzzy, c-format msgid "too many repeated lines" msgstr "for mange argumenter" -#: src/uniq.c:522 +#: src/uniq.c:521 msgid "invalid number of fields to skip" msgstr "ugyldig antall felt å hoppe over" -#: src/uniq.c:531 +#: src/uniq.c:530 msgid "invalid number of bytes to skip" msgstr "ugyldig antall oktetter å hoppe over" -#: src/uniq.c:540 +#: src/uniq.c:539 #, fuzzy msgid "invalid number of bytes to compare" msgstr "ugyldig antall oktetter å sammenligne" -#: src/uniq.c:559 +#: src/uniq.c:558 #, c-format msgid "printing all duplicated lines and repeat counts is meaningless" msgstr "å skrive alle dupliserte linjer *og* gjentagelsesantall er meningsløst" @@ -10131,6 +10428,11 @@ msgid_plural "up %ld days %2d:%02d, " msgstr[0] "" msgstr[1] "" +#: src/uptime.c:149 +#, c-format +msgid "up %2d:%02d, " +msgstr "" + #: src/uptime.c:151 #, fuzzy, c-format msgid "%lu user" @@ -10211,84 +10513,84 @@ msgstr "" msgid " old " msgstr "" -#: src/who.c:449 +#: src/who.c:440 msgid "system boot" msgstr "" -#: src/who.c:456 src/who.c:458 +#: src/who.c:447 src/who.c:449 msgid "id=" msgstr "" -#: src/who.c:471 src/who.c:476 +#: src/who.c:462 src/who.c:467 msgid "term=" msgstr "" -#: src/who.c:473 src/who.c:477 +#: src/who.c:464 src/who.c:468 msgid "exit=" msgstr "" -#: src/who.c:494 +#: src/who.c:485 msgid "LOGIN" msgstr "" -#: src/who.c:514 +#: src/who.c:505 msgid "clock change" msgstr "" -#: src/who.c:526 src/who.c:527 +#: src/who.c:517 src/who.c:518 msgid "run-level" msgstr "" -#: src/who.c:530 src/who.c:531 +#: src/who.c:521 src/who.c:522 msgid "last=" msgstr "" -#: src/who.c:562 +#: src/who.c:553 #, c-format msgid "" "\n" "# users=%lu\n" msgstr "" -#: src/who.c:568 +#: src/who.c:559 msgid "NAME" msgstr "" -#: src/who.c:568 +#: src/who.c:559 msgid "LINE" msgstr "" -#: src/who.c:568 +#: src/who.c:559 msgid "TIME" msgstr "" -#: src/who.c:568 +#: src/who.c:559 #, fuzzy msgid "IDLE" msgstr "FEIL" -#: src/who.c:569 +#: src/who.c:560 msgid "PID" msgstr "" -#: src/who.c:569 +#: src/who.c:560 msgid "COMMENT" msgstr "" -#: src/who.c:569 +#: src/who.c:560 msgid "EXIT" msgstr "" -#: src/who.c:649 +#: src/who.c:640 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n" msgstr "Bruk: %s [FLAGG]... FIL1 FIL2\n" -#: src/who.c:650 +#: src/who.c:641 msgid "Print information about users who are currently logged in.\n" msgstr "" -#: src/who.c:653 +#: src/who.c:644 msgid "" "\n" " -a, --all same as -b -d --login -p -r -t -T -u\n" @@ -10297,18 +10599,18 @@ msgid "" " -H, --heading print line of column headings\n" msgstr "" -#: src/who.c:660 +#: src/who.c:651 msgid " -l, --login print system login processes\n" msgstr "" -#: src/who.c:663 +#: src/who.c:654 msgid "" " --lookup attempt to canonicalize hostnames via DNS\n" " -m only hostname and user associated with stdin\n" " -p, --process print active processes spawned by init\n" msgstr "" -#: src/who.c:668 +#: src/who.c:659 msgid "" " -q, --count all login names and number of users logged on\n" " -r, --runlevel print current runlevel\n" @@ -10316,7 +10618,7 @@ msgid "" " -t, --time print last system clock change\n" msgstr "" -#: src/who.c:674 +#: src/who.c:665 msgid "" " -T, -w, --mesg add user's message status as +, - or ?\n" " -u, --users list users logged in\n" @@ -10324,7 +10626,7 @@ msgid "" " --writable same as -T\n" msgstr "" -#: src/who.c:682 +#: src/who.c:673 #, c-format msgid "" "\n" @@ -10359,6 +10661,34 @@ 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" @@ -10368,20 +10698,63 @@ msgstr "" #~ "eller: %s [FLAGG]\n" #, fuzzy -#~ msgid "Usage: %s [OPTION] FILE...\n" -#~ msgstr "Bruk: %s [FLAGG] [FIL]...\n" +#~ 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 "Usage: %s [OPTION]... PATH START\n" -#~ msgstr "Bruk: %s [FLAGG]... SETT1 [SETT2]\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 "" +#~ "-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 "cannot create link %s" -#~ msgstr "kan ikke opprette katalog %s" +#~ 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 "%s: option '%s' is ambiguous\n" -#~ msgstr "%s: flagget «-W %s» er flertydig\n" +#~ 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" @@ -10437,6 +10810,10 @@ msgstr "" #~ 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" @@ -10774,10 +11151,32 @@ msgstr "" #~ 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" diff --git a/po/nl.gmo b/po/nl.gmo index 2ee2ce5f..abcbe76a 100644 Binary files a/po/nl.gmo and b/po/nl.gmo differ diff --git a/po/nl.po b/po/nl.po index 4116c808..b33f4916 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1,21 +1,19 @@ # Dutch 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. # -# "Hoe is dat zo gekomen -# Van altijd blijven slapen -# Tot nooit meer willen zien?" +# "Non vi sed amore." # -# Benno Schulenberg <benno@vertaalt.nl>, 2008, 2010, 2011, 2012. +# Benno Schulenberg <benno@vertaalt.nl>, 2008, 2010, 2011, 2012, 2013. # 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.16\n" +"Project-Id-Version: coreutils 8.20-pre2\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2012-05-10 19:35+0200\n" -"PO-Revision-Date: 2012-03-29 22:05+0200\n" +"POT-Creation-Date: 2013-02-14 15:56+0000\n" +"PO-Revision-Date: 2013-02-10 09:37+0100\n" "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n" "Language-Team: Dutch <vertaling@vrijschrift.org>\n" "Language: nl\n" @@ -43,19 +41,19 @@ msgstr "Geldige argumenten zijn:" msgid "error closing file" msgstr "fout bij sluiten van bestand" -#: lib/closeout.c:112 src/base64.c:109 src/base64.c:121 src/base64.c:127 -#: src/base64.c:168 src/base64.c:224 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:330 src/expand.c:355 src/head.c:298 -#: src/head.c:348 src/head.c:756 src/head.c:797 src/mktemp.c:350 src/od.c:919 -#: src/paste.c:160 src/shuf.c:369 src/split.c:727 src/split.c:964 -#: src/split.c:969 src/tail.c:350 src/tail.c:1201 src/tail.c:1307 +#: 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 -#: src/unexpand.c:427 src/unexpand.c:443 +#: 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:1160 src/copy.c:2602 +#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617 #, c-format msgid "preserving permissions for %s" msgstr "behouden van toegangsrechten van %s" @@ -247,18 +245,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:483 +#: lib/mkdir-p.c:196 src/install.c:484 #, c-format msgid "cannot change permissions of %s" msgstr "kan de toegangsrechten van %s niet veranderen" -#: lib/mkdir-p.c:206 src/copy.c:2261 src/install.c:709 src/install.c:722 +#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722 #, 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:915 src/tac.c:435 +#: src/split.c:929 src/tac.c:434 #, c-format msgid "memory exhausted" msgstr "onvoldoende geheugen beschikbaar" @@ -307,76 +305,76 @@ msgstr "’" msgid "%s: end of file" msgstr "%s: einde van bestand" -#: lib/regcomp.c:130 +#: lib/regcomp.c:131 msgid "Success" msgstr "Gelukt" -#: lib/regcomp.c:133 +#: lib/regcomp.c:134 msgid "No match" msgstr "Geen overeenkomsten" -#: lib/regcomp.c:136 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "Ongeldige reguliere expressie" # Zie http://mailman.vrijschrift.org/pipermail/vertaling/2005-August/004670.html -#: lib/regcomp.c:139 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "Ongeldig samengesteld teken" -#: lib/regcomp.c:142 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "Ongeldige tekenklassenaam" -#: lib/regcomp.c:145 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "Backslash aan het eind" -#: lib/regcomp.c:148 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "Ongeldige terugverwijzing" -#: lib/regcomp.c:151 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "Ongepaarde [ of [^" -#: lib/regcomp.c:154 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "Ongepaarde ( of \\(" -#: lib/regcomp.c:157 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "Ongepaarde \\{" -#: lib/regcomp.c:160 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "Ongeldige inhoud van \\{\\}" -#: lib/regcomp.c:163 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "Ongeldig bereikeinde" -#: lib/regcomp.c:166 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Onvoldoende geheugen beschikbaar" -#: lib/regcomp.c:169 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "Ongeldige voorafgaande reguliere expressie" -#: lib/regcomp.c:172 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "Voortijdig einde van reguliere expressie" -#: lib/regcomp.c:175 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "Reguliere expressie is te groot" -#: lib/regcomp.c:178 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "Ongepaarde ) of \\)" -#: lib/regcomp.c:703 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "Geen eerdere reguliere expressie" @@ -415,7 +413,7 @@ msgstr "^[jJyY]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-mode-acl.c:695 src/copy.c:2284 src/cp.c:518 +#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516 #, c-format msgid "setting permissions for %s" msgstr "instellen van toegangsrechten van %s" @@ -559,13 +557,13 @@ msgstr "Stroomstoring" msgid "Resource lost" msgstr "Hulpbron verloren" -#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262 -#: lib/spawn-pipe.c:265 +#: 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:232 lib/spawn-pipe.c:346 lib/wait-process.c:282 +#: 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" @@ -581,24 +579,24 @@ msgstr "Realtime-signaal %d" msgid "Unknown signal %d" msgstr "Onbekend signaal %d" -#: lib/unicodeio.c:103 +#: lib/unicodeio.c:102 msgid "iconv function not usable" msgstr "de functie iconv() is onbruikbaar" -#: lib/unicodeio.c:105 +#: lib/unicodeio.c:104 msgid "iconv function not available" msgstr "de functie iconv() is niet beschikbaar" -#: lib/unicodeio.c:112 +#: lib/unicodeio.c:111 msgid "character out of range" msgstr "teken ligt buiten toegestaan bereik" -#: lib/unicodeio.c:182 +#: lib/unicodeio.c:181 #, c-format msgid "cannot convert U+%04X to local character set" msgstr "kan U+%04X niet converteren naar de lokale tekenset" -#: lib/unicodeio.c:184 +#: lib/unicodeio.c:183 #, c-format msgid "cannot convert U+%04X to local character set: %s" msgstr "kan U+%04X niet converteren naar de lokale tekenset: %s" @@ -783,7 +781,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:562 +#: lib/version-etc.c:251 src/system.h:573 #, c-format msgid "%s home page: <%s>\n" msgstr "Webpagina van %s: <%s>\n" @@ -793,7 +791,7 @@ 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:563 +#: lib/version-etc.c:256 src/system.h:574 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" @@ -884,15 +882,13 @@ msgstr "Simon Josefsson" msgid "" "Usage: %s [OPTION]... [FILE]\n" "Base64 encode or decode FILE, or standard input, to standard output.\n" -"\n" msgstr "" "Gebruik: %s [OPTIE...] [BESTAND]\n" "\n" -"Het gegeven BESTAND (of standaardinvoer) volgens de base64-methode\n" -"coderen of decoderen naar standaarduitvoer.\n" -"\n" +"Codeert of decodeert het gegeven BESTAND (of standaardinvoer)\n" +"volgens de base64-methode naar standaarduitvoer.\n" -#: src/base64.c:64 +#: src/base64.c:67 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -909,7 +905,7 @@ msgstr "" "regel\n" "\n" -#: src/base64.c:73 src/cat.c:110 src/fmt.c:293 src/shuf.c:71 src/sum.c:70 +#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -917,7 +913,7 @@ msgstr "" "\n" "Zonder BESTAND, of wanneer BESTAND - is, wordt standaardinvoer gelezen.\n" -#: src/base64.c:76 +#: src/base64.c:79 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -934,37 +930,37 @@ msgstr "" "over andere niet-alfabetische tekens in de gecodeerde reeks bytes te " "stappen.\n" -#: src/base64.c:171 src/base64.c:208 src/csplit.c:263 src/csplit.c:1435 -#: src/join.c:451 src/shuf.c:157 src/shuf.c:361 src/tac-pipe.c:74 +#: 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 #, c-format msgid "read error" msgstr "fout bij lezen" -#: src/base64.c:227 +#: src/base64.c:230 #, c-format msgid "invalid input" msgstr "ongeldige invoer" -#: src/base64.c:264 +#: src/base64.c:267 #, c-format msgid "invalid wrap size: %s" msgstr "ongeldige waarde van optie '-w'/'--wrap': %s" -#: src/base64.c:283 src/basename.c:173 src/comm.c:435 src/cp.c:607 -#: src/date.c:441 src/dircolors.c:447 src/du.c:894 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:169 src/install.c:929 src/join.c:961 -#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:157 src/mv.c:447 -#: src/od.c:1802 src/ptx.c:2081 src/readlink.c:154 src/seq.c:408 -#: src/shuf.c:320 src/shuf.c:339 src/sort.c:4477 src/split.c:1313 -#: src/tr.c:1797 src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:454 -#: src/uniq.c:471 src/unlink.c:81 src/uptime.c:250 src/users.c:146 -#: src/wc.c:666 src/who.c:836 src/whoami.c:79 +#: 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 #, c-format msgid "extra operand %s" msgstr "overtollig argument: %s" -#: src/base64.c:315 src/cat.c:781 +#: src/base64.c:318 src/cat.c:781 #, c-format msgid "closing standard input" msgstr "sluiten van standaardinvoer" @@ -972,15 +968,15 @@ 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/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:53 src/env.c:33 +#: 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/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:65 src/su.c:88 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 +#: 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 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -998,13 +994,11 @@ msgstr "" msgid "" "Print NAME with any leading directory components removed.\n" "If specified, also remove a trailing SUFFIX.\n" -"\n" msgstr "" -"De NAAM zonder de voorafgaande mapcomponenten tonen.\n" -"Indien gegeven, ook het ACHTERVOEGSEL verwijderen.\n" -"\n" +"Toont de NAAM zonder de voorafgaande mapcomponenten.\n" +"Indien gegeven, wordt ook het ACHTERVOEGSEL verwijderd.\n" -#: src/basename.c:59 +#: 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" @@ -1016,7 +1010,7 @@ msgstr "" " -z, --zero elke regel afsluiten met 0-byte, niet met " "nieuweregel\n" -#: src/basename.c:66 +#: src/basename.c:67 #, c-format msgid "" "\n" @@ -1033,20 +1027,21 @@ msgstr "" " %s -s .h include/stdio.h -> \"stdio\"\n" " %s -a een/rks1 een/rks2 -> \"rks1\" gevolgd door \"rks2\"\n" -#: src/basename.c:167 src/chcon.c:531 src/chgrp.c:277 src/chmod.c:526 -#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1369 +#: 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:183 src/mkfifo.c:108 src/mknod.c:146 src/nohup.c:111 -#: src/pathchk.c:148 src/printf.c:674 src/readlink.c:146 src/realpath.c:236 -#: src/rm.c:314 src/rmdir.c:223 src/seq.c:402 src/setuidgid.c:137 -#: src/sleep.c:119 src/stat.c:1476 src/stdbuf.c:346 src/tr.c:1782 +#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 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 #, 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:52 src/split.c:49 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/split.c:49 msgid "Torbjorn Granlund" msgstr "Torbjörn Granlund" @@ -1056,8 +1051,8 @@ msgstr "Torbjörn Granlund" msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:846 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4720 src/nl.c:182 src/paste.c:435 src/pr.c:2768 src/sum.c:58 +#: 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/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 +1115,7 @@ msgstr "" msgid "cannot do ioctl on %s" msgstr "kan geen ioctl() doen op %s" -#: src/cat.c:637 src/dd.c:2209 src/sort.c:379 src/tee.c:165 src/yes.c:86 +#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86 #, c-format msgid "standard output" msgstr "standaarduitvoer" @@ -1137,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:55 src/head.c:46 src/hostid.c:33 +#: 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 msgid "Jim Meyering" msgstr "Jim Meyering" -#: src/chcon.c:100 src/runcon.c:203 src/runcon.c:234 +#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238 #, c-format msgid "failed to create security context: %s" msgstr "kan beveiligingscontext %s niet aanmaken" @@ -1154,8 +1149,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:540 src/copy.c:2222 src/runcon.c:217 -#: src/stat.c:683 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221 +#: src/stat.c:702 #, c-format msgid "failed to get security context of %s" msgstr "kan de beveiligingscontext van %s niet verkrijgen" @@ -1171,12 +1166,12 @@ 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:446 src/ls.c:2981 +#: src/du.c:457 src/ls.c:2981 #, 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:426 +#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437 #, c-format msgid "cannot read directory %s" msgstr "kan map %s niet lezen" @@ -1186,13 +1181,13 @@ 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:599 +#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562 #, 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:618 -#: src/remove.c:613 +#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642 +#: src/remove.c:576 #, c-format msgid "fts_close failed" msgstr "fts_close() is mislukt" @@ -1215,14 +1210,14 @@ msgid "" "Change the security context of each FILE to CONTEXT.\n" "With --reference, change the security context of each FILE to that of " "RFILE.\n" -"\n" msgstr "" -"De beveiligingscontext van elk gegeven BESTAND veranderen naar CONTEXT.\n" -"Als '--reference' gegeven is, dan de beveiligingscontext van elk BESTAND\n" -"veranderen naar die van REFERENTIEBESTAND.\n" +"Verandert de beveiligingscontext van elk gegeven BESTAND naar CONTEXT.\n" "\n" +"Als '--reference' gegeven is, dan wordt de beveiligingscontext van elk " +"BESTAND\n" +"veranderd naar die van REFERENTIEBESTAND.\n" -#: src/chcon.c:362 src/chgrp.c:123 src/chown.c:94 +#: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94 msgid "" " --dereference affect the referent of each symbolic link (this is\n" " the default), rather than the symbolic link itself\n" @@ -1235,7 +1230,7 @@ msgstr "" "plaats\n" " van de bestanden waarnaar ze verwijzen\n" -#: src/chcon.c:367 +#: src/chcon.c:369 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" @@ -1249,7 +1244,15 @@ msgstr "" " -l, --range=BEREIK dit bereik instellen in de doel-" "beveiligingscontext\n" -#: src/chcon.c:373 +#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 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 '/' niet speciaal behandelen (standaard)\n" +" --preserve-root op '/' niet recursief werken\n" + +#: src/chcon.c:379 msgid "" " --reference=RFILE use RFILE's security context rather than " "specifying\n" @@ -1259,15 +1262,15 @@ msgstr "" "gebruiken\n" " in plaats van een CONTEXT-waarde\n" -#: src/chcon.c:377 src/chgrp.c:140 src/chown.c:118 +#: 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 bestanden en mappen recursief behandelen\n" -#: src/chcon.c:380 +#: src/chcon.c:386 msgid " -v, --verbose output a diagnostic for every file processed\n" msgstr " -v, --verbose een melding geven voor elk gezien bestand\n" -#: src/chcon.c:383 src/chgrp.c:143 src/chown.c:121 +#: src/chcon.c:389 src/chgrp.c:143 src/chown.c:121 msgid "" "\n" "The following options modify how a hierarchy is traversed when the -R\n" @@ -1292,36 +1295,36 @@ msgstr "" " -P symbolische koppelingen niet volgen (standaard)\n" "\n" -#: src/chcon.c:512 src/chgrp.c:264 src/chown.c:267 +#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267 #, c-format msgid "-R --dereference requires either -H or -L" msgstr "de combinatie '-R --dereference' vereist of '-H' of '-L'" -#: src/chcon.c:518 +#: src/chcon.c:524 #, c-format msgid "-R -h requires -P" msgstr "de combinatie '-R -h' vereist '-P'" -#: src/chcon.c:533 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282 -#: src/comm.c:429 src/csplit.c:1371 src/join.c:1149 src/link.c:79 -#: src/mknod.c:148 src/setuidgid.c:139 src/tr.c:1785 +#: 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 #, c-format msgid "missing operand after %s" msgstr "ontbrekend argument na %s" -#: src/chcon.c:556 src/runcon.c:247 +#: src/chcon.c:562 src/runcon.c:251 #, c-format msgid "invalid context: %s" msgstr "ongeldige context: %s" -#: src/chcon.c:563 +#: src/chcon.c:569 #, c-format msgid "conflicting security context specifiers given" msgstr "conflicterende specificaties voor beveiligingscontext gegeven" -#: src/chcon.c:572 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:433 src/cp.c:493 -#: src/mv.c:96 src/pwd.c:273 src/rm.c:324 src/touch.c:351 +#: 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 #, c-format msgid "failed to get attributes of %s" msgstr "kan de eigenschappen van %s niet verkrijgen" @@ -1371,14 +1374,6 @@ msgstr "" " een symbolische koppeling veranderd kan " "worden)\n" -#: src/chgrp.c:132 src/chmod.c:387 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 '/' niet speciaal behandelen (standaard)\n" -" --preserve-root op '/' niet recursief werken\n" - #: src/chgrp.c:136 msgid "" " --reference=RFILE use RFILE's group rather than specifying a\n" @@ -1644,7 +1639,7 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:97 src/install.c:575 src/setuidgid.c:110 src/setuidgid.c:120 +#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120 #, c-format msgid "invalid group %s" msgstr "ongeldige groep: %s" @@ -1713,8 +1708,8 @@ msgstr "instellen van groeps-ID is mislukt" msgid "failed to set user-ID" msgstr "instellen van gebruikers-ID is mislukt" -#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:213 src/stdbuf.c:366 -#: src/timeout.c:402 +#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365 +#: src/timeout.c:454 #, c-format msgid "failed to run command %s" msgstr "kan commando %s niet uitvoeren" @@ -1841,20 +1836,24 @@ 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:1609 src/dd.c:1976 +#: 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 #, c-format -msgid "reading %s" -msgstr "lezen van %s" +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:426 +#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425 #, c-format msgid "cannot lseek %s" msgstr "kan geen 'lseek' doen op %s" -#: src/copy.c:206 src/dd.c:2039 src/dd.c:2102 +#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151 #, c-format -msgid "writing %s" -msgstr "schrijven van %s" +msgid "error writing %s" +msgstr "fout bij schrijven van %s" #: src/copy.c:313 #, c-format @@ -1876,7 +1875,7 @@ msgstr "kan %s niet uitbreiden" msgid "clearing permissions for %s" msgstr "wissen van toegangsrechten van %s" -#: src/copy.c:697 src/copy.c:2470 src/cp.c:331 +#: src/copy.c:697 src/copy.c:2480 src/cp.c:329 #, c-format msgid "failed to preserve ownership for %s" msgstr "behouden van eigenaar van %s is mislukt" @@ -1891,14 +1890,14 @@ msgstr "kan bestand %s niet vinden" msgid "failed to preserve authorship for %s" msgstr "behouden van het auteurschap van %s is mislukt" -#: src/copy.c:804 src/csplit.c:638 src/du.c:901 src/fmt.c:449 src/head.c:847 -#: src/sort.c:4489 src/split.c:1329 src/tail.c:1756 src/wc.c:678 +#: 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 "kan %s niet openen om te lezen" -#: src/copy.c:810 src/copy.c:972 src/dd.c:1546 src/dd.c:2114 src/dd.c:2252 -#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:141 +#: 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 #, c-format msgid "cannot fstat %s" msgstr "kan status van %s niet opvragen" @@ -1919,14 +1918,14 @@ msgstr "kan de aanmaakcontext van het bestandssysteem niet verkrijgen" 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:1574 src/copy.c:1777 src/copy.c:1935 src/ln.c:314 -#: src/remove.c:267 src/remove.c:293 src/remove.c:444 src/remove.c:465 +#: 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 #, c-format msgid "cannot remove %s" msgstr "kan %s niet verwijderen" -#: src/copy.c:886 src/copy.c:1578 src/copy.c:1772 src/copy.c:1940 -#: src/remove.c:418 +#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945 +#: src/remove.c:375 #, c-format msgid "removed %s\n" msgstr "%s is verwijderd\n" @@ -1946,190 +1945,190 @@ msgstr "kan het normale bestand %s niet aanmaken" msgid "failed to clone %s from %s" msgstr "kan %2$s niet klonen naar %1$s" -#: src/copy.c:1098 src/copy.c:2531 +#: src/copy.c:1098 src/copy.c:2541 #, c-format msgid "preserving times for %s" msgstr "behouden van tijdsstempels van %s" -#: src/copy.c:1170 src/copy.c:1176 src/head.c:855 src/touch.c:175 -#: src/truncate.c:413 +#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172 +#: src/truncate.c:417 #, c-format -msgid "closing %s" -msgstr "sluiten van %s" +msgid "failed to close %s" +msgstr "sluiten van %s is mislukt" -#: src/copy.c:1466 +#: src/copy.c:1471 #, c-format msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? " msgstr "%s: toch proberen om %s te overschrijven, modus %04lo (%s) negeren? " -#: src/copy.c:1473 +#: src/copy.c:1478 #, c-format msgid "%s: overwrite %s? " msgstr "%s: %s overschrijven? " -#: src/copy.c:1542 +#: src/copy.c:1547 #, c-format msgid " (backup: %s)" msgstr " (reservekopie: %s)" -#: src/copy.c:1552 +#: src/copy.c:1557 #, c-format msgid "failed to restore the default file creation context" msgstr "kan de standaard aanmaakcontext niet herstellen" -#: src/copy.c:1584 +#: src/copy.c:1589 #, c-format msgid "cannot create hard link %s to %s" msgstr "kan geen harde koppeling %s maken naar %s" -#: src/copy.c:1637 src/copy.c:1689 src/copy.c:2272 src/copy.c:2589 +#: 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:1220 src/truncate.c:365 +#: src/stat.c:1239 src/truncate.c:363 #, c-format msgid "cannot stat %s" msgstr "kan status van %s niet opvragen" -#: src/copy.c:1645 +#: src/copy.c:1650 #, c-format msgid "omitting directory %s" msgstr "map %s wordt overgeslagen" -#: src/copy.c:1659 +#: src/copy.c:1664 #, c-format msgid "warning: source file %s specified more than once" msgstr "waarschuwing: bronbestand %s is meerdere keren opgegeven" -#: src/copy.c:1707 src/ln.c:246 +#: src/copy.c:1712 src/ln.c:246 #, c-format msgid "%s and %s are the same file" msgstr "%s en %s zijn hetzelfde bestand" -#: src/copy.c:1806 +#: src/copy.c:1811 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "kan niet-map %s niet overschrijven met map %s" -#: src/copy.c:1824 src/ln.c:214 +#: src/copy.c:1829 src/ln.c:214 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "zal zojuist aangemaakte %s niet overschrijven met %s" -#: src/copy.c:1842 +#: src/copy.c:1847 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "kan map %s niet overschrijven met een niet-map" -#: src/copy.c:1856 +#: src/copy.c:1861 #, 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:1886 +#: src/copy.c:1891 #, 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:1887 +#: src/copy.c:1892 #, 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:1910 src/ln.c:276 +#: src/copy.c:1915 src/ln.c:276 #, c-format msgid "cannot backup %s" msgstr "kan geen reservekopie maken van %s" -#: src/copy.c:1974 +#: src/copy.c:1979 #, 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:2051 +#: src/copy.c:2056 #, 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:2068 +#: src/copy.c:2073 #, 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:2118 +#: src/copy.c:2123 #, 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:2161 +#: src/copy.c:2166 #, c-format msgid "cannot move %s to %s" msgstr "kan %s niet verplaatsen naar %s" -#: src/copy.c:2173 +#: src/copy.c:2178 #, 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 " +"verplaatsing tussen apparaten is mislukt: %s naar %s; kan het doel niet " "verwijderen" -#: src/copy.c:2207 src/install.c:905 src/mkdir.c:189 src/mkfifo.c:114 -#: src/mknod.c:167 +#: 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:2241 +#: src/copy.c:2246 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "kan cyclische symbolische koppeling %s niet kopiëren" -#: src/copy.c:2350 +#: src/copy.c:2355 #, 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:2357 +#: src/copy.c:2362 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "kan symbolische koppeling %s naar %s niet aanmaken" -#: src/copy.c:2406 src/mkfifo.c:133 +#: src/copy.c:2416 src/mkfifo.c:132 #, c-format msgid "cannot create fifo %s" msgstr "kan fifo %s niet aanmaken" -#: src/copy.c:2415 +#: src/copy.c:2425 #, c-format msgid "cannot create special file %s" msgstr "kan speciaal bestand %s niet aanmaken" -#: src/copy.c:2426 src/ls.c:3191 src/stat.c:902 +#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921 #, c-format msgid "cannot read symbolic link %s" msgstr "kan symbolische koppeling %s niet lezen" -#: src/copy.c:2453 +#: src/copy.c:2463 #, c-format msgid "cannot create symbolic link %s" msgstr "kan symbolische koppeling %s niet aanmaken" -#: src/copy.c:2485 +#: src/copy.c:2495 #, c-format msgid "%s has unknown file type" msgstr "%s heeft onbekend bestandstype" -#: src/copy.c:2629 src/ln.c:358 +#: src/copy.c:2644 src/ln.c:358 #, c-format msgid "cannot un-backup %s" msgstr "kan %s niet uit reservekopie herstellen" -#: src/copy.c:2633 +#: src/copy.c:2648 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (uit reservekopie hersteld)\n" -#: src/cp.c:156 src/mv.c:284 +#: src/cp.c:156 src/mv.c:286 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -2142,27 +2141,10 @@ msgstr "" "\n" #: src/cp.c:162 -msgid "" -"Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" -"\n" -msgstr "" -"Een BRON naar een BESTEMMING kopiëren, of BRON(nen) naar een MAP.\n" -"\n" +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:166 src/csplit.c:1458 src/cut.c:197 src/df.c:852 src/du.c:268 -#: src/expand.c:112 src/fmt.c:275 src/fold.c:75 src/head.c:115 -#: src/install.c:612 src/kill.c:86 src/ln.c:392 src/ls.c:4726 src/mkdir.c:61 -#: src/mkfifo.c:56 src/mknod.c:58 src/mv.c:294 src/nl.c:191 src/paste.c:445 -#: src/pr.c:2777 src/ptx.c:1825 src/shred.c:153 src/shuf.c:58 src/sort.c:399 -#: src/split.c:211 src/stdbuf.c:95 src/tac.c:142 src/tail.c:268 -#: src/touch.c:226 src/truncate.c:107 src/unexpand.c:122 src/uniq.c:145 -msgid "" -"Mandatory arguments to long options are mandatory for short options too.\n" -msgstr "" -"(Een verplicht argument bij een lange optie geldt ook voor de korte vorm.)\n" -"\n" - -#: src/cp.c:169 +#: src/cp.c:168 msgid "" " -a, --archive same as -dR --preserve=all\n" " --attributes-only don't copy the file data, just the " @@ -2187,12 +2169,13 @@ msgstr "" " -d hetzelfde als '--no-dereference --" "preserve=links'\n" -#: src/cp.c:178 +#: src/cp.c:177 msgid "" " -f, --force if an existing destination file cannot be\n" -" opened, remove it and try again (redundant " -"if\n" -" the -n option is used)\n" +" opened, remove it and try again (this " +"option\n" +" is ignored when the -n option is also " +"used)\n" " -i, --interactive prompt before overwrite (overrides a previous " "-n\n" " option)\n" @@ -2202,12 +2185,13 @@ msgstr "" "kan\n" " worden, het verwijderen en het opnieuw " "proberen\n" -" (overbodig als optie '-n' wordt gebruikt)\n" +" (wordt genegeerd als ook optie '-n' gegeven " +"is)\n" " -i, --interactive voor overschrijven om toestemming vragen\n" " (gaat boven een eerdere optie '-n')\n" " -H gegeven symbolische koppelingen in BRON volgen\n" -#: src/cp.c:188 +#: src/cp.c:186 msgid "" " -l, --link hard link files instead of copying\n" " -L, --dereference always follow symbolic links in SOURCE\n" @@ -2215,7 +2199,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:192 +#: src/cp.c:190 msgid "" " -n, --no-clobber do not overwrite an existing file (overrides\n" " a previous -i option)\n" @@ -2225,7 +2209,7 @@ msgstr "" " (gaat boven een eerdere optie '-i')\n" " -P, --no-dereference geen symbolische koppelingen in BRON volgen\n" -#: src/cp.c:197 +#: src/cp.c:195 msgid "" " -p same as --preserve=mode,ownership,timestamps\n" " --preserve[=ATTR_LIST] preserve the specified attributes (default:\n" @@ -2244,7 +2228,7 @@ msgstr "" " mogelijkheden zijn: context, links, xattr, " "all)\n" -#: src/cp.c:205 +#: src/cp.c:203 msgid "" " --no-preserve=ATTR_LIST don't preserve the specified attributes\n" " --parents use full source file name under DIRECTORY\n" @@ -2253,7 +2237,7 @@ msgstr "" " --parents volledige naam gebruiken van bronbestand onder " "MAP\n" -#: src/cp.c:209 +#: src/cp.c:207 msgid "" " -R, -r, --recursive copy directories recursively\n" " --reflink[=WHEN] control clone/CoW copies. See below\n" @@ -2267,7 +2251,7 @@ msgstr "" " u deze probeert te openen (anders dan '--" "force')\n" -#: src/cp.c:215 +#: src/cp.c:213 msgid "" " --sparse=WHEN control creation of sparse files. See below\n" " --strip-trailing-slashes remove any trailing slashes from each " @@ -2279,7 +2263,7 @@ msgstr "" " --strip-trailing-slashes schuine strepen achter elk BRON-argument\n" " verwijderen\n" -#: src/cp.c:220 +#: src/cp.c:218 msgid "" " -s, --symbolic-link make symbolic links instead of copying\n" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -2294,7 +2278,7 @@ msgstr "" " -T, --no-target-directory BESTEMMING behandelen als een normaal " "bestand\n" -#: src/cp.c:226 +#: src/cp.c:224 msgid "" " -u, --update copy only when the SOURCE file is newer\n" " than the destination file or when the\n" @@ -2309,7 +2293,7 @@ msgstr "" " -x, --one-file-system binnen dit bestandssysteem blijven\n" "\n" -#: src/cp.c:235 +#: src/cp.c:233 msgid "" "\n" "By default, sparse SOURCE files are detected by a crude heuristic and the\n" @@ -2342,7 +2326,7 @@ msgstr "" "gespecificeerd, wordt\n" "teruggevallen op standaard kopiëren.\n" -#: src/cp.c:247 src/install.c:649 src/ln.c:421 src/mv.c:321 +#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322 msgid "" "\n" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -2360,7 +2344,7 @@ msgstr "" "dit zijn de mogelijke waarden (methodes):\n" "\n" -#: src/cp.c:254 src/install.c:656 src/mv.c:328 +#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329 msgid "" " none, off never make backups (even if --backup is given)\n" " numbered, t make numbered backups\n" @@ -2372,7 +2356,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:260 +#: src/cp.c:258 msgid "" "\n" "As a special case, cp makes a backup of SOURCE when the force and backup\n" @@ -2384,92 +2368,92 @@ msgstr "" "'--force' en '--backup' gegeven zijn én BRON en BESTEMMING dezelfde\n" "naam van een bestaand gewoon bestand zijn.\n" -#: src/cp.c:319 +#: src/cp.c:317 #, c-format msgid "failed to preserve times for %s" msgstr "behouden van de tijdsstempels van %s is mislukt" -#: src/cp.c:350 +#: src/cp.c:348 #, c-format msgid "failed to preserve permissions for %s" msgstr "behouden van de toegangsrechten van %s is mislukt" -#: src/cp.c:477 +#: src/cp.c:475 #, c-format msgid "cannot make directory %s" msgstr "kan map %s niet aanmaken" -#: src/cp.c:526 src/cp.c:545 +#: src/cp.c:524 src/cp.c:543 #, c-format msgid "%s exists but is not a directory" msgstr "%s bestaat maar is geen map" -#: src/cp.c:572 src/cp.c:1068 src/install.c:401 src/install.c:844 src/ln.c:123 -#: src/ln.c:181 src/ln.c:202 src/ln.c:516 src/mv.c:152 src/mv.c:399 +#: 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 #, c-format -msgid "accessing %s" -msgstr "zoeken van toegang tot %s" +msgid "failed to access %s" +msgstr "kan geen toegang krijgen tot %s" -#: src/cp.c:592 src/install.c:914 src/ln.c:546 src/mv.c:432 src/shred.c:1182 -#: src/touch.c:433 src/truncate.c:356 +#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181 +#: src/touch.c:429 src/truncate.c:354 #, c-format msgid "missing file operand" msgstr "geen bestand opgegeven" -#: src/cp.c:594 src/install.c:916 src/ln.c:560 src/mv.c:434 +#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436 #, c-format msgid "missing destination file operand after %s" msgstr "ontbrekende bestemming na %s" -#: src/cp.c:603 src/install.c:925 src/mv.c:443 +#: src/cp.c:601 src/install.c:926 src/mv.c:445 #, 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:619 src/cp.c:1070 src/install.c:403 src/install.c:846 -#: src/install.c:938 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:401 -#: src/mv.c:457 +#: 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 #, c-format msgid "target %s is not a directory" msgstr "doel %s is geen map" -#: src/cp.c:730 +#: src/cp.c:728 #, c-format msgid "with --parents, the destination must be a directory" msgstr "met '--parents' moet de bestemming een map zijn" -#: src/cp.c:1063 src/install.c:839 src/ln.c:511 src/mv.c:394 +#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395 #, c-format msgid "multiple target directories specified" msgstr "meer dan één bestemmingsmap opgegeven" -#: src/cp.c:1108 +#: src/cp.c:1110 #, c-format msgid "cannot make both hard and symbolic links" msgstr "kan niet zowel harde als symbolische koppelingen maken" -#: src/cp.c:1115 src/mv.c:464 +#: src/cp.c:1117 src/mv.c:466 #, c-format msgid "options --backup and --no-clobber are mutually exclusive" msgstr "de opties '--backup' en '--no-clobber' sluiten elkaar uit" -#: src/cp.c:1121 +#: src/cp.c:1123 #, c-format msgid "--reflink can be used only with --sparse=auto" msgstr "optie '--reflink' kan alleen worden gebruikt met '--sparse=auto'" -#: src/cp.c:1129 src/install.c:899 src/ln.c:582 src/mv.c:472 +#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474 msgid "backup type" msgstr "reservekopiemethode" -#: src/cp.c:1154 +#: src/cp.c:1156 #, 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:1160 +#: src/cp.c:1162 #, c-format msgid "cannot preserve extended attributes, cp is built without xattr support" msgstr "" @@ -2481,142 +2465,139 @@ msgstr "" msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:529 +#: src/csplit.c:531 #, c-format msgid "input disappeared" msgstr "invoer is verdwenen" -#: src/csplit.c:658 src/csplit.c:669 +#: src/csplit.c:660 src/csplit.c:671 #, c-format msgid "%s: line number out of range" msgstr "%s: regelnummer valt buiten bereik" -#: src/csplit.c:698 +#: src/csplit.c:700 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: regelnummer valt buiten bereik" -#: src/csplit.c:701 src/csplit.c:750 +#: src/csplit.c:703 src/csplit.c:752 #, c-format msgid " on repetition %s\n" msgstr " tijdens herhaling %s\n" -#: src/csplit.c:744 +#: src/csplit.c:746 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: geen overeenkomst gevonden" -#: src/csplit.c:808 src/csplit.c:848 src/nl.c:359 src/tac.c:274 +#: src/csplit.c:810 src/csplit.c:850 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:981 +#: src/csplit.c:983 #, c-format msgid "write error for %s" msgstr "fout bij schrijven naar %s" -#: src/csplit.c:1057 +#: src/csplit.c:1059 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: geheel getal verwacht na scheidingsteken" -#: src/csplit.c:1073 +#: src/csplit.c:1075 #, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: '}' is vereist bij een herhalingsaantal" -#: src/csplit.c:1083 +#: src/csplit.c:1085 #, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: geheel getal is vereist tussen '{' en '}'" -#: src/csplit.c:1110 +#: src/csplit.c:1112 #, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: afsluitend scheidingsteken '%c' ontbreekt" -#: src/csplit.c:1127 +#: src/csplit.c:1129 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: ongeldige reguliere expressie: %s" -#: src/csplit.c:1160 +#: src/csplit.c:1162 #, c-format msgid "%s: invalid pattern" msgstr "%s: ongeldig patroon" -#: src/csplit.c:1163 +#: src/csplit.c:1165 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: regelnummer moet groter zijn dan nul" -#: src/csplit.c:1169 +#: src/csplit.c:1171 #, 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:1175 +#: src/csplit.c:1177 #, 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:1253 +#: src/csplit.c:1255 #, c-format msgid "missing conversion specifier in suffix" msgstr "specificatie voor conversie ontbreekt in achtervoegsel" -#: src/csplit.c:1259 +#: src/csplit.c:1261 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "ongeldige conversiespecificatie in achtervoegsel: %c" -#: src/csplit.c:1262 +#: src/csplit.c:1264 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "ongeldige conversiespecificatie in achtervoegsel: \\%.3o" -#: src/csplit.c:1267 +#: src/csplit.c:1269 #, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "ongeldige vlaggen in conversiespecificatie: %%%c%c" -#: src/csplit.c:1284 +#: src/csplit.c:1286 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "te veel specificaties voor %%-conversie in achtervoegsel" -#: src/csplit.c:1298 +#: src/csplit.c:1300 #, c-format msgid "missing %% conversion specification in suffix" msgstr "ontbrekende specificatie voor %%-conversie in achtervoegsel" -#: src/csplit.c:1345 +#: src/csplit.c:1347 #, c-format msgid "%s: invalid number" msgstr "%s: ongeldig getal" -#: src/csplit.c:1449 +#: src/csplit.c:1451 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "" "Gebruik: %s [OPTIE...] BESTAND PATROON...\n" "\n" -#: src/csplit.c:1453 +#: src/csplit.c:1455 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" -"\n" msgstr "" -"Het gegeven BESTAND opdelen aan de hand van het gegeven PATROON of de " +"Deelt het gegeven BESTAND op aan de hand van het gegeven PATROON of de " "gegeven\n" -"patronen, de delen naar de bestanden 'xx00', 'xx01', 'xx02', enz. " -"schrijven,\n" -"en het aantal bytes van elk deel op standaarduitvoer tonen.\n" -"\n" +"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:1461 +#: src/csplit.c:1462 #, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2628,7 +2609,7 @@ msgstr "" " -f, --prefix=VOORVOEGSEL te gebruiken voorvoegsel in plaats van 'xx'\n" " -k, --keep-files uitvoerbestanden niet verwijderen bij fouten\n" -#: src/csplit.c:1466 +#: src/csplit.c:1467 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" @@ -2639,7 +2620,7 @@ msgstr "" " -z, --elide-empty-files lege uitvoerbestanden verwijderen\n" "\n" -#: src/csplit.c:1473 +#: src/csplit.c:1474 msgid "" "\n" "Read standard input if FILE is -. Each PATTERN may be:\n" @@ -2649,7 +2630,7 @@ msgstr "" "\n" "Elk PATROON mag zijn:\n" -#: src/csplit.c:1477 +#: src/csplit.c:1478 msgid "" "\n" " INTEGER copy up to but not including specified line number\n" @@ -2675,7 +2656,7 @@ msgstr "" msgid "David M. Ihnat" msgstr "David M. Ihnat" -#: src/cut.c:64 +#: src/cut.c:64 src/cut.c:372 msgid "fields and positions are numbered from 1" msgstr "velden en posities worden genummerd vanaf 1" @@ -2687,15 +2668,12 @@ msgstr "" "\n" #: src/cut.c:193 -msgid "" -"Print selected parts of lines from each FILE to standard output.\n" -"\n" +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" -"\n" -#: src/cut.c:200 +#: src/cut.c:199 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2706,7 +2684,7 @@ msgstr "" " -d, --delimiter=TEKEN dit veldscheidingsteken gebruiken in plaats van " "TAB\n" -#: src/cut.c:205 +#: src/cut.c:204 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2719,7 +2697,7 @@ msgstr "" "gegeven\n" " -n (genegeerde optie)\n" -#: src/cut.c:211 +#: src/cut.c:210 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" @@ -2727,7 +2705,7 @@ msgstr "" " --complement het complement maken van de set van geselecteerde\n" " bytes, tekens of velden\n" -#: src/cut.c:215 +#: src/cut.c:214 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2738,7 +2716,7 @@ msgstr "" " standaard het invoerscheidingsteken\n" "\n" -#: src/cut.c:222 +#: src/cut.c:221 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2752,7 +2730,7 @@ msgstr "" "in dezelfde volgorde als ze gelezen werd en slechts precies één keer.\n" "\n" -#: src/cut.c:228 +#: src/cut.c:227 msgid "" "Each range is one of:\n" "\n" @@ -2772,46 +2750,47 @@ msgstr "" "\n" "Zonder BESTAND, of wanneer BESTAND - is, wordt standaardinvoer gelezen.\n" -#: src/cut.c:368 src/cut.c:489 -msgid "invalid byte or field list" +#: src/cut.c:367 src/cut.c:493 +msgid "invalid byte, character or field list" msgstr "ongeldige lijst van bytes of velden" -#: src/cut.c:385 +#: src/cut.c:387 msgid "invalid range with no endpoint: -" msgstr "ongeldig bereik zonder eindpunt: -" -#: src/cut.c:399 +#: src/cut.c:403 msgid "invalid decreasing range" msgstr "ongeldig aflopend bereik" -#: src/cut.c:478 +#: src/cut.c:482 #, c-format msgid "byte offset %s is too large" msgstr "byte-positie %s is te groot" -#: src/cut.c:481 +#: src/cut.c:485 #, c-format msgid "field number %s is too large" msgstr "veldnummer %s is te groot" -#: src/cut.c:789 src/cut.c:797 +#: src/cut.c:795 src/cut.c:803 msgid "only one type of list may be specified" msgstr "er mag slechts één soort lijst worden opgegeven" -#: src/cut.c:806 +#: src/cut.c:812 src/numfmt.c:1408 +#, c-format msgid "the delimiter must be a single character" msgstr "het scheidingsteken moet een enkel teken zijn" -#: src/cut.c:841 +#: src/cut.c:847 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:844 +#: src/cut.c:850 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:848 +#: src/cut.c:854 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2819,11 +2798,11 @@ msgstr "" "het onderdrukken van onbegrensde regels heeft\n" " alleen zin als met velden gewerkt wordt" -#: src/cut.c:864 +#: src/cut.c:870 msgid "missing list of fields" msgstr "ontbrekende lijst van velden" -#: src/cut.c:866 +#: src/cut.c:872 msgid "missing list of positions" msgstr "ontbrekende lijst van posities" @@ -2838,9 +2817,13 @@ msgstr "" "\n" #: src/date.c:128 +msgid "Display the current time in the given FORMAT, or set the system date.\n" +msgstr "" +"Toont de huidige datum en/of tijd (in de gegeven OPMAAK),\n" +"of stelt de systeemdatum en/of -tijd in (Maand, Dag, uren, minuten).\n" + +#: src/date.c:134 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" " -I[TIMESPEC], --iso-8601[=TIMESPEC] output date/time in ISO 8601 format.\n" @@ -2848,9 +2831,6 @@ msgid "" " 'hours', 'minutes', 'seconds', or 'ns' for date\n" " and time to the indicated precision.\n" msgstr "" -"De huidige datum en/of tijd tonen (in de gegeven OPMAAK),\n" -"of de systeemdatum en/of -tijd instellen (Maand, Dag, uren, minuten).\n" -"\n" " -d, --date=DATUMTIJD deze DATUMTIJD tonen i.p.v. de huidige tijd\n" " -f, --file=DATUMTIJDBESTAND als '--date' voor elke regel in " "DATUMTIJDBESTAND\n" @@ -2863,7 +2843,7 @@ msgstr "" " 'ns' voor datum+tijd in de aangegeven " "precisie\n" -#: src/date.c:138 +#: src/date.c:142 msgid "" " -r, --reference=FILE display the last modification time of FILE\n" " -R, --rfc-2822 output date and time in RFC 2822 format.\n" @@ -2875,7 +2855,7 @@ msgstr "" " bijvoorbeeld: Mon, 07 Aug 2006 12:34:56 " "-0600\n" -#: src/date.c:143 +#: src/date.c:147 msgid "" " --rfc-3339=TIMESPEC output date and time in RFC 3339 format.\n" " TIMESPEC='date', 'seconds', or 'ns' for\n" @@ -2896,7 +2876,7 @@ msgstr "" " -u, --utc, --universal de standaard wereldtijd gebruiken\n" "\n" -#: src/date.c:154 +#: src/date.c:158 msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" @@ -2910,7 +2890,7 @@ msgstr "" " %% het procentteken\n" " %a de afkorting van de dag volgens de taalregio (bijv. zo)\n" -#: src/date.c:161 +#: src/date.c:165 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2923,7 +2903,7 @@ msgstr "" " %c de datum/tijd volgens de taalregio (bijv. za 01 okt 2005 16:57:09 " "CEST)\n" -#: src/date.c:167 +#: src/date.c:171 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2935,7 +2915,7 @@ msgstr "" " %D de datum op Amerikaanse manier; hetzelfde als %m/%d/%y\n" " %e de dag in de maand, met voorloopspatie; hetzelfde als %_d\n" -#: src/date.c:173 +#: src/date.c:177 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -2946,7 +2926,7 @@ msgstr "" " %G het jaar van het ISO-weeknummer (zie %V); normaal alleen nuttig met " "%V\n" -#: src/date.c:178 +#: src/date.c:182 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2958,7 +2938,7 @@ msgstr "" " %I het uur (01...12)\n" " %j de dag in het jaar (001...366)\n" -#: src/date.c:184 +#: src/date.c:188 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -2970,7 +2950,7 @@ msgstr "" " %m de maand (01...12)\n" " %M de minuut (00...59)\n" -#: src/date.c:190 +#: src/date.c:194 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2989,7 +2969,7 @@ msgstr "" " %R de tijd in 24-uursaanduiding; hetzelfde als %H:%M\n" " %s de seconden sinds 1970-01-01 00:00:00 UTC\n" -#: src/date.c:199 +#: src/date.c:203 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -3001,7 +2981,7 @@ msgstr "" " %T de tijd; hetzelfde als %H:%M:%S\n" " %u de dag van de week (1...7); 1 is maandag\n" -#: src/date.c:205 +#: src/date.c:209 msgid "" " %U week number of year, with Sunday as first day of week (00..53)\n" " %V ISO week number, with Monday as first day of week (01..53)\n" @@ -3015,7 +2995,7 @@ msgstr "" " %W weeknummer in het jaar, met maandag als eerste dag van de week " "(00...53)\n" -#: src/date.c:211 +#: src/date.c:215 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -3027,7 +3007,7 @@ msgstr "" " %y de laatste twee cijfers van het jaar (00...99)\n" " %Y het jaar\n" -#: src/date.c:217 +#: src/date.c:221 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -3046,7 +3026,7 @@ msgstr "" "\n" "Standaard gebruikt 'date' voorloopnullen bij numerieke velden.\n" -#: src/date.c:226 +#: src/date.c:230 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -3064,7 +3044,7 @@ msgstr "" " ^ hoofdletters gebruiken, indien mogelijk\n" " # hoofd- in kleine letters wijzigen en omgekeerd, indien mogelijk\n" -#: src/date.c:235 +#: src/date.c:239 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -3079,7 +3059,7 @@ msgstr "" "en een O betekent alternatieve cijfers uit de taalregio te gebruiken,\n" "waarbij voor beide geldt: indien beschikbaar.\n" -#: src/date.c:242 +#: src/date.c:246 msgid "" "\n" "Examples:\n" @@ -3105,36 +3085,36 @@ msgstr "" "aan de westkust van de Verenigde Staten:\n" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" -#: src/date.c:275 src/dd.c:2193 src/head.c:838 src/md5sum.c:477 -#: src/md5sum.c:798 src/od.c:863 src/od.c:1914 src/pr.c:1176 src/pr.c:1372 -#: src/pr.c:1494 src/stty.c:842 src/tac.c:563 src/tail.c:343 src/tee.c:126 +#: 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 #, c-format msgid "standard input" msgstr "standaardinvoer" -#: src/date.c:303 src/date.c:523 +#: src/date.c:307 src/date.c:527 #, c-format msgid "invalid date %s" msgstr "ongeldige datum: %s" -#: src/date.c:414 src/date.c:448 +#: src/date.c:418 src/date.c:452 #, c-format msgid "multiple output formats specified" msgstr "meer dan één uitvoeropmaak opgegeven" -#: src/date.c:426 +#: src/date.c:430 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "de gegeven opties om datums te tonen gaan niet samen" -#: src/date.c:433 +#: src/date.c:437 #, c-format msgid "the options to print and set the time may not be used together" msgstr "de opties om de tijd te tonen of in te stellen gaan niet samen" # Een zin toevoegd om de meest voorkomende oorzaak van deze melding op te vangen. -#: src/date.c:454 +#: src/date.c:458 #, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -3145,23 +3125,23 @@ msgstr "" "als een optie gebruikt wordt om een datum op te geven,\n" "moet een gewoon argument een opmaaktekenreeks zijn die begint met '+'" -#: src/date.c:531 +#: src/date.c:535 #, c-format msgid "cannot set date" msgstr "kan datum niet instellen" -#: src/date.c:554 src/du.c:360 +#: src/date.c:558 src/du.c:371 #, c-format msgid "time %s is out of range" msgstr "tijd %s valt buiten bereik" #. This is a proper name. See the gettext manual, section Names. -#: src/dd.c:44 src/factor.c:43 src/rm.c:41 src/tail.c:69 src/touch.c:41 +#: 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 "Paul Rubin" -#: src/dd.c:517 +#: src/dd.c:521 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3171,7 +3151,7 @@ msgstr "" " of: %s OPTIE\n" "\n" -#: src/dd.c:522 +#: src/dd.c:526 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -3190,7 +3170,7 @@ msgstr "" " count=BLOKKEN slechts dit aantal invoerblokken kopiëren\n" " ibs=BYTES aantal tegelijk te lezen bytes (standaard: 512)\n" -#: src/dd.c:531 +#: src/dd.c:535 msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -3199,7 +3179,8 @@ msgid "" " oflag=FLAGS write as per the comma separated symbol list\n" " seek=N skip N obs-sized blocks at start of output\n" " skip=N skip N ibs-sized blocks at start of input\n" -" status=noxfer suppress transfer statistics\n" +" status=WHICH WHICH info to suppress outputting to stderr;\n" +" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" msgstr "" " if=BESTAND uit dit bestand lezen i.p.v. van standaardinvoer\n" " iflag=VLAGGEN lezen met deze kommagescheiden eigenschappen\n" @@ -3208,12 +3189,17 @@ msgstr "" " oflag=VLAGGEN schrijven met deze kommagescheiden eigenschappen\n" " seek=BLOKKEN dit aantal 'obs'-blokken aan begin van uitvoer overslaan\n" " skip=BLOKKEN dit aantal 'ibs'-blokken aan begin van invoer overslaan\n" -" status=noxfer statistieken van de verplaatsing onderdrukken\n" +" status=WATWEG bepaalde informatie naar standaardfoutuitvoer " +"onderdrukken;\n" +" 'noxfer' onderdrukt verplaatsingsstatistieken; 'none' " +"alles\n" -#: src/dd.c:541 +# Het getal N komt niet voor in mijn vertaling +# (en BLOCKS niet meer in het origineel). +#: src/dd.c:546 msgid "" "\n" -"BLOCKS and BYTES may be followed by the following multiplicative suffixes:\n" +"N and BYTES may be followed by the following multiplicative suffixes:\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, and so on for T, P, E, Z, Y.\n" "\n" @@ -3228,7 +3214,7 @@ msgstr "" "\n" "Mogelijke CONVERSIES zijn:\n" -#: src/dd.c:550 +#: src/dd.c:555 msgid "" " ascii from EBCDIC to ASCII\n" " ebcdic from ASCII to EBCDIC\n" @@ -3258,7 +3244,7 @@ msgstr "" "wanneer\n" " samen met 'block' of 'unblock', dan uitvullen met spaties\n" -#: src/dd.c:563 +#: src/dd.c:568 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3274,7 +3260,7 @@ msgstr "" " fdatasync het uitvoerbestand fysiek naar schijf schrijven vóór afsluiten\n" " fsync idem, maar ook de metagegevens schrijven\n" -#: src/dd.c:571 +#: src/dd.c:576 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3288,79 +3274,79 @@ msgstr "" " append achtervoegen (alleen zinvol bij uitvoer; suggestie: " "conv=notrunc)\n" -#: src/dd.c:578 +#: src/dd.c:583 msgid " cio use concurrent I/O for data\n" msgstr " cio gelijktijdige I/O gebruiken voor de gegevens\n" -#: src/dd.c:580 +#: src/dd.c:585 msgid " direct use direct I/O for data\n" msgstr " direct directe I/O gebruiken voor de gegevens\n" -#: src/dd.c:582 +#: src/dd.c:587 msgid " directory fail unless a directory\n" msgstr " directory weigeren als het geen map is\n" -#: src/dd.c:584 +#: src/dd.c:589 msgid " dsync use synchronized I/O for data\n" msgstr " dsync gesynchroniseerde I/O gebruiken voor de gegevens\n" -#: src/dd.c:586 +#: src/dd.c:591 msgid " sync likewise, but also for metadata\n" msgstr " sync idem, maar ook voor de metagegevens\n" -#: src/dd.c:587 +#: src/dd.c:592 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr "" " fullblock volledige blokken invoer verzamelen (alleen bij 'iflag')\n" -#: src/dd.c:590 +#: src/dd.c:595 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock niet-blokkerende I/O gebruiken\n" -#: src/dd.c:592 +#: src/dd.c:597 msgid " noatime do not update access time\n" msgstr " noatime toegangstijdsstempels niet wijzigen\n" -#: src/dd.c:595 +#: src/dd.c:600 msgid " nocache discard cached data\n" msgstr " nocache gecachte gegevens verwerpen\n" -#: src/dd.c:598 +#: src/dd.c:603 msgid " noctty do not assign controlling terminal from file\n" msgstr " noctty bestand is geen besturende terminal\n" -#: src/dd.c:601 +#: src/dd.c:606 msgid " nofollow do not follow symlinks\n" msgstr " nofollow symbolische koppelingen niet volgen\n" -#: src/dd.c:603 +#: src/dd.c:608 msgid " nolinks fail if multiply-linked\n" msgstr " nolinks weigeren als bestand meer dan één harde koppeling heeft\n" -#: src/dd.c:605 +#: src/dd.c:610 msgid " binary use binary I/O for data\n" msgstr " binary binaire I/O gebruiken voor de gegevens\n" -#: src/dd.c:607 +#: src/dd.c:612 msgid " text use text I/O for data\n" msgstr " text tekst-I/O gebruiken voor de gegevens\n" -#: src/dd.c:609 +#: src/dd.c:614 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:612 +#: src/dd.c:617 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:615 +#: src/dd.c:620 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:620 +#: src/dd.c:625 #, c-format msgid "" "\n" @@ -3390,7 +3376,7 @@ msgstr "" "Opties zijn:\n" "\n" -#: src/dd.c:676 +#: src/dd.c:683 #, c-format msgid "" "%<PRIuMAX>+%<PRIuMAX> records in\n" @@ -3399,21 +3385,21 @@ msgstr "" "%<PRIuMAX>+%<PRIuMAX> records gelezen\n" "%<PRIuMAX>+%<PRIuMAX> records geschreven\n" -#: src/dd.c:682 +#: src/dd.c:689 #, 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:694 +#: src/dd.c:701 #, 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:712 +#: src/dd.c:720 msgid "Infinity B" msgstr "oneindig" @@ -3427,83 +3413,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:725 +#: src/dd.c:733 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g s, %s/s\n" -#: src/dd.c:804 +#: src/dd.c:812 #, c-format msgid "closing input file %s" msgstr "sluiten van invoerbestand %s" -#: src/dd.c:811 +#: src/dd.c:819 #, c-format msgid "closing output file %s" msgstr "sluiten van uitvoerbestand %s" -#: src/dd.c:1014 +#: src/dd.c:1022 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "uitschakelen van O_DIRECT is mislukt: %s" -#: src/dd.c:1085 src/dd.c:1934 +#: src/dd.c:1093 src/dd.c:1942 #, c-format msgid "writing to %s" msgstr "schrijven naar %s" -#: src/dd.c:1199 src/dd.c:1253 +#: src/dd.c:1207 src/dd.c:1261 #, c-format msgid "unrecognized operand %s" msgstr "niet-herkend argument: %s" -#: src/dd.c:1210 +#: src/dd.c:1218 msgid "invalid conversion" msgstr "ongeldige conversie" -#: src/dd.c:1213 src/dd.c:1289 +#: src/dd.c:1221 src/dd.c:1297 msgid "invalid input flag" msgstr "ongeldige invoervlag" -#: src/dd.c:1216 src/dd.c:1283 src/dd.c:1295 +#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303 msgid "invalid output flag" msgstr "ongeldige uitvoervlag" -#: src/dd.c:1219 +#: src/dd.c:1227 msgid "invalid status flag" msgstr "ongeldige statusvlag" -#: src/dd.c:1258 src/truncate.c:312 +#: src/dd.c:1266 src/truncate.c:310 #, c-format msgid "invalid number %s" msgstr "ongeldig getal: %s" -#: src/dd.c:1340 +#: src/dd.c:1348 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "slechts één van {ascii,ebcdic,ibm} is mogelijk" -#: src/dd.c:1342 +#: src/dd.c:1350 #, c-format msgid "cannot combine block and unblock" msgstr "'block' en 'unblock' gaan niet samen" -#: src/dd.c:1344 +#: src/dd.c:1352 #, c-format msgid "cannot combine lcase and ucase" msgstr "'lcase' en 'ucase' gaan niet samen" -#: src/dd.c:1346 +#: src/dd.c:1354 #, c-format msgid "cannot combine excl and nocreat" msgstr "'excl' en 'nocreat' gaan niet samen" -#: src/dd.c:1349 +#: src/dd.c:1357 #, c-format msgid "cannot combine direct and nocache" msgstr "'direct' en 'nocache' gaan niet samen" -#: src/dd.c:1506 +#: src/dd.c:1514 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3512,73 +3498,73 @@ 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:1593 +#: src/dd.c:1601 #, c-format msgid "%s: cannot skip" msgstr "%s: kan niet overslaan" -#: src/dd.c:1595 src/dd.c:1614 src/dd.c:1675 +#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683 #, c-format msgid "%s: cannot seek" msgstr "%s: kan geen 'seek' doen" -#: src/dd.c:1655 +#: src/dd.c:1663 #, c-format msgid "offset overflow while reading file %s" msgstr "positie werd te groot tijdens lezen van bestand %s" -#: src/dd.c:1667 +#: src/dd.c:1675 #, c-format msgid "warning: invalid file offset after failed read" msgstr "" "waarschuwing: positie in bestand klopt niet meer na mislukte leesopdracht" -#: src/dd.c:1671 +#: src/dd.c:1679 #, c-format msgid "cannot work around kernel bug after all" msgstr "kan toch niet om de kernelfout heen werken" -#: src/dd.c:1814 +#: src/dd.c:1822 #, c-format msgid "setting flags for %s" msgstr "instellen van vlaggen voor %s" -#: src/dd.c:1867 +#: 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:1881 +#: 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:1914 +#: src/dd.c:1922 #, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: kan niet naar de gegeven positie springen" -#: src/dd.c:2125 src/dd.c:2258 +#: src/dd.c:2133 #, c-format -msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" -msgstr "afkorten op %<PRIuMAX> bytes van uitvoerbestand %s is mislukt" +msgid "failed to truncate to %<PRIdMAX> bytes in output file %s" +msgstr "afkorten op %<PRIdMAX> bytes van uitvoerbestand %s is mislukt" -#: src/dd.c:2138 +#: src/dd.c:2146 #, c-format msgid "fdatasync failed for %s" msgstr "'fdatasync' is mislukt voor %s" -#: src/dd.c:2148 +#: src/dd.c:2156 #, c-format msgid "fsync failed for %s" msgstr "'fsync' is mislukt voor %s" -#: src/dd.c:2199 src/dd.c:2228 +#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165 #, c-format -msgid "opening %s" -msgstr "openen van %s" +msgid "failed to open %s" +msgstr "openen van %s is mislukt" -#: src/dd.c:2237 +#: src/dd.c:2246 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) " @@ -3587,86 +3573,106 @@ msgstr "" "positie is te groot: kan niet afkorten tot een lengte van seek=%<PRIuMAX> " "(%lu-byte) blokken" -#: src/dd.c:2274 src/dd.c:2280 +#: src/dd.c:2267 +#, 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 #, 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:54 src/expr.c:153 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:39 src/sleep.c:35 src/sort.c:66 +#: 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 msgid "Paul Eggert" msgstr "Paul Eggert" -#: src/df.c:140 +#: src/df.c:172 msgid "Filesystem" msgstr "Bestandssysteem" -#: src/df.c:141 +#: src/df.c:175 msgid "Type" msgstr "Type" -#: src/df.c:142 +#: src/df.c:178 src/df.c:542 msgid "blocks" msgstr "blokken" +#: src/df.c:181 +msgid "Used" +msgstr "Gebruikt" + +#: src/df.c:184 +msgid "Available" +msgstr "Beschikbaar" + +#: src/df.c:187 +msgid "Use%" +msgstr "Geb%" + # Het aantal minuten inactiviteit; maximaal 6 tekens. -#: src/df.c:142 +#: src/df.c:190 msgid "Inodes" msgstr "I-nodes" -#: src/df.c:142 -msgid "Size" -msgstr "Grootte" - -#: src/df.c:143 -msgid "Used" -msgstr "Gebruikt" - -#: src/df.c:143 +#: src/df.c:193 msgid "IUsed" msgstr "IGebr" -#: src/df.c:144 -msgid "Available" -msgstr "Beschikbaar" - -#: src/df.c:144 +#: src/df.c:196 msgid "IFree" msgstr "IVrij" -#: src/df.c:144 -msgid "Avail" -msgstr "Besch" - -#: src/df.c:145 -msgid "Use%" -msgstr "Geb%" - -#: src/df.c:145 +#: src/df.c:199 msgid "IUse%" msgstr "IGeb%" -#: src/df.c:145 +#: src/df.c:202 +msgid "Mounted on" +msgstr "Aangekoppeld op" + +#: src/df.c:383 +#, c-format +msgid "option --output: field '%s' unknown" +msgstr "optie '--output': veld '%s' is onbekend" + +#: src/df.c:390 +#, c-format +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 +msgid "Size" +msgstr "Grootte" + +#: src/df.c:414 src/df.c:451 +msgid "Avail" +msgstr "Besch" + +#: src/df.c:474 msgid "Capacity" msgstr "Vulgraad" -#: src/df.c:146 -msgid "Mounted on" -msgstr "Aangekoppeld op" +#. 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 +#, c-format +msgid "%s-%s" +msgstr "%s-%s" -#: src/df.c:847 +#: src/df.c:1210 msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" -"\n" msgstr "" -"Gebruikte en beschikbare ruimte tonen van alle aangekoppelde " +"Toont gebruikte en beschikbare ruimte van alle aangekoppelde " "bestandssystemen,\n" "of van de bestandssystemen waarop de gegeven BESTANDen zich bevinden.\n" -"\n" -#: src/df.c:855 +#: src/df.c:1217 msgid "" " -a, --all include dummy file systems\n" " -B, --block-size=SIZE scale sizes by SIZE before printing them. E.g.,\n" @@ -3689,7 +3695,7 @@ msgstr "" " -H, --si idem, maar machten van 1000 i.p.v. 1024 " "gebruiken\n" -#: src/df.c:865 +#: src/df.c:1227 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3705,8 +3711,12 @@ msgstr "" " --no-sync geen 'sync' doen vóór ophalen van info " "(standaard)\n" -#: src/df.c:872 +#: src/df.c:1234 +#, fuzzy msgid "" +" --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" +" or print all fields if FIELD_LIST is " +"omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" " -t, --type=TYPE limit listing to file systems of type TYPE\n" @@ -3723,20 +3733,41 @@ msgstr "" " -v (genegeerde optie)\n" "\n" -#: src/df.c:1027 +#: src/df.c:1248 +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" +msgstr "" + +#: src/df.c:1285 +#, 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 #, c-format msgid "file system type %s both selected and excluded" msgstr "bestandssysteemtype %s is zowel gekozen als uitgesloten" -#: src/df.c:1075 +#: src/df.c:1500 msgid "Warning: " msgstr "Waarschuwing: " -#: src/df.c:1077 src/stat.c:795 +#: src/df.c:1502 src/stat.c:814 msgid "cannot read table of mounted file systems" msgstr "kan tabel van aangekoppelde bestandssystemen niet lezen" -#: src/df.c:1107 +#: src/df.c:1539 #, c-format msgid "no file systems processed" msgstr "geen bestandssystemen verwerkt" @@ -3851,7 +3882,7 @@ msgstr "" " %s map1/rks map2/rks -> \"map1\" gevolgd door \"map2\"\n" " %s stdio.h -> \".\"\n" -#: src/du.c:260 src/sort.c:390 src/wc.c:112 +#: src/du.c:270 src/sort.c:394 src/wc.c:112 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3861,17 +3892,15 @@ msgstr "" " of: %s [OPTIE...] --files0-from=LIJSTBESTAND\n" "\n" -#: src/du.c:264 -msgid "" -"Summarize disk usage of each FILE, recursively for directories.\n" -"\n" +#: src/du.c:274 +msgid "Summarize disk usage of each FILE, recursively for directories.\n" msgstr "" -"Het schijfgebruik samenvatten van elk gegeven BESTAND, recursief voor " -"mappen.\n" -"\n" +"Vat het schijfgebruik samen van elk gegeven BESTAND, recursief voor mappen.\n" -#: src/du.c:271 +#: src/du.c:280 msgid "" +" -0, --null end each output line with 0 byte rather than " +"newline\n" " -a, --all write counts for all files, not just directories\n" " --apparent-size print apparent sizes, rather than disk usage; " "although\n" @@ -3879,6 +3908,7 @@ 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" " -a, --all waardes tonen voor alle bestanden, niet alleen " "mappen\n" " --apparent-size werkelijke groottes tonen in plaats van " @@ -3891,7 +3921,8 @@ msgstr "" "interne\n" " fragmentatie, indirecte blokken en dergelijke\n" -#: src/du.c:279 +#: src/du.c:289 +#, 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" @@ -3900,6 +3931,11 @@ msgid "" " -c, --total produce a grand total\n" " -D, --dereference-args dereference only symlinks that are listed on the\n" " command line\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 "" " -B, --block-size=GROOTTE de te tonen groottes schalen naar deze waarde;\n" " '-BM' bijvoorbeeld toont de groottes in " @@ -3911,7 +3947,7 @@ msgstr "" " -D, --dereference-args alleen direct gegeven symbolische koppelingen " "volgen\n" -#: src/du.c:288 +#: src/du.c:302 msgid "" " --files0-from=F summarize disk usage of the NUL-terminated file\n" " names specified in file F;\n" @@ -3919,7 +3955,6 @@ msgid "" " -H equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" --si like -h, but use powers of 1000 not 1024\n" msgstr "" " --files0-from=LST het schijfgebruik tonen van de bestanden die " "opgesomd\n" @@ -3930,57 +3965,38 @@ msgstr "" " -H hetzelfde als '--dereference-args' (-D)\n" " -h, --human-readable groottes in leesbare vorm tonen (bijv. 15K, 234M, " "2G)\n" -" --si idem, maar machten van 1000 i.p.v. 1024 gebruiken\n" -#: src/du.c:297 +#: src/du.c:310 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 hetzelfde als '--block-size=1K'\n" +" -L, --dereference alle symbolische koppelingen volgen\n" " -l, --count-links de grootte tellen voor elke harde koppeling\n" " -m hetzelfde als '--block-size=1M'\n" -#: src/du.c:302 +#: src/du.c:316 msgid "" -" -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " "default)\n" -" -0, --null end each output line with 0 byte rather than " -"newline\n" " -S, --separate-dirs 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 alle symbolische koppelingen volgen\n" " -P, --no-dereference symbolische koppelingen niet volgen (standaard)\n" -" -0, --null regels afsluiten met 0-byte, niet met nieuweregel\n" " -S, --separate-dirs 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:309 -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 mappen op andere bestandssystemen overslaan\n" -" -X, --exclude-from=LST bestanden uitsluiten die overeenkomen met een\n" -" patroon uit het bestand LST\n" -" --exclude=PATROON bestanden uitluiten die overeenkomen met PATROON\n" -" -d, --max-depth=GETAL het totaal voor een map of bestand alleen tonen " -"als\n" -" deze GETAL of minder niveaus onder het begin " -"ligt;\n" -" '--max-depth=0' is hetzelfde als '--summarize'\n" - -#: src/du.c:318 +#: src/du.c:322 +#, fuzzy msgid "" +" -t, --threshold=SIZE exclude entries smaller than SIZE if positive,\n" +" or entries greater than SIZE if negative\n" " --time show time of the last modification of any file in " "the\n" " directory, or any of its subdirectories\n" @@ -3998,66 +4014,74 @@ msgstr "" " waarden zijn 'iso', 'long-iso', 'full-iso', of\n" " '+OPMAAK' (zie bij 'date' voor de mogelijkheden)\n" -#: src/du.c:375 -#, fuzzy +#: src/du.c:333 +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 msgid "Infinity" msgstr "oneindig" -#: src/du.c:600 +#: src/du.c:507 +#, c-format +msgid "mount point %s already traversed" +msgstr "aankoppelingspunt %s is al doorlopen" + +#: src/du.c:624 #, c-format msgid "fts_read failed: %s" msgstr "fts_read() is mislukt: %s" -#: src/du.c:724 +#: src/du.c:780 #, c-format msgid "invalid maximum depth %s" msgstr "ongeldige maximum diepte %s" -#: src/du.c:817 +#: src/du.c:809 +#, c-format +msgid "invalid --threshold argument '-0'" +msgstr "ongeldig argument van '--threshold': '-0'" + +#: src/du.c:887 #, c-format msgid "cannot both summarize and show all entries" msgstr "kan niet zowel alleen totalen tonen als alle items tonen" -#: src/du.c:824 +#: src/du.c:894 #, 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:830 +#: src/du.c:900 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "fout: totalen tonen gaat niet samen met '--max-depth=%lu'" -#: src/du.c:896 src/sort.c:4479 src/wc.c:668 +#: src/du.c:966 src/sort.c:4533 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:949 src/md5sum.c:587 src/od.c:903 src/tac.c:239 src/tac.c:350 -#: src/tac.c:506 src/tac.c:586 src/wc.c:733 +#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 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:963 src/sort.c:4508 src/wc.c:747 +#: src/du.c:1040 src/sort.c:4562 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:980 src/du.c:988 src/wc.c:760 src/wc.c:768 +#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768 msgid "invalid zero-length file name" msgstr "ongeldige bestandsnaam (lengte nul)" -#: src/du.c:1007 src/head.c:149 src/head.c:262 src/head.c:334 src/head.c:538 -#: src/head.c:620 src/head.c:692 src/head.c:750 src/head.c:774 src/tail.c:412 -#: src/tail.c:500 src/tail.c:549 src/tail.c:642 src/tail.c:770 src/tail.c:818 -#: src/tail.c:855 src/tail.c:1782 src/tail.c:1812 src/uniq.c:395 -#, c-format -msgid "error reading %s" -msgstr "fout bij lezen van %s" - -#: src/du.c:1010 src/ls.c:2649 src/wc.c:791 +#: src/du.c:1088 src/ls.c:2649 src/wc.c:791 msgid "total" msgstr "totaal" @@ -4162,23 +4186,24 @@ msgstr "" "Gebruik: %s [OPTIE...] [-] [NAAM=WAARDE]... [COMMANDO [ARGUMENT...]]\n" #: src/env.c:55 +msgid "Set each NAME to VALUE in the environment and run COMMAND.\n" +msgstr "" +"Kent de gegeven WAARDE aan omgevingsvariabele NAAM toe en voert COMMANDO " +"uit.\n" + +#: src/env.c:61 msgid "" -"Set each NAME to VALUE in the environment and run COMMAND.\n" -"\n" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with 0 byte rather than newline\n" " -u, --unset=NAME remove variable from the environment\n" msgstr "" -"De gegeven WAARDE aan omgevingsvariabele NAAM toekennen en COMMANDO " -"uitvoeren.\n" -"\n" " -i, --ignore-environment alle ongenoemde omgevingsvariabelen " "verwijderen\n" " -0, --null elke regel afsluiten met een 0-byte, niet met " "nieuweregel\n" " -u, --unset=NAAM de genoemde variabele uit de omgeving verwijderen\n" -#: src/env.c:64 +#: src/env.c:68 msgid "" "\n" "A mere - implies -i. If no COMMAND, print the resulting environment.\n" @@ -4187,17 +4212,17 @@ msgstr "" "Een losse '-' betekent hetzelfde als '-i'.\n" "Zonder COMMANDO wordt de resulterende omgeving getoond.\n" -#: src/env.c:120 +#: src/env.c:124 #, c-format msgid "cannot unset %s" msgstr "kan %s niet verwijderen" -#: src/env.c:131 +#: src/env.c:135 #, c-format msgid "cannot set %s" msgstr "kan %s geen waarde geven" -#: src/env.c:148 +#: src/env.c:152 #, c-format msgid "cannot specify --null (-0) with command" msgstr "optie '--null' (-0) gaat niet samen met een commando" @@ -4206,15 +4231,13 @@ msgstr "optie '--null' (-0) gaat niet samen met een commando" msgid "" "Convert tabs in each FILE to spaces, writing to standard output.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" -"Elk BESTAND naar standaarduitvoer sturen met tabs geconverteerd naar " +"Stuurt elk BESTAND naar standaarduitvoer met tabs geconverteerd naar " "spaties.\n" "\n" "Zonder BESTAND, of wanneer BESTAND - is, wordt standaardinvoer gelezen.\n" -"\n" -#: src/expand.c:115 +#: src/expand.c:114 msgid "" " -i, --initial do not convert tabs after non blanks\n" " -t, --tabs=NUMBER have tabs NUMBER characters apart, not 8\n" @@ -4222,34 +4245,34 @@ msgstr "" " -i, --initial tabs na niet-witruimte niet converteren\n" " -t, --tabs=GETAL te gebruiken tabbreedte in plaats van 8\n" -#: src/expand.c:119 +#: src/expand.c:118 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:172 src/unexpand.c:191 +#: src/expand.c:171 src/unexpand.c:190 #, c-format msgid "tab stop is too large %s" msgstr "tab-positie is te groot: %s" -#: src/expand.c:180 src/unexpand.c:199 +#: src/expand.c:179 src/unexpand.c:198 #, c-format msgid "tab size contains invalid character(s): %s" msgstr "tab-grootte of -positie bevat ongeldig(e) teken(s): %s" -#: src/expand.c:206 src/unexpand.c:225 +#: src/expand.c:205 src/unexpand.c:224 #, c-format msgid "tab size cannot be 0" msgstr "tab-grootte of -positie mag niet 0 zijn" -#: src/expand.c:208 src/unexpand.c:227 +#: src/expand.c:207 src/unexpand.c:226 #, c-format msgid "tab sizes must be ascending" msgstr "tab-posities moeten toenemen" -#: src/expand.c:326 src/expand.c:345 src/unexpand.c:374 src/unexpand.c:419 +#: 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 "invoerregel is te lang" @@ -4415,12 +4438,12 @@ msgstr "fout in zoeken met reguliere expressie" msgid "non-integer argument" msgstr "argument is geen geheel getal" -#: src/expr.c:793 src/truncate.c:316 +#: src/expr.c:793 src/truncate.c:314 #, c-format msgid "division by zero" msgstr "deling door nul" -#: src/expr.c:887 src/sort.c:2029 +#: src/expr.c:887 src/sort.c:2044 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "zet LC_ALL='C' om het probleem te omzeilen" @@ -4430,25 +4453,32 @@ msgstr "zet LC_ALL='C' om het probleem te omzeilen" msgid "the strings compared were %s and %s" msgstr "de te vergelijken tekenreeksen waren %s en %s" -#: src/factor.c:449 -msgid "using arbitrary-precision arithmetic" -msgstr "berekening met willekeurige precisie wordt gebruikt" +#. This is a proper name. See the gettext manual, section Names. +#: src/factor.c:111 +msgid "Niels Moller" +msgstr "Niels Moller" -#: src/factor.c:460 -msgid "using single-precision arithmetic" -msgstr "berekening met enkelvoudige precisie wordt gebruikt" +#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459 +#, 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:465 src/od.c:1640 src/od.c:1709 +#: src/factor.c:2092 #, c-format -msgid "%s is too large" -msgstr "%s is te groot" +msgid "squfof queue overflow" +msgstr "wachtrij-overloop in SQUFOF" -#: src/factor.c:469 +#: src/factor.c:2419 #, c-format msgid "%s is not a valid positive integer" msgstr "%s is geen geldig positief geheel getal" -#: src/factor.c:494 +#: src/factor.c:2442 src/od.c:1646 src/od.c:1715 +#, c-format +msgid "%s is too large" +msgstr "%s is te groot" + +#: src/factor.c:2454 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4458,7 +4488,7 @@ msgstr "" " of: %s OPTIE\n" "\n" -#: src/factor.c:499 +#: src/factor.c:2459 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" @@ -4485,11 +4515,11 @@ msgid "cannot stat current directory (now %s)" msgstr "kan status van huidige map %s niet opvragen" #. This is a proper name. See the gettext manual, section Names. -#: src/fmt.c:37 +#: src/fmt.c:38 msgid "Ross Paterson" msgstr "Ross Paterson" -#: src/fmt.c:269 +#: src/fmt.c:270 #, c-format msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n" msgstr "" @@ -4497,15 +4527,13 @@ msgstr "" "\n" # De tweede zin is overbodig, want staat al na de opties. -#: src/fmt.c:270 +#: 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" -"\n" msgstr "" -"Elk BESTAND naar standaarduitvoer sturen met de alinea's opnieuw ingedeeld.\n" +"Stuurt elk BESTAND naar standaarduitvoer met de alinea's opnieuw ingedeeld.\n" "De optie -GETAL is een afkorting van --width=GETAL.\n" -"\n" #: src/fmt.c:278 msgid "" @@ -4521,8 +4549,8 @@ msgstr "" " -s, --split-only lange regels splitsen maar niet opnieuw " "uitvullen\n" -#: src/fmt.c:285 -#, fuzzy, c-format +#: src/fmt.c:287 +#, 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" @@ -4533,8 +4561,10 @@ msgstr "" "tweede\n" " -u, --uniform-spacing één spatie tussen woorden, twee na een zin\n" " -w, --width=GETAL maximale regelbreedte (standaard is 75)\n" +" -g, --goal=GETAL doelbreedte (standaard 93% van maximale " +"regelbreedte)\n" -#: src/fmt.c:357 +#: src/fmt.c:359 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -4543,7 +4573,7 @@ msgstr "" "ongeldige optie: '%c'; -GETAL wordt alleen herkend als\n" "het het eerste argument is; gebruik anders '-w GETAL'" -#: src/fmt.c:403 src/fmt.c:414 +#: src/fmt.c:405 src/fmt.c:416 #, c-format msgid "invalid width: %s" msgstr "ongeldige breedte: %s" @@ -4552,14 +4582,13 @@ msgstr "ongeldige breedte: %s" msgid "" "Wrap input lines in each FILE (standard input by default), writing to\n" "standard output.\n" -"\n" msgstr "" -"Elk BESTAND naar standaarduitvoer sturen met de regels op een bepaalde " +"Stuurt elk BESTAND naar standaarduitvoer met de regels op een bepaalde " "lengte\n" "afgebroken. Zonder argumenten wordt standaardinvoer gelezen.\n" "\n" -#: src/fold.c:78 +#: src/fold.c:77 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4570,16 +4599,16 @@ msgstr "" " -w, --width=GETAL te gebruiken afbreekbreedte in plaats van 80\n" "\n" -#: src/fold.c:289 src/pr.c:836 +#: src/fold.c:288 src/pr.c:832 #, c-format 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:75 +#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 #: src/truncate.c:37 msgid "Padraig Brady" -msgstr "Padraig Brady" +msgstr "Pádraig Brady" # Deze commando's kennen alleen de opties --help en --version. #: src/getlimits.c:65 @@ -4596,17 +4625,17 @@ msgstr "" "scripts.\n" "\n" -#: src/group-list.c:69 src/id.c:345 src/setuidgid.c:184 +#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184 #, 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:350 +#: src/group-list.c:74 src/id.c:370 #, c-format msgid "failed to get groups for the current process" msgstr "kan de groepen van het huidige proces niet verkrijgen" -#: src/group-list.c:104 +#: src/group-list.c:114 #, c-format msgid "cannot find name for group ID %lu" msgstr "kan geen naam vinden bij groeps-ID %lu" @@ -4650,15 +4679,13 @@ 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" -"\n" msgstr "" -"De eerste 10 regels van elk gegeven BESTAND naar standaarduitvoer kopiëren.\n" +"Kopieert de eerste 10 regels van elk gegeven BESTAND naar standaarduitvoer.\n" "Als meer dan één BESTAND gegeven is, wordt de uitvoer van elk bestand\n" "voorafgegaan door een kopje met de bestandsnaam. Zonder BESTAND, of\n" "wanneer BESTAND - is, wordt standaardinvoer gelezen.\n" -"\n" -#: src/head.c:118 +#: src/head.c:117 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -4674,7 +4701,7 @@ msgstr "" " met een minteken, alle regels behalve de " "laatste N\n" -#: src/head.c:126 +#: src/head.c:125 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4683,7 +4710,7 @@ msgstr "" " -v, --verbose altijd bestandsnaamkopjes tonen\n" "\n" -#: src/head.c:132 +#: src/head.c:131 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -4695,58 +4722,58 @@ 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:152 -#, c-format -msgid "error writing %s" -msgstr "fout bij schrijven van %s" - -#: src/head.c:155 +#: src/head.c:154 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: bestand is te veel geslonken" -#: src/head.c:228 src/head.c:1044 +#: src/head.c:227 src/head.c:1051 #, c-format msgid "%s: number of bytes is too large" msgstr "%s: aantal bytes is te groot" -#: src/head.c:441 +#: 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:613 src/head.c:684 src/tail.c:450 +#: src/head.c:612 src/head.c:691 src/tail.c:449 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: kan niet naar positie %s springen" -#: src/head.c:791 +#: src/head.c:673 +#, c-format +msgid "%s: failed to reset file pointer" +msgstr "%s: resetten van bestandspositieaanduider is mislukt" + +#: src/head.c:798 #, c-format msgid "cannot reposition file pointer for %s" msgstr "kan de bestandspositieaanduider van %s niet verplaatsen" -#: src/head.c:878 +#: src/head.c:885 #, 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:879 +#: src/head.c:886 msgid "number of lines" msgstr "aantal regels" -#: src/head.c:879 +#: src/head.c:886 msgid "number of bytes" msgstr "aantal bytes" -#: src/head.c:886 src/tail.c:1947 +#: src/head.c:893 src/tail.c:1947 msgid "invalid number of lines" msgstr "ongeldig aantal regels" -#: src/head.c:887 src/tail.c:1948 +#: src/head.c:894 src/tail.c:1948 msgid "invalid number of bytes" msgstr "ongeldig aantal bytes" -#: src/head.c:974 src/head.c:1032 +#: src/head.c:981 src/head.c:1039 #, c-format msgid "invalid trailing option -- %c" msgstr "ongeldige optie aan het eind: %c" @@ -4871,86 +4898,86 @@ msgstr "kan de context van het proces niet verkrijgen" msgid "cannot get effective UID" msgstr "kan effectieve UID niet verkrijgen" -#: src/id.c:289 +#: src/id.c:311 #, c-format -msgid "cannot find name for user ID %lu" -msgstr "kan geen naam vinden bij gebruikers-ID %lu" +msgid "cannot find name for user ID %s" +msgstr "kan geen naam vinden bij gebruikers-ID %s" -#: src/id.c:309 +#: src/id.c:329 #, c-format -msgid "uid=%lu" -msgstr "UID=%lu" +msgid "uid=%s" +msgstr "UID=%s" -#: src/id.c:314 +#: src/id.c:334 #, c-format -msgid " gid=%lu" -msgstr " GID=%lu" +msgid " gid=%s" +msgstr " GID=%s" -#: src/id.c:321 +#: src/id.c:341 #, c-format -msgid " euid=%lu" -msgstr " EUID=%lu" +msgid " euid=%s" +msgstr " EUID=%s" -#: src/id.c:329 +#: src/id.c:349 #, c-format -msgid " egid=%lu" -msgstr " EGID=%lu" +msgid " egid=%s" +msgstr " EGID=%s" -#: src/id.c:357 +#: src/id.c:377 msgid " groups=" msgstr " groepen=" -#: src/id.c:373 +#: src/id.c:393 #, c-format msgid " context=%s" msgstr " context=%s" -#: src/install.c:372 +#: src/install.c:373 #, c-format msgid "warning: %s: failed to change context to %s" msgstr "waarschuwing: %s: kan beveiligingscontext niet veranderen naar %s" -#: src/install.c:413 +#: src/install.c:414 #, c-format msgid "creating directory %s" msgstr "aanmaken van map %s" -#: src/install.c:481 +#: src/install.c:482 #, c-format msgid "cannot change ownership of %s" msgstr "kan de eigenaar van %s niet veranderen" -#: src/install.c:505 +#: src/install.c:506 #, c-format msgid "cannot set time stamps for %s" msgstr "kan de tijdsstempels van %s niet instellen" -#: src/install.c:526 src/split.c:412 src/timeout.c:387 +#: src/install.c:527 src/split.c:426 src/timeout.c:439 #, c-format msgid "fork system call failed" msgstr "kan geen nieuw proces starten" -#: src/install.c:530 +#: src/install.c:531 #, c-format msgid "cannot run %s" msgstr "kan %s niet uitvoeren" -#: src/install.c:534 +#: src/install.c:535 #, c-format msgid "waiting for strip" msgstr "wachten op 'strip'" -#: src/install.c:536 +#: src/install.c:537 #, c-format msgid "strip process terminated abnormally" msgstr "het proces 'strip' is abnormaal afgesloten" -#: src/install.c:557 +#: src/install.c:558 #, c-format msgid "invalid user %s" msgstr "ongeldige gebruiker: %s" -#: src/install.c:593 +#: src/install.c:594 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -4964,7 +4991,7 @@ msgstr "" " of: %s [OPTIE...] -d MAP...\n" "\n" -#: src/install.c:600 +#: src/install.c:601 msgid "" "\n" "This install program copies files (often just compiled) into destination\n" @@ -4976,7 +5003,6 @@ msgid "" "In the first three forms, copy SOURCE to DEST or multiple SOURCE(s) to\n" "the existing DIRECTORY, while setting permission modes and owner/group.\n" "In the 4th form, create all components of the given DIRECTORY(ies).\n" -"\n" msgstr "" "\n" "Dit programma kopieert bestanden (vaak zojuist gecompileerd) naar door u\n" @@ -4990,7 +5016,6 @@ msgstr "" "worden.\n" "Bij de vierde vorm worden alle componenten van de gegeven MAP(pen) " "aangemaakt.\n" -"\n" #: src/install.c:615 msgid "" @@ -5067,7 +5092,7 @@ msgstr "" "instellen\n" "\n" -#: src/install.c:858 +#: src/install.c:859 #, c-format msgid "" "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled" @@ -5075,53 +5100,53 @@ msgstr "" "Waarschuwing: optie '--preserve-context' wordt genegeerd;\n" "deze kernel heeft geen SELinux." -#: src/install.c:868 +#: 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:885 +#: src/install.c:886 #, 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:888 +#: src/install.c:889 #, 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:892 +#: 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:946 src/mkdir.c:202 src/stdbuf.c:327 +#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326 #, c-format msgid "invalid mode %s" msgstr "ongeldige modus %s" -#: src/install.c:953 +#: src/install.c:954 #, 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:958 +#: src/install.c:959 #, 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:965 +#: src/install.c:966 #, c-format msgid "options --compare (-C) and --strip are mutually exclusive" msgstr "de opties '--compare' (-C) en '--strip' sluiten elkaar uit" -#: src/install.c:971 +#: src/install.c:972 #, c-format msgid "" "the --compare (-C) option is ignored when you specify a mode with non-" @@ -5131,7 +5156,7 @@ msgstr "" "toegangsrechten" #. This is a proper name. See the gettext manual, section Names. -#: src/join.c:40 src/sort.c:65 +#: src/join.c:40 src/sort.c:66 msgid "Mike Haertel" msgstr "Mike Haertel" @@ -5238,8 +5263,8 @@ msgstr "" #: src/join.c:403 #, c-format -msgid "%s:%ju: is not sorted: %.*s" -msgstr "%s:%ju: is niet gesorteerd: %.*s" +msgid "%s:%<PRIuMAX>: is not sorted: %.*s" +msgstr "%s:%<PRIuMAX>: is niet gesorteerd: %.*s" #: src/join.c:840 src/join.c:1038 #, c-format @@ -5266,12 +5291,12 @@ msgstr "incompatibele join-velden: %lu, %lu" msgid "conflicting empty-field replacement strings" msgstr "conflicterende vervangingstekenreeksen voor lege velden" -#: src/join.c:1101 src/sort.c:4414 +#: src/join.c:1101 src/sort.c:4468 #, c-format msgid "multi-character tab %s" msgstr "meerdere tekens in scheidingsteken %s" -#: src/join.c:1105 src/sort.c:4419 +#: src/join.c:1105 src/sort.c:4473 #, c-format msgid "incompatible tabs" msgstr "incompatibele scheidingstekens" @@ -5294,14 +5319,10 @@ msgstr "" "\n" #: src/kill.c:82 -msgid "" -"Send signals to processes, or list signals.\n" -"\n" -msgstr "" -"Signalen naar processen zenden, of signaalnamen opsommen.\n" -"\n" +msgid "Send signals to processes, or list signals.\n" +msgstr "Zendt signalen naar processen, of somt signaalnamen op.\n" -#: src/kill.c:89 +#: src/kill.c:88 msgid "" " -s, --signal=SIGNAL, -SIGNAL\n" " specify the name or number of the signal to be sent\n" @@ -5316,7 +5337,7 @@ msgstr "" " -t, --table een tabel met signaalnummers, -namen en betekenissen " "tonen\n" -#: src/kill.c:97 +#: src/kill.c:96 msgid "" "\n" "SIGNAL may be a signal name like 'HUP', or a signal number like '1',\n" @@ -5330,32 +5351,32 @@ msgstr "" "PID is een geheel getal; als het negatief is dan duidt het een procesgroep " "aan.\n" -#: src/kill.c:206 +#: src/kill.c:205 #, c-format msgid "%s: invalid process id" msgstr "ongeldig proces-ID: %s" -#: src/kill.c:260 +#: src/kill.c:259 #, c-format msgid "invalid option -- %c" msgstr "ongeldige optie: %c" -#: src/kill.c:269 +#: src/kill.c:268 #, c-format msgid "%s: multiple signals specified" msgstr "meer dan één signaal gegeven: %s" -#: src/kill.c:283 +#: src/kill.c:282 #, c-format msgid "multiple -l or -t options specified" msgstr "meer dan één optie '-l' of '-t' gegeven" -#: src/kill.c:300 +#: src/kill.c:299 #, c-format msgid "cannot combine signal with -l or -t" msgstr "een signaal gaat niet samen met optie '-l' of '-t'" -#: src/kill.c:306 +#: src/kill.c:305 #, c-format msgid "no process ID specified" msgstr "geen proces-ID gegeven" @@ -5469,7 +5490,6 @@ msgid "" "When creating hard links, each TARGET must exist. Symbolic links\n" "can hold arbitrary text; if later resolved, a relative link is\n" "interpreted in relation to its parent directory.\n" -"\n" msgstr "" "In de 1ste vorm: een koppeling naar DOEL maken met de naam KOPPELINGSNAAM.\n" "In de 2de vorm: een koppeling naar DOEL maken in de huidige MAP.\n" @@ -5481,9 +5501,8 @@ msgstr "" "koppelingen kunnen een willekeurige tekst bevatten; bij het later herleiden\n" "wordt een relatieve koppeling geïnterpreteerd in relatie tot haar ouder-" "map.\n" -"\n" -#: src/ln.c:395 +#: src/ln.c:394 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -5507,7 +5526,7 @@ msgstr "" "systeembeperkingen)\n" " -f, --force bestaande bestemmingsbestanden verwijderen\n" -#: src/ln.c:403 +#: src/ln.c:402 msgid "" " -i, --interactive prompt whether to remove destinations\n" " -L, --logical dereference TARGETs that are symbolic links\n" @@ -5533,7 +5552,7 @@ msgstr "" " -s, --symbolic symbolische in plaats van harde koppelingen " "maken\n" -#: src/ln.c:412 +#: src/ln.c:411 msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" " -t, --target-directory=DIRECTORY specify the DIRECTORY in which to " @@ -5551,26 +5570,14 @@ msgstr "" " -v, --verbose naam en doel van elke gemaakte koppeling " "tonen\n" -#: src/ln.c:428 -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 nooit reservekopieën maken (zelfs niet met '--backup')\n" -" numbered, t genummerde reservekopieën maken\n" -" existing, nil genummerde reserves maken als er al zijn, anders simpele\n" -" simple, never altijd simpele reservekopieën maken\n" -"\n" - -#: src/ln.c:435 +#: src/ln.c:433 #, 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" "Optie '-s' negeert '-L' en '-P'. Anders bepaalt de laatst gegeven optie " "het\n" "gedrag wanneer de bron een symbolische koppeling is; standaard is dit '%s'.\n" @@ -5644,7 +5651,7 @@ msgstr "genegeerd: ongeldige breedte %s in omgevingsvariabele COLUMNS" 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:1976 +#: src/ls.c:1750 src/ptx.c:1975 #, c-format msgid "invalid line width: %s" msgstr "ongeldige regelbreedte: %s" @@ -5707,7 +5714,7 @@ msgstr "lezen van map %s" msgid "closing directory %s" msgstr "sluiten van map %s" -#: src/ls.c:3301 +#: src/ls.c:3302 #, c-format msgid "cannot compare file names %s and %s" msgstr "kan bestandsnamen %s en %s niet vergelijken" @@ -5716,14 +5723,13 @@ msgstr "kan bestandsnamen %s en %s niet vergelijken" msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" -"\n" msgstr "" -"Informatie tonen over de gegeven BESTANDen (standaard over de huidige map).\n" +"Toont informatie over de gegeven BESTANDen (standaard over de huidige map).\n" +"\n" "De items worden alfabetisch gesorteerd als geen van de opties '-cftuvSUX'\n" "noch '--sort' gegeven is.\n" -"\n" -#: src/ls.c:4729 +#: src/ls.c:4728 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -5737,7 +5743,7 @@ msgstr "" " -b, --escape niet-grafische tekens tonen als codes in C-" "stijl\n" -#: src/ls.c:4735 +#: src/ls.c:4734 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them. E." "g.,\n" @@ -5763,7 +5769,7 @@ msgstr "" " met '-l': op naam sorteren en 'ctime' tonen;\n" " anders: op 'ctime' sorteren, recentste eerst\n" -#: src/ls.c:4745 +#: src/ls.c:4744 msgid "" " -C list entries by columns\n" " --color[=WHEN] colorize the output. WHEN defaults to " @@ -5785,7 +5791,7 @@ msgstr "" " -D, --dired uitvoer produceren voor de 'dired'-modus van " "Emacs\n" -#: src/ls.c:4753 +#: src/ls.c:4752 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -5806,11 +5812,11 @@ msgstr "" "column' (-1)\n" " --full-time hetzelfde als '-l --time-style=full-iso'\n" -#: src/ls.c:4761 +#: src/ls.c:4760 msgid " -g like -l, but do not list owner\n" msgstr " -g als '-l', maar geen eigenaar tonen\n" -#: src/ls.c:4764 +#: src/ls.c:4763 msgid "" " --group-directories-first\n" " group directories before files.\n" @@ -5822,7 +5828,7 @@ msgstr "" " worden met een '--sort', maar gebruik van\n" " '--sort=none' of '-U' deactiveert groepering\n" -#: src/ls.c:4770 +#: src/ls.c:4769 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" @@ -5836,7 +5842,7 @@ msgstr "" " --si idem, maar machten van 1000 i.p.v. 1024 " "gebruiken\n" -#: src/ls.c:4776 +#: src/ls.c:4775 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5858,7 +5864,7 @@ msgstr "" " --hide=PATROON de namen die voldoen aan PATROON niet tonen\n" " (geldt niet samen met '-a' of '-A')\n" -#: src/ls.c:4786 +#: src/ls.c:4785 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -5879,7 +5885,7 @@ msgstr "" " -I, --ignore=PATROON de namen die voldoen aan PATROON niet tonen\n" " -k, --kibibytes blokken van 1024 bytes gebruiken\n" -#: src/ls.c:4796 +#: src/ls.c:4795 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5897,7 +5903,7 @@ msgstr "" " in plaats van over de koppeling zelf\n" " -m geen kolommen maar kommagescheiden lijst tonen\n" -#: src/ls.c:4804 +#: src/ls.c:4803 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. " @@ -5915,7 +5921,7 @@ msgstr "" " -p, --indicator-style=slash\n" " een '/'-indicator achter mapnamen toevoegen\n" -#: src/ls.c:4812 +#: src/ls.c:4811 msgid "" " -q, --hide-control-chars print ? instead of non graphic characters\n" " --show-control-chars show non graphic characters as-is (default\n" @@ -5937,7 +5943,7 @@ msgstr "" " 'shell', 'shell-always', 'c' (-Q), 'escape' (-" "b)\n" -#: src/ls.c:4821 +#: src/ls.c:4820 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -5949,7 +5955,7 @@ msgstr "" " -s, --size toegewezen aantal blokken tonen voor ieder " "bestand\n" -#: src/ls.c:4826 +#: src/ls.c:4825 msgid "" " -S sort by file size\n" " --sort=WORD sort by WORD instead of name: none -U,\n" @@ -5968,7 +5974,7 @@ msgstr "" " 'atime' of 'access' of 'use' (-u),\n" " 'ctime' of 'status' (-c)\n" -#: src/ls.c:4836 +#: src/ls.c:4835 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, +FORMAT.\n" @@ -5993,7 +5999,7 @@ msgstr "" "dan\n" " geldt deze alleen buiten de POSIX-taalregio\n" -#: src/ls.c:4845 +#: src/ls.c:4844 msgid "" " -t sort by modification time, newest first\n" " -T, --tabsize=COLS assume tab stops at each COLS instead of 8\n" @@ -6001,7 +6007,7 @@ msgstr "" " -t op de tijd van laatste wijziging sorteren\n" " -T, --tabsize=AANTAL te gebruiken tabbreedte in plaats van 8\n" -#: src/ls.c:4849 +#: src/ls.c:4848 msgid "" " -u with -lt: sort by, and show, access time\n" " with -l: show access time and sort by name\n" @@ -6018,7 +6024,7 @@ msgstr "" "plaatsingsvolgorde\n" " -v logisch sorteren op (versie)nummers in de naam\n" -#: src/ls.c:4856 +#: src/ls.c:4855 msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" @@ -6035,7 +6041,7 @@ msgstr "" " -1 één item per regel tonen\n" "\n" -#: src/ls.c:4866 +#: src/ls.c:4865 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -6050,7 +6056,7 @@ msgstr "" "Omgevingsvariabele LS_COLORS kan deze instellingen wijzigen. Gebruik\n" "het commando 'dircolors' om deze variabele in te stellen.\n" -#: src/ls.c:4873 +#: src/ls.c:4872 msgid "" "\n" "Exit status:\n" @@ -6080,7 +6086,7 @@ msgstr "Scott Miller" msgid "David Madore" msgstr "David Madore" -#: src/md5sum.c:162 +#: src/md5sum.c:164 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -6095,7 +6101,7 @@ msgstr "" "Zonder BESTAND, of wanneer BESTAND - is, wordt standaardinvoer gelezen.\n" "\n" -#: src/md5sum.c:172 +#: src/md5sum.c:174 msgid "" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" @@ -6103,28 +6109,32 @@ msgstr "" " -b, --binary in binaire modus lezen (standaard, behalve bij " "standaardinvoer)\n" -#: src/md5sum.c:176 +#: src/md5sum.c:178 msgid " -b, --binary read in binary mode\n" msgstr " -b, --binary in binaire modus lezen\n" -#: src/md5sum.c:179 +#: src/md5sum.c:181 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr "" " -c, --check %s-controlesommen uit BESTAND(en) lezen en controleren\n" -#: src/md5sum.c:183 +#: src/md5sum.c:184 +msgid " --tag create a BSD-style checksum\n" +msgstr " --tag een controlesom in BSD-stijl genereren\n" + +#: src/md5sum.c:188 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" " -t, --text in tekstmodus lezen (standaard bij lezen van " "standaardinvoer)\n" -#: src/md5sum.c:187 +#: src/md5sum.c:192 msgid " -t, --text read in text mode (default)\n" msgstr " -t, --text in tekstmodus lezen (standaard)\n" -#: src/md5sum.c:190 +#: src/md5sum.c:195 msgid "" "\n" "The following three options are useful only when verifying checksums:\n" @@ -6143,14 +6153,14 @@ msgstr "" " -w, --warn waarschuwen bij verkeerd opgemaakte controlesomregels\n" "\n" -#: src/md5sum.c:198 +#: 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:203 +#: src/md5sum.c:208 #, c-format msgid "" "\n" @@ -6167,42 +6177,42 @@ msgstr "" "type\n" "aangeeft ('*' voor binair, ' ' voor tekst), en de naam van het bestand.\n" -#: src/md5sum.c:502 +#: src/md5sum.c:523 #, c-format msgid "%s: too many checksum lines" msgstr "%s: te veel regels met controlesommen" -#: src/md5sum.c:526 +#: src/md5sum.c:547 #, c-format msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line" msgstr "%s: %<PRIuMAX>: onjuist opgemaakte regel met %s-controlesom" -#: src/md5sum.c:551 +#: src/md5sum.c:572 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: openen of lezen is MISLUKT\n" -#: src/md5sum.c:574 +#: src/md5sum.c:595 msgid "FAILED" msgstr "VERKEERD" -#: src/md5sum.c:576 +#: src/md5sum.c:597 msgid "OK" msgstr "goed" -#: src/md5sum.c:600 +#: src/md5sum.c:621 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "%s: geen correct opgemaakte regels met %s-controlesommen gevonden" -#: src/md5sum.c:610 +#: src/md5sum.c:631 #, 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:618 +#: src/md5sum.c:639 #, c-format msgid "WARNING: %<PRIuMAX> listed file could not be read" msgid_plural "WARNING: %<PRIuMAX> listed files could not be read" @@ -6210,7 +6220,7 @@ msgstr[0] "WAARSCHUWING: %<PRIuMAX> getoond bestand kan niet gelezen worden" msgstr[1] "" "WAARSCHUWING: %<PRIuMAX> getoonde bestanden kunnen niet gelezen worden" -#: src/md5sum.c:626 +#: src/md5sum.c:647 #, c-format msgid "WARNING: %<PRIuMAX> computed checksum did NOT match" msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match" @@ -6218,7 +6228,17 @@ msgstr[0] "WAARSCHUWING: %<PRIuMAX> berekende controlesom komt NIET overeen" msgstr[1] "" "WAARSCHUWING: %<PRIuMAX> berekende controlesommen komen NIET overeen" -#: src/md5sum.c:704 +#: src/md5sum.c:760 +#, c-format +msgid "--tag does not support --text mode" +msgstr "optie '--tag' gaat niet samen met '--text'" + +#: src/md5sum.c:766 +#, 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 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" @@ -6226,23 +6246,23 @@ msgstr "" "de opties '--binary' en '--text' gelden niet voor het verifiëren van " "controlesommen" -#: src/md5sum.c:712 +#: src/md5sum.c:781 #, 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:719 +#: src/md5sum.c:788 #, 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:726 +#: src/md5sum.c:795 #, 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:733 +#: src/md5sum.c:802 #, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "" @@ -6256,14 +6276,10 @@ msgstr "" "\n" #: src/mkdir.c:57 -msgid "" -"Create the DIRECTORY(ies), if they do not already exist.\n" -"\n" -msgstr "" -"De gegeven MAP(pen) aanmaken (als ze nog niet bestaan).\n" -"\n" +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:64 +#: src/mkdir.c:63 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" @@ -6280,7 +6296,7 @@ msgstr "" "map\n" "\n" -#: src/mkdir.c:169 +#: src/mkdir.c:168 #, c-format msgid "created directory %s" msgstr "map %s is aangemaakt" @@ -6293,33 +6309,29 @@ msgstr "" "\n" #: src/mkfifo.c:52 -msgid "" -"Create named pipes (FIFOs) with the given NAMEs.\n" -"\n" -msgstr "" -"Voor elke gegeven NAAM een benoemde pijp (FIFO) aanmaken.\n" -"\n" +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:59 src/mknod.c:61 +#: src/mkfifo.c:58 src/mknod.c:60 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=rwx - " +" -m, --mode=MODUS in te stellen rechten (zie 'chmod'), i.p.v. 'a=rw - " "umask'\n" -#: src/mkfifo.c:62 +#: src/mkfifo.c:61 msgid "" " -Z, --context=CTX set the SELinux security context of each NAME to CTX\n" msgstr "" " -Z, --context=CTX te gebruiken beveiligingscontext voor elke aangemaakte " "pijp\n" -#: src/mkfifo.c:122 src/mknod.c:128 +#: src/mkfifo.c:121 src/mknod.c:127 #, c-format msgid "invalid mode" msgstr "ongeldige modus" -#: src/mkfifo.c:127 src/mknod.c:133 +#: src/mkfifo.c:126 src/mknod.c:132 #, c-format msgid "mode must specify only file permission bits" msgstr "de modus mag alleen bestandstoegangsrechten bevatten" @@ -6332,18 +6344,14 @@ msgstr "" "\n" #: src/mknod.c:54 -msgid "" -"Create the special file NAME of the given TYPE.\n" -"\n" -msgstr "" -"Het speciale bestand NAAM aanmaken van het gegeven TYPE.\n" -"\n" +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:64 +#: 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:69 +#: src/mknod.c:68 msgid "" "\n" "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n" @@ -6359,7 +6367,7 @@ msgstr "" "0,\n" "octaal; anders decimaal. TYPE mag zijn:\n" -#: src/mknod.c:76 +#: src/mknod.c:75 msgid "" "\n" " b create a block (buffered) special file\n" @@ -6371,40 +6379,40 @@ msgstr "" " c, u een byte-apparaatbestand aanmaken (ongebufferd)\n" " p een FIFO aanmaken\n" -#: src/mknod.c:151 +#: src/mknod.c:150 msgid "Special files require major and minor device numbers." msgstr "Speciale bestanden vereisen hoofd- en subapparaatnummers." -#: src/mknod.c:161 +#: src/mknod.c:160 msgid "Fifos do not have major and minor device numbers." msgstr "FIFO's hebben geen hoofd- en subapparaatnummers." -#: src/mknod.c:177 +#: src/mknod.c:176 #, c-format msgid "block special files not supported" msgstr "blok-apparaatbestanden worden niet ondersteund" -#: src/mknod.c:186 +#: src/mknod.c:185 #, c-format msgid "character special files not supported" msgstr "byte-apparaatbestanden worden niet ondersteund" -#: src/mknod.c:202 +#: src/mknod.c:201 #, c-format msgid "invalid major device number %s" msgstr "ongeldig hoofdapparaatnummer %s" -#: src/mknod.c:207 +#: src/mknod.c:206 #, c-format msgid "invalid minor device number %s" msgstr "ongeldig subapparaatnummer %s" -#: src/mknod.c:212 +#: src/mknod.c:211 #, c-format msgid "invalid device %s %s" msgstr "ongeldig apparaat %s %s" -#: src/mknod.c:226 +#: src/mknod.c:225 #, c-format msgid "invalid device type %s" msgstr "ongeldig apparaattype %s" @@ -6497,60 +6505,56 @@ msgstr "" " indien ingesteld; anders de map gegeven via '-p';\n" " anders /tmp [verouderd]\n" -#: src/mktemp.c:222 +#: 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:228 +#: src/mktemp.c:229 #, c-format msgid "too many templates" msgstr "te veel sjablonen" -#: src/mktemp.c:248 +#: src/mktemp.c:249 #, c-format msgid "with --suffix, template %s must end in X" msgstr "met '--suffix' moet sjabloon %s eindigen op een X" -#: src/mktemp.c:273 src/split.c:1117 +#: src/mktemp.c:274 src/split.c:1130 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "ongeldig achtervoegsel %s; het bevat een mapscheidingsteken" -#: src/mktemp.c:278 +#: src/mktemp.c:279 #, c-format msgid "too few X's in template %s" msgstr "te weinig X'en in sjabloon %s" -#: src/mktemp.c:291 +#: src/mktemp.c:292 #, c-format msgid "invalid template, %s, contains directory separator" msgstr "ongeldig sjabloon %s; het bevat een mapscheidingsteken" -#: src/mktemp.c:305 +#: src/mktemp.c:306 #, 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:325 +#: src/mktemp.c:326 #, c-format msgid "failed to create directory via template %s" msgstr "kan geen map aanmaken via sjabloon %s" -#: src/mktemp.c:335 +#: src/mktemp.c:336 #, c-format msgid "failed to create file via template %s" msgstr "kan geen bestand aanmaken via sjabloon %s" -#: src/mv.c:290 -msgid "" -"Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" -"\n" -msgstr "" -"BRON hernoemen naar BESTEMMING, of BRON(nen) verplaatsen naar MAP.\n" -"\n" +#: src/mv.c:292 +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:297 +#: src/mv.c:298 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -6572,7 +6576,7 @@ msgstr "" "Als u meer dan één van -i, -f, -n specificeert dan is alleen de laatste " "effectief.\n" -#: src/mv.c:306 +#: src/mv.c:307 msgid "" " --strip-trailing-slashes remove any trailing slashes from each " "SOURCE\n" @@ -6584,7 +6588,7 @@ msgstr "" " -S, --suffix=ACHTERVOEGSEL te gebruiken achtervoegsel voor " "reservekopieën\n" -#: src/mv.c:311 +#: src/mv.c:312 msgid "" " -t, --target-directory=DIRECTORY move all SOURCE arguments into " "DIRECTORY\n" @@ -6615,35 +6619,35 @@ msgstr "" #, c-format msgid "" "Run COMMAND with an adjusted niceness, which affects process scheduling.\n" -"With no COMMAND, print the current niceness. Nicenesses range from\n" -"%d (most favorable scheduling) to %d (least favorable).\n" -"\n" -" -n, --adjustment=N add integer N to the niceness (default 10)\n" +"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 "" -"Het gegeven COMMANDO uitvoeren met een aangepaste procesbeleefdheid;\n" +"Voert het gegeven COMMANDO uit met een aangepaste procesbeleefdheid;\n" "als geen COMMANDO gegeven is, dan de huidige procesbeleefdheid tonen.\n" "Beleefdheidswaarden lopen van %d (krijgt meeste tijd) tot %d (minste tijd).\n" -"\n" + +#: src/nice.c:82 +msgid " -n, --adjustment=N add integer N to the niceness (default 10)\n" +msgstr "" " -n, --adjustment=GETAL dit getal (standaard 10) optellen bij de " "beleefdheid\n" -"\n" -#: src/nice.c:168 +#: src/nice.c:172 #, c-format msgid "invalid adjustment %s" msgstr "ongeldige aanpassing %s" -#: src/nice.c:177 +#: src/nice.c:181 #, c-format msgid "a command must be given with an adjustment" msgstr "bij een aanpassing moet er een commando gegeven worden" -#: src/nice.c:184 src/nice.c:195 +#: src/nice.c:188 src/nice.c:199 #, c-format msgid "cannot get niceness" msgstr "kan de huidige beleefdheidswaarde niet verkrijgen" -#: src/nice.c:201 +#: src/nice.c:205 #, c-format msgid "cannot set niceness" msgstr "kan beleefdheidswaarde niet instellen" @@ -6653,19 +6657,17 @@ msgstr "kan beleefdheidswaarde niet instellen" msgid "Scott Bartram" msgstr "Scott Bartram" -#: src/nl.c:186 +#: src/nl.c:179 msgid "" "Write each FILE to standard output, with line numbers added.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" -"Elk gegeven BESTAND naar standaarduitvoer sturen, met regelnummers " +"Stuurt elk gegeven BESTAND naar standaarduitvoer, met regelnummers " "toegevoegd.\n" "\n" "Zonder BESTAND, of wanneer BESTAND - is, wordt standaardinvoer gelezen.\n" -"\n" -#: src/nl.c:194 +#: src/nl.c:186 msgid "" " -b, --body-numbering=STYLE use STYLE for numbering body lines\n" " -d, --section-delimiter=CC use CC for separating logical pages\n" @@ -6676,7 +6678,7 @@ msgstr "" "paginascheiding\n" " -f, --footer-numbering=STIJL stijl voor de nummering van voetregels\n" -#: src/nl.c:199 +#: src/nl.c:191 msgid "" " -h, --header-numbering=STYLE use STYLE for numbering header lines\n" " -i, --line-increment=NUMBER line number increment at each line\n" @@ -6698,7 +6700,7 @@ msgstr "" " -s, --number-separator=TEKST toe te voegen tekst na (mogelijk) " "regelnummer\n" -#: src/nl.c:207 +#: src/nl.c:199 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" @@ -6708,7 +6710,7 @@ msgstr "" " -w, --number-width=AANTAL aantal te gebruiken kolommen voor " "regelnummers\n" -#: src/nl.c:213 +#: src/nl.c:205 msgid "" "\n" "By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC are\n" @@ -6722,7 +6724,7 @@ msgstr "" "\n" "STIJL is één van:\n" -#: src/nl.c:219 +#: src/nl.c:211 msgid "" "\n" " a number all lines\n" @@ -6752,54 +6754,47 @@ msgstr "" " rz rechts uitgelijnd, met voorloopnullen\n" "\n" -#: src/nl.c:286 +#: src/nl.c:278 #, c-format msgid "line number overflow" msgstr "regelnummer loopt over" -#: src/nl.c:486 +#: src/nl.c:478 #, c-format msgid "invalid header numbering style: %s" msgstr "ongeldige stijl voor kopregelnummering: %s" -#: src/nl.c:494 +#: src/nl.c:486 #, c-format msgid "invalid body numbering style: %s" msgstr "ongeldige stijl voor regelnummers: %s" -#: src/nl.c:502 +#: src/nl.c:494 #, c-format msgid "invalid footer numbering style: %s" msgstr "ongeldige stijl voor voetregelnummering: %s" -#: src/nl.c:511 +#: src/nl.c:503 #, c-format msgid "invalid starting line number: %s" msgstr "ongeldig regelnummer voor beginregel: %s" -#: src/nl.c:517 -#, c-format -msgid "WARNING: --page-increment is deprecated; use --line-increment instead" -msgstr "" -"WAARSCHUWING: optie '--page-increment' is verouderd;\n" -"gebruik in plaats daarvan '--line-increment'" - -#: src/nl.c:524 +#: src/nl.c:512 #, c-format msgid "invalid line number increment: %s" msgstr "ongeldige ophoging voor regelnummers: %s" -#: src/nl.c:536 +#: src/nl.c:524 #, c-format msgid "invalid number of blank lines: %s" msgstr "ongeldig aantal lege regels: %s" -#: src/nl.c:550 +#: src/nl.c:538 #, c-format msgid "invalid line number field width: %s" msgstr "ongeldige veldbreedte voor regelnummer: %s" -#: src/nl.c:569 +#: src/nl.c:557 #, c-format msgid "invalid line numbering format: %s" msgstr "ongeldige opmaak voor nummering: %s" @@ -6850,11 +6845,6 @@ msgstr "kan standaardinvoer niet onbruikbaar maken" msgid "ignoring input" msgstr "invoer wordt genegeerd" -#: src/nohup.c:163 src/nohup.c:165 -#, c-format -msgid "failed to open %s" -msgstr "kan %s niet openen" - #: src/nohup.c:175 #, c-format msgid "ignoring input and appending output to %s" @@ -6889,18 +6879,18 @@ msgid "failed to redirect standard error" msgstr "kan standaardfoutuitvoer niet omleiden" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:32 +#: src/nproc.c:33 msgid "Giuseppe Scrivano" msgstr "Giuseppe Scrivano" -#: src/nproc.c:56 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 +#: src/nproc.c:57 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "" "Gebruik: %s [OPTIE...]\n" "\n" -#: src/nproc.c:57 +#: src/nproc.c:58 msgid "" "Print the number of processing units available to the current process,\n" "which may be less than the number of online processors\n" @@ -6911,7 +6901,7 @@ msgstr "" "dit kan minder zijn dan het aantal processoren dat online is.\n" "\n" -#: src/nproc.c:62 +#: src/nproc.c:63 msgid "" " --all print the number of installed processors\n" " --ignore=N if possible, exclude N processing units\n" @@ -6919,11 +6909,351 @@ msgstr "" " --all het aantal geïnstalleerde processoren tonen\n" " --ignore=N indien mogelijk, N processoreenheden uitsluiten\n" -#: src/nproc.c:106 +#: src/nproc.c:107 #, c-format 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 +msgid "Assaf Gordon" +msgstr "Assaf Gordon" + +#: src/numfmt.c:676 +#, c-format +msgid "value too large to be converted: '%s'" +msgstr "waarde is te groot om geconverteerd te kunnen worden: '%s'" + +#: src/numfmt.c:680 +#, c-format +msgid "invalid number: '%s'" +msgstr "ongeldig getal: '%s'" + +#: src/numfmt.c:684 +#, c-format +msgid "rejecting suffix in input: '%s' (consider using --from)" +msgstr "" + +#: src/numfmt.c:688 +#, c-format +msgid "invalid suffix in input: '%s'" +msgstr "ongeldig achtervoegsel in invoer: '%s'" + +#: src/numfmt.c:692 +#, c-format +msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)" +msgstr "" + +#: src/numfmt.c:723 +#, c-format +msgid "failed to prepare value '%Lf' for printing" +msgstr "voorbereiden van waarde '%Lf' voor tonen is mislukt" + +#: src/numfmt.c:787 +#, c-format +msgid "invalid unit size: '%s'" +msgstr "ongeldige eenheidsgrootte: %s" + +#: src/numfmt.c:802 src/numfmt.c:1025 src/numfmt.c:1032 +#, 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" + +#: src/numfmt.c:816 +#, fuzzy +msgid "" +"Reformat NUMBER(s), or the numbers from standard input if none are " +"specified.\n" +msgstr "xxx" + +#: src/numfmt.c:820 +#, fuzzy +msgid " --debug print warnings about invalid input\n" +msgstr "" +" --strict met '--check': met foutcode afsluiten bij ongeldige " +"invoer\n" + +#: src/numfmt.c:823 +msgid "" +" -d, --delimiter=X use X instead of whitespace for field delimiter\n" +msgstr "" + +#: src/numfmt.c:826 +msgid "" +" --field=N replace the number in input field N (default is 1)\n" +msgstr "" + +#: src/numfmt.c:829 +msgid "" +" --format=FORMAT use printf style floating-point FORMAT;\n" +" see FORMAT below for details\n" +msgstr "" + +#: src/numfmt.c:833 +msgid "" +" --from=UNIT auto-scale input numbers to UNITs; default is " +"'none';\n" +" see UNIT below\n" +msgstr "" + +#: src/numfmt.c:837 +msgid "" +" --from-unit=N specify the input unit size (instead of the default " +"1)\n" +msgstr "" + +#: src/numfmt.c:840 +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 "" + +#: src/numfmt.c:844 +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 +msgid "" +" --invalid=MODE failure mode for invalid numbers: MODE can be:\n" +" abort (default), fail, warn, ignore\n" +msgstr "" + +#: src/numfmt.c:852 +msgid "" +" --padding=N pad the output to N characters; positive N will\n" +" right-align; negative N will left-align;\n" +" padding is ignored if the output is wider than N;\n" +" the default is to automatically pad if a " +"whitespace\n" +" is found\n" +msgstr "" + +#: src/numfmt.c:859 +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 +msgid "" +" --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" +" SUFFIX in input numbers\n" +msgstr "" + +#: src/numfmt.c:867 +msgid "" +" --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" +msgstr "" + +#: src/numfmt.c:870 +msgid "" +" --to-unit=N the output unit size (instead of the default 1)\n" +msgstr "" + +#: src/numfmt.c:877 +#, fuzzy +msgid "" +"\n" +"UNIT options:\n" +msgstr "Andere opties:\n" + +#: src/numfmt.c:880 +msgid " none no auto-scaling is done; suffixes will trigger an error\n" +msgstr "" + +#: src/numfmt.c:883 +msgid "" +" auto accept optional single/two letter suffix:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" +msgstr "" + +#: src/numfmt.c:889 +msgid "" +" si accept optional single letter suffix:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:894 +msgid "" +" iec accept optional single letter suffix:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:899 +msgid "" +" iec-i accept optional two-letter suffix:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:905 +#, 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" +msgstr "" + +#: src/numfmt.c:912 +#, c-format +msgid "" +"\n" +"Exit status is 0 if all input numbers were successfully converted.\n" +"By default, %s will stop at the first conversion error with exit status 2.\n" +"With --invalid='fail' a warning is printed for each conversion error\n" +"and the exit status is 2. With --invalid='warn' each conversion error is\n" +"diagnosed, but the exit status is 0. With --invalid='ignore' conversion\n" +"errors are not diagnosed and the exit status is 0.\n" +msgstr "" + +#: src/numfmt.c:921 +#, c-format +msgid "" +"\n" +"Examples:\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" +msgstr "" + +#: src/numfmt.c:974 src/seq.c:212 +#, c-format +msgid "format %s has no %% directive" +msgstr "opmaakspecificatie %s bevat geen '%%'" + +#: src/numfmt.c:990 +#, c-format +msgid "invalid format %s (width overflow)" +msgstr "ongeldige opmaak %s (breedte is te groot)" + +#: src/numfmt.c:1007 src/seq.c:229 +#, c-format +msgid "format %s ends in %%" +msgstr "opmaakspecificatie %s eindigt in '%%'" + +#: src/numfmt.c:1010 +#, c-format +msgid "invalid format %s, directive must be %%['][-][N]f" +msgstr "" + +#: src/numfmt.c:1018 src/seq.c:236 +#, c-format +msgid "format %s has too many %% directives" +msgstr "opmaakspecificatie %s bevat te veel '%%'" + +#: src/numfmt.c:1070 +#, c-format +msgid "invalid suffix in input '%s': '%s'" +msgstr "ongeldig achtervoegsel in invoer '%s': '%s'" + +#: src/numfmt.c:1092 +#, c-format +msgid "value too large to be printed: '%Lg' (consider using --to)" +msgstr "" + +#: src/numfmt.c:1100 +#, c-format +msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" +msgstr "" + +#: src/numfmt.c:1184 +#, c-format +msgid "large input value '%s': possible precision loss" +msgstr "groote invoerwaarde '%s': mogelijk verlies van precisie" + +#: src/numfmt.c:1293 +#, 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 +#, c-format +msgid "invalid padding value '%s'" +msgstr "ongeldige opvulwaarde '%s'" + +#: src/numfmt.c:1401 +#, c-format +msgid "invalid field value '%s'" +msgstr "ongeldige veldwaarde '%s'" + +#: src/numfmt.c:1430 +#, c-format +msgid "invalid header value '%s'" +msgstr "ongeldige kopregelwaarde '%s'" + +#: src/numfmt.c:1456 +#, 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 +#, c-format +msgid "no conversion option specified" +msgstr "geen conversie-optie gegeven" + +#: src/numfmt.c:1471 +#, c-format +msgid "grouping cannot be combined with --to" +msgstr "groepering gaat niet samen met optie '--to'" + +#: src/numfmt.c:1473 +#, c-format +msgid "grouping has no effect in this locale" +msgstr "groepering heeft geen effect in deze taalregio" + +#: src/numfmt.c:1486 +#, c-format +msgid "--header ignored with command-line input" +msgstr "optie '--header' wordt genegeerd met invoer op de opdrachtregel" + +#: src/numfmt.c:1511 +#, c-format +msgid "error reading input" +msgstr "fout bij lezen van invoer" + +#: src/numfmt.c:1520 +#, c-format +msgid "failed to convert some of the input numbers" +msgstr "enkele van de invoergetallen zijn niet geconverteerd" + #: src/od.c:294 #, c-format msgid "" @@ -6955,14 +7285,30 @@ msgstr "" "\n" #: src/od.c:307 -msgid "All arguments to long options are mandatory for short options.\n" +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" +"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" +"at first byte printed, incremented when dump is progressing.\n" +"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 "" -"(Een verplicht argument bij een lange optie geldt ook voor de korte vorm.)\n" -"\n" +"Als niet '--traditional' gebruikt is, dan geldt de tweede vorm van " +"'Gebruik'\n" +"wanneer het laatste argument met een '+' begint of (bij twee argumenten) " +"met\n" +"een cijfer. Een POSITIE-argument betekent hetzelfde als '-j POSITIE'.\n" +"LABEL is een pseudo-adres voor de eerste getoonde byte, wordt tussen " +"haakjes\n" +"getoond, en wordt net als het echte adres opgehoogd tijdens de voortgang.\n" +"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:310 +#: src/od.c:318 +#, fuzzy msgid "" -" -A, --address-radix=RADIX decide how file offsets are printed\n" +" -A, --address-radix=RADIX output format for file offsets. RADIX is one\n" +" of [doxn], for Decimal, Octal, Hex or None\n" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" " -A, --address-radix=GROND te gebruiken grondtal voor adressen (o, d, x, " @@ -6970,15 +7316,17 @@ msgstr "" " -j, --skip-bytes=AANTAL dit aantal bytes aan begin van invoer " "overslaan\n" -#: src/od.c:314 +#: src/od.c:323 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" -" --traditional accept arguments in traditional form\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 " "invoer\n" @@ -6989,11 +7337,11 @@ msgstr "" "regelweglating\n" " -w, --width[=AANTAL] aantal te tonen bytes per uitvoerregel\n" " --traditional ook argumenten in traditionele vorm accepteren\n" -"\n" -#: src/od.c:324 +#: src/od.c:336 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" @@ -7001,13 +7349,14 @@ msgid "" " -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" " -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" " -d als '-t u2', decimale getallen van 2 bytes zonder teken tonen\n" -#: src/od.c:332 +#: src/od.c:345 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -7023,42 +7372,21 @@ 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:340 +#: src/od.c:353 msgid "" "\n" -"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" -"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" -"at first byte printed, incremented when dump is progressing.\n" -"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" -"Als niet '--traditional' gebruikt is, dan geldt de tweede vorm van " -"'Gebruik'\n" -"wanneer het laatste argument met een '+' begint of (bij twee argumenten) " -"met\n" -"een cijfer. Een POSITIE-argument betekent hetzelfde als '-j POSITIE'.\n" -"LABEL is een pseudo-adres voor de eerste getoonde byte, wordt tussen " -"haakjes\n" -"getoond, en wordt net als het echte adres opgehoogd tijdens de voortgang.\n" -"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:349 -msgid "" "\n" "TYPE is made up of one or more of these specifications:\n" -"\n" " a named character, ignoring high-order bit\n" " c ASCII 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:356 +#: src/od.c:360 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -7073,60 +7401,53 @@ msgstr "" " 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:363 +#: src/od.c:367 msgid "" "\n" -"SIZE is a number. For TYPE in doux, SIZE may also be C for\n" +"SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" "sizeof(char), S for sizeof(short), I for sizeof(int) or L for\n" "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" -"AANTAL is een getal. Als TYPE een van 'doux' is, dan mag AANTAL ook zijn:\n" +"AANTAL is een getal. Als TYPE een van [doux] is, dan mag AANTAL ook zijn:\n" "C voor sizeof(char), S voor sizeof(short), I voor sizeof(int), of L voor\n" "sizeof(long). Als TYPE 'f' is, mag AANTAL ook zijn: F voor sizeof(float),\n" "D voor sizeof(double), of L voor sizeof(long double). (De " "machineafhankelijke\n" "functie sizeof() geeft de lengte in bytes aan van de gegeven eenheid.)\n" -#: src/od.c:370 +#: src/od.c:374 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" +"Adding a z suffix to any type displays printable characters at the end of\n" +"each output line.\n" msgstr "" -"\n" -"GROND is d voor decimaal, o voor octaal, x voor hexadecimaal, of n voor " -"geen.\n" -"Met voorvoegsel 0x of 0X is AANTAL hexadecimaal; mogelijke " -"vermenigvuldigings-\n" -"achtervoegsels zijn: 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, Y.\n" -"Met een achtergevoegde z worden aan het eind van iedere regel met bytes de\n" -"corresponderende afdrukbare tekens toegevoegd.\n" -#: src/od.c:380 +#: src/od.c:379 +#, 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" +"\n" +"\n" +"BYTES is hex with 0x or 0X prefix, and may have a multiplier suffix:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"and so on for G, T, P, E, Z, Y.\n" msgstr "" -" \n" -"Optie '--string' zonder een getal betekent 3; '--width' zonder een getal\n" -"betekent 32. Standaard voor 'od' is '-A o -t oS -w16'.\n" +"\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" -#: src/od.c:633 src/od.c:753 +#: src/od.c:639 src/od.c:759 #, c-format msgid "invalid type string %s" msgstr "ongeldig type: %s" -#: src/od.c:643 +#: src/od.c:649 #, c-format msgid "" "invalid type string %s;\n" @@ -7135,7 +7456,7 @@ msgstr "" "ongeldig type: %s;\n" "dit systeem kent geen geheelgetaltype van %lu bytes " -#: src/od.c:764 +#: src/od.c:770 #, c-format msgid "" "invalid type string %s;\n" @@ -7144,37 +7465,37 @@ msgstr "" "ongeldig type: %s;\n" "dit systeem kent geen drijvendekommagetal van %lu bytes " -#: src/od.c:822 +#: src/od.c:828 #, c-format msgid "invalid character '%c' in type string %s" msgstr "ongeldig teken '%c' in opmaakreeks %s" -#: src/od.c:1047 +#: src/od.c:1053 #, c-format msgid "cannot skip past end of combined input" msgstr "kan niet voorbij het einde van de gecombineerde invoer springen" -#: src/od.c:1603 +#: src/od.c:1609 #, 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:1729 +#: src/od.c:1735 #, 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:1804 +#: src/od.c:1810 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:1825 +#: src/od.c:1831 #, 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:1868 +#: src/od.c:1874 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "waarschuwing: ongeldige breedte %lu; zal %d gebruiken" @@ -7194,17 +7515,14 @@ 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" -"\n" msgstr "" -"De overeenkomstige regels uit de gegeven BESTANDen scheiden met tabs en " -"naar\n" -"naar standaarduitvoer sturen -- oftewel: de bestanden als kolommen " -"samenvoegen.\n" +"Scheidt de overeenkomstige regels uit de gegeven BESTANDen met tabs en " +"stuurt\n" +"ze naar standaarduitvoer -- oftewel: voegt de bestanden als kolommen samen.\n" "\n" "Zonder BESTAND, of wanneer BESTAND - is, wordt standaardinvoer gelezen.\n" -"\n" -#: src/paste.c:448 +#: 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" @@ -7213,7 +7531,7 @@ msgstr "" " -s, --serial de bestanden als rijen samenvoegen\n" "\n" -#: src/paste.c:509 +#: src/paste.c:508 #, c-format msgid "delimiter list ends with an unescaped backslash: %s" msgstr "lijst met scheidingstekens eindigt met onaangehaalde backslash: %s" @@ -7275,85 +7593,85 @@ msgid "Kaveh Ghazi" msgstr "Kaveh Ghazi" #. TRANSLATORS: Real name is unknown; at most 19 characters. -#: src/pinky.c:250 +#: src/pinky.c:242 msgid " ???" msgstr " ???" # Als de echte naam op het systeem niet bestaat. #. TRANSLATORS: Idle time is unknown; at most 5 characters. -#: src/pinky.c:274 +#: src/pinky.c:266 msgid "?????" msgstr "(onbekend)" -#: src/pinky.c:323 +#: src/pinky.c:314 #, c-format msgid "Login name: " msgstr "Gebruikersnaam: " -#: src/pinky.c:326 +#: src/pinky.c:317 #, c-format msgid "In real life: " msgstr "Echte naam: " # Als de echte naam op het systeem niet bestaat. #. TRANSLATORS: Real name is unknown; no hard limit. -#: src/pinky.c:330 +#: src/pinky.c:321 msgid "???\n" msgstr "(onbekend)\n" -#: src/pinky.c:350 +#: src/pinky.c:341 #, c-format msgid "Directory: " msgstr "Map: " -#: src/pinky.c:352 +#: src/pinky.c:343 #, c-format msgid "Shell: " msgstr "Shell: " -#: src/pinky.c:371 +#: src/pinky.c:362 #, c-format msgid "Project: " msgstr "Project: " -#: src/pinky.c:395 +#: src/pinky.c:386 #, c-format msgid "Plan:\n" msgstr "Plan:\n" # Dit mag maximaal 8 tekens zijn, vandaar de samendrukking. -#: src/pinky.c:414 +#: src/pinky.c:405 msgid "Login" msgstr "Gbruikr" -#: src/pinky.c:416 +#: src/pinky.c:407 msgid "Name" msgstr "Volledige naam" -#: src/pinky.c:417 +#: src/pinky.c:408 msgid " TTY" msgstr " TTY" # Het aantal minuten inactiviteit; maximaal 6 tekens. -#: src/pinky.c:419 +#: src/pinky.c:410 msgid "Idle" msgstr "Ledig" # Aanmeldingstijd. -#: src/pinky.c:420 +#: src/pinky.c:411 msgid "When" msgstr "Ingelogd" -#: src/pinky.c:423 +#: src/pinky.c:414 msgid "Where" msgstr "Waar" -#: src/pinky.c:502 +#: src/pinky.c:493 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Gebruik: %s [OPTIE...] [GEBRUIKER...]\n" -#: src/pinky.c:503 +#: src/pinky.c:494 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7369,7 +7687,7 @@ msgstr "" " -p het planbestand weglaten in de lange uitvoer\n" " -s de korte uitvoer tonen (standaard)\n" -#: src/pinky.c:511 +#: src/pinky.c:502 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7384,7 +7702,7 @@ msgstr "" "uitvoer\n" "\n" -#: src/pinky.c:520 +#: src/pinky.c:511 #, c-format msgid "" "\n" @@ -7395,7 +7713,7 @@ msgstr "" "Een lichtgewicht 'finger'-programma dat gebruikersinformatie toont.\n" "Het geraadpleegde 'utmp'-bestand is %s.\n" -#: src/pinky.c:604 +#: src/pinky.c:595 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "" @@ -7411,87 +7729,84 @@ msgstr "Pete TerMaat" msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:912 +#: src/pr.c:908 #, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "ontbrekend argument in '--pages=EERSTE[:LAATSTE]'" -#: src/pr.c:914 +#: src/pr.c:910 #, c-format msgid "invalid page range %s" msgstr "ongeldige paginareeks %s" -#: src/pr.c:979 +#: src/pr.c:975 #, c-format msgid "'-l PAGE_LENGTH' invalid number of lines: %s" msgstr "'-l PAGINALENGTE', ongeldig aantal regels: %s" -#: src/pr.c:1003 +#: src/pr.c:999 #, c-format msgid "'-N NUMBER' invalid starting line number: %s" msgstr "'-N AANTAL', ongeldig beginregelnummer: %s" -#: src/pr.c:1015 +#: src/pr.c:1011 #, c-format msgid "'-o MARGIN' invalid line offset: %s" msgstr "'-o MARGE', ongeldige regelpositie: %s" -#: src/pr.c:1056 +#: src/pr.c:1052 #, c-format msgid "'-w PAGE_WIDTH' invalid number of characters: %s" msgstr "'-w PAGINABREEDTE', ongeldig aantal tekens: %s" -#: src/pr.c:1070 +#: src/pr.c:1066 #, c-format msgid "'-W PAGE_WIDTH' invalid number of characters: %s" msgstr "'-W PAGINABREEDTE', ongeldig aantal tekens: %s" -#: src/pr.c:1100 +#: src/pr.c:1096 #, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "" "bij horizontaal afdrukken kan het aantal kolommen niet worden opgegeven" -#: src/pr.c:1104 +#: src/pr.c:1100 #, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "kan niet zowel verticaal als horizontaal afdrukken" -#: src/pr.c:1200 +#: src/pr.c:1196 #, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "'-%c', overtollige tekens of ongeldig getal in het argument: %s" -#: src/pr.c:1304 +#: src/pr.c:1293 #, c-format msgid "page width too narrow" msgstr "te smalle paginabreedte" -#: src/pr.c:2369 +#: src/pr.c:2353 #, c-format msgid "starting page number %<PRIuMAX> exceeds page count %<PRIuMAX>" msgstr "" "startpaginanummer %<PRIuMAX> is hoger dan het aantal pagina's %<PRIuMAX>" -#: src/pr.c:2396 +#: src/pr.c:2380 #, c-format msgid "page number overflow" msgstr "paginanummer loopt over" -#: src/pr.c:2401 +#: src/pr.c:2385 #, c-format msgid "Page %<PRIuMAX>" msgstr "Pagina %<PRIuMAX>" -#: src/pr.c:2773 -msgid "" -"Paginate or columnate FILE(s) for printing.\n" -"\n" +#: src/pr.c:2757 +msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" -"Van de gegeven BESTAND(en) pagina's of kolommen maken om af te drukken.\n" -"\n" +"Maakt van de gegeven BESTAND(en) pagina's of kolommen, om ze af te drukken.\n" -#: src/pr.c:2780 +#: src/pr.c:2763 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -7508,7 +7823,7 @@ msgstr "" " tenzij '-a' gegeven is; het aantal regels per kolom\n" " voor elke pagina gelijk houden\n" -#: src/pr.c:2788 +#: src/pr.c:2771 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7525,7 +7840,7 @@ msgstr "" " -d, --double-space\n" " tussen elk paar regels een lege regel toevoegen\n" -#: src/pr.c:2796 +#: src/pr.c:2779 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7549,7 +7864,7 @@ msgstr "" "regels\n" " en geen paginavoet printen\n" -#: src/pr.c:2806 +#: src/pr.c:2789 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -7574,7 +7889,7 @@ msgstr "" " van '-W' uit; kolommen worden niet uitgelijnd;\n" " '--sep-string[=TEKST]' stelt scheidingstekens in\n" -#: src/pr.c:2815 +#: src/pr.c:2798 msgid "" " -l, --length=PAGE_LENGTH\n" " set the page length to PAGE_LENGTH (66) lines\n" @@ -7589,7 +7904,7 @@ msgstr "" " -m, --merge de bestanden naast elkaar printen, elk in een kolom;\n" " lange regels afkappen, tenzij '-J' gegeven is\n" -#: src/pr.c:2822 +#: src/pr.c:2805 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -7608,7 +7923,7 @@ msgstr "" "regel\n" " op de eerste te printen pagina (zie +EERSTEPAGINA)\n" -#: src/pr.c:2830 +#: src/pr.c:2813 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -7626,7 +7941,7 @@ msgstr "" " geen waarschuwing geven als bestand niet geopend kan " "worden\n" -#: src/pr.c:2837 +#: src/pr.c:2820 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -7643,7 +7958,7 @@ msgstr "" " drie kolomopties ('-KOLOMMEN'|'-a -KOLOMMEN'|'-m')\n" " behalve als ook '-w' gegeven is\n" -#: src/pr.c:2844 +#: src/pr.c:2827 msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" @@ -7661,7 +7976,7 @@ msgstr "" "kolomopties\n" " -t, --omit-header paginakop- en voetteksten weglaten\n" -#: src/pr.c:2851 +#: src/pr.c:2834 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -7685,7 +8000,7 @@ msgstr "" " tekstkolommen; -s[TEKEN] schakelt de standaardbreedte " "uit\n" -#: src/pr.c:2861 +#: src/pr.c:2844 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -7698,7 +8013,7 @@ msgstr "" " lange regels afkappen, tenzij '-J' gegeven is;\n" " '-S' en '-s' hebben geen invloed\n" -#: src/pr.c:2869 +#: src/pr.c:2852 msgid "" "\n" "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" @@ -7863,13 +8178,11 @@ msgstr "" msgid "" "Output a permuted index, including context, of the words in the input " "files.\n" -"\n" msgstr "" -"Een gepermuteerde index produceren, inclusief context,\n" +"Produceert een gepermuteerde index, inclusief context,\n" "van de woorden in de invoerbestanden.\n" -"\n" -#: src/ptx.c:1828 +#: src/ptx.c:1827 msgid "" " -A, --auto-reference output automatically generated references\n" " -G, --traditional behave more like System V 'ptx'\n" @@ -7879,7 +8192,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:1833 +#: src/ptx.c:1832 msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" " -O, --format=roff generate output as roff directives\n" @@ -7894,7 +8207,7 @@ msgstr "" "zinnen\n" " -T, --format=tex als uitvoer 'TeX'-directieven produceren\n" -#: src/ptx.c:1840 +#: src/ptx.c:1839 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -7910,7 +8223,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:1848 +#: src/ptx.c:1847 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -7924,7 +8237,7 @@ msgstr "" "referentie\n" "\n" -#: src/ptx.c:1855 +#: src/ptx.c:1854 msgid "" "\n" "With no FILE or if FILE is -, read Standard Input. '-F /' by default.\n" @@ -7933,7 +8246,7 @@ msgstr "" "Zonder BESTAND, of wanneer BESTAND - is, wordt standaardinvoer gelezen.\n" "Optie '-F /' is standaard.\n" -#: src/ptx.c:1949 +#: src/ptx.c:1948 #, c-format msgid "invalid gap width: %s" msgstr "ongeldige breedte van tussenruimte: %s" @@ -7960,7 +8273,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "kan niet naar map %s gaan" -#: src/pwd.c:170 src/pwd.c:277 +#: src/pwd.c:170 src/pwd.c:277 src/split.c:373 #, c-format msgid "failed to stat %s" msgstr "kan status van %s niet opvragen" @@ -7976,15 +8289,16 @@ msgid "ignoring non-option arguments" msgstr "argumenten die geen optie zijn worden genegeerd" #. This is a proper name. See the gettext manual, section Names. -#: src/readlink.c:33 +#: src/readlink.c:32 msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 +#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147 +#: src/stat.c:1349 src/touch.c:212 #, c-format -msgid "Usage: %s [OPTION]... FILE\n" +msgid "Usage: %s [OPTION]... FILE...\n" msgstr "" -"Gebruik: %s [OPTIE...] KOPPELINGSNAAM\n" +"Gebruik: %s [OPTIE...] BESTAND...\n" "\n" #: src/readlink.c:63 @@ -8015,16 +8329,19 @@ 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 " "recursively,\n" " without requirements on components " "existence\n" -" -n, --no-newline do not output the trailing newline\n" +" -n, --no-newline do not output the trailing delimiter\n" " -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" msgstr "" " -m, --canonicalize-missing canoniek maken door elke koppeling in elke\n" " component van het pad recursief te volgen;\n" @@ -8036,13 +8353,10 @@ msgstr "" " -v, --verbose meer foutmeldingen tonen\n" "\n" -#: src/realpath.c:71 src/rm.c:134 src/shred.c:147 src/stat.c:1330 -#: src/touch.c:215 +#: src/readlink.c:152 #, c-format -msgid "Usage: %s [OPTION]... FILE...\n" -msgstr "" -"Gebruik: %s [OPTIE...] BESTAND...\n" -"\n" +msgid "ignoring --no-newline with multiple arguments" +msgstr "optie '--no-newline' met meerdere argumenten wordt genegeerd" #: src/realpath.c:72 msgid "" @@ -8087,12 +8401,12 @@ msgstr "" msgid "generating relative path" msgstr "aanmaken van relatief pad" -#: src/remove.c:286 +#: src/remove.c:273 #, c-format msgid "%s: descend into write-protected directory %s? " msgstr "%s: afdalen in voor schrijven beschermde map %s? " -#: src/remove.c:287 +#: src/remove.c:274 #, c-format msgid "%s: descend into directory %s? " msgstr "%s: afdalen in map %s? " @@ -8101,37 +8415,37 @@ msgstr "%s: afdalen in map %s? " #. translate "%s: remove %s (write-protected) %s? " #. instead. It should avoid grammatical problems #. with the output of file_type. -#: src/remove.c:303 +#: src/remove.c:290 #, c-format msgid "%s: remove write-protected %s %s? " msgstr "%s: %s %s (schrijfbeveiligd) verwijderen? " -#: src/remove.c:304 +#: src/remove.c:291 #, c-format msgid "%s: remove %s %s? " msgstr "%s: %s %s verwijderen? " -#: src/remove.c:417 +#: src/remove.c:374 #, c-format msgid "removed directory: %s\n" msgstr "map %s is verwijderd\n" -#: src/remove.c:481 +#: src/remove.c:444 #, c-format msgid "cannot remove directory: %s" msgstr "kan map %s niet verwijderen" -#: src/remove.c:537 +#: src/remove.c:500 #, 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:557 +#: src/remove.c:520 #, c-format msgid "traversal failed: %s" msgstr "doorlopen is mislukt: %s" -#: src/remove.c:563 +#: src/remove.c:526 #, c-format msgid "" "unexpected failure: fts_info=%d: %s\n" @@ -8140,12 +8454,12 @@ msgstr "" "onverwachte fout: fts_info=%d: %s\n" "gaarne rapporteren aan %s" -#: src/rm.c:118 +#: src/rm.c:119 #, c-format msgid "Try '%s ./%s' to remove the file %s.\n" msgstr "Typ '%s ./%s' om het bestand %s te verwijderen.\n" -#: src/rm.c:135 +#: src/rm.c:136 msgid "" "Remove (unlink) the FILE(s).\n" "\n" @@ -8159,7 +8473,7 @@ msgstr "" "stellen\n" " -i voor elke verwijdering om bevestiging vragen\n" -#: src/rm.c:141 +#: src/rm.c:142 msgid "" " -I prompt once before removing more than three files, " "or\n" @@ -8183,7 +8497,7 @@ msgstr "" " of 'always' (-i); zonder WANNEER altijd " "vragen\n" -#: src/rm.c:148 +#: src/rm.c:149 msgid "" " --one-file-system when removing a hierarchy recursively, skip any\n" " directory that is on a file system different from\n" @@ -8193,20 +8507,21 @@ msgstr "" " zich op een ander bestandssysteem bevinden dan\n" " het bijbehorende opdrachtregelargument\n" -#: src/rm.c:153 +#: src/rm.c:154 msgid "" " --no-preserve-root do not treat '/' specially\n" " --preserve-root do not remove '/' (default)\n" " -r, -R, --recursive remove directories and their contents recursively\n" +" -d, --dir remove empty directories\n" " -v, --verbose explain what is being done\n" msgstr "" " --no-preserve-root '/' niet speciaal behandelen\n" " --preserve-root op '/' niet recursief werken (standaard)\n" " -r, -R, --recursive mappen en hun inhoud recursief verwijderen\n" +" -d, --dir lege mappen verwijderen\n" " -v, --verbose tonen wat er gedaan wordt\n" -"\n" -#: src/rm.c:161 +#: src/rm.c:163 msgid "" "\n" "By default, rm does not remove directories. Use the --recursive (-r or -R)\n" @@ -8217,7 +8532,7 @@ msgstr "" "Standaard verwijdert 'rm' geen mappen. Gebruik de optie '--recursive'\n" "('-r' of '-R') om ook iedere genoemde map en diens inhoud te verwijderen.\n" -#: src/rm.c:166 +#: src/rm.c:168 #, c-format msgid "" "\n" @@ -8233,7 +8548,7 @@ msgstr "" " %s -- -foo\n" " %s ./-foo\n" -#: src/rm.c:175 +#: src/rm.c:177 msgid "" "\n" "Note that if you use rm to remove a file, it might be possible to recover\n" @@ -8246,12 +8561,12 @@ msgstr "" "zekerheid wilt over de onherstelbaarheid van de inhoud, gebruik dan " "'shred'.\n" -#: src/rm.c:335 +#: src/rm.c:342 #, c-format msgid "%s: remove all arguments recursively? " msgstr "%s: alle argumenten recursief verwijderen? " -#: src/rm.c:336 +#: src/rm.c:343 #, c-format msgid "%s: remove all arguments? " msgstr "%s: alle argumenten verwijderen? " @@ -8312,7 +8627,15 @@ msgstr "" msgid "" "Run a program in a different 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" "\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" " -t, --type=TYPE type (for same role as parent)\n" @@ -8321,10 +8644,6 @@ msgid "" " -l, --range=RANGE levelrange\n" "\n" msgstr "" -"Het gegeven COMMANDO in een andere beveiligingscontext uitvoeren.\n" -"Zonder CONTEXT of COMMANDO, de huidige beveiligingscontext tonen.\n" -"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" @@ -8332,72 +8651,72 @@ msgstr "" " -u, --user=GEBRUIKER te gebruiken gebruikersidentiteit\n" "\n" -#: src/runcon.c:140 +#: src/runcon.c:144 #, c-format msgid "multiple roles" msgstr "meerdere rollen gegeven" -#: src/runcon.c:145 +#: src/runcon.c:149 #, c-format msgid "multiple types" msgstr "meerdere typen gegeven" -#: src/runcon.c:150 +#: src/runcon.c:154 #, c-format msgid "multiple users" msgstr "meerdere gebruikers gegeven" -#: src/runcon.c:155 +#: src/runcon.c:159 #, c-format msgid "multiple levelranges" msgstr "meerdere niveaubereiken gegeven" -#: src/runcon.c:173 src/runcon.c:209 +#: src/runcon.c:177 src/runcon.c:213 #, c-format msgid "failed to get current context" msgstr "kan de huidige context niet verkrijgen" -#: src/runcon.c:183 +#: src/runcon.c:187 #, c-format msgid "you must specify -c, -t, -u, -l, -r, or context" msgstr "u moet -c, -l, -r, -t, -u, of een context opgeven" -#: src/runcon.c:191 +#: src/runcon.c:195 #, c-format msgid "no command specified" msgstr "geen commando gegeven" -#: src/runcon.c:197 +#: src/runcon.c:201 #, 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:223 +#: src/runcon.c:227 #, c-format msgid "failed to compute a new context" msgstr "kan geen nieuwe context berekenen" -#: src/runcon.c:237 +#: src/runcon.c:241 #, c-format msgid "failed to set new user %s" msgstr "kan nieuwe gebruiker %s niet instellen" -#: src/runcon.c:239 +#: src/runcon.c:243 #, c-format msgid "failed to set new type %s" msgstr "kan nieuw type %s niet instellen" -#: src/runcon.c:241 +#: src/runcon.c:245 #, c-format msgid "failed to set new range %s" msgstr "kan nieuw bereik %s niet instellen" -#: src/runcon.c:243 +#: src/runcon.c:247 #, c-format msgid "failed to set new role %s" msgstr "kan nieuwe rol %s niet instellen" -#: src/runcon.c:251 +#: src/runcon.c:255 #, c-format msgid "unable to set security context %s" msgstr "kan beveiligingscontext %s niet instellen" @@ -8415,23 +8734,22 @@ msgstr "" "\n" #: src/seq.c:73 +msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" +msgstr "Toont de getallen van EERSTE tot LAATSTE, met stapgrootte STAP.\n" + +#: src/seq.c:79 msgid "" -"Print numbers from FIRST to LAST, in steps of INCREMENT.\n" -"\n" " -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 "" -"De getallen van EERSTE tot LAATSTE tonen, met stapgrootte STAP.\n" -"\n" " -f, --format=OPMAAK te gebruiken drijvendekomma-opmaak (als bij " "'printf')\n" " -s, --separator=TEKST te gebruiken getallenscheiding (standaard: \\n)\n" " -w, --equal-width breedte gelijkmaken door toevoegen van " "voorloopnullen\n" -"\n" -#: src/seq.c:82 +#: src/seq.c:86 msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" @@ -8448,7 +8766,7 @@ msgstr "" "en negatief als EERSTE kleiner is dan LAATSTE.\n" "\n" -#: src/seq.c:90 +#: src/seq.c:94 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" @@ -8459,32 +8777,17 @@ 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:136 +#: src/seq.c:140 #, c-format msgid "invalid floating point argument: %s" msgstr "ongeldig drijvendekomma-argument: %s" -#: src/seq.c:193 -#, c-format -msgid "format %s has no %% directive" -msgstr "opmaakspecificatie %s bevat geen '%%'" - -#: src/seq.c:210 -#, c-format -msgid "format %s ends in %%" -msgstr "opmaakspecificatie %s eindigt in '%%'" - -#: src/seq.c:213 +#: src/seq.c:232 #, c-format msgid "format %s has unknown %%%c directive" msgstr "opmaakspecificatie %s bevat onbekende '%%%c'" -#: src/seq.c:217 -#, c-format -msgid "format %s has too many %% directives" -msgstr "opmaakspecificatie %s bevat te veel '%%'" - -#: src/seq.c:431 +#: src/seq.c:555 #, 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" @@ -8530,27 +8833,27 @@ msgstr "" " (indien gegeven) aanvullende groeps-ID's op GID1,...\n" "\n" -#: src/setuidgid.c:163 +#: src/setuidgid.c:162 #, c-format msgid "unknown user-ID: %s" msgstr "onbekend gebruikers-ID: %s" -#: src/setuidgid.c:174 +#: 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:191 +#: src/setuidgid.c:190 #, c-format msgid "failed to set supplemental group(s)" msgstr "kan geen aanvullende groep(en) instellen" -#: src/setuidgid.c:201 +#: src/setuidgid.c:200 #, c-format msgid "cannot set group-ID to %lu" msgstr "kan groeps-ID niet op %lu instellen" -#: src/setuidgid.c:205 +#: src/setuidgid.c:204 #, c-format msgid "cannot set user-ID to %lu" msgstr "kan gebruikers-ID niet op %lu instellen" @@ -8564,13 +8867,11 @@ msgstr "Colin Plumb" 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" -"\n" msgstr "" -"Gegeven BESTAND(en) meerdere malen overschrijven, om het zelfs voor heel\n" +"Overschrijft gegeven BESTAND(en) meerdere malen, om het zelfs voor heel\n" "dure apparatuur moeilijk te maken de inhoud ervan te herstellen.\n" -"\n" -#: src/shred.c:156 +#: src/shred.c:155 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -8586,7 +8887,7 @@ msgstr "" " -s, --size=N dit aantal bytes vernietigen (achtervoegsels als K, M, G " "mogen)\n" -#: src/shred.c:162 +#: src/shred.c:161 msgid "" " -u, --remove truncate and remove file after overwriting\n" " -v, --verbose show progress\n" @@ -8602,7 +8903,7 @@ msgstr "" "verhullen\n" "\n" -#: src/shred.c:171 +#: src/shred.c:170 msgid "" "\n" "If FILE is -, shred standard output.\n" @@ -8624,7 +8925,7 @@ msgstr "" "meeste mensen de optie '--remove'.\n" "\n" -#: src/shred.c:181 +#: src/shred.c:180 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" @@ -8641,7 +8942,7 @@ msgstr "" "niet gegarandeerd dat het werkt in elke modus van het bestandssysteem:\n" "\n" -#: src/shred.c:189 +#: src/shred.c:188 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -8663,7 +8964,7 @@ msgstr "" "Appliance\n" "\n" -#: src/shred.c:199 +#: src/shred.c:198 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -8677,7 +8978,7 @@ msgstr "" "* gecomprimeerde bestandssystemen\n" "\n" -#: src/shred.c:206 +#: src/shred.c:205 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" @@ -8702,7 +9003,7 @@ msgstr "" "zoals gedocumenteerd in de man-pagina van mount ('man mount').\n" "\n" -#: src/shred.c:216 +#: src/shred.c:215 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" @@ -8712,124 +9013,124 @@ 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:296 +#: src/shred.c:295 #, c-format msgid "%s: fdatasync failed" msgstr "" "%s: synchronisatie van data in geheugen en op schijf (fdatasync) is mislukt" -#: src/shred.c:307 +#: src/shred.c:306 #, c-format msgid "%s: fsync failed" msgstr "" "%s: synchronisatie van data in geheugen en op schijf (fsync) is mislukt" -#: src/shred.c:384 +#: src/shred.c:383 #, c-format msgid "%s: cannot rewind" msgstr "%s: kan niet terugspoelen" -#: src/shred.c:403 +#: src/shred.c:402 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: doorloop %lu/%lu (%s)..." -#: src/shred.c:453 +#: src/shred.c:452 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: fout tijdens schrijven op positie %s" -#: src/shred.c:471 +#: src/shred.c:470 #, c-format msgid "%s: lseek failed" msgstr "%s: 'lseek' is mislukt" -#: src/shred.c:482 +#: src/shred.c:481 #, c-format msgid "%s: file too large" msgstr "%s: bestand is te groot" -#: src/shred.c:505 +#: src/shred.c:504 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: doorloop %lu/%lu (%s)...%s" -#: src/shred.c:521 +#: src/shred.c:520 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: doorloop %lu/%lu (%s)...%s/%s %d%%" -#: src/shred.c:768 +#: src/shred.c:767 #, c-format msgid "%s: fstat failed" msgstr "%s: opvragen van bestandsstatus is mislukt" -#: src/shred.c:779 +#: src/shred.c:778 #, c-format msgid "%s: invalid file type" msgstr "%s: ongeldig bestandstype" -#: src/shred.c:798 +#: src/shred.c:797 #, c-format msgid "%s: file has negative size" msgstr "%s: bestand heeft een negatieve grootte" -#: src/shred.c:865 +#: src/shred.c:864 src/sort.c:932 src/split.c:378 #, c-format msgid "%s: error truncating" msgstr "%s: fout bij inkorten" -#: src/shred.c:881 +#: src/shred.c:880 #, c-format msgid "%s: fcntl failed" msgstr "%s: manipuleren van bestandsdescriptor is mislukt" -#: src/shred.c:886 +#: src/shred.c:885 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "%s: kan een alleen-toevoegen-bestand niet vernietigen" -#: src/shred.c:968 +#: src/shred.c:967 #, c-format msgid "%s: removing" msgstr "verwijderen van %s" -#: src/shred.c:992 +#: src/shred.c:991 #, c-format msgid "%s: renamed to %s" msgstr "%s is hernoemd tot %s" -#: src/shred.c:1014 +#: src/shred.c:1013 #, c-format msgid "%s: failed to remove" msgstr "verwijderen van %s is mislukt" -#: src/shred.c:1018 +#: src/shred.c:1017 #, c-format msgid "%s: removed" msgstr "%s is verwijderd" -#: src/shred.c:1025 src/shred.c:1068 +#: src/shred.c:1024 src/shred.c:1067 #, c-format msgid "%s: failed to close" msgstr "sluiten van %s is mislukt" -#: src/shred.c:1061 +#: src/shred.c:1060 #, c-format msgid "%s: failed to open for writing" msgstr "openen voor schrijven van %s is mislukt" -#: src/shred.c:1126 +#: src/shred.c:1125 #, c-format msgid "%s: invalid number of passes" msgstr "ongeldig aantal doorlopen: %s" -#: src/shred.c:1135 src/shuf.c:291 src/sort.c:4387 +#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441 #, c-format msgid "multiple random sources specified" msgstr "meer dan één bron van willekeurige bytes gegeven" -#: src/shred.c:1149 +#: src/shred.c:1148 #, c-format msgid "%s: invalid file size" msgstr "ongeldige bestandsgrootte: %s" @@ -8847,15 +9148,12 @@ msgstr "" "\n" #: src/shuf.c:54 -msgid "" -"Write a random permutation of the input lines to standard output.\n" -"\n" +msgid "Write a random permutation of the input lines to standard output.\n" msgstr "" -"Een willekeurige husseling van de invoerregels naar standaarduitvoer " -"sturen.\n" -"\n" +"Stuurt een willekeurige husseling van de invoerregels naar " +"standaarduitvoer.\n" -#: src/shuf.c:61 +#: src/shuf.c:60 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,27 +9173,27 @@ msgstr "" " -z, --zero-terminated regels afsluiten met 0-byte, niet met " "nieuweregel\n" -#: src/shuf.c:245 +#: src/shuf.c:244 #, c-format msgid "multiple -i options specified" msgstr "meer dan één optie '-i' gegeven" -#: src/shuf.c:265 +#: src/shuf.c:264 #, c-format msgid "invalid input range %s" msgstr "ongeldig invoerbereik: %s" -#: src/shuf.c:278 +#: src/shuf.c:277 #, c-format msgid "invalid line count %s" msgstr "ongeldig aantal regels: %s" -#: src/shuf.c:285 src/sort.c:4381 +#: src/shuf.c:284 src/sort.c:4435 #, c-format msgid "multiple output files specified" msgstr "meer dan één uitvoerbestand gegeven" -#: src/shuf.c:311 +#: src/shuf.c:310 #, c-format msgid "cannot combine -e and -i options" msgstr "opties '-e' en '-i' gaan niet samen" @@ -8924,7 +9222,7 @@ msgstr "" "er gepauzeerd gedurende een tijd die de som is van de waarden.\n" "\n" -#: src/sleep.c:135 src/timeout.c:295 +#: src/sleep.c:135 src/timeout.c:320 #, c-format msgid "invalid time interval %s" msgstr "ongeldig tijdsinterval: %s" @@ -8934,21 +9232,19 @@ msgstr "ongeldig tijdsinterval: %s" msgid "cannot read realtime clock" msgstr "kan de realtime-klok niet lezen" -#: src/sort.c:395 -msgid "" -"Write sorted concatenation of all FILE(s) to standard output.\n" -"\n" +#: src/sort.c:399 +msgid "Write sorted concatenation of all FILE(s) to standard output.\n" msgstr "" -"Gegeven BESTAND(en) samenvoegen en gesorteerd naar standaarduitvoer sturen.\n" -"\n" +"Stuurt gegeven BESTAND(en samengevoegd en) gesorteerd naar " +"standaarduitvoer.\n" -#: src/sort.c:402 +#: src/sort.c:405 msgid "" "Ordering options:\n" "\n" msgstr "Sorteeropties:\n" -#: src/sort.c:406 +#: src/sort.c:409 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -8960,7 +9256,7 @@ msgstr "" "beschouwen\n" " -f, --ignore-case kleine letters als hoofdletters beschouwen\n" -#: src/sort.c:412 +#: src/sort.c:415 msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" " -i, --ignore-nonprinting consider only printable characters\n" @@ -8971,13 +9267,13 @@ msgstr "" " -i, --ignore-nonprinting alleen afdrukbare tekens beschouwen\n" " -M, --month-sort ordenen: (onbekend) < 'JAN' < ... < 'DEC'\n" -#: src/sort.c:417 +#: src/sort.c:420 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:420 +#: src/sort.c:423 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -8989,7 +9285,7 @@ msgstr "" " --random-source=BSTND willekeurige bytes uit dit bestand halen\n" " -r, --reverse het resultaat van de vergelijking omkeren\n" -#: src/sort.c:426 +#: src/sort.c:429 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -9008,13 +9304,13 @@ msgstr "" "sorteren\n" "\n" -#: src/sort.c:434 +#: src/sort.c:437 msgid "" "Other options:\n" "\n" msgstr "Andere opties:\n" -#: src/sort.c:438 +#: src/sort.c:441 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" @@ -9023,7 +9319,7 @@ msgstr "" "samenvoegen;\n" " bij meer, tijdelijke bestanden gebruiken\n" -#: src/sort.c:442 +#: src/sort.c:445 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 " @@ -9038,7 +9334,7 @@ msgstr "" " --compress-program=PROG tijdelijke bestanden met PROG comprimeren;\n" " decomprimeren met 'PROG -d'\n" -#: src/sort.c:449 +#: src/sort.c:452 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -9056,7 +9352,7 @@ msgstr "" " '-' is, dan de namen van standaardinvoer " "lezen\n" -#: src/sort.c:456 +#: src/sort.c:459 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 +9363,7 @@ msgstr "" " -m, --merge gesorteerde bestanden samenvoegen; niet " "sorteren\n" -#: src/sort.c:460 +#: src/sort.c:463 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -9081,7 +9377,7 @@ msgstr "" " noodvergelijking als niets werkt\n" " -S, --buffer-size=GROOTTE te gebruiken grootte voor hoofdgeheugenbuffer\n" -#: src/sort.c:466 +#: src/sort.c:469 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -9107,14 +9403,14 @@ msgstr "" "tonen;\n" " met '-c': op strikte ordening controleren\n" -#: src/sort.c:475 +#: 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:480 +#: src/sort.c:483 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -9151,7 +9447,7 @@ msgstr "" "\n" "GROOTTE mag gevolgd worden door een vermenigvuldigingsachtervoegsel:\n" -#: src/sort.c:493 +#: src/sort.c:496 msgid "" "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n" "\n" @@ -9170,266 +9466,268 @@ msgstr "" "sorteervolgorde. Stel 'LC_ALL=C' in voor de traditionele sorteervolgorde\n" "die de gewone bytewaarde gebruikt.\n" -#: src/sort.c:694 +#: src/sort.c:697 #, c-format msgid "waiting for %s [-d]" msgstr "wachten op %s [-d]" -#: src/sort.c:699 +#: src/sort.c:702 #, c-format msgid "%s [-d] terminated abnormally" msgstr "%s [-d] is niet normaal geëindigd" -#: src/sort.c:853 +#: src/sort.c:856 #, c-format msgid "cannot create temporary file in %s" msgstr "kan tijdelijk bestand %s niet aanmaken" -#: src/sort.c:939 src/sort.c:2010 src/sort.c:3056 src/sort.c:3755 -#: src/sort.c:3758 +#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713 +#: src/sort.c:3804 src/sort.c:3807 msgid "open failed" msgstr "openen is mislukt" -#: src/sort.c:959 +#: src/sort.c:970 msgid "fflush failed" msgstr "alles naar schijf wegschrijven (fflush) is mislukt" -#: src/sort.c:964 src/sort.c:2013 src/sort.c:4646 +#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706 msgid "close failed" msgstr "sluiten is mislukt" -#: src/sort.c:973 +#: src/sort.c:986 #, c-format msgid "dup2 failed" msgstr "dup2() is mislukt" -#: src/sort.c:1090 +#: src/sort.c:1103 #, c-format msgid "couldn't execute %s" msgstr "kan %s niet uitvoeren" -#: src/sort.c:1097 +#: src/sort.c:1110 msgid "couldn't create temporary file" msgstr "kan geen tijdelijk bestand aanmaken" -#: src/sort.c:1136 +#: src/sort.c:1149 #, c-format msgid "couldn't create process for %s -d" msgstr "kan geen proces voor '%s -d' aanmaken" -#: src/sort.c:1150 +#: src/sort.c:1161 #, c-format msgid "couldn't execute %s -d" msgstr "kan '%s -d' niet uitvoeren" -#: src/sort.c:1209 +#: src/sort.c:1220 #, c-format msgid "warning: cannot remove: %s" msgstr "waarschuwing: kan %s niet verwijderen" -#: src/sort.c:1295 +#: src/sort.c:1306 #, c-format msgid "invalid --%s argument %s" msgstr "ongeldig argument van '--%s': %s" -#: src/sort.c:1298 +#: src/sort.c:1309 #, c-format msgid "minimum --%s argument is %s" msgstr "minimum argument van '--%s' is %s" -#: src/sort.c:1313 +#: src/sort.c:1324 #, c-format msgid "--%s argument %s too large" msgstr "argument %2$s van '--%1$s' is te groot" -#: src/sort.c:1316 +#: src/sort.c:1327 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "met huidige 'rlimit' is maximum argument van '--%s': %s" -#: src/sort.c:1398 +#: src/sort.c:1409 #, c-format msgid "number in parallel must be nonzero" msgstr "maximaal aantal parallelle processen mag niet nul zijn" -#: src/sort.c:1479 +#: src/sort.c:1494 msgid "stat failed" msgstr "opvragen van bestandsstatus is mislukt" -#: src/sort.c:1740 +#: src/sort.c:1755 msgid "read failed" msgstr "lezen is mislukt" -#: src/sort.c:2028 +#: src/sort.c:2043 #, c-format msgid "string transformation failed" msgstr "transformatie van tekenreeks is mislukt" -#: src/sort.c:2031 +#: src/sort.c:2046 #, c-format msgid "the untransformed string was %s" msgstr "de niet-getransformeerde tekenreeks was %s" -#: src/sort.c:2194 +#: src/sort.c:2209 #, c-format msgid "^ no match for key\n" msgstr "^ geen overeenkomst voor sleutel\n" -#: src/sort.c:2374 +#: src/sort.c:2389 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "verouderde sleutel %s is gebruikt; gebruik liever %s" -#: src/sort.c:2380 +#: src/sort.c:2395 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "sleutel %lu heeft breedte nul en wordt genegeerd" -#: src/sort.c:2391 +#: src/sort.c:2406 #, 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:2404 +#: src/sort.c:2419 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "sleutel %lu is numeriek en beslaat meerdere velden" -#: src/sort.c:2436 +#: src/sort.c:2451 #, 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:2442 +#: src/sort.c:2457 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "optie '-r' betreft alleen de noodvergelijking" -#: src/sort.c:2716 src/sort.c:2725 +#: src/sort.c:2731 src/sort.c:2740 msgid "write failed" msgstr "schrijven is mislukt" -#: src/sort.c:2768 +#: src/sort.c:2783 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: wanorde: " -#: src/sort.c:2771 +#: src/sort.c:2786 msgid "standard error" msgstr "standaardfoutuitvoer" -#: src/sort.c:3926 +#: src/sort.c:3698 +msgid "cannot read" +msgstr "kan niet lezen" + +#: src/sort.c:3976 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: ongeldige veldspecificatie %s" -#: src/sort.c:3937 +#: src/sort.c:3987 #, c-format msgid "options '-%s' are incompatible" msgstr "opties '-%s' gaan niet samen" -#: src/sort.c:3988 +#: src/sort.c:4038 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s: ongeldig aantal bij het begin van %s" -#: src/sort.c:4245 +#: src/sort.c:4295 msgid "invalid number after '-'" msgstr "ongeldig getal na '-'" -#: src/sort.c:4248 src/sort.c:4334 src/sort.c:4362 +#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416 msgid "invalid number after '.'" msgstr "ongeldig getal na '.'" -#: src/sort.c:4261 src/sort.c:4367 +#: src/sort.c:4315 src/sort.c:4421 msgid "stray character in field spec" msgstr "verdwaald teken in veldspecificatie" -#: src/sort.c:4308 +#: src/sort.c:4362 #, c-format msgid "multiple compress programs specified" msgstr "meer dan één compressieprogramma opgegeven" -#: src/sort.c:4325 +#: src/sort.c:4379 msgid "invalid number at field start" msgstr "ongeldig getal aan het begin van een veld" -#: src/sort.c:4329 src/sort.c:4357 +#: src/sort.c:4383 src/sort.c:4411 msgid "field number is zero" msgstr "veldnummer is nul" -#: src/sort.c:4338 +#: src/sort.c:4392 msgid "character offset is zero" msgstr "tekenpositie is nul" -#: src/sort.c:4353 +#: src/sort.c:4407 msgid "invalid number after ','" msgstr "ongeldig getal na ','" -#: src/sort.c:4403 +#: src/sort.c:4457 #, c-format msgid "empty tab" msgstr "lege tab" -#: src/sort.c:4496 src/wc.c:692 +#: src/sort.c:4550 src/wc.c:692 #, c-format msgid "cannot read file names from %s" msgstr "kan geen bestandsnamen uit %s lezen" -#: src/sort.c:4518 +#: src/sort.c:4572 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s:%lu: ongeldige bestandsnaam (lengte nul)" -#: src/sort.c:4524 +#: src/sort.c:4578 #, c-format msgid "no input from %s" msgstr "geen invoer van %s" -#: src/sort.c:4570 +#: src/sort.c:4624 #, c-format msgid "using %s sorting rules" msgstr "sorteerregels van %s worden gebruikt" -#: src/sort.c:4573 +#: src/sort.c:4627 #, c-format msgid "using simple byte comparison" msgstr "eenvoudige byte-vergelijking wordt gebruikt" -#: src/sort.c:4604 +#: src/sort.c:4658 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "extra argument %s is niet toegestaan bij optie '-%c'" -#: src/split.c:184 +#: src/split.c:187 #, 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:201 +#: src/split.c:204 #, c-format msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" msgstr "Gebruik: %s [OPTIE...] [INVOER [VOORVOEGSEL]]\n" -#: src/split.c:205 +#: src/split.c:208 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" -"\n" msgstr "" -"Stukken van de INVOER met een vaste grootte schrijven naar VOORVOEGSELaa,\n" -"VOORVOEGSELab, VOORVOEGSELac, ... De standaard grootte is 1000 regels en\n" +"Schrijft stukken van de INVOER met een vaste grootte naar VOORVOEGSELaa,\n" +"VOORVOEGSELab, VOORVOEGSELac, ...; de standaardgrootte is 1000 regels en\n" "het standaard VOORVOEGSEL is 'x'.\n" "\n" "Zonder INVOER, of wanneer INVOER - is, wordt standaardinvoer gelezen.\n" -"\n" -#: src/split.c:214 +#: src/split.c:216 #, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" @@ -9467,7 +9765,7 @@ msgstr "" " -u, --unbuffered invoer direct naar uitvoer kopiëren met '-n " "r/...'\n" -#: src/split.c:227 +#: src/split.c:229 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" @@ -9476,7 +9774,7 @@ msgstr "" "uitvoerbestand\n" "\n" -#: src/split.c:234 +#: src/split.c:236 msgid "" "\n" "CHUNKS may be:\n" @@ -9497,187 +9795,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:352 +#: src/split.c:354 #, c-format msgid "output file suffixes exhausted" msgstr "achtervoegsels voor uitvoerbestanden zijn verbruikt" -#: src/split.c:364 +#: src/split.c:366 #, c-format msgid "creating file %s\n" msgstr "aanmaken van bestand %s\n" -#: src/split.c:377 +#: src/split.c:375 +#, c-format +msgid "%s would overwrite input; aborting" +msgstr "%s zou invoer overschrijven -- gestopt" + +#: src/split.c:391 #, c-format msgid "failed to set FILE environment variable" msgstr "instellen van omgevingsvariabele FILE is mislukt" -#: src/split.c:379 +#: src/split.c:393 #, c-format msgid "executing with FILE=%s\n" msgstr "wordt uitgevoerd met FILE=%s\n" -#: src/split.c:381 +#: src/split.c:395 #, c-format msgid "failed to create pipe" msgstr "aanmaken van pijp is mislukt" -#: src/split.c:395 +#: src/split.c:409 #, c-format msgid "closing prior pipe" msgstr "sluiten van eerdere pijp" -#: src/split.c:397 +#: src/split.c:411 #, c-format msgid "closing output pipe" msgstr "sluiten van uitvoerpijp" -#: src/split.c:401 +#: src/split.c:415 #, c-format msgid "moving input pipe" msgstr "verplaatsen van invoerpijp" -#: src/split.c:403 +#: src/split.c:417 #, c-format msgid "closing input pipe" msgstr "sluiten van invoerpijp" -#: src/split.c:408 +#: src/split.c:422 #, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "kan commando \"%s -c %s\" niet uitvoeren" -#: src/split.c:414 +#: src/split.c:428 #, c-format msgid "failed to close input pipe" msgstr "kan invoerpijp niet sluiten" -#: src/split.c:450 +#: src/split.c:464 #, c-format msgid "waiting for child process" msgstr "wachten op dochterproces" -#: src/split.c:460 +#: src/split.c:474 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "met FILE=%s, signaal %s van commando: %s" -#: src/split.c:468 +#: src/split.c:482 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "met FILE=%s, afsluitwaarde %d van commando: %s" -#: src/split.c:475 src/timeout.c:449 +#: src/split.c:489 src/timeout.c:494 #, c-format msgid "unknown status from command (0x%X)" msgstr "onbekende afsluitwaarde (0x%X) van commando" -#: src/split.c:1037 +#: src/split.c:1052 #, c-format msgid "cannot split in more than one way" msgstr "kan niet op meerdere manieren splitsen" -#: src/split.c:1050 src/split.c:1192 src/split.c:1363 +#: src/split.c:1065 src/split.c:1205 src/split.c:1376 #, c-format msgid "%s: invalid number of chunks" msgstr "ongeldig aantal brokken: %s" -#: src/split.c:1054 +#: src/split.c:1069 #, c-format msgid "%s: invalid chunk number" msgstr "ongeldig broknummer: %s" -#: src/split.c:1106 +#: src/split.c:1119 #, c-format msgid "%s: invalid suffix length" msgstr "ongeldige lengte voor achtervoegsel: %s" -#: src/split.c:1131 src/split.c:1139 src/split.c:1162 src/split.c:1167 +#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180 #, c-format msgid "%s: invalid number of bytes" msgstr "ongeldig aantal bytes: %s" -#: src/split.c:1150 src/split.c:1297 +#: src/split.c:1163 src/split.c:1310 #, c-format msgid "%s: invalid number of lines" msgstr "ongeldig aantal regels: %s" # Engelse foutmelding is onduidelijk. -#: src/split.c:1223 +#: src/split.c:1236 #, c-format msgid "line count option -%s%c... is too large" msgstr "regelaantal '-%s%c...' is te groot" -#: src/split.c:1235 +#: src/split.c:1248 #, c-format msgid "%s: invalid start value for numerical suffix" msgstr "%s: ongeldige startwaarde voor numeriek achtervoegsel" -#: src/split.c:1263 +#: src/split.c:1276 #, c-format msgid "%s: invalid IO block size" msgstr "ongeldige IO-blokgrootte: %s" -#: src/split.c:1284 +#: src/split.c:1297 #, 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:1321 +#: src/split.c:1334 #, 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:1356 +#: src/split.c:1369 #, 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:169 +#: src/stat.c:173 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:838 +#: src/stat.c:857 #, c-format msgid "failed to canonicalize %s" msgstr "canoniseren van %s is mislukt" -#: src/stat.c:1050 +#: src/stat.c:1069 #, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "waarschuwing: onbekende stuurcode '\\%c'" -#: src/stat.c:1105 +#: src/stat.c:1124 #, c-format msgid "%s: invalid directive" msgstr "%s: ongeldige directief" -#: src/stat.c:1151 +#: src/stat.c:1170 #, c-format msgid "warning: backslash at end of format" msgstr "waarschuwing: backslash aan eind van opmaakaanduiding" -#: src/stat.c:1182 +#: src/stat.c:1201 #, 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:1189 +#: src/stat.c:1208 #, c-format msgid "cannot read file system information for %s" msgstr "kan informatie in bestandssysteem niet lezen voor %s" -#: src/stat.c:1209 +#: src/stat.c:1228 #, 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:1245 +#: src/stat.c:1264 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -9693,7 +9996,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1268 +#: src/stat.c:1287 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -9703,31 +10006,31 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1278 +#: src/stat.c:1297 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:1286 +#: src/stat.c:1305 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:1295 +#: src/stat.c:1314 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:1305 +#: src/stat.c:1324 #, c-format msgid "Context: %C\n" msgstr "Context: %C\n" -#: src/stat.c:1313 +#: src/stat.c:1332 msgid "" "Access: %x\n" "Modify: %y\n" @@ -9739,19 +10042,19 @@ msgstr "" "Veranderd: %z\n" "Ontstaan: %w\n" -#: src/stat.c:1331 +#: src/stat.c:1350 +msgid "Display file or file system status.\n" +msgstr "Toont de status van een bestand (of van een bestandssysteem).\n" + +#: src/stat.c:1356 msgid "" -"Display file or file system status.\n" -"\n" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" -"De status van een bestand tonen (of van een bestandssysteem).\n" -"\n" " -L, --dereference symbolische koppelingen volgen\n" " -f, --file-system status tonen van bestandssysteem i.p.v. van bestand\n" -#: src/stat.c:1337 +#: src/stat.c:1360 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -9769,7 +10072,7 @@ msgstr "" " -t, --terse de informatie in beknopte vorm tonen\n" "\n" -#: src/stat.c:1348 +#: src/stat.c:1371 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -9789,7 +10092,7 @@ msgstr "" " %B de grootte in bytes van elk blok gerapporteerd door %b\n" " %C SELinux-beveiligingscontext-tekenreeks\n" -#: src/stat.c:1357 +#: src/stat.c:1380 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -9805,7 +10108,7 @@ msgstr "" " %g groeps-ID van eigenaar\n" " %G groepsnaam van eigenaar\n" -#: src/stat.c:1365 +#: src/stat.c:1388 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -9827,7 +10130,7 @@ msgstr "" " %t hoofdapparaattype in hex\n" " %T subapparaattype in hex\n" -#: src/stat.c:1376 +#: src/stat.c:1399 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -9853,7 +10156,7 @@ msgstr "" " %Z tijdstip van laatste verandering, in seconden sinds Epoch\n" "\n" -#: src/stat.c:1390 +#: src/stat.c:1413 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -9871,7 +10174,7 @@ msgstr "" " %d aantal vrije inodes in bestandssysteem\n" " %f aantal vrije blokken in bestandssysteem\n" -#: src/stat.c:1399 +#: src/stat.c:1422 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -9897,12 +10200,10 @@ msgstr "Gebruik: %s [OPTIE...] COMMANDO\n" #: src/stdbuf.c:91 msgid "" "Run COMMAND, with modified buffering operations for its standard streams.\n" -"\n" msgstr "" -"COMMANDO uitvoeren met gewijzigde buffering voor zijn standaard streams.\n" -"\n" +"Voert COMMANDO uit met gewijzigde buffering voor zijn standaard streams.\n" -#: src/stdbuf.c:98 +#: src/stdbuf.c:97 msgid "" " -i, --input=MODE adjust standard input stream buffering\n" " -o, --output=MODE adjust standard output stream buffering\n" @@ -9912,7 +10213,7 @@ msgstr "" " -o, --output=MODUS de standaarduitvoer-streambuffering aanpassen\n" " -e, --error=MODUS de standaardfoutuitvoer-streambuffering aanpassen\n" -#: src/stdbuf.c:105 +#: src/stdbuf.c:104 msgid "" "\n" "If MODE is 'L' the corresponding stream will be line buffered.\n" @@ -9922,7 +10223,7 @@ msgstr "" "Als MODUS 'L' is, zal de overeenkomende stream regelgebufferd zijn.\n" "Deze modus is ongeldig voor standaardinvoer.\n" -#: src/stdbuf.c:108 +#: src/stdbuf.c:107 msgid "" "\n" "If MODE is '0' the corresponding stream will be unbuffered.\n" @@ -9930,7 +10231,7 @@ msgstr "" "\n" "Als MODUS '0' is, zal de overeenkomstige stream ongebufferd zijn.\n" -#: src/stdbuf.c:111 +#: src/stdbuf.c:110 msgid "" "\n" "Otherwise MODE is a number which may be followed by one of the following:\n" @@ -9945,7 +10246,7 @@ msgstr "" "In deze gevallen zal de overeenkomstige stream volledig gebufferd zijn\n" "met de grootte ingesteld op MODUS bytes.\n" -#: src/stdbuf.c:117 +#: src/stdbuf.c:116 msgid "" "\n" "NOTE: If COMMAND adjusts the buffering of its standard streams ('tee' does\n" @@ -9964,22 +10265,22 @@ msgstr "" "enzovoort) gebruiken geen streams voor invoer/uitvoer, en worden dus niet\n" "beïnvloed door instellingen van 'stdbuf'.\n" -#: src/stdbuf.c:227 +#: src/stdbuf.c:226 #, c-format msgid "failed to find %s" msgstr "kan %s niet vinden" -#: src/stdbuf.c:247 src/stdbuf.c:279 +#: src/stdbuf.c:246 src/stdbuf.c:278 #, c-format msgid "failed to update the environment with %s" msgstr "het bijwerken van de omgeving met %s is mislukt" -#: src/stdbuf.c:321 +#: src/stdbuf.c:320 #, c-format msgid "line buffering stdin is meaningless" msgstr "regelbuffering van standaardinvoer is zinloos" -#: src/stty.c:509 +#: src/stty.c:513 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -9990,22 +10291,21 @@ msgstr "" " of: %s [-F APPARAAT | --file=APPARAAT] [-a|--all]\n" " of: %s [-F APPARAAT | --file=APPARAAT] [-g|--save]\n" -#: src/stty.c:515 +#: src/stty.c:519 +msgid "Print or change terminal characteristics.\n" +msgstr "Toont terminalkarakteristieken of stelt ze in.\n" + +#: src/stty.c:525 msgid "" -"Print or change terminal characteristics.\n" -"\n" " -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 "" -"Terminalkarakteristieken tonen of instellen.\n" -"\n" " -a, --all alle huidige instellingen in leesbare vorm tonen\n" " -g, --save alle huidige instellingen in herbruikbare vorm tonen\n" " -F, --file=APPARAAT te gebruiken apparaat in plaats van standaardinvoer\n" -"\n" -#: src/stty.c:524 +#: src/stty.c:532 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -10016,7 +10316,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:529 +#: src/stty.c:537 msgid "" "\n" "Special characters:\n" @@ -10031,7 +10331,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:536 +#: src/stty.c:544 msgid "" " * eol2 CHAR alternate CHAR for ending the line\n" " erase CHAR CHAR will erase the last character typed\n" @@ -10043,7 +10343,7 @@ msgstr "" " intr TEKEN TEKEN zendt een interruptsignaal\n" " kill TEKEN TEKEN verwijdert de huidige regel\n" -#: src/stty.c:542 +#: src/stty.c:550 msgid "" " * lnext CHAR CHAR will enter the next character quoted\n" " quit CHAR CHAR will send a quit signal\n" @@ -10055,7 +10355,7 @@ msgstr "" " * rprnt TEKEN TEKEN herschrijft de huidige regel\n" " start TEKEN TEKEN herstart de uitvoer nadat deze is gestopt\n" -#: src/stty.c:548 +#: src/stty.c:556 msgid "" " stop CHAR CHAR will stop the output\n" " susp CHAR CHAR will send a terminal stop signal\n" @@ -10067,7 +10367,7 @@ msgstr "" " * swtch TEKEN TEKEN schakelt naar een andere shell-laag\n" " * werase TEKE TEKEN verwijdert het laatst getypte woord\n" -#: src/stty.c:554 +#: src/stty.c:562 msgid "" "\n" "Special settings:\n" @@ -10081,7 +10381,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:561 +#: src/stty.c:569 msgid "" " ispeed N set the input speed to N\n" " * line N use line discipline N\n" @@ -10095,7 +10395,7 @@ msgstr "" "tekens\n" " ospeed N de uitvoersnelheid op N zetten\n" -#: src/stty.c:567 +#: src/stty.c:575 msgid "" " * rows N tell the kernel that the terminal has N rows\n" " * size print the number of rows and columns according to the " @@ -10109,39 +10409,41 @@ msgstr "" " time N met '-icanon': leestijdslimiet op N tiende seconde " "instellen\n" -#: src/stty.c:573 +#: src/stty.c:581 msgid "" "\n" "Control settings:\n" " [-]clocal disable modem control signals\n" " [-]cread allow input to be received\n" " * [-]crtscts enable RTS/CTS handshaking\n" +" * [-]cdtrdsr enable DTR/DSR handshaking\n" " csN set character size to N bits, N in [5..8]\n" msgstr "" "\n" "Besturingsinstellingen:\n" " [-]clocal modem-besturingssignalen uitschakelen\n" " [-]cread het ontvangen van invoer toestaan\n" -" * [-]crtscts RTS/CTS-handshake inschakelen\n" +" * [-]crtscts RTS/CTS-\n" +" * [-]cdtrdsr DTR/DSR-handshake inschakelen\n" " csN tekengrootte op N bits instellen; N in [5..8]\n" -#: src/stty.c:581 +#: src/stty.c:590 msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" " [-]hupcl same as [-]hup\n" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" -" [-]parodd set odd parity (even with '-')\n" +" [-]parodd set odd parity (or even parity with '-')\n" msgstr "" " [-]cstopb twee stopbits per teken gebruiken (één met '-')\n" " [-]hup 'opgehangen'-signaal sturen wanneer laatste proces de TTY " "sluit\n" " [-]hupcl hetzelfde als '[-]hup'\n" " [-]parenb pariteitsbit in uitvoer genereren en in invoer verwachten\n" -" [-]parodd oneven pariteit instellen (even met '-')\n" +" [-]parodd oneven pariteit instellen (of even pariteit met '-')\n" -#: src/stty.c:588 +#: src/stty.c:597 msgid "" "\n" "Input settings:\n" @@ -10158,7 +10460,7 @@ msgstr "" " [-]ignbrk break-tekens negeren\n" " [-]igncr CR-tekens negeren\n" -#: src/stty.c:596 +#: src/stty.c:605 msgid "" " [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" @@ -10174,11 +10476,11 @@ msgstr "" " [-]inpck controle op invoerpariteit inschakelen\n" " [-]istrip hoogste bit (het achtste) van invoertekens nul maken\n" -#: src/stty.c:603 +#: src/stty.c:612 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr " * [-]iutf8 aannemen dat invoertekens in UTF-8 gecodeerd zijn\n" -#: src/stty.c:606 +#: src/stty.c:615 msgid "" " * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" @@ -10195,7 +10497,7 @@ msgstr "" " [-]parmrk pariteitsfouten markeren (met een 255-0-tekencombinatie)\n" " [-]tandem hetzelfde als '[-]ixoff'\n" -#: src/stty.c:614 +#: src/stty.c:623 msgid "" "\n" "Output settings:\n" @@ -10211,7 +10513,7 @@ msgstr "" " * ffN 'form feed'-vertragingsstijl; N in [0..1]\n" " * nlN nieuweregel-vertragingsstijl; N in [0..1]\n" -#: src/stty.c:622 +#: src/stty.c:631 msgid "" " * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of null characters\n" @@ -10231,7 +10533,7 @@ msgstr "" "regelbegin)\n" " * [-]onlret 'nieuweregel' voert ook een 'naar regelbegin' uit\n" -#: src/stty.c:630 +#: src/stty.c:639 msgid "" " * [-]onocr do not print carriage returns in the first column\n" " [-]opost postprocess output\n" @@ -10248,7 +10550,7 @@ msgstr "" " * -tabs hetzelfde als 'tab3'\n" " * vtN vertragingsstijl voor verticale tab; N in [0..1]\n" -#: src/stty.c:638 +#: src/stty.c:647 msgid "" "\n" "Local settings:\n" @@ -10262,7 +10564,7 @@ msgstr "" " * crtkill gehele regel verwijderen via 'echoprt' en 'echoe'\n" " * -crtkill gehele regel verwijderen via 'echoctl' en 'echok'\n" -#: src/stty.c:645 +#: src/stty.c:654 msgid "" " * [-]ctlecho echo control characters in hat notation ('^c')\n" " [-]echo echo input characters\n" @@ -10276,7 +10578,7 @@ msgstr "" " [-]echoe hetzelfde als '[-]crterase'\n" " [-]echok een nieuweregel-teken echoën na een kill-teken\n" -#: src/stty.c:652 +#: src/stty.c:661 msgid "" " * [-]echoke same as [-]crtkill\n" " [-]echonl echo newline even if not echoing other characters\n" @@ -10292,7 +10594,7 @@ msgstr "" "inschakelen\n" " [-]iexten niet-POSIX speciale tekens inschakelen\n" -#: src/stty.c:659 +#: src/stty.c:668 msgid "" " [-]isig enable interrupt, quit, and suspend special characters\n" " [-]noflsh disable flushing after interrupt and quit special " @@ -10309,7 +10611,7 @@ msgstr "" "schrijven\n" " * [-]xcase met 'icanon': '\\' voor kleine letter maakt hoofdletter\n" -#: src/stty.c:666 +#: src/stty.c:675 msgid "" "\n" "Combination settings:\n" @@ -10323,7 +10625,7 @@ msgstr "" " cbreak hetzelfde als '-icanon'\n" " -cbreak hetzelfde als 'icanon'\n" -#: src/stty.c:673 +#: src/stty.c:682 msgid "" " cooked same as brkint ignpar istrip icrnl ixon opost isig\n" " icanon, eof and eol characters to their default values\n" @@ -10335,7 +10637,7 @@ msgstr "" " -cooked hetzelfde als 'raw'\n" " crt hetzelfde als 'echoe echoctl echoke'\n" -#: src/stty.c:679 +#: src/stty.c:688 msgid "" " dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" " kill ^u\n" @@ -10349,7 +10651,7 @@ msgstr "" " ek de erase- en kill-tekens op hun standaardwaarden zetten\n" " evenp hetzelfde als 'parenb -parodd cs7'\n" -#: src/stty.c:686 +#: src/stty.c:695 msgid "" " -evenp same as -parenb cs8\n" " * [-]lcase same as xcase iuclc olcuc\n" @@ -10365,7 +10667,7 @@ msgstr "" " nl hetzelfde als '-icrnl -onlcr\n" " -nl hetzelfde als 'icrnl -inlcr -igncr onlcr -ocrnl -onlret'\n" -#: src/stty.c:694 +#: src/stty.c:703 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -10379,7 +10681,7 @@ msgstr "" " pass8 hetzelfde als '-parenb -istrip cs8'\n" " -pass8 hetzelfde als 'parenb istrip cs7'\n" -#: src/stty.c:701 +#: src/stty.c:710 msgid "" " raw same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" " -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n" @@ -10391,7 +10693,7 @@ msgstr "" " -imaxbel -opost -isig -icanon -xcase min 1 time 0'\n" " -raw hetzelfde als 'cooked'\n" -#: src/stty.c:707 +#: src/stty.c:716 msgid "" " sane same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" " -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n" @@ -10408,7 +10710,7 @@ msgstr "" " -xcase -tostop -echoprt echoctl echoke', met\n" " alle speciale tekens op hun standaardwaarden\n" -#: src/stty.c:715 +#: src/stty.c:724 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -10425,12 +10727,12 @@ msgstr "" "0177 of 127; de speciale waarden '^-' of 'undef' kunnen gebruikt worden om\n" "speciale tekens inactief te maken.\n" -#: src/stty.c:787 +#: src/stty.c:796 #, c-format msgid "only one device may be specified" msgstr "er mag slechts één apparaat gegeven worden" -#: src/stty.c:817 +#: src/stty.c:826 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" @@ -10438,131 +10740,47 @@ msgid "" msgstr "" "de opties voor duidelijke en voor 'stty'-leesbare uitvoer gaan niet samen" -#: src/stty.c:823 +#: src/stty.c:832 #, 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:838 +#: src/stty.c:847 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s: kan niet-blokkerende modus niet herstellen" -#: src/stty.c:883 src/stty.c:993 +#: src/stty.c:892 src/stty.c:1002 #, c-format msgid "invalid argument %s" msgstr "ongeldig argument: %s" -#: src/stty.c:894 src/stty.c:911 src/stty.c:923 src/stty.c:936 src/stty.c:948 -#: src/stty.c:968 +#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957 +#: src/stty.c:977 #, c-format msgid "missing argument to %s" msgstr "ontbrekend argument bij %s" -#: src/stty.c:974 +#: src/stty.c:983 #, c-format msgid "invalid line discipline %s" msgstr "ongeldig lijnprotocol: %s" -#: src/stty.c:1044 +#: src/stty.c:1053 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s: kan niet alle gevraagde acties uitvoeren" -#: src/stty.c:1390 +#: src/stty.c:1399 #, c-format msgid "%s: no size information for this device" msgstr "%s: er is geen grootte-informatie voor dit apparaat" -#: src/stty.c:1904 +#: src/stty.c:1920 #, c-format msgid "invalid integer argument %s" msgstr "ongeldig geheelgetal-argument: %s" -#: src/su.c:229 -msgid "Password:" -msgstr "Wachtwoord:" - -#: src/su.c:232 -#, c-format -msgid "getpass: cannot open /dev/tty" -msgstr "getpass(): kan /dev/tty niet openen" - -#: src/su.c:290 -#, c-format -msgid "cannot set groups" -msgstr "kan de groepen niet instellen" - -#: src/su.c:294 -#, c-format -msgid "cannot set group id" -msgstr "kan groeps-ID niet instellen" - -#: src/su.c:296 -#, c-format -msgid "cannot set user id" -msgstr "kan gebruikers-ID niet instellen" - -#: src/su.c:371 -#, c-format -msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" -msgstr "" -"Gebruik: %s [OPTIE...] [-] [GEBRUIKER [ARGUMENT...]]\n" -"\n" - -#: src/su.c:372 -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 "" -"Het effectieve gebruikers-ID en groeps-ID wijzigen in die van GEBRUIKER.\n" -"\n" -" -, -l, --login van de shell een login-shell maken\n" -" -c, --command=COMMANDO een enkel COMMANDO naar de shell sturen met '-" -"c'\n" -" -f, --fast '-f' aan de shell meegeven (voor 'csh' of " -"'tcsh')\n" -" -m, --preserve-environment de omgevingsvariabelen niet resetten\n" -" -p hetzelfde als '-m'\n" -" -s, --shell=SHELL SHELL uitvoeren (als /etc/shells dit " -"toestaat)\n" -"\n" - -#: src/su.c:384 -msgid "" -"\n" -"A mere - implies -l. If USER not given, assume root.\n" -msgstr "" -"\n" -"Een simpele - betekent -l. Als geen GEBRUIKER gegeven is, wordt root " -"begrepen.\n" - -#: src/su.c:461 -#, c-format -msgid "user %s does not exist" -msgstr "gebruiker %s bestaat niet" - -#: src/su.c:484 -#, c-format -msgid "incorrect password" -msgstr "onjuist wachtwoord" - -#: src/su.c:501 -#, c-format -msgid "using restricted shell %s" -msgstr "ingeperkte shell %s wordt gebruikt" - -#: src/su.c:509 -#, c-format -msgid "warning: cannot change directory to %s" -msgstr "waarschuwing: kan map niet wijzigen in %s" - #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 msgid "Kayvan Aghaiepour" @@ -10594,7 +10812,7 @@ msgstr "" msgid "ignoring all arguments" msgstr "alle argumenten worden genegeerd" -#: src/system.h:340 +#: src/system.h:343 #, c-format msgid "" "\n" @@ -10607,15 +10825,23 @@ msgstr "" "prevaleert boven de hier beschreven versie. Kijk in de documentatie van\n" "uw shell voor details over de ondersteunde opties.\n" -#: src/system.h:346 +#: src/system.h:349 msgid " --help display this help and exit\n" msgstr " --help deze hulptekst tonen en stoppen\n" -#: src/system.h:348 +#: src/system.h:351 msgid " --version output version information and exit\n" msgstr " --version programmaversie tonen en stoppen\n" -#: src/system.h:541 +#: src/system.h:544 +msgid "" +"\n" +"Mandatory arguments to long options are mandatory for short options too.\n" +msgstr "" +"\n" +"(Een verplicht argument bij een lange optie geldt ook voor de korte vorm.)\n" + +#: src/system.h:552 msgid "" "\n" "SIZE is an integer and optional unit (example: 10M is 10*1024*1024). Units\n" @@ -10629,7 +10855,7 @@ msgstr "" "1000).\n" "Bijvoorbeeld: 10M is 10*1024*1024.\n" -#: src/system.h:550 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -10643,7 +10869,7 @@ msgstr "" "BLOCKSIZE. Anders is de eenheid standaard 1024 bytes (of 512 als\n" "POSIXLY_CORRECT gezet is).\n" -#: src/system.h:560 +#: src/system.h:571 #, c-format msgid "" "\n" @@ -10656,23 +10882,23 @@ msgstr "" #. <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:574 +#: src/system.h:585 #, 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:578 +#: src/system.h:589 #, 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:585 +#: src/system.h:596 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "Typ '%s --help' voor meer informatie.\n" -#: src/system.h:617 +#: src/system.h:628 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -10696,14 +10922,12 @@ msgstr "Jay Lepreau" msgid "" "Write each FILE to standard output, last line first.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" -"Elk gegeven BESTAND naar standaarduitvoer schrijven, laatste regel eerst.\n" +"Schrijft elk gegeven BESTAND naar standaarduitvoer, laatste regel eerst.\n" "\n" "Zonder BESTAND, of wanneer BESTAND - is, wordt standaardinvoer gelezen.\n" -"\n" -#: src/tac.c:145 +#: src/tac.c:144 msgid "" " -b, --before attach the separator before instead of after\n" " -r, --regex interpret the separator as a regular expression\n" @@ -10714,42 +10938,42 @@ msgstr "" " -s, --separator=TEKST deze scheider gebruiken in plaats van nieuweregel\n" "\n" -#: src/tac.c:235 src/tac.c:336 +#: src/tac.c:234 src/tac.c:335 #, c-format msgid "%s: seek failed" msgstr "%s: 'seek' is mislukt" -#: src/tac.c:264 +#: src/tac.c:263 #, c-format msgid "record too large" msgstr "record is te groot" -#: src/tac.c:451 +#: src/tac.c:450 #, c-format msgid "failed to create temporary file in %s" msgstr "kan geen tijdelijk bestand aanmaken in %s" -#: src/tac.c:459 +#: src/tac.c:458 #, c-format msgid "failed to open %s for writing" msgstr "openen voor schrijven van %s is mislukt" -#: src/tac.c:476 +#: src/tac.c:475 #, c-format msgid "failed to rewind stream for %s" msgstr "terugspringen in stroom voor %s is mislukt" -#: src/tac.c:512 src/tac.c:519 +#: src/tac.c:511 src/tac.c:518 #, c-format msgid "%s: write error" msgstr "%s: fout bij schrijven" -#: src/tac.c:572 +#: src/tac.c:571 #, c-format msgid "failed to open %s for reading" msgstr "kan %s niet openen om te lezen" -#: src/tac.c:630 +#: src/tac.c:629 #, c-format msgid "separator cannot be empty" msgstr "scheidingsteken mag niet leeg zijn" @@ -10765,16 +10989,15 @@ 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" -"\n" msgstr "" -"De laatste %d regels van elk gegeven BESTAND naar standaarduitvoer " -"kopiëren.\n" -"Als meer dan één BESTAND gegeven is, wordt de uitvoer van elk bestand\n" -"voorafgegaan door een kopje met de bestandsnaam. Zonder BESTAND, of\n" -"wanneer BESTAND - is, wordt standaardinvoer gelezen.\n" +"Kopieert de laatste %d regels van elk gegeven BESTAND naar " +"standaarduitvoer.\n" "\n" +"Als meer dan één BESTAND gegeven is, wordt de uitvoer van elk bestand\n" +"voorafgegaan door een kopje met de bestandsnaam.\n" +"Zonder BESTAND, of wanneer BESTAND - is, wordt standaardinvoer gelezen.\n" -#: src/tail.c:271 +#: src/tail.c:270 msgid "" " -c, --bytes=K output the last K bytes; alternatively, use -c " "+K\n" @@ -10786,7 +11009,7 @@ msgstr "" " bytes beginnend met Kde van elk bestand " "uitgevoerd\n" -#: src/tail.c:275 +#: src/tail.c:274 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -10801,7 +11024,7 @@ msgstr "" " equivalent\n" " -F hetzelfde als '--follow=name --retry'\n" -#: src/tail.c:282 +#: src/tail.c:281 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -10826,7 +11049,7 @@ msgstr "" " (gebruikelijk bij roterende logbestanden);\n" " met 'inotify' is deze optie zelden nuttig\n" -#: src/tail.c:295 +#: src/tail.c:294 msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" " -q, --quiet, --silent never output headers giving file names\n" @@ -10842,7 +11065,7 @@ msgstr "" "op\n" " naam gevolgd wordt (bij '--follow=name' dus)\n" -#: src/tail.c:302 +#: src/tail.c:301 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations.\n" @@ -10856,7 +11079,7 @@ msgstr "" " minstens eens per N seconden controleren\n" " -v, --verbose altijd bestandsnaamkopjes tonen\n" -#: src/tail.c:311 +#: src/tail.c:310 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -10875,7 +11098,7 @@ msgstr "" "GB 1000*1000*1000, G 1024*1024*1024, en zo verder voor T, P, E, Z, Y.\n" "\n" -#: src/tail.c:320 +#: src/tail.c:319 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" @@ -10895,27 +11118,27 @@ msgstr "" "houdt\n" "met hernoemen, verwijderen en opnieuw aanmaken.\n" -#: src/tail.c:379 +#: src/tail.c:378 #, c-format msgid "closing %s (fd=%d)" msgstr "sluiten van %s (bestandsdescriptor=%d)" -#: src/tail.c:454 +#: 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:458 +#: src/tail.c:457 #, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "%s: kan niet naar eind-relatieve positie %s springen" -#: src/tail.c:895 +#: src/tail.c:894 #, 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:907 +#: src/tail.c:906 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " @@ -10925,41 +11148,41 @@ msgstr "" "rapporteer dit a.u.b. aan %s;\n" "teruggevallen op polsen" -#: src/tail.c:964 +#: src/tail.c:963 #, c-format msgid "%s has become inaccessible" msgstr "%s is ontoegankelijk geworden" -#: src/tail.c:981 +#: src/tail.c:980 #, 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:990 +#: src/tail.c:989 #, 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:1011 +#: src/tail.c:1010 #, c-format msgid "%s has become accessible" msgstr "%s is toegankelijk geworden" -#: src/tail.c:1019 +#: src/tail.c:1018 #, 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:1030 +#: src/tail.c:1029 #, 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:1131 +#: src/tail.c:1130 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: kan niet-blokkerende modus niet wijzigen" @@ -11328,17 +11551,22 @@ msgstr "ontbrekende ']'" msgid "extra argument %s" msgstr "overtollig argument: %s" -#: src/timeout.c:124 +#: src/timeout.c:112 +#, fuzzy, c-format +msgid "warning: sigprocmask" +msgstr "Waarschuwing: kan timer niet aanmaken" + +#: src/timeout.c:145 #, c-format msgid "warning: timer_settime" msgstr "Waarschuwing: kan timertijd niet instellen" -#: src/timeout.c:129 +#: src/timeout.c:150 #, c-format msgid "warning: timer_create" msgstr "Waarschuwing: kan timer niet aanmaken" -#: src/timeout.c:204 +#: src/timeout.c:225 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -11347,18 +11575,17 @@ msgstr "" "Gebruik: %s [OPTIE] DUUR COMMANDO [ARGUMENT...]\n" " of: %s [OPTIE]\n" -#: src/timeout.c:208 -msgid "" -"Start COMMAND, and kill it if still running after DURATION.\n" -"\n" -"Mandatory arguments to long options are mandatory for short options too.\n" +#: src/timeout.c:229 +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" -"\n" -"Een verplicht argument bij een lange optie geldt ook voor de korte vorm.\n" -#: src/timeout.c:213 +#: src/timeout.c:235 +#, fuzzy msgid "" +" --preserve-status\n" +" exit with the same status as COMMAND, even when the\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 " @@ -11389,7 +11616,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:229 +#: src/timeout.c:254 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -11400,37 +11627,44 @@ 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:234 +#: src/timeout.c:259 msgid "" "\n" -"If the command times out, then exit with status 124. Otherwise, exit\n" -"with the status of COMMAND. If no signal is specified, send the TERM\n" -"signal upon timeout. The TERM signal kills any process that does not\n" -"block or catch that signal. For other processes, it may be necessary to\n" -"use the KILL (9) signal, since this signal cannot be caught. If the\n" -"KILL (9) signal is sent, the exit status is 128+9 rather than 124.\n" +"If the command times out, and --preserve-status is not set, then exit with\n" +"status 124. Otherwise, exit with the status of COMMAND. If no signal\n" +"is specified, send the TERM signal upon timeout. The TERM signal kills\n" +"any process that does not block or catch that signal. It may be necessary\n" +"to use the KILL (9) signal, since this signal cannot be caught, in which\n" +"case the exit status is 128+9 rather than 124.\n" msgstr "" "\n" -"Als de tijdslimiet van het commando verloopt, dan is de afsluitwaarde 124,\n" -"anders de afsluitwaarde van COMMANDO. Als geen signaal gespecificeerd is,\n" -"dan wordt bij tijdsoverschrijding het TERM-signaal verzonden -- dit signaal\n" -"beëindigt processen die het signaal niet blokkeren of afvangen. Voor " -"andere\n" -"processen kan het nodig zijn om het KILL-signaal (9) te gebruiken, omdat " +"Als de tijdslimiet van het commando verloopt, en '--preserve-status' is " +"niet\n" +"gegeven, dan is de afsluitwaarde 124, anders de afsluitwaarde van COMMANDO.\n" +"Als geen signaal gegeven is, dan wordt bij tijdsoverschrijding het TERM-" +"signaal\n" +"verzonden -- dit signaal beëindigt processen die het signaal niet blokkeren " +"of\n" +"afvangen. Het kan nodig zijn om het KILL-signaal (9) te gebruiken, omdat " "dit\n" -"signaal niet afgevangen kan worden. Als het KILL-signaal (9) gestuurd " -"wordt,\n" -"dan is de afsluitwaarde 128+9 in plaats van 124.\n" +"signaal niet afgevangen kan worden -- in dat geval is de afsluitwaarde " +"128+9\n" +"in plaats van 124.\n" -#: src/timeout.c:419 +#: src/timeout.c:363 +#, c-format +msgid "warning: disabling core dumps failed" +msgstr "waarschuwing: uitschakelen van geheugendumps is mislukt" + +#: src/timeout.c:471 #, c-format msgid "error waiting for command" msgstr "fout bij het wachten op commando" -#: src/timeout.c:441 +#: src/timeout.c:482 #, c-format -msgid "warning: disabling core dumps failed" -msgstr "waarschuwing: uitschakelen van geheugendumps is mislukt" +msgid "the monitored command dumped core" +msgstr "het gemonitorde commando heeft een geheugendump gemaakt" #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 @@ -11442,22 +11676,22 @@ msgstr "Jim Kingdon" msgid "Randy Smith" msgstr "Randy Smith" -#: src/touch.c:115 src/touch.c:313 +#: src/touch.c:115 src/touch.c:309 #, c-format msgid "invalid date format %s" msgstr "ongeldige datumopmaak %s" -#: src/touch.c:194 +#: src/touch.c:191 #, c-format msgid "cannot touch %s" msgstr "kan tijdsstempels van %s niet wijzigen" -#: src/touch.c:200 +#: src/touch.c:197 #, c-format msgid "setting times of %s" msgstr "instellen van tijdsstempels van %s" -#: src/touch.c:216 +#: src/touch.c:213 msgid "" "Update the access and modification times of each FILE to the current time.\n" "\n" @@ -11466,10 +11700,8 @@ msgid "" "\n" "A FILE argument string of - is handled specially and causes touch to\n" "change the times of the file associated with standard output.\n" -"\n" msgstr "" -"De toegangs- en wijzigingstijden van elk BESTAND op de huidige tijd " -"instellen.\n" +"Stelt de toegangs- en wijzigingstijden van elk BESTAND op de huidige tijd.\n" "\n" "Elk BESTANDsargument dat niet bestaat wordt als een leeg bestand " "aangemaakt,\n" @@ -11478,9 +11710,8 @@ msgstr "" "Het BESTANDsargument '-' wordt speciaal behandeld: het zorgt ervoor dat " "'touch'\n" "de tijdsstempels van het bestand verbonden met standaarduitvoer wijzigt.\n" -"\n" -#: src/touch.c:229 +#: src/touch.c:225 msgid "" " -a change only the access time\n" " -c, --no-create do not create any files\n" @@ -11494,7 +11725,7 @@ msgstr "" " in plaats van de huidige tijd\n" " -f (genegeerde optie)\n" -#: src/touch.c:235 +#: src/touch.c:231 msgid "" " -h, --no-dereference affect each symbolic link instead of any " "referenced\n" @@ -11508,11 +11739,11 @@ msgstr "" " symbolische koppeling veranderd kan worden)\n" " -m alleen de wijzigingstijd veranderen\n" -#: src/touch.c:241 +#: src/touch.c:237 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" -" --time=WORD change the specified time:\n" +" --time=WORD change the specified time:\n" " WORD is access, atime, or use: equivalent to -a\n" " WORD is modify or mtime: equivalent to -m\n" msgstr "" @@ -11524,7 +11755,7 @@ msgstr "" " 'modify' of 'mtime': hetzelfde als '-m'\n" "\n" -#: src/touch.c:250 +#: src/touch.c:246 msgid "" "\n" "Note that the -d and -t options accept different time-date formats.\n" @@ -11534,12 +11765,12 @@ msgstr "" "verwachten.\n" # De vertaling zegt wat het vage origineel precies bedoelt. -#: src/touch.c:339 +#: src/touch.c:335 #, c-format msgid "cannot specify times from more than one source" msgstr "optie '-t' gaat niet samen met '-d' of '-r'" -#: src/touch.c:413 +#: src/touch.c:409 #, c-format msgid "" "warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'" @@ -11831,28 +12062,27 @@ msgid "" "If a FILE is larger than the specified size, the extra data is lost.\n" "If a FILE is shorter, it is extended and the extended part (hole)\n" "reads as zero bytes.\n" -"\n" msgstr "" -"Elk gegeven BESTAND vergroten of verkleinen tot de gespecificeerde grootte.\n" +"Vergroot of verkleint elk gegeven BESTAND tot de gespecificeerde grootte.\n" "\n" "Een BESTAND dat nog niet bestaat wordt aangemaakt.\n" +"\n" "Als een BESTAND groter is dan de gespecificeerde grootte, dan gaan de extra\n" "gegevens verloren. Als een BESTAND kleiner is, dan wordt het uitgebreid en\n" "het \"toegevoegde\" deel (een gat) leest als nul-bytes.\n" -"\n" -#: src/truncate.c:110 +#: src/truncate.c:109 msgid " -c, --no-create do not create any files\n" msgstr " -c, --no-create geen bestanden aanmaken\n" -#: src/truncate.c:113 +#: src/truncate.c:112 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" " -o, --io-blocks GROOTTE zien als aantal IO-blokken in plaats van " "bytes\n" -#: src/truncate.c:116 +#: 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" @@ -11860,7 +12090,7 @@ msgstr "" " -r, --reference=BESTAND de grootte van dit BESTAND gebruiken\n" " -s, --size=GROOTTE deze GROOTTE gebruiken\n" -#: src/truncate.c:122 +#: src/truncate.c:121 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -11873,57 +12103,57 @@ msgstr "" "'/' naar beneden afronden op een veelvoud van,\n" "'%' naar boven afronden op een veelvoud van.\n" -#: src/truncate.c:150 +#: src/truncate.c:149 #, c-format msgid "overflow in %<PRIdMAX> * %<PRIdMAX> byte blocks for file %s" msgstr "overloop in %<PRIdMAX> * %<PRIdMAX>-byte blokken voor bestand %s" -#: src/truncate.c:174 +#: src/truncate.c:173 #, c-format msgid "%s has unusable, apparently negative size" msgstr "%s: bestand heeft een onbruikbare, kennelijk negatieve grootte" -#: src/truncate.c:184 src/truncate.c:379 +#: src/truncate.c:183 src/truncate.c:384 #, c-format msgid "cannot get the size of %s" msgstr "kan de grootte van %s niet achterhalen" -#: src/truncate.c:206 +#: src/truncate.c:205 #, c-format msgid "overflow rounding up size of file %s" msgstr "overloop bij naar boven afronden van de grootte van bestand %s" -#: src/truncate.c:216 +#: src/truncate.c:215 #, c-format msgid "overflow extending size of file %s" msgstr "overloop bij het vergroten van de grootte van bestand %s" -#: src/truncate.c:231 +#: src/truncate.c:230 #, c-format msgid "failed to truncate %s at %<PRIdMAX> bytes" msgstr "afkorten van %s op %<PRIdMAX> bytes is mislukt" -#: src/truncate.c:305 +#: src/truncate.c:303 #, c-format msgid "multiple relative modifiers specified" msgstr "er is meer dan één relatieve wijziging opgegeven" -#: src/truncate.c:335 +#: src/truncate.c:333 #, c-format msgid "you must specify either %s or %s" msgstr "u moet ofwel %s ofwel %s opgeven" -#: src/truncate.c:342 +#: src/truncate.c:340 #, c-format msgid "you must specify a relative %s with %s" msgstr "u moet een relatieve %s opgeven bij %s" -#: src/truncate.c:349 +#: src/truncate.c:347 #, c-format msgid "%s was specified but %s was not" msgstr "%s is gespecificeerd maar %s niet" -#: src/truncate.c:400 +#: src/truncate.c:404 #, c-format msgid "cannot open %s for writing" msgstr "kan %s niet openen om te schrijven" @@ -12027,15 +12257,13 @@ msgstr "kan de naam van het systeem niet verkrijgen" msgid "" "Convert blanks in each FILE to tabs, writing to standard output.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" -"Elk BESTAND naar standaarduitvoer sturen met witruimte geconverteerd naar " +"Stuurt elk BESTAND naar standaarduitvoer met witruimte geconverteerd naar " "tabs.\n" "\n" "Zonder BESTAND, of wanneer BESTAND - is, wordt standaardinvoer gelezen.\n" -"\n" -#: src/unexpand.c:125 +#: src/unexpand.c:124 msgid "" " -a, --all convert all blanks, instead of just initial blanks\n" " --first-only convert only leading sequences of blanks (overrides -a)\n" @@ -12051,12 +12279,12 @@ msgstr "" "(idem)\n" "\n" -#: src/unexpand.c:153 +#: src/unexpand.c:152 #, c-format msgid "tabs are too far apart" msgstr "tabposities zijn te ver uit elkaar" -#: src/unexpand.c:505 +#: src/unexpand.c:504 #, c-format msgid "tab stop value is too large" msgstr "tabpositie is te groot" @@ -12074,14 +12302,13 @@ msgid "" "writing to OUTPUT (or standard output).\n" "\n" "With no options, matching lines are merged to the first occurrence.\n" -"\n" msgstr "" -"Bij elkaar staande gelijke regels uit INVOER (of standaardinvoer)\n" -"uitfilteren en eenmalig schrijven naar UITVOER (of standaarduitvoer).\n" +"Filtert duplicaten van voorgaande regels uit INVOER (of standaardinvoer)\n" +"en schrijft naar UITVOER (of standaarduitvoer).\n" "\n" -"Zonder opties worden gelijke regels samengevoegd bij eerste voorkomen.\n" +"Zonder opties worden identieke regels samengedrukt tot één voorkomen.\n" -#: src/uniq.c:148 +#: src/uniq.c:147 msgid "" " -c, --count prefix lines by the number of occurrences\n" " -d, --repeated only print duplicate lines\n" @@ -12090,7 +12317,7 @@ msgstr "" " -d, --repeated alleen de regels tonen die meerdere keren " "voorkomen\n" -#: src/uniq.c:152 +#: src/uniq.c:151 msgid "" " -D, --all-repeated[=delimit-method] print all duplicate lines\n" " delimit-method={none(default),prepend,separate}\n" @@ -12113,13 +12340,13 @@ msgstr "" " -u, --unique alleen unieke regels tonen\n" " -z, --zero-terminated regels afsluiten met 0-byte, niet met nieuweregel\n" -#: src/uniq.c:162 +#: src/uniq.c:161 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:167 +#: src/uniq.c:166 msgid "" "\n" "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n" @@ -12129,7 +12356,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:172 +#: src/uniq.c:171 msgid "" "\n" "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n" @@ -12143,24 +12370,24 @@ msgstr "" "'uniq'.\n" "Verder volgt de vergelijking de regels gespecificeerd door 'LC_COLLATE'.\n" -#: src/uniq.c:359 +#: src/uniq.c:358 #, c-format msgid "too many repeated lines" msgstr "te veel herhaalde regels" -#: src/uniq.c:522 +#: src/uniq.c:521 msgid "invalid number of fields to skip" msgstr "ongeldig aantal velden om over te slaan" -#: src/uniq.c:531 +#: src/uniq.c:530 msgid "invalid number of bytes to skip" msgstr "ongeldig aantal bytes om over te slaan" -#: src/uniq.c:540 +#: src/uniq.c:539 msgid "invalid number of bytes to compare" msgstr "ongeldig aantal bytes om te vergelijken" -#: src/uniq.c:559 +#: src/uniq.c:558 #, c-format msgid "printing all duplicated lines and repeat counts is meaningless" msgstr "alle herhaalde regels én de herhalingsaantallen tonen is onzin" @@ -12180,7 +12407,7 @@ msgid "" "Call the unlink function to remove the specified FILE.\n" "\n" msgstr "" -"Het gegeven BESTAND verwijderen via de unlink()-functie.\n" +"Verwijdert het gegeven BESTAND via de unlink()-functie.\n" "\n" #: src/unlink.c:86 @@ -12215,6 +12442,11 @@ msgid_plural "up %ld days %2d:%02d, " msgstr[0] "in bedrijf %ld dag %2d:%02d, " msgstr[1] "in bedrijf %ld dagen %2d:%02d, " +#: src/uptime.c:149 +#, c-format +msgid "up %2d:%02d, " +msgstr "in bedrijf %2d:%02d, " + #: src/uptime.c:151 #, c-format msgid "%lu user" @@ -12234,7 +12466,7 @@ msgid "" "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 "" -"De huidige tijd tonen, de tijdsduur dat het systeem in bedrijf is, het " +"Toont de huidige tijd, de tijdsduur dat het systeem in bedrijf is, het " "aantal\n" "gebruikers op het systeem, en het gemiddelde aantal taken dat uitgevoerd " "werd\n" @@ -12272,7 +12504,7 @@ msgid "" "If FILE is not specified, use %s. %s as FILE is common.\n" "\n" msgstr "" -"Tonen wie er (volgens BESTAND) momenteel ingelogd zijn.\n" +"Toont wie er (volgens BESTAND) momenteel ingelogd zijn.\n" "\n" "Als geen BESTAND gegeven is, wordt %s gebruikt.\n" "Gewoonlijk wordt %s als BESTAND meegegeven.\n" @@ -12290,7 +12522,7 @@ msgid "" " -m, --chars print the character counts\n" " -l, --lines print the newline counts\n" msgstr "" -"Het aantal regels, woorden en bytes voor elk gegeven BESTAND tonen, plus " +"Toont het aantal regels, woorden en bytes voor elk gegeven BESTAND, plus " "een\n" "totaalscore als meer dan één BESTAND gegeven is. Een woord is een " "tekenreeks\n" @@ -12329,40 +12561,40 @@ msgid " old " msgstr " oud " # Maximaal 12 tekens. -#: src/who.c:449 +#: src/who.c:440 msgid "system boot" msgstr "gestart" -#: src/who.c:456 src/who.c:458 +#: src/who.c:447 src/who.c:449 msgid "id=" msgstr "id=" -#: src/who.c:471 src/who.c:476 +#: src/who.c:462 src/who.c:467 msgid "term=" msgstr "term=" -#: src/who.c:473 src/who.c:477 +#: src/who.c:464 src/who.c:468 msgid "exit=" msgstr "exit=" # Maximaal 8 tekens. -#: src/who.c:494 +#: src/who.c:485 msgid "LOGIN" msgstr "LOGIN" -#: src/who.c:514 +#: src/who.c:505 msgid "clock change" msgstr "klok is verzet" -#: src/who.c:526 src/who.c:527 +#: src/who.c:517 src/who.c:518 msgid "run-level" msgstr "run-level" -#: src/who.c:530 src/who.c:531 +#: src/who.c:521 src/who.c:522 msgid "last=" msgstr "vorige=" -#: src/who.c:562 +#: src/who.c:553 #, c-format msgid "" "\n" @@ -12371,46 +12603,46 @@ msgstr "" "\n" "aantal gebruikers=%lu\n" -#: src/who.c:568 +#: src/who.c:559 msgid "NAME" msgstr "NAAM" -#: src/who.c:568 +#: src/who.c:559 msgid "LINE" msgstr "TERMINAL" -#: src/who.c:568 +#: src/who.c:559 msgid "TIME" msgstr "TIJD" # Maximaal zes tekens. -#: src/who.c:568 +#: src/who.c:559 msgid "IDLE" msgstr "LEDIG" -#: src/who.c:569 +#: src/who.c:560 msgid "PID" msgstr "PID" # Maximaal zeven tekens. -#: src/who.c:569 +#: src/who.c:560 msgid "COMMENT" msgstr "NOTITIE" -#: src/who.c:569 +#: src/who.c:560 msgid "EXIT" msgstr "AFSLUITING" -#: src/who.c:649 +#: src/who.c:640 #, c-format msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n" msgstr "Gebruik: %s [OPTIE...] [ BESTAND | ARGUMENT1 ARGUMENT2 ]\n" -#: src/who.c:650 +#: src/who.c:641 msgid "Print information about users who are currently logged in.\n" -msgstr "Informatie tonen over gebruikers die nu zijn ingelogd.\n" +msgstr "Toont informatie over gebruikers die nu zijn ingelogd.\n" -#: src/who.c:653 +#: src/who.c:644 msgid "" "\n" " -a, --all same as -b -d --login -p -r -t -T -u\n" @@ -12424,11 +12656,11 @@ msgstr "" " -d, --dead dode processen tonen\n" " -H, --heading een regel met kolomkoppen tonen\n" -#: src/who.c:660 +#: src/who.c:651 msgid " -l, --login print system login processes\n" msgstr " -l, --login de inlogprocessen tonen\n" -#: src/who.c:663 +#: src/who.c:654 msgid "" " --lookup attempt to canonicalize hostnames via DNS\n" " -m only hostname and user associated with stdin\n" @@ -12439,7 +12671,7 @@ msgstr "" "standaardinvoer\n" " -p, --process de actieve processen gestart door 'init' tonen\n" -#: src/who.c:668 +#: src/who.c:659 msgid "" " -q, --count all login names and number of users logged on\n" " -r, --runlevel print current runlevel\n" @@ -12451,7 +12683,7 @@ msgstr "" " -s, --short alleen naam, terminal, en inlogtijd tonen (standaard)\n" " -t, --time de laatste wijziging van de systeemklok tonen\n" -#: src/who.c:674 +#: src/who.c:665 msgid "" " -T, -w, --mesg add user's message status as +, - or ?\n" " -u, --users list users logged in\n" @@ -12465,7 +12697,7 @@ msgstr "" " --writable hetzelfde als '-T'\n" "\n" -#: src/who.c:682 +#: src/who.c:673 #, c-format msgid "" "\n" @@ -12485,7 +12717,7 @@ msgid "" "Same as id -un.\n" "\n" msgstr "" -"De gebruikersnaam tonen die hoort bij het huidige effectieve gebruikers-ID.\n" +"Toont de gebruikersnaam die hoort bij het huidige effectieve gebruikers-ID.\n" "(Hetzelfde als 'id -un'.)\n" "\n" @@ -12509,9 +12741,188 @@ msgid "" "Repeatedly output a line with all specified STRING(s), or 'y'.\n" "\n" msgstr "" -"Voortdurend een regel met de gegeven TEKST (of anders 'y') produceren.\n" +"Produceert voortdurend een regel met de gegeven TEKST (of anders 'y').\n" "\n" +#~ msgid "using single-precision arithmetic" +#~ msgstr "berekening met enkelvoudige precisie wordt gebruikt" + +#~ msgid "using arbitrary-precision arithmetic" +#~ msgstr "berekening met willekeurige precisie wordt gebruikt" + +#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n" +#~ msgstr "" +#~ "\tGebruik: %s [OPTIE...] [GETAL]\n" +#~ "\n" + +#~ msgid "no valid suffix found\n" +#~ msgstr "geen geldig achtervoegsel gevonden\n" + +#~ msgid "reading %s" +#~ msgstr "lezen van %s" + +#~ msgid "writing %s" +#~ msgstr "schrijven van %s" + +#~ msgid "closing %s" +#~ msgstr "sluiten van %s" + +#~ msgid "accessing %s" +#~ msgstr "zoeken van toegang tot %s" + +#~ msgid "opening %s" +#~ msgstr "openen van %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 mappen op andere bestandssystemen overslaan\n" +#~ " -X, --exclude-from=LST bestanden uitsluiten die overeenkomen met een\n" +#~ " patroon uit het bestand LST\n" +#~ " --exclude=PATROON bestanden uitluiten die overeenkomen met " +#~ "PATROON\n" +#~ " -d, --max-depth=GETAL het totaal voor een map of bestand alleen tonen " +#~ "als\n" +#~ " deze GETAL of minder niveaus onder het begin " +#~ "ligt;\n" +#~ " '--max-depth=0' is hetzelfde als '--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 nooit reservekopieën maken (zelfs niet met '--" +#~ "backup')\n" +#~ " numbered, t genummerde reservekopieën maken\n" +#~ " existing, nil genummerde reserves maken als er al zijn, anders " +#~ "simpele\n" +#~ " simple, never altijd simpele reservekopieën maken\n" +#~ "\n" + +#~ msgid "" +#~ "WARNING: --page-increment is deprecated; use --line-increment instead" +#~ msgstr "" +#~ "WAARSCHUWING: optie '--page-increment' is verouderd;\n" +#~ "gebruik in plaats daarvan '--line-increment'" + +#~ msgid "All arguments to long options are mandatory for short options.\n" +#~ msgstr "" +#~ "(Een verplicht argument bij een lange optie geldt ook voor de korte " +#~ "vorm.)\n" +#~ "\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" +#~ "GROND is d voor decimaal, o voor octaal, x voor hexadecimaal, of n voor " +#~ "geen.\n" +#~ "Met voorvoegsel 0x of 0X is AANTAL hexadecimaal; mogelijke " +#~ "vermenigvuldigings-\n" +#~ "achtervoegsels zijn: 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, Y.\n" +#~ "Met een achtergevoegde z worden aan het eind van iedere regel met bytes " +#~ "de\n" +#~ "corresponderende afdrukbare tekens toegevoegd.\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 "" +#~ " \n" +#~ "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:" + +#~ msgid "getpass: cannot open /dev/tty" +#~ msgstr "getpass(): kan /dev/tty niet openen" + +#~ msgid "cannot set groups" +#~ msgstr "kan de groepen niet instellen" + +#~ msgid "cannot set group id" +#~ msgstr "kan groeps-ID niet instellen" + +#~ msgid "cannot set user id" +#~ msgstr "kan gebruikers-ID niet instellen" + +#~ msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" +#~ msgstr "" +#~ "Gebruik: %s [OPTIE...] [-] [GEBRUIKER [ARGUMENT...]]\n" +#~ "\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 "" +#~ "Het effectieve gebruikers-ID en groeps-ID wijzigen in die van GEBRUIKER.\n" +#~ "\n" +#~ " -, -l, --login van de shell een login-shell maken\n" +#~ " -c, --command=COMMANDO een enkel COMMANDO naar de shell sturen " +#~ "met '-c'\n" +#~ " -f, --fast '-f' aan de shell meegeven (voor 'csh' of " +#~ "'tcsh')\n" +#~ " -m, --preserve-environment de omgevingsvariabelen niet resetten\n" +#~ " -p hetzelfde als '-m'\n" +#~ " -s, --shell=SHELL SHELL uitvoeren (als /etc/shells dit " +#~ "toestaat)\n" +#~ "\n" + +#~ msgid "" +#~ "\n" +#~ "A mere - implies -l. If USER not given, assume root.\n" +#~ msgstr "" +#~ "\n" +#~ "Een simpele - betekent -l. Als geen GEBRUIKER gegeven is, wordt root " +#~ "begrepen.\n" + +#~ msgid "user %s does not exist" +#~ msgstr "gebruiker %s bestaat niet" + +#~ msgid "incorrect password" +#~ msgstr "onjuist wachtwoord" + +#~ msgid "using restricted shell %s" +#~ msgstr "ingeperkte shell %s wordt gebruikt" + +#~ msgid "warning: cannot change directory to %s" +#~ msgstr "waarschuwing: kan map niet wijzigen in %s" + #~ msgid "" #~ "\n" #~ "Examples:\n" @@ -12710,9 +13121,6 @@ msgstr "" #~ msgid "invalid number of lines: 0" #~ msgstr "ongeldig aantal regels: 0" -#~ msgid "invalid format width" -#~ msgstr "ongeldige opmaakbreedte" - #~ msgid "invalid format precision" #~ msgstr "ongeldige opmaakprecisie" diff --git a/po/pl.gmo b/po/pl.gmo index 713ba0e4..787b6b09 100644 Binary files a/po/pl.gmo and b/po/pl.gmo differ diff --git a/po/pl.po b/po/pl.po index e6e5c05f..a4f29744 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 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 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. # Contributions: -# Rafał Maszkowski <rzm@icm.edu.pl> 1996-2001, 2003-2012. +# Rafał Maszkowski <rzm@icm.edu.pl> 1996-2001, 2003-2013. # 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.16\n" +"Project-Id-Version: coreutils 8.20-pre3\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2012-05-10 19:35+0200\n" -"PO-Revision-Date: 2012-03-27 00:00+0200\n" +"POT-Creation-Date: 2013-02-14 15:56+0000\n" +"PO-Revision-Date: 2013-02-13 15:30+0100\n" "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n" "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n" "Language: pl\n" @@ -45,19 +45,19 @@ msgstr "Prawidłowe argumenty to:" msgid "error closing file" msgstr "błąd zamknięcia pliku" -#: lib/closeout.c:112 src/base64.c:109 src/base64.c:121 src/base64.c:127 -#: src/base64.c:168 src/base64.c:224 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:330 src/expand.c:355 src/head.c:298 -#: src/head.c:348 src/head.c:756 src/head.c:797 src/mktemp.c:350 src/od.c:919 -#: src/paste.c:160 src/shuf.c:369 src/split.c:727 src/split.c:964 -#: src/split.c:969 src/tail.c:350 src/tail.c:1201 src/tail.c:1307 +#: 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 -#: src/unexpand.c:427 src/unexpand.c:443 +#: 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:1160 src/copy.c:2602 +#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617 #, c-format msgid "preserving permissions for %s" msgstr "zachowanie uprawnień %s" @@ -197,70 +197,70 @@ msgstr "Nieznany błąd" #: lib/getopt.c:547 lib/getopt.c:576 #, c-format msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: opcja '%s' jest niejednoznaczna; możliwości:" +msgstr "%s: opcja „%s” jest niejednoznaczna; możliwości:" #: lib/getopt.c:624 lib/getopt.c:628 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: opcja '--%s' nie może mieć argumentu\n" +msgstr "%s: opcja „--%s” nie może mieć argumentu\n" #: lib/getopt.c:637 lib/getopt.c:642 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" -msgstr "%s: opcja '%c%s' nie może mieć argumentu\n" +msgstr "%s: opcja „%c%s” nie może mieć argumentu\n" #: lib/getopt.c:685 lib/getopt.c:704 #, c-format msgid "%s: option '--%s' requires an argument\n" -msgstr "%s: opcja '--%s' wymaga argumentu\n" +msgstr "%s: opcja „--%s” wymaga argumentu\n" #: lib/getopt.c:742 lib/getopt.c:745 #, c-format msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: nierozpoznana opcja '--%s'\n" +msgstr "%s: nierozpoznana opcja „--%s”\n" #: lib/getopt.c:753 lib/getopt.c:756 #, c-format msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: nierozpoznana opcja '%c%s'\n" +msgstr "%s: nierozpoznana opcja „--%c%s”\n" #: lib/getopt.c:805 lib/getopt.c:808 #, c-format msgid "%s: invalid option -- '%c'\n" -msgstr "%s: błędna opcja -- '%c'\n" +msgstr "%s: błędna opcja -- „%c”\n" #: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 #, c-format msgid "%s: option requires an argument -- '%c'\n" -msgstr "%s: opcja wymaga argumentu -- '%c'\n" +msgstr "%s: opcja wymaga argumentu -- „%c”\n" #: lib/getopt.c:934 lib/getopt.c:950 #, c-format msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: opcja '-W %s' jest niejednoznaczna\n" +msgstr "%s: opcja „-W %s” jest niejednoznaczna\n" #: lib/getopt.c:974 lib/getopt.c:992 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: opcja '-W %s' nie może mieć argumentu\n" +msgstr "%s: opcja „-W %s” nie może mieć argumentu\n" #: lib/getopt.c:1013 lib/getopt.c:1031 #, c-format msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: opcja '-W %s' wymaga argumentu\n" +msgstr "%s: opcja „-W %s” wymaga argumentu\n" -#: lib/mkdir-p.c:196 src/install.c:483 +#: lib/mkdir-p.c:196 src/install.c:484 #, c-format msgid "cannot change permissions of %s" msgstr "nie można zmienić uprawnień do %s" -#: lib/mkdir-p.c:206 src/copy.c:2261 src/install.c:709 src/install.c:722 +#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722 #, 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:915 src/tac.c:435 +#: src/split.c:929 src/tac.c:434 #, c-format msgid "memory exhausted" msgstr "brak pamięci" @@ -309,76 +309,76 @@ msgstr "”" msgid "%s: end of file" msgstr "%s: koniec pliku" -#: lib/regcomp.c:130 +#: lib/regcomp.c:131 msgid "Success" msgstr "Sukces" -#: lib/regcomp.c:133 +#: lib/regcomp.c:134 msgid "No match" msgstr "Brak dopasowania" -#: lib/regcomp.c:136 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "Błędne wyrażenie regularne" # ? - rzm -#: lib/regcomp.c:139 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "Znak błędny dla bieżącego uporządkowania" -#: lib/regcomp.c:142 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "Błędna nazwa klasy znaków" -#: lib/regcomp.c:145 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "Końcowy ukośnik odwrotny" -#: lib/regcomp.c:148 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "Błędne odwołanie" -#: lib/regcomp.c:151 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "Niesparowany [ lub [^" -#: lib/regcomp.c:154 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "Niesparowany ( lub \\(" -#: lib/regcomp.c:157 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "Niedopasowany \\{" -#: lib/regcomp.c:160 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "Błędna zawartość \\{\\}" -#: lib/regcomp.c:163 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "Błędny koniec zakresu" -#: lib/regcomp.c:166 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Brak pamięci" -#: lib/regcomp.c:169 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "Błędne wyrażenie regularne" -#: lib/regcomp.c:172 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "Przedwczesny koniec szukania wyrażenia regularnego" -#: lib/regcomp.c:175 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "Za duże wyrażenie regularne" -#: lib/regcomp.c:178 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "Niesparowany ) lub \\)" -#: lib/regcomp.c:703 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "Brak poprzedniego wyrażenia regularnego" @@ -417,7 +417,7 @@ msgstr "^[yYtT]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-mode-acl.c:695 src/copy.c:2284 src/cp.c:518 +#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516 #, c-format msgid "setting permissions for %s" msgstr "nie można ustawić uprawnień do %s" @@ -558,13 +558,13 @@ msgstr "Brak zasilania" msgid "Resource lost" msgstr "Utracony zasób" -#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262 -#: lib/spawn-pipe.c:265 +#: 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:232 lib/spawn-pipe.c:346 lib/wait-process.c:282 +#: 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" @@ -580,24 +580,24 @@ msgstr "Sygnał czasu rzeczywistego nr %d" msgid "Unknown signal %d" msgstr "Nieznany sygnał nr %d" -#: lib/unicodeio.c:103 +#: lib/unicodeio.c:102 msgid "iconv function not usable" msgstr "nie można użyć funkcji iconv" -#: lib/unicodeio.c:105 +#: lib/unicodeio.c:104 msgid "iconv function not available" msgstr "funkcja iconv nie jest dostępna" -#: lib/unicodeio.c:112 +#: lib/unicodeio.c:111 msgid "character out of range" msgstr "znak spoza zakresu" -#: lib/unicodeio.c:182 +#: lib/unicodeio.c:181 #, c-format msgid "cannot convert U+%04X to local character set" msgstr "nie można przekształcić U+%04X do lokalnego zestawu znaków" -#: lib/unicodeio.c:184 +#: lib/unicodeio.c:183 #, c-format msgid "cannot convert U+%04X to local character set: %s" msgstr "nie można przekształcić U+%04X do lokalnego zestawu znaków: %s" @@ -779,7 +779,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:562 +#: lib/version-etc.c:251 src/system.h:573 #, c-format msgid "%s home page: <%s>\n" msgstr "strona domowa %s: %s\n" @@ -789,7 +789,7 @@ 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:563 +#: lib/version-etc.c:256 src/system.h:574 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" @@ -842,7 +842,7 @@ msgstr "nie udało się porównanie napisów" #: lib/xmemcoll.c:40 #, c-format msgid "Set LC_ALL='C' to work around the problem." -msgstr "Ustaw LC_ALL='C' żeby obejść problem" +msgstr "Ustaw LC_ALL=C żeby obejść problem" #: lib/xmemcoll.c:42 #, c-format @@ -857,17 +857,17 @@ msgstr "nie można wykonać formatowanych danych wyjściowych" #: lib/xstrtol-error.c:63 #, c-format msgid "invalid %s%s argument '%s'" -msgstr "%s%s - błędny argument '%s'" +msgstr "%s%s - błędny argument „%s”" #: lib/xstrtol-error.c:68 #, c-format msgid "invalid suffix in %s%s argument '%s'" -msgstr "%s%s - błędny przyrostek '%s'" +msgstr "%s%s - błędny przyrostek „%s”" #: lib/xstrtol-error.c:72 #, c-format msgid "%s%s argument '%s' too large" -msgstr "%s%s - argument '%s' jest za duży" +msgstr "%s%s - argument „%s” jest za duży" #. This is a proper name. See the gettext manual, section Names. #: src/base64.c:40 @@ -879,13 +879,12 @@ msgstr "Simon Josefsson" msgid "" "Usage: %s [OPTION]... [FILE]\n" "Base64 encode or decode FILE, or standard input, to standard output.\n" -"\n" msgstr "" "Składnia: %s [OPCJA]... [PLIK]\n" "Zakodowane lub zdekodowanie kodem 64-znakowym (base64) PLIKU albo danych\n" "między standardowym wejściem i wyjściem.\n" -#: src/base64.c:64 +#: src/base64.c:67 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -902,7 +901,7 @@ msgstr "" " 76), 0 wyłącza zawijanie\n" "\n" -#: src/base64.c:73 src/cat.c:110 src/fmt.c:293 src/shuf.c:71 src/sum.c:70 +#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -911,7 +910,7 @@ msgstr "" "Jeżeli nie został podany PLIK albo podany jest jako -, czytane jest\n" "standardowe wejście.\n" -#: src/base64.c:76 +#: src/base64.c:79 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -926,37 +925,37 @@ msgstr "" "będzie\n" "próbował opuścić jakiekolwiek inne znaki nie z alfabetu base64.\n" -#: src/base64.c:171 src/base64.c:208 src/csplit.c:263 src/csplit.c:1435 -#: src/join.c:451 src/shuf.c:157 src/shuf.c:361 src/tac-pipe.c:74 +#: 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 #, c-format msgid "read error" msgstr "błąd czytania" -#: src/base64.c:227 +#: src/base64.c:230 #, c-format msgid "invalid input" msgstr "błędne dane wejściowe" -#: src/base64.c:264 +#: src/base64.c:267 #, c-format msgid "invalid wrap size: %s" msgstr "błędny rozmiar zawijania: %s" -#: src/base64.c:283 src/basename.c:173 src/comm.c:435 src/cp.c:607 -#: src/date.c:441 src/dircolors.c:447 src/du.c:894 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:169 src/install.c:929 src/join.c:961 -#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:157 src/mv.c:447 -#: src/od.c:1802 src/ptx.c:2081 src/readlink.c:154 src/seq.c:408 -#: src/shuf.c:320 src/shuf.c:339 src/sort.c:4477 src/split.c:1313 -#: src/tr.c:1797 src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:454 -#: src/uniq.c:471 src/unlink.c:81 src/uptime.c:250 src/users.c:146 -#: src/wc.c:666 src/who.c:836 src/whoami.c:79 +#: 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 #, c-format msgid "extra operand %s" msgstr "nadmiarowy argument %s" -#: src/base64.c:315 src/cat.c:781 +#: src/base64.c:318 src/cat.c:781 #, c-format msgid "closing standard input" msgstr "zamknięcie standardowego wejścia" @@ -964,15 +963,15 @@ 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/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:53 src/env.c:33 +#: 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/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:65 src/su.c:88 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 +#: 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 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -982,20 +981,18 @@ msgid "" "Usage: %s NAME [SUFFIX]\n" " or: %s OPTION... NAME...\n" msgstr "" -"Składnia: %s NAZWA [ROZSZERZENIE]\n" +"Składnia: %s NAZWA [PRZYROSTEK]\n" " albo: %s OPCJA... NAZWA...\n" #: src/basename.c:53 msgid "" "Print NAME with any leading directory components removed.\n" "If specified, also remove a trailing SUFFIX.\n" -"\n" msgstr "" "Wyświetla NAZWĘ, usuwając wszystkie poprzedzające składniki ścieżki.\n" "Jeśli jest podany, usuwa również PRZYROSTEK.\n" -"\n" -#: src/basename.c:59 +#: 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" @@ -1006,7 +1003,7 @@ msgstr "" " -z, --zero oddzielanie danych wyjściowych znakiem NUL, a nie\n" " znakiem nowej linii\n" -#: src/basename.c:66 +#: src/basename.c:67 #, c-format msgid "" "\n" @@ -1023,20 +1020,21 @@ msgstr "" " %s -s .h include/stdio.h -> \"stdio\"\n" " %s -a any/str1 any/str2 -> \"str1\", a po nim \"str2\"\n" -#: src/basename.c:167 src/chcon.c:531 src/chgrp.c:277 src/chmod.c:526 -#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1369 +#: 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:183 src/mkfifo.c:108 src/mknod.c:146 src/nohup.c:111 -#: src/pathchk.c:148 src/printf.c:674 src/readlink.c:146 src/realpath.c:236 -#: src/rm.c:314 src/rmdir.c:223 src/seq.c:402 src/setuidgid.c:137 -#: src/sleep.c:119 src/stat.c:1476 src/stdbuf.c:346 src/tr.c:1782 +#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 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 #, 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:52 src/split.c:49 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/split.c:49 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" @@ -1046,8 +1044,8 @@ msgstr "Torbjorn Granlund" msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:846 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4720 src/nl.c:182 src/paste.c:435 src/pr.c:2768 src/sum.c:58 +#: 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/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" @@ -1104,7 +1102,7 @@ msgstr "" msgid "cannot do ioctl on %s" msgstr "nie można wykonać ioctl na %s" -#: src/cat.c:637 src/dd.c:2209 src/sort.c:379 src/tee.c:165 src/yes.c:86 +#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86 #, c-format msgid "standard output" msgstr "standardowe wyjście" @@ -1121,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:55 src/head.c:46 src/hostid.c:33 +#: 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 msgid "Jim Meyering" msgstr "Jim Meyering" -#: src/chcon.c:100 src/runcon.c:203 src/runcon.c:234 +#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238 #, c-format msgid "failed to create security context: %s" msgstr "błąd tworzenia kontekstu bezpieczeństwa: %s" @@ -1138,8 +1136,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:540 src/copy.c:2222 src/runcon.c:217 -#: src/stat.c:683 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221 +#: src/stat.c:702 #, c-format msgid "failed to get security context of %s" msgstr "nie udało się odczytać kontekstu bezpieczeństwa %s" @@ -1155,12 +1153,12 @@ 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:446 src/ls.c:2981 +#: src/du.c:457 src/ls.c:2981 #, 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:426 +#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437 #, c-format msgid "cannot read directory %s" msgstr "nie można przeczytać katalogu %s" @@ -1170,13 +1168,13 @@ 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:599 +#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562 #, 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:618 -#: src/remove.c:613 +#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642 +#: src/remove.c:576 #, c-format msgid "fts_close failed" msgstr "błąd fts_close" @@ -1198,14 +1196,13 @@ msgid "" "Change the security context of each FILE to CONTEXT.\n" "With --reference, change the security context of each FILE to that of " "RFILE.\n" -"\n" msgstr "" "Zmiana kontekstu bezpieczeństwa każdego PLIKU na KONTEKST. Z opcją --" "reference:\n" "zmiana kontekstu bezpieczeństwa każdego PLIKU na taki jaki ma PLIK_WZ.\n" "\n" -#: src/chcon.c:362 src/chgrp.c:123 src/chown.c:94 +#: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94 msgid "" " --dereference affect the referent of each symbolic link (this is\n" " the default), rather than the symbolic link itself\n" @@ -1220,7 +1217,7 @@ msgstr "" "symbolicznych,\n" " a nie plików przez nie wskazywanych\n" -#: src/chcon.c:367 +#: src/chcon.c:369 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" @@ -1236,7 +1233,16 @@ msgstr "" " -l, --range=ZAKRES ustawienie ZAKRESU w docelowym kontekscie\n" " bezpieczeństwa\n" -#: src/chcon.c:373 +#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 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 bez traktowania katalogu „/” w specjalny sposób\n" +" (domyślnie)\n" +" --preserve-root odmowa rekusywnego działania na „/”\n" + +#: src/chcon.c:379 msgid "" " --reference=RFILE use RFILE's security context rather than " "specifying\n" @@ -1245,16 +1251,16 @@ msgstr "" " --reference=PLIK_WZ użycie kontekstu bezpieczeństwa pliku PLIK_WZ\n" " zamiast podanego KONTEKSTU\n" -#: src/chcon.c:377 src/chgrp.c:140 src/chown.c:118 +#: 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 zmiany też w plikach w podkatalogach\n" -#: src/chcon.c:380 +#: src/chcon.c:386 msgid " -v, --verbose output a diagnostic for every file processed\n" msgstr "" " -v, --verbose wypisanie informacji o każdym przetwarzanym pliku\n" -#: src/chcon.c:383 src/chgrp.c:143 src/chown.c:121 +#: src/chcon.c:389 src/chgrp.c:143 src/chown.c:121 msgid "" "\n" "The following options modify how a hierarchy is traversed when the -R\n" @@ -1279,36 +1285,36 @@ msgstr "" "(domyślnie)\n" "\n" -#: src/chcon.c:512 src/chgrp.c:264 src/chown.c:267 +#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267 #, c-format msgid "-R --dereference requires either -H or -L" msgstr "-R --dereference wymaga -H albo -L" -#: src/chcon.c:518 +#: src/chcon.c:524 #, c-format msgid "-R -h requires -P" msgstr "-R -h wymagają podania -P" -#: src/chcon.c:533 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282 -#: src/comm.c:429 src/csplit.c:1371 src/join.c:1149 src/link.c:79 -#: src/mknod.c:148 src/setuidgid.c:139 src/tr.c:1785 +#: 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 #, c-format msgid "missing operand after %s" msgstr "brakujący argument po %s" -#: src/chcon.c:556 src/runcon.c:247 +#: src/chcon.c:562 src/runcon.c:251 #, c-format msgid "invalid context: %s" msgstr "błędny kontekst: %s" -#: src/chcon.c:563 +#: src/chcon.c:569 #, c-format msgid "conflicting security context specifiers given" msgstr "podano sprzeczne specyfikacje kontekstów bezpieczeństwa" -#: src/chcon.c:572 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:433 src/cp.c:493 -#: src/mv.c:96 src/pwd.c:273 src/rm.c:324 src/touch.c:351 +#: 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 #, c-format msgid "failed to get attributes of %s" msgstr "nie udało się odczytać atrybutów %s" @@ -1355,15 +1361,6 @@ msgstr "" " (tylko dla systemów, które umieją zmienić\n" " właściciela dowiązania symbolicznego)\n" -#: src/chgrp.c:132 src/chmod.c:387 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 bez traktowania katalogu '/' w specjalny sposób\n" -" (domyślnie)\n" -" --preserve-root odmowa rekusywnego działania na '/'\n" - #: src/chgrp.c:136 msgid "" " --reference=RFILE use RFILE's group rather than specifying a\n" @@ -1467,7 +1464,7 @@ msgid "" "Each MODE is of the form '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n" msgstr "" "\n" -"UPRAWNIENIA mają formę '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n" +"UPRAWNIENIA mają formę „[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+”.\n" #: src/chmod.c:513 #, c-format @@ -1608,7 +1605,7 @@ msgstr "" "Właściciel nie będzie zmieniony, jeżeli nie został podany. Grupa nie będzie\n" "zmieniona, jeżeli nie została podana; będzie zmieniona na grupę główną, " "jeżeli\n" -"po WŁAŚCICIELU został podany ':'. WŁAŚCICIEL i GRUPA mogą być podane " +"po WŁAŚCICIELU został podany „:”. WŁAŚCICIEL i GRUPA mogą być podane " "zarówno\n" "numerycznie jak symbolicznie.\n" @@ -1632,7 +1629,7 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:97 src/install.c:575 src/setuidgid.c:110 src/setuidgid.c:120 +#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120 #, c-format msgid "invalid group %s" msgstr "błędna grupa %s" @@ -1679,8 +1676,8 @@ msgid "" "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n" msgstr "" "\n" -"Jeżeli nie jest podane żadne polecenie, uruchamiany jest '${SHELL} -i'\n" -"(domyślnie: '/bin/sh -i').\n" +"Jeżeli nie jest podane żadne polecenie, uruchamiany jest „${SHELL} -i”\n" +"(domyślnie: „/bin/sh -i”).\n" #: src/chroot.c:202 #, c-format @@ -1702,8 +1699,8 @@ msgstr "nie udało się ustawić identyfikatora grupy" 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:213 src/stdbuf.c:366 -#: src/timeout.c:402 +#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365 +#: src/timeout.c:454 #, c-format msgid "failed to run command %s" msgstr "nie udało się uruchomić polecenia %s" @@ -1791,7 +1788,7 @@ msgid "" msgstr "" "\n" "Zauważ, że porównania odbywają się zgodnie z regułami podanymi\n" -"przez 'LC_COLLATE'.\n" +"przez „LC_COLLATE”.\n" #: src/comm.c:137 #, c-format @@ -1824,20 +1821,24 @@ msgstr "podano wiele ograniczników" msgid "empty %s not allowed" msgstr "pusty %s nie jest dozwolony" -#: src/copy.c:168 src/dd.c:1609 src/dd.c:1976 +#: 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 #, c-format -msgid "reading %s" -msgstr "czytanie %s" +msgid "error reading %s" +msgstr "błąd czytania %s" -#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:426 +#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425 #, c-format msgid "cannot lseek %s" msgstr "nie można wykonać lseek na %s" -#: src/copy.c:206 src/dd.c:2039 src/dd.c:2102 +#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151 #, c-format -msgid "writing %s" -msgstr "zapis %s" +msgid "error writing %s" +msgstr "błąd zapisu %s" #: src/copy.c:313 #, c-format @@ -1859,7 +1860,7 @@ msgstr "nie udało się rozszerzyć %s" msgid "clearing permissions for %s" msgstr "kasowanie uprawnień dla %s" -#: src/copy.c:697 src/copy.c:2470 src/cp.c:331 +#: src/copy.c:697 src/copy.c:2480 src/cp.c:329 #, c-format msgid "failed to preserve ownership for %s" msgstr "nie udało się zachować własności %s" @@ -1874,14 +1875,14 @@ msgstr "nie udało się znaleźć pliku %s" msgid "failed to preserve authorship for %s" msgstr "nie udało się zachować autorstwa %s" -#: src/copy.c:804 src/csplit.c:638 src/du.c:901 src/fmt.c:449 src/head.c:847 -#: src/sort.c:4489 src/split.c:1329 src/tail.c:1756 src/wc.c:678 +#: 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 "nie można otworzyć %s do czytania" -#: src/copy.c:810 src/copy.c:972 src/dd.c:1546 src/dd.c:2114 src/dd.c:2252 -#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:141 +#: 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 #, c-format msgid "cannot fstat %s" msgstr "nie można wykonać fstat na %s" @@ -1901,14 +1902,14 @@ msgstr "nie udało się odczytać kontekstu utworzenia systemu plików" 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:1574 src/copy.c:1777 src/copy.c:1935 src/ln.c:314 -#: src/remove.c:267 src/remove.c:293 src/remove.c:444 src/remove.c:465 +#: 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 #, c-format msgid "cannot remove %s" msgstr "nie można usunąć %s" -#: src/copy.c:886 src/copy.c:1578 src/copy.c:1772 src/copy.c:1940 -#: src/remove.c:418 +#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945 +#: src/remove.c:375 #, c-format msgid "removed %s\n" msgstr "usunięty %s\n" @@ -1930,195 +1931,195 @@ msgstr "nie można utworzyć zwykłego pliku %s" msgid "failed to clone %s from %s" msgstr "nie udało się sklonować %s z %s" -#: src/copy.c:1098 src/copy.c:2531 +#: src/copy.c:1098 src/copy.c:2541 #, c-format msgid "preserving times for %s" msgstr "zachowanie czasu %s" -#: src/copy.c:1170 src/copy.c:1176 src/head.c:855 src/touch.c:175 -#: src/truncate.c:413 +#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172 +#: src/truncate.c:417 #, c-format -msgid "closing %s" -msgstr "zamykanie %s" +msgid "failed to close %s" +msgstr "nie udało się zamknąć %s" -#: src/copy.c:1466 +#: src/copy.c:1471 #, c-format msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? " msgstr "%s: zamazywanie %s, obejść uprawnienia %04lo (%s)? " -#: src/copy.c:1473 +#: src/copy.c:1478 #, c-format msgid "%s: overwrite %s? " msgstr "%s: zamazać %s? " -#: src/copy.c:1542 +#: src/copy.c:1547 #, c-format msgid " (backup: %s)" msgstr " (kopia zapasowa: %s)" -#: src/copy.c:1552 +#: src/copy.c:1557 #, 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:1584 +#: src/copy.c:1589 #, 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:1637 src/copy.c:1689 src/copy.c:2272 src/copy.c:2589 +#: 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:1220 src/truncate.c:365 +#: src/stat.c:1239 src/truncate.c:363 #, c-format msgid "cannot stat %s" msgstr "nie można wykonać stat na %s" -#: src/copy.c:1645 +#: src/copy.c:1650 #, c-format msgid "omitting directory %s" msgstr "katalog %s został pominięty" -#: src/copy.c:1659 +#: src/copy.c:1664 #, 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:1707 src/ln.c:246 +#: src/copy.c:1712 src/ln.c:246 #, c-format msgid "%s and %s are the same file" msgstr "%s i %s to ten sam plik" -#: src/copy.c:1806 +#: src/copy.c:1811 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "nie można zamazać nie-katalogu %s katalogiem %s" -#: src/copy.c:1824 src/ln.c:214 +#: src/copy.c:1829 src/ln.c:214 #, 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:1842 +#: src/copy.c:1847 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "nie można zamazać katalogu %s nie-katalogiem" -#: src/copy.c:1856 +#: src/copy.c:1861 #, 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:1886 +#: src/copy.c:1891 #, 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:1887 +#: src/copy.c:1892 #, 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:1910 src/ln.c:276 +#: src/copy.c:1915 src/ln.c:276 #, c-format msgid "cannot backup %s" msgstr "nie można utworzyć kopii zapasowej %s" -#: src/copy.c:1974 +#: src/copy.c:1979 #, 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:2051 +#: src/copy.c:2056 #, 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:2068 +#: src/copy.c:2073 #, 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:2118 +#: src/copy.c:2123 #, 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:2161 +#: src/copy.c:2166 #, c-format msgid "cannot move %s to %s" msgstr "nie można przenieść %s do %s" -#: src/copy.c:2173 +#: src/copy.c:2178 #, 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:2207 src/install.c:905 src/mkdir.c:189 src/mkfifo.c:114 -#: src/mknod.c:167 +#: 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:2241 +#: src/copy.c:2246 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "nie można skopiować cyklicznego dowiązania symbolicznego %s" -#: src/copy.c:2350 +#: src/copy.c:2355 #, 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:2357 +#: src/copy.c:2362 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "nie można utworzyć dowiązania symbolicznego %s do %s" -#: src/copy.c:2406 src/mkfifo.c:133 +#: src/copy.c:2416 src/mkfifo.c:132 #, c-format msgid "cannot create fifo %s" msgstr "nie można utworzyć potoku %s" -#: src/copy.c:2415 +#: src/copy.c:2425 #, c-format msgid "cannot create special file %s" msgstr "nie można utworzyć pliku specjalnego %s" -#: src/copy.c:2426 src/ls.c:3191 src/stat.c:902 +#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921 #, c-format msgid "cannot read symbolic link %s" msgstr "nie można przeczytać dowiązania symbolicznego %s" -#: src/copy.c:2453 +#: src/copy.c:2463 #, c-format msgid "cannot create symbolic link %s" msgstr "nie można utworzyć dowiązania symbolicznego %s" -#: src/copy.c:2485 +#: src/copy.c:2495 #, c-format msgid "%s has unknown file type" msgstr "%s to nieznany typ pliku" -#: src/copy.c:2629 src/ln.c:358 +#: src/copy.c:2644 src/ln.c:358 #, c-format msgid "cannot un-backup %s" msgstr "nie można przywrócić kopii zapasowej %s" -#: src/copy.c:2633 +#: src/copy.c:2648 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (przywrócenie kopii zapasowej)\n" -#: src/cp.c:156 src/mv.c:284 +#: src/cp.c:156 src/mv.c:286 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -2130,26 +2131,10 @@ msgstr "" " albo: %s [OPCJA]... -t KATALOG ŹRÓDŁO...\n" #: src/cp.c:162 -msgid "" -"Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" -"\n" -msgstr "" -"Skopiowanie ŹRÓDŁA do CELU lub ŹRÓDŁA/ŹRÓDEŁ do KATALOGU.\n" -"\n" +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:166 src/csplit.c:1458 src/cut.c:197 src/df.c:852 src/du.c:268 -#: src/expand.c:112 src/fmt.c:275 src/fold.c:75 src/head.c:115 -#: src/install.c:612 src/kill.c:86 src/ln.c:392 src/ls.c:4726 src/mkdir.c:61 -#: src/mkfifo.c:56 src/mknod.c:58 src/mv.c:294 src/nl.c:191 src/paste.c:445 -#: src/pr.c:2777 src/ptx.c:1825 src/shred.c:153 src/shuf.c:58 src/sort.c:399 -#: src/split.c:211 src/stdbuf.c:95 src/tac.c:142 src/tail.c:268 -#: src/touch.c:226 src/truncate.c:107 src/unexpand.c:122 src/uniq.c:145 -msgid "" -"Mandatory arguments to long options are mandatory for short options too.\n" -msgstr "" -"Argumenty obowiązkowe dla opcji długich obowiązują również dla krótkich.\n" - -#: src/cp.c:169 +#: src/cp.c:168 msgid "" " -a, --archive same as -dR --preserve=all\n" " --attributes-only don't copy the file data, just the " @@ -2172,12 +2157,13 @@ msgstr "" " przypadku rekursji\n" " -d to samo co --no-dereference --preserve=links\n" -#: src/cp.c:178 +#: src/cp.c:177 msgid "" " -f, --force if an existing destination file cannot be\n" -" opened, remove it and try again (redundant " -"if\n" -" the -n option is used)\n" +" opened, remove it and try again (this " +"option\n" +" is ignored when the -n option is also " +"used)\n" " -i, --interactive prompt before overwrite (overrides a previous " "-n\n" " option)\n" @@ -2185,13 +2171,13 @@ msgid "" msgstr "" " -f, --force jeżeli istniejący plik docelowy nie daje się\n" " otworzyć, będzie skasowany i otwierany\n" -" ponownie (niepotrzebne jeżeli użyta jest\n" -" opcja -n)\n" +" ponownie (ignorowane jeżeli użyta jest\n" +" też opcja -n)\n" " -i, --interactive pytanie przed zamazaniem (wyłącza opcję -n)\n" " -H podążanie za dowiązaniami symbolicznymi w\n" " ŹRÓDLE podanymi jako argumenty polecenia\n" -#: src/cp.c:188 +#: src/cp.c:186 msgid "" " -l, --link hard link files instead of copying\n" " -L, --dereference always follow symbolic links in SOURCE\n" @@ -2200,7 +2186,7 @@ msgstr "" " -L, --dereference podążanie za wszystkimi dowiązaniami\n" " symbolicznymi w ŹRÓDLE\n" -#: src/cp.c:192 +#: src/cp.c:190 msgid "" " -n, --no-clobber do not overwrite an existing file (overrides\n" " a previous -i option)\n" @@ -2213,7 +2199,7 @@ msgstr "" "w\n" " ŹRÓDLE\n" -#: src/cp.c:197 +#: src/cp.c:195 msgid "" " -p same as --preserve=mode,ownership,timestamps\n" " --preserve[=ATTR_LIST] preserve the specified attributes (default:\n" @@ -2235,7 +2221,7 @@ msgstr "" "atrybuty),\n" " all (wszystkie)\n" -#: src/cp.c:205 +#: src/cp.c:203 msgid "" " --no-preserve=ATTR_LIST don't preserve the specified attributes\n" " --parents use full source file name under DIRECTORY\n" @@ -2243,7 +2229,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:209 +#: src/cp.c:207 msgid "" " -R, -r, --recursive copy directories recursively\n" " --reflink[=WHEN] control clone/CoW copies. See below\n" @@ -2258,7 +2244,7 @@ msgstr "" "docelowego\n" " przed próbą jego otwarcia (por. z --force)\n" -#: src/cp.c:215 +#: src/cp.c:213 msgid "" " --sparse=WHEN control creation of sparse files. See below\n" " --strip-trailing-slashes remove any trailing slashes from each " @@ -2272,7 +2258,7 @@ msgstr "" "z\n" " nazw argumentów ŹRÓDŁOWYCH\n" -#: src/cp.c:220 +#: src/cp.c:218 msgid "" " -s, --symbolic-link make symbolic links instead of copying\n" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -2285,7 +2271,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:226 +#: src/cp.c:224 msgid "" " -u, --update copy only when the SOURCE file is newer\n" " than the destination file or when the\n" @@ -2299,7 +2285,7 @@ msgstr "" " -x, --one-file-system pozostanie w jednym systemie plików\n" "\n" -#: src/cp.c:235 +#: src/cp.c:233 msgid "" "\n" "By default, sparse SOURCE files are detected by a crude heuristic and the\n" @@ -2332,7 +2318,7 @@ msgstr "" "niemożności wykonania lekkiego kopiowania zostanie wykonane kopiowanie " "zwykłe.\n" -#: src/cp.c:247 src/install.c:649 src/ln.c:421 src/mv.c:321 +#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322 msgid "" "\n" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -2342,7 +2328,7 @@ msgid "" "\n" msgstr "" "\n" -"Rozszerzenie nazwy kopii zapasowej to '~', jeżeli nie jest ustawione\n" +"Rozszerzenie nazwy kopii zapasowej to „~”, jeżeli nie jest ustawione\n" "inaczej przez --suffix albo SIMPLE_BACKUP_SUFFIX. Traktowanie wersji może " "być\n" "ustawione przez opcję --backup albo przez zmienną środowiska " @@ -2350,7 +2336,7 @@ msgstr "" "Możliwe wartości:\n" "\n" -#: src/cp.c:254 src/install.c:656 src/mv.c:328 +#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329 msgid "" " none, off never make backups (even if --backup is given)\n" " numbered, t make numbered backups\n" @@ -2364,7 +2350,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:260 +#: src/cp.c:258 msgid "" "\n" "As a special case, cp makes a backup of SOURCE when the force and backup\n" @@ -2376,93 +2362,93 @@ 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:319 +#: src/cp.c:317 #, c-format msgid "failed to preserve times for %s" msgstr "nie udało się zachować czasu %s" -#: src/cp.c:350 +#: src/cp.c:348 #, c-format msgid "failed to preserve permissions for %s" msgstr "nie udało się zachować uprawnień do %s" -#: src/cp.c:477 +#: src/cp.c:475 #, c-format msgid "cannot make directory %s" msgstr "nie można utworzyć katalogu %s" -#: src/cp.c:526 src/cp.c:545 +#: src/cp.c:524 src/cp.c:543 #, c-format msgid "%s exists but is not a directory" msgstr "%s istnieje, ale nie jest katalogiem" -#: src/cp.c:572 src/cp.c:1068 src/install.c:401 src/install.c:844 src/ln.c:123 -#: src/ln.c:181 src/ln.c:202 src/ln.c:516 src/mv.c:152 src/mv.c:399 +#: 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 #, c-format -msgid "accessing %s" -msgstr "dostęp do %s" +msgid "failed to access %s" +msgstr "nie udało się uzyskać dostępu do %s" -#: src/cp.c:592 src/install.c:914 src/ln.c:546 src/mv.c:432 src/shred.c:1182 -#: src/touch.c:433 src/truncate.c:356 +#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181 +#: src/touch.c:429 src/truncate.c:354 #, c-format msgid "missing file operand" msgstr "brakujący argument plikowy" -#: src/cp.c:594 src/install.c:916 src/ln.c:560 src/mv.c:434 +#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436 #, c-format msgid "missing destination file operand after %s" msgstr "brakujący plik docelowy po %s" -#: src/cp.c:603 src/install.c:925 src/mv.c:443 +#: src/cp.c:601 src/install.c:926 src/mv.c:445 #, 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:619 src/cp.c:1070 src/install.c:403 src/install.c:846 -#: src/install.c:938 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:401 -#: src/mv.c:457 +#: 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 #, c-format msgid "target %s is not a directory" msgstr "cel %s nie jest katalogiem" -#: src/cp.c:730 +#: src/cp.c:728 #, c-format msgid "with --parents, the destination must be a directory" msgstr "z opcją --parents cel musi być katalogiem" -#: src/cp.c:1063 src/install.c:839 src/ln.c:511 src/mv.c:394 +#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395 #, c-format msgid "multiple target directories specified" msgstr "podano wiele katalogów docelowych" -#: src/cp.c:1108 +#: src/cp.c:1110 #, 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:1115 src/mv.c:464 +#: src/cp.c:1117 src/mv.c:466 #, c-format msgid "options --backup and --no-clobber are mutually exclusive" msgstr "opcje --backup i --no-clobber wzajemnie się wykluczają" -#: src/cp.c:1121 +#: src/cp.c:1123 #, 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:1129 src/install.c:899 src/ln.c:582 src/mv.c:472 +#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474 msgid "backup type" msgstr "rodzaj kopii zapasowej" -#: src/cp.c:1154 +#: src/cp.c:1156 #, 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:1160 +#: src/cp.c:1162 #, c-format msgid "cannot preserve extended attributes, cp is built without xattr support" msgstr "" @@ -2474,138 +2460,136 @@ msgstr "" msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:529 +#: src/csplit.c:531 #, c-format msgid "input disappeared" msgstr "dane wejściowe zniknęły" -#: src/csplit.c:658 src/csplit.c:669 +#: src/csplit.c:660 src/csplit.c:671 #, c-format msgid "%s: line number out of range" msgstr "%s: numer linii spoza zakresu" -#: src/csplit.c:698 +#: src/csplit.c:700 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: numer linii spoza zakresu" -#: src/csplit.c:701 src/csplit.c:750 +#: src/csplit.c:703 src/csplit.c:752 #, c-format msgid " on repetition %s\n" msgstr " przy powtórzeniu %s\n" -#: src/csplit.c:744 +#: src/csplit.c:746 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: nie pasuje" -#: src/csplit.c:808 src/csplit.c:848 src/nl.c:359 src/tac.c:274 +#: src/csplit.c:810 src/csplit.c:850 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:981 +#: src/csplit.c:983 #, c-format msgid "write error for %s" msgstr "błąd pisania dla %s" -#: src/csplit.c:1057 +#: src/csplit.c:1059 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: po ograniczniku powinna być liczba całkowita" -#: src/csplit.c:1073 +#: src/csplit.c:1075 #, c-format msgid "%s: '}' is required in repeat count" -msgstr "%s: '}' jest wymagany w liczniku powtórzeń" +msgstr "%s: „}” jest wymagany w liczniku powtórzeń" -#: src/csplit.c:1083 +#: src/csplit.c:1085 #, c-format msgid "%s}: integer required between '{' and '}'" -msgstr "%s}: między '{' a '}' musi być liczba całkowita" +msgstr "%s}: między „{” a „}” musi być liczba całkowita" -#: src/csplit.c:1110 +#: src/csplit.c:1112 #, c-format msgid "%s: closing delimiter '%c' missing" -msgstr "%s: brak zamykającego ogranicznika '%c'" +msgstr "%s: brak zamykającego ogranicznika „%c”" -#: src/csplit.c:1127 +#: src/csplit.c:1129 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: błędne wyrażenie regularne: %s" -#: src/csplit.c:1160 +#: src/csplit.c:1162 #, c-format msgid "%s: invalid pattern" msgstr "%s: błędny wzorzec" -#: src/csplit.c:1163 +#: src/csplit.c:1165 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: numer linii musi być większy od zera" -#: src/csplit.c:1169 +#: src/csplit.c:1171 #, 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:1175 +#: src/csplit.c:1177 #, 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:1253 +#: src/csplit.c:1255 #, c-format msgid "missing conversion specifier in suffix" msgstr "brak określenia konwersji w rozszerzeniu" -#: src/csplit.c:1259 +#: src/csplit.c:1261 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "błędne określenie konwersji w rozszerzeniu: %c" -#: src/csplit.c:1262 +#: src/csplit.c:1264 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "błędne określenie konwersji w rozszerzeniu: \\%.3o" -#: src/csplit.c:1267 +#: src/csplit.c:1269 #, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "błędne flagi w specyfikacji przekształcenia: %%%c%c" -#: src/csplit.c:1284 +#: src/csplit.c:1286 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "za dużo określeń konwersji %% w rozszerzeniu" -#: src/csplit.c:1298 +#: src/csplit.c:1300 #, c-format msgid "missing %% conversion specification in suffix" msgstr "brak określenia konwersji %% w rozszerzeniu" -#: src/csplit.c:1345 +#: src/csplit.c:1347 #, c-format msgid "%s: invalid number" msgstr "%s: błędna liczba" -#: src/csplit.c:1449 +#: src/csplit.c:1451 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Składnia: %s [OPCJA]... PLIK WZORZEC...\n" -#: src/csplit.c:1453 +#: src/csplit.c:1455 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" -"\n" msgstr "" -"Zapisanie kawałków PLIKU oddzielonych przez WZORCE do plików 'xx01', " -"'xx02',\n" +"Zapisanie kawałków PLIKU oddzielonych przez WZORCE do plików „xx01”, " +"„xx02,”\n" "..., i podanie na standardowym wyjściu liczby bajtów w każdym kawałku.\n" -"\n" -#: src/csplit.c:1461 +#: src/csplit.c:1462 #, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2617,7 +2601,7 @@ msgstr "" " -k, --keep-files bez kasowania plików wyjściowych w razie " "błędów\n" -#: src/csplit.c:1466 +#: src/csplit.c:1467 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" @@ -2628,7 +2612,7 @@ msgstr "" "wyjściowych\n" " -z, --elide-empty-files usunięcie pustych plików wyjściowych\n" -#: src/csplit.c:1473 +#: src/csplit.c:1474 msgid "" "\n" "Read standard input if FILE is -. Each PATTERN may be:\n" @@ -2637,7 +2621,7 @@ msgstr "" "Jeżeli PLIK jest podany jako -, czytane jest standardowe wejście.\n" "Możliwe WZORCE:\n" -#: src/csplit.c:1477 +#: src/csplit.c:1478 msgid "" "\n" " INTEGER copy up to but not including specified line number\n" @@ -2660,14 +2644,14 @@ msgstr "" " {*} powtórzenie poprzedniego wzorca tyle razy ile się " "da\n" "\n" -"PRZESUNIĘCIE linii musi się składać z '+' albo '-' oraz liczby całkowitej.\n" +"PRZESUNIĘCIE linii musi się składać z „+” albo „-” oraz liczby całkowitej.\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:64 src/cut.c:372 msgid "fields and positions are numbered from 1" msgstr "pola i pozycje są numerowane od 1" @@ -2677,14 +2661,11 @@ msgid "Usage: %s OPTION... [FILE]...\n" msgstr "Składnia: %s OPCJA... [PLIK]...\n" #: src/cut.c:193 -msgid "" -"Print selected parts of lines from each FILE to standard output.\n" -"\n" +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" -"\n" -#: src/cut.c:200 +#: src/cut.c:199 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2695,7 +2676,7 @@ msgstr "" " -d, --delimiter=OGRANICZNIK użycie OGRANICZNIKA zamiast TABa jako " "separatora\n" -#: src/cut.c:205 +#: src/cut.c:204 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2708,7 +2689,7 @@ msgstr "" " opcja -s\n" " -n (ignorowane)\n" -#: src/cut.c:211 +#: src/cut.c:210 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" @@ -2717,7 +2698,7 @@ msgstr "" "znaków\n" " albo pól\n" -#: src/cut.c:215 +#: src/cut.c:214 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2729,7 +2710,7 @@ msgstr "" " wyjściowych, domyślnie używany jest separator\n" " danych wejściowych\n" -#: src/cut.c:222 +#: src/cut.c:221 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2742,7 +2723,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:228 +#: src/cut.c:227 msgid "" "Each range is one of:\n" "\n" @@ -2763,45 +2744,46 @@ msgstr "" "Jeżeli PLIK nie jest podany albo podany jako -, czytane jest\n" "standardowe wejście.\n" -#: src/cut.c:368 src/cut.c:489 -msgid "invalid byte or field list" -msgstr "błędna lista bajtów lub pól" +#: src/cut.c:367 src/cut.c:493 +msgid "invalid byte, character or field list" +msgstr "błędna lista bajtów, znaków lub pól" -#: src/cut.c:385 +#: src/cut.c:387 msgid "invalid range with no endpoint: -" msgstr "błędny zakres bez podania końca: -" -#: src/cut.c:399 +#: src/cut.c:403 msgid "invalid decreasing range" msgstr "błędny zakres od większego do mniejszego" -#: src/cut.c:478 +#: src/cut.c:482 #, c-format msgid "byte offset %s is too large" msgstr "przesunięcie bajtowe %s jest za duże" -#: src/cut.c:481 +#: src/cut.c:485 #, c-format msgid "field number %s is too large" msgstr "numer pola %s jest za duży" -#: src/cut.c:789 src/cut.c:797 +#: src/cut.c:795 src/cut.c:803 msgid "only one type of list may be specified" msgstr "można podać tylko jeden typ listy" -#: src/cut.c:806 +#: src/cut.c:812 src/numfmt.c:1408 +#, c-format msgid "the delimiter must be a single character" msgstr "ogranicznik musi być pojedynczym znakiem" -#: src/cut.c:841 +#: src/cut.c:847 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:844 +#: src/cut.c:850 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:848 +#: src/cut.c:854 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2809,11 +2791,11 @@ msgstr "" "blokowanie wyświetlania linii bez ograniczników jest sensowne\n" "\ttylko dla operacji na polach" -#: src/cut.c:864 +#: src/cut.c:870 msgid "missing list of fields" msgstr "brakująca lista pól" -#: src/cut.c:866 +#: src/cut.c:872 msgid "missing list of positions" msgstr "brakująca lista pozycji" @@ -2827,9 +2809,13 @@ msgstr "" " albo: %s [-u|--utc|--universal] [MMDDggmm[[CC]RR][.ss]]\n" #: src/date.c:128 +msgid "Display the current time in the given FORMAT, or set the system date.\n" +msgstr "" +"Wypisanie bieżącego czasu w podanym formacie albo ustawienie czasu " +"systemowego.\n" + +#: src/date.c:134 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" " -I[TIMESPEC], --iso-8601[=TIMESPEC] output date/time in ISO 8601 format.\n" @@ -2837,22 +2823,19 @@ msgid "" " 'hours', 'minutes', 'seconds', or 'ns' for date\n" " and time to the indicated precision.\n" msgstr "" -"Wypisanie bieżącego czasu w podanym formacie albo ustawienie czasu " -"systemowego.\n" -"\n" " -d, --date=SPECYFIKACJA wypisanie czasu podanego przez SPECYFIKACJĘ, " "nie\n" " bieżącego (now)\n" " -f, --file=PLIKDAT jak --date, dla każdej linii PLIKUDAT\n" " -I[SPECYF_CZASU], --iso-8601[=SPECYF_CZASU] wypisani daty/czasu w " "formacie\n" -" ISO 8601. SPECYF_CZASU='date' dla podania samej\n" -" daty (tryb domyślny), 'hours' (godziny), " -"'minutes'\n" -" 'seconds' albo 'ns' dla podania daty i czasu z\n" +" ISO 8601. SPECYF_CZASU=date dla podania samej\n" +" daty (tryb domyślny), „hours” (godziny), " +"„minutes”,\n" +" „seconds” albo „ns” dla podania daty i czasu z\n" " pożądaną dokładnością.\n" -#: src/date.c:138 +#: src/date.c:142 msgid "" " -r, --reference=FILE display the last modification time of FILE\n" " -R, --rfc-2822 output date and time in RFC 2822 format.\n" @@ -2861,7 +2844,7 @@ msgstr "" " -r, --reference=PLIK wyświetla czas ostatniej modyfikacji PLIKU\n" " -R, --rfc-822 wypisuje datę i czas zgodnie z RFC 2822\n" -#: src/date.c:143 +#: src/date.c:147 msgid "" " --rfc-3339=TIMESPEC output date and time in RFC 3339 format.\n" " TIMESPEC='date', 'seconds', or 'ns' for\n" @@ -2873,13 +2856,13 @@ msgid "" msgstr "" " --rfc-3339=CZAS wypisuje data i czas w formacie RFC 3339.\n" " Dla osiągnięcia żądanej dokładności należy\n" -" podać CZAS='date', 'seconds' albo 'ns'.\n" +" podać CZAS=date, „seconds” albo „ns”.\n" " 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" -#: src/date.c:154 +#: src/date.c:158 msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" @@ -2893,7 +2876,7 @@ msgstr "" " %% znak procenta %\n" " %a lokalny skrót nazwy dnia tygodnia (np. pon)\n" -#: src/date.c:161 +#: src/date.c:165 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2905,7 +2888,7 @@ msgstr "" " %B lokalna pełna nazwa miesiąca (np. styczeń)\n" " %c lokalna data i czas (np. czw mar 03 23:05:25 MEST 2005)\n" -#: src/date.c:167 +#: src/date.c:171 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2917,7 +2900,7 @@ msgstr "" " %D data; to samo co %m/%d/%y\n" " %e dzień miesiąca uzupełniony spacjami; to samo co %_d\n" -#: src/date.c:173 +#: src/date.c:177 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -2929,7 +2912,7 @@ msgstr "" " %G rok odpowiadający numerowi tygodnia ISO (zob. %V); zwykle użyteczne\n" " tylko z %V\n" -#: src/date.c:178 +#: src/date.c:182 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2941,7 +2924,7 @@ msgstr "" " %I godzina (01...12)\n" " %j dzień roku (001...366)\n" -#: src/date.c:184 +#: src/date.c:188 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -2953,7 +2936,7 @@ msgstr "" " %m miesiąc (01...12)\n" " %M minuta (00...59)\n" -#: src/date.c:190 +#: src/date.c:194 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2971,7 +2954,7 @@ msgstr "" " %R czas w formacie 24-godzinnym; to samo co %H:%M\n" " %s liczba sekund od godz. 00:00:00, 1 stycznia 1970 UTC\n" -#: src/date.c:199 +#: src/date.c:203 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2983,7 +2966,7 @@ msgstr "" " %T czas; to samo co %H:%M:%S\n" " %u dzień tygodnia (1..7); 1 to poniedziałek\n" -#: src/date.c:205 +#: src/date.c:209 msgid "" " %U week number of year, with Sunday as first day of week (00..53)\n" " %V ISO week number, with Monday as first day of week (01..53)\n" @@ -2995,7 +2978,7 @@ msgstr "" " %w numer dnia tygodnia (0...6), 0 oznacza niedzielę\n" " %W numer tygodnia w roku, poniedziałek zaczyna tydzień (00...53)\n" -#: src/date.c:211 +#: src/date.c:215 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -3007,7 +2990,7 @@ msgstr "" " %y dwie ostatnie cyfry roku (00...99)\n" " %Y rok\n" -#: src/date.c:217 +#: src/date.c:221 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -3028,7 +3011,7 @@ msgstr "" "\n" "Domyślnie numeryczne pola daty są dopełniane zerami.\n" -#: src/date.c:226 +#: src/date.c:230 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -3038,15 +3021,15 @@ msgid "" " ^ use upper case if possible\n" " # use opposite case if possible\n" msgstr "" -"Następujące opcjonalne flagi mogą być podane po '%':\n" +"Następujące opcjonalne flagi mogą być podane po „%”:\n" "\n" " - (myślnik) bez dopełniania\n" " _ (podkreślenie) dopełnienie odstępami\n" " 0 (zero) dopełnienie zerami\n" " ^ używanie wielkich liter jeżeli to możliwe\n" -" # użycie małych liter zamiast wielkich i odwotnie, jeżeli to możliwe\n" +" # użycie małych liter zamiast wielkich i odwrotnie, jeżeli to możliwe\n" -#: src/date.c:235 +#: src/date.c:239 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -3061,7 +3044,7 @@ msgstr "" "E - żeby użyć alternatywnej reprezentacji lokalnej albo\n" "O - żeby użyć alternatywnych symboli numerycznych, jeżeli są dostepne\n" -#: src/date.c:242 +#: src/date.c:246 msgid "" "\n" "Examples:\n" @@ -3087,62 +3070,62 @@ msgstr "" "USA:\n" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" -#: src/date.c:275 src/dd.c:2193 src/head.c:838 src/md5sum.c:477 -#: src/md5sum.c:798 src/od.c:863 src/od.c:1914 src/pr.c:1176 src/pr.c:1372 -#: src/pr.c:1494 src/stty.c:842 src/tac.c:563 src/tail.c:343 src/tee.c:126 +#: 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 #, c-format msgid "standard input" msgstr "standardowe wejście" -#: src/date.c:303 src/date.c:523 +#: src/date.c:307 src/date.c:527 #, c-format msgid "invalid date %s" msgstr "błędna data: %s" -#: src/date.c:414 src/date.c:448 +#: src/date.c:418 src/date.c:452 #, c-format msgid "multiple output formats specified" msgstr "podano wiele formatów wyjściowych" -#: src/date.c:426 +#: src/date.c:430 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "opcje specyfikujące daty do wyświetlenia wzajemnie się wykluczają" -#: src/date.c:433 +#: src/date.c:437 #, c-format msgid "the options to print and set the time may not be used together" msgstr "opcje wyświetlające i ustawiające czas nie mogą być używane razem" -#: src/date.c:454 +#: src/date.c:458 #, 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 "" -"brak znaku '+' na początku argumentu %s;\n" +"brak znaku „+” na początku argumentu %s;\n" "jeśli użyto opcji określających datę/y, każdy argument nie będący\n" -"opcją musi być specyfikacją formatu i zaczynać się od '+'" +"opcją musi być specyfikacją formatu i zaczynać się od „+”" -#: src/date.c:531 +#: src/date.c:535 #, c-format msgid "cannot set date" msgstr "ustawienie daty niemożliwe" -#: src/date.c:554 src/du.c:360 +#: src/date.c:558 src/du.c:371 #, c-format msgid "time %s is out of range" msgstr "czas %s jest spoza zakresu" #. This is a proper name. See the gettext manual, section Names. -#: src/dd.c:44 src/factor.c:43 src/rm.c:41 src/tail.c:69 src/touch.c:41 +#: 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 "Paul Rubin" -#: src/dd.c:517 +#: src/dd.c:521 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3151,7 +3134,7 @@ msgstr "" "Składnia: %s [ARGUMENT]...\n" " albo: %s OPCJA\n" -#: src/dd.c:522 +#: src/dd.c:526 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -3171,7 +3154,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:531 +#: src/dd.c:535 msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -3180,7 +3163,8 @@ msgid "" " oflag=FLAGS write as per the comma separated symbol list\n" " seek=N skip N obs-sized blocks at start of output\n" " skip=N skip N ibs-sized blocks at start of input\n" -" status=noxfer suppress transfer statistics\n" +" status=WHICH WHICH info to suppress outputting to stderr;\n" +" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" msgstr "" " if=PLIK czytanie z PLIKU zamiast ze standardowego wejścia\n" " iflag=FLAGI czytanie zgodnie z podaną listą słów kluczowych\n" @@ -3191,12 +3175,14 @@ msgstr "" " oddzielonych przecinkami\n" " seek=ILE przeskoczenie ILU bloków o rozmiarze obs na wyjściu\n" " skip=ILE przeskoczenie ILU bloków o rozmiarze ibs na wejściu\n" -" status=noxfer bez statystyki kopiowania\n" +" status=JAKIE JAKIE informacje nie będą wysyłane na standardowe\n" +" wyjście błędu: „noxfer” - bez statystyki kopiowania,\n" +" „none” - żadnych informacji\n" -#: src/dd.c:541 +#: src/dd.c:546 msgid "" "\n" -"BLOCKS and BYTES may be followed by the following multiplicative suffixes:\n" +"N and BYTES may be followed by the following multiplicative suffixes:\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, and so on for T, P, E, Z, Y.\n" "\n" @@ -3204,14 +3190,14 @@ msgid "" "\n" msgstr "" "\n" -"BLOKI i BAJTY mogą mieć następujące przyrostki mnożące:\n" +"N i BAJTY mogą mieć następujące przyrostki mnożące:\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, itd. dla T, P, E, Z, Y.\n" "\n" "Każde SŁOWO_KL może być:\n" "\n" -#: src/dd.c:550 +#: src/dd.c:555 msgid "" " ascii from EBCDIC to ASCII\n" " ebcdic from ASCII to EBCDIC\n" @@ -3241,7 +3227,7 @@ msgstr "" " jeżeli użyte z block albo unblock, dopełnienie spacjami zamiast\n" " NULami\n" -#: src/dd.c:563 +#: src/dd.c:568 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3257,7 +3243,7 @@ msgstr "" " fdatasync wymuszenie fizycznego zapisu danych przed zakończeniem\n" " fsync jak fdatasync, ale też dla metadanych\n" -#: src/dd.c:571 +#: src/dd.c:576 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3270,75 +3256,75 @@ msgstr "" "\n" " append tryb dopisywania (ma sens tylko dla wyjścia)\n" -#: src/dd.c:578 +#: src/dd.c:583 msgid " cio use concurrent I/O for data\n" msgstr " cio użycie równoległego I/O dla danych\n" -#: src/dd.c:580 +#: src/dd.c:585 msgid " direct use direct I/O for data\n" msgstr " direct dane zapisywane przez bezpośrednie I/O\n" -#: src/dd.c:582 +#: src/dd.c:587 msgid " directory fail unless a directory\n" msgstr " directory błąd jeżeli nie katalog\n" -#: src/dd.c:584 +#: src/dd.c:589 msgid " dsync use synchronized I/O for data\n" msgstr " dsync dane zapisywane przez synchronizowane I/O\n" -#: src/dd.c:586 +#: src/dd.c:591 msgid " sync likewise, but also for metadata\n" msgstr " sync podobnie, ale też dla metadanych\n" -#: src/dd.c:587 +#: src/dd.c:592 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:590 +#: src/dd.c:595 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock użycie nie blokującego I/O\n" -#: src/dd.c:592 +#: src/dd.c:597 msgid " noatime do not update access time\n" msgstr " noatime bez aktualizacji czasu dostępu\n" -#: src/dd.c:595 +#: src/dd.c:600 msgid " nocache discard cached data\n" msgstr " nocache skasowanie pamięci podręcznej\n" -#: src/dd.c:598 +#: src/dd.c:603 msgid " noctty do not assign controlling terminal from file\n" msgstr " noctty bez przyporządkowywania terminala sterującego - pliku\n" -#: src/dd.c:601 +#: src/dd.c:606 msgid " nofollow do not follow symlinks\n" msgstr " nofollow bez rozwijania dowiązań symbolicznych\n" -#: src/dd.c:603 +#: src/dd.c:608 msgid " nolinks fail if multiply-linked\n" msgstr " nolinks błąd jeżeli wielokrotnie dołączony\n" -#: src/dd.c:605 +#: src/dd.c:610 msgid " binary use binary I/O for data\n" msgstr " binary użycie binarnego I/O dla danych\n" -#: src/dd.c:607 +#: src/dd.c:612 msgid " text use text I/O for data\n" msgstr " text użycie tekstowego I/O dla danych\n" -#: src/dd.c:609 +#: src/dd.c:614 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" +msgstr " count_bytes traktowanie „count=N” jak liczby najtów (tylko iflag)\n" -#: src/dd.c:612 +#: src/dd.c:617 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" +msgstr " skip_bytes traktowanie „skip=N” jak liczby bajtów (tylko iflag)\n" -#: src/dd.c:615 +#: src/dd.c:620 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" +msgstr " seek_bytes traktowanie „seek=N” jak liczby bajtów (tylko oflag)\n" -#: src/dd.c:620 +#: src/dd.c:625 #, c-format msgid "" "\n" @@ -3355,7 +3341,7 @@ msgid "" "\n" msgstr "" "\n" -"Wysłanie sygnału %s do działającego programu 'dd' powoduje wypisanie\n" +"Wysłanie sygnału %s do działającego programu „dd” powoduje wypisanie\n" "statystyki wejścia i wyjścia na standardowym wyjściu błędów i kontynuację\n" "kopiowania.\n" "\n" @@ -3366,7 +3352,7 @@ msgstr "" " 9387674624 bytes (9.4 GB) copied, 34.6279 seconds, 271 MB/s\n" "\n" -#: src/dd.c:676 +#: src/dd.c:683 #, c-format msgid "" "%<PRIuMAX>+%<PRIuMAX> records in\n" @@ -3375,7 +3361,7 @@ msgstr "" "%<PRIuMAX>+%<PRIuMAX> przeczytanych recordów\n" "%<PRIuMAX>+%<PRIuMAX> zapisanych recordów\n" -#: src/dd.c:682 +#: src/dd.c:689 #, c-format msgid "%<PRIuMAX> truncated record\n" msgid_plural "%<PRIuMAX> truncated records\n" @@ -3383,7 +3369,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:694 +#: src/dd.c:701 #, c-format msgid "%<PRIuMAX> byte (%s) copied" msgid_plural "%<PRIuMAX> bytes (%s) copied" @@ -3391,7 +3377,7 @@ msgstr[0] "skopiowany %<PRIuMAX> bajt (%s)" msgstr[1] "skopiowane %<PRIuMAX> bajty (%s)" msgstr[2] "skopiowane %<PRIuMAX> bajtów (%s)" -#: src/dd.c:712 +#: src/dd.c:720 msgid "Infinity B" msgstr "nieskończenie wiele B" @@ -3405,83 +3391,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:725 +#: src/dd.c:733 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g s, %s/s\n" -#: src/dd.c:804 +#: src/dd.c:812 #, c-format msgid "closing input file %s" msgstr "zamykanie pliku wejściowego %s" -#: src/dd.c:811 +#: src/dd.c:819 #, c-format msgid "closing output file %s" msgstr "zamknięcie pliku wyjściowego %s" -#: src/dd.c:1014 +#: src/dd.c:1022 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "nie udało się wyłączyć O_DIRECT: %s" -#: src/dd.c:1085 src/dd.c:1934 +#: src/dd.c:1093 src/dd.c:1942 #, c-format msgid "writing to %s" msgstr "zapis do %s" -#: src/dd.c:1199 src/dd.c:1253 +#: src/dd.c:1207 src/dd.c:1261 #, c-format msgid "unrecognized operand %s" msgstr "nierozpoznany argument %s" -#: src/dd.c:1210 +#: src/dd.c:1218 msgid "invalid conversion" msgstr "błędna konwersja" -#: src/dd.c:1213 src/dd.c:1289 +#: src/dd.c:1221 src/dd.c:1297 msgid "invalid input flag" msgstr "błędna flaga wejściowa" -#: src/dd.c:1216 src/dd.c:1283 src/dd.c:1295 +#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303 msgid "invalid output flag" msgstr "błędna flaga wyjściowa" -#: src/dd.c:1219 +#: src/dd.c:1227 msgid "invalid status flag" msgstr "błędna flaga stanu" -#: src/dd.c:1258 src/truncate.c:312 +#: src/dd.c:1266 src/truncate.c:310 #, c-format msgid "invalid number %s" msgstr "błędna liczba %s" -#: src/dd.c:1340 +#: src/dd.c:1348 #, 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:1342 +#: src/dd.c:1350 #, c-format msgid "cannot combine block and unblock" msgstr "nie można użyć block i unblock równocześnie" -#: src/dd.c:1344 +#: src/dd.c:1352 #, c-format msgid "cannot combine lcase and ucase" msgstr "nie można użyć razem lcase i ucase" -#: src/dd.c:1346 +#: src/dd.c:1354 #, c-format msgid "cannot combine excl and nocreat" msgstr "nie można użyć razem excl i nocreat" -#: src/dd.c:1349 +#: src/dd.c:1357 #, c-format msgid "cannot combine direct and nocache" msgstr "nie można użyć razem direct i nocache" -#: src/dd.c:1506 +#: src/dd.c:1514 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3490,72 +3476,72 @@ 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:1593 +#: src/dd.c:1601 #, c-format msgid "%s: cannot skip" msgstr "%s: nie przeskoczyć na wejściu" -#: src/dd.c:1595 src/dd.c:1614 src/dd.c:1675 +#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683 #, c-format msgid "%s: cannot seek" msgstr "%s: nie można ustawić pozycji na wyjściu" -#: src/dd.c:1655 +#: src/dd.c:1663 #, c-format msgid "offset overflow while reading file %s" msgstr "przepełnienie licznika pozycji w czasie czytanie pliku %s" -#: src/dd.c:1667 +#: src/dd.c:1675 #, c-format msgid "warning: invalid file offset after failed read" msgstr "uwaga: błędna pozycja w pliku po nieudanym czytaniu" -#: src/dd.c:1671 +#: src/dd.c:1679 #, c-format msgid "cannot work around kernel bug after all" msgstr "nie udało się obejść błędu jądra" -#: src/dd.c:1814 +#: src/dd.c:1822 #, c-format msgid "setting flags for %s" msgstr "ustawienie flag dla %s" -#: src/dd.c:1867 +#: 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:1881 +#: 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:1914 +#: src/dd.c:1922 #, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: nie można przeskoczyć do podanej pozycji na wejściu" -#: src/dd.c:2125 src/dd.c:2258 +#: src/dd.c:2133 #, 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" +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:2138 +#: src/dd.c:2146 #, c-format msgid "fdatasync failed for %s" msgstr "nieudany fdatasync dla %s" -#: src/dd.c:2148 +#: src/dd.c:2156 #, c-format msgid "fsync failed for %s" msgstr "nieudany fsync dla %s" -#: src/dd.c:2199 src/dd.c:2228 +#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165 #, c-format -msgid "opening %s" -msgstr "otwieranie %s" +msgid "failed to open %s" +msgstr "nie udało się otworzyć %s" -#: src/dd.c:2237 +#: src/dd.c:2246 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) " @@ -3564,85 +3550,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:2274 src/dd.c:2280 +#: src/dd.c:2267 +#, 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 #, 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:54 src/expr.c:153 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:39 src/sleep.c:35 src/sort.c:66 +#: 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 msgid "Paul Eggert" msgstr "Paul Eggert" -#: src/df.c:140 +#: src/df.c:172 msgid "Filesystem" msgstr "System plików" -#: src/df.c:141 +#: src/df.c:175 msgid "Type" msgstr "Typ" -#: src/df.c:142 +#: src/df.c:178 src/df.c:542 msgid "blocks" msgstr "bl" -#: src/df.c:142 -msgid "Inodes" -msgstr "iwęzły" - -#: src/df.c:142 -msgid "Size" -msgstr "rozm." - -#: src/df.c:143 +#: src/df.c:181 msgid "Used" msgstr "użyte" -#: src/df.c:143 -msgid "IUsed" -msgstr "użyteI" - -#: src/df.c:144 +#: src/df.c:184 msgid "Available" msgstr "dostępne" -#: src/df.c:144 -msgid "IFree" -msgstr "wolneI" - -#: src/df.c:144 -msgid "Avail" -msgstr "dost." - -#: src/df.c:145 +#: src/df.c:187 msgid "Use%" msgstr "%uż." -#: src/df.c:145 +#: src/df.c:190 +msgid "Inodes" +msgstr "iwęzły" + +#: src/df.c:193 +msgid "IUsed" +msgstr "użyteI" + +#: src/df.c:196 +msgid "IFree" +msgstr "wolneI" + +#: src/df.c:199 msgid "IUse%" msgstr "%uż.I" -#: src/df.c:145 +#: src/df.c:202 +msgid "Mounted on" +msgstr "zamont. na" + +#: src/df.c:383 +#, c-format +msgid "option --output: field '%s' unknown" +msgstr "opcja --output: nieznane pole „%s”" + +#: src/df.c:390 +#, c-format +msgid "option --output: field '%s' used more than once" +msgstr "opcja --output: pole „%s” pojawiło się więcej niż raz" + +#: src/df.c:410 src/df.c:449 +msgid "Size" +msgstr "rozm." + +#: src/df.c:414 src/df.c:451 +msgid "Avail" +msgstr "dost." + +#: src/df.c:474 msgid "Capacity" msgstr "pojemność" -#: src/df.c:146 -msgid "Mounted on" -msgstr "zamont. na" +#. 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 +#, c-format +msgid "%s-%s" +msgstr "%s-%s" -#: src/df.c:847 +#: src/df.c:1210 msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" -"\n" msgstr "" "Pokazuje informacje o systemie plików, w którym jest każdy z PLIKÓW, " "domyślnie\n" "o wszystkich systemach plików.\n" -"\n" -#: src/df.c:855 +#: src/df.c:1217 msgid "" " -a, --all include dummy file systems\n" " -B, --block-size=SIZE scale sizes by SIZE before printing them. E.g.,\n" @@ -3654,7 +3660,7 @@ msgid "" " -H, --si likewise, but use powers of 1000 not 1024\n" msgstr "" " -a, --all pokazanie też specjalnych systemów plików\n" -" -B, --block-size=ROZMIAR Skala rozmiarów, np. '-BM' powoduje wypisanie\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" @@ -3662,7 +3668,7 @@ msgstr "" "2G)\n" " -H, --si podobnie, ale z użyciem potęg 1000, nie 1024\n" -#: src/df.c:865 +#: src/df.c:1227 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3676,8 +3682,11 @@ msgstr "" " --no-sync bez wywołania sync przed pobraniem informacji o\n" " systemach plików (domyślnie)\n" -#: src/df.c:872 +#: src/df.c:1234 msgid "" +" --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" +" or print all fields if FIELD_LIST is " +"omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" " -t, --type=TYPE limit listing to file systems of type TYPE\n" @@ -3685,6 +3694,10 @@ msgid "" " -x, --exclude-type=TYPE limit listing to file systems not of type TYPE\n" " -v (ignored)\n" msgstr "" +" --output[=LISTA_PÓL] użycie formatu zdefiniowanego przez LISTĘ_PÓL\n" +" albo wypisanie wszystkich pól, jeżeli " +"LISTA_PÓL\n" +" została pominięta\n" " -P, --portability użycie formatu zgodnego z POSIX-em\n" " --sync wywołanie sync przed pobraniem informacji\n" " -t, --type=TYP pokazanie tylko systemów plików tego TYPU\n" @@ -3692,20 +3705,45 @@ msgstr "" " -x, --exclude-type=TYP pokazanie tylko systemów plików nie tego TYPU\n" " -v (ignorowane)\n" -#: src/df.c:1027 +#: src/df.c:1248 +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" +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" + +#: src/df.c:1285 +#, 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 #, 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:1075 +#: src/df.c:1500 msgid "Warning: " msgstr "Uwaga: " -#: src/df.c:1077 src/stat.c:795 +#: src/df.c:1502 src/stat.c:814 msgid "cannot read table of mounted file systems" msgstr "nie można przeczytać tablicy zamontowanych systemów plików" -#: src/df.c:1107 +#: src/df.c:1539 #, c-format msgid "no file systems processed" msgstr "nie zostały przetworzone żadne systemy plików" @@ -3747,7 +3785,7 @@ msgstr "" "Jeżeli jest podany PLIK, jest czytany dla określenia jakie kolory są użyte\n" "z jakimi rozszerzeniami. W przeciwnym wypadku użyta jest wkompilowana baza\n" "danych. Szczegóły formatu tych plików można zobaczyć przez\n" -"'dircolors --print-database'.\n" +"„dircolors --print-database”.\n" #: src/dircolors.c:286 #, c-format @@ -3795,7 +3833,7 @@ msgid "" "\n" msgstr "" "Wyświetlenie NAZWY bez ostatniego składnika bez ukośnika albo bez końcowego\n" -"ukośnika; jeśli NAZWA nie zawiera znaków '/', wyświetlenie '.' (co oznacza\n" +"ukośnika; jeśli NAZWA nie zawiera znaków „/”, wyświetlenie „.” (co oznacza\n" "katalog bieżący).\n" "\n" @@ -3820,7 +3858,7 @@ msgstr "" " %s dir1/str dir2/str -> \"dir1\", a po nim \"dir2\"\n" " %s stdio.h Wynik: \".\".\n" -#: src/du.c:260 src/sort.c:390 src/wc.c:112 +#: src/du.c:270 src/sort.c:394 src/wc.c:112 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3829,16 +3867,15 @@ msgstr "" "Składnia: %s [OPCJA]... [PLIK]...\n" " albo: %s [OPCJA]... --files0-from=P\n" -#: src/du.c:264 -msgid "" -"Summarize disk usage of each FILE, recursively for directories.\n" -"\n" +#: src/du.c:274 +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" -"\n" -#: src/du.c:271 +#: src/du.c:280 msgid "" +" -0, --null end each output line with 0 byte rather than " +"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,6 +3883,9 @@ 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 " +"zamiast\n" +" znakiem nowej linii\n" " -a, --all podanie podliczenia dla plików, nie samych " "katalogów\n" " --apparent-size podanie rozmiarów pozornych zamiast zużycia dysku;\n" @@ -3856,7 +3896,7 @@ msgstr "" "pośrednich\n" " itp.\n" -#: src/du.c:279 +#: src/du.c:289 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" @@ -3865,16 +3905,26 @@ msgid "" " -c, --total produce a grand total\n" " -D, --dereference-args dereference only symlinks that are listed on the\n" " command line\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 "" -" -B, --block-size=ROZMIAR Skala rozmiarów, np. '-BM' powoduje wypisanie\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" +" -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" " argumenty\n" +" -d, --max-depth=N wypisanie sumy dla katalogu (albo pliku - z --all)\n" +" tylko jeżeli jest N lub mniej poziomów poniżej\n" +" argumentu polecenia; --max-depth=0 jest " +"równoważne\n" +" --summarize\n" -#: src/du.c:288 +#: src/du.c:302 msgid "" " --files0-from=F summarize disk usage of the NUL-terminated file\n" " names specified in file F;\n" @@ -3882,7 +3932,6 @@ msgid "" " -H equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" --si like -h, but use powers of 1000 not 1024\n" msgstr "" " --files0-from=PLIK podsumowanie zajętości dysku przez pliki podane w\n" " PLIKU (nazwy zakończone przez NUL)\n" @@ -3893,57 +3942,37 @@ msgstr "" " -h, --human-readable rozmiary w formacie czytelnym dla ludzi (np. 1K " "234M\n" " 2G)\n" -" --si podobnie, ale z użyciem potęg 1000, nie 1024\n" -#: src/du.c:297 +#: src/du.c:310 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, --kilobytes to samo co --block-size=1K\n" +" -L, --dereference rozwinięcie wszystkich dowiązań symbolicznych\n" " -l, --count-links liczenie rozmiaru wielokrotnie jeżeli plik ma\n" " dowiązania zwykłe\n" " -m jak dla --block-size=1M\n" -#: src/du.c:302 +#: src/du.c:316 msgid "" -" -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " "default)\n" -" -0, --null end each output line with 0 byte rather than " -"newline\n" " -S, --separate-dirs 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 rozwinięcie wszystkich dowiązań symbolicznych\n" " -P, --no-dereference bez rozwijania dowiązań symbolicznych (domyślnie)\n" -" -0, --null po każdej linii znak 0 zamiast znaku nowej linii\n" " -S, --separate-dirs bez uwzględniania rozmiarów podkatalogów\n" +" --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:309 -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 ominięcie katalogów będących w innych systemach\n" -" plików\n" -" -X --exclude-from=PLIK pominięcie plików pasujących do wzorców w PLIKU\n" -" --exclude=WZÓR pominięcie plików pasujących do WZORU\n" -" -d, --max-depth=N wypisanie podsumowania dla katalogu (lub pliku -\n" -" z --all) tylko jeżeli jest N lub mniej poziomów\n" -" poniżej podanego jako argument komendy;\n" -" --max-depth=0 jest tym samym co -summarize\n" - -#: src/du.c:318 +#: src/du.c:322 msgid "" +" -t, --threshold=SIZE exclude entries smaller than SIZE if positive,\n" +" or entries greater than SIZE if negative\n" " --time show time of the last modification of any file in " "the\n" " directory, or any of its subdirectories\n" @@ -3953,6 +3982,11 @@ msgid "" " full-iso, long-iso, iso, +FORMAT\n" " FORMAT is interpreted like 'date'\n" msgstr "" +" -t, --threshold=ROZMIAR wykluczenie elementów mniejszych niż ROZMIAR, " +"jeżeli\n" +" jest dodatni, albo większych niż ROZMIAR, " +"jeżeli\n" +" jest ujemny\n" " --time pokazanie czasu ostatniej modyfikacji dowolnego " "pliku\n" " w katalogu albo dowolnego podkatalogu tego " @@ -3961,67 +3995,79 @@ msgstr "" " atime, access, use, ctime albo status\n" " --time-style=STYL pokazanie czasu w STYLU:\n" " full-iso, long-iso, iso, +FORMAT\n" -" FORMAT jest interpretowany jak dla 'date'\n" +" FORMAT jest interpretowany jak dla „date”\n" + +#: src/du.c:333 +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=PLIK pominięcie plików pasujących do wzorców w PLIKU\n" +" --exclude=WZÓR pominięcie plików pasujących do WZORU\n" +" -x, --one-file-system ominięcie katalogów będących w innych systemach\n" +" plików\n" -#: src/du.c:375 -#, fuzzy +#: src/du.c:386 msgid "Infinity" -msgstr "nieskończenie wiele B" +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:600 +#: src/du.c:624 #, c-format msgid "fts_read failed: %s" msgstr "błąd fts_read %s" -#: src/du.c:724 +#: src/du.c:780 #, c-format msgid "invalid maximum depth %s" msgstr "błędny maksymalny poziom zagłębienia %s" -#: src/du.c:817 +#: src/du.c:809 +#, c-format +msgid "invalid --threshold argument '-0'" +msgstr "błędny argument opcji --threshold: „-0”" + +#: src/du.c:887 #, 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:824 +#: src/du.c:894 #, 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:830 +#: src/du.c:900 #, 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:896 src/sort.c:4479 src/wc.c:668 +#: src/du.c:966 src/sort.c:4533 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:949 src/md5sum.c:587 src/od.c:903 src/tac.c:239 src/tac.c:350 -#: src/tac.c:506 src/tac.c:586 src/wc.c:733 +#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 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:963 src/sort.c:4508 src/wc.c:747 +#: src/du.c:1040 src/sort.c:4562 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:980 src/du.c:988 src/wc.c:760 src/wc.c:768 +#: src/du.c:1057 src/du.c:1065 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:1007 src/head.c:149 src/head.c:262 src/head.c:334 src/head.c:538 -#: src/head.c:620 src/head.c:692 src/head.c:750 src/head.c:774 src/tail.c:412 -#: src/tail.c:500 src/tail.c:549 src/tail.c:642 src/tail.c:770 src/tail.c:818 -#: src/tail.c:855 src/tail.c:1782 src/tail.c:1812 src/uniq.c:395 -#, c-format -msgid "error reading %s" -msgstr "błąd czytania %s" - -#: src/du.c:1010 src/ls.c:2649 src/wc.c:791 +#: src/du.c:1088 src/ls.c:2649 src/wc.c:791 msgid "total" msgstr "razem" @@ -4126,22 +4172,23 @@ msgstr "" "Składnia: %s [OPCJA]... [-] [NAZWA=WARTOŚĆ]... [POLECENIE [ARGUMENT]...]\n" #: src/env.c:55 +msgid "Set each NAME to VALUE in the environment and run COMMAND.\n" +msgstr "" +"Ustawienie każdej zmiennej środowiskowej NAZWA wartości WARTOŚĆ i wykonanie\n" +"POLECENIA.\n" + +#: src/env.c:61 msgid "" -"Set each NAME to VALUE in the environment and run COMMAND.\n" -"\n" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with 0 byte rather than newline\n" " -u, --unset=NAME remove variable from the environment\n" msgstr "" -"Ustawienie każdej zmiennej środowiskowej NAZWA wartości WARTOŚĆ i wykonanie\n" -"POLECENIA.\n" -"\n" " -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" " -u, --unset=NAZWA usunięcie zmiennej ze środowiska\n" -#: src/env.c:64 +#: src/env.c:68 msgid "" "\n" "A mere - implies -i. If no COMMAND, print the resulting environment.\n" @@ -4150,17 +4197,17 @@ msgstr "" "Argument - implikuje -i. Jeśli nie podano POLECENIA, wyświetla otrzymane " "środowisko.\n" -#: src/env.c:120 +#: src/env.c:124 #, c-format msgid "cannot unset %s" msgstr "nie udało się usunąć %s" -#: src/env.c:131 +#: src/env.c:135 #, c-format msgid "cannot set %s" msgstr "nie można ustawić %s" -#: src/env.c:148 +#: src/env.c:152 #, c-format msgid "cannot specify --null (-0) with command" msgstr "nie można podać --null (-0) razem z poleceniem" @@ -4169,15 +4216,13 @@ msgstr "nie można podać --null (-0) razem z poleceniem" msgid "" "Convert tabs in each FILE to spaces, writing to standard output.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" "Zamiana TAB-ów we wszystkich PLIKACH na spacje, wynik na standardowym " "wyjściu.\n" "Jeżeli PLIK nie jest podany albo podany jako -, czytane jest standardowe\n" "wejście.\n" -"\n" -#: src/expand.c:115 +#: src/expand.c:114 msgid "" " -i, --initial do not convert tabs after non blanks\n" " -t, --tabs=NUMBER have tabs NUMBER characters apart, not 8\n" @@ -4186,34 +4231,34 @@ msgstr "" "odstęp\n" " -t, --tabs=ILE użycie znaków tabulacji co ILE znaków, nie co 8\n" -#: src/expand.c:119 +#: src/expand.c:118 msgid "" " -t, --tabs=LIST use comma separated list of explicit tab positions\n" msgstr "" " -t, --tabs=LISTA użycie listy pozycji TABów oddzielanych przecinkami\n" -#: src/expand.c:172 src/unexpand.c:191 +#: src/expand.c:171 src/unexpand.c:190 #, c-format msgid "tab stop is too large %s" msgstr "pozycja TABa %s jest za duża" -#: src/expand.c:180 src/unexpand.c:199 +#: src/expand.c:179 src/unexpand.c:198 #, c-format msgid "tab size contains invalid character(s): %s" msgstr "rozmiar TABa zawiera błędny znak(i): %s" -#: src/expand.c:206 src/unexpand.c:225 +#: src/expand.c:205 src/unexpand.c:224 #, c-format msgid "tab size cannot be 0" msgstr "rozmiar TABa nie może wynosić 0" # sizes or positions? - rzm -#: src/expand.c:208 src/unexpand.c:227 +#: src/expand.c:207 src/unexpand.c:226 #, c-format msgid "tab sizes must be ascending" msgstr "kolejne pozycje TABa muszą rosnąć" -#: src/expand.c:326 src/expand.c:345 src/unexpand.c:374 src/unexpand.c:419 +#: 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 "za długa linia wejściowa" @@ -4323,8 +4368,8 @@ msgid "" " ( EXPRESSION ) value of EXPRESSION\n" msgstr "" " + SŁOWO SŁOWO interpretowane jako napis, nawet jeżeli\n" -" jest to słowo kluczowe, jak 'match' albo\n" -" operator jak '/'\n" +" jest to słowo kluczowe, jak „match” albo\n" +" operator jak „/”\n" "\n" " ( WYRAŻENIE ) wartość WYRAŻENIA\n" @@ -4339,7 +4384,7 @@ msgid "" msgstr "" "\n" "Większość operatorów musi być chroniona przed interpretacją przez powłokę\n" -"znakiem '\\' lub cudzysłowami. Porównania są arytmetyczne, jeśli obydwa\n" +"znakiem „\\” lub cudzysłowami. Porównania są arytmetyczne, jeśli obydwa\n" "ARGUMENTY są liczbami, w przeciwnym wypadku - leksykograficzne.\n" "Dopasowania zwracają napis zgodny ze wzorcem zawartym pomiędzy \\( i \\)\n" "lub 0; jeśli \\( i \\) nie zostały użyte, dopasowanie zwraca liczbę " @@ -4375,40 +4420,47 @@ msgstr "błąd procedury dopasowywania wyrażeń regularnych" msgid "non-integer argument" msgstr "argument niecałkowity" -#: src/expr.c:793 src/truncate.c:316 +#: src/expr.c:793 src/truncate.c:314 #, c-format msgid "division by zero" msgstr "dzielenie przez zero" -#: src/expr.c:887 src/sort.c:2029 +#: src/expr.c:887 src/sort.c:2044 #, c-format msgid "set LC_ALL='C' to work around the problem" -msgstr "Ustaw LC_ALL='C' żeby obejść problem" +msgstr "Ustaw LC_ALL=C żeby obejść problem" #: src/expr.c:889 #, c-format msgid "the strings compared were %s and %s" msgstr "Porównywane napisy %s i %s." -#: src/factor.c:449 -msgid "using arbitrary-precision arithmetic" -msgstr "użyta arytmetyka dużej precyzji" +#. This is a proper name. See the gettext manual, section Names. +#: src/factor.c:111 +msgid "Niels Moller" +msgstr "Niels Moller" -#: src/factor.c:460 -msgid "using single-precision arithmetic" -msgstr "użyta arytmetyka pojedynczej precyzji" +#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459 +#, 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:465 src/od.c:1640 src/od.c:1709 +#: src/factor.c:2092 #, c-format -msgid "%s is too large" -msgstr "%s jest za duża" +msgid "squfof queue overflow" +msgstr "przepełnienie kolejki squfof" -#: src/factor.c:469 +#: src/factor.c:2419 #, c-format msgid "%s is not a valid positive integer" msgstr "%s nie jest poprawną dodatnią liczbą całkowitą" -#: src/factor.c:494 +#: src/factor.c:2442 src/od.c:1646 src/od.c:1715 +#, c-format +msgid "%s is too large" +msgstr "%s jest za duża" + +#: src/factor.c:2454 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4417,7 +4469,7 @@ msgstr "" "Składnia: %s [LICZBA]...\n" " albo: %s OPCJA\n" -#: src/factor.c:499 +#: src/factor.c:2459 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" @@ -4443,24 +4495,22 @@ msgid "cannot stat current directory (now %s)" msgstr "nie można odczytać danych bieżącego katalogu (obecnie %s)" #. This is a proper name. See the gettext manual, section Names. -#: src/fmt.c:37 +#: src/fmt.c:38 msgid "Ross Paterson" msgstr "Ross Paterson" -#: src/fmt.c:269 +#: src/fmt.c:270 #, c-format msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n" msgstr "Składnia: %s [-SZEROKOŚĆ] [OPCJA]... [PLIK]...\n" -#: src/fmt.c:270 +#: 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" -"\n" msgstr "" "Przeformatowanie akapitów w PLIKU(ACH), wynik na standardowym wyjściu.\n" "Opcja -SZEROKOŚĆ jest skróconą formą -width=SZEROKOŚĆ.\n" -"\n" #: src/fmt.c:278 msgid "" @@ -4476,8 +4526,8 @@ msgstr "" "linii\n" " -s, --split-only podzielenie długich linii, ale bez wyrównania\n" -#: src/fmt.c:285 -#, fuzzy, c-format +#: src/fmt.c:287 +#, 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" @@ -4487,10 +4537,12 @@ msgstr "" " -t, --tagged-paragraph wcięcie pierwszej linii inne niż drugiej\n" " -u, --uniform-spacing jedna spacja między słowami, dwie między " "zdaniami\n" -" -w, --width=ILE maksymalna szerokość linii (domyślnie 75 " +" -w, --width=SZEROKOŚĆ maksymalna SZEROKOŚĆ linii (domyślnie 75 " "kolumn)\n" +" -g, --goal=SZEROKOŚĆ docelowa SZEROKOŚĆ (domyślnie 93% of szerokości\n" +" linii)\n" -#: src/fmt.c:357 +#: src/fmt.c:359 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -4500,7 +4552,7 @@ msgstr "" "użyj\n" "-w N zamiast" -#: src/fmt.c:403 src/fmt.c:414 +#: src/fmt.c:405 src/fmt.c:416 #, c-format msgid "invalid width: %s" msgstr "błędna szerokość: %s" @@ -4509,13 +4561,11 @@ msgstr "błędna szerokość: %s" msgid "" "Wrap input lines in each FILE (standard input by default), writing to\n" "standard output.\n" -"\n" msgstr "" "Łamanie linii w każdym PLIKU wejściowym (domyślnie standardowym wejściu),\n" "wynik na standardowym wyjściu.\n" -"\n" -#: src/fold.c:78 +#: src/fold.c:77 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4525,13 +4575,13 @@ msgstr "" " -s, --spaces łamanie na spacjach\n" " -w, --width=SZER użycie SZER kolumn zamiast 80\n" -#: src/fold.c:289 src/pr.c:836 +#: src/fold.c:288 src/pr.c:832 #, c-format 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:75 +#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 #: src/truncate.c:37 msgid "Padraig Brady" msgstr "Padraig Brady" @@ -4550,17 +4600,17 @@ msgstr "" "powłoki.\n" "\n" -#: src/group-list.c:69 src/id.c:345 src/setuidgid.c:184 +#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184 #, 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:350 +#: src/group-list.c:74 src/id.c:370 #, c-format msgid "failed to get groups for the current process" msgstr "nie udało się odczytać grupy bieżącego procesu" -#: src/group-list.c:104 +#: src/group-list.c:114 #, c-format msgid "cannot find name for group ID %lu" msgstr "nie można znaleźć nazwy grupy o ID %lu" @@ -4605,15 +4655,13 @@ 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" -"\n" msgstr "" "Wypisanie 10 pierwszych linii każdego PLIKU na standardowym wyjściu.\n" "Dla większej liczby PLIKÓW każdy kawałek ma nagłówek z nazwą.\n" "Jeżeli PLIK nie jest podany albo podany jest jako -, czytane jest\n" "standardowe wejście.\n" -"\n" -#: src/head.c:118 +#: src/head.c:117 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -4623,13 +4671,13 @@ msgid "" " K lines of each file\n" msgstr "" " -c, --bytes=[-]ILE wypisanie pierwszych ILE bajtów z każdego pliku;\n" -" ILE z '-' na początku - wypisanie wszystkich\n" +" ILE z „-” na początku - wypisanie wszystkich\n" " oprócz ostatnich ILE bajtów każdego pliku\n" " -n, --lines=[-]ILE wypisanie pierwszych ILE linii zamiast 10\n" -" ILE z '-' na początku - wypisanie wszystkich\n" +" ILE z „-” na początku - wypisanie wszystkich\n" " oprócz ostatnich ILE linii każdego pliku\n" -#: src/head.c:126 +#: src/head.c:125 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4637,7 +4685,7 @@ msgstr "" " -q, --quiet, --silent bez wypisywania nagłówków z nazwami plików\n" " -v, --verbose zawsze wypisywane są nagłówki z nazwami plików\n" -#: src/head.c:132 +#: src/head.c:131 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -4649,58 +4697,58 @@ 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:152 -#, c-format -msgid "error writing %s" -msgstr "błąd zapisu %s" - -#: src/head.c:155 +#: src/head.c:154 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: plik się za bardzo zmniejszył" -#: src/head.c:228 src/head.c:1044 +#: src/head.c:227 src/head.c:1051 #, c-format msgid "%s: number of bytes is too large" msgstr "%s: ilość bajtów jest za duża" -#: src/head.c:441 +#: 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:613 src/head.c:684 src/tail.c:450 +#: src/head.c:612 src/head.c:691 src/tail.c:449 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: nie można ustawić pozycji %s" -#: src/head.c:791 +#: 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 #, c-format msgid "cannot reposition file pointer for %s" msgstr "nie można zmienić pozycji w pliku %s" -#: src/head.c:878 +#: src/head.c:885 #, 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:879 +#: src/head.c:886 msgid "number of lines" msgstr "liczba linii" -#: src/head.c:879 +#: src/head.c:886 msgid "number of bytes" msgstr "liczba bajtów" -#: src/head.c:886 src/tail.c:1947 +#: src/head.c:893 src/tail.c:1947 msgid "invalid number of lines" msgstr "błędna liczba linii" -#: src/head.c:887 src/tail.c:1948 +#: src/head.c:894 src/tail.c:1948 msgid "invalid number of bytes" msgstr "błędna liczba bajtów" -#: src/head.c:974 src/head.c:1032 +#: src/head.c:981 src/head.c:1039 #, c-format msgid "invalid trailing option -- %c" msgstr "błędna opcja na końcu -- %c" @@ -4823,86 +4871,86 @@ msgstr "nie można odczytać kontekstu bezpieczeństwa procesu" msgid "cannot get effective UID" msgstr "nie można ustalić efektywnego identyfikatora użytkownika" -#: src/id.c:289 -#, fuzzy, c-format -msgid "cannot find name for user ID %lu" -msgstr "nie można znaleźć nazwy użytkownika o ID %lu" +#: src/id.c:311 +#, c-format +msgid "cannot find name for user ID %s" +msgstr "nie można znaleźć nazwy użytkownika o ID %s" -#: src/id.c:309 -#, fuzzy, c-format -msgid "uid=%lu" -msgstr "uid=%lu" +#: src/id.c:329 +#, c-format +msgid "uid=%s" +msgstr "uid=%s" -#: src/id.c:314 -#, fuzzy, c-format -msgid " gid=%lu" -msgstr " egid=%lu" +#: src/id.c:334 +#, c-format +msgid " gid=%s" +msgstr " gid=%s" -#: src/id.c:321 -#, fuzzy, c-format -msgid " euid=%lu" -msgstr " egid=%lu" +#: src/id.c:341 +#, c-format +msgid " euid=%s" +msgstr " euid=%s" -#: src/id.c:329 +#: src/id.c:349 #, c-format -msgid " egid=%lu" -msgstr " egid=%lu" +msgid " egid=%s" +msgstr " egid=%s" -#: src/id.c:357 +#: src/id.c:377 msgid " groups=" msgstr " grupy=" -#: src/id.c:373 +#: src/id.c:393 #, c-format msgid " context=%s" msgstr " kontekst=%s" -#: src/install.c:372 +#: src/install.c:373 #, 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:413 +#: src/install.c:414 #, c-format msgid "creating directory %s" msgstr "tworzenie katalogu %s" -#: src/install.c:481 +#: src/install.c:482 #, c-format msgid "cannot change ownership of %s" msgstr "nie można zmienić właściciela na %s" -#: src/install.c:505 +#: src/install.c:506 #, c-format msgid "cannot set time stamps for %s" msgstr "nie można ustawić czasów %s" -#: src/install.c:526 src/split.c:412 src/timeout.c:387 +#: src/install.c:527 src/split.c:426 src/timeout.c:439 #, c-format msgid "fork system call failed" msgstr "nie powiodło się wywołanie systemowe fork" -#: src/install.c:530 +#: src/install.c:531 #, c-format msgid "cannot run %s" msgstr "nie udało się uruchomić programu %s" -#: src/install.c:534 +#: src/install.c:535 #, c-format msgid "waiting for strip" msgstr "czekanie na program strip" -#: src/install.c:536 +#: src/install.c:537 #, c-format msgid "strip process terminated abnormally" msgstr "program strip zakończony nieprawidłowo" -#: src/install.c:557 +#: src/install.c:558 #, c-format msgid "invalid user %s" msgstr "błędny użytkownik %s" -#: src/install.c:593 +#: src/install.c:594 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -4915,7 +4963,7 @@ msgstr "" " albo: %s [OPCJA]... -t KATALOG ŹRóDŁO...\n" " albo: %s [OPCJA]... -d KATALOG...\n" -#: src/install.c:600 +#: src/install.c:601 msgid "" "\n" "This install program copies files (often just compiled) into destination\n" @@ -4927,7 +4975,6 @@ msgid "" "In the first three forms, copy SOURCE to DEST or multiple SOURCE(s) to\n" "the existing DIRECTORY, while setting permission modes and owner/group.\n" "In the 4th form, create all components of the given DIRECTORY(ies).\n" -"\n" msgstr "" "\n" "Program install kopiuje pliki (często dopiero co skompilowane) do " @@ -4944,7 +4991,6 @@ msgstr "" "grupa.\n" "W czwartym formacie tworzone są wszystkie katalogi składowe podanej ścieżki\n" "KATALOGU/ÓW.\n" -"\n" #: src/install.c:615 msgid "" @@ -5017,7 +5063,7 @@ msgstr "" " -Z, --context=KONTEKST ustawienie kontekstu bezpieczeństwa SELinux dla\n" " plików i katalogów\n" -#: src/install.c:858 +#: src/install.c:859 #, c-format msgid "" "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled" @@ -5025,51 +5071,51 @@ msgstr "" "UWAGA: zignorowana opcja --preserve-context, to jądro nie ma włączonego " "SELinuksa" -#: src/install.c:868 +#: 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:885 +#: src/install.c:886 #, 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:888 +#: src/install.c:889 #, 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:892 +#: 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:946 src/mkdir.c:202 src/stdbuf.c:327 +#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326 #, c-format msgid "invalid mode %s" msgstr "błędne uprawnienia %s" -#: src/install.c:953 +#: src/install.c:954 #, 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:958 +#: src/install.c:959 #, 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:965 +#: src/install.c:966 #, c-format msgid "options --compare (-C) and --strip are mutually exclusive" msgstr "opcje --compare (-C) i --strip wzajemnie się wykluczają" -#: src/install.c:971 +#: src/install.c:972 #, c-format msgid "" "the --compare (-C) option is ignored when you specify a mode with non-" @@ -5079,7 +5125,7 @@ msgstr "" "będącymi bitami praw dostępu" #. This is a proper name. See the gettext manual, section Names. -#: src/join.c:40 src/sort.c:65 +#: src/join.c:40 src/sort.c:66 msgid "Mike Haertel" msgstr "Mike Haertel" @@ -5113,7 +5159,7 @@ msgstr "" " -i, --ignore-case porównując pola ignoruje różnice między małymi i " "wielkimi\n" " literami\n" -" -j POLE równoważne '-j 1 POLE -j 2 POLE'\n" +" -j POLE równoważne „-j 1 POLE -j 2 POLE”\n" " -o FORMAT zachowanie FORMATU przy tworzeniu linii wyjściowej\n" " -t ZNAK użycie ZNAKU jako separatora pól linii wej. i wyj.\n" @@ -5162,24 +5208,24 @@ msgstr "" "Jeżeli nie jest podana opcja -t ZNAK, spacje na początku linii oddzielają\n" "pola i są ignorowane, w przeciwnym wypadku pola są oddzielane przez\n" "ZNAK. POLE jest numerem pola liczonym od 1. FORMAT to jedna lub więcej\n" -"specyfikacji 'NUMER.POLE' albo '0'. Domyślny FORMAT wypisuje pole łączące,\n" +"specyfikacji „NUMER.POLE” albo „0”. Domyślny FORMAT wypisuje pole łączące,\n" "pozostałe pola z PLIKU1 i pozostałe pola z PLIKU2, wszystkie oddzielone\n" -"ZNAKIEM. Jeżeli FORMAT to słowo kluczowe 'auto', to pierwsza linia każdego\n" +"ZNAKIEM. Jeżeli FORMAT to słowo kluczowe „auto”, to pierwsza linia każdego\n" "z plików określa liczbę pól wypisywanych w każdej linii\n" "\n" "Ważne: PLIK1 i PLIK2 muszą być posortowane po polu łączącym.\n" -"Np. jeżeli 'join' został uruchomiony bez opcji użyj przedtem 'sort -k " -"1b,1',\n" -"a jeżeli 'sort' był uruchomiony bez opcji użyj ' join -t '' '.\n" +"Np. jeżeli „join” został uruchomiony bez opcji użyj przedtem „sort -k " +"1b,1”,\n" +"a jeżeli „sort” był uruchomiony bez opcji użyj „join -t ''”.\n" "Zauważ, że porównania odbywają się zgodnie z regułami określonymi w \n" -"'LC_COLLATE'.\n" +"„LC_COLLATE”.\n" "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 #, c-format -msgid "%s:%ju: is not sorted: %.*s" -msgstr "%s:%ju: nie jest posortowany: %.*s" +msgid "%s:%<PRIuMAX>: is not sorted: %.*s" +msgstr "%s:%<PRIuMAX>: nie jest posortowany: %.*s" #: src/join.c:840 src/join.c:1038 #, c-format @@ -5206,12 +5252,12 @@ msgstr "niekompatybilne pola łączenia %lu, %lu" msgid "conflicting empty-field replacement strings" msgstr "konflikt napisów zastępujących puste pola" -#: src/join.c:1101 src/sort.c:4414 +#: src/join.c:1101 src/sort.c:4468 #, c-format msgid "multi-character tab %s" msgstr "wieloznakowy TAB %s" -#: src/join.c:1105 src/sort.c:4419 +#: src/join.c:1105 src/sort.c:4473 #, c-format msgid "incompatible tabs" msgstr "niekompatybilne TABy" @@ -5233,14 +5279,10 @@ msgstr "" " albo: %s -t [SYGNAŁ]...\n" #: src/kill.c:82 -msgid "" -"Send signals to processes, or list signals.\n" -"\n" -msgstr "" -"Wysyła sygnały do procesów albo pokazuje listę sygnałów.\n" -"\n" +msgid "Send signals to processes, or list signals.\n" +msgstr "Wysyła sygnały do procesów albo pokazuje listę sygnałów.\n" -#: src/kill.c:89 +#: src/kill.c:88 msgid "" " -s, --signal=SIGNAL, -SIGNAL\n" " specify the name or number of the signal to be sent\n" @@ -5253,7 +5295,7 @@ msgstr "" " -l, --list lista nazw sygnałów albo konwersja nazw na/z numery\n" " -t, --table tablica informacji o sygnałach\n" -#: src/kill.c:97 +#: src/kill.c:96 msgid "" "\n" "SIGNAL may be a signal name like 'HUP', or a signal number like '1',\n" @@ -5261,36 +5303,36 @@ msgid "" "PID is an integer; if negative it identifies a process group.\n" msgstr "" "\n" -"SYGNAŁ może być podany przez nazwę jak 'HUP', numer jak '1' albo jako\n" +"SYGNAŁ może być podany przez nazwę jak „HUP”, numer jak „1” albo jako\n" "status wyjściowy procesu zakończonego przez sygnał.\n" "PID jest liczbą całkowitą, jeżeli ujemną, to oznacza grupę procesów.\n" -#: src/kill.c:206 +#: src/kill.c:205 #, c-format msgid "%s: invalid process id" msgstr "%s: błędny identyfikator procesu" -#: src/kill.c:260 +#: src/kill.c:259 #, c-format msgid "invalid option -- %c" msgstr "błędna opcja -- %c" -#: src/kill.c:269 +#: src/kill.c:268 #, c-format msgid "%s: multiple signals specified" msgstr "%s: podano wiele sygnałów" -#: src/kill.c:283 +#: src/kill.c:282 #, c-format msgid "multiple -l or -t options specified" msgstr "podano wiele opcji -l lub -t" -#: src/kill.c:300 +#: src/kill.c:299 #, c-format msgid "cannot combine signal with -l or -t" msgstr "nie można podać sygnału równocześnie z opcjami -l lub -t" -#: src/kill.c:306 +#: src/kill.c:305 #, c-format msgid "no process ID specified" msgstr "brak identyfikatora procesu" @@ -5402,7 +5444,6 @@ msgid "" "When creating hard links, each TARGET must exist. Symbolic links\n" "can hold arbitrary text; if later resolved, a relative link is\n" "interpreted in relation to its parent directory.\n" -"\n" msgstr "" "W pierwszej formie - utworzenie dowiązania do CELU z nazwą\n" "NAZWA_DOWIĄZANIA. W drugiej formie - utworzenie dowiązania do CELU\n" @@ -5415,9 +5456,8 @@ msgstr "" "symboliczne mogą zawierać dowolny tekst. Gdy są później rozwijane,\n" "dowiązanie ze ścieżką względną jest interpretowane względem katalogu, w\n" "którym się znajduje.\n" -"\n" -#: src/ln.c:395 +#: src/ln.c:394 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -5438,7 +5478,7 @@ msgstr "" "administratora)\n" " -f, --force skasowanie istniejących CELÓW bez pytania\n" -#: src/ln.c:403 +#: src/ln.c:402 msgid "" " -i, --interactive prompt whether to remove destinations\n" " -L, --logical dereference TARGETs that are symbolic links\n" @@ -5461,7 +5501,7 @@ msgstr "" " -s, --symbolic tworzenie dowiązań symbolicznych zamiast " "zwykłych\n" -#: src/ln.c:412 +#: src/ln.c:411 msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" " -t, --target-directory=DIRECTORY specify the DIRECTORY in which to " @@ -5478,28 +5518,14 @@ msgstr "" " zwykłego pliku\n" " -v, --verbose wypisanie nazw plików przed dowiązaniem\n" -#: src/ln.c:428 -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 nigdy nie są tworzone kopie zapasowe (nawet gdy jest " -"podana\n" -" opcja --backup)\n" -" numbered, t tworzenie numerowanych kopii zapasowych\n" -" existing, nil numerowane jeżeli takie już istnieją, jeżeli nie - proste\n" -" simple, never tworzenie zawsze prostych kopii zapasowych\n" -"\n" - -#: src/ln.c:435 +#: src/ln.c:433 #, 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" "Jeżeli jest użyta opcja -s, to ignorowane są opcje -L i -P. W przeciwnym\n" "przypadku ostatnia podana opcja wpływa na zachowanie programu kiedy CELEM\n" "jest dowiązanie symboliczne, domyślnie jest to %s.\n" @@ -5575,7 +5601,7 @@ msgstr "ignoruję błędną długość w zmiennej środowiskowej COLUMNS: %s" 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:1976 +#: src/ls.c:1750 src/ptx.c:1975 #, c-format msgid "invalid line width: %s" msgstr "błędna szerokość linii: %s" @@ -5596,7 +5622,7 @@ msgstr "Prawidłowe argumenty to:\n" #: src/ls.c:2061 msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" -msgstr " - +FORMAT (np., +%H:%M) żeby podać format w stylu 'date'\n" +msgstr " - +FORMAT (np., +%H:%M) żeby podać format w stylu „date”\n" #: src/ls.c:2096 #, c-format @@ -5638,7 +5664,7 @@ msgstr "czytanie katalogu %s" msgid "closing directory %s" msgstr "zamykanie katalogu %s" -#: src/ls.c:3301 +#: src/ls.c:3302 #, c-format msgid "cannot compare file names %s and %s" msgstr "nie można porównać nazw plików %s i %s" @@ -5647,13 +5673,11 @@ msgstr "nie można porównać nazw plików %s i %s" msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" -"\n" 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" -"\n" -#: src/ls.c:4729 +#: src/ls.c:4728 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -5668,7 +5692,7 @@ msgstr "" "stylu\n" " języka C, np. \\012)\n" -#: src/ls.c:4735 +#: src/ls.c:4734 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them. E." "g.,\n" @@ -5681,7 +5705,7 @@ msgid "" " 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 " @@ -5693,7 +5717,7 @@ msgstr "" " w przeciwnym przypadku: sortowanie wg ctime,\n" " najnowsze pliki na początku\n" -#: src/ls.c:4745 +#: src/ls.c:4744 msgid "" " -C list entries by columns\n" " --color[=WHEN] colorize the output. WHEN defaults to " @@ -5706,15 +5730,15 @@ msgid "" 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" +"„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" " -D, --dired dane wyjściowe dla trybu dired Emacsa\n" -#: src/ls.c:4753 +#: src/ls.c:4752 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -5726,7 +5750,7 @@ msgstr "" " -f bez sortowania, włączenie -aU, wyłączenie -lst\n" " -F, --classify dopisanie znaków wskazujących typ każdego\n" " elementu (jednego z */=>@|)\n" -" --file-type podobnie, ale oprócz '*'\n" +" --file-type podobnie, ale oprócz „*”\n" " --format=SŁOWO across (poziomo), odpowiada opcji -x, commas\n" " (oddzielone przecinkami) -m, horizontal\n" " (poziomo) -x, long (długi, z dodatkowymi\n" @@ -5736,11 +5760,11 @@ msgstr "" " kolumnach) -C\n" " --full-time jak -l --time-style=full-iso\n" -#: src/ls.c:4761 +#: src/ls.c:4760 msgid " -g like -l, but do not list owner\n" msgstr " -g jak -l, ale nie pokazuje właściciela\n" -#: src/ls.c:4764 +#: src/ls.c:4763 msgid "" " --group-directories-first\n" " group directories before files.\n" @@ -5752,7 +5776,7 @@ 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:4770 +#: src/ls.c:4769 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" @@ -5765,7 +5789,7 @@ msgstr "" " dla ludzi (np. 1K 234M 2G)\n" " --si podobnie, ale z użyciem potęg 1000, nie 1024\n" -#: src/ls.c:4776 +#: src/ls.c:4775 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5786,7 +5810,7 @@ msgstr "" " --hide=WZÓR bez wypisywania nazw pasujących do WZORU\n" " (wyłączane przez -a albo -A)\n" -#: src/ls.c:4786 +#: src/ls.c:4785 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -5806,7 +5830,7 @@ msgstr "" "WZORU\n" " -k, --kibibytes użycie bloków o rozmiarze 1024 bajtów\n" -#: src/ls.c:4796 +#: src/ls.c:4795 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5822,7 +5846,7 @@ msgstr "" " -m pisanie do pełnej szerokości, oddzielanie " "przecinkami\n" -#: src/ls.c:4804 +#: src/ls.c:4803 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. " @@ -5838,7 +5862,7 @@ msgstr "" " -o jak -l, ale bez informacji o grupie\n" " -p, --indicator-style=slash dodanie / do nazw katalogów\n" -#: src/ls.c:4812 +#: src/ls.c:4811 msgid "" " -q, --hide-control-chars print ? instead of non graphic characters\n" " --show-control-chars show non graphic characters as-is (default\n" @@ -5852,7 +5876,7 @@ msgstr "" " -q, --hide-control-chars pisanie ? zamiast znaków sterujących\n" " --show-control-chars pokazanie znaków niedrukowalnych (domyślnie, " "chyba\n" -" że program nazywa się 'ls' i pisze na " +" że program nazywa się „ls” i pisze na " "terminalu)\n" " -Q, --quote-name ujęcie nazw w cudzysłowy\n" " --quoting-style=SŁOWO zabezpieczenie znaków specjalnych w stylu " @@ -5860,7 +5884,7 @@ msgstr "" " literal, locale, shell, shell-always, c, " "escape\n" -#: src/ls.c:4821 +#: src/ls.c:4820 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -5872,7 +5896,7 @@ msgstr "" " -s, --size wypisanie liczby bloków zajętych przez każdy " "plik\n" -#: src/ls.c:4826 +#: src/ls.c:4825 msgid "" " -S sort by file size\n" " --sort=WORD sort by WORD instead of name: none -U,\n" @@ -5896,7 +5920,7 @@ msgstr "" " - ctime, status - -c; użycie podanego czasu do\n" " sortowania gdy podano --sort=time\n" -#: src/ls.c:4836 +#: src/ls.c:4835 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, +FORMAT.\n" @@ -5909,14 +5933,14 @@ msgid "" 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'. " +" 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" +" nowszych. Jeżeli STYL zaczyna się od „posix-”,\n" " STYL jest używany tylko dla locale nie POSIX\n" -#: src/ls.c:4845 +#: src/ls.c:4844 msgid "" " -t sort by modification time, newest first\n" " -T, --tabsize=COLS assume tab stops at each COLS instead of 8\n" @@ -5925,7 +5949,7 @@ msgstr "" " na początku\n" " -T, --tabsize=KOLUMNA TAB co tyle KOLUMN, zamiast co 8\n" -#: src/ls.c:4849 +#: src/ls.c:4848 msgid "" " -u with -lt: sort by, and show, access time\n" " with -l: show access time and sort by name\n" @@ -5942,7 +5966,7 @@ msgstr "" " -v sortowanie wg liczb (numerów wersji) zawartych\n" " w nazwach plików\n" -#: src/ls.c:4856 +#: src/ls.c:4855 msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" @@ -5959,7 +5983,7 @@ msgstr "" " -Z, --context wypisanie kontekstu bezpieczeństwa SELinuksa\n" " -1 listowanie po jednym pliku w linii\n" -#: src/ls.c:4866 +#: src/ls.c:4865 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5974,7 +5998,7 @@ msgstr "" "środowiskowa LS_COLORS może zmienić te ustawienia. Można ją ustawić\n" "przy pomocy polecenia dircolors.\n" -#: src/ls.c:4873 +#: src/ls.c:4872 msgid "" "\n" "Exit status:\n" @@ -6003,7 +6027,7 @@ msgstr "Scott Miller" msgid "David Madore" msgstr "David Madore" -#: src/md5sum.c:162 +#: src/md5sum.c:164 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -6015,7 +6039,7 @@ msgstr "" "Wypisuje albo sprawdza sumy kontrolne %s (%d-bitowe).\n" "Bez podanego PLIKU albo gdy jest podany jako -, czyta standardowe wejście.\n" -#: src/md5sum.c:172 +#: src/md5sum.c:174 msgid "" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" @@ -6023,28 +6047,32 @@ msgstr "" " -b, --binary czytanie plików w trybie binarnym (domyślne jeżeli\n" " nie jest czytane tty przez standardowe wejście)\n" -#: src/md5sum.c:176 +#: src/md5sum.c:178 msgid " -b, --binary read in binary mode\n" msgstr " -b, --binary czytanie w trybie binarnym.\n" -#: src/md5sum.c:179 +#: src/md5sum.c:181 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr " -c, --check sprawdzanie sum %s zapisanych w PLIKACH\n" -#: src/md5sum.c:183 +#: src/md5sum.c:184 +msgid " --tag create a BSD-style checksum\n" +msgstr " --tag wyliczenie sumy kontrolnej w stylu BSD\n" + +#: src/md5sum.c:188 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" " -t, --text czytanie plików w trybie tekstowym (domyślne jeżeli\n" " czytane jest tty przez standardowe wejście)\n" -#: src/md5sum.c:187 +#: src/md5sum.c:192 msgid " -t, --text read in text mode (default)\n" msgstr "" " -t, --text czytanie plików w trybie tekstowym (domyślnie)\n" -#: src/md5sum.c:190 +#: src/md5sum.c:195 msgid "" "\n" "The following three options are useful only when verifying checksums:\n" @@ -6063,14 +6091,14 @@ msgstr "" "sum\n" "\n" -#: src/md5sum.c:198 +#: 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:203 +#: src/md5sum.c:208 #, c-format msgid "" "\n" @@ -6082,38 +6110,38 @@ msgstr "" "\n" "Sumy są liczone wg opisu w %s. Przy sprawdzaniu dane wejściowe powinny\n" "być takie jak wygenerowane przez ten program na wyjściu. Domyślny tryb to\n" -"wypisanie linii z sumą kontrolną, znaku wskazującego typ ('*' - binarny,\n" +"wypisanie linii z sumą kontrolną, znaku wskazującego typ („*” - binarny,\n" "spacja - tekstowy) i nazwy każdego PLIKU.\n" -#: src/md5sum.c:502 +#: src/md5sum.c:523 #, c-format msgid "%s: too many checksum lines" msgstr "%s: za dużo linii z sumami kontrolnymi" -#: src/md5sum.c:526 +#: src/md5sum.c:547 #, c-format msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line" msgstr "%s: %<PRIuMAX>: nieprawidłowo sformatowana linia sumy kontrolnej %s" -#: src/md5sum.c:551 +#: src/md5sum.c:572 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: NIEPOWODZENIE otwarcia lub odczytu\n" -#: src/md5sum.c:574 +#: src/md5sum.c:595 msgid "FAILED" msgstr "NIEPOWODZENIE" -#: src/md5sum.c:576 +#: src/md5sum.c:597 msgid "OK" msgstr "DOBRZE" -#: src/md5sum.c:600 +#: src/md5sum.c:621 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "%s: brak poprawnie sformatowanych linii sumy kontrolnej %s" -#: src/md5sum.c:610 +#: src/md5sum.c:631 #, c-format msgid "WARNING: %<PRIuMAX> line is improperly formatted" msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted" @@ -6121,7 +6149,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:618 +#: src/md5sum.c:639 #, c-format msgid "WARNING: %<PRIuMAX> listed file could not be read" msgid_plural "WARNING: %<PRIuMAX> listed files could not be read" @@ -6129,7 +6157,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:626 +#: src/md5sum.c:647 #, c-format msgid "WARNING: %<PRIuMAX> computed checksum did NOT match" msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match" @@ -6137,7 +6165,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:704 +#: src/md5sum.c:760 +#, c-format +msgid "--tag does not support --text mode" +msgstr "--tag nie może być łączony z trybem --text" + +#: src/md5sum.c:766 +#, 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 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" @@ -6145,22 +6183,22 @@ msgstr "" "opcje --binary i --text nie mają znaczenia przy weryfikacji sum\n" "kontrolnych" -#: src/md5sum.c:712 +#: src/md5sum.c:781 #, 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:719 +#: src/md5sum.c:788 #, 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:726 +#: src/md5sum.c:795 #, 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:733 +#: src/md5sum.c:802 #, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "opcja --strict ma znaczenie tylko przy weryfikacji sum kontrolnych" @@ -6171,14 +6209,10 @@ msgid "Usage: %s [OPTION]... DIRECTORY...\n" msgstr "Składnia: %s [OPCJA]... KATALOG...\n" #: src/mkdir.c:57 -msgid "" -"Create the DIRECTORY(ies), if they do not already exist.\n" -"\n" -msgstr "" -"Utworzenie KATALOGU/ÓW, jeżeli jeszcze nie istnieją.\n" -"\n" +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:64 +#: src/mkdir.c:63 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" @@ -6193,7 +6227,7 @@ msgstr "" " -Z, --context=KONT ustawienie kontekstu bezpieczeństwa SELinuksa dla\n" " każdego tworzonego katalogu\n" -#: src/mkdir.c:169 +#: src/mkdir.c:168 #, c-format msgid "created directory %s" msgstr "utworzony katalog %s" @@ -6204,31 +6238,27 @@ msgid "Usage: %s [OPTION]... NAME...\n" msgstr "Składnia: %s [OPCJA]... NAZWA...\n" #: src/mkfifo.c:52 -msgid "" -"Create named pipes (FIFOs) with the given NAMEs.\n" -"\n" -msgstr "" -"Tworzenie nazwanych potoków (pipes, FIFOs) o podanych NAZWACH.\n" -"\n" +msgid "Create named pipes (FIFOs) with the given NAMEs.\n" +msgstr "Tworzenie nazwanych potoków (pipes, FIFOs) o podanych NAZWACH.\n" -#: src/mkfifo.c:59 src/mknod.c:61 +#: src/mkfifo.c:58 src/mknod.c:60 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:62 +#: src/mkfifo.c:61 msgid "" " -Z, --context=CTX set the SELinux security context of each NAME to CTX\n" msgstr "" " -Z, --context=KONT ustawienie kontekstu bezpieczeństwa SELinux dla każdej\n" " NAZWY jako KONT\n" -#: src/mkfifo.c:122 src/mknod.c:128 +#: src/mkfifo.c:121 src/mknod.c:127 #, c-format msgid "invalid mode" msgstr "błędne uprawnienia" -#: src/mkfifo.c:127 src/mknod.c:133 +#: src/mkfifo.c:126 src/mknod.c:132 #, c-format msgid "mode must specify only file permission bits" msgstr "mogą być podane ylko bity uprawnień" @@ -6239,20 +6269,16 @@ msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n" msgstr "Składnia: %s [OPCJA]... NAZWA TYP [WIĘKSZY MNIEJSZY]\n" #: src/mknod.c:54 -msgid "" -"Create the special file NAME of the given TYPE.\n" -"\n" -msgstr "" -"Utworzenie pliku specjalnego o podanej NAZWIE i TYPIE.\n" -"\n" +msgid "Create the special file NAME of the given TYPE.\n" +msgstr "Utworzenie pliku specjalnego o podanej NAZWIE i TYPIE.\n" -#: src/mknod.c:64 +#: 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:69 +#: src/mknod.c:68 msgid "" "\n" "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n" @@ -6267,7 +6293,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:76 +#: src/mknod.c:75 msgid "" "\n" " b create a block (buffered) special file\n" @@ -6279,41 +6305,41 @@ msgstr "" " c, u specjalny plik znakowy (niebuforowany)\n" " p potok (FIFO)\n" -#: src/mknod.c:151 +#: src/mknod.c:150 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:161 +#: src/mknod.c:160 msgid "Fifos do not have major and minor device numbers." msgstr "Potoki nie mają numerów większych ani mniejszych." -#: src/mknod.c:177 +#: src/mknod.c:176 #, c-format msgid "block special files not supported" msgstr "specjalne pliki blokowe nie są obsługiwane" -#: src/mknod.c:186 +#: src/mknod.c:185 #, c-format msgid "character special files not supported" msgstr "specjalne pliki znakowe nie są obsługiwane" -#: src/mknod.c:202 +#: src/mknod.c:201 #, c-format msgid "invalid major device number %s" msgstr "błędny większy numer urządzenia %s" -#: src/mknod.c:207 +#: src/mknod.c:206 #, c-format msgid "invalid minor device number %s" msgstr "błędny mniejszy numer urządzenia %s" -#: src/mknod.c:212 +#: src/mknod.c:211 #, c-format msgid "invalid device %s %s" msgstr "błędne urządzenie %s %s" -#: src/mknod.c:226 +#: src/mknod.c:225 #, c-format msgid "invalid device type %s" msgstr "błędne typ urządzenia %s" @@ -6336,7 +6362,7 @@ msgid "" msgstr "" "Bezpieczne utworzenie tymczasowego pliku albo katalogu i wypisanie jego " "nazwy.\n" -"WZORZEC musi zawierać co najmniej trzy kolejne znaki 'X' w ostatniej " +"WZORZEC musi zawierać co najmniej trzy kolejne znaki „X” w ostatniej " "części.\n" "Jeżeli WZORZEC nie jest podany, użyty będzie wzorzec tmp.XXXXXXXXXX i " "domyślna\n" @@ -6406,63 +6432,60 @@ msgstr "" " katalogu podanego przez opcję -p, w innym przypadku\n" " - /tmp [przestarzałe]\n" -#: src/mktemp.c:222 +#: 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:228 +#: src/mktemp.c:229 #, c-format msgid "too many templates" msgstr "za dużo wzorców" -#: src/mktemp.c:248 +#: src/mktemp.c:249 #, 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:273 src/split.c:1117 +#: src/mktemp.c:274 src/split.c:1130 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "błędny przyrostek %s - zawiera separator nazw podkatalogów" -#: src/mktemp.c:278 +#: src/mktemp.c:279 #, c-format msgid "too few X's in template %s" msgstr "za mało X-ów we wzorcu %s" -#: src/mktemp.c:291 +#: src/mktemp.c:292 #, c-format msgid "invalid template, %s, contains directory separator" msgstr "błędny wzorzec %s - zawiera separator nazw podkatalogów" -#: src/mktemp.c:305 +#: src/mktemp.c:306 #, 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:325 +#: src/mktemp.c:326 #, c-format msgid "failed to create directory via template %s" msgstr "nie udało się utworzyć katalogu przy pomocy wzorca %s" -#: src/mktemp.c:335 +#: src/mktemp.c:336 #, c-format msgid "failed to create file via template %s" msgstr "nie udało się utworzyć pliki przy pomocy wzorca %s" -#: src/mv.c:290 -msgid "" -"Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" -"\n" +#: src/mv.c:292 +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" -"\n" -#: src/mv.c:297 +#: src/mv.c:298 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -6482,7 +6505,7 @@ msgstr "" " -i, --interactive pytanie przed zamazaniem\n" " -n, --no-clobber bez nadpisywania istniejących plików\n" -#: src/mv.c:306 +#: src/mv.c:307 msgid "" " --strip-trailing-slashes remove any trailing slashes from each " "SOURCE\n" @@ -6494,7 +6517,7 @@ msgstr "" " -S, --suffix=ROZSZERZ zmiana domyślnego rozszerzenia kopii " "zapasowej\n" -#: src/mv.c:311 +#: src/mv.c:312 msgid "" " -t, --target-directory=DIRECTORY move all SOURCE arguments into " "DIRECTORY\n" @@ -6520,32 +6543,33 @@ msgstr "Składnia: %s [OPCJA] [POLECENIE [ARGUMENT]...]\n" #, c-format msgid "" "Run COMMAND with an adjusted niceness, which affects process scheduling.\n" -"With no COMMAND, print the current niceness. Nicenesses range from\n" -"%d (most favorable scheduling) to %d (least favorable).\n" -"\n" -" -n, --adjustment=N add integer N to the niceness (default 10)\n" +"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 "" -"Uruchomienie POLECENIA z poprawionym priorytetem, co wpływa na przydział\n" -"czasu procesora. Bez POLECENIE wypisuje bieżący priorytet. Priorytet może\n" +"Uruchomienie POLECENIA ze zmienionym priorytetem, co wpływa na przydział\n" +"czasu procesora. Bez POLECENIA wypisuje bieżący priorytet. Priorytet może\n" "mieć wartość od %d (największe przydziały czasu) do %d (najmniejsze).\n" -"\n" -#: src/nice.c:168 +#: src/nice.c:82 +msgid " -n, --adjustment=N add integer N to the niceness (default 10)\n" +msgstr " -n, --adjustment=N dodanie N do priorytetu (domyślnie 10)\n" + +#: src/nice.c:172 #, c-format msgid "invalid adjustment %s" msgstr "błędny poprawka %s" -#: src/nice.c:177 +#: src/nice.c:181 #, c-format msgid "a command must be given with an adjustment" msgstr "razem z priorytetem musi być podane polecenie" -#: src/nice.c:184 src/nice.c:195 +#: src/nice.c:188 src/nice.c:199 #, c-format msgid "cannot get niceness" msgstr "nie można ustalić ile wynosi poprawka" -#: src/nice.c:201 +#: src/nice.c:205 #, c-format msgid "cannot set niceness" msgstr "ustawienie poprawki niemożliwe" @@ -6555,18 +6579,16 @@ msgstr "ustawienie poprawki niemożliwe" msgid "Scott Bartram" msgstr "Scott Bartram" -#: src/nl.c:186 +#: src/nl.c:179 msgid "" "Write each FILE to standard output, with line numbers added.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" "Wypisanie każdego PLIKU na standardowe wyjście z numerami linii.\n" "Jeżeli PLIK nie jest podany albo podany jako -, czytane jest\n" "standardowe wejście.\n" -"\n" -#: src/nl.c:194 +#: src/nl.c:186 msgid "" " -b, --body-numbering=STYLE use STYLE for numbering body lines\n" " -d, --section-delimiter=CC use CC for separating logical pages\n" @@ -6576,7 +6598,7 @@ msgstr "" " -d, --section-delimiter=CC użycie CC do oddzielania stron logicznych\n" " -f, --footer-numbering=STYL użycie STYLU do numerowania linii stopek\n" -#: src/nl.c:199 +#: src/nl.c:191 msgid "" " -h, --header-numbering=STYLE use STYLE for numbering header lines\n" " -i, --line-increment=NUMBER line number increment at each line\n" @@ -6599,7 +6621,7 @@ msgstr "" " -s, --number-separator=NAPIS dodanie NAPISU po ewentualnym numerze " "linii\n" -#: src/nl.c:207 +#: src/nl.c:199 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" @@ -6608,7 +6630,7 @@ msgstr "" "logicznej\n" " -w, --number-width=ILE ILE kolumn na numery linii\n" -#: src/nl.c:213 +#: src/nl.c:205 msgid "" "\n" "By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC are\n" @@ -6620,7 +6642,7 @@ msgstr "" "dwa ograniczniki oddzielające strony logiczne. Jeżeli brakuje drugiego\n" "przyjmowana jest wartość :. Napisz \\\\ żeby uzyskać \\. STYL to jeden z:\n" -#: src/nl.c:219 +#: src/nl.c:211 msgid "" "\n" " a number all lines\n" @@ -6650,54 +6672,47 @@ msgstr "" " rz dosunięte do prawej, z zerami na początku\n" "\n" -#: src/nl.c:286 +#: src/nl.c:278 #, c-format msgid "line number overflow" msgstr "przepełnienie licznika wierszy" -#: src/nl.c:486 +#: src/nl.c:478 #, c-format msgid "invalid header numbering style: %s" msgstr "błędny styl numerowania nagłówka: %s" -#: src/nl.c:494 +#: src/nl.c:486 #, c-format msgid "invalid body numbering style: %s" msgstr "błędny styl numerownaia treści: %s" -#: src/nl.c:502 +#: src/nl.c:494 #, c-format msgid "invalid footer numbering style: %s" msgstr "błędny styl numerowania stopek: %s" -#: src/nl.c:511 +#: src/nl.c:503 #, c-format msgid "invalid starting line number: %s" msgstr "błędny początkowy numer linii: %s" -#: src/nl.c:517 -#, c-format -msgid "WARNING: --page-increment is deprecated; use --line-increment instead" -msgstr "" -"UWAGA: opcja --page-increment jest przestarzała, zamiast niej używaj --line-" -"increment" - -#: src/nl.c:524 +#: src/nl.c:512 #, c-format msgid "invalid line number increment: %s" msgstr "błędny przyrost numeru linii: %s" -#: src/nl.c:536 +#: src/nl.c:524 #, c-format msgid "invalid number of blank lines: %s" msgstr "błędna liczba pustych linii: %s" -#: src/nl.c:550 +#: src/nl.c:538 #, c-format msgid "invalid line number field width: %s" msgstr "błędna szerokość pola numeru linii: %s" -#: src/nl.c:569 +#: src/nl.c:557 #, c-format msgid "invalid line numbering format: %s" msgstr "błędny przyrost numeru linii: %s" @@ -6731,10 +6746,10 @@ msgstr "" "Jeżeli standardowym wejściem jest terminal, przekierowany jest do niego\n" "/dev/null .\n" "Jeżeli standardowym wyjściem jest terminal, dane wyjściowe, będą dołączone\n" -"do 'nohup.out' a jeżeli to niemożliwe, do '$HOME/nohup.out'.\n" +"do „nohup.out” a jeżeli to niemożliwe, do „$HOME/nohup.out”.\n" "Jeżeli standardowe wyjście błędów jest terminalem, zostanie przekierowane\n" "na standardowe wyjście.\n" -"Żeby zapisać dany wyjściowe do PLIKU należy użyć '%s POLECENIE > PLIK'.\n" +"Żeby zapisać dany wyjściowe do PLIKU należy użyć „%s POLECENIE > PLIK”.\n" #: src/nohup.c:127 #, c-format @@ -6746,11 +6761,6 @@ msgstr "nie udało się uczynić standardowego wejścia bezużytecznym" msgid "ignoring input" msgstr "zignorowane dane wejściowe" -#: src/nohup.c:163 src/nohup.c:165 -#, c-format -msgid "failed to open %s" -msgstr "nie udało się otworzyć %s" - #: src/nohup.c:175 #, c-format msgid "ignoring input and appending output to %s" @@ -6785,16 +6795,16 @@ msgid "failed to redirect standard error" msgstr "nie udało się przekierować wyjścia standardowego błędu" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:32 +#: src/nproc.c:33 msgid "Giuseppe Scrivano" msgstr "Giuseppe Scrivano" -#: src/nproc.c:56 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 +#: src/nproc.c:57 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Składnia: %s [OPCJA]...\n" -#: src/nproc.c:57 +#: src/nproc.c:58 msgid "" "Print the number of processing units available to the current process,\n" "which may be less than the number of online processors\n" @@ -6804,7 +6814,7 @@ msgstr "" "mniejsza niż liczba włączonych procesorów\n" "\n" -#: src/nproc.c:62 +#: src/nproc.c:63 msgid "" " --all print the number of installed processors\n" " --ignore=N if possible, exclude N processing units\n" @@ -6812,11 +6822,439 @@ msgstr "" " --all liczba zainstalowanych procesorów\n" " --ignore=N jeżeli to możliwe, wyłączenie N procesorów\n" -#: src/nproc.c:106 +#: src/nproc.c:107 #, c-format 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 +msgid "Assaf Gordon" +msgstr "Assaf Gordon" + +#: src/numfmt.c:676 +#, c-format +msgid "value too large to be converted: '%s'" +msgstr "wartość za duża żeby mogła być przekształcona: „%s”" + +#: src/numfmt.c:680 +#, c-format +msgid "invalid number: '%s'" +msgstr "błędna liczba „%s”" + +#: src/numfmt.c:684 +#, c-format +msgid "rejecting suffix in input: '%s' (consider using --from)" +msgstr "odrzucony przyrostek na wejściu: „%s” (rozważ użycie --from)" + +#: src/numfmt.c:688 +#, c-format +msgid "invalid suffix in input: '%s'" +msgstr "błędny przyrostek na wejściu: „%s”" + +#: src/numfmt.c:692 +#, 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)" + +#: src/numfmt.c:723 +#, c-format +msgid "failed to prepare value '%Lf' for printing" +msgstr "błąd przygotowania wartości „%Lf” do drukowania" + +#: src/numfmt.c:787 +#, c-format +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 +#, c-format +msgid "Usage: %s [OPTION]... [NUMBER]...\n" +msgstr "Składnia: %s [OPCJA]... [LICZBA]...\n" + +#: src/numfmt.c:816 +msgid "" +"Reformat NUMBER(s), or the numbers from standard input if none are " +"specified.\n" +msgstr "" +"Przeformatowanie LICZB/Y ze standardowego wejścia albo podanych jako " +"argumenty.\n" + +#: src/numfmt.c:820 +msgid " --debug print warnings about invalid input\n" +msgstr "" +" --debug wypisywanie ostrzeżeń o błędnych danych wejściowych\n" + +#: src/numfmt.c:823 +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 +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 +msgid "" +" --format=FORMAT use printf style floating-point FORMAT;\n" +" see FORMAT below for details\n" +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 +msgid "" +" --from=UNIT auto-scale input numbers to UNITs; default is " +"'none';\n" +" see UNIT below\n" +msgstr "" +" --from=JEDNOSTKI samoczynne przeskalowanie liczb wejściowych do\n" +" JEDNOSTEK. Domyślnie: „none” („żadne”). Zobacz " +"spis\n" +" JEDNOSTEK poniżej.\n" + +#: src/numfmt.c:837 +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 +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 grupowanie cyfr wg ustawień regionalnych (np.\n" +" 1.000.000). (więc nie działa dla ustawień C/POSIX)\n" + +#: src/numfmt.c:844 +msgid "" +" --header[=N] print (without converting) the first N header lines;\n" +" N defaults to 1 if not specified\n" +msgstr "" +" --header[=N] pierwsze N linii zostanie przepisanych bez konwersji.\n" +" Jeżeli N nie jest podane, domyslnie jedna.\n" + +#: src/numfmt.c:848 +msgid "" +" --invalid=MODE failure mode for invalid numbers: MODE can be:\n" +" abort (default), fail, warn, ignore\n" +msgstr "" +" --invalid=TRYB reakcja na błędne liczby. TRYB to:\n" +" abort (zakończ; domyślnie), fail (błąd),\n" +" warn (ostrzeżenie), ignore (ignorowanie)\n" + +#: src/numfmt.c:852 +msgid "" +" --padding=N pad the output to N characters; positive N will\n" +" right-align; negative N will left-align;\n" +" padding is ignored if the output is wider than N;\n" +" the default is to automatically pad if a " +"whitespace\n" +" is found\n" +msgstr "" +" --padding=N dopełnienie danych wyjściowych do N znaków.\n" +" Dodatnie N oznacza dosunięcie do prawej. Ujemne - " +"do\n" +" lewej. Jeżeli dane są szersze niż N znaków, nie są\n" +" dopełniane. Domyślnie dopełnienie jest " +"automatyczne,\n" +" jeżeli napotkane są odstępy\n" + +#: src/numfmt.c:859 +msgid "" +" --round=METHOD use METHOD for rounding when scaling; METHOD can be:\n" +" up, down, from-zero (default), towards-zero, " +"nearest\n" +msgstr "" +" --round=METODA METODA zaokrąglania przy skalowaniu: up (w górę), " +"down\n" +" (w dół), from-zero (od zera; domyślnie), towards-" +"zero\n" +" (w kierunku zera), nearest (najbliższa)\n" + +#: src/numfmt.c:863 +msgid "" +" --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" +" SUFFIX in input numbers\n" +msgstr "" +" --suffix=PRZYROSTEK dodanie PRZYROSTKA do liczb wyjściowych i\n" +" akceptowanie opcjonalnego PRZYROSTKA w liczbach\n" +" wejściowych\n" + +#: src/numfmt.c:867 +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 +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 +msgid "" +"\n" +"UNIT options:\n" +msgstr "" +"\n" +"Inne opcje:\n" + +#: src/numfmt.c:880 +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 +msgid "" +" auto accept optional single/two letter suffix:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" +msgstr "" +" auto akceptowanie opcjonalnego jedno-dwuliterowago przyrostka:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" + +#: src/numfmt.c:889 +msgid "" +" si accept optional single letter suffix:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ...\n" +msgstr "" +" si akceptowanie opcjonalnego jednoliterowago przyrostka:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ...\n" + +#: src/numfmt.c:894 +msgid "" +" iec accept optional single letter suffix:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ...\n" +msgstr "" +" iec akceptowanie opcjonalnego jednego jednoliterowego przyrostka:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ...\n" + +#: src/numfmt.c:899 +msgid "" +" iec-i accept optional two-letter suffix:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ...\n" +msgstr "" +" iec-i akcpetowanie opcjonalnego dwuliterowego przyrostka:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ...\n" + +#: src/numfmt.c:905 +#, 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" +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" + +#: src/numfmt.c:912 +#, c-format +msgid "" +"\n" +"Exit status is 0 if all input numbers were successfully converted.\n" +"By default, %s will stop at the first conversion error with exit status 2.\n" +"With --invalid='fail' a warning is printed for each conversion error\n" +"and the exit status is 2. With --invalid='warn' each conversion error is\n" +"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" +"Stan wyjściowy to 0, jeżeli udało się prawidłowo przekształcić wszystkie\n" +"liczby. Domyślnie %s zatrzyma się przy pierwszym błędzie przekształcania\n" +"ze stanem wyjściowym 2. Z opcją --invalid=fail jest tylko wypisywane\n" +"ostrzeżenie dla każdego błędu przekształcania, a stan wyjściowy to 2. Z " +"opcją\n" +"--invalid=warn podawane są informacje diagnostyczne o każdym błędzie\n" +"przekształcania, a stan wyjściowy będzie miał wartość 0. Z opcją\n" +"--invalid=ignore nie są podawane informacje diagnostyczne, stan wyjściowy\n" +"wynosi 0.\n" + +#: src/numfmt.c:921 +#, c-format +msgid "" +"\n" +"Examples:\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" +msgstr "" +"\n" +"Przykłady:\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 +#, c-format +msgid "format %s has no %% directive" +msgstr "format %s nie ma dyrektywy %%" + +#: src/numfmt.c:990 +#, 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 +#, c-format +msgid "format %s ends in %%" +msgstr "format %s kończy się %%" + +#: src/numfmt.c:1010 +#, c-format +msgid "invalid format %s, directive must be %%['][-][N]f" +msgstr "błędny format %s, dyrektywa powinna być w postaci %%['][-][N]f" + +#: src/numfmt.c:1018 src/seq.c:236 +#, c-format +msgid "format %s has too many %% directives" +msgstr "format %s ma za dużo dyrektyw %%" + +#: src/numfmt.c:1070 +#, c-format +msgid "invalid suffix in input '%s': '%s'" +msgstr "błędny przyrostek na wejściu „%s”: „%s”" + +#: src/numfmt.c:1092 +#, 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 +#, 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 +#, c-format +msgid "large input value '%s': possible precision loss" +msgstr "duża wartość wejściowa „%s”: możliwa utrata precyzji" + +#: src/numfmt.c:1293 +#, 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 +#, c-format +msgid "invalid padding value '%s'" +msgstr "błędna wartość wypełniania „%s”" + +#: src/numfmt.c:1401 +#, c-format +msgid "invalid field value '%s'" +msgstr "błędny numer pola: „%s”" + +#: src/numfmt.c:1430 +#, c-format +msgid "invalid header value '%s'" +msgstr "błędna zawartość nagłówka „%s”" + +#: src/numfmt.c:1456 +#, 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 +#, c-format +msgid "no conversion option specified" +msgstr "nie podano opcji przekształcenia" + +#: src/numfmt.c:1471 +#, 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 +#, c-format +msgid "grouping has no effect in this locale" +msgstr "grupowanie nie działa dla tych ustawień regionalnych" + +#: src/numfmt.c:1486 +#, 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 +#, c-format +msgid "error reading input" +msgstr "błąd czytania danych wejściowych" + +#: src/numfmt.c:1520 +#, 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 #, c-format msgid "" @@ -6846,42 +7284,68 @@ msgstr "" "\n" #: src/od.c:307 -msgid "All arguments to long options are mandatory for short options.\n" -msgstr "Argumenty obowiązkowe dla opcji długich obowiązują dla krótkich.\n" +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" +"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" +"at first byte printed, incremented when dump is progressing.\n" +"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 "" +"Jeżeli i pierwszy i drugi format pasuje do użytej składni, a ostatni " +"argument\n" +"zaczyna się od + albo (w przypadku dwóch argumentów) od cyfry, zakłada się, " +"że\n" +"został użyty format trzeci. PRZESUNIĘCIE oznacza to samo co -j " +"PRZESUNIĘCIE.\n" +"ETYKIETA to pseudo-adres wypisanego bajtu, zwiększa się w trakcie pracy\n" +"programu. Dla PRZESUNIĘCIA i ETYKIETY przedrostek 0x lub 0X oznacza zapis\n" +"szesnastkowy, zapis ósemkowy jest oznaczany przez przyrostek . , a " +"przyrostek\n" +"b oznacza wielokrotność 512.\n" -#: src/od.c:310 +#: src/od.c:318 msgid "" -" -A, --address-radix=RADIX decide how file offsets are printed\n" +" -A, --address-radix=RADIX output format for file offsets. RADIX is one\n" +" of [doxn], for Decimal, Octal, Hex or None\n" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" -" -A, --address-radix=BAZA postać wypisywania pozycji\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" " -j, --skip-bytes=BAJTY ominięcie tylu początkowych BAJTÓW każdego " "pliku\n" -#: src/od.c:314 +#: src/od.c:323 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" -" --traditional accept arguments in traditional form\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\n" +" 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" +"wyjściowej.\n" +" Jeżeli liczba BAJTÓW jest pominięta: 32\n" " --traditional akceptowanie argumentów w tradycyjnym " "formacie\n" -#: src/od.c:324 +#: src/od.c:336 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" @@ -6889,13 +7353,14 @@ msgid "" " -d same as -t u2, select unsigned decimal 2-byte units\n" msgstr "" "\n" +"\n" "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" " -d to samo co -t u2, dziesiętnie liczby 2-bajtowe bez znaku\n" -#: src/od.c:332 +#: src/od.c:345 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -6911,44 +7376,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:340 +#: src/od.c:353 msgid "" "\n" -"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" -"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" -"at first byte printed, incremented when dump is progressing.\n" -"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" -"Jeżeli i pierwszy i drugi format pasuje do użytej składni, a ostatni " -"argument\n" -"zaczyna się od + albo (w przypadku dwóch argumentów) od cyfry, zakłada się, " -"że\n" -"został użyty format trzeci. PRZESUNIĘCIE oznacza to samo co -j " -"PRZESUNIĘCIE.\n" -"ETYKIETA to pseudo-adres wypisanego bajtu, zwiększa się w trakcie pracy\n" -"programu. Dla PRZESUNIĘCIA i ETYKIETY przedrostek 0x lub 0X oznacza zapis\n" -"szesnastkowy, zapis ósemkowy jest oznaczany przez przyrostek . , a " -"przyrostek\n" -"b oznacza wielokrotność 512.\n" - -#: src/od.c:349 -msgid "" "\n" "TYPE is made up of one or more of these specifications:\n" -"\n" " a named character, ignoring high-order bit\n" " c ASCII character or backslash escape\n" msgstr "" "\n" -"TYP składa się z jednej lub więcej następujących specyfikacji:\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" -#: src/od.c:356 +#: src/od.c:360 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -6962,55 +7404,59 @@ 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:363 +#: src/od.c:367 msgid "" "\n" -"SIZE is a number. For TYPE in doux, SIZE may also be C for\n" +"SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" "sizeof(char), S for sizeof(short), I for sizeof(int) or L for\n" "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" -"ROZMIAR jest liczbą. Dla TYPÓW d, o, u, x ROZMIAR może być też C dla\n" +"ROZMIAR jest liczbą. Dla TYPÓW [doux] ROZMIAR może być też C dla\n" "sizeof(char), S dla sizeof(short), I dla sizeof(int) albo L dla\n" "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:370 +#: src/od.c:374 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" +"Adding a z suffix to any type displays printable characters at the end of\n" +"each output line.\n" msgstr "" "\n" -"BAZĘ oznacza się d jeżeli jest dziesiętna, o - ósemkowa, x - szesnastkowa, n " -"-\n" -"żadna. BAJTY są w zapisie szesnastkowym jeżeli maja przedrostek 0x albo 0X;\n" -"mogą mieć przyrostek mnożący: b 512, kB 1000, K 1024, MB 1000*1000,\n" -"M 1024*1024, GB 1000*1000*1000, G 1024*1024*1024 itd. dla T, P, E, Z, Y.\n" -"Dodanie przyrostka 'z' do dowolnego typu dodaje wyświetlanie znaków\n" -"drukowalnych na końcu każdej linii.\n" +"Dodanie przyrostka do dowolnego typu powoduje pokazanie drukowalnych znaków\n" +"na końcu każdej linii danych wyjściowych.\n" -#: src/od.c:380 +#: src/od.c:379 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" +"\n" +"BYTES is hex with 0x or 0X prefix, and may have a multiplier suffix:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"and so on for G, T, P, E, Z, Y.\n" msgstr "" -"Opcja --string bez liczby oznacza długość równą 3; opcja --width bez\n" -"liczby oznacza szerokość równą 32. Domyślnie od używa -A o -t oS -w16.\n" +"\n" +"\n" +"BAJTY są podawane jak wartość szestnastkowa z przedrostkiem 0x albo 0X\n" +"i może mieć przyrostek mnożący:\n" +" b 512\n" +" kB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"i tak dalej dla G, T, P, E, Z, Y.\n" -#: src/od.c:633 src/od.c:753 +#: src/od.c:639 src/od.c:759 #, c-format msgid "invalid type string %s" msgstr "błędna specyfikacja typu %s" -#: src/od.c:643 +#: src/od.c:649 #, c-format msgid "" "invalid type string %s;\n" @@ -7019,7 +7465,7 @@ msgstr "" "błędna specyfikacja typu %s;\n" "ten system nie ma %lu-bajtowych liczb całkowitych" -#: src/od.c:764 +#: src/od.c:770 #, c-format msgid "" "invalid type string %s;\n" @@ -7028,37 +7474,37 @@ msgstr "" "błędna specyfikacja typu %s;\n" "ten system nie ma %lu-bajtowych liczb zmiennoprzecinkowych" -#: src/od.c:822 +#: src/od.c:828 #, c-format msgid "invalid character '%c' in type string %s" -msgstr "błędny znak '%c' w specyfikacji typu %s" +msgstr "błędny znak „%c” w specyfikacji typu %s" -#: src/od.c:1047 +#: src/od.c:1053 #, 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:1603 +#: src/od.c:1609 #, 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]" +"błędna baza danych wyjściowych „%c”; musi to być jeden ze znaków [doxn]" -#: src/od.c:1729 +#: src/od.c:1735 #, c-format msgid "no type may be specified when dumping strings" msgstr "nie można podawać typu przy wypisywaniu napisów" -#: src/od.c:1804 +#: src/od.c:1810 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:1825 +#: src/od.c:1831 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "za duże skip-bytes + read-bytes" -#: src/od.c:1868 +#: src/od.c:1874 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "uwaga: błędna szerokość %lu; używam %d zamiast" @@ -7078,14 +7524,12 @@ 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" -"\n" msgstr "" "Wypisywanie linii złożonych ze sklejonych kolejnych odpowiadających sobie\n" "linii z każdego PLIKU oddzielonych TABami, na standardowe wyjście.\n" "Bez PLIKU albo gdy jest podany jako -, czytane jest standardowe wejście.\n" -"\n" -#: src/paste.c:448 +#: 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" @@ -7093,7 +7537,7 @@ msgstr "" " -d, --delimiters=LISTA użycie kolejnych znaków z LISTY zamiast TABów\n" " -s, --serial przepisanie plików po kolei zamiast równolegle\n" -#: src/paste.c:509 +#: src/paste.c:508 #, c-format msgid "delimiter list ends with an unescaped backslash: %s" msgstr "ograniczenie końców listy przez ukośnik odwrotny: %s" @@ -7116,7 +7560,7 @@ msgstr "" #: src/pathchk.c:170 #, c-format msgid "leading '-' in a component of file name %s" -msgstr "'-' na początku składnika nazwy pliku %s" +msgstr "„-” na początku składnika nazwy pliku %s" #: src/pathchk.c:196 #, c-format @@ -7155,80 +7599,80 @@ msgid "Kaveh Ghazi" msgstr "Kaveh Ghazi" #. TRANSLATORS: Real name is unknown; at most 19 characters. -#: src/pinky.c:250 +#: src/pinky.c:242 msgid " ???" msgstr " ???" #. TRANSLATORS: Idle time is unknown; at most 5 characters. -#: src/pinky.c:274 +#: src/pinky.c:266 msgid "?????" msgstr "?????" -#: src/pinky.c:323 +#: src/pinky.c:314 #, c-format msgid "Login name: " msgstr "Użytkownik: " -#: src/pinky.c:326 +#: src/pinky.c:317 #, c-format msgid "In real life: " msgstr "Imię i nazwisko: " #. TRANSLATORS: Real name is unknown; no hard limit. -#: src/pinky.c:330 +#: src/pinky.c:321 msgid "???\n" msgstr "???\n" -#: src/pinky.c:350 +#: src/pinky.c:341 #, c-format msgid "Directory: " msgstr "Katalog: " -#: src/pinky.c:352 +#: src/pinky.c:343 #, c-format msgid "Shell: " msgstr "Powłoka: " -#: src/pinky.c:371 +#: src/pinky.c:362 #, c-format msgid "Project: " msgstr "Projekt: " -#: src/pinky.c:395 +#: src/pinky.c:386 #, c-format msgid "Plan:\n" msgstr "Plan:\n" -#: src/pinky.c:414 +#: src/pinky.c:405 msgid "Login" msgstr "Użytkownik" -#: src/pinky.c:416 +#: src/pinky.c:407 msgid "Name" msgstr "Nazwisko" -#: src/pinky.c:417 +#: src/pinky.c:408 msgid " TTY" msgstr " TTY" -#: src/pinky.c:419 +#: src/pinky.c:410 msgid "Idle" msgstr "Bezczynny" -#: src/pinky.c:420 +#: src/pinky.c:411 msgid "When" msgstr "Kiedy" -#: src/pinky.c:423 +#: src/pinky.c:414 msgid "Where" msgstr "Skąd" -#: src/pinky.c:502 +#: src/pinky.c:493 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Składnia: %s [OPCJA]... [UŻYTKOWNIK]...\n" -#: src/pinky.c:503 +#: src/pinky.c:494 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7245,7 +7689,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:511 +#: src/pinky.c:502 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7261,7 +7705,7 @@ msgstr "" "bezczynności\n" " w formacie skróconym\n" -#: src/pinky.c:520 +#: src/pinky.c:511 #, c-format msgid "" "\n" @@ -7269,10 +7713,10 @@ msgid "" "The utmp file will be %s.\n" msgstr "" "\n" -"Uproszczona wersja programu 'finger'. Wyświetla informacje o użytkownikach.\n" +"Uproszczona wersja programu „finger”. Wyświetla informacje o użytkownikach.\n" "Ścieżka do pliku utmp: %s .\n" -#: src/pinky.c:604 +#: src/pinky.c:595 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "" @@ -7288,86 +7732,82 @@ msgstr "Pete TerMaat" msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:912 +#: src/pr.c:908 #, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" -msgstr "'--pages=PIERWSZA_STRONA[:OSTATNIA_STRONA]' - brakujący argument" +msgstr "„--pages=PIERWSZA_STRONA[:OSTATNIA_STRONA]” - brakujący argument" -#: src/pr.c:914 +#: src/pr.c:910 #, c-format msgid "invalid page range %s" msgstr "błędny zakres stron %s" -#: src/pr.c:979 +#: src/pr.c:975 #, c-format msgid "'-l PAGE_LENGTH' invalid number of lines: %s" -msgstr "'-l DŁ_STRONY' błędna liczba linii: %s" +msgstr "„-l DŁ_STRONY” błędna liczba linii: %s" -#: src/pr.c:1003 +#: src/pr.c:999 #, c-format msgid "'-N NUMBER' invalid starting line number: %s" -msgstr "'-N LICZBA' błędny numer linii początkowej: %s" +msgstr "„-N LICZBA” błędny numer linii początkowej: %s" -#: src/pr.c:1015 +#: src/pr.c:1011 #, c-format msgid "'-o MARGIN' invalid line offset: %s" -msgstr "'-o MARGINES' błędne przesunięcie linii: %s" +msgstr "„-o MARGINES” błędne przesunięcie linii: %s" -#: src/pr.c:1056 +#: src/pr.c:1052 #, c-format msgid "'-w PAGE_WIDTH' invalid number of characters: %s" -msgstr "'-w SZEROKOŚĆ_STRONY' błędna liczba znaków: %s" +msgstr "„-w SZEROKOŚĆ_STRONY” błędna liczba znaków: %s" -#: src/pr.c:1070 +#: src/pr.c:1066 #, c-format msgid "'-W PAGE_WIDTH' invalid number of characters: %s" -msgstr "'-W SZEROKOŚĆ_STRONY' błędna liczba znaków: %s" +msgstr "„-W SZEROKOŚĆ_STRONY” błędna liczba znaków: %s" -#: src/pr.c:1100 +#: src/pr.c:1096 #, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "przy wypisywaniu równoległym nie można podawać liczby kolumn" # wzdłuż? - rzm -#: src/pr.c:1104 +#: src/pr.c:1100 #, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "nie można wypisywać równocześnie w kolejnych kolumnach i równolegle" -#: src/pr.c:1200 +#: src/pr.c:1196 #, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" -msgstr "'-%c' nadmiarowe znaki lub błędna liczba w argumencie: %s" +msgstr "„-%c” nadmiarowe znaki lub błędna liczba w argumencie: %s" -#: src/pr.c:1304 +#: src/pr.c:1293 #, c-format msgid "page width too narrow" msgstr "szerokość strony za mała" -#: src/pr.c:2369 +#: src/pr.c:2353 #, c-format msgid "starting page number %<PRIuMAX> exceeds page count %<PRIuMAX>" msgstr "początkowy numer strony %<PRIuMAX> przekracza liczbę stron %<PRIuMAX>" -#: src/pr.c:2396 +#: src/pr.c:2380 #, c-format msgid "page number overflow" msgstr "przepełnienie licznika stron" -#: src/pr.c:2401 +#: src/pr.c:2385 #, c-format msgid "Page %<PRIuMAX>" msgstr "Strona %<PRIuMAX>" -#: src/pr.c:2773 -msgid "" -"Paginate or columnate FILE(s) for printing.\n" -"\n" -msgstr "" -"Podzielenie na strony lub ułożenie w kolumny PLIKU/ÓW do drukowania.\n" -"\n" +#: src/pr.c:2757 +msgid "Paginate or columnate FILE(s) for printing.\n" +msgstr "Podzielenie na strony lub ułożenie w kolumny PLIKU/ÓW do drukowania.\n" -#: src/pr.c:2780 +#: src/pr.c:2763 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -7386,7 +7826,7 @@ msgstr "" " góry do dołu, chyba że użyte jest -a. Wyrównanie liczby\n" " linii w kolumnach na każdej stronie.\n" -#: src/pr.c:2788 +#: src/pr.c:2771 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7404,7 +7844,7 @@ msgstr "" " -d, --double-space\n" " podwójny odstęp na wyjściu\n" -#: src/pr.c:2796 +#: src/pr.c:2779 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7426,7 +7866,7 @@ msgstr "" " znaku nowej linii (przez 3-liniowy nagłówek strony z -F\n" " lub 5-liniowy nagłówek i stopkę bez -F)\n" -#: src/pr.c:2806 +#: src/pr.c:2789 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -7449,7 +7889,7 @@ msgstr "" " -W, bez wyrównania kolumn, -sep-string[-NAPIS] ustawia\n" " separatory\n" -#: src/pr.c:2815 +#: src/pr.c:2798 msgid "" " -l, --length=PAGE_LENGTH\n" " set the page length to PAGE_LENGTH (66) lines\n" @@ -7465,7 +7905,7 @@ msgstr "" "długości\n" " są łączone przez -J\n" -#: src/pr.c:2822 +#: src/pr.c:2805 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -7483,7 +7923,7 @@ msgstr "" "pierwszej\n" " drukowanej strony (zob. +PIERWSZA_STRONA)\n" -#: src/pr.c:2830 +#: src/pr.c:2813 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -7498,7 +7938,7 @@ msgstr "" " -r, --no-file-warnings\n" " bez ostrzeżeń kiedy plik nie może być otwarty\n" -#: src/pr.c:2837 +#: src/pr.c:2820 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -7510,12 +7950,12 @@ 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:2844 +#: src/pr.c:2827 msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" @@ -7532,7 +7972,7 @@ msgstr "" " kolumn\n" " -t, --omit-header bez wypisywania nagłówków i stopek stron\n" -#: src/pr.c:2851 +#: src/pr.c:2834 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -7557,7 +7997,7 @@ msgstr "" " wydruku wielokolumnowego, -s[ZNAK] wyłącza wartość\n" " domyślną (72)\n" -#: src/pr.c:2861 +#: src/pr.c:2844 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -7572,7 +8012,7 @@ msgstr "" "nie\n" " przeszkadza opcjom -S ani -s.\n" -#: src/pr.c:2869 +#: src/pr.c:2852 msgid "" "\n" "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" @@ -7659,7 +8099,7 @@ msgid "" "ARGUMENTs converted to proper type first. Variable widths are handled.\n" msgstr "" " %% pojedynczy %\n" -" %b ARGUMENT ze zinterpretowanymi sekwencjami '\\' oprócz\n" +" %b ARGUMENT ze zinterpretowanymi sekwencjami „\\” oprócz\n" " sekwencji ósemkowych, które mają formę \\0 albo \\0NNN\n" "\n" "i wszystkie specyfikacje formatu C zakończone jednym ze znaków\n" @@ -7732,12 +8172,9 @@ msgstr "" msgid "" "Output a permuted index, including context, of the words in the input " "files.\n" -"\n" -msgstr "" -"Pokazanie indeksu słów z plików wejściowych razem z kontekstem.\n" -"\n" +msgstr "Pokazanie indeksu słów z plików wejściowych razem z kontekstem.\n" -#: src/ptx.c:1828 +#: src/ptx.c:1827 msgid "" " -A, --auto-reference output automatically generated references\n" " -G, --traditional behave more like System V 'ptx'\n" @@ -7745,12 +8182,12 @@ msgid "" msgstr "" " -A, --auto-reference wypisanie automatycznie wygenerowanych\n" " odnośników\n" -" -G, --traditional zachowanie zgodności z wersją ptx z Systemu " -"V\n" +" -G, --traditional zachowanie zgodności z wersją „ptx” z " +"Systemu V\n" " -F, --flag-truncation=NAPIS użycie NAPISU do zaznaczania wyciętych " "linii\n" -#: src/ptx.c:1833 +#: src/ptx.c:1832 msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" " -O, --format=roff generate output as roff directives\n" @@ -7767,7 +8204,7 @@ msgstr "" " -T, --format=tex generowanie wyjścia w postaci dyrektyw TeX-" "a\n" -#: src/ptx.c:1840 +#: src/ptx.c:1839 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -7786,7 +8223,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:1848 +#: src/ptx.c:1847 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -7799,16 +8236,16 @@ msgstr "" " -w, --width=NUMBER szerokość wyjścia w kolumnach, bez " "odnośników\n" -#: src/ptx.c:1855 +#: src/ptx.c:1854 msgid "" "\n" "With no FILE or if FILE is -, read Standard Input. '-F /' by default.\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" +"wejście. Domyślnie użyta jest opcja „-F /”.\n" -#: src/ptx.c:1949 +#: src/ptx.c:1948 #, c-format msgid "invalid gap width: %s" msgstr "błędna szerokość odstępu: %s" @@ -7835,7 +8272,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "nie udało się chdir do %s" -#: src/pwd.c:170 src/pwd.c:277 +#: src/pwd.c:170 src/pwd.c:277 src/split.c:373 #, c-format msgid "failed to stat %s" msgstr "nie udało się stat %s" @@ -7851,14 +8288,15 @@ msgid "ignoring non-option arguments" msgstr "zignorowano argumenty nie będące opcjami" #. This is a proper name. See the gettext manual, section Names. -#: src/readlink.c:33 +#: src/readlink.c:32 msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 +#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147 +#: src/stat.c:1349 src/touch.c:212 #, c-format -msgid "Usage: %s [OPTION]... FILE\n" -msgstr "Składnia: %s [OPCJA]... PLIK\n" +msgid "Usage: %s [OPTION]... FILE...\n" +msgstr "Składnia: %s [OPCJA]... PLIK...\n" #: src/readlink.c:63 msgid "" @@ -7898,10 +8336,12 @@ msgid "" "recursively,\n" " without requirements on components " "existence\n" -" -n, --no-newline do not output the trailing newline\n" +" -n, --no-newline do not output the trailing delimiter\n" " -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" msgstr "" " -m, --canonicalize-missing doprowadzenie do postaci kanonicznej przez\n" " rekursywne rozwiązanie wszystkich dowiązań\n" @@ -7912,12 +8352,13 @@ 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" -#: src/realpath.c:71 src/rm.c:134 src/shred.c:147 src/stat.c:1330 -#: src/touch.c:215 +#: src/readlink.c:152 #, c-format -msgid "Usage: %s [OPTION]... FILE...\n" -msgstr "Składnia: %s [OPCJA]... PLIK...\n" +msgid "ignoring --no-newline with multiple arguments" +msgstr "zignorowano --no-newline z wielona argumentami" #: src/realpath.c:72 msgid "" @@ -7943,7 +8384,7 @@ msgid "" msgstr "" " -e, --canonicalize-existing wszystkie elementy ścieżki musza istnieć\n" " -m, --canonicalize-missing elementy ścieżki nie muszą istnieć\n" -" -L, --logical rozwinięcie elementów '..' przed " +" -L, --logical rozwinięcie elementów „..” przed " "dowiązaniami\n" " symbolicznymi\n" " -P, --physical rozwinięcie dowiązań symbolicznych w " @@ -7963,12 +8404,12 @@ msgstr "" msgid "generating relative path" msgstr "tworzenie ścieżki względnej" -#: src/remove.c:286 +#: src/remove.c:273 #, c-format msgid "%s: descend into write-protected directory %s? " msgstr "%s: wejść w katalog %s, zabezpieczony przed zapisem? " -#: src/remove.c:287 +#: src/remove.c:274 #, c-format msgid "%s: descend into directory %s? " msgstr "%s: przejść do katalogu %s? " @@ -7977,37 +8418,37 @@ msgstr "%s: przejść do katalogu %s? " #. translate "%s: remove %s (write-protected) %s? " #. instead. It should avoid grammatical problems #. with the output of file_type. -#: src/remove.c:303 +#: src/remove.c:290 #, c-format msgid "%s: remove write-protected %s %s? " msgstr "%s: usunąć zabezpieczony przed zapisem %s %s? " -#: src/remove.c:304 +#: src/remove.c:291 #, c-format msgid "%s: remove %s %s? " msgstr "%s: usunąć %s %s? " -#: src/remove.c:417 +#: src/remove.c:374 #, c-format msgid "removed directory: %s\n" msgstr "usunięty katalog %s\n" -#: src/remove.c:481 +#: src/remove.c:444 #, c-format msgid "cannot remove directory: %s" msgstr "nie można usunąć katalogu: %s" -#: src/remove.c:537 +#: src/remove.c:500 #, 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:557 +#: src/remove.c:520 #, c-format msgid "traversal failed: %s" msgstr "błąd przeglądania: %s" -#: src/remove.c:563 +#: src/remove.c:526 #, c-format msgid "" "unexpected failure: fts_info=%d: %s\n" @@ -8016,12 +8457,12 @@ msgstr "" "nieoczekiwany błąd: fts_info=%d: %s\n" "prosimy o wysłanie raportu do %s" -#: src/rm.c:118 +#: src/rm.c:119 #, c-format msgid "Try '%s ./%s' to remove the file %s.\n" -msgstr "Użyj '%s ./%s' żeby usunąć plik %s.\n" +msgstr "Użyj „%s ./%s” żeby usunąć plik %s.\n" -#: src/rm.c:135 +#: src/rm.c:136 msgid "" "Remove (unlink) the FILE(s).\n" "\n" @@ -8035,7 +8476,7 @@ msgstr "" " bez pytań\n" " -i pytanie przez każdym kasowaniem\n" -#: src/rm.c:141 +#: src/rm.c:142 msgid "" " -I prompt once before removing more than three files, " "or\n" @@ -8056,7 +8497,7 @@ msgstr "" "zawsze\n" " jest zadawane pytanie\n" -#: src/rm.c:148 +#: src/rm.c:149 msgid "" " --one-file-system when removing a hierarchy recursively, skip any\n" " directory that is on a file system different from\n" @@ -8068,20 +8509,21 @@ msgstr "" " niż ten, na którym znajduje się argument " "polecenia\n" -#: src/rm.c:153 +#: src/rm.c:154 msgid "" " --no-preserve-root do not treat '/' specially\n" " --preserve-root do not remove '/' (default)\n" " -r, -R, --recursive remove directories and their contents recursively\n" +" -d, --dir remove empty directories\n" " -v, --verbose explain what is being done\n" msgstr "" -" --no-preserve-root bez traktowania katalogu '/' w specjalny sposób\n" -" (domyślnie)\n" -" --preserve-root odmowa usunięcia '/' (domyslnie)\n" +" --no-preserve-root bez traktowania katalogu „/” w specjalny sposób\n" +" --preserve-root odmowa usunięcia „/” (domyslnie)\n" " -r, -R, --recursive usuwanie katalogów z zawartością rekursywnie\n" +" -d, --dir usuwanie pustych katalogów\n" " -v, --verbose wyjaśnianie co się dzieje\n" -#: src/rm.c:161 +#: src/rm.c:163 msgid "" "\n" "By default, rm does not remove directories. Use the --recursive (-r or -R)\n" @@ -8092,7 +8534,7 @@ msgstr "" "Domyślnie rm nie usuwa katalogów. Użyj opcji --recursive (albo -r albo -R)\n" "żeby skasować również wszystkie podane katalogi z zawartością.\n" -#: src/rm.c:166 +#: src/rm.c:168 #, c-format msgid "" "\n" @@ -8103,13 +8545,13 @@ msgid "" " %s ./-foo\n" msgstr "" "\n" -"Żeby usunąć plik z nazwą zaczynająca się od '-', np. '-foo', można użyć\n" +"Żeby usunąć plik z nazwą zaczynająca się od „-”, np. „-foo”, można użyć\n" "jednego z poleceń:\n" " %s -- -foo\n" "\n" " %s ./-foo\n" -#: src/rm.c:175 +#: src/rm.c:177 msgid "" "\n" "Note that if you use rm to remove a file, it might be possible to recover\n" @@ -8117,18 +8559,18 @@ msgid "" "assurance that the contents are truly unrecoverable, consider using shred.\n" msgstr "" "\n" -"Warto zauważyć, że po usunięciu plku przy użyciu 'rm', jeżeli dysponuje się\n" +"Warto zauważyć, że po usunięciu plku przy użyciu „rm”, jeżeli dysponuje się\n" "dostateczną wiedzą i czasem istnieje możliwość odtworzenia jego zawartości\n" "lub jej części. Jeżeli chcemy mieć większą pewność, że zawartość pliku " "będzie\n" "rzeczywiście nie do odtworzenia, należy rozważyć użycie programu shred.\n" -#: src/rm.c:335 +#: src/rm.c:342 #, c-format msgid "%s: remove all arguments recursively? " msgstr "%s: usunąć wszystkie argumenty rekursywnie? " -#: src/rm.c:336 +#: src/rm.c:343 #, c-format msgid "%s: remove all arguments? " msgstr "%s: usunąć wszystkie argumenty? " @@ -8167,9 +8609,9 @@ msgid "" msgstr "" " -p, --parents usunięcie KATALOGU, potem próba usunięcia każdego " "katalogu\n" -" nadrzędnego tej ścieżki. Np,. 'rmdir -p a/b/c jest " +" nadrzędnego tej ścieżki. Np. „rmdir -p a/b/c” jest " "podobne\n" -" do 'rmdir a/b/c a/b a'.\n" +" do „rmdir a/b/c a/b a”.\n" " -v, --verbose informacja diagnostyczna o każdym przetworzonym katalogu\n" #: src/rmdir.c:242 @@ -8191,7 +8633,12 @@ msgstr "" msgid "" "Run a program in a different security context.\n" "With neither CONTEXT nor COMMAND, print the current security context.\n" -"\n" +msgstr "" +"Uruchomienie programu w innym kontekscie bezpieczeństwa\n" +"Bez KONTEKSTU ani POLECENIA - wypisanie bieżącego kontekstu bezpieczeństwa.\n" + +#: src/runcon.c:94 +msgid "" " CONTEXT Complete security context\n" " -c, --compute compute process transition context before modifying\n" " -t, --type=TYPE type (for same role as parent)\n" @@ -8200,85 +8647,82 @@ msgid "" " -l, --range=RANGE levelrange\n" "\n" msgstr "" -"Uruchomienie programu w innym kontekscie bezpieczeństwa\n" -"Bez KONTEKSTU ani POLECENIA - wypisanie bieżącego kontekstu bezpieczeństwa.\n" -"\n" " KONTEKST pełny kontekst bezpieczeństwa\n" " -c, --compute wyliczenie przejściowego kontekstu procesu przez\n" " zmodyfikowaniem kontekstu\n" " -t, --type=TYP typ (dla tej samej roli, w której jest proces\n" " rodzicielski)\n" -" -u, --user=UŻYTKOWNIK identyfikacja użytkownika\n" +" -u, --user=UŻYTKOWNIK identyfikacja użytkownika\n" " -r, --role=ROLA rola\n" -" -l, --range=ZAKRES zakres poziomów\n" +" -l, --range=ZAKRES zakres poziomów\n" "\n" -#: src/runcon.c:140 +#: src/runcon.c:144 #, c-format msgid "multiple roles" msgstr "wiele ról" -#: src/runcon.c:145 +#: src/runcon.c:149 #, c-format msgid "multiple types" msgstr "wiele typów" -#: src/runcon.c:150 +#: src/runcon.c:154 #, c-format msgid "multiple users" msgstr "wielu użytkowników" -#: src/runcon.c:155 +#: src/runcon.c:159 #, c-format msgid "multiple levelranges" msgstr "wiele zakresów" -#: src/runcon.c:173 src/runcon.c:209 +#: src/runcon.c:177 src/runcon.c:213 #, c-format msgid "failed to get current context" msgstr "nie udało się odczytać bieżącego kontekstu" -#: src/runcon.c:183 +#: src/runcon.c:187 #, c-format msgid "you must specify -c, -t, -u, -l, -r, or context" msgstr "musisz użyć -c, -t -u, -l, -r albo kontekstu" -#: src/runcon.c:191 +#: src/runcon.c:195 #, c-format msgid "no command specified" msgstr "brak polecenia" -#: src/runcon.c:197 +#: src/runcon.c:201 #, 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:223 +#: src/runcon.c:227 #, c-format msgid "failed to compute a new context" msgstr "nie udało się obliczyć nowego kontekstu" -#: src/runcon.c:237 +#: src/runcon.c:241 #, c-format msgid "failed to set new user %s" msgstr "nie udało się ustawić nowego użytkownika %s" -#: src/runcon.c:239 +#: src/runcon.c:243 #, c-format msgid "failed to set new type %s" msgstr "nie udało się ustawić nowego typu %s" -#: src/runcon.c:241 +#: src/runcon.c:245 #, c-format msgid "failed to set new range %s" msgstr "nie udało się ustawić nowego zakresu %s" -#: src/runcon.c:243 +#: src/runcon.c:247 #, c-format msgid "failed to set new role %s" msgstr "nie udało się ustawić nowej roli %s" -#: src/runcon.c:251 +#: src/runcon.c:255 #, c-format msgid "unable to set security context %s" msgstr "nie udało się ustawić kontekstu bezpieczeństwa %s" @@ -8295,22 +8739,22 @@ msgstr "" " albo: %s [OPCJA]... PIERWSZA KROK OSTATNIA\n" #: src/seq.c:73 +msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" +msgstr "Wyświetlenie liczb od PIERWSZEJ do OSTATNIEJ z krokiem KROK.\n" + +#: src/seq.c:79 msgid "" -"Print numbers from FIRST to LAST, in steps of INCREMENT.\n" -"\n" " -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 "" -"Wyświetlenie liczb od PIERWSZEJ do OSTATNIEJ z krokiem KROK.\n" -"\n" " -f, --format=FORMAT użycie FORMATU w stylu zmiennoprzecinkowego " "formatu\n" " funkcji printf\n" " -s, --separator=NAPIS rozdzielenie liczb NAPISEM (domyślnie: \\n)\n" " -w, --equal-width wypełnienie zerami do równej szerokości\n" -#: src/seq.c:82 +#: src/seq.c:86 msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" @@ -8327,43 +8771,28 @@ msgstr "" "mniejsza od OSTATNIEJ, KROK jest zwykle ujemny, jeśli PIERWSZA jest większa\n" "od OSTATNIEJ.\n" -#: src/seq.c:90 +#: src/seq.c:94 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 "" -"FORMAT musi umożliwiać wypisanie jednego argumentu typu 'double'; domyślnie\n" +"FORMAT musi umożliwiać wypisanie jednego argumentu typu „double”; domyślnie\n" "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:136 +#: src/seq.c:140 #, c-format msgid "invalid floating point argument: %s" msgstr "błędny argument zmiennoprzecinkowy: %s" -#: src/seq.c:193 -#, c-format -msgid "format %s has no %% directive" -msgstr "format %s nie ma dyrektywy %%" - -#: src/seq.c:210 -#, c-format -msgid "format %s ends in %%" -msgstr "format %s kończy się %%" - -#: src/seq.c:213 +#: src/seq.c:232 #, c-format msgid "format %s has unknown %%%c directive" msgstr "format %s zawiera nieznaną dyrektywę %%%c" -#: src/seq.c:217 -#, c-format -msgid "format %s has too many %% directives" -msgstr "format %s ma za dużo dyrektyw %%" - # ? - rzm -#: src/seq.c:431 +#: src/seq.c:555 #, 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" @@ -8405,27 +8834,27 @@ msgstr "" " z numerycznym GID, a identyfikatorów dodatkowych grup -\n" " jeżeli podane - jako GID1, ...\n" -#: src/setuidgid.c:163 +#: src/setuidgid.c:162 #, c-format msgid "unknown user-ID: %s" msgstr "nieznany identyfikator użytkownika %s" -#: src/setuidgid.c:174 +#: 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:191 +#: src/setuidgid.c:190 #, c-format msgid "failed to set supplemental group(s)" msgstr "nie udało się ustawić grup dodatkowych" -#: src/setuidgid.c:201 +#: src/setuidgid.c:200 #, c-format msgid "cannot set group-ID to %lu" msgstr "nie można ustawić identyfikatora grupy %lu" -#: src/setuidgid.c:205 +#: src/setuidgid.c:204 #, c-format msgid "cannot set user-ID to %lu" msgstr "nie można ustawić identyfikatora użytkownika %lu" @@ -8439,13 +8868,11 @@ msgstr "Colin Plumb" 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" -"\n" msgstr "" "Wielokrotne zamazanie podanego PLIKU w celu utrudnienia odzyskania jego\n" "zawartości nawet przy użyciu drogich urządzeń do odzyskiwania danych.\n" -"\n" -#: src/shred.c:156 +#: src/shred.c:155 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -8459,7 +8886,7 @@ msgstr "" " -s, --size=N zamazanie N bajtów (można używać przyrostków takich jak K,\n" " M, G)\n" -#: src/shred.c:162 +#: src/shred.c:161 msgid "" " -u, --remove truncate and remove file after overwriting\n" " -v, --verbose show progress\n" @@ -8474,7 +8901,7 @@ msgstr "" " domyślnie dla plików innych niż zwykłe\n" " -z, --zero dodatkowe zamazanie zerami, aby ukryć zamazywanie\n" -#: src/shred.c:171 +#: src/shred.c:170 msgid "" "\n" "If FILE is -, shred standard output.\n" @@ -8494,7 +8921,7 @@ msgstr "" "zwykłych plików zwykle używa się opcji --remove.\n" "\n" -#: src/shred.c:181 +#: src/shred.c:180 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" @@ -8512,7 +8939,7 @@ msgstr "" "gwarancji, że działa efektywnie we wszystkich trybach pracy systemu plików:\n" "\n" -#: src/shred.c:189 +#: src/shred.c:188 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -8533,7 +8960,7 @@ msgstr "" "* które zapisują stan chwilowy, jak serwer NFS Network Appliance\n" "\n" -#: src/shred.c:199 +#: src/shred.c:198 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -8546,7 +8973,7 @@ msgstr "" "* kompresowanymi\n" "\n" -#: src/shred.c:206 +#: src/shred.c:205 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" @@ -8569,7 +8996,7 @@ msgstr "" "(man mount)\n" "\n" -#: src/shred.c:216 +#: src/shred.c:215 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" @@ -8580,122 +9007,122 @@ msgstr "" "które nie mogą zostać usunięte i plik zamazany schredem może zostać\n" "odtworzony.\n" -#: src/shred.c:296 +#: src/shred.c:295 #, c-format msgid "%s: fdatasync failed" msgstr "%s: błąd fdatasync" -#: src/shred.c:307 +#: src/shred.c:306 #, c-format msgid "%s: fsync failed" msgstr "%s: błąd fsync" -#: src/shred.c:384 +#: src/shred.c:383 #, c-format msgid "%s: cannot rewind" msgstr "%s: nie można przewinąć" -#: src/shred.c:403 +#: src/shred.c:402 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: przebieg %lu/%lu (%s)..." -#: src/shred.c:453 +#: src/shred.c:452 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: błąd zapisu na pozycji %s" -#: src/shred.c:471 +#: src/shred.c:470 #, c-format msgid "%s: lseek failed" msgstr "%s: nie udało się ustawienie pozycji lseek" -#: src/shred.c:482 +#: src/shred.c:481 #, c-format msgid "%s: file too large" msgstr "%s: plik jest za duży" -#: src/shred.c:505 +#: src/shred.c:504 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: przebieg %lu/%lu (%s)...%s" -#: src/shred.c:521 +#: src/shred.c:520 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: przebieg %lu/%lu (%s)...%s/%s %d%%" -#: src/shred.c:768 +#: src/shred.c:767 #, c-format msgid "%s: fstat failed" msgstr "%s: błąd fstat" -#: src/shred.c:779 +#: src/shred.c:778 #, c-format msgid "%s: invalid file type" msgstr "%s: błędny typ pliku" -#: src/shred.c:798 +#: src/shred.c:797 #, c-format msgid "%s: file has negative size" msgstr "%s: plik ma ujemny rozmiar" -#: src/shred.c:865 +#: src/shred.c:864 src/sort.c:932 src/split.c:378 #, c-format msgid "%s: error truncating" msgstr "%s: błąd obcinania" -#: src/shred.c:881 +#: src/shred.c:880 #, c-format msgid "%s: fcntl failed" msgstr "%s: błąd fcntl" -#: src/shred.c:886 +#: src/shred.c:885 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "%s: nie można zamazywać pliku tylko do dopisywania" -#: src/shred.c:968 +#: src/shred.c:967 #, c-format msgid "%s: removing" msgstr "%s: usuwanie" -#: src/shred.c:992 +#: src/shred.c:991 #, c-format msgid "%s: renamed to %s" msgstr "%s: przemianowany na %s" -#: src/shred.c:1014 +#: src/shred.c:1013 #, c-format msgid "%s: failed to remove" msgstr "%s: błąd przy kasowaniu pliku" -#: src/shred.c:1018 +#: src/shred.c:1017 #, c-format msgid "%s: removed" msgstr "%s: skasowany" -#: src/shred.c:1025 src/shred.c:1068 +#: src/shred.c:1024 src/shred.c:1067 #, c-format msgid "%s: failed to close" msgstr "%s: błąd przy zamykaniu pliku" -#: src/shred.c:1061 +#: src/shred.c:1060 #, c-format msgid "%s: failed to open for writing" msgstr "%s: błąd przy otwieraniu do zapisu" -#: src/shred.c:1126 +#: src/shred.c:1125 #, c-format msgid "%s: invalid number of passes" msgstr "%s: błędna liczba przebiegów" -#: src/shred.c:1135 src/shuf.c:291 src/sort.c:4387 +#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441 #, c-format msgid "multiple random sources specified" msgstr "podano wiele źródeł losowych bajtów" -#: src/shred.c:1149 +#: src/shred.c:1148 #, c-format msgid "%s: invalid file size" msgstr "%s: błędny rozmiar pliku" @@ -8712,14 +9139,11 @@ msgstr "" " albo: %s -i LO-HI [OPCJA]...\n" #: src/shuf.c:54 -msgid "" -"Write a random permutation of the input lines to standard output.\n" -"\n" +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" -"\n" -#: src/shuf.c:61 +#: src/shuf.c:60 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 " @@ -8742,27 +9166,27 @@ msgstr "" " -z, --zero-terminated zakończenie linii przez bajt 0, nie przez znak\n" " nowej linii\n" -#: src/shuf.c:245 +#: src/shuf.c:244 #, c-format msgid "multiple -i options specified" msgstr "podano wiele opcji -i" -#: src/shuf.c:265 +#: src/shuf.c:264 #, c-format msgid "invalid input range %s" msgstr "błędny zakres wejściowy: %s" -#: src/shuf.c:278 +#: src/shuf.c:277 #, c-format msgid "invalid line count %s" msgstr "błędna liczba linii %s" -#: src/shuf.c:285 src/sort.c:4381 +#: src/shuf.c:284 src/sort.c:4435 #, c-format msgid "multiple output files specified" msgstr "podano wiele plików wyjściowych" -#: src/shuf.c:311 +#: src/shuf.c:310 #, c-format msgid "cannot combine -e and -i options" msgstr "nie można łączyć ustawiania opcji -e i -i" @@ -8782,16 +9206,16 @@ msgid "" msgstr "" "Składnia: %s ILE[PRZYROSTEK]...\n" " albo: %s OPCJA\n" -"Czekanie przez określoną LICZBĘ sekund. PRZYROSTKIEM może być 's' dla\n" -"oznaczenia sekund (domyślnie), m - minut, h - godzin i d - dni. Inaczej niż " -"w\n" -"większości implementacji, w których ILE musi być liczbą całkowitą, tutaj " -"ILE\n" -"może być dowolną liczbą zmiennoprzecinkową. Jeżeli podane są dwa lub więcej\n" -"argumenty, przerwa trwa tyle ile suma ich wartości.\n" +"Czekanie przez określoną LICZBĘ sekund. PRZYROSTKIEM może być „s” dla\n" +"oznaczenia sekund (domyślnie), „m” - minut, „h” - godzin i „d” - dni. " +"Inaczej\n" +"niż w większości implementacji, w których ILE musi być liczbą całkowitą, " +"tutaj\n" +"ILE może być dowolną liczbą zmiennoprzecinkową. Jeżeli podane są dwa lub\n" +"więcej argumenty, przerwa trwa tyle ile suma ich wartości.\n" "\n" -#: src/sleep.c:135 src/timeout.c:295 +#: src/sleep.c:135 src/timeout.c:320 #, c-format msgid "invalid time interval %s" msgstr "błędny odstęp czasowy %s" @@ -8801,16 +9225,13 @@ msgstr "błędny odstęp czasowy %s" msgid "cannot read realtime clock" msgstr "nie można odczytać zegara systemowego" -#: src/sort.c:395 -msgid "" -"Write sorted concatenation of all FILE(s) to standard output.\n" -"\n" +#: src/sort.c:399 +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" -"\n" -#: src/sort.c:402 +#: src/sort.c:405 msgid "" "Ordering options:\n" "\n" @@ -8818,7 +9239,7 @@ msgstr "" "Opcje porządkowania:\n" "\n" -#: src/sort.c:406 +#: src/sort.c:409 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -8830,7 +9251,7 @@ msgstr "" " alfanumerycznych\n" " -f, --ignore-case traktowanie małych liter jak wielkich\n" -#: src/sort.c:412 +#: src/sort.c:415 msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" " -i, --ignore-nonprinting consider only printable characters\n" @@ -8838,15 +9259,15 @@ msgid "" msgstr "" " -g, --general-numeric-sort porównywanie według wartości liczbowej\n" " -i, --ignore-nonprinting branie pod uwagę tylko znaków drukowalnych\n" -" -M, --month-sort porządek: (nieznany) < 'JAN' < ... < 'DEC'\n" +" -M, --month-sort porządek: (nieznany) < „JAN” < ... < „DEC”\n" -#: src/sort.c:417 +#: src/sort.c:420 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:420 +#: src/sort.c:423 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -8859,7 +9280,7 @@ msgstr "" " --random-source=PLIK losowe bajty z PLIKU\n" " -r, --reverse odwrotny porządek sortowania\n" -#: src/sort.c:426 +#: src/sort.c:429 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -8878,7 +9299,7 @@ msgstr "" "zawartych\n" " w tekście\n" -#: src/sort.c:434 +#: src/sort.c:437 msgid "" "Other options:\n" "\n" @@ -8886,7 +9307,7 @@ msgstr "" "Inne opcje:\n" "\n" -#: src/sort.c:438 +#: src/sort.c:441 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" @@ -8895,7 +9316,7 @@ msgstr "" " naraz; dla większej liczby użyte będą pliki\n" " tymczasowe\n" -#: src/sort.c:442 +#: src/sort.c:445 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 " @@ -8911,7 +9332,7 @@ msgstr "" "PROG;\n" " dekompresowanie przez PROG -d\n" -#: src/sort.c:449 +#: src/sort.c:452 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -8927,7 +9348,7 @@ msgstr "" " Jeżeli PLIK to -, nazwy czytane są ze\n" " standardowego wejścia\n" -#: src/sort.c:456 +#: src/sort.c:459 msgid "" " -k, --key=KEYDEF sort via a key; KEYDEF gives location and type\n" " -m, --merge merge already sorted files; do not sort\n" @@ -8936,7 +9357,7 @@ msgstr "" " -m, --merge połączenie już posortowanych plików, bez " "sortowania\n" -#: src/sort.c:460 +#: src/sort.c:463 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -8950,7 +9371,7 @@ msgstr "" " porównania końcowego\n" " -S, --buffer-size=ROZM ROZMIAR głównego bufora pamięci\n" -#: src/sort.c:466 +#: src/sort.c:469 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -8974,14 +9395,14 @@ msgstr "" " wypisanie tylko pierwszej z identycznych " "linii\n" -#: src/sort.c:475 +#: 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:480 +#: src/sort.c:483 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -9014,7 +9435,7 @@ msgstr "" "\n" "ROZMIAR może być uzupełniony o następujące mnożniki:\n" -#: src/sort.c:493 +#: src/sort.c:496 msgid "" "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n" "\n" @@ -9035,266 +9456,268 @@ 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:694 +#: src/sort.c:697 #, c-format msgid "waiting for %s [-d]" msgstr "czekanie na %s [-d]" -#: src/sort.c:699 +#: src/sort.c:702 #, c-format msgid "%s [-d] terminated abnormally" msgstr "%s [-d] zakończone nieprawidłowo" -#: src/sort.c:853 +#: src/sort.c:856 #, c-format msgid "cannot create temporary file in %s" msgstr "nie można utworzyć pliku tymczasowego w %s" -#: src/sort.c:939 src/sort.c:2010 src/sort.c:3056 src/sort.c:3755 -#: src/sort.c:3758 +#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713 +#: src/sort.c:3804 src/sort.c:3807 msgid "open failed" msgstr "błąd otwierania pliku" -#: src/sort.c:959 +#: src/sort.c:970 msgid "fflush failed" msgstr "błąd fflush" -#: src/sort.c:964 src/sort.c:2013 src/sort.c:4646 +#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706 msgid "close failed" msgstr "błąd zamykania pliku" -#: src/sort.c:973 +#: src/sort.c:986 #, c-format msgid "dup2 failed" msgstr "błąd dup2" -#: src/sort.c:1090 +#: src/sort.c:1103 #, c-format msgid "couldn't execute %s" msgstr "nie udało się uruchomić %s" -#: src/sort.c:1097 +#: src/sort.c:1110 msgid "couldn't create temporary file" msgstr "nie udało się utworzyć pliku tymczasowego" -#: src/sort.c:1136 +#: src/sort.c:1149 #, c-format msgid "couldn't create process for %s -d" msgstr "nie udało się uruchomić procesu %s -d" -#: src/sort.c:1150 +#: src/sort.c:1161 #, c-format msgid "couldn't execute %s -d" msgstr "nie udało się uruchomić %s -d" -#: src/sort.c:1209 +#: src/sort.c:1220 #, c-format msgid "warning: cannot remove: %s" msgstr "uwaga: nie udało się usunąć %s" -#: src/sort.c:1295 +#: src/sort.c:1306 #, c-format msgid "invalid --%s argument %s" -msgstr "błędny argument opci --%s: %s" +msgstr "błędny argument opcji --%s: %s" -#: src/sort.c:1298 +#: src/sort.c:1309 #, c-format msgid "minimum --%s argument is %s" msgstr "minimalna wartość argumentu opcji --%s to %s" -#: src/sort.c:1313 +#: src/sort.c:1324 #, c-format msgid "--%s argument %s too large" msgstr "opcja --%s ma za duży argument %s" -#: src/sort.c:1316 +#: src/sort.c:1327 #, 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:1398 +#: src/sort.c:1409 #, c-format msgid "number in parallel must be nonzero" msgstr "liczba równoległych sortowań (parallel) musi byc niezerowy" -#: src/sort.c:1479 +#: src/sort.c:1494 msgid "stat failed" msgstr "błąd stat" -#: src/sort.c:1740 +#: src/sort.c:1755 msgid "read failed" msgstr "błąd czytania" -#: src/sort.c:2028 +#: src/sort.c:2043 #, c-format msgid "string transformation failed" msgstr "nie udało się przekształcenie napisu" -#: src/sort.c:2031 +#: src/sort.c:2046 #, c-format msgid "the untransformed string was %s" msgstr "nieprzekształconym napisem był %s" -#: src/sort.c:2194 +#: src/sort.c:2209 #, c-format msgid "^ no match for key\n" msgstr "^ brak dopasowania klucza\n" -#: src/sort.c:2374 +#: src/sort.c:2389 #, 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:2380 +#: src/sort.c:2395 #, 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:2391 +#: src/sort.c:2406 #, 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'" +msgstr "początkowe odstępy są znaczące w kluczu %lu, rozważ podanie „b”" -#: src/sort.c:2404 +#: src/sort.c:2419 #, 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:2436 +#: src/sort.c:2451 #, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" -msgstr[0] "opcja '-%s' została zignorowana" -msgstr[1] "opcje '-%s' zostały zignorowane" -msgstr[2] "opcji '-%s' zostało zignorowanych" +msgstr[0] "opcja „-%s” została zignorowana" +msgstr[1] "opcje „-%s” zostały zignorowane" +msgstr[2] "opcji „-%s” zostało zignorowanych" -#: src/sort.c:2442 +#: src/sort.c:2457 #, c-format msgid "option '-r' only applies to last-resort comparison" -msgstr "opcja '-r' ma zastosowanie tylko do porównań ostatniej szansy" +msgstr "opcja „-r” ma zastosowanie tylko do porównań ostatniej szansy" -#: src/sort.c:2716 src/sort.c:2725 +#: src/sort.c:2731 src/sort.c:2740 msgid "write failed" msgstr "błąd zapisu" -#: src/sort.c:2768 +#: src/sort.c:2783 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: nieuporządkowanie: " -#: src/sort.c:2771 +#: src/sort.c:2786 msgid "standard error" msgstr "standardowe wyjście błędów" -#: src/sort.c:3926 +#: src/sort.c:3698 +msgid "cannot read" +msgstr "nie można przeczytać" + +#: src/sort.c:3976 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: błędna specyfikacja pola %s" -#: src/sort.c:3937 +#: src/sort.c:3987 #, c-format msgid "options '-%s' are incompatible" -msgstr "opcje '-%s' nie pasują do siebie" +msgstr "opcje „-%s” nie pasują do siebie" -#: src/sort.c:3988 +#: src/sort.c:4038 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s: błędna liczba na początku %s" -#: src/sort.c:4245 +#: src/sort.c:4295 msgid "invalid number after '-'" -msgstr "błędna liczba po '-'" +msgstr "błędna liczba po „-”" -#: src/sort.c:4248 src/sort.c:4334 src/sort.c:4362 +#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416 msgid "invalid number after '.'" -msgstr "błędna liczba po '.'" +msgstr "błędna liczba po „.”" -#: src/sort.c:4261 src/sort.c:4367 +#: src/sort.c:4315 src/sort.c:4421 msgid "stray character in field spec" msgstr "nieprawidłowy znak w specyfikacji pola" -#: src/sort.c:4308 +#: src/sort.c:4362 #, c-format msgid "multiple compress programs specified" msgstr "podano wiele programów kompresujących" -#: src/sort.c:4325 +#: src/sort.c:4379 msgid "invalid number at field start" msgstr "błędna liczba na początku pola" -#: src/sort.c:4329 src/sort.c:4357 +#: src/sort.c:4383 src/sort.c:4411 msgid "field number is zero" msgstr "numer pola wynosi zero" -#: src/sort.c:4338 +#: src/sort.c:4392 msgid "character offset is zero" msgstr "numer znaku wynosi zero" -#: src/sort.c:4353 +#: src/sort.c:4407 msgid "invalid number after ','" -msgstr "błędna liczba po ','" +msgstr "błędna liczba po „,”" -#: src/sort.c:4403 +#: src/sort.c:4457 #, c-format msgid "empty tab" msgstr "pusty TAB" -#: src/sort.c:4496 src/wc.c:692 +#: src/sort.c:4550 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:4518 +#: src/sort.c:4572 #, 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:4524 +#: src/sort.c:4578 #, c-format msgid "no input from %s" msgstr "brak danych z %s" -#: src/sort.c:4570 +#: src/sort.c:4624 #, c-format msgid "using %s sorting rules" msgstr "użycie reguł sortowania %s" -#: src/sort.c:4573 +#: src/sort.c:4627 #, c-format msgid "using simple byte comparison" msgstr "użycie prostego porównywania bajtów" -#: src/sort.c:4604 +#: src/sort.c:4658 #, 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:184 +#: src/split.c:187 #, c-format msgid "the suffix length needs to be at least %zu" msgstr "przystek musi mieć co najmniej %zu znaków" -#: src/split.c:201 +#: src/split.c:204 #, c-format msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" msgstr "Składnia: %s [OPCJA]... [PLIK [PRZEDROSTEK]]\n" -#: src/split.c:205 +#: src/split.c:208 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" -"\n" msgstr "" "Zapisanie równych kawałków PLIKU do PRZEDROSTEKaa, PRZEDROSTEKab, ...;\n" -"domyślny rozmiat to 1000 linii, domyslny PRZEDROSTEK to 'x'. Jeżeli PLIK " +"domyślny rozmiar to 1000 linii, domyslny PRZEDROSTEK to „x”. Jeżeli PLIK " "nie\n" "jest podany albo podany jako -, czytane jest standardowe wejście\n" -"\n" -#: src/split.c:214 +#: src/split.c:216 #, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" @@ -9319,15 +9742,15 @@ msgstr "" " -d, --numeric-suffixes[=OD] użycie przyrostków liczbowych zamiast\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" +" -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" " -u, --unbuffered natychmiastowe kopiowanie wejścia na wyjście po\n" -" użyciu '-n r/...'\n" +" użyciu „-n r/...”\n" -#: src/split.c:227 +#: src/split.c:229 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" @@ -9336,7 +9759,7 @@ msgstr "" "komunikatów\n" " diagnostycznych\n" -#: src/split.c:234 +#: src/split.c:236 msgid "" "\n" "CHUNKS may be:\n" @@ -9354,191 +9777,196 @@ msgstr "" "l/N podział na N plików bez dzielenia linii\n" "l/K/N K-ta CZĘŚĆ z N wysłana na standardowe wyjście,\n" " podział bez dzielenia linii\n" -"r/N jak 'l', ale kolejne linie wysyłane do kolejnych plików\n" +"r/N jak „l”, ale kolejne linie wysyłane do kolejnych plików\n" "r/K/N jak wyżej, ale tylko K-ta część N wysłana na standardowe\n" " wyjście\n" -#: src/split.c:352 +#: src/split.c:354 #, c-format msgid "output file suffixes exhausted" msgstr "zabrakło przyrostków plików wyjściowych" -#: src/split.c:364 +#: src/split.c:366 #, c-format msgid "creating file %s\n" msgstr "tworzenie pliku %s\n" -#: src/split.c:377 +#: src/split.c:375 +#, c-format +msgid "%s would overwrite input; aborting" +msgstr "%s nadpisałby dane wejściowe; zatrzymanie pracy" + +#: src/split.c:391 #, c-format msgid "failed to set FILE environment variable" msgstr "nie udało się ustawić zmiennej środowiskowej FILE" -#: src/split.c:379 +#: src/split.c:393 #, c-format msgid "executing with FILE=%s\n" msgstr "wykonywanie z FILE=%s\n" -#: src/split.c:381 +#: src/split.c:395 #, c-format msgid "failed to create pipe" msgstr "nie udało się utworzyć potoku" -#: src/split.c:395 +#: src/split.c:409 #, c-format msgid "closing prior pipe" msgstr "zamykanie potoku" -#: src/split.c:397 +#: src/split.c:411 #, c-format msgid "closing output pipe" msgstr "zamknięcie potoku wyjściowego" -#: src/split.c:401 +#: src/split.c:415 #, c-format msgid "moving input pipe" msgstr "zamykanie potoku wejściowego" -#: src/split.c:403 +#: src/split.c:417 #, c-format msgid "closing input pipe" msgstr "zamykanie potoku wejściowego" -#: src/split.c:408 +#: src/split.c:422 #, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "nie udało się uruchomić polecenia \"%s -c %s\"" -#: src/split.c:414 +#: src/split.c:428 #, c-format msgid "failed to close input pipe" msgstr "nie udało się zamknąć potoku wejściowego" -#: src/split.c:450 +#: src/split.c:464 #, c-format msgid "waiting for child process" msgstr "czekanie na proces potomny" -#: src/split.c:460 +#: src/split.c:474 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "podczas gdy FILE=%s, sygnał %s z polecenia %s" -#: src/split.c:468 +#: src/split.c:482 #, 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:475 src/timeout.c:449 +#: src/split.c:489 src/timeout.c:494 #, c-format msgid "unknown status from command (0x%X)" msgstr "nieznany kod wyjściowe polecenia (0x%X)" -#: src/split.c:1037 +#: src/split.c:1052 #, 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:1050 src/split.c:1192 src/split.c:1363 +#: src/split.c:1065 src/split.c:1205 src/split.c:1376 #, c-format msgid "%s: invalid number of chunks" msgstr "%s: błędna liczba części" -#: src/split.c:1054 +#: src/split.c:1069 #, c-format msgid "%s: invalid chunk number" msgstr "%s: błędny numer części" -#: src/split.c:1106 +#: src/split.c:1119 #, c-format msgid "%s: invalid suffix length" msgstr "%s: błędna długość przyrostka" -#: src/split.c:1131 src/split.c:1139 src/split.c:1162 src/split.c:1167 +#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180 #, c-format msgid "%s: invalid number of bytes" msgstr "%s: błędna liczba bajtów" -#: src/split.c:1150 src/split.c:1297 +#: src/split.c:1163 src/split.c:1310 #, c-format msgid "%s: invalid number of lines" msgstr "%s: błędna liczba linii" -#: src/split.c:1223 +#: src/split.c:1236 #, c-format msgid "line count option -%s%c... is too large" msgstr "za duża ilość linii w opcji -%s%c..." -#: src/split.c:1235 +#: src/split.c:1248 #, c-format msgid "%s: invalid start value for numerical suffix" msgstr "%s: błędna początkowa wartość przyrostka liczbowego" -#: src/split.c:1263 +#: src/split.c:1276 #, c-format msgid "%s: invalid IO block size" msgstr "%s: błędny rozmiar bloku IO" -#: src/split.c:1284 +#: src/split.c:1297 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "--filter nie przekazał przetworzonego fragmentu do wyjścia" -#: src/split.c:1321 +#: src/split.c:1334 #, 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:1356 +#: src/split.c:1369 #, 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:169 +#: src/stat.c:173 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:838 +#: src/stat.c:857 #, c-format msgid "failed to canonicalize %s" msgstr "nie udało się kanonizować %s" -#: src/stat.c:1050 +#: src/stat.c:1069 #, c-format msgid "warning: unrecognized escape '\\%c'" -msgstr "uwaga: nierozpoznana sekwencja '\\%c'" +msgstr "uwaga: nierozpoznana sekwencja „\\%c”" -#: src/stat.c:1105 +#: src/stat.c:1124 #, c-format msgid "%s: invalid directive" msgstr "%s: błędna dyrektywa" -#: src/stat.c:1151 +#: src/stat.c:1170 #, c-format msgid "warning: backslash at end of format" msgstr "uwaga: ukośnik odwrotny na końcu formatu" -#: src/stat.c:1182 +#: src/stat.c:1201 #, 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:1189 +#: src/stat.c:1208 #, c-format msgid "cannot read file system information for %s" msgstr "nie można przeczytać informacji systemowych o %s" -#: src/stat.c:1209 +#: src/stat.c:1228 #, 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:1245 +#: src/stat.c:1264 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -9554,7 +9982,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1268 +#: src/stat.c:1287 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -9564,30 +9992,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1278 +#: src/stat.c:1297 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:1286 +#: src/stat.c:1305 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:1295 +#: src/stat.c:1314 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:1305 +#: src/stat.c:1324 #, c-format msgid "Context: %C\n" msgstr "Kontekst: %C\n" -#: src/stat.c:1313 +#: src/stat.c:1332 msgid "" "Access: %x\n" "Modify: %y\n" @@ -9599,19 +10027,20 @@ msgstr "" "Zmiana: %z\n" "Utworzenie: %w\n" -#: src/stat.c:1331 +#: src/stat.c:1350 +msgid "Display file or file system status.\n" +msgstr "Wypisanie stanu pliku albo systemu plików\n" + +#: src/stat.c:1356 msgid "" -"Display file or file system status.\n" -"\n" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" "Pokazanie danych pliku albo systemu plików\n" -"\n" -" -L, --dereference rozwiązywanie dowiązań symbolicznych\n" +" -L, --dereference podążanie za dowiązaniami symbolicznymi\n" " -f, --file-system pokazanie danych systemu plików, a nie pliku\n" -#: src/stat.c:1337 +#: src/stat.c:1360 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -9630,7 +10059,7 @@ msgstr "" " linii. Żeby go wypisać użyj \\n w FORMACIE.\n" " -t, --terse wypisywanie informacji w skróconej formie\n" -#: src/stat.c:1348 +#: src/stat.c:1371 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -9650,7 +10079,7 @@ msgstr "" " %B rozmiar w bajtach każdego bloku podanego przez %b\n" " %C kontekst bezpieczeństwa SELinuksa\n" -#: src/stat.c:1357 +#: src/stat.c:1380 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -9666,7 +10095,7 @@ msgstr "" " %g numer grupy właściciela pliku\n" " %G nazwa grupy właściciela pliku\n" -#: src/stat.c:1365 +#: src/stat.c:1388 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -9688,7 +10117,7 @@ msgstr "" " %t większy numer urządzenia szesnastkowo\n" " %T mniejszy numer urządzenia szesnastkowo\n" -#: src/stat.c:1376 +#: src/stat.c:1399 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -9714,7 +10143,7 @@ msgstr "" " %Z czas ostatniej zmiany czasu w sekundach od Epoki\n" "\n" -#: src/stat.c:1390 +#: src/stat.c:1413 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -9732,7 +10161,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:1399 +#: src/stat.c:1422 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -9758,12 +10187,11 @@ msgstr "Składnia: %s OPCJA... POLECENIE\n" #: src/stdbuf.c:91 msgid "" "Run COMMAND, with modified buffering operations for its standard streams.\n" -"\n" msgstr "" -"Uruchamia POLECENIE ze zmodyfikowanymi operacjami buforowania standardowych " -"strumieni.\n" +"Uruchamia POLECENIE ze zmodyfikowanymi operacjami buforowania jego " +"standardowych strumieni.\n" -#: src/stdbuf.c:98 +#: src/stdbuf.c:97 msgid "" " -i, --input=MODE adjust standard input stream buffering\n" " -o, --output=MODE adjust standard output stream buffering\n" @@ -9773,25 +10201,25 @@ msgstr "" " -o, --output=TRYB modyfikacja buforowania standardowego wyjścia\n" " -e, --error=TRYB modyfikacja buforowania standardowego wyjścia błędu\n" -#: src/stdbuf.c:105 +#: src/stdbuf.c:104 msgid "" "\n" "If MODE is 'L' the corresponding stream will be line buffered.\n" "This option is invalid with standard input.\n" msgstr "" "\n" -"Jeżeli TRYB to 'L', odpowiedni strumień będzie buforowany liniami. Opcja\n" +"Jeżeli TRYB to „L”, odpowiedni strumień będzie buforowany liniami. Opcja\n" "jest błędna dla standardowego wejścia.\n" -#: src/stdbuf.c:108 +#: src/stdbuf.c:107 msgid "" "\n" "If MODE is '0' the corresponding stream will be unbuffered.\n" msgstr "" "\n" -"Jeżeli TRYB to '0', odpowiedni strumień nie będzie buforowany.\n" +"Jeżeli TRYB to „0”, odpowiedni strumień nie będzie buforowany.\n" -#: src/stdbuf.c:111 +#: src/stdbuf.c:110 msgid "" "\n" "Otherwise MODE is a number which may be followed by one of the following:\n" @@ -9806,7 +10234,7 @@ msgstr "" "P, E, Z, Y. W tym przypadku odpowiedni strumień będzie buforowany w\n" "buforze o rozmiarze MODE bajtów.\n" -#: src/stdbuf.c:117 +#: src/stdbuf.c:116 msgid "" "\n" "NOTE: If COMMAND adjusts the buffering of its standard streams ('tee' does\n" @@ -9817,26 +10245,26 @@ msgid "" msgstr "" "\n" "UWAGA: Jeżeli POLECENIE zmienia sposób buforowania swoich standardowych\n" -"strumieni (robi to np. 'tee'), przestawi wtedy ustawienia zmienione przez\n" -"'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" +"strumieni (robi to np. „tee”), przestawi wtedy ustawienia zmienione przez\n" +"„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:227 +#: src/stdbuf.c:226 #, c-format msgid "failed to find %s" msgstr "nie udało się znaleźć %s" -#: src/stdbuf.c:247 src/stdbuf.c:279 +#: src/stdbuf.c:246 src/stdbuf.c:278 #, c-format msgid "failed to update the environment with %s" msgstr "nie udało się zaktualizować środowiska %s" -#: src/stdbuf.c:321 +#: src/stdbuf.c:320 #, c-format msgid "line buffering stdin is meaningless" msgstr "buforowanie liniowe standardowego wejścia nie ma znaczenia" -#: src/stty.c:509 +#: src/stty.c:513 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -9847,16 +10275,16 @@ 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:515 +#: src/stty.c:519 +msgid "Print or change terminal characteristics.\n" +msgstr "Wypisanie lub zmiana ustawień terminala.\n" + +#: src/stty.c:525 msgid "" -"Print or change terminal characteristics.\n" -"\n" " -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 "" -"Wypisanie lub zmiana ustawień terminala.\n" -"\n" " -a, --all wyświetlenie wszystkich aktualnych ustawień w postaci\n" " czytelnej dla człowieka\n" " -g, --save wyświetlenie wszystkich aktualnych ustawień w formacie\n" @@ -9864,7 +10292,7 @@ msgstr "" " -F, --file=URZĄDZENIE otwarcie i używanie podanego URZĄDZENIA zamiast\n" " standardowego wejścia\n" -#: src/stty.c:524 +#: src/stty.c:532 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -9874,7 +10302,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:529 +#: src/stty.c:537 msgid "" "\n" "Special characters:\n" @@ -9889,7 +10317,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:536 +#: src/stty.c:544 msgid "" " * eol2 CHAR alternate CHAR for ending the line\n" " erase CHAR CHAR will erase the last character typed\n" @@ -9901,7 +10329,7 @@ msgstr "" " intr ZNAK ZNAK wysyła sygnał przerwania\n" " kill ZNAK ZNAK kasuje bieżącą linię\n" -#: src/stty.c:542 +#: src/stty.c:550 msgid "" " * lnext CHAR CHAR will enter the next character quoted\n" " quit CHAR CHAR will send a quit signal\n" @@ -9913,7 +10341,7 @@ msgstr "" " * rprnt ZNAK ZNAK powtarza bieżącą linię\n" " start ZNAK ZNAK wznawia wyświetlanie\n" -#: src/stty.c:548 +#: src/stty.c:556 msgid "" " stop CHAR CHAR will stop the output\n" " susp CHAR CHAR will send a terminal stop signal\n" @@ -9925,7 +10353,7 @@ msgstr "" " * swtch ZNAK ZNAK włącza inną warstwę powłoki\n" " * werase ZNAK ZNAK kasuje ostatnie wprowadzone słowo\n" -#: src/stty.c:554 +#: src/stty.c:562 msgid "" "\n" "Special settings:\n" @@ -9939,7 +10367,7 @@ msgstr "" " * cols N ustawienie szerokości terminala na N kolumn\n" " * columns N to samo co cols N\n" -#: src/stty.c:561 +#: src/stty.c:569 msgid "" " ispeed N set the input speed to N\n" " * line N use line discipline N\n" @@ -9952,7 +10380,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:567 +#: src/stty.c:575 msgid "" " * rows N tell the kernel that the terminal has N rows\n" " * size print the number of rows and columns according to the " @@ -9965,39 +10393,41 @@ msgstr "" " speed wyświetlenie prędkości terminala\n" " time N z -icanon ustawienie timeout na N dziesiątych sekundy\n" -#: src/stty.c:573 +#: src/stty.c:581 msgid "" "\n" "Control settings:\n" " [-]clocal disable modem control signals\n" " [-]cread allow input to be received\n" " * [-]crtscts enable RTS/CTS handshaking\n" +" * [-]cdtrdsr enable DTR/DSR handshaking\n" " csN set character size to N bits, N in [5..8]\n" msgstr "" "\n" "Ustawienia sterujące:\n" " [-]clocal wyłączenie sygnałów sterowania modemu\n" " [-]cread włączenie odbioru z wejścia\n" -" * [-]crtscts włączenie protokołu RTS/CTS (handshaking)\n" +" * [-]crtscts włączenie sterowania przepływem przez RTS/CTS\n" +" * [-]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:581 +#: src/stty.c:590 msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" " [-]hupcl same as [-]hup\n" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" -" [-]parodd set odd parity (even with '-')\n" +" [-]parodd set odd parity (or even parity with '-')\n" msgstr "" -" [-]cstopb użycie dwóch bitów stopu na znak (jeden z '-')\n" +" [-]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" " terminal\n" " [-]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" +" [-]parodd włączenie parzystości nieparzystej (parzystej z „-”)\n" -#: src/stty.c:588 +#: src/stty.c:597 msgid "" "\n" "Input settings:\n" @@ -10013,7 +10443,7 @@ msgstr "" " [-]ignbrk ignorowanie znaku break\n" " [-]igncr ignorowanie znaku CR\n" -#: src/stty.c:596 +#: src/stty.c:605 msgid "" " [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" @@ -10028,12 +10458,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:603 +#: src/stty.c:612 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:606 +#: src/stty.c:615 msgid "" " * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" @@ -10049,7 +10479,7 @@ msgstr "" " [-]parmrk zaznaczanie błędów parzystości sekwencją 255-0-znak\n" " [-]tandem to samo co [-]ixoff\n" -#: src/stty.c:614 +#: src/stty.c:623 msgid "" "\n" "Output settings:\n" @@ -10065,7 +10495,7 @@ 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:622 +#: src/stty.c:631 msgid "" " * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of null characters\n" @@ -10081,7 +10511,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:630 +#: src/stty.c:639 msgid "" " * [-]onocr do not print carriage returns in the first column\n" " [-]opost postprocess output\n" @@ -10099,7 +10529,7 @@ msgstr "" " * vtN styl opóźnienia po tabulatorze pionowym, N w zakresie " "[0..1]\n" -#: src/stty.c:638 +#: src/stty.c:647 msgid "" "\n" "Local settings:\n" @@ -10115,7 +10545,7 @@ msgstr "" " * -crtkill kasowanie całej linii zgodnie z ustawieniami echoctl i " "echok\n" -#: src/stty.c:645 +#: src/stty.c:654 msgid "" " * [-]ctlecho echo control characters in hat notation ('^c')\n" " [-]echo echo input characters\n" @@ -10123,13 +10553,13 @@ msgid "" " [-]echoe same as [-]crterase\n" " [-]echok echo a newline after a kill character\n" msgstr "" -" * [-]ctlecho wyświetlanie znaków kontrolnych jako '^c' itp.\n" +" * [-]ctlecho wyświetlanie znaków kontrolnych jako „^c” itp.\n" " [-]echo wyświetlanie każdego znaku z wejścia\n" " * [-]echoctl to samo co [-]ctlecho\n" " [-]echoe to samo co [-]crterase\n" " [-]echok wyświetlanie znaku nowej linii po znaku kill\n" -#: src/stty.c:652 +#: src/stty.c:661 msgid "" " * [-]echoke same as [-]crtkill\n" " [-]echonl echo newline even if not echoing other characters\n" @@ -10139,11 +10569,11 @@ msgid "" msgstr "" " * [-]echoke to samo co [-]crtkill\n" " [-]echonl wyświetlanie znaku NL nawet jeśli inne nie są wyświetlane\n" -" * [-]echoprt wyświetlanie skasowanych znaków wstecz między '\\' i '/'\n" +" * [-]echoprt wyświetlanie skasowanych znaków wstecz między „\\” i „/”\n" " [-]icanon wyświetlanie znaków erase, kill, werase i rprnt\n" " [-]iexten wyświetlanie znaków spoza specyfikacji POSIX\n" -#: src/stty.c:659 +#: src/stty.c:668 msgid "" " [-]isig enable interrupt, quit, and suspend special characters\n" " [-]noflsh disable flushing after interrupt and quit special " @@ -10157,9 +10587,9 @@ msgstr "" " * [-]prterase to samo co [-]echoprt\n" " * [-]tostop zatrzymywanie procesów w tle, próbujących pisać na " "terminal\n" -" * [-]xcase z icanon: wyświetlanie wielkich liter jako '\\mała-litera'\n" +" * [-]xcase z icanon: wyświetlanie wielkich liter jako „\\mała-litera”\n" -#: src/stty.c:666 +#: src/stty.c:675 msgid "" "\n" "Combination settings:\n" @@ -10173,7 +10603,7 @@ msgstr "" " cbreak jak -icanon\n" " -cbreak jak icanon\n" -#: src/stty.c:673 +#: src/stty.c:682 msgid "" " cooked same as brkint ignpar istrip icrnl ixon opost isig\n" " icanon, eof and eol characters to their default values\n" @@ -10185,7 +10615,7 @@ msgstr "" " -cooked jak raw\n" " crt jak echoe echoctl echoke\n" -#: src/stty.c:679 +#: src/stty.c:688 msgid "" " dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" " kill ^u\n" @@ -10199,7 +10629,7 @@ msgstr "" " ek ustawienie znaków erase i kill na wartości domyślne\n" " evenp jak parenb -parodd cs7\n" -#: src/stty.c:686 +#: src/stty.c:695 msgid "" " -evenp same as -parenb cs8\n" " * [-]lcase same as xcase iuclc olcuc\n" @@ -10215,7 +10645,7 @@ msgstr "" " nl jak -icrnl -onlcr\n" " -nl jak icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" -#: src/stty.c:694 +#: src/stty.c:703 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -10229,7 +10659,7 @@ msgstr "" " pass8 jak -parenb -istrip cs8\n" " -pass8 jak parenb istrip cs7\n" -#: src/stty.c:701 +#: src/stty.c:710 msgid "" " raw same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" " -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n" @@ -10241,7 +10671,7 @@ msgstr "" " -imaxbel -opost -isig -icanon -xcase min 1 time 0\n" " -raw jak cooked\n" -#: src/stty.c:707 +#: src/stty.c:716 msgid "" " sane same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" " -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n" @@ -10257,7 +10687,7 @@ msgstr "" " -xcase -tostop -echoprt echoctl echoke, wszystkie znaki\n" " specjalne przybierają standardowe wartości\n" -#: src/stty.c:715 +#: src/stty.c:724 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -10272,139 +10702,59 @@ 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:787 +#: src/stty.c:796 #, c-format msgid "only one device may be specified" msgstr "może być podane tylko jedno urządzenie" -#: src/stty.c:817 +#: src/stty.c:826 #, 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:823 +#: src/stty.c:832 #, 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:838 +#: src/stty.c:847 #, 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:883 src/stty.c:993 +#: src/stty.c:892 src/stty.c:1002 #, c-format msgid "invalid argument %s" msgstr "błędny argument %s" -#: src/stty.c:894 src/stty.c:911 src/stty.c:923 src/stty.c:936 src/stty.c:948 -#: src/stty.c:968 +#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957 +#: src/stty.c:977 #, c-format msgid "missing argument to %s" msgstr "brakujący argument %s" -#: src/stty.c:974 +#: src/stty.c:983 #, c-format msgid "invalid line discipline %s" msgstr "błędna dyscyplina linii: %s" -#: src/stty.c:1044 +#: src/stty.c:1053 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s: wykonanie wszystkich żądanych operacji było niemożliwe" -#: src/stty.c:1390 +#: src/stty.c:1399 #, c-format msgid "%s: no size information for this device" msgstr "%s: brak informacji o wielkości tego urządzenia" -#: src/stty.c:1904 +#: src/stty.c:1920 #, c-format msgid "invalid integer argument %s" msgstr "błędny argument całkowity %s" -#: src/su.c:229 -msgid "Password:" -msgstr "Hasło:" - -#: src/su.c:232 -#, c-format -msgid "getpass: cannot open /dev/tty" -msgstr "getpass: otwarcie /dev/tty niemożliwe" - -#: src/su.c:290 -#, c-format -msgid "cannot set groups" -msgstr "nie można ustawić grup" - -#: src/su.c:294 -#, c-format -msgid "cannot set group id" -msgstr "nie można ustawić identyfikatora grupy" - -#: src/su.c:296 -#, c-format -msgid "cannot set user id" -msgstr "nie można ustawić identyfikatora użytkownika" - -#: src/su.c:371 -#, c-format -msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" -msgstr "Składnia: %s [OPCJA]... [-] [UŻYTKOWNIK [ARGUMENT]...]\n" - -#: src/su.c:372 -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 "" -"Zmiana efektywnego identyfikatora użytkownika i grupy na identyfikator\n" -"UŻYTKOWNIKA.\n" -"\n" -" -, -l, --login uruchomienie powłoki podstawowej (login " -"shell)\n" -" -c, --command=POLECENIE przekazanie POLECENIA powłoce opcją -c\n" -" -f, --fast przekazanie -f powłoce (dla csh lub tcsh)\n" -" -m, --preserve-environment bez kasowania zmiennych środowiskowych\n" -" -p to samo co -m\n" -" -s, --shell=POWŁOKA uruchomienie POWŁOKI, jeśli /etc/shells " -"pozwala\n" - -#: src/su.c:384 -msgid "" -"\n" -"A mere - implies -l. If USER not given, assume root.\n" -msgstr "" -"\n" -"Sam - jest równoznaczny -l. Jeśli brak UŻYTKOWNIKA, domyślnym jest root.\n" - -#: src/su.c:461 -#, c-format -msgid "user %s does not exist" -msgstr "użytkownik %s nie istnieje" - -#: src/su.c:484 -#, c-format -msgid "incorrect password" -msgstr "niepoprawne hasło" - -#: src/su.c:501 -#, c-format -msgid "using restricted shell %s" -msgstr "użycie powłoki z ograniczeniami %s" - -#: src/su.c:509 -#, c-format -msgid "warning: cannot change directory to %s" -msgstr "uwaga: nie można zmienić katalogu na %s" - #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 msgid "Kayvan Aghaiepour" @@ -10435,7 +10785,7 @@ msgstr "" msgid "ignoring all arguments" msgstr "wszystkie argumenty zostały zignorowane" -#: src/system.h:340 +#: src/system.h:343 #, c-format msgid "" "\n" @@ -10448,15 +10798,23 @@ msgstr "" "która zwykle zasłania wersję tu opisaną. Szczegóły opcji tego polecenia\n" "opisuje dokumentacja.\n" -#: src/system.h:346 +#: src/system.h:349 msgid " --help display this help and exit\n" msgstr " --help wyświetlenie tego opisu i zakończenie\n" -#: src/system.h:348 +#: src/system.h:351 msgid " --version output version information and exit\n" msgstr " --version wyświetlenie informacji o wersji i zakończenie\n" -#: src/system.h:541 +#: src/system.h:544 +msgid "" +"\n" +"Mandatory arguments to long options are mandatory for short options too.\n" +msgstr "" +"\n" +"Argumenty obowiązkowe dla opcji długich obowiązują również dla krótkich.\n" + +#: src/system.h:552 msgid "" "\n" "SIZE is an integer and optional unit (example: 10M is 10*1024*1024). Units\n" @@ -10470,7 +10828,7 @@ msgstr "" "MB,\n" "... (potęgi 1000).\n" -#: src/system.h:550 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -10485,7 +10843,7 @@ msgstr "" "bajty\n" "albo 512 bajtów jeżeli ustawiona jest zmienna POSIXLY_CORRECT.\n" -#: src/system.h:560 +#: src/system.h:571 #, c-format msgid "" "\n" @@ -10498,26 +10856,26 @@ msgstr "" #. <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:574 +#: src/system.h:585 #, 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:578 +#: src/system.h:589 #, c-format msgid "For complete documentation, run: info coreutils '%s invocation'\n" msgstr "" -"Żeby przeczytać kompletną dokumentację uruchom: info coreutils '%s " -"invocation'\n" +"Żeby przeczytać kompletną dokumentację uruchom: info coreutils „%s " +"invocation”\n" -#: src/system.h:585 +#: src/system.h:596 #, c-format msgid "Try '%s --help' for more information.\n" -msgstr "Napisz '%s --help' dla uzyskania informacji.\n" +msgstr "Napisz „%s --help” dla uzyskania informacji.\n" -#: src/system.h:617 +#: src/system.h:628 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -10541,14 +10899,12 @@ msgstr "Jay Lepreau" msgid "" "Write each FILE to standard output, last line first.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" "Przepisanie każdego PLIKU na standardowe wyjście, w odwrotnym porządku:\n" "ostatnia linia pierwsza. Jeżeli PLIK nie jest podany albo podany jako -,\n" "czytane jest standardowe wejście.\n" -"\n" -#: src/tac.c:145 +#: src/tac.c:144 msgid "" " -b, --before attach the separator before instead of after\n" " -r, --regex interpret the separator as a regular expression\n" @@ -10559,42 +10915,42 @@ msgstr "" " -s, --separator=NAPIS użycie NAPISU jako separatora zamiast nowej " "linii\n" -#: src/tac.c:235 src/tac.c:336 +#: src/tac.c:234 src/tac.c:335 #, c-format msgid "%s: seek failed" msgstr "%s: nie udało się ustawienie pozycji" -#: src/tac.c:264 +#: src/tac.c:263 #, c-format msgid "record too large" msgstr "rekord jest za duży" -#: src/tac.c:451 +#: src/tac.c:450 #, c-format msgid "failed to create temporary file in %s" msgstr "nie udało się utworzyć pliku tymczasowego w %s" -#: src/tac.c:459 +#: src/tac.c:458 #, c-format msgid "failed to open %s for writing" msgstr "błąd przy otwieraniu %s do zapisu" -#: src/tac.c:476 +#: src/tac.c:475 #, c-format msgid "failed to rewind stream for %s" msgstr "nie udało się zmienić pozycji w strumieniu %s" -#: src/tac.c:512 src/tac.c:519 +#: src/tac.c:511 src/tac.c:518 #, c-format msgid "%s: write error" msgstr "%s: błąd zapisu" -#: src/tac.c:572 +#: src/tac.c:571 #, c-format msgid "failed to open %s for reading" msgstr "nie udało się otworzyć %s do czytania" -#: src/tac.c:630 +#: src/tac.c:629 #, c-format msgid "separator cannot be empty" msgstr "separator nie może być pusty" @@ -10610,15 +10966,13 @@ 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" -"\n" msgstr "" "Wypisanie %d ostatnich linii każdego PLIKU na standardowym wyjściu.\n" "Dla większej liczby PLIKÓW każda porcja ma nagłówek z nazwą. Jeżeli PLIK " "nie\n" "jest podany albo podany jako -, czytane jest standardowe wejście.\n" -"\n" -#: src/tail.c:271 +#: src/tail.c:270 msgid "" " -c, --bytes=K output the last K bytes; alternatively, use -c " "+K\n" @@ -10629,7 +10983,7 @@ msgstr "" " -c +K aby wypisać od N-tego bajtu z każdego z\n" " plików\n" -#: src/tail.c:275 +#: src/tail.c:274 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -10643,7 +10997,7 @@ msgstr "" " równoważne\n" " -F to samo co --follow=name --retry\n" -#: src/tail.c:282 +#: src/tail.c:281 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -10667,7 +11021,7 @@ msgstr "" " Ta opcja jest rzadko przydatna jeżeli dostępne\n" " jest inotify\n" -#: src/tail.c:295 +#: src/tail.c:294 msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" " -q, --quiet, --silent never output headers giving file names\n" @@ -10684,7 +11038,7 @@ msgstr "" " niedostępny później; użyteczne do śledzenia wg\n" " nazwy, np. z --follow=name\n" -#: src/tail.c:302 +#: src/tail.c:301 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations.\n" @@ -10698,7 +11052,7 @@ msgstr "" " najmniej co N sekund.\n" " -v, --verbose wypisywanie zawsze nagłówków z nazwami plików\n" -#: src/tail.c:311 +#: src/tail.c:310 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -10709,14 +11063,14 @@ msgid "" "\n" msgstr "" "\n" -"Jeżeli pierwszy znak N (liczby bajtów lub linii) to '+', pisanie zaczyna\n" +"Jeżeli pierwszy znak N (liczby bajtów lub linii) to „+”, pisanie zaczyna\n" "się od N-tego elementu od początku każdego pliku. W przeciwnym wypadku\n" "wypisywane jest ostatnich N elementów pliku. N może mieć przyrostek\n" "mnożący: 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" "\n" -#: src/tail.c:320 +#: src/tail.c:319 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" @@ -10735,27 +11089,27 @@ 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:379 +#: src/tail.c:378 #, c-format msgid "closing %s (fd=%d)" msgstr "zamykanie %s (fd=%d)" -#: src/tail.c:454 +#: 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:458 +#: src/tail.c:457 #, 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:895 +#: src/tail.c:894 #, 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:907 +#: src/tail.c:906 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " @@ -10764,39 +11118,39 @@ msgstr "" "nierozpoznany system pliów typu 0x%08lx w %s; proszę wysłać raport do %s; " "powrót do cyklicznego sprawdzania" -#: src/tail.c:964 +#: src/tail.c:963 #, c-format msgid "%s has become inaccessible" msgstr "%s stał się niedostępny" -#: src/tail.c:981 +#: src/tail.c:980 #, 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:990 +#: src/tail.c:989 #, 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:1011 +#: src/tail.c:1010 #, c-format msgid "%s has become accessible" msgstr "%s stał się dostępny" -#: src/tail.c:1019 +#: src/tail.c:1018 #, c-format msgid "%s has appeared; following end of new file" msgstr "%s pojawił się; śledzenie końca nowego pliku" -#: src/tail.c:1030 +#: src/tail.c:1029 #, c-format msgid "%s has been replaced; following end of new file" msgstr "%s został podmieniony; śledzenie końca nowego pliku" -#: src/tail.c:1131 +#: src/tail.c:1130 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: zresetowanie trybu nie blokującego nie było możliwe" @@ -10930,12 +11284,12 @@ msgstr "błędna liczba całkowita %s" #: src/test.c:241 msgid "')' expected" -msgstr "spodziewany ')'" +msgstr "spodziewany „)”" #: src/test.c:244 #, c-format msgid "')' expected, found %s" -msgstr "spodziewany ')', napotkany %s" +msgstr "spodziewany „)”, napotkany %s" #: src/test.c:260 src/test.c:618 #, c-format @@ -11125,7 +11479,7 @@ msgstr "" "symboliczne.\n" "Należy zwrócić uwagę na to, że nawiasy muszą być chronione przed " "interpretacją\n" -"przez powłokę, np. przez '\\'. LICZBA musi być całkowita i może mieć także\n" +"przez powłokę, np. przez „\\”. LICZBA musi być całkowita i może mieć także\n" "postać -l NAPIS czyli długość NAPISU.\n" #: src/test.c:786 @@ -11154,24 +11508,29 @@ msgstr "Matthew Bradburn" #: src/test.c:858 msgid "missing ']'" -msgstr "brak ']'" +msgstr "brak „]”" #: src/test.c:872 #, c-format msgid "extra argument %s" msgstr "nadmiarowy argument: %s" -#: src/timeout.c:124 +#: src/timeout.c:112 +#, c-format +msgid "warning: sigprocmask" +msgstr "uwaga: sigprocmask" + +#: src/timeout.c:145 #, c-format msgid "warning: timer_settime" msgstr "uwaga: timer_settime" -#: src/timeout.c:129 +#: src/timeout.c:150 #, c-format msgid "warning: timer_create" msgstr "uwaga: timer_create" -#: src/timeout.c:204 +#: src/timeout.c:225 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -11180,19 +11539,17 @@ msgstr "" "Składnia: %s [OPCJA] CZAS POLECENIE [ARGUMENT]...\n" " albo: %s [OPCJA]\n" -#: src/timeout.c:208 -msgid "" -"Start COMMAND, and kill it if still running after DURATION.\n" -"\n" -"Mandatory arguments to long options are mandatory for short options too.\n" +#: src/timeout.c:229 +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" -"\n" -"Argumenty obowiązkowe dla opcji długich obowiązują również dla krótkich.\n" -#: src/timeout.c:213 +#: src/timeout.c:235 msgid "" +" --preserve-status\n" +" exit with the same status as COMMAND, even when the\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 " @@ -11206,6 +11563,9 @@ msgid "" " 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" @@ -11216,10 +11576,10 @@ msgstr "" " 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" +" SYGNAŁ może być podany przez nazwę, jak „HUP”, albo\n" +" przez numer. Lista sygnałów: „kill -l”\n" -#: src/timeout.c:229 +#: src/timeout.c:254 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -11228,35 +11588,42 @@ msgid "" msgstr "" "\n" "CZAS jest liczbą rzeczywistą z opcjonalnym przyrostkiem:\n" -"to 's' dla sekund (domyślnie), 'm' dla minut, 'h' dla godzin, 'd' dla dni.\n" +"to „s” dla sekund (domyślnie), „m” dla minut, „h” dla godzin, „d” dla dni.\n" -#: src/timeout.c:234 +#: src/timeout.c:259 msgid "" "\n" -"If the command times out, then exit with status 124. Otherwise, exit\n" -"with the status of COMMAND. If no signal is specified, send the TERM\n" -"signal upon timeout. The TERM signal kills any process that does not\n" -"block or catch that signal. For other processes, it may be necessary to\n" -"use the KILL (9) signal, since this signal cannot be caught. If the\n" -"KILL (9) signal is sent, the exit status is 128+9 rather than 124.\n" +"If the command times out, and --preserve-status is not set, then exit with\n" +"status 124. Otherwise, exit with the status of COMMAND. If no signal\n" +"is specified, send the TERM signal upon timeout. The TERM signal kills\n" +"any process that does not block or catch that signal. It may be necessary\n" +"to use the KILL (9) signal, since this signal cannot be caught, in which\n" +"case the exit status is 128+9 rather than 124.\n" msgstr "" "\n" -"Jeżeli polecenie wyczerpie czas, program podaje status wyjściowy 124.\n" -"W przeciwnym przypadku zwraca status polecenia. Jeżeli nie jest podany\n" -"sygnał, wysyłany jest sygnał TERM. TERM zabija procesy, które nie\n" -"przechwytują tego sygnału. Dla innych procesów może być konieczne\n" -"użycie sygnału KILL (9), który nie może być przechwycony. Po wysłaniu\n" -"sygnału KILL (9), kod wyjścia to 128+9, a nie 124.\n" +"Jeżeli polecenie wyczerpie czas, a nie została użyta opcja --preserve-" +"status,\n" +"program podaje status wyjściowy 124. W przeciwnym przypadku zwraca status\n" +"POLECENIA. Jeżeli nie jest podany sygnał, wysyłany jest sygnał TERM. TERM\n" +"zabija procesy, które nie przechwytują tego sygnału. Dla innych procesów " +"może\n" +"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 +#, c-format +msgid "warning: disabling core dumps failed" +msgstr "uwaga: nie udało się wyłączenie zrzutów pamięci" -#: src/timeout.c:419 +#: src/timeout.c:471 #, c-format msgid "error waiting for command" msgstr "błąd zapisu w czasie czekania na polecenie" -#: src/timeout.c:441 +#: src/timeout.c:482 #, c-format -msgid "warning: disabling core dumps failed" -msgstr "uwaga: nie udało się wyłączenie zrzutów pamięci" +msgid "the monitored command dumped core" +msgstr "monitowane polecenie zrobiło zrzut pamięci" #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 @@ -11268,22 +11635,22 @@ msgstr "Jim Kingdon" msgid "Randy Smith" msgstr "Randy Smith" -#: src/touch.c:115 src/touch.c:313 +#: src/touch.c:115 src/touch.c:309 #, c-format msgid "invalid date format %s" msgstr "błędny format daty %s" -#: src/touch.c:194 +#: src/touch.c:191 #, c-format msgid "cannot touch %s" msgstr "nie można dotknąć %s" -#: src/touch.c:200 +#: src/touch.c:197 #, c-format msgid "setting times of %s" msgstr "ustawienie czasu %s" -#: src/touch.c:216 +#: src/touch.c:213 msgid "" "Update the access and modification times of each FILE to the current time.\n" "\n" @@ -11292,7 +11659,6 @@ msgid "" "\n" "A FILE argument string of - is handled specially and causes touch to\n" "change the times of the file associated with standard output.\n" -"\n" msgstr "" "Uaktualnienie czasu ostatniego odczytu albo modyfikacji każdego PLIKU do\n" "bieżącego czasu.\n" @@ -11300,11 +11666,10 @@ msgstr "" "Jeżeli argument PLIK nie istnieje, jest tworzony jako pusty PLIK, chyba że\n" "podana jest opcja -c albo -h.\n" "\n" -"PLIK o nazwie '-' jest traktowany specjalnie: touch ustawia czas pliku\n" +"PLIK o nazwie „-” jest traktowany specjalnie: touch ustawia czas pliku\n" "związanego ze standardowym wyjściem.\n" -"\n" -#: src/touch.c:229 +#: src/touch.c:225 msgid "" " -a change only the access time\n" " -c, --no-create do not create any files\n" @@ -11316,7 +11681,7 @@ msgstr "" " -d, --date=SPECYFIKACJA użycie SPECYFIKACJI zamiast bieżącego czasu\n" " -f (ignorowane)\n" -#: src/touch.c:235 +#: src/touch.c:231 msgid "" " -h, --no-dereference affect each symbolic link instead of any " "referenced\n" @@ -11331,22 +11696,22 @@ msgstr "" "symbolicznego)\n" " -m zmiana tylko czasu modyfikacji\n" -#: src/touch.c:241 +#: src/touch.c:237 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" -" --time=WORD change the specified time:\n" +" --time=WORD change the specified time:\n" " WORD is access, atime, or use: equivalent to -a\n" " WORD is modify or mtime: equivalent to -m\n" msgstr "" " -r, --reference=PLIK użycie czasu tego PLIKU zamiast czasu bieżącego\n" " -t CZAS użycie [[CC]YY]MMDDhhmm[.ss] zamiast bieżącego " "czasu\n" -" --time=SŁOWO ustawienie czasu wg SŁOWA: access atime use (czas\n" +" --time=SŁOWO ustawienie czasu wg SŁOWA: access atime use (czas\n" " dostępu, to samo co -a), modify mtime (czas\n" " modyfikacji, to samo co -m)\n" -#: src/touch.c:250 +#: src/touch.c:246 msgid "" "\n" "Note that the -d and -t options accept different time-date formats.\n" @@ -11354,18 +11719,18 @@ msgstr "" "\n" "Należy zauważyć, że opcje -d i -t akceptują różne formaty daty/czasu.\n" -#: src/touch.c:339 +#: src/touch.c:335 #, c-format msgid "cannot specify times from more than one source" msgstr "nie można podać czasu z więcej niż jednego źródła" -#: src/touch.c:413 +#: src/touch.c:409 #, c-format msgid "" "warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'" msgstr "" -"uwaga: 'touch %s' jest formą przestarzałą; używaj 'touch -t %04ld%02d%02d%02d" -"%02d.%02d'" +"uwaga: „touch %s” jest formą przestarzałą; używaj „touch -t %04ld%02d%02d%02d" +"%02d.%02d”" #: src/tr.c:286 #, c-format @@ -11507,7 +11872,7 @@ msgstr "" #: src/tr.c:673 #, c-format msgid "range-endpoints of '%s-%s' are in reverse collating sequence order" -msgstr "końce zakresu '%s-%s' są w odwrotnym porządku sortowania" +msgstr "końce zakresu „%s-%s” są w odwrotnym porządku sortowania" #: src/tr.c:829 #, c-format @@ -11517,12 +11882,12 @@ msgstr "błędna liczba powtórzeń %s w specyfikacji [c*n]" #: src/tr.c:910 #, c-format msgid "missing character class name '[::]'" -msgstr "brakująca nazwa klasy znaków '[::]'" +msgstr "brakująca nazwa klasy znaków „[::]”" #: src/tr.c:913 #, c-format msgid "missing equivalence class character '[==]'" -msgstr "brakujący znak dla klasy równoważności '[==]'" +msgstr "brakujący znak dla klasy równoważności „[==]”" #: src/tr.c:928 #, c-format @@ -11578,7 +11943,7 @@ msgid "" "string2 are 'upper' and 'lower'" msgstr "" "przy zamianie w ZBIORZE2 mogą się pojawić tylko klasy znaków\n" -"'upper' (wielkie litery) i 'lower' (małe litery)" +"„upper” (wielkie litery) i „lower” (małe litery)" #: src/tr.c:1520 #, c-format @@ -11644,28 +12009,26 @@ msgid "" "If a FILE is larger than the specified size, the extra data is lost.\n" "If a FILE is shorter, it is extended and the extended part (hole)\n" "reads as zero bytes.\n" -"\n" msgstr "" -"Obcięcie albo rozciągnięcie każdego PLIKU do podanego rozmiatu\n" +"Obcięcie albo rozciągnięcie każdego PLIKU do podanego rozmiaru\n" "\n" "PLIK, który nie istnieje jest tworzony.\n" "\n" "Jeżeli PLIK jest większy od podanego rozmiaru, nadmiarowe dane są\n" "tracone. Jeżeli jest krótszy, dodana część (dziura) jest\n" "odczytywana jako bajty zerowe.\n" -"\n" -#: src/truncate.c:110 +#: src/truncate.c:109 msgid " -c, --no-create do not create any files\n" msgstr " -c, --no-create bez tworzenia nowych plików\n" -#: src/truncate.c:113 +#: src/truncate.c:112 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" " -o, --io-blocks ROZMIAR traktowany jako liczba bloków, nie bajtów\n" -#: src/truncate.c:116 +#: 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" @@ -11673,7 +12036,7 @@ msgstr "" " -r, --reference=PLIKODN użycie rozmiaru tego PLIKU ODNIESIENIA\n" " -s, --size=ROZMIAR użycie tego ROZMIARU\n" -#: src/truncate.c:122 +#: src/truncate.c:121 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -11682,61 +12045,61 @@ msgid "" msgstr "" "\n" "ROZMIAR może być też poprzedzony przez jeden z następujących\n" -"przedrostków: '+' zwiększ o, '-' zmniejsz o, '<' najwyżej, '>' co najmniej,\n" -"'/' zaokrągl w dół do wielokrotności, '%' zaokrągl w górę do " +"przedrostków: „+” zwiększ o, „-” zmniejsz o, „<” najwyżej, „>” co najmniej,\n" +"„/” zaokrągl w dół do wielokrotności, „%” zaokrągl w górę do " "wielokrotności.\n" -#: src/truncate.c:150 +#: src/truncate.c:149 #, c-format msgid "overflow in %<PRIdMAX> * %<PRIdMAX> byte blocks for file %s" msgstr "przepełnienie przy %<PRIdMAX> * %<PRIdMAX> bajtach dla pliku %s" -#: src/truncate.c:174 +#: src/truncate.c:173 #, c-format msgid "%s has unusable, apparently negative size" -msgstr "plik %s ma zły rozmiat, wyglądający na ujemny" +msgstr "plik %s ma zły rozmiar, wyglądający na ujemny" -#: src/truncate.c:184 src/truncate.c:379 +#: src/truncate.c:183 src/truncate.c:384 #, c-format msgid "cannot get the size of %s" msgstr "nie można ustalić rozmiaru %s" -#: src/truncate.c:206 +#: src/truncate.c:205 #, c-format msgid "overflow rounding up size of file %s" msgstr "przepełnienie przy zaokrąglaniu rozmiaru pliku %s" -#: src/truncate.c:216 +#: src/truncate.c:215 #, c-format msgid "overflow extending size of file %s" -msgstr "przepełnienie przy zwiększaniu rozmiatu pliku %s" +msgstr "przepełnienie przy zwiększaniu rozmiaru pliku %s" -#: src/truncate.c:231 +#: src/truncate.c:230 #, c-format msgid "failed to truncate %s at %<PRIdMAX> bytes" msgstr "nie udało się obciąć pliku %s do %<PRIdMAX> bajtów" -#: src/truncate.c:305 +#: src/truncate.c:303 #, c-format msgid "multiple relative modifiers specified" msgstr "podano wiele modyfikatorów względnych" -#: src/truncate.c:335 +#: src/truncate.c:333 #, c-format msgid "you must specify either %s or %s" msgstr "musisz podać albo %s albo %s" -#: src/truncate.c:342 +#: src/truncate.c:340 #, c-format msgid "you must specify a relative %s with %s" msgstr "musisz podać względy %s z %s" -#: src/truncate.c:349 +#: src/truncate.c:347 #, c-format msgid "%s was specified but %s was not" msgstr "został podany %s, ale nie %s" -#: src/truncate.c:400 +#: src/truncate.c:404 #, c-format msgid "cannot open %s for writing" msgstr "nie można otworzyć %s do pisania" @@ -11835,14 +12198,12 @@ msgstr "nie można ustalić nazwy systemu" msgid "" "Convert blanks in each FILE to tabs, writing to standard output.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" "W każdym PLIKU spacje zamieniane są na TABy, wynik jest wypisywany na\n" "standardowe wyjście. Jeżeli PLIK nie jest podany albo podany jako -,\n" "czytane jest standardowe wejście.\n" -"\n" -#: src/unexpand.c:125 +#: src/unexpand.c:124 msgid "" " -a, --all convert all blanks, instead of just initial blanks\n" " --first-only convert only leading sequences of blanks (overrides -a)\n" @@ -11855,12 +12216,12 @@ msgstr "" " -t, --tabs=LISTA użycie oddzielanej przecinkami LISTY pozycji TABów\n" " (włącza -a)\n" -#: src/unexpand.c:153 +#: src/unexpand.c:152 #, c-format msgid "tabs are too far apart" msgstr "znaki tabulacji zbyt odległe od siebie" -#: src/unexpand.c:505 +#: src/unexpand.c:504 #, c-format msgid "tab stop value is too large" msgstr "za duża wartość pozycji końca TABów" @@ -11876,17 +12237,15 @@ msgid "" "writing to OUTPUT (or standard output).\n" "\n" "With no options, matching lines are merged to the first occurrence.\n" -"\n" msgstr "" "Odfiltrowanie sąsiadujących identycznych linii z WEJŚCIA (albo " "standardowego\n" "wejścia), wynik zapisywany do WYJŚCIA (albo standardowego wyjścia).\n" "\n" -"Jeżeli nie są podane żadne opcje, z identycznych linii pozostawiana jest\n" -"pierwwsza.\n" -"\n" +"Jeżeli nie są podane żadne opcje, pozostawiana jest tylko pierwsza z\n" +"identycznych linii.\n" -#: src/uniq.c:148 +#: src/uniq.c:147 msgid "" " -c, --count prefix lines by the number of occurrences\n" " -d, --repeated only print duplicate lines\n" @@ -11894,7 +12253,7 @@ msgstr "" " -c, --count poprzedzenie linii liczbą powtórzeń\n" " -d, --repeated wypisanie tylko powtórzonych linii\n" -#: src/uniq.c:152 +#: src/uniq.c:151 msgid "" " -D, --all-repeated[=delimit-method] print all duplicate lines\n" " delimit-method={none(default),prepend,separate}\n" @@ -11918,11 +12277,11 @@ msgstr "" " -u, --unique wypisanie tylko linii unikalnych\n" " -z, --zero-terminated na końcach linii bajty 0, nie znak nowej linii\n" -#: src/uniq.c:162 +#: src/uniq.c:161 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:167 +#: src/uniq.c:166 msgid "" "\n" "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n" @@ -11934,7 +12293,7 @@ msgstr "" "przeskakiwaniem\n" "znaków.\n" -#: src/uniq.c:172 +#: src/uniq.c:171 msgid "" "\n" "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n" @@ -11942,31 +12301,31 @@ msgid "" "Also, comparisons honor the rules specified by 'LC_COLLATE'.\n" msgstr "" "\n" -"Uwaga: 'uniq' nie wykrywa powtórzeń linii, które nie następują bezpośrednio\n" -"po sobie. Dane wejściowe można najpierw posortować albo użyć 'sort -u'\n" -"zamiast 'uniq'. Porównania odbywają się zgodnie z regułami podanymi przez\n" -"'LC_COLLATE'.\n" +"Uwaga: „uniq” nie wykrywa powtórzeń linii, które nie następują bezpośrednio\n" +"po sobie. Dane wejściowe można najpierw posortować albo użyć „sort -u”\n" +"zamiast „uniq”. Porównania odbywają się zgodnie z regułami podanymi przez\n" +"„LC_COLLATE”.\n" -#: src/uniq.c:359 +#: src/uniq.c:358 #, c-format msgid "too many repeated lines" msgstr "za dużo powtórzonych linii" -#: src/uniq.c:522 +#: src/uniq.c:521 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:531 +#: src/uniq.c:530 msgid "invalid number of bytes to skip" msgstr "błędna liczba bajtów do przeskoczenia" -#: src/uniq.c:540 +#: src/uniq.c:539 msgid "invalid number of bytes to compare" msgstr "błędna liczba bajtów do porównania" # ? rzm -#: src/uniq.c:559 +#: src/uniq.c:558 #, c-format msgid "printing all duplicated lines and repeat counts is meaningless" msgstr "" @@ -12024,6 +12383,11 @@ msgstr[0] "działa %ld dzień %2d:%02d, " msgstr[1] "działa %ld dni %2d:%02d, " msgstr[2] "działa %ld dni %2d:%02d, " +#: src/uptime.c:149 +#, c-format +msgid "up %2d:%02d, " +msgstr "działa %2d:%02d, " + #: src/uptime.c:151 #, c-format msgid "%lu user" @@ -12123,39 +12487,39 @@ msgstr "" msgid " old " msgstr "dawno" -#: src/who.c:449 +#: src/who.c:440 msgid "system boot" msgstr "start systemu" -#: src/who.c:456 src/who.c:458 +#: src/who.c:447 src/who.c:449 msgid "id=" msgstr "id=" -#: src/who.c:471 src/who.c:476 +#: src/who.c:462 src/who.c:467 msgid "term=" msgstr "zakończenie=" -#: src/who.c:473 src/who.c:477 +#: src/who.c:464 src/who.c:468 msgid "exit=" msgstr "wyjście=" -#: src/who.c:494 +#: src/who.c:485 msgid "LOGIN" msgstr "LOGIN" -#: src/who.c:514 +#: src/who.c:505 msgid "clock change" msgstr "zmiana czasu" -#: src/who.c:526 src/who.c:527 +#: src/who.c:517 src/who.c:518 msgid "run-level" msgstr "run-level" -#: src/who.c:530 src/who.c:531 +#: src/who.c:521 src/who.c:522 msgid "last=" msgstr "ostatni=" -#: src/who.c:562 +#: src/who.c:553 #, c-format msgid "" "\n" @@ -12164,44 +12528,44 @@ msgstr "" "\n" "liczba użytkowników=%lu\n" -#: src/who.c:568 +#: src/who.c:559 msgid "NAME" msgstr "UŻYTKOWNIK" -#: src/who.c:568 +#: src/who.c:559 msgid "LINE" msgstr "TERM" -#: src/who.c:568 +#: src/who.c:559 msgid "TIME" msgstr "CZAS" -#: src/who.c:568 +#: src/who.c:559 msgid "IDLE" msgstr "BEZCZYNNY" -#: src/who.c:569 +#: src/who.c:560 msgid "PID" msgstr "PID" -#: src/who.c:569 +#: src/who.c:560 msgid "COMMENT" msgstr "KOMENTARZ" -#: src/who.c:569 +#: src/who.c:560 msgid "EXIT" msgstr "WYJŚCIE" -#: src/who.c:649 +#: src/who.c:640 #, c-format msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n" msgstr "Składnia: %s [OPCJA]... [ PLIK | ARGUMENT1 ARGUMENT2 ]\n" -#: src/who.c:650 +#: src/who.c:641 msgid "Print information about users who are currently logged in.\n" msgstr "Wypisuje informację o aktualnie zalogowanych użytkownikach.\n" -#: src/who.c:653 +#: src/who.c:644 msgid "" "\n" " -a, --all same as -b -d --login -p -r -t -T -u\n" @@ -12215,11 +12579,11 @@ msgstr "" " -d, --dead wypisanie martwych procesów\n" " -H, --heading wypisanie linii nagłówków kolumn\n" -#: src/who.c:660 +#: src/who.c:651 msgid " -l, --login print system login processes\n" msgstr " -l, --login wypisanie systemowych procesów login\n" -#: src/who.c:663 +#: src/who.c:654 msgid "" " --lookup attempt to canonicalize hostnames via DNS\n" " -m only hostname and user associated with stdin\n" @@ -12231,7 +12595,7 @@ msgstr "" " ze standardowym wejściem\n" " -p, --process aktywne procesy uruchomione przez init\n" -#: src/who.c:668 +#: src/who.c:659 msgid "" " -q, --count all login names and number of users logged on\n" " -r, --runlevel print current runlevel\n" @@ -12244,7 +12608,7 @@ msgstr "" "(domyślnie)\n" " -t, --time podanie ostatniej zmiany zegara systemowego\n" -#: src/who.c:674 +#: src/who.c:665 msgid "" " -T, -w, --mesg add user's message status as +, - or ?\n" " -u, --users list users logged in\n" @@ -12257,7 +12621,7 @@ msgstr "" " --message to samo co -T\n" " --writable to samo co -T\n" -#: src/who.c:682 +#: src/who.c:673 #, c-format msgid "" "\n" @@ -12266,7 +12630,7 @@ msgid "" msgstr "" "\n" "Jeśli nie podano PLIKU, używany jest %s. Często podaje się %s.\n" -"Obecność ARG1 ARG2 implikuje -m. Typowe wywołania: 'am i', 'mom likes'.\n" +"Obecność ARG1 ARG2 implikuje -m. Typowe wywołania: „am i”, „mom likes”.\n" #: src/whoami.c:45 msgid "" @@ -12297,13 +12661,5 @@ msgid "" "Repeatedly output a line with all specified STRING(s), or 'y'.\n" "\n" msgstr "" -"Powtarzanie na wyjściu linii ze wszystkimi podanymi NAPIS(AMI) albo 'y'\n" +"Powtarzanie na wyjściu linii ze wszystkimi podanymi NAPIS(AMI) albo „y”\n" "\n" - -#, fuzzy -#~ msgid " gid=%s" -#~ msgstr " gid=%lu" - -#, fuzzy -#~ msgid " euid=%s" -#~ msgstr " euid=%lu" diff --git a/po/pt.gmo b/po/pt.gmo index 4ded7eb0..07a3a161 100644 Binary files a/po/pt.gmo and b/po/pt.gmo differ diff --git a/po/pt.po b/po/pt.po index 806d5bd5..b4b4092d 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: 2012-05-10 19:35+0200\n" +"POT-Creation-Date: 2013-02-14 15:56+0000\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,19 +36,19 @@ msgstr "Argumentos válidos:" msgid "error closing file" msgstr "erro ao fechar o ficheiro" -#: lib/closeout.c:112 src/base64.c:109 src/base64.c:121 src/base64.c:127 -#: src/base64.c:168 src/base64.c:224 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:330 src/expand.c:355 src/head.c:298 -#: src/head.c:348 src/head.c:756 src/head.c:797 src/mktemp.c:350 src/od.c:919 -#: src/paste.c:160 src/shuf.c:369 src/split.c:727 src/split.c:964 -#: src/split.c:969 src/tail.c:350 src/tail.c:1201 src/tail.c:1307 +#: 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 -#: src/unexpand.c:427 src/unexpand.c:443 +#: 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:1160 src/copy.c:2602 +#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617 #, c-format msgid "preserving permissions for %s" msgstr "a preservar as permissões de %s" @@ -240,18 +240,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:483 +#: lib/mkdir-p.c:196 src/install.c:484 #, 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:2261 src/install.c:709 src/install.c:722 +#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722 #, 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:915 src/tac.c:435 +#: src/split.c:929 src/tac.c:434 #, c-format msgid "memory exhausted" msgstr "memória esgotada" @@ -300,75 +300,75 @@ msgstr "»" msgid "%s: end of file" msgstr "%s: fim de ficheiro" -#: lib/regcomp.c:130 +#: lib/regcomp.c:131 msgid "Success" msgstr "Sucesso" -#: lib/regcomp.c:133 +#: lib/regcomp.c:134 msgid "No match" msgstr "Sem correspondência" -#: lib/regcomp.c:136 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "Expressão regular inválida" -#: lib/regcomp.c:139 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "Carácter de ordem inválido" -#: lib/regcomp.c:142 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "Nome de classe de carácter inválido" -#: lib/regcomp.c:145 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "Barra invertida no final" -#: lib/regcomp.c:148 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "Referência anterior inválida" -#: lib/regcomp.c:151 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "[ ou [^ não correspondido" -#: lib/regcomp.c:154 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "( ou \\( não correspondido" -#: lib/regcomp.c:157 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "\\{ não correspondido" -#: lib/regcomp.c:160 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "Conteúdo de \\{\\} inválido" -#: lib/regcomp.c:163 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "Limite final de intervalo inválido" -#: lib/regcomp.c:166 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Memória esgotada" -#: lib/regcomp.c:169 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "Expressão regular precedente inválida" -#: lib/regcomp.c:172 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "Fim prematuro de expressão regular" -#: lib/regcomp.c:175 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "Expressão regular demasiado grande" -#: lib/regcomp.c:178 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr ") ou \\) não correspondido" -#: lib/regcomp.c:703 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "Nenhuma expressão regular anterior" @@ -407,7 +407,7 @@ msgstr "^[yY]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-mode-acl.c:695 src/copy.c:2284 src/cp.c:518 +#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516 #, c-format msgid "setting permissions for %s" msgstr "a definir as permissões de %s" @@ -554,13 +554,13 @@ msgstr "erro de open" msgid "Resource lost" msgstr "" -#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262 -#: lib/spawn-pipe.c:265 +#: 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:232 lib/spawn-pipe.c:346 lib/wait-process.c:282 +#: 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" @@ -576,24 +576,24 @@ msgstr "intervalo de tempo inválido %s" msgid "Unknown signal %d" msgstr "" -#: lib/unicodeio.c:103 +#: lib/unicodeio.c:102 msgid "iconv function not usable" msgstr "função iconv inutilizável" -#: lib/unicodeio.c:105 +#: lib/unicodeio.c:104 msgid "iconv function not available" msgstr "função iconv indisponível" -#: lib/unicodeio.c:112 +#: lib/unicodeio.c:111 msgid "character out of range" msgstr "carácter fora de limite" -#: lib/unicodeio.c:182 +#: lib/unicodeio.c:181 #, c-format msgid "cannot convert U+%04X to local character set" msgstr "impossível converter U+%04X para conjunto de caracteres local" -#: lib/unicodeio.c:184 +#: lib/unicodeio.c:183 #, c-format msgid "cannot convert U+%04X to local character set: %s" msgstr "impossível converter U+%04X para conjunto de caracteres local: %s" @@ -777,7 +777,7 @@ msgstr "" "\n" "Comunique erros através de <%s>.\n" -#: lib/version-etc.c:251 src/system.h:562 +#: lib/version-etc.c:251 src/system.h:573 #, c-format msgid "%s home page: <%s>\n" msgstr "" @@ -787,7 +787,7 @@ msgstr "" msgid "%s home page: <http://www.gnu.org/software/%s/>\n" msgstr "" -#: lib/version-etc.c:256 src/system.h:563 +#: lib/version-etc.c:256 src/system.h:574 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" @@ -878,14 +878,13 @@ msgstr "" msgid "" "Usage: %s [OPTION]... [FILE]\n" "Base64 encode or decode FILE, or standard input, to standard output.\n" -"\n" msgstr "" "Utilização: %s [OPÇÃO] [FICHEIRO]\n" "Codificar ou descodificar em base64 o FICHEIRO, ou a entrada padrão, para a " "saída padrão.\n" "\n" -#: src/base64.c:64 +#: src/base64.c:67 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -895,7 +894,7 @@ msgid "" "\n" msgstr "" -#: src/base64.c:73 src/cat.c:110 src/fmt.c:293 src/shuf.c:71 src/sum.c:70 +#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -903,7 +902,7 @@ msgstr "" "\n" "Sem FICHEIRO, ou quando FICHEIRO é -, ler entrada padrão.\n" -#: src/base64.c:76 +#: src/base64.c:79 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -918,37 +917,37 @@ 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:171 src/base64.c:208 src/csplit.c:263 src/csplit.c:1435 -#: src/join.c:451 src/shuf.c:157 src/shuf.c:361 src/tac-pipe.c:74 +#: 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 #, c-format msgid "read error" msgstr "erro de leitura" -#: src/base64.c:227 +#: src/base64.c:230 #, c-format msgid "invalid input" msgstr "dados de entrada inválidos" -#: src/base64.c:264 +#: src/base64.c:267 #, c-format msgid "invalid wrap size: %s" msgstr "comprimento de partição inválido: %s" -#: src/base64.c:283 src/basename.c:173 src/comm.c:435 src/cp.c:607 -#: src/date.c:441 src/dircolors.c:447 src/du.c:894 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:169 src/install.c:929 src/join.c:961 -#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:157 src/mv.c:447 -#: src/od.c:1802 src/ptx.c:2081 src/readlink.c:154 src/seq.c:408 -#: src/shuf.c:320 src/shuf.c:339 src/sort.c:4477 src/split.c:1313 -#: src/tr.c:1797 src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:454 -#: src/uniq.c:471 src/unlink.c:81 src/uptime.c:250 src/users.c:146 -#: src/wc.c:666 src/who.c:836 src/whoami.c:79 +#: 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 #, c-format msgid "extra operand %s" msgstr "operando extra %s" -#: src/base64.c:315 src/cat.c:781 +#: src/base64.c:318 src/cat.c:781 #, c-format msgid "closing standard input" msgstr "a fechar a entrada padrão" @@ -956,15 +955,15 @@ 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/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:53 src/env.c:33 +#: 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/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:65 src/su.c:88 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 +#: 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 msgid "David MacKenzie" msgstr "" @@ -978,23 +977,23 @@ msgstr "" " ou: %s OPÇÃO\n" #: src/basename.c:53 +#, fuzzy msgid "" "Print NAME with any leading directory components removed.\n" "If specified, also remove a trailing SUFFIX.\n" -"\n" msgstr "" "Mostrar NOME com todas as pastas removidas.\n" "Se especificado, remover também um SUFIXO.\n" "\n" -#: src/basename.c:59 +#: 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" msgstr "" -#: src/basename.c:66 +#: src/basename.c:67 #, c-format msgid "" "\n" @@ -1005,20 +1004,21 @@ msgid "" " %s -a any/str1 any/str2 -> \"str1\" followed by \"str2\"\n" msgstr "" -#: src/basename.c:167 src/chcon.c:531 src/chgrp.c:277 src/chmod.c:526 -#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1369 +#: 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:183 src/mkfifo.c:108 src/mknod.c:146 src/nohup.c:111 -#: src/pathchk.c:148 src/printf.c:674 src/readlink.c:146 src/realpath.c:236 -#: src/rm.c:314 src/rmdir.c:223 src/seq.c:402 src/setuidgid.c:137 -#: src/sleep.c:119 src/stat.c:1476 src/stdbuf.c:346 src/tr.c:1782 +#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 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 #, 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:52 src/split.c:49 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/split.c:49 msgid "Torbjorn Granlund" msgstr "" @@ -1028,8 +1028,8 @@ msgstr "" msgid "Richard M. Stallman" msgstr "" -#: src/cat.c:88 src/df.c:846 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4720 src/nl.c:182 src/paste.c:435 src/pr.c:2768 src/sum.c:58 +#: 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/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 +1087,7 @@ msgstr "" msgid "cannot do ioctl on %s" msgstr "erro ao executar ioctl em %s" -#: src/cat.c:637 src/dd.c:2209 src/sort.c:379 src/tee.c:165 src/yes.c:86 +#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86 #, c-format msgid "standard output" msgstr "canal de saída padrão (stdout)" @@ -1104,14 +1104,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:55 src/head.c:46 src/hostid.c:33 +#: 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 msgid "Jim Meyering" msgstr "" -#: src/chcon.c:100 src/runcon.c:203 src/runcon.c:234 +#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238 #, c-format msgid "failed to create security context: %s" msgstr "erro ao criar contexto de segurança: %s" @@ -1121,8 +1121,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:540 src/copy.c:2222 src/runcon.c:217 -#: src/stat.c:683 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221 +#: src/stat.c:702 #, c-format msgid "failed to get security context of %s" msgstr "erro ao obter contexto de segurança de %s" @@ -1138,12 +1138,12 @@ 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:446 src/ls.c:2981 +#: src/du.c:457 src/ls.c:2981 #, 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:426 +#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437 #, c-format msgid "cannot read directory %s" msgstr "impossível ler a pasta %s" @@ -1153,13 +1153,13 @@ 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:599 +#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562 #, 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:618 -#: src/remove.c:613 +#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642 +#: src/remove.c:576 #, fuzzy, c-format msgid "fts_close failed" msgstr "erro de close" @@ -1182,7 +1182,6 @@ msgid "" "Change the security context of each FILE to CONTEXT.\n" "With --reference, change the security context 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 " @@ -1192,7 +1191,7 @@ msgstr "" "mudança\n" " -h, --no-dereference afectar lig. simbólicas e não fich. referenciados\n" -#: src/chcon.c:362 src/chgrp.c:123 src/chown.c:94 +#: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94 msgid "" " --dereference affect the referent of each symbolic link (this is\n" " the default), rather than the symbolic link itself\n" @@ -1200,7 +1199,7 @@ msgid "" "file\n" msgstr "" -#: src/chcon.c:367 +#: src/chcon.c:369 #, fuzzy msgid "" " -u, --user=USER set user USER in the target security context\n" @@ -1214,7 +1213,16 @@ msgstr "" " -l, --range=ALCANCE definir ALCANCE no contexto de segurança alvo\n" "\n" -#: src/chcon.c:373 +#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110 +#, fuzzy +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 (predefinição)\n" +" --preserve-root falhar ao operar recursivamente em '/'\n" + +#: src/chcon.c:379 #, fuzzy msgid "" " --reference=RFILE use RFILE's security context rather than " @@ -1227,15 +1235,15 @@ msgstr "" " -v, --verbose despejar um diagnóstico para cada ficheiro " "processado\n" -#: src/chcon.c:377 src/chgrp.c:140 src/chown.c:118 +#: 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:380 +#: src/chcon.c:386 msgid " -v, --verbose output a diagnostic for every file processed\n" msgstr "" -#: src/chcon.c:383 src/chgrp.c:143 src/chown.c:121 +#: src/chcon.c:389 src/chgrp.c:143 src/chown.c:121 #, fuzzy msgid "" "\n" @@ -1263,36 +1271,36 @@ msgstr "" " -P não percorrer ligações simbólicas (predefinido)\n" "\n" -#: src/chcon.c:512 src/chgrp.c:264 src/chown.c:267 +#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267 #, c-format msgid "-R --dereference requires either -H or -L" msgstr "-R --dereference requere -H ou -L" -#: src/chcon.c:518 +#: src/chcon.c:524 #, c-format msgid "-R -h requires -P" msgstr "-R -h requere -P" -#: src/chcon.c:533 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282 -#: src/comm.c:429 src/csplit.c:1371 src/join.c:1149 src/link.c:79 -#: src/mknod.c:148 src/setuidgid.c:139 src/tr.c:1785 +#: 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 #, c-format msgid "missing operand after %s" msgstr "operando em falta após %s" -#: src/chcon.c:556 src/runcon.c:247 +#: src/chcon.c:562 src/runcon.c:251 #, c-format msgid "invalid context: %s" msgstr "contexto inválido: %s" -#: src/chcon.c:563 +#: src/chcon.c:569 #, c-format msgid "conflicting security context specifiers given" msgstr "especificadores de contexto de segurança em conflito" -#: src/chcon.c:572 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:433 src/cp.c:493 -#: src/mv.c:96 src/pwd.c:273 src/rm.c:324 src/touch.c:351 +#: 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 #, c-format msgid "failed to get attributes of %s" msgstr "erro ao obter os atributos de %s" @@ -1344,15 +1352,6 @@ msgstr "" "podem\n" " alterar o dono de uma ligação simbólica)\n" -#: src/chgrp.c:132 src/chmod.c:387 src/chown.c:110 -#, fuzzy -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 (predefinição)\n" -" --preserve-root falhar ao operar recursivamente em '/'\n" - #: src/chgrp.c:136 msgid "" " --reference=RFILE use RFILE's group rather than specifying a\n" @@ -1439,8 +1438,14 @@ msgstr "" " -h, --no-dereference afectar lig. simbólicas e não fich. referenciados\n" #: src/chmod.c:391 +#, fuzzy 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 msgid " -R, --recursive change files and directories recursively\n" @@ -1609,7 +1614,7 @@ msgstr "" msgid "Roland McGrath" msgstr "" -#: src/chroot.c:97 src/install.c:575 src/setuidgid.c:110 src/setuidgid.c:120 +#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120 #, c-format msgid "invalid group %s" msgstr "grupo %s inválido" @@ -1677,8 +1682,8 @@ msgstr "erro ao definir o novo papel %s" 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:213 src/stdbuf.c:366 -#: src/timeout.c:402 +#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365 +#: src/timeout.c:454 #, fuzzy, c-format msgid "failed to run command %s" msgstr "impossível executar o comando %s" @@ -1794,20 +1799,24 @@ msgstr "múltiplas opções -i especificadas" msgid "empty %s not allowed" msgstr "" -#: src/copy.c:168 src/dd.c:1609 src/dd.c:1976 +#: 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 #, c-format -msgid "reading %s" -msgstr "a ler %s" +msgid "error reading %s" +msgstr "erro ao ler %s" -#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:426 +#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425 #, c-format msgid "cannot lseek %s" msgstr "impossível alterar o posicionamento dentro do ficheiro %s" -#: src/copy.c:206 src/dd.c:2039 src/dd.c:2102 +#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151 #, c-format -msgid "writing %s" -msgstr "a escrever %s" +msgid "error writing %s" +msgstr "erro ao escrever %s" #: src/copy.c:313 #, fuzzy, c-format @@ -1829,7 +1838,7 @@ msgstr "erro ao abrir %s" msgid "clearing permissions for %s" msgstr "a limpar as permissões de %s" -#: src/copy.c:697 src/copy.c:2470 src/cp.c:331 +#: src/copy.c:697 src/copy.c:2480 src/cp.c:329 #, c-format msgid "failed to preserve ownership for %s" msgstr "erro ao preservar o dono de %s" @@ -1844,14 +1853,14 @@ msgstr "ficheiro %s não encontrado" msgid "failed to preserve authorship for %s" msgstr "erro ao preservar o criador de %s" -#: src/copy.c:804 src/csplit.c:638 src/du.c:901 src/fmt.c:449 src/head.c:847 -#: src/sort.c:4489 src/split.c:1329 src/tail.c:1756 src/wc.c:678 +#: 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 "impossível abrir %s para leitura" -#: src/copy.c:810 src/copy.c:972 src/dd.c:1546 src/dd.c:2114 src/dd.c:2252 -#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:141 +#: 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 #, c-format msgid "cannot fstat %s" msgstr "impossível obter o estado de %s" @@ -1871,14 +1880,14 @@ msgstr "erro ao obter o contexto de criação do sistema de ficheiros" 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:1574 src/copy.c:1777 src/copy.c:1935 src/ln.c:314 -#: src/remove.c:267 src/remove.c:293 src/remove.c:444 src/remove.c:465 +#: 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 #, c-format msgid "cannot remove %s" msgstr "impossível remover %s" -#: src/copy.c:886 src/copy.c:1578 src/copy.c:1772 src/copy.c:1940 -#: src/remove.c:418 +#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945 +#: src/remove.c:375 #, c-format msgid "removed %s\n" msgstr "%s removido\n" @@ -1896,188 +1905,188 @@ msgstr "impossível criar o ficheiro regular %s" #: src/copy.c:985 #, fuzzy, c-format msgid "failed to clone %s from %s" -msgstr "erro ao abrir %s" +msgstr "erro ao fechar a pasta %s" -#: src/copy.c:1098 src/copy.c:2531 +#: src/copy.c:1098 src/copy.c:2541 #, c-format msgid "preserving times for %s" msgstr "a preservar os dados de tempo de %s" -#: src/copy.c:1170 src/copy.c:1176 src/head.c:855 src/touch.c:175 -#: src/truncate.c:413 -#, c-format -msgid "closing %s" -msgstr "a fechar %s" +#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172 +#: src/truncate.c:417 +#, fuzzy, c-format +msgid "failed to close %s" +msgstr "erro ao abrir %s" -#: src/copy.c:1466 +#: src/copy.c:1471 #, c-format msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? " msgstr "%s: tentar sobrescrever %s, cancelando o modo %04lo (%s)? " -#: src/copy.c:1473 +#: src/copy.c:1478 #, c-format msgid "%s: overwrite %s? " msgstr "%s: sobrescrever %s? " -#: src/copy.c:1542 +#: src/copy.c:1547 #, c-format msgid " (backup: %s)" msgstr " (salvaguarda: %s)" -#: src/copy.c:1552 +#: src/copy.c:1557 #, 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:1584 +#: src/copy.c:1589 #, c-format msgid "cannot create hard link %s to %s" msgstr "impossível criar a ligação persistente %s para %s" -#: src/copy.c:1637 src/copy.c:1689 src/copy.c:2272 src/copy.c:2589 +#: 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:1220 src/truncate.c:365 +#: src/stat.c:1239 src/truncate.c:363 #, c-format msgid "cannot stat %s" msgstr "impossível analisar %s" -#: src/copy.c:1645 +#: src/copy.c:1650 #, c-format msgid "omitting directory %s" msgstr "a omitir a pasta %s" -#: src/copy.c:1659 +#: src/copy.c:1664 #, 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:1707 src/ln.c:246 +#: src/copy.c:1712 src/ln.c:246 #, c-format msgid "%s and %s are the same file" msgstr "%s e %s são o mesmo ficheiro" -#: src/copy.c:1806 +#: src/copy.c:1811 #, 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:1824 src/ln.c:214 +#: src/copy.c:1829 src/ln.c:214 #, 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:1842 +#: src/copy.c:1847 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "impossível sobrescrever a pasta %s com não-pasta" -#: src/copy.c:1856 +#: src/copy.c:1861 #, 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:1886 +#: src/copy.c:1891 #, 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:1887 +#: src/copy.c:1892 #, 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:1910 src/ln.c:276 +#: src/copy.c:1915 src/ln.c:276 #, c-format msgid "cannot backup %s" msgstr "impossível salvaguardar %s" -#: src/copy.c:1974 +#: src/copy.c:1979 #, 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:2051 +#: src/copy.c:2056 #, 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:2068 +#: src/copy.c:2073 #, 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:2118 +#: src/copy.c:2123 #, 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:2161 +#: src/copy.c:2166 #, c-format msgid "cannot move %s to %s" msgstr "impossível mover %s para %s" -#: src/copy.c:2173 +#: src/copy.c:2178 #, 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:2207 src/install.c:905 src/mkdir.c:189 src/mkfifo.c:114 -#: src/mknod.c:167 +#: 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:2241 +#: src/copy.c:2246 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "impossível copiar a ligação simbólica cíclica %s" -#: src/copy.c:2350 +#: src/copy.c:2355 #, 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:2357 +#: src/copy.c:2362 #, 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:2406 src/mkfifo.c:133 +#: src/copy.c:2416 src/mkfifo.c:132 #, c-format msgid "cannot create fifo %s" msgstr "impossível criar fifo %s" -#: src/copy.c:2415 +#: src/copy.c:2425 #, c-format msgid "cannot create special file %s" msgstr "impossível criar o ficheiro especial %s" -#: src/copy.c:2426 src/ls.c:3191 src/stat.c:902 +#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921 #, c-format msgid "cannot read symbolic link %s" msgstr "impossível ler a ligação simbólica %s" -#: src/copy.c:2453 +#: src/copy.c:2463 #, c-format msgid "cannot create symbolic link %s" msgstr "impossível criar a ligação simbólica %s" -#: src/copy.c:2485 +#: src/copy.c:2495 #, c-format msgid "%s has unknown file type" msgstr "%s é um tipo de ficheiro desconhecido" -#: src/copy.c:2629 src/ln.c:358 +#: src/copy.c:2644 src/ln.c:358 #, c-format msgid "cannot un-backup %s" msgstr "impossível recuperar %s" -#: src/copy.c:2633 +#: src/copy.c:2648 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (recuperação)\n" -#: src/cp.c:156 src/mv.c:284 +#: src/cp.c:156 src/mv.c:286 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -2089,27 +2098,13 @@ msgstr "" " ou: %s [OPÇÃO]... -t PASTA FONTE...\n" #: src/cp.c:162 -msgid "" -"Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" -"\n" +#, 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:166 src/csplit.c:1458 src/cut.c:197 src/df.c:852 src/du.c:268 -#: src/expand.c:112 src/fmt.c:275 src/fold.c:75 src/head.c:115 -#: src/install.c:612 src/kill.c:86 src/ln.c:392 src/ls.c:4726 src/mkdir.c:61 -#: src/mkfifo.c:56 src/mknod.c:58 src/mv.c:294 src/nl.c:191 src/paste.c:445 -#: src/pr.c:2777 src/ptx.c:1825 src/shred.c:153 src/shuf.c:58 src/sort.c:399 -#: src/split.c:211 src/stdbuf.c:95 src/tac.c:142 src/tail.c:268 -#: src/touch.c:226 src/truncate.c:107 src/unexpand.c:122 src/uniq.c:145 -msgid "" -"Mandatory arguments to long options are mandatory for short options too.\n" -msgstr "" -"Argumentos mandatórios para opções longas são mandatórios para opções curtas " -"também.\n" - -#: src/cp.c:169 +#: src/cp.c:168 #, fuzzy msgid "" " -a, --archive same as -dR --preserve=all\n" @@ -2132,13 +2127,14 @@ msgstr "" " -d o mesmo que --no-dereference --" "preserve=links\n" -#: src/cp.c:178 +#: src/cp.c:177 #, fuzzy msgid "" " -f, --force if an existing destination file cannot be\n" -" opened, remove it and try again (redundant " -"if\n" -" the -n option is used)\n" +" opened, remove it and try again (this " +"option\n" +" is ignored when the -n option is also " +"used)\n" " -i, --interactive prompt before overwrite (overrides a previous " "-n\n" " option)\n" @@ -2151,7 +2147,7 @@ msgstr "" " -H seguir as ligações simbólicas da linha de " "comandos em ORIGEM\n" -#: src/cp.c:188 +#: src/cp.c:186 #, fuzzy msgid "" " -l, --link hard link files instead of copying\n" @@ -2160,7 +2156,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:192 +#: src/cp.c:190 #, fuzzy msgid "" " -n, --no-clobber do not overwrite an existing file (overrides\n" @@ -2174,7 +2170,7 @@ msgstr "" " -H seguir as ligações simbólicas da linha de " "comandos em ORIGEM\n" -#: src/cp.c:197 +#: src/cp.c:195 #, fuzzy msgid "" " -p same as --preserve=mode,ownership,timestamps\n" @@ -2191,7 +2187,7 @@ msgstr "" " mode,ownership,timestamps), se possível\n" " atributos adicionais: context, links, all\n" -#: src/cp.c:205 +#: src/cp.c:203 msgid "" " --no-preserve=ATTR_LIST don't preserve the specified attributes\n" " --parents use full source file name under DIRECTORY\n" @@ -2200,7 +2196,7 @@ msgstr "" " --parents usar nome completo de ficheiro de origem em " "PASTA\n" -#: src/cp.c:209 +#: src/cp.c:207 #, fuzzy msgid "" " -R, -r, --recursive copy directories recursively\n" @@ -2214,7 +2210,7 @@ msgstr "" "antes\n" " de tentar abri-lo (oposto a --force)\n" -#: src/cp.c:215 +#: src/cp.c:213 #, fuzzy msgid "" " --sparse=WHEN control creation of sparse files. See below\n" @@ -2226,7 +2222,7 @@ msgstr "" " --strip-trailing-slashes remover as 'barras' de cada argumento de\n" " ORIGEM\n" -#: src/cp.c:220 +#: src/cp.c:218 msgid "" " -s, --symbolic-link make symbolic links instead of copying\n" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -2240,7 +2236,7 @@ msgstr "" "PASTA\n" " -T, --no-target-directory tratar DESTINO como um ficheiro normal\n" -#: src/cp.c:226 +#: src/cp.c:224 msgid "" " -u, --update copy only when the SOURCE file is newer\n" " than the destination file or when the\n" @@ -2254,7 +2250,7 @@ msgstr "" " -v, --verbose explicar o que está a ser feito\n" " -x, --one-file-system permanecer neste sistema de ficheiros\n" -#: src/cp.c:235 +#: src/cp.c:233 #, fuzzy msgid "" "\n" @@ -2281,7 +2277,7 @@ msgstr "" "Use --sparse=never para inibir a criação de ficheiros esparsos.\n" "\n" -#: src/cp.c:247 src/install.c:649 src/ln.c:421 src/mv.c:321 +#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322 #, fuzzy msgid "" "\n" @@ -2298,7 +2294,7 @@ msgstr "" "variável de ambiente VERSION_CONTROL. Eis os valores:\n" "\n" -#: src/cp.c:254 src/install.c:656 src/mv.c:328 +#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329 msgid "" " none, off never make backups (even if --backup is given)\n" " numbered, t make numbered backups\n" @@ -2311,7 +2307,7 @@ msgstr "" "simples\n" " simple, never efectuar sempre salvaguardas simples\n" -#: src/cp.c:260 +#: src/cp.c:258 msgid "" "\n" "As a special case, cp makes a backup of SOURCE when the force and backup\n" @@ -2323,94 +2319,94 @@ 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:319 +#: src/cp.c:317 #, c-format msgid "failed to preserve times for %s" msgstr "erro ao preservar os tempos de %s" -#: src/cp.c:350 +#: src/cp.c:348 #, c-format msgid "failed to preserve permissions for %s" msgstr "erro ao preservar permissões de %s" -#: src/cp.c:477 +#: src/cp.c:475 #, c-format msgid "cannot make directory %s" msgstr "impossível criar a pasta %s" -#: src/cp.c:526 src/cp.c:545 +#: src/cp.c:524 src/cp.c:543 #, c-format msgid "%s exists but is not a directory" msgstr "%s existe mas não é uma pasta" -#: src/cp.c:572 src/cp.c:1068 src/install.c:401 src/install.c:844 src/ln.c:123 -#: src/ln.c:181 src/ln.c:202 src/ln.c:516 src/mv.c:152 src/mv.c:399 -#, c-format -msgid "accessing %s" -msgstr "a aceder a %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 +#, fuzzy, c-format +msgid "failed to access %s" +msgstr "erro ao abrir %s" -#: src/cp.c:592 src/install.c:914 src/ln.c:546 src/mv.c:432 src/shred.c:1182 -#: src/touch.c:433 src/truncate.c:356 +#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181 +#: src/touch.c:429 src/truncate.c:354 #, c-format msgid "missing file operand" msgstr "operando de ficheiro em falta" -#: src/cp.c:594 src/install.c:916 src/ln.c:560 src/mv.c:434 +#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436 #, c-format msgid "missing destination file operand after %s" msgstr "operando de ficheiro de destino em falta após %s" -#: src/cp.c:603 src/install.c:925 src/mv.c:443 +#: src/cp.c:601 src/install.c:926 src/mv.c:445 #, 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:619 src/cp.c:1070 src/install.c:403 src/install.c:846 -#: src/install.c:938 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:401 -#: src/mv.c:457 +#: 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 #, c-format msgid "target %s is not a directory" msgstr "o destino %s não é uma pasta" -#: src/cp.c:730 +#: src/cp.c:728 #, c-format msgid "with --parents, the destination must be a directory" msgstr "com --parents, o destino deve ser uma pasta" -#: src/cp.c:1063 src/install.c:839 src/ln.c:511 src/mv.c:394 +#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395 #, c-format msgid "multiple target directories specified" msgstr "múltiplas pastas de destino especificadas" -#: src/cp.c:1108 +#: src/cp.c:1110 #, c-format msgid "cannot make both hard and symbolic links" msgstr "impossível criar ligações simbólicas e persistentes" -#: src/cp.c:1115 src/mv.c:464 +#: src/cp.c:1117 src/mv.c:466 #, 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:1121 +#: src/cp.c:1123 #, c-format msgid "--reflink can be used only with --sparse=auto" msgstr "" -#: src/cp.c:1129 src/install.c:899 src/ln.c:582 src/mv.c:472 +#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474 msgid "backup type" msgstr "tipo de salvaguarda" -#: src/cp.c:1154 +#: src/cp.c:1156 #, 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:1160 +#: src/cp.c:1162 #, c-format msgid "cannot preserve extended attributes, cp is built without xattr support" msgstr "" @@ -2420,138 +2416,137 @@ msgstr "" msgid "Stuart Kemp" msgstr "" -#: src/csplit.c:529 +#: src/csplit.c:531 #, c-format msgid "input disappeared" msgstr "a entrada desapareceu" -#: src/csplit.c:658 src/csplit.c:669 +#: src/csplit.c:660 src/csplit.c:671 #, c-format msgid "%s: line number out of range" msgstr "%s: número de linha fora de alcance" -#: src/csplit.c:698 +#: src/csplit.c:700 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: número de linha fora de alcance" -#: src/csplit.c:701 src/csplit.c:750 +#: src/csplit.c:703 src/csplit.c:752 #, c-format msgid " on repetition %s\n" msgstr "em repetição %s\n" -#: src/csplit.c:744 +#: src/csplit.c:746 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: correspondência não encontrada" -#: src/csplit.c:808 src/csplit.c:848 src/nl.c:359 src/tac.c:274 +#: src/csplit.c:810 src/csplit.c:850 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:981 +#: src/csplit.c:983 #, c-format msgid "write error for %s" msgstr "erro de escrita para %s" -#: src/csplit.c:1057 +#: src/csplit.c:1059 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: inteiro esperado após delimitador" -#: src/csplit.c:1073 +#: src/csplit.c:1075 #, fuzzy, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: '}' é requerido na contagem de repetição" -#: src/csplit.c:1083 +#: src/csplit.c:1085 #, fuzzy, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: inteiro requerido entre '{' e '}'" -#: src/csplit.c:1110 +#: src/csplit.c:1112 #, fuzzy, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: delimitador de fecho '%c' em falta" -#: src/csplit.c:1127 +#: src/csplit.c:1129 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: expressão regular inválida: %s" -#: src/csplit.c:1160 +#: src/csplit.c:1162 #, c-format msgid "%s: invalid pattern" msgstr "%s: padrão inválido" -#: src/csplit.c:1163 +#: src/csplit.c:1165 #, 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:1169 +#: src/csplit.c:1171 #, 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:1175 +#: src/csplit.c:1177 #, 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:1253 +#: src/csplit.c:1255 #, c-format msgid "missing conversion specifier in suffix" msgstr "especificador de conversão em falta no sufixo" -#: src/csplit.c:1259 +#: src/csplit.c:1261 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "especificação de conversão inválida no sufixo: %c" -#: src/csplit.c:1262 +#: src/csplit.c:1264 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "especificação de conversão inválida no sufixo: \\%.3o" -#: src/csplit.c:1267 +#: src/csplit.c:1269 #, fuzzy, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "%.*s: especificação de conversão inválida" -#: src/csplit.c:1284 +#: src/csplit.c:1286 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "demasiadas especificações de conversão %% no sufixo" -#: src/csplit.c:1298 +#: src/csplit.c:1300 #, c-format msgid "missing %% conversion specification in suffix" msgstr "especificação de conversão %% inválida no sufixo" -#: src/csplit.c:1345 +#: src/csplit.c:1347 #, c-format msgid "%s: invalid number" msgstr "%s: número inválido" -#: src/csplit.c:1449 +#: src/csplit.c:1451 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Utilização: %s [OPÇÃO]... FICHEIRO PADRÃO...\n" -#: src/csplit.c:1453 +#: src/csplit.c:1455 #, 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" -"\n" msgstr "" "Despejar partes de FICHEIRO separadas por PADRÃO(ÕES) para os ficheiros " "'xx00',\n" "'xx01', ..., e exibir contagem de bytes de cada parte.\n" -#: src/csplit.c:1461 +#: src/csplit.c:1462 #, fuzzy, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2562,7 +2557,7 @@ 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:1466 +#: src/csplit.c:1467 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" @@ -2572,7 +2567,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:1473 +#: src/csplit.c:1474 msgid "" "\n" "Read standard input if FILE is -. Each PATTERN may be:\n" @@ -2580,7 +2575,7 @@ msgstr "" "\n" "Ler a entrada padrão se FICHEIRO for -. Cada PADRÃO pode ser:\n" -#: src/csplit.c:1477 +#: src/csplit.c:1478 #, fuzzy msgid "" "\n" @@ -2607,7 +2602,7 @@ msgstr "" msgid "David M. Ihnat" msgstr "" -#: src/cut.c:64 +#: 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" @@ -2617,14 +2612,13 @@ msgid "Usage: %s OPTION... [FILE]...\n" msgstr "Utilização: %s OPÇÃO... [FICHEIRO]...\n" #: src/cut.c:193 -msgid "" -"Print selected parts of lines from each FILE to standard output.\n" -"\n" +#, 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:200 +#: src/cut.c:199 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2634,7 +2628,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:205 +#: src/cut.c:204 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2648,7 +2642,7 @@ msgstr "" " seja especificada\n" " -n (ignorado)\n" -#: src/cut.c:211 +#: src/cut.c:210 #, fuzzy msgid "" " --complement complement the set of selected bytes, characters\n" @@ -2657,7 +2651,7 @@ msgstr "" " --complement complementar o conjunto de bytes escolhidos,\n" " caracteres ou campos.\n" -#: src/cut.c:215 +#: src/cut.c:214 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2668,7 +2662,7 @@ msgstr "" " o modo predefinido é usar o delimitador de " "entrada\n" -#: src/cut.c:222 +#: src/cut.c:221 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2680,7 +2674,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:228 +#: src/cut.c:227 msgid "" "Each range is one of:\n" "\n" @@ -2700,45 +2694,47 @@ msgstr "" "\n" "Sem FICHEIRO, ou quando FICHEIRO é -, ler a entrada padrão.\n" -#: src/cut.c:368 src/cut.c:489 -msgid "invalid byte or field list" +#: src/cut.c:367 src/cut.c:493 +#, fuzzy +msgid "invalid byte, character or field list" msgstr "byte ou lista de campo inválido" -#: src/cut.c:385 +#: src/cut.c:387 msgid "invalid range with no endpoint: -" msgstr "intervalo inválido sem fim: -" -#: src/cut.c:399 +#: src/cut.c:403 msgid "invalid decreasing range" msgstr "intervalo decrescente inválido" -#: src/cut.c:478 +#: src/cut.c:482 #, c-format msgid "byte offset %s is too large" msgstr "posição de byte %s demasiado grande" -#: src/cut.c:481 +#: src/cut.c:485 #, c-format msgid "field number %s is too large" msgstr "número de campo %s demasiado grande" -#: src/cut.c:789 src/cut.c:797 +#: src/cut.c:795 src/cut.c:803 msgid "only one type of list may be specified" msgstr "apenas um tipo de lista pode ser especificado" -#: src/cut.c:806 +#: src/cut.c:812 src/numfmt.c:1408 +#, c-format msgid "the delimiter must be a single character" msgstr "o delimitador deve ser um único carácter" -#: src/cut.c:841 +#: src/cut.c:847 msgid "you must specify a list of bytes, characters, or fields" msgstr "deve especificar uma lista de bytes, caracteres ou campos" -#: src/cut.c:844 +#: src/cut.c:850 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:848 +#: src/cut.c:854 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2746,11 +2742,11 @@ msgstr "" "suprimir linhas não delimitadas faz sentido\n" "\tapenas para campos" -#: src/cut.c:864 +#: src/cut.c:870 msgid "missing list of fields" msgstr "lista de campos ausente" -#: src/cut.c:866 +#: src/cut.c:872 msgid "missing list of positions" msgstr "lista de posições ausente" @@ -2764,9 +2760,11 @@ msgstr "" " ou: %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 "" + +#: src/date.c:134 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" " -I[TIMESPEC], --iso-8601[=TIMESPEC] output date/time in ISO 8601 format.\n" @@ -2775,7 +2773,7 @@ msgid "" " and time to the indicated precision.\n" msgstr "" -#: src/date.c:138 +#: src/date.c:142 msgid "" " -r, --reference=FILE display the last modification time of FILE\n" " -R, --rfc-2822 output date and time in RFC 2822 format.\n" @@ -2786,7 +2784,7 @@ msgstr "" " -R, --rfc-2822 exibir data e hora no formato RFC 2822.\n" " Exemplo: Seg, 07 Ago 2006 12:34:56 -0600\n" -#: src/date.c:143 +#: src/date.c:147 #, fuzzy msgid "" " --rfc-3339=TIMESPEC output date and time in RFC 3339 format.\n" @@ -2806,7 +2804,7 @@ msgstr "" " -u, --utc, --universal exibir ou alterar Hora Universal Coordenada " "(UTC)\n" -#: src/date.c:154 +#: src/date.c:158 #, fuzzy msgid "" "\n" @@ -2822,7 +2820,7 @@ msgstr "" " %% um literal %\n" " %a nome de semana local abreviado (ex.: Dom)\n" -#: src/date.c:161 +#: src/date.c:165 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2834,7 +2832,7 @@ msgstr "" " %B nome local completo de mês (ex.: Janeiro)\n" " %c data e hora local (ex.: Qui Mar 3 23:05:25 2005)\n" -#: src/date.c:167 +#: src/date.c:171 #, fuzzy msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" @@ -2847,7 +2845,7 @@ msgstr "" " %D data; o mesmo que %m/%d/%y\n" " %e dia do mês, alinhado a espaço; o mesmo que %_d\n" -#: src/date.c:173 +#: src/date.c:177 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -2857,7 +2855,7 @@ msgstr "" " %g últimos dois dígitos de número de semana ISO (ver %G)\n" " %G ano de número de semana ISO (ver %V); normalmente útil apenas com %V\n" -#: src/date.c:178 +#: src/date.c:182 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2869,7 +2867,7 @@ msgstr "" " %I hora (01..12)\n" " %j dia do ano (001..366)\n" -#: src/date.c:184 +#: src/date.c:188 #, fuzzy msgid "" " %k hour, space padded ( 0..23); same as %_H\n" @@ -2882,7 +2880,7 @@ msgstr "" " %m mês (01..12)\n" " %M minuto (00..59)\n" -#: src/date.c:190 +#: src/date.c:194 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2900,7 +2898,7 @@ msgstr "" " %R horas e minutos de 24 hora; o mesmo que %H:%M\n" " %s segundos desde 1970-01-01 00:00:00 UTC\n" -#: src/date.c:199 +#: src/date.c:203 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2912,7 +2910,7 @@ msgstr "" " %T hora (tempo completo); o mesmo que %H:%M:%S\n" " %u dia da semana (1..7); 1 é Segunda-feira\n" -#: src/date.c:205 +#: src/date.c:209 msgid "" " %U week number of year, with Sunday as first day of week (00..53)\n" " %V ISO week number, with Monday as first day of week (01..53)\n" @@ -2926,7 +2924,7 @@ msgstr "" " %W número de semana do ano, Segunda-feira primeiro dia da semana " "(00..53)\n" -#: src/date.c:211 +#: src/date.c:215 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -2938,7 +2936,7 @@ msgstr "" " %y últimos dois dígitos do ano (00..99)\n" " %Y ano\n" -#: src/date.c:217 +#: src/date.c:221 #, fuzzy msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" @@ -2959,7 +2957,7 @@ msgstr "" "\n" "Por omissão, date preenche campos numéricos com zeros.\n" -#: src/date.c:226 +#: src/date.c:230 #, fuzzy msgid "" "The following optional flags may follow '%':\n" @@ -2978,7 +2976,7 @@ msgstr "" " ^ usar maiúsculas se possível\n" " # usar capitalização oposta se possível\n" -#: src/date.c:235 +#: src/date.c:239 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -2992,7 +2990,7 @@ msgstr "" "E para usar as representações locais alternativas se disponíveis, ou\n" "O para usar os símbolos numéricos locais alternativos se disponíveis.\n" -#: src/date.c:242 +#: src/date.c:246 msgid "" "\n" "Examples:\n" @@ -3006,36 +3004,36 @@ msgid "" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:275 src/dd.c:2193 src/head.c:838 src/md5sum.c:477 -#: src/md5sum.c:798 src/od.c:863 src/od.c:1914 src/pr.c:1176 src/pr.c:1372 -#: src/pr.c:1494 src/stty.c:842 src/tac.c:563 src/tail.c:343 src/tee.c:126 +#: 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 #, c-format msgid "standard input" msgstr "canal de entrada por omissão (stdin)" -#: src/date.c:303 src/date.c:523 +#: src/date.c:307 src/date.c:527 #, c-format msgid "invalid date %s" msgstr "data inválida %s" -#: src/date.c:414 src/date.c:448 +#: src/date.c:418 src/date.c:452 #, c-format msgid "multiple output formats specified" msgstr "múltiplos formatos de saída especificados" -#: src/date.c:426 +#: src/date.c:430 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "" "as opções para especificar datas para impressão são mutuamente exclusivas" -#: src/date.c:433 +#: src/date.c:437 #, c-format msgid "the options to print and set the time may not be used together" msgstr "as opções para imprimir e definir o tempo não podem ser usadas juntas" -#: src/date.c:454 +#: src/date.c:458 #, fuzzy, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -3046,23 +3044,23 @@ msgstr "" "Ao usar uma opção para especificar data(s), qualquer argumento não-opção\n" "deve ser uma expressão de formato iniciada por '+'." -#: src/date.c:531 +#: src/date.c:535 #, c-format msgid "cannot set date" msgstr "impossível alterar a data" -#: src/date.c:554 src/du.c:360 +#: src/date.c:558 src/du.c:371 #, c-format msgid "time %s is out of range" msgstr "o tempo %s está fora de alcance" #. This is a proper name. See the gettext manual, section Names. -#: src/dd.c:44 src/factor.c:43 src/rm.c:41 src/tail.c:69 src/touch.c:41 +#: 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 "" -#: src/dd.c:517 +#: src/dd.c:521 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3071,7 +3069,7 @@ msgstr "" "Utilização: %s [OPERANDO]...\n" " ou: %s OPÇÃO\n" -#: src/dd.c:522 +#: src/dd.c:526 #, fuzzy msgid "" "Copy a file, converting and formatting according to the operands.\n" @@ -3090,7 +3088,7 @@ msgstr "" " count=BLOCOS copiar apenas BLOCOS blocos de entrada\n" " ibs=BYTES ler BYTES bytes de cada vez\n" -#: src/dd.c:531 +#: src/dd.c:535 #, fuzzy msgid "" " if=FILE read from FILE instead of stdin\n" @@ -3100,7 +3098,8 @@ msgid "" " oflag=FLAGS write as per the comma separated symbol list\n" " seek=N skip N obs-sized blocks at start of output\n" " skip=N skip N ibs-sized blocks at start of input\n" -" status=noxfer suppress transfer statistics\n" +" status=WHICH WHICH info to suppress outputting to stderr;\n" +" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" msgstr "" " if=FICHEIRO ler a partir de FICHEIRO em vez de stdin\n" " iflag=OPÇÕES ler como lista de símbolos separados por vírgulas\n" @@ -3111,11 +3110,11 @@ 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:541 +#: src/dd.c:546 #, fuzzy msgid "" "\n" -"BLOCKS and BYTES may be followed by the following multiplicative suffixes:\n" +"N and BYTES may be followed by the following multiplicative suffixes:\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, and so on for T, P, E, Z, Y.\n" "\n" @@ -3130,7 +3129,7 @@ msgstr "" "Cadda símbolo CONV pode ser:\n" "\n" -#: src/dd.c:550 +#: src/dd.c:555 #, fuzzy msgid "" " ascii from EBCDIC to ASCII\n" @@ -3158,7 +3157,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:563 +#: src/dd.c:568 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3175,7 +3174,7 @@ msgstr "" "terminar\n" " fsync da mesma forma, mas escrever igualmente os meta-dados\n" -#: src/dd.c:571 +#: src/dd.c:576 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3188,77 +3187,77 @@ msgstr "" "\n" " append modo acrescentar (sentido só para saída; conv=notrunc sugerido)\n" -#: src/dd.c:578 +#: src/dd.c:583 #, fuzzy msgid " cio use concurrent I/O for data\n" msgstr " text usar E/S de texto para dados\n" -#: src/dd.c:580 +#: src/dd.c:585 msgid " direct use direct I/O for data\n" msgstr " direct usar E/S directas para dados\n" -#: src/dd.c:582 +#: src/dd.c:587 #, fuzzy msgid " directory fail unless a directory\n" msgstr " erro de pasta a menos que seja uma pasta\n" -#: src/dd.c:584 +#: src/dd.c:589 msgid " dsync use synchronized I/O for data\n" msgstr " dsync usar E/S sincronizadas para dados\n" -#: src/dd.c:586 +#: src/dd.c:591 msgid " sync likewise, but also for metadata\n" msgstr " sync da mesma forma, mas também para meta-dados\n" -#: src/dd.c:587 +#: src/dd.c:592 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr "" -#: src/dd.c:590 +#: src/dd.c:595 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock usar E/S não-bloquantes\n" -#: src/dd.c:592 +#: src/dd.c:597 msgid " noatime do not update access time\n" msgstr " noatime não actualizar o tempo de acesso\n" -#: src/dd.c:595 +#: src/dd.c:600 msgid " nocache discard cached data\n" msgstr "" -#: src/dd.c:598 +#: src/dd.c:603 msgid " noctty do not assign controlling terminal from file\n" msgstr " noctty não atribuir terminal de controlo do ficheiro\n" -#: src/dd.c:601 +#: src/dd.c:606 msgid " nofollow do not follow symlinks\n" msgstr " nofollow não seguir ligações simbólicas\n" -#: src/dd.c:603 +#: src/dd.c:608 msgid " nolinks fail if multiply-linked\n" msgstr " nolinks falhar se multiplamente ligado\n" -#: src/dd.c:605 +#: src/dd.c:610 msgid " binary use binary I/O for data\n" msgstr " binary usar E/S binárias para dados\n" -#: src/dd.c:607 +#: src/dd.c:612 msgid " text use text I/O for data\n" msgstr " text usar E/S de texto para dados\n" -#: src/dd.c:609 +#: src/dd.c:614 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:612 +#: src/dd.c:617 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:615 +#: src/dd.c:620 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:620 +#: src/dd.c:625 #, fuzzy, c-format msgid "" "\n" @@ -3287,7 +3286,7 @@ msgstr "" "Opções são:\n" "\n" -#: src/dd.c:676 +#: src/dd.c:683 #, c-format msgid "" "%<PRIuMAX>+%<PRIuMAX> records in\n" @@ -3296,21 +3295,21 @@ msgstr "" "%<PRIuMAX>+%<PRIuMAX> registos dentro\n" "%<PRIuMAX>+%<PRIuMAX> registos fora\n" -#: src/dd.c:682 +#: src/dd.c:689 #, 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:694 +#: src/dd.c:701 #, 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:712 +#: src/dd.c:720 msgid "Infinity B" msgstr "Infinitivo B" @@ -3324,83 +3323,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:725 +#: src/dd.c:733 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g s, %s/s\n" -#: src/dd.c:804 +#: src/dd.c:812 #, c-format msgid "closing input file %s" msgstr "a fechar o ficheiro de entrada %s" -#: src/dd.c:811 +#: src/dd.c:819 #, c-format msgid "closing output file %s" msgstr "a apagar o ficheiro de saída %s" -#: src/dd.c:1014 +#: src/dd.c:1022 #, fuzzy, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "erro ao entrar na pasta %s" -#: src/dd.c:1085 src/dd.c:1934 +#: src/dd.c:1093 src/dd.c:1942 #, c-format msgid "writing to %s" msgstr "a escrever em %s" -#: src/dd.c:1199 src/dd.c:1253 +#: src/dd.c:1207 src/dd.c:1261 #, c-format msgid "unrecognized operand %s" msgstr "operando desconhecido %s" -#: src/dd.c:1210 +#: src/dd.c:1218 msgid "invalid conversion" msgstr "conversão inválida" -#: src/dd.c:1213 src/dd.c:1289 +#: src/dd.c:1221 src/dd.c:1297 msgid "invalid input flag" msgstr "opção de entrada inválida" -#: src/dd.c:1216 src/dd.c:1283 src/dd.c:1295 +#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303 msgid "invalid output flag" msgstr "opção de saída inválida" -#: src/dd.c:1219 +#: src/dd.c:1227 msgid "invalid status flag" msgstr "opção de estado inválida" -#: src/dd.c:1258 src/truncate.c:312 +#: src/dd.c:1266 src/truncate.c:310 #, c-format msgid "invalid number %s" msgstr "número inválido %s" -#: src/dd.c:1340 +#: src/dd.c:1348 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "impossível combinar quaisquer dois de {ascii,ebcdic,ibm}" -#: src/dd.c:1342 +#: src/dd.c:1350 #, c-format msgid "cannot combine block and unblock" msgstr "impossível combinar bloquear e desbloquear" -#: src/dd.c:1344 +#: src/dd.c:1352 #, c-format msgid "cannot combine lcase and ucase" msgstr "impossível combinar letras minúsculas e maiúsculas" -#: src/dd.c:1346 +#: src/dd.c:1354 #, c-format msgid "cannot combine excl and nocreat" msgstr "impossível combinar excl e nocreat" -#: src/dd.c:1349 +#: src/dd.c:1357 #, fuzzy, c-format msgid "cannot combine direct and nocache" msgstr "impossível combinar excl e nocreat" -#: src/dd.c:1506 +#: src/dd.c:1514 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3409,72 +3408,72 @@ 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:1593 +#: src/dd.c:1601 #, fuzzy, c-format msgid "%s: cannot skip" msgstr "%s: impossível indexar" -#: src/dd.c:1595 src/dd.c:1614 src/dd.c:1675 +#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683 #, c-format msgid "%s: cannot seek" msgstr "%s: impossível indexar" -#: src/dd.c:1655 +#: src/dd.c:1663 #, c-format msgid "offset overflow while reading file %s" msgstr "erro de excesso de índice ao ler o ficheiro %s" -#: src/dd.c:1667 +#: src/dd.c:1675 #, 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:1671 +#: src/dd.c:1679 #, c-format msgid "cannot work around kernel bug after all" msgstr "impossível contornar erro do kernel" -#: src/dd.c:1814 +#: src/dd.c:1822 #, c-format msgid "setting flags for %s" msgstr "a definir opções para %s" -#: src/dd.c:1867 +#: src/dd.c:1875 #, c-format msgid "memory exhausted by input buffer of size %zu bytes (%s)" msgstr "" -#: src/dd.c:1881 +#: src/dd.c:1889 #, c-format msgid "memory exhausted by output buffer of size %zu bytes (%s)" msgstr "" -#: src/dd.c:1914 +#: src/dd.c:1922 #, fuzzy, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: impossível mover para a posição relativa %s" -#: src/dd.c:2125 src/dd.c:2258 +#: src/dd.c:2133 #, fuzzy, c-format -msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" +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:2138 +#: src/dd.c:2146 #, c-format msgid "fdatasync failed for %s" msgstr "erro de fdatasync para %s" -#: src/dd.c:2148 +#: src/dd.c:2156 #, c-format msgid "fsync failed for %s" msgstr "erro de fsync para %s" -#: src/dd.c:2199 src/dd.c:2228 +#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165 #, c-format -msgid "opening %s" -msgstr "a abrir %s" +msgid "failed to open %s" +msgstr "erro ao abrir %s" -#: src/dd.c:2237 +#: src/dd.c:2246 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) " @@ -3482,85 +3481,107 @@ msgid "" msgstr "" "índice muito alto: erro ao truncar para seek=%<PRIuMAX> blocos (de %lu bytes)" -#: src/dd.c:2274 src/dd.c:2280 +#: src/dd.c:2267 +#, 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 #, 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:54 src/expr.c:153 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:39 src/sleep.c:35 src/sort.c:66 +#: 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 msgid "Paul Eggert" msgstr "" -#: src/df.c:140 +#: src/df.c:172 msgid "Filesystem" msgstr "Sist.fichs" -#: src/df.c:141 +#: src/df.c:175 msgid "Type" msgstr "Tipo" -#: src/df.c:142 +#: src/df.c:178 src/df.c:542 msgid "blocks" msgstr "blocos" -#: src/df.c:142 -msgid "Inodes" -msgstr "Inodes" - -#: src/df.c:142 -msgid "Size" -msgstr "Tama" - -#: src/df.c:143 +#: src/df.c:181 msgid "Used" msgstr "Ocup" -#: src/df.c:143 -msgid "IUsed" -msgstr "IOcup" - -#: src/df.c:144 +#: src/df.c:184 msgid "Available" msgstr "Livres" -#: src/df.c:144 -msgid "IFree" -msgstr "ILivr" - -#: src/df.c:144 -msgid "Avail" -msgstr "Livre" - -#: src/df.c:145 +#: src/df.c:187 msgid "Use%" msgstr "Uso%" -#: src/df.c:145 +#: src/df.c:190 +msgid "Inodes" +msgstr "Inodes" + +#: src/df.c:193 +msgid "IUsed" +msgstr "IOcup" + +#: src/df.c:196 +msgid "IFree" +msgstr "ILivr" + +#: src/df.c:199 msgid "IUse%" msgstr "UsoI%" -#: src/df.c:145 +#: src/df.c:202 +msgid "Mounted on" +msgstr "Montado em" + +#: src/df.c:383 +#, c-format +msgid "option --output: field '%s' unknown" +msgstr "" + +#: src/df.c:390 +#, fuzzy, c-format +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 +msgid "Size" +msgstr "Tama" + +#: src/df.c:414 src/df.c:451 +msgid "Avail" +msgstr "Livre" + +#: src/df.c:474 msgid "Capacity" msgstr "Capacida" -#: src/df.c:146 -msgid "Mounted on" -msgstr "Montado em" +#. 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 +#, c-format +msgid "%s-%s" +msgstr "" -#: src/df.c:847 +#: src/df.c:1210 +#, fuzzy msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" -"\n" msgstr "" "Mostrar informação acerca do sistema de ficheiros onde cada FICHEIRO " "reside,\n" "ou todos os sistemas de ficheiros por omissão.\n" "\n" -#: src/df.c:855 +#: src/df.c:1217 #, fuzzy msgid "" " -a, --all include dummy file systems\n" @@ -3578,7 +3599,7 @@ msgstr "" " -H, --si da mesma forma, mas usar potências de 1000, não " "1024\n" -#: src/df.c:865 +#: src/df.c:1227 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3592,8 +3613,12 @@ msgstr "" " --no-sync não invocar sync antes de obter informação " "(predef.)\n" -#: src/df.c:872 +#: src/df.c:1234 +#, fuzzy msgid "" +" --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" +" or print all fields if FIELD_LIST is " +"omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" " -t, --type=TYPE limit listing to file systems of type TYPE\n" @@ -3609,20 +3634,43 @@ msgstr "" "TIPO\n" " -v (ignorado)\n" -#: src/df.c:1027 +#: src/df.c:1248 +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" +msgstr "" + +#: src/df.c:1285 +#, 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 #, 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:1075 +#: src/df.c:1500 msgid "Warning: " msgstr "Aviso: " -#: src/df.c:1077 src/stat.c:795 +#: src/df.c:1502 src/stat.c:814 msgid "cannot read table of mounted file systems" msgstr "impossível ler a tabela de sistemas de ficheiros montados" -#: src/df.c:1107 +#: src/df.c:1539 #, c-format msgid "no file systems processed" msgstr "nenhum sistema de ficheiros processado" @@ -3742,7 +3790,7 @@ msgstr "" " %s /usr/bin/sort Mostrar \"/usr/bin\".\n" " %s stdio.h Mostrar \".\".\n" -#: src/du.c:260 src/sort.c:390 src/wc.c:112 +#: src/du.c:270 src/sort.c:394 src/wc.c:112 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3751,17 +3799,18 @@ msgstr "" "Utilização: %s [OPÇÃO]... [FICHEIRO]...\n" " ou: %s [OPÇÃO]... --files0-from=F\n" -#: src/du.c:264 -msgid "" -"Summarize disk usage of each FILE, recursively for directories.\n" -"\n" +#: src/du.c:274 +#, 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:271 +#: src/du.c:280 #, fuzzy msgid "" +" -0, --null end each output line with 0 byte rather than " +"newline\n" " -a, --all write counts for all files, not just directories\n" " --apparent-size print apparent sizes, rather than disk usage; " "although\n" @@ -3779,7 +3828,7 @@ msgstr "" "(esparsos),\n" " fragmentação interna, blocos indirectos e afins\n" -#: src/du.c:279 +#: src/du.c:289 #, fuzzy msgid "" " -B, --block-size=SIZE scale sizes by SIZE before printing them. E.g.,\n" @@ -3789,6 +3838,11 @@ msgid "" " -c, --total produce a grand total\n" " -D, --dereference-args dereference only symlinks that are listed on the\n" " command line\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 "" " -B, --block-size=TAMANHO usar blocos de TAMANHO bytes\n" " -b, --bytes equivalente a '--apparent-size --block-size=1'\n" @@ -3796,7 +3850,7 @@ msgstr "" " -D, --dereference-args desreferenciar só ligações simbólicas listadas na\n" " linha de comandos\n" -#: src/du.c:288 +#: src/du.c:302 #, fuzzy msgid "" " --files0-from=F summarize disk usage of the NUL-terminated file\n" @@ -3805,7 +3859,6 @@ msgid "" " -H equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" --si like -h, but use powers of 1000 not 1024\n" msgstr "" " --files0-from=F resumir util. de disco dos nomes de ficheiro " "terminados\n" @@ -3816,9 +3869,11 @@ 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:297 +#: src/du.c:310 +#, fuzzy 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 "" @@ -3827,14 +3882,13 @@ msgstr "" "persistentemente\n" " -m como --block-size=1M\n" -#: src/du.c:302 +#: src/du.c:316 +#, fuzzy msgid "" -" -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " "default)\n" -" -0, --null end each output line with 0 byte rather than " -"newline\n" " -S, --separate-dirs 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 desreferenciar todas as ligações simbólicas\n" @@ -3843,32 +3897,11 @@ msgstr "" " -S, --separate-dirs não incuir tamanhos das pastas\n" " -s, --summarize mostrar apenas um total para cada argumento\n" -#: src/du.c:309 -#, 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" - -#: src/du.c:318 +#: src/du.c:322 #, fuzzy msgid "" +" -t, --threshold=SIZE exclude entries smaller than SIZE if positive,\n" +" or entries greater than SIZE if negative\n" " --time show time of the last modification of any file in " "the\n" " directory, or any of its subdirectories\n" @@ -3888,65 +3921,74 @@ msgstr "" " full-iso, long-iso, iso, +FORMATO\n" " FORMATO é interpretado como 'date'\n" -#: src/du.c:375 +#: src/du.c:333 +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 msgid "Infinity" msgstr "Infinitivo B" -#: src/du.c:600 +#: src/du.c:507 +#, c-format +msgid "mount point %s already traversed" +msgstr "" + +#: src/du.c:624 #, fuzzy, c-format msgid "fts_read failed: %s" msgstr "fts_read falhou" -#: src/du.c:724 +#: src/du.c:780 #, c-format msgid "invalid maximum depth %s" msgstr "profundidade máxima %s inválida" -#: src/du.c:817 +#: src/du.c:809 +#, fuzzy, c-format +msgid "invalid --threshold argument '-0'" +msgstr "argumento inválido %s" + +#: src/du.c:887 #, 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:824 +#: src/du.c:894 #, 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:830 +#: src/du.c:900 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "aviso: resumo conflicte com --max-depth=%lu" -#: src/du.c:896 src/sort.c:4479 src/wc.c:668 +#: src/du.c:966 src/sort.c:4533 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:949 src/md5sum.c:587 src/od.c:903 src/tac.c:239 src/tac.c:350 -#: src/tac.c:506 src/tac.c:586 src/wc.c:733 +#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 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:963 src/sort.c:4508 src/wc.c:747 +#: src/du.c:1040 src/sort.c:4562 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:980 src/du.c:988 src/wc.c:760 src/wc.c:768 +#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768 msgid "invalid zero-length file name" msgstr "nome de ficheiro vazio inválido'" -#: src/du.c:1007 src/head.c:149 src/head.c:262 src/head.c:334 src/head.c:538 -#: src/head.c:620 src/head.c:692 src/head.c:750 src/head.c:774 src/tail.c:412 -#: src/tail.c:500 src/tail.c:549 src/tail.c:642 src/tail.c:770 src/tail.c:818 -#: src/tail.c:855 src/tail.c:1782 src/tail.c:1812 src/uniq.c:395 -#, c-format -msgid "error reading %s" -msgstr "erro ao ler %s" - -#: src/du.c:1010 src/ls.c:2649 src/wc.c:791 +#: src/du.c:1088 src/ls.c:2649 src/wc.c:791 msgid "total" msgstr "total" @@ -4043,10 +4085,12 @@ msgid "Usage: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n" msgstr "Utilização: %s [OPÇÃO]... [-] [NOME=VALOR]... [COMANDO [ARG]...]\n" #: src/env.c:55 +msgid "Set each NAME to VALUE in the environment and run COMMAND.\n" +msgstr "" + +#: src/env.c:61 #, fuzzy msgid "" -"Set each NAME to VALUE in the environment and run COMMAND.\n" -"\n" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with 0 byte rather than newline\n" " -u, --unset=NAME remove variable from the environment\n" @@ -4056,7 +4100,7 @@ msgstr "" " -i, --ignore-environment começar com um ambiente vazio\n" " -u, --unset=NOME retirar variável NOME do ambiente\n" -#: src/env.c:64 +#: src/env.c:68 msgid "" "\n" "A mere - implies -i. If no COMMAND, print the resulting environment.\n" @@ -4064,32 +4108,32 @@ msgstr "" "\n" "Um mero - implica -i. Sem COMANDO, mostrar o ambiente resultante.\n" -#: src/env.c:120 +#: src/env.c:124 #, fuzzy, c-format msgid "cannot unset %s" msgstr "impossível analisar %s" -#: src/env.c:131 +#: src/env.c:135 #, fuzzy, c-format msgid "cannot set %s" msgstr "impossível analisar %s" -#: src/env.c:148 +#: src/env.c:152 #, c-format msgid "cannot specify --null (-0) with command" msgstr "" #: 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" -"\n" msgstr "" "Converter TABs em cada FICHEIRO para espaços, escrevendo na saída padrão.\n" "Sem FICHEIRO, ou quando FICHEIRO é -, ler a entrada padrão.\n" "\n" -#: src/expand.c:115 +#: src/expand.c:114 msgid "" " -i, --initial do not convert tabs after non blanks\n" " -t, --tabs=NUMBER have tabs NUMBER characters apart, not 8\n" @@ -4097,33 +4141,33 @@ msgstr "" " -i, --initial não converter TABs após caracteres não-brancos\n" " -t, --tabs=NÚMERO considerar TABs de NÚMERO caracteres, não 8\n" -#: src/expand.c:119 +#: src/expand.c:118 msgid "" " -t, --tabs=LIST use comma separated list of explicit tab positions\n" msgstr "" " -t, --tabs=LISTA usar lista explícita de TABs separ. por vírgulas\n" -#: src/expand.c:172 src/unexpand.c:191 +#: src/expand.c:171 src/unexpand.c:190 #, c-format msgid "tab stop is too large %s" msgstr "o tabulador é demasiado grande %s" -#: src/expand.c:180 src/unexpand.c:199 +#: src/expand.c:179 src/unexpand.c:198 #, c-format msgid "tab size contains invalid character(s): %s" msgstr "o tamanho do tabulador contém caracteres inválidos: %s" -#: src/expand.c:206 src/unexpand.c:225 +#: src/expand.c:205 src/unexpand.c:224 #, c-format msgid "tab size cannot be 0" msgstr "tamanho de TAB não pode ser 0" -#: src/expand.c:208 src/unexpand.c:227 +#: src/expand.c:207 src/unexpand.c:226 #, c-format msgid "tab sizes must be ascending" msgstr "tamanhos de TABs devem ser crescentes" -#: src/expand.c:326 src/expand.c:345 src/unexpand.c:374 src/unexpand.c:419 +#: 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 "linha de entrada demasiado grande" @@ -4283,12 +4327,12 @@ msgstr "erro no analisador de expressões regulares" msgid "non-integer argument" msgstr "argumento não numérico" -#: src/expr.c:793 src/truncate.c:316 +#: src/expr.c:793 src/truncate.c:314 #, c-format msgid "division by zero" msgstr "divisão por zero" -#: src/expr.c:887 src/sort.c:2029 +#: src/expr.c:887 src/sort.c:2044 #, fuzzy, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "Defina LC_ALL='C' para contornar o problema." @@ -4298,25 +4342,32 @@ msgstr "Defina LC_ALL='C' para contornar o problema." msgid "the strings compared were %s and %s" msgstr "As expressões comparadas foram %s e %s." -#: src/factor.c:449 -msgid "using arbitrary-precision arithmetic" +#. This is a proper name. See the gettext manual, section Names. +#: src/factor.c:111 +msgid "Niels Moller" msgstr "" -#: src/factor.c:460 -msgid "using single-precision arithmetic" +#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459 +#, c-format +msgid "Lucas prime test failure. This should not happen" msgstr "" -#: src/factor.c:465 src/od.c:1640 src/od.c:1709 +#: src/factor.c:2092 #, c-format -msgid "%s is too large" -msgstr "%s é muito grande" +msgid "squfof queue overflow" +msgstr "" -#: src/factor.c:469 +#: src/factor.c:2419 #, c-format msgid "%s is not a valid positive integer" msgstr "%s não é um inteiro positivo válido" -#: src/factor.c:494 +#: src/factor.c:2442 src/od.c:1646 src/od.c:1715 +#, c-format +msgid "%s is too large" +msgstr "%s é muito grande" + +#: src/factor.c:2454 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4325,7 +4376,7 @@ msgstr "" "Utilização: %s [NÚMERO]...\n" " ou: %s OPÇÃO\n" -#: src/factor.c:499 +#: src/factor.c:2459 #, fuzzy msgid "" "Print the prime factors of each specified integer NUMBER. If none\n" @@ -4353,21 +4404,20 @@ msgid "cannot stat current directory (now %s)" msgstr "impossível obter a pasta actual (agora %s)" #. This is a proper name. See the gettext manual, section Names. -#: src/fmt.c:37 +#: src/fmt.c:38 msgid "Ross Paterson" msgstr "" -#: src/fmt.c:269 +#: src/fmt.c:270 #, fuzzy, c-format msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n" msgstr "Utilização: %s [-DÍGITOS] [OPÇÃO]... [FICHEIRO]...\n" -#: src/fmt.c:270 +#: 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" -"\n" msgstr "" "Reformatar cada parágrafo em FICHEIRO(s), escrevendo para a saída padrão.\n" "Sem FICHEIRO ou se FICHEIRO for '-', ler a entrada padrão.\n" @@ -4386,8 +4436,8 @@ msgstr "" " inserindo o prefixo nas linhas reformatadas\n" " -s, --split-only separar linhas longas, mas não reencher\n" -#: src/fmt.c:285 -#, fuzzy, c-format +#: src/fmt.c:287 +#, fuzzy, 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" @@ -4400,7 +4450,7 @@ msgstr "" " -w, --width=LARGURA largura máxima de linha (predefinida 75 " "colunas)\n" -#: src/fmt.c:357 +#: src/fmt.c:359 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -4409,23 +4459,23 @@ msgstr "" "opção inválida -- %c; -LARGURA é reconhecida apenas quando é a primeira\n" "opção; use -w N ao invés" -#: src/fmt.c:403 src/fmt.c:414 +#: src/fmt.c:405 src/fmt.c:416 #, c-format msgid "invalid width: %s" msgstr "largura inválida: %s" #: src/fold.c:70 +#, fuzzy msgid "" "Wrap input lines in each FILE (standard input by default), writing to\n" "standard output.\n" -"\n" msgstr "" "Envolver as linhas de entrada em cada FICHEIRO (entrada padrão por " "omissão),\n" "escrelendo para a saída padrão.\n" "\n" -#: src/fold.c:78 +#: src/fold.c:77 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4435,13 +4485,13 @@ msgstr "" " -s, --spaces separar nos espaços\n" " -w, --width=LARGURA usar LARGURA colunas em vez de 80\n" -#: src/fold.c:289 src/pr.c:836 +#: src/fold.c:288 src/pr.c:832 #, c-format 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:75 +#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 #: src/truncate.c:37 msgid "Padraig Brady" msgstr "" @@ -4457,17 +4507,17 @@ msgid "" "\n" msgstr "" -#: src/group-list.c:69 src/id.c:345 src/setuidgid.c:184 +#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184 #, 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:350 +#: src/group-list.c:74 src/id.c:370 #, c-format msgid "failed to get groups for the current process" msgstr "erro ao obter os grupos do processo corrente" -#: src/group-list.c:104 +#: src/group-list.c:114 #, c-format msgid "cannot find name for group ID %lu" msgstr "impossível encontrar o nome do grupo com ID %lu" @@ -4508,17 +4558,17 @@ msgid "%s: no such user" msgstr "%s: Utilizador inexistente" #: 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" -"\n" msgstr "" "Mostrar as primeiras 10 linhas de cada FICHEIRO.\n" "Com mais de um FICHEIRO, preceder cada linha com o nome do ficheiro.\n" "Sem FICHEIRO ou quando FICHEIRO é -, ler a entrada padrão.\n" -#: src/head.c:118 +#: src/head.c:117 #, fuzzy msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" @@ -4537,7 +4587,7 @@ msgstr "" "últimas\n" " N linhas de cada ficheiro\n" -#: src/head.c:126 +#: src/head.c:125 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4545,7 +4595,7 @@ msgstr "" " -q, --quiet, --silent nuncar mostrar cabeçalhos com nomes de ficheiros\n" " -v, --verbose mostrar sempre cabeçalhos com nomes de ficheiros\n" -#: src/head.c:132 +#: src/head.c:131 #, fuzzy msgid "" "\n" @@ -4558,58 +4608,58 @@ 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:152 -#, c-format -msgid "error writing %s" -msgstr "erro ao escrever %s" - -#: src/head.c:155 +#: src/head.c:154 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: o ficheiro encolheu demasiado" -#: src/head.c:228 src/head.c:1044 +#: src/head.c:227 src/head.c:1051 #, c-format msgid "%s: number of bytes is too large" msgstr "%s: número de bytes muito grande" -#: src/head.c:441 +#: 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:613 src/head.c:684 src/tail.c:450 +#: src/head.c:612 src/head.c:691 src/tail.c:449 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: impossível deslocar para a posição %s" -#: src/head.c:791 +#: src/head.c:673 +#, fuzzy, c-format +msgid "%s: failed to reset file pointer" +msgstr "%s: impossível remover" + +#: src/head.c:798 #, c-format msgid "cannot reposition file pointer for %s" msgstr "impossível reposicionar apontador de ficheiro para %s" -#: src/head.c:878 +#: src/head.c:885 #, 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:879 +#: src/head.c:886 msgid "number of lines" msgstr "número de linhas" -#: src/head.c:879 +#: src/head.c:886 msgid "number of bytes" msgstr "número de bytes" -#: src/head.c:886 src/tail.c:1947 +#: src/head.c:893 src/tail.c:1947 msgid "invalid number of lines" msgstr "número de linhas inválido" -#: src/head.c:887 src/tail.c:1948 +#: src/head.c:894 src/tail.c:1948 msgid "invalid number of bytes" msgstr "número de bytes inválido" -#: src/head.c:974 src/head.c:1032 +#: src/head.c:981 src/head.c:1039 #, c-format msgid "invalid trailing option -- %c" msgstr "opção final inválida -- %c" @@ -4728,86 +4778,86 @@ msgstr "impossível obter contexto do processo" msgid "cannot get effective UID" msgstr "impossível desreferenciar %s" -#: src/id.c:289 +#: src/id.c:311 #, fuzzy, c-format -msgid "cannot find name for user ID %lu" +msgid "cannot find name for user ID %s" msgstr "impossível encontrar o nome do utilizador com ID %lu" -#: src/id.c:309 +#: src/id.c:329 #, c-format -msgid "uid=%lu" +msgid "uid=%s" msgstr "" -#: src/id.c:314 +#: src/id.c:334 #, c-format -msgid " gid=%lu" +msgid " gid=%s" msgstr "" -#: src/id.c:321 +#: src/id.c:341 #, c-format -msgid " euid=%lu" +msgid " euid=%s" msgstr "" -#: src/id.c:329 +#: src/id.c:349 #, c-format -msgid " egid=%lu" +msgid " egid=%s" msgstr "" -#: src/id.c:357 +#: src/id.c:377 msgid " groups=" msgstr " grupos=" -#: src/id.c:373 +#: src/id.c:393 #, fuzzy, c-format msgid " context=%s" msgstr "contexto inválido: %s" -#: src/install.c:372 +#: src/install.c:373 #, c-format msgid "warning: %s: failed to change context to %s" msgstr "aviso: %s: erro ao alterar contexto para %s" -#: src/install.c:413 +#: src/install.c:414 #, c-format msgid "creating directory %s" msgstr "a criar a pasta %s" -#: src/install.c:481 +#: src/install.c:482 #, c-format msgid "cannot change ownership of %s" msgstr "impossível alterar o dono de %s" -#: src/install.c:505 +#: src/install.c:506 #, c-format msgid "cannot set time stamps for %s" msgstr "impossível alterar marcas de tempo de %s" -#: src/install.c:526 src/split.c:412 src/timeout.c:387 +#: src/install.c:527 src/split.c:426 src/timeout.c:439 #, c-format msgid "fork system call failed" msgstr "erro na chamada de sistema fork" -#: src/install.c:530 +#: src/install.c:531 #, fuzzy, c-format msgid "cannot run %s" msgstr "impossível correr strip" -#: src/install.c:534 +#: src/install.c:535 #, c-format msgid "waiting for strip" msgstr "a aguardar por strip" -#: src/install.c:536 +#: src/install.c:537 #, c-format msgid "strip process terminated abnormally" msgstr "o processo strip terminou anormalmente" -#: src/install.c:557 +#: src/install.c:558 #, c-format msgid "invalid user %s" msgstr "utilizador inválido %s" -#: src/install.c:593 +#: src/install.c:594 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -4820,7 +4870,7 @@ msgstr "" " ou: %s [OPÇÃO]... -t PASTA ORIGEM...\n" " ou: %s [OPÇÃO]... -d PASTA...\n" -#: src/install.c:600 +#: src/install.c:601 #, fuzzy msgid "" "\n" @@ -4833,7 +4883,6 @@ msgid "" "In the first three forms, copy SOURCE to DEST or multiple SOURCE(s) to\n" "the existing DIRECTORY, while setting permission modes and owner/group.\n" "In the 4th form, create all components of the given DIRECTORY(ies).\n" -"\n" msgstr "" "Nas primeiras 3 formas, copiar ORIGEM para DESTINO ou múltiplas ORIGEM(ns)\n" "para a PASTA existente, e também definir modos de permissão e dono/grupo.\n" @@ -4912,57 +4961,57 @@ msgstr "" " -Z, --context=CONTEXTO alterar cont. de segurança SELinux de fich. e " "pastas\n" -#: src/install.c:858 +#: src/install.c:859 #, 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:868 +#: 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:885 +#: src/install.c:886 #, 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:888 +#: src/install.c:889 #, 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:892 +#: 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:946 src/mkdir.c:202 src/stdbuf.c:327 +#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326 #, c-format msgid "invalid mode %s" msgstr "modo inválido %s" -#: src/install.c:953 +#: src/install.c:954 #, c-format msgid "WARNING: ignoring --strip-program option as -s option was not specified" msgstr "" -#: src/install.c:958 +#: src/install.c:959 #, 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:965 +#: src/install.c:966 #, 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:971 +#: src/install.c:972 #, c-format msgid "" "the --compare (-C) option is ignored when you specify a mode with non-" @@ -4970,7 +5019,7 @@ msgid "" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/join.c:40 src/sort.c:65 +#: src/join.c:40 src/sort.c:66 msgid "Mike Haertel" msgstr "" @@ -5064,7 +5113,7 @@ msgstr "" #: src/join.c:403 #, c-format -msgid "%s:%ju: is not sorted: %.*s" +msgid "%s:%<PRIuMAX>: is not sorted: %.*s" msgstr "" #: src/join.c:840 src/join.c:1038 @@ -5092,12 +5141,12 @@ msgstr "campos de junção inválidos %lu, %lu" msgid "conflicting empty-field replacement strings" msgstr "expressões de substituição de campo vazio em conflicto" -#: src/join.c:1101 src/sort.c:4414 +#: src/join.c:1101 src/sort.c:4468 #, c-format msgid "multi-character tab %s" msgstr "tabulador multi-carácter %s" -#: src/join.c:1105 src/sort.c:4419 +#: src/join.c:1105 src/sort.c:4473 #, c-format msgid "incompatible tabs" msgstr "tabuladores incompatíveis" @@ -5119,14 +5168,13 @@ msgstr "" " ou: %s -t [SINAL]...\n" #: src/kill.c:82 -msgid "" -"Send signals to processes, or list signals.\n" -"\n" +#, fuzzy +msgid "Send signals to processes, or list signals.\n" msgstr "" "Enviar sinais a processos ou listar sinais.\n" "\n" -#: src/kill.c:89 +#: src/kill.c:88 msgid "" " -s, --signal=SIGNAL, -SIGNAL\n" " specify the name or number of the signal to be sent\n" @@ -5139,7 +5187,7 @@ msgstr "" " -l, --list listar nomes dos sinais ou converter para/de números\n" " -t, --table exibir uma tabela de informao de informação sinais\n" -#: src/kill.c:97 +#: src/kill.c:96 #, fuzzy msgid "" "\n" @@ -5152,32 +5200,32 @@ msgstr "" "um estado de saída de um processo terminado por um sinal.\n" "PID é um inteiro; se negativo identifica um grupo de processos.\n" -#: src/kill.c:206 +#: src/kill.c:205 #, c-format msgid "%s: invalid process id" msgstr "%s: número de processo inválido" -#: src/kill.c:260 +#: src/kill.c:259 #, c-format msgid "invalid option -- %c" msgstr "opção inválida -- %c" -#: src/kill.c:269 +#: src/kill.c:268 #, c-format msgid "%s: multiple signals specified" msgstr "%s: múltiplos sinais especificados" -#: src/kill.c:283 +#: src/kill.c:282 #, c-format msgid "multiple -l or -t options specified" msgstr "múltiplas opções -l ou -t especificadas" -#: src/kill.c:300 +#: src/kill.c:299 #, c-format msgid "cannot combine signal with -l or -t" msgstr "impossível combinar sinal com -l ou -t" -#: src/kill.c:306 +#: src/kill.c:305 #, c-format msgid "no process ID specified" msgstr "número de processo não especificado" @@ -5288,7 +5336,6 @@ msgid "" "When creating hard links, each TARGET must exist. Symbolic links\n" "can hold arbitrary text; if later resolved, a relative link is\n" "interpreted in relation to its parent directory.\n" -"\n" msgstr "" "Na primeira forma, criar uma ligação para DESTINO com nome NOME_LIGAÇÃO.\n" "Na segunda forma, criar uma ligação para DESTINO na pasta actual.\n" @@ -5298,7 +5345,7 @@ msgstr "" "Ao criar ligações persistentes, cada DESTINO deve existir.\n" "\n" -#: src/ln.c:395 +#: src/ln.c:394 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -5321,7 +5368,7 @@ msgstr "" "util.)\n" " -f, --force remover ficheiros de destino existentes\n" -#: src/ln.c:403 +#: src/ln.c:402 #, fuzzy msgid "" " -i, --interactive prompt whether to remove destinations\n" @@ -5340,7 +5387,7 @@ msgstr "" " -s, --symbolic criar ligações simbólicas em vez de " "persistentes\n" -#: src/ln.c:412 +#: src/ln.c:411 #, fuzzy msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -5356,24 +5403,10 @@ 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:428 -#, 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 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" - -#: src/ln.c:435 +#: src/ln.c:433 #, 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 "" @@ -5444,7 +5477,7 @@ msgstr "a ignorar largura inválida na variável de ambiente COLUMNS: %s" 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:1976 +#: src/ls.c:1750 src/ptx.c:1975 #, c-format msgid "invalid line width: %s" msgstr "largura de linha inválida: %s" @@ -5508,7 +5541,7 @@ msgstr "a ler a pasta %s" msgid "closing directory %s" msgstr "a fechar a pasta %s" -#: src/ls.c:3301 +#: src/ls.c:3302 #, c-format msgid "cannot compare file names %s and %s" msgstr "impossível comparar os nomes de ficheiro %s e %s" @@ -5518,13 +5551,12 @@ msgstr "impossível comparar os nomes de ficheiro %s e %s" msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" -"\n" msgstr "" "Listar informação acerca dos FICHEIROs (a pasta actual por omissão).\n" "Ordenar entradas alfabeticamente se nenhuma de -cftuvSUX e --sort.\n" "\n" -#: src/ls.c:4729 +#: src/ls.c:4728 #, fuzzy msgid "" " -a, --all do not ignore entries starting with .\n" @@ -5539,7 +5571,7 @@ msgstr "" " -b, --escape mostrar sinal. octais para caract. não " "gráficos\n" -#: src/ls.c:4735 +#: src/ls.c:4734 #, fuzzy msgid "" " --block-size=SIZE scale sizes by SIZE before printing them. E." @@ -5560,7 +5592,7 @@ msgstr "" " com -l: mostrar ctime e ordenar por nome\n" " senão: ordenar por ctime\n" -#: src/ls.c:4745 +#: src/ls.c:4744 #, fuzzy msgid "" " -C list entries by columns\n" @@ -5583,7 +5615,7 @@ msgstr "" " -D, --dired gerar saída desenhada para o modo de pastas " "Emacs\n" -#: src/ls.c:4753 +#: src/ls.c:4752 #, fuzzy msgid "" " -f do not sort, enable -aU, disable -ls --color\n" @@ -5603,11 +5635,11 @@ msgstr "" " uma coluna -1, verboso -l, vertical -C\n" " --full-time como -l --time-style=full-iso\n" -#: src/ls.c:4761 +#: src/ls.c:4760 msgid " -g like -l, but do not list owner\n" msgstr " -g como -l, mas não listar o dono\n" -#: src/ls.c:4764 +#: src/ls.c:4763 msgid "" " --group-directories-first\n" " group directories before files.\n" @@ -5620,7 +5652,7 @@ msgstr "" " uso de --sort=none (-U) desactiva " "agrupamento\n" -#: src/ls.c:4770 +#: src/ls.c:4769 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" @@ -5633,7 +5665,7 @@ msgstr "" " (ex., 1K 234M 2G)\n" " --si igual, mas usar potências de 1000, não 1024\n" -#: src/ls.c:4776 +#: src/ls.c:4775 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5653,7 +5685,7 @@ msgstr "" " --hide=PADRÃO não listar entradas que correspondam ao PADRÃO\n" " (redefinido por -a ou -A)\n" -#: src/ls.c:4786 +#: src/ls.c:4785 #, fuzzy msgid "" " --indicator-style=WORD append indicator with style WORD to entry " @@ -5673,7 +5705,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:4796 +#: src/ls.c:4795 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5690,7 +5722,7 @@ msgstr "" " vez da própria ligação\n" " -m encher largura com entradas separadas por ,\n" -#: src/ls.c:4804 +#: src/ls.c:4803 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. " @@ -5709,7 +5741,7 @@ msgstr "" " -p, --indicator-style=slash\n" " acrescentar indicador / a pastas\n" -#: src/ls.c:4812 +#: src/ls.c:4811 #, fuzzy msgid "" " -q, --hide-control-chars print ? instead of non graphic characters\n" @@ -5729,7 +5761,7 @@ msgstr "" " literal, locale, shell, shell-always, c, " "escape\n" -#: src/ls.c:4821 +#: src/ls.c:4820 #, fuzzy msgid "" " -r, --reverse reverse order while sorting\n" @@ -5741,7 +5773,7 @@ msgstr "" " -R, --recursive listar subpastas recursivamente\n" " -s, --size mostrar o tamanho de cada ficheiro, em blocos\n" -#: src/ls.c:4826 +#: src/ls.c:4825 msgid "" " -S sort by file size\n" " --sort=WORD sort by WORD instead of name: none -U,\n" @@ -5762,7 +5794,7 @@ msgstr "" "chave\n" " de ordenação se --sort=time\n" -#: src/ls.c:4836 +#: src/ls.c:4835 #, fuzzy msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" @@ -5786,7 +5818,7 @@ msgstr "" "toma\n" " efeito apenas fora da localização POSIX\n" -#: src/ls.c:4845 +#: src/ls.c:4844 #, fuzzy msgid "" " -t sort by modification time, newest first\n" @@ -5795,7 +5827,7 @@ 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:4849 +#: src/ls.c:4848 #, fuzzy msgid "" " -u with -lt: sort by, and show, access time\n" @@ -5812,7 +5844,7 @@ msgstr "" " -U não ordenar; listar entradas na ordem da pasta\n" " -v ordenar por versão\n" -#: src/ls.c:4856 +#: src/ls.c:4855 msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" @@ -5827,7 +5859,7 @@ msgstr "" " -Z, --context mostrar contextos de segurança SELinux\n" " -1 listar um ficheiro por linha\n" -#: src/ls.c:4866 +#: src/ls.c:4865 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5836,7 +5868,7 @@ msgid "" "variable can change the settings. Use the dircolors command to set it.\n" msgstr "" -#: src/ls.c:4873 +#: src/ls.c:4872 msgid "" "\n" "Exit status:\n" @@ -5860,7 +5892,7 @@ msgstr "" msgid "David Madore" msgstr "" -#: src/md5sum.c:162 +#: src/md5sum.c:164 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -5873,7 +5905,7 @@ msgstr "" "Sem FICHEIRO, ou quando FICHEIRO é -, ler a entrada padrão.\n" "\n" -#: src/md5sum.c:172 +#: src/md5sum.c:174 #, fuzzy msgid "" " -b, --binary read in binary mode (default unless reading tty " @@ -5882,30 +5914,34 @@ msgstr "" " -b, --binary ler em modo binário (predefinido excepto ao ler " "stdin)\n" -#: src/md5sum.c:176 +#: src/md5sum.c:178 #, fuzzy msgid " -b, --binary read in binary mode\n" msgstr " -b, --binary ler em modo binário\n" -#: src/md5sum.c:179 +#: src/md5sum.c:181 #, fuzzy, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr "" " -c, --check ler somas de %s dos FICHEIROs e verificá-las\n" -#: src/md5sum.c:183 +#: src/md5sum.c:184 +msgid " --tag create a BSD-style checksum\n" +msgstr "" + +#: src/md5sum.c:188 #, fuzzy msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" " -t, --text ler em modo de texto (predefinido ao ler stdin)\n" -#: src/md5sum.c:187 +#: src/md5sum.c:192 #, fuzzy msgid " -t, --text read in text mode (default)\n" msgstr " -t, --text ler em modo de texto (predefinido)\n" -#: src/md5sum.c:190 +#: src/md5sum.c:195 #, fuzzy msgid "" "\n" @@ -5921,12 +5957,12 @@ msgstr "" " -w, --warn avisar linhas de somas de controlo mal formatadas\n" "\n" -#: src/md5sum.c:198 +#: src/md5sum.c:203 msgid "" " --strict with --check, exit non-zero for any invalid input\n" msgstr "" -#: src/md5sum.c:203 +#: src/md5sum.c:208 #, fuzzy, c-format msgid "" "\n" @@ -5943,78 +5979,88 @@ 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:502 +#: src/md5sum.c:523 #, c-format msgid "%s: too many checksum lines" msgstr "%s: demasiadas linhas de somas de controlo" -#: src/md5sum.c:526 +#: src/md5sum.c:547 #, c-format msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line" msgstr "%s: %<PRIuMAX>: linha de soma de controlo %s mal formatada" -#: src/md5sum.c:551 +#: src/md5sum.c:572 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: ERRO de abertura ou leitura\n" -#: src/md5sum.c:574 +#: src/md5sum.c:595 msgid "FAILED" msgstr "ERRO" -#: src/md5sum.c:576 +#: src/md5sum.c:597 msgid "OK" msgstr "OK" -#: src/md5sum.c:600 +#: src/md5sum.c:621 #, 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:610 +#: src/md5sum.c:631 #, 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:618 +#: src/md5sum.c:639 #, 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:626 +#: src/md5sum.c:647 #, 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:704 +#: src/md5sum.c:760 +#, c-format +msgid "--tag does not support --text mode" +msgstr "" + +#: src/md5sum.c:766 +#, 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 #, 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:712 +#: src/md5sum.c:781 #, 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:719 +#: src/md5sum.c:788 #, 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:726 +#: src/md5sum.c:795 #, 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:733 +#: src/md5sum.c:802 #, 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" @@ -6025,14 +6071,13 @@ msgid "Usage: %s [OPTION]... DIRECTORY...\n" msgstr "Utilização: %s [OPÇÃO]... PASTA...\n" #: src/mkdir.c:57 -msgid "" -"Create the DIRECTORY(ies), if they do not already exist.\n" -"\n" +#, 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:64 +#: src/mkdir.c:63 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" @@ -6048,7 +6093,7 @@ msgstr "" " -Z, --context=CTX alterar o context de segurança SELinux de cada pasta\n" " criada para CTX\n" -#: src/mkdir.c:169 +#: src/mkdir.c:168 #, c-format msgid "created directory %s" msgstr "pasta %s criada" @@ -6059,31 +6104,30 @@ msgid "Usage: %s [OPTION]... NAME...\n" msgstr "Utilização: %s [OPÇÃO]... NOME...\n" #: src/mkfifo.c:52 -msgid "" -"Create named pipes (FIFOs) with the given NAMEs.\n" -"\n" +#, 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:59 src/mknod.c:61 +#: src/mkfifo.c:58 src/mknod.c:60 #, 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:62 +#: src/mkfifo.c:61 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" -#: src/mkfifo.c:122 src/mknod.c:128 +#: src/mkfifo.c:121 src/mknod.c:127 #, c-format msgid "invalid mode" msgstr "modo inválido" -#: src/mkfifo.c:127 src/mknod.c:133 +#: src/mkfifo.c:126 src/mknod.c:132 #, c-format msgid "mode must specify only file permission bits" msgstr "modo deve especificar apenas bits de permissão de ficheiro" @@ -6094,19 +6138,18 @@ msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n" msgstr "Utilização: %s [OPÇÃO]... NOME TIPO [MAIOR MENOR]\n" #: src/mknod.c:54 -msgid "" -"Create the special file NAME of the given TYPE.\n" -"\n" +#, 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:64 +#: 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:69 +#: src/mknod.c:68 msgid "" "\n" "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n" @@ -6121,7 +6164,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:76 +#: src/mknod.c:75 msgid "" "\n" " b create a block (buffered) special file\n" @@ -6133,40 +6176,40 @@ msgstr "" " c, u criar um ficheiro especial de caracteres (não protegido)\n" " p criar um FIFO\n" -#: src/mknod.c:151 +#: src/mknod.c:150 msgid "Special files require major and minor device numbers." msgstr "Ficheiros especiais requerem números maior e menor do dispositivo." -#: src/mknod.c:161 +#: src/mknod.c:160 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:177 +#: src/mknod.c:176 #, c-format msgid "block special files not supported" msgstr "ficheiros especiais de tipo bloco não suportados" -#: src/mknod.c:186 +#: src/mknod.c:185 #, c-format msgid "character special files not supported" msgstr "ficheiros especiais de tipo caracter não suportados" -#: src/mknod.c:202 +#: src/mknod.c:201 #, c-format msgid "invalid major device number %s" msgstr "número maior de dispositivo inválido %s" -#: src/mknod.c:207 +#: src/mknod.c:206 #, c-format msgid "invalid minor device number %s" msgstr "número menor de dispositivo inválido %s" -#: src/mknod.c:212 +#: src/mknod.c:211 #, c-format msgid "invalid device %s %s" msgstr "dispositivo inválido %s %s" -#: src/mknod.c:226 +#: src/mknod.c:225 #, c-format msgid "invalid device type %s" msgstr "tipo de dispositivo inválido %s" @@ -6241,60 +6284,59 @@ msgstr "" " relativo a uma pasta: $TMPDIR, se definida; senão a\n" " pasta especificada via -p; senão /tmp [obsoleto]\n" -#: src/mktemp.c:222 +#: 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:228 +#: src/mktemp.c:229 #, c-format msgid "too many templates" msgstr "demasiados moldes (templates)" -#: src/mktemp.c:248 +#: src/mktemp.c:249 #, c-format msgid "with --suffix, template %s must end in X" msgstr "" -#: src/mktemp.c:273 src/split.c:1117 +#: src/mktemp.c:274 src/split.c:1130 #, fuzzy, c-format msgid "invalid suffix %s, contains directory separator" msgstr "molde (template) inválido, %s, contém separador de pastas" -#: src/mktemp.c:278 +#: src/mktemp.c:279 #, c-format msgid "too few X's in template %s" msgstr "muito poucos X's no molde (template) %s" -#: src/mktemp.c:291 +#: src/mktemp.c:292 #, c-format msgid "invalid template, %s, contains directory separator" msgstr "molde (template) inválido, %s, contém separador de pastas" -#: src/mktemp.c:305 +#: src/mktemp.c:306 #, 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:325 +#: src/mktemp.c:326 #, c-format msgid "failed to create directory via template %s" msgstr "erro ao criar pasta via molde (template) %s" -#: src/mktemp.c:335 +#: src/mktemp.c:336 #, c-format msgid "failed to create file via template %s" msgstr "erro ao criar ficheiro via molde (template) %s" -#: src/mv.c:290 -msgid "" -"Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" -"\n" +#: src/mv.c:292 +#, 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:297 +#: src/mv.c:298 #, fuzzy msgid "" " --backup[=CONTROL] make a backup of each existing destination " @@ -6313,7 +6355,7 @@ msgstr "" " -f, --force não perguntar antes de sobrescrever\n" " -i, --interactive perguntar antes de sobrescrever\n" -#: src/mv.c:306 +#: src/mv.c:307 msgid "" " --strip-trailing-slashes remove any trailing slashes from each " "SOURCE\n" @@ -6324,7 +6366,7 @@ msgstr "" " de ORIGEM\n" " -S, --suffix=SUFIXO redefinir o sufixo de salvaguarda habitual\n" -#: src/mv.c:311 +#: src/mv.c:312 msgid "" " -t, --target-directory=DIRECTORY move all SOURCE arguments into " "DIRECTORY\n" @@ -6347,13 +6389,11 @@ msgid "Usage: %s [OPTION] [COMMAND [ARG]...]\n" msgstr "Utilização: %s [OPÇÃO] [COMANDO [ARG]...]\n" #: src/nice.c:73 -#, c-format +#, fuzzy, c-format msgid "" "Run COMMAND with an adjusted niceness, which affects process scheduling.\n" -"With no COMMAND, print the current niceness. Nicenesses range from\n" -"%d (most favorable scheduling) to %d (least favorable).\n" -"\n" -" -n, --adjustment=N add integer N to the niceness (default 10)\n" +"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 "" "Correr COMANDO com prioridade, ajustada afectando o planeamento de " "processos.\n" @@ -6362,22 +6402,26 @@ msgstr "" "\n" " -n, --adjustment=N somar inteiro N à prioridade (predifinido 10)\n" -#: src/nice.c:168 +#: src/nice.c:82 +msgid " -n, --adjustment=N add integer N to the niceness (default 10)\n" +msgstr "" + +#: src/nice.c:172 #, c-format msgid "invalid adjustment %s" msgstr "ajuste inválido %s" -#: src/nice.c:177 +#: src/nice.c:181 #, c-format msgid "a command must be given with an adjustment" msgstr "um comando deve ser dado com um ajuste" -#: src/nice.c:184 src/nice.c:195 +#: src/nice.c:188 src/nice.c:199 #, c-format msgid "cannot get niceness" msgstr "impossível obter nível de prioridade" -#: src/nice.c:201 +#: src/nice.c:205 #, c-format msgid "cannot set niceness" msgstr "impossível alterar nível de prioridade" @@ -6387,17 +6431,17 @@ msgstr "impossível alterar nível de prioridade" msgid "Scott Bartram" msgstr "" -#: src/nl.c:186 +#: 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" -"\n" msgstr "" "Escrever cada FICHEIRO para a saída padrão, com número de linha.\n" "Sem FICHEIRO, ou quando FICHEIRO é -, ler a entrada padrão.\n" "\n" -#: src/nl.c:194 +#: src/nl.c:186 msgid "" " -b, --body-numbering=STYLE use STYLE for numbering body lines\n" " -d, --section-delimiter=CC use CC for separating logical pages\n" @@ -6408,7 +6452,7 @@ msgstr "" " -f, --footer-numbering=ESTILO usar ESTILO para numerar linhas de roda-" "pé\n" -#: src/nl.c:199 +#: src/nl.c:191 #, fuzzy msgid "" " -h, --header-numbering=STYLE use STYLE for numbering header lines\n" @@ -6431,7 +6475,7 @@ msgstr "" " -s, --number-separator=EXP adicionar EXP após (possível) número de " "linha\n" -#: src/nl.c:207 +#: src/nl.c:199 #, fuzzy msgid "" " -v, --starting-line-number=NUMBER first line number on each logical page\n" @@ -6441,7 +6485,7 @@ msgstr "" "lógica\n" " -w, --number-width=NÚMERO usar NÚMERO colunas para números de linha\n" -#: src/nl.c:213 +#: src/nl.c:205 msgid "" "\n" "By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC are\n" @@ -6453,7 +6497,7 @@ msgstr "" "dois caracteres delimitadores para separar páginas lógicas, um segundo\n" "carácter em falta implica :. Escreva \\\\ para \\. ESTILO é um de:\n" -#: src/nl.c:219 +#: src/nl.c:211 msgid "" "\n" " a number all lines\n" @@ -6483,52 +6527,47 @@ msgstr "" " rz alinhar à direita, com zeros iniciais\n" "\n" -#: src/nl.c:286 +#: src/nl.c:278 #, c-format msgid "line number overflow" msgstr "número de linha demasiado grande" -#: src/nl.c:486 +#: src/nl.c:478 #, c-format msgid "invalid header numbering style: %s" msgstr "estilo de numeração de cabeçalho inválido: %s" -#: src/nl.c:494 +#: src/nl.c:486 #, c-format msgid "invalid body numbering style: %s" msgstr "estilo de numeração de corpo inválido: %s" -#: src/nl.c:502 +#: src/nl.c:494 #, c-format msgid "invalid footer numbering style: %s" msgstr "estilo de numeração de roda-pé inválido: %s" -#: src/nl.c:511 +#: src/nl.c:503 #, c-format msgid "invalid starting line number: %s" msgstr "número de linha inicial inválido: %s" -#: src/nl.c:517 -#, fuzzy, c-format -msgid "WARNING: --page-increment is deprecated; use --line-increment instead" -msgstr "a opção --megabytes está obsoleta; use -m ao invés" - -#: src/nl.c:524 +#: src/nl.c:512 #, c-format msgid "invalid line number increment: %s" msgstr "incremento de número de linha inválido: %s" -#: src/nl.c:536 +#: src/nl.c:524 #, c-format msgid "invalid number of blank lines: %s" msgstr "número inválido de linhas em branco: %s" -#: src/nl.c:550 +#: src/nl.c:538 #, c-format msgid "invalid line number field width: %s" msgstr "largura de campo de número de linha inválida: %s" -#: src/nl.c:569 +#: src/nl.c:557 #, c-format msgid "invalid line numbering format: %s" msgstr "formato de numeração de linha inválido: %s" @@ -6578,11 +6617,6 @@ msgstr "erro ao redireccionar o canal de erro padrão" msgid "ignoring input" msgstr "a ignorar a entrada" -#: src/nohup.c:163 src/nohup.c:165 -#, c-format -msgid "failed to open %s" -msgstr "erro ao abrir %s" - #: src/nohup.c:175 #, c-format msgid "ignoring input and appending output to %s" @@ -6614,33 +6648,370 @@ msgid "failed to redirect standard error" msgstr "erro ao redireccionar o canal de erro padrão" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:32 +#: src/nproc.c:33 msgid "Giuseppe Scrivano" msgstr "" -#: src/nproc.c:56 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 +#: src/nproc.c:57 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Utilização: %s [OPÇÃO]...\n" -#: src/nproc.c:57 +#: src/nproc.c:58 msgid "" "Print the number of processing units available to the current process,\n" "which may be less than the number of online processors\n" "\n" msgstr "" -#: src/nproc.c:62 +#: src/nproc.c:63 msgid "" " --all print the number of installed processors\n" " --ignore=N if possible, exclude N processing units\n" msgstr "" -#: src/nproc.c:106 +#: src/nproc.c:107 #, fuzzy, c-format 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 +msgid "Assaf Gordon" +msgstr "" + +#: src/numfmt.c:676 +#, fuzzy, c-format +msgid "value too large to be converted: '%s'" +msgstr "%s: valor não convertido na totalidade" + +#: src/numfmt.c:680 +#, fuzzy, c-format +msgid "invalid number: '%s'" +msgstr "número inválido %s" + +#: src/numfmt.c:684 +#, c-format +msgid "rejecting suffix in input: '%s' (consider using --from)" +msgstr "" + +#: src/numfmt.c:688 +#, fuzzy, c-format +msgid "invalid suffix in input: '%s'" +msgstr "sufixo inválido no argumento %s%s '%s'" + +#: src/numfmt.c:692 +#, c-format +msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)" +msgstr "" + +#: src/numfmt.c:723 +#, fuzzy, c-format +msgid "failed to prepare value '%Lf' for printing" +msgstr "%s: erro ao abrir para escrita" + +#: src/numfmt.c:787 +#, fuzzy, c-format +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 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [NUMBER]...\n" +msgstr "Utilização: %s [OPÇÃO]... [UTILIZADOR]...\n" + +#: src/numfmt.c:816 +msgid "" +"Reformat NUMBER(s), or the numbers from standard input if none are " +"specified.\n" +msgstr "" + +#: src/numfmt.c:820 +msgid " --debug print warnings about invalid input\n" +msgstr "" + +#: src/numfmt.c:823 +msgid "" +" -d, --delimiter=X use X instead of whitespace for field delimiter\n" +msgstr "" + +#: src/numfmt.c:826 +msgid "" +" --field=N replace the number in input field N (default is 1)\n" +msgstr "" + +#: src/numfmt.c:829 +msgid "" +" --format=FORMAT use printf style floating-point FORMAT;\n" +" see FORMAT below for details\n" +msgstr "" + +#: src/numfmt.c:833 +msgid "" +" --from=UNIT auto-scale input numbers to UNITs; default is " +"'none';\n" +" see UNIT below\n" +msgstr "" + +#: src/numfmt.c:837 +msgid "" +" --from-unit=N specify the input unit size (instead of the default " +"1)\n" +msgstr "" + +#: src/numfmt.c:840 +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 "" + +#: src/numfmt.c:844 +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 +msgid "" +" --invalid=MODE failure mode for invalid numbers: MODE can be:\n" +" abort (default), fail, warn, ignore\n" +msgstr "" + +#: src/numfmt.c:852 +msgid "" +" --padding=N pad the output to N characters; positive N will\n" +" right-align; negative N will left-align;\n" +" padding is ignored if the output is wider than N;\n" +" the default is to automatically pad if a " +"whitespace\n" +" is found\n" +msgstr "" + +#: src/numfmt.c:859 +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 +msgid "" +" --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" +" SUFFIX in input numbers\n" +msgstr "" + +#: src/numfmt.c:867 +msgid "" +" --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" +msgstr "" + +#: src/numfmt.c:870 +msgid "" +" --to-unit=N the output unit size (instead of the default 1)\n" +msgstr "" + +#: src/numfmt.c:877 +#, fuzzy +msgid "" +"\n" +"UNIT options:\n" +msgstr "" +"Opções de ordenação:\n" +"\n" + +#: src/numfmt.c:880 +msgid " none no auto-scaling is done; suffixes will trigger an error\n" +msgstr "" + +#: src/numfmt.c:883 +msgid "" +" auto accept optional single/two letter suffix:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" +msgstr "" + +#: src/numfmt.c:889 +msgid "" +" si accept optional single letter suffix:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:894 +msgid "" +" iec accept optional single letter suffix:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:899 +msgid "" +" iec-i accept optional two-letter suffix:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:905 +#, 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" +msgstr "" + +#: src/numfmt.c:912 +#, c-format +msgid "" +"\n" +"Exit status is 0 if all input numbers were successfully converted.\n" +"By default, %s will stop at the first conversion error with exit status 2.\n" +"With --invalid='fail' a warning is printed for each conversion error\n" +"and the exit status is 2. With --invalid='warn' each conversion error is\n" +"diagnosed, but the exit status is 0. With --invalid='ignore' conversion\n" +"errors are not diagnosed and the exit status is 0.\n" +msgstr "" + +#: src/numfmt.c:921 +#, c-format +msgid "" +"\n" +"Examples:\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" +msgstr "" + +#: src/numfmt.c:974 src/seq.c:212 +#, fuzzy, c-format +msgid "format %s has no %% directive" +msgstr "o destino %s não é uma pasta" + +#: src/numfmt.c:990 +#, fuzzy, c-format +msgid "invalid format %s (width overflow)" +msgstr "formato de largura inválido" + +#: src/numfmt.c:1007 src/seq.c:229 +#, c-format +msgid "format %s ends in %%" +msgstr "" + +#: src/numfmt.c:1010 +#, c-format +msgid "invalid format %s, directive must be %%['][-][N]f" +msgstr "" + +#: src/numfmt.c:1018 src/seq.c:236 +#, 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 "sufixo inválido no argumento %s%s '%s'" + +#: src/numfmt.c:1092 +#, c-format +msgid "value too large to be printed: '%Lg' (consider using --to)" +msgstr "" + +#: src/numfmt.c:1100 +#, c-format +msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" +msgstr "" + +#: src/numfmt.c:1184 +#, c-format +msgid "large input value '%s': possible precision loss" +msgstr "" + +#: src/numfmt.c:1293 +#, 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 "Alcance de página 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:1430 +#, fuzzy, c-format +msgid "invalid header value '%s'" +msgstr "data inválida %s" + +#: src/numfmt.c:1456 +#, 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 +#, fuzzy, c-format +msgid "no conversion option specified" +msgstr "múltiplas opções -i especificadas" + +#: src/numfmt.c:1471 +#, 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 +#, c-format +msgid "grouping has no effect in this locale" +msgstr "" + +#: src/numfmt.c:1486 +#, c-format +msgid "--header ignored with command-line input" +msgstr "" + +#: src/numfmt.c:1511 +#, fuzzy, c-format +msgid "error reading input" +msgstr "erro ao ler %s" + +#: src/numfmt.c:1520 +#, fuzzy, c-format +msgid "failed to convert some of the input numbers" +msgstr "erro ao redireccionar o canal de erro padrão" + #: src/od.c:294 #, c-format msgid "" @@ -6671,28 +7042,46 @@ msgstr "" "\n" #: src/od.c:307 -msgid "All arguments to long options are mandatory for short options.\n" +#, fuzzy +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" +"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" +"at first byte printed, incremented when dump is progressing.\n" +"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 "" -"Todos os argumentos de opções longas são mandatórios para opções curtas.\n" +"\n" +"Se ambos o primeiro e segundo formatos se aplicarem, o segundo é assumido " +"se\n" +"o último operando começar por + ou (se houver 2 operandos) um dígito.\n" +"Um operando ÍNDICE significa -j ÍNDICE. ETIQUETA é o pseudo-endereço do\n" +"primeiro byte mostrado, incrementado ao longo que se despeja.\n" +"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:310 +#: src/od.c:318 +#, fuzzy msgid "" -" -A, --address-radix=RADIX decide how file offsets are printed\n" +" -A, --address-radix=RADIX output format for file offsets. RADIX is one\n" +" of [doxn], for Decimal, Octal, Hex or None\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:314 +#: src/od.c:323 #, 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" -" --traditional accept arguments in traditional form\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 limitar a BYTES bytes de entrada\n" " -S, --strings[=BYTES] despejar cadeias de pelo menos BYTES " @@ -6702,9 +7091,11 @@ msgstr "" " -w, --width[=BYTES] despejar BYTES bytes por linha de saída\n" " --traditional aceitar argumentos na forma tradicional\n" -#: src/od.c:324 +#: src/od.c:336 +#, fuzzy 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" @@ -6719,7 +7110,7 @@ msgstr "" "sinalizadas\n" " -d como -t u2, seleccionar unidades de 2 bytes decimais positivas\n" -#: src/od.c:332 +#: src/od.c:345 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -6735,30 +7126,12 @@ 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:340 +#: src/od.c:353 +#, fuzzy msgid "" "\n" -"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" -"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" -"at first byte printed, incremented when dump is progressing.\n" -"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" -"Se ambos o primeiro e segundo formatos se aplicarem, o segundo é assumido " -"se\n" -"o último operando começar por + ou (se houver 2 operandos) um dígito.\n" -"Um operando ÍNDICE significa -j ÍNDICE. ETIQUETA é o pseudo-endereço do\n" -"primeiro byte mostrado, incrementado ao longo que se despeja.\n" -"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:349 -msgid "" "\n" "TYPE is made up of one or more of these specifications:\n" -"\n" " a named character, ignoring high-order bit\n" " c ASCII character or backslash escape\n" msgstr "" @@ -6768,7 +7141,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:356 +#: src/od.c:360 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -6782,10 +7155,11 @@ msgstr "" " u[TAMANHO] decimal sem sinal, TAMANHO bytes por inteiro\n" " x[TAMANHO] hexadecimal, TAMANHO bytes por inteiro\n" -#: src/od.c:363 +#: src/od.c:367 +#, fuzzy msgid "" "\n" -"SIZE is a number. For TYPE in doux, SIZE may also be C for\n" +"SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" "sizeof(char), S for sizeof(short), I for sizeof(int) or L for\n" "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" @@ -6796,44 +7170,37 @@ 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:370 -#, fuzzy +#: src/od.c:374 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" +"Adding a z suffix to any type displays printable characters at the end of\n" +"each output line.\n" 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. " -#: src/od.c:380 +#: src/od.c:379 #, 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" +"\n" +"\n" +"BYTES is hex with 0x or 0X prefix, and may have a multiplier suffix:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"and so on for G, T, P, E, Z, Y.\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" +"\n" +"N pode ter um sufixo de multiplicação:\n" +"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:633 src/od.c:753 +#: src/od.c:639 src/od.c:759 #, c-format msgid "invalid type string %s" msgstr "expressão inválida %s" -#: src/od.c:643 +#: src/od.c:649 #, c-format msgid "" "invalid type string %s;\n" @@ -6842,7 +7209,7 @@ msgstr "" "expressão de tipo inválida %s;\n" "este sistema não providencia um tipo integral de %lu bytes" -#: src/od.c:764 +#: src/od.c:770 #, c-format msgid "" "invalid type string %s;\n" @@ -6851,38 +7218,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:822 +#: src/od.c:828 #, 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:1047 +#: src/od.c:1053 #, c-format msgid "cannot skip past end of combined input" msgstr "impossível slatar depois do fim da entrada combinada" -#: src/od.c:1603 +#: src/od.c:1609 #, 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:1729 +#: src/od.c:1735 #, c-format msgid "no type may be specified when dumping strings" msgstr "nenhum tipo pode ser especificado ao despejar expressões" -#: src/od.c:1804 +#: src/od.c:1810 #, fuzzy msgid "compatibility mode supports at most one file" msgstr "Modo de compatibilidade suporta no máximo um ficheiro." -#: src/od.c:1825 +#: src/od.c:1831 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "skip-bytes + read-bytes é demasiado grande" -#: src/od.c:1868 +#: src/od.c:1874 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "aviso: largura inválida %lu; a usar %d ao invés" @@ -6898,18 +7265,18 @@ msgid "standard input is closed" msgstr "o canal de entrada padrão está fechado" #: 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" -"\n" msgstr "" "Escrever linhas consistindo das linhas correspondentes sequencialmente de\n" "cada FICHEIRO, separadas por TABs, para a saída padrão.\n" "Sem FICHEIRO, ou quando FICHEIRO é -, ler a entrada padrão.\n" "\n" -#: src/paste.c:448 +#: 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" @@ -6918,7 +7285,7 @@ msgstr "" " -s, --serial colar um ficheiro de cada vez em vez de em " "paralelo\n" -#: src/paste.c:509 +#: src/paste.c:508 #, c-format msgid "delimiter list ends with an unescaped backslash: %s" msgstr "lista de delimitadores termina com uma barra invertida assinalada: %s" @@ -6981,80 +7348,80 @@ msgid "Kaveh Ghazi" msgstr "" #. TRANSLATORS: Real name is unknown; at most 19 characters. -#: src/pinky.c:250 +#: src/pinky.c:242 msgid " ???" msgstr "" #. TRANSLATORS: Idle time is unknown; at most 5 characters. -#: src/pinky.c:274 +#: src/pinky.c:266 msgid "?????" msgstr "" -#: src/pinky.c:323 +#: src/pinky.c:314 #, c-format msgid "Login name: " msgstr "Nome de utilizador: " -#: src/pinky.c:326 +#: src/pinky.c:317 #, c-format msgid "In real life: " msgstr "Na vida real: " #. TRANSLATORS: Real name is unknown; no hard limit. -#: src/pinky.c:330 +#: src/pinky.c:321 msgid "???\n" msgstr "???\n" -#: src/pinky.c:350 +#: src/pinky.c:341 #, c-format msgid "Directory: " msgstr "Pasta: " -#: src/pinky.c:352 +#: src/pinky.c:343 #, c-format msgid "Shell: " msgstr "Consola: " -#: src/pinky.c:371 +#: src/pinky.c:362 #, c-format msgid "Project: " msgstr "Projecto: " -#: src/pinky.c:395 +#: src/pinky.c:386 #, c-format msgid "Plan:\n" msgstr "Plan:\n" -#: src/pinky.c:414 +#: src/pinky.c:405 msgid "Login" msgstr "Utilizador" -#: src/pinky.c:416 +#: src/pinky.c:407 msgid "Name" msgstr "Nome" -#: src/pinky.c:417 +#: src/pinky.c:408 msgid " TTY" msgstr " TTY" -#: src/pinky.c:419 +#: src/pinky.c:410 msgid "Idle" msgstr "Inactivo" -#: src/pinky.c:420 +#: src/pinky.c:411 msgid "When" msgstr "Quando" -#: src/pinky.c:423 +#: src/pinky.c:414 msgid "Where" msgstr "Onde" -#: src/pinky.c:502 +#: src/pinky.c:493 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Utilização: %s [OPÇÃO]... [UTILIZADOR]...\n" -#: src/pinky.c:503 +#: src/pinky.c:494 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7072,7 +7439,7 @@ msgstr "" " -p omitir o ficheiro de plano do utilizador em formato longo\n" " -s produzir saída curta (predefinido)\n" -#: src/pinky.c:511 +#: src/pinky.c:502 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7088,7 +7455,7 @@ msgstr "" "tempo\n" " de inactividade em formato curto\n" -#: src/pinky.c:520 +#: src/pinky.c:511 #, fuzzy, c-format msgid "" "\n" @@ -7099,7 +7466,7 @@ msgstr "" "Um programa 'finger' leve; exibir informação de utilizador.\n" "O ficheiro utmp será %s.\n" -#: src/pinky.c:604 +#: src/pinky.c:595 #, 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" @@ -7114,87 +7481,86 @@ msgstr "" msgid "Roland Huebner" msgstr "" -#: src/pr.c:912 +#: src/pr.c:908 #, fuzzy, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "'--pages=PRIM_PÁG[:ÚLT_PÁG]' argumento em falta" -#: src/pr.c:914 +#: src/pr.c:910 #, fuzzy, c-format msgid "invalid page range %s" msgstr "Alcance de página inválido %s" -#: src/pr.c:979 +#: src/pr.c:975 #, fuzzy, c-format msgid "'-l PAGE_LENGTH' invalid number of lines: %s" msgstr "'-l COMP_PÁG' número inválido de linhas: %s" -#: src/pr.c:1003 +#: src/pr.c:999 #, fuzzy, c-format msgid "'-N NUMBER' invalid starting line number: %s" msgstr "'-N NÚMERO' número de linha inicial inválido: %s" -#: src/pr.c:1015 +#: src/pr.c:1011 #, fuzzy, c-format msgid "'-o MARGIN' invalid line offset: %s" msgstr "'-o MARGEM' índice de linha inválido: %s" -#: src/pr.c:1056 +#: src/pr.c:1052 #, fuzzy, c-format msgid "'-w PAGE_WIDTH' invalid number of characters: %s" msgstr "'-w COMP_PÁG' número de caracteres inválido: %s" -#: src/pr.c:1070 +#: src/pr.c:1066 #, fuzzy, c-format msgid "'-W PAGE_WIDTH' invalid number of characters: %s" msgstr "'-W COMP_PÁG' número inválido de caracteres: %s" -#: src/pr.c:1100 +#: src/pr.c:1096 #, fuzzy, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "Impossível especificar número de colunas ao escrever em paralelo." -#: src/pr.c:1104 +#: src/pr.c:1100 #, fuzzy, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "" "Impossível especificar simultaneamente escrita paralela e não paralela." -#: src/pr.c:1200 +#: src/pr.c:1196 #, fuzzy, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "'-%c' caracteres extra ou número inválido no argumento: %s" -#: src/pr.c:1304 +#: src/pr.c:1293 #, c-format msgid "page width too narrow" msgstr "largura de página muito estreita" -#: src/pr.c:2369 +#: src/pr.c:2353 #, c-format msgid "starting page number %<PRIuMAX> exceeds page count %<PRIuMAX>" msgstr "" "número de página inicial %<PRIuMAX> excede contagem de páginas %<PRIuMAX>" -#: src/pr.c:2396 +#: src/pr.c:2380 #, fuzzy, c-format msgid "page number overflow" msgstr "Excesso de número de página" -#: src/pr.c:2401 +#: src/pr.c:2385 #, c-format msgid "Page %<PRIuMAX>" msgstr "Página %<PRIuMAX>" -#: src/pr.c:2773 -msgid "" -"Paginate or columnate FILE(s) for printing.\n" -"\n" +#: src/pr.c:2757 +#, fuzzy +msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" "Paginar ou colunizar FICHEIRO(s) para impressão.\n" "\n" -#: src/pr.c:2780 +#: src/pr.c:2763 #, fuzzy msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" @@ -7213,7 +7579,7 @@ msgstr "" "nas\n" " colunas de cada página.\n" -#: src/pr.c:2788 +#: src/pr.c:2771 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7230,7 +7596,7 @@ msgstr "" " -d, --double-space\n" " duplicar o espaço da saída\n" -#: src/pr.c:2796 +#: src/pr.c:2779 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7251,7 +7617,7 @@ msgstr "" " (por um cabeçalho de página de 3 linhas com -F ou\n" " cabeçalho e reboque de 5 linhas sem -F)\n" -#: src/pr.c:2806 +#: src/pr.c:2789 #, fuzzy msgid "" " -h, --header=HEADER\n" @@ -7273,7 +7639,7 @@ msgstr "" " alinhamento de cols., --sep-string[=EXP] define " "separadores\n" -#: src/pr.c:2815 +#: src/pr.c:2798 #, fuzzy msgid "" " -l, --length=PAGE_LENGTH\n" @@ -7290,7 +7656,7 @@ msgstr "" " truncar linhas, mas juntar linhas de altura completa com " "-J\n" -#: src/pr.c:2822 +#: src/pr.c:2805 #, fuzzy msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" @@ -7309,7 +7675,7 @@ msgstr "" " contar a partir de NÚMERO na primeira linha da primeira\n" " página impressa (ver +PRIM_PÁG)\n" -#: src/pr.c:2830 +#: src/pr.c:2813 #, fuzzy msgid "" " -o, --indent=MARGIN\n" @@ -7324,7 +7690,7 @@ msgstr "" " -r, --no-file-warnings\n" " omitir aviso quando um ficheiro não puder ser aberto\n" -#: src/pr.c:2837 +#: src/pr.c:2820 #, fuzzy msgid "" " -s[CHAR], --separator[=CHAR]\n" @@ -7342,7 +7708,7 @@ msgstr "" "opções\n" " de colunas (-COLUNAS|-a -COLUNAS|-m), excepto com -w\n" -#: src/pr.c:2844 +#: src/pr.c:2827 #, fuzzy msgid "" " -S[STRING], --sep-string[=STRING]\n" @@ -7358,7 +7724,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:2851 +#: src/pr.c:2834 #, fuzzy msgid "" " -T, --omit-pagination\n" @@ -7384,7 +7750,7 @@ msgstr "" " para saída de múlt. cols. de texto, -s[char] desactiva " "(72)\n" -#: src/pr.c:2861 +#: src/pr.c:2844 #, fuzzy msgid "" " -W, --page-width=PAGE_WIDTH\n" @@ -7399,7 +7765,7 @@ msgstr "" "interferência\n" " com -S ou -s\n" -#: src/pr.c:2869 +#: src/pr.c:2852 #, fuzzy msgid "" "\n" @@ -7562,16 +7928,16 @@ msgstr "" " ou: %s -G [OPÇÃO]... [ENTRADA [SAÍDA]]\n" #: src/ptx.c:1821 +#, fuzzy msgid "" "Output a permuted index, including context, of the words in the input " "files.\n" -"\n" msgstr "" "Despejar um índice permutado, incluindo contexto, das palavras nos ficheiros " "de entrada.\n" "\n" -#: src/ptx.c:1828 +#: src/ptx.c:1827 #, fuzzy msgid "" " -A, --auto-reference output automatically generated references\n" @@ -7583,7 +7949,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:1833 +#: src/ptx.c:1832 #, fuzzy msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" @@ -7598,7 +7964,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:1840 +#: src/ptx.c:1839 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -7616,7 +7982,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:1848 +#: src/ptx.c:1847 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -7629,7 +7995,7 @@ msgstr "" " -w, --width=NÚMERO largura saída em colunas, referência " "excluída\n" -#: src/ptx.c:1855 +#: src/ptx.c:1854 #, fuzzy msgid "" "\n" @@ -7638,7 +8004,7 @@ msgstr "" "\n" "Sem FICHEIRO ou se FICHEIRO é -, ler a entrada padrão. '-F /' por omissão.\n" -#: src/ptx.c:1949 +#: src/ptx.c:1948 #, c-format msgid "invalid gap width: %s" msgstr "largura de espaço inválida: %s" @@ -7662,7 +8028,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "erro ao entrar na pasta %s" -#: src/pwd.c:170 src/pwd.c:277 +#: src/pwd.c:170 src/pwd.c:277 src/split.c:373 #, c-format msgid "failed to stat %s" msgstr "erro ao analisar %s" @@ -7678,14 +8044,15 @@ msgid "ignoring non-option arguments" msgstr "a ignorar argumentos não-opção" #. This is a proper name. See the gettext manual, section Names. -#: src/readlink.c:33 +#: src/readlink.c:32 msgid "Dmitry V. Levin" msgstr "" -#: src/readlink.c:62 +#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147 +#: src/stat.c:1349 src/touch.c:212 #, c-format -msgid "Usage: %s [OPTION]... FILE\n" -msgstr "Utilização: %s [OPÇÃO]... FICHEIRO\n" +msgid "Usage: %s [OPTION]... FILE...\n" +msgstr "Utilização: %s [OPÇÃO]... FICHEIRO...\n" #: src/readlink.c:63 #, fuzzy @@ -7720,16 +8087,19 @@ msgstr "" " todas as componentes devem existir\n" #: src/readlink.c:75 +#, fuzzy msgid "" " -m, --canonicalize-missing canonicalize by following every symlink in\n" " every component of the given name " "recursively,\n" " without requirements on components " "existence\n" -" -n, --no-newline do not output the trailing newline\n" +" -n, --no-newline do not output the trailing delimiter\n" " -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" msgstr "" " -m, --canonicalize-missing canonizar seguindo todas as ligações " "simbólicas\n" @@ -7742,11 +8112,10 @@ msgstr "" " -s, --silent suprimir a maioria das mensagens de erro\n" " -v, --verbose relatar os erros\n" -#: src/realpath.c:71 src/rm.c:134 src/shred.c:147 src/stat.c:1330 -#: src/touch.c:215 -#, c-format -msgid "Usage: %s [OPTION]... FILE...\n" -msgstr "Utilização: %s [OPÇÃO]... FICHEIRO...\n" +#: src/readlink.c:152 +#, fuzzy, c-format +msgid "ignoring --no-newline with multiple arguments" +msgstr "a ignorar argumentos não-opção" #: src/realpath.c:72 msgid "" @@ -7773,12 +8142,12 @@ msgstr "" msgid "generating relative path" msgstr "" -#: src/remove.c:286 +#: src/remove.c:273 #, c-format msgid "%s: descend into write-protected directory %s? " msgstr "%s: entrar na pasta protegida contra escrita %s? " -#: src/remove.c:287 +#: src/remove.c:274 #, c-format msgid "%s: descend into directory %s? " msgstr "%s: entrar na pasta %s? " @@ -7787,49 +8156,49 @@ msgstr "%s: entrar na pasta %s? " #. translate "%s: remove %s (write-protected) %s? " #. instead. It should avoid grammatical problems #. with the output of file_type. -#: src/remove.c:303 +#: src/remove.c:290 #, c-format msgid "%s: remove write-protected %s %s? " msgstr "%s: remover %s %s protegido contra escrita?" -#: src/remove.c:304 +#: src/remove.c:291 #, c-format msgid "%s: remove %s %s? " msgstr "%s: remover %s %s? " -#: src/remove.c:417 +#: src/remove.c:374 #, c-format msgid "removed directory: %s\n" msgstr "pasta removida: %s\n" -#: src/remove.c:481 +#: src/remove.c:444 #, fuzzy, c-format msgid "cannot remove directory: %s" msgstr "impossível remover a pasta %s" -#: src/remove.c:537 +#: src/remove.c:500 #, 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:557 +#: src/remove.c:520 #, fuzzy, c-format msgid "traversal failed: %s" msgstr "erro de read" -#: src/remove.c:563 +#: src/remove.c:526 #, c-format msgid "" "unexpected failure: fts_info=%d: %s\n" "please report to %s" msgstr "" -#: src/rm.c:118 +#: src/rm.c:119 #, fuzzy, c-format msgid "Try '%s ./%s' to remove the file %s.\n" msgstr "Tente '%s ./%s' para remover o ficheiro %s.\n" -#: src/rm.c:135 +#: src/rm.c:136 #, fuzzy msgid "" "Remove (unlink) the FILE(s).\n" @@ -7843,7 +8212,7 @@ msgstr "" " -f, --force ignorar ficheiros inexistentes, nunca perguntar\n" " -i perguntar antes de cada remoção\n" -#: src/rm.c:141 +#: src/rm.c:142 msgid "" " -I prompt once before removing more than three files, " "or\n" @@ -7863,7 +8232,7 @@ msgstr "" "I)\n" " ou always (-i). Sem QUANDO, perguntar sempre\n" -#: src/rm.c:148 +#: src/rm.c:149 msgid "" " --one-file-system when removing a hierarchy recursively, skip any\n" " directory that is on a file system different from\n" @@ -7873,12 +8242,13 @@ msgstr "" " pastas de um sistema de ficheiros diferente do\n" " do argumento especificado na linha de comandos\n" -#: src/rm.c:153 +#: src/rm.c:154 #, fuzzy msgid "" " --no-preserve-root do not treat '/' specially\n" " --preserve-root do not remove '/' (default)\n" " -r, -R, --recursive remove directories and their contents recursively\n" +" -d, --dir remove empty directories\n" " -v, --verbose explain what is being done\n" msgstr "" " --no-preserve-root não tratar '/' de forma especial\n" @@ -7886,7 +8256,7 @@ msgstr "" " -r, -R, --recursive remover pastas e seus conteúdos recursivamente\n" " -v, --verbose explicar o que está a ser feito\n" -#: src/rm.c:161 +#: src/rm.c:163 msgid "" "\n" "By default, rm does not remove directories. Use the --recursive (-r or -R)\n" @@ -7897,7 +8267,7 @@ msgstr "" "Por omissão, rm não remove pastas. Use a opção --recursive (-r ou -R)\n" "para remover cada pasta listada também, bem como os seus conteúdos.\n" -#: src/rm.c:166 +#: src/rm.c:168 #, fuzzy, c-format msgid "" "\n" @@ -7914,7 +8284,7 @@ msgstr "" "\n" " %s ./-foo\n" -#: src/rm.c:175 +#: src/rm.c:177 #, fuzzy msgid "" "\n" @@ -7929,12 +8299,12 @@ msgstr "" "sejam\n" "realmente irrecuperáveis, considere a utilização de shred.\n" -#: src/rm.c:335 +#: src/rm.c:342 #, c-format msgid "%s: remove all arguments recursively? " msgstr "%s: remover todos os argumentos recursivamente? " -#: src/rm.c:336 +#: src/rm.c:343 #, c-format msgid "%s: remove all arguments? " msgstr "%s: remover todos os argumentos? " @@ -7995,7 +8365,11 @@ msgstr "" msgid "" "Run a program in a different security context.\n" "With neither CONTEXT nor COMMAND, print the current security context.\n" -"\n" +msgstr "" + +#: src/runcon.c:94 +#, fuzzy +msgid "" " CONTEXT Complete security context\n" " -c, --compute compute process transition context before modifying\n" " -t, --type=TYPE type (for same role as parent)\n" @@ -8015,72 +8389,72 @@ msgstr "" " -l, --range=ALCANCE intervalo de nível\n" "\n" -#: src/runcon.c:140 +#: src/runcon.c:144 #, c-format msgid "multiple roles" msgstr "múltiplos papéis" -#: src/runcon.c:145 +#: src/runcon.c:149 #, c-format msgid "multiple types" msgstr "múltiplos tipos" -#: src/runcon.c:150 +#: src/runcon.c:154 #, c-format msgid "multiple users" msgstr "múltiplos utilizadores" -#: src/runcon.c:155 +#: src/runcon.c:159 #, c-format msgid "multiple levelranges" msgstr "múltiplos intervalos de nível" -#: src/runcon.c:173 src/runcon.c:209 +#: src/runcon.c:177 src/runcon.c:213 #, c-format msgid "failed to get current context" msgstr "erro ao obter o contexto actual" -#: src/runcon.c:183 +#: src/runcon.c:187 #, c-format msgid "you must specify -c, -t, -u, -l, -r, or context" msgstr "deve especificar -c, -t, -u, -l, -r ou contexto" -#: src/runcon.c:191 +#: src/runcon.c:195 #, c-format msgid "no command specified" msgstr "nenhum comando especificado" -#: src/runcon.c:197 +#: src/runcon.c:201 #, 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:223 +#: src/runcon.c:227 #, c-format msgid "failed to compute a new context" msgstr "erro ao computar um novo contexto" -#: src/runcon.c:237 +#: src/runcon.c:241 #, c-format msgid "failed to set new user %s" msgstr "erro ao definir o novo utilizador %s" -#: src/runcon.c:239 +#: src/runcon.c:243 #, c-format msgid "failed to set new type %s" msgstr "erro ao definir o novo tipo %s" -#: src/runcon.c:241 +#: src/runcon.c:245 #, c-format msgid "failed to set new range %s" msgstr "erro ao definir o novo intervalo %s" -#: src/runcon.c:243 +#: src/runcon.c:247 #, c-format msgid "failed to set new role %s" msgstr "erro ao definir o novo papel %s" -#: src/runcon.c:251 +#: src/runcon.c:255 #, c-format msgid "unable to set security context %s" msgstr "erro ao definir o context de segurança %s" @@ -8097,9 +8471,12 @@ msgstr "" " ou: %s [OPÇÃO]... PRIMEIRO INCREMENTO ÚLTIMO\n" #: src/seq.c:73 +msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" +msgstr "" + +#: src/seq.c:79 +#, fuzzy msgid "" -"Print numbers from FIRST to LAST, in steps of INCREMENT.\n" -"\n" " -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" @@ -8112,7 +8489,7 @@ msgstr "" "\\n)\n" " -w, --equal-width equalizar largura preenchendo zeros iniciais\n" -#: src/seq.c:82 +#: src/seq.c:86 msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" @@ -8128,43 +8505,28 @@ msgstr "" "INCREMENTO é habitualmente positivo se PRIMEIRO é menor que ÚLTIMO, e\n" "INCREMENTO é habitualmente negativo se PRIMEIRO é maior que ÚLTIMO.\n" -#: src/seq.c:90 +#: src/seq.c:94 #, fuzzy 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 deve ser indicado para mostrar um argumento de tipo 'double';\n" -"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:136 -#, c-format -msgid "invalid floating point argument: %s" -msgstr "argumento em vírgula flutuante inválido: %s" - -#: src/seq.c:193 -#, fuzzy, c-format -msgid "format %s has no %% directive" -msgstr "o destino %s não é uma pasta" +"FORMATO deve ser indicado para mostrar um argumento de tipo 'double';\n" +"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:210 +#: src/seq.c:140 #, c-format -msgid "format %s ends in %%" -msgstr "" +msgid "invalid floating point argument: %s" +msgstr "argumento em vírgula flutuante inválido: %s" -#: src/seq.c:213 +#: src/seq.c:232 #, fuzzy, c-format msgid "format %s has unknown %%%c directive" msgstr "%s é um tipo de ficheiro desconhecido" -#: src/seq.c:217 -#, c-format -msgid "format %s has too many %% directives" -msgstr "" - -#: src/seq.c:431 +#: src/seq.c:555 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" @@ -8209,27 +8571,27 @@ 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:163 +#: src/setuidgid.c:162 #, c-format msgid "unknown user-ID: %s" msgstr "ID de utilizador desconhecido: %s" -#: src/setuidgid.c:174 +#: 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:191 +#: src/setuidgid.c:190 #, c-format msgid "failed to set supplemental group(s)" msgstr "erro ao definir grupo(s) adicional(is)" -#: src/setuidgid.c:201 +#: 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:205 +#: src/setuidgid.c:204 #, c-format msgid "cannot set user-ID to %lu" msgstr "impossível alterar o identificador de utilizador para %lu" @@ -8240,16 +8602,16 @@ msgid "Colin Plumb" msgstr "" #: src/shred.c:148 +#, 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" -"\n" msgstr "" "Sobrescrever os FICHEIRO(s) especificados repetidamente, de forma a tornar\n" "ainda mais difícil recuperar os dados mesmo para equipamento muito caro.\n" "\n" -#: src/shred.c:156 +#: src/shred.c:155 #, fuzzy, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -8262,7 +8624,7 @@ 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:162 +#: src/shred.c:161 msgid "" " -u, --remove truncate and remove file after overwriting\n" " -v, --verbose show progress\n" @@ -8277,7 +8639,7 @@ msgstr "" " -z, --zero adicionar zeros no final da escrita para esconder " "destruição\n" -#: src/shred.c:171 +#: src/shred.c:170 msgid "" "\n" "If FILE is -, shred standard output.\n" @@ -8298,7 +8660,7 @@ msgstr "" "regulares, a opção mais comum é --remove option.\n" "\n" -#: src/shred.c:181 +#: src/shred.c:180 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" @@ -8316,7 +8678,7 @@ msgstr "" "não é garantido que seja eficaz em todos os modos do sistema de ficheiros:\n" "\n" -#: src/shred.c:189 +#: src/shred.c:188 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -8338,7 +8700,7 @@ msgstr "" "* sistemas com imagens instantâneas, como Network Appliance's NFS server\n" "\n" -#: src/shred.c:199 +#: src/shred.c:198 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -8352,7 +8714,7 @@ msgstr "" "* sistemas de ficheiros com compressão\n" "\n" -#: src/shred.c:206 +#: src/shred.c:205 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" @@ -8375,7 +8737,7 @@ msgstr "" "como documentado na página de manual mount (man mount).\n" "\n" -#: src/shred.c:216 +#: src/shred.c:215 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" @@ -8387,122 +8749,122 @@ msgstr "" "um\n" "ficheiro destruído seja recuperado mais tarde.\n" -#: src/shred.c:296 +#: src/shred.c:295 #, c-format msgid "%s: fdatasync failed" msgstr "%s: error de fdatasync" -#: src/shred.c:307 +#: src/shred.c:306 #, c-format msgid "%s: fsync failed" msgstr "%s: error de fsync" -#: src/shred.c:384 +#: src/shred.c:383 #, c-format msgid "%s: cannot rewind" msgstr "%s: impossível retroceder" -#: src/shred.c:403 +#: src/shred.c:402 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: pass %lu/%lu (%s)..." -#: src/shred.c:453 +#: src/shred.c:452 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: erro ao escrever na posição %s" -#: src/shred.c:471 +#: src/shred.c:470 #, c-format msgid "%s: lseek failed" msgstr "%s: erro de lseek" -#: src/shred.c:482 +#: src/shred.c:481 #, c-format msgid "%s: file too large" msgstr "%s: ficheiro demasiado grande" -#: src/shred.c:505 +#: src/shred.c:504 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: pass %lu/%lu (%s)...%s" -#: src/shred.c:521 +#: src/shred.c:520 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: pass %lu/%lu (%s)...%s/%s %d%%" -#: src/shred.c:768 +#: src/shred.c:767 #, c-format msgid "%s: fstat failed" msgstr "%s: erro de fstat" -#: src/shred.c:779 +#: src/shred.c:778 #, c-format msgid "%s: invalid file type" msgstr "%s: tipo de ficheiro inválido" -#: src/shred.c:798 +#: src/shred.c:797 #, c-format msgid "%s: file has negative size" msgstr "%s: ficheiro tem tamanho negativo" -#: src/shred.c:865 +#: src/shred.c:864 src/sort.c:932 src/split.c:378 #, c-format msgid "%s: error truncating" msgstr "%s: erro de truncagem" -#: src/shred.c:881 +#: src/shred.c:880 #, c-format msgid "%s: fcntl failed" msgstr "%s: erro de fcntl" -#: src/shred.c:886 +#: src/shred.c:885 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "%s: impossível destruir ficheiro (apenas se pode acrescentar)" -#: src/shred.c:968 +#: src/shred.c:967 #, c-format msgid "%s: removing" msgstr "%s: a remover" -#: src/shred.c:992 +#: src/shred.c:991 #, c-format msgid "%s: renamed to %s" msgstr "%s: renomeado para %s" -#: src/shred.c:1014 +#: src/shred.c:1013 #, c-format msgid "%s: failed to remove" msgstr "%s: impossível remover" -#: src/shred.c:1018 +#: src/shred.c:1017 #, c-format msgid "%s: removed" msgstr "%s: removido" -#: src/shred.c:1025 src/shred.c:1068 +#: src/shred.c:1024 src/shred.c:1067 #, c-format msgid "%s: failed to close" msgstr "%s: erro ao fechar" -#: src/shred.c:1061 +#: src/shred.c:1060 #, c-format msgid "%s: failed to open for writing" msgstr "%s: erro ao abrir para escrita" -#: src/shred.c:1126 +#: src/shred.c:1125 #, c-format msgid "%s: invalid number of passes" msgstr "%s: número de passagens inválido" -#: src/shred.c:1135 src/shuf.c:291 src/sort.c:4387 +#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441 #, c-format msgid "multiple random sources specified" msgstr "múltiplas origens aleatórias especificadas" -#: src/shred.c:1149 +#: src/shred.c:1148 #, c-format msgid "%s: invalid file size" msgstr "%s: tamanho de ficheiro inválido" @@ -8519,14 +8881,13 @@ msgstr "" " ou: %s -i BAIXO-ALTO [OPÇÃO]...\n" #: src/shuf.c:54 -msgid "" -"Write a random permutation of the input lines to standard output.\n" -"\n" +#, 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:61 +#: src/shuf.c:60 #, fuzzy msgid "" " -e, --echo treat each ARG as an input line\n" @@ -8545,27 +8906,27 @@ 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:245 +#: src/shuf.c:244 #, c-format msgid "multiple -i options specified" msgstr "múltiplas opções -i especificadas" -#: src/shuf.c:265 +#: src/shuf.c:264 #, c-format msgid "invalid input range %s" msgstr "intervalo de entrada inválido %s" -#: src/shuf.c:278 +#: src/shuf.c:277 #, c-format msgid "invalid line count %s" msgstr "contagem de linhas inválida %s" -#: src/shuf.c:285 src/sort.c:4381 +#: src/shuf.c:284 src/sort.c:4435 #, c-format msgid "multiple output files specified" msgstr "múltiplos ficheiros de saída especificados" -#: src/shuf.c:311 +#: src/shuf.c:310 #, c-format msgid "cannot combine -e and -i options" msgstr "impossível combinar as opções -e e -i" @@ -8593,7 +8954,7 @@ msgstr "" "pela soma dos seus valores.\n" "\n" -#: src/sleep.c:135 src/timeout.c:295 +#: src/sleep.c:135 src/timeout.c:320 #, c-format msgid "invalid time interval %s" msgstr "intervalo de tempo inválido %s" @@ -8603,15 +8964,14 @@ msgstr "intervalo de tempo inválido %s" msgid "cannot read realtime clock" msgstr "impossível consultar relógio de tempo real" -#: src/sort.c:395 -msgid "" -"Write sorted concatenation of all FILE(s) to standard output.\n" -"\n" +#: src/sort.c:399 +#, 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:402 +#: src/sort.c:405 msgid "" "Ordering options:\n" "\n" @@ -8619,7 +8979,7 @@ msgstr "" "Opções de ordenação:\n" "\n" -#: src/sort.c:406 +#: src/sort.c:409 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -8631,19 +8991,19 @@ msgstr "" "alfanuméricos\n" " -f, --ignore-case ignorar capitalização de letras\n" -#: src/sort.c:412 +#: src/sort.c:415 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:417 +#: src/sort.c:420 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" -#: src/sort.c:420 +#: src/sort.c:423 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -8651,7 +9011,7 @@ msgid "" " -r, --reverse reverse the result of comparisons\n" msgstr "" -#: src/sort.c:426 +#: src/sort.c:429 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -8661,7 +9021,7 @@ msgid "" "\n" msgstr "" -#: src/sort.c:434 +#: src/sort.c:437 #, fuzzy msgid "" "Other options:\n" @@ -8670,13 +9030,13 @@ msgstr "" "Opções de ordenação:\n" "\n" -#: src/sort.c:438 +#: src/sort.c:441 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" msgstr "" -#: src/sort.c:442 +#: src/sort.c:445 #, fuzzy msgid "" " -c, --check, --check=diagnose-first check for sorted input; do not sort\n" @@ -8697,7 +9057,7 @@ msgstr "" "1)\n" " -m, --merge combinar ficheiros já ordenados; não ordenar\n" -#: src/sort.c:449 +#: src/sort.c:452 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -8706,13 +9066,13 @@ msgid "" " If F is - then read names from standard input\n" msgstr "" -#: src/sort.c:456 +#: src/sort.c:459 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:460 +#: src/sort.c:463 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -8723,7 +9083,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:466 +#: src/sort.c:469 #, fuzzy, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -8744,12 +9104,12 @@ msgstr "" " -u, --unique com -c, verificar ordenação estricta;\n" " sem -c, mostrar só primeiro de iguais\n" -#: src/sort.c:475 +#: 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:480 +#: src/sort.c:483 #, fuzzy msgid "" "\n" @@ -8779,7 +9139,7 @@ msgstr "" "\n" "TAMANHO pode ser seguido pelos seguintes sufixos multiplicativos:\n" -#: src/sort.c:493 +#: src/sort.c:496 msgid "" "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n" "\n" @@ -8800,267 +9160,271 @@ msgstr "" "Defina LC_ALL=C para obter a ordenação tradicional que utiliza valores\n" "de byte nativos.\n" -#: src/sort.c:694 +#: src/sort.c:697 #, c-format msgid "waiting for %s [-d]" msgstr "a aguardar por %s [-d]" -#: src/sort.c:699 +#: src/sort.c:702 #, c-format msgid "%s [-d] terminated abnormally" msgstr "%s [-d] terminou de forma anormal" -#: src/sort.c:853 +#: src/sort.c:856 #, fuzzy, c-format msgid "cannot create temporary file in %s" msgstr "impossível criar a pasta temporária %s" -#: src/sort.c:939 src/sort.c:2010 src/sort.c:3056 src/sort.c:3755 -#: src/sort.c:3758 +#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713 +#: src/sort.c:3804 src/sort.c:3807 msgid "open failed" msgstr "erro de open" -#: src/sort.c:959 +#: src/sort.c:970 msgid "fflush failed" msgstr "erro de fflush" -#: src/sort.c:964 src/sort.c:2013 src/sort.c:4646 +#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706 msgid "close failed" msgstr "erro de close" -#: src/sort.c:973 +#: src/sort.c:986 #, c-format msgid "dup2 failed" msgstr "erro de dup2" -#: src/sort.c:1090 +#: src/sort.c:1103 #, c-format msgid "couldn't execute %s" msgstr "impossível executar %s" -#: src/sort.c:1097 +#: src/sort.c:1110 msgid "couldn't create temporary file" msgstr "impossível criar o ficheiro temporário" -#: src/sort.c:1136 +#: src/sort.c:1149 #, c-format msgid "couldn't create process for %s -d" msgstr "impossível criar o processo para %s -d" -#: src/sort.c:1150 +#: src/sort.c:1161 #, c-format msgid "couldn't execute %s -d" msgstr "impossível executar %s -d" -#: src/sort.c:1209 +#: src/sort.c:1220 #, c-format msgid "warning: cannot remove: %s" msgstr "aviso: impossível remover: %s" -#: src/sort.c:1295 +#: src/sort.c:1306 #, fuzzy, c-format msgid "invalid --%s argument %s" msgstr "argumento inválido %s" -#: src/sort.c:1298 +#: src/sort.c:1309 #, fuzzy, c-format msgid "minimum --%s argument is %s" msgstr "argumento %s%s inválido '%s'" -#: src/sort.c:1313 +#: src/sort.c:1324 #, fuzzy, c-format msgid "--%s argument %s too large" msgstr "argumento %s%s '%s' demasiado grande" -#: src/sort.c:1316 +#: src/sort.c:1327 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "" -#: src/sort.c:1398 +#: src/sort.c:1409 #, c-format msgid "number in parallel must be nonzero" msgstr "" -#: src/sort.c:1479 +#: src/sort.c:1494 msgid "stat failed" msgstr "error de stat" -#: src/sort.c:1740 +#: src/sort.c:1755 msgid "read failed" msgstr "erro de read" -#: src/sort.c:2028 +#: src/sort.c:2043 #, c-format msgid "string transformation failed" msgstr "erro na transformação de expressões" -#: src/sort.c:2031 +#: src/sort.c:2046 #, fuzzy, c-format msgid "the untransformed string was %s" msgstr "a expressão não transformada era %s." -#: src/sort.c:2194 +#: src/sort.c:2209 #, c-format msgid "^ no match for key\n" msgstr "" -#: src/sort.c:2374 +#: src/sort.c:2389 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "" -#: src/sort.c:2380 +#: src/sort.c:2395 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "" -#: src/sort.c:2391 +#: src/sort.c:2406 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" -#: src/sort.c:2404 +#: src/sort.c:2419 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "" -#: src/sort.c:2436 +#: src/sort.c:2451 #, 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" -#: src/sort.c:2442 +#: src/sort.c:2457 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "" -#: src/sort.c:2716 src/sort.c:2725 +#: src/sort.c:2731 src/sort.c:2740 msgid "write failed" msgstr "erro de escrita" -#: src/sort.c:2768 +#: src/sort.c:2783 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: desordem: " -#: src/sort.c:2771 +#: src/sort.c:2786 msgid "standard error" msgstr "erro padrão" -#: src/sort.c:3926 +#: src/sort.c:3698 +#, fuzzy +msgid "cannot read" +msgstr "%s: impossível retroceder" + +#: src/sort.c:3976 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: especificação de campo inválida %s" -#: src/sort.c:3937 +#: src/sort.c:3987 #, fuzzy, c-format msgid "options '-%s' are incompatible" msgstr "as opções '-%s' são incompatíveis" -#: src/sort.c:3988 +#: src/sort.c:4038 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s: contagem inválida no início de %s" -#: src/sort.c:4245 +#: src/sort.c:4295 #, fuzzy msgid "invalid number after '-'" msgstr "número inválido após '-'" -#: src/sort.c:4248 src/sort.c:4334 src/sort.c:4362 +#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416 #, fuzzy msgid "invalid number after '.'" msgstr "número inválido após '.'" -#: src/sort.c:4261 src/sort.c:4367 +#: src/sort.c:4315 src/sort.c:4421 msgid "stray character in field spec" msgstr "carácter solto na especificação de campo" -#: src/sort.c:4308 +#: src/sort.c:4362 #, c-format msgid "multiple compress programs specified" msgstr "múltiplos programas de compressão especificados" -#: src/sort.c:4325 +#: src/sort.c:4379 msgid "invalid number at field start" msgstr "número inválido no início do campo" -#: src/sort.c:4329 src/sort.c:4357 +#: src/sort.c:4383 src/sort.c:4411 msgid "field number is zero" msgstr "número de campo é zero" -#: src/sort.c:4338 +#: src/sort.c:4392 msgid "character offset is zero" msgstr "índice de carácter é zero" -#: src/sort.c:4353 +#: src/sort.c:4407 #, fuzzy msgid "invalid number after ','" msgstr "número inválido após ','" -#: src/sort.c:4403 +#: src/sort.c:4457 #, c-format msgid "empty tab" msgstr "TAB vazio" -#: src/sort.c:4496 src/wc.c:692 +#: src/sort.c:4550 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:4518 +#: src/sort.c:4572 #, fuzzy, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "nome de ficheiro vazio inválido'" -#: src/sort.c:4524 +#: src/sort.c:4578 #, fuzzy, c-format msgid "no input from %s" msgstr "a fechar o ficheiro de entrada %s" -#: src/sort.c:4570 +#: src/sort.c:4624 #, c-format msgid "using %s sorting rules" msgstr "" -#: src/sort.c:4573 +#: src/sort.c:4627 #, c-format msgid "using simple byte comparison" msgstr "" -#: src/sort.c:4604 +#: src/sort.c:4658 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "operando extra %s não permitido com -%c" -#: src/split.c:184 +#: src/split.c:187 #, c-format msgid "the suffix length needs to be at least %zu" msgstr "" -#: src/split.c:201 +#: src/split.c:204 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" msgstr "Utilização: %s [OPÇÃO] [ENTRADA [PREFIXO]]\n" -#: src/split.c:205 +#: src/split.c:208 #, fuzzy 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" -"\n" msgstr "" "Despejar partes de ENTRADA de tamanho fixo para PREFIXOaa, PREFIXOab, ...;\n" "tamanho predef. 1000 linhas e PREFIXO predef. 'x'. Sem ENTRADA, ou quando\n" "ENTRADA é -, ler a entrada padrão.\n" "\n" -#: src/split.c:214 +#: src/split.c:216 #, fuzzy, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" @@ -9085,7 +9449,7 @@ msgstr "" " -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:227 +#: src/split.c:229 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" @@ -9094,7 +9458,7 @@ msgstr "" "cada\n" " ficheiro ser aberto\n" -#: src/split.c:234 +#: src/split.c:236 msgid "" "\n" "CHUNKS may be:\n" @@ -9106,184 +9470,189 @@ msgid "" "r/K/N likewise but only output Kth of N to stdout\n" msgstr "" -#: src/split.c:352 +#: src/split.c:354 #, fuzzy, c-format msgid "output file suffixes exhausted" msgstr "Sufixos de ficheiro de saída esgotados" -#: src/split.c:364 +#: src/split.c:366 #, c-format msgid "creating file %s\n" msgstr "a criar o ficheiro %s\n" -#: src/split.c:377 +#: src/split.c:375 +#, c-format +msgid "%s would overwrite input; aborting" +msgstr "" + +#: src/split.c:391 #, fuzzy, c-format msgid "failed to set FILE environment variable" -msgstr "erro ao alterar o contexto de segurança de %s para %s" +msgstr "erro ao definir o novo papel %s" -#: src/split.c:379 +#: src/split.c:393 #, c-format msgid "executing with FILE=%s\n" msgstr "" -#: src/split.c:381 +#: src/split.c:395 #, fuzzy, c-format msgid "failed to create pipe" -msgstr "impossível criar a ligação persistente %s para %s" +msgstr "erro ao remover %s" -#: src/split.c:395 +#: src/split.c:409 #, fuzzy, c-format msgid "closing prior pipe" msgstr "a fechar a pasta %s" -#: src/split.c:397 +#: src/split.c:411 #, fuzzy, c-format msgid "closing output pipe" msgstr "a apagar o ficheiro de saída %s" -#: src/split.c:401 +#: src/split.c:415 #, fuzzy, c-format msgid "moving input pipe" msgstr "a fechar o ficheiro de entrada %s" -#: src/split.c:403 +#: src/split.c:417 #, fuzzy, c-format msgid "closing input pipe" msgstr "a fechar o ficheiro de entrada %s" -#: src/split.c:408 +#: src/split.c:422 #, fuzzy, c-format msgid "failed to run command: \"%s -c %s\"" -msgstr "impossível executar o comando %s" +msgstr "erro ao alterar contexto de %s para %s" -#: src/split.c:414 +#: src/split.c:428 #, fuzzy, c-format msgid "failed to close input pipe" msgstr "erro ao fechar a pasta %s" -#: src/split.c:450 +#: src/split.c:464 #, fuzzy, c-format msgid "waiting for child process" msgstr "a aguardar por strip" -#: src/split.c:460 +#: src/split.c:474 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "" -#: src/split.c:468 +#: src/split.c:482 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:475 src/timeout.c:449 +#: src/split.c:489 src/timeout.c:494 #, c-format msgid "unknown status from command (0x%X)" msgstr "" -#: src/split.c:1037 +#: src/split.c:1052 #, c-format msgid "cannot split in more than one way" msgstr "impossível dividir em mais do que uma forma" -#: src/split.c:1050 src/split.c:1192 src/split.c:1363 +#: src/split.c:1065 src/split.c:1205 src/split.c:1376 #, fuzzy, c-format msgid "%s: invalid number of chunks" msgstr "%s: número de segundos inválido" -#: src/split.c:1054 +#: src/split.c:1069 #, fuzzy, c-format msgid "%s: invalid chunk number" msgstr "%s: número inválido" -#: src/split.c:1106 +#: src/split.c:1119 #, c-format msgid "%s: invalid suffix length" msgstr "%s: comprimento de sufixo inválido" -#: src/split.c:1131 src/split.c:1139 src/split.c:1162 src/split.c:1167 +#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180 #, c-format msgid "%s: invalid number of bytes" msgstr "%s: número de bytes inválido" -#: src/split.c:1150 src/split.c:1297 +#: src/split.c:1163 src/split.c:1310 #, c-format msgid "%s: invalid number of lines" msgstr "%s: número de linhas inválido" -#: src/split.c:1223 +#: src/split.c:1236 #, 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:1235 +#: src/split.c:1248 #, fuzzy, c-format msgid "%s: invalid start value for numerical suffix" msgstr "número de linha inicial inválido: %s" -#: src/split.c:1263 +#: src/split.c:1276 #, fuzzy, c-format msgid "%s: invalid IO block size" msgstr "%s: tamanho de ficheiro inválido" -#: src/split.c:1284 +#: src/split.c:1297 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1321 +#: src/split.c:1334 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1356 +#: src/split.c:1369 #, 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:169 +#: src/stat.c:173 msgid "Michael Meskes" msgstr "" -#: src/stat.c:838 +#: src/stat.c:857 #, fuzzy, c-format msgid "failed to canonicalize %s" msgstr "erro ao abrir %s" -#: src/stat.c:1050 +#: src/stat.c:1069 #, fuzzy, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "aviso: código de escape '\\%c' desconhecido" -#: src/stat.c:1105 +#: src/stat.c:1124 #, c-format msgid "%s: invalid directive" msgstr "%s: directiva inválida" -#: src/stat.c:1151 +#: src/stat.c:1170 #, c-format msgid "warning: backslash at end of format" msgstr "aviso: barra invertida no final do formato" -#: src/stat.c:1182 +#: src/stat.c:1201 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" -#: src/stat.c:1189 +#: src/stat.c:1208 #, 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:1209 +#: src/stat.c:1228 #, 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:1245 +#: src/stat.c:1264 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -9294,7 +9663,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1268 +#: src/stat.c:1287 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -9302,30 +9671,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1278 +#: src/stat.c:1297 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:1286 +#: src/stat.c:1305 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:1295 +#: src/stat.c:1314 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:1305 +#: src/stat.c:1324 #, c-format msgid "Context: %C\n" msgstr "" -#: src/stat.c:1313 +#: src/stat.c:1332 msgid "" "Access: %x\n" "Modify: %y\n" @@ -9333,10 +9702,13 @@ msgid "" " Birth: %w\n" msgstr "" -#: src/stat.c:1331 +#: src/stat.c:1350 +msgid "Display file or file system status.\n" +msgstr "" + +#: src/stat.c:1356 +#, fuzzy msgid "" -"Display file or file system status.\n" -"\n" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" @@ -9345,7 +9717,7 @@ 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:1337 +#: src/stat.c:1360 #, fuzzy msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" @@ -9363,7 +9735,7 @@ msgstr "" " Se quiser um, inclua \\n em FORMATO.\n" " -t, --terse mostrar a informação em forma resumida\n" -#: src/stat.c:1348 +#: src/stat.c:1371 #, fuzzy msgid "" "\n" @@ -9384,7 +9756,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:1357 +#: src/stat.c:1380 #, fuzzy msgid "" " %d device number in decimal\n" @@ -9401,7 +9773,7 @@ msgstr "" " %g ID de grupo do dono\n" " %G Nome de grupo do dono\n" -#: src/stat.c:1365 +#: src/stat.c:1388 #, fuzzy msgid "" " %h number of hard links\n" @@ -9423,7 +9795,7 @@ msgstr "" " %t Tipo de dispositivo maior, em hexadecimal\n" " %T Tipo de dispositivo menor, em hexadecimal\n" -#: src/stat.c:1376 +#: src/stat.c:1399 #, fuzzy msgid "" " %u user ID of owner\n" @@ -9448,7 +9820,7 @@ msgstr "" " %Z Tempo da última alteração em segundos desde Epoch\n" "\n" -#: src/stat.c:1390 +#: src/stat.c:1413 #, fuzzy msgid "" "Valid format sequences for file systems:\n" @@ -9468,7 +9840,7 @@ msgstr "" " %f Blocos livres no sistema de ficheiros\n" " %C Expressão de contexto de segurança SELinux\n" -#: src/stat.c:1399 +#: src/stat.c:1422 #, fuzzy msgid "" " %i file system ID in hex\n" @@ -9495,30 +9867,29 @@ msgstr "Utilização: %s [OPÇÃO]...\n" #: src/stdbuf.c:91 msgid "" "Run COMMAND, with modified buffering operations for its standard streams.\n" -"\n" msgstr "" -#: src/stdbuf.c:98 +#: src/stdbuf.c:97 msgid "" " -i, --input=MODE adjust standard input stream buffering\n" " -o, --output=MODE adjust standard output stream buffering\n" " -e, --error=MODE adjust standard error stream buffering\n" msgstr "" -#: src/stdbuf.c:105 +#: src/stdbuf.c:104 msgid "" "\n" "If MODE is 'L' the corresponding stream will be line buffered.\n" "This option is invalid with standard input.\n" msgstr "" -#: src/stdbuf.c:108 +#: src/stdbuf.c:107 msgid "" "\n" "If MODE is '0' the corresponding stream will be unbuffered.\n" msgstr "" -#: src/stdbuf.c:111 +#: src/stdbuf.c:110 msgid "" "\n" "Otherwise MODE is a number which may be followed by one of the following:\n" @@ -9528,7 +9899,7 @@ msgid "" "size set to MODE bytes.\n" msgstr "" -#: src/stdbuf.c:117 +#: src/stdbuf.c:116 msgid "" "\n" "NOTE: If COMMAND adjusts the buffering of its standard streams ('tee' does\n" @@ -9538,22 +9909,22 @@ msgid "" "and are thus unaffected by 'stdbuf' settings.\n" msgstr "" -#: src/stdbuf.c:227 +#: src/stdbuf.c:226 #, fuzzy, c-format msgid "failed to find %s" msgstr "erro ao abrir %s" -#: src/stdbuf.c:247 src/stdbuf.c:279 +#: src/stdbuf.c:246 src/stdbuf.c:278 #, 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:321 +#: src/stdbuf.c:320 #, c-format msgid "line buffering stdin is meaningless" msgstr "" -#: src/stty.c:509 +#: src/stty.c:513 #, fuzzy, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -9564,10 +9935,13 @@ msgstr "" " or: %s [-F DISPOSITIVO] [--file=DISPOSITIVO] [-a|--all]\n" " or: %s [-F DISPOSITIVO] [--file=DISPOSITIVO] [-g|--save]\n" -#: src/stty.c:515 +#: src/stty.c:519 +msgid "Print or change terminal characteristics.\n" +msgstr "" + +#: src/stty.c:525 +#, fuzzy msgid "" -"Print or change terminal characteristics.\n" -"\n" " -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" @@ -9578,7 +9952,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:524 +#: src/stty.c:532 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -9588,7 +9962,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:529 +#: src/stty.c:537 msgid "" "\n" "Special characters:\n" @@ -9602,7 +9976,7 @@ msgstr "" " eof CAR CAR enviará um fim de ficheiro (terminar a entrada)\n" " eol CAR CAR terminará a linha\n" -#: src/stty.c:536 +#: src/stty.c:544 msgid "" " * eol2 CHAR alternate CHAR for ending the line\n" " erase CHAR CHAR will erase the last character typed\n" @@ -9614,7 +9988,7 @@ msgstr "" " intr CAR CAR enviará um sinal de interrupção\n" " kill CAR CAR apagará a linha actual\n" -#: src/stty.c:542 +#: src/stty.c:550 msgid "" " * lnext CHAR CHAR will enter the next character quoted\n" " quit CHAR CHAR will send a quit signal\n" @@ -9626,7 +10000,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:548 +#: src/stty.c:556 msgid "" " stop CHAR CHAR will stop the output\n" " susp CHAR CHAR will send a terminal stop signal\n" @@ -9638,7 +10012,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:554 +#: src/stty.c:562 #, fuzzy msgid "" "\n" @@ -9653,7 +10027,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:561 +#: src/stty.c:569 msgid "" " ispeed N set the input speed to N\n" " * line N use line discipline N\n" @@ -9667,7 +10041,7 @@ msgstr "" "completa\n" " ospeed N alterar a taxa de saída para N\n" -#: src/stty.c:567 +#: src/stty.c:575 msgid "" " * rows N tell the kernel that the terminal has N rows\n" " * size print the number of rows and columns according to the " @@ -9682,13 +10056,15 @@ msgstr "" " time N com -icanon, definir limite de leitura N décimos de " "segundo\n" -#: src/stty.c:573 +#: src/stty.c:581 +#, fuzzy msgid "" "\n" "Control settings:\n" " [-]clocal disable modem control signals\n" " [-]cread allow input to be received\n" " * [-]crtscts enable RTS/CTS handshaking\n" +" * [-]cdtrdsr enable DTR/DSR handshaking\n" " csN set character size to N bits, N in [5..8]\n" msgstr "" "\n" @@ -9698,7 +10074,7 @@ msgstr "" " * [-]crtscts activar cumprimento RTS/CTS\n" " csN definir tamanho de carácter N bits, N em [5..8]\n" -#: src/stty.c:581 +#: src/stty.c:590 #, fuzzy msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" @@ -9706,7 +10082,7 @@ msgid "" " [-]hupcl same as [-]hup\n" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" -" [-]parodd set odd parity (even with '-')\n" +" [-]parodd set odd parity (or even parity with '-')\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 " @@ -9715,7 +10091,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:588 +#: src/stty.c:597 msgid "" "\n" "Input settings:\n" @@ -9731,7 +10107,7 @@ msgstr "" " [-]ignbrk ignorar caracteres de paragem\n" " [-]igncr ignorar carriage return\n" -#: src/stty.c:596 +#: src/stty.c:605 msgid "" " [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" @@ -9746,11 +10122,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:603 +#: src/stty.c:612 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr " * [-]iutf8 assumir caracteres de entrada em UTF-8\n" -#: src/stty.c:606 +#: src/stty.c:615 msgid "" " * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" @@ -9768,7 +10144,7 @@ msgstr "" "0)\n" " [-]tandem o mesmo que [-]ixoff\n" -#: src/stty.c:614 +#: src/stty.c:623 msgid "" "\n" "Output settings:\n" @@ -9784,7 +10160,7 @@ 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:622 +#: src/stty.c:631 msgid "" " * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of null characters\n" @@ -9800,7 +10176,7 @@ msgstr "" " * [-]onlcr traduzir nova linha para carriage return-nova linha\n" " * [-]onlret nova linha executa um carriage return\n" -#: src/stty.c:630 +#: src/stty.c:639 msgid "" " * [-]onocr do not print carriage returns in the first column\n" " [-]opost postprocess output\n" @@ -9816,7 +10192,7 @@ msgstr "" " * -tabs o mesmo que tab3\n" " * vtN estilo de atraso de tab vertical, N em [0..1]\n" -#: src/stty.c:638 +#: src/stty.c:647 msgid "" "\n" "Local settings:\n" @@ -9831,7 +10207,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:645 +#: src/stty.c:654 #, fuzzy msgid "" " * [-]ctlecho echo control characters in hat notation ('^c')\n" @@ -9846,7 +10222,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:652 +#: src/stty.c:661 #, fuzzy msgid "" " * [-]echoke same as [-]crtkill\n" @@ -9862,7 +10238,7 @@ msgstr "" " [-]icanon activar caracteres especiais erase, kill, werase e rprnt\n" " [-]iexten activar caracteres especiais não-POSIX\n" -#: src/stty.c:659 +#: src/stty.c:668 #, fuzzy msgid "" " [-]isig enable interrupt, quit, and suspend special characters\n" @@ -9879,7 +10255,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:666 +#: src/stty.c:675 msgid "" "\n" "Combination settings:\n" @@ -9893,7 +10269,7 @@ msgstr "" " cbreak o mesmo que -icanon\n" " -cbreak o mesmo que icanon\n" -#: src/stty.c:673 +#: src/stty.c:682 msgid "" " cooked same as brkint ignpar istrip icrnl ixon opost isig\n" " icanon, eof and eol characters to their default values\n" @@ -9905,7 +10281,7 @@ msgstr "" " -cooked o mesmo que raw\n" " crt o mesmo que echoe echoctl echoke\n" -#: src/stty.c:679 +#: src/stty.c:688 msgid "" " dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" " kill ^u\n" @@ -9919,7 +10295,7 @@ msgstr "" " ek erase e kill nos seus valores predefinidos\n" " evenp o mesmo que parenb -parodd cs7\n" -#: src/stty.c:686 +#: src/stty.c:695 msgid "" " -evenp same as -parenb cs8\n" " * [-]lcase same as xcase iuclc olcuc\n" @@ -9935,7 +10311,7 @@ msgstr "" " nl o mesmo que -icrnl -onlcr\n" " -nl o mesmo que icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" -#: src/stty.c:694 +#: src/stty.c:703 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -9949,7 +10325,7 @@ msgstr "" " pass8 o memso que -parenb -istrip cs8\n" " -pass8 o memso que parenb istrip cs7\n" -#: src/stty.c:701 +#: src/stty.c:710 msgid "" " raw same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" " -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n" @@ -9961,7 +10337,7 @@ msgstr "" " -imaxbel -opost -isig -icanon -xcase min 1 time 0\n" " -raw o mesmo que cooked\n" -#: src/stty.c:707 +#: src/stty.c:716 #, fuzzy msgid "" " sane same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" @@ -9979,7 +10355,7 @@ msgstr "" " -xcase -tostop -echoprt echoctl echoke, todos caracteres\n" " especiais nos seus valores predefinidos.\n" -#: src/stty.c:715 +#: src/stty.c:724 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -9995,12 +10371,12 @@ msgstr "" "0x37, 0177 ou 127; valores especiais ^- ou undef são utilizados para anular\n" "caracteres especiais.\n" -#: src/stty.c:787 +#: src/stty.c:796 #, c-format msgid "only one device may be specified" msgstr "apenas um dispositivo deve ser especificado" -#: src/stty.c:817 +#: src/stty.c:826 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" @@ -10009,124 +10385,47 @@ 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:823 +#: src/stty.c:832 #, 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:838 +#: src/stty.c:847 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s: impossível desactivar modo não-bloqueante" -#: src/stty.c:883 src/stty.c:993 +#: src/stty.c:892 src/stty.c:1002 #, c-format msgid "invalid argument %s" msgstr "argumento inválido %s" -#: src/stty.c:894 src/stty.c:911 src/stty.c:923 src/stty.c:936 src/stty.c:948 -#: src/stty.c:968 +#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957 +#: src/stty.c:977 #, c-format msgid "missing argument to %s" msgstr "argumento em falta para %s" -#: src/stty.c:974 +#: src/stty.c:983 #, c-format msgid "invalid line discipline %s" msgstr "disciplina de linha inválida %s" -#: src/stty.c:1044 +#: src/stty.c:1053 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s: impossível realizar todas as operações pedidas" -#: src/stty.c:1390 +#: src/stty.c:1399 #, c-format msgid "%s: no size information for this device" msgstr "%s: nenhuma informação de tamanho para este dispositivo" -#: src/stty.c:1904 +#: src/stty.c:1920 #, c-format msgid "invalid integer argument %s" msgstr "argumento inteiro inválido %s" -#: src/su.c:229 -msgid "Password:" -msgstr "Senha:" - -#: src/su.c:232 -#, c-format -msgid "getpass: cannot open /dev/tty" -msgstr "getpass: impossível abrir /dev/tty" - -#: src/su.c:290 -#, c-format -msgid "cannot set groups" -msgstr "impossível definir grupos" - -#: src/su.c:294 -#, c-format -msgid "cannot set group id" -msgstr "impossível alterar a identificação de grupo" - -#: src/su.c:296 -#, c-format -msgid "cannot set user id" -msgstr "impossível alterar o ID do utilizador" - -#: src/su.c:371 -#, c-format -msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" -msgstr "Utilização: %s [OPÇÃO]... [-] [UTILIZADOR [ARGUMENTO]...]\n" - -#: src/su.c:372 -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" - -#: src/su.c:384 -msgid "" -"\n" -"A mere - implies -l. If USER not given, assume root.\n" -msgstr "" -"\n" -"Um simples - implica -l. Sem UTILIZADOR, assumir root.\n" - -#: src/su.c:461 -#, c-format -msgid "user %s does not exist" -msgstr "o utilizador %s não existe" - -#: src/su.c:484 -#, c-format -msgid "incorrect password" -msgstr "senha incorrecta" - -#: src/su.c:501 -#, c-format -msgid "using restricted shell %s" -msgstr "a usar a shell restrita %s" - -#: src/su.c:509 -#, c-format -msgid "warning: cannot change directory to %s" -msgstr "aviso: impossível mudar para a pasta %s" - #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 msgid "Kayvan Aghaiepour" @@ -10158,7 +10457,7 @@ msgstr "" msgid "ignoring all arguments" msgstr "a ignorar todos os argumentos" -#: src/system.h:340 +#: src/system.h:343 #, c-format msgid "" "\n" @@ -10171,15 +10470,24 @@ msgstr "" "a versão descrita aqui. Por favor veja a documentação da sua shell para\n" "detalhes acerca das opções suportadas.\n" -#: src/system.h:346 +#: src/system.h:349 msgid " --help display this help and exit\n" msgstr " --help exibir esta ajuda e sair\n" -#: src/system.h:348 +#: src/system.h:351 msgid " --version output version information and exit\n" msgstr " --version mostrar a informação de versão e sair\n" -#: src/system.h:541 +#: src/system.h:544 +#, fuzzy +msgid "" +"\n" +"Mandatory arguments to long options are mandatory for short options too.\n" +msgstr "" +"Argumentos mandatórios para opções longas são mandatórios para opções curtas " +"também.\n" + +#: src/system.h:552 msgid "" "\n" "SIZE is an integer and optional unit (example: 10M is 10*1024*1024). Units\n" @@ -10187,7 +10495,7 @@ msgid "" "1000).\n" msgstr "" -#: src/system.h:550 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -10196,7 +10504,7 @@ msgid "" "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n" msgstr "" -#: src/system.h:560 +#: src/system.h:571 #, fuzzy, c-format msgid "" "\n" @@ -10209,22 +10517,22 @@ msgstr "" #. <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:574 +#: src/system.h:585 #, c-format msgid "Report %s translation bugs to <http://translationproject.org/team/>\n" msgstr "" -#: src/system.h:578 +#: src/system.h:589 #, c-format msgid "For complete documentation, run: info coreutils '%s invocation'\n" msgstr "" -#: src/system.h:585 +#: src/system.h:596 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "Tente '%s --help' para mais informações.\n" -#: src/system.h:617 +#: src/system.h:628 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -10245,16 +10553,16 @@ 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" -"\n" msgstr "" "Escrever cada FICHEIRO para a saída padrão, última linha em primeiro.\n" "Sem FICHEIRO, ou quando FICHEIRO é -, ler a entrada padrão.\n" "\n" -#: src/tac.c:145 +#: src/tac.c:144 msgid "" " -b, --before attach the separator before instead of after\n" " -r, --regex interpret the separator as a regular expression\n" @@ -10265,42 +10573,42 @@ msgstr "" "regular\n" " -s, --separator=EXPR usar EXPR como o separador em vez de nova linha\n" -#: src/tac.c:235 src/tac.c:336 +#: src/tac.c:234 src/tac.c:335 #, c-format msgid "%s: seek failed" msgstr "%s: erro de seek" -#: src/tac.c:264 +#: src/tac.c:263 #, c-format msgid "record too large" msgstr "campo demasiado grande" -#: src/tac.c:451 +#: src/tac.c:450 #, fuzzy, c-format msgid "failed to create temporary file in %s" msgstr "impossível criar a pasta temporária %s" -#: src/tac.c:459 +#: src/tac.c:458 #, fuzzy, c-format msgid "failed to open %s for writing" msgstr "%s: erro ao abrir para escrita" -#: src/tac.c:476 +#: src/tac.c:475 #, fuzzy, c-format msgid "failed to rewind stream for %s" msgstr "erro ao preservar os tempos de %s" -#: src/tac.c:512 src/tac.c:519 +#: src/tac.c:511 src/tac.c:518 #, c-format msgid "%s: write error" msgstr "%s: erro de escrita" -#: src/tac.c:572 +#: src/tac.c:571 #, fuzzy, c-format msgid "failed to open %s for reading" msgstr "impossível abrir %s para leitura" -#: src/tac.c:630 +#: src/tac.c:629 #, c-format msgid "separator cannot be empty" msgstr "o separador não pode ser vazio" @@ -10311,19 +10619,18 @@ msgid "Ian Lance Taylor" msgstr "" #: src/tail.c:262 -#, c-format +#, fuzzy, 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" -"\n" msgstr "" "Exibir as últimas %d linhas de cada FICHEIRO.\n" "Com mais de um FICHEIRO, anteceder cada um com um cabeçalho com o seu nome.\n" "Sem FICHEIRO, ou quando FICHEIRO é -, ler a entrada padrão.\n" "\n" -#: src/tail.c:271 +#: src/tail.c:270 msgid "" " -c, --bytes=K output the last K bytes; alternatively, use -c " "+K\n" @@ -10331,7 +10638,7 @@ msgid "" "file\n" msgstr "" -#: src/tail.c:275 +#: src/tail.c:274 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -10346,7 +10653,7 @@ msgstr "" " equivalentes\n" " -F o mesmo que --follow=name --retry\n" -#: src/tail.c:282 +#: src/tail.c:281 #, fuzzy, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -10369,7 +10676,7 @@ msgstr "" " para ver se se foi removido ou renomeado\n" " (este é o caso habitual de logs rotativos)\n" -#: src/tail.c:295 +#: src/tail.c:294 #, fuzzy msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" @@ -10385,8 +10692,7 @@ msgstr "" " -v, --verbose despejar sempre cabeçalhos com nomes de " "ficheiros\n" -#: src/tail.c:302 -#, fuzzy +#: src/tail.c:301 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations.\n" @@ -10394,14 +10700,8 @@ msgid "" " least once every N seconds.\n" " -v, --verbose always output headers giving file names\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" -" -s, --sleep-interval=S com -f, dormir por aproximadamente S segundos\n" -" (predefinido 1.0) entre iterações.\n" -" -v, --verbose despejar sempre cabeçalhos com nomes de " -"ficheiros\n" -#: src/tail.c:311 +#: src/tail.c:310 #, fuzzy msgid "" "\n" @@ -10421,7 +10721,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:320 +#: src/tail.c:319 #, fuzzy msgid "" "With --follow (-f), tail defaults to following the file descriptor, which\n" @@ -10440,64 +10740,64 @@ msgstr "" "recriado\n" "por qualquer outro programa.\n" -#: src/tail.c:379 +#: src/tail.c:378 #, c-format msgid "closing %s (fd=%d)" msgstr "a fechar %s (fd=%d)" -#: src/tail.c:454 +#: 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:458 +#: src/tail.c:457 #, 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:895 +#: src/tail.c:894 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "" -#: src/tail.c:907 +#: src/tail.c:906 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" msgstr "" -#: src/tail.c:964 +#: src/tail.c:963 #, c-format msgid "%s has become inaccessible" msgstr "%s tornou-se inacessível" -#: src/tail.c:981 +#: src/tail.c:980 #, 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:990 +#: src/tail.c:989 #, 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:1011 +#: src/tail.c:1010 #, c-format msgid "%s has become accessible" msgstr "%s tornou-se acessível" -#: src/tail.c:1019 +#: src/tail.c:1018 #, c-format msgid "%s has appeared; following end of new file" msgstr "%s apareceu; a seguir fim do novo ficheiro" -#: src/tail.c:1030 +#: src/tail.c:1029 #, 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:1131 +#: src/tail.c:1130 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: impossível alterar modo de desbloqueamento" @@ -10859,17 +11159,22 @@ msgstr "']' em falta" msgid "extra argument %s" msgstr "argumento extra %s" -#: src/timeout.c:124 +#: src/timeout.c:112 +#, c-format +msgid "warning: sigprocmask" +msgstr "" + +#: src/timeout.c:145 #, c-format msgid "warning: timer_settime" msgstr "" -#: src/timeout.c:129 +#: src/timeout.c:150 #, c-format msgid "warning: timer_create" msgstr "" -#: src/timeout.c:204 +#: src/timeout.c:225 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -10878,18 +11183,18 @@ msgstr "" "Utilização: %s OPÇÃO UTILIZADOR COMANDO [ARGUMENTO]...\n" " ou: %s OPÇÃO\n" -#: src/timeout.c:208 +#: src/timeout.c:229 #, fuzzy -msgid "" -"Start COMMAND, and kill it if still running after DURATION.\n" -"\n" -"Mandatory arguments to long options are mandatory for short options too.\n" +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:213 +#: src/timeout.c:235 msgid "" +" --preserve-status\n" +" exit with the same status as COMMAND, even when the\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 " @@ -10904,7 +11209,7 @@ msgid "" " See 'kill -l' for a list of signals\n" msgstr "" -#: src/timeout.c:229 +#: src/timeout.c:254 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -10912,25 +11217,30 @@ msgid "" "days.\n" msgstr "" -#: src/timeout.c:234 +#: src/timeout.c:259 msgid "" "\n" -"If the command times out, then exit with status 124. Otherwise, exit\n" -"with the status of COMMAND. If no signal is specified, send the TERM\n" -"signal upon timeout. The TERM signal kills any process that does not\n" -"block or catch that signal. For other processes, it may be necessary to\n" -"use the KILL (9) signal, since this signal cannot be caught. If the\n" -"KILL (9) signal is sent, the exit status is 128+9 rather than 124.\n" +"If the command times out, and --preserve-status is not set, then exit with\n" +"status 124. Otherwise, exit with the status of COMMAND. If no signal\n" +"is specified, send the TERM signal upon timeout. The TERM signal kills\n" +"any process that does not block or catch that signal. It may be necessary\n" +"to use the KILL (9) signal, since this signal cannot be caught, in which\n" +"case the exit status is 128+9 rather than 124.\n" msgstr "" -#: src/timeout.c:419 +#: src/timeout.c:363 +#, c-format +msgid "warning: disabling core dumps failed" +msgstr "" + +#: src/timeout.c:471 #, fuzzy, c-format msgid "error waiting for command" msgstr "erro ao escrever %s" -#: src/timeout.c:441 +#: src/timeout.c:482 #, c-format -msgid "warning: disabling core dumps failed" +msgid "the monitored command dumped core" msgstr "" #. This is a proper name. See the gettext manual, section Names. @@ -10943,22 +11253,22 @@ msgstr "" msgid "Randy Smith" msgstr "" -#: src/touch.c:115 src/touch.c:313 +#: src/touch.c:115 src/touch.c:309 #, c-format msgid "invalid date format %s" msgstr "formato de data inválido %s" -#: src/touch.c:194 +#: src/touch.c:191 #, c-format msgid "cannot touch %s" msgstr "impossível executar sobre %s" -#: src/touch.c:200 +#: src/touch.c:197 #, c-format msgid "setting times of %s" msgstr "a alterar os tempos de %s" -#: src/touch.c:216 +#: src/touch.c:213 #, fuzzy msgid "" "Update the access and modification times of each FILE to the current time.\n" @@ -10968,7 +11278,6 @@ msgid "" "\n" "A FILE argument string of - is handled specially and causes touch to\n" "change the times of the file associated with standard output.\n" -"\n" msgstr "" "Actualizar o acesso e tempos de modificação de cada FICHEIRO para o actual.\n" "\n" @@ -10979,7 +11288,7 @@ msgstr "" "tempos do ficheiro associado com a saída padrão.\n" "\n" -#: src/touch.c:229 +#: src/touch.c:225 #, fuzzy msgid "" " -a change only the access time\n" @@ -10993,7 +11302,7 @@ msgstr "" " -f (ignorado)\n" " -m alterar apenas o tempo de modificação\n" -#: src/touch.c:235 +#: src/touch.c:231 #, fuzzy msgid "" " -h, --no-dereference affect each symbolic link instead of any " @@ -11007,11 +11316,12 @@ msgstr "" "podem\n" " alterar o dono de uma ligação simbólica)\n" -#: src/touch.c:241 +#: 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" -" --time=WORD change the specified time:\n" +" --time=WORD change the specified time:\n" " WORD is access, atime, or use: equivalent to -a\n" " WORD is modify or mtime: equivalent to -m\n" msgstr "" @@ -11021,7 +11331,7 @@ msgstr "" " PALAVRA é access, atime ou use: equivalente a -a\n" " PALAVRA é modify ou mtime: equivalente a -m\n" -#: src/touch.c:250 +#: src/touch.c:246 msgid "" "\n" "Note that the -d and -t options accept different time-date formats.\n" @@ -11029,12 +11339,12 @@ msgstr "" "\n" "Note que as opções -d e -t aceitam diferentes formatos hora-data.\n" -#: src/touch.c:339 +#: src/touch.c:335 #, c-format msgid "cannot specify times from more than one source" msgstr "impossível especificar tempos a partir de mais de uma fonte" -#: src/touch.c:413 +#: src/touch.c:409 #, fuzzy, c-format msgid "" "warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'" @@ -11305,26 +11615,25 @@ msgid "" "If a FILE is larger than the specified size, the extra data is lost.\n" "If a FILE is shorter, it is extended and the extended part (hole)\n" "reads as zero bytes.\n" -"\n" msgstr "" -#: src/truncate.c:110 +#: src/truncate.c:109 #, fuzzy msgid " -c, --no-create do not create any files\n" msgstr " -d, --directory criar uma pasta, não um ficheiro\n" -#: src/truncate.c:113 +#: src/truncate.c:112 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" -#: src/truncate.c:116 +#: 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" msgstr "" -#: src/truncate.c:122 +#: src/truncate.c:121 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -11332,57 +11641,57 @@ msgid "" "'/' round down to multiple of, '%' round up to multiple of.\n" msgstr "" -#: src/truncate.c:150 +#: src/truncate.c:149 #, c-format msgid "overflow in %<PRIdMAX> * %<PRIdMAX> byte blocks for file %s" msgstr "" -#: src/truncate.c:174 +#: src/truncate.c:173 #, fuzzy, c-format msgid "%s has unusable, apparently negative size" msgstr "%s: ficheiro tem tamanho negativo" -#: src/truncate.c:184 src/truncate.c:379 +#: src/truncate.c:183 src/truncate.c:384 #, fuzzy, c-format msgid "cannot get the size of %s" msgstr "impossível alterar o dono de %s" -#: src/truncate.c:206 +#: src/truncate.c:205 #, fuzzy, c-format msgid "overflow rounding up size of file %s" msgstr "erro de excesso de índice ao ler o ficheiro %s" -#: src/truncate.c:216 +#: src/truncate.c:215 #, fuzzy, c-format msgid "overflow extending size of file %s" msgstr "erro de excesso de índice ao ler o ficheiro %s" -#: src/truncate.c:231 +#: src/truncate.c:230 #, c-format msgid "failed to truncate %s at %<PRIdMAX> bytes" msgstr "" -#: src/truncate.c:305 +#: src/truncate.c:303 #, fuzzy, c-format msgid "multiple relative modifiers specified" msgstr "múltiplas pastas de destino especificadas" -#: src/truncate.c:335 +#: src/truncate.c:333 #, fuzzy, c-format msgid "you must specify either %s or %s" msgstr "deve especificar uma lista de bytes, caracteres ou campos" -#: src/truncate.c:342 +#: src/truncate.c:340 #, c-format msgid "you must specify a relative %s with %s" msgstr "" -#: src/truncate.c:349 +#: src/truncate.c:347 #, c-format msgid "%s was specified but %s was not" msgstr "" -#: src/truncate.c:400 +#: src/truncate.c:404 #, c-format msgid "cannot open %s for writing" msgstr "impossível abrir %s para escrita" @@ -11477,16 +11786,16 @@ msgid "cannot get system name" msgstr "impossível obter o nome do 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" -"\n" msgstr "" "Converter expaços em cada FICHEIRO para TABs, escrevendo na saída padrão.\n" "Sem FICHEIRO, ou quando FICHEIRO é -, ler a entrada padrão.\n" "\n" -#: src/unexpand.c:125 +#: src/unexpand.c:124 msgid "" " -a, --all convert all blanks, instead of just initial blanks\n" " --first-only convert only leading sequences of blanks (overrides -a)\n" @@ -11499,12 +11808,12 @@ msgstr "" " -t, --tabs=LISTA usar lista sep. por vírg. de posições de TABs (activa -" "a)\n" -#: src/unexpand.c:153 +#: src/unexpand.c:152 #, c-format msgid "tabs are too far apart" msgstr "TABs demasiado separados" -#: src/unexpand.c:505 +#: src/unexpand.c:504 #, c-format msgid "tab stop value is too large" msgstr "valor de paragem de TAB demasiado grande" @@ -11520,10 +11829,9 @@ msgid "" "writing to OUTPUT (or standard output).\n" "\n" "With no options, matching lines are merged to the first occurrence.\n" -"\n" msgstr "" -#: src/uniq.c:148 +#: src/uniq.c:147 msgid "" " -c, --count prefix lines by the number of occurrences\n" " -d, --repeated only print duplicate lines\n" @@ -11531,7 +11839,7 @@ msgstr "" " -c, --count prefixar linhas com o número de ocorrências\n" " -d, --repeated exibir apenas linhas duplicadas\n" -#: src/uniq.c:152 +#: src/uniq.c:151 #, fuzzy msgid "" " -D, --all-repeated[=delimit-method] print all duplicate lines\n" @@ -11552,12 +11860,12 @@ msgstr "" " -u, --unique apenas mostrar linhas únicas\n" " -z, --zero-terminated terminlr linhas com byte zero, não nova linha\n" -#: src/uniq.c:162 +#: src/uniq.c:161 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:167 +#: src/uniq.c:166 #, fuzzy msgid "" "\n" @@ -11569,7 +11877,7 @@ msgstr "" "espaço.\n" "Campos são saltados antes de caracteres.\n" -#: src/uniq.c:172 +#: src/uniq.c:171 #, fuzzy msgid "" "\n" @@ -11581,24 +11889,24 @@ 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:359 +#: src/uniq.c:358 #, c-format msgid "too many repeated lines" msgstr "demasiados linhas repetidas" -#: src/uniq.c:522 +#: src/uniq.c:521 msgid "invalid number of fields to skip" msgstr "número inválido de campos a ignorar" -#: src/uniq.c:531 +#: src/uniq.c:530 msgid "invalid number of bytes to skip" msgstr "número inválido de bytes a ignorar" -#: src/uniq.c:540 +#: src/uniq.c:539 msgid "invalid number of bytes to compare" msgstr "número inválido de bytes a comparar" -#: src/uniq.c:559 +#: src/uniq.c:558 #, c-format msgid "printing all duplicated lines and repeat counts is meaningless" msgstr "mostrar linhas duplicadas e contagens de repetidas não faz sentido" @@ -11652,6 +11960,11 @@ msgid_plural "up %ld days %2d:%02d, " msgstr[0] "" msgstr[1] "" +#: src/uptime.c:149 +#, fuzzy, c-format +msgid "up %2d:%02d, " +msgstr " %2d:%02d%s up " + #: src/uptime.c:151 #, c-format msgid "%lu user" @@ -11750,40 +12063,40 @@ msgstr "" msgid " old " msgstr " old " -#: src/who.c:449 +#: src/who.c:440 #, fuzzy msgid "system boot" msgstr "Erro de sistema" -#: src/who.c:456 src/who.c:458 +#: src/who.c:447 src/who.c:449 msgid "id=" msgstr "id=" -#: src/who.c:471 src/who.c:476 +#: src/who.c:462 src/who.c:467 msgid "term=" msgstr "term=" -#: src/who.c:473 src/who.c:477 +#: src/who.c:464 src/who.c:468 msgid "exit=" msgstr "saíd=" -#: src/who.c:494 +#: src/who.c:485 msgid "LOGIN" msgstr "" -#: src/who.c:514 +#: src/who.c:505 msgid "clock change" msgstr "mud. relógio" -#: src/who.c:526 src/who.c:527 +#: src/who.c:517 src/who.c:518 msgid "run-level" msgstr "nível-exe" -#: src/who.c:530 src/who.c:531 +#: src/who.c:521 src/who.c:522 msgid "last=" msgstr "últi=" -#: src/who.c:562 +#: src/who.c:553 #, c-format msgid "" "\n" @@ -11792,44 +12105,44 @@ msgstr "" "\n" "# utlzs=%lu\n" -#: src/who.c:568 +#: src/who.c:559 msgid "NAME" msgstr "NOME" -#: src/who.c:568 +#: src/who.c:559 msgid "LINE" msgstr "LINH" -#: src/who.c:568 +#: src/who.c:559 msgid "TIME" msgstr "TEMP" -#: src/who.c:568 +#: src/who.c:559 msgid "IDLE" msgstr "INAC" -#: src/who.c:569 +#: src/who.c:560 msgid "PID" msgstr "PID" -#: src/who.c:569 +#: src/who.c:560 msgid "COMMENT" msgstr "COMENTÁ" -#: src/who.c:569 +#: src/who.c:560 msgid "EXIT" msgstr "SAÍD" -#: src/who.c:649 +#: src/who.c:640 #, c-format msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n" msgstr "Utilização: %s [OPÇÃO]... [ FICHEIRO | ARG1 ARG2 ]\n" -#: src/who.c:650 +#: src/who.c:641 msgid "Print information about users who are currently logged in.\n" msgstr "" -#: src/who.c:653 +#: src/who.c:644 msgid "" "\n" " -a, --all same as -b -d --login -p -r -t -T -u\n" @@ -11843,12 +12156,12 @@ msgstr "" " -d, --dead mostrar processos mortos\n" " -H, --heading mostrar linha de títulos de colunas\n" -#: src/who.c:660 +#: src/who.c:651 msgid " -l, --login print system login processes\n" msgstr "" " -l, --login mostrar processos de registo de entraad do sistema\n" -#: src/who.c:663 +#: src/who.c:654 msgid "" " --lookup attempt to canonicalize hostnames via DNS\n" " -m only hostname and user associated with stdin\n" @@ -11859,7 +12172,7 @@ msgstr "" "stdin\n" " -p, --process mostrar processos activos criados por init\n" -#: src/who.c:668 +#: src/who.c:659 msgid "" " -q, --count all login names and number of users logged on\n" " -r, --runlevel print current runlevel\n" @@ -11872,7 +12185,7 @@ msgstr "" " -s, --short mostrar apenas nome, linha e tempo (predefinido)\n" " -t, --time mostrar última mudança do relógio de sistema\n" -#: src/who.c:674 +#: src/who.c:665 msgid "" " -T, -w, --mesg add user's message status as +, - or ?\n" " -u, --users list users logged in\n" @@ -11885,7 +12198,7 @@ msgstr "" " --message o mesmo que -T\n" " --writable o mesmo que -T\n" -#: src/who.c:682 +#: src/who.c:673 #, fuzzy, c-format msgid "" "\n" @@ -11930,12 +12243,17 @@ msgstr "" "'y'.\n" "\n" -#~ msgid "" -#~ "Usage: %s NAME\n" -#~ " or: %s OPTION\n" -#~ msgstr "" -#~ "Utilização: %s NOME\n" -#~ " ou: %s OPÇÃO\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" + +#, fuzzy +#~ msgid "no valid suffix found\n" +#~ msgstr "%s: comprimento de sufixo inválido" #~ msgid "" #~ "\n" @@ -11948,19 +12266,179 @@ msgstr "" #~ " %s /usr/bin/sort Mostrar \"sort\".\n" #~ " %s include/stdio.h .h Mostrar \"stdio\".\n" -#~ msgid "Usage: %s [OPTION] FILE...\n" -#~ msgstr "Utilização: %s [OPÇÃO] FICHEIRO...\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" +#~ "\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 "" +#~ "\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" +#~ "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" +#~ 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" + +#, 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" -#~ " --dereference affect the referent of each symbolic link (this " -#~ "is\n" -#~ " the default), rather than the symbolic link " -#~ "itself\n" +#~ " -f, --silent, --quiet suppress most error messages\n" +#~ " -v, --verbose output a diagnostic for every file processed\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" @@ -11971,6 +12449,13 @@ msgstr "" #~ "(por\n" #~ " 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" @@ -11998,13 +12483,6 @@ msgstr "" #~ " -c, --changes como verboso mas comunicar apenas quando há " #~ "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" @@ -12056,25 +12534,24 @@ msgstr "" #~ "processado\n" #~ "\n" -#, fuzzy -#~ msgid "Usage: %s [OPTION]... PATH START\n" -#~ msgstr "Utilização: %s [OPÇÃO]... CONJUNTO1 [CONJUNTO2]\n" - -#, fuzzy #~ msgid "" -#~ " -n, --no-newline do not output the trailing " -#~ "newline\n" -#~ " " +#~ "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 "" -#~ "Ecoar as EXPRESSÃO(ões) para a saída padrão.\n" +#~ "Exibir o tempo actual no FORMATO dado, ou alterar a data do sistema.\n" #~ "\n" -#~ " -n não despejar a nova linha final\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 is an integer with an optional suffix (example: 10MB). Suffixes " -#~ "are:\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 "" @@ -12084,26 +12561,6 @@ msgstr "" #~ "kB 1000, K 1024, MB 1000*1000, M 1024*1024 e por aí fora para 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 "" -#~ "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 "cannot create link %s" -#~ msgstr "impossível criar a ligação %s" - -#, fuzzy -#~ msgid "%s: option '%s' is ambiguous\n" -#~ msgstr "%s: a opção '-W %s' é ambígua\n" - #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s: opção ilegal -- %c\n" @@ -12148,6 +12605,9 @@ msgstr "" #~ "Utilização: %s NOVARAIZ [COMANDO...]\n" #~ " ou: %s OPÇÃO\n" +#~ msgid "cannot create link %s" +#~ msgstr "impossível criar a ligação %s" + #~ msgid "" #~ " -P, --no-dereference never follow symbolic links in SOURCE\n" #~ msgstr "" @@ -12172,9 +12632,6 @@ msgstr "" #~ 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" -#~ msgid "invalid format width" -#~ msgstr "formato de largura inválido" - #~ msgid "invalid format precision" #~ msgstr "formato de precisão inválido" @@ -12410,6 +12867,9 @@ msgstr "" #~ msgid "invalid number of lines: 0" #~ msgstr "número de linhas inválido: 0" +#~ msgid "Usage: %s [OPTION] FILE...\n" +#~ msgstr "Utilização: %s [OPÇÃO] FICHEIRO...\n" + #~ msgid "new_mode: mode\n" #~ msgstr "modo_novo: modo\n" @@ -12491,9 +12951,6 @@ msgstr "" #~ "entrada padrão), escrevendo na SAÍDA (ou saída padrão).\n" #~ "\n" -#~ msgid " %2d:%02d%s up " -#~ msgstr " %2d:%02d%s up " - #~ msgid "am" #~ msgstr "am" diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo index 414dcc8c..f90ebad0 100644 Binary files a/po/pt_BR.gmo and b/po/pt_BR.gmo differ diff --git a/po/pt_BR.po b/po/pt_BR.po index 108bc98b..224325ea 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1,28 +1,27 @@ -# translation of coreutils-6.12.po to Brazilian Portuguese +# translation of coreutils-8.18-pre1.po to Brazilian Portuguese # Tradução para o português do Brasil das mensagens do "coreutils" -# Copyright (C) 2008 Free Software Foundation, Inc. +# Copyright (C) 2012 Free Software Foundation, Inc. # This file is distributed under the same license as the coreutils package. -# # Cyro Mendes De Moraes Neto <neto@conectiva.com.br>, 1998. # Rodrigo Stulzer Lopes <rodrigo@conectiva.com.br>, 2001. # Juan Carlos Castro y Castro <jcastro@vialink.com.br>, 2003. -# Rodolfo Ribeiro Gomes <rodolforg@gmail.com>, 2008. +# Rodolfo Ribeiro Gomes <rodolforg@gmail.com>, 2008, 2010, 2012. +# msgid "" msgstr "" -"Project-Id-Version: coreutils-6.12\n" +"Project-Id-Version: coreutils-8.18-pre1\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2012-05-10 19:35+0200\n" -"PO-Revision-Date: 2008-06-10 11:39-0300\n" +"POT-Creation-Date: 2013-02-14 15:56+0000\n" +"PO-Revision-Date: 2012-06-24 16:47-0300\n" "Last-Translator: Rodolfo Ribeiro Gomes <rodolforg@gmail.com>\n" -"Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n" +"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge." +"net>\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" -# , c-format #: lib/argmatch.c:133 #, c-format msgid "invalid argument %s for %s" @@ -31,31 +30,29 @@ msgstr "%s é um argumento inválido para %s" #: lib/argmatch.c:134 #, c-format msgid "ambiguous argument %s for %s" -msgstr "%s é um argumento ambíguo %s" +msgstr "%s é um argumento ambíguo para %s" #: lib/argmatch.c:153 msgid "Valid arguments are:" msgstr "Os argumentos válidos são:" -# , c-format #: lib/closein.c:100 msgid "error closing file" msgstr "erro ao fechar o arquivo" -#: lib/closeout.c:112 src/base64.c:109 src/base64.c:121 src/base64.c:127 -#: src/base64.c:168 src/base64.c:224 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:330 src/expand.c:355 src/head.c:298 -#: src/head.c:348 src/head.c:756 src/head.c:797 src/mktemp.c:350 src/od.c:919 -#: src/paste.c:160 src/shuf.c:369 src/split.c:727 src/split.c:964 -#: src/split.c:969 src/tail.c:350 src/tail.c:1201 src/tail.c:1307 +#: 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 -#: src/unexpand.c:427 src/unexpand.c:443 +#: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "erro de gravação" -# , c-format -#: lib/copy-acl.c:611 src/copy.c:1160 src/copy.c:2602 +#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617 #, c-format msgid "preserving permissions for %s" msgstr "preservando permissões para %s" @@ -193,82 +190,76 @@ msgid "Unknown error" msgstr "Erro desconhecido" #: lib/getopt.c:547 lib/getopt.c:576 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: a opção \"%s\" está ambígua\n" +msgstr "%s: a opção \"%s\" está ambígua; possibilidades:" #: 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: a opção \"--%s\" não admite argumentos\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: a opção \"%c%s\" não admite argumentos\n" #: lib/getopt.c:685 lib/getopt.c:704 -#, fuzzy, c-format +#, c-format msgid "%s: option '--%s' requires an argument\n" -msgstr "%s: a opção \"%s\" exige um argumento\n" +msgstr "%s: a opção \"--%s\" exige um argumento\n" -# , c-format #: lib/getopt.c:742 lib/getopt.c:745 -#, fuzzy, c-format +#, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: opção desconhecida \"--%s\"\n" -# , c-format #: lib/getopt.c:753 lib/getopt.c:756 -#, fuzzy, c-format +#, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: opção desconhecida \"%c%s\"\n" -# , c-format #: lib/getopt.c:805 lib/getopt.c:808 -#, fuzzy, c-format +#, c-format msgid "%s: invalid option -- '%c'\n" -msgstr "%s: opção inválida -- %c\n" +msgstr "%s: opção inválida -- \"%c\"\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: a opção exige um argumento -- %c\n" +msgstr "%s: a opção exige um argumento -- \"%c\"\n" #: lib/getopt.c:934 lib/getopt.c:950 -#, fuzzy, c-format +#, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: a opção \"-W %s\" está ambígua\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: a opção \"-W %s\" não admite argumentos\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: a opção \"%s\" exige um argumento\n" +msgstr "%s: a opção \"-W %s\" exige um argumento\n" -# , c-format -#: lib/mkdir-p.c:196 src/install.c:483 +#: lib/mkdir-p.c:196 src/install.c:484 #, c-format msgid "cannot change permissions of %s" msgstr "é impossível mudar as permissões de %s" -# , c-format -#: lib/mkdir-p.c:206 src/copy.c:2261 src/install.c:709 src/install.c:722 +#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722 #, 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:915 src/tac.c:435 +#: src/split.c:929 src/tac.c:434 #, c-format msgid "memory exhausted" msgstr "memória esgotada" -# , c-format #: lib/openat-die.c:38 #, c-format msgid "unable to record current working directory" @@ -302,90 +293,86 @@ msgstr "falhou em retornar ao diretório inicial de trabalho" #. and use glyphs suitable for your language. #: lib/quotearg.c:312 msgid "`" -msgstr "\"" +msgstr "“" #: lib/quotearg.c:313 msgid "'" -msgstr "\"" +msgstr "”" -# , c-format #: lib/randread.c:128 #, c-format msgid "%s: end of file" msgstr "%s: fim de arquivo" -#: lib/regcomp.c:130 +#: lib/regcomp.c:131 msgid "Success" msgstr "Sucesso" -#: lib/regcomp.c:133 +#: lib/regcomp.c:134 msgid "No match" msgstr "Nenhuma ocorrência do padrão" -# , c-format -#: lib/regcomp.c:136 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "Expressão regular inválida" -#: lib/regcomp.c:139 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "Caractere inválido de colagem" -# , c-format -#: lib/regcomp.c:142 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "Nome inválido de categoria de caracteres" -#: lib/regcomp.c:145 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "Barra invertida excedente ao final" -#: lib/regcomp.c:148 +#: lib/regcomp.c:149 msgid "Invalid back reference" -msgstr "Retro-referência inválida" +msgstr "Retrorreferência inválida" -#: lib/regcomp.c:151 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "[ ou [^ sem correspondente" -#: lib/regcomp.c:154 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "( ou \\( sem correspondente" -#: lib/regcomp.c:157 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "\\{ sem correspondente" -#: lib/regcomp.c:160 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "Conteúdo inválido de \\{\\}" -#: lib/regcomp.c:163 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "Fim inválido de intervalo" -#: lib/regcomp.c:166 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Memória esgotada" -# , c-format -#: lib/regcomp.c:169 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" -msgstr "Expressão regular precedente é inválida" +msgstr "A expressão regular precedente é inválida" -#: lib/regcomp.c:172 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "Fim prematuro da expressão regular" -#: lib/regcomp.c:175 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "Expressão regular grande demais" -#: lib/regcomp.c:178 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr ") ou \\) sem correspondente" -#: lib/regcomp.c:703 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "Nenhuma expressão regular anterior" @@ -397,7 +384,7 @@ msgstr "é perigoso operar recursivamente em %s" #: lib/root-dev-ino.h:41 #, c-format msgid "it is dangerous to operate recursively on %s (same as %s)" -msgstr "é perigoso operar recursivamente em %s (o mesmo em %s)" +msgstr "é perigoso operar recursivamente em %s (o mesmo que em %s)" #: lib/root-dev-ino.h:43 #, c-format @@ -424,199 +411,187 @@ msgstr "^[sS]" msgid "^[nN]" msgstr "^[nN]" -# , c-format -#: lib/set-mode-acl.c:695 src/copy.c:2284 src/cp.c:518 +#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516 #, c-format msgid "setting permissions for %s" msgstr "definindo permissões para %s" #: lib/siglist.h:31 msgid "Hangup" -msgstr "" +msgstr "Desconexão" #: lib/siglist.h:34 msgid "Interrupt" -msgstr "" +msgstr "Interrupção" #: lib/siglist.h:37 msgid "Quit" -msgstr "" +msgstr "Desistência" #: lib/siglist.h:40 msgid "Illegal instruction" -msgstr "" +msgstr "Instrução ilegal" #: lib/siglist.h:43 msgid "Trace/breakpoint trap" -msgstr "" +msgstr "Armadilha de ponto de interrupção/interceptações" #: lib/siglist.h:46 msgid "Aborted" -msgstr "" +msgstr "Abortado" #: lib/siglist.h:49 msgid "Floating point exception" -msgstr "" +msgstr "Exceção de vírgula flutuante" #: lib/siglist.h:52 msgid "Killed" -msgstr "" +msgstr "Morto" #: lib/siglist.h:55 -#, fuzzy msgid "Bus error" -msgstr "Erro de sistema" +msgstr "Erro no barramento" #: lib/siglist.h:58 msgid "Segmentation fault" -msgstr "" +msgstr "Falha de segmentação" #: lib/siglist.h:61 msgid "Broken pipe" -msgstr "" +msgstr "Duto quebrado" #: lib/siglist.h:64 msgid "Alarm clock" -msgstr "" +msgstr "Relógio de alarme" #: lib/siglist.h:67 msgid "Terminated" -msgstr "" +msgstr "Terminado" #: lib/siglist.h:70 msgid "Urgent I/O condition" -msgstr "" +msgstr "Condição de E/S urgente" #: lib/siglist.h:73 msgid "Stopped (signal)" -msgstr "" +msgstr "Suspenso (sinal)" #: lib/siglist.h:76 msgid "Stopped" -msgstr "" +msgstr "Suspenso" #: lib/siglist.h:79 msgid "Continued" -msgstr "" +msgstr "Continuado" #: lib/siglist.h:82 msgid "Child exited" -msgstr "" +msgstr "Processo filho saiu" #: lib/siglist.h:85 msgid "Stopped (tty input)" -msgstr "" +msgstr "Suspenso (entrada tty)" #: lib/siglist.h:88 msgid "Stopped (tty output)" -msgstr "" +msgstr "Suspenso (saída tty)" #: lib/siglist.h:91 msgid "I/O possible" -msgstr "" +msgstr "I/O possível" #: lib/siglist.h:94 msgid "CPU time limit exceeded" -msgstr "" +msgstr "Limite de tempo na CPU excedido" #: lib/siglist.h:97 msgid "File size limit exceeded" -msgstr "" +msgstr "Limite de tamanho de arquivo excedido" #: lib/siglist.h:100 msgid "Virtual timer expired" -msgstr "" +msgstr "Temporizador virtual expirou" #: lib/siglist.h:103 msgid "Profiling timer expired" -msgstr "" +msgstr "Temporizador de perfilamento expirou" #: lib/siglist.h:106 -#, fuzzy msgid "Window changed" -msgstr "mudança de relógio" +msgstr "Janela alterada" -# , c-format #: lib/siglist.h:109 -#, fuzzy msgid "User defined signal 1" -msgstr "%s: sinal inválido" +msgstr "Sinal definido pelo usuário 1" -# , c-format #: lib/siglist.h:112 -#, fuzzy msgid "User defined signal 2" -msgstr "%s: sinal inválido" +msgstr "Sinal definido pelo usuário 2" #: lib/siglist.h:117 msgid "EMT trap" -msgstr "" +msgstr "Armadilha de EMT" #: lib/siglist.h:120 -#, fuzzy msgid "Bad system call" -msgstr "a chamada de sistema \"fork\" falhou" +msgstr "Chamada inválida de sistema" #: lib/siglist.h:123 msgid "Stack fault" -msgstr "" +msgstr "Falha de pilha" #: lib/siglist.h:126 msgid "Information request" -msgstr "" +msgstr "Requisição de informação" #: lib/siglist.h:128 -#, fuzzy msgid "Power failure" -msgstr "erro abrindo arquivo" +msgstr "Falha de energia" #: lib/siglist.h:131 msgid "Resource lost" -msgstr "" +msgstr "Recurso perdido" -# , c-format -#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262 -#: lib/spawn-pipe.c:265 -#, fuzzy, c-format +#: 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 fifo %s" +msgstr "não foi possível criar duto" -#: lib/spawn-pipe.c:232 lib/spawn-pipe.c:346 lib/wait-process.c:282 +#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282 #: lib/wait-process.c:356 -#, fuzzy, c-format +#, c-format msgid "%s subprocess failed" -msgstr "%s: busca (\"seek\") falhou" +msgstr "subprocesso de %s falhou" -# , c-format #: lib/strsignal.c:114 -#, fuzzy, c-format +#, c-format msgid "Real-time signal %d" -msgstr "intervalo inválido de tempo %s" +msgstr "Sinal de tempo real %d" #: lib/strsignal.c:118 #, c-format msgid "Unknown signal %d" -msgstr "" +msgstr "Sinal desconhecido %d" -#: lib/unicodeio.c:103 +#: lib/unicodeio.c:102 msgid "iconv function not usable" msgstr "função iconv não utilizável" -#: lib/unicodeio.c:105 +#: lib/unicodeio.c:104 msgid "iconv function not available" msgstr "função iconv não disponível" -# , c-format -#: lib/unicodeio.c:112 +#: lib/unicodeio.c:111 msgid "character out of range" msgstr "caractere fora de faixa" -#: lib/unicodeio.c:182 +#: lib/unicodeio.c:181 #, c-format msgid "cannot convert U+%04X to local character set" msgstr "impossível converter U+%04X para o conjunto local de caracteres" -#: lib/unicodeio.c:184 +#: lib/unicodeio.c:183 #, c-format msgid "cannot convert U+%04X to local character set: %s" msgstr "impossível converter U+%04X para o conjunto local de caracteres: %s" @@ -636,17 +611,17 @@ msgstr "spec inválido" #: lib/verror.c:73 #, c-format msgid "unable to display error message" -msgstr "" +msgstr "incapaz de mostrar mensagem de erro" #: lib/version-etc.c:74 #, c-format msgid "Packaged by %s (%s)\n" -msgstr "" +msgstr "Empacotado por %s (%s)\n" #: lib/version-etc.c:77 #, c-format msgid "Packaged by %s\n" -msgstr "" +msgstr "Empacotado por %s\n" #. TRANSLATORS: Translate "(C)" to the copyright symbol #. (C-in-a-circle), if this symbol is available in the user's @@ -656,7 +631,6 @@ msgid "(C)" msgstr "(C)" #: lib/version-etc.c:86 -#, fuzzy msgid "" "\n" "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl." @@ -666,7 +640,7 @@ msgid "" "\n" msgstr "" "\n" -"Licença GPLv3+: GNU GPL versão 3 ou posterior\t<http://gnu.org/licenses/gpl." +"Licença GPLv3+: GNU GPL versão 3 ou posterior <http://gnu.org/licenses/gpl." "html>\n" "Este é um software livre: você é livre para alterá-lo e redistribuí-lo.\n" "NÃO HÁ GARANTIA, na máxima extensão permitida pela lei.\n" @@ -785,77 +759,73 @@ msgstr "" #. "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" -"Relate os problemas para <%s>.\n" +"Relate os problemas para: %s\n" #: lib/version-etc.c:247 -#, fuzzy, c-format +#, c-format msgid "Report %s bugs to: %s\n" -msgstr "" -"\n" -"Relate os problemas para <%s>.\n" +msgstr "Relate os problemas de %s para: %s\n" -#: lib/version-etc.c:251 src/system.h:562 +#: lib/version-etc.c:251 src/system.h:573 #, c-format msgid "%s home page: <%s>\n" -msgstr "" +msgstr "página de %s: <%s>\n" #: lib/version-etc.c:253 #, c-format msgid "%s home page: <http://www.gnu.org/software/%s/>\n" -msgstr "" +msgstr "página de %s: <http://www.gnu.org/software/%s/>\n" -#: lib/version-etc.c:256 src/system.h:563 +#: lib/version-etc.c:256 src/system.h:574 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" -msgstr "" +msgstr "Ajuda geral sobre uso de software GNU: <http://www.gnu.org/gethelp/>\n" #: lib/w32spawn.h:43 -#, fuzzy, c-format +#, c-format msgid "_open_osfhandle failed" -msgstr "erro abrindo arquivo" +msgstr "_open_osfhandle falhou" #: lib/w32spawn.h:84 #, c-format msgid "cannot restore fd %d: dup2 failed" -msgstr "" +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 "" +msgstr "subprocesso de %s" #: lib/wait-process.c:274 lib/wait-process.c:346 #, c-format msgid "%s subprocess got fatal signal %d" -msgstr "" +msgstr "subprocesso de %s recebeu o sinal fatal %d" #: lib/xfreopen.c:35 msgid "stdin" -msgstr "" +msgstr "entrada padrão" #: lib/xfreopen.c:36 msgid "stdout" -msgstr "" +msgstr "saída padrão" #: lib/xfreopen.c:37 msgid "stderr" -msgstr "" +msgstr "erro padrão" #: lib/xfreopen.c:38 -#, fuzzy msgid "unknown stream" -msgstr "Erro desconhecido de sistema" +msgstr "fluxo desconhecido" -# , c-format #: lib/xfreopen.c:39 -#, fuzzy, c-format +#, c-format msgid "failed to reopen %s with mode %s" -msgstr "falhou em remover %s" +msgstr "falhou em reabrir %s com modo %s" #: lib/xmemcoll.c:39 src/expr.c:886 #, c-format @@ -875,24 +845,22 @@ msgstr "Os textos comparados foram %s e %s." #: lib/xprintf.c:50 lib/xprintf.c:76 #, c-format msgid "cannot perform formatted output" -msgstr "impossível formatar a saída" +msgstr "não é possível formatar a saída" -# , c-format #: lib/xstrtol-error.c:63 -#, fuzzy, c-format +#, c-format msgid "invalid %s%s argument '%s'" msgstr "argumento inválido para %s%s: \"%s\"" -# , c-format #: lib/xstrtol-error.c:68 -#, fuzzy, c-format +#, c-format msgid "invalid suffix in %s%s argument '%s'" msgstr "sufixo inválido no argumento para %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\" muito grande" +msgstr "argumento de %s%s \"%s\" é grande demais" #. This is a proper name. See the gettext manual, section Names. #: src/base64.c:40 @@ -904,14 +872,13 @@ msgstr "Simon Josefsson" msgid "" "Usage: %s [OPTION]... [FILE]\n" "Base64 encode or decode FILE, or standard input, to standard output.\n" -"\n" msgstr "" -"Uso: %s [OPÇÃO] [ARQUIVO]\n" +"Uso: %s [OPÇÃO]... [ARQUIVO]\n" "Codifica ou decodifica na Base64 o ARQUIVO, ou a entrada padrão, para a " "saída\n" "padrão.\n" -#: src/base64.c:64 +#: src/base64.c:67 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -920,8 +887,14 @@ msgid "" " Use 0 to disable line wrapping\n" "\n" msgstr "" +" -d, --decode decodifica os dados\n" +" -i, --ignore-garbage ao decodificar, ignora caracteres não alfabéticos\n" +" -w, --wrap=COLS quebra linhas codificadas após COLS caracteres\n" +" (padrão: 76).\n" +" Use 0 para desabilitar\n" +"\n" -#: src/base64.c:73 src/cat.c:110 src/fmt.c:293 src/shuf.c:71 src/sum.c:70 +#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -929,7 +902,7 @@ msgstr "" "\n" "Se ARQUIVO não for especificado ou for -, lê a entrada padrão.\n" -#: src/base64.c:76 +#: src/base64.c:79 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -940,41 +913,40 @@ msgstr "" "\n" "Os dados são codificados como descrito para o alfabeto base64 na RFC 3548.\n" "Na decodificação, a entrada pode conter caracteres de nova linha além dos\n" -"bytes do alfabeto base64 formal. Use --ignore-garbage para tentar se\n" +"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:171 src/base64.c:208 src/csplit.c:263 src/csplit.c:1435 -#: src/join.c:451 src/shuf.c:157 src/shuf.c:361 src/tac-pipe.c:74 +#: 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 #, c-format msgid "read error" msgstr "erro de leitura" -#: src/base64.c:227 +#: src/base64.c:230 #, c-format msgid "invalid input" msgstr "entrada inválida" -# , c-format -#: src/base64.c:264 +#: src/base64.c:267 #, c-format msgid "invalid wrap size: %s" msgstr "tamanho inválido para quebra: %s" -#: src/base64.c:283 src/basename.c:173 src/comm.c:435 src/cp.c:607 -#: src/date.c:441 src/dircolors.c:447 src/du.c:894 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:169 src/install.c:929 src/join.c:961 -#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:157 src/mv.c:447 -#: src/od.c:1802 src/ptx.c:2081 src/readlink.c:154 src/seq.c:408 -#: src/shuf.c:320 src/shuf.c:339 src/sort.c:4477 src/split.c:1313 -#: src/tr.c:1797 src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:454 -#: src/uniq.c:471 src/unlink.c:81 src/uptime.c:250 src/users.c:146 -#: src/wc.c:666 src/who.c:836 src/whoami.c:79 +#: 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 #, c-format msgid "extra operand %s" msgstr "operando extra %s" -#: src/base64.c:315 src/cat.c:781 +#: src/base64.c:318 src/cat.c:781 #, c-format msgid "closing standard input" msgstr "fechando entrada padrão" @@ -982,46 +954,51 @@ 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/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:53 src/env.c:33 +#: 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/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:65 src/su.c:88 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 +#: 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 msgid "David MacKenzie" msgstr "David MacKenzie" -# , c-format #: src/basename.c:48 -#, fuzzy, c-format +#, c-format msgid "" "Usage: %s NAME [SUFFIX]\n" " or: %s OPTION... NAME...\n" msgstr "" "Uso: %s NOME [SUFIXO]\n" -" ou: %s OPÇÃO\n" +" ou: %s OPÇÃO... NOME...\n" #: src/basename.c:53 +#, fuzzy msgid "" "Print NAME with any leading directory components removed.\n" "If specified, also remove a trailing SUFFIX.\n" -"\n" msgstr "" "Mostra o NOME sem quaisquer componentes iniciais de diretório.\n" -"Se for especificado, remove também o SUFIXO final.\n" +"Se especificado, remove também o SUFIXO final.\n" "\n" -#: src/basename.c:59 +#: 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" msgstr "" +" -a, --multiple dá suporte a múltiplos argumentos e trata cada um " +"como um\n" +" NOME\n" +" -s, --suffix=SUFIXO remove um sufixo\n" +" -z, --zero separa a saída com um caractere NUL em vez de nova-" +"linha\n" -#: src/basename.c:66 +#: src/basename.c:67 #, c-format msgid "" "\n" @@ -1031,22 +1008,28 @@ msgid "" " %s -s .h include/stdio.h -> \"stdio\"\n" " %s -a any/str1 any/str2 -> \"str1\" followed by \"str2\"\n" msgstr "" +"\n" +"Exemplos:\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/txt1 algo/txt2 -> \"txt1\" seguido de \"txt2\"\n" -# , c-format -#: src/basename.c:167 src/chcon.c:531 src/chgrp.c:277 src/chmod.c:526 -#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1369 +#: 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:183 src/mkfifo.c:108 src/mknod.c:146 src/nohup.c:111 -#: src/pathchk.c:148 src/printf.c:674 src/readlink.c:146 src/realpath.c:236 -#: src/rm.c:314 src/rmdir.c:223 src/seq.c:402 src/setuidgid.c:137 -#: src/sleep.c:119 src/stat.c:1476 src/stdbuf.c:346 src/tr.c:1782 +#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 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 #, 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:52 src/split.c:49 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/split.c:49 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" @@ -1056,16 +1039,14 @@ msgstr "Torbjorn Granlund" msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -# , c-format -#: src/cat.c:88 src/df.c:846 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4720 src/nl.c:182 src/paste.c:435 src/pr.c:2768 src/sum.c:58 +#: 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/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "Uso: %s [OPÇÃO]... [ARQUIVO]...\n" #: src/cat.c:92 -#, fuzzy msgid "" "Concatenate FILE(s), or standard input, to standard output.\n" "\n" @@ -1079,12 +1060,13 @@ msgstr "" "Concatena ARQUIVO(s), ou a entrada padrão, para a saída padrão.\n" "\n" " -A, --show-all equivalente a -vET\n" -" -b, --number-nonblank numera as linhas de saída que não forem em branco\n" +" -b, --number-nonblank numera as linhas de saída que não forem em " +"branco,\n" +" sobrepõe -n\n" " -e equivalente a -vE\n" " -E, --show-ends insere $ ao final de cada linha\n" " -n, --number numera todas as linhas de saída\n" -" -s, --squeeze-blank suprime linhas em branco sucessivas, restando só " -"uma\n" +" -s, --squeeze-blank suprime linhas em branco repetidas\n" #: src/cat.c:102 msgid "" @@ -1113,18 +1095,16 @@ msgstr "" " por fim.\n" " %s Copia a entrada padrão para a saída padrão.\n" -# , c-format #: src/cat.c:326 #, c-format msgid "cannot do ioctl on %s" msgstr "é impossível executar a função \"ioctl\" em %s" -#: src/cat.c:637 src/dd.c:2209 src/sort.c:379 src/tee.c:165 src/yes.c:86 +#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86 #, c-format msgid "standard output" msgstr "saída padrão" -# , c-format #: src/cat.c:716 #, c-format msgid "%s: input file is output file" @@ -1137,14 +1117,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:55 src/head.c:46 src/hostid.c:33 +#: 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 msgid "Jim Meyering" msgstr "Jim Meyering" -#: src/chcon.c:100 src/runcon.c:203 src/runcon.c:234 +#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238 #, c-format msgid "failed to create security context: %s" msgstr "falhou em criar contexto de segurança: %s" @@ -1152,53 +1132,50 @@ msgstr "falhou em criar contexto de segurança: %s" #: src/chcon.c:112 #, c-format msgid "failed to set %s security context component to %s" -msgstr "falhou em definir componente %s do contexto de segurança para %s" +msgstr "falhou em definir o componente %s do contexto de segurança para %s" -#: src/chcon.c:156 src/chcon.c:540 src/copy.c:2222 src/runcon.c:217 -#: src/stat.c:683 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221 +#: src/stat.c:702 #, c-format msgid "failed to get security context of %s" -msgstr "falhou em obter contexto de segurança de %s" +msgstr "falhou em obter o contexto de segurança de %s" #: src/chcon.c:166 #, c-format 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" -# , c-format #: src/chcon.c:193 #, 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:446 src/ls.c:2981 +#: src/du.c:457 src/ls.c:2981 #, c-format msgid "cannot access %s" -msgstr "impossível acessar %s" +msgstr "não é possível acessar %s" -# , c-format -#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:426 +#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437 #, c-format msgid "cannot read directory %s" -msgstr "impossível ler diretório %s" +msgstr "não é possível ler diretório %s" -# , c-format #: src/chcon.c:292 -#, fuzzy, c-format +#, c-format msgid "changing security context of %s\n" -msgstr "alterando contexto de segurança de %s" +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:599 +#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562 #, 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:618 -#: src/remove.c:613 -#, fuzzy, c-format +#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642 +#: src/remove.c:576 +#, c-format msgid "fts_close failed" -msgstr "erro fechando arquivo" +msgstr "fts_close falhou" #: src/chcon.c:351 #, c-format @@ -1217,28 +1194,27 @@ msgid "" "Change the security context of each FILE to CONTEXT.\n" "With --reference, change the security context of each FILE to that of " "RFILE.\n" -"\n" msgstr "" "Muda o contexto de segurança de cada ARQUIVO para CONTEXTO.\n" "Com --reference, altera o contexto de segurança de cada ARQUIVO para o " "mesmo\n" -"do ARQUIVOREF.\n" +"do de ARQUIVOREF.\n" "\n" -" -c, --changes como --verbose, mas só avisa quando uma alteração\n" -" for feita\n" -" -h, --no-dereference afeta as ligações simbólicas em vez dos arquivos\n" -" referenciados por elas\n" -#: src/chcon.c:362 src/chgrp.c:123 src/chown.c:94 +#: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94 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 "" +" --dereference afeta a referência de cada ligação simbólica em " +"vez\n" +" da própria ligação em si (isso é o padrão)\n" +" -h, --no-dereference afeta as ligações simbólicas em vez dos arquivos\n" +" referenciados por elas\n" -#: src/chcon.c:367 -#, fuzzy +#: src/chcon.c:369 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" @@ -1250,10 +1226,16 @@ msgstr "" " -r, --role=REGRA define a regra REGRA no contexto de segurança alvo\n" " -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" -"\n" -#: src/chcon.c:373 -#, fuzzy +#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 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 não tratar \"/\" de forma diferenciada (o padrão)\n" +" --preserve-root falha ao operar recursivamente em \"/\"\n" + +#: src/chcon.c:379 msgid "" " --reference=RFILE use RFILE's security context rather than " "specifying\n" @@ -1261,19 +1243,18 @@ msgid "" msgstr "" " --reference=ARQR usa o contexto de segurança de ARQR em vez de\n" " especificar um valor para CONTEXTO\n" -" -R, --recursive opera em arquivos e diretórios recursivamente\n" -" -v, --verbose emite um diagnóstico para cada arquivo processado\n" -#: src/chcon.c:377 src/chgrp.c:140 src/chown.c:118 +#: 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 em arquivos e diretórios recursivamente\n" -#: src/chcon.c:380 +#: src/chcon.c:386 msgid " -v, --verbose output a diagnostic for every file processed\n" msgstr "" +" -v, --verbose emite um diagnóstico para cada arquivo processado\n" -#: src/chcon.c:383 src/chgrp.c:143 src/chown.c:121 -#, fuzzy +#: src/chcon.c:389 src/chgrp.c:143 src/chown.c:121 msgid "" "\n" "The following options modify how a hierarchy is traversed when the -R\n" @@ -1287,49 +1268,48 @@ msgid "" " -P do not traverse any symbolic links (default)\n" "\n" msgstr "" +"\n" "As seguintes opções modificam como uma hierarquia é percorrida quando a\n" -"opção -R é também especificada. Se mais de uma destas forem especificadas,\n" +"opção -R é especificada também. Se mais de uma destas forem especificadas,\n" "somente a última faz efeito.\n" "\n" " -H se um argumento da linha de comando for uma\n" " ligação simbólica para diretório, percorra-o\n" -" -L percorra cada ligação simbólica para diretório\n" -" encontrada\n" +" -L percorra toda ligação simbólica para diretório\n" +" que for encontrada\n" " -P não percorra ligações simbólicas (padrão)\n" "\n" -#: src/chcon.c:512 src/chgrp.c:264 src/chown.c:267 +#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267 #, c-format msgid "-R --dereference requires either -H or -L" msgstr "-R --dereference exige -H ou -L" -#: src/chcon.c:518 +#: src/chcon.c:524 #, c-format msgid "-R -h requires -P" msgstr "-R -h exige -P" -# , c-format -#: src/chcon.c:533 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282 -#: src/comm.c:429 src/csplit.c:1371 src/join.c:1149 src/link.c:79 -#: src/mknod.c:148 src/setuidgid.c:139 src/tr.c:1785 +#: 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 #, c-format msgid "missing operand after %s" msgstr "falta operando depois de %s" -# , c-format -#: src/chcon.c:556 src/runcon.c:247 +#: src/chcon.c:562 src/runcon.c:251 #, c-format msgid "invalid context: %s" msgstr "contexto inválido: %s" -#: src/chcon.c:563 +#: src/chcon.c:569 #, c-format msgid "conflicting security context specifiers given" msgstr "foram fornecidos especificadores de contexto de segurança conflitantes" -#: src/chcon.c:572 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:433 src/cp.c:493 -#: src/mv.c:96 src/pwd.c:273 src/rm.c:324 src/touch.c:351 +#: 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 #, c-format msgid "failed to get attributes of %s" msgstr "falhou em obter os atributos de %s" @@ -1339,7 +1319,6 @@ msgstr "falhou em obter os atributos de %s" msgid "invalid group: %s" msgstr "grupo inválido: %s" -# , c-format #: src/chgrp.c:108 #, c-format msgid "" @@ -1350,21 +1329,15 @@ msgstr "" " ou: %s [OPÇÃO]... --reference=ARQUIVOREF ARQUIVO...\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 "" -"Muda o contexto de segurança de cada ARQUIVO para CONTEXTO.\n" -"Com --reference, altera o contexto de segurança de cada ARQUIVO para o " -"mesmo\n" -"do ARQUIVOREF.\n" +"Altera o grupo de cada ARQUIVO para GRUPO.\n" +"Com --reference, altera o grupo de cada ARQUIVO para o mesmo de\n" +"ARQUIVOREF.\n" "\n" -" -c, --changes como --verbose, mas só avisa quando uma alteração\n" -" for feita\n" -" -h, --no-dereference afeta as ligações simbólicas em vez dos arquivos\n" -" referenciados por elas\n" #: src/chgrp.c:118 src/chmod.c:382 src/chown.c:89 msgid "" @@ -1372,31 +1345,27 @@ msgid "" " -f, --silent, --quiet suppress most error messages\n" " -v, --verbose output a diagnostic for every file processed\n" msgstr "" +" -c, --changes como verbose, mas só relata quando há uma " +"alteração\n" +" -f, --silent, --quiet suprime a maioria das mensagens de erro\n" +" -v, --verbose emite um diagnóstico para cada arquivo processado\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 "" -" -h, --no-dereference afeta cada ligação simbólica em vez do arquivo por\n" -" ela referenciado (útil somente em sistemas que\n" -" permitem mudar o dono de uma ligação simbólica)\n" - -#: src/chgrp.c:132 src/chmod.c:387 src/chown.c:110 -#, fuzzy -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 diferenciada (o padrão)\n" -" --preserve-root falha ao operar recursivamente em \"/\"\n" +" (útil somente em sistemas que permitem mudar o " +"dono\n" +" de uma ligação simbólica)\n" #: src/chgrp.c:136 msgid "" " --reference=RFILE use RFILE's group rather than specifying a\n" " GROUP value\n" msgstr "" +" --reference=ARQR usa o grupo de ARQR em vez de especificar um\n" +" valor para GRUPO\n" #: src/chgrp.c:158 #, c-format @@ -1422,33 +1391,30 @@ 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 -#, fuzzy, c-format +#, c-format msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n" -msgstr "modo de %s alterado para %04lo (%s)\n" +msgstr "modo de %s alterado de %04lo (%s) para %04lo (%s)\n" #: src/chmod.c:166 -#, fuzzy, c-format +#, c-format msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n" -msgstr "falhou em alterar o modo de %s para %04lo (%s)\n" +msgstr "falhou em alterar o modo de %s de %04lo (%s) para %04lo (%s)\n" #: src/chmod.c:169 #, c-format msgid "mode of %s retained as %04lo (%s)\n" msgstr "modo de %s mantido como %04lo (%s)\n" -# , c-format #: src/chmod.c:236 #, c-format msgid "cannot operate on dangling symlink %s" msgstr "impossível operar na ligação simbólica quebrada %s" -# , c-format #: src/chmod.c:276 #, c-format msgid "changing permissions of %s" msgstr "alterando permissões de %s" -# , c-format #: src/chmod.c:311 #, c-format msgid "%s: new permissions are %s, not %s" @@ -1466,83 +1432,72 @@ msgstr "" " ou: %s [OPÇÃO]... --reference=ARQREF ARQUIVO...\n" #: src/chmod.c:377 -#, fuzzy 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 "" -"Muda o contexto de segurança de cada ARQUIVO para CONTEXTO.\n" -"Com --reference, altera o contexto de segurança de cada ARQUIVO para o " -"mesmo\n" -"do ARQUIVOREF.\n" +"Muda o modo de cada ARQUIVO para MODO.\n" +"Com --reference, altera o modo de cada ARQUIVO para o mesmo de ARQREF.\n" "\n" -" -c, --changes como --verbose, mas só avisa quando uma alteração\n" -" for feita\n" -" -h, --no-dereference afeta as ligações simbólicas em vez dos arquivos\n" -" referenciados por elas\n" #: src/chmod.c:391 msgid " --reference=RFILE use RFILE's mode instead of MODE values\n" -msgstr "" +msgstr " --reference=ARQR usa o modo de ARQR em vez dos valores MODO\n" #: src/chmod.c:394 msgid " -R, --recursive change files and directories recursively\n" msgstr "" +" -R, --recursive altera os arquivos e diretórios recursivamente\n" #: src/chmod.c:399 -#, fuzzy msgid "" "\n" "Each MODE is of the form '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n" msgstr "" "\n" -"Cada MODO é da forma \"[ugoa]*([-+=]([rwxXst]*|[ugo]))+\".\n" +"Cada MODO é da forma \"[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+\".\n" #: src/chmod.c:513 #, c-format msgid "cannot combine mode and --reference options" msgstr "é impossível combinar as opções MODO e --reference" -# , c-format #: src/chmod.c:544 #, c-format msgid "invalid mode: %s" msgstr "modo inválido: %s" #: src/chown-core.c:158 -#, fuzzy, c-format +#, c-format msgid "changed ownership of %s from %s to %s\n" -msgstr "alterado o dono de %s para %s\n" +msgstr "alterado o dono de %s de %s para %s\n" #: src/chown-core.c:159 -#, fuzzy, c-format +#, c-format msgid "changed group of %s from %s to %s\n" -msgstr "alterado o grupo de %s para %s\n" +msgstr "alterado o grupo de %s de %s para %s\n" #: src/chown-core.c:160 #, c-format msgid "no change to ownership of %s\n" msgstr "não foi alterada a posse de %s\n" -# , c-format #: src/chown-core.c:165 -#, fuzzy, c-format +#, c-format msgid "failed to change ownership of %s from %s to %s\n" -msgstr "falhou em alterar dono de %s para %s\n" +msgstr "falhou em alterar dono de %s de %s para %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 "falhou em alterar o grupo de %s para %s\n" +msgstr "falhou em alterar o grupo de %s de %s para %s\n" -# , c-format #: src/chown-core.c:167 src/chown-core.c:173 #, c-format msgid "failed to change ownership of %s\n" msgstr "falhou em alterar a posse de %s\n" -# , c-format #: src/chown-core.c:171 #, c-format msgid "failed to change ownership of %s to %s\n" @@ -1568,7 +1523,6 @@ msgstr "grupo de %s mantido como %s\n" msgid "ownership of %s retained\n" msgstr "mantida a posse de %s\n" -# , c-format #: src/chown-core.c:379 #, c-format msgid "cannot dereference %s" @@ -1584,7 +1538,6 @@ msgstr "alterando o dono de %s" msgid "changing group of %s" msgstr "alterando o grupo de %s" -# , c-format #: src/chown.c:79 #, c-format msgid "" @@ -1601,9 +1554,11 @@ msgid "" "RFILE.\n" "\n" msgstr "" +"Altera o dono e/ou grupo de cada ARQUIVO para DONO e/ou GRUPO.\n" +"Com --reference, altera o dono e grupo de cada ARQUIVO para o de ARQR\n" +"\n" #: src/chown.c:103 -#, fuzzy msgid "" " --from=CURRENT_OWNER:CURRENT_GROUP\n" " change the owner and/or group of each file only if\n" @@ -1617,8 +1572,8 @@ msgstr "" " muda dono e/ou grupo de cada arquivo apenas se seu\n" " dono e/ou grupo atual forem iguais aos\n" " especificados nesta opção. Um dos dois pode ser\n" -" omitido, caso não seja exigido o teste do atributo\n" -" omitido.\n" +" omitido, no caso de não ser exigido o teste de tal\n" +" atributo\n" #: src/chown.c:114 msgid "" @@ -1627,7 +1582,6 @@ msgid "" msgstr "" #: src/chown.c:136 -#, fuzzy msgid "" "\n" "Owner is unchanged if missing. Group is unchanged if missing, but changed\n" @@ -1635,8 +1589,8 @@ msgid "" "OWNER and GROUP may be numeric as well as symbolic.\n" msgstr "" "\n" -"O dono, caso não informado, permanece inalterado. O grupo também não é\n" -"alterado se não for informado, mas mudará para o grupo de login se deixado\n" +"O dono, caso não seja informado, permanece inalterado. O grupo também não é\n" +"alterado se não informado, mas mudará para o grupo de login se deixado\n" "implícito por \":\" após um DONO simbólico.\n" "DONO e GRUPO podem ser numéricos bem como simbólicos.\n" @@ -1660,29 +1614,28 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:97 src/install.c:575 src/setuidgid.c:110 src/setuidgid.c:120 +#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120 #, c-format msgid "invalid group %s" msgstr "grupo inválido %s" #: src/chroot.c:109 -#, fuzzy, c-format +#, c-format msgid "invalid group list %s" -msgstr "grupo inválido %s" +msgstr "lista de grupo inválido %s" #: src/chroot.c:117 -#, fuzzy, c-format +#, c-format msgid "failed to set additional groups" -msgstr "falhou em estabelecer grupo(s) suplementar(es)" +msgstr "falhou em estabelecer grupo(s) adicional(ais)" -# , c-format #: src/chroot.c:132 -#, fuzzy, c-format +#, c-format msgid "" "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" " or: %s OPTION\n" msgstr "" -"Uso: %s OPÇÃO USUÁRIO COMANDO [ARGUMENTO]...\n" +"Uso: %s [OPÇÃO] NOVORAIZ [COMANDO [ARGUMENTO]...]\n" " ou: %s OPÇÃO\n" #: src/chroot.c:137 @@ -1700,42 +1653,39 @@ msgid "" msgstr "" #: src/chroot.c:149 -#, fuzzy msgid "" "\n" "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n" msgstr "" "\n" -"Se nenhum COMANDO for dado, executa \"`${SHELL} -i'\" (padrão: /bin/sh).\n" +"Se nenhum COMANDO for dado, executa \"`${SHELL} -i'\" (padrão: \"/bin/sh -i" +"\").\n" -# , c-format #: src/chroot.c:202 #, c-format msgid "cannot change root directory to %s" msgstr "não foi possível mudar o diretório raiz para %s" -# , c-format #: src/chroot.c:206 #, c-format msgid "cannot chdir to root directory" msgstr "não foi possível ir para o diretório raiz" #: src/chroot.c:247 -#, fuzzy, c-format +#, c-format msgid "failed to set group-ID" -msgstr "falhou em definir a nova regra %s" +msgstr "falhou em definir o ID de grupo" #: src/chroot.c:253 -#, fuzzy, c-format +#, c-format msgid "failed to set user-ID" -msgstr "falhou em definir o novo usuário %s" +msgstr "falhou em definir o ID de usuário" -# , c-format -#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:213 src/stdbuf.c:366 -#: src/timeout.c:402 -#, fuzzy, c-format +#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365 +#: src/timeout.c:454 +#, c-format msgid "failed to run command %s" -msgstr "não foi possível executar o comando %s" +msgstr "falhou em executar o comando %s" #. This is a proper name. See the gettext manual, section Names. #: src/cksum.c:40 @@ -1747,7 +1697,6 @@ msgstr "Q. Frank Xia" msgid "%s: file too long" msgstr "%s: arquivo muito grande" -# , c-format #: src/cksum.c:263 #, c-format msgid "" @@ -1765,7 +1714,6 @@ msgstr "" "Exibe a soma de verificação CRC e o total de bytes de cada ARQUIVO.\n" "\n" -# , c-format #: src/comm.c:103 src/join.c:187 #, c-format msgid "Usage: %s [OPTION]... FILE1 FILE2\n" @@ -1788,7 +1736,6 @@ msgstr "" "ARQUIVO2; a terceira coluna contém as linhas comuns a ambos os arquivos.\n" #: src/comm.c:116 -#, fuzzy msgid "" "\n" " -1 suppress column 1 (lines unique to FILE1)\n" @@ -1796,25 +1743,20 @@ msgid "" " -3 suppress column 3 (lines that appear in both files)\n" msgstr "" "\n" -" -1 suprime as linhas que só existem em ARQUIVO1\n" -" -2 suprime as linhas que só existem em ARQUIVO2\n" -" -3 suprime as linhas que aparecem em ambos os arquivos\n" +" -1 suprime a coluna 1 (linhas só existentes em ARQUIVO1)\n" +" -2 suprime a coluna 2 (linhas só existentes em ARQUIVO2)\n" +" -3 suprime a coluna 3 (linhas existentes nos dois arquivos)\n" #: src/comm.c:122 -#, fuzzy msgid "" "\n" " --check-order check that the input is correctly sorted, even\n" " if all input lines are pairable\n" " --nocheck-order do not check that the input is correctly sorted\n" msgstr "" -" -v ARQUIVONUM como -a ARQUIVONUM, mas suprime as linhas de saída " -"unidas\n" -" -1 CAMPO junta baseado neste CAMPO do arquivo 1\n" -" -2 CAMPO junta baseado neste CAMPO do arquivo 2\n" -" --check-order verifica se a entrada está corretamente ordenada, mesmo " -"se\n" -" todas as linhas de entrada forem pareáveis\n" +"\n" +" --check-order verifica se a entrada está corretamente ordenada, mesmo\n" +" sendo todas as linhas de entrada pareáveis\n" " --nocheck-order não verifica se a entrada está ordenada corretamente\n" #: src/comm.c:128 @@ -1837,36 +1779,38 @@ msgid "" msgstr "" #: src/comm.c:222 -#, fuzzy, c-format +#, c-format msgid "file %d is not in sorted order" -msgstr "O arquivo %d não está ordenado" +msgstr "o arquivo %d não está ordenado" #: src/comm.c:407 -#, fuzzy, c-format +#, c-format msgid "multiple delimiters specified" -msgstr "foram especificadas múltiplas opções -i" +msgstr "foram especificados múltiplos delimitadores" #: src/comm.c:411 #, c-format msgid "empty %s not allowed" msgstr "" -# , c-format -#: src/copy.c:168 src/dd.c:1609 src/dd.c:1976 +#: 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 #, c-format -msgid "reading %s" -msgstr "lendo %s" +msgid "error reading %s" +msgstr "erro lendo %s" -#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:426 +#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425 #, c-format msgid "cannot lseek %s" msgstr "impossível fazer \"lseek\" em %s" -# , c-format -#: src/copy.c:206 src/dd.c:2039 src/dd.c:2102 +#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151 #, c-format -msgid "writing %s" -msgstr "escrevendo %s" +msgid "error writing %s" +msgstr "erro escrevendo %s" #: src/copy.c:313 #, fuzzy, c-format @@ -1874,22 +1818,21 @@ msgid "%s: failed to get extents info" msgstr "falhou em obter o contexto atual" #: src/copy.c:373 -#, fuzzy, c-format +#, c-format msgid "%s: write failed" -msgstr "erro de escrita" +msgstr "%s: falhou em escrever" #: src/copy.c:442 src/copy.c:1083 #, fuzzy, c-format msgid "failed to extend %s" msgstr "falhou em abrir %s" -# , c-format #: src/copy.c:662 #, c-format msgid "clearing permissions for %s" msgstr "apagando as permissões para %s" -#: src/copy.c:697 src/copy.c:2470 src/cp.c:331 +#: src/copy.c:697 src/copy.c:2480 src/cp.c:329 #, c-format msgid "failed to preserve ownership for %s" msgstr "falhou em preservar o dono para %s" @@ -1904,14 +1847,14 @@ msgstr "falhou em localizar o arquivo %s" msgid "failed to preserve authorship for %s" msgstr "falhou em preservar a autoria para %s" -#: src/copy.c:804 src/csplit.c:638 src/du.c:901 src/fmt.c:449 src/head.c:847 -#: src/sort.c:4489 src/split.c:1329 src/tail.c:1756 src/wc.c:678 +#: 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 "não foi possível abrir %s para leitura" -#: src/copy.c:810 src/copy.c:972 src/dd.c:1546 src/dd.c:2114 src/dd.c:2252 -#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:141 +#: 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 #, c-format msgid "cannot fstat %s" msgstr "não foi possível obter o estado de %s" @@ -1931,15 +1874,14 @@ msgstr "falhou em obter o contexto de criação do sistema de arquivos" msgid "failed to set the security context of %s to %s" msgstr "falhou em definir o contexto de segurança de %s para %s" -# , c-format -#: src/copy.c:881 src/copy.c:1574 src/copy.c:1777 src/copy.c:1935 src/ln.c:314 -#: src/remove.c:267 src/remove.c:293 src/remove.c:444 src/remove.c:465 +#: 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 #, c-format msgid "cannot remove %s" msgstr "não foi possível remover %s" -#: src/copy.c:886 src/copy.c:1578 src/copy.c:1772 src/copy.c:1940 -#: src/remove.c:418 +#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945 +#: src/remove.c:375 #, c-format msgid "removed %s\n" msgstr "removido %s\n" @@ -1949,215 +1891,200 @@ msgstr "removido %s\n" msgid "not writing through dangling symlink %s" msgstr "não se escreve através de uma ligação simbólica quebrada: %s" -# , c-format #: src/copy.c:964 #, c-format msgid "cannot create regular file %s" msgstr "não foi possível criar arquivo comum %s" #: src/copy.c:985 -#, fuzzy, c-format +#, c-format msgid "failed to clone %s from %s" -msgstr "falhou em abrir %s" +msgstr "falhou em clonar %s a partir de %s" -#: src/copy.c:1098 src/copy.c:2531 +#: src/copy.c:1098 src/copy.c:2541 #, c-format msgid "preserving times for %s" msgstr "preservando horário para %s" -#: src/copy.c:1170 src/copy.c:1176 src/head.c:855 src/touch.c:175 -#: src/truncate.c:413 -#, c-format -msgid "closing %s" -msgstr "fechando %s" +#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172 +#: src/truncate.c:417 +#, fuzzy, c-format +msgid "failed to close %s" +msgstr "falhou em abrir %s" -#: src/copy.c:1466 +#: src/copy.c:1471 #, c-format msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? " msgstr "%s: tentar sobrescrever %s, desobedecendo o modo %04lo (%s)? " -#: src/copy.c:1473 +#: src/copy.c:1478 #, c-format msgid "%s: overwrite %s? " msgstr "%s: sobrescrever %s? " -#: src/copy.c:1542 +#: src/copy.c:1547 #, c-format msgid " (backup: %s)" msgstr " (cópia de segurança: %s)" -#: src/copy.c:1552 +#: src/copy.c:1557 #, c-format msgid "failed to restore the default file creation context" msgstr "falhou em restaurar o contexto padrão de criação de arquivo" -# , c-format -#: src/copy.c:1584 +#: src/copy.c:1589 #, c-format msgid "cannot create hard link %s to %s" msgstr "não foi possível criar ligação absoluta %s para %s" -# , c-format -#: src/copy.c:1637 src/copy.c:1689 src/copy.c:2272 src/copy.c:2589 +#: 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:1220 src/truncate.c:365 +#: src/stat.c:1239 src/truncate.c:363 #, c-format msgid "cannot stat %s" msgstr "impossível obter estado de %s" -# , c-format -#: src/copy.c:1645 +#: src/copy.c:1650 #, c-format msgid "omitting directory %s" msgstr "omitindo o diretório %s" -#: src/copy.c:1659 +#: src/copy.c:1664 #, 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:1707 src/ln.c:246 +#: src/copy.c:1712 src/ln.c:246 #, c-format msgid "%s and %s are the same file" msgstr "%s e %s são o mesmo arquivo" -# , c-format -#: src/copy.c:1806 +#: src/copy.c:1811 #, 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:1824 src/ln.c:214 +#: src/copy.c:1829 src/ln.c:214 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "não sobrescreverá o recém-criado %s com %s" -# , c-format -#: src/copy.c:1842 +#: src/copy.c:1847 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "é impossível sobrescrever diretório %s com um não-diretório" -# , c-format -#: src/copy.c:1856 +#: src/copy.c:1861 #, 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:1886 +#: src/copy.c:1891 #, 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:1887 +#: src/copy.c:1892 #, 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:1910 src/ln.c:276 +#: src/copy.c:1915 src/ln.c:276 #, c-format msgid "cannot backup %s" msgstr "não foi possível fazer cópia de segurança de %s" -#: src/copy.c:1974 +#: src/copy.c:1979 #, 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" -# , c-format -#: src/copy.c:2051 +#: src/copy.c:2056 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "é impossível copiar um diretório, %s, para si próprio, %s" -# , c-format -#: src/copy.c:2068 +#: src/copy.c:2073 #, 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" -# , c-format -#: src/copy.c:2118 +#: src/copy.c:2123 #, 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" -# , c-format -#: src/copy.c:2161 +#: src/copy.c:2166 #, c-format msgid "cannot move %s to %s" msgstr "não foi possível mover %s para %s" -#: src/copy.c:2173 +#: src/copy.c:2178 #, 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:2207 src/install.c:905 src/mkdir.c:189 src/mkfifo.c:114 -#: src/mknod.c:167 +#: 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:2241 +#: src/copy.c:2246 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "é impossível copiar ligação simbólica cíclica %s" -#: src/copy.c:2350 +#: src/copy.c:2355 #, 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" -# , c-format -#: src/copy.c:2357 +#: src/copy.c:2362 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "não foi possível criar ligação simbólica %s para %s" -# , c-format -#: src/copy.c:2406 src/mkfifo.c:133 +#: src/copy.c:2416 src/mkfifo.c:132 #, c-format msgid "cannot create fifo %s" msgstr "não foi possível criar fifo %s" -#: src/copy.c:2415 +#: src/copy.c:2425 #, c-format msgid "cannot create special file %s" msgstr "não foi possível criar arquivo especial %s" -# , c-format -#: src/copy.c:2426 src/ls.c:3191 src/stat.c:902 +#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921 #, c-format msgid "cannot read symbolic link %s" msgstr "não foi possível ler ligação simbólica %s" -# , c-format -#: src/copy.c:2453 +#: src/copy.c:2463 #, c-format msgid "cannot create symbolic link %s" msgstr "não foi possível criar ligação simbólica %s" -#: src/copy.c:2485 +#: src/copy.c:2495 #, c-format msgid "%s has unknown file type" msgstr "%s tem um tipo desconhecido de arquivo" -#: src/copy.c:2629 src/ln.c:358 +#: src/copy.c:2644 src/ln.c:358 #, c-format msgid "cannot un-backup %s" msgstr "não foi possível restaurar a cópia de segurança %s" -#: src/copy.c:2633 +#: src/copy.c:2648 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (cópia de segurança restaurada)\n" -#: src/cp.c:156 src/mv.c:284 +#: src/cp.c:156 src/mv.c:286 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -2169,27 +2096,13 @@ msgstr "" " ou: %s [OPÇÃO]... -t DIRETÓRIO ORIGEM...\n" #: src/cp.c:162 -msgid "" -"Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" -"\n" +#, 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:166 src/csplit.c:1458 src/cut.c:197 src/df.c:852 src/du.c:268 -#: src/expand.c:112 src/fmt.c:275 src/fold.c:75 src/head.c:115 -#: src/install.c:612 src/kill.c:86 src/ln.c:392 src/ls.c:4726 src/mkdir.c:61 -#: src/mkfifo.c:56 src/mknod.c:58 src/mv.c:294 src/nl.c:191 src/paste.c:445 -#: src/pr.c:2777 src/ptx.c:1825 src/shred.c:153 src/shuf.c:58 src/sort.c:399 -#: src/split.c:211 src/stdbuf.c:95 src/tac.c:142 src/tail.c:268 -#: src/touch.c:226 src/truncate.c:107 src/unexpand.c:122 src/uniq.c:145 -msgid "" -"Mandatory arguments to long options are mandatory for short options too.\n" -msgstr "" -"Argumentos obrigatórios para opções longas também o são para opções curtas.\n" - -#: src/cp.c:169 -#, fuzzy +#: src/cp.c:168 msgid "" " -a, --archive same as -dR --preserve=all\n" " --attributes-only don't copy the file data, just the " @@ -2202,7 +2115,9 @@ msgid "" "recursive\n" " -d same as --no-dereference --preserve=links\n" msgstr "" -" -a, --archive o mesmo que -dpR\n" +" -a, --archive o mesmo que -dR --preserve=all\n" +" --attributes-only não copia os dados do arquivo, só seus\n" +" atributos\n" " --backup[=CONTROLE] faz uma cópia de segurança de cada arquivo\n" " de destino já existente\n" " -b como --backup, mas não aceita argumentos\n" @@ -2211,13 +2126,14 @@ msgstr "" " -d o mesmo que --no-dereference --" "preserve=links\n" -#: src/cp.c:178 +#: src/cp.c:177 #, fuzzy msgid "" " -f, --force if an existing destination file cannot be\n" -" opened, remove it and try again (redundant " -"if\n" -" the -n option is used)\n" +" opened, remove it and try again (this " +"option\n" +" is ignored when the -n option is also " +"used)\n" " -i, --interactive prompt before overwrite (overrides a previous " "-n\n" " option)\n" @@ -2226,35 +2142,33 @@ msgstr "" " -f, --force se um arquivo de destino já existente não " "puder\n" " ser aberto, remove-o e tenta novamente\n" -" -i, --interactive pergunta antes de sobrescrever\n" +" (redundante se a opção -n for usada)\n" +" -i, --interactive pergunta antes de sobrescrever (sobrepõe\n" +" uma opção -n usada anteriormente)\n" " -H segue as ligações simbólicas da linha de\n" " comando em ORIGEM\n" -#: src/cp.c:188 -#, fuzzy +#: src/cp.c:186 msgid "" " -l, --link hard link files instead of copying\n" " -L, --dereference always follow symbolic links in SOURCE\n" msgstr "" -" -l, --link liga arquivos em vez de copiar\n" +" -l, --link faz ligação absoluta dos arquivos em vez de\n" +" copiá-los\n" " -L, --dereference sempre segue ligações simbólicas em ORIGEM\n" -#: src/cp.c:192 -#, fuzzy +#: src/cp.c:190 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 "" -" -f, --force se um arquivo de destino já existente não " -"puder\n" -" ser aberto, remove-o e tenta novamente\n" -" -i, --interactive pergunta antes de sobrescrever\n" -" -H segue as ligações simbólicas da linha de\n" -" comando em ORIGEM\n" +" -n, --no-clobber não sobrescreve um arquivo existente " +"(sobrepõe\n" +" uma opção -i anterior)\n" +" -P, --no-dereference nunca segue uma ligação simbólica em ORIGEM\n" -#: src/cp.c:197 -#, fuzzy +#: src/cp.c:195 msgid "" " -p same as --preserve=mode,ownership,timestamps\n" " --preserve[=ATTR_LIST] preserve the specified attributes (default:\n" @@ -2267,17 +2181,17 @@ msgstr "" " --preserve[=LST_ATRIB] preserva os atributos especificados (padrão:\n" " modo,dono,horários), e, se possível,\n" " atributos adicionais: contexto, ligações,\n" -" tudo.\n" +" estendidos, tudo.\n" " Os nomes a serem usados na lista devem " "estar\n" " em inglês separados por vírgula e sem " "espaço.\n" " Os atributos são: mode (modo),\n" " ownership (dono), timestamps (horários),\n" -" context (contexto), links (ligações) e all\n" -" (tudo)\n" +" context (contexto), links (ligações),\n" +" xattr (estendidos) e all (tudo)\n" -#: src/cp.c:205 +#: src/cp.c:203 msgid "" " --no-preserve=ATTR_LIST don't preserve the specified attributes\n" " --parents use full source file name under DIRECTORY\n" @@ -2286,8 +2200,7 @@ msgstr "" " --parents usa o nome completo do arquivo fonte sob\n" " DIRETÓRIO\n" -#: src/cp.c:209 -#, fuzzy +#: src/cp.c:207 msgid "" " -R, -r, --recursive copy directories recursively\n" " --reflink[=WHEN] control clone/CoW copies. See below\n" @@ -2296,23 +2209,24 @@ msgid "" "force)\n" msgstr "" " -R, -r, --recursive copia os diretórios recursivamente\n" +" --reflink[=QUANDO] controla cópias clone/CoW. Veja abaixo\n" " --remove-destination remove cada arquivo de destino existente " "antes\n" " de tentar abri-lo (contrasta com --force)\n" -#: src/cp.c:215 -#, fuzzy +#: src/cp.c:213 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=QUANDO controla a criação de arquivos esparsos\n" +" --sparse=QUANDO controla a criação de arquivos esparsos.\n" +" Veja abaixo\n" " --strip-trailing-slashes remove as barras finais de cada argumento\n" " ORIGEM\n" -#: src/cp.c:220 +#: src/cp.c:218 msgid "" " -s, --symbolic-link make symbolic links instead of copying\n" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -2326,7 +2240,7 @@ msgstr "" " diretório DIR\n" " -T, --no-target-directory trata DESTINO como um arquivo normal\n" -#: src/cp.c:226 +#: src/cp.c:224 msgid "" " -u, --update copy only when the SOURCE file is newer\n" " than the destination file or when the\n" @@ -2341,8 +2255,7 @@ msgstr "" " -v, --verbose explica o que está sendo feito\n" " -x, --one-file-system permanece neste sistema de arquivos\n" -#: src/cp.c:235 -#, fuzzy +#: src/cp.c:233 msgid "" "\n" "By default, sparse SOURCE files are detected by a crude heuristic and the\n" @@ -2362,12 +2275,15 @@ msgstr "" "básica e os respectivos arquivos de DESTINOs são também feitos esparsos.\n" "Este é o comportamento escolhido por --sparse=auto. Especifique\n" "--sparse=always para criar um arquivo esparso em DESTINO sempre que o\n" -"arquivo ORIGEM tiver uma seqüência de bytes zero suficientemente grande.\n" +"arquivo ORIGEM tiver uma sequência de bytes zero suficientemente grande.\n" "Use --sparse=never para inibir a criação de arquivos esparsos.\n" "\n" +"Quando --reflink[=always] for especificado, realiza uma cópia leve, em que\n" +"os blocos de dados são copiados somente quando modificados. Se isso não\n" +"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:247 src/install.c:649 src/ln.c:421 src/mv.c:321 -#, fuzzy +#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322 msgid "" "\n" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -2385,7 +2301,7 @@ msgstr "" "são:\n" "\n" -#: src/cp.c:254 src/install.c:656 src/mv.c:328 +#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329 msgid "" " none, off never make backups (even if --backup is given)\n" " numbered, t make numbered backups\n" @@ -2399,7 +2315,7 @@ msgstr "" " simples em caso contrário\n" " simple, never sempre faz cópias de segurança simples\n" -#: src/cp.c:260 +#: src/cp.c:258 msgid "" "\n" "As a special case, cp makes a backup of SOURCE when the force and backup\n" @@ -2411,96 +2327,93 @@ 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:319 +#: src/cp.c:317 #, c-format msgid "failed to preserve times for %s" msgstr "falhou em preservar horário para %s" -# , c-format -#: src/cp.c:350 +#: src/cp.c:348 #, c-format msgid "failed to preserve permissions for %s" msgstr "falhou em preservar permissões para %s" -# , c-format -#: src/cp.c:477 +#: src/cp.c:475 #, c-format msgid "cannot make directory %s" msgstr "não foi possível criar diretório %s" -#: src/cp.c:526 src/cp.c:545 +#: src/cp.c:524 src/cp.c:543 #, c-format msgid "%s exists but is not a directory" msgstr "%s existe, mas não é um diretório" -#: src/cp.c:572 src/cp.c:1068 src/install.c:401 src/install.c:844 src/ln.c:123 -#: src/ln.c:181 src/ln.c:202 src/ln.c:516 src/mv.c:152 src/mv.c:399 -#, c-format -msgid "accessing %s" -msgstr "acessando %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 +#, fuzzy, c-format +msgid "failed to access %s" +msgstr "falhou em abrir %s" -#: src/cp.c:592 src/install.c:914 src/ln.c:546 src/mv.c:432 src/shred.c:1182 -#: src/touch.c:433 src/truncate.c:356 +#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181 +#: src/touch.c:429 src/truncate.c:354 #, c-format msgid "missing file operand" msgstr "falta o operando arquivo" -#: src/cp.c:594 src/install.c:916 src/ln.c:560 src/mv.c:434 +#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436 #, c-format msgid "missing destination file operand after %s" msgstr "falta o operando arquivo de destino após %s" -#: src/cp.c:603 src/install.c:925 src/mv.c:443 -#, fuzzy, c-format +#: src/cp.c:601 src/install.c:926 src/mv.c:445 +#, 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)" +"é impossível combinar --target-directory (-t) com --no-target-directory (-T)" -#: src/cp.c:619 src/cp.c:1070 src/install.c:403 src/install.c:846 -#: src/install.c:938 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:401 -#: src/mv.c:457 +#: 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 #, c-format msgid "target %s is not a directory" msgstr "o alvo %s não é um diretório" -#: src/cp.c:730 +#: src/cp.c:728 #, 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:1063 src/install.c:839 src/ln.c:511 src/mv.c:394 +#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395 #, c-format msgid "multiple target directories specified" msgstr "foram especificados múltiplos diretórios-alvo" -#: src/cp.c:1108 +#: src/cp.c:1110 #, c-format msgid "cannot make both hard and symbolic links" msgstr "é impossível fazer ligações absolutas e simbólicas simultaneamente" -#: src/cp.c:1115 src/mv.c:464 -#, fuzzy, c-format +#: src/cp.c:1117 src/mv.c:466 +#, c-format msgid "options --backup and --no-clobber are mutually exclusive" -msgstr "" -"as opções que especificam datas para exibição são mutuamente exclusivas" +msgstr "as opções que --backup e --no-clobber são mutuamente exclusivas" -#: src/cp.c:1121 +#: src/cp.c:1123 #, c-format msgid "--reflink can be used only with --sparse=auto" msgstr "" -#: src/cp.c:1129 src/install.c:899 src/ln.c:582 src/mv.c:472 +#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474 msgid "backup type" msgstr "tipo de cópia de segurança" -#: src/cp.c:1154 +#: src/cp.c:1156 #, 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:1160 +#: src/cp.c:1162 #, c-format msgid "cannot preserve extended attributes, cp is built without xattr support" msgstr "" @@ -2510,167 +2423,152 @@ msgstr "" msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:529 +#: src/csplit.c:531 #, c-format msgid "input disappeared" msgstr "a entrada desapareceu" -# , c-format -#: src/csplit.c:658 src/csplit.c:669 +#: src/csplit.c:660 src/csplit.c:671 #, c-format msgid "%s: line number out of range" msgstr "%s: número de linha fora dos limites" -# , c-format -#: src/csplit.c:698 +#: src/csplit.c:700 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: número de linha fora dos limites" -# , c-format -#: src/csplit.c:701 src/csplit.c:750 +#: src/csplit.c:703 src/csplit.c:752 #, c-format msgid " on repetition %s\n" msgstr " na repetição %s\n" -# , c-format -#: src/csplit.c:744 +#: src/csplit.c:746 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: ocorrência não encontrada" -#: src/csplit.c:808 src/csplit.c:848 src/nl.c:359 src/tac.c:274 +#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273 #, c-format msgid "error in regular expression search" msgstr "erro na busca da expressão regular" -# , c-format -#: src/csplit.c:981 +#: src/csplit.c:983 #, c-format msgid "write error for %s" msgstr "erro ao escrever em %s" -# , c-format -#: src/csplit.c:1057 +#: src/csplit.c:1059 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: espera-se um número inteiro depois do delimitador" -# , c-format -#: src/csplit.c:1073 -#, fuzzy, c-format +#: src/csplit.c:1075 +#, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: exige-se uma \"}\" depois do número de repetições" -# , c-format -#: src/csplit.c:1083 -#, fuzzy, c-format +#: src/csplit.c:1085 +#, c-format msgid "%s}: integer required between '{' and '}'" -msgstr "%s}: entre \"{\" e \"}\" deve se especificar um número inteiro" +msgstr "%s}: deve se especificar um número inteiro entre \"{\" e \"}\"" -# , c-format -#: src/csplit.c:1110 -#, fuzzy, c-format +#: src/csplit.c:1112 +#, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: falta o delimitador de fechamento \"%c\"" -# , c-format -#: src/csplit.c:1127 +#: src/csplit.c:1129 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: expressão regular inválida: %s" -# , c-format -#: src/csplit.c:1160 +#: src/csplit.c:1162 #, c-format msgid "%s: invalid pattern" msgstr "%s: padrão inválido" -# , c-format -#: src/csplit.c:1163 +#: src/csplit.c:1165 #, 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:1169 +#: src/csplit.c:1171 #, 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:1175 +#: src/csplit.c:1177 #, 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:1253 +#: src/csplit.c:1255 #, c-format msgid "missing conversion specifier in suffix" msgstr "falta especificador de conversão no sufixo" -# , c-format -#: src/csplit.c:1259 +#: src/csplit.c:1261 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "especificador de conversão no sufixo é inválido: %c" -#: src/csplit.c:1262 +#: src/csplit.c:1264 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "especificador de conversão no sufixo é inválido: \\%.3o" -# , c-format -#: src/csplit.c:1267 -#, fuzzy, c-format +#: src/csplit.c:1269 +#, c-format msgid "invalid flags in conversion specification: %%%c%c" -msgstr "%.*s: especificação inválida de conversão" +msgstr "sinalizadores inválidos na especificação de conversão: %%%c%c" -#: src/csplit.c:1284 +#: src/csplit.c:1286 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "muitos especificadores %% de conversão no sufixo" -#: src/csplit.c:1298 +#: src/csplit.c:1300 #, c-format msgid "missing %% conversion specification in suffix" msgstr "falta especificador %% de conversão no sufixo" -#: src/csplit.c:1345 +#: src/csplit.c:1347 #, c-format msgid "%s: invalid number" msgstr "%s: número inválido" -# , c-format -#: src/csplit.c:1449 +#: src/csplit.c:1451 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Uso: %s [OPÇÃO]... ARQUIVO PADRÃO...\n" -#: src/csplit.c:1453 +#: src/csplit.c:1455 #, 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" -"\n" msgstr "" "Emite pedaços do ARQUIVO separado pelo PADRÃO(ões) para os arquivos " "\"xx00\",\n" "\"xx01\", ..., e emite o total de bytes de cada pedaço na saída padrão.\n" +"\n" -#: src/csplit.c:1461 -#, fuzzy, c-format +#: src/csplit.c:1462 +#, 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 como sufixo o FORMATO de sprintf em vez " -"de\n" -" %02d\n" +" -b, --suffix-format=FORMATO usa como sufixo o FORMATO (no estilo de " +"sprintf)\n" +" em vez de %02d\n" " -f, --prefix=PREFIXO usa PREFIXO em vez de \"xx\"\n" " -k, --keep-files não remove arquivo de saída mesmo caso haja " "erros\n" -#: src/csplit.c:1466 +#: src/csplit.c:1467 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" @@ -2681,7 +2579,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:1473 +#: src/csplit.c:1474 msgid "" "\n" "Read standard input if FILE is -. Each PATTERN may be:\n" @@ -2689,8 +2587,7 @@ msgstr "" "\n" "Lê a entrada padrão se ARQUIVO for -. Cada PADRÃO pode ser:\n" -#: src/csplit.c:1477 -#, fuzzy +#: src/csplit.c:1478 msgid "" "\n" " INTEGER copy up to but not including specified line number\n" @@ -2719,25 +2616,23 @@ msgstr "" msgid "David M. Ihnat" msgstr "David M. Ihnat" -#: src/cut.c:64 +#: 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" -# , c-format #: src/cut.c:189 #, c-format msgid "Usage: %s OPTION... [FILE]...\n" msgstr "Uso: %s OPÇÃO... [ARQUIVO]...\n" #: src/cut.c:193 -msgid "" -"Print selected parts of lines from each FILE to standard output.\n" -"\n" +#, 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:200 +#: src/cut.c:199 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2747,7 +2642,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:205 +#: src/cut.c:204 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2761,16 +2656,15 @@ msgstr "" " menos que a opção -s esteja especificada\n" " -n (sem efeito)\n" -#: src/cut.c:211 -#, fuzzy +#: src/cut.c:210 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" msgstr "" " --complement complementa o conjunto dos bytes, caracteres ou\n" -" campos selecionados.\n" +" campos selecionados\n" -#: src/cut.c:215 +#: src/cut.c:214 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2780,7 +2674,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:222 +#: src/cut.c:221 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2793,7 +2687,7 @@ msgstr "" "selecionada\n" "é escrita na mesma ordem que é lida, e é escrita uma única vez.\n" -#: src/cut.c:228 +#: src/cut.c:227 msgid "" "Each range is one of:\n" "\n" @@ -2814,49 +2708,48 @@ msgstr "" "\n" "Se ARQUIVO não for especificado ou for -, lê a entrada padrão.\n" -#: src/cut.c:368 src/cut.c:489 -msgid "invalid byte or field list" +#: src/cut.c:367 src/cut.c:493 +#, fuzzy +msgid "invalid byte, character or field list" msgstr "lista inválida de bytes ou campos" -# , c-format -#: src/cut.c:385 +#: src/cut.c:387 msgid "invalid range with no endpoint: -" msgstr "não é valido um intervalo sem especificar limite: -" -# , c-format -#: src/cut.c:399 +#: src/cut.c:403 msgid "invalid decreasing range" msgstr "não é válido um intervalo decrescente" -#: src/cut.c:478 +#: src/cut.c:482 #, c-format msgid "byte offset %s is too large" msgstr "deslocamento de byte %s é muito grande" -# , c-format -#: src/cut.c:481 +#: src/cut.c:485 #, c-format msgid "field number %s is too large" msgstr "o número de campo %s é muito grande" -#: src/cut.c:789 src/cut.c:797 +#: src/cut.c:795 src/cut.c:803 msgid "only one type of list may be specified" msgstr "somente um tipo de lista pode ser especificado" -#: src/cut.c:806 +#: src/cut.c:812 src/numfmt.c:1408 +#, c-format msgid "the delimiter must be a single character" msgstr "o delimitador deve ser um único caractere" -#: src/cut.c:841 +#: src/cut.c:847 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:844 +#: src/cut.c:850 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:848 +#: src/cut.c:854 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2864,11 +2757,11 @@ msgstr "" "suprimir as linhas não delimitadas só tem sentido\n" "\tquando se processa campos" -#: src/cut.c:864 +#: src/cut.c:870 msgid "missing list of fields" msgstr "falta lista de campos" -#: src/cut.c:866 +#: src/cut.c:872 msgid "missing list of positions" msgstr "falta lista de posições" @@ -2882,9 +2775,11 @@ msgstr "" " ou: %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 "" + +#: src/date.c:134 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" " -I[TIMESPEC], --iso-8601[=TIMESPEC] output date/time in ISO 8601 format.\n" @@ -2893,7 +2788,7 @@ msgid "" " and time to the indicated precision.\n" msgstr "" -#: src/date.c:138 +#: src/date.c:142 msgid "" " -r, --reference=FILE display the last modification time of FILE\n" " -R, --rfc-2822 output date and time in RFC 2822 format.\n" @@ -2903,7 +2798,7 @@ msgstr "" " -R, --rfc-2822 emite a data e hora no formato da RFC 2822.\n" " Exemplo: Seg, 07 Ago 2006 12:34:56 -0600\n" -#: src/date.c:143 +#: src/date.c:147 #, fuzzy msgid "" " --rfc-3339=TIMESPEC output date and time in RFC 3339 format.\n" @@ -2922,8 +2817,7 @@ msgstr "" " -s, --set=TEXTO ajusta a hora para a descrita por TEXTO\n" " -u, --utc, --universal emite ou ajusta a Hora Universal Coordenada\n" -#: src/date.c:154 -#, fuzzy +#: src/date.c:158 msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" @@ -2932,14 +2826,12 @@ msgid "" " %a locale's abbreviated weekday name (e.g., Sun)\n" msgstr "" "\n" -"FORMATO controla a saída. A única opção válida para a segunda forma de uso\n" -"especifica a Hora Unversal Coordenada (UTC). As seqüências interpretadas " -"são:\n" +"FORMATO controla a saída. As sequências interpretadas são:\n" "\n" " %% um % literal\n" " %a nome abreviado do dia de semana da localidade (por exemplo, Sáb)\n" -#: src/date.c:161 +#: src/date.c:165 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2952,8 +2844,7 @@ msgstr "" " %c data e hora na localidade (por exemplo, Sáb 08 Mar 2008 18:34:17 " "BRT)\n" -#: src/date.c:167 -#, fuzzy +#: src/date.c:171 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2962,11 +2853,10 @@ msgid "" msgstr "" " %C século; como %Y, mas omite os dois últimos dígitos (por exemplo, 21)\n" " %d dia do mês (por exemplo, 01)\n" -" %D data no formato estadosunidense; o mesmo que %d/%m/%y\n" -" %e dia do mês, preenchido com espaço em vez de 0 a esquerda; igual a " -"%_d\n" +" %D data no formato estado-unidense; o mesmo que %d/%m/%y\n" +" %e dia do mês, preenchido com espaço; o mesmo que %_d\n" -#: src/date.c:173 +#: src/date.c:177 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -2977,7 +2867,7 @@ msgstr "" " %G ano do número ISO da semana ISO (veja %V); normalmente útil só com " "%V\n" -#: src/date.c:178 +#: src/date.c:182 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2989,7 +2879,7 @@ msgstr "" " %I hora (01..12)\n" " %j dia do ano (001..366)\n" -#: src/date.c:184 +#: src/date.c:188 #, fuzzy msgid "" " %k hour, space padded ( 0..23); same as %_H\n" @@ -3002,7 +2892,7 @@ msgstr "" " %m mês (01..12)\n" " %M minuto (00..59)\n" -#: src/date.c:190 +#: src/date.c:194 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -3021,7 +2911,7 @@ msgstr "" " %R hora e minuto no estilo 24 horas; o mesmo que %H:%M\n" " %s segundos desde 1970-01-01 00:00:00 UTC\n" -#: src/date.c:199 +#: src/date.c:203 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -3033,7 +2923,7 @@ msgstr "" " %T as horas; o mesmo que %H:%M:%S\n" " %u dia da semana (1..7); 1 é segunda-feira\n" -#: src/date.c:205 +#: src/date.c:209 msgid "" " %U week number of year, with Sunday as first day of week (00..53)\n" " %V ISO week number, with Monday as first day of week (01..53)\n" @@ -3047,7 +2937,7 @@ msgstr "" " %W número da semana no ano, sendo segunda-feira o início da semana " "(00..53)\n" -#: src/date.c:211 +#: src/date.c:215 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -3059,8 +2949,7 @@ msgstr "" " %y os últimos dois dígitos do ano (00..99)\n" " %Y ano\n" -#: src/date.c:217 -#, fuzzy +#: src/date.c:221 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -3071,17 +2960,16 @@ msgid "" "\n" "By default, date pads numeric fields with zeroes.\n" msgstr "" -" %z fuso horário numérico +hhmm (por exemplo, -0300)\n" -" %:z fuso horário numérico +hh:mm (por exemplo, -03:00)\n" -" %::z fuso horário numérico +hh:mm:ss (por exemplo, -03:00:00)\n" -" %:::z fuso horário numérico com : para a precisão necessária (por " -"exemplo,\n" -" -04, +05:30)\n" +" %z fuso horário numérico +hhmm (por exemplo, -0400)\n" +" %:z fuso horário numérico +hh:mm (por exemplo, -04:00)\n" +" %::z fuso horário numérico +hh:mm:ss (por exemplo, -04:00:00)\n" +" %:::z fuso horário numérico com : para a precisão necessária\n" +" (por exemplo, -04, +05:30)\n" " %Z abreviação alfabética do fuso horário (por exemplo, BRT)\n" "\n" -"Por padrão, campos númericos de data são preenchidos com zeros a esquerda.\n" +"Por padrão, campos numéricos de data são preenchidos com zeros.\n" -#: src/date.c:226 +#: src/date.c:230 #, fuzzy msgid "" "The following optional flags may follow '%':\n" @@ -3100,7 +2988,7 @@ msgstr "" " ^ usa maiúsculas se possível\n" " # inverte maiúsculas com minúsculas (e vice-versa) se possível\n" -#: src/date.c:235 +#: src/date.c:239 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -3116,7 +3004,7 @@ msgstr "" " O para usar os símbolos númericos alternativos da localidade, se " "disponível.\n" -#: src/date.c:242 +#: src/date.c:246 msgid "" "\n" "Examples:\n" @@ -3130,37 +3018,36 @@ msgid "" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:275 src/dd.c:2193 src/head.c:838 src/md5sum.c:477 -#: src/md5sum.c:798 src/od.c:863 src/od.c:1914 src/pr.c:1176 src/pr.c:1372 -#: src/pr.c:1494 src/stty.c:842 src/tac.c:563 src/tail.c:343 src/tee.c:126 +#: 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 #, c-format msgid "standard input" msgstr "entrada padrão" -# , c-format -#: src/date.c:303 src/date.c:523 +#: src/date.c:307 src/date.c:527 #, c-format msgid "invalid date %s" msgstr "data inválida %s" -#: src/date.c:414 src/date.c:448 +#: src/date.c:418 src/date.c:452 #, c-format msgid "multiple output formats specified" msgstr "foram especificados múltiplos formatos de saída" -#: src/date.c:426 +#: src/date.c:430 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "" "as opções que especificam datas para exibição são mutuamente exclusivas" -#: src/date.c:433 +#: src/date.c:437 #, c-format msgid "the options to print and set the time may not be used together" msgstr "as opções para exibir e alterar o horário não podem ser usadas juntas" -#: src/date.c:454 +#: src/date.c:458 #, fuzzy, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -3168,28 +3055,26 @@ msgid "" "argument must be a format string beginning with '+'" msgstr "" "o argumento %s não tem um \"+\" inicial;\n" -"Quando usada uma opção que especifique data(s), qualquer argumento que não\n" -"seja uma opção tem que ser um texto de formatação começando com \"+\"." +"quando usada uma opção que especifique data(s), qualquer argumento que\n" +"não seja uma opção tem que ser um texto de formatação começando com \"+\"" -#: src/date.c:531 +#: src/date.c:535 #, c-format msgid "cannot set date" msgstr "não foi possível ajustar data" -# , c-format -#: src/date.c:554 src/du.c:360 +#: src/date.c:558 src/du.c:371 #, c-format msgid "time %s is out of range" msgstr "hora %s fora do intervalo permitido" #. This is a proper name. See the gettext manual, section Names. -#: src/dd.c:44 src/factor.c:43 src/rm.c:41 src/tail.c:69 src/touch.c:41 +#: 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 "Paul Rubin" -# , c-format -#: src/dd.c:517 +#: src/dd.c:521 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3198,7 +3083,7 @@ msgstr "" "Uso: %s [OPERANDO]...\n" " ou: %s OPÇÃO\n" -#: src/dd.c:522 +#: src/dd.c:526 #, fuzzy msgid "" "Copy a file, converting and formatting according to the operands.\n" @@ -3219,7 +3104,7 @@ msgstr "" " count=BLOCOS copia somente BLOCOS blocos de entrada\n" " ibs=BYTES lê BYTES bytes de uma vez\n" -#: src/dd.c:531 +#: src/dd.c:535 #, fuzzy msgid "" " if=FILE read from FILE instead of stdin\n" @@ -3229,25 +3114,28 @@ msgid "" " oflag=FLAGS write as per the comma separated symbol list\n" " seek=N skip N obs-sized blocks at start of output\n" " skip=N skip N ibs-sized blocks at start of input\n" -" status=noxfer suppress transfer statistics\n" +" status=WHICH WHICH info to suppress outputting to stderr;\n" +" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" msgstr "" " if=ARQUIVO lê do ARQUIVO em vez de usar a entrada padrão\n" " iflag=SINALIZ lê conforme lista de símbolos separados por vírgula\n" -" obs=BYTES escreve BYTES bytes de uma vez\n" +" obs=BYTES escreve BYTES bytes de uma vez (padrão: 512)\n" " of=ARQUIVO escreve em ARQUIVO em vez de usar a saída padrão\n" " oflag=SINALIZ escreve conforme uma lista de símbolos separados por " "vírgula\n" -" seek=BLOCOS salta BLOCOS (tamanho ditado por obs) a partir do\n" -" início da saída\n" -" skip=BLOCOS salta BLOCOS (tamanho ditado por ibs) a partir do\n" -" início da entrada\n" +" seek=N salta N blocos de tamanho ditado por obs a partir do " +"início\n" +" da saída\n" +" skip=BLOCOS salta N blocos de tamanho ditado por ibs a partir do " +"início\n" +" da entrada\n" " status=noxfer suprime as estatísticas da transferência\n" -#: src/dd.c:541 +#: src/dd.c:546 #, fuzzy msgid "" "\n" -"BLOCKS and BYTES may be followed by the following multiplicative suffixes:\n" +"N and BYTES may be followed by the following multiplicative suffixes:\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, and so on for T, P, E, Z, Y.\n" "\n" @@ -3256,13 +3144,14 @@ msgid "" msgstr "" "\n" "BLOCOS e BYTES podem ser seguidos pelos seguintes sufixos multiplicativos:\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, e assim por diante para T, P, E, Z, Y.\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, e assim por diante para T, P, E, Z e " +"Y.\n" "\n" "Cada símbolo CONV pode ser:\n" "\n" -#: src/dd.c:550 +#: src/dd.c:555 #, fuzzy msgid "" " ascii from EBCDIC to ASCII\n" @@ -3285,13 +3174,9 @@ msgstr "" " unblock substitui os espaços ao final dos registros de tamanho cbs\n" " por caractere de nova-linha\n" " lcase altera as maiúsculas para minúsculas\n" -" ucase altera as minúsculas para maiúsculas\n" -" swab troca cada par de bytes de entrada\n" -" sync preenche cada bloco de entrada com NULOs até o tamanho ibs; se\n" -" usado com block ou unblock, preenche com espaços em vez de " -"NULOs\n" -#: src/dd.c:563 +#: src/dd.c:568 +#, fuzzy msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3300,15 +3185,15 @@ msgid "" " fdatasync physically write output file data before finishing\n" " fsync likewise, but also write metadata\n" msgstr "" -" excl falha se o arquivo de saída já existir\n" -" nocreat não cria o arquivo de saída\n" -" notrunc não trunca o arquivo de saída\n" " noerror continua mesmo após erros de leitura\n" +" sync preenche cada bloco de entrada com NULOs até o tamanho ibs; se\n" +" usado com block ou unblock, preenche com espaços em vez de " +"NULOs\n" " fdatasync escreve fisicamente os dados do arquivo de saída antes de " "concluir\n" " fsync similar, mas também escreve metadados\n" -#: src/dd.c:571 +#: src/dd.c:576 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3321,78 +3206,76 @@ msgstr "" "\n" " append modo anexar (só faz sentido para saída; sugere-se conv=notrunc)\n" -#: src/dd.c:578 -#, fuzzy +#: src/dd.c:583 msgid " cio use concurrent I/O for data\n" -msgstr " text usa E/S textual para dados\n" +msgstr " cio usa E/S concorrente para dados\n" -#: src/dd.c:580 +#: src/dd.c:585 msgid " direct use direct I/O for data\n" msgstr " direct usa E/S direta para dados\n" -#: src/dd.c:582 -#, fuzzy +#: src/dd.c:587 msgid " directory fail unless a directory\n" -msgstr " directory falha a menos que seja um diretório\n" +msgstr " directory falha a menos que seja um diretório\n" -#: src/dd.c:584 +#: src/dd.c:589 msgid " dsync use synchronized I/O for data\n" msgstr " dsync usa E/S sincronizada para dados\n" -#: src/dd.c:586 +#: src/dd.c:591 msgid " sync likewise, but also for metadata\n" msgstr " sync similar, mas também para metadados\n" -#: src/dd.c:587 +#: src/dd.c:592 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr "" -#: src/dd.c:590 +#: src/dd.c:595 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock usa E/S não-bloqueante\n" -#: src/dd.c:592 +#: src/dd.c:597 msgid " noatime do not update access time\n" msgstr " noatime não atualiza o horário de acesso\n" -#: src/dd.c:595 +#: src/dd.c:600 msgid " nocache discard cached data\n" msgstr "" -#: src/dd.c:598 +#: src/dd.c:603 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:601 +#: src/dd.c:606 msgid " nofollow do not follow symlinks\n" msgstr " nofollow não segue ligações simbólicas\n" -#: src/dd.c:603 +#: src/dd.c:608 msgid " nolinks fail if multiply-linked\n" msgstr " nolinks falha se ligado múltiplas vezes\n" -#: src/dd.c:605 +#: src/dd.c:610 msgid " binary use binary I/O for data\n" msgstr " binary usa E/S binária para dados\n" -#: src/dd.c:607 +#: src/dd.c:612 msgid " text use text I/O for data\n" msgstr " text usa E/S textual para dados\n" -#: src/dd.c:609 +#: src/dd.c:614 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:612 +#: src/dd.c:617 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:615 +#: src/dd.c:620 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:620 -#, fuzzy, c-format +#: src/dd.c:625 +#, c-format msgid "" "\n" "Sending a %s signal to a running 'dd' process makes it\n" @@ -3415,12 +3298,12 @@ msgstr "" " $ kill -%s $pid; sleep 1; kill $pid\n" " 18335302+0 registros de entrada\n" " 18335302+0 registros de saída\n" -" 9387674624 bytes (9.4 GB) copiados, 34.6279 s, 271 MB/s\n" +" 9387674624 bytes (9,4 GB) copiados, 34,6279 s, 271 MB/s\n" "\n" "As opções são:\n" "\n" -#: src/dd.c:676 +#: src/dd.c:683 #, c-format msgid "" "%<PRIuMAX>+%<PRIuMAX> records in\n" @@ -3429,21 +3312,21 @@ msgstr "" "%<PRIuMAX>+%<PRIuMAX> registros de entrada\n" "%<PRIuMAX>+%<PRIuMAX> registros de saída\n" -#: src/dd.c:682 +#: src/dd.c:689 #, 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:694 +#: src/dd.c:701 #, 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:712 +#: src/dd.c:720 msgid "Infinity B" msgstr "Banda infinita" @@ -3457,91 +3340,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:725 +#: src/dd.c:733 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g s, %s/s\n" -# , c-format -#: src/dd.c:804 +#: src/dd.c:812 #, c-format msgid "closing input file %s" msgstr "fechando arquivo de entrada %s" -#: src/dd.c:811 +#: src/dd.c:819 #, c-format msgid "closing output file %s" msgstr "fechando arquivo de saída %s" -#: src/dd.c:1014 -#, fuzzy, c-format +#: src/dd.c:1022 +#, c-format msgid "failed to turn off O_DIRECT: %s" -msgstr "falhou em mudar para o diretório %s" +msgstr "falhou em desativar O_DIRECT: %s" -# , c-format -#: src/dd.c:1085 src/dd.c:1934 +#: src/dd.c:1093 src/dd.c:1942 #, c-format msgid "writing to %s" msgstr "escrevendo em %s" -# , c-format -#: src/dd.c:1199 src/dd.c:1253 +#: src/dd.c:1207 src/dd.c:1261 #, c-format msgid "unrecognized operand %s" msgstr "operando desconhecido %s" -# , c-format -#: src/dd.c:1210 +#: src/dd.c:1218 msgid "invalid conversion" msgstr "conversão inválida" -# , c-format -#: src/dd.c:1213 src/dd.c:1289 +#: src/dd.c:1221 src/dd.c:1297 msgid "invalid input flag" msgstr "sinalizador inválido de entrada" -#: src/dd.c:1216 src/dd.c:1283 src/dd.c:1295 +#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303 msgid "invalid output flag" msgstr "sinalizador inválido de saída" -# , c-format -#: src/dd.c:1219 +#: src/dd.c:1227 msgid "invalid status flag" msgstr "sinalizador inválido de estado" -#: src/dd.c:1258 src/truncate.c:312 +#: src/dd.c:1266 src/truncate.c:310 #, c-format msgid "invalid number %s" msgstr "número inválido %s" -#: src/dd.c:1340 +#: src/dd.c:1348 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "é impossível qualquer combinação entre {ascii,ebcdic,ibm}" -#: src/dd.c:1342 +#: src/dd.c:1350 #, c-format msgid "cannot combine block and unblock" msgstr "é impossível combinar \"block\" com \"unblock\"" -#: src/dd.c:1344 +#: src/dd.c:1352 #, c-format msgid "cannot combine lcase and ucase" msgstr "é impossível combinar \"lcase\" com \"ucase\"" -# , c-format -#: src/dd.c:1346 +#: src/dd.c:1354 #, c-format msgid "cannot combine excl and nocreat" msgstr "é impossível combinar \"excl\" com \"nocreat\"" -# , c-format -#: src/dd.c:1349 -#, fuzzy, c-format +#: src/dd.c:1357 +#, c-format msgid "cannot combine direct and nocache" -msgstr "é impossível combinar \"excl\" com \"nocreat\"" +msgstr "é impossível combinar \"direct\" com \"nocache\"" -#: src/dd.c:1506 +#: src/dd.c:1514 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3550,75 +3425,72 @@ 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:1593 -#, fuzzy, c-format +#: src/dd.c:1601 +#, c-format msgid "%s: cannot skip" -msgstr "%s: não foi possível buscar (\"seek\")" +msgstr "%s: não foi possível ignorar" -#: src/dd.c:1595 src/dd.c:1614 src/dd.c:1675 +#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683 #, c-format msgid "%s: cannot seek" msgstr "%s: não foi possível buscar (\"seek\")" -#: src/dd.c:1655 +#: src/dd.c:1663 #, c-format msgid "offset overflow while reading file %s" msgstr "estouro de deslocamento enquanto lia o arquivo %s" -# , c-format -#: src/dd.c:1667 +#: src/dd.c:1675 #, 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:1671 +#: src/dd.c:1679 #, c-format msgid "cannot work around kernel bug after all" msgstr "não foi possível contornar o bug no kernel" -#: src/dd.c:1814 +#: src/dd.c:1822 #, c-format msgid "setting flags for %s" msgstr "ajustando sinalizadores para %s" -#: src/dd.c:1867 +#: src/dd.c:1875 #, c-format msgid "memory exhausted by input buffer of size %zu bytes (%s)" msgstr "" -#: src/dd.c:1881 +#: src/dd.c:1889 #, c-format msgid "memory exhausted by output buffer of size %zu bytes (%s)" msgstr "" -# , c-format -#: src/dd.c:1914 -#, fuzzy, c-format +#: src/dd.c:1922 +#, c-format msgid "%s: cannot skip to specified offset" -msgstr "%s: não foi possível buscar (\"seek\") pela posição relativa %s" +msgstr "%s: não foi possível ignorar até o deslocamento especificado" -#: src/dd.c:2125 src/dd.c:2258 +#: src/dd.c:2133 #, fuzzy, c-format -msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" -msgstr "truncando aos %<PRIuMAX> bytes no arquivo de saída %s" +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:2138 +#: src/dd.c:2146 #, c-format msgid "fdatasync failed for %s" msgstr "\"fdatasync\" falhou para %s" -#: src/dd.c:2148 +#: src/dd.c:2156 #, c-format msgid "fsync failed for %s" msgstr "\"fsync\" falhou para %s" -# , c-format -#: src/dd.c:2199 src/dd.c:2228 +#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165 #, c-format -msgid "opening %s" -msgstr "abrindo %s" +msgid "failed to open %s" +msgstr "falhou em abrir %s" -#: src/dd.c:2237 +#: src/dd.c:2246 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) " @@ -3627,85 +3499,106 @@ msgstr "" "deslocamento muito grande: é impossível truncar para um comprimento de busca=" "%<PRIuMAX> (%lu-byte) blocos" -#: src/dd.c:2274 src/dd.c:2280 -#, fuzzy, c-format +#: src/dd.c:2267 +#, 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 +#, c-format msgid "failed to discard cache for: %s" -msgstr "falhou em mudar para o diretório %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:54 src/expr.c:153 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:39 src/sleep.c:35 src/sort.c:66 +#: 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 msgid "Paul Eggert" msgstr "Paul Eggert" -#: src/df.c:140 +#: src/df.c:172 msgid "Filesystem" msgstr "Sist. Arq." -#: src/df.c:141 +#: src/df.c:175 msgid "Type" msgstr "Tipo" -#: src/df.c:142 +#: src/df.c:178 src/df.c:542 msgid "blocks" msgstr "blocos" -#: src/df.c:142 -msgid "Inodes" -msgstr "Inodes" - -#: src/df.c:142 -msgid "Size" -msgstr "Tam" - -#: src/df.c:143 +#: src/df.c:181 msgid "Used" -msgstr "Usad" - -#: src/df.c:143 -msgid "IUsed" -msgstr "IUsados" +msgstr "Usado" -#: src/df.c:144 +#: src/df.c:184 msgid "Available" -msgstr "Dispon." - -#: src/df.c:144 -msgid "IFree" -msgstr "ILivr" - -#: src/df.c:144 -msgid "Avail" -msgstr "Dispon." +msgstr "Disponível" -#: src/df.c:145 +#: src/df.c:187 msgid "Use%" msgstr "Uso%" -#: src/df.c:145 +#: src/df.c:190 +msgid "Inodes" +msgstr "" + +#: src/df.c:193 +msgid "IUsed" +msgstr "IUsado" + +#: src/df.c:196 +msgid "IFree" +msgstr "" + +#: src/df.c:199 msgid "IUse%" msgstr "IUso%" -#: src/df.c:145 -msgid "Capacity" -msgstr "Capacidade" - -#: src/df.c:146 +#: src/df.c:202 msgid "Mounted on" msgstr "Montado em" -#: src/df.c:847 +#: src/df.c:383 +#, c-format +msgid "option --output: field '%s' unknown" +msgstr "" + +#: src/df.c:390 +#, fuzzy, c-format +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 +msgid "Size" +msgstr "Tam." + +#: src/df.c:414 src/df.c:451 +msgid "Avail" +msgstr "Disp." + +#: src/df.c:474 +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 +#, c-format +msgid "%s-%s" +msgstr "" + +#: src/df.c:1210 +#, fuzzy msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" -"\n" msgstr "" "Mostra informações sobre os sistemas de arquivo nos quais cada ARQUIVO\n" "reside ou, por padrão, sobre todos os sistemas de arquivos.\n" "\n" -#: src/df.c:855 -#, fuzzy +#: src/df.c:1217 msgid "" " -a, --all include dummy file systems\n" " -B, --block-size=SIZE scale sizes by SIZE before printing them. E.g.,\n" @@ -3717,13 +3610,17 @@ msgid "" " -H, --si likewise, but use powers of 1000 not 1024\n" msgstr "" " -a, --all inclui sistemas de arquivo fictícios\n" -" -B, --block-size=TAM usa blocos de TAM bytes\n" +" -B, --block-size=TAM o tamanho considera blocos de TAM bytes. Exemplo:\n" +" -BM emite tamanhos em unidades de 1.048.576 " +"bytes.\n" +" Veja o formato de TAM abaixo.\n" +" --total produz um total geral\n" " -h, --human-readable emite tamanhos em formato mais humanamente " "inteligível\n" " (por exemplo, 1K 234M 2G)\n" " -H, --si similar, mas usa potências de 1000, e não de 1024\n" -#: src/df.c:865 +#: src/df.c:1227 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3737,8 +3634,12 @@ msgstr "" " --no-sync não invocar \"sync\" ao obter informações de uso " "(padrão)\n" -#: src/df.c:872 +#: src/df.c:1234 +#, fuzzy msgid "" +" --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" +" or print all fields if FIELD_LIST is " +"omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" " -t, --type=TYPE limit listing to file systems of type TYPE\n" @@ -3755,20 +3656,43 @@ msgstr "" " sejam do tipo TIPO\n" " -v (sem efeito)\n" -#: src/df.c:1027 +#: src/df.c:1248 +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" +msgstr "" + +#: src/df.c:1285 +#, 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 #, 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:1075 +#: src/df.c:1500 msgid "Warning: " msgstr "Aviso: " -#: src/df.c:1077 src/stat.c:795 +#: src/df.c:1502 src/stat.c:814 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:1107 +#: src/df.c:1539 #, c-format msgid "no file systems processed" msgstr "nenhum sistema de arquivo foi processado" @@ -3778,7 +3702,6 @@ msgstr "nenhum sistema de arquivo foi processado" msgid "H. Peter Anvin" msgstr "H. Peter Anvin" -# , c-format #: src/dircolors.c:97 src/uptime.c:196 src/users.c:105 #, c-format msgid "Usage: %s [OPTION]... [FILE]\n" @@ -3817,13 +3740,11 @@ msgstr "" "Para detalhes sobre o formato destes arquivos, execute\n" " \"dircolors --print-database\".\n" -# , c-format #: src/dircolors.c:286 #, c-format msgid "%s:%lu: invalid line; missing second token" msgstr "%s:%lu: linha inválida; falta o segundo termo" -# , c-format #: src/dircolors.c:358 #, c-format msgid "%s:%lu: unrecognized keyword %s" @@ -3856,7 +3777,6 @@ msgstr "" "variável de ambiente SHELL não existente e não se especificou nenhum\n" "tipo de shell como argumento" -# , c-format #: src/dirname.c:50 #, c-format msgid "Usage: %s [OPTION] NAME...\n" @@ -3878,12 +3798,10 @@ msgstr "" #: src/dirname.c:59 #, fuzzy msgid " -z, --zero separate output with NUL rather than newline\n" -msgstr "" -" -z, --zero-terminated termina linhas com byte 0, e não com \"nova-linha" -"\"\n" +msgstr " -z, --zero termina linhas com byte 0, e não com \"nova-linha\"\n" #: src/dirname.c:64 -#, fuzzy, c-format +#, c-format msgid "" "\n" "Examples:\n" @@ -3893,11 +3811,11 @@ msgid "" msgstr "" "\n" "Exemplos:\n" -" %s /usr/bin/sort Emite \"/usr/bin\".\n" -" %s stdio.h Emite \".\".\n" +" %s /usr/bin/ -> \"/usr\"\n" +" %s dir1/str dir2/str -> \"dir1\" seguido de \"dir2\"\n" +" %s stdio.h -> \".\"\n" -# , c-format -#: src/du.c:260 src/sort.c:390 src/wc.c:112 +#: src/du.c:270 src/sort.c:394 src/wc.c:112 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3906,17 +3824,18 @@ msgstr "" "Uso: %s [OPÇÃO]... [ARQUIVO]...\n" " ou: %s [OPÇÃO]... --files0-from=A\n" -#: src/du.c:264 -msgid "" -"Summarize disk usage of each FILE, recursively for directories.\n" -"\n" +#: src/du.c:274 +#, 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:271 +#: src/du.c:280 #, fuzzy msgid "" +" -0, --null end each output line with 0 byte rather than " +"newline\n" " -a, --all write counts for all files, not just directories\n" " --apparent-size print apparent sizes, rather than disk usage; " "although\n" @@ -3933,7 +3852,7 @@ msgstr "" " esparsos, fragmentação interna, blocos indiretos\n" " e outros afins\n" -#: src/du.c:279 +#: src/du.c:289 #, fuzzy msgid "" " -B, --block-size=SIZE scale sizes by SIZE before printing them. E.g.,\n" @@ -3943,6 +3862,11 @@ msgid "" " -c, --total produce a grand total\n" " -D, --dereference-args dereference only symlinks that are listed on the\n" " command line\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 "" " -B, --block-size=TAM usa blocos de TAM bytes\n" " -b, --bytes equivalente a \"--apparent-size --block-size=1\"\n" @@ -3950,7 +3874,7 @@ msgstr "" " -D, --dereference-args interpreta apenas as ligações simbólicas listadas\n" " na linha de comando\n" -#: src/du.c:288 +#: src/du.c:302 #, fuzzy msgid "" " --files0-from=F summarize disk usage of the NUL-terminated file\n" @@ -3959,7 +3883,6 @@ msgid "" " -H equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" --si like -h, but use powers of 1000 not 1024\n" msgstr "" " --files0-from=A resume o uso de disco do arquivos de nomes " "terminados\n" @@ -3972,9 +3895,11 @@ 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:297 +#: src/du.c:310 +#, fuzzy 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 "" @@ -3983,14 +3908,13 @@ msgstr "" " absoluta\n" " -m o mesmo que --block-size=1M\n" -#: src/du.c:302 +#: src/du.c:316 +#, fuzzy msgid "" -" -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " "default)\n" -" -0, --null end each output line with 0 byte rather than " -"newline\n" " -S, --separate-dirs 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 interpreta todas as ligações simbólicas\n" @@ -4000,33 +3924,11 @@ 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:309 -#, 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 ignora diretórios em sistemas de arquivo " -"diferentes\n" -" -X ARQ, --exclude-from=ARQ Exclui arquivos que coincidam com qualquer " -"padrão\n" -" em ARQ.\n" -" --exclude=PADRÃO Exclui arquivos que coincidam com o PADRÃO.\n" -" --max-depth=N exibe o total para um diretório (ou arquivo, com\n" -" --all) somente se está a N ou menos níveis abaixo\n" -" do argumento da linha de comando; --max-depth=0 " -"é\n" -" equivalente a --summarize\n" - -#: src/du.c:318 +#: src/du.c:322 #, fuzzy msgid "" +" -t, --threshold=SIZE exclude entries smaller than SIZE if positive,\n" +" or entries greater than SIZE if negative\n" " --time show time of the last modification of any file in " "the\n" " directory, or any of its subdirectories\n" @@ -4048,84 +3950,89 @@ msgstr "" " full-iso, long-iso, iso, +FORMATO\n" " FORMATO é interpretado como em \"date\"\n" -#: src/du.c:375 +#: src/du.c:333 +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 msgid "Infinity" msgstr "Banda infinita" -#: src/du.c:600 +#: src/du.c:507 +#, c-format +msgid "mount point %s already traversed" +msgstr "" + +#: src/du.c:624 #, fuzzy, c-format msgid "fts_read failed: %s" msgstr "fts_read falhou" -# , c-format -#: src/du.c:724 +#: src/du.c:780 #, c-format msgid "invalid maximum depth %s" msgstr "profundidade máxima inválida %s" -#: src/du.c:817 +#: src/du.c:809 +#, fuzzy, c-format +msgid "invalid --threshold argument '-0'" +msgstr "argumento inválido %s" + +#: src/du.c:887 #, 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:824 +#: src/du.c:894 #, 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:830 +#: src/du.c:900 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "aviso: resumir conflita com --max-depth=%lu" -#: src/du.c:896 src/sort.c:4479 src/wc.c:668 +#: src/du.c:966 src/sort.c:4533 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." -# , c-format -#: src/du.c:949 src/md5sum.c:587 src/od.c:903 src/tac.c:239 src/tac.c:350 -#: src/tac.c:506 src/tac.c:586 src/wc.c:733 +#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 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:963 src/sort.c:4508 src/wc.c:747 +#: src/du.c:1040 src/sort.c:4562 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:980 src/du.c:988 src/wc.c:760 src/wc.c:768 +#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768 msgid "invalid zero-length file name" msgstr "é inválido um nome de arquivo de comprimento nulo" -# , c-format -#: src/du.c:1007 src/head.c:149 src/head.c:262 src/head.c:334 src/head.c:538 -#: src/head.c:620 src/head.c:692 src/head.c:750 src/head.c:774 src/tail.c:412 -#: src/tail.c:500 src/tail.c:549 src/tail.c:642 src/tail.c:770 src/tail.c:818 -#: src/tail.c:855 src/tail.c:1782 src/tail.c:1812 src/uniq.c:395 -#, c-format -msgid "error reading %s" -msgstr "erro lendo %s" - -#: src/du.c:1010 src/ls.c:2649 src/wc.c:791 +#: src/du.c:1088 src/ls.c:2649 src/wc.c:791 msgid "total" msgstr "total" #. 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" -# , c-format #: src/echo.c:41 #, fuzzy, c-format msgid "" @@ -4203,17 +4110,18 @@ msgstr "" msgid "Richard Mlynarik" msgstr "Richard Mlynarik" -# , c-format #: src/env.c:52 #, c-format msgid "Usage: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n" msgstr "Uso: %s [OPÇÃO]... [-] [NOME=VALOR]... [COMANDO [ARGUMENTO]...]\n" #: src/env.c:55 +msgid "Set each NAME to VALUE in the environment and run COMMAND.\n" +msgstr "" + +#: src/env.c:61 #, fuzzy msgid "" -"Set each NAME to VALUE in the environment and run COMMAND.\n" -"\n" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with 0 byte rather than newline\n" " -u, --unset=NAME remove variable from the environment\n" @@ -4223,7 +4131,7 @@ msgstr "" " -i, --ignore-environment começa com um ambiente vazio\n" " -u, --unset=NOME retira variável NOME do ambiente\n" -#: src/env.c:64 +#: src/env.c:68 msgid "" "\n" "A mere - implies -i. If no COMMAND, print the resulting environment.\n" @@ -4232,35 +4140,33 @@ msgstr "" "Um mero - implica em -i. Se não houver COMANDO, exibe o ambiente " "resultante.\n" -# , c-format -#: src/env.c:120 +#: src/env.c:124 #, fuzzy, c-format msgid "cannot unset %s" msgstr "impossível obter estado de %s" -# , c-format -#: src/env.c:131 +#: src/env.c:135 #, fuzzy, c-format msgid "cannot set %s" msgstr "impossível obter estado de %s" -#: src/env.c:148 +#: src/env.c:152 #, c-format msgid "cannot specify --null (-0) with command" msgstr "" #: 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" -"\n" msgstr "" "Converte tabulações de cada ARQUIVO em espaços e escreve o resultado na\n" "saída padrão. Se ARQUIVO não for especificado ou for -, lê a entrada " "padrão.\n" "\n" -#: src/expand.c:115 +#: src/expand.c:114 msgid "" " -i, --initial do not convert tabs after non blanks\n" " -t, --tabs=NUMBER have tabs NUMBER characters apart, not 8\n" @@ -4269,34 +4175,34 @@ msgstr "" " -t, --tabs=NÚMERO as tabulações têm largura de NÚMERO caracteres, e não " "8\n" -#: src/expand.c:119 +#: src/expand.c:118 msgid "" " -t, --tabs=LIST use comma separated list of explicit tab positions\n" msgstr "" " -t, --tabs=LISTA usa lista de posições explícitas para tabulações,\n" " separadas por vírgula\n" -#: src/expand.c:172 src/unexpand.c:191 +#: src/expand.c:171 src/unexpand.c:190 #, c-format msgid "tab stop is too large %s" msgstr "parada de tabulação é muito grande %s" -#: src/expand.c:180 src/unexpand.c:199 +#: src/expand.c:179 src/unexpand.c:198 #, c-format msgid "tab size contains invalid character(s): %s" msgstr "o tamanho de tabulação contém caractere(s) inválido(s): %s" -#: src/expand.c:206 src/unexpand.c:225 +#: src/expand.c:205 src/unexpand.c:224 #, c-format msgid "tab size cannot be 0" msgstr "o tamanho de tabulação não pode ser 0" -#: src/expand.c:208 src/unexpand.c:227 +#: src/expand.c:207 src/unexpand.c:226 #, c-format msgid "tab sizes must be ascending" msgstr "os tamanhos das tabulações devem ser ascendentes" -#: src/expand.c:326 src/expand.c:345 src/unexpand.c:374 src/unexpand.c:419 +#: 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 "linha de entrada é muito longa" @@ -4311,7 +4217,6 @@ msgstr "Mike Parker" msgid "James Youngman" msgstr "James Youngman" -# , c-format #: src/expr.c:203 #, c-format msgid "" @@ -4447,7 +4352,6 @@ msgstr "" "for nula ou 0; será 2 se EXPRESSÃO for sintaticamente inválida; e será 3 se\n" "um erro ocorreu.\n" -# , c-format #: src/expr.c:278 #, c-format msgid "syntax error" @@ -4463,12 +4367,12 @@ msgstr "erro na busca da expressão regular" msgid "non-integer argument" msgstr "argumento não-numérico" -#: src/expr.c:793 src/truncate.c:316 +#: src/expr.c:793 src/truncate.c:314 #, c-format msgid "division by zero" msgstr "divisão por zero" -#: src/expr.c:887 src/sort.c:2029 +#: src/expr.c:887 src/sort.c:2044 #, fuzzy, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "Defina LC_ALL='C' para contornar o problema." @@ -4478,26 +4382,32 @@ msgstr "Defina LC_ALL='C' para contornar o problema." msgid "the strings compared were %s and %s" msgstr "Os textos comparados foram %s e %s." -#: src/factor.c:449 -msgid "using arbitrary-precision arithmetic" +#. This is a proper name. See the gettext manual, section Names. +#: src/factor.c:111 +msgid "Niels Moller" msgstr "" -#: src/factor.c:460 -msgid "using single-precision arithmetic" +#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459 +#, c-format +msgid "Lucas prime test failure. This should not happen" msgstr "" -#: src/factor.c:465 src/od.c:1640 src/od.c:1709 +#: src/factor.c:2092 #, c-format -msgid "%s is too large" -msgstr "%s é muito grande" +msgid "squfof queue overflow" +msgstr "" -#: src/factor.c:469 +#: src/factor.c:2419 #, c-format msgid "%s is not a valid positive integer" msgstr "%s não é um inteiro positivo válido" -# , c-format -#: src/factor.c:494 +#: src/factor.c:2442 src/od.c:1646 src/od.c:1715 +#, c-format +msgid "%s is too large" +msgstr "%s é muito grande" + +#: src/factor.c:2454 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4506,7 +4416,7 @@ msgstr "" "Uso: %s [NÚMERO]...\n" " ou: %s OPÇÃO\n" -#: src/factor.c:499 +#: src/factor.c:2459 #, fuzzy msgid "" "Print the prime factors of each specified integer NUMBER. If none\n" @@ -4519,42 +4429,37 @@ msgstr "" "da entrada padrão se não forem especificados argumentos na linha de " "comando.\n" -# , c-format #: src/find-mount-point.c:40 #, c-format msgid "cannot get current directory" msgstr "não foi possível saber o diretório atual" -# , c-format #: src/find-mount-point.c:50 src/find-mount-point.c:64 #: src/find-mount-point.c:92 #, c-format msgid "cannot change to directory %s" msgstr "não foi possível mudar para diretório %s" -# , c-format #: src/find-mount-point.c:70 #, c-format msgid "cannot stat current directory (now %s)" msgstr "não foi possível realizar \"stat\" no diretório atual (agora %s)" #. This is a proper name. See the gettext manual, section Names. -#: src/fmt.c:37 +#: src/fmt.c:38 msgid "Ross Paterson" msgstr "Ross Paterson" -# , c-format -#: src/fmt.c:269 +#: src/fmt.c:270 #, fuzzy, c-format msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n" msgstr "Uso: %s [-DÍGITOS] [OPÇÃO]... [ARQUIVO]...\n" -#: src/fmt.c:270 +#: 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" -"\n" msgstr "" "Reformata cada parágrafo no(s) ARQUIVO(s), escrevendo na saída padrão.\n" "Se ARQUIVO não for especificado ou for -, lê a entrada padrão.\n" @@ -4573,8 +4478,8 @@ msgstr "" " reanexando o prefixo às linhas reformatadas\n" " -s, --split-only divide as linhas longas, mas não liga à próxima\n" -#: src/fmt.c:285 -#, fuzzy, c-format +#: src/fmt.c:287 +#, fuzzy, 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" @@ -4586,7 +4491,7 @@ msgstr "" " -w, --width=LARGURA a largura máxima da linha (o padrão é 75 " "colunas)\n" -#: src/fmt.c:357 +#: src/fmt.c:359 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -4595,24 +4500,23 @@ msgstr "" "opção inválida -- %c; -LARGURA é reconhecida somente quando é a primeira\n" "opção; use -w N no lugar" -# , c-format -#: src/fmt.c:403 src/fmt.c:414 +#: src/fmt.c:405 src/fmt.c:416 #, c-format msgid "invalid width: %s" msgstr "largura inválida: %s" #: src/fold.c:70 +#, fuzzy msgid "" "Wrap input lines in each FILE (standard input by default), writing to\n" "standard output.\n" -"\n" msgstr "" "Quebra as linhas de entradas de cada ARQUIVO (em caso omisso, entrada " "padrão),\n" "escrevendo na saída padrão.\n" "\n" -#: src/fold.c:78 +#: src/fold.c:77 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4622,23 +4526,21 @@ msgstr "" " -s, --spaces quebra com espaços\n" " -w, --width=LARGURA usa LARGURA colunas em vez de 80\n" -# , c-format -#: src/fold.c:289 src/pr.c:836 +#: src/fold.c:288 src/pr.c:832 #, c-format 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:75 +#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 #: src/truncate.c:37 msgid "Padraig Brady" -msgstr "" +msgstr "Padraig Brady" -# , c-format #: src/getlimits.c:65 -#, fuzzy, c-format +#, c-format msgid "Usage: %s\n" -msgstr "Uso: %s [OPÇÃO]\n" +msgstr "Uso: %s\n" #: src/getlimits.c:69 msgid "" @@ -4646,26 +4548,25 @@ msgid "" "\n" msgstr "" -#: src/group-list.c:69 src/id.c:345 src/setuidgid.c:184 +#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184 #, 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:350 +#: src/group-list.c:74 src/id.c:370 #, c-format msgid "failed to get groups for the current process" msgstr "falhou em obter os grupos do usuário para o processo atual" -#: src/group-list.c:104 +#: src/group-list.c:114 #, c-format msgid "cannot find name for group ID %lu" msgstr "não foi possível encontrar o nome para a ID de grupo %lu" -# , c-format #: src/groups.c:53 -#, fuzzy, c-format +#, c-format msgid "Usage: %s [OPTION]... [USERNAME]...\n" -msgstr "Uso: %s [OPÇÃO]... [NOMEDOUSUÁRIO]\n" +msgstr "Uso: %s [OPÇÃO]... [NOMEDOUSUÁRIO]...\n" #: src/groups.c:54 #, fuzzy @@ -4683,7 +4584,6 @@ msgstr "" msgid "cannot get real UID" msgstr "não foi possível definir id de usuário" -# , c-format #: src/groups.c:110 src/id.c:241 #, fuzzy, c-format msgid "cannot get effective GID" @@ -4700,11 +4600,11 @@ msgid "%s: no such user" msgstr "%s: Usuário inexistente" #: 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" -"\n" msgstr "" "Emite as primeiras 10 linhas de cada ARQUIVO para saída padrão.\n" "Se especificados vários ARQUIVO(s), o nome de cada arquivo precede as " @@ -4712,7 +4612,7 @@ msgstr "" "Se ARQUIVO não for especificado ou for -, lê a entrada padrão.\n" "\n" -#: src/head.c:118 +#: src/head.c:117 #, fuzzy msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" @@ -4732,7 +4632,7 @@ msgstr "" "cada\n" " arquivo, exceto as 10 últimas\n" -#: src/head.c:126 +#: src/head.c:125 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4741,7 +4641,7 @@ msgstr "" "arquivos\n" " -v, --verbose sempre emitir cabeçalhos com nomes dos arquivos\n" -#: src/head.c:132 +#: src/head.c:131 #, fuzzy msgid "" "\n" @@ -4754,76 +4654,70 @@ 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" -# , c-format -#: src/head.c:152 -#, c-format -msgid "error writing %s" -msgstr "erro escrevendo %s" - -#: src/head.c:155 +#: src/head.c:154 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: arquivo pequeno demais" -#: src/head.c:228 src/head.c:1044 +#: src/head.c:227 src/head.c:1051 #, c-format msgid "%s: number of bytes is too large" msgstr "%s: número de bytes é muito grande" -# , c-format -#: src/head.c:441 +#: 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" -# , c-format -#: src/head.c:613 src/head.c:684 src/tail.c:450 +#: src/head.c:612 src/head.c:691 src/tail.c:449 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: não foi possível ir à posição %s" -# , c-format -#: src/head.c:791 +#: src/head.c:673 +#, fuzzy, c-format +msgid "%s: failed to reset file pointer" +msgstr "%s: falhou em remover" + +#: src/head.c:798 #, c-format msgid "cannot reposition file pointer for %s" msgstr "não foi possível reposicionar ponteiro de arquivo para %s" -#: src/head.c:878 +#: src/head.c:885 #, 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:879 +#: src/head.c:886 msgid "number of lines" msgstr "número de linhas" -#: src/head.c:879 +#: src/head.c:886 msgid "number of bytes" msgstr "número de bytes" -#: src/head.c:886 src/tail.c:1947 +#: src/head.c:893 src/tail.c:1947 msgid "invalid number of lines" msgstr "número inválido de linhas" -#: src/head.c:887 src/tail.c:1948 +#: src/head.c:894 src/tail.c:1948 msgid "invalid number of bytes" msgstr "número inválido de bytes" -# , c-format -#: src/head.c:974 src/head.c:1032 +#: src/head.c:981 src/head.c:1039 #, c-format msgid "invalid trailing option -- %c" msgstr "opção inválida -- %c" #: src/hostid.c:42 -#, fuzzy, c-format +#, c-format msgid "" "Usage: %s [OPTION]\n" "Print the numeric identifier (in hexadecimal) for the current host.\n" "\n" msgstr "" -"Uso: %s\n" -" ou: %s OPÇÃO\n" +"Uso: %s [OPÇÃO]\n" "Emite o identificador numérico (em hexadecimal) para a máquina atual.\n" "\n" @@ -4840,7 +4734,6 @@ msgstr "" "Mostra ou configura o nome da máquina do sistema atual.\n" "\n" -# , c-format #: src/hostname.c:94 #, c-format msgid "cannot set name to %s" @@ -4863,7 +4756,6 @@ msgstr "não foi possível determinar o nome da máquina" msgid "Arnold Robbins" msgstr "Arnold Robbins" -# , c-format #: src/id.c:81 #, c-format msgid "Usage: %s [OPTION]... [USERNAME]\n" @@ -4928,98 +4820,91 @@ msgstr "é impossível emitir apenas nomes ou ID reais no formato padrão" msgid "can't get process context" msgstr "é impossível obter o contexto do processo" -# , c-format #: src/id.c:224 #, fuzzy, c-format msgid "cannot get effective UID" msgstr "não foi possível obter o alvo referenciado por %s" -#: src/id.c:289 +#: src/id.c:311 #, fuzzy, c-format -msgid "cannot find name for user ID %lu" +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:309 -#, c-format -msgid "uid=%lu" -msgstr "" +#: src/id.c:329 +#, fuzzy, c-format +msgid "uid=%s" +msgstr "uid=%lu" -#: src/id.c:314 -#, c-format -msgid " gid=%lu" -msgstr "" +#: src/id.c:334 +#, fuzzy, c-format +msgid " gid=%s" +msgstr " gid=%lu" -#: src/id.c:321 -#, c-format -msgid " euid=%lu" -msgstr "" +#: src/id.c:341 +#, fuzzy, c-format +msgid " euid=%s" +msgstr " euid=%lu" -#: src/id.c:329 -#, c-format -msgid " egid=%lu" -msgstr "" +#: src/id.c:349 +#, fuzzy, c-format +msgid " egid=%s" +msgstr " egid=%lu" -#: src/id.c:357 +#: src/id.c:377 msgid " groups=" msgstr " grupos=" -# , c-format -#: src/id.c:373 +#: src/id.c:393 #, fuzzy, c-format msgid " context=%s" msgstr "contexto inválido: %s" -# , c-format -#: src/install.c:372 +#: src/install.c:373 #, c-format msgid "warning: %s: failed to change context to %s" msgstr "aviso: %s: falhou em alterar o contexto para %s" -# , c-format -#: src/install.c:413 +#: src/install.c:414 #, c-format msgid "creating directory %s" msgstr "criando o diretório %s" -# , c-format -#: src/install.c:481 +#: src/install.c:482 #, c-format msgid "cannot change ownership of %s" msgstr "não foi possível mudar a posse de %s" -# , c-format -#: src/install.c:505 +#: src/install.c:506 #, c-format msgid "cannot set time stamps for %s" msgstr "não foi possível alterar o horário de %s" -#: src/install.c:526 src/split.c:412 src/timeout.c:387 +#: src/install.c:527 src/split.c:426 src/timeout.c:439 #, c-format msgid "fork system call failed" msgstr "a chamada de sistema \"fork\" falhou" -#: src/install.c:530 +#: src/install.c:531 #, fuzzy, c-format msgid "cannot run %s" msgstr "não foi possível executar \"strip\"" -# , c-format -#: src/install.c:534 +#: src/install.c:535 #, c-format msgid "waiting for strip" msgstr "esperando por \"strip\"" -#: src/install.c:536 +#: src/install.c:537 #, c-format msgid "strip process terminated abnormally" msgstr "o processo \"strip\" terminou anormalmente" -#: src/install.c:557 +#: src/install.c:558 #, c-format msgid "invalid user %s" msgstr "usuário inválido %s" -#: src/install.c:593 +#: src/install.c:594 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -5032,7 +4917,7 @@ msgstr "" " ou: %s [OPÇÃO]... -t DIRETÓRIO ORIGEM...\n" " ou: %s [OPÇÃO]... -d DIRETÓRIO...\n" -#: src/install.c:600 +#: src/install.c:601 #, fuzzy msgid "" "\n" @@ -5045,7 +4930,6 @@ msgid "" "In the first three forms, copy SOURCE to DEST or multiple SOURCE(s) to\n" "the existing DIRECTORY, while setting permission modes and owner/group.\n" "In the 4th form, create all components of the given DIRECTORY(ies).\n" -"\n" msgstr "" "Na três primeiras formas, copia ORIGEM para DESTINO ou múltiplas ORIGEM " "para\n" @@ -5128,7 +5012,7 @@ msgstr "" "arquivos\n" " e diretórios\n" -#: src/install.c:858 +#: src/install.c:859 #, fuzzy, c-format msgid "" "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled" @@ -5136,53 +5020,52 @@ msgstr "" "Aviso: ignorando --preserve-context; este Kernel não é habilitado com " "SELinux." -#: src/install.c:868 +#: 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:885 +#: src/install.c:886 #, 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:888 +#: src/install.c:889 #, 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:892 +#: 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" -# , c-format -#: src/install.c:946 src/mkdir.c:202 src/stdbuf.c:327 +#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326 #, c-format msgid "invalid mode %s" msgstr "modo inválido %s" -#: src/install.c:953 +#: src/install.c:954 #, c-format msgid "WARNING: ignoring --strip-program option as -s option was not specified" msgstr "" -#: src/install.c:958 +#: src/install.c:959 #, 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:965 +#: src/install.c:966 #, 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:971 +#: src/install.c:972 #, c-format msgid "" "the --compare (-C) option is ignored when you specify a mode with non-" @@ -5190,7 +5073,7 @@ msgid "" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/join.c:40 src/sort.c:65 +#: src/join.c:40 src/sort.c:66 msgid "Mike Haertel" msgstr "Mike Haertel" @@ -5289,22 +5172,19 @@ msgstr "" #: src/join.c:403 #, c-format -msgid "%s:%ju: is not sorted: %.*s" +msgid "%s:%<PRIuMAX>: is not sorted: %.*s" msgstr "" -# , c-format #: src/join.c:840 src/join.c:1038 #, c-format msgid "invalid field number: %s" msgstr "número inválido de campo: %s" -# , c-format #: src/join.c:861 src/join.c:870 #, c-format msgid "invalid field specifier: %s" msgstr "especificação inválida do campo: %s" -# , c-format #: src/join.c:877 #, c-format msgid "invalid file number in field spec: %s" @@ -5320,13 +5200,12 @@ msgstr "campos de junção incompatíveis %lu, %lu" msgid "conflicting empty-field replacement strings" msgstr "conflito entre textos de substituição de campos vazios" -# , c-format -#: src/join.c:1101 src/sort.c:4414 +#: src/join.c:1101 src/sort.c:4468 #, c-format msgid "multi-character tab %s" msgstr "tabulação multicaractere %s" -#: src/join.c:1105 src/sort.c:4419 +#: src/join.c:1105 src/sort.c:4473 #, c-format msgid "incompatible tabs" msgstr "tabulações incompatíveis" @@ -5348,14 +5227,13 @@ msgstr "" " ou: %s -t [SINAL]...\n" #: src/kill.c:82 -msgid "" -"Send signals to processes, or list signals.\n" -"\n" +#, fuzzy +msgid "Send signals to processes, or list signals.\n" msgstr "" "Envia sinais a processos ou lista os sinais.\n" "\n" -#: src/kill.c:89 +#: src/kill.c:88 msgid "" " -s, --signal=SIGNAL, -SIGNAL\n" " specify the name or number of the signal to be sent\n" @@ -5370,7 +5248,7 @@ msgstr "" " de sinais e seus números (e vice-versa)\n" " -t, --table emite uma tabela de informações de sinais\n" -#: src/kill.c:97 +#: src/kill.c:96 #, fuzzy msgid "" "\n" @@ -5384,34 +5262,32 @@ msgstr "" "ou ainda um estado de saída de um processo terminado por um sinal.\n" "PID é um inteiro; se negativo, identifica um grupo de processo.\n" -# , c-format -#: src/kill.c:206 +#: src/kill.c:205 #, c-format msgid "%s: invalid process id" msgstr "%s: id inválida de processo" -# , c-format -#: src/kill.c:260 +#: src/kill.c:259 #, c-format msgid "invalid option -- %c" msgstr "opção inválida -- %c" -#: src/kill.c:269 +#: src/kill.c:268 #, c-format msgid "%s: multiple signals specified" msgstr "%s: foram especificados múltiplos sinais" -#: src/kill.c:283 +#: src/kill.c:282 #, c-format msgid "multiple -l or -t options specified" msgstr "foram especificadas múltiplas opções -l ou -t" -#: src/kill.c:300 +#: src/kill.c:299 #, c-format msgid "cannot combine signal with -l or -t" msgstr "é impossível combinar sinal com -l ou -t" -#: src/kill.c:306 +#: src/kill.c:305 #, c-format msgid "no process ID specified" msgstr "nenhuma ID de processo foi especificada" @@ -5421,7 +5297,6 @@ msgstr "nenhuma ID de processo foi especificada" msgid "failed to allocate a %<PRIuMAX> byte stdio buffer\n" msgstr "" -# , c-format #: src/libstdbuf.c:116 #, fuzzy, c-format msgid "invalid buffering mode %s for %s\n" @@ -5437,7 +5312,6 @@ msgstr "" msgid "Michael Stone" msgstr "Michael Stone" -# , c-format #: src/link.c:45 #, c-format msgid "" @@ -5457,7 +5331,6 @@ msgstr "" "ARQUIVO1.\n" "\n" -# , c-format #: src/link.c:90 #, c-format msgid "cannot create link %s to %s" @@ -5468,7 +5341,6 @@ msgstr "não foi possível criar a ligação %s para %s" msgid "%s: hard link not allowed for directory" msgstr "%s: não são permitidas ligações absolutas para diretórios" -# , c-format #: src/ln.c:255 #, c-format msgid "%s: cannot overwrite directory" @@ -5479,13 +5351,11 @@ msgstr "%s: é impossível sobrescrever diretórios" msgid "%s: replace %s? " msgstr "%s: substituir %s? " -# , c-format #: src/ln.c:345 #, fuzzy, c-format msgid "failed to create symbolic link %s" msgstr "não foi possível criar ligação simbólica %s" -# , c-format #: src/ln.c:346 #, fuzzy, c-format msgid "failed to create symbolic link %s -> %s" @@ -5496,13 +5366,11 @@ msgstr "não foi possível criar ligação simbólica %s para %s" msgid "failed to create hard link to %.0s%s" msgstr "criando ligação absoluta para %.0s%s" -# , c-format #: src/ln.c:351 #, fuzzy, c-format msgid "failed to create hard link %s" msgstr "não foi possível criar ligação absoluta %s para %s" -# , c-format #: src/ln.c:352 #, fuzzy, c-format msgid "failed to create hard link %s => %s" @@ -5532,7 +5400,6 @@ msgid "" "When creating hard links, each TARGET must exist. Symbolic links\n" "can hold arbitrary text; if later resolved, a relative link is\n" "interpreted in relation to its parent directory.\n" -"\n" msgstr "" "Na 1ª forma, cria uma ligação para ALVO com o nome NOME_LIGAÇÃO.\n" "Na 2ª forma, cria uma ligação para ALVO no diretório atual.\n" @@ -5541,7 +5408,7 @@ msgstr "" "Ao criar ligações absolutas, é obrigatória a existência de cada ALVO.\n" "\n" -#: src/ln.c:395 +#: src/ln.c:394 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -5565,7 +5432,7 @@ msgstr "" " super-usuário)\n" " -f, --force remove arquivos de destino existentes\n" -#: src/ln.c:403 +#: src/ln.c:402 #, fuzzy msgid "" " -i, --interactive prompt whether to remove destinations\n" @@ -5584,7 +5451,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:412 +#: src/ln.c:411 #, fuzzy msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -5601,25 +5468,10 @@ 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:428 -#, 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 faz cópias de segurança (mesmo se --backup for\n" -" especificado)\n" -" numbered, t faz cópias de segurança numeradas\n" -" existing, nil numeradas se já existirem cópias de segurança numeradas,\n" -" simples em caso contrário\n" -" simple, never sempre faz cópias de segurança simples\n" - -#: src/ln.c:435 +#: src/ln.c:433 #, 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 "" @@ -5629,7 +5481,6 @@ msgstr "" msgid "cannot combine --target-directory and --no-target-directory" msgstr "É impossível combinar --target-directory com --no-target-directory" -# , c-format #: src/ln.c:588 #, fuzzy, c-format msgid "cannot do --relative without --symbolic" @@ -5640,7 +5491,6 @@ msgstr "não foi possível criar ligação simbólica %s" msgid "FIXME: unknown" msgstr "FIXME: desconhecido" -# , c-format #: src/logname.c:39 src/sync.c:40 #, c-format msgid "Usage: %s [OPTION]\n" @@ -5693,19 +5543,16 @@ 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" -# , c-format -#: src/ls.c:1750 src/ptx.c:1976 +#: src/ls.c:1750 src/ptx.c:1975 #, c-format msgid "invalid line width: %s" msgstr "largura inválida de linha: %s" -# , c-format #: src/ls.c:1824 #, c-format msgid "invalid tab size: %s" msgstr "tamanho inválido de tabulação: %s" -# , c-format #: src/ls.c:2033 #, c-format msgid "invalid time style format %s" @@ -5725,7 +5572,6 @@ msgstr "" msgid "error initializing month strings" msgstr "" -# , c-format #: src/ls.c:2407 #, c-format msgid "unrecognized prefix: %s" @@ -5736,37 +5582,32 @@ msgstr "prefixo desconhecido: %s" msgid "unparsable value for LS_COLORS environment variable" msgstr "o valor da variável de ambiente LS_COLORS não pode ser analisado" -# , c-format #: src/ls.c:2514 src/pwd.c:161 #, c-format msgid "cannot open directory %s" msgstr "não foi possível abrir o diretório %s" -# , c-format #: src/ls.c:2529 #, c-format msgid "cannot determine device and inode of %s" msgstr "não foi possível determinar o dispositivo e o inode de %s" -# , c-format #: src/ls.c:2538 #, c-format msgid "%s: not listing already-listed directory" msgstr "%s: não listando o diretório já listado" -# , c-format #: src/ls.c:2615 src/pwd.c:229 #, c-format msgid "reading directory %s" msgstr "lendo o diretório %s" -# , c-format #: src/ls.c:2630 #, c-format msgid "closing directory %s" msgstr "fechando o diretório %s" -#: src/ls.c:3301 +#: src/ls.c:3302 #, c-format msgid "cannot compare file names %s and %s" msgstr "não foi possível comparar os nomes de arquivo %s e %s" @@ -5776,7 +5617,6 @@ msgstr "não foi possível comparar os nomes de arquivo %s e %s" msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" -"\n" msgstr "" "Lista informações sobre os ARQUIVOs (no diretório atual por padrão).\n" "Lista as entradas em ordem alfabética se não for usada nenhuma opção -" @@ -5784,7 +5624,7 @@ msgstr "" "nem --sort.\n" "\n" -#: src/ls.c:4729 +#: src/ls.c:4728 #, fuzzy msgid "" " -a, --all do not ignore entries starting with .\n" @@ -5799,7 +5639,7 @@ msgstr "" " -b, --escape emite escapes em octal para caracteres não-\n" " gráficos\n" -#: src/ls.c:4735 +#: src/ls.c:4734 #, fuzzy msgid "" " --block-size=SIZE scale sizes by SIZE before printing them. E." @@ -5823,7 +5663,7 @@ msgstr "" " com -l: mostra o ctime e ordena por nome\n" " demais casos: ordena por ctime\n" -#: src/ls.c:4745 +#: src/ls.c:4744 #, fuzzy msgid "" " -C list entries by columns\n" @@ -5847,7 +5687,7 @@ msgstr "" " -D, --dired gera a saída projetada para modo \"dired\" do " "Emacs\n" -#: src/ls.c:4753 +#: src/ls.c:4752 #, fuzzy msgid "" " -f do not sort, enable -aU, disable -ls --color\n" @@ -5867,11 +5707,11 @@ msgstr "" " \"verbose\" (-l), \"vertical\" (-C)\n" " --full-time o mesmo que -l --time-style=full-iso\n" -#: src/ls.c:4761 +#: src/ls.c:4760 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:4764 +#: src/ls.c:4763 msgid "" " --group-directories-first\n" " group directories before files.\n" @@ -5885,7 +5725,7 @@ msgstr "" " --sort=none (-U) desabilita o agrupamento de\n" " diretórios\n" -#: src/ls.c:4770 +#: src/ls.c:4769 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" @@ -5900,7 +5740,7 @@ msgstr "" " --si similar, mas usa potências de 1000, e não de " "1024\n" -#: src/ls.c:4776 +#: src/ls.c:4775 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5926,7 +5766,7 @@ msgstr "" "usa\n" " -a ou -A)\n" -#: src/ls.c:4786 +#: src/ls.c:4785 #, fuzzy msgid "" " --indicator-style=WORD append indicator with style WORD to entry " @@ -5950,7 +5790,7 @@ msgstr "" " com o PADRÃO (em sintaxe shell)\n" " -k o mesmo que --block-size=1K\n" -#: src/ls.c:4796 +#: src/ls.c:4795 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5968,7 +5808,7 @@ msgstr "" "entradas\n" " separadas por vírgula\n" -#: src/ls.c:4804 +#: src/ls.c:4803 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. " @@ -5989,7 +5829,7 @@ msgstr "" " -p, --indicator-style=slash\n" " anexa o indicador / aos diretórios\n" -#: src/ls.c:4812 +#: src/ls.c:4811 #, fuzzy msgid "" " -q, --hide-control-chars print ? instead of non graphic characters\n" @@ -6013,7 +5853,7 @@ msgstr "" " literal, locale, shell, shell-always, c, " "escape\n" -#: src/ls.c:4821 +#: src/ls.c:4820 #, fuzzy msgid "" " -r, --reverse reverse order while sorting\n" @@ -6025,7 +5865,7 @@ msgstr "" " -R, --recursive lista os subdiretórios recursivamente\n" " -s, --size emite o tamanho de cada arquivo, em blocos\n" -#: src/ls.c:4826 +#: src/ls.c:4825 msgid "" " -S sort by file size\n" " --sort=WORD sort by WORD instead of name: none -U,\n" @@ -6048,7 +5888,7 @@ msgstr "" " usa o horário especificado como chave de\n" " ordenação se --sort=time\n" -#: src/ls.c:4836 +#: src/ls.c:4835 #, fuzzy msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" @@ -6073,7 +5913,7 @@ msgstr "" "ESTILO\n" " só faz efeito fora da localidade POSIX\n" -#: src/ls.c:4845 +#: src/ls.c:4844 #, fuzzy msgid "" " -t sort by modification time, newest first\n" @@ -6083,7 +5923,7 @@ msgstr "" " -T, --tabsize=COLS assume paradas de tabulação a cada COLS em vez\n" " de 8\n" -#: src/ls.c:4849 +#: src/ls.c:4848 #, fuzzy msgid "" " -u with -lt: sort by, and show, access time\n" @@ -6100,7 +5940,7 @@ msgstr "" " -U não ordena; lista na ordem do diretório\n" " -v ordena por versão\n" -#: src/ls.c:4856 +#: src/ls.c:4855 msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" @@ -6119,7 +5959,7 @@ msgstr "" " cada arquivo\n" " -1 lista um arquivo por linha\n" -#: src/ls.c:4866 +#: src/ls.c:4865 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -6128,7 +5968,7 @@ msgid "" "variable can change the settings. Use the dircolors command to set it.\n" msgstr "" -#: src/ls.c:4873 +#: src/ls.c:4872 msgid "" "\n" "Exit status:\n" @@ -6152,7 +5992,7 @@ msgstr "Scott Miller" msgid "David Madore" msgstr "David Madore" -#: src/md5sum.c:162 +#: src/md5sum.c:164 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -6165,7 +6005,7 @@ msgstr "" "Se ARQUIVO não for especificado ou for -, lê a entrada padrão.\n" "\n" -#: src/md5sum.c:172 +#: src/md5sum.c:174 #, fuzzy msgid "" " -b, --binary read in binary mode (default unless reading tty " @@ -6175,17 +6015,21 @@ msgstr "" "entrada\n" " padrão do tty)\n" -#: src/md5sum.c:176 +#: src/md5sum.c:178 #, fuzzy msgid " -b, --binary read in binary mode\n" msgstr " -b, --binary lê em modo binário\n" -#: src/md5sum.c:179 +#: src/md5sum.c:181 #, fuzzy, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr " -c, --check lê as somas %s dos ARQUIVOs e as confere\n" -#: src/md5sum.c:183 +#: src/md5sum.c:184 +msgid " --tag create a BSD-style checksum\n" +msgstr "" + +#: src/md5sum.c:188 #, fuzzy msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" @@ -6194,12 +6038,12 @@ msgstr "" "padrão\n" " do tty)\n" -#: src/md5sum.c:187 +#: src/md5sum.c:192 #, fuzzy msgid " -t, --text read in text mode (default)\n" msgstr " -t, --text lê em modo texto (padrão)\n" -#: src/md5sum.c:190 +#: src/md5sum.c:195 #, fuzzy msgid "" "\n" @@ -6218,12 +6062,12 @@ msgstr "" " de maneira imprópria\n" "\n" -#: src/md5sum.c:198 +#: src/md5sum.c:203 msgid "" " --strict with --check, exit non-zero for any invalid input\n" msgstr "" -#: src/md5sum.c:203 +#: src/md5sum.c:208 #, fuzzy, c-format msgid "" "\n" @@ -6240,44 +6084,39 @@ msgstr "" "caractere\n" "indicando o tipo (\"*\" para binário, \" \"para texto) e o nome do arquivo.\n" -# , c-format -#: src/md5sum.c:502 +#: src/md5sum.c:523 #, c-format msgid "%s: too many checksum lines" msgstr "%s: muitas linhas de soma de verificação" -# , c-format -#: src/md5sum.c:526 +#: src/md5sum.c:547 #, 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" -# , c-format -#: src/md5sum.c:551 +#: src/md5sum.c:572 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: FALHOU na abertura ou na leitura\n" -#: src/md5sum.c:574 +#: src/md5sum.c:595 msgid "FAILED" msgstr "FALHOU" -#: src/md5sum.c:576 +#: src/md5sum.c:597 msgid "OK" msgstr "SUCESSO" -# , c-format -#: src/md5sum.c:600 +#: src/md5sum.c:621 #, 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" -# , c-format -#: src/md5sum.c:610 +#: src/md5sum.c:631 #, fuzzy, c-format msgid "WARNING: %<PRIuMAX> line is improperly formatted" msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted" @@ -6288,8 +6127,7 @@ msgstr[1] "" "%s: %<PRIuMAX>: linha de soma de verificação %s formatada de maneira " "imprópria" -# , c-format -#: src/md5sum.c:618 +#: src/md5sum.c:639 #, fuzzy, c-format msgid "WARNING: %<PRIuMAX> listed file could not be read" msgid_plural "WARNING: %<PRIuMAX> listed files could not be read" @@ -6298,8 +6136,7 @@ msgstr[1] "" "AVISO: %<PRIuMAX> dos %<PRIuMAX> arquivos listados não pôde(puderam) ser lido" "(s)" -# , c-format -#: src/md5sum.c:626 +#: src/md5sum.c:647 #, fuzzy, c-format msgid "WARNING: %<PRIuMAX> computed checksum did NOT match" msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match" @@ -6309,7 +6146,17 @@ msgstr[1] "" "AVISO: %<PRIuMAX> das %<PRIuMAX> somas de verificação calculadas NÃO coincide" "(m)" -#: src/md5sum.c:704 +#: src/md5sum.c:760 +#, c-format +msgid "--tag does not support --text mode" +msgstr "" + +#: src/md5sum.c:766 +#, 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 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" @@ -6317,41 +6164,39 @@ msgstr "" "as opções --binary e --text não fazem sentido ao conferir as somas de " "verificação" -#: src/md5sum.c:712 +#: src/md5sum.c:781 #, 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:719 +#: src/md5sum.c:788 #, 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:726 +#: src/md5sum.c:795 #, 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:733 +#: src/md5sum.c:802 #, 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" -# , c-format #: src/mkdir.c:56 src/rmdir.c:164 #, c-format msgid "Usage: %s [OPTION]... DIRECTORY...\n" msgstr "Uso: %s [OPÇÃO]... DIRETÓRIO...\n" #: src/mkdir.c:57 -msgid "" -"Create the DIRECTORY(ies), if they do not already exist.\n" -"\n" +#, 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:64 +#: src/mkdir.c:63 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" @@ -6369,27 +6214,24 @@ msgstr "" "diretório\n" " criado como CTX\n" -# , c-format -#: src/mkdir.c:169 +#: src/mkdir.c:168 #, c-format msgid "created directory %s" msgstr "foi criado o diretório %s" -# , c-format #: src/mkfifo.c:51 src/pathchk.c:89 #, c-format msgid "Usage: %s [OPTION]... NAME...\n" msgstr "Uso: %s [OPÇÃO]... NOME...\n" #: src/mkfifo.c:52 -msgid "" -"Create named pipes (FIFOs) with the given NAMEs.\n" -"\n" +#, 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:59 src/mknod.c:61 +#: src/mkfifo.c:58 src/mknod.c:60 #, fuzzy msgid "" " -m, --mode=MODE set file permission bits to MODE, not a=rw - umask\n" @@ -6397,44 +6239,42 @@ 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:62 +#: src/mkfifo.c:61 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" -#: src/mkfifo.c:122 src/mknod.c:128 +#: src/mkfifo.c:121 src/mknod.c:127 #, c-format msgid "invalid mode" msgstr "modo inválido" -#: src/mkfifo.c:127 src/mknod.c:133 +#: src/mkfifo.c:126 src/mknod.c:132 #, c-format msgid "mode must specify only file permission bits" msgstr "o modo deve especificar apenas os bits de permissão de arquivo" -# , c-format #: src/mknod.c:52 #, 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 -msgid "" -"Create the special file NAME of the given TYPE.\n" -"\n" +#, 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:64 +#: 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:69 +#: src/mknod.c:68 msgid "" "\n" "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n" @@ -6451,7 +6291,7 @@ msgstr "" "em caso contrário, como decimal.\n" "TIPO pode ser:\n" -#: src/mknod.c:76 +#: src/mknod.c:75 msgid "" "\n" " b create a block (buffered) special file\n" @@ -6463,45 +6303,40 @@ msgstr "" " c, u cria um arquivo especial de tipo caractere (não \"buffered\")\n" " p cria uma \"FIFO\"\n" -#: src/mknod.c:151 +#: src/mknod.c:150 msgid "Special files require major and minor device numbers." msgstr "Arquivos especiais exigem os números maior e menor do dispositivo." -# , c-format -#: src/mknod.c:161 +#: src/mknod.c:160 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:177 +#: src/mknod.c:176 #, c-format msgid "block special files not supported" msgstr "não há suporte para arquivos especiais de bloco" -#: src/mknod.c:186 +#: src/mknod.c:185 #, c-format msgid "character special files not supported" msgstr "não há suporte para arquivos especiais de caractere" -# , c-format -#: src/mknod.c:202 +#: src/mknod.c:201 #, c-format msgid "invalid major device number %s" msgstr "número maior de dispostivo é inválido %s" -# , c-format -#: src/mknod.c:207 +#: src/mknod.c:206 #, c-format msgid "invalid minor device number %s" msgstr "número menor de dispostivo é inválido %s" -# , c-format -#: src/mknod.c:212 +#: src/mknod.c:211 #, c-format msgid "invalid device %s %s" msgstr "dispositivo inválido %s %s" -# , c-format -#: src/mknod.c:226 +#: src/mknod.c:225 #, c-format msgid "invalid device type %s" msgstr "tipo inválido de dispositivo %s" @@ -6509,9 +6344,8 @@ msgstr "tipo inválido de dispositivo %s" #. This is a proper name. See the gettext manual, section Names. #: src/mktemp.c:37 msgid "Eric Blake" -msgstr "" +msgstr "Eric Blake" -# , c-format #: src/mktemp.c:68 #, c-format msgid "Usage: %s [OPTION]... [TEMPLATE]\n" @@ -6582,61 +6416,59 @@ msgstr "" " senão, usa o diretório especificado via -p; senão, usa\n" " /tmp [obsoleto]\n" -#: src/mktemp.c:222 +#: 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:228 +#: src/mktemp.c:229 #, c-format msgid "too many templates" msgstr "muitos modelos" -#: src/mktemp.c:248 +#: src/mktemp.c:249 #, c-format msgid "with --suffix, template %s must end in X" msgstr "" -#: src/mktemp.c:273 src/split.c:1117 +#: src/mktemp.c:274 src/split.c:1130 #, fuzzy, c-format msgid "invalid suffix %s, contains directory separator" msgstr "modelo inválido, %s; contém separador de diretório" -#: src/mktemp.c:278 +#: src/mktemp.c:279 #, c-format msgid "too few X's in template %s" msgstr "poucos Xs no modelo %s" -#: src/mktemp.c:291 +#: src/mktemp.c:292 #, c-format msgid "invalid template, %s, contains directory separator" msgstr "modelo inválido, %s; contém separador de diretório" -#: src/mktemp.c:305 +#: src/mktemp.c:306 #, 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" -# , c-format -#: src/mktemp.c:325 +#: src/mktemp.c:326 #, c-format msgid "failed to create directory via template %s" msgstr "falhou em criar o diretório via modelo %s" -#: src/mktemp.c:335 +#: src/mktemp.c:336 #, c-format msgid "failed to create file via template %s" msgstr "falhou em criar o arquivo via modelo %s" -#: src/mv.c:290 -msgid "" -"Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" -"\n" +#: src/mv.c:292 +#, 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:297 +#: src/mv.c:298 #, fuzzy msgid "" " --backup[=CONTROL] make a backup of each existing destination " @@ -6656,7 +6488,7 @@ msgstr "" " -f, --force não pergunta antes de sobrescrever\n" " -i, --interactive pergunta antes de sobrescrever\n" -#: src/mv.c:306 +#: src/mv.c:307 msgid "" " --strip-trailing-slashes remove any trailing slashes from each " "SOURCE\n" @@ -6668,7 +6500,7 @@ msgstr "" " -S, --suffix=SUFIXO redefine o sufixo costumeiro de cópia de\n" " segurança\n" -#: src/mv.c:311 +#: src/mv.c:312 msgid "" " -t, --target-directory=DIRECTORY move all SOURCE arguments into " "DIRECTORY\n" @@ -6687,20 +6519,17 @@ msgstr "" " de destino não existe\n" " -v, --verbose explica o que está sendo feito\n" -# , c-format #: src/nice.c:72 #, c-format msgid "Usage: %s [OPTION] [COMMAND [ARG]...]\n" msgstr "Uso: %s [OPÇÃO] [COMANDO [ARG]...]\n" #: src/nice.c:73 -#, c-format +#, fuzzy, c-format msgid "" "Run COMMAND with an adjusted niceness, which affects process scheduling.\n" -"With no COMMAND, print the current niceness. Nicenesses range from\n" -"%d (most favorable scheduling) to %d (least favorable).\n" -"\n" -" -n, --adjustment=N add integer N to the niceness (default 10)\n" +"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 "" "Executa COMANDO com um valor de nice ajustado, que afeta o escalonamento do\n" "processo.\n" @@ -6710,24 +6539,26 @@ msgstr "" " -n, --adjustment=N adiciona o número inteiro N ao valor de nice\n" " (o padrão é 10)\n" -# , c-format -#: src/nice.c:168 +#: src/nice.c:82 +msgid " -n, --adjustment=N add integer N to the niceness (default 10)\n" +msgstr "" + +#: src/nice.c:172 #, c-format msgid "invalid adjustment %s" msgstr "ajuste inválido %s" -#: src/nice.c:177 +#: src/nice.c:181 #, c-format msgid "a command must be given with an adjustment" msgstr "um comando deve ser fornecido com um ajuste" -# , c-format -#: src/nice.c:184 src/nice.c:195 +#: src/nice.c:188 src/nice.c:199 #, c-format msgid "cannot get niceness" msgstr "não foi possível obter o valor de nice" -#: src/nice.c:201 +#: src/nice.c:205 #, c-format msgid "cannot set niceness" msgstr "não foi possível ajustar o valor de nice" @@ -6737,17 +6568,17 @@ msgstr "não foi possível ajustar o valor de nice" msgid "Scott Bartram" msgstr "Scott Bartram" -#: src/nl.c:186 +#: 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" -"\n" msgstr "" "Escreve cada ARQUIVO para a saída padrão junto com os números das linhas.\n" "Se ARQUIVO não é fornecido ou se for -, lê a entrada padrão.\n" "\n" -#: src/nl.c:194 +#: src/nl.c:186 msgid "" " -b, --body-numbering=STYLE use STYLE for numbering body lines\n" " -d, --section-delimiter=CC use CC for separating logical pages\n" @@ -6759,7 +6590,7 @@ msgstr "" " -f, --footer-numbering=ESTILO usa ESTILO para numeração das linhas de\n" " rodapé\n" -#: src/nl.c:199 +#: src/nl.c:191 #, fuzzy msgid "" " -h, --header-numbering=STYLE use STYLE for numbering header lines\n" @@ -6786,7 +6617,7 @@ msgstr "" "número\n" " da linha\n" -#: src/nl.c:207 +#: src/nl.c:199 #, fuzzy msgid "" " -v, --starting-line-number=NUMBER first line number on each logical page\n" @@ -6797,7 +6628,7 @@ msgstr "" " -w, --number-width=NÚMERO usa NÚMERO colunas para numeração das " "linhas\n" -#: src/nl.c:213 +#: src/nl.c:205 msgid "" "\n" "By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC are\n" @@ -6810,7 +6641,7 @@ msgstr "" "a ausência de um segundo caractere implica em :. Digite \\\\ para \\.\n" "ESTILO é um dos itens:\n" -#: src/nl.c:219 +#: src/nl.c:211 msgid "" "\n" " a number all lines\n" @@ -6840,65 +6671,51 @@ msgstr "" " rz justificação à direita, com zeros iniciais\n" "\n" -# , c-format -#: src/nl.c:286 +#: src/nl.c:278 #, c-format msgid "line number overflow" msgstr "estouro do número de linhas" -# , c-format -#: src/nl.c:486 +#: src/nl.c:478 #, c-format msgid "invalid header numbering style: %s" msgstr "estilo inválido de numeração de cabeçalho: %s" -#: src/nl.c:494 +#: src/nl.c:486 #, c-format msgid "invalid body numbering style: %s" msgstr "estilo inválido de numeração do corpo: %s" -# , c-format -#: src/nl.c:502 +#: src/nl.c:494 #, c-format msgid "invalid footer numbering style: %s" msgstr "estilo inválido de numeração de rodapé: %s" -# , c-format -#: src/nl.c:511 +#: src/nl.c:503 #, c-format msgid "invalid starting line number: %s" msgstr "número inválido para linha inicial: %s" -#: src/nl.c:517 -#, fuzzy, c-format -msgid "WARNING: --page-increment is deprecated; use --line-increment instead" -msgstr "a opção --megabytes é obsoleta; use -m no lugar" - -# , c-format -#: src/nl.c:524 +#: src/nl.c:512 #, c-format msgid "invalid line number increment: %s" msgstr "incremento inválido de número de linha: %s" -# , c-format -#: src/nl.c:536 +#: src/nl.c:524 #, c-format msgid "invalid number of blank lines: %s" msgstr "número inválido de linhas vazias: %s" -# , c-format -#: src/nl.c:550 +#: src/nl.c:538 #, c-format msgid "invalid line number field width: %s" msgstr "largura inválida de campo de numeração de linha: %s" -# , c-format -#: src/nl.c:569 +#: src/nl.c:557 #, c-format msgid "invalid line numbering format: %s" msgstr "formato inválido de numeração de linha: %s" -# , c-format #: src/nohup.c:53 #, c-format msgid "" @@ -6944,11 +6761,6 @@ msgstr "falhou em redirecionar o erro padrão" msgid "ignoring input" msgstr "ignorando entrada" -#: src/nohup.c:163 src/nohup.c:165 -#, c-format -msgid "failed to open %s" -msgstr "falhou em abrir %s" - #: src/nohup.c:175 #, c-format msgid "ignoring input and appending output to %s" @@ -6980,36 +6792,370 @@ msgid "failed to redirect standard error" msgstr "falhou em redirecionar o erro padrão" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:32 +#: src/nproc.c:33 msgid "Giuseppe Scrivano" -msgstr "" +msgstr "Giuseppe Scrivano" -# , c-format -#: src/nproc.c:56 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 +#: src/nproc.c:57 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Uso: %s [OPÇÃO]...\n" -#: src/nproc.c:57 +#: src/nproc.c:58 msgid "" "Print the number of processing units available to the current process,\n" "which may be less than the number of online processors\n" "\n" msgstr "" -#: src/nproc.c:62 +#: src/nproc.c:63 msgid "" " --all print the number of installed processors\n" " --ignore=N if possible, exclude N processing units\n" msgstr "" -# , c-format -#: src/nproc.c:106 +#: src/nproc.c:107 #, fuzzy, c-format msgid "%s: invalid number to ignore" msgstr "%s: número inválido de linhas" -# , c-format +#. This is a proper name. See the gettext manual, section Names. +#: src/numfmt.c:35 +msgid "Assaf Gordon" +msgstr "" + +#: src/numfmt.c:676 +#, fuzzy, c-format +msgid "value too large to be converted: '%s'" +msgstr "%s: valor não foi convertido totalmente" + +#: src/numfmt.c:680 +#, fuzzy, c-format +msgid "invalid number: '%s'" +msgstr "número inválido %s" + +#: src/numfmt.c:684 +#, c-format +msgid "rejecting suffix in input: '%s' (consider using --from)" +msgstr "" + +#: src/numfmt.c:688 +#, fuzzy, c-format +msgid "invalid suffix in input: '%s'" +msgstr "sufixo inválido no argumento para %s%s: \"%s\"" + +#: src/numfmt.c:692 +#, c-format +msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)" +msgstr "" + +#: src/numfmt.c:723 +#, fuzzy, c-format +msgid "failed to prepare value '%Lf' for printing" +msgstr "%s: falhou em abrir para escrita" + +#: src/numfmt.c:787 +#, fuzzy, c-format +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 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [NUMBER]...\n" +msgstr "Uso: %s [OPÇÃO]... [USUÁRIO]...\n" + +#: src/numfmt.c:816 +msgid "" +"Reformat NUMBER(s), or the numbers from standard input if none are " +"specified.\n" +msgstr "" + +#: src/numfmt.c:820 +msgid " --debug print warnings about invalid input\n" +msgstr "" + +#: src/numfmt.c:823 +msgid "" +" -d, --delimiter=X use X instead of whitespace for field delimiter\n" +msgstr "" + +#: src/numfmt.c:826 +msgid "" +" --field=N replace the number in input field N (default is 1)\n" +msgstr "" + +#: src/numfmt.c:829 +msgid "" +" --format=FORMAT use printf style floating-point FORMAT;\n" +" see FORMAT below for details\n" +msgstr "" + +#: src/numfmt.c:833 +msgid "" +" --from=UNIT auto-scale input numbers to UNITs; default is " +"'none';\n" +" see UNIT below\n" +msgstr "" + +#: src/numfmt.c:837 +msgid "" +" --from-unit=N specify the input unit size (instead of the default " +"1)\n" +msgstr "" + +#: src/numfmt.c:840 +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 "" + +#: src/numfmt.c:844 +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 +msgid "" +" --invalid=MODE failure mode for invalid numbers: MODE can be:\n" +" abort (default), fail, warn, ignore\n" +msgstr "" + +#: src/numfmt.c:852 +msgid "" +" --padding=N pad the output to N characters; positive N will\n" +" right-align; negative N will left-align;\n" +" padding is ignored if the output is wider than N;\n" +" the default is to automatically pad if a " +"whitespace\n" +" is found\n" +msgstr "" + +#: src/numfmt.c:859 +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 +msgid "" +" --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" +" SUFFIX in input numbers\n" +msgstr "" + +#: src/numfmt.c:867 +msgid "" +" --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" +msgstr "" + +#: src/numfmt.c:870 +msgid "" +" --to-unit=N the output unit size (instead of the default 1)\n" +msgstr "" + +#: src/numfmt.c:877 +#, fuzzy +msgid "" +"\n" +"UNIT options:\n" +msgstr "" +"Opções de ordenação:\n" +"\n" + +#: src/numfmt.c:880 +msgid " none no auto-scaling is done; suffixes will trigger an error\n" +msgstr "" + +#: src/numfmt.c:883 +msgid "" +" auto accept optional single/two letter suffix:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" +msgstr "" + +#: src/numfmt.c:889 +msgid "" +" si accept optional single letter suffix:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:894 +msgid "" +" iec accept optional single letter suffix:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:899 +msgid "" +" iec-i accept optional two-letter suffix:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:905 +#, 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" +msgstr "" + +#: src/numfmt.c:912 +#, c-format +msgid "" +"\n" +"Exit status is 0 if all input numbers were successfully converted.\n" +"By default, %s will stop at the first conversion error with exit status 2.\n" +"With --invalid='fail' a warning is printed for each conversion error\n" +"and the exit status is 2. With --invalid='warn' each conversion error is\n" +"diagnosed, but the exit status is 0. With --invalid='ignore' conversion\n" +"errors are not diagnosed and the exit status is 0.\n" +msgstr "" + +#: src/numfmt.c:921 +#, c-format +msgid "" +"\n" +"Examples:\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" +msgstr "" + +#: src/numfmt.c:974 src/seq.c:212 +#, fuzzy, c-format +msgid "format %s has no %% directive" +msgstr "o alvo %s não é um diretório" + +#: src/numfmt.c:990 +#, fuzzy, c-format +msgid "invalid format %s (width overflow)" +msgstr "largura inválida do formato" + +#: src/numfmt.c:1007 src/seq.c:229 +#, c-format +msgid "format %s ends in %%" +msgstr "" + +#: src/numfmt.c:1010 +#, c-format +msgid "invalid format %s, directive must be %%['][-][N]f" +msgstr "" + +#: src/numfmt.c:1018 src/seq.c:236 +#, 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 "sufixo inválido no argumento para %s%s: \"%s\"" + +#: src/numfmt.c:1092 +#, c-format +msgid "value too large to be printed: '%Lg' (consider using --to)" +msgstr "" + +#: src/numfmt.c:1100 +#, c-format +msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" +msgstr "" + +#: src/numfmt.c:1184 +#, c-format +msgid "large input value '%s': possible precision loss" +msgstr "" + +#: src/numfmt.c:1293 +#, 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 "intervalo inválido de página %s" + +#: src/numfmt.c:1401 +#, fuzzy, c-format +msgid "invalid field value '%s'" +msgstr "número inválido de campo: %s" + +#: src/numfmt.c:1430 +#, fuzzy, c-format +msgid "invalid header value '%s'" +msgstr "data inválida %s" + +#: src/numfmt.c:1456 +#, 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 +#, fuzzy, c-format +msgid "no conversion option specified" +msgstr "foram especificadas múltiplas opções -i" + +#: src/numfmt.c:1471 +#, 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 +#, c-format +msgid "grouping has no effect in this locale" +msgstr "" + +#: src/numfmt.c:1486 +#, c-format +msgid "--header ignored with command-line input" +msgstr "" + +#: src/numfmt.c:1511 +#, fuzzy, c-format +msgid "error reading input" +msgstr "erro lendo %s" + +#: src/numfmt.c:1520 +#, fuzzy, c-format +msgid "failed to convert some of the input numbers" +msgstr "falhou em redirecionar o erro padrão" + #: src/od.c:294 #, c-format msgid "" @@ -7040,29 +7186,52 @@ msgstr "" "\n" #: src/od.c:307 -msgid "All arguments to long options are mandatory for short options.\n" +#, fuzzy +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" +"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" +"at first byte printed, incremented when dump is progressing.\n" +"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 "" -"Todos os argumentos para opções longas são obrigatórias para opções curtas.\n" +"\n" +"Se tanto o primeiro como o segundo formato de chamada se aplicarem, o " +"segundo\n" +"é assumido se o último operando começar com + ou (se houverem 2 operandos) " +"com\n" +"um dígito.\n" +"Um operando DESLOCAMENTO significa o mesmo que -j DESLOCAMENTO. RÓTULO é um\n" +"pseudo-endereço do primeiro byte emitido, incrementado à medida que " +"progride\n" +"o despejo de bytes.\n" +"Para DESLOCAMENTO e RÓTULO, um prefixo 0x ou 0X indica um numeral " +"hexadecimal;\n" +"sufixos possíveis são . para octal e b para multiplicação por 512.\n" -#: src/od.c:310 +#: src/od.c:318 +#, fuzzy msgid "" -" -A, --address-radix=RADIX decide how file offsets are printed\n" +" -A, --address-radix=RADIX output format for file offsets. RADIX is one\n" +" of [doxn], for Decimal, Octal, Hex or None\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:314 +#: src/od.c:323 #, 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" -" --traditional accept arguments in traditional form\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=QTD limita a emitir até QTD bytes de entrada\n" " -S, --strings[=QTD] emite textos de pelo menos QTD bytes de\n" @@ -7072,9 +7241,11 @@ msgstr "" " -w, --width[=QTD] emite QTD bytes por linha de saída\n" " --traditional aceita argumentos na forma tradicional\n" -#: src/od.c:324 +#: src/od.c:336 +#, fuzzy 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" @@ -7092,7 +7263,7 @@ msgstr "" " invertida\n" " -d o mesmo que -t u2, seleciona decimais sem sinal de 2-bytes\n" -#: src/od.c:332 +#: src/od.c:345 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -7108,35 +7279,12 @@ 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:340 +#: src/od.c:353 +#, fuzzy msgid "" "\n" -"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" -"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" -"at first byte printed, incremented when dump is progressing.\n" -"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" -"Se tanto o primeiro como o segundo formato de chamada se aplicarem, o " -"segundo\n" -"é assumido se o último operando começar com + ou (se houverem 2 operandos) " -"com\n" -"um dígito.\n" -"Um operando DESLOCAMENTO significa o mesmo que -j DESLOCAMENTO. RÓTULO é um\n" -"pseudo-endereço do primeiro byte emitido, incrementado à medida que " -"progride\n" -"o despejo de bytes.\n" -"Para DESLOCAMENTO e RÓTULO, um prefixo 0x ou 0X indica um numeral " -"hexadecimal;\n" -"sufixos possíveis são . para octal e b para multiplicação por 512.\n" - -#: src/od.c:349 -msgid "" "\n" "TYPE is made up of one or more of these specifications:\n" -"\n" " a named character, ignoring high-order bit\n" " c ASCII character or backslash escape\n" msgstr "" @@ -7146,7 +7294,7 @@ msgstr "" " a caractere com nome, ignorando o bit mais significativo\n" " c caractere ASCII ou escape por barra invertida\n" -#: src/od.c:356 +#: src/od.c:360 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -7160,10 +7308,11 @@ 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:363 +#: src/od.c:367 +#, fuzzy msgid "" "\n" -"SIZE is a number. For TYPE in doux, SIZE may also be C for\n" +"SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" "sizeof(char), S for sizeof(short), I for sizeof(int) or L for\n" "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" @@ -7179,46 +7328,37 @@ msgstr "" "de\n" "programação C que indica o número de bytes para o tipo de variável.\n" -#: src/od.c:370 -#, fuzzy +#: src/od.c:374 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" +"Adding a z suffix to any type displays printable characters at the end of\n" +"each output line.\n" msgstr "" -"\n" -"BASE numérica é d para decimal, o para octal, x para hexadecimal ou n para\n" -"nenhuma.\n" -"QTD é 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 assim por diante com T, P, E, Z e Y.\n" -"Adicionar um sufixo z para qualquer tipo mostra os caracteres imprimíveis " -"ao\n" -"final de cada linha de saída. " -#: src/od.c:380 +#: src/od.c:379 #, 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" +"\n" +"\n" +"BYTES is hex with 0x or 0X prefix, and may have a multiplier suffix:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"and so on for G, T, P, E, Z, Y.\n" 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" +"\n" +"N 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 assim por diante com T, P, E, Z, Y.\n" -# , c-format -#: src/od.c:633 src/od.c:753 +#: src/od.c:639 src/od.c:759 #, c-format msgid "invalid type string %s" msgstr "texto de tipo inválido %s" -# , c-format -#: src/od.c:643 +#: src/od.c:649 #, c-format msgid "" "invalid type string %s;\n" @@ -7227,8 +7367,7 @@ msgstr "" "texto de tipo inválido %s;\n" "este sistema não provê um tipo de inteiro com %lu-bytes" -# , c-format -#: src/od.c:764 +#: src/od.c:770 #, c-format msgid "" "invalid type string %s;\n" @@ -7237,47 +7376,43 @@ msgstr "" "texto de tipo inválido %s;\n" "este sistema não provê um tipo de ponto-flutuante com %lu-bytes" -# , c-format -#: src/od.c:822 +#: src/od.c:828 #, fuzzy, c-format msgid "invalid character '%c' in type string %s" msgstr "caractere inválido \"%c\" no texto de tipo %s" -#: src/od.c:1047 +#: src/od.c:1053 #, c-format msgid "cannot skip past end of combined input" msgstr "é impossível acessar além da entrada combinada" -# , c-format -#: src/od.c:1603 +#: src/od.c:1609 #, 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:1729 +#: src/od.c:1735 #, 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:1804 +#: src/od.c:1810 #, 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:1825 +#: src/od.c:1831 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "bytes-a-pular + bytes-a-ler é um valor muito grande" -# , c-format -#: src/od.c:1868 +#: src/od.c:1874 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "aviso: largura %lu inválida; será usada %d em seu lugar" -# , c-format #: src/operand2sig.c:69 #, c-format msgid "%s: invalid signal" @@ -7289,18 +7424,18 @@ msgid "standard input is closed" msgstr "a entrada padrão está fechada" #: 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" -"\n" msgstr "" "Escreve linhas constituídas das linhas seqüencialmente correspondentes de\n" "cada ARQUIVO, separaradas por tabulações, para a saída padrão.\n" "Se ARQUIVO não for especificado ou for -, lê a entrada padrão.\n" "\n" -#: src/paste.c:448 +#: 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" @@ -7309,7 +7444,7 @@ msgstr "" "tabulações\n" " -s, --serial cola um arquivo por vez em de todos em paralelo\n" -#: src/paste.c:509 +#: src/paste.c:508 #, c-format msgid "delimiter list ends with an unescaped backslash: %s" msgstr "" @@ -7336,7 +7471,6 @@ msgstr "" msgid "leading '-' in a component of file name %s" msgstr "um componente do nome de arquivo começa com \"-\" %s" -# , c-format #: src/pathchk.c:196 #, c-format msgid "nonportable character %s in file name %s" @@ -7375,81 +7509,80 @@ msgid "Kaveh Ghazi" msgstr "Kaveh Ghazi" #. TRANSLATORS: Real name is unknown; at most 19 characters. -#: src/pinky.c:250 +#: src/pinky.c:242 msgid " ???" -msgstr "" +msgstr " ???" #. TRANSLATORS: Idle time is unknown; at most 5 characters. -#: src/pinky.c:274 +#: src/pinky.c:266 msgid "?????" -msgstr "" +msgstr "?????" -#: src/pinky.c:323 +#: src/pinky.c:314 #, c-format msgid "Login name: " msgstr "Nome de usuário: " -#: src/pinky.c:326 +#: src/pinky.c:317 #, c-format msgid "In real life: " msgstr "Na vida real: " #. TRANSLATORS: Real name is unknown; no hard limit. -#: src/pinky.c:330 +#: src/pinky.c:321 msgid "???\n" msgstr "???\n" -#: src/pinky.c:350 +#: src/pinky.c:341 #, c-format msgid "Directory: " msgstr "Diretório: " -#: src/pinky.c:352 +#: src/pinky.c:343 #, c-format msgid "Shell: " msgstr "Shell: " -#: src/pinky.c:371 +#: src/pinky.c:362 #, c-format msgid "Project: " msgstr "Projeto: " -#: src/pinky.c:395 +#: src/pinky.c:386 #, c-format msgid "Plan:\n" msgstr "Planos:\n" -#: src/pinky.c:414 +#: src/pinky.c:405 msgid "Login" msgstr "Usuário" -#: src/pinky.c:416 +#: src/pinky.c:407 msgid "Name" msgstr "Nome" -#: src/pinky.c:417 +#: src/pinky.c:408 msgid " TTY" msgstr " TTY" -#: src/pinky.c:419 +#: src/pinky.c:410 msgid "Idle" msgstr "Ocioso" -#: src/pinky.c:420 +#: src/pinky.c:411 msgid "When" msgstr "Quando" -#: src/pinky.c:423 +#: src/pinky.c:414 msgid "Where" msgstr "Onde" -# , c-format -#: src/pinky.c:502 +#: src/pinky.c:493 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Uso: %s [OPÇÃO]... [USUÁRIO]...\n" -#: src/pinky.c:503 +#: src/pinky.c:494 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7468,7 +7601,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:511 +#: src/pinky.c:502 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7485,7 +7618,7 @@ msgstr "" "tempo\n" " ocioso em formatação curta\n" -#: src/pinky.c:520 +#: src/pinky.c:511 #, fuzzy, c-format msgid "" "\n" @@ -7496,7 +7629,7 @@ msgstr "" "Um programa \"finger\" mais leve; emite as informações do usuário.\n" "O arquivo utmp será %s.\n" -#: src/pinky.c:604 +#: src/pinky.c:595 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "" @@ -7512,96 +7645,87 @@ msgstr "Pete TerMaat" msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:912 +#: src/pr.c:908 #, fuzzy, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "\"--pages=PRIMEIRA_PÁG[:ÚLTIMA_PÁG]\" está com argumentos faltando" -# , c-format -#: src/pr.c:914 +#: src/pr.c:910 #, fuzzy, c-format msgid "invalid page range %s" msgstr "intervalo inválido de página %s" -# , c-format -#: src/pr.c:979 +#: src/pr.c:975 #, fuzzy, c-format msgid "'-l PAGE_LENGTH' invalid number of lines: %s" msgstr "\"-l TAMANHO_PÁG\" número inválido de linhas: %s" -# , c-format -#: src/pr.c:1003 +#: src/pr.c:999 #, fuzzy, c-format msgid "'-N NUMBER' invalid starting line number: %s" msgstr "\"-N NÚMERO\" número inválido de linha inicial: %s" -# , c-format -#: src/pr.c:1015 +#: src/pr.c:1011 #, fuzzy, c-format msgid "'-o MARGIN' invalid line offset: %s" msgstr "\"-o MARGEM\" deslocamento (offset) inválido de linha: %s" -# , c-format -#: src/pr.c:1056 +#: src/pr.c:1052 #, fuzzy, c-format msgid "'-w PAGE_WIDTH' invalid number of characters: %s" msgstr "\"-w TAMANHO_PÁG\" número inválido de caracteres: %s" -# , c-format -#: src/pr.c:1070 +#: src/pr.c:1066 #, fuzzy, c-format msgid "'-W PAGE_WIDTH' invalid number of characters: %s" msgstr "\"-W TAMANHO_PÁG\" número inválido de caracteres: %s" -#: src/pr.c:1100 +#: src/pr.c:1096 #, fuzzy, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "" "É impossível especificar o número de colunas quando imprimindo em paralelo." -#: src/pr.c:1104 +#: src/pr.c:1100 #, fuzzy, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "" "É impossível especificar impressão em paralelo e transversalmente ao mesmo " "tempo." -# , c-format -#: src/pr.c:1200 +#: src/pr.c:1196 #, fuzzy, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "\"-%c\" caracteres extras ou número inválido no argumento: %s" -#: src/pr.c:1304 +#: src/pr.c:1293 #, c-format msgid "page width too narrow" msgstr "largura de página muito estreita" -#: src/pr.c:2369 +#: src/pr.c:2353 #, c-format msgid "starting page number %<PRIuMAX> exceeds page count %<PRIuMAX>" msgstr "número da página inicial %<PRIuMAX> ultrapassa o total de %<PRIuMAX>" -# , c-format -#: src/pr.c:2396 +#: src/pr.c:2380 #, fuzzy, c-format msgid "page number overflow" msgstr "Estouro do número de página" -#: src/pr.c:2401 +#: src/pr.c:2385 #, c-format msgid "Page %<PRIuMAX>" msgstr "Página %<PRIuMAX>" -#: src/pr.c:2773 -msgid "" -"Paginate or columnate FILE(s) for printing.\n" -"\n" +#: src/pr.c:2757 +#, fuzzy +msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" "Dispõe o(s) ARQUIVO(s) em páginas ou colunas para impressão.\n" "\n" -#: src/pr.c:2780 +#: src/pr.c:2763 #, fuzzy msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" @@ -7619,7 +7743,7 @@ msgstr "" " que a opção -a seja usada. Equilibra a quantidade de\n" " linhas nas colunas de cada página.\n" -#: src/pr.c:2788 +#: src/pr.c:2771 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7636,7 +7760,7 @@ msgstr "" " -d, --double-space\n" " espaço duplo na saída\n" -#: src/pr.c:2796 +#: src/pr.c:2779 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7661,7 +7785,7 @@ msgstr "" "sem\n" " -F)\n" -#: src/pr.c:2806 +#: src/pr.c:2789 #, fuzzy msgid "" " -h, --header=HEADER\n" @@ -7686,7 +7810,7 @@ msgstr "" " nenhum alinhamento de colunas, --sep-string[=TEXTO]\n" " define os separadores\n" -#: src/pr.c:2815 +#: src/pr.c:2798 #, fuzzy msgid "" " -l, --length=PAGE_LENGTH\n" @@ -7703,7 +7827,7 @@ msgstr "" "trunca\n" " linhas, mas junta as de comprimento completo com -J\n" -#: src/pr.c:2822 +#: src/pr.c:2805 #, fuzzy msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" @@ -7722,7 +7846,7 @@ msgstr "" "da\n" " página impressa (veja +PRIMEIRA_PÁG)\n" -#: src/pr.c:2830 +#: src/pr.c:2813 #, fuzzy msgid "" " -o, --indent=MARGIN\n" @@ -7738,7 +7862,7 @@ msgstr "" " -r, --no-file-warnings\n" " omite avisos quando um arquivo não puder ser aberto\n" -#: src/pr.c:2837 +#: src/pr.c:2820 #, fuzzy msgid "" " -s[CHAR], --separator[=CHAR]\n" @@ -7757,7 +7881,7 @@ msgstr "" " as 3 opções de colunas (-COLUNA|-a COLUNA|-m), exceto\n" " quando -w estiver definida\n" -#: src/pr.c:2844 +#: src/pr.c:2827 #, fuzzy msgid "" " -S[STRING], --sep-string[=STRING]\n" @@ -7774,7 +7898,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:2851 +#: src/pr.c:2834 #, fuzzy msgid "" " -T, --omit-pagination\n" @@ -7802,7 +7926,7 @@ msgstr "" "[CARACTERE]\n" " desativa (72)\n" -#: src/pr.c:2861 +#: src/pr.c:2844 #, fuzzy msgid "" " -W, --page-width=PAGE_WIDTH\n" @@ -7817,7 +7941,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:2869 +#: src/pr.c:2852 #, fuzzy msgid "" "\n" @@ -7855,7 +7979,6 @@ msgid "" msgstr "" "aviso: %s: caractere(s) após constante de caractere foi(foram) ignorado(s)" -# , c-format #: src/printf.c:88 #, c-format msgid "" @@ -7937,25 +8060,21 @@ msgstr "%s: valor não foi convertido totalmente" msgid "missing hexadecimal number in escape" msgstr "falta um número hexadecimal no escape" -# , c-format #: src/printf.c:286 #, c-format msgid "invalid universal character name \\%c%0*x" msgstr "nome inválido de caractere universal \\%c%0*x" -# , c-format #: src/printf.c:547 #, c-format msgid "invalid field width: %s" msgstr "largura inválida de campo: %s" -# , c-format #: src/printf.c:582 #, c-format msgid "invalid precision: %s" msgstr "precisão inválida: %s" -# , c-format #: src/printf.c:609 #, c-format msgid "%.*s: invalid conversion specification" @@ -7979,7 +8098,6 @@ msgstr "François Pinard" msgid "%s (for regexp %s)" msgstr "%s (para expressão regular %s)" -# , c-format #: src/ptx.c:1817 #, c-format msgid "" @@ -7990,17 +8108,17 @@ msgstr "" " ou: %s -G [OPÇÃO]... [ENTRADA [SAÍDA]]\n" #: src/ptx.c:1821 +#, fuzzy msgid "" "Output a permuted index, including context, of the words in the input " "files.\n" -"\n" msgstr "" "Emite um índice permutado, incluindo o contexto, das palavras dos arquivos " "de\n" "entrada.\n" "\n" -#: src/ptx.c:1828 +#: src/ptx.c:1827 #, fuzzy msgid "" " -A, --auto-reference output automatically generated references\n" @@ -8014,7 +8132,7 @@ msgstr "" " -F, --flag-truncation=TEXTO usa TEXTO para sinalizar truncamento de " "linha\n" -#: src/ptx.c:1833 +#: src/ptx.c:1832 #, fuzzy msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" @@ -8030,7 +8148,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:1840 +#: src/ptx.c:1839 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -8051,7 +8169,7 @@ msgstr "" " -o, --only-file=ARQUIVO lê somente a lista de palavras deste " "ARQUIVO\n" -#: src/ptx.c:1848 +#: src/ptx.c:1847 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -8064,7 +8182,7 @@ msgstr "" " -w, --width=NÚMERO a largura de saída em colunas, referências\n" " excluídas\n" -#: src/ptx.c:1855 +#: src/ptx.c:1854 #, fuzzy msgid "" "\n" @@ -8074,8 +8192,7 @@ msgstr "" "Se ARQUIVO não for fornecido ou se for -, lê a entrada padrão.\n" "\"-F /\" por padrão.\n" -# , c-format -#: src/ptx.c:1949 +#: src/ptx.c:1948 #, c-format msgid "invalid gap width: %s" msgstr "largura inválida de espaçamento: %s" @@ -8099,7 +8216,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "falhou em mudar para o diretório %s" -#: src/pwd.c:170 src/pwd.c:277 +#: src/pwd.c:170 src/pwd.c:277 src/split.c:373 #, c-format msgid "failed to stat %s" msgstr "falhou em obter o estado de %s" @@ -8116,15 +8233,15 @@ msgid "ignoring non-option arguments" msgstr "ignorando argumentos que não são opções" #. This is a proper name. See the gettext manual, section Names. -#: src/readlink.c:33 +#: src/readlink.c:32 msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -# , c-format -#: src/readlink.c:62 +#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147 +#: src/stat.c:1349 src/touch.c:212 #, c-format -msgid "Usage: %s [OPTION]... FILE\n" -msgstr "Uso: %s [OPÇÃO]... ARQUIVO\n" +msgid "Usage: %s [OPTION]... FILE...\n" +msgstr "Uso: %s [OPÇÃO]... ARQUIVO...\n" #: src/readlink.c:63 #, fuzzy @@ -8159,16 +8276,19 @@ msgstr "" " todos os componentes devem existir\n" #: src/readlink.c:75 +#, fuzzy msgid "" " -m, --canonicalize-missing canonicalize by following every symlink in\n" " every component of the given name " "recursively,\n" " without requirements on components " "existence\n" -" -n, --no-newline do not output the trailing newline\n" +" -n, --no-newline do not output the trailing delimiter\n" " -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" msgstr "" " -m, --canonicalize-missing coloca na forma canônica interpretando toda\n" " ligação simbólica em cada componente do " @@ -8180,12 +8300,10 @@ msgstr "" " -s, --silent suprime a maioria das mensagens de erro\n" " -v, --verbose relata mensagens de erro\n" -# , c-format -#: src/realpath.c:71 src/rm.c:134 src/shred.c:147 src/stat.c:1330 -#: src/touch.c:215 -#, c-format -msgid "Usage: %s [OPTION]... FILE...\n" -msgstr "Uso: %s [OPÇÃO]... ARQUIVO...\n" +#: src/readlink.c:152 +#, fuzzy, c-format +msgid "ignoring --no-newline with multiple arguments" +msgstr "ignorando argumentos que não são opções" #: src/realpath.c:72 msgid "" @@ -8212,14 +8330,12 @@ msgstr "" msgid "generating relative path" msgstr "" -# , c-format -#: src/remove.c:286 +#: src/remove.c:273 #, c-format msgid "%s: descend into write-protected directory %s? " msgstr "%s: entrar no diretório protegido contra escrita %s? " -# , c-format -#: src/remove.c:287 +#: src/remove.c:274 #, c-format msgid "%s: descend into directory %s? " msgstr "%s: entrar no diretório %s? " @@ -8228,51 +8344,49 @@ msgstr "%s: entrar no diretório %s? " #. translate "%s: remove %s (write-protected) %s? " #. instead. It should avoid grammatical problems #. with the output of file_type. -#: src/remove.c:303 +#: src/remove.c:290 #, c-format msgid "%s: remove write-protected %s %s? " msgstr "%s: remover %s %s protegido contra escrita? " -#: src/remove.c:304 +#: src/remove.c:291 #, c-format msgid "%s: remove %s %s? " msgstr "%s: remover %s %s? " -# , c-format -#: src/remove.c:417 +#: src/remove.c:374 #, c-format msgid "removed directory: %s\n" msgstr "removeu o diretório: %s\n" -# , c-format -#: src/remove.c:481 +#: src/remove.c:444 #, fuzzy, c-format msgid "cannot remove directory: %s" msgstr "não foi possível remover o diretório %s" -#: src/remove.c:537 +#: src/remove.c:500 #, 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:557 +#: src/remove.c:520 #, fuzzy, c-format msgid "traversal failed: %s" msgstr "falhou na leitura" -#: src/remove.c:563 +#: src/remove.c:526 #, c-format msgid "" "unexpected failure: fts_info=%d: %s\n" "please report to %s" msgstr "" -#: src/rm.c:118 +#: src/rm.c:119 #, fuzzy, c-format msgid "Try '%s ./%s' to remove the file %s.\n" msgstr "Experimente \"%s ./%s\" para remover o arquivo %s.\n" -#: src/rm.c:135 +#: src/rm.c:136 #, fuzzy msgid "" "Remove (unlink) the FILE(s).\n" @@ -8286,7 +8400,7 @@ msgstr "" " -f, --force ignora arquivos inexistentes, nunca questionar\n" " -i questiona antes de cada remoção\n" -#: src/rm.c:141 +#: src/rm.c:142 msgid "" " -I prompt once before removing more than three files, " "or\n" @@ -8306,7 +8420,7 @@ msgstr "" " once (-I) (uma vez), ou always (-i) (sempre).\n" " Sem QUANDO, questiona sempre\n" -#: src/rm.c:148 +#: src/rm.c:149 msgid "" " --one-file-system when removing a hierarchy recursively, skip any\n" " directory that is on a file system different from\n" @@ -8317,12 +8431,13 @@ msgstr "" " arquivo diferente daquele do respectivo argumento\n" " da linha de comando\n" -#: src/rm.c:153 +#: src/rm.c:154 #, fuzzy msgid "" " --no-preserve-root do not treat '/' specially\n" " --preserve-root do not remove '/' (default)\n" " -r, -R, --recursive remove directories and their contents recursively\n" +" -d, --dir remove empty directories\n" " -v, --verbose explain what is being done\n" msgstr "" " --no-preserve-root não trata \"/\" de forma especial\n" @@ -8330,7 +8445,7 @@ msgstr "" " -r, -R, --recursive remove diretórios e seus conteúdos recursivamente\n" " -v, --verbose explica o que está sendo feito\n" -#: src/rm.c:161 +#: src/rm.c:163 msgid "" "\n" "By default, rm does not remove directories. Use the --recursive (-r or -R)\n" @@ -8341,7 +8456,7 @@ msgstr "" "Por padrão, rm não remove diretórios. Use a opção --recursive (-r ou -R)\n" "para remover também cada diretório listado, junto com todo seu conteúdo.\n" -#: src/rm.c:166 +#: src/rm.c:168 #, fuzzy, c-format msgid "" "\n" @@ -8358,7 +8473,7 @@ msgstr "" "\n" " %s ./-foo\n" -#: src/rm.c:175 +#: src/rm.c:177 #, fuzzy msgid "" "\n" @@ -8371,23 +8486,21 @@ msgstr "" "recuperar o conteúdo desse arquivo. Se quiser assegurar que o conteúdo seja\n" "de fato irrecuperável, considere usar shred.\n" -#: src/rm.c:335 +#: src/rm.c:342 #, c-format msgid "%s: remove all arguments recursively? " msgstr "%s: remover todos os argumentos recursivamente? " -#: src/rm.c:336 +#: src/rm.c:343 #, c-format msgid "%s: remove all arguments? " msgstr "%s: remover todos os argumentos? " -# , c-format #: src/rmdir.c:134 src/rmdir.c:233 #, c-format msgid "removing directory, %s" msgstr "removendo o diretório %s" -# , c-format #: src/rmdir.c:148 #, c-format msgid "failed to remove directory %s" @@ -8419,7 +8532,6 @@ msgstr "" " \"rmdir -p a/b/c\" é similar a \"rmdir a/b/c a/b a\".\n" " --verbose emite um diagnóstico para cada diretório processado\n" -# , c-format #: src/rmdir.c:242 #, c-format msgid "failed to remove %s" @@ -8436,9 +8548,13 @@ msgstr "" #: src/runcon.c:87 msgid "" -"Run a program in a different security context.\n" -"With neither CONTEXT nor COMMAND, print the current security context.\n" -"\n" +"Run a program in a different security context.\n" +"With neither CONTEXT nor COMMAND, print the current security context.\n" +msgstr "" + +#: src/runcon.c:94 +#, fuzzy +msgid "" " CONTEXT Complete security context\n" " -c, --compute compute process transition context before modifying\n" " -t, --type=TYPE type (for same role as parent)\n" @@ -8459,78 +8575,76 @@ msgstr "" " -l, --range=FAIXA faixa de nível\n" "\n" -#: src/runcon.c:140 +#: src/runcon.c:144 #, c-format msgid "multiple roles" msgstr "múltiplas regras" -#: src/runcon.c:145 +#: src/runcon.c:149 #, c-format msgid "multiple types" msgstr "múltiplos tipos" -#: src/runcon.c:150 +#: src/runcon.c:154 #, c-format msgid "multiple users" msgstr "múltiplos usuários" -#: src/runcon.c:155 +#: src/runcon.c:159 #, c-format msgid "multiple levelranges" msgstr "múltiplas faixas de nível" -#: src/runcon.c:173 src/runcon.c:209 +#: src/runcon.c:177 src/runcon.c:213 #, c-format msgid "failed to get current context" msgstr "falhou em obter o contexto atual" -#: src/runcon.c:183 +#: src/runcon.c:187 #, c-format msgid "you must specify -c, -t, -u, -l, -r, or context" msgstr "você deve especificar -c, -t, -u, -l, -r ou contexto" -#: src/runcon.c:191 +#: src/runcon.c:195 #, c-format msgid "no command specified" msgstr "nenhum comando foi especificado" -#: src/runcon.c:197 +#: src/runcon.c:201 #, 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:223 +#: src/runcon.c:227 #, c-format msgid "failed to compute a new context" msgstr "falhou em computar o novo contexto" -#: src/runcon.c:237 +#: src/runcon.c:241 #, c-format msgid "failed to set new user %s" msgstr "falhou em definir o novo usuário %s" -#: src/runcon.c:239 +#: src/runcon.c:243 #, c-format msgid "failed to set new type %s" msgstr "falhou em definir o novo tipo %s" -#: src/runcon.c:241 +#: src/runcon.c:245 #, c-format msgid "failed to set new range %s" msgstr "falhou em definir a nova faixa %s" -#: src/runcon.c:243 +#: src/runcon.c:247 #, c-format msgid "failed to set new role %s" msgstr "falhou em definir a nova regra %s" -# , c-format -#: src/runcon.c:251 +#: src/runcon.c:255 #, c-format msgid "unable to set security context %s" msgstr "incapaz de definir o contexto de segurança %s" -# , c-format #: src/seq.c:68 #, c-format msgid "" @@ -8543,9 +8657,12 @@ msgstr "" " ou: %s [OPÇÃO]... PRIMEIRO INCREMENTO ÚLTIMO\n" #: src/seq.c:73 +msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" +msgstr "" + +#: src/seq.c:79 +#, fuzzy msgid "" -"Print numbers from FIRST to LAST, in steps of INCREMENT.\n" -"\n" " -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" @@ -8558,7 +8675,7 @@ msgstr "" " -w, --equal-width equaliza a largura preenchendo com zeros à " "esquerda\n" -#: src/seq.c:82 +#: src/seq.c:86 msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" @@ -8575,7 +8692,7 @@ msgstr "" "INCREMENTO normalmente é positivo se PRIMEIRO for menor que ÚLTIMO, e\n" "negativo caso contrário.\n" -#: src/seq.c:90 +#: src/seq.c:94 #, fuzzy msgid "" "FORMAT must be suitable for printing one argument of type 'double';\n" @@ -8588,40 +8705,23 @@ msgstr "" "forem números decimais de ponto fixo com precisão máxima PREC, e é %g caso\n" "contrário.\n" -# , c-format -#: src/seq.c:136 +#: src/seq.c:140 #, c-format msgid "invalid floating point argument: %s" msgstr "argumento inválido de ponto flutuante: %s" -#: src/seq.c:193 -#, fuzzy, c-format -msgid "format %s has no %% directive" -msgstr "o alvo %s não é um diretório" - -#: src/seq.c:210 -#, c-format -msgid "format %s ends in %%" -msgstr "" - -#: src/seq.c:213 +#: src/seq.c:232 #, fuzzy, c-format msgid "format %s has unknown %%%c directive" msgstr "%s tem um tipo desconhecido de arquivo" -#: src/seq.c:217 -#, c-format -msgid "format %s has too many %% directives" -msgstr "" - -#: src/seq.c:431 +#: src/seq.c:555 #, 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" -# , c-format #: src/setuidgid.c:49 #, fuzzy, c-format msgid "" @@ -8660,27 +8760,27 @@ 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:163 +#: src/setuidgid.c:162 #, c-format msgid "unknown user-ID: %s" msgstr "ID desconhecida do usuário: %s" -#: src/setuidgid.c:174 +#: 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:191 +#: src/setuidgid.c:190 #, c-format msgid "failed to set supplemental group(s)" msgstr "falhou em estabelecer grupo(s) suplementar(es)" -#: src/setuidgid.c:201 +#: 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:205 +#: 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" @@ -8691,10 +8791,10 @@ msgid "Colin Plumb" msgstr "Colin Plumb" #: src/shred.c:148 +#, 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" -"\n" msgstr "" "Sobrescreve o(s) ARQUIVO(s) especificado(s) repetidamente, para dificultar\n" "tentativas de recuperação dos dados mesmo através dos maquinários mais " @@ -8702,7 +8802,7 @@ msgstr "" "Esse procedimento também é chamado de formatação física.\n" "\n" -#: src/shred.c:156 +#: src/shred.c:155 #, fuzzy, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -8718,7 +8818,7 @@ msgstr "" "K,\n" " M e G)\n" -#: src/shred.c:162 +#: src/shred.c:161 msgid "" " -u, --remove truncate and remove file after overwriting\n" " -v, --verbose show progress\n" @@ -8734,7 +8834,7 @@ msgstr "" "formatação\n" " física\n" -#: src/shred.c:171 +#: src/shred.c:170 msgid "" "\n" "If FILE is -, shred standard output.\n" @@ -8756,7 +8856,7 @@ msgstr "" "a maioria das pessoas usam a opção --remove.\n" "\n" -#: src/shred.c:181 +#: src/shred.c:180 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" @@ -8775,7 +8875,7 @@ msgstr "" "do sistema de arquivos:\n" "\n" -#: src/shred.c:189 +#: src/shred.c:188 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -8796,7 +8896,7 @@ msgstr "" " Appliance's NFS\n" "\n" -#: src/shred.c:199 +#: src/shred.c:198 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -8811,7 +8911,7 @@ msgstr "" "* sistemas de arquivos comprimidos\n" "\n" -#: src/shred.c:206 +#: src/shred.c:205 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" @@ -8833,7 +8933,7 @@ msgstr "" "arquivo /etc/fstab como documentado no manual de mount (man mount).\n" "\n" -#: src/shred.c:216 +#: src/shred.c:215 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" @@ -8844,134 +8944,128 @@ 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:296 +#: src/shred.c:295 #, c-format msgid "%s: fdatasync failed" msgstr "%s: \"fdatasync\" falhou" -#: src/shred.c:307 +#: src/shred.c:306 #, c-format msgid "%s: fsync failed" msgstr "%s: \"fsync\" falhou" -#: src/shred.c:384 +#: src/shred.c:383 #, c-format msgid "%s: cannot rewind" msgstr "%s: não foi possível voltar ao início" -#: src/shred.c:403 +#: src/shred.c:402 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: passagem %lu/%lu (%s)..." -# , c-format -#: src/shred.c:453 +#: src/shred.c:452 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: erro escrevendo na posição %s" -#: src/shred.c:471 +#: src/shred.c:470 #, c-format msgid "%s: lseek failed" msgstr "%s: \"lseek\" falhou" -#: src/shred.c:482 +#: src/shred.c:481 #, c-format msgid "%s: file too large" msgstr "%s: arquivo muito grande" -#: src/shred.c:505 +#: src/shred.c:504 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: passagem %lu/%lu (%s)...%s" -#: src/shred.c:521 +#: src/shred.c:520 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: passagem %lu/%lu (%s)...%s/%s %d%%" -#: src/shred.c:768 +#: src/shred.c:767 #, c-format msgid "%s: fstat failed" msgstr "%s: \"fstat\" falhou" -# , c-format -#: src/shred.c:779 +#: src/shred.c:778 #, c-format msgid "%s: invalid file type" msgstr "%s: tipo inválido de arquivo" -#: src/shred.c:798 +#: src/shred.c:797 #, c-format msgid "%s: file has negative size" msgstr "%s: arquivo tem tamanho negativo" -#: src/shred.c:865 +#: src/shred.c:864 src/sort.c:932 src/split.c:378 #, c-format msgid "%s: error truncating" msgstr "%s: erro ao truncar" -#: src/shred.c:881 +#: src/shred.c:880 #, c-format msgid "%s: fcntl failed" msgstr "%s: \"fcntl\" falhou" -#: src/shred.c:886 +#: src/shred.c:885 #, 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:968 +#: src/shred.c:967 #, c-format msgid "%s: removing" msgstr "%s: removendo" -# , c-format -#: src/shred.c:992 +#: src/shred.c:991 #, c-format msgid "%s: renamed to %s" msgstr "%s: renomeado como %s" -#: src/shred.c:1014 +#: src/shred.c:1013 #, c-format msgid "%s: failed to remove" msgstr "%s: falhou em remover" -#: src/shred.c:1018 +#: src/shred.c:1017 #, c-format msgid "%s: removed" msgstr "%s: removido" -#: src/shred.c:1025 src/shred.c:1068 +#: src/shred.c:1024 src/shred.c:1067 #, c-format msgid "%s: failed to close" msgstr "%s: falhou em fechar" -#: src/shred.c:1061 +#: src/shred.c:1060 #, c-format msgid "%s: failed to open for writing" msgstr "%s: falhou em abrir para escrita" -# , c-format -#: src/shred.c:1126 +#: src/shred.c:1125 #, c-format msgid "%s: invalid number of passes" msgstr "%s: número inválido de passagens" -#: src/shred.c:1135 src/shuf.c:291 src/sort.c:4387 +#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441 #, c-format msgid "multiple random sources specified" msgstr "foram especificadas múltiplas fontes de aleatoriedade" -# , c-format -#: src/shred.c:1149 +#: src/shred.c:1148 #, c-format msgid "%s: invalid file size" msgstr "%s: tamanho inválido de arquivo" -# , c-format #: src/shuf.c:48 #, c-format msgid "" @@ -8984,14 +9078,13 @@ msgstr "" " ou: %s -i MENOR-MAIOR [OPÇÃO]...\n" #: src/shuf.c:54 -msgid "" -"Write a random permutation of the input lines to standard output.\n" -"\n" +#, 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:61 +#: src/shuf.c:60 #, fuzzy msgid "" " -e, --echo treat each ARG as an input line\n" @@ -9014,29 +9107,27 @@ msgstr "" " -z, --zero-terminated termina as linhas com byte 0, e não com nova-" "linha\n" -#: src/shuf.c:245 +#: src/shuf.c:244 #, c-format msgid "multiple -i options specified" msgstr "foram especificadas múltiplas opções -i" -#: src/shuf.c:265 +#: src/shuf.c:264 #, c-format msgid "invalid input range %s" msgstr "intervalo inválido de entrada %s" -# , c-format -#: src/shuf.c:278 +#: src/shuf.c:277 #, c-format msgid "invalid line count %s" msgstr "quantidade inválida de linhas %s" -#: src/shuf.c:285 src/sort.c:4381 +#: src/shuf.c:284 src/sort.c:4435 #, c-format msgid "multiple output files specified" msgstr "foram especificados múltiplos arquivos de saída" -# , c-format -#: src/shuf.c:311 +#: src/shuf.c:310 #, c-format msgid "cannot combine -e and -i options" msgstr "é impossível combinar as opções -e e -i" @@ -9065,8 +9156,7 @@ msgstr "" "obtida pela soma de seus valores.\n" "\n" -# , c-format -#: src/sleep.c:135 src/timeout.c:295 +#: src/sleep.c:135 src/timeout.c:320 #, c-format msgid "invalid time interval %s" msgstr "intervalo inválido de tempo %s" @@ -9076,15 +9166,14 @@ msgstr "intervalo inválido de tempo %s" msgid "cannot read realtime clock" msgstr "não foi possível ler relógio de tempo real" -#: src/sort.c:395 -msgid "" -"Write sorted concatenation of all FILE(s) to standard output.\n" -"\n" +#: src/sort.c:399 +#, 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:402 +#: src/sort.c:405 msgid "" "Ordering options:\n" "\n" @@ -9092,7 +9181,7 @@ msgstr "" "Opções de ordenação:\n" "\n" -#: src/sort.c:406 +#: src/sort.c:409 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -9105,19 +9194,19 @@ msgstr "" " -f, --ignore-case ignora diferença entre maiúsculas e " "minúsculas\n" -#: src/sort.c:412 +#: src/sort.c:415 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:417 +#: src/sort.c:420 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" -#: src/sort.c:420 +#: src/sort.c:423 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -9125,7 +9214,7 @@ msgid "" " -r, --reverse reverse the result of comparisons\n" msgstr "" -#: src/sort.c:426 +#: src/sort.c:429 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -9135,7 +9224,7 @@ msgid "" "\n" msgstr "" -#: src/sort.c:434 +#: src/sort.c:437 #, fuzzy msgid "" "Other options:\n" @@ -9144,13 +9233,13 @@ msgstr "" "Opções de ordenação:\n" "\n" -#: src/sort.c:438 +#: src/sort.c:441 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" msgstr "" -#: src/sort.c:442 +#: src/sort.c:445 #, fuzzy msgid "" " -c, --check, --check=diagnose-first check for sorted input; do not sort\n" @@ -9172,7 +9261,7 @@ msgstr "" " (origem é 1)\n" " -m, --merge mescla os arquivos já ordenados; não ordena\n" -#: src/sort.c:449 +#: src/sort.c:452 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -9181,13 +9270,13 @@ msgid "" " If F is - then read names from standard input\n" msgstr "" -#: src/sort.c:456 +#: src/sort.c:459 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:460 +#: src/sort.c:463 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -9202,7 +9291,7 @@ msgstr "" " -S, --buffer-size=TAM usa TAManho para o \"buffer\" de memória " "principal\n" -#: src/sort.c:466 +#: src/sort.c:469 #, fuzzy, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -9226,13 +9315,13 @@ msgstr "" " sem -c, emite apenas a primeira linha de uma\n" " seqüência repetida\n" -#: src/sort.c:475 +#: 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:480 +#: src/sort.c:483 #, fuzzy msgid "" "\n" @@ -9264,7 +9353,7 @@ msgstr "" "\n" "TAMANHO pode ser seguido pelos seguintes sufixos multiplicadores:\n" -#: src/sort.c:493 +#: src/sort.c:496 msgid "" "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n" "\n" @@ -9287,274 +9376,264 @@ msgstr "" "de\n" "bytes.\n" -# , c-format -#: src/sort.c:694 +#: src/sort.c:697 #, c-format msgid "waiting for %s [-d]" msgstr "escrevendo em %s [-d]" -#: src/sort.c:699 +#: src/sort.c:702 #, c-format msgid "%s [-d] terminated abnormally" msgstr "%s [-d] terminado anormalmente" -# , c-format -#: src/sort.c:853 +#: src/sort.c:856 #, fuzzy, c-format msgid "cannot create temporary file in %s" msgstr "não foi possível criar arquivo temporário %s" -#: src/sort.c:939 src/sort.c:2010 src/sort.c:3056 src/sort.c:3755 -#: src/sort.c:3758 +#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713 +#: src/sort.c:3804 src/sort.c:3807 msgid "open failed" msgstr "erro abrindo arquivo" -#: src/sort.c:959 +#: src/sort.c:970 msgid "fflush failed" msgstr "erro liberando dados no arquivo (\"fflush\")" -#: src/sort.c:964 src/sort.c:2013 src/sort.c:4646 +#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706 msgid "close failed" msgstr "erro fechando arquivo" -#: src/sort.c:973 +#: src/sort.c:986 #, c-format msgid "dup2 failed" msgstr "erro na duplicação de descritor de arquivo (\"dup2\")" -#: src/sort.c:1090 +#: src/sort.c:1103 #, c-format msgid "couldn't execute %s" msgstr "não pôde executar %s" -# , c-format -#: src/sort.c:1097 +#: src/sort.c:1110 msgid "couldn't create temporary file" msgstr "não pôde criar arquivo temporário" -# , c-format -#: src/sort.c:1136 +#: src/sort.c:1149 #, c-format msgid "couldn't create process for %s -d" msgstr "não pôde criar processo para %s -d" -#: src/sort.c:1150 +#: src/sort.c:1161 #, c-format msgid "couldn't execute %s -d" msgstr "não pôde executar %s -d" -# , c-format -#: src/sort.c:1209 +#: src/sort.c:1220 #, c-format msgid "warning: cannot remove: %s" msgstr "aviso: não foi possível remover: %s" -# , c-format -#: src/sort.c:1295 +#: src/sort.c:1306 #, fuzzy, c-format msgid "invalid --%s argument %s" msgstr "argumento inválido %s" -# , c-format -#: src/sort.c:1298 +#: src/sort.c:1309 #, fuzzy, c-format msgid "minimum --%s argument is %s" msgstr "argumento inválido para %s%s: \"%s\"" -#: src/sort.c:1313 +#: src/sort.c:1324 #, fuzzy, c-format msgid "--%s argument %s too large" msgstr "%s%s: argumento \"%s\" muito grande" -#: src/sort.c:1316 +#: src/sort.c:1327 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "" -#: src/sort.c:1398 +#: src/sort.c:1409 #, c-format msgid "number in parallel must be nonzero" msgstr "" -#: src/sort.c:1479 +#: src/sort.c:1494 msgid "stat failed" msgstr "falhou no \"stat\"" -#: src/sort.c:1740 +#: src/sort.c:1755 msgid "read failed" msgstr "falhou na leitura" -#: src/sort.c:2028 +#: src/sort.c:2043 #, c-format msgid "string transformation failed" msgstr "a transformação do texto falhou" -#: src/sort.c:2031 +#: src/sort.c:2046 #, fuzzy, c-format msgid "the untransformed string was %s" msgstr "O texto não transformado era %s." -#: src/sort.c:2194 +#: src/sort.c:2209 #, c-format msgid "^ no match for key\n" msgstr "" -#: src/sort.c:2374 +#: src/sort.c:2389 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "" -#: src/sort.c:2380 +#: src/sort.c:2395 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "" -#: src/sort.c:2391 +#: src/sort.c:2406 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" -#: src/sort.c:2404 +#: src/sort.c:2419 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "" -#: src/sort.c:2436 +#: src/sort.c:2451 #, 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:2442 +#: src/sort.c:2457 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "" -#: src/sort.c:2716 src/sort.c:2725 +#: src/sort.c:2731 src/sort.c:2740 msgid "write failed" msgstr "erro de escrita" -# , c-format -#: src/sort.c:2768 +#: src/sort.c:2783 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: desordenado: " -# , c-format -#: src/sort.c:2771 +#: src/sort.c:2786 msgid "standard error" msgstr "erro padrão" -# , c-format -#: src/sort.c:3926 +#: src/sort.c:3698 +#, fuzzy +msgid "cannot read" +msgstr "%s: não foi possível voltar ao início" + +#: src/sort.c:3976 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: especificação inválida de campo %s" -#: src/sort.c:3937 +#: src/sort.c:3987 #, fuzzy, c-format msgid "options '-%s' are incompatible" msgstr "as opções \"-%s\" são incompatíveis" -# , c-format -#: src/sort.c:3988 +#: src/sort.c:4038 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s: contagem inválida no início de %s" -#: src/sort.c:4245 +#: src/sort.c:4295 #, fuzzy msgid "invalid number after '-'" msgstr "número inválido após \"-\"" -#: src/sort.c:4248 src/sort.c:4334 src/sort.c:4362 +#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416 #, fuzzy msgid "invalid number after '.'" msgstr "número inválido após \".\"" -#: src/sort.c:4261 src/sort.c:4367 +#: src/sort.c:4315 src/sort.c:4421 msgid "stray character in field spec" msgstr "caractere no lugar errado no campo spec" -#: src/sort.c:4308 +#: src/sort.c:4362 #, c-format msgid "multiple compress programs specified" msgstr "foram especificados múltiplos programas de compressão" -#: src/sort.c:4325 +#: src/sort.c:4379 msgid "invalid number at field start" msgstr "número inválido no início do campo" -# , c-format -#: src/sort.c:4329 src/sort.c:4357 +#: src/sort.c:4383 src/sort.c:4411 msgid "field number is zero" msgstr "o número do campo é zero" -#: src/sort.c:4338 +#: src/sort.c:4392 msgid "character offset is zero" msgstr "o deslocamento de caracteres é zero" -#: src/sort.c:4353 +#: src/sort.c:4407 #, fuzzy msgid "invalid number after ','" msgstr "número inválido após \",\"" -#: src/sort.c:4403 +#: src/sort.c:4457 #, c-format msgid "empty tab" msgstr "tabulação vazia" -#: src/sort.c:4496 src/wc.c:692 +#: src/sort.c:4550 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:4518 +#: src/sort.c:4572 #, fuzzy, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "é inválido um nome de arquivo de comprimento nulo" -# , c-format -#: src/sort.c:4524 +#: src/sort.c:4578 #, fuzzy, c-format msgid "no input from %s" msgstr "fechando arquivo de entrada %s" -#: src/sort.c:4570 +#: src/sort.c:4624 #, c-format msgid "using %s sorting rules" msgstr "" -#: src/sort.c:4573 +#: src/sort.c:4627 #, c-format msgid "using simple byte comparison" msgstr "" -#: src/sort.c:4604 +#: src/sort.c:4658 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "operando extra %s não é permitido com -%c" -#: src/split.c:184 +#: src/split.c:187 #, c-format msgid "the suffix length needs to be at least %zu" msgstr "" -# , c-format -#: src/split.c:201 +#: src/split.c:204 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" msgstr "Uso: %s [OPÇÃO] [ENTRADA [PREFIXO]]\n" -#: src/split.c:205 +#: src/split.c:208 #, fuzzy 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" -"\n" msgstr "" "Divide ENTRADA em pedaços de tamanho fixo para PREFIXOaa, PREFIXOab, ...; o\n" "tamanho padrão é 1000 linhas, e o padrão para PREFIXO é \"x\". Se ENTRADA " @@ -9562,8 +9641,8 @@ msgstr "" "for especificada ou for -, lê a entrada padrão.\n" "\n" -#: src/split.c:214 -#, fuzzy, c-format +#: src/split.c:216 +#, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" " --additional-suffix=SUFFIX append an additional SUFFIX to file " @@ -9580,14 +9659,8 @@ msgid "" " -n, --number=CHUNKS generate CHUNKS output files. See below\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" -" -a, --suffix-length=N usa sufixos de comprimento N (padrão: %d)\n" -" -b, --bytes=BYTES escreve BYTES bytes em cada arquivo de saída\n" -" -C, --line-bytes=BYTES escreve no máximo BYTES bytes por arquivo de " -"saída\n" -" -d, --numeric-suffixes usa sufixos numéricos em vez de alfabéticos\n" -" -l, --lines=NÚMERO escreve NÚMERO linhas em cada arquivo de saída\n" -#: src/split.c:227 +#: src/split.c:229 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" @@ -9595,7 +9668,7 @@ msgstr "" " --verbose mostra um diagnóstico logo antes de abrir cada\n" " arquivo de saída\n" -#: src/split.c:234 +#: src/split.c:236 msgid "" "\n" "CHUNKS may be:\n" @@ -9607,201 +9680,189 @@ msgid "" "r/K/N likewise but only output Kth of N to stdout\n" msgstr "" -#: src/split.c:352 +#: src/split.c:354 #, fuzzy, c-format msgid "output file suffixes exhausted" msgstr "Esgotaram-se os sufixos de arquivos de saída" -# , c-format -#: src/split.c:364 +#: src/split.c:366 #, c-format msgid "creating file %s\n" msgstr "criando arquivo %s\n" -#: src/split.c:377 +#: src/split.c:375 +#, c-format +msgid "%s would overwrite input; aborting" +msgstr "" + +#: src/split.c:391 #, 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:379 +#: src/split.c:393 #, c-format msgid "executing with FILE=%s\n" msgstr "" -# , c-format -#: src/split.c:381 +#: src/split.c:395 #, fuzzy, c-format msgid "failed to create pipe" msgstr "não foi possível criar ligação absoluta %s para %s" -# , c-format -#: src/split.c:395 +#: src/split.c:409 #, fuzzy, c-format msgid "closing prior pipe" msgstr "fechando o diretório %s" -#: src/split.c:397 +#: src/split.c:411 #, fuzzy, c-format msgid "closing output pipe" msgstr "fechando arquivo de saída %s" -# , c-format -#: src/split.c:401 +#: src/split.c:415 #, fuzzy, c-format msgid "moving input pipe" msgstr "fechando arquivo de entrada %s" -# , c-format -#: src/split.c:403 +#: src/split.c:417 #, fuzzy, c-format msgid "closing input pipe" msgstr "fechando arquivo de entrada %s" -# , c-format -#: src/split.c:408 +#: src/split.c:422 #, fuzzy, c-format msgid "failed to run command: \"%s -c %s\"" -msgstr "não foi possível executar o comando %s" +msgstr "falhou em executar o comando %s" -# , c-format -#: src/split.c:414 +#: src/split.c:428 #, fuzzy, c-format msgid "failed to close input pipe" msgstr "falhou em fechar o diretório %s" -# , c-format -#: src/split.c:450 +#: src/split.c:464 #, fuzzy, c-format msgid "waiting for child process" msgstr "esperando por \"strip\"" -#: src/split.c:460 +#: src/split.c:474 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "" -#: src/split.c:468 +#: src/split.c:482 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:475 src/timeout.c:449 +#: src/split.c:489 src/timeout.c:494 #, c-format msgid "unknown status from command (0x%X)" msgstr "" -#: src/split.c:1037 +#: src/split.c:1052 #, c-format msgid "cannot split in more than one way" msgstr "é impossível subdividir em mais de uma forma" -# , c-format -#: src/split.c:1050 src/split.c:1192 src/split.c:1363 +#: src/split.c:1065 src/split.c:1205 src/split.c:1376 #, fuzzy, c-format msgid "%s: invalid number of chunks" msgstr "%s: número inválido de segundos" -#: src/split.c:1054 +#: src/split.c:1069 #, fuzzy, c-format msgid "%s: invalid chunk number" msgstr "%s: número inválido" -# , c-format -#: src/split.c:1106 +#: src/split.c:1119 #, c-format msgid "%s: invalid suffix length" msgstr "%s: comprimento inválido de sufixo" -# , c-format -#: src/split.c:1131 src/split.c:1139 src/split.c:1162 src/split.c:1167 +#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180 #, c-format msgid "%s: invalid number of bytes" msgstr "%s: número inválido de bytes" -# , c-format -#: src/split.c:1150 src/split.c:1297 +#: src/split.c:1163 src/split.c:1310 #, c-format msgid "%s: invalid number of lines" msgstr "%s: número inválido de linhas" -#: src/split.c:1223 +#: src/split.c:1236 #, c-format msgid "line count option -%s%c... is too large" msgstr "a opção de contagem de linha -%s%c... está muito grande" -# , c-format -#: src/split.c:1235 +#: src/split.c:1248 #, fuzzy, c-format msgid "%s: invalid start value for numerical suffix" msgstr "número inválido para linha inicial: %s" -# , c-format -#: src/split.c:1263 +#: src/split.c:1276 #, fuzzy, c-format msgid "%s: invalid IO block size" msgstr "%s: tamanho inválido de arquivo" -#: src/split.c:1284 +#: src/split.c:1297 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1321 +#: src/split.c:1334 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1356 +#: src/split.c:1369 #, 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:169 +#: src/stat.c:173 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:838 +#: src/stat.c:857 #, fuzzy, c-format msgid "failed to canonicalize %s" msgstr "falhou em abrir %s" -# , c-format -#: src/stat.c:1050 +#: src/stat.c:1069 #, fuzzy, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "aviso: escape desconhecido \"\\%c\"" -# , c-format -#: src/stat.c:1105 +#: src/stat.c:1124 #, c-format msgid "%s: invalid directive" msgstr "%s: diretiva inválida" -#: src/stat.c:1151 +#: src/stat.c:1170 #, c-format msgid "warning: backslash at end of format" msgstr "aviso: barra invertida no final da formatação" -#: src/stat.c:1182 +#: src/stat.c:1201 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" -# , c-format -#: src/stat.c:1189 +#: src/stat.c:1208 #, 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:1209 +#: src/stat.c:1228 #, 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:1245 +#: src/stat.c:1264 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -9812,7 +9873,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1268 +#: src/stat.c:1287 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -9820,30 +9881,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1278 +#: src/stat.c:1297 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:1286 +#: src/stat.c:1305 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:1295 +#: src/stat.c:1314 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:1305 +#: src/stat.c:1324 #, c-format msgid "Context: %C\n" msgstr "" -#: src/stat.c:1313 +#: src/stat.c:1332 msgid "" "Access: %x\n" "Modify: %y\n" @@ -9851,10 +9912,13 @@ msgid "" " Birth: %w\n" msgstr "" -#: src/stat.c:1331 +#: src/stat.c:1350 +msgid "Display file or file system status.\n" +msgstr "" + +#: src/stat.c:1356 +#, fuzzy msgid "" -"Display file or file system status.\n" -"\n" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" @@ -9864,7 +9928,7 @@ msgstr "" " -f, --file-system mostra o estado do sistema de arquivos, em vez de o\n" " estado do arquivo\n" -#: src/stat.c:1337 +#: src/stat.c:1360 #, fuzzy msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" @@ -9882,7 +9946,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:1348 +#: src/stat.c:1371 #, fuzzy msgid "" "\n" @@ -9903,7 +9967,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:1357 +#: src/stat.c:1380 #, fuzzy msgid "" " %d device number in decimal\n" @@ -9920,7 +9984,7 @@ msgstr "" " %g ID de grupo do dono\n" " %G Nome de grupo do dono\n" -#: src/stat.c:1365 +#: src/stat.c:1388 #, fuzzy msgid "" " %h number of hard links\n" @@ -9942,7 +10006,7 @@ msgstr "" " %t Tipo maior de dispositivo em hexadecimal\n" " %T Tipo menor de dispositivo em hexadecimal\n" -#: src/stat.c:1376 +#: src/stat.c:1399 #, fuzzy msgid "" " %u user ID of owner\n" @@ -9967,7 +10031,7 @@ msgstr "" " %Z Horário da última alteração do estado em segundos desde Epoch\n" "\n" -#: src/stat.c:1390 +#: src/stat.c:1413 #, fuzzy msgid "" "Valid format sequences for file systems:\n" @@ -9987,7 +10051,7 @@ msgstr "" " %f Blocos livres no sistema de arquivos\n" " %C Texto de contexto de segurança SELinux\n" -#: src/stat.c:1399 +#: src/stat.c:1422 #, fuzzy msgid "" " %i file system ID in hex\n" @@ -10006,7 +10070,6 @@ msgstr "" " %t Tipo em hexadecimal\n" " %T Tipo em forma inteligível por humanos\n" -# , c-format #: src/stdbuf.c:90 #, fuzzy, c-format msgid "Usage: %s OPTION... COMMAND\n" @@ -10015,30 +10078,29 @@ msgstr "Uso: %s [OPÇÃO]...\n" #: src/stdbuf.c:91 msgid "" "Run COMMAND, with modified buffering operations for its standard streams.\n" -"\n" msgstr "" -#: src/stdbuf.c:98 +#: src/stdbuf.c:97 msgid "" " -i, --input=MODE adjust standard input stream buffering\n" " -o, --output=MODE adjust standard output stream buffering\n" " -e, --error=MODE adjust standard error stream buffering\n" msgstr "" -#: src/stdbuf.c:105 +#: src/stdbuf.c:104 msgid "" "\n" "If MODE is 'L' the corresponding stream will be line buffered.\n" "This option is invalid with standard input.\n" msgstr "" -#: src/stdbuf.c:108 +#: src/stdbuf.c:107 msgid "" "\n" "If MODE is '0' the corresponding stream will be unbuffered.\n" msgstr "" -#: src/stdbuf.c:111 +#: src/stdbuf.c:110 msgid "" "\n" "Otherwise MODE is a number which may be followed by one of the following:\n" @@ -10048,7 +10110,7 @@ msgid "" "size set to MODE bytes.\n" msgstr "" -#: src/stdbuf.c:117 +#: src/stdbuf.c:116 msgid "" "\n" "NOTE: If COMMAND adjusts the buffering of its standard streams ('tee' does\n" @@ -10058,22 +10120,22 @@ msgid "" "and are thus unaffected by 'stdbuf' settings.\n" msgstr "" -#: src/stdbuf.c:227 +#: src/stdbuf.c:226 #, fuzzy, c-format msgid "failed to find %s" msgstr "falhou em abrir %s" -#: src/stdbuf.c:247 src/stdbuf.c:279 +#: src/stdbuf.c:246 src/stdbuf.c:278 #, 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:321 +#: src/stdbuf.c:320 #, c-format msgid "line buffering stdin is meaningless" msgstr "" -#: src/stty.c:509 +#: src/stty.c:513 #, fuzzy, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -10084,10 +10146,13 @@ msgstr "" " ou: %s [-F DISPOSITIVO] [--file=DISPOSITIVO] [-a|--all]\n" " ou: %s [-F DISPOSITIVO] [--file=DISPOSITIVO] [-g|--save]\n" -#: src/stty.c:515 +#: src/stty.c:519 +msgid "Print or change terminal characteristics.\n" +msgstr "" + +#: src/stty.c:525 +#, fuzzy msgid "" -"Print or change terminal characteristics.\n" -"\n" " -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" @@ -10101,7 +10166,7 @@ msgstr "" " -F, --file=DISPOSIVO abre e usa o DISPOSItivo especificado em vez da\n" " entrada padrão\n" -#: src/stty.c:524 +#: src/stty.c:532 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -10113,7 +10178,7 @@ msgstr "" "determina\n" "quais são as características disponíveis.\n" -#: src/stty.c:529 +#: src/stty.c:537 msgid "" "\n" "Special characters:\n" @@ -10128,7 +10193,7 @@ msgstr "" " eof CARAC CARAC enviará um fim-de-arquivo (termina a entrada)\n" " eol CARAC CARAC terminará a linha\n" -#: src/stty.c:536 +#: src/stty.c:544 msgid "" " * eol2 CHAR alternate CHAR for ending the line\n" " erase CHAR CHAR will erase the last character typed\n" @@ -10140,7 +10205,7 @@ msgstr "" " intr CARAC CARAC enviará um sinal de interrupção\n" " kill CARAC CARAC apagará a linha atual\n" -#: src/stty.c:542 +#: src/stty.c:550 msgid "" " * lnext CHAR CHAR will enter the next character quoted\n" " quit CHAR CHAR will send a quit signal\n" @@ -10152,7 +10217,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:548 +#: src/stty.c:556 msgid "" " stop CHAR CHAR will stop the output\n" " susp CHAR CHAR will send a terminal stop signal\n" @@ -10164,7 +10229,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:554 +#: src/stty.c:562 #, fuzzy msgid "" "\n" @@ -10179,7 +10244,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:561 +#: src/stty.c:569 msgid "" " ispeed N set the input speed to N\n" " * line N use line discipline N\n" @@ -10194,7 +10259,7 @@ msgstr "" " completa\n" " ospeed N configura a velocidade de saída para N bauds\n" -#: src/stty.c:567 +#: src/stty.c:575 msgid "" " * rows N tell the kernel that the terminal has N rows\n" " * size print the number of rows and columns according to the " @@ -10209,13 +10274,15 @@ msgstr "" "décimos\n" " de segundo\n" -#: src/stty.c:573 +#: src/stty.c:581 +#, fuzzy msgid "" "\n" "Control settings:\n" " [-]clocal disable modem control signals\n" " [-]cread allow input to be received\n" " * [-]crtscts enable RTS/CTS handshaking\n" +" * [-]cdtrdsr enable DTR/DSR handshaking\n" " csN set character size to N bits, N in [5..8]\n" msgstr "" "\n" @@ -10225,7 +10292,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:581 +#: src/stty.c:590 #, fuzzy msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" @@ -10233,7 +10300,7 @@ msgid "" " [-]hupcl same as [-]hup\n" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" -" [-]parodd set odd parity (even with '-')\n" +" [-]parodd set odd parity (or even parity with '-')\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" @@ -10244,7 +10311,7 @@ msgstr "" " na entrada\n" " [-]parodd define a paridade como ímpar (par com \"-\")\n" -#: src/stty.c:588 +#: src/stty.c:597 msgid "" "\n" "Input settings:\n" @@ -10260,7 +10327,7 @@ msgstr "" " [-]ignbrk ignora caracteres \"break\"\n" " [-]igncr ignora retorno de carro\n" -#: src/stty.c:596 +#: src/stty.c:605 msgid "" " [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" @@ -10276,13 +10343,13 @@ msgstr "" " [-]istrip zera o bit mais significativo (8) dos caracteres de " "entrada\n" -#: src/stty.c:603 +#: src/stty.c:612 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:606 +#: src/stty.c:615 msgid "" " * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" @@ -10300,7 +10367,7 @@ msgstr "" "caractere)\n" " [-]tandem o mesmo que [-]ixoff\n" -#: src/stty.c:614 +#: src/stty.c:623 msgid "" "\n" "Output settings:\n" @@ -10316,7 +10383,7 @@ 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:622 +#: src/stty.c:631 msgid "" " * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of null characters\n" @@ -10333,7 +10400,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:630 +#: src/stty.c:639 msgid "" " * [-]onocr do not print carriage returns in the first column\n" " [-]opost postprocess output\n" @@ -10349,7 +10416,7 @@ msgstr "" " * -tabs o mesmo que tab3\n" " * vtN estilo do atraso da tabulação vertical, N em [0..1]\n" -#: src/stty.c:638 +#: src/stty.c:647 msgid "" "\n" "Local settings:\n" @@ -10367,7 +10434,7 @@ msgstr "" "e\n" " echok\n" -#: src/stty.c:645 +#: src/stty.c:654 #, fuzzy msgid "" " * [-]ctlecho echo control characters in hat notation ('^c')\n" @@ -10383,7 +10450,7 @@ msgstr "" " [-]echoe o mesmo que [-]crterase\n" " [-]echok ecoa uma nova-linha depois de um caractere de \"kill\"\n" -#: src/stty.c:652 +#: src/stty.c:661 #, fuzzy msgid "" " * [-]echoke same as [-]crtkill\n" @@ -10400,7 +10467,7 @@ msgstr "" " (matar), werase (apagar palavra) e rprnt\n" " [-]iexten habilita caracteres especiais não-POSIX\n" -#: src/stty.c:659 +#: src/stty.c:668 #, fuzzy msgid "" " [-]isig enable interrupt, quit, and suspend special characters\n" @@ -10420,7 +10487,7 @@ msgstr "" " terminal\n" " * [-]xcase com icanon, escapa com \"\\\" caracteres em maiúsculas\n" -#: src/stty.c:666 +#: src/stty.c:675 msgid "" "\n" "Combination settings:\n" @@ -10434,7 +10501,7 @@ msgstr "" " cbreak o mesmo que -icanon\n" " -cbreak o mesmo que icanon\n" -#: src/stty.c:673 +#: src/stty.c:682 msgid "" " cooked same as brkint ignpar istrip icrnl ixon opost isig\n" " icanon, eof and eol characters to their default values\n" @@ -10446,7 +10513,7 @@ msgstr "" " -cooked o mesmo que raw\n" " crt o mesmo que echoe echoctl echoke\n" -#: src/stty.c:679 +#: src/stty.c:688 msgid "" " dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" " kill ^u\n" @@ -10460,7 +10527,7 @@ msgstr "" " ek caracteres \"erase\" e \"kill\" nos seus valores padrão\n" " evenp o mesmo que parenb -parodd cs7\n" -#: src/stty.c:686 +#: src/stty.c:695 msgid "" " -evenp same as -parenb cs8\n" " * [-]lcase same as xcase iuclc olcuc\n" @@ -10476,7 +10543,7 @@ msgstr "" " nl o mesmo que -icrnl -onlcr\n" " -nl o mesmo que icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" -#: src/stty.c:694 +#: src/stty.c:703 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -10490,7 +10557,7 @@ msgstr "" " pass8 o mesmo que -parenb -istrip cs8\n" " -pass8 o mesmo que parenb istrip cs7\n" -#: src/stty.c:701 +#: src/stty.c:710 msgid "" " raw same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" " -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n" @@ -10502,7 +10569,7 @@ msgstr "" " -imaxbel -opost -isig -icanon -xcase min 1 time 0\n" " -raw o mesmo que \"cooked\"\n" -#: src/stty.c:707 +#: src/stty.c:716 #, fuzzy msgid "" " sane same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" @@ -10521,7 +10588,7 @@ msgstr "" "caracteres\n" " especiais com seus valores padrão.\n" -#: src/stty.c:715 +#: src/stty.c:724 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -10539,12 +10606,12 @@ msgstr "" "\"\n" " (indefinido) são utilizados para desabilitar caracteres especiais.\n" -#: src/stty.c:787 +#: src/stty.c:796 #, c-format msgid "only one device may be specified" msgstr "somente um dispositivo pode ser especificado" -#: src/stty.c:817 +#: src/stty.c:826 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" @@ -10553,130 +10620,47 @@ msgstr "" "as opções para estilo de saída detalhado e inteligível ao stty\n" "são mutuamente exclusivas" -#: src/stty.c:823 +#: src/stty.c:832 #, 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:838 +#: src/stty.c:847 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s: não foi possível reiniciar modo não-bloqueante" -# , c-format -#: src/stty.c:883 src/stty.c:993 +#: src/stty.c:892 src/stty.c:1002 #, c-format msgid "invalid argument %s" msgstr "argumento inválido %s" -#: src/stty.c:894 src/stty.c:911 src/stty.c:923 src/stty.c:936 src/stty.c:948 -#: src/stty.c:968 +#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957 +#: src/stty.c:977 #, c-format msgid "missing argument to %s" msgstr "faltando argumento para %s" -# , c-format -#: src/stty.c:974 +#: src/stty.c:983 #, c-format msgid "invalid line discipline %s" msgstr "disciplina inválida de linha %s" -#: src/stty.c:1044 +#: src/stty.c:1053 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s: incapaz de realizar todas as operações solicitadas" -#: src/stty.c:1390 +#: src/stty.c:1399 #, c-format msgid "%s: no size information for this device" msgstr "%s: sem informação de tamanho para este dispositivo" -# , c-format -#: src/stty.c:1904 +#: src/stty.c:1920 #, c-format msgid "invalid integer argument %s" msgstr "argumento inválido para inteiro %s" -#: src/su.c:229 -msgid "Password:" -msgstr "Senha:" - -#: src/su.c:232 -#, c-format -msgid "getpass: cannot open /dev/tty" -msgstr "getpass: não foi possível abrir /dev/tty" - -#: src/su.c:290 -#, c-format -msgid "cannot set groups" -msgstr "não foi possível definir grupos" - -#: src/su.c:294 -#, c-format -msgid "cannot set group id" -msgstr "não foi possível definir id de grupo" - -#: src/su.c:296 -#, c-format -msgid "cannot set user id" -msgstr "não foi possível definir id de usuário" - -# , c-format -#: src/su.c:371 -#, c-format -msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" -msgstr "Uso: %s [OPÇÃO]... [-] [USUÁRIO [ARGUMENTO]...]\n" - -#: src/su.c:372 -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 "" -"Altera as identificações de usuário e grupo efetivo do USUÁRIO.\n" -"\n" -" -, -l, --login torna o shell em um shell de acesso (\"login" -"\")\n" -" -c, --command=COMANDO passa um único COMANDO ao shell\n" -" -f, --fast envia um -f ao shell (para csh ou tcsh)\n" -" -m, --preserve-environment não reinicia as variáveis de ambiente\n" -" -p o mesmo que -m\n" -" -s, --shell=SHELL executa SHELL se /etc/shells o permitir\n" - -#: src/su.c:384 -msgid "" -"\n" -"A mere - implies -l. If USER not given, assume root.\n" -msgstr "" -"\n" -"Um mero - implica em -l. Se USUÁRIO não for especificado, assume-se root.\n" - -#: src/su.c:461 -#, c-format -msgid "user %s does not exist" -msgstr "usuário %s não existe" - -#: src/su.c:484 -#, c-format -msgid "incorrect password" -msgstr "senha incorreta" - -#: src/su.c:501 -#, c-format -msgid "using restricted shell %s" -msgstr "usando shell restrito %s" - -# , c-format -#: src/su.c:509 -#, c-format -msgid "warning: cannot change directory to %s" -msgstr "aviso: não foi possível mudar para o diretório %s" - #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 msgid "Kayvan Aghaiepour" @@ -10711,7 +10695,7 @@ msgstr "" msgid "ignoring all arguments" msgstr "ignorando todos os argumentos" -#: src/system.h:340 +#: src/system.h:343 #, c-format msgid "" "\n" @@ -10725,15 +10709,23 @@ msgstr "" "seu\n" "shell sobre a que opções ele oferece suporte.\n" -#: src/system.h:346 +#: src/system.h:349 msgid " --help display this help and exit\n" msgstr " --help mostra esta ajuda e finaliza\n" -#: src/system.h:348 +#: src/system.h:351 msgid " --version output version information and exit\n" msgstr " --version informa a versão e finaliza\n" -#: src/system.h:541 +#: src/system.h:544 +#, fuzzy +msgid "" +"\n" +"Mandatory arguments to long options are mandatory for short options too.\n" +msgstr "" +"Argumentos obrigatórios para opções longas também o são para opções curtas.\n" + +#: src/system.h:552 msgid "" "\n" "SIZE is an integer and optional unit (example: 10M is 10*1024*1024). Units\n" @@ -10741,7 +10733,7 @@ msgid "" "1000).\n" msgstr "" -#: src/system.h:550 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -10750,7 +10742,7 @@ msgid "" "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n" msgstr "" -#: src/system.h:560 +#: src/system.h:571 #, fuzzy, c-format msgid "" "\n" @@ -10763,23 +10755,22 @@ msgstr "" #. <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:574 +#: src/system.h:585 #, c-format msgid "Report %s translation bugs to <http://translationproject.org/team/>\n" msgstr "" -#: src/system.h:578 +#: src/system.h:589 #, c-format msgid "For complete documentation, run: info coreutils '%s invocation'\n" msgstr "" -# , c-format -#: src/system.h:585 +#: src/system.h:596 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "Experimente \"%s --help\" para mais informações.\n" -#: src/system.h:617 +#: src/system.h:628 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -10800,16 +10791,16 @@ 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" -"\n" msgstr "" "Escreve cada ARQUIVO na saída padrão, começando pela última linha.\n" "Se ARQUIVO não for especificado ou for -, lê a entrada padrão.\n" "\n" -#: src/tac.c:145 +#: src/tac.c:144 msgid "" " -b, --before attach the separator before instead of after\n" " -r, --regex interpret the separator as a regular expression\n" @@ -10823,43 +10814,42 @@ msgstr "" " -s, --separator=TEXTO usa TEXTO como separador, em vez do caractere de\n" " \"nova-linha\"\n" -#: src/tac.c:235 src/tac.c:336 +#: src/tac.c:234 src/tac.c:335 #, c-format msgid "%s: seek failed" msgstr "%s: busca (\"seek\") falhou" -#: src/tac.c:264 +#: src/tac.c:263 #, c-format msgid "record too large" msgstr "registro muito grande" -# , c-format -#: src/tac.c:451 +#: src/tac.c:450 #, fuzzy, c-format msgid "failed to create temporary file in %s" msgstr "não foi possível criar arquivo temporário %s" -#: src/tac.c:459 +#: src/tac.c:458 #, fuzzy, c-format msgid "failed to open %s for writing" msgstr "%s: falhou em abrir para escrita" -#: src/tac.c:476 +#: src/tac.c:475 #, fuzzy, c-format msgid "failed to rewind stream for %s" msgstr "falhou em preservar horário para %s" -#: src/tac.c:512 src/tac.c:519 +#: src/tac.c:511 src/tac.c:518 #, c-format msgid "%s: write error" msgstr "%s: erro de escrita" -#: src/tac.c:572 +#: src/tac.c:571 #, fuzzy, c-format msgid "failed to open %s for reading" msgstr "não foi possível abrir %s para leitura" -#: src/tac.c:630 +#: src/tac.c:629 #, c-format msgid "separator cannot be empty" msgstr "o separador não pode ser nulo" @@ -10870,12 +10860,11 @@ msgid "Ian Lance Taylor" msgstr "Ian Lance Taylor" #: src/tail.c:262 -#, c-format +#, fuzzy, 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" -"\n" msgstr "" "Mostra as %d últimas linhas de cada ARQUIVO na saída padrão.\n" "Se especificados vários ARQUIVOs, mostra o nome de cada um antes de suas\n" @@ -10883,7 +10872,7 @@ msgstr "" "Se ARQUIVO não for especificado ou for -, lê a entrada padrão.\n" "\n" -#: src/tail.c:271 +#: src/tail.c:270 msgid "" " -c, --bytes=K output the last K bytes; alternatively, use -c " "+K\n" @@ -10891,7 +10880,7 @@ msgid "" "file\n" msgstr "" -#: src/tail.c:275 +#: src/tail.c:274 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -10907,7 +10896,7 @@ msgstr "" " equivalentes\n" " -F o mesmo que --follow=name --retry\n" -#: src/tail.c:282 +#: src/tail.c:281 #, fuzzy, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -10932,7 +10921,7 @@ msgstr "" " (uma situação comum para arquivos de log " "rotativo)\n" -#: src/tail.c:295 +#: src/tail.c:294 #, fuzzy msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" @@ -10948,7 +10937,7 @@ msgstr "" " -v, --verbose sempre emite cabeçalhos com os nomes dos " "ARQUIVOs\n" -#: src/tail.c:302 +#: src/tail.c:301 #, fuzzy msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" @@ -10964,7 +10953,7 @@ msgstr "" " -v, --verbose sempre emite cabeçalhos com os nomes dos " "ARQUIVOs\n" -#: src/tail.c:311 +#: src/tail.c:310 #, fuzzy msgid "" "\n" @@ -10984,7 +10973,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:320 +#: src/tail.c:319 #, fuzzy msgid "" "With --follow (-f), tail defaults to following the file descriptor, which\n" @@ -11003,70 +10992,68 @@ msgstr "" "algum\n" "outro programa.\n" -#: src/tail.c:379 +#: src/tail.c:378 #, c-format msgid "closing %s (fd=%d)" msgstr "fechando %s (fd=%d)" -# , c-format -#: src/tail.c:454 +#: 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:458 +#: src/tail.c:457 #, 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:895 +#: src/tail.c:894 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "" -#: src/tail.c:907 +#: src/tail.c:906 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" msgstr "" -#: src/tail.c:964 +#: src/tail.c:963 #, c-format msgid "%s has become inaccessible" msgstr "%s se tornou inacessível" -#: src/tail.c:981 +#: src/tail.c:980 #, 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:990 +#: src/tail.c:989 #, 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:1011 +#: src/tail.c:1010 #, c-format msgid "%s has become accessible" msgstr "%s se tornou acessível" -# , c-format -#: src/tail.c:1019 +#: src/tail.c:1018 #, c-format msgid "%s has appeared; following end of new file" msgstr "%s apareceu; monitorando o fim do novo arquivo" -#: src/tail.c:1030 +#: src/tail.c:1029 #, 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:1131 +#: src/tail.c:1130 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: não foi possível alterar o modo não-bloqueante" @@ -11081,7 +11068,6 @@ msgstr "%s: arquivo truncado" msgid "no files remaining" msgstr "nenhum aquivo restante" -# , c-format #: src/tail.c:1369 #, fuzzy, c-format msgid "cannot watch parent directory of %s" @@ -11092,7 +11078,6 @@ msgstr "não foi possível realizar \"stat\" no diretório atual (agora %s)" msgid "inotify resources exhausted" msgstr "memória esgotada" -# , c-format #: src/tail.c:1390 src/tail.c:1519 #, fuzzy, c-format msgid "cannot watch %s" @@ -11103,7 +11088,6 @@ msgstr "não foi possível tocar %s" msgid "error monitoring inotify event" msgstr "" -# , c-format #: src/tail.c:1493 #, fuzzy, c-format msgid "error reading inotify event" @@ -11120,7 +11104,6 @@ msgstr "" msgid "number in %s is too large" msgstr "o número em %s é muito grande" -# , c-format #: src/tail.c:1975 #, c-format msgid "%s: invalid maximum number of unchanged stats between opens" @@ -11128,13 +11111,11 @@ msgstr "" "%s: número inválido para máximo de estados inalterados entre aberturas do " "arquivo" -# , c-format #: src/tail.c:1991 #, c-format msgid "%s: invalid PID" msgstr "%s: PID inválido" -# , c-format #: src/tail.c:2010 #, c-format msgid "%s: invalid number of seconds" @@ -11160,7 +11141,6 @@ msgstr "aviso: PID ignorado; --pid=PID é útil somente quando monitorando" msgid "warning: --pid=PID is not supported on this system" msgstr "aviso: não há suporte para--pid=PID neste sistema" -# , c-format #: src/tail.c:2142 #, c-format msgid "cannot follow %s by name" @@ -11242,7 +11222,6 @@ msgstr "operador binário desconhecido" msgid "%s: binary operator expected" msgstr "%s: era esperado um operador binário" -# , c-format #: src/test.c:704 msgid "" "Usage: test EXPRESSION\n" @@ -11448,18 +11427,22 @@ msgstr "falta \"]\"" msgid "extra argument %s" msgstr "argumento extra %s" -#: src/timeout.c:124 +#: src/timeout.c:112 +#, c-format +msgid "warning: sigprocmask" +msgstr "" + +#: src/timeout.c:145 #, c-format msgid "warning: timer_settime" msgstr "" -#: src/timeout.c:129 +#: src/timeout.c:150 #, c-format msgid "warning: timer_create" msgstr "" -# , c-format -#: src/timeout.c:204 +#: src/timeout.c:225 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -11468,17 +11451,17 @@ msgstr "" "Uso: %s OPÇÃO USUÁRIO COMANDO [ARGUMENTO]...\n" " ou: %s OPÇÃO\n" -#: src/timeout.c:208 +#: src/timeout.c:229 #, fuzzy -msgid "" -"Start COMMAND, and kill it if still running after DURATION.\n" -"\n" -"Mandatory arguments to long options are mandatory for short options too.\n" +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:213 +#: src/timeout.c:235 msgid "" +" --preserve-status\n" +" exit with the same status as COMMAND, even when the\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 " @@ -11493,7 +11476,7 @@ msgid "" " See 'kill -l' for a list of signals\n" msgstr "" -#: src/timeout.c:229 +#: src/timeout.c:254 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -11501,26 +11484,30 @@ msgid "" "days.\n" msgstr "" -#: src/timeout.c:234 +#: src/timeout.c:259 msgid "" "\n" -"If the command times out, then exit with status 124. Otherwise, exit\n" -"with the status of COMMAND. If no signal is specified, send the TERM\n" -"signal upon timeout. The TERM signal kills any process that does not\n" -"block or catch that signal. For other processes, it may be necessary to\n" -"use the KILL (9) signal, since this signal cannot be caught. If the\n" -"KILL (9) signal is sent, the exit status is 128+9 rather than 124.\n" +"If the command times out, and --preserve-status is not set, then exit with\n" +"status 124. Otherwise, exit with the status of COMMAND. If no signal\n" +"is specified, send the TERM signal upon timeout. The TERM signal kills\n" +"any process that does not block or catch that signal. It may be necessary\n" +"to use the KILL (9) signal, since this signal cannot be caught, in which\n" +"case the exit status is 128+9 rather than 124.\n" +msgstr "" + +#: src/timeout.c:363 +#, c-format +msgid "warning: disabling core dumps failed" msgstr "" -# , c-format -#: src/timeout.c:419 +#: src/timeout.c:471 #, fuzzy, c-format msgid "error waiting for command" msgstr "erro escrevendo %s" -#: src/timeout.c:441 +#: src/timeout.c:482 #, c-format -msgid "warning: disabling core dumps failed" +msgid "the monitored command dumped core" msgstr "" #. This is a proper name. See the gettext manual, section Names. @@ -11533,24 +11520,22 @@ msgstr "Jim Kingdon" msgid "Randy Smith" msgstr "Randy Smith" -# , c-format -#: src/touch.c:115 src/touch.c:313 +#: src/touch.c:115 src/touch.c:309 #, c-format msgid "invalid date format %s" msgstr "formato de data inválido %s" -# , c-format -#: src/touch.c:194 +#: src/touch.c:191 #, c-format msgid "cannot touch %s" msgstr "não foi possível tocar %s" -#: src/touch.c:200 +#: src/touch.c:197 #, c-format msgid "setting times of %s" msgstr "configurando horário de %s" -#: src/touch.c:216 +#: src/touch.c:213 #, fuzzy msgid "" "Update the access and modification times of each FILE to the current time.\n" @@ -11560,7 +11545,6 @@ msgid "" "\n" "A FILE argument string of - is handled specially and causes touch to\n" "change the times of the file associated with standard output.\n" -"\n" msgstr "" "Atualiza os horários de modificação e acesso de cada ARQUIVO para o horário\n" "atual.\n" @@ -11572,7 +11556,7 @@ msgstr "" "altere os horários do arquivo associado com a saída padrão.\n" "\n" -#: src/touch.c:229 +#: src/touch.c:225 #, fuzzy msgid "" " -a change only the access time\n" @@ -11586,7 +11570,7 @@ msgstr "" " -f (sem efeito)\n" " -m altera somente o horário de modificação\n" -#: src/touch.c:235 +#: src/touch.c:231 #, fuzzy msgid "" " -h, --no-dereference affect each symbolic link instead of any " @@ -11599,11 +11583,12 @@ msgstr "" " ela referenciado (útil somente em sistemas que\n" " permitem mudar o dono de uma ligação simbólica)\n" -#: src/touch.c:241 +#: 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" -" --time=WORD change the specified time:\n" +" --time=WORD change the specified time:\n" " WORD is access, atime, or use: equivalent to -a\n" " WORD is modify or mtime: equivalent to -m\n" msgstr "" @@ -11616,7 +11601,7 @@ msgstr "" " PALAVRA é \"modify\" ou \"mtime\": equivalente a -" "m\n" -#: src/touch.c:250 +#: src/touch.c:246 msgid "" "\n" "Note that the -d and -t options accept different time-date formats.\n" @@ -11624,13 +11609,12 @@ msgstr "" "\n" "Note que as opções -d e -t aceitam formatos diferentes de data e hora.\n" -#: src/touch.c:339 +#: src/touch.c:335 #, c-format msgid "cannot specify times from more than one source" msgstr "é impossível especificar horários de mais de uma fonte" -# , c-format -#: src/touch.c:413 +#: src/touch.c:409 #, fuzzy, c-format msgid "" "warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'" @@ -11638,7 +11622,6 @@ msgstr "" "aviso: \"touch %s\" está obsoleto; use \"touch -t %04ld%02d%02d%02d%02d.%02d" "\"" -# , c-format #: src/tr.c:286 #, c-format msgid "Usage: %s [OPTION]... SET1 [SET2]\n" @@ -11774,7 +11757,6 @@ msgid "warning: an unescaped backslash at end of string is not portable" msgstr "" "aviso: não é portável ter uma barra invertida sem escape no final de um texto" -# , c-format #: src/tr.c:673 #, fuzzy, c-format msgid "range-endpoints of '%s-%s' are in reverse collating sequence order" @@ -11782,13 +11764,11 @@ msgstr "" "os extremos do intervalo em \"%s-%s\" estão em ordem inversa da seqüência de " "colagem (\"collate\")" -# , c-format #: src/tr.c:829 #, c-format msgid "invalid repeat count %s in [c*n] construct" msgstr "número inválido de repetições %s na especificação [c*n]" -# , c-format #: src/tr.c:910 #, fuzzy, c-format msgid "missing character class name '[::]'" @@ -11799,13 +11779,11 @@ msgstr "nome de classe de caracteres faltando \"[::]\"" msgid "missing equivalence class character '[==]'" msgstr "caractere de classe de equivalência faltando \"[==]\"" -# , c-format #: src/tr.c:928 #, c-format msgid "invalid character class %s" msgstr "classe inválida de caracteres %s" -# , c-format #: src/tr.c:947 #, c-format msgid "%s: equivalence class operand must be a single character" @@ -11886,7 +11864,6 @@ msgid "Only one string may be given when deleting without squeezing repeats." msgstr "" "Somente um conjunto pode ser fornecido ao remover sem omitir repetições." -# , c-format #: src/true.c:38 #, c-format msgid "" @@ -11905,7 +11882,6 @@ msgstr "Sai com um código de estado indicando sucesso." msgid "Exit with a status code indicating failure." msgstr "Sai com um código de estado indicando sucesso." -# , c-format #: src/truncate.c:96 #, fuzzy, c-format msgid "Usage: %s OPTION... FILE...\n" @@ -11920,26 +11896,25 @@ msgid "" "If a FILE is larger than the specified size, the extra data is lost.\n" "If a FILE is shorter, it is extended and the extended part (hole)\n" "reads as zero bytes.\n" -"\n" msgstr "" -#: src/truncate.c:110 +#: src/truncate.c:109 #, fuzzy msgid " -c, --no-create do not create any files\n" msgstr " -d, --directory cria um diretório, e não um arquivo\n" -#: src/truncate.c:113 +#: src/truncate.c:112 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" -#: src/truncate.c:116 +#: 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" msgstr "" -#: src/truncate.c:122 +#: src/truncate.c:121 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -11947,58 +11922,57 @@ msgid "" "'/' round down to multiple of, '%' round up to multiple of.\n" msgstr "" -#: src/truncate.c:150 +#: src/truncate.c:149 #, c-format msgid "overflow in %<PRIdMAX> * %<PRIdMAX> byte blocks for file %s" msgstr "" -#: src/truncate.c:174 +#: src/truncate.c:173 #, fuzzy, c-format msgid "%s has unusable, apparently negative size" msgstr "%s: arquivo tem tamanho negativo" -# , c-format -#: src/truncate.c:184 src/truncate.c:379 +#: src/truncate.c:183 src/truncate.c:384 #, fuzzy, c-format msgid "cannot get the size of %s" msgstr "não foi possível mudar a posse de %s" -#: src/truncate.c:206 +#: src/truncate.c:205 #, fuzzy, c-format msgid "overflow rounding up size of file %s" msgstr "estouro de deslocamento enquanto lia o arquivo %s" -#: src/truncate.c:216 +#: src/truncate.c:215 #, fuzzy, c-format msgid "overflow extending size of file %s" msgstr "estouro de deslocamento enquanto lia o arquivo %s" -#: src/truncate.c:231 +#: src/truncate.c:230 #, c-format msgid "failed to truncate %s at %<PRIdMAX> bytes" msgstr "" -#: src/truncate.c:305 +#: src/truncate.c:303 #, fuzzy, c-format msgid "multiple relative modifiers specified" msgstr "foram especificados múltiplos diretórios-alvo" -#: src/truncate.c:335 +#: src/truncate.c:333 #, fuzzy, c-format msgid "you must specify either %s or %s" msgstr "deve-se especificar uma lista de bytes, caracteres ou campos" -#: src/truncate.c:342 +#: src/truncate.c:340 #, c-format msgid "you must specify a relative %s with %s" msgstr "" -#: src/truncate.c:349 +#: src/truncate.c:347 #, c-format msgid "%s was specified but %s was not" msgstr "" -#: src/truncate.c:400 +#: src/truncate.c:404 #, c-format msgid "cannot open %s for writing" msgstr "não foi possível abrir %s para escrita" @@ -12091,24 +12065,23 @@ msgstr "" "Emite a arquitetura da máquina.\n" "\n" -# , c-format #: src/uname.c:286 #, c-format msgid "cannot get system name" msgstr "não foi possível obter o nome do 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" -"\n" msgstr "" "Converte os espaços de cada ARQUIVO em tabulações, escrevendo na saída " "padrão.\n" "Sem ARQUIVO não for especificado ou for -, lê a entrada padrão.\n" "\n" -#: src/unexpand.c:125 +#: src/unexpand.c:124 msgid "" " -a, --all convert all blanks, instead of just initial blanks\n" " --first-only convert only leading sequences of blanks (overrides -a)\n" @@ -12124,17 +12097,16 @@ msgstr "" " -t, --tabs=LISTA usa a LISTA (separadas por vírgulas) de posições de\n" " tabulação (habilita -a)\n" -#: src/unexpand.c:153 +#: src/unexpand.c:152 #, c-format msgid "tabs are too far apart" msgstr "as tabulações estão muito longínquas" -#: src/unexpand.c:505 +#: src/unexpand.c:504 #, c-format msgid "tab stop value is too large" msgstr "o valor da parada de tabulação é muito grande" -# , c-format #: src/uniq.c:134 #, c-format msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n" @@ -12146,10 +12118,9 @@ msgid "" "writing to OUTPUT (or standard output).\n" "\n" "With no options, matching lines are merged to the first occurrence.\n" -"\n" msgstr "" -#: src/uniq.c:148 +#: src/uniq.c:147 msgid "" " -c, --count prefix lines by the number of occurrences\n" " -d, --repeated only print duplicate lines\n" @@ -12157,7 +12128,7 @@ 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:152 +#: src/uniq.c:151 #, fuzzy msgid "" " -D, --all-repeated[=delimit-method] print all duplicate lines\n" @@ -12181,11 +12152,11 @@ msgstr "" " -z, --zero-terminated termina as linhas com o byte 0, e não com nova-" "linha\n" -#: src/uniq.c:162 +#: src/uniq.c:161 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:167 +#: src/uniq.c:166 msgid "" "\n" "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n" @@ -12196,7 +12167,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:172 +#: src/uniq.c:171 #, fuzzy msgid "" "\n" @@ -12209,33 +12180,30 @@ msgstr "" "Talvez você prefira ordenar a entrada primeiro, ou usar \"sort -u\" sem " "\"uniq\".\n" -#: src/uniq.c:359 +#: src/uniq.c:358 #, c-format msgid "too many repeated lines" msgstr "muitas linhas repetidas" -# , c-format -#: src/uniq.c:522 +#: src/uniq.c:521 msgid "invalid number of fields to skip" msgstr "quantidade inválida de campos para ignorar" -# , c-format -#: src/uniq.c:531 +#: src/uniq.c:530 msgid "invalid number of bytes to skip" msgstr "quantidade inválida de bytes para ignorar" -#: src/uniq.c:540 +#: src/uniq.c:539 msgid "invalid number of bytes to compare" msgstr "quantidade inválida de bytes para comparar" -#: src/uniq.c:559 +#: src/uniq.c:558 #, c-format msgid "printing all duplicated lines and repeat counts is meaningless" msgstr "" "não faz sentido emitir todas as linhas duplicadas e contagens de repetição " "simultaneamente" -# , c-format #: src/unlink.c:45 #, c-format msgid "" @@ -12254,7 +12222,6 @@ msgstr "" "especificado.\n" "\n" -# , c-format #: src/unlink.c:86 #, c-format msgid "cannot unlink %s" @@ -12287,6 +12254,11 @@ msgid_plural "up %ld days %2d:%02d, " msgstr[0] "" msgstr[1] "" +#: src/uptime.c:149 +#, fuzzy, c-format +msgid "up %2d:%02d, " +msgstr " %2d:%02d%s no ar " + #: src/uptime.c:151 #, c-format msgid "%lu user" @@ -12322,7 +12294,7 @@ msgstr "" #: src/uptime.c:210 #, c-format msgid "\n" -msgstr "" +msgstr "\n" #: src/uptime.c:212 #, fuzzy, c-format @@ -12386,40 +12358,41 @@ msgstr "" msgid " old " msgstr " antigo " -#: src/who.c:449 +#: src/who.c:440 #, fuzzy msgid "system boot" msgstr "Erro de sistema" -#: src/who.c:456 src/who.c:458 +#: src/who.c:447 src/who.c:449 msgid "id=" msgstr "id=" -#: src/who.c:471 src/who.c:476 +#: src/who.c:462 src/who.c:467 msgid "term=" msgstr "térm=" -#: src/who.c:473 src/who.c:477 +#: src/who.c:464 src/who.c:468 msgid "exit=" msgstr "saída=" -#: src/who.c:494 +#: src/who.c:485 +#, fuzzy msgid "LOGIN" -msgstr "" +msgstr "LINHA" -#: src/who.c:514 +#: src/who.c:505 msgid "clock change" msgstr "mudança de relógio" -#: src/who.c:526 src/who.c:527 +#: src/who.c:517 src/who.c:518 msgid "run-level" msgstr "nível de execução" -#: src/who.c:530 src/who.c:531 +#: src/who.c:521 src/who.c:522 msgid "last=" msgstr "último=" -#: src/who.c:562 +#: src/who.c:553 #, c-format msgid "" "\n" @@ -12428,45 +12401,44 @@ msgstr "" "\n" "# usuários=%lu\n" -#: src/who.c:568 +#: src/who.c:559 msgid "NAME" msgstr "NOME" -#: src/who.c:568 +#: src/who.c:559 msgid "LINE" msgstr "LINHA" -#: src/who.c:568 +#: src/who.c:559 msgid "TIME" msgstr "HORÁRIO" -#: src/who.c:568 +#: src/who.c:559 msgid "IDLE" msgstr "OCIOSO" -#: src/who.c:569 +#: src/who.c:560 msgid "PID" msgstr "PID" -#: src/who.c:569 +#: src/who.c:560 msgid "COMMENT" msgstr "COMENTÁRIO" -#: src/who.c:569 +#: src/who.c:560 msgid "EXIT" msgstr "SAÍDA" -# , c-format -#: src/who.c:649 +#: src/who.c:640 #, c-format msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n" msgstr "Uso: %s [OPÇÃO]... [ ARQUIVO | ARG1 ARG2 ]\n" -#: src/who.c:650 +#: src/who.c:641 msgid "Print information about users who are currently logged in.\n" msgstr "" -#: src/who.c:653 +#: src/who.c:644 msgid "" "\n" " -a, --all same as -b -d --login -p -r -t -T -u\n" @@ -12480,12 +12452,12 @@ msgstr "" " -d, --dead emite os processos mortos\n" " -H, --heading emite a linha com cabeçalhos das colunas\n" -#: src/who.c:660 +#: src/who.c:651 msgid " -l, --login print system login processes\n" msgstr "" " -l, --login emite os processo de acesso (\"login\") do sistema\n" -#: src/who.c:663 +#: src/who.c:654 msgid "" " --lookup attempt to canonicalize hostnames via DNS\n" " -m only hostname and user associated with stdin\n" @@ -12496,7 +12468,7 @@ msgstr "" "padrão\n" " -p, --process mostra os processos ativos criados por \"init\"\n" -#: src/who.c:668 +#: src/who.c:659 msgid "" " -q, --count all login names and number of users logged on\n" " -r, --runlevel print current runlevel\n" @@ -12508,7 +12480,7 @@ msgstr "" " -s, --short emite apenas nome, linha e horário (o padrão)\n" " -t, --time emite a última modificação de relógio do sistema\n" -#: src/who.c:674 +#: src/who.c:665 msgid "" " -T, -w, --mesg add user's message status as +, - or ?\n" " -u, --users list users logged in\n" @@ -12520,7 +12492,7 @@ msgstr "" " --message o mesmo que -T\n" " --writable o mesmo que -T\n" -#: src/who.c:682 +#: src/who.c:673 #, fuzzy, c-format msgid "" "\n" @@ -12547,7 +12519,6 @@ msgstr "" msgid "%s: cannot find name for user ID %lu\n" msgstr "%s: não foi possível encontrar o nome para a ID de usuário %lu\n" -# , c-format #: src/yes.c:41 #, c-format msgid "" @@ -12558,7 +12529,6 @@ msgstr "" " ou: %s OPÇÃO\n" #: src/yes.c:47 -#, fuzzy msgid "" "Repeatedly output a line with all specified STRING(s), or 'y'.\n" "\n" @@ -12566,13 +12536,179 @@ msgstr "" "Emite repetidamente uma linha com todos os TEXTOs especificados ou \"y\".\n" "\n" -# , c-format +#, fuzzy +#~ msgid " returning value: '%s'\n" +#~ msgstr "criando arquivo %s\n" + +#, fuzzy +#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n" +#~ msgstr "Uso: %s [OPÇÃO] NOME...\n" + +#, fuzzy +#~ msgid "no valid suffix found\n" +#~ msgstr "%s: comprimento inválido de sufixo" + +#~ msgid "reading %s" +#~ msgstr "lendo %s" + +#~ msgid "writing %s" +#~ msgstr "escrevendo %s" + +#~ msgid "closing %s" +#~ msgstr "fechando %s" + +#~ msgid "accessing %s" +#~ msgstr "acessando %s" + +#~ msgid "opening %s" +#~ msgstr "abrindo %s" + +#, fuzzy #~ msgid "" -#~ "Usage: %s NAME\n" -#~ " or: %s OPTION\n" +#~ " -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 "" -#~ "Uso: %s NOME\n" -#~ " ou: %s OPÇÃO\n" +#~ " -x, --one-file-system ignora diretórios em sistemas de arquivo " +#~ "diferentes\n" +#~ " -X ARQ, --exclude-from=ARQ Exclui arquivos que coincidam com qualquer " +#~ "padrão\n" +#~ " em ARQ.\n" +#~ " --exclude=PADRÃO Exclui arquivos que coincidam com o PADRÃO.\n" +#~ " --max-depth=N exibe o total para um diretório (ou arquivo, com\n" +#~ " --all) somente se está a N ou menos níveis " +#~ "abaixo\n" +#~ " do argumento da linha de comando; --max-" +#~ "depth=0 é\n" +#~ " equivalente a --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 faz cópias de segurança (mesmo se --backup for\n" +#~ " especificado)\n" +#~ " numbered, t faz cópias de segurança numeradas\n" +#~ " existing, nil numeradas se já existirem cópias de segurança " +#~ "numeradas,\n" +#~ " simples em caso contrário\n" +#~ " simple, never sempre faz cópias de segurança simples\n" + +#, fuzzy +#~ msgid "" +#~ "WARNING: --page-increment is deprecated; use --line-increment instead" +#~ msgstr "a opção --megabytes é obsoleta; use -m no lugar" + +#~ msgid "All arguments to long options are mandatory for short options.\n" +#~ msgstr "" +#~ "Todos os argumentos para opções longas são obrigatórias para opções " +#~ "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 numérica é d para decimal, o para octal, x para hexadecimal ou n " +#~ "para\n" +#~ "nenhuma.\n" +#~ "QTD é 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 assim por diante com T, P, E, Z e " +#~ "Y.\n" +#~ "Adicionar um sufixo z para qualquer tipo mostra os caracteres imprimíveis " +#~ "ao\n" +#~ "final de 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 em 3. --width sem um número\n" +#~ "implica em 32. Por padrão, od usa -A o -t d2 -w16.\n" + +#~ msgid "Usage: %s [OPTION]... FILE\n" +#~ msgstr "Uso: %s [OPÇÃO]... ARQUIVO\n" + +#~ msgid "Password:" +#~ msgstr "Senha:" + +#~ msgid "getpass: cannot open /dev/tty" +#~ msgstr "getpass: não foi possível abrir /dev/tty" + +#~ msgid "cannot set groups" +#~ msgstr "não foi possível definir grupos" + +#~ msgid "cannot set group id" +#~ msgstr "não foi possível definir id de grupo" + +#~ msgid "cannot set user id" +#~ msgstr "não foi possível definir id de usuário" + +#~ msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" +#~ msgstr "Uso: %s [OPÇÃO]... [-] [USUÁRIO [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 "" +#~ "Altera as identificações de usuário e grupo efetivo do USUÁRIO.\n" +#~ "\n" +#~ " -, -l, --login torna o shell em um shell de acesso " +#~ "(\"login\")\n" +#~ " -c, --command=COMANDO passa um único COMANDO ao shell\n" +#~ " -f, --fast envia um -f ao shell (para csh ou tcsh)\n" +#~ " -m, --preserve-environment não reinicia as variáveis de ambiente\n" +#~ " -p o mesmo que -m\n" +#~ " -s, --shell=SHELL executa SHELL se /etc/shells o permitir\n" + +#~ msgid "" +#~ "\n" +#~ "A mere - implies -l. If USER not given, assume root.\n" +#~ msgstr "" +#~ "\n" +#~ "Um mero - implica em -l. Se USUÁRIO não for especificado, assume-se " +#~ "root.\n" + +#~ msgid "user %s does not exist" +#~ msgstr "usuário %s não existe" + +#~ msgid "incorrect password" +#~ msgstr "senha incorreta" + +#~ msgid "using restricted shell %s" +#~ msgstr "usando shell restrito %s" + +#~ msgid "warning: cannot change directory to %s" +#~ msgstr "aviso: não foi possível mudar para o diretório %s" #~ msgid "" #~ "\n" @@ -12585,10 +12721,6 @@ msgstr "" #~ " %s /usr/bin/sort Exibe \"sort\".\n" #~ " %s include/stdio.h .h Exibe \"stdio\".\n" -# , c-format -#~ msgid "Usage: %s [OPTION] FILE...\n" -#~ msgstr "Uso: %s [OPÇÃO] ARQUIVO...\n" - #~ msgid "" #~ "Change the group of each FILE to GROUP.\n" #~ "With --reference, change the group of each FILE to that of RFILE.\n" @@ -12703,33 +12835,8 @@ msgstr "" #~ "processado\n" #~ "\n" -# , c-format -#, fuzzy -#~ msgid "Usage: %s [OPTION]... PATH START\n" -#~ msgstr "Uso: %s [OPÇÃO]... CONJUNTO1 [CONJUNTO2]\n" - -#, fuzzy -#~ msgid "" -#~ " -n, --no-newline do not output the trailing " -#~ "newline\n" -#~ " " -#~ msgstr "" -#~ "Ecoa o(s) TEXTO(s) para a saída padrão.\n" -#~ "\n" -#~ " -n não emitir o caractere de nova-linha do final do TEXTO\n" - -#, fuzzy -#~ 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" -#~ "TAM pode ser (ou pode ser um inteiro opcionalmente seguido por):\n" -#~ "kB 1000, K 1024, MB 1000*1000, M 1024*1024, extendendo para G, T, P, E, " -#~ "Z, Y.\n" +#~ msgid "truncating %s" +#~ msgstr "truncando %s" #~ msgid "" #~ "Display the current time in the given FORMAT, or set the system date.\n" @@ -12744,19 +12851,81 @@ msgstr "" #~ " -f, --file=ARQDATA como --date uma vez para cada linha de " #~ "ARQDATA\n" -# , c-format -#~ msgid "cannot create link %s" -#~ msgstr "não foi possível criar ligação %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 não cria o arquivo de saída\n" +#~ " excl falha se o arquivo de saída já existir\n" +#~ " notrunc não trunca o arquivo de saída\n" +#~ " ucase altera as minúsculas para maiúsculas\n" +#~ " swab troca cada par de bytes de entrada\n" + +#~ msgid "Filesystem " +#~ msgstr "Sist. Arq. " + +#, fuzzy +#~ msgid " Inodes IUsed IFree IUse%" +#~ msgstr " Inodes IUsados ILivr IUso%%" + +#, fuzzy +#~ msgid " Size Used Avail Use%" +#~ msgstr " Tam Usad Disp Uso%%" + +#, fuzzy +#~ msgid " Size Used Avail Use%" +#~ msgstr " Tam Usado Disp Uso%%" + +#~ msgid " %s-blocks Used Available Capacity" +#~ msgstr " %s-blocos Usad Dispon. Capacidade" + +#~ msgid " %4s-blocks Used Available Use%%" +#~ msgstr " %4s-blocos Usad Dispon. Uso%%" + +#~ msgid "" +#~ "Usage: %s NAME\n" +#~ " or: %s OPTION\n" +#~ msgstr "" +#~ "Uso: %s NOME\n" +#~ " ou: %s OPÇÃO\n" + +#~ 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 usa sufixos de comprimento N (padrão: %d)\n" +#~ " -b, --bytes=BYTES escreve BYTES bytes em cada arquivo de saída\n" +#~ " -C, --line-bytes=BYTES escreve no máximo BYTES bytes por arquivo de " +#~ "saída\n" +#~ " -d, --numeric-suffixes usa sufixos numéricos em vez de alfabéticos\n" +#~ " -l, --lines=NÚMERO escreve NÚMERO linhas em cada arquivo de saída\n" + +#~ msgid "invalid number of lines: 0" +#~ msgstr "número inválido de linhas: 0" #, fuzzy -#~ msgid "%s: option '%s' is ambiguous\n" -#~ msgstr "%s: a opção \"-W %s\" está ambígua\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" +#~ "TAM pode ser (ou pode ser um inteiro opcionalmente seguido por):\n" +#~ "kB 1000, K 1024, MB 1000*1000, M 1024*1024, extendendo para G, T, P, E, " +#~ "Z, Y.\n" -# , c-format #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s: opção ilegal -- %c\n" -# , c-format #~ msgid "invalid argument: %s" #~ msgstr "argumento inválido: %s" @@ -12789,14 +12958,12 @@ msgstr "" #~ msgid "FIXME unknown" #~ msgstr "FIXME desconhecido" -# , c-format #~ msgid "Usage: %s [OPTION] [FILE]...\n" #~ msgstr "Uso: %s [OPÇÃO] [ARQUIVO]...\n" #~ msgid "%s" #~ msgstr "%s" -# , c-format #~ msgid "" #~ "Usage: %s NEWROOT [COMMAND...]\n" #~ " or: %s OPTION\n" @@ -12830,11 +12997,6 @@ msgstr "" #~ msgid "the --reply option is deprecated; use -i or -f instead" #~ msgstr "a opção --reply é obsoleta; use -i ou -f no lugar" -# , c-format -#~ msgid "invalid format width" -#~ msgstr "largura inválida do formato" - -# , c-format #~ msgid "invalid format precision" #~ msgstr "precisão inválida do formato" @@ -12848,7 +13010,6 @@ msgstr "" #~ "AVISO: use --si, não -H; o significado da opção -H irá mudar em breve\n" #~ "para o mesmo que --dereference-args (-D)" -# , c-format #~ msgid "Usage: %s [OPTION]... [STRING]...\n" #~ msgstr "Uso: %s [OPÇÃO]... [TEXTO]...\n" @@ -12935,7 +13096,6 @@ msgstr "" #~ "problemas, e\n" #~ "2 se graves problemas acontecerem.\n" -# , c-format #~ msgid "Usage: %s [OPTION] DIRECTORY...\n" #~ msgstr "Uso: %s [OPÇÃO] DIRETÓRIO...\n" @@ -12952,7 +13112,6 @@ msgstr "" #~ msgid " -p DIR use DIR as a prefix; implies -t [deprecated]\n" #~ msgstr " -p DIR usa DIR como prefixo; implica em -t [obsoleto]\n" -# , c-format #~ msgid "%d: fmt=\"%s\" width=%d\n" #~ msgstr "%d: fmt=\"%s\" largura=%d\n" @@ -12981,11 +13140,9 @@ msgstr "" #~ " \\t tabulação horizontal\n" #~ " \\v tabulação vertical\n" -# , c-format #~ msgid "FATAL: failed to close directory %s" #~ msgstr "FATAL: falhou em fechar o diretório %s" -# , c-format #~ msgid "FATAL: cannot open .. from %s" #~ msgstr "FATAL: não foi possível abrir .. de %s" @@ -12995,7 +13152,6 @@ msgstr "" #~ msgid "FATAL: directory %s changed dev/ino" #~ msgstr "FATAL: diretório %s alterou dev/ino" -# , c-format #~ msgid "FATAL: cannot enter directory %s" #~ msgstr "FATAL: não foi possível entrar no diretório %s" @@ -13005,30 +13161,24 @@ msgstr "" #~ msgid "FATAL: cannot return to .. from %s" #~ msgstr "FATAL: não foi possível retornar para .. de %s" -# , c-format #~ msgid "cannot remove root directory %s" #~ msgstr "é impossível remover o diretório raiz %s" -# , c-format #~ msgid "cannot remove relative-named %s" #~ msgstr "não foi possível remover %s com nome relativo" -# , c-format #~ msgid "cannot restore current working directory" #~ msgstr "não foi possível restaurar o diretório de trabalho atual" -# , c-format #~ msgid "no %% directive in format string %s" #~ msgstr "nenhuma diretiva %% no texto de formatação %s" #~ msgid "too many %% directives in format string %s" #~ msgstr "muitas diretivas %% no texto de formatação %s" -# , c-format #~ msgid "invalid format string: %s" #~ msgstr "texto inválido de formatação: %s" -# , c-format #~ msgid "Usage: %s [OPTIONS] FILE [...]\n" #~ msgstr "Uso: %s [OPÇÕES] ARQUIVO [...]\n" @@ -13071,11 +13221,9 @@ msgstr "" #~ " -r, --reverse inverte o resultado das comparações\n" #~ "\n" -# , c-format #~ msgid "cannot create temporary file" #~ msgstr "não foi possível criar arquivo temporário" -# , c-format #~ msgid "couldn't open temporary file" #~ msgstr "não pôde abrir arquivo temporário" @@ -13091,8 +13239,8 @@ msgstr "" #~ "GB 1000*1000*1000, G 1024*1024*1024, e assim por diante com T, P, E, Z, " #~ "Y.\n" -#~ msgid "invalid number of lines: 0" -#~ msgstr "número inválido de linhas: 0" +#~ msgid "Usage: %s [OPTION] FILE...\n" +#~ msgstr "Uso: %s [OPÇÃO] ARQUIVO...\n" #~ msgid "new_mode: mode\n" #~ msgstr "novo_modo: modo\n" @@ -13133,10 +13281,6 @@ msgstr "" #~ "que\n" #~ "mesmo se um ARQUIVO for renomeado, tail continuará a rastrear seu fim. " -# , c-format -#~ msgid "creating %s" -#~ msgstr "criando %s" - #~ msgid "" #~ "\n" #~ "Translation occurs if -d is not given and both SET1 and SET2 appear.\n" @@ -13181,9 +13325,6 @@ msgstr "" #~ "entrada padrão), escrevendo na SAÍDA (ou saída padrão).\n" #~ "\n" -#~ msgid " %2d:%02d%s up " -#~ msgstr " %2d:%02d%s no ar " - #~ msgid "am" #~ msgstr "am" @@ -13195,6 +13336,5 @@ msgstr "" #~ msgstr[0] "%ld dia" #~ msgstr[1] "%ld dias" -# , c-format #~ msgid "Usage: %s [OPTION]... [ FILE ]\n" #~ msgstr "Uso: %s [OPÇÃO]... [ ARQUIVO ]\n" diff --git a/po/ro.gmo b/po/ro.gmo index 7ddd1559..4a52fe72 100644 Binary files a/po/ro.gmo and b/po/ro.gmo differ diff --git a/po/ro.po b/po/ro.po index 2c70fed4..7e9d94f9 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: 2012-05-10 19:35+0200\n" +"POT-Creation-Date: 2013-02-14 15:56+0000\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,19 +36,19 @@ msgstr "Argumente valide sînt:" msgid "error closing file" msgstr "eroare la închiderea fișierului" -#: lib/closeout.c:112 src/base64.c:109 src/base64.c:121 src/base64.c:127 -#: src/base64.c:168 src/base64.c:224 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:330 src/expand.c:355 src/head.c:298 -#: src/head.c:348 src/head.c:756 src/head.c:797 src/mktemp.c:350 src/od.c:919 -#: src/paste.c:160 src/shuf.c:369 src/split.c:727 src/split.c:964 -#: src/split.c:969 src/tail.c:350 src/tail.c:1201 src/tail.c:1307 +#: 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 -#: src/unexpand.c:427 src/unexpand.c:443 +#: 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:1160 src/copy.c:2602 +#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617 #, c-format msgid "preserving permissions for %s" msgstr "se păstrează permisiunile pentru %s" @@ -240,18 +240,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:483 +#: lib/mkdir-p.c:196 src/install.c:484 #, c-format msgid "cannot change permissions of %s" msgstr "permisiunile %s nu se pot modifica" -#: lib/mkdir-p.c:206 src/copy.c:2261 src/install.c:709 src/install.c:722 +#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722 #, 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:915 src/tac.c:435 +#: src/split.c:929 src/tac.c:434 #, c-format msgid "memory exhausted" msgstr "memorie epuizată" @@ -300,75 +300,75 @@ msgstr "”" msgid "%s: end of file" msgstr "%s: sfîrșit de fișier" -#: lib/regcomp.c:130 +#: lib/regcomp.c:131 msgid "Success" msgstr "Succes" -#: lib/regcomp.c:133 +#: lib/regcomp.c:134 msgid "No match" msgstr "Nicio potrivire" -#: lib/regcomp.c:136 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "Expresie regulată nevalidă" -#: lib/regcomp.c:139 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "" -#: lib/regcomp.c:142 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "" -#: lib/regcomp.c:145 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "" -#: lib/regcomp.c:148 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "" -#: lib/regcomp.c:151 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "[ sau [^ fără pereche" -#: lib/regcomp.c:154 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "( sau \\( fără pereche" -#: lib/regcomp.c:157 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "\\{ fără pereche" -#: lib/regcomp.c:160 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "Conținut nevalid al \\{\\}" -#: lib/regcomp.c:163 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "Sfîrșit nevalid de domeniu" -#: lib/regcomp.c:166 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Memorie epuizată" -#: lib/regcomp.c:169 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "Expresie regulată precedentă nevalidă" -#: lib/regcomp.c:172 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "Sfîrșit prematur al expresiei regulate" -#: lib/regcomp.c:175 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "Expresie regulată prea mare" -#: lib/regcomp.c:178 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr ") sau \\) fără pereche" -#: lib/regcomp.c:703 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "Nicio expresie regulată anterioară" @@ -408,7 +408,7 @@ msgstr "^[dDyY]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-mode-acl.c:695 src/copy.c:2284 src/cp.c:518 +#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516 #, c-format msgid "setting permissions for %s" msgstr "se stabilesc permisiunile pentru %s" @@ -549,13 +549,13 @@ msgstr "Pană de curent" msgid "Resource lost" msgstr "Resursă pierdută" -#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262 -#: lib/spawn-pipe.c:265 +#: 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:232 lib/spawn-pipe.c:346 lib/wait-process.c:282 +#: 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" @@ -571,24 +571,24 @@ msgstr "Semnal în timp real %d" msgid "Unknown signal %d" msgstr "Semnal necunoscut %d" -#: lib/unicodeio.c:103 +#: lib/unicodeio.c:102 msgid "iconv function not usable" msgstr "funcție iconv inutilizabilă" -#: lib/unicodeio.c:105 +#: lib/unicodeio.c:104 msgid "iconv function not available" msgstr "funcție iconv indisponibilă" -#: lib/unicodeio.c:112 +#: lib/unicodeio.c:111 msgid "character out of range" msgstr "caracter în afara diapazonului" -#: lib/unicodeio.c:182 +#: lib/unicodeio.c:181 #, c-format msgid "cannot convert U+%04X to local character set" msgstr "U+%04X nu poate fi convertit în setul de caractere local" -#: lib/unicodeio.c:184 +#: lib/unicodeio.c:183 #, c-format msgid "cannot convert U+%04X to local character set: %s" msgstr "U+%04X nu poate fi convertit în setul de caractere local: %s" @@ -770,7 +770,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:562 +#: lib/version-etc.c:251 src/system.h:573 #, c-format msgid "%s home page: <%s>\n" msgstr "Pagina oficială %s: <%s>\n" @@ -780,7 +780,7 @@ 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:563 +#: lib/version-etc.c:256 src/system.h:574 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" @@ -867,18 +867,17 @@ msgid "Simon Josefsson" msgstr "Simon Josefsson" #: src/base64.c:60 -#, c-format +#, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" "Base64 encode or decode FILE, or standard input, to standard output.\n" -"\n" msgstr "" "Utilizare: %s [OPȚIUNE]... [FIȘIER]\n" "Codifică sau decodifică FIȘIER sau intrarea standard în Base64, spre ieșirea " "standard.\n" "\n" -#: src/base64.c:64 +#: src/base64.c:67 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -888,7 +887,7 @@ msgid "" "\n" msgstr "" -#: src/base64.c:73 src/cat.c:110 src/fmt.c:293 src/shuf.c:71 src/sum.c:70 +#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -896,7 +895,7 @@ msgstr "" "\n" "Fără FIȘIER, sau cînd FIȘIER e -, citește intrarea standard.\n" -#: src/base64.c:76 +#: src/base64.c:79 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -905,37 +904,37 @@ msgid "" "from any other non-alphabet bytes in the encoded stream.\n" msgstr "" -#: src/base64.c:171 src/base64.c:208 src/csplit.c:263 src/csplit.c:1435 -#: src/join.c:451 src/shuf.c:157 src/shuf.c:361 src/tac-pipe.c:74 +#: 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 #, c-format msgid "read error" msgstr "eroare de citire" -#: src/base64.c:227 +#: src/base64.c:230 #, c-format msgid "invalid input" msgstr "intrare nevalidă" -#: src/base64.c:264 +#: src/base64.c:267 #, c-format msgid "invalid wrap size: %s" msgstr "" -#: src/base64.c:283 src/basename.c:173 src/comm.c:435 src/cp.c:607 -#: src/date.c:441 src/dircolors.c:447 src/du.c:894 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:169 src/install.c:929 src/join.c:961 -#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:157 src/mv.c:447 -#: src/od.c:1802 src/ptx.c:2081 src/readlink.c:154 src/seq.c:408 -#: src/shuf.c:320 src/shuf.c:339 src/sort.c:4477 src/split.c:1313 -#: src/tr.c:1797 src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:454 -#: src/uniq.c:471 src/unlink.c:81 src/uptime.c:250 src/users.c:146 -#: src/wc.c:666 src/who.c:836 src/whoami.c:79 +#: 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 #, c-format msgid "extra operand %s" msgstr "operand %s în plus" -#: src/base64.c:315 src/cat.c:781 +#: src/base64.c:318 src/cat.c:781 #, c-format msgid "closing standard input" msgstr "se închide intrarea standard" @@ -943,15 +942,15 @@ 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/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:53 src/env.c:33 +#: 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/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:65 src/su.c:88 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 +#: 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 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -968,17 +967,16 @@ msgstr "" msgid "" "Print NAME with any leading directory components removed.\n" "If specified, also remove a trailing SUFFIX.\n" -"\n" msgstr "" -#: src/basename.c:59 +#: 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" msgstr "" -#: src/basename.c:66 +#: src/basename.c:67 #, c-format msgid "" "\n" @@ -989,20 +987,21 @@ msgid "" " %s -a any/str1 any/str2 -> \"str1\" followed by \"str2\"\n" msgstr "" -#: src/basename.c:167 src/chcon.c:531 src/chgrp.c:277 src/chmod.c:526 -#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1369 +#: 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:183 src/mkfifo.c:108 src/mknod.c:146 src/nohup.c:111 -#: src/pathchk.c:148 src/printf.c:674 src/readlink.c:146 src/realpath.c:236 -#: src/rm.c:314 src/rmdir.c:223 src/seq.c:402 src/setuidgid.c:137 -#: src/sleep.c:119 src/stat.c:1476 src/stdbuf.c:346 src/tr.c:1782 +#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 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 #, 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:52 src/split.c:49 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/split.c:49 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" @@ -1012,8 +1011,8 @@ msgstr "Torbjorn Granlund" msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:846 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4720 src/nl.c:182 src/paste.c:435 src/pr.c:2768 src/sum.c:58 +#: 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/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" @@ -1072,7 +1071,7 @@ msgstr "" msgid "cannot do ioctl on %s" msgstr "nu se poate face ioctl asupra %s" -#: src/cat.c:637 src/dd.c:2209 src/sort.c:379 src/tee.c:165 src/yes.c:86 +#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86 #, c-format msgid "standard output" msgstr "ieșirea standard" @@ -1089,14 +1088,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:55 src/head.c:46 src/hostid.c:33 +#: 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 msgid "Jim Meyering" msgstr "Jim Meyering" -#: src/chcon.c:100 src/runcon.c:203 src/runcon.c:234 +#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238 #, c-format msgid "failed to create security context: %s" msgstr "eșec la crearea contextului de securitate: %s" @@ -1106,8 +1105,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:540 src/copy.c:2222 src/runcon.c:217 -#: src/stat.c:683 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221 +#: src/stat.c:702 #, c-format msgid "failed to get security context of %s" msgstr "eșec la obținerea contextului de securitate al %s" @@ -1123,12 +1122,12 @@ 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:446 src/ls.c:2981 +#: src/du.c:457 src/ls.c:2981 #, 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:426 +#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437 #, c-format msgid "cannot read directory %s" msgstr "dosarul %s nu poate fi citit" @@ -1138,13 +1137,13 @@ 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:599 +#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562 #, 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:618 -#: src/remove.c:613 +#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642 +#: src/remove.c:576 #, c-format msgid "fts_close failed" msgstr "fts_close a eșuat" @@ -1162,10 +1161,9 @@ msgid "" "Change the security context of each FILE to CONTEXT.\n" "With --reference, change the security context of each FILE to that of " "RFILE.\n" -"\n" msgstr "" -#: src/chcon.c:362 src/chgrp.c:123 src/chown.c:94 +#: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94 msgid "" " --dereference affect the referent of each symbolic link (this is\n" " the default), rather than the symbolic link itself\n" @@ -1173,7 +1171,7 @@ msgid "" "file\n" msgstr "" -#: src/chcon.c:367 +#: src/chcon.c:369 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" @@ -1181,22 +1179,31 @@ msgid "" " -l, --range=RANGE set range RANGE in the target security context\n" msgstr "" -#: src/chcon.c:373 +#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110 +#, fuzzy +msgid "" +" --no-preserve-root do not treat '/' specially (the default)\n" +" --preserve-root fail to operate recursively on '/'\n" +msgstr "" +" --no-preserve-root nu trata „/” deosebit (implicit)\n" +" --preserve-root eșuează la operarea recursivă pe „/”\n" + +#: src/chcon.c:379 msgid "" " --reference=RFILE use RFILE's security context rather than " "specifying\n" " a CONTEXT value\n" msgstr "" -#: src/chcon.c:377 src/chgrp.c:140 src/chown.c:118 +#: 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:380 +#: src/chcon.c:386 msgid " -v, --verbose output a diagnostic for every file processed\n" msgstr "" -#: src/chcon.c:383 src/chgrp.c:143 src/chown.c:121 +#: src/chcon.c:389 src/chgrp.c:143 src/chown.c:121 #, fuzzy msgid "" "\n" @@ -1224,36 +1231,36 @@ msgstr "" " -P nu traversa nicio legătură simbolică (implicit)\n" "\n" -#: src/chcon.c:512 src/chgrp.c:264 src/chown.c:267 +#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267 #, c-format msgid "-R --dereference requires either -H or -L" msgstr "-R --dereference necesită fie -H, fie -L" -#: src/chcon.c:518 +#: src/chcon.c:524 #, c-format msgid "-R -h requires -P" msgstr "-R -h cere -P" -#: src/chcon.c:533 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282 -#: src/comm.c:429 src/csplit.c:1371 src/join.c:1149 src/link.c:79 -#: src/mknod.c:148 src/setuidgid.c:139 src/tr.c:1785 +#: 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 #, c-format msgid "missing operand after %s" msgstr "operand lipsă după %s" -#: src/chcon.c:556 src/runcon.c:247 +#: src/chcon.c:562 src/runcon.c:251 #, c-format msgid "invalid context: %s" msgstr "context nevalid: %s" -#: src/chcon.c:563 +#: src/chcon.c:569 #, c-format msgid "conflicting security context specifiers given" msgstr "" -#: src/chcon.c:572 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:433 src/cp.c:493 -#: src/mv.c:96 src/pwd.c:273 src/rm.c:324 src/touch.c:351 +#: 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 #, c-format msgid "failed to get attributes of %s" msgstr "eșec la obținerea atributelor %s" @@ -1292,15 +1299,6 @@ msgid "" " ownership of a symlink)\n" msgstr "" -#: src/chgrp.c:132 src/chmod.c:387 src/chown.c:110 -#, fuzzy -msgid "" -" --no-preserve-root do not treat '/' specially (the default)\n" -" --preserve-root fail to operate recursively on '/'\n" -msgstr "" -" --no-preserve-root nu trata „/” deosebit (implicit)\n" -" --preserve-root eșuează la operarea recursivă pe „/”\n" - #: src/chgrp.c:136 msgid "" " --reference=RFILE use RFILE's group rather than specifying a\n" @@ -1538,7 +1536,7 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:97 src/install.c:575 src/setuidgid.c:110 src/setuidgid.c:120 +#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120 #, c-format msgid "invalid group %s" msgstr "grup %s nevalid" @@ -1608,8 +1606,8 @@ msgstr "eșec la stabilirea ID-grup" msgid "failed to set user-ID" msgstr "eșec la stabilirea ID-utilizator" -#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:213 src/stdbuf.c:366 -#: src/timeout.c:402 +#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365 +#: src/timeout.c:454 #, c-format msgid "failed to run command %s" msgstr "eșec la rularea comenzii %s" @@ -1711,20 +1709,24 @@ msgstr "delimitatori multipli specificați" msgid "empty %s not allowed" msgstr "%s gol interzis" -#: src/copy.c:168 src/dd.c:1609 src/dd.c:1976 +#: 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 #, c-format -msgid "reading %s" -msgstr "se citește %s" +msgid "error reading %s" +msgstr "eroare la citirea %s" -#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:426 +#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425 #, c-format msgid "cannot lseek %s" msgstr "nu se poate face lseek %s" -#: src/copy.c:206 src/dd.c:2039 src/dd.c:2102 +#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151 #, c-format -msgid "writing %s" -msgstr "se scrie %s" +msgid "error writing %s" +msgstr "eroare la scrierea %s" #: src/copy.c:313 #, fuzzy, c-format @@ -1746,7 +1748,7 @@ msgstr "eșec la deschiderea %s" msgid "clearing permissions for %s" msgstr "se curăță permisiunile pentru %s" -#: src/copy.c:697 src/copy.c:2470 src/cp.c:331 +#: src/copy.c:697 src/copy.c:2480 src/cp.c:329 #, c-format msgid "failed to preserve ownership for %s" msgstr "păstrarea apartenenței pentru %s a eșuat" @@ -1761,14 +1763,14 @@ msgstr "găsirea fișierului %s a eșuat" msgid "failed to preserve authorship for %s" msgstr "" -#: src/copy.c:804 src/csplit.c:638 src/du.c:901 src/fmt.c:449 src/head.c:847 -#: src/sort.c:4489 src/split.c:1329 src/tail.c:1756 src/wc.c:678 +#: 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 "%s nu poate fi deschis pentru citire" -#: src/copy.c:810 src/copy.c:972 src/dd.c:1546 src/dd.c:2114 src/dd.c:2252 -#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:141 +#: 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 #, c-format msgid "cannot fstat %s" msgstr "nu se poate face fstat %s" @@ -1788,14 +1790,14 @@ msgstr "" msgid "failed to set the security context of %s to %s" msgstr "" -#: src/copy.c:881 src/copy.c:1574 src/copy.c:1777 src/copy.c:1935 src/ln.c:314 -#: src/remove.c:267 src/remove.c:293 src/remove.c:444 src/remove.c:465 +#: 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 #, c-format msgid "cannot remove %s" msgstr "%s nu poate fi eliminat" -#: src/copy.c:886 src/copy.c:1578 src/copy.c:1772 src/copy.c:1940 -#: src/remove.c:418 +#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945 +#: src/remove.c:375 #, c-format msgid "removed %s\n" msgstr "eliminat %s\n" @@ -1815,186 +1817,186 @@ msgstr "fișierul obișnuit %s nu poate fi creat" msgid "failed to clone %s from %s" msgstr "eșec la clonarea %s" -#: src/copy.c:1098 src/copy.c:2531 +#: src/copy.c:1098 src/copy.c:2541 #, c-format msgid "preserving times for %s" msgstr "se păstrează timpii pentru %s" -#: src/copy.c:1170 src/copy.c:1176 src/head.c:855 src/touch.c:175 -#: src/truncate.c:413 -#, c-format -msgid "closing %s" -msgstr "se închide %s" +#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172 +#: src/truncate.c:417 +#, fuzzy, c-format +msgid "failed to close %s" +msgstr "eșec la deschiderea %s" -#: src/copy.c:1466 +#: src/copy.c:1471 #, c-format msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? " msgstr "" -#: src/copy.c:1473 +#: src/copy.c:1478 #, c-format msgid "%s: overwrite %s? " msgstr "%s: suprascrieți %s? " -#: src/copy.c:1542 +#: src/copy.c:1547 #, c-format msgid " (backup: %s)" msgstr " (rezervă: %s)" -#: src/copy.c:1552 +#: src/copy.c:1557 #, c-format msgid "failed to restore the default file creation context" msgstr "" -#: src/copy.c:1584 +#: src/copy.c:1589 #, c-format msgid "cannot create hard link %s to %s" msgstr "" -#: src/copy.c:1637 src/copy.c:1689 src/copy.c:2272 src/copy.c:2589 +#: 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:1220 src/truncate.c:365 +#: src/stat.c:1239 src/truncate.c:363 #, c-format msgid "cannot stat %s" msgstr "nu se poate face stat %s" -#: src/copy.c:1645 +#: src/copy.c:1650 #, c-format msgid "omitting directory %s" msgstr "se omite dosarul %s" -#: src/copy.c:1659 +#: src/copy.c:1664 #, 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:1707 src/ln.c:246 +#: src/copy.c:1712 src/ln.c:246 #, 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:1806 +#: src/copy.c:1811 #, 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:1824 src/ln.c:214 +#: src/copy.c:1829 src/ln.c:214 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "" -#: src/copy.c:1842 +#: src/copy.c:1847 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "nu se poate suprascrie dosarul %s cu non-dosar" -#: src/copy.c:1856 +#: src/copy.c:1861 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "" -#: src/copy.c:1886 +#: src/copy.c:1891 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "" -#: src/copy.c:1887 +#: src/copy.c:1892 #, 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:1910 src/ln.c:276 +#: src/copy.c:1915 src/ln.c:276 #, c-format msgid "cannot backup %s" msgstr "%s nu poate fi copiat de rezervă" -#: src/copy.c:1974 +#: src/copy.c:1979 #, c-format msgid "will not copy %s through just-created symlink %s" msgstr "" -#: src/copy.c:2051 +#: src/copy.c:2056 #, 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:2068 +#: src/copy.c:2073 #, c-format msgid "will not create hard link %s to directory %s" msgstr "" -#: src/copy.c:2118 +#: src/copy.c:2123 #, 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:2161 +#: src/copy.c:2166 #, c-format msgid "cannot move %s to %s" msgstr "nu se poate muta %s la %s" -#: src/copy.c:2173 +#: src/copy.c:2178 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" -#: src/copy.c:2207 src/install.c:905 src/mkdir.c:189 src/mkfifo.c:114 -#: src/mknod.c:167 +#: 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:2241 +#: src/copy.c:2246 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "nu se poate copia legătura simbolică ciclică %s" -#: src/copy.c:2350 +#: src/copy.c:2355 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "" -#: src/copy.c:2357 +#: src/copy.c:2362 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "nu se poate crea legătura simbolică %s la %s" -#: src/copy.c:2406 src/mkfifo.c:133 +#: src/copy.c:2416 src/mkfifo.c:132 #, c-format msgid "cannot create fifo %s" msgstr "" -#: src/copy.c:2415 +#: src/copy.c:2425 #, c-format msgid "cannot create special file %s" msgstr "fișierul special %s nu poate fi creat" -#: src/copy.c:2426 src/ls.c:3191 src/stat.c:902 +#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921 #, c-format msgid "cannot read symbolic link %s" msgstr "legătura simbolică %s nu poate fi citită" -#: src/copy.c:2453 +#: src/copy.c:2463 #, c-format msgid "cannot create symbolic link %s" msgstr "legătura simbolică %s nu poate fi creată" -#: src/copy.c:2485 +#: src/copy.c:2495 #, c-format msgid "%s has unknown file type" msgstr "%s are un tip de fișier necunoscut" -#: src/copy.c:2629 src/ln.c:358 +#: src/copy.c:2644 src/ln.c:358 #, c-format msgid "cannot un-backup %s" msgstr "" -#: src/copy.c:2633 +#: src/copy.c:2648 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "" -#: src/cp.c:156 src/mv.c:284 +#: src/cp.c:156 src/mv.c:286 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -2006,27 +2008,13 @@ msgstr "" " sau: %s [OPȚIUNE]... -t DOSAR SURSĂ...\n" #: src/cp.c:162 -msgid "" -"Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" -"\n" +#, 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:166 src/csplit.c:1458 src/cut.c:197 src/df.c:852 src/du.c:268 -#: src/expand.c:112 src/fmt.c:275 src/fold.c:75 src/head.c:115 -#: src/install.c:612 src/kill.c:86 src/ln.c:392 src/ls.c:4726 src/mkdir.c:61 -#: src/mkfifo.c:56 src/mknod.c:58 src/mv.c:294 src/nl.c:191 src/paste.c:445 -#: src/pr.c:2777 src/ptx.c:1825 src/shred.c:153 src/shuf.c:58 src/sort.c:399 -#: src/split.c:211 src/stdbuf.c:95 src/tac.c:142 src/tail.c:268 -#: src/touch.c:226 src/truncate.c:107 src/unexpand.c:122 src/uniq.c:145 -msgid "" -"Mandatory arguments to long options are mandatory for short options too.\n" -msgstr "" -"Argumentele obligatorii pentru opțiuni lungi sînt obligatorii și pentru " -"opțiunile scurte.\n" - -#: src/cp.c:169 +#: src/cp.c:168 msgid "" " -a, --archive same as -dR --preserve=all\n" " --attributes-only don't copy the file data, just the " @@ -2040,32 +2028,33 @@ msgid "" " -d same as --no-dereference --preserve=links\n" msgstr "" -#: src/cp.c:178 +#: src/cp.c:177 msgid "" " -f, --force if an existing destination file cannot be\n" -" opened, remove it and try again (redundant " -"if\n" -" the -n option is used)\n" +" opened, remove it and try again (this " +"option\n" +" is ignored when the -n option is also " +"used)\n" " -i, --interactive prompt before overwrite (overrides a previous " "-n\n" " option)\n" " -H follow command-line symbolic links in SOURCE\n" msgstr "" -#: src/cp.c:188 +#: src/cp.c:186 msgid "" " -l, --link hard link files instead of copying\n" " -L, --dereference always follow symbolic links in SOURCE\n" msgstr "" -#: src/cp.c:192 +#: src/cp.c:190 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:197 +#: src/cp.c:195 msgid "" " -p same as --preserve=mode,ownership,timestamps\n" " --preserve[=ATTR_LIST] preserve the specified attributes (default:\n" @@ -2075,13 +2064,13 @@ msgid "" " all\n" msgstr "" -#: src/cp.c:205 +#: src/cp.c:203 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:209 +#: src/cp.c:207 msgid "" " -R, -r, --recursive copy directories recursively\n" " --reflink[=WHEN] control clone/CoW copies. See below\n" @@ -2090,7 +2079,7 @@ msgid "" "force)\n" msgstr "" -#: src/cp.c:215 +#: src/cp.c:213 msgid "" " --sparse=WHEN control creation of sparse files. See below\n" " --strip-trailing-slashes remove any trailing slashes from each " @@ -2098,7 +2087,7 @@ msgid "" " argument\n" msgstr "" -#: src/cp.c:220 +#: src/cp.c:218 msgid "" " -s, --symbolic-link make symbolic links instead of copying\n" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -2107,7 +2096,7 @@ msgid "" " -T, --no-target-directory treat DEST as a normal file\n" msgstr "" -#: src/cp.c:226 +#: src/cp.c:224 msgid "" " -u, --update copy only when the SOURCE file is newer\n" " than the destination file or when the\n" @@ -2116,7 +2105,7 @@ msgid "" " -x, --one-file-system stay on this file system\n" msgstr "" -#: src/cp.c:235 +#: src/cp.c:233 msgid "" "\n" "By default, sparse SOURCE files are detected by a crude heuristic and the\n" @@ -2132,7 +2121,7 @@ msgid "" "fails, or if --reflink=auto is specified, fall back to a standard copy.\n" msgstr "" -#: src/cp.c:247 src/install.c:649 src/ln.c:421 src/mv.c:321 +#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322 msgid "" "\n" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -2142,7 +2131,7 @@ msgid "" "\n" msgstr "" -#: src/cp.c:254 src/install.c:656 src/mv.c:328 +#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329 msgid "" " none, off never make backups (even if --backup is given)\n" " numbered, t make numbered backups\n" @@ -2150,7 +2139,7 @@ msgid "" " simple, never always make simple backups\n" msgstr "" -#: src/cp.c:260 +#: src/cp.c:258 msgid "" "\n" "As a special case, cp makes a backup of SOURCE when the force and backup\n" @@ -2158,91 +2147,91 @@ msgid "" "regular file.\n" msgstr "" -#: src/cp.c:319 +#: src/cp.c:317 #, c-format msgid "failed to preserve times for %s" msgstr "păstrarea timpilor pentru %s a eșuat" -#: src/cp.c:350 +#: src/cp.c:348 #, c-format msgid "failed to preserve permissions for %s" msgstr "păstrarea permisiunilor pentru %s a eșuat" -#: src/cp.c:477 +#: src/cp.c:475 #, c-format msgid "cannot make directory %s" msgstr "dosarul %s nu poate fi făcut" -#: src/cp.c:526 src/cp.c:545 +#: src/cp.c:524 src/cp.c:543 #, c-format msgid "%s exists but is not a directory" msgstr "%s există dar nu este un dosar" -#: src/cp.c:572 src/cp.c:1068 src/install.c:401 src/install.c:844 src/ln.c:123 -#: src/ln.c:181 src/ln.c:202 src/ln.c:516 src/mv.c:152 src/mv.c:399 -#, c-format -msgid "accessing %s" -msgstr "se accesează %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 +#, fuzzy, c-format +msgid "failed to access %s" +msgstr "eșec la deschiderea %s" -#: src/cp.c:592 src/install.c:914 src/ln.c:546 src/mv.c:432 src/shred.c:1182 -#: src/touch.c:433 src/truncate.c:356 +#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181 +#: src/touch.c:429 src/truncate.c:354 #, c-format msgid "missing file operand" msgstr "lipsă operand fișier" -#: src/cp.c:594 src/install.c:916 src/ln.c:560 src/mv.c:434 +#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436 #, c-format msgid "missing destination file operand after %s" msgstr "lipsă operand fișier destinație după %s" -#: src/cp.c:603 src/install.c:925 src/mv.c:443 +#: src/cp.c:601 src/install.c:926 src/mv.c:445 #, 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:619 src/cp.c:1070 src/install.c:403 src/install.c:846 -#: src/install.c:938 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:401 -#: src/mv.c:457 +#: 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 #, c-format msgid "target %s is not a directory" msgstr "ținta %s nu este un dosar" -#: src/cp.c:730 +#: src/cp.c:728 #, c-format msgid "with --parents, the destination must be a directory" msgstr "cu --parents, destinația trebuie să fie un dosar" -#: src/cp.c:1063 src/install.c:839 src/ln.c:511 src/mv.c:394 +#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395 #, c-format msgid "multiple target directories specified" msgstr "multiple dosare-țintă specificate" -#: src/cp.c:1108 +#: src/cp.c:1110 #, c-format msgid "cannot make both hard and symbolic links" msgstr "" -#: src/cp.c:1115 src/mv.c:464 +#: src/cp.c:1117 src/mv.c:466 #, c-format msgid "options --backup and --no-clobber are mutually exclusive" msgstr "opțiunile --backup și --no-clobber se exclud reciproc" -#: src/cp.c:1121 +#: src/cp.c:1123 #, c-format msgid "--reflink can be used only with --sparse=auto" msgstr "--reflink poate fi utilizat numai cu --sparse=auto" -#: src/cp.c:1129 src/install.c:899 src/ln.c:582 src/mv.c:472 +#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474 msgid "backup type" msgstr "tip copie de siguranță" -#: src/cp.c:1154 +#: src/cp.c:1156 #, c-format msgid "cannot preserve security context without an SELinux-enabled kernel" msgstr "" -#: src/cp.c:1160 +#: src/cp.c:1162 #, c-format msgid "cannot preserve extended attributes, cp is built without xattr support" msgstr "" @@ -2252,134 +2241,133 @@ msgstr "" msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:529 +#: src/csplit.c:531 #, c-format msgid "input disappeared" msgstr "intrarea a dispărut" -#: src/csplit.c:658 src/csplit.c:669 +#: src/csplit.c:660 src/csplit.c:671 #, c-format msgid "%s: line number out of range" msgstr "%s: număr linie în afara intervalului" -#: src/csplit.c:698 +#: src/csplit.c:700 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: număr linie în afara intervalului" -#: src/csplit.c:701 src/csplit.c:750 +#: src/csplit.c:703 src/csplit.c:752 #, c-format msgid " on repetition %s\n" msgstr "" -#: src/csplit.c:744 +#: src/csplit.c:746 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: nicio potrivire găsită" -#: src/csplit.c:808 src/csplit.c:848 src/nl.c:359 src/tac.c:274 +#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273 #, c-format msgid "error in regular expression search" msgstr "" -#: src/csplit.c:981 +#: src/csplit.c:983 #, c-format msgid "write error for %s" msgstr "eroare de scriere pentru %s" -#: src/csplit.c:1057 +#: src/csplit.c:1059 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: se așteaptă întreg după delimitator" -#: src/csplit.c:1073 +#: src/csplit.c:1075 #, c-format msgid "%s: '}' is required in repeat count" msgstr "" -#: src/csplit.c:1083 +#: src/csplit.c:1085 #, c-format msgid "%s}: integer required between '{' and '}'" msgstr "" -#: src/csplit.c:1110 +#: src/csplit.c:1112 #, c-format msgid "%s: closing delimiter '%c' missing" msgstr "" -#: src/csplit.c:1127 +#: src/csplit.c:1129 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: expresie regulată nevalidă: %s" -#: src/csplit.c:1160 +#: src/csplit.c:1162 #, c-format msgid "%s: invalid pattern" msgstr "%s: model nevalid" -#: src/csplit.c:1163 +#: src/csplit.c:1165 #, 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:1169 +#: src/csplit.c:1171 #, 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:1175 +#: src/csplit.c:1177 #, 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:1253 +#: src/csplit.c:1255 #, c-format msgid "missing conversion specifier in suffix" msgstr "" -#: src/csplit.c:1259 +#: src/csplit.c:1261 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "" -#: src/csplit.c:1262 +#: src/csplit.c:1264 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "" -#: src/csplit.c:1267 +#: src/csplit.c:1269 #, fuzzy, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "%.*s: specificare de conversie nevalidă" -#: src/csplit.c:1284 +#: src/csplit.c:1286 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "" -#: src/csplit.c:1298 +#: src/csplit.c:1300 #, c-format msgid "missing %% conversion specification in suffix" msgstr "" -#: src/csplit.c:1345 +#: src/csplit.c:1347 #, c-format msgid "%s: invalid number" msgstr "%s: număr nevalid" -#: src/csplit.c:1449 +#: src/csplit.c:1451 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Utilizare: %s [OPȚIUNE]... FIȘIER MODEL...\n" -#: src/csplit.c:1453 +#: src/csplit.c:1455 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" -"\n" msgstr "" -#: src/csplit.c:1461 +#: src/csplit.c:1462 #, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2387,20 +2375,20 @@ msgid "" " -k, --keep-files do not remove output files on errors\n" msgstr "" -#: src/csplit.c:1466 +#: src/csplit.c:1467 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:1473 +#: src/csplit.c:1474 msgid "" "\n" "Read standard input if FILE is -. Each PATTERN may be:\n" msgstr "" -#: src/csplit.c:1477 +#: src/csplit.c:1478 msgid "" "\n" " INTEGER copy up to but not including specified line number\n" @@ -2417,7 +2405,7 @@ msgstr "" msgid "David M. Ihnat" msgstr "David M. Ihnat" -#: src/cut.c:64 +#: 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" @@ -2427,20 +2415,19 @@ msgid "Usage: %s OPTION... [FILE]...\n" msgstr "Utilizare: %s OPȚIUNE... [FIȘIER]...\n" #: src/cut.c:193 -msgid "" -"Print selected parts of lines from each FILE to standard output.\n" -"\n" +#, 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:200 +#: src/cut.c:199 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:205 +#: src/cut.c:204 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2448,20 +2435,20 @@ msgid "" " -n (ignored)\n" msgstr "" -#: src/cut.c:211 +#: src/cut.c:210 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" msgstr "" -#: src/cut.c:215 +#: src/cut.c:214 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:222 +#: src/cut.c:221 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2469,7 +2456,7 @@ msgid "" "in the same order that it is read, and is written exactly once.\n" msgstr "" -#: src/cut.c:228 +#: src/cut.c:227 msgid "" "Each range is one of:\n" "\n" @@ -2481,55 +2468,57 @@ msgid "" "With no FILE, or when FILE is -, read standard input.\n" msgstr "" -#: src/cut.c:368 src/cut.c:489 -msgid "invalid byte or field list" -msgstr "" +#: src/cut.c:367 src/cut.c:493 +#, 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:385 +#: src/cut.c:387 msgid "invalid range with no endpoint: -" msgstr "" -#: src/cut.c:399 +#: src/cut.c:403 msgid "invalid decreasing range" msgstr "" -#: src/cut.c:478 +#: src/cut.c:482 #, c-format msgid "byte offset %s is too large" msgstr "" -#: src/cut.c:481 +#: src/cut.c:485 #, c-format msgid "field number %s is too large" msgstr "numărul de cîmp %s e prea mare" -#: src/cut.c:789 src/cut.c:797 +#: src/cut.c:795 src/cut.c:803 msgid "only one type of list may be specified" msgstr "poate fi specificat numai un tip de listă" -#: src/cut.c:806 +#: src/cut.c:812 src/numfmt.c:1408 +#, c-format msgid "the delimiter must be a single character" msgstr "delimitatorul trebuie să fie un singur caracter" -#: src/cut.c:841 +#: src/cut.c:847 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:844 +#: src/cut.c:850 msgid "an input delimiter may be specified only when operating on fields" msgstr "" -#: src/cut.c:848 +#: src/cut.c:854 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" msgstr "" -#: src/cut.c:864 +#: src/cut.c:870 msgid "missing list of fields" msgstr "lipsește lista de cîmpuri" -#: src/cut.c:866 +#: src/cut.c:872 msgid "missing list of positions" msgstr "lipsește lista de poziții" @@ -2543,9 +2532,11 @@ msgstr "" " sau: %s [-u|--utc|--universal] [LLZZhhmm[[SS]AA][.ss]]\n" #: src/date.c:128 +msgid "Display the current time in the given FORMAT, or set the system date.\n" +msgstr "" + +#: src/date.c:134 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" " -I[TIMESPEC], --iso-8601[=TIMESPEC] output date/time in ISO 8601 format.\n" @@ -2554,14 +2545,14 @@ msgid "" " and time to the indicated precision.\n" msgstr "" -#: src/date.c:138 +#: src/date.c:142 msgid "" " -r, --reference=FILE display the last modification time of FILE\n" " -R, --rfc-2822 output date and time in RFC 2822 format.\n" " Example: Mon, 07 Aug 2006 12:34:56 -0600\n" msgstr "" -#: src/date.c:143 +#: src/date.c:147 msgid "" " --rfc-3339=TIMESPEC output date and time in RFC 3339 format.\n" " TIMESPEC='date', 'seconds', or 'ns' for\n" @@ -2572,7 +2563,7 @@ msgid "" " -u, --utc, --universal print or set Coordinated Universal Time\n" msgstr "" -#: src/date.c:154 +#: src/date.c:158 msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" @@ -2581,7 +2572,7 @@ msgid "" " %a locale's abbreviated weekday name (e.g., Sun)\n" msgstr "" -#: src/date.c:161 +#: src/date.c:165 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2589,7 +2580,7 @@ msgid "" " %c locale's date and time (e.g., Thu Mar 3 23:05:25 2005)\n" msgstr "" -#: src/date.c:167 +#: src/date.c:171 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2597,14 +2588,14 @@ msgid "" " %e day of month, space padded; same as %_d\n" msgstr "" -#: src/date.c:173 +#: src/date.c:177 msgid "" " %F full date; same as %Y-%m-%d\n" " %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 "" -#: src/date.c:178 +#: src/date.c:182 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2612,7 +2603,7 @@ msgid "" " %j day of year (001..366)\n" msgstr "" -#: src/date.c:184 +#: src/date.c:188 #, fuzzy msgid "" " %k hour, space padded ( 0..23); same as %_H\n" @@ -2625,7 +2616,7 @@ msgstr "" " %m lună (01..12)\n" " %M minut (00..59)\n" -#: src/date.c:190 +#: src/date.c:194 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2636,7 +2627,7 @@ msgid "" " %s seconds since 1970-01-01 00:00:00 UTC\n" msgstr "" -#: src/date.c:199 +#: src/date.c:203 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2648,7 +2639,7 @@ msgstr "" " %T ora; identic cu %H:%M:%S\n" " %u ziua săptămînii (1..7); 1 e Luni\n" -#: src/date.c:205 +#: src/date.c:209 msgid "" " %U week number of year, with Sunday as first day of week (00..53)\n" " %V ISO week number, with Monday as first day of week (01..53)\n" @@ -2656,7 +2647,7 @@ msgid "" " %W week number of year, with Monday as first day of week (00..53)\n" msgstr "" -#: src/date.c:211 +#: src/date.c:215 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -2664,7 +2655,7 @@ msgid "" " %Y year\n" msgstr "" -#: src/date.c:217 +#: src/date.c:221 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -2676,7 +2667,7 @@ msgid "" "By default, date pads numeric fields with zeroes.\n" msgstr "" -#: src/date.c:226 +#: src/date.c:230 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -2687,7 +2678,7 @@ msgid "" " # use opposite case if possible\n" msgstr "" -#: src/date.c:235 +#: src/date.c:239 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -2696,7 +2687,7 @@ msgid "" "O to use the locale's alternate numeric symbols if available.\n" msgstr "" -#: src/date.c:242 +#: src/date.c:246 msgid "" "\n" "Examples:\n" @@ -2710,35 +2701,35 @@ msgid "" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:275 src/dd.c:2193 src/head.c:838 src/md5sum.c:477 -#: src/md5sum.c:798 src/od.c:863 src/od.c:1914 src/pr.c:1176 src/pr.c:1372 -#: src/pr.c:1494 src/stty.c:842 src/tac.c:563 src/tail.c:343 src/tee.c:126 +#: 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 #, c-format msgid "standard input" msgstr "intrarea standard" -#: src/date.c:303 src/date.c:523 +#: src/date.c:307 src/date.c:527 #, c-format msgid "invalid date %s" msgstr "dată nevalidă %s" -#: src/date.c:414 src/date.c:448 +#: src/date.c:418 src/date.c:452 #, c-format msgid "multiple output formats specified" msgstr "multiple formate de ieșire specificate" -#: src/date.c:426 +#: src/date.c:430 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "" -#: src/date.c:433 +#: src/date.c:437 #, c-format msgid "the options to print and set the time may not be used together" msgstr "" -#: src/date.c:454 +#: src/date.c:458 #, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -2746,23 +2737,23 @@ msgid "" "argument must be a format string beginning with '+'" msgstr "" -#: src/date.c:531 +#: src/date.c:535 #, c-format msgid "cannot set date" msgstr "nu se poate stabili data" -#: src/date.c:554 src/du.c:360 +#: src/date.c:558 src/du.c:371 #, c-format msgid "time %s is out of range" msgstr "ora %s este în afara intervalului" #. This is a proper name. See the gettext manual, section Names. -#: src/dd.c:44 src/factor.c:43 src/rm.c:41 src/tail.c:69 src/touch.c:41 +#: 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 "Paul Rubin" -#: src/dd.c:517 +#: src/dd.c:521 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -2771,7 +2762,7 @@ msgstr "" "Utilizare: %s [OPERAND]...\n" " sau: %s OPȚIUNE\n" -#: src/dd.c:522 +#: src/dd.c:526 #, fuzzy msgid "" "Copy a file, converting and formatting according to the operands.\n" @@ -2791,7 +2782,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:531 +#: src/dd.c:535 msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -2800,13 +2791,15 @@ msgid "" " oflag=FLAGS write as per the comma separated symbol list\n" " seek=N skip N obs-sized blocks at start of output\n" " skip=N skip N ibs-sized blocks at start of input\n" -" status=noxfer suppress transfer statistics\n" +" status=WHICH WHICH info to suppress outputting to stderr;\n" +" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" msgstr "" -#: src/dd.c:541 +#: src/dd.c:546 +#, fuzzy msgid "" "\n" -"BLOCKS and BYTES may be followed by the following multiplicative suffixes:\n" +"N and BYTES may be followed by the following multiplicative suffixes:\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, and so on for T, P, E, Z, Y.\n" "\n" @@ -2822,7 +2815,7 @@ msgstr "" "Fiecare simbol CONV poate fi:\n" "\n" -#: src/dd.c:550 +#: src/dd.c:555 #, fuzzy msgid "" " ascii from EBCDIC to ASCII\n" @@ -2848,7 +2841,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:563 +#: src/dd.c:568 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -2864,7 +2857,7 @@ msgstr "" " fdatasync physically write output file data before finishing\n" " fsync likewise, but also write metadata\n" -#: src/dd.c:571 +#: src/dd.c:576 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -2873,75 +2866,75 @@ msgid "" "suggested)\n" msgstr "" -#: src/dd.c:578 +#: src/dd.c:583 msgid " cio use concurrent I/O for data\n" msgstr " cio utilizează I/E concurentă pentru date\n" -#: src/dd.c:580 +#: src/dd.c:585 msgid " direct use direct I/O for data\n" msgstr " direct utilizează I/E directă pentru date\n" -#: src/dd.c:582 +#: src/dd.c:587 msgid " directory fail unless a directory\n" msgstr "" -#: src/dd.c:584 +#: src/dd.c:589 msgid " dsync use synchronized I/O for data\n" msgstr "" -#: src/dd.c:586 +#: src/dd.c:591 msgid " sync likewise, but also for metadata\n" msgstr "" -#: src/dd.c:587 +#: src/dd.c:592 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr "" -#: src/dd.c:590 +#: src/dd.c:595 msgid " nonblock use non-blocking I/O\n" msgstr "" -#: src/dd.c:592 +#: src/dd.c:597 msgid " noatime do not update access time\n" msgstr "" -#: src/dd.c:595 +#: src/dd.c:600 msgid " nocache discard cached data\n" msgstr "" -#: src/dd.c:598 +#: src/dd.c:603 msgid " noctty do not assign controlling terminal from file\n" msgstr "" -#: src/dd.c:601 +#: src/dd.c:606 msgid " nofollow do not follow symlinks\n" msgstr " nofollow nu urma legăturile simbolice\n" -#: src/dd.c:603 +#: src/dd.c:608 msgid " nolinks fail if multiply-linked\n" msgstr "" -#: src/dd.c:605 +#: src/dd.c:610 msgid " binary use binary I/O for data\n" msgstr " binary utilizează I/E binară pentru date\n" -#: src/dd.c:607 +#: src/dd.c:612 msgid " text use text I/O for data\n" msgstr " text utilizează I/E textuală pentru date\n" -#: src/dd.c:609 +#: src/dd.c:614 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:612 +#: src/dd.c:617 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:615 +#: src/dd.c:620 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:620 +#: src/dd.c:625 #, c-format msgid "" "\n" @@ -2958,7 +2951,7 @@ msgid "" "\n" msgstr "" -#: src/dd.c:676 +#: src/dd.c:683 #, c-format msgid "" "%<PRIuMAX>+%<PRIuMAX> records in\n" @@ -2967,7 +2960,7 @@ msgstr "" "%<PRIuMAX>+%<PRIuMAX> înregistrări citite\n" "%<PRIuMAX>+%<PRIuMAX> înregistrări scrise\n" -#: src/dd.c:682 +#: src/dd.c:689 #, c-format msgid "%<PRIuMAX> truncated record\n" msgid_plural "%<PRIuMAX> truncated records\n" @@ -2975,7 +2968,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:694 +#: src/dd.c:701 #, c-format msgid "%<PRIuMAX> byte (%s) copied" msgid_plural "%<PRIuMAX> bytes (%s) copied" @@ -2983,7 +2976,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:712 +#: src/dd.c:720 msgid "Infinity B" msgstr "" @@ -2997,239 +2990,261 @@ 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:725 +#: src/dd.c:733 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g s, %s/s\n" -#: src/dd.c:804 +#: src/dd.c:812 #, c-format msgid "closing input file %s" msgstr "se închide fișierul de intrare %s" -#: src/dd.c:811 +#: src/dd.c:819 #, c-format msgid "closing output file %s" msgstr "se închide fișierul de ieșire %s" -#: src/dd.c:1014 +#: src/dd.c:1022 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "" -#: src/dd.c:1085 src/dd.c:1934 +#: src/dd.c:1093 src/dd.c:1942 #, c-format msgid "writing to %s" msgstr "se scrie în %s" -#: src/dd.c:1199 src/dd.c:1253 +#: src/dd.c:1207 src/dd.c:1261 #, c-format msgid "unrecognized operand %s" msgstr "operand %s necunoscut" -#: src/dd.c:1210 +#: src/dd.c:1218 msgid "invalid conversion" msgstr "conversie nevalidă" -#: src/dd.c:1213 src/dd.c:1289 +#: src/dd.c:1221 src/dd.c:1297 msgid "invalid input flag" msgstr "fanion de intrare nevalid" -#: src/dd.c:1216 src/dd.c:1283 src/dd.c:1295 +#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303 msgid "invalid output flag" msgstr "fanion de ieșire nevalid" -#: src/dd.c:1219 +#: src/dd.c:1227 msgid "invalid status flag" msgstr "fanion de stare nevalid" -#: src/dd.c:1258 src/truncate.c:312 +#: src/dd.c:1266 src/truncate.c:310 #, c-format msgid "invalid number %s" msgstr "număr nevalid %s" -#: src/dd.c:1340 +#: src/dd.c:1348 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "" -#: src/dd.c:1342 +#: src/dd.c:1350 #, c-format msgid "cannot combine block and unblock" msgstr "block și unblock nu se pot combina" -#: src/dd.c:1344 +#: src/dd.c:1352 #, c-format msgid "cannot combine lcase and ucase" msgstr "lcase și ucase nu se pot combina" -#: src/dd.c:1346 +#: src/dd.c:1354 #, c-format msgid "cannot combine excl and nocreat" msgstr "excl și nocreat nu se pot combina" -#: src/dd.c:1349 +#: src/dd.c:1357 #, fuzzy, c-format msgid "cannot combine direct and nocache" msgstr "excl și nocreat nu se pot combina" -#: src/dd.c:1506 +#: src/dd.c:1514 #, 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:1593 +#: src/dd.c:1601 #, c-format msgid "%s: cannot skip" msgstr "%s: nu se poate sări" -#: src/dd.c:1595 src/dd.c:1614 src/dd.c:1675 +#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683 #, c-format msgid "%s: cannot seek" msgstr "%s: nu se poate căuta" -#: src/dd.c:1655 +#: src/dd.c:1663 #, c-format msgid "offset overflow while reading file %s" msgstr "" -#: src/dd.c:1667 +#: src/dd.c:1675 #, c-format msgid "warning: invalid file offset after failed read" msgstr "" -#: src/dd.c:1671 +#: src/dd.c:1679 #, c-format msgid "cannot work around kernel bug after all" msgstr "" -#: src/dd.c:1814 +#: src/dd.c:1822 #, c-format msgid "setting flags for %s" msgstr "se stabilesc fanioane pentru %s" -#: src/dd.c:1867 +#: src/dd.c:1875 #, c-format msgid "memory exhausted by input buffer of size %zu bytes (%s)" msgstr "" -#: src/dd.c:1881 +#: src/dd.c:1889 #, c-format msgid "memory exhausted by output buffer of size %zu bytes (%s)" msgstr "" -#: src/dd.c:1914 +#: src/dd.c:1922 #, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: nu se poate sări la decalajul specificat" -#: src/dd.c:2125 src/dd.c:2258 +#: src/dd.c:2133 #, c-format -msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" +msgid "failed to truncate to %<PRIdMAX> bytes in output file %s" msgstr "" -#: src/dd.c:2138 +#: src/dd.c:2146 #, c-format msgid "fdatasync failed for %s" msgstr "fdatasync eșuat pentru %s" -#: src/dd.c:2148 +#: src/dd.c:2156 #, c-format msgid "fsync failed for %s" msgstr "fsync eșuat pentru %s" -#: src/dd.c:2199 src/dd.c:2228 +#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165 #, c-format -msgid "opening %s" -msgstr "se deschide %s" +msgid "failed to open %s" +msgstr "eșec la deschiderea %s" -#: src/dd.c:2237 +#: src/dd.c:2246 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) " "blocks" msgstr "" -#: src/dd.c:2274 src/dd.c:2280 +#: src/dd.c:2267 +#, c-format +msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" +msgstr "" + +#: src/dd.c:2283 src/dd.c:2289 #, 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:54 src/expr.c:153 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:39 src/sleep.c:35 src/sort.c:66 +#: 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 msgid "Paul Eggert" msgstr "Paul Eggert" -#: src/df.c:140 +#: src/df.c:172 msgid "Filesystem" msgstr "Sistem de fișiere" -#: src/df.c:141 +#: src/df.c:175 msgid "Type" msgstr "Tip" -#: src/df.c:142 +#: src/df.c:178 src/df.c:542 msgid "blocks" msgstr "blocuri" -#: src/df.c:142 -msgid "Inodes" -msgstr "Inoduri" - -#: src/df.c:142 -msgid "Size" -msgstr "Dimens" - -#: src/df.c:143 +#: src/df.c:181 msgid "Used" msgstr "Utilizat" -#: src/df.c:143 -msgid "IUsed" -msgstr "IUtilizat" - -#: src/df.c:144 +#: src/df.c:184 msgid "Available" msgstr "Disponibil" -#: src/df.c:144 -msgid "IFree" -msgstr "ILiber" - -#: src/df.c:144 -msgid "Avail" -msgstr "Liber" - -#: src/df.c:145 +#: src/df.c:187 msgid "Use%" msgstr "Uz%" -#: src/df.c:145 +#: src/df.c:190 +msgid "Inodes" +msgstr "Inoduri" + +#: src/df.c:193 +msgid "IUsed" +msgstr "IUtilizat" + +#: src/df.c:196 +msgid "IFree" +msgstr "ILiber" + +#: src/df.c:199 msgid "IUse%" msgstr "IUz%" -#: src/df.c:145 +#: src/df.c:202 +msgid "Mounted on" +msgstr "Montat pe" + +#: src/df.c:383 +#, c-format +msgid "option --output: field '%s' unknown" +msgstr "" + +#: src/df.c:390 +#, 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 +msgid "Size" +msgstr "Dimens" + +#: src/df.c:414 src/df.c:451 +msgid "Avail" +msgstr "Liber" + +#: src/df.c:474 msgid "Capacity" msgstr "Capacitate" -#: src/df.c:146 -msgid "Mounted on" -msgstr "Montat pe" +#. 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 +#, c-format +msgid "%s-%s" +msgstr "" -#: src/df.c:847 +#: src/df.c:1210 +#, fuzzy msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" -"\n" msgstr "" "Arată informații despre sistemul de fișiere pe care rezidă fiecare FIȘIER\n" "sau implicit toate sistemele de fișiere.\n" "\n" -#: src/df.c:855 +#: src/df.c:1217 msgid "" " -a, --all include dummy file systems\n" " -B, --block-size=SIZE scale sizes by SIZE before printing them. E.g.,\n" @@ -3241,7 +3256,7 @@ msgid "" " -H, --si likewise, but use powers of 1000 not 1024\n" msgstr "" -#: src/df.c:865 +#: src/df.c:1227 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3250,8 +3265,11 @@ msgid "" "(default)\n" msgstr "" -#: src/df.c:872 +#: src/df.c:1234 msgid "" +" --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" +" or print all fields if FIELD_LIST is " +"omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" " -t, --type=TYPE limit listing to file systems of type TYPE\n" @@ -3260,20 +3278,42 @@ msgid "" " -v (ignored)\n" msgstr "" -#: src/df.c:1027 +#: src/df.c:1248 +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" +msgstr "" + +#: src/df.c:1285 +#, 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 #, c-format msgid "file system type %s both selected and excluded" msgstr "" -#: src/df.c:1075 +#: src/df.c:1500 msgid "Warning: " msgstr "Atenție: " -#: src/df.c:1077 src/stat.c:795 +#: src/df.c:1502 src/stat.c:814 msgid "cannot read table of mounted file systems" msgstr "tabelul sistemelor de fișiere montate nu poate fi citit" -#: src/df.c:1107 +#: src/df.c:1539 #, c-format msgid "no file systems processed" msgstr "niciun sistem de fișiere prelucrat" @@ -3363,7 +3403,7 @@ msgid "" " %s stdio.h -> \".\"\n" msgstr "" -#: src/du.c:260 src/sort.c:390 src/wc.c:112 +#: src/du.c:270 src/sort.c:394 src/wc.c:112 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3372,17 +3412,18 @@ msgstr "" "Utilizare: %s [OPȚIUNE]... [FIȘIER]...\n" " sau: %s [OPȚIUNE]... --files0-from=F\n" -#: src/du.c:264 -msgid "" -"Summarize disk usage of each FILE, recursively for directories.\n" -"\n" +#: src/du.c:274 +#, fuzzy +msgid "Summarize disk usage of each FILE, recursively for directories.\n" msgstr "" "Sumarizează utilizarea discului de către fiecare FIȘIER, recursiv pentru " "dosare.\n" "\n" -#: src/du.c:271 +#: src/du.c:280 msgid "" +" -0, --null end each output line with 0 byte rather than " +"newline\n" " -a, --all write counts for all files, not just directories\n" " --apparent-size print apparent sizes, rather than disk usage; " "although\n" @@ -3391,7 +3432,7 @@ msgid "" " fragmentation, indirect blocks, and the like\n" msgstr "" -#: src/du.c:279 +#: src/du.c:289 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" @@ -3400,9 +3441,14 @@ msgid "" " -c, --total produce a grand total\n" " -D, --dereference-args dereference only symlinks that are listed on the\n" " command line\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 "" -#: src/du.c:288 +#: src/du.c:302 msgid "" " --files0-from=F summarize disk usage of the NUL-terminated file\n" " names specified in file F;\n" @@ -3410,41 +3456,29 @@ msgid "" " -H equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" --si like -h, but use powers of 1000 not 1024\n" msgstr "" -#: src/du.c:297 +#: src/du.c:310 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 "" -#: src/du.c:302 +#: src/du.c:316 msgid "" -" -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " "default)\n" -" -0, --null end each output line with 0 byte rather than " -"newline\n" " -S, --separate-dirs 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:309 -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 "" - -#: src/du.c:318 +#: src/du.c:322 msgid "" +" -t, --threshold=SIZE exclude entries smaller than SIZE if positive,\n" +" or entries greater than SIZE if negative\n" " --time show time of the last modification of any file in " "the\n" " directory, or any of its subdirectories\n" @@ -3455,64 +3489,73 @@ msgid "" " FORMAT is interpreted like 'date'\n" msgstr "" -#: src/du.c:375 +#: src/du.c:333 +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 msgid "Infinity" msgstr "" -#: src/du.c:600 +#: src/du.c:507 +#, c-format +msgid "mount point %s already traversed" +msgstr "" + +#: src/du.c:624 #, fuzzy, c-format msgid "fts_read failed: %s" msgstr "fts_read a eșuat" -#: src/du.c:724 +#: src/du.c:780 #, c-format msgid "invalid maximum depth %s" msgstr "" -#: src/du.c:817 +#: src/du.c:809 +#, fuzzy, c-format +msgid "invalid --threshold argument '-0'" +msgstr "argument %s%s nevalid „%s”" + +#: src/du.c:887 #, c-format msgid "cannot both summarize and show all entries" msgstr "" -#: src/du.c:824 +#: src/du.c:894 #, c-format msgid "warning: summarizing is the same as using --max-depth=0" msgstr "" -#: src/du.c:830 +#: src/du.c:900 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "" -#: src/du.c:896 src/sort.c:4479 src/wc.c:668 +#: src/du.c:966 src/sort.c:4533 src/wc.c:668 msgid "file operands cannot be combined with --files0-from" msgstr "" -#: src/du.c:949 src/md5sum.c:587 src/od.c:903 src/tac.c:239 src/tac.c:350 -#: src/tac.c:506 src/tac.c:586 src/wc.c:733 +#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 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:963 src/sort.c:4508 src/wc.c:747 +#: src/du.c:1040 src/sort.c:4562 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:980 src/du.c:988 src/wc.c:760 src/wc.c:768 +#: src/du.c:1057 src/du.c:1065 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:1007 src/head.c:149 src/head.c:262 src/head.c:334 src/head.c:538 -#: src/head.c:620 src/head.c:692 src/head.c:750 src/head.c:774 src/tail.c:412 -#: src/tail.c:500 src/tail.c:549 src/tail.c:642 src/tail.c:770 src/tail.c:818 -#: src/tail.c:855 src/tail.c:1782 src/tail.c:1812 src/uniq.c:395 -#, c-format -msgid "error reading %s" -msgstr "eroare la citirea %s" - -#: src/du.c:1010 src/ls.c:2649 src/wc.c:791 +#: src/du.c:1088 src/ls.c:2649 src/wc.c:791 msgid "total" msgstr "total" @@ -3595,10 +3638,12 @@ msgid "Usage: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n" msgstr "Utilizare: %s [OPȚIUNE]... [-] [NUME=VALOARE]... [COMANDĂ [ARG]...]\n" #: src/env.c:55 +msgid "Set each NAME to VALUE in the environment and run COMMAND.\n" +msgstr "" + +#: src/env.c:61 #, fuzzy msgid "" -"Set each NAME to VALUE in the environment and run COMMAND.\n" -"\n" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with 0 byte rather than newline\n" " -u, --unset=NAME remove variable from the environment\n" @@ -3608,7 +3653,7 @@ msgstr "" " -i, --ignore-environment pornește cu un mediu gol\n" " -u, --unset=NAME elimină variabila din mediu\n" -#: src/env.c:64 +#: src/env.c:68 msgid "" "\n" "A mere - implies -i. If no COMMAND, print the resulting environment.\n" @@ -3616,60 +3661,62 @@ msgstr "" "\n" "Un simplu - implică -i. Fără COMANDĂ tipărește mediul rezultant.\n" -#: src/env.c:120 +#: src/env.c:124 #, fuzzy, c-format msgid "cannot unset %s" msgstr "nu se poate rula %s" -#: src/env.c:131 +#: src/env.c:135 #, fuzzy, c-format msgid "cannot set %s" msgstr "nu se poate face stat %s" -#: src/env.c:148 +#: src/env.c:152 #, c-format msgid "cannot specify --null (-0) with command" msgstr "" #: 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" -"\n" msgstr "" +"\n" +"Fără FIȘIER, sau cînd FIȘIER e -, citește intrarea standard.\n" -#: src/expand.c:115 +#: src/expand.c:114 msgid "" " -i, --initial do not convert tabs after non blanks\n" " -t, --tabs=NUMBER have tabs NUMBER characters apart, not 8\n" msgstr "" -#: src/expand.c:119 +#: src/expand.c:118 msgid "" " -t, --tabs=LIST use comma separated list of explicit tab positions\n" msgstr "" -#: src/expand.c:172 src/unexpand.c:191 +#: src/expand.c:171 src/unexpand.c:190 #, c-format msgid "tab stop is too large %s" msgstr "" -#: src/expand.c:180 src/unexpand.c:199 +#: src/expand.c:179 src/unexpand.c:198 #, c-format msgid "tab size contains invalid character(s): %s" msgstr "" -#: src/expand.c:206 src/unexpand.c:225 +#: src/expand.c:205 src/unexpand.c:224 #, c-format msgid "tab size cannot be 0" msgstr "" -#: src/expand.c:208 src/unexpand.c:227 +#: src/expand.c:207 src/unexpand.c:226 #, c-format msgid "tab sizes must be ascending" msgstr "" -#: src/expand.c:326 src/expand.c:345 src/unexpand.c:374 src/unexpand.c:419 +#: 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 "linie de intrare prea lungă" @@ -3783,12 +3830,12 @@ msgstr "" msgid "non-integer argument" msgstr "argument non-numeric" -#: src/expr.c:793 src/truncate.c:316 +#: src/expr.c:793 src/truncate.c:314 #, c-format msgid "division by zero" msgstr "împărțire la zero" -#: src/expr.c:887 src/sort.c:2029 +#: src/expr.c:887 src/sort.c:2044 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "stabiliți LC_ALL='C' pentru a evita problema" @@ -3798,25 +3845,32 @@ msgstr "stabiliți LC_ALL='C' pentru a evita problema" msgid "the strings compared were %s and %s" msgstr "șirurile comparate au fost %s și %s" -#: src/factor.c:449 -msgid "using arbitrary-precision arithmetic" +#. This is a proper name. See the gettext manual, section Names. +#: src/factor.c:111 +msgid "Niels Moller" msgstr "" -#: src/factor.c:460 -msgid "using single-precision arithmetic" +#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459 +#, c-format +msgid "Lucas prime test failure. This should not happen" msgstr "" -#: src/factor.c:465 src/od.c:1640 src/od.c:1709 +#: src/factor.c:2092 #, c-format -msgid "%s is too large" -msgstr "%s este prea mare" +msgid "squfof queue overflow" +msgstr "" -#: src/factor.c:469 +#: src/factor.c:2419 #, c-format msgid "%s is not a valid positive integer" msgstr "%s nu este un întreg pozitiv valid" -#: src/factor.c:494 +#: src/factor.c:2442 src/od.c:1646 src/od.c:1715 +#, c-format +msgid "%s is too large" +msgstr "%s este prea mare" + +#: src/factor.c:2454 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -3825,7 +3879,7 @@ msgstr "" "Utilizare: %s [NUMĂR]...\n" " sau: %s OPȚIUNE\n" -#: src/factor.c:499 +#: src/factor.c:2459 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" @@ -3849,20 +3903,19 @@ msgid "cannot stat current directory (now %s)" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/fmt.c:37 +#: src/fmt.c:38 msgid "Ross Paterson" msgstr "Ross Paterson" -#: src/fmt.c:269 +#: src/fmt.c:270 #, c-format msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n" msgstr "Utilizare: %s [-LĂȚIME] [OPȚIUNE]... [FIȘIER]...\n" -#: src/fmt.c:270 +#: 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" -"\n" msgstr "" #: src/fmt.c:278 @@ -3873,8 +3926,8 @@ msgid "" " -s, --split-only split long lines, but do not refill\n" msgstr "" -#: src/fmt.c:285 -#, c-format +#: src/fmt.c:287 +#, 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" @@ -3882,14 +3935,14 @@ msgid "" " -g, --goal=WIDTH goal width (default of 93% of width)\n" msgstr "" -#: src/fmt.c:357 +#: src/fmt.c:359 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" "option; use -w N instead" msgstr "" -#: src/fmt.c:403 src/fmt.c:414 +#: src/fmt.c:405 src/fmt.c:416 #, c-format msgid "invalid width: %s" msgstr "lățime nevalidă: %s" @@ -3898,23 +3951,22 @@ msgstr "lățime nevalidă: %s" msgid "" "Wrap input lines in each FILE (standard input by default), writing to\n" "standard output.\n" -"\n" msgstr "" -#: src/fold.c:78 +#: src/fold.c:77 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" " -w, --width=WIDTH use WIDTH columns instead of 80\n" msgstr "" -#: src/fold.c:289 src/pr.c:836 +#: src/fold.c:288 src/pr.c:832 #, c-format 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:75 +#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 #: src/truncate.c:37 msgid "Padraig Brady" msgstr "Padraig Brady" @@ -3930,17 +3982,17 @@ msgid "" "\n" msgstr "" -#: src/group-list.c:69 src/id.c:345 src/setuidgid.c:184 +#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184 #, 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:350 +#: src/group-list.c:74 src/id.c:370 #, c-format msgid "failed to get groups for the current process" msgstr "eșec la obținerea grupurilor pentru procesul curent" -#: src/group-list.c:104 +#: src/group-list.c:114 #, c-format msgid "cannot find name for group ID %lu" msgstr "" @@ -3982,10 +4034,9 @@ 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" -"\n" msgstr "" -#: src/head.c:118 +#: src/head.c:117 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -3995,13 +4046,13 @@ msgid "" " K lines of each file\n" msgstr "" -#: src/head.c:126 +#: 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 "" -#: src/head.c:132 +#: src/head.c:131 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -4009,58 +4060,58 @@ msgid "" "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n" msgstr "" -#: src/head.c:152 -#, c-format -msgid "error writing %s" -msgstr "eroare la scrierea %s" - -#: src/head.c:155 +#: src/head.c:154 #, c-format msgid "%s: file has shrunk too much" msgstr "" -#: src/head.c:228 src/head.c:1044 +#: src/head.c:227 src/head.c:1051 #, c-format msgid "%s: number of bytes is too large" msgstr "%s: numărul de octeți e prea mare" -#: src/head.c:441 +#: src/head.c:440 #, c-format msgid "%s: cannot lseek back to original position" msgstr "" -#: src/head.c:613 src/head.c:684 src/tail.c:450 +#: src/head.c:612 src/head.c:691 src/tail.c:449 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: nu se poate căuta la decalajul %s" -#: src/head.c:791 +#: src/head.c:673 +#, fuzzy, c-format +msgid "%s: failed to reset file pointer" +msgstr "%s: eșec la eliminare" + +#: src/head.c:798 #, c-format msgid "cannot reposition file pointer for %s" msgstr "" -#: src/head.c:878 +#: src/head.c:885 #, 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:879 +#: src/head.c:886 msgid "number of lines" msgstr "număr de linii" -#: src/head.c:879 +#: src/head.c:886 msgid "number of bytes" msgstr "număr de octeți" -#: src/head.c:886 src/tail.c:1947 +#: src/head.c:893 src/tail.c:1947 msgid "invalid number of lines" msgstr "număr de linii nevalid" -#: src/head.c:887 src/tail.c:1948 +#: src/head.c:894 src/tail.c:1948 msgid "invalid number of bytes" msgstr "număr de octeți nevalid" -#: src/head.c:974 src/head.c:1032 +#: src/head.c:981 src/head.c:1039 #, c-format msgid "invalid trailing option -- %c" msgstr "opțiune finală nevalidă -- %c" @@ -4164,86 +4215,86 @@ msgstr "contextul procesului nu poate fi obținut" msgid "cannot get effective UID" msgstr "%s nu poate fi dereferențiat" -#: src/id.c:289 +#: src/id.c:311 #, fuzzy, c-format -msgid "cannot find name for user ID %lu" +msgid "cannot find name for user ID %s" msgstr "numele nu poate fi stabilit la %s" -#: src/id.c:309 +#: src/id.c:329 #, fuzzy, c-format -msgid "uid=%lu" +msgid "uid=%s" msgstr "uid=%lu" -#: src/id.c:314 +#: src/id.c:334 #, fuzzy, c-format -msgid " gid=%lu" -msgstr " egid=%lu" +msgid " gid=%s" +msgstr " gid=%lu" -#: src/id.c:321 +#: src/id.c:341 #, fuzzy, c-format -msgid " euid=%lu" -msgstr " egid=%lu" +msgid " euid=%s" +msgstr " euid=%lu" -#: src/id.c:329 -#, c-format -msgid " egid=%lu" +#: src/id.c:349 +#, fuzzy, c-format +msgid " egid=%s" msgstr " egid=%lu" -#: src/id.c:357 +#: src/id.c:377 msgid " groups=" msgstr " grupuri=" -#: src/id.c:373 +#: src/id.c:393 #, c-format msgid " context=%s" msgstr " context=%s" -#: src/install.c:372 +#: src/install.c:373 #, c-format msgid "warning: %s: failed to change context to %s" msgstr "" -#: src/install.c:413 +#: src/install.c:414 #, c-format msgid "creating directory %s" msgstr "se creează dosarul %s" -#: src/install.c:481 +#: src/install.c:482 #, c-format msgid "cannot change ownership of %s" msgstr "apartenența %s nu poate fi schimbată" -#: src/install.c:505 +#: src/install.c:506 #, c-format msgid "cannot set time stamps for %s" msgstr "" -#: src/install.c:526 src/split.c:412 src/timeout.c:387 +#: src/install.c:527 src/split.c:426 src/timeout.c:439 #, c-format msgid "fork system call failed" msgstr "" -#: src/install.c:530 +#: src/install.c:531 #, c-format msgid "cannot run %s" msgstr "nu se poate rula %s" -#: src/install.c:534 +#: src/install.c:535 #, c-format msgid "waiting for strip" msgstr "" -#: src/install.c:536 +#: src/install.c:537 #, c-format msgid "strip process terminated abnormally" msgstr "" -#: src/install.c:557 +#: src/install.c:558 #, c-format msgid "invalid user %s" msgstr "utilizator nevalid %s" -#: src/install.c:593 +#: src/install.c:594 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -4252,7 +4303,7 @@ msgid "" " or: %s [OPTION]... -d DIRECTORY...\n" msgstr "" -#: src/install.c:600 +#: src/install.c:601 msgid "" "\n" "This install program copies files (often just compiled) into destination\n" @@ -4264,7 +4315,6 @@ msgid "" "In the first three forms, copy SOURCE to DEST or multiple SOURCE(s) to\n" "the existing DIRECTORY, while setting permission modes and owner/group.\n" "In the 4th form, create all components of the given DIRECTORY(ies).\n" -"\n" msgstr "" #: src/install.c:615 @@ -4312,53 +4362,53 @@ msgid "" "directories\n" msgstr "" -#: src/install.c:858 +#: src/install.c:859 #, c-format msgid "" "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled" msgstr "" -#: src/install.c:868 +#: src/install.c:869 #, c-format msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled" msgstr "" -#: src/install.c:885 +#: src/install.c:886 #, c-format msgid "the strip option may not be used when installing a directory" msgstr "" -#: src/install.c:888 +#: src/install.c:889 #, c-format msgid "target directory not allowed when installing a directory" msgstr "" -#: src/install.c:892 +#: src/install.c:893 #, c-format msgid "cannot force target context to %s and preserve it" msgstr "" -#: src/install.c:946 src/mkdir.c:202 src/stdbuf.c:327 +#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326 #, c-format msgid "invalid mode %s" msgstr "regim nevalid %s" -#: src/install.c:953 +#: src/install.c:954 #, c-format msgid "WARNING: ignoring --strip-program option as -s option was not specified" msgstr "" -#: src/install.c:958 +#: src/install.c:959 #, c-format msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive" msgstr "" -#: src/install.c:965 +#: src/install.c:966 #, c-format msgid "options --compare (-C) and --strip are mutually exclusive" msgstr "" -#: src/install.c:971 +#: src/install.c:972 #, c-format msgid "" "the --compare (-C) option is ignored when you specify a mode with non-" @@ -4366,7 +4416,7 @@ msgid "" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/join.c:40 src/sort.c:65 +#: src/join.c:40 src/sort.c:66 msgid "Mike Haertel" msgstr "Mike Haertel" @@ -4422,7 +4472,7 @@ msgstr "" #: src/join.c:403 #, c-format -msgid "%s:%ju: is not sorted: %.*s" +msgid "%s:%<PRIuMAX>: is not sorted: %.*s" msgstr "" #: src/join.c:840 src/join.c:1038 @@ -4450,12 +4500,12 @@ msgstr "" msgid "conflicting empty-field replacement strings" msgstr "" -#: src/join.c:1101 src/sort.c:4414 +#: src/join.c:1101 src/sort.c:4468 #, c-format msgid "multi-character tab %s" msgstr "" -#: src/join.c:1105 src/sort.c:4419 +#: src/join.c:1105 src/sort.c:4473 #, c-format msgid "incompatible tabs" msgstr "" @@ -4477,14 +4527,13 @@ msgstr "" " sau: %s -t [SEMNAL]...\n" #: src/kill.c:82 -msgid "" -"Send signals to processes, or list signals.\n" -"\n" +#, fuzzy +msgid "Send signals to processes, or list signals.\n" msgstr "" "Trimite semnale către procese sau enumeră semnalele.\n" "\n" -#: src/kill.c:89 +#: src/kill.c:88 msgid "" " -s, --signal=SIGNAL, -SIGNAL\n" " specify the name or number of the signal to be sent\n" @@ -4493,7 +4542,7 @@ msgid "" " -t, --table print a table of signal information\n" msgstr "" -#: src/kill.c:97 +#: src/kill.c:96 msgid "" "\n" "SIGNAL may be a signal name like 'HUP', or a signal number like '1',\n" @@ -4501,32 +4550,32 @@ msgid "" "PID is an integer; if negative it identifies a process group.\n" msgstr "" -#: src/kill.c:206 +#: src/kill.c:205 #, c-format msgid "%s: invalid process id" msgstr "%s: identificator de proces nevalid" -#: src/kill.c:260 +#: src/kill.c:259 #, c-format msgid "invalid option -- %c" msgstr "opțiune nevalidă -- %c" -#: src/kill.c:269 +#: src/kill.c:268 #, c-format msgid "%s: multiple signals specified" msgstr "%s: semnale multiple specificate" -#: src/kill.c:283 +#: src/kill.c:282 #, c-format msgid "multiple -l or -t options specified" msgstr "multiple opțiuni -l sau -t specificate" -#: src/kill.c:300 +#: src/kill.c:299 #, c-format msgid "cannot combine signal with -l or -t" msgstr "semnalul nu se poate combina cu -l sau -t" -#: src/kill.c:306 +#: src/kill.c:305 #, c-format msgid "no process ID specified" msgstr "niciun identificator de proces specificat" @@ -4630,10 +4679,9 @@ msgid "" "When creating hard links, each TARGET must exist. Symbolic links\n" "can hold arbitrary text; if later resolved, a relative link is\n" "interpreted in relation to its parent directory.\n" -"\n" msgstr "" -#: src/ln.c:395 +#: src/ln.c:394 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -4646,7 +4694,7 @@ msgid "" " -f, --force remove existing destination files\n" msgstr "" -#: src/ln.c:403 +#: src/ln.c:402 msgid "" " -i, --interactive prompt whether to remove destinations\n" " -L, --logical dereference TARGETs that are symbolic links\n" @@ -4658,7 +4706,7 @@ msgid "" " -s, --symbolic make symbolic links instead of hard links\n" msgstr "" -#: src/ln.c:412 +#: src/ln.c:411 msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" " -t, --target-directory=DIRECTORY specify the DIRECTORY in which to " @@ -4668,18 +4716,10 @@ msgid "" " -v, --verbose print name of each linked file\n" msgstr "" -#: src/ln.c:428 -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 "" - -#: src/ln.c:435 +#: src/ln.c:433 #, 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 "" @@ -4750,7 +4790,7 @@ msgstr "" msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "" -#: src/ls.c:1750 src/ptx.c:1976 +#: src/ls.c:1750 src/ptx.c:1975 #, c-format msgid "invalid line width: %s" msgstr "lățime linie nevalidă: %s" @@ -4814,7 +4854,7 @@ msgstr "se citește dosarul %s" msgid "closing directory %s" msgstr "se închide dosarul %s" -#: src/ls.c:3301 +#: src/ls.c:3302 #, c-format msgid "cannot compare file names %s and %s" msgstr "denumirile de fișier %s și %s nu se pot compara" @@ -4823,10 +4863,9 @@ msgstr "denumirile de fișier %s și %s nu se pot compara" msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" -"\n" msgstr "" -#: src/ls.c:4729 +#: src/ls.c:4728 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -4835,7 +4874,7 @@ msgid "" "characters\n" msgstr "" -#: src/ls.c:4735 +#: src/ls.c:4734 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them. E." "g.,\n" @@ -4849,7 +4888,7 @@ msgid "" " otherwise: sort by ctime, newest first\n" msgstr "" -#: src/ls.c:4745 +#: src/ls.c:4744 msgid "" " -C list entries by columns\n" " --color[=WHEN] colorize the output. WHEN defaults to " @@ -4861,7 +4900,7 @@ msgid "" " -D, --dired generate output designed for Emacs' dired mode\n" msgstr "" -#: src/ls.c:4753 +#: src/ls.c:4752 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -4871,11 +4910,11 @@ msgid "" " --full-time like -l --time-style=full-iso\n" msgstr "" -#: src/ls.c:4761 +#: src/ls.c:4760 msgid " -g like -l, but do not list owner\n" msgstr "" -#: src/ls.c:4764 +#: src/ls.c:4763 msgid "" " --group-directories-first\n" " group directories before files.\n" @@ -4883,7 +4922,7 @@ msgid "" " use of --sort=none (-U) disables grouping\n" msgstr "" -#: src/ls.c:4770 +#: src/ls.c:4769 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" @@ -4891,7 +4930,7 @@ msgid "" " --si likewise, but use powers of 1000 not 1024\n" msgstr "" -#: src/ls.c:4776 +#: src/ls.c:4775 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -4904,7 +4943,7 @@ msgid "" " (overridden by -a or -A)\n" msgstr "" -#: src/ls.c:4786 +#: src/ls.c:4785 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -4916,7 +4955,7 @@ msgid "" " -k, --kibibytes use 1024-byte blocks\n" msgstr "" -#: src/ls.c:4796 +#: src/ls.c:4795 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -4926,7 +4965,7 @@ msgid "" "entries\n" msgstr "" -#: src/ls.c:4804 +#: src/ls.c:4803 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. " @@ -4937,7 +4976,7 @@ msgid "" " append / indicator to directories\n" msgstr "" -#: src/ls.c:4812 +#: src/ls.c:4811 msgid "" " -q, --hide-control-chars print ? instead of non graphic characters\n" " --show-control-chars show non graphic characters as-is (default\n" @@ -4949,7 +4988,7 @@ msgid "" "escape\n" msgstr "" -#: src/ls.c:4821 +#: src/ls.c:4820 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -4957,7 +4996,7 @@ msgid "" "blocks\n" msgstr "" -#: src/ls.c:4826 +#: src/ls.c:4825 msgid "" " -S sort by file size\n" " --sort=WORD sort by WORD instead of name: none -U,\n" @@ -4969,7 +5008,7 @@ msgid "" " if --sort=time\n" msgstr "" -#: src/ls.c:4836 +#: src/ls.c:4835 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, +FORMAT.\n" @@ -4981,13 +5020,13 @@ msgid "" " takes effect only outside the POSIX locale\n" msgstr "" -#: src/ls.c:4845 +#: src/ls.c:4844 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:4849 +#: src/ls.c:4848 msgid "" " -u with -lt: sort by, and show, access time\n" " with -l: show access time and sort by name\n" @@ -4996,7 +5035,7 @@ msgid "" " -v natural sort of (version) numbers within text\n" msgstr "" -#: src/ls.c:4856 +#: src/ls.c:4855 msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" @@ -5006,7 +5045,7 @@ msgid "" " -1 list one file per line\n" msgstr "" -#: src/ls.c:4866 +#: src/ls.c:4865 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5015,7 +5054,7 @@ msgid "" "variable can change the settings. Use the dircolors command to set it.\n" msgstr "" -#: src/ls.c:4873 +#: src/ls.c:4872 msgid "" "\n" "Exit status:\n" @@ -5039,7 +5078,7 @@ msgstr "Scott Miller" msgid "David Madore" msgstr "David Madore" -#: src/md5sum.c:162 +#: src/md5sum.c:164 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -5048,35 +5087,39 @@ msgid "" "\n" msgstr "" -#: src/md5sum.c:172 +#: src/md5sum.c:174 #, fuzzy msgid "" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr " -t, --text citește în regim textual (implicit)\n" -#: src/md5sum.c:176 +#: src/md5sum.c:178 #, fuzzy msgid " -b, --binary read in binary mode\n" msgstr " -t, --text citește în regim textual (implicit)\n" -#: src/md5sum.c:179 +#: src/md5sum.c:181 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr "" -#: src/md5sum.c:183 +#: src/md5sum.c:184 +msgid " --tag create a BSD-style checksum\n" +msgstr "" + +#: src/md5sum.c:188 #, fuzzy msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr " -t, --text citește în regim textual (implicit)\n" -#: src/md5sum.c:187 +#: src/md5sum.c:192 #, fuzzy msgid " -t, --text read in text mode (default)\n" msgstr " -t, --text citește în regim textual (implicit)\n" -#: src/md5sum.c:190 +#: src/md5sum.c:195 msgid "" "\n" "The following three options are useful only when verifying checksums:\n" @@ -5086,12 +5129,12 @@ msgid "" "\n" msgstr "" -#: src/md5sum.c:198 +#: src/md5sum.c:203 msgid "" " --strict with --check, exit non-zero for any invalid input\n" msgstr "" -#: src/md5sum.c:203 +#: src/md5sum.c:208 #, c-format msgid "" "\n" @@ -5101,35 +5144,35 @@ msgid "" "space for text), and name for each FILE.\n" msgstr "" -#: src/md5sum.c:502 +#: src/md5sum.c:523 #, c-format msgid "%s: too many checksum lines" msgstr "" -#: src/md5sum.c:526 +#: src/md5sum.c:547 #, c-format msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line" msgstr "" -#: src/md5sum.c:551 +#: src/md5sum.c:572 #, c-format msgid "%s: FAILED open or read\n" msgstr "" -#: src/md5sum.c:574 +#: src/md5sum.c:595 msgid "FAILED" msgstr "EȘUAT" -#: src/md5sum.c:576 +#: src/md5sum.c:597 msgid "OK" msgstr "OK" -#: src/md5sum.c:600 +#: src/md5sum.c:621 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "" -#: src/md5sum.c:610 +#: src/md5sum.c:631 #, c-format msgid "WARNING: %<PRIuMAX> line is improperly formatted" msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted" @@ -5137,7 +5180,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/md5sum.c:618 +#: src/md5sum.c:639 #, c-format msgid "WARNING: %<PRIuMAX> listed file could not be read" msgid_plural "WARNING: %<PRIuMAX> listed files could not be read" @@ -5145,7 +5188,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/md5sum.c:626 +#: src/md5sum.c:647 #, c-format msgid "WARNING: %<PRIuMAX> computed checksum did NOT match" msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match" @@ -5153,28 +5196,38 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/md5sum.c:704 +#: src/md5sum.c:760 +#, c-format +msgid "--tag does not support --text mode" +msgstr "" + +#: src/md5sum.c:766 +#, c-format +msgid "the --tag option is meaningless when verifying checksums" +msgstr "" + +#: src/md5sum.c:773 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" msgstr "" -#: src/md5sum.c:712 +#: src/md5sum.c:781 #, c-format msgid "the --status option is meaningful only when verifying checksums" msgstr "" -#: src/md5sum.c:719 +#: src/md5sum.c:788 #, c-format msgid "the --warn option is meaningful only when verifying checksums" msgstr "" -#: src/md5sum.c:726 +#: src/md5sum.c:795 #, c-format msgid "the --quiet option is meaningful only when verifying checksums" msgstr "" -#: src/md5sum.c:733 +#: src/md5sum.c:802 #, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "" @@ -5185,14 +5238,13 @@ msgid "Usage: %s [OPTION]... DIRECTORY...\n" msgstr "Utilizare: %s [OPȚIUNE]... DOSAR...\n" #: src/mkdir.c:57 -msgid "" -"Create the DIRECTORY(ies), if they do not already exist.\n" -"\n" +#, 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:64 +#: src/mkdir.c:63 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" @@ -5201,7 +5253,7 @@ msgid "" " directory to CTX\n" msgstr "" -#: src/mkdir.c:169 +#: src/mkdir.c:168 #, c-format msgid "created directory %s" msgstr "creat dosarul %s" @@ -5212,27 +5264,25 @@ msgid "Usage: %s [OPTION]... NAME...\n" msgstr "Utilizare: %s [OPȚIUNE]... DENUMIRE...\n" #: src/mkfifo.c:52 -msgid "" -"Create named pipes (FIFOs) with the given NAMEs.\n" -"\n" +msgid "Create named pipes (FIFOs) with the given NAMEs.\n" msgstr "" -#: src/mkfifo.c:59 src/mknod.c:61 +#: src/mkfifo.c:58 src/mknod.c:60 msgid "" " -m, --mode=MODE set file permission bits to MODE, not a=rw - umask\n" msgstr "" -#: src/mkfifo.c:62 +#: src/mkfifo.c:61 msgid "" " -Z, --context=CTX set the SELinux security context of each NAME to CTX\n" msgstr "" -#: src/mkfifo.c:122 src/mknod.c:128 +#: src/mkfifo.c:121 src/mknod.c:127 #, c-format msgid "invalid mode" msgstr "regim nevalid" -#: src/mkfifo.c:127 src/mknod.c:133 +#: src/mkfifo.c:126 src/mknod.c:132 #, c-format msgid "mode must specify only file permission bits" msgstr "" @@ -5243,18 +5293,17 @@ msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n" msgstr "Utilizare: %s [OPȚIUNE]... DENUMIRE TIP [MAJOR MINOR]\n" #: src/mknod.c:54 -msgid "" -"Create the special file NAME of the given TYPE.\n" -"\n" +#, 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:64 +#: src/mknod.c:63 msgid " -Z, --context=CTX set the SELinux security context of NAME to CTX\n" msgstr "" -#: src/mknod.c:69 +#: src/mknod.c:68 msgid "" "\n" "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n" @@ -5263,7 +5312,7 @@ msgid "" "otherwise, as decimal. TYPE may be:\n" msgstr "" -#: src/mknod.c:76 +#: src/mknod.c:75 msgid "" "\n" " b create a block (buffered) special file\n" @@ -5271,40 +5320,40 @@ msgid "" " p create a FIFO\n" msgstr "" -#: src/mknod.c:151 +#: src/mknod.c:150 msgid "Special files require major and minor device numbers." msgstr "Fișierele speciale necesită numere de dispozitiv majore și minore." -#: src/mknod.c:161 +#: src/mknod.c:160 msgid "Fifos do not have major and minor device numbers." msgstr "" -#: src/mknod.c:177 +#: src/mknod.c:176 #, c-format msgid "block special files not supported" msgstr "" -#: src/mknod.c:186 +#: src/mknod.c:185 #, c-format msgid "character special files not supported" msgstr "" -#: src/mknod.c:202 +#: src/mknod.c:201 #, c-format msgid "invalid major device number %s" msgstr "" -#: src/mknod.c:207 +#: src/mknod.c:206 #, c-format msgid "invalid minor device number %s" msgstr "" -#: src/mknod.c:212 +#: src/mknod.c:211 #, c-format msgid "invalid device %s %s" msgstr "dispozitiv nevalid %s %s" -#: src/mknod.c:226 +#: src/mknod.c:225 #, c-format msgid "invalid device type %s" msgstr "tip de dispozitiv nevalid %s" @@ -5363,60 +5412,59 @@ msgid "" " directory specified via -p; else /tmp [deprecated]\n" msgstr "" -#: src/mktemp.c:222 +#: 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:228 +#: src/mktemp.c:229 #, c-format msgid "too many templates" msgstr "prea multe șabloane" -#: src/mktemp.c:248 +#: src/mktemp.c:249 #, c-format msgid "with --suffix, template %s must end in X" msgstr "" -#: src/mktemp.c:273 src/split.c:1117 +#: src/mktemp.c:274 src/split.c:1130 #, fuzzy, c-format msgid "invalid suffix %s, contains directory separator" msgstr "șablonul nevalid, %s, conține separator de dosare" -#: src/mktemp.c:278 +#: src/mktemp.c:279 #, c-format msgid "too few X's in template %s" msgstr "prea puțini X în șablonul %s" -#: src/mktemp.c:291 +#: src/mktemp.c:292 #, c-format msgid "invalid template, %s, contains directory separator" msgstr "șablonul nevalid, %s, conține separator de dosare" -#: src/mktemp.c:305 +#: src/mktemp.c:306 #, 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:325 +#: src/mktemp.c:326 #, c-format msgid "failed to create directory via template %s" msgstr "eșec la crearea dosarului prin șablonul %s" -#: src/mktemp.c:335 +#: src/mktemp.c:336 #, c-format msgid "failed to create file via template %s" msgstr "eșec la crearea fișierului prin șablonul %s" -#: src/mv.c:290 -msgid "" -"Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" -"\n" +#: src/mv.c:292 +#, 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:297 +#: src/mv.c:298 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -5429,7 +5477,7 @@ msgid "" "effect.\n" msgstr "" -#: src/mv.c:306 +#: src/mv.c:307 msgid "" " --strip-trailing-slashes remove any trailing slashes from each " "SOURCE\n" @@ -5437,7 +5485,7 @@ msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" msgstr "" -#: src/mv.c:311 +#: src/mv.c:312 msgid "" " -t, --target-directory=DIRECTORY move all SOURCE arguments into " "DIRECTORY\n" @@ -5457,28 +5505,30 @@ msgstr "Utilizare: %s [OPȚIUNE] [COMANDĂ [ARG]...]\n" #, c-format msgid "" "Run COMMAND with an adjusted niceness, which affects process scheduling.\n" -"With no COMMAND, print the current niceness. Nicenesses range from\n" -"%d (most favorable scheduling) to %d (least favorable).\n" -"\n" -" -n, --adjustment=N add integer N to the niceness (default 10)\n" +"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 "" + +#: src/nice.c:82 +msgid " -n, --adjustment=N add integer N to the niceness (default 10)\n" msgstr "" -#: src/nice.c:168 +#: src/nice.c:172 #, c-format msgid "invalid adjustment %s" msgstr "ajustare nevalidă %s" -#: src/nice.c:177 +#: src/nice.c:181 #, c-format msgid "a command must be given with an adjustment" msgstr "o comandă trebuie dată cu o ajustare" -#: src/nice.c:184 src/nice.c:195 +#: src/nice.c:188 src/nice.c:199 #, c-format msgid "cannot get niceness" msgstr "" -#: src/nice.c:201 +#: src/nice.c:205 #, c-format msgid "cannot set niceness" msgstr "" @@ -5488,21 +5538,23 @@ msgstr "" msgid "Scott Bartram" msgstr "Scott Bartram" -#: src/nl.c:186 +#: 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" -"\n" msgstr "" +"\n" +"Fără FIȘIER, sau cînd FIȘIER e -, citește intrarea standard.\n" -#: src/nl.c:194 +#: src/nl.c:186 msgid "" " -b, --body-numbering=STYLE use STYLE for numbering body lines\n" " -d, --section-delimiter=CC use CC for separating logical pages\n" " -f, --footer-numbering=STYLE use STYLE for numbering footer lines\n" msgstr "" -#: src/nl.c:199 +#: src/nl.c:191 msgid "" " -h, --header-numbering=STYLE use STYLE for numbering header lines\n" " -i, --line-increment=NUMBER line number increment at each line\n" @@ -5514,13 +5566,13 @@ msgid "" " -s, --number-separator=STRING add STRING after (possible) line number\n" msgstr "" -#: src/nl.c:207 +#: src/nl.c:199 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 "" -#: src/nl.c:213 +#: src/nl.c:205 msgid "" "\n" "By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC are\n" @@ -5528,7 +5580,7 @@ msgid "" "second character implies :. Type \\\\ for \\. STYLE is one of:\n" msgstr "" -#: src/nl.c:219 +#: src/nl.c:211 msgid "" "\n" " a number all lines\n" @@ -5545,53 +5597,47 @@ msgid "" "\n" msgstr "" -#: src/nl.c:286 +#: src/nl.c:278 #, c-format msgid "line number overflow" msgstr "" -#: src/nl.c:486 +#: src/nl.c:478 #, c-format msgid "invalid header numbering style: %s" msgstr "stil nevalid de numerotare colontitlu: %s" -#: src/nl.c:494 +#: src/nl.c:486 #, c-format msgid "invalid body numbering style: %s" msgstr "stil nevalid de numerotare corp: %s" -#: src/nl.c:502 +#: src/nl.c:494 #, c-format msgid "invalid footer numbering style: %s" msgstr "stil nevalid de numerotare coloncifru: %s" -#: src/nl.c:511 +#: src/nl.c:503 #, c-format msgid "invalid starting line number: %s" msgstr "număr nevalid de linie inițială: %s" -#: src/nl.c:517 -#, c-format -msgid "WARNING: --page-increment is deprecated; use --line-increment instead" -msgstr "" -"ATENȚIE: --page-increment este învechit; utilizați --line-increment în schimb" - -#: src/nl.c:524 +#: src/nl.c:512 #, c-format msgid "invalid line number increment: %s" msgstr "" -#: src/nl.c:536 +#: src/nl.c:524 #, c-format msgid "invalid number of blank lines: %s" msgstr "număr nevalid de linii goale: %s" -#: src/nl.c:550 +#: src/nl.c:538 #, c-format msgid "invalid line number field width: %s" msgstr "" -#: src/nl.c:569 +#: src/nl.c:557 #, c-format msgid "invalid line numbering format: %s" msgstr "format nevalid de numerotare linii: %s" @@ -5632,11 +5678,6 @@ msgstr "redirijarea ieșirii standard a eșuat" msgid "ignoring input" msgstr "se ignoră intrarea" -#: src/nohup.c:163 src/nohup.c:165 -#, c-format -msgid "failed to open %s" -msgstr "eșec la deschiderea %s" - #: src/nohup.c:175 #, c-format msgid "ignoring input and appending output to %s" @@ -5668,33 +5709,367 @@ msgid "failed to redirect standard error" msgstr "redirijarea ieșirii standard a eșuat" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:32 +#: src/nproc.c:33 msgid "Giuseppe Scrivano" msgstr "" -#: src/nproc.c:56 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 +#: src/nproc.c:57 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Utilizare: %s [OPȚIUNE]...\n" -#: src/nproc.c:57 +#: src/nproc.c:58 msgid "" "Print the number of processing units available to the current process,\n" "which may be less than the number of online processors\n" "\n" msgstr "" -#: src/nproc.c:62 +#: src/nproc.c:63 msgid "" " --all print the number of installed processors\n" " --ignore=N if possible, exclude N processing units\n" msgstr "" -#: src/nproc.c:106 +#: src/nproc.c:107 #, fuzzy, c-format 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 +msgid "Assaf Gordon" +msgstr "" + +#: src/numfmt.c:676 +#, c-format +msgid "value too large to be converted: '%s'" +msgstr "" + +#: src/numfmt.c:680 +#, fuzzy, c-format +msgid "invalid number: '%s'" +msgstr "număr nevalid %s" + +#: src/numfmt.c:684 +#, c-format +msgid "rejecting suffix in input: '%s' (consider using --from)" +msgstr "" + +#: src/numfmt.c:688 +#, fuzzy, c-format +msgid "invalid suffix in input: '%s'" +msgstr "lățime linie nevalidă: %s" + +#: src/numfmt.c:692 +#, c-format +msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)" +msgstr "" + +#: src/numfmt.c:723 +#, fuzzy, c-format +msgid "failed to prepare value '%Lf' for printing" +msgstr "%s: eșec la deschiderea pentru scriere" + +#: src/numfmt.c:787 +#, fuzzy, c-format +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 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [NUMBER]...\n" +msgstr "Utilizare: %s [OPȚIUNE]... [UTILIZATOR]...\n" + +#: src/numfmt.c:816 +msgid "" +"Reformat NUMBER(s), or the numbers from standard input if none are " +"specified.\n" +msgstr "" + +#: src/numfmt.c:820 +msgid " --debug print warnings about invalid input\n" +msgstr "" + +#: src/numfmt.c:823 +msgid "" +" -d, --delimiter=X use X instead of whitespace for field delimiter\n" +msgstr "" + +#: src/numfmt.c:826 +msgid "" +" --field=N replace the number in input field N (default is 1)\n" +msgstr "" + +#: src/numfmt.c:829 +msgid "" +" --format=FORMAT use printf style floating-point FORMAT;\n" +" see FORMAT below for details\n" +msgstr "" + +#: src/numfmt.c:833 +msgid "" +" --from=UNIT auto-scale input numbers to UNITs; default is " +"'none';\n" +" see UNIT below\n" +msgstr "" + +#: src/numfmt.c:837 +msgid "" +" --from-unit=N specify the input unit size (instead of the default " +"1)\n" +msgstr "" + +#: src/numfmt.c:840 +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 "" + +#: src/numfmt.c:844 +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 +msgid "" +" --invalid=MODE failure mode for invalid numbers: MODE can be:\n" +" abort (default), fail, warn, ignore\n" +msgstr "" + +#: src/numfmt.c:852 +msgid "" +" --padding=N pad the output to N characters; positive N will\n" +" right-align; negative N will left-align;\n" +" padding is ignored if the output is wider than N;\n" +" the default is to automatically pad if a " +"whitespace\n" +" is found\n" +msgstr "" + +#: src/numfmt.c:859 +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 +msgid "" +" --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" +" SUFFIX in input numbers\n" +msgstr "" + +#: src/numfmt.c:867 +msgid "" +" --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" +msgstr "" + +#: src/numfmt.c:870 +msgid "" +" --to-unit=N the output unit size (instead of the default 1)\n" +msgstr "" + +#: src/numfmt.c:877 +msgid "" +"\n" +"UNIT options:\n" +msgstr "" + +#: src/numfmt.c:880 +msgid " none no auto-scaling is done; suffixes will trigger an error\n" +msgstr "" + +#: src/numfmt.c:883 +msgid "" +" auto accept optional single/two letter suffix:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" +msgstr "" + +#: src/numfmt.c:889 +msgid "" +" si accept optional single letter suffix:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:894 +msgid "" +" iec accept optional single letter suffix:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:899 +msgid "" +" iec-i accept optional two-letter suffix:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:905 +#, 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" +msgstr "" + +#: src/numfmt.c:912 +#, c-format +msgid "" +"\n" +"Exit status is 0 if all input numbers were successfully converted.\n" +"By default, %s will stop at the first conversion error with exit status 2.\n" +"With --invalid='fail' a warning is printed for each conversion error\n" +"and the exit status is 2. With --invalid='warn' each conversion error is\n" +"diagnosed, but the exit status is 0. With --invalid='ignore' conversion\n" +"errors are not diagnosed and the exit status is 0.\n" +msgstr "" + +#: src/numfmt.c:921 +#, c-format +msgid "" +"\n" +"Examples:\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" +msgstr "" + +#: src/numfmt.c:974 src/seq.c:212 +#, c-format +msgid "format %s has no %% directive" +msgstr "" + +#: src/numfmt.c:990 +#, fuzzy, c-format +msgid "invalid format %s (width overflow)" +msgstr "lățime nevalidă a formatului" + +#: src/numfmt.c:1007 src/seq.c:229 +#, c-format +msgid "format %s ends in %%" +msgstr "" + +#: src/numfmt.c:1010 +#, c-format +msgid "invalid format %s, directive must be %%['][-][N]f" +msgstr "" + +#: src/numfmt.c:1018 src/seq.c:236 +#, 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 "lățime linie nevalidă: %s" + +#: src/numfmt.c:1092 +#, c-format +msgid "value too large to be printed: '%Lg' (consider using --to)" +msgstr "" + +#: src/numfmt.c:1100 +#, c-format +msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" +msgstr "" + +#: src/numfmt.c:1184 +#, c-format +msgid "large input value '%s': possible precision loss" +msgstr "" + +#: src/numfmt.c:1293 +#, 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 "interval de pagini nevalid %s" + +#: src/numfmt.c:1401 +#, fuzzy, c-format +msgid "invalid field value '%s'" +msgstr "număr de cîmp nevalid: %s" + +#: src/numfmt.c:1430 +#, fuzzy, c-format +msgid "invalid header value '%s'" +msgstr "dată nevalidă %s" + +#: src/numfmt.c:1456 +#, 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 +#, fuzzy, c-format +msgid "no conversion option specified" +msgstr "niciun identificator de proces specificat" + +#: src/numfmt.c:1471 +#, fuzzy, c-format +msgid "grouping cannot be combined with --to" +msgstr "semnalul nu se poate combina cu -l sau -t" + +#: src/numfmt.c:1473 +#, c-format +msgid "grouping has no effect in this locale" +msgstr "" + +#: src/numfmt.c:1486 +#, c-format +msgid "--header ignored with command-line input" +msgstr "" + +#: src/numfmt.c:1511 +#, fuzzy, c-format +msgid "error reading input" +msgstr "eroare la citirea %s" + +#: src/numfmt.c:1520 +#, fuzzy, c-format +msgid "failed to convert some of the input numbers" +msgstr "redirijarea ieșirii standard a eșuat" + #: src/od.c:294 #, c-format msgid "" @@ -5719,31 +6094,39 @@ msgid "" msgstr "" #: src/od.c:307 -msgid "All arguments to long options are mandatory for short options.\n" +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" +"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" +"at first byte printed, incremented when dump is progressing.\n" +"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 "" -"Toate argumentele obligatorii pentru opțiuni lungi sînt obligatorii pentru " -"opțiuni scurte\n" -#: src/od.c:310 +#: src/od.c:318 msgid "" -" -A, --address-radix=RADIX decide how file offsets are printed\n" +" -A, --address-radix=RADIX output format for file offsets. RADIX is one\n" +" of [doxn], for Decimal, Octal, Hex or None\n" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" -#: src/od.c:314 +#: src/od.c:323 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" -" --traditional accept arguments in traditional form\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:324 +#: src/od.c:336 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" @@ -5751,7 +6134,7 @@ msgid "" " -d same as -t u2, select unsigned decimal 2-byte units\n" msgstr "" -#: src/od.c:332 +#: src/od.c:345 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -5761,27 +6144,16 @@ msgid "" " -x same as -t x2, select hexadecimal 2-byte units\n" msgstr "" -#: src/od.c:340 +#: src/od.c:353 msgid "" "\n" -"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" -"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" -"at first byte printed, incremented when dump is progressing.\n" -"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 "" - -#: src/od.c:349 -msgid "" "\n" "TYPE is made up of one or more of these specifications:\n" -"\n" " a named character, ignoring high-order bit\n" " c ASCII character or backslash escape\n" msgstr "" -#: src/od.c:356 +#: src/od.c:360 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -5790,83 +6162,84 @@ msgid "" " x[SIZE] hexadecimal, SIZE bytes per integer\n" msgstr "" -#: src/od.c:363 +#: src/od.c:367 msgid "" "\n" -"SIZE is a number. For TYPE in doux, SIZE may also be C for\n" +"SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" "sizeof(char), S for sizeof(short), I for sizeof(int) or L for\n" "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 "" -#: src/od.c:370 +#: src/od.c:374 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" +"Adding a z suffix to any type displays printable characters at the end of\n" +"each output line.\n" msgstr "" -#: src/od.c:380 +#: src/od.c:379 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" +"\n" +"BYTES is hex with 0x or 0X prefix, and may have a multiplier suffix:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"and so on for G, T, P, E, Z, Y.\n" msgstr "" -#: src/od.c:633 src/od.c:753 +#: src/od.c:639 src/od.c:759 #, c-format msgid "invalid type string %s" msgstr "" -#: src/od.c:643 +#: src/od.c:649 #, c-format msgid "" "invalid type string %s;\n" "this system doesn't provide a %lu-byte integral type" msgstr "" -#: src/od.c:764 +#: src/od.c:770 #, c-format msgid "" "invalid type string %s;\n" "this system doesn't provide a %lu-byte floating point type" msgstr "" -#: src/od.c:822 +#: src/od.c:828 #, fuzzy, c-format msgid "invalid character '%c' in type string %s" msgstr "caracter neportabil %s în denumirea de fișier %s" -#: src/od.c:1047 +#: src/od.c:1053 #, c-format msgid "cannot skip past end of combined input" msgstr "" -#: src/od.c:1603 +#: src/od.c:1609 #, c-format msgid "invalid output address radix '%c'; it must be one character from [doxn]" msgstr "" -#: src/od.c:1729 +#: src/od.c:1735 #, c-format msgid "no type may be specified when dumping strings" msgstr "" -#: src/od.c:1804 +#: src/od.c:1810 msgid "compatibility mode supports at most one file" msgstr "regimul de compatibilitate susține cel mult un fișier" -#: src/od.c:1825 +#: src/od.c:1831 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "skip-bytes + read-bytes este prea mare" -#: src/od.c:1868 +#: src/od.c:1874 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "atenție: lățime nevalidă %lu; se utilizează %d în loc" @@ -5886,16 +6259,15 @@ 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" -"\n" msgstr "" -#: src/paste.c:448 +#: 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 "" -#: src/paste.c:509 +#: src/paste.c:508 #, c-format msgid "delimiter list ends with an unescaped backslash: %s" msgstr "" @@ -5950,80 +6322,80 @@ msgid "Kaveh Ghazi" msgstr "Kaveh Ghazi" #. TRANSLATORS: Real name is unknown; at most 19 characters. -#: src/pinky.c:250 +#: src/pinky.c:242 msgid " ???" msgstr " ???" #. TRANSLATORS: Idle time is unknown; at most 5 characters. -#: src/pinky.c:274 +#: src/pinky.c:266 msgid "?????" msgstr "?????" -#: src/pinky.c:323 +#: src/pinky.c:314 #, c-format msgid "Login name: " msgstr "Nume de autentificare: " -#: src/pinky.c:326 +#: src/pinky.c:317 #, c-format msgid "In real life: " msgstr "În viața reală: " #. TRANSLATORS: Real name is unknown; no hard limit. -#: src/pinky.c:330 +#: src/pinky.c:321 msgid "???\n" msgstr "???\n" -#: src/pinky.c:350 +#: src/pinky.c:341 #, c-format msgid "Directory: " msgstr "Dosar: " -#: src/pinky.c:352 +#: src/pinky.c:343 #, c-format msgid "Shell: " msgstr "Interpretor: " -#: src/pinky.c:371 +#: src/pinky.c:362 #, c-format msgid "Project: " msgstr "Proiect: " -#: src/pinky.c:395 +#: src/pinky.c:386 #, c-format msgid "Plan:\n" msgstr "Plan:\n" -#: src/pinky.c:414 +#: src/pinky.c:405 msgid "Login" msgstr "Autentificare" -#: src/pinky.c:416 +#: src/pinky.c:407 msgid "Name" msgstr "Nume" -#: src/pinky.c:417 +#: src/pinky.c:408 msgid " TTY" msgstr " TTY" -#: src/pinky.c:419 +#: src/pinky.c:410 msgid "Idle" msgstr "Inactiv" -#: src/pinky.c:420 +#: src/pinky.c:411 msgid "When" msgstr "Cînd" -#: src/pinky.c:423 +#: src/pinky.c:414 msgid "Where" msgstr "Unde" -#: src/pinky.c:502 +#: src/pinky.c:493 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Utilizare: %s [OPȚIUNE]... [UTILIZATOR]...\n" -#: src/pinky.c:503 +#: src/pinky.c:494 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -6033,7 +6405,7 @@ msgid "" " -s do short format output, this is the default\n" msgstr "" -#: src/pinky.c:511 +#: src/pinky.c:502 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -6042,7 +6414,7 @@ msgid "" " in short format\n" msgstr "" -#: src/pinky.c:520 +#: src/pinky.c:511 #, c-format msgid "" "\n" @@ -6050,7 +6422,7 @@ msgid "" "The utmp file will be %s.\n" msgstr "" -#: src/pinky.c:604 +#: src/pinky.c:595 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "" @@ -6065,83 +6437,81 @@ msgstr "Pete TerMaat" msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:912 +#: src/pr.c:908 #, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "" -#: src/pr.c:914 +#: src/pr.c:910 #, c-format msgid "invalid page range %s" msgstr "interval de pagini nevalid %s" -#: src/pr.c:979 +#: src/pr.c:975 #, fuzzy, c-format msgid "'-l PAGE_LENGTH' invalid number of lines: %s" msgstr "număr de linii nevalid: 0" -#: src/pr.c:1003 +#: src/pr.c:999 #, fuzzy, c-format msgid "'-N NUMBER' invalid starting line number: %s" msgstr "număr nevalid de linie inițială: %s" -#: src/pr.c:1015 +#: src/pr.c:1011 #, fuzzy, c-format msgid "'-o MARGIN' invalid line offset: %s" msgstr "lățime linie nevalidă: %s" -#: src/pr.c:1056 +#: src/pr.c:1052 #, fuzzy, c-format msgid "'-w PAGE_WIDTH' invalid number of characters: %s" msgstr "număr nevalid de coloane: %s" -#: src/pr.c:1070 +#: src/pr.c:1066 #, fuzzy, c-format msgid "'-W PAGE_WIDTH' invalid number of characters: %s" msgstr "număr nevalid de coloane: %s" -#: src/pr.c:1100 +#: src/pr.c:1096 #, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "" -#: src/pr.c:1104 +#: src/pr.c:1100 #, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "" -#: src/pr.c:1200 +#: src/pr.c:1196 #, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "" -#: src/pr.c:1304 +#: src/pr.c:1293 #, c-format msgid "page width too narrow" msgstr "" -#: src/pr.c:2369 +#: src/pr.c:2353 #, c-format msgid "starting page number %<PRIuMAX> exceeds page count %<PRIuMAX>" msgstr "" -#: src/pr.c:2396 +#: src/pr.c:2380 #, c-format msgid "page number overflow" msgstr "" -#: src/pr.c:2401 +#: src/pr.c:2385 #, c-format msgid "Page %<PRIuMAX>" msgstr "Pagina %<PRIuMAX>" -#: src/pr.c:2773 -msgid "" -"Paginate or columnate FILE(s) for printing.\n" -"\n" +#: src/pr.c:2757 +msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" -#: src/pr.c:2780 +#: src/pr.c:2763 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -6151,7 +6521,7 @@ msgid "" " columns on each page\n" msgstr "" -#: src/pr.c:2788 +#: src/pr.c:2771 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -6161,7 +6531,7 @@ msgid "" " double space the output\n" msgstr "" -#: src/pr.c:2796 +#: src/pr.c:2779 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -6173,7 +6543,7 @@ msgid "" " and trailer without -F)\n" msgstr "" -#: src/pr.c:2806 +#: src/pr.c:2789 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -6186,7 +6556,7 @@ msgid "" " alignment, --sep-string[=STRING] sets separators\n" msgstr "" -#: src/pr.c:2815 +#: src/pr.c:2798 msgid "" " -l, --length=PAGE_LENGTH\n" " set the page length to PAGE_LENGTH (66) lines\n" @@ -6195,7 +6565,7 @@ msgid "" " truncate lines, but join lines of full length with -J\n" msgstr "" -#: src/pr.c:2822 +#: src/pr.c:2805 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -6205,7 +6575,7 @@ msgid "" " page printed (see +FIRST_PAGE)\n" msgstr "" -#: src/pr.c:2830 +#: src/pr.c:2813 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -6214,7 +6584,7 @@ msgid "" " omit warning when a file cannot be opened\n" msgstr "" -#: src/pr.c:2837 +#: src/pr.c:2820 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -6224,7 +6594,7 @@ msgid "" " options (-COLUMN|-a -COLUMN|-m) except -w is set\n" msgstr "" -#: src/pr.c:2844 +#: src/pr.c:2827 msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" @@ -6234,7 +6604,7 @@ msgid "" " -t, --omit-header omit page headers and trailers\n" msgstr "" -#: src/pr.c:2851 +#: src/pr.c:2834 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -6248,7 +6618,7 @@ msgid "" "(72)\n" msgstr "" -#: src/pr.c:2861 +#: src/pr.c:2844 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -6257,7 +6627,7 @@ msgid "" " with -S or -s\n" msgstr "" -#: src/pr.c:2869 +#: src/pr.c:2852 #, fuzzy msgid "" "\n" @@ -6393,17 +6763,16 @@ msgstr "" msgid "" "Output a permuted index, including context, of the words in the input " "files.\n" -"\n" msgstr "" -#: src/ptx.c:1828 +#: src/ptx.c:1827 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:1833 +#: src/ptx.c:1832 msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" " -O, --format=roff generate output as roff directives\n" @@ -6412,7 +6781,7 @@ msgid "" " -T, --format=tex generate output as TeX directives\n" msgstr "" -#: src/ptx.c:1840 +#: src/ptx.c:1839 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -6422,7 +6791,7 @@ msgid "" " -o, --only-file=FILE read only word list from this FILE\n" msgstr "" -#: src/ptx.c:1848 +#: src/ptx.c:1847 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -6430,7 +6799,7 @@ msgid "" "excluded\n" msgstr "" -#: src/ptx.c:1855 +#: src/ptx.c:1854 #, fuzzy msgid "" "\n" @@ -6439,7 +6808,7 @@ msgstr "" "\n" "Fără FIȘIER, sau cînd FIȘIER e -, citește intrarea standard.\n" -#: src/ptx.c:1949 +#: src/ptx.c:1948 #, c-format msgid "invalid gap width: %s" msgstr "" @@ -6463,7 +6832,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "nu s-a putut face chdir în %s" -#: src/pwd.c:170 src/pwd.c:277 +#: src/pwd.c:170 src/pwd.c:277 src/split.c:373 #, c-format msgid "failed to stat %s" msgstr "nu s-a putut face stat %s" @@ -6479,14 +6848,15 @@ msgid "ignoring non-option arguments" msgstr "se ignoră argumentele non-opțiune" #. This is a proper name. See the gettext manual, section Names. -#: src/readlink.c:33 +#: src/readlink.c:32 msgid "Dmitry V. Levin" msgstr "Dmitrii V. Levin" -#: src/readlink.c:62 +#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147 +#: src/stat.c:1349 src/touch.c:212 #, c-format -msgid "Usage: %s [OPTION]... FILE\n" -msgstr "Utilizare: %s OPȚIUNE]... FIȘIER\n" +msgid "Usage: %s [OPTION]... FILE...\n" +msgstr "Utilizare: %s [OPȚIUNE]... FIȘIER...\n" #: src/readlink.c:63 msgid "" @@ -6515,17 +6885,18 @@ msgid "" "recursively,\n" " without requirements on components " "existence\n" -" -n, --no-newline do not output the trailing newline\n" +" -n, --no-newline do not output the trailing delimiter\n" " -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" msgstr "" -#: src/realpath.c:71 src/rm.c:134 src/shred.c:147 src/stat.c:1330 -#: src/touch.c:215 -#, c-format -msgid "Usage: %s [OPTION]... FILE...\n" -msgstr "Utilizare: %s [OPȚIUNE]... FIȘIER...\n" +#: src/readlink.c:152 +#, fuzzy, c-format +msgid "ignoring --no-newline with multiple arguments" +msgstr "se ignoră argumentele non-opțiune" #: src/realpath.c:72 msgid "" @@ -6552,12 +6923,12 @@ msgstr "" msgid "generating relative path" msgstr "" -#: src/remove.c:286 +#: src/remove.c:273 #, c-format msgid "%s: descend into write-protected directory %s? " msgstr "%s: descindeți în dosarul protejat la scriere %s? " -#: src/remove.c:287 +#: src/remove.c:274 #, c-format msgid "%s: descend into directory %s? " msgstr "%s: descindeți în dosarul %s? " @@ -6566,49 +6937,49 @@ msgstr "%s: descindeți în dosarul %s? " #. translate "%s: remove %s (write-protected) %s? " #. instead. It should avoid grammatical problems #. with the output of file_type. -#: src/remove.c:303 +#: src/remove.c:290 #, c-format msgid "%s: remove write-protected %s %s? " msgstr "" -#: src/remove.c:304 +#: src/remove.c:291 #, c-format msgid "%s: remove %s %s? " msgstr "%s: eliminați %s %s? " -#: src/remove.c:417 +#: src/remove.c:374 #, c-format msgid "removed directory: %s\n" msgstr "dosar eliminat: %s\n" -#: src/remove.c:481 +#: src/remove.c:444 #, fuzzy, c-format msgid "cannot remove directory: %s" msgstr "dosarul %s nu poate fi eliminat" -#: src/remove.c:537 +#: src/remove.c:500 #, 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:557 +#: src/remove.c:520 #, fuzzy, c-format msgid "traversal failed: %s" msgstr "citire eșuată" -#: src/remove.c:563 +#: src/remove.c:526 #, c-format msgid "" "unexpected failure: fts_info=%d: %s\n" "please report to %s" msgstr "" -#: src/rm.c:118 +#: src/rm.c:119 #, fuzzy, c-format msgid "Try '%s ./%s' to remove the file %s.\n" msgstr "Încercați „%s ./%s” pentru a elimina fișierul %s.\n" -#: src/rm.c:135 +#: src/rm.c:136 msgid "" "Remove (unlink) the FILE(s).\n" "\n" @@ -6617,7 +6988,7 @@ msgid "" " -i prompt before every removal\n" msgstr "" -#: src/rm.c:141 +#: src/rm.c:142 msgid "" " -I prompt once before removing more than three files, " "or\n" @@ -6629,22 +7000,23 @@ msgid "" " always (-i). Without WHEN, prompt always\n" msgstr "" -#: src/rm.c:148 +#: src/rm.c:149 msgid "" " --one-file-system when removing a hierarchy recursively, skip any\n" " directory that is on a file system different from\n" " that of the corresponding command line argument\n" msgstr "" -#: src/rm.c:153 +#: src/rm.c:154 msgid "" " --no-preserve-root do not treat '/' specially\n" " --preserve-root do not remove '/' (default)\n" " -r, -R, --recursive remove directories and their contents recursively\n" +" -d, --dir remove empty directories\n" " -v, --verbose explain what is being done\n" msgstr "" -#: src/rm.c:161 +#: src/rm.c:163 msgid "" "\n" "By default, rm does not remove directories. Use the --recursive (-r or -R)\n" @@ -6652,7 +7024,7 @@ msgid "" "contents.\n" msgstr "" -#: src/rm.c:166 +#: src/rm.c:168 #, c-format msgid "" "\n" @@ -6663,7 +7035,7 @@ msgid "" " %s ./-foo\n" msgstr "" -#: src/rm.c:175 +#: src/rm.c:177 msgid "" "\n" "Note that if you use rm to remove a file, it might be possible to recover\n" @@ -6671,12 +7043,12 @@ msgid "" "assurance that the contents are truly unrecoverable, consider using shred.\n" msgstr "" -#: src/rm.c:335 +#: src/rm.c:342 #, c-format msgid "%s: remove all arguments recursively? " msgstr "%s: eliminați toate argumentele recursiv? " -#: src/rm.c:336 +#: src/rm.c:343 #, c-format msgid "%s: remove all arguments? " msgstr "%s: eliminați toate argumentele? " @@ -6724,7 +7096,10 @@ msgstr "" msgid "" "Run a program in a different security context.\n" "With neither CONTEXT nor COMMAND, print the current security context.\n" -"\n" +msgstr "" + +#: src/runcon.c:94 +msgid "" " CONTEXT Complete security context\n" " -c, --compute compute process transition context before modifying\n" " -t, --type=TYPE type (for same role as parent)\n" @@ -6734,72 +7109,72 @@ msgid "" "\n" msgstr "" -#: src/runcon.c:140 +#: src/runcon.c:144 #, c-format msgid "multiple roles" msgstr "" -#: src/runcon.c:145 +#: src/runcon.c:149 #, c-format msgid "multiple types" msgstr "" -#: src/runcon.c:150 +#: src/runcon.c:154 #, c-format msgid "multiple users" msgstr "" -#: src/runcon.c:155 +#: src/runcon.c:159 #, c-format msgid "multiple levelranges" msgstr "" -#: src/runcon.c:173 src/runcon.c:209 +#: src/runcon.c:177 src/runcon.c:213 #, c-format msgid "failed to get current context" msgstr "" -#: src/runcon.c:183 +#: src/runcon.c:187 #, c-format msgid "you must specify -c, -t, -u, -l, -r, or context" msgstr "" -#: src/runcon.c:191 +#: src/runcon.c:195 #, c-format msgid "no command specified" msgstr "nicio comandă specificată" -#: src/runcon.c:197 +#: src/runcon.c:201 #, c-format msgid "%s may be used only on a SELinux kernel" msgstr "" -#: src/runcon.c:223 +#: src/runcon.c:227 #, c-format msgid "failed to compute a new context" msgstr "" -#: src/runcon.c:237 +#: src/runcon.c:241 #, c-format msgid "failed to set new user %s" msgstr "" -#: src/runcon.c:239 +#: src/runcon.c:243 #, c-format msgid "failed to set new type %s" msgstr "" -#: src/runcon.c:241 +#: src/runcon.c:245 #, c-format msgid "failed to set new range %s" msgstr "" -#: src/runcon.c:243 +#: src/runcon.c:247 #, c-format msgid "failed to set new role %s" msgstr "" -#: src/runcon.c:251 +#: src/runcon.c:255 #, c-format msgid "unable to set security context %s" msgstr "" @@ -6813,15 +7188,17 @@ msgid "" msgstr "" #: src/seq.c:73 +msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" +msgstr "" + +#: src/seq.c:79 msgid "" -"Print numbers from FIRST to LAST, in steps of INCREMENT.\n" -"\n" " -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 "" -#: src/seq.c:82 +#: src/seq.c:86 msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" @@ -6831,39 +7208,24 @@ msgid "" "INCREMENT is usually negative if FIRST is greater than LAST.\n" msgstr "" -#: src/seq.c:90 +#: src/seq.c:94 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:136 +#: src/seq.c:140 #, c-format msgid "invalid floating point argument: %s" msgstr "" -#: src/seq.c:193 -#, c-format -msgid "format %s has no %% directive" -msgstr "" - -#: src/seq.c:210 -#, c-format -msgid "format %s ends in %%" -msgstr "" - -#: src/seq.c:213 +#: src/seq.c:232 #, c-format msgid "format %s has unknown %%%c directive" msgstr "" -#: src/seq.c:217 -#, c-format -msgid "format %s has too many %% directives" -msgstr "" - -#: src/seq.c:431 +#: src/seq.c:555 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" @@ -6893,27 +7255,27 @@ msgid "" " (if specified) supplemental group IDs to GID1, ...\n" msgstr "" -#: src/setuidgid.c:163 +#: src/setuidgid.c:162 #, c-format msgid "unknown user-ID: %s" msgstr "" -#: src/setuidgid.c:174 +#: src/setuidgid.c:173 #, c-format msgid "to use user-ID %s you need to use -g too" msgstr "" -#: src/setuidgid.c:191 +#: src/setuidgid.c:190 #, c-format msgid "failed to set supplemental group(s)" msgstr "" -#: src/setuidgid.c:201 +#: src/setuidgid.c:200 #, c-format msgid "cannot set group-ID to %lu" msgstr "" -#: src/setuidgid.c:205 +#: src/setuidgid.c:204 #, c-format msgid "cannot set user-ID to %lu" msgstr "" @@ -6927,10 +7289,9 @@ msgstr "Colin Plumb" 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" -"\n" msgstr "" -#: src/shred.c:156 +#: src/shred.c:155 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -6939,7 +7300,7 @@ msgid "" " -s, --size=N shred this many bytes (suffixes like K, M, G accepted)\n" msgstr "" -#: src/shred.c:162 +#: src/shred.c:161 msgid "" " -u, --remove truncate and remove file after overwriting\n" " -v, --verbose show progress\n" @@ -6948,7 +7309,7 @@ msgid "" " -z, --zero add a final overwrite with zeros to hide shredding\n" msgstr "" -#: src/shred.c:171 +#: src/shred.c:170 msgid "" "\n" "If FILE is -, shred standard output.\n" @@ -6960,7 +7321,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:181 +#: src/shred.c:180 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" @@ -6971,7 +7332,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:189 +#: src/shred.c:188 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -6983,7 +7344,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:199 +#: src/shred.c:198 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -6992,7 +7353,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:206 +#: src/shred.c:205 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" @@ -7004,129 +7365,129 @@ msgid "" "\n" msgstr "" -#: src/shred.c:216 +#: src/shred.c:215 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:296 +#: src/shred.c:295 #, c-format msgid "%s: fdatasync failed" msgstr "" -#: src/shred.c:307 +#: src/shred.c:306 #, c-format msgid "%s: fsync failed" msgstr "" -#: src/shred.c:384 +#: src/shred.c:383 #, c-format msgid "%s: cannot rewind" msgstr "" -#: src/shred.c:403 +#: src/shred.c:402 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "" -#: src/shred.c:453 +#: src/shred.c:452 #, c-format msgid "%s: error writing at offset %s" msgstr "" -#: src/shred.c:471 +#: src/shred.c:470 #, c-format msgid "%s: lseek failed" msgstr "" -#: src/shred.c:482 +#: src/shred.c:481 #, c-format msgid "%s: file too large" msgstr "%s: fișier prea mare" -#: src/shred.c:505 +#: src/shred.c:504 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "" -#: src/shred.c:521 +#: src/shred.c:520 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "" -#: src/shred.c:768 +#: src/shred.c:767 #, c-format msgid "%s: fstat failed" msgstr "%s: fstat eșuat" -#: src/shred.c:779 +#: src/shred.c:778 #, c-format msgid "%s: invalid file type" msgstr "%s: tip de fișier nevalid" -#: src/shred.c:798 +#: src/shred.c:797 #, c-format msgid "%s: file has negative size" msgstr "%s: fișierul are dimensiune nevalidă" -#: src/shred.c:865 +#: src/shred.c:864 src/sort.c:932 src/split.c:378 #, c-format msgid "%s: error truncating" msgstr "%s: eroare la trunchiere" -#: src/shred.c:881 +#: src/shred.c:880 #, c-format msgid "%s: fcntl failed" msgstr "%s: fcntl eșuat" -#: src/shred.c:886 +#: src/shred.c:885 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "" -#: src/shred.c:968 +#: src/shred.c:967 #, c-format msgid "%s: removing" msgstr "%s: eliminare" -#: src/shred.c:992 +#: src/shred.c:991 #, c-format msgid "%s: renamed to %s" msgstr "%s: redenumit în %s" -#: src/shred.c:1014 +#: src/shred.c:1013 #, c-format msgid "%s: failed to remove" msgstr "%s: eșec la eliminare" -#: src/shred.c:1018 +#: src/shred.c:1017 #, c-format msgid "%s: removed" msgstr "%s: eliminat" -#: src/shred.c:1025 src/shred.c:1068 +#: src/shred.c:1024 src/shred.c:1067 #, c-format msgid "%s: failed to close" msgstr "%s: eșec la închidere" -#: src/shred.c:1061 +#: src/shred.c:1060 #, c-format msgid "%s: failed to open for writing" msgstr "%s: eșec la deschiderea pentru scriere" -#: src/shred.c:1126 +#: src/shred.c:1125 #, c-format msgid "%s: invalid number of passes" msgstr "" -#: src/shred.c:1135 src/shuf.c:291 src/sort.c:4387 +#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441 #, c-format msgid "multiple random sources specified" msgstr "" -#: src/shred.c:1149 +#: src/shred.c:1148 #, c-format msgid "%s: invalid file size" msgstr "%s: dimensiune de fișier nevalidă" @@ -7140,12 +7501,10 @@ msgid "" msgstr "" #: src/shuf.c:54 -msgid "" -"Write a random permutation of the input lines to standard output.\n" -"\n" +msgid "Write a random permutation of the input lines to standard output.\n" msgstr "" -#: src/shuf.c:61 +#: src/shuf.c:60 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 " @@ -7156,27 +7515,27 @@ msgid "" " -z, --zero-terminated end lines with 0 byte, not newline\n" msgstr "" -#: src/shuf.c:245 +#: src/shuf.c:244 #, c-format msgid "multiple -i options specified" msgstr "" -#: src/shuf.c:265 +#: src/shuf.c:264 #, c-format msgid "invalid input range %s" msgstr "" -#: src/shuf.c:278 +#: src/shuf.c:277 #, c-format msgid "invalid line count %s" msgstr "" -#: src/shuf.c:285 src/sort.c:4381 +#: src/shuf.c:284 src/sort.c:4435 #, c-format msgid "multiple output files specified" msgstr "multiple fișiere de ieșire specificate" -#: src/shuf.c:311 +#: src/shuf.c:310 #, c-format msgid "cannot combine -e and -i options" msgstr "" @@ -7195,7 +7554,7 @@ msgid "" "\n" msgstr "" -#: src/sleep.c:135 src/timeout.c:295 +#: src/sleep.c:135 src/timeout.c:320 #, c-format msgid "invalid time interval %s" msgstr "" @@ -7205,13 +7564,13 @@ msgstr "" msgid "cannot read realtime clock" msgstr "" -#: src/sort.c:395 -msgid "" -"Write sorted concatenation of all FILE(s) to standard output.\n" -"\n" +#: src/sort.c:399 +#, 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:402 +#: src/sort.c:405 msgid "" "Ordering options:\n" "\n" @@ -7219,7 +7578,7 @@ msgstr "" "Opțiuni de ordonare:\n" "\n" -#: src/sort.c:406 +#: src/sort.c:409 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -7227,19 +7586,19 @@ msgid "" " -f, --ignore-case fold lower case to upper case characters\n" msgstr "" -#: src/sort.c:412 +#: src/sort.c:415 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:417 +#: src/sort.c:420 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" -#: src/sort.c:420 +#: src/sort.c:423 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -7247,7 +7606,7 @@ msgid "" " -r, --reverse reverse the result of comparisons\n" msgstr "" -#: src/sort.c:426 +#: src/sort.c:429 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -7257,19 +7616,19 @@ msgid "" "\n" msgstr "" -#: src/sort.c:434 +#: src/sort.c:437 msgid "" "Other options:\n" "\n" msgstr "" -#: src/sort.c:438 +#: src/sort.c:441 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" msgstr "" -#: src/sort.c:442 +#: src/sort.c:445 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 " @@ -7278,7 +7637,7 @@ msgid "" " decompress them with PROG -d\n" msgstr "" -#: src/sort.c:449 +#: src/sort.c:452 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -7287,13 +7646,13 @@ msgid "" " If F is - then read names from standard input\n" msgstr "" -#: src/sort.c:456 +#: src/sort.c:459 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:460 +#: src/sort.c:463 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -7301,7 +7660,7 @@ msgid "" " -S, --buffer-size=SIZE use SIZE for main memory buffer\n" msgstr "" -#: src/sort.c:466 +#: src/sort.c:469 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -7316,11 +7675,11 @@ msgid "" "run\n" msgstr "" -#: src/sort.c:475 +#: src/sort.c:478 msgid " -z, --zero-terminated end lines with 0 byte, not newline\n" msgstr "" -#: src/sort.c:480 +#: src/sort.c:483 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -7339,7 +7698,7 @@ msgid "" "SIZE may be followed by the following multiplicative suffixes:\n" msgstr "" -#: src/sort.c:493 +#: src/sort.c:496 msgid "" "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n" "\n" @@ -7351,132 +7710,132 @@ msgid "" "native byte values.\n" msgstr "" -#: src/sort.c:694 +#: src/sort.c:697 #, c-format msgid "waiting for %s [-d]" msgstr "" -#: src/sort.c:699 +#: src/sort.c:702 #, c-format msgid "%s [-d] terminated abnormally" msgstr "" -#: src/sort.c:853 +#: src/sort.c:856 #, c-format msgid "cannot create temporary file in %s" msgstr "" -#: src/sort.c:939 src/sort.c:2010 src/sort.c:3056 src/sort.c:3755 -#: src/sort.c:3758 +#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713 +#: src/sort.c:3804 src/sort.c:3807 msgid "open failed" msgstr "deschidere eșuată" -#: src/sort.c:959 +#: src/sort.c:970 msgid "fflush failed" msgstr "fflush eșuat" -#: src/sort.c:964 src/sort.c:2013 src/sort.c:4646 +#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706 msgid "close failed" msgstr "închidere eșuată" -#: src/sort.c:973 +#: src/sort.c:986 #, c-format msgid "dup2 failed" msgstr "dup2 eșuat" -#: src/sort.c:1090 +#: src/sort.c:1103 #, c-format msgid "couldn't execute %s" msgstr "" -#: src/sort.c:1097 +#: src/sort.c:1110 msgid "couldn't create temporary file" msgstr "fișierul temporar nu a putut fi creat" -#: src/sort.c:1136 +#: src/sort.c:1149 #, c-format msgid "couldn't create process for %s -d" msgstr "" -#: src/sort.c:1150 +#: src/sort.c:1161 #, c-format msgid "couldn't execute %s -d" msgstr "" -#: src/sort.c:1209 +#: src/sort.c:1220 #, c-format msgid "warning: cannot remove: %s" msgstr "" -#: src/sort.c:1295 +#: src/sort.c:1306 #, c-format msgid "invalid --%s argument %s" msgstr "" -#: src/sort.c:1298 +#: src/sort.c:1309 #, c-format msgid "minimum --%s argument is %s" msgstr "" -#: src/sort.c:1313 +#: src/sort.c:1324 #, c-format msgid "--%s argument %s too large" msgstr "" -#: src/sort.c:1316 +#: src/sort.c:1327 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "" -#: src/sort.c:1398 +#: src/sort.c:1409 #, c-format msgid "number in parallel must be nonzero" msgstr "" -#: src/sort.c:1479 +#: src/sort.c:1494 msgid "stat failed" msgstr "stat eșuat" -#: src/sort.c:1740 +#: src/sort.c:1755 msgid "read failed" msgstr "citire eșuată" -#: src/sort.c:2028 +#: src/sort.c:2043 #, c-format msgid "string transformation failed" msgstr "transformarea șirului a eșuat" -#: src/sort.c:2031 +#: src/sort.c:2046 #, c-format msgid "the untransformed string was %s" msgstr "șirul transformat a fost %s" -#: src/sort.c:2194 +#: src/sort.c:2209 #, c-format msgid "^ no match for key\n" msgstr "" -#: src/sort.c:2374 +#: src/sort.c:2389 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "" -#: src/sort.c:2380 +#: src/sort.c:2395 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "" -#: src/sort.c:2391 +#: src/sort.c:2406 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" -#: src/sort.c:2404 +#: src/sort.c:2419 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "" -#: src/sort.c:2436 +#: src/sort.c:2451 #, fuzzy, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" @@ -7484,130 +7843,134 @@ msgstr[0] "opțiunile „-%s” sînt incompatibile" msgstr[1] "opțiunile „-%s” sînt incompatibile" msgstr[2] "opțiunile „-%s” sînt incompatibile" -#: src/sort.c:2442 +#: src/sort.c:2457 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "" -#: src/sort.c:2716 src/sort.c:2725 +#: src/sort.c:2731 src/sort.c:2740 msgid "write failed" msgstr "scriere eșuată" -#: src/sort.c:2768 +#: src/sort.c:2783 #, c-format msgid "%s: %s:%s: disorder: " msgstr "" -#: src/sort.c:2771 +#: src/sort.c:2786 msgid "standard error" msgstr "eroarea standard" -#: src/sort.c:3926 +#: src/sort.c:3698 +#, fuzzy +msgid "cannot read" +msgstr "nu se poate stabili data" + +#: src/sort.c:3976 #, c-format msgid "%s: invalid field specification %s" msgstr "" -#: src/sort.c:3937 +#: src/sort.c:3987 #, fuzzy, c-format msgid "options '-%s' are incompatible" msgstr "opțiunile „-%s” sînt incompatibile" -#: src/sort.c:3988 +#: src/sort.c:4038 #, c-format msgid "%s: invalid count at start of %s" msgstr "" -#: src/sort.c:4245 +#: src/sort.c:4295 #, fuzzy msgid "invalid number after '-'" msgstr "număr nevalid după „-”" -#: src/sort.c:4248 src/sort.c:4334 src/sort.c:4362 +#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416 #, fuzzy msgid "invalid number after '.'" msgstr "număr nevalid după „.”" -#: src/sort.c:4261 src/sort.c:4367 +#: src/sort.c:4315 src/sort.c:4421 msgid "stray character in field spec" msgstr "" -#: src/sort.c:4308 +#: src/sort.c:4362 #, c-format msgid "multiple compress programs specified" msgstr "" -#: src/sort.c:4325 +#: src/sort.c:4379 msgid "invalid number at field start" msgstr "" -#: src/sort.c:4329 src/sort.c:4357 +#: src/sort.c:4383 src/sort.c:4411 msgid "field number is zero" msgstr "numărul cîmpului e zero" -#: src/sort.c:4338 +#: src/sort.c:4392 msgid "character offset is zero" msgstr "" -#: src/sort.c:4353 +#: src/sort.c:4407 #, fuzzy msgid "invalid number after ','" msgstr "număr nevalid după „,”" -#: src/sort.c:4403 +#: src/sort.c:4457 #, c-format msgid "empty tab" msgstr "" -#: src/sort.c:4496 src/wc.c:692 +#: src/sort.c:4550 src/wc.c:692 #, c-format msgid "cannot read file names from %s" msgstr "" -#: src/sort.c:4518 +#: src/sort.c:4572 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "" -#: src/sort.c:4524 +#: src/sort.c:4578 #, c-format msgid "no input from %s" msgstr "" -#: src/sort.c:4570 +#: src/sort.c:4624 #, c-format msgid "using %s sorting rules" msgstr "" -#: src/sort.c:4573 +#: src/sort.c:4627 #, c-format msgid "using simple byte comparison" msgstr "" -#: src/sort.c:4604 +#: src/sort.c:4658 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "" -#: src/split.c:184 +#: src/split.c:187 #, c-format msgid "the suffix length needs to be at least %zu" msgstr "" -#: src/split.c:201 +#: src/split.c:204 #, c-format msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" msgstr "Utilizare: %s [OPȚIUNE]... [INTRARE [PREFIX]]\n" -#: src/split.c:205 +#: src/split.c:208 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" -"\n" msgstr "" -#: src/split.c:214 +#: src/split.c:216 #, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" @@ -7626,13 +7989,13 @@ msgid "" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" -#: src/split.c:227 +#: src/split.c:229 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" msgstr "" -#: src/split.c:234 +#: src/split.c:236 msgid "" "\n" "CHUNKS may be:\n" @@ -7644,184 +8007,189 @@ msgid "" "r/K/N likewise but only output Kth of N to stdout\n" msgstr "" -#: src/split.c:352 +#: src/split.c:354 #, c-format msgid "output file suffixes exhausted" msgstr "" -#: src/split.c:364 +#: src/split.c:366 #, c-format msgid "creating file %s\n" msgstr "se creează fișierul %s\n" -#: src/split.c:377 +#: src/split.c:375 +#, c-format +msgid "%s would overwrite input; aborting" +msgstr "" + +#: src/split.c:391 #, 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:379 +#: src/split.c:393 #, c-format msgid "executing with FILE=%s\n" msgstr "" -#: src/split.c:381 +#: src/split.c:395 #, fuzzy, c-format msgid "failed to create pipe" -msgstr "eșec la crearea contextului de securitate: %s" +msgstr "eșec la eliminarea %s" -#: src/split.c:395 +#: src/split.c:409 #, fuzzy, c-format msgid "closing prior pipe" msgstr "se închide dosarul %s" -#: src/split.c:397 +#: src/split.c:411 #, fuzzy, c-format msgid "closing output pipe" msgstr "se închide fișierul de ieșire %s" -#: src/split.c:401 +#: src/split.c:415 #, fuzzy, c-format msgid "moving input pipe" msgstr "se închide fișierul de intrare %s" -#: src/split.c:403 +#: src/split.c:417 #, fuzzy, c-format msgid "closing input pipe" msgstr "se închide fișierul de intrare %s" -#: src/split.c:408 +#: src/split.c:422 #, fuzzy, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "eșec la rularea comenzii %s" -#: src/split.c:414 +#: src/split.c:428 #, fuzzy, c-format msgid "failed to close input pipe" msgstr "eșec la închiderea dosarului %s" -#: src/split.c:450 +#: src/split.c:464 #, c-format msgid "waiting for child process" msgstr "" -#: src/split.c:460 +#: src/split.c:474 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "" -#: src/split.c:468 +#: src/split.c:482 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:475 src/timeout.c:449 +#: src/split.c:489 src/timeout.c:494 #, c-format msgid "unknown status from command (0x%X)" msgstr "" -#: src/split.c:1037 +#: src/split.c:1052 #, c-format msgid "cannot split in more than one way" msgstr "" -#: src/split.c:1050 src/split.c:1192 src/split.c:1363 +#: src/split.c:1065 src/split.c:1205 src/split.c:1376 #, fuzzy, c-format msgid "%s: invalid number of chunks" msgstr "%s: număr de secunde nevalid" -#: src/split.c:1054 +#: src/split.c:1069 #, fuzzy, c-format msgid "%s: invalid chunk number" msgstr "%s: număr nevalid" -#: src/split.c:1106 +#: src/split.c:1119 #, c-format msgid "%s: invalid suffix length" msgstr "" -#: src/split.c:1131 src/split.c:1139 src/split.c:1162 src/split.c:1167 +#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180 #, c-format msgid "%s: invalid number of bytes" msgstr "%s: număr de octeți nevalid" -#: src/split.c:1150 src/split.c:1297 +#: src/split.c:1163 src/split.c:1310 #, c-format msgid "%s: invalid number of lines" msgstr "%s: număr de linii nevalid" -#: src/split.c:1223 +#: src/split.c:1236 #, c-format msgid "line count option -%s%c... is too large" msgstr "" -#: src/split.c:1235 +#: src/split.c:1248 #, fuzzy, c-format msgid "%s: invalid start value for numerical suffix" msgstr "număr nevalid de linie inițială: %s" -#: src/split.c:1263 +#: src/split.c:1276 #, fuzzy, c-format msgid "%s: invalid IO block size" msgstr "%s: dimensiune de fișier nevalidă" -#: src/split.c:1284 +#: src/split.c:1297 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1321 +#: src/split.c:1334 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1356 +#: src/split.c:1369 #, 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:169 +#: src/stat.c:173 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:838 +#: src/stat.c:857 #, fuzzy, c-format msgid "failed to canonicalize %s" msgstr "eșec la clonarea %s" -#: src/stat.c:1050 +#: src/stat.c:1069 #, fuzzy, c-format msgid "warning: unrecognized escape '\\%c'" -msgstr "operand %s necunoscut" +msgstr "%s: opțiune necunoscută „%c%s”\n" -#: src/stat.c:1105 +#: src/stat.c:1124 #, c-format msgid "%s: invalid directive" msgstr "%s: directivă nevalidă" -#: src/stat.c:1151 +#: src/stat.c:1170 #, c-format msgid "warning: backslash at end of format" msgstr "" -#: src/stat.c:1182 +#: src/stat.c:1201 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" -#: src/stat.c:1189 +#: src/stat.c:1208 #, c-format msgid "cannot read file system information for %s" msgstr "" -#: src/stat.c:1209 +#: src/stat.c:1228 #, 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:1245 +#: src/stat.c:1264 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -7832,7 +8200,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1268 +#: src/stat.c:1287 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -7840,30 +8208,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1278 +#: src/stat.c:1297 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:1286 +#: src/stat.c:1305 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:1295 +#: src/stat.c:1314 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:1305 +#: src/stat.c:1324 #, fuzzy, c-format msgid "Context: %C\n" msgstr " context=%s" -#: src/stat.c:1313 +#: src/stat.c:1332 msgid "" "Access: %x\n" "Modify: %y\n" @@ -7871,15 +8239,17 @@ msgid "" " Birth: %w\n" msgstr "" -#: src/stat.c:1331 +#: src/stat.c:1350 +msgid "Display file or file system status.\n" +msgstr "" + +#: src/stat.c:1356 msgid "" -"Display file or file system status.\n" -"\n" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" -#: src/stat.c:1337 +#: src/stat.c:1360 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -7889,7 +8259,7 @@ msgid "" " -t, --terse print the information in terse form\n" msgstr "" -#: src/stat.c:1348 +#: src/stat.c:1371 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -7901,7 +8271,7 @@ msgid "" " %C SELinux security context string\n" msgstr "" -#: src/stat.c:1357 +#: src/stat.c:1380 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -7911,7 +8281,7 @@ msgid "" " %G group name of owner\n" msgstr "" -#: src/stat.c:1365 +#: src/stat.c:1388 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -7924,7 +8294,7 @@ msgid "" " %T minor device type in hex\n" msgstr "" -#: src/stat.c:1376 +#: src/stat.c:1399 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -7939,7 +8309,7 @@ msgid "" "\n" msgstr "" -#: src/stat.c:1390 +#: src/stat.c:1413 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -7950,7 +8320,7 @@ msgid "" " %f free blocks in file system\n" msgstr "" -#: src/stat.c:1399 +#: src/stat.c:1422 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -7969,30 +8339,29 @@ msgstr "" #: src/stdbuf.c:91 msgid "" "Run COMMAND, with modified buffering operations for its standard streams.\n" -"\n" msgstr "" -#: src/stdbuf.c:98 +#: src/stdbuf.c:97 msgid "" " -i, --input=MODE adjust standard input stream buffering\n" " -o, --output=MODE adjust standard output stream buffering\n" " -e, --error=MODE adjust standard error stream buffering\n" msgstr "" -#: src/stdbuf.c:105 +#: src/stdbuf.c:104 msgid "" "\n" "If MODE is 'L' the corresponding stream will be line buffered.\n" "This option is invalid with standard input.\n" msgstr "" -#: src/stdbuf.c:108 +#: src/stdbuf.c:107 msgid "" "\n" "If MODE is '0' the corresponding stream will be unbuffered.\n" msgstr "" -#: src/stdbuf.c:111 +#: src/stdbuf.c:110 msgid "" "\n" "Otherwise MODE is a number which may be followed by one of the following:\n" @@ -8002,7 +8371,7 @@ msgid "" "size set to MODE bytes.\n" msgstr "" -#: src/stdbuf.c:117 +#: src/stdbuf.c:116 msgid "" "\n" "NOTE: If COMMAND adjusts the buffering of its standard streams ('tee' does\n" @@ -8012,22 +8381,22 @@ msgid "" "and are thus unaffected by 'stdbuf' settings.\n" msgstr "" -#: src/stdbuf.c:227 +#: src/stdbuf.c:226 #, fuzzy, c-format msgid "failed to find %s" msgstr "eșec la deschiderea %s" -#: src/stdbuf.c:247 src/stdbuf.c:279 +#: src/stdbuf.c:246 src/stdbuf.c:278 #, c-format msgid "failed to update the environment with %s" msgstr "" -#: src/stdbuf.c:321 +#: src/stdbuf.c:320 #, c-format msgid "line buffering stdin is meaningless" msgstr "" -#: src/stty.c:509 +#: src/stty.c:513 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -8035,23 +8404,25 @@ msgid "" " or: %s [-F DEVICE | --file=DEVICE] [-g|--save]\n" msgstr "" -#: src/stty.c:515 +#: src/stty.c:519 +msgid "Print or change terminal characteristics.\n" +msgstr "" + +#: src/stty.c:525 msgid "" -"Print or change terminal characteristics.\n" -"\n" " -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:524 +#: src/stty.c:532 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:529 +#: src/stty.c:537 msgid "" "\n" "Special characters:\n" @@ -8060,7 +8431,7 @@ msgid "" " eol CHAR CHAR will end the line\n" msgstr "" -#: src/stty.c:536 +#: src/stty.c:544 msgid "" " * eol2 CHAR alternate CHAR for ending the line\n" " erase CHAR CHAR will erase the last character typed\n" @@ -8068,7 +8439,7 @@ msgid "" " kill CHAR CHAR will erase the current line\n" msgstr "" -#: src/stty.c:542 +#: src/stty.c:550 msgid "" " * lnext CHAR CHAR will enter the next character quoted\n" " quit CHAR CHAR will send a quit signal\n" @@ -8076,7 +8447,7 @@ msgid "" " start CHAR CHAR will restart the output after stopping it\n" msgstr "" -#: src/stty.c:548 +#: src/stty.c:556 msgid "" " stop CHAR CHAR will stop the output\n" " susp CHAR CHAR will send a terminal stop signal\n" @@ -8084,7 +8455,7 @@ msgid "" " * werase CHAR CHAR will erase the last word typed\n" msgstr "" -#: src/stty.c:554 +#: src/stty.c:562 msgid "" "\n" "Special settings:\n" @@ -8093,7 +8464,7 @@ msgid "" " * columns N same as cols N\n" msgstr "" -#: src/stty.c:561 +#: src/stty.c:569 msgid "" " ispeed N set the input speed to N\n" " * line N use line discipline N\n" @@ -8102,7 +8473,7 @@ msgid "" " ospeed N set the output speed to N\n" msgstr "" -#: src/stty.c:567 +#: src/stty.c:575 msgid "" " * rows N tell the kernel that the terminal has N rows\n" " * size print the number of rows and columns according to the " @@ -8111,27 +8482,28 @@ msgid "" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" -#: src/stty.c:573 +#: src/stty.c:581 msgid "" "\n" "Control settings:\n" " [-]clocal disable modem control signals\n" " [-]cread allow input to be received\n" " * [-]crtscts enable RTS/CTS handshaking\n" +" * [-]cdtrdsr enable DTR/DSR handshaking\n" " csN set character size to N bits, N in [5..8]\n" msgstr "" -#: src/stty.c:581 +#: src/stty.c:590 msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" " [-]hupcl same as [-]hup\n" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" -" [-]parodd set odd parity (even with '-')\n" +" [-]parodd set odd parity (or even parity with '-')\n" msgstr "" -#: src/stty.c:588 +#: src/stty.c:597 msgid "" "\n" "Input settings:\n" @@ -8141,7 +8513,7 @@ msgid "" " [-]igncr ignore carriage return\n" msgstr "" -#: src/stty.c:596 +#: src/stty.c:605 msgid "" " [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" @@ -8150,11 +8522,11 @@ msgid "" " [-]istrip clear high (8th) bit of input characters\n" msgstr "" -#: src/stty.c:603 +#: src/stty.c:612 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr "" -#: src/stty.c:606 +#: src/stty.c:615 msgid "" " * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" @@ -8164,7 +8536,7 @@ msgid "" " [-]tandem same as [-]ixoff\n" msgstr "" -#: src/stty.c:614 +#: src/stty.c:623 msgid "" "\n" "Output settings:\n" @@ -8174,7 +8546,7 @@ msgid "" " * nlN newline delay style, N in [0..1]\n" msgstr "" -#: src/stty.c:622 +#: src/stty.c:631 msgid "" " * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of null characters\n" @@ -8184,7 +8556,7 @@ msgid "" " * [-]onlret newline performs a carriage return\n" msgstr "" -#: src/stty.c:630 +#: src/stty.c:639 msgid "" " * [-]onocr do not print carriage returns in the first column\n" " [-]opost postprocess output\n" @@ -8194,7 +8566,7 @@ msgid "" " * vtN vertical tab delay style, N in [0..1]\n" msgstr "" -#: src/stty.c:638 +#: src/stty.c:647 msgid "" "\n" "Local settings:\n" @@ -8203,7 +8575,7 @@ msgid "" " * -crtkill kill all line by obeying the echoctl and echok settings\n" msgstr "" -#: src/stty.c:645 +#: src/stty.c:654 msgid "" " * [-]ctlecho echo control characters in hat notation ('^c')\n" " [-]echo echo input characters\n" @@ -8212,7 +8584,7 @@ msgid "" " [-]echok echo a newline after a kill character\n" msgstr "" -#: src/stty.c:652 +#: src/stty.c:661 msgid "" " * [-]echoke same as [-]crtkill\n" " [-]echonl echo newline even if not echoing other characters\n" @@ -8221,7 +8593,7 @@ msgid "" " [-]iexten enable non-POSIX special characters\n" msgstr "" -#: src/stty.c:659 +#: src/stty.c:668 msgid "" " [-]isig enable interrupt, quit, and suspend special characters\n" " [-]noflsh disable flushing after interrupt and quit special " @@ -8231,7 +8603,7 @@ msgid "" " * [-]xcase with icanon, escape with '\\' for uppercase characters\n" msgstr "" -#: src/stty.c:666 +#: src/stty.c:675 msgid "" "\n" "Combination settings:\n" @@ -8240,7 +8612,7 @@ msgid "" " -cbreak same as icanon\n" msgstr "" -#: src/stty.c:673 +#: src/stty.c:682 msgid "" " cooked same as brkint ignpar istrip icrnl ixon opost isig\n" " icanon, eof and eol characters to their default values\n" @@ -8248,7 +8620,7 @@ msgid "" " crt same as echoe echoctl echoke\n" msgstr "" -#: src/stty.c:679 +#: src/stty.c:688 msgid "" " dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" " kill ^u\n" @@ -8257,7 +8629,7 @@ msgid "" " evenp same as parenb -parodd cs7\n" msgstr "" -#: src/stty.c:686 +#: src/stty.c:695 msgid "" " -evenp same as -parenb cs8\n" " * [-]lcase same as xcase iuclc olcuc\n" @@ -8267,7 +8639,7 @@ msgid "" " -nl same as icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" msgstr "" -#: src/stty.c:694 +#: src/stty.c:703 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -8276,7 +8648,7 @@ msgid "" " -pass8 same as parenb istrip cs7\n" msgstr "" -#: src/stty.c:701 +#: src/stty.c:710 msgid "" " raw same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" " -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n" @@ -8284,7 +8656,7 @@ msgid "" " -raw same as cooked\n" msgstr "" -#: src/stty.c:707 +#: src/stty.c:716 msgid "" " sane same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" " -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n" @@ -8294,7 +8666,7 @@ msgid "" " characters to their default values\n" msgstr "" -#: src/stty.c:715 +#: src/stty.c:724 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -8303,126 +8675,59 @@ msgid "" "127; special values ^- or undef used to disable special characters.\n" msgstr "" -#: src/stty.c:787 +#: src/stty.c:796 #, c-format msgid "only one device may be specified" msgstr "" -#: src/stty.c:817 +#: src/stty.c:826 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" "mutually exclusive" msgstr "" -#: src/stty.c:823 +#: src/stty.c:832 #, c-format msgid "when specifying an output style, modes may not be set" msgstr "" -#: src/stty.c:838 +#: src/stty.c:847 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "" -#: src/stty.c:883 src/stty.c:993 +#: src/stty.c:892 src/stty.c:1002 #, c-format msgid "invalid argument %s" msgstr "" -#: src/stty.c:894 src/stty.c:911 src/stty.c:923 src/stty.c:936 src/stty.c:948 -#: src/stty.c:968 +#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957 +#: src/stty.c:977 #, c-format msgid "missing argument to %s" msgstr "" -#: src/stty.c:974 +#: src/stty.c:983 #, c-format msgid "invalid line discipline %s" msgstr "" -#: src/stty.c:1044 +#: src/stty.c:1053 #, c-format msgid "%s: unable to perform all requested operations" msgstr "" -#: src/stty.c:1390 +#: src/stty.c:1399 #, c-format msgid "%s: no size information for this device" msgstr "" -#: src/stty.c:1904 +#: src/stty.c:1920 #, c-format msgid "invalid integer argument %s" msgstr "" -#: src/su.c:229 -msgid "Password:" -msgstr "Parolă:" - -#: src/su.c:232 -#, c-format -msgid "getpass: cannot open /dev/tty" -msgstr "getpass: nu se poate deschide /dev/tty" - -#: src/su.c:290 -#, c-format -msgid "cannot set groups" -msgstr "nu se pot stabili grupurile" - -#: src/su.c:294 -#, c-format -msgid "cannot set group id" -msgstr "" - -#: src/su.c:296 -#, c-format -msgid "cannot set user id" -msgstr "" - -#: src/su.c:371 -#, c-format -msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" -msgstr "Utilizare: %s [OPȚIUNE]... [-] [UTILIZATOR [ARG]...]\n" - -#: src/su.c:372 -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 "" - -#: src/su.c:384 -msgid "" -"\n" -"A mere - implies -l. If USER not given, assume root.\n" -msgstr "" - -#: src/su.c:461 -#, c-format -msgid "user %s does not exist" -msgstr "utilizatorul %s nu există" - -#: src/su.c:484 -#, c-format -msgid "incorrect password" -msgstr "parolă incorectă" - -#: src/su.c:501 -#, c-format -msgid "using restricted shell %s" -msgstr "se utilizează interpretorul restricționat %s" - -#: src/su.c:509 -#, c-format -msgid "warning: cannot change directory to %s" -msgstr "atenție: dosarul nu se poate schimba la %s" - #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 msgid "Kayvan Aghaiepour" @@ -8447,7 +8752,7 @@ msgstr "" msgid "ignoring all arguments" msgstr "se ignoră toate argumentele" -#: src/system.h:340 +#: src/system.h:343 #, c-format msgid "" "\n" @@ -8456,15 +8761,24 @@ msgid "" "for details about the options it supports.\n" msgstr "" -#: src/system.h:346 +#: src/system.h:349 msgid " --help display this help and exit\n" msgstr "" -#: src/system.h:348 +#: src/system.h:351 msgid " --version output version information and exit\n" msgstr "" -#: src/system.h:541 +#: src/system.h:544 +#, fuzzy +msgid "" +"\n" +"Mandatory arguments to long options are mandatory for short options too.\n" +msgstr "" +"Argumentele obligatorii pentru opțiuni lungi sînt obligatorii și pentru " +"opțiunile scurte.\n" + +#: src/system.h:552 msgid "" "\n" "SIZE is an integer and optional unit (example: 10M is 10*1024*1024). Units\n" @@ -8472,7 +8786,7 @@ msgid "" "1000).\n" msgstr "" -#: src/system.h:550 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -8481,7 +8795,7 @@ msgid "" "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n" msgstr "" -#: src/system.h:560 +#: src/system.h:571 #, c-format msgid "" "\n" @@ -8494,22 +8808,22 @@ msgstr "" #. <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:574 +#: src/system.h:585 #, c-format msgid "Report %s translation bugs to <http://translationproject.org/team/>\n" msgstr "" -#: src/system.h:578 +#: src/system.h:589 #, c-format msgid "For complete documentation, run: info coreutils '%s invocation'\n" msgstr "" -#: src/system.h:585 +#: src/system.h:596 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "Încercați „%s --help” pentru informații suplimentare.\n" -#: src/system.h:617 +#: src/system.h:628 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -8525,55 +8839,57 @@ 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" -"\n" msgstr "" +"\n" +"Fără FIȘIER, sau cînd FIȘIER e -, citește intrarea standard.\n" -#: src/tac.c:145 +#: src/tac.c:144 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 "" -#: src/tac.c:235 src/tac.c:336 +#: src/tac.c:234 src/tac.c:335 #, c-format msgid "%s: seek failed" msgstr "" -#: src/tac.c:264 +#: src/tac.c:263 #, c-format msgid "record too large" msgstr "înregistrare prea mare" -#: src/tac.c:451 +#: src/tac.c:450 #, fuzzy, c-format msgid "failed to create temporary file in %s" msgstr "eșec la crearea contextului de securitate: %s" -#: src/tac.c:459 +#: src/tac.c:458 #, fuzzy, c-format msgid "failed to open %s for writing" msgstr "%s: eșec la deschiderea pentru scriere" -#: src/tac.c:476 +#: src/tac.c:475 #, fuzzy, c-format msgid "failed to rewind stream for %s" msgstr "păstrarea timpilor pentru %s a eșuat" -#: src/tac.c:512 src/tac.c:519 +#: src/tac.c:511 src/tac.c:518 #, c-format msgid "%s: write error" msgstr "%s: eroare de scriere" -#: src/tac.c:572 +#: src/tac.c:571 #, fuzzy, c-format msgid "failed to open %s for reading" msgstr "%s nu poate fi deschis pentru citire" -#: src/tac.c:630 +#: src/tac.c:629 #, c-format msgid "separator cannot be empty" msgstr "separatorul nu poate fi gol" @@ -8589,10 +8905,9 @@ 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" -"\n" msgstr "" -#: src/tail.c:271 +#: src/tail.c:270 msgid "" " -c, --bytes=K output the last K bytes; alternatively, use -c " "+K\n" @@ -8600,7 +8915,7 @@ msgid "" "file\n" msgstr "" -#: src/tail.c:275 +#: src/tail.c:274 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -8609,7 +8924,7 @@ msgid "" " -F same as --follow=name --retry\n" msgstr "" -#: src/tail.c:282 +#: src/tail.c:281 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -8623,7 +8938,7 @@ msgid "" " With inotify, this option is rarely useful.\n" msgstr "" -#: src/tail.c:295 +#: src/tail.c:294 msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" " -q, --quiet, --silent never output headers giving file names\n" @@ -8632,7 +8947,7 @@ msgid "" " name, i.e., with --follow=name\n" msgstr "" -#: src/tail.c:302 +#: src/tail.c:301 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations.\n" @@ -8641,7 +8956,7 @@ msgid "" " -v, --verbose always output headers giving file names\n" msgstr "" -#: src/tail.c:311 +#: src/tail.c:310 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -8652,7 +8967,7 @@ msgid "" "\n" msgstr "" -#: src/tail.c:320 +#: src/tail.c:319 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" @@ -8662,64 +8977,64 @@ msgid "" "named file in a way that accommodates renaming, removal and creation.\n" msgstr "" -#: src/tail.c:379 +#: src/tail.c:378 #, c-format msgid "closing %s (fd=%d)" msgstr "se închide %s (fd=%d)" -#: src/tail.c:454 +#: src/tail.c:453 #, c-format msgid "%s: cannot seek to relative offset %s" msgstr "" -#: src/tail.c:458 +#: src/tail.c:457 #, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "" -#: src/tail.c:895 +#: src/tail.c:894 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "" -#: src/tail.c:907 +#: src/tail.c:906 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" msgstr "" -#: src/tail.c:964 +#: src/tail.c:963 #, c-format msgid "%s has become inaccessible" msgstr "%s a devenit inaccesibil" -#: src/tail.c:981 +#: src/tail.c:980 #, c-format msgid "%s has been replaced with an untailable file; giving up on this name" msgstr "" -#: src/tail.c:990 +#: src/tail.c:989 #, c-format msgid "%s has been replaced with a remote file. giving up on this name" msgstr "" -#: src/tail.c:1011 +#: src/tail.c:1010 #, c-format msgid "%s has become accessible" msgstr "%s a devenit accesibil" -#: src/tail.c:1019 +#: src/tail.c:1018 #, c-format msgid "%s has appeared; following end of new file" msgstr "" -#: src/tail.c:1030 +#: src/tail.c:1029 #, c-format msgid "%s has been replaced; following end of new file" msgstr "" -#: src/tail.c:1131 +#: src/tail.c:1130 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "" @@ -9014,17 +9329,22 @@ msgstr "lipsește „]”" msgid "extra argument %s" msgstr "argument în plus %s" -#: src/timeout.c:124 +#: src/timeout.c:112 +#, c-format +msgid "warning: sigprocmask" +msgstr "" + +#: src/timeout.c:145 #, c-format msgid "warning: timer_settime" msgstr "" -#: src/timeout.c:129 +#: src/timeout.c:150 #, c-format msgid "warning: timer_create" msgstr "" -#: src/timeout.c:204 +#: src/timeout.c:225 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -9033,18 +9353,18 @@ msgstr "" "Utilizare: %s [OPȚIUNE] RĂDĂCINĂNOUĂ [COMANDĂ [ARG]...]\n" " sau: %s OPȚIUNE\n" -#: src/timeout.c:208 +#: src/timeout.c:229 #, fuzzy -msgid "" -"Start COMMAND, and kill it if still running after DURATION.\n" -"\n" -"Mandatory arguments to long options are mandatory for short options too.\n" +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:213 +#: src/timeout.c:235 msgid "" +" --preserve-status\n" +" exit with the same status as COMMAND, even when the\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 " @@ -9059,7 +9379,7 @@ msgid "" " See 'kill -l' for a list of signals\n" msgstr "" -#: src/timeout.c:229 +#: src/timeout.c:254 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -9067,25 +9387,30 @@ msgid "" "days.\n" msgstr "" -#: src/timeout.c:234 +#: src/timeout.c:259 msgid "" "\n" -"If the command times out, then exit with status 124. Otherwise, exit\n" -"with the status of COMMAND. If no signal is specified, send the TERM\n" -"signal upon timeout. The TERM signal kills any process that does not\n" -"block or catch that signal. For other processes, it may be necessary to\n" -"use the KILL (9) signal, since this signal cannot be caught. If the\n" -"KILL (9) signal is sent, the exit status is 128+9 rather than 124.\n" +"If the command times out, and --preserve-status is not set, then exit with\n" +"status 124. Otherwise, exit with the status of COMMAND. If no signal\n" +"is specified, send the TERM signal upon timeout. The TERM signal kills\n" +"any process that does not block or catch that signal. It may be necessary\n" +"to use the KILL (9) signal, since this signal cannot be caught, in which\n" +"case the exit status is 128+9 rather than 124.\n" msgstr "" -#: src/timeout.c:419 +#: src/timeout.c:363 +#, c-format +msgid "warning: disabling core dumps failed" +msgstr "" + +#: src/timeout.c:471 #, c-format msgid "error waiting for command" msgstr "" -#: src/timeout.c:441 +#: src/timeout.c:482 #, c-format -msgid "warning: disabling core dumps failed" +msgid "the monitored command dumped core" msgstr "" #. This is a proper name. See the gettext manual, section Names. @@ -9098,22 +9423,22 @@ msgstr "Jim Kingdon" msgid "Randy Smith" msgstr "Randy Smith" -#: src/touch.c:115 src/touch.c:313 +#: src/touch.c:115 src/touch.c:309 #, c-format msgid "invalid date format %s" msgstr "format de dată necunoscut %s" -#: src/touch.c:194 +#: src/touch.c:191 #, c-format msgid "cannot touch %s" msgstr "nu se poate atinge %s" -#: src/touch.c:200 +#: src/touch.c:197 #, c-format msgid "setting times of %s" msgstr "se stabilesc timpii %s" -#: src/touch.c:216 +#: src/touch.c:213 msgid "" "Update the access and modification times of each FILE to the current time.\n" "\n" @@ -9122,10 +9447,9 @@ msgid "" "\n" "A FILE argument string of - is handled specially and causes touch to\n" "change the times of the file associated with standard output.\n" -"\n" msgstr "" -#: src/touch.c:229 +#: src/touch.c:225 msgid "" " -a change only the access time\n" " -c, --no-create do not create any files\n" @@ -9133,7 +9457,7 @@ msgid "" " -f (ignored)\n" msgstr "" -#: src/touch.c:235 +#: src/touch.c:231 msgid "" " -h, --no-dereference affect each symbolic link instead of any " "referenced\n" @@ -9142,27 +9466,27 @@ msgid "" " -m change only the modification time\n" msgstr "" -#: src/touch.c:241 +#: src/touch.c:237 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" -" --time=WORD change the specified time:\n" +" --time=WORD change the specified time:\n" " WORD is access, atime, or use: equivalent to -a\n" " WORD is modify or mtime: equivalent to -m\n" msgstr "" -#: src/touch.c:250 +#: src/touch.c:246 msgid "" "\n" "Note that the -d and -t options accept different time-date formats.\n" msgstr "" -#: src/touch.c:339 +#: src/touch.c:335 #, c-format msgid "cannot specify times from more than one source" msgstr "timpii nu pot fi specificați din mai mult de o sursă" -#: src/touch.c:413 +#: src/touch.c:409 #, c-format msgid "" "warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'" @@ -9380,25 +9704,24 @@ msgid "" "If a FILE is larger than the specified size, the extra data is lost.\n" "If a FILE is shorter, it is extended and the extended part (hole)\n" "reads as zero bytes.\n" -"\n" msgstr "" -#: src/truncate.c:110 +#: src/truncate.c:109 msgid " -c, --no-create do not create any files\n" msgstr " -c, --no-create nu crea niciun fișier\n" -#: src/truncate.c:113 +#: src/truncate.c:112 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" -#: src/truncate.c:116 +#: 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" msgstr "" -#: src/truncate.c:122 +#: src/truncate.c:121 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -9406,57 +9729,57 @@ msgid "" "'/' round down to multiple of, '%' round up to multiple of.\n" msgstr "" -#: src/truncate.c:150 +#: src/truncate.c:149 #, c-format msgid "overflow in %<PRIdMAX> * %<PRIdMAX> byte blocks for file %s" msgstr "" -#: src/truncate.c:174 +#: src/truncate.c:173 #, c-format msgid "%s has unusable, apparently negative size" msgstr "" -#: src/truncate.c:184 src/truncate.c:379 +#: src/truncate.c:183 src/truncate.c:384 #, fuzzy, c-format msgid "cannot get the size of %s" msgstr "apartenența %s nu poate fi schimbată" -#: src/truncate.c:206 +#: src/truncate.c:205 #, c-format msgid "overflow rounding up size of file %s" msgstr "" -#: src/truncate.c:216 +#: src/truncate.c:215 #, c-format msgid "overflow extending size of file %s" msgstr "" -#: src/truncate.c:231 +#: src/truncate.c:230 #, c-format msgid "failed to truncate %s at %<PRIdMAX> bytes" msgstr "" -#: src/truncate.c:305 +#: src/truncate.c:303 #, c-format msgid "multiple relative modifiers specified" msgstr "" -#: src/truncate.c:335 +#: src/truncate.c:333 #, fuzzy, c-format msgid "you must specify either %s or %s" msgstr "trebuie să specificați o listă de octeți, caractere sau cîmpuri" -#: src/truncate.c:342 +#: src/truncate.c:340 #, c-format msgid "you must specify a relative %s with %s" msgstr "" -#: src/truncate.c:349 +#: src/truncate.c:347 #, c-format msgid "%s was specified but %s was not" msgstr "" -#: src/truncate.c:400 +#: src/truncate.c:404 #, c-format msgid "cannot open %s for writing" msgstr "%s nu se poate deschide pentru scriere" @@ -9530,13 +9853,15 @@ msgid "cannot get system name" msgstr "nu se poate obține numele sistemului" #: 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" -"\n" msgstr "" +"\n" +"Fără FIȘIER, sau cînd FIȘIER e -, citește intrarea standard.\n" -#: src/unexpand.c:125 +#: src/unexpand.c:124 msgid "" " -a, --all convert all blanks, instead of just initial blanks\n" " --first-only convert only leading sequences of blanks (overrides -a)\n" @@ -9544,12 +9869,12 @@ msgid "" " -t, --tabs=LIST use comma separated LIST of tab positions (enables -a)\n" msgstr "" -#: src/unexpand.c:153 +#: src/unexpand.c:152 #, c-format msgid "tabs are too far apart" msgstr "" -#: src/unexpand.c:505 +#: src/unexpand.c:504 #, c-format msgid "tab stop value is too large" msgstr "" @@ -9565,16 +9890,15 @@ msgid "" "writing to OUTPUT (or standard output).\n" "\n" "With no options, matching lines are merged to the first occurrence.\n" -"\n" msgstr "" -#: src/uniq.c:148 +#: src/uniq.c:147 msgid "" " -c, --count prefix lines by the number of occurrences\n" " -d, --repeated only print duplicate lines\n" msgstr "" -#: src/uniq.c:152 +#: src/uniq.c:151 msgid "" " -D, --all-repeated[=delimit-method] print all duplicate lines\n" " delimit-method={none(default),prepend,separate}\n" @@ -9586,18 +9910,18 @@ msgid "" " -z, --zero-terminated end lines with 0 byte, not newline\n" msgstr "" -#: src/uniq.c:162 +#: src/uniq.c:161 msgid " -w, --check-chars=N compare no more than N characters in lines\n" msgstr "" -#: src/uniq.c:167 +#: src/uniq.c:166 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:172 +#: src/uniq.c:171 msgid "" "\n" "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n" @@ -9605,24 +9929,24 @@ msgid "" "Also, comparisons honor the rules specified by 'LC_COLLATE'.\n" msgstr "" -#: src/uniq.c:359 +#: src/uniq.c:358 #, c-format msgid "too many repeated lines" msgstr "prea multe linii repetate" -#: src/uniq.c:522 +#: src/uniq.c:521 msgid "invalid number of fields to skip" msgstr "" -#: src/uniq.c:531 +#: src/uniq.c:530 msgid "invalid number of bytes to skip" msgstr "" -#: src/uniq.c:540 +#: src/uniq.c:539 msgid "invalid number of bytes to compare" msgstr "" -#: src/uniq.c:559 +#: src/uniq.c:558 #, c-format msgid "printing all duplicated lines and repeat counts is meaningless" msgstr "" @@ -9675,6 +9999,11 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" +#: src/uptime.c:149 +#, c-format +msgid "up %2d:%02d, " +msgstr "" + #: src/uptime.c:151 #, c-format msgid "%lu user" @@ -9749,83 +10078,83 @@ msgstr "" msgid " old " msgstr " vechi " -#: src/who.c:449 +#: src/who.c:440 msgid "system boot" msgstr "demarare sistem" -#: src/who.c:456 src/who.c:458 +#: src/who.c:447 src/who.c:449 msgid "id=" msgstr "id=" -#: src/who.c:471 src/who.c:476 +#: src/who.c:462 src/who.c:467 msgid "term=" msgstr "term=" -#: src/who.c:473 src/who.c:477 +#: src/who.c:464 src/who.c:468 msgid "exit=" msgstr "" -#: src/who.c:494 +#: src/who.c:485 msgid "LOGIN" msgstr "" -#: src/who.c:514 +#: src/who.c:505 msgid "clock change" msgstr "" -#: src/who.c:526 src/who.c:527 +#: src/who.c:517 src/who.c:518 msgid "run-level" msgstr "" -#: src/who.c:530 src/who.c:531 +#: src/who.c:521 src/who.c:522 msgid "last=" msgstr "" -#: src/who.c:562 +#: src/who.c:553 #, c-format msgid "" "\n" "# users=%lu\n" msgstr "" -#: src/who.c:568 +#: src/who.c:559 msgid "NAME" msgstr "" -#: src/who.c:568 +#: src/who.c:559 msgid "LINE" msgstr "LINIE" -#: src/who.c:568 +#: src/who.c:559 msgid "TIME" msgstr "" -#: src/who.c:568 +#: src/who.c:559 msgid "IDLE" msgstr "" -#: src/who.c:569 +#: src/who.c:560 msgid "PID" msgstr "PID" -#: src/who.c:569 +#: src/who.c:560 msgid "COMMENT" msgstr "" -#: src/who.c:569 +#: src/who.c:560 msgid "EXIT" msgstr "" -#: src/who.c:649 +#: src/who.c:640 #, c-format msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n" msgstr "" -#: src/who.c:650 +#: src/who.c:641 msgid "Print information about users who are currently logged in.\n" msgstr "" -#: src/who.c:653 +#: src/who.c:644 msgid "" "\n" " -a, --all same as -b -d --login -p -r -t -T -u\n" @@ -9834,18 +10163,18 @@ msgid "" " -H, --heading print line of column headings\n" msgstr "" -#: src/who.c:660 +#: src/who.c:651 msgid " -l, --login print system login processes\n" msgstr "" -#: src/who.c:663 +#: src/who.c:654 msgid "" " --lookup attempt to canonicalize hostnames via DNS\n" " -m only hostname and user associated with stdin\n" " -p, --process print active processes spawned by init\n" msgstr "" -#: src/who.c:668 +#: src/who.c:659 msgid "" " -q, --count all login names and number of users logged on\n" " -r, --runlevel print current runlevel\n" @@ -9853,7 +10182,7 @@ msgid "" " -t, --time print last system clock change\n" msgstr "" -#: src/who.c:674 +#: src/who.c:665 msgid "" " -T, -w, --mesg add user's message status as +, - or ?\n" " -u, --users list users logged in\n" @@ -9861,7 +10190,7 @@ msgid "" " --writable same as -T\n" msgstr "" -#: src/who.c:682 +#: src/who.c:673 #, c-format msgid "" "\n" @@ -9895,12 +10224,27 @@ msgid "" msgstr "" #, fuzzy -#~ msgid " gid=%s" -#~ msgstr " gid=%lu" +#~ msgid " returning value: '%s'\n" +#~ msgstr "se creează fișierul %s\n" #, fuzzy -#~ msgid " euid=%s" -#~ msgstr " euid=%lu" +#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n" +#~ msgstr "Utilizare: %s [OPȚIUNE]... [UTILIZATOR]...\n" + +#~ msgid "reading %s" +#~ msgstr "se citește %s" + +#~ msgid "writing %s" +#~ msgstr "se scrie %s" + +#~ msgid "closing %s" +#~ msgstr "se închide %s" + +#~ msgid "accessing %s" +#~ msgstr "se accesează %s" + +#~ msgid "opening %s" +#~ msgstr "se deschide %s" #~ msgid "" #~ "Usage: %s NAME\n" @@ -9909,34 +10253,47 @@ msgstr "" #~ "Utilizare: %s DENUMIRE\n" #~ " sau: %s OPȚIUNE\n" -#, fuzzy -#~ msgid "Usage: %s [OPTION] FILE...\n" -#~ msgstr "Utilizare: %s [OPȚIUNE]... FIȘIER...\n" - -#, fuzzy -#~ msgid "Usage: %s [OPTION]... PATH START\n" -#~ msgstr "Utilizare: %s [OPȚIUNE]... MULȚIME1 [MULȚIME2]\n" - -#, fuzzy #~ msgid "" -#~ " -n, --no-newline do not output the trailing " -#~ "newline\n" -#~ " " +#~ "WARNING: --page-increment is deprecated; use --line-increment instead" #~ msgstr "" -#~ "Imită ȘIR(uri) spre ieșirea standard.\n" -#~ "\n" -#~ " -n nu afișa linia nouă finală\n" +#~ "ATENȚIE: --page-increment este învechit; utilizați --line-increment în " +#~ "schimb" -#, fuzzy -#~ msgid "%s: option '%s' is ambiguous\n" -#~ msgstr "%s: opțiunea „-W %s” e ambiguă\n" +#~ msgid "All arguments to long options are mandatory for short options.\n" +#~ msgstr "" +#~ "Toate argumentele obligatorii pentru opțiuni lungi sînt obligatorii " +#~ "pentru opțiuni scurte\n" + +#~ msgid "Usage: %s [OPTION]... FILE\n" +#~ msgstr "Utilizare: %s OPȚIUNE]... FIȘIER\n" + +#~ msgid "Password:" +#~ msgstr "Parolă:" + +#~ msgid "getpass: cannot open /dev/tty" +#~ msgstr "getpass: nu se poate deschide /dev/tty" + +#~ msgid "cannot set groups" +#~ msgstr "nu se pot stabili grupurile" + +#~ msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" +#~ msgstr "Utilizare: %s [OPȚIUNE]... [-] [UTILIZATOR [ARG]...]\n" + +#~ msgid "user %s does not exist" +#~ msgstr "utilizatorul %s nu există" + +#~ msgid "incorrect password" +#~ msgstr "parolă incorectă" + +#~ msgid "using restricted shell %s" +#~ msgstr "se utilizează interpretorul restricționat %s" + +#~ msgid "warning: cannot change directory to %s" +#~ msgstr "atenție: dosarul nu se poate schimba la %s" #~ msgid "%s" #~ msgstr "%s" -#~ msgid "invalid format width" -#~ msgstr "lățime nevalidă a formatului" - #~ msgid "invalid format precision" #~ msgstr "precizie nevalidă a formatului" diff --git a/po/ru.gmo b/po/ru.gmo index 8b9cbb3f..88b34354 100644 Binary files a/po/ru.gmo and b/po/ru.gmo differ diff --git a/po/ru.po b/po/ru.po index cbff46ca..46723a35 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. +# Yuri Kozlov <yuray@komyakino.ru>, 2009, 2010, 2011, 2012, 2013. # Pavel Maryanov <acid@jack.kiev.ua>, 2011. msgid "" msgstr "" -"Project-Id-Version: coreutils 8.16\n" +"Project-Id-Version: coreutils 8.20-pre3\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2012-05-10 19:35+0200\n" -"PO-Revision-Date: 2012-03-27 20:55+0400\n" +"POT-Creation-Date: 2013-02-14 15:56+0000\n" +"PO-Revision-Date: 2013-02-12 21:26+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.2\n" +"X-Generator: Lokalize 1.4\n" #: lib/argmatch.c:133 #, c-format @@ -41,19 +41,19 @@ msgstr "Допустимые аргументы:" msgid "error closing file" msgstr "ошибка закрытия файла" -#: lib/closeout.c:112 src/base64.c:109 src/base64.c:121 src/base64.c:127 -#: src/base64.c:168 src/base64.c:224 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:330 src/expand.c:355 src/head.c:298 -#: src/head.c:348 src/head.c:756 src/head.c:797 src/mktemp.c:350 src/od.c:919 -#: src/paste.c:160 src/shuf.c:369 src/split.c:727 src/split.c:964 -#: src/split.c:969 src/tail.c:350 src/tail.c:1201 src/tail.c:1307 +#: 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 -#: src/unexpand.c:427 src/unexpand.c:443 +#: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "ошибка записи" -#: lib/copy-acl.c:611 src/copy.c:1160 src/copy.c:2602 +#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617 #, c-format msgid "preserving permissions for %s" msgstr "сохранение прав доступа для %s" @@ -245,18 +245,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:483 +#: lib/mkdir-p.c:196 src/install.c:484 #, c-format msgid "cannot change permissions of %s" msgstr "невозможно изменить права доступа %s" -#: lib/mkdir-p.c:206 src/copy.c:2261 src/install.c:709 src/install.c:722 +#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722 #, 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:915 src/tac.c:435 +#: src/split.c:929 src/tac.c:434 #, c-format msgid "memory exhausted" msgstr "память исчерпана" @@ -305,75 +305,75 @@ msgstr "»" msgid "%s: end of file" msgstr "%s: конец файла" -#: lib/regcomp.c:130 +#: lib/regcomp.c:131 msgid "Success" msgstr "Успех" -#: lib/regcomp.c:133 +#: lib/regcomp.c:134 msgid "No match" msgstr "Нет соответствия" -#: lib/regcomp.c:136 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "Недопустимое регулярное выражение" -#: lib/regcomp.c:139 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "Неверный символ сортировки" -#: lib/regcomp.c:142 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "Неверное имя класса символов" -#: lib/regcomp.c:145 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "Обратная косая черта в конце выражения" -#: lib/regcomp.c:148 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "Неверная обратная ссылка" -#: lib/regcomp.c:151 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "Непарная [ или [^" -#: lib/regcomp.c:154 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "Непарная ( или \\(" -#: lib/regcomp.c:157 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "Непарная \\{" -#: lib/regcomp.c:160 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "Неверное содержимое \\{\\}" -#: lib/regcomp.c:163 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "Неверный конец диапазона" -#: lib/regcomp.c:166 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Память исчерпана" -#: lib/regcomp.c:169 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "Неверное предшествующее регулярное выражение" -#: lib/regcomp.c:172 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "Преждевременный конец регулярного выражения" -#: lib/regcomp.c:175 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "Регулярное выражение слишком велико" -#: lib/regcomp.c:178 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "Непарная ) или \\)" -#: lib/regcomp.c:703 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "Нет предшествующего регулярного выражения" @@ -413,7 +413,7 @@ msgstr "^[ДдYy]" msgid "^[nN]" msgstr "^[НнNn]" -#: lib/set-mode-acl.c:695 src/copy.c:2284 src/cp.c:518 +#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516 #, c-format msgid "setting permissions for %s" msgstr "установка прав доступа для %s" @@ -554,13 +554,13 @@ msgstr "Отказ питания" msgid "Resource lost" msgstr "Ресурс потерян" -#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262 -#: lib/spawn-pipe.c:265 +#: 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:232 lib/spawn-pipe.c:346 lib/wait-process.c:282 +#: 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" @@ -576,24 +576,24 @@ msgstr "Сигнал реального времени %d" msgid "Unknown signal %d" msgstr "Неизвестный сигнал %d" -#: lib/unicodeio.c:103 +#: lib/unicodeio.c:102 msgid "iconv function not usable" msgstr "функция iconv неприменима" -#: lib/unicodeio.c:105 +#: lib/unicodeio.c:104 msgid "iconv function not available" msgstr "функция iconv недоступна" -#: lib/unicodeio.c:112 +#: lib/unicodeio.c:111 msgid "character out of range" msgstr "символ вне допустимого диапазона" -#: lib/unicodeio.c:182 +#: lib/unicodeio.c:181 #, c-format msgid "cannot convert U+%04X to local character set" msgstr "невозможно преобразовать U+%04X к локальной кодировке" -#: lib/unicodeio.c:184 +#: lib/unicodeio.c:183 #, c-format msgid "cannot convert U+%04X to local character set: %s" msgstr "невозможно преобразовать U+%04X к локальной кодировке: %s" @@ -775,7 +775,7 @@ msgstr "" msgid "Report %s bugs to: %s\n" msgstr "Об ошибках в %s сообщайте по адресу %s\n" -#: lib/version-etc.c:251 src/system.h:562 +#: lib/version-etc.c:251 src/system.h:573 #, c-format msgid "%s home page: <%s>\n" msgstr "Домашняя страница %s: <%s>\n" @@ -785,7 +785,7 @@ 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:563 +#: lib/version-etc.c:256 src/system.h:574 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "Справка по работе с программами GNU: <http://www.gnu.org/gethelp/>\n" @@ -875,14 +875,12 @@ msgstr "Саймон Джозефсон (Simon Josefsson)" msgid "" "Usage: %s [OPTION]... [FILE]\n" "Base64 encode or decode FILE, or standard input, to standard output.\n" -"\n" msgstr "" "Использование: %s [КЛЮЧ]… [ФАЙЛ]\n" -"Кодирует или декодирует в/из base64 ФАЙЛ или стандартный ввод на " -"стандартный \n" -"вывод.\n" +"Кодирует или декодирует ФАЙЛ или стандартный ввод на стандартный\n" +"вывод в/из base64.\n" -#: src/base64.c:64 +#: src/base64.c:67 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -899,7 +897,7 @@ msgstr "" " выключить перенос.\n" "\n" -#: src/base64.c:73 src/cat.c:110 src/fmt.c:293 src/shuf.c:71 src/sum.c:70 +#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -907,7 +905,7 @@ msgstr "" "\n" "Если ФАЙЛ не задан или задан как -, читает стандартный ввод.\n" -#: src/base64.c:76 +#: src/base64.c:79 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -921,37 +919,37 @@ msgstr "" "формального алфавита base64. Используйте ключ --ignore-garbage, чтобы\n" "попытаться проигнорировать неалфавитные символы в закодированном потоке.\n" -#: src/base64.c:171 src/base64.c:208 src/csplit.c:263 src/csplit.c:1435 -#: src/join.c:451 src/shuf.c:157 src/shuf.c:361 src/tac-pipe.c:74 +#: 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 #, c-format msgid "read error" msgstr "ошибка чтения" -#: src/base64.c:227 +#: src/base64.c:230 #, c-format msgid "invalid input" msgstr "неверный ввод" -#: src/base64.c:264 +#: src/base64.c:267 #, c-format msgid "invalid wrap size: %s" msgstr "неверный размер переноса: %s" -#: src/base64.c:283 src/basename.c:173 src/comm.c:435 src/cp.c:607 -#: src/date.c:441 src/dircolors.c:447 src/du.c:894 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:169 src/install.c:929 src/join.c:961 -#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:157 src/mv.c:447 -#: src/od.c:1802 src/ptx.c:2081 src/readlink.c:154 src/seq.c:408 -#: src/shuf.c:320 src/shuf.c:339 src/sort.c:4477 src/split.c:1313 -#: src/tr.c:1797 src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:454 -#: src/uniq.c:471 src/unlink.c:81 src/uptime.c:250 src/users.c:146 -#: src/wc.c:666 src/who.c:836 src/whoami.c:79 +#: 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 #, c-format msgid "extra operand %s" msgstr "лишний операнд %s" -#: src/base64.c:315 src/cat.c:781 +#: src/base64.c:318 src/cat.c:781 #, c-format msgid "closing standard input" msgstr "закрытие стандартного ввода" @@ -959,15 +957,15 @@ 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/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:53 src/env.c:33 +#: 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/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:65 src/su.c:88 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 +#: 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 msgid "David MacKenzie" msgstr "Дэвид Маккензи (David MacKenzie)" @@ -984,13 +982,11 @@ msgstr "" msgid "" "Print NAME with any leading directory components removed.\n" "If specified, also remove a trailing SUFFIX.\n" -"\n" msgstr "" "Выводит ИМЯ без предшествующих названий каталогов.\n" "Если указано, удаляет также завершающий СУФФИКС.\n" -"\n" -#: src/basename.c:59 +#: 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" @@ -1000,7 +996,7 @@ msgstr "" " -s, --suffix=СУФФИКС удалить завершающий СУФФИКС\n" " -z, --zero разделять вывод NUL, а не символом новой строки\n" -#: src/basename.c:66 +#: src/basename.c:67 #, c-format msgid "" "\n" @@ -1017,20 +1013,21 @@ msgstr "" " %s -s .h include/stdio.h -> «stdio»\n" " %s -a any/str1 any/str2 -> за «str1» выведется «str2»\n" -#: src/basename.c:167 src/chcon.c:531 src/chgrp.c:277 src/chmod.c:526 -#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1369 +#: 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:183 src/mkfifo.c:108 src/mknod.c:146 src/nohup.c:111 -#: src/pathchk.c:148 src/printf.c:674 src/readlink.c:146 src/realpath.c:236 -#: src/rm.c:314 src/rmdir.c:223 src/seq.c:402 src/setuidgid.c:137 -#: src/sleep.c:119 src/stat.c:1476 src/stdbuf.c:346 src/tr.c:1782 +#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 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 #, 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:52 src/split.c:49 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/split.c:49 msgid "Torbjorn Granlund" msgstr "Торбьёрн Гронлунд (Torbjorn Granlund)" @@ -1038,10 +1035,10 @@ msgstr "Торбьёрн Гронлунд (Torbjorn Granlund)" #: src/cat.c:49 src/comm.c:37 src/ls.c:123 src/rm.c:43 src/split.c:50 #: src/tee.c:35 src/uniq.c:41 msgid "Richard M. Stallman" -msgstr "Ричард М. Столлмен (Richard M. Stallman)" +msgstr "Ричард М. Столлман (Richard M. Stallman)" -#: src/cat.c:88 src/df.c:846 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4720 src/nl.c:182 src/paste.c:435 src/pr.c:2768 src/sum.c:58 +#: 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/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" @@ -1076,7 +1073,7 @@ msgid "" " -v, --show-nonprinting use ^ and M- notation, except for LFD and TAB\n" msgstr "" " -t синоним -vT\n" -" -T, --show-tabs показывать символов табуляции как ^I\n" +" -T, --show-tabs показывать символы табуляции как ^I\n" " -u (игнорируется)\n" " -v, --show-nonprinting использовать запись с ^ и M-, за исключением\n" " символов перевода строки и табуляции\n" @@ -1099,7 +1096,7 @@ msgstr "" msgid "cannot do ioctl on %s" msgstr "невозможно выполнить ioctl для %s" -#: src/cat.c:637 src/dd.c:2209 src/sort.c:379 src/tee.c:165 src/yes.c:86 +#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86 #, c-format msgid "standard output" msgstr "стандартный вывод" @@ -1116,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:55 src/head.c:46 src/hostid.c:33 +#: 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 msgid "Jim Meyering" msgstr "Джим Мейеринг (Jim Meyering)" -#: src/chcon.c:100 src/runcon.c:203 src/runcon.c:234 +#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238 #, c-format msgid "failed to create security context: %s" msgstr "не удалось создать контекст безопасности: %s" @@ -1133,8 +1130,8 @@ msgstr "не удалось создать контекст безопаснос msgid "failed to set %s security context component to %s" msgstr "не удалось установить компонент контекста безопасности %s равным %s" -#: src/chcon.c:156 src/chcon.c:540 src/copy.c:2222 src/runcon.c:217 -#: src/stat.c:683 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221 +#: src/stat.c:702 #, c-format msgid "failed to get security context of %s" msgstr "не удалось получить контекст безопасности %s" @@ -1142,7 +1139,7 @@ msgstr "не удалось получить контекст безопасно #: src/chcon.c:166 #, c-format msgid "can't apply partial context to unlabeled file %s" -msgstr "не удалось применить частичный контекст к непомеченному файлу %s" +msgstr "не удалось применить частичный контекст к не помеченному файлу %s" #: src/chcon.c:193 #, c-format @@ -1150,12 +1147,12 @@ 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:446 src/ls.c:2981 +#: src/du.c:457 src/ls.c:2981 #, c-format msgid "cannot access %s" msgstr "невозможно получить доступ к %s" -#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:426 +#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437 #, c-format msgid "cannot read directory %s" msgstr "невозможно прочитать каталог %s" @@ -1165,13 +1162,13 @@ 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:599 +#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562 #, 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:618 -#: src/remove.c:613 +#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642 +#: src/remove.c:576 #, c-format msgid "fts_close failed" msgstr "операция fts_close завершилась неудачно" @@ -1192,14 +1189,12 @@ msgid "" "Change the security context of each FILE to CONTEXT.\n" "With --reference, change the security context of each FILE to that of " "RFILE.\n" -"\n" msgstr "" -"Смена КОНТЕКСТА безопасности указанных ФАЙЛОВ.\n" -"При задании --reference, сменить контекст безопасности\n" -"указанных ФАЙЛОВ как у ЭФАЙЛА.\n" -"\n" +"Меняет КОНТЕКСТ безопасности указанных ФАЙЛОВ.\n" +"При задании --reference, делает контекст безопасности\n" +"указанных ФАЙЛОВ таким же как у ЭФАЙЛА.\n" -#: src/chcon.c:362 src/chgrp.c:123 src/chown.c:94 +#: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94 msgid "" " --dereference affect the referent of each symbolic link (this is\n" " the default), rather than the symbolic link itself\n" @@ -1211,7 +1206,7 @@ msgstr "" " ссылке (по умолчанию)\n" " -h, --no-dereference применять к символьной ссылке, а не к самому файлу\n" -#: src/chcon.c:367 +#: src/chcon.c:369 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" @@ -1225,7 +1220,15 @@ msgstr "" " -l, --range=ДИАПАЗОН задать ДИАПАЗОН в назначаемом контексте " "безопасности\n" -#: src/chcon.c:373 +#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 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 не обрабатывать «/» особым образом (по умолчанию)\n" +" --preserve-root отказываться рекурсивно обрабатывать «/»\n" + +#: src/chcon.c:379 msgid "" " --reference=RFILE use RFILE's security context rather than " "specifying\n" @@ -1234,17 +1237,17 @@ msgstr "" " --reference=ЭФАЙЛ использовать контекст безопасности ЭФАЙЛа, вместо\n" " указанного значения КОНТЕКСТА\n" -#: src/chcon.c:377 src/chgrp.c:140 src/chown.c:118 +#: 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 рекурсивно обрабатывать файлы и каталоги\n" -#: src/chcon.c:380 +#: src/chcon.c:386 msgid " -v, --verbose output a diagnostic for every file processed\n" msgstr "" " -v, --verbose выводить диагностические сообщения для каждого " "файла\n" -#: src/chcon.c:383 src/chgrp.c:143 src/chown.c:121 +#: src/chcon.c:389 src/chgrp.c:143 src/chown.c:121 msgid "" "\n" "The following options modify how a hierarchy is traversed when the -R\n" @@ -1271,36 +1274,36 @@ msgstr "" " -P не переходить по символьным ссылкам (по умолчанию)\n" "\n" -#: src/chcon.c:512 src/chgrp.c:264 src/chown.c:267 +#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267 #, c-format msgid "-R --dereference requires either -H or -L" msgstr "Комбинация ключей -R --dereference требует указать -H либо -L" -#: src/chcon.c:518 +#: src/chcon.c:524 #, c-format msgid "-R -h requires -P" msgstr "-R -h требуют -P" -#: src/chcon.c:533 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282 -#: src/comm.c:429 src/csplit.c:1371 src/join.c:1149 src/link.c:79 -#: src/mknod.c:148 src/setuidgid.c:139 src/tr.c:1785 +#: 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 #, c-format msgid "missing operand after %s" msgstr "пропущен операнд после %s" -#: src/chcon.c:556 src/runcon.c:247 +#: src/chcon.c:562 src/runcon.c:251 #, c-format msgid "invalid context: %s" msgstr "неверный контекст: %s" -#: src/chcon.c:563 +#: src/chcon.c:569 #, c-format msgid "conflicting security context specifiers given" msgstr "конфликт указанных параметров контекста безопасности" -#: src/chcon.c:572 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:433 src/cp.c:493 -#: src/mv.c:96 src/pwd.c:273 src/rm.c:324 src/touch.c:351 +#: 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 #, c-format msgid "failed to get attributes of %s" msgstr "ошибка получения атрибутов %s" @@ -1350,14 +1353,6 @@ msgstr "" " (имеет смысл только на системах, где\n" " можно изменять владельца символьной ссылки)\n" -#: src/chgrp.c:132 src/chmod.c:387 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 не обрабатывать «/» особым образом (по умолчанию)\n" -" --preserve-root отказываться рекурсивно обрабатывать «/»\n" - #: src/chgrp.c:136 msgid "" " --reference=RFILE use RFILE's group rather than specifying a\n" @@ -1621,7 +1616,7 @@ msgstr "" msgid "Roland McGrath" msgstr "Роланд МакГрат (Roland McGrath)" -#: src/chroot.c:97 src/install.c:575 src/setuidgid.c:110 src/setuidgid.c:120 +#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120 #, c-format msgid "invalid group %s" msgstr "неверная группа %s" @@ -1691,8 +1686,8 @@ msgstr "не удалось установить group-ID" msgid "failed to set user-ID" msgstr "не удалось установить user-ID" -#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:213 src/stdbuf.c:366 -#: src/timeout.c:402 +#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365 +#: src/timeout.c:454 #, c-format msgid "failed to run command %s" msgstr "не удалось выполнить команду %s" @@ -1813,20 +1808,24 @@ msgstr "указано несколько разделителей" msgid "empty %s not allowed" msgstr "пустое значение %s не разрешено" -#: src/copy.c:168 src/dd.c:1609 src/dd.c:1976 +#: 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 #, c-format -msgid "reading %s" -msgstr "чтение %s" +msgid "error reading %s" +msgstr "ошибка чтения %s" -#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:426 +#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425 #, c-format msgid "cannot lseek %s" msgstr "невозможно выполнить lseek для %s" -#: src/copy.c:206 src/dd.c:2039 src/dd.c:2102 +#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151 #, c-format -msgid "writing %s" -msgstr "запись %s" +msgid "error writing %s" +msgstr "ошибка записи %s" #: src/copy.c:313 #, c-format @@ -1848,7 +1847,7 @@ msgstr "не удалось расширить %s" msgid "clearing permissions for %s" msgstr "очистка прав доступа для %s" -#: src/copy.c:697 src/copy.c:2470 src/cp.c:331 +#: src/copy.c:697 src/copy.c:2480 src/cp.c:329 #, c-format msgid "failed to preserve ownership for %s" msgstr "не удалось сохранить владельца %s" @@ -1863,14 +1862,14 @@ msgstr "не удалось найти файл %s" msgid "failed to preserve authorship for %s" msgstr "не удалось сохранить автора %s" -#: src/copy.c:804 src/csplit.c:638 src/du.c:901 src/fmt.c:449 src/head.c:847 -#: src/sort.c:4489 src/split.c:1329 src/tail.c:1756 src/wc.c:678 +#: 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 "невозможно открыть %s для чтения" -#: src/copy.c:810 src/copy.c:972 src/dd.c:1546 src/dd.c:2114 src/dd.c:2252 -#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:141 +#: 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 #, c-format msgid "cannot fstat %s" msgstr "невозможно выполнить fstat для %s" @@ -1890,14 +1889,14 @@ msgstr "не удалось получить контекст создания msgid "failed to set the security context of %s to %s" msgstr "не удалось установить контекст безопасности для %s в %s" -#: src/copy.c:881 src/copy.c:1574 src/copy.c:1777 src/copy.c:1935 src/ln.c:314 -#: src/remove.c:267 src/remove.c:293 src/remove.c:444 src/remove.c:465 +#: 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 #, c-format msgid "cannot remove %s" msgstr "невозможно удалить %s" -#: src/copy.c:886 src/copy.c:1578 src/copy.c:1772 src/copy.c:1940 -#: src/remove.c:418 +#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945 +#: src/remove.c:375 #, c-format msgid "removed %s\n" msgstr "удалён %s\n" @@ -1917,191 +1916,191 @@ msgstr "невозможно создать обычный файл %s" msgid "failed to clone %s from %s" msgstr "не удалось выполнить клонирование %s из %s" -#: src/copy.c:1098 src/copy.c:2531 +#: src/copy.c:1098 src/copy.c:2541 #, c-format msgid "preserving times for %s" msgstr "сохранение временной отметки %s" -#: src/copy.c:1170 src/copy.c:1176 src/head.c:855 src/touch.c:175 -#: src/truncate.c:413 +#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172 +#: src/truncate.c:417 #, c-format -msgid "closing %s" -msgstr "закрытие %s" +msgid "failed to close %s" +msgstr "не удалось закрыть %s" -#: src/copy.c:1466 +#: src/copy.c:1471 #, c-format msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? " msgstr "%s: попытаться перезаписать %s, несмотря на права доступа %04lo (%s)? " -#: src/copy.c:1473 +#: src/copy.c:1478 #, c-format msgid "%s: overwrite %s? " msgstr "%s: переписать %s? " -#: src/copy.c:1542 +#: src/copy.c:1547 #, c-format msgid " (backup: %s)" msgstr " (резервная копия: %s)" -#: src/copy.c:1552 +#: src/copy.c:1557 #, c-format msgid "failed to restore the default file creation context" msgstr "не удалось восстановить контекст создания файла по умолчанию" -#: src/copy.c:1584 +#: src/copy.c:1589 #, c-format msgid "cannot create hard link %s to %s" msgstr "невозможно создать жёсткую ссылку %s на %s" -#: src/copy.c:1637 src/copy.c:1689 src/copy.c:2272 src/copy.c:2589 +#: 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:1220 src/truncate.c:365 +#: src/stat.c:1239 src/truncate.c:363 #, c-format msgid "cannot stat %s" msgstr "не удалось выполнить stat для %s" -#: src/copy.c:1645 +#: src/copy.c:1650 #, c-format msgid "omitting directory %s" msgstr "пропускается каталог %s" -#: src/copy.c:1659 +#: src/copy.c:1664 #, c-format msgid "warning: source file %s specified more than once" msgstr "предупреждение: файл-источник %s указан более одного раза" -#: src/copy.c:1707 src/ln.c:246 +#: src/copy.c:1712 src/ln.c:246 #, c-format msgid "%s and %s are the same file" msgstr "%s и %s - один и тот же файл" -#: src/copy.c:1806 +#: src/copy.c:1811 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "" "невозможно перезаписать поверх файла %s, не являющегося каталогом, каталог %s" -#: src/copy.c:1824 src/ln.c:214 +#: src/copy.c:1829 src/ln.c:214 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "только что созданный файл %s не будет переписан в %s" -#: src/copy.c:1842 +#: src/copy.c:1847 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "невозможно перезаписать каталог %s файлом, не являющимся каталогом" -#: src/copy.c:1856 +#: src/copy.c:1861 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "" "невозможно переименовать каталог в файл, не являющийся каталогом: %s -> %s" -#: src/copy.c:1886 +#: src/copy.c:1891 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "сохранение запасной копии %s уничтожит оригинал; %s не перенесён" -#: src/copy.c:1887 +#: src/copy.c:1892 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "сохранение запасной копии %s уничтожит оригинал; %s не скопирован" -#: src/copy.c:1910 src/ln.c:276 +#: src/copy.c:1915 src/ln.c:276 #, c-format msgid "cannot backup %s" msgstr "невозможно создать резервную копию для %s" -#: src/copy.c:1974 +#: src/copy.c:1979 #, c-format msgid "will not copy %s through just-created symlink %s" msgstr "копирование %s через только что созданную %s не выполняется" -#: src/copy.c:2051 +#: src/copy.c:2056 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "невозможно скопировать каталог %s в самого себя, %s" -#: src/copy.c:2068 +#: src/copy.c:2073 #, c-format msgid "will not create hard link %s to directory %s" msgstr "жёсткая ссылка %s на каталог %s не будет создана" -#: src/copy.c:2118 +#: src/copy.c:2123 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "невозможно перенести %s в свой собственный подкаталог, %s" -#: src/copy.c:2161 +#: src/copy.c:2166 #, c-format msgid "cannot move %s to %s" msgstr "невозможно переместить %s в %s" -#: src/copy.c:2173 +#: src/copy.c:2178 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" "не удалось перемещение с устройства %s на устройство %s: невозможно удалить " "назначение" -#: src/copy.c:2207 src/install.c:905 src/mkdir.c:189 src/mkfifo.c:114 -#: src/mknod.c:167 +#: 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:2241 +#: src/copy.c:2246 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "невозможно скопировать циклическую символьную ссылку %s" -#: src/copy.c:2350 +#: src/copy.c:2355 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "" "%s: относительные символьные ссылки можно создавать только в текущем каталоге" -#: src/copy.c:2357 +#: src/copy.c:2362 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "невозможно создать символьную ссылку %s на %s" -#: src/copy.c:2406 src/mkfifo.c:133 +#: src/copy.c:2416 src/mkfifo.c:132 #, c-format msgid "cannot create fifo %s" msgstr "невозможно создать очередь %s" -#: src/copy.c:2415 +#: src/copy.c:2425 #, c-format msgid "cannot create special file %s" msgstr "невозможно создать специальный файл %s" -#: src/copy.c:2426 src/ls.c:3191 src/stat.c:902 +#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921 #, c-format msgid "cannot read symbolic link %s" msgstr "невозможно считать символьную ссылку %s" -#: src/copy.c:2453 +#: src/copy.c:2463 #, c-format msgid "cannot create symbolic link %s" msgstr "невозможно создать символьную ссылку %s" -#: src/copy.c:2485 +#: src/copy.c:2495 #, c-format msgid "%s has unknown file type" msgstr "неизвестный тип файла %s" -#: src/copy.c:2629 src/ln.c:358 +#: src/copy.c:2644 src/ln.c:358 #, c-format msgid "cannot un-backup %s" msgstr "невозможно восстановить %s из резервной копии" -#: src/copy.c:2633 +#: src/copy.c:2648 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (восстановление)\n" -#: src/cp.c:156 src/mv.c:284 +#: src/cp.c:156 src/mv.c:286 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -2113,26 +2112,10 @@ msgstr "" " или: %s [КЛЮЧ]… -t КАТАЛОГ ИСТОЧНИК…\n" #: src/cp.c:162 -msgid "" -"Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" -"\n" -msgstr "" -"Копирует ИСТОЧНИК в НАЗНАЧЕНИЕ, или несколько ИСТОЧНИКОВ в КАТАЛОГ.\n" -"\n" - -#: src/cp.c:166 src/csplit.c:1458 src/cut.c:197 src/df.c:852 src/du.c:268 -#: src/expand.c:112 src/fmt.c:275 src/fold.c:75 src/head.c:115 -#: src/install.c:612 src/kill.c:86 src/ln.c:392 src/ls.c:4726 src/mkdir.c:61 -#: src/mkfifo.c:56 src/mknod.c:58 src/mv.c:294 src/nl.c:191 src/paste.c:445 -#: src/pr.c:2777 src/ptx.c:1825 src/shred.c:153 src/shuf.c:58 src/sort.c:399 -#: src/split.c:211 src/stdbuf.c:95 src/tac.c:142 src/tail.c:268 -#: src/touch.c:226 src/truncate.c:107 src/unexpand.c:122 src/uniq.c:145 -msgid "" -"Mandatory arguments to long options are mandatory for short options too.\n" -msgstr "" -"Аргументы, обязательные для длинных ключей, обязательны и для коротких.\n" +msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" +msgstr "Копирует ИСТОЧНИК в НАЗНАЧЕНИЕ, или несколько ИСТОЧНИКОВ в КАТАЛОГ.\n" -#: src/cp.c:169 +#: src/cp.c:168 msgid "" " -a, --archive same as -dR --preserve=all\n" " --attributes-only don't copy the file data, just the " @@ -2155,27 +2138,29 @@ msgstr "" " -d то же, что и --no-dereference --" "preserve=link\n" -#: src/cp.c:178 +#: src/cp.c:177 msgid "" " -f, --force if an existing destination file cannot be\n" -" opened, remove it and try again (redundant " -"if\n" -" the -n option is used)\n" +" opened, remove it and try again (this " +"option\n" +" is ignored when the -n option is also " +"used)\n" " -i, --interactive prompt before overwrite (overrides a previous " "-n\n" " option)\n" " -H follow command-line symbolic links in SOURCE\n" msgstr "" -" -f, --force если нельзя открыть существующий файл,\n" -" удалить его и попробовать ещё раз(с " -"резервным,\n" -" если указан ключ -n)\n" -" -i, --interactive спрашивать перед тем как переписывать" +" -f, --force если невозможно открыть существующий файл, " +"то\n" +" удалить его и попробовать ещё раз (этот " +"параметр\n" +" игнорируется, если также указан ключ -n)\n" +" -i, --interactive спрашивать перед тем как переписывать " "(отменяет\n" " ранее указанный ключ -n)\n" " -H следовать по символьным ссылкам в ИСТОЧНИКЕ\n" -#: src/cp.c:188 +#: src/cp.c:186 msgid "" " -l, --link hard link files instead of copying\n" " -L, --dereference always follow symbolic links in SOURCE\n" @@ -2184,7 +2169,7 @@ msgstr "" " -L, --dereference всегда следовать символьным ссылкам в " "ИСТОЧНИКЕ\n" -#: src/cp.c:192 +#: src/cp.c:190 msgid "" " -n, --no-clobber do not overwrite an existing file (overrides\n" " a previous -i option)\n" @@ -2196,7 +2181,7 @@ msgstr "" " -P, --no-dereference не следовать по символьным ссылкам в " "ИСТОЧНИКЕ\n" -#: src/cp.c:197 +#: src/cp.c:195 msgid "" " -p same as --preserve=mode,ownership,timestamps\n" " --preserve[=ATTR_LIST] preserve the specified attributes (default:\n" @@ -2213,7 +2198,7 @@ msgstr "" "xattr,\n" " all\n" -#: src/cp.c:205 +#: src/cp.c:203 msgid "" " --no-preserve=ATTR_LIST don't preserve the specified attributes\n" " --parents use full source file name under DIRECTORY\n" @@ -2221,7 +2206,7 @@ msgstr "" " --no-preserve=СПИС_АТТР не сохранять указанные атрибуты\n" " --parents добавить исходный путь к КАТАЛОГУ\n" -#: src/cp.c:209 +#: src/cp.c:207 msgid "" " -R, -r, --recursive copy directories recursively\n" " --reflink[=WHEN] control clone/CoW copies. See below\n" @@ -2234,7 +2219,7 @@ msgstr "" " --remove-destination удалять каждый файл назначения перед\n" " попыткой его открыть (обратно к --force)\n" -#: src/cp.c:215 +#: src/cp.c:213 msgid "" " --sparse=WHEN control creation of sparse files. See below\n" " --strip-trailing-slashes remove any trailing slashes from each " @@ -2246,7 +2231,7 @@ msgstr "" " --strip-trailing-slashes удалять все конечные косые черты из каждого\n" " аргумента ИСТОЧНИК\n" -#: src/cp.c:220 +#: src/cp.c:218 msgid "" " -s, --symbolic-link make symbolic links instead of copying\n" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -2261,7 +2246,7 @@ msgstr "" " --target-directory=КАТ скопировать все ИСТОЧНИКИ в КАТАЛОГ\n" " -T, --no-target-directory считать НАЗНАЧЕНИЕ обычным файлом\n" -#: src/cp.c:226 +#: src/cp.c:224 msgid "" " -u, --update copy only when the SOURCE file is newer\n" " than the destination file or when the\n" @@ -2275,7 +2260,7 @@ msgstr "" " -v, --verbose пояснять что будет сделано\n" " -x, --one-file-system оставаться в пределах одной файловой системы\n" -#: src/cp.c:235 +#: src/cp.c:233 msgid "" "\n" "By default, sparse SOURCE files are detected by a crude heuristic and the\n" @@ -2304,7 +2289,7 @@ msgstr "" "блоки данных копируются только при изменении. Если это невозможно, или если\n" "указано --reflink=auto, то используется обычное копирование.\n" -#: src/cp.c:247 src/install.c:649 src/ln.c:421 src/mv.c:321 +#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322 msgid "" "\n" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -2321,7 +2306,7 @@ msgstr "" "окружения VERSION_CONTROL. Допустимые значения:\n" "\n" -#: src/cp.c:254 src/install.c:656 src/mv.c:328 +#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329 msgid "" " none, off never make backups (even if --backup is given)\n" " numbered, t make numbered backups\n" @@ -2335,7 +2320,7 @@ msgstr "" " нумерованные иначе создавать простые\n" " simple. never всегда создавать простые копии\n" -#: src/cp.c:260 +#: src/cp.c:258 msgid "" "\n" "As a special case, cp makes a backup of SOURCE when the force and backup\n" @@ -2347,91 +2332,91 @@ msgstr "" "ключи -f и -b, а если ИСТОЧНИК совпадает с НАЗНАЧЕНИЕМ, то cp создает\n" "резервную копию НАЗНАЧЕНИЯ.\n" -#: src/cp.c:319 +#: src/cp.c:317 #, c-format msgid "failed to preserve times for %s" msgstr "не удалось сохранить временные метки для %s" -#: src/cp.c:350 +#: src/cp.c:348 #, c-format msgid "failed to preserve permissions for %s" msgstr "не удалось сохранить права доступа для %s" -#: src/cp.c:477 +#: src/cp.c:475 #, c-format msgid "cannot make directory %s" msgstr "невозможно создать каталог %s" -#: src/cp.c:526 src/cp.c:545 +#: src/cp.c:524 src/cp.c:543 #, c-format msgid "%s exists but is not a directory" msgstr "%s существует, но не является каталогом" -#: src/cp.c:572 src/cp.c:1068 src/install.c:401 src/install.c:844 src/ln.c:123 -#: src/ln.c:181 src/ln.c:202 src/ln.c:516 src/mv.c:152 src/mv.c:399 +#: 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 #, c-format -msgid "accessing %s" -msgstr "обращение к %s" +msgid "failed to access %s" +msgstr "не удалось получить доступ к %s" -#: src/cp.c:592 src/install.c:914 src/ln.c:546 src/mv.c:432 src/shred.c:1182 -#: src/touch.c:433 src/truncate.c:356 +#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181 +#: src/touch.c:429 src/truncate.c:354 #, c-format msgid "missing file operand" msgstr "пропущен операнд, задающий файл" -#: src/cp.c:594 src/install.c:916 src/ln.c:560 src/mv.c:434 +#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436 #, c-format msgid "missing destination file operand after %s" msgstr "после %s пропущен операнд, задающий целевой файл" -#: src/cp.c:603 src/install.c:925 src/mv.c:443 +#: src/cp.c:601 src/install.c:926 src/mv.c:445 #, c-format msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)" msgstr "нельзя сочетать --target-directory (-t) и --no-target-directory (-T)" -#: src/cp.c:619 src/cp.c:1070 src/install.c:403 src/install.c:846 -#: src/install.c:938 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:401 -#: src/mv.c:457 +#: 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 #, c-format msgid "target %s is not a directory" msgstr "указанная цель %s не является каталогом" -#: src/cp.c:730 +#: src/cp.c:728 #, c-format msgid "with --parents, the destination must be a directory" msgstr "при заданном --parents назначение должно быть каталогом" -#: src/cp.c:1063 src/install.c:839 src/ln.c:511 src/mv.c:394 +#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395 #, c-format msgid "multiple target directories specified" msgstr "задано несколько целевых каталогов" -#: src/cp.c:1108 +#: src/cp.c:1110 #, c-format msgid "cannot make both hard and symbolic links" msgstr "невозможно создать жёсткую и символьную ссылку одновременно" -#: src/cp.c:1115 src/mv.c:464 +#: src/cp.c:1117 src/mv.c:466 #, c-format msgid "options --backup and --no-clobber are mutually exclusive" msgstr "ключи --backup и --no-clobber взаимно исключают друг друга" -#: src/cp.c:1121 +#: src/cp.c:1123 #, c-format msgid "--reflink can be used only with --sparse=auto" msgstr "ключ --reflink можно использовать только с --sparse=auto" -#: src/cp.c:1129 src/install.c:899 src/ln.c:582 src/mv.c:472 +#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474 msgid "backup type" msgstr "тип резервной копии" -#: src/cp.c:1154 +#: src/cp.c:1156 #, c-format msgid "cannot preserve security context without an SELinux-enabled kernel" msgstr "" "невозможно сохранить контекст безопасности без ядра с поддержкой SELinux" -#: src/cp.c:1160 +#: src/cp.c:1162 #, c-format msgid "cannot preserve extended attributes, cp is built without xattr support" msgstr "" @@ -2442,137 +2427,135 @@ msgstr "" msgid "Stuart Kemp" msgstr "Стюарт Кемп (Stuart Kemp)" -#: src/csplit.c:529 +#: src/csplit.c:531 #, c-format msgid "input disappeared" msgstr "ввод стал недоступен" -#: src/csplit.c:658 src/csplit.c:669 +#: src/csplit.c:660 src/csplit.c:671 #, c-format msgid "%s: line number out of range" msgstr "%s: номер строки вне допустимых пределов" -#: src/csplit.c:698 +#: src/csplit.c:700 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: номер строки вне допустимых пределов" -#: src/csplit.c:701 src/csplit.c:750 +#: src/csplit.c:703 src/csplit.c:752 #, c-format msgid " on repetition %s\n" msgstr " при повторе %s\n" -#: src/csplit.c:744 +#: src/csplit.c:746 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: совпадение не найдено" -#: src/csplit.c:808 src/csplit.c:848 src/nl.c:359 src/tac.c:274 +#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273 #, c-format msgid "error in regular expression search" msgstr "ошибка поиска регулярного выражения" -#: src/csplit.c:981 +#: src/csplit.c:983 #, c-format msgid "write error for %s" msgstr "ошибка записи для %s" -#: src/csplit.c:1057 +#: src/csplit.c:1059 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: после разделителя ожидается целое число" -#: src/csplit.c:1073 +#: src/csplit.c:1075 #, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: при задании числа повторов необходима «}»" -#: src/csplit.c:1083 +#: src/csplit.c:1085 #, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: между «{» и «}» должно быть целое число" -#: src/csplit.c:1110 +#: src/csplit.c:1112 #, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: пропущен закрывающий разделитель «%c»" -#: src/csplit.c:1127 +#: src/csplit.c:1129 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: недопустимое регулярное выражение: %s" -#: src/csplit.c:1160 +#: src/csplit.c:1162 #, c-format msgid "%s: invalid pattern" msgstr "%s: недопустимый образец" -#: src/csplit.c:1163 +#: src/csplit.c:1165 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: номер строки должен быть больше нуля" -#: src/csplit.c:1169 +#: src/csplit.c:1171 #, c-format msgid "line number %s is smaller than preceding line number, %s" msgstr "номер строки %s меньше номера предыдущей строки, %s" -#: src/csplit.c:1175 +#: src/csplit.c:1177 #, c-format msgid "warning: line number %s is the same as preceding line number" msgstr "предупреждение: номер строки %s равен предыдущему номеру строки" -#: src/csplit.c:1253 +#: src/csplit.c:1255 #, c-format msgid "missing conversion specifier in suffix" msgstr "пропущен описатель преобразования в суффиксе" -#: src/csplit.c:1259 +#: src/csplit.c:1261 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "неверный описатель преобразования в суффиксе: %c" -#: src/csplit.c:1262 +#: src/csplit.c:1264 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "неверный описатель преобразования в суффиксе: \\%.3o" -#: src/csplit.c:1267 +#: src/csplit.c:1269 #, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "некорректные флаги в спецификации преобразования: %%%c%c" -#: src/csplit.c:1284 +#: src/csplit.c:1286 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "слишком много описаний преобразования (%%) в суффиксе" -#: src/csplit.c:1298 +#: src/csplit.c:1300 #, c-format msgid "missing %% conversion specification in suffix" msgstr "пропущено описание преобразования (%%) в суффиксе" -#: src/csplit.c:1345 +#: src/csplit.c:1347 #, c-format msgid "%s: invalid number" msgstr "%s: недопустимое число" -#: src/csplit.c:1449 +#: src/csplit.c:1451 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Использование: %s [КЛЮЧ]… ФАЙЛ ОБРАЗЕЦ…\n" -#: src/csplit.c:1453 +#: src/csplit.c:1455 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" -"\n" msgstr "" -"Выводит части ФАЙЛА, разделенные ОБРАЗЦОМ (ОБРАЗЦАМИ), в файлы «xx00»,\n" +"Выводит части ФАЙЛА, разделённые ОБРАЗЦОМ (ОБРАЗЦАМИ), в файлы «xx00»,\n" "«xx01», … и печатает число байт в каждой части на стандартный вывод.\n" -"\n" -#: src/csplit.c:1461 +#: src/csplit.c:1462 #, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2583,7 +2566,7 @@ msgstr "" " -f, --prefix=ПРЕФИКС использовать ПРЕФИКС вместо «xx»\n" " -k, --keep-files не удалять выходные файлы при ошибке\n" -#: src/csplit.c:1466 +#: src/csplit.c:1467 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" @@ -2593,7 +2576,7 @@ msgstr "" " -s, --quiet, --silent не печатать размеры выходных файлов\n" " -z, --elide-empty-files удалять пустые выходные файлы\n" -#: src/csplit.c:1473 +#: src/csplit.c:1474 msgid "" "\n" "Read standard input if FILE is -. Each PATTERN may be:\n" @@ -2602,7 +2585,7 @@ msgstr "" "Если ФАЙЛ задан как -, читает стандартный ввод. ОБРАЗЕЦ задается следующим\n" "образом:\n" -#: src/csplit.c:1477 +#: src/csplit.c:1478 msgid "" "\n" " INTEGER copy up to but not including specified line number\n" @@ -2631,7 +2614,7 @@ msgstr "" msgid "David M. Ihnat" msgstr "Дэвид М. Инат (David M. Ihnat)" -#: src/cut.c:64 +#: src/cut.c:64 src/cut.c:372 msgid "fields and positions are numbered from 1" msgstr "поля и позиции нумеруются с 1" @@ -2641,14 +2624,11 @@ msgid "Usage: %s OPTION... [FILE]...\n" msgstr "Использование: %s КЛЮЧ… [ФАЙЛ]…\n" #: src/cut.c:193 -msgid "" -"Print selected parts of lines from each FILE to standard output.\n" -"\n" +msgid "Print selected parts of lines from each FILE to standard output.\n" msgstr "" "Печатает выбранные части строк из каждого ФАЙЛА на стандартный вывод.\n" -"\n" -#: src/cut.c:200 +#: src/cut.c:199 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2660,7 +2640,7 @@ msgstr "" "РАЗДЕЛИТЕЛЬ\n" " вместо табуляции\n" -#: src/cut.c:205 +#: src/cut.c:204 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2674,7 +2654,7 @@ msgstr "" " только не задан ключ -s\n" " -n (игнорируется)\n" -#: src/cut.c:211 +#: src/cut.c:210 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" @@ -2683,7 +2663,7 @@ msgstr "" "символов\n" " или полей\n" -#: src/cut.c:215 +#: src/cut.c:214 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2697,7 +2677,7 @@ msgstr "" "разделитель\n" " для ввода\n" -#: src/cut.c:222 +#: src/cut.c:221 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2710,7 +2690,7 @@ msgstr "" "Выбранные части входного файла печатаются в том порядке, в котором они\n" "появляются на входе, и печатаются ровно один раз.\n" -#: src/cut.c:228 +#: src/cut.c:227 msgid "" "Each range is one of:\n" "\n" @@ -2730,46 +2710,47 @@ msgstr "" "\n" "Если ФАЙЛ не задан или задан как -, читает стандартный ввод.\n" -#: src/cut.c:368 src/cut.c:489 -msgid "invalid byte or field list" -msgstr "неправильный список байтов или полей" +#: src/cut.c:367 src/cut.c:493 +msgid "invalid byte, character or field list" +msgstr "неправильный байт, символ или список полей" -#: src/cut.c:385 +#: src/cut.c:387 msgid "invalid range with no endpoint: -" msgstr "неверный диапазон без окончания: -" -#: src/cut.c:399 +#: src/cut.c:403 msgid "invalid decreasing range" msgstr "неверный уменьшающийся диапазон" -#: src/cut.c:478 +#: src/cut.c:482 #, c-format msgid "byte offset %s is too large" msgstr "байтовое смещение %s слишком велико" -#: src/cut.c:481 +#: src/cut.c:485 #, c-format msgid "field number %s is too large" msgstr "номер поля %s слишком велик" -#: src/cut.c:789 src/cut.c:797 +#: src/cut.c:795 src/cut.c:803 msgid "only one type of list may be specified" msgstr "можно задать только один тип списка" -#: src/cut.c:806 +#: src/cut.c:812 src/numfmt.c:1408 +#, c-format msgid "the delimiter must be a single character" msgstr "разделитель должен быть одним символом" -#: src/cut.c:841 +#: src/cut.c:847 msgid "you must specify a list of bytes, characters, or fields" msgstr "вы должны задать список байт, символов или полей" -#: src/cut.c:844 +#: src/cut.c:850 msgid "an input delimiter may be specified only when operating on fields" msgstr "" "разделитель для входных данных можно задавать только при обработке полей" -#: src/cut.c:848 +#: src/cut.c:854 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2777,11 +2758,11 @@ msgstr "" "запрещение вывода строк, не содержащих разделителей,\n" "имеет смысл только при работе с полями" -#: src/cut.c:864 +#: src/cut.c:870 msgid "missing list of fields" msgstr "отсутствует список полей" -#: src/cut.c:866 +#: src/cut.c:872 msgid "missing list of positions" msgstr "отсутствует список позиций" @@ -2795,9 +2776,12 @@ msgstr "" " или: %s [-u|--utc|--universal] [ММДДччмм[[ВВ]ГГ][.сс]]\n" #: src/date.c:128 +msgid "Display the current time in the given FORMAT, or set the system date.\n" +msgstr "" +"Выводит текущее время в заданном ФОРМАТЕ, или изменяет время в системе.\n" + +#: src/date.c:134 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" " -I[TIMESPEC], --iso-8601[=TIMESPEC] output date/time in ISO 8601 format.\n" @@ -2805,8 +2789,6 @@ msgid "" " 'hours', 'minutes', 'seconds', or 'ns' for date\n" " and time to the indicated precision.\n" msgstr "" -"Выводит текущее время в заданном ФОРМАТЕ или устанавливает системное время.\n" -"\n" " -d, --date=СТРОКА показать не текущее время, а время, описанное\n" " заданной СТРОКОЙ\n" " -f, --file=ФАЙЛ соответствует применению --date для каждой\n" @@ -2818,7 +2800,7 @@ msgstr "" " или «ns» для получения даты и времени\n" " с нужной точностью.\n" -#: src/date.c:138 +#: src/date.c:142 msgid "" " -r, --reference=FILE display the last modification time of FILE\n" " -R, --rfc-2822 output date and time in RFC 2822 format.\n" @@ -2828,7 +2810,7 @@ msgstr "" " -R, --rfc-2822 выводить время в соответствии с RFC-2822\n" " Пример: Mon, 07 Aug 2006 12:34:56 -0600\n" -#: src/date.c:143 +#: src/date.c:147 msgid "" " --rfc-3339=TIMESPEC output date and time in RFC 3339 format.\n" " TIMESPEC='date', 'seconds', or 'ns' for\n" @@ -2847,7 +2829,7 @@ msgstr "" " -u, --utc, --universal показать или установить универсальное\n" " координированное время\n" -#: src/date.c:154 +#: src/date.c:158 msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" @@ -2861,7 +2843,7 @@ msgstr "" " %% знак %\n" " %a сокращённое название дня недели (напр., вск) согласно локали\n" -#: src/date.c:161 +#: src/date.c:165 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2873,7 +2855,7 @@ msgstr "" " %B полное название месяца (напр., январь) согласно локали\n" " %c время и дата (напр., Чтв 3 Мар 23:05:25 2005) согласно локали\n" -#: src/date.c:167 +#: src/date.c:171 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2885,7 +2867,7 @@ msgstr "" " %D дата; аналогично %m/%d/%y\n" " %e день месяца, дополненный пробелами; аналогично %_d\n" -#: src/date.c:173 +#: src/date.c:177 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -2896,7 +2878,7 @@ msgstr "" " %G год для номера недели ISO (см. %V); обычно бывает полезно только с " "%V\n" -#: src/date.c:178 +#: src/date.c:182 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2908,7 +2890,7 @@ msgstr "" " %I час (01..12)\n" " %j номер дня в году (001..366)\n" -#: src/date.c:184 +#: src/date.c:188 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -2920,7 +2902,7 @@ msgstr "" " %m месяц (01..12)\n" " %M минуты (00..59)\n" -#: src/date.c:190 +#: src/date.c:194 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2938,7 +2920,7 @@ msgstr "" " %R часы и минуты согласно локали, 24-часовой формат; аналог %H:%M\n" " %s число секунд, истёкших с 1970-01-01 00:00:00 UTC\n" -#: src/date.c:199 +#: src/date.c:203 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2950,7 +2932,7 @@ msgstr "" " %T время, аналог %H:%M:%S\n" " %u день недели (1..7); 1 обозначает понедельник\n" -#: src/date.c:205 +#: src/date.c:209 msgid "" " %U week number of year, with Sunday as first day of week (00..53)\n" " %V ISO week number, with Monday as first day of week (01..53)\n" @@ -2962,7 +2944,7 @@ msgstr "" " %w день недели (0..6), 0 означает воскресенье\n" " %W номер недели в году, если первый день недели -- понедельник (00..53)\n" -#: src/date.c:211 +#: src/date.c:215 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -2974,7 +2956,7 @@ msgstr "" " %y последние две цифры года (00..99)\n" " %Y год\n" -#: src/date.c:217 +#: src/date.c:221 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -2994,7 +2976,7 @@ msgstr "" "\n" "По умолчанию date дополняет числовые поля нулями.\n" -#: src/date.c:226 +#: src/date.c:230 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -3012,7 +2994,7 @@ msgstr "" " ^ использовать верхний регистр, если возможно\n" " # использовать противоположный регистр, если возможно\n" -#: src/date.c:235 +#: src/date.c:239 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -3028,7 +3010,7 @@ msgstr "" "локали\n" "O -- если возможно, использовать альтернативные числовые символы локали.\n" -#: src/date.c:242 +#: src/date.c:246 msgid "" "\n" "Examples:\n" @@ -3052,36 +3034,36 @@ msgstr "" "Показать местное время 09:00 следующей пятницы на западном побережье США\n" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" -#: src/date.c:275 src/dd.c:2193 src/head.c:838 src/md5sum.c:477 -#: src/md5sum.c:798 src/od.c:863 src/od.c:1914 src/pr.c:1176 src/pr.c:1372 -#: src/pr.c:1494 src/stty.c:842 src/tac.c:563 src/tail.c:343 src/tee.c:126 +#: 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 #, c-format msgid "standard input" msgstr "стандартный ввод" -#: src/date.c:303 src/date.c:523 +#: src/date.c:307 src/date.c:527 #, c-format msgid "invalid date %s" msgstr "неверная дата %s" -#: src/date.c:414 src/date.c:448 +#: src/date.c:418 src/date.c:452 #, c-format msgid "multiple output formats specified" msgstr "задано несколько выходных форматов" -#: src/date.c:426 +#: src/date.c:430 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "ключи для вывода даты взаимно исключают друг друга" -#: src/date.c:433 +#: src/date.c:437 #, c-format msgid "the options to print and set the time may not be used together" msgstr "" "ключи для установки и для отображения времени не могут применяться вместе" -#: src/date.c:454 +#: src/date.c:458 #, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -3093,32 +3075,32 @@ msgstr "" "строкой\n" "формата, начинающейся знаком «+»" -#: src/date.c:531 +#: src/date.c:535 #, c-format msgid "cannot set date" msgstr "невозможно установить дату" -#: src/date.c:554 src/du.c:360 +#: src/date.c:558 src/du.c:371 #, c-format msgid "time %s is out of range" msgstr "время %s вне допустимого диапазона" #. This is a proper name. See the gettext manual, section Names. -#: src/dd.c:44 src/factor.c:43 src/rm.c:41 src/tail.c:69 src/touch.c:41 +#: 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 "Поль Рубин (Paul Rubin)" -#: src/dd.c:517 +#: src/dd.c:521 #, c-format msgid "" "Usage: %s [OPERAND]...\n" " or: %s OPTION\n" msgstr "" "Использование: %s [ОПЕРАНД]…\n" -" или: %s КЛЮЧ\n" +" или: %s ПАРАМЕТР\n" -#: src/dd.c:522 +#: src/dd.c:526 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -3137,7 +3119,7 @@ msgstr "" " count=ЧИСЛО копировать только заданное ЧИСЛО входных блоков\n" " ibs=ЧИСЛО считывать до ЧИСЛА байт за раз (по умолчанию 512)\n" -#: src/dd.c:531 +#: src/dd.c:535 msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -3146,25 +3128,28 @@ msgid "" " oflag=FLAGS write as per the comma separated symbol list\n" " seek=N skip N obs-sized blocks at start of output\n" " skip=N skip N ibs-sized blocks at start of input\n" -" status=noxfer suppress transfer statistics\n" +" status=WHICH WHICH info to suppress outputting to stderr;\n" +" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" msgstr "" " if=ФАЙЛ читать ФАЙЛ, а не стандартный ввод\n" -" iflag=СПИСОК читать в соответствии со СПИСКОМ символов,\n" +" iflag=ФЛАГИ читать в соответствии со списком символов,\n" " элементы перечисляются через запятую\n" " obs=ЧИСЛО записывать заданное ЧИСЛО байт за раз (по умолчанию 512)\n" " of=ФАЙЛ записывать в ФАЙЛ, а не на стандартный вывод\n" -" oflag=СПИСОК записывать в соответствии со списком символов,\n" +" oflag=ФЛАГИ записывать в соответствии со списком символов,\n" " элементы перечисляются через запятую\n" -" seek=ЧИСЛО пропустить до начала вывода заданное ЧИСЛО блоков\n" -" размера obs\n" -" skip=ЧИСЛО пропустить с начала ввода заданное ЧИСЛО блоков размера " -"ibs\n" -" status=noxfer не выводить статистику передачи\n" +" seek=ЧИСЛО пропустить перед началом вывода заданное ЧИСЛО блоков\n" +" размером obs\n" +" skip=ЧИСЛО пропустить перед началом ввода заданное ЧИСЛО блоков\n" +" размером ibs\n" +" status=ИНФО заданную ИНФОрмацию не выводить в stderr;\n" +" «noxfer» — не выводить статистику передачи\n" +" «none» — не выводить ничего\n" -#: src/dd.c:541 +#: src/dd.c:546 msgid "" "\n" -"BLOCKS and BYTES may be followed by the following multiplicative suffixes:\n" +"N and BYTES may be followed by the following multiplicative suffixes:\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, and so on for T, P, E, Z, Y.\n" "\n" @@ -3176,10 +3161,10 @@ msgstr "" "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 и так далее для T, P, E, Z, Y.\n" "\n" -"Каждый элемент СПИСКА для conv может быть:\n" +"Каждый символ СПИСКА может быть:\n" "\n" -#: src/dd.c:550 +#: src/dd.c:555 msgid "" " ascii from EBCDIC to ASCII\n" " ebcdic from ASCII to EBCDIC\n" @@ -3209,7 +3194,7 @@ msgstr "" " sync дополнять каждый входной блок NUL-ми до размера ibs; при\n" " использовании с block или unblock, дополнять пробелам, а не NUL\n" -#: src/dd.c:563 +#: src/dd.c:568 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3225,7 +3210,7 @@ msgstr "" " fdatasync физически записать выходной файл перед завершением\n" " fsync аналогично, но записать также метаданные\n" -#: src/dd.c:571 +#: src/dd.c:576 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3239,75 +3224,75 @@ msgstr "" " append режим добавления (имеет смысл для вывода; рекомендуется " "conv=notrunc)\n" -#: src/dd.c:578 +#: src/dd.c:583 msgid " cio use concurrent I/O for data\n" msgstr " cio использовать конкурентный ввод/вывод для данных\n" -#: src/dd.c:580 +#: src/dd.c:585 msgid " direct use direct I/O for data\n" msgstr " direct использовать прямой ввод/вывод для данных\n" -#: src/dd.c:582 +#: src/dd.c:587 msgid " directory fail unless a directory\n" msgstr " directory выдавать ошибку, если это не каталог\n" -#: src/dd.c:584 +#: src/dd.c:589 msgid " dsync use synchronized I/O for data\n" msgstr " dsync использовать синхронизированный ввод/вывод для данных\n" -#: src/dd.c:586 +#: src/dd.c:591 msgid " sync likewise, but also for metadata\n" msgstr " sync то же, но так же и для метаданных\n" -#: src/dd.c:587 +#: src/dd.c:592 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr " fullblock накапливать полные блоки входных данных (только iflag)\n" -#: src/dd.c:590 +#: src/dd.c:595 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock использовать неблокирующий ввод/вывод\n" -#: src/dd.c:592 +#: src/dd.c:597 msgid " noatime do not update access time\n" msgstr " noatime не обновлять время последнего доступа\n" -#: src/dd.c:595 +#: src/dd.c:600 msgid " nocache discard cached data\n" msgstr " nocache отвергать кэшированные данные\n" -#: src/dd.c:598 +#: src/dd.c:603 msgid " noctty do not assign controlling terminal from file\n" msgstr " noctty не назначать управляющий терминал из файла\n" -#: src/dd.c:601 +#: src/dd.c:606 msgid " nofollow do not follow symlinks\n" msgstr " nofollow не следовать по символьным ссылкам\n" -#: src/dd.c:603 +#: src/dd.c:608 msgid " nolinks fail if multiply-linked\n" msgstr " nolinks выдавать ошибку, если найдено несколько ссылок\n" -#: src/dd.c:605 +#: src/dd.c:610 msgid " binary use binary I/O for data\n" msgstr " binary использовать бинарный ввод/вывод для данных\n" -#: src/dd.c:607 +#: src/dd.c:612 msgid " text use text I/O for data\n" msgstr " text использовать текстовый ввод/вывод для данных\n" -#: src/dd.c:609 +#: src/dd.c:614 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr " count_bytes считать «count=N» как счётчик байт (только с iflag)\n" -#: src/dd.c:612 +#: src/dd.c:617 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr " skip_bytes считать «skip=N» как счётчик байт (только с iflag)\n" -#: src/dd.c:615 +#: src/dd.c:620 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr " seek_bytes считать «seek=N» как счётчик байт (только с oflag)\n" -#: src/dd.c:620 +#: src/dd.c:625 #, c-format msgid "" "\n" @@ -3324,29 +3309,29 @@ msgid "" "\n" msgstr "" "\n" -"Если послать работающему процессу «dd» сигнал %s, он напечатает на\n" -"стандартный поток ошибок статистику ввода/вывода и продолжит\n" -"копирование.\n" +"Если послать работающему процессу «dd» сигнал %s, то в\n" +"стандартный поток ошибок будет выдана статистика ввода/вывода\n" +"и копирование продолжится.\n" "\n" " $ dd if=/dev/zero of=/dev/null& pid=$!\n" " $ kill -%s $pid; sleep 1; kill $pid\n" -" 18335302+0 входных записей\n" -" 18335302+0 выходных записей\n" +" 18335302+0 записей получено\n" +" 18335302+0 записей отправлено\n" " 9387674624 байта (9.4 GB) скопировано, 34.6279 секунды, 271 MB/s\n" "\n" "Ключи:\n" "\n" -#: src/dd.c:676 +#: src/dd.c:683 #, c-format msgid "" "%<PRIuMAX>+%<PRIuMAX> records in\n" "%<PRIuMAX>+%<PRIuMAX> records out\n" msgstr "" -"%<PRIuMAX>+%<PRIuMAX> записей считано\n" -"%<PRIuMAX>+%<PRIuMAX> записей написано\n" +"%<PRIuMAX>+%<PRIuMAX> записей получено\n" +"%<PRIuMAX>+%<PRIuMAX> записей отправлено\n" -#: src/dd.c:682 +#: src/dd.c:689 #, c-format msgid "%<PRIuMAX> truncated record\n" msgid_plural "%<PRIuMAX> truncated records\n" @@ -3354,7 +3339,7 @@ msgstr[0] "%<PRIuMAX> усечённая запись\n" msgstr[1] "%<PRIuMAX> усечённые записи\n" msgstr[2] "%<PRIuMAX> усечённых записей\n" -#: src/dd.c:694 +#: src/dd.c:701 #, c-format msgid "%<PRIuMAX> byte (%s) copied" msgid_plural "%<PRIuMAX> bytes (%s) copied" @@ -3362,7 +3347,7 @@ msgstr[0] " скопирован %<PRIuMAX> байт (%s)" msgstr[1] " скопировано %<PRIuMAX> байта (%s)" msgstr[2] " скопировано %<PRIuMAX> байт (%s)" -#: src/dd.c:712 +#: src/dd.c:720 msgid "Infinity B" msgstr "Бесконечность" @@ -3376,83 +3361,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:725 +#: src/dd.c:733 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g c, %s/c\n" -#: src/dd.c:804 +#: src/dd.c:812 #, c-format msgid "closing input file %s" msgstr "закрытие входного файла %s" -#: src/dd.c:811 +#: src/dd.c:819 #, c-format msgid "closing output file %s" msgstr "закрытие выходного файла %s" -#: src/dd.c:1014 +#: src/dd.c:1022 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "не удалось выключить O_DIRECT: %s" -#: src/dd.c:1085 src/dd.c:1934 +#: src/dd.c:1093 src/dd.c:1942 #, c-format msgid "writing to %s" msgstr "запись в %s" -#: src/dd.c:1199 src/dd.c:1253 +#: src/dd.c:1207 src/dd.c:1261 #, c-format msgid "unrecognized operand %s" msgstr "операнд %s не распознан" -#: src/dd.c:1210 +#: src/dd.c:1218 msgid "invalid conversion" msgstr "недопустимое преобразование" -#: src/dd.c:1213 src/dd.c:1289 +#: src/dd.c:1221 src/dd.c:1297 msgid "invalid input flag" msgstr "недопустимый флаг ввода" -#: src/dd.c:1216 src/dd.c:1283 src/dd.c:1295 +#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303 msgid "invalid output flag" msgstr "недопустимый флаг вывода" -#: src/dd.c:1219 +#: src/dd.c:1227 msgid "invalid status flag" msgstr "недопустимый флаг состояния" -#: src/dd.c:1258 src/truncate.c:312 +#: src/dd.c:1266 src/truncate.c:310 #, c-format msgid "invalid number %s" msgstr "неверный номер %s" -#: src/dd.c:1340 +#: src/dd.c:1348 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "нельзя сочетать любые два из {ascii,ebcdic,ibm}" -#: src/dd.c:1342 +#: src/dd.c:1350 #, c-format msgid "cannot combine block and unblock" msgstr "нельзя совмещать block и unblock" -#: src/dd.c:1344 +#: src/dd.c:1352 #, c-format msgid "cannot combine lcase and ucase" msgstr "нельзя совмещать lcase и ucase" -#: src/dd.c:1346 +#: src/dd.c:1354 #, c-format msgid "cannot combine excl and nocreat" msgstr "нельзя совмещать excl и nocreat" -#: src/dd.c:1349 +#: src/dd.c:1357 #, c-format msgid "cannot combine direct and nocache" msgstr "нельзя совмещать direct и nocache" -#: src/dd.c:1506 +#: src/dd.c:1514 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3461,72 +3446,72 @@ msgstr "" "предупреждение: обходим ошибку lseek в ядре для файла (%s)\n" " mt_type=0x%0lx -- см. <sys/mtio.h> для списка типов" -#: src/dd.c:1593 +#: src/dd.c:1601 #, c-format msgid "%s: cannot skip" msgstr "%s: невозможно пропустить" -#: src/dd.c:1595 src/dd.c:1614 src/dd.c:1675 +#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683 #, c-format msgid "%s: cannot seek" msgstr "%s: невозможно сместиться" -#: src/dd.c:1655 +#: src/dd.c:1663 #, c-format msgid "offset overflow while reading file %s" msgstr "переполнение сдвига при чтении файла %s" -#: src/dd.c:1667 +#: src/dd.c:1675 #, c-format msgid "warning: invalid file offset after failed read" msgstr "предупреждение: смещение файла стало неверным после ошибки чтения" -#: src/dd.c:1671 +#: src/dd.c:1679 #, c-format msgid "cannot work around kernel bug after all" msgstr "невозможно обойти ошибку ядра" -#: src/dd.c:1814 +#: src/dd.c:1822 #, c-format msgid "setting flags for %s" msgstr "установка флагов для %s" -#: src/dd.c:1867 +#: src/dd.c:1875 #, c-format msgid "memory exhausted by input buffer of size %zu bytes (%s)" msgstr "исчерпана память буфером ввода размера %zu байт (%s)" -#: src/dd.c:1881 +#: src/dd.c:1889 #, c-format msgid "memory exhausted by output buffer of size %zu bytes (%s)" msgstr "исчерпана память буфером вывода размера %zu байт (%s)" -#: src/dd.c:1914 +#: src/dd.c:1922 #, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: невозможно пропустить до заданного смещения" -#: src/dd.c:2125 src/dd.c:2258 +#: src/dd.c:2133 #, c-format -msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" -msgstr "не удалось выполнить отсечение на %<PRIuMAX> байт в выходном файле %s" +msgid "failed to truncate to %<PRIdMAX> bytes in output file %s" +msgstr "не удалось выполнить отсечение на %<PRIdMAX> байт в выходном файле %s" -#: src/dd.c:2138 +#: src/dd.c:2146 #, c-format msgid "fdatasync failed for %s" msgstr "операция fdatasync для %s завершилась неудачно" -#: src/dd.c:2148 +#: src/dd.c:2156 #, c-format msgid "fsync failed for %s" msgstr "операция fsync для %s завершилась неудачно" -#: src/dd.c:2199 src/dd.c:2228 +#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165 #, c-format -msgid "opening %s" -msgstr "открытие %s" +msgid "failed to open %s" +msgstr "не удалось открыть %s" -#: src/dd.c:2237 +#: src/dd.c:2246 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) " @@ -3535,84 +3520,104 @@ msgstr "" "смещение слишком велико: невозможно обрезать до величины seek=%<PRIuMAX> " "(%lu-байтных) блоков" -#: src/dd.c:2274 src/dd.c:2280 +#: src/dd.c:2267 +#, c-format +msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" +msgstr "не удалось выполнить отсечение на %<PRIuMAX> байт в выходном файле %s" + +#: src/dd.c:2283 src/dd.c:2289 #, 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:54 src/expr.c:153 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:39 src/sleep.c:35 src/sort.c:66 +#: 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 msgid "Paul Eggert" msgstr "Поль Эггерт (Paul Eggert)" -#: src/df.c:140 +#: src/df.c:172 msgid "Filesystem" msgstr "Файловая система" -#: src/df.c:141 +#: src/df.c:175 msgid "Type" msgstr "Тип" -#: src/df.c:142 +#: src/df.c:178 src/df.c:542 msgid "blocks" msgstr "блоков" -#: src/df.c:142 -msgid "Inodes" -msgstr "Iнодов" - -#: src/df.c:142 -msgid "Size" -msgstr "Размер" - -#: src/df.c:143 +#: src/df.c:181 msgid "Used" msgstr "Использовано" -#: src/df.c:143 -msgid "IUsed" -msgstr "IИспользовано" - -#: src/df.c:144 +#: src/df.c:184 msgid "Available" msgstr "Доступно" -#: src/df.c:144 -msgid "IFree" -msgstr "IСвободно" - -#: src/df.c:144 -msgid "Avail" -msgstr "Дост" - -#: src/df.c:145 +#: src/df.c:187 msgid "Use%" msgstr "Использовано%" -#: src/df.c:145 +#: src/df.c:190 +msgid "Inodes" +msgstr "Iнодов" + +#: src/df.c:193 +msgid "IUsed" +msgstr "IИспользовано" + +#: src/df.c:196 +msgid "IFree" +msgstr "IСвободно" + +#: src/df.c:199 msgid "IUse%" msgstr "IИспользовано%" -#: src/df.c:145 +#: src/df.c:202 +msgid "Mounted on" +msgstr "Cмонтировано в" + +#: src/df.c:383 +#, c-format +msgid "option --output: field '%s' unknown" +msgstr "ключ --output: неизвестное поле «%s»" + +#: src/df.c:390 +#, c-format +msgid "option --output: field '%s' used more than once" +msgstr "ключ --output: поле «%s» используется более одного раза" + +#: src/df.c:410 src/df.c:449 +msgid "Size" +msgstr "Размер" + +#: src/df.c:414 src/df.c:451 +msgid "Avail" +msgstr "Дост" + +#: src/df.c:474 msgid "Capacity" msgstr "Вместимость" -#: src/df.c:146 -msgid "Mounted on" -msgstr "Cмонтировано в" +#. 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 +#, c-format +msgid "%s-%s" +msgstr "%s-%s" -#: src/df.c:847 +#: src/df.c:1210 msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" -"\n" msgstr "" -"Показать сведения о файловой системе, на которой расположен каждый\n" +"Показывает сведения о файловой системе, на которой расположен каждый\n" "из ФАЙЛОВ, или, по умолчанию, обо всех файловых системах.\n" -"\n" -#: src/df.c:855 +#: src/df.c:1217 msgid "" " -a, --all include dummy file systems\n" " -B, --block-size=SIZE scale sizes by SIZE before printing them. E.g.,\n" @@ -3633,7 +3638,7 @@ msgstr "" " (например, 1K 234M 2G)\n" " -H, --si то же, но использовать степени 1000, а не 1024\n" -#: src/df.c:865 +#: src/df.c:1227 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3649,8 +3654,11 @@ msgstr "" " --no-sync не вызывать sync перед получением информации об\n" " использовании блоков (по умолчанию)\n" -#: src/df.c:872 +#: src/df.c:1234 msgid "" +" --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" +" or print all fields if FIELD_LIST is " +"omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" " -t, --type=TYPE limit listing to file systems of type TYPE\n" @@ -3658,29 +3666,59 @@ msgid "" " -x, --exclude-type=TYPE limit listing to file systems not of type TYPE\n" " -v (ignored)\n" msgstr "" +" --output[=FIELD_LIST]\n" +" при выводе использовать формат FIELD_LIST, или\n" +" показать все поля, если значение FIELD_LIST\n" +" не указано.\n" " -P, --portability выводить в формате POSIX\n" " --sync вызывать sync перед получением информации об\n" " использовании блоков\n" " -t, --type=ТИП перечислить только файловые системы указанного " "ТИПА\n" -" -T, --print-type печатать тип файловой системы\n" +" -T, --print-type выводить тип файловой системы\n" " -x, --exclude-type=ТИП исключить файловые системы указанного ТИПА\n" " -v (игнорируется)\n" -#: src/df.c:1027 +#: src/df.c:1248 +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" +msgstr "" +"\n" +"Значение FIELD_LIST предоставляет собой список включаемых колонок,\n" +"перечисляемых через запятую. Возможные имена полей:\n" +"«source», «fstype», «itotal», «iused», «iavail», «ipcent»,\n" +"«size», «used», «avail», «pcent» и «target» (см. также страницу info).\n" + +#: src/df.c:1285 +#, 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 #, c-format msgid "file system type %s both selected and excluded" msgstr "файловая система типа %s и выбрана, и исключена" -#: src/df.c:1075 +#: src/df.c:1500 msgid "Warning: " msgstr "Предупреждение: " -#: src/df.c:1077 src/stat.c:795 +#: src/df.c:1502 src/stat.c:814 msgid "cannot read table of mounted file systems" msgstr "не удалось прочитать таблицу смонтированных файловых систем" -#: src/df.c:1107 +#: src/df.c:1539 #, c-format msgid "no file systems processed" msgstr "не обработано ни одной файловой системы" @@ -3794,7 +3832,7 @@ msgstr "" " %s dir1/str dir2/str -> за «dir1» выводится «dir2»\n" " %s stdio.h -> «.»\n" -#: src/du.c:260 src/sort.c:390 src/wc.c:112 +#: src/du.c:270 src/sort.c:394 src/wc.c:112 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3803,16 +3841,15 @@ msgstr "" "Использование: %s [КЛЮЧ]… [ФАЙЛ]…\n" " или: %s [КЛЮЧ]… --files0-from=Ф\n" -#: src/du.c:264 -msgid "" -"Summarize disk usage of each FILE, recursively for directories.\n" -"\n" +#: src/du.c:274 +msgid "Summarize disk usage of each FILE, recursively for directories.\n" msgstr "" "Суммирует использование дискового пространства каждого ФАЙЛА, с каталогами.\n" -"\n" -#: src/du.c:271 +#: src/du.c:280 msgid "" +" -0, --null end each output line with 0 byte rather than " +"newline\n" " -a, --all write counts for all files, not just directories\n" " --apparent-size print apparent sizes, rather than disk usage; " "although\n" @@ -3820,6 +3857,8 @@ msgid "" " larger due to holes in ('sparse') files, internal\n" " fragmentation, indirect blocks, and the like\n" msgstr "" +" -0, --null заканчивать каждую выводимую строку 0-м байтом,\n" +" а не символом новой строки\n" " -a, --all печатать объём для всех файлов, а не только\n" " каталогов\n" " --apparent-size печатать действительные размеры, а не занимаемое " @@ -3830,7 +3869,7 @@ msgstr "" "фрагментации,\n" " косвенных блоков и тому подобного\n" -#: src/du.c:279 +#: src/du.c:289 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" @@ -3839,6 +3878,11 @@ msgid "" " -c, --total produce a grand total\n" " -D, --dereference-args dereference only symlinks that are listed on the\n" " command line\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 "" " -B, --block-size=РАЗМЕР использовать блоки указанного РАЗМЕРА. Например,\n" " «-BM» выводит размеры в единицах, равных " @@ -3848,8 +3892,13 @@ msgstr "" " -c, --total выводить общий итог\n" " -D, --dereference-args следовать только по символьным ссылкам,\n" " которые перечислены в командной строке\n" +" -d, --max-depth=N выводить общий размер каталога (или файла,\n" +" если --all) только для N-го или меньшего уровня\n" +" чем указанный аргумент командной строки;\n" +" значение --max-depth=0 аналогично\n" +" указанию --summarize\n" -#: src/du.c:288 +#: src/du.c:302 msgid "" " --files0-from=F summarize disk usage of the NUL-terminated file\n" " names specified in file F;\n" @@ -3857,7 +3906,6 @@ msgid "" " -H equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" --si like -h, but use powers of 1000 not 1024\n" msgstr "" " --files0-from=Ф вывести отчёт об использовании диска, чьи имена\n" " файлов (завершённые нулем) перечислены в файле Ф\n" @@ -3866,62 +3914,39 @@ msgstr "" " -H эквивалентен ключу --dereference-args (-D)\n" " -h, --human-readable печатать размеры в удобном для человека виде\n" " (например, 1K 234M 2G)\n" -" --si как -h, но использовать степени 1000, а не 1024\n" -#: src/du.c:297 +#: src/du.c:310 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 синоним --block-size=1K\n" +" -L, --dereference разыменовывать символьные ссылки\n" " -l, --count-links складывать размеры, если есть несколько жёстких\n" " ссылок\n" " -m синоним --block-size=1M\n" -#: src/du.c:302 +#: src/du.c:316 msgid "" -" -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " "default)\n" -" -0, --null end each output line with 0 byte rather than " -"newline\n" " -S, --separate-dirs 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 разыменовывать символьные ссылки\n" " -P, --no-dereference не следовать по символьным ссылкам (по " "умолчанию)\n" -" -0, --null завершать каждую выводимую строку 0-м байтом, а " -"не\n" -" символом новой строки\n" -" -S, --separate-dirs не включать размер каталогов\n" +" -S, --separate-dirs не включать размер подкаталогов\n" +" --si как -h, но использовать множитель 1000, а не " +"1024\n" " -s, --summarize показывать только итог для каждого аргумента\n" -#: src/du.c:309 -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 пропускать каталоги на других файловых системах\n" -" -X, --exclude-from=ФАЙЛ исключать файлы, совпадающие с каким-либо\n" -" образцом из ФАЙЛА\n" -" --exclude=ОБРАЗЕЦ исключать файлы, соответствующие ОБРАЗЦУ\n" -" -d, --max-depth=N выводить итог для каталога (или файла,\n" -" если --all), только если он на N или меньше " -"уровней\n" -" ниже, чем аргумент командной строки; --max-" -"depth=0\n" -" эквивалентно --summarize\n" - -#: src/du.c:318 +#: src/du.c:322 msgid "" +" -t, --threshold=SIZE exclude entries smaller than SIZE if positive,\n" +" or entries greater than SIZE if negative\n" " --time show time of the last modification of any file in " "the\n" " directory, or any of its subdirectories\n" @@ -3931,6 +3956,10 @@ msgid "" " full-iso, long-iso, iso, +FORMAT\n" " FORMAT is interpreted like 'date'\n" msgstr "" +" -t, --threshold=РАЗМЕР исключить элементы, размер которых меньше " +"РАЗМЕРА,\n" +" если значение положительно, или размер которых\n" +" больше, если значение отрицательно\n" " --time показывать время последнего изменения файлов\n" " в каталоге или во всех его подкаталогах\n" " --time=СЛОВО показывать указанное СЛОВОМ время, а не время\n" @@ -3939,65 +3968,77 @@ msgstr "" " full-iso, long-iso, iso, +ФОРМАТ\n" " ФОРМАТ интерпретируется как в «date»\n" -#: src/du.c:375 -#, fuzzy +#: src/du.c:333 +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=ФАЙЛ исключить файлы, совпадающие с любым шаблоном\n" +" из ФАЙЛа\n" +" --exclude=ШАБЛОН исключить файлы, совпадающие с ШАБЛОНом\n" +" -x, --one-file-system пропускать каталоги из других файловых систем\n" + +#: src/du.c:386 msgid "Infinity" msgstr "Бесконечность" -#: src/du.c:600 +#: src/du.c:507 +#, c-format +msgid "mount point %s already traversed" +msgstr "точка монтирования %s уже пройдена" + +#: src/du.c:624 #, c-format msgid "fts_read failed: %s" msgstr "операция fts_read завершилась с ошибкой: %s" -#: src/du.c:724 +#: src/du.c:780 #, c-format msgid "invalid maximum depth %s" msgstr "недопустимая максимальная глубина %s" -#: src/du.c:817 +#: src/du.c:809 +#, c-format +msgid "invalid --threshold argument '-0'" +msgstr "недопустимый для --threshold аргумент «-0»" + +#: src/du.c:887 #, c-format msgid "cannot both summarize and show all entries" msgstr "невозможно одновременно подводить итог и показывать все элементы" -#: src/du.c:824 +#: src/du.c:894 #, c-format msgid "warning: summarizing is the same as using --max-depth=0" msgstr "предупреждение: подведение итога это то же самое, что и --max-depth=0" -#: src/du.c:830 +#: src/du.c:900 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "предупреждение: подведение итога конфликтует с --max-depth=%lu" -#: src/du.c:896 src/sort.c:4479 src/wc.c:668 +#: src/du.c:966 src/sort.c:4533 src/wc.c:668 msgid "file operands cannot be combined with --files0-from" msgstr "операнды-файлы нельзя сочетать с --files0-from" -#: src/du.c:949 src/md5sum.c:587 src/od.c:903 src/tac.c:239 src/tac.c:350 -#: src/tac.c:506 src/tac.c:586 src/wc.c:733 +#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 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:963 src/sort.c:4508 src/wc.c:747 +#: src/du.c:1040 src/sort.c:4562 src/wc.c:747 #, c-format msgid "when reading file names from stdin, no file name of %s allowed" msgstr "" "при чтении имён файлов со стандартного ввода, имя файла %s не допускается" -#: src/du.c:980 src/du.c:988 src/wc.c:760 src/wc.c:768 +#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768 msgid "invalid zero-length file name" msgstr "неверное имя файла нулевой длины" -#: src/du.c:1007 src/head.c:149 src/head.c:262 src/head.c:334 src/head.c:538 -#: src/head.c:620 src/head.c:692 src/head.c:750 src/head.c:774 src/tail.c:412 -#: src/tail.c:500 src/tail.c:549 src/tail.c:642 src/tail.c:770 src/tail.c:818 -#: src/tail.c:855 src/tail.c:1782 src/tail.c:1812 src/uniq.c:395 -#, c-format -msgid "error reading %s" -msgstr "ошибка чтения %s" - -#: src/du.c:1010 src/ls.c:2649 src/wc.c:791 +#: src/du.c:1088 src/ls.c:2649 src/wc.c:791 msgid "total" msgstr "итого" @@ -4101,23 +4142,23 @@ msgid "Usage: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n" msgstr "Использование: %s [КЛЮЧ]… [-] [ИМЯ=ЗНАЧЕНИЕ]… [КОМАНДА [АРГ]…]\n" #: src/env.c:55 +msgid "Set each NAME to VALUE in the environment and run COMMAND.\n" +msgstr "" +"Присваивает каждому ИМЕНИ соответствующее ЗНАЧЕНИЕ в окружении и запускает " +"КОМАНДУ.\n" + +#: src/env.c:61 msgid "" -"Set each NAME to VALUE in the environment and run COMMAND.\n" -"\n" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with 0 byte rather than newline\n" " -u, --unset=NAME remove variable from the environment\n" msgstr "" -"Присваивает каждому ИМЕНИ соответствующее ЗНАЧЕНИЕ и запускает КОМАНДУ в " -"этом\n" -"окружении.\n" -"\n" " -i, --ignore-environment начать с пустым окружением\n" " -0, --null завершать каждую выводимую строку 0-м байтом,\n" " a не символом новой строки\n" " -u, --unset=ИМЯ удалить переменную с ИМЕНЕМ из окружения\n" -#: src/env.c:64 +#: src/env.c:68 msgid "" "\n" "A mere - implies -i. If no COMMAND, print the resulting environment.\n" @@ -4127,17 +4168,17 @@ msgstr "" "получившееся\n" "окружение.\n" -#: src/env.c:120 +#: src/env.c:124 #, c-format msgid "cannot unset %s" msgstr "невозможно удалить %s" -#: src/env.c:131 +#: src/env.c:135 #, c-format msgid "cannot set %s" msgstr "невозможно установить %s" -#: src/env.c:148 +#: src/env.c:152 #, c-format msgid "cannot specify --null (-0) with command" msgstr "невозможно указание --null (-0) с командой" @@ -4146,14 +4187,12 @@ msgstr "невозможно указание --null (-0) с командой" msgid "" "Convert tabs in each FILE to spaces, writing to standard output.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" "Преобразует символы табуляции в каждом ФАЙЛЕ в пробелы и печатает на " "стандартный\n" "вывод. Если ФАЙЛ не задан или задан как -, читает стандартный ввод.\n" -"\n" -#: src/expand.c:115 +#: src/expand.c:114 msgid "" " -i, --initial do not convert tabs after non blanks\n" " -t, --tabs=NUMBER have tabs NUMBER characters apart, not 8\n" @@ -4163,34 +4202,34 @@ msgstr "" " символов\n" " -t, --tabs=ЧИСЛО устанавливает ширину табуляции, по умолчанию 8\n" -#: src/expand.c:119 +#: src/expand.c:118 msgid "" " -t, --tabs=LIST use comma separated list of explicit tab positions\n" msgstr "" " -t, --tabs=СПИСОК использовать разделённый запятыми список позиций\n" " табуляции\n" -#: src/expand.c:172 src/unexpand.c:191 +#: src/expand.c:171 src/unexpand.c:190 #, c-format msgid "tab stop is too large %s" msgstr "размер табуляции слишком велик %s" -#: src/expand.c:180 src/unexpand.c:199 +#: src/expand.c:179 src/unexpand.c:198 #, c-format msgid "tab size contains invalid character(s): %s" msgstr "размер табуляции содержит недопустимый символ(ы): %s" -#: src/expand.c:206 src/unexpand.c:225 +#: src/expand.c:205 src/unexpand.c:224 #, c-format msgid "tab size cannot be 0" msgstr "размер табуляции не может быть равен нулю" -#: src/expand.c:208 src/unexpand.c:227 +#: src/expand.c:207 src/unexpand.c:226 #, c-format msgid "tab sizes must be ascending" msgstr "номера позиций табуляции должны возрастать" -#: src/expand.c:326 src/expand.c:345 src/unexpand.c:374 src/unexpand.c:419 +#: 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 "входная строка слишком велика" @@ -4350,12 +4389,12 @@ msgstr "ошибка в сопоставителе регулярных выра msgid "non-integer argument" msgstr "нецелочисленный аргумент" -#: src/expr.c:793 src/truncate.c:316 +#: src/expr.c:793 src/truncate.c:314 #, c-format msgid "division by zero" msgstr "деление на ноль" -#: src/expr.c:887 src/sort.c:2029 +#: src/expr.c:887 src/sort.c:2044 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "чтобы обойти эту проблему, установите LC_ALL='C'" @@ -4365,25 +4404,32 @@ msgstr "чтобы обойти эту проблему, установите LC msgid "the strings compared were %s and %s" msgstr "сравнивались строки %s %s" -#: src/factor.c:449 -msgid "using arbitrary-precision arithmetic" -msgstr "используется арифметика с произвольной точностью" +#. This is a proper name. See the gettext manual, section Names. +#: src/factor.c:111 +msgid "Niels Moller" +msgstr "Нильс Меллер (Niels Moller)" -#: src/factor.c:460 -msgid "using single-precision arithmetic" -msgstr "используется арифметика с одинарной точностью" +#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459 +#, c-format +msgid "Lucas prime test failure. This should not happen" +msgstr "Не пройден основной тест Лукаса. Этого не должно случиться" -#: src/factor.c:465 src/od.c:1640 src/od.c:1709 +#: src/factor.c:2092 #, c-format -msgid "%s is too large" -msgstr "%s слишком велик" +msgid "squfof queue overflow" +msgstr "переполнение очереди squfof" -#: src/factor.c:469 +#: src/factor.c:2419 #, c-format msgid "%s is not a valid positive integer" msgstr "%s не является допустимым целым положительным числом" -#: src/factor.c:494 +#: src/factor.c:2442 src/od.c:1646 src/od.c:1715 +#, c-format +msgid "%s is too large" +msgstr "%s слишком велик" + +#: src/factor.c:2454 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4392,7 +4438,7 @@ msgstr "" "Использование: %s [ЧИСЛО]…\n" " или: %s КЛЮЧ\n" -#: src/factor.c:499 +#: src/factor.c:2459 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" @@ -4419,24 +4465,22 @@ msgid "cannot stat current directory (now %s)" msgstr "невозможно выполнить stat для текущего каталога (сейчас %s)" #. This is a proper name. See the gettext manual, section Names. -#: src/fmt.c:37 +#: src/fmt.c:38 msgid "Ross Paterson" msgstr "Росс Патерсон (Ross Paterson)" -#: src/fmt.c:269 +#: src/fmt.c:270 #, c-format msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n" msgstr "Использование: %s [-ЦИФРЫ] [КЛЮЧ]… [ФАЙЛ]…\n" -#: src/fmt.c:270 +#: 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" -"\n" msgstr "" "Переформатирует каждый абзац в ФАЙЛЕ(ах) и печатает на стандартный вывод.\n" "Ключ -ЦИФРЫ -- сокращённая форма --width=ЦИФРЫ.\n" -"\n" #: src/fmt.c:278 msgid "" @@ -4450,8 +4494,8 @@ msgstr "" " СТРОКИ, сохраняя при этом префикс строк\n" " -s, --split-only разбивать длинные строки, но не заполнять\n" -#: src/fmt.c:285 -#, fuzzy, c-format +#: src/fmt.c:287 +#, 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" @@ -4462,8 +4506,10 @@ msgstr "" " -u, --uniform-spacing один пробел после слова, два после предложения\n" " -w, --width=ЧИСЛО максимальная ширина строки (по умолчанию 75\n" " столбцов)\n" +" -g, --goal=ЧИСЛО ширина задаваемого показателя (goal,\n" +" по умолчанию 93% ширины)\n" -#: src/fmt.c:357 +#: src/fmt.c:359 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -4472,7 +4518,7 @@ msgstr "" "неверный ключ -- %c; -ЦИФРЫ распознается, только если это первый\n" "аргумент, в противном случае пишите -w N" -#: src/fmt.c:403 src/fmt.c:414 +#: src/fmt.c:405 src/fmt.c:416 #, c-format msgid "invalid width: %s" msgstr "недопустимая ширина: %s" @@ -4481,14 +4527,12 @@ msgstr "недопустимая ширина: %s" msgid "" "Wrap input lines in each FILE (standard input by default), writing to\n" "standard output.\n" -"\n" msgstr "" "Разбивает строки в ФАЙЛЕ(ах) (по умолчанию читает стандартный ввод) и " "печатает\n" "на стандартный вывод.\n" -"\n" -#: src/fold.c:78 +#: src/fold.c:77 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4498,13 +4542,13 @@ msgstr "" " -s, --spaces разбивать только на пробелах\n" " -w, --width=ЧИСЛО использовать указанное ЧИСЛО столбцов, а не 80\n" -#: src/fold.c:289 src/pr.c:836 +#: src/fold.c:288 src/pr.c:832 #, c-format 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:75 +#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 #: src/truncate.c:37 msgid "Padraig Brady" msgstr "Падрайг Брэди (Padraig Brady)" @@ -4523,17 +4567,17 @@ msgstr "" "сценариях командной строки.\n" "\n" -#: src/group-list.c:69 src/id.c:345 src/setuidgid.c:184 +#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184 #, c-format msgid "failed to get groups for user %s" msgstr "не удалось получить группы пользователя %s" -#: src/group-list.c:74 src/id.c:350 +#: src/group-list.c:74 src/id.c:370 #, c-format msgid "failed to get groups for the current process" msgstr "не удалось получить группы текущего процесса" -#: src/group-list.c:104 +#: src/group-list.c:114 #, c-format msgid "cannot find name for group ID %lu" msgstr "невозможно определить имя группы для ID %lu" @@ -4578,14 +4622,12 @@ 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" -"\n" msgstr "" "Печатает первые 10 строк каждого ФАЙЛА на стандартный вывод.\n" "Если задано несколько ФАЙЛОВ, сначала печатает заголовок с именем файла.\n" "Если ФАЙЛ не задан или задан как -, читает стандартный ввод.\n" -"\n" -#: src/head.c:118 +#: src/head.c:117 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -4602,7 +4644,7 @@ msgstr "" " если перед K стоит «-», напечатать все, кроме K\n" " последних строк каждого файла\n" -#: src/head.c:126 +#: src/head.c:125 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4610,7 +4652,7 @@ msgstr "" " -q, --quiet, --silent не печатать заголовки с именами файлов\n" " -v, --verbose всегда печатать заголовки с именами файлов\n" -#: src/head.c:132 +#: src/head.c:131 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -4622,58 +4664,58 @@ 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:152 -#, c-format -msgid "error writing %s" -msgstr "ошибка записи %s" - -#: src/head.c:155 +#: src/head.c:154 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: файл слишком сократился" -#: src/head.c:228 src/head.c:1044 +#: src/head.c:227 src/head.c:1051 #, c-format msgid "%s: number of bytes is too large" msgstr "%s: число байт слишком велико" -#: src/head.c:441 +#: src/head.c:440 #, c-format msgid "%s: cannot lseek back to original position" msgstr "%s: невозможно вернуть указатель файла на первоначальную позицию" -#: src/head.c:613 src/head.c:684 src/tail.c:450 +#: src/head.c:612 src/head.c:691 src/tail.c:449 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: невозможно сместиться к позиции %s" -#: src/head.c:791 +#: src/head.c:673 +#, c-format +msgid "%s: failed to reset file pointer" +msgstr "%s: не удалось сбросить (reset) файловый указатель" + +#: src/head.c:798 #, c-format msgid "cannot reposition file pointer for %s" msgstr "невозможно переместить указатель файла для %s" -#: src/head.c:878 +#: src/head.c:885 #, c-format msgid "%s: %s is so large that it is not representable" msgstr "%s: %s настолько велико, что его невозможно машинно представить" -#: src/head.c:879 +#: src/head.c:886 msgid "number of lines" msgstr "число строк" -#: src/head.c:879 +#: src/head.c:886 msgid "number of bytes" msgstr "число байт" -#: src/head.c:886 src/tail.c:1947 +#: src/head.c:893 src/tail.c:1947 msgid "invalid number of lines" msgstr "неверное число строк" -#: src/head.c:887 src/tail.c:1948 +#: src/head.c:894 src/tail.c:1948 msgid "invalid number of bytes" msgstr "неверный число байт" -#: src/head.c:974 src/head.c:1032 +#: src/head.c:981 src/head.c:1039 #, c-format msgid "invalid trailing option -- %c" msgstr "неверный завершающий ключ -- %c" @@ -4796,86 +4838,86 @@ msgstr "не удалось получить контекст процесса" msgid "cannot get effective UID" msgstr "невозможно получить эффективный UID" -#: src/id.c:289 +#: src/id.c:311 #, c-format -msgid "cannot find name for user ID %lu" -msgstr "невозможно определить имя пользователя для ID %lu" +msgid "cannot find name for user ID %s" +msgstr "невозможно определить имя пользователя для ID %s" -#: src/id.c:309 +#: src/id.c:329 #, c-format -msgid "uid=%lu" -msgstr "uid=%lu" +msgid "uid=%s" +msgstr "uid=%s" -#: src/id.c:314 +#: src/id.c:334 #, c-format -msgid " gid=%lu" -msgstr " gid=%lu" +msgid " gid=%s" +msgstr " gid=%s" -#: src/id.c:321 +#: src/id.c:341 #, c-format -msgid " euid=%lu" -msgstr " euid=%lu" +msgid " euid=%s" +msgstr " euid=%s" -#: src/id.c:329 +#: src/id.c:349 #, c-format -msgid " egid=%lu" -msgstr " egid=%lu" +msgid " egid=%s" +msgstr " egid=%s" -#: src/id.c:357 +#: src/id.c:377 msgid " groups=" msgstr " группы=" -#: src/id.c:373 +#: src/id.c:393 #, c-format msgid " context=%s" msgstr " контекст=%s" -#: src/install.c:372 +#: src/install.c:373 #, c-format msgid "warning: %s: failed to change context to %s" msgstr "предупреждение: %s: невозможно сменить контекст на %s" -#: src/install.c:413 +#: src/install.c:414 #, c-format msgid "creating directory %s" msgstr "создание каталога %s" -#: src/install.c:481 +#: src/install.c:482 #, c-format msgid "cannot change ownership of %s" msgstr "невозможно изменить владельца %s" -#: src/install.c:505 +#: src/install.c:506 #, c-format msgid "cannot set time stamps for %s" msgstr "невозможно установить временные отметки для %s" -#: src/install.c:526 src/split.c:412 src/timeout.c:387 +#: src/install.c:527 src/split.c:426 src/timeout.c:439 #, c-format msgid "fork system call failed" msgstr "системный вызов fork завершился неудачно" -#: src/install.c:530 +#: src/install.c:531 #, c-format msgid "cannot run %s" msgstr "невозможно запустить %s" -#: src/install.c:534 +#: src/install.c:535 #, c-format msgid "waiting for strip" msgstr "ожидание strip" -#: src/install.c:536 +#: src/install.c:537 #, c-format msgid "strip process terminated abnormally" msgstr "процесс strip завершился неудачно" -#: src/install.c:557 +#: src/install.c:558 #, c-format msgid "invalid user %s" msgstr "неверный пользователь %s" -#: src/install.c:593 +#: src/install.c:594 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -4888,7 +4930,7 @@ msgstr "" " или: %s [КЛЮЧ]… -t КАТАЛОГ ИСТОЧНИК…\n" " или: %s [КЛЮЧ]… -d КАТАЛОГ…\n" -#: src/install.c:600 +#: src/install.c:601 msgid "" "\n" "This install program copies files (often just compiled) into destination\n" @@ -4900,7 +4942,6 @@ msgid "" "In the first three forms, copy SOURCE to DEST or multiple SOURCE(s) to\n" "the existing DIRECTORY, while setting permission modes and owner/group.\n" "In the 4th form, create all components of the given DIRECTORY(ies).\n" -"\n" msgstr "" "\n" "Программа install копирует файлы (часто, только что скомпилированные) в\n" @@ -4912,7 +4953,6 @@ msgstr "" "ИСТОЧНИКОВ в существующий КАТАЛОГ, устанавливая режимы доступа и\n" "владельца/группу. В четвёртой форме создаются все компоненты указанных\n" "КАТАЛОГОВ.\n" -"\n" #: src/install.c:615 msgid "" @@ -4991,7 +5031,7 @@ msgstr "" " -Z, --context=КОНТЕКСТ задать контекст безопасности SELinux файлам\n" " и каталогам\n" -#: src/install.c:858 +#: src/install.c:859 #, c-format msgid "" "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled" @@ -4999,51 +5039,50 @@ msgstr "" "ПРЕДУПРЕЖДЕНИЕ: игнорируется ключ --preserve-context; ядро без поддержки " "SELinux" -#: src/install.c:868 +#: src/install.c:869 #, c-format msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled" msgstr "" "ПРЕДУПРЕЖДЕНИЕ: игнорируется ключ --context (-Z); ядро без поддержки SELinux" -#: src/install.c:885 +#: src/install.c:886 #, c-format msgid "the strip option may not be used when installing a directory" msgstr "при установке каталога нельзя применять ключ strip" -#: src/install.c:888 +#: src/install.c:889 #, c-format msgid "target directory not allowed when installing a directory" msgstr "при установке каталога нельзя задавать целевой каталог" -#: src/install.c:892 +#: src/install.c:893 #, c-format msgid "cannot force target context to %s and preserve it" msgstr "невозможно установить контекст цели в %s и сохранить его" -#: src/install.c:946 src/mkdir.c:202 src/stdbuf.c:327 +#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326 #, c-format msgid "invalid mode %s" msgstr "неверный режим %s" -#: src/install.c:953 +#: src/install.c:954 #, c-format msgid "WARNING: ignoring --strip-program option as -s option was not specified" msgstr "" "ПРЕДУПРЕЖДЕНИЕ: игнорируется ключ --strip-program, так как не указан ключ -s" -#: src/install.c:958 +#: src/install.c:959 #, c-format msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive" msgstr "" -"ключи --compare (-C) и --preserve-timestamps являются взаимно исключают друг " -"друга" +"ключи --compare (-C) и --preserve-timestamps взаимно исключают друг друга" -#: src/install.c:965 +#: src/install.c:966 #, c-format msgid "options --compare (-C) and --strip are mutually exclusive" -msgstr "ключи --compare (-C) и --strip являются взаимно исключают друг друга" +msgstr "ключи --compare (-C) и --strip взаимно исключают друг друга" -#: src/install.c:971 +#: src/install.c:972 #, c-format msgid "" "the --compare (-C) option is ignored when you specify a mode with non-" @@ -5053,7 +5092,7 @@ msgstr "" "битами" #. This is a proper name. See the gettext manual, section Names. -#: src/join.c:40 src/sort.c:65 +#: src/join.c:40 src/sort.c:66 msgid "Mike Haertel" msgstr "Майк Гертель (Mike Haertel)" @@ -5149,8 +5188,8 @@ msgstr "" #: src/join.c:403 #, c-format -msgid "%s:%ju: is not sorted: %.*s" -msgstr "%s:%ju: без сортировки: %.*s" +msgid "%s:%<PRIuMAX>: is not sorted: %.*s" +msgstr "%s:%<PRIuMAX>: без сортировки: %.*s" #: src/join.c:840 src/join.c:1038 #, c-format @@ -5177,12 +5216,12 @@ msgstr "поля объединения %lu, %lu несовместимы" msgid "conflicting empty-field replacement strings" msgstr "конфликтующие строки замены для пустого поля" -#: src/join.c:1101 src/sort.c:4414 +#: src/join.c:1101 src/sort.c:4468 #, c-format msgid "multi-character tab %s" msgstr "многознаковая табуляция %s" -#: src/join.c:1105 src/sort.c:4419 +#: src/join.c:1105 src/sort.c:4473 #, c-format msgid "incompatible tabs" msgstr "несовместимая табуляция" @@ -5204,14 +5243,10 @@ msgstr "" " или: %s -t [СИГНАЛ]…\n" #: src/kill.c:82 -msgid "" -"Send signals to processes, or list signals.\n" -"\n" -msgstr "" -"Посылает процессам сигналы или перечисляет сигналы.\n" -"\n" +msgid "Send signals to processes, or list signals.\n" +msgstr "Посылает процессам сигналы или показывает список сигналов.\n" -#: src/kill.c:89 +#: src/kill.c:88 msgid "" " -s, --signal=SIGNAL, -SIGNAL\n" " specify the name or number of the signal to be sent\n" @@ -5225,7 +5260,7 @@ msgstr "" " наоборот\n" " -t, --table печатает таблицу с информацией о сигналах\n" -#: src/kill.c:97 +#: src/kill.c:96 msgid "" "\n" "SIGNAL may be a signal name like 'HUP', or a signal number like '1',\n" @@ -5238,32 +5273,32 @@ msgstr "" "PID является целым числом; если оно отрицательно, то обозначает группу\n" "процессов.\n" -#: src/kill.c:206 +#: src/kill.c:205 #, c-format msgid "%s: invalid process id" msgstr "%s: неверный идентификатор процесса" -#: src/kill.c:260 +#: src/kill.c:259 #, c-format msgid "invalid option -- %c" msgstr "неверный ключ -- %c" -#: src/kill.c:269 +#: src/kill.c:268 #, c-format msgid "%s: multiple signals specified" msgstr "%s: задано несколько сигналов" -#: src/kill.c:283 +#: src/kill.c:282 #, c-format msgid "multiple -l or -t options specified" msgstr "задано несколько ключей -l или -t" -#: src/kill.c:300 +#: src/kill.c:299 #, c-format msgid "cannot combine signal with -l or -t" msgstr "нельзя объединять сигнал с -l или -t" -#: src/kill.c:306 +#: src/kill.c:305 #, c-format msgid "no process ID specified" msgstr "не задан идентификатор процесса" @@ -5374,7 +5409,6 @@ msgid "" "When creating hard links, each TARGET must exist. Symbolic links\n" "can hold arbitrary text; if later resolved, a relative link is\n" "interpreted in relation to its parent directory.\n" -"\n" msgstr "" "В первой форме создаётся ссылка на ЦЕЛЬ с указанным ИМЕНЕМ_ССЫЛКИ.\n" "Во второй форме создаётся ссылка на ЦЕЛЬ в текущем каталоге.\n" @@ -5384,9 +5418,8 @@ msgstr "" "При создании жёстких ссылок каждая ЦЕЛЬ должна существовать.\n" "Символьные ссылки могут содержать произвольный текст; при разыменовании\n" "относительная ссылка интерпретируется относительно родительского каталога.\n" -"\n" -#: src/ln.c:395 +#: src/ln.c:394 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -5409,7 +5442,7 @@ msgstr "" " суперпользователя)\n" " -f, --force удалять существующие целевые файлы\n" -#: src/ln.c:403 +#: src/ln.c:402 msgid "" " -i, --interactive prompt whether to remove destinations\n" " -L, --logical dereference TARGETs that are symbolic links\n" @@ -5432,7 +5465,7 @@ msgstr "" " -s, --symbolic создавать символьные ссылки, вместо жёстких " "ссылок\n" -#: src/ln.c:412 +#: src/ln.c:411 msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" " -t, --target-directory=DIRECTORY specify the DIRECTORY in which to " @@ -5446,33 +5479,17 @@ msgstr "" " -T, --no-target-directory всегда считать ИМЯ_ССЫЛКИ обычным файлом\n" " -v, --verbose печатать имя каждого файла при создании ссылки\n" -#: src/ln.c:428 -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 никогда не создавать резервных копий (даже если\n" -" указан ключ --backup)\n" -" numbered, t создавать нумерованные копии\n" -" existing, nil если существуют нумерованные копии, то создавать\n" -" нумерованные иначе создавать простые\n" -" simple. never всегда создавать простые копии\n" -"\n" - -#: src/ln.c:435 +#: src/ln.c:433 #, 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 игнорируются -L и -P. Иначе, последний " -"параметр\n" +"\n" +"При использовании параметра -s игнорируются -L и -P. Иначе, последний ключ\n" "определяет поведение, когда ЦЕЛЬЮ является символьная ссылка,\n" "по умолчанию %s.\n" -"\n" #: src/ln.c:554 #, c-format @@ -5542,7 +5559,7 @@ msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "" "проигнорирован неверный размер табуляции в переменной окружения TABSIZE: %s" -#: src/ls.c:1750 src/ptx.c:1976 +#: src/ls.c:1750 src/ptx.c:1975 #, c-format msgid "invalid line width: %s" msgstr "неверная ширина строки: %s" @@ -5605,7 +5622,7 @@ msgstr "чтение каталога %s" msgid "closing directory %s" msgstr "закрытие каталога %s" -#: src/ls.c:3301 +#: src/ls.c:3302 #, c-format msgid "cannot compare file names %s and %s" msgstr "невозможно сравнить имена файлов %s и %s" @@ -5614,14 +5631,12 @@ msgstr "невозможно сравнить имена файлов %s и %s" msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" -"\n" msgstr "" -"Выдает информацию о ФАЙЛАХ (по умолчанию о текущем каталоге).\n" +"Выдаёт информацию о ФАЙЛАХ (по умолчанию о текущем каталоге).\n" "Сортирует в алфавитном порядке, если не задан ни --sort, ни один из\n" "ключей -cftuvSUX.\n" -"\n" -#: src/ls.c:4729 +#: src/ls.c:4728 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -5633,9 +5648,9 @@ msgstr "" " -A, --almost-all не выдавать подразумеваемые . и ..\n" " --author вместе с -l, печатать автора каждого файла\n" " -b, --escape печатать экранирующие последовательности\n" -" в стиле С для неграфических символов\n" +" в стиле С для не графических символов\n" -#: src/ls.c:4735 +#: src/ls.c:4734 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them. E." "g.,\n" @@ -5661,7 +5676,7 @@ msgstr "" " иначе: сортировать по ctime, сначала самые " "новые\n" -#: src/ls.c:4745 +#: src/ls.c:4744 msgid "" " -C list entries by columns\n" " --color[=WHEN] colorize the output. WHEN defaults to " @@ -5683,7 +5698,7 @@ msgstr "" " также не следовать по символьным ссылкам\n" " -D, --dired генерировать вывод для режима Emacs dired\n" -#: src/ls.c:4753 +#: src/ls.c:4752 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -5701,11 +5716,11 @@ msgstr "" " single-column -1, verbose -l, vertical -C\n" " --full-time синоним -l --time-style=full-iso\n" -#: src/ls.c:4761 +#: src/ls.c:4760 msgid " -g like -l, but do not list owner\n" msgstr " -g как -l, но не выводить владельца\n" -#: src/ls.c:4764 +#: src/ls.c:4763 msgid "" " --group-directories-first\n" " group directories before files.\n" @@ -5718,7 +5733,7 @@ msgstr "" "использование\n" " --sort=none (-U) выключает группировку\n" -#: src/ls.c:4770 +#: src/ls.c:4769 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" @@ -5731,7 +5746,7 @@ msgstr "" " (например, 1K 234M 2G)\n" " --si то же, но использовать степени 1000, а не 1024\n" -#: src/ls.c:4776 +#: src/ls.c:4775 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5753,7 +5768,7 @@ msgstr "" " --hide=ШАБЛОН не показывать файлы, соответствующие ШАБЛОНУ\n" " оболочки (отменяется ключами -a или -A)\n" -#: src/ls.c:4786 +#: src/ls.c:4785 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -5774,7 +5789,7 @@ msgstr "" " оболочки\n" " -k использовать блоки по 1024 байта\n" -#: src/ls.c:4796 +#: src/ls.c:4795 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5790,7 +5805,7 @@ msgstr "" " ссылается\n" " -m выдавать список на всю ширину через запятую\n" -#: src/ls.c:4804 +#: src/ls.c:4803 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. " @@ -5806,7 +5821,7 @@ msgstr "" " -o как -l, но не выводить информацию о группе\n" " -p, --indicator-style=slash добавлять индикатор / к каталогам\n" -#: src/ls.c:4812 +#: src/ls.c:4811 msgid "" " -q, --hide-control-chars print ? instead of non graphic characters\n" " --show-control-chars show non graphic characters as-is (default\n" @@ -5825,7 +5840,7 @@ msgstr "" " --quoting-style=ТИП использовать тип заключения в кавычки ТИП:\n" " literal, shell, shell-always, c, escape\n" -#: src/ls.c:4821 +#: src/ls.c:4820 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -5836,7 +5851,7 @@ msgstr "" " -R, --recursive рекурсивно показывать каталоги\n" " -s, --size печатать размер каждого файла в блоках\n" -#: src/ls.c:4826 +#: src/ls.c:4825 msgid "" " -S sort by file size\n" " --sort=WORD sort by WORD instead of name: none -U,\n" @@ -5860,7 +5875,7 @@ msgstr "" " если --sort=time, использовать указанное\n" " время в качестве ключа сортировки\n" -#: src/ls.c:4836 +#: src/ls.c:4835 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, +FORMAT.\n" @@ -5882,7 +5897,7 @@ msgstr "" " если к СТИЛЮ добавлен префикс «posix-», то он\n" " действует только в локали, отличной от POSIX\n" -#: src/ls.c:4845 +#: src/ls.c:4844 msgid "" " -t sort by modification time, newest first\n" " -T, --tabsize=COLS assume tab stops at each COLS instead of 8\n" @@ -5892,7 +5907,7 @@ msgstr "" " -T, --tabsize=РАЗМЕР использовать табуляцию указанного РАЗМЕРА, а не " "8\n" -#: src/ls.c:4849 +#: src/ls.c:4848 msgid "" " -u with -lt: sort by, and show, access time\n" " with -l: show access time and sort by name\n" @@ -5909,7 +5924,7 @@ msgstr "" " -v сортировать по номерам (версии) в текстовом\n" " представлении\n" -#: src/ls.c:4856 +#: src/ls.c:4855 msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" @@ -5925,7 +5940,7 @@ msgstr "" " файла\n" " -1 перечислять по одному файлу на строке\n" -#: src/ls.c:4866 +#: src/ls.c:4865 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5941,7 +5956,7 @@ msgstr "" "служит для изменения значений. Для её установки используйте команду " "dircolors.\n" -#: src/ls.c:4873 +#: src/ls.c:4872 msgid "" "\n" "Exit status:\n" @@ -5970,7 +5985,7 @@ msgstr "Скот Миллер (Scott Miller)" msgid "David Madore" msgstr "Дэвид Мэдор (David Madore)" -#: src/md5sum.c:162 +#: src/md5sum.c:164 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -5983,7 +5998,7 @@ msgstr "" "Если ФАЙЛ не задан или задан как -, читает стандартный ввод.\n" "\n" -#: src/md5sum.c:172 +#: src/md5sum.c:174 msgid "" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" @@ -5991,16 +6006,20 @@ msgstr "" " -b, --binary читать в двоичном режиме (по умолчанию, если\n" " читается не терминальный ввод)\n" -#: src/md5sum.c:176 +#: src/md5sum.c:178 msgid " -b, --binary read in binary mode\n" msgstr " -b, --binary читать в двоичном режиме\n" -#: src/md5sum.c:179 +#: src/md5sum.c:181 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr " -c, --check читать суммы %s из ФАЙЛОВ и сверять их\n" -#: src/md5sum.c:183 +#: src/md5sum.c:184 +msgid " --tag create a BSD-style checksum\n" +msgstr " --tag создать контрольную сумму в стиле BSD\n" + +#: src/md5sum.c:188 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" @@ -6008,11 +6027,11 @@ msgstr "" "читается\n" " терминальный ввод)\n" -#: src/md5sum.c:187 +#: src/md5sum.c:192 msgid " -t, --text read in text mode (default)\n" msgstr " -t, --text читать в текстовом режиме (по умолчанию)\n" -#: src/md5sum.c:190 +#: src/md5sum.c:195 msgid "" "\n" "The following three options are useful only when verifying checksums:\n" @@ -6033,14 +6052,14 @@ msgstr "" " списке контрольных сумм\n" "\n" -#: src/md5sum.c:198 +#: src/md5sum.c:203 msgid "" " --strict with --check, exit non-zero for any invalid input\n" msgstr "" " --strict с --check завершить работу с ненулевым кодом при\n" " любых некорректных входных данных\n" -#: src/md5sum.c:203 +#: src/md5sum.c:208 #, c-format msgid "" "\n" @@ -6055,35 +6074,35 @@ msgstr "" "По умолчанию печатает строку с контрольной суммой, знак, показывающий\n" "режим ввода («*» для двоичных, пробел для текстовых) и имя каждого ФАЙЛА.\n" -#: src/md5sum.c:502 +#: src/md5sum.c:523 #, c-format msgid "%s: too many checksum lines" msgstr "%s: слишком много строк контрольных сумм" -#: src/md5sum.c:526 +#: src/md5sum.c:547 #, c-format msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line" msgstr "%s: %<PRIuMAX>: неправильно составленная строка контрольной суммы %s" -#: src/md5sum.c:551 +#: src/md5sum.c:572 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: невозможно открыть или прочитать\n" -#: src/md5sum.c:574 +#: src/md5sum.c:595 msgid "FAILED" msgstr "ПОВРЕЖДЁН" -#: src/md5sum.c:576 +#: src/md5sum.c:597 msgid "OK" msgstr "ЦЕЛ" -#: src/md5sum.c:600 +#: src/md5sum.c:621 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "%s: не найдено верно составленных строк контрольных сумм %s" -#: src/md5sum.c:610 +#: src/md5sum.c:631 #, c-format msgid "WARNING: %<PRIuMAX> line is improperly formatted" msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted" @@ -6091,7 +6110,7 @@ msgstr[0] "ПРЕДУПРЕЖДЕНИЕ: неправильный формат msgstr[1] "ПРЕДУПРЕЖДЕНИЕ: неправильный формат строк %<PRIuMAX>" msgstr[2] "ПРЕДУПРЕЖДЕНИЕ: неправильный формат строк %<PRIuMAX>" -#: src/md5sum.c:618 +#: src/md5sum.c:639 #, c-format msgid "WARNING: %<PRIuMAX> listed file could not be read" msgid_plural "WARNING: %<PRIuMAX> listed files could not be read" @@ -6099,7 +6118,7 @@ msgstr[0] "ПРЕДУПРЕЖДЕНИЕ: не удалось прочитать msgstr[1] "ПРЕДУПРЕЖДЕНИЕ: не удалось прочитать %<PRIuMAX> файла из списка" msgstr[2] "ПРЕДУПРЕЖДЕНИЕ: не удалось прочитать %<PRIuMAX> файлов из списка" -#: src/md5sum.c:626 +#: src/md5sum.c:647 #, c-format msgid "WARNING: %<PRIuMAX> computed checksum did NOT match" msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match" @@ -6107,28 +6126,38 @@ msgstr[0] "ПРЕДУПРЕЖДЕНИЕ: НЕ совпала %<PRIuMAX> вычи msgstr[1] "ПРЕДУПРЕЖДЕНИЕ: НЕ совпали %<PRIuMAX> вычисленные контрольные суммы" msgstr[2] "ПРЕДУПРЕЖДЕНИЕ: НЕ совпали %<PRIuMAX> вычисленных контрольных сумм" -#: src/md5sum.c:704 +#: src/md5sum.c:760 +#, c-format +msgid "--tag does not support --text mode" +msgstr "--tag не поддерживает режим --text" + +#: src/md5sum.c:766 +#, c-format +msgid "the --tag option is meaningless when verifying checksums" +msgstr "ключ --tag имеет смысл только при проверке контрольных сумм" + +#: src/md5sum.c:773 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" msgstr "ключи --binary и --text бессмысленны при проверке контрольных сумм" -#: src/md5sum.c:712 +#: src/md5sum.c:781 #, c-format msgid "the --status option is meaningful only when verifying checksums" msgstr "ключ --status имеет смысл только при проверке контрольных сумм" -#: src/md5sum.c:719 +#: src/md5sum.c:788 #, c-format msgid "the --warn option is meaningful only when verifying checksums" msgstr "ключ --warn имеет смысл только при проверке контрольных сумм" -#: src/md5sum.c:726 +#: src/md5sum.c:795 #, c-format msgid "the --quiet option is meaningful only when verifying checksums" msgstr "ключ --quiet имеет смысл только при проверке контрольных сумм" -#: src/md5sum.c:733 +#: src/md5sum.c:802 #, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "ключ --strict имеет смысл только при проверке контрольных сумм" @@ -6139,15 +6168,11 @@ msgid "Usage: %s [OPTION]... DIRECTORY...\n" msgstr "Использование: %s [КЛЮЧ]… КАТАЛОГ…\n" #: src/mkdir.c:57 -msgid "" -"Create the DIRECTORY(ies), if they do not already exist.\n" -"\n" -msgstr "" -"Создает КАТАЛОГ(и), если он ещё не существует.\n" -"\n" +msgid "Create the DIRECTORY(ies), if they do not already exist.\n" +msgstr "Создает КАТАЛОГ(и), если он ещё не существует.\n" # not a=rwx - umask ??? что за бред -#: src/mkdir.c:64 +#: src/mkdir.c:63 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" @@ -6162,7 +6187,7 @@ msgstr "" " -Z, --context=CTX установить контекст безопасности SELinux для каждого\n" " создаваемого каталога равным CTX\n" -#: src/mkdir.c:169 +#: src/mkdir.c:168 #, c-format msgid "created directory %s" msgstr "создан каталог %s" @@ -6173,32 +6198,28 @@ msgid "Usage: %s [OPTION]... NAME...\n" msgstr "Использование: %s [КЛЮЧ]… ИМЯ…\n" #: src/mkfifo.c:52 -msgid "" -"Create named pipes (FIFOs) with the given NAMEs.\n" -"\n" -msgstr "" -"Создает именованные каналы (FIFO) для заданного NAME.\n" -"\n" +msgid "Create named pipes (FIFOs) with the given NAMEs.\n" +msgstr "Создаёт именованные каналы (FIFO) для заданного ИМЕНИ.\n" # not a=rwx - umask ??? что за бред -#: src/mkfifo.c:59 src/mknod.c:61 +#: src/mkfifo.c:58 src/mknod.c:60 msgid "" " -m, --mode=MODE set file permission bits to MODE, not a=rw - umask\n" msgstr " -m, --mode=РЕЖИМ установить РЕЖИМ доступа\n" -#: src/mkfifo.c:62 +#: src/mkfifo.c:61 msgid "" " -Z, --context=CTX set the SELinux security context of each NAME to CTX\n" msgstr "" " -Z, --context=CTX установить контекст безопасности SELinux для каждого\n" " ИМЕНИ равным CTX\n" -#: src/mkfifo.c:122 src/mknod.c:128 +#: src/mkfifo.c:121 src/mknod.c:127 #, c-format msgid "invalid mode" msgstr "неверный режим" -#: src/mkfifo.c:127 src/mknod.c:133 +#: src/mkfifo.c:126 src/mknod.c:132 #, c-format msgid "mode must specify only file permission bits" msgstr "режим должен задавать только биты разрешений для файла" @@ -6209,20 +6230,16 @@ msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n" msgstr "Использование: %s [КЛЮЧ]… ИМЯ ТИП [ОСНОВНОЙ ВТОРОСТЕПЕННЫЙ]\n" #: src/mknod.c:54 -msgid "" -"Create the special file NAME of the given TYPE.\n" -"\n" -msgstr "" -"Создает специальный файл с именем NAME и типом TYPE.\n" -"\n" +msgid "Create the special file NAME of the given TYPE.\n" +msgstr "Создаёт специальный файл с ИМЕНЕМ и ТИПОМ.\n" -#: src/mknod.c:64 +#: 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:69 +#: src/mknod.c:68 msgid "" "\n" "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n" @@ -6237,7 +6254,7 @@ msgstr "" "шестнадцатеричные числа; если начинаются на 0, то как восьмеричные;\n" "иначе как десятичные. ТИП может принимать следующие значения:\n" -#: src/mknod.c:76 +#: src/mknod.c:75 msgid "" "\n" " b create a block (buffered) special file\n" @@ -6249,42 +6266,42 @@ msgstr "" " c, u создать файл символьного устройства (небуферизованный)\n" " p создать именованный канал\n" -#: src/mknod.c:151 +#: src/mknod.c:150 msgid "Special files require major and minor device numbers." msgstr "" "Для специального файла должны быть указаны основной и второстепенный номера " "устройства." -#: src/mknod.c:161 +#: src/mknod.c:160 msgid "Fifos do not have major and minor device numbers." msgstr "У файлов-очередей нет основного и второстепенного числа устройства." -#: src/mknod.c:177 +#: src/mknod.c:176 #, c-format msgid "block special files not supported" msgstr "блочные специальные файлы не поддерживаются" -#: src/mknod.c:186 +#: src/mknod.c:185 #, c-format msgid "character special files not supported" msgstr "специальные символьные файлы не поддерживаются" -#: src/mknod.c:202 +#: src/mknod.c:201 #, c-format msgid "invalid major device number %s" msgstr "неверное основное число устройства %s" -#: src/mknod.c:207 +#: src/mknod.c:206 #, c-format msgid "invalid minor device number %s" msgstr "неверное второстепенное число устройства %s" -#: src/mknod.c:212 +#: src/mknod.c:211 #, c-format msgid "invalid device %s %s" msgstr "неверное устройство %s %s" -#: src/mknod.c:226 +#: src/mknod.c:225 #, c-format msgid "invalid device type %s" msgstr "неверный тип устройства %s" @@ -6371,60 +6388,58 @@ msgstr "" " относительно каталога: $TMPDIR, если задан; иначе\n" " каталог задаётся через -p; иначе /tmp (устарел)\n" -#: src/mktemp.c:222 +#: src/mktemp.c:223 #, c-format msgid "failed to redirect stderr to /dev/null" msgstr "не удалось перенаправить стандартный поток ошибок в /dev/null" -#: src/mktemp.c:228 +#: src/mktemp.c:229 #, c-format msgid "too many templates" msgstr "слишком много шаблонов" -#: src/mktemp.c:248 +#: src/mktemp.c:249 #, c-format msgid "with --suffix, template %s must end in X" msgstr "При задании --suffix, шаблон %s должен оканчиваться на X" -#: src/mktemp.c:273 src/split.c:1117 +#: src/mktemp.c:274 src/split.c:1130 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "неверный суффикс %s, содержит разделитель каталогов" -#: src/mktemp.c:278 +#: src/mktemp.c:279 #, c-format msgid "too few X's in template %s" msgstr "слишком мало X в шаблоне %s" -#: src/mktemp.c:291 +#: src/mktemp.c:292 #, c-format msgid "invalid template, %s, contains directory separator" msgstr "неверный шаблон %s, содержит разделитель каталогов" -#: src/mktemp.c:305 +#: src/mktemp.c:306 #, c-format msgid "invalid template, %s; with --tmpdir, it may not be absolute" msgstr "неверный шаблон %s; с --tmpdir в нём не может быть абсолютного пути" -#: src/mktemp.c:325 +#: src/mktemp.c:326 #, c-format msgid "failed to create directory via template %s" msgstr "не удалось создать каталог по шаблону %s" -#: src/mktemp.c:335 +#: src/mktemp.c:336 #, c-format msgid "failed to create file via template %s" msgstr "не удалось создать файл по шаблону %s" -#: src/mv.c:290 -msgid "" -"Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" -"\n" +#: src/mv.c:292 +msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" msgstr "" -"Переименовывает ИСТОЧНИК в НАЗНАЧЕНИЕ, или переносит ИСТОЧНИК(и) в КАТАЛОГ.\n" -"\n" +"Переименовывает ИСТОЧНИК в НАЗНАЧЕНИЕ, или перемещает ИСТОЧНИК(и) в " +"КАТАЛОГ.\n" -#: src/mv.c:297 +#: src/mv.c:298 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -6443,7 +6458,7 @@ msgstr "" " -n, --no-clobber не переписывать существующий файл\n" "Если указано более одного ключа -i, -f, -n, то используется последний.\n" -#: src/mv.c:306 +#: src/mv.c:307 msgid "" " --strip-trailing-slashes remove any trailing slashes from each " "SOURCE\n" @@ -6455,7 +6470,7 @@ msgstr "" " -S, --suffix=СУФФИКС перекрывает обычный суффикс для резервных " "копий\n" -#: src/mv.c:311 +#: src/mv.c:312 msgid "" " -t, --target-directory=DIRECTORY move all SOURCE arguments into " "DIRECTORY\n" @@ -6481,34 +6496,35 @@ msgstr "Использование: %s [КЛЮЧ] [КОМАНДА [АРГ]…]\n #, c-format msgid "" "Run COMMAND with an adjusted niceness, which affects process scheduling.\n" -"With no COMMAND, print the current niceness. Nicenesses range from\n" -"%d (most favorable scheduling) to %d (least favorable).\n" -"\n" -" -n, --adjustment=N add integer N to the niceness (default 10)\n" +"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 "" -"Запускает КОМАНДУ с измененным значением nice, что влияет на приоритет\n" -"для планировщика. Если КОМАНДА не задана, печатает текущее значение\n" -"nice. Допустимы пределы от %d (наибольший приоритет) до %d\n" +"Запускает КОМАНДУ с изменённым значением nice, что влияет на приоритет\n" +"при планировании. Если КОМАНДА не задана, печатает текущее значение\n" +"nice. Значения nice лежат в диапазоне от %d (наибольший приоритет) до %d\n" "(наименьший).\n" -"\n" + +#: src/nice.c:82 +msgid " -n, --adjustment=N add integer N to the niceness (default 10)\n" +msgstr "" " -n, --adjustment=N увеличить nice на целое число N (по умолчанию 10)\n" -#: src/nice.c:168 +#: src/nice.c:172 #, c-format msgid "invalid adjustment %s" msgstr "неверная поправка %s" -#: src/nice.c:177 +#: src/nice.c:181 #, c-format msgid "a command must be given with an adjustment" msgstr "если задана поправка, должна быть указана команда" -#: src/nice.c:184 src/nice.c:195 +#: src/nice.c:188 src/nice.c:199 #, c-format msgid "cannot get niceness" msgstr "невозможно узнать значение nice" -#: src/nice.c:201 +#: src/nice.c:205 #, c-format msgid "cannot set niceness" msgstr "невозможно установить значение nice" @@ -6518,17 +6534,15 @@ msgstr "невозможно установить значение nice" msgid "Scott Bartram" msgstr "Скотт Бертрам (Scott Bartram)" -#: src/nl.c:186 +#: src/nl.c:179 msgid "" "Write each FILE to standard output, with line numbers added.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" "Печатает каждый ФАЙЛ на стандартный вывод, добавляя номера строк.\n" "Если ФАЙЛ не задан или задан как -, читает стандартный ввод.\n" -"\n" -#: src/nl.c:194 +#: src/nl.c:186 msgid "" " -b, --body-numbering=STYLE use STYLE for numbering body lines\n" " -d, --section-delimiter=CC use CC for separating logical pages\n" @@ -6541,7 +6555,7 @@ msgstr "" "нижнего\n" " колонтитула\n" -#: src/nl.c:199 +#: src/nl.c:191 msgid "" " -h, --header-numbering=STYLE use STYLE for numbering header lines\n" " -i, --line-increment=NUMBER line number increment at each line\n" @@ -6562,7 +6576,7 @@ msgstr "" " логической страницы\n" " -s, --number-separator=СТРОКА добавлять СТРОКУ после номера\n" -#: src/nl.c:207 +#: src/nl.c:199 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" @@ -6573,7 +6587,7 @@ msgstr "" " -w, --number-width=ЧИСЛО использовать заданное ЧИСЛО столбцов для\n" " номеров строк\n" -#: src/nl.c:213 +#: src/nl.c:205 msgid "" "\n" "By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC are\n" @@ -6587,7 +6601,7 @@ msgstr "" "качестве второго используется :. Вводите \\\\ чтобы получить \\. СТИЛЬ\n" "задается как один из следующих:\n" -#: src/nl.c:219 +#: src/nl.c:211 msgid "" "\n" " a number all lines\n" @@ -6617,54 +6631,47 @@ msgstr "" " rz выравнивать по правому краю, выводить начальные нули\n" "\n" -#: src/nl.c:286 +#: src/nl.c:278 #, c-format msgid "line number overflow" msgstr "переполнение номера строки" -#: src/nl.c:486 +#: src/nl.c:478 #, c-format msgid "invalid header numbering style: %s" msgstr "неверный стиль нумерования заголовка: %s" -#: src/nl.c:494 +#: src/nl.c:486 #, c-format msgid "invalid body numbering style: %s" msgstr "неверный стиль нумерования тела: %s" -#: src/nl.c:502 +#: src/nl.c:494 #, c-format msgid "invalid footer numbering style: %s" msgstr "неверный стиль нумерования нижнего колонтитула: %s" -#: src/nl.c:511 +#: src/nl.c:503 #, c-format msgid "invalid starting line number: %s" msgstr "неверный номер начальной строки: %s" -#: src/nl.c:517 -#, c-format -msgid "WARNING: --page-increment is deprecated; use --line-increment instead" -msgstr "" -"ПРЕДУПРЕЖДЕНИЕ: ключ --page-increment устарел, используйте вместо него --" -"line-increment" - -#: src/nl.c:524 +#: src/nl.c:512 #, c-format msgid "invalid line number increment: %s" msgstr "неверное приращение номера строки: %s" -#: src/nl.c:536 +#: src/nl.c:524 #, c-format msgid "invalid number of blank lines: %s" msgstr "неверное число пустых строк: %s" -#: src/nl.c:550 +#: src/nl.c:538 #, c-format msgid "invalid line number field width: %s" msgstr "неверная ширина поля для номера строки: %s" -#: src/nl.c:569 +#: src/nl.c:557 #, c-format msgid "invalid line numbering format: %s" msgstr "неверный формат нумерации строк: %s" @@ -6715,11 +6722,6 @@ msgstr "не удалось отобразить, стандартный вво msgid "ignoring input" msgstr "ввод игнорируется" -#: src/nohup.c:163 src/nohup.c:165 -#, c-format -msgid "failed to open %s" -msgstr "не удалось открыть %s" - #: src/nohup.c:175 #, c-format msgid "ignoring input and appending output to %s" @@ -6753,16 +6755,16 @@ msgid "failed to redirect standard error" msgstr "не удалось перенаправить стандартный поток ошибок" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:32 +#: src/nproc.c:33 msgid "Giuseppe Scrivano" msgstr "Джузеппе Скривано (Giuseppe Scrivano)" -#: src/nproc.c:56 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 +#: src/nproc.c:57 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Использование: %s [КЛЮЧ]…\n" -#: src/nproc.c:57 +#: src/nproc.c:58 msgid "" "Print the number of processing units available to the current process,\n" "which may be less than the number of online processors\n" @@ -6772,7 +6774,7 @@ msgstr "" "которое может быть меньше числа работающих процессоров\n" "\n" -#: src/nproc.c:62 +#: src/nproc.c:63 msgid "" " --all print the number of installed processors\n" " --ignore=N if possible, exclude N processing units\n" @@ -6780,11 +6782,436 @@ msgstr "" " --all вывести число установленных процессоров\n" " --ignore=N если возможно, исключить N обрабатывающих элементов\n" -#: src/nproc.c:106 +#: src/nproc.c:107 #, c-format msgid "%s: invalid number to ignore" msgstr "%s: неверное число для исключения" +#. This is a proper name. See the gettext manual, section Names. +#: src/numfmt.c:35 +msgid "Assaf Gordon" +msgstr "Ассаф Гордон (Assaf Gordon)" + +#: src/numfmt.c:676 +#, c-format +msgid "value too large to be converted: '%s'" +msgstr "значение слишком велико для преобразования: «%s»" + +#: src/numfmt.c:680 +#, c-format +msgid "invalid number: '%s'" +msgstr "неверное число: «%s»" + +#: src/numfmt.c:684 +#, c-format +msgid "rejecting suffix in input: '%s' (consider using --from)" +msgstr "" +"отбрасывается суффикс в входных данных: «%s» (попробуйте указать --from)" + +#: src/numfmt.c:688 +#, c-format +msgid "invalid suffix in input: '%s'" +msgstr "неверный суффикс в входных данных: «%s»" + +#: src/numfmt.c:692 +#, c-format +msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)" +msgstr "отсутствующий суффикс «i» в входных данных: «%s» (например Ki/Mi/Gi)" + +#: src/numfmt.c:723 +#, 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 +#, c-format +msgid "out of memory (requested %zu bytes)" +msgstr "нехватка памяти (запрошено %zu байт)" + +#: src/numfmt.c:813 +#, c-format +msgid "Usage: %s [OPTION]... [NUMBER]...\n" +msgstr "Использование: %s [КЛЮЧ]… [ЧИСЛО]…\n" + +#: src/numfmt.c:816 +msgid "" +"Reformat NUMBER(s), or the numbers from standard input if none are " +"specified.\n" +msgstr "" +"Переформатирует ЧИСЛО(а), читаемое из стандартного ввода, если оно не " +"указано в командной строке.\n" + +#: src/numfmt.c:820 +msgid " --debug print warnings about invalid input\n" +msgstr "" +" --debug показывать предупреждения при некорректных входных\n" +" данных\n" + +#: src/numfmt.c:823 +msgid "" +" -d, --delimiter=X use X instead of whitespace for field delimiter\n" +msgstr "" +" -d, --delimiter=X использовать X вместо пробела как разделитель полей\n" + +#: src/numfmt.c:826 +msgid "" +" --field=N replace the number in input field N (default is 1)\n" +msgstr "" +" --field=N заменять число в входном поле N (по умолчанию 1)\n" + +#: src/numfmt.c:829 +msgid "" +" --format=FORMAT use printf style floating-point FORMAT;\n" +" see FORMAT below for details\n" +msgstr "" +" --format=ФОРМАТ использовать ФОРМАТ плавающей точки в стиле printf;\n" +" подробности смотрите в разделе ФОРМАТ далее\n" + +#: src/numfmt.c:833 +msgid "" +" --from=UNIT auto-scale input numbers to UNITs; default is " +"'none';\n" +" see UNIT below\n" +msgstr "" +" --from=ЕДИНИЦА автоматически масштабировать входные число к " +"ЕДИНИЦАМ\n" +" изменения; по умолчанию «none»; смотрите ЕДИНИЦЫ " +"далее\n" + +#: src/numfmt.c:837 +msgid "" +" --from-unit=N specify the input unit size (instead of the default " +"1)\n" +msgstr "" +" --from-unit=N задать размер единицы измерения входных данных\n" +" (вместо значения по умолчанию 1).\n" + +#: src/numfmt.c:840 +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 группировать цифры согласно локали (например " +"1,000,000)\n" +" (ничего не делается в локалях C/POSIX)\n" + +#: src/numfmt.c:844 +msgid "" +" --header[=N] print (without converting) the first N header lines;\n" +" N defaults to 1 if not specified\n" +msgstr "" +" --header[=N] выводить (без преобразования) первые N строк;\n" +" если N не задано, то значение равно 1\n" + +#: src/numfmt.c:848 +msgid "" +" --invalid=MODE failure mode for invalid numbers: MODE can be:\n" +" abort (default), fail, warn, ignore\n" +msgstr "" +" --invalid=РЕЖИМ режим отказа для неправильных чисел. Значение " +"РЕЖИМА:\n" +" abort (по умолчанию), fail, warn, ignore\n" + +#: src/numfmt.c:852 +msgid "" +" --padding=N pad the output to N characters; positive N will\n" +" right-align; negative N will left-align;\n" +" padding is ignored if the output is wider than N;\n" +" the default is to automatically pad if a " +"whitespace\n" +" is found\n" +msgstr "" +" --padding=N дополнять результат до N символов;\n" +" если N положительно, то выполняется выравнивание по\n" +" правому краю; если N отрицательно, то по левому; " +"если\n" +" результат шире N, то дополнение не производится;\n" +" по умолчанию дополнение выполняется, если\n" +" обнаруживается пробельный символ\n" + +#: src/numfmt.c:859 +msgid "" +" --round=METHOD use METHOD for rounding when scaling; METHOD can be:\n" +" up, down, from-zero (default), towards-zero, " +"nearest\n" +msgstr "" +" --round=МЕТОД метод округления, используемый при масштабировании;\n" +" значение МЕТОДА: up, down, from-zero (по умолчанию),\n" +" towards-zero, nearest\n" + +#: src/numfmt.c:863 +msgid "" +" --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" +" SUFFIX in input numbers\n" +msgstr "" +" --suffix=СУФФИКС добавлять СУФФИКС к выходным значениям и учитывать\n" +" необязательный СУФФИКС у входных значений\n" + +#: src/numfmt.c:867 +msgid "" +" --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" +msgstr "" +" --to=ЕДИНИЦА автомасштабирование выходные значения к ЕДИНИЦЕ\n" +" изменения; смотрите ЕДИНИЦА далее\n" + +#: src/numfmt.c:870 +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 +msgid "" +"\n" +"UNIT options:\n" +msgstr "" +"\n" +"ЕДИНИЦЫ:\n" + +#: src/numfmt.c:880 +msgid " none no auto-scaling is done; suffixes will trigger an error\n" +msgstr " none отключить масштабирование; суффиксы приводят к ошибке\n" + +#: src/numfmt.c:883 +msgid "" +" auto accept optional single/two letter suffix:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" +msgstr "" +" auto учесть необязательный одно/двух буквенный суффикс:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" + +#: src/numfmt.c:889 +msgid "" +" si accept optional single letter suffix:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ...\n" +msgstr "" +" si учесть необязательный однобуквенный суффикс:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ...\n" + +#: src/numfmt.c:894 +msgid "" +" iec accept optional single letter suffix:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ...\n" +msgstr "" +" iec учесть необязательный однобуквенный суффикс:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ...\n" + +#: src/numfmt.c:899 +msgid "" +" iec-i accept optional two-letter suffix:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ...\n" +msgstr "" +" iec-i учесть необязательный двухбуквенный суффикс:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ...\n" + +#: src/numfmt.c:905 +#, 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" +msgstr "" +"\n" +"Значение ФОРМАТА должно позволять вывод одного аргумента с плавающей точкой\n" +"«%f». Необязательная кавычка (%'f) включает --grouping (если поддерживается\n" +"текущей локалью). При указании необязательного значения ширины (%10f)\n" +"производится дополнение вывода. При указании необязательного отрицательного\n" +"значения ширины (%-10f) производится дополнение слева.\n" + +#: src/numfmt.c:912 +#, c-format +msgid "" +"\n" +"Exit status is 0 if all input numbers were successfully converted.\n" +"By default, %s will stop at the first conversion error with exit status 2.\n" +"With --invalid='fail' a warning is printed for each conversion error\n" +"and the exit status is 2. With --invalid='warn' each conversion error is\n" +"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" +"Код завершения равен 0, если все входные числа были успешно преобразованы.\n" +"По умолчанию, %s прервётся при первой ошибке преобразования с кодом\n" +"завершения 2. Если указано --invalid=«fail», то выводится предупреждение\n" +"при каждой ошибке преобразования и код завершения равен 2.\n" +"Если указано --invalid=«warn», то описывается каждая ошибка преобразования,\n" +"но код завершения равен 0. Если указано --invalid=«ignore», то про ошибки\n" +"преобразования не сообщается и код завершения равен 0.\n" + +#: src/numfmt.c:921 +#, c-format +msgid "" +"\n" +"Examples:\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" +msgstr "" +"\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" + +#: src/numfmt.c:974 src/seq.c:212 +#, c-format +msgid "format %s has no %% directive" +msgstr "в формате %s не указана директива %%" + +#: src/numfmt.c:990 +#, c-format +msgid "invalid format %s (width overflow)" +msgstr "неверный формат %s (переполнение по ширине)" + +#: src/numfmt.c:1007 src/seq.c:229 +#, c-format +msgid "format %s ends in %%" +msgstr "формат %s заканчивается на %%" + +#: src/numfmt.c:1010 +#, c-format +msgid "invalid format %s, directive must be %%['][-][N]f" +msgstr "неверный формат %s, директива должна быть %%['][-][N]f" + +#: src/numfmt.c:1018 src/seq.c:236 +#, c-format +msgid "format %s has too many %% directives" +msgstr "в формате %s содержится слишком много директив %%" + +#: src/numfmt.c:1070 +#, c-format +msgid "invalid suffix in input '%s': '%s'" +msgstr "неверный суффикс в входных данных «%s»: «%s»" + +#: src/numfmt.c:1092 +#, c-format +msgid "value too large to be printed: '%Lg' (consider using --to)" +msgstr "значение слишком велико для вывода: «%Lg» (попробуйте указать --to)" + +#: src/numfmt.c:1100 +#, c-format +msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" +msgstr "" +"значение слишком велико для вывода: «%Lg» (обработка значений > 999Y " +"невозможна)" + +#: src/numfmt.c:1184 +#, c-format +msgid "large input value '%s': possible precision loss" +msgstr "большое входное значение «%s»: возможна потеря точности" + +#: src/numfmt.c:1293 +#, c-format +msgid "input line is too short, no numbers found to convert in field %ld" +msgstr "" +"входная строка слишком коротка, нет чисел для преобразования в поле %ld" + +#: src/numfmt.c:1388 +#, c-format +msgid "invalid padding value '%s'" +msgstr "неверное значение дополнения «%s»" + +#: src/numfmt.c:1401 +#, c-format +msgid "invalid field value '%s'" +msgstr "неверное значение поля «%s»" + +#: src/numfmt.c:1430 +#, c-format +msgid "invalid header value '%s'" +msgstr "неверное значение заголовка «%s»" + +#: src/numfmt.c:1456 +#, 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 +#, c-format +msgid "no conversion option specified" +msgstr "ключи преобразования не заданы" + +#: src/numfmt.c:1471 +#, c-format +msgid "grouping cannot be combined with --to" +msgstr "группировку нельзя сочетать с --to" + +#: src/numfmt.c:1473 +#, c-format +msgid "grouping has no effect in this locale" +msgstr "группировка не имеет смысла с этой локалью" + +#: src/numfmt.c:1486 +#, c-format +msgid "--header ignored with command-line input" +msgstr "при указании в командной строке --header игнорируется" + +#: src/numfmt.c:1511 +#, c-format +msgid "error reading input" +msgstr "ошибка чтения входных данных" + +#: src/numfmt.c:1520 +#, c-format +msgid "failed to convert some of the input numbers" +msgstr "не удалось преобразовать некоторые из входных чисел" + #: src/od.c:294 #, c-format msgid "" @@ -6816,40 +7243,62 @@ msgstr "" "\n" #: src/od.c:307 -msgid "All arguments to long options are mandatory for short options.\n" -msgstr "Все аргументы для длинных ключей обязательны для коротких.\n" +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" +"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" +"at first byte printed, incremented when dump is progressing.\n" +"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" +"операнда) на цифру. Операнд СМЕЩЕНИЕ означает -j СМЕЩЕНИЕ. МЕТКА —\n" +"это псевдоадрес первого напечатанного байта; она увеличивается в процессе\n" +"вывода. Префикс 0x или 0X задает СМЕЩЕНИЕ или МЕТКУ как\n" +"шестнадцатеричные числа, суффикс . — как восьмеричные, а суффикс b\n" +"умножает на 512.\n" -#: src/od.c:310 +#: src/od.c:318 msgid "" -" -A, --address-radix=RADIX decide how file offsets are printed\n" +" -A, --address-radix=RADIX output format for file offsets. RADIX is one\n" +" of [doxn], for Decimal, Octal, Hex or None\n" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" -" -A, --address-radix=ОСНОВАНИЕ выводить смещения в файлах в заданной " -"системе\n" -" счисления\n" +" -A, --address-radix=ОСНОВАНИЕ выходной формат для файловых смещений.\n" +" ОСНОВАНИЕ может быть [doxn], для Decimal, " +"Octal,\n" +" Hex или None\n" " -j, --skip-bytes=Н пропустить первые Н байт\n" -#: src/od.c:314 +#: src/od.c:323 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" -" --traditional accept arguments in traditional form\n" -msgstr "" -" -N, --read-bytes=Н считывать только Н байт в каждом файле\n" -" -S Н, --strings[=Н] выводить строки длиной по меньшей мере Н\n" -" графических символов\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" " -t, --format=ТИП выбирает формат или форматы вывода\n" " -v, --output-duplicates не помечать символом * невыводимые строки\n" -" -w[Н], --width[=Н] выводить Н байт в каждой выходной строке\n" +" -w[Н], --width[=Н] выводить Н байт в каждой выходной строке.\n" +" Если Н не задано, то используется значение " +"32.\n" " --traditional принимать аргументы в традиционной форме\n" -#: src/od.c:324 +#: src/od.c:336 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" @@ -6857,15 +7306,16 @@ msgid "" " -d same as -t u2, select unsigned decimal 2-byte units\n" msgstr "" "\n" +"\n" "Традиционные спецификации формата можно писать вперемешку, они " -"аккумулируются:\n" +"объединяются:\n" " -a синоним -t a, именованные символы, старший бит игнорируется\n" " -b синоним -t o1, восьмеричные байты\n" " -c синоним -t c, ASCII-символы или управляющие последовательности\n" " с обратной косой чертой\n" " -d синоним -t u2, беззнаковые десятичные двухбайтовые единицы\n" -#: src/od.c:332 +#: src/od.c:345 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -6881,40 +7331,21 @@ msgstr "" " -s синоним -t d2, десятичные двухбайтовые единицы\n" " -x синоним -t x2, шестнадцатеричные двухбайтовые единицы\n" -#: src/od.c:340 +#: src/od.c:353 msgid "" "\n" -"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" -"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" -"at first byte printed, incremented when dump is progressing.\n" -"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" -"форма, если последний операнд начинается на + или (если заданы два\n" -"операнда) на цифру. Операнд СМЕЩЕНИЕ означает -j СМЕЩЕНИЕ. МЕТКА --\n" -"это псевдоадрес первого напечатанного байта; она увеличивается в процессе\n" -"вывода. Префикс 0x или 0X задает СМЕЩЕНИЕ или МЕТКУ как\n" -"шестнадцатеричные числа, суффикс . -- как восьмеричные, а суффикс b\n" -"умножает на 512.\n" - -#: src/od.c:349 -msgid "" "\n" "TYPE is made up of one or more of these specifications:\n" -"\n" " a named character, ignoring high-order bit\n" " c ASCII character or backslash escape\n" msgstr "" "\n" -"ТИП составляется из одного или нескольких следующих спецификаций:\n" "\n" +"ТИП составляется из одного или нескольких следующих спецификаций:\n" " a именованный символ, старший бит игнорируется\n" " c ASCII-символ или управляющая последовательность\n" -#: src/od.c:356 +#: src/od.c:360 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -6928,57 +7359,60 @@ msgstr "" " u[ЧИСЛО] беззнаковое десятичное целое размером заданное ЧИСЛО байт\n" " x[ЧИСЛО] шестнадцатеричное целое размером заданное ЧИСЛО байт\n" -#: src/od.c:363 +#: src/od.c:367 msgid "" "\n" -"SIZE is a number. For TYPE in doux, SIZE may also be C for\n" +"SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" "sizeof(char), S for sizeof(short), I for sizeof(int) or L for\n" "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" -"Если ФОРМАТ -- одно из [doux], ЧИСЛО может задаваться как C (char), S " -"(short),\n" -"I (int) или L (long), если ФОРМАТ равен f, то ЧИСЛО также может быть F " -"(float),\n" -"D (double) или L (long double).\n" +"Если ФОРМАТ — одно из [doux], ЧИСЛО может задаваться как C sizeof(char),\n" +"S sizeof(short), I sizeof(int) или L sizeof(long). Если ФОРМАТ равен f, то\n" +"ЧИСЛО также может быть F sizeof(float), D sizeof(double) или\n" +"L sizeof(long double).\n" -#: src/od.c:370 +#: src/od.c:374 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" +"Adding a z suffix to any type displays printable characters at the end of\n" +"each output line.\n" msgstr "" "\n" -"ОСНОВАНИЕ может быть d (десятичным), o (восьмеричным), x " -"(шестнадцатеричным)\n" -"или n (не выводить смещения). Н с префиксом 0x или 0X воспринимается как\n" -"шестнадцатеричное и может иметь умножающий суффикс:\n" -"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" -"Если добавить к любому формату суффикс z, то в конце\n" -"каждой строки будут выводиться печатные символы.\n" +"Добавляет суффикс z к любым показываемым печатным символам\n" +"в конце каждой выходной строки.\n" -#: src/od.c:380 +#: src/od.c:379 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" +"\n" +"BYTES is hex with 0x or 0X prefix, and may have a multiplier suffix:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"and so on for G, T, P, E, Z, Y.\n" msgstr "" -"Ключ --string без числа подразумевает 3; --width без числа подразумевает\n" -"32. По умолчанию od использует ключи -A o -t d2 -w16.\n" +"\n" +"\n" +"Н задаётся шестнадцатеричным числом с префиксом 0x или 0X, и может " +"содержать\n" +"умножающий суффикс:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"и так далее для G, T, P, E, Z, Y.\n" -#: src/od.c:633 src/od.c:753 +#: src/od.c:639 src/od.c:759 #, c-format msgid "invalid type string %s" msgstr "неверная строка типа %s" -#: src/od.c:643 +#: src/od.c:649 #, c-format msgid "" "invalid type string %s;\n" @@ -6987,7 +7421,7 @@ msgstr "" "неверно задана строка типа %s;\n" "данная система не предоставляет %lu-байтного целого типа" -#: src/od.c:764 +#: src/od.c:770 #, c-format msgid "" "invalid type string %s;\n" @@ -6996,38 +7430,38 @@ msgstr "" "неверно задан тип %s;\n" "данная система не предоставляет %lu-байтного типа с плавающей точкой" -#: src/od.c:822 +#: src/od.c:828 #, c-format msgid "invalid character '%c' in type string %s" msgstr "неверный символ «%c» в строке типа %s" -#: src/od.c:1047 +#: src/od.c:1053 #, c-format msgid "cannot skip past end of combined input" msgstr "невозможно сместиться за предел последнего входного файла" -#: src/od.c:1603 +#: src/od.c:1609 #, c-format msgid "invalid output address radix '%c'; it must be one character from [doxn]" msgstr "" "неверно задано основание системы счисления «%c»,\n" "должно быть одним из символов [doxn]" -#: src/od.c:1729 +#: src/od.c:1735 #, c-format msgid "no type may be specified when dumping strings" msgstr "при дампе строк нельзя задавать тип" -#: src/od.c:1804 +#: src/od.c:1810 msgid "compatibility mode supports at most one file" msgstr "режим совместимости поддерживается только для одного файла" -#: src/od.c:1825 +#: src/od.c:1831 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "значение skip-bytes + read-bytes слишком велико" -#: src/od.c:1868 +#: src/od.c:1874 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "предупреждение: неверная ширина %lu; будет использована %d" @@ -7047,14 +7481,12 @@ 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" -"\n" msgstr "" "Печатает на стандартный вывод строки, составленные из соответствующих строк\n" -"входных ФАЙЛОВ, разделенных табуляцией.\n" +"входных ФАЙЛОВ, разделённых табуляцией.\n" "Если ФАЙЛ не задан или задан как -, читает стандартный ввод.\n" -"\n" -#: src/paste.c:448 +#: 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" @@ -7063,7 +7495,7 @@ msgstr "" "СПИСКА\n" " -s, --serial обрабатывать файлы последовательно\n" -#: src/paste.c:509 +#: src/paste.c:508 #, c-format msgid "delimiter list ends with an unescaped backslash: %s" msgstr "" @@ -7124,80 +7556,80 @@ msgid "Kaveh Ghazi" msgstr "Каве Гази (Kaveh Ghazi)" #. TRANSLATORS: Real name is unknown; at most 19 characters. -#: src/pinky.c:250 +#: src/pinky.c:242 msgid " ???" msgstr " ???" #. TRANSLATORS: Idle time is unknown; at most 5 characters. -#: src/pinky.c:274 +#: src/pinky.c:266 msgid "?????" msgstr "?????" -#: src/pinky.c:323 +#: src/pinky.c:314 #, c-format msgid "Login name: " msgstr "Регистрационное имя: " -#: src/pinky.c:326 +#: src/pinky.c:317 #, c-format msgid "In real life: " msgstr "В реальной жизни: " #. TRANSLATORS: Real name is unknown; no hard limit. -#: src/pinky.c:330 +#: src/pinky.c:321 msgid "???\n" msgstr "???\n" -#: src/pinky.c:350 +#: src/pinky.c:341 #, c-format msgid "Directory: " msgstr "Каталог: " -#: src/pinky.c:352 +#: src/pinky.c:343 #, c-format msgid "Shell: " msgstr "Оболочка: " -#: src/pinky.c:371 +#: src/pinky.c:362 #, c-format msgid "Project: " msgstr "Проект: " -#: src/pinky.c:395 +#: src/pinky.c:386 #, c-format msgid "Plan:\n" msgstr "План:\n" -#: src/pinky.c:414 +#: src/pinky.c:405 msgid "Login" msgstr "Имя" -#: src/pinky.c:416 +#: src/pinky.c:407 msgid "Name" msgstr "Имя" -#: src/pinky.c:417 +#: src/pinky.c:408 msgid " TTY" msgstr " Терминал" -#: src/pinky.c:419 +#: src/pinky.c:410 msgid "Idle" msgstr "Неактивен" -#: src/pinky.c:420 +#: src/pinky.c:411 msgid "When" msgstr "Когда" -#: src/pinky.c:423 +#: src/pinky.c:414 msgid "Where" msgstr "Где" -#: src/pinky.c:502 +#: src/pinky.c:493 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Использование: %s [КЛЮЧ]… [ПОЛЬЗОВАТЕЛЬ]…\n" -#: src/pinky.c:503 +#: src/pinky.c:494 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7217,7 +7649,7 @@ msgstr "" " -s использовать краткий формат вывода, принимается по " "умолчанию\n" -#: src/pinky.c:511 +#: src/pinky.c:502 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7232,7 +7664,7 @@ msgstr "" " -q опустить в кратком формате полное имя пользователя, имя\n" " удаленной машины и время неактивности\n" -#: src/pinky.c:520 +#: src/pinky.c:511 #, c-format msgid "" "\n" @@ -7243,7 +7675,7 @@ msgstr "" "Упрощённая программа «finger»; печатает сведения о пользователе.\n" "В качестве файла utmp будет использоваться %s.\n" -#: src/pinky.c:604 +#: src/pinky.c:595 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "" @@ -7260,87 +7692,83 @@ msgstr "Пит ТерМаат (Pete TerMaat)" msgid "Roland Huebner" msgstr "Роланд Хьюбнер (Roland Huebner)" -#: src/pr.c:912 +#: src/pr.c:908 #, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "в «--pages=ПЕРВАЯ_СТР[:ПОСЛЕДНЯЯ_СТР]» пропущен аргумент" -#: src/pr.c:914 +#: src/pr.c:910 #, c-format msgid "invalid page range %s" msgstr "неверный диапазон страниц %s" -#: src/pr.c:979 +#: src/pr.c:975 #, c-format msgid "'-l PAGE_LENGTH' invalid number of lines: %s" msgstr "в «-l ДЛИНА_СТРАНИЦЫ» неверное число строк: %s" -#: src/pr.c:1003 +#: src/pr.c:999 #, c-format msgid "'-N NUMBER' invalid starting line number: %s" msgstr "в «-N НОМЕР» неверный номер начальной строки: %s" -#: src/pr.c:1015 +#: src/pr.c:1011 #, c-format msgid "'-o MARGIN' invalid line offset: %s" msgstr "в «-o ПОЛЕ» неверное смещение: %s" -#: src/pr.c:1056 +#: src/pr.c:1052 #, c-format msgid "'-w PAGE_WIDTH' invalid number of characters: %s" msgstr "в «-w ШИРИНА_СТРАНИЦЫ» неверное число символов: %s" -#: src/pr.c:1070 +#: src/pr.c:1066 #, c-format msgid "'-W PAGE_WIDTH' invalid number of characters: %s" msgstr "в «-W ШИРИНА_СТРАНИЦЫ» неверное число символов: %s" -#: src/pr.c:1100 +#: src/pr.c:1096 #, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "невозможно задать число столбцов при параллельной печати" -#: src/pr.c:1104 +#: src/pr.c:1100 #, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "невозможно одновременно печатать вдоль и параллельно" -#: src/pr.c:1200 +#: src/pr.c:1196 #, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "в «-%c» лишние символы или неверное число в аргументе: %s" -#: src/pr.c:1304 +#: src/pr.c:1293 #, c-format msgid "page width too narrow" msgstr "страница слишком узкая" -#: src/pr.c:2369 +#: src/pr.c:2353 #, c-format msgid "starting page number %<PRIuMAX> exceeds page count %<PRIuMAX>" msgstr "" "номер начальной страницы %<PRIuMAX> превосходит общее число страниц " "%<PRIuMAX>" -#: src/pr.c:2396 +#: src/pr.c:2380 #, c-format msgid "page number overflow" msgstr "переполнение номера страницы" -#: src/pr.c:2401 +#: src/pr.c:2385 #, c-format msgid "Page %<PRIuMAX>" msgstr "Страница %<PRIuMAX>" -#: src/pr.c:2773 -msgid "" -"Paginate or columnate FILE(s) for printing.\n" -"\n" -msgstr "" -"Разбивает ФАЙЛ(ы) на страницы или колонки для печати.\n" -"\n" +#: src/pr.c:2757 +msgid "Paginate or columnate FILE(s) for printing.\n" +msgstr "Разбивает ФАЙЛ(ы) на страницы или колонки для печати.\n" -#: src/pr.c:2780 +#: src/pr.c:2763 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -7359,7 +7787,7 @@ msgstr "" " только не указан ключ -a. Балансировать число строк в\n" " колонке на каждой странице.\n" -#: src/pr.c:2788 +#: src/pr.c:2771 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7377,7 +7805,7 @@ msgstr "" " -d, --double-space\n" " вставлять пустую строку после каждой выходной строки\n" -#: src/pr.c:2796 +#: src/pr.c:2779 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7399,7 +7827,7 @@ msgstr "" " если есть ключ -F, и пятистрочным заголовком и\n" " завершителем, если ключ -F не задан)\n" -#: src/pr.c:2806 +#: src/pr.c:2789 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -7423,7 +7851,7 @@ msgstr "" " не выравнивать колонки, --sep-string[=СТРОКА] задает\n" " разделители\n" -#: src/pr.c:2815 +#: src/pr.c:2798 msgid "" " -l, --length=PAGE_LENGTH\n" " set the page length to PAGE_LENGTH (66) lines\n" @@ -7438,7 +7866,7 @@ msgstr "" " -m, --merge печатать все файлы параллельно, по одному в колонке,\n" " усекать строки, но соединять полные строки при -J\n" -#: src/pr.c:2822 +#: src/pr.c:2805 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -7457,7 +7885,7 @@ msgstr "" "выводимой\n" " страницы (смотри +ПЕРВАЯ_СТРАНИЦА)\n" -#: src/pr.c:2830 +#: src/pr.c:2813 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -7472,7 +7900,7 @@ msgstr "" " -r, --no-file-warnings\n" " не предупреждать о невозможности открытия файла\n" -#: src/pr.c:2837 +#: src/pr.c:2820 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -7489,7 +7917,7 @@ msgstr "" " колонок ключей (-КОЛОНКА|-a -КОЛОНКА|-m), если только\n" " нет ключа -w\n" -#: src/pr.c:2844 +#: src/pr.c:2827 msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" @@ -7505,7 +7933,7 @@ msgstr "" " что -S\" \"); не влияет на ключи для колонок\n" " -t, --omit-header не выводить заголовки страниц\n" -#: src/pr.c:2851 +#: src/pr.c:2834 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -7528,7 +7956,7 @@ msgstr "" " установить ШИРИНУ_СТРАНИЦЫ (72) для\n" " вывода в несколько колонок, -s[символ] выключает (72)\n" -#: src/pr.c:2861 +#: src/pr.c:2844 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -7540,7 +7968,7 @@ msgstr "" " установить ШИРИНУ_СТРАНИЦЫ (72), усекать строки,\n" " если нет ключа -J; не затрагивается ключами -S или -s\n" -#: src/pr.c:2869 +#: src/pr.c:2852 msgid "" "\n" "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" @@ -7706,13 +8134,11 @@ msgstr "" msgid "" "Output a permuted index, including context, of the words in the input " "files.\n" -"\n" msgstr "" "Печатает перемешанный алфавитный указатель слов входных файлов, включая " "контекст.\n" -"\n" -#: src/ptx.c:1828 +#: src/ptx.c:1827 msgid "" " -A, --auto-reference output automatically generated references\n" " -G, --traditional behave more like System V 'ptx'\n" @@ -7725,7 +8151,7 @@ msgstr "" " -F, --flag-truncation=СТРОКА использовать СТРОКУ для пометки усечения " "строк\n" -#: src/ptx.c:1833 +#: src/ptx.c:1832 msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" " -O, --format=roff generate output as roff directives\n" @@ -7741,7 +8167,7 @@ msgstr "" " -S, --sentence-regexp=РЕГВЫР для конца строк или конца предложений\n" " -T, --format=tex генерировать вывод в виде директив TeX\n" -#: src/ptx.c:1840 +#: src/ptx.c:1839 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -7761,7 +8187,7 @@ msgstr "" " -o, --only-file=ФАЙЛ только считать список слов из заданного " "ФАЙЛА\n" -#: src/ptx.c:1848 +#: src/ptx.c:1847 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -7773,7 +8199,7 @@ msgstr "" " -t, --typeset-mode - не реализовано -\n" " -w, --width=ЧИСЛО ширина вывода в столбцах, не считая ссылки\n" -#: src/ptx.c:1855 +#: src/ptx.c:1854 msgid "" "\n" "With no FILE or if FILE is -, read Standard Input. '-F /' by default.\n" @@ -7782,7 +8208,7 @@ msgstr "" "Если ФАЙЛ не задан или задан как -, читает стандартный ввод.\n" "По умолчанию предполагается «-F /».\n" -#: src/ptx.c:1949 +#: src/ptx.c:1948 #, c-format msgid "invalid gap width: %s" msgstr "неверная ширина дырки: %s" @@ -7809,7 +8235,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "ошибка изменения каталога на %s" -#: src/pwd.c:170 src/pwd.c:277 +#: src/pwd.c:170 src/pwd.c:277 src/split.c:373 #, c-format msgid "failed to stat %s" msgstr "ошибка получения атрибутов %s" @@ -7825,14 +8251,15 @@ msgid "ignoring non-option arguments" msgstr "не являющиеся ключами аргументы проигнорированы" #. This is a proper name. See the gettext manual, section Names. -#: src/readlink.c:33 +#: src/readlink.c:32 msgid "Dmitry V. Levin" msgstr "Дмитрий В. Левин (Dmitry V. Levin)" -#: src/readlink.c:62 +#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147 +#: src/stat.c:1349 src/touch.c:212 #, c-format -msgid "Usage: %s [OPTION]... FILE\n" -msgstr "Использование: %s [КЛЮЧ]… [ФАЙЛ]\n" +msgid "Usage: %s [OPTION]... FILE...\n" +msgstr "Использование: %s [КЛЮЧ]… ФАЙЛ…\n" #: src/readlink.c:63 msgid "" @@ -7870,26 +8297,29 @@ msgid "" "recursively,\n" " without requirements on components " "existence\n" -" -n, --no-newline do not output the trailing newline\n" +" -n, --no-newline do not output the trailing delimiter\n" " -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" msgstr "" -" -m, --canonicalize-missing получить каноническое имя файла путем\n" +" -m, --canonicalize-missing получить каноническое имя файла путём\n" " рекурсивного следования по всем символьным\n" " ссылкам в каждом компоненте заданного пути;\n" -" компоненты пути не обязаны существовать\n" -" -n, --no-newline не выводить завершающий перевод строки\n" +" компоненты пути могут отсутствовать\n" +" -n, --no-newline не выводить завершающий разделитель\n" " -q, --quiet,\n" " -s, --silent подавлять вывод большинства сообщений об " "ошибках\n" " -v, --verbose сообщать об ошибках\n" +" -z, --zero использовать при выводе разделитель NUL,\n" +" а не символ новой строки\n" -#: src/realpath.c:71 src/rm.c:134 src/shred.c:147 src/stat.c:1330 -#: src/touch.c:215 +#: src/readlink.c:152 #, c-format -msgid "Usage: %s [OPTION]... FILE...\n" -msgstr "Использование: %s [КЛЮЧ]… ФАЙЛ…\n" +msgid "ignoring --no-newline with multiple arguments" +msgstr "игнорируется --no-newline с несколькими аргументами" #: src/realpath.c:72 msgid "" @@ -7933,12 +8363,12 @@ msgstr "" msgid "generating relative path" msgstr "генерируется относительный путь" -#: src/remove.c:286 +#: src/remove.c:273 #, c-format msgid "%s: descend into write-protected directory %s? " msgstr "%s: спуститься в защищённый от записи каталог %s? " -#: src/remove.c:287 +#: src/remove.c:274 #, c-format msgid "%s: descend into directory %s? " msgstr "%s: спуститься в каталог %s? " @@ -7947,37 +8377,37 @@ msgstr "%s: спуститься в каталог %s? " #. translate "%s: remove %s (write-protected) %s? " #. instead. It should avoid grammatical problems #. with the output of file_type. -#: src/remove.c:303 +#: src/remove.c:290 #, c-format msgid "%s: remove write-protected %s %s? " msgstr "%s: удалить защищенный от записи %s %s? " -#: src/remove.c:304 +#: src/remove.c:291 #, c-format msgid "%s: remove %s %s? " msgstr "%s: удалить %s %s? " -#: src/remove.c:417 +#: src/remove.c:374 #, c-format msgid "removed directory: %s\n" msgstr "удален каталог: %s\n" -#: src/remove.c:481 +#: src/remove.c:444 #, c-format msgid "cannot remove directory: %s" msgstr "невозможно удалить каталог: %s" -#: src/remove.c:537 +#: src/remove.c:500 #, c-format msgid "skipping %s, since it's on a different device" msgstr "пропускается %s, поскольку он находится на другом устройстве" -#: src/remove.c:557 +#: src/remove.c:520 #, c-format msgid "traversal failed: %s" msgstr "обход завершился неудачно: %s" -#: src/remove.c:563 +#: src/remove.c:526 #, c-format msgid "" "unexpected failure: fts_info=%d: %s\n" @@ -7986,12 +8416,12 @@ msgstr "" "неожиданная ошибка: fts_info=%d: %s\n" "сообщите %s" -#: src/rm.c:118 +#: src/rm.c:119 #, c-format msgid "Try '%s ./%s' to remove the file %s.\n" msgstr "Попробуйте «%s ./%s», чтобы удалить файл %s.\n" -#: src/rm.c:135 +#: src/rm.c:136 msgid "" "Remove (unlink) the FILE(s).\n" "\n" @@ -8006,7 +8436,7 @@ msgstr "" " не спрашивать\n" " -i запрашивать подтверждение перед каждым удалением\n" -#: src/rm.c:141 +#: src/rm.c:142 msgid "" " -I prompt once before removing more than three files, " "or\n" @@ -8030,7 +8460,7 @@ msgstr "" "всегда).\n" " Если КОГДА не задано, запрашивать всегда.\n" -#: src/rm.c:148 +#: src/rm.c:149 msgid "" " --one-file-system when removing a hierarchy recursively, skip any\n" " directory that is on a file system different from\n" @@ -8041,20 +8471,21 @@ msgstr "" "системе,\n" " что и соответствующий аргумент командной строки\n" -#: src/rm.c:153 +#: src/rm.c:154 msgid "" " --no-preserve-root do not treat '/' specially\n" " --preserve-root do not remove '/' (default)\n" " -r, -R, --recursive remove directories and their contents recursively\n" +" -d, --dir remove empty directories\n" " -v, --verbose explain what is being done\n" msgstr "" " --no-preserve-root не обрабатывать «/» особым образом\n" -" --preserve-root отказываться рекурсивно обрабатывать «/»\n" -" (по умолчанию)\n" +" --preserve-root не удалять «/» (по умолчанию)\n" " -r, -R, --recursive рекурсивно удалять каталоги и их содержимое\n" +" -d, --dir удалять пустые каталоги\n" " -v, --verbose пояснять производимые действия\n" -#: src/rm.c:161 +#: src/rm.c:163 msgid "" "\n" "By default, rm does not remove directories. Use the --recursive (-r or -R)\n" @@ -8066,7 +8497,7 @@ msgstr "" "или -R), чтобы удалить все перечисленные каталоги вместе с их\n" "содержимым.\n" -#: src/rm.c:166 +#: src/rm.c:168 #, c-format msgid "" "\n" @@ -8083,7 +8514,7 @@ msgstr "" "\n" " %s ./-foo\n" -#: src/rm.c:175 +#: src/rm.c:177 msgid "" "\n" "Note that if you use rm to remove a file, it might be possible to recover\n" @@ -8096,12 +8527,12 @@ msgstr "" "Используйте shred, если вам необходима большая\n" "уверенность в невозможности восстановления содержимого.\n" -#: src/rm.c:335 +#: src/rm.c:342 #, c-format msgid "%s: remove all arguments recursively? " msgstr "%s: удалить все аргументы рекурсивно? " -#: src/rm.c:336 +#: src/rm.c:343 #, c-format msgid "%s: remove all arguments? " msgstr "%s: удалить все аргументы? " @@ -8162,7 +8593,13 @@ msgstr "" msgid "" "Run a program in a different security context.\n" "With neither CONTEXT nor COMMAND, print the current security context.\n" -"\n" +msgstr "" +"Запускает программу в другом контексте безопасности.\n" +"Если не указана КОМАНДА или КОНТЕКСТ, то выводится текущий контекст\n" +"безопасности.\n" + +#: src/runcon.c:94 +msgid "" " CONTEXT Complete security context\n" " -c, --compute compute process transition context before modifying\n" " -t, --type=TYPE type (for same role as parent)\n" @@ -8171,84 +8608,80 @@ msgid "" " -l, --range=RANGE levelrange\n" "\n" msgstr "" -"Запускает программу в другом контексте безопасности.\n" -"Если не указаны КОНТЕКСТ и КОМАНДА, то выводит текущий контекст " -"безопасности.\n" -"\n" " КОНТЕКСТ Полный контекст безопасности\n" " -c, --compute вычислить переходный контекст перед изменением\n" -" -t, --type=ТИП тип (что и родитель)\n" +" -t, --type=ТИП тип (с ролью что и у родителя)\n" " -u, --user=ПОЛЬЗОВАТЕЛЬ обозначение пользователя\n" " -r, --role=РОЛЬ роль\n" " -l, --range=ДИАПАЗОН диапазон\n" "\n" -#: src/runcon.c:140 +#: src/runcon.c:144 #, c-format msgid "multiple roles" msgstr "несколько ролей" -#: src/runcon.c:145 +#: src/runcon.c:149 #, c-format msgid "multiple types" msgstr "несколько типов" -#: src/runcon.c:150 +#: src/runcon.c:154 #, c-format msgid "multiple users" msgstr "несколько пользователей" -#: src/runcon.c:155 +#: src/runcon.c:159 #, c-format msgid "multiple levelranges" msgstr "несколько диапазонов" -#: src/runcon.c:173 src/runcon.c:209 +#: src/runcon.c:177 src/runcon.c:213 #, c-format msgid "failed to get current context" msgstr "не удалось получить текущий контекст" -#: src/runcon.c:183 +#: src/runcon.c:187 #, c-format msgid "you must specify -c, -t, -u, -l, -r, or context" msgstr "вы должны указать -c, -t, -u, -l, -r или контекст" -#: src/runcon.c:191 +#: src/runcon.c:195 #, c-format msgid "no command specified" msgstr "не задана команда" -#: src/runcon.c:197 +#: src/runcon.c:201 #, c-format msgid "%s may be used only on a SELinux kernel" msgstr "%s может использоваться только с поддержкой SELinux в ядре" -#: src/runcon.c:223 +#: src/runcon.c:227 #, c-format msgid "failed to compute a new context" msgstr "не удалось вычислить новый контекст" -#: src/runcon.c:237 +#: src/runcon.c:241 #, c-format msgid "failed to set new user %s" msgstr "не удалось установить нового пользователя %s" -#: src/runcon.c:239 +#: src/runcon.c:243 #, c-format msgid "failed to set new type %s" msgstr "не удалось установить новый тип %s" -#: src/runcon.c:241 +#: src/runcon.c:245 #, c-format msgid "failed to set new range %s" msgstr "не удалось установить новый диапазон %s" -#: src/runcon.c:243 +#: src/runcon.c:247 #, c-format msgid "failed to set new role %s" msgstr "не удалось установить новую роль %s" -#: src/runcon.c:251 +#: src/runcon.c:255 #, c-format msgid "unable to set security context %s" msgstr "не удалось установить контекст безопасности %s" @@ -8265,22 +8698,22 @@ msgstr "" " или: %s [КЛЮЧ]… ПЕРВЫЙ ПРИРОСТ ПОСЛЕДНИЙ\n" #: src/seq.c:73 +msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" +msgstr "Печатает числа от ПЕРВОГО до ПОСЛЕДНЕГО с шагом ПРИРОСТ.\n" + +#: src/seq.c:79 msgid "" -"Print numbers from FIRST to LAST, in steps of INCREMENT.\n" -"\n" " -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 "" -"Печатает числа от ПЕРВОГО до ПОСЛЕДНЕГО с шагом ПРИРОСТ.\n" -"\n" " -f, --format=ФОРМАТ использовать для дробных чисел ФОРМАТ в стиле\n" " printf\n" " -s, --separator=СТРОКА использовать СТРОКУ как разделитель\n" " (по умолчанию \\n)\n" " -w, --equal-width выравнивать по ширине, добавляя в начало нули\n" -#: src/seq.c:82 +#: src/seq.c:86 msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" @@ -8296,7 +8729,7 @@ msgstr "" "плавающей точкой. ПРИРОСТ обычно положителен, если ПЕРВЫЙ меньше\n" "ПОСЛЕДНЕГО, и отрицателен, если ПЕРВЫЙ больше ПОСЛЕДНЕГО.\n" -#: src/seq.c:90 +#: src/seq.c:94 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" @@ -8307,32 +8740,17 @@ msgstr "" "ПОСЛЕДНИЙ все являются десятичными числами с фиксированной точкой с\n" "максимальной точностью PREC, и %g в противном случае.\n" -#: src/seq.c:136 +#: src/seq.c:140 #, c-format msgid "invalid floating point argument: %s" msgstr "неверный аргумент с плавающей точкой: %s" -#: src/seq.c:193 -#, c-format -msgid "format %s has no %% directive" -msgstr "в формате %s не указана директива %%" - -#: src/seq.c:210 -#, c-format -msgid "format %s ends in %%" -msgstr "формат %s заканчивается на %%" - -#: src/seq.c:213 +#: src/seq.c:232 #, c-format msgid "format %s has unknown %%%c directive" msgstr "формат %s содержит неизвестную директиву %%%c" -#: src/seq.c:217 -#, c-format -msgid "format %s has too many %% directives" -msgstr "в формате %s содержится слишком много директив %%" - -#: src/seq.c:431 +#: src/seq.c:555 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "при выводе строк одинаковой ширины формат можно не указывать" @@ -8373,28 +8791,28 @@ msgstr "" " -g GID[,GID1…] также задать первичную group-ID числовым GID, и\n" " (если указано) дополнительные ID групп в GID1, …\n" -#: src/setuidgid.c:163 +#: src/setuidgid.c:162 #, c-format msgid "unknown user-ID: %s" msgstr "неизвестный идентификатор пользователя: %s" -#: src/setuidgid.c:174 +#: src/setuidgid.c:173 #, c-format msgid "to use user-ID %s you need to use -g too" msgstr "" "чтобы использовать идентификатор пользователя %s, вам нужно указать также -g" -#: src/setuidgid.c:191 +#: src/setuidgid.c:190 #, c-format msgid "failed to set supplemental group(s)" msgstr "не удалось установить дополнительную группу(ы)" -#: src/setuidgid.c:201 +#: src/setuidgid.c:200 #, c-format msgid "cannot set group-ID to %lu" msgstr "невозможно установить идентификатор группы равным %lu" -#: src/setuidgid.c:205 +#: src/setuidgid.c:204 #, c-format msgid "cannot set user-ID to %lu" msgstr "невозможно установить идентификатор пользователя равным %lu" @@ -8408,13 +8826,11 @@ msgstr "Колин Пламб (Colin Plumb)" 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" -"\n" msgstr "" "Переписывает несколько раз указанные файлы для того, чтобы сделать более\n" "сложным восстановление даже с использованием очень дорогого оборудования.\n" -"\n" -#: src/shred.c:156 +#: src/shred.c:155 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -8428,7 +8844,7 @@ msgstr "" " (по умолчанию /dev/urandom)\n" " -s, --size=N очистить N байт (возможны суффиксы вида K, M, G)\n" -#: src/shred.c:162 +#: src/shred.c:161 msgid "" " -u, --remove truncate and remove file after overwriting\n" " -v, --verbose show progress\n" @@ -8444,7 +8860,7 @@ msgstr "" " -z, --zero перезаписать в конце нулями, чтобы скрыть " "перемешивание\n" -#: src/shred.c:171 +#: src/shred.c:170 msgid "" "\n" "If FILE is -, shred standard output.\n" @@ -8464,7 +8880,7 @@ msgstr "" "большинство людей используют ключ --remove.\n" "\n" -#: src/shred.c:181 +#: src/shred.c:180 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" @@ -8483,7 +8899,7 @@ msgstr "" "\n" # log-structured??? -#: src/shred.c:189 +#: src/shred.c:188 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -8505,7 +8921,7 @@ msgstr "" " NFS-сервер от Network Appliance\n" "\n" -#: src/shred.c:199 +#: src/shred.c:198 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -8519,7 +8935,7 @@ msgstr "" "* сжатые файловые системы\n" "\n" -#: src/shred.c:206 +#: src/shred.c:205 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" @@ -8540,7 +8956,7 @@ msgstr "" "странице man для mount (man mount).\n" "\n" -#: src/shred.c:216 +#: src/shred.c:215 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" @@ -8550,123 +8966,123 @@ msgstr "" "содержать копии файла, которые нельзя удалить, и которые позволят\n" "впоследствии восстановить уничтоженный файл.\n" -#: src/shred.c:296 +#: src/shred.c:295 #, c-format msgid "%s: fdatasync failed" msgstr "%s: операция fdatasync завершилась неуспехом" -#: src/shred.c:307 +#: src/shred.c:306 #, c-format msgid "%s: fsync failed" msgstr "%s: операция fsync завершилась неудачно" -#: src/shred.c:384 +#: src/shred.c:383 #, c-format msgid "%s: cannot rewind" msgstr "%s: невозможно откатиться" -#: src/shred.c:403 +#: src/shred.c:402 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: проход %lu/%lu (%s)…" -#: src/shred.c:453 +#: src/shred.c:452 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: ошибка записи по смещению %s" -#: src/shred.c:471 +#: src/shred.c:470 #, c-format msgid "%s: lseek failed" msgstr "%s: операция lseek завершилась неудачно" -#: src/shred.c:482 +#: src/shred.c:481 #, c-format msgid "%s: file too large" msgstr "%s: файл слишком велик" -#: src/shred.c:505 +#: src/shred.c:504 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: проход %lu/%lu (%s)…%s" -#: src/shred.c:521 +#: src/shred.c:520 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: проход %lu/%lu (%s)…%s/%s %d%%" -#: src/shred.c:768 +#: src/shred.c:767 #, c-format msgid "%s: fstat failed" msgstr "%s: операция fstat завершилась неуспехом" -#: src/shred.c:779 +#: src/shred.c:778 #, c-format msgid "%s: invalid file type" msgstr "%s: неверный тип файла" -#: src/shred.c:798 +#: src/shred.c:797 #, c-format msgid "%s: file has negative size" msgstr "%s: у файла отрицательный размер" -#: src/shred.c:865 +#: src/shred.c:864 src/sort.c:932 src/split.c:378 #, c-format msgid "%s: error truncating" msgstr "%s: ошибка при усечении" -#: src/shred.c:881 +#: src/shred.c:880 #, c-format msgid "%s: fcntl failed" msgstr "%s: операция fcntl завершилась неуспехом" -#: src/shred.c:886 +#: src/shred.c:885 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "" "%s: невозможно нарезать файловый дескриптор с только с правом добавления" -#: src/shred.c:968 +#: src/shred.c:967 #, c-format msgid "%s: removing" msgstr "%s: удаление" -#: src/shred.c:992 +#: src/shred.c:991 #, c-format msgid "%s: renamed to %s" msgstr "%s: переименован в %s" -#: src/shred.c:1014 +#: src/shred.c:1013 #, c-format msgid "%s: failed to remove" msgstr "%s: не удалось удалить" -#: src/shred.c:1018 +#: src/shred.c:1017 #, c-format msgid "%s: removed" msgstr "%s: удалён" -#: src/shred.c:1025 src/shred.c:1068 +#: src/shred.c:1024 src/shred.c:1067 #, c-format msgid "%s: failed to close" msgstr "%s: не удалось закрыть" -#: src/shred.c:1061 +#: src/shred.c:1060 #, c-format msgid "%s: failed to open for writing" msgstr "%s: не удалось открыть для чтения" -#: src/shred.c:1126 +#: src/shred.c:1125 #, c-format msgid "%s: invalid number of passes" msgstr "%s: неверное число проходов" -#: src/shred.c:1135 src/shuf.c:291 src/sort.c:4387 +#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441 #, c-format msgid "multiple random sources specified" msgstr "задано несколько источников случайных чисел" -#: src/shred.c:1149 +#: src/shred.c:1148 #, c-format msgid "%s: invalid file size" msgstr "%s: неверный размер файла" @@ -8683,14 +9099,10 @@ msgstr "" " или: %s -l ОТ-ДО [КЛЮЧ]…\n" #: src/shuf.c:54 -msgid "" -"Write a random permutation of the input lines to standard output.\n" -"\n" -msgstr "" -"Печатает случайную перестановку входных строк на стандартный вывод.\n" -"\n" +msgid "Write a random permutation of the input lines to standard output.\n" +msgstr "Печатает случайную перестановку входных строк на стандартный вывод.\n" -#: src/shuf.c:61 +#: src/shuf.c:60 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 " @@ -8709,27 +9121,27 @@ msgstr "" " (по умолчанию /dev/urandom)\n" " -z, --zero-terminated завершать строки нулем, а не переводом строки\n" -#: src/shuf.c:245 +#: src/shuf.c:244 #, c-format msgid "multiple -i options specified" msgstr "задано несколько ключей -i" -#: src/shuf.c:265 +#: src/shuf.c:264 #, c-format msgid "invalid input range %s" msgstr "недопустимый входной диапазон %s" -#: src/shuf.c:278 +#: src/shuf.c:277 #, c-format msgid "invalid line count %s" msgstr "неверное число строк: %s" -#: src/shuf.c:285 src/sort.c:4381 +#: src/shuf.c:284 src/sort.c:4435 #, c-format msgid "multiple output files specified" msgstr "задано несколько выходных файлов" -#: src/shuf.c:311 +#: src/shuf.c:310 #, c-format msgid "cannot combine -e and -i options" msgstr "нельзя сочетать ключи -e и -i" @@ -8757,7 +9169,7 @@ msgstr "" "аргументов, приостанавливает на период, равный сумме их значений.\n" "\n" -#: src/sleep.c:135 src/timeout.c:295 +#: src/sleep.c:135 src/timeout.c:320 #, c-format msgid "invalid time interval %s" msgstr "неверный временной интервал %s" @@ -8767,15 +9179,11 @@ msgstr "неверный временной интервал %s" msgid "cannot read realtime clock" msgstr "невозможно прочитать таймер реального времени" -#: src/sort.c:395 -msgid "" -"Write sorted concatenation of all FILE(s) to standard output.\n" -"\n" -msgstr "" -"Печатает сортированное слияние всех ФАЙЛ(ов) на стандартный вывод.\n" -"\n" +#: src/sort.c:399 +msgid "Write sorted concatenation of all FILE(s) to standard output.\n" +msgstr "Печатает сортированное слияние всех ФАЙЛ(ов) на стандартный вывод.\n" -#: src/sort.c:402 +#: src/sort.c:405 msgid "" "Ordering options:\n" "\n" @@ -8783,7 +9191,7 @@ msgstr "" "Ключи, задающие порядок:\n" "\n" -#: src/sort.c:406 +#: src/sort.c:409 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -8794,7 +9202,7 @@ msgstr "" " -d, --dictionary-order рассматривать только пропуски, буквы и цифры\n" " -f, --ignore-case игнорировать регистр букв\n" -#: src/sort.c:412 +#: src/sort.c:415 msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" " -i, --ignore-nonprinting consider only printable characters\n" @@ -8805,14 +9213,14 @@ msgstr "" " -i, --ignore-nonprinting рассматривать только печатные символы\n" " -M, --month-sort сравнивать (неизвестно) < «JAN» < … < «DEC»\n" -#: src/sort.c:417 +#: src/sort.c:420 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:420 +#: src/sort.c:423 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -8824,7 +9232,7 @@ msgstr "" " --random-source=ФАЙЛ брать случайные числа из ФАЙЛА\n" " -r, --reverse обратить результаты сравнения\n" -#: src/sort.c:426 +#: src/sort.c:429 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -8840,7 +9248,7 @@ msgstr "" " -V, --version-sort сортировать по номерам (версии) в текстовом\n" " представлении\n" -#: src/sort.c:434 +#: src/sort.c:437 msgid "" "Other options:\n" "\n" @@ -8848,7 +9256,7 @@ msgstr "" "Другие ключи:\n" "\n" -#: src/sort.c:438 +#: src/sort.c:441 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" @@ -8856,7 +9264,7 @@ msgstr "" " --batch-size=NMERGE объединять не более чем NMERGE ввода за раз;\n" " для большего использовать временные файлы\n" -#: src/sort.c:442 +#: src/sort.c:445 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 " @@ -8873,7 +9281,7 @@ msgstr "" " --compress-program=ПРОГ сжимать временные файлы командой ПРОГ;\n" " разжимать командой ПРОГ -d\n" -#: src/sort.c:449 +#: src/sort.c:452 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -8890,7 +9298,7 @@ msgstr "" " Если Ф равно -, то читать имена файлов из\n" " стандартного ввода\n" -#: src/sort.c:456 +#: src/sort.c:459 msgid "" " -k, --key=KEYDEF sort via a key; KEYDEF gives location and type\n" " -m, --merge merge already sorted files; do not sort\n" @@ -8900,7 +9308,7 @@ msgstr "" " -m, --merge объединить уже сортированные файлы,\n" " не сортировать\n" -#: src/sort.c:460 +#: src/sort.c:463 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -8916,7 +9324,7 @@ msgstr "" "указанного\n" " РАЗМЕРА\n" -#: src/sort.c:466 +#: src/sort.c:469 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -8945,13 +9353,13 @@ msgstr "" "нескольких\n" " равных\n" -#: src/sort.c:475 +#: 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:480 +#: src/sort.c:483 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -8982,7 +9390,7 @@ msgstr "" "\n" "После РАЗМЕРА можно писать следующие суффиксы-мультипликаторы:\n" -#: src/sort.c:493 +#: src/sort.c:496 msgid "" "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n" "\n" @@ -9003,132 +9411,132 @@ msgstr "" "Чтобы получить традиционный порядок, использующий системные значения байт,\n" "установите LC_ALL=C.\n" -#: src/sort.c:694 +#: src/sort.c:697 #, c-format msgid "waiting for %s [-d]" msgstr "ожидание %s [-d]" -#: src/sort.c:699 +#: src/sort.c:702 #, c-format msgid "%s [-d] terminated abnormally" msgstr "%s [-d] завершился неудачно" -#: src/sort.c:853 +#: src/sort.c:856 #, c-format msgid "cannot create temporary file in %s" msgstr "невозможно создать временный файл в %s" -#: src/sort.c:939 src/sort.c:2010 src/sort.c:3056 src/sort.c:3755 -#: src/sort.c:3758 +#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713 +#: src/sort.c:3804 src/sort.c:3807 msgid "open failed" msgstr "операция открытия завершилась неудачно" -#: src/sort.c:959 +#: src/sort.c:970 msgid "fflush failed" msgstr "операция fflush завершилась неудачно" -#: src/sort.c:964 src/sort.c:2013 src/sort.c:4646 +#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706 msgid "close failed" msgstr "закрытие завершилось неудачно" -#: src/sort.c:973 +#: src/sort.c:986 #, c-format msgid "dup2 failed" msgstr "dup2 завершилась неудачно" -#: src/sort.c:1090 +#: src/sort.c:1103 #, c-format msgid "couldn't execute %s" msgstr "невозможно выполнить %s" -#: src/sort.c:1097 +#: src/sort.c:1110 msgid "couldn't create temporary file" msgstr "невозможно создать временный файл" -#: src/sort.c:1136 +#: src/sort.c:1149 #, c-format msgid "couldn't create process for %s -d" msgstr "невозможно создать процесс для %s -d" -#: src/sort.c:1150 +#: src/sort.c:1161 #, c-format msgid "couldn't execute %s -d" msgstr "невозможно выполнить %s -d" -#: src/sort.c:1209 +#: src/sort.c:1220 #, c-format msgid "warning: cannot remove: %s" msgstr "предупреждение, невозможно удалить: %s" -#: src/sort.c:1295 +#: src/sort.c:1306 #, c-format msgid "invalid --%s argument %s" msgstr "--%s содержит неверный аргумент %s" -#: src/sort.c:1298 +#: src/sort.c:1309 #, c-format msgid "minimum --%s argument is %s" msgstr "минимальным аргументом --%s является %s" -#: src/sort.c:1313 +#: src/sort.c:1324 #, c-format msgid "--%s argument %s too large" msgstr "--%s имеет слишком большой аргумент %s" -#: src/sort.c:1316 +#: src/sort.c:1327 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "максимальным аргументом --%s с текущим rlimit является %s" -#: src/sort.c:1398 +#: src/sort.c:1409 #, c-format msgid "number in parallel must be nonzero" msgstr "количество параллельных сортировок должно быть ненулевым" -#: src/sort.c:1479 +#: src/sort.c:1494 msgid "stat failed" msgstr "операция stat завершилась неудачно" -#: src/sort.c:1740 +#: src/sort.c:1755 msgid "read failed" msgstr "чтение завершилось неудачно" -#: src/sort.c:2028 +#: src/sort.c:2043 #, c-format msgid "string transformation failed" msgstr "не удалось выполнить преобразование строки" -#: src/sort.c:2031 +#: src/sort.c:2046 #, c-format msgid "the untransformed string was %s" msgstr "исходная строка была %s" -#: src/sort.c:2194 +#: src/sort.c:2209 #, c-format msgid "^ no match for key\n" msgstr "^ не найдено совпадений с ключом\n" -#: src/sort.c:2374 +#: src/sort.c:2389 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "указан устаревший ключ %s; вместо него используйте %s" -#: src/sort.c:2380 +#: src/sort.c:2395 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "ключ %lu нулевой ширины и будет проигнорирован" -#: src/sort.c:2391 +#: src/sort.c:2406 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "начальные пробелы в ключе %lu важны; укажите также «b»" -#: src/sort.c:2404 +#: src/sort.c:2419 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "ключ %lu является числовым и охватывает несколько полей" -#: src/sort.c:2436 +#: src/sort.c:2451 #, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" @@ -9136,132 +9544,134 @@ msgstr[0] "ключ «-%s» игнорируется" msgstr[1] "ключа «-%s» игнорируется" msgstr[2] "ключей «-%s» игнорируется" -#: src/sort.c:2442 +#: src/sort.c:2457 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "ключ «-r» применяется только если ничего не совпало" -#: src/sort.c:2716 src/sort.c:2725 +#: src/sort.c:2731 src/sort.c:2740 msgid "write failed" msgstr "запись завершилась неудачно" -#: src/sort.c:2768 +#: src/sort.c:2783 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: неправильный порядок: " -#: src/sort.c:2771 +#: src/sort.c:2786 msgid "standard error" msgstr "стандартная ошибка" -#: src/sort.c:3926 +#: src/sort.c:3698 +msgid "cannot read" +msgstr "не удалось прочитать" + +#: src/sort.c:3976 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: неверная спецификация поля %s" -#: src/sort.c:3937 +#: src/sort.c:3987 #, c-format msgid "options '-%s' are incompatible" msgstr "ключи «-%s» несовместимы" -#: src/sort.c:3988 +#: src/sort.c:4038 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s: неверный счетчик в начале %s" -#: src/sort.c:4245 +#: src/sort.c:4295 msgid "invalid number after '-'" msgstr "неверное число после «-»" -#: src/sort.c:4248 src/sort.c:4334 src/sort.c:4362 +#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416 msgid "invalid number after '.'" msgstr "неверное число после «.»" -#: src/sort.c:4261 src/sort.c:4367 +#: src/sort.c:4315 src/sort.c:4421 msgid "stray character in field spec" msgstr "лишний символ в спецификации поля" -#: src/sort.c:4308 +#: src/sort.c:4362 #, c-format msgid "multiple compress programs specified" msgstr "заданы несколько программ сжатия" -#: src/sort.c:4325 +#: src/sort.c:4379 msgid "invalid number at field start" msgstr "неверное число в начале поля" -#: src/sort.c:4329 src/sort.c:4357 +#: src/sort.c:4383 src/sort.c:4411 msgid "field number is zero" msgstr "нулевой номер поля" -#: src/sort.c:4338 +#: src/sort.c:4392 msgid "character offset is zero" msgstr "нулевой знаковый сдвиг" -#: src/sort.c:4353 +#: src/sort.c:4407 msgid "invalid number after ','" msgstr "неверное число после «,»" -#: src/sort.c:4403 +#: src/sort.c:4457 #, c-format msgid "empty tab" msgstr "пустая табуляция" -#: src/sort.c:4496 src/wc.c:692 +#: src/sort.c:4550 src/wc.c:692 #, c-format msgid "cannot read file names from %s" msgstr "невозможно прочитать имена файлов из %s" -#: src/sort.c:4518 +#: src/sort.c:4572 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s:%lu: неверное имя файла нулевой длины" -#: src/sort.c:4524 +#: src/sort.c:4578 #, c-format msgid "no input from %s" msgstr "нет ввода из %s" -#: src/sort.c:4570 +#: src/sort.c:4624 #, c-format msgid "using %s sorting rules" msgstr "правила, используемые для сортировки: %s" -#: src/sort.c:4573 +#: src/sort.c:4627 #, c-format msgid "using simple byte comparison" msgstr "используется простое побайтовое сравнение" -#: src/sort.c:4604 +#: src/sort.c:4658 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "дополнительный операнд %s не допустим с -%c" -#: src/split.c:184 +#: src/split.c:187 #, c-format msgid "the suffix length needs to be at least %zu" msgstr "длина суффикса должна быть не менее %zu" -#: src/split.c:201 +#: src/split.c:204 #, c-format msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" msgstr "Использование: %s [КЛЮЧ]… [ВВОД [ПРЕФИКС]]\n" -#: src/split.c:205 +#: src/split.c:208 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" -"\n" msgstr "" -"Выводит фиксированного размера части ФАЙЛА в файлы ПРЕФИКСaa,\n" +"Выводит части ФАЙЛА фиксированного размера в файлы ПРЕФИКСaa,\n" "ПРЕФИКСab, …; по умолчанию размер части равен 1000 строк, а ПРЕФИКС\n" "равен «x». Если ФАЙЛ не задан или задан как -, читает стандартный\n" "ввод.\n" -"\n" -#: src/split.c:214 +#: src/split.c:216 #, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" @@ -9297,7 +9707,7 @@ msgstr "" " -u, --unbuffered сразу копировать ввод в вывод при указании «-n r/" "…»\n" -#: src/split.c:227 +#: src/split.c:229 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" @@ -9305,7 +9715,7 @@ msgstr "" " --verbose печатать диагностику перед открытием\n" " очередного выходного файла\n" -#: src/split.c:234 +#: src/split.c:236 msgid "" "\n" "CHUNKS may be:\n" @@ -9325,188 +9735,193 @@ msgstr "" "r/N как «l», но использовать циклический перебор\n" "r/K/N аналогично, но вывести только K-ую порцию из N на стандартный вывод\n" -#: src/split.c:352 +#: src/split.c:354 #, c-format msgid "output file suffixes exhausted" msgstr "исчерпаны суффиксы для выходных файлов" -#: src/split.c:364 +#: src/split.c:366 #, c-format msgid "creating file %s\n" msgstr "создаётся файл %s\n" -#: src/split.c:377 +#: src/split.c:375 +#, c-format +msgid "%s would overwrite input; aborting" +msgstr "%s перезаписал был начальные данные; прекращение выполнения" + +#: src/split.c:391 #, c-format msgid "failed to set FILE environment variable" msgstr "не удалось задать переменную окружения FILE" -#: src/split.c:379 +#: src/split.c:393 #, c-format msgid "executing with FILE=%s\n" msgstr "выполняется с FILE=%s\n" -#: src/split.c:381 +#: src/split.c:395 #, c-format msgid "failed to create pipe" msgstr "не удалось создать канал" -#: src/split.c:395 +#: src/split.c:409 #, c-format msgid "closing prior pipe" msgstr "закрытие предыдущего канала" -#: src/split.c:397 +#: src/split.c:411 #, c-format msgid "closing output pipe" msgstr "закрытие выходного канала" -#: src/split.c:401 +#: src/split.c:415 #, c-format msgid "moving input pipe" msgstr "перемещение входного канала" -#: src/split.c:403 +#: src/split.c:417 #, c-format msgid "closing input pipe" msgstr "закрытие входного канала" -#: src/split.c:408 +#: src/split.c:422 #, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "не удалось выполнить команду: «%s -c %s»" -#: src/split.c:414 +#: src/split.c:428 #, c-format msgid "failed to close input pipe" msgstr "не удалось закрыть входной канал" -#: src/split.c:450 +#: src/split.c:464 #, c-format msgid "waiting for child process" msgstr "ожидание дочернего процесса" -#: src/split.c:460 +#: src/split.c:474 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "при FILE=%s, сигнал %s от команды: %s" -#: src/split.c:468 +#: src/split.c:482 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "при FILE=%s, код возврата %d из команды: %s" -#: src/split.c:475 src/timeout.c:449 +#: src/split.c:489 src/timeout.c:494 #, c-format msgid "unknown status from command (0x%X)" msgstr "неизвестный код возврата команды (0x%X)" -#: src/split.c:1037 +#: src/split.c:1052 #, c-format msgid "cannot split in more than one way" msgstr "невозможно разбивать несколькими методами сразу" -#: src/split.c:1050 src/split.c:1192 src/split.c:1363 +#: src/split.c:1065 src/split.c:1205 src/split.c:1376 #, c-format msgid "%s: invalid number of chunks" msgstr "%s: неверное количество порций" -#: src/split.c:1054 +#: src/split.c:1069 #, c-format msgid "%s: invalid chunk number" msgstr "%s: неверный номер порции" -#: src/split.c:1106 +#: src/split.c:1119 #, c-format msgid "%s: invalid suffix length" msgstr "%s: неверная длина суффикса" -#: src/split.c:1131 src/split.c:1139 src/split.c:1162 src/split.c:1167 +#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180 #, c-format msgid "%s: invalid number of bytes" msgstr "%s: неверное число байт" -#: src/split.c:1150 src/split.c:1297 +#: src/split.c:1163 src/split.c:1310 #, c-format msgid "%s: invalid number of lines" msgstr "%s: неверное число строк" -#: src/split.c:1223 +#: src/split.c:1236 #, c-format msgid "line count option -%s%c... is too large" msgstr "ключ числа строк -%s%c… слишком велик" -#: src/split.c:1235 +#: src/split.c:1248 #, c-format msgid "%s: invalid start value for numerical suffix" msgstr "%s: неверное начальное значение числового суффикса" -#: src/split.c:1263 +#: src/split.c:1276 #, c-format msgid "%s: invalid IO block size" msgstr "%s: неверный размер блока ввода-вывода" -#: src/split.c:1284 +#: src/split.c:1297 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "--filter не применяется к порциям, извлекаемым в stdout" -#: src/split.c:1321 +#: src/split.c:1334 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" "начальное значение числового суффикса слишком большое и превышает длину " "суффикса" -#: src/split.c:1356 +#: src/split.c:1369 #, c-format msgid "%s: cannot determine file size" msgstr "%s: невозможно определить размер файла" #. This is a proper name. See the gettext manual, section Names. -#: src/stat.c:169 +#: src/stat.c:173 msgid "Michael Meskes" msgstr "Майкл Мескес (Michael Meskes)" -#: src/stat.c:838 +#: src/stat.c:857 #, c-format msgid "failed to canonicalize %s" msgstr "не удалось выполнить канонизацию %s" -#: src/stat.c:1050 +#: src/stat.c:1069 #, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "предупреждение: управляющая последовательность «\\%c» не распознана" -#: src/stat.c:1105 +#: src/stat.c:1124 #, c-format msgid "%s: invalid directive" msgstr "%s: неверная директива" -#: src/stat.c:1151 +#: src/stat.c:1170 #, c-format msgid "warning: backslash at end of format" msgstr "предупреждение: обратная косая черта в конце формата" -#: src/stat.c:1182 +#: src/stat.c:1201 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" "используемое значение %s для обозначения стандартного ввода не работает в " "режиме файловой системы" -#: src/stat.c:1189 +#: src/stat.c:1208 #, c-format msgid "cannot read file system information for %s" msgstr "невозможно считать информацию файловой системы для %s" -#: src/stat.c:1209 +#: src/stat.c:1228 #, 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:1245 +#: src/stat.c:1264 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -9522,7 +9937,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1268 +#: src/stat.c:1287 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -9532,31 +9947,31 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1278 +#: src/stat.c:1297 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:1286 +#: src/stat.c:1305 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:1295 +#: src/stat.c:1314 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:1305 +#: src/stat.c:1324 #, c-format msgid "Context: %C\n" msgstr "Контекст: %C\n" -#: src/stat.c:1313 +#: src/stat.c:1332 msgid "" "Access: %x\n" "Modify: %y\n" @@ -9568,19 +9983,19 @@ msgstr "" "Изменён: %z\n" " Создан: %w\n" -#: src/stat.c:1331 +#: src/stat.c:1350 +msgid "Display file or file system status.\n" +msgstr "Отображает состояние файла или файловой системы.\n" + +#: src/stat.c:1356 msgid "" -"Display file or file system status.\n" -"\n" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" -"Отображает состояние файла или файловой системы.\n" -"\n" " -L, --dereference следовать по ссылкам\n" " -f, --file-system показать состояние файловой системы, а не файла\n" -#: src/stat.c:1337 +#: src/stat.c:1360 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -9598,7 +10013,7 @@ msgstr "" "\\n.\n" " -t, --terse выводить информацию в компактной форме\n" -#: src/stat.c:1348 +#: src/stat.c:1371 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -9618,7 +10033,7 @@ msgstr "" " %B размер блока, сообщаемого %b, в байтах\n" " %C строка контекста безопасности SELinux\n" -#: src/stat.c:1357 +#: src/stat.c:1380 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -9634,7 +10049,7 @@ msgstr "" " %g ID группы-владельца\n" " %G имя группы-владельца\n" -#: src/stat.c:1365 +#: src/stat.c:1388 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -9656,7 +10071,7 @@ msgstr "" " %t основной тип устройства, шестнадцатеричный формат\n" " %T второстепенный тип устройства, шестнадцатеричный формат\n" -#: src/stat.c:1376 +#: src/stat.c:1399 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -9682,7 +10097,7 @@ msgstr "" " %Z время последнего изменения в секундах с начала Эпохи\n" "\n" -#: src/stat.c:1390 +#: src/stat.c:1413 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -9700,7 +10115,7 @@ msgstr "" " %d количество свободных файловых нод в файловой системе\n" " %f количество свободных блоков в файловой системе\n" -#: src/stat.c:1399 +#: src/stat.c:1422 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -9726,13 +10141,11 @@ msgstr "Использование: %s КЛЮЧ… КОМАНДА\n" #: src/stdbuf.c:91 msgid "" "Run COMMAND, with modified buffering operations for its standard streams.\n" -"\n" msgstr "" "Запускает КОМАНДУ с изменёнными операциями буферизации для стандартных " "потоков.\n" -"\n" -#: src/stdbuf.c:98 +#: src/stdbuf.c:97 msgid "" " -i, --input=MODE adjust standard input stream buffering\n" " -o, --output=MODE adjust standard output stream buffering\n" @@ -9743,7 +10156,7 @@ msgstr "" "потока\n" " -e, --error=РЕЖИМ Адаптировать буферизацию стандартного потока ошибок\n" -#: src/stdbuf.c:105 +#: src/stdbuf.c:104 msgid "" "\n" "If MODE is 'L' the corresponding stream will be line buffered.\n" @@ -9754,7 +10167,7 @@ msgstr "" "буферизироваться построчно. Этот ключ некорректен при использовании\n" "стандартного ввода.\n" -#: src/stdbuf.c:108 +#: src/stdbuf.c:107 msgid "" "\n" "If MODE is '0' the corresponding stream will be unbuffered.\n" @@ -9763,7 +10176,7 @@ msgstr "" "Если значение РЕЖИМА равно «0», то соответствующий поток не будет\n" "буферизироваться.\n" -#: src/stdbuf.c:111 +#: src/stdbuf.c:110 msgid "" "\n" "Otherwise MODE is a number which may be followed by one of the following:\n" @@ -9779,7 +10192,7 @@ msgstr "" "В этом случае соответствующий поток будет полностью буферизироваться и\n" "размер буфера будет равен число байт в РЕЖИМЕ.\n" -#: src/stdbuf.c:117 +#: src/stdbuf.c:116 msgid "" "\n" "NOTE: If COMMAND adjusts the buffering of its standard streams ('tee' does\n" @@ -9795,22 +10208,22 @@ msgstr "" "Также некоторые фильтры (например «dd», «cat» и т.д.) не используют потоки\n" "ввода/вывода, и поэтому «stdbuf» не укажет на них никакого влияния.\n" -#: src/stdbuf.c:227 +#: src/stdbuf.c:226 #, c-format msgid "failed to find %s" msgstr "не удалось найти %s" -#: src/stdbuf.c:247 src/stdbuf.c:279 +#: src/stdbuf.c:246 src/stdbuf.c:278 #, c-format msgid "failed to update the environment with %s" msgstr "не удалось обновить окружение с %s" -#: src/stdbuf.c:321 +#: src/stdbuf.c:320 #, c-format msgid "line buffering stdin is meaningless" msgstr "строковая буферизация stdin бессмысленна" -#: src/stty.c:509 +#: src/stty.c:513 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -9821,16 +10234,16 @@ msgstr "" " или: %s [-F УСТРОЙСТВО] [--file=УСТРОЙСТВО] [-a|--all]\n" " или: %s [-F УСТРОЙСТВО] [--file=УСТРОЙСТВО] [-g|--save]\n" -#: src/stty.c:515 +#: src/stty.c:519 +msgid "Print or change terminal characteristics.\n" +msgstr "Печатает или изменяет настройки терминала.\n" + +#: src/stty.c:525 msgid "" -"Print or change terminal characteristics.\n" -"\n" " -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 "" -"Печатает или изменяет настройки терминала.\n" -"\n" " -a, --all напечатать все текущие настройки в форме, понятной " "человеку\n" " -g, --save напечатать все текущие настройки в форме, понятной " @@ -9840,7 +10253,7 @@ msgstr "" " открыть и использовать указанное устройство вместо\n" " стандартного ввода\n" -#: src/stty.c:524 +#: src/stty.c:532 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -9852,7 +10265,7 @@ msgstr "" "иной\n" "настройки определяется используемой системой.\n" -#: src/stty.c:529 +#: src/stty.c:537 msgid "" "\n" "Special characters:\n" @@ -9868,7 +10281,7 @@ msgstr "" " eof СИМВОЛ СИМВОЛ будет означать конец файла (прекращать ввод)\n" " eol СИМВОЛ СИМВОЛ будет означать конец строки\n" -#: src/stty.c:536 +#: src/stty.c:544 msgid "" " * eol2 CHAR alternate CHAR for ending the line\n" " erase CHAR CHAR will erase the last character typed\n" @@ -9880,7 +10293,7 @@ msgstr "" " intr СИМВОЛ СИМВОЛ будет посылать сигнал прерывания\n" " kill СИМВОЛ СИМВОЛ будет стирать текущую строку\n" -#: src/stty.c:542 +#: src/stty.c:550 msgid "" " * lnext CHAR CHAR will enter the next character quoted\n" " quit CHAR CHAR will send a quit signal\n" @@ -9893,7 +10306,7 @@ msgstr "" "* rprnt СИМВОЛ СИМВОЛ будет перерисовывать текущую строку\n" " start СИМВОЛ СИМВОЛ будет возобновлять ввод\n" -#: src/stty.c:548 +#: src/stty.c:556 msgid "" " stop CHAR CHAR will stop the output\n" " susp CHAR CHAR will send a terminal stop signal\n" @@ -9905,7 +10318,7 @@ msgstr "" "* swtch СИМВОЛ СИМВОЛ будет переключать уровень вложенности оболочки\n" "* werase СИМВОЛ СИМВОЛ стирать последние введенное слово\n" -#: src/stty.c:554 +#: src/stty.c:562 msgid "" "\n" "Special settings:\n" @@ -9919,7 +10332,7 @@ msgstr "" "* cols Н сообщить ядру, что терминал имеет Н столбцов\n" "* columns Н синоним cols\n" -#: src/stty.c:561 +#: src/stty.c:569 msgid "" " ispeed N set the input speed to N\n" " * line N use line discipline N\n" @@ -9933,7 +10346,7 @@ msgstr "" " символов для завершения операции чтения\n" " ospeed Н установить скорость вывода\n" -#: src/stty.c:567 +#: src/stty.c:575 msgid "" " * rows N tell the kernel that the terminal has N rows\n" " * size print the number of rows and columns according to the " @@ -9947,31 +10360,32 @@ msgstr "" " time Н используется с -icanon, установить временной предел для\n" " операции чтения равным Н десятым секунды\n" -#: src/stty.c:573 +#: src/stty.c:581 msgid "" "\n" "Control settings:\n" " [-]clocal disable modem control signals\n" " [-]cread allow input to be received\n" " * [-]crtscts enable RTS/CTS handshaking\n" +" * [-]cdtrdsr enable DTR/DSR handshaking\n" " csN set character size to N bits, N in [5..8]\n" msgstr "" "\n" "Управляющие настройки:\n" -" [-]clocal отменить управляющие сигналы модема\n" +" [-]clocal выключить управляющие сигналы модема\n" " [-]cread разрешить ввод\n" -"* [-]crtscts разрешить управление потоком данных с подтверждением\n" -" готовности\n" +"* [-]crtscts включить квитирование по RTS/CTS\n" +" * [-]cdtrdsr включить квитирование по DTR/DSR\n" " csН установить размер символа равным Н бит, Н от 5 до 8\n" -#: src/stty.c:581 +#: src/stty.c:590 msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" " [-]hupcl same as [-]hup\n" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" -" [-]parodd set odd parity (even with '-')\n" +" [-]parodd set odd parity (or even parity with '-')\n" msgstr "" " [-]cstopb использовать два разделяющих бита на символ (один, если с " "«-»)\n" @@ -9981,9 +10395,9 @@ msgstr "" " [-]parenb генерировать при выводе бит четности и ожидать бит четности " "на\n" " вводе\n" -" [-]parodd установить проверку на нечетность (даже с «-»)\n" +" [-]parodd установить проверку на нечетность (или даже чётность с «-»)\n" -#: src/stty.c:588 +#: src/stty.c:597 msgid "" "\n" "Input settings:\n" @@ -9999,7 +10413,7 @@ msgstr "" " [-]ignbrk игнорировать символы прерывания\n" " [-]igncr игнорировать символы возврата каретки\n" -#: src/stty.c:596 +#: src/stty.c:605 msgid "" " [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" @@ -10015,11 +10429,11 @@ msgstr "" " [-]inpck использовать проверку четности ввода\n" " [-]istrip очищать старший (восьмой) бит вводимых символов\n" -#: src/stty.c:603 +#: src/stty.c:612 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr " * [-]iutf8 предполагать, что входные символы в кодировке UTF-8\n" -#: src/stty.c:606 +#: src/stty.c:615 msgid "" " * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" @@ -10035,7 +10449,7 @@ msgstr "" " [-]parmrk отмечать ошибки четности (последовательностью из 255 нулей)\n" " [-]tandem синоним [-]xioff\n" -#: src/stty.c:614 +#: src/stty.c:623 msgid "" "\n" "Output settings:\n" @@ -10051,7 +10465,7 @@ msgstr "" "* ffН значение паузы после перевода страницы, допустимые Н [0..1]\n" "* nlН значение паузы после новой строки, допустимые Н [0..1]\n" -#: src/stty.c:622 +#: src/stty.c:631 msgid "" " * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of null characters\n" @@ -10068,7 +10482,7 @@ msgstr "" "строку\n" "* [-]onlret перевод строки производит возврат каретки\n" -#: src/stty.c:630 +#: src/stty.c:639 msgid "" " * [-]onocr do not print carriage returns in the first column\n" " [-]opost postprocess output\n" @@ -10086,7 +10500,7 @@ msgstr "" "* vtН значение паузы после вертикальной табуляции, допустимые Н " "[0..1]\n" -#: src/stty.c:638 +#: src/stty.c:647 msgid "" "\n" "Local settings:\n" @@ -10100,7 +10514,7 @@ msgstr "" "* crtkill стирать всю строку, подчиняясь установкам echoprt и echoe\n" "* -crtkill стирать всю строку, подчиняясь установкам echoctl и echok\n" -#: src/stty.c:645 +#: src/stty.c:654 msgid "" " * [-]ctlecho echo control characters in hat notation ('^c')\n" " [-]echo echo input characters\n" @@ -10114,7 +10528,7 @@ msgstr "" " [-]echoe синоним [-]crterase\n" " [-]echok отображать перевод строки после символа уничтожения\n" -#: src/stty.c:652 +#: src/stty.c:661 msgid "" " * [-]echoke same as [-]crtkill\n" " [-]echonl echo newline even if not echoing other characters\n" @@ -10132,7 +10546,7 @@ msgstr "" " [-]iexten использовать специальные символы, не описанные в стандарте\n" " POSIX\n" -#: src/stty.c:659 +#: src/stty.c:668 msgid "" " [-]isig enable interrupt, quit, and suspend special characters\n" " [-]noflsh disable flushing after interrupt and quit special " @@ -10149,7 +10563,7 @@ msgstr "" " запись на терминал\n" "* [-]xcase отображать «\\» для заглавных букв, используется с icanon\n" -#: src/stty.c:666 +#: src/stty.c:675 msgid "" "\n" "Combination settings:\n" @@ -10163,7 +10577,7 @@ msgstr "" " cbreak синоним -icanon\n" " -cbreak синоним icanon\n" -#: src/stty.c:673 +#: src/stty.c:682 msgid "" " cooked same as brkint ignpar istrip icrnl ixon opost isig\n" " icanon, eof and eol characters to their default values\n" @@ -10175,7 +10589,7 @@ msgstr "" " -cooked синоним raw\n" " crt синоним echoe echoctl echoke\n" -#: src/stty.c:679 +#: src/stty.c:688 msgid "" " dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" " kill ^u\n" @@ -10190,7 +10604,7 @@ msgstr "" "умолчанию\n" " evenp синоним parenb -parodd cs7\n" -#: src/stty.c:686 +#: src/stty.c:695 msgid "" " -evenp same as -parenb cs8\n" " * [-]lcase same as xcase iuclc olcuc\n" @@ -10206,7 +10620,7 @@ msgstr "" " nl синоним -icrnl -onlcr\n" " -nl синоним icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" -#: src/stty.c:694 +#: src/stty.c:703 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -10220,7 +10634,7 @@ msgstr "" " pass8 синоним -parenb -istrip cs8\n" " -pass8 синоним parenb istrip cs7\n" -#: src/stty.c:701 +#: src/stty.c:710 msgid "" " raw same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" " -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n" @@ -10232,7 +10646,7 @@ msgstr "" " -imaxbel -opost -isig -icanon -xcase min 1 time 0\n" " -raw синоним cooked\n" -#: src/stty.c:707 +#: src/stty.c:716 msgid "" " sane same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" " -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n" @@ -10248,7 +10662,7 @@ msgstr "" " -xcase -tostop -echoprt echoctl echoke, все специальные\n" " символы установлены в их значения по умолчанию\n" -#: src/stty.c:715 +#: src/stty.c:724 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -10264,12 +10678,12 @@ msgstr "" "или задаются в как ^c, 0x37, 0177 или 127; для отмены специальных символов\n" "служат значения ^- и undef.\n" -#: src/stty.c:787 +#: src/stty.c:796 #, c-format msgid "only one device may be specified" msgstr "можно задать только одно устройство" -#: src/stty.c:817 +#: src/stty.c:826 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" @@ -10278,127 +10692,47 @@ msgstr "" "ключи для вывода в виде, читаемом человеком и читаемом программой stty,\n" "взаимоисключающие" -#: src/stty.c:823 +#: src/stty.c:832 #, c-format msgid "when specifying an output style, modes may not be set" msgstr "при задании стиля вывода нельзя устанавливать режим" -#: src/stty.c:838 +#: src/stty.c:847 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s: невозможно переинициализировать неблокирующий режим" -#: src/stty.c:883 src/stty.c:993 +#: src/stty.c:892 src/stty.c:1002 #, c-format msgid "invalid argument %s" msgstr "неверный аргумент %s" -#: src/stty.c:894 src/stty.c:911 src/stty.c:923 src/stty.c:936 src/stty.c:948 -#: src/stty.c:968 +#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957 +#: src/stty.c:977 #, c-format msgid "missing argument to %s" msgstr "пропущен аргумент для %s" -#: src/stty.c:974 +#: src/stty.c:983 #, c-format msgid "invalid line discipline %s" msgstr "неверные настройки линии (line discipline) %s" -#: src/stty.c:1044 +#: src/stty.c:1053 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s: невозможно произвести все запрошенные действия" -#: src/stty.c:1390 +#: src/stty.c:1399 #, c-format msgid "%s: no size information for this device" msgstr "%s: для этого устройства нет сведений о размерах" -#: src/stty.c:1904 +#: src/stty.c:1920 #, c-format msgid "invalid integer argument %s" msgstr "неверный целый аргумент %s" -#: src/su.c:229 -msgid "Password:" -msgstr "Пароль:" - -#: src/su.c:232 -#, c-format -msgid "getpass: cannot open /dev/tty" -msgstr "getpass: не удалось открыть /dev/tty" - -#: src/su.c:290 -#, c-format -msgid "cannot set groups" -msgstr "невозможно установить группы" - -#: src/su.c:294 -#, c-format -msgid "cannot set group id" -msgstr "невозможно установить групповой id" - -#: src/su.c:296 -#, c-format -msgid "cannot set user id" -msgstr "невозможно установить пользовательский id" - -#: src/su.c:371 -#, c-format -msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" -msgstr "Использование: %s [КЛЮЧ] [-] [ПОЛЬЗОВАТЕЛЬ [АРГ]…]\n" - -#: src/su.c:372 -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 "" -"Устанавливает эффективные идентификаторы пользователя и группы как у " -"ПОЛЬЗОВАТЕЛЯ.\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" - -#: src/su.c:384 -msgid "" -"\n" -"A mere - implies -l. If USER not given, assume root.\n" -msgstr "" -"\n" -"Просто знак минус подразумевает -l. Если ПОЛЬЗОВАТЕЛЬ не задан,\n" -"подразумевается root.\n" - -#: src/su.c:461 -#, c-format -msgid "user %s does not exist" -msgstr "пользователь %s не существует" - -#: src/su.c:484 -#, c-format -msgid "incorrect password" -msgstr "неправильный пароль" - -#: src/su.c:501 -#, c-format -msgid "using restricted shell %s" -msgstr "используется ограниченная оболочка %s" - -#: src/su.c:509 -#, c-format -msgid "warning: cannot change directory to %s" -msgstr "предупреждение: невозможно сменить каталог на %s" - #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 msgid "Kayvan Aghaiepour" @@ -10432,7 +10766,7 @@ msgstr "" msgid "ignoring all arguments" msgstr "все аргументы проигнорированы" -#: src/system.h:340 +#: src/system.h:343 #, c-format msgid "" "\n" @@ -10446,17 +10780,25 @@ msgstr "" "документации по вашей оболочке, чтобы узнать, какие ключи она\n" "поддерживает.\n" -#: src/system.h:346 +#: src/system.h:349 msgid " --help display this help and exit\n" msgstr " --help показать эту справку и выйти\n" -#: src/system.h:348 +#: src/system.h:351 msgid " --version output version information and exit\n" msgstr "" " --version показать информацию о версии и выйти\n" "\n" -#: src/system.h:541 +#: src/system.h:544 +msgid "" +"\n" +"Mandatory arguments to long options are mandatory for short options too.\n" +msgstr "" +"\n" +"Аргументы, обязательные для длинных ключей, обязательны и для коротких.\n" + +#: src/system.h:552 msgid "" "\n" "SIZE is an integer and optional unit (example: 10M is 10*1024*1024). Units\n" @@ -10468,7 +10810,7 @@ msgstr "" "(пример: 10M is 10*1024*1024). Единицы изменения:\n" "K, M, G, T, P, E, Z, Y (степень 1024) или KB, MB, … (степень 1000).\n" -#: src/system.h:550 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -10482,7 +10824,7 @@ msgstr "" "Иначе, единицей по умолчанию является 1024 байта (или 512, если\n" "установлена POSIXLY_CORRECT).\n" -#: src/system.h:560 +#: src/system.h:571 #, c-format msgid "" "\n" @@ -10495,23 +10837,23 @@ msgstr "" #. <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:574 +#: src/system.h:585 #, c-format msgid "Report %s translation bugs to <http://translationproject.org/team/>\n" msgstr "Об ошибках в переводе сообщений «%s» сообщайте по адресу <gnu@mx.ru>\n" -#: src/system.h:578 +#: src/system.h:589 #, c-format msgid "For complete documentation, run: info coreutils '%s invocation'\n" msgstr "" "Полная документация доступна по команде: info coreutils '%s invocation'\n" -#: src/system.h:585 +#: src/system.h:596 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "По команде «%s --help» можно получить дополнительную информацию.\n" -#: src/system.h:617 +#: src/system.h:628 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -10535,13 +10877,11 @@ msgstr "Джей Лепро (Jay Lepreau)" msgid "" "Write each FILE to standard output, last line first.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" "Печатает ФАЙЛЫ на стандартный вывод, начиная с последней строки.\n" "Если ФАЙЛ не задан или задан как -, читает стандартный ввод.\n" -"\n" -#: src/tac.c:145 +#: src/tac.c:144 msgid "" " -b, --before attach the separator before instead of after\n" " -r, --regex interpret the separator as a regular expression\n" @@ -10553,42 +10893,42 @@ msgstr "" " -s, --separator=СТРОКА использовать как разделитель СТРОКУ, а не символ\n" " новой строки\n" -#: src/tac.c:235 src/tac.c:336 +#: src/tac.c:234 src/tac.c:335 #, c-format msgid "%s: seek failed" msgstr "%s: перемещение по файлу завершилось неудачно" -#: src/tac.c:264 +#: src/tac.c:263 #, c-format msgid "record too large" msgstr "запись слишком велика" -#: src/tac.c:451 +#: src/tac.c:450 #, c-format msgid "failed to create temporary file in %s" msgstr "не удалось создать временный файл в %s" -#: src/tac.c:459 +#: src/tac.c:458 #, c-format msgid "failed to open %s for writing" msgstr "не удалось открыть %s на запись" -#: src/tac.c:476 +#: src/tac.c:475 #, c-format msgid "failed to rewind stream for %s" msgstr "не удалось отмотать поток для %s" -#: src/tac.c:512 src/tac.c:519 +#: src/tac.c:511 src/tac.c:518 #, c-format msgid "%s: write error" msgstr "%s: ошибка записи" -#: src/tac.c:572 +#: src/tac.c:571 #, c-format msgid "failed to open %s for reading" msgstr "не удалось открыть %s для чтения" -#: src/tac.c:630 +#: src/tac.c:629 #, c-format msgid "separator cannot be empty" msgstr "разделитель не может быть пустым" @@ -10604,14 +10944,12 @@ 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" -"\n" msgstr "" "Печатает последние %d строк каждого из ФАЙЛОВ на стандартный вывод.\n" "Если задано несколько ФАЙЛОВ, сначала печатает заголовок с именем файла.\n" "Если ФАЙЛ не задан или задан как -, читает стандартный ввод.\n" -"\n" -#: src/tail.c:271 +#: src/tail.c:270 msgid "" " -c, --bytes=K output the last K bytes; alternatively, use -c " "+K\n" @@ -10621,7 +10959,7 @@ msgstr "" " -c, --bytes=Н показать последние Н байт; или же укажите -c +Н,\n" " чтобы начать вывод каждого файла с Н-го байта\n" -#: src/tail.c:275 +#: src/tail.c:274 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -10634,7 +10972,7 @@ msgstr "" " -f, --follow и --follow=descriptor эквивалентны\n" " -F эквивалент --follow=name --retry\n" -#: src/tail.c:282 +#: src/tail.c:281 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -10661,7 +10999,7 @@ msgstr "" "использовании\n" " механизма inotify этот параметр не требуется.\n" -#: src/tail.c:295 +#: src/tail.c:294 msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" " -q, --quiet, --silent never output headers giving file names\n" @@ -10678,7 +11016,7 @@ msgstr "" "указывается\n" " имя, то есть, с --follow=name\n" -#: src/tail.c:302 +#: src/tail.c:301 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations.\n" @@ -10693,7 +11031,7 @@ msgstr "" " чем раз в N секунд.\n" " -v, --verbose всегда выводить заголовки с именами файлов\n" -#: src/tail.c:311 +#: src/tail.c:310 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -10711,7 +11049,7 @@ msgstr "" "GB 1000*1000*1000, G 1024*1024*1024 и так далее для T, P, E, Z, Y.\n" "\n" -#: src/tail.c:320 +#: src/tail.c:319 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" @@ -10732,27 +11070,27 @@ msgstr "" "создан\n" "какой-то другой программой.\n" -#: src/tail.c:379 +#: src/tail.c:378 #, c-format msgid "closing %s (fd=%d)" msgstr "закрытие %s (fd=%d)" -#: src/tail.c:454 +#: src/tail.c:453 #, c-format msgid "%s: cannot seek to relative offset %s" msgstr "%s: невозможно переместить указатель позиции на %s" -#: src/tail.c:458 +#: src/tail.c:457 #, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "%s: невозможно переместить указатель позиции на %s относительно конца" -#: src/tail.c:895 +#: src/tail.c:894 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "невозможно определить расположение %s, возвращаемся к методу опросом" -#: src/tail.c:907 +#: src/tail.c:906 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " @@ -10761,39 +11099,39 @@ msgstr "" "неизвестный тип файловой системы 0x%08lx для %s. Сообщите об этом в %s. " "Возвращаемся к опросу." -#: src/tail.c:964 +#: src/tail.c:963 #, c-format msgid "%s has become inaccessible" msgstr "%s стал недоступен" -#: src/tail.c:981 +#: src/tail.c:980 #, c-format msgid "%s has been replaced with an untailable file; giving up on this name" msgstr "" "%s был замещен файлом, для которого tail неприменим; конец вывода для этого " "имени" -#: src/tail.c:990 +#: src/tail.c:989 #, c-format msgid "%s has been replaced with a remote file. giving up on this name" msgstr "%s был замещён файлом удалённым файлом, конец вывода для этого имени" -#: src/tail.c:1011 +#: src/tail.c:1010 #, c-format msgid "%s has become accessible" msgstr "%s стал доступен" -#: src/tail.c:1019 +#: src/tail.c:1018 #, c-format msgid "%s has appeared; following end of new file" msgstr "%s появился; начат вывод для нового файла" -#: src/tail.c:1030 +#: src/tail.c:1029 #, c-format msgid "%s has been replaced; following end of new file" msgstr "%s был замещен; вывод продолжается для нового файла" -#: src/tail.c:1131 +#: src/tail.c:1130 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: невозможно изменить неблокирующий режим" @@ -10849,7 +11187,7 @@ msgstr "число в %s слишком велико" #, c-format msgid "%s: invalid maximum number of unchanged stats between opens" msgstr "" -"%s: неверное максимальное число неизменявшихся параметров между открытиями" +"%s: неверное максимальное число не изменявшихся параметров между открытиями" #: src/tail.c:1991 #, c-format @@ -11162,17 +11500,22 @@ msgstr "пропущена «]»" msgid "extra argument %s" msgstr "лишний аргумент %s" -#: src/timeout.c:124 +#: src/timeout.c:112 +#, c-format +msgid "warning: sigprocmask" +msgstr "предупреждение: sigprocmask" + +#: src/timeout.c:145 #, c-format msgid "warning: timer_settime" msgstr "предупреждение: timer_settime" -#: src/timeout.c:129 +#: src/timeout.c:150 #, c-format msgid "warning: timer_create" msgstr "предупреждение: timer_create" -#: src/timeout.c:204 +#: src/timeout.c:225 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -11181,19 +11524,17 @@ msgstr "" "Использование: %s [КЛЮЧ] ПРОДОЛЖИТЕЛЬНОСТЬ КОМАНДА [АРГ]…\n" " или: %s [КЛЮЧ]\n" -#: src/timeout.c:208 -msgid "" -"Start COMMAND, and kill it if still running after DURATION.\n" -"\n" -"Mandatory arguments to long options are mandatory for short options too.\n" +#: src/timeout.c:229 +msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "" "Запускает КОМАНДУ и завершает её по истечении времени, задаваемого\n" "ПРОДОЛЖИТЕЛЬНОСТЬЮ.\n" -"\n" -"Аргументы, обязательные для длинных ключей, обязательны и для коротких.\n" -#: src/timeout.c:213 +#: src/timeout.c:235 msgid "" +" --preserve-status\n" +" exit with the same status as COMMAND, even when the\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 " @@ -11207,6 +11548,10 @@ msgid "" " 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" " --foreground\n" " Если запуск timeout выполнен не из оболочки командной " "строки,\n" @@ -11222,7 +11567,7 @@ msgstr "" "номером.\n" " Список сигналов см. по команде «kill -l»\n" -#: src/timeout.c:229 +#: src/timeout.c:254 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -11234,34 +11579,40 @@ msgstr "" "суффиксом: «s» (по умолчанию) — секунды, «m» — минуты, «h» — часы\n" "или «d» — дни.\n" -#: src/timeout.c:234 +#: src/timeout.c:259 msgid "" "\n" -"If the command times out, then exit with status 124. Otherwise, exit\n" -"with the status of COMMAND. If no signal is specified, send the TERM\n" -"signal upon timeout. The TERM signal kills any process that does not\n" -"block or catch that signal. For other processes, it may be necessary to\n" -"use the KILL (9) signal, since this signal cannot be caught. If the\n" -"KILL (9) signal is sent, the exit status is 128+9 rather than 124.\n" +"If the command times out, and --preserve-status is not set, then exit with\n" +"status 124. Otherwise, exit with the status of COMMAND. If no signal\n" +"is specified, send the TERM signal upon timeout. The TERM signal kills\n" +"any process that does not block or catch that signal. It may be necessary\n" +"to use the KILL (9) signal, since this signal cannot be caught, in which\n" +"case the exit status is 128+9 rather than 124.\n" msgstr "" "\n" -"Если команда завершилась по таймауту, то код завершения 124. Иначе\n" -"возвращается полученный код завершения КОМАНДЫ. Если сигнал не задан\n" -"то по таймауту посылается сигнал TERM. Сигнал TERM завершает любой процесс,\n" -"который не блокирует или перехватывает данный сигнал. Остальным процессам,\n" -"может понадобиться послать сигнал KILL (9), так как этот сигнал нельзя\n" -"перехватить. Если послан сигнал KILL (9), то код завершения равен 128+9\n" -"а не 124.\n" +"Если команда завершилась по таймауту и не указан ключ --preserve-status,\n" +"то код завершения равен 124. Иначе возвращается полученный код завершения\n" +"КОМАНДЫ. Если сигнал не задан, то по таймауту посылается сигнал TERM.\n" +"Сигнал TERM завершает любой процесс, который не блокирует или перехватывает\n" +"данный сигнал. Остальным процессам, может понадобиться послать сигнал\n" +"KILL (9), так как этот сигнал нельзя перехватить. Если послан сигнал KILL " +"(9),\n" +"то код завершения равен 128+9, а не 124.\n" + +#: src/timeout.c:363 +#, c-format +msgid "warning: disabling core dumps failed" +msgstr "предупреждение: не удалось отключить создание core" -#: src/timeout.c:419 +#: src/timeout.c:471 #, c-format msgid "error waiting for command" msgstr "ошибка ожидания команды" -#: src/timeout.c:441 +#: src/timeout.c:482 #, c-format -msgid "warning: disabling core dumps failed" -msgstr "предупреждение: не удалось отключить создание core" +msgid "the monitored command dumped core" +msgstr "отслеживаемая команда завершилась созданием дампа" #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 @@ -11273,22 +11624,22 @@ msgstr "Джим Кингдон (Jim Kingdon)" msgid "Randy Smith" msgstr "Рэнди Смит (Randy Smith)" -#: src/touch.c:115 src/touch.c:313 +#: src/touch.c:115 src/touch.c:309 #, c-format msgid "invalid date format %s" msgstr "неверный формат даты %s" -#: src/touch.c:194 +#: src/touch.c:191 #, c-format msgid "cannot touch %s" msgstr "невозможно выполнить touch для %s" -#: src/touch.c:200 +#: src/touch.c:197 #, c-format msgid "setting times of %s" msgstr "установка временных отметок %s" -#: src/touch.c:216 +#: src/touch.c:213 msgid "" "Update the access and modification times of each FILE to the current time.\n" "\n" @@ -11297,7 +11648,6 @@ msgid "" "\n" "A FILE argument string of - is handled specially and causes touch to\n" "change the times of the file associated with standard output.\n" -"\n" msgstr "" "Устанавливает временные метки доступа и изменения каждого ФАЙЛА в текущее\n" "время.\n" @@ -11309,9 +11659,8 @@ msgstr "" "образом\n" "и вызывает изменение временных меток файла, связанного со стандартным " "выводом.\n" -"\n" -#: src/touch.c:229 +#: src/touch.c:225 msgid "" " -a change only the access time\n" " -c, --no-create do not create any files\n" @@ -11324,7 +11673,7 @@ msgstr "" " текущего времени\n" " -f (игнорируется)\n" -#: src/touch.c:235 +#: src/touch.c:231 msgid "" " -h, --no-dereference affect each symbolic link instead of any " "referenced\n" @@ -11337,11 +11686,11 @@ msgstr "" " можно изменять владельца символьной ссылки)\n" " -m изменять только время изменения\n" -#: src/touch.c:241 +#: src/touch.c:237 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" -" --time=WORD change the specified time:\n" +" --time=WORD change the specified time:\n" " WORD is access, atime, or use: equivalent to -a\n" " WORD is modify or mtime: equivalent to -m\n" msgstr "" @@ -11349,10 +11698,10 @@ msgstr "" " -t ВРЕМЯ использовать [[ВВ]ГГ]ММДДччмм[.сс] вместо\n" " текущего времени\n" " --time=СЛОВО изменить указанное время:\n" -" СЛОВО access, atime, use эквивалентно -a\n" -" СЛОВО modify, mtime эквивалентно -m\n" +" значения access, atime, use эквивалентны -a\n" +" значения modify, mtime эквивалентны -m\n" -#: src/touch.c:250 +#: src/touch.c:246 msgid "" "\n" "Note that the -d and -t options accept different time-date formats.\n" @@ -11360,12 +11709,12 @@ msgstr "" "\n" "Заметьте, что ключи -d и -t используют разные форматы даты и времени.\n" -#: src/touch.c:339 +#: src/touch.c:335 #, c-format msgid "cannot specify times from more than one source" msgstr "невозможно задать время из нескольких источников" -#: src/touch.c:413 +#: src/touch.c:409 #, c-format msgid "" "warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'" @@ -11655,29 +12004,27 @@ msgid "" "If a FILE is larger than the specified size, the extra data is lost.\n" "If a FILE is shorter, it is extended and the extended part (hole)\n" "reads as zero bytes.\n" -"\n" msgstr "" -"Уплотняет или увеличивает размер каждого ФАЙЛА до заданного размера\n" +"Урезает или увеличивает размер каждого ФАЙЛА до заданного размера\n" "\n" "Если ФАЙЛ не существует, то он создаётся.\n" "\n" "Если ФАЙЛ больше заданного размера, все лишние данные будут потеряны.\n" "Если ФАЙЛ короче, то он расширяется, и это место\n" "читается как нулевые байты.\n" -"\n" -#: src/truncate.c:110 +#: src/truncate.c:109 msgid " -c, --no-create do not create any files\n" msgstr " -c, --no-create не создавать файлов\n" -#: src/truncate.c:113 +#: src/truncate.c:112 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" " -o, --io-blocks считать РАЗМЕР числом блоков вв/вывода, а не " "байтов\n" -#: src/truncate.c:116 +#: 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" @@ -11685,7 +12032,7 @@ msgstr "" " -r, --reference=RФАЙЛ базовый размер RФАЙЛА\n" " -s, --size=РАЗМЕР установить или подогнать размер файла под РАЗМЕР\n" -#: src/truncate.c:122 +#: src/truncate.c:121 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -11698,57 +12045,57 @@ msgstr "" "«>» — не менее, «/» — округлить с сторону уменьшения,\n" "«%» — округлить в сторону увеличения.\n" -#: src/truncate.c:150 +#: src/truncate.c:149 #, c-format msgid "overflow in %<PRIdMAX> * %<PRIdMAX> byte blocks for file %s" msgstr "переполнение в %<PRIdMAX> * %<PRIdMAX> байтовых блоков для файла %s" -#: src/truncate.c:174 +#: src/truncate.c:173 #, c-format msgid "%s has unusable, apparently negative size" msgstr "%s имеет нерабочий, вероятно, отрицательный размер" -#: src/truncate.c:184 src/truncate.c:379 +#: src/truncate.c:183 src/truncate.c:384 #, c-format msgid "cannot get the size of %s" msgstr "невозможно получить размер %s" -#: src/truncate.c:206 +#: src/truncate.c:205 #, c-format msgid "overflow rounding up size of file %s" msgstr "переполнение при округлении размера в сторону увеличения файла %s" -#: src/truncate.c:216 +#: src/truncate.c:215 #, c-format msgid "overflow extending size of file %s" msgstr "переполнение при расширении размера файла %s" -#: src/truncate.c:231 +#: src/truncate.c:230 #, c-format msgid "failed to truncate %s at %<PRIdMAX> bytes" msgstr "не удалось усечь %s на %<PRIdMAX> байт" -#: src/truncate.c:305 +#: src/truncate.c:303 #, c-format msgid "multiple relative modifiers specified" msgstr "задано несколько относительных модификаторов" -#: src/truncate.c:335 +#: src/truncate.c:333 #, c-format msgid "you must specify either %s or %s" msgstr "вы должны задать что-то одно: %s или %s" -#: src/truncate.c:342 +#: src/truncate.c:340 #, c-format msgid "you must specify a relative %s with %s" msgstr "вы должны задать относительный %s с %s" -#: src/truncate.c:349 +#: src/truncate.c:347 #, c-format msgid "%s was specified but %s was not" msgstr "указан %s, но без %s" -#: src/truncate.c:400 +#: src/truncate.c:404 #, c-format msgid "cannot open %s for writing" msgstr "невозможно открыть %s для записи" @@ -11848,14 +12195,12 @@ msgstr "невозможно узнать название системы" msgid "" "Convert blanks in each FILE to tabs, writing to standard output.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" "Преобразует пробелы в ФАЙЛАХ в символы табуляции и печатает на\n" "стандартный вывод. Если ФАЙЛ не задан или задан как -, читает\n" "стандартный ввод.\n" -"\n" -#: src/unexpand.c:125 +#: src/unexpand.c:124 msgid "" " -a, --all convert all blanks, instead of just initial blanks\n" " --first-only convert only leading sequences of blanks (overrides -a)\n" @@ -11872,12 +12217,12 @@ msgstr "" "позиций\n" " табуляции (включает -a)\n" -#: src/unexpand.c:153 +#: src/unexpand.c:152 #, c-format msgid "tabs are too far apart" msgstr "позиции табуляции слишком далеко друг от друга" -#: src/unexpand.c:505 +#: src/unexpand.c:504 #, c-format msgid "tab stop value is too large" msgstr "размер табуляции слишком велик" @@ -11893,15 +12238,13 @@ msgid "" "writing to OUTPUT (or standard output).\n" "\n" "With no options, matching lines are merged to the first occurrence.\n" -"\n" msgstr "" -"Фильтрует совпавшие строки из ВХОДА (или стандартного ввод),\n" +"Фильтрует совпавшие строки из ВХОДА (или стандартного ввода),\n" "записывая их в ВЫХОД (или стандартный вывод).\n" "\n" "Без ключей совпавшие строки объединяются с первым появлением.\n" -"\n" -#: src/uniq.c:148 +#: src/uniq.c:147 msgid "" " -c, --count prefix lines by the number of occurrences\n" " -d, --repeated only print duplicate lines\n" @@ -11909,7 +12252,7 @@ msgstr "" " -c, --count выводить число повторов в начале каждой строки\n" " -d, --repeated выводить только повторяющиеся строки\n" -#: src/uniq.c:152 +#: src/uniq.c:151 msgid "" " -D, --all-repeated[=delimit-method] print all duplicate lines\n" " delimit-method={none(default),prepend,separate}\n" @@ -11932,11 +12275,11 @@ msgstr "" " -z, --zero-terminated строки оканчиваются байтом с 0, а не символом\n" " новой строки\n" -#: src/uniq.c:162 +#: src/uniq.c:161 msgid " -w, --check-chars=N compare no more than N characters in lines\n" msgstr " -w, --check-chars=Н сравнивать первые Н символов строк\n" -#: src/uniq.c:167 +#: src/uniq.c:166 msgid "" "\n" "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n" @@ -11947,7 +12290,7 @@ msgstr "" "и/или TAB), за которой следуют непробельные символы. Сначала пропускаются\n" "поля, потом символы.\n" -#: src/uniq.c:172 +#: src/uniq.c:171 msgid "" "\n" "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n" @@ -11961,24 +12304,24 @@ msgstr "" "«uniq».\n" "Также, при сравнении учитываются правила задаваемые «LC_COLLATE».\n" -#: src/uniq.c:359 +#: src/uniq.c:358 #, c-format msgid "too many repeated lines" msgstr "слишком много повторяющихся строк" -#: src/uniq.c:522 +#: src/uniq.c:521 msgid "invalid number of fields to skip" msgstr "неверное число пропускаемых полей" -#: src/uniq.c:531 +#: src/uniq.c:530 msgid "invalid number of bytes to skip" msgstr "неверное число пропускаемых байт" -#: src/uniq.c:540 +#: src/uniq.c:539 msgid "invalid number of bytes to compare" msgstr "неверное число сравниваемых байт" -#: src/uniq.c:559 +#: src/uniq.c:558 #, c-format msgid "printing all duplicated lines and repeat counts is meaningless" msgstr "печать всех повторяющихся сток и числа повторений бессмысленна" @@ -12033,6 +12376,11 @@ msgstr[0] "%ld день %2d:%02d, " msgstr[1] "%ld дня %2d:%02d, " msgstr[2] "%ld дней %2d:%02d, " +#: src/uptime.c:149 +#, c-format +msgid "up %2d:%02d, " +msgstr "в работе %2d:%02d, " + #: src/uptime.c:151 #, c-format msgid "%lu user" @@ -12136,39 +12484,39 @@ msgstr "" msgid " old " msgstr "давно" -#: src/who.c:449 +#: src/who.c:440 msgid "system boot" msgstr "загрузка системы" -#: src/who.c:456 src/who.c:458 +#: src/who.c:447 src/who.c:449 msgid "id=" msgstr "id=" -#: src/who.c:471 src/who.c:476 +#: src/who.c:462 src/who.c:467 msgid "term=" msgstr "терминал=" -#: src/who.c:473 src/who.c:477 +#: src/who.c:464 src/who.c:468 msgid "exit=" msgstr "выход=" -#: src/who.c:494 +#: src/who.c:485 msgid "LOGIN" msgstr "ВХОД" -#: src/who.c:514 +#: src/who.c:505 msgid "clock change" msgstr "изменение времени" -#: src/who.c:526 src/who.c:527 +#: src/who.c:517 src/who.c:518 msgid "run-level" msgstr "уровень выполнения" -#: src/who.c:530 src/who.c:531 +#: src/who.c:521 src/who.c:522 msgid "last=" msgstr "предыдущий=" -#: src/who.c:562 +#: src/who.c:553 #, c-format msgid "" "\n" @@ -12177,44 +12525,44 @@ msgstr "" "\n" "количество пользователей=%lu\n" -#: src/who.c:568 +#: src/who.c:559 msgid "NAME" msgstr "ИМЯ" -#: src/who.c:568 +#: src/who.c:559 msgid "LINE" msgstr "ЛИНИЯ" -#: src/who.c:568 +#: src/who.c:559 msgid "TIME" msgstr "ВРЕМЯ" -#: src/who.c:568 +#: src/who.c:559 msgid "IDLE" msgstr "НЕАКТИВЕН" -#: src/who.c:569 +#: src/who.c:560 msgid "PID" msgstr "PID" -#: src/who.c:569 +#: src/who.c:560 msgid "COMMENT" msgstr "КОММЕНТАРИЙ" -#: src/who.c:569 +#: src/who.c:560 msgid "EXIT" msgstr "ВЫХОД" -#: src/who.c:649 +#: src/who.c:640 #, c-format msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n" msgstr "Использование: %s [КЛЮЧ]… [ ФАЙЛ | АРГ1 АРГ2]\n" -#: src/who.c:650 +#: src/who.c:641 msgid "Print information about users who are currently logged in.\n" msgstr "Печатать информацию о пользователях, вошедших в систему.\n" -#: src/who.c:653 +#: src/who.c:644 msgid "" "\n" " -a, --all same as -b -d --login -p -r -t -T -u\n" @@ -12228,11 +12576,11 @@ msgstr "" " -d, --dead печатать мертвые процессы\n" " -H, --heading печатать строку с заголовками столбцов\n" -#: src/who.c:660 +#: src/who.c:651 msgid " -l, --login print system login processes\n" msgstr " -l, --login печатать процессы входа в систему\n" -#: src/who.c:663 +#: src/who.c:654 msgid "" " --lookup attempt to canonicalize hostnames via DNS\n" " -m only hostname and user associated with stdin\n" @@ -12243,7 +12591,7 @@ msgstr "" " стандартным вводом\n" " -p, --process печатать активные процессы, которые породил init\n" -#: src/who.c:668 +#: src/who.c:659 msgid "" " -q, --count all login names and number of users logged on\n" " -r, --runlevel print current runlevel\n" @@ -12256,7 +12604,7 @@ msgstr "" "умолчанию)\n" " -t, --time печатать последнее изменение системного времени\n" -#: src/who.c:674 +#: src/who.c:665 msgid "" " -T, -w, --mesg add user's message status as +, - or ?\n" " -u, --users list users logged in\n" @@ -12268,7 +12616,7 @@ msgstr "" " --message эквивалент -T\n" " --writable эквивалент -T\n" -#: src/who.c:682 +#: src/who.c:673 #, c-format msgid "" "\n" @@ -12312,6 +12660,398 @@ msgstr "" "Непрерывно печатает заданную СТРОКУ(и) или, если СТРОКА не задана, то «y».\n" "\n" +#~ msgid "using single-precision arithmetic" +#~ msgstr "используется арифметика с одинарной точностью" + +#~ msgid "using arbitrary-precision arithmetic" +#~ msgstr "используется арифметика с произвольной точностью" + +#~ msgid "" +#~ "simple_strtod_human:\n" +#~ " input string: '%s'\n" +#~ " locale decimal-point: '%s'\n" +#~ msgstr "" +#~ "simple_strtod_human:\n" +#~ " входная строка: «%s»\n" +#~ " дробный разделитель из локали: «%s»\n" + +#~ msgid "" +#~ " parsed numeric value: %Lf\n" +#~ " input precision = %d\n" +#~ msgstr "" +#~ " обработанное числовое значение: %Lf\n" +#~ " входная точность = %d\n" + +#~ msgid " Auto-scaling, found 'i', switching to base %d\n" +#~ msgstr " Автомасштабирование, найдено «i», переход на основание %d\n" + +#~ msgid " suffix power=%d^%d = %Lf\n" +#~ msgstr " индекс степени=%d^%d = %Lf\n" + +#~ msgid " returning value: %Lf (%LG)\n" +#~ msgstr " возвращаемое значение: %Lf (%LG)\n" + +#~ msgid "double_to_human:\n" +#~ msgstr "double_to_human:\n" + +#~ msgid " no scaling, returning (grouped) value: %'.*Lf\n" +#~ msgstr "" +#~ " без масштабирования, возвращается (сгруппированное) значение: %'.*Lf\n" + +#~ msgid " no scaling, returning value: %.*Lf\n" +#~ msgstr " без масштабирования, возвращается значение: %.*Lf\n" + +#~ msgid " scaled value to %Lf * %0.f ^ %d\n" +#~ msgstr " значение смасшабировано к %Lf * %0.f ^ %d\n" + +#~ msgid " after rounding, value=%Lf * %0.f ^ %d\n" +#~ msgstr " значение после округления=%Lf * %0.f ^ %d\n" + +#~ msgid " returning value: '%s'\n" +#~ msgstr " возвращаемое значение: «%s»\n" + +#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n" +#~ msgstr "Использование: %s [КЛЮЧИ] [ЧИСЛО]\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=ЕДИНИЦА автоматически масштабировать входные число к " +#~ "ЕДИНИЦАМ\n" +#~ " изменения. По умолчанию «none». Смотрите ЕДИНИЦЫ " +#~ "далее.\n" +#~ " --from-unit=N задать размер единицы измерения входных данных\n" +#~ " (вместо значения по умолчанию 1).\n" +#~ " --to=ЕДИНИЦА автомасштабирование выходные значения к ЕДИНИЦЕ " +#~ "изменения.\n" +#~ " Смотрите ЕДИНИЦЫ далее.\n" +#~ " --to-unit=N размер единицы измерения выходных данных\n" +#~ " (вместо значения по умолчанию 1).\n" +#~ " --round=МЕТОД метод округления, используемый при масштабировании.\n" +#~ " Значение МЕТОДА: up, down, from-zero (по умолчанию),\n" +#~ " towards-zero, nearest\n" +#~ " --suffix=СУФФИКС добавлять СУФФИКС к выходным значениям и учитывать\n" +#~ " необязательный СУФФИКС у входных значений.\n" +#~ " --padding=N дополнять результат до N символов.\n" +#~ " Если N положительно, то выполняется выравнивание по " +#~ "правому\n" +#~ " краю. Если N отрицательно, то по левому. Замечание: " +#~ "если результат шире N, то дополнение не " +#~ "производится.\n" +#~ " По умолчанию дополнение выполняется, если " +#~ "обнаруживается\n" +#~ " пробельный символ.\n" +#~ " --grouping группировать цифры (например 1,000,000).\n" +#~ " Группировка выполняется согласно локали (т. е. " +#~ "отсутствует\n" +#~ " в локалях C/POSIX).\n" +#~ " --header[=N] выводить (без преобразования) первые N строк.\n" +#~ " Если N не задано, то значение равно 1.\n" +#~ " --field N заменять число в входном поле N (по умолчанию 1)\n" +#~ " -d, --delimiter=X использовать X вместо пробела как разделитель полей\n" +#~ " --format=ФОРМАТ использовать ФОРМАТ плавающей точки в стиле printf.\n" +#~ " Подробности смотрите в разделе ФОРМАТ далее.\n" +#~ " --invalid=РЕЖИМ режим отказа для неправильных чисел. Значение " +#~ "РЕЖИМА:\n" +#~ " abort (по умолчанию), fail, warn, ignore.\n" +#~ " --debug показывать предупреждения при некорректных входных " +#~ "данных.\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" +#~ "ЕДИНИЦЫ:\n" +#~ " none Отключить масштабирование. Суффиксы приводят к ошибке.\n" +#~ " auto Учесть необязательный одно/двух буквенный суффикс:\n" +#~ " 1K = 1000\n" +#~ " 1Ki = 1024\n" +#~ " 1M = 1000000\n" +#~ " 1Mi = 1048576\n" +#~ " si Учесть необязательный однобуквенный суффикс:\n" +#~ " 1K = 1000\n" +#~ " 1M = 1000000\n" +#~ " ...\n" +#~ " iec Учесть необязательный однобуквенный суффикс:\n" +#~ " 1K = 1024\n" +#~ " 1M = 1048576\n" +#~ " ...\n" +#~ " iec-i Учесть необязательный двухбуквенный суффикс:\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 "" +#~ "формат строки:\n" +#~ " входная: %s\n" +#~ " группировка: %s\n" +#~ " дополнение по ширине: %ld\n" +#~ " выравнивание: %s\n" +#~ " префикс: «%s»\n" +#~ " суффикс: «%s»\n" + +#~ msgid "" +#~ "formatting output:\n" +#~ " value: %Lf\n" +#~ " humanized: '%s'\n" +#~ msgstr "" +#~ "отформатированный вывод:\n" +#~ " значение: %Lf\n" +#~ " в человечном виде: «%s»\n" + +#~ msgid " After padding: '%s'\n" +#~ msgstr " После дополнения: «%s»\n" + +#~ msgid "trimming suffix '%s'\n" +#~ msgstr "обрезается суффикс «%s»\n" + +#~ msgid "no valid suffix found\n" +#~ msgstr "корректный суффикс не найден\n" + +#~ msgid "setting Auto-Padding to %ld characters\n" +#~ msgstr "устанавливается Auto-Padding до %ld символов\n" + +#~ msgid "" +#~ "extracting Fields:\n" +#~ " input: '%s'\n" +#~ " field: %d\n" +#~ msgstr "" +#~ "извлечённые поля:\n" +#~ " ввод: «%s»\n" +#~ " поле: %d\n" + +#~ msgid "" +#~ " TOO FEW FIELDS!\n" +#~ " prefix: '%s'\n" +#~ msgstr "" +#~ " МАЛО ПОЛЕЙ!\n" +#~ " префикс: «%s»\n" + +#~ msgid "" +#~ " prefix: '%s'\n" +#~ " number: '%s'\n" +#~ " suffix: '%s'\n" +#~ msgstr "" +#~ " префикс: «%s»\n" +#~ " число: «%s»\n" +#~ " суффикс: «%s»\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 "" +#~ " -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 пропускать каталоги на других файловых " +#~ "системах\n" +#~ " -X, --exclude-from=ФАЙЛ исключать файлы, совпадающие с каким-либо\n" +#~ " образцом из ФАЙЛА\n" +#~ " --exclude=ОБРАЗЕЦ исключать файлы, соответствующие ОБРАЗЦУ\n" +#~ " -d, --max-depth=N выводить итог для каталога (или файла,\n" +#~ " если --all), только если он на N или меньше " +#~ "уровней\n" +#~ " ниже, чем аргумент командной строки; --max-" +#~ "depth=0\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 никогда не создавать резервных копий (даже если\n" +#~ " указан ключ --backup)\n" +#~ " numbered, t создавать нумерованные копии\n" +#~ " existing, nil если существуют нумерованные копии, то создавать\n" +#~ " нумерованные иначе создавать простые\n" +#~ " simple. never всегда создавать простые копии\n" +#~ "\n" + +#~ msgid "" +#~ "WARNING: --page-increment is deprecated; use --line-increment instead" +#~ msgstr "" +#~ "ПРЕДУПРЕЖДЕНИЕ: ключ --page-increment устарел, используйте вместо него --" +#~ "line-increment" + +#~ msgid "All arguments to long options are mandatory for short options.\n" +#~ msgstr "Все аргументы для длинных ключей обязательны для коротких.\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" +#~ "ОСНОВАНИЕ может быть d (десятичным), o (восьмеричным), x " +#~ "(шестнадцатеричным)\n" +#~ "или n (не выводить смещения). Н с префиксом 0x или 0X воспринимается как\n" +#~ "шестнадцатеричное и может иметь умножающий суффикс:\n" +#~ "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" +#~ "Если добавить к любому формату суффикс z, то в конце\n" +#~ "каждой строки будут выводиться печатные символы.\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 без числа подразумевает 3; --width без числа подразумевает\n" +#~ "32. По умолчанию 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 "невозможно установить групповой id" + +#~ msgid "cannot set user id" +#~ msgstr "невозможно установить пользовательский id" + +#~ 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 "" +#~ "Устанавливает эффективные идентификаторы пользователя и группы как у " +#~ "ПОЛЬЗОВАТЕЛЯ.\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. Если ПОЛЬЗОВАТЕЛЬ не задан,\n" +#~ "подразумевается root.\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" + #~ msgid "" #~ "\n" #~ "Examples:\n" @@ -12512,9 +13252,6 @@ msgstr "" #~ msgid "invalid number of lines: 0" #~ msgstr "неверное число строк: 0" -#~ msgid "invalid format width" -#~ msgstr "неверная ширина в формате" - #~ msgid "invalid format precision" #~ msgstr "неверная точность в формате" diff --git a/po/sk.gmo b/po/sk.gmo index 364eeef6..c3e5a825 100644 Binary files a/po/sk.gmo and b/po/sk.gmo differ diff --git a/po/sk.po b/po/sk.po index 37d71c45..94842fcb 100644 --- a/po/sk.po +++ b/po/sk.po @@ -2,15 +2,15 @@ # Copyright (C) 1996 Free Software Foundation, Inc. # This file is distributed under the same license as the coreutils package. # Miroslav Vasko <vasko@debian.cz>, 1999. -# Ivan Masár <helix84@centrum.sk>, 2007, 2008. # Ján Ondrej <ondrejj(at)salstar.sk>, 2008. +# Ivan Masár <helix84@centrum.sk>, 2007, 2008, 2012. # msgid "" msgstr "" -"Project-Id-Version: coreutils 7.0\n" +"Project-Id-Version: coreutils 8.18-pre1\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2012-05-10 19:35+0200\n" -"PO-Revision-Date: 2008-12-23 14:58+0100\n" +"POT-Creation-Date: 2013-02-14 15:56+0000\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" "Language: sk\n" @@ -37,19 +37,19 @@ msgstr "Platné argumenty sú:" msgid "error closing file" msgstr "chyba pri zatváraní súboru" -#: lib/closeout.c:112 src/base64.c:109 src/base64.c:121 src/base64.c:127 -#: src/base64.c:168 src/base64.c:224 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:330 src/expand.c:355 src/head.c:298 -#: src/head.c:348 src/head.c:756 src/head.c:797 src/mktemp.c:350 src/od.c:919 -#: src/paste.c:160 src/shuf.c:369 src/split.c:727 src/split.c:964 -#: src/split.c:969 src/tail.c:350 src/tail.c:1201 src/tail.c:1307 +#: 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 -#: src/unexpand.c:427 src/unexpand.c:443 +#: 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:1160 src/copy.c:2602 +#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617 #, c-format msgid "preserving permissions for %s" msgstr "zachovávajú sa práva %s" @@ -241,18 +241,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:483 +#: lib/mkdir-p.c:196 src/install.c:484 #, 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:2261 src/install.c:709 src/install.c:722 +#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722 #, 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:915 src/tac.c:435 +#: src/split.c:929 src/tac.c:434 #, c-format msgid "memory exhausted" msgstr "vyčerpaná pamäť" @@ -301,75 +301,75 @@ msgstr "'" msgid "%s: end of file" msgstr "%s: koniec súboru" -#: lib/regcomp.c:130 +#: lib/regcomp.c:131 msgid "Success" msgstr "Úspešné" -#: lib/regcomp.c:133 +#: lib/regcomp.c:134 msgid "No match" msgstr "Bez zhody" -#: lib/regcomp.c:136 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "Neplatný regulárny výraz" -#: lib/regcomp.c:139 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "Neplatný znak kolacionovania" -#: lib/regcomp.c:142 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "Neplatný názov triedy znaku" -#: lib/regcomp.c:145 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "Lomka na konci" -#: lib/regcomp.c:148 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "Neplatná spätná referencia" -#: lib/regcomp.c:151 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "[ alebo [^ bez náprotivku" -#: lib/regcomp.c:154 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "( alebo \\( bez náprotivku" -#: lib/regcomp.c:157 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "\\{ bez náprotivku" -#: lib/regcomp.c:160 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "Neplatný obsah \\{\\}" -#: lib/regcomp.c:163 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "Neplatné ukončenie rozsahu" -#: lib/regcomp.c:166 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Pamäť bola vyčerpaná" -#: lib/regcomp.c:169 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "Neplatný predchádzajúci regulárny výraz" -#: lib/regcomp.c:172 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "Predčasný koniec regulárneho výrazu" -#: lib/regcomp.c:175 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "Tegulárny výraz je príliš veľký" -#: lib/regcomp.c:178 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr ") alebo \\) bez náprotivku" -#: lib/regcomp.c:703 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "Žiaden predošlý regulárny výraz" @@ -408,42 +408,42 @@ msgstr "^[yYaAáÁ]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-mode-acl.c:695 src/copy.c:2284 src/cp.c:518 +#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516 #, c-format msgid "setting permissions for %s" msgstr "nastavujú sa práva %s" #: lib/siglist.h:31 msgid "Hangup" -msgstr "" +msgstr "Zavesiť" #: lib/siglist.h:34 msgid "Interrupt" -msgstr "" +msgstr "Prerušiť" #: lib/siglist.h:37 msgid "Quit" -msgstr "" +msgstr "Ukončiť" #: lib/siglist.h:40 msgid "Illegal instruction" -msgstr "" +msgstr "Neplatná inštrukcia" #: lib/siglist.h:43 msgid "Trace/breakpoint trap" -msgstr "" +msgstr "Zastavenie trasovania/breakpoint" #: lib/siglist.h:46 msgid "Aborted" -msgstr "" +msgstr "Zrušený" #: lib/siglist.h:49 msgid "Floating point exception" -msgstr "" +msgstr "Výnimka pohyblivej desatinnej čiarky" #: lib/siglist.h:52 msgid "Killed" -msgstr "" +msgstr "Zabitý" #: lib/siglist.h:55 #, fuzzy @@ -452,31 +452,31 @@ msgstr "Systémová chyba" #: lib/siglist.h:58 msgid "Segmentation fault" -msgstr "" +msgstr "Chyba segmentácie" #: lib/siglist.h:61 msgid "Broken pipe" -msgstr "" +msgstr "Prerušená rúra" #: lib/siglist.h:64 msgid "Alarm clock" -msgstr "" +msgstr "Budík" #: lib/siglist.h:67 msgid "Terminated" -msgstr "" +msgstr "Ukončený" #: lib/siglist.h:70 msgid "Urgent I/O condition" -msgstr "" +msgstr "Naliehavý stav V/V" #: lib/siglist.h:73 msgid "Stopped (signal)" -msgstr "" +msgstr "Zastavený (signál)" #: lib/siglist.h:76 msgid "Stopped" -msgstr "" +msgstr "Zastavený" #: lib/siglist.h:79 #, fuzzy @@ -485,35 +485,35 @@ msgstr "pokračovať? " #: lib/siglist.h:82 msgid "Child exited" -msgstr "" +msgstr "Potomok skončil" #: lib/siglist.h:85 msgid "Stopped (tty input)" -msgstr "" +msgstr "Zastavený (vstup tty)" #: lib/siglist.h:88 msgid "Stopped (tty output)" -msgstr "" +msgstr "Zastavený (výstup tty)" #: lib/siglist.h:91 msgid "I/O possible" -msgstr "" +msgstr "V/V možný" #: lib/siglist.h:94 msgid "CPU time limit exceeded" -msgstr "" +msgstr "Prekročený časový limit CPU" #: lib/siglist.h:97 msgid "File size limit exceeded" -msgstr "" +msgstr "Prekročený limit veľkosti súboru" #: lib/siglist.h:100 msgid "Virtual timer expired" -msgstr "" +msgstr "Vypršal virtuálny časovač" #: lib/siglist.h:103 msgid "Profiling timer expired" -msgstr "" +msgstr "Vypršal profilovací časovač" #: lib/siglist.h:106 #, fuzzy @@ -532,7 +532,7 @@ msgstr "%s: neplatný signál" #: lib/siglist.h:117 msgid "EMT trap" -msgstr "" +msgstr "Zastavenie EMT" #: lib/siglist.h:120 #, fuzzy @@ -541,11 +541,11 @@ msgstr "veľkosť bloku" #: lib/siglist.h:123 msgid "Stack fault" -msgstr "" +msgstr "Chyba zásobnáka" #: lib/siglist.h:126 msgid "Information request" -msgstr "" +msgstr "Žiadosť o informácie" #: lib/siglist.h:128 #, fuzzy @@ -554,15 +554,15 @@ msgstr "zlyhalo otvorenie" #: lib/siglist.h:131 msgid "Resource lost" -msgstr "" +msgstr "Zdroj stratený" -#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262 -#: lib/spawn-pipe.c:265 +#: 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:232 lib/spawn-pipe.c:346 lib/wait-process.c:282 +#: 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" @@ -576,26 +576,26 @@ msgstr "chybné číslo položky: `%s'" #: lib/strsignal.c:118 #, c-format msgid "Unknown signal %d" -msgstr "" +msgstr "Neznámy signál %d" -#: lib/unicodeio.c:103 +#: lib/unicodeio.c:102 msgid "iconv function not usable" msgstr "funkcia iconv nie je použiteľná" -#: lib/unicodeio.c:105 +#: lib/unicodeio.c:104 msgid "iconv function not available" msgstr "funkcia iconv nie je dostupná" -#: lib/unicodeio.c:112 +#: lib/unicodeio.c:111 msgid "character out of range" msgstr "znak je mimo rozsahu" -#: lib/unicodeio.c:182 +#: lib/unicodeio.c:181 #, c-format msgid "cannot convert U+%04X to local character set" msgstr "nie je možné konvertovať U+%04X do lokálnej znakovej sady" -#: lib/unicodeio.c:184 +#: lib/unicodeio.c:183 #, c-format msgid "cannot convert U+%04X to local character set: %s" msgstr "nie je možné konvertovať U+%04X do lokálnej znakovej sady: %s" @@ -615,17 +615,17 @@ msgstr "neplatná špec." #: lib/verror.c:73 #, c-format msgid "unable to display error message" -msgstr "" +msgstr "nie je možné zobraziť chybovú správu" #: lib/version-etc.c:74 #, c-format msgid "Packaged by %s (%s)\n" -msgstr "" +msgstr "Balík vytvoril %s (%s)\n" #: lib/version-etc.c:77 #, c-format msgid "Packaged by %s\n" -msgstr "" +msgstr "Balík vytvoril %s\n" #. TRANSLATORS: Translate "(C)" to the copyright symbol #. (C-in-a-circle), if this symbol is available in the user's @@ -779,19 +779,20 @@ msgstr "" "\n" "Chyby v programe oznamujte tu: <%s>.\n" -#: lib/version-etc.c:251 src/system.h:562 +#: lib/version-etc.c:251 src/system.h:573 #, c-format msgid "%s home page: <%s>\n" -msgstr "" +msgstr "Domovská stránka %s: <%s>\n" #: lib/version-etc.c:253 #, c-format msgid "%s home page: <http://www.gnu.org/software/%s/>\n" -msgstr "" +msgstr "Domovská stránka %s: <http://www.gnu.org/software/%s/>\n" -#: lib/version-etc.c:256 src/system.h:563 +#: lib/version-etc.c:256 src/system.h:574 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 @@ -801,29 +802,29 @@ msgstr "zlyhalo otvorenie" #: lib/w32spawn.h:84 #, c-format msgid "cannot restore fd %d: dup2 failed" -msgstr "" +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 "" +msgstr "podproces %s" #: lib/wait-process.c:274 lib/wait-process.c:346 #, c-format msgid "%s subprocess got fatal signal %d" -msgstr "" +msgstr "podproces %s dostal kritický signál %d" #: lib/xfreopen.c:35 msgid "stdin" -msgstr "" +msgstr "št. vstup" #: lib/xfreopen.c:36 msgid "stdout" -msgstr "" +msgstr "št. výstup" #: lib/xfreopen.c:37 msgid "stderr" -msgstr "" +msgstr "št. chybový výstup" #: lib/xfreopen.c:38 #, fuzzy @@ -876,18 +877,17 @@ msgid "Simon Josefsson" msgstr "Simon Josefsson" #: src/base64.c:60 -#, c-format +#, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" "Base64 encode or decode FILE, or standard input, to standard output.\n" -"\n" msgstr "" "Použitie: %s [VOĽBA] [SÚBOR]\n" "Base64 zakódovanie alebo dekódovanie SÚBORu alebo štand. vstupu na štand. " "výstup.\n" "\n" -#: src/base64.c:64 +#: src/base64.c:67 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -896,8 +896,14 @@ msgid "" " Use 0 to disable line wrapping\n" "\n" msgstr "" +" -d, --decode dekódovať dáta\n" +" -i, --ignore-garbage počas dekódovania ignorovať neabecedné znaky\n" +" -w, --wrap=STĹP zalomiť nekódované riadky po STĹP znakoch " +"(predvolene 76).\n" +" Použite 0 na zamedzenie zalamovania riadkov\n" +"\n" -#: src/base64.c:73 src/cat.c:110 src/fmt.c:293 src/shuf.c:71 src/sum.c:70 +#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -905,7 +911,7 @@ msgstr "" "\n" "Bez SÚBORu alebo keď SÚBOR je - číta zo štand. vstupu.\n" -#: src/base64.c:76 +#: src/base64.c:79 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -920,37 +926,37 @@ msgstr "" "pokus o zotavenie v prípade výskytu iných nealfabetických znakov\n" "v kódovanom toku.\n" -#: src/base64.c:171 src/base64.c:208 src/csplit.c:263 src/csplit.c:1435 -#: src/join.c:451 src/shuf.c:157 src/shuf.c:361 src/tac-pipe.c:74 +#: 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 #, c-format msgid "read error" msgstr "chyba pri čítaní" -#: src/base64.c:227 +#: src/base64.c:230 #, c-format msgid "invalid input" msgstr "neplatný vstup" -#: src/base64.c:264 +#: src/base64.c:267 #, c-format msgid "invalid wrap size: %s" msgstr "neplatná veľkosť zalamovania: %s" -#: src/base64.c:283 src/basename.c:173 src/comm.c:435 src/cp.c:607 -#: src/date.c:441 src/dircolors.c:447 src/du.c:894 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:169 src/install.c:929 src/join.c:961 -#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:157 src/mv.c:447 -#: src/od.c:1802 src/ptx.c:2081 src/readlink.c:154 src/seq.c:408 -#: src/shuf.c:320 src/shuf.c:339 src/sort.c:4477 src/split.c:1313 -#: src/tr.c:1797 src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:454 -#: src/uniq.c:471 src/unlink.c:81 src/uptime.c:250 src/users.c:146 -#: src/wc.c:666 src/who.c:836 src/whoami.c:79 +#: 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 #, c-format msgid "extra operand %s" msgstr "nadbytočný operand %s" -#: src/base64.c:315 src/cat.c:781 +#: src/base64.c:318 src/cat.c:781 #, c-format msgid "closing standard input" msgstr "zatvára sa štandardný vstup" @@ -958,15 +964,15 @@ 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/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:53 src/env.c:33 +#: 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/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:65 src/su.c:88 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 +#: 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 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -980,23 +986,27 @@ msgstr "" " alebo: %s [VOĽBA]\n" #: src/basename.c:53 +#, fuzzy msgid "" "Print NAME with any leading directory components removed.\n" "If specified, also remove a trailing SUFFIX.\n" -"\n" msgstr "" "Vypísať NÁZOV bez adresárov vedúcich k nemu.\n" "Odstrániť aj PRÍPONU, pokiaľ bola zadaná.\n" "\n" -#: src/basename.c:59 +#: 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" msgstr "" +" -a, --multiple zapne podporu viacerých argumentov a považuje každý " +"za NÁZOV\n" +" -s, --suffix=PRÍPONA odstráni PRÍPONU na konci\n" +" -z, --zero oddeľuje výstup znakom NUL namiesto nového riadka\n" -#: src/basename.c:66 +#: src/basename.c:67 #, c-format msgid "" "\n" @@ -1006,21 +1016,28 @@ msgid "" " %s -s .h include/stdio.h -> \"stdio\"\n" " %s -a any/str1 any/str2 -> \"str1\" followed by \"str2\"\n" msgstr "" +"\n" +"Príklady:\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” a následne „str2”\n" -#: src/basename.c:167 src/chcon.c:531 src/chgrp.c:277 src/chmod.c:526 -#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1369 +#: 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:183 src/mkfifo.c:108 src/mknod.c:146 src/nohup.c:111 -#: src/pathchk.c:148 src/printf.c:674 src/readlink.c:146 src/realpath.c:236 -#: src/rm.c:314 src/rmdir.c:223 src/seq.c:402 src/setuidgid.c:137 -#: src/sleep.c:119 src/stat.c:1476 src/stdbuf.c:346 src/tr.c:1782 +#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 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 #, 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:52 src/split.c:49 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/split.c:49 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" @@ -1030,8 +1047,8 @@ msgstr "Torbjorn Granlund" msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:846 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4720 src/nl.c:182 src/paste.c:435 src/pr.c:2768 src/sum.c:58 +#: 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/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 +1105,7 @@ msgstr "" msgid "cannot do ioctl on %s" msgstr "nie je možné vykonať ioctl na %s" -#: src/cat.c:637 src/dd.c:2209 src/sort.c:379 src/tee.c:165 src/yes.c:86 +#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86 #, c-format msgid "standard output" msgstr "štandardný výstup" @@ -1105,14 +1122,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:55 src/head.c:46 src/hostid.c:33 +#: 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 msgid "Jim Meyering" msgstr "Jim Meyering" -#: src/chcon.c:100 src/runcon.c:203 src/runcon.c:234 +#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238 #, c-format msgid "failed to create security context: %s" msgstr "nie je možné vytvoriť bezpečnostný kontext: %s" @@ -1122,8 +1139,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:540 src/copy.c:2222 src/runcon.c:217 -#: src/stat.c:683 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221 +#: src/stat.c:702 #, c-format msgid "failed to get security context of %s" msgstr "nepodarilo sa získať bezpečnostný kontext %s" @@ -1139,12 +1156,12 @@ 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:446 src/ls.c:2981 +#: src/du.c:457 src/ls.c:2981 #, 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:426 +#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437 #, c-format msgid "cannot read directory %s" msgstr "nie je možné načítať adresár %s" @@ -1154,13 +1171,13 @@ 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:599 +#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562 #, 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:618 -#: src/remove.c:613 +#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642 +#: src/remove.c:576 #, fuzzy, c-format msgid "fts_close failed" msgstr "zlyhalo zatvorenie súboru" @@ -1172,7 +1189,7 @@ msgid "" " or: %s [OPTION]... [-u USER] [-r ROLE] [-l RANGE] [-t TYPE] FILE...\n" " or: %s [OPTION]... --reference=RFILE FILE...\n" msgstr "" -"Použitie: %s [VOĽBA]... KOTEXT SÚBOR\n" +"Použitie: %s [VOĽBA]... KONTEXT SÚBOR\n" " alebo: %s [VOĽBA]... [-u POUŽ] [-r ROLA] [-l ROZSAH] [-t TYP] SÚBOR...\n" " alebo: %s [VOĽBA]... --reference=RSÚBOR SÚBOR...\n" @@ -1182,26 +1199,34 @@ msgid "" "Change the security context of each FILE to CONTEXT.\n" "With --reference, change the security context of each FILE to that of " "RFILE.\n" -"\n" msgstr "" "Zmeniť bezpečnostný kontext každého SÚBORu na KONTEXT.\n" -"S parametrom --reference sa zmení bezpečnostný kontext každého\n" -"SÚBORU na rovnaký ako má RSÚBOR.\n" +"S parametrom --reference zmení bezpečnostný kontext každého SÚBORU\n" +"na rovnaký ako má RSÚBOR.\n" "\n" " -c, --changes ako verbose, ale oznamovať iba keď sa vykoná zmena\n" " -h, --no-dereference ovplyvňuje referenta každého symbolického odkazu\n" " (toto je štandardné správanie) namiesto samotného\n" " symbolického odkazu\n" -#: src/chcon.c:362 src/chgrp.c:123 src/chown.c:94 +#: 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 "" +"Zmeniť bezpečnostný kontext každého SÚBORu na KONTEXT.\n" +"S parametrom --reference sa zmení bezpečnostný kontext každého\n" +"SÚBORU na rovnaký ako má RSÚBOR.\n" +"\n" +" -c, --changes ako verbose, ale oznamovať iba keď sa vykoná zmena\n" +" -h, --no-dereference ovplyvňuje referenta každého symbolického odkazu\n" +" (toto je štandardné správanie) namiesto samotného\n" +" symbolického odkazu\n" -#: src/chcon.c:367 +#: src/chcon.c:369 #, fuzzy msgid "" " -u, --user=USER set user USER in the target security context\n" @@ -1218,28 +1243,34 @@ msgstr "" "kontexte\n" "\n" -#: src/chcon.c:373 -#, fuzzy +#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 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 nezaobchádzať „/“ špeciálne (predvolené)\n" +" --preserve-root zabrániť rekurzívnemu prechádzaniu od „/“\n" + +#: src/chcon.c:379 msgid "" " --reference=RFILE use RFILE's security context rather than " "specifying\n" " a CONTEXT value\n" msgstr "" -" --reference=RSÚBOR použiť bezpečnostný kontext RSÚBORU namiesto " +" --reference=RSÚBOR použije bezpečnostný kontext RSÚBORU namiesto " "zadania\n" " hodnoty KONTEXT\n" -" -R, --recursive rekurzívne vykonávať na adresároch súboroch\n" -" -v, --verbose vypísať diagnostiku každého spracovaného súboru\n" -#: src/chcon.c:377 src/chgrp.c:140 src/chown.c:118 +#: 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 rekurzívne prechádzať adresármi a súbormi\n" -#: src/chcon.c:380 +#: src/chcon.c:386 msgid " -v, --verbose output a diagnostic for every file processed\n" msgstr "" +" -v, --verbose vypíše diagnostiku pri každom spracovanom súbore\n" -#: src/chcon.c:383 src/chgrp.c:143 src/chown.c:121 +#: src/chcon.c:389 src/chgrp.c:143 src/chown.c:121 #, fuzzy msgid "" "\n" @@ -1264,36 +1295,36 @@ msgstr "" " -P neprechádzať žiadne symbolické odkazy (štandardne)\n" "\n" -#: src/chcon.c:512 src/chgrp.c:264 src/chown.c:267 +#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267 #, c-format msgid "-R --dereference requires either -H or -L" msgstr "-R --dereference vyžaduje buď -H alebo -L" -#: src/chcon.c:518 +#: src/chcon.c:524 #, c-format msgid "-R -h requires -P" msgstr "-R -h vyžaduje -P" -#: src/chcon.c:533 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282 -#: src/comm.c:429 src/csplit.c:1371 src/join.c:1149 src/link.c:79 -#: src/mknod.c:148 src/setuidgid.c:139 src/tr.c:1785 +#: 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 #, c-format msgid "missing operand after %s" msgstr "chýba operand po %s" -#: src/chcon.c:556 src/runcon.c:247 +#: src/chcon.c:562 src/runcon.c:251 #, c-format msgid "invalid context: %s" msgstr "neplatný kontexxt: %s" -#: src/chcon.c:563 +#: src/chcon.c:569 #, c-format msgid "conflicting security context specifiers given" msgstr "boli zadané konflitné špecifikátory kontextu" -#: src/chcon.c:572 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:433 src/cp.c:493 -#: src/mv.c:96 src/pwd.c:273 src/rm.c:324 src/touch.c:351 +#: 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 #, c-format msgid "failed to get attributes of %s" msgstr "nepodarilo sa zistiť atribúty %s" @@ -1313,20 +1344,14 @@ msgstr "" " alebo: %s [PREPÍNAČ]... --reference=RSÚBOR SÚBOR...\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 "" -"Zmeniť bezpečnostný kontext každého SÚBORu na KONTEXT.\n" -"S parametrom --reference sa zmení bezpečnostný kontext každého\n" -"SÚBORU na rovnaký ako má RSÚBOR.\n" +"Zmaniť skupinu každého SÚBORU na SKUPINU.\n" +"S parametrom --reference zmení skupinu každého súboru na skupinu RSÚBORu.\n" "\n" -" -c, --changes ako verbose, ale oznamovať iba keď sa vykoná zmena\n" -" -h, --no-dereference ovplyvňuje referenta každého symbolického odkazu\n" -" (toto je štandardné správanie) namiesto samotného\n" -" symbolického odkazu\n" #: src/chgrp.c:118 src/chmod.c:382 src/chown.c:89 msgid "" @@ -1334,34 +1359,25 @@ msgid "" " -f, --silent, --quiet suppress most error messages\n" " -v, --verbose output a diagnostic for every file processed\n" msgstr "" +" -c, --changes ako verbose, ale hlási iba v prípade zmien\n" +" -f, --silent, --quiet potlačí väčšinu chybových správ\n" +" -v, --verbose vypíše diagnostiku pri každom spracovanom súbore\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 "" -" -h, --no-dereference má vplyv na každý symbolický odkaz, nie len na\n" -" súbory, na ktoré sa odkazuje (to je užitičné iba " -"na\n" -" systémoch, ktoré môžu zmeniť vlastníctvo " -"symbolického\n" -" odkazu)\n" - -#: src/chgrp.c:132 src/chmod.c:387 src/chown.c:110 -#, fuzzy -msgid "" -" --no-preserve-root do not treat '/' specially (the default)\n" -" --preserve-root fail to operate recursively on '/'\n" -msgstr "" -" --no-preserve-root nezaobchádzať s „/“ špeciálne (štandardné)\n" -" --preserve-root zabrániť rekurzívnemu prechádzaniu od „/“\n" +" (užitočné iba na systémoch, ktoré môžu zmeniť \n" +" vlastníctvo symbolického odkazu)\n" #: src/chgrp.c:136 msgid "" " --reference=RFILE use RFILE's group rather than specifying a\n" " GROUP value\n" msgstr "" +" --reference=RFILE použiť skupinu súboru RSÚBOR namiesto\n" +" zadania hodnoty SKUPINA\n" #: src/chgrp.c:158 #, c-format @@ -1387,14 +1403,14 @@ 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 -#, fuzzy, c-format +#, c-format msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n" -msgstr "práva súboru %s boli zmenené na %04lo (%s)\n" +msgstr "režim súboru %s sa zmenil z %04lo (%s) na %04lo (%s)\n" #: src/chmod.c:166 -#, fuzzy, c-format +#, c-format msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n" -msgstr "zmena práv súboru %s na %04lo (%s) zlyhala\n" +msgstr "zmena režimu súboru %s z %04lo (%s) na %04lo (%s)\n" #: src/chmod.c:169 #, c-format @@ -1428,20 +1444,14 @@ msgstr "" " or: %s [VOĽBA]... --reference=RSÚBOR SÚBOR...\n" #: src/chmod.c:377 -#, fuzzy 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 "" -"Zmeniť bezpečnostný kontext každého SÚBORu na KONTEXT.\n" -"S parametrom --reference sa zmení bezpečnostný kontext každého\n" -"SÚBORU na rovnaký ako má RSÚBOR.\n" +"Zmeniť režim každého SÚBORU na REŽIM.\n" +"S parametrom --reference zmení skupinu každého súboru na skupinu RSÚBORu.\n" "\n" -" -c, --changes ako verbose, ale oznamovať iba keď sa vykoná zmena\n" -" -h, --no-dereference ovplyvňuje referenta každého symbolického odkazu\n" -" (toto je štandardné správanie) namiesto samotného\n" -" symbolického odkazu\n" #: src/chmod.c:391 msgid " --reference=RFILE use RFILE's mode instead of MODE values\n" @@ -1449,16 +1459,15 @@ msgstr "" #: src/chmod.c:394 msgid " -R, --recursive change files and directories recursively\n" -msgstr "" +msgstr " -R, --recursive rekurzívne prechádzať adresármi a súbormi\n" #: src/chmod.c:399 -#, fuzzy msgid "" "\n" "Each MODE is of the form '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n" msgstr "" "\n" -"každý REŽIM je v tvare „[ugoa]*([-+=]([rwxXst]*|[ugo]))+“.\n" +"každý REŽIM je v tvare „[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+“.\n" #: src/chmod.c:513 #, c-format @@ -1471,14 +1480,14 @@ msgid "invalid mode: %s" msgstr "neplatný režim: %s" #: src/chown-core.c:158 -#, fuzzy, c-format +#, c-format msgid "changed ownership of %s from %s to %s\n" -msgstr "vlastníka %s zmenený na %s\n" +msgstr "vlastník %s zmenený z %s na %s\n" #: src/chown-core.c:159 -#, fuzzy, c-format +#, c-format msgid "changed group of %s from %s to %s\n" -msgstr "skupina %s zmenená na %s\n" +msgstr "skupina %s zmenená z %s na %s\n" #: src/chown-core.c:160 #, c-format @@ -1486,14 +1495,14 @@ msgid "no change to ownership of %s\n" msgstr "vlastníctvo %s zostalo nezmenené\n" #: src/chown-core.c:165 -#, fuzzy, c-format +#, c-format msgid "failed to change ownership of %s from %s to %s\n" -msgstr "nepodarilo sa zmeniť práva %s na %s\n" +msgstr "nepodarilo sa zmeniť vlastníctvo %s z %s na %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 "zmena skupiny %s na %s zlyhala\n" +msgstr "nepodarilo sa zmeniť skupinu %s z %s na %s\n" #: src/chown-core.c:167 src/chown-core.c:173 #, c-format @@ -1538,7 +1547,7 @@ msgstr "mením vlastníctvo %s" #: src/chown-core.c:468 #, c-format msgid "changing group of %s" -msgstr "mená sa skupina %s" +msgstr "mení sa skupina %s" #: src/chown.c:79 #, c-format @@ -1556,6 +1565,9 @@ msgid "" "RFILE.\n" "\n" msgstr "" +"Zmeniť skupinu alebo vlastníka každého SÚBORu na SKUP alebo VLAST.\n" +"S parametrom --reference zmení skupinu každého súboru na skupinu RSÚBORu.\n" +"\n" #: src/chown.c:103 msgid "" @@ -1602,15 +1614,15 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:97 src/install.c:575 src/setuidgid.c:110 src/setuidgid.c:120 +#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120 #, c-format msgid "invalid group %s" msgstr "neplatná skupina %s" #: src/chroot.c:109 -#, fuzzy, c-format +#, c-format msgid "invalid group list %s" -msgstr "neplatná skupina %s" +msgstr "neplatný zoznam skupín %s" #: src/chroot.c:117 #, fuzzy, c-format @@ -1664,8 +1676,8 @@ msgstr "nepodarilo sa nastaviť novú rolu %s" 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:213 src/stdbuf.c:366 -#: src/timeout.c:402 +#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365 +#: src/timeout.c:454 #, fuzzy, c-format msgid "failed to run command %s" msgstr "nie je možné vykonať príkaz %s" @@ -1785,20 +1797,24 @@ msgstr "uvedených viacero oddeľovačov" msgid "empty %s not allowed" msgstr "" -#: src/copy.c:168 src/dd.c:1609 src/dd.c:1976 +#: 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 #, c-format -msgid "reading %s" -msgstr "číta sa %s" +msgid "error reading %s" +msgstr "chyba pri čítaní %s" -#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:426 +#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425 #, c-format msgid "cannot lseek %s" msgstr "nie je možné vykonať lseek %s" -#: src/copy.c:206 src/dd.c:2039 src/dd.c:2102 +#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151 #, c-format -msgid "writing %s" -msgstr "zapisuje sa %s" +msgid "error writing %s" +msgstr "chyba pri zápise %s" #: src/copy.c:313 #, fuzzy, c-format @@ -1820,7 +1836,7 @@ msgstr "nepodarilo sa otvoriť %s" msgid "clearing permissions for %s" msgstr "čistia sa oprávnenia %s" -#: src/copy.c:697 src/copy.c:2470 src/cp.c:331 +#: src/copy.c:697 src/copy.c:2480 src/cp.c:329 #, c-format msgid "failed to preserve ownership for %s" msgstr "nepodarilo sa zachovať vlastníctvo %s" @@ -1835,14 +1851,14 @@ msgstr "nepodarilo sa vyhľadať súbor %s" msgid "failed to preserve authorship for %s" msgstr "nepodarilo sa zachovať autorstvo %s" -#: src/copy.c:804 src/csplit.c:638 src/du.c:901 src/fmt.c:449 src/head.c:847 -#: src/sort.c:4489 src/split.c:1329 src/tail.c:1756 src/wc.c:678 +#: 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 "nie je možné otvoriť %s pre čítanie" -#: src/copy.c:810 src/copy.c:972 src/dd.c:1546 src/dd.c:2114 src/dd.c:2252 -#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:141 +#: 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 #, c-format msgid "cannot fstat %s" msgstr "nie je možné vykonať fstat %s" @@ -1862,14 +1878,14 @@ msgstr "nepodarilo sa získať kontext vytvorenia súborového systému" 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:1574 src/copy.c:1777 src/copy.c:1935 src/ln.c:314 -#: src/remove.c:267 src/remove.c:293 src/remove.c:444 src/remove.c:465 +#: 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 #, c-format msgid "cannot remove %s" msgstr "nie je možné odstrániť %s" -#: src/copy.c:886 src/copy.c:1578 src/copy.c:1772 src/copy.c:1940 -#: src/remove.c:418 +#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945 +#: src/remove.c:375 #, c-format msgid "removed %s\n" msgstr "odstránené %s\n" @@ -1887,191 +1903,191 @@ msgstr "nie je možné vytvoriť obyčajný súbor %s" #: src/copy.c:985 #, fuzzy, c-format msgid "failed to clone %s from %s" -msgstr "nepodarilo sa otvoriť %s" +msgstr "nie je možné zatvoriť adresár %s" -#: src/copy.c:1098 src/copy.c:2531 +#: src/copy.c:1098 src/copy.c:2541 #, c-format msgid "preserving times for %s" msgstr "zachovávam časy %s" -#: src/copy.c:1170 src/copy.c:1176 src/head.c:855 src/touch.c:175 -#: src/truncate.c:413 -#, c-format -msgid "closing %s" -msgstr "zatvára sa %s" +#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172 +#: src/truncate.c:417 +#, fuzzy, c-format +msgid "failed to close %s" +msgstr "nepodarilo sa otvoriť %s" -#: src/copy.c:1466 +#: src/copy.c:1471 #, fuzzy, c-format msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? " msgstr "%s: prepísať %s bez ohľadu na práva %04lo? " -#: src/copy.c:1473 +#: src/copy.c:1478 #, c-format msgid "%s: overwrite %s? " msgstr "%s: prepísať %s? " -#: src/copy.c:1542 +#: src/copy.c:1547 #, c-format msgid " (backup: %s)" msgstr "(záloha: %s)" -#: src/copy.c:1552 +#: src/copy.c:1557 #, 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:1584 +#: src/copy.c:1589 #, fuzzy, c-format msgid "cannot create hard link %s to %s" msgstr "nie je možné vytvoriť adresár %s" -#: src/copy.c:1637 src/copy.c:1689 src/copy.c:2272 src/copy.c:2589 +#: 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:1220 src/truncate.c:365 +#: src/stat.c:1239 src/truncate.c:363 #, c-format msgid "cannot stat %s" msgstr "nie je možné stat() %s" -#: src/copy.c:1645 +#: src/copy.c:1650 #, c-format msgid "omitting directory %s" msgstr "vynecháva sa adresár %s" -#: src/copy.c:1659 +#: src/copy.c:1664 #, 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:1707 src/ln.c:246 +#: src/copy.c:1712 src/ln.c:246 #, c-format msgid "%s and %s are the same file" msgstr "%s a %s predstavujú ten istý súbor" -#: src/copy.c:1806 +#: src/copy.c:1811 #, 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:1824 src/ln.c:214 +#: src/copy.c:1829 src/ln.c:214 #, 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:1842 +#: src/copy.c:1847 #, 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:1856 +#: src/copy.c:1861 #, 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:1886 +#: src/copy.c:1891 #, 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:1887 +#: src/copy.c:1892 #, 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:1910 src/ln.c:276 +#: src/copy.c:1915 src/ln.c:276 #, c-format msgid "cannot backup %s" msgstr "nie je možné zálohovať %s" -#: src/copy.c:1974 +#: src/copy.c:1979 #, 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:2051 +#: src/copy.c:2056 #, fuzzy, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "nie je možné vytvoriť adresár %s" -#: src/copy.c:2068 +#: src/copy.c:2073 #, 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:2118 +#: src/copy.c:2123 #, 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:2161 +#: src/copy.c:2166 #, fuzzy, c-format msgid "cannot move %s to %s" msgstr "ioctl na `%s' nie je možné vykonať" -#: src/copy.c:2173 +#: src/copy.c:2178 #, 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:2207 src/install.c:905 src/mkdir.c:189 src/mkfifo.c:114 -#: src/mknod.c:167 +#: 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:2241 +#: src/copy.c:2246 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "nie je možné skopírovať zacyklený symbolický odkaz %s" -#: src/copy.c:2350 +#: src/copy.c:2355 #, 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:2357 +#: src/copy.c:2362 #, fuzzy, c-format msgid "cannot create symbolic link %s to %s" msgstr "nie je možné vytvoriť adresár %s" -#: src/copy.c:2406 src/mkfifo.c:133 +#: src/copy.c:2416 src/mkfifo.c:132 #, fuzzy, c-format msgid "cannot create fifo %s" msgstr "nie je možné vytvoriť adresár %s" -#: src/copy.c:2415 +#: src/copy.c:2425 #, fuzzy, c-format msgid "cannot create special file %s" msgstr "pozícia znaku je nula" -#: src/copy.c:2426 src/ls.c:3191 src/stat.c:902 +#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921 #, fuzzy, c-format msgid "cannot read symbolic link %s" msgstr "ioctl na `%s' nie je možné vykonať" -#: src/copy.c:2453 +#: src/copy.c:2463 #, fuzzy, c-format msgid "cannot create symbolic link %s" msgstr "nie je možné vytvoriť adresár %s" -#: src/copy.c:2485 +#: src/copy.c:2495 #, c-format msgid "%s has unknown file type" msgstr "%s je neznámy typ souboru" -#: src/copy.c:2629 src/ln.c:358 +#: src/copy.c:2644 src/ln.c:358 #, fuzzy, c-format msgid "cannot un-backup %s" msgstr "nie je možné spustiť %s" -#: src/copy.c:2633 +#: src/copy.c:2648 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (obnovenie zálohy)\n" -#: src/cp.c:156 src/mv.c:284 +#: src/cp.c:156 src/mv.c:286 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -2083,27 +2099,13 @@ msgstr "" " alebo: %s [VOĽBA]... ZAČIATOK KROK LAST\n" #: src/cp.c:162 -msgid "" -"Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" -"\n" +#, 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:166 src/csplit.c:1458 src/cut.c:197 src/df.c:852 src/du.c:268 -#: src/expand.c:112 src/fmt.c:275 src/fold.c:75 src/head.c:115 -#: src/install.c:612 src/kill.c:86 src/ln.c:392 src/ls.c:4726 src/mkdir.c:61 -#: src/mkfifo.c:56 src/mknod.c:58 src/mv.c:294 src/nl.c:191 src/paste.c:445 -#: src/pr.c:2777 src/ptx.c:1825 src/shred.c:153 src/shuf.c:58 src/sort.c:399 -#: src/split.c:211 src/stdbuf.c:95 src/tac.c:142 src/tail.c:268 -#: src/touch.c:226 src/truncate.c:107 src/unexpand.c:122 src/uniq.c:145 -msgid "" -"Mandatory arguments to long options are mandatory for short options too.\n" -msgstr "" -"Povinné argumenty dlhých tvarov volieb sú taktiež povinné pre krátke tvary " -"volieb.\n" - -#: src/cp.c:169 +#: src/cp.c:168 #, fuzzy msgid "" " -a, --archive same as -dR --preserve=all\n" @@ -2126,13 +2128,14 @@ msgstr "" " -d rovnaké ako --no-dereference --" "preserve=links\n" -#: src/cp.c:178 +#: src/cp.c:177 #, fuzzy msgid "" " -f, --force if an existing destination file cannot be\n" -" opened, remove it and try again (redundant " -"if\n" -" the -n option is used)\n" +" opened, remove it and try again (this " +"option\n" +" is ignored when the -n option is also " +"used)\n" " -i, --interactive prompt before overwrite (overrides a previous " "-n\n" " option)\n" @@ -2144,7 +2147,7 @@ msgstr "" " -H nasledovať symbolické odkazy z príkazového " "riadka v ZDROJi\n" -#: src/cp.c:188 +#: src/cp.c:186 #, fuzzy msgid "" " -l, --link hard link files instead of copying\n" @@ -2153,7 +2156,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:192 +#: src/cp.c:190 #, fuzzy msgid "" " -n, --no-clobber do not overwrite an existing file (overrides\n" @@ -2166,7 +2169,7 @@ msgstr "" " -H nasledovať symbolické odkazy z príkazového " "riadka v ZDROJi\n" -#: src/cp.c:197 +#: src/cp.c:195 #, fuzzy msgid "" " -p same as --preserve=mode,ownership,timestamps\n" @@ -2182,7 +2185,7 @@ msgstr "" " mode,ownership,timestamps), ak je to možné\n" " ďalšie atribúty: context, links, all\n" -#: src/cp.c:205 +#: src/cp.c:203 msgid "" " --no-preserve=ATTR_LIST don't preserve the specified attributes\n" " --parents use full source file name under DIRECTORY\n" @@ -2191,7 +2194,7 @@ msgstr "" " --parents použiť v ADRESÁRI plný názov zdrojového " "súboru\n" -#: src/cp.c:209 +#: src/cp.c:207 #, fuzzy msgid "" " -R, -r, --recursive copy directories recursively\n" @@ -2205,7 +2208,7 @@ msgstr "" "súboru\n" " ho odstrániť (na rozdiel od --force)\n" -#: src/cp.c:215 +#: src/cp.c:213 #, fuzzy msgid "" " --sparse=WHEN control creation of sparse files. See below\n" @@ -2236,7 +2239,7 @@ msgstr "" "--sparse=never zabráni tvoreniu nesúvislých súborov.\n" "\n" -#: src/cp.c:220 +#: src/cp.c:218 msgid "" " -s, --symbolic-link make symbolic links instead of copying\n" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -2245,7 +2248,7 @@ msgid "" " -T, --no-target-directory treat DEST as a normal file\n" msgstr "" -#: src/cp.c:226 +#: src/cp.c:224 #, fuzzy msgid "" " -u, --update copy only when the SOURCE file is newer\n" @@ -2271,7 +2274,7 @@ msgstr "" " --version vypísať informáciu o verzii a skončiť\n" "\n" -#: src/cp.c:235 +#: src/cp.c:233 #, fuzzy msgid "" "\n" @@ -2310,7 +2313,7 @@ msgstr "" "--sparse=never zabráni tvoreniu nesúvislých súborov.\n" "\n" -#: src/cp.c:247 src/install.c:649 src/ln.c:421 src/mv.c:321 +#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322 #, fuzzy msgid "" "\n" @@ -2333,7 +2336,7 @@ msgstr "" " existujú, inak tvoriť jednoduché\n" " simple, never vždy tvoriť jednoduché záložné kópie súborov \n" -#: src/cp.c:254 src/install.c:656 src/mv.c:328 +#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329 msgid "" " none, off never make backups (even if --backup is given)\n" " numbered, t make numbered backups\n" @@ -2347,7 +2350,7 @@ msgstr "" " existujú, inak tvoriť jednoduché\n" " simple, never vždy tvoriť jednoduché záložné kópie súborov \n" -#: src/cp.c:260 +#: src/cp.c:258 msgid "" "\n" "As a special case, cp makes a backup of SOURCE when the force and backup\n" @@ -2358,90 +2361,90 @@ 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:319 +#: src/cp.c:317 #, c-format msgid "failed to preserve times for %s" msgstr "nie je možné zachovať časy %s" -#: src/cp.c:350 +#: src/cp.c:348 #, c-format msgid "failed to preserve permissions for %s" msgstr "nie je možné zachovať práva %s" -#: src/cp.c:477 +#: src/cp.c:475 #, c-format msgid "cannot make directory %s" msgstr "nie je možné vytvoriť adresár %s" -#: src/cp.c:526 src/cp.c:545 +#: src/cp.c:524 src/cp.c:543 #, c-format msgid "%s exists but is not a directory" msgstr "%s existuje, ale nie je adresárom" -#: src/cp.c:572 src/cp.c:1068 src/install.c:401 src/install.c:844 src/ln.c:123 -#: src/ln.c:181 src/ln.c:202 src/ln.c:516 src/mv.c:152 src/mv.c:399 -#, c-format -msgid "accessing %s" -msgstr "pristupujem k %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 +#, fuzzy, c-format +msgid "failed to access %s" +msgstr "nepodarilo sa otvoriť %s" -#: src/cp.c:592 src/install.c:914 src/ln.c:546 src/mv.c:432 src/shred.c:1182 -#: src/touch.c:433 src/truncate.c:356 +#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181 +#: src/touch.c:429 src/truncate.c:354 #, c-format msgid "missing file operand" msgstr "chýba operand súboru" -#: src/cp.c:594 src/install.c:916 src/ln.c:560 src/mv.c:434 +#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436 #, c-format msgid "missing destination file operand after %s" msgstr "chýba operand cieľového súboru po %s" -#: src/cp.c:603 src/install.c:925 src/mv.c:443 +#: src/cp.c:601 src/install.c:926 src/mv.c:445 #, 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:619 src/cp.c:1070 src/install.c:403 src/install.c:846 -#: src/install.c:938 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:401 -#: src/mv.c:457 +#: 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 #, c-format msgid "target %s is not a directory" msgstr "cieľ %s nie je adresárom" -#: src/cp.c:730 +#: src/cp.c:728 #, 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:1063 src/install.c:839 src/ln.c:511 src/mv.c:394 +#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395 #, c-format msgid "multiple target directories specified" msgstr "boli uvedené viaceré cieľové adresáre" -#: src/cp.c:1108 +#: src/cp.c:1110 #, 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:1115 src/mv.c:464 +#: src/cp.c:1117 src/mv.c:466 #, 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:1121 +#: src/cp.c:1123 #, c-format msgid "--reflink can be used only with --sparse=auto" msgstr "" -#: src/cp.c:1129 src/install.c:899 src/ln.c:582 src/mv.c:472 +#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474 msgid "backup type" msgstr "typ zálohy" -#: src/cp.c:1154 +#: src/cp.c:1156 #, c-format msgid "cannot preserve security context without an SELinux-enabled kernel" msgstr "" -#: src/cp.c:1160 +#: src/cp.c:1162 #, c-format msgid "cannot preserve extended attributes, cp is built without xattr support" msgstr "" @@ -2451,135 +2454,134 @@ msgstr "" msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:529 +#: src/csplit.c:531 #, c-format msgid "input disappeared" msgstr "vstup sa stratil" -#: src/csplit.c:658 src/csplit.c:669 +#: src/csplit.c:660 src/csplit.c:671 #, c-format msgid "%s: line number out of range" msgstr "%s: číslo riadku je mimo rozsah" -#: src/csplit.c:698 +#: src/csplit.c:700 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: číslo riadka je mimo rozsahu" -#: src/csplit.c:701 src/csplit.c:750 +#: src/csplit.c:703 src/csplit.c:752 #, c-format msgid " on repetition %s\n" msgstr " v opakovaní %s\n" -#: src/csplit.c:744 +#: src/csplit.c:746 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: zhoda nenájdená" -#: src/csplit.c:808 src/csplit.c:848 src/nl.c:359 src/tac.c:274 +#: src/csplit.c:810 src/csplit.c:850 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:981 +#: src/csplit.c:983 #, c-format msgid "write error for %s" msgstr "chyba pri zápise do %s" -#: src/csplit.c:1057 +#: src/csplit.c:1059 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: po oddeľovači sa očakáva celé číslo" -#: src/csplit.c:1073 +#: src/csplit.c:1075 #, fuzzy, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: '}' je požadovaná v počítadle opakovaní" -#: src/csplit.c:1083 +#: src/csplit.c:1085 #, fuzzy, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: medzi `{' a `}' musí byť celé číslo" -#: src/csplit.c:1110 +#: src/csplit.c:1112 #, fuzzy, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: chýba koncový oddeľovač „%c“" -#: src/csplit.c:1127 +#: src/csplit.c:1129 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: chybný regulárny výraz: %s" -#: src/csplit.c:1160 +#: src/csplit.c:1162 #, c-format msgid "%s: invalid pattern" msgstr "%s: chybný vzor" -#: src/csplit.c:1163 +#: src/csplit.c:1165 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: číslo riadku musí byť väčšie ako nula" -#: src/csplit.c:1169 +#: src/csplit.c:1171 #, 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:1175 +#: src/csplit.c:1177 #, 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:1253 +#: src/csplit.c:1255 #, c-format msgid "missing conversion specifier in suffix" msgstr "v parametri prepínača chýba určenie typu konverzie" -#: src/csplit.c:1259 +#: src/csplit.c:1261 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "chybne zadaný typ konverzie v parametri prepínača: %c" -#: src/csplit.c:1262 +#: src/csplit.c:1264 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "chybne zadaný typ konverzie v parametri prepínača: \\%.3o" -#: src/csplit.c:1267 +#: src/csplit.c:1269 #, fuzzy, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "%s: chybne zadaná položka `%s'" -#: src/csplit.c:1284 +#: src/csplit.c:1286 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "príliš mnoho typov konverzie %% v parametri prepínača" -#: src/csplit.c:1298 +#: src/csplit.c:1300 #, c-format msgid "missing %% conversion specification in suffix" msgstr "v parametri prepínača chýba zadanie typu konverzie pomocou %%" -#: src/csplit.c:1345 +#: src/csplit.c:1347 #, c-format msgid "%s: invalid number" msgstr "%s: chybné číslo" -#: src/csplit.c:1449 +#: src/csplit.c:1451 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Použitie: %s [PREPÍNAČ]... SÚBOR VZOROV...\n" -#: src/csplit.c:1453 +#: src/csplit.c:1455 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" -"\n" msgstr "" -#: src/csplit.c:1461 +#: src/csplit.c:1462 #, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2587,20 +2589,20 @@ msgid "" " -k, --keep-files do not remove output files on errors\n" msgstr "" -#: src/csplit.c:1466 +#: src/csplit.c:1467 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:1473 +#: src/csplit.c:1474 msgid "" "\n" "Read standard input if FILE is -. Each PATTERN may be:\n" msgstr "" -#: src/csplit.c:1477 +#: src/csplit.c:1478 msgid "" "\n" " INTEGER copy up to but not including specified line number\n" @@ -2617,7 +2619,7 @@ msgstr "" msgid "David M. Ihnat" msgstr "David M. Ihnat" -#: src/cut.c:64 +#: src/cut.c:64 src/cut.c:372 msgid "fields and positions are numbered from 1" msgstr "" @@ -2627,19 +2629,17 @@ msgid "Usage: %s OPTION... [FILE]...\n" msgstr "Použitie: %s [VOĽBA]... [SÚBOR]...\n" #: src/cut.c:193 -msgid "" -"Print selected parts of lines from each FILE to standard output.\n" -"\n" +msgid "Print selected parts of lines from each FILE to standard output.\n" msgstr "" -#: src/cut.c:200 +#: src/cut.c:199 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:205 +#: src/cut.c:204 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2647,20 +2647,20 @@ msgid "" " -n (ignored)\n" msgstr "" -#: src/cut.c:211 +#: src/cut.c:210 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" msgstr "" -#: src/cut.c:215 +#: src/cut.c:214 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:222 +#: src/cut.c:221 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2668,7 +2668,7 @@ msgid "" "in the same order that it is read, and is written exactly once.\n" msgstr "" -#: src/cut.c:228 +#: src/cut.c:227 msgid "" "Each range is one of:\n" "\n" @@ -2680,48 +2680,50 @@ msgid "" "With no FILE, or when FILE is -, read standard input.\n" msgstr "" -#: src/cut.c:368 src/cut.c:489 -msgid "invalid byte or field list" +#: src/cut.c:367 src/cut.c:493 +#, fuzzy +msgid "invalid byte, character or field list" msgstr "chybný zoznam bajtov alebo položiek" -#: src/cut.c:385 +#: src/cut.c:387 #, fuzzy msgid "invalid range with no endpoint: -" msgstr "chybný typ reťazca `%s'" -#: src/cut.c:399 +#: src/cut.c:403 #, fuzzy msgid "invalid decreasing range" msgstr "neplatné číslo" -#: src/cut.c:478 +#: src/cut.c:482 #, fuzzy, c-format msgid "byte offset %s is too large" msgstr "%s je príliš veľa" -#: src/cut.c:481 +#: src/cut.c:485 #, fuzzy, c-format msgid "field number %s is too large" msgstr "číslo položky je nula" -#: src/cut.c:789 src/cut.c:797 +#: src/cut.c:795 src/cut.c:803 msgid "only one type of list may be specified" msgstr "môže byť zadaný iba jeden typ zoznamu" -#: src/cut.c:806 +#: src/cut.c:812 src/numfmt.c:1408 +#, c-format msgid "the delimiter must be a single character" msgstr "oddeľovač musí byť jediný znak" -#: src/cut.c:841 +#: src/cut.c:847 msgid "you must specify a list of bytes, characters, or fields" msgstr "musíte zadat zoznam bajtov, znakov alebo položiek" -#: src/cut.c:844 +#: src/cut.c:850 #, 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:848 +#: src/cut.c:854 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2729,11 +2731,11 @@ msgstr "" "potlačenie riadkov neobsahujúcich oddeľovač, má význam iba\n" "\tpri použití pracuje s poľami" -#: src/cut.c:864 +#: src/cut.c:870 msgid "missing list of fields" msgstr "chýba zoznam položiek" -#: src/cut.c:866 +#: src/cut.c:872 msgid "missing list of positions" msgstr "chýba zoznam pozícií" @@ -2747,9 +2749,11 @@ msgstr "" " alebo: %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 "" + +#: src/date.c:134 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" " -I[TIMESPEC], --iso-8601[=TIMESPEC] output date/time in ISO 8601 format.\n" @@ -2758,14 +2762,14 @@ msgid "" " and time to the indicated precision.\n" msgstr "" -#: src/date.c:138 +#: src/date.c:142 msgid "" " -r, --reference=FILE display the last modification time of FILE\n" " -R, --rfc-2822 output date and time in RFC 2822 format.\n" " Example: Mon, 07 Aug 2006 12:34:56 -0600\n" msgstr "" -#: src/date.c:143 +#: src/date.c:147 msgid "" " --rfc-3339=TIMESPEC output date and time in RFC 3339 format.\n" " TIMESPEC='date', 'seconds', or 'ns' for\n" @@ -2776,7 +2780,7 @@ msgid "" " -u, --utc, --universal print or set Coordinated Universal Time\n" msgstr "" -#: src/date.c:154 +#: src/date.c:158 msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" @@ -2785,7 +2789,7 @@ msgid "" " %a locale's abbreviated weekday name (e.g., Sun)\n" msgstr "" -#: src/date.c:161 +#: src/date.c:165 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2793,7 +2797,7 @@ msgid "" " %c locale's date and time (e.g., Thu Mar 3 23:05:25 2005)\n" msgstr "" -#: src/date.c:167 +#: src/date.c:171 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2801,14 +2805,14 @@ msgid "" " %e day of month, space padded; same as %_d\n" msgstr "" -#: src/date.c:173 +#: src/date.c:177 msgid "" " %F full date; same as %Y-%m-%d\n" " %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 "" -#: src/date.c:178 +#: src/date.c:182 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2816,7 +2820,7 @@ msgid "" " %j day of year (001..366)\n" msgstr "" -#: src/date.c:184 +#: src/date.c:188 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -2824,7 +2828,7 @@ msgid "" " %M minute (00..59)\n" msgstr "" -#: src/date.c:190 +#: src/date.c:194 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2835,7 +2839,7 @@ msgid "" " %s seconds since 1970-01-01 00:00:00 UTC\n" msgstr "" -#: src/date.c:199 +#: src/date.c:203 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2843,7 +2847,7 @@ msgid "" " %u day of week (1..7); 1 is Monday\n" msgstr "" -#: src/date.c:205 +#: src/date.c:209 msgid "" " %U week number of year, with Sunday as first day of week (00..53)\n" " %V ISO week number, with Monday as first day of week (01..53)\n" @@ -2851,7 +2855,7 @@ msgid "" " %W week number of year, with Monday as first day of week (00..53)\n" msgstr "" -#: src/date.c:211 +#: src/date.c:215 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -2859,7 +2863,7 @@ msgid "" " %Y year\n" msgstr "" -#: src/date.c:217 +#: src/date.c:221 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -2871,7 +2875,7 @@ msgid "" "By default, date pads numeric fields with zeroes.\n" msgstr "" -#: src/date.c:226 +#: src/date.c:230 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -2882,7 +2886,7 @@ msgid "" " # use opposite case if possible\n" msgstr "" -#: src/date.c:235 +#: src/date.c:239 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -2891,7 +2895,7 @@ msgid "" "O to use the locale's alternate numeric symbols if available.\n" msgstr "" -#: src/date.c:242 +#: src/date.c:246 msgid "" "\n" "Examples:\n" @@ -2905,35 +2909,35 @@ msgid "" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:275 src/dd.c:2193 src/head.c:838 src/md5sum.c:477 -#: src/md5sum.c:798 src/od.c:863 src/od.c:1914 src/pr.c:1176 src/pr.c:1372 -#: src/pr.c:1494 src/stty.c:842 src/tac.c:563 src/tail.c:343 src/tee.c:126 +#: 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 #, c-format msgid "standard input" msgstr "štandardný vstup" -#: src/date.c:303 src/date.c:523 +#: src/date.c:307 src/date.c:527 #, c-format msgid "invalid date %s" msgstr "neplatný dátum %s" -#: src/date.c:414 src/date.c:448 +#: src/date.c:418 src/date.c:452 #, fuzzy, c-format msgid "multiple output formats specified" msgstr "\\%c: neprípustná sekvencia" -#: src/date.c:426 +#: src/date.c:430 #, fuzzy, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "prepínače --string a --check sa vzájomne vylučujú" -#: src/date.c:433 +#: src/date.c:437 #, c-format msgid "the options to print and set the time may not be used together" msgstr "voľby pre výpis a nastavenie času nemôžu byť použité spoločne" -#: src/date.c:454 +#: src/date.c:458 #, fuzzy, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -2944,23 +2948,23 @@ msgstr "" "Pokiaľ je pre špecifikáciu dátumu použitá voľba, všetky argumenty,\n" "ktoré nie sú voľbami, musia byť formátovacím reťazcom s úvodným `+'." -#: src/date.c:531 +#: src/date.c:535 #, c-format msgid "cannot set date" msgstr "nie je možné nastaviť dátum" -#: src/date.c:554 src/du.c:360 +#: src/date.c:558 src/du.c:371 #, c-format msgid "time %s is out of range" msgstr "čas %s je mino rozsahu" #. This is a proper name. See the gettext manual, section Names. -#: src/dd.c:44 src/factor.c:43 src/rm.c:41 src/tail.c:69 src/touch.c:41 +#: 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 "Paul Rubin" -#: src/dd.c:517 +#: src/dd.c:521 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -2969,7 +2973,7 @@ msgstr "" "Použitie: %s [SÚBOR]...\n" " alebo: %s [VOĽBA]\n" -#: src/dd.c:522 +#: src/dd.c:526 #, fuzzy msgid "" "Copy a file, converting and formatting according to the operands.\n" @@ -2989,7 +2993,7 @@ msgstr "" " count=BLOKOV skopírovať iba BLOKOV vstupných blokov\n" " ibs=BAJTOV čítať BAJTOV bajtov naraz\n" -#: src/dd.c:531 +#: src/dd.c:535 #, fuzzy msgid "" " if=FILE read from FILE instead of stdin\n" @@ -2999,7 +3003,8 @@ msgid "" " oflag=FLAGS write as per the comma separated symbol list\n" " seek=N skip N obs-sized blocks at start of output\n" " skip=N skip N ibs-sized blocks at start of input\n" -" status=noxfer suppress transfer statistics\n" +" status=WHICH WHICH info to suppress outputting to stderr;\n" +" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" msgstr "" " if=SÚBOR čítať zo SÚBORu namiesto štandardného vstupu\n" " iflag=PRÍZN čítať podľa tohto zoznamu symbolov oddelených čiarkami\n" @@ -3011,11 +3016,11 @@ 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:541 +#: src/dd.c:546 #, fuzzy msgid "" "\n" -"BLOCKS and BYTES may be followed by the following multiplicative suffixes:\n" +"N and BYTES may be followed by the following multiplicative suffixes:\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, and so on for T, P, E, Z, Y.\n" "\n" @@ -3030,7 +3035,7 @@ msgstr "" "Každý symbol KONV môže byť:\n" "\n" -#: src/dd.c:550 +#: src/dd.c:555 #, fuzzy msgid "" " ascii from EBCDIC to ASCII\n" @@ -3058,7 +3063,7 @@ msgstr "" " keď sa použije s block alebo unblock, vyplniť medzerami namiesto " "NULL\n" -#: src/dd.c:563 +#: src/dd.c:568 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3074,7 +3079,7 @@ msgstr "" " fdatasync pred ukončením fyzicky zapísať údaje\n" " fsync podobne, ale zapísať aj metadáta\n" -#: src/dd.c:571 +#: src/dd.c:576 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3088,77 +3093,77 @@ msgstr "" " append režim pridávania (zmysluplné iba pre výstup; navrhuje sa " "conv=notrunc)\n" -#: src/dd.c:578 +#: src/dd.c:583 #, fuzzy msgid " cio use concurrent I/O for data\n" msgstr " text použiť pre dáta textový V/V\n" -#: src/dd.c:580 +#: src/dd.c:585 msgid " direct use direct I/O for data\n" msgstr " direct použiť pre dáta priamy V/V\n" -#: src/dd.c:582 +#: src/dd.c:587 #, fuzzy msgid " directory fail unless a directory\n" msgstr "%s existuje, ale nie je adresárom" -#: src/dd.c:584 +#: src/dd.c:589 msgid " dsync use synchronized I/O for data\n" msgstr " dsync použiť pre dáta synchronizovaný V/V\n" -#: src/dd.c:586 +#: src/dd.c:591 msgid " sync likewise, but also for metadata\n" msgstr " sync podobne, ale aj pre metadáta\n" -#: src/dd.c:587 +#: src/dd.c:592 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr "" -#: src/dd.c:590 +#: src/dd.c:595 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock použiť neblokoujúci V/V\n" -#: src/dd.c:592 +#: src/dd.c:597 msgid " noatime do not update access time\n" msgstr " noatime neaktualizovať čas posledného prístupu\n" -#: src/dd.c:595 +#: src/dd.c:600 msgid " nocache discard cached data\n" msgstr "" -#: src/dd.c:598 +#: src/dd.c:603 msgid " noctty do not assign controlling terminal from file\n" msgstr " noctty nepriraďovať zo súboru riadiaci terminál\n" -#: src/dd.c:601 +#: src/dd.c:606 msgid " nofollow do not follow symlinks\n" msgstr " nofollow nenasledovať symbolické odkazy\n" -#: src/dd.c:603 +#: src/dd.c:608 msgid " nolinks fail if multiply-linked\n" msgstr " nolinks skončiť neúspešne pri viacnásobnom odkaze\n" -#: src/dd.c:605 +#: src/dd.c:610 msgid " binary use binary I/O for data\n" msgstr " binary použiť pre dáta binárny V/V\n" -#: src/dd.c:607 +#: src/dd.c:612 msgid " text use text I/O for data\n" msgstr " text použiť pre dáta textový V/V\n" -#: src/dd.c:609 +#: src/dd.c:614 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:612 +#: src/dd.c:617 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:615 +#: src/dd.c:620 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:620 +#: src/dd.c:625 #, fuzzy, c-format msgid "" "\n" @@ -3188,7 +3193,7 @@ msgstr "" "Voľby sú:\n" "\n" -#: src/dd.c:676 +#: src/dd.c:683 #, c-format msgid "" "%<PRIuMAX>+%<PRIuMAX> records in\n" @@ -3197,14 +3202,14 @@ msgstr "" "%<PRIuMAX>+%<PRIuMAX> záznamov prečítaných\n" "%<PRIuMAX>+%<PRIuMAX> záznamov zapísaných\n" -#: src/dd.c:682 +#: src/dd.c:689 #, 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:694 +#: src/dd.c:701 #, c-format msgid "%<PRIuMAX> byte (%s) copied" msgid_plural "%<PRIuMAX> bytes (%s) copied" @@ -3212,7 +3217,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:712 +#: src/dd.c:720 msgid "Infinity B" msgstr "nekonečno B" @@ -3226,87 +3231,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:725 +#: src/dd.c:733 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g s, %s/s\n" -#: src/dd.c:804 +#: src/dd.c:812 #, fuzzy, c-format msgid "closing input file %s" msgstr "vytváram súbor `%s'\n" -#: src/dd.c:811 +#: src/dd.c:819 #, c-format msgid "closing output file %s" msgstr "zatváram výstupný súbor %s" -#: src/dd.c:1014 +#: src/dd.c:1022 #, fuzzy, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "zmena skupiny %s na %s zlyhala\n" -#: src/dd.c:1085 src/dd.c:1934 +#: src/dd.c:1093 src/dd.c:1942 #, c-format msgid "writing to %s" msgstr "zápis do %s" -#: src/dd.c:1199 src/dd.c:1253 +#: src/dd.c:1207 src/dd.c:1261 #, c-format msgid "unrecognized operand %s" msgstr "neznámy operand %s" -#: src/dd.c:1210 +#: src/dd.c:1218 #, fuzzy msgid "invalid conversion" msgstr "neplatná konverzia: %s" -#: src/dd.c:1213 src/dd.c:1289 +#: src/dd.c:1221 src/dd.c:1297 #, fuzzy msgid "invalid input flag" msgstr "neplatný vstupný prepínač: %s" -#: src/dd.c:1216 src/dd.c:1283 src/dd.c:1295 +#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303 #, fuzzy msgid "invalid output flag" msgstr "neplatný výstupný prepínač: %sneplatná skupina" -#: src/dd.c:1219 +#: src/dd.c:1227 #, fuzzy msgid "invalid status flag" msgstr "neplatný stavový prepínač: %s" -#: src/dd.c:1258 src/truncate.c:312 +#: src/dd.c:1266 src/truncate.c:310 #, c-format msgid "invalid number %s" msgstr "neplatné číslo %s" -#: src/dd.c:1340 +#: src/dd.c:1348 #, 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:1342 +#: src/dd.c:1350 #, c-format msgid "cannot combine block and unblock" msgstr "nie je možné skombinovať block a unblock" -#: src/dd.c:1344 +#: src/dd.c:1352 #, c-format msgid "cannot combine lcase and ucase" msgstr "nie je možné skombinovať lcase a ucase" -#: src/dd.c:1346 +#: src/dd.c:1354 #, c-format msgid "cannot combine excl and nocreat" msgstr "nie je možné skombinovať excl a nocreat" -#: src/dd.c:1349 +#: src/dd.c:1357 #, fuzzy, c-format msgid "cannot combine direct and nocache" msgstr "nie je možné skombinovať excl a nocreat" -#: src/dd.c:1506 +#: src/dd.c:1514 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3315,72 +3320,72 @@ 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:1593 +#: src/dd.c:1601 #, fuzzy, c-format msgid "%s: cannot skip" msgstr "%s: nie je možné vyhľadať" -#: src/dd.c:1595 src/dd.c:1614 src/dd.c:1675 +#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683 #, c-format msgid "%s: cannot seek" msgstr "%s: nie je možné vyhľadať" -#: src/dd.c:1655 +#: src/dd.c:1663 #, c-format msgid "offset overflow while reading file %s" msgstr "pretečenie pozície pri čítaní súboru %s" -#: src/dd.c:1667 +#: src/dd.c:1675 #, 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:1671 +#: src/dd.c:1679 #, c-format msgid "cannot work around kernel bug after all" msgstr "nakoniec nie je možné obísť chybu jadra" -#: src/dd.c:1814 +#: src/dd.c:1822 #, c-format msgid "setting flags for %s" msgstr "nastavujem príznaky %s" -#: src/dd.c:1867 +#: src/dd.c:1875 #, c-format msgid "memory exhausted by input buffer of size %zu bytes (%s)" msgstr "" -#: src/dd.c:1881 +#: src/dd.c:1889 #, c-format msgid "memory exhausted by output buffer of size %zu bytes (%s)" msgstr "" -#: src/dd.c:1914 +#: src/dd.c:1922 #, fuzzy, c-format msgid "%s: cannot skip to specified offset" msgstr "nie je možné vytvoriť adresár %s" -#: src/dd.c:2125 src/dd.c:2258 +#: src/dd.c:2133 #, fuzzy, c-format -msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" +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:2138 +#: src/dd.c:2146 #, c-format msgid "fdatasync failed for %s" msgstr "fdatasync zlyhalo na %s" -#: src/dd.c:2148 +#: src/dd.c:2156 #, c-format msgid "fsync failed for %s" msgstr "fsync zlyhalo na %s" -#: src/dd.c:2199 src/dd.c:2228 +#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165 #, c-format -msgid "opening %s" -msgstr "otváram %s" +msgid "failed to open %s" +msgstr "nepodarilo sa otvoriť %s" -#: src/dd.c:2237 +#: src/dd.c:2246 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) " @@ -3389,84 +3394,106 @@ 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:2274 src/dd.c:2280 +#: src/dd.c:2267 +#, 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 #, 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:54 src/expr.c:153 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:39 src/sleep.c:35 src/sort.c:66 +#: 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 msgid "Paul Eggert" msgstr "Paul Eggert" -#: src/df.c:140 +#: src/df.c:172 msgid "Filesystem" msgstr "Súborový systém" -#: src/df.c:141 +#: src/df.c:175 msgid "Type" msgstr "Typ" -#: src/df.c:142 +#: src/df.c:178 src/df.c:542 msgid "blocks" msgstr "bloky" -#: src/df.c:142 -msgid "Inodes" -msgstr "I-uzly" - -#: src/df.c:142 -msgid "Size" -msgstr "Veľk" - -#: src/df.c:143 +#: src/df.c:181 msgid "Used" msgstr "Použ" -#: src/df.c:143 -msgid "IUsed" -msgstr "IPouž" - -#: src/df.c:144 +#: src/df.c:184 msgid "Available" msgstr "Dostupné" -#: src/df.c:144 -msgid "IFree" -msgstr "IVoľ" - -#: src/df.c:144 -msgid "Avail" -msgstr "Dost" - -#: src/df.c:145 +#: src/df.c:187 msgid "Use%" msgstr "Pou%" -#: src/df.c:145 +#: src/df.c:190 +msgid "Inodes" +msgstr "I-uzly" + +#: src/df.c:193 +msgid "IUsed" +msgstr "IPouž" + +#: src/df.c:196 +msgid "IFree" +msgstr "IVoľ" + +#: src/df.c:199 msgid "IUse%" msgstr "IPou%" -#: src/df.c:145 +#: src/df.c:202 +msgid "Mounted on" +msgstr "Pripojený na" + +#: src/df.c:383 +#, c-format +msgid "option --output: field '%s' unknown" +msgstr "" + +#: src/df.c:390 +#, 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 +msgid "Size" +msgstr "Veľk" + +#: src/df.c:414 src/df.c:451 +msgid "Avail" +msgstr "Dost" + +#: src/df.c:474 msgid "Capacity" msgstr "Kapacita" -#: src/df.c:146 -msgid "Mounted on" -msgstr "Pripojený na" +#. 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 +#, c-format +msgid "%s-%s" +msgstr "" -#: src/df.c:847 +#: src/df.c:1210 +#, fuzzy msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" -"\n" msgstr "" "Zobraziť informácie o súborovom systéme, na ktorom sa nachádza SÚBOR\n" "alebo štandardne o všetkých súborových systémoch.\n" "\n" -#: src/df.c:855 +#: src/df.c:1217 #, fuzzy msgid "" " -a, --all include dummy file systems\n" @@ -3484,7 +3511,7 @@ msgstr "" "(napr., 1K 234M 2G)\n" " -H, --si podobne, ale používať násobky 1000, nie 1024\n" -#: src/df.c:865 +#: src/df.c:1227 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3499,8 +3526,12 @@ msgstr "" " --no-sync nevyvolávať sync pred získaním informácií o využití " "(štandardne)\n" -#: src/df.c:872 +#: src/df.c:1234 +#, fuzzy msgid "" +" --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" +" or print all fields if FIELD_LIST is " +"omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" " -t, --type=TYPE limit listing to file systems of type TYPE\n" @@ -3516,21 +3547,43 @@ msgstr "" "nie sú typu TYP\n" " -v (ignoruje sa)\n" -#: src/df.c:1027 +#: src/df.c:1248 +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" +msgstr "" + +#: src/df.c:1285 +#, 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 #, 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:1075 +#: src/df.c:1500 msgid "Warning: " msgstr "Upozornenie: " -#: src/df.c:1077 src/stat.c:795 +#: src/df.c:1502 src/stat.c:814 #, 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:1107 +#: src/df.c:1539 #, c-format msgid "no file systems processed" msgstr "neboli spracované žiadne súborové systémy" @@ -3638,7 +3691,7 @@ msgid " -z, --zero separate output with NUL rather than newline\n" msgstr "" #: src/dirname.c:64 -#, fuzzy, c-format +#, c-format msgid "" "\n" "Examples:\n" @@ -3646,12 +3699,8 @@ msgid "" " %s dir1/str dir2/str -> \"dir1\" followed by \"dir2\"\n" " %s stdio.h -> \".\"\n" msgstr "" -"\n" -"príklady:\n" -" %s /usr/bin/sort Vypísať \"/usr/bin\".\n" -" %s stdio.h Vypísať \".\".\n" -#: src/du.c:260 src/sort.c:390 src/wc.c:112 +#: src/du.c:270 src/sort.c:394 src/wc.c:112 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3660,18 +3709,19 @@ msgstr "" "Použitie: %s [VOĽBA]... [SÚBOR]...\n" " or: %s [VOĽBA]... --files0-from=F\n" -#: src/du.c:264 -msgid "" -"Summarize disk usage of each FILE, recursively for directories.\n" -"\n" +#: src/du.c:274 +#, fuzzy +msgid "Summarize disk usage of each FILE, recursively for directories.\n" msgstr "" "Vypísať zhrnutie využitia disku každým SÚBORom, rekurzívne prechádzať " "adresáre.\n" "\n" -#: src/du.c:271 +#: src/du.c:280 #, fuzzy msgid "" +" -0, --null end each output line with 0 byte rather than " +"newline\n" " -a, --all write counts for all files, not just directories\n" " --apparent-size print apparent sizes, rather than disk usage; " "although\n" @@ -3689,7 +3739,7 @@ msgstr "" "vnútornej\n" " fragmentácii, nepriamym blokom a podobne\n" -#: src/du.c:279 +#: src/du.c:289 #, fuzzy msgid "" " -B, --block-size=SIZE scale sizes by SIZE before printing them. E.g.,\n" @@ -3699,6 +3749,11 @@ msgid "" " -c, --total produce a grand total\n" " -D, --dereference-args dereference only symlinks that are listed on the\n" " command line\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 "" " -B, --block-size=VEĽ použiť bloky s veľkosťou VEĽ\n" " -b, --bytes ekvivalent „--apparent-size --block-size=1“\n" @@ -3707,7 +3762,7 @@ msgstr "" "uvedené\n" " na príkazovom riadku\n" -#: src/du.c:288 +#: src/du.c:302 #, fuzzy msgid "" " --files0-from=F summarize disk usage of the NUL-terminated file\n" @@ -3716,7 +3771,6 @@ msgid "" " -H equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" --si like -h, but use powers of 1000 not 1024\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" @@ -3727,9 +3781,11 @@ msgstr "" "(napr., 1K 234M 2G)\n" " --si ako -h, ale použiť násobky 1000, nie 1024\n" -#: src/du.c:297 +#: src/du.c:310 +#, fuzzy 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 "" @@ -3737,14 +3793,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:302 +#: src/du.c:316 +#, fuzzy msgid "" -" -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " "default)\n" -" -0, --null end each output line with 0 byte rather than " -"newline\n" " -S, --separate-dirs 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 dereferencovať všetky symbolické odkazy\n" @@ -3754,20 +3809,10 @@ msgstr "" " -S, --separate-dirs nevypisovať veľkosti podadresárov\n" " -s, --summarize zobraziť iba zhrnutie pre každý z argumentov\n" -#: src/du.c:309 -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 "" - -#: src/du.c:318 +#: src/du.c:322 msgid "" +" -t, --threshold=SIZE exclude entries smaller than SIZE if positive,\n" +" or entries greater than SIZE if negative\n" " --time show time of the last modification of any file in " "the\n" " directory, or any of its subdirectories\n" @@ -3778,66 +3823,75 @@ msgid "" " FORMAT is interpreted like 'date'\n" msgstr "" -#: src/du.c:375 -#, fuzzy -msgid "Infinity" -msgstr "nekonečno B" +#: src/du.c:333 +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:600 +#: src/du.c:386 +#, fuzzy +msgid "Infinity" +msgstr "nekonečno B" + +#: src/du.c:507 +#, c-format +msgid "mount point %s already traversed" +msgstr "" + +#: src/du.c:624 #, fuzzy, c-format msgid "fts_read failed: %s" msgstr "fts_read zlyhalo" -#: src/du.c:724 +#: src/du.c:780 #, fuzzy, c-format msgid "invalid maximum depth %s" msgstr "chybné číslo položky: `%s'" -#: src/du.c:817 +#: src/du.c:809 +#, fuzzy, c-format +msgid "invalid --threshold argument '-0'" +msgstr "chybný argument %s pre `%s'" + +#: src/du.c:887 #, 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:824 +#: src/du.c:894 #, 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:830 +#: src/du.c:900 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "upozornenie: sumarizácia je v konflikte s --max-depth=%lu" -#: src/du.c:896 src/sort.c:4479 src/wc.c:668 +#: src/du.c:966 src/sort.c:4533 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:949 src/md5sum.c:587 src/od.c:903 src/tac.c:239 src/tac.c:350 -#: src/tac.c:506 src/tac.c:586 src/wc.c:733 +#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 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:963 src/sort.c:4508 src/wc.c:747 +#: src/du.c:1040 src/sort.c:4562 src/wc.c:747 #, c-format msgid "when reading file names from stdin, no file name of %s allowed" msgstr "" -#: src/du.c:980 src/du.c:988 src/wc.c:760 src/wc.c:768 +#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768 #, fuzzy msgid "invalid zero-length file name" msgstr "neplatná skupina" -#: src/du.c:1007 src/head.c:149 src/head.c:262 src/head.c:334 src/head.c:538 -#: src/head.c:620 src/head.c:692 src/head.c:750 src/head.c:774 src/tail.c:412 -#: src/tail.c:500 src/tail.c:549 src/tail.c:642 src/tail.c:770 src/tail.c:818 -#: src/tail.c:855 src/tail.c:1782 src/tail.c:1812 src/uniq.c:395 -#, c-format -msgid "error reading %s" -msgstr "chyba pri čítaní %s" - -#: src/du.c:1010 src/ls.c:2649 src/wc.c:791 +#: src/du.c:1088 src/ls.c:2649 src/wc.c:791 msgid "total" msgstr "celkom" @@ -3917,10 +3971,12 @@ msgid "Usage: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n" msgstr "Použitie: %s [VOĽBA]... [-] [NÁZOV=HODNOTA]... [PRÍKAZ [ARG]...]\n" #: src/env.c:55 +msgid "Set each NAME to VALUE in the environment and run COMMAND.\n" +msgstr "" + +#: src/env.c:61 #, fuzzy msgid "" -"Set each NAME to VALUE in the environment and run COMMAND.\n" -"\n" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with 0 byte rather than newline\n" " -u, --unset=NAME remove variable from the environment\n" @@ -3930,67 +3986,70 @@ msgstr "" " -i, --ignore-environment začať s prázdnym prostredím\n" " -u, --unset=NAME odstrániť premennú z prostredia\n" -#: src/env.c:64 +#: src/env.c:68 msgid "" "\n" "A mere - implies -i. If no COMMAND, print the resulting environment.\n" msgstr "" -#: src/env.c:120 +#: src/env.c:124 #, fuzzy, c-format msgid "cannot unset %s" msgstr "nie je možné spustiť %s" -#: src/env.c:131 +#: src/env.c:135 #, fuzzy, c-format msgid "cannot set %s" msgstr "nie je možné stat() %s" -#: src/env.c:148 +#: src/env.c:152 #, c-format msgid "cannot specify --null (-0) with command" msgstr "" #: 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" -"\n" msgstr "" +"V každom SÚBORe prevedie medzery na tabulátory a výsledok vypisuje\n" +"na štandardný výstup. Ak nebude SÚBOR zadaný alebo bude -, načíta sa\n" +"štandardný vstup.\n" -#: src/expand.c:115 +#: src/expand.c:114 msgid "" " -i, --initial do not convert tabs after non blanks\n" " -t, --tabs=NUMBER have tabs NUMBER characters apart, not 8\n" msgstr "" -#: src/expand.c:119 +#: src/expand.c:118 msgid "" " -t, --tabs=LIST use comma separated list of explicit tab positions\n" msgstr "" -#: src/expand.c:172 src/unexpand.c:191 +#: src/expand.c:171 src/unexpand.c:190 #, fuzzy, c-format msgid "tab stop is too large %s" msgstr "%s je príliš veľa" -#: src/expand.c:180 src/unexpand.c:199 +#: src/expand.c:179 src/unexpand.c:198 #, fuzzy, c-format msgid "tab size contains invalid character(s): %s" msgstr "veľkosť tabulátoru obsahuje neplatný znak" -#: src/expand.c:206 src/unexpand.c:225 +#: src/expand.c:205 src/unexpand.c:224 #, c-format msgid "tab size cannot be 0" msgstr "veľkosť tabulátoru nemôže byť 0" # sizes or positions? - rzm -#: src/expand.c:208 src/unexpand.c:227 +#: src/expand.c:207 src/unexpand.c:226 #, c-format msgid "tab sizes must be ascending" msgstr "postupnosť pozíc tabulátorov musí byť rastúca" -#: src/expand.c:326 src/expand.c:345 src/unexpand.c:374 src/unexpand.c:419 +#: 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 "vstupný riadok je príliš dlhý" @@ -4110,12 +4169,12 @@ msgstr "chyba pri vyhľadávaní pomocou regulárneho výrazu" msgid "non-integer argument" msgstr "nečíselný argument" -#: src/expr.c:793 src/truncate.c:316 +#: src/expr.c:793 src/truncate.c:314 #, c-format msgid "division by zero" msgstr "delenie nulou" -#: src/expr.c:887 src/sort.c:2029 +#: src/expr.c:887 src/sort.c:2044 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "nastavením LC_ALL='C' obídete tento problém" @@ -4125,25 +4184,32 @@ msgstr "nastavením LC_ALL='C' obídete tento problém" msgid "the strings compared were %s and %s" msgstr "Porovnávané reťazce boli %s a %s." -#: src/factor.c:449 -msgid "using arbitrary-precision arithmetic" +#. This is a proper name. See the gettext manual, section Names. +#: src/factor.c:111 +msgid "Niels Moller" msgstr "" -#: src/factor.c:460 -msgid "using single-precision arithmetic" +#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459 +#, c-format +msgid "Lucas prime test failure. This should not happen" msgstr "" -#: src/factor.c:465 src/od.c:1640 src/od.c:1709 +#: src/factor.c:2092 #, c-format -msgid "%s is too large" -msgstr "%s je príliš veľa" +msgid "squfof queue overflow" +msgstr "" -#: src/factor.c:469 +#: src/factor.c:2419 #, c-format msgid "%s is not a valid positive integer" msgstr "%s nie je platné kladné celé číslo" -#: src/factor.c:494 +#: src/factor.c:2442 src/od.c:1646 src/od.c:1715 +#, c-format +msgid "%s is too large" +msgstr "%s je príliš veľa" + +#: src/factor.c:2454 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4152,7 +4218,7 @@ msgstr "" "Použitie: %s [ČÍSLO]...\n" " alebo: %s VOĽBA\n" -#: src/factor.c:499 +#: src/factor.c:2459 #, fuzzy msgid "" "Print the prime factors of each specified integer NUMBER. If none\n" @@ -4181,20 +4247,19 @@ msgid "cannot stat current directory (now %s)" msgstr "nie je možné stat() aktuálny adresár (%s)" #. This is a proper name. See the gettext manual, section Names. -#: src/fmt.c:37 +#: src/fmt.c:38 msgid "Ross Paterson" msgstr "Ross Paterson" -#: src/fmt.c:269 +#: src/fmt.c:270 #, fuzzy, c-format msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n" msgstr "Použitie: %s [-ČÍSLICA] [PREPÍNAČ]... [SÚBOR]...\n" -#: src/fmt.c:270 +#: 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" -"\n" msgstr "" #: src/fmt.c:278 @@ -4210,8 +4275,8 @@ msgstr "" "formátom\n" " -s, --split-only iba rozdelí dlhé riadky\n" -#: src/fmt.c:285 -#, fuzzy, c-format +#: src/fmt.c:287 +#, fuzzy, 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" @@ -4222,14 +4287,14 @@ msgstr "" " -u, --uniform-spacing jedna medzera medzi slovami, dve za vetou\n" " -w, --width=ŠÍRKA maximálna šírka riadka (implicitne 75 stĺpcov)\n" -#: src/fmt.c:357 +#: src/fmt.c:359 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" "option; use -w N instead" msgstr "" -#: src/fmt.c:403 src/fmt.c:414 +#: src/fmt.c:405 src/fmt.c:416 #, c-format msgid "invalid width: %s" msgstr "neplatná šírka: %s" @@ -4238,23 +4303,22 @@ msgstr "neplatná šírka: %s" msgid "" "Wrap input lines in each FILE (standard input by default), writing to\n" "standard output.\n" -"\n" msgstr "" -#: src/fold.c:78 +#: src/fold.c:77 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" " -w, --width=WIDTH use WIDTH columns instead of 80\n" msgstr "" -#: src/fold.c:289 src/pr.c:836 +#: src/fold.c:288 src/pr.c:832 #, c-format 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:75 +#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 #: src/truncate.c:37 msgid "Padraig Brady" msgstr "" @@ -4270,17 +4334,17 @@ msgid "" "\n" msgstr "" -#: src/group-list.c:69 src/id.c:345 src/setuidgid.c:184 +#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184 #, 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:350 +#: src/group-list.c:74 src/id.c:370 #, fuzzy, c-format msgid "failed to get groups for the current process" msgstr "zmena skupiny %s na %s zlyhala\n" -#: src/group-list.c:104 +#: src/group-list.c:114 #, fuzzy, c-format msgid "cannot find name for group ID %lu" msgstr "nie je možné zmeniť používateľa a/alebo skupinu %s" @@ -4305,7 +4369,7 @@ msgstr "nie je možné nastaviť ID používateľa" #: src/groups.c:110 src/id.c:241 #, fuzzy, c-format msgid "cannot get effective GID" -msgstr "nie je možné dereferencovať %s" +msgstr "súbor sa nedá rozdeliť viacerými spôsobmi" #: src/groups.c:115 src/id.c:246 #, fuzzy, c-format @@ -4318,11 +4382,11 @@ msgid "%s: no such user" msgstr "%s: Používateľ neexistuje" #: 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" -"\n" msgstr "" "Vypíše prvých 10 riadkov každého SÚBORu na štandardný výstup. S viac ako\n" "jedným SÚBORom, bude pred vypísaním každého uvedená hlavička obsahujúca " @@ -4330,7 +4394,7 @@ msgstr "" "súboru. Ak SÚBOR nebude zadaný alebo bude -, načíta sa štandardný vstup.\n" "\n" -#: src/head.c:118 +#: src/head.c:117 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -4340,13 +4404,13 @@ msgid "" " K lines of each file\n" msgstr "" -#: src/head.c:126 +#: 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 "" -#: src/head.c:132 +#: src/head.c:131 #, fuzzy msgid "" "\n" @@ -4362,59 +4426,59 @@ msgstr "" "Každý symbol KONV môže byť:\n" "\n" -#: src/head.c:152 -#, c-format -msgid "error writing %s" -msgstr "chyba pri zápise %s" - -#: src/head.c:155 +#: src/head.c:154 #, c-format msgid "%s: file has shrunk too much" msgstr "" -#: src/head.c:228 src/head.c:1044 +#: src/head.c:227 src/head.c:1051 #, c-format msgid "%s: number of bytes is too large" msgstr "%s: počet bajtov je príliš veľký" -#: src/head.c:441 +#: src/head.c:440 #, c-format msgid "%s: cannot lseek back to original position" msgstr "" -#: src/head.c:613 src/head.c:684 src/tail.c:450 +#: src/head.c:612 src/head.c:691 src/tail.c:449 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: nie je možné presunúť sa na pozíciu %s" -#: src/head.c:791 +#: src/head.c:673 +#, 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" # src/tail.c:968 -#: src/head.c:878 +#: src/head.c:885 #, 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:879 +#: src/head.c:886 msgid "number of lines" msgstr "počet riadkov" -#: src/head.c:879 +#: src/head.c:886 msgid "number of bytes" msgstr "počet bajtov" -#: src/head.c:886 src/tail.c:1947 +#: src/head.c:893 src/tail.c:1947 msgid "invalid number of lines" msgstr "chybný počet riadkov" -#: src/head.c:887 src/tail.c:1948 +#: src/head.c:894 src/tail.c:1948 msgid "invalid number of bytes" msgstr "chybný počet bajtov" -#: src/head.c:974 src/head.c:1032 +#: src/head.c:981 src/head.c:1039 #, c-format msgid "invalid trailing option -- %c" msgstr "chybná posledná voľba -- %c" @@ -4533,88 +4597,88 @@ msgstr "nie je možné zistiť typ procesora" #: src/id.c:224 #, fuzzy, c-format msgid "cannot get effective UID" -msgstr "nie je možné dereferencovať %s" +msgstr "súbor sa nedá rozdeliť viacerými spôsobmi" -#: src/id.c:289 +#: src/id.c:311 #, fuzzy, c-format -msgid "cannot find name for user ID %lu" +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:309 +#: src/id.c:329 #, fuzzy, c-format -msgid "uid=%lu" +msgid "uid=%s" msgstr "uid=%lu" -#: src/id.c:314 +#: src/id.c:334 #, fuzzy, c-format -msgid " gid=%lu" -msgstr " egid=%lu" +msgid " gid=%s" +msgstr " gid=%lu" -#: src/id.c:321 +#: src/id.c:341 #, fuzzy, c-format -msgid " euid=%lu" -msgstr " egid=%lu" +msgid " euid=%s" +msgstr " euid=%lu" -#: src/id.c:329 -#, c-format -msgid " egid=%lu" +#: src/id.c:349 +#, fuzzy, c-format +msgid " egid=%s" msgstr " egid=%lu" -#: src/id.c:357 +#: src/id.c:377 msgid " groups=" msgstr " skupiny=" -#: src/id.c:373 +#: src/id.c:393 #, fuzzy, c-format msgid " context=%s" msgstr "neplatný kontexxt: %s" -#: src/install.c:372 +#: src/install.c:373 #, fuzzy, c-format msgid "warning: %s: failed to change context to %s" msgstr "nie je možné vytvoriť adresár %s" -#: src/install.c:413 +#: src/install.c:414 #, c-format msgid "creating directory %s" msgstr "vytvára sa adresár %s" -#: src/install.c:481 +#: src/install.c:482 #, fuzzy, c-format msgid "cannot change ownership of %s" msgstr "nie je možné zmeniť práva %s" -#: src/install.c:505 +#: src/install.c:506 #, fuzzy, c-format msgid "cannot set time stamps for %s" msgstr "nie je možné vytvoriť adresár %s" -#: src/install.c:526 src/split.c:412 src/timeout.c:387 +#: src/install.c:527 src/split.c:426 src/timeout.c:439 #, fuzzy, c-format msgid "fork system call failed" msgstr "veľkosť bloku" -#: src/install.c:530 +#: src/install.c:531 #, fuzzy, c-format msgid "cannot run %s" msgstr "nie je možné spustiť %s" -#: src/install.c:534 +#: src/install.c:535 #, fuzzy, c-format msgid "waiting for strip" msgstr "chyba pri zápise %s" -#: src/install.c:536 +#: src/install.c:537 #, c-format msgid "strip process terminated abnormally" msgstr "" -#: src/install.c:557 +#: src/install.c:558 #, c-format msgid "invalid user %s" msgstr "neplatný používateľ %s" -#: src/install.c:593 +#: src/install.c:594 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -4626,7 +4690,7 @@ msgstr "" " alebo: %s [VOĽBA]... ZAČIATOK KONIEC\n" " alebo: %s [VOĽBA]... ZAČIATOK KROK LAST\n" -#: src/install.c:600 +#: src/install.c:601 msgid "" "\n" "This install program copies files (often just compiled) into destination\n" @@ -4638,7 +4702,6 @@ msgid "" "In the first three forms, copy SOURCE to DEST or multiple SOURCE(s) to\n" "the existing DIRECTORY, while setting permission modes and owner/group.\n" "In the 4th form, create all components of the given DIRECTORY(ies).\n" -"\n" msgstr "" #: src/install.c:615 @@ -4686,55 +4749,55 @@ msgid "" "directories\n" msgstr "" -#: src/install.c:858 +#: src/install.c:859 #, c-format msgid "" "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled" msgstr "" -#: src/install.c:868 +#: src/install.c:869 #, c-format msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled" msgstr "" -#: src/install.c:885 +#: src/install.c:886 #, 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:888 +#: src/install.c:889 #, 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:892 +#: src/install.c:893 #, c-format msgid "cannot force target context to %s and preserve it" msgstr "" -#: src/install.c:946 src/mkdir.c:202 src/stdbuf.c:327 +#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326 #, fuzzy, c-format msgid "invalid mode %s" msgstr "chybné číslo položky: `%s'" -#: src/install.c:953 +#: src/install.c:954 #, c-format msgid "WARNING: ignoring --strip-program option as -s option was not specified" msgstr "" -#: src/install.c:958 +#: src/install.c:959 #, 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:965 +#: src/install.c:966 #, 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:971 +#: src/install.c:972 #, c-format msgid "" "the --compare (-C) option is ignored when you specify a mode with non-" @@ -4742,7 +4805,7 @@ msgid "" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/join.c:40 src/sort.c:65 +#: src/join.c:40 src/sort.c:66 msgid "Mike Haertel" msgstr "Mike Haertel" @@ -4810,7 +4873,7 @@ msgstr "" #: src/join.c:403 #, c-format -msgid "%s:%ju: is not sorted: %.*s" +msgid "%s:%<PRIuMAX>: is not sorted: %.*s" msgstr "" #: src/join.c:840 src/join.c:1038 @@ -4838,12 +4901,12 @@ msgstr "" msgid "conflicting empty-field replacement strings" msgstr "" -#: src/join.c:1101 src/sort.c:4414 +#: src/join.c:1101 src/sort.c:4468 #, fuzzy, c-format msgid "multi-character tab %s" msgstr "viacznakový tabulátor `%s'" -#: src/join.c:1105 src/sort.c:4419 +#: src/join.c:1105 src/sort.c:4473 #, c-format msgid "incompatible tabs" msgstr "nekompatibilné tabulátory" @@ -4865,14 +4928,13 @@ msgstr "" " alebo: %s -t [SIGNÁL]...\n" #: src/kill.c:82 -msgid "" -"Send signals to processes, or list signals.\n" -"\n" +#, fuzzy +msgid "Send signals to processes, or list signals.\n" msgstr "" "Poslať signály procesom alebo vypísať signály.\n" "\n" -#: src/kill.c:89 +#: src/kill.c:88 #, fuzzy msgid "" " -s, --signal=SIGNAL, -SIGNAL\n" @@ -4888,7 +4950,7 @@ msgstr "" " --help vypísať túto pomoc a skončiť\n" " --version vypísať informáciu o verzii a skončiť\n" -#: src/kill.c:97 +#: src/kill.c:96 #, fuzzy msgid "" "\n" @@ -4901,32 +4963,32 @@ msgstr "" "alebo návratový kód procsu ukončeného signálom.\n" "PID je celé číslo; ak je záporné, označuje skupinu procesov.\n" -#: src/kill.c:206 +#: src/kill.c:205 #, c-format msgid "%s: invalid process id" msgstr "%s: neplatný id procesu" -#: src/kill.c:260 +#: src/kill.c:259 #, c-format msgid "invalid option -- %c" msgstr "neplatná voľba -- %c" -#: src/kill.c:269 +#: src/kill.c:268 #, c-format msgid "%s: multiple signals specified" msgstr "%s: uvedených viacero signálov" -#: src/kill.c:283 +#: src/kill.c:282 #, c-format msgid "multiple -l or -t options specified" msgstr "bolo zadaných viacero volieb -l alebo -t" -#: src/kill.c:300 +#: src/kill.c:299 #, c-format msgid "cannot combine signal with -l or -t" msgstr "nie je možné kombinovať signál s voľbou -l alebo -t" -#: src/kill.c:306 +#: src/kill.c:305 #, c-format msgid "no process ID specified" msgstr "nebol zadaný ID procesu" @@ -5034,10 +5096,9 @@ msgid "" "When creating hard links, each TARGET must exist. Symbolic links\n" "can hold arbitrary text; if later resolved, a relative link is\n" "interpreted in relation to its parent directory.\n" -"\n" msgstr "" -#: src/ln.c:395 +#: src/ln.c:394 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -5050,7 +5111,7 @@ msgid "" " -f, --force remove existing destination files\n" msgstr "" -#: src/ln.c:403 +#: src/ln.c:402 msgid "" " -i, --interactive prompt whether to remove destinations\n" " -L, --logical dereference TARGETs that are symbolic links\n" @@ -5062,7 +5123,7 @@ msgid "" " -s, --symbolic make symbolic links instead of hard links\n" msgstr "" -#: src/ln.c:412 +#: src/ln.c:411 msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" " -t, --target-directory=DIRECTORY specify the DIRECTORY in which to " @@ -5072,25 +5133,10 @@ msgid "" " -v, --verbose print name of each linked file\n" msgstr "" -#: src/ln.c:428 -#, 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 nikdy nevytvárať záložné kópie (ani ak bolo zadané --" -"backup)\n" -" numbered, t tvoriť číslované záložné kópie\n" -" existing, nil tvoriť číslované, pokiaľ už číslované záložné kópie\n" -" existujú, inak tvoriť jednoduché\n" -" simple, never vždy tvoriť jednoduché záložné kópie súborov \n" - -#: src/ln.c:435 +#: src/ln.c:433 #, 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 "" @@ -5160,7 +5206,7 @@ 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:1976 +#: src/ls.c:1750 src/ptx.c:1975 #, c-format msgid "invalid line width: %s" msgstr "neplatná šírka riadka: %s" @@ -5224,7 +5270,7 @@ msgstr "číta sa adresár %s" msgid "closing directory %s" msgstr "zatvíra sa adresár %s" -#: src/ls.c:3301 +#: src/ls.c:3302 #, c-format msgid "cannot compare file names %s and %s" msgstr "nie je možné porovnať názvy súborov %s a %s" @@ -5233,10 +5279,9 @@ msgstr "nie je možné porovnať názvy súborov %s a %s" msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" -"\n" msgstr "" -#: src/ls.c:4729 +#: src/ls.c:4728 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -5245,7 +5290,7 @@ msgid "" "characters\n" msgstr "" -#: src/ls.c:4735 +#: src/ls.c:4734 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them. E." "g.,\n" @@ -5259,7 +5304,7 @@ msgid "" " otherwise: sort by ctime, newest first\n" msgstr "" -#: src/ls.c:4745 +#: src/ls.c:4744 msgid "" " -C list entries by columns\n" " --color[=WHEN] colorize the output. WHEN defaults to " @@ -5271,7 +5316,7 @@ msgid "" " -D, --dired generate output designed for Emacs' dired mode\n" msgstr "" -#: src/ls.c:4753 +#: src/ls.c:4752 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -5281,11 +5326,11 @@ msgid "" " --full-time like -l --time-style=full-iso\n" msgstr "" -#: src/ls.c:4761 +#: src/ls.c:4760 msgid " -g like -l, but do not list owner\n" msgstr "" -#: src/ls.c:4764 +#: src/ls.c:4763 msgid "" " --group-directories-first\n" " group directories before files.\n" @@ -5293,7 +5338,7 @@ msgid "" " use of --sort=none (-U) disables grouping\n" msgstr "" -#: src/ls.c:4770 +#: src/ls.c:4769 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" @@ -5301,7 +5346,7 @@ msgid "" " --si likewise, but use powers of 1000 not 1024\n" msgstr "" -#: src/ls.c:4776 +#: src/ls.c:4775 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5314,7 +5359,7 @@ msgid "" " (overridden by -a or -A)\n" msgstr "" -#: src/ls.c:4786 +#: src/ls.c:4785 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -5326,7 +5371,7 @@ msgid "" " -k, --kibibytes use 1024-byte blocks\n" msgstr "" -#: src/ls.c:4796 +#: src/ls.c:4795 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5336,7 +5381,7 @@ msgid "" "entries\n" msgstr "" -#: src/ls.c:4804 +#: src/ls.c:4803 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. " @@ -5347,7 +5392,7 @@ msgid "" " append / indicator to directories\n" msgstr "" -#: src/ls.c:4812 +#: src/ls.c:4811 #, fuzzy msgid "" " -q, --hide-control-chars print ? instead of non graphic characters\n" @@ -5392,15 +5437,16 @@ 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:4821 +#: src/ls.c:4820 +#, fuzzy 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 "" +msgstr " -R, --recursive vypíše adresáre rekurzívne\n" -#: src/ls.c:4826 +#: src/ls.c:4825 msgid "" " -S sort by file size\n" " --sort=WORD sort by WORD instead of name: none -U,\n" @@ -5412,7 +5458,7 @@ msgid "" " if --sort=time\n" msgstr "" -#: src/ls.c:4836 +#: src/ls.c:4835 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, +FORMAT.\n" @@ -5424,13 +5470,13 @@ msgid "" " takes effect only outside the POSIX locale\n" msgstr "" -#: src/ls.c:4845 +#: src/ls.c:4844 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:4849 +#: src/ls.c:4848 msgid "" " -u with -lt: sort by, and show, access time\n" " with -l: show access time and sort by name\n" @@ -5439,7 +5485,7 @@ msgid "" " -v natural sort of (version) numbers within text\n" msgstr "" -#: src/ls.c:4856 +#: src/ls.c:4855 msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" @@ -5449,7 +5495,7 @@ msgid "" " -1 list one file per line\n" msgstr "" -#: src/ls.c:4866 +#: src/ls.c:4865 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5458,7 +5504,7 @@ msgid "" "variable can change the settings. Use the dircolors command to set it.\n" msgstr "" -#: src/ls.c:4873 +#: src/ls.c:4872 msgid "" "\n" "Exit status:\n" @@ -5482,7 +5528,7 @@ msgstr "Scott Miller" msgid "David Madore" msgstr "David Madore" -#: src/md5sum.c:162 +#: src/md5sum.c:164 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -5495,34 +5541,38 @@ msgstr "" " Pokiaľ nie je SÚBOR zadaný, načíta sa štandardný vstup.\n" "\n" -#: src/md5sum.c:172 +#: src/md5sum.c:174 #, fuzzy msgid "" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr " -b, --binary čítať v binárnom režime\n" -#: src/md5sum.c:176 +#: src/md5sum.c:178 #, fuzzy msgid " -b, --binary read in binary mode\n" msgstr " -b, --binary čítať v binárnom režime\n" -#: src/md5sum.c:179 +#: src/md5sum.c:181 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr "" -#: src/md5sum.c:183 +#: src/md5sum.c:184 +msgid " --tag create a BSD-style checksum\n" +msgstr "" + +#: src/md5sum.c:188 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" -#: src/md5sum.c:187 +#: src/md5sum.c:192 #, fuzzy msgid " -t, --text read in text mode (default)\n" msgstr " -b, --binary čítať v binárnom režime\n" -#: src/md5sum.c:190 +#: src/md5sum.c:195 msgid "" "\n" "The following three options are useful only when verifying checksums:\n" @@ -5532,12 +5582,12 @@ msgid "" "\n" msgstr "" -#: src/md5sum.c:198 +#: src/md5sum.c:203 msgid "" " --strict with --check, exit non-zero for any invalid input\n" msgstr "" -#: src/md5sum.c:203 +#: src/md5sum.c:208 #, c-format msgid "" "\n" @@ -5547,35 +5597,35 @@ msgid "" "space for text), and name for each FILE.\n" msgstr "" -#: src/md5sum.c:502 +#: src/md5sum.c:523 #, 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:526 +#: src/md5sum.c:547 #, 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:551 +#: src/md5sum.c:572 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: ZLYHALO otvorenie alebo čítanie\n" -#: src/md5sum.c:574 +#: src/md5sum.c:595 msgid "FAILED" msgstr "CHYBNÝ" -#: src/md5sum.c:576 +#: src/md5sum.c:597 msgid "OK" msgstr "V PORIADKU" -#: src/md5sum.c:600 +#: src/md5sum.c:621 #, 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:610 +#: src/md5sum.c:631 #, fuzzy, c-format msgid "WARNING: %<PRIuMAX> line is improperly formatted" msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted" @@ -5583,7 +5633,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:618 +#: src/md5sum.c:639 #, c-format msgid "WARNING: %<PRIuMAX> listed file could not be read" msgid_plural "WARNING: %<PRIuMAX> listed files could not be read" @@ -5591,7 +5641,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/md5sum.c:626 +#: src/md5sum.c:647 #, c-format msgid "WARNING: %<PRIuMAX> computed checksum did NOT match" msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match" @@ -5599,29 +5649,39 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/md5sum.c:704 +#: src/md5sum.c:760 +#, c-format +msgid "--tag does not support --text mode" +msgstr "" + +#: src/md5sum.c:766 +#, 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 #, 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:712 +#: src/md5sum.c:781 #, 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:719 +#: src/md5sum.c:788 #, 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:726 +#: src/md5sum.c:795 #, 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:733 +#: src/md5sum.c:802 #, 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" @@ -5632,12 +5692,10 @@ msgid "Usage: %s [OPTION]... DIRECTORY...\n" msgstr "Použitie: %s [VOĽBA... ADRESÁR...\n" #: src/mkdir.c:57 -msgid "" -"Create the DIRECTORY(ies), if they do not already exist.\n" -"\n" +msgid "Create the DIRECTORY(ies), if they do not already exist.\n" msgstr "" -#: src/mkdir.c:64 +#: src/mkdir.c:63 #, fuzzy msgid "" " -m, --mode=MODE set file mode (as in chmod), not a=rwx - umask\n" @@ -5653,7 +5711,7 @@ msgstr "" " pokiaľ je to potrebné.\n" " -v, --verbose vypísať správu o každom vytváranom adresári\n" -#: src/mkdir.c:169 +#: src/mkdir.c:168 #, c-format msgid "created directory %s" msgstr "bol vytvorený adresár %s" @@ -5664,12 +5722,10 @@ msgid "Usage: %s [OPTION]... NAME...\n" msgstr "Použitie: %s [VOĽBA]... NÁZOV...\n" #: src/mkfifo.c:52 -msgid "" -"Create named pipes (FIFOs) with the given NAMEs.\n" -"\n" +msgid "Create named pipes (FIFOs) with the given NAMEs.\n" msgstr "" -#: src/mkfifo.c:59 src/mknod.c:61 +#: src/mkfifo.c:58 src/mknod.c:60 #, fuzzy msgid "" " -m, --mode=MODE set file permission bits to MODE, not a=rw - umask\n" @@ -5677,17 +5733,17 @@ msgstr "" " -m, --mode=PRÁVA nastaviť prístupové PRÁVA (ako s „chmod“), nie a=rw - " "umask\n" -#: src/mkfifo.c:62 +#: src/mkfifo.c:61 msgid "" " -Z, --context=CTX set the SELinux security context of each NAME to CTX\n" msgstr "" -#: src/mkfifo.c:122 src/mknod.c:128 +#: src/mkfifo.c:121 src/mknod.c:127 #, c-format msgid "invalid mode" msgstr "neplatný režim" -#: src/mkfifo.c:127 src/mknod.c:133 +#: src/mkfifo.c:126 src/mknod.c:132 #, c-format msgid "mode must specify only file permission bits" msgstr "" @@ -5698,16 +5754,14 @@ 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 -msgid "" -"Create the special file NAME of the given TYPE.\n" -"\n" +msgid "Create the special file NAME of the given TYPE.\n" msgstr "" -#: src/mknod.c:64 +#: src/mknod.c:63 msgid " -Z, --context=CTX set the SELinux security context of NAME to CTX\n" msgstr "" -#: src/mknod.c:69 +#: src/mknod.c:68 msgid "" "\n" "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n" @@ -5716,7 +5770,7 @@ msgid "" "otherwise, as decimal. TYPE may be:\n" msgstr "" -#: src/mknod.c:76 +#: src/mknod.c:75 msgid "" "\n" " b create a block (buffered) special file\n" @@ -5728,42 +5782,42 @@ msgstr "" " c, u vytvoriť znakový špeciálny súbor (bez bufera)\n" " p vytvoriť rúru (FIFO)\n" -#: src/mknod.c:151 +#: src/mknod.c:150 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:161 +#: src/mknod.c:160 msgid "Fifos do not have major and minor device numbers." msgstr "FIFO nemajú hlavné a vedľajšie čísla zariadenia." -#: src/mknod.c:177 +#: src/mknod.c:176 #, c-format msgid "block special files not supported" msgstr "špeciálne blokové súbory nie sú podporované" -#: src/mknod.c:186 +#: src/mknod.c:185 #, c-format msgid "character special files not supported" msgstr "špeciálne znakové súbory nie sú podporované" -#: src/mknod.c:202 +#: src/mknod.c:201 #, c-format msgid "invalid major device number %s" msgstr "neplatné hlavné číslo zariadenia %s" -#: src/mknod.c:207 +#: src/mknod.c:206 #, c-format msgid "invalid minor device number %s" msgstr "neplatné vedľajšie číslo zariadenia %s" -#: src/mknod.c:212 +#: src/mknod.c:211 #, c-format msgid "invalid device %s %s" msgstr "neplatné zariadenie %s %s" -#: src/mknod.c:226 +#: src/mknod.c:225 #, c-format msgid "invalid device type %s" msgstr "neplatný typ zariadenia %s" @@ -5822,58 +5876,59 @@ msgid "" " directory specified via -p; else /tmp [deprecated]\n" msgstr "" -#: src/mktemp.c:222 +#: src/mktemp.c:223 #, c-format msgid "failed to redirect stderr to /dev/null" msgstr "" -#: src/mktemp.c:228 +#: src/mktemp.c:229 #, c-format msgid "too many templates" msgstr "príliš veľa šablón" -#: src/mktemp.c:248 +#: src/mktemp.c:249 #, c-format msgid "with --suffix, template %s must end in X" msgstr "" -#: src/mktemp.c:273 src/split.c:1117 +#: src/mktemp.c:274 src/split.c:1130 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "" -#: src/mktemp.c:278 +#: src/mktemp.c:279 #, c-format msgid "too few X's in template %s" msgstr "" -#: src/mktemp.c:291 +#: src/mktemp.c:292 #, c-format msgid "invalid template, %s, contains directory separator" msgstr "" -#: src/mktemp.c:305 +#: src/mktemp.c:306 #, c-format msgid "invalid template, %s; with --tmpdir, it may not be absolute" msgstr "" -#: src/mktemp.c:325 +#: src/mktemp.c:326 #, 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:335 +#: src/mktemp.c:336 #, c-format msgid "failed to create file via template %s" msgstr "nepodarilo sa vytvoriť súbor prostredníctvom šablóny %s" -#: src/mv.c:290 -msgid "" -"Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" -"\n" +#: src/mv.c:292 +#, 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:297 +#: src/mv.c:298 #, fuzzy msgid "" " --backup[=CONTROL] make a backup of each existing destination " @@ -5895,7 +5950,7 @@ msgstr "" " -d rovnaké ako --no-dereference --" "preserve=links\n" -#: src/mv.c:306 +#: src/mv.c:307 msgid "" " --strip-trailing-slashes remove any trailing slashes from each " "SOURCE\n" @@ -5903,7 +5958,7 @@ msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" msgstr "" -#: src/mv.c:311 +#: src/mv.c:312 msgid "" " -t, --target-directory=DIRECTORY move all SOURCE arguments into " "DIRECTORY\n" @@ -5929,28 +5984,30 @@ msgstr "Použitie: %s [VOĹBA] [PRÍKAZ [ARG]...]\n" #, c-format msgid "" "Run COMMAND with an adjusted niceness, which affects process scheduling.\n" -"With no COMMAND, print the current niceness. Nicenesses range from\n" -"%d (most favorable scheduling) to %d (least favorable).\n" -"\n" -" -n, --adjustment=N add integer N to the niceness (default 10)\n" +"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 "" -#: src/nice.c:168 +#: src/nice.c:82 +msgid " -n, --adjustment=N add integer N to the niceness (default 10)\n" +msgstr "" + +#: src/nice.c:172 #, c-format msgid "invalid adjustment %s" msgstr "neplatné nastavenie %s" -#: src/nice.c:177 +#: src/nice.c:181 #, c-format msgid "a command must be given with an adjustment" msgstr "s úpravou musí byť zadaný príkaz" -#: src/nice.c:184 src/nice.c:195 +#: src/nice.c:188 src/nice.c:199 #, c-format msgid "cannot get niceness" msgstr "nie je možné zistiť nice" -#: src/nice.c:201 +#: src/nice.c:205 #, c-format msgid "cannot set niceness" msgstr "nie je možné nastaviť nice" @@ -5960,14 +6017,17 @@ msgstr "nie je možné nastaviť nice" msgid "Scott Bartram" msgstr "Scott Bartram" -#: src/nl.c:186 +#: 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" -"\n" msgstr "" +"V každom SÚBORe prevedie medzery na tabulátory a výsledok vypisuje\n" +"na štandardný výstup. Ak nebude SÚBOR zadaný alebo bude -, načíta sa\n" +"štandardný vstup.\n" -#: src/nl.c:194 +#: src/nl.c:186 msgid "" " -b, --body-numbering=STYLE use STYLE for numbering body lines\n" " -d, --section-delimiter=CC use CC for separating logical pages\n" @@ -5977,7 +6037,7 @@ msgstr "" " -d, --section-delimiter=CC použiť CC na oddelenie logických stránok\n" " -f, --footer-numbering=ŠTÝL použiť ŠTÝL na číslovanie riadkov pätičky\n" -#: src/nl.c:199 +#: src/nl.c:191 msgid "" " -h, --header-numbering=STYLE use STYLE for numbering header lines\n" " -i, --line-increment=NUMBER line number increment at each line\n" @@ -5989,13 +6049,13 @@ msgid "" " -s, --number-separator=STRING add STRING after (possible) line number\n" msgstr "" -#: src/nl.c:207 +#: src/nl.c:199 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 "" -#: src/nl.c:213 +#: src/nl.c:205 msgid "" "\n" "By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC are\n" @@ -6003,7 +6063,7 @@ msgid "" "second character implies :. Type \\\\ for \\. STYLE is one of:\n" msgstr "" -#: src/nl.c:219 +#: src/nl.c:211 msgid "" "\n" " a number all lines\n" @@ -6020,52 +6080,47 @@ msgid "" "\n" msgstr "" -#: src/nl.c:286 +#: src/nl.c:278 #, c-format msgid "line number overflow" msgstr "pretečenie počtu riadkov" -#: src/nl.c:486 +#: src/nl.c:478 #, c-format msgid "invalid header numbering style: %s" msgstr "neplatný štýl číslovania hlavičky: %s" -#: src/nl.c:494 +#: src/nl.c:486 #, c-format msgid "invalid body numbering style: %s" msgstr "neplatný štýl číslovania tela: %s" -#: src/nl.c:502 +#: src/nl.c:494 #, c-format msgid "invalid footer numbering style: %s" msgstr "neplatný štýl číslovania pätičky: %s" -#: src/nl.c:511 +#: src/nl.c:503 #, c-format msgid "invalid starting line number: %s" msgstr "neplatné počiatočné číslo riadka: %s" -#: src/nl.c:517 -#, c-format -msgid "WARNING: --page-increment is deprecated; use --line-increment instead" -msgstr "" - -#: src/nl.c:524 +#: src/nl.c:512 #, c-format msgid "invalid line number increment: %s" msgstr "neplatná hodnota prírastku čísla riadka: %s" -#: src/nl.c:536 +#: src/nl.c:524 #, c-format msgid "invalid number of blank lines: %s" msgstr "neplatný počet prázdnych riadkov: %s" -#: src/nl.c:550 +#: src/nl.c:538 #, c-format msgid "invalid line number field width: %s" msgstr "neplatná šírka poľa čísla riadku: %s" -#: src/nl.c:569 +#: src/nl.c:557 #, c-format msgid "invalid line numbering format: %s" msgstr "neplatný formát číslovania riadkov: %s" @@ -6106,20 +6161,15 @@ msgstr "obidva súbory nemôžu byť štandardným vstupom" msgid "ignoring input" msgstr "ignoruje sa vstup" -#: src/nohup.c:163 src/nohup.c:165 -#, c-format -msgid "failed to open %s" -msgstr "nepodarilo sa otvoriť %s" - #: src/nohup.c:175 #, c-format msgid "ignoring input and appending output to %s" msgstr "" #: src/nohup.c:176 -#, fuzzy, c-format +#, c-format msgid "appending output to %s" -msgstr "mená sa skupina %s" +msgstr "pridáva sa výstup k %s" #: src/nohup.c:193 #, c-format @@ -6142,33 +6192,367 @@ msgid "failed to redirect standard error" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:32 +#: src/nproc.c:33 msgid "Giuseppe Scrivano" msgstr "" -#: src/nproc.c:56 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 +#: src/nproc.c:57 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Použitie: %s [VOĽBA]...\n" -#: src/nproc.c:57 +#: src/nproc.c:58 msgid "" "Print the number of processing units available to the current process,\n" "which may be less than the number of online processors\n" "\n" msgstr "" -#: src/nproc.c:62 +#: src/nproc.c:63 msgid "" " --all print the number of installed processors\n" " --ignore=N if possible, exclude N processing units\n" msgstr "" -#: src/nproc.c:106 +#: src/nproc.c:107 #, fuzzy, c-format 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 +msgid "Assaf Gordon" +msgstr "" + +#: src/numfmt.c:676 +#, fuzzy, c-format +msgid "value too large to be converted: '%s'" +msgstr "%s: hodnota nebola úplne prevedená" + +#: src/numfmt.c:680 +#, fuzzy, c-format +msgid "invalid number: '%s'" +msgstr "neplatné číslo %s" + +#: src/numfmt.c:684 +#, c-format +msgid "rejecting suffix in input: '%s' (consider using --from)" +msgstr "" + +#: src/numfmt.c:688 +#, fuzzy, c-format +msgid "invalid suffix in input: '%s'" +msgstr "naplatná prípona v argumente %s%s „%s“" + +#: src/numfmt.c:692 +#, c-format +msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)" +msgstr "" + +#: src/numfmt.c:723 +#, fuzzy, c-format +msgid "failed to prepare value '%Lf' for printing" +msgstr "%s: nepodarilo sa otvoriť na zápis" + +#: src/numfmt.c:787 +#, fuzzy, c-format +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 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [NUMBER]...\n" +msgstr "Použitie: %s [PREPÍNAČ]... [SÚBOR]...\n" + +#: src/numfmt.c:816 +msgid "" +"Reformat NUMBER(s), or the numbers from standard input if none are " +"specified.\n" +msgstr "" + +#: src/numfmt.c:820 +msgid " --debug print warnings about invalid input\n" +msgstr "" + +#: src/numfmt.c:823 +msgid "" +" -d, --delimiter=X use X instead of whitespace for field delimiter\n" +msgstr "" + +#: src/numfmt.c:826 +msgid "" +" --field=N replace the number in input field N (default is 1)\n" +msgstr "" + +#: src/numfmt.c:829 +msgid "" +" --format=FORMAT use printf style floating-point FORMAT;\n" +" see FORMAT below for details\n" +msgstr "" + +#: src/numfmt.c:833 +msgid "" +" --from=UNIT auto-scale input numbers to UNITs; default is " +"'none';\n" +" see UNIT below\n" +msgstr "" + +#: src/numfmt.c:837 +msgid "" +" --from-unit=N specify the input unit size (instead of the default " +"1)\n" +msgstr "" + +#: src/numfmt.c:840 +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 "" + +#: src/numfmt.c:844 +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 +msgid "" +" --invalid=MODE failure mode for invalid numbers: MODE can be:\n" +" abort (default), fail, warn, ignore\n" +msgstr "" + +#: src/numfmt.c:852 +msgid "" +" --padding=N pad the output to N characters; positive N will\n" +" right-align; negative N will left-align;\n" +" padding is ignored if the output is wider than N;\n" +" the default is to automatically pad if a " +"whitespace\n" +" is found\n" +msgstr "" + +#: src/numfmt.c:859 +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 +msgid "" +" --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" +" SUFFIX in input numbers\n" +msgstr "" + +#: src/numfmt.c:867 +msgid "" +" --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" +msgstr "" + +#: src/numfmt.c:870 +msgid "" +" --to-unit=N the output unit size (instead of the default 1)\n" +msgstr "" + +#: src/numfmt.c:877 +msgid "" +"\n" +"UNIT options:\n" +msgstr "" + +#: src/numfmt.c:880 +msgid " none no auto-scaling is done; suffixes will trigger an error\n" +msgstr "" + +#: src/numfmt.c:883 +msgid "" +" auto accept optional single/two letter suffix:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" +msgstr "" + +#: src/numfmt.c:889 +msgid "" +" si accept optional single letter suffix:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:894 +msgid "" +" iec accept optional single letter suffix:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:899 +msgid "" +" iec-i accept optional two-letter suffix:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:905 +#, 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" +msgstr "" + +#: src/numfmt.c:912 +#, c-format +msgid "" +"\n" +"Exit status is 0 if all input numbers were successfully converted.\n" +"By default, %s will stop at the first conversion error with exit status 2.\n" +"With --invalid='fail' a warning is printed for each conversion error\n" +"and the exit status is 2. With --invalid='warn' each conversion error is\n" +"diagnosed, but the exit status is 0. With --invalid='ignore' conversion\n" +"errors are not diagnosed and the exit status is 0.\n" +msgstr "" + +#: src/numfmt.c:921 +#, c-format +msgid "" +"\n" +"Examples:\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" +msgstr "" + +#: src/numfmt.c:974 src/seq.c:212 +#, fuzzy, c-format +msgid "format %s has no %% directive" +msgstr "cieľ %s nie je adresárom" + +#: src/numfmt.c:990 +#, fuzzy, c-format +msgid "invalid format %s (width overflow)" +msgstr "neplatná šírka vo formáte" + +#: src/numfmt.c:1007 src/seq.c:229 +#, c-format +msgid "format %s ends in %%" +msgstr "" + +#: src/numfmt.c:1010 +#, c-format +msgid "invalid format %s, directive must be %%['][-][N]f" +msgstr "" + +#: src/numfmt.c:1018 src/seq.c:236 +#, 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 "naplatná prípona v argumente %s%s „%s“" + +#: src/numfmt.c:1092 +#, c-format +msgid "value too large to be printed: '%Lg' (consider using --to)" +msgstr "" + +#: src/numfmt.c:1100 +#, c-format +msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" +msgstr "" + +#: src/numfmt.c:1184 +#, c-format +msgid "large input value '%s': possible precision loss" +msgstr "" + +#: src/numfmt.c:1293 +#, 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 "chybný rozsah stránok %s" + +#: src/numfmt.c:1401 +#, fuzzy, c-format +msgid "invalid field value '%s'" +msgstr "chybné číslo položky: `%s'" + +#: src/numfmt.c:1430 +#, fuzzy, c-format +msgid "invalid header value '%s'" +msgstr "neplatný dátum %s" + +#: src/numfmt.c:1456 +#, 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 +#, fuzzy, c-format +msgid "no conversion option specified" +msgstr "uvedených viacero volieb -i" + +#: src/numfmt.c:1471 +#, 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 +#, c-format +msgid "grouping has no effect in this locale" +msgstr "" + +#: src/numfmt.c:1486 +#, c-format +msgid "--header ignored with command-line input" +msgstr "" + +#: src/numfmt.c:1511 +#, fuzzy, c-format +msgid "error reading input" +msgstr "chyba pri čítaní %s" + +#: src/numfmt.c:1520 +#, 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 #, c-format msgid "" @@ -6193,29 +6577,39 @@ msgid "" msgstr "" #: src/od.c:307 -msgid "All arguments to long options are mandatory for short options.\n" +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" +"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" +"at first byte printed, incremented when dump is progressing.\n" +"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 "" -#: src/od.c:310 +#: src/od.c:318 msgid "" -" -A, --address-radix=RADIX decide how file offsets are printed\n" +" -A, --address-radix=RADIX output format for file offsets. RADIX is one\n" +" of [doxn], for Decimal, Octal, Hex or None\n" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" -#: src/od.c:314 +#: src/od.c:323 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" -" --traditional accept arguments in traditional form\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:324 +#: src/od.c:336 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" @@ -6223,7 +6617,7 @@ msgid "" " -d same as -t u2, select unsigned decimal 2-byte units\n" msgstr "" -#: src/od.c:332 +#: src/od.c:345 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -6233,27 +6627,16 @@ msgid "" " -x same as -t x2, select hexadecimal 2-byte units\n" msgstr "" -#: src/od.c:340 +#: src/od.c:353 msgid "" "\n" -"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" -"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" -"at first byte printed, incremented when dump is progressing.\n" -"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 "" - -#: src/od.c:349 -msgid "" "\n" "TYPE is made up of one or more of these specifications:\n" -"\n" " a named character, ignoring high-order bit\n" " c ASCII character or backslash escape\n" msgstr "" -#: src/od.c:356 +#: src/od.c:360 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -6262,40 +6645,49 @@ msgid "" " x[SIZE] hexadecimal, SIZE bytes per integer\n" msgstr "" -#: src/od.c:363 +#: src/od.c:367 msgid "" "\n" -"SIZE is a number. For TYPE in doux, SIZE may also be C for\n" +"SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" "sizeof(char), S for sizeof(short), I for sizeof(int) or L for\n" "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 "" -#: src/od.c:370 +#: src/od.c:374 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" +"Adding a z suffix to any type displays printable characters at the end of\n" +"each output line.\n" msgstr "" -#: src/od.c:380 +#: src/od.c:379 +#, 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" +"\n" +"\n" +"BYTES is hex with 0x or 0X prefix, and may have a multiplier suffix:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"and so on for G, T, P, E, Z, Y.\n" msgstr "" +"\n" +"Po BLOKOV a BAJTOV môže byť uvedená jedna z nasledovných prípon:\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 atď pre T, P, E, Z, Y.\n" +"\n" +"Každý symbol KONV môže byť:\n" +"\n" -#: src/od.c:633 src/od.c:753 +#: src/od.c:639 src/od.c:759 #, c-format msgid "invalid type string %s" msgstr "neplatný reťazec typu %s" -#: src/od.c:643 +#: src/od.c:649 #, c-format msgid "" "invalid type string %s;\n" @@ -6304,7 +6696,7 @@ msgstr "" "neplatný reťazec typu %s;\n" "tento systém neposkytuje %lu-bajtové celé čísla" -#: src/od.c:764 +#: src/od.c:770 #, c-format msgid "" "invalid type string %s;\n" @@ -6314,38 +6706,38 @@ msgstr "" "tento systém neposkytuje %lu-bajtové čísla s plávajúcou desatinnou\n" "čiarkou" -#: src/od.c:822 +#: src/od.c:828 #, fuzzy, c-format msgid "invalid character '%c' in type string %s" msgstr "neplatný znak „%c“ v reťazci typu „%s“" -#: src/od.c:1047 +#: src/od.c:1053 #, c-format msgid "cannot skip past end of combined input" msgstr "nemožno preskočiť koniec kombinovaného vstupu" -#: src/od.c:1603 +#: src/od.c:1609 #, 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:1729 +#: src/od.c:1735 #, c-format msgid "no type may be specified when dumping strings" msgstr "pri vypisovaní reťazcov nemožno zadať typ" -#: src/od.c:1804 +#: src/od.c:1810 #, fuzzy msgid "compatibility mode supports at most one file" msgstr "V kompatibilnom režime je podporovaný najviac jeden súbor." -#: src/od.c:1825 +#: src/od.c:1831 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "" -#: src/od.c:1868 +#: src/od.c:1874 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "upozornenie: chybná šírka %lu; namiesto nej sa použije %d" @@ -6361,20 +6753,23 @@ msgid "standard input is closed" msgstr "štandardný vstup je uzavrený" #: 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" -"\n" msgstr "" +"V každom SÚBORe prevedie medzery na tabulátory a výsledok vypisuje\n" +"na štandardný výstup. Ak nebude SÚBOR zadaný alebo bude -, načíta sa\n" +"štandardný vstup.\n" -#: src/paste.c:448 +#: 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 "" -#: src/paste.c:509 +#: src/paste.c:508 #, c-format msgid "delimiter list ends with an unescaped backslash: %s" msgstr "" @@ -6429,81 +6824,81 @@ msgid "Kaveh Ghazi" msgstr "Kaveh Ghazi" #. TRANSLATORS: Real name is unknown; at most 19 characters. -#: src/pinky.c:250 +#: src/pinky.c:242 msgid " ???" msgstr " ???" #. TRANSLATORS: Idle time is unknown; at most 5 characters. -#: src/pinky.c:274 +#: src/pinky.c:266 #, fuzzy msgid "?????" msgstr "???\n" -#: src/pinky.c:323 +#: src/pinky.c:314 #, c-format msgid "Login name: " msgstr "Prihlasovacie meno: " -#: src/pinky.c:326 +#: src/pinky.c:317 #, c-format msgid "In real life: " msgstr "V reáli: " #. TRANSLATORS: Real name is unknown; no hard limit. -#: src/pinky.c:330 +#: src/pinky.c:321 msgid "???\n" msgstr "???\n" -#: src/pinky.c:350 +#: src/pinky.c:341 #, c-format msgid "Directory: " msgstr "Adresár: " -#: src/pinky.c:352 +#: src/pinky.c:343 #, c-format msgid "Shell: " msgstr "Shell: " -#: src/pinky.c:371 +#: src/pinky.c:362 #, c-format msgid "Project: " msgstr "Projekt: " -#: src/pinky.c:395 +#: src/pinky.c:386 #, c-format msgid "Plan:\n" msgstr "Plán:\n" -#: src/pinky.c:414 +#: src/pinky.c:405 msgid "Login" msgstr "Login" -#: src/pinky.c:416 +#: src/pinky.c:407 msgid "Name" msgstr " Meno" -#: src/pinky.c:417 +#: src/pinky.c:408 msgid " TTY" msgstr " TTY" -#: src/pinky.c:419 +#: src/pinky.c:410 msgid "Idle" msgstr "Nečin" -#: src/pinky.c:420 +#: src/pinky.c:411 msgid "When" msgstr "Kedy" -#: src/pinky.c:423 +#: src/pinky.c:414 msgid "Where" msgstr "Kde " -#: src/pinky.c:502 +#: src/pinky.c:493 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Použitie: %s [PREPÍNAČ]... [SÚBOR]...\n" -#: src/pinky.c:503 +#: src/pinky.c:494 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -6513,7 +6908,7 @@ msgid "" " -s do short format output, this is the default\n" msgstr "" -#: src/pinky.c:511 +#: src/pinky.c:502 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 +6917,7 @@ msgid "" " in short format\n" msgstr "" -#: src/pinky.c:520 +#: src/pinky.c:511 #, c-format msgid "" "\n" @@ -6530,7 +6925,7 @@ msgid "" "The utmp file will be %s.\n" msgstr "" -#: src/pinky.c:604 +#: src/pinky.c:595 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "" @@ -6547,84 +6942,82 @@ msgstr "Pete TerMaat" msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:912 +#: src/pr.c:908 #, fuzzy, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "`--pages=PRVÁ_STRÁNKA[:POSLEDNÁ_STRÁNKA]' chýbajúci parameter" -#: src/pr.c:914 +#: src/pr.c:910 #, fuzzy, c-format msgid "invalid page range %s" msgstr "chybný rozsah stránok %s" -#: src/pr.c:979 +#: src/pr.c:975 #, fuzzy, c-format msgid "'-l PAGE_LENGTH' invalid number of lines: %s" msgstr "„-l DĹŽKA_STRÁNKY“ neplatný počet riadkov: %s" -#: src/pr.c:1003 +#: src/pr.c:999 #, fuzzy, c-format msgid "'-N NUMBER' invalid starting line number: %s" msgstr "„-N ČÍSLO“ chybné číslo počiatočného riadka: %s" -#: src/pr.c:1015 +#: src/pr.c:1011 #, fuzzy, c-format msgid "'-o MARGIN' invalid line offset: %s" msgstr "„-o OKRAJ“ chybný posun riadka: %s" -#: src/pr.c:1056 +#: src/pr.c:1052 #, fuzzy, c-format msgid "'-w PAGE_WIDTH' invalid number of characters: %s" msgstr "„-w ŠÍRKA_STRÁNKY“ neplatný počet znakov: %s" -#: src/pr.c:1070 +#: src/pr.c:1066 #, fuzzy, c-format msgid "'-W PAGE_WIDTH' invalid number of characters: %s" msgstr "„-W ŠÍRKA_STRÁNKY“ neplatný počet znakov: %s" -#: src/pr.c:1100 +#: src/pr.c:1096 #, fuzzy, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "Pri výpise vedľa seba, nie je možné zadať počet stĺpcov." # wzdluz? - rzm -#: src/pr.c:1104 +#: src/pr.c:1100 #, fuzzy, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "Nie je možné zadať výpis súborov po sebe a vedľa seba." -#: src/pr.c:1200 +#: src/pr.c:1196 #, fuzzy, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "„-%c“ nadbytočné znaky alebo neplatné číslo v argumente: %s" -#: src/pr.c:1304 +#: src/pr.c:1293 #, c-format msgid "page width too narrow" msgstr "šírka stránky je príliš malá" -#: src/pr.c:2369 +#: src/pr.c:2353 #, c-format msgid "starting page number %<PRIuMAX> exceeds page count %<PRIuMAX>" msgstr "" -#: src/pr.c:2396 +#: src/pr.c:2380 #, fuzzy, c-format msgid "page number overflow" msgstr "Pretečenie čísla strany" -#: src/pr.c:2401 +#: src/pr.c:2385 #, c-format msgid "Page %<PRIuMAX>" msgstr "" -#: src/pr.c:2773 -msgid "" -"Paginate or columnate FILE(s) for printing.\n" -"\n" +#: src/pr.c:2757 +msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" -#: src/pr.c:2780 +#: src/pr.c:2763 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -6634,7 +7027,7 @@ msgid "" " columns on each page\n" msgstr "" -#: src/pr.c:2788 +#: src/pr.c:2771 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -6644,7 +7037,7 @@ msgid "" " double space the output\n" msgstr "" -#: src/pr.c:2796 +#: src/pr.c:2779 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -6656,7 +7049,7 @@ msgid "" " and trailer without -F)\n" msgstr "" -#: src/pr.c:2806 +#: src/pr.c:2789 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -6669,7 +7062,7 @@ msgid "" " alignment, --sep-string[=STRING] sets separators\n" msgstr "" -#: src/pr.c:2815 +#: src/pr.c:2798 msgid "" " -l, --length=PAGE_LENGTH\n" " set the page length to PAGE_LENGTH (66) lines\n" @@ -6678,7 +7071,7 @@ msgid "" " truncate lines, but join lines of full length with -J\n" msgstr "" -#: src/pr.c:2822 +#: src/pr.c:2805 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -6688,7 +7081,7 @@ msgid "" " page printed (see +FIRST_PAGE)\n" msgstr "" -#: src/pr.c:2830 +#: src/pr.c:2813 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -6697,7 +7090,7 @@ msgid "" " omit warning when a file cannot be opened\n" msgstr "" -#: src/pr.c:2837 +#: src/pr.c:2820 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -6707,7 +7100,7 @@ msgid "" " options (-COLUMN|-a -COLUMN|-m) except -w is set\n" msgstr "" -#: src/pr.c:2844 +#: src/pr.c:2827 msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" @@ -6717,7 +7110,7 @@ msgid "" " -t, --omit-header omit page headers and trailers\n" msgstr "" -#: src/pr.c:2851 +#: src/pr.c:2834 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -6731,7 +7124,7 @@ msgid "" "(72)\n" msgstr "" -#: src/pr.c:2861 +#: src/pr.c:2844 #, fuzzy msgid "" " -W, --page-width=PAGE_WIDTH\n" @@ -6752,7 +7145,7 @@ msgstr "" " --help vypíše tuto nápovedu a skončí\n" " --version vypíše označenie verzie a skončí\n" -#: src/pr.c:2869 +#: src/pr.c:2852 #, fuzzy msgid "" "\n" @@ -6893,17 +7286,16 @@ msgstr "" msgid "" "Output a permuted index, including context, of the words in the input " "files.\n" -"\n" msgstr "" -#: src/ptx.c:1828 +#: src/ptx.c:1827 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:1833 +#: src/ptx.c:1832 msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" " -O, --format=roff generate output as roff directives\n" @@ -6912,7 +7304,7 @@ msgid "" " -T, --format=tex generate output as TeX directives\n" msgstr "" -#: src/ptx.c:1840 +#: src/ptx.c:1839 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -6922,7 +7314,7 @@ msgid "" " -o, --only-file=FILE read only word list from this FILE\n" msgstr "" -#: src/ptx.c:1848 +#: src/ptx.c:1847 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -6930,7 +7322,7 @@ msgid "" "excluded\n" msgstr "" -#: src/ptx.c:1855 +#: src/ptx.c:1854 #, fuzzy msgid "" "\n" @@ -6939,7 +7331,7 @@ msgstr "" "\n" "Bez SÚBORu alebo keď SÚBOR je - číta zo štand. vstupu.\n" -#: src/ptx.c:1949 +#: src/ptx.c:1948 #, fuzzy, c-format msgid "invalid gap width: %s" msgstr "chybné číslo položky: `%s'" @@ -6961,7 +7353,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "zmena skupiny %s na %s zlyhala\n" -#: src/pwd.c:170 src/pwd.c:277 +#: src/pwd.c:170 src/pwd.c:277 src/split.c:373 #, c-format msgid "failed to stat %s" msgstr "zlyhalo stat() %s" @@ -6977,14 +7369,15 @@ msgid "ignoring non-option arguments" msgstr "ignurujú sa argumenty, ktoré nie sú voľbami" #. This is a proper name. See the gettext manual, section Names. -#: src/readlink.c:33 +#: src/readlink.c:32 msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 +#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147 +#: src/stat.c:1349 src/touch.c:212 #, c-format -msgid "Usage: %s [OPTION]... FILE\n" -msgstr "Použitie: %s [VOĽBA]... [SÚBOR]\n" +msgid "Usage: %s [OPTION]... FILE...\n" +msgstr "Použitie: %s [VOĽBA]... [SÚBOR]...\n" #: src/readlink.c:63 msgid "" @@ -7011,17 +7404,18 @@ msgid "" "recursively,\n" " without requirements on components " "existence\n" -" -n, --no-newline do not output the trailing newline\n" +" -n, --no-newline do not output the trailing delimiter\n" " -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" msgstr "" -#: src/realpath.c:71 src/rm.c:134 src/shred.c:147 src/stat.c:1330 -#: src/touch.c:215 -#, c-format -msgid "Usage: %s [OPTION]... FILE...\n" -msgstr "Použitie: %s [VOĽBA]... [SÚBOR]...\n" +#: src/readlink.c:152 +#, fuzzy, c-format +msgid "ignoring --no-newline with multiple arguments" +msgstr "ignurujú sa argumenty, ktoré nie sú voľbami" #: src/realpath.c:72 msgid "" @@ -7048,12 +7442,12 @@ msgstr "" msgid "generating relative path" msgstr "" -#: src/remove.c:286 +#: src/remove.c:273 #, c-format msgid "%s: descend into write-protected directory %s? " msgstr "%s: zostúpiť do adresára chráneného voči zápisu %s? " -#: src/remove.c:287 +#: src/remove.c:274 #, c-format msgid "%s: descend into directory %s? " msgstr "%s: zostúpiť do adresára %s? " @@ -7062,49 +7456,49 @@ msgstr "%s: zostúpiť do adresára %s? " #. translate "%s: remove %s (write-protected) %s? " #. instead. It should avoid grammatical problems #. with the output of file_type. -#: src/remove.c:303 +#: src/remove.c:290 #, c-format msgid "%s: remove write-protected %s %s? " msgstr "%s: zmazať súbor chránený proti zápisu %s %s? " -#: src/remove.c:304 +#: src/remove.c:291 #, c-format msgid "%s: remove %s %s? " msgstr "%s: zmazať %s %s? " -#: src/remove.c:417 +#: src/remove.c:374 #, c-format msgid "removed directory: %s\n" msgstr "odstránený adresár: %s\n" -#: src/remove.c:481 +#: src/remove.c:444 #, fuzzy, c-format msgid "cannot remove directory: %s" msgstr "nie je možné odstrániť adresár %s" -#: src/remove.c:537 +#: src/remove.c:500 #, c-format msgid "skipping %s, since it's on a different device" msgstr "" -#: src/remove.c:557 +#: src/remove.c:520 #, fuzzy, c-format msgid "traversal failed: %s" msgstr "zlyhalo čítanie" -#: src/remove.c:563 +#: src/remove.c:526 #, c-format msgid "" "unexpected failure: fts_info=%d: %s\n" "please report to %s" msgstr "" -#: src/rm.c:118 +#: src/rm.c:119 #, c-format msgid "Try '%s ./%s' to remove the file %s.\n" msgstr "" -#: src/rm.c:135 +#: src/rm.c:136 msgid "" "Remove (unlink) the FILE(s).\n" "\n" @@ -7113,7 +7507,7 @@ msgid "" " -i prompt before every removal\n" msgstr "" -#: src/rm.c:141 +#: src/rm.c:142 msgid "" " -I prompt once before removing more than three files, " "or\n" @@ -7125,22 +7519,23 @@ msgid "" " always (-i). Without WHEN, prompt always\n" msgstr "" -#: src/rm.c:148 +#: src/rm.c:149 msgid "" " --one-file-system when removing a hierarchy recursively, skip any\n" " directory that is on a file system different from\n" " that of the corresponding command line argument\n" msgstr "" -#: src/rm.c:153 +#: src/rm.c:154 msgid "" " --no-preserve-root do not treat '/' specially\n" " --preserve-root do not remove '/' (default)\n" " -r, -R, --recursive remove directories and their contents recursively\n" +" -d, --dir remove empty directories\n" " -v, --verbose explain what is being done\n" msgstr "" -#: src/rm.c:161 +#: src/rm.c:163 msgid "" "\n" "By default, rm does not remove directories. Use the --recursive (-r or -R)\n" @@ -7148,7 +7543,7 @@ msgid "" "contents.\n" msgstr "" -#: src/rm.c:166 +#: src/rm.c:168 #, c-format msgid "" "\n" @@ -7159,7 +7554,7 @@ msgid "" " %s ./-foo\n" msgstr "" -#: src/rm.c:175 +#: src/rm.c:177 msgid "" "\n" "Note that if you use rm to remove a file, it might be possible to recover\n" @@ -7167,12 +7562,12 @@ msgid "" "assurance that the contents are truly unrecoverable, consider using shred.\n" msgstr "" -#: src/rm.c:335 +#: src/rm.c:342 #, c-format msgid "%s: remove all arguments recursively? " msgstr "" -#: src/rm.c:336 +#: src/rm.c:343 #, c-format msgid "%s: remove all arguments? " msgstr "%s: odstrániť všetky argumenty? " @@ -7225,7 +7620,10 @@ msgstr "" msgid "" "Run a program in a different security context.\n" "With neither CONTEXT nor COMMAND, print the current security context.\n" -"\n" +msgstr "" + +#: src/runcon.c:94 +msgid "" " CONTEXT Complete security context\n" " -c, --compute compute process transition context before modifying\n" " -t, --type=TYPE type (for same role as parent)\n" @@ -7235,72 +7633,72 @@ msgid "" "\n" msgstr "" -#: src/runcon.c:140 +#: src/runcon.c:144 #, c-format msgid "multiple roles" msgstr "" -#: src/runcon.c:145 +#: src/runcon.c:149 #, c-format msgid "multiple types" msgstr "" -#: src/runcon.c:150 +#: src/runcon.c:154 #, c-format msgid "multiple users" msgstr "" -#: src/runcon.c:155 +#: src/runcon.c:159 #, c-format msgid "multiple levelranges" msgstr "" -#: src/runcon.c:173 src/runcon.c:209 +#: src/runcon.c:177 src/runcon.c:213 #, c-format msgid "failed to get current context" msgstr "nepodarilo sa zistiť aktuálny kontext" -#: src/runcon.c:183 +#: src/runcon.c:187 #, c-format msgid "you must specify -c, -t, -u, -l, -r, or context" msgstr "" -#: src/runcon.c:191 +#: src/runcon.c:195 #, c-format msgid "no command specified" msgstr "nebol zadaný príkaz" -#: src/runcon.c:197 +#: src/runcon.c:201 #, c-format msgid "%s may be used only on a SELinux kernel" msgstr "" -#: src/runcon.c:223 +#: src/runcon.c:227 #, c-format msgid "failed to compute a new context" msgstr "nepodarilo sa vypočítať nový kontext" -#: src/runcon.c:237 +#: src/runcon.c:241 #, c-format msgid "failed to set new user %s" msgstr "nepodarilo sa nastaviť nového používateľa %s" -#: src/runcon.c:239 +#: src/runcon.c:243 #, c-format msgid "failed to set new type %s" msgstr "nepodarilo sa nastaviť nový typ %s" -#: src/runcon.c:241 +#: src/runcon.c:245 #, c-format msgid "failed to set new range %s" msgstr "nepodarilo sa nastaviť nový rozsah %s" -#: src/runcon.c:243 +#: src/runcon.c:247 #, c-format msgid "failed to set new role %s" msgstr "nepodarilo sa nastaviť novú rolu %s" -#: src/runcon.c:251 +#: src/runcon.c:255 #, c-format msgid "unable to set security context %s" msgstr "nie je možné nastaviť bezpečnostný kontext %s" @@ -7317,15 +7715,17 @@ msgstr "" " alebo: %s [VOĽBA]... PRVÝ KROK POSLEDNÝ\n" #: src/seq.c:73 +msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" +msgstr "" + +#: src/seq.c:79 msgid "" -"Print numbers from FIRST to LAST, in steps of INCREMENT.\n" -"\n" " -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 "" -#: src/seq.c:82 +#: src/seq.c:86 #, fuzzy msgid "" "\n" @@ -7340,39 +7740,24 @@ 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:90 +#: src/seq.c:94 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:136 +#: src/seq.c:140 #, c-format msgid "invalid floating point argument: %s" msgstr "neplatný argument s plávajúcou desatinnou čiarkou: %s" -#: src/seq.c:193 -#, fuzzy, c-format -msgid "format %s has no %% directive" -msgstr "cieľ %s nie je adresárom" - -#: src/seq.c:210 -#, c-format -msgid "format %s ends in %%" -msgstr "" - -#: src/seq.c:213 +#: src/seq.c:232 #, fuzzy, c-format msgid "format %s has unknown %%%c directive" msgstr "%s je neznámy typ souboru" -#: src/seq.c:217 -#, c-format -msgid "format %s has too many %% directives" -msgstr "" - -#: src/seq.c:431 +#: src/seq.c:555 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" @@ -7406,27 +7791,27 @@ msgid "" " (if specified) supplemental group IDs to GID1, ...\n" msgstr "" -#: src/setuidgid.c:163 +#: src/setuidgid.c:162 #, c-format msgid "unknown user-ID: %s" msgstr "" -#: src/setuidgid.c:174 +#: src/setuidgid.c:173 #, c-format msgid "to use user-ID %s you need to use -g too" msgstr "" -#: src/setuidgid.c:191 +#: 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:201 +#: 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:205 +#: 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" @@ -7440,10 +7825,9 @@ msgstr "Colin Plumb" 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" -"\n" msgstr "" -#: src/shred.c:156 +#: src/shred.c:155 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -7452,7 +7836,7 @@ msgid "" " -s, --size=N shred this many bytes (suffixes like K, M, G accepted)\n" msgstr "" -#: src/shred.c:162 +#: src/shred.c:161 msgid "" " -u, --remove truncate and remove file after overwriting\n" " -v, --verbose show progress\n" @@ -7461,7 +7845,7 @@ msgid "" " -z, --zero add a final overwrite with zeros to hide shredding\n" msgstr "" -#: src/shred.c:171 +#: src/shred.c:170 msgid "" "\n" "If FILE is -, shred standard output.\n" @@ -7473,7 +7857,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:181 +#: src/shred.c:180 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" @@ -7484,7 +7868,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:189 +#: src/shred.c:188 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -7496,7 +7880,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:199 +#: src/shred.c:198 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -7505,7 +7889,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:206 +#: src/shred.c:205 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" @@ -7517,129 +7901,129 @@ msgid "" "\n" msgstr "" -#: src/shred.c:216 +#: src/shred.c:215 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:296 +#: src/shred.c:295 #, c-format msgid "%s: fdatasync failed" msgstr "%s: fdatasync zlyhalo" -#: src/shred.c:307 +#: src/shred.c:306 #, c-format msgid "%s: fsync failed" msgstr "%s: fsync zlyhal" -#: src/shred.c:384 +#: src/shred.c:383 #, c-format msgid "%s: cannot rewind" msgstr "%s: nie je možné presunúť sa na začiatok súboru" -#: src/shred.c:403 +#: src/shred.c:402 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: prechod %lu/%lu (%s)..." -#: src/shred.c:453 +#: src/shred.c:452 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: chyba pri zápise na ofset %s" -#: src/shred.c:471 +#: src/shred.c:470 #, c-format msgid "%s: lseek failed" msgstr "%s: lseek zlyhal" -#: src/shred.c:482 +#: src/shred.c:481 #, c-format msgid "%s: file too large" msgstr "%s: súbor je príliš veľký" -#: src/shred.c:505 +#: src/shred.c:504 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: prechod %lu/%lu (%s)...%s" -#: src/shred.c:521 +#: src/shred.c:520 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: prechod %lu/%lu (%s)...%s/%s %d%%" -#: src/shred.c:768 +#: src/shred.c:767 #, c-format msgid "%s: fstat failed" msgstr "%s: fstat zlyhal" -#: src/shred.c:779 +#: src/shred.c:778 #, c-format msgid "%s: invalid file type" msgstr "%s: neplatný typ súboru" -#: src/shred.c:798 +#: src/shred.c:797 #, c-format msgid "%s: file has negative size" msgstr "%s: súbor má zápornú dĺžku" -#: src/shred.c:865 +#: src/shred.c:864 src/sort.c:932 src/split.c:378 #, c-format msgid "%s: error truncating" msgstr "%s: chyba pri skracovaní" -#: src/shred.c:881 +#: src/shred.c:880 #, c-format msgid "%s: fcntl failed" msgstr "%s: fcntl zlyhalo" -#: src/shred.c:886 +#: src/shred.c:885 #, 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:968 +#: src/shred.c:967 #, c-format msgid "%s: removing" msgstr "%s: maže sa" -#: src/shred.c:992 +#: src/shred.c:991 #, c-format msgid "%s: renamed to %s" msgstr "%s: premenovaný na %s" -#: src/shred.c:1014 +#: src/shred.c:1013 #, c-format msgid "%s: failed to remove" msgstr "%s: nepodarilo sa odstrániť" -#: src/shred.c:1018 +#: src/shred.c:1017 #, c-format msgid "%s: removed" msgstr "%s: zmazaný" -#: src/shred.c:1025 src/shred.c:1068 +#: src/shred.c:1024 src/shred.c:1067 #, c-format msgid "%s: failed to close" msgstr "%s: nepodarilo sa zatvoriť" -#: src/shred.c:1061 +#: src/shred.c:1060 #, c-format msgid "%s: failed to open for writing" msgstr "%s: nepodarilo sa otvoriť na zápis" -#: src/shred.c:1126 +#: src/shred.c:1125 #, c-format msgid "%s: invalid number of passes" msgstr "%s: neplatný počet prechodov" -#: src/shred.c:1135 src/shuf.c:291 src/sort.c:4387 +#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441 #, c-format msgid "multiple random sources specified" msgstr "boli uvedené viaceré náhodné zdroje" -#: src/shred.c:1149 +#: src/shred.c:1148 #, c-format msgid "%s: invalid file size" msgstr "%s: neplatná veľkosť súboru" @@ -7656,12 +8040,10 @@ msgstr "" " alebo: %s -i LO-HI [VOĽBA]...\n" #: src/shuf.c:54 -msgid "" -"Write a random permutation of the input lines to standard output.\n" -"\n" +msgid "Write a random permutation of the input lines to standard output.\n" msgstr "" -#: src/shuf.c:61 +#: src/shuf.c:60 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 " @@ -7672,27 +8054,27 @@ msgid "" " -z, --zero-terminated end lines with 0 byte, not newline\n" msgstr "" -#: src/shuf.c:245 +#: src/shuf.c:244 #, c-format msgid "multiple -i options specified" msgstr "uvedených viacero volieb -i" -#: src/shuf.c:265 +#: src/shuf.c:264 #, c-format msgid "invalid input range %s" msgstr "neplatný rozash vstupu %s" -#: src/shuf.c:278 +#: src/shuf.c:277 #, c-format msgid "invalid line count %s" msgstr "naplatný počet riadkov %s" -#: src/shuf.c:285 src/sort.c:4381 +#: src/shuf.c:284 src/sort.c:4435 #, c-format msgid "multiple output files specified" msgstr "uvedených viacero výstupných súborov" -#: src/shuf.c:311 +#: src/shuf.c:310 #, c-format msgid "cannot combine -e and -i options" msgstr "nie je možné kombinovať voľby -e a -i" @@ -7720,7 +8102,7 @@ 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:295 +#: src/sleep.c:135 src/timeout.c:320 #, fuzzy, c-format msgid "invalid time interval %s" msgstr "chybné číslo položky: `%s'" @@ -7730,19 +8112,17 @@ msgstr "chybné číslo položky: `%s'" msgid "cannot read realtime clock" msgstr "nie je možné prečítať hodiny reálneho času" -#: src/sort.c:395 -msgid "" -"Write sorted concatenation of all FILE(s) to standard output.\n" -"\n" +#: src/sort.c:399 +msgid "Write sorted concatenation of all FILE(s) to standard output.\n" msgstr "" -#: src/sort.c:402 +#: src/sort.c:405 msgid "" "Ordering options:\n" "\n" msgstr "" -#: src/sort.c:406 +#: src/sort.c:409 #, fuzzy msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" @@ -7764,19 +8144,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:412 +#: src/sort.c:415 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:417 +#: src/sort.c:420 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" -#: src/sort.c:420 +#: src/sort.c:423 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -7784,7 +8164,7 @@ msgid "" " -r, --reverse reverse the result of comparisons\n" msgstr "" -#: src/sort.c:426 +#: src/sort.c:429 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -7794,19 +8174,19 @@ msgid "" "\n" msgstr "" -#: src/sort.c:434 +#: src/sort.c:437 msgid "" "Other options:\n" "\n" msgstr "" -#: src/sort.c:438 +#: src/sort.c:441 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" msgstr "" -#: src/sort.c:442 +#: src/sort.c:445 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 " @@ -7815,7 +8195,7 @@ msgid "" " decompress them with PROG -d\n" msgstr "" -#: src/sort.c:449 +#: src/sort.c:452 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -7824,13 +8204,13 @@ msgid "" " If F is - then read names from standard input\n" msgstr "" -#: src/sort.c:456 +#: src/sort.c:459 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:460 +#: src/sort.c:463 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -7838,7 +8218,7 @@ msgid "" " -S, --buffer-size=SIZE use SIZE for main memory buffer\n" msgstr "" -#: src/sort.c:466 +#: src/sort.c:469 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -7853,11 +8233,11 @@ msgid "" "run\n" msgstr "" -#: src/sort.c:475 +#: src/sort.c:478 msgid " -z, --zero-terminated end lines with 0 byte, not newline\n" msgstr "" -#: src/sort.c:480 +#: src/sort.c:483 #, fuzzy msgid "" "\n" @@ -7888,7 +8268,7 @@ msgstr "" "\n" "VEĽKOSŤ môže byť nasledovaná nasledovnými príponami násobkov:\n" -#: src/sort.c:493 +#: src/sort.c:496 msgid "" "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n" "\n" @@ -7900,264 +8280,268 @@ msgid "" "native byte values.\n" msgstr "" -#: src/sort.c:694 +#: src/sort.c:697 #, c-format msgid "waiting for %s [-d]" msgstr "4ak8 sa na %s [-d]" -#: src/sort.c:699 +#: src/sort.c:702 #, c-format msgid "%s [-d] terminated abnormally" msgstr "" -#: src/sort.c:853 +#: src/sort.c:856 #, fuzzy, c-format msgid "cannot create temporary file in %s" msgstr "nie je možné vytvoriť dočasný súbor %s" -#: src/sort.c:939 src/sort.c:2010 src/sort.c:3056 src/sort.c:3755 -#: src/sort.c:3758 +#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713 +#: src/sort.c:3804 src/sort.c:3807 msgid "open failed" msgstr "zlyhalo otvorenie" -#: src/sort.c:959 +#: src/sort.c:970 msgid "fflush failed" msgstr "fflush zlyhalo" -#: src/sort.c:964 src/sort.c:2013 src/sort.c:4646 +#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706 msgid "close failed" msgstr "zlyhalo zatvorenie súboru" -#: src/sort.c:973 +#: src/sort.c:986 #, c-format msgid "dup2 failed" msgstr "dup2 zlyhalo" -#: src/sort.c:1090 +#: src/sort.c:1103 #, c-format msgid "couldn't execute %s" msgstr "nebolo možné spustiť %s" -#: src/sort.c:1097 +#: src/sort.c:1110 msgid "couldn't create temporary file" msgstr "nebolo možné vytvoriť dočasný súbor" -#: src/sort.c:1136 +#: src/sort.c:1149 #, c-format msgid "couldn't create process for %s -d" msgstr "nie je možné vytvoriť proces pre %s -d" -#: src/sort.c:1150 +#: src/sort.c:1161 #, c-format msgid "couldn't execute %s -d" msgstr "nebolo možné vykonať %s -d" -#: src/sort.c:1209 +#: src/sort.c:1220 #, c-format msgid "warning: cannot remove: %s" msgstr "upozornenie: nie je možné odstrániť: %s" -#: src/sort.c:1295 +#: src/sort.c:1306 #, fuzzy, c-format msgid "invalid --%s argument %s" msgstr "chybný argument %s pre `%s'" -#: src/sort.c:1298 +#: src/sort.c:1309 #, fuzzy, c-format msgid "minimum --%s argument is %s" msgstr "neplatný %s%s argument „%s“" -#: src/sort.c:1313 +#: src/sort.c:1324 #, fuzzy, c-format msgid "--%s argument %s too large" msgstr "%s%s argument „%s“ je príliš veľký" -#: src/sort.c:1316 +#: src/sort.c:1327 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "" -#: src/sort.c:1398 +#: src/sort.c:1409 #, c-format msgid "number in parallel must be nonzero" msgstr "" -#: src/sort.c:1479 +#: src/sort.c:1494 msgid "stat failed" msgstr "zlyhal stat" -#: src/sort.c:1740 +#: src/sort.c:1755 msgid "read failed" msgstr "zlyhalo čítanie" -#: src/sort.c:2028 +#: src/sort.c:2043 #, c-format msgid "string transformation failed" msgstr "transformácia reťazca sa nepodarila" -#: src/sort.c:2031 +#: src/sort.c:2046 #, c-format msgid "the untransformed string was %s" msgstr "netransformovaný reťazec bol %s" -#: src/sort.c:2194 +#: src/sort.c:2209 #, c-format msgid "^ no match for key\n" msgstr "" -#: src/sort.c:2374 +#: src/sort.c:2389 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "" -#: src/sort.c:2380 +#: src/sort.c:2395 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "" -#: src/sort.c:2391 +#: src/sort.c:2406 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" -#: src/sort.c:2404 +#: src/sort.c:2419 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "" -#: src/sort.c:2436 +#: src/sort.c:2451 #, fuzzy, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" -msgstr[0] "%s: voľba `%s' nie je jednoznačná\n" -msgstr[1] "%s: voľba `%s' nie je jednoznačná\n" -msgstr[2] "%s: voľba `%s' nie je jednoznačná\n" +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:2442 +#: src/sort.c:2457 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "" -#: src/sort.c:2716 src/sort.c:2725 +#: src/sort.c:2731 src/sort.c:2740 msgid "write failed" msgstr "chyba pri zápise" -#: src/sort.c:2768 +#: src/sort.c:2783 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: nezotriediteľné: " -#: src/sort.c:2771 +#: src/sort.c:2786 msgid "standard error" msgstr "štandardná chyba" -#: src/sort.c:3926 +#: src/sort.c:3698 +#, fuzzy +msgid "cannot read" +msgstr "nie je možné spustiť %s" + +#: src/sort.c:3976 #, fuzzy, c-format msgid "%s: invalid field specification %s" msgstr "%s: chybne zadaná položka `%s'" -#: src/sort.c:3937 -#, fuzzy, c-format +#: src/sort.c:3987 +#, c-format msgid "options '-%s' are incompatible" -msgstr "%s: voľba `%s' nie je jednoznačná\n" +msgstr "" -#: src/sort.c:3988 +#: src/sort.c:4038 #, fuzzy, c-format msgid "%s: invalid count at start of %s" msgstr "%s: chybný počet na začiatku `%s'" -#: src/sort.c:4245 +#: src/sort.c:4295 #, fuzzy msgid "invalid number after '-'" msgstr "chybné číslo za `-'" -#: src/sort.c:4248 src/sort.c:4334 src/sort.c:4362 +#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416 #, fuzzy msgid "invalid number after '.'" msgstr "chybné číslo za `.'" -#: src/sort.c:4261 src/sort.c:4367 +#: src/sort.c:4315 src/sort.c:4421 msgid "stray character in field spec" msgstr "neočakávaný znak v špecifikácii položky" -#: src/sort.c:4308 +#: src/sort.c:4362 #, fuzzy, c-format msgid "multiple compress programs specified" msgstr "\\%c: neprípustná sekvencia" -#: src/sort.c:4325 +#: src/sort.c:4379 msgid "invalid number at field start" msgstr "chybné číslo na začiatku položky" -#: src/sort.c:4329 src/sort.c:4357 +#: src/sort.c:4383 src/sort.c:4411 msgid "field number is zero" msgstr "číslo položky je nula" -#: src/sort.c:4338 +#: src/sort.c:4392 msgid "character offset is zero" msgstr "pozícia znaku je nula" -#: src/sort.c:4353 +#: src/sort.c:4407 #, fuzzy msgid "invalid number after ','" msgstr "chybné číslo za `,'" -#: src/sort.c:4403 +#: src/sort.c:4457 #, c-format msgid "empty tab" msgstr "prázdna záložka" -#: src/sort.c:4496 src/wc.c:692 +#: src/sort.c:4550 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:4518 +#: src/sort.c:4572 #, fuzzy, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "neplatná skupina" -#: src/sort.c:4524 +#: src/sort.c:4578 #, fuzzy, c-format msgid "no input from %s" msgstr "vytváram súbor `%s'\n" -#: src/sort.c:4570 +#: src/sort.c:4624 #, c-format msgid "using %s sorting rules" msgstr "" -#: src/sort.c:4573 +#: src/sort.c:4627 #, c-format msgid "using simple byte comparison" msgstr "" -#: src/sort.c:4604 +#: src/sort.c:4658 #, 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:184 +#: src/split.c:187 #, c-format msgid "the suffix length needs to be at least %zu" msgstr "" -#: src/split.c:201 +#: src/split.c:204 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" msgstr "Použitie: %s [PREPÍNAČ] [SÚBOR [PREDPONA]]\n" -#: src/split.c:205 +#: src/split.c:208 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" -"\n" msgstr "" -#: src/split.c:214 -#, fuzzy, c-format +#: src/split.c:216 +#, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" " --additional-suffix=SUFFIX append an additional SUFFIX to file " @@ -8174,19 +8558,14 @@ msgid "" " -n, --number=CHUNKS generate CHUNKS output files. See below\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" -" -a, --suffix-length=N použiť prípony s dĺžkou N (štandardne %d)\n" -" -b, --bytes=VEĽKOSŤ zapíše VEĽKOST bajtov do výstupného súboru\n" -" -C, --line-bytes=VEĽKOSŤ zapíše najviac VEĽKOST bytov na výstupný riadok\n" -" -d, --numeric-suffixes použiť číselné prípony namiesto abecedných\n" -" -l, --lines=POČET zapíše POČET riadkov do výstupného súboru\n" -#: src/split.c:227 +#: src/split.c:229 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" msgstr "" -#: src/split.c:234 +#: src/split.c:236 msgid "" "\n" "CHUNKS may be:\n" @@ -8198,184 +8577,189 @@ msgid "" "r/K/N likewise but only output Kth of N to stdout\n" msgstr "" -#: src/split.c:352 +#: src/split.c:354 #, c-format msgid "output file suffixes exhausted" msgstr "" -#: src/split.c:364 +#: src/split.c:366 #, c-format msgid "creating file %s\n" msgstr "vytvára sa súbor %s\n" -#: src/split.c:377 +#: src/split.c:375 +#, c-format +msgid "%s would overwrite input; aborting" +msgstr "" + +#: src/split.c:391 #, fuzzy, c-format msgid "failed to set FILE environment variable" -msgstr "nie je možné nastaviť bezpečnostný kontext %s na %s" +msgstr "nepodarilo sa nastaviť novú rolu %s" -#: src/split.c:379 +#: src/split.c:393 #, c-format msgid "executing with FILE=%s\n" msgstr "" -#: src/split.c:381 +#: src/split.c:395 #, fuzzy, c-format msgid "failed to create pipe" -msgstr "nie je možné vytvoriť adresár %s" +msgstr "nepodarilo sa odstrániť %s" -#: src/split.c:395 +#: src/split.c:409 #, fuzzy, c-format msgid "closing prior pipe" msgstr "zatvíra sa adresár %s" -#: src/split.c:397 +#: src/split.c:411 #, fuzzy, c-format msgid "closing output pipe" msgstr "zatváram výstupný súbor %s" -#: src/split.c:401 +#: src/split.c:415 #, fuzzy, c-format msgid "moving input pipe" msgstr "vytváram súbor `%s'\n" -#: src/split.c:403 +#: src/split.c:417 #, fuzzy, c-format msgid "closing input pipe" msgstr "vytváram súbor `%s'\n" -#: src/split.c:408 +#: src/split.c:422 #, fuzzy, c-format msgid "failed to run command: \"%s -c %s\"" -msgstr "nie je možné vykonať príkaz %s" +msgstr "nepodarilo sa zmeniť bezpečnostný kontext %s na %s" -#: src/split.c:414 +#: src/split.c:428 #, fuzzy, c-format msgid "failed to close input pipe" msgstr "nie je možné zatvoriť adresár %s" -#: src/split.c:450 +#: src/split.c:464 #, fuzzy, c-format msgid "waiting for child process" msgstr "chyba pri zápise %s" -#: src/split.c:460 +#: src/split.c:474 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "" -#: src/split.c:468 +#: src/split.c:482 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:475 src/timeout.c:449 +#: src/split.c:489 src/timeout.c:494 #, c-format msgid "unknown status from command (0x%X)" msgstr "" -#: src/split.c:1037 +#: src/split.c:1052 #, c-format msgid "cannot split in more than one way" msgstr "súbor sa nedá rozdeliť viacerými spôsobmi" -#: src/split.c:1050 src/split.c:1192 src/split.c:1363 +#: src/split.c:1065 src/split.c:1205 src/split.c:1376 #, fuzzy, c-format msgid "%s: invalid number of chunks" msgstr "%s: neplatný počet sekúnd" -#: src/split.c:1054 +#: src/split.c:1069 #, fuzzy, c-format msgid "%s: invalid chunk number" msgstr "%s: chybné číslo" -#: src/split.c:1106 +#: src/split.c:1119 #, c-format msgid "%s: invalid suffix length" msgstr "%s: neplatná dĺžka prípony" -#: src/split.c:1131 src/split.c:1139 src/split.c:1162 src/split.c:1167 +#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180 #, c-format msgid "%s: invalid number of bytes" msgstr "%s: chybný počet bajtov" -#: src/split.c:1150 src/split.c:1297 +#: src/split.c:1163 src/split.c:1310 #, c-format msgid "%s: invalid number of lines" msgstr "%s: chybný počet riadkov" -#: src/split.c:1223 +#: src/split.c:1236 #, 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:1235 +#: src/split.c:1248 #, fuzzy, c-format msgid "%s: invalid start value for numerical suffix" msgstr "neplatné počiatočné číslo riadka: %s" -#: src/split.c:1263 +#: src/split.c:1276 #, fuzzy, c-format msgid "%s: invalid IO block size" msgstr "%s: neplatná veľkosť súboru" -#: src/split.c:1284 +#: src/split.c:1297 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1321 +#: src/split.c:1334 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1356 +#: src/split.c:1369 #, 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:169 +#: src/stat.c:173 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:838 +#: src/stat.c:857 #, fuzzy, c-format msgid "failed to canonicalize %s" msgstr "nepodarilo sa otvoriť %s" -#: src/stat.c:1050 +#: src/stat.c:1069 #, fuzzy, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "upozornenie: nerozpoznaná úniková klauzula „\\%c“" -#: src/stat.c:1105 +#: src/stat.c:1124 #, c-format msgid "%s: invalid directive" msgstr "%s: neplatná direktíva" -#: src/stat.c:1151 +#: src/stat.c:1170 #, c-format msgid "warning: backslash at end of format" msgstr "upozornenie: spätná lomka na konci reťazca" -#: src/stat.c:1182 +#: src/stat.c:1201 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" -#: src/stat.c:1189 +#: src/stat.c:1208 #, 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:1209 +#: src/stat.c:1228 #, 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:1245 +#: src/stat.c:1264 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -8386,7 +8770,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1268 +#: src/stat.c:1287 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -8394,30 +8778,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1278 +#: src/stat.c:1297 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:1286 +#: src/stat.c:1305 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:1295 +#: src/stat.c:1314 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:1305 +#: src/stat.c:1324 #, fuzzy, c-format msgid "Context: %C\n" msgstr "neplatný kontexxt: %s" -#: src/stat.c:1313 +#: src/stat.c:1332 msgid "" "Access: %x\n" "Modify: %y\n" @@ -8425,15 +8809,17 @@ msgid "" " Birth: %w\n" msgstr "" -#: src/stat.c:1331 +#: src/stat.c:1350 +msgid "Display file or file system status.\n" +msgstr "" + +#: src/stat.c:1356 msgid "" -"Display file or file system status.\n" -"\n" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" -#: src/stat.c:1337 +#: src/stat.c:1360 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -8443,7 +8829,7 @@ msgid "" " -t, --terse print the information in terse form\n" msgstr "" -#: src/stat.c:1348 +#: src/stat.c:1371 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -8455,7 +8841,7 @@ msgid "" " %C SELinux security context string\n" msgstr "" -#: src/stat.c:1357 +#: src/stat.c:1380 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -8465,7 +8851,7 @@ msgid "" " %G group name of owner\n" msgstr "" -#: src/stat.c:1365 +#: src/stat.c:1388 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -8478,7 +8864,7 @@ msgid "" " %T minor device type in hex\n" msgstr "" -#: src/stat.c:1376 +#: src/stat.c:1399 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -8493,7 +8879,7 @@ msgid "" "\n" msgstr "" -#: src/stat.c:1390 +#: src/stat.c:1413 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -8504,7 +8890,7 @@ msgid "" " %f free blocks in file system\n" msgstr "" -#: src/stat.c:1399 +#: src/stat.c:1422 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -8523,30 +8909,29 @@ msgstr "Použitie: %s [VOĽBA]...\n" #: src/stdbuf.c:91 msgid "" "Run COMMAND, with modified buffering operations for its standard streams.\n" -"\n" msgstr "" -#: src/stdbuf.c:98 +#: src/stdbuf.c:97 msgid "" " -i, --input=MODE adjust standard input stream buffering\n" " -o, --output=MODE adjust standard output stream buffering\n" " -e, --error=MODE adjust standard error stream buffering\n" msgstr "" -#: src/stdbuf.c:105 +#: src/stdbuf.c:104 msgid "" "\n" "If MODE is 'L' the corresponding stream will be line buffered.\n" "This option is invalid with standard input.\n" msgstr "" -#: src/stdbuf.c:108 +#: src/stdbuf.c:107 msgid "" "\n" "If MODE is '0' the corresponding stream will be unbuffered.\n" msgstr "" -#: src/stdbuf.c:111 +#: src/stdbuf.c:110 #, fuzzy msgid "" "\n" @@ -8561,7 +8946,7 @@ msgstr "" "nasledovných:\n" "kB 1000, K 1024, MB 1000*1000, M 1024*1024 atď pre G, T, P, E, Z, Y.\n" -#: src/stdbuf.c:117 +#: src/stdbuf.c:116 msgid "" "\n" "NOTE: If COMMAND adjusts the buffering of its standard streams ('tee' does\n" @@ -8571,22 +8956,22 @@ msgid "" "and are thus unaffected by 'stdbuf' settings.\n" msgstr "" -#: src/stdbuf.c:227 +#: src/stdbuf.c:226 #, fuzzy, c-format msgid "failed to find %s" msgstr "nepodarilo sa otvoriť %s" -#: src/stdbuf.c:247 src/stdbuf.c:279 +#: src/stdbuf.c:246 src/stdbuf.c:278 #, 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:321 +#: src/stdbuf.c:320 #, c-format msgid "line buffering stdin is meaningless" msgstr "" -#: src/stty.c:509 +#: src/stty.c:513 #, fuzzy, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -8597,10 +8982,13 @@ msgstr "" " alebo: %s [-F ZARIADENIE] [--file=ZARIADENIE] [-a|--all]\n" " alebo: %s [-F ZARIADENIE] [--file=ZARIADENIE] [-g|--save]\n" -#: src/stty.c:515 +#: src/stty.c:519 +msgid "Print or change terminal characteristics.\n" +msgstr "" + +#: src/stty.c:525 +#, fuzzy msgid "" -"Print or change terminal characteristics.\n" -"\n" " -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" @@ -8614,14 +9002,14 @@ msgstr "" " -F, --file=ZARIADENIE otvoriť a používať zadané zariadenie namiesto\n" " štandardného vstupu\n" -#: src/stty.c:524 +#: src/stty.c:532 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:529 +#: src/stty.c:537 msgid "" "\n" "Special characters:\n" @@ -8630,7 +9018,7 @@ msgid "" " eol CHAR CHAR will end the line\n" msgstr "" -#: src/stty.c:536 +#: src/stty.c:544 msgid "" " * eol2 CHAR alternate CHAR for ending the line\n" " erase CHAR CHAR will erase the last character typed\n" @@ -8638,7 +9026,7 @@ msgid "" " kill CHAR CHAR will erase the current line\n" msgstr "" -#: src/stty.c:542 +#: src/stty.c:550 msgid "" " * lnext CHAR CHAR will enter the next character quoted\n" " quit CHAR CHAR will send a quit signal\n" @@ -8646,7 +9034,7 @@ msgid "" " start CHAR CHAR will restart the output after stopping it\n" msgstr "" -#: src/stty.c:548 +#: src/stty.c:556 msgid "" " stop CHAR CHAR will stop the output\n" " susp CHAR CHAR will send a terminal stop signal\n" @@ -8654,7 +9042,7 @@ msgid "" " * werase CHAR CHAR will erase the last word typed\n" msgstr "" -#: src/stty.c:554 +#: src/stty.c:562 msgid "" "\n" "Special settings:\n" @@ -8663,7 +9051,7 @@ msgid "" " * columns N same as cols N\n" msgstr "" -#: src/stty.c:561 +#: src/stty.c:569 msgid "" " ispeed N set the input speed to N\n" " * line N use line discipline N\n" @@ -8672,7 +9060,7 @@ msgid "" " ospeed N set the output speed to N\n" msgstr "" -#: src/stty.c:567 +#: src/stty.c:575 msgid "" " * rows N tell the kernel that the terminal has N rows\n" " * size print the number of rows and columns according to the " @@ -8681,17 +9069,18 @@ msgid "" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" -#: src/stty.c:573 +#: src/stty.c:581 msgid "" "\n" "Control settings:\n" " [-]clocal disable modem control signals\n" " [-]cread allow input to be received\n" " * [-]crtscts enable RTS/CTS handshaking\n" +" * [-]cdtrdsr enable DTR/DSR handshaking\n" " csN set character size to N bits, N in [5..8]\n" msgstr "" -#: src/stty.c:581 +#: src/stty.c:590 #, fuzzy msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" @@ -8699,7 +9088,7 @@ msgid "" " [-]hupcl same as [-]hup\n" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" -" [-]parodd set odd parity (even with '-')\n" +" [-]parodd set odd parity (or even parity with '-')\n" msgstr "" " [-]cstopb používať dva stop bity (jeden s „-“)\n" " [-]hup poslať signál zavesenia, keď posledný proces zatvorí " @@ -8708,7 +9097,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:588 +#: src/stty.c:597 msgid "" "\n" "Input settings:\n" @@ -8718,7 +9107,7 @@ msgid "" " [-]igncr ignore carriage return\n" msgstr "" -#: src/stty.c:596 +#: src/stty.c:605 msgid "" " [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" @@ -8727,11 +9116,11 @@ msgid "" " [-]istrip clear high (8th) bit of input characters\n" msgstr "" -#: src/stty.c:603 +#: src/stty.c:612 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr "" -#: src/stty.c:606 +#: src/stty.c:615 msgid "" " * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" @@ -8741,7 +9130,7 @@ msgid "" " [-]tandem same as [-]ixoff\n" msgstr "" -#: src/stty.c:614 +#: src/stty.c:623 msgid "" "\n" "Output settings:\n" @@ -8751,7 +9140,7 @@ msgid "" " * nlN newline delay style, N in [0..1]\n" msgstr "" -#: src/stty.c:622 +#: src/stty.c:631 msgid "" " * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of null characters\n" @@ -8768,7 +9157,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:630 +#: src/stty.c:639 msgid "" " * [-]onocr do not print carriage returns in the first column\n" " [-]opost postprocess output\n" @@ -8778,7 +9167,7 @@ msgid "" " * vtN vertical tab delay style, N in [0..1]\n" msgstr "" -#: src/stty.c:638 +#: src/stty.c:647 msgid "" "\n" "Local settings:\n" @@ -8787,7 +9176,7 @@ msgid "" " * -crtkill kill all line by obeying the echoctl and echok settings\n" msgstr "" -#: src/stty.c:645 +#: src/stty.c:654 msgid "" " * [-]ctlecho echo control characters in hat notation ('^c')\n" " [-]echo echo input characters\n" @@ -8796,7 +9185,7 @@ msgid "" " [-]echok echo a newline after a kill character\n" msgstr "" -#: src/stty.c:652 +#: src/stty.c:661 msgid "" " * [-]echoke same as [-]crtkill\n" " [-]echonl echo newline even if not echoing other characters\n" @@ -8805,7 +9194,7 @@ msgid "" " [-]iexten enable non-POSIX special characters\n" msgstr "" -#: src/stty.c:659 +#: src/stty.c:668 msgid "" " [-]isig enable interrupt, quit, and suspend special characters\n" " [-]noflsh disable flushing after interrupt and quit special " @@ -8815,7 +9204,7 @@ msgid "" " * [-]xcase with icanon, escape with '\\' for uppercase characters\n" msgstr "" -#: src/stty.c:666 +#: src/stty.c:675 msgid "" "\n" "Combination settings:\n" @@ -8824,7 +9213,7 @@ msgid "" " -cbreak same as icanon\n" msgstr "" -#: src/stty.c:673 +#: src/stty.c:682 msgid "" " cooked same as brkint ignpar istrip icrnl ixon opost isig\n" " icanon, eof and eol characters to their default values\n" @@ -8832,7 +9221,7 @@ msgid "" " crt same as echoe echoctl echoke\n" msgstr "" -#: src/stty.c:679 +#: src/stty.c:688 msgid "" " dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" " kill ^u\n" @@ -8841,7 +9230,7 @@ msgid "" " evenp same as parenb -parodd cs7\n" msgstr "" -#: src/stty.c:686 +#: src/stty.c:695 msgid "" " -evenp same as -parenb cs8\n" " * [-]lcase same as xcase iuclc olcuc\n" @@ -8851,7 +9240,7 @@ msgid "" " -nl same as icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" msgstr "" -#: src/stty.c:694 +#: src/stty.c:703 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -8860,7 +9249,7 @@ msgid "" " -pass8 same as parenb istrip cs7\n" msgstr "" -#: src/stty.c:701 +#: src/stty.c:710 msgid "" " raw same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" " -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n" @@ -8868,7 +9257,7 @@ msgid "" " -raw same as cooked\n" msgstr "" -#: src/stty.c:707 +#: src/stty.c:716 msgid "" " sane same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" " -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n" @@ -8878,7 +9267,7 @@ msgid "" " characters to their default values\n" msgstr "" -#: src/stty.c:715 +#: src/stty.c:724 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -8893,135 +9282,59 @@ msgstr "" "^c, 0x37, 0177 alebo 127; pre zákaz špeciálneho znaku treba použiť\n" "^- alebo undef.\n" -#: src/stty.c:787 +#: src/stty.c:796 #, c-format msgid "only one device may be specified" msgstr "môže byť zadané iba jedno zariadenie" -#: src/stty.c:817 +#: src/stty.c:826 #, 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:823 +#: src/stty.c:832 #, 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:838 +#: src/stty.c:847 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s: nie je možné opustiť neblokovací režim" -#: src/stty.c:883 src/stty.c:993 +#: src/stty.c:892 src/stty.c:1002 #, fuzzy, c-format msgid "invalid argument %s" msgstr "chybný argument %s pre `%s'" -#: src/stty.c:894 src/stty.c:911 src/stty.c:923 src/stty.c:936 src/stty.c:948 -#: src/stty.c:968 +#: 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 msgid "missing argument to %s" msgstr "nejednoznačný argument %s pre `%s'" -#: src/stty.c:974 +#: src/stty.c:983 #, fuzzy, c-format msgid "invalid line discipline %s" msgstr "chybné číslo položky: `%s'" -#: src/stty.c:1044 +#: src/stty.c:1053 #, 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:1390 +#: src/stty.c:1399 #, c-format msgid "%s: no size information for this device" msgstr "%s: neexistuje informácia o veľkosti tohoto zariadenia" -#: src/stty.c:1904 +#: src/stty.c:1920 #, c-format msgid "invalid integer argument %s" msgstr "neplatný celočíselný argument %s" -#: src/su.c:229 -msgid "Password:" -msgstr "Heslo:" - -#: src/su.c:232 -#, c-format -msgid "getpass: cannot open /dev/tty" -msgstr "getpass: nie je možné otvoriť /dev/tty" - -#: src/su.c:290 -#, c-format -msgid "cannot set groups" -msgstr "nie je možné nastaviť skupiny" - -#: src/su.c:294 -#, c-format -msgid "cannot set group id" -msgstr "nie je možné nastaviť ID skupiny" - -#: src/su.c:296 -#, c-format -msgid "cannot set user id" -msgstr "nie je možné nastaviť ID používateľa" - -#: src/su.c:371 -#, c-format -msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" -msgstr "Použitie: %s [VOĽBA]... [-] [POUŽÍVATEĽ [ARG]...]\n" - -#: src/su.c:372 -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 "" -"Zmeniť efektívne id používateľa a skupiny na id POUŽÍVATEĽA.\n" -"\n" -" -, -l, --login urobiť tento shell prihlasovacím\n" -" -c, --command=PRÍKAZ odovzdať shellu jediný PRÍKAZ pomocou -c\n" -" -f, --fast odovzdať shellu -f (pre csh alebo tcsh)\n" -" -m, --preserve-environment zachovať premenné prostredia\n" -" -p rovnaké ako -m\n" -" -s, --shell=SHELL spustiť SHELL, pokiaľ to /etc/shells " -"povoľuje\n" - -#: src/su.c:384 -msgid "" -"\n" -"A mere - implies -l. If USER not given, assume root.\n" -msgstr "" - -#: src/su.c:461 -#, c-format -msgid "user %s does not exist" -msgstr "používateľ %s neexistuje" - -#: src/su.c:484 -#, c-format -msgid "incorrect password" -msgstr "nesprávne heslo" - -#: src/su.c:501 -#, c-format -msgid "using restricted shell %s" -msgstr "použitý obmedzený shell %s" - -#: src/su.c:509 -#, c-format -msgid "warning: cannot change directory to %s" -msgstr "upozornenie: nie je možné zmeniť adresár na %s" - #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 msgid "Kayvan Aghaiepour" @@ -9052,7 +9365,7 @@ msgstr "" msgid "ignoring all arguments" msgstr "ignorujú sa všetky argumenty" -#: src/system.h:340 +#: src/system.h:343 #, c-format msgid "" "\n" @@ -9061,15 +9374,24 @@ msgid "" "for details about the options it supports.\n" msgstr "" -#: src/system.h:346 +#: src/system.h:349 msgid " --help display this help and exit\n" msgstr " --help zobrazí tohto pomocníka a skončí\n" -#: src/system.h:348 +#: src/system.h:351 msgid " --version output version information and exit\n" msgstr " --version vypíše informácie o verzii a skončí\n" -#: src/system.h:541 +#: src/system.h:544 +#, fuzzy +msgid "" +"\n" +"Mandatory arguments to long options are mandatory for short options too.\n" +msgstr "" +"Povinné argumenty dlhých tvarov volieb sú taktiež povinné pre krátke tvary " +"volieb.\n" + +#: src/system.h:552 msgid "" "\n" "SIZE is an integer and optional unit (example: 10M is 10*1024*1024). Units\n" @@ -9077,7 +9399,7 @@ msgid "" "1000).\n" msgstr "" -#: src/system.h:550 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -9086,7 +9408,7 @@ msgid "" "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n" msgstr "" -#: src/system.h:560 +#: src/system.h:571 #, fuzzy, c-format msgid "" "\n" @@ -9099,22 +9421,22 @@ msgstr "" #. <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:574 +#: src/system.h:585 #, c-format msgid "Report %s translation bugs to <http://translationproject.org/team/>\n" msgstr "" -#: src/system.h:578 +#: src/system.h:589 #, c-format msgid "For complete documentation, run: info coreutils '%s invocation'\n" msgstr "" -#: src/system.h:585 +#: src/system.h:596 #, 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:617 +#: src/system.h:628 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -9135,13 +9457,16 @@ 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" -"\n" msgstr "" +"V každom SÚBORe prevedie medzery na tabulátory a výsledok vypisuje\n" +"na štandardný výstup. Ak nebude SÚBOR zadaný alebo bude -, načíta sa\n" +"štandardný vstup.\n" -#: src/tac.c:145 +#: src/tac.c:144 msgid "" " -b, --before attach the separator before instead of after\n" " -r, --regex interpret the separator as a regular expression\n" @@ -9153,42 +9478,42 @@ msgstr "" " -s, --separator=REŤAZEC použije REŤAZEC ako oddeľovač namiesto nového " "riadku\n" -#: src/tac.c:235 src/tac.c:336 +#: src/tac.c:234 src/tac.c:335 #, c-format msgid "%s: seek failed" msgstr "%s: zlyhalo posunutie v súbore" -#: src/tac.c:264 +#: src/tac.c:263 #, c-format msgid "record too large" msgstr "záznam je príliš dlhý" -#: src/tac.c:451 +#: src/tac.c:450 #, fuzzy, c-format msgid "failed to create temporary file in %s" msgstr "nie je možné vytvoriť dočasný súbor %s" -#: src/tac.c:459 +#: src/tac.c:458 #, fuzzy, c-format msgid "failed to open %s for writing" msgstr "%s: nepodarilo sa otvoriť na zápis" -#: src/tac.c:476 +#: src/tac.c:475 #, fuzzy, c-format msgid "failed to rewind stream for %s" msgstr "nie je možné zachovať časy %s" -#: src/tac.c:512 src/tac.c:519 +#: src/tac.c:511 src/tac.c:518 #, c-format msgid "%s: write error" msgstr "%s: chyba pri zápise" -#: src/tac.c:572 +#: src/tac.c:571 #, fuzzy, c-format msgid "failed to open %s for reading" msgstr "nie je možné otvoriť %s pre čítanie" -#: src/tac.c:630 +#: src/tac.c:629 #, c-format msgid "separator cannot be empty" msgstr "oddeľovač nemôže byť prázdny" @@ -9199,12 +9524,11 @@ msgid "Ian Lance Taylor" msgstr "Ian Lance Taylor" #: src/tail.c:262 -#, c-format +#, fuzzy, 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" -"\n" msgstr "" "Vypíše prvých %d riadkov každého súboru na štandardný výstup. S viac ako\n" "jedným súborom, bude pred vypísaním každého uvedená hlavička obsahujúca " @@ -9212,7 +9536,7 @@ msgstr "" "súboru. Ak SÚBOR nebude zadaný alebo bude -, načíta sa štandardný vstup.\n" "\n" -#: src/tail.c:271 +#: src/tail.c:270 msgid "" " -c, --bytes=K output the last K bytes; alternatively, use -c " "+K\n" @@ -9220,7 +9544,7 @@ msgid "" "file\n" msgstr "" -#: src/tail.c:275 +#: src/tail.c:274 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -9229,7 +9553,7 @@ msgid "" " -F same as --follow=name --retry\n" msgstr "" -#: src/tail.c:282 +#: src/tail.c:281 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -9243,7 +9567,7 @@ msgid "" " With inotify, this option is rarely useful.\n" msgstr "" -#: src/tail.c:295 +#: src/tail.c:294 msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" " -q, --quiet, --silent never output headers giving file names\n" @@ -9252,7 +9576,7 @@ msgid "" " name, i.e., with --follow=name\n" msgstr "" -#: src/tail.c:302 +#: src/tail.c:301 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations.\n" @@ -9261,8 +9585,7 @@ msgid "" " -v, --verbose always output headers giving file names\n" msgstr "" -#: src/tail.c:311 -#, fuzzy +#: src/tail.c:310 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -9272,15 +9595,8 @@ msgid "" "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n" "\n" msgstr "" -"\n" -"Po BLOKOV a BAJTOV môže byť uvedená jedna z nasledovných prípon:\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 atď pre T, P, E, Z, Y.\n" -"\n" -"Každý symbol KONV môže byť:\n" -"\n" -#: src/tail.c:320 +#: src/tail.c:319 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" @@ -9290,66 +9606,66 @@ msgid "" "named file in a way that accommodates renaming, removal and creation.\n" msgstr "" -#: src/tail.c:379 +#: src/tail.c:378 #, c-format msgid "closing %s (fd=%d)" msgstr "zatvára sa %s (fd=%d)" -#: src/tail.c:454 +#: 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:458 +#: src/tail.c:457 #, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "" -#: src/tail.c:895 +#: src/tail.c:894 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "" -#: src/tail.c:907 +#: src/tail.c:906 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" msgstr "" -#: src/tail.c:964 +#: src/tail.c:963 #, fuzzy, c-format msgid "%s has become inaccessible" msgstr "`%s' sa stal nedostupným" -#: src/tail.c:981 +#: src/tail.c:980 #, 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:990 +#: src/tail.c:989 #, 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:1011 +#: src/tail.c:1010 #, fuzzy, c-format msgid "%s has become accessible" msgstr "`%s' sa stal dostupným" -#: src/tail.c:1019 +#: src/tail.c:1018 #, 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:1030 +#: src/tail.c:1029 #, 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:1131 +#: src/tail.c:1130 #, fuzzy, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: nie je možné opustiť neblokovací režim" @@ -9686,17 +10002,22 @@ msgstr "chýba „]”" msgid "extra argument %s" msgstr "argument %s je naviac" -#: src/timeout.c:124 +#: src/timeout.c:112 +#, c-format +msgid "warning: sigprocmask" +msgstr "" + +#: src/timeout.c:145 #, c-format msgid "warning: timer_settime" msgstr "" -#: src/timeout.c:129 +#: src/timeout.c:150 #, c-format msgid "warning: timer_create" msgstr "" -#: src/timeout.c:204 +#: src/timeout.c:225 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -9705,18 +10026,18 @@ msgstr "" "Použitie: %s VOĽBA POUŽÍVATEĽ PRÍKAZ [ARGUMENT]...\n" " alebo: %s VOĽBA\n" -#: src/timeout.c:208 +#: src/timeout.c:229 #, fuzzy -msgid "" -"Start COMMAND, and kill it if still running after DURATION.\n" -"\n" -"Mandatory arguments to long options are mandatory for short options too.\n" +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:213 +#: src/timeout.c:235 msgid "" +" --preserve-status\n" +" exit with the same status as COMMAND, even when the\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 " @@ -9731,7 +10052,7 @@ msgid "" " See 'kill -l' for a list of signals\n" msgstr "" -#: src/timeout.c:229 +#: src/timeout.c:254 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -9739,25 +10060,30 @@ msgid "" "days.\n" msgstr "" -#: src/timeout.c:234 +#: src/timeout.c:259 msgid "" "\n" -"If the command times out, then exit with status 124. Otherwise, exit\n" -"with the status of COMMAND. If no signal is specified, send the TERM\n" -"signal upon timeout. The TERM signal kills any process that does not\n" -"block or catch that signal. For other processes, it may be necessary to\n" -"use the KILL (9) signal, since this signal cannot be caught. If the\n" -"KILL (9) signal is sent, the exit status is 128+9 rather than 124.\n" +"If the command times out, and --preserve-status is not set, then exit with\n" +"status 124. Otherwise, exit with the status of COMMAND. If no signal\n" +"is specified, send the TERM signal upon timeout. The TERM signal kills\n" +"any process that does not block or catch that signal. It may be necessary\n" +"to use the KILL (9) signal, since this signal cannot be caught, in which\n" +"case the exit status is 128+9 rather than 124.\n" +msgstr "" + +#: src/timeout.c:363 +#, c-format +msgid "warning: disabling core dumps failed" msgstr "" -#: src/timeout.c:419 +#: src/timeout.c:471 #, fuzzy, c-format msgid "error waiting for command" msgstr "chyba pri zápise %s" -#: src/timeout.c:441 +#: src/timeout.c:482 #, c-format -msgid "warning: disabling core dumps failed" +msgid "the monitored command dumped core" msgstr "" #. This is a proper name. See the gettext manual, section Names. @@ -9770,22 +10096,22 @@ msgstr "Jim Kingdon" msgid "Randy Smith" msgstr "Randy Smith" -#: src/touch.c:115 src/touch.c:313 +#: src/touch.c:115 src/touch.c:309 #, c-format msgid "invalid date format %s" msgstr "chybný formát dátumu %s" -#: src/touch.c:194 +#: src/touch.c:191 #, c-format msgid "cannot touch %s" msgstr "nie je možné vykonať touch %s" -#: src/touch.c:200 +#: src/touch.c:197 #, c-format msgid "setting times of %s" msgstr "nastavujem časy %s" -#: src/touch.c:216 +#: src/touch.c:213 msgid "" "Update the access and modification times of each FILE to the current time.\n" "\n" @@ -9794,10 +10120,9 @@ msgid "" "\n" "A FILE argument string of - is handled specially and causes touch to\n" "change the times of the file associated with standard output.\n" -"\n" msgstr "" -#: src/touch.c:229 +#: src/touch.c:225 msgid "" " -a change only the access time\n" " -c, --no-create do not create any files\n" @@ -9805,8 +10130,7 @@ msgid "" " -f (ignored)\n" msgstr "" -#: src/touch.c:235 -#, fuzzy +#: src/touch.c:231 msgid "" " -h, --no-dereference affect each symbolic link instead of any " "referenced\n" @@ -9815,33 +10139,33 @@ msgid "" " -m change only the modification time\n" msgstr "" " -h, --no-dereference má vplyv na každý symbolický odkaz, nie len na\n" -" súbory, na ktoré sa odkazuje (to je užitičné iba " +" súbory, na ktoré sa odkazuje (to je užitočné iba " "na\n" -" systémoch, ktoré môžu zmeniť vlastníctvo " -"symbolického\n" -" odkazu)\n" +" systémoch, ktoré môžu zmeniť časovú známku\n" +" symbolického odkazu)\n" +" -m zmeniť len čas poslendnej zmeny\n" -#: src/touch.c:241 +#: src/touch.c:237 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" -" --time=WORD change the specified time:\n" +" --time=WORD change the specified time:\n" " WORD is access, atime, or use: equivalent to -a\n" " WORD is modify or mtime: equivalent to -m\n" msgstr "" -#: src/touch.c:250 +#: src/touch.c:246 msgid "" "\n" "Note that the -d and -t options accept different time-date formats.\n" msgstr "" -#: src/touch.c:339 +#: src/touch.c:335 #, c-format msgid "cannot specify times from more than one source" msgstr "nie je možné uviesť počet z viac ako jedného zdroja" -#: src/touch.c:413 +#: src/touch.c:409 #, fuzzy, c-format msgid "" "warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'" @@ -10090,26 +10414,25 @@ msgid "" "If a FILE is larger than the specified size, the extra data is lost.\n" "If a FILE is shorter, it is extended and the extended part (hole)\n" "reads as zero bytes.\n" -"\n" msgstr "" -#: src/truncate.c:110 +#: src/truncate.c:109 #, fuzzy msgid " -c, --no-create do not create any files\n" msgstr " -d, --directory vytvoriť adresár, nie súbor\n" -#: src/truncate.c:113 +#: src/truncate.c:112 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" -#: src/truncate.c:116 +#: 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" msgstr "" -#: src/truncate.c:122 +#: src/truncate.c:121 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -10117,57 +10440,57 @@ msgid "" "'/' round down to multiple of, '%' round up to multiple of.\n" msgstr "" -#: src/truncate.c:150 +#: src/truncate.c:149 #, c-format msgid "overflow in %<PRIdMAX> * %<PRIdMAX> byte blocks for file %s" msgstr "" -#: src/truncate.c:174 +#: src/truncate.c:173 #, fuzzy, c-format msgid "%s has unusable, apparently negative size" msgstr "%s: súbor má zápornú dĺžku" -#: src/truncate.c:184 src/truncate.c:379 +#: src/truncate.c:183 src/truncate.c:384 #, fuzzy, c-format msgid "cannot get the size of %s" msgstr "súbor sa nedá rozdeliť viacerými spôsobmi" -#: src/truncate.c:206 +#: src/truncate.c:205 #, fuzzy, c-format msgid "overflow rounding up size of file %s" msgstr "pretečenie pozície pri čítaní súboru %s" -#: src/truncate.c:216 +#: src/truncate.c:215 #, fuzzy, c-format msgid "overflow extending size of file %s" msgstr "pretečenie pozície pri čítaní súboru %s" -#: src/truncate.c:231 +#: src/truncate.c:230 #, fuzzy, c-format msgid "failed to truncate %s at %<PRIdMAX> bytes" msgstr "presúvam sa za %s bajtov vo výstupnom súbore %s" -#: src/truncate.c:305 +#: src/truncate.c:303 #, fuzzy, c-format msgid "multiple relative modifiers specified" msgstr "boli uvedené viaceré cieľové adresáre" -#: src/truncate.c:335 +#: src/truncate.c:333 #, fuzzy, c-format msgid "you must specify either %s or %s" msgstr "nie je možné nastaviť bezpečnostný kontext %s na %s" -#: src/truncate.c:342 +#: src/truncate.c:340 #, fuzzy, c-format msgid "you must specify a relative %s with %s" msgstr "nie je možné nastaviť bezpečnostný kontext %s na %s" -#: src/truncate.c:349 +#: src/truncate.c:347 #, c-format msgid "%s was specified but %s was not" msgstr "" -#: src/truncate.c:400 +#: src/truncate.c:404 #, c-format msgid "cannot open %s for writing" msgstr "nie je možné otvoriť %s na čítanie" @@ -10254,16 +10577,16 @@ msgid "cannot get system name" msgstr "nie je možné zistiť systémový názov" #: 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" -"\n" msgstr "" "V každom SÚBORe prevedie medzery na tabulátory a výsledok vypisuje\n" "na štandardný výstup. Ak nebude SÚBOR zadaný alebo bude -, načíta sa\n" "štandardný vstup.\n" -#: src/unexpand.c:125 +#: src/unexpand.c:124 msgid "" " -a, --all convert all blanks, instead of just initial blanks\n" " --first-only convert only leading sequences of blanks (overrides -a)\n" @@ -10271,12 +10594,12 @@ msgid "" " -t, --tabs=LIST use comma separated LIST of tab positions (enables -a)\n" msgstr "" -#: src/unexpand.c:153 +#: src/unexpand.c:152 #, c-format msgid "tabs are too far apart" msgstr "" -#: src/unexpand.c:505 +#: src/unexpand.c:504 #, c-format msgid "tab stop value is too large" msgstr "hodnota tabulátora je príliš veľká" @@ -10292,16 +10615,15 @@ msgid "" "writing to OUTPUT (or standard output).\n" "\n" "With no options, matching lines are merged to the first occurrence.\n" -"\n" msgstr "" -#: src/uniq.c:148 +#: src/uniq.c:147 msgid "" " -c, --count prefix lines by the number of occurrences\n" " -d, --repeated only print duplicate lines\n" msgstr "" -#: src/uniq.c:152 +#: src/uniq.c:151 msgid "" " -D, --all-repeated[=delimit-method] print all duplicate lines\n" " delimit-method={none(default),prepend,separate}\n" @@ -10313,18 +10635,18 @@ msgid "" " -z, --zero-terminated end lines with 0 byte, not newline\n" msgstr "" -#: src/uniq.c:162 +#: src/uniq.c:161 msgid " -w, --check-chars=N compare no more than N characters in lines\n" msgstr "" -#: src/uniq.c:167 +#: src/uniq.c:166 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:172 +#: src/uniq.c:171 msgid "" "\n" "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n" @@ -10332,25 +10654,25 @@ msgid "" "Also, comparisons honor the rules specified by 'LC_COLLATE'.\n" msgstr "" -#: src/uniq.c:359 +#: src/uniq.c:358 #, c-format msgid "too many repeated lines" msgstr "príliš veľa zopakovaných riadkov" -#: src/uniq.c:522 +#: src/uniq.c:521 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:531 +#: src/uniq.c:530 msgid "invalid number of bytes to skip" msgstr "chybný počet znakov na preskočenie" -#: src/uniq.c:540 +#: src/uniq.c:539 msgid "invalid number of bytes to compare" msgstr "chybný počet znakov na porovnanie" -#: src/uniq.c:559 +#: src/uniq.c:558 #, c-format msgid "printing all duplicated lines and repeat counts is meaningless" msgstr "" @@ -10404,6 +10726,11 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" +#: src/uptime.c:149 +#, fuzzy, c-format +msgid "up %2d:%02d, " +msgstr " %2d:%02d%s beží " + #: src/uptime.c:151 #, c-format msgid "%lu user" @@ -10502,41 +10829,41 @@ msgstr "" msgid " old " msgstr " dávno " -#: src/who.c:449 +#: src/who.c:440 #, fuzzy msgid "system boot" msgstr "Systémová chyba" -#: src/who.c:456 src/who.c:458 +#: src/who.c:447 src/who.c:449 msgid "id=" msgstr "id=" -#: src/who.c:471 src/who.c:476 +#: src/who.c:462 src/who.c:467 msgid "term=" msgstr "term=" -#: src/who.c:473 src/who.c:477 +#: src/who.c:464 src/who.c:468 msgid "exit=" msgstr "ukonč=" -#: src/who.c:494 +#: src/who.c:485 #, fuzzy msgid "LOGIN" msgstr "TERM" -#: src/who.c:514 +#: src/who.c:505 msgid "clock change" msgstr "zmena času" -#: src/who.c:526 src/who.c:527 +#: src/who.c:517 src/who.c:518 msgid "run-level" msgstr "úroveň-behu" -#: src/who.c:530 src/who.c:531 +#: src/who.c:521 src/who.c:522 msgid "last=" msgstr "posledný=" -#: src/who.c:562 +#: src/who.c:553 #, c-format msgid "" "\n" @@ -10545,44 +10872,44 @@ msgstr "" "\n" "# používateľov=%lu\n" -#: src/who.c:568 +#: src/who.c:559 msgid "NAME" msgstr "NÁZOV" -#: src/who.c:568 +#: src/who.c:559 msgid "LINE" msgstr "TERM" -#: src/who.c:568 +#: src/who.c:559 msgid "TIME" msgstr "ČAS" -#: src/who.c:568 +#: src/who.c:559 msgid "IDLE" msgstr "NEČINNÝ" -#: src/who.c:569 +#: src/who.c:560 msgid "PID" msgstr "PID" -#: src/who.c:569 +#: src/who.c:560 msgid "COMMENT" msgstr "KOMENTÁR" -#: src/who.c:569 +#: src/who.c:560 msgid "EXIT" msgstr "UKONČ" -#: src/who.c:649 +#: src/who.c:640 #, c-format msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n" msgstr "Použitie: %s [PREPÍNAČ]... [ SÚBOR | ARG1 ARG2 ]\n" -#: src/who.c:650 +#: src/who.c:641 msgid "Print information about users who are currently logged in.\n" msgstr "" -#: src/who.c:653 +#: src/who.c:644 msgid "" "\n" " -a, --all same as -b -d --login -p -r -t -T -u\n" @@ -10591,18 +10918,18 @@ msgid "" " -H, --heading print line of column headings\n" msgstr "" -#: src/who.c:660 +#: src/who.c:651 msgid " -l, --login print system login processes\n" msgstr "" -#: src/who.c:663 +#: src/who.c:654 msgid "" " --lookup attempt to canonicalize hostnames via DNS\n" " -m only hostname and user associated with stdin\n" " -p, --process print active processes spawned by init\n" msgstr "" -#: src/who.c:668 +#: src/who.c:659 msgid "" " -q, --count all login names and number of users logged on\n" " -r, --runlevel print current runlevel\n" @@ -10610,7 +10937,7 @@ msgid "" " -t, --time print last system clock change\n" msgstr "" -#: src/who.c:674 +#: src/who.c:665 msgid "" " -T, -w, --mesg add user's message status as +, - or ?\n" " -u, --users list users logged in\n" @@ -10618,7 +10945,7 @@ msgid "" " --writable same as -T\n" msgstr "" -#: src/who.c:682 +#: src/who.c:673 #, fuzzy, c-format msgid "" "\n" @@ -10660,20 +10987,133 @@ msgid "" msgstr "" #, fuzzy -#~ msgid " gid=%s" -#~ msgstr " gid=%lu" +#~ msgid " returning value: '%s'\n" +#~ msgstr "vytvára sa súbor %s\n" + +#, fuzzy +#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n" +#~ msgstr "Použitie: %s [VOĽBA] NÁZOV...\n" #, fuzzy -#~ msgid " euid=%s" -#~ msgstr " euid=%lu" +#~ msgid "no valid suffix found\n" +#~ msgstr "%s: neplatná dĺžka prípony" + +#~ msgid "reading %s" +#~ msgstr "číta sa %s" + +#~ msgid "writing %s" +#~ msgstr "zapisuje sa %s" + +#~ msgid "closing %s" +#~ msgstr "zatvára sa %s" + +#~ msgid "accessing %s" +#~ msgstr "pristupujem k %s" + +#~ msgid "opening %s" +#~ msgstr "otváram %s" #, fuzzy #~ msgid "" -#~ "Usage: %s NAME\n" -#~ " or: %s OPTION\n" +#~ " 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 "" -#~ "Použitie: %s [SÚBOR]...\n" -#~ " alebo: %s [VOĽBA]\n" +#~ " none, off nikdy nevytvárať záložné kópie (ani ak bolo zadané --" +#~ "backup)\n" +#~ " numbered, t tvoriť číslované záložné kópie\n" +#~ " existing, nil tvoriť číslované, pokiaľ už číslované záložné kópie\n" +#~ " existujú, inak tvoriť jednoduché\n" +#~ " simple, never vždy tvoriť jednoduché záložné kópie súborov \n" + +#~ msgid "Usage: %s [OPTION]... FILE\n" +#~ msgstr "Použitie: %s [VOĽBA]... [SÚBOR]\n" + +#~ msgid "Password:" +#~ msgstr "Heslo:" + +#~ msgid "getpass: cannot open /dev/tty" +#~ msgstr "getpass: nie je možné otvoriť /dev/tty" + +#~ msgid "cannot set groups" +#~ msgstr "nie je možné nastaviť skupiny" + +#~ msgid "cannot set group id" +#~ msgstr "nie je možné nastaviť ID skupiny" + +#~ msgid "cannot set user id" +#~ msgstr "nie je možné nastaviť ID používateľa" + +#~ msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" +#~ msgstr "Použitie: %s [VOĽBA]... [-] [POUŽÍVATEĽ [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 "" +#~ "Zmeniť efektívne id používateľa a skupiny na id POUŽÍVATEĽA.\n" +#~ "\n" +#~ " -, -l, --login urobiť tento shell prihlasovacím\n" +#~ " -c, --command=PRÍKAZ odovzdať shellu jediný PRÍKAZ pomocou -c\n" +#~ " -f, --fast odovzdať shellu -f (pre csh alebo tcsh)\n" +#~ " -m, --preserve-environment zachovať premenné prostredia\n" +#~ " -p rovnaké ako -m\n" +#~ " -s, --shell=SHELL spustiť SHELL, pokiaľ to /etc/shells " +#~ "povoľuje\n" + +#~ msgid "user %s does not exist" +#~ msgstr "používateľ %s neexistuje" + +#~ msgid "incorrect password" +#~ msgstr "nesprávne heslo" + +#~ msgid "using restricted shell %s" +#~ msgstr "použitý obmedzený shell %s" + +#~ msgid "warning: cannot change directory to %s" +#~ msgstr "upozornenie: nie je možné zmeniť adresár na %s" + +#~ msgid "%s: illegal option -- %c\n" +#~ msgstr "%s: nepovolený prepínač -- %c\n" + +#~ msgid "invalid argument: %s" +#~ msgstr "neplatný argument: %s" + +#~ msgid "Try `%s --help' for more information.\n" +#~ msgstr "Viac informácií získate príkazom `%s --help'.\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=STĹP Zalamovať zakódované riadky po STĹP znakoch " +#~ "(štandardne 76).\n" +#~ " Nastavením na 0 vypnete zalamovanie riadkov.\n" +#~ "\n" +#~ " -d, --decode Dekódovať dáta.\n" +#~ " -i, --ignore-garbage Pri dekódovaní ignorovať nealfabetické znaky.\n" +#~ "\n" + +#~ msgid "" +#~ " --help Display this help and exit.\n" +#~ " --version Output version information and exit.\n" +#~ msgstr "" +#~ " --help vypíše tohto pomocníka a skončí\n" +#~ " --version vypíše označenie verzie a skončí\n" #~ msgid "" #~ "\n" @@ -10686,11 +11126,8 @@ msgstr "" #~ " %s /usr/bin/sort Výstup \"sort\".\n" #~ " %s include/stdio.h .h Výstup \"stdio\".\n" -#~ msgid "Try `%s --help' for more information.\n" -#~ msgstr "Viac informácií získate príkazom `%s --help'.\n" - -#~ msgid "Usage: %s [OPTION] FILE...\n" -#~ msgstr "Použitie: %s [VOĽBA] [SÚBOR]...\n" +#~ msgid "%s" +#~ msgstr "%s" #~ msgid "" #~ "Change the group of each FILE to GROUP.\n" @@ -10759,22 +11196,14 @@ msgstr "" #~ " --reference=RSÚBOR použiť práva RSÚBORu namiesto PRÁV\n" #~ " -R, --recursive vykonať operáciu aj vo vnorených adresároch\n" -#, fuzzy -#~ msgid "Usage: %s [OPTION]... PATH START\n" -#~ msgstr "Použitie: %s [PREPÍNAČ]... MNOŽINA1 [MNOŽINA2]\n" - -#, fuzzy #~ 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" +#~ " -P, --no-dereference never follow symbolic links in SOURCE\n" #~ msgstr "" -#~ "\n" -#~ "VEĽKOSŤ môže byť (alebo môže byť celé číslo, po ktorom nasleduje) jedno z " -#~ "nasledovných:\n" -#~ "kB 1000, K 1024, MB 1000*1000, M 1024*1024 atď pre G, T, P, E, Z, Y.\n" +#~ " -P, --no-dereference nikdy nenasledovať symbolické odkazy v " +#~ "ZDROJi\n" + +#~ msgid "invalid format precision" +#~ msgstr "neplatná presnosť vo formáte" #, fuzzy #~ msgid "" @@ -10799,58 +11228,36 @@ msgstr "" #~ " --help vypísať túto pomoc a skončiť\n" #~ " --version vypísať informáciu o verzii a skončiť\n" -#, fuzzy -#~ msgid "cannot create link %s" -#~ msgstr "nie je možné vytvoriť adresár %s" - -#, fuzzy -#~ msgid "%s: option '%s' is ambiguous\n" -#~ msgstr "%s: prepínač `-W %s' nie je jednoznačný\n" - -#~ msgid "%s: illegal option -- %c\n" -#~ msgstr "%s: nepovolený prepínač -- %c\n" - -#~ msgid "invalid argument: %s" -#~ msgstr "neplatný argument: %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" +#~ "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 "" -#~ " -w, --wrap=STĹP Zalamovať zakódované riadky po STĹP znakoch " -#~ "(štandardne 76).\n" -#~ " Nastavením na 0 vypnete zalamovanie riadkov.\n" -#~ "\n" -#~ " -d, --decode Dekódovať dáta.\n" -#~ " -i, --ignore-garbage Pri dekódovaní ignorovať nealfabetické znaky.\n" #~ "\n" +#~ "VEĽKOSŤ môže byť (alebo môže byť celé číslo, po ktorom nasleduje) jedno z " +#~ "nasledovných:\n" +#~ "kB 1000, K 1024, MB 1000*1000, M 1024*1024 atď pre G, T, P, E, Z, Y.\n" +#, fuzzy #~ msgid "" -#~ " --help Display this help and exit.\n" -#~ " --version Output version information and exit.\n" +#~ "Usage: %s NAME\n" +#~ " or: %s OPTION\n" #~ msgstr "" -#~ " --help vypíše tohto pomocníka a skončí\n" -#~ " --version vypíše označenie verzie a skončí\n" - -#~ msgid "%s" -#~ msgstr "%s" +#~ "Použitie: %s [SÚBOR]...\n" +#~ " alebo: %s [VOĽBA]\n" #~ msgid "" -#~ " -P, --no-dereference never follow symbolic links in SOURCE\n" +#~ "\n" +#~ "Examples:\n" +#~ " %s /usr/bin/sort Output \"/usr/bin\".\n" +#~ " %s stdio.h Output \".\".\n" #~ msgstr "" -#~ " -P, --no-dereference nikdy nenasledovať symbolické odkazy v " -#~ "ZDROJi\n" - -#~ msgid "invalid format width" -#~ msgstr "neplatná šírka vo formáte" - -#~ msgid "invalid format precision" -#~ msgstr "neplatná presnosť vo formáte" +#~ "\n" +#~ "príklady:\n" +#~ " %s /usr/bin/sort Vypísať \"/usr/bin\".\n" +#~ " %s stdio.h Vypísať \".\".\n" #~ msgid "Usage: %s [OPTION]... [STRING]...\n" #~ msgstr "Použitie: %s [VOĽBA]... [SÚBOR]...\n" @@ -10930,6 +11337,21 @@ msgstr "" #~ msgid "couldn't open temporary file" #~ msgstr "nebolo možné otvoriť dočasný súbor" +#~ 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 použiť prípony s dĺžkou N (štandardne %d)\n" +#~ " -b, --bytes=VEĽKOSŤ zapíše VEĽKOST bajtov do výstupného súboru\n" +#~ " -C, --line-bytes=VEĽKOSŤ zapíše najviac VEĽKOST bytov na výstupný " +#~ "riadok\n" +#~ " -d, --numeric-suffixes použiť číselné prípony namiesto abecedných\n" +#~ " -l, --lines=POČET zapíše POČET riadkov do výstupného súboru\n" + #~ msgid "invalid number of lines: 0" #~ msgstr "chybný počet riadkov: 0" @@ -11018,6 +11440,9 @@ msgstr "" #~ msgid "cannot create temporary file" #~ msgstr "nie je možné vytvoriť dočasný súbor" +#~ msgid "Usage: %s [OPTION] FILE...\n" +#~ msgstr "Použitie: %s [VOĽBA] [SÚBOR]...\n" + #~ msgid "new_mode: mode\n" #~ msgstr "new_mode: mode\n" @@ -11062,9 +11487,6 @@ msgstr "" #~ "s\n" #~ "používa MNOŽINU1.\n" -#~ msgid " %2d:%02d%s up " -#~ msgstr " %2d:%02d%s beží " - #~ msgid "am" #~ msgstr "am" @@ -11756,10 +12178,6 @@ msgstr "" #~ msgid "removing the directory itself: %s\n" #~ msgstr "varovanie: nie je možné zmeniť adresár na %s" -#, fuzzy -#~ msgid "cannot fork" -#~ msgstr "nie je možné spustiť %s" - #, fuzzy #~ msgid "" #~ "ERROR: the source file %s initially had device/inode\n" diff --git a/po/sl.gmo b/po/sl.gmo index 8dbad3ca..0c5543f0 100644 Binary files a/po/sl.gmo and b/po/sl.gmo differ diff --git a/po/sl.po b/po/sl.po index e05286b5..ccb2f79a 100644 --- a/po/sl.po +++ b/po/sl.po @@ -3,14 +3,14 @@ # 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. # Klemen Košir <klemen913@gmail.com>, 2011. -# $Id: coreutils-8.16.sl.po,v 1.2 2012/04/12 19:14:06 peterlin Exp $ +# $Id: coreutils-8.20-pre1.sl.po,v 1.2 2012/10/28 21:27:44 peterlin Exp $ # msgid "" msgstr "" -"Project-Id-Version: GNU coreutils 8.16\n" +"Project-Id-Version: GNU coreutils 8.20-pre1\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2012-05-10 19:35+0200\n" -"PO-Revision-Date: 2012-04-12 21:14+0200\n" +"POT-Creation-Date: 2013-02-14 15:56+0000\n" +"PO-Revision-Date: 2012-10-28 22:27+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,19 +38,19 @@ msgstr "Veljavni argumenti so:" msgid "error closing file" msgstr "napaka pri zapiranju datoteke" -#: lib/closeout.c:112 src/base64.c:109 src/base64.c:121 src/base64.c:127 -#: src/base64.c:168 src/base64.c:224 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:330 src/expand.c:355 src/head.c:298 -#: src/head.c:348 src/head.c:756 src/head.c:797 src/mktemp.c:350 src/od.c:919 -#: src/paste.c:160 src/shuf.c:369 src/split.c:727 src/split.c:964 -#: src/split.c:969 src/tail.c:350 src/tail.c:1201 src/tail.c:1307 +#: 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 -#: src/unexpand.c:427 src/unexpand.c:443 +#: 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:1160 src/copy.c:2602 +#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617 #, c-format msgid "preserving permissions for %s" msgstr "ohranjena dovoljenja za %s" @@ -243,19 +243,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:483 +#: lib/mkdir-p.c:196 src/install.c:484 #, c-format msgid "cannot change permissions of %s" msgstr "dovoljenj %s ni mogoče spremeniti" -#: lib/mkdir-p.c:206 src/copy.c:2261 src/install.c:709 src/install.c:722 +#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722 #, 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:915 src/tac.c:435 +#: src/split.c:929 src/tac.c:434 #, c-format msgid "memory exhausted" msgstr "zmanjkalo pomnilnika" @@ -304,76 +304,76 @@ msgstr "«" msgid "%s: end of file" msgstr "%s: konec datoteke" -#: lib/regcomp.c:130 +#: lib/regcomp.c:131 msgid "Success" msgstr "Uspešno" -#: lib/regcomp.c:133 +#: lib/regcomp.c:134 msgid "No match" msgstr "Brez zadetkov" -#: lib/regcomp.c:136 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "Neveljaven regularni izraz" -#: lib/regcomp.c:139 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "Neveljaven razvrščevalni znak" -#: lib/regcomp.c:142 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "Neveljavno ime razreda znakov" -#: lib/regcomp.c:145 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "Zaključna obratna poševnica" -#: lib/regcomp.c:148 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "Neveljaven povratni sklic" -#: lib/regcomp.c:151 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "Uklepaj [ ali [^ brez para" -#: lib/regcomp.c:154 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "Uklepaj ( ali \\( brez para" -#: lib/regcomp.c:157 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "Uklepaj \\{ brez para" -#: lib/regcomp.c:160 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "Neveljavna vsebina \\{\\}" -#: lib/regcomp.c:163 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "Neveljaven konec razpona" # ! INEXACT -#: lib/regcomp.c:166 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Pomnilnik izčrpan" -#: lib/regcomp.c:169 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "Neveljaven predhodni regularni izraz" -#: lib/regcomp.c:172 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "Predčasen zaključek regularnega izraza" -#: lib/regcomp.c:175 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "Regularni izraz je preobsežen" -#: lib/regcomp.c:178 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "Zaklepaj ) ali \\) brez para" -#: lib/regcomp.c:703 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "Prejšnjega regularnega izraza ni" @@ -412,7 +412,7 @@ msgstr "^[jJdD]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-mode-acl.c:695 src/copy.c:2284 src/cp.c:518 +#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516 #, c-format msgid "setting permissions for %s" msgstr "nastavljena dovoljenja za %s" @@ -553,13 +553,13 @@ msgstr "Izpad toka" msgid "Resource lost" msgstr "Vir izgubljen" -#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262 -#: lib/spawn-pipe.c:265 +#: 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:232 lib/spawn-pipe.c:346 lib/wait-process.c:282 +#: 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" @@ -575,24 +575,24 @@ msgstr "Realnočasovni signal %d" msgid "Unknown signal %d" msgstr "Neznani signal %d" -#: lib/unicodeio.c:103 +#: lib/unicodeio.c:102 msgid "iconv function not usable" msgstr "funkcija iconv ne deluje" -#: lib/unicodeio.c:105 +#: lib/unicodeio.c:104 msgid "iconv function not available" msgstr "funkcija iconv ni na voljo" -#: lib/unicodeio.c:112 +#: lib/unicodeio.c:111 msgid "character out of range" msgstr "koda znaka izven obsega" -#: lib/unicodeio.c:182 +#: lib/unicodeio.c:181 #, c-format msgid "cannot convert U+%04X to local character set" msgstr "znaka s kodo U+%04X ni mogoče pretvoriti v lokalni nabor znakov" -#: lib/unicodeio.c:184 +#: lib/unicodeio.c:183 #, c-format msgid "cannot convert U+%04X to local character set: %s" msgstr "znaka s kodo U+%04X ni moč pretvoriti v lokalni nabor znakov: %s" @@ -776,7 +776,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:562 +#: lib/version-etc.c:251 src/system.h:573 #, c-format msgid "%s home page: <%s>\n" msgstr "Domača stran %s: <%s>\n" @@ -786,7 +786,7 @@ 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:563 +#: lib/version-etc.c:256 src/system.h:574 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" @@ -872,18 +872,17 @@ msgid "Simon Josefsson" msgstr "Simon Josefsson" #: src/base64.c:60 -#, c-format +#, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" "Base64 encode or decode FILE, or standard input, to standard output.\n" -"\n" msgstr "" "Uporaba: %s [IZBIRA]... [DATOTEKA]\n" "Base64 kodira ali dekodira DATOTEKO ali standardni vhod na standardni " "izhod.\n" "\n" -#: src/base64.c:64 +#: src/base64.c:67 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -898,7 +897,7 @@ msgstr "" "\\\n" " N=0 pomeni brez preloma vrstic\n" -#: src/base64.c:73 src/cat.c:110 src/fmt.c:293 src/shuf.c:71 src/sum.c:70 +#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -906,7 +905,7 @@ msgstr "" "\n" "Če DATOTEKA ni podana, ali pa je enaka -, beremo s standardnega vhoda.\n" -#: src/base64.c:76 +#: src/base64.c:79 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -923,37 +922,37 @@ msgstr "" "druge\n" "znake izven abecede base64.\n" -#: src/base64.c:171 src/base64.c:208 src/csplit.c:263 src/csplit.c:1435 -#: src/join.c:451 src/shuf.c:157 src/shuf.c:361 src/tac-pipe.c:74 +#: 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 #, c-format msgid "read error" msgstr "napaka pri branju" -#: src/base64.c:227 +#: src/base64.c:230 #, c-format msgid "invalid input" msgstr "neveljavni vhod" -#: src/base64.c:264 +#: src/base64.c:267 #, c-format msgid "invalid wrap size: %s" msgstr "neveljavna širina: %s" -#: src/base64.c:283 src/basename.c:173 src/comm.c:435 src/cp.c:607 -#: src/date.c:441 src/dircolors.c:447 src/du.c:894 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:169 src/install.c:929 src/join.c:961 -#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:157 src/mv.c:447 -#: src/od.c:1802 src/ptx.c:2081 src/readlink.c:154 src/seq.c:408 -#: src/shuf.c:320 src/shuf.c:339 src/sort.c:4477 src/split.c:1313 -#: src/tr.c:1797 src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:454 -#: src/uniq.c:471 src/unlink.c:81 src/uptime.c:250 src/users.c:146 -#: src/wc.c:666 src/who.c:836 src/whoami.c:79 +#: 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 #, c-format msgid "extra operand %s" msgstr "odvečni operand %s" -#: src/base64.c:315 src/cat.c:781 +#: src/base64.c:318 src/cat.c:781 #, c-format msgid "closing standard input" msgstr "zapiramo standardni vhod" @@ -961,15 +960,15 @@ msgstr "zapiramo 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/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:53 src/env.c:33 +#: 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/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:65 src/su.c:88 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 +#: 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 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -983,15 +982,15 @@ 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" -"\n" msgstr "" "Izpišemo IME datoteke brez celotne poti do nje. Če je podana PRIPONA,\n" "izpišemo ime datoteke brez pripone.\n" -#: src/basename.c:59 +#: 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" @@ -1002,7 +1001,7 @@ msgstr "" " -s, --suffix=PRIPONA odstrani PRIPONO\n" " -z, --zero vrstice zaključi z znakom NUL namesto z LF\n" -#: src/basename.c:66 +#: src/basename.c:67 #, c-format msgid "" "\n" @@ -1019,20 +1018,21 @@ msgstr "" " %s -s .h include/stdio.h -> »stdio«\n" " %s -a nekaj/niz1 nekaj/niz2 -> »niz1« ki mu sledi »niz2«\n" -#: src/basename.c:167 src/chcon.c:531 src/chgrp.c:277 src/chmod.c:526 -#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1369 +#: 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:183 src/mkfifo.c:108 src/mknod.c:146 src/nohup.c:111 -#: src/pathchk.c:148 src/printf.c:674 src/readlink.c:146 src/realpath.c:236 -#: src/rm.c:314 src/rmdir.c:223 src/seq.c:402 src/setuidgid.c:137 -#: src/sleep.c:119 src/stat.c:1476 src/stdbuf.c:346 src/tr.c:1782 +#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 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 #, 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:52 src/split.c:49 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/split.c:49 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" @@ -1042,8 +1042,8 @@ msgstr "Torbjorn Granlund" msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:846 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4720 src/nl.c:182 src/paste.c:435 src/pr.c:2768 src/sum.c:58 +#: 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/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 +1102,7 @@ msgstr "" msgid "cannot do ioctl on %s" msgstr "ioctl na »%s« ni mogoč" -#: src/cat.c:637 src/dd.c:2209 src/sort.c:379 src/tee.c:165 src/yes.c:86 +#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86 #, c-format msgid "standard output" msgstr "standardni izhod" @@ -1119,14 +1119,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:55 src/head.c:46 src/hostid.c:33 +#: 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 msgid "Jim Meyering" msgstr "Jim Meyering" -#: src/chcon.c:100 src/runcon.c:203 src/runcon.c:234 +#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238 #, c-format msgid "failed to create security context: %s" msgstr "ustvarjenje varnostnega konteksta ni uspelo: %s" @@ -1136,8 +1136,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:540 src/copy.c:2222 src/runcon.c:217 -#: src/stat.c:683 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221 +#: src/stat.c:702 #, c-format msgid "failed to get security context of %s" msgstr "branje varnostnega konteksta %s ni uspelo" @@ -1153,12 +1153,12 @@ 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:446 src/ls.c:2981 +#: src/du.c:457 src/ls.c:2981 #, 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:426 +#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437 #, c-format msgid "cannot read directory %s" msgstr "imenika %s ni mogoče prebrati" @@ -1168,13 +1168,13 @@ msgstr "imenika %s ni mogoče prebrati" msgid "changing security context of %s\n" msgstr "spreminjanje varnostnega konteksta %s\n" -#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:599 +#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562 #, 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:618 -#: src/remove.c:613 +#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642 +#: src/remove.c:576 #, c-format msgid "fts_close failed" msgstr "fts_close ni uspel" @@ -1192,18 +1192,18 @@ msgstr "" " ali: %s [IZBIRA]... --reference=ZGLED DATOTEKA...\n" #: src/chcon.c:357 +#, fuzzy msgid "" "Change the security context of each FILE to CONTEXT.\n" "With --reference, change the security context 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" "\n" -#: src/chcon.c:362 src/chgrp.c:123 src/chown.c:94 +#: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94 msgid "" " --dereference affect the referent of each symbolic link (this is\n" " the default), rather than the symbolic link itself\n" @@ -1216,7 +1216,7 @@ msgstr "" " -h, --no-deferefence deluje na simbolne povezave, ne na ciljne " "datoteke\n" -#: src/chcon.c:367 +#: src/chcon.c:369 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" @@ -1228,7 +1228,15 @@ msgstr "" " -t, --type=TIP nastavi TIP v ciljnem varnostnem kontekstu\n" " -l, --range=OBSEG nastavi OBSEG v ciljnem varnostnem kontekstu\n" -#: src/chcon.c:373 +#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 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 imenika »/« ne obravnavamo posebej (privzeto)\n" +" --preserve-root ne dovoli rekurzivnega dela na »/«\n" + +#: src/chcon.c:379 msgid "" " --reference=RFILE use RFILE's security context rather than " "specifying\n" @@ -1238,15 +1246,15 @@ msgstr "" "nastavimo\n" " enako, kot ga ima nastavljen ZGLED\n" -#: src/chcon.c:377 src/chgrp.c:140 src/chown.c:118 +#: 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 rekurzivno obdelamo imenike in datoteke\n" -#: src/chcon.c:380 +#: src/chcon.c:386 msgid " -v, --verbose output a diagnostic for every file processed\n" msgstr " -v, --verbose z diagnostiko za vsako obdelano datoteko\n" -#: src/chcon.c:383 src/chgrp.c:143 src/chown.c:121 +#: src/chcon.c:389 src/chgrp.c:143 src/chown.c:121 msgid "" "\n" "The following options modify how a hierarchy is traversed when the -R\n" @@ -1273,36 +1281,36 @@ msgstr "" " -P ne prečeši nobene simbolne povezave (privzeto)\n" "\n" -#: src/chcon.c:512 src/chgrp.c:264 src/chown.c:267 +#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267 #, c-format msgid "-R --dereference requires either -H or -L" msgstr "-R --dereference zahteva bodisi -H, bodisi -L" -#: src/chcon.c:518 +#: src/chcon.c:524 #, c-format msgid "-R -h requires -P" msgstr "-R -h zahteva -P" -#: src/chcon.c:533 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282 -#: src/comm.c:429 src/csplit.c:1371 src/join.c:1149 src/link.c:79 -#: src/mknod.c:148 src/setuidgid.c:139 src/tr.c:1785 +#: 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 #, c-format msgid "missing operand after %s" msgstr "manjkajoč operand za %s" -#: src/chcon.c:556 src/runcon.c:247 +#: src/chcon.c:562 src/runcon.c:251 #, c-format msgid "invalid context: %s" msgstr "neveljavni kontekst: %s" -#: src/chcon.c:563 +#: src/chcon.c:569 #, c-format msgid "conflicting security context specifiers given" msgstr "podana določila varnostnega konteksta si nasprotujejo" -#: src/chcon.c:572 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:433 src/cp.c:493 -#: src/mv.c:96 src/pwd.c:273 src/rm.c:324 src/touch.c:351 +#: 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 #, c-format msgid "failed to get attributes of %s" msgstr "branje prilastkov (atributov) %s ni uspelo" @@ -1352,14 +1360,6 @@ msgstr "" "spremembo\n" " lastništva simbolne povezave)\n" -#: src/chgrp.c:132 src/chmod.c:387 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 imenika »/« ne obravnavamo posebej (privzeto)\n" -" --preserve-root ne dovoli rekurzivnega dela na »/«\n" - #: src/chgrp.c:136 msgid "" " --reference=RFILE use RFILE's group rather than specifying a\n" @@ -1626,7 +1626,7 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:97 src/install.c:575 src/setuidgid.c:110 src/setuidgid.c:120 +#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120 #, c-format msgid "invalid group %s" msgstr "neveljavno ime skupine %s" @@ -1694,8 +1694,8 @@ msgstr "nastavitev GID ni uspela" msgid "failed to set user-ID" msgstr "nastavitev UID ni uspela" -#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:213 src/stdbuf.c:366 -#: src/timeout.c:402 +#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365 +#: src/timeout.c:454 #, c-format msgid "failed to run command %s" msgstr "ukaza %s ni uspelo izvesti" @@ -1816,20 +1816,24 @@ msgstr "podanih je več razmejilnikov" msgid "empty %s not allowed" msgstr "prazen %s ni dovoljen" -#: src/copy.c:168 src/dd.c:1609 src/dd.c:1976 +#: 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 #, c-format -msgid "reading %s" -msgstr "beremo %s" +msgid "error reading %s" +msgstr "napaka pri branju %s" -#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:426 +#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425 #, c-format msgid "cannot lseek %s" msgstr "premikanje z lseek po %s ni mogoče" -#: src/copy.c:206 src/dd.c:2039 src/dd.c:2102 +#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151 #, c-format -msgid "writing %s" -msgstr "zapisovanje %s" +msgid "error writing %s" +msgstr "napaka pri pisanju na %s" #: src/copy.c:313 #, c-format @@ -1851,7 +1855,7 @@ msgstr "razširjanje %s ni uspelo" msgid "clearing permissions for %s" msgstr "brišemo dovoljenja za %s" -#: src/copy.c:697 src/copy.c:2470 src/cp.c:331 +#: src/copy.c:697 src/copy.c:2480 src/cp.c:329 #, c-format msgid "failed to preserve ownership for %s" msgstr "lastništvo za %s ni bilo ohranjeno" @@ -1866,14 +1870,14 @@ msgstr "vpogled v datoteko %s ni uspel" msgid "failed to preserve authorship for %s" msgstr "avtorstvo datoteke %s ni bilo ohranjeno" -#: src/copy.c:804 src/csplit.c:638 src/du.c:901 src/fmt.c:449 src/head.c:847 -#: src/sort.c:4489 src/split.c:1329 src/tail.c:1756 src/wc.c:678 +#: 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 "datotek %s ni mogoče odpreti za branje" -#: src/copy.c:810 src/copy.c:972 src/dd.c:1546 src/dd.c:2114 src/dd.c:2252 -#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:141 +#: 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 #, c-format msgid "cannot fstat %s" msgstr "statusa %s ni moč ugotoviti s fstat" @@ -1893,14 +1897,14 @@ msgstr "branje konteksta ustvarjenja datotečnega sistema ni uspelo" msgid "failed to set the security context of %s to %s" msgstr "nastavitev varnostnega konteksta %s na %s ni uspela" -#: src/copy.c:881 src/copy.c:1574 src/copy.c:1777 src/copy.c:1935 src/ln.c:314 -#: src/remove.c:267 src/remove.c:293 src/remove.c:444 src/remove.c:465 +#: 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 #, c-format msgid "cannot remove %s" msgstr "ni mogoče odstraniti %s" -#: src/copy.c:886 src/copy.c:1578 src/copy.c:1772 src/copy.c:1940 -#: src/remove.c:418 +#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945 +#: src/remove.c:375 #, c-format msgid "removed %s\n" msgstr "odstranjena %s\n" @@ -1920,188 +1924,188 @@ msgstr "ni mogoče ustvariti navadne datoteke %s" msgid "failed to clone %s from %s" msgstr "ustvarjanje klona %s iz %s ni uspelo" -#: src/copy.c:1098 src/copy.c:2531 +#: src/copy.c:1098 src/copy.c:2541 #, c-format msgid "preserving times for %s" msgstr "ohranjeni časi za %s" -#: src/copy.c:1170 src/copy.c:1176 src/head.c:855 src/touch.c:175 -#: src/truncate.c:413 -#, c-format -msgid "closing %s" -msgstr "zapiramo %s" +#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172 +#: src/truncate.c:417 +#, fuzzy, c-format +msgid "failed to close %s" +msgstr "odpiranje %s ni uspelo" -#: src/copy.c:1466 +#: src/copy.c:1471 #, c-format msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? " msgstr "%s: naj pišemo prek %s navzlic zaščiti %04lo (%s)? " -#: src/copy.c:1473 +#: src/copy.c:1478 #, c-format msgid "%s: overwrite %s? " msgstr "%s: naj pišemo prek %s? " -#: src/copy.c:1542 +#: src/copy.c:1547 #, c-format msgid " (backup: %s)" msgstr " (varnostna kopija: %s)" -#: src/copy.c:1552 +#: src/copy.c:1557 #, c-format msgid "failed to restore the default file creation context" msgstr "povrnitev privzetega konteksta ustvarjenja datoteke ni uspela" -#: src/copy.c:1584 +#: src/copy.c:1589 #, c-format msgid "cannot create hard link %s to %s" msgstr "ni mogoče ustvariti trde povezave %s na %s" -#: src/copy.c:1637 src/copy.c:1689 src/copy.c:2272 src/copy.c:2589 +#: 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:1220 src/truncate.c:365 +#: src/stat.c:1239 src/truncate.c:363 #, c-format msgid "cannot stat %s" msgstr "statusa %s ni moč ugotoviti s stat" -#: src/copy.c:1645 +#: src/copy.c:1650 #, c-format msgid "omitting directory %s" msgstr "izpuščamo imenik %s" -#: src/copy.c:1659 +#: src/copy.c:1664 #, c-format msgid "warning: source file %s specified more than once" msgstr "opozorilo: izvorna datoteka %s je podana več kot enkrat" -#: src/copy.c:1707 src/ln.c:246 +#: src/copy.c:1712 src/ln.c:246 #, c-format msgid "%s and %s are the same file" msgstr "%s in %s sta ena in ista datoteka" -#: src/copy.c:1806 +#: src/copy.c:1811 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "prek ne-imenika %s ne moremo pisati imenika %s" -#: src/copy.c:1824 src/ln.c:214 +#: src/copy.c:1829 src/ln.c:214 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "prek pravkar ustvarjene datoteke %s ne moremo zapisati %s" -#: src/copy.c:1842 +#: src/copy.c:1847 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "prek imenika %s ne moremo zapisati ne-imenika" -#: src/copy.c:1856 +#: src/copy.c:1861 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "imenika ne moremo premakniti v ne-imenik: %s -> %s" -#: src/copy.c:1886 +#: src/copy.c:1891 #, 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:1887 +#: src/copy.c:1892 #, 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:1910 src/ln.c:276 +#: src/copy.c:1915 src/ln.c:276 #, c-format msgid "cannot backup %s" msgstr "ni mogoče izdelati varnostne kopije %s" -#: src/copy.c:1974 +#: src/copy.c:1979 #, 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:2051 +#: src/copy.c:2056 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "imenika %s se ne da prepisati vase, v %s" -#: src/copy.c:2068 +#: src/copy.c:2073 #, 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:2118 +#: src/copy.c:2123 #, 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:2161 +#: src/copy.c:2166 #, c-format msgid "cannot move %s to %s" msgstr "ni mogoče premakniti %s v %s" -#: src/copy.c:2173 +#: src/copy.c:2178 #, 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:2207 src/install.c:905 src/mkdir.c:189 src/mkfifo.c:114 -#: src/mknod.c:167 +#: 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:2241 +#: src/copy.c:2246 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "ni mogoče prepisati ciklične simbolne povezave %s" # ! INEXACT -#: src/copy.c:2350 +#: src/copy.c:2355 #, 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:2357 +#: src/copy.c:2362 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "ni mogoče ustvariti simbolne povezave %s na %s" -#: src/copy.c:2406 src/mkfifo.c:133 +#: src/copy.c:2416 src/mkfifo.c:132 #, c-format msgid "cannot create fifo %s" msgstr "ni mogoče ustvariti FIFO %s" -#: src/copy.c:2415 +#: src/copy.c:2425 #, c-format msgid "cannot create special file %s" msgstr "ni mogoče ustvariti posebne datoteke %s" -#: src/copy.c:2426 src/ls.c:3191 src/stat.c:902 +#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921 #, c-format msgid "cannot read symbolic link %s" msgstr "ni mogoče prebrati simbolne povezave %s" -#: src/copy.c:2453 +#: src/copy.c:2463 #, c-format msgid "cannot create symbolic link %s" msgstr "ni mogoče ustvariti simbolne povezave %s" -#: src/copy.c:2485 +#: src/copy.c:2495 #, c-format msgid "%s has unknown file type" msgstr "%s ima neznan tip datoteke" -#: src/copy.c:2629 src/ln.c:358 +#: src/copy.c:2644 src/ln.c:358 #, c-format msgid "cannot un-backup %s" msgstr "ni mogoče odstraniti varnostne kopije %s" -#: src/copy.c:2633 +#: src/copy.c:2648 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (brez varnostne kopije)\n" # ! INEXACT -#: src/cp.c:156 src/mv.c:284 +#: src/cp.c:156 src/mv.c:286 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -2113,28 +2117,14 @@ msgstr "" " ali: %s [IZBIRA]... --target-directory=IMENIK IZVOR...\n" #: src/cp.c:162 -msgid "" -"Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" -"\n" +#, fuzzy +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" -#: src/cp.c:166 src/csplit.c:1458 src/cut.c:197 src/df.c:852 src/du.c:268 -#: src/expand.c:112 src/fmt.c:275 src/fold.c:75 src/head.c:115 -#: src/install.c:612 src/kill.c:86 src/ln.c:392 src/ls.c:4726 src/mkdir.c:61 -#: src/mkfifo.c:56 src/mknod.c:58 src/mv.c:294 src/nl.c:191 src/paste.c:445 -#: src/pr.c:2777 src/ptx.c:1825 src/shred.c:153 src/shuf.c:58 src/sort.c:399 -#: src/split.c:211 src/stdbuf.c:95 src/tac.c:142 src/tail.c:268 -#: src/touch.c:226 src/truncate.c:107 src/unexpand.c:122 src/uniq.c:145 -msgid "" -"Mandatory arguments to long options are mandatory for short options too.\n" -msgstr "" -"Obvezni argumenti, navedeni pri dolgi obliki izbire, veljajo tudi za " -"kratko.\n" - # ! INEXACT -#: src/cp.c:169 +#: src/cp.c:168 msgid "" " -a, --archive same as -dR --preserve=all\n" " --attributes-only don't copy the file data, just the " @@ -2160,12 +2150,14 @@ msgstr "" " posebnih datotek\n" " -d isto kot --no-dereference --preserve=links\n" -#: src/cp.c:178 +#: src/cp.c:177 +#, fuzzy msgid "" " -f, --force if an existing destination file cannot be\n" -" opened, remove it and try again (redundant " -"if\n" -" the -n option is used)\n" +" opened, remove it and try again (this " +"option\n" +" is ignored when the -n option is also " +"used)\n" " -i, --interactive prompt before overwrite (overrides a previous " "-n\n" " option)\n" @@ -2179,7 +2171,7 @@ msgstr "" "n)\n" " -H sledimo simbolnim povezavam v VIRU\n" -#: src/cp.c:188 +#: src/cp.c:186 msgid "" " -l, --link hard link files instead of copying\n" " -L, --dereference always follow symbolic links in SOURCE\n" @@ -2188,7 +2180,7 @@ msgstr "" "datotek\n" " -L, --dereference vedno sledimo simbolnim povezavam v VIRU\n" -#: src/cp.c:192 +#: src/cp.c:190 msgid "" " -n, --no-clobber do not overwrite an existing file (overrides\n" " a previous -i option)\n" @@ -2198,7 +2190,7 @@ msgstr "" " nad prejšnjo izbiro -i)\n" " -P, --no-dereference nikoli ne sledimo simbolnim povezavam v VIRU\n" -#: src/cp.c:197 +#: src/cp.c:195 msgid "" " -p same as --preserve=mode,ownership,timestamps\n" " --preserve[=ATTR_LIST] preserve the specified attributes (default:\n" @@ -2216,7 +2208,7 @@ msgstr "" "xattr,\n" " all)\n" -#: src/cp.c:205 +#: src/cp.c:203 msgid "" " --no-preserve=ATTR_LIST don't preserve the specified attributes\n" " --parents use full source file name under DIRECTORY\n" @@ -2224,7 +2216,7 @@ msgstr "" " --no-preserve=SEZN_PRIL ne ohranimo navedenih prilastkov\n" " --parents pot do vira dodaj v IMENIK\n" -#: src/cp.c:209 +#: src/cp.c:207 msgid "" " -R, -r, --recursive copy directories recursively\n" " --reflink[=WHEN] control clone/CoW copies. See below\n" @@ -2237,7 +2229,7 @@ msgstr "" " --remove-destination vsako ciljno datoteko vedno odstranimo pred\n" " poskusom pisanja vanjo (prim. --force)\n" -#: src/cp.c:215 +#: src/cp.c:213 msgid "" " --sparse=WHEN control creation of sparse files. See below\n" " --strip-trailing-slashes remove any trailing slashes from each " @@ -2250,7 +2242,7 @@ msgstr "" "podanih\n" " IZVOROV\n" -#: src/cp.c:220 +#: src/cp.c:218 msgid "" " -s, --symbolic-link make symbolic links instead of copying\n" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -2263,7 +2255,7 @@ msgstr "" " --target-directory=IMENIK vse IZVORE premakni v IMENIK\n" " -T, --no-target-directory obravnavaj CILJ kot navadno datoteko\n" -#: src/cp.c:226 +#: src/cp.c:224 msgid "" " -u, --update copy only when the SOURCE file is newer\n" " than the destination file or when the\n" @@ -2278,7 +2270,7 @@ msgstr "" " -x, --one-file-system samo krajevni datotečni sistem\n" # ! INEXACT -#: src/cp.c:235 +#: src/cp.c:233 msgid "" "\n" "By default, sparse SOURCE files are detected by a crude heuristic and the\n" @@ -2310,7 +2302,7 @@ msgstr "" "se \n" "uporabi standardno kopiranje.\n" -#: src/cp.c:247 src/install.c:649 src/ln.c:421 src/mv.c:321 +#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322 msgid "" "\n" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -2325,7 +2317,7 @@ msgstr "" "kopij lahko nastavimo z izbiro --backup ali spremenljivko\n" "VERSION_CONTROL. Možnosti so:\n" -#: src/cp.c:254 src/install.c:656 src/mv.c:328 +#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329 msgid "" " none, off never make backups (even if --backup is given)\n" " numbered, t make numbered backups\n" @@ -2338,7 +2330,7 @@ msgstr "" " sicer enostavne\n" " simple, never vedno enostavne varnostne kopije\n" -#: src/cp.c:260 +#: src/cp.c:258 msgid "" "\n" "As a special case, cp makes a backup of SOURCE when the force and backup\n" @@ -2351,91 +2343,91 @@ msgstr "" "--force in --backup, IZVOR in CILJ pa sta isto ime za obstoječo navadno\n" "datoteko.\n" -#: src/cp.c:319 +#: src/cp.c:317 #, c-format msgid "failed to preserve times for %s" msgstr "časi za %s niso bili ohranjeni" -#: src/cp.c:350 +#: src/cp.c:348 #, c-format msgid "failed to preserve permissions for %s" msgstr "dovoljenja datoteke %s niso ohranjena" -#: src/cp.c:477 +#: src/cp.c:475 #, c-format msgid "cannot make directory %s" msgstr "ni mogoče ustvariti imenika %s" -#: src/cp.c:526 src/cp.c:545 +#: src/cp.c:524 src/cp.c:543 #, c-format msgid "%s exists but is not a directory" msgstr "%s obstaja, vendar ni imenik" -#: src/cp.c:572 src/cp.c:1068 src/install.c:401 src/install.c:844 src/ln.c:123 -#: src/ln.c:181 src/ln.c:202 src/ln.c:516 src/mv.c:152 src/mv.c:399 -#, c-format -msgid "accessing %s" -msgstr "dostopamo do %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 +#, fuzzy, c-format +msgid "failed to access %s" +msgstr "odpiranje %s ni uspelo" -#: src/cp.c:592 src/install.c:914 src/ln.c:546 src/mv.c:432 src/shred.c:1182 -#: src/touch.c:433 src/truncate.c:356 +#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181 +#: src/touch.c:429 src/truncate.c:354 #, c-format msgid "missing file operand" msgstr "manjkajoč operand datoteke" -#: src/cp.c:594 src/install.c:916 src/ln.c:560 src/mv.c:434 +#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436 #, c-format msgid "missing destination file operand after %s" msgstr "manjkajoč operand ciljne datoteke za %s" -#: src/cp.c:603 src/install.c:925 src/mv.c:443 +#: src/cp.c:601 src/install.c:926 src/mv.c:445 #, 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:619 src/cp.c:1070 src/install.c:403 src/install.c:846 -#: src/install.c:938 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:401 -#: src/mv.c:457 +#: 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 #, c-format msgid "target %s is not a directory" msgstr "cilj %s ni imenik" -#: src/cp.c:730 +#: src/cp.c:728 #, c-format msgid "with --parents, the destination must be a directory" msgstr "pri izbiri --parents mora biti cilj imenik" -#: src/cp.c:1063 src/install.c:839 src/ln.c:511 src/mv.c:394 +#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395 #, c-format msgid "multiple target directories specified" msgstr "podanih je več ciljnih imenikov" -#: src/cp.c:1108 +#: src/cp.c:1110 #, c-format msgid "cannot make both hard and symbolic links" msgstr "hkratne trde in simbolne povezave niso mogoče" -#: src/cp.c:1115 src/mv.c:464 +#: src/cp.c:1117 src/mv.c:466 #, c-format msgid "options --backup and --no-clobber are mutually exclusive" msgstr "izbiri --backup in --no-clobber se medsebojno izključujeta" -#: src/cp.c:1121 +#: src/cp.c:1123 #, c-format msgid "--reflink can be used only with --sparse=auto" msgstr "--reflink je moč uporabiti le skupaj z --sparse=auto" -#: src/cp.c:1129 src/install.c:899 src/ln.c:582 src/mv.c:472 +#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474 msgid "backup type" msgstr "vrsta varnostne kopije" -#: src/cp.c:1154 +#: src/cp.c:1156 #, 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:1160 +#: src/cp.c:1162 #, c-format msgid "cannot preserve extended attributes, cp is built without xattr support" msgstr "" @@ -2446,138 +2438,138 @@ msgstr "" msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:529 +#: src/csplit.c:531 #, c-format msgid "input disappeared" msgstr "vhod je izginil" -#: src/csplit.c:658 src/csplit.c:669 +#: src/csplit.c:660 src/csplit.c:671 #, c-format msgid "%s: line number out of range" msgstr "%s: številka vrstice izven razpona" -#: src/csplit.c:698 +#: src/csplit.c:700 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: številka vrstice izven razpona" -#: src/csplit.c:701 src/csplit.c:750 +#: src/csplit.c:703 src/csplit.c:752 #, c-format msgid " on repetition %s\n" msgstr " pri ponovitvi %s\n" -#: src/csplit.c:744 +#: src/csplit.c:746 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: ujemanja ni" -#: src/csplit.c:808 src/csplit.c:848 src/nl.c:359 src/tac.c:274 +#: src/csplit.c:810 src/csplit.c:850 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:981 +#: src/csplit.c:983 #, c-format msgid "write error for %s" msgstr "napaka pri pisanju za %s" -#: src/csplit.c:1057 +#: src/csplit.c:1059 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: za razmejilnikom pričakovano celo število" -#: src/csplit.c:1073 +#: src/csplit.c:1075 #, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: pri ponovitvah je zahtevan »}«" -#: src/csplit.c:1083 +#: src/csplit.c:1085 #, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: med »{« in »}« je zahtevano celo število" -#: src/csplit.c:1110 +#: src/csplit.c:1112 #, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: manjkajoč zaključni razmejilnik »%c«" -#: src/csplit.c:1127 +#: src/csplit.c:1129 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: neveljavni regularni izraz: %s" -#: src/csplit.c:1160 +#: src/csplit.c:1162 #, c-format msgid "%s: invalid pattern" msgstr "%s: neveljavni vzorec" -#: src/csplit.c:1163 +#: src/csplit.c:1165 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: število vrstice mora biti pozitivno" -#: src/csplit.c:1169 +#: src/csplit.c:1171 #, 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:1175 +#: src/csplit.c:1177 #, 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:1253 +#: src/csplit.c:1255 #, c-format msgid "missing conversion specifier in suffix" msgstr "manjkajoče določilo pretvorbe v priponi" -#: src/csplit.c:1259 +#: src/csplit.c:1261 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "neveljavno določilo pretvorbe v priponi: %c" -#: src/csplit.c:1262 +#: src/csplit.c:1264 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "neveljavno določilo pretvorbe v priponi: \\\\%.3o" -#: src/csplit.c:1267 +#: src/csplit.c:1269 #, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "neveljavna označba v določilu pretvorbe: %%%c%c" -#: src/csplit.c:1284 +#: src/csplit.c:1286 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "preveč določil pretvorbe %% v priponi" -#: src/csplit.c:1298 +#: src/csplit.c:1300 #, c-format msgid "missing %% conversion specification in suffix" msgstr "manjkajoče določilo pretvorbe %% v priponi" -#: src/csplit.c:1345 +#: src/csplit.c:1347 #, c-format msgid "%s: invalid number" msgstr "%s: neveljavno število" -#: src/csplit.c:1449 +#: src/csplit.c:1451 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Uporaba: %s [IZBIRA]... DATOTEKA VZOREC...\n" -#: src/csplit.c:1453 +#: src/csplit.c:1455 +#, 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" -"\n" 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:1461 +#: src/csplit.c:1462 #, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2589,7 +2581,7 @@ msgstr "" " -k, --keep-files ob napaki ne odstrani nepopolno zapisanih " "datotek\n" -#: src/csplit.c:1466 +#: src/csplit.c:1467 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" @@ -2600,7 +2592,7 @@ msgstr "" " -s, --quiet, --silent brez izpisa velikosti na standardni izhod\n" " -z, --elide-empty-files odstrani prazne izhodne datoteke\n" -#: src/csplit.c:1473 +#: src/csplit.c:1474 msgid "" "\n" "Read standard input if FILE is -. Each PATTERN may be:\n" @@ -2608,7 +2600,7 @@ msgstr "" "\n" "Če je DATOTEKA -, beremo s standardnega vhoda. VZOREC je lahko eden od:\n" -#: src/csplit.c:1477 +#: src/csplit.c:1478 msgid "" "\n" " INTEGER copy up to but not including specified line number\n" @@ -2634,7 +2626,7 @@ msgstr "" msgid "David M. Ihnat" msgstr "David M. Ihnat" -#: src/cut.c:64 +#: 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" @@ -2644,15 +2636,14 @@ msgid "Usage: %s OPTION... [FILE]...\n" msgstr "Uporaba: %s IZBIRA... [DATOTEKA]...\n" #: src/cut.c:193 -msgid "" -"Print selected parts of lines from each FILE to standard output.\n" -"\n" +#, fuzzy +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:200 +#: src/cut.c:199 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2662,7 +2653,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:205 +#: src/cut.c:204 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2676,7 +2667,7 @@ msgstr "" " izbira -s\n" " -n (se ne upošteva)\n" -#: src/cut.c:211 +#: src/cut.c:210 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" @@ -2684,7 +2675,7 @@ msgstr "" " --complement komplement množice izbranih bajtov, znakov ali " "polj\n" -#: src/cut.c:215 +#: src/cut.c:214 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2694,7 +2685,7 @@ msgstr "" " --output-delimiter=NIZ naj bo NIZ razmejilnik na izhodu\n" " privzeti izhodni razmejilnik je enak vhodnemu\n" -#: src/cut.c:222 +#: src/cut.c:221 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2708,7 +2699,7 @@ msgstr "" "v\n" "istem vrstnem redu, kot je bil prebran, in je zapisan natanko enkrat.\n" -#: src/cut.c:228 +#: src/cut.c:227 msgid "" "Each range is one of:\n" "\n" @@ -2728,45 +2719,47 @@ msgstr "" "\n" "Če DATOTEKA ni podana, ali če je enaka - (minusu), se bere standardni vhod.\n" -#: src/cut.c:368 src/cut.c:489 -msgid "invalid byte or field list" +#: src/cut.c:367 src/cut.c:493 +#, fuzzy +msgid "invalid byte, character or field list" msgstr "neveljavni seznam bajtov ali polj" -#: src/cut.c:385 +#: src/cut.c:387 msgid "invalid range with no endpoint: -" msgstr "neveljavni razpon brez končne točke: -" -#: src/cut.c:399 +#: src/cut.c:403 msgid "invalid decreasing range" msgstr "neveljavni padajoči razpon" -#: src/cut.c:478 +#: src/cut.c:482 #, c-format msgid "byte offset %s is too large" msgstr "odmik %s (v bajtih) je prevelik" -#: src/cut.c:481 +#: src/cut.c:485 #, c-format msgid "field number %s is too large" msgstr "številka polja %s je prevelika" -#: src/cut.c:789 src/cut.c:797 +#: src/cut.c:795 src/cut.c:803 msgid "only one type of list may be specified" msgstr "določen je lahko samo en tip seznama" -#: src/cut.c:806 +#: src/cut.c:812 src/numfmt.c:1408 +#, c-format msgid "the delimiter must be a single character" msgstr "razmejilnik mora biti en sam znak" -#: src/cut.c:841 +#: src/cut.c:847 msgid "you must specify a list of bytes, characters, or fields" msgstr "podati je treba seznam bajtov, znakov ali polj" -#: src/cut.c:844 +#: src/cut.c:850 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:848 +#: src/cut.c:854 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2774,11 +2767,11 @@ msgstr "" "neizpisovanje vrstic, ki ne vsebujejo razmejilnika\n" "\tje smiselno le, kadar delamo s polji" -#: src/cut.c:864 +#: src/cut.c:870 msgid "missing list of fields" msgstr "seznam polj manjka" -#: src/cut.c:866 +#: src/cut.c:872 msgid "missing list of positions" msgstr "seznam položajev manjka" @@ -2792,9 +2785,12 @@ msgstr "" " ali: %s [-u|--utc|--universal] [MMDDuumm[[SS]LL][.ss]]\n" #: src/date.c:128 +msgid "Display the current time in the given FORMAT, or set the system date.\n" +msgstr "" + +#: src/date.c:134 +#, 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" " -I[TIMESPEC], --iso-8601[=TIMESPEC] output date/time in ISO 8601 format.\n" @@ -2813,7 +2809,7 @@ msgstr "" " »hours«, »minutes«, »seconds« ali »ns« za izpis\n" " datuma in ure v zahtevani natančnosti.\n" -#: src/date.c:138 +#: src/date.c:142 msgid "" " -r, --reference=FILE display the last modification time of FILE\n" " -R, --rfc-2822 output date and time in RFC 2822 format.\n" @@ -2823,7 +2819,7 @@ msgstr "" "DATOTEKO\n" " -R, --rfc-2822 čas izpiši skladno s priporočilom RFC-2822\n" -#: src/date.c:143 +#: src/date.c:147 msgid "" " --rfc-3339=TIMESPEC output date and time in RFC 3339 format.\n" " TIMESPEC='date', 'seconds', or 'ns' for\n" @@ -2842,7 +2838,7 @@ msgstr "" " -u, --utc, --universal izpis ali nastavitev časa v UTC namesto v " "lokalnem\n" -#: src/date.c:154 +#: src/date.c:158 msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" @@ -2856,7 +2852,7 @@ msgstr "" " %% znak za odstotek: %\n" " %a lokalizirano okrajšano ime dneva v tednu (npr. ned)\n" -#: src/date.c:161 +#: src/date.c:165 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2868,7 +2864,7 @@ msgstr "" " %B lokalizirano polno ime meseca, spremenljive širine (npr. januar)\n" " %c lokaliziran izpis datuma in ure (sob 04 nov 1989 12:02:33 CET)\n" -#: src/date.c:167 +#: src/date.c:171 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2880,7 +2876,7 @@ msgstr "" " %D datum; isto kot %m/%d/%y\n" " %e dan v mesecu, dopolnjen s presledki; isto kot %_d\n" -#: src/date.c:173 +#: src/date.c:177 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -2891,7 +2887,7 @@ msgstr "" " %G štirištevilčno leto, ustrezajoče številki tedna ISO (glejte %V);\n" " praviloma uporabno le v kombinaciji z %V\n" -#: src/date.c:178 +#: src/date.c:182 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2903,7 +2899,7 @@ msgstr "" " %I ura (01..12)\n" " %j dan v letu (001..366)\n" -#: src/date.c:184 +#: src/date.c:188 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -2915,7 +2911,7 @@ msgstr "" " %m mesec (01..12)\n" " %M minuta (00..59)\n" -#: src/date.c:190 +#: src/date.c:194 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2933,7 +2929,7 @@ msgstr "" " %R čas v 24-urnem zapisu; isto kot %H:%M\n" " %s sekunde od 00:00:00, 1970-01-01 UTC\n" -#: src/date.c:199 +#: src/date.c:203 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2945,7 +2941,7 @@ msgstr "" " %T čas v 24-urnem zapisu; isto kot %H:%M:%S\n" " %u dan v tednu (1..7); 1 je ponedeljek\n" -#: src/date.c:205 +#: src/date.c:209 msgid "" " %U week number of year, with Sunday as first day of week (00..53)\n" " %V ISO week number, with Monday as first day of week (01..53)\n" @@ -2958,7 +2954,7 @@ msgstr "" " %W številka tedna v letu s ponedeljkom kot prvim dnevom v tednu " "(00..53)\n" -#: src/date.c:211 +#: src/date.c:215 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -2970,7 +2966,7 @@ msgstr "" " %y zadnji dve števki leta (00..99)\n" " %Y leto\n" -#: src/date.c:217 +#: src/date.c:221 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -2991,7 +2987,7 @@ msgstr "" "Privzeto so številčna polja v datumu do polne dolžine polja dopolnjena\n" "z ničlami.\n" -#: src/date.c:226 +#: src/date.c:230 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -3009,7 +3005,7 @@ msgstr "" " »^« če je mogoče, uporabi velike črke\n" " »#« če je mogoče, uporabi nasprotne črke\n" -#: src/date.c:235 +#: src/date.c:239 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -3023,7 +3019,7 @@ msgstr "" "»E« za lokalizirano alternativno predstavitev, če je ta na voljo, ali\n" "»O« za lokalizirane alternativne številčne simbole, če so ti na voljo.\n" -#: src/date.c:242 +#: src/date.c:246 msgid "" "\n" "Examples:\n" @@ -3048,35 +3044,35 @@ 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:275 src/dd.c:2193 src/head.c:838 src/md5sum.c:477 -#: src/md5sum.c:798 src/od.c:863 src/od.c:1914 src/pr.c:1176 src/pr.c:1372 -#: src/pr.c:1494 src/stty.c:842 src/tac.c:563 src/tail.c:343 src/tee.c:126 +#: 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 #, c-format msgid "standard input" msgstr "standardni vhod" -#: src/date.c:303 src/date.c:523 +#: src/date.c:307 src/date.c:527 #, c-format msgid "invalid date %s" msgstr "neveljavni datum %s" -#: src/date.c:414 src/date.c:448 +#: src/date.c:418 src/date.c:452 #, c-format msgid "multiple output formats specified" msgstr "podana je več kot ena oblika izhoda" -#: src/date.c:426 +#: src/date.c:430 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "izbire pri določanju datumov za izpis se medsebojno izključujejo" -#: src/date.c:433 +#: src/date.c:437 #, c-format msgid "the options to print and set the time may not be used together" msgstr "izbiri za izpis in nastavitev datuma se medsebojno izključujeta" -#: src/date.c:454 +#: src/date.c:458 #, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -3087,23 +3083,23 @@ msgstr "" "Pri določanju datuma morajo biti vsi argumenti, ki niso izbire,\n" "določitelji oblike datuma in se morajo začeti s »+«" -#: src/date.c:531 +#: src/date.c:535 #, c-format msgid "cannot set date" msgstr "datuma ni mogoče nastaviti" -#: src/date.c:554 src/du.c:360 +#: src/date.c:558 src/du.c:371 #, c-format msgid "time %s is out of range" msgstr "čas %s je izven razpona" #. This is a proper name. See the gettext manual, section Names. -#: src/dd.c:44 src/factor.c:43 src/rm.c:41 src/tail.c:69 src/touch.c:41 +#: 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 "Paul Rubin" -#: src/dd.c:517 +#: src/dd.c:521 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3112,7 +3108,7 @@ msgstr "" "Uporaba: %s [OPERAND]...\n" " ali: %s IZBIRA\n" -#: src/dd.c:522 +#: src/dd.c:526 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -3132,7 +3128,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:531 +#: src/dd.c:535 msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -3141,7 +3137,8 @@ msgid "" " oflag=FLAGS write as per the comma separated symbol list\n" " seek=N skip N obs-sized blocks at start of output\n" " skip=N skip N ibs-sized blocks at start of input\n" -" status=noxfer suppress transfer statistics\n" +" status=WHICH WHICH info to suppress outputting to stderr;\n" +" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" msgstr "" " if=DATOTEKA beri z navedene DATOTEKE namesto s standardnega vhoda\n" " iflag=ZASTAVICA beri kot z vejicami ločen seznam simbolov\n" @@ -3152,12 +3149,13 @@ msgstr "" " dolžine obs\n" " skip=BLOKOV na začetku branja preskoči zahtevano število BLOKOV\n" " dolžine ibs\n" -" status=noxfer brez statistike prenosa\n" +" status=IZPIS omeji IZPIS na stderr; »noxfer« brez statistike prenosa,\n" +" »none« brez vseh izpisov\n" -#: src/dd.c:541 +#: src/dd.c:546 msgid "" "\n" -"BLOCKS and BYTES may be followed by the following multiplicative suffixes:\n" +"N and BYTES may be followed by the following multiplicative suffixes:\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, and so on for T, P, E, Z, Y.\n" "\n" @@ -3165,14 +3163,14 @@ msgid "" "\n" msgstr "" "\n" -"Število BAJTOV in BLOKOV lahko okrajšamo s priponami za množenje: c = 1,\n" +"Števila N in BAJTOV lahko okrajšamo s priponami za množenje: c = 1,\n" "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, in tako dalje za T, P, E, Z, Y.\n" "\n" "PRETVORBA je lahko (več izbir ločimo z vejico):\n" "\n" -#: src/dd.c:550 +#: src/dd.c:555 msgid "" " ascii from EBCDIC to ASCII\n" " ebcdic from ASCII to EBCDIC\n" @@ -3200,7 +3198,7 @@ msgstr "" " tudi block ali unblock, zapolni s presledki namesto z znaki " "NUL\n" -#: src/dd.c:563 +#: src/dd.c:568 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3216,7 +3214,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:571 +#: src/dd.c:576 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3231,76 +3229,76 @@ msgstr "" "priporočeno\n" " conv=notrunc)\n" -#: src/dd.c:578 +#: src/dd.c:583 msgid " cio use concurrent I/O for data\n" msgstr " cio uporabi vzporedne vhodno-izhodne funkcije za podatke\n" -#: src/dd.c:580 +#: src/dd.c:585 msgid " direct use direct I/O for data\n" msgstr " direct uporabi neposredne vhodno-izhodne funkcije za podatke\n" -#: src/dd.c:582 +#: src/dd.c:587 msgid " directory fail unless a directory\n" msgstr " directory opusti, razen če je imenik\n" -#: src/dd.c:584 +#: src/dd.c:589 msgid " dsync use synchronized I/O for data\n" msgstr "" " dsync uporabi sinhronizirane vhodno-izhodne funkcije za podatke\n" -#: src/dd.c:586 +#: src/dd.c:591 msgid " sync likewise, but also for metadata\n" msgstr " sync enako, a tudi za metapodatke\n" -#: src/dd.c:587 +#: src/dd.c:592 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr " fullblock naberi polne bloke na vhodu (zgolj iflag)\n" -#: src/dd.c:590 +#: src/dd.c:595 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock uporabi neblokirne vhodno-izhodne funkcije\n" -#: src/dd.c:592 +#: src/dd.c:597 msgid " noatime do not update access time\n" msgstr " noatime ne ažuriraj časa zadnjega dostopa\n" -#: src/dd.c:595 +#: src/dd.c:600 msgid " nocache discard cached data\n" msgstr " nocache zavrzi medpomnjene podatke\n" -#: src/dd.c:598 +#: src/dd.c:603 msgid " noctty do not assign controlling terminal from file\n" msgstr " noctty ne določaj krmilnega terminala iz datoteke\n" -#: src/dd.c:601 +#: src/dd.c:606 msgid " nofollow do not follow symlinks\n" msgstr " nofollow ne sledi simbolnim povezavam\n" -#: src/dd.c:603 +#: src/dd.c:608 msgid " nolinks fail if multiply-linked\n" msgstr " nolinks opusti, če je datoteka večkratno povezana\n" -#: src/dd.c:605 +#: src/dd.c:610 msgid " binary use binary I/O for data\n" msgstr " binary uporabi binarne vhodno-izhodne funkcije za podatke\n" -#: src/dd.c:607 +#: src/dd.c:612 msgid " text use text I/O for data\n" msgstr " text uporabi besedilne vhodno-izhodne funkcije za podatke\n" -#: src/dd.c:609 +#: src/dd.c:614 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:612 +#: src/dd.c:617 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:615 +#: src/dd.c:620 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:620 +#: src/dd.c:625 #, c-format msgid "" "\n" @@ -3329,7 +3327,7 @@ msgstr "" "Izbire so:\n" "\n" -#: src/dd.c:676 +#: src/dd.c:683 #, c-format msgid "" "%<PRIuMAX>+%<PRIuMAX> records in\n" @@ -3339,7 +3337,7 @@ msgstr "" "%<PRIuMAX>+%<PRIuMAX> zapisov na izhodu\n" # ! INEXACT -#: src/dd.c:682 +#: src/dd.c:689 #, c-format msgid "%<PRIuMAX> truncated record\n" msgid_plural "%<PRIuMAX> truncated records\n" @@ -3348,7 +3346,7 @@ msgstr[1] "%<PRIuMAX> odrezan zapis\n" msgstr[2] "%<PRIuMAX> odrezana zapisa\n" msgstr[3] "%<PRIuMAX> odrezani zapisi\n" -#: src/dd.c:694 +#: src/dd.c:701 #, c-format msgid "%<PRIuMAX> byte (%s) copied" msgid_plural "%<PRIuMAX> bytes (%s) copied" @@ -3357,7 +3355,7 @@ msgstr[1] "%<PRIuMAX> bajt (%s) prepisan" msgstr[2] "%<PRIuMAX> bajta (%s) prepisana" msgstr[3] "%<PRIuMAX> bajti (%s) prepisani" -#: src/dd.c:712 +#: src/dd.c:720 msgid "Infinity B" msgstr "neskončno B" @@ -3371,85 +3369,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:725 +#: src/dd.c:733 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g s, %s/s\n" -#: src/dd.c:804 +#: src/dd.c:812 #, c-format msgid "closing input file %s" msgstr "zapiramo vhodno datoteko %s" -#: src/dd.c:811 +#: src/dd.c:819 #, c-format msgid "closing output file %s" msgstr "zapiramo izhodno datoteko %s" -#: src/dd.c:1014 +#: src/dd.c:1022 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "izklop O_DIRECT ni uspel: %s" -#: src/dd.c:1085 src/dd.c:1934 +#: src/dd.c:1093 src/dd.c:1942 #, c-format msgid "writing to %s" msgstr "pišemo na %s" -#: src/dd.c:1199 src/dd.c:1253 +#: src/dd.c:1207 src/dd.c:1261 #, c-format msgid "unrecognized operand %s" msgstr "neprepoznan operand %s" -#: src/dd.c:1210 +#: src/dd.c:1218 msgid "invalid conversion" msgstr "neveljavna pretvorba" -#: src/dd.c:1213 src/dd.c:1289 +#: src/dd.c:1221 src/dd.c:1297 msgid "invalid input flag" msgstr "neveljavna vhodna zastavica" # ! INEXACT -#: src/dd.c:1216 src/dd.c:1283 src/dd.c:1295 +#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303 msgid "invalid output flag" msgstr "neveljavno izhodna zastavica" -#: src/dd.c:1219 +#: src/dd.c:1227 msgid "invalid status flag" msgstr "neveljavna statusna zastavica" -#: src/dd.c:1258 src/truncate.c:312 +#: src/dd.c:1266 src/truncate.c:310 #, c-format msgid "invalid number %s" msgstr "neveljavno število %s" -#: src/dd.c:1340 +#: src/dd.c:1348 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "pretvorbe ascii, ebcdic in ibm se medsebojno izključujejo" -#: src/dd.c:1342 +#: src/dd.c:1350 #, c-format msgid "cannot combine block and unblock" msgstr "pretvorbi block in unblock se medsebojno izključujeta" # ! INEXACT -#: src/dd.c:1344 +#: src/dd.c:1352 #, c-format msgid "cannot combine lcase and ucase" msgstr "pretvorbi lcase in ucase se medsebojno izključujeta" -#: src/dd.c:1346 +#: src/dd.c:1354 #, c-format msgid "cannot combine excl and nocreat" msgstr "pretvorbi excl in nocreat se medsebojno izključujeta" -#: src/dd.c:1349 +#: src/dd.c:1357 #, c-format msgid "cannot combine direct and nocache" msgstr "izbiri direct in nocache se medsebojno izključujeta" -#: src/dd.c:1506 +#: src/dd.c:1514 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3458,73 +3456,73 @@ 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:1593 +#: src/dd.c:1601 #, c-format msgid "%s: cannot skip" msgstr "%s: pri branju premik s »skip« ni mogoč" -#: src/dd.c:1595 src/dd.c:1614 src/dd.c:1675 +#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683 #, c-format msgid "%s: cannot seek" msgstr "%s: pri pisanju premik s »seek« ni mogoč" -#: src/dd.c:1655 +#: src/dd.c:1663 #, c-format msgid "offset overflow while reading file %s" msgstr "prekoračitev odmika pri branju datoteke %s" -#: src/dd.c:1667 +#: src/dd.c:1675 #, c-format msgid "warning: invalid file offset after failed read" msgstr "opozorilo: neveljavni odmik datoteke po napaki pri branju" -#: src/dd.c:1671 +#: src/dd.c:1679 #, c-format msgid "cannot work around kernel bug after all" msgstr "napake v jedru ni bilo mogoče zaobiti" -#: src/dd.c:1814 +#: src/dd.c:1822 #, c-format msgid "setting flags for %s" msgstr "nastavljanje zastavic za %s" -#: src/dd.c:1867 +#: 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:1881 +#: 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:1914 +#: src/dd.c:1922 #, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: pri branju premik na zahtevani odmik ni mogoč" -#: src/dd.c:2125 src/dd.c:2258 -#, c-format -msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" +#: src/dd.c:2133 +#, fuzzy, c-format +msgid "failed to truncate to %<PRIdMAX> bytes in output file %s" msgstr "obrezovanje na %<PRIuMAX> bajtov pri izhodni datoteki %s ni uspelo" -#: src/dd.c:2138 +#: src/dd.c:2146 #, c-format msgid "fdatasync failed for %s" msgstr "fdatasync ni uspel za %s" -#: src/dd.c:2148 +#: src/dd.c:2156 #, c-format msgid "fsync failed for %s" msgstr "fsync ni uspel za %s<" -#: src/dd.c:2199 src/dd.c:2228 +#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165 #, c-format -msgid "opening %s" -msgstr "odpiramo %s" +msgid "failed to open %s" +msgstr "odpiranje %s ni uspelo" -#: src/dd.c:2237 +#: src/dd.c:2246 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) " @@ -3533,84 +3531,106 @@ msgstr "" "odmik prevelik: ni moč odrezati na dolžino seek=%<PRIuMAX> (%lu-bajtnih) " "blokov" -#: src/dd.c:2274 src/dd.c:2280 +#: src/dd.c:2267 +#, 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 #, 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:54 src/expr.c:153 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:39 src/sleep.c:35 src/sort.c:66 +#: 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 msgid "Paul Eggert" msgstr "Paul Eggert" -#: src/df.c:140 +#: src/df.c:172 msgid "Filesystem" msgstr "Dat. sist." -#: src/df.c:141 +#: src/df.c:175 msgid "Type" msgstr "Tip" -#: src/df.c:142 +#: src/df.c:178 src/df.c:542 msgid "blocks" msgstr "blokov" -#: src/df.c:142 -msgid "Inodes" -msgstr "Inodov" - -#: src/df.c:142 -msgid "Size" -msgstr "Vel." - -#: src/df.c:143 +#: src/df.c:181 msgid "Used" msgstr "Upor." -#: src/df.c:143 -msgid "IUsed" -msgstr "IUpor" - -#: src/df.c:144 +#: src/df.c:184 msgid "Available" msgstr "Na voljo" -#: src/df.c:144 -msgid "IFree" -msgstr "IPros" - -#: src/df.c:144 -msgid "Avail" -msgstr "Prost" - -#: src/df.c:145 +#: src/df.c:187 msgid "Use%" msgstr "Upo%" -#: src/df.c:145 +#: src/df.c:190 +msgid "Inodes" +msgstr "Inodov" + +#: src/df.c:193 +msgid "IUsed" +msgstr "IUpor" + +#: src/df.c:196 +msgid "IFree" +msgstr "IPros" + +#: src/df.c:199 msgid "IUse%" msgstr "IUpo%" -#: src/df.c:145 +#: src/df.c:202 +msgid "Mounted on" +msgstr "Priklopljeno na" + +#: src/df.c:383 +#, c-format +msgid "option --output: field '%s' unknown" +msgstr "" + +#: 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:410 src/df.c:449 +msgid "Size" +msgstr "Vel." + +#: src/df.c:414 src/df.c:451 +msgid "Avail" +msgstr "Prost" + +#: src/df.c:474 msgid "Capacity" msgstr "Kapacit." -#: src/df.c:146 -msgid "Mounted on" -msgstr "Priklopljeno na" +#. 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 +#, c-format +msgid "%s-%s" +msgstr "%s-%s" -#: src/df.c:847 +#: src/df.c:1210 +#, fuzzy msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" -"\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:855 +#: src/df.c:1217 msgid "" " -a, --all include dummy file systems\n" " -B, --block-size=SIZE scale sizes by SIZE before printing them. E.g.,\n" @@ -3630,7 +3650,7 @@ msgstr "" "2G)\n" " -H, --si podobno kot -h, vendar z bazo 1000 namesto 1024\n" -#: src/df.c:865 +#: src/df.c:1227 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3643,8 +3663,12 @@ msgstr "" " -l, --local omejimo seznam na lokalni datotečni sistem\n" " --no-sync brez klica sync() pred izpisom porabe (privzeto)\n" -#: src/df.c:872 +#: src/df.c:1234 +#, fuzzy msgid "" +" --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" +" or print all fields if FIELD_LIST is " +"omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" " -t, --type=TYPE limit listing to file systems of type TYPE\n" @@ -3659,20 +3683,42 @@ msgstr "" " -x, --exclude-type=TIP brez datotečnih sistemov tipa TIP\n" " -v (se ne upošteva)\n" -#: src/df.c:1027 +#: src/df.c:1248 +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" +msgstr "" + +#: src/df.c:1285 +#, fuzzy, 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: " + +#: 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 #, 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:1075 +#: src/df.c:1500 msgid "Warning: " msgstr "Opozorilo: " -#: src/df.c:1077 src/stat.c:795 +#: src/df.c:1502 src/stat.c:814 msgid "cannot read table of mounted file systems" msgstr "tabele priklopljenih datotečnih sistemov ni moč prebrati" -#: src/df.c:1107 +#: src/df.c:1539 #, c-format msgid "no file systems processed" msgstr "obdelan ni bil noben datotečni sistem" @@ -3788,7 +3834,7 @@ msgstr "" " %s dir1/str dir2/str -> »dir1«, ki mu sledi »dir2«\n" " %s stdio.h -> ».«\n" -#: src/du.c:260 src/sort.c:390 src/wc.c:112 +#: src/du.c:270 src/sort.c:394 src/wc.c:112 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3797,16 +3843,18 @@ msgstr "" "Uporaba: %s [IZBIRA]... [DATOTEKA]...\n" " ali: %s [IZBIRA]... --files0-from=F\n" -#: src/du.c:264 -msgid "" -"Summarize disk usage of each FILE, recursively for directories.\n" -"\n" +#: src/du.c:274 +#, fuzzy +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:271 +#: src/du.c:280 +#, fuzzy msgid "" +" -0, --null end each output line with 0 byte rather than " +"newline\n" " -a, --all write counts for all files, not just directories\n" " --apparent-size print apparent sizes, rather than disk usage; " "although\n" @@ -3822,7 +3870,8 @@ msgstr "" "bloki\n" " ipd.) pa je lahko tudi manjša\n" -#: src/du.c:279 +#: src/du.c:289 +#, 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" @@ -3831,6 +3880,11 @@ msgid "" " -c, --total produce a grand total\n" " -D, --dereference-args dereference only symlinks that are listed on the\n" " command line\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 "" " -B, --block-size=ENOTA štejemo v ENOTA bajtov velikih blokih;\n" " npr. »-BM« izpiše velikost v enotah po 1.048.576\n" @@ -3840,7 +3894,8 @@ msgstr "" " -D, --dereference-args razrešimo le simbolne povezave, navedene v ukazni " "vrstici\n" -#: src/du.c:288 +#: src/du.c:302 +#, fuzzy msgid "" " --files0-from=F summarize disk usage of the NUL-terminated file\n" " names specified in file F;\n" @@ -3848,7 +3903,6 @@ msgid "" " -H equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" --si like -h, but use powers of 1000 not 1024\n" msgstr "" " --files0-from=S poraba diska za datoteke, navedene v datoteki S;\n" " datoteke v seznamu morajo biti ločene z znakom " @@ -3859,9 +3913,11 @@ msgstr "" "2G)\n" " --si podobno kot -h, vendar v bazi 1000 namesto 1024\n" -#: src/du.c:297 +#: src/du.c:310 +#, fuzzy 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 "" @@ -3869,14 +3925,13 @@ msgstr "" " -l, --count-links trde povezeva štejemo po večkrat\n" " -m isto kot --block-size=1M\n" -#: src/du.c:302 +#: src/du.c:316 +#, fuzzy msgid "" -" -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " "default)\n" -" -0, --null end each output line with 0 byte rather than " -"newline\n" " -S, --separate-dirs 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 " @@ -3887,29 +3942,11 @@ msgstr "" " -S, --separate-dirs brez velikosti podimenikov\n" " -s, --summarize za vsak argument samo povzetek\n" -#: src/du.c:309 -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 brez imenikov na ostalih datotečnih sistemih\n" -" -X --exclude-from=DATOTEKA brez datotek, ki jih pokrivajo vzorci, \n" -" podani v DATOTEKI\n" -" --exclude=VZOREC brez datotek, ki jih pokriva podani VZOREC\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:318 +#: src/du.c:322 +#, fuzzy msgid "" +" -t, --threshold=SIZE exclude entries smaller than SIZE if positive,\n" +" or entries greater than SIZE if negative\n" " --time show time of the last modification of any file in " "the\n" " directory, or any of its subdirectories\n" @@ -3928,65 +3965,73 @@ msgstr "" " full-iso, long-iso, iso, +FORMAT\n" " FORMAT se tolmači kot pri ukazu »date«\n" -#: src/du.c:375 -#, fuzzy +#: src/du.c:333 +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 msgid "Infinity" -msgstr "neskončno B" +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:600 +#: src/du.c:624 #, c-format msgid "fts_read failed: %s" msgstr "fts_read ni uspel: %s" -#: src/du.c:724 +#: src/du.c:780 #, c-format msgid "invalid maximum depth %s" msgstr "neveljavna največja globina %s" -#: src/du.c:817 +#: src/du.c:809 +#, fuzzy, c-format +msgid "invalid --threshold argument '-0'" +msgstr "neveljavni --%s argument %s" + +#: src/du.c:887 #, c-format msgid "cannot both summarize and show all entries" msgstr "možnosti se izključujeta - ali izpis vseh, ali povzetek" -#: src/du.c:824 +#: src/du.c:894 #, 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:830 +#: src/du.c:900 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "opozorilo: povzetek se izključuje z --max-depth=%lu" -#: src/du.c:896 src/sort.c:4479 src/wc.c:668 +#: src/du.c:966 src/sort.c:4533 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:949 src/md5sum.c:587 src/od.c:903 src/tac.c:239 src/tac.c:350 -#: src/tac.c:506 src/tac.c:586 src/wc.c:733 +#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 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:963 src/sort.c:4508 src/wc.c:747 +#: src/du.c:1040 src/sort.c:4562 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:980 src/du.c:988 src/wc.c:760 src/wc.c:768 +#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768 msgid "invalid zero-length file name" msgstr "neveljavno ime (dolžina nič) datoteke" -#: src/du.c:1007 src/head.c:149 src/head.c:262 src/head.c:334 src/head.c:538 -#: src/head.c:620 src/head.c:692 src/head.c:750 src/head.c:774 src/tail.c:412 -#: src/tail.c:500 src/tail.c:549 src/tail.c:642 src/tail.c:770 src/tail.c:818 -#: src/tail.c:855 src/tail.c:1782 src/tail.c:1812 src/uniq.c:395 -#, c-format -msgid "error reading %s" -msgstr "napaka pri branju %s" - -#: src/du.c:1010 src/ls.c:2649 src/wc.c:791 +#: src/du.c:1088 src/ls.c:2649 src/wc.c:791 msgid "total" msgstr "skupno" @@ -4089,9 +4134,12 @@ msgid "Usage: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n" 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 "" + +#: src/env.c:61 +#, fuzzy msgid "" -"Set each NAME to VALUE in the environment and run COMMAND.\n" -"\n" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with 0 byte rather than newline\n" " -u, --unset=NAME remove variable from the environment\n" @@ -4104,7 +4152,7 @@ msgstr "" " -u, --unset=IME odstrani spremenljivko z navedenim IMENOM iz " "okolja\n" -#: src/env.c:64 +#: src/env.c:68 msgid "" "\n" "A mere - implies -i. If no COMMAND, print the resulting environment.\n" @@ -4112,26 +4160,26 @@ msgstr "" "\n" "Sam - implicira -i. Če UKAZ ni podan, izpišemo spremenljivke okolja.\n" -#: src/env.c:120 +#: src/env.c:124 #, c-format msgid "cannot unset %s" msgstr "ni mogoče odnastaviti %s" -#: src/env.c:131 +#: src/env.c:135 #, c-format msgid "cannot set %s" msgstr "ni mogoče nastaviti %s" -#: src/env.c:148 +#: src/env.c:152 #, c-format 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" -"\n" msgstr "" "Tabulatorje v vsaki od DATOTEK nadomestimo s presledki in rezultat izpišemo\n" "na standardni izhod. Če DATOTEKA ni podana, ali če je enaka - (minus), " @@ -4139,7 +4187,7 @@ msgstr "" "s standardnega vhoda.\n" "\n" -#: src/expand.c:115 +#: src/expand.c:114 msgid "" " -i, --initial do not convert tabs after non blanks\n" " -t, --tabs=NUMBER have tabs NUMBER characters apart, not 8\n" @@ -4147,34 +4195,34 @@ msgstr "" " -i, --initial nadomesti samo tabulatorje, ki sledijo praznim znakom\n" " -t, --tabs=ŠIRINA ŠIRINA tabulatorja naj bo navedeno namesto 8\n" -#: src/expand.c:119 +#: src/expand.c:118 msgid "" " -t, --tabs=LIST use comma separated list of explicit tab positions\n" msgstr "" " -t, --tabs=SEZNAM uporabi z vejicami ločen SEZNAM eksplicitnih " "tabulatorjev\n" -#: src/expand.c:172 src/unexpand.c:191 +#: src/expand.c:171 src/unexpand.c:190 #, c-format msgid "tab stop is too large %s" msgstr "tabulator je prevelik %s" -#: src/expand.c:180 src/unexpand.c:199 +#: src/expand.c:179 src/unexpand.c:198 #, c-format msgid "tab size contains invalid character(s): %s" msgstr "širina tabulatorja vsebuje neveljavni(-e) znak(e): %s" -#: src/expand.c:206 src/unexpand.c:225 +#: src/expand.c:205 src/unexpand.c:224 #, c-format msgid "tab size cannot be 0" msgstr "širina tabulatorja ne more biti 0" -#: src/expand.c:208 src/unexpand.c:227 +#: src/expand.c:207 src/unexpand.c:226 #, c-format msgid "tab sizes must be ascending" msgstr "seznam tabulatorjev mora biti naraščajoč" -#: src/expand.c:326 src/expand.c:345 src/unexpand.c:374 src/unexpand.c:419 +#: 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 "vhodna vrstica je predolga" @@ -4334,12 +4382,12 @@ msgstr "napaka v ujemalniku z regularnimi izrazi" msgid "non-integer argument" msgstr "ne-celoštevilčni argument" -#: src/expr.c:793 src/truncate.c:316 +#: src/expr.c:793 src/truncate.c:314 #, c-format msgid "division by zero" msgstr "deljenje z nič" -#: src/expr.c:887 src/sort.c:2029 +#: src/expr.c:887 src/sort.c:2044 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "nastavite LC_ALL='C', da bi odpravili težavo." @@ -4349,25 +4397,32 @@ msgstr "nastavite LC_ALL='C', da bi odpravili težavo." msgid "the strings compared were %s and %s" msgstr "primerjana niza sta bila %s in %s" -#: src/factor.c:449 -msgid "using arbitrary-precision arithmetic" -msgstr "z uporabo aritmetike z poljubno natančnostjo" +#. This is a proper name. See the gettext manual, section Names. +#: src/factor.c:111 +msgid "Niels Moller" +msgstr "Niels Möller" -#: src/factor.c:460 -msgid "using single-precision arithmetic" -msgstr "z uporabo aritmetike enojne natančnosti" +#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459 +#, 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:465 src/od.c:1640 src/od.c:1709 +#: src/factor.c:2092 #, c-format -msgid "%s is too large" -msgstr "%s je preveliko" +msgid "squfof queue overflow" +msgstr "prekoračitev obsega za vrsto squfof" -#: src/factor.c:469 +#: src/factor.c:2419 #, c-format msgid "%s is not a valid positive integer" msgstr "%s ni veljavno pozitivno celo število" -#: src/factor.c:494 +#: src/factor.c:2442 src/od.c:1646 src/od.c:1715 +#, c-format +msgid "%s is too large" +msgstr "%s je preveliko" + +#: src/factor.c:2454 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4376,7 +4431,7 @@ msgstr "" "Uporaba: %s [ŠTEVILO]...\n" " ali: %s IZBIRA\n" -#: src/factor.c:499 +#: src/factor.c:2459 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" @@ -4403,20 +4458,20 @@ msgid "cannot stat current directory (now %s)" msgstr "statusa trenutnega imenika (zdaj %s) ni moč ugotoviti" #. This is a proper name. See the gettext manual, section Names. -#: src/fmt.c:37 +#: src/fmt.c:38 msgid "Ross Paterson" msgstr "Ross Paterson" -#: src/fmt.c:269 +#: src/fmt.c:270 #, c-format msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n" msgstr "Uporaba: %s [-ŠIRINA] [IZBIRA]... [DATOTEKA]...\n" -#: src/fmt.c:270 +#: 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" -"\n" msgstr "" "Vsak odstavek v DATOTEKI(-ah) preoblikujemo in izpišemo na standardni " "izhod.\n" @@ -4435,8 +4490,8 @@ msgstr "" " tega pridaj oblikovanim vrsticam\n" " -s, --split-only poreži predolge vrstice, a brez poravnave\n" -#: src/fmt.c:285 -#, fuzzy, c-format +#: src/fmt.c:287 +#, 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" @@ -4447,8 +4502,9 @@ msgstr "" "druge\n" " -u, --uniform-spacing en presledek med besedami, dva za piko\n" " -w, --width=ŠIRINA največja širina vrstice (privzeto 75 znakov)\n" +" -g, --goal=ŠIRINA želena širina (privzeto 93% celotne širine)\n" -#: src/fmt.c:357 +#: src/fmt.c:359 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -4457,22 +4513,22 @@ msgstr "" "neveljavna izbira -- %c; -WIDTH je prepoznana le, če je navedena kot prva\n" "izbira; namesto tega uporabite -w N" -#: src/fmt.c:403 src/fmt.c:414 +#: src/fmt.c:405 src/fmt.c:416 #, c-format 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" -"\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:78 +#: src/fold.c:77 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4482,13 +4538,13 @@ msgstr "" " -s, --spaces prelom na presledkih\n" " -w, --width=ŠIRINA nastavimo ŠIRINO vrstic (privzeto 80)\n" -#: src/fold.c:289 src/pr.c:836 +#: src/fold.c:288 src/pr.c:832 #, c-format 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:75 +#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 #: src/truncate.c:37 msgid "Padraig Brady" msgstr "Padraig Brady" @@ -4506,17 +4562,17 @@ msgstr "" "Izpis lokalnih omejitev v obliki, uporabne za skripte ukazne lupine.\n" "\n" -#: src/group-list.c:69 src/id.c:345 src/setuidgid.c:184 +#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184 #, 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:350 +#: src/group-list.c:74 src/id.c:370 #, c-format msgid "failed to get groups for the current process" msgstr "branje skupine za trenutni proces ni uspelo" -#: src/group-list.c:104 +#: src/group-list.c:114 #, c-format msgid "cannot find name for group ID %lu" msgstr "ime skupine za GID %lu ni ugotovljivo" @@ -4557,18 +4613,18 @@ 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" "With no FILE, or when FILE is -, read standard input.\n" -"\n" 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:118 +#: src/head.c:117 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -4587,7 +4643,7 @@ msgstr "" "zadnjih\n" " K vrstic vsake datoteke\n" -#: src/head.c:126 +#: src/head.c:125 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4595,7 +4651,7 @@ msgstr "" " -q, --quiet, --silent vedno brez izpisa imena datoteke\n" " -v, --verbose vedno izpišemo še ime datoteke\n" -#: src/head.c:132 +#: src/head.c:131 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -4607,58 +4663,58 @@ 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:152 -#, c-format -msgid "error writing %s" -msgstr "napaka pri pisanju na %s" - -#: src/head.c:155 +#: src/head.c:154 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: datoteka se je preveč skrčila" -#: src/head.c:228 src/head.c:1044 +#: src/head.c:227 src/head.c:1051 #, c-format msgid "%s: number of bytes is too large" msgstr "%s: število bajtov je preveliko" -#: src/head.c:441 +#: 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:613 src/head.c:684 src/tail.c:450 +#: src/head.c:612 src/head.c:691 src/tail.c:449 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: premik na odmik %s ni mogoč" -#: src/head.c:791 +#: 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 #, c-format msgid "cannot reposition file pointer for %s" msgstr "ni mogoče premakniti datotečnega kazalca za %s" -#: src/head.c:878 +#: src/head.c:885 #, 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:879 +#: src/head.c:886 msgid "number of lines" msgstr "število vrstic" -#: src/head.c:879 +#: src/head.c:886 msgid "number of bytes" msgstr "število bajtov" -#: src/head.c:886 src/tail.c:1947 +#: src/head.c:893 src/tail.c:1947 msgid "invalid number of lines" msgstr "neveljavno število vrstic" -#: src/head.c:887 src/tail.c:1948 +#: src/head.c:894 src/tail.c:1948 msgid "invalid number of bytes" msgstr "neveljavno število bajtov" -#: src/head.c:974 src/head.c:1032 +#: src/head.c:981 src/head.c:1039 #, c-format msgid "invalid trailing option -- %c" msgstr "neveljavna zaključna izbira -- %c" @@ -4773,87 +4829,87 @@ msgstr "konteksta procesa ni mogoče pridobiti" msgid "cannot get effective UID" msgstr "efektivnega UID ni mogoče ugotoviti" -#: src/id.c:289 +#: src/id.c:311 #, c-format -msgid "cannot find name for user ID %lu" -msgstr "uporabniško ime za UID %lu ni ugotovljivo" +msgid "cannot find name for user ID %s" +msgstr "uporabniškega imena za UID %s ni moč ugotoviti" -#: src/id.c:309 +#: src/id.c:329 #, c-format -msgid "uid=%lu" -msgstr "uid=%lu" +msgid "uid=%s" +msgstr "uid=%s" -#: src/id.c:314 +#: src/id.c:334 #, c-format -msgid " gid=%lu" -msgstr " gid=%lu" +msgid " gid=%s" +msgstr " gid=%s" -#: src/id.c:321 +#: src/id.c:341 #, c-format -msgid " euid=%lu" -msgstr " euid=%lu" +msgid " euid=%s" +msgstr " euid=%s" -#: src/id.c:329 +#: src/id.c:349 #, c-format -msgid " egid=%lu" -msgstr " egid=%lu" +msgid " egid=%s" +msgstr " egid=%s" -#: src/id.c:357 +#: src/id.c:377 msgid " groups=" msgstr " skupine=" -#: src/id.c:373 +#: src/id.c:393 #, c-format msgid " context=%s" msgstr " kontekst=%s" -#: src/install.c:372 +#: src/install.c:373 #, c-format msgid "warning: %s: failed to change context to %s" msgstr "opozorilo: %s: sprememba konteksta na %s ni uspela" -#: src/install.c:413 +#: src/install.c:414 #, c-format msgid "creating directory %s" msgstr "ustvarjanje imenik %s" -#: src/install.c:481 +#: src/install.c:482 #, c-format msgid "cannot change ownership of %s" msgstr "lastništva %s ni mogoče spremeniti" -#: src/install.c:505 +#: src/install.c:506 #, c-format msgid "cannot set time stamps for %s" msgstr "datoteke %s ni moč časovno označiti" -#: src/install.c:526 src/split.c:412 src/timeout.c:387 +#: src/install.c:527 src/split.c:426 src/timeout.c:439 #, c-format msgid "fork system call failed" msgstr "vejitev ni mogoča" -#: src/install.c:530 +#: src/install.c:531 #, c-format msgid "cannot run %s" msgstr "ni mogoče pognati %s" -#: src/install.c:534 +#: src/install.c:535 #, c-format msgid "waiting for strip" msgstr "čakamo na »strip«" -#: src/install.c:536 +#: src/install.c:537 #, c-format msgid "strip process terminated abnormally" msgstr "proces »strip« se je zaključil nenormalno" -#: src/install.c:557 +#: src/install.c:558 #, c-format msgid "invalid user %s" msgstr "neveljavno ime uporabnika %s" # ! INEXACT -#: src/install.c:593 +#: src/install.c:594 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -4866,7 +4922,8 @@ msgstr "" " ali: %s [IZBIRA]... -t IMENIK IZVOR...\n" " ali: %s [IZBIRA]... -d IMENIK...\n" -#: src/install.c:600 +#: src/install.c:601 +#, fuzzy msgid "" "\n" "This install program copies files (often just compiled) into destination\n" @@ -4878,7 +4935,6 @@ msgid "" "In the first three forms, copy SOURCE to DEST or multiple SOURCE(s) to\n" "the existing DIRECTORY, while setting permission modes and owner/group.\n" "In the 4th form, create all components of the given DIRECTORY(ies).\n" -"\n" msgstr "" "\n" "Ta namestitveni program prepiše datoteke (pogosti pravkar prevedene) v\n" @@ -4964,7 +5020,7 @@ msgstr "" " -Z, --context=KONTEKST nastavi varnostni kontekst SELinux datotek in " "imenikov\n" -#: src/install.c:858 +#: src/install.c:859 #, c-format msgid "" "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled" @@ -4972,50 +5028,50 @@ msgstr "" "OPOZORILO: določilo --preserve-context ni upoštevano; jedro ne podpira " "SELinux." -#: src/install.c:868 +#: 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:885 +#: src/install.c:886 #, 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:888 +#: src/install.c:889 #, c-format msgid "target directory not allowed when installing a directory" msgstr "navedba ciljnega imenika ni dovoljena pri namestitvi imenika" -#: src/install.c:892 +#: 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:946 src/mkdir.c:202 src/stdbuf.c:327 +#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326 #, c-format msgid "invalid mode %s" msgstr "neveljavni način %s" -#: src/install.c:953 +#: src/install.c:954 #, 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:958 +#: src/install.c:959 #, 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:965 +#: src/install.c:966 #, c-format msgid "options --compare (-C) and --strip are mutually exclusive" msgstr "izbiri --compare (-C) in --strip se medsebojno izključujeta" -#: src/install.c:971 +#: src/install.c:972 #, c-format msgid "" "the --compare (-C) option is ignored when you specify a mode with non-" @@ -5025,7 +5081,7 @@ msgstr "" "dovoljenj" #. This is a proper name. See the gettext manual, section Names. -#: src/join.c:40 src/sort.c:65 +#: src/join.c:40 src/sort.c:66 msgid "Mike Haertel" msgstr "Mike Haertel" @@ -5123,8 +5179,8 @@ msgstr "" "opozorilno sporočilo.\n" #: src/join.c:403 -#, c-format -msgid "%s:%ju: is not sorted: %.*s" +#, fuzzy, c-format +msgid "%s:%<PRIuMAX>: is not sorted: %.*s" msgstr "%s:%ju: ni urejeno: %.*s" #: src/join.c:840 src/join.c:1038 @@ -5152,12 +5208,12 @@ msgstr "nezdružljivi združevalni polji %lu, %lu" msgid "conflicting empty-field replacement strings" msgstr "nasprotujoča si niza za nadomestitev praznega polja" -#: src/join.c:1101 src/sort.c:4414 +#: src/join.c:1101 src/sort.c:4468 #, c-format msgid "multi-character tab %s" msgstr "večznakovni tabulator %s" -#: src/join.c:1105 src/sort.c:4419 +#: src/join.c:1105 src/sort.c:4473 #, c-format msgid "incompatible tabs" msgstr "nezdružljivi tabulatorji" @@ -5179,14 +5235,13 @@ msgstr "" " ali: %s -t [SIGNAL]...\n" #: src/kill.c:82 -msgid "" -"Send signals to processes, or list signals.\n" -"\n" +#, fuzzy +msgid "Send signals to processes, or list signals.\n" msgstr "" "Procesom pošljemo signale, ali pa izpišemo signale.\n" "\n" -#: src/kill.c:89 +#: src/kill.c:88 msgid "" " -s, --signal=SIGNAL, -SIGNAL\n" " specify the name or number of the signal to be sent\n" @@ -5200,7 +5255,7 @@ msgstr "" " v ime (ali obratno)\n" " -t, --table izpišemo tabelo signalnih informacij\n" -#: src/kill.c:97 +#: src/kill.c:96 msgid "" "\n" "SIGNAL may be a signal name like 'HUP', or a signal number like '1',\n" @@ -5213,32 +5268,32 @@ msgstr "" "PID (identifikacijska številkoa uporabnika) je celo število; negativna \n" "vrednost določa identifikacijko številko skupine.\n" -#: src/kill.c:206 +#: src/kill.c:205 #, c-format msgid "%s: invalid process id" msgstr "%s: neveljavna identifikacijska številka procesa" -#: src/kill.c:260 +#: src/kill.c:259 #, c-format msgid "invalid option -- %c" msgstr "neveljavna izbira -- %c" -#: src/kill.c:269 +#: src/kill.c:268 #, c-format msgid "%s: multiple signals specified" msgstr "%s: podan več kot en signal" -#: src/kill.c:283 +#: src/kill.c:282 #, c-format msgid "multiple -l or -t options specified" msgstr "hkrati sta podani izbiri -l in -t" -#: src/kill.c:300 +#: src/kill.c:299 #, c-format msgid "cannot combine signal with -l or -t" msgstr "signala ni moč kombinirati z izbirama -l ali -t" -#: src/kill.c:306 +#: src/kill.c:305 #, c-format msgid "no process ID specified" msgstr "številka procesa (PID) ni določena" @@ -5340,6 +5395,7 @@ msgstr "" " ali: %s [IZBIRA]... -t IMENIK CILJ (četrta oblika)\n" #: src/ln.c:381 +#, fuzzy 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" @@ -5349,7 +5405,6 @@ msgid "" "When creating hard links, each TARGET must exist. Symbolic links\n" "can hold arbitrary text; if later resolved, a relative link is\n" "interpreted in relation to its parent directory.\n" -"\n" msgstr "" "V prvi obliki ustvarimo povezavo do določenega CILJA z imenom POVEZAVE.\n" "V drugi obliki se ustvari povezava do CILJA v trenutnem imeniku.\n" @@ -5363,7 +5418,7 @@ msgstr "" "\n" # ! INEXACT -#: src/ln.c:395 +#: src/ln.c:394 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -5385,7 +5440,7 @@ msgstr "" " -f, --force odstranimo morebitne obstoječe ciljne " "datoteke\n" -#: src/ln.c:403 +#: src/ln.c:402 msgid "" " -i, --interactive prompt whether to remove destinations\n" " -L, --logical dereference TARGETs that are symbolic links\n" @@ -5406,7 +5461,7 @@ msgstr "" " povezave\n" " -s, --symbolic ustvari simbolne povezave namesto trdih\n" -#: src/ln.c:412 +#: src/ln.c:411 msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" " -t, --target-directory=DIRECTORY specify the DIRECTORY in which to " @@ -5422,24 +5477,10 @@ msgstr "" "datoteko\n" " -v, --verbose z izpisom imen datotek, ki jih povezujemo\n" -#: src/ln.c:428 +#: src/ln.c:433 +#, fuzzy, c-format 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 nikoli ne delamo varnostne kopije, niti z izbiro --backup\n" -" numbered, t oštevilčene varnostne kopije\n" -" existing, nil oštevilčene varnostne kopije, če take že obstajajo,\n" -" sicer enostavne\n" -" simple, never vedno enostavne varnostne kopije\n" "\n" - -#: src/ln.c:435 -#, c-format -msgid "" "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 "" @@ -5515,7 +5556,7 @@ msgstr "ne upoštevamo neveljavne širine v spremenljivki COLUMNS: %s" 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:1976 +#: src/ls.c:1750 src/ptx.c:1975 #, c-format msgid "invalid line width: %s" msgstr "neveljavna širina vrstice: %s" @@ -5580,22 +5621,22 @@ msgid "closing directory %s" msgstr "zapiramo imenik %s" # ! INEXACT -#: src/ls.c:3301 +#: src/ls.c:3302 #, 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 msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" -"\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:4729 +#: src/ls.c:4728 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -5609,7 +5650,7 @@ msgstr "" " -b, --escape izpis C-jevske ubežne kode za neizpisljive " "znake\n" -#: src/ls.c:4735 +#: src/ls.c:4734 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them. E." "g.,\n" @@ -5637,7 +5678,7 @@ msgstr "" " sicer: urejeno po ctime, začenši z " "najnovejšim\n" -#: src/ls.c:4745 +#: src/ls.c:4744 msgid "" " -C list entries by columns\n" " --color[=WHEN] colorize the output. WHEN defaults to " @@ -5658,7 +5699,7 @@ msgstr "" " brez sledenja simbolnim povezavam\n" " -D, --dired izpis primeren za način »dired« v Emacsu\n" -#: src/ls.c:4753 +#: src/ls.c:4752 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -5675,11 +5716,11 @@ msgstr "" " single-column -1, verbose -l, vertical -C\n" " --full-time kot -l --time-style=full-iso\n" -#: src/ls.c:4761 +#: src/ls.c:4760 msgid " -g like -l, but do not list owner\n" msgstr " -g kot -l, vendar brez izpisa lastnika\n" -#: src/ls.c:4764 +#: src/ls.c:4763 msgid "" " --group-directories-first\n" " group directories before files.\n" @@ -5691,7 +5732,7 @@ msgstr "" " mogoča je dopolnitev z izbiro --sort, raba\n" " --sort=none (-U) onemogoči združevanje\n" -#: src/ls.c:4770 +#: src/ls.c:4769 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" @@ -5704,7 +5745,7 @@ msgstr "" " --si podobno kot -h, vendar v bazi 1000 namesto " "1024\n" -#: src/ls.c:4776 +#: src/ls.c:4775 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5724,7 +5765,7 @@ msgstr "" " ki kažejo na imenike\n" " --hide=VZOREC brez impliciranih vnosov, opisanih z VZORCEM\n" -#: src/ls.c:4786 +#: src/ls.c:4785 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -5744,7 +5785,7 @@ msgstr "" " -I, --ignore=VZOREC pri izpisu izpusti imena, ki ustrezajo VZORCU\n" " -k, --kibibytes uporabljaj 1024-bajtne bloke\n" -#: src/ls.c:4796 +#: src/ls.c:4795 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5759,7 +5800,7 @@ msgstr "" " -m z vejicami ločena imena prek celotne širine " "vrstice\n" -#: src/ls.c:4804 +#: src/ls.c:4803 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. " @@ -5776,7 +5817,7 @@ msgstr "" " -p, --indicator-style=slash imenike označimo s pripono »/«\n" # ! INEXACT -#: src/ls.c:4812 +#: src/ls.c:4811 msgid "" " -q, --hide-control-chars print ? instead of non graphic characters\n" " --show-control-chars show non graphic characters as-is (default\n" @@ -5796,7 +5837,7 @@ msgstr "" "»locale«,\n" " »shell«, »shell-always«, »c« ali »escape«\n" -#: src/ls.c:4821 +#: src/ls.c:4820 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -5807,7 +5848,7 @@ msgstr "" " -R, --recursive rekurziven izpis podimenikov\n" " -s, --size izpis velikosti datotek (v blokih)\n" -#: src/ls.c:4826 +#: src/ls.c:4825 msgid "" " -S sort by file size\n" " --sort=WORD sort by WORD instead of name: none -U,\n" @@ -5831,7 +5872,7 @@ msgstr "" " z izbiro --sort=time tudi uredi po izbranem " "času\n" -#: src/ls.c:4836 +#: src/ls.c:4835 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, +FORMAT.\n" @@ -5853,7 +5894,7 @@ msgstr "" " če se SLOG začne s predpono »posix-«, velja\n" " podani slog samo izven krajevnega okolja POSIX\n" -#: src/ls.c:4845 +#: src/ls.c:4844 msgid "" " -t sort by modification time, newest first\n" " -T, --tabsize=COLS assume tab stops at each COLS instead of 8\n" @@ -5862,7 +5903,7 @@ msgstr "" " začenši z najnovejšim časom\n" " -T, --tabsize=STOLPCEV tabulator nastavljen na STOLPCEV namesto na 8\n" -#: src/ls.c:4849 +#: src/ls.c:4848 msgid "" " -u with -lt: sort by, and show, access time\n" " with -l: show access time and sort by name\n" @@ -5880,7 +5921,7 @@ msgstr "" " -U brez urejanja; kot so v imeniku\n" " -v urejanje po številki različice\n" -#: src/ls.c:4856 +#: src/ls.c:4855 msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" @@ -5897,7 +5938,7 @@ msgstr "" "datoteko\n" " -1 izpis po eno datoteko v vrstici\n" -#: src/ls.c:4866 +#: src/ls.c:4865 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5911,7 +5952,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:4873 +#: src/ls.c:4872 msgid "" "\n" "Exit status:\n" @@ -5940,7 +5981,7 @@ msgstr "Scott Miller" msgid "David Madore" msgstr "David Madore" -#: src/md5sum.c:162 +#: src/md5sum.c:164 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -5953,7 +5994,7 @@ msgstr "" "Če DATOTEKA ni podana ali če je enaka -, se bere s standardnega vhoda.\n" "\n" -#: src/md5sum.c:172 +#: src/md5sum.c:174 msgid "" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" @@ -5961,26 +6002,30 @@ msgstr "" " -b, --binary beri binarno (privzeto, razen pri branju s " "terminala)\n" -#: src/md5sum.c:176 +#: src/md5sum.c:178 msgid " -b, --binary read in binary mode\n" msgstr " -b, --binary beri binarno\n" -#: src/md5sum.c:179 +#: src/md5sum.c:181 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr " -c, --check preberi %s vsot iz DATOTEK in jih preveri\n" -#: src/md5sum.c:183 +#: src/md5sum.c:184 +msgid " --tag create a BSD-style checksum\n" +msgstr " --tag ustvari nadzorno vsoto v slogu BSD\n" + +#: src/md5sum.c:188 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" " -t, --text beri besedilno (privzeto pri branju s terminala)\n" -#: src/md5sum.c:187 +#: src/md5sum.c:192 msgid " -t, --text read in text mode (default)\n" msgstr " -t, --text beri besedilno (privzeto)\n" -#: src/md5sum.c:190 +#: src/md5sum.c:195 msgid "" "\n" "The following three options are useful only when verifying checksums:\n" @@ -5997,14 +6042,14 @@ msgstr "" " z nadzornimi vsotami MD5\n" "\n" -#: src/md5sum.c:198 +#: 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:203 +#: src/md5sum.c:208 #, c-format msgid "" "\n" @@ -6020,35 +6065,35 @@ msgstr "" "besedilne datoteke) in imenom DATOTEKE, za katero je bila izračunana\n" "nadzorna vsota.\n" -#: src/md5sum.c:502 +#: src/md5sum.c:523 #, c-format msgid "%s: too many checksum lines" msgstr "%s: preveč vrstic z nadzorno vsoto" -#: src/md5sum.c:526 +#: src/md5sum.c:547 #, c-format msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line" msgstr "%s: %<PRIuMAX>: nepravilno oblikovana vrstica z nadzorno vsoto %s" -#: src/md5sum.c:551 +#: src/md5sum.c:572 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: NAPAKA pri odpiranju ali branju\n" -#: src/md5sum.c:574 +#: src/md5sum.c:595 msgid "FAILED" msgstr "NAPAKA" -#: src/md5sum.c:576 +#: src/md5sum.c:597 msgid "OK" msgstr "V REDU" -#: src/md5sum.c:600 +#: src/md5sum.c:621 #, 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:610 +#: src/md5sum.c:631 #, c-format msgid "WARNING: %<PRIuMAX> line is improperly formatted" msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted" @@ -6057,7 +6102,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:618 +#: src/md5sum.c:639 #, c-format msgid "WARNING: %<PRIuMAX> listed file could not be read" msgid_plural "WARNING: %<PRIuMAX> listed files could not be read" @@ -6066,7 +6111,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:626 +#: src/md5sum.c:647 #, c-format msgid "WARNING: %<PRIuMAX> computed checksum did NOT match" msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match" @@ -6075,29 +6120,39 @@ 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:704 +#: src/md5sum.c:760 +#, c-format +msgid "--tag does not support --text mode" +msgstr "--tag ne podpira načina --text" + +#: src/md5sum.c:766 +#, c-format +msgid "the --tag option is meaningless when verifying checksums" +msgstr "izbira --tag ni smiselna pri preverjanju nadzornih vsot" + +#: src/md5sum.c:773 #, 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:712 +#: src/md5sum.c:781 #, 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:719 +#: src/md5sum.c:788 #, 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:726 +#: src/md5sum.c:795 #, 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:733 +#: src/md5sum.c:802 #, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "izbira --strict je smiselna samo pri preverjanju nadzornih vsot" @@ -6108,14 +6163,13 @@ msgid "Usage: %s [OPTION]... DIRECTORY...\n" msgstr "Uporaba: %s [IZBIRA]... IMENIK...\n" #: src/mkdir.c:57 -msgid "" -"Create the DIRECTORY(ies), if they do not already exist.\n" -"\n" +#, fuzzy +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" -#: src/mkdir.c:64 +#: src/mkdir.c:63 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" @@ -6132,7 +6186,7 @@ msgstr "" "imenik\n" " na KONTEKST\n" -#: src/mkdir.c:169 +#: src/mkdir.c:168 #, c-format msgid "created directory %s" msgstr "ustvarjen imenik %s" @@ -6143,31 +6197,30 @@ msgid "Usage: %s [OPTION]... NAME...\n" msgstr "Uporaba: %s [IZBIRA]... IME...\n" #: src/mkfifo.c:52 -msgid "" -"Create named pipes (FIFOs) with the given NAMEs.\n" -"\n" +#, fuzzy +msgid "Create named pipes (FIFOs) with the given NAMEs.\n" msgstr "" "Ustvarimo poimenovano cev (FIFO) z navedenim IMENOM.\n" "\n" -#: src/mkfifo.c:59 src/mknod.c:61 +#: src/mkfifo.c:58 src/mknod.c:60 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:62 +#: src/mkfifo.c:61 msgid "" " -Z, --context=CTX set the SELinux security context of each NAME to CTX\n" msgstr "" " -Z, --context=CTX za vsako IME nastavi varnostni kontekst SELinux na CTX\n" -#: src/mkfifo.c:122 src/mknod.c:128 +#: src/mkfifo.c:121 src/mknod.c:127 #, c-format msgid "invalid mode" msgstr "napačna zaščita" -#: src/mkfifo.c:127 src/mknod.c:133 +#: src/mkfifo.c:126 src/mknod.c:132 #, c-format msgid "mode must specify only file permission bits" msgstr "način mora določiti le bite dovoljenja za dostop do datoteke" @@ -6178,19 +6231,18 @@ msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n" msgstr "Uporaba: %s [IZBIRA]... IME TIP [GLAVNO POMOŽNO]\n" #: src/mknod.c:54 -msgid "" -"Create the special file NAME of the given TYPE.\n" -"\n" +#, fuzzy +msgid "Create the special file NAME of the given TYPE.\n" msgstr "" "Ustvarimo posebno datoteko navedenega TIPA z navedenim IMENOM.\n" "\n" -#: src/mknod.c:64 +#: 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:69 +#: src/mknod.c:68 msgid "" "\n" "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n" @@ -6208,7 +6260,7 @@ msgstr "" "sicer pa kot desetiško število. TIP je lahko:\n" # ! INEXACT -#: src/mknod.c:76 +#: src/mknod.c:75 msgid "" "\n" " b create a block (buffered) special file\n" @@ -6220,41 +6272,41 @@ msgstr "" " c, u ustvarimo znakovno enoto (brez izravnalnika)\n" " p ustvarimo FIFO\n" -#: src/mknod.c:151 +#: src/mknod.c:150 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:161 +#: src/mknod.c:160 msgid "Fifos do not have major and minor device numbers." msgstr "Poimenovane cevi nimajo glavnih in pomožnih števil naprave" -#: src/mknod.c:177 +#: src/mknod.c:176 #, c-format msgid "block special files not supported" msgstr "bločne enote niso podprte" -#: src/mknod.c:186 +#: src/mknod.c:185 #, c-format msgid "character special files not supported" msgstr "znakovne enote niso podprte" -#: src/mknod.c:202 +#: src/mknod.c:201 #, c-format msgid "invalid major device number %s" msgstr "neveljavno GLAVNO število enote %s" -#: src/mknod.c:207 +#: src/mknod.c:206 #, c-format msgid "invalid minor device number %s" msgstr "neveljavno POMOŽNO število enote %s" -#: src/mknod.c:212 +#: src/mknod.c:211 #, c-format msgid "invalid device %s %s" msgstr "neveljavna enota %s %s" -#: src/mknod.c:226 +#: src/mknod.c:225 #, c-format msgid "invalid device type %s" msgstr "neveljavna vrsta naprave %s" @@ -6344,61 +6396,60 @@ msgstr "" "nastavljen;\n" " imenik, določen s -p; ali /tmp (odsvetovano).\n" -#: src/mktemp.c:222 +#: 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:228 +#: src/mktemp.c:229 #, c-format msgid "too many templates" msgstr "preveč predlog" -#: src/mktemp.c:248 +#: src/mktemp.c:249 #, 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:273 src/split.c:1117 +#: src/mktemp.c:274 src/split.c:1130 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "neveljavna pripona %s, vsebuje ločilnik imenikov" -#: src/mktemp.c:278 +#: src/mktemp.c:279 #, c-format msgid "too few X's in template %s" msgstr "premalo mest (X) v predlogi %s" -#: src/mktemp.c:291 +#: src/mktemp.c:292 #, c-format msgid "invalid template, %s, contains directory separator" msgstr "neveljavna predloga, %s, vsebuje ločilnike imenikov" -#: src/mktemp.c:305 +#: src/mktemp.c:306 #, 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:325 +#: src/mktemp.c:326 #, c-format msgid "failed to create directory via template %s" msgstr "ustvarjenje imenika s predlogo %s ni uspelo" -#: src/mktemp.c:335 +#: src/mktemp.c:336 #, c-format msgid "failed to create file via template %s" msgstr "ustvarjenje datoteke s predlogo %s ni uspelo" -#: src/mv.c:290 -msgid "" -"Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" -"\n" +#: src/mv.c:292 +#, fuzzy +msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" msgstr "" "Preimenujemo IZVOR v CILJ, ali več IZVOROV v IMENIK.\n" "\n" # ! INEXACT -#: src/mv.c:297 +#: src/mv.c:298 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -6422,7 +6473,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:306 +#: src/mv.c:307 msgid "" " --strip-trailing-slashes remove any trailing slashes from each " "SOURCE\n" @@ -6434,7 +6485,7 @@ msgstr "" " IZVOROV\n" " -S, --suffix=PRIPONA izrecno navedena PRIPONA varnostnih kopij\n" -#: src/mv.c:311 +#: src/mv.c:312 msgid "" " -t, --target-directory=DIRECTORY move all SOURCE arguments into " "DIRECTORY\n" @@ -6456,38 +6507,40 @@ msgid "Usage: %s [OPTION] [COMMAND [ARG]...]\n" msgstr "Uporaba: %s [IZBIRA]... [UKAZ [ARGUMENT]...]\n" #: src/nice.c:73 -#, c-format +#, fuzzy, c-format msgid "" "Run COMMAND with an adjusted niceness, which affects process scheduling.\n" -"With no COMMAND, print the current niceness. Nicenesses range from\n" -"%d (most favorable scheduling) to %d (least favorable).\n" -"\n" -" -n, --adjustment=N add integer N to the niceness (default 10)\n" +"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 "" "Požene UKAZ s spremenjeno vrednost »nice«, kar vpliva na prioriteto " "izvajanja.\n" "Če UKAZ ni podan, izpiše trenutno raven prioritete. Vrednosti »nice« so " "med \n" -"%d (najvišja prioriteta) in %d (najnižja).\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:168 +#: src/nice.c:82 +msgid " -n, --adjustment=N add integer N to the niceness (default 10)\n" +msgstr "" + +#: src/nice.c:172 #, c-format msgid "invalid adjustment %s" msgstr "neveljavni popravek %s" -#: src/nice.c:177 +#: src/nice.c:181 #, c-format msgid "a command must be given with an adjustment" msgstr "ob podanem popravku ravni moramo podati tudi ukaz" -#: src/nice.c:184 src/nice.c:195 +#: src/nice.c:188 src/nice.c:199 #, c-format msgid "cannot get niceness" msgstr "prioriteta izvajanja ni ugotovljiva" -#: src/nice.c:201 +#: src/nice.c:205 #, c-format msgid "cannot set niceness" msgstr "prioritete izvajanja ni mogoče nastaviti" @@ -6497,18 +6550,18 @@ msgstr "prioritete izvajanja ni mogoče nastaviti" msgid "Scott Bartram" msgstr "Scott Bartram" -#: src/nl.c:186 +#: 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" -"\n" 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:194 +#: src/nl.c:186 msgid "" " -b, --body-numbering=STYLE use STYLE for numbering body lines\n" " -d, --section-delimiter=CC use CC for separating logical pages\n" @@ -6520,7 +6573,7 @@ msgstr "" " -f, --footer-numbering=SLOG uporabi SLOG pri oštevilčenju znožja " "strani\n" -#: src/nl.c:199 +#: src/nl.c:191 msgid "" " -h, --header-numbering=STYLE use STYLE for numbering header lines\n" " -i, --line-increment=NUMBER line number increment at each line\n" @@ -6542,7 +6595,7 @@ msgstr "" "strani\n" " -s, --number-separator=NIZ pripni NIZ (možni) številki vrstice\n" -#: src/nl.c:207 +#: src/nl.c:199 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" @@ -6551,7 +6604,7 @@ msgstr "" " strani\n" " -w, --number-width=ŠTEVILO ŠTEVILO znakov širine za oštevilčenje\n" -#: src/nl.c:213 +#: src/nl.c:205 msgid "" "\n" "By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC are\n" @@ -6565,7 +6618,7 @@ msgstr "" "privzame :.\n" "Uporabite \\\\\\\\ za \\\\. SLOG je nekaj od naštetega:\n" -#: src/nl.c:219 +#: src/nl.c:211 msgid "" "\n" " a number all lines\n" @@ -6594,54 +6647,47 @@ msgstr "" " rn desno poravnano, brez vodilnih ničel\n" " rz desno poravnano, z vodilnimi ničlami\n" -#: src/nl.c:286 +#: src/nl.c:278 #, c-format msgid "line number overflow" msgstr "prekoračitev številke vrstice" -#: src/nl.c:486 +#: src/nl.c:478 #, c-format msgid "invalid header numbering style: %s" msgstr "neveljavni slog oštevilčenja glave: %s" -#: src/nl.c:494 +#: src/nl.c:486 #, c-format msgid "invalid body numbering style: %s" msgstr "neveljavni slog oštevilčenja telesa: %s" -#: src/nl.c:502 +#: src/nl.c:494 #, c-format msgid "invalid footer numbering style: %s" msgstr "neveljavni slog oštevilčenja noge: %s" -#: src/nl.c:511 +#: src/nl.c:503 #, c-format msgid "invalid starting line number: %s" msgstr "neveljavna začetna številka vrstice: %s" -#: src/nl.c:517 -#, c-format -msgid "WARNING: --page-increment is deprecated; use --line-increment instead" -msgstr "" -"OPOZORILO: izbira --page-increment je opuščena; namesto nje uporabite --line-" -"increment" - -#: src/nl.c:524 +#: src/nl.c:512 #, c-format msgid "invalid line number increment: %s" msgstr "neveljavni vrstični inkrement: %s" -#: src/nl.c:536 +#: src/nl.c:524 #, c-format msgid "invalid number of blank lines: %s" msgstr "neveljavno število praznih vrstic: %s" -#: src/nl.c:550 +#: src/nl.c:538 #, c-format msgid "invalid line number field width: %s" msgstr "neveljavna širina polja s številko vrstice: %s" -#: src/nl.c:569 +#: src/nl.c:557 #, c-format msgid "invalid line numbering format: %s" msgstr "neveljavna oblika oštevilčenja vrstic: %s" @@ -6692,11 +6738,6 @@ msgstr "onemogočenje standardnega izhoda ni uspelo" msgid "ignoring input" msgstr "ne upoštevamo vhoda" -#: src/nohup.c:163 src/nohup.c:165 -#, c-format -msgid "failed to open %s" -msgstr "odpiranje %s ni uspelo" - #: src/nohup.c:175 #, c-format msgid "ignoring input and appending output to %s" @@ -6730,16 +6771,16 @@ msgid "failed to redirect standard error" msgstr "preusmeritev standardnega izhoda za napake ni uspela" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:32 +#: src/nproc.c:33 msgid "Giuseppe Scrivano" msgstr "Giuseppe Scrivano" -#: src/nproc.c:56 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 +#: src/nproc.c:57 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Uporaba: %s [IZBIRA]...\n" -#: src/nproc.c:57 +#: src/nproc.c:58 msgid "" "Print the number of processing units available to the current process,\n" "which may be less than the number of online processors\n" @@ -6749,7 +6790,7 @@ msgstr "" "lahko manj od števila delujočih procesorjev\n" "\n" -#: src/nproc.c:62 +#: src/nproc.c:63 msgid "" " --all print the number of installed processors\n" " --ignore=N if possible, exclude N processing units\n" @@ -6757,11 +6798,351 @@ msgstr "" " --all izpiši število nameščenih procesorjev\n" " --ignore=N če je mogoče, izloči N procesnih enot\n" -#: src/nproc.c:106 +#: src/nproc.c:107 #, c-format 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 +msgid "Assaf Gordon" +msgstr "" + +#: src/numfmt.c:676 +#, fuzzy, c-format +msgid "value too large to be converted: '%s'" +msgstr "%s: vrednost nepopolno pretvorjena" + +#: src/numfmt.c:680 +#, fuzzy, c-format +msgid "invalid number: '%s'" +msgstr "neveljavno število %s" + +#: src/numfmt.c:684 +#, c-format +msgid "rejecting suffix in input: '%s' (consider using --from)" +msgstr "" + +#: src/numfmt.c:688 +#, fuzzy, c-format +msgid "invalid suffix in input: '%s'" +msgstr "neveljavna pripona pri %s%s argumentu '%s'" + +#: src/numfmt.c:692 +#, c-format +msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)" +msgstr "" + +#: src/numfmt.c:723 +#, fuzzy, 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" + +#: 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 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [NUMBER]...\n" +msgstr "Uporaba: %s [IZBIRA]... [UPORABNIK]...\n" + +#: src/numfmt.c:816 +msgid "" +"Reformat NUMBER(s), or the numbers from standard input if none are " +"specified.\n" +msgstr "" + +#: src/numfmt.c:820 +#, fuzzy +msgid " --debug print warnings about invalid input\n" +msgstr "" +" --strict (skupaj s --check) zaključi z napako za neveljaven " +"vhod\n" + +#: src/numfmt.c:823 +msgid "" +" -d, --delimiter=X use X instead of whitespace for field delimiter\n" +msgstr "" + +#: src/numfmt.c:826 +msgid "" +" --field=N replace the number in input field N (default is 1)\n" +msgstr "" + +#: src/numfmt.c:829 +msgid "" +" --format=FORMAT use printf style floating-point FORMAT;\n" +" see FORMAT below for details\n" +msgstr "" + +#: src/numfmt.c:833 +msgid "" +" --from=UNIT auto-scale input numbers to UNITs; default is " +"'none';\n" +" see UNIT below\n" +msgstr "" + +#: src/numfmt.c:837 +msgid "" +" --from-unit=N specify the input unit size (instead of the default " +"1)\n" +msgstr "" + +#: src/numfmt.c:840 +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 "" + +#: src/numfmt.c:844 +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 +msgid "" +" --invalid=MODE failure mode for invalid numbers: MODE can be:\n" +" abort (default), fail, warn, ignore\n" +msgstr "" + +#: src/numfmt.c:852 +msgid "" +" --padding=N pad the output to N characters; positive N will\n" +" right-align; negative N will left-align;\n" +" padding is ignored if the output is wider than N;\n" +" the default is to automatically pad if a " +"whitespace\n" +" is found\n" +msgstr "" + +#: src/numfmt.c:859 +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 +msgid "" +" --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" +" SUFFIX in input numbers\n" +msgstr "" + +#: src/numfmt.c:867 +msgid "" +" --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" +msgstr "" + +#: src/numfmt.c:870 +msgid "" +" --to-unit=N the output unit size (instead of the default 1)\n" +msgstr "" + +#: src/numfmt.c:877 +#, fuzzy +msgid "" +"\n" +"UNIT options:\n" +msgstr "" +"Druge izbire:\n" +"\n" + +#: src/numfmt.c:880 +msgid " none no auto-scaling is done; suffixes will trigger an error\n" +msgstr "" + +#: src/numfmt.c:883 +msgid "" +" auto accept optional single/two letter suffix:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" +msgstr "" + +#: src/numfmt.c:889 +msgid "" +" si accept optional single letter suffix:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:894 +msgid "" +" iec accept optional single letter suffix:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:899 +msgid "" +" iec-i accept optional two-letter suffix:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:905 +#, 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" +msgstr "" + +#: src/numfmt.c:912 +#, c-format +msgid "" +"\n" +"Exit status is 0 if all input numbers were successfully converted.\n" +"By default, %s will stop at the first conversion error with exit status 2.\n" +"With --invalid='fail' a warning is printed for each conversion error\n" +"and the exit status is 2. With --invalid='warn' each conversion error is\n" +"diagnosed, but the exit status is 0. With --invalid='ignore' conversion\n" +"errors are not diagnosed and the exit status is 0.\n" +msgstr "" + +#: src/numfmt.c:921 +#, c-format +msgid "" +"\n" +"Examples:\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" +msgstr "" + +#: src/numfmt.c:974 src/seq.c:212 +#, c-format +msgid "format %s has no %% directive" +msgstr "določilo %s ne vsebuje direktive %%" + +#: src/numfmt.c:990 +#, fuzzy, c-format +msgid "invalid format %s (width overflow)" +msgstr "neveljavna širina oblike" + +#: src/numfmt.c:1007 src/seq.c:229 +#, 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:1018 src/seq.c:236 +#, 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:1092 +#, c-format +msgid "value too large to be printed: '%Lg' (consider using --to)" +msgstr "" + +#: src/numfmt.c:1100 +#, c-format +msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" +msgstr "" + +#: src/numfmt.c:1184 +#, c-format +msgid "large input value '%s': possible precision loss" +msgstr "" + +#: src/numfmt.c:1293 +#, 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 "neveljavni razpon strani %s" + +#: src/numfmt.c:1401 +#, fuzzy, c-format +msgid "invalid field value '%s'" +msgstr "neveljavna številka polja: »%s«" + +#: src/numfmt.c:1430 +#, fuzzy, c-format +msgid "invalid header value '%s'" +msgstr "neveljavni datum %s" + +#: src/numfmt.c:1456 +#, fuzzy, c-format +msgid "--grouping cannot be combined with --format" +msgstr "datotečnih operandov ni mogoče kombinirati z izbiro --files0-from." + +#: 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 +msgid "no conversion option specified" +msgstr "podanih je več izbir -i" + +#: src/numfmt.c:1471 +#, fuzzy, c-format +msgid "grouping cannot be combined with --to" +msgstr "datotečnih operandov ni mogoče kombinirati z izbiro --files0-from." + +#: src/numfmt.c:1473 +#, c-format +msgid "grouping has no effect in this locale" +msgstr "" + +#: src/numfmt.c:1486 +#, c-format +msgid "--header ignored with command-line input" +msgstr "" + +#: src/numfmt.c:1511 +#, fuzzy, c-format +msgid "error reading input" +msgstr "napaka pri branju %s" + +#: src/numfmt.c:1520 +#, fuzzy, c-format +msgid "failed to convert some of the input numbers" +msgstr "onemogočenje standardnega izhoda ni uspelo" + #: src/od.c:294 #, c-format msgid "" @@ -6792,27 +7173,46 @@ msgstr "" "\n" #: src/od.c:307 -msgid "All arguments to long options are mandatory for short options.\n" -msgstr "Vsi argumenti pri dolgi obliki izbire so obvezni tudi pri kratki.\n" +#, fuzzy +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" +"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" +"at first byte printed, incremented when dump is progressing.\n" +"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" +"izpisanega bajta in se prišteje odmiku pri izpisu. Pri ODMIKU in OZNAKI\n" +"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:310 +#: src/od.c:318 +#, fuzzy msgid "" -" -A, --address-radix=RADIX decide how file offsets are printed\n" +" -A, --address-radix=RADIX output format for file offsets. RADIX is one\n" +" of [doxn], for Decimal, Octal, Hex or None\n" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" " -A, --address-radix=OSNOVA OSNOVA pri izpisu odmikov v datoteki (doxn)\n" " -j, --skip-bytes=ŠTEVILO pri vsaki datoteki preskočimo prvih ŠTEVILO " "bajtov\n" -#: src/od.c:314 +#: src/od.c:323 +#, 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" -" --traditional accept arguments in traditional form\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" @@ -6823,9 +7223,11 @@ msgstr "" " -w, --width[=ŠTEVILO] v vsaki vrstici izpiši ŠTEVILO bajtov\n" " --traditional sprejemi argumente v tradicionalni obliki\n" -#: src/od.c:324 +#: src/od.c:336 +#, fuzzy 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" @@ -6839,7 +7241,7 @@ msgstr "" " -c isto kot -t c, ASCII; neizpisljive znake uvedi z obratno poševnico\n" " -d isto kot -t u2, desetiški izpis dvobajtnih nepredznačenih enot\n" -#: src/od.c:332 +#: src/od.c:345 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -6856,29 +7258,12 @@ 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:340 +#: src/od.c:353 +#, fuzzy msgid "" "\n" -"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" -"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" -"at first byte printed, incremented when dump is progressing.\n" -"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" -"izpisanega bajta in se prišteje odmiku pri izpisu. Pri ODMIKU in OZNAKI\n" -"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:349 -msgid "" "\n" "TYPE is made up of one or more of these specifications:\n" -"\n" " a named character, ignoring high-order bit\n" " c ASCII character or backslash escape\n" msgstr "" @@ -6888,7 +7273,7 @@ msgstr "" " a poimenovani znaki\n" " c znaki ASCII; neizpisljivi znaki uvedeni z obratno poševnico\n" -#: src/od.c:356 +#: src/od.c:360 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -6902,10 +7287,11 @@ 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:363 +#: src/od.c:367 +#, fuzzy msgid "" "\n" -"SIZE is a number. For TYPE in doux, SIZE may also be C for\n" +"SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" "sizeof(char), S for sizeof(short), I for sizeof(int) or L for\n" "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" @@ -6916,44 +7302,37 @@ 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:370 +#: src/od.c:374 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" -"OSNOVA je lahko d (desetiška), o (osmiška), x (šestnajstiška) ali n " -"(nobena).\n" -"Če ima ŠTEVILO predpono 0x ali 0X, se tolmači kot šestnajstiška vrednost.\n" -"Množiteljske pripone: b pomeni množenje s 512, kB 1000, K 1024, MB " -"1000×1000,\n" -"M 1024×1024, GB 1000×1000×1000, G 1024×1024×1024 itn. za T, P, E, Z in Y.\n" -"Pripona z pri kateremkoli tipu doda prikaz izpisljivih znakov na koncu " -"vsake\n" -"vrstice.\n" +"Adding a z suffix to any type displays printable characters at the end of\n" +"each output line.\n" +msgstr "" -#: src/od.c:380 +#: src/od.c:379 +#, 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" +"\n" +"\n" +"BYTES is hex with 0x or 0X prefix, and may have a multiplier suffix:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"and so on for G, T, P, E, Z, Y.\n" msgstr "" -"Izbira --string brez argumenta privzame vrednost 3. Izbira --width brez\n" -"argumenta privzame vrednost 32. Privzete vrednosti, ki jih uporablja »od«,\n" -"so: -A o -t oS -w 16.\n" +"\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" -#: src/od.c:633 src/od.c:753 +#: src/od.c:639 src/od.c:759 #, c-format msgid "invalid type string %s" msgstr "neveljavna oznaka tipa %s" -#: src/od.c:643 +#: src/od.c:649 #, c-format msgid "" "invalid type string %s;\n" @@ -6962,7 +7341,7 @@ msgstr "" "neveljavna oznaka tip %s;\n" "ta sistem ne omogoča %lu-bajtnega celoštevilčnega tipa" -#: src/od.c:764 +#: src/od.c:770 #, c-format msgid "" "invalid type string %s;\n" @@ -6971,36 +7350,36 @@ msgstr "" "neveljavna oznaka tip %s;\n" "ta sistem ne omogoča %lu-bajtnega zapisa v plavajoči vejici" -#: src/od.c:822 +#: src/od.c:828 #, c-format msgid "invalid character '%c' in type string %s" msgstr "neveljavni znak %c v oznaki tipa %s" -#: src/od.c:1047 +#: src/od.c:1053 #, c-format msgid "cannot skip past end of combined input" msgstr "ni mogoče prek konca kombiniranega vhoda" -#: src/od.c:1603 +#: src/od.c:1609 #, 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:1729 +#: src/od.c:1735 #, 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:1804 +#: src/od.c:1810 msgid "compatibility mode supports at most one file" msgstr "združljivostni način podpira največ eno datoteko" -#: src/od.c:1825 +#: src/od.c:1831 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "vsota preskočenih in prebranih bajtov je prevelika" -#: src/od.c:1868 +#: src/od.c:1874 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "opozorilo: neveljavna širina %lu; namesto nje jemljemo %d" @@ -7016,11 +7395,11 @@ 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" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" "Vsaki od vrstic iz prve DATOTEKE s tabulatorjem na konec pridružimo " "istoležno\n" @@ -7028,7 +7407,7 @@ msgstr "" "DATOTEKA ni podana ali je enaka -, beremo s standardnega vhoda.\n" "\n" -#: src/paste.c:448 +#: 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" @@ -7036,7 +7415,7 @@ msgstr "" " -d, --delimiters=SEZNAM za ločitev uporabimo znake s SEZNAMA namesto TAB\n" " -s, --serial datoteke združujemo zaporedno namesto vzporedno\n" -#: src/paste.c:509 +#: src/paste.c:508 #, c-format msgid "delimiter list ends with an unescaped backslash: %s" msgstr "seznam razmejilnikov se konča z nezavarovano obratno poševnico: %s" @@ -7096,80 +7475,80 @@ msgid "Kaveh Ghazi" msgstr "Kaveh Ghazi" #. TRANSLATORS: Real name is unknown; at most 19 characters. -#: src/pinky.c:250 +#: src/pinky.c:242 msgid " ???" msgstr " ???" #. TRANSLATORS: Idle time is unknown; at most 5 characters. -#: src/pinky.c:274 +#: src/pinky.c:266 msgid "?????" msgstr "?????" -#: src/pinky.c:323 +#: src/pinky.c:314 #, c-format msgid "Login name: " msgstr "Uporabniško ime: " -#: src/pinky.c:326 +#: src/pinky.c:317 #, c-format msgid "In real life: " msgstr "Pravo ime: " #. TRANSLATORS: Real name is unknown; no hard limit. -#: src/pinky.c:330 +#: src/pinky.c:321 msgid "???\n" msgstr "???\n" -#: src/pinky.c:350 +#: src/pinky.c:341 #, c-format msgid "Directory: " msgstr "Imenik: " -#: src/pinky.c:352 +#: src/pinky.c:343 #, c-format msgid "Shell: " msgstr "Ukazna lupina: " -#: src/pinky.c:371 +#: src/pinky.c:362 #, c-format msgid "Project: " msgstr "Projekt: " -#: src/pinky.c:395 +#: src/pinky.c:386 #, c-format msgid "Plan:\n" msgstr "Načrt:\n" -#: src/pinky.c:414 +#: src/pinky.c:405 msgid "Login" msgstr "Login" -#: src/pinky.c:416 +#: src/pinky.c:407 msgid "Name" msgstr " Ime" -#: src/pinky.c:417 +#: src/pinky.c:408 msgid " TTY" msgstr " TTY" -#: src/pinky.c:419 +#: src/pinky.c:410 msgid "Idle" msgstr "Neak" -#: src/pinky.c:420 +#: src/pinky.c:411 msgid "When" msgstr "Kdaj" -#: src/pinky.c:423 +#: src/pinky.c:414 msgid "Where" msgstr "Kje" -#: src/pinky.c:502 +#: src/pinky.c:493 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Uporaba: %s [IZBIRA]... [UPORABNIK]...\n" -#: src/pinky.c:503 +#: src/pinky.c:494 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7185,7 +7564,7 @@ msgstr "" " -p v dolgi obliki izpusti uporabnikovo datoteko .plan\n" " -s kratka oblika izpisa (privzeto)\n" -#: src/pinky.c:511 +#: src/pinky.c:502 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7201,7 +7580,7 @@ msgstr "" "računalnika\n" " in čas neaktivnosti\n" -#: src/pinky.c:520 +#: src/pinky.c:511 #, c-format msgid "" "\n" @@ -7212,7 +7591,7 @@ msgstr "" "Poenostavljeni program »finger«: izpis informacij o uporbnikih.\n" "Datoteka UTMP bo %s.\n" -#: src/pinky.c:604 +#: src/pinky.c:595 #, 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" @@ -7227,85 +7606,84 @@ msgstr "Pete TerMaat" msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:912 +#: src/pr.c:908 #, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "»--pages=PRVA_STRAN[:ZADNJA_STRAN]«: manjkajoči argument" -#: src/pr.c:914 +#: src/pr.c:910 #, c-format msgid "invalid page range %s" msgstr "neveljavni razpon strani %s" -#: src/pr.c:979 +#: src/pr.c:975 #, c-format msgid "'-l PAGE_LENGTH' invalid number of lines: %s" msgstr "»-l DOLŽINA_STRANI« nedovoljeno število vrstic: %s" -#: src/pr.c:1003 +#: src/pr.c:999 #, c-format msgid "'-N NUMBER' invalid starting line number: %s" msgstr "»-N ŠTEVILKA« nedovoljena številka začetne vrstice: %s" -#: src/pr.c:1015 +#: src/pr.c:1011 #, c-format msgid "'-o MARGIN' invalid line offset: %s" msgstr "»-o ROB« nedovoljeni odmik od levega roba: %s" -#: src/pr.c:1056 +#: src/pr.c:1052 #, c-format msgid "'-w PAGE_WIDTH' invalid number of characters: %s" msgstr "»-w ŠIRINA_STRANI« neveljavno število znakov: %s" -#: src/pr.c:1070 +#: src/pr.c:1066 #, c-format msgid "'-W PAGE_WIDTH' invalid number of characters: %s" msgstr "»-W ŠIRINA_STRANI« neveljavno število znakov: %s" -#: src/pr.c:1100 +#: src/pr.c:1096 #, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "pri vzporednem izpisu ni mogoče določiti števila stolpcev" -#: src/pr.c:1104 +#: src/pr.c:1100 #, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "možnosti izpisa počez in vzporednega izpisa se izključujeta" -#: src/pr.c:1200 +#: src/pr.c:1196 #, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "»-%c« dodatni znaki ali neveljavno število v argumentu: %s" -#: src/pr.c:1304 +#: src/pr.c:1293 #, c-format msgid "page width too narrow" msgstr "širina strani premajhna" -#: src/pr.c:2369 +#: src/pr.c:2353 #, c-format msgid "starting page number %<PRIuMAX> exceeds page count %<PRIuMAX>" msgstr "začetna stran %<PRIuMAX> presega skupno število strani %<PRIuMAX>" -#: src/pr.c:2396 +#: src/pr.c:2380 #, c-format msgid "page number overflow" msgstr "prekoračitev števila strani" -#: src/pr.c:2401 +#: src/pr.c:2385 #, c-format msgid "Page %<PRIuMAX>" msgstr "Stran %<PRIuMAX>" -#: src/pr.c:2773 -msgid "" -"Paginate or columnate FILE(s) for printing.\n" -"\n" +#: 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:2780 +#: src/pr.c:2763 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -7323,7 +7701,7 @@ msgstr "" "strani\n" " je uravnoteženo.\n" -#: src/pr.c:2788 +#: src/pr.c:2771 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7340,7 +7718,7 @@ msgstr "" " -d, --double-space\n" " izpis z dvojnim razmakom\n" -#: src/pr.c:2796 +#: src/pr.c:2779 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7361,7 +7739,7 @@ msgstr "" " praznimi vrsticami (s 3-vrstičnim zglavjem z izbiro -F\n" " ali 5-vrstičnim zglavjem in znožjem brez -F)\n" -#: src/pr.c:2806 +#: src/pr.c:2789 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -7383,7 +7761,7 @@ msgstr "" " -J, --join-lines združujemo cele vrstice, brez rezanja vrstic z -W, brez\n" " poravnave stolpcev, --sep-string[=NIZ] nastavi ločila\n" -#: src/pr.c:2815 +#: src/pr.c:2798 msgid "" " -l, --length=PAGE_LENGTH\n" " set the page length to PAGE_LENGTH (66) lines\n" @@ -7399,7 +7777,7 @@ msgstr "" " vrstice porežemo, razen z izbiro -J, kjer združimo " "celotne\n" -#: src/pr.c:2822 +#: src/pr.c:2805 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -7419,7 +7797,7 @@ msgstr "" "na\n" " prvi natisnjeni strani (glej +PRVA_STRAN)\n" -#: src/pr.c:2830 +#: src/pr.c:2813 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -7434,7 +7812,7 @@ msgstr "" " -r, --no-file-warnings\n" " brez opozoril, kadar ni mogoče odpreti datoteke\n" -#: src/pr.c:2837 +#: src/pr.c:2820 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -7450,7 +7828,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:2844 +#: src/pr.c:2827 msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" @@ -7465,7 +7843,7 @@ msgstr "" " isto kot -S\" \"), brez učinka na nastavitve stolpcev\n" " -t, --omit-header brez zglavja in repa\n" -#: src/pr.c:2851 +#: src/pr.c:2834 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -7489,7 +7867,7 @@ msgstr "" "72);\n" " samo besedilo v več stolpcih; -s[znak] izklopi\n" -#: src/pr.c:2861 +#: src/pr.c:2844 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -7504,7 +7882,7 @@ msgstr "" "na\n" " izbiri -s in -S\n" -#: src/pr.c:2869 +#: src/pr.c:2852 msgid "" "\n" "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" @@ -7643,7 +8021,7 @@ msgstr "opozorilo: odvečni argumenti začenši s %s niso bili upoštevani" #. This is a proper name. See the gettext manual, section Names. #: src/ptx.c:42 msgid "F. Pinard" -msgstr "F. Pinard" +msgstr "François Pinard" #: src/ptx.c:419 #, c-format @@ -7660,15 +8038,15 @@ msgstr "" " ali: %s -G [IZBIRA]... [VHOD [IZHOD]]\n" #: src/ptx.c:1821 +#, fuzzy msgid "" "Output a permuted index, including context, of the words in the input " "files.\n" -"\n" msgstr "" "Izpis permutiranega kazala gesel v vhodnih datotekah, skupaj s kontekstom.\n" "\n" -#: src/ptx.c:1828 +#: src/ptx.c:1827 msgid "" " -A, --auto-reference output automatically generated references\n" " -G, --traditional behave more like System V 'ptx'\n" @@ -7679,7 +8057,7 @@ msgstr "" " -F, --flag-truncation=NIZ za označevanje okrajšanih vrstic uporabi " "NIZ\n" -#: src/ptx.c:1833 +#: src/ptx.c:1832 msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" " -O, --format=roff generate output as roff directives\n" @@ -7694,7 +8072,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:1840 +#: src/ptx.c:1839 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -7714,7 +8092,7 @@ msgstr "" " -o, --only-file=FILE preberi le seznam besed iz navedene " "DATOTEKE\n" -#: src/ptx.c:1848 +#: src/ptx.c:1847 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -7725,7 +8103,7 @@ msgstr "" " -t, --typeset-mode - ni izvedeno -\n" " -w, --width=ŠTEVILO širina izhoda v znakih, brez sklicev\n" -#: src/ptx.c:1855 +#: src/ptx.c:1854 msgid "" "\n" "With no FILE or if FILE is -, read Standard Input. '-F /' by default.\n" @@ -7734,7 +8112,7 @@ msgstr "" "Kadar DATOTEKA ni podana ali je enaka -, se bere standardni vhod. Privzeto\n" "označevanje okrajšanih vrstic je »-F /«.\n" -#: src/ptx.c:1949 +#: src/ptx.c:1948 #, c-format msgid "invalid gap width: %s" msgstr "neveljavna širina razmaka: %s" @@ -7762,7 +8140,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "menjava imenika v %s ni uspela" -#: src/pwd.c:170 src/pwd.c:277 +#: src/pwd.c:170 src/pwd.c:277 src/split.c:373 #, c-format msgid "failed to stat %s" msgstr "branje statistike %s ni uspelo" @@ -7778,15 +8156,15 @@ msgid "ignoring non-option arguments" msgstr "ne-izbirnih argumentov ne upoštevamo" #. This is a proper name. See the gettext manual, section Names. -#: src/readlink.c:33 +#: src/readlink.c:32 msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -# ! INEXACT -#: src/readlink.c:62 +#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147 +#: src/stat.c:1349 src/touch.c:212 #, c-format -msgid "Usage: %s [OPTION]... FILE\n" -msgstr "Uporaba: %s [IZBIRA]... DATOTEKA\n" +msgid "Usage: %s [OPTION]... FILE...\n" +msgstr "Uporaba: %s [IZBIRA]... DATOTEKA...\n" #: src/readlink.c:63 msgid "" @@ -7820,16 +8198,19 @@ msgstr "" " komponente poti morajo obstajati\n" #: src/readlink.c:75 +#, fuzzy msgid "" " -m, --canonicalize-missing canonicalize by following every symlink in\n" " every component of the given name " "recursively,\n" " without requirements on components " "existence\n" -" -n, --no-newline do not output the trailing newline\n" +" -n, --no-newline do not output the trailing delimiter\n" " -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" msgstr "" " -m, --canonicalize-missing kanoniziran izpis vsake komponente vsake " "simbolne\n" @@ -7841,11 +8222,10 @@ msgstr "" " -s, --silent brez izpisa večine poročil o napakah\n" " -v, --verbose z poročili o napakah\n" -#: src/realpath.c:71 src/rm.c:134 src/shred.c:147 src/stat.c:1330 -#: src/touch.c:215 -#, c-format -msgid "Usage: %s [OPTION]... FILE...\n" -msgstr "Uporaba: %s [IZBIRA]... DATOTEKA...\n" +#: src/readlink.c:152 +#, fuzzy, c-format +msgid "ignoring --no-newline with multiple arguments" +msgstr "ne-izbirnih argumentov ne upoštevamo" #: src/realpath.c:72 msgid "" @@ -7887,13 +8267,13 @@ msgstr "" msgid "generating relative path" msgstr "ustvarjamo relativno pot" -#: src/remove.c:286 +#: src/remove.c:273 #, c-format msgid "%s: descend into write-protected directory %s? " msgstr "%s: naj se spustimo v imenik %s, ki je zavarovan proti pisanju? " # POZOR!!! Razisci, kaj je misljeno! -#: src/remove.c:287 +#: src/remove.c:274 #, c-format msgid "%s: descend into directory %s? " msgstr "%s: naj se spustimo v podimenik %s? " @@ -7902,37 +8282,37 @@ msgstr "%s: naj se spustimo v podimenik %s? " #. translate "%s: remove %s (write-protected) %s? " #. instead. It should avoid grammatical problems #. with the output of file_type. -#: src/remove.c:303 +#: src/remove.c:290 #, c-format msgid "%s: remove write-protected %s %s? " msgstr "%s: naj se odstrani %s %s, ki je zavarovana proti pisanju? " -#: src/remove.c:304 +#: src/remove.c:291 #, c-format msgid "%s: remove %s %s? " msgstr "%s: naj se odstrani %s %s? " -#: src/remove.c:417 +#: src/remove.c:374 #, c-format msgid "removed directory: %s\n" msgstr "odstranjen imenik: %s\n" -#: src/remove.c:481 +#: src/remove.c:444 #, c-format msgid "cannot remove directory: %s" msgstr "imenika ni mogoče odstraniti: %s" -#: src/remove.c:537 +#: src/remove.c:500 #, c-format msgid "skipping %s, since it's on a different device" msgstr "preskakujemo %s, ker je na drugi napravi" -#: src/remove.c:557 +#: src/remove.c:520 #, c-format msgid "traversal failed: %s" msgstr "prečenje ni uspelo: %s" -#: src/remove.c:563 +#: src/remove.c:526 #, c-format msgid "" "unexpected failure: fts_info=%d: %s\n" @@ -7941,12 +8321,12 @@ msgstr "" "nepričakovan neuspeh: fts_info=%d: %s\n" "prosimo, javite na %s" -#: src/rm.c:118 +#: src/rm.c:119 #, c-format msgid "Try '%s ./%s' to remove the file %s.\n" msgstr "Poskusite »%s ./%s«, da bi odstranili datoteko %s.\n" -#: src/rm.c:135 +#: src/rm.c:136 msgid "" "Remove (unlink) the FILE(s).\n" "\n" @@ -7960,7 +8340,7 @@ msgstr "" " brez zahteve po potrditvi pred vsakim brisanjem\n" " -i zahtevamo potrditev pred vsakim brisanjem\n" -#: src/rm.c:141 +#: src/rm.c:142 msgid "" " -I prompt once before removing more than three files, " "or\n" @@ -7980,7 +8360,7 @@ msgstr "" " (enkrat, isto kot -I), always (vedno, isto kot -i,\n" " privzeto)\n" -#: src/rm.c:148 +#: src/rm.c:149 msgid "" " --one-file-system when removing a hierarchy recursively, skip any\n" " directory that is on a file system different from\n" @@ -7991,20 +8371,22 @@ msgstr "" "tistega,\n" " ki pripada argumentu ukazne vrstice\n" -#: src/rm.c:153 +#: src/rm.c:154 msgid "" " --no-preserve-root do not treat '/' specially\n" " --preserve-root do not remove '/' (default)\n" " -r, -R, --recursive remove directories and their contents recursively\n" +" -d, --dir remove empty directories\n" " -v, --verbose explain what is being done\n" msgstr "" -" --no-preserve-root imenika »/« ne obravnavamo posebej (privzeto)\n" -" --preserve-root ne dovoli rekurzivnega dela na »/«\n" -" -r, -R, --recursive rekurzivno brisanje vsebine imenika s podimeniki " +" --no-preserve-root imenika »/« ne obravnavamo kot izjeme \n" +" --preserve-root ne odstrani »/« (privzeto)\n" +" -r, -R, --recursive rekurzivno brisanje vsebine imenikov s podimeniki " "vred\n" +" -d, --dir odstrani prazne imenike\n" " -v, --verbose z razlago poteka\n" -#: src/rm.c:161 +#: src/rm.c:163 msgid "" "\n" "By default, rm does not remove directories. Use the --recursive (-r or -R)\n" @@ -8015,7 +8397,7 @@ msgstr "" "Privzeto ukaz »rm« ne odstrani imenikov. Z izbiro --recursive (-r ali -R)\n" "pa odstrani tudi vse navedene imenike z njihovo vsebino vred.\n" -#: src/rm.c:166 +#: src/rm.c:168 #, c-format msgid "" "\n" @@ -8033,7 +8415,7 @@ msgstr "" "\n" " %s ./-bla\n" -#: src/rm.c:175 +#: src/rm.c:177 msgid "" "\n" "Note that if you use rm to remove a file, it might be possible to recover\n" @@ -8045,12 +8427,12 @@ msgstr "" "mogoče rekonstruirati. Če bi bili radi bolj gotovi, da je vsebina zares\n" "nepovratno izbrisana, razmislite o uporabi ukaza shred.\n" -#: src/rm.c:335 +#: src/rm.c:342 #, c-format msgid "%s: remove all arguments recursively? " msgstr "%s: naj vse argumente rekurzivno odstranimo? " -#: src/rm.c:336 +#: src/rm.c:343 #, c-format msgid "%s: remove all arguments? " msgstr "%s: naj se odstranijo vsi argumenti? " @@ -8110,7 +8492,11 @@ msgstr "" msgid "" "Run a program in a different security context.\n" "With neither CONTEXT nor COMMAND, print the current security context.\n" -"\n" +msgstr "" + +#: src/runcon.c:94 +#, fuzzy +msgid "" " CONTEXT Complete security context\n" " -c, --compute compute process transition context before modifying\n" " -t, --type=TYPE type (for same role as parent)\n" @@ -8129,72 +8515,72 @@ msgstr "" " -r, --role=VLOGA vloga\n" " -l, --range=OBSEG obseg ravni\n" -#: src/runcon.c:140 +#: src/runcon.c:144 #, c-format msgid "multiple roles" msgstr "več vlog" -#: src/runcon.c:145 +#: src/runcon.c:149 #, c-format msgid "multiple types" msgstr "več tipov" -#: src/runcon.c:150 +#: src/runcon.c:154 #, c-format msgid "multiple users" msgstr "več uporabnikov" -#: src/runcon.c:155 +#: src/runcon.c:159 #, c-format msgid "multiple levelranges" msgstr "več obsegov" -#: src/runcon.c:173 src/runcon.c:209 +#: src/runcon.c:177 src/runcon.c:213 #, c-format msgid "failed to get current context" msgstr "branje trenutnega konteksta ni uspelo" -#: src/runcon.c:183 +#: src/runcon.c:187 #, c-format msgid "you must specify -c, -t, -u, -l, -r, or context" msgstr "podati morate -c, -t, -u, -l, -r ali kontekst" -#: src/runcon.c:191 +#: src/runcon.c:195 #, c-format msgid "no command specified" msgstr "ukaz ni določen" -#: src/runcon.c:197 +#: src/runcon.c:201 #, c-format msgid "%s may be used only on a SELinux kernel" msgstr "%s lahko uporabite le z jedrom SELinux" -#: src/runcon.c:223 +#: src/runcon.c:227 #, c-format msgid "failed to compute a new context" msgstr "izračun novega konteksta ni uspel" -#: src/runcon.c:237 +#: src/runcon.c:241 #, c-format msgid "failed to set new user %s" msgstr "nastavitev novega uporabnika %s ni uspela" -#: src/runcon.c:239 +#: src/runcon.c:243 #, c-format msgid "failed to set new type %s" msgstr "nastavitev novega tipa %s ni uspela" -#: src/runcon.c:241 +#: src/runcon.c:245 #, c-format msgid "failed to set new range %s" msgstr "nastavitev novega obsega %s ni uspela" -#: src/runcon.c:243 +#: src/runcon.c:247 #, c-format msgid "failed to set new role %s" msgstr "nastavitev nove vloge %s ni uspela" -#: src/runcon.c:251 +#: src/runcon.c:255 #, c-format msgid "unable to set security context %s" msgstr "varnostnega konteksta %s ni mogoče nastaviti" @@ -8211,9 +8597,12 @@ msgstr "" " ali: %s [IZBIRA]... PRVO KORAK ZADNJE\n" #: src/seq.c:73 +msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" +msgstr "" + +#: src/seq.c:79 +#, fuzzy msgid "" -"Print numbers from FIRST to LAST, in steps of INCREMENT.\n" -"\n" " -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" @@ -8226,7 +8615,7 @@ msgstr "" " -w, --equal-width polja dopolni do enake širine z vodilnimi " "ničlami\n" -#: src/seq.c:82 +#: src/seq.c:86 msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" @@ -8242,7 +8631,7 @@ msgstr "" "števila s plavajočo vejico. KORAK je navadno pozitiven, če je PRVO\n" "število manjše od ZADNJEGA, sicer pa negativen.\n" -#: src/seq.c:90 +#: src/seq.c:94 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" @@ -8253,32 +8642,17 @@ msgstr "" "števila\n" "predstavljena v fiksni natančnosti PREC, sicer pa %g.\n" -#: src/seq.c:136 +#: src/seq.c:140 #, c-format msgid "invalid floating point argument: %s" msgstr "argument ni neveljavno število v plavajoči vejici: %s" -#: src/seq.c:193 -#, c-format -msgid "format %s has no %% directive" -msgstr "določilo %s ne vsebuje direktive %%" - -#: src/seq.c:210 -#, c-format -msgid "format %s ends in %%" -msgstr "določilo %s se zaključi z %%" - -#: src/seq.c:213 +#: src/seq.c:232 #, c-format msgid "format %s has unknown %%%c directive" msgstr "določilo %s vsebuje neznano direktivo %%%c" -#: src/seq.c:217 -#, c-format -msgid "format %s has too many %% directives" -msgstr "določilo %s vsebuje preveč direktiv %%" - -#: src/seq.c:431 +#: src/seq.c:555 #, 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" @@ -8318,27 +8692,27 @@ 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:163 +#: src/setuidgid.c:162 #, c-format msgid "unknown user-ID: %s" msgstr "neznana številka uporabnika (UID): %s" -#: src/setuidgid.c:174 +#: 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:191 +#: src/setuidgid.c:190 #, c-format msgid "failed to set supplemental group(s)" msgstr "dodatne skupine ni mogoče nastaviti" -#: src/setuidgid.c:201 +#: src/setuidgid.c:200 #, c-format msgid "cannot set group-ID to %lu" msgstr "nastavitev GID na %lu ni mogoča" -#: src/setuidgid.c:205 +#: src/setuidgid.c:204 #, c-format msgid "cannot set user-ID to %lu" msgstr "nastavitev UID na %lu ni mogoča" @@ -8349,16 +8723,16 @@ msgid "Colin Plumb" msgstr "Colin Plumb" #: src/shred.c:148 +#, 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" -"\n" msgstr "" "Vsebino navedene DATOTEKE uničimo tako, da prek nje večkrat zapišemo\n" "drugo vsebino.\n" "\n" -#: src/shred.c:156 +#: src/shred.c:155 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -8372,7 +8746,7 @@ msgstr "" " -s, --size=N uničimo podano število bajtov (dovoljene pripone K, M, " "G...)\n" -#: src/shred.c:162 +#: src/shred.c:161 msgid "" " -u, --remove truncate and remove file after overwriting\n" " -v, --verbose show progress\n" @@ -8387,7 +8761,7 @@ msgstr "" " -z, --zero na koncu zapiši prek datoteke ničle, da se prikrije " "uničenje\n" -#: src/shred.c:171 +#: src/shred.c:170 msgid "" "\n" "If FILE is -, shred standard output.\n" @@ -8408,7 +8782,7 @@ msgstr "" "z navadnimi datotekami večina uporablja izbiro --remove.\n" "\n" -#: src/shred.c:181 +#: src/shred.c:180 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" @@ -8428,7 +8802,7 @@ msgstr "" "datotečnega sistema:\n" "\n" -#: src/shred.c:189 +#: src/shred.c:188 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -8450,7 +8824,7 @@ msgstr "" " strežnik NFS podjetja Network Appliace\n" "\n" -#: src/shred.c:199 +#: src/shred.c:198 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -8464,7 +8838,7 @@ msgstr "" "* stisnjeni datotečni sistemi\n" "\n" -#: src/shred.c:206 +#: src/shred.c:205 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" @@ -8488,7 +8862,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:216 +#: src/shred.c:215 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" @@ -8498,122 +8872,122 @@ msgstr "" "in oddaljenih zrcalih. Teh izvodov ne moremo odstraniti in iz njih je\n" "mogoče rekonstruirati uničeno datoteko.\n" -#: src/shred.c:296 +#: src/shred.c:295 #, c-format msgid "%s: fdatasync failed" msgstr "%s: klic fdatasync ni uspel" -#: src/shred.c:307 +#: src/shred.c:306 #, c-format msgid "%s: fsync failed" msgstr "%s: fsync ni uspel" -#: src/shred.c:384 +#: src/shred.c:383 #, c-format msgid "%s: cannot rewind" msgstr "%s: ni mogoče previti na začetek" -#: src/shred.c:403 +#: src/shred.c:402 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: prehod %lu/%lu (%s)..." -#: src/shred.c:453 +#: src/shred.c:452 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: napaka med pisanjem pri odmiku %s" -#: src/shred.c:471 +#: src/shred.c:470 #, c-format msgid "%s: lseek failed" msgstr "%s: klic lseek ni uspel" -#: src/shred.c:482 +#: src/shred.c:481 #, c-format msgid "%s: file too large" msgstr "%s: datoteka prevelika" -#: src/shred.c:505 +#: src/shred.c:504 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: prehod %lu/%lu (%s)...%s" -#: src/shred.c:521 +#: src/shred.c:520 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: prehod %lu/%lu (%s)...%s/%s %d%%" -#: src/shred.c:768 +#: src/shred.c:767 #, c-format msgid "%s: fstat failed" msgstr "%s: klic fstat ni uspel" -#: src/shred.c:779 +#: src/shred.c:778 #, c-format msgid "%s: invalid file type" msgstr "%s: neveljavni tip datoteke" -#: src/shred.c:798 +#: src/shred.c:797 #, c-format msgid "%s: file has negative size" msgstr "%s: velikost datoteke negativna" -#: src/shred.c:865 +#: src/shred.c:864 src/sort.c:932 src/split.c:378 #, c-format msgid "%s: error truncating" msgstr "%s: napaka pri krajšanju" -#: src/shred.c:881 +#: src/shred.c:880 #, c-format msgid "%s: fcntl failed" msgstr "%s: klic fcntl ni uspel" -#: src/shred.c:886 +#: src/shred.c:885 #, 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:968 +#: src/shred.c:967 #, c-format msgid "%s: removing" msgstr "%s: odstranjujemo" -#: src/shred.c:992 +#: src/shred.c:991 #, c-format msgid "%s: renamed to %s" msgstr "%s: preimenovano v %s" -#: src/shred.c:1014 +#: src/shred.c:1013 #, c-format msgid "%s: failed to remove" msgstr "%s: ni mogoče odstraniti" -#: src/shred.c:1018 +#: src/shred.c:1017 #, c-format msgid "%s: removed" msgstr "%s: odstranjeno" -#: src/shred.c:1025 src/shred.c:1068 +#: src/shred.c:1024 src/shred.c:1067 #, c-format msgid "%s: failed to close" msgstr "%s: ni mogoče zapreti" -#: src/shred.c:1061 +#: src/shred.c:1060 #, c-format msgid "%s: failed to open for writing" msgstr "%s: ni mogoče odpreti za pisanje" -#: src/shred.c:1126 +#: src/shred.c:1125 #, c-format msgid "%s: invalid number of passes" msgstr "%s: neveljavno število prehodov" -#: src/shred.c:1135 src/shuf.c:291 src/sort.c:4387 +#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441 #, c-format msgid "multiple random sources specified" msgstr "naveden je več kot en izvor naključnih števil" -#: src/shred.c:1149 +#: src/shred.c:1148 #, c-format msgid "%s: invalid file size" msgstr "%s: neveljavna velikost datoteke" @@ -8630,14 +9004,13 @@ msgstr "" " ali: %s -i SP-ZG [IZBIRA]...\n" #: src/shuf.c:54 -msgid "" -"Write a random permutation of the input lines to standard output.\n" -"\n" +#, fuzzy +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" -#: src/shuf.c:61 +#: src/shuf.c:60 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 " @@ -8657,27 +9030,27 @@ msgstr "" " -z, --zero-terminated zaključi vrstice z \\0, ne z znakom za novo " "vrstico\n" -#: src/shuf.c:245 +#: src/shuf.c:244 #, c-format msgid "multiple -i options specified" msgstr "podanih je več izbir -i" -#: src/shuf.c:265 +#: src/shuf.c:264 #, c-format msgid "invalid input range %s" msgstr "neveljavni vhodni razpon %s" -#: src/shuf.c:278 +#: src/shuf.c:277 #, c-format msgid "invalid line count %s" msgstr "neveljavno število vrstic %s" -#: src/shuf.c:285 src/sort.c:4381 +#: src/shuf.c:284 src/sort.c:4435 #, c-format msgid "multiple output files specified" msgstr "podana je več kot ena izhodna datoteka" -#: src/shuf.c:311 +#: src/shuf.c:310 #, c-format msgid "cannot combine -e and -i options" msgstr "izbir -e in -i ni mogoče kombinirati" @@ -8704,7 +9077,7 @@ msgstr "" "velja premor za vsoto njihovih vrednosti.\n" "\n" -#: src/sleep.c:135 src/timeout.c:295 +#: src/sleep.c:135 src/timeout.c:320 #, c-format msgid "invalid time interval %s" msgstr "neveljavni časovni interval %s" @@ -8714,16 +9087,15 @@ msgstr "neveljavni časovni interval %s" msgid "cannot read realtime clock" msgstr "ure s stvarnim časom ni moč prebrati" -#: src/sort.c:395 -msgid "" -"Write sorted concatenation of all FILE(s) to standard output.\n" -"\n" +#: src/sort.c:399 +#, fuzzy +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 " "izhod.\n" "\n" -#: src/sort.c:402 +#: src/sort.c:405 msgid "" "Ordering options:\n" "\n" @@ -8731,7 +9103,7 @@ msgstr "" "Izbire pri urejanju:\n" "\n" -#: src/sort.c:406 +#: src/sort.c:409 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -8742,7 +9114,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:412 +#: src/sort.c:415 msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" " -i, --ignore-nonprinting consider only printable characters\n" @@ -8752,13 +9124,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:417 +#: src/sort.c:420 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:420 +#: src/sort.c:423 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -8770,7 +9142,7 @@ msgstr "" " --random-source=DATOTEKA beri naključne bajte iz DATOTEKE\n" " -r, --reverse izpis v obrnjenem vrstnem redu\n" -#: src/sort.c:426 +#: src/sort.c:429 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -8784,7 +9156,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:434 +#: src/sort.c:437 msgid "" "Other options:\n" "\n" @@ -8792,7 +9164,7 @@ msgstr "" "Druge izbire:\n" "\n" -#: src/sort.c:438 +#: src/sort.c:441 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" @@ -8800,7 +9172,7 @@ msgstr "" " --batch-size=N združuj največ N vhodov naenkrat; pri večjem\n" " številu uporabi začasne datoteke\n" -#: src/sort.c:442 +#: src/sort.c:445 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 " @@ -8815,7 +9187,7 @@ msgstr "" " --compress-program=PROGRAM začasne datoteke stisni s PROGRAMOM; pri\n" " dekomprimiranju uporabi »PROGRAM -d«\n" -#: src/sort.c:449 +#: src/sort.c:452 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -8829,7 +9201,7 @@ msgstr "" " imena so zaključena z NUL; če je DATOTEKA »-« ,\n" " se bere standardni vhod\n" -#: src/sort.c:456 +#: src/sort.c:459 msgid "" " -k, --key=KEYDEF sort via a key; KEYDEF gives location and type\n" " -m, --merge merge already sorted files; do not sort\n" @@ -8838,7 +9210,7 @@ msgstr "" " -m, --merge že urejene datoteke združi brez ponovnega " "urejanja\n" -#: src/sort.c:460 +#: src/sort.c:463 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -8851,7 +9223,7 @@ msgstr "" " primerjav\n" " -S, --buffer-size=VELIKOST določi VELIKOST izravnalnika\n" -#: src/sort.c:466 +#: src/sort.c:469 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -8876,12 +9248,12 @@ msgstr "" " sicer izpiši samo prve od zaporednih enakih " "vrstic\n" -#: src/sort.c:475 +#: 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:480 +#: src/sort.c:483 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -8910,7 +9282,7 @@ msgstr "" "\n" "VELIKOSTI lahko sledi ena od naslednji multiplikativnih pripon:\n" -#: src/sort.c:493 +#: src/sort.c:496 msgid "" "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n" "\n" @@ -8930,133 +9302,133 @@ msgstr "" "obnašanje\n" "(urejanje po številski vrednosti bajtov), uporabite LC_ALL=C.\n" -#: src/sort.c:694 +#: src/sort.c:697 #, c-format msgid "waiting for %s [-d]" msgstr "čakamo na %s [-d]" -#: src/sort.c:699 +#: src/sort.c:702 #, c-format msgid "%s [-d] terminated abnormally" msgstr "%s [-d] se je zaključil nenormalno" -#: src/sort.c:853 +#: src/sort.c:856 #, c-format msgid "cannot create temporary file in %s" msgstr "začasne datoteke v %s ni mogoče ustvariti" -#: src/sort.c:939 src/sort.c:2010 src/sort.c:3056 src/sort.c:3755 -#: src/sort.c:3758 +#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713 +#: src/sort.c:3804 src/sort.c:3807 msgid "open failed" msgstr "odpiranje ni uspelo" -#: src/sort.c:959 +#: src/sort.c:970 msgid "fflush failed" msgstr "klic fflush ni uspel" -#: src/sort.c:964 src/sort.c:2013 src/sort.c:4646 +#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706 msgid "close failed" msgstr "zapiranje ni uspelo" -#: src/sort.c:973 +#: src/sort.c:986 #, c-format msgid "dup2 failed" msgstr "klic dup2 ni uspel" -#: src/sort.c:1090 +#: src/sort.c:1103 #, c-format msgid "couldn't execute %s" msgstr "ni mogoče izvesti %s" -#: src/sort.c:1097 +#: src/sort.c:1110 msgid "couldn't create temporary file" msgstr "začasne datoteke ni mogoče ustvariti" -#: src/sort.c:1136 +#: src/sort.c:1149 #, c-format msgid "couldn't create process for %s -d" msgstr "ni mogoče ustvariti procesa za %s -d" -#: src/sort.c:1150 +#: src/sort.c:1161 #, c-format msgid "couldn't execute %s -d" msgstr "ni mogoče izvesti %s -d" -#: src/sort.c:1209 +#: src/sort.c:1220 #, c-format msgid "warning: cannot remove: %s" msgstr "opozorilo: ni moč odstraniti %s" -#: src/sort.c:1295 +#: src/sort.c:1306 #, c-format msgid "invalid --%s argument %s" msgstr "neveljavni --%s argument %s" -#: src/sort.c:1298 +#: src/sort.c:1309 #, c-format msgid "minimum --%s argument is %s" msgstr "najmanjši --%s argument je %s" -#: src/sort.c:1313 +#: src/sort.c:1324 #, c-format msgid "--%s argument %s too large" msgstr "--%s argument %s je prevelik" -#: src/sort.c:1316 +#: src/sort.c:1327 #, 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:1398 +#: src/sort.c:1409 #, c-format msgid "number in parallel must be nonzero" msgstr "število vzporednih stolpcev mora biti večje od nič" -#: src/sort.c:1479 +#: src/sort.c:1494 msgid "stat failed" msgstr "poizvedba po statusu ni uspela" -#: src/sort.c:1740 +#: src/sort.c:1755 msgid "read failed" msgstr "branje ni uspelo" -#: src/sort.c:2028 +#: src/sort.c:2043 #, c-format msgid "string transformation failed" msgstr "pretvorba niza ni uspela" -#: src/sort.c:2031 +#: src/sort.c:2046 #, c-format msgid "the untransformed string was %s" msgstr "nepretvorjeni niz je bil %s" -#: src/sort.c:2194 +#: src/sort.c:2209 #, c-format msgid "^ no match for key\n" msgstr "^ brez ujemanja za ključ\n" -#: src/sort.c:2374 +#: src/sort.c:2389 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "uporabljen opuščen ključ »%s«; nadomestite ga z »%s«" -#: src/sort.c:2380 +#: src/sort.c:2395 #, 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:2391 +#: src/sort.c:2406 #, 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:2404 +#: src/sort.c:2419 #, 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:2436 +#: src/sort.c:2451 #, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" @@ -9065,134 +9437,138 @@ 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:2442 +#: src/sort.c:2457 #, 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:2716 src/sort.c:2725 +#: src/sort.c:2731 src/sort.c:2740 msgid "write failed" msgstr "pisanje ni uspelo" -#: src/sort.c:2768 +#: src/sort.c:2783 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: neurejenost: " -#: src/sort.c:2771 +#: src/sort.c:2786 msgid "standard error" msgstr "standardna napaka" -#: src/sort.c:3926 +#: src/sort.c:3698 +msgid "cannot read" +msgstr "branje ni mogoče" + +#: src/sort.c:3976 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: neveljavno določilo polja: %s" -#: src/sort.c:3937 +#: src/sort.c:3987 #, c-format msgid "options '-%s' are incompatible" msgstr "izbire »-%s« so nezdružljive" -#: src/sort.c:3988 +#: src/sort.c:4038 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s: neveljavni števec na začetku %s" -#: src/sort.c:4245 +#: src/sort.c:4295 msgid "invalid number after '-'" msgstr "neveljavno število za »-«" -#: src/sort.c:4248 src/sort.c:4334 src/sort.c:4362 +#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416 msgid "invalid number after '.'" msgstr "neveljavno število za ».«" -#: src/sort.c:4261 src/sort.c:4367 +#: src/sort.c:4315 src/sort.c:4421 msgid "stray character in field spec" msgstr "zablodeli znak v določilu polja" -#: src/sort.c:4308 +#: src/sort.c:4362 #, c-format msgid "multiple compress programs specified" msgstr "podan je več kot en program za stiskanje" -#: src/sort.c:4325 +#: src/sort.c:4379 msgid "invalid number at field start" msgstr "neveljavno število začetka polja" -#: src/sort.c:4329 src/sort.c:4357 +#: src/sort.c:4383 src/sort.c:4411 msgid "field number is zero" msgstr "številka polja je nič" -#: src/sort.c:4338 +#: src/sort.c:4392 msgid "character offset is zero" msgstr "znakovni zamik je nič" -#: src/sort.c:4353 +#: src/sort.c:4407 msgid "invalid number after ','" msgstr "neveljavno število za »,«" -#: src/sort.c:4403 +#: src/sort.c:4457 #, c-format msgid "empty tab" msgstr "prazen tabulator" # POZOR!!! Razisci, kaj program res tu pocne! # ! INEXACT -#: src/sort.c:4496 src/wc.c:692 +#: src/sort.c:4550 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:4518 +#: src/sort.c:4572 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s:%lu: neveljavno ime datoteke (dolžina nič)" -#: src/sort.c:4524 +#: src/sort.c:4578 #, c-format msgid "no input from %s" msgstr "ni vhoda iz %s" -#: src/sort.c:4570 +#: src/sort.c:4624 #, c-format msgid "using %s sorting rules" msgstr "z uporabo %s pravil za urejanje" -#: src/sort.c:4573 +#: src/sort.c:4627 #, c-format msgid "using simple byte comparison" msgstr "z uporabo preproste primerjave bajtov" -#: src/sort.c:4604 +#: src/sort.c:4658 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "dodatni operand %s pri izbiri -%c ni dovoljen" -#: src/split.c:184 +#: src/split.c:187 #, c-format msgid "the suffix length needs to be at least %zu" msgstr "dolžina pripone mora biti najmanj %zu" -#: src/split.c:201 +#: src/split.c:204 #, c-format msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" msgstr "Uporaba: %s [IZBIRA]... [VHOD [PREDPONA]]\n" -#: src/split.c:205 +#: src/split.c:208 +#, fuzzy 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" -"\n" 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:214 +#: src/split.c:216 #, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" @@ -9223,7 +9599,7 @@ msgstr "" " -n, --number=KOSOV ustvari KOSOV izhodnih datotek. Glejte nižje.\n" " -u, --unbuffered takoj prepiši vhod na izhod z »-n r/...«\n" -#: src/split.c:227 +#: src/split.c:229 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" @@ -9231,7 +9607,7 @@ msgstr "" " --verbose z izpisom diagnostike tik\n" " preden odpremo posamično datoteko\n" -#: src/split.c:234 +#: src/split.c:236 msgid "" "\n" "CHUNKS may be:\n" @@ -9252,185 +9628,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:352 +#: src/split.c:354 #, c-format msgid "output file suffixes exhausted" msgstr "pripone izhodnih datotek so izčrpane" -#: src/split.c:364 +#: src/split.c:366 #, c-format msgid "creating file %s\n" msgstr "ustvarjanje datoteke %s\n" -#: src/split.c:377 +#: src/split.c:375 +#, c-format +msgid "%s would overwrite input; aborting" +msgstr "%s bi pisal prek vhoda; prekinjamo" + +#: src/split.c:391 #, c-format msgid "failed to set FILE environment variable" msgstr "nastavitev spremenljivke FILE ni uspela" -#: src/split.c:379 +#: src/split.c:393 #, c-format msgid "executing with FILE=%s\n" msgstr "izvajamo s FILE=%s\n" -#: src/split.c:381 +#: src/split.c:395 #, c-format msgid "failed to create pipe" msgstr "ni mogoče ustvariti cevovoda" -#: src/split.c:395 +#: src/split.c:409 #, c-format msgid "closing prior pipe" msgstr "zapiramo prejšnji cevovod" -#: src/split.c:397 +#: src/split.c:411 #, c-format msgid "closing output pipe" msgstr "zapiramo izhodni cevovod" -#: src/split.c:401 +#: src/split.c:415 #, c-format msgid "moving input pipe" msgstr "prestavljamo vhodni cevovod" -#: src/split.c:403 +#: src/split.c:417 #, c-format msgid "closing input pipe" msgstr "zapiramo vhodni cevovod" -#: src/split.c:408 +#: src/split.c:422 #, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "ukaz ni bil uspešno izveden: \"%s -c %s\"" -#: src/split.c:414 +#: src/split.c:428 #, c-format msgid "failed to close input pipe" msgstr "zapiranje vhodnega cevovoda ni uspelo" -#: src/split.c:450 +#: src/split.c:464 #, c-format msgid "waiting for child process" msgstr "čakamo na nasledniški proces" -#: src/split.c:460 +#: src/split.c:474 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "pri FILE=%s prejeli signal %s od ukaza: %s" -#: src/split.c:468 +#: src/split.c:482 #, 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:475 src/timeout.c:449 +#: src/split.c:489 src/timeout.c:494 #, c-format msgid "unknown status from command (0x%X)" msgstr "neznani status ukaza (0x%X)" -#: src/split.c:1037 +#: src/split.c:1052 #, c-format msgid "cannot split in more than one way" msgstr "razcep na več kot en način ni mogoč" -#: src/split.c:1050 src/split.c:1192 src/split.c:1363 +#: src/split.c:1065 src/split.c:1205 src/split.c:1376 #, c-format msgid "%s: invalid number of chunks" msgstr "%s: neveljavno število kosov" -#: src/split.c:1054 +#: src/split.c:1069 #, c-format msgid "%s: invalid chunk number" msgstr "%s: neveljavno število kosa" -#: src/split.c:1106 +#: src/split.c:1119 #, c-format msgid "%s: invalid suffix length" msgstr "%s: neveljavno dolžina pripone" -#: src/split.c:1131 src/split.c:1139 src/split.c:1162 src/split.c:1167 +#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180 #, c-format msgid "%s: invalid number of bytes" msgstr "%s: neveljavno število bajtov" -#: src/split.c:1150 src/split.c:1297 +#: src/split.c:1163 src/split.c:1310 #, c-format msgid "%s: invalid number of lines" msgstr "%s: neveljavno število vrstic" -#: src/split.c:1223 +#: src/split.c:1236 #, c-format msgid "line count option -%s%c... is too large" msgstr "števec vrstic -%s%c... je prevelik" -#: src/split.c:1235 +#: src/split.c:1248 #, c-format msgid "%s: invalid start value for numerical suffix" msgstr "%s: neveljavna začetna vrednost za številčno pripono" -#: src/split.c:1263 +#: src/split.c:1276 #, c-format msgid "%s: invalid IO block size" msgstr "%s: neveljavna velikost V/I bloka" -#: src/split.c:1284 +#: src/split.c:1297 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "--filter ne obdeluje kosa, zapisanega na standardni izhod" -#: src/split.c:1321 +#: src/split.c:1334 #, 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:1356 +#: src/split.c:1369 #, 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:169 +#: src/stat.c:173 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:838 +#: src/stat.c:857 #, c-format msgid "failed to canonicalize %s" msgstr "kanoniziranje %s ni uspelo" -#: src/stat.c:1050 +#: src/stat.c:1069 #, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "opozorilo: neprepoznana izbira »\\%c«" -#: src/stat.c:1105 +#: src/stat.c:1124 #, c-format msgid "%s: invalid directive" msgstr "%s: neveljavna direktiva" -#: src/stat.c:1151 +#: src/stat.c:1170 #, c-format msgid "warning: backslash at end of format" msgstr "opozorilo: obratna poševnica na koncu formatnega določila" -#: src/stat.c:1182 +#: src/stat.c:1201 #, 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:1189 +#: src/stat.c:1208 #, c-format msgid "cannot read file system information for %s" msgstr "ni mogoče prebrati datotečnega sistema %s" -#: src/stat.c:1209 +#: src/stat.c:1228 #, 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:1245 +#: src/stat.c:1264 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -9446,7 +9827,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1268 +#: src/stat.c:1287 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -9456,30 +9837,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1278 +#: src/stat.c:1297 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:1286 +#: src/stat.c:1305 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:1295 +#: src/stat.c:1314 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:1305 +#: src/stat.c:1324 #, c-format msgid "Context: %C\n" msgstr "Kontekst: %C\n" -#: src/stat.c:1313 +#: src/stat.c:1332 msgid "" "Access: %x\n" "Modify: %y\n" @@ -9491,10 +9872,13 @@ msgstr "" "Spremem.: %z\n" " Rojstvo: %w\n" -#: src/stat.c:1331 +#: src/stat.c:1350 +msgid "Display file or file system status.\n" +msgstr "" + +#: src/stat.c:1356 +#, fuzzy msgid "" -"Display file or file system status.\n" -"\n" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" @@ -9504,7 +9888,7 @@ msgstr "" " -f, --file-system izpis statusa datotečnega sistema, ne statusa " "datoteke\n" -#: src/stat.c:1337 +#: src/stat.c:1360 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -9520,7 +9904,7 @@ msgstr "" " verstice; če jo želite, dodajte \\n v OBLIKO.\n" " -t, --terse izpis podatkov v zgoščeni obliki\n" -#: src/stat.c:1348 +#: src/stat.c:1371 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -9540,7 +9924,7 @@ msgstr "" " %B - velikost v bajtih za vsak blok, ki ga javi »%b«\n" " %C - niz z varnostnim kontekstom SELinux\n" -#: src/stat.c:1357 +#: src/stat.c:1380 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -9556,7 +9940,7 @@ msgstr "" " %g - številka skupine (GID) lastnika\n" " %G - ime skupine lastnika\n" -#: src/stat.c:1365 +#: src/stat.c:1388 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -9578,7 +9962,7 @@ msgstr "" " %t - glavna številka zvrsti enote, šestnajstiško\n" " %T - pomožna številka zvrsti enote, šestnajstiško\n" -#: src/stat.c:1376 +#: src/stat.c:1399 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -9604,7 +9988,7 @@ msgstr "" " %Z - čas zadnje spremembe inoda, v sekundah od 1970-01-01\n" "\n" -#: src/stat.c:1390 +#: src/stat.c:1413 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -9622,7 +10006,7 @@ msgstr "" " %d - število prostih inodov v datotečnem sistemu\n" " %f - število prostih blokov v datotečnem sistemu\n" -#: src/stat.c:1399 +#: src/stat.c:1422 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -9646,14 +10030,14 @@ 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" -"\n" msgstr "" "Izvedi UKAZ z modificiranimi izravnalnimi operacijami za standardne tokove.\n" "\n" -#: src/stdbuf.c:98 +#: src/stdbuf.c:97 msgid "" " -i, --input=MODE adjust standard input stream buffering\n" " -o, --output=MODE adjust standard output stream buffering\n" @@ -9663,7 +10047,7 @@ msgstr "" " -o, --output=NAČIN Prilagodi izravnavanje toka standardnega izhoda\n" " -e, --error=NAČIN Prilagodi izravnavanje toka standardnega izhoda napak\n" -#: src/stdbuf.c:105 +#: src/stdbuf.c:104 msgid "" "\n" "If MODE is 'L' the corresponding stream will be line buffered.\n" @@ -9673,7 +10057,7 @@ msgstr "" "Če je NAČIN enak »L«, se za tok uporablja izravnavanje na ravni vrstic.\n" "Na izbira ni veljavna, če je izbran standardni vhod.\n" -#: src/stdbuf.c:108 +#: src/stdbuf.c:107 msgid "" "\n" "If MODE is '0' the corresponding stream will be unbuffered.\n" @@ -9681,7 +10065,7 @@ msgstr "" "\n" "Če je NAČIN enak »0« (ničla), se za tok ne uporablja izravnavanje.\n" -#: src/stdbuf.c:111 +#: src/stdbuf.c:110 msgid "" "\n" "Otherwise MODE is a number which may be followed by one of the following:\n" @@ -9697,7 +10081,7 @@ msgstr "" "V tem primeru bo izbrani tok izravnavan, velikost izravnalnika pa NAČIN " "bajtov.\n" -#: src/stdbuf.c:117 +#: src/stdbuf.c:116 msgid "" "\n" "NOTE: If COMMAND adjusts the buffering of its standard streams ('tee' does\n" @@ -9715,22 +10099,22 @@ msgstr "" "vhod \n" "in izhod, zato nastavitve »stdbuf« nanje nimajo učinka.\n" -#: src/stdbuf.c:227 +#: src/stdbuf.c:226 #, c-format msgid "failed to find %s" msgstr "neuspelo iskanje %s" -#: src/stdbuf.c:247 src/stdbuf.c:279 +#: src/stdbuf.c:246 src/stdbuf.c:278 #, c-format msgid "failed to update the environment with %s" msgstr "posodobitev okolja z %s ni uspela" -#: src/stdbuf.c:321 +#: src/stdbuf.c:320 #, c-format msgid "line buffering stdin is meaningless" msgstr "vrstično izravnavanje standardnega vhoda ni smiselno" -#: src/stty.c:509 +#: src/stty.c:513 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -9741,10 +10125,13 @@ msgstr "" " ali: %s [-F ENOTA] [--file=ENOTA] [-a|-all]\n" " ali: %s [-F ENOTA] [--file=ENOTA] [-g|--save]\n" -#: src/stty.c:515 +#: src/stty.c:519 +msgid "Print or change terminal characteristics.\n" +msgstr "" + +#: src/stty.c:525 +#, fuzzy msgid "" -"Print or change terminal characteristics.\n" -"\n" " -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" @@ -9758,7 +10145,7 @@ msgstr "" " -F, --file=ENOTA odpri in uporabi navedeno ENOTO namesto standardnega " "vhoda\n" -#: src/stty.c:524 +#: src/stty.c:532 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -9769,7 +10156,7 @@ msgstr "" "označuje nastavitve, ki so razširitve standarda POSIX. Dejansko\n" "dostopne nastavitve so odvisne od sistema.\n" -#: src/stty.c:529 +#: src/stty.c:537 msgid "" "\n" "Special characters:\n" @@ -9784,7 +10171,7 @@ msgstr "" " eof ZNAK ZNAK bo zaključil datoteko (končal vhod)\n" " eol ZNAK ZNAK bo zaključil vrstico\n" -#: src/stty.c:536 +#: src/stty.c:544 msgid "" " * eol2 CHAR alternate CHAR for ending the line\n" " erase CHAR CHAR will erase the last character typed\n" @@ -9796,7 +10183,7 @@ msgstr "" " intr ZNAK ZNAK bo poslal signal za prekinitev\n" " kill ZNAK ZNAK bo pobrisal trenutno vrstico\n" -#: src/stty.c:542 +#: src/stty.c:550 msgid "" " * lnext CHAR CHAR will enter the next character quoted\n" " quit CHAR CHAR will send a quit signal\n" @@ -9808,7 +10195,7 @@ msgstr "" " * rprnt ZNAK ZNAK bo obnovil (ponovno izrisal) trenutno vrstico\n" " start ZNAK ZNAK bo ponovno pognal ustavljeni izhod\n" -#: src/stty.c:548 +#: src/stty.c:556 msgid "" " stop CHAR CHAR will stop the output\n" " susp CHAR CHAR will send a terminal stop signal\n" @@ -9820,7 +10207,7 @@ msgstr "" " * swtch ZNAK ZNAK bo preklopil v drugo plast lupine\n" " * werase ZNAK ZNAK bo pobrisal nazadnje vneseno besedo\n" -#: src/stty.c:554 +#: src/stty.c:562 msgid "" "\n" "Special settings:\n" @@ -9835,7 +10222,7 @@ msgstr "" " * cols N sporoči jedru, da uporabljamo terminal z N stolpci\n" " * columns N isto kot cols N\n" -#: src/stty.c:561 +#: src/stty.c:569 msgid "" " ispeed N set the input speed to N\n" " * line N use line discipline N\n" @@ -9848,7 +10235,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:567 +#: src/stty.c:575 msgid "" " * rows N tell the kernel that the terminal has N rows\n" " * size print the number of rows and columns according to the " @@ -9862,13 +10249,15 @@ msgstr "" " time N z -icanon, nastavi iztek časa pri branju na N desetink " "sekunde\n" -#: src/stty.c:573 +#: src/stty.c:581 +#, fuzzy msgid "" "\n" "Control settings:\n" " [-]clocal disable modem control signals\n" " [-]cread allow input to be received\n" " * [-]crtscts enable RTS/CTS handshaking\n" +" * [-]cdtrdsr enable DTR/DSR handshaking\n" " csN set character size to N bits, N in [5..8]\n" msgstr "" "\n" @@ -9879,23 +10268,23 @@ msgstr "" " csN nastavi velikost znaka v bitih na N; N je v intervalu " "[5..8]\n" -#: src/stty.c:581 +#: src/stty.c:590 msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" " [-]hupcl same as [-]hup\n" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" -" [-]parodd set odd parity (even with '-')\n" +" [-]parodd set odd parity (or even parity with '-')\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 " "terminal\n" " [-]hupcl isto kot [-]hup\n" " [-]parenb pošiljaj paritetni bit na izhodu in ga pričakuj na vhodu\n" -" [-]parodd izberi liho pariteto (pri »-« je soda)\n" +" [-]parodd izberi liho pariteto (oziroma sodo pri »-«)\n" -#: src/stty.c:588 +#: src/stty.c:597 msgid "" "\n" "Input settings:\n" @@ -9911,7 +10300,7 @@ msgstr "" " [-]ignbrk ne upoštevaj prekinitvenih znakov\n" " [-]igncr ne upoštevaj znaka za pomik na levi rob\n" -#: src/stty.c:596 +#: src/stty.c:605 msgid "" " [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" @@ -9925,12 +10314,12 @@ msgstr "" " [-]inpck omogoči preverjanje paritete na vhodu\n" " [-]istrip najvišji (osmi) bit znakov vedno postavi na nič\n" -#: src/stty.c:603 +#: src/stty.c:612 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:606 +#: src/stty.c:615 msgid "" " * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" @@ -9947,7 +10336,7 @@ msgstr "" " [-]parmrk označi napako v pariteti z zaporedjem 255-0-ZNAK\n" " [-]tandem isto kot [-]ixoff\n" -#: src/stty.c:614 +#: src/stty.c:623 msgid "" "\n" "Output settings:\n" @@ -9964,7 +10353,7 @@ msgstr "" "[0..1]\n" " * nlN slog zakasnitve pri skoku v naslednjo vrsto; N je v [0..1]\n" -#: src/stty.c:622 +#: src/stty.c:631 msgid "" " * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of null characters\n" @@ -9980,7 +10369,7 @@ msgstr "" " * [-]onlcr pretvori znake NL v CR\n" " * [-]onlret znak NL opravi še pomik na začetek vrste\n" -#: src/stty.c:630 +#: src/stty.c:639 msgid "" " * [-]onocr do not print carriage returns in the first column\n" " [-]opost postprocess output\n" @@ -9996,7 +10385,7 @@ msgstr "" " * -tabs isto kot tab3\n" " * vtN slog zakasnitve pri vertikalnem tabulatorju; N je v [0..1]\n" -#: src/stty.c:638 +#: src/stty.c:647 msgid "" "\n" "Local settings:\n" @@ -10010,7 +10399,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:645 +#: src/stty.c:654 msgid "" " * [-]ctlecho echo control characters in hat notation ('^c')\n" " [-]echo echo input characters\n" @@ -10024,7 +10413,7 @@ msgstr "" " [-]echoe isti kot [-]crterase\n" " [-]echok izpiši znak za novo vrstico po brisanju vrstice\n" -#: src/stty.c:652 +#: src/stty.c:661 msgid "" " * [-]echoke same as [-]crtkill\n" " [-]echonl echo newline even if not echoing other characters\n" @@ -10038,7 +10427,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:659 +#: src/stty.c:668 msgid "" " [-]isig enable interrupt, quit, and suspend special characters\n" " [-]noflsh disable flushing after interrupt and quit special " @@ -10056,7 +10445,7 @@ msgstr "" " * [-]xcase skupaj z icanon, predhodi vse velike črke z obratno\n" " poševnico »\\«\n" -#: src/stty.c:666 +#: src/stty.c:675 msgid "" "\n" "Combination settings:\n" @@ -10070,7 +10459,7 @@ msgstr "" " cbreak isto kot -icanon\n" " -cbreak isto kot icanon\n" -#: src/stty.c:673 +#: src/stty.c:682 msgid "" " cooked same as brkint ignpar istrip icrnl ixon opost isig\n" " icanon, eof and eol characters to their default values\n" @@ -10082,7 +10471,7 @@ msgstr "" " -cooked isto kot raw\n" " crt isto kot echoe echoctl echoke\n" -#: src/stty.c:679 +#: src/stty.c:688 msgid "" " dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" " kill ^u\n" @@ -10096,7 +10485,7 @@ msgstr "" " ek znaka erase in kill na njuni privzeti vrednosti\n" " evenp isto kot parenb -parodd cs7\n" -#: src/stty.c:686 +#: src/stty.c:695 msgid "" " -evenp same as -parenb cs8\n" " * [-]lcase same as xcase iuclc olcuc\n" @@ -10112,7 +10501,7 @@ msgstr "" " nl isto kot -icrnl -onlcr\n" " -nl isto kot icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" -#: src/stty.c:694 +#: src/stty.c:703 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -10126,7 +10515,7 @@ msgstr "" " pass8 isto kot -parenb -istrip cs8\n" " -pass8 isto kot parenb istrip cs7\n" -#: src/stty.c:701 +#: src/stty.c:710 msgid "" " raw same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" " -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n" @@ -10138,7 +10527,7 @@ msgstr "" " -imaxbel -opost -isig -icanon -xcase min 1 time 0\n" " -raw isto kot cooked\n" -#: src/stty.c:707 +#: src/stty.c:716 msgid "" " sane same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" " -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n" @@ -10154,7 +10543,7 @@ msgstr "" " -xcase -tostop -echoprt echoctl echoke, vsi posebni znaki\n" " na njihove privzete vrednosti\n" -#: src/stty.c:715 +#: src/stty.c:724 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -10169,12 +10558,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:787 +#: src/stty.c:796 #, c-format msgid "only one device may be specified" msgstr "navedena je lahko samo ena enota" -#: src/stty.c:817 +#: src/stty.c:826 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" @@ -10183,129 +10572,47 @@ msgstr "" "izbiri za izpis v človeku berljivi obliki ter obliki, ki jo lahko prebere\n" "stty, sta si nasprotujoči" -#: src/stty.c:823 +#: src/stty.c:832 #, 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:838 +#: src/stty.c:847 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s: ne-blokirnega načina ni mogoče ponovno zagnati" -#: src/stty.c:883 src/stty.c:993 +#: src/stty.c:892 src/stty.c:1002 #, c-format msgid "invalid argument %s" msgstr "neveljavni argument %s" -#: src/stty.c:894 src/stty.c:911 src/stty.c:923 src/stty.c:936 src/stty.c:948 -#: src/stty.c:968 +#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957 +#: src/stty.c:977 #, c-format msgid "missing argument to %s" msgstr "izbiri %s manjka argument" -#: src/stty.c:974 +#: src/stty.c:983 #, c-format msgid "invalid line discipline %s" msgstr "neveljavni komunikacijski protokol %s" -#: src/stty.c:1044 +#: src/stty.c:1053 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s: vseh zahtevanih operacij se ni dalo izvesti" -#: src/stty.c:1390 +#: src/stty.c:1399 #, c-format msgid "%s: no size information for this device" msgstr "%s: ni podatka o velikosti te enote" -#: src/stty.c:1904 +#: src/stty.c:1920 #, c-format msgid "invalid integer argument %s" msgstr "neveljavni celoštevilčni argument %s" -#: src/su.c:229 -msgid "Password:" -msgstr "Geslo:" - -#: src/su.c:232 -#, c-format -msgid "getpass: cannot open /dev/tty" -msgstr "getpass: ni mogoče odpreti /dev/tty" - -#: src/su.c:290 -#, c-format -msgid "cannot set groups" -msgstr "nastavitev skupin ni mogoča" - -#: src/su.c:294 -#, c-format -msgid "cannot set group id" -msgstr "nastavitev GID ni mogoča" - -#: src/su.c:296 -#, c-format -msgid "cannot set user id" -msgstr "nastavitev UID ni mogoča" - -#: src/su.c:371 -#, c-format -msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" -msgstr "Uporaba: %s [IZBIRA]... [-] [UPORABNIK [ARGUMENT]...]\n" - -#: src/su.c:372 -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 "" -"Aktivno uporabniško in skupinsko identiteto spremenimo na identiteto\n" -"navedenega UPORABNIKA.\n" -"\n" -" -, -l, --login naj bo ukazna lupina prijavna lupina\n" -" -c, --command=UKAZ ukazni lupini podamo en sam navedeni UKAZ s -" -"c\n" -" -f, --fast ukazni lupini podamo izbiro -f (samo csh in " -"tcsh)\n" -" -m, --preserve-environment brez spreminjanja nastavitev okolja\n" -" -p isto kot -m\n" -" -s, --shell=LUPINA poženemo navedeno LUPINO (če jo /etc/shells " -"dovoli)\n" - -#: src/su.c:384 -msgid "" -"\n" -"A mere - implies -l. If USER not given, assume root.\n" -msgstr "" -"\n" -"Minus - brez česarkoli pomeni isto kot -l. Če UPORABNIK ni naveden, se\n" -"privzame naduporabnik.\n" - -#: src/su.c:461 -#, c-format -msgid "user %s does not exist" -msgstr "uporabnik %s ne obstaja" - -#: src/su.c:484 -#, c-format -msgid "incorrect password" -msgstr "napačno geslo" - -#: src/su.c:501 -#, c-format -msgid "using restricted shell %s" -msgstr "z omejeno ukazno lupino %s" - -#: src/su.c:509 -#, c-format -msgid "warning: cannot change directory to %s" -msgstr "opozorilo: imenik %s ni dosegljiv" - #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 msgid "Kayvan Aghaiepour" @@ -10337,7 +10644,7 @@ msgstr "" msgid "ignoring all arguments" msgstr "ne upoštevamo nobenih argumentov" -#: src/system.h:340 +#: src/system.h:343 #, c-format msgid "" "\n" @@ -10350,15 +10657,24 @@ msgstr "" "prevlada nad tu opisano različico. Prosimo, obrnite se na dokumentacijo\n" "vaše ukazne lupine za podrobnosti o podprtih izbirah.\n" -#: src/system.h:346 +#: src/system.h:349 msgid " --help display this help and exit\n" msgstr " --help ta navodila\n" -#: src/system.h:348 +#: src/system.h:351 msgid " --version output version information and exit\n" msgstr " --version različica programa\n" -#: src/system.h:541 +#: src/system.h:544 +#, fuzzy +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 " +"kratko.\n" + +#: src/system.h:552 msgid "" "\n" "SIZE is an integer and optional unit (example: 10M is 10*1024*1024). Units\n" @@ -10371,7 +10687,7 @@ msgstr "" "Enote so K, M, G, T, P, E, Z, Y (potence 1024) ali KB, MB... (potence " "1000).\n" -#: src/system.h:550 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -10385,7 +10701,7 @@ msgstr "" "BLOCKSIZE. Privzeta enota je 1024 bajtov (512 pri nastavljenem " "POSIXLY_CORRECT).\n" -#: src/system.h:560 +#: src/system.h:571 #, c-format msgid "" "\n" @@ -10398,24 +10714,24 @@ msgstr "" #. <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:574 +#: src/system.h:585 #, 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:578 +#: src/system.h:589 #, 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:585 +#: src/system.h:596 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "Poskusite »%s --help« za izčrpnejša navodila\n" -#: src/system.h:617 +#: src/system.h:628 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -10436,17 +10752,17 @@ 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" -"\n" 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:145 +#: src/tac.c:144 msgid "" " -b, --before attach the separator before instead of after\n" " -r, --regex interpret the separator as a regular expression\n" @@ -10456,42 +10772,42 @@ msgstr "" " -r, --regex ločila obravnavamo kot regularne izraze\n" " -s, --separator=NIZ vrstice naj ločuje NIZ, ne znak za novo vrstico\n" -#: src/tac.c:235 src/tac.c:336 +#: src/tac.c:234 src/tac.c:335 #, c-format msgid "%s: seek failed" msgstr "%s: klic seek ni uspel" -#: src/tac.c:264 +#: src/tac.c:263 #, c-format msgid "record too large" msgstr "zapis je prevelik" -#: src/tac.c:451 +#: src/tac.c:450 #, c-format msgid "failed to create temporary file in %s" msgstr "začasne datoteke v %s ni mogoče ustvariti" -#: src/tac.c:459 +#: src/tac.c:458 #, c-format msgid "failed to open %s for writing" msgstr "%s ni mogoče odpreti za pisanje" -#: src/tac.c:476 +#: src/tac.c:475 #, c-format msgid "failed to rewind stream for %s" msgstr "toka za %s ni mogoče previti na začetek" -#: src/tac.c:512 src/tac.c:519 +#: src/tac.c:511 src/tac.c:518 #, c-format msgid "%s: write error" msgstr "%s: napaka pri pisanju" -#: src/tac.c:572 +#: src/tac.c:571 #, c-format msgid "failed to open %s for reading" msgstr "datoteke %s ni mogoče odpreti za branje" -#: src/tac.c:630 +#: src/tac.c:629 #, c-format msgid "separator cannot be empty" msgstr "ločilo ne more biti prazno" @@ -10502,12 +10818,11 @@ msgid "Ian Lance Taylor" msgstr "Ian Lance Taylor" #: src/tail.c:262 -#, c-format +#, fuzzy, 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" -"\n" msgstr "" "Zadnjih %d vrstic vsake od podanih DATOTEK izpišemo na standardni izhod.\n" "Če je podana več kot ena DATOTEKA, izpišemo pred tem še glavo z imenom\n" @@ -10515,7 +10830,7 @@ msgstr "" "vhoda.\n" "\n" -#: src/tail.c:271 +#: src/tail.c:270 msgid "" " -c, --bytes=K output the last K bytes; alternatively, use -c " "+K\n" @@ -10526,7 +10841,7 @@ msgstr "" "+K\n" " za izpis bajtov od K-tega dalje v vsaki datoteki\n" -#: src/tail.c:275 +#: src/tail.c:274 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -10539,7 +10854,7 @@ msgstr "" " --follow=descriptor so sopomenke\n" " -F isto kot --follow=name --retry\n" -#: src/tail.c:282 +#: src/tail.c:281 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -10564,7 +10879,7 @@ msgstr "" "datotekah).\n" " Z inotify je ta izbira redkokdaj uporabna.\n" -#: src/tail.c:295 +#: src/tail.c:294 msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" " -q, --quiet, --silent never output headers giving file names\n" @@ -10580,7 +10895,7 @@ msgstr "" "sledenjem\n" " imena (izbira --follow-name)\n" -#: src/tail.c:302 +#: src/tail.c:301 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations.\n" @@ -10594,7 +10909,7 @@ msgstr "" " vsakih N sekund.\n" " -v, --verbose vedno z izpisom glave z imenom datoteke\n" -#: src/tail.c:311 +#: src/tail.c:310 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -10612,7 +10927,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:320 +#: src/tail.c:319 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" @@ -10630,27 +10945,27 @@ 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:379 +#: src/tail.c:378 #, c-format msgid "closing %s (fd=%d)" msgstr "zapiramo %s (fd=%d)" -#: src/tail.c:454 +#: 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:458 +#: src/tail.c:457 #, 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:895 +#: src/tail.c:894 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "ni moč ugotoviti lokacije %s, uporabljamo programsko izpraševanje" -#: src/tail.c:907 +#: src/tail.c:906 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " @@ -10659,38 +10974,38 @@ 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:964 +#: src/tail.c:963 #, c-format msgid "%s has become inaccessible" msgstr "%s je postala nedostopna" -#: src/tail.c:981 +#: src/tail.c:980 #, 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:990 +#: src/tail.c:989 #, 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:1011 +#: src/tail.c:1010 #, c-format msgid "%s has become accessible" msgstr "%s je postala dostopna" -#: src/tail.c:1019 +#: src/tail.c:1018 #, c-format msgid "%s has appeared; following end of new file" msgstr "%s se je pojavila; sledimo konec nove datoteka" -#: src/tail.c:1030 +#: src/tail.c:1029 #, c-format msgid "%s has been replaced; following end of new file" msgstr "%s je bila zamenjana; sledimo konec nove datoteke" -#: src/tail.c:1131 +#: src/tail.c:1130 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: ne-blokirnega načina ni mogoče spremeniti" @@ -11057,17 +11372,22 @@ msgstr "manjkajoč »]«" msgid "extra argument %s" msgstr "odvečen argument %s" -#: src/timeout.c:124 +#: src/timeout.c:112 +#, fuzzy, c-format +msgid "warning: sigprocmask" +msgstr "opozorilo: timer_create" + +#: src/timeout.c:145 #, c-format msgid "warning: timer_settime" msgstr "opozorilo: timer_settime" -#: src/timeout.c:129 +#: src/timeout.c:150 #, c-format msgid "warning: timer_create" msgstr "opozorilo: timer_create" -#: src/timeout.c:204 +#: src/timeout.c:225 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -11076,19 +11396,21 @@ msgstr "" "Uporaba: %s [IZBIRA] TRAJANJE UKAZ [ARGUMENT]...\n" " ali: %s [IZBIRA]\n" -#: src/timeout.c:208 -msgid "" -"Start COMMAND, and kill it if still running after DURATION.\n" -"\n" -"Mandatory arguments to long options are mandatory for short options too.\n" +#: src/timeout.c:229 +#, fuzzy +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" -#: src/timeout.c:213 +#: src/timeout.c:235 +#, fuzzy msgid "" +" --preserve-status\n" +" exit with the same status as COMMAND, even when the\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 " @@ -11116,7 +11438,7 @@ msgstr "" " SIGNAL lahko podamo z imenom (npr. »HUP«) ali številko.\n" " Seznam signalov lahko izvemo z ukazom »kill -l«.\n" -#: src/timeout.c:229 +#: src/timeout.c:254 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -11127,15 +11449,16 @@ 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:234 +#: src/timeout.c:259 +#, fuzzy msgid "" "\n" -"If the command times out, then exit with status 124. Otherwise, exit\n" -"with the status of COMMAND. If no signal is specified, send the TERM\n" -"signal upon timeout. The TERM signal kills any process that does not\n" -"block or catch that signal. For other processes, it may be necessary to\n" -"use the KILL (9) signal, since this signal cannot be caught. If the\n" -"KILL (9) signal is sent, the exit status is 128+9 rather than 124.\n" +"If the command times out, and --preserve-status is not set, then exit with\n" +"status 124. Otherwise, exit with the status of COMMAND. If no signal\n" +"is specified, send the TERM signal upon timeout. The TERM signal kills\n" +"any process that does not block or catch that signal. It may be necessary\n" +"to use the KILL (9) signal, since this signal cannot be caught, in which\n" +"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" @@ -11145,15 +11468,20 @@ msgstr "" "signal KILL (9), ki ga ni mogoče prestreči. Ob poslanem signalu KILL(9)\n" "izhodni status ni 124, ampak 128+9.\n" -#: src/timeout.c:419 +#: src/timeout.c:363 +#, c-format +msgid "warning: disabling core dumps failed" +msgstr "opozorilo: pomnilniških izmetov ni mogoče onemogočiti" + +#: src/timeout.c:471 #, c-format msgid "error waiting for command" msgstr "napaka pri čakanju na ukaz" -#: src/timeout.c:441 +#: src/timeout.c:482 #, c-format -msgid "warning: disabling core dumps failed" -msgstr "opozorilo: pomnilniških izmetov ni mogoče onemogočiti" +msgid "the monitored command dumped core" +msgstr "nadzorovani ukaz je izvrgel pomnilniško sliko" #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 @@ -11165,22 +11493,23 @@ msgstr "Jim Kingdon" msgid "Randy Smith" msgstr "Randy Smith" -#: src/touch.c:115 src/touch.c:313 +#: src/touch.c:115 src/touch.c:309 #, c-format msgid "invalid date format %s" msgstr "neveljavna oblika datuma %s" -#: src/touch.c:194 +#: src/touch.c:191 #, c-format msgid "cannot touch %s" msgstr "%s ni dosegljiv" -#: src/touch.c:200 +#: src/touch.c:197 #, c-format msgid "setting times of %s" msgstr "nastavljanje časov %s" -#: src/touch.c:216 +#: src/touch.c:213 +#, fuzzy msgid "" "Update the access and modification times of each FILE to the current time.\n" "\n" @@ -11189,7 +11518,6 @@ msgid "" "\n" "A FILE argument string of - is handled specially and causes touch to\n" "change the times of the file associated with standard output.\n" -"\n" msgstr "" "Čas zadnjega dostopa in spremembe vsake DATOTEKE postavimo na trenutni čas.\n" "\n" @@ -11200,7 +11528,7 @@ msgstr "" "datoteki, povezani s standardnim izhodom.\n" "\n" -#: src/touch.c:229 +#: src/touch.c:225 msgid "" " -a change only the access time\n" " -c, --no-create do not create any files\n" @@ -11212,7 +11540,7 @@ msgstr "" " -d, --date=NIZ razčleni NIZ in uporabi ta čas namesto trenutnega\n" " -f (se ne upošteva)\n" -#: src/touch.c:235 +#: src/touch.c:231 msgid "" " -h, --no-dereference affect each symbolic link instead of any " "referenced\n" @@ -11226,11 +11554,11 @@ msgstr "" " lastništva simbolne povezave)\n" " -m spremeni samo čas zadnje spremembe\n" -#: src/touch.c:241 +#: src/touch.c:237 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" -" --time=WORD change the specified time:\n" +" --time=WORD change the specified time:\n" " WORD is access, atime, or use: equivalent to -a\n" " WORD is modify or mtime: equivalent to -m\n" msgstr "" @@ -11241,7 +11569,7 @@ msgstr "" " čas dostopa: access, atime, use (isto kot -a)\n" " čas spremembe: mtime, modify (isto kot -m)\n" -#: src/touch.c:250 +#: src/touch.c:246 msgid "" "\n" "Note that the -d and -t options accept different time-date formats.\n" @@ -11250,12 +11578,12 @@ msgstr "" "Bodite pozorni na to, da izbiri -d in -t sprejemata različna zapisa datuma\n" "in časa.\n" -#: src/touch.c:339 +#: src/touch.c:335 #, c-format msgid "cannot specify times from more than one source" msgstr "hkrati lahko navedemo samo en vir" -#: src/touch.c:413 +#: src/touch.c:409 #, c-format msgid "" "warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'" @@ -11530,6 +11858,7 @@ 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" @@ -11538,7 +11867,6 @@ msgid "" "If a FILE is larger than the specified size, the extra data is lost.\n" "If a FILE is shorter, it is extended and the extended part (hole)\n" "reads as zero bytes.\n" -"\n" msgstr "" "Zmanjšaj ali povečaj VELIKOST DATOTEKE do navedene vrednosti.\n" "\n" @@ -11549,18 +11877,18 @@ msgstr "" "predpisane dolžine dopolni z znaki \\0.\n" "\n" -#: src/truncate.c:110 +#: src/truncate.c:109 msgid " -c, --no-create do not create any files\n" msgstr " -c, --no-create ne ustvari nobene datoteke\n" -#: src/truncate.c:113 +#: src/truncate.c:112 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" " -o, --io-blocks obravnavaj VELIKOST podano v V/I blokih, ne v " "bajtih\n" -#: src/truncate.c:116 +#: 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" @@ -11568,7 +11896,7 @@ msgstr "" " -r, --reference=DATOTEKA uporabi velikost navedene DATOTEKE\n" " -s, --size=VELIKOST nastavi ali spremeni datoteko na navedeno VELIKOST\n" -#: src/truncate.c:122 +#: src/truncate.c:121 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -11581,58 +11909,58 @@ msgstr "" "»/« zaokroži navzdol na večkratnik od, »%« zaokroži navzgor na večkratnik " "od.\n" -#: src/truncate.c:150 +#: src/truncate.c:149 #, c-format msgid "overflow in %<PRIdMAX> * %<PRIdMAX> byte blocks for file %s" msgstr "" "prekoračitev obsega pri dolžini %<PRIdMAX>×%<PRIdMAX> bajtov datoteke %s" -#: src/truncate.c:174 +#: src/truncate.c:173 #, c-format msgid "%s has unusable, apparently negative size" msgstr "%s ima neuporabno, navidezno negativno velikost" -#: src/truncate.c:184 src/truncate.c:379 +#: src/truncate.c:183 src/truncate.c:384 #, c-format msgid "cannot get the size of %s" msgstr "ni mogoče prebrati velikosti %s" -#: src/truncate.c:206 +#: src/truncate.c:205 #, c-format msgid "overflow rounding up size of file %s" msgstr "prekoračitev obsega pri zaokrožitvi navzgor velikosti datoteke %s" -#: src/truncate.c:216 +#: src/truncate.c:215 #, c-format msgid "overflow extending size of file %s" msgstr "prekoračitev obsega pri povečevanju dolžine datoteke %s" -#: src/truncate.c:231 +#: src/truncate.c:230 #, c-format msgid "failed to truncate %s at %<PRIdMAX> bytes" msgstr "ni mogoče odrezati datoteke %s pri dolžini %<PRIdMAX> bajtov" -#: src/truncate.c:305 +#: src/truncate.c:303 #, c-format msgid "multiple relative modifiers specified" msgstr "podanih je več relativnih modifikatorjev" -#: src/truncate.c:335 +#: src/truncate.c:333 #, c-format msgid "you must specify either %s or %s" msgstr "navesti morate bodisi %s bodisi %s" -#: src/truncate.c:342 +#: src/truncate.c:340 #, c-format msgid "you must specify a relative %s with %s" msgstr "navesti morate relativni %s z %s" -#: src/truncate.c:349 +#: src/truncate.c:347 #, c-format msgid "%s was specified but %s was not" msgstr "%s je bil določen, %s pa ne" -#: src/truncate.c:400 +#: src/truncate.c:404 #, c-format msgid "cannot open %s for writing" msgstr "%s ni mogoče odpreti za pisanje" @@ -11725,10 +12053,10 @@ 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" -"\n" msgstr "" "Presledke v vsaki DATOTEKI nadomestimo s tabulatorji in rezultat zapišemo " "na\n" @@ -11737,7 +12065,7 @@ msgstr "" "vhoda.\n" "\n" -#: src/unexpand.c:125 +#: src/unexpand.c:124 msgid "" " -a, --all convert all blanks, instead of just initial blanks\n" " --first-only convert only leading sequences of blanks (overrides -a)\n" @@ -11752,12 +12080,12 @@ msgstr "" "tabulatorja\n" " (omogoči -a)\n" -#: src/unexpand.c:153 +#: src/unexpand.c:152 #, c-format msgid "tabs are too far apart" msgstr "razmik med tabulatorji je prevelik" -#: src/unexpand.c:505 +#: src/unexpand.c:504 #, c-format msgid "tab stop value is too large" msgstr "vrednost tabulatorja je prevelika" @@ -11768,12 +12096,12 @@ msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n" msgstr "Uporaba: %s [IZBIRA]... [VHOD [IZHOD]]\n" #: src/uniq.c:138 +#, fuzzy 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" -"\n" msgstr "" "Filtriraj soslednje ujemajoče se vrstice pri branju z VHODA (ali\n" "standardnega vhoda) in pisanju na IZHOD (ali standardni izhod).\n" @@ -11781,7 +12109,7 @@ msgstr "" "Če ni navedena nobena IZBIRA, se zaporedne enake vrstice nadomestijo z eno.\n" "\n" -#: src/uniq.c:148 +#: src/uniq.c:147 msgid "" " -c, --count prefix lines by the number of occurrences\n" " -d, --repeated only print duplicate lines\n" @@ -11790,7 +12118,7 @@ msgstr "" "ponovitev\n" " -d, --repeated izpišemo samo podvojene vrstice\n" -#: src/uniq.c:152 +#: src/uniq.c:151 msgid "" " -D, --all-repeated[=delimit-method] print all duplicate lines\n" " delimit-method={none(default),prepend,separate}\n" @@ -11810,11 +12138,11 @@ msgstr "" " -u, --unique izpiši samo nepodvojene vrstice\n" " -z, --zero-terminated vrstice zaključi z znakom NUL, ne LF\n" -#: src/uniq.c:162 +#: src/uniq.c:161 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:167 +#: src/uniq.c:166 msgid "" "\n" "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n" @@ -11824,7 +12152,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:172 +#: src/uniq.c:171 msgid "" "\n" "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n" @@ -11836,24 +12164,24 @@ 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:359 +#: src/uniq.c:358 #, c-format msgid "too many repeated lines" msgstr "preveč ponovljenih vrstic" -#: src/uniq.c:522 +#: src/uniq.c:521 msgid "invalid number of fields to skip" msgstr "neveljavno število preskočenih polj" -#: src/uniq.c:531 +#: src/uniq.c:530 msgid "invalid number of bytes to skip" msgstr "neveljavno število preskočenih bajtov" -#: src/uniq.c:540 +#: src/uniq.c:539 msgid "invalid number of bytes to compare" msgstr "neveljavno število primerjanih bajtov" -#: src/uniq.c:559 +#: src/uniq.c:558 #, c-format msgid "printing all duplicated lines and repeat counts is meaningless" msgstr "izpis vseh podvojenih vrstic skupaj s številom ponovitev ni smiseln" @@ -11909,6 +12237,11 @@ msgstr[1] "pokonci %ld dan %2d:%02d, " msgstr[2] "pokonci %ld dni %2d:%02d, " msgstr[3] "pokonci %ld dni %2d:%02d, " +#: src/uptime.c:149 +#, fuzzy, c-format +msgid "up %2d:%02d, " +msgstr "pokonci %ld dni %2d:%02d, " + #: src/uptime.c:151 #, c-format msgid "%lu user" @@ -12010,39 +12343,39 @@ msgstr "" msgid " old " msgstr " staro " -#: src/who.c:449 +#: src/who.c:440 msgid "system boot" msgstr "sistemski zagon" -#: src/who.c:456 src/who.c:458 +#: src/who.c:447 src/who.c:449 msgid "id=" msgstr "id=" -#: src/who.c:471 src/who.c:476 +#: src/who.c:462 src/who.c:467 msgid "term=" msgstr "term=" -#: src/who.c:473 src/who.c:477 +#: src/who.c:464 src/who.c:468 msgid "exit=" msgstr "exit=" -#: src/who.c:494 +#: src/who.c:485 msgid "LOGIN" msgstr "PRIJAVA" -#: src/who.c:514 +#: src/who.c:505 msgid "clock change" msgstr "sprem. ure" -#: src/who.c:526 src/who.c:527 +#: src/who.c:517 src/who.c:518 msgid "run-level" msgstr "run-level" -#: src/who.c:530 src/who.c:531 +#: src/who.c:521 src/who.c:522 msgid "last=" msgstr "last=" -#: src/who.c:562 +#: src/who.c:553 #, c-format msgid "" "\n" @@ -12051,44 +12384,44 @@ msgstr "" "\n" "Št. up.=%lu\n" -#: src/who.c:568 +#: src/who.c:559 msgid "NAME" msgstr "IME" -#: src/who.c:568 +#: src/who.c:559 msgid "LINE" msgstr "LINIJA" -#: src/who.c:568 +#: src/who.c:559 msgid "TIME" msgstr "ČAS" -#: src/who.c:568 +#: src/who.c:559 msgid "IDLE" msgstr "NEAKT." -#: src/who.c:569 +#: src/who.c:560 msgid "PID" msgstr "PID" -#: src/who.c:569 +#: src/who.c:560 msgid "COMMENT" msgstr "KOMENTAR" -#: src/who.c:569 +#: src/who.c:560 msgid "EXIT" msgstr "IZH." -#: src/who.c:649 +#: src/who.c:640 #, c-format msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n" msgstr "Uporaba: %s [IZBIRA]... [ DATOTEKA | ARGUMENT1 ARGUMENT2 ]\n" -#: src/who.c:650 +#: src/who.c:641 msgid "Print information about users who are currently logged in.\n" msgstr "Izpis podatkov o trenutno prijavljenih uporabnikih.\n" -#: src/who.c:653 +#: src/who.c:644 msgid "" "\n" " -a, --all same as -b -d --login -p -r -t -T -u\n" @@ -12102,11 +12435,11 @@ msgstr "" " -d, --dead izpis mrtvih procesov\n" " -H, --heading izpiši vrstico z legendo\n" -#: src/who.c:660 +#: src/who.c:651 msgid " -l, --login print system login processes\n" msgstr " -l, --login izpiši prijavne procese sistema\n" -#: src/who.c:663 +#: src/who.c:654 msgid "" " --lookup attempt to canonicalize hostnames via DNS\n" " -m only hostname and user associated with stdin\n" @@ -12118,7 +12451,7 @@ msgstr "" " standardnim vhodom\n" " -p, --process izpišemo aktivne procese, ki jih je zagnal init\n" -#: src/who.c:668 +#: src/who.c:659 msgid "" " -q, --count all login names and number of users logged on\n" " -r, --runlevel print current runlevel\n" @@ -12131,7 +12464,7 @@ msgstr "" "(privzeto)\n" " -t, --time izpišemo zadnjo spremembo sistemske ure\n" -#: src/who.c:674 +#: src/who.c:665 msgid "" " -T, -w, --mesg add user's message status as +, - or ?\n" " -u, --users list users logged in\n" @@ -12143,7 +12476,7 @@ msgstr "" " --message isto kot -T\n" " --writable isto kot -T\n" -#: src/who.c:682 +#: src/who.c:673 #, c-format msgid "" "\n" @@ -12188,6 +12521,185 @@ msgstr "" "Ponavljaje izpisujemo vrstico s podanim NIZOM (privzeto »y«).\n" "\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" + +#, fuzzy +#~ msgid " returning value: '%s'\n" +#~ msgstr "ustvarjanje datoteke %s\n" + +#, fuzzy +#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n" +#~ msgstr "Uporaba: %s [IZBIRA] IME...\n" + +#, fuzzy +#~ msgid "no valid suffix found\n" +#~ msgstr "%s: neveljavno dolžina pripone" + +#~ msgid "reading %s" +#~ msgstr "beremo %s" + +#~ msgid "writing %s" +#~ msgstr "zapisovanje %s" + +#~ msgid "closing %s" +#~ msgstr "zapiramo %s" + +#~ msgid "accessing %s" +#~ msgstr "dostopamo do %s" + +#~ msgid "opening %s" +#~ msgstr "odpiramo %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 brez imenikov na ostalih datotečnih sistemih\n" +#~ " -X --exclude-from=DATOTEKA brez datotek, ki jih pokrivajo vzorci, \n" +#~ " podani v DATOTEKI\n" +#~ " --exclude=VZOREC brez datotek, ki jih pokriva podani VZOREC\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" + +#~ 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 nikoli ne delamo varnostne kopije, niti z izbiro --" +#~ "backup\n" +#~ " numbered, t oštevilčene varnostne kopije\n" +#~ " existing, nil oštevilčene varnostne kopije, če take že obstajajo,\n" +#~ " sicer enostavne\n" +#~ " simple, never vedno enostavne varnostne kopije\n" +#~ "\n" + +#~ msgid "" +#~ "WARNING: --page-increment is deprecated; use --line-increment instead" +#~ msgstr "" +#~ "OPOZORILO: izbira --page-increment je opuščena; namesto nje uporabite --" +#~ "line-increment" + +#~ msgid "All arguments to long options are mandatory for short options.\n" +#~ msgstr "Vsi argumenti pri dolgi obliki izbire so obvezni tudi pri kratki.\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" +#~ "OSNOVA je lahko d (desetiška), o (osmiška), x (šestnajstiška) ali n " +#~ "(nobena).\n" +#~ "Če ima ŠTEVILO predpono 0x ali 0X, se tolmači kot šestnajstiška " +#~ "vrednost.\n" +#~ "Množiteljske pripone: b pomeni množenje s 512, kB 1000, K 1024, MB " +#~ "1000×1000,\n" +#~ "M 1024×1024, GB 1000×1000×1000, G 1024×1024×1024 itn. za T, P, E, Z in " +#~ "Y.\n" +#~ "Pripona z pri kateremkoli tipu doda prikaz izpisljivih znakov na koncu " +#~ "vsake\n" +#~ "vrstice.\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 "" +#~ "Izbira --string brez argumenta privzame vrednost 3. Izbira --width brez\n" +#~ "argumenta privzame vrednost 32. Privzete vrednosti, ki jih uporablja " +#~ "»od«,\n" +#~ "so: -A o -t oS -w 16.\n" + +# ! INEXACT +#~ msgid "Usage: %s [OPTION]... FILE\n" +#~ msgstr "Uporaba: %s [IZBIRA]... DATOTEKA\n" + +#~ msgid "Password:" +#~ msgstr "Geslo:" + +#~ msgid "getpass: cannot open /dev/tty" +#~ msgstr "getpass: ni mogoče odpreti /dev/tty" + +#~ msgid "cannot set groups" +#~ msgstr "nastavitev skupin ni mogoča" + +#~ msgid "cannot set group id" +#~ msgstr "nastavitev GID ni mogoča" + +#~ msgid "cannot set user id" +#~ msgstr "nastavitev UID ni mogoča" + +#~ msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" +#~ msgstr "Uporaba: %s [IZBIRA]... [-] [UPORABNIK [ARGUMENT]...]\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 "" +#~ "Aktivno uporabniško in skupinsko identiteto spremenimo na identiteto\n" +#~ "navedenega UPORABNIKA.\n" +#~ "\n" +#~ " -, -l, --login naj bo ukazna lupina prijavna lupina\n" +#~ " -c, --command=UKAZ ukazni lupini podamo en sam navedeni UKAZ " +#~ "s -c\n" +#~ " -f, --fast ukazni lupini podamo izbiro -f (samo csh " +#~ "in tcsh)\n" +#~ " -m, --preserve-environment brez spreminjanja nastavitev okolja\n" +#~ " -p isto kot -m\n" +#~ " -s, --shell=LUPINA poženemo navedeno LUPINO (če jo /etc/" +#~ "shells dovoli)\n" + +#~ msgid "" +#~ "\n" +#~ "A mere - implies -l. If USER not given, assume root.\n" +#~ msgstr "" +#~ "\n" +#~ "Minus - brez česarkoli pomeni isto kot -l. Če UPORABNIK ni naveden, se\n" +#~ "privzame naduporabnik.\n" + +#~ msgid "user %s does not exist" +#~ msgstr "uporabnik %s ne obstaja" + +#~ msgid "incorrect password" +#~ msgstr "napačno geslo" + +#~ msgid "using restricted shell %s" +#~ msgstr "z omejeno ukazno lupino %s" + +#~ msgid "warning: cannot change directory to %s" +#~ msgstr "opozorilo: imenik %s ni dosegljiv" + #~ msgid "" #~ "\n" #~ "Examples:\n" @@ -12373,9 +12885,6 @@ msgstr "" #~ msgid "%s" #~ msgstr "%s" -#~ msgid "invalid format width" -#~ msgstr "neveljavna širina oblike" - #~ msgid "invalid format precision" #~ msgstr "neveljavna natančnost oblike" @@ -13174,9 +13683,6 @@ msgstr "" #~ msgid "cannot obtain time stamps for %s" #~ msgstr "časovne oznake %s ni moč najti" -#~ msgid "invalid field number: `%s'" -#~ msgstr "neveljavna številka polja: »%s«" - #~ msgid "invalid field number for file 1: `%s'" #~ msgstr "neveljavna številka polja za prvo datoteko: »%s«" diff --git a/po/sv.gmo b/po/sv.gmo index 12dafae1..45878e07 100644 Binary files a/po/sv.gmo and b/po/sv.gmo differ diff --git a/po/sv.po b/po/sv.po index cca8aa5c..90de06c5 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 Free Software Foundation, Inc. +# Copyright © 1997, 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. # 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. +# Göran Uddeborg <goeran@uddeborg.se>, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013. # -# $Revision: 1.159 $ +# $Revision: 1.174 $ # msgid "" msgstr "" -"Project-Id-Version: coreutils 8.16\n" +"Project-Id-Version: coreutils 8.20-pre3\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2012-05-10 19:35+0200\n" -"PO-Revision-Date: 2012-03-28 22:38+0200\n" +"POT-Creation-Date: 2013-02-14 15:56+0000\n" +"PO-Revision-Date: 2013-02-12 11:19+0100\n" "Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -40,19 +40,19 @@ msgstr "Giltiga argument är:" msgid "error closing file" msgstr "fel när fil stängdes" -#: lib/closeout.c:112 src/base64.c:109 src/base64.c:121 src/base64.c:127 -#: src/base64.c:168 src/base64.c:224 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:330 src/expand.c:355 src/head.c:298 -#: src/head.c:348 src/head.c:756 src/head.c:797 src/mktemp.c:350 src/od.c:919 -#: src/paste.c:160 src/shuf.c:369 src/split.c:727 src/split.c:964 -#: src/split.c:969 src/tail.c:350 src/tail.c:1201 src/tail.c:1307 +#: 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 -#: src/unexpand.c:427 src/unexpand.c:443 +#: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "skrivfel" -#: lib/copy-acl.c:611 src/copy.c:1160 src/copy.c:2602 +#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617 #, c-format msgid "preserving permissions for %s" msgstr "bevarar rättigheter på %s" @@ -244,18 +244,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:483 +#: lib/mkdir-p.c:196 src/install.c:484 #, c-format msgid "cannot change permissions of %s" msgstr "kan inte ändra rättigheter på %s" -#: lib/mkdir-p.c:206 src/copy.c:2261 src/install.c:709 src/install.c:722 +#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722 #, 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:915 src/tac.c:435 +#: src/split.c:929 src/tac.c:434 #, c-format msgid "memory exhausted" msgstr "minnet slut" @@ -304,75 +304,75 @@ msgstr "”" msgid "%s: end of file" msgstr "%s: filslut" -#: lib/regcomp.c:130 +#: lib/regcomp.c:131 msgid "Success" msgstr "Lyckas" -#: lib/regcomp.c:133 +#: lib/regcomp.c:134 msgid "No match" msgstr "Ingen matchning" -#: lib/regcomp.c:136 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "Felaktigt reguljärt uttryck" -#: lib/regcomp.c:139 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "Ogiltigt sorteringstecken" -#: lib/regcomp.c:142 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "Ogiltigt teckenklassnamn" -#: lib/regcomp.c:145 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "Avslutande bakstreck" -#: lib/regcomp.c:148 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "Ogiltig bakåtreferens" -#: lib/regcomp.c:151 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "Ensam [ eller [^" -#: lib/regcomp.c:154 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "Ensam ( eller \\(" -#: lib/regcomp.c:157 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "Ensam \\{" -#: lib/regcomp.c:160 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "Ogiltigt innehåll i \\{\\}" -#: lib/regcomp.c:163 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "Ogiltigt intervallslut" -#: lib/regcomp.c:166 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Minnet slut" -#: lib/regcomp.c:169 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "Felaktigt tidigare reguljärt uttryck" -#: lib/regcomp.c:172 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "För tidigt slut på reguljärt uttryck" -#: lib/regcomp.c:175 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "Reguljärt uttryck för stort" -#: lib/regcomp.c:178 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "Ensam ) eller \\)" -#: lib/regcomp.c:703 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "Inget tidigare reguljärt uttryck" @@ -411,7 +411,7 @@ msgstr "^[yYjJ]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-mode-acl.c:695 src/copy.c:2284 src/cp.c:518 +#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516 #, c-format msgid "setting permissions for %s" msgstr "sätter rättigheter på %s" @@ -552,13 +552,13 @@ msgstr "Strömavbrott" msgid "Resource lost" msgstr "Förlorad resurs" -#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262 -#: lib/spawn-pipe.c:265 +#: 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:232 lib/spawn-pipe.c:346 lib/wait-process.c:282 +#: 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" @@ -574,24 +574,24 @@ msgstr "Realtidssignal %d" msgid "Unknown signal %d" msgstr "Okänd signal %d" -#: lib/unicodeio.c:103 +#: lib/unicodeio.c:102 msgid "iconv function not usable" msgstr "iconv-funktion inte användbar" -#: lib/unicodeio.c:105 +#: lib/unicodeio.c:104 msgid "iconv function not available" msgstr "iconv-funktion inte tillgänglig" -#: lib/unicodeio.c:112 +#: lib/unicodeio.c:111 msgid "character out of range" msgstr "tecken utanför intervall" -#: lib/unicodeio.c:182 +#: lib/unicodeio.c:181 #, c-format msgid "cannot convert U+%04X to local character set" msgstr "kan inte konvertera U+%04X till lokal teckenuppsättning" -#: lib/unicodeio.c:184 +#: lib/unicodeio.c:183 #, c-format msgid "cannot convert U+%04X to local character set: %s" msgstr "kan inte konvertera U+%04X till lokal teckenuppsättning: %s" @@ -775,7 +775,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:562 +#: lib/version-etc.c:251 src/system.h:573 #, c-format msgid "%s home page: <%s>\n" msgstr "%s hemsida: <%s>\n" @@ -785,7 +785,7 @@ 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:563 +#: lib/version-etc.c:256 src/system.h:574 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" @@ -876,13 +876,11 @@ msgstr "Simon Josefsson" msgid "" "Usage: %s [OPTION]... [FILE]\n" "Base64 encode or decode FILE, or standard input, to standard output.\n" -"\n" msgstr "" -"Användning: %s [FLAGGA]... [FIL]\n" +"Användning: %s [FLAGGA]… [FIL]\n" "Base64-koda eller -avkoda FIL, eller standard in, till standard ut.\n" -"\n" -#: src/base64.c:64 +#: src/base64.c:67 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -898,7 +896,7 @@ msgstr "" " Använd 0 för att så av radbrytning\n" "\n" -#: src/base64.c:73 src/cat.c:110 src/fmt.c:293 src/shuf.c:71 src/sum.c:70 +#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -906,7 +904,7 @@ msgstr "" "\n" "Utan FIL, eller när FIL är -, läs standard in.\n" -#: src/base64.c:76 +#: src/base64.c:79 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -921,37 +919,37 @@ msgstr "" "att försöka återhämta från tecken utanför alfabetet i den kodade\n" "strömmen.\n" -#: src/base64.c:171 src/base64.c:208 src/csplit.c:263 src/csplit.c:1435 -#: src/join.c:451 src/shuf.c:157 src/shuf.c:361 src/tac-pipe.c:74 +#: 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 #, c-format msgid "read error" msgstr "läsfel" -#: src/base64.c:227 +#: src/base64.c:230 #, c-format msgid "invalid input" msgstr "ogiltig indata" -#: src/base64.c:264 +#: src/base64.c:267 #, c-format msgid "invalid wrap size: %s" msgstr "ogiltig radbrytningslängd: %s" -#: src/base64.c:283 src/basename.c:173 src/comm.c:435 src/cp.c:607 -#: src/date.c:441 src/dircolors.c:447 src/du.c:894 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:169 src/install.c:929 src/join.c:961 -#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:157 src/mv.c:447 -#: src/od.c:1802 src/ptx.c:2081 src/readlink.c:154 src/seq.c:408 -#: src/shuf.c:320 src/shuf.c:339 src/sort.c:4477 src/split.c:1313 -#: src/tr.c:1797 src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:454 -#: src/uniq.c:471 src/unlink.c:81 src/uptime.c:250 src/users.c:146 -#: src/wc.c:666 src/who.c:836 src/whoami.c:79 +#: 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 #, c-format msgid "extra operand %s" msgstr "extra operand %s" -#: src/base64.c:315 src/cat.c:781 +#: src/base64.c:318 src/cat.c:781 #, c-format msgid "closing standard input" msgstr "stänger standard in" @@ -959,15 +957,15 @@ 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/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:53 src/env.c:33 +#: 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/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:65 src/su.c:88 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 +#: 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 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -984,13 +982,11 @@ msgstr "" msgid "" "Print NAME with any leading directory components removed.\n" "If specified, also remove a trailing SUFFIX.\n" -"\n" msgstr "" "Skriv NAMN med eventuella inledande sökvägskomponenter borttagna.\n" "Tag bort eventuell specificerad ÄNDELSE.\n" -"\n" -#: src/basename.c:59 +#: 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" @@ -1000,7 +996,7 @@ msgstr "" " -s, --suffix=ÄNDELSE ta bort ett avslutande ÄNDELSE\n" " -z, --zero separera utdata med NOLL istället för nyrad\n" -#: src/basename.c:66 +#: src/basename.c:67 #, c-format msgid "" "\n" @@ -1017,20 +1013,21 @@ msgstr "" " %s -s .h include/stdio.h → ”stdio”\n" " %s -a any/str1 any/str2 → ”str1” följt av ”str2”\n" -#: src/basename.c:167 src/chcon.c:531 src/chgrp.c:277 src/chmod.c:526 -#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1369 +#: 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:183 src/mkfifo.c:108 src/mknod.c:146 src/nohup.c:111 -#: src/pathchk.c:148 src/printf.c:674 src/readlink.c:146 src/realpath.c:236 -#: src/rm.c:314 src/rmdir.c:223 src/seq.c:402 src/setuidgid.c:137 -#: src/sleep.c:119 src/stat.c:1476 src/stdbuf.c:346 src/tr.c:1782 +#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 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 #, 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:52 src/split.c:49 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/split.c:49 msgid "Torbjorn Granlund" msgstr "Torbjörn Granlund" @@ -1040,8 +1037,8 @@ msgstr "Torbjörn Granlund" msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:846 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4720 src/nl.c:182 src/paste.c:435 src/pr.c:2768 src/sum.c:58 +#: 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/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" @@ -1098,7 +1095,7 @@ msgstr "" msgid "cannot do ioctl on %s" msgstr "kan inte göra ”ioctl” på %s" -#: src/cat.c:637 src/dd.c:2209 src/sort.c:379 src/tee.c:165 src/yes.c:86 +#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86 #, c-format msgid "standard output" msgstr "standard ut" @@ -1115,14 +1112,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:55 src/head.c:46 src/hostid.c:33 +#: 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 msgid "Jim Meyering" msgstr "Jim Meyering" -#: src/chcon.c:100 src/runcon.c:203 src/runcon.c:234 +#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238 #, c-format msgid "failed to create security context: %s" msgstr "kunde inte skapa säkerhetskontext: %s" @@ -1132,8 +1129,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:540 src/copy.c:2222 src/runcon.c:217 -#: src/stat.c:683 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221 +#: src/stat.c:702 #, c-format msgid "failed to get security context of %s" msgstr "kunde inte ta reda på säkerhetskontext för %s" @@ -1149,12 +1146,12 @@ 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:446 src/ls.c:2981 +#: src/du.c:457 src/ls.c:2981 #, 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:426 +#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437 #, c-format msgid "cannot read directory %s" msgstr "kan inte läsa katalog %s" @@ -1164,13 +1161,13 @@ 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:599 +#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562 #, 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:618 -#: src/remove.c:613 +#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642 +#: src/remove.c:576 #, c-format msgid "fts_close failed" msgstr "fts_close misslyckades" @@ -1192,13 +1189,11 @@ msgid "" "Change the security context of each FILE to CONTEXT.\n" "With --reference, change the security context of each FILE to that of " "RFILE.\n" -"\n" msgstr "" "Ändra säkerhetskontext för varje FIL till KONTEXT.\n" "Med --reference, ändra säkerhetskontext för varje FIL till den hos RFIL.\n" -"\n" -#: src/chcon.c:362 src/chgrp.c:123 src/chown.c:94 +#: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94 msgid "" " --dereference affect the referent of each symbolic link (this is\n" " the default), rather than the symbolic link itself\n" @@ -1211,7 +1206,7 @@ msgstr "" " -h, --no-dereference ändra symboliska länkar istället för referade " "filer\n" -#: src/chcon.c:367 +#: src/chcon.c:369 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" @@ -1225,7 +1220,15 @@ msgstr "" " -l, --range=INTERVALL sätt intervallet INTERVALL i målets " "säkerhetskontext\n" -#: src/chcon.c:373 +#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 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 behandla inte ”/” speciellt (normalfall)\n" +" --preserve-root låt bli att arbeta på ”/”\n" + +#: src/chcon.c:379 msgid "" " --reference=RFILE use RFILE's security context rather than " "specifying\n" @@ -1235,16 +1238,16 @@ msgstr "" "ange\n" " ett KONTEXTvärde\n" -#: src/chcon.c:377 src/chgrp.c:140 src/chown.c:118 +#: 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 arbeta på filer och kataloger rekursivt\n" -#: src/chcon.c:380 +#: src/chcon.c:386 msgid " -v, --verbose output a diagnostic for every file processed\n" msgstr "" " -v, --verbose skriv ut ett meddelande för varje bearbetad fil\n" -#: src/chcon.c:383 src/chgrp.c:143 src/chown.c:121 +#: src/chcon.c:389 src/chgrp.c:143 src/chown.c:121 msgid "" "\n" "The following options modify how a hierarchy is traversed when the -R\n" @@ -1269,36 +1272,36 @@ msgstr "" " -P följ inga symboliska länkar (normalfall)\n" "\n" -#: src/chcon.c:512 src/chgrp.c:264 src/chown.c:267 +#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267 #, c-format msgid "-R --dereference requires either -H or -L" msgstr "-R --dereference kräver antingen -H eller -L" -#: src/chcon.c:518 +#: src/chcon.c:524 #, c-format msgid "-R -h requires -P" msgstr "-R -h kräver -P" -#: src/chcon.c:533 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282 -#: src/comm.c:429 src/csplit.c:1371 src/join.c:1149 src/link.c:79 -#: src/mknod.c:148 src/setuidgid.c:139 src/tr.c:1785 +#: 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 #, c-format msgid "missing operand after %s" msgstr "operand saknas efter %s" -#: src/chcon.c:556 src/runcon.c:247 +#: src/chcon.c:562 src/runcon.c:251 #, c-format msgid "invalid context: %s" msgstr "ogiltig kontext: %s" -#: src/chcon.c:563 +#: src/chcon.c:569 #, c-format msgid "conflicting security context specifiers given" msgstr "motstridiga specificerare för säkerhetskontext angivna" -#: src/chcon.c:572 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:433 src/cp.c:493 -#: src/mv.c:96 src/pwd.c:273 src/rm.c:324 src/touch.c:351 +#: 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 #, c-format msgid "failed to get attributes of %s" msgstr "kunde inte hämta attribut för %s" @@ -1333,7 +1336,7 @@ msgid "" " -f, --silent, --quiet suppress most error messages\n" " -v, --verbose output a diagnostic for every file processed\n" msgstr "" -" -c, --changes som \"verbose\" men rapportera bara när ändringar " +" -c, --changes som ”verbose” men rapportera bara när ändringar " "görs\n" " -f, --silent, --quiet utelämna de flesta felmeddelanden\n" " -v, --verbose skriv ut ett meddelande för varje bearbetad fil\n" @@ -1346,14 +1349,6 @@ msgstr "" " (meningsfullt endast på system där det går att\n" " ändra ägare på en symbolisk länk)\n" -#: src/chgrp.c:132 src/chmod.c:387 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 behandla inte ”/” speciellt (normalfall)\n" -" --preserve-root låt bli att arbeta på ”/”\n" - #: src/chgrp.c:136 msgid "" " --reference=RFILE use RFILE's group rather than specifying a\n" @@ -1614,7 +1609,7 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:97 src/install.c:575 src/setuidgid.c:110 src/setuidgid.c:120 +#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120 #, c-format msgid "invalid group %s" msgstr "ogiltig grupp %s" @@ -1683,8 +1678,8 @@ msgstr "misslyckades att sätta grupp-ID" 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:213 src/stdbuf.c:366 -#: src/timeout.c:402 +#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365 +#: src/timeout.c:454 #, c-format msgid "failed to run command %s" msgstr "misslyckades att köra kommandot %s" @@ -1804,20 +1799,24 @@ msgstr "multipla avgränsare angivna" msgid "empty %s not allowed" msgstr "tom %s är inte tillåtet" -#: src/copy.c:168 src/dd.c:1609 src/dd.c:1976 +#: 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 #, c-format -msgid "reading %s" -msgstr "läser %s" +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:426 +#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425 #, c-format msgid "cannot lseek %s" msgstr "kan inte göra lseek i %s" -#: src/copy.c:206 src/dd.c:2039 src/dd.c:2102 +#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151 #, c-format -msgid "writing %s" -msgstr "skriver %s" +msgid "error writing %s" +msgstr "fel vid skrivning av %s" #: src/copy.c:313 #, c-format @@ -1839,7 +1838,7 @@ msgstr "misslyckades att utöka %s" msgid "clearing permissions for %s" msgstr "tar bort rättigheter på %s" -#: src/copy.c:697 src/copy.c:2470 src/cp.c:331 +#: src/copy.c:697 src/copy.c:2480 src/cp.c:329 #, c-format msgid "failed to preserve ownership for %s" msgstr "misslyckades att bevara ägare av %s" @@ -1854,14 +1853,14 @@ msgstr "misslyckades att hitta filen %s" msgid "failed to preserve authorship for %s" msgstr "misslyckades att bevara författarskap för %s" -#: src/copy.c:804 src/csplit.c:638 src/du.c:901 src/fmt.c:449 src/head.c:847 -#: src/sort.c:4489 src/split.c:1329 src/tail.c:1756 src/wc.c:678 +#: 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 "kan inte öppna %s för läsning" -#: src/copy.c:810 src/copy.c:972 src/dd.c:1546 src/dd.c:2114 src/dd.c:2252 -#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:141 +#: 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 #, c-format msgid "cannot fstat %s" msgstr "kan inte göra fstat på %s" @@ -1881,14 +1880,14 @@ msgstr "misslyckades att hämta skapandekontexten för filsystemet" 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:1574 src/copy.c:1777 src/copy.c:1935 src/ln.c:314 -#: src/remove.c:267 src/remove.c:293 src/remove.c:444 src/remove.c:465 +#: 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 #, c-format msgid "cannot remove %s" msgstr "kan inte ta bort %s" -#: src/copy.c:886 src/copy.c:1578 src/copy.c:1772 src/copy.c:1940 -#: src/remove.c:418 +#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945 +#: src/remove.c:375 #, c-format msgid "removed %s\n" msgstr "tog bort %s\n" @@ -1908,186 +1907,186 @@ msgstr "kan inte skapa normal fil %s" msgid "failed to clone %s from %s" msgstr "misslyckades att klona %s från %s" -#: src/copy.c:1098 src/copy.c:2531 +#: src/copy.c:1098 src/copy.c:2541 #, c-format msgid "preserving times for %s" msgstr "bevarar tider på %s" -#: src/copy.c:1170 src/copy.c:1176 src/head.c:855 src/touch.c:175 -#: src/truncate.c:413 +#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172 +#: src/truncate.c:417 #, c-format -msgid "closing %s" -msgstr "stänger %s" +msgid "failed to close %s" +msgstr "misslyckades att stänga %s" -#: src/copy.c:1466 +#: src/copy.c:1471 #, 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)? " -#: src/copy.c:1473 +#: src/copy.c:1478 #, c-format msgid "%s: overwrite %s? " msgstr "%s: skriva över %s? " -#: src/copy.c:1542 +#: src/copy.c:1547 #, c-format msgid " (backup: %s)" msgstr "(säkerhetskopia: %s)" -#: src/copy.c:1552 +#: src/copy.c:1557 #, c-format msgid "failed to restore the default file creation context" msgstr "misslyckades att återställa standardkontext för filskapande" -#: src/copy.c:1584 +#: src/copy.c:1589 #, c-format msgid "cannot create hard link %s to %s" msgstr "kan inte skapa hård länk %s till %s" -#: src/copy.c:1637 src/copy.c:1689 src/copy.c:2272 src/copy.c:2589 +#: 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:1220 src/truncate.c:365 +#: src/stat.c:1239 src/truncate.c:363 #, c-format msgid "cannot stat %s" msgstr "kan inte ta status på %s" -#: src/copy.c:1645 +#: src/copy.c:1650 #, c-format msgid "omitting directory %s" msgstr "utesluter katalog %s" -#: src/copy.c:1659 +#: src/copy.c:1664 #, 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:1707 src/ln.c:246 +#: src/copy.c:1712 src/ln.c:246 #, c-format msgid "%s and %s are the same file" msgstr "%s och %s är samma fil" -#: src/copy.c:1806 +#: src/copy.c:1811 #, 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:1824 src/ln.c:214 +#: src/copy.c:1829 src/ln.c:214 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "kommer inte skriva över nyligen skapade %s med %s" -#: src/copy.c:1842 +#: src/copy.c:1847 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "kan inte skriva över katalog %s med icke-katalog" -#: src/copy.c:1856 +#: src/copy.c:1861 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "kan inte flytta katalog på icke-katalog: %s → %s" -#: src/copy.c:1886 +#: src/copy.c:1891 #, 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:1887 +#: src/copy.c:1892 #, 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:1910 src/ln.c:276 +#: src/copy.c:1915 src/ln.c:276 #, c-format msgid "cannot backup %s" msgstr "kan inte göra säkerhetskopia %s" -#: src/copy.c:1974 +#: src/copy.c:1979 #, 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:2051 +#: src/copy.c:2056 #, 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:2068 +#: src/copy.c:2073 #, 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:2118 +#: src/copy.c:2123 #, 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:2161 +#: src/copy.c:2166 #, c-format msgid "cannot move %s to %s" msgstr "kan inte flytta %s till %s" -#: src/copy.c:2173 +#: src/copy.c:2178 #, 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:2207 src/install.c:905 src/mkdir.c:189 src/mkfifo.c:114 -#: src/mknod.c:167 +#: 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:2241 +#: src/copy.c:2246 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "kan inte kopiera cyklisk symbolisk länk %s" -#: src/copy.c:2350 +#: src/copy.c:2355 #, 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:2357 +#: src/copy.c:2362 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "kan inte skapa symbolisk länk %s till %s" -#: src/copy.c:2406 src/mkfifo.c:133 +#: src/copy.c:2416 src/mkfifo.c:132 #, c-format msgid "cannot create fifo %s" msgstr "kan inte skapa fifo %s" -#: src/copy.c:2415 +#: src/copy.c:2425 #, c-format msgid "cannot create special file %s" msgstr "kan inte skapa specialfil %s" -#: src/copy.c:2426 src/ls.c:3191 src/stat.c:902 +#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921 #, c-format msgid "cannot read symbolic link %s" msgstr "kan inte läsa symbolisk länk %s" -#: src/copy.c:2453 +#: src/copy.c:2463 #, c-format msgid "cannot create symbolic link %s" msgstr "kan inte skapa symbolisk länk %s" -#: src/copy.c:2485 +#: src/copy.c:2495 #, c-format msgid "%s has unknown file type" msgstr "%s har okänd filtyp" -#: src/copy.c:2629 src/ln.c:358 +#: src/copy.c:2644 src/ln.c:358 #, c-format msgid "cannot un-backup %s" msgstr "kan inte avsäkerhetskopiera %s" -#: src/copy.c:2633 +#: src/copy.c:2648 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s → %s (återta säkerhetskopia)\n" -#: src/cp.c:156 src/mv.c:284 +#: src/cp.c:156 src/mv.c:286 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -2099,27 +2098,10 @@ msgstr "" " eller: %s [FLAGGA]... -t KATALOG KÄLLA...\n" #: src/cp.c:162 -msgid "" -"Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" -"\n" -msgstr "" -"Kopiera KÄLLA till DEST, eller flera KÄLLOR till KATALOG.\n" -"\n" - -#: src/cp.c:166 src/csplit.c:1458 src/cut.c:197 src/df.c:852 src/du.c:268 -#: src/expand.c:112 src/fmt.c:275 src/fold.c:75 src/head.c:115 -#: src/install.c:612 src/kill.c:86 src/ln.c:392 src/ls.c:4726 src/mkdir.c:61 -#: src/mkfifo.c:56 src/mknod.c:58 src/mv.c:294 src/nl.c:191 src/paste.c:445 -#: src/pr.c:2777 src/ptx.c:1825 src/shred.c:153 src/shuf.c:58 src/sort.c:399 -#: src/split.c:211 src/stdbuf.c:95 src/tac.c:142 src/tail.c:268 -#: src/touch.c:226 src/truncate.c:107 src/unexpand.c:122 src/uniq.c:145 -msgid "" -"Mandatory arguments to long options are mandatory for short options too.\n" -msgstr "" -"Obligatoriska argument till långa flaggor är obligatoriska även för de " -"korta.\n" +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:169 +#: src/cp.c:168 msgid "" " -a, --archive same as -dR --preserve=all\n" " --attributes-only don't copy the file data, just the " @@ -2141,26 +2123,28 @@ msgstr "" "rekursivt\n" " -d samma som --no-dereference --preserve=links\n" -#: src/cp.c:178 +#: src/cp.c:177 msgid "" " -f, --force if an existing destination file cannot be\n" -" opened, remove it and try again (redundant " -"if\n" -" the -n option is used)\n" +" opened, remove it and try again (this " +"option\n" +" is ignored when the -n option is also " +"used)\n" " -i, --interactive prompt before overwrite (overrides a previous " "-n\n" " option)\n" " -H follow command-line symbolic links in SOURCE\n" msgstr "" " -f, --force om en befintlig destinationsfil inte kan\n" -" öppnas, ta bort den och försök igen\n" -" (överflödigt om -n används)\n" -" -i, --interactive fråga innan något skrivs över (åsidosätt en\n" +" öppnas, ta bort den och försök igen (denna\n" +" flagga ignoreras om -n också används)\n" +" -i, --interactive fråga innan något skrivs över (åsidosätter " +"en\n" " tidigare flagga -n)\n" " -H följ symboliska länkar på kommandoraden i " "KÄLLA\n" -#: src/cp.c:188 +#: src/cp.c:186 msgid "" " -l, --link hard link files instead of copying\n" " -L, --dereference always follow symbolic links in SOURCE\n" @@ -2168,7 +2152,7 @@ msgstr "" " -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:192 +#: src/cp.c:190 msgid "" " -n, --no-clobber do not overwrite an existing file (overrides\n" " a previous -i option)\n" @@ -2179,7 +2163,7 @@ msgstr "" " en tidigare flagga -i)\n" " -P, --no-dereference följ aldrig symboliska länkar i KÄLLA\n" -#: src/cp.c:197 +#: src/cp.c:195 msgid "" " -p same as --preserve=mode,ownership,timestamps\n" " --preserve[=ATTR_LIST] preserve the specified attributes (default:\n" @@ -2196,7 +2180,7 @@ msgstr "" "xattr,\n" " all\n" -#: src/cp.c:205 +#: src/cp.c:203 msgid "" " --no-preserve=ATTR_LIST don't preserve the specified attributes\n" " --parents use full source file name under DIRECTORY\n" @@ -2204,7 +2188,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:209 +#: src/cp.c:207 msgid "" " -R, -r, --recursive copy directories recursively\n" " --reflink[=WHEN] control clone/CoW copies. See below\n" @@ -2217,7 +2201,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:215 +#: src/cp.c:213 msgid "" " --sparse=WHEN control creation of sparse files. See below\n" " --strip-trailing-slashes remove any trailing slashes from each " @@ -2229,7 +2213,7 @@ msgstr "" "från\n" " varje KÄLL-argument\n" -#: src/cp.c:220 +#: src/cp.c:218 msgid "" " -s, --symbolic-link make symbolic links instead of copying\n" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -2243,7 +2227,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:226 +#: src/cp.c:224 msgid "" " -u, --update copy only when the SOURCE file is newer\n" " than the destination file or when the\n" @@ -2257,7 +2241,7 @@ msgstr "" " -v, --verbose berätta vad som görs\n" " -x, --one-file-system stanna inom detta filsystem\n" -#: src/cp.c:235 +#: src/cp.c:233 msgid "" "\n" "By default, sparse SOURCE files are detected by a crude heuristic and the\n" @@ -2284,7 +2268,7 @@ msgstr "" "kopieringen eller, om --reflink=auto anges, faller tillbaka på en\n" "standardkopiering.\n" -#: src/cp.c:247 src/install.c:649 src/ln.c:421 src/mv.c:321 +#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322 msgid "" "\n" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -2300,7 +2284,7 @@ msgstr "" "med miljövariabeln VERSION_CONTROL. Den kan ha följande värden:\n" "\n" -#: src/cp.c:254 src/install.c:656 src/mv.c:328 +#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329 msgid "" " none, off never make backups (even if --backup is given)\n" " numbered, t make numbered backups\n" @@ -2312,7 +2296,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:260 +#: src/cp.c:258 msgid "" "\n" "As a special case, cp makes a backup of SOURCE when the force and backup\n" @@ -2324,92 +2308,92 @@ msgstr "" "backup-flaggorna är givna, och KÄLLA och DEST är samma namn på en befintlig\n" "normal fil.\n" -#: src/cp.c:319 +#: src/cp.c:317 #, c-format msgid "failed to preserve times for %s" msgstr "misslyckades att bevara tider för %s" -#: src/cp.c:350 +#: src/cp.c:348 #, c-format msgid "failed to preserve permissions for %s" msgstr "misslyckades att bevara rättigheter på %s" -#: src/cp.c:477 +#: src/cp.c:475 #, c-format msgid "cannot make directory %s" msgstr "kan inte skapa katalog %s" -#: src/cp.c:526 src/cp.c:545 +#: src/cp.c:524 src/cp.c:543 #, c-format msgid "%s exists but is not a directory" msgstr "%s finns men är inte en katalog" -#: src/cp.c:572 src/cp.c:1068 src/install.c:401 src/install.c:844 src/ln.c:123 -#: src/ln.c:181 src/ln.c:202 src/ln.c:516 src/mv.c:152 src/mv.c:399 +#: 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 #, c-format -msgid "accessing %s" -msgstr "bearbetar %s" +msgid "failed to access %s" +msgstr "misslyckades att komma åt %s" -#: src/cp.c:592 src/install.c:914 src/ln.c:546 src/mv.c:432 src/shred.c:1182 -#: src/touch.c:433 src/truncate.c:356 +#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181 +#: src/touch.c:429 src/truncate.c:354 #, c-format msgid "missing file operand" msgstr "filoperand saknas" -#: src/cp.c:594 src/install.c:916 src/ln.c:560 src/mv.c:434 +#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436 #, c-format msgid "missing destination file operand after %s" msgstr "destinationfilsoperand saknas efter %s" -#: src/cp.c:603 src/install.c:925 src/mv.c:443 +#: src/cp.c:601 src/install.c:926 src/mv.c:445 #, 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:619 src/cp.c:1070 src/install.c:403 src/install.c:846 -#: src/install.c:938 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:401 -#: src/mv.c:457 +#: 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 #, c-format msgid "target %s is not a directory" msgstr "målet %s är inte en katalog" -#: src/cp.c:730 +#: src/cp.c:728 #, c-format msgid "with --parents, the destination must be a directory" msgstr "med --parents måste destinationen vara en katalog" -#: src/cp.c:1063 src/install.c:839 src/ln.c:511 src/mv.c:394 +#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395 #, c-format msgid "multiple target directories specified" msgstr "multipla målkataloger angivna" -#: src/cp.c:1108 +#: src/cp.c:1110 #, 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:1115 src/mv.c:464 +#: src/cp.c:1117 src/mv.c:466 #, c-format msgid "options --backup and --no-clobber are mutually exclusive" msgstr "flaggorna --backup och --no-clobber är ömsesidigt uteslutande" -#: src/cp.c:1121 +#: src/cp.c:1123 #, c-format msgid "--reflink can be used only with --sparse=auto" msgstr "--reflink kan endast användas med --sparse=auto" -#: src/cp.c:1129 src/install.c:899 src/ln.c:582 src/mv.c:472 +#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474 msgid "backup type" msgstr "säkerhetskopietyp" -#: src/cp.c:1154 +#: src/cp.c:1156 #, 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:1160 +#: src/cp.c:1162 #, 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" @@ -2419,137 +2403,135 @@ msgstr "kan inte bevara utökade attribut, cp byggdes utan stöd för xattr" msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:529 +#: src/csplit.c:531 #, c-format msgid "input disappeared" msgstr "indata försvann" -#: src/csplit.c:658 src/csplit.c:669 +#: src/csplit.c:660 src/csplit.c:671 #, c-format msgid "%s: line number out of range" msgstr "%s: radnummer utanför intervallet" -#: src/csplit.c:698 +#: src/csplit.c:700 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: radnummer utanför intervallet" -#: src/csplit.c:701 src/csplit.c:750 +#: src/csplit.c:703 src/csplit.c:752 #, c-format msgid " on repetition %s\n" msgstr " vid upprepning %s\n" -#: src/csplit.c:744 +#: src/csplit.c:746 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: ingen träff" -#: src/csplit.c:808 src/csplit.c:848 src/nl.c:359 src/tac.c:274 +#: src/csplit.c:810 src/csplit.c:850 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:981 +#: src/csplit.c:983 #, c-format msgid "write error for %s" msgstr "skrivfel för %s" -#: src/csplit.c:1057 +#: src/csplit.c:1059 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: heltal förväntades efter avskiljare" -#: src/csplit.c:1073 +#: src/csplit.c:1075 #, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: upprepningsoperatorn måste avslutas med ”}”" -#: src/csplit.c:1083 +#: src/csplit.c:1085 #, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: heltal krävs mellan ”{” och ”}”" -#: src/csplit.c:1110 +#: src/csplit.c:1112 #, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: avslutande avskiljare ”%c” saknas" -#: src/csplit.c:1127 +#: src/csplit.c:1129 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: felaktigt reguljärt uttryck: %s" -#: src/csplit.c:1160 +#: src/csplit.c:1162 #, c-format msgid "%s: invalid pattern" msgstr "%s: felaktigt mönster" -#: src/csplit.c:1163 +#: src/csplit.c:1165 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: radnummer måste vara större än noll" -#: src/csplit.c:1169 +#: src/csplit.c:1171 #, 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:1175 +#: src/csplit.c:1177 #, 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:1253 +#: src/csplit.c:1255 #, c-format msgid "missing conversion specifier in suffix" msgstr "saknar formatbeskrivning i ändelse" -#: src/csplit.c:1259 +#: src/csplit.c:1261 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "felaktig formatbeskrivning i ändelse: %c" -#: src/csplit.c:1262 +#: src/csplit.c:1264 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "felaktig formatbeskrivning i ändelse: \\%.3o" -#: src/csplit.c:1267 +#: src/csplit.c:1269 #, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "ogiltiga flaggor formatbeskrivning: %%%c%c" -#: src/csplit.c:1284 +#: src/csplit.c:1286 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "för många %%-formatbeskrivningar i ändelse" -#: src/csplit.c:1298 +#: src/csplit.c:1300 #, c-format msgid "missing %% conversion specification in suffix" msgstr "saknar %%-formatbeskrivning i ändelse" -#: src/csplit.c:1345 +#: src/csplit.c:1347 #, c-format msgid "%s: invalid number" msgstr "%s: felaktigt tal" -#: src/csplit.c:1449 +#: src/csplit.c:1451 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Användning: %s [FLAGGA]... FIL MÖNSTER...\n" -#: src/csplit.c:1453 +#: src/csplit.c:1455 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" -"\n" 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" -"\n" -#: src/csplit.c:1461 +#: src/csplit.c:1462 #, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2560,7 +2542,7 @@ 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:1466 +#: src/csplit.c:1467 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" @@ -2570,7 +2552,7 @@ msgstr "" " -s, --quiet, --silent skriv inte ut storleken på utmatningsfiler\n" " -z, --elide-empty-files ta bort tomma utmatningsfiler\n" -#: src/csplit.c:1473 +#: src/csplit.c:1474 msgid "" "\n" "Read standard input if FILE is -. Each PATTERN may be:\n" @@ -2579,7 +2561,7 @@ msgstr "" "Läs standard in om FIL är -. Varje MÖNSTER kan vara:\n" "\n" -#: src/csplit.c:1477 +#: src/csplit.c:1478 msgid "" "\n" " INTEGER copy up to but not including specified line number\n" @@ -2606,7 +2588,7 @@ msgstr "" msgid "David M. Ihnat" msgstr "David M. Ihnat" -#: src/cut.c:64 +#: 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" @@ -2616,14 +2598,10 @@ msgid "Usage: %s OPTION... [FILE]...\n" msgstr "Användning: %s FLAGGA... [FIL]...\n" #: src/cut.c:193 -msgid "" -"Print selected parts of lines from each FILE to standard output.\n" -"\n" -msgstr "" -"Skriv valda delar av rader från varje FIL till standard ut.\n" -"\n" +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:200 +#: src/cut.c:199 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2634,7 +2612,7 @@ msgstr "" " -d, --delimiter=AVSKILJ använd AVSKILJ i stället för TAB som " "fältavskiljare\n" -#: src/cut.c:205 +#: src/cut.c:204 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2645,7 +2623,7 @@ msgstr "" " saknar avkiljare, om inte flaggan -s anges\n" " -n (ignorerad)\n" -#: src/cut.c:211 +#: src/cut.c:210 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" @@ -2654,7 +2632,7 @@ msgstr "" "eller \n" " fälten\n" -#: src/cut.c:215 +#: src/cut.c:214 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2664,7 +2642,7 @@ msgstr "" " --output-delimiter=STRÄNG använd STRÄNG som avskiljare vid utmatning\n" " standard är att avända inmatningsavskiljaren\n" -#: src/cut.c:222 +#: src/cut.c:221 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2676,7 +2654,7 @@ msgstr "" "intervall, eller flera intervall avskilda med komman. Utvald indata\n" "skrivs i samma ordning som den läses, och skrivs exakt en gång.\n" -#: src/cut.c:228 +#: src/cut.c:227 msgid "" "Each range is one of:\n" "\n" @@ -2696,45 +2674,46 @@ msgstr "" "\n" "Utan FIL eller när FIL är -, läs standard in.\n" -#: src/cut.c:368 src/cut.c:489 -msgid "invalid byte or field list" -msgstr "felaktig byte- eller fältlista" +#: src/cut.c:367 src/cut.c:493 +msgid "invalid byte, character or field list" +msgstr "felaktig byte-, tecken- eller fältlista" -#: src/cut.c:385 +#: src/cut.c:387 msgid "invalid range with no endpoint: -" msgstr "ogiltigt intervall utan slutpunkt: -" -#: src/cut.c:399 +#: src/cut.c:403 msgid "invalid decreasing range" msgstr "ogiltigt sjunkande intervall" -#: src/cut.c:478 +#: src/cut.c:482 #, c-format msgid "byte offset %s is too large" msgstr "byteposition %s är för stor" -#: src/cut.c:481 +#: src/cut.c:485 #, c-format msgid "field number %s is too large" msgstr "fältnummer %s är för stort" -#: src/cut.c:789 src/cut.c:797 +#: src/cut.c:795 src/cut.c:803 msgid "only one type of list may be specified" msgstr "endast en sorts lista får användas" -#: src/cut.c:806 +#: src/cut.c:812 src/numfmt.c:1408 +#, c-format msgid "the delimiter must be a single character" msgstr "avskiljaren måste vara endast ett tecken" -#: src/cut.c:841 +#: src/cut.c:847 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:844 +#: src/cut.c:850 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:848 +#: src/cut.c:854 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2742,11 +2721,11 @@ msgstr "" "att undertrycka ej avskilda rader är endast rimligt\n" "\tvid arbete på fält" -#: src/cut.c:864 +#: src/cut.c:870 msgid "missing list of fields" msgstr "saknar fältlista" -#: src/cut.c:866 +#: src/cut.c:872 msgid "missing list of positions" msgstr "saknar lista med positionsangivelser" @@ -2760,9 +2739,11 @@ msgstr "" " eller: %s [-u|--utc|--universal] [MMDDhhmm[[ÅÅ]ÅÅ][.ss]]\n" #: src/date.c:128 +msgid "Display the current time in the given FORMAT, or set the system date.\n" +msgstr "Visa aktuell tid med angivet FORMAT, eller ställ in systemtiden.\n" + +#: src/date.c:134 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" " -I[TIMESPEC], --iso-8601[=TIMESPEC] output date/time in ISO 8601 format.\n" @@ -2770,8 +2751,6 @@ msgid "" " 'hours', 'minutes', 'seconds', or 'ns' for date\n" " and time to the indicated precision.\n" msgstr "" -"Visa aktuell tid på det angivna FORMATet, eller sätt systemtiden.\n" -"\n" " -d, --date=STRÄNG visa tiden som beskriv av STRÄNG, inte ”nu”\n" " -f, --file=DATUMFIL som --date en gång för varje rad i DATUMFIL\n" " -I[TIDSSPEC], --iso-8601[=TIDSSPEC] skriv ut datum/tid i ISO 8601-" @@ -2781,7 +2760,7 @@ msgstr "" "datum\n" " och tid med den angivna precisionen.\n" -#: src/date.c:138 +#: src/date.c:142 msgid "" " -r, --reference=FILE display the last modification time of FILE\n" " -R, --rfc-2822 output date and time in RFC 2822 format.\n" @@ -2791,7 +2770,7 @@ msgstr "" " -R, --rfc-2822 skriv ut tid och datum enligt formatet RFC 2822\n" " Exampel: Mon, 07 Aug 2006 12:34:56 +0200\n" -#: src/date.c:143 +#: src/date.c:147 msgid "" " --rfc-3339=TIMESPEC output date and time in RFC 3339 format.\n" " TIMESPEC='date', 'seconds', or 'ns' for\n" @@ -2813,7 +2792,7 @@ msgstr "" " -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" -#: src/date.c:154 +#: src/date.c:158 msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" @@ -2827,7 +2806,7 @@ msgstr "" " %% ett literalt %\n" " %a lokalens förkortade veckodagsnamn (t.ex. sön)\n" -#: src/date.c:161 +#: src/date.c:165 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2839,7 +2818,7 @@ msgstr "" " %B lokalens fullständiga månadsnamn (t.ex. januari)\n" " %c lokalens dag och tid (t.ex. ons 5 okt 2005 22.02.05)\n" -#: src/date.c:167 +#: src/date.c:171 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2851,7 +2830,7 @@ msgstr "" " %D datum, samma som %m/%d/%y\n" " %e dag i månad, blankutfyllt, samma som %_d\n" -#: src/date.c:173 +#: src/date.c:177 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -2862,7 +2841,7 @@ msgstr "" " %G året motsvarande ISO-veckonumret (se %V), normalt användbart endast\n" " med %V\n" -#: src/date.c:178 +#: src/date.c:182 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2874,7 +2853,7 @@ msgstr "" " %I timme (01-12)\n" " %j dag på året (001-366)\n" -#: src/date.c:184 +#: src/date.c:188 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -2886,7 +2865,7 @@ msgstr "" " %m månad (01-12)\n" " %M minut (00-59)\n" -#: src/date.c:190 +#: src/date.c:194 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2904,7 +2883,7 @@ msgstr "" " %R 24-timmars timme och minut, samma som %H:%M\n" " %s sekunder sedan ”1970-01-01 00.00.00 UTC”\n" -#: src/date.c:199 +#: src/date.c:203 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2916,7 +2895,7 @@ msgstr "" " %T tid, samma som %H:%M:%S\n" " %u dag i veckan (1-7), 1 är måndag\n" -#: src/date.c:205 +#: src/date.c:209 msgid "" " %U week number of year, with Sunday as first day of week (00..53)\n" " %V ISO week number, with Monday as first day of week (01..53)\n" @@ -2928,7 +2907,7 @@ msgstr "" " %w veckodag (0-6); 0 är söndag\n" " %W veckonummer, med måndag som första dag i veckan (00-53)\n" -#: src/date.c:211 +#: src/date.c:215 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -2940,7 +2919,7 @@ msgstr "" " %y sista två siffrorna i årtalet (00-99)\n" " %Y år\n" -#: src/date.c:217 +#: src/date.c:221 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -2960,7 +2939,7 @@ msgstr "" "\n" "Normalt fyller date ut numeriska fält med nollor.\n" -#: src/date.c:226 +#: src/date.c:230 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -2978,7 +2957,7 @@ msgstr "" " ^ använd versaler om möjligt\n" " # använd motsatt skiftläge om möjligt\n" -#: src/date.c:235 +#: src/date.c:239 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -2993,7 +2972,7 @@ msgstr "" "eller\n" "O för att använda lokalens alternativa numeriska symboler om tillgängliga.\n" -#: src/date.c:242 +#: src/date.c:246 msgid "" "\n" "Examples:\n" @@ -3017,36 +2996,36 @@ 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:275 src/dd.c:2193 src/head.c:838 src/md5sum.c:477 -#: src/md5sum.c:798 src/od.c:863 src/od.c:1914 src/pr.c:1176 src/pr.c:1372 -#: src/pr.c:1494 src/stty.c:842 src/tac.c:563 src/tail.c:343 src/tee.c:126 +#: 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 #, c-format msgid "standard input" msgstr "standard in" -#: src/date.c:303 src/date.c:523 +#: src/date.c:307 src/date.c:527 #, c-format msgid "invalid date %s" msgstr "ogiltigt datum %s" -#: src/date.c:414 src/date.c:448 +#: src/date.c:418 src/date.c:452 #, c-format msgid "multiple output formats specified" msgstr "multipla utformat angivna" -#: src/date.c:426 +#: src/date.c:430 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "flaggorna för att ange datum för utskrift är ömsesidigt uteslutande" -#: src/date.c:433 +#: src/date.c:437 #, c-format msgid "the options to print and set the time may not be used together" msgstr "" "argumenten för utskrift och för tidsinställning får inte användas tillsammans" -#: src/date.c:454 +#: src/date.c:458 #, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -3057,23 +3036,23 @@ msgstr "" "När en flagga som anger datum används måste eventuellt argument, som\n" "inte är en flagga vara en formatsträng som börjar med ”+”" -#: src/date.c:531 +#: src/date.c:535 #, c-format msgid "cannot set date" msgstr "kan inte ställa klockan" -#: src/date.c:554 src/du.c:360 +#: src/date.c:558 src/du.c:371 #, c-format msgid "time %s is out of range" msgstr "tiden %s är utanför tillåtet intervall" #. This is a proper name. See the gettext manual, section Names. -#: src/dd.c:44 src/factor.c:43 src/rm.c:41 src/tail.c:69 src/touch.c:41 +#: 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 "Paul Rubin" -#: src/dd.c:517 +#: src/dd.c:521 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3082,7 +3061,7 @@ msgstr "" "Användning: %s [OPERAND]...\n" " eller: %s FLAGGA\n" -#: src/dd.c:522 +#: src/dd.c:526 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -3100,7 +3079,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:531 +#: src/dd.c:535 msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -3109,7 +3088,8 @@ msgid "" " oflag=FLAGS write as per the comma separated symbol list\n" " seek=N skip N obs-sized blocks at start of output\n" " skip=N skip N ibs-sized blocks at start of input\n" -" status=noxfer suppress transfer statistics\n" +" status=WHICH WHICH info to suppress outputting to stderr;\n" +" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" msgstr "" " if=FIL läs från FIL istället för standard in\n" " iflag=FLAGGOR läs enligt den kommaseparerade symbollistan\n" @@ -3118,12 +3098,14 @@ msgstr "" " oflag=FLAGGOR skriv enligt den kommaseparerade symbollistan\n" " seek=N hoppa över N obs-stora block från början av utfil\n" " skip=N hoppa över N ibs-stora block från början av infil\n" -" status=noxfer utelämna överföringsstatistik\n" +" status=VILKEN VILKEN information som skall utelämnas från utskrift till\n" +" standard fel; ”noxfer” utelämnar överföringsstatistik,\n" +" ”none” utelämnar allt\n" -#: src/dd.c:541 +#: src/dd.c:546 msgid "" "\n" -"BLOCKS and BYTES may be followed by the following multiplicative suffixes:\n" +"N and BYTES may be followed by the following multiplicative suffixes:\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, and so on for T, P, E, Z, Y.\n" "\n" @@ -3131,14 +3113,14 @@ msgid "" "\n" msgstr "" "\n" -"BLOCK och BYTE kan följas av de följande multiplikativa ändelserna:\n" +"N och BYTE kan följas av de följande multiplikativa ändelserna:\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, och så vidare för T, P, E, Z, Y.\n" "\n" "Varje KONV-symbol kan vara:\n" "\n" -#: src/dd.c:550 +#: src/dd.c:555 msgid "" " ascii from EBCDIC to ASCII\n" " ebcdic from ASCII to EBCDIC\n" @@ -3165,7 +3147,7 @@ msgstr "" " det används med block eller unblock, fyll ut med blanktecken\n" " istället för nulltecken\n" -#: src/dd.c:563 +#: src/dd.c:568 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3181,7 +3163,7 @@ msgstr "" " fdatasync skriv fysiskt data till utfilen före avslut\n" " fsync d:o, men skriv även metadata\n" -#: src/dd.c:571 +#: src/dd.c:576 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3195,75 +3177,75 @@ msgstr "" " append lägg-till-läge (meningsfullt endast för utmatning, conv=notrunc\n" " rekommenderas)\n" -#: src/dd.c:578 +#: src/dd.c:583 msgid " cio use concurrent I/O for data\n" msgstr " cio använd samtidig I/O för data\n" -#: src/dd.c:580 +#: src/dd.c:585 msgid " direct use direct I/O for data\n" msgstr " direct använd direkt I/O för data\n" -#: src/dd.c:582 +#: src/dd.c:587 msgid " directory fail unless a directory\n" msgstr " directory misslyckas om inte en katalog\n" -#: src/dd.c:584 +#: src/dd.c:589 msgid " dsync use synchronized I/O for data\n" msgstr " dsync använd synkroniserad I/O för data\n" -#: src/dd.c:586 +#: src/dd.c:591 msgid " sync likewise, but also for metadata\n" msgstr " sync d:o, men även för metadata\n" -#: src/dd.c:587 +#: src/dd.c:592 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr " fullblock ackumulera hela block av indata (endast iflag)\n" -#: src/dd.c:590 +#: src/dd.c:595 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock använd icke blockerande I/O\n" -#: src/dd.c:592 +#: src/dd.c:597 msgid " noatime do not update access time\n" msgstr " noatime uppdatera inte åtkomsttiden\n" -#: src/dd.c:595 +#: src/dd.c:600 msgid " nocache discard cached data\n" msgstr " nocache kasta mellanlagrade data\n" -#: src/dd.c:598 +#: src/dd.c:603 msgid " noctty do not assign controlling terminal from file\n" msgstr " noctty tilldela inte styrterminal från fil\n" -#: src/dd.c:601 +#: src/dd.c:606 msgid " nofollow do not follow symlinks\n" msgstr " nofollow följ inte symboliska länkar\n" -#: src/dd.c:603 +#: src/dd.c:608 msgid " nolinks fail if multiply-linked\n" msgstr " nolinks misslyckas ifall flera länkar\n" -#: src/dd.c:605 +#: src/dd.c:610 msgid " binary use binary I/O for data\n" msgstr " binary använd binär I/O för data\n" -#: src/dd.c:607 +#: src/dd.c:612 msgid " text use text I/O for data\n" msgstr " text använd text-I/O för data\n" -#: src/dd.c:609 +#: src/dd.c:614 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:612 +#: src/dd.c:617 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:615 +#: src/dd.c:620 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:620 +#: src/dd.c:625 #, c-format msgid "" "\n" @@ -3290,7 +3272,7 @@ msgstr "" " 18335302+0 poster ut\n" " 9387674624 byte (9.4 GB) kopierade, 34.6279 sekunder, 271 MB/s\n" -#: src/dd.c:676 +#: src/dd.c:683 #, c-format msgid "" "%<PRIuMAX>+%<PRIuMAX> records in\n" @@ -3299,21 +3281,21 @@ msgstr "" "%<PRIuMAX>+%<PRIuMAX> poster in\n" "%<PRIuMAX>+%<PRIuMAX> poster ut\n" -#: src/dd.c:682 +#: src/dd.c:689 #, 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:694 +#: src/dd.c:701 #, 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:712 +#: src/dd.c:720 msgid "Infinity B" msgstr "Oändligt B" @@ -3327,83 +3309,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:725 +#: src/dd.c:733 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g s, %s/s\n" -#: src/dd.c:804 +#: src/dd.c:812 #, c-format msgid "closing input file %s" msgstr "stänger infil %s" -#: src/dd.c:811 +#: src/dd.c:819 #, c-format msgid "closing output file %s" msgstr "stänger utdatafil %s" -#: src/dd.c:1014 +#: src/dd.c:1022 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "misslyckades att slå av O_DIRECT: %s" -#: src/dd.c:1085 src/dd.c:1934 +#: src/dd.c:1093 src/dd.c:1942 #, c-format msgid "writing to %s" msgstr "skrivning till %s" -#: src/dd.c:1199 src/dd.c:1253 +#: src/dd.c:1207 src/dd.c:1261 #, c-format msgid "unrecognized operand %s" msgstr "okänd operand %s" -#: src/dd.c:1210 +#: src/dd.c:1218 msgid "invalid conversion" msgstr "ogiltig konvertering" -#: src/dd.c:1213 src/dd.c:1289 +#: src/dd.c:1221 src/dd.c:1297 msgid "invalid input flag" msgstr "ogiltig inflagga" -#: src/dd.c:1216 src/dd.c:1283 src/dd.c:1295 +#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303 msgid "invalid output flag" msgstr "ogiltig utflagga" -#: src/dd.c:1219 +#: src/dd.c:1227 msgid "invalid status flag" msgstr "ogiltig statusflagga" -#: src/dd.c:1258 src/truncate.c:312 +#: src/dd.c:1266 src/truncate.c:310 #, c-format msgid "invalid number %s" msgstr "ogiltigt antal %s" -#: src/dd.c:1340 +#: src/dd.c:1348 #, 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:1342 +#: src/dd.c:1350 #, c-format msgid "cannot combine block and unblock" msgstr "kan inte kombinera block och unblock" -#: src/dd.c:1344 +#: src/dd.c:1352 #, c-format msgid "cannot combine lcase and ucase" msgstr "kan inte kombinera lcase och ucase" -#: src/dd.c:1346 +#: src/dd.c:1354 #, c-format msgid "cannot combine excl and nocreat" msgstr "kan inte kombinera excl och nocreate" -#: src/dd.c:1349 +#: src/dd.c:1357 #, c-format msgid "cannot combine direct and nocache" msgstr "det går inte att kombinera direct och nocache" -#: src/dd.c:1506 +#: src/dd.c:1514 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3412,72 +3394,72 @@ 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:1593 +#: src/dd.c:1601 #, c-format msgid "%s: cannot skip" msgstr "%s: kan inte hoppa över" -#: src/dd.c:1595 src/dd.c:1614 src/dd.c:1675 +#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683 #, c-format msgid "%s: cannot seek" msgstr "%s: kan inte söka" -#: src/dd.c:1655 +#: src/dd.c:1663 #, c-format msgid "offset overflow while reading file %s" msgstr "spill i filposition vid läsning av filen %s" -#: src/dd.c:1667 +#: src/dd.c:1675 #, c-format msgid "warning: invalid file offset after failed read" msgstr "varning: ogiltig filposition efter misslyckad läsning" -#: src/dd.c:1671 +#: src/dd.c:1679 #, c-format msgid "cannot work around kernel bug after all" msgstr "kan inte kringgå fel i kärnan trots allt" -#: src/dd.c:1814 +#: src/dd.c:1822 #, c-format msgid "setting flags for %s" msgstr "sätter flaggor för %s" -#: src/dd.c:1867 +#: 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:1881 +#: 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:1914 +#: src/dd.c:1922 #, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: kan inte hoppa över till angiven position" -#: src/dd.c:2125 src/dd.c:2258 +#: src/dd.c:2133 #, c-format -msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" -msgstr "misslyckades att hugga av vid %<PRIuMAX> byte i utdatafil %s" +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:2138 +#: src/dd.c:2146 #, c-format msgid "fdatasync failed for %s" msgstr "fdatasync misslyckades för %s" -#: src/dd.c:2148 +#: src/dd.c:2156 #, c-format msgid "fsync failed for %s" msgstr "fsync misslyckades för %s" -#: src/dd.c:2199 src/dd.c:2228 +#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165 #, c-format -msgid "opening %s" -msgstr "öppnar %s" +msgid "failed to open %s" +msgstr "misslyckades att öppna %s" -#: src/dd.c:2237 +#: src/dd.c:2246 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) " @@ -3486,84 +3468,104 @@ msgstr "" "positionen för stor: kan inte hugga av till en längd av seek=%<PRIuMAX> (%lu-" "byte-)block" -#: src/dd.c:2274 src/dd.c:2280 +#: src/dd.c:2267 +#, 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 #, 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:54 src/expr.c:153 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:39 src/sleep.c:35 src/sort.c:66 +#: 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 msgid "Paul Eggert" msgstr "Paul Eggert" -#: src/df.c:140 +#: src/df.c:172 msgid "Filesystem" msgstr "Filsystem" -#: src/df.c:141 +#: src/df.c:175 msgid "Type" msgstr "Typ" -#: src/df.c:142 +#: src/df.c:178 src/df.c:542 msgid "blocks" msgstr "block" -#: src/df.c:142 -msgid "Inodes" -msgstr "Inoder" - -#: src/df.c:142 -msgid "Size" -msgstr "Storlek" - -#: src/df.c:143 +#: src/df.c:181 msgid "Used" msgstr "Använt" -#: src/df.c:143 -msgid "IUsed" -msgstr "IAnvänt" - -#: src/df.c:144 +#: src/df.c:184 msgid "Available" msgstr "Tillgängligt" -#: src/df.c:144 -msgid "IFree" -msgstr "ILediga" - -#: src/df.c:144 -msgid "Avail" -msgstr "Ledigt" - -#: src/df.c:145 +#: src/df.c:187 msgid "Use%" msgstr "Anv%" -#: src/df.c:145 +#: src/df.c:190 +msgid "Inodes" +msgstr "Inoder" + +#: src/df.c:193 +msgid "IUsed" +msgstr "IAnvänt" + +#: src/df.c:196 +msgid "IFree" +msgstr "ILediga" + +#: src/df.c:199 msgid "IUse%" msgstr "IAnv%" -#: src/df.c:145 +#: src/df.c:202 +msgid "Mounted on" +msgstr "Monterat på" + +#: src/df.c:383 +#, c-format +msgid "option --output: field '%s' unknown" +msgstr "flaggan --output: fältet ”%s” är okänt" + +#: src/df.c:390 +#, c-format +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 +msgid "Size" +msgstr "Storlek" + +#: src/df.c:414 src/df.c:451 +msgid "Avail" +msgstr "Ledigt" + +#: src/df.c:474 msgid "Capacity" msgstr "Kapacitet" -#: src/df.c:146 -msgid "Mounted on" -msgstr "Monterat på" +#. 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 +#, c-format +msgid "%s-%s" +msgstr "%s-%s" -#: src/df.c:847 +#: src/df.c:1210 msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" -"\n" msgstr "" "Visa information om filsystemet där varje FIL ligger, eller annars alla\n" "filsystem.\n" -"\n" -#: src/df.c:855 +#: src/df.c:1217 msgid "" " -a, --all include dummy file systems\n" " -B, --block-size=SIZE scale sizes by SIZE before printing them. E.g.,\n" @@ -3583,7 +3585,7 @@ msgstr "" " -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" -#: src/df.c:865 +#: src/df.c:1227 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3597,8 +3599,11 @@ msgstr "" " --no-sync anropa inte sync innan information hämtas " "(normalfall)\n" -#: src/df.c:872 +#: src/df.c:1234 msgid "" +" --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" +" or print all fields if FIELD_LIST is " +"omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" " -t, --type=TYPE limit listing to file systems of type TYPE\n" @@ -3606,27 +3611,55 @@ 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" +" 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" " -t, --type=TYP begränsa listningen till filsystem av typen TYP\n" " -T, --print-type skriv ut filsystemtyp\n" -" -x, --exclude-type=TYP utelämna filsystem av typ TYP\n" +" -x, --exclude-type=TYP utelämna filsystem av typ TYP\n" " -v (ignorerad)\n" -#: src/df.c:1027 +#: src/df.c:1248 +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" +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" + +#: src/df.c:1285 +#, 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 #, c-format msgid "file system type %s both selected and excluded" msgstr "filsystemstypen %s är både vald och exkluderad" -#: src/df.c:1075 +#: src/df.c:1500 msgid "Warning: " msgstr "Varning: " -#: src/df.c:1077 src/stat.c:795 +#: src/df.c:1502 src/stat.c:814 msgid "cannot read table of mounted file systems" msgstr "kan inte läsa tabellen över monterade filsystem" -#: src/df.c:1107 +#: src/df.c:1539 #, c-format msgid "no file systems processed" msgstr "inga filsystem bearbetade" @@ -3738,7 +3771,7 @@ msgstr "" " %s dir1/str dir2/str → ”dir1” följt av ”dir2”\n" " %s stdio.h → ”.”.\n" -#: src/du.c:260 src/sort.c:390 src/wc.c:112 +#: src/du.c:270 src/sort.c:394 src/wc.c:112 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3747,16 +3780,14 @@ msgstr "" "Användning: %s [FLAGGA]... [FIL]...\n" " eller: %s [FLAGGA]... --files0-from=F\n" -#: src/du.c:264 -msgid "" -"Summarize disk usage of each FILE, recursively for directories.\n" -"\n" -msgstr "" -"Sammanfatta diskanvändningen för varje FIL, rekursivt för kataloger.\n" -"\n" +#: src/du.c:274 +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:271 +#: src/du.c:280 msgid "" +" -0, --null end each output line with 0 byte rather than " +"newline\n" " -a, --all write counts for all files, not just directories\n" " --apparent-size print apparent sizes, rather than disk usage; " "although\n" @@ -3764,6 +3795,8 @@ 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" " -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, " @@ -3773,7 +3806,7 @@ msgstr "" " intern fragmentering, indirekta block, och " "liknande\n" -#: src/du.c:279 +#: src/du.c:289 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" @@ -3782,6 +3815,11 @@ msgid "" " -c, --total produce a grand total\n" " -D, --dereference-args dereference only symlinks that are listed on the\n" " command line\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 "" " -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 " @@ -3792,8 +3830,12 @@ msgstr "" " -D, --dereference-args följ endast symboliska länkar som är uppräknade " "på\n" " kommandoraden\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\n" +" som --summarize\n" -#: src/du.c:288 +#: src/du.c:302 msgid "" " --files0-from=F summarize disk usage of the NUL-terminated file\n" " names specified in file F;\n" @@ -3801,64 +3843,42 @@ msgid "" " -H equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" --si like -h, but use powers of 1000 not 1024\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" " -H detsamma som --dereference-args (-D)\n" " -h, --human-readable skriv storlekar i läsbart format (t.ex. 1K 234M 2G)\n" -" --si som -h men i exponenter av 1000 istället för 1024\n" -#: src/du.c:297 +#: src/du.c:310 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 som --block-size=1K\n" +" -L, --dereference följ alla symboliska länkar\n" " -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:302 +#: src/du.c:316 msgid "" -" -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " "default)\n" -" -0, --null end each output line with 0 byte rather than " -"newline\n" " -S, --separate-dirs 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ölj alla symboliska länkar\n" " -P, --no-dereference följ inga symboliska länkar (detta är normalfallet)\n" -" -0, --null avsluta varje utrad med en 0-byte istället för " -"nyrad\n" " -S, --separate-dirs ta 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:309 -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" - -#: src/du.c:318 +#: src/du.c:322 msgid "" +" -t, --threshold=SIZE exclude entries smaller than SIZE if positive,\n" +" or entries greater than SIZE if negative\n" " --time show time of the last modification of any file in " "the\n" " directory, or any of its subdirectories\n" @@ -3868,73 +3888,89 @@ msgid "" " full-iso, long-iso, iso, +FORMAT\n" " FORMAT is interpreted like '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" +" 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" -" FORMAT tolkas so för ”date”\n" +" full-iso, long-iso, iso, +FORMAT\n" +" FORMAT tolkas so för ”date”\n" + +#: src/du.c:333 +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 utelämna filer som matchar något mönster i FIL\n" +" --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:375 -#, fuzzy +#: src/du.c:386 msgid "Infinity" -msgstr "Oändligt B" +msgstr "Oändligt" + +#: src/du.c:507 +#, c-format +msgid "mount point %s already traversed" +msgstr "monteringspunkten %s är redan traverserad" -#: src/du.c:600 +#: src/du.c:624 #, c-format msgid "fts_read failed: %s" msgstr "fts_read misslyckades: %s" -#: src/du.c:724 +#: src/du.c:780 #, c-format msgid "invalid maximum depth %s" msgstr "ogiltigt maxdjup %s" -#: src/du.c:817 +#: src/du.c:809 +#, c-format +msgid "invalid --threshold argument '-0'" +msgstr "felaktigt argument till --threshold ”-0”" + +#: src/du.c:887 #, c-format msgid "cannot both summarize and show all entries" msgstr "kan inte samtidigt bara visa summan och alla storlekar" -#: src/du.c:824 +#: src/du.c:894 #, 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:830 +#: src/du.c:900 #, 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:896 src/sort.c:4479 src/wc.c:668 +#: src/du.c:966 src/sort.c:4533 src/wc.c:668 msgid "file operands cannot be combined with --files0-from" msgstr "filoperander kan inte kombineras med --files0-from" -#: src/du.c:949 src/md5sum.c:587 src/od.c:903 src/tac.c:239 src/tac.c:350 -#: src/tac.c:506 src/tac.c:586 src/wc.c:733 +#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 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:963 src/sort.c:4508 src/wc.c:747 +#: src/du.c:1040 src/sort.c:4562 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:980 src/du.c:988 src/wc.c:760 src/wc.c:768 +#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768 msgid "invalid zero-length file name" msgstr "ogiltigt filnamn med längd noll" -#: src/du.c:1007 src/head.c:149 src/head.c:262 src/head.c:334 src/head.c:538 -#: src/head.c:620 src/head.c:692 src/head.c:750 src/head.c:774 src/tail.c:412 -#: src/tail.c:500 src/tail.c:549 src/tail.c:642 src/tail.c:770 src/tail.c:818 -#: src/tail.c:855 src/tail.c:1782 src/tail.c:1812 src/uniq.c:395 -#, c-format -msgid "error reading %s" -msgstr "fel vid läsning av %s" - -#: src/du.c:1010 src/ls.c:2649 src/wc.c:791 +#: src/du.c:1088 src/ls.c:2649 src/wc.c:791 msgid "total" msgstr "totalt" @@ -4037,22 +4073,21 @@ msgid "Usage: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n" msgstr "Användning: %s [FLAGGA]... [-] [NAMN=VÄRDE]... [KOMMANDO [ARG]...]\n" #: src/env.c:55 +msgid "Set each NAME to VALUE in the environment and run COMMAND.\n" +msgstr "Sätt varje NAMN till VÄRDE i miljön och kör KOMMANDO.\n" + +#: src/env.c:61 msgid "" -"Set each NAME to VALUE in the environment and run COMMAND.\n" -"\n" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with 0 byte rather than newline\n" " -u, --unset=NAME remove variable from the environment\n" msgstr "" -"Sätt varje NAMN till VÄRDE i miljön och kör KOMMANDO.\n" -"\n" -" -i, --ignore-environment börja med en tom miljö\n" -" -0, --null avsluta varje utmatad rad med en 0-byte " -"istället\n" -" för nyrad\n" -" -u, --unset=NAMN ta bort variabeln från miljön\n" +" -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" +" -u, --unset=NAMN ta bort variabeln från miljön\n" -#: src/env.c:64 +#: src/env.c:68 msgid "" "\n" "A mere - implies -i. If no COMMAND, print the resulting environment.\n" @@ -4061,17 +4096,17 @@ msgstr "" "Ett ensamt - medför -i. Om inget KOMMANDO, skriv ut den resulterande " "miljön.\n" -#: src/env.c:120 +#: src/env.c:124 #, c-format msgid "cannot unset %s" msgstr "kan inte ta bort %s" -#: src/env.c:131 +#: src/env.c:135 #, c-format msgid "cannot set %s" msgstr "kan inte sätta %s" -#: src/env.c:148 +#: src/env.c:152 #, c-format msgid "cannot specify --null (-0) with command" msgstr "det går inte att ange --null (-0) med ett kommando" @@ -4080,13 +4115,11 @@ msgstr "det går inte att ange --null (-0) med ett kommando" msgid "" "Convert tabs in each FILE to spaces, writing to standard output.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" "Konvertera tabulatorer i varje FIL till mellanslag, skriv till standard ut.\n" "Utan FIL eller om FIL är -, läs standard in.\n" -"\n" -#: src/expand.c:115 +#: src/expand.c:114 msgid "" " -i, --initial do not convert tabs after non blanks\n" " -t, --tabs=NUMBER have tabs NUMBER characters apart, not 8\n" @@ -4094,33 +4127,33 @@ msgstr "" " -i, --initial konvertera inte tabulatorer efter icke-blanktecken\n" " -t, --tabs=ANTAL använd ANTAL tecken mellan tabulatorer, ej 8\n" -#: src/expand.c:119 +#: src/expand.c:118 msgid "" " -t, --tabs=LIST use comma separated list of explicit tab positions\n" msgstr "" " -t, --tabs=LISTA använd kommaseparerad lista med tabulatorpositioner\n" -#: src/expand.c:172 src/unexpand.c:191 +#: src/expand.c:171 src/unexpand.c:190 #, c-format msgid "tab stop is too large %s" msgstr "tabulatorsteg är för stort %s" -#: src/expand.c:180 src/unexpand.c:199 +#: src/expand.c:179 src/unexpand.c:198 #, c-format msgid "tab size contains invalid character(s): %s" msgstr "tabulatorsteg innehåller felaktiga tecken: %s" -#: src/expand.c:206 src/unexpand.c:225 +#: src/expand.c:205 src/unexpand.c:224 #, c-format msgid "tab size cannot be 0" msgstr "tabulatorsteg kan inte vara 0" -#: src/expand.c:208 src/unexpand.c:227 +#: src/expand.c:207 src/unexpand.c:226 #, c-format msgid "tab sizes must be ascending" msgstr "tabulatorsteg måste vara stigande" -#: src/expand.c:326 src/expand.c:345 src/unexpand.c:374 src/unexpand.c:419 +#: 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 "för lång rad in" @@ -4218,10 +4251,10 @@ msgstr "" "\n" " STRÄNG : REGUTTR förankrad mönstersökning efter REGUTTR i STRÄNG\n" "\n" -" match STRÄNG REGUTTR samma som STRÄNG : REGUTTR\n" -" subtr STRÄNG POS LÄNGD delsträng av STRÄNG, POS räknas från 1\n" -" 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" +" match STRÄNG REGUTTR samma som STRÄNG : REGUTTR\n" +" substr STRÄNG POS LÄNGD delsträng av STRÄNG, POS räknas från 1\n" +" 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 msgid "" @@ -4279,12 +4312,12 @@ msgstr "fel i matchningen av reguljärt uttryck" msgid "non-integer argument" msgstr "argument som inte är heltal" -#: src/expr.c:793 src/truncate.c:316 +#: src/expr.c:793 src/truncate.c:314 #, c-format msgid "division by zero" msgstr "division med noll" -#: src/expr.c:887 src/sort.c:2029 +#: src/expr.c:887 src/sort.c:2044 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "sätt LC_ALL='C' för att kringgå problemet" @@ -4294,25 +4327,32 @@ msgstr "sätt LC_ALL='C' för att kringgå problemet" msgid "the strings compared were %s and %s" msgstr "de jämförda strängarna var %s och %s" -#: src/factor.c:449 -msgid "using arbitrary-precision arithmetic" -msgstr "använder aritmetik med godtycklig precision" +#. This is a proper name. See the gettext manual, section Names. +#: src/factor.c:111 +msgid "Niels Moller" +msgstr "Niels Möller" -#: src/factor.c:460 -msgid "using single-precision arithmetic" -msgstr "använder aritmetik med enkel precision" +#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459 +#, c-format +msgid "Lucas prime test failure. This should not happen" +msgstr "Lucas primtalstest misslyckades. Detta skall inte hända" -#: src/factor.c:465 src/od.c:1640 src/od.c:1709 +#: src/factor.c:2092 #, c-format -msgid "%s is too large" -msgstr "%s är för stort" +msgid "squfof queue overflow" +msgstr "squfof köspill" -#: src/factor.c:469 +#: src/factor.c:2419 #, c-format msgid "%s is not a valid positive integer" msgstr "%s är inte ett giltigt positivt heltal" -#: src/factor.c:494 +#: src/factor.c:2442 src/od.c:1646 src/od.c:1715 +#, c-format +msgid "%s is too large" +msgstr "%s är för stort" + +#: src/factor.c:2454 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4322,7 +4362,7 @@ msgstr "" " eller: %s FLAGGA\n" "\n" -#: src/factor.c:499 +#: src/factor.c:2459 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" @@ -4349,24 +4389,22 @@ msgid "cannot stat current directory (now %s)" msgstr "kan inte ta status på aktuell katalog (nu %s)" #. This is a proper name. See the gettext manual, section Names. -#: src/fmt.c:37 +#: src/fmt.c:38 msgid "Ross Paterson" msgstr "Ross Paterson" -#: src/fmt.c:269 +#: src/fmt.c:270 #, c-format msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n" msgstr "Användning: %s [-BREDD] [FLAGGA]... [FIL]...\n" -#: src/fmt.c:270 +#: 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" -"\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" -"\n" #: src/fmt.c:278 msgid "" @@ -4380,8 +4418,12 @@ msgstr "" " sätt tillbaka prefixet på omformaterade rader\n" " -s, --split-only dela långa rader, men justera ej\n" -#: src/fmt.c:285 -#, fuzzy, c-format +# 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 "" " -t, --tagged-paragraph indentation of first line different from second\n" " -u, --uniform-spacing one space between words, two after sentences\n" @@ -4392,8 +4434,9 @@ 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" -#: src/fmt.c:357 +#: src/fmt.c:359 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -4402,7 +4445,7 @@ msgstr "" "ogiltig flagga -- %c; -RADLÄNGD accepteras bara när det är den första\n" "flaggan; använd -w N istället" -#: src/fmt.c:403 src/fmt.c:414 +#: src/fmt.c:405 src/fmt.c:416 #, c-format msgid "invalid width: %s" msgstr "ogiltig radlängd: %s" @@ -4411,13 +4454,11 @@ msgstr "ogiltig radlängd: %s" msgid "" "Wrap input lines in each FILE (standard input by default), writing to\n" "standard output.\n" -"\n" msgstr "" "Bryt inmatade rader i varje fil (standard in som standard) och skriv till\n" "standard ut.\n" -"\n" -#: src/fold.c:78 +#: src/fold.c:77 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4427,13 +4468,13 @@ msgstr "" " -s, --spaces bryt vid mellanrum\n" " -w, --width=ANTAL använd ANTAL kolumner i stället för 80\n" -#: src/fold.c:289 src/pr.c:836 +#: src/fold.c:288 src/pr.c:832 #, c-format 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:75 +#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 #: src/truncate.c:37 msgid "Padraig Brady" msgstr "Padraig Brady" @@ -4452,17 +4493,17 @@ msgstr "" "skalskript.\n" "\n" -#: src/group-list.c:69 src/id.c:345 src/setuidgid.c:184 +#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184 #, 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:350 +#: src/group-list.c:74 src/id.c:370 #, c-format msgid "failed to get groups for the current process" msgstr "kunde inte avgöra grupper för dem aktuella processen" -#: src/group-list.c:104 +#: src/group-list.c:114 #, c-format msgid "cannot find name for group ID %lu" msgstr "kan inte hitta ett namn för grupp-ID %lu" @@ -4508,14 +4549,12 @@ 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" -"\n" msgstr "" "Skriv de 10 första raderna av varje FIL till standard ut.\n" "Vid fler än en FIL, föregå varje fil med ett huvud med filens namn.\n" "Utan FIL eller när FIL är -, läs standard in.\n" -"\n" -#: src/head.c:118 +#: src/head.c:117 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -4534,7 +4573,7 @@ msgstr "" "sista\n" " K raderna av varje fil\n" -#: src/head.c:126 +#: src/head.c:125 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4542,7 +4581,7 @@ msgstr "" " -q, --quiet, --silent skriv aldrig huvuden med filnamn\n" " -v, --verbose skriv alltid huvuden med filnamn\n" -#: src/head.c:132 +#: src/head.c:131 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -4554,58 +4593,58 @@ 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:152 -#, c-format -msgid "error writing %s" -msgstr "fel vid skrivning av %s" - -#: src/head.c:155 +#: src/head.c:154 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: filen har krympt för mycket" -#: src/head.c:228 src/head.c:1044 +#: src/head.c:227 src/head.c:1051 #, c-format msgid "%s: number of bytes is too large" msgstr "%s: antal byte är för stort" -#: src/head.c:441 +#: 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:613 src/head.c:684 src/tail.c:450 +#: src/head.c:612 src/head.c:691 src/tail.c:449 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: kan inte söka till position %s" -#: src/head.c:791 +#: src/head.c:673 +#, 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" -#: src/head.c:878 +#: src/head.c:885 #, 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:879 +#: src/head.c:886 msgid "number of lines" msgstr "antal rader" -#: src/head.c:879 +#: src/head.c:886 msgid "number of bytes" msgstr "antal byte" -#: src/head.c:886 src/tail.c:1947 +#: src/head.c:893 src/tail.c:1947 msgid "invalid number of lines" msgstr "felaktigt antal rader" -#: src/head.c:887 src/tail.c:1948 +#: src/head.c:894 src/tail.c:1948 msgid "invalid number of bytes" msgstr "felaktigt antal byte" -#: src/head.c:974 src/head.c:1032 +#: src/head.c:981 src/head.c:1039 #, c-format msgid "invalid trailing option -- %c" msgstr "ogiltig avslutande flagga -- %c" @@ -4723,86 +4762,86 @@ msgstr "kan inte få processkontexten" msgid "cannot get effective UID" msgstr "kan inte få fram effekiv UID" -#: src/id.c:289 +#: src/id.c:311 #, c-format -msgid "cannot find name for user ID %lu" -msgstr "kan inte hitta ett namn för användar-ID %lu" +msgid "cannot find name for user ID %s" +msgstr "kan inte hitta ett namn för användar-ID %s" -#: src/id.c:309 +#: src/id.c:329 #, c-format -msgid "uid=%lu" -msgstr "uid=%lu" +msgid "uid=%s" +msgstr "uid=%s" -#: src/id.c:314 +#: src/id.c:334 #, c-format -msgid " gid=%lu" -msgstr " gid=%lu" +msgid " gid=%s" +msgstr " gid=%s" -#: src/id.c:321 +#: src/id.c:341 #, c-format -msgid " euid=%lu" -msgstr " euid=%lu" +msgid " euid=%s" +msgstr " euid=%s" -#: src/id.c:329 +#: src/id.c:349 #, c-format -msgid " egid=%lu" -msgstr " egid=%lu" +msgid " egid=%s" +msgstr " egid=%s" -#: src/id.c:357 +#: src/id.c:377 msgid " groups=" msgstr " grupper=" -#: src/id.c:373 +#: src/id.c:393 #, c-format msgid " context=%s" msgstr " kontext=%s" -#: src/install.c:372 +#: src/install.c:373 #, c-format msgid "warning: %s: failed to change context to %s" msgstr "varning: %s: misslyckades att byta kontext till %s" -#: src/install.c:413 +#: src/install.c:414 #, c-format msgid "creating directory %s" msgstr "skapar katalog %s" -#: src/install.c:481 +#: src/install.c:482 #, c-format msgid "cannot change ownership of %s" msgstr "kan inte byta ägare av %s" -#: src/install.c:505 +#: src/install.c:506 #, c-format msgid "cannot set time stamps for %s" msgstr "kan inte sätta tidsstämpel för %s" -#: src/install.c:526 src/split.c:412 src/timeout.c:387 +#: src/install.c:527 src/split.c:426 src/timeout.c:439 #, c-format msgid "fork system call failed" msgstr "systemanropet fork misslyckades" -#: src/install.c:530 +#: src/install.c:531 #, c-format msgid "cannot run %s" msgstr "kan inte köra %s" -#: src/install.c:534 +#: src/install.c:535 #, c-format msgid "waiting for strip" msgstr "väntar på strip" -#: src/install.c:536 +#: src/install.c:537 #, c-format msgid "strip process terminated abnormally" msgstr "strip-processen slutade onormalt" -#: src/install.c:557 +#: src/install.c:558 #, c-format msgid "invalid user %s" msgstr "ogiltig användare %s" -#: src/install.c:593 +#: src/install.c:594 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -4815,7 +4854,7 @@ msgstr "" " eller: %s [FLAGGA]... -t KATALOG KÄLLA...\n" " eller: %s [FLAGGA]... -d KATALOG...\n" -#: src/install.c:600 +#: src/install.c:601 msgid "" "\n" "This install program copies files (often just compiled) into destination\n" @@ -4827,7 +4866,6 @@ msgid "" "In the first three forms, copy SOURCE to DEST or multiple SOURCE(s) to\n" "the existing DIRECTORY, while setting permission modes and owner/group.\n" "In the 4th form, create all components of the given DIRECTORY(ies).\n" -"\n" msgstr "" "\n" "Detta installationsprogram kopierar filer (oftast nykompilerade) till\n" @@ -4839,7 +4877,6 @@ msgstr "" "en befintlig KATALOG, samtidigt som rättigheter och ägare/grupp sätts.\n" "Det fjärde formatet skapar KATALOG(er) inklusive eventuella " "föräldrakataloger.\n" -"\n" #: src/install.c:615 msgid "" @@ -4911,55 +4948,55 @@ msgstr "" " -Z, --context=KONTEXT sätt SELinux-säkerhetskontext på filer och " "kataloger\n" -#: src/install.c:858 +#: src/install.c:859 #, 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:868 +#: 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:885 +#: src/install.c:886 #, 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:888 +#: src/install.c:889 #, 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:892 +#: 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:946 src/mkdir.c:202 src/stdbuf.c:327 +#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326 #, c-format msgid "invalid mode %s" msgstr "ogiltig rättighet %s" -#: src/install.c:953 +#: src/install.c:954 #, 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:958 +#: src/install.c:959 #, 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:965 +#: src/install.c:966 #, c-format msgid "options --compare (-C) and --strip are mutually exclusive" msgstr "flaggorna --compare (-C) och --strip är ömsesidigt uteslutande" -#: src/install.c:971 +#: src/install.c:972 #, c-format msgid "" "the --compare (-C) option is ignored when you specify a mode with non-" @@ -4968,7 +5005,7 @@ msgstr "" "flaggan --compare (-C) ignoreras när du anger ett läge med tillåt-inte-bitar" #. This is a proper name. See the gettext manual, section Names. -#: src/join.c:40 src/sort.c:65 +#: src/join.c:40 src/sort.c:66 msgid "Mike Haertel" msgstr "Mike Haertel" @@ -5061,8 +5098,8 @@ msgstr "" #: src/join.c:403 #, c-format -msgid "%s:%ju: is not sorted: %.*s" -msgstr "%s:%ju: är inte sorterad: %.*s" +msgid "%s:%<PRIuMAX>: is not sorted: %.*s" +msgstr "%s:%<PRIuMAX>: är inte sorterad: %.*s" #: src/join.c:840 src/join.c:1038 #, c-format @@ -5089,12 +5126,12 @@ msgstr "inkompatibla join-fält %lu, %lu" msgid "conflicting empty-field replacement strings" msgstr "motsägelsefulla ersättningssträngar för tomma fält" -#: src/join.c:1101 src/sort.c:4414 +#: src/join.c:1101 src/sort.c:4468 #, c-format msgid "multi-character tab %s" msgstr "flerteckenstabulator %s" -#: src/join.c:1105 src/sort.c:4419 +#: src/join.c:1105 src/sort.c:4473 #, c-format msgid "incompatible tabs" msgstr "inkompatibla tabulatorer" @@ -5116,14 +5153,10 @@ msgstr "" " eller: %s -t [SIGNAL]...\n" #: src/kill.c:82 -msgid "" -"Send signals to processes, or list signals.\n" -"\n" -msgstr "" -"Skickar signaler till processer, eller räknar upp signaler.\n" -"\n" +msgid "Send signals to processes, or list signals.\n" +msgstr "Skickar signaler till processer, eller räknar upp signaler.\n" -#: src/kill.c:89 +#: src/kill.c:88 msgid "" " -s, --signal=SIGNAL, -SIGNAL\n" " specify the name or number of the signal to be sent\n" @@ -5138,7 +5171,7 @@ msgstr "" " nummer\n" " -t, --table skriv en tabell med signalinformation\n" -#: src/kill.c:97 +#: src/kill.c:96 msgid "" "\n" "SIGNAL may be a signal name like 'HUP', or a signal number like '1',\n" @@ -5150,32 +5183,32 @@ msgstr "" "”1”, eller en slutstatus från en process avslutad av en signal. PID\n" "är ett heltal; om det är negativt identifierar det en processgrupp.\n" -#: src/kill.c:206 +#: src/kill.c:205 #, c-format msgid "%s: invalid process id" msgstr "%s: ogiltigt process-id" -#: src/kill.c:260 +#: src/kill.c:259 #, c-format msgid "invalid option -- %c" msgstr "ogiltig flagga -- %c" -#: src/kill.c:269 +#: src/kill.c:268 #, c-format msgid "%s: multiple signals specified" msgstr "%s: flera signaler angivna" -#: src/kill.c:283 +#: src/kill.c:282 #, c-format msgid "multiple -l or -t options specified" msgstr "multipla -l eller -t-flaggor angivna" -#: src/kill.c:300 +#: src/kill.c:299 #, c-format msgid "cannot combine signal with -l or -t" msgstr "kan inte kombinera signal med -l eller -t" -#: src/kill.c:306 +#: src/kill.c:305 #, c-format msgid "no process ID specified" msgstr "inget process-ID angivet" @@ -5286,7 +5319,6 @@ msgid "" "When creating hard links, each TARGET must exist. Symbolic links\n" "can hold arbitrary text; if later resolved, a relative link is\n" "interpreted in relation to its parent directory.\n" -"\n" msgstr "" "I det första formatet, skapa en link till MÅL med namnet LÄNKNAMN.\n" "I det andra formatet, skapa en länk till MÅL i aktuell katalog.\n" @@ -5295,9 +5327,8 @@ msgstr "" "Normalt får varje destination (namn på ny länk) inte redan finnas.\n" "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" -"\n" -#: src/ln.c:395 +#: src/ln.c:394 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -5317,7 +5348,7 @@ msgstr "" " även för superanvändaren)\n" " -f, --force ta bort befintliga destinationsfiler\n" -#: src/ln.c:403 +#: src/ln.c:402 msgid "" " -i, --interactive prompt whether to remove destinations\n" " -L, --logical dereference TARGETs that are symbolic links\n" @@ -5339,7 +5370,7 @@ msgstr "" " -s, --symbolic gör symboliska länkar istället för hårda " "länkar\n" -#: src/ln.c:412 +#: src/ln.c:411 msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" " -t, --target-directory=DIRECTORY specify the DIRECTORY in which to " @@ -5353,26 +5384,14 @@ 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:428 -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" - -#: src/ln.c:435 +#: src/ln.c:433 #, 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" "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" @@ -5443,7 +5462,7 @@ msgstr "ignorerar felaktig bredd i miljövariabeln COLUMNS: %s" 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:1976 +#: src/ls.c:1750 src/ptx.c:1975 #, c-format msgid "invalid line width: %s" msgstr "felaktig radlängd: %s" @@ -5506,7 +5525,7 @@ msgstr "läser katalog %s" msgid "closing directory %s" msgstr "stänger katalog %s" -#: src/ls.c:3301 +#: src/ls.c:3302 #, c-format msgid "cannot compare file names %s and %s" msgstr "kan inte jämföra filnamnen %s och %s" @@ -5515,13 +5534,11 @@ msgstr "kan inte jämföra filnamnen %s och %s" msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" -"\n" msgstr "" "Visa information om FILerna (aktuell katalog om inget anges). Sortera\n" "posterna alfabetiskt om ingen av -cftuvSUX eller --sort anges.\n" -"\n" -#: src/ls.c:4729 +#: src/ls.c:4728 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -5534,7 +5551,7 @@ 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:4735 +#: src/ls.c:4734 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them. E." "g.,\n" @@ -5560,7 +5577,7 @@ msgstr "" " med -l: visa ctime och sortera alfabetiskt\n" " annars: sortera efter ctime, nyast först\n" -#: src/ls.c:4745 +#: src/ls.c:4744 msgid "" " -C list entries by columns\n" " --color[=WHEN] colorize the output. WHEN defaults to " @@ -5580,7 +5597,7 @@ msgstr "" " och följ inte symboliska länkar\n" " -D, --dired anpassa utdata för Emacs dired-funktion\n" -#: src/ls.c:4753 +#: src/ls.c:4752 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -5597,11 +5614,11 @@ msgstr "" " single-column -1, verbose -l, vertical -C\n" " --full-time som -l --time-style=full-iso\n" -#: src/ls.c:4761 +#: src/ls.c:4760 msgid " -g like -l, but do not list owner\n" msgstr " -g som -l, men skriv inte ut ägare\n" -#: src/ls.c:4764 +#: src/ls.c:4763 msgid "" " --group-directories-first\n" " group directories before files.\n" @@ -5613,7 +5630,7 @@ msgstr "" " utöka med en flagga --sort, men användning\n" " av --sort=none (-U) avaktiverar gruppering\n" -#: src/ls.c:4770 +#: src/ls.c:4769 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" @@ -5625,7 +5642,7 @@ msgstr "" " (t.ex. 1K 234M 2G)\n" " --si d:o, men använd potenser av 1000, inte 1024\n" -#: src/ls.c:4776 +#: src/ls.c:4775 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5647,7 +5664,7 @@ msgstr "" "MÖNSTER\n" " (åsidosätts av -a eller -A)\n" -#: src/ls.c:4786 +#: src/ls.c:4785 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -5667,7 +5684,7 @@ msgstr "" " skalMÖNSTER\n" " -k, --kibibytes använd 1024-bytesblock\n" -#: src/ls.c:4796 +#: src/ls.c:4795 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5684,7 +5701,7 @@ msgstr "" " -m fyll bredden med en kommaseparerad lista av " "poster\n" -#: src/ls.c:4804 +#: src/ls.c:4803 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. " @@ -5702,7 +5719,7 @@ msgstr "" " -p, --indicator-style=slash\n" " lägg till en /-indikator till kataloger\n" -#: src/ls.c:4812 +#: src/ls.c:4811 msgid "" " -q, --hide-control-chars print ? instead of non graphic characters\n" " --show-control-chars show non graphic characters as-is (default\n" @@ -5723,7 +5740,7 @@ msgstr "" " literal, locale, shell, shell-always, c, " "escape\n" -#: src/ls.c:4821 +#: src/ls.c:4820 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -5735,7 +5752,7 @@ msgstr "" " -s, --size skriv allokerade storleken i block för varje " "fil\n" -#: src/ls.c:4826 +#: src/ls.c:4825 msgid "" " -S sort by file size\n" " --sort=WORD sort by WORD instead of name: none -U,\n" @@ -5755,7 +5772,7 @@ msgstr "" " angiven tid som sorteringsnyckel om --" "sort=time\n" -#: src/ls.c:4836 +#: src/ls.c:4835 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, +FORMAT.\n" @@ -5776,7 +5793,7 @@ msgstr "" "gäller\n" " STIL endast utanför lokalen POSIX\n" -#: src/ls.c:4845 +#: src/ls.c:4844 msgid "" " -t sort by modification time, newest first\n" " -T, --tabsize=COLS assume tab stops at each COLS instead of 8\n" @@ -5784,7 +5801,7 @@ msgstr "" " -t sortera efter modifieringstid, nyast först\n" " -T, --tabsize=KOLUMN antag tabulatorsteg varje KOLUMN, inte var 8:e\n" -#: src/ls.c:4849 +#: src/ls.c:4848 msgid "" " -u with -lt: sort by, and show, access time\n" " with -l: show access time and sort by name\n" @@ -5799,7 +5816,7 @@ msgstr "" " -U sortera inte; lista poster i katalogordning\n" " -v naturlig sortering av (versions)nummer i text\n" -#: src/ls.c:4856 +#: src/ls.c:4855 msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" @@ -5815,7 +5832,7 @@ msgstr "" " varje fil\n" " -1 lista en fil per rad\n" -#: src/ls.c:4866 +#: src/ls.c:4865 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5830,7 +5847,7 @@ msgstr "" "Miljövariablen LS_COLORS kan ändra instaällningen Använd kommandot\n" "dircolors för att sätta den.\n" -#: src/ls.c:4873 +#: src/ls.c:4872 msgid "" "\n" "Exit status:\n" @@ -5859,7 +5876,7 @@ msgstr "Scott Miller" msgid "David Madore" msgstr "David Madore" -#: src/md5sum.c:162 +#: src/md5sum.c:164 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -5872,7 +5889,7 @@ msgstr "" "Utan FIL eller om FIL är -, läs standard in.\n" "\n" -#: src/md5sum.c:172 +#: src/md5sum.c:174 msgid "" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" @@ -5880,27 +5897,31 @@ msgstr "" " -b, --binary läs i binärt läge (standard om inte standard in från\n" " tty läses)\n" -#: src/md5sum.c:176 +#: src/md5sum.c:178 msgid " -b, --binary read in binary mode\n" msgstr " -b, --binary läs i binärt läge\n" -#: src/md5sum.c:179 +#: src/md5sum.c:181 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr " -c, --check läs %s-summor från FILen och kontrollera dem\n" -#: src/md5sum.c:183 +#: src/md5sum.c:184 +msgid " --tag create a BSD-style checksum\n" +msgstr " --tag skapa en kontrollsumma i BSD-stil\n" + +#: src/md5sum.c:188 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" " -t, --text läs i textläge (standard om standard in från tty " "läses)\n" -#: src/md5sum.c:187 +#: src/md5sum.c:192 msgid " -t, --text read in text mode (default)\n" msgstr " -t, --text läs i textläge (standard)\n" -#: src/md5sum.c:190 +#: src/md5sum.c:195 msgid "" "\n" "The following three options are useful only when verifying checksums:\n" @@ -5917,14 +5938,14 @@ msgstr "" " -w, --warn varna för felaktigt formaterade kontrollsummerader\n" "\n" -#: src/md5sum.c:198 +#: 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:203 +#: src/md5sum.c:208 #, c-format msgid "" "\n" @@ -5939,56 +5960,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:502 +#: src/md5sum.c:523 #, c-format msgid "%s: too many checksum lines" msgstr "%s: för många kontrollsummerader" -#: src/md5sum.c:526 +#: src/md5sum.c:547 #, c-format msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line" msgstr "%s: %<PRIuMAX>: felaktigt formaterad %s-kontrollsummerad" -#: src/md5sum.c:551 +#: src/md5sum.c:572 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: MISSLYCKADES att öppna eller läsa\n" -#: src/md5sum.c:574 +#: src/md5sum.c:595 msgid "FAILED" msgstr "MISSLYCKADES" -#: src/md5sum.c:576 +#: src/md5sum.c:597 msgid "OK" msgstr "OK" -#: src/md5sum.c:600 +#: src/md5sum.c:621 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "%s: inga korrekt formaterade %s-kontrollsummerader funna" -#: src/md5sum.c:610 +#: src/md5sum.c:631 #, 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:618 +#: src/md5sum.c:639 #, 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:626 +#: src/md5sum.c:647 #, 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:704 +#: src/md5sum.c:760 +#, c-format +msgid "--tag does not support --text mode" +msgstr "--tag stödjer inte läget --text" + +#: src/md5sum.c:766 +#, 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 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" @@ -5996,22 +6027,22 @@ msgstr "" "flaggorna --binary och --text är meningsfulla enbart när kontrollsummor\n" "verifieras" -#: src/md5sum.c:712 +#: src/md5sum.c:781 #, 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:719 +#: src/md5sum.c:788 #, 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:726 +#: src/md5sum.c:795 #, 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:733 +#: src/md5sum.c:802 #, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "flaggan --strict är meningsfull enbart när kontrollsummor verifieras" @@ -6022,14 +6053,10 @@ msgid "Usage: %s [OPTION]... DIRECTORY...\n" msgstr "Användning: %s [FLAGGA]... KATALOG...\n" #: src/mkdir.c:57 -msgid "" -"Create the DIRECTORY(ies), if they do not already exist.\n" -"\n" -msgstr "" -"Skapa KATALOG(er), om de inte redan finns.\n" -"\n" +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:64 +#: src/mkdir.c:63 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" @@ -6044,7 +6071,7 @@ msgstr "" " -Z, --context=KTX sätt SELinuxsäkerhetskontexten på varje skapad katalog\n" " till KTX\n" -#: src/mkdir.c:169 +#: src/mkdir.c:168 #, c-format msgid "created directory %s" msgstr "skapade katalog %s" @@ -6055,32 +6082,28 @@ msgid "Usage: %s [OPTION]... NAME...\n" msgstr "Användning: %s [FLAGGA]... NAMN...\n" #: src/mkfifo.c:52 -msgid "" -"Create named pipes (FIFOs) with the given NAMEs.\n" -"\n" -msgstr "" -"Skapa namngivna rör (FIFO) med de givna NAMNen.\n" -"\n" +msgid "Create named pipes (FIFOs) with the given NAMEs.\n" +msgstr "Skapa namngivna rör (FIFO) med de givna NAMNen.\n" -#: src/mkfifo.c:59 src/mknod.c:61 +#: src/mkfifo.c:58 src/mknod.c:60 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:62 +#: src/mkfifo.c:61 msgid "" " -Z, --context=CTX set the SELinux security context of each NAME to CTX\n" msgstr "" " -Z, --context=KTX sätt SELinux-säkerhetskontexten på varje NAMN till KTX\n" -#: src/mkfifo.c:122 src/mknod.c:128 +#: src/mkfifo.c:121 src/mknod.c:127 #, c-format msgid "invalid mode" msgstr "felaktig rättighet" -#: src/mkfifo.c:127 src/mknod.c:133 +#: src/mkfifo.c:126 src/mknod.c:132 #, c-format msgid "mode must specify only file permission bits" msgstr "rättigheter måste ange endast filrättighetsbitar" @@ -6091,19 +6114,15 @@ msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n" msgstr "Användning: %s [FLAGGA]... NAMN TYP [ÖVRE LÄGRE]\n" #: src/mknod.c:54 -msgid "" -"Create the special file NAME of the given TYPE.\n" -"\n" -msgstr "" -"Skapa specialfilen NAMN av angiven TYP.\n" -"\n" +msgid "Create the special file NAME of the given TYPE.\n" +msgstr "Skapa specialfilen NAMN av angiven TYP.\n" -#: src/mknod.c:64 +#: 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:69 +#: src/mknod.c:68 msgid "" "\n" "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n" @@ -6117,7 +6136,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:76 +#: src/mknod.c:75 msgid "" "\n" " b create a block (buffered) special file\n" @@ -6129,40 +6148,40 @@ msgstr "" " c, u skapa en (obuffrad) teckenspecialfil\n" " p skapa en FIFO\n" -#: src/mknod.c:151 +#: src/mknod.c:150 msgid "Special files require major and minor device numbers." msgstr "Specialfiler kräver övre och undre enhetsnummer" -#: src/mknod.c:161 +#: src/mknod.c:160 msgid "Fifos do not have major and minor device numbers." msgstr "Fifo:er har inte övre och undre enhetsnummer." -#: src/mknod.c:177 +#: src/mknod.c:176 #, c-format msgid "block special files not supported" msgstr "blockspecialfiler stöds inte" -#: src/mknod.c:186 +#: src/mknod.c:185 #, c-format msgid "character special files not supported" msgstr "teckenspecialfiler stöds inte" -#: src/mknod.c:202 +#: src/mknod.c:201 #, c-format msgid "invalid major device number %s" msgstr "ogiltigt övre enhetsnummer %s" -#: src/mknod.c:207 +#: src/mknod.c:206 #, c-format msgid "invalid minor device number %s" msgstr "ogiltigt undre enhetsnummer %s" -#: src/mknod.c:212 +#: src/mknod.c:211 #, c-format msgid "invalid device %s %s" msgstr "ogiltig enhet %s %s" -#: src/mknod.c:226 +#: src/mknod.c:225 #, c-format msgid "invalid device type %s" msgstr "ogiltig enhetstyp %s" @@ -6244,60 +6263,56 @@ msgstr "" " katalogen som angetts via -p, annars /tmp " "[undanbedes]\n" -#: src/mktemp.c:222 +#: 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:228 +#: src/mktemp.c:229 #, c-format msgid "too many templates" msgstr "för många mallar" -#: src/mktemp.c:248 +#: src/mktemp.c:249 #, c-format msgid "with --suffix, template %s must end in X" msgstr "med --suffix måste mallen %s sluta med X" -#: src/mktemp.c:273 src/split.c:1117 +#: src/mktemp.c:274 src/split.c:1130 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "ogiltigt suffix %s, innehåller katalogseparator" -#: src/mktemp.c:278 +#: src/mktemp.c:279 #, c-format msgid "too few X's in template %s" msgstr "för få X i mallen %s" -#: src/mktemp.c:291 +#: src/mktemp.c:292 #, c-format msgid "invalid template, %s, contains directory separator" msgstr "ogiltig mall, %s, innehåller katalogseparator" -#: src/mktemp.c:305 +#: src/mktemp.c:306 #, 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:325 +#: src/mktemp.c:326 #, c-format msgid "failed to create directory via template %s" msgstr "misslyckades att skapa en katalog via mallen %s" -#: src/mktemp.c:335 +#: src/mktemp.c:336 #, c-format msgid "failed to create file via template %s" msgstr "misslyckades att skapa en fil via mallen %s" -#: src/mv.c:290 -msgid "" -"Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" -"\n" -msgstr "" -"Byt namn på KÄLLA till DEST eller flytta KÄLLor till KATALOG.\n" -"\n" +#: src/mv.c:292 +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:297 +#: src/mv.c:298 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -6316,7 +6331,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:306 +#: src/mv.c:307 msgid "" " --strip-trailing-slashes remove any trailing slashes from each " "SOURCE\n" @@ -6327,7 +6342,7 @@ msgstr "" " KÄLLargument\n" " -S, --suffix=ÄNDELSE ersätt den vanliga säkerhetskopieändelsen\n" -#: src/mv.c:311 +#: src/mv.c:312 msgid "" " -t, --target-directory=DIRECTORY move all SOURCE arguments into " "DIRECTORY\n" @@ -6354,35 +6369,36 @@ msgstr "Användning: %s [FLAGGA] [KOMMANDO [ARG]...]\n" #, c-format msgid "" "Run COMMAND with an adjusted niceness, which affects process scheduling.\n" -"With no COMMAND, print the current niceness. Nicenesses range from\n" -"%d (most favorable scheduling) to %d (least favorable).\n" -"\n" -" -n, --adjustment=N add integer N to the niceness (default 10)\n" +"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 "" "Kör KOMMANDO med justerat nice-värde, vilket påverkar processens\n" "schemaläggning. Utan KOMMANDO skrivs nuvarande nice-värde.\n" -"Nice-värden går från %d (mest gynnad schemaläggning) till %d (minst\n" -"gynnad).\n" -"\n" +"Nice-värden går från %d (mest gynnsamt för processen) till %d (minst\n" +"gynnsamt för processen).\n" + +#: src/nice.c:82 +msgid " -n, --adjustment=N add integer N to the niceness (default 10)\n" +msgstr "" " -n, --adjustment=N lägg till heltalet N till nice-värdet (10 som " "standard)\n" -#: src/nice.c:168 +#: src/nice.c:172 #, c-format msgid "invalid adjustment %s" msgstr "felaktigt justering %s" -#: src/nice.c:177 +#: src/nice.c:181 #, c-format msgid "a command must be given with an adjustment" msgstr "ett kommando måste anges med en justering" -#: src/nice.c:184 src/nice.c:195 +#: src/nice.c:188 src/nice.c:199 #, c-format msgid "cannot get niceness" msgstr "kan inte avgöra nice-värde" -#: src/nice.c:201 +#: src/nice.c:205 #, c-format msgid "cannot set niceness" msgstr "kan inte sätta nice-värde" @@ -6392,17 +6408,15 @@ msgstr "kan inte sätta nice-värde" msgid "Scott Bartram" msgstr "Scott Bartram" -#: src/nl.c:186 +#: src/nl.c:179 msgid "" "Write each FILE to standard output, with line numbers added.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" "Skriv varje FIL till standard ut och lägg till radnummer.\n" "Utan FIL eller om FIL är -, läs standard in.\n" -"\n" -#: src/nl.c:194 +#: src/nl.c:186 msgid "" " -b, --body-numbering=STYLE use STYLE for numbering body lines\n" " -d, --section-delimiter=CC use CC for separating logical pages\n" @@ -6413,7 +6427,7 @@ msgstr "" " -d, --section-delimiter=CC använd CC för att avgränsa logiska sidor\n" " -f, --footer-numbering=STIL använd STIL för att numrera rader i fot\n" -#: src/nl.c:199 +#: src/nl.c:191 msgid "" " -h, --header-numbering=STYLE use STYLE for numbering header lines\n" " -i, --line-increment=NUMBER line number increment at each line\n" @@ -6433,7 +6447,7 @@ msgstr "" " -s, --number-separator=STRÄNG lägg till STRÄNG efter (möjligt) " "radnummer\n" -#: src/nl.c:207 +#: src/nl.c:199 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" @@ -6441,7 +6455,7 @@ msgstr "" " -v, --starting-line-number=NUMMER första radnumret på varje logisk sida\n" " -w, --number-width=ANTAL använd ANTAL kolumner för radnummer\n" -#: src/nl.c:213 +#: src/nl.c:205 msgid "" "\n" "By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC are\n" @@ -6453,7 +6467,7 @@ msgstr "" "består av två tecken för att avskilja logiska sidor, saknas andra\n" "tecknet menas :. Skriv \\\\ för \\. STIL är någon av:\n" -#: src/nl.c:219 +#: src/nl.c:211 msgid "" "\n" " a number all lines\n" @@ -6484,52 +6498,47 @@ msgstr "" " rz högerjusterat, inledande nollor\n" "\n" -#: src/nl.c:286 +#: src/nl.c:278 #, c-format msgid "line number overflow" msgstr "spill i radnummer" -#: src/nl.c:486 +#: src/nl.c:478 #, c-format msgid "invalid header numbering style: %s" msgstr "felaktig stil för numrering av sidhuvud: %s" -#: src/nl.c:494 +#: src/nl.c:486 #, c-format msgid "invalid body numbering style: %s" msgstr "felaktig stil för numrering av kropp: %s" -#: src/nl.c:502 +#: src/nl.c:494 #, c-format msgid "invalid footer numbering style: %s" msgstr "felaktig stil för numrering av sidfot: %s" -#: src/nl.c:511 +#: src/nl.c:503 #, c-format msgid "invalid starting line number: %s" msgstr "felaktigt första radnummer: %s" -#: src/nl.c:517 -#, c-format -msgid "WARNING: --page-increment is deprecated; use --line-increment instead" -msgstr "VARNING: --page-increment undanbedes, använd --line-increment istället" - -#: src/nl.c:524 +#: src/nl.c:512 #, c-format msgid "invalid line number increment: %s" msgstr "felaktig ökning av radnummer: %s" -#: src/nl.c:536 +#: src/nl.c:524 #, c-format msgid "invalid number of blank lines: %s" msgstr "felaktigt antal tomma rader: %s" -#: src/nl.c:550 +#: src/nl.c:538 #, c-format msgid "invalid line number field width: %s" msgstr "felaktig bredd på radnumrets fält: %s" -#: src/nl.c:569 +#: src/nl.c:557 #, c-format msgid "invalid line numbering format: %s" msgstr "felaktigt format på radnummer: %s" @@ -6579,11 +6588,6 @@ msgstr "misslyckades att göra standard in oanvändbar" msgid "ignoring input" msgstr "ignorerar indata" -#: src/nohup.c:163 src/nohup.c:165 -#, c-format -msgid "failed to open %s" -msgstr "misslyckades att öppna %s" - #: src/nohup.c:175 #, c-format msgid "ignoring input and appending output to %s" @@ -6615,16 +6619,16 @@ msgid "failed to redirect standard error" msgstr "misslyckades att omdirigera standard fel" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:32 +#: src/nproc.c:33 msgid "Giuseppe Scrivano" msgstr "Giuseppe Scrivano" -#: src/nproc.c:56 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 +#: src/nproc.c:57 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Användning: %s [FLAGGA]...\n" -#: src/nproc.c:57 +#: src/nproc.c:58 msgid "" "Print the number of processing units available to the current process,\n" "which may be less than the number of online processors\n" @@ -6635,7 +6639,7 @@ msgstr "" "vilket kan vara mindre än antalet inkopplade processorer\n" "\n" -#: src/nproc.c:62 +#: src/nproc.c:63 msgid "" " --all print the number of installed processors\n" " --ignore=N if possible, exclude N processing units\n" @@ -6643,11 +6647,382 @@ msgstr "" " --all skriv antalet installerade processorer\n" " --ignore=N om möjligt, uteslut N processorenheter\n" -#: src/nproc.c:106 +#: src/nproc.c:107 #, c-format 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 +msgid "Assaf Gordon" +msgstr "Assaf Gordon" + +#: src/numfmt.c:676 +#, c-format +msgid "value too large to be converted: '%s'" +msgstr "värdet är för stort för att konverteras: ”%s”" + +#: src/numfmt.c:680 +#, c-format +msgid "invalid number: '%s'" +msgstr "ogiltigt tal: ”%s”" + +#: src/numfmt.c:684 +#, 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)" + +#: src/numfmt.c:688 +#, c-format +msgid "invalid suffix in input: '%s'" +msgstr "felaktigt suffix i indata: ”%s”" + +#: src/numfmt.c:692 +#, 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)" + +#: src/numfmt.c:723 +#, c-format +msgid "failed to prepare value '%Lf' for printing" +msgstr "misslyckades förbereda värdet ”%Lf” för utskrift" + +#: src/numfmt.c:787 +#, c-format +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 +#, c-format +msgid "Usage: %s [OPTION]... [NUMBER]...\n" +msgstr "Användning: %s [FLAGGA]… [NUMMER]…\n" + +#: src/numfmt.c:816 +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 +msgid " --debug print warnings about invalid input\n" +msgstr " --debug skriv varningar om ogiltig indata\n" + +#: src/numfmt.c:823 +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 +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 +msgid "" +" --format=FORMAT use printf style floating-point FORMAT;\n" +" see FORMAT below for details\n" +msgstr "" +" --format=FORMAT använd flyttalsformat FORMAT av typ printf;\n" +" se FORMAT nedan för detaljer\n" + +#: src/numfmt.c:833 +msgid "" +" --from=UNIT auto-scale input numbers to UNITs; default is " +"'none';\n" +" see UNIT below\n" +msgstr "" +" --from=ENHET skala automatiskt indatatal till ENHETer; standard " +"är\n" +" ”none”; se ENHET nedan\n" + +#: src/numfmt.c:837 +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 +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 använd lokaldefinierad gruppering av siffror,\n" +" t.ex. 1 000 000 (vilket betyder att det inte har\n" +" någon effekt i lokalen C/POSIX)\n" + +#: src/numfmt.c:844 +msgid "" +" --header[=N] print (without converting) the first N header lines;\n" +" N defaults to 1 if not specified\n" +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 +msgid "" +" --invalid=MODE failure mode for invalid numbers: MODE can be:\n" +" abort (default), fail, warn, ignore\n" +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 +msgid "" +" --padding=N pad the output to N characters; positive N will\n" +" right-align; negative N will left-align;\n" +" padding is ignored if the output is wider than N;\n" +" the default is to automatically pad if a " +"whitespace\n" +" is found\n" +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" +" standard är att automatiskt fylla ut om ett\n" +" blanktecken finns\n" + +#: src/numfmt.c:859 +msgid "" +" --round=METHOD use METHOD for rounding when scaling; METHOD can be:\n" +" up, down, from-zero (default), towards-zero, " +"nearest\n" +msgstr "" +" --round=METOD använd METOD för avrundning vid skalning; METOD kan " +"vara:\n" +" up, down, from-zero (standard), towards-zero, " +"nearest\n" + +#: src/numfmt.c:863 +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 " +"ett\n" +" möjligt SUFFIX i indatatal\n" + +#: src/numfmt.c:867 +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 +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 +msgid "" +"\n" +"UNIT options:\n" +msgstr "" +"\n" +"ENHETSflaggor:\n" + +#: src/numfmt.c:880 +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 +msgid "" +" auto accept optional single/two letter suffix:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" +msgstr "" +" auto acceptera valfria en-/tvåteckenssuffix:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" + +#: src/numfmt.c:889 +msgid "" +" si accept optional single letter suffix:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:894 +msgid "" +" iec accept optional single letter suffix:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:899 +msgid "" +" iec-i accept optional two-letter suffix:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:905 +#, 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" +msgstr "" + +#: src/numfmt.c:912 +#, c-format +msgid "" +"\n" +"Exit status is 0 if all input numbers were successfully converted.\n" +"By default, %s will stop at the first conversion error with exit status 2.\n" +"With --invalid='fail' a warning is printed for each conversion error\n" +"and the exit status is 2. With --invalid='warn' each conversion error is\n" +"diagnosed, but the exit status is 0. With --invalid='ignore' conversion\n" +"errors are not diagnosed and the exit status is 0.\n" +msgstr "" + +#: src/numfmt.c:921 +#, c-format +msgid "" +"\n" +"Examples:\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" +msgstr "" + +#: src/numfmt.c:974 src/seq.c:212 +#, c-format +msgid "format %s has no %% directive" +msgstr "målet %s har inget %%-direktiv" + +#: src/numfmt.c:990 +#, c-format +msgid "invalid format %s (width overflow)" +msgstr "felaktigt format %s (spill i bredden)" + +#: src/numfmt.c:1007 src/seq.c:229 +#, c-format +msgid "format %s ends in %%" +msgstr "format %s avslutas med %%" + +#: src/numfmt.c:1010 +#, c-format +msgid "invalid format %s, directive must be %%['][-][N]f" +msgstr "" + +#: src/numfmt.c:1018 src/seq.c:236 +#, c-format +msgid "format %s has too many %% directives" +msgstr "format %s har för många %%-direktiv" + +#: src/numfmt.c:1070 +#, c-format +msgid "invalid suffix in input '%s': '%s'" +msgstr "felaktigt suffix i indata ”%s”: %s" + +#: src/numfmt.c:1092 +#, c-format +msgid "value too large to be printed: '%Lg' (consider using --to)" +msgstr "" + +#: src/numfmt.c:1100 +#, c-format +msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" +msgstr "" + +#: src/numfmt.c:1184 +#, c-format +msgid "large input value '%s': possible precision loss" +msgstr "" + +#: src/numfmt.c:1293 +#, c-format +msgid "input line is too short, no numbers found to convert in field %ld" +msgstr "" + +#: src/numfmt.c:1388 +#, c-format +msgid "invalid padding value '%s'" +msgstr "ogiltigt utfyllnadsvärde ”%s”" + +#: src/numfmt.c:1401 +#, c-format +msgid "invalid field value '%s'" +msgstr "felaktigt fältvärde ”%s”" + +#: src/numfmt.c:1430 +#, c-format +msgid "invalid header value '%s'" +msgstr "ogiltigt huvudvärde ”%s”" + +#: src/numfmt.c:1456 +#, 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 +#, c-format +msgid "no conversion option specified" +msgstr "ingen konverteringsflagga angiven" + +#: src/numfmt.c:1471 +#, c-format +msgid "grouping cannot be combined with --to" +msgstr "gruppering kan inte kombineras med --to" + +#: src/numfmt.c:1473 +#, c-format +msgid "grouping has no effect in this locale" +msgstr "" + +#: src/numfmt.c:1486 +#, c-format +msgid "--header ignored with command-line input" +msgstr "" + +#: src/numfmt.c:1511 +#, c-format +msgid "error reading input" +msgstr "fel vid läsning av indata" + +#: src/numfmt.c:1520 +#, c-format +msgid "failed to convert some of the input numbers" +msgstr "misslyckades att konvertera några av indatatalen" + #: src/od.c:294 #, c-format msgid "" @@ -6678,40 +7053,60 @@ msgstr "" "\n" #: src/od.c:307 -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 "" +"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" +"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" +"at first byte printed, incremented when dump is progressing.\n" +"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 "" +"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" +"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:310 +#: src/od.c:318 msgid "" -" -A, --address-radix=RADIX decide how file offsets are printed\n" +" -A, --address-radix=RADIX output format for file offsets. RADIX is one\n" +" of [doxn], for Decimal, Octal, Hex or None\n" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" -" -A, --address-radix=RADIX avgör hur filposition skrivs\n" -" -j, --skip-bytes=BYTE hoppa först över BYTE byt i indata\n" +" -A, --address-radix=RADIX utformat för filpositioner. RADIX är en av\n" +" [doxn], för Decimal, Oktal, Hex eller iNgen\n" +" -j, --skip-bytes=BYTE hoppa först över BYTE byte i indata\n" -#: src/od.c:314 +#: src/od.c:323 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" -" --traditional accept arguments in traditional form\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" " -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 " "rader\n" -" -w[BYTE], --width[=BYTE] skriv ut BYTE byte per rad\n" -" --traditional acceptera argument i traditionellt format\n" +" -w[BYTE], --width[=BYTE] skriv ut BYTE byte per rad.\n" +" 32 underförstås när BYTE inte anges\n" +" --traditional acceptera argument i tredje formatet ovan\n" -#: src/od.c:324 +#: src/od.c:336 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" @@ -6719,14 +7114,15 @@ msgid "" " -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" " -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 2-bytenheter, utan tecken, decimalt\n" +" -d samma som -t u2, välj desimala 2-bytenheter utan tecken\n" -#: src/od.c:332 +#: src/od.c:345 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -6742,40 +7138,21 @@ msgstr "" " -s samma som -t d2, välj decimala 2-byteenheter\n" " -x samma som -t x2, välj hexadecimala 2-bytenheter\n" -#: src/od.c:340 +#: src/od.c:353 msgid "" "\n" -"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" -"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" -"at first byte printed, incremented when dump is progressing.\n" -"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" -"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" -"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:349 -msgid "" "\n" "TYPE is made up of one or more of these specifications:\n" -"\n" " a named character, ignoring high-order bit\n" " c ASCII character or backslash escape\n" msgstr "" "\n" -"TYP skapas av en eller fler av dessa specifikationer:\n" "\n" -" a namngivet tecken, ignorera höga biten\n" -" c ASCII-tecken eller sekvens med omvänt snedstreck\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" -#: src/od.c:356 +#: src/od.c:360 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -6789,58 +7166,55 @@ msgstr "" " u[STORLEK] decimalt utan tecken, STORLEK byte per heltal\n" " x[STORLEK] hexadecimalt, STORLEK byte per heltal\n" -#: src/od.c:363 +#: src/od.c:367 msgid "" "\n" -"SIZE is a number. For TYPE in doux, SIZE may also be C for\n" +"SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" "sizeof(char), S for sizeof(short), I for sizeof(int) or L for\n" "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" -"STORLEK är ett tal. För TYP doux, kan STORLEK också vara C för\n" +"STORLEK är ett tal. För TYP i [doux] kan STORLEK också vara C för\n" "sizeof(char), S för sizeof(short), I för sizeof(int) eller L för\n" -"sizeof(long). Om TYP är f, kan STORLEK också var F för sizeof(float), D\n" +"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:370 +#: src/od.c:374 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" +"Adding a z suffix to any type displays printable characters at the end of\n" +"each 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" -#: src/od.c:380 +#: src/od.c:379 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" +"\n" +"BYTES is hex with 0x or 0X prefix, and may have a multiplier suffix:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"and so on for G, T, P, E, Z, Y.\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" +"\n" +"\n" +"BYTE är hex med prefixet 0x eller 0X, och kan ha en multiplikativ ändelse:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000·1000\n" +" M 1024·1024\n" +"och så vidare för G, T, P, E, Z, Y.\n" -#: src/od.c:633 src/od.c:753 +#: src/od.c:639 src/od.c:759 #, c-format msgid "invalid type string %s" msgstr "ogiltig typsträng %s" -#: src/od.c:643 +#: src/od.c:649 #, c-format msgid "" "invalid type string %s;\n" @@ -6849,7 +7223,7 @@ msgstr "" "ogiltig typsträng %s;\n" "detta system har ingen %lu-bytes heltalstyp" -#: src/od.c:764 +#: src/od.c:770 #, c-format msgid "" "invalid type string %s;\n" @@ -6858,38 +7232,38 @@ msgstr "" "ogiltig typsträng %s;\n" "detta system har ingen %lu-bytes flyttalstyp" -#: src/od.c:822 +#: src/od.c:828 #, c-format msgid "invalid character '%c' in type string %s" msgstr "ogiltigt tecken ”%c” i typsträngen %s" -#: src/od.c:1047 +#: src/od.c:1053 #, c-format msgid "cannot skip past end of combined input" msgstr "kan inte hoppa förbi slutet på en kombinerad inmatning" -#: src/od.c:1603 +#: src/od.c:1609 #, 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:1729 +#: src/od.c:1735 #, c-format msgid "no type may be specified when dumping strings" msgstr "ingen typ kan anges när strängar sparas" -#: src/od.c:1804 +#: src/od.c:1810 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:1825 +#: src/od.c:1831 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "skip-bytes + read-bytes är för stort" -#: src/od.c:1868 +#: src/od.c:1874 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "varning: ogiltig bredd %lu; använder %d i stället" @@ -6909,14 +7283,12 @@ 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" -"\n" msgstr "" "Skriv rader som består av sekventiellt korresponderande rader från\n" "varje FIL, åtskilda med TAB, till standard ut. Utan FIL eller om\n" "FIL är -, läs standard in.\n" -"\n" -#: src/paste.c:448 +#: 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" @@ -6925,7 +7297,7 @@ msgstr "" " -s, --serial klistra in en fil i taget i stället för " "parallellt\n" -#: src/paste.c:509 +#: src/paste.c:508 #, c-format msgid "delimiter list ends with an unescaped backslash: %s" msgstr "avgränsningslistor avslutas med en oskyddat omvänt snedstreck: %s" @@ -6986,81 +7358,81 @@ msgid "Kaveh Ghazi" msgstr "Kaveh Ghazi" #. TRANSLATORS: Real name is unknown; at most 19 characters. -#: src/pinky.c:250 +#: src/pinky.c:242 msgid " ???" msgstr " ???" #. TRANSLATORS: Idle time is unknown; at most 5 characters. -#: src/pinky.c:274 +#: src/pinky.c:266 msgid "?????" msgstr "?????" -#: src/pinky.c:323 +#: src/pinky.c:314 #, c-format msgid "Login name: " msgstr "Inloggningsnamn: " -#: src/pinky.c:326 +#: src/pinky.c:317 #, c-format msgid "In real life: " msgstr "I verkliga livet: " #. TRANSLATORS: Real name is unknown; no hard limit. -#: src/pinky.c:330 +#: src/pinky.c:321 msgid "???\n" msgstr "???\n" -#: src/pinky.c:350 +#: src/pinky.c:341 #, c-format msgid "Directory: " msgstr "Katalog: " -#: src/pinky.c:352 +#: src/pinky.c:343 #, c-format msgid "Shell: " msgstr "Skal: " -#: src/pinky.c:371 +#: src/pinky.c:362 #, c-format msgid "Project: " msgstr "Projekt: " -#: src/pinky.c:395 +#: src/pinky.c:386 #, c-format msgid "Plan:\n" msgstr "Plan:\n" # Rubrik i 8 tecken bred kolumn. -#: src/pinky.c:414 +#: src/pinky.c:405 msgid "Login" msgstr "Login" -#: src/pinky.c:416 +#: src/pinky.c:407 msgid "Name" msgstr "Namn" -#: src/pinky.c:417 +#: src/pinky.c:408 msgid " TTY" msgstr " TTY" -#: src/pinky.c:419 +#: src/pinky.c:410 msgid "Idle" msgstr "Overksam" -#: src/pinky.c:420 +#: src/pinky.c:411 msgid "When" msgstr "När" -#: src/pinky.c:423 +#: src/pinky.c:414 msgid "Where" msgstr "Var" -#: src/pinky.c:502 +#: src/pinky.c:493 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Användning: %s [FLAGGA]... [ANVÄNDARE]...\n" -#: src/pinky.c:503 +#: src/pinky.c:494 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7077,7 +7449,7 @@ msgstr "" " -p utelämna användarens planfil i det långa formatet\n" " -s skriv ut i kort format\n" -#: src/pinky.c:511 +#: src/pinky.c:502 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7093,7 +7465,7 @@ msgstr "" " -q utelämna användarens fullstädniga namn, fjärrvärd och \n" " overksamma tiden i kort format\n" -#: src/pinky.c:520 +#: src/pinky.c:511 #, c-format msgid "" "\n" @@ -7104,7 +7476,7 @@ msgstr "" "Ett lättviktigt ”finger”-program; skriver ut användarinformation.\n" "utmp-filen kommer att vara %s.\n" -#: src/pinky.c:604 +#: src/pinky.c:595 #, 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" @@ -7119,85 +7491,81 @@ msgstr "Pete TerMaat" msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:912 +#: src/pr.c:908 #, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "”--pages=FÖRSTA_SIDA[:SISTA_SIDA]” saknar argument" -#: src/pr.c:914 +#: src/pr.c:910 #, c-format msgid "invalid page range %s" msgstr "ogiltigt sidintervall %s" -#: src/pr.c:979 +#: src/pr.c:975 #, c-format msgid "'-l PAGE_LENGTH' invalid number of lines: %s" msgstr "”-l SIDLÄNGD” felaktigt antal rader: %s" -#: src/pr.c:1003 +#: src/pr.c:999 #, c-format msgid "'-N NUMBER' invalid starting line number: %s" msgstr "”-N NUMMER” felaktigt första radnummer: %s" -#: src/pr.c:1015 +#: src/pr.c:1011 #, c-format msgid "'-o MARGIN' invalid line offset: %s" msgstr "”-o MARGINAL” felaktigt indrag av rad: %s" -#: src/pr.c:1056 +#: src/pr.c:1052 #, c-format msgid "'-w PAGE_WIDTH' invalid number of characters: %s" msgstr "”-w SIDBREDD” felaktigt antal tecken: %s" -#: src/pr.c:1070 +#: src/pr.c:1066 #, c-format msgid "'-W PAGE_WIDTH' invalid number of characters: %s" msgstr "”-W SIDBREDD” felaktigt antal tecken: %s" -#: src/pr.c:1100 +#: src/pr.c:1096 #, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "det går inte att ange antal kolumner vid parallell utskrift" -#: src/pr.c:1104 +#: src/pr.c:1100 #, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "det går inte att ange både utskrift på tvären och parallell utskrift" -#: src/pr.c:1200 +#: src/pr.c:1196 #, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "”-%c” extra tecken eller felaktigt tal i argumentet: %s" -#: src/pr.c:1304 +#: src/pr.c:1293 #, c-format msgid "page width too narrow" msgstr "bredden på sidan är för smal" -#: src/pr.c:2369 +#: src/pr.c:2353 #, c-format msgid "starting page number %<PRIuMAX> exceeds page count %<PRIuMAX>" msgstr "första sidnummer %<PRIuMAX> överskrider antalet sidor %<PRIuMAX>" -#: src/pr.c:2396 +#: src/pr.c:2380 #, c-format msgid "page number overflow" msgstr "spill i sidnummer" -#: src/pr.c:2401 +#: src/pr.c:2385 #, c-format msgid "Page %<PRIuMAX>" msgstr "Sida %<PRIuMAX>" -#: src/pr.c:2773 -msgid "" -"Paginate or columnate FILE(s) for printing.\n" -"\n" -msgstr "" -"Paginera eller skapa kolumner av FIL(er) för utskrift.\n" -"\n" +#: src/pr.c:2757 +msgid "Paginate or columnate FILE(s) for printing.\n" +msgstr "Paginera eller skapa kolumner av FIL(er) för utskrift.\n" -#: src/pr.c:2780 +#: src/pr.c:2763 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -7214,7 +7582,7 @@ msgstr "" "kolumnerna\n" " på varje sida\n" -#: src/pr.c:2788 +#: src/pr.c:2771 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7231,7 +7599,7 @@ msgstr "" " -d, --double-space\n" " skriv ut med dubbelt radavstånd\n" -#: src/pr.c:2796 +#: src/pr.c:2779 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7252,7 +7620,7 @@ msgstr "" " separera sidor (med ett 3-raders huvud vid -F eller\n" " 5-raders huvud och fot utan -F)\n" -#: src/pr.c:2806 +#: src/pr.c:2789 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -7275,7 +7643,7 @@ msgstr "" "ingen\n" " kolumnjustering, --sep-string[STRÄNG] anger avskiljare\n" -#: src/pr.c:2815 +#: src/pr.c:2798 msgid "" " -l, --length=PAGE_LENGTH\n" " set the page length to PAGE_LENGTH (66) lines\n" @@ -7289,7 +7657,7 @@ msgstr "" " -m, --merge skriv alla filer parallellt, en i varje kolumn, hugg av\n" " rader, men slå samman rader till full längd med -J\n" -#: src/pr.c:2822 +#: src/pr.c:2805 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -7306,7 +7674,7 @@ msgstr "" " börja räkna med NUMMER vid första raden på första sidan\n" " som skrivs ut (se +FÖRSTA_SIDA)\n" -#: src/pr.c:2830 +#: src/pr.c:2813 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -7321,7 +7689,7 @@ msgstr "" " -r, --no-file-warnings\n" " utelämna varning när en fil inte kan öppnas\n" -#: src/pr.c:2837 +#: src/pr.c:2820 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -7338,7 +7706,7 @@ msgstr "" "kolumnflaggorna\n" " (-KOLUMN|-a KOLUMN|-m) utom när -w är angivet\n" -#: src/pr.c:2844 +#: src/pr.c:2827 msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" @@ -7354,7 +7722,7 @@ msgstr "" "kolumnflaggor\n" " -t, --omit-header utelämna sidhuvud och sidfot\n" -#: src/pr.c:2851 +#: src/pr.c:2834 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -7376,7 +7744,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:2861 +#: src/pr.c:2844 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -7389,7 +7757,7 @@ msgstr "" " utmatning, hugg av rader utom om flagga -J är satt,\n" " ingen koppling till -S eller -s\n" -#: src/pr.c:2869 +#: src/pr.c:2852 msgid "" "\n" "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" @@ -7525,12 +7893,6 @@ msgstr "%.*s: felaktig fältspecifikation" msgid "warning: ignoring excess arguments, starting with %s" msgstr "varning: ignorerar överflödiga argument, startar med %s" -# Denna kommentar skulle varit med i po-filen, men har av någon -# anledning fallit bort. Jag har felrapporterat att den saknas. -# -# Note to translator: Please translate "F. Pinard" to "François -# Pinard" if "ç" (c-with-cedilla) is available in the -# translation's character set and encoding. #. TRANSLATORS: Please translate "F. Pinard" to "François Pinard" #. if "ç" (c-with-cedilla) is available in the translation's character #. set and encoding. @@ -7557,12 +7919,10 @@ msgstr "" msgid "" "Output a permuted index, including context, of the words in the input " "files.\n" -"\n" msgstr "" -"Utdata är ett permuterat index, med sammanhang, av orden i indatafilerna\n" -"\n" +"Mata ut ett permuterat index, med sammanhang, av orden i indatafilerna.\n" -#: src/ptx.c:1828 +#: src/ptx.c:1827 msgid "" " -A, --auto-reference output automatically generated references\n" " -G, --traditional behave more like System V 'ptx'\n" @@ -7573,7 +7933,7 @@ msgstr "" " -F, --flag-truncation=STRÄNG använd STRÄNG för att markera avhuggnar " "rader\n" -#: src/ptx.c:1833 +#: src/ptx.c:1832 msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" " -O, --format=roff generate output as roff directives\n" @@ -7587,7 +7947,7 @@ msgstr "" " -S, --sentence-regexp=REGUTTR för radslut eller meningsslut\n" " -T, --format=tex generera utdata som TeX-direktiv\n" -#: src/ptx.c:1840 +#: src/ptx.c:1839 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -7605,7 +7965,7 @@ msgstr "" " -o, --only-file=FIL läs lista av ord att endast använda från " "FIL\n" -#: src/ptx.c:1848 +#: src/ptx.c:1847 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -7617,7 +7977,7 @@ msgstr "" " -w, --width=ANTAL utmatningsbredd i kolumner, utan " "referenser\n" -#: src/ptx.c:1855 +#: src/ptx.c:1854 msgid "" "\n" "With no FILE or if FILE is -, read Standard Input. '-F /' by default.\n" @@ -7625,7 +7985,7 @@ msgstr "" "\n" "Utan FIL eller om FIL är -, läs standard in. ”-F /” är standard.\n" -#: src/ptx.c:1949 +#: src/ptx.c:1948 #, c-format msgid "invalid gap width: %s" msgstr "ogiltig gapbredd: %s" @@ -7652,7 +8012,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "misslyckades att ändra katalog till %s" -#: src/pwd.c:170 src/pwd.c:277 +#: src/pwd.c:170 src/pwd.c:277 src/split.c:373 #, c-format msgid "failed to stat %s" msgstr "misslyckades att ta status på %s" @@ -7668,14 +8028,15 @@ msgid "ignoring non-option arguments" msgstr "ignorerar argument som inte är flaggor" #. This is a proper name. See the gettext manual, section Names. -#: src/readlink.c:33 +#: src/readlink.c:32 msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 +#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147 +#: src/stat.c:1349 src/touch.c:212 #, c-format -msgid "Usage: %s [OPTION]... FILE\n" -msgstr "Användning: %s [FLAGGA]... FIL\n" +msgid "Usage: %s [OPTION]... FILE...\n" +msgstr "Användning: %s [FLAGGA]... FIL...\n" #: src/readlink.c:63 msgid "" @@ -7713,10 +8074,12 @@ msgid "" "recursively,\n" " without requirements on components " "existence\n" -" -n, --no-newline do not output the trailing newline\n" +" -n, --no-newline do not output the trailing delimiter\n" " -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" msgstr "" " -m, --canonicalize-missing gör kanoniskt genom att följa varje " "symbolisk\n" @@ -7727,12 +8090,12 @@ 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" -#: src/realpath.c:71 src/rm.c:134 src/shred.c:147 src/stat.c:1330 -#: src/touch.c:215 +#: src/readlink.c:152 #, c-format -msgid "Usage: %s [OPTION]... FILE...\n" -msgstr "Användning: %s [FLAGGA]... FIL...\n" +msgid "ignoring --no-newline with multiple arguments" +msgstr "ignorerar --no-newline med flera argument" #: src/realpath.c:72 msgid "" @@ -7774,12 +8137,12 @@ msgstr "" msgid "generating relative path" msgstr "genererar relativ sökväg" -#: src/remove.c:286 +#: src/remove.c:273 #, c-format msgid "%s: descend into write-protected directory %s? " msgstr "%s: gå ner i skrivskyddad katalog %s? " -#: src/remove.c:287 +#: src/remove.c:274 #, c-format msgid "%s: descend into directory %s? " msgstr "%s: gå ner i katalog %s? " @@ -7788,37 +8151,37 @@ msgstr "%s: gå ner i katalog %s? " #. translate "%s: remove %s (write-protected) %s? " #. instead. It should avoid grammatical problems #. with the output of file_type. -#: src/remove.c:303 +#: src/remove.c:290 #, c-format msgid "%s: remove write-protected %s %s? " msgstr "%s: ta bort skrivskyddad %s %s? " -#: src/remove.c:304 +#: src/remove.c:291 #, c-format msgid "%s: remove %s %s? " msgstr "%s: ta bort %s %s? " -#: src/remove.c:417 +#: src/remove.c:374 #, c-format msgid "removed directory: %s\n" msgstr "tog bort katalog: %s\n" -#: src/remove.c:481 +#: src/remove.c:444 #, c-format msgid "cannot remove directory: %s" msgstr "kan inte ta bort katalog: %s" -#: src/remove.c:537 +#: src/remove.c:500 #, 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:557 +#: src/remove.c:520 #, c-format msgid "traversal failed: %s" msgstr "traversering misslyckades: %s" -#: src/remove.c:563 +#: src/remove.c:526 #, c-format msgid "" "unexpected failure: fts_info=%d: %s\n" @@ -7827,12 +8190,12 @@ msgstr "" "oväntat fel: fts_info=%d: %s\n" "rapportera gärna till %s" -#: src/rm.c:118 +#: src/rm.c:119 #, c-format msgid "Try '%s ./%s' to remove the file %s.\n" msgstr "Försök med ”%s ./%s” för att ta bort filen %s.\n" -#: src/rm.c:135 +#: src/rm.c:136 msgid "" "Remove (unlink) the FILE(s).\n" "\n" @@ -7846,7 +8209,7 @@ msgstr "" "aldrig\n" " -i fråga före varje borttagning\n" -#: src/rm.c:141 +#: src/rm.c:142 msgid "" " -I prompt once before removing more than three files, " "or\n" @@ -7864,7 +8227,7 @@ msgstr "" " --interactive[=NÄR] fråga enligt NÄR: never, once (-I), eller\n" " always (-i). Utan NÄR, fråga alltid\n" -#: src/rm.c:148 +#: src/rm.c:149 msgid "" " --one-file-system when removing a hierarchy recursively, skip any\n" " directory that is on a file system different from\n" @@ -7875,19 +8238,21 @@ msgstr "" "filsystem\n" " än motsvarande kommandoradsargument gör\n" -#: src/rm.c:153 +#: src/rm.c:154 msgid "" " --no-preserve-root do not treat '/' specially\n" " --preserve-root do not remove '/' (default)\n" " -r, -R, --recursive remove directories and their contents recursively\n" +" -d, --dir remove empty directories\n" " -v, --verbose explain what is being done\n" msgstr "" " --no-preserve-root behandla inte ”/” speciellt\n" " --preserve-root ta inte bort ”/” (normalfall)\n" " -r, -R, --recursive ta bort kataloger och deras innehåll rekursivt\n" +" -d, --dir ta bort tomma kataloger\n" " -v, --verbose berätta vad som görs\n" -#: src/rm.c:161 +#: src/rm.c:163 msgid "" "\n" "By default, rm does not remove directories. Use the --recursive (-r or -R)\n" @@ -7901,7 +8266,7 @@ msgstr "" "dess\n" "inenhåll.\n" -#: src/rm.c:166 +#: src/rm.c:168 #, c-format msgid "" "\n" @@ -7918,7 +8283,7 @@ msgstr "" "\n" " %s ./-apa\n" -#: src/rm.c:175 +#: src/rm.c:177 msgid "" "\n" "Note that if you use rm to remove a file, it might be possible to recover\n" @@ -7931,12 +8296,12 @@ msgstr "" "och/eller tid. För större visshet om att innehållet verkligen är borta, \n" "överväg att använda shred.\n" -#: src/rm.c:335 +#: src/rm.c:342 #, c-format msgid "%s: remove all arguments recursively? " msgstr "%s: ta bort alla argument rekursivt? " -#: src/rm.c:336 +#: src/rm.c:343 #, c-format msgid "%s: remove all arguments? " msgstr "%s: ta bort alla argument? " @@ -7996,7 +8361,13 @@ msgstr "" msgid "" "Run a program in a different security context.\n" "With neither CONTEXT nor COMMAND, print the current security context.\n" -"\n" +msgstr "" +"Kör ett program i en annan säkerhetskontext.\n" +"Med varken KONTEXT eller KOMMANDO, skriv ut den aktuella " +"säkerhetskontexten.\n" + +#: src/runcon.c:94 +msgid "" " CONTEXT Complete security context\n" " -c, --compute compute process transition context before modifying\n" " -t, --type=TYPE type (for same role as parent)\n" @@ -8005,10 +8376,6 @@ msgid "" " -l, --range=RANGE levelrange\n" "\n" msgstr "" -"Kör ett program i en annan säkerhetskontext.\n" -"Med varken KONTEXT eller KOMMANDO, skriv ut den aktuella " -"säkerhetskontexten.\n" -"\n" " KONTEXT Fullständig säkerhetskontext\n" " -c, --compute beräkna processövergångskontext före modifiering\n" " -t, --type=TYP typ (för samma roll som föräldern)\n" @@ -8017,72 +8384,72 @@ msgstr "" " -l, --range=INTVL nivåintervall\n" "\n" -#: src/runcon.c:140 +#: src/runcon.c:144 #, c-format msgid "multiple roles" msgstr "flera roller" -#: src/runcon.c:145 +#: src/runcon.c:149 #, c-format msgid "multiple types" msgstr "flera typer" -#: src/runcon.c:150 +#: src/runcon.c:154 #, c-format msgid "multiple users" msgstr "flera användare" -#: src/runcon.c:155 +#: src/runcon.c:159 #, c-format msgid "multiple levelranges" msgstr "flera nivåintervall" -#: src/runcon.c:173 src/runcon.c:209 +#: src/runcon.c:177 src/runcon.c:213 #, c-format msgid "failed to get current context" msgstr "misslyckades att hämta aktuell kontext" -#: src/runcon.c:183 +#: src/runcon.c:187 #, c-format msgid "you must specify -c, -t, -u, -l, -r, or context" msgstr "du måste ange -c, -t, -u, -l, -r eller kontext" -#: src/runcon.c:191 +#: src/runcon.c:195 #, c-format msgid "no command specified" msgstr "inget kommando angivet" -#: src/runcon.c:197 +#: src/runcon.c:201 #, 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:223 +#: src/runcon.c:227 #, c-format msgid "failed to compute a new context" msgstr "misslyckades att beräkna en ny kontext" -#: src/runcon.c:237 +#: src/runcon.c:241 #, c-format msgid "failed to set new user %s" msgstr "misslyckades att sätta ny användare %s" -#: src/runcon.c:239 +#: src/runcon.c:243 #, c-format msgid "failed to set new type %s" msgstr "misslyckades att sätta ny typ %s" -#: src/runcon.c:241 +#: src/runcon.c:245 #, c-format msgid "failed to set new range %s" msgstr "misslyckades att sätta nytt intervall %s" -#: src/runcon.c:243 +#: src/runcon.c:247 #, c-format msgid "failed to set new role %s" msgstr "misslyckades att sätta ny roll %s" -#: src/runcon.c:251 +#: src/runcon.c:255 #, c-format msgid "unable to set security context %s" msgstr "kan inte sätta säkerhetskontext %s" @@ -8099,22 +8466,22 @@ msgstr "" " eller: %s [FLAGGA]... FÖRSTA ÖKNING SISTA\n" #: src/seq.c:73 +msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" +msgstr "Skriv ut tal från FÖRSTA till SISTA, i steg om ÖKNING.\n" + +#: src/seq.c:79 msgid "" -"Print numbers from FIRST to LAST, in steps of INCREMENT.\n" -"\n" " -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 "" -"Skriv ut tal från FÖRSTA till SISTA, i steg om ÖKNING.\n" -"\n" -" -f, --format=FORMAT använd flyttalsFORMAT av typ printf\n" -" -s, --separator=STRÄNG använd STRÄNG för att separera tal (standard: " +" -f, --format=FORMAT använd flyttalsFORMAT av typ printf\n" +" -s, --separator=STRÄNG använd STRÄNG för att separera tal (standard: " "\\n)\n" -" -w, --equal-width jämna ut bredd genom att lägga till inledande " +" -w, --equal-width jämna ut bredd genom att lägga till inledande " "nollor\n" -#: src/seq.c:82 +#: src/seq.c:86 msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" @@ -8130,7 +8497,7 @@ msgstr "" "positivt om FÖRSTA är mindre än SISTA och ÖKNING är normalt negativt\n" "om FÖRSTA är större än SISTA.\n" -#: src/seq.c:90 +#: src/seq.c:94 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" @@ -8140,32 +8507,17 @@ 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:136 +#: src/seq.c:140 #, c-format msgid "invalid floating point argument: %s" msgstr "felaktigt flyttalsargument: %s" -#: src/seq.c:193 -#, c-format -msgid "format %s has no %% directive" -msgstr "målet %s har inget %%-direktiv" - -#: src/seq.c:210 -#, c-format -msgid "format %s ends in %%" -msgstr "format %s avslutas med %%" - -#: src/seq.c:213 +#: src/seq.c:232 #, c-format msgid "format %s has unknown %%%c directive" msgstr "formatet %s har okänt %%%c-direktiv" -#: src/seq.c:217 -#, c-format -msgid "format %s has too many %% directives" -msgstr "format %s har för många %%-direktiv" - -#: src/seq.c:431 +#: src/seq.c:555 #, 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" @@ -8207,27 +8559,27 @@ msgstr "" "GID,\n" " och (om angivet) tilläggsgrupp-ID:n till GID1, ...\n" -#: src/setuidgid.c:163 +#: src/setuidgid.c:162 #, c-format msgid "unknown user-ID: %s" msgstr "okänt användar-ID: %s" -#: src/setuidgid.c:174 +#: 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:191 +#: src/setuidgid.c:190 #, c-format msgid "failed to set supplemental group(s)" msgstr "misslyckades att sätta tilläggsgrupp(er)" -#: src/setuidgid.c:201 +#: 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:205 +#: src/setuidgid.c:204 #, c-format msgid "cannot set user-ID to %lu" msgstr "kan inte sätta användar-id till %lu" @@ -8241,13 +8593,11 @@ msgstr "Colin Plumb" 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" -"\n" 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" -"\n" -#: src/shred.c:156 +#: src/shred.c:155 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -8260,7 +8610,7 @@ 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:162 +#: src/shred.c:161 msgid "" " -u, --remove truncate and remove file after overwriting\n" " -v, --verbose show progress\n" @@ -8275,7 +8625,7 @@ msgstr "" " -z, --zero lägg till en avslutande överskrivning med nollor för att\n" " dölja strimlandet\n" -#: src/shred.c:171 +#: src/shred.c:170 msgid "" "\n" "If FILE is -, shred standard output.\n" @@ -8296,7 +8646,7 @@ msgstr "" "--remove.\n" "\n" -#: src/shred.c:181 +#: src/shred.c:180 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" @@ -8315,7 +8665,7 @@ msgstr "" "lägen:\n" "\n" -#: src/shred.c:189 +#: src/shred.c:188 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -8335,7 +8685,7 @@ msgstr "" "* filsystem som tar ögonblicksbilder, såsom Network Appliances NFS-server\n" "\n" -#: src/shred.c:199 +#: src/shred.c:198 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -8349,7 +8699,7 @@ msgstr "" "* comprimerade filsystem\n" "\n" -#: src/shred.c:206 +#: src/shred.c:205 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" @@ -8370,7 +8720,7 @@ msgstr "" "mount (man mount).\n" "\n" -#: src/shred.c:216 +#: src/shred.c:215 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" @@ -8381,123 +8731,123 @@ 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:296 +#: src/shred.c:295 #, c-format msgid "%s: fdatasync failed" msgstr "%s: fdatasync misslyckades" -#: src/shred.c:307 +#: src/shred.c:306 #, c-format msgid "%s: fsync failed" msgstr "%s: fsync misslyckades" -#: src/shred.c:384 +#: src/shred.c:383 #, c-format msgid "%s: cannot rewind" msgstr "%s: kan inte backa till början" -#: src/shred.c:403 +#: src/shred.c:402 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: pass %lu/%lu (%s)..." -#: src/shred.c:453 +#: src/shred.c:452 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: fel vid skrivning vid position %s" -#: src/shred.c:471 +#: src/shred.c:470 #, c-format msgid "%s: lseek failed" msgstr "%s: lseek misslyckades" -#: src/shred.c:482 +#: src/shred.c:481 #, c-format msgid "%s: file too large" msgstr "%s: filen är för stor" -#: src/shred.c:505 +#: src/shred.c:504 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: pass %lu/%lu (%s)...%s" -#: src/shred.c:521 +#: src/shred.c:520 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: pass %lu/%lu (%s)...%s/%s %d%%" -#: src/shred.c:768 +#: src/shred.c:767 #, c-format msgid "%s: fstat failed" msgstr "%s: fstat misslyckades" -#: src/shred.c:779 +#: src/shred.c:778 #, c-format msgid "%s: invalid file type" msgstr "%s: ogiltig filtyp" -#: src/shred.c:798 +#: src/shred.c:797 #, c-format msgid "%s: file has negative size" msgstr "%s: filen har negativ storlek" -#: src/shred.c:865 +#: src/shred.c:864 src/sort.c:932 src/split.c:378 #, c-format msgid "%s: error truncating" msgstr "%s: fel vid avhuggning" -#: src/shred.c:881 +#: src/shred.c:880 #, c-format msgid "%s: fcntl failed" msgstr "%s: fcntl misslyckades" -#: src/shred.c:886 +#: src/shred.c:885 #, 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" -#: src/shred.c:968 +#: src/shred.c:967 #, c-format msgid "%s: removing" msgstr "%s: tar bort" -#: src/shred.c:992 +#: src/shred.c:991 #, c-format msgid "%s: renamed to %s" msgstr "%s: namnändrad till %s" -#: src/shred.c:1014 +#: src/shred.c:1013 #, c-format msgid "%s: failed to remove" msgstr "%s: misslyckades att ta bort" -#: src/shred.c:1018 +#: src/shred.c:1017 #, c-format msgid "%s: removed" msgstr "%s: borttagen" -#: src/shred.c:1025 src/shred.c:1068 +#: src/shred.c:1024 src/shred.c:1067 #, c-format msgid "%s: failed to close" msgstr "%s: misslyckades att stänga" -#: src/shred.c:1061 +#: src/shred.c:1060 #, c-format msgid "%s: failed to open for writing" msgstr "%s: misslyckades öppna för skrivning" -#: src/shred.c:1126 +#: src/shred.c:1125 #, c-format msgid "%s: invalid number of passes" msgstr "%s: ogiltigt antal pass" -#: src/shred.c:1135 src/shuf.c:291 src/sort.c:4387 +#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441 #, c-format msgid "multiple random sources specified" msgstr "multipla slumpkällor angivna" -#: src/shred.c:1149 +#: src/shred.c:1148 #, c-format msgid "%s: invalid file size" msgstr "%s: ogiltig filstorlek" @@ -8514,14 +8864,10 @@ msgstr "" " eller: %s -i LÅ-HÖ [FLAGGA]...\n" #: src/shuf.c:54 -msgid "" -"Write a random permutation of the input lines to standard output.\n" -"\n" -msgstr "" -"Skriv en slumpvis permutation av indataraderna till standard ut.\n" -"\n" +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:61 +#: src/shuf.c:60 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 " @@ -8540,27 +8886,27 @@ msgstr "" " --random-source=FIL hämta slumpbyte:ar från FIL\n" " -z, --zero-terminated avsluta rader med 0-byte, inte nyrad\n" -#: src/shuf.c:245 +#: src/shuf.c:244 #, c-format msgid "multiple -i options specified" msgstr "multipla -l-flaggor angivna" -#: src/shuf.c:265 +#: src/shuf.c:264 #, c-format msgid "invalid input range %s" msgstr "ogiltigt indataintervall %s" -#: src/shuf.c:278 +#: src/shuf.c:277 #, c-format msgid "invalid line count %s" msgstr "felaktig radantal %s" -#: src/shuf.c:285 src/sort.c:4381 +#: src/shuf.c:284 src/sort.c:4435 #, c-format msgid "multiple output files specified" msgstr "multipla utfiler angivna" -#: src/shuf.c:311 +#: src/shuf.c:310 #, c-format msgid "cannot combine -e and -i options" msgstr "det går inte att kombinera flaggorna -e och -i" @@ -8587,7 +8933,7 @@ msgstr "" "flera agument, gör paus så länge som summan av dem anger\n" "\n" -#: src/sleep.c:135 src/timeout.c:295 +#: src/sleep.c:135 src/timeout.c:320 #, c-format msgid "invalid time interval %s" msgstr "felaktigt tidsintervall: %s" @@ -8597,15 +8943,11 @@ msgstr "felaktigt tidsintervall: %s" msgid "cannot read realtime clock" msgstr "kan inte läsa realtidsklockan" -#: src/sort.c:395 -msgid "" -"Write sorted concatenation of all FILE(s) to standard output.\n" -"\n" -msgstr "" -"Skriv en sorterad sammanfogning av alla FIL(er) till standard ut.\n" -"\n" +#: src/sort.c:399 +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:402 +#: src/sort.c:405 msgid "" "Ordering options:\n" "\n" @@ -8613,7 +8955,7 @@ msgstr "" "Sorteringsflaggor:\n" "\n" -#: src/sort.c:406 +#: src/sort.c:409 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -8625,7 +8967,7 @@ msgstr "" "tecken\n" " -f, --ignore-case byt gemener mot versaler\n" -#: src/sort.c:412 +#: src/sort.c:415 msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" " -i, --ignore-nonprinting consider only printable characters\n" @@ -8635,13 +8977,13 @@ msgstr "" " -i, --ignore-nonprinting beakta endast skrivbara tecken\n" " -M, --month-sort jämför (okänd) < ”JAN” < … < ”DEC”\n" -#: src/sort.c:417 +#: src/sort.c:420 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:420 +#: src/sort.c:423 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -8653,7 +8995,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:426 +#: src/sort.c:429 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -8669,7 +9011,7 @@ msgstr "" " -V, --version-sort naturlig sortering av (versions)nummer i text\n" "\n" -#: src/sort.c:434 +#: src/sort.c:437 msgid "" "Other options:\n" "\n" @@ -8677,7 +9019,7 @@ msgstr "" "Andra flaggor:\n" "\n" -#: src/sort.c:438 +#: src/sort.c:441 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" @@ -8685,7 +9027,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:442 +#: src/sort.c:445 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 " @@ -8700,7 +9042,7 @@ msgstr "" " --compress-program=PROG komprimera temporärfiler med PROG;\n" " packa upp dem med PROG -d\n" -#: src/sort.c:449 +#: src/sort.c:452 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -8716,7 +9058,7 @@ msgstr "" " nollterminerade namn i filen F.\n" " Om F är - så läs namn från standard in\n" -#: src/sort.c:456 +#: src/sort.c:459 msgid "" " -k, --key=KEYDEF sort via a key; KEYDEF gives location and type\n" " -m, --merge merge already sorted files; do not sort\n" @@ -8725,7 +9067,7 @@ msgstr "" "typ\n" " -m, --merge slå samman redan sorterade filer, sortera inte\n" -#: src/sort.c:460 +#: src/sort.c:463 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -8738,7 +9080,7 @@ msgstr "" " sista-utvägsjämförelse\n" " -S, --buffer-size=STORLEK använd STORLEK för huvudminnesbuffert\n" -#: src/sort.c:466 +#: src/sort.c:469 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -8765,11 +9107,11 @@ msgstr "" " utan -c, skriv ut endast den första av flera " "lika\n" -#: src/sort.c:475 +#: 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:480 +#: src/sort.c:483 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -8800,7 +9142,7 @@ msgstr "" "\n" "STORLEK kan följas av följande multiplikativa ändelser:\n" -#: src/sort.c:493 +#: src/sort.c:496 msgid "" "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n" "\n" @@ -8821,264 +9163,266 @@ msgstr "" "Sätt LC_ALL=C för att få traditionell sorteringsordning som använder\n" "de underliggande bytevärdena.\n" -#: src/sort.c:694 +#: src/sort.c:697 #, c-format msgid "waiting for %s [-d]" msgstr "väntar på %s [-d]" -#: src/sort.c:699 +#: src/sort.c:702 #, c-format msgid "%s [-d] terminated abnormally" msgstr "%s [-d] avslutade oväntat" -#: src/sort.c:853 +#: src/sort.c:856 #, c-format msgid "cannot create temporary file in %s" msgstr "det går inte att skapa en temporärfil i %s" -#: src/sort.c:939 src/sort.c:2010 src/sort.c:3056 src/sort.c:3755 -#: src/sort.c:3758 +#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713 +#: src/sort.c:3804 src/sort.c:3807 msgid "open failed" msgstr "misslyckades öppna" -#: src/sort.c:959 +#: src/sort.c:970 msgid "fflush failed" msgstr "fflush misslyckades" -#: src/sort.c:964 src/sort.c:2013 src/sort.c:4646 +#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706 msgid "close failed" msgstr "misslyckades stänga" -#: src/sort.c:973 +#: src/sort.c:986 #, c-format msgid "dup2 failed" msgstr "dup2 misslyckades" -#: src/sort.c:1090 +#: src/sort.c:1103 #, c-format msgid "couldn't execute %s" msgstr "det gick inte att köra %s" -#: src/sort.c:1097 +#: src/sort.c:1110 msgid "couldn't create temporary file" msgstr "det går inte att skapa temporärfil" -#: src/sort.c:1136 +#: src/sort.c:1149 #, 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:1150 +#: src/sort.c:1161 #, c-format msgid "couldn't execute %s -d" msgstr "det gick inte att köra %s -d" -#: src/sort.c:1209 +#: src/sort.c:1220 #, c-format msgid "warning: cannot remove: %s" msgstr "varning: kan inte ta bort: %s" -#: src/sort.c:1295 +#: src/sort.c:1306 #, c-format msgid "invalid --%s argument %s" msgstr "felaktigt argument %2$s till --%1$s" -#: src/sort.c:1298 +#: src/sort.c:1309 #, c-format msgid "minimum --%s argument is %s" msgstr "minsta argument till --%s är %s" -#: src/sort.c:1313 +#: src/sort.c:1324 #, c-format msgid "--%s argument %s too large" msgstr "argument %2$s till %1$s är för stort" -#: src/sort.c:1316 +#: src/sort.c:1327 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "maximalt argument till --%s vid aktuell rlimit är %s" -#: src/sort.c:1398 +#: src/sort.c:1409 #, c-format msgid "number in parallel must be nonzero" msgstr "antal parallella måste skilt från noll" -#: src/sort.c:1479 +#: src/sort.c:1494 msgid "stat failed" msgstr "misslyckades ta status" -#: src/sort.c:1740 +#: src/sort.c:1755 msgid "read failed" msgstr "misslyckades läsa" -#: src/sort.c:2028 +#: src/sort.c:2043 #, c-format msgid "string transformation failed" msgstr "strängtransformation misslyckades" -#: src/sort.c:2031 +#: src/sort.c:2046 #, c-format msgid "the untransformed string was %s" msgstr "den otransformerade strängen var %s" -#: src/sort.c:2194 +#: src/sort.c:2209 #, c-format msgid "^ no match for key\n" msgstr "^ ingen match för nyckel\n" -#: src/sort.c:2374 +#: src/sort.c:2389 #, 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:2380 +#: src/sort.c:2395 #, 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:2391 +#: src/sort.c:2406 #, 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:2404 +#: src/sort.c:2419 #, 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:2436 +#: src/sort.c:2451 #, 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:2442 +#: src/sort.c:2457 #, 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:2716 src/sort.c:2725 +#: src/sort.c:2731 src/sort.c:2740 msgid "write failed" msgstr "misslyckaes skriva" -#: src/sort.c:2768 +#: src/sort.c:2783 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: oordning: " -#: src/sort.c:2771 +#: src/sort.c:2786 msgid "standard error" msgstr "standard fel" -#: src/sort.c:3926 +#: src/sort.c:3698 +msgid "cannot read" +msgstr "kan inte läsa" + +#: src/sort.c:3976 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: felaktig fältspecifikation %s" -#: src/sort.c:3937 +#: src/sort.c:3987 #, c-format msgid "options '-%s' are incompatible" msgstr "flaggorna ”-%s” är inkompatibla" -#: src/sort.c:3988 +#: src/sort.c:4038 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s: felaktigt antal i början på %s" -#: src/sort.c:4245 +#: src/sort.c:4295 msgid "invalid number after '-'" msgstr "felaktigt nummer efter ”-”" -#: src/sort.c:4248 src/sort.c:4334 src/sort.c:4362 +#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416 msgid "invalid number after '.'" msgstr "felaktigt nummer efter ”.”" -#: src/sort.c:4261 src/sort.c:4367 +#: src/sort.c:4315 src/sort.c:4421 msgid "stray character in field spec" msgstr "extra tecken i fältspecifikation" -#: src/sort.c:4308 +#: src/sort.c:4362 #, c-format msgid "multiple compress programs specified" msgstr "multipla komprimeringsprogram angivna" -#: src/sort.c:4325 +#: src/sort.c:4379 msgid "invalid number at field start" msgstr "felaktigt nummer vid fältstart" -#: src/sort.c:4329 src/sort.c:4357 +#: src/sort.c:4383 src/sort.c:4411 msgid "field number is zero" msgstr "fältnummer är noll" -#: src/sort.c:4338 +#: src/sort.c:4392 msgid "character offset is zero" msgstr "teckenplats är noll" -#: src/sort.c:4353 +#: src/sort.c:4407 msgid "invalid number after ','" msgstr "felaktigt nummer efter ”,”" -#: src/sort.c:4403 +#: src/sort.c:4457 #, c-format msgid "empty tab" msgstr "tom tabulator" -#: src/sort.c:4496 src/wc.c:692 +#: src/sort.c:4550 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:4518 +#: src/sort.c:4572 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s:%lu: ogiltigt filnamn med längd noll" -#: src/sort.c:4524 +#: src/sort.c:4578 #, c-format msgid "no input from %s" msgstr "ingen indata från %s" -#: src/sort.c:4570 +#: src/sort.c:4624 #, c-format msgid "using %s sorting rules" msgstr "använder %s-sorteringsregler" -#: src/sort.c:4573 +#: src/sort.c:4627 #, c-format msgid "using simple byte comparison" msgstr "använder enkel bytejämförelse" -#: src/sort.c:4604 +#: src/sort.c:4658 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "extra operand %s inte tillåten med -%c" -#: src/split.c:184 +#: src/split.c:187 #, c-format msgid "the suffix length needs to be at least %zu" msgstr "ändelsens längd behöver vara åtminstone %zu" -#: src/split.c:201 +#: src/split.c:204 #, c-format msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" msgstr "Användning: %s [FLAGGA]... [INFIL [PREFIX]]\n" -#: src/split.c:205 +#: src/split.c:208 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" -"\n" msgstr "" "Skriv ut delar av INFIL med bestämd storlek till PREFIXaa, PREFIXab, …\n" "Standardstorlek är 1000 rader, och standardprefix är ”x”. Utan INFIL,\n" "eller när INFIL är -, läs standard in.\n" -"\n" -#: src/split.c:214 +#: src/split.c:216 #, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" @@ -9111,7 +9455,7 @@ msgstr "" "…”\n" "\n" -#: src/split.c:227 +#: src/split.c:229 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" @@ -9119,7 +9463,7 @@ msgstr "" " --verbose skriv ett meddelande strax före varje\n" " utfil öppnas\n" -#: src/split.c:234 +#: src/split.c:236 msgid "" "\n" "CHUNKS may be:\n" @@ -9139,184 +9483,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:352 +#: src/split.c:354 #, c-format msgid "output file suffixes exhausted" msgstr "slut på utfiländelser" -#: src/split.c:364 +#: src/split.c:366 #, c-format msgid "creating file %s\n" msgstr "skapar filen %s\n" -#: src/split.c:377 +#: src/split.c:375 +#, c-format +msgid "%s would overwrite input; aborting" +msgstr "%s skulle skriva över indata, avbryter" + +#: src/split.c:391 #, c-format msgid "failed to set FILE environment variable" msgstr "misslyckades att sätta miljövariabeln FILE" -#: src/split.c:379 +#: src/split.c:393 #, c-format msgid "executing with FILE=%s\n" msgstr "kör med FIL=%s\n" -#: src/split.c:381 +#: src/split.c:395 #, c-format msgid "failed to create pipe" msgstr "misslyckades att skapa rör" -#: src/split.c:395 +#: src/split.c:409 #, c-format msgid "closing prior pipe" msgstr "stänger tidigare rör" -#: src/split.c:397 +#: src/split.c:411 #, c-format msgid "closing output pipe" msgstr "stänger utdatarör" -#: src/split.c:401 +#: src/split.c:415 #, c-format msgid "moving input pipe" msgstr "flyttar indatarör" -#: src/split.c:403 +#: src/split.c:417 #, c-format msgid "closing input pipe" msgstr "stänger indatafil" -#: src/split.c:408 +#: src/split.c:422 #, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "misslyckades att köra kommandot ”%s -c %s”" -#: src/split.c:414 +#: src/split.c:428 #, c-format msgid "failed to close input pipe" msgstr "misslyckades att stänga indatarör" -#: src/split.c:450 +#: src/split.c:464 #, c-format msgid "waiting for child process" msgstr "väntar på barnprocess" -#: src/split.c:460 +#: src/split.c:474 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "med FILE=%s, signal %s från kommando: %s" -#: src/split.c:468 +#: src/split.c:482 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "med FILE=%s, slutkod %d från kommando: %s" -#: src/split.c:475 src/timeout.c:449 +#: src/split.c:489 src/timeout.c:494 #, c-format msgid "unknown status from command (0x%X)" msgstr "okänd status från kommando (0x%X)" -#: src/split.c:1037 +#: src/split.c:1052 #, c-format msgid "cannot split in more than one way" msgstr "kan inte dela på mer än ett sätt" -#: src/split.c:1050 src/split.c:1192 src/split.c:1363 +#: src/split.c:1065 src/split.c:1205 src/split.c:1376 #, c-format msgid "%s: invalid number of chunks" msgstr "%s: ogiltigt antal bitar" -#: src/split.c:1054 +#: src/split.c:1069 #, c-format msgid "%s: invalid chunk number" msgstr "%s: felaktigt bitantal" -#: src/split.c:1106 +#: src/split.c:1119 #, c-format msgid "%s: invalid suffix length" msgstr "%s: felaktig ändelselängd" -#: src/split.c:1131 src/split.c:1139 src/split.c:1162 src/split.c:1167 +#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180 #, c-format msgid "%s: invalid number of bytes" msgstr "%s: felaktigt antal byte" -#: src/split.c:1150 src/split.c:1297 +#: src/split.c:1163 src/split.c:1310 #, c-format msgid "%s: invalid number of lines" msgstr "%s: felaktigt antal rader" -#: src/split.c:1223 +#: src/split.c:1236 #, c-format msgid "line count option -%s%c... is too large" msgstr "radantalsflagga -%s%c... är för stor" -#: src/split.c:1235 +#: src/split.c:1248 #, c-format msgid "%s: invalid start value for numerical suffix" msgstr "%s: felaktigt startvärde för numerisk ändelse" -#: src/split.c:1263 +#: src/split.c:1276 #, c-format msgid "%s: invalid IO block size" msgstr "%s: ogiltig blockstorlek för IO" -#: src/split.c:1284 +#: src/split.c:1297 #, 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:1321 +#: src/split.c:1334 #, 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:1356 +#: src/split.c:1369 #, 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:169 +#: src/stat.c:173 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:838 +#: src/stat.c:857 #, c-format msgid "failed to canonicalize %s" msgstr "misslyckades att kanonisera %s" -#: src/stat.c:1050 +#: src/stat.c:1069 #, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "varning: okänd sekvens med omvänt snedstreck ”\\%c”" -#: src/stat.c:1105 +#: src/stat.c:1124 #, c-format msgid "%s: invalid directive" msgstr "%s: ogiltigt direktiv" -#: src/stat.c:1151 +#: src/stat.c:1170 #, c-format msgid "warning: backslash at end of format" msgstr "varning: omvänt snedstreck vid slutet av formatet" -#: src/stat.c:1182 +#: src/stat.c:1201 #, 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:1189 +#: src/stat.c:1208 #, c-format msgid "cannot read file system information for %s" msgstr "kan inte läsa filsysteminformation för %s" -#: src/stat.c:1209 +#: src/stat.c:1228 #, 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:1245 +#: src/stat.c:1264 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -9332,7 +9681,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1268 +#: src/stat.c:1287 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -9342,30 +9691,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1278 +#: src/stat.c:1297 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:1286 +#: src/stat.c:1305 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:1295 +#: src/stat.c:1314 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:1305 +#: src/stat.c:1324 #, c-format msgid "Context: %C\n" msgstr "Kontext: %C\n" -#: src/stat.c:1313 +#: src/stat.c:1332 msgid "" "Access: %x\n" "Modify: %y\n" @@ -9377,19 +9726,19 @@ msgstr "" " Ändring: %z\n" " Född: %w\n" -#: src/stat.c:1331 +#: src/stat.c:1350 +msgid "Display file or file system status.\n" +msgstr "Visa fil- eller filsystemstatus.\n" + +#: src/stat.c:1356 msgid "" -"Display file or file system status.\n" -"\n" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" -"Visa fil- eller filsystemstatus.\n" -"\n" " -L, --dereference följ länkar\n" " -f, --file-system visa filsystemstatus istället för filstatus\n" -#: src/stat.c:1337 +#: src/stat.c:1360 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -9407,7 +9756,7 @@ msgstr "" " \\n i FORMAT.\n" " -t, --terse skriv informationen på kortfattad form\n" -#: src/stat.c:1348 +#: src/stat.c:1371 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -9427,7 +9776,7 @@ msgstr "" " %B storleken i byte på varje block rapporterat av %b\n" " %C SELinux säkerhetskontextsträng\n" -#: src/stat.c:1357 +#: src/stat.c:1380 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -9443,7 +9792,7 @@ msgstr "" " %g grupp-ID på ägare\n" " %G gruppnamn på ägare\n" -#: src/stat.c:1365 +#: src/stat.c:1388 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -9465,7 +9814,7 @@ msgstr "" " %t övre enhetsnummer hexadecimalt\n" " %T undre enhetsnummer hexadecimalt\n" -#: src/stat.c:1376 +#: src/stat.c:1399 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -9491,7 +9840,7 @@ msgstr "" " %Z filens ändringstid, sekunder sedan Epok\n" "\n" -#: src/stat.c:1390 +#: src/stat.c:1413 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -9509,7 +9858,7 @@ msgstr "" " %d fria filnoder i filsystem\n" " %f fria block i filsystem\n" -#: src/stat.c:1399 +#: src/stat.c:1422 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -9535,13 +9884,11 @@ msgstr "Användning: %s FLAGGA... KOMMANDO\n" #: src/stdbuf.c:91 msgid "" "Run COMMAND, with modified buffering operations for its standard streams.\n" -"\n" msgstr "" "Kör KOMMANDO, med modifierad buffringsoperationer för dess " "standardströmmar.\n" -"\n" -#: src/stdbuf.c:98 +#: src/stdbuf.c:97 msgid "" " -i, --input=MODE adjust standard input stream buffering\n" " -o, --output=MODE adjust standard output stream buffering\n" @@ -9551,7 +9898,7 @@ msgstr "" " -o, --output=LÄGE justera strömbuffring av standard ut\n" " -e, --error=LÄGE justera strömbuffring av standard fel\n" -#: src/stdbuf.c:105 +#: src/stdbuf.c:104 msgid "" "\n" "If MODE is 'L' the corresponding stream will be line buffered.\n" @@ -9561,7 +9908,7 @@ msgstr "" "Om LÄGE är ”L” kommer motsvarande ström vara radbuffrad.\n" "Detta alternativ är ogiltigt med standard in.\n" -#: src/stdbuf.c:108 +#: src/stdbuf.c:107 msgid "" "\n" "If MODE is '0' the corresponding stream will be unbuffered.\n" @@ -9569,7 +9916,7 @@ msgstr "" "\n" "Om LÄGE är ”0” kommer motsvarande ström vara obuffrad.\n" -#: src/stdbuf.c:111 +#: src/stdbuf.c:110 msgid "" "\n" "Otherwise MODE is a number which may be followed by one of the following:\n" @@ -9586,7 +9933,7 @@ msgstr "" "till\n" "LÄGE byte.\n" -#: src/stdbuf.c:117 +#: src/stdbuf.c:116 msgid "" "\n" "NOTE: If COMMAND adjusts the buffering of its standard streams ('tee' does\n" @@ -9604,22 +9951,22 @@ msgstr "" "strömmar\n" "för I/O, och påverkas alltså inte av ”stdbuf”-inställningar.\n" -#: src/stdbuf.c:227 +#: src/stdbuf.c:226 #, c-format msgid "failed to find %s" msgstr "misslyckades att hitta %s" -#: src/stdbuf.c:247 src/stdbuf.c:279 +#: src/stdbuf.c:246 src/stdbuf.c:278 #, c-format msgid "failed to update the environment with %s" msgstr "misslyckades att uppdatera miljön med %s" -#: src/stdbuf.c:321 +#: src/stdbuf.c:320 #, c-format msgid "line buffering stdin is meaningless" msgstr "radbuffring av standard in är meningslöst" -#: src/stty.c:509 +#: src/stty.c:513 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -9630,22 +9977,22 @@ msgstr "" " eller: %s [-F ENHETS | --file=ENHETS] [-a|--all]\n" " eller: %s [-F ENHETS | --file=ENHETS] [-g|--save]\n" -#: src/stty.c:515 +#: src/stty.c:519 +msgid "Print or change terminal characteristics.\n" +msgstr "Skriv ut eller ändra terminalkarakteristik.\n" + +#: src/stty.c:525 msgid "" -"Print or change terminal characteristics.\n" -"\n" " -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 "" -"Skriv ut eller ändra terminalkarakteristik.\n" -"\n" " -a, --all skriv ut alla nuvarande inställningar läsligt\n" " -g, --save skriv ut alla nuvarande inställningar i stty-format\n" " -F, --file=ENHET öppna och använd angiven ENHET istället för standard " "in\n" -#: src/stty.c:524 +#: src/stty.c:532 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -9656,7 +10003,7 @@ msgstr "" "icke-POSIX-inställning. Det underliggande systemet definierar vilka\n" "inställningar som är tillgängliga.\n" -#: src/stty.c:529 +#: src/stty.c:537 msgid "" "\n" "Special characters:\n" @@ -9670,7 +10017,7 @@ msgstr "" " eof TECKEN TECKEN skickar ett filslut (avsluta inmatning)\n" " eol TECKEN TECKEN avslutar raden\n" -#: src/stty.c:536 +#: src/stty.c:544 msgid "" " * eol2 CHAR alternate CHAR for ending the line\n" " erase CHAR CHAR will erase the last character typed\n" @@ -9682,7 +10029,7 @@ msgstr "" " intr TECKEN TECKEN skickar en avbrottssignal\n" " kill TECKEN TECKEN raderar nuvarande rad\n" -#: src/stty.c:542 +#: src/stty.c:550 msgid "" " * lnext CHAR CHAR will enter the next character quoted\n" " quit CHAR CHAR will send a quit signal\n" @@ -9694,7 +10041,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:548 +#: src/stty.c:556 msgid "" " stop CHAR CHAR will stop the output\n" " susp CHAR CHAR will send a terminal stop signal\n" @@ -9706,7 +10053,7 @@ msgstr "" " * swtch TECKEN TECKEN byter till ett annat skal\n" " * werase TECKEN TECKEN raderar det senast skrivna ordet\n" -#: src/stty.c:554 +#: src/stty.c:562 msgid "" "\n" "Special settings:\n" @@ -9720,7 +10067,7 @@ msgstr "" " * cols N säg till kärnan att terminalen har N kolumner\n" " * columns N samma som cols N\n" -#: src/stty.c:561 +#: src/stty.c:569 msgid "" " ispeed N set the input speed to N\n" " * line N use line discipline N\n" @@ -9734,7 +10081,7 @@ msgstr "" "läsning\n" " ospeed N sätt utmatningshastighet till N\n" -#: src/stty.c:567 +#: src/stty.c:575 msgid "" " * rows N tell the kernel that the terminal has N rows\n" " * size print the number of rows and columns according to the " @@ -9748,30 +10095,32 @@ msgstr "" " time N med -icanon, sätt timeout för läsning till N tiondels " "sekunder\n" -#: src/stty.c:573 +#: src/stty.c:581 msgid "" "\n" "Control settings:\n" " [-]clocal disable modem control signals\n" " [-]cread allow input to be received\n" " * [-]crtscts enable RTS/CTS handshaking\n" +" * [-]cdtrdsr enable DTR/DSR handshaking\n" " csN set character size to N bits, N in [5..8]\n" msgstr "" "\n" "Kontrollinställningar:\n" " [-]clocal stäng av kontrollsignaler till modem\n" " [-]cread tillåt mottagandet av indata\n" -" * [-]crtscts möjliggör RTS/CTS handskakning\n" -" csN sätt teckenstorleken till N bitar, N 5-8\n" +" * [-]crtscts möjliggör RTS/CTS-handskakning\n" +" * [-]cdtrdse möjliggör DTR/DSR-handskakning\n" +" csN sätt teckenstorleken till N bitar, N i [5..8]\n" -#: src/stty.c:581 +#: src/stty.c:590 msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" " [-]hupcl same as [-]hup\n" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" -" [-]parodd set odd parity (even with '-')\n" +" [-]parodd set odd parity (or even parity with '-')\n" msgstr "" " [-]cstopb använd två stoppbitar per tecken (en med ”-”)\n" " [-]hup skicka en påläggningssignal när sista processen stänger " @@ -9779,9 +10128,9 @@ msgstr "" " [-]hupcl samma som [-]hup\n" " [-]parenb generera paritetsbit i utdata och förvänta paritetsbit i " "indata\n" -" [-]parodd ställ in udda paritet (jämn med ”-”)\n" +" [-]parodd ställ in udda paritet (eller jämn paritet med ”-”)\n" -#: src/stty.c:588 +#: src/stty.c:597 msgid "" "\n" "Input settings:\n" @@ -9797,7 +10146,7 @@ msgstr "" " [-]ignbrk ignorera avbrottstecken\n" " [-]igncr ignorera vagnretur\n" -#: src/stty.c:596 +#: src/stty.c:605 msgid "" " [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" @@ -9812,11 +10161,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:603 +#: src/stty.c:612 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr " * [-]iutf8 anta inmatningstecken är UTF-8-kodade\n" -#: src/stty.c:606 +#: src/stty.c:615 msgid "" " * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" @@ -9833,7 +10182,7 @@ msgstr "" " [-]parmrk markera paritetsfel (med en 255-0 teckensekvens)\n" " [-]tandem samma som [-]ixoff\n" -#: src/stty.c:614 +#: src/stty.c:623 msgid "" "\n" "Output settings:\n" @@ -9849,7 +10198,7 @@ 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:622 +#: src/stty.c:631 msgid "" " * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of null characters\n" @@ -9867,7 +10216,7 @@ msgstr "" " * [-]onlcr översätt nyrad till vagnretur-nyrad\n" " * [-]onlret nyrad utför vagnretur\n" -#: src/stty.c:630 +#: src/stty.c:639 msgid "" " * [-]onocr do not print carriage returns in the first column\n" " [-]opost postprocess output\n" @@ -9883,7 +10232,7 @@ msgstr "" " * -tabs samma som tab3\n" " * vtN fördröjning på vertikal tabulator, N är [0-1]\n" -#: src/stty.c:638 +#: src/stty.c:647 msgid "" "\n" "Local settings:\n" @@ -9899,7 +10248,7 @@ msgstr "" " * -crtkill radera hela raden genom att använda inställningarna\n" " för echoctl och echok\n" -#: src/stty.c:645 +#: src/stty.c:654 msgid "" " * [-]ctlecho echo control characters in hat notation ('^c')\n" " [-]echo echo input characters\n" @@ -9913,7 +10262,7 @@ msgstr "" " [-]echoe samma som [-]crterase\n" " [-]echok eka ett nyrad efter ett dödatecken\n" -#: src/stty.c:652 +#: src/stty.c:661 msgid "" " * [-]echoke same as [-]crtkill\n" " [-]echonl echo newline even if not echoing other characters\n" @@ -9927,7 +10276,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:659 +#: src/stty.c:668 msgid "" " [-]isig enable interrupt, quit, and suspend special characters\n" " [-]noflsh disable flushing after interrupt and quit special " @@ -9944,7 +10293,7 @@ msgstr "" " * [-]xcase tillsammans med icanon, används ”\\” som kontrollsekvens\n" " för versaltecken\n" -#: src/stty.c:666 +#: src/stty.c:675 msgid "" "\n" "Combination settings:\n" @@ -9958,7 +10307,7 @@ msgstr "" " cbreak samma som -icanon\n" " -cbreak samma som icanon\n" -#: src/stty.c:673 +#: src/stty.c:682 msgid "" " cooked same as brkint ignpar istrip icrnl ixon opost isig\n" " icanon, eof and eol characters to their default values\n" @@ -9971,7 +10320,7 @@ msgstr "" " -cooked samma som raw\n" " crt samma som echoe echoctl echoke\n" -#: src/stty.c:679 +#: src/stty.c:688 msgid "" " dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" " kill ^u\n" @@ -9985,7 +10334,7 @@ msgstr "" " ek radera- och återställtecken till sina standardvärden\n" " evenp samma som parenb -parodd cs7\n" -#: src/stty.c:686 +#: src/stty.c:695 msgid "" " -evenp same as -parenb cs8\n" " * [-]lcase same as xcase iuclc olcuc\n" @@ -10001,7 +10350,7 @@ msgstr "" " nl samma som -icrnl -onlcr\n" " -nl samma som icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" -#: src/stty.c:694 +#: src/stty.c:703 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -10015,7 +10364,7 @@ msgstr "" " pass8 samma som -parenb -istrip cs8\n" " -pass8 samma som parenb istrip cs7\n" -#: src/stty.c:701 +#: src/stty.c:710 msgid "" " raw same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" " -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n" @@ -10027,7 +10376,7 @@ msgstr "" " -imaxbel -opost -isig -icanon -xcase min 1 time 0\n" " -raw samma som cooked\n" -#: src/stty.c:707 +#: src/stty.c:716 msgid "" " sane same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" " -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n" @@ -10043,7 +10392,7 @@ msgstr "" " -xcase -tostop -echoprt echoctl echoke, \n" " alla specialtecken till sina standardvärden\n" -#: src/stty.c:715 +#: src/stty.c:724 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -10057,12 +10406,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:787 +#: src/stty.c:796 #, c-format msgid "only one device may be specified" msgstr "endast en enhet får anges" -#: src/stty.c:817 +#: src/stty.c:826 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" @@ -10071,125 +10420,47 @@ msgstr "" "flaggorna för utförlig och stty-läsbar utmatningsstil är ömsesidigt\n" "uteslutande" -#: src/stty.c:823 +#: src/stty.c:832 #, 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:838 +#: src/stty.c:847 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s: kan inte starta om icke-blockerande läge" -#: src/stty.c:883 src/stty.c:993 +#: src/stty.c:892 src/stty.c:1002 #, c-format msgid "invalid argument %s" msgstr "felaktigt argument %s" -#: src/stty.c:894 src/stty.c:911 src/stty.c:923 src/stty.c:936 src/stty.c:948 -#: src/stty.c:968 +#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957 +#: src/stty.c:977 #, c-format msgid "missing argument to %s" msgstr "argument saknas till %s" -#: src/stty.c:974 +#: src/stty.c:983 #, c-format msgid "invalid line discipline %s" msgstr "felaktig linjedisciplin %s" -#: src/stty.c:1044 +#: src/stty.c:1053 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s: kunde inte utföra alla efterfrågade operationer" -#: src/stty.c:1390 +#: src/stty.c:1399 #, c-format msgid "%s: no size information for this device" msgstr "%s: ingen storleksinformation på denna enhet" -#: src/stty.c:1904 +#: src/stty.c:1920 #, c-format msgid "invalid integer argument %s" msgstr "felaktigt heltalsargument %s" -#: src/su.c:229 -msgid "Password:" -msgstr "Lösenord:" - -#: src/su.c:232 -#, c-format -msgid "getpass: cannot open /dev/tty" -msgstr "getpass: kan inte öppna /dev/tty" - -#: src/su.c:290 -#, c-format -msgid "cannot set groups" -msgstr "kan inte sätta grupper" - -#: src/su.c:294 -#, c-format -msgid "cannot set group id" -msgstr "kan inte sätta grupp-id" - -#: src/su.c:296 -#, c-format -msgid "cannot set user id" -msgstr "kan inte sätta användar-id" - -#: src/su.c:371 -#, c-format -msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" -msgstr "Användning: %s [FLAGGA]... [-] [ANVÄNDARE [ARG]...]\n" - -#: src/su.c:372 -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 "" -"Ändra gällande användar-id och grupp-id till ANVÄNDAREs.\n" -"\n" -" -, -l, --login gör skalet till ett inloggningsskal\n" -" -c, --command=KOMMANDO skicka ett enskilt KOMMANDO till skalet med -" -"c\n" -" -f, --fast skicka -f till skalet (för csh eller tcsh)\n" -" -m, --preserve-environment återställ inte miljövariabler\n" -" -p samma som -m\n" -" -s, --shell=SKAL kör SKAL, om /etc/shells tillåter det\n" - -#: src/su.c:384 -msgid "" -"\n" -"A mere - implies -l. If USER not given, assume root.\n" -msgstr "" -"\n" -"Att bara ange - implierar -l. Om ANVÄDNARE inte anges, antas root.\n" - -#: src/su.c:461 -#, c-format -msgid "user %s does not exist" -msgstr "användaren %s existerar inte" - -#: src/su.c:484 -#, c-format -msgid "incorrect password" -msgstr "felaktigt lösenord" - -#: src/su.c:501 -#, c-format -msgid "using restricted shell %s" -msgstr "använder ett skyddat skal %s" - -#: src/su.c:509 -#, c-format -msgid "warning: cannot change directory to %s" -msgstr "varning: kan inte byta katalog till %s" - #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 msgid "Kayvan Aghaiepour" @@ -10221,7 +10492,7 @@ msgstr "" msgid "ignoring all arguments" msgstr "ignorerar alla argument" -#: src/system.h:340 +#: src/system.h:343 #, c-format msgid "" "\n" @@ -10235,15 +10506,24 @@ msgstr "" "beskrivs här. Se dokumentationen för ditt skal för detaljer om valen det\n" "stödjer.\n" -#: src/system.h:346 +#: src/system.h:349 msgid " --help display this help and exit\n" msgstr " --help visa denna hjälptext och avsluta\n" -#: src/system.h:348 +#: src/system.h:351 msgid " --version output version information and exit\n" msgstr " --version visa versionsinformation och avsluta\n" -#: src/system.h:541 +#: src/system.h:544 +msgid "" +"\n" +"Mandatory arguments to long options are mandatory for short options too.\n" +msgstr "" +"\n" +"Obligatoriska argument till långa flaggor är obligatoriska även för de " +"korta.\n" + +#: src/system.h:552 msgid "" "\n" "SIZE is an integer and optional unit (example: 10M is 10*1024*1024). Units\n" @@ -10255,7 +10535,7 @@ msgstr "" "Enheter är K, M, G, T, P, E, Z, Y (multiplar av 1024) eller KB, MB, …\n" "(multiplar av 1000).\n" -#: src/system.h:550 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -10268,7 +10548,7 @@ 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:560 +#: src/system.h:571 #, c-format msgid "" "\n" @@ -10282,24 +10562,24 @@ msgstr "" #. <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:574 +#: src/system.h:585 #, 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:578 +#: src/system.h:589 #, 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:585 +#: src/system.h:596 #, 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:617 +#: src/system.h:628 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -10323,13 +10603,11 @@ msgstr "Jay Lepreau" msgid "" "Write each FILE to standard output, last line first.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" "Skriv varje FIL till standard ut, sista raden först.\n" "Utan FIL, eller när FIL är -, läs standard in.\n" -"\n" -#: src/tac.c:145 +#: src/tac.c:144 msgid "" " -b, --before attach the separator before instead of after\n" " -r, --regex interpret the separator as a regular expression\n" @@ -10340,42 +10618,42 @@ msgstr "" " -s, --separator=STRÄNG använd STRÄNG som skiljetecken i stället för ny " "rad\n" -#: src/tac.c:235 src/tac.c:336 +#: src/tac.c:234 src/tac.c:335 #, c-format msgid "%s: seek failed" msgstr "%s: sökning misslyckades" -#: src/tac.c:264 +#: src/tac.c:263 #, c-format msgid "record too large" msgstr "för stor post" -#: src/tac.c:451 +#: src/tac.c:450 #, c-format msgid "failed to create temporary file in %s" msgstr "misslyckades att att skapa en temporärfil i %s" -#: src/tac.c:459 +#: src/tac.c:458 #, c-format msgid "failed to open %s for writing" msgstr "misslyckades öppna %s för skrivning" -#: src/tac.c:476 +#: src/tac.c:475 #, c-format msgid "failed to rewind stream for %s" msgstr "misslyckades att spola tillbaka strömmen för %s" -#: src/tac.c:512 src/tac.c:519 +#: src/tac.c:511 src/tac.c:518 #, c-format msgid "%s: write error" msgstr "%s: skrivfel" -#: src/tac.c:572 +#: src/tac.c:571 #, c-format msgid "failed to open %s for reading" msgstr "misslyckades att öppna %s för läsning" -#: src/tac.c:630 +#: src/tac.c:629 #, c-format msgid "separator cannot be empty" msgstr "skiljetecken kan inte vara tomt" @@ -10391,14 +10669,12 @@ 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" -"\n" msgstr "" "Skriv de sista %d raderna från varje FIL till standard ut.\n" "Vid fler än en FIL, inled varje med ett huvud med filnamnet.\n" "Utan FIL eller om FIL är -, läs standard in.\n" -"\n" -#: src/tail.c:271 +#: src/tail.c:270 msgid "" " -c, --bytes=K output the last K bytes; alternatively, use -c " "+K\n" @@ -10411,7 +10687,7 @@ msgstr "" "varje\n" " fil\n" -#: src/tail.c:275 +#: src/tail.c:274 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -10425,7 +10701,7 @@ msgstr "" " likvärdiga\n" " -F samma som --follow=name --retry\n" -#: src/tail.c:282 +#: src/tail.c:281 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -10452,7 +10728,7 @@ msgstr "" "loggfiler)-\n" " Med inotify är denna flagga sällan användbar.\n" -#: src/tail.c:295 +#: src/tail.c:294 msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" " -q, --quiet, --silent never output headers giving file names\n" @@ -10467,7 +10743,7 @@ msgstr "" "följer\n" " enligt namn, t.ex., med --follow=namn\n" -#: src/tail.c:302 +#: src/tail.c:301 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations.\n" @@ -10481,7 +10757,7 @@ msgstr "" " åtminstone var N:e sekund.\n" " -v, --verbose skriv alltid ut huvuden med filnamn\n" -#: src/tail.c:311 +#: src/tail.c:310 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -10499,7 +10775,7 @@ msgstr "" "GB 1000·1000·1000, G 1024·1024·1024, and so on for T, P, E, Z, Y.\n" "\n" -#: src/tail.c:320 +#: src/tail.c:319 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" @@ -10516,27 +10792,27 @@ 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:379 +#: src/tail.c:378 #, c-format msgid "closing %s (fd=%d)" msgstr "stänger %s (fd=%d)" -#: src/tail.c:454 +#: 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:458 +#: src/tail.c:457 #, 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:895 +#: src/tail.c:894 #, 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:907 +#: src/tail.c:906 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " @@ -10545,37 +10821,37 @@ msgstr "" "okänd filsystemtyp 0x%08lx för %s. Rapportera gärna detta till %s. Återgår " "till pollning" -#: src/tail.c:964 +#: src/tail.c:963 #, c-format msgid "%s has become inaccessible" msgstr "%s har blivit oåtkomlig" -#: src/tail.c:981 +#: src/tail.c:980 #, 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:990 +#: src/tail.c:989 #, 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:1011 +#: src/tail.c:1010 #, c-format msgid "%s has become accessible" msgstr "%s har blivit åtkomlig" -#: src/tail.c:1019 +#: src/tail.c:1018 #, 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:1030 +#: src/tail.c:1029 #, 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:1131 +#: src/tail.c:1130 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: kan inte ändra icke-blockerande läge" @@ -10935,17 +11211,22 @@ msgstr " ”]” saknas" msgid "extra argument %s" msgstr "extra argument %s" -#: src/timeout.c:124 +#: src/timeout.c:112 +#, c-format +msgid "warning: sigprocmask" +msgstr "varning: sigprocmask" + +#: src/timeout.c:145 #, c-format msgid "warning: timer_settime" msgstr "varning: timer_settime" -#: src/timeout.c:129 +#: src/timeout.c:150 #, c-format msgid "warning: timer_create" msgstr "varning: timer_create" -#: src/timeout.c:204 +#: src/timeout.c:225 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -10954,19 +11235,15 @@ msgstr "" "Användning: %s [FLAGGA] LÖPTID KOMMANDO [ARG]...\n" " eller: %s [FLAGGA]\n" -#: src/timeout.c:208 -msgid "" -"Start COMMAND, and kill it if still running after DURATION.\n" -"\n" -"Mandatory arguments to long options are mandatory for short options too.\n" -msgstr "" -"Starta KOMMANDO, och döda det om det fortfarande kör efter LÖPTID.\n" -"\n" -"Obligatoriska argument till långa flaggor är obligatoriska även för de " -"korta.\n" +#: src/timeout.c:229 +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:213 +#: src/timeout.c:235 msgid "" +" --preserve-status\n" +" exit with the same status as COMMAND, even when the\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 " @@ -10980,6 +11257,9 @@ msgid "" " 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" " --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" @@ -10992,7 +11272,7 @@ msgstr "" " SIGNAL kan vara ett namn som ”HUP” eller ett nummer.\n" " Se ”kill -l” för en lista på signaler.\n" -#: src/timeout.c:229 +#: src/timeout.c:254 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -11004,34 +11284,41 @@ msgstr "" "”s” för sekunder (standard), ”m” för minuter, ”h” för timmar eller ”d” för\n" "dagar.\n" -#: src/timeout.c:234 +#: src/timeout.c:259 msgid "" "\n" -"If the command times out, then exit with status 124. Otherwise, exit\n" -"with the status of COMMAND. If no signal is specified, send the TERM\n" -"signal upon timeout. The TERM signal kills any process that does not\n" -"block or catch that signal. For other processes, it may be necessary to\n" -"use the KILL (9) signal, since this signal cannot be caught. If the\n" -"KILL (9) signal is sent, the exit status is 128+9 rather than 124.\n" +"If the command times out, and --preserve-status is not set, then exit with\n" +"status 124. Otherwise, exit with the status of COMMAND. If no signal\n" +"is specified, send the TERM signal upon timeout. The TERM signal kills\n" +"any process that does not block or catch that signal. It may be necessary\n" +"to use the KILL (9) signal, since this signal cannot be caught, in which\n" +"case the exit status is 128+9 rather than 124.\n" msgstr "" "\n" -"Om kommandot går över tiden, avsluta då med status 124. Avsluta annars\n" -"returnera slutstatusen från KOMMANDO. Om ingen signal anges, skicka\n" -"signalen TERM när tiden går ut. Signalen TERM dödar en process som\n" -"blockerar eller fångar den signalen. För andra processer kan det vara\n" -"nödvändigt att använda signalen KILL (9) eftersom den signalen inte kan\n" -"fångas. Om signalen KILL (9) skickas är slutstatusen 128+9 istället för " -"124.\n" +"Om kommandot går över tiden, och --preserve-status inte är satt, avsluta då\n" +"med status 124. Avsluta annars med slutstatusen från KOMMANDO. Om ingen\n" +"signal anges, skicka signalen TERM när tiden går ut. Signalen TERM dödar " +"en\n" +"process som inte blockerar eller fångar den signalen. Det kan vara " +"nödvändigt\n" +"att använda signalen KILL (9) eftersom den signalen inte kan fångas, i " +"vilket\n" +"fall slutstatusen är 128+9 istället för 124.\n" -#: src/timeout.c:419 +#: src/timeout.c:363 +#, c-format +msgid "warning: disabling core dumps failed" +msgstr "varning: det gick inte att avaktivera minnesdumpar" + +#: src/timeout.c:471 #, c-format msgid "error waiting for command" msgstr "fel vid inväntande av kommando" -#: src/timeout.c:441 +#: src/timeout.c:482 #, c-format -msgid "warning: disabling core dumps failed" -msgstr "varning: det gick inte att avaktivera minnesdumpar" +msgid "the monitored command dumped core" +msgstr "det bevakade programmet skrev en minnesdump" #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 @@ -11043,22 +11330,22 @@ msgstr "Jim Kingdon" msgid "Randy Smith" msgstr "Randy Smith" -#: src/touch.c:115 src/touch.c:313 +#: src/touch.c:115 src/touch.c:309 #, c-format msgid "invalid date format %s" msgstr "felaktigt datumformat %s" -#: src/touch.c:194 +#: src/touch.c:191 #, c-format msgid "cannot touch %s" msgstr "kan inte beröra %s" -#: src/touch.c:200 +#: src/touch.c:197 #, c-format msgid "setting times of %s" msgstr "sätter tider på %s" -#: src/touch.c:216 +#: src/touch.c:213 msgid "" "Update the access and modification times of each FILE to the current time.\n" "\n" @@ -11067,7 +11354,6 @@ msgid "" "\n" "A FILE argument string of - is handled specially and causes touch to\n" "change the times of the file associated with standard output.\n" -"\n" msgstr "" "Uppdatera åtkomst- och modifieringstiderna på varje fil till aktuell tid.\n" "\n" @@ -11075,9 +11361,8 @@ msgstr "" "\n" "En - som FIL-argumentsträng hanteras speciellt och får touch att ändra\n" "tiden på filen som är kopplad till standard ut.\n" -"\n" -#: src/touch.c:229 +#: src/touch.c:225 msgid "" " -a change only the access time\n" " -c, --no-create do not create any files\n" @@ -11090,7 +11375,7 @@ msgstr "" "tid\n" " -f (ignorerad)\n" -#: src/touch.c:235 +#: src/touch.c:231 msgid "" " -h, --no-dereference affect each symbolic link instead of any " "referenced\n" @@ -11104,22 +11389,22 @@ msgstr "" " tidsstämpel på en symbolisk länk)\n" " -m ändra bara modifikationstiden\n" -#: src/touch.c:241 +#: src/touch.c:237 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" -" --time=WORD change the specified time:\n" +" --time=WORD change the specified time:\n" " WORD is access, atime, or use: equivalent to -a\n" " WORD is modify or mtime: equivalent to -m\n" msgstr "" " -r, --reference=FIL använd FILs tider istället för aktuell tid\n" " -t STÄMPEL använd [[ÅÅ]ÅÅ]MMDDhhmm[.ss] istället för aktuell " "tid\n" -" --time=ORD sätt den angivna tiden:\n" +" --time=ORD ändra den angivna tiden:\n" " ORD är access, atime eller use: detsamma som -a\n" -" ORT är modify eller mtime: detsamma som -m\n" +" ORD är modify eller mtime: detsamma som -m\n" -#: src/touch.c:250 +#: src/touch.c:246 msgid "" "\n" "Note that the -d and -t options accept different time-date formats.\n" @@ -11127,12 +11412,12 @@ msgstr "" "\n" "Observera att flaggorna -d och -t tar olika tid-datumformat.\n" -#: src/touch.c:339 +#: src/touch.c:335 #, c-format msgid "cannot specify times from more than one source" msgstr "kan inte ange tider från mer än en källa" -#: src/touch.c:413 +#: src/touch.c:409 #, c-format msgid "" "warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'" @@ -11143,7 +11428,7 @@ msgstr "" #: src/tr.c:286 #, c-format msgid "Usage: %s [OPTION]... SET1 [SET2]\n" -msgstr "Användning: %s [FLAGGA]... MÄNGD1 [MÄNGD2]\n" +msgstr "Användning: %s [FLAGGA]… MÄNGD1 [MÄNGD2]\n" #: src/tr.c:290 msgid "" @@ -11406,7 +11691,7 @@ msgstr "Avsluta med en statuskod som indikerar misslyckande." #: src/truncate.c:96 #, c-format msgid "Usage: %s OPTION... FILE...\n" -msgstr "Användning: %s FLAGGA... FIL...\n" +msgstr "Användning: %s FLAGGA… FIL…\n" #: src/truncate.c:97 msgid "" @@ -11417,7 +11702,6 @@ msgid "" "If a FILE is larger than the specified size, the extra data is lost.\n" "If a FILE is shorter, it is extended and the extended part (hole)\n" "reads as zero bytes.\n" -"\n" msgstr "" "Krymp eller utöka storleken på varje FIL till den angivna storleken.\n" "\n" @@ -11426,20 +11710,19 @@ msgstr "" "Om en FIL är större än den angivna storleken förloras överskjutande data.\n" "Om en FIL är kortare utökas den och den utökade delen (ett hål) läses\n" "som noll-byte:ar.\n" -"\n" -#: src/truncate.c:110 +#: src/truncate.c:109 msgid " -c, --no-create do not create any files\n" msgstr " -c, --no-create skapa inga filer en fil\n" -#: src/truncate.c:113 +#: src/truncate.c:112 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" " -o, --io-blocks använd STORLEK som antal IO-block istället för " "byte\n" -#: src/truncate.c:116 +#: 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" @@ -11447,7 +11730,7 @@ msgstr "" " -r, --reference=RFIL basera storlek på RFIL\n" " -s, --size=STORLEK ange eller justera filstorlek med STORLEK\n" -#: src/truncate.c:122 +#: src/truncate.c:121 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -11459,57 +11742,57 @@ msgstr "" "”+” utöka med, ”-” minska med, ”<” högst, ”>” minst,\n" "”/” avrunda neråt till multipel av, ”%” avrunda uppåt till multipel av.\n" -#: src/truncate.c:150 +#: src/truncate.c:149 #, c-format msgid "overflow in %<PRIdMAX> * %<PRIdMAX> byte blocks for file %s" msgstr "spill i %<PRIdMAX> · %<PRIdMAX> byte-block för fil %s" -#: src/truncate.c:174 +#: src/truncate.c:173 #, c-format msgid "%s has unusable, apparently negative size" msgstr "%s: filen har oanvändbar, till synes negativ storlek" -#: src/truncate.c:184 src/truncate.c:379 +#: src/truncate.c:183 src/truncate.c:384 #, c-format msgid "cannot get the size of %s" msgstr "kan inte hämta storleken på %s" -#: src/truncate.c:206 +#: src/truncate.c:205 #, c-format msgid "overflow rounding up size of file %s" msgstr "spill vid avrundning uppåt av storlek på filen %s" -#: src/truncate.c:216 +#: src/truncate.c:215 #, c-format msgid "overflow extending size of file %s" msgstr "spill vid utökning av storlek av filen %s" -#: src/truncate.c:231 +#: src/truncate.c:230 #, c-format msgid "failed to truncate %s at %<PRIdMAX> bytes" msgstr "misslyckades att hugga av %s vid %<PRIdMAX> byte" -#: src/truncate.c:305 +#: src/truncate.c:303 #, c-format msgid "multiple relative modifiers specified" msgstr "multipla relativa modifierare angivna" -#: src/truncate.c:335 +#: src/truncate.c:333 #, c-format msgid "you must specify either %s or %s" msgstr "du måste ange antingen %s eller %s" -#: src/truncate.c:342 +#: src/truncate.c:340 #, c-format msgid "you must specify a relative %s with %s" msgstr "du måste ange en relativ %s till %s" -#: src/truncate.c:349 +#: src/truncate.c:347 #, c-format msgid "%s was specified but %s was not" msgstr "%s angavs men inte %s" -#: src/truncate.c:400 +#: src/truncate.c:404 #, c-format msgid "cannot open %s for writing" msgstr "kan inte öppna %s för skrivning" @@ -11606,13 +11889,11 @@ msgstr "kan inte avgöra systemnamn" msgid "" "Convert blanks in each FILE to tabs, writing to standard output.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" "Konvertera mellanrum i varje FIL till tabulatorer, skriv till standard ut.\n" "Utan FIL eller om FIL är -, läs standard in.\n" -"\n" -#: src/unexpand.c:125 +#: src/unexpand.c:124 msgid "" " -a, --all convert all blanks, instead of just initial blanks\n" " --first-only convert only leading sequences of blanks (overrides -a)\n" @@ -11627,12 +11908,12 @@ msgstr "" " -t, --tabs=LISTA använd kommaseparerad LISTA med tabulatorpositioner\n" " (aktiverar -a)\n" -#: src/unexpand.c:153 +#: src/unexpand.c:152 #, c-format msgid "tabs are too far apart" msgstr "tabulatorer är för långt isär" -#: src/unexpand.c:505 +#: src/unexpand.c:504 #, c-format msgid "tab stop value is too large" msgstr "tabulatorsteg är för stort" @@ -11640,7 +11921,7 @@ msgstr "tabulatorsteg är för stort" #: src/uniq.c:134 #, c-format msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n" -msgstr "Användning: %s [FLAGGA]... [INFIL [UTFIL]]\n" +msgstr "Användning: %s [FLAGGA]… [INFIL [UTFIL]]\n" #: src/uniq.c:138 msgid "" @@ -11648,15 +11929,13 @@ msgid "" "writing to OUTPUT (or standard output).\n" "\n" "With no options, matching lines are merged to the first occurrence.\n" -"\n" msgstr "" "Filtrera intilliggande matchande rader från INFIL (eller standard in),\n" "skriv till UTFIL (eller standard ut).\n" "\n" "Utan flaggor slås matchande rader samman till den första förekomsten.\n" -"\n" -#: src/uniq.c:148 +#: src/uniq.c:147 msgid "" " -c, --count prefix lines by the number of occurrences\n" " -d, --repeated only print duplicate lines\n" @@ -11664,7 +11943,7 @@ 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" -#: src/uniq.c:152 +#: src/uniq.c:151 msgid "" " -D, --all-repeated[=delimit-method] print all duplicate lines\n" " delimit-method={none(default),prepend,separate}\n" @@ -11684,11 +11963,11 @@ msgstr "" " -u, --unique skriv endast unika rader\n" " -z, --zero-terminated avsluta rader med 0-byte, inte nyrad\n" -#: src/uniq.c:162 +#: src/uniq.c:161 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:167 +#: src/uniq.c:166 msgid "" "\n" "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n" @@ -11699,7 +11978,7 @@ msgstr "" "tabulatorer) och sedan tecken som ej är blanka. Fält hoppas över före\n" "tecken.\n" -#: src/uniq.c:172 +#: src/uniq.c:171 msgid "" "\n" "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n" @@ -11711,24 +11990,24 @@ 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:359 +#: src/uniq.c:358 #, c-format msgid "too many repeated lines" msgstr "för många upprepade rader" -#: src/uniq.c:522 +#: src/uniq.c:521 msgid "invalid number of fields to skip" msgstr "ogiltigt antal fält att hoppa över" -#: src/uniq.c:531 +#: src/uniq.c:530 msgid "invalid number of bytes to skip" msgstr "ogiltigt antal byte att hoppa över" -#: src/uniq.c:540 +#: src/uniq.c:539 msgid "invalid number of bytes to compare" msgstr "ogiltigt antal byte att jämföra" -#: src/uniq.c:559 +#: src/uniq.c:558 #, c-format msgid "printing all duplicated lines and repeat counts is meaningless" msgstr "" @@ -11783,6 +12062,11 @@ msgid_plural "up %ld days %2d:%02d, " msgstr[0] "uppe %ld dag %2d.%02d, " msgstr[1] "uppe %ld dagar %2d.%02d, " +#: src/uptime.c:149 +#, c-format +msgid "up %2d:%02d, " +msgstr "uppe %2d.%02d, " + #: src/uptime.c:151 #, c-format msgid "%lu user" @@ -11879,39 +12163,39 @@ msgstr "" msgid " old " msgstr "länge" -#: src/who.c:449 +#: src/who.c:440 msgid "system boot" msgstr "systemstart" -#: src/who.c:456 src/who.c:458 +#: src/who.c:447 src/who.c:449 msgid "id=" msgstr "id=" -#: src/who.c:471 src/who.c:476 +#: src/who.c:462 src/who.c:467 msgid "term=" msgstr "term=" -#: src/who.c:473 src/who.c:477 +#: src/who.c:464 src/who.c:468 msgid "exit=" msgstr "slut=" -#: src/who.c:494 +#: src/who.c:485 msgid "LOGIN" msgstr "INLOGGNING" -#: src/who.c:514 +#: src/who.c:505 msgid "clock change" msgstr "klockändring" -#: src/who.c:526 src/who.c:527 +#: src/who.c:517 src/who.c:518 msgid "run-level" msgstr "körnivå" -#: src/who.c:530 src/who.c:531 +#: src/who.c:521 src/who.c:522 msgid "last=" msgstr "sist=" -#: src/who.c:562 +#: src/who.c:553 #, c-format msgid "" "\n" @@ -11920,46 +12204,46 @@ msgstr "" "\n" "# användare=%lu\n" -#: src/who.c:568 +#: src/who.c:559 msgid "NAME" msgstr "NAMN" -#: src/who.c:568 +#: src/who.c:559 msgid "LINE" msgstr "LINJE" -#: src/who.c:568 +#: src/who.c:559 msgid "TIME" msgstr "TID" # Högst 6 tecken kommer skrivas ut. -#: src/who.c:568 +#: src/who.c:559 msgid "IDLE" msgstr "LUGN" -#: src/who.c:569 +#: src/who.c:560 msgid "PID" msgstr "PID" # Högst 8 tecken kommer skrivas ut. -#: src/who.c:569 +#: src/who.c:560 msgid "COMMENT" msgstr "KOMMENTAR" -#: src/who.c:569 +#: src/who.c:560 msgid "EXIT" msgstr "SLUT" -#: src/who.c:649 +#: src/who.c:640 #, c-format msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n" -msgstr "Användning: %s [FLAGGA]... [ FIL | ARG1 ARG2 ]\n" +msgstr "Användning: %s [FLAGGA]… [ FIL | ARG1 ARG2 ]\n" -#: src/who.c:650 +#: src/who.c:641 msgid "Print information about users who are currently logged in.\n" msgstr "Skriv information om användare som är inloggade just nu.\n" -#: src/who.c:653 +#: src/who.c:644 msgid "" "\n" " -a, --all same as -b -d --login -p -r -t -T -u\n" @@ -11973,11 +12257,11 @@ msgstr "" " -d, --dead skriv ut döda processer\n" " -H, --heading skriv ut rad med kolumnhuvuden\n" -#: src/who.c:660 +#: src/who.c:651 msgid " -l, --login print system login processes\n" msgstr " -l, --login skriv ut inloggningsprocesser\n" -#: src/who.c:663 +#: src/who.c:654 msgid "" " --lookup attempt to canonicalize hostnames via DNS\n" " -m only hostname and user associated with stdin\n" @@ -11988,7 +12272,7 @@ msgstr "" "in\n" " -p, --process skriv aktiva processer startade av init\n" -#: src/who.c:668 +#: src/who.c:659 msgid "" " -q, --count all login names and number of users logged on\n" " -r, --runlevel print current runlevel\n" @@ -12000,7 +12284,7 @@ msgstr "" " -s, --short skriv endast namn, linje och tid (standard)\n" " -t, --time skriv alla ändringar av systemklockan\n" -#: src/who.c:674 +#: src/who.c:665 msgid "" " -T, -w, --mesg add user's message status as +, - or ?\n" " -u, --users list users logged in\n" @@ -12012,7 +12296,7 @@ msgstr "" " --message samma som -T\n" " --writeable samma som -T\n" -#: src/who.c:682 +#: src/who.c:673 #, c-format msgid "" "\n" @@ -12046,7 +12330,7 @@ msgid "" "Usage: %s [STRING]...\n" " or: %s OPTION\n" msgstr "" -"Användning: %s [STRÄNG]...\n" +"Användning: %s [STRÄNG]…\n" " eller: %s FLAGGA\n" #: src/yes.c:47 @@ -12056,3 +12340,150 @@ msgid "" 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" diff --git a/po/tr.gmo b/po/tr.gmo index 3addf155..8f2edcd8 100644 Binary files a/po/tr.gmo and b/po/tr.gmo differ diff --git a/po/tr.po b/po/tr.po index 40e17fd5..e72ab3d5 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: 2012-05-10 19:35+0200\n" +"POT-Creation-Date: 2013-02-14 15:56+0000\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,19 +39,19 @@ msgstr "Geçerli argümanlar:" msgid "error closing file" msgstr "girdi dosyası %s kapatılıyor" -#: lib/closeout.c:112 src/base64.c:109 src/base64.c:121 src/base64.c:127 -#: src/base64.c:168 src/base64.c:224 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:330 src/expand.c:355 src/head.c:298 -#: src/head.c:348 src/head.c:756 src/head.c:797 src/mktemp.c:350 src/od.c:919 -#: src/paste.c:160 src/shuf.c:369 src/split.c:727 src/split.c:964 -#: src/split.c:969 src/tail.c:350 src/tail.c:1201 src/tail.c:1307 +#: 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 -#: src/unexpand.c:427 src/unexpand.c:443 +#: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "yazma hatası" -#: lib/copy-acl.c:611 src/copy.c:1160 src/copy.c:2602 +#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617 #, fuzzy, c-format msgid "preserving permissions for %s" msgstr "%s'in izinleri ayarlanıyor" @@ -256,18 +256,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:483 +#: lib/mkdir-p.c:196 src/install.c:484 #, 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:2261 src/install.c:709 src/install.c:722 +#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722 #, 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:915 src/tac.c:435 +#: src/split.c:929 src/tac.c:434 #, c-format msgid "memory exhausted" msgstr "bellek tükendi" @@ -316,82 +316,82 @@ msgstr "'" msgid "%s: end of file" msgstr "%s: arama (seek) başarısız" -#: lib/regcomp.c:130 +#: lib/regcomp.c:131 msgid "Success" msgstr "" -#: lib/regcomp.c:133 +#: lib/regcomp.c:134 msgid "No match" msgstr "" -#: lib/regcomp.c:136 +#: lib/regcomp.c:137 #, fuzzy msgid "Invalid regular expression" msgstr "%s: geçersiz düzenli ifade(regular expression): %s" -#: lib/regcomp.c:139 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "" -#: lib/regcomp.c:142 +#: lib/regcomp.c:143 #, fuzzy msgid "Invalid character class name" msgstr "geçersiz karakter sınıfı `%s'" -#: lib/regcomp.c:145 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "" -#: lib/regcomp.c:148 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "" -#: lib/regcomp.c:151 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "" -#: lib/regcomp.c:154 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "" -#: lib/regcomp.c:157 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "" -#: lib/regcomp.c:160 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "" -#: lib/regcomp.c:163 +#: lib/regcomp.c:164 #, fuzzy msgid "Invalid range end" msgstr "Geçersiz sayfa aralığı `%s'" -#: lib/regcomp.c:166 +#: lib/regcomp.c:167 #, fuzzy msgid "Memory exhausted" msgstr "bellek tükendi" -#: lib/regcomp.c:169 +#: lib/regcomp.c:170 #, fuzzy msgid "Invalid preceding regular expression" msgstr "%s: geçersiz düzenli ifade(regular expression): %s" -#: lib/regcomp.c:172 +#: lib/regcomp.c:173 #, fuzzy msgid "Premature end of regular expression" msgstr "düzenli ifade (regular expression) aramasında hata oluştu" -#: lib/regcomp.c:175 +#: lib/regcomp.c:176 #, fuzzy msgid "Regular expression too big" msgstr "düzenli ifade (regular expression) aramasında hata oluştu" -#: lib/regcomp.c:178 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:703 +#: lib/regcomp.c:704 #, fuzzy msgid "No previous regular expression" msgstr "düzenli ifade (regular expression) aramasında hata oluştu" @@ -431,7 +431,7 @@ msgstr "^[eE]" msgid "^[nN]" msgstr "^[hH]" -#: lib/set-mode-acl.c:695 src/copy.c:2284 src/cp.c:518 +#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516 #, c-format msgid "setting permissions for %s" msgstr "%s'in izinleri ayarlanıyor" @@ -578,13 +578,13 @@ msgstr "açma işlemi başarısız" msgid "Resource lost" msgstr "" -#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262 -#: lib/spawn-pipe.c:265 +#: 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:232 lib/spawn-pipe.c:346 lib/wait-process.c:282 +#: 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" @@ -601,24 +601,24 @@ msgid "Unknown signal %d" msgstr "" # -#: lib/unicodeio.c:103 +#: lib/unicodeio.c:102 msgid "iconv function not usable" msgstr "iconv işlevi kullanılabilir değil" -#: lib/unicodeio.c:105 +#: lib/unicodeio.c:104 msgid "iconv function not available" msgstr "iconv işlevi yok" -#: lib/unicodeio.c:112 +#: lib/unicodeio.c:111 msgid "character out of range" msgstr "karakter kapsamdışı" -#: lib/unicodeio.c:182 +#: lib/unicodeio.c:181 #, c-format msgid "cannot convert U+%04X to local character set" msgstr "U+%04X yerel karakter kümesine dönüştürülemiyor" -#: lib/unicodeio.c:184 +#: lib/unicodeio.c:183 #, c-format msgid "cannot convert U+%04X to local character set: %s" msgstr "U+%04X yerel karakter kümesine dönüştürülemiyor: %s" @@ -798,7 +798,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:562 +#: lib/version-etc.c:251 src/system.h:573 #, c-format msgid "%s home page: <%s>\n" msgstr "" @@ -808,7 +808,7 @@ msgstr "" msgid "%s home page: <http://www.gnu.org/software/%s/>\n" msgstr "" -#: lib/version-etc.c:256 src/system.h:563 +#: lib/version-etc.c:256 src/system.h:574 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" @@ -897,14 +897,17 @@ msgid "Simon Josefsson" msgstr "" #: src/base64.c:60 -#, c-format +#, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" "Base64 encode or decode FILE, or standard input, to standard output.\n" -"\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:64 +#: src/base64.c:67 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -914,7 +917,7 @@ msgid "" "\n" msgstr "" -#: src/base64.c:73 src/cat.c:110 src/fmt.c:293 src/shuf.c:71 src/sum.c:70 +#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -922,7 +925,7 @@ msgstr "" "\n" "DOSYA verilmemişse veya DOSYA - ise, standart girdi okunur.\n" -#: src/base64.c:76 +#: src/base64.c:79 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -931,38 +934,38 @@ msgid "" "from any other non-alphabet bytes in the encoded stream.\n" msgstr "" -#: src/base64.c:171 src/base64.c:208 src/csplit.c:263 src/csplit.c:1435 -#: src/join.c:451 src/shuf.c:157 src/shuf.c:361 src/tac-pipe.c:74 +#: 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 #, c-format msgid "read error" msgstr "okuma hatası" -#: src/base64.c:227 +#: src/base64.c:230 #, fuzzy, c-format msgid "invalid input" msgstr "geçersiz girdi bayrağı: %s" -#: src/base64.c:264 +#: src/base64.c:267 #, fuzzy, c-format msgid "invalid wrap size: %s" msgstr "geçersiz sekme boyutu: %s" -#: src/base64.c:283 src/basename.c:173 src/comm.c:435 src/cp.c:607 -#: src/date.c:441 src/dircolors.c:447 src/du.c:894 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:169 src/install.c:929 src/join.c:961 -#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:157 src/mv.c:447 -#: src/od.c:1802 src/ptx.c:2081 src/readlink.c:154 src/seq.c:408 -#: src/shuf.c:320 src/shuf.c:339 src/sort.c:4477 src/split.c:1313 -#: src/tr.c:1797 src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:454 -#: src/uniq.c:471 src/unlink.c:81 src/uptime.c:250 src/users.c:146 -#: src/wc.c:666 src/who.c:836 src/whoami.c:79 +#: 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 #, c-format msgid "extra operand %s" msgstr "`%s' operandı fazla" # -#: src/base64.c:315 src/cat.c:781 +#: src/base64.c:318 src/cat.c:781 #, c-format msgid "closing standard input" msgstr "standart girdi kapatılıyor" @@ -970,15 +973,15 @@ 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/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:53 src/env.c:33 +#: 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/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:65 src/su.c:88 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 +#: 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 ve David MacKenzie" @@ -993,23 +996,23 @@ msgstr "" " veya: %s SEÇENEK\n" #: src/basename.c:53 +#, fuzzy msgid "" "Print NAME with any leading directory components removed.\n" "If specified, also remove a trailing SUFFIX.\n" -"\n" msgstr "" "Dizinlerle ilgili kısımlar kaldırılarak İSİM basılır.\n" "Belirtilmişse, SONEK de kaldırılır.\n" "\n" -#: src/basename.c:59 +#: 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" msgstr "" -#: src/basename.c:66 +#: src/basename.c:67 #, c-format msgid "" "\n" @@ -1020,20 +1023,21 @@ msgid "" " %s -a any/str1 any/str2 -> \"str1\" followed by \"str2\"\n" msgstr "" -#: src/basename.c:167 src/chcon.c:531 src/chgrp.c:277 src/chmod.c:526 -#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1369 +#: 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:183 src/mkfifo.c:108 src/mknod.c:146 src/nohup.c:111 -#: src/pathchk.c:148 src/printf.c:674 src/readlink.c:146 src/realpath.c:236 -#: src/rm.c:314 src/rmdir.c:223 src/seq.c:402 src/setuidgid.c:137 -#: src/sleep.c:119 src/stat.c:1476 src/stdbuf.c:346 src/tr.c:1782 +#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 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 #, 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:52 src/split.c:49 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/split.c:49 msgid "Torbjorn Granlund" msgstr "" @@ -1044,8 +1048,8 @@ msgstr "" msgid "Richard M. Stallman" msgstr "Torbjorn Granlund ve Richard M. Stallman" -#: src/cat.c:88 src/df.c:846 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4720 src/nl.c:182 src/paste.c:435 src/pr.c:2768 src/sum.c:58 +#: 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/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" @@ -1098,7 +1102,7 @@ msgstr "" msgid "cannot do ioctl on %s" msgstr "`%s üzerinde ioctl başarısız" -#: src/cat.c:637 src/dd.c:2209 src/sort.c:379 src/tee.c:165 src/yes.c:86 +#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86 #, c-format msgid "standard output" msgstr "standart çıktı" @@ -1115,7 +1119,7 @@ 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:55 src/head.c:46 src/hostid.c:33 +#: 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 @@ -1123,7 +1127,7 @@ msgstr "" msgid "Jim Meyering" msgstr "Jim Meyering ve Paul Eggert" -#: src/chcon.c:100 src/runcon.c:203 src/runcon.c:234 +#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238 #, fuzzy, c-format msgid "failed to create security context: %s" msgstr "%s'nın sahipliği değiştirilemedi\n" @@ -1133,8 +1137,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:540 src/copy.c:2222 src/runcon.c:217 -#: src/stat.c:683 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221 +#: src/stat.c:702 #, fuzzy, c-format msgid "failed to get security context of %s" msgstr "%s'nın öznitelikleri alınamadı" @@ -1150,12 +1154,12 @@ 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:446 src/ls.c:2981 +#: src/du.c:457 src/ls.c:2981 #, 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:426 +#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437 #, c-format msgid "cannot read directory %s" msgstr "%s dizini okunamıyor" @@ -1165,13 +1169,13 @@ 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:599 +#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562 #, 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:618 -#: src/remove.c:613 +#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642 +#: src/remove.c:576 #, fuzzy, c-format msgid "fts_close failed" msgstr "kapatma işlemi başarısız" @@ -1192,10 +1196,9 @@ msgid "" "Change the security context of each FILE to CONTEXT.\n" "With --reference, change the security context of each FILE to that of " "RFILE.\n" -"\n" msgstr "" -#: src/chcon.c:362 src/chgrp.c:123 src/chown.c:94 +#: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94 msgid "" " --dereference affect the referent of each symbolic link (this is\n" " the default), rather than the symbolic link itself\n" @@ -1203,7 +1206,7 @@ msgid "" "file\n" msgstr "" -#: src/chcon.c:367 +#: src/chcon.c:369 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" @@ -1211,7 +1214,16 @@ msgid "" " -l, --range=RANGE set range RANGE in the target security context\n" msgstr "" -#: src/chcon.c:373 +#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110 +#, fuzzy +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" + +#: src/chcon.c:379 #, fuzzy msgid "" " --reference=RFILE use RFILE's security context rather than " @@ -1225,15 +1237,15 @@ msgstr "" " -v, --verbose işlenen her dosya için bir durum iletisi gösterir.\n" "\n" -#: src/chcon.c:377 src/chgrp.c:140 src/chown.c:118 +#: 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:380 +#: src/chcon.c:386 msgid " -v, --verbose output a diagnostic for every file processed\n" msgstr "" -#: src/chcon.c:383 src/chgrp.c:143 src/chown.c:121 +#: src/chcon.c:389 src/chgrp.c:143 src/chown.c:121 #, fuzzy msgid "" "\n" @@ -1258,36 +1270,36 @@ msgstr "" " -P hiç bir sembolik bağı gezmez (öntanımlı)\n" "\n" -#: src/chcon.c:512 src/chgrp.c:264 src/chown.c:267 +#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267 #, 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:518 +#: src/chcon.c:524 #, c-format msgid "-R -h requires -P" msgstr "-R -h ile -P kullanılmalıdır" -#: src/chcon.c:533 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282 -#: src/comm.c:429 src/csplit.c:1371 src/join.c:1149 src/link.c:79 -#: src/mknod.c:148 src/setuidgid.c:139 src/tr.c:1785 +#: 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 #, c-format msgid "missing operand after %s" msgstr "`%s'den sonra eksik işlenen" -#: src/chcon.c:556 src/runcon.c:247 +#: src/chcon.c:562 src/runcon.c:251 #, fuzzy, c-format msgid "invalid context: %s" msgstr "geçersiz kip: %s" -#: src/chcon.c:563 +#: src/chcon.c:569 #, c-format msgid "conflicting security context specifiers given" msgstr "" -#: src/chcon.c:572 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:433 src/cp.c:493 -#: src/mv.c:96 src/pwd.c:273 src/rm.c:324 src/touch.c:351 +#: 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 #, c-format msgid "failed to get attributes of %s" msgstr "%s'nın öznitelikleri alınamadı" @@ -1331,15 +1343,6 @@ msgstr "" " dosyayı değil. (yalnızca sembolik bağ sahibiyetini\n" " değiştirebilen sistemlerde bulunur.\n" -#: src/chgrp.c:132 src/chmod.c:387 src/chown.c:110 -#, fuzzy -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" - #: src/chgrp.c:136 msgid "" " --reference=RFILE use RFILE's group rather than specifying a\n" @@ -1414,8 +1417,15 @@ msgid "" msgstr "" #: src/chmod.c:391 +#, fuzzy 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 msgid " -R, --recursive change files and directories recursively\n" @@ -1576,7 +1586,7 @@ msgstr "" msgid "Roland McGrath" msgstr "" -#: src/chroot.c:97 src/install.c:575 src/setuidgid.c:110 src/setuidgid.c:120 +#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120 #, c-format msgid "invalid group %s" msgstr "geçersiz grup %s" @@ -1643,8 +1653,8 @@ msgstr "%s durumlanamadı" msgid "failed to set user-ID" msgstr "%s durumlanamadı" -#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:213 src/stdbuf.c:366 -#: src/timeout.c:402 +#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365 +#: src/timeout.c:454 #, fuzzy, c-format msgid "failed to run command %s" msgstr "%s komutu çalıştırılamadı" @@ -1753,20 +1763,24 @@ 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:1609 src/dd.c:1976 +#: 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 #, c-format -msgid "reading %s" -msgstr "%s okunuyor" +msgid "error reading %s" +msgstr "%s'i okunurken hata" -#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:426 +#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425 #, c-format msgid "cannot lseek %s" msgstr "%s'de lseek yapılamadı" -#: src/copy.c:206 src/dd.c:2039 src/dd.c:2102 +#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151 #, c-format -msgid "writing %s" -msgstr "%s yazılıyor" +msgid "error writing %s" +msgstr "%s'e yazarken hata" #: src/copy.c:313 #, fuzzy, c-format @@ -1788,7 +1802,7 @@ msgstr "%s açılamadı" msgid "clearing permissions for %s" msgstr "%s'in izinleri ayarlanıyor" -#: src/copy.c:697 src/copy.c:2470 src/cp.c:331 +#: src/copy.c:697 src/copy.c:2480 src/cp.c:329 #, c-format msgid "failed to preserve ownership for %s" msgstr "%s'nin sahiplik bilgileri korunamadı" @@ -1803,14 +1817,14 @@ msgstr "%s dosyasına bakılamadı" msgid "failed to preserve authorship for %s" msgstr "%s'nin yazar bilgileri korunamadı" -#: src/copy.c:804 src/csplit.c:638 src/du.c:901 src/fmt.c:449 src/head.c:847 -#: src/sort.c:4489 src/split.c:1329 src/tail.c:1756 src/wc.c:678 +#: 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 "%s okumak için açılamadı" -#: src/copy.c:810 src/copy.c:972 src/dd.c:1546 src/dd.c:2114 src/dd.c:2252 -#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:141 +#: 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 #, c-format msgid "cannot fstat %s" msgstr "%s'nin dosya durumu (fstat) alınamadı" @@ -1830,14 +1844,14 @@ msgstr "standart hatanın kopyası, exec sonunda kapanmaya ayarlanamadı" 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:1574 src/copy.c:1777 src/copy.c:1935 src/ln.c:314 -#: src/remove.c:267 src/remove.c:293 src/remove.c:444 src/remove.c:465 +#: 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 #, c-format msgid "cannot remove %s" msgstr "%s silinemedi" -#: src/copy.c:886 src/copy.c:1578 src/copy.c:1772 src/copy.c:1940 -#: src/remove.c:418 +#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945 +#: src/remove.c:375 #, c-format msgid "removed %s\n" msgstr "%s silindi\n" @@ -1857,186 +1871,186 @@ msgstr "normal dosya %s oluşturulamadı" msgid "failed to clone %s from %s" msgstr "%s açılamadı" -#: src/copy.c:1098 src/copy.c:2531 +#: src/copy.c:1098 src/copy.c:2541 #, c-format msgid "preserving times for %s" msgstr "%s'in zaman damgaları korundu" -#: src/copy.c:1170 src/copy.c:1176 src/head.c:855 src/touch.c:175 -#: src/truncate.c:413 -#, c-format -msgid "closing %s" -msgstr "%s kapatılıyor " +#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172 +#: src/truncate.c:417 +#, fuzzy, c-format +msgid "failed to close %s" +msgstr "%s açılamadı" -#: src/copy.c:1466 +#: src/copy.c:1471 #, fuzzy, c-format msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? " msgstr "%s: %s'ın, %04lo kipi gözardı edilerek, üzerine yazılsın mı?" -#: src/copy.c:1473 +#: src/copy.c:1478 #, c-format msgid "%s: overwrite %s? " msgstr "%s: %s'ın üzerine yazılsın mı?" -#: src/copy.c:1542 +#: src/copy.c:1547 #, c-format msgid " (backup: %s)" msgstr " (yedek: %s)" -#: src/copy.c:1552 +#: src/copy.c:1557 #, c-format msgid "failed to restore the default file creation context" msgstr "" -#: src/copy.c:1584 +#: src/copy.c:1589 #, c-format msgid "cannot create hard link %s to %s" msgstr "%s sabit bağı %s'e bağlanamadı" -#: src/copy.c:1637 src/copy.c:1689 src/copy.c:2272 src/copy.c:2589 +#: 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:1220 src/truncate.c:365 +#: src/stat.c:1239 src/truncate.c:363 #, c-format msgid "cannot stat %s" msgstr "%s durumlanamadı" -#: src/copy.c:1645 +#: src/copy.c:1650 #, c-format msgid "omitting directory %s" msgstr "%s dizini atlanıyor" -#: src/copy.c:1659 +#: src/copy.c:1664 #, c-format msgid "warning: source file %s specified more than once" msgstr "uyarı: %s kaynak dosyası bir defadan çok belirtilmiş" -#: src/copy.c:1707 src/ln.c:246 +#: src/copy.c:1712 src/ln.c:246 #, c-format msgid "%s and %s are the same file" msgstr "%s ve %s aynı dosya" -#: src/copy.c:1806 +#: src/copy.c:1811 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "Dizin olmayan %s'un üzerine dizin %s yazılamaz" -#: src/copy.c:1824 src/ln.c:214 +#: src/copy.c:1829 src/ln.c:214 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "yeni oluşturulmuş %s'un üzerine %s yazılamaz" -#: src/copy.c:1842 +#: src/copy.c:1847 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "Dizin %s'ın üzerine dizin olmayan bir dosya yazılamaz" -#: src/copy.c:1856 +#: src/copy.c:1861 #, 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:1886 +#: src/copy.c:1891 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "%s'ı yedeklemek kaynağı yok eder; %s taşınmadı" -#: src/copy.c:1887 +#: src/copy.c:1892 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "%s'ı yedeklemek kaynağı yok eder; %s kopyalanmadı" -#: src/copy.c:1910 src/ln.c:276 +#: src/copy.c:1915 src/ln.c:276 #, c-format msgid "cannot backup %s" msgstr "%s yedeklenemedi" -#: src/copy.c:1974 +#: src/copy.c:1979 #, 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:2051 +#: src/copy.c:2056 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "bir dizin, %s, kendi içine kopyalanamaz, %s" -#: src/copy.c:2068 +#: src/copy.c:2073 #, 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:2118 +#: src/copy.c:2123 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "%s kendi alt dizinine taşınamaz, %s" -#: src/copy.c:2161 +#: src/copy.c:2166 #, c-format msgid "cannot move %s to %s" msgstr "%s %s'e taşınamadı" -#: src/copy.c:2173 +#: src/copy.c:2178 #, 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:2207 src/install.c:905 src/mkdir.c:189 src/mkfifo.c:114 -#: src/mknod.c:167 +#: 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:2241 +#: src/copy.c:2246 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "çevrimli sembolik bağ %s kopyalanamaz" -#: src/copy.c:2350 +#: src/copy.c:2355 #, 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:2357 +#: src/copy.c:2362 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "sembolik bağ %s, %s'e bağlanamadı" -#: src/copy.c:2406 src/mkfifo.c:133 +#: src/copy.c:2416 src/mkfifo.c:132 #, c-format msgid "cannot create fifo %s" msgstr "%s fifosu oluşturulamadı" -#: src/copy.c:2415 +#: src/copy.c:2425 #, c-format msgid "cannot create special file %s" msgstr "özel dosya %s oluşturulamadı" -#: src/copy.c:2426 src/ls.c:3191 src/stat.c:902 +#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921 #, c-format msgid "cannot read symbolic link %s" msgstr "%s sembolik bağı okunamadı" -#: src/copy.c:2453 +#: src/copy.c:2463 #, c-format msgid "cannot create symbolic link %s" msgstr "%s sembolik bağı oluşturulamadı" -#: src/copy.c:2485 +#: src/copy.c:2495 #, c-format msgid "%s has unknown file type" msgstr "%s bilinmeyen dosya türüne sahip" -#: src/copy.c:2629 src/ln.c:358 +#: src/copy.c:2644 src/ln.c:358 #, c-format msgid "cannot un-backup %s" msgstr "%s yedeklemesi geri alınamadı" -#: src/copy.c:2633 +#: src/copy.c:2648 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (yedeklemeyi geri al)\n" -#: src/cp.c:156 src/mv.c:284 +#: src/cp.c:156 src/mv.c:286 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -2048,28 +2062,13 @@ msgstr "" " veya: %s [SEÇENEK]... -t DİZİN KAYNAK...\n" #: src/cp.c:162 -msgid "" -"Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" -"\n" +#, 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:166 src/csplit.c:1458 src/cut.c:197 src/df.c:852 src/du.c:268 -#: src/expand.c:112 src/fmt.c:275 src/fold.c:75 src/head.c:115 -#: src/install.c:612 src/kill.c:86 src/ln.c:392 src/ls.c:4726 src/mkdir.c:61 -#: src/mkfifo.c:56 src/mknod.c:58 src/mv.c:294 src/nl.c:191 src/paste.c:445 -#: src/pr.c:2777 src/ptx.c:1825 src/shred.c:153 src/shuf.c:58 src/sort.c:399 -#: src/split.c:211 src/stdbuf.c:95 src/tac.c:142 src/tail.c:268 -#: src/touch.c:226 src/truncate.c:107 src/unexpand.c:122 src/uniq.c:145 -msgid "" -"Mandatory arguments to long options are mandatory for short options too.\n" -msgstr "" -"Uzun seçenekler için zorunlu olan argümanlar kısa seçenekler için de " -"zorunludur.\n" - -#: src/cp.c:169 +#: src/cp.c:168 #, fuzzy msgid "" " -a, --archive same as -dR --preserve=all\n" @@ -2091,13 +2090,14 @@ msgstr "" "içeriğini kopyalar\n" " -d --no-dereference --preserve=link ile aynı\n" -#: src/cp.c:178 +#: src/cp.c:177 #, fuzzy msgid "" " -f, --force if an existing destination file cannot be\n" -" opened, remove it and try again (redundant " -"if\n" -" the -n option is used)\n" +" opened, remove it and try again (this " +"option\n" +" is ignored when the -n option is also " +"used)\n" " -i, --interactive prompt before overwrite (overrides a previous " "-n\n" " option)\n" @@ -2110,20 +2110,20 @@ msgstr "" " -i, --interactive üzerine yazmadan önce sorar\n" " -H komut satırında sembolik bağları izler\n" -#: src/cp.c:188 +#: src/cp.c:186 msgid "" " -l, --link hard link files instead of copying\n" " -L, --dereference always follow symbolic links in SOURCE\n" msgstr "" -#: src/cp.c:192 +#: src/cp.c:190 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:197 +#: src/cp.c:195 #, fuzzy msgid "" " -p same as --preserve=mode,ownership,timestamps\n" @@ -2145,7 +2145,7 @@ msgstr "" " diğer öznitelikler:\n" " links,all\n" -#: src/cp.c:205 +#: src/cp.c:203 #, fuzzy msgid "" " --no-preserve=ATTR_LIST don't preserve the specified attributes\n" @@ -2155,7 +2155,7 @@ msgstr "" " --parents kaynak yolunu DİZİN'in sonuna ekler\n" " -P --no-dereference ile aynı\n" -#: src/cp.c:209 +#: src/cp.c:207 #, fuzzy msgid "" " -R, -r, --recursive copy directories recursively\n" @@ -2169,7 +2169,7 @@ msgstr "" "denemeden\n" " siler (--force ile karşılaştır)\n" -#: src/cp.c:215 +#: src/cp.c:213 #, fuzzy msgid "" " --sparse=WHEN control creation of sparse files. See below\n" @@ -2186,7 +2186,7 @@ msgstr "" "kesmeleri\n" " (/) kaldırır\n" -#: src/cp.c:220 +#: src/cp.c:218 msgid "" " -s, --symbolic-link make symbolic links instead of copying\n" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -2200,7 +2200,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:226 +#: src/cp.c:224 msgid "" " -u, --update copy only when the SOURCE file is newer\n" " than the destination file or when the\n" @@ -2216,7 +2216,7 @@ msgstr "" " -v, --verbose ne yapıldığını anlatır\n" " -x, --one-file-system bu dosya sisteminde kalır\n" -#: src/cp.c:235 +#: src/cp.c:233 #, fuzzy msgid "" "\n" @@ -2243,7 +2243,7 @@ msgstr "" "kullanın.\n" "\n" -#: src/cp.c:247 src/install.c:649 src/ln.c:421 src/mv.c:321 +#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322 #, fuzzy msgid "" "\n" @@ -2260,7 +2260,7 @@ msgstr "" "VERSION_CONTROL çevre değişkeninden belirlenebilir. Geçerli değerler:\n" "\n" -#: src/cp.c:254 src/install.c:656 src/mv.c:328 +#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329 msgid "" " none, off never make backups (even if --backup is given)\n" " numbered, t make numbered backups\n" @@ -2273,7 +2273,7 @@ msgstr "" "basit\n" " simple, never her zaman basit yedekleme yap\n" -#: src/cp.c:260 +#: src/cp.c:258 msgid "" "\n" "As a special case, cp makes a backup of SOURCE when the force and backup\n" @@ -2285,90 +2285,90 @@ 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:319 +#: src/cp.c:317 #, c-format msgid "failed to preserve times for %s" msgstr "%s'in zaman damgaları korunamadı" -#: src/cp.c:350 +#: src/cp.c:348 #, c-format msgid "failed to preserve permissions for %s" msgstr "%s'in izinleri korunamadı" -#: src/cp.c:477 +#: src/cp.c:475 #, c-format msgid "cannot make directory %s" msgstr "dizin %s oluşturulamadı" -#: src/cp.c:526 src/cp.c:545 +#: src/cp.c:524 src/cp.c:543 #, c-format msgid "%s exists but is not a directory" msgstr "%s var ama bir dizin değil" -#: src/cp.c:572 src/cp.c:1068 src/install.c:401 src/install.c:844 src/ln.c:123 -#: src/ln.c:181 src/ln.c:202 src/ln.c:516 src/mv.c:152 src/mv.c:399 -#, c-format -msgid "accessing %s" -msgstr "%s'e erişiliyor" +#: 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 +msgid "failed to access %s" +msgstr "%s açılamadı" -#: src/cp.c:592 src/install.c:914 src/ln.c:546 src/mv.c:432 src/shred.c:1182 -#: src/touch.c:433 src/truncate.c:356 +#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181 +#: src/touch.c:429 src/truncate.c:354 #, c-format msgid "missing file operand" msgstr "dosya işleyeni eksik" -#: src/cp.c:594 src/install.c:916 src/ln.c:560 src/mv.c:434 +#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436 #, c-format msgid "missing destination file operand after %s" msgstr "%s sonrasında hedef dosya işleyeni eksik" -#: src/cp.c:603 src/install.c:925 src/mv.c:443 +#: src/cp.c:601 src/install.c:926 src/mv.c:445 #, 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:619 src/cp.c:1070 src/install.c:403 src/install.c:846 -#: src/install.c:938 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:401 -#: src/mv.c:457 +#: 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 #, c-format msgid "target %s is not a directory" msgstr "hedef %s bir dizin değil" -#: src/cp.c:730 +#: src/cp.c:728 #, fuzzy, c-format msgid "with --parents, the destination must be a directory" msgstr "dosya yolları korunurken hedef bir dizin olmalı" -#: src/cp.c:1063 src/install.c:839 src/ln.c:511 src/mv.c:394 +#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395 #, c-format msgid "multiple target directories specified" msgstr "birden fazla hedef dizin belirtilmiş" -#: src/cp.c:1108 +#: src/cp.c:1110 #, c-format msgid "cannot make both hard and symbolic links" msgstr "hem sabit hem sembolik bağ oluşturulamaz" -#: src/cp.c:1115 src/mv.c:464 +#: src/cp.c:1117 src/mv.c:466 #, 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:1121 +#: src/cp.c:1123 #, c-format msgid "--reflink can be used only with --sparse=auto" msgstr "" -#: src/cp.c:1129 src/install.c:899 src/ln.c:582 src/mv.c:472 +#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474 msgid "backup type" msgstr "yedekleme türü" -#: src/cp.c:1154 +#: src/cp.c:1156 #, c-format msgid "cannot preserve security context without an SELinux-enabled kernel" msgstr "" -#: src/cp.c:1160 +#: src/cp.c:1162 #, c-format msgid "cannot preserve extended attributes, cp is built without xattr support" msgstr "" @@ -2378,139 +2378,138 @@ msgstr "" msgid "Stuart Kemp" msgstr "" -#: src/csplit.c:529 +#: src/csplit.c:531 #, c-format msgid "input disappeared" msgstr "girdi yok oldu" -#: src/csplit.c:658 src/csplit.c:669 +#: src/csplit.c:660 src/csplit.c:671 #, c-format msgid "%s: line number out of range" msgstr "%s: satır sayısı kapsam dışı" -#: src/csplit.c:698 +#: src/csplit.c:700 #, fuzzy, c-format msgid "%s: %s: line number out of range" msgstr "%s: `%s': satır sayısı kapsam dışı" -#: src/csplit.c:701 src/csplit.c:750 +#: src/csplit.c:703 src/csplit.c:752 #, c-format msgid " on repetition %s\n" msgstr " %s tekrarda\n" -#: src/csplit.c:744 +#: src/csplit.c:746 #, fuzzy, c-format msgid "%s: %s: match not found" msgstr "%s: `%s': eşleşme bulunamadı" -#: src/csplit.c:808 src/csplit.c:848 src/nl.c:359 src/tac.c:274 +#: src/csplit.c:810 src/csplit.c:850 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:981 +#: src/csplit.c:983 #, fuzzy, c-format msgid "write error for %s" msgstr "`%s' için yazım hatası" -#: src/csplit.c:1057 +#: src/csplit.c:1059 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: ayraçtan sonra tamsayı olmalı" -#: src/csplit.c:1073 +#: src/csplit.c:1075 #, fuzzy, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: tekrar sayımında `}' gerekli" -#: src/csplit.c:1083 +#: src/csplit.c:1085 #, fuzzy, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: `{' ve `}' arasına tamsayı yazılmalı" -#: src/csplit.c:1110 +#: src/csplit.c:1112 #, fuzzy, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: kapatan ayraç `%c' eksik" -#: src/csplit.c:1127 +#: src/csplit.c:1129 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: geçersiz düzenli ifade(regular expression): %s" -#: src/csplit.c:1160 +#: src/csplit.c:1162 #, c-format msgid "%s: invalid pattern" msgstr "%s: geçersiz kalıp" -#: src/csplit.c:1163 +#: src/csplit.c:1165 #, 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:1169 +#: src/csplit.c:1171 #, 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:1175 +#: src/csplit.c:1177 #, 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:1253 +#: src/csplit.c:1255 #, c-format msgid "missing conversion specifier in suffix" msgstr "sonekte dönüşüm belirleyicisi eksik" -#: src/csplit.c:1259 +#: src/csplit.c:1261 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "sonekte geçersiz dönüşüm belirleyicisi: %c" -#: src/csplit.c:1262 +#: src/csplit.c:1264 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "sonekte geçersiz dönüşüm belirleyicisi: \\%.3o" -#: src/csplit.c:1267 +#: src/csplit.c:1269 #, fuzzy, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "%.*s: geçersiz çevrim tanımı" -#: src/csplit.c:1284 +#: src/csplit.c:1286 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "sonekte gereğinden fazla %% dönüşüm belirleyicisi var" -#: src/csplit.c:1298 +#: src/csplit.c:1300 #, c-format msgid "missing %% conversion specification in suffix" msgstr "sonekte %% dönüşüm belirleyicisi eksik" -#: src/csplit.c:1345 +#: src/csplit.c:1347 #, c-format msgid "%s: invalid number" msgstr "%s: geçersiz sayı" -#: src/csplit.c:1449 +#: src/csplit.c:1451 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Kullanım: %s [SEÇENEK]... DOSYA KALIP...\n" -#: src/csplit.c:1453 +#: src/csplit.c:1455 #, 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" -"\n" msgstr "" "KALIP(lar)la ayrılmış DOSYA parçalarını `xx01', `xx02', ... isimli " "dosyalara,\n" "her parçanın bayt sayısını standart çıktıya yazar.\n" "\n" -#: src/csplit.c:1461 +#: src/csplit.c:1462 #, fuzzy, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2521,7 +2520,7 @@ msgstr "" " -f, --prefix=ÖNEK `xx' yerine ÖNEKi kullanır\n" " -k, --keep-files hata olduğunda çıktı dosyalarını silmez\n" -#: src/csplit.c:1466 +#: src/csplit.c:1467 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" @@ -2532,7 +2531,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:1473 +#: src/csplit.c:1474 msgid "" "\n" "Read standard input if FILE is -. Each PATTERN may be:\n" @@ -2541,7 +2540,7 @@ msgstr "" "Eğer DOSYA - olarak verilmişse, standart girdiyi okur. Her KALIP, aşağıdaki\n" "seçeneklerden olabilir:\n" -#: src/csplit.c:1477 +#: src/csplit.c:1478 #, fuzzy msgid "" "\n" @@ -2570,7 +2569,7 @@ msgstr "" msgid "David M. Ihnat" msgstr "" -#: src/cut.c:64 +#: src/cut.c:64 src/cut.c:372 msgid "fields and positions are numbered from 1" msgstr "" @@ -2580,14 +2579,13 @@ msgid "Usage: %s OPTION... [FILE]...\n" msgstr "Kullanım: %s [SEÇENEK]... [DOSYA]...\n" #: src/cut.c:193 -msgid "" -"Print selected parts of lines from each FILE to standard output.\n" -"\n" +#, 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:200 +#: src/cut.c:199 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2597,7 +2595,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:205 +#: src/cut.c:204 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2610,7 +2608,7 @@ msgstr "" " satırları yazdırır.\n" " -n (yoksayılır)\n" -#: src/cut.c:211 +#: src/cut.c:210 #, fuzzy msgid "" " --complement complement the set of selected bytes, characters\n" @@ -2618,7 +2616,7 @@ msgid "" msgstr "" " --complement seçili bayt, karakter veya alan kümelerini tümler\n" -#: src/cut.c:215 +#: src/cut.c:214 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2628,7 +2626,7 @@ msgstr "" " --output-delimeter=DİZGE\n" " çıktı ayracı olarak DİZGE'yi kullanır \n" -#: src/cut.c:222 +#: src/cut.c:221 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2636,7 +2634,7 @@ msgid "" "in the same order that it is read, and is written exactly once.\n" msgstr "" -#: src/cut.c:228 +#: src/cut.c:227 #, fuzzy msgid "" "Each range is one of:\n" @@ -2661,47 +2659,49 @@ msgstr "" "\n" "DOSYA belirtilmediğinde veya - olarak verildiğinde standart girdiden okur.\n" -#: src/cut.c:368 src/cut.c:489 -msgid "invalid byte or field list" +#: src/cut.c:367 src/cut.c:493 +#, fuzzy +msgid "invalid byte, character or field list" msgstr "geçersiz bayt veya alan listesi" -#: src/cut.c:385 +#: src/cut.c:387 #, fuzzy msgid "invalid range with no endpoint: -" msgstr "geçersiz genişlik seçeneği: %s" -#: src/cut.c:399 +#: src/cut.c:403 #, fuzzy msgid "invalid decreasing range" msgstr "Geçersiz sayfa aralığı `%s'" -#: src/cut.c:478 +#: src/cut.c:482 #, c-format msgid "byte offset %s is too large" msgstr "bayt görecesi %s çok büyük" -#: src/cut.c:481 +#: src/cut.c:485 #, c-format msgid "field number %s is too large" msgstr "alan numarası %s çok büyük" -#: src/cut.c:789 src/cut.c:797 +#: src/cut.c:795 src/cut.c:803 msgid "only one type of list may be specified" msgstr "sadece bir liste türü belirtilebilir" -#: src/cut.c:806 +#: src/cut.c:812 src/numfmt.c:1408 +#, c-format msgid "the delimiter must be a single character" msgstr "ayraç tek karakter olmalıdır" -#: src/cut.c:841 +#: src/cut.c:847 msgid "you must specify a list of bytes, characters, or fields" msgstr "bayt, karakter ya da alan listesi belirtilmelidir" -#: src/cut.c:844 +#: src/cut.c:850 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:848 +#: src/cut.c:854 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2709,11 +2709,11 @@ msgstr "" "ayrılmamış alanları atlamak sadece alanlar üzerinde işlem\n" "\tyapılırken anlamlı" -#: src/cut.c:864 +#: src/cut.c:870 msgid "missing list of fields" msgstr "alan listesi eksik" -#: src/cut.c:866 +#: src/cut.c:872 msgid "missing list of positions" msgstr "konum listesi eksik" @@ -2727,9 +2727,11 @@ msgstr "" " veya: %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 "" + +#: src/date.c:134 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" " -I[TIMESPEC], --iso-8601[=TIMESPEC] output date/time in ISO 8601 format.\n" @@ -2738,7 +2740,7 @@ msgid "" " and time to the indicated precision.\n" msgstr "" -#: src/date.c:138 +#: src/date.c:142 #, fuzzy msgid "" " -r, --reference=FILE display the last modification time of FILE\n" @@ -2752,7 +2754,7 @@ msgstr "" " -u, --utc, --universal zamanı Greenwich saatiyle gösterir ya da " "değiştirir\n" -#: src/date.c:143 +#: src/date.c:147 msgid "" " --rfc-3339=TIMESPEC output date and time in RFC 3339 format.\n" " TIMESPEC='date', 'seconds', or 'ns' for\n" @@ -2763,7 +2765,7 @@ msgid "" " -u, --utc, --universal print or set Coordinated Universal Time\n" msgstr "" -#: src/date.c:154 +#: src/date.c:158 #, fuzzy msgid "" "\n" @@ -2779,7 +2781,7 @@ msgstr "" " %% sabit %\n" " %a yerelin kısaltılmış gün adı (Paz..Cmt)\n" -#: src/date.c:161 +#: src/date.c:165 #, fuzzy msgid "" " %A locale's full weekday name (e.g., Sunday)\n" @@ -2792,7 +2794,7 @@ msgstr "" " %B yerelin uzun ay adı, değişken uzunluk (Ocak..Aralık)\n" " %c yerelin tarih ve zamanı (Cmt Kas 04 12:02:33 EEST 1989)\n" -#: src/date.c:167 +#: src/date.c:171 #, fuzzy msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" @@ -2805,14 +2807,14 @@ msgstr "" " %D tarih (aa/gg/yy)\n" " %e boşlukla yastıklanmış ayın günü ( 1..31)\n" -#: src/date.c:173 +#: src/date.c:177 msgid "" " %F full date; same as %Y-%m-%d\n" " %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 "" -#: src/date.c:178 +#: src/date.c:182 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2824,7 +2826,7 @@ msgstr "" " %I saat (01..12)\n" " %j yılın günü (001..366)\n" -#: src/date.c:184 +#: src/date.c:188 #, fuzzy msgid "" " %k hour, space padded ( 0..23); same as %_H\n" @@ -2837,7 +2839,7 @@ msgstr "" " %m ay (01..12)\n" " %M dakika (00..59)\n" -#: src/date.c:190 +#: src/date.c:194 #, fuzzy msgid "" " %n a newline\n" @@ -2858,7 +2860,7 @@ msgstr "" "eklentisi)\n" # -#: src/date.c:199 +#: src/date.c:203 #, fuzzy msgid "" " %S second (00..60)\n" @@ -2872,7 +2874,7 @@ msgstr "" " %T 24 saatlik zaman (ss:dd:SS)\n" " %u haftanın günü (1..7); 1, pazartesiye tekabül eder\n" -#: src/date.c:205 +#: src/date.c:209 #, fuzzy msgid "" " %U week number of year, with Sunday as first day of week (00..53)\n" @@ -2887,7 +2889,7 @@ msgstr "" " %W yılın haftası, pazartesi günü haftanın ilk günü kabul edilir " "(00..53)\n" -#: src/date.c:211 +#: src/date.c:215 #, fuzzy msgid "" " %x locale's date representation (e.g., 12/31/99)\n" @@ -2900,7 +2902,7 @@ msgstr "" " %y yılın son iki basamağı (00..99)\n" " %Y yıl (1970...)\n" -#: src/date.c:217 +#: src/date.c:221 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -2912,7 +2914,7 @@ msgid "" "By default, date pads numeric fields with zeroes.\n" msgstr "" -#: src/date.c:226 +#: src/date.c:230 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -2923,7 +2925,7 @@ msgid "" " # use opposite case if possible\n" msgstr "" -#: src/date.c:235 +#: src/date.c:239 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -2932,7 +2934,7 @@ msgid "" "O to use the locale's alternate numeric symbols if available.\n" msgstr "" -#: src/date.c:242 +#: src/date.c:246 msgid "" "\n" "Examples:\n" @@ -2946,35 +2948,35 @@ msgid "" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:275 src/dd.c:2193 src/head.c:838 src/md5sum.c:477 -#: src/md5sum.c:798 src/od.c:863 src/od.c:1914 src/pr.c:1176 src/pr.c:1372 -#: src/pr.c:1494 src/stty.c:842 src/tac.c:563 src/tail.c:343 src/tee.c:126 +#: 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 #, c-format msgid "standard input" msgstr "standart girdi" -#: src/date.c:303 src/date.c:523 +#: src/date.c:307 src/date.c:527 #, fuzzy, c-format msgid "invalid date %s" msgstr "`%s' geçerli bir zaman dizgesi değil" -#: src/date.c:414 src/date.c:448 +#: src/date.c:418 src/date.c:452 #, fuzzy, c-format msgid "multiple output formats specified" msgstr "birden fazla çıktı dosyası belirtilmiş" -#: src/date.c:426 +#: src/date.c:430 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "tarih belirten bu seçenekler birlikte kullanılamaz" -#: src/date.c:433 +#: src/date.c:437 #, c-format msgid "the options to print and set the time may not be used together" msgstr "zamanı ayarlamak ve göstermek için bu seçenekler birlikte kullanılamaz" -#: src/date.c:454 +#: src/date.c:458 #, fuzzy, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -2985,23 +2987,23 @@ msgstr "" "Zamanı belirtmek için bir seçenek kullanırken, seçenek olmayan\n" "her argüman `+' ile başlayan bir biçem dizgesi olmalıdır." -#: src/date.c:531 +#: src/date.c:535 #, c-format msgid "cannot set date" msgstr "tarih ayarlanamadı" -#: src/date.c:554 src/du.c:360 +#: src/date.c:558 src/du.c:371 #, c-format msgid "time %s is out of range" msgstr "%s zamanı aralık dışı" #. This is a proper name. See the gettext manual, section Names. -#: src/dd.c:44 src/factor.c:43 src/rm.c:41 src/tail.c:69 src/touch.c:41 +#: 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 "" -#: src/dd.c:517 +#: src/dd.c:521 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3010,7 +3012,7 @@ msgstr "" "Kullanımı: %s [İŞLEYEN]...\n" " veya: %s SEÇENEK\n" -#: src/dd.c:522 +#: src/dd.c:526 #, fuzzy msgid "" "Copy a file, converting and formatting according to the operands.\n" @@ -3030,7 +3032,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:531 +#: src/dd.c:535 #, fuzzy msgid "" " if=FILE read from FILE instead of stdin\n" @@ -3040,7 +3042,8 @@ msgid "" " oflag=FLAGS write as per the comma separated symbol list\n" " seek=N skip N obs-sized blocks at start of output\n" " skip=N skip N ibs-sized blocks at start of input\n" -" status=noxfer suppress transfer statistics\n" +" status=WHICH WHICH info to suppress outputting to stderr;\n" +" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" msgstr "" " if=DOSYA standart girdi yerine DOSYA'dan okur\n" " iflag=BAYRAK virgülle ayrılmış sembol listesine uygun olarak okur\n" @@ -3050,11 +3053,11 @@ 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:541 +#: src/dd.c:546 #, fuzzy msgid "" "\n" -"BLOCKS and BYTES may be followed by the following multiplicative suffixes:\n" +"N and BYTES may be followed by the following multiplicative suffixes:\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, and so on for T, P, E, Z, Y.\n" "\n" @@ -3069,7 +3072,7 @@ msgstr "" "Her CONV sembolü:\n" "\n" -#: src/dd.c:550 +#: src/dd.c:555 #, fuzzy msgid "" " ascii from EBCDIC to ASCII\n" @@ -3100,7 +3103,7 @@ msgstr "" "yerine\n" " boşlukla doldurur\n" -#: src/dd.c:563 +#: src/dd.c:568 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3116,7 +3119,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:571 +#: src/dd.c:576 #, fuzzy msgid "" "\n" @@ -3130,81 +3133,81 @@ msgstr "" "\n" " append ekleme kipi (yalnız çıktı için geçerli)\n" -#: src/dd.c:578 +#: src/dd.c:583 #, fuzzy msgid " cio use concurrent I/O for data\n" msgstr " direct veri için direkt I/O kullanır\n" -#: src/dd.c:580 +#: src/dd.c:585 msgid " direct use direct I/O for data\n" msgstr " direct veri için direkt I/O kullanır\n" -#: src/dd.c:582 +#: src/dd.c:587 #, fuzzy msgid " directory fail unless a directory\n" msgstr " direct veri için direkt I/O kullanır\n" -#: src/dd.c:584 +#: src/dd.c:589 msgid " dsync use synchronized I/O for data\n" msgstr " dsync veri için senkron I/O kullanır\n" -#: src/dd.c:586 +#: src/dd.c:591 msgid " sync likewise, but also for metadata\n" msgstr " sync önceki gibi fakat meta veri için de geçerli\n" -#: src/dd.c:587 +#: src/dd.c:592 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr "" -#: src/dd.c:590 +#: src/dd.c:595 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock bloklamayan I/O kullanır\n" -#: src/dd.c:592 +#: src/dd.c:597 msgid " noatime do not update access time\n" msgstr "" -#: src/dd.c:595 +#: src/dd.c:600 msgid " nocache discard cached data\n" msgstr "" -#: src/dd.c:598 +#: src/dd.c:603 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:601 +#: src/dd.c:606 msgid " nofollow do not follow symlinks\n" msgstr " nofollow sembolik bağları izlemez\n" -#: src/dd.c:603 +#: src/dd.c:608 msgid " nolinks fail if multiply-linked\n" msgstr "" -#: src/dd.c:605 +#: src/dd.c:610 #, fuzzy msgid " binary use binary I/O for data\n" msgstr " direct veri için direkt I/O kullanır\n" -#: src/dd.c:607 +#: src/dd.c:612 #, fuzzy msgid " text use text I/O for data\n" msgstr " direct veri için direkt I/O kullanır\n" -#: src/dd.c:609 +#: src/dd.c:614 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:612 +#: src/dd.c:617 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:615 +#: src/dd.c:620 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:620 +#: src/dd.c:625 #, fuzzy, c-format msgid "" "\n" @@ -3234,28 +3237,28 @@ msgstr "" "Seçenekler:\n" "\n" -#: src/dd.c:676 +#: src/dd.c:683 #, c-format msgid "" "%<PRIuMAX>+%<PRIuMAX> records in\n" "%<PRIuMAX>+%<PRIuMAX> records out\n" msgstr "" -#: src/dd.c:682 +#: src/dd.c:689 #, 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:694 +#: src/dd.c:701 #, 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:712 +#: src/dd.c:720 #, fuzzy msgid "Infinity B" msgstr "Sonsuz" @@ -3270,90 +3273,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:725 +#: src/dd.c:733 #, fuzzy, c-format msgid ", %g s, %s/s\n" msgstr ", %g saniye, %s/s\n" -#: src/dd.c:804 +#: src/dd.c:812 #, c-format msgid "closing input file %s" msgstr "girdi dosyası %s kapatılıyor" -#: src/dd.c:811 +#: src/dd.c:819 #, c-format msgid "closing output file %s" msgstr "çıktı dosyası %s kapatılıyor" -#: src/dd.c:1014 +#: src/dd.c:1022 #, fuzzy, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "%s dizinine chdir başarısız" -#: src/dd.c:1085 src/dd.c:1934 +#: src/dd.c:1093 src/dd.c:1942 #, c-format msgid "writing to %s" msgstr "%s'e yazılıyor" -#: src/dd.c:1199 src/dd.c:1253 +#: src/dd.c:1207 src/dd.c:1261 #, c-format msgid "unrecognized operand %s" msgstr "geçersiz işleyen %s" -#: src/dd.c:1210 +#: src/dd.c:1218 #, fuzzy msgid "invalid conversion" msgstr "geçersiz dönüşüm: %s" -#: src/dd.c:1213 src/dd.c:1289 +#: src/dd.c:1221 src/dd.c:1297 #, fuzzy msgid "invalid input flag" msgstr "geçersiz girdi bayrağı: %s" -#: src/dd.c:1216 src/dd.c:1283 src/dd.c:1295 +#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303 #, fuzzy msgid "invalid output flag" msgstr "geçersiz çıktı bayrağı: %s" -#: src/dd.c:1219 +#: src/dd.c:1227 #, fuzzy msgid "invalid status flag" msgstr "geçersiz durum bayrağı: %s" -#: src/dd.c:1258 src/truncate.c:312 +#: src/dd.c:1266 src/truncate.c:310 #, c-format msgid "invalid number %s" msgstr "geçersiz sayı %s" -#: src/dd.c:1340 +#: src/dd.c:1348 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "{ascii, ebcdic, ibm} değerlerinin herhangi ikisi birleştirilemez" # -#: src/dd.c:1342 +#: src/dd.c:1350 #, c-format msgid "cannot combine block and unblock" msgstr "`block' ve `unblock' seçenekleri aynı anda kullanılamaz" -#: src/dd.c:1344 +#: src/dd.c:1352 #, 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:1346 +#: src/dd.c:1354 #, c-format msgid "cannot combine excl and nocreat" msgstr "`excl' ve `nocreat' seçenekleri birleştirilemez" -#: src/dd.c:1349 +#: src/dd.c:1357 #, fuzzy, c-format msgid "cannot combine direct and nocache" msgstr "`excl' ve `nocreat' seçenekleri birleştirilemez" -#: src/dd.c:1506 +#: src/dd.c:1514 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3363,156 +3366,178 @@ msgstr "" "alternatifler\n" " kullanılıyor -- tür listesi için <sys/mtio.h>'e bakın" -#: src/dd.c:1593 +#: src/dd.c:1601 #, fuzzy, c-format msgid "%s: cannot skip" msgstr "%s: aranamadı" -#: src/dd.c:1595 src/dd.c:1614 src/dd.c:1675 +#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683 #, c-format msgid "%s: cannot seek" msgstr "%s: aranamadı" -#: src/dd.c:1655 +#: src/dd.c:1663 #, c-format msgid "offset overflow while reading file %s" msgstr "%s dosya okunurken görece taşması" -#: src/dd.c:1667 +#: src/dd.c:1675 #, 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:1671 +#: src/dd.c:1679 #, c-format msgid "cannot work around kernel bug after all" msgstr "çekirdek hatası bertaraf edilemedi" -#: src/dd.c:1814 +#: src/dd.c:1822 #, c-format msgid "setting flags for %s" msgstr "%s için seçenekler belirtiliyor" -#: src/dd.c:1867 +#: src/dd.c:1875 #, c-format msgid "memory exhausted by input buffer of size %zu bytes (%s)" msgstr "" -#: src/dd.c:1881 +#: src/dd.c:1889 #, c-format msgid "memory exhausted by output buffer of size %zu bytes (%s)" msgstr "" -#: src/dd.c:1914 +#: src/dd.c:1922 #, fuzzy, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: görece %s'ye ilerlenemiyor (seek)" -#: src/dd.c:2125 src/dd.c:2258 +#: src/dd.c:2133 #, fuzzy, c-format -msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" +msgid "failed to truncate to %<PRIdMAX> bytes in output file %s" msgstr "çıktı dosyasında %s bayt ileriye gidildi %s" -#: src/dd.c:2138 +#: src/dd.c:2146 #, c-format msgid "fdatasync failed for %s" msgstr "%s için fdatasync başarısız" -#: src/dd.c:2148 +#: src/dd.c:2156 #, c-format msgid "fsync failed for %s" msgstr "%s için fsync başarısız" -#: src/dd.c:2199 src/dd.c:2228 +#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165 #, c-format -msgid "opening %s" -msgstr "%s açılıyor" +msgid "failed to open %s" +msgstr "%s açılamadı" -#: src/dd.c:2237 +#: src/dd.c:2246 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) " "blocks" msgstr "" -#: src/dd.c:2274 src/dd.c:2280 +#: src/dd.c:2267 +#, 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 #, 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:54 src/expr.c:153 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:39 src/sleep.c:35 src/sort.c:66 +#: 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 msgid "Paul Eggert" msgstr "" -#: src/df.c:140 +#: src/df.c:172 msgid "Filesystem" msgstr "Dosyasistemi" -#: src/df.c:141 +#: src/df.c:175 msgid "Type" msgstr "Tür" -#: src/df.c:142 +#: src/df.c:178 src/df.c:542 msgid "blocks" msgstr "blok" -#: src/df.c:142 -msgid "Inodes" -msgstr "Dosyaindeksi" - -#: src/df.c:142 -msgid "Size" -msgstr "Boy" - -#: src/df.c:143 +#: src/df.c:181 msgid "Used" msgstr "Dolu" -#: src/df.c:143 -msgid "IUsed" -msgstr "Dolu" - -#: src/df.c:144 +#: src/df.c:184 msgid "Available" msgstr "Boş" -#: src/df.c:144 -msgid "IFree" -msgstr "Boş" - -#: src/df.c:144 -msgid "Avail" -msgstr "Boş" - -#: src/df.c:145 +#: src/df.c:187 msgid "Use%" msgstr "Kull%" -#: src/df.c:145 +#: src/df.c:190 +msgid "Inodes" +msgstr "Dosyaindeksi" + +#: src/df.c:193 +msgid "IUsed" +msgstr "Dolu" + +#: src/df.c:196 +msgid "IFree" +msgstr "Boş" + +#: src/df.c:199 msgid "IUse%" msgstr "IKull%" -#: src/df.c:145 +#: src/df.c:202 +msgid "Mounted on" +msgstr "Bağlanılan yer" + +#: src/df.c:383 +#, c-format +msgid "option --output: field '%s' unknown" +msgstr "" + +#: src/df.c:390 +#, fuzzy, c-format +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 +msgid "Size" +msgstr "Boy" + +#: src/df.c:414 src/df.c:451 +msgid "Avail" +msgstr "Boş" + +#: src/df.c:474 msgid "Capacity" msgstr "Kapasite" -#: src/df.c:146 -msgid "Mounted on" -msgstr "Bağlanılan yer" +#. 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 +#, c-format +msgid "%s-%s" +msgstr "" -#: src/df.c:847 +#: src/df.c:1210 +#, fuzzy msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" -"\n" msgstr "" "Üzerinde DOSYA'ların bulunduğu dosyasistemi hakkında bilgi gösterir,\n" "veya öntanımlı olarak bütün dosyasistemleri hakkında bilgi gösterir.\n" "\n" -#: src/df.c:855 +#: src/df.c:1217 #, fuzzy msgid "" " -a, --all include dummy file systems\n" @@ -3531,7 +3556,7 @@ msgstr "" " -H, --si yukarıdaki gibi fakat 1000'in katlarını kullanır,\n" " 1024'ün değil.\n" -#: src/df.c:865 +#: src/df.c:1227 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3545,8 +3570,12 @@ msgstr "" " --no-sync (öntanımlı) kullanım bilgisini almadan önce sync\n" " yapmaz\n" -#: src/df.c:872 +#: src/df.c:1234 +#, fuzzy msgid "" +" --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" +" or print all fields if FIELD_LIST is " +"omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" " -t, --type=TYPE limit listing to file systems of type TYPE\n" @@ -3563,21 +3592,43 @@ msgstr "" " dosyasistemleri ile sınırlar\n" " -v (yoksayılır)\n" -#: src/df.c:1027 +#: src/df.c:1248 +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" +msgstr "" + +#: src/df.c:1285 +#, 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 "" + +#: src/df.c:1442 #, 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:1075 +#: src/df.c:1500 msgid "Warning: " msgstr "Uyarı: " -#: src/df.c:1077 src/stat.c:795 +#: src/df.c:1502 src/stat.c:814 #, fuzzy msgid "cannot read table of mounted file systems" msgstr "%s bağlanmış dosyasistemleri tablosu okunamadı" -#: src/df.c:1107 +#: src/df.c:1539 #, c-format msgid "no file systems processed" msgstr "" @@ -3696,7 +3747,7 @@ msgid "" " %s stdio.h -> \".\"\n" msgstr "" -#: src/du.c:260 src/sort.c:390 src/wc.c:112 +#: src/du.c:270 src/sort.c:394 src/wc.c:112 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3705,18 +3756,19 @@ msgstr "" "Kullanım: %s [SEÇENEK]... DOSYA\n" " veya: %s [SEÇENEK]... --files0-from=F\n" -#: src/du.c:264 -msgid "" -"Summarize disk usage of each FILE, recursively for directories.\n" -"\n" +#: src/du.c:274 +#, fuzzy +msgid "Summarize disk usage of each FILE, recursively for directories.\n" msgstr "" "Her DOSYA'nın disk kullanımını özetler, dizinler için çevrimli çalışır.\n" "\n" # -#: src/du.c:271 +#: src/du.c:280 #, fuzzy msgid "" +" -0, --null end each output line with 0 byte rather than " +"newline\n" " -a, --all write counts for all files, not just directories\n" " --apparent-size print apparent sizes, rather than disk usage; " "although\n" @@ -3737,7 +3789,7 @@ msgstr "" " -c, --total toplam hesaplar\n" " -D, --dereference-args sembolik bağ olduğu zaman DOSYA'ları takip eder\n" -#: src/du.c:279 +#: src/du.c:289 #, fuzzy msgid "" " -B, --block-size=SIZE scale sizes by SIZE before printing them. E.g.,\n" @@ -3747,15 +3799,23 @@ msgid "" " -c, --total produce a grand total\n" " -D, --dereference-args dereference only symlinks that are listed on the\n" " command line\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 "" -" -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" +" -x, --one-file-system başka dosyasistemlerinde olan dizinleri atlar\n" +" -X DOSYA, --exclude-from=DOSYA DOSYA'da bulunan kalıplara uyan dosyaları\n" +" işlemden hariç tutar.\n" +" --exclude=KAL KAL kalıbına uyan dosyaları işlemden hariç tutar.\n" +" --max-depth=N bir dizin için toplamı (veya dosya için, --all " +"ile),\n" +" yalnızca komut satırı argümanından N veya daha az\n" +" seviye aşağıda ise gösterir. \n" +" --max-depth=0, --summarize ile aynıdır.\n" -#: src/du.c:288 +#: src/du.c:302 #, fuzzy msgid "" " --files0-from=F summarize disk usage of the NUL-terminated file\n" @@ -3764,7 +3824,6 @@ msgid "" " -H equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" --si like -h, but use powers of 1000 not 1024\n" msgstr "" " --files0-from=F F dosyasında isimleri belirtilen, sonu NUL ile " "biten\n" @@ -3779,21 +3838,21 @@ 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:297 +#: src/du.c:310 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 "" -#: src/du.c:302 +#: src/du.c:316 +#, fuzzy msgid "" -" -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " "default)\n" -" -0, --null end each output line with 0 byte rather than " -"newline\n" " -S, --separate-dirs 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 bütün sembolik bağları takip eder\n" @@ -3803,31 +3862,11 @@ 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:309 -#, 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 başka dosyasistemlerinde olan dizinleri atlar\n" -" -X DOSYA, --exclude-from=DOSYA DOSYA'da bulunan kalıplara uyan dosyaları\n" -" işlemden hariç tutar.\n" -" --exclude=KAL KAL kalıbına uyan dosyaları işlemden hariç tutar.\n" -" --max-depth=N bir dizin için toplamı (veya dosya için, --all " -"ile),\n" -" yalnızca komut satırı argümanından N veya daha az\n" -" seviye aşağıda ise gösterir. \n" -" --max-depth=0, --summarize ile aynıdır.\n" - -#: src/du.c:318 +#: src/du.c:322 #, fuzzy msgid "" +" -t, --threshold=SIZE exclude entries smaller than SIZE if positive,\n" +" or entries greater than SIZE if negative\n" " --time show time of the last modification of any file in " "the\n" " directory, or any of its subdirectories\n" @@ -3854,65 +3893,74 @@ msgstr "" " status (durum); eğer --sort=time belirtilmişse\n" " seçilen zaman değerine göre sıralar.\n" -#: src/du.c:375 +#: src/du.c:333 +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 msgid "Infinity" msgstr "Sonsuz" -#: src/du.c:600 +#: src/du.c:507 +#, c-format +msgid "mount point %s already traversed" +msgstr "" + +#: src/du.c:624 #, fuzzy, c-format msgid "fts_read failed: %s" msgstr "fts_read başarısız oldu" -#: src/du.c:724 +#: src/du.c:780 #, c-format msgid "invalid maximum depth %s" msgstr "geçersiz maksimum derinlik %s" -#: src/du.c:817 +#: src/du.c:809 +#, fuzzy, c-format +msgid "invalid --threshold argument '-0'" +msgstr "%s argümanı geçersiz" + +#: src/du.c:887 #, c-format msgid "cannot both summarize and show all entries" msgstr "hem özetleyip hem bütün girdiler gösterilemez" -#: src/du.c:824 +#: src/du.c:894 #, c-format msgid "warning: summarizing is the same as using --max-depth=0" msgstr "uyarı: özetlemek --max-depth=0 ile aynı" -#: src/du.c:830 +#: src/du.c:900 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "uyarı: özetlemek --max-depth=%lu ile çakışıyor" -#: src/du.c:896 src/sort.c:4479 src/wc.c:668 +#: src/du.c:966 src/sort.c:4533 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:949 src/md5sum.c:587 src/od.c:903 src/tac.c:239 src/tac.c:350 -#: src/tac.c:506 src/tac.c:586 src/wc.c:733 +#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 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:963 src/sort.c:4508 src/wc.c:747 +#: src/du.c:1040 src/sort.c:4562 src/wc.c:747 #, c-format msgid "when reading file names from stdin, no file name of %s allowed" msgstr "" -#: src/du.c:980 src/du.c:988 src/wc.c:760 src/wc.c:768 +#: src/du.c:1057 src/du.c:1065 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:1007 src/head.c:149 src/head.c:262 src/head.c:334 src/head.c:538 -#: src/head.c:620 src/head.c:692 src/head.c:750 src/head.c:774 src/tail.c:412 -#: src/tail.c:500 src/tail.c:549 src/tail.c:642 src/tail.c:770 src/tail.c:818 -#: src/tail.c:855 src/tail.c:1782 src/tail.c:1812 src/uniq.c:395 -#, c-format -msgid "error reading %s" -msgstr "%s'i okunurken hata" - -#: src/du.c:1010 src/ls.c:2649 src/wc.c:791 +#: src/du.c:1088 src/ls.c:2649 src/wc.c:791 msgid "total" msgstr "toplam" @@ -4007,10 +4055,12 @@ msgid "Usage: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n" msgstr "Kullanımı: %s [SEÇENEK]... [-] [İSİM=DEĞER]... [KOMUT [ARG]...]\n" #: src/env.c:55 +msgid "Set each NAME to VALUE in the environment and run COMMAND.\n" +msgstr "" + +#: src/env.c:61 #, fuzzy msgid "" -"Set each NAME to VALUE in the environment and run COMMAND.\n" -"\n" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with 0 byte rather than newline\n" " -u, --unset=NAME remove variable from the environment\n" @@ -4020,7 +4070,7 @@ msgstr "" " -i, --ignore-environment bir boş çevre ile başlatır\n" " -u, --unset=İSİM İSİM ile belirtilen çevre değişkenini kaldırır\n" -#: src/env.c:64 +#: src/env.c:68 msgid "" "\n" "A mere - implies -i. If no COMMAND, print the resulting environment.\n" @@ -4029,32 +4079,32 @@ msgstr "" "Sadece -, -i uygular. KOMUT verilmezse mevcut çevre değişkenlerini " "listeler.\n" -#: src/env.c:120 +#: src/env.c:124 #, fuzzy, c-format msgid "cannot unset %s" msgstr "%s durumlanamadı" -#: src/env.c:131 +#: src/env.c:135 #, fuzzy, c-format msgid "cannot set %s" msgstr "%s durumlanamadı" -#: src/env.c:148 +#: src/env.c:152 #, c-format msgid "cannot specify --null (-0) with command" msgstr "" #: 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" -"\n" msgstr "" "Her DOSYA'daki tabları boşluğa çevirerek standart çıktıya yazar.\n" "DOSYA belirtilmediğinde, veya - olduğunda, standart girdiden okur.\n" "\n" -#: src/expand.c:115 +#: src/expand.c:114 msgid "" " -i, --initial do not convert tabs after non blanks\n" " -t, --tabs=NUMBER have tabs NUMBER characters apart, not 8\n" @@ -4062,7 +4112,7 @@ msgstr "" " -i, --initial Boşluktan sonra gelmeyen tabları değiştirmez\n" " -t, --tabs=N tabların yerine 8 değil N boşluk koyar\n" -#: src/expand.c:119 +#: src/expand.c:118 msgid "" " -t, --tabs=LIST use comma separated list of explicit tab positions\n" msgstr "" @@ -4071,27 +4121,27 @@ msgstr "" " Satırda listenin uzunluğundan fazla tab varsa, fazla\n" " olan tablar yerine bir boşluk koyar\n" -#: src/expand.c:172 src/unexpand.c:191 +#: src/expand.c:171 src/unexpand.c:190 #, c-format msgid "tab stop is too large %s" msgstr "sekme boyu %s çok büyük" -#: src/expand.c:180 src/unexpand.c:199 +#: src/expand.c:179 src/unexpand.c:198 #, c-format msgid "tab size contains invalid character(s): %s" msgstr "sekme boyunda geçersiz karakter(ler): %s" -#: src/expand.c:206 src/unexpand.c:225 +#: src/expand.c:205 src/unexpand.c:224 #, c-format msgid "tab size cannot be 0" msgstr "tab boyu 0 olamaz" -#: src/expand.c:208 src/unexpand.c:227 +#: src/expand.c:207 src/unexpand.c:226 #, c-format msgid "tab sizes must be ascending" msgstr "tab boyları küçükten büyüğe sıralı olmalı" -#: src/expand.c:326 src/expand.c:345 src/unexpand.c:374 src/unexpand.c:419 +#: 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 "girdi satırı fazla uzun" @@ -4253,13 +4303,13 @@ msgstr "düzenli ifade (regular expression) aramasında hata oluştu" msgid "non-integer argument" msgstr "nümerik olmayan argüman" -#: src/expr.c:793 src/truncate.c:316 +#: src/expr.c:793 src/truncate.c:314 #, c-format msgid "division by zero" msgstr "sıfırla bölüm" # -#: src/expr.c:887 src/sort.c:2029 +#: src/expr.c:887 src/sort.c:2044 #, 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." @@ -4269,25 +4319,32 @@ msgstr "Problemi devre dışı bırakmak için LC_ALL='C' tanımlayın." msgid "the strings compared were %s and %s" msgstr "Karşılaştırılan dizgeler %s ve %s idi." -#: src/factor.c:449 -msgid "using arbitrary-precision arithmetic" +#. This is a proper name. See the gettext manual, section Names. +#: src/factor.c:111 +msgid "Niels Moller" msgstr "" -#: src/factor.c:460 -msgid "using single-precision arithmetic" +#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459 +#, c-format +msgid "Lucas prime test failure. This should not happen" msgstr "" -#: src/factor.c:465 src/od.c:1640 src/od.c:1709 +#: src/factor.c:2092 #, c-format -msgid "%s is too large" -msgstr "%s çok büyük" +msgid "squfof queue overflow" +msgstr "" -#: src/factor.c:469 +#: src/factor.c:2419 #, fuzzy, c-format msgid "%s is not a valid positive integer" msgstr "`%s' bir pozitif tamsayı değil." -#: src/factor.c:494 +#: src/factor.c:2442 src/od.c:1646 src/od.c:1715 +#, c-format +msgid "%s is too large" +msgstr "%s çok büyük" + +#: src/factor.c:2454 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4296,7 +4353,7 @@ msgstr "" "Kullanımı: %s [SAYI]...\n" " veya: %s SEÇENEK\n" -#: src/factor.c:499 +#: src/factor.c:2459 #, fuzzy msgid "" "Print the prime factors of each specified integer NUMBER. If none\n" @@ -4324,21 +4381,20 @@ msgid "cannot stat current directory (now %s)" msgstr "şimdiki dizin durumlanamadı (şimdi %s)" #. This is a proper name. See the gettext manual, section Names. -#: src/fmt.c:37 +#: src/fmt.c:38 msgid "Ross Paterson" msgstr "" -#: src/fmt.c:269 +#: src/fmt.c:270 #, fuzzy, c-format msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n" msgstr "Kullanım: %s [-BASAMAKLAR] [SEÇENEK]... [DOSYA]...\n" -#: src/fmt.c:270 +#: 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" -"\n" msgstr "" "DOSYA(lar)daki tüm paragrafları yeniden biçemlendirir ve standart çıktıya\n" "yazar. Eğer DOSYA adı yoksa veya `-' ise, standart girdiden okur.\n" @@ -4357,8 +4413,8 @@ msgstr "" " -s, --split-only uzun satırları böler fakat kısaları " "birleştirmez\n" -#: src/fmt.c:285 -#, fuzzy, c-format +#: src/fmt.c:287 +#, fuzzy, 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" @@ -4371,7 +4427,7 @@ msgstr "" "koyar.\n" " -w, --width=GENİŞLİK maksimum satır genişliği (öntanımlı 75 sütun) \n" -#: src/fmt.c:357 +#: src/fmt.c:359 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -4380,22 +4436,22 @@ msgstr "" "geçersiz seçenek -- %c; GENİŞLİK yalnızca ilk seçenek olduğu zaman kabul\n" "edilir; bunun yerine -w N kullanın" -#: src/fmt.c:403 src/fmt.c:414 +#: src/fmt.c:405 src/fmt.c:416 #, c-format msgid "invalid width: %s" msgstr "geçersiz genişlik: %s" #: src/fold.c:70 +#, fuzzy msgid "" "Wrap input lines in each FILE (standard input by default), writing to\n" "standard output.\n" -"\n" msgstr "" "DOSYA'daki (DOSYA belirtilmediğinde standart girdi'deki) satırları \n" "katlar ve standart çıktıya yazar\n" "\n" -#: src/fold.c:78 +#: src/fold.c:77 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4405,13 +4461,13 @@ msgstr "" " -s, --spaces satırı boşluklarda böler\n" " -w, --width=N 80 yerine N sütun kullanır\n" -#: src/fold.c:289 src/pr.c:836 +#: src/fold.c:288 src/pr.c:832 #, fuzzy, c-format 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:75 +#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 #: src/truncate.c:37 msgid "Padraig Brady" msgstr "" @@ -4427,17 +4483,17 @@ msgid "" "\n" msgstr "" -#: src/group-list.c:69 src/id.c:345 src/setuidgid.c:184 +#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184 #, 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:350 +#: src/group-list.c:74 src/id.c:370 #, fuzzy, c-format msgid "failed to get groups for the current process" msgstr "%s'in grup üyeliği %s olarak değiştirilemedi\n" -#: src/group-list.c:104 +#: src/group-list.c:114 #, fuzzy, c-format msgid "cannot find name for group ID %lu" msgstr "%u grup kimliğinin ismi bulunamıyor" @@ -4475,18 +4531,18 @@ msgid "%s: no such user" msgstr "%s: Böyle bir kullanıcı yok" #: 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" -"\n" msgstr "" "Her DOSYA'nın ilk on satırını standart çıktıya yazar.\n" "Birden fazla DOSYA verildiğinde, her dosyadan önce dosya adını yazar.\n" "DOSYA adı verilmediğinde, veya - olduğunda standart girdiden okur.\n" "\n" -#: src/head.c:118 +#: src/head.c:117 #, fuzzy msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" @@ -4504,7 +4560,7 @@ msgstr "" "satırı\n" " haricindeki bütün içeriğini yazdırır\n" -#: src/head.c:126 +#: src/head.c:125 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4512,7 +4568,7 @@ msgstr "" " -q, --quiet, --silent dosya isimlerini göstermez\n" " -v, --verbose dosya isimlerini gösterir\n" -#: src/head.c:132 +#: src/head.c:131 #, fuzzy msgid "" "\n" @@ -4528,58 +4584,58 @@ msgstr "" "Her CONV sembolü:\n" "\n" -#: src/head.c:152 -#, c-format -msgid "error writing %s" -msgstr "%s'e yazarken hata" - -#: src/head.c:155 +#: src/head.c:154 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: dosya fazla küçülmüş" -#: src/head.c:228 src/head.c:1044 +#: src/head.c:227 src/head.c:1051 #, c-format msgid "%s: number of bytes is too large" msgstr "%s: bayt sayısı fazla büyük" -#: src/head.c:441 +#: src/head.c:440 #, c-format msgid "%s: cannot lseek back to original position" msgstr "%s: orjinal konuma geri gidilemiyor (lseek)" -#: src/head.c:613 src/head.c:684 src/tail.c:450 +#: src/head.c:612 src/head.c:691 src/tail.c:449 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: %s görecesine ilerleme (seek) yapılamıyor" -#: src/head.c:791 +#: src/head.c:673 +#, fuzzy, c-format +msgid "%s: failed to reset file pointer" +msgstr "%s: silinemedi" + +#: src/head.c:798 #, c-format msgid "cannot reposition file pointer for %s" msgstr "%s üzerinde lseek başarısız" -#: src/head.c:878 +#: src/head.c:885 #, 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:879 +#: src/head.c:886 msgid "number of lines" msgstr "satır sayısı" -#: src/head.c:879 +#: src/head.c:886 msgid "number of bytes" msgstr "bayt sayısı" -#: src/head.c:886 src/tail.c:1947 +#: src/head.c:893 src/tail.c:1947 msgid "invalid number of lines" msgstr "geçersiz satır sayısı" -#: src/head.c:887 src/tail.c:1948 +#: src/head.c:894 src/tail.c:1948 msgid "invalid number of bytes" msgstr "geçersiz bayt sayısı" -#: src/head.c:974 src/head.c:1032 +#: src/head.c:981 src/head.c:1039 #, fuzzy, c-format msgid "invalid trailing option -- %c" msgstr "geçersiz seçenek -- %c" @@ -4695,86 +4751,86 @@ msgstr "" msgid "cannot get effective UID" msgstr "%s izlenemedi" -#: src/id.c:289 +#: src/id.c:311 #, fuzzy, c-format -msgid "cannot find name for user ID %lu" +msgid "cannot find name for user ID %s" msgstr "%u kullanıcı kimliğinin ismi bulunamıyor" -#: src/id.c:309 +#: src/id.c:329 #, c-format -msgid "uid=%lu" +msgid "uid=%s" msgstr "" -#: src/id.c:314 +#: src/id.c:334 #, c-format -msgid " gid=%lu" +msgid " gid=%s" msgstr "" -#: src/id.c:321 +#: src/id.c:341 #, c-format -msgid " euid=%lu" +msgid " euid=%s" msgstr "" -#: src/id.c:329 +#: src/id.c:349 #, c-format -msgid " egid=%lu" +msgid " egid=%s" msgstr "" -#: src/id.c:357 +#: src/id.c:377 msgid " groups=" msgstr " gruplar=" -#: src/id.c:373 +#: src/id.c:393 #, c-format msgid " context=%s" msgstr "" -#: src/install.c:372 +#: src/install.c:373 #, fuzzy, c-format msgid "warning: %s: failed to change context to %s" msgstr "uyarı: %s dizinine geçilemiyor" -#: src/install.c:413 +#: src/install.c:414 #, c-format msgid "creating directory %s" msgstr "dizin %s oluşturuluyor" -#: src/install.c:481 +#: src/install.c:482 #, c-format msgid "cannot change ownership of %s" msgstr "%s'in sahipliği değiştirilemiyor" -#: src/install.c:505 +#: src/install.c:506 #, c-format msgid "cannot set time stamps for %s" msgstr "%s için zaman damgalama yapılamadı" -#: src/install.c:526 src/split.c:412 src/timeout.c:387 +#: src/install.c:527 src/split.c:426 src/timeout.c:439 #, c-format msgid "fork system call failed" msgstr "fork sistem çağrısı başarısız" -#: src/install.c:530 +#: src/install.c:531 #, fuzzy, c-format msgid "cannot run %s" msgstr "strip çalıştırılamadı" -#: src/install.c:534 +#: src/install.c:535 #, fuzzy, c-format msgid "waiting for strip" msgstr "%s'e yazılıyor" -#: src/install.c:536 +#: src/install.c:537 #, c-format msgid "strip process terminated abnormally" msgstr "" -#: src/install.c:557 +#: src/install.c:558 #, c-format msgid "invalid user %s" msgstr "geçersiz kullanıcı %s" -#: src/install.c:593 +#: src/install.c:594 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -4787,7 +4843,7 @@ msgstr "" " veya: %s [SEÇENEK]... -t DİZİN KAYNAK...\n" " veya: %s [SEÇENEK]... -d DİZİN...\n" -#: src/install.c:600 +#: src/install.c:601 #, fuzzy msgid "" "\n" @@ -4800,7 +4856,6 @@ msgid "" "In the first three forms, copy SOURCE to DEST or multiple SOURCE(s) to\n" "the existing DIRECTORY, while setting permission modes and owner/group.\n" "In the 4th form, create all components of the given DIRECTORY(ies).\n" -"\n" msgstr "" "İlk üç biçemde KAYNAK'ı HEDEF'e veya birden fazla KAYNAK'ı mevcut DİZİN'e\n" "kopyalar, aynı zamanda izin kiplerini ve sahip/grup bilgilerini atar.\n" @@ -4873,53 +4928,53 @@ msgid "" "directories\n" msgstr "" -#: src/install.c:858 +#: src/install.c:859 #, c-format msgid "" "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled" msgstr "" -#: src/install.c:868 +#: src/install.c:869 #, c-format msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled" msgstr "" -#: src/install.c:885 +#: src/install.c:886 #, 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:888 +#: src/install.c:889 #, c-format msgid "target directory not allowed when installing a directory" msgstr "bir dizin kurulurken hedef dizin belirlenemez" -#: src/install.c:892 +#: src/install.c:893 #, c-format msgid "cannot force target context to %s and preserve it" msgstr "" -#: src/install.c:946 src/mkdir.c:202 src/stdbuf.c:327 +#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326 #, c-format msgid "invalid mode %s" msgstr "geçersiz kip %s" -#: src/install.c:953 +#: src/install.c:954 #, c-format msgid "WARNING: ignoring --strip-program option as -s option was not specified" msgstr "" -#: src/install.c:958 +#: src/install.c:959 #, 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:965 +#: src/install.c:966 #, fuzzy, c-format msgid "options --compare (-C) and --strip are mutually exclusive" msgstr "tarih belirten bu seçenekler birlikte kullanılamaz" -#: src/install.c:971 +#: src/install.c:972 #, c-format msgid "" "the --compare (-C) option is ignored when you specify a mode with non-" @@ -4927,7 +4982,7 @@ msgid "" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/join.c:40 src/sort.c:65 +#: src/join.c:40 src/sort.c:66 #, fuzzy msgid "Mike Haertel" msgstr "Mike Haertel ve Paul Eggert" @@ -5011,7 +5066,7 @@ msgstr "" #: src/join.c:403 #, c-format -msgid "%s:%ju: is not sorted: %.*s" +msgid "%s:%<PRIuMAX>: is not sorted: %.*s" msgstr "" #: src/join.c:840 src/join.c:1038 @@ -5039,12 +5094,12 @@ msgstr "" msgid "conflicting empty-field replacement strings" msgstr "" -#: src/join.c:1101 src/sort.c:4414 +#: src/join.c:1101 src/sort.c:4468 #, 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:4419 +#: src/join.c:1105 src/sort.c:4473 #, c-format msgid "incompatible tabs" msgstr "uyumsuz sekme" @@ -5066,14 +5121,13 @@ msgstr "" " ya da: %s -t [SİNYAL]...\n" #: src/kill.c:82 -msgid "" -"Send signals to processes, or list signals.\n" -"\n" +#, fuzzy +msgid "Send signals to processes, or list signals.\n" msgstr "" "İşlemlere sinyal yollar veya sinyalleri listeler.\n" "\n" -#: src/kill.c:89 +#: src/kill.c:88 msgid "" " -s, --signal=SIGNAL, -SIGNAL\n" " specify the name or number of the signal to be sent\n" @@ -5088,7 +5142,7 @@ msgstr "" " numaraları arasında dönüşüm yapar.\n" " -t, --table Sinyal bilgileri tablosu gösterir.\n" -#: src/kill.c:97 +#: src/kill.c:96 #, fuzzy msgid "" "\n" @@ -5101,32 +5155,32 @@ msgstr "" "veya bir sinyalle sonlanmış işlemin çıkış durumu olabilir.\n" "PID bir tamsayıdır; eğer negatif ise bir işlem grubunu tanımlar.\n" -#: src/kill.c:206 +#: src/kill.c:205 #, c-format msgid "%s: invalid process id" msgstr "%s: geçersiz işlem kimlik no" -#: src/kill.c:260 +#: src/kill.c:259 #, c-format msgid "invalid option -- %c" msgstr "geçersiz seçenek -- %c" -#: src/kill.c:269 +#: src/kill.c:268 #, c-format msgid "%s: multiple signals specified" msgstr "%s: birden fazla sinyal belirtilmiş" -#: src/kill.c:283 +#: src/kill.c:282 #, c-format msgid "multiple -l or -t options specified" msgstr "birden fazla -l veya -t seçeneği belirtilmiş" -#: src/kill.c:300 +#: src/kill.c:299 #, c-format msgid "cannot combine signal with -l or -t" msgstr "sinyal, -l veya -t ile birleştirilemez" -#: src/kill.c:306 +#: src/kill.c:305 #, c-format msgid "no process ID specified" msgstr "süreç kimliği belirtilmemiş" @@ -5238,7 +5292,6 @@ msgid "" "When creating hard links, each TARGET must exist. Symbolic links\n" "can hold arbitrary text; if later resolved, a relative link is\n" "interpreted in relation to its parent directory.\n" -"\n" msgstr "" "1. formda, belirlenen HEDEF'e, opsiyonel BAĞ_ADI ile bir bağ oluşturur.\n" "2. formda, HEDEF'e mevcut dizinde bir bağ oluşturur.\n" @@ -5248,7 +5301,7 @@ msgstr "" "mevcut olmak zorundadır.\n" "\n" -#: src/ln.c:395 +#: src/ln.c:394 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -5270,7 +5323,7 @@ msgstr "" " bu işlem başarısız olacaktır)\n" " -f, --force önceden var olan hedef dosyaları siler\n" -#: src/ln.c:403 +#: src/ln.c:402 #, fuzzy msgid "" " -i, --interactive prompt whether to remove destinations\n" @@ -5288,7 +5341,7 @@ msgstr "" " -i, --interactive hedefleri silmeden önce sorar\n" " -s, --symbolic sabit bağ yerine sembolik bağ oluşturur\n" -#: src/ln.c:412 +#: src/ln.c:411 #, fuzzy msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -5303,26 +5356,12 @@ 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:428 -#, fuzzy +#: src/ln.c:433 +#, c-format 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" - -#: src/ln.c:435 -#, c-format -msgid "" -"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" +"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 "" #: src/ln.c:554 @@ -5393,7 +5432,7 @@ 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:1976 +#: src/ls.c:1750 src/ptx.c:1975 #, c-format msgid "invalid line width: %s" msgstr "geçersiz satır genişliği: %s" @@ -5457,7 +5496,7 @@ msgstr "dizin %s okunuyor" msgid "closing directory %s" msgstr "%s dizini kapatılıyor" -#: src/ls.c:3301 +#: src/ls.c:3302 #, c-format msgid "cannot compare file names %s and %s" msgstr "%s ve %s dosya adları karşılaştırılamaz" @@ -5467,14 +5506,13 @@ msgstr "%s ve %s dosya adları karşılaştırılamaz" msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" -"\n" msgstr "" "DOSYA(lar) hakkında bilgileri listeler (öntanımlı olarak şimdiki dizinde).\n" "Eğer -cftuSUX veya --sort seçenekleri verilmemiş ise girdileri alfabetik\n" "sıralar.\n" "\n" -#: src/ls.c:4729 +#: src/ls.c:4728 #, fuzzy msgid "" " -a, --all do not ignore entries starting with .\n" @@ -5489,7 +5527,7 @@ msgstr "" " -b, --escape grafik olmayan karakterleri sekizlik\n" " değerlerle gösterir\n" -#: src/ls.c:4735 +#: src/ls.c:4734 #, fuzzy msgid "" " --block-size=SIZE scale sizes by SIZE before printing them. E." @@ -5511,7 +5549,7 @@ 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:4745 +#: src/ls.c:4744 #, fuzzy msgid "" " -C list entries by columns\n" @@ -5535,7 +5573,7 @@ msgstr "" " sembolik bağları izlemez.\n" " -D, --dired Emacs dired kipine uygun çıktı verir\n" -#: src/ls.c:4753 +#: src/ls.c:4752 #, fuzzy msgid "" " -f do not sort, enable -aU, disable -ls --color\n" @@ -5554,11 +5592,11 @@ msgstr "" " -1 tek sütun, -l uzun, -C dikey\n" " --full-time -l --time-style=full-iso gibi\n" -#: src/ls.c:4761 +#: src/ls.c:4760 msgid " -g like -l, but do not list owner\n" msgstr "" -#: src/ls.c:4764 +#: src/ls.c:4763 msgid "" " --group-directories-first\n" " group directories before files.\n" @@ -5566,7 +5604,7 @@ msgid "" " use of --sort=none (-U) disables grouping\n" msgstr "" -#: src/ls.c:4770 +#: src/ls.c:4769 #, fuzzy msgid "" " -G, --no-group in a long listing, don't print group names\n" @@ -5581,7 +5619,7 @@ msgstr "" " -H, --si yukarıdaki gibi fakat 1000'in katlarını kullanır,\n" " 1024'ün değil.\n" -#: src/ls.c:4776 +#: src/ls.c:4775 #, fuzzy msgid "" " -H, --dereference-command-line\n" @@ -5608,7 +5646,7 @@ msgstr "" " --hide=KALIP KALIP'a uyan örtük girdileri göstermez\n" " (-a veya -A ile etkisizleştirilir)\n" -#: src/ls.c:4786 +#: src/ls.c:4785 #, fuzzy msgid "" " --indicator-style=WORD append indicator with style WORD to entry " @@ -5629,7 +5667,7 @@ msgstr "" " göstermez\n" " -k --block-size=1K gibi\n" -#: src/ls.c:4796 +#: src/ls.c:4795 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5646,7 +5684,7 @@ msgstr "" " bilgilerini değil\n" " -m satırı virgül ayraçlı girdilerle doldurur\n" -#: src/ls.c:4804 +#: src/ls.c:4803 #, fuzzy msgid "" " -n, --numeric-uid-gid like -l, but list numeric user and group IDs\n" @@ -5666,7 +5704,7 @@ msgstr "" " kullanır\n" " -p, --file-type bilgilere belirteç ekler ( /=@| dan biri) \n" -#: src/ls.c:4812 +#: src/ls.c:4811 #, fuzzy msgid "" " -q, --hide-control-chars print ? instead of non graphic characters\n" @@ -5691,7 +5729,7 @@ msgstr "" " shell-always (her zaman kabuk), c (C dili), \n" " escape (kaçış karakterli)\n" -#: src/ls.c:4821 +#: src/ls.c:4820 #, fuzzy msgid "" " -r, --reverse reverse order while sorting\n" @@ -5704,7 +5742,7 @@ msgstr "" " -s, --size -l ile her dosyanın boyutunu blok olarak\n" " gösterir\n" -#: src/ls.c:4826 +#: src/ls.c:4825 #, fuzzy msgid "" " -S sort by file size\n" @@ -5733,7 +5771,7 @@ msgstr "" " status (durum); eğer --sort=time belirtilmişse\n" " seçilen zaman değerine göre sıralar.\n" -#: src/ls.c:4836 +#: src/ls.c:4835 #, fuzzy msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" @@ -5758,13 +5796,13 @@ 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:4845 +#: src/ls.c:4844 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:4849 +#: src/ls.c:4848 #, fuzzy msgid "" " -u with -lt: sort by, and show, access time\n" @@ -5782,7 +5820,7 @@ msgstr "" "gösterir\n" " -v sürüme göre sıralar\n" -#: src/ls.c:4856 +#: src/ls.c:4855 #, fuzzy msgid "" " -w, --width=COLS assume screen width instead of current value\n" @@ -5797,7 +5835,7 @@ msgstr "" " -X girdi sonekine göre alfabetik sıralar\n" " -1 her satıra bir dosya olarak listeler\n" -#: src/ls.c:4866 +#: src/ls.c:4865 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5806,7 +5844,7 @@ msgid "" "variable can change the settings. Use the dircolors command to set it.\n" msgstr "" -#: src/ls.c:4873 +#: src/ls.c:4872 msgid "" "\n" "Exit status:\n" @@ -5831,7 +5869,7 @@ msgstr "" msgid "David Madore" msgstr "" -#: src/md5sum.c:162 +#: src/md5sum.c:164 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -5844,13 +5882,13 @@ msgstr "" "%s (%d-bit) sağlama toplamlarını kontrol eder veya yazar.\n" "DOSYA adı verilmediğinde veya - olduğunda standart girdiden okur.\n" -#: src/md5sum.c:172 +#: src/md5sum.c:174 msgid "" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr "" -#: src/md5sum.c:176 +#: src/md5sum.c:178 #, fuzzy msgid " -b, --binary read in binary mode\n" msgstr "" @@ -5858,21 +5896,25 @@ msgstr "" " -B, --binary konsol aygıtına yazarken ikilik yazma kullanır.\n" "\n" -#: src/md5sum.c:179 +#: src/md5sum.c:181 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr "" -#: src/md5sum.c:183 +#: src/md5sum.c:184 +msgid " --tag create a BSD-style checksum\n" +msgstr "" + +#: src/md5sum.c:188 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" -#: src/md5sum.c:187 +#: src/md5sum.c:192 msgid " -t, --text read in text mode (default)\n" msgstr "" -#: src/md5sum.c:190 +#: src/md5sum.c:195 #, fuzzy msgid "" "\n" @@ -5890,12 +5932,12 @@ msgstr "" " uyarı verir\n" "\n" -#: src/md5sum.c:198 +#: src/md5sum.c:203 msgid "" " --strict with --check, exit non-zero for any invalid input\n" msgstr "" -#: src/md5sum.c:203 +#: src/md5sum.c:208 #, fuzzy, c-format msgid "" "\n" @@ -5910,49 +5952,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:502 +#: src/md5sum.c:523 #, c-format msgid "%s: too many checksum lines" msgstr "%s: çok fazla sağlama satırı" -#: src/md5sum.c:526 +#: src/md5sum.c:547 #, c-format msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line" msgstr "%s: %<PRIuMAX>: yanlış biçemlenmiş %s sağlama satırı" -#: src/md5sum.c:551 +#: src/md5sum.c:572 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s:açma veya okuma BAŞARISIZ\n" -#: src/md5sum.c:574 +#: src/md5sum.c:595 msgid "FAILED" msgstr "BAŞARISIZ" -#: src/md5sum.c:576 +#: src/md5sum.c:597 msgid "OK" msgstr "Tamam" -#: src/md5sum.c:600 +#: src/md5sum.c:621 #, 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:610 +#: src/md5sum.c:631 #, 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:618 +#: src/md5sum.c:639 #, 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:626 +#: src/md5sum.c:647 #, fuzzy, c-format msgid "WARNING: %<PRIuMAX> computed checksum did NOT match" msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match" @@ -5961,29 +6003,39 @@ msgstr[0] "" msgstr[1] "" "UYARI: Hesaplanmış sağlamaların %<PRIuMAX> / %<PRIuMAX> kısmı eşleşmedi" -#: src/md5sum.c:704 +#: src/md5sum.c:760 +#, c-format +msgid "--tag does not support --text mode" +msgstr "" + +#: src/md5sum.c:766 +#, 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 #, 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:712 +#: src/md5sum.c:781 #, 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:719 +#: src/md5sum.c:788 #, 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:726 +#: src/md5sum.c:795 #, 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:733 +#: src/md5sum.c:802 #, 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ı" @@ -5994,14 +6046,13 @@ msgid "Usage: %s [OPTION]... DIRECTORY...\n" msgstr "Kullanım: %s [SEÇENEK]... DİZİN...\n" #: src/mkdir.c:57 -msgid "" -"Create the DIRECTORY(ies), if they do not already exist.\n" -"\n" +#, 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:64 +#: src/mkdir.c:63 #, fuzzy msgid "" " -m, --mode=MODE set file mode (as in chmod), not a=rwx - umask\n" @@ -6016,7 +6067,7 @@ 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:169 +#: src/mkdir.c:168 #, c-format msgid "created directory %s" msgstr "dizin %s oluşturuldu" @@ -6027,14 +6078,13 @@ msgid "Usage: %s [OPTION]... NAME...\n" msgstr "Kullanımı: %s [SEÇENEK]... İSİM...\n" #: src/mkfifo.c:52 -msgid "" -"Create named pipes (FIFOs) with the given NAMEs.\n" -"\n" +#, 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:59 src/mknod.c:61 +#: src/mkfifo.c:58 src/mknod.c:60 #, fuzzy msgid "" " -m, --mode=MODE set file permission bits to MODE, not a=rw - umask\n" @@ -6042,17 +6092,17 @@ 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:62 +#: src/mkfifo.c:61 msgid "" " -Z, --context=CTX set the SELinux security context of each NAME to CTX\n" msgstr "" -#: src/mkfifo.c:122 src/mknod.c:128 +#: src/mkfifo.c:121 src/mknod.c:127 #, c-format msgid "invalid mode" msgstr "geçersiz kip" -#: src/mkfifo.c:127 src/mknod.c:133 +#: src/mkfifo.c:126 src/mknod.c:132 #, c-format msgid "mode must specify only file permission bits" msgstr "" @@ -6063,18 +6113,17 @@ 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 -msgid "" -"Create the special file NAME of the given TYPE.\n" -"\n" +#, 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:64 +#: src/mknod.c:63 msgid " -Z, --context=CTX set the SELinux security context of NAME to CTX\n" msgstr "" -#: src/mknod.c:69 +#: src/mknod.c:68 msgid "" "\n" "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n" @@ -6089,7 +6138,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:76 +#: src/mknod.c:75 msgid "" "\n" " b create a block (buffered) special file\n" @@ -6101,40 +6150,40 @@ msgstr "" " c, u özel karakter (önbellekli) dosyası oluşturur\n" " p FIFO oluşturur\n" -#: src/mknod.c:151 +#: src/mknod.c:150 msgid "Special files require major and minor device numbers." msgstr "Özel dosyalar, majör ve minör aygıt numaraları gerektirir." -#: src/mknod.c:161 +#: src/mknod.c:160 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:177 +#: src/mknod.c:176 #, c-format msgid "block special files not supported" msgstr "özel blok dosyalar desteklenmiyor" -#: src/mknod.c:186 +#: src/mknod.c:185 #, c-format msgid "character special files not supported" msgstr "özel karakter dosyaları desteklenmiyor" -#: src/mknod.c:202 +#: src/mknod.c:201 #, c-format msgid "invalid major device number %s" msgstr "geçersiz majör aygıt numarası %s" -#: src/mknod.c:207 +#: src/mknod.c:206 #, c-format msgid "invalid minor device number %s" msgstr "geçersiz minör aygıt numarası %s" -#: src/mknod.c:212 +#: src/mknod.c:211 #, c-format msgid "invalid device %s %s" msgstr "geçersiz aygıt %s %s" -#: src/mknod.c:226 +#: src/mknod.c:225 #, c-format msgid "invalid device type %s" msgstr "geçersiz aygıt türü %s" @@ -6193,60 +6242,59 @@ msgid "" " directory specified via -p; else /tmp [deprecated]\n" msgstr "" -#: src/mktemp.c:222 +#: src/mktemp.c:223 #, fuzzy, c-format msgid "failed to redirect stderr to /dev/null" msgstr "standart hata yeniden yönlendirilemedi" -#: src/mktemp.c:228 +#: src/mktemp.c:229 #, fuzzy, c-format msgid "too many templates" msgstr "çok fazla tekrar eden satır" -#: src/mktemp.c:248 +#: src/mktemp.c:249 #, c-format msgid "with --suffix, template %s must end in X" msgstr "" -#: src/mktemp.c:273 src/split.c:1117 +#: src/mktemp.c:274 src/split.c:1130 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "" -#: src/mktemp.c:278 +#: src/mktemp.c:279 #, c-format msgid "too few X's in template %s" msgstr "" -#: src/mktemp.c:291 +#: src/mktemp.c:292 #, c-format msgid "invalid template, %s, contains directory separator" msgstr "" -#: src/mktemp.c:305 +#: src/mktemp.c:306 #, c-format msgid "invalid template, %s; with --tmpdir, it may not be absolute" msgstr "" -#: src/mktemp.c:325 +#: src/mktemp.c:326 #, fuzzy, c-format msgid "failed to create directory via template %s" msgstr "%s dizini oluşturulamıyor" -#: src/mktemp.c:335 +#: src/mktemp.c:336 #, fuzzy, c-format msgid "failed to create file via template %s" msgstr "%s'in zaman damgaları korunamadı" -#: src/mv.c:290 -msgid "" -"Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" -"\n" +#: src/mv.c:292 +#, 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:297 +#: src/mv.c:298 #, fuzzy msgid "" " --backup[=CONTROL] make a backup of each existing destination " @@ -6266,7 +6314,7 @@ msgstr "" " -i, --interactive üzerine yazmadan önce sorar\n" " --reply=query ile aynı\n" -#: src/mv.c:306 +#: src/mv.c:307 #, fuzzy msgid "" " --strip-trailing-slashes remove any trailing slashes from each " @@ -6284,7 +6332,7 @@ msgstr "" " -S, --suffix=SONEK öntanımlı sonek yerine SONEK değerini " "kullanır.\n" -#: src/mv.c:311 +#: src/mv.c:312 msgid "" " -t, --target-directory=DIRECTORY move all SOURCE arguments into " "DIRECTORY\n" @@ -6311,10 +6359,8 @@ msgstr "Kullanımı: %s [SEÇENEK] [KOMUT [ARG]...]\n" #, fuzzy, c-format msgid "" "Run COMMAND with an adjusted niceness, which affects process scheduling.\n" -"With no COMMAND, print the current niceness. Nicenesses range from\n" -"%d (most favorable scheduling) to %d (least favorable).\n" -"\n" -" -n, --adjustment=N add integer N to the niceness (default 10)\n" +"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 "" "KOMUTu ayarlanan işlem önceliğinde çalıştırır.\n" "KOMUT verilmezse, mevcut işlem önceliğini gösterir. Öncelik sıralaması\n" @@ -6323,22 +6369,26 @@ msgstr "" " -n, --adjustment=AYAR AYAR değerini şimdiki öncelik değerine ekler\n" " (öntanımlı 10)\n" -#: src/nice.c:168 +#: src/nice.c:82 +msgid " -n, --adjustment=N add integer N to the niceness (default 10)\n" +msgstr "" + +#: src/nice.c:172 #, fuzzy, c-format msgid "invalid adjustment %s" msgstr "`%s' geçersiz ayar" -#: src/nice.c:177 +#: src/nice.c:181 #, c-format msgid "a command must be given with an adjustment" msgstr "komut ayarlama ile birlikte verilmeli" -#: src/nice.c:184 src/nice.c:195 +#: src/nice.c:188 src/nice.c:199 #, fuzzy, c-format msgid "cannot get niceness" msgstr "sistem ismi alınamadı" -#: src/nice.c:201 +#: src/nice.c:205 #, fuzzy, c-format msgid "cannot set niceness" msgstr "tarih ayarlanamadı" @@ -6348,18 +6398,18 @@ msgstr "tarih ayarlanamadı" msgid "Scott Bartram" msgstr "" -#: src/nl.c:186 +#: 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" -"\n" msgstr "" "Satır başlarına satır numarası koyarak her DOSYA'yı standart çıktıya " "yazdırır.\n" "DOSYA adı verilmemişse, veya - olarak verilmişse, standart girdiden okur.\n" "\n" -#: src/nl.c:194 +#: src/nl.c:186 msgid "" " -b, --body-numbering=STYLE use STYLE for numbering body lines\n" " -d, --section-delimiter=CC use CC for separating logical pages\n" @@ -6370,7 +6420,7 @@ msgstr "" "kullanır\n" " -f, --footer-numbering=TARZ altyazıları TARZ tarzında numaralandırır\n" -#: src/nl.c:199 +#: src/nl.c:191 #, fuzzy msgid "" " -h, --header-numbering=STYLE use STYLE for numbering header lines\n" @@ -6392,7 +6442,7 @@ msgstr "" " numaralarını baştan başlatmaz\n" " -s, --number-separator=DİZGE satır numarasından sonra DİZGE yazdırır\n" -#: src/nl.c:207 +#: src/nl.c:199 #, fuzzy msgid "" " -v, --starting-line-number=NUMBER first line number on each logical page\n" @@ -6401,7 +6451,7 @@ msgstr "" " -v, --first-page=SAYI her mantıksal sayfanın ilk satır numarası\n" " -w, --number-width=SAYI satır numarası genişliğini SAYI yapar\n" -#: src/nl.c:213 +#: src/nl.c:205 msgid "" "\n" "By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC are\n" @@ -6416,7 +6466,7 @@ msgstr "" "karakter verilmemişse :. kabul edilir. \\. elde etmek için \\\\ yazılır. \n" "TARZ, aşağıdaki değerlerden biri olarak belirtilmelidir: \n" -#: src/nl.c:219 +#: src/nl.c:211 #, fuzzy msgid "" "\n" @@ -6448,52 +6498,47 @@ msgstr "" " rz sağa dayalı yazdırır, numaraların başlarına sıfır koyar\n" "\n" -#: src/nl.c:286 +#: src/nl.c:278 #, c-format msgid "line number overflow" msgstr "satır numarası taşması" -#: src/nl.c:486 +#: src/nl.c:478 #, c-format msgid "invalid header numbering style: %s" msgstr "geçersiz başlık numaralama tarzı: %s" -#: src/nl.c:494 +#: src/nl.c:486 #, c-format msgid "invalid body numbering style: %s" msgstr "geçersiz gövde numaralama tarzı: %s" -#: src/nl.c:502 +#: src/nl.c:494 #, c-format msgid "invalid footer numbering style: %s" msgstr "geçersiz altbilgi numaralama tarzı: %s" -#: src/nl.c:511 +#: src/nl.c:503 #, c-format msgid "invalid starting line number: %s" msgstr "geçersiz başlangıç satır numarası: %s" -#: src/nl.c:517 -#, fuzzy, c-format -msgid "WARNING: --page-increment is deprecated; use --line-increment instead" -msgstr "--allow-missing seçeneği kaldırılacaktır; yerine --retry kullanın" - -#: src/nl.c:524 +#: src/nl.c:512 #, c-format msgid "invalid line number increment: %s" msgstr "geçersiz satır numarası artışı: %s" -#: src/nl.c:536 +#: src/nl.c:524 #, c-format msgid "invalid number of blank lines: %s" msgstr "geçersiz boş satır sayısı: %s" -#: src/nl.c:550 +#: src/nl.c:538 #, c-format msgid "invalid line number field width: %s" msgstr "geçersiz satır numarası alan genişliği: %s" -#: src/nl.c:569 +#: src/nl.c:557 #, c-format msgid "invalid line numbering format: %s" msgstr "geçersiz satır numaralama biçemi: %s" @@ -6537,11 +6582,6 @@ msgstr "standart çıktı yeniden yönlendirilemedi" msgid "ignoring input" msgstr "argümanların tamamı yoksayılıyor" -#: src/nohup.c:163 src/nohup.c:165 -#, c-format -msgid "failed to open %s" -msgstr "%s açılamadı" - #: src/nohup.c:175 #, fuzzy, c-format msgid "ignoring input and appending output to %s" @@ -6573,33 +6613,368 @@ msgid "failed to redirect standard error" msgstr "standart hata yeniden yönlendirilemedi" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:32 +#: src/nproc.c:33 msgid "Giuseppe Scrivano" msgstr "" -#: src/nproc.c:56 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 +#: src/nproc.c:57 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Kullanım: %s [SEÇENEK]...\n" -#: src/nproc.c:57 +#: src/nproc.c:58 msgid "" "Print the number of processing units available to the current process,\n" "which may be less than the number of online processors\n" "\n" msgstr "" -#: src/nproc.c:62 +#: src/nproc.c:63 msgid "" " --all print the number of installed processors\n" " --ignore=N if possible, exclude N processing units\n" msgstr "" -#: src/nproc.c:106 +#: src/nproc.c:107 #, fuzzy, c-format 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 +msgid "Assaf Gordon" +msgstr "" + +#: src/numfmt.c:676 +#, fuzzy, c-format +msgid "value too large to be converted: '%s'" +msgstr "%s: değer tamamen dönüştürülmedi" + +#: src/numfmt.c:680 +#, fuzzy, c-format +msgid "invalid number: '%s'" +msgstr "geçersiz sayı %s" + +#: src/numfmt.c:684 +#, c-format +msgid "rejecting suffix in input: '%s' (consider using --from)" +msgstr "" + +#: src/numfmt.c:688 +#, fuzzy, c-format +msgid "invalid suffix in input: '%s'" +msgstr "tamsayı argüman olarak `%s' geçersiz" + +#: src/numfmt.c:692 +#, c-format +msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)" +msgstr "" + +#: src/numfmt.c:723 +#, fuzzy, c-format +msgid "failed to prepare value '%Lf' for printing" +msgstr "%s: yazmak için açılamadı" + +#: src/numfmt.c:787 +#, fuzzy, c-format +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 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [NUMBER]...\n" +msgstr "Kullanımı: %s [SEÇENEK]... [KULLANICI]...\n" + +#: src/numfmt.c:816 +msgid "" +"Reformat NUMBER(s), or the numbers from standard input if none are " +"specified.\n" +msgstr "" + +#: src/numfmt.c:820 +msgid " --debug print warnings about invalid input\n" +msgstr "" + +#: src/numfmt.c:823 +msgid "" +" -d, --delimiter=X use X instead of whitespace for field delimiter\n" +msgstr "" + +#: src/numfmt.c:826 +msgid "" +" --field=N replace the number in input field N (default is 1)\n" +msgstr "" + +#: src/numfmt.c:829 +msgid "" +" --format=FORMAT use printf style floating-point FORMAT;\n" +" see FORMAT below for details\n" +msgstr "" + +#: src/numfmt.c:833 +msgid "" +" --from=UNIT auto-scale input numbers to UNITs; default is " +"'none';\n" +" see UNIT below\n" +msgstr "" + +#: src/numfmt.c:837 +msgid "" +" --from-unit=N specify the input unit size (instead of the default " +"1)\n" +msgstr "" + +#: src/numfmt.c:840 +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 "" + +#: src/numfmt.c:844 +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 +msgid "" +" --invalid=MODE failure mode for invalid numbers: MODE can be:\n" +" abort (default), fail, warn, ignore\n" +msgstr "" + +#: src/numfmt.c:852 +msgid "" +" --padding=N pad the output to N characters; positive N will\n" +" right-align; negative N will left-align;\n" +" padding is ignored if the output is wider than N;\n" +" the default is to automatically pad if a " +"whitespace\n" +" is found\n" +msgstr "" + +#: src/numfmt.c:859 +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 +msgid "" +" --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" +" SUFFIX in input numbers\n" +msgstr "" + +#: src/numfmt.c:867 +msgid "" +" --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" +msgstr "" + +#: src/numfmt.c:870 +msgid "" +" --to-unit=N the output unit size (instead of the default 1)\n" +msgstr "" + +#: src/numfmt.c:877 +msgid "" +"\n" +"UNIT options:\n" +msgstr "" + +#: src/numfmt.c:880 +msgid " none no auto-scaling is done; suffixes will trigger an error\n" +msgstr "" + +#: src/numfmt.c:883 +msgid "" +" auto accept optional single/two letter suffix:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" +msgstr "" + +#: src/numfmt.c:889 +msgid "" +" si accept optional single letter suffix:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:894 +msgid "" +" iec accept optional single letter suffix:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:899 +msgid "" +" iec-i accept optional two-letter suffix:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:905 +#, 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" +msgstr "" + +#: src/numfmt.c:912 +#, c-format +msgid "" +"\n" +"Exit status is 0 if all input numbers were successfully converted.\n" +"By default, %s will stop at the first conversion error with exit status 2.\n" +"With --invalid='fail' a warning is printed for each conversion error\n" +"and the exit status is 2. With --invalid='warn' each conversion error is\n" +"diagnosed, but the exit status is 0. With --invalid='ignore' conversion\n" +"errors are not diagnosed and the exit status is 0.\n" +msgstr "" + +#: src/numfmt.c:921 +#, c-format +msgid "" +"\n" +"Examples:\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" +msgstr "" + +#: src/numfmt.c:974 src/seq.c:212 +#, fuzzy, c-format +msgid "format %s has no %% directive" +msgstr "hedef %s bir dizin değil" + +#: src/numfmt.c:990 +#, 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 +#, c-format +msgid "format %s ends in %%" +msgstr "" + +#: src/numfmt.c:1010 +#, c-format +msgid "invalid format %s, directive must be %%['][-][N]f" +msgstr "" + +#: src/numfmt.c:1018 src/seq.c:236 +#, 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 "tamsayı argüman olarak `%s' geçersiz" + +#: src/numfmt.c:1092 +#, c-format +msgid "value too large to be printed: '%Lg' (consider using --to)" +msgstr "" + +#: src/numfmt.c:1100 +#, c-format +msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" +msgstr "" + +#: src/numfmt.c:1184 +#, c-format +msgid "large input value '%s': possible precision loss" +msgstr "" + +#: src/numfmt.c:1293 +#, 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 "Geçersiz sayfa aralığı `%s'" + +#: src/numfmt.c:1401 +#, fuzzy, c-format +msgid "invalid field value '%s'" +msgstr "geçersiz alan numarası: `%s'" + +#: src/numfmt.c:1430 +#, fuzzy, c-format +msgid "invalid header value '%s'" +msgstr "`%s' geçerli bir zaman dizgesi değil" + +#: src/numfmt.c:1456 +#, 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 +#, fuzzy, c-format +msgid "no conversion option specified" +msgstr "birden fazla -l veya -t seçeneği belirtilmiş" + +#: src/numfmt.c:1471 +#, fuzzy, c-format +msgid "grouping cannot be combined with --to" +msgstr "Dosya işleyenleri --files0-from ile birleştirilemez" + +#: src/numfmt.c:1473 +#, c-format +msgid "grouping has no effect in this locale" +msgstr "" + +#: src/numfmt.c:1486 +#, c-format +msgid "--header ignored with command-line input" +msgstr "" + +#: src/numfmt.c:1511 +#, fuzzy, c-format +msgid "error reading input" +msgstr "%s'i okunurken hata" + +# +#: src/numfmt.c:1520 +#, fuzzy, c-format +msgid "failed to convert some of the input numbers" +msgstr "standart çıktı yeniden yönlendirilemedi" + #: src/od.c:294 #, c-format msgid "" @@ -6629,28 +7004,58 @@ msgstr "" "\n" #: src/od.c:307 -msgid "All arguments to long options are mandatory for short options.\n" +#, fuzzy +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" +"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" +"at first byte printed, incremented when dump is progressing.\n" +"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 "" -"Uzun seçenekler için zorunlu argümanlar kısa seçenekler için de zorunludur.\n" +"\n" +"Eğer birinci ve ikinci çağırış şekilleri beraber kullanılmış ise, son " +"işlenenin +\n" +"ile veya bir sayı ile başlaması veya iki işlenen olması halinde, 2. çağırış " +"şekli\n" +"varsayılır.\n" +"GORELI işleneni, -j GORELI anlamına gelir. ETİKET, ilk bayttaki sanal " +"adrestir, ve\n" +"yazdırma devam ettikçe artar.\n" +"GÖRELİ ve ETİKET için, 0x veya 0X öneki, 16'lık sayı anlamına gelir;\n" +"sonekler sekizlik sayılar için . ve 512 ile çarpılması için b olabilir.\n" +"\n" +"FORMAT aşağıdaki kısaltmalar kullanılarak oluşturulur:\n" +"\n" +" a karakter isimlerini yazar\n" +" (Örnek:'od -t a' tab karakteri gördüğünde 'ht' yazar)\n" +" c ASCII karakterler veya terskesme ile kaçışlar\n" +" c alfabe elemanlarını olduğu gibi kontrol karakterlerini\n" +" terskesikle gösteririldikleri gibi yazar\n" +" (Örnek: 'od -t c' tab karakteri gördüğünde '\t' yazar)\n" -#: src/od.c:310 +#: src/od.c:318 +#, fuzzy msgid "" -" -A, --address-radix=RADIX decide how file offsets are printed\n" +" -A, --address-radix=RADIX output format for file offsets. RADIX is one\n" +" of [doxn], for Decimal, Octal, Hex or None\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:314 +#: src/od.c:323 #, 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" -" --traditional accept arguments in traditional form\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=BAYT çıktıyı dosya başına BAYT baytla sınırlar\n" " -s, --strings[=SAYI] en az SAYI grafik karakter içeren dizgeler\n" @@ -6661,10 +7066,11 @@ msgstr "" " -w, --width[=BAYT] her satıra BAYT bayt yazar\n" " --traditional geleneksel formda argüman kabul eder\n" -#: src/od.c:324 +#: src/od.c:336 #, fuzzy 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" @@ -6680,7 +7086,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:332 +#: src/od.c:345 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -6695,48 +7101,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:340 -#, fuzzy +#: src/od.c:353 msgid "" "\n" -"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" -"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" -"at first byte printed, incremented when dump is progressing.\n" -"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ğer birinci ve ikinci çağırış şekilleri beraber kullanılmış ise, son " -"işlenenin +\n" -"ile veya bir sayı ile başlaması veya iki işlenen olması halinde, 2. çağırış " -"şekli\n" -"varsayılır.\n" -"GORELI işleneni, -j GORELI anlamına gelir. ETİKET, ilk bayttaki sanal " -"adrestir, ve\n" -"yazdırma devam ettikçe artar.\n" -"GÖRELİ ve ETİKET için, 0x veya 0X öneki, 16'lık sayı anlamına gelir;\n" -"sonekler sekizlik sayılar için . ve 512 ile çarpılması için b olabilir.\n" -"\n" -"FORMAT aşağıdaki kısaltmalar kullanılarak oluşturulur:\n" -"\n" -" a karakter isimlerini yazar\n" -" (Örnek:'od -t a' tab karakteri gördüğünde 'ht' yazar)\n" -" c ASCII karakterler veya terskesme ile kaçışlar\n" -" c alfabe elemanlarını olduğu gibi kontrol karakterlerini\n" -" terskesikle gösteririldikleri gibi yazar\n" -" (Örnek: 'od -t c' tab karakteri gördüğünde '\t' yazar)\n" - -#: src/od.c:349 -msgid "" "\n" "TYPE is made up of one or more of these specifications:\n" -"\n" " a named character, ignoring high-order bit\n" " c ASCII character or backslash escape\n" msgstr "" -#: src/od.c:356 +#: src/od.c:360 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -6752,10 +7126,11 @@ 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:363 +#: src/od.c:367 +#, fuzzy msgid "" "\n" -"SIZE is a number. For TYPE in doux, SIZE may also be C for\n" +"SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" "sizeof(char), S for sizeof(short), I for sizeof(int) or L for\n" "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" @@ -6768,46 +7143,40 @@ msgstr "" "F, sizeof(double) anlamına gelen D veya sizeof(long double) anlamına\n" "gelen L de gelebilir.\n" -#: src/od.c:370 -#, fuzzy +#: src/od.c:374 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" +"Adding a z suffix to any type displays printable characters at the end of\n" +"each 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." -#: src/od.c:380 +#: src/od.c:379 #, 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" +"\n" +"\n" +"BYTES is hex with 0x or 0X prefix, and may have a multiplier suffix:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"and so on for G, T, P, E, Z, Y.\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" +"\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" -#: src/od.c:633 src/od.c:753 +#: src/od.c:639 src/od.c:759 #, fuzzy, c-format msgid "invalid type string %s" msgstr "geçersiz format `%s'" -#: src/od.c:643 +#: src/od.c:649 #, fuzzy, c-format msgid "" "invalid type string %s;\n" @@ -6816,7 +7185,7 @@ msgstr "" "geçersiz format `%s';\n" "bu sistem, yerleşik %lu baytlık tamsayı türü desteklemiyor" -#: src/od.c:764 +#: src/od.c:770 #, fuzzy, c-format msgid "" "invalid type string %s;\n" @@ -6825,39 +7194,39 @@ msgstr "" "geçersiz format `%s';\n" "bu sistem %lu baytlık bir kayan ondalık (floating point) türü desteklemiyor" -#: src/od.c:822 +#: src/od.c:828 #, 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:1047 +#: src/od.c:1053 #, 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:1603 +#: src/od.c:1609 #, 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:1729 +#: src/od.c:1735 #, c-format msgid "no type may be specified when dumping strings" msgstr "dizgeler çıktılanırken tür belirtilemez" -#: src/od.c:1804 +#: src/od.c:1810 #, fuzzy msgid "compatibility mode supports at most one file" msgstr "Eski kullanım kipi en fazla bir dosya destekler." -#: src/od.c:1825 +#: src/od.c:1831 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "atlanacak baytlar + okunacak baytlar çok büyük" -#: src/od.c:1868 +#: src/od.c:1874 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "uyarı: geçersiz genişlik %lu; %d kullanılıyor" @@ -6873,18 +7242,18 @@ msgid "standard input is closed" msgstr "standart girdi kapalı" #: 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" -"\n" msgstr "" "Standart çıktıya her DOSYAdan aynı sırada olan satırları aralarına \n" "tablar koyarak yazar. DOSYA adı verilmediğinde veya - olduğunda standart\n" "girdiden okur\n" "\n" -#: src/paste.c:448 +#: 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" @@ -6893,7 +7262,7 @@ msgstr "" " -s, --serial Her dosyayı (paralel olarak yazmak yerine) \n" " arka arkaya yazar\n" -#: src/paste.c:509 +#: src/paste.c:508 #, c-format msgid "delimiter list ends with an unescaped backslash: %s" msgstr "" @@ -6950,80 +7319,80 @@ msgid "Kaveh Ghazi" msgstr "" #. TRANSLATORS: Real name is unknown; at most 19 characters. -#: src/pinky.c:250 +#: src/pinky.c:242 msgid " ???" msgstr "" #. TRANSLATORS: Idle time is unknown; at most 5 characters. -#: src/pinky.c:274 +#: src/pinky.c:266 msgid "?????" msgstr "" -#: src/pinky.c:323 +#: src/pinky.c:314 #, c-format msgid "Login name: " msgstr "Kullanıcı ismi:" -#: src/pinky.c:326 +#: src/pinky.c:317 #, c-format msgid "In real life: " msgstr "Gerçekte:" #. TRANSLATORS: Real name is unknown; no hard limit. -#: src/pinky.c:330 +#: src/pinky.c:321 msgid "???\n" msgstr "???\n" -#: src/pinky.c:350 +#: src/pinky.c:341 #, c-format msgid "Directory: " msgstr "Dizin:" -#: src/pinky.c:352 +#: src/pinky.c:343 #, c-format msgid "Shell: " msgstr "Kabuk:" -#: src/pinky.c:371 +#: src/pinky.c:362 #, c-format msgid "Project: " msgstr "Proje:" -#: src/pinky.c:395 +#: src/pinky.c:386 #, c-format msgid "Plan:\n" msgstr "Plan:\n" -#: src/pinky.c:414 +#: src/pinky.c:405 msgid "Login" msgstr "Giriş" -#: src/pinky.c:416 +#: src/pinky.c:407 msgid "Name" msgstr "İsim" -#: src/pinky.c:417 +#: src/pinky.c:408 msgid " TTY" msgstr " TTY" -#: src/pinky.c:419 +#: src/pinky.c:410 msgid "Idle" msgstr "Boşta" -#: src/pinky.c:420 +#: src/pinky.c:411 msgid "When" msgstr " zaman" -#: src/pinky.c:423 +#: src/pinky.c:414 msgid "Where" msgstr " yer" -#: src/pinky.c:502 +#: src/pinky.c:493 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Kullanımı: %s [SEÇENEK]... [KULLANICI]...\n" -#: src/pinky.c:503 +#: src/pinky.c:494 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7039,7 +7408,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:511 +#: src/pinky.c:502 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7055,7 +7424,7 @@ msgstr "" "zamanını\n" " göstermez\n" -#: src/pinky.c:520 +#: src/pinky.c:511 #, fuzzy, c-format msgid "" "\n" @@ -7066,7 +7435,7 @@ msgstr "" "Basit bir`finger' uygulaması; kullanıcı bilgilerini gösterir.\n" "utmp dosyası olarak %s kullanılacaktır.\n" -#: src/pinky.c:604 +#: src/pinky.c:595 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "" @@ -7083,87 +7452,86 @@ msgstr "" msgid "Roland Huebner" msgstr "Pete TerMaat ve Roland Huebner" -#: src/pr.c:912 +#: src/pr.c:908 #, fuzzy, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "`--pages=İLK_SAYFA[:SON_SAYFA]' argüman eksik" -#: src/pr.c:914 +#: src/pr.c:910 #, fuzzy, c-format msgid "invalid page range %s" msgstr "Geçersiz sayfa aralığı `%s'" -#: src/pr.c:979 +#: src/pr.c:975 #, fuzzy, c-format msgid "'-l PAGE_LENGTH' invalid number of lines: %s" msgstr "`-l SAYFA_UZUNLUĞU' geçersiz satır sayısı: `%s'" -#: src/pr.c:1003 +#: src/pr.c:999 #, fuzzy, c-format msgid "'-N NUMBER' invalid starting line number: %s" msgstr "`-N SAYI' geçersiz başlangıç satır numarası: `%s'" -#: src/pr.c:1015 +#: src/pr.c:1011 #, fuzzy, c-format msgid "'-o MARGIN' invalid line offset: %s" msgstr "`-o KENAR' geçersiz satır göreli konumu: `%s'" -#: src/pr.c:1056 +#: src/pr.c:1052 #, fuzzy, c-format msgid "'-w PAGE_WIDTH' invalid number of characters: %s" msgstr "`-w SAYFA_GENİŞLİĞİ' geçersiz harf sayısı: `%s'" -#: src/pr.c:1070 +#: src/pr.c:1066 #, fuzzy, c-format msgid "'-W PAGE_WIDTH' invalid number of characters: %s" msgstr "`-W SAYFA_GENİŞLİĞİ' geçersiz harf sayısı: `%s'" -#: src/pr.c:1100 +#: src/pr.c:1096 #, fuzzy, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "Paralel yazdırma yapılırken sütun sayısı belirtilemez." -#: src/pr.c:1104 +#: src/pr.c:1100 #, fuzzy, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "Hem paralel yazım, hem altalta yazım yapılamaz." -#: src/pr.c:1200 +#: src/pr.c:1196 #, fuzzy, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "`-%c' argüman içinde fazla harf veya geçersiz sayı: `%s'" -#: src/pr.c:1304 +#: src/pr.c:1293 #, c-format msgid "page width too narrow" msgstr "sayfa genişliği çok dar" -#: src/pr.c:2369 +#: src/pr.c:2353 #, c-format msgid "starting page number %<PRIuMAX> exceeds page count %<PRIuMAX>" msgstr "" "başlangıç sayfa numarası %<PRIuMAX> sayfa sayısı %<PRIuMAX> değerini aşıyor" -#: src/pr.c:2396 +#: src/pr.c:2380 #, fuzzy, c-format msgid "page number overflow" msgstr "Sayfa numarası taşması" -#: src/pr.c:2401 +#: src/pr.c:2385 #, c-format msgid "Page %<PRIuMAX>" msgstr "Sayfa %<PRIuMAX>" -#: src/pr.c:2773 -msgid "" -"Paginate or columnate FILE(s) for printing.\n" -"\n" +#: src/pr.c:2757 +#, fuzzy +msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" "DOSYA(ları)yı kolonlara ayırır veya sayfalandırır ve yazar .\n" "\n" # -#: src/pr.c:2780 +#: src/pr.c:2763 #, fuzzy msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" @@ -7182,7 +7550,7 @@ msgstr "" " Her sayfada tüm sütunların satır sayılarını \n" " aynı yapar\n" -#: src/pr.c:2788 +#: src/pr.c:2771 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7199,7 +7567,7 @@ msgstr "" " -d, --double-space\n" " çift aralık bırakarak yazar\n" -#: src/pr.c:2796 +#: src/pr.c:2779 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7220,7 +7588,7 @@ msgstr "" " yenisatır karakteri yerine (\\n) formfeed (\\f) \n" " karakteri kullanarak sayfaları ayırır\n" -#: src/pr.c:2806 +#: src/pr.c:2789 #, fuzzy msgid "" " -h, --header=HEADER\n" @@ -7247,7 +7615,7 @@ msgstr "" " kolonları hizalamaz, --sep-string[=KAR] ayraçları\n" " belirler\n" -#: src/pr.c:2815 +#: src/pr.c:2798 #, fuzzy msgid "" " -l, --length=PAGE_LENGTH\n" @@ -7270,7 +7638,7 @@ msgstr "" "toplar \n" " ( -J deki gibi)\n" -#: src/pr.c:2822 +#: src/pr.c:2805 #, fuzzy msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" @@ -7291,7 +7659,7 @@ msgstr "" " satıra 5 , ikinci satıra 6,... numaralarını verir)\n" " (+ILK_SAYFA seçeneğine de bakınız)\n" -#: src/pr.c:2830 +#: src/pr.c:2813 #, fuzzy msgid "" " -o, --indent=MARGIN\n" @@ -7307,7 +7675,7 @@ msgstr "" " -r, --no-file-warnings\n" " belirtilen dosyayı açamadığında hata mesajı vermez\n" -#: src/pr.c:2837 +#: src/pr.c:2820 #, fuzzy msgid "" " -s[CHAR], --separator[=CHAR]\n" @@ -7323,7 +7691,7 @@ msgstr "" " diğer hiçbir seçeneğin satırları kısaltmasına\n" " izin vermez\n" -#: src/pr.c:2844 +#: src/pr.c:2827 #, fuzzy msgid "" " -S[STRING], --sep-string[=STRING]\n" @@ -7339,7 +7707,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:2851 +#: src/pr.c:2834 #, fuzzy msgid "" " -T, --omit-pagination\n" @@ -7368,7 +7736,7 @@ msgstr "" "istiyor-\n" " sanız -w seçeneğini mutlaka kullanın\n" -#: src/pr.c:2861 +#: src/pr.c:2844 #, fuzzy msgid "" " -W, --page-width=PAGE_WIDTH\n" @@ -7385,7 +7753,7 @@ msgstr "" "seçenek\n" " ve -s ,-S seçenekleri birbirlerini etkilemezler\n" -#: src/pr.c:2869 +#: src/pr.c:2852 #, fuzzy msgid "" "\n" @@ -7547,15 +7915,15 @@ msgstr "" " veya: %s -G [SEÇENEK]... [GİRDİ [ÇIKTI]]\n" #: src/ptx.c:1821 +#, fuzzy msgid "" "Output a permuted index, including context, of the words in the input " "files.\n" -"\n" msgstr "" "girdi dosyasındaki kelimelerin (contextleriyle beraber),bir permutasyonunu \n" " oluşturur.\n" -#: src/ptx.c:1828 +#: src/ptx.c:1827 #, fuzzy msgid "" " -A, --auto-reference output automatically generated references\n" @@ -7569,7 +7937,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:1833 +#: src/ptx.c:1832 #, fuzzy msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" @@ -7590,7 +7958,7 @@ msgstr "" " expression (düzenli ifade) ) \n" " -T, --format=tex TeX formatında çıktı oluştur\n" -#: src/ptx.c:1840 +#: src/ptx.c:1839 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -7612,7 +7980,7 @@ msgstr "" " -o, --only-file=DOSYA girdide sadece DOSYA'daki kelimeleri\n" " dikkate alır\n" -#: src/ptx.c:1848 +#: src/ptx.c:1847 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -7625,7 +7993,7 @@ msgstr "" " -w, --width=SAYI çıktıdaki kolon sayısı SAYI olur \n" " (referans hariç)\n" -#: src/ptx.c:1855 +#: src/ptx.c:1854 #, fuzzy msgid "" "\n" @@ -7635,7 +8003,7 @@ msgstr "" "DOSYA belirtilmediğinde veya - olduğunda standart girdiden okur. \n" "`-F /' seçeneği verilmiş gibi çalışır\n" -#: src/ptx.c:1949 +#: src/ptx.c:1948 #, c-format msgid "invalid gap width: %s" msgstr "geçersiz boşluk genişliği: %s" @@ -7659,7 +8027,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "%s dizinine chdir başarısız" -#: src/pwd.c:170 src/pwd.c:277 +#: src/pwd.c:170 src/pwd.c:277 src/split.c:373 #, c-format msgid "failed to stat %s" msgstr "%s durumlanamadı" @@ -7675,14 +8043,15 @@ msgid "ignoring non-option arguments" msgstr "seçenek olmayan argümanlar yoksayılıyor" #. This is a proper name. See the gettext manual, section Names. -#: src/readlink.c:33 +#: src/readlink.c:32 msgid "Dmitry V. Levin" msgstr "" -#: src/readlink.c:62 +#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147 +#: src/stat.c:1349 src/touch.c:212 #, c-format -msgid "Usage: %s [OPTION]... FILE\n" -msgstr "Kullanım: %s [SEÇENEK]... [DOSYA]\n" +msgid "Usage: %s [OPTION]... FILE...\n" +msgstr "Kullanım: %s [SEÇENEK]... DOSYA...\n" #: src/readlink.c:63 #, fuzzy @@ -7728,10 +8097,12 @@ msgid "" "recursively,\n" " without requirements on components " "existence\n" -" -n, --no-newline do not output the trailing newline\n" +" -n, --no-newline do not output the trailing delimiter\n" " -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" msgstr "" " -f, --canonicalize verilen yolun bileşenlerinde yer alan her " "sembolik\n" @@ -7741,11 +8112,10 @@ msgstr "" " -s, --silent pek çok hata iletisini göstermez.\n" " -v, --verbose hata iletilerini gösterir.\n" -#: src/realpath.c:71 src/rm.c:134 src/shred.c:147 src/stat.c:1330 -#: src/touch.c:215 -#, c-format -msgid "Usage: %s [OPTION]... FILE...\n" -msgstr "Kullanım: %s [SEÇENEK]... DOSYA...\n" +#: src/readlink.c:152 +#, fuzzy, c-format +msgid "ignoring --no-newline with multiple arguments" +msgstr "seçenek olmayan argümanlar yoksayılıyor" #: src/realpath.c:72 msgid "" @@ -7772,12 +8142,12 @@ msgstr "" msgid "generating relative path" msgstr "" -#: src/remove.c:286 +#: src/remove.c:273 #, c-format msgid "%s: descend into write-protected directory %s? " msgstr "%s: korumalı dizin %s'nin içine inilsin mi?" -#: src/remove.c:287 +#: src/remove.c:274 #, c-format msgid "%s: descend into directory %s? " msgstr "%s: %s dizininin içine inilsin mi?" @@ -7786,49 +8156,49 @@ msgstr "%s: %s dizininin içine inilsin mi?" #. translate "%s: remove %s (write-protected) %s? " #. instead. It should avoid grammatical problems #. with the output of file_type. -#: src/remove.c:303 +#: src/remove.c:290 #, c-format msgid "%s: remove write-protected %s %s? " msgstr "%s: korumalı %s %s silinsin mi?" -#: src/remove.c:304 +#: src/remove.c:291 #, c-format msgid "%s: remove %s %s? " msgstr "%s: %s %s silinsin mi?" -#: src/remove.c:417 +#: src/remove.c:374 #, c-format msgid "removed directory: %s\n" msgstr "%s dizini silindi\n" -#: src/remove.c:481 +#: src/remove.c:444 #, fuzzy, c-format msgid "cannot remove directory: %s" msgstr "dizin %s silinemiyor" -#: src/remove.c:537 +#: src/remove.c:500 #, c-format msgid "skipping %s, since it's on a different device" msgstr "" -#: src/remove.c:557 +#: src/remove.c:520 #, fuzzy, c-format msgid "traversal failed: %s" msgstr "okuma başarısız oldu" -#: src/remove.c:563 +#: src/remove.c:526 #, c-format msgid "" "unexpected failure: fts_info=%d: %s\n" "please report to %s" msgstr "" -#: src/rm.c:118 +#: src/rm.c:119 #, c-format msgid "Try '%s ./%s' to remove the file %s.\n" msgstr "" -#: src/rm.c:135 +#: src/rm.c:136 msgid "" "Remove (unlink) the FILE(s).\n" "\n" @@ -7837,7 +8207,7 @@ msgid "" " -i prompt before every removal\n" msgstr "" -#: src/rm.c:141 +#: src/rm.c:142 msgid "" " -I prompt once before removing more than three files, " "or\n" @@ -7849,19 +8219,20 @@ msgid "" " always (-i). Without WHEN, prompt always\n" msgstr "" -#: src/rm.c:148 +#: src/rm.c:149 msgid "" " --one-file-system when removing a hierarchy recursively, skip any\n" " directory that is on a file system different from\n" " that of the corresponding command line argument\n" msgstr "" -#: src/rm.c:153 +#: src/rm.c:154 #, fuzzy msgid "" " --no-preserve-root do not treat '/' specially\n" " --preserve-root do not remove '/' (default)\n" " -r, -R, --recursive remove directories and their contents recursively\n" +" -d, --dir remove empty directories\n" " -v, --verbose explain what is being done\n" msgstr "" " --no-preserve-root `/' için özel işlem yapma (öntanımlı)\n" @@ -7869,7 +8240,7 @@ msgstr "" " -r, -R, --recursive yinelemeli olarak dizinlerin içlerindekileri siler\n" " -v, --verbose ne yapıldığını anlatır\n" -#: src/rm.c:161 +#: src/rm.c:163 msgid "" "\n" "By default, rm does not remove directories. Use the --recursive (-r or -R)\n" @@ -7877,7 +8248,7 @@ msgid "" "contents.\n" msgstr "" -#: src/rm.c:166 +#: src/rm.c:168 #, fuzzy, c-format msgid "" "\n" @@ -7894,7 +8265,7 @@ msgstr "" "\n" " %s ./-foo\n" -#: src/rm.c:175 +#: src/rm.c:177 #, fuzzy msgid "" "\n" @@ -7907,12 +8278,12 @@ msgstr "" "içindekileri geri almanız mümkündür. Eğer dosya içeriğinin gerçekten geri\n" "alınamaz olarak silinmesini istiyorsanız, shred komutunu kullanın.\n" -#: src/rm.c:335 +#: src/rm.c:342 #, c-format msgid "%s: remove all arguments recursively? " msgstr "" -#: src/rm.c:336 +#: src/rm.c:343 #, fuzzy, c-format msgid "%s: remove all arguments? " msgstr "%s: %s %s silinsin mi?" @@ -7971,7 +8342,10 @@ msgstr "" msgid "" "Run a program in a different security context.\n" "With neither CONTEXT nor COMMAND, print the current security context.\n" -"\n" +msgstr "" + +#: src/runcon.c:94 +msgid "" " CONTEXT Complete security context\n" " -c, --compute compute process transition context before modifying\n" " -t, --type=TYPE type (for same role as parent)\n" @@ -7981,72 +8355,72 @@ msgid "" "\n" msgstr "" -#: src/runcon.c:140 +#: src/runcon.c:144 #, c-format msgid "multiple roles" msgstr "" -#: src/runcon.c:145 +#: src/runcon.c:149 #, c-format msgid "multiple types" msgstr "" -#: src/runcon.c:150 +#: src/runcon.c:154 #, c-format msgid "multiple users" msgstr "" -#: src/runcon.c:155 +#: src/runcon.c:159 #, c-format msgid "multiple levelranges" msgstr "" -#: src/runcon.c:173 src/runcon.c:209 +#: src/runcon.c:177 src/runcon.c:213 #, fuzzy, c-format msgid "failed to get current context" msgstr "%s'nın öznitelikleri alınamadı" -#: src/runcon.c:183 +#: src/runcon.c:187 #, c-format msgid "you must specify -c, -t, -u, -l, -r, or context" msgstr "" -#: src/runcon.c:191 +#: src/runcon.c:195 #, fuzzy, c-format msgid "no command specified" msgstr "süreç kimliği belirtilmemiş" -#: src/runcon.c:197 +#: src/runcon.c:201 #, c-format msgid "%s may be used only on a SELinux kernel" msgstr "" -#: src/runcon.c:223 +#: src/runcon.c:227 #, fuzzy, c-format msgid "failed to compute a new context" msgstr "%s açılamadı" -#: src/runcon.c:237 +#: src/runcon.c:241 #, fuzzy, c-format msgid "failed to set new user %s" msgstr "%s durumlanamadı" -#: src/runcon.c:239 +#: src/runcon.c:243 #, fuzzy, c-format msgid "failed to set new type %s" msgstr "%s durumlanamadı" -#: src/runcon.c:241 +#: src/runcon.c:245 #, fuzzy, c-format msgid "failed to set new range %s" msgstr "%s durumlanamadı" -#: src/runcon.c:243 +#: src/runcon.c:247 #, fuzzy, c-format msgid "failed to set new role %s" msgstr "%s durumlanamadı" -#: src/runcon.c:251 +#: src/runcon.c:255 #, fuzzy, c-format msgid "unable to set security context %s" msgstr "%s'in izinleri eski haline getirilemedi" @@ -8063,10 +8437,12 @@ msgstr "" " ya da: %s [SEÇENEK]... İLK ARTIŞ SON\n" #: src/seq.c:73 +msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" +msgstr "" + +#: src/seq.c:79 #, fuzzy msgid "" -"Print numbers from FIRST to LAST, in steps of INCREMENT.\n" -"\n" " -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" @@ -8079,7 +8455,7 @@ msgstr "" " -w, --equal-width rakamları sıfırla yastıklayarak eşit genişliğe " "getirir\n" -#: src/seq.c:82 +#: src/seq.c:86 #, fuzzy msgid "" "\n" @@ -8098,39 +8474,24 @@ 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:90 +#: src/seq.c:94 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:136 +#: src/seq.c:140 #, c-format msgid "invalid floating point argument: %s" msgstr "gerçel sayı argüman geçersiz: %s" -#: src/seq.c:193 -#, fuzzy, c-format -msgid "format %s has no %% directive" -msgstr "hedef %s bir dizin değil" - -#: src/seq.c:210 -#, c-format -msgid "format %s ends in %%" -msgstr "" - -#: src/seq.c:213 +#: src/seq.c:232 #, fuzzy, c-format msgid "format %s has unknown %%%c directive" msgstr "%s bilinmeyen dosya türüne sahip" -#: src/seq.c:217 -#, c-format -msgid "format %s has too many %% directives" -msgstr "" - -#: src/seq.c:431 +#: src/seq.c:555 #, 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" @@ -8170,27 +8531,27 @@ msgid "" " (if specified) supplemental group IDs to GID1, ...\n" msgstr "" -#: src/setuidgid.c:163 +#: src/setuidgid.c:162 #, c-format msgid "unknown user-ID: %s" msgstr "bilinmeyen kullanıcı kimliği: %s" -#: src/setuidgid.c:174 +#: src/setuidgid.c:173 #, c-format msgid "to use user-ID %s you need to use -g too" msgstr "" -#: src/setuidgid.c:191 +#: src/setuidgid.c:190 #, fuzzy, c-format msgid "failed to set supplemental group(s)" msgstr "ek grup atanamadı" -#: src/setuidgid.c:201 +#: src/setuidgid.c:200 #, c-format msgid "cannot set group-ID to %lu" msgstr "grup kimliği %lu olarak atanamıyor" -#: src/setuidgid.c:205 +#: src/setuidgid.c:204 #, c-format msgid "cannot set user-ID to %lu" msgstr "kullanıcı kimliği %lu olarak atanamıyor" @@ -8201,16 +8562,16 @@ msgid "Colin Plumb" msgstr "" #: src/shred.c:148 +#, 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" -"\n" msgstr "" "Belirtilen DOSYA(ların) üzerine bir kaç defa yazarak pahalı donanım \n" "çözümleri ile bile dosya içeriğinin kurtarılabilmesini zorlaştırır.\n" "\n" -#: src/shred.c:156 +#: src/shred.c:155 #, fuzzy, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -8225,7 +8586,7 @@ 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:162 +#: src/shred.c:161 msgid "" " -u, --remove truncate and remove file after overwriting\n" " -v, --verbose show progress\n" @@ -8240,7 +8601,7 @@ msgstr "" " -z, --zero işlemi gizlemek için en son olarak üzerine sıfırlarla " "yazar\n" -#: src/shred.c:171 +#: src/shred.c:170 msgid "" "\n" "If FILE is -, shred standard output.\n" @@ -8262,7 +8623,7 @@ msgstr "" "çalıştırıldığı zaman genelde --remove seçeneği kullanılır.\n" "\n" -#: src/shred.c:181 +#: src/shred.c:180 #, fuzzy msgid "" "CAUTION: Note that shred relies on a very important assumption:\n" @@ -8279,7 +8640,7 @@ msgstr "" "komutunun işe yaramadığı dosya sistemleri örneklenmiştir:\n" "\n" -#: src/shred.c:189 +#: src/shred.c:188 #, fuzzy msgid "" "* log-structured or journaled file systems, such as those supplied with\n" @@ -8303,7 +8664,7 @@ msgstr "" " kaydeden dosya sistemleri\n" "\n" -#: src/shred.c:199 +#: src/shred.c:198 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -8312,7 +8673,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:206 +#: src/shred.c:205 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" @@ -8324,7 +8685,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:216 +#: src/shred.c:215 #, fuzzy msgid "" "In addition, file system backups and remote mirrors may contain copies\n" @@ -8340,122 +8701,122 @@ 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:296 +#: src/shred.c:295 #, c-format msgid "%s: fdatasync failed" msgstr "%s: fdatasync başarısız" -#: src/shred.c:307 +#: src/shred.c:306 #, c-format msgid "%s: fsync failed" msgstr "%s: fsync başarısız" -#: src/shred.c:384 +#: src/shred.c:383 #, c-format msgid "%s: cannot rewind" msgstr "%s: geri gelinemiyor" -#: src/shred.c:403 +#: src/shred.c:402 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: geçiş %lu/%lu (%s)" -#: src/shred.c:453 +#: src/shred.c:452 #, c-format msgid "%s: error writing at offset %s" msgstr "%s %s göreli konumunda yazdırma hatası" -#: src/shred.c:471 +#: src/shred.c:470 #, c-format msgid "%s: lseek failed" msgstr "%s: arama (lseek) başarısız" -#: src/shred.c:482 +#: src/shred.c:481 #, c-format msgid "%s: file too large" msgstr "%s: dosya çok büyük" -#: src/shred.c:505 +#: src/shred.c:504 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: geçiş %lu/%lu (%s)...%s" -#: src/shred.c:521 +#: src/shred.c:520 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: geçiş %lu/%lu (%s)...%s/%s %d%%" -#: src/shred.c:768 +#: src/shred.c:767 #, c-format msgid "%s: fstat failed" msgstr "%s: fstat başarısız" -#: src/shred.c:779 +#: src/shred.c:778 #, c-format msgid "%s: invalid file type" msgstr "%s: geçersiz dosya tipi" -#: src/shred.c:798 +#: src/shred.c:797 #, c-format msgid "%s: file has negative size" msgstr "%s: dosya büyüklüğü negatif" -#: src/shred.c:865 +#: src/shred.c:864 src/sort.c:932 src/split.c:378 #, c-format msgid "%s: error truncating" msgstr "%s: kısaltmada hata" -#: src/shred.c:881 +#: src/shred.c:880 #, c-format msgid "%s: fcntl failed" msgstr "%s: fcntl başarısız" -#: src/shred.c:886 +#: src/shred.c:885 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "%s: yalnızca eklenebilir kipte dosya belirteçine shred uygulanamaz" -#: src/shred.c:968 +#: src/shred.c:967 #, c-format msgid "%s: removing" msgstr "%s: siliniyor" -#: src/shred.c:992 +#: src/shred.c:991 #, c-format msgid "%s: renamed to %s" msgstr "%s: %s olarak yeniden adlandırıldı" -#: src/shred.c:1014 +#: src/shred.c:1013 #, c-format msgid "%s: failed to remove" msgstr "%s: silinemedi" -#: src/shred.c:1018 +#: src/shred.c:1017 #, c-format msgid "%s: removed" msgstr "%s: silindi" -#: src/shred.c:1025 src/shred.c:1068 +#: src/shred.c:1024 src/shred.c:1067 #, c-format msgid "%s: failed to close" msgstr "%s: kapatılamadı" -#: src/shred.c:1061 +#: src/shred.c:1060 #, c-format msgid "%s: failed to open for writing" msgstr "%s: yazmak için açılamadı" -#: src/shred.c:1126 +#: src/shred.c:1125 #, c-format msgid "%s: invalid number of passes" msgstr "%s geçersiz sayıda geçiş" -#: src/shred.c:1135 src/shuf.c:291 src/sort.c:4387 +#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441 #, fuzzy, c-format msgid "multiple random sources specified" msgstr "birden fazla çıktı dosyası belirtilmiş" -#: src/shred.c:1149 +#: src/shred.c:1148 #, c-format msgid "%s: invalid file size" msgstr "%s: geçersiz dosya büyüklüğü" @@ -8473,14 +8834,12 @@ msgstr "" #: src/shuf.c:54 #, fuzzy -msgid "" -"Write a random permutation of the input lines to standard output.\n" -"\n" +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:61 +#: src/shuf.c:60 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 " @@ -8491,27 +8850,27 @@ msgid "" " -z, --zero-terminated end lines with 0 byte, not newline\n" msgstr "" -#: src/shuf.c:245 +#: src/shuf.c:244 #, fuzzy, c-format msgid "multiple -i options specified" msgstr "birden fazla -l veya -t seçeneği belirtilmiş" -#: src/shuf.c:265 +#: src/shuf.c:264 #, fuzzy, c-format msgid "invalid input range %s" msgstr "geçersiz girdi bayrağı: %s" -#: src/shuf.c:278 +#: src/shuf.c:277 #, fuzzy, c-format msgid "invalid line count %s" msgstr "geçersiz satır genişliği: %s" -#: src/shuf.c:285 src/sort.c:4381 +#: src/shuf.c:284 src/sort.c:4435 #, c-format msgid "multiple output files specified" msgstr "birden fazla çıktı dosyası belirtilmiş" -#: src/shuf.c:311 +#: src/shuf.c:310 #, fuzzy, c-format msgid "cannot combine -e and -i options" msgstr "kip ve --reference seçenekleri birleştirilemez" @@ -8537,7 +8896,7 @@ msgstr "" "değer gerekirken, burada SAYI bir gerçel sayı olabilir.\n" "\n" -#: src/sleep.c:135 src/timeout.c:295 +#: src/sleep.c:135 src/timeout.c:320 #, fuzzy, c-format msgid "invalid time interval %s" msgstr "`%s' zaman aralığı geçersiz" @@ -8547,11 +8906,9 @@ msgstr "`%s' zaman aralığı geçersiz" msgid "cannot read realtime clock" msgstr "gerçekzaman saati okunamıyor" -#: src/sort.c:395 +#: src/sort.c:399 #, fuzzy -msgid "" -"Write sorted concatenation of all FILE(s) to standard output.\n" -"\n" +msgid "Write sorted concatenation of all FILE(s) to standard output.\n" msgstr "" "DOSYA(ların)nın sıralanmış halini standart çıktıya yazar.\n" "sort sıralama yaparken her satırın belli bir bölümune bakarak sıralama\n" @@ -8562,13 +8919,13 @@ msgstr "" "Sıralama seçenekleri:\n" "\n" -#: src/sort.c:402 +#: src/sort.c:405 msgid "" "Ordering options:\n" "\n" msgstr "" -#: src/sort.c:406 +#: src/sort.c:409 #, fuzzy msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" @@ -8586,7 +8943,7 @@ msgstr "" " -f, --ignore-case sıralarken büyük/küçük harf farklılıklarını \n" " dikkate almaz \n" -#: src/sort.c:412 +#: src/sort.c:415 #, fuzzy msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" @@ -8613,12 +8970,12 @@ msgstr "" " -r, --reverse tersine sıralar\n" "\n" -#: src/sort.c:417 +#: src/sort.c:420 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" -#: src/sort.c:420 +#: src/sort.c:423 #, fuzzy msgid "" " -n, --numeric-sort compare according to string numerical value\n" @@ -8646,7 +9003,7 @@ msgstr "" " -r, --reverse tersine sıralar\n" "\n" -#: src/sort.c:426 +#: src/sort.c:429 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -8656,19 +9013,19 @@ msgid "" "\n" msgstr "" -#: src/sort.c:434 +#: src/sort.c:437 msgid "" "Other options:\n" "\n" msgstr "" -#: src/sort.c:438 +#: src/sort.c:441 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" msgstr "" -#: src/sort.c:442 +#: src/sort.c:445 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 " @@ -8677,7 +9034,7 @@ msgid "" " decompress them with PROG -d\n" msgstr "" -#: src/sort.c:449 +#: src/sort.c:452 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -8686,13 +9043,13 @@ msgid "" " If F is - then read names from standard input\n" msgstr "" -#: src/sort.c:456 +#: src/sort.c:459 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:460 +#: src/sort.c:463 #, fuzzy msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" @@ -8718,7 +9075,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:466 +#: src/sort.c:469 #, fuzzy, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -8742,13 +9099,13 @@ msgstr "" " kullanılmadığında sıralama yaparken aynı olan \n" " satırlardan sadece birini yazar \n" -#: src/sort.c:475 +#: 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:480 +#: src/sort.c:483 #, fuzzy msgid "" "\n" @@ -8780,7 +9137,7 @@ msgstr "" "\n" "SAYI'dan sonra aşağıdaki soneklerden biri gelebilir:\n" -#: src/sort.c:493 +#: src/sort.c:496 msgid "" "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n" "\n" @@ -8801,269 +9158,273 @@ 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:694 +#: src/sort.c:697 #, fuzzy, c-format msgid "waiting for %s [-d]" msgstr "%s'e yazılıyor" -#: src/sort.c:699 +#: src/sort.c:702 #, c-format msgid "%s [-d] terminated abnormally" msgstr "" -#: src/sort.c:853 +#: src/sort.c:856 #, fuzzy, c-format msgid "cannot create temporary file in %s" msgstr "geçici dosya %s oluşturulamadı" -#: src/sort.c:939 src/sort.c:2010 src/sort.c:3056 src/sort.c:3755 -#: src/sort.c:3758 +#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713 +#: src/sort.c:3804 src/sort.c:3807 msgid "open failed" msgstr "açma işlemi başarısız" -#: src/sort.c:959 +#: src/sort.c:970 msgid "fflush failed" msgstr "fflush başarısız" -#: src/sort.c:964 src/sort.c:2013 src/sort.c:4646 +#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706 msgid "close failed" msgstr "kapatma işlemi başarısız" -#: src/sort.c:973 +#: src/sort.c:986 #, fuzzy, c-format msgid "dup2 failed" msgstr "açma işlemi başarısız" -#: src/sort.c:1090 +#: src/sort.c:1103 #, c-format msgid "couldn't execute %s" msgstr "" -#: src/sort.c:1097 +#: src/sort.c:1110 #, fuzzy msgid "couldn't create temporary file" msgstr "geçici dosya oluşturulamadı" -#: src/sort.c:1136 +#: src/sort.c:1149 #, fuzzy, c-format msgid "couldn't create process for %s -d" msgstr "%s dizini oluşturulamıyor" -#: src/sort.c:1150 +#: src/sort.c:1161 #, c-format msgid "couldn't execute %s -d" msgstr "" -#: src/sort.c:1209 +#: src/sort.c:1220 #, c-format msgid "warning: cannot remove: %s" msgstr "uyarı: %s silinemedi" -#: src/sort.c:1295 +#: src/sort.c:1306 #, fuzzy, c-format msgid "invalid --%s argument %s" msgstr "%s argümanı geçersiz" -#: src/sort.c:1298 +#: src/sort.c:1309 #, fuzzy, c-format msgid "minimum --%s argument is %s" msgstr "%s argümanı `%s' için belirsiz" -#: src/sort.c:1313 +#: src/sort.c:1324 #, fuzzy, c-format msgid "--%s argument %s too large" msgstr "%s: `%.*s' sayımı fazla büyük" -#: src/sort.c:1316 +#: src/sort.c:1327 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "" -#: src/sort.c:1398 +#: src/sort.c:1409 #, c-format msgid "number in parallel must be nonzero" msgstr "" -#: src/sort.c:1479 +#: src/sort.c:1494 msgid "stat failed" msgstr "stat başarısız" -#: src/sort.c:1740 +#: src/sort.c:1755 msgid "read failed" msgstr "okuma başarısız oldu" # -#: src/sort.c:2028 +#: src/sort.c:2043 #, fuzzy, c-format msgid "string transformation failed" msgstr "dizge karşılaştırması başarısız" -#: src/sort.c:2031 +#: src/sort.c:2046 #, c-format msgid "the untransformed string was %s" msgstr "" -#: src/sort.c:2194 +#: src/sort.c:2209 #, c-format msgid "^ no match for key\n" msgstr "" -#: src/sort.c:2374 +#: src/sort.c:2389 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "" -#: src/sort.c:2380 +#: src/sort.c:2395 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "" -#: src/sort.c:2391 +#: src/sort.c:2406 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" -#: src/sort.c:2404 +#: src/sort.c:2419 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "" -#: src/sort.c:2436 +#: src/sort.c:2451 #, 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" -#: src/sort.c:2442 +#: src/sort.c:2457 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "" -#: src/sort.c:2716 src/sort.c:2725 +#: src/sort.c:2731 src/sort.c:2740 msgid "write failed" msgstr "yazma başarısız oldu" -#: src/sort.c:2768 +#: src/sort.c:2783 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: sırasız: " -#: src/sort.c:2771 +#: src/sort.c:2786 msgid "standard error" msgstr "standart hata" -#: src/sort.c:3926 +#: src/sort.c:3698 +#, fuzzy +msgid "cannot read" +msgstr "%s: geri gelinemiyor" + +#: src/sort.c:3976 #, fuzzy, c-format msgid "%s: invalid field specification %s" msgstr "%s: geçersiz alan tanımı `%s'" -#: src/sort.c:3937 +#: src/sort.c:3987 #, fuzzy, c-format msgid "options '-%s' are incompatible" msgstr "%s: `%s' seçeneği belirsiz\n" -#: src/sort.c:3988 +#: src/sort.c:4038 #, 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:4245 +#: src/sort.c:4295 #, fuzzy msgid "invalid number after '-'" msgstr "`-' den sonra geçersiz sayı" -#: src/sort.c:4248 src/sort.c:4334 src/sort.c:4362 +#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416 #, fuzzy msgid "invalid number after '.'" msgstr "`.' dan sonra geçersiz sayı" -#: src/sort.c:4261 src/sort.c:4367 +#: src/sort.c:4315 src/sort.c:4421 msgid "stray character in field spec" msgstr "alan tanımında fazla harf" -#: src/sort.c:4308 +#: src/sort.c:4362 #, fuzzy, c-format msgid "multiple compress programs specified" msgstr "birden fazla hedef dizin belirtilmiş" -#: src/sort.c:4325 +#: src/sort.c:4379 msgid "invalid number at field start" msgstr "alan başlangıcında geçersiz sayı" -#: src/sort.c:4329 src/sort.c:4357 +#: src/sort.c:4383 src/sort.c:4411 msgid "field number is zero" msgstr "alan numarası sıfır" -#: src/sort.c:4338 +#: src/sort.c:4392 msgid "character offset is zero" msgstr "sıralama anahtarında belirtilen karakter yeri sıfır" -#: src/sort.c:4353 +#: src/sort.c:4407 #, fuzzy msgid "invalid number after ','" msgstr "`,' den sonra geçersiz sayı" -#: src/sort.c:4403 +#: src/sort.c:4457 #, c-format msgid "empty tab" msgstr "boş sekme" -#: src/sort.c:4496 src/wc.c:692 +#: src/sort.c:4550 src/wc.c:692 #, c-format msgid "cannot read file names from %s" msgstr "%s'den dosya adları okunamadı" -#: src/sort.c:4518 +#: src/sort.c:4572 #, fuzzy, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "geçersiz sıfır uzunluklu dosya adı" -#: src/sort.c:4524 +#: src/sort.c:4578 #, fuzzy, c-format msgid "no input from %s" msgstr "girdi dosyası %s kapatılıyor" -#: src/sort.c:4570 +#: src/sort.c:4624 #, c-format msgid "using %s sorting rules" msgstr "" -#: src/sort.c:4573 +#: src/sort.c:4627 #, c-format msgid "using simple byte comparison" msgstr "" -#: src/sort.c:4604 +#: src/sort.c:4658 #, 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:184 +#: src/split.c:187 #, c-format msgid "the suffix length needs to be at least %zu" msgstr "" -#: src/split.c:201 +#: src/split.c:204 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" msgstr "Kullanım: %s [SEÇENEK] [GİRDİ [ÖNEK]]\n" -#: src/split.c:205 +#: src/split.c:208 #, fuzzy 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" -"\n" msgstr "" "GIRDI'yi eşit büyüklükte parçalara bölüp ONEKaa, ONEKab, ... isimli\n" "dosyalara kor. Ötanımlı boy 1000 satır ve öntanımlı ONEK `x'tir.\n" "GIRDI belirtilmediğinde veya - olduğunda standart girdiyi kullanır\n" "\n" -#: src/split.c:214 +#: src/split.c:216 #, fuzzy, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" @@ -9088,7 +9449,7 @@ msgstr "" " -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:227 +#: src/split.c:229 #, fuzzy msgid "" " --verbose print a diagnostic just before each\n" @@ -9099,7 +9460,7 @@ msgstr "" "hata'ya\n" " yazılır)\n" -#: src/split.c:234 +#: src/split.c:236 msgid "" "\n" "CHUNKS may be:\n" @@ -9111,185 +9472,190 @@ msgid "" "r/K/N likewise but only output Kth of N to stdout\n" msgstr "" -#: src/split.c:352 +#: src/split.c:354 #, fuzzy, c-format msgid "output file suffixes exhausted" msgstr "kullanacak parça ismi kalmadı" -#: src/split.c:364 +#: src/split.c:366 #, fuzzy, c-format msgid "creating file %s\n" msgstr "`%s' dosyası oluşturuluyor\n" -#: src/split.c:377 +#: src/split.c:375 +#, c-format +msgid "%s would overwrite input; aborting" +msgstr "" + +#: src/split.c:391 #, fuzzy, c-format msgid "failed to set FILE environment variable" -msgstr "%s durumlanamadı" +msgstr "çevre değişkeni LS_COLORS'da taranamaz değer" -#: src/split.c:379 +#: src/split.c:393 #, c-format msgid "executing with FILE=%s\n" msgstr "" -#: src/split.c:381 +#: src/split.c:395 #, fuzzy, c-format msgid "failed to create pipe" -msgstr "%s sabit bağı %s'e bağlanamadı" +msgstr "%s durumlanamadı" -#: src/split.c:395 +#: src/split.c:409 #, fuzzy, c-format msgid "closing prior pipe" msgstr "%s dizini kapatılıyor" -#: src/split.c:397 +#: src/split.c:411 #, fuzzy, c-format msgid "closing output pipe" msgstr "çıktı dosyası %s kapatılıyor" -#: src/split.c:401 +#: src/split.c:415 #, fuzzy, c-format msgid "moving input pipe" msgstr "girdi dosyası %s kapatılıyor" -#: src/split.c:403 +#: src/split.c:417 #, fuzzy, c-format msgid "closing input pipe" msgstr "girdi dosyası %s kapatılıyor" -#: src/split.c:408 +#: src/split.c:422 #, fuzzy, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "%s komutu çalıştırılamadı" -#: src/split.c:414 +#: src/split.c:428 #, fuzzy, c-format msgid "failed to close input pipe" msgstr "%s: kapatılamadı" -#: src/split.c:450 -#, fuzzy, c-format +#: src/split.c:464 +#, c-format msgid "waiting for child process" -msgstr "%s'e yazılıyor" +msgstr "" -#: src/split.c:460 +#: src/split.c:474 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "" -#: src/split.c:468 +#: src/split.c:482 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:475 src/timeout.c:449 +#: src/split.c:489 src/timeout.c:494 #, c-format msgid "unknown status from command (0x%X)" msgstr "" -#: src/split.c:1037 +#: src/split.c:1052 #, c-format msgid "cannot split in more than one way" msgstr "-C -l -b seçenekleri beraber kullanılmaz" -#: src/split.c:1050 src/split.c:1192 src/split.c:1363 +#: src/split.c:1065 src/split.c:1205 src/split.c:1376 #, fuzzy, c-format msgid "%s: invalid number of chunks" msgstr "%s: geçersiz saniye sayısı" -#: src/split.c:1054 +#: src/split.c:1069 #, fuzzy, c-format msgid "%s: invalid chunk number" msgstr "%s: geçersiz sayı" -#: src/split.c:1106 +#: src/split.c:1119 #, c-format msgid "%s: invalid suffix length" msgstr "%s: -a seçeneğine verilen arguman geçersiz" -#: src/split.c:1131 src/split.c:1139 src/split.c:1162 src/split.c:1167 +#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180 #, c-format msgid "%s: invalid number of bytes" msgstr "%s: geçersiz bayt sayısı" -#: src/split.c:1150 src/split.c:1297 +#: src/split.c:1163 src/split.c:1310 #, c-format msgid "%s: invalid number of lines" msgstr "%s: geçersiz satır sayısı" -#: src/split.c:1223 +#: src/split.c:1236 #, 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:1235 +#: src/split.c:1248 #, fuzzy, c-format msgid "%s: invalid start value for numerical suffix" msgstr "geçersiz başlangıç satır numarası: %s" -#: src/split.c:1263 +#: src/split.c:1276 #, fuzzy, c-format msgid "%s: invalid IO block size" msgstr "%s: geçersiz dosya büyüklüğü" -#: src/split.c:1284 +#: src/split.c:1297 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1321 +#: src/split.c:1334 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1356 +#: src/split.c:1369 #, 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:169 +#: src/stat.c:173 msgid "Michael Meskes" msgstr "" -#: src/stat.c:838 +#: src/stat.c:857 #, fuzzy, c-format msgid "failed to canonicalize %s" msgstr "%s açılamadı" -#: src/stat.c:1050 +#: src/stat.c:1069 #, fuzzy, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "%s: `%c%s' seçeneği bilinmiyor\n" -#: src/stat.c:1105 +#: src/stat.c:1124 #, fuzzy, c-format msgid "%s: invalid directive" msgstr "%%%c: yönerge geçersiz" -#: src/stat.c:1151 +#: src/stat.c:1170 #, fuzzy, c-format msgid "warning: backslash at end of format" msgstr "dizge sonunda geçersiz terskesik gösterimi" -#: src/stat.c:1182 +#: src/stat.c:1201 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" -#: src/stat.c:1189 +#: src/stat.c:1208 #, c-format msgid "cannot read file system information for %s" msgstr "%s için dosyasistem bilgisi okunamadı" # -#: src/stat.c:1209 +#: src/stat.c:1228 #, 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:1245 +#: src/stat.c:1264 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -9300,7 +9666,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1268 +#: src/stat.c:1287 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -9308,30 +9674,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1278 +#: src/stat.c:1297 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:1286 +#: src/stat.c:1305 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:1295 +#: src/stat.c:1314 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:1305 +#: src/stat.c:1324 #, c-format msgid "Context: %C\n" msgstr "" -#: src/stat.c:1313 +#: src/stat.c:1332 msgid "" "Access: %x\n" "Modify: %y\n" @@ -9339,15 +9705,17 @@ msgid "" " Birth: %w\n" msgstr "" -#: src/stat.c:1331 +#: src/stat.c:1350 +msgid "Display file or file system status.\n" +msgstr "" + +#: src/stat.c:1356 msgid "" -"Display file or file system status.\n" -"\n" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" -#: src/stat.c:1337 +#: src/stat.c:1360 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -9357,7 +9725,7 @@ msgid "" " -t, --terse print the information in terse form\n" msgstr "" -#: src/stat.c:1348 +#: src/stat.c:1371 #, fuzzy msgid "" "\n" @@ -9377,7 +9745,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:1357 +#: src/stat.c:1380 #, fuzzy msgid "" " %d device number in decimal\n" @@ -9394,7 +9762,7 @@ msgstr "" " %G Sahibin grup adı\n" " %g Sahibin grup kimlik no'su\n" -#: src/stat.c:1365 +#: src/stat.c:1388 #, fuzzy msgid "" " %h number of hard links\n" @@ -9416,7 +9784,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:1376 +#: src/stat.c:1399 #, fuzzy msgid "" " %u user ID of owner\n" @@ -9441,7 +9809,7 @@ msgstr "" " %z Son dosya değişim zamanı\n" "\n" -#: src/stat.c:1390 +#: src/stat.c:1413 #, fuzzy msgid "" "Valid format sequences for file systems:\n" @@ -9460,7 +9828,7 @@ msgstr "" " %d Dosya sisteminde boş dosya düğümleri\n" " %f Dosya sisteminde boş bloklar\n" -#: src/stat.c:1399 +#: src/stat.c:1422 #, fuzzy msgid "" " %i file system ID in hex\n" @@ -9486,30 +9854,29 @@ msgstr "Kullanım: %s [SEÇENEK]...\n" #: src/stdbuf.c:91 msgid "" "Run COMMAND, with modified buffering operations for its standard streams.\n" -"\n" msgstr "" -#: src/stdbuf.c:98 +#: src/stdbuf.c:97 msgid "" " -i, --input=MODE adjust standard input stream buffering\n" " -o, --output=MODE adjust standard output stream buffering\n" " -e, --error=MODE adjust standard error stream buffering\n" msgstr "" -#: src/stdbuf.c:105 +#: src/stdbuf.c:104 msgid "" "\n" "If MODE is 'L' the corresponding stream will be line buffered.\n" "This option is invalid with standard input.\n" msgstr "" -#: src/stdbuf.c:108 +#: src/stdbuf.c:107 msgid "" "\n" "If MODE is '0' the corresponding stream will be unbuffered.\n" msgstr "" -#: src/stdbuf.c:111 +#: src/stdbuf.c:110 msgid "" "\n" "Otherwise MODE is a number which may be followed by one of the following:\n" @@ -9519,7 +9886,7 @@ msgid "" "size set to MODE bytes.\n" msgstr "" -#: src/stdbuf.c:117 +#: src/stdbuf.c:116 msgid "" "\n" "NOTE: If COMMAND adjusts the buffering of its standard streams ('tee' does\n" @@ -9529,22 +9896,22 @@ msgid "" "and are thus unaffected by 'stdbuf' settings.\n" msgstr "" -#: src/stdbuf.c:227 +#: src/stdbuf.c:226 #, fuzzy, c-format msgid "failed to find %s" msgstr "%s açılamadı" -#: src/stdbuf.c:247 src/stdbuf.c:279 +#: src/stdbuf.c:246 src/stdbuf.c:278 #, c-format msgid "failed to update the environment with %s" msgstr "" -#: src/stdbuf.c:321 +#: src/stdbuf.c:320 #, c-format msgid "line buffering stdin is meaningless" msgstr "" -#: src/stty.c:509 +#: src/stty.c:513 #, fuzzy, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -9555,10 +9922,13 @@ msgstr "" " veya: %s [-F AYGIT] [--file=AYGIT] [-a|--all]\n" " ya da: %s [-F AYGIT] [--file=AYGIT] [-g|--save]\n" -#: src/stty.c:515 +#: src/stty.c:519 +msgid "Print or change terminal characteristics.\n" +msgstr "" + +#: src/stty.c:525 +#, fuzzy msgid "" -"Print or change terminal characteristics.\n" -"\n" " -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" @@ -9569,7 +9939,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:524 +#: src/stty.c:532 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -9579,7 +9949,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:529 +#: src/stty.c:537 msgid "" "\n" "Special characters:\n" @@ -9593,7 +9963,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:536 +#: src/stty.c:544 msgid "" " * eol2 CHAR alternate CHAR for ending the line\n" " erase CHAR CHAR will erase the last character typed\n" @@ -9605,7 +9975,7 @@ msgstr "" " intr KRKT KRKT bir kesme (SIGINT) sinyali gönderecektir\n" " kill KRKT KRKT bulunulan satırı silecektir\n" -#: src/stty.c:542 +#: src/stty.c:550 msgid "" " * lnext CHAR CHAR will enter the next character quoted\n" " quit CHAR CHAR will send a quit signal\n" @@ -9617,7 +9987,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:548 +#: src/stty.c:556 msgid "" " stop CHAR CHAR will stop the output\n" " susp CHAR CHAR will send a terminal stop signal\n" @@ -9629,7 +9999,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:554 +#: src/stty.c:562 #, fuzzy msgid "" "\n" @@ -9644,7 +10014,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:561 +#: src/stty.c:569 msgid "" " ispeed N set the input speed to N\n" " * line N use line discipline N\n" @@ -9659,7 +10029,7 @@ msgstr "" " sayısını N yapar\n" " ospeed N çıktı hızını N olarak ayarlar\n" -#: src/stty.c:567 +#: src/stty.c:575 msgid "" " * rows N tell the kernel that the terminal has N rows\n" " * size print the number of rows and columns according to the " @@ -9672,13 +10042,15 @@ 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:573 +#: src/stty.c:581 +#, fuzzy msgid "" "\n" "Control settings:\n" " [-]clocal disable modem control signals\n" " [-]cread allow input to be received\n" " * [-]crtscts enable RTS/CTS handshaking\n" +" * [-]cdtrdsr enable DTR/DSR handshaking\n" " csN set character size to N bits, N in [5..8]\n" msgstr "" "\n" @@ -9688,7 +10060,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:581 +#: src/stty.c:590 #, fuzzy msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" @@ -9696,7 +10068,7 @@ msgid "" " [-]hupcl same as [-]hup\n" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" -" [-]parodd set odd parity (even with '-')\n" +" [-]parodd set odd parity (or even parity with '-')\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 " @@ -9706,7 +10078,7 @@ msgstr "" "beklenir\n" " [-]parodd tek eşlik biti kullanılır (`-' ile çift)\n" -#: src/stty.c:588 +#: src/stty.c:597 msgid "" "\n" "Input settings:\n" @@ -9723,7 +10095,7 @@ msgstr "" " [-]ignbrk kırma karakterlerini yoksayar\n" " [-]igncr satır başı karakterlerini yoksayar\n" -#: src/stty.c:596 +#: src/stty.c:605 msgid "" " [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" @@ -9738,11 +10110,11 @@ msgstr "" " [-]inpck girdi eşlik denetimini etkinleştirir\n" " [-]istrip girdi karakterlerinin yüksek (8.) bitini temizler\n" -#: src/stty.c:603 +#: src/stty.c:612 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr " * [-]iutf8 girdi karakterlerinin UTF-8 kodlu olduğunu varsayar\n" -#: src/stty.c:606 +#: src/stty.c:615 msgid "" " * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" @@ -9759,7 +10131,7 @@ msgstr "" " [-]parmrk eşlik hatalarını imler (255-0-karakter sıralamasıyla)\n" " [-]tandem [-]ixoff ile aynı\n" -#: src/stty.c:614 +#: src/stty.c:623 msgid "" "\n" "Output settings:\n" @@ -9775,7 +10147,7 @@ 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:622 +#: src/stty.c:631 msgid "" " * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of null characters\n" @@ -9792,7 +10164,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:630 +#: src/stty.c:639 msgid "" " * [-]onocr do not print carriage returns in the first column\n" " [-]opost postprocess output\n" @@ -9808,7 +10180,7 @@ msgstr "" "* -tabs tab3 ile aynı\n" "* vtN düşey sekme tarzı gecikme, N [0..1] arasında\n" -#: src/stty.c:638 +#: src/stty.c:647 msgid "" "\n" "Local settings:\n" @@ -9823,7 +10195,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:645 +#: src/stty.c:654 #, fuzzy msgid "" " * [-]ctlecho echo control characters in hat notation ('^c')\n" @@ -9838,7 +10210,7 @@ msgstr "" " [-]echoe [-]crterase ile aynı\n" " [-]echok karakteri sildikten sonra bir alt satıra geçiş yansılar\n" -#: src/stty.c:652 +#: src/stty.c:661 #, fuzzy msgid "" " * [-]echoke same as [-]crtkill\n" @@ -9856,7 +10228,7 @@ msgstr "" " karakterlerini etkinleştirir\n" " [-]iexten POSIX olmayan özel karakterleri etkinleştirir\n" -#: src/stty.c:659 +#: src/stty.c:668 #, fuzzy msgid "" " [-]isig enable interrupt, quit, and suspend special characters\n" @@ -9873,7 +10245,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:666 +#: src/stty.c:675 msgid "" "\n" "Combination settings:\n" @@ -9887,7 +10259,7 @@ msgstr "" " cbreak -icanon ile aynı\n" " -cbreak icanon ile aynı\n" -#: src/stty.c:673 +#: src/stty.c:682 msgid "" " cooked same as brkint ignpar istrip icrnl ixon opost isig\n" " icanon, eof and eol characters to their default values\n" @@ -9900,7 +10272,7 @@ msgstr "" " -cooked raw ile aynı\n" " crt echoe echoctl echoke ile aynı\n" -#: src/stty.c:679 +#: src/stty.c:688 msgid "" " dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" " kill ^u\n" @@ -9915,7 +10287,7 @@ msgstr "" " değerleriyle aynı\n" " evenp parenb -parodd cs7 ile aynı\n" -#: src/stty.c:686 +#: src/stty.c:695 msgid "" " -evenp same as -parenb cs8\n" " * [-]lcase same as xcase iuclc olcuc\n" @@ -9931,7 +10303,7 @@ msgstr "" " nl -icrnl -onlcr ile aynı\n" " -nl icrnl -inlcr -igncr onlcr -ocrnl -onlret ile aynı\n" -#: src/stty.c:694 +#: src/stty.c:703 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -9945,7 +10317,7 @@ msgstr "" " pass8 -parenb -istrip cs8 ile aynı\n" " -pass8 parenb istrip cs7 ile aynı\n" -#: src/stty.c:701 +#: src/stty.c:710 msgid "" " raw same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" " -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n" @@ -9957,7 +10329,7 @@ msgstr "" " -imaxbel -opost -isig -icanon -xcase min 1 time 0 ile aynı\n" " -raw cooked ile aynı\n" -#: src/stty.c:707 +#: src/stty.c:716 #, fuzzy msgid "" " sane same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" @@ -9974,7 +10346,7 @@ msgstr "" " -xcase -tostop -echoprt echoctl echoke, tüm özel\n" " karakterlerin öntanımlı değerleriyle aynı.\n" -#: src/stty.c:715 +#: src/stty.c:724 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -9990,12 +10362,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:787 +#: src/stty.c:796 #, c-format msgid "only one device may be specified" msgstr "sadee tek aygıt belirtilebilir" -#: src/stty.c:817 +#: src/stty.c:826 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" @@ -10004,126 +10376,47 @@ msgstr "" "ayrıntılı çıktı seçenekleri ile stty-okuyabilir tarzı çıktı\n" "seçenekleri birlikte kullanılamaz" -#: src/stty.c:823 +#: src/stty.c:832 #, c-format msgid "when specifying an output style, modes may not be set" msgstr "bir çıktı tarzı belirtildiğinde kipler ayarlanamaz" -#: src/stty.c:838 +#: src/stty.c:847 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s: bloklamayan kip sıfırlanamadı" -#: src/stty.c:883 src/stty.c:993 +#: src/stty.c:892 src/stty.c:1002 #, fuzzy, c-format msgid "invalid argument %s" msgstr "%s argümanı geçersiz" -#: src/stty.c:894 src/stty.c:911 src/stty.c:923 src/stty.c:936 src/stty.c:948 -#: src/stty.c:968 +#: 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 msgid "missing argument to %s" msgstr "`%s'de argüman kayıp" -#: src/stty.c:974 +#: src/stty.c:983 #, fuzzy, c-format msgid "invalid line discipline %s" msgstr "geçersiz satır belirleyicisi `%s'" -#: src/stty.c:1044 +#: src/stty.c:1053 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s: istenen işlemlerin tümü yapılamıyor" -#: src/stty.c:1390 +#: src/stty.c:1399 #, c-format msgid "%s: no size information for this device" msgstr "%s: bu aygıt için boyut bilgileri yok" -#: src/stty.c:1904 +#: src/stty.c:1920 #, fuzzy, c-format msgid "invalid integer argument %s" msgstr "tamsayı argüman olarak `%s' geçersiz" -#: src/su.c:229 -msgid "Password:" -msgstr "Parola:" - -#: src/su.c:232 -#, c-format -msgid "getpass: cannot open /dev/tty" -msgstr "getpass: dev/tty açılamıyor" - -#: src/su.c:290 -#, c-format -msgid "cannot set groups" -msgstr "gruplar atanamıyor" - -#: src/su.c:294 -#, c-format -msgid "cannot set group id" -msgstr "grup kimliği atanamıyor" - -#: src/su.c:296 -#, c-format -msgid "cannot set user id" -msgstr "kullanıcı kimliği atanamıyor" - -#: src/su.c:371 -#, c-format -msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" -msgstr "Kullanımı: %s [SEÇENEK]... [-] [KULLANICI [ARG]...]\n" - -#: src/su.c:372 -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" - -#: src/su.c:384 -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" - -#: src/su.c:461 -#, c-format -msgid "user %s does not exist" -msgstr "%s diye bir kullanıcı yok" - -#: src/su.c:484 -#, c-format -msgid "incorrect password" -msgstr "parola yanlış" - -#: src/su.c:501 -#, c-format -msgid "using restricted shell %s" -msgstr "kısıtlı kabuk %s kullanılıyor" - -#: src/su.c:509 -#, c-format -msgid "warning: cannot change directory to %s" -msgstr "uyarı: %s dizinine geçilemiyor" - #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 #, fuzzy @@ -10158,7 +10451,7 @@ msgstr "" msgid "ignoring all arguments" msgstr "argümanların tamamı yoksayılıyor" -#: src/system.h:340 +#: src/system.h:343 #, c-format msgid "" "\n" @@ -10167,15 +10460,25 @@ msgid "" "for details about the options it supports.\n" msgstr "" -#: src/system.h:346 +#: src/system.h:349 msgid " --help display this help and exit\n" msgstr " --help bu yardımı gösterir ve çıkar\n" -#: src/system.h:348 +#: src/system.h:351 msgid " --version output version information and exit\n" msgstr " --version sürüm bilgisini gösterir ve çıkar\n" -#: src/system.h:541 +# +#: src/system.h:544 +#, fuzzy +msgid "" +"\n" +"Mandatory arguments to long options are mandatory for short options too.\n" +msgstr "" +"Uzun seçenekler için zorunlu olan argümanlar kısa seçenekler için de " +"zorunludur.\n" + +#: src/system.h:552 msgid "" "\n" "SIZE is an integer and optional unit (example: 10M is 10*1024*1024). Units\n" @@ -10183,7 +10486,7 @@ msgid "" "1000).\n" msgstr "" -#: src/system.h:550 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -10192,7 +10495,7 @@ msgid "" "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n" msgstr "" -#: src/system.h:560 +#: src/system.h:571 #, fuzzy, c-format msgid "" "\n" @@ -10206,22 +10509,22 @@ msgstr "" #. <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:574 +#: src/system.h:585 #, c-format msgid "Report %s translation bugs to <http://translationproject.org/team/>\n" msgstr "" -#: src/system.h:578 +#: src/system.h:589 #, c-format msgid "For complete documentation, run: info coreutils '%s invocation'\n" msgstr "" -#: src/system.h:585 +#: src/system.h:596 #, 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:617 +#: src/system.h:628 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -10242,16 +10545,16 @@ 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" -"\n" msgstr "" "DOSYAları baştan sona yazar ( son satır ilk).\n" "DOSYA belirtilmediğinde veya - olduğunda standart girdiden okur.\n" "\n" -#: src/tac.c:145 +#: src/tac.c:144 msgid "" " -b, --before attach the separator before instead of after\n" " -r, --regex interpret the separator as a regular expression\n" @@ -10262,42 +10565,42 @@ msgstr "" " (regex = regular expression (düzenli ifade))\n" " -s, --seperator=AYRAC satırları `\\n' yerine AYRAC ile ayır\n" -#: src/tac.c:235 src/tac.c:336 +#: src/tac.c:234 src/tac.c:335 #, c-format msgid "%s: seek failed" msgstr "%s: arama (seek) başarısız" -#: src/tac.c:264 +#: src/tac.c:263 #, c-format msgid "record too large" msgstr "kayıt çok büyük" -#: src/tac.c:451 +#: src/tac.c:450 #, fuzzy, c-format msgid "failed to create temporary file in %s" msgstr "geçici dosya %s oluşturulamadı" -#: src/tac.c:459 +#: src/tac.c:458 #, fuzzy, c-format msgid "failed to open %s for writing" msgstr "%s: yazmak için açılamadı" -#: src/tac.c:476 +#: src/tac.c:475 #, fuzzy, c-format msgid "failed to rewind stream for %s" msgstr "%s'in zaman damgaları korunamadı" -#: src/tac.c:512 src/tac.c:519 +#: src/tac.c:511 src/tac.c:518 #, c-format msgid "%s: write error" msgstr "%s: yazma hatası" -#: src/tac.c:572 +#: src/tac.c:571 #, fuzzy, c-format msgid "failed to open %s for reading" msgstr "%s okumak için açılamadı" -#: src/tac.c:630 +#: src/tac.c:629 #, c-format msgid "separator cannot be empty" msgstr "-s 'ten sonra AYRAC belirtilmeli" @@ -10308,18 +10611,17 @@ msgid "Ian Lance Taylor" msgstr "" #: src/tail.c:262 -#, c-format +#, fuzzy, 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" -"\n" msgstr "" "Belirtilen her DOSYA'nın son %d satırını standart çıktıya yazar.\n" "Dosya ismi belirtilmediğinde veya - olduğunda standart girdiden okur.\n" "\n" -#: src/tail.c:271 +#: src/tail.c:270 msgid "" " -c, --bytes=K output the last K bytes; alternatively, use -c " "+K\n" @@ -10327,7 +10629,7 @@ msgid "" "file\n" msgstr "" -#: src/tail.c:275 +#: src/tail.c:274 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -10345,7 +10647,7 @@ msgstr "" " descriptor'ını kullanarak izler.\n" " -F --follow=name --retry 'ın aynısı \n" -#: src/tail.c:282 +#: src/tail.c:281 #, fuzzy, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -10369,7 +10671,7 @@ msgstr "" "yapar)\n" # -#: src/tail.c:295 +#: src/tail.c:294 #, fuzzy msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" @@ -10388,9 +10690,7 @@ msgstr "" "eder \n" " -v, --verbose dosya isimlerini gösteren başlıklar yazar\n" -# -#: src/tail.c:302 -#, fuzzy +#: src/tail.c:301 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations.\n" @@ -10398,17 +10698,8 @@ msgid "" " least once every N seconds.\n" " -v, --verbose always output headers giving file names\n" msgstr "" -" --pid=PID -f ile kullanılır. Proses numarası PID olan " -"proses\n" -" öldükten sonra çıkar\n" -" -q, --quiet, --silent dosya isimlerini gösteren başlıklar yazmaz\n" -" -s, --sleep-interval=S -f ile kullanıldığı zaman dosyaya birşey yazılıp " -"yazıl-\n" -" madığını S saniyede bir (öntanımlı 1.0) kontrol " -"eder \n" -" -v, --verbose dosya isimlerini gösteren başlıklar yazar\n" -#: src/tail.c:311 +#: src/tail.c:310 #, fuzzy msgid "" "\n" @@ -10426,7 +10717,7 @@ msgstr "" "b = 512, k = 1024, m = 1024*1024.\n" "\n" -#: src/tail.c:320 +#: src/tail.c:319 #, fuzzy msgid "" "With --follow (-f), tail defaults to following the file descriptor, which\n" @@ -10442,64 +10733,64 @@ 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:379 +#: src/tail.c:378 #, c-format msgid "closing %s (fd=%d)" msgstr "%s kapatılıyor (fd=%d)" -#: src/tail.c:454 +#: 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:458 +#: src/tail.c:457 #, 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:895 +#: src/tail.c:894 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "" -#: src/tail.c:907 +#: src/tail.c:906 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" msgstr "" -#: src/tail.c:964 +#: src/tail.c:963 #, fuzzy, c-format msgid "%s has become inaccessible" msgstr "`%s' dosyası okunamaz hale geldi" -#: src/tail.c:981 +#: src/tail.c:980 #, 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:990 +#: src/tail.c:989 #, 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:1011 +#: src/tail.c:1010 #, fuzzy, c-format msgid "%s has become accessible" msgstr "`%s' dosyası tekrar okunabilir hale geldi" -#: src/tail.c:1019 +#: src/tail.c:1018 #, 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:1030 +#: src/tail.c:1029 #, 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:1131 +#: src/tail.c:1130 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: bloklamayan kip değiştirilemedi" @@ -10870,17 +11161,22 @@ msgstr "`]' eksik\n" msgid "extra argument %s" msgstr "%s argümanı fazla" -#: src/timeout.c:124 +#: src/timeout.c:112 +#, c-format +msgid "warning: sigprocmask" +msgstr "" + +#: src/timeout.c:145 #, c-format msgid "warning: timer_settime" msgstr "" -#: src/timeout.c:129 +#: src/timeout.c:150 #, c-format msgid "warning: timer_create" msgstr "" -#: src/timeout.c:204 +#: src/timeout.c:225 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -10890,18 +11186,18 @@ msgstr "" " veya: %s SEÇENEK\n" # -#: src/timeout.c:208 +#: src/timeout.c:229 #, fuzzy -msgid "" -"Start COMMAND, and kill it if still running after DURATION.\n" -"\n" -"Mandatory arguments to long options are mandatory for short options too.\n" +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:213 +#: src/timeout.c:235 msgid "" +" --preserve-status\n" +" exit with the same status as COMMAND, even when the\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 " @@ -10916,7 +11212,7 @@ msgid "" " See 'kill -l' for a list of signals\n" msgstr "" -#: src/timeout.c:229 +#: src/timeout.c:254 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -10924,25 +11220,30 @@ msgid "" "days.\n" msgstr "" -#: src/timeout.c:234 +#: src/timeout.c:259 msgid "" "\n" -"If the command times out, then exit with status 124. Otherwise, exit\n" -"with the status of COMMAND. If no signal is specified, send the TERM\n" -"signal upon timeout. The TERM signal kills any process that does not\n" -"block or catch that signal. For other processes, it may be necessary to\n" -"use the KILL (9) signal, since this signal cannot be caught. If the\n" -"KILL (9) signal is sent, the exit status is 128+9 rather than 124.\n" +"If the command times out, and --preserve-status is not set, then exit with\n" +"status 124. Otherwise, exit with the status of COMMAND. If no signal\n" +"is specified, send the TERM signal upon timeout. The TERM signal kills\n" +"any process that does not block or catch that signal. It may be necessary\n" +"to use the KILL (9) signal, since this signal cannot be caught, in which\n" +"case the exit status is 128+9 rather than 124.\n" +msgstr "" + +#: src/timeout.c:363 +#, c-format +msgid "warning: disabling core dumps failed" msgstr "" -#: src/timeout.c:419 +#: src/timeout.c:471 #, fuzzy, c-format msgid "error waiting for command" msgstr "%s'e yazarken hata" -#: src/timeout.c:441 +#: src/timeout.c:482 #, c-format -msgid "warning: disabling core dumps failed" +msgid "the monitored command dumped core" msgstr "" #. This is a proper name. See the gettext manual, section Names. @@ -10955,22 +11256,22 @@ msgstr "" msgid "Randy Smith" msgstr "" -#: src/touch.c:115 src/touch.c:313 +#: src/touch.c:115 src/touch.c:309 #, c-format msgid "invalid date format %s" msgstr "geçersiz tarih biçemi %s" -#: src/touch.c:194 +#: src/touch.c:191 #, c-format msgid "cannot touch %s" msgstr "`touch' %s yapılamadı" -#: src/touch.c:200 +#: src/touch.c:197 #, c-format msgid "setting times of %s" msgstr "%s'in zamanları değiştiriliyor" -#: src/touch.c:216 +#: src/touch.c:213 msgid "" "Update the access and modification times of each FILE to the current time.\n" "\n" @@ -10979,10 +11280,9 @@ msgid "" "\n" "A FILE argument string of - is handled specially and causes touch to\n" "change the times of the file associated with standard output.\n" -"\n" msgstr "" -#: src/touch.c:229 +#: src/touch.c:225 #, fuzzy msgid "" " -a change only the access time\n" @@ -10996,7 +11296,7 @@ msgstr "" " -f (yoksayılıyor)\n" " -m yalnız değişim tarihini günceller\n" -#: src/touch.c:235 +#: src/touch.c:231 #, fuzzy msgid "" " -h, --no-dereference affect each symbolic link instead of any " @@ -11010,11 +11310,12 @@ msgstr "" " dosyayı değil. (yalnızca sembolik bağ sahibiyetini\n" " değiştirebilen sistemlerde bulunur.\n" -#: src/touch.c:241 +#: 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" -" --time=WORD change the specified time:\n" +" --time=WORD change the specified time:\n" " WORD is access, atime, or use: equivalent to -a\n" " WORD is modify or mtime: equivalent to -m\n" msgstr "" @@ -11028,7 +11329,7 @@ msgstr "" " aynı) modify (değişim) mtime (değişim, -m ile " "aynı)\n" -#: src/touch.c:250 +#: src/touch.c:246 msgid "" "\n" "Note that the -d and -t options accept different time-date formats.\n" @@ -11036,12 +11337,12 @@ msgstr "" "\n" "Dikkat: -d ve -t seçenekleri farklı zaman/tarih biçemleri kabul ederler.\n" -#: src/touch.c:339 +#: src/touch.c:335 #, c-format msgid "cannot specify times from more than one source" msgstr "zaman birden fazla kaynaktan belirtilemez" -#: src/touch.c:413 +#: src/touch.c:409 #, fuzzy, c-format msgid "" "warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'" @@ -11318,25 +11619,24 @@ msgid "" "If a FILE is larger than the specified size, the extra data is lost.\n" "If a FILE is shorter, it is extended and the extended part (hole)\n" "reads as zero bytes.\n" -"\n" msgstr "" -#: src/truncate.c:110 +#: src/truncate.c:109 msgid " -c, --no-create do not create any files\n" msgstr "" -#: src/truncate.c:113 +#: src/truncate.c:112 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" -#: src/truncate.c:116 +#: 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" msgstr "" -#: src/truncate.c:122 +#: src/truncate.c:121 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -11344,57 +11644,57 @@ msgid "" "'/' round down to multiple of, '%' round up to multiple of.\n" msgstr "" -#: src/truncate.c:150 +#: src/truncate.c:149 #, c-format msgid "overflow in %<PRIdMAX> * %<PRIdMAX> byte blocks for file %s" msgstr "" -#: src/truncate.c:174 +#: src/truncate.c:173 #, fuzzy, c-format msgid "%s has unusable, apparently negative size" msgstr "%s: dosya büyüklüğü negatif" -#: src/truncate.c:184 src/truncate.c:379 +#: src/truncate.c:183 src/truncate.c:384 #, fuzzy, c-format msgid "cannot get the size of %s" msgstr "günün zamanı belirlenemedi" -#: src/truncate.c:206 +#: src/truncate.c:205 #, fuzzy, c-format msgid "overflow rounding up size of file %s" msgstr "%s dosya okunurken görece taşması" -#: src/truncate.c:216 +#: src/truncate.c:215 #, fuzzy, c-format msgid "overflow extending size of file %s" msgstr "%s dosya okunurken görece taşması" -#: src/truncate.c:231 +#: src/truncate.c:230 #, c-format msgid "failed to truncate %s at %<PRIdMAX> bytes" msgstr "" -#: src/truncate.c:305 +#: src/truncate.c:303 #, fuzzy, c-format msgid "multiple relative modifiers specified" msgstr "birden fazla hedef dizin belirtilmiş" -#: src/truncate.c:335 +#: src/truncate.c:333 #, fuzzy, c-format msgid "you must specify either %s or %s" msgstr "bayt, karakter ya da alan listesi belirtilmelidir" -#: src/truncate.c:342 +#: src/truncate.c:340 #, c-format msgid "you must specify a relative %s with %s" msgstr "" -#: src/truncate.c:349 +#: src/truncate.c:347 #, c-format msgid "%s was specified but %s was not" msgstr "" -#: src/truncate.c:400 +#: src/truncate.c:404 #, c-format msgid "cannot open %s for writing" msgstr "%s yazmak için açılamadı" @@ -11488,16 +11788,16 @@ msgid "cannot get system name" msgstr "sistem ismi alınamadı" #: 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" -"\n" msgstr "" "DOSYA'daki boşlukları sekmeye çevirir ve standard çıktıya yazar.\n" "DOSYA belirtilmediğinde veya - olduğunda standard girdiden okur.\n" "\n" -#: src/unexpand.c:125 +#: src/unexpand.c:124 #, fuzzy msgid "" " -a, --all convert all blanks, instead of just initial blanks\n" @@ -11515,12 +11815,12 @@ msgstr "" " -t, --tabs=LİSTE virgüllerle ayrılmış sekme pozisyonları LİSTEsini\n" " kullanır (-a'yı etkinleştirir)\n" -#: src/unexpand.c:153 +#: src/unexpand.c:152 #, c-format msgid "tabs are too far apart" msgstr "sekmeler fazla aralı" -#: src/unexpand.c:505 +#: src/unexpand.c:504 #, fuzzy, c-format msgid "tab stop value is too large" msgstr "sekme boyu %s çok büyük" @@ -11536,10 +11836,9 @@ msgid "" "writing to OUTPUT (or standard output).\n" "\n" "With no options, matching lines are merged to the first occurrence.\n" -"\n" msgstr "" -#: src/uniq.c:148 +#: src/uniq.c:147 msgid "" " -c, --count prefix lines by the number of occurrences\n" " -d, --repeated only print duplicate lines\n" @@ -11547,7 +11846,7 @@ 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:152 +#: src/uniq.c:151 #, fuzzy msgid "" " -D, --all-repeated[=delimit-method] print all duplicate lines\n" @@ -11572,12 +11871,12 @@ msgstr "" " -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:162 +#: src/uniq.c:161 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:167 +#: src/uniq.c:166 #, fuzzy msgid "" "\n" @@ -11588,7 +11887,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:172 +#: src/uniq.c:171 msgid "" "\n" "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n" @@ -11596,24 +11895,24 @@ msgid "" "Also, comparisons honor the rules specified by 'LC_COLLATE'.\n" msgstr "" -#: src/uniq.c:359 +#: src/uniq.c:358 #, c-format msgid "too many repeated lines" msgstr "çok fazla tekrar eden satır" -#: src/uniq.c:522 +#: src/uniq.c:521 msgid "invalid number of fields to skip" msgstr "atlanacak alan sayısı geçersiz" -#: src/uniq.c:531 +#: src/uniq.c:530 msgid "invalid number of bytes to skip" msgstr "atlanacak bayt sayısı geçersiz" -#: src/uniq.c:540 +#: src/uniq.c:539 msgid "invalid number of bytes to compare" msgstr "karşılaştırılacak bayt sayısı geçersiz" -#: src/uniq.c:559 +#: src/uniq.c:558 #, c-format msgid "printing all duplicated lines and repeat counts is meaningless" msgstr "" @@ -11669,6 +11968,11 @@ msgid_plural "up %ld days %2d:%02d, " msgstr[0] "" msgstr[1] "" +#: src/uptime.c:149 +#, fuzzy, c-format +msgid "up %2d:%02d, " +msgstr "Şu an %2d:%02d%s, " + #: src/uptime.c:151 #, c-format msgid "%lu user" @@ -11761,39 +12065,39 @@ msgstr "" msgid " old " msgstr " eski " -#: src/who.c:449 +#: src/who.c:440 msgid "system boot" msgstr "" -#: src/who.c:456 src/who.c:458 +#: src/who.c:447 src/who.c:449 msgid "id=" msgstr "kimlik=" -#: src/who.c:471 src/who.c:476 +#: src/who.c:462 src/who.c:467 msgid "term=" msgstr "terminal=" -#: src/who.c:473 src/who.c:477 +#: src/who.c:464 src/who.c:468 msgid "exit=" msgstr "çıkış=" -#: src/who.c:494 +#: src/who.c:485 msgid "LOGIN" msgstr "" -#: src/who.c:514 +#: src/who.c:505 msgid "clock change" msgstr "saat değişikliği" -#: src/who.c:526 src/who.c:527 +#: src/who.c:517 src/who.c:518 msgid "run-level" msgstr "açılış-seviyesi" -#: src/who.c:530 src/who.c:531 +#: src/who.c:521 src/who.c:522 msgid "last=" msgstr "son=" -#: src/who.c:562 +#: src/who.c:553 #, c-format msgid "" "\n" @@ -11802,44 +12106,44 @@ msgstr "" "\n" "kullanıcı sayısı: %lu\n" -#: src/who.c:568 +#: src/who.c:559 msgid "NAME" msgstr "İSİM" -#: src/who.c:568 +#: src/who.c:559 msgid "LINE" msgstr "HAT" -#: src/who.c:568 +#: src/who.c:559 msgid "TIME" msgstr "SAAT" -#: src/who.c:568 +#: src/who.c:559 msgid "IDLE" msgstr "ATIL " -#: src/who.c:569 +#: src/who.c:560 msgid "PID" msgstr "PID" -#: src/who.c:569 +#: src/who.c:560 msgid "COMMENT" msgstr "AÇIKLAMA" -#: src/who.c:569 +#: src/who.c:560 msgid "EXIT" msgstr "ÇIKIŞ" -#: src/who.c:649 +#: src/who.c:640 #, c-format msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n" msgstr "Kullanımı: %s [SEÇENEK]... [ DOSYA | ARG1 ARG2 ]\n" -#: src/who.c:650 +#: src/who.c:641 msgid "Print information about users who are currently logged in.\n" msgstr "" -#: src/who.c:653 +#: src/who.c:644 msgid "" "\n" " -a, --all same as -b -d --login -p -r -t -T -u\n" @@ -11853,11 +12157,11 @@ msgstr "" " -d, --dead ölü işlemleri yazdırır\n" " -H, --heading sütun başlığı satırı yazdırır\n" -#: src/who.c:660 +#: src/who.c:651 msgid " -l, --login print system login processes\n" msgstr "" -#: src/who.c:663 +#: src/who.c:654 msgid "" " --lookup attempt to canonicalize hostnames via DNS\n" " -m only hostname and user associated with stdin\n" @@ -11868,7 +12172,7 @@ msgstr "" " -m stdGirdi'deki kullanıcı ve makina ismini gösterir\n" " -p, --process init tarafından başlatılan aktif işlemleri listeler\n" -#: src/who.c:668 +#: src/who.c:659 msgid "" " -q, --count all login names and number of users logged on\n" " -r, --runlevel print current runlevel\n" @@ -11880,7 +12184,7 @@ msgstr "" " -s, --short yalnız isim, satır ve zamanı gösterir (öntanımlı)\n" " -t, --time son sistem saat değişikliğini gösterir\n" -#: src/who.c:674 +#: src/who.c:665 msgid "" " -T, -w, --mesg add user's message status as +, - or ?\n" " -u, --users list users logged in\n" @@ -11892,7 +12196,7 @@ msgstr "" " --message -T ile aynı\n" " --writable -T ile aynı\n" -#: src/who.c:682 +#: src/who.c:673 #, fuzzy, c-format msgid "" "\n" @@ -11936,6 +12240,33 @@ 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" @@ -11943,8 +12274,125 @@ msgstr "" #~ "Kullanımı: %s İSİM\n" #~ " veya: %s SEÇENEK\n" -#~ msgid "Usage: %s [OPTION] FILE...\n" -#~ msgstr "Kullanım: %s [SEÇENEK] DOSYA...\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 "cannot set groups" +#~ msgstr "gruplar atanamıyor" + +#~ msgid "cannot set group id" +#~ msgstr "grup kimliği atanamıyor" + +#~ msgid "cannot set user id" +#~ msgstr "kullanıcı 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 "warning: cannot change directory to %s" +#~ msgstr "uyarı: %s dizinine geçilemiyor" #, fuzzy #~ msgid "" @@ -11953,10 +12401,8 @@ 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" +#~ " -f, --silent, --quiet suppress most error messages\n" +#~ " -v, --verbose output a diagnostic for every file processed\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" @@ -11967,6 +12413,13 @@ msgstr "" #~ " --dereference her sembolik bağın imlediği dosyayı değiştirir,\n" #~ " 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" +#~ 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" @@ -11997,13 +12450,6 @@ msgstr "" #~ " -c, --changes verbose gibi, fakat yalnızca değişiklikleri " #~ "bildirir\n" -#~ 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 "" #~ " -f, --silent, --quiet suppress most error messages\n" #~ " -v, --verbose output a diagnostic for every file processed\n" @@ -12059,35 +12505,6 @@ msgstr "" #~ "gösterir.\n" #~ "\n" -#, fuzzy -#~ msgid "Usage: %s [OPTION]... PATH START\n" -#~ msgstr "Kullanım: %s [SEÇENEK]... KÜME1 [KÜME2]\n" - -#, fuzzy -#~ msgid "" -#~ " -n, --no-newline do not output the trailing " -#~ "newline\n" -#~ " " -#~ msgstr "" -#~ "DİZGE(leri) standart çıktıya yazdırır.\n" -#~ "\n" -#~ " -n sonlayan yenisatırı yazdırmaz\n" - -#, fuzzy -#~ 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" -#~ "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" - #, fuzzy #~ msgid "" #~ "Display the current time in the given FORMAT, or set the system date.\n" @@ -12109,12 +12526,20 @@ msgstr "" #~ "nanosaniye\n" #~ " hassasiyetinde gösterilir.\n" -#~ msgid "cannot create link %s" -#~ msgstr "%s bağı oluşturulamadı" - #, fuzzy -#~ msgid "%s: option '%s' is ambiguous\n" -#~ msgstr "%s: `-W %s' seçeneği belirsiz\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" +#~ "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" @@ -12176,6 +12601,9 @@ msgstr "" #~ msgid "cannot overwrite directory %s" #~ msgstr "%s dizininin üzerine yazılamaz" +#~ msgid "cannot create link %s" +#~ msgstr "%s bağı oluşturulamadı" + #~ msgid "" #~ "The backup suffix is `~', unless set with --suffix or " #~ "SIMPLE_BACKUP_SUFFIX.\n" @@ -12200,9 +12628,6 @@ msgstr "" #~ msgid "symbolic links are not supported on this system" #~ msgstr "bu sistemde sembolik bağlar desteklenmiyor" -#~ msgid "invalid format width" -#~ msgstr "geçersiz biçem genişliği" - #~ msgid "invalid format precision" #~ msgstr "geçersiz biçem kesinliği" @@ -12366,9 +12791,6 @@ 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'" @@ -12631,6 +13053,9 @@ msgstr "" #~ msgid "invalid number of lines: 0" #~ msgstr "geçersiz satır sayısı: 0" +#~ msgid "Usage: %s [OPTION] FILE...\n" +#~ msgstr "Kullanım: %s [SEÇENEK] DOSYA...\n" + #~ msgid "" #~ "Display file or file system status.\n" #~ "\n" @@ -12809,9 +13234,6 @@ msgstr "" #~ msgid "`-%lu' option is obsolete; use `-f %lu'" #~ msgstr "`-%lu' seçeneği eski; yerine `-f %lu' kullanın" -#~ msgid " %2d:%02d%s up " -#~ msgstr "Şu an %2d:%02d%s, " - #~ msgid "am" #~ msgstr "öö" diff --git a/po/uk.gmo b/po/uk.gmo index 51f7864f..68e67201 100644 Binary files a/po/uk.gmo and b/po/uk.gmo differ diff --git a/po/uk.po b/po/uk.po index 24b7ff2f..c4b07a32 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. +# Yuri Chornoivan <yurchor@ukr.net>, 2011, 2012, 2013. msgid "" msgstr "" -"Project-Id-Version: coreutils 8.16\n" +"Project-Id-Version: coreutils 8.20-pre3\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2012-05-10 19:35+0200\n" -"PO-Revision-Date: 2012-04-14 22:47+0300\n" +"POT-Creation-Date: 2013-02-14 15:56+0000\n" +"PO-Revision-Date: 2013-02-11 22:58+0200\n" "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n" "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n" "Language: uk\n" @@ -39,19 +39,19 @@ msgstr "Допустимі аргументи:" msgid "error closing file" msgstr "помилка при закритті файла" -#: lib/closeout.c:112 src/base64.c:109 src/base64.c:121 src/base64.c:127 -#: src/base64.c:168 src/base64.c:224 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:330 src/expand.c:355 src/head.c:298 -#: src/head.c:348 src/head.c:756 src/head.c:797 src/mktemp.c:350 src/od.c:919 -#: src/paste.c:160 src/shuf.c:369 src/split.c:727 src/split.c:964 -#: src/split.c:969 src/tail.c:350 src/tail.c:1201 src/tail.c:1307 +#: 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 -#: src/unexpand.c:427 src/unexpand.c:443 +#: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "помилка запису" -#: lib/copy-acl.c:611 src/copy.c:1160 src/copy.c:2602 +#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617 #, c-format msgid "preserving permissions for %s" msgstr "збереження прав доступу для %s" @@ -243,18 +243,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:483 +#: lib/mkdir-p.c:196 src/install.c:484 #, c-format msgid "cannot change permissions of %s" msgstr "Не вдалося змінити права доступу до %s" -#: lib/mkdir-p.c:206 src/copy.c:2261 src/install.c:709 src/install.c:722 +#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722 #, 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:915 src/tac.c:435 +#: src/split.c:929 src/tac.c:434 #, c-format msgid "memory exhausted" msgstr "пам'ять вичерпано" @@ -304,75 +304,75 @@ msgstr "»" msgid "%s: end of file" msgstr "%s: кінець файла" -#: lib/regcomp.c:130 +#: lib/regcomp.c:131 msgid "Success" msgstr "Виконано" -#: lib/regcomp.c:133 +#: lib/regcomp.c:134 msgid "No match" msgstr "Немає збігів" -#: lib/regcomp.c:136 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "Неправильний регулярний вираз" -#: lib/regcomp.c:139 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "Неправильний символ порівняння" -#: lib/regcomp.c:142 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "Некоректна назва класу символу" -#: lib/regcomp.c:145 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "Зворотна коса риска наприкінці" -#: lib/regcomp.c:148 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "Неправильне зворотне посилання" -#: lib/regcomp.c:151 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "Непарна [ чи [^" -#: lib/regcomp.c:154 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "Непарна ( чи \\(" -#: lib/regcomp.c:157 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "Непарна \\{" -#: lib/regcomp.c:160 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "Неприпустимий вміст \\{\\}" -#: lib/regcomp.c:163 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "Неправильний кінець діапазону" -#: lib/regcomp.c:166 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Скінчилась пам'ять" -#: lib/regcomp.c:169 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "Некоректний попередній регулярний вираз" -#: lib/regcomp.c:172 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "Передчасний кінець регулярного виразу" -#: lib/regcomp.c:175 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "Розмір виразу надто великий" -#: lib/regcomp.c:178 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "Непарна ) чи \\)" -#: lib/regcomp.c:703 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "Відсутній попередній регулярний вираз" @@ -412,7 +412,7 @@ msgstr "^[yY]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-mode-acl.c:695 src/copy.c:2284 src/cp.c:518 +#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516 #, c-format msgid "setting permissions for %s" msgstr "встановлення прав доступу для %s" @@ -553,13 +553,13 @@ msgstr "Відмова живлення" msgid "Resource lost" msgstr "Втрачено ресурс" -#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262 -#: lib/spawn-pipe.c:265 +#: 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:232 lib/spawn-pipe.c:346 lib/wait-process.c:282 +#: 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" @@ -575,24 +575,24 @@ msgstr "Сигнал реального часу %d" msgid "Unknown signal %d" msgstr "Невідомий сигнал %d" -#: lib/unicodeio.c:103 +#: lib/unicodeio.c:102 msgid "iconv function not usable" msgstr "функцію iconv неможливо використати" -#: lib/unicodeio.c:105 +#: lib/unicodeio.c:104 msgid "iconv function not available" msgstr "функція iconv недоступна" -#: lib/unicodeio.c:112 +#: lib/unicodeio.c:111 msgid "character out of range" msgstr "символ поза діапазоном" -#: lib/unicodeio.c:182 +#: lib/unicodeio.c:181 #, c-format msgid "cannot convert U+%04X to local character set" msgstr "неможливо перетворити U+%04X у локальне кодування" -#: lib/unicodeio.c:184 +#: lib/unicodeio.c:183 #, c-format msgid "cannot convert U+%04X to local character set: %s" msgstr "неможливо перетворити U+%04X у локальне кодування: %s" @@ -629,7 +629,7 @@ msgstr "Пакування виконано %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 "" @@ -773,7 +773,7 @@ msgstr "" msgid "Report %s bugs to: %s\n" msgstr "Про вади у %s повідомляйте на адресу %s\n" -#: lib/version-etc.c:251 src/system.h:562 +#: lib/version-etc.c:251 src/system.h:573 #, c-format msgid "%s home page: <%s>\n" msgstr "Домашня сторінка %s: <%s>\n" @@ -783,7 +783,7 @@ 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:563 +#: lib/version-etc.c:256 src/system.h:574 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "Загальна довідка з ПЗ GNU: <http://www.gnu.org/gethelp/>\n" @@ -873,14 +873,12 @@ msgstr "Simon Josefsson" msgid "" "Usage: %s [OPTION]... [FILE]\n" "Base64 encode or decode FILE, or standard input, to standard output.\n" -"\n" msgstr "" "Використання: %s [КЛЮЧ]... [ФАЙЛ]\n" "Кодування чи декодування файла чи стандартного потоку вводу у форматі\n" "Base64, і запис у стандартний потік виводу.\n" -"\n" -#: src/base64.c:64 +#: src/base64.c:67 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -896,7 +894,7 @@ msgstr "" " 0 вимикає перенесення рядків.\n" "\n" -#: src/base64.c:73 src/cat.c:110 src/fmt.c:293 src/shuf.c:71 src/sum.c:70 +#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -905,7 +903,7 @@ msgstr "" "Якщо вхідний файл не вказаний, або якщо вказано символ -,\n" "використовується стандартний ввід.\n" -#: src/base64.c:76 +#: src/base64.c:79 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -919,37 +917,37 @@ msgstr "" "формального алфавіту base64. Вказуйте ключ --ignore-garbage, щоб\n" "спробувати ігнорувати неалфавітні знаки в закодованому потоці.\n" -#: src/base64.c:171 src/base64.c:208 src/csplit.c:263 src/csplit.c:1435 -#: src/join.c:451 src/shuf.c:157 src/shuf.c:361 src/tac-pipe.c:74 +#: 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 #, c-format msgid "read error" msgstr "помилка читання" -#: src/base64.c:227 +#: src/base64.c:230 #, c-format msgid "invalid input" msgstr "неправильні вхідні дані" -#: src/base64.c:264 +#: src/base64.c:267 #, c-format msgid "invalid wrap size: %s" msgstr "неправильна величина переносу: %s" -#: src/base64.c:283 src/basename.c:173 src/comm.c:435 src/cp.c:607 -#: src/date.c:441 src/dircolors.c:447 src/du.c:894 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:169 src/install.c:929 src/join.c:961 -#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:157 src/mv.c:447 -#: src/od.c:1802 src/ptx.c:2081 src/readlink.c:154 src/seq.c:408 -#: src/shuf.c:320 src/shuf.c:339 src/sort.c:4477 src/split.c:1313 -#: src/tr.c:1797 src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:454 -#: src/uniq.c:471 src/unlink.c:81 src/uptime.c:250 src/users.c:146 -#: src/wc.c:666 src/who.c:836 src/whoami.c:79 +#: 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 #, c-format msgid "extra operand %s" msgstr "зайвий операнд %s" -#: src/base64.c:315 src/cat.c:781 +#: src/base64.c:318 src/cat.c:781 #, c-format msgid "closing standard input" msgstr "закривається стандартний потік вводу" @@ -957,15 +955,15 @@ 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/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:53 src/env.c:33 +#: 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/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:65 src/su.c:88 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 +#: 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 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -982,13 +980,11 @@ msgstr "" msgid "" "Print NAME with any leading directory components removed.\n" "If specified, also remove a trailing SUFFIX.\n" -"\n" msgstr "" "Вивести НАЗВУ з вилученням компонента каталогу на початку рядка.\n" "Також вилучити завершальний СУФІКС (якщо вказано).\n" -"\n" -#: src/basename.c:59 +#: 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" @@ -1000,7 +996,7 @@ msgstr "" " -z, --zero відокремлювати пункти у виведенні символом NUL, а не " "символом нового рядка\n" -#: src/basename.c:66 +#: src/basename.c:67 #, c-format msgid "" "\n" @@ -1017,20 +1013,21 @@ msgstr "" " %s -s .h include/stdio.h -> «stdio»\n" " %s -a any/str1 any/str2 -> «str1», потім «str2»\n" -#: src/basename.c:167 src/chcon.c:531 src/chgrp.c:277 src/chmod.c:526 -#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1369 +#: 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:183 src/mkfifo.c:108 src/mknod.c:146 src/nohup.c:111 -#: src/pathchk.c:148 src/printf.c:674 src/readlink.c:146 src/realpath.c:236 -#: src/rm.c:314 src/rmdir.c:223 src/seq.c:402 src/setuidgid.c:137 -#: src/sleep.c:119 src/stat.c:1476 src/stdbuf.c:346 src/tr.c:1782 +#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 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 #, 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:52 src/split.c:49 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/split.c:49 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" @@ -1040,8 +1037,8 @@ msgstr "Torbjorn Granlund" msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:846 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4720 src/nl.c:182 src/paste.c:435 src/pr.c:2768 src/sum.c:58 +#: 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/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" @@ -1098,7 +1095,7 @@ msgstr "" msgid "cannot do ioctl on %s" msgstr "помилка ioctl на %s" -#: src/cat.c:637 src/dd.c:2209 src/sort.c:379 src/tee.c:165 src/yes.c:86 +#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86 #, c-format msgid "standard output" msgstr "стандартний вивід" @@ -1115,14 +1112,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:55 src/head.c:46 src/hostid.c:33 +#: 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 msgid "Jim Meyering" msgstr "Jim Meyering" -#: src/chcon.c:100 src/runcon.c:203 src/runcon.c:234 +#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238 #, c-format msgid "failed to create security context: %s" msgstr "не вдалося створити контексту безпеки: %s" @@ -1132,8 +1129,8 @@ msgstr "не вдалося створити контексту безпеки: msgid "failed to set %s security context component to %s" msgstr "не вдалося встановити %s контекст безпеки компоненту %s" -#: src/chcon.c:156 src/chcon.c:540 src/copy.c:2222 src/runcon.c:217 -#: src/stat.c:683 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221 +#: src/stat.c:702 #, c-format msgid "failed to get security context of %s" msgstr "не вдалося встановити контекст безпеки %s" @@ -1149,12 +1146,12 @@ 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:446 src/ls.c:2981 +#: src/du.c:457 src/ls.c:2981 #, c-format msgid "cannot access %s" msgstr "не вдалося отримати доступ до %s" -#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:426 +#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437 #, c-format msgid "cannot read directory %s" msgstr "не вдалося прочитати каталог %s" @@ -1164,13 +1161,13 @@ 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:599 +#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562 #, 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:618 -#: src/remove.c:613 +#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642 +#: src/remove.c:576 #, c-format msgid "fts_close failed" msgstr "помилка fts_close" @@ -1192,13 +1189,12 @@ msgid "" "Change the security context of each FILE to CONTEXT.\n" "With --reference, change the security context of each FILE to that of " "RFILE.\n" -"\n" msgstr "" "Змінює контекст безпеки кожного файла ФАЙЛ на КОНТЕКСТ.\n" "З ключем --reference, змінює контекст безпеки кожного ФАЙЛа на контекст " "ЗФАЙЛа.\n" -#: src/chcon.c:362 src/chgrp.c:123 src/chown.c:94 +#: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94 msgid "" " --dereference affect the referent of each symbolic link (this is\n" " the default), rather than the symbolic link itself\n" @@ -1210,7 +1206,7 @@ msgstr "" " -h, --no-dereference обробити символічні посилання замість файлів, на " "які вони посилаються\n" -#: src/chcon.c:367 +#: src/chcon.c:369 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" @@ -1224,7 +1220,15 @@ msgstr "" " -l, --range=ДІАПАЗОН встановити діапазон ДІАПАЗОН у цільовому контексті " "безпеки\n" -#: src/chcon.c:373 +#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 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 не трактувати '/' особливим чином (типово)\n" +" --preserve-root перешкоджати рекурсивному виконанню на '/'\n" + +#: src/chcon.c:379 msgid "" " --reference=RFILE use RFILE's security context rather than " "specifying\n" @@ -1233,17 +1237,17 @@ msgstr "" " --reference=ЗФАЙЛА використовувати контекст ЗФАЙЛА замість явного\n" " вказування КОНТЕКСТ\n" -#: src/chcon.c:377 src/chgrp.c:140 src/chown.c:118 +#: 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 обробляти файли і каталоги рекурсивно\n" -#: src/chcon.c:380 +#: src/chcon.c:386 msgid " -v, --verbose output a diagnostic for every file processed\n" msgstr "" " -v, --verbose вивести діагностичні дані для кожного з оброблених " "файлів\n" -#: src/chcon.c:383 src/chgrp.c:143 src/chown.c:121 +#: src/chcon.c:389 src/chgrp.c:143 src/chown.c:121 msgid "" "\n" "The following options modify how a hierarchy is traversed when the -R\n" @@ -1258,7 +1262,7 @@ msgid "" "\n" msgstr "" "\n" -"Наступні ключі впливають на спосіб обходу ієрархії каталогів при\n" +"Вказані нижче ключі впливають на спосіб обходу ієрархії каталогів при\n" "заданому ключі -R. Якщо вказано декілька цих ключів, діє\n" "лише останній.\n" "\n" @@ -1269,36 +1273,36 @@ msgstr "" " -P не переходити за символьними посиланнями (типово)\n" "\n" -#: src/chcon.c:512 src/chgrp.c:264 src/chown.c:267 +#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267 #, c-format msgid "-R --dereference requires either -H or -L" -msgstr "Для комбінація ключів -R --dereference треба вказати -H або -L" +msgstr "Для комбінації ключів -R --dereference слід вказати -H або -L" -#: src/chcon.c:518 +#: src/chcon.c:524 #, c-format msgid "-R -h requires -P" msgstr "при вказуванні -R -h потрібно вказати -P" -#: src/chcon.c:533 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282 -#: src/comm.c:429 src/csplit.c:1371 src/join.c:1149 src/link.c:79 -#: src/mknod.c:148 src/setuidgid.c:139 src/tr.c:1785 +#: 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 #, c-format msgid "missing operand after %s" msgstr "пропущений операнд після %s" -#: src/chcon.c:556 src/runcon.c:247 +#: src/chcon.c:562 src/runcon.c:251 #, c-format msgid "invalid context: %s" msgstr "неправильний контекст: %s" -#: src/chcon.c:563 +#: src/chcon.c:569 #, c-format msgid "conflicting security context specifiers given" -msgstr "вказано конфліктуючі специфікатори контексту безпеки" +msgstr "вказано конфліктні специфікатори контексту безпеки" -#: src/chcon.c:572 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:433 src/cp.c:493 -#: src/mv.c:96 src/pwd.c:273 src/rm.c:324 src/touch.c:351 +#: 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 #, c-format msgid "failed to get attributes of %s" msgstr "помилка отримання атрибутів %s" @@ -1348,14 +1352,6 @@ msgstr "" " (діє лише на системі з підтримкою зміни прав\n" " власності символічних посилань)\n" -#: src/chgrp.c:132 src/chmod.c:387 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 не трактувати '/' особливим чином (типово)\n" -" --preserve-root перешкоджати рекурсивному виконанню на '/'\n" - #: src/chgrp.c:136 msgid "" " --reference=RFILE use RFILE's group rather than specifying a\n" @@ -1618,7 +1614,7 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:97 src/install.c:575 src/setuidgid.c:110 src/setuidgid.c:120 +#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120 #, c-format msgid "invalid group %s" msgstr "неправильна група %s" @@ -1686,8 +1682,8 @@ msgstr "не вдалося встановити ідентифікатор гр msgid "failed to set user-ID" msgstr "не вдалося встановити ідентифікатор користувача" -#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:213 src/stdbuf.c:366 -#: src/timeout.c:402 +#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365 +#: src/timeout.c:454 #, c-format msgid "failed to run command %s" msgstr "не вдалося виконати команду %s" @@ -1805,20 +1801,24 @@ msgstr "задано декілька розділювачів" msgid "empty %s not allowed" msgstr "порожній рядок %s є неприпустимим" -#: src/copy.c:168 src/dd.c:1609 src/dd.c:1976 +#: 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 #, c-format -msgid "reading %s" -msgstr "читання %s" +msgid "error reading %s" +msgstr "помилка читання %s" -#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:426 +#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425 #, c-format msgid "cannot lseek %s" msgstr "не вдалося виконати lseek для %s" -#: src/copy.c:206 src/dd.c:2039 src/dd.c:2102 +#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151 #, c-format -msgid "writing %s" -msgstr "запис %s" +msgid "error writing %s" +msgstr "помилка запису %s" #: src/copy.c:313 #, c-format @@ -1840,7 +1840,7 @@ msgstr "не вдалося розширити %s" msgid "clearing permissions for %s" msgstr "очищення прав доступу для %s" -#: src/copy.c:697 src/copy.c:2470 src/cp.c:331 +#: src/copy.c:697 src/copy.c:2480 src/cp.c:329 #, c-format msgid "failed to preserve ownership for %s" msgstr "не вдалося зберегти власника %s" @@ -1855,14 +1855,14 @@ msgstr "не вдалося найти файл %s" msgid "failed to preserve authorship for %s" msgstr "не вдалося зберегти автора %s" -#: src/copy.c:804 src/csplit.c:638 src/du.c:901 src/fmt.c:449 src/head.c:847 -#: src/sort.c:4489 src/split.c:1329 src/tail.c:1756 src/wc.c:678 +#: 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 "не вдалося відкрити %s для читання" -#: src/copy.c:810 src/copy.c:972 src/dd.c:1546 src/dd.c:2114 src/dd.c:2252 -#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:141 +#: 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 #, c-format msgid "cannot fstat %s" msgstr "не вдалося виконати fstat для %s" @@ -1882,14 +1882,14 @@ msgstr "не вдалося отримати контекст файлової msgid "failed to set the security context of %s to %s" msgstr "не вдалося встановити контекст безпеки %s на %s" -#: src/copy.c:881 src/copy.c:1574 src/copy.c:1777 src/copy.c:1935 src/ln.c:314 -#: src/remove.c:267 src/remove.c:293 src/remove.c:444 src/remove.c:465 +#: 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 #, c-format msgid "cannot remove %s" msgstr "не вдалося вилучити %s" -#: src/copy.c:886 src/copy.c:1578 src/copy.c:1772 src/copy.c:1940 -#: src/remove.c:418 +#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945 +#: src/remove.c:375 #, c-format msgid "removed %s\n" msgstr "вилучено %s\n" @@ -1909,189 +1909,189 @@ msgstr "не вдалося створити звичайний файл %s" msgid "failed to clone %s from %s" msgstr "не вдалося клонувати %s з %s" -#: src/copy.c:1098 src/copy.c:2531 +#: src/copy.c:1098 src/copy.c:2541 #, c-format msgid "preserving times for %s" msgstr "збереження відмітки про час %s" -#: src/copy.c:1170 src/copy.c:1176 src/head.c:855 src/touch.c:175 -#: src/truncate.c:413 +#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172 +#: src/truncate.c:417 #, c-format -msgid "closing %s" -msgstr "закриття %s" +msgid "failed to close %s" +msgstr "не вдалося закрити %s" -#: src/copy.c:1466 +#: src/copy.c:1471 #, c-format msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? " msgstr "%s: намагатись переписати %s, незважаючи на права доступу %04lo (%s)? " -#: src/copy.c:1473 +#: src/copy.c:1478 #, c-format msgid "%s: overwrite %s? " msgstr "%s: переписати %s? " -#: src/copy.c:1542 +#: src/copy.c:1547 #, c-format msgid " (backup: %s)" msgstr " (резервна копія: %s)" -#: src/copy.c:1552 +#: src/copy.c:1557 #, c-format msgid "failed to restore the default file creation context" msgstr "помилка при відновленні типового контексту при створенні файла" -#: src/copy.c:1584 +#: src/copy.c:1589 #, c-format msgid "cannot create hard link %s to %s" msgstr "не вдалося створити жорстке посилання %s на %s" -#: src/copy.c:1637 src/copy.c:1689 src/copy.c:2272 src/copy.c:2589 +#: 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:1220 src/truncate.c:365 +#: src/stat.c:1239 src/truncate.c:363 #, c-format msgid "cannot stat %s" msgstr "не вдалося виконати stat для %s" -#: src/copy.c:1645 +#: src/copy.c:1650 #, c-format msgid "omitting directory %s" msgstr "пропуск каталогу %s" -#: src/copy.c:1659 +#: src/copy.c:1664 #, c-format msgid "warning: source file %s specified more than once" msgstr "попередження: вхідний файл %s вказаний більше одного разу" -#: src/copy.c:1707 src/ln.c:246 +#: src/copy.c:1712 src/ln.c:246 #, c-format msgid "%s and %s are the same file" msgstr "%s та %s - один і той самий файл" -#: src/copy.c:1806 +#: src/copy.c:1811 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "не можна перезаписати файл %s, що не є каталогом, каталогом %s" -#: src/copy.c:1824 src/ln.c:214 +#: src/copy.c:1829 src/ln.c:214 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "не переписується щойно створений %s %s" -#: src/copy.c:1842 +#: src/copy.c:1847 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "не можна перезаписувати каталог %s файлом, що не є каталогом" -#: src/copy.c:1856 +#: src/copy.c:1861 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "не можна перейменувати каталог на файл, що не є каталогом: %s -> %s" -#: src/copy.c:1886 +#: src/copy.c:1891 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "збереження запасної копії %s знищить оригінал; %s не перенесений" -#: src/copy.c:1887 +#: src/copy.c:1892 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "збереження запасної копії %s знищить оригінал; %s не скопійовано" -#: src/copy.c:1910 src/ln.c:276 +#: src/copy.c:1915 src/ln.c:276 #, c-format msgid "cannot backup %s" msgstr "не вдалося створити резервну копію для %s" -#: src/copy.c:1974 +#: src/copy.c:1979 #, c-format msgid "will not copy %s through just-created symlink %s" msgstr "не буде копіюватися %s через щойно створене символьне посилання %s" -#: src/copy.c:2051 +#: src/copy.c:2056 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "не вдалося скопіювати каталог, %s, у самого себе, %s" -#: src/copy.c:2068 +#: src/copy.c:2073 #, c-format msgid "will not create hard link %s to directory %s" msgstr "жорстке посилання %s на каталог %s не буде створено" -#: src/copy.c:2118 +#: src/copy.c:2123 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "не вдалося перенести %s у свій власний підкаталог, %s" -#: src/copy.c:2161 +#: src/copy.c:2166 #, c-format msgid "cannot move %s to %s" msgstr "не вдалося перемістити %s у %s" -#: src/copy.c:2173 +#: src/copy.c:2178 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" "помилка при переміщенні з пристрою %s на пристрій %s: не вдалося вилучити " "цільовий файл" -#: src/copy.c:2207 src/install.c:905 src/mkdir.c:189 src/mkfifo.c:114 -#: src/mknod.c:167 +#: 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:2241 +#: src/copy.c:2246 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "не вдалося скопіювати циклічне символьне посилання %s" -#: src/copy.c:2350 +#: src/copy.c:2355 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "" "%s: відносні символьні посилання можна створювати лише у поточному каталозі" -#: src/copy.c:2357 +#: src/copy.c:2362 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "не вдалося створити символьне посилання %s на %s" -#: src/copy.c:2406 src/mkfifo.c:133 +#: src/copy.c:2416 src/mkfifo.c:132 #, c-format msgid "cannot create fifo %s" msgstr "не вдалося створити чергу %s" -#: src/copy.c:2415 +#: src/copy.c:2425 #, c-format msgid "cannot create special file %s" msgstr "не вдалося створити спеціальній файл %s" -#: src/copy.c:2426 src/ls.c:3191 src/stat.c:902 +#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921 #, c-format msgid "cannot read symbolic link %s" msgstr "не вдалося прочитати символьне посилання %s" -#: src/copy.c:2453 +#: src/copy.c:2463 #, c-format msgid "cannot create symbolic link %s" msgstr "не вдалося створити символьне посилання %s" -#: src/copy.c:2485 +#: src/copy.c:2495 #, c-format msgid "%s has unknown file type" msgstr "%s має невідомий тип файла" -#: src/copy.c:2629 src/ln.c:358 +#: src/copy.c:2644 src/ln.c:358 #, c-format msgid "cannot un-backup %s" msgstr "не вдалося відновити %s з резервної копії" -#: src/copy.c:2633 +#: src/copy.c:2648 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (відновлення)\n" -#: src/cp.c:156 src/mv.c:284 +#: src/cp.c:156 src/mv.c:286 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -2103,27 +2103,10 @@ msgstr "" " або: %s [КЛЮЧ]... -t КАТАЛОГ ДЖЕРЕЛО...\n" #: src/cp.c:162 -msgid "" -"Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" -"\n" -msgstr "" -"Копіює ДЖЕРЕЛО у ЦІЛЬ, або декілька ДЖЕРЕЛ у КАТАЛОГ.\n" -"\n" - -#: src/cp.c:166 src/csplit.c:1458 src/cut.c:197 src/df.c:852 src/du.c:268 -#: src/expand.c:112 src/fmt.c:275 src/fold.c:75 src/head.c:115 -#: src/install.c:612 src/kill.c:86 src/ln.c:392 src/ls.c:4726 src/mkdir.c:61 -#: src/mkfifo.c:56 src/mknod.c:58 src/mv.c:294 src/nl.c:191 src/paste.c:445 -#: src/pr.c:2777 src/ptx.c:1825 src/shred.c:153 src/shuf.c:58 src/sort.c:399 -#: src/split.c:211 src/stdbuf.c:95 src/tac.c:142 src/tail.c:268 -#: src/touch.c:226 src/truncate.c:107 src/unexpand.c:122 src/uniq.c:145 -msgid "" -"Mandatory arguments to long options are mandatory for short options too.\n" -msgstr "" -"Обов'язкові аргументи для довгих форм запису параметрів є обов'язковими і " -"для скорочених форм.\n" +msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" +msgstr "Копіює ДЖЕРЕЛО у ЦІЛЬ, або декілька ДЖЕРЕЛ у КАТАЛОГ.\n" -#: src/cp.c:169 +#: src/cp.c:168 msgid "" " -a, --archive same as -dR --preserve=all\n" " --attributes-only don't copy the file data, just the " @@ -2145,12 +2128,13 @@ msgstr "" " -d те саме, що й --no-dereference --" "preserve=link\n" -#: src/cp.c:178 +#: src/cp.c:177 msgid "" " -f, --force if an existing destination file cannot be\n" -" opened, remove it and try again (redundant " -"if\n" -" the -n option is used)\n" +" opened, remove it and try again (this " +"option\n" +" is ignored when the -n option is also " +"used)\n" " -i, --interactive prompt before overwrite (overrides a previous " "-n\n" " option)\n" @@ -2158,13 +2142,14 @@ msgid "" msgstr "" " -f, --force якщо не можна відкрити існуючий файл,\n" " вилучити його та спробувати ще раз\n" -" (зайве, при вказаному параметрі -n )\n" +" (буде проігноровано, якщо вказано\n" +" параметр -n )\n" " -i, --interactive запитувати підтвердження перед переписом\n" " (перевизначає раніше вказаний параметрі -" "n )\n" " -H слідувати за символьним посиланням у ДЖЕРЕЛО\n" -#: src/cp.c:188 +#: src/cp.c:186 msgid "" " -l, --link hard link files instead of copying\n" " -L, --dereference always follow symbolic links in SOURCE\n" @@ -2173,7 +2158,7 @@ msgstr "" " -L, --dereference завжди слідувати за символічним посиланням у " "ДЖЕРЕЛО\n" -#: src/cp.c:192 +#: src/cp.c:190 msgid "" " -n, --no-clobber do not overwrite an existing file (overrides\n" " a previous -i option)\n" @@ -2184,7 +2169,7 @@ msgstr "" " -P, --no-dereference ніколи не йти за символічними посиланнями у " "ДЖЕРЕЛО\n" -#: src/cp.c:197 +#: src/cp.c:195 msgid "" " -p same as --preserve=mode,ownership,timestamps\n" " --preserve[=ATTR_LIST] preserve the specified attributes (default:\n" @@ -2200,7 +2185,7 @@ msgstr "" " додаткові атрибути: context, links, xattr, " "all\n" -#: src/cp.c:205 +#: src/cp.c:203 msgid "" " --no-preserve=ATTR_LIST don't preserve the specified attributes\n" " --parents use full source file name under DIRECTORY\n" @@ -2208,7 +2193,7 @@ msgstr "" " --no-preserve=СПИС_АТТР не зберігати вказані атрибути\n" " --parents добавить вихідний шлях до КАТАЛОГУ\n" -#: src/cp.c:209 +#: src/cp.c:207 msgid "" " -R, -r, --recursive copy directories recursively\n" " --reflink[=WHEN] control clone/CoW copies. See below\n" @@ -2221,7 +2206,7 @@ msgstr "" " --remove-destination вилучати кожен цільовий файл, перш ніж\n" " копіювати його (протилежність до --force)\n" -#: src/cp.c:215 +#: src/cp.c:213 msgid "" " --sparse=WHEN control creation of sparse files. See below\n" " --strip-trailing-slashes remove any trailing slashes from each " @@ -2233,7 +2218,7 @@ msgstr "" " --strip-trailing-slashes вилучає усі кінцеві похилі риски з кожного\n" " аргументу ДЖЕРЕЛО\n" -#: src/cp.c:220 +#: src/cp.c:218 msgid "" " -s, --symbolic-link make symbolic links instead of copying\n" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -2248,7 +2233,7 @@ msgstr "" " --target-directory=КАТАЛОГ скопіювати всі ДЖЕРЕЛА у КАТАЛОГ\n" " -T, --no-target-directory вважати ЦІЛЬ звичайним файлом\n" -#: src/cp.c:226 +#: src/cp.c:224 msgid "" " -u, --update copy only when the SOURCE file is newer\n" " than the destination file or when the\n" @@ -2262,7 +2247,7 @@ msgstr "" " -v, --verbose пояснювати що зроблено\n" " -x, --one-file-system залишатись у межах однієї файлової системи\n" -#: src/cp.c:235 +#: src/cp.c:233 msgid "" "\n" "By default, sparse SOURCE files are detected by a crude heuristic and the\n" @@ -2293,7 +2278,7 @@ msgstr "" "неможливо, копіювання зазнає невдачі або, якщо вказано --reflink=auto,\n" "повернеться до стандартного режиму.\n" -#: src/cp.c:247 src/install.c:649 src/ln.c:421 src/mv.c:321 +#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322 msgid "" "\n" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -2309,7 +2294,7 @@ msgstr "" "VERSION_CONTROL. Можливі значення:\n" "\n" -#: src/cp.c:254 src/install.c:656 src/mv.c:328 +#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329 msgid "" " none, off never make backups (even if --backup is given)\n" " numbered, t make numbered backups\n" @@ -2323,7 +2308,7 @@ msgstr "" " нумеровані інакше створювати прості\n" " simple. never завжди створювати прості копії\n" -#: src/cp.c:260 +#: src/cp.c:258 msgid "" "\n" "As a special case, cp makes a backup of SOURCE when the force and backup\n" @@ -2334,92 +2319,92 @@ msgstr "" "Коли вказані ключі -f та -b, та SOURCE збігається з DEST cp створює\n" "резервну копію DEST.\n" -#: src/cp.c:319 +#: src/cp.c:317 #, c-format msgid "failed to preserve times for %s" msgstr "не вдалося зберегти мітки часу для %s" -#: src/cp.c:350 +#: src/cp.c:348 #, c-format msgid "failed to preserve permissions for %s" msgstr "не вдалося зберегти права доступу для %s" -#: src/cp.c:477 +#: src/cp.c:475 #, c-format msgid "cannot make directory %s" msgstr "не вдалося створити каталог %s" -#: src/cp.c:526 src/cp.c:545 +#: src/cp.c:524 src/cp.c:543 #, c-format msgid "%s exists but is not a directory" msgstr "%s існує, але не є каталогом" -#: src/cp.c:572 src/cp.c:1068 src/install.c:401 src/install.c:844 src/ln.c:123 -#: src/ln.c:181 src/ln.c:202 src/ln.c:516 src/mv.c:152 src/mv.c:399 +#: 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 #, c-format -msgid "accessing %s" -msgstr "звернення до %s" +msgid "failed to access %s" +msgstr "не вдалося отримати доступ до %s" -#: src/cp.c:592 src/install.c:914 src/ln.c:546 src/mv.c:432 src/shred.c:1182 -#: src/touch.c:433 src/truncate.c:356 +#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181 +#: src/touch.c:429 src/truncate.c:354 #, c-format msgid "missing file operand" msgstr "пропущений операнд, що вказує файл" -#: src/cp.c:594 src/install.c:916 src/ln.c:560 src/mv.c:434 +#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436 #, c-format msgid "missing destination file operand after %s" msgstr "після %s пропущений операнд, що вказує цільовий файл" -#: src/cp.c:603 src/install.c:925 src/mv.c:443 +#: src/cp.c:601 src/install.c:926 src/mv.c:445 #, c-format msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)" msgstr "" "не можна використовувати водночас --target-directory (-t) і --no-target-" "directory (-T)" -#: src/cp.c:619 src/cp.c:1070 src/install.c:403 src/install.c:846 -#: src/install.c:938 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:401 -#: src/mv.c:457 +#: 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 #, c-format msgid "target %s is not a directory" msgstr "вказана ціль %s не є каталогом" -#: src/cp.c:730 +#: src/cp.c:728 #, c-format msgid "with --parents, the destination must be a directory" msgstr "при заданому --parents ціль повинна бути каталогом" -#: src/cp.c:1063 src/install.c:839 src/ln.c:511 src/mv.c:394 +#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395 #, c-format msgid "multiple target directories specified" msgstr "вказано декілька цільових каталогів" -#: src/cp.c:1108 +#: src/cp.c:1110 #, c-format msgid "cannot make both hard and symbolic links" msgstr "не можна створювати жорстке та символьне посилання одночасно" -#: src/cp.c:1115 src/mv.c:464 +#: src/cp.c:1117 src/mv.c:466 #, c-format msgid "options --backup and --no-clobber are mutually exclusive" msgstr "параметри --backup і --no-clobber не можна використовувати одночасно" -#: src/cp.c:1121 +#: src/cp.c:1123 #, c-format msgid "--reflink can be used only with --sparse=auto" msgstr "--reflink можна використовувати лише разом з --sparse=auto" -#: src/cp.c:1129 src/install.c:899 src/ln.c:582 src/mv.c:472 +#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474 msgid "backup type" msgstr "тип резервної копії" -#: src/cp.c:1154 +#: src/cp.c:1156 #, c-format msgid "cannot preserve security context without an SELinux-enabled kernel" msgstr "не можна зберігати контекст безпеки, якщо ядро не підтримує SELinux" -#: src/cp.c:1160 +#: src/cp.c:1162 #, c-format msgid "cannot preserve extended attributes, cp is built without xattr support" msgstr "не вдалося зберегти розширені атрибути, cp зібрано без підтримки xattr" @@ -2429,137 +2414,135 @@ msgstr "не вдалося зберегти розширені атрибути msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:529 +#: src/csplit.c:531 #, c-format msgid "input disappeared" msgstr "ввід став недоступний" -#: src/csplit.c:658 src/csplit.c:669 +#: src/csplit.c:660 src/csplit.c:671 #, c-format msgid "%s: line number out of range" msgstr "%s: номер рядка поза допустимими межами" -#: src/csplit.c:698 +#: src/csplit.c:700 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: номер рядка поза допустимими межами" -#: src/csplit.c:701 src/csplit.c:750 +#: src/csplit.c:703 src/csplit.c:752 #, c-format msgid " on repetition %s\n" msgstr " при повторі %s\n" -#: src/csplit.c:744 +#: src/csplit.c:746 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: відповідність не знайдено" -#: src/csplit.c:808 src/csplit.c:848 src/nl.c:359 src/tac.c:274 +#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273 #, c-format msgid "error in regular expression search" msgstr "помилка пошуку регулярного виразу" -#: src/csplit.c:981 +#: src/csplit.c:983 #, c-format msgid "write error for %s" msgstr "помилка запису для %s" -#: src/csplit.c:1057 +#: src/csplit.c:1059 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: після розділювача очікується ціле число" -#: src/csplit.c:1073 +#: src/csplit.c:1075 #, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: при вказуванні числа повторів слід додати '}'" -#: src/csplit.c:1083 +#: src/csplit.c:1085 #, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s: між '{' та '}' має бути вказано ціле число" -#: src/csplit.c:1110 +#: src/csplit.c:1112 #, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: пропущено кінцевий роздільник '%c'" -#: src/csplit.c:1127 +#: src/csplit.c:1129 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: неприпустимий регулярний вираз: %s" -#: src/csplit.c:1160 +#: src/csplit.c:1162 #, c-format msgid "%s: invalid pattern" msgstr "%s: неприпустимий шаблон" -#: src/csplit.c:1163 +#: src/csplit.c:1165 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: номер рядка повинен бути більше нуля" -#: src/csplit.c:1169 +#: src/csplit.c:1171 #, c-format msgid "line number %s is smaller than preceding line number, %s" msgstr "номер рядка %s менше номеру попереднього рядка, %s" -#: src/csplit.c:1175 +#: src/csplit.c:1177 #, c-format msgid "warning: line number %s is the same as preceding line number" msgstr "попередження: номер рядка %s дорівнює попередньому номеру рядка" -#: src/csplit.c:1253 +#: src/csplit.c:1255 #, c-format msgid "missing conversion specifier in suffix" msgstr "пропущений специфікатор перетворення у суфіксі" -#: src/csplit.c:1259 +#: src/csplit.c:1261 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "неправильний специфікатор перетворення у суфіксі: %c" -#: src/csplit.c:1262 +#: src/csplit.c:1264 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "неправильний специфікатор перетворення у суфіксі: \\%.3o" -#: src/csplit.c:1267 +#: src/csplit.c:1269 #, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "некоректні прапорці у специфікації перетворення: %%%c%c" -#: src/csplit.c:1284 +#: src/csplit.c:1286 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "надто багато описів перетворення (%%) у суфіксі" -#: src/csplit.c:1298 +#: src/csplit.c:1300 #, c-format msgid "missing %% conversion specification in suffix" msgstr "пропущено опис перетворення (%%) у суфіксі" -#: src/csplit.c:1345 +#: src/csplit.c:1347 #, c-format msgid "%s: invalid number" msgstr "%s: неприпустимий число" -#: src/csplit.c:1449 +#: src/csplit.c:1451 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Використання: %s [КЛЮЧ]... ФАЙЛ ШАБЛОН...\n" -#: src/csplit.c:1453 +#: src/csplit.c:1455 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" -"\n" msgstr "" "Виводить частини ФАЙЛА, розділені ШАБЛОНОМ (ШАБЛОНАМИ), до файлів 'xx00',\n" "'xx01', ... та виводить число байт у кожній частині на стандартний вивід.\n" -"\n" -#: src/csplit.c:1461 +#: src/csplit.c:1462 #, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2571,7 +2554,7 @@ msgstr "" " -f, --prefix=ПРЕФІКС використовувати ПРЕФІКС замість 'xx'\n" " -k, --keep-files не вилучати файли виводу при помилках\n" -#: src/csplit.c:1466 +#: src/csplit.c:1467 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" @@ -2581,7 +2564,7 @@ msgstr "" " -s, --quiet, --silent не виводити розміри вихідних файлів\n" " -z, --elide-empty-files вилучати порожні файли виводу\n" -#: src/csplit.c:1473 +#: src/csplit.c:1474 msgid "" "\n" "Read standard input if FILE is -. Each PATTERN may be:\n" @@ -2590,7 +2573,7 @@ msgstr "" "Якщо ФАЙЛ вказаний як -, читає стандартний ввід. ШАБЛОН вказується\n" "наступним чином:\n" -#: src/csplit.c:1477 +#: src/csplit.c:1478 msgid "" "\n" " INTEGER copy up to but not including specified line number\n" @@ -2616,7 +2599,7 @@ msgstr "" msgid "David M. Ihnat" msgstr "David M. Ihnat" -#: src/cut.c:64 +#: src/cut.c:64 src/cut.c:372 msgid "fields and positions are numbered from 1" msgstr "поля та позиції нумеруються з 1" @@ -2626,14 +2609,11 @@ msgid "Usage: %s OPTION... [FILE]...\n" msgstr "Використання: %s КЛЮЧ... [ФАЙЛ]...\n" #: src/cut.c:193 -msgid "" -"Print selected parts of lines from each FILE to standard output.\n" -"\n" +msgid "Print selected parts of lines from each FILE to standard output.\n" msgstr "" "Виводить вибрані частини рядків з кожного ФАЙЛА на стандартний вивід.\n" -"\n" -#: src/cut.c:200 +#: src/cut.c:199 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2644,7 +2624,7 @@ msgstr "" " -d, --delimiter=РОЗДІЛЮВАЧ використовувати РОЗДІЛЮВАЧ для розділення\n" " полів замість табуляції\n" -#: src/cut.c:205 +#: src/cut.c:204 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2656,7 +2636,7 @@ msgstr "" " якщо не вказаний ключ -s\n" " -n (ігнорується)\n" -#: src/cut.c:211 +#: src/cut.c:210 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" @@ -2664,7 +2644,7 @@ msgstr "" " --complement доповнити множину вибраних байтів, знаків " "або полів.\n" -#: src/cut.c:215 +#: src/cut.c:214 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2676,7 +2656,7 @@ msgstr "" " при виводі, типово використовується\n" " розділювач для вводу\n" -#: src/cut.c:222 +#: src/cut.c:221 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2689,7 +2669,7 @@ msgstr "" "Вибрані частини вхідного файла виводяться у тому порядку, у якому вони,\n" "з'являються на вході, та виводяться рівно один раз.\n" -#: src/cut.c:228 +#: src/cut.c:227 msgid "" "Each range is one of:\n" "\n" @@ -2709,45 +2689,46 @@ msgstr "" "\n" "Якщо ФАЙЛ не вказаний або вказаний як -, читає стандартний ввід.\n" -#: src/cut.c:368 src/cut.c:489 -msgid "invalid byte or field list" -msgstr "неправильний список байтів або полів" +#: src/cut.c:367 src/cut.c:493 +msgid "invalid byte, character or field list" +msgstr "некоректний байт, символ або список полів" -#: src/cut.c:385 +#: src/cut.c:387 msgid "invalid range with no endpoint: -" msgstr "неправильний діапазон без кінцевого значення: -" -#: src/cut.c:399 +#: src/cut.c:403 msgid "invalid decreasing range" msgstr "неприпустимий спадаючий діапазон" -#: src/cut.c:478 +#: src/cut.c:482 #, c-format msgid "byte offset %s is too large" msgstr "байтовий зсув %s надто великий" -#: src/cut.c:481 +#: src/cut.c:485 #, c-format msgid "field number %s is too large" msgstr "номер поля %s надто великий" -#: src/cut.c:789 src/cut.c:797 +#: src/cut.c:795 src/cut.c:803 msgid "only one type of list may be specified" msgstr "можна вказати лише один тип списку" -#: src/cut.c:806 +#: src/cut.c:812 src/numfmt.c:1408 +#, c-format msgid "the delimiter must be a single character" msgstr "розділювач повинен бути одним символом" -#: src/cut.c:841 +#: src/cut.c:847 msgid "you must specify a list of bytes, characters, or fields" msgstr "треба вказати список байт, символів або полів" -#: src/cut.c:844 +#: src/cut.c:850 msgid "an input delimiter may be specified only when operating on fields" msgstr "розділювач для вхідних даних можна вказувати лише при обробці полів" -#: src/cut.c:848 +#: src/cut.c:854 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2755,11 +2736,11 @@ msgstr "" "заборона виводу рядків, що не містять розділювачів,\n" "має сенс лише при роботі з полями" -#: src/cut.c:864 +#: src/cut.c:870 msgid "missing list of fields" msgstr "відсутній список полів" -#: src/cut.c:866 +#: src/cut.c:872 msgid "missing list of positions" msgstr "відсутній список позицій" @@ -2773,9 +2754,12 @@ msgstr "" " або: %s [-u|--utc|--universal] [ММДДррхх[[СС]РР][.сс]]\n" #: src/date.c:128 +msgid "Display the current time in the given FORMAT, or set the system date.\n" +msgstr "" +"Показати поточний час у вказаному ФОРМАТі або встановити системну дату.\n" + +#: src/date.c:134 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" " -I[TIMESPEC], --iso-8601[=TIMESPEC] output date/time in ISO 8601 format.\n" @@ -2783,8 +2767,6 @@ msgid "" " 'hours', 'minutes', 'seconds', or 'ns' for date\n" " and time to the indicated precision.\n" msgstr "" -"Показати поточний час у вказаному ФОРМАТі або встановити системну дату.\n" -"\n" " -d, --date=РЯДОК показати час, описаний РЯДКОМ, а не теперішній.\n" " -f, --file=ФАЙЛ_ДАТИ подібний до --date для кожного з рядків " "ФАЙЛ_ДАТИ\n" @@ -2794,7 +2776,7 @@ msgstr "" " 'hours', 'minutes', 'seconds' і 'ns' -- дата і\n" " час з відповідною точністю.\n" -#: src/date.c:138 +#: src/date.c:142 msgid "" " -r, --reference=FILE display the last modification time of FILE\n" " -R, --rfc-2822 output date and time in RFC 2822 format.\n" @@ -2804,7 +2786,7 @@ msgstr "" " -R, --rfc-2822 виводити час відповідно до RFC-2822\n" " Приклад: Mon, 07 Aug 2006 12:34:56 -0600\n" -#: src/date.c:143 +#: src/date.c:147 msgid "" " --rfc-3339=TIMESPEC output date and time in RFC 3339 format.\n" " TIMESPEC='date', 'seconds', or 'ns' for\n" @@ -2821,7 +2803,7 @@ msgstr "" " -u, --utc, --universal показати або встановити універсальний\n" " координований час\n" -#: src/date.c:154 +#: src/date.c:158 msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" @@ -2835,7 +2817,7 @@ msgstr "" " %% знак %\n" " %a місцева скорочена назва дня тижня (напр., нед)\n" -#: src/date.c:161 +#: src/date.c:165 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2847,7 +2829,7 @@ msgstr "" " %B місцева повна назва місяця (напр., січень)\n" " %c місцевий час та дата (напр., Чтв 3 Мар 23:05:25 2005)\n" -#: src/date.c:167 +#: src/date.c:171 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2859,7 +2841,7 @@ msgstr "" " %D дата; те саме, що і %m/%d/%y\n" " %e день місяця, доповнений пробілами; те саме, що і %_d\n" -#: src/date.c:173 +#: src/date.c:177 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -2869,7 +2851,7 @@ msgstr "" " %g останні дві цифри року для номера тижня ISO (см. %G)\n" " %G рік для номера тижня ISO (см. %V); звичайно буває корисно лише з %V\n" -#: src/date.c:178 +#: src/date.c:182 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2881,7 +2863,7 @@ msgstr "" " %I час (01..12)\n" " %j номер дня у році (001..366)\n" -#: src/date.c:184 +#: src/date.c:188 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -2893,7 +2875,7 @@ msgstr "" " %m місяць (01..12)\n" " %M хвилини (00..59)\n" -#: src/date.c:190 +#: src/date.c:194 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2912,7 +2894,7 @@ msgstr "" "%M\n" " %s число секунд, що минули з 1970-01-01 00:00:00 UTC\n" -#: src/date.c:199 +#: src/date.c:203 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2924,7 +2906,7 @@ msgstr "" " %T час, аналог %H:%M:%S\n" " %u день тижня (1..7); 1 означає понеділок\n" -#: src/date.c:205 +#: src/date.c:209 msgid "" " %U week number of year, with Sunday as first day of week (00..53)\n" " %V ISO week number, with Monday as first day of week (01..53)\n" @@ -2936,7 +2918,7 @@ msgstr "" " %w день тижня (0..6), 0 означає неділю\n" " %W номер тижня у році, якщо перший день тижня -- понеділок (00..53)\n" -#: src/date.c:211 +#: src/date.c:215 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -2948,7 +2930,7 @@ msgstr "" " %y останні дві цифри року (00..99)\n" " %Y рік\n" -#: src/date.c:217 +#: src/date.c:221 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -2968,7 +2950,7 @@ msgstr "" "\n" "Типово date доповнює числові поля нулями.\n" -#: src/date.c:226 +#: src/date.c:230 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -2986,7 +2968,7 @@ msgstr "" " ^ використовувати верхній регістр, якщо можливо\n" " # використовувати протилежний регістр, якщо можливо\n" -#: src/date.c:235 +#: src/date.c:239 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -3001,7 +2983,7 @@ msgstr "" "E -- якщо можливо, вживати альтернативне представлення для поточної локалі\n" "O -- якщо можливо, використовувати альтернативні числові символи локалі.\n" -#: src/date.c:242 +#: src/date.c:246 msgid "" "\n" "Examples:\n" @@ -3025,37 +3007,37 @@ msgstr "" "Показати локальний час для 9:00 наступної п'ятниці у Києві\n" " $ date --date='TZ=\"Europe/Kiev\" 09:00 next Fri'\n" -#: src/date.c:275 src/dd.c:2193 src/head.c:838 src/md5sum.c:477 -#: src/md5sum.c:798 src/od.c:863 src/od.c:1914 src/pr.c:1176 src/pr.c:1372 -#: src/pr.c:1494 src/stty.c:842 src/tac.c:563 src/tail.c:343 src/tee.c:126 +#: 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 #, c-format msgid "standard input" msgstr "стандартний ввід" -#: src/date.c:303 src/date.c:523 +#: src/date.c:307 src/date.c:527 #, c-format msgid "invalid date %s" msgstr "неправильна дата %s" -#: src/date.c:414 src/date.c:448 +#: src/date.c:418 src/date.c:452 #, c-format msgid "multiple output formats specified" msgstr "задано декілька вихідних форматів" -#: src/date.c:426 +#: src/date.c:430 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "ключі для виводу дати взаємно виключають друг друга" -#: src/date.c:433 +#: src/date.c:437 #, c-format msgid "the options to print and set the time may not be used together" msgstr "" "ключі для встановлення та для відображення часу не можуть застосовуватись " "разом" -#: src/date.c:454 +#: src/date.c:458 #, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -3066,23 +3048,23 @@ msgstr "" "При вказуванні дати, кожен аргумент, що не є ключем, повинен мати\n" "символьний формат та починатись зі знаку '+'." -#: src/date.c:531 +#: src/date.c:535 #, c-format msgid "cannot set date" msgstr "не вдалося встановити дату" -#: src/date.c:554 src/du.c:360 +#: src/date.c:558 src/du.c:371 #, c-format msgid "time %s is out of range" msgstr "час %s поза допустимим діапазоном" #. This is a proper name. See the gettext manual, section Names. -#: src/dd.c:44 src/factor.c:43 src/rm.c:41 src/tail.c:69 src/touch.c:41 +#: 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 "Paul Rubin" -#: src/dd.c:517 +#: src/dd.c:521 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3091,7 +3073,7 @@ msgstr "" "Використання: %s [ОПЕРАНД]...\n" " або: %s КЛЮЧ\n" -#: src/dd.c:522 +#: src/dd.c:526 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -3110,7 +3092,7 @@ msgstr "" " count=ЧИСЛО копіювати лише вказане ЧИСЛО вхідних блоків\n" " ibs=ЧИСЛО читати вказане ЧИСЛО байт за раз (типово 512)\n" -#: src/dd.c:531 +#: src/dd.c:535 msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -3119,7 +3101,8 @@ msgid "" " oflag=FLAGS write as per the comma separated symbol list\n" " seek=N skip N obs-sized blocks at start of output\n" " skip=N skip N ibs-sized blocks at start of input\n" -" status=noxfer suppress transfer statistics\n" +" status=WHICH WHICH info to suppress outputting to stderr;\n" +" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" msgstr "" " if=ФАЙЛ читати ФАЙЛ, а не стандартне введення\n" " iflag=СПИСОК читати відповідно до СПИСКУ символів,\n" @@ -3130,12 +3113,14 @@ msgstr "" " елементи слід розділяти комами\n" " seek=N пропустити з початку виводу N блоків розміром obs\n" " skip=N пропустити з початку вводу N блоків розміром ibs\n" -" status=noxfer не виводити статистику передавання\n" +" status=РЕЖИМ РЕЖИМ придушення виведення даних до stderr;\n" +" «noxfer» — придушити виведення статистики передавання,\n" +" «none» — придушити виведення будь-яких даних\n" -#: src/dd.c:541 +#: src/dd.c:546 msgid "" "\n" -"BLOCKS and BYTES may be followed by the following multiplicative suffixes:\n" +"N and BYTES may be followed by the following multiplicative suffixes:\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, and so on for T, P, E, Z, Y.\n" "\n" @@ -3143,14 +3128,14 @@ msgid "" "\n" msgstr "" "\n" -"Після ЧИСЛА блоків та байтів може бути вказано один з множників:\n" +"Після ЧИСЛА і БАЙТів може бути вказано один з множників:\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 тощо для T, P, E, Z, Y.\n" "\n" "Кожен елемент СПИСКУ для conv може бути:\n" "\n" -#: src/dd.c:550 +#: src/dd.c:555 msgid "" " ascii from EBCDIC to ASCII\n" " ebcdic from ASCII to EBCDIC\n" @@ -3180,7 +3165,7 @@ msgstr "" " sync доповнювати кожен вхідний блок нулями до розміру ibs; якщо\n" " вживається разом з block або unblock, доповнювати пробілами\n" -#: src/dd.c:563 +#: src/dd.c:568 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3196,7 +3181,7 @@ msgstr "" " fdatasync фізично записати файл виводу перед завершенням\n" " fsync аналогічно, але записати також метадані\n" -#: src/dd.c:571 +#: src/dd.c:576 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3210,81 +3195,81 @@ msgstr "" " append режим додавання (має сенс для виводу; рекомендується " "conv=notrunc)\n" -#: src/dd.c:578 +#: src/dd.c:583 msgid " cio use concurrent I/O for data\n" msgstr " cio використовувати конкурентне введення-виведення для дати\n" -#: src/dd.c:580 +#: src/dd.c:585 msgid " direct use direct I/O for data\n" msgstr " direct використовувати прямий ввід/вивід для даних\n" -#: src/dd.c:582 +#: src/dd.c:587 msgid " directory fail unless a directory\n" msgstr " directory помилка, якщо не є каталогом\n" -#: src/dd.c:584 +#: src/dd.c:589 msgid " dsync use synchronized I/O for data\n" msgstr " dsync використовувати синхронізований ввід/вивід для даних\n" -#: src/dd.c:586 +#: src/dd.c:591 msgid " sync likewise, but also for metadata\n" msgstr " sync те саме, але також для метаданих\n" -#: src/dd.c:587 +#: src/dd.c:592 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr " fullblock акумулювати повні блоки вводу (лише iflag)\n" -#: src/dd.c:590 +#: src/dd.c:595 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock використовувати ввід/вивід без блокування\n" -#: src/dd.c:592 +#: src/dd.c:597 msgid " noatime do not update access time\n" msgstr " noatime не оновлювати час останнього доступу\n" -#: src/dd.c:595 +#: src/dd.c:600 msgid " nocache discard cached data\n" msgstr " nocache відкинути кешовані дані\n" -#: src/dd.c:598 +#: src/dd.c:603 msgid " noctty do not assign controlling terminal from file\n" msgstr " noctty не призначати керівний термінал з файла\n" -#: src/dd.c:601 +#: src/dd.c:606 msgid " nofollow do not follow symlinks\n" msgstr " nofollow не слідувати за символьним посиланням\n" -#: src/dd.c:603 +#: src/dd.c:608 msgid " nolinks fail if multiply-linked\n" msgstr " nolinks помилка, якщо знайдено декілька посилань\n" -#: src/dd.c:605 +#: src/dd.c:610 msgid " binary use binary I/O for data\n" msgstr " binary використовувати двійковий ввід/вивід для даних\n" -#: src/dd.c:607 +#: src/dd.c:612 msgid " text use text I/O for data\n" msgstr " text використовувати текстовий ввід/вивід для даних\n" -#: src/dd.c:609 +#: src/dd.c:614 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" " count_bytes вважати «count=N» визначенням кількості байтів (лише для " "iflag)\n" -#: src/dd.c:612 +#: src/dd.c:617 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" " skip_bytes вважати «skip=N» визначенням кількості байтів (лише для " "iflag)\n" -#: src/dd.c:615 +#: src/dd.c:620 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" " seek_bytes вважати «seek=N» визначенням кількості байтів (лише для " "oflag)\n" -#: src/dd.c:620 +#: src/dd.c:625 #, c-format msgid "" "\n" @@ -3314,7 +3299,7 @@ msgstr "" "Ключі:\n" "\n" -#: src/dd.c:676 +#: src/dd.c:683 #, c-format msgid "" "%<PRIuMAX>+%<PRIuMAX> records in\n" @@ -3323,7 +3308,7 @@ msgstr "" "%<PRIuMAX>+%<PRIuMAX> записів прочитано\n" "%<PRIuMAX>+%<PRIuMAX> записів записано\n" -#: src/dd.c:682 +#: src/dd.c:689 #, c-format msgid "%<PRIuMAX> truncated record\n" msgid_plural "%<PRIuMAX> truncated records\n" @@ -3331,7 +3316,7 @@ msgstr[0] "%<PRIuMAX> обрізаний запис\n" msgstr[1] "%<PRIuMAX> обрізані записи\n" msgstr[2] "%<PRIuMAX> обрізаних записів\n" -#: src/dd.c:694 +#: src/dd.c:701 #, c-format msgid "%<PRIuMAX> byte (%s) copied" msgid_plural "%<PRIuMAX> bytes (%s) copied" @@ -3339,7 +3324,7 @@ msgstr[0] " скопійовано %<PRIuMAX> байт (%s)" msgstr[1] " скопійовано %<PRIuMAX> байти (%s)" msgstr[2] " скопійовано %<PRIuMAX> байтів (%s)" -#: src/dd.c:712 +#: src/dd.c:720 msgid "Infinity B" msgstr "Нескінченість" @@ -3353,83 +3338,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:725 +#: src/dd.c:733 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g с, %s/s\n" -#: src/dd.c:804 +#: src/dd.c:812 #, c-format msgid "closing input file %s" msgstr "закриття вхідного файла %s" -#: src/dd.c:811 +#: src/dd.c:819 #, c-format msgid "closing output file %s" msgstr "закриття файла виводу %s" -#: src/dd.c:1014 +#: src/dd.c:1022 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "не вдалося вимкнути O_DIRECT: %s" -#: src/dd.c:1085 src/dd.c:1934 +#: src/dd.c:1093 src/dd.c:1942 #, c-format msgid "writing to %s" msgstr "запис у %s" -#: src/dd.c:1199 src/dd.c:1253 +#: src/dd.c:1207 src/dd.c:1261 #, c-format msgid "unrecognized operand %s" msgstr "операнд %s не розпізнаний" -#: src/dd.c:1210 +#: src/dd.c:1218 msgid "invalid conversion" msgstr "неприпустиме перетворення" -#: src/dd.c:1213 src/dd.c:1289 +#: src/dd.c:1221 src/dd.c:1297 msgid "invalid input flag" msgstr "неприпустима ознака входу" -#: src/dd.c:1216 src/dd.c:1283 src/dd.c:1295 +#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303 msgid "invalid output flag" msgstr "неприпустимий ознака виводу" -#: src/dd.c:1219 +#: src/dd.c:1227 msgid "invalid status flag" msgstr "неприпустимий ознака статусу" -#: src/dd.c:1258 src/truncate.c:312 +#: src/dd.c:1266 src/truncate.c:310 #, c-format msgid "invalid number %s" msgstr "неправильний номер %s" -#: src/dd.c:1340 +#: src/dd.c:1348 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "не можна одночасно використовувати будь-які два з {ascii,ebcdic,ibm}" -#: src/dd.c:1342 +#: src/dd.c:1350 #, c-format msgid "cannot combine block and unblock" msgstr "не можна одночасно використовувати block та unblock" -#: src/dd.c:1344 +#: src/dd.c:1352 #, c-format msgid "cannot combine lcase and ucase" msgstr "не можна одночасно використовувати lcase та ucase" -#: src/dd.c:1346 +#: src/dd.c:1354 #, c-format msgid "cannot combine excl and nocreat" msgstr "не можна одночасно використовувати excl та nocreat" -#: src/dd.c:1349 +#: src/dd.c:1357 #, c-format msgid "cannot combine direct and nocache" msgstr "не можна одночасно використовувати direct і nocache" -#: src/dd.c:1506 +#: src/dd.c:1514 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3438,72 +3423,72 @@ msgstr "" "попередження: обходиться помилка lseek у ядрі для файла (%s)\n" " mt_type=0x%0lx -- см. <sys/mtio.h> для списку типів" -#: src/dd.c:1593 +#: src/dd.c:1601 #, c-format msgid "%s: cannot skip" msgstr "%s: не вдалося пропустити" -#: src/dd.c:1595 src/dd.c:1614 src/dd.c:1675 +#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683 #, c-format msgid "%s: cannot seek" msgstr "%s: не вдалося зсунути вказівник файла" -#: src/dd.c:1655 +#: src/dd.c:1663 #, c-format msgid "offset overflow while reading file %s" msgstr "переповнення зсуву при читанні файла %s" -#: src/dd.c:1667 +#: src/dd.c:1675 #, c-format msgid "warning: invalid file offset after failed read" msgstr "попередження: некоректний зсув файла після помилки читання" -#: src/dd.c:1671 +#: src/dd.c:1679 #, c-format msgid "cannot work around kernel bug after all" msgstr "не вдалося обійти помилку ядра" -#: src/dd.c:1814 +#: src/dd.c:1822 #, c-format msgid "setting flags for %s" msgstr "встановлення ознак для %s" -#: src/dd.c:1867 +#: src/dd.c:1875 #, c-format msgid "memory exhausted by input buffer of size %zu bytes (%s)" msgstr "пам'ять вичерпано буфером введення даних розміром у %zu байтів (%s)" -#: src/dd.c:1881 +#: src/dd.c:1889 #, c-format msgid "memory exhausted by output buffer of size %zu bytes (%s)" msgstr "пам'ять вичерпано буфером виведення даних розміром у %zu байтів (%s)" -#: src/dd.c:1914 +#: src/dd.c:1922 #, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: не вдалося перемістити вказівник позиції на вказану кількість" -#: src/dd.c:2125 src/dd.c:2258 +#: src/dd.c:2133 #, c-format -msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" -msgstr "не вдалося обрізати до %<PRIuMAX> у файлі виведення даних %s" +msgid "failed to truncate to %<PRIdMAX> bytes in output file %s" +msgstr "не вдалося обрізати до %<PRIdMAX> у файлі виведення даних %s" -#: src/dd.c:2138 +#: src/dd.c:2146 #, c-format msgid "fdatasync failed for %s" msgstr "операція fdatasync для %s завершилась помилкою" -#: src/dd.c:2148 +#: src/dd.c:2156 #, c-format msgid "fsync failed for %s" msgstr "операція fsync для %s завершилась помилкою" -#: src/dd.c:2199 src/dd.c:2228 +#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165 #, c-format -msgid "opening %s" -msgstr "відкриття %s" +msgid "failed to open %s" +msgstr "не вдалося відкрити %s" -#: src/dd.c:2237 +#: src/dd.c:2246 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) " @@ -3512,84 +3497,104 @@ msgstr "" "зсув надто великий: не вдалося обрізати до величини seek=%<PRIuMAX> (%lu-" "байтних) блоків" -#: src/dd.c:2274 src/dd.c:2280 +#: src/dd.c:2267 +#, c-format +msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" +msgstr "не вдалося обрізати до %<PRIuMAX> у файлі виведення даних %s" + +#: src/dd.c:2283 src/dd.c:2289 #, 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:54 src/expr.c:153 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:39 src/sleep.c:35 src/sort.c:66 +#: 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 msgid "Paul Eggert" msgstr "Paul Eggert" -#: src/df.c:140 +#: src/df.c:172 msgid "Filesystem" msgstr "Ф. система" -#: src/df.c:141 +#: src/df.c:175 msgid "Type" msgstr "Тип" -#: src/df.c:142 +#: src/df.c:178 src/df.c:542 msgid "blocks" msgstr "блоків" -#: src/df.c:142 -msgid "Inodes" -msgstr "І-вузлів" - -#: src/df.c:142 -msgid "Size" -msgstr "Розм" - -#: src/df.c:143 +#: src/df.c:181 msgid "Used" msgstr "Вик" -#: src/df.c:143 -msgid "IUsed" -msgstr "Викор" - -#: src/df.c:144 +#: src/df.c:184 msgid "Available" msgstr "Доступно" -#: src/df.c:144 -msgid "IFree" -msgstr "Вільн" - -#: src/df.c:144 -msgid "Avail" -msgstr "Дост" - -#: src/df.c:145 +#: src/df.c:187 msgid "Use%" msgstr "Вик%" -#: src/df.c:145 +#: src/df.c:190 +msgid "Inodes" +msgstr "І-вузлів" + +#: src/df.c:193 +msgid "IUsed" +msgstr "Викор" + +#: src/df.c:196 +msgid "IFree" +msgstr "Вільн" + +#: src/df.c:199 msgid "IUse%" msgstr "Вик%" -#: src/df.c:145 +#: src/df.c:202 +msgid "Mounted on" +msgstr "змонтований на" + +#: src/df.c:383 +#, c-format +msgid "option --output: field '%s' unknown" +msgstr "параметр --output: поле «%s» є невідомим" + +#: src/df.c:390 +#, c-format +msgid "option --output: field '%s' used more than once" +msgstr "параметр --output: поле «%s» використано декілька разів" + +#: src/df.c:410 src/df.c:449 +msgid "Size" +msgstr "Розм" + +#: src/df.c:414 src/df.c:451 +msgid "Avail" +msgstr "Дост" + +#: src/df.c:474 msgid "Capacity" msgstr "Всього" -#: src/df.c:146 -msgid "Mounted on" -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 +#, c-format +msgid "%s-%s" +msgstr "%s-%s" -#: src/df.c:847 +#: src/df.c:1210 msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" -"\n" msgstr "" "Показати інформацію про файлову систему, на якій розташований кожен\n" "з ФАЙЛІВ, або, типово, про усі файлові системи.\n" -"\n" -#: src/df.c:855 +#: src/df.c:1217 msgid "" " -a, --all include dummy file systems\n" " -B, --block-size=SIZE scale sizes by SIZE before printing them. E.g.,\n" @@ -3612,7 +3617,7 @@ msgstr "" " -H, --si те саме, але використовувати ступені 1000, а не " "1024\n" -#: src/df.c:865 +#: src/df.c:1227 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3628,8 +3633,11 @@ msgstr "" " --no-sync не викликати sync перед отриманням інформації про\n" " використання блоків (типово)\n" -#: src/df.c:872 +#: src/df.c:1234 msgid "" +" --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" +" or print all fields if FIELD_LIST is " +"omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" " -t, --type=TYPE limit listing to file systems of type TYPE\n" @@ -3637,6 +3645,10 @@ msgid "" " -x, --exclude-type=TYPE limit listing to file systems not of type TYPE\n" " -v (ignored)\n" msgstr "" +" --output[=СПИСОК_ПОЛІВ] використовувати формат виведення, визначений " +"СПИСКОМ_ПОЛІВ,\n" +" або вивести всі поля, якщо СПИСОК_ПОЛІВ не " +"вказано.\n" " -P, --portability виводити у форматі POSIX\n" " --sync викликати sync перед отриманням інформації про\n" " використання блоків\n" @@ -3645,20 +3657,48 @@ msgstr "" " -x, --exclude-type=ТИП виключати файлові системи вказаного ТИПУ\n" " -v (ігнорується)\n" -#: src/df.c:1027 +#: src/df.c:1248 +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" +msgstr "" +"\n" +"СПИСОК_ПОЛІВ — відокремлений комами список стовпчиків, які слід включити.\n" +"Можливі назви стовпчиків: 'source', 'fstype', 'itotal', 'iused', 'iavail', " +"'ipcent',\n" +"'size', 'used', 'avail', 'pcent' і 'target' (див. сторінку info).\n" + +#: src/df.c:1285 +#, 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 #, c-format msgid "file system type %s both selected and excluded" msgstr "файлова система типа %s і вибрана, і виключена" -#: src/df.c:1075 +#: src/df.c:1500 msgid "Warning: " msgstr "Попередження: " -#: src/df.c:1077 src/stat.c:795 +#: src/df.c:1502 src/stat.c:814 msgid "cannot read table of mounted file systems" msgstr "%помилка при читані змонтованих файлових систем" -#: src/df.c:1107 +#: src/df.c:1539 #, c-format msgid "no file systems processed" msgstr "не вказана жодна файлова система" @@ -3775,7 +3815,7 @@ msgstr "" " %s dir1/str dir2/str -> «dir1», потім «dir2»\n" " %s stdio.h -> «.»\n" -#: src/du.c:260 src/sort.c:390 src/wc.c:112 +#: src/du.c:270 src/sort.c:394 src/wc.c:112 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3784,16 +3824,14 @@ msgstr "" "Використання: %s [КЛЮЧ]... [ФАЙЛ]...\n" " або: %s [КЛЮЧ]... --files0-from=Ф\n" -#: src/du.c:264 -msgid "" -"Summarize disk usage of each FILE, recursively for directories.\n" -"\n" -msgstr "" -"Сумарне використання дискового простору кожного ФАЙЛА, з каталогами.\n" -"\n" +#: src/du.c:274 +msgid "Summarize disk usage of each FILE, recursively for directories.\n" +msgstr "Сумарне використання дискового простору кожного ФАЙЛА, з каталогами.\n" -#: src/du.c:271 +#: src/du.c:280 msgid "" +" -0, --null end each output line with 0 byte rather than " +"newline\n" " -a, --all write counts for all files, not just directories\n" " --apparent-size print apparent sizes, rather than disk usage; " "although\n" @@ -3801,13 +3839,16 @@ msgid "" " larger due to holes in ('sparse') files, internal\n" " fragmentation, indirect blocks, and the like\n" msgstr "" +" -0, --null завершувати кожен рядок виведених даних 0-байтом " +"замість символу\n" +" нового рядка\n" " -a, --all виводить обсяг для усіх файлів, а не лише каталогів\n" " --apparent-size виводить дійсні розміри, а не зайнятий дисковий\n" " простір; хоча справжній розмір звичайно менший,\n" " іноді він може бути більшим через дірки у файлах,\n" " внутрішньої фрагментації, непрямих блоків та т.і.\n" -#: src/du.c:279 +#: src/du.c:289 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" @@ -3816,6 +3857,11 @@ msgid "" " -c, --total produce a grand total\n" " -D, --dereference-args dereference only symlinks that are listed on the\n" " command line\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 "" " -B, --block-size=РОЗМІР використовувати блоки вказаного РОЗМІРУ. Приклад:\n" " «-BM» виводить розміри у одиницях у 1.048.576 " @@ -3825,8 +3871,15 @@ msgstr "" " -c, --total підбивати підсумок\n" " -D, --dereference-args розіменовувати символьні посилання у командному\n" " рядку\n" +" -d, --max-depth=Н виводити підсумки для каталогу (або файла, якщо " +"вказано --all),\n" +" лише, якщо він перебуває на Н-му або нижчому рівні " +"відносно\n" +" аргументу командного рядка; --max-depth=0 — те " +"саме, що і для\n" +" --summarize\n" -#: src/du.c:288 +#: src/du.c:302 msgid "" " --files0-from=F summarize disk usage of the NUL-terminated file\n" " names specified in file F;\n" @@ -3834,7 +3887,6 @@ msgid "" " -H equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" --si like -h, but use powers of 1000 not 1024\n" msgstr "" " --files0-from=Ф вивести звіт про файли, чиї назви (завершені\n" " нулем) перераховані у файлі Ф\n" @@ -3843,58 +3895,37 @@ msgstr "" " -H еквівалент ключа --dereference-args (-D)\n" " -h, --human-readable виводити розміри у зручному для людини вигляді\n" " (наприклад, 1K 234M 2G)\n" -" --si як -h, але використовувати ступені 1000, а не 1024\n" -#: src/du.c:297 +#: src/du.c:310 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 як --block-size=1K\n" +" -L, --dereference розіменувати всі символічні посилання\n" " -l, --count-links прочитати кожне жорстке посилання як окремий файл\n" " -m як --block-size=1M\n" -#: src/du.c:302 +#: src/du.c:316 msgid "" -" -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " "default)\n" -" -0, --null end each output line with 0 byte rather than " -"newline\n" " -S, --separate-dirs 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 розіменовувати символьні посилання\n" " -P, --no-dereference не слідувати за символьним посиланням (типово)\n" -" -0, --null завершувати рядок виводу нулем, а не переносом " -"рядка\n" " -S, --separate-dirs не включати розмір каталогів\n" +" --si подібне до -h, але з використанням мір, кратних до " +"1000, а не 1024\n" " -s, --summarize виводити лише зведення для кожного аргументу\n" -#: src/du.c:309 -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 пропускати каталоги на інших файлових системах\n" -" -X, --exclude-from=ФАЙЛ виключати файли, що збігаються з якимось\n" -" шаблоном з ФАЙЛА\n" -" --exclude=ШАБЛОН виключати файли, що збігаються з ШАБЛОНОМ\n" -" --max-depth=N виводити зведення про каталог (або файл, з --" -"all),\n" -" лише якщо він на N або менше рівнів нижче,\n" -" ніж аргумент командного рядка; --max-depth=0\n" -" еквівалентно до --summarize\n" - -#: src/du.c:318 +#: src/du.c:322 msgid "" +" -t, --threshold=SIZE exclude entries smaller than SIZE if positive,\n" +" or entries greater than SIZE if negative\n" " --time show time of the last modification of any file in " "the\n" " directory, or any of its subdirectories\n" @@ -3904,6 +3935,8 @@ msgid "" " full-iso, long-iso, iso, +FORMAT\n" " FORMAT is interpreted like 'date'\n" msgstr "" +" -t, --threshold=РОЗМІР виключити записи, менші за РОЗМІР, якщо додатне,\n" +" або записи, більші за РОЗМІР, якщо від’ємне\n" " --time виводити час останньої зміни будь-якого файла у\n" " каталозі або усіх його підкаталогів\n" " --time=СЛОВО виводити вказаний у СЛОВО час, а не час \n" @@ -3912,64 +3945,76 @@ msgstr "" " full-iso, long-iso, iso, +ФОРМАТ\n" " ФОРМАТ інтерпретується як у 'date'\n" -#: src/du.c:375 -#, fuzzy +#: src/du.c:333 +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=ФАЙЛ виключити файли, назви яких відповідають зразку з " +"ФАЙЛа\n" +" --exclude=ЗРАЗОК виключити файли, назви яких відповідають ЗРАЗКУ\n" +" -x, --one-file-system пропускати каталоги на різних файлових системах\n" + +#: src/du.c:386 msgid "Infinity" msgstr "Нескінченість" -#: src/du.c:600 +#: src/du.c:507 +#, c-format +msgid "mount point %s already traversed" +msgstr "обхід точки монтування %s вже здійснено" + +#: src/du.c:624 #, c-format msgid "fts_read failed: %s" msgstr "помилка fts_read: %s" -#: src/du.c:724 +#: src/du.c:780 #, c-format msgid "invalid maximum depth %s" msgstr "неприпустима максимальна глибина %s" -#: src/du.c:817 +#: src/du.c:809 +#, c-format +msgid "invalid --threshold argument '-0'" +msgstr "некоректний аргумент --threshold «-0»" + +#: src/du.c:887 #, c-format msgid "cannot both summarize and show all entries" msgstr "не можна одночасно підбивати зведення та виводити всі елементи" -#: src/du.c:824 +#: src/du.c:894 #, c-format msgid "warning: summarizing is the same as using --max-depth=0" msgstr "попередження: підбиття зведення це те ж саме, що й --max-depth=0" -#: src/du.c:830 +#: src/du.c:900 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "попередження: підбиття зведення конфліктує з --max-depth=%lu" -#: src/du.c:896 src/sort.c:4479 src/wc.c:668 +#: src/du.c:966 src/sort.c:4533 src/wc.c:668 msgid "file operands cannot be combined with --files0-from" msgstr "операнди-файли не можна використовувати разом з --files0-from" -#: src/du.c:949 src/md5sum.c:587 src/od.c:903 src/tac.c:239 src/tac.c:350 -#: src/tac.c:506 src/tac.c:586 src/wc.c:733 +#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 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:963 src/sort.c:4508 src/wc.c:747 +#: src/du.c:1040 src/sort.c:4562 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:980 src/du.c:988 src/wc.c:760 src/wc.c:768 +#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768 msgid "invalid zero-length file name" msgstr "неправильна назва файла нульової довжини" -#: src/du.c:1007 src/head.c:149 src/head.c:262 src/head.c:334 src/head.c:538 -#: src/head.c:620 src/head.c:692 src/head.c:750 src/head.c:774 src/tail.c:412 -#: src/tail.c:500 src/tail.c:549 src/tail.c:642 src/tail.c:770 src/tail.c:818 -#: src/tail.c:855 src/tail.c:1782 src/tail.c:1812 src/uniq.c:395 -#, c-format -msgid "error reading %s" -msgstr "помилка читання %s" - -#: src/du.c:1010 src/ls.c:2649 src/wc.c:791 +#: src/du.c:1088 src/ls.c:2649 src/wc.c:791 msgid "total" msgstr "загалом" @@ -4072,22 +4117,23 @@ msgstr "" "Використання: %s [КЛЮЧ]... [-] [НАЗВА=ЗНАЧЕННЯ]... [КОМАНДА [АРГ]...]\n" #: src/env.c:55 +msgid "Set each NAME to VALUE in the environment and run COMMAND.\n" +msgstr "" +"Встановлює кожній НАЗВІ відповідне ЗНАЧЕННЯ та запускає КОМАНДУ у цьому\n" +"середовищі.\n" + +#: src/env.c:61 msgid "" -"Set each NAME to VALUE in the environment and run COMMAND.\n" -"\n" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with 0 byte rather than newline\n" " -u, --unset=NAME remove variable from the environment\n" msgstr "" -"Встановлює кожній НАЗВІ відповідне ЗНАЧЕННЯ та запускає КОМАНДУ у цьому\n" -"середовищі.\n" -"\n" " -i, --ignore-environment почати з порожнім оточенням\n" " -0, --null завершувати кожне з виведених рядків 0-байтом, " "а не розривом рядка\n" " -u, --unset=НАЗВА вилучити з оточення НАЗВИ\n" -#: src/env.c:64 +#: src/env.c:68 msgid "" "\n" "A mere - implies -i. If no COMMAND, print the resulting environment.\n" @@ -4096,17 +4142,17 @@ msgstr "" "Просто '-' -- синонім для '-i'. Якщо не вказана КОМАНДА, виводить отримане\n" "оточення.\n" -#: src/env.c:120 +#: src/env.c:124 #, c-format msgid "cannot unset %s" msgstr "не вдалося вилучити %s" -#: src/env.c:131 +#: src/env.c:135 #, c-format msgid "cannot set %s" msgstr "не вдалося встановити %s" -#: src/env.c:148 +#: src/env.c:152 #, c-format msgid "cannot specify --null (-0) with command" msgstr "не можна вказувати --null (-0) з командою" @@ -4115,14 +4161,12 @@ msgstr "не можна вказувати --null (-0) з командою" msgid "" "Convert tabs in each FILE to spaces, writing to standard output.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" "Перетворює знаки табуляції у кожному ФАЙЛІ на пробіли та виводить на\n" "стандартний вивід. Якщо ФАЙЛ не вказаний або вказаний як -, читає.\n" "стандартний ввід\n" -"\n" -#: src/expand.c:115 +#: src/expand.c:114 msgid "" " -i, --initial do not convert tabs after non blanks\n" " -t, --tabs=NUMBER have tabs NUMBER characters apart, not 8\n" @@ -4131,34 +4175,34 @@ msgstr "" "пробілів\n" " -t, --tabs=ЧИСЛО встановлює ширину табуляції, типово 8\n" -#: src/expand.c:119 +#: src/expand.c:118 msgid "" " -t, --tabs=LIST use comma separated list of explicit tab positions\n" msgstr "" " -t, --tabs=СПИСОК використовувати розділений комами список позицій " "табуляції\n" -#: src/expand.c:172 src/unexpand.c:191 +#: src/expand.c:171 src/unexpand.c:190 #, c-format msgid "tab stop is too large %s" msgstr "розмір табуляції надто великий %s" -#: src/expand.c:180 src/unexpand.c:199 +#: src/expand.c:179 src/unexpand.c:198 #, c-format msgid "tab size contains invalid character(s): %s" msgstr "розмір табуляції містить неприпустимий знак (знаки): %s" -#: src/expand.c:206 src/unexpand.c:225 +#: src/expand.c:205 src/unexpand.c:224 #, c-format msgid "tab size cannot be 0" msgstr "розмір табуляції не може дорівнювати нулю" -#: src/expand.c:208 src/unexpand.c:227 +#: src/expand.c:207 src/unexpand.c:226 #, c-format msgid "tab sizes must be ascending" msgstr "номера позицій табуляції повинні зростати" -#: src/expand.c:326 src/expand.c:345 src/unexpand.c:374 src/unexpand.c:419 +#: 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 "вхідний рядок надто великий" @@ -4319,12 +4363,12 @@ msgstr "помилка у механізмі відповідності регу msgid "non-integer argument" msgstr "не цілочисловий аргумент" -#: src/expr.c:793 src/truncate.c:316 +#: src/expr.c:793 src/truncate.c:314 #, c-format msgid "division by zero" msgstr "ділення на нуль" -#: src/expr.c:887 src/sort.c:2029 +#: src/expr.c:887 src/sort.c:2044 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "Щоб обійти цю проблему, встановіть LC_ALL='C'" @@ -4334,25 +4378,32 @@ msgstr "Щоб обійти цю проблему, встановіть LC_ALL=' msgid "the strings compared were %s and %s" msgstr "рядки, що порівнювались %s та %s." -#: src/factor.c:449 -msgid "using arbitrary-precision arithmetic" -msgstr "використання арифметики з довільною точністю" +#. This is a proper name. See the gettext manual, section Names. +#: src/factor.c:111 +msgid "Niels Moller" +msgstr "Niels Moller" -#: src/factor.c:460 -msgid "using single-precision arithmetic" -msgstr "використання арифметики з фіксованою точністю" +#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459 +#, c-format +msgid "Lucas prime test failure. This should not happen" +msgstr "Не вдалося перевірити простоту за тестом Люка. Цього не мало статися." -#: src/factor.c:465 src/od.c:1640 src/od.c:1709 +#: src/factor.c:2092 #, c-format -msgid "%s is too large" -msgstr "%s надто велике" +msgid "squfof queue overflow" +msgstr "переповнення черги squfof" -#: src/factor.c:469 +#: src/factor.c:2419 #, c-format msgid "%s is not a valid positive integer" msgstr "%s не є правильним цілим додатнім числом" -#: src/factor.c:494 +#: src/factor.c:2442 src/od.c:1646 src/od.c:1715 +#, c-format +msgid "%s is too large" +msgstr "%s надто велике" + +#: src/factor.c:2454 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4361,7 +4412,7 @@ msgstr "" "Використання: %s [ЧИСЛО]...\n" " або: %s КЛЮЧ\n" -#: src/factor.c:499 +#: src/factor.c:2459 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" @@ -4388,24 +4439,22 @@ msgid "cannot stat current directory (now %s)" msgstr "не вдалося виконати stat для поточного каталогу (наразі %s)" #. This is a proper name. See the gettext manual, section Names. -#: src/fmt.c:37 +#: src/fmt.c:38 msgid "Ross Paterson" msgstr "Ross Paterson" -#: src/fmt.c:269 +#: src/fmt.c:270 #, c-format msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n" msgstr "Використання: %s [-ШИРИНА] [ПАРАМЕТР]... [ФАЙЛ]...\n" -#: src/fmt.c:270 +#: 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" -"\n" msgstr "" "Переформатує кожен абзац у ФАЙЛІ(ах) та виводить на стандартне виведення.\n" "Параметр -ШИРИНА є скороченою формою --width=ЧИСЛО.\n" -"\n" #: src/fmt.c:278 msgid "" @@ -4419,19 +4468,20 @@ msgstr "" " зберігаючи при цьому префікс рядків\n" " -s, --split-only розбивати довгі рядки, але не заповнювати\n" -#: src/fmt.c:285 -#, fuzzy, c-format +#: src/fmt.c:287 +#, 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 відступ першого рядка відмінний від другого\n" +" -t, --tagged-paragraph відступ першого рядка, відмінний від другого\n" " -u, --uniform-spacing один пробіл після слова, два після речення\n" -" -w, --width=ЧИСЛО максимальна ширина рядка (типово 75 стовпчиків)\n" +" -w, --width=ЧИСЛО максимальна довжина рядка (типово 75 позицій)\n" +" -g, --goal=ДОВЖИНА остаточна довжина (типово 93% довжини)\n" -#: src/fmt.c:357 +#: src/fmt.c:359 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -4440,22 +4490,20 @@ msgstr "" "неправильний ключ -- %c; -ШИРИНА розпізнається, лише якщо це перший\n" "аргумент, у іншому випадку вказуйте -w N" -#: src/fmt.c:403 src/fmt.c:414 +#: src/fmt.c:405 src/fmt.c:416 #, c-format msgid "invalid width: %s" -msgstr "неприпустима ширина: %s" +msgstr "неприпустима довжина: %s" #: src/fold.c:70 msgid "" "Wrap input lines in each FILE (standard input by default), writing to\n" "standard output.\n" -"\n" msgstr "" "Розбиває рядки у ФАЙЛІ(ах) (типово читає стандартний ввід) та виводить\n" "на стандартний вивід.\n" -"\n" -#: src/fold.c:78 +#: src/fold.c:77 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4465,13 +4513,13 @@ msgstr "" " -s, --spaces розбивати лише на пробілах\n" " -w, --width=ЧИСЛО використовувати вказане ЧИСЛО стовпчиків, а не 80\n" -#: src/fold.c:289 src/pr.c:836 +#: src/fold.c:288 src/pr.c:832 #, c-format 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:75 +#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 #: src/truncate.c:37 msgid "Padraig Brady" msgstr "Padraig Brady" @@ -4490,17 +4538,17 @@ msgstr "" "сценаріях.\n" "\n" -#: src/group-list.c:69 src/id.c:345 src/setuidgid.c:184 +#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184 #, c-format msgid "failed to get groups for user %s" msgstr "помилка при отриманні груп користувачів %s" -#: src/group-list.c:74 src/id.c:350 +#: src/group-list.c:74 src/id.c:370 #, c-format msgid "failed to get groups for the current process" msgstr "не вдалося отримати групи для поточного процесу" -#: src/group-list.c:104 +#: src/group-list.c:114 #, c-format msgid "cannot find name for group ID %lu" msgstr "не вдалося визначити назву групи для ID %lu" @@ -4547,14 +4595,12 @@ 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" -"\n" msgstr "" "Виводити перші 10 рядків кожного ФАЙЛА на стандартний вивід.\n" "Якщо задано декілька ФАЙЛІВ, спочатку виводити заголовок з назвою файла.\n" "Якщо ФАЙЛ не вказаний або вказаний як -, читає стандартний ввід.\n" -"\n" -#: src/head.c:118 +#: src/head.c:117 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -4570,7 +4616,7 @@ msgstr "" " якщо перед K стоїть «-», вивести всі, крім K\n" " останніх рядків кожного файла\n" -#: src/head.c:126 +#: src/head.c:125 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4578,7 +4624,7 @@ msgstr "" " -q, --quiet, --silent не виводити заголовки з назвами файлів\n" " -v, --verbose завжди виводити заголовки з назвами файлів\n" -#: src/head.c:132 +#: src/head.c:131 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -4590,58 +4636,58 @@ 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:152 -#, c-format -msgid "error writing %s" -msgstr "помилка запису %s" - -#: src/head.c:155 +#: src/head.c:154 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: файл надто скоротився" -#: src/head.c:228 src/head.c:1044 +#: src/head.c:227 src/head.c:1051 #, c-format msgid "%s: number of bytes is too large" msgstr "%s: число байт надто великий" -#: src/head.c:441 +#: src/head.c:440 #, c-format msgid "%s: cannot lseek back to original position" msgstr "ю%s: не вдалося вернуть вказівник файла на початкову позицію" -#: src/head.c:613 src/head.c:684 src/tail.c:450 +#: src/head.c:612 src/head.c:691 src/tail.c:449 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: не вдалося перейти до позиції %s" -#: src/head.c:791 +#: src/head.c:673 +#, 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" -#: src/head.c:878 +#: src/head.c:885 #, c-format msgid "%s: %s is so large that it is not representable" msgstr "%s: %s настільки великий, що його неможливо машинно представити" -#: src/head.c:879 +#: src/head.c:886 msgid "number of lines" msgstr "число рядків" -#: src/head.c:879 +#: src/head.c:886 msgid "number of bytes" msgstr "число байт" -#: src/head.c:886 src/tail.c:1947 +#: src/head.c:893 src/tail.c:1947 msgid "invalid number of lines" msgstr "неправильна кількість рядків" -#: src/head.c:887 src/tail.c:1948 +#: src/head.c:894 src/tail.c:1948 msgid "invalid number of bytes" msgstr "неправильна кількість байт" -#: src/head.c:974 src/head.c:1032 +#: src/head.c:981 src/head.c:1039 #, c-format msgid "invalid trailing option -- %c" msgstr "неправильний завершальний ключ -- '%c'" @@ -4757,86 +4803,86 @@ msgstr "не можна отримати контекст процесу" msgid "cannot get effective UID" msgstr "не вдалося отримати ефективний UID" -#: src/id.c:289 +#: src/id.c:311 #, c-format -msgid "cannot find name for user ID %lu" -msgstr "не вдалося визначити ім'я користувача для ID %lu" +msgid "cannot find name for user ID %s" +msgstr "не вдалося визначити ім'я користувача для ID %s" -#: src/id.c:309 +#: src/id.c:329 #, c-format -msgid "uid=%lu" -msgstr "uid=%lu" +msgid "uid=%s" +msgstr "uid=%s" -#: src/id.c:314 +#: src/id.c:334 #, c-format -msgid " gid=%lu" -msgstr " gid=%lu" +msgid " gid=%s" +msgstr " gid=%s" -#: src/id.c:321 +#: src/id.c:341 #, c-format -msgid " euid=%lu" -msgstr " euid=%lu" +msgid " euid=%s" +msgstr " euid=%s" -#: src/id.c:329 +#: src/id.c:349 #, c-format -msgid " egid=%lu" -msgstr " egid=%lu" +msgid " egid=%s" +msgstr " egid=%s" -#: src/id.c:357 +#: src/id.c:377 msgid " groups=" msgstr " групи=" -#: src/id.c:373 +#: src/id.c:393 #, c-format msgid " context=%s" msgstr " контекст=%s" -#: src/install.c:372 +#: src/install.c:373 #, c-format msgid "warning: %s: failed to change context to %s" msgstr "попередження: %s: не вдалося змінити контекст у %s" -#: src/install.c:413 +#: src/install.c:414 #, c-format msgid "creating directory %s" msgstr "створення каталогу %s" -#: src/install.c:481 +#: src/install.c:482 #, c-format msgid "cannot change ownership of %s" msgstr "не вдалося змінити власника %s" -#: src/install.c:505 +#: src/install.c:506 #, c-format msgid "cannot set time stamps for %s" msgstr "не вдалося встановити мітки часу для %s" -#: src/install.c:526 src/split.c:412 src/timeout.c:387 +#: src/install.c:527 src/split.c:426 src/timeout.c:439 #, c-format msgid "fork system call failed" msgstr "системний виклик fork завершився помилкою" -#: src/install.c:530 +#: src/install.c:531 #, c-format msgid "cannot run %s" msgstr "не вдалося запустити %s" -#: src/install.c:534 +#: src/install.c:535 #, c-format msgid "waiting for strip" msgstr "очікування strip" -#: src/install.c:536 +#: src/install.c:537 #, c-format msgid "strip process terminated abnormally" msgstr "процес strip завершився помилкою" -#: src/install.c:557 +#: src/install.c:558 #, c-format msgid "invalid user %s" msgstr "неправильний користувач %s" -#: src/install.c:593 +#: src/install.c:594 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -4849,7 +4895,7 @@ msgstr "" " або %s [КЛЮЧ]... -t КАТАЛОГ ДЖЕРЕЛО...\n" " або %s [КЛЮЧ]... -d КАТАЛОГ...\n" -#: src/install.c:600 +#: src/install.c:601 msgid "" "\n" "This install program copies files (often just compiled) into destination\n" @@ -4861,7 +4907,6 @@ msgid "" "In the first three forms, copy SOURCE to DEST or multiple SOURCE(s) to\n" "the existing DIRECTORY, while setting permission modes and owner/group.\n" "In the 4th form, create all components of the given DIRECTORY(ies).\n" -"\n" msgstr "" "\n" "Ця програма для встановлення копіює файли (часто щойно зібрані) до " @@ -4874,7 +4919,6 @@ msgstr "" "ДЖЕРЕЛ до вже створеного КАТАЛОГу, встановлюючи режими доступу та\n" "власника/групу. В четвертій формі створює всі компоненти вказаних\n" "КАТАЛОГІВ.\n" -"\n" #: src/install.c:615 msgid "" @@ -4944,58 +4988,58 @@ msgstr "" " -Z, --context=CONTEXT встановити контекст безпеки SELinux для файлів та " "каталогів\n" -#: src/install.c:858 +#: src/install.c:859 #, c-format msgid "" "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled" msgstr "" "Попередження: --preserve-context ігнорується; ядро не підтримує SELinux." -#: src/install.c:868 +#: src/install.c:869 #, c-format msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled" msgstr "Попередження: --context (-Z) ігнорується; ядро не підтримує SELinux." -#: src/install.c:885 +#: src/install.c:886 #, c-format msgid "the strip option may not be used when installing a directory" msgstr "при встановленні каталогу не можна вживати ключ strip" -#: src/install.c:888 +#: src/install.c:889 #, c-format msgid "target directory not allowed when installing a directory" msgstr "при встановленні каталогу не можна вказувати цільовий каталог" -#: src/install.c:892 +#: src/install.c:893 #, c-format msgid "cannot force target context to %s and preserve it" msgstr "не можна примусово вказувати контекст та %s зберігати його " -#: src/install.c:946 src/mkdir.c:202 src/stdbuf.c:327 +#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326 #, c-format msgid "invalid mode %s" msgstr "неправильний режим %s" -#: src/install.c:953 +#: src/install.c:954 #, c-format msgid "WARNING: ignoring --strip-program option as -s option was not specified" msgstr "" "ПОПЕРЕДЖЕННЯ: ігноруємо параметр --strip-program, оскільки параметр -s не " "вказано" -#: src/install.c:958 +#: src/install.c:959 #, c-format msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive" msgstr "" "параметри --compare (-C) і --preserve-timestamps не можна використовувати " "одночасно" -#: src/install.c:965 +#: src/install.c:966 #, c-format msgid "options --compare (-C) and --strip are mutually exclusive" msgstr "параметри --compare (-C) і --strip не можна використовувати одночасно" -#: src/install.c:971 +#: src/install.c:972 #, c-format msgid "" "the --compare (-C) option is ignored when you specify a mode with non-" @@ -5005,7 +5049,7 @@ msgstr "" "бітами" #. This is a proper name. See the gettext manual, section Names. -#: src/join.c:40 src/sort.c:65 +#: src/join.c:40 src/sort.c:66 msgid "Mike Haertel" msgstr "Mike Haertel" @@ -5098,8 +5142,8 @@ msgstr "" #: src/join.c:403 #, c-format -msgid "%s:%ju: is not sorted: %.*s" -msgstr "%s:%ju: не впорядковано: %.*s" +msgid "%s:%<PRIuMAX>: is not sorted: %.*s" +msgstr "%s:%<PRIuMAX>: не впорядковано: %.*s" #: src/join.c:840 src/join.c:1038 #, c-format @@ -5126,12 +5170,12 @@ msgstr "поля об'єднання %lu, %lu несумісні" msgid "conflicting empty-field replacement strings" msgstr "конфліктуючі рядки заміни для порожнього поля" -#: src/join.c:1101 src/sort.c:4414 +#: src/join.c:1101 src/sort.c:4468 #, c-format msgid "multi-character tab %s" msgstr "багатознакова табуляція %s" -#: src/join.c:1105 src/sort.c:4419 +#: src/join.c:1105 src/sort.c:4473 #, c-format msgid "incompatible tabs" msgstr "несумісна табуляція" @@ -5153,14 +5197,10 @@ msgstr "" " або: %s -t [СИГНАЛ]...\n" #: src/kill.c:82 -msgid "" -"Send signals to processes, or list signals.\n" -"\n" -msgstr "" -"Надсилає процесам сигнали або виводить сигнали.\n" -"\n" +msgid "Send signals to processes, or list signals.\n" +msgstr "Надсилає процесам сигнали або виводить сигнали.\n" -#: src/kill.c:89 +#: src/kill.c:88 msgid "" " -s, --signal=SIGNAL, -SIGNAL\n" " specify the name or number of the signal to be sent\n" @@ -5174,7 +5214,7 @@ msgstr "" "назад\n" " -t, --table виводить таблицю з інформацією про сигнали\n" -#: src/kill.c:97 +#: src/kill.c:96 msgid "" "\n" "SIGNAL may be a signal name like 'HUP', or a signal number like '1',\n" @@ -5187,32 +5227,32 @@ msgstr "" "PID є цілим числом; якщо воно є від'ємним, то означає групу\n" "процесів.\n" -#: src/kill.c:206 +#: src/kill.c:205 #, c-format msgid "%s: invalid process id" msgstr "%s: неправильний ідентифікатор процесу" -#: src/kill.c:260 +#: src/kill.c:259 #, c-format msgid "invalid option -- %c" msgstr "неправильний ключ -- '%c'" -#: src/kill.c:269 +#: src/kill.c:268 #, c-format msgid "%s: multiple signals specified" msgstr "%s: задано декілька сигналів" -#: src/kill.c:283 +#: src/kill.c:282 #, c-format msgid "multiple -l or -t options specified" msgstr "задано декілька ключів -l або -t" -#: src/kill.c:300 +#: src/kill.c:299 #, c-format msgid "cannot combine signal with -l or -t" msgstr "не можна об'єднувати сигнал з -l або -t" -#: src/kill.c:306 +#: src/kill.c:305 #, c-format msgid "no process ID specified" msgstr "не вказаний ідентифікатор процесу" @@ -5323,7 +5363,6 @@ msgid "" "When creating hard links, each TARGET must exist. Symbolic links\n" "can hold arbitrary text; if later resolved, a relative link is\n" "interpreted in relation to its parent directory.\n" -"\n" msgstr "" "У першій формі створюється посилання на ПРИЗНАЧЕННЯ з назвою ПОСИЛАННЯ.\n" "У другий формі створюється посилання на ПРИЗНАЧЕННЯ у поточному каталозі.\n" @@ -5336,9 +5375,8 @@ msgstr "" "Символічні посилання можуть містити довільний текст. Під час пізнішого\n" "визначення ПРИЗНАЧЕННЯ відносне посилання визначатиметься на основі\n" "батьківського каталогу посилання.\n" -"\n" -#: src/ln.c:395 +#: src/ln.c:394 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -5358,7 +5396,7 @@ msgstr "" " суперкористувача)\n" " -f, --force вилучати вже створені цільові файли\n" -#: src/ln.c:403 +#: src/ln.c:402 msgid "" " -i, --interactive prompt whether to remove destinations\n" " -L, --logical dereference TARGETs that are symbolic links\n" @@ -5382,7 +5420,7 @@ msgstr "" " -s, --symbolic створювати символічні посилання, замість " "жорстких\n" -#: src/ln.c:412 +#: src/ln.c:411 msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" " -t, --target-directory=DIRECTORY specify the DIRECTORY in which to " @@ -5399,28 +5437,14 @@ msgstr "" " -v, --verbose виводити назву кожного файла перед створенням " "посилання\n" -#: src/ln.c:428 -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 ніколи не створювати резервних копій (навіть якщо\n" -" вказаний ключ --backup)\n" -" numbered, t створювати нумеровані копії\n" -" existing, nil якщо існують нумеровані копії, то створювати\n" -" нумеровані інакше створювати прості\n" -" simple. never завжди створювати прості копії\n" -"\n" - -#: src/ln.c:435 +#: src/ln.c:433 #, 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" "Використання -s призводить до ігнорування -L і -P. Інакше, останній " "параметр\n" "визначає роботу програми, якщо призначенням є символічне посилання.\n" @@ -5486,7 +5510,7 @@ msgstr "проігноровано неправильне значення зм #: src/ls.c:1599 #, c-format msgid "ignoring invalid width in environment variable COLUMNS: %s" -msgstr "проігноровано неправильну ширину змінної оточення COLUMNS: %s" +msgstr "проігноровано неправильну довжину змінної середовища COLUMNS: %s" #: src/ls.c:1629 #, c-format @@ -5494,10 +5518,10 @@ msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "" "проігноровано неправильний розмір табуляції змінної оточення TABSIZE: %s" -#: src/ls.c:1750 src/ptx.c:1976 +#: src/ls.c:1750 src/ptx.c:1975 #, c-format msgid "invalid line width: %s" -msgstr "неправильна ширина рядка: %s" +msgstr "неправильна довжина рядка: %s" #: src/ls.c:1824 #, c-format @@ -5557,7 +5581,7 @@ msgstr "читання каталогу %s" msgid "closing directory %s" msgstr "закриття каталогу %s" -#: src/ls.c:3301 +#: src/ls.c:3302 #, c-format msgid "cannot compare file names %s and %s" msgstr "не вдалося порівняти назви файлів %s та %s" @@ -5566,14 +5590,12 @@ msgstr "не вдалося порівняти назви файлів %s та % msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" -"\n" msgstr "" "Виводить дані щодо ФАЙЛів (типово у поточному каталозі).\n" "Впорядковує у алфавітному порядку, якщо не вказано ні --sort, ні один з\n" "параметрів -cftuSUX.\n" -"\n" -#: src/ls.c:4729 +#: src/ls.c:4728 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -5587,7 +5609,7 @@ msgstr "" " -b, --escape виводити вісімкові керівні послідовності\n" " замість неграфічних знаків\n" -#: src/ls.c:4735 +#: src/ls.c:4734 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them. E." "g.,\n" @@ -5613,7 +5635,7 @@ msgstr "" " у іншому випадку впорядкувати за часом зміни,\n" " найновіші — перші\n" -#: src/ls.c:4745 +#: src/ls.c:4744 msgid "" " -C list entries by columns\n" " --color[=WHEN] colorize the output. WHEN defaults to " @@ -5633,7 +5655,7 @@ msgstr "" " також не слідувати за символічним посиланням\n" " -D, --dired створити виведені дані у режимі Emacs dired\n" -#: src/ls.c:4753 +#: src/ls.c:4752 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -5649,11 +5671,11 @@ msgstr "" " single-column -1, verbose -l, vertical -C\n" " --full-time виводити повну дату та час\n" -#: src/ls.c:4761 +#: src/ls.c:4760 msgid " -g like -l, but do not list owner\n" msgstr " -g як і -l, але не виводити власника\n" -#: src/ls.c:4764 +#: src/ls.c:4763 msgid "" " --group-directories-first\n" " group directories before files.\n" @@ -5666,7 +5688,7 @@ msgstr "" " але використання --sort=none (-U) вимикає\n" " групування\n" -#: src/ls.c:4770 +#: src/ls.c:4769 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" @@ -5678,7 +5700,7 @@ msgstr "" " (наприклад, 1K 234M 2G)\n" " -H, --si те саме, але виводити ступені 1000, а не 1024\n" -#: src/ls.c:4776 +#: src/ls.c:4775 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5700,7 +5722,7 @@ msgstr "" " --hide=ШАБЛОН не виводити файли, що відповідають ШАБЛОНУ\n" " оболонки (скасовується ключами -a або -A)\n" -#: src/ls.c:4786 +#: src/ls.c:4785 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -5718,7 +5740,7 @@ msgstr "" " -I, --ignore=ШАБЛОН не виводити файли, що відповідають ШАБЛОНУ\n" " -k, --kibibytes використовувати 1024-байтові блоки\n" -#: src/ls.c:4796 +#: src/ls.c:4795 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5733,7 +5755,7 @@ msgstr "" " посилається посилання\n" " -m виводити список на всю ширину через кому\n" -#: src/ls.c:4804 +#: src/ls.c:4803 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. " @@ -5749,7 +5771,7 @@ msgstr "" " -o як -l, але не виводити інформацію про групу\n" " -p, --indicator-style=slash додавати індикатор / до каталогів\n" -#: src/ls.c:4812 +#: src/ls.c:4811 msgid "" " -q, --hide-control-chars print ? instead of non graphic characters\n" " --show-control-chars show non graphic characters as-is (default\n" @@ -5768,7 +5790,7 @@ msgstr "" " --quoting-style=СЛОВО використовувати вид оточення дужками СЛОВО:\n" " literal, shell, shell-always, c, escape\n" -#: src/ls.c:4821 +#: src/ls.c:4820 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -5779,7 +5801,7 @@ msgstr "" " -R, --recursive рекурсивно виводити каталоги\n" " -s, --size виводити розмір кожного файла, у блоках\n" -#: src/ls.c:4826 +#: src/ls.c:4825 msgid "" " -S sort by file size\n" " --sort=WORD sort by WORD instead of name: none -U,\n" @@ -5799,7 +5821,7 @@ msgstr "" " status; якщо --sort=time, використовувати\n" " вказаний час як ключ сортування\n" -#: src/ls.c:4836 +#: src/ls.c:4835 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, +FORMAT.\n" @@ -5819,7 +5841,7 @@ msgstr "" "префікс\n" " 'posix-', то він діє лише не у POSIX локалі\n" -#: src/ls.c:4845 +#: src/ls.c:4844 msgid "" " -t sort by modification time, newest first\n" " -T, --tabsize=COLS assume tab stops at each COLS instead of 8\n" @@ -5828,7 +5850,7 @@ msgstr "" "спочатку\n" " -T, --tabsize=ЧИСЛО крок табуляції дорівнює ЧИСЛУ замість 8\n" -#: src/ls.c:4849 +#: src/ls.c:4848 msgid "" " -u with -lt: sort by, and show, access time\n" " with -l: show access time and sort by name\n" @@ -5846,7 +5868,7 @@ msgstr "" "текстовому\n" " форматі\n" -#: src/ls.c:4856 +#: src/ls.c:4855 msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" @@ -5855,14 +5877,14 @@ msgid "" "file\n" " -1 list one file per line\n" msgstr "" -" -w, --width=ЧИСЛО задає ширину екрану замість поточного значення\n" +" -w, --width=ЧИСЛО задає ширину екрана замість поточного значення\n" " -x вивід списку рядками, а не стовпчиками\n" " -X сортувати за розширенням у алфавітному порядку\n" " -Z, --context виводити контекст безпеки SELinux для кожного " "файла\n" -" -1 виводити по одному файла у рядку\n" +" -1 виводити по одному файлу у рядку\n" -#: src/ls.c:4866 +#: src/ls.c:4865 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5877,7 +5899,7 @@ msgstr "" "Змінити параметри можна за допомогою змінної середовища LS_COLORS.\n" "Для встановлення цієї змінної скористайтеся командою dircolors.\n" -#: src/ls.c:4873 +#: src/ls.c:4872 msgid "" "\n" "Exit status:\n" @@ -5908,7 +5930,7 @@ msgstr "Scott Miller" msgid "David Madore" msgstr "David Madore" -#: src/md5sum.c:162 +#: src/md5sum.c:164 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -5921,7 +5943,7 @@ msgstr "" "Якщо ФАЙЛ не вказано або вказано як «-», читає стандартне джерело даних.\n" "\n" -#: src/md5sum.c:172 +#: src/md5sum.c:174 msgid "" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" @@ -5929,27 +5951,31 @@ msgstr "" " -b, --binary читати у двійковому режимі (типово, якщо\n" " читається не термінальне введення)\n" -#: src/md5sum.c:176 +#: src/md5sum.c:178 msgid " -b, --binary read in binary mode\n" msgstr " -b, --binary читати у двійковому режимі\n" -#: src/md5sum.c:179 +#: src/md5sum.c:181 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr " -c, --check читати суми %s з ФАЙЛІВ та порівняти їх\n" -#: src/md5sum.c:183 +#: src/md5sum.c:184 +msgid " --tag create a BSD-style checksum\n" +msgstr " --tag створити контрольну суму у форматі BSD\n" + +#: src/md5sum.c:188 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" " -t, --text читати у текстовому режимі (типово, якщо\n" " читається термінальний ввід)\n" -#: src/md5sum.c:187 +#: src/md5sum.c:192 msgid " -t, --text read in text mode (default)\n" msgstr " -t, --text читати у текстовому режимі (типово)\n" -#: src/md5sum.c:190 +#: src/md5sum.c:195 msgid "" "\n" "The following three options are useful only when verifying checksums:\n" @@ -5970,7 +5996,7 @@ msgstr "" " списку контрольних сум\n" "\n" -#: src/md5sum.c:198 +#: src/md5sum.c:203 msgid "" " --strict with --check, exit non-zero for any invalid input\n" msgstr "" @@ -5978,7 +6004,7 @@ msgstr "" "некоректного\n" " джерела вхідних даних\n" -#: src/md5sum.c:203 +#: src/md5sum.c:208 #, c-format msgid "" "\n" @@ -5993,35 +6019,35 @@ msgstr "" "Типово виводить рядок з контрольною сумою, символ, що вказує на\n" "тип файла («*» для двійкових, « » для текстових), та назву кожного ФАЙЛа.\n" -#: src/md5sum.c:502 +#: src/md5sum.c:523 #, c-format msgid "%s: too many checksum lines" msgstr "%s: надто багато рядків контрольних сум" -#: src/md5sum.c:526 +#: src/md5sum.c:547 #, c-format msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line" msgstr "%s: %<PRIuMAX>: неправильно складений рядок контрольної суми %s" -#: src/md5sum.c:551 +#: src/md5sum.c:572 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: не вдалося відкрити або прочитати\n" -#: src/md5sum.c:574 +#: src/md5sum.c:595 msgid "FAILED" msgstr "ПОМИЛКА" -#: src/md5sum.c:576 +#: src/md5sum.c:597 msgid "OK" msgstr "Гаразд" -#: src/md5sum.c:600 +#: src/md5sum.c:621 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "%s: не знайдено правильно складених рядків контрольних сум %s" -#: src/md5sum.c:610 +#: src/md5sum.c:631 #, c-format msgid "WARNING: %<PRIuMAX> line is improperly formatted" msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted" @@ -6029,7 +6055,7 @@ msgstr[0] "ПОПЕРЕДЖЕННЯ: %<PRIuMAX> рядок має помилко msgstr[1] "ПОПЕРЕДЖЕННЯ: %<PRIuMAX> рядки мають помилкове форматування" msgstr[2] "ПОПЕРЕДЖЕННЯ: %<PRIuMAX> рядків мають помилкове форматування" -#: src/md5sum.c:618 +#: src/md5sum.c:639 #, c-format msgid "WARNING: %<PRIuMAX> listed file could not be read" msgid_plural "WARNING: %<PRIuMAX> listed files could not be read" @@ -6037,7 +6063,7 @@ msgstr[0] "ПОПЕРЕДЖЕННЯ: не вдалося прочитати %<PR msgstr[1] "ПОПЕРЕДЖЕННЯ: не вдалося прочитати %<PRIuMAX> вказані файли" msgstr[2] "ПОПЕРЕДЖЕННЯ: не вдалося прочитати %<PRIuMAX> вказаних файлів" -#: src/md5sum.c:626 +#: src/md5sum.c:647 #, c-format msgid "WARNING: %<PRIuMAX> computed checksum did NOT match" msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match" @@ -6045,28 +6071,38 @@ msgstr[0] "ПОПЕРЕДЖЕННЯ: НЕ збіглась %<PRIuMAX> обчис msgstr[1] "ПОПЕРЕДЖЕННЯ: НЕ збіглись %<PRIuMAX> обчислені контрольні суми" msgstr[2] "ПОПЕРЕДЖЕННЯ: НЕ збіглись %<PRIuMAX> обчислених контрольних сум" -#: src/md5sum.c:704 +#: src/md5sum.c:760 +#, c-format +msgid "--tag does not support --text mode" +msgstr "підтримки --tag у режимі --text не передбачено" + +#: src/md5sum.c:766 +#, c-format +msgid "the --tag option is meaningless when verifying checksums" +msgstr "ключ --tag не має сенсу під час перевірки контрольних сум" + +#: src/md5sum.c:773 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" msgstr "ключі --binary та --text не мають сенсу при перевірці контрольних сум" -#: src/md5sum.c:712 +#: src/md5sum.c:781 #, c-format msgid "the --status option is meaningful only when verifying checksums" msgstr "ключ --status має сенс лише при перевірці контрольних сум" -#: src/md5sum.c:719 +#: src/md5sum.c:788 #, c-format msgid "the --warn option is meaningful only when verifying checksums" msgstr "ключ --warn має сенс лише при перевірці контрольних сум" -#: src/md5sum.c:726 +#: src/md5sum.c:795 #, c-format msgid "the --quiet option is meaningful only when verifying checksums" msgstr "ключ --quiet має сенс лише при перевірці контрольних сум" -#: src/md5sum.c:733 +#: src/md5sum.c:802 #, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "ключ --strict має сенс лише при перевірці контрольних сум" @@ -6077,14 +6113,10 @@ msgid "Usage: %s [OPTION]... DIRECTORY...\n" msgstr "Використання: %s [КЛЮЧ]... КАТАЛОГ...\n" #: src/mkdir.c:57 -msgid "" -"Create the DIRECTORY(ies), if they do not already exist.\n" -"\n" -msgstr "" -"Створює DIRECTORY, якщо він ще не існує.\n" -"\n" +msgid "Create the DIRECTORY(ies), if they do not already exist.\n" +msgstr "Створює DIRECTORY, якщо він ще не існує.\n" -#: src/mkdir.c:64 +#: src/mkdir.c:63 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" @@ -6099,7 +6131,7 @@ msgstr "" " -Z, --context=CTX встановити контекст безпеки SELinux кожного створеного\n" " каталогу на CTX\n" -#: src/mkdir.c:169 +#: src/mkdir.c:168 #, c-format msgid "created directory %s" msgstr "створений каталог %s" @@ -6110,32 +6142,28 @@ msgid "Usage: %s [OPTION]... NAME...\n" msgstr "Використання: %s [КЛЮЧ]... НАЗВА...\n" #: src/mkfifo.c:52 -msgid "" -"Create named pipes (FIFOs) with the given NAMEs.\n" -"\n" -msgstr "" -"Створює іменовані канали (FIFO) для вказаного NAME.\n" -"\n" +msgid "Create named pipes (FIFOs) with the given NAMEs.\n" +msgstr "Створює іменовані канали (FIFO) для вказаного NAME.\n" -#: src/mkfifo.c:59 src/mknod.c:61 +#: src/mkfifo.c:58 src/mknod.c:60 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:62 +#: src/mkfifo.c:61 msgid "" " -Z, --context=CTX set the SELinux security context of each NAME to CTX\n" msgstr "" " -Z, --context=КОН встановити контекст безпеки SELinux для кожної НАЗВИ у " "КОН\n" -#: src/mkfifo.c:122 src/mknod.c:128 +#: src/mkfifo.c:121 src/mknod.c:127 #, c-format msgid "invalid mode" msgstr "неправильний режим" -#: src/mkfifo.c:127 src/mknod.c:133 +#: src/mkfifo.c:126 src/mknod.c:132 #, c-format msgid "mode must specify only file permission bits" msgstr "режим повинен визначати лише біти прав доступу до файла" @@ -6146,19 +6174,15 @@ msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n" msgstr "Використання: %s [КЛЮЧ]... НАЗВА ТИП [ОСНОВНИЙ ДРУГОРЯДНИЙ]\n" #: src/mknod.c:54 -msgid "" -"Create the special file NAME of the given TYPE.\n" -"\n" -msgstr "" -"Створює спеціальній файл з назвою NAME та типом TYPE.\n" -"\n" +msgid "Create the special file NAME of the given TYPE.\n" +msgstr "Створює спеціальній файл з назвою NAME та типом TYPE.\n" -#: src/mknod.c:64 +#: 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:69 +#: src/mknod.c:68 msgid "" "\n" "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n" @@ -6173,7 +6197,7 @@ msgstr "" "шістнадцяткові числа; якщо починаються з 0 - як вісімкові;\n" "інакше як десяткові. ТИП може приймати наступні значення:\n" -#: src/mknod.c:76 +#: src/mknod.c:75 msgid "" "\n" " b create a block (buffered) special file\n" @@ -6185,42 +6209,42 @@ msgstr "" " c, u створити файл символьного пристрою (не буферизований)\n" " p створити іменований канал\n" -#: src/mknod.c:151 +#: src/mknod.c:150 msgid "Special files require major and minor device numbers." msgstr "" "Для спеціального файла повинні бути вказані основний та другорядний номери " "пристрою." -#: src/mknod.c:161 +#: src/mknod.c:160 msgid "Fifos do not have major and minor device numbers." msgstr "У файлів-черг немає основного та другорядного числа пристрою." -#: src/mknod.c:177 +#: src/mknod.c:176 #, c-format msgid "block special files not supported" msgstr "блочні спеціальні файли не підтримуються" -#: src/mknod.c:186 +#: src/mknod.c:185 #, c-format msgid "character special files not supported" msgstr "знакові спеціальні файли не підтримуються" -#: src/mknod.c:202 +#: src/mknod.c:201 #, c-format msgid "invalid major device number %s" msgstr "неправильне основне число пристрою %s" -#: src/mknod.c:207 +#: src/mknod.c:206 #, c-format msgid "invalid minor device number %s" msgstr "неправильне другорядне число пристрою %s" -#: src/mknod.c:212 +#: src/mknod.c:211 #, c-format msgid "invalid device %s %s" msgstr "неправильний пристрій %s %s" -#: src/mknod.c:226 +#: src/mknod.c:225 #, c-format msgid "invalid device type %s" msgstr "неправильний тип пристрою %s" @@ -6308,60 +6332,57 @@ msgstr "" " разі каталог вказується у -p; інакше /tmp " "[застаріло]\n" -#: src/mktemp.c:222 +#: src/mktemp.c:223 #, c-format msgid "failed to redirect stderr to /dev/null" msgstr "не вдалося переспрямувати stderr до /dev/null" -#: src/mktemp.c:228 +#: src/mktemp.c:229 #, c-format msgid "too many templates" msgstr "надто багато шаблонів" -#: src/mktemp.c:248 +#: src/mktemp.c:249 #, c-format msgid "with --suffix, template %s must end in X" msgstr "у разі визначення --suffix, шаблон %s має завершувати на X" -#: src/mktemp.c:273 src/split.c:1117 +#: src/mktemp.c:274 src/split.c:1130 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "некоректний шаблон, %s, містить символ розділення каталогів" -#: src/mktemp.c:278 +#: src/mktemp.c:279 #, c-format msgid "too few X's in template %s" msgstr "надто мало символів X у шаблоні %s" -#: src/mktemp.c:291 +#: src/mktemp.c:292 #, c-format msgid "invalid template, %s, contains directory separator" msgstr "неправильний шаблон, %s, містить символ розділення каталогів" -#: src/mktemp.c:305 +#: src/mktemp.c:306 #, c-format msgid "invalid template, %s; with --tmpdir, it may not be absolute" msgstr "неправильний шаблон, %s; з --tmpdir, він не може бути абсолютним" -#: src/mktemp.c:325 +#: src/mktemp.c:326 #, c-format msgid "failed to create directory via template %s" msgstr "не вдалося створити каталог через шаблон %s" -#: src/mktemp.c:335 +#: src/mktemp.c:336 #, c-format msgid "failed to create file via template %s" msgstr "не вдалося створити файл через шаблон %s" -#: src/mv.c:290 -msgid "" -"Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" -"\n" +#: src/mv.c:292 +msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" msgstr "" "Перейменовує ДЖЕРЕЛО у ПРИЗНАЧЕННЯ, або переміщує ДЖЕРЕЛА до КАТАЛОГУ.\n" -"\n" -#: src/mv.c:297 +#: src/mv.c:298 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -6382,7 +6403,7 @@ msgstr "" "Якщо буде вказано декілька -i, -f, -n, братиметься до уваги лише останній\n" "параметр.\n" -#: src/mv.c:306 +#: src/mv.c:307 msgid "" " --strip-trailing-slashes remove any trailing slashes from each " "SOURCE\n" @@ -6393,7 +6414,7 @@ msgstr "" " аргументу ДЖЕРЕЛО\n" " -S, --suffix=СУФІКС перевизначає суфікс для резервних копій\n" -#: src/mv.c:311 +#: src/mv.c:312 msgid "" " -t, --target-directory=DIRECTORY move all SOURCE arguments into " "DIRECTORY\n" @@ -6419,55 +6440,54 @@ msgstr "Використання: %s [КЛЮЧ] [КОМАНДА [АРГ]...]\n" #, c-format msgid "" "Run COMMAND with an adjusted niceness, which affects process scheduling.\n" -"With no COMMAND, print the current niceness. Nicenesses range from\n" -"%d (most favorable scheduling) to %d (least favorable).\n" -"\n" -" -n, --adjustment=N add integer N to the niceness (default 10)\n" +"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 "" -"Запускає КОМАНДУ зі зміненим значенням уподобаності, що впливає на " +"Запускає КОМАНДУ зі зміненим значенням поступливості, що впливає на " "пріоритет\n" "для планувальника. Якщо КОМАНДУ не вказано, виводиться поточне значення\n" -"уподобаності. Допустимі межі: від %d (найбільший пріоритет) до %d\n" +"поступливості. Допустимі межі: від %d (найбільший пріоритет) до %d\n" "(найменший).\n" -"\n" -" -n, --adjustment=N збільшити уподобаність на ціле число N (типово 10)\n" -#: src/nice.c:168 +#: src/nice.c:82 +msgid " -n, --adjustment=N add integer N to the niceness (default 10)\n" +msgstr "" +" -n, --adjustment=N збільшити поступливість на ціле число N (типово 10)\n" + +#: src/nice.c:172 #, c-format msgid "invalid adjustment %s" msgstr "неправильна поправка %s" -#: src/nice.c:177 +#: src/nice.c:181 #, c-format msgid "a command must be given with an adjustment" msgstr "якщо вказана поправка, треба вказати команду" -#: src/nice.c:184 src/nice.c:195 +#: src/nice.c:188 src/nice.c:199 #, c-format msgid "cannot get niceness" -msgstr "не вдалося дізнатись уподобаності" +msgstr "не вдалося дізнатись поступливість" -#: src/nice.c:201 +#: src/nice.c:205 #, c-format msgid "cannot set niceness" -msgstr "не вдалося встановити значення уподобаності" +msgstr "не вдалося встановити значення поступливості" #. This is a proper name. See the gettext manual, section Names. #: src/nl.c:40 msgid "Scott Bartram" msgstr "Scott Bartram" -#: src/nl.c:186 +#: src/nl.c:179 msgid "" "Write each FILE to standard output, with line numbers added.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" "Виводить кожен ФАЙЛ на стандартний вивід, додаючи номери рядків.\n" "Якщо ФАЙЛ не вказаний або вказаний як -, читається стандартний ввід.\n" -"\n" -#: src/nl.c:194 +#: src/nl.c:186 msgid "" " -b, --body-numbering=STYLE use STYLE for numbering body lines\n" " -d, --section-delimiter=CC use CC for separating logical pages\n" @@ -6480,7 +6500,7 @@ msgstr "" " -f, --footer-numbering=СТИЛЬ використовувати СТИЛЬ нумерації рядків\n" " нижнього колонтитулу\n" -#: src/nl.c:199 +#: src/nl.c:191 msgid "" " -h, --header-numbering=STYLE use STYLE for numbering header lines\n" " -i, --line-increment=NUMBER line number increment at each line\n" @@ -6501,7 +6521,7 @@ msgstr "" " кожної логічної сторінки\n" " -s, --number-separator=РЯДОК додавати РЯДОК після номера\n" -#: src/nl.c:207 +#: src/nl.c:199 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" @@ -6511,7 +6531,7 @@ msgstr "" " -w, --number-width=ЧИСЛО використовувати вказане ЧИСЛО стовпчиків\n" " для номерів рядків\n" -#: src/nl.c:213 +#: src/nl.c:205 msgid "" "\n" "By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC are\n" @@ -6524,7 +6544,7 @@ msgstr "" "іншого використовується :. Вводьте \\\\ щоб отримати \\. СТИЛЬ вказується\n" "як один з наступних:\n" -#: src/nl.c:219 +#: src/nl.c:211 msgid "" "\n" " a number all lines\n" @@ -6554,54 +6574,47 @@ msgstr "" " rz вирівнювати по правому краю, виводити початкові нулі\n" "\n" -#: src/nl.c:286 +#: src/nl.c:278 #, c-format msgid "line number overflow" msgstr "переповнення номера рядка" -#: src/nl.c:486 +#: src/nl.c:478 #, c-format msgid "invalid header numbering style: %s" msgstr "неправильний стиль нумерації заголовка: %s" -#: src/nl.c:494 +#: src/nl.c:486 #, c-format msgid "invalid body numbering style: %s" msgstr "неправильний стиль нумерації тіла: %s" -#: src/nl.c:502 +#: src/nl.c:494 #, c-format msgid "invalid footer numbering style: %s" msgstr "неправильний стиль нумерації нижнього колонтитула: %s" -#: src/nl.c:511 +#: src/nl.c:503 #, c-format msgid "invalid starting line number: %s" msgstr "неправильний номер початкового рядка: %s" -#: src/nl.c:517 -#, c-format -msgid "WARNING: --page-increment is deprecated; use --line-increment instead" -msgstr "" -"ПОПЕРЕДЖЕННЯ: --page-increment вважаєте застарілим; вам варто скористатися --" -"line-increment" - -#: src/nl.c:524 +#: src/nl.c:512 #, c-format msgid "invalid line number increment: %s" msgstr "неправильний приріст номеру рядка: %s" -#: src/nl.c:536 +#: src/nl.c:524 #, c-format msgid "invalid number of blank lines: %s" msgstr "неправильна кількість порожніх рядків: %s" -#: src/nl.c:550 +#: src/nl.c:538 #, c-format msgid "invalid line number field width: %s" msgstr "неправильна ширина поля для номера рядка: %s" -#: src/nl.c:569 +#: src/nl.c:557 #, c-format msgid "invalid line numbering format: %s" msgstr "неправильний формат нумерації рядків: %s" @@ -6653,11 +6666,6 @@ msgstr "" msgid "ignoring input" msgstr "всі аргументи проігноровані" -#: src/nohup.c:163 src/nohup.c:165 -#, c-format -msgid "failed to open %s" -msgstr "не вдалося відкрити %s" - #: src/nohup.c:175 #, c-format msgid "ignoring input and appending output to %s" @@ -6691,16 +6699,16 @@ msgid "failed to redirect standard error" msgstr "не вдалося перенаправити стандартний потік помилок" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:32 +#: src/nproc.c:33 msgid "Giuseppe Scrivano" msgstr "Giuseppe Scrivano" -#: src/nproc.c:56 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 +#: src/nproc.c:57 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Використання: %s [КЛЮЧ]...\n" -#: src/nproc.c:57 +#: src/nproc.c:58 msgid "" "Print the number of processing units available to the current process,\n" "which may be less than the number of online processors\n" @@ -6710,7 +6718,7 @@ msgstr "" "може бути меншим за кількість процесорів, які працюватимуть.\n" "\n" -#: src/nproc.c:62 +#: src/nproc.c:63 msgid "" " --all print the number of installed processors\n" " --ignore=N if possible, exclude N processing units\n" @@ -6718,11 +6726,452 @@ msgstr "" " --all вивести кількість встановлених процесорів\n" " --ignore=N якщо можна, виключити N модулів обробки\n" -#: src/nproc.c:106 +#: src/nproc.c:107 #, c-format msgid "%s: invalid number to ignore" msgstr "%s: некоректне число для виключення" +#. This is a proper name. See the gettext manual, section Names. +#: src/numfmt.c:35 +msgid "Assaf Gordon" +msgstr "Assaf Gordon" + +#: src/numfmt.c:676 +#, c-format +msgid "value too large to be converted: '%s'" +msgstr "значення є надто великим для перетворення: «%s»" + +#: src/numfmt.c:680 +#, c-format +msgid "invalid number: '%s'" +msgstr "некоректне число: «%s»" + +#: src/numfmt.c:684 +#, c-format +msgid "rejecting suffix in input: '%s' (consider using --from)" +msgstr "" +"відкидаємо суфікс «%s» у вхідних даних (варто використовувати --from для " +"його збереження)" + +#: src/numfmt.c:688 +#, c-format +msgid "invalid suffix in input: '%s'" +msgstr "некоректний суфікс у вхідних даних: «%s»" + +#: src/numfmt.c:692 +#, c-format +msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)" +msgstr "у вхідних даних не вистачає суфікса «i»: «%s» (наприклад Ki/Mi/Gi)" + +#: src/numfmt.c:723 +#, 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 +#, c-format +msgid "out of memory (requested %zu bytes)" +msgstr "переповнення пам’яті (запитано %zu байтів)" + +#: src/numfmt.c:813 +#, c-format +msgid "Usage: %s [OPTION]... [NUMBER]...\n" +msgstr "Користування: %s [ПАРАМЕТР]... [ЧИСЛО]...\n" + +#: src/numfmt.c:816 +msgid "" +"Reformat NUMBER(s), or the numbers from standard input if none are " +"specified.\n" +msgstr "" +"Виконати переформатування числа ЧИСЛО або чисел зі стандартного джерела " +"даних, якщо ЧИСЛО не вказано.\n" + +#: src/numfmt.c:820 +msgid " --debug print warnings about invalid input\n" +msgstr "" +" --debug виводити попередження щодо некоректних вхідних даних\n" + +#: src/numfmt.c:823 +msgid "" +" -d, --delimiter=X use X instead of whitespace for field delimiter\n" +msgstr "" +" -d, --delimiter=X використовувати X замість пробілу для відокремлення " +"полів\n" + +#: src/numfmt.c:826 +msgid "" +" --field=N replace the number in input field N (default is 1)\n" +msgstr "" +" --field=N замісити число у полі N вхідних даних (типове поле -- " +"1)\n" + +#: src/numfmt.c:829 +msgid "" +" --format=FORMAT use printf style floating-point FORMAT;\n" +" see FORMAT below for details\n" +msgstr "" +" --format=ФОРМАТ використовувати форматування у стилі printf;\n" +" див. докладний опис форматів нижче\n" + +#: src/numfmt.c:833 +msgid "" +" --from=UNIT auto-scale input numbers to UNITs; default is " +"'none';\n" +" see UNIT below\n" +msgstr "" +" --from=ОДИНИЦЯ автоматично масштабувати вхідні числа за ОДИНИЦЕЮ; " +"типове значення -- 'none';\n" +" див. опис одиниць нижче\n" + +#: src/numfmt.c:837 +msgid "" +" --from-unit=N specify the input unit size (instead of the default " +"1)\n" +msgstr "" +" --from-unit=N вказати розмірність одиниці у вхідних даних (замість " +"типової 1)\n" + +#: src/numfmt.c:840 +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 групувати цифри відповідно до правил локалі, " +"наприклад 1.000.000\n" +" (не працюватиме у локалі C/POSIX)\n" + +#: src/numfmt.c:844 +msgid "" +" --header[=N] print (without converting) the first N header lines;\n" +" N defaults to 1 if not specified\n" +msgstr "" +" --header[=N] вивести (без перетворення) перші N рядків заголовка;\n" +" якщо не вказано, типовим значенням є 1\n" + +#: src/numfmt.c:848 +msgid "" +" --invalid=MODE failure mode for invalid numbers: MODE can be:\n" +" abort (default), fail, warn, ignore\n" +msgstr "" +" --invalid=РЕЖИМ режим обробки некоректних символів. Можливі режими:\n" +" abort (перервати обробку, типовий), fail (обробити з " +"помилками),\n" +" warn (попередити), ignore (ігнорувати).\n" + +#: src/numfmt.c:852 +msgid "" +" --padding=N pad the output to N characters; positive N will\n" +" right-align; negative N will left-align;\n" +" padding is ignored if the output is wider than N;\n" +" the default is to automatically pad if a " +"whitespace\n" +" is found\n" +msgstr "" +" --padding=N доповнити виведені дані до N символів.\n" +" Використання додатного N призведе до вирівнювання " +"праворуч\n" +" Від’ємні N вирівнюватимуть дані ліворуч.\n" +" Зауваження: якщо виведені дані будуть довшими за N,\n" +" доповнення не відбуватиметься. Типовим є автоматичне " +"доповнення,\n" +" якщо буде виявлено пробіли.\n" + +#: src/numfmt.c:859 +msgid "" +" --round=METHOD use METHOD for rounding when scaling; METHOD can be:\n" +" up, down, from-zero (default), towards-zero, " +"nearest\n" +msgstr "" +" --round=СПОСІБ спосіб округлення під час масштабування. Варіанти:\n" +" up (до більшого), down (до меншого), from-zero (до " +"дальшого\n" +" до нуля, типовий), towards-zero (до ближчого до " +"нуля),\n" +" nearest (до найближчого цілого\n" + +#: src/numfmt.c:863 +msgid "" +" --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" +" SUFFIX in input numbers\n" +msgstr "" +" --suffix=СУФІКС додати СУФІКС до виведених чисел і використовувати " +"СУФІКС\n" +" у вхідних даних.\n" + +#: src/numfmt.c:867 +msgid "" +" --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" +msgstr "" +" --to=ОДИНИЦЯ автоматично масштабувати виведені числа за ОДИНИЦЕЮ; " +"див. опис одиниць нижче\n" + +#: src/numfmt.c:870 +msgid "" +" --to-unit=N the output unit size (instead of the default 1)\n" +msgstr "" +" --to-unit=N розмірність одиниці у виведених даних (замість " +"типової 1)\n" + +#: src/numfmt.c:877 +msgid "" +"\n" +"UNIT options:\n" +msgstr "" +"\n" +"Параметри одиниць:\n" + +#: src/numfmt.c:880 +msgid " none no auto-scaling is done; suffixes will trigger an error\n" +msgstr "" +" none без автоматичного масштабування; використання суфіксів призведе " +"до повідомлення про помилку\n" + +#: src/numfmt.c:883 +msgid "" +" auto accept optional single/two letter suffix:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" +msgstr "" +" auto приймати додаткові одно-/дволітерні суфікси:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" + +#: src/numfmt.c:889 +msgid "" +" si accept optional single letter suffix:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ...\n" +msgstr "" +" si приймати додаткові однолітерні суфікси:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ...\n" + +#: src/numfmt.c:894 +msgid "" +" iec accept optional single letter suffix:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ...\n" +msgstr "" +" iec приймати додаткові однолітерні суфікси:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ...\n" + +#: src/numfmt.c:899 +msgid "" +" iec-i accept optional two-letter suffix:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ...\n" +msgstr "" +" iec-i приймати додаткові дволітерні суфікси:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ...\n" + +#: src/numfmt.c:905 +#, 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" +msgstr "" +"\n" +"ФОРМАТ має відповідати виведенню одного аргументу з рухомою крапкою -- " +"«%f».\n" +"Використання лапки (%'f) увімкне параметр --grouping (якщо він підтримується " +"поточною локаллю).\n" +"Додаткове визначення довжини (%10f) призведе до доповнення виведених даних. " +"Додаткові від’ємні\n" +"значення довжини (%-10f) вирівнюватимуть виведення ліворуч.\n" + +#: src/numfmt.c:912 +#, c-format +msgid "" +"\n" +"Exit status is 0 if all input numbers were successfully converted.\n" +"By default, %s will stop at the first conversion error with exit status 2.\n" +"With --invalid='fail' a warning is printed for each conversion error\n" +"and the exit status is 2. With --invalid='warn' each conversion error is\n" +"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" +"Станом виходу буде 0, якщо всі числа у вхідних даних було успішно " +"перетворено.\n" +"Типово, %s припинить обробку після першої ж помилки зі станом виходу 2.\n" +"Якщо буде вказано --invalid='fail', для кожної помилки перетворення буде\n" +"виведено попередження, а станом виходу буде 2. Якщо буде вказано\n" +"--invalid='warn', буде виявлено всіх помилки перетворення, але станом " +"виходу\n" +"буде 0. Якщо буде вказано --invalid='ignore', про помилки перетворення не\n" +"повідомлятиметься, а станом виходу буде 0.\n" + +#: src/numfmt.c:921 +#, c-format +msgid "" +"\n" +"Examples:\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" +msgstr "" +"\n" +"Прикладиs:\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 +#, c-format +msgid "format %s has no %% directive" +msgstr "формат %s не містить директиву %%" + +#: src/numfmt.c:990 +#, c-format +msgid "invalid format %s (width overflow)" +msgstr "некоректний формат %s (переповнення ширини)" + +#: src/numfmt.c:1007 src/seq.c:229 +#, c-format +msgid "format %s ends in %%" +msgstr "формат %s закінчується у %%" + +#: src/numfmt.c:1010 +#, c-format +msgid "invalid format %s, directive must be %%['][-][N]f" +msgstr "некоректний формат %s, інструкцією має бути %%['][-][N]f" + +#: src/numfmt.c:1018 src/seq.c:236 +#, c-format +msgid "format %s has too many %% directives" +msgstr "формат %s має надто багато директив %%" + +#: src/numfmt.c:1070 +#, c-format +msgid "invalid suffix in input '%s': '%s'" +msgstr "некоректний суфікс у вхідних даних «%s»: «%s»" + +#: src/numfmt.c:1092 +#, c-format +msgid "value too large to be printed: '%Lg' (consider using --to)" +msgstr "" +"значення є надто великим для виведення: «%Lg» (варто скористатися --to)" + +#: src/numfmt.c:1100 +#, c-format +msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" +msgstr "" +"значення є надто великим для виведення: «%Lg» (обробка значень більше 999Y " +"неможлива)" + +#: src/numfmt.c:1184 +#, c-format +msgid "large input value '%s': possible precision loss" +msgstr "занадто велике вхідне значення, «%s», можлива втрата точності" + +#: src/numfmt.c:1293 +#, c-format +msgid "input line is too short, no numbers found to convert in field %ld" +msgstr "" +"надто короткий рядок вхідних даних, у полі %ld не виявлено чисел для " +"форматування" + +#: src/numfmt.c:1388 +#, c-format +msgid "invalid padding value '%s'" +msgstr "некоректне значення доповнення «%s»" + +#: src/numfmt.c:1401 +#, c-format +msgid "invalid field value '%s'" +msgstr "некоректне значення поля, «%s»" + +#: src/numfmt.c:1430 +#, c-format +msgid "invalid header value '%s'" +msgstr "некоректне значення заголовка, «%s»" + +#: src/numfmt.c:1456 +#, 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 +#, c-format +msgid "no conversion option specified" +msgstr "не вказано параметра перетворення" + +#: src/numfmt.c:1471 +#, c-format +msgid "grouping cannot be combined with --to" +msgstr "grouping не можна використовувати разом з --to" + +#: src/numfmt.c:1473 +#, c-format +msgid "grouping has no effect in this locale" +msgstr "групування не діє у цій локалі" + +#: src/numfmt.c:1486 +#, c-format +msgid "--header ignored with command-line input" +msgstr "" +"--header проігноровано, оскільки вхідні дані надходять з командного рядка" + +#: src/numfmt.c:1511 +#, c-format +msgid "error reading input" +msgstr "помилка під час спроби читання вхідних даних" + +#: src/numfmt.c:1520 +#, c-format +msgid "failed to convert some of the input numbers" +msgstr "не вдалося перетворити деякі з вхідних чисел" + #: src/od.c:294 #, c-format msgid "" @@ -6752,39 +7201,62 @@ msgstr "" "\n" #: src/od.c:307 -msgid "All arguments to long options are mandatory for short options.\n" -msgstr "Всі аргументи для довгих ключів є обов'язковими для коротких.\n" +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" +"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" +"at first byte printed, incremented when dump is progressing.\n" +"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" +"операнда) на цифру. Операнд ЗСУВ означає -j ЗСУВ. МІТКА --\n" +"це псевдоадреса першого виведеного байту, збільшується у процесі\n" +"виводу. Префікс 0x або 0X задає ЗСУВ або МІТКУ як\n" +"шістнадцяткові числа, суфікс . -- як вісімкові, а суфікс b\n" +"помножує на 512.\n" -#: src/od.c:310 +#: src/od.c:318 msgid "" -" -A, --address-radix=RADIX decide how file offsets are printed\n" +" -A, --address-radix=RADIX output format for file offsets. RADIX is one\n" +" of [doxn], for Decimal, Octal, Hex or None\n" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" " -A, --address-radix=ОСНОВА виводити зсув у файлах використовуючи\n" " вказану систему числення\n" +"\n" +" ОСНОВОЮ може бути одна з літер [doxn],\n" +" десяткова, вісімкова, шістнадцяткова або\n" +" ніяка\n" " -j, --skip-bytes=Н пропустить перші Н байт\n" -#: src/od.c:314 +#: src/od.c:323 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" -" --traditional accept arguments in traditional form\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 читати лише N байтів у кожному файлі\n" " -S, --strings[=N] виводити рядки довжиною принаймні N байтів\n" " графічних знаків\n" +" Якщо N не вказано, буде використано 3\n" " -t, --format=ТИП вибір формату або форматів виводу\n" " -v, --output-duplicates не позначати знаком * рядки, що не виводяться\n" " -w[N], --width[=N] виводити N байтів у кожному рядку виводу\n" +" Якщо N не вказано, буде використано 32\n" " --traditional приймати аргументи у традиційній формі\n" -#: src/od.c:324 +#: src/od.c:336 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" @@ -6792,13 +7264,14 @@ msgid "" " -d same as -t u2, select unsigned decimal 2-byte units\n" msgstr "" "\n" +"\n" "Традиційні специфікації формату можна змішувати, вони акумулюються:\n" " -a синонім -t a, іменовані знаки\n" " -b синонім -t o1, вісімкові байти\n" " -c синонім -t c, ASCII-знаки або керівні послідовності з '\\'\n" " -d синонім -t u2, беззнакові десяткові двобайтові одиниці\n" -#: src/od.c:332 +#: src/od.c:345 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -6814,40 +7287,21 @@ msgstr "" " -s синонім -t d2, десяткові двобайтові одиниці\n" " -x синонім -t x2, шістнадцяткові двобайтові одиниці\n" -#: src/od.c:340 +#: src/od.c:353 msgid "" "\n" -"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" -"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" -"at first byte printed, incremented when dump is progressing.\n" -"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" -"форма, якщо останній операнд починається на + або (якщо вказані два\n" -"операнда) на цифру. Операнд ЗСУВ означає -j ЗСУВ. МІТКА --\n" -"це псевдоадреса першого виведеного байту, збільшується у процесі\n" -"виводу. Префікс 0x або 0X задає ЗСУВ або МІТКУ як\n" -"шістнадцяткові числа, суфікс . -- як вісімкові, а суфікс b\n" -"помножує на 512.\n" - -#: src/od.c:349 -msgid "" "\n" "TYPE is made up of one or more of these specifications:\n" -"\n" " a named character, ignoring high-order bit\n" " c ASCII character or backslash escape\n" msgstr "" "\n" -"ТИП може складатись з одного або більше наступних описів:\n" "\n" +"ТИП може складатись з одного або більше наступних описів:\n" " a іменований знак\n" " c ASCII-знак або керівна послідовність з '\\'\n" -#: src/od.c:356 +#: src/od.c:360 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -6861,55 +7315,59 @@ msgstr "" " u[ЧИСЛО] беззнакове десяткове ціле розміром вказане ЧИСЛО байт\n" " x[ЧИСЛО] шістнадцяткове ціле розміром вказане ЧИСЛО байт\n" -#: src/od.c:363 +#: src/od.c:367 msgid "" "\n" -"SIZE is a number. For TYPE in doux, SIZE may also be C for\n" +"SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" "sizeof(char), S for sizeof(short), I for sizeof(int) or L for\n" "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" -"Якщо ФОРМАТ -- одне з [doux], ЧИСЛО можна вказувати як C (char), S (short),\n" -"I (int) або L (long), якщо ФОРМАТ дорівнює f, то ЧИСЛО може бути F (float),\n" +"Якщо ТИП -- одна з літер [doux], ЧИСЛО можна вказувати як C (char), S " +"(short),\n" +"I (int) або L (long), якщо ТИП дорівнює f, ЧИСЛО може бути F (float),\n" "D (double) або L (long double).\n" -#: src/od.c:370 +#: src/od.c:374 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" +"Adding a z suffix to any type displays printable characters at the end of\n" +"each output line.\n" msgstr "" "\n" -"ОСНОВА може бути d (десятковою), o (вісімковою), x (шістнадцятковою) або\n" -"n (не виводити зсув). Н з префіксом 0x або 0X сприймається як\n" -"шістнадцяткове, з суфіксом b множиться на 512, з суфіксом kB — 1000, K — " -"1024,\n" -"MB — 1000*1000, M — 1024*1024, GB — 1000*1000*1000, G — 1024*1024*1024, те " -"саме\n" -"для T, P, E, Z, Y. Якщо додати до будь-якого формату суфікс z,\n" -"наприкінці кожного рядка будуть виводитись друковані символи.\n" +"Додавання суфікса z до будь-якого типу призведе до виведення видимих " +"символів\n" +"наприкінці кожного рядка виведених даних.\n" -#: src/od.c:380 +#: src/od.c:379 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" +"\n" +"BYTES is hex with 0x or 0X prefix, and may have a multiplier suffix:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"and so on for G, T, P, E, Z, Y.\n" msgstr "" -"Параметр --string без аргументу означає 3, --width — 32.\n" -"Типово od використовуються ключі -A o -t oS -w16.\n" +"\n" +"\n" +"Після ЧИСЛА блоків та байт може стояти один з суфіксів-множників:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"тощо для G, T, P, E, Z, Y.\n" -#: src/od.c:633 src/od.c:753 +#: src/od.c:639 src/od.c:759 #, c-format msgid "invalid type string %s" msgstr "неправильний рядок типу %s" -#: src/od.c:643 +#: src/od.c:649 #, c-format msgid "" "invalid type string %s;\n" @@ -6918,7 +7376,7 @@ msgstr "" "неправильно вказаний рядок типу %s;\n" "ця система не підтримує %lu-байтове цілого типу" -#: src/od.c:764 +#: src/od.c:770 #, c-format msgid "" "invalid type string %s;\n" @@ -6927,38 +7385,38 @@ msgstr "" "неправильно вказаний тип %s;\n" "ця система не підтримує %lu-байтове типу з плаваючою комою" -#: src/od.c:822 +#: src/od.c:828 #, c-format msgid "invalid character '%c' in type string %s" msgstr "неправильний знак '%c' у рядку типу %s" -#: src/od.c:1047 +#: src/od.c:1053 #, c-format msgid "cannot skip past end of combined input" msgstr "неможливо перейти за межу останнього вхідного файла" -#: src/od.c:1603 +#: src/od.c:1609 #, c-format msgid "invalid output address radix '%c'; it must be one character from [doxn]" msgstr "" "неправильно вказана основа системи числення '%c', повинна бути одним з " "символів [doxn]" -#: src/od.c:1729 +#: src/od.c:1735 #, c-format msgid "no type may be specified when dumping strings" msgstr "при дампі рядків не можна вказувати тип" -#: src/od.c:1804 +#: src/od.c:1810 msgid "compatibility mode supports at most one file" msgstr "у режимі сумісності підтримується не більше одного файла." -#: src/od.c:1825 +#: src/od.c:1831 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "значення skip-bytes + read-bytes надто велике" -#: src/od.c:1868 +#: src/od.c:1874 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "попередження: неправильна ширина %lu; буде використана %d" @@ -6978,14 +7436,12 @@ 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" -"\n" msgstr "" "Виводить на стандартний вивід рядки, складені з відповідних рядків\n" "вхідних ФАЙЛІВ, що розділяються табуляцією.\n" "Якщо ФАЙЛ не вказаний або вказаний як -, читається стандартний ввід.\n" -"\n" -#: src/paste.c:448 +#: 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" @@ -6994,7 +7450,7 @@ msgstr "" "СПИСКУ\n" " -s, --serial обробляти файли послідовно\n" -#: src/paste.c:509 +#: src/paste.c:508 #, c-format msgid "delimiter list ends with an unescaped backslash: %s" msgstr "список роздільників завершується неекранованою зворотною рискою: %s" @@ -7055,80 +7511,80 @@ msgid "Kaveh Ghazi" msgstr "Kaveh Ghazi" #. TRANSLATORS: Real name is unknown; at most 19 characters. -#: src/pinky.c:250 +#: src/pinky.c:242 msgid " ???" msgstr " ???" #. TRANSLATORS: Idle time is unknown; at most 5 characters. -#: src/pinky.c:274 +#: src/pinky.c:266 msgid "?????" msgstr "?????" -#: src/pinky.c:323 +#: src/pinky.c:314 #, c-format msgid "Login name: " msgstr "Реєстраційна назва: " -#: src/pinky.c:326 +#: src/pinky.c:317 #, c-format msgid "In real life: " msgstr "У реальному житті: " #. TRANSLATORS: Real name is unknown; no hard limit. -#: src/pinky.c:330 +#: src/pinky.c:321 msgid "???\n" msgstr "???\n" -#: src/pinky.c:350 +#: src/pinky.c:341 #, c-format msgid "Directory: " msgstr "Каталог: " -#: src/pinky.c:352 +#: src/pinky.c:343 #, c-format msgid "Shell: " msgstr "Оболонка: " -#: src/pinky.c:371 +#: src/pinky.c:362 #, c-format msgid "Project: " msgstr "Проект: " -#: src/pinky.c:395 +#: src/pinky.c:386 #, c-format msgid "Plan:\n" msgstr "План:\n" -#: src/pinky.c:414 +#: src/pinky.c:405 msgid "Login" msgstr "Реєстраційне ім'я'" -#: src/pinky.c:416 +#: src/pinky.c:407 msgid "Name" msgstr "Назва" -#: src/pinky.c:417 +#: src/pinky.c:408 msgid " TTY" msgstr " Термінал" -#: src/pinky.c:419 +#: src/pinky.c:410 msgid "Idle" msgstr "Неактивний" -#: src/pinky.c:420 +#: src/pinky.c:411 msgid "When" msgstr "Коли" -#: src/pinky.c:423 +#: src/pinky.c:414 msgid "Where" msgstr "Де" -#: src/pinky.c:502 +#: src/pinky.c:493 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Використання: %s [КЛЮЧ]... [КОРИСТУВАЧ]...\n" -#: src/pinky.c:503 +#: src/pinky.c:494 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7147,7 +7603,7 @@ msgstr "" " користувача\n" " -s короткий формат виводу, типово використовується\n" -#: src/pinky.c:511 +#: src/pinky.c:502 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7162,7 +7618,7 @@ msgstr "" " -q опустити у короткому форматі повне ім'я користувача,\n" " назву віддаленої машини та час неактивності\n" -#: src/pinky.c:520 +#: src/pinky.c:511 #, c-format msgid "" "\n" @@ -7173,7 +7629,7 @@ msgstr "" "Спрощена програма 'finger'; виводить відомості про користувача.\n" "У складі файла utmp буде використовуватися %s.\n" -#: src/pinky.c:604 +#: src/pinky.c:595 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "" @@ -7190,87 +7646,83 @@ msgstr "Pete TerMaat" msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:912 +#: src/pr.c:908 #, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "'--pages=ПЕРША_СТОР[:ОСТАННЯ_СТОР]' пропущений аргумент" -#: src/pr.c:914 +#: src/pr.c:910 #, c-format msgid "invalid page range %s" msgstr "некоректний діапазон сторінок %s" -#: src/pr.c:979 +#: src/pr.c:975 #, c-format msgid "'-l PAGE_LENGTH' invalid number of lines: %s" msgstr "'-l ДОВЖИНА_СТОРІНКИ' неправильна кількість рядків: %s" -#: src/pr.c:1003 +#: src/pr.c:999 #, c-format msgid "'-N NUMBER' invalid starting line number: %s" msgstr "'-N НОМЕР' неправильний номер початкового рядка: %s" -#: src/pr.c:1015 +#: src/pr.c:1011 #, c-format msgid "'-o MARGIN' invalid line offset: %s" msgstr "'-o ПОЛЕ' неправильний зсув: %s" -#: src/pr.c:1056 +#: src/pr.c:1052 #, c-format msgid "'-w PAGE_WIDTH' invalid number of characters: %s" msgstr "«-w ШИРИНА_СТОРІНКИ» неправильна кількість знаків: %s" -#: src/pr.c:1070 +#: src/pr.c:1066 #, c-format msgid "'-W PAGE_WIDTH' invalid number of characters: %s" msgstr "«-W ШИРИНА_СТОРІНКИ» неправильна кількість знаків: %s" -#: src/pr.c:1100 +#: src/pr.c:1096 #, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "неможливо вказати кількість позицій під час паралельного друку" -#: src/pr.c:1104 +#: src/pr.c:1100 #, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "не можна одночасно вказувати друк вздовж і паралельно." -#: src/pr.c:1200 +#: src/pr.c:1196 #, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "'-%c' зайві знаки або неправильне число у аргументі: %s" -#: src/pr.c:1304 +#: src/pr.c:1293 #, c-format msgid "page width too narrow" msgstr "сторінка надто вузька" -#: src/pr.c:2369 +#: src/pr.c:2353 #, c-format msgid "starting page number %<PRIuMAX> exceeds page count %<PRIuMAX>" msgstr "" "номер початкової сторінки %<PRIuMAX> перевищує загальну кількість сторінок " "%<PRIuMAX>" -#: src/pr.c:2396 +#: src/pr.c:2380 #, c-format msgid "page number overflow" msgstr "переповнення номеру сторінок" -#: src/pr.c:2401 +#: src/pr.c:2385 #, c-format msgid "Page %<PRIuMAX>" msgstr "Сторінка %<PRIuMAX>" -#: src/pr.c:2773 -msgid "" -"Paginate or columnate FILE(s) for printing.\n" -"\n" -msgstr "" -"Розбиває ФАЙЛ(и) на сторінки або колонки для друку.\n" -"\n" +#: src/pr.c:2757 +msgid "Paginate or columnate FILE(s) for printing.\n" +msgstr "Розбиває ФАЙЛ(и) на сторінки або колонки під час виведення.\n" -#: src/pr.c:2780 +#: src/pr.c:2763 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -7287,7 +7739,7 @@ msgstr "" " лише коли не вказаний ключ -a. Балансувати кількість\n" " рядків у колонці на кожній сторінці.\n" -#: src/pr.c:2788 +#: src/pr.c:2771 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7304,7 +7756,7 @@ msgstr "" " -d, --double-space\n" " вставляти порожній рядок після кожного виведеного рядка\n" -#: src/pr.c:2796 +#: src/pr.c:2779 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7326,7 +7778,7 @@ msgstr "" " ключ -F, та п'ятирядковим заголовком та кінцівкою, якщо\n" " ключ -F не вказаний)\n" -#: src/pr.c:2806 +#: src/pr.c:2789 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -7348,7 +7800,7 @@ msgstr "" " не вирівнювати колонки, --sep-string[=РЯДОК]\n" " задає розділювачі\n" -#: src/pr.c:2815 +#: src/pr.c:2798 msgid "" " -l, --length=PAGE_LENGTH\n" " set the page length to PAGE_LENGTH (66) lines\n" @@ -7362,7 +7814,7 @@ msgstr "" " -m, --merge виводити всі файли паралельно, по одному у стовпчику,\n" " урізати рядка, але з'єднувати повні рядки при -J\n" -#: src/pr.c:2822 +#: src/pr.c:2805 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -7379,7 +7831,7 @@ msgstr "" " почати нумерацію з НОМЕРА з першого рядка першої\n" " сторінки, що виводиться (дивіться +ПЕРША_СТОРІНКА)\n" -#: src/pr.c:2830 +#: src/pr.c:2813 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -7393,7 +7845,7 @@ msgstr "" " -r, --no-file-warnings\n" " не попереджати про неможливість відкриття файла\n" -#: src/pr.c:2837 +#: src/pr.c:2820 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -7408,7 +7860,7 @@ msgstr "" " -s[ЗНАК] вимикає урізання рядків для усіх трьох ключів\n" " для колонок (-ЧИСЛО |-a -ЧИСЛО|-m), якщо немає ключа -w\n" -#: src/pr.c:2844 +#: src/pr.c:2827 msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" @@ -7425,7 +7877,7 @@ msgstr "" " на ключі для колонок\n" " -t, --omit-header не виводити заголовки\n" -#: src/pr.c:2851 +#: src/pr.c:2834 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -7447,7 +7899,7 @@ msgstr "" " встановити ШИРИНУ_СТОРІНКИ (72) у стовпчиках для\n" " виводу у декілька колонок, -s[знак] вимикає (72)\n" -#: src/pr.c:2861 +#: src/pr.c:2844 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -7460,7 +7912,7 @@ msgstr "" " якщо не вказаний ключ -J; не змінюється ключами -S чи -" "s\n" -#: src/pr.c:2869 +#: src/pr.c:2852 msgid "" "\n" "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" @@ -7622,13 +8074,11 @@ msgstr "" msgid "" "Output a permuted index, including context, of the words in the input " "files.\n" -"\n" msgstr "" "Виводить переставлений алфавітний вказівник слів вхідних файлів, включаючи " "контекст.\n" -"\n" -#: src/ptx.c:1828 +#: src/ptx.c:1827 msgid "" " -A, --auto-reference output automatically generated references\n" " -G, --traditional behave more like System V 'ptx'\n" @@ -7639,7 +8089,7 @@ msgstr "" " -F, --flag-truncation=РЯДОК використовувати РЯДОК для позначення " "обрізаних рядків\n" -#: src/ptx.c:1833 +#: src/ptx.c:1832 msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" " -O, --format=roff generate output as roff directives\n" @@ -7654,7 +8104,7 @@ msgstr "" " -S, --sentence-regexp=REGEXP для кінця рядків або кінця речень\n" " -T, --format=tex генерувати вивід у вигляді директив TeX\n" -#: src/ptx.c:1840 +#: src/ptx.c:1839 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -7673,7 +8123,7 @@ msgstr "" " -o, --only-file=ФАЙЛ лише прочитати список слів з заданого " "ФАЙЛА\n" -#: src/ptx.c:1848 +#: src/ptx.c:1847 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -7685,7 +8135,7 @@ msgstr "" " -w, --width=ЧИСЛО ширина виводу у стовпчиках, без урахування " "посилань\n" -#: src/ptx.c:1855 +#: src/ptx.c:1854 msgid "" "\n" "With no FILE or if FILE is -, read Standard Input. '-F /' by default.\n" @@ -7694,10 +8144,10 @@ msgstr "" "Якщо ФАЙЛ не вказаний або вказаний як -, читає стандартний ввід.\n" "Типово вважається вказаним '-F /'.\n" -#: src/ptx.c:1949 +#: src/ptx.c:1948 #, c-format msgid "invalid gap width: %s" -msgstr "неправильна ширина дірки: %s" +msgstr "неправильна ширина інтервалу: %s" #: src/pwd.c:57 msgid "" @@ -7721,7 +8171,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "помилка зміни каталогу на %s" -#: src/pwd.c:170 src/pwd.c:277 +#: src/pwd.c:170 src/pwd.c:277 src/split.c:373 #, c-format msgid "failed to stat %s" msgstr "помилка отримання атрибутів %s" @@ -7737,14 +8187,15 @@ msgid "ignoring non-option arguments" msgstr "аргументи, що не є ключами проігноровані" #. This is a proper name. See the gettext manual, section Names. -#: src/readlink.c:33 +#: src/readlink.c:32 msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 +#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147 +#: src/stat.c:1349 src/touch.c:212 #, c-format -msgid "Usage: %s [OPTION]... FILE\n" -msgstr "Використання: %s [КЛЮЧ]... [ФАЙЛ]\n" +msgid "Usage: %s [OPTION]... FILE...\n" +msgstr "Використання: %s [КЛЮЧ]... ФАЙЛ...\n" #: src/readlink.c:63 msgid "" @@ -7783,25 +8234,28 @@ msgid "" "recursively,\n" " without requirements on components " "existence\n" -" -n, --no-newline do not output the trailing newline\n" +" -n, --no-newline do not output the trailing delimiter\n" " -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" msgstr "" " -m, --canonicalize-missing отримати канонічну назва файла шляхом\n" " рекурсивного слідування по усім символьним\n" " посиланням в усіх компонентах шляху;\n" " компоненти не обов'язково мають існувати\n" -" -n, --no-newline не виводити завершальне переведення рядка\n" +" -n, --no-newline не виводити кінцевий роздільник\n" " -q, --quiet,\n" " -s, --silent не виводити повідомлення про помилки\n" " -v, --verbose повідомляти про помилки\n" +" -z, --zero відокремлювати виведені рядки нуль-байтом,\n" +" а не символом нового рядка\n" -#: src/realpath.c:71 src/rm.c:134 src/shred.c:147 src/stat.c:1330 -#: src/touch.c:215 +#: src/readlink.c:152 #, c-format -msgid "Usage: %s [OPTION]... FILE...\n" -msgstr "Використання: %s [КЛЮЧ]... ФАЙЛ...\n" +msgid "ignoring --no-newline with multiple arguments" +msgstr "ігноруємо --no-newline з декількома аргументами" #: src/realpath.c:72 msgid "" @@ -7844,12 +8298,12 @@ msgstr "" msgid "generating relative path" msgstr "створення відносного шляху" -#: src/remove.c:286 +#: src/remove.c:273 #, c-format msgid "%s: descend into write-protected directory %s? " msgstr "%s: спуститься у захищений від запису каталог %s? " -#: src/remove.c:287 +#: src/remove.c:274 #, c-format msgid "%s: descend into directory %s? " msgstr "%s: спуститься у каталог %s? " @@ -7858,37 +8312,37 @@ msgstr "%s: спуститься у каталог %s? " #. translate "%s: remove %s (write-protected) %s? " #. instead. It should avoid grammatical problems #. with the output of file_type. -#: src/remove.c:303 +#: src/remove.c:290 #, c-format msgid "%s: remove write-protected %s %s? " msgstr "%s: вилучити захищений від запису %s %s? " -#: src/remove.c:304 +#: src/remove.c:291 #, c-format msgid "%s: remove %s %s? " msgstr "%s: вилучити %s %s? " -#: src/remove.c:417 +#: src/remove.c:374 #, c-format msgid "removed directory: %s\n" msgstr "вилучено каталог: %s\n" -#: src/remove.c:481 +#: src/remove.c:444 #, c-format msgid "cannot remove directory: %s" msgstr "не вдалося вилучити каталог: %s" -#: src/remove.c:537 +#: src/remove.c:500 #, c-format msgid "skipping %s, since it's on a different device" msgstr "припущено %s, оскільки він розташований на іншому пристрої" -#: src/remove.c:557 +#: src/remove.c:520 #, c-format msgid "traversal failed: %s" msgstr "помилка під час обходу: %s" -#: src/remove.c:563 +#: src/remove.c:526 #, c-format msgid "" "unexpected failure: fts_info=%d: %s\n" @@ -7897,12 +8351,12 @@ msgstr "" "неочікувана помилка: fts_info=%d: %s\n" "повідомте %s" -#: src/rm.c:118 +#: src/rm.c:119 #, c-format msgid "Try '%s ./%s' to remove the file %s.\n" msgstr "Спробуйте «%s ./%s», щоб вилучити файл %s.\n" -#: src/rm.c:135 +#: src/rm.c:136 msgid "" "Remove (unlink) the FILE(s).\n" "\n" @@ -7916,7 +8370,7 @@ msgstr "" "не питати\n" " -i питати перед кожним вилученням\n" -#: src/rm.c:141 +#: src/rm.c:142 msgid "" " -I prompt once before removing more than three files, " "or\n" @@ -7933,7 +8387,7 @@ msgstr "" " --interactive[=КОЛИ] питати КОЛИ: never, once (-I), \n" " always (-i). Без значення КОЛИ — питати завжди\n" -#: src/rm.c:148 +#: src/rm.c:149 msgid "" " --one-file-system when removing a hierarchy recursively, skip any\n" " directory that is on a file system different from\n" @@ -7943,19 +8397,21 @@ msgstr "" " каталоги, що лежать на інших файлових системах,\n" " ніж вказані аргументами командного рядку\n" -#: src/rm.c:153 +#: src/rm.c:154 msgid "" " --no-preserve-root do not treat '/' specially\n" " --preserve-root do not remove '/' (default)\n" " -r, -R, --recursive remove directories and their contents recursively\n" +" -d, --dir remove empty directories\n" " -v, --verbose explain what is being done\n" msgstr "" -" --no-preserve-root не обробляти / особливим чином (типово)\n" -" --preserve-root відмовлятись рекурсивно обробляти /\n" -" -r, -R, --recursive рекурсивно вилучати каталоги та їх зміст\n" +" --no-preserve-root не обробляти / особливим чином\n" +" --preserve-root не вилучати / (типова поведінка)\n" +" -r, -R, --recursive рекурсивно вилучати каталоги та їх вміст\n" +" -d, --dir вилучати порожні каталоги\n" " -v, --verbose пояснювати дії, що виконуються\n" -#: src/rm.c:161 +#: src/rm.c:163 msgid "" "\n" "By default, rm does not remove directories. Use the --recursive (-r or -R)\n" @@ -7967,7 +8423,7 @@ msgstr "" "або -R), щоб вилучити всі перелічені каталоги разом з їхнім\n" "змістом.\n" -#: src/rm.c:166 +#: src/rm.c:168 #, c-format msgid "" "\n" @@ -7984,7 +8440,7 @@ msgstr "" "\n" " %s ./-foo\n" -#: src/rm.c:175 +#: src/rm.c:177 msgid "" "\n" "Note that if you use rm to remove a file, it might be possible to recover\n" @@ -7996,12 +8452,12 @@ msgstr "" "зазвичай можна відновити. Використовуйте shred, якщо потрібна більша\n" "впевненість у неможливості відновлення вмісту.\n" -#: src/rm.c:335 +#: src/rm.c:342 #, c-format msgid "%s: remove all arguments recursively? " msgstr "%s: вилучити усі аргументи рекурсивно? " -#: src/rm.c:336 +#: src/rm.c:343 #, c-format msgid "%s: remove all arguments? " msgstr "%s: вилучити усі аргументи? " @@ -8052,7 +8508,7 @@ msgid "" "Usage: %s CONTEXT COMMAND [args]\n" " or: %s [ -c ] [-u USER] [-r ROLE] [-t TYPE] [-l RANGE] COMMAND [args]\n" msgstr "" -"Використання: %s CONTEXT КОМАНДА [аргументів]\n" +"Використання: %s КОНТЕКСТ КОМАНДА [аргументи]\n" " або: %s [ -c ] [-u КОРИСТУВАЧ] [-r РОЛЬ] [-t ТИП] [-l ДІАПАЗОН] КОМАНДА " "[аргументи]\n" @@ -8060,7 +8516,13 @@ msgstr "" msgid "" "Run a program in a different security context.\n" "With neither CONTEXT nor COMMAND, print the current security context.\n" -"\n" +msgstr "" +"Запустити програму з іншим контекстом безпеки.\n" +"якщо не вказано ні КОНТЕКСТ, ані КОМАНДА, виводиться поточний контекст " +"безпеки.\n" + +#: src/runcon.c:94 +msgid "" " CONTEXT Complete security context\n" " -c, --compute compute process transition context before modifying\n" " -t, --type=TYPE type (for same role as parent)\n" @@ -8069,83 +8531,80 @@ msgid "" " -l, --range=RANGE levelrange\n" "\n" msgstr "" -"Запустити програму з іншим контекстом безпеки.\n" -"якщо не вказано КОНТЕКСТ ані КОМАНДА, виводиться поточний контекст безпеки.\n" -"\n" -" КОНТЕКСТ Повний контекст безпеки\n" -" -c, --compute обчислити процес переходу контексту перед зміною\n" -" -t, --type=ТИП тип (для тієї ж ролі, що й у батьківському)\n" -" -u, --user=КОРИСИТУВАЧ користувач\n" -" -r, --role=РОЛЬ роль\n" -" -l, --range=ДІАПАЗОН діапазон рівня\n" +" КОНТЕКСТ Повний контекст безпеки\n" +" -c, --compute обчислити процес переходу контексту перед зміною\n" +" -t, --type=ТИП тип (для тієї ж ролі, що й у батьківському)\n" +" -u, --user=КОРИСТУВАЧ користувач\n" +" -r, --role=РОЛЬ роль\n" +" -l, --range=ДІАПАЗОН діапазон рівня\n" "\n" -#: src/runcon.c:140 +#: src/runcon.c:144 #, c-format msgid "multiple roles" msgstr "множинні ролей" -#: src/runcon.c:145 +#: src/runcon.c:149 #, c-format msgid "multiple types" msgstr "множинні типи" -#: src/runcon.c:150 +#: src/runcon.c:154 #, c-format msgid "multiple users" msgstr "множинні користувачі" -#: src/runcon.c:155 +#: src/runcon.c:159 #, c-format msgid "multiple levelranges" msgstr "множинні діапазони" -#: src/runcon.c:173 src/runcon.c:209 +#: src/runcon.c:177 src/runcon.c:213 #, c-format msgid "failed to get current context" msgstr "помилка при отриманні поточного контексту" -#: src/runcon.c:183 +#: src/runcon.c:187 #, c-format msgid "you must specify -c, -t, -u, -l, -r, or context" msgstr "слід вказати -c, -t, -u, -l, -r, або контекст" -#: src/runcon.c:191 +#: src/runcon.c:195 #, c-format msgid "no command specified" msgstr "не вказано команду" -#: src/runcon.c:197 +#: src/runcon.c:201 #, c-format msgid "%s may be used only on a SELinux kernel" msgstr "%s можна використовувати лише у середовищі з підтримкою SELinux у ядрі" -#: src/runcon.c:223 +#: src/runcon.c:227 #, c-format msgid "failed to compute a new context" msgstr "помилка при обчисленні нового контексту" -#: src/runcon.c:237 +#: src/runcon.c:241 #, c-format msgid "failed to set new user %s" msgstr "помилка при встановленні нового користувача %s" -#: src/runcon.c:239 +#: src/runcon.c:243 #, c-format msgid "failed to set new type %s" msgstr "помилка при встановленні нового типу %s" -#: src/runcon.c:241 +#: src/runcon.c:245 #, c-format msgid "failed to set new range %s" msgstr "помилка при встановленні нового діапазону %s" -#: src/runcon.c:243 +#: src/runcon.c:247 #, c-format msgid "failed to set new role %s" msgstr "помилка при встановленні нової ролі %s" -#: src/runcon.c:251 +#: src/runcon.c:255 #, c-format msgid "unable to set security context %s" msgstr "не вдалося встановити контекст безпеки %s" @@ -8162,20 +8621,21 @@ msgstr "" " або: %s [КЛЮЧ]... ПЕРШЕ ПРИРІСТ ОСТАННЄ\n" #: src/seq.c:73 +msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" +msgstr "Виводить числа від ПЕРШОГО до ОСТАННЬОГО з кроком ПРИРІСТ.\n" + +#: src/seq.c:79 msgid "" -"Print numbers from FIRST to LAST, in steps of INCREMENT.\n" -"\n" " -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 "" -"Виводить числа від ПЕРШОГО до ОСТАННЬОГО з кроком ПРИРІСТ.\n" -"\n" " -f, --format ФОРМАТ використовувати ФОРМАТ у стилі printf\n" " -s, --separator РЯДОК використовувати РЯДОК як розділювач (типово \\n)\n" -" -w, --equal-width вирівнювати по ширині, додаючи на початок нулі\n" +" -w, --equal-width вирівнювати за шириною з додаванням початкових " +"нулів\n" -#: src/seq.c:82 +#: src/seq.c:86 msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" @@ -8191,7 +8651,7 @@ msgstr "" "комою. ПРИРІСТ повинен бути додатнім, якщо ПЕРШИЙ менше\n" "ОСТАННЬОГО, та від'ємним у іншому випадку.\n" -#: src/seq.c:90 +#: src/seq.c:94 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" @@ -8201,32 +8661,17 @@ msgstr "" "типове значення %.PRECf якщо ПЕРШЕ, ПРИРІСТ, та ОСТАННЄ є числами \n" "з плаваючою комою з максимальною точністю ТОЧН, та %g у іншому випадку.\n" -#: src/seq.c:136 +#: src/seq.c:140 #, c-format msgid "invalid floating point argument: %s" msgstr "неправильний аргумент з плаваючою комою: %s" -#: src/seq.c:193 -#, c-format -msgid "format %s has no %% directive" -msgstr "формат %s не містить директиву %%" - -#: src/seq.c:210 -#, c-format -msgid "format %s ends in %%" -msgstr "формат %s закінчується у %%" - -#: src/seq.c:213 +#: src/seq.c:232 #, c-format msgid "format %s has unknown %%%c directive" msgstr "формат містить %s невідому директиву %%%c" -#: src/seq.c:217 -#, c-format -msgid "format %s has too many %% directives" -msgstr "формат %s має надто багато директив %%" - -#: src/seq.c:431 +#: src/seq.c:555 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "при виводі рядків однакової ширини формат можна не вказувати" @@ -8269,28 +8714,28 @@ msgstr "" " (якщо вказано) ідентифікатори додаткових груп ID у " "GID1, ...\n" -#: src/setuidgid.c:163 +#: src/setuidgid.c:162 #, c-format msgid "unknown user-ID: %s" msgstr "невідомий ідентифікатор користувача: %s" -#: src/setuidgid.c:174 +#: 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:191 +#: src/setuidgid.c:190 #, c-format msgid "failed to set supplemental group(s)" msgstr "не вдалося встановити додаткові групи" -#: src/setuidgid.c:201 +#: src/setuidgid.c:200 #, c-format msgid "cannot set group-ID to %lu" msgstr "не вдалося встановити ідентифікатор групи рівним %lu" -#: src/setuidgid.c:205 +#: src/setuidgid.c:204 #, c-format msgid "cannot set user-ID to %lu" msgstr "не вдалося встановити ідентифікатор користувача рівним %lu" @@ -8304,13 +8749,11 @@ msgstr "Colin Plumb" 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" -"\n" msgstr "" "Перезаписує декілька раз вказані файли, щоб ускладнити відновлення\n" "навіть з використанням дуже коштовного обладнання.\n" -"\n" -#: src/shred.c:156 +#: src/shred.c:155 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -8323,7 +8766,7 @@ msgstr "" " --random-source=ФАЙЛ брати випадкові дані з ФАЙЛа\n" " -s, --size=N очистити N байт (можливі суфікси, подібні до K, M, G)\n" -#: src/shred.c:162 +#: src/shred.c:161 msgid "" " -u, --remove truncate and remove file after overwriting\n" " -v, --verbose show progress\n" @@ -8337,7 +8780,7 @@ msgstr "" " типово для незвичних файлів\n" " -z, --zero перезаписати у конці нулями, щоб сховати змішування\n" -#: src/shred.c:171 +#: src/shred.c:170 msgid "" "\n" "If FILE is -, shred standard output.\n" @@ -8357,7 +8800,7 @@ msgstr "" "файлів більшість людей використовує ключ --remove.\n" "\n" -#: src/shred.c:181 +#: src/shred.c:180 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" @@ -8375,7 +8818,7 @@ msgstr "" "режимах файлової системи:\n" "\n" -#: src/shred.c:189 +#: src/shred.c:188 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -8397,7 +8840,7 @@ msgstr "" " NFS-сервер від Network Appliance\n" "\n" -#: src/shred.c:199 +#: src/shred.c:198 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -8411,7 +8854,7 @@ msgstr "" "* стиснені файлові системи\n" "\n" -#: src/shred.c:206 +#: src/shred.c:205 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" @@ -8431,7 +8874,7 @@ msgstr "" "конкретної файлової системи у файлі /etc/fstab, згідно документації на\n" "сторінці man для mount (man mount).\n" -#: src/shred.c:216 +#: src/shred.c:215 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" @@ -8441,122 +8884,122 @@ msgstr "" "містити копії файла, які не можна вилучити, і які пізніше надають змогу\n" "відновити знищений файл.\n" -#: src/shred.c:296 +#: src/shred.c:295 #, c-format msgid "%s: fdatasync failed" msgstr "%s: операція fdatasync завершилась невдало" -#: src/shred.c:307 +#: src/shred.c:306 #, c-format msgid "%s: fsync failed" msgstr "%s: операція fsync завершилась невдало" -#: src/shred.c:384 +#: src/shred.c:383 #, c-format msgid "%s: cannot rewind" msgstr "%s: не вдалося відкотитись" -#: src/shred.c:403 +#: src/shred.c:402 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: прохід %lu/%lu (%s)..." -#: src/shred.c:453 +#: src/shred.c:452 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: помилка записи за зсувом %s" -#: src/shred.c:471 +#: src/shred.c:470 #, c-format msgid "%s: lseek failed" msgstr "%s: операція lseek завершилась помилкою" -#: src/shred.c:482 +#: src/shred.c:481 #, c-format msgid "%s: file too large" msgstr "%s: файл надто великий" -#: src/shred.c:505 +#: src/shred.c:504 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: прохід %lu/%lu (%s)...%s" -#: src/shred.c:521 +#: src/shred.c:520 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: прохід %lu/%lu (%s)...%s/%s %d%%" -#: src/shred.c:768 +#: src/shred.c:767 #, c-format msgid "%s: fstat failed" msgstr "%s: операція fstat завершилась помилкою" -#: src/shred.c:779 +#: src/shred.c:778 #, c-format msgid "%s: invalid file type" msgstr "%s: неправильний тип файла" -#: src/shred.c:798 +#: src/shred.c:797 #, c-format msgid "%s: file has negative size" msgstr "%s: файл має від'ємний розмір" -#: src/shred.c:865 +#: src/shred.c:864 src/sort.c:932 src/split.c:378 #, c-format msgid "%s: error truncating" msgstr "%s: помилка при скороченні" -#: src/shred.c:881 +#: src/shred.c:880 #, c-format msgid "%s: fcntl failed" msgstr "%s: операція fcntl завершилась помилкою" -#: src/shred.c:886 +#: src/shred.c:885 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "%s: не вдалося нарізати файловий дескриптор з лише з правом додавання" -#: src/shred.c:968 +#: src/shred.c:967 #, c-format msgid "%s: removing" msgstr "%s: вилучення" -#: src/shred.c:992 +#: src/shred.c:991 #, c-format msgid "%s: renamed to %s" msgstr "%s: перейменований на %s" -#: src/shred.c:1014 +#: src/shred.c:1013 #, c-format msgid "%s: failed to remove" msgstr "%s: не вдалося вилучити" -#: src/shred.c:1018 +#: src/shred.c:1017 #, c-format msgid "%s: removed" msgstr "%s: вилучено" -#: src/shred.c:1025 src/shred.c:1068 +#: src/shred.c:1024 src/shred.c:1067 #, c-format msgid "%s: failed to close" msgstr "%s: не вдалося закрити" -#: src/shred.c:1061 +#: src/shred.c:1060 #, c-format msgid "%s: failed to open for writing" msgstr "%s: не вдалося відкрити для читання" -#: src/shred.c:1126 +#: src/shred.c:1125 #, c-format msgid "%s: invalid number of passes" msgstr "%s: неправильна кількість проходів" -#: src/shred.c:1135 src/shuf.c:291 src/sort.c:4387 +#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441 #, c-format msgid "multiple random sources specified" msgstr "вказано декілька форматів виводу" -#: src/shred.c:1149 +#: src/shred.c:1148 #, c-format msgid "%s: invalid file size" msgstr "%s: неправильний розмір файла" @@ -8573,14 +9016,10 @@ msgstr "" " або: %s -i НИЖ-ВИЩ [КЛЮЧ]...\n" #: src/shuf.c:54 -msgid "" -"Write a random permutation of the input lines to standard output.\n" -"\n" -msgstr "" -"Виводить випадково переставлені вхідні рядки на стандартний вивід.\n" -"\n" +msgid "Write a random permutation of the input lines to standard output.\n" +msgstr "Виводить випадково переставлені вхідні рядки на стандартний вивід.\n" -#: src/shuf.c:61 +#: src/shuf.c:60 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 " @@ -8600,27 +9039,27 @@ msgstr "" "символом\n" " нового рядка\n" -#: src/shuf.c:245 +#: src/shuf.c:244 #, c-format msgid "multiple -i options specified" msgstr "задано декілька ключів -i" -#: src/shuf.c:265 +#: src/shuf.c:264 #, c-format msgid "invalid input range %s" msgstr "неприпустимий вхідний діапазон %s" -#: src/shuf.c:278 +#: src/shuf.c:277 #, c-format msgid "invalid line count %s" msgstr "неправильна кількість рядків %s" -#: src/shuf.c:285 src/sort.c:4381 +#: src/shuf.c:284 src/sort.c:4435 #, c-format msgid "multiple output files specified" msgstr "задано декілька файлів для виводу" -#: src/shuf.c:311 +#: src/shuf.c:310 #, c-format msgid "cannot combine -e and -i options" msgstr "не можна одночасно використовувати ключі -e та -i" @@ -8647,7 +9086,7 @@ msgstr "" "може бути довільним числом з плаваючою комою.\n" "\n" -#: src/sleep.c:135 src/timeout.c:295 +#: src/sleep.c:135 src/timeout.c:320 #, c-format msgid "invalid time interval %s" msgstr "неправильний інтервал часу %s" @@ -8657,15 +9096,11 @@ msgstr "неправильний інтервал часу %s" msgid "cannot read realtime clock" msgstr "не вдалося прочитати значення таймеру реального часу" -#: src/sort.c:395 -msgid "" -"Write sorted concatenation of all FILE(s) to standard output.\n" -"\n" -msgstr "" -"Вивести сортоване сполучення усіх ФАЙЛ(ів) на стандартний вивід.\n" -"\n" +#: src/sort.c:399 +msgid "Write sorted concatenation of all FILE(s) to standard output.\n" +msgstr "Вивести сортоване сполучення усіх ФАЙЛ(ів) на стандартний вивід.\n" -#: src/sort.c:402 +#: src/sort.c:405 msgid "" "Ordering options:\n" "\n" @@ -8673,7 +9108,7 @@ msgstr "" "Ключі, що вказують порядок:\n" "\n" -#: src/sort.c:406 +#: src/sort.c:409 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -8684,7 +9119,7 @@ msgstr "" " -d, --dictionary-order розглядати лише пропуски, літери та цифри\n" " -f, --ignore-case ігнорувати регістр літер\n" -#: src/sort.c:412 +#: src/sort.c:415 msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" " -i, --ignore-nonprinting consider only printable characters\n" @@ -8694,14 +9129,14 @@ msgstr "" " -i, --ignore-nonprinting розглядати лише друковані знаки\n" " -M, --month-sort порівнювати (невідомо) < 'JAN' < ... < 'DEC'\n" -#: src/sort.c:417 +#: src/sort.c:420 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:420 +#: src/sort.c:423 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -8713,7 +9148,7 @@ msgstr "" " --random-source=ФАЙЛ випадкові дані з ФАЙЛА\n" " -r, --reverse зворотний порядок порівняння\n" -#: src/sort.c:426 +#: src/sort.c:429 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -8729,7 +9164,7 @@ msgstr "" " -V, --version-sort сортувати за номером версії\n" "\n" -#: src/sort.c:434 +#: src/sort.c:437 msgid "" "Other options:\n" "\n" @@ -8737,7 +9172,7 @@ msgstr "" "Інші параметри:\n" "\n" -#: src/sort.c:438 +#: src/sort.c:441 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" @@ -8746,7 +9181,7 @@ msgstr "" "одразу;\n" " для решти використовувати тимчасові файли\n" -#: src/sort.c:442 +#: src/sort.c:445 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 " @@ -8761,7 +9196,7 @@ msgstr "" " --compress-program=ПРОГ стискати тимчасові файли командою ПРОГ;\n" " розпаковувати командою ПРОГ -d\n" -#: src/sort.c:449 +#: src/sort.c:452 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -8779,7 +9214,7 @@ msgstr "" "джерела\n" " вхідних даних\n" -#: src/sort.c:456 +#: src/sort.c:459 msgid "" " -k, --key=KEYDEF sort via a key; KEYDEF gives location and type\n" " -m, --merge merge already sorted files; do not sort\n" @@ -8789,7 +9224,7 @@ msgstr "" " -m, --merge об'єднати вже впорядковані файли; не " "впорядковувати\n" -#: src/sort.c:460 +#: src/sort.c:463 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -8802,7 +9237,7 @@ msgstr "" " -S, --buffer-size=РОЗМІР\n" " використовувати в пам'яті буфер вказаного РОЗМІРУ\n" -#: src/sort.c:466 +#: src/sort.c:469 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -8827,13 +9262,13 @@ msgstr "" " -u, --unique з -c, суворо перевіряти порядок;\n" " без -c, виводити лише перше з кількох рівних\n" -#: src/sort.c:475 +#: src/sort.c:478 msgid " -z, --zero-terminated end lines with 0 byte, not newline\n" msgstr "" " -z, --zero-terminated завершувати рядки нульовим байтом, а не символом " "нового рядка\n" -#: src/sort.c:480 +#: src/sort.c:483 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -8864,7 +9299,7 @@ msgstr "" "\n" "Після РОЗМІРУ можна вказувати такі суфікси-мультиплікатори:\n" -#: src/sort.c:493 +#: src/sort.c:496 msgid "" "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n" "\n" @@ -8884,132 +9319,132 @@ msgstr "" "Щоб отримати традиційний порядок, що використовує системні значення байт,\n" "встановіть LC_ALL=C.\n" -#: src/sort.c:694 +#: src/sort.c:697 #, c-format msgid "waiting for %s [-d]" msgstr "очікування %s [-d]" -#: src/sort.c:699 +#: src/sort.c:702 #, c-format msgid "%s [-d] terminated abnormally" msgstr "%s [-d] аварійно завершений" -#: src/sort.c:853 +#: src/sort.c:856 #, c-format msgid "cannot create temporary file in %s" msgstr "не вдалося створити тимчасовий файл у %s" -#: src/sort.c:939 src/sort.c:2010 src/sort.c:3056 src/sort.c:3755 -#: src/sort.c:3758 +#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713 +#: src/sort.c:3804 src/sort.c:3807 msgid "open failed" msgstr "операція відкриття завершилась помилкою" -#: src/sort.c:959 +#: src/sort.c:970 msgid "fflush failed" msgstr "операція fflush завершилась помилкою" -#: src/sort.c:964 src/sort.c:2013 src/sort.c:4646 +#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706 msgid "close failed" msgstr "помилка закриття" -#: src/sort.c:973 +#: src/sort.c:986 #, c-format msgid "dup2 failed" msgstr "помилка dup2" -#: src/sort.c:1090 +#: src/sort.c:1103 #, c-format msgid "couldn't execute %s" msgstr "неможливо виконати %s" -#: src/sort.c:1097 +#: src/sort.c:1110 msgid "couldn't create temporary file" msgstr "не вдалося створити тимчасовий файл" -#: src/sort.c:1136 +#: src/sort.c:1149 #, c-format msgid "couldn't create process for %s -d" msgstr "неможливо створити процес для %s -d" -#: src/sort.c:1150 +#: src/sort.c:1161 #, c-format msgid "couldn't execute %s -d" msgstr "неможливо виконати %s -d" -#: src/sort.c:1209 +#: src/sort.c:1220 #, c-format msgid "warning: cannot remove: %s" msgstr "попередження, не вдалося вилучити: %s" -#: src/sort.c:1295 +#: src/sort.c:1306 #, c-format msgid "invalid --%s argument %s" msgstr "некоректний аргумент --%s %s" -#: src/sort.c:1298 +#: src/sort.c:1309 #, c-format msgid "minimum --%s argument is %s" msgstr "мінімальним аргументом --%s є %s" -#: src/sort.c:1313 +#: src/sort.c:1324 #, c-format msgid "--%s argument %s too large" msgstr "аргумент --%s %s є занадто великим" -#: src/sort.c:1316 +#: src/sort.c:1327 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "максимум --%s аргумент з поточним rlimit що дорівнює %s" -#: src/sort.c:1398 +#: src/sort.c:1409 #, c-format msgid "number in parallel must be nonzero" msgstr "кількість паралельних впорядкувань має бути ненульовою" -#: src/sort.c:1479 +#: src/sort.c:1494 msgid "stat failed" msgstr "операція stat завершилась помилкою" -#: src/sort.c:1740 +#: src/sort.c:1755 msgid "read failed" msgstr "помилка читання" -#: src/sort.c:2028 +#: src/sort.c:2043 #, c-format msgid "string transformation failed" msgstr "помилка перетворення рядків" -#: src/sort.c:2031 +#: src/sort.c:2046 #, c-format msgid "the untransformed string was %s" msgstr "Рядок до перетворення %s" -#: src/sort.c:2194 +#: src/sort.c:2209 #, c-format msgid "^ no match for key\n" msgstr "^ не знайдено збігів з ключем\n" -#: src/sort.c:2374 +#: src/sort.c:2389 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "використано застарілий ключ «%s»; вам варто скористатися ключем «%s»" -#: src/sort.c:2380 +#: src/sort.c:2395 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "ключ %lu має нульову ширину, його буде проігноровано" -#: src/sort.c:2391 +#: src/sort.c:2406 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "початкові пробіли у ключі %lu буде враховано; варто також вказати «b»" -#: src/sort.c:2404 +#: src/sort.c:2419 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "ключ %lu є числовим, він охоплює декілька полів" -#: src/sort.c:2436 +#: src/sort.c:2451 #, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" @@ -9017,132 +9452,134 @@ msgstr[0] "параметр «-%s» проігноровано" msgstr[1] "параметри «-%s» проігноровано" msgstr[2] "параметри «-%s» проігноровано" -#: src/sort.c:2442 +#: src/sort.c:2457 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "параметр «-r» застосовується лише у разі, якщо збігів не виявлено" -#: src/sort.c:2716 src/sort.c:2725 +#: src/sort.c:2731 src/sort.c:2740 msgid "write failed" msgstr "запис завершився помилкою" -#: src/sort.c:2768 +#: src/sort.c:2783 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: неправильний порядок: " -#: src/sort.c:2771 +#: src/sort.c:2786 msgid "standard error" msgstr "стандартна помилка" -#: src/sort.c:3926 +#: src/sort.c:3698 +msgid "cannot read" +msgstr "не вдалося прочитати" + +#: src/sort.c:3976 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: неправильна специфікація поля %s" -#: src/sort.c:3937 +#: src/sort.c:3987 #, c-format msgid "options '-%s' are incompatible" msgstr "несумісні параметри '-%s'" -#: src/sort.c:3988 +#: src/sort.c:4038 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s: неправильний лічильник на початку %s" -#: src/sort.c:4245 +#: src/sort.c:4295 msgid "invalid number after '-'" msgstr "неправильне число після '-'" -#: src/sort.c:4248 src/sort.c:4334 src/sort.c:4362 +#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416 msgid "invalid number after '.'" msgstr "неправильне число після '.'" -#: src/sort.c:4261 src/sort.c:4367 +#: src/sort.c:4315 src/sort.c:4421 msgid "stray character in field spec" msgstr "зайвий знак у специфікації поля" -#: src/sort.c:4308 +#: src/sort.c:4362 #, c-format msgid "multiple compress programs specified" msgstr "вказано декілька програм стискання" -#: src/sort.c:4325 +#: src/sort.c:4379 msgid "invalid number at field start" msgstr "неправильне число на початку поля" -#: src/sort.c:4329 src/sort.c:4357 +#: src/sort.c:4383 src/sort.c:4411 msgid "field number is zero" msgstr "нульовий номер поля" -#: src/sort.c:4338 +#: src/sort.c:4392 msgid "character offset is zero" msgstr "нульовий знаковий зсув" -#: src/sort.c:4353 +#: src/sort.c:4407 msgid "invalid number after ','" msgstr "неправильне число після ','" -#: src/sort.c:4403 +#: src/sort.c:4457 #, c-format msgid "empty tab" msgstr "порожня табуляція" -#: src/sort.c:4496 src/wc.c:692 +#: src/sort.c:4550 src/wc.c:692 #, c-format msgid "cannot read file names from %s" msgstr "не вдалося прочитати назви файлів з %s" -#: src/sort.c:4518 +#: src/sort.c:4572 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s:%lu: некоректна нульова довжина назви файла" -#: src/sort.c:4524 +#: src/sort.c:4578 #, c-format msgid "no input from %s" msgstr "немає вхідних даних з %s" -#: src/sort.c:4570 +#: src/sort.c:4624 #, c-format msgid "using %s sorting rules" msgstr "використовуються правила впорядковування %s" -#: src/sort.c:4573 +#: src/sort.c:4627 #, c-format msgid "using simple byte comparison" msgstr "використовується просте порівняння байтів" -#: src/sort.c:4604 +#: src/sort.c:4658 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "додатковий операнд %s не припустимий з -%c" -#: src/split.c:184 +#: src/split.c:187 #, c-format msgid "the suffix length needs to be at least %zu" msgstr "довжина суфікса не повинна бути меншою за %zu" -#: src/split.c:201 +#: src/split.c:204 #, c-format msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" msgstr "Використання: %s [ПАРАМЕТР]... [ВХІДНІ_ДАНІ [ПРЕФІКС]]\n" -#: src/split.c:205 +#: src/split.c:208 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" -"\n" msgstr "" -"Виводить фіксовані за розміром частини ФАЙЛА у файли ПРЕФІКСaa,\n" +"Виводить фіксовані за розміром частини ВХІДНІ_ДАНІ до файлів ПРЕФІКСaa,\n" "ПРЕФІКСab, ...; типово розмір частини дорівнює 1000 рядків, а ПРЕФІКС\n" "дорівнює 'x'. Якщо ВХІДНІ_ДАНІ не вказано або вказано як -, читає\n" "дані зі стандартного джерела даних.\n" -"\n" -#: src/split.c:214 +#: src/split.c:216 #, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" @@ -9174,7 +9611,7 @@ msgstr "" " -u, --unbuffered копіювати вхідні дані безпосередньо до виведення з " "«-n r/...»\n" -#: src/split.c:227 +#: src/split.c:229 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" @@ -9182,7 +9619,7 @@ msgstr "" " --verbose виводити діагностичні повідомлення\n" " перед відкриттям кожного файла виводу\n" -#: src/split.c:234 +#: src/split.c:236 msgid "" "\n" "CHUNKS may be:\n" @@ -9202,187 +9639,192 @@ msgstr "" "r/N подібно до «l», але з використанням циклічного перебирання\n" "r/K/N те саме, але вивести лише K-ий з N до stdout\n" -#: src/split.c:352 +#: src/split.c:354 #, c-format msgid "output file suffixes exhausted" msgstr "вичерпано суфікси для вихідних файлів" -#: src/split.c:364 +#: src/split.c:366 #, c-format msgid "creating file %s\n" msgstr "створюється файл %s\n" -#: src/split.c:377 +#: src/split.c:375 +#, c-format +msgid "%s would overwrite input; aborting" +msgstr "%s перепише вхідні дані; перериваємо роботу" + +#: src/split.c:391 #, c-format msgid "failed to set FILE environment variable" msgstr "не вдалося встановити змінну середовища FILE" -#: src/split.c:379 +#: src/split.c:393 #, c-format msgid "executing with FILE=%s\n" msgstr "виконання з FILE=%s\n" -#: src/split.c:381 +#: src/split.c:395 #, c-format msgid "failed to create pipe" msgstr "не вдалося створити канал" -#: src/split.c:395 +#: src/split.c:409 #, c-format msgid "closing prior pipe" msgstr "закриття попереднього каналу" -#: src/split.c:397 +#: src/split.c:411 #, c-format msgid "closing output pipe" msgstr "закриття каналу виведення" -#: src/split.c:401 +#: src/split.c:415 #, c-format msgid "moving input pipe" msgstr "пересування каналу введення" -#: src/split.c:403 +#: src/split.c:417 #, c-format msgid "closing input pipe" msgstr "закриття каналу введення" -#: src/split.c:408 +#: src/split.c:422 #, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "не вдалося виконати команду: «%s -c %s»" -#: src/split.c:414 +#: src/split.c:428 #, c-format msgid "failed to close input pipe" msgstr "не вдалося закрити канал вхідних даних" -#: src/split.c:450 +#: src/split.c:464 #, c-format msgid "waiting for child process" msgstr "очікування на дочірній процес" -#: src/split.c:460 +#: src/split.c:474 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "при FILE=%s, сигнал %s від команди: %s" -#: src/split.c:468 +#: src/split.c:482 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "при FILE=%s, код виходу %d від команди: %s" -#: src/split.c:475 src/timeout.c:449 +#: src/split.c:489 src/timeout.c:494 #, c-format msgid "unknown status from command (0x%X)" msgstr "невідомий стан від команди (0x%X)" -#: src/split.c:1037 +#: src/split.c:1052 #, c-format msgid "cannot split in more than one way" msgstr "не можна розбивати одразу кількома методами" -#: src/split.c:1050 src/split.c:1192 src/split.c:1363 +#: src/split.c:1065 src/split.c:1205 src/split.c:1376 #, c-format msgid "%s: invalid number of chunks" msgstr "%s: некоректна кількість фрагментів" -#: src/split.c:1054 +#: src/split.c:1069 #, c-format msgid "%s: invalid chunk number" msgstr "%s: некоректний номер фрагмента" -#: src/split.c:1106 +#: src/split.c:1119 #, c-format msgid "%s: invalid suffix length" msgstr "%s: неправильна довжина суфіксу" -#: src/split.c:1131 src/split.c:1139 src/split.c:1162 src/split.c:1167 +#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180 #, c-format msgid "%s: invalid number of bytes" msgstr "%s: неправильна кількість байт" -#: src/split.c:1150 src/split.c:1297 +#: src/split.c:1163 src/split.c:1310 #, c-format msgid "%s: invalid number of lines" msgstr "%s: неправильна кількість рядків" -#: src/split.c:1223 +#: src/split.c:1236 #, c-format msgid "line count option -%s%c... is too large" msgstr "ключ кількості рядків -%s%c... надто великий" -#: src/split.c:1235 +#: src/split.c:1248 #, c-format msgid "%s: invalid start value for numerical suffix" msgstr "%s: некоректне початкове значення у числовому суфіксі" -#: src/split.c:1263 +#: src/split.c:1276 #, c-format msgid "%s: invalid IO block size" msgstr "%s: некоректний розмір блоку введення-виведення" -#: src/split.c:1284 +#: src/split.c:1297 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "--filter не обробляє фрагменти, видобуті до stdout" -#: src/split.c:1321 +#: src/split.c:1334 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" "початкове значення числового суфікса є занадто великим для довжини суфікса" -#: src/split.c:1356 +#: src/split.c:1369 #, c-format msgid "%s: cannot determine file size" msgstr "%s: не вдалося визначити розмір файла" #. This is a proper name. See the gettext manual, section Names. -#: src/stat.c:169 +#: src/stat.c:173 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:838 +#: src/stat.c:857 #, c-format msgid "failed to canonicalize %s" msgstr "не вдалося перетворити у канонічну форму %s" -#: src/stat.c:1050 +#: src/stat.c:1069 #, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "попередження: керівна послідовність '\\%c' не розпізнана" -#: src/stat.c:1105 +#: src/stat.c:1124 #, c-format msgid "%s: invalid directive" msgstr "%s: неправильна директива" -#: src/stat.c:1151 +#: src/stat.c:1170 #, c-format msgid "warning: backslash at end of format" msgstr "попередження: зворотна похила риска наприкінці формату" -#: src/stat.c:1182 +#: src/stat.c:1201 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" "використання %s для позначення стандартного введення не працює у режимі " "файлової системи" -#: src/stat.c:1189 +#: src/stat.c:1208 #, c-format msgid "cannot read file system information for %s" msgstr "не вдалося прочитати інформацію файлової системи для %s" -#: src/stat.c:1209 +#: src/stat.c:1228 #, 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:1245 +#: src/stat.c:1264 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -9398,7 +9840,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1268 +#: src/stat.c:1287 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -9408,30 +9850,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1278 +#: src/stat.c:1297 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:1286 +#: src/stat.c:1305 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:1295 +#: src/stat.c:1314 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:1305 +#: src/stat.c:1324 #, c-format msgid "Context: %C\n" msgstr "Контекст: %C\n" -#: src/stat.c:1313 +#: src/stat.c:1332 msgid "" "Access: %x\n" "Modify: %y\n" @@ -9443,19 +9885,19 @@ msgstr "" " Зміна: %z\n" "Створ.: %w\n" -#: src/stat.c:1331 +#: src/stat.c:1350 +msgid "Display file or file system status.\n" +msgstr "Показати файл або стан файлової системи.\n" + +#: src/stat.c:1356 msgid "" -"Display file or file system status.\n" -"\n" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" -"Відображає стан файла або файлової системи.\n" -"\n" " -L, --dereference слідувати за посиланням\n" " -f, --file-system показати стан файлової системи, а не файла\n" -#: src/stat.c:1337 +#: src/stat.c:1360 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -9473,7 +9915,7 @@ msgstr "" "\\n.\n" " -t, --terse виводити дані у компактній формі\n" -#: src/stat.c:1348 +#: src/stat.c:1371 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -9493,7 +9935,7 @@ msgstr "" " %B розмір блоку, що повідомляється %b, у байтах\n" " %C рядок з контекстом безпеки SELinux\n" -#: src/stat.c:1357 +#: src/stat.c:1380 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -9509,7 +9951,7 @@ msgstr "" " %g ідентифікатор групи-власника\n" " %G назва групи-власника\n" -#: src/stat.c:1365 +#: src/stat.c:1388 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -9531,7 +9973,7 @@ msgstr "" " %t основний тип пристрою, шістнадцятковий\n" " %T другорядний тип пристрою, шістнадцятковий\n" -#: src/stat.c:1376 +#: src/stat.c:1399 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -9557,7 +9999,7 @@ msgstr "" " %Z час останньої зміни у секундах з початку Епохи\n" "\n" -#: src/stat.c:1390 +#: src/stat.c:1413 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -9575,7 +10017,7 @@ msgstr "" " %d кількість вільних файлових вузлів у файловій системі\n" " %f кількість вільних блоків у файловій системі\n" -#: src/stat.c:1399 +#: src/stat.c:1422 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -9601,12 +10043,10 @@ msgstr "Використання: %s ПАРАМЕТР... КОМАНДА\n" #: src/stdbuf.c:91 msgid "" "Run COMMAND, with modified buffering operations for its standard streams.\n" -"\n" msgstr "" "Запускає КОМАНДУ зі зміненими діями з буферизації для стандартних потоків.\n" -"\n" -#: src/stdbuf.c:98 +#: src/stdbuf.c:97 msgid "" " -i, --input=MODE adjust standard input stream buffering\n" " -o, --output=MODE adjust standard output stream buffering\n" @@ -9618,7 +10058,7 @@ msgstr "" "виведення\n" " -e, --error=РЕЖИМ скоригувати буферизацію для потоку стандартних помилок\n" -#: src/stdbuf.c:105 +#: src/stdbuf.c:104 msgid "" "\n" "If MODE is 'L' the corresponding stream will be line buffered.\n" @@ -9629,7 +10069,7 @@ msgstr "" "буферизацію.\n" "Цей параметр є некоректним для стандартного джерела даних.\n" -#: src/stdbuf.c:108 +#: src/stdbuf.c:107 msgid "" "\n" "If MODE is '0' the corresponding stream will be unbuffered.\n" @@ -9637,7 +10077,7 @@ msgstr "" "\n" "Якщо РЕЖИМ дорівнює 0, відповідний потік не буферизується.\n" -#: src/stdbuf.c:111 +#: src/stdbuf.c:110 msgid "" "\n" "Otherwise MODE is a number which may be followed by one of the following:\n" @@ -9652,7 +10092,7 @@ msgstr "" "У такому разі відповідний потік буде повністю буферизовано зі встановленням\n" "розміру буфера у РЕЖИМ байтів.\n" -#: src/stdbuf.c:117 +#: src/stdbuf.c:116 msgid "" "\n" "NOTE: If COMMAND adjusts the buffering of its standard streams ('tee' does\n" @@ -9667,22 +10107,22 @@ msgstr "" "Крім того, деякі фільтри (зокрема dd і cat) не використовують потоки для\n" "введення/виведення, отже параметри stdbuf на них не впливають.\n" -#: src/stdbuf.c:227 +#: src/stdbuf.c:226 #, c-format msgid "failed to find %s" msgstr "не вдалося знайти %s" -#: src/stdbuf.c:247 src/stdbuf.c:279 +#: src/stdbuf.c:246 src/stdbuf.c:278 #, c-format msgid "failed to update the environment with %s" msgstr "не вдалося оновити середовища за допомогою %s" -#: src/stdbuf.c:321 +#: src/stdbuf.c:320 #, c-format msgid "line buffering stdin is meaningless" msgstr "рядкова буферизація stdin не має сенсу" -#: src/stty.c:509 +#: src/stty.c:513 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -9693,16 +10133,16 @@ msgstr "" " або %s [-F ПРИСТРІЙ] [--file=ПРИСТРІЙ] [-a|--all]\n" " або %s [-F ПРИСТРІЙ] [--file=ПРИСТРІЙ] [-g|--save]\n" -#: src/stty.c:515 +#: src/stty.c:519 +msgid "Print or change terminal characteristics.\n" +msgstr "Виводить або змінює характеристики термінала.\n" + +#: src/stty.c:525 msgid "" -"Print or change terminal characteristics.\n" -"\n" " -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 "" -"Виводить або змінює встановлення терміналу.\n" -"\n" " -a, --all вивести поточні параметри у текстовій формі\n" " -g, --save вивести поточні параметри у формі, що зрозуміла програмі\n" " stty\n" @@ -9710,7 +10150,7 @@ msgstr "" " відкрити та використовувати вказаний пристрій замість\n" " стандартного вводу\n" -#: src/stty.c:524 +#: src/stty.c:532 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -9721,7 +10161,7 @@ msgstr "" "позначені параметри, не описані у стандарті POSIX. Доступність того чи\n" "іншого параметру визначається системою, що використовується.\n" -#: src/stty.c:529 +#: src/stty.c:537 msgid "" "\n" "Special characters:\n" @@ -9736,7 +10176,7 @@ msgstr "" " eof СИМВОЛ СИМВОЛ буде означати кінець файла (припинення вводу)\n" " eol СИМВОЛ СИМВОЛ буде означати кінець рядка\n" -#: src/stty.c:536 +#: src/stty.c:544 msgid "" " * eol2 CHAR alternate CHAR for ending the line\n" " erase CHAR CHAR will erase the last character typed\n" @@ -9748,7 +10188,7 @@ msgstr "" " intr СИМВОЛ СИМВОЛ буде надсилати сигнал переривання\n" " kill СИМВОЛ СИМВОЛ буде стирати поточний рядок\n" -#: src/stty.c:542 +#: src/stty.c:550 msgid "" " * lnext CHAR CHAR will enter the next character quoted\n" " quit CHAR CHAR will send a quit signal\n" @@ -9761,7 +10201,7 @@ msgstr "" "* rprnt СИМВОЛ СИМВОЛ буде перерисовувати поточний рядок\n" " start СИМВОЛ СИМВОЛ буде відновлювати ввід\n" -#: src/stty.c:548 +#: src/stty.c:556 msgid "" " stop CHAR CHAR will stop the output\n" " susp CHAR CHAR will send a terminal stop signal\n" @@ -9773,7 +10213,7 @@ msgstr "" "* swtch СИМВОЛ СИМВОЛ буде перемикати рівень складності оболонки\n" "* werase СИМВОЛ СИМВОЛ буде стирати останнє введене слово\n" -#: src/stty.c:554 +#: src/stty.c:562 msgid "" "\n" "Special settings:\n" @@ -9788,7 +10228,7 @@ msgstr "" "* cols Н повідомити ядру, що термінал має Н стовпчиків\n" "* columns Н синонім cols\n" -#: src/stty.c:561 +#: src/stty.c:569 msgid "" " ispeed N set the input speed to N\n" " * line N use line discipline N\n" @@ -9802,7 +10242,7 @@ msgstr "" " символів для завершення операції читання\n" " ospeed Н встановити швидкість виводу\n" -#: src/stty.c:567 +#: src/stty.c:575 msgid "" " * rows N tell the kernel that the terminal has N rows\n" " * size print the number of rows and columns according to the " @@ -9816,30 +10256,32 @@ msgstr "" " time Н використовується з -icanon, встановити часову межу для\n" " операції читання рівним Н десятим секунди\n" -#: src/stty.c:573 +#: src/stty.c:581 msgid "" "\n" "Control settings:\n" " [-]clocal disable modem control signals\n" " [-]cread allow input to be received\n" " * [-]crtscts enable RTS/CTS handshaking\n" +" * [-]cdtrdsr enable DTR/DSR handshaking\n" " csN set character size to N bits, N in [5..8]\n" msgstr "" "\n" "Параметри керування:\n" -" [-]clocal скасувати керівні сигнали модему\n" -" [-]cread дозволити ввід\n" -"* [-]crtscts дозволити керування потоком з підтвердженням готовності\n" -" csН встановити розмір символу рівним Н біт, Н від 5 до 8\n" +" [-]clocal скасувати керівні сигнали модему\n" +" [-]cread дозволити ввід\n" +" * [-]crtscts дозволити керування потоком RTS/CTS\n" +" * [-]cdtrdsr дозволити керування потоком DTR/DSR\n" +" csН встановити розмір символу рівним Н біт, Н від 5 до 8\n" -#: src/stty.c:581 +#: src/stty.c:590 msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" " [-]hupcl same as [-]hup\n" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" -" [-]parodd set odd parity (even with '-')\n" +" [-]parodd set odd parity (or even parity with '-')\n" msgstr "" " [-]cstopb два біти розділення у символі (один, якщо з '-')\n" " [-]hup надсилати сигнал обриву термінальної лінії, коли останній\n" @@ -9848,9 +10290,10 @@ msgstr "" " [-]parenb генерувати при виводі біт парності та очікувати біт " "парності\n" " на вводі\n" -" [-]parodd встановити перевірку на парність (навіть з '-')\n" +" [-]parodd встановити перевірку на непарність (або парність, якщо з " +"'-')\n" -#: src/stty.c:588 +#: src/stty.c:597 msgid "" "\n" "Input settings:\n" @@ -9866,7 +10309,7 @@ msgstr "" " [-]ignbrk ігнорувати символи переривання\n" " [-]igncr ігнорувати символи переведення каретки\n" -#: src/stty.c:596 +#: src/stty.c:605 msgid "" " [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" @@ -9881,11 +10324,11 @@ msgstr "" " [-]inpck використовувати перевірку парності вводу\n" " [-]istrip очищати старший (восьмий) біт символів, що вводяться\n" -#: src/stty.c:603 +#: src/stty.c:612 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr " * [-]iutf8 вважати, що вхідні знаки у кодуванні UTF-8\n" -#: src/stty.c:606 +#: src/stty.c:615 msgid "" " * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" @@ -9901,7 +10344,7 @@ msgstr "" " [-]parmrk відмічати помилки парності (послідовністю з 255 нулів)\n" " [-]tandem синонім [-]xioff\n" -#: src/stty.c:614 +#: src/stty.c:623 msgid "" "\n" "Output settings:\n" @@ -9917,7 +10360,7 @@ msgstr "" "* ffН пауза після переведення сторінки, діапазон Н [0..1]\n" "* nlН пауза після нового рядка, діапазон Н [0..1]\n" -#: src/stty.c:622 +#: src/stty.c:631 msgid "" " * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of null characters\n" @@ -9933,7 +10376,7 @@ msgstr "" "* [-]onlcr перетворювати переведення рядка у переведення каретки\n" "* [-]onlret переведення рядка призводить до переведення каретки\n" -#: src/stty.c:630 +#: src/stty.c:639 msgid "" " * [-]onocr do not print carriage returns in the first column\n" " [-]opost postprocess output\n" @@ -9950,7 +10393,7 @@ msgstr "" "* -tabs синонім tab3\n" "* vtН пауза після вертикальної табуляції, діапазон Н [0..1]\n" -#: src/stty.c:638 +#: src/stty.c:647 msgid "" "\n" "Local settings:\n" @@ -9964,7 +10407,7 @@ msgstr "" "* crtkill стирати весь рядок, згідно з параметрами echoprt та echoe\n" "* -crtkill стирати весь рядок, згідно з параметрами echoctl та echok\n" -#: src/stty.c:645 +#: src/stty.c:654 msgid "" " * [-]ctlecho echo control characters in hat notation ('^c')\n" " [-]echo echo input characters\n" @@ -9978,7 +10421,7 @@ msgstr "" " [-]echoe синонім [-]crterase\n" " [-]echok відображати переведення рядка після символу знищення\n" -#: src/stty.c:652 +#: src/stty.c:661 msgid "" " * [-]echoke same as [-]crtkill\n" " [-]echonl echo newline even if not echoing other characters\n" @@ -9994,7 +10437,7 @@ msgstr "" " [-]icanon використовувати спецсимволи erase, kill, werase, та rprnt\n" " [-]iexten використовувати спецсимволи, не описані у стандарті POSIX\n" -#: src/stty.c:659 +#: src/stty.c:668 msgid "" " [-]isig enable interrupt, quit, and suspend special characters\n" " [-]noflsh disable flushing after interrupt and quit special " @@ -10011,7 +10454,7 @@ msgstr "" " на термінал\n" "* [-]xcase відображати '\\' для великих літер, вживається з icanon\n" -#: src/stty.c:666 +#: src/stty.c:675 msgid "" "\n" "Combination settings:\n" @@ -10025,7 +10468,7 @@ msgstr "" " cbreak синонім -icanon\n" " -cbreak синонім icanon\n" -#: src/stty.c:673 +#: src/stty.c:682 msgid "" " cooked same as brkint ignpar istrip icrnl ixon opost isig\n" " icanon, eof and eol characters to their default values\n" @@ -10037,7 +10480,7 @@ msgstr "" " -cooked синонім raw\n" " crt синонім echoe echoctl echoke\n" -#: src/stty.c:679 +#: src/stty.c:688 msgid "" " dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" " kill ^u\n" @@ -10051,7 +10494,7 @@ msgstr "" " ek встановити типові значення для символів erase та kill\n" " evenp синонім parenb -parodd cs7\n" -#: src/stty.c:686 +#: src/stty.c:695 msgid "" " -evenp same as -parenb cs8\n" " * [-]lcase same as xcase iuclc olcuc\n" @@ -10067,7 +10510,7 @@ msgstr "" " nl синонім -icrnl -onlcr\n" " -nl синонім icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" -#: src/stty.c:694 +#: src/stty.c:703 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -10081,7 +10524,7 @@ msgstr "" " pass8 синонім -parenb -istrip cs8\n" " -pass8 синонім parenb istrip cs7\n" -#: src/stty.c:701 +#: src/stty.c:710 msgid "" " raw same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" " -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n" @@ -10093,7 +10536,7 @@ msgstr "" " -imaxbel -opost -isig -icanon -xcase min 1 time 0\n" " -raw синонім cooked\n" -#: src/stty.c:707 +#: src/stty.c:716 msgid "" " sane same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" " -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n" @@ -10109,7 +10552,7 @@ msgstr "" " -xcase -tostop -echoprt echoctl echoke, всі спецсимволи\n" " мають типове значення\n" -#: src/stty.c:715 +#: src/stty.c:724 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -10124,12 +10567,12 @@ msgstr "" "буквально або вказуються у як ^c, 0x37, 0177 або 127; для скасування\n" "спеціальних символів служать значення ^- та undef.\n" -#: src/stty.c:787 +#: src/stty.c:796 #, c-format msgid "only one device may be specified" msgstr "можна вказати лише одне пристрій" -#: src/stty.c:817 +#: src/stty.c:826 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" @@ -10138,126 +10581,47 @@ msgstr "" "ключі для виводу у текстовому та виводі, зрозумілому програмі stty,\n" "виключають один одного" -#: src/stty.c:823 +#: src/stty.c:832 #, c-format msgid "when specifying an output style, modes may not be set" msgstr "при вказуванні стилю виводу не можна встановлювати режим" -#: src/stty.c:838 +#: src/stty.c:847 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s: не вдалося переініціалізувати неблокуючий режим" -#: src/stty.c:883 src/stty.c:993 +#: src/stty.c:892 src/stty.c:1002 #, c-format msgid "invalid argument %s" msgstr "неправильний аргумент %s" -#: src/stty.c:894 src/stty.c:911 src/stty.c:923 src/stty.c:936 src/stty.c:948 -#: src/stty.c:968 +#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957 +#: src/stty.c:977 #, c-format msgid "missing argument to %s" msgstr "пропущений аргумент для %s" -#: src/stty.c:974 +#: src/stty.c:983 #, c-format msgid "invalid line discipline %s" msgstr "неправильна line discipline %s" -#: src/stty.c:1044 +#: src/stty.c:1053 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s: не вдалося виконати всі запитані дії" -#: src/stty.c:1390 +#: src/stty.c:1399 #, c-format msgid "%s: no size information for this device" msgstr "%s: для цього пристрою немає відомостей про розмір" -#: src/stty.c:1904 +#: src/stty.c:1920 #, c-format msgid "invalid integer argument %s" msgstr "неправильний цілий аргумент %s" -#: src/su.c:229 -msgid "Password:" -msgstr "Пароль:" - -#: src/su.c:232 -#, c-format -msgid "getpass: cannot open /dev/tty" -msgstr "getpass: не вдалося відкрити /dev/tty" - -#: src/su.c:290 -#, c-format -msgid "cannot set groups" -msgstr "не вдалося встановити групи" - -#: src/su.c:294 -#, c-format -msgid "cannot set group id" -msgstr "не вдалося встановити груповий id" - -#: src/su.c:296 -#, c-format -msgid "cannot set user id" -msgstr "не вдалося встановити id користувача" - -#: src/su.c:371 -#, c-format -msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" -msgstr "Використання: %s [КЛЮЧ]... [-] [КОРИСТУВАЧ [АРГ]...]\n" - -#: src/su.c:372 -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 "" -"Встановлює ефективні id користувача та групи як у КОРИСТУВАЧА.\n" -"\n" -" -, -l, --login використовувати оболонку як оболонку входу\n" -" -c, --commmand=КОМАНДА передати оболонці КОМАНДУ за допомогою -c\n" -" -f, --fast передати оболонці -f (для csh або tcsh)\n" -" -m, --preserve-environment не перевстановлювати змінні оточення\n" -" -p синонім для -m\n" -" -s, --shell=ОБОЛОНКА запустити ОБОЛОНКУ, якщо дозволяє /etc/" -"shells\n" - -#: src/su.c:384 -msgid "" -"\n" -"A mere - implies -l. If USER not given, assume root.\n" -msgstr "" -"\n" -"Просто знак мінус означає -l. Якщо КОРИСТУВАЧ не вказаний,\n" -"вважається root.\n" - -#: src/su.c:461 -#, c-format -msgid "user %s does not exist" -msgstr "користувач %s не існує" - -#: src/su.c:484 -#, c-format -msgid "incorrect password" -msgstr "неправильний пароль" - -#: src/su.c:501 -#, c-format -msgid "using restricted shell %s" -msgstr "використовується обмежена оболонка %s" - -#: src/su.c:509 -#, c-format -msgid "warning: cannot change directory to %s" -msgstr "попередження: не вдалося змінити каталог на %s" - #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 msgid "Kayvan Aghaiepour" @@ -10291,7 +10655,7 @@ msgstr "" msgid "ignoring all arguments" msgstr "всі аргументи проігноровані" -#: src/system.h:340 +#: src/system.h:343 #, c-format msgid "" "\n" @@ -10305,17 +10669,26 @@ msgstr "" "документації з вашої оболонки, щоб дізнатись, які ключі вона\n" "підтримує.\n" -#: src/system.h:346 +#: src/system.h:349 msgid " --help display this help and exit\n" msgstr " --help показати цю довідку та вийти\n" -#: src/system.h:348 +#: src/system.h:351 msgid " --version output version information and exit\n" msgstr "" " --version показати інформацію про версію та вийти\n" "\n" -#: src/system.h:541 +#: src/system.h:544 +msgid "" +"\n" +"Mandatory arguments to long options are mandatory for short options too.\n" +msgstr "" +"\n" +"Обов'язкові аргументи для довгих форм запису параметрів є обов'язковими і " +"для скорочених форм.\n" + +#: src/system.h:552 msgid "" "\n" "SIZE is an integer and optional unit (example: 10M is 10*1024*1024). Units\n" @@ -10328,7 +10701,7 @@ msgstr "" "Одиницями можуть бути K, M, G, T, P, E, Z, Y (степені 1024) або KB, MB... " "(степені 1000).\n" -#: src/system.h:550 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -10342,7 +10715,7 @@ msgstr "" "Якщо розмір не буде знайдено, типовою одиницею буде 1024 байтів\n" "(або 512, якщо встановлено POSIXLY_CORRECT).\n" -#: src/system.h:560 +#: src/system.h:571 #, c-format msgid "" "\n" @@ -10355,26 +10728,26 @@ msgstr "" #. <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:574 +#: src/system.h:585 #, c-format msgid "Report %s translation bugs to <http://translationproject.org/team/>\n" msgstr "" "Повідомте %s про помилку у перекладі на <http://translationproject.org/team/" ">\n" -#: src/system.h:578 +#: src/system.h:589 #, c-format msgid "For complete documentation, run: info coreutils '%s invocation'\n" msgstr "" "Ознайомитися з повною документацією можна за допомогою команди info " "coreutils '%s invocation'\n" -#: src/system.h:585 +#: src/system.h:596 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "Спробуйте '%s --help' для одержання додаткової інформації.\n" -#: src/system.h:617 +#: src/system.h:628 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -10398,13 +10771,11 @@ msgstr "Jay Lepreau" msgid "" "Write each FILE to standard output, last line first.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" "Виводить ФАЙЛИ на стандартний вивід, починаючи з останньої рядка.\n" -"Якщо ФАЙЛ не вказаний або вказаний як -, читає стандартний ввід.\n" -"\n" +"Якщо ФАЙЛ не вказано або вказано як -, читає стандартний ввід.\n" -#: src/tac.c:145 +#: src/tac.c:144 msgid "" " -b, --before attach the separator before instead of after\n" " -r, --regex interpret the separator as a regular expression\n" @@ -10414,42 +10785,42 @@ msgstr "" " -r, --regex сприймати розділювач як регулярний вираз\n" " -s, --separator=РЯДОК вказати розділювачем РЯДОК, а не знак '\\n'\n" -#: src/tac.c:235 src/tac.c:336 +#: src/tac.c:234 src/tac.c:335 #, c-format msgid "%s: seek failed" msgstr "%s: помилка переміщення по файла" -#: src/tac.c:264 +#: src/tac.c:263 #, c-format msgid "record too large" msgstr "запис надто великий" -#: src/tac.c:451 +#: src/tac.c:450 #, c-format msgid "failed to create temporary file in %s" msgstr "не вдалося створити тимчасовий файл у %s" -#: src/tac.c:459 +#: src/tac.c:458 #, c-format msgid "failed to open %s for writing" msgstr "не вдалося відкрити %s для читання" -#: src/tac.c:476 +#: src/tac.c:475 #, c-format msgid "failed to rewind stream for %s" msgstr "не вдалося повернутися до початку потоку даних для %s" -#: src/tac.c:512 src/tac.c:519 +#: src/tac.c:511 src/tac.c:518 #, c-format msgid "%s: write error" msgstr "%s: помилка запису" -#: src/tac.c:572 +#: src/tac.c:571 #, c-format msgid "failed to open %s for reading" msgstr "помилка при спробі відкрити %s для читання" -#: src/tac.c:630 +#: src/tac.c:629 #, c-format msgid "separator cannot be empty" msgstr "розділювач не може бути порожнім" @@ -10465,14 +10836,12 @@ 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" -"\n" msgstr "" "Виводить останні %d рядків кожного з ФАЙЛІВ на стандартний вивід.\n" "Якщо задано декілька ФАЙЛІВ, спочатку виводить заголовок з назвою файла.\n" -"Якщо ФАЙЛ не вказаний або вказаний як -, читає стандартний ввід.\n" -"\n" +"Якщо ФАЙЛ не вказано або вказано як -, читає стандартний ввід.\n" -#: src/tail.c:271 +#: src/tail.c:270 msgid "" " -c, --bytes=K output the last K bytes; alternatively, use -c " "+K\n" @@ -10483,7 +10852,7 @@ msgstr "" " щоб виведення було розпочато з Н-го байта кожного " "з файлів\n" -#: src/tail.c:275 +#: src/tail.c:274 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -10497,7 +10866,7 @@ msgstr "" " -f, --follow та --follow=descriptor еквівалентні\n" " -F еквівалент --follow=name --retry\n" -#: src/tail.c:282 +#: src/tail.c:281 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -10521,7 +10890,7 @@ msgstr "" " ротації системних протокольних файлів)\n" " З inotify цей параметр малокорисний.\n" -#: src/tail.c:295 +#: src/tail.c:294 msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" " -q, --quiet, --silent never output headers giving file names\n" @@ -10536,7 +10905,7 @@ msgstr "" " доступ до нього буде втрачено, корисно, якщо \n" " вказано назву файла, тобто з --follow=name\n" -#: src/tail.c:302 +#: src/tail.c:301 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations.\n" @@ -10550,7 +10919,7 @@ msgstr "" " процес P принаймні кожні Н секунд.\n" " -v, --verbose завжди виводити заголовки з назвами файлів\n" -#: src/tail.c:311 +#: src/tail.c:310 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -10568,7 +10937,7 @@ msgstr "" "GB 1000*1000*1000, G 1024*1024*1024 тощо для T, P, E, Z, Y.\n" "\n" -#: src/tail.c:320 +#: src/tail.c:319 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" @@ -10587,28 +10956,28 @@ msgstr "" "уваги\n" "його перейменування, вилучення або створення.\n" -#: src/tail.c:379 +#: src/tail.c:378 #, c-format msgid "closing %s (fd=%d)" msgstr "закриття %s (fd=%d)" -#: src/tail.c:454 +#: src/tail.c:453 #, c-format msgid "%s: cannot seek to relative offset %s" msgstr "%s: не вдалося перемістити вказівник позиції на %s" -#: src/tail.c:458 +#: src/tail.c:457 #, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "%s: не вдалося перемістити вказівник позиції на %s відносно кінця" -#: src/tail.c:895 +#: src/tail.c:894 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "" "не вдалося визначити розташування %s. Повертаємося до способу опитування" -#: src/tail.c:907 +#: src/tail.c:906 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " @@ -10617,39 +10986,39 @@ msgstr "" "Нерозпізнаний тип файлової системи 0x%08lx для %s. Будь ласка, повідомте про " "нього до %s. Повертаємося до простого опитування." -#: src/tail.c:964 +#: src/tail.c:963 #, c-format msgid "%s has become inaccessible" msgstr "%s став недоступний" -#: src/tail.c:981 +#: src/tail.c:980 #, c-format msgid "%s has been replaced with an untailable file; giving up on this name" msgstr "" "%s був замінений файлом, для якого tail незастосовний; кінець виводу для " "цієї назви" -#: src/tail.c:990 +#: src/tail.c:989 #, c-format msgid "%s has been replaced with a remote file. giving up on this name" msgstr "%s було замінено віддаленим файлом. Кінець виводу для цієї назви" -#: src/tail.c:1011 +#: src/tail.c:1010 #, c-format msgid "%s has become accessible" msgstr "%s став доступний" -#: src/tail.c:1019 +#: src/tail.c:1018 #, c-format msgid "%s has appeared; following end of new file" msgstr "%s з'явився; початий вивід для нового файла" -#: src/tail.c:1030 +#: src/tail.c:1029 #, c-format msgid "%s has been replaced; following end of new file" msgstr "%s був заміщений; вивід продовжується для нового файла" -#: src/tail.c:1131 +#: src/tail.c:1130 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: не вдалося змінити неблокуючий режим" @@ -11015,17 +11384,22 @@ msgstr "пропущено ']'" msgid "extra argument %s" msgstr "зайвий аргумент %s" -#: src/timeout.c:124 +#: src/timeout.c:112 +#, c-format +msgid "warning: sigprocmask" +msgstr "попередження: sigprocmask" + +#: src/timeout.c:145 #, c-format msgid "warning: timer_settime" msgstr "попередження: timer_settime" -#: src/timeout.c:129 +#: src/timeout.c:150 #, c-format msgid "warning: timer_create" msgstr "попередження: timer_create" -#: src/timeout.c:204 +#: src/timeout.c:225 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -11034,20 +11408,17 @@ msgstr "" "Використання: %s [ПАРАМЕТР] ТРИВАЛІСТЬ КОМАНДА [АРГУМЕНТ]...\n" " або: %s [ПАРАМЕТР]\n" -#: src/timeout.c:208 -msgid "" -"Start COMMAND, and kill it if still running after DURATION.\n" -"\n" -"Mandatory arguments to long options are mandatory for short options too.\n" +#: src/timeout.c:229 +msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "" "Запустити КОМАНДУ і завершити її роботу, якщо її не буде завершено протягом " "часу ТРИВАЛІСТЬ.\n" -"\n" -"Обов'язкові аргументи для довгих форм запису параметрів є обов'язковими і " -"для скорочених форм.\n" -#: src/timeout.c:213 +#: src/timeout.c:235 msgid "" +" --preserve-status\n" +" exit with the same status as COMMAND, even when the\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 " @@ -11061,6 +11432,9 @@ msgid "" " 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" " --foreground\n" " Якщо timeout не запущено безпосередньо з командної " "оболонки,\n" @@ -11080,7 +11454,7 @@ msgstr "" " Переглянути список сигналів можна за допомогою команди\n" " «kill -l»\n" -#: src/timeout.c:229 +#: src/timeout.c:254 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -11091,36 +11465,42 @@ msgstr "" "ТРИВАЛІСТЬ — число з плаваючою крапкою з додатковим суфіксом:\n" "«s» — секунди (типовий), «m» — хвилини, «h» — години або «d» — дні.\n" -#: src/timeout.c:234 +#: src/timeout.c:259 msgid "" "\n" -"If the command times out, then exit with status 124. Otherwise, exit\n" -"with the status of COMMAND. If no signal is specified, send the TERM\n" -"signal upon timeout. The TERM signal kills any process that does not\n" -"block or catch that signal. For other processes, it may be necessary to\n" -"use the KILL (9) signal, since this signal cannot be caught. If the\n" -"KILL (9) signal is sent, the exit status is 128+9 rather than 124.\n" +"If the command times out, and --preserve-status is not set, then exit with\n" +"status 124. Otherwise, exit with the status of COMMAND. If no signal\n" +"is specified, send the TERM signal upon timeout. The TERM signal kills\n" +"any process that does not block or catch that signal. It may be necessary\n" +"to use the KILL (9) signal, since this signal cannot be caught, in which\n" +"case the exit status is 128+9 rather than 124.\n" msgstr "" "\n" -"Якщо час очікування на завершення команди буде перевищено, вийти з\n" -"кодом стану 124. Якщо цього не відбудеться, вийти з кодом стану\n" -"КОМАНДИ. Якщо сигналу не вказано, надіслати сигнал TERM після\n" -"перевищення часу очікування. Сигнал TERM перерве виконання будь-яких\n" +"Якщо час очікування на завершення команди буде перевищено, і не вказано\n" +"--preserve-status, вийти з кодом стану 124. Якщо цього не відбудеться,\n" +"вийти з кодом стану КОМАНДИ. Якщо сигналу не вказано, надіслати сигнал TERM\n" +"після перевищення часу очікування. Сигнал TERM перерве виконання будь-яких\n" "процесів, які не блокують і не перехоплюють цей сигнал. Іншим\n" "процесам слід насилати сигнал KILL (9), оскільки цей сигнал не може\n" "бути перехоплено. Якщо надіслано сигнал KILL (9), станом виходу буде\n" "128+9, а не 124.\n" -"\n" -#: src/timeout.c:419 +#: src/timeout.c:363 +#, c-format +msgid "warning: disabling core dumps failed" +msgstr "попередження: спроба вимикання дампів ядра завершилася невдало" + +#: src/timeout.c:471 #, c-format msgid "error waiting for command" msgstr "помилка під час очікування на команду" -#: src/timeout.c:441 +#: src/timeout.c:482 #, c-format -msgid "warning: disabling core dumps failed" -msgstr "попередження: спроба вимикання дампів ядра завершилася невдало" +msgid "the monitored command dumped core" +msgstr "" +"команда, за якою виконувалося спостереження, завершила роботу критичною " +"помилкою" #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 @@ -11132,22 +11512,22 @@ msgstr "Jim Kingdon" msgid "Randy Smith" msgstr "Randy Smith" -#: src/touch.c:115 src/touch.c:313 +#: src/touch.c:115 src/touch.c:309 #, c-format msgid "invalid date format %s" msgstr "неправильний формат дати %s" -#: src/touch.c:194 +#: src/touch.c:191 #, c-format msgid "cannot touch %s" msgstr "не вдалося виконати touch для %s" -#: src/touch.c:200 +#: src/touch.c:197 #, c-format msgid "setting times of %s" msgstr "встановлення тимчасових позначок %s" -#: src/touch.c:216 +#: src/touch.c:213 msgid "" "Update the access and modification times of each FILE to the current time.\n" "\n" @@ -11156,7 +11536,6 @@ msgid "" "\n" "A FILE argument string of - is handled specially and causes touch to\n" "change the times of the file associated with standard output.\n" -"\n" msgstr "" "Оновити час доступу та час зміни кожного ФАЙЛА до поточної позначки часу.\n" "\n" @@ -11166,9 +11545,8 @@ msgstr "" "Якщо у аргументі ФАЙЛ вказано символ -, він обробляється особливим чином\n" "та призводить до зміни позначки часу для файла, пов'язаного зі стандартним\n" "виведенням даних.\n" -"\n" -#: src/touch.c:229 +#: src/touch.c:225 msgid "" " -a change only the access time\n" " -c, --no-create do not create any files\n" @@ -11181,7 +11559,7 @@ msgstr "" " замість поточного часу\n" " -f (ігнорується)\n" -#: src/touch.c:235 +#: src/touch.c:231 msgid "" " -h, --no-dereference affect each symbolic link instead of any " "referenced\n" @@ -11194,11 +11572,11 @@ msgstr "" " зміни часових позначок символічних посилань)\n" " -m змірити лише час внесення змін\n" -#: src/touch.c:241 +#: src/touch.c:237 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" -" --time=WORD change the specified time:\n" +" --time=WORD change the specified time:\n" " WORD is access, atime, or use: equivalent to -a\n" " WORD is modify or mtime: equivalent to -m\n" msgstr "" @@ -11209,7 +11587,7 @@ msgstr "" " СЛОВО access, atime, use еквівалентно -a\n" " СЛОВО modify, mtime еквівалентно -m\n" -#: src/touch.c:250 +#: src/touch.c:246 msgid "" "\n" "Note that the -d and -t options accept different time-date formats.\n" @@ -11217,12 +11595,12 @@ msgstr "" "\n" "Зауважте, що ключі -d та -t сприймають різні формати дати та часу.\n" -#: src/touch.c:339 +#: src/touch.c:335 #, c-format msgid "cannot specify times from more than one source" msgstr "не вдалося вказати час з кількох джерел" -#: src/touch.c:413 +#: src/touch.c:409 #, c-format msgid "" "warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'" @@ -11507,7 +11885,6 @@ msgid "" "If a FILE is larger than the specified size, the extra data is lost.\n" "If a FILE is shorter, it is extended and the extended part (hole)\n" "reads as zero bytes.\n" -"\n" msgstr "" "Зменшити або збільшити розмір кожного ФАЙЛа до вказаного значення\n" "\n" @@ -11516,20 +11893,19 @@ msgstr "" "Якщо розмір ФАЙЛа перевищуватиме вказаний, додаткові дані буде втрачено.\n" "Якщо розмір ФАЙЛа буде меншим, його буде збільшено. Додаткову частину\n" "буде заповнено нульовими байтами.\n" -"\n" -#: src/truncate.c:110 +#: src/truncate.c:109 msgid " -c, --no-create do not create any files\n" msgstr " -c, --no-create не створювати файлів\n" -#: src/truncate.c:113 +#: src/truncate.c:112 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" " -o, --io-blocks вважати РОЗМІР кількістю блоків введення-вивадення, " "а не байтів\n" -#: src/truncate.c:116 +#: 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" @@ -11538,7 +11914,7 @@ msgstr "" " -s, --size=РОЗМІР встановити або змінити розмір файла, відповідно до " "РОЗМІР\n" -#: src/truncate.c:122 +#: src/truncate.c:121 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -11550,57 +11926,57 @@ msgstr "" "«+» — розширити, «-» — звузити, «<» — не більше, «>» — не менше,\n" "«/» — зменшити до кратного, «%» — збільшити до кратного.\n" -#: src/truncate.c:150 +#: src/truncate.c:149 #, c-format msgid "overflow in %<PRIdMAX> * %<PRIdMAX> byte blocks for file %s" msgstr "переповнення у %<PRIdMAX> * %<PRIdMAX> байтових блоків для файла %s" -#: src/truncate.c:174 +#: src/truncate.c:173 #, c-format msgid "%s has unusable, apparently negative size" msgstr "%s має непридатний, ймовірно від'ємний розмір" -#: src/truncate.c:184 src/truncate.c:379 +#: src/truncate.c:183 src/truncate.c:384 #, c-format msgid "cannot get the size of %s" msgstr "не вдалося визначити розмір %s" -#: src/truncate.c:206 +#: src/truncate.c:205 #, c-format msgid "overflow rounding up size of file %s" msgstr "переповнення під час округлення розміру файла %s у бік збільшення" -#: src/truncate.c:216 +#: src/truncate.c:215 #, c-format msgid "overflow extending size of file %s" msgstr "переповнення під час розширення розміру файла %s" -#: src/truncate.c:231 +#: src/truncate.c:230 #, c-format msgid "failed to truncate %s at %<PRIdMAX> bytes" msgstr "не вдалося обрізати %s до %<PRIdMAX> байтів" -#: src/truncate.c:305 +#: src/truncate.c:303 #, c-format msgid "multiple relative modifiers specified" msgstr "вказано декілька відносних модифікаторів" -#: src/truncate.c:335 +#: src/truncate.c:333 #, c-format msgid "you must specify either %s or %s" msgstr "можна визначити лише щось одне: %s або %s" -#: src/truncate.c:342 +#: src/truncate.c:340 #, c-format msgid "you must specify a relative %s with %s" msgstr "вам слід вказати відносний %s з %s" -#: src/truncate.c:349 +#: src/truncate.c:347 #, c-format msgid "%s was specified but %s was not" msgstr "вказано %s, але без %s" -#: src/truncate.c:400 +#: src/truncate.c:404 #, c-format msgid "cannot open %s for writing" msgstr "не вдалося відкрити %s для запису" @@ -11698,14 +12074,12 @@ msgstr "не вдалося дізнатись назву системи" msgid "" "Convert blanks in each FILE to tabs, writing to standard output.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" "Перетворює пробіли у ФАЙЛАХ у знаки табуляції та виводить на\n" -"стандартний вивід. Якщо ФАЙЛ не вказаний або вказаний як -, читається\n" -"стандартний ввід.\n" -"\n" +"стандартний вивід. Якщо ФАЙЛ не вказано або вказано як -, читаються\n" +"дані зі стандартного джерела вхідних даних.\n" -#: src/unexpand.c:125 +#: src/unexpand.c:124 msgid "" " -a, --all convert all blanks, instead of just initial blanks\n" " --first-only convert only leading sequences of blanks (overrides -a)\n" @@ -11719,12 +12093,12 @@ msgstr "" " -t, --tabs=СПИСОК використовувати заданий СПИСОК (розділених комами)\n" " позицій табуляції (включає -a)\n" -#: src/unexpand.c:153 +#: src/unexpand.c:152 #, c-format msgid "tabs are too far apart" msgstr "позиції табуляції надто далеко одна від одної" -#: src/unexpand.c:505 +#: src/unexpand.c:504 #, c-format msgid "tab stop value is too large" msgstr "розмір табуляції надто великий" @@ -11740,16 +12114,14 @@ msgid "" "writing to OUTPUT (or standard output).\n" "\n" "With no options, matching lines are merged to the first occurrence.\n" -"\n" msgstr "" "Фільтрує сусідні відповідні рядків з ВХОДУ (або стандартного введення),\n" "з записом до ВИХОДУ (або стандартного виведення).\n" "\n" "Якщо не вказано параметрів, відповідні рядки об'єднуються з рядками,\n" "виявленими першими.\n" -"\n" -#: src/uniq.c:148 +#: src/uniq.c:147 msgid "" " -c, --count prefix lines by the number of occurrences\n" " -d, --repeated only print duplicate lines\n" @@ -11757,7 +12129,7 @@ msgstr "" " -c, --count виводити число повторів на початку кожного рядка\n" " -d, --repeated виводити лише рядки, що повторюються\n" -#: src/uniq.c:152 +#: src/uniq.c:151 msgid "" " -D, --all-repeated[=delimit-method] print all duplicate lines\n" " delimit-method={none(default),prepend,separate}\n" @@ -11777,11 +12149,11 @@ msgstr "" " -u, --unique виводити лише рядки, що не повторюються\n" " -z, --zero-terminated кінцеві рядки з 0 байта, без символу нового рядка\n" -#: src/uniq.c:162 +#: src/uniq.c:161 msgid " -w, --check-chars=N compare no more than N characters in lines\n" msgstr " -w, --check-chars=Н порівнювати перші Н знаків рядків\n" -#: src/uniq.c:167 +#: src/uniq.c:166 msgid "" "\n" "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n" @@ -11791,7 +12163,7 @@ msgstr "" "Полем вважається послідовність пробільних знаків, за якою\n" "йдуть не пробільні знаки. Спочатку пропускаються поля, потім символи.\n" -#: src/uniq.c:172 +#: src/uniq.c:171 msgid "" "\n" "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n" @@ -11805,24 +12177,24 @@ msgstr "" "Крім того, під час порівняння використовуються правила, встановлені змінною\n" "LC_COLLATE.\n" -#: src/uniq.c:359 +#: src/uniq.c:358 #, c-format msgid "too many repeated lines" msgstr "надто багато рядків, що повторюються" -#: src/uniq.c:522 +#: src/uniq.c:521 msgid "invalid number of fields to skip" msgstr "неправильна кількість полів, що пропускаються" -#: src/uniq.c:531 +#: src/uniq.c:530 msgid "invalid number of bytes to skip" msgstr "неправильна кількість байт, що пропускаються" -#: src/uniq.c:540 +#: src/uniq.c:539 msgid "invalid number of bytes to compare" msgstr "неправильна кількість байт, що порівнюються" -#: src/uniq.c:559 +#: src/uniq.c:558 #, c-format msgid "printing all duplicated lines and repeat counts is meaningless" msgstr "вивід усіх рядків, що повторюються та числа повторів не має сенсу" @@ -11877,6 +12249,11 @@ msgstr[0] "%ld день %2d:%02d, " msgstr[1] "%ld дні %2d:%02d, " msgstr[2] "%ld днів %2d:%02d, " +#: src/uptime.c:149 +#, c-format +msgid "up %2d:%02d, " +msgstr "%2d:%02d, " + #: src/uptime.c:151 #, c-format msgid "%lu user" @@ -11979,39 +12356,39 @@ msgstr "" msgid " old " msgstr "давно" -#: src/who.c:449 +#: src/who.c:440 msgid "system boot" msgstr "завантаження системи" -#: src/who.c:456 src/who.c:458 +#: src/who.c:447 src/who.c:449 msgid "id=" msgstr "id=" -#: src/who.c:471 src/who.c:476 +#: src/who.c:462 src/who.c:467 msgid "term=" msgstr "термінал=" -#: src/who.c:473 src/who.c:477 +#: src/who.c:464 src/who.c:468 msgid "exit=" msgstr "вихід=" -#: src/who.c:494 +#: src/who.c:485 msgid "LOGIN" msgstr "ВХІД" -#: src/who.c:514 +#: src/who.c:505 msgid "clock change" msgstr "зміна часу" -#: src/who.c:526 src/who.c:527 +#: src/who.c:517 src/who.c:518 msgid "run-level" msgstr "рівень виконання" -#: src/who.c:530 src/who.c:531 +#: src/who.c:521 src/who.c:522 msgid "last=" msgstr "попередній=" -#: src/who.c:562 +#: src/who.c:553 #, c-format msgid "" "\n" @@ -12020,44 +12397,44 @@ msgstr "" "\n" "число користувачів=%lu\n" -#: src/who.c:568 +#: src/who.c:559 msgid "NAME" msgstr "НАЗВА" -#: src/who.c:568 +#: src/who.c:559 msgid "LINE" msgstr "ЛІНІЯ" -#: src/who.c:568 +#: src/who.c:559 msgid "TIME" msgstr "Час" -#: src/who.c:568 +#: src/who.c:559 msgid "IDLE" msgstr "НЕАКТИВНИЙ" -#: src/who.c:569 +#: src/who.c:560 msgid "PID" msgstr "PID" -#: src/who.c:569 +#: src/who.c:560 msgid "COMMENT" msgstr "КОМЕНТАР" -#: src/who.c:569 +#: src/who.c:560 msgid "EXIT" msgstr "ВИХІД" -#: src/who.c:649 +#: src/who.c:640 #, c-format msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n" msgstr "Використання: %s [КЛЮЧ]... [ ФАЙЛ | АРГ1 АРГ2]\n" -#: src/who.c:650 +#: src/who.c:641 msgid "Print information about users who are currently logged in.\n" msgstr "Вивести дані щодо користувачів, які працюють у системі.\n" -#: src/who.c:653 +#: src/who.c:644 msgid "" "\n" " -a, --all same as -b -d --login -p -r -t -T -u\n" @@ -12071,11 +12448,11 @@ msgstr "" " -d, --dead виводити мертві процеси\n" " -H, --heading виводити рядок з заголовками стовпчиків\n" -#: src/who.c:660 +#: src/who.c:651 msgid " -l, --login print system login processes\n" msgstr " -l, --login виводити процеси входу у систему\n" -#: src/who.c:663 +#: src/who.c:654 msgid "" " --lookup attempt to canonicalize hostnames via DNS\n" " -m only hostname and user associated with stdin\n" @@ -12086,7 +12463,7 @@ msgstr "" " стандартним вводом\n" " -p, --process виводити активні процеси, які породжені init\n" -#: src/who.c:668 +#: src/who.c:659 msgid "" " -q, --count all login names and number of users logged on\n" " -r, --runlevel print current runlevel\n" @@ -12098,7 +12475,7 @@ msgstr "" " -s, --short виводити лише назву, лінію та час (приймається типово)\n" " -t, --time виводити останню зміна системного часу\n" -#: src/who.c:674 +#: src/who.c:665 msgid "" " -T, -w, --mesg add user's message status as +, - or ?\n" " -u, --users list users logged in\n" @@ -12110,7 +12487,7 @@ msgstr "" " --message еквівалент -T\n" " --writable еквівалент -T\n" -#: src/who.c:682 +#: src/who.c:673 #, c-format msgid "" "\n" @@ -12155,6 +12532,397 @@ msgstr "" "'y'.\n" "\n" +#~ msgid "using single-precision arithmetic" +#~ msgstr "використання арифметики з фіксованою точністю" + +#~ msgid "using arbitrary-precision arithmetic" +#~ msgstr "використання арифметики з довільною точністю" + +#~ msgid "" +#~ "simple_strtod_human:\n" +#~ " input string: '%s'\n" +#~ " locale decimal-point: '%s'\n" +#~ msgstr "" +#~ "simple_strtod_human:\n" +#~ " рядок вхідних даних: «%s»\n" +#~ " символ відокремлення дробової частини локалі: «%s»\n" + +#~ msgid "" +#~ " parsed numeric value: %Lf\n" +#~ " input precision = %d\n" +#~ msgstr "" +#~ " оброблене числове значення: %Lf\n" +#~ " точність вхідних даних = %d\n" + +#~ msgid " Auto-scaling, found 'i', switching to base %d\n" +#~ msgstr " Автомасштабування, виявлено «i», перемикаємося на основу %d\n" + +#~ msgid " suffix power=%d^%d = %Lf\n" +#~ msgstr " степінь у суфіксі=%d^%d = %Lf\n" + +#~ msgid " returning value: %Lf (%LG)\n" +#~ msgstr " повертаємо значення %Lf (%LG)\n" + +#~ msgid "double_to_human:\n" +#~ msgstr "double_to_human:\n" + +#~ msgid " no scaling, returning (grouped) value: %'.*Lf\n" +#~ msgstr " без масштабування, повертаємо значення (з групуванням) %'.*Lf\n" + +#~ msgid " no scaling, returning value: %.*Lf\n" +#~ msgstr " без масштабування, повертаємо значення %.*Lf\n" + +#~ msgid " scaled value to %Lf * %0.f ^ %d\n" +#~ msgstr " масштабоване значення до %Lf * %0.f ^ %d\n" + +#~ msgid " after rounding, value=%Lf * %0.f ^ %d\n" +#~ msgstr " після округлення, значення=%Lf * %0.f ^ %d\n" + +#~ msgid " returning value: '%s'\n" +#~ msgstr " повернутаємо значення «%s»\n" + +#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n" +#~ msgstr "Використання: %s [ПАРАМЕТРИ] [ЧИСЛО]\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=ОДИНИЦЯ автоматично масштабувати вхідні числа за ОДИНИЦЕЮ. " +#~ "Типове\n" +#~ " значення -- 'none'. Опис ОДИНИЦІ наведено нижче.\n" +#~ " --from-unit=N вказати розмір вхідної одиниці (типовим є 1).\n" +#~ " --to=ОДИНИЦЯ автоматично масштабувати виведені числа за ОДИНИЦЕЮ. " +#~ "Опис\n" +#~ " ОДИНИЦІ наведено нижче.\n" +#~ " --to-unit=N розмір одиниці виведення (замість типового значення " +#~ "1).\n" +#~ " --round=СПОСІБ спосіб округлення під час масштабування. Варіанти:\n" +#~ " up (до більшого), down (до меншого), from-zero (до " +#~ "дальшого\n" +#~ " до нуля, типовий), towards-zero (до ближчого до " +#~ "нуля), nearest (до найближчого цілого\n" +#~ " --suffix=СУФІКС додати СУФІКС до виведених чисел і використовувати " +#~ "СУФІКС\n" +#~ " у вхідних даних.\n" +#~ " --padding=N доповнити виведені дані до N символів.\n" +#~ " Використання додатного N призведе до вирівнювання " +#~ "праворуч\n" +#~ " Від’ємні N вирівнюватимуть дані ліворуч.\n" +#~ " Зауваження: якщо виведені дані будуть довшими за N,\n" +#~ " доповнення не відбуватиметься. Типовим є автоматичне " +#~ "доповнення,\n" +#~ " якщо буде виявлено пробіли.\n" +#~ " --grouping групувати цифри (наприклад, 1.000.000).\n" +#~ " Використовується визначене локаллю групування (тобто не " +#~ "впливає\n" +#~ " на локалі C/POSIX).\n" +#~ " --header[=N] вивести (без перетворення) перші N рядків заголовка.\n" +#~ " Якщо не вказано, типовим значенням N є 1.\n" +#~ " --field N замінити число у вхідному полі N (типовим є 1)\n" +#~ " -d, --delimiter=X використовувати X замість пробілу для відокремлення " +#~ "полів\n" +#~ " --format=ФОРМАТ використовувати форматування у стилі printf.\n" +#~ " Опис ФОРМАТу наведено нижче.\n" +#~ " --invalid=РЕЖИМ режим обробки некоректних символів. Можливі режими:\n" +#~ " abort (перервати обробку, типовий), fail (обробити з " +#~ "помилками),\n" +#~ " warn (попередити), ignore (ігнорувати).\n" +#~ " --debug виводити попередження щодо некоректних вхідних даних.\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" +#~ "Варіанти ОДИНИЦІ:\n" +#~ " none без автоматичного масштабування. Використання суфіксів\n" +#~ " призводитиме до повідомлення про помилку.\n" +#~ " auto Використовувати додатковий одно- або дволітерний суфікс:\n" +#~ " 1K = 1000\n" +#~ " 1Ki = 1024\n" +#~ " 1M = 1000000\n" +#~ " 1Mi = 1048576\n" +#~ " si Використовувати додатковий однолітерний суфікс:\n" +#~ " 1K = 1000\n" +#~ " 1M = 1000000\n" +#~ " ...\n" +#~ " iec Використовувати додатковий однолітерний суфікс:\n" +#~ " 1K = 1024\n" +#~ " 1M = 1048576\n" +#~ " ...\n" +#~ " iec-i Використовувати додатковий дволітерний суфікс:\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 "" +#~ "Рядок форматування:\n" +#~ " вхідні дані: %s\n" +#~ " групування: %s\n" +#~ " розмір доповнення: %ld\n" +#~ " вирівнювання: %s\n" +#~ " префікс: «%s»\n" +#~ " суфікс: «%s»\n" + +#~ msgid "" +#~ "formatting output:\n" +#~ " value: %Lf\n" +#~ " humanized: '%s'\n" +#~ msgstr "" +#~ "форматуємо виведення:\n" +#~ " значення: %Lf\n" +#~ " у зручному форматі: «%s»\n" + +#~ msgid " After padding: '%s'\n" +#~ msgstr " Після доповнення: «%s»\n" + +#~ msgid "trimming suffix '%s'\n" +#~ msgstr "обрізаємо суфікс «%s»\n" + +#~ msgid "no valid suffix found\n" +#~ msgstr "не знайдено коректного суфікса\n" + +#~ msgid "setting Auto-Padding to %ld characters\n" +#~ msgstr "встановлюємо автоматичне доповнення до %ld символів\n" + +#~ msgid "" +#~ "extracting Fields:\n" +#~ " input: '%s'\n" +#~ " field: %d\n" +#~ msgstr "" +#~ "видобуваємо поля:\n" +#~ " вхідні дані: «%s»\n" +#~ " поле: %d\n" + +#~ msgid "" +#~ " TOO FEW FIELDS!\n" +#~ " prefix: '%s'\n" +#~ msgstr "" +#~ " НАДТО МАЛО ПОЛІВ!\n" +#~ " префікс: «%s»\n" + +#~ msgid "" +#~ " prefix: '%s'\n" +#~ " number: '%s'\n" +#~ " suffix: '%s'\n" +#~ msgstr "" +#~ " префікс: «%s»\n" +#~ " номер: «%s»\n" +#~ " суфікс: «%s»\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 "" +#~ " -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 пропускати каталоги на інших файлових системах\n" +#~ " -X, --exclude-from=ФАЙЛ виключати файли, що збігаються з якимось\n" +#~ " шаблоном з ФАЙЛА\n" +#~ " --exclude=ШАБЛОН виключати файли, що збігаються з ШАБЛОНОМ\n" +#~ " --max-depth=N виводити зведення про каталог (або файл, з --" +#~ "all),\n" +#~ " лише якщо він на N або менше рівнів нижче,\n" +#~ " ніж аргумент командного рядка; --max-depth=0\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 ніколи не створювати резервних копій (навіть якщо\n" +#~ " вказаний ключ --backup)\n" +#~ " numbered, t створювати нумеровані копії\n" +#~ " existing, nil якщо існують нумеровані копії, то створювати\n" +#~ " нумеровані інакше створювати прості\n" +#~ " simple. never завжди створювати прості копії\n" +#~ "\n" + +#~ msgid "" +#~ "WARNING: --page-increment is deprecated; use --line-increment instead" +#~ msgstr "" +#~ "ПОПЕРЕДЖЕННЯ: --page-increment вважаєте застарілим; вам варто " +#~ "скористатися --line-increment" + +#~ msgid "All arguments to long options are mandatory for short options.\n" +#~ msgstr "Всі аргументи для довгих ключів є обов'язковими для коротких.\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" +#~ "ОСНОВА може бути d (десятковою), o (вісімковою), x (шістнадцятковою) або\n" +#~ "n (не виводити зсув). Н з префіксом 0x або 0X сприймається як\n" +#~ "шістнадцяткове, з суфіксом b множиться на 512, з суфіксом kB — 1000, K — " +#~ "1024,\n" +#~ "MB — 1000*1000, M — 1024*1024, GB — 1000*1000*1000, G — 1024*1024*1024, " +#~ "те саме\n" +#~ "для T, P, E, Z, Y. Якщо додати до будь-якого формату суфікс z,\n" +#~ "наприкінці кожного рядка будуть виводитись друковані символи.\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 без аргументу означає 3, --width — 32.\n" +#~ "Типово od використовуються ключі -A o -t oS -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 "не вдалося встановити груповий id" + +#~ msgid "cannot set user id" +#~ msgstr "не вдалося встановити id користувача" + +#~ 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 "" +#~ "Встановлює ефективні id користувача та групи як у КОРИСТУВАЧА.\n" +#~ "\n" +#~ " -, -l, --login використовувати оболонку як оболонку " +#~ "входу\n" +#~ " -c, --commmand=КОМАНДА передати оболонці КОМАНДУ за допомогою -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. Якщо КОРИСТУВАЧ не вказаний,\n" +#~ "вважається root.\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" + #~ msgid "" #~ "\n" #~ "Examples:\n" diff --git a/po/vi.gmo b/po/vi.gmo index 007abedf..99178911 100644 Binary files a/po/vi.gmo and b/po/vi.gmo differ diff --git a/po/vi.po b/po/vi.po index e3ee5148..724f7169 100644 --- a/po/vi.po +++ b/po/vi.po @@ -5,24 +5,24 @@ # 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. +# Nguyễn Thái Ngọc Duy <pclouds@gmail.com>, 2012. # msgid "" msgstr "" -"Project-Id-Version: coreutils-8.16\n" +"Project-Id-Version: coreutils-8.20-pre1\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2012-05-10 19:35+0200\n" -"PO-Revision-Date: 2012-03-27 09:22+0700\n" +"POT-Creation-Date: 2013-02-14 15:56+0000\n" +"PO-Revision-Date: 2012-12-11 13:35+0700\n" "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n" -"Language-Team: Vietnamese <vi-VN@googlegroups.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-Poedit-Language: Vietnamese\n" -"X-Poedit-Country: VIET NAM\n" -"X-Poedit-SourceCharset: utf-8\n" +"X-Poedit-SourceCharset: UTF-8\n" #: lib/argmatch.c:133 #, c-format @@ -32,44 +32,44 @@ 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ố vẫn mơ hồ %s cho %s" +msgstr "đối số không rõ ràng %s cho %s" #: lib/argmatch.c:153 msgid "Valid arguments are:" -msgstr "Đối số hợp lệ:" +msgstr "Những đối số hợp lệ:" #: lib/closein.c:100 msgid "error closing file" -msgstr "lỗi đóng tệp tin" - -#: lib/closeout.c:112 src/base64.c:109 src/base64.c:121 src/base64.c:127 -#: src/base64.c:168 src/base64.c:224 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:330 src/expand.c:355 src/head.c:298 -#: src/head.c:348 src/head.c:756 src/head.c:797 src/mktemp.c:350 src/od.c:919 -#: src/paste.c:160 src/shuf.c:369 src/split.c:727 src/split.c:964 -#: src/split.c:969 src/tail.c:350 src/tail.c:1201 src/tail.c:1307 +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 -#: src/unexpand.c:427 src/unexpand.c:443 +#: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" -msgstr "lỗi ghi nhớ" +msgstr "lỗi ghi" -#: lib/copy-acl.c:611 src/copy.c:1160 src/copy.c:2602 +#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617 #, c-format msgid "preserving permissions for %s" -msgstr "đang bảo tồn quyền hạn cho %s" +msgstr "giữ nguyên quyền hạn cho %s" #: lib/error.c:188 msgid "Unknown system error" -msgstr "Lỗi hệ thống không rõ" +msgstr "Lỗi hệ thống lạ" #: lib/file-type.c:38 msgid "regular empty file" -msgstr "tệp tin trống thông thường" +msgstr "tập tin trống thông thường" #: lib/file-type.c:38 msgid "regular file" -msgstr "tệp tin thông thường" +msgstr "tập tin thông thường" #: lib/file-type.c:41 msgid "directory" @@ -77,11 +77,11 @@ msgstr "thư mục" #: lib/file-type.c:44 msgid "block special file" -msgstr "tệp tin đặc biệt khối" +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ự" +msgstr "tập tin đặc biệt ký tự" #: lib/file-type.c:50 msgid "fifo" @@ -93,11 +93,11 @@ msgstr "liên kết mềm" #: lib/file-type.c:56 msgid "socket" -msgstr "ổ cắm" +msgstr "socket" #: lib/file-type.c:59 msgid "message queue" -msgstr "hàng thông điệp" +msgstr "hàng đợi thông điệp" #: lib/file-type.c:62 msgid "semaphore" @@ -113,31 +113,31 @@ msgstr "đối tượng bộ nhớ đặt kiểu" #: lib/file-type.c:70 msgid "weird file" -msgstr "tệp tin kỳ lạ" +msgstr "tập tin kỳ lạ" #: lib/gai_strerror.c:57 msgid "Address family for hostname not supported" -msgstr "Nhóm địa chỉ cho tên máy vẫn không được hỗ trợ" +msgstr "Nhóm địa chỉ cho tên máy không được hỗ trợ" #: lib/gai_strerror.c:58 msgid "Temporary failure in name resolution" -msgstr "Tiến trình giải quyết tên bị lỗi tạm thời" +msgstr "Lỗi tạm thời phân giải tên" #: lib/gai_strerror.c:59 msgid "Bad value for ai_flags" -msgstr "Giá trị sai cho ai_flags" +msgstr "Giá trị ai_flags sai" #: lib/gai_strerror.c:60 msgid "Non-recoverable failure in name resolution" -msgstr "Tiến trình giải quyết tên bị lỗi một cách không thể phục hồi" +msgstr "Lỗi không thể phục hồi khi phân giải tên" #: lib/gai_strerror.c:61 msgid "ai_family not supported" -msgstr "không hỗ trợ ai_family" +msgstr "không hỗ trợ ai_family" #: lib/gai_strerror.c:62 msgid "Memory allocation failure" -msgstr "Lỗi phân cấp bộ nhớ" +msgstr "Lỗi cấp phát bộ nhớ" #: lib/gai_strerror.c:63 msgid "No address associated with hostname" @@ -149,11 +149,11 @@ msgstr "Không rõ tên hay dịch vụ" #: lib/gai_strerror.c:65 msgid "Servname not supported for ai_socktype" -msgstr "Không hỗ trợ tên dịch vụ cho « ai_socktype »" +msgstr "Không hỗ trợ tên dịch vụ cho ai_socktype" #: lib/gai_strerror.c:66 msgid "ai_socktype not supported" -msgstr "Không hỗ trợ « ai_socktype »" +msgstr "Không hỗ trợ ai_socktype" #: lib/gai_strerror.c:67 msgid "System error" @@ -169,19 +169,19 @@ msgstr "Đang xử lý yêu cầu" #: lib/gai_strerror.c:71 msgid "Request canceled" -msgstr "Yêu cầu bị bãi bỏ" +msgstr "Yêu cầu bị huỷ bỏ" #: lib/gai_strerror.c:72 msgid "Request not canceled" -msgstr "Yêu cầu không bị bãi bỏ" +msgstr "Yêu cầu không bị huỷ bỏ" #: lib/gai_strerror.c:73 msgid "All requests done" -msgstr "Mọi yêu cầu đều đã xử lý xong" +msgstr "Đã xử lý xong mọi yêu cầu" #: lib/gai_strerror.c:74 msgid "Interrupted by a signal" -msgstr "Bị tín hiệu gián đoạn" +msgstr "Bị ngắt bởi tín hiệu" #: lib/gai_strerror.c:75 msgid "Parameter string not correctly encoded" @@ -189,75 +189,75 @@ msgstr "Chuỗi tham số sai mã hoá" #: lib/gai_strerror.c:87 msgid "Unknown error" -msgstr "Lỗi không rõ" +msgstr "Lỗi lạ" #: lib/getopt.c:547 lib/getopt.c:576 #, c-format msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: tùy chọn « %s » chưa rõ ràng; khả năng là:" +msgstr "%s: tùy chọn “%s” chưa rõ ràng; khả năng là:" #: lib/getopt.c:624 lib/getopt.c:628 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: tùy chọn « --%s » không cho phép đối số\n" +msgstr "%s: tùy chọn “--%s” không cần đối số\n" #: lib/getopt.c:637 lib/getopt.c:642 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" -msgstr "%s: tùy chọn « %c%s » không cho phép đối số\n" +msgstr "%s: tùy chọn “%c%s” không cho phép một đối số\n" #: lib/getopt.c:685 lib/getopt.c:704 #, c-format msgid "%s: option '--%s' requires an argument\n" -msgstr "%s: tùy chọn « --%s » yêu cầu một đối số\n" +msgstr "%s: tùy chọn “--%s” cần một đối số\n" #: lib/getopt.c:742 lib/getopt.c:745 #, c-format msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: không nhận ra tuỳ chọn « --%s »\n" +msgstr "%s: không nhận ra tùy chọn “--%s”\n" #: lib/getopt.c:753 lib/getopt.c:756 #, c-format msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: không nhận ra tuỳ chọn « %c%s »\n" +msgstr "%s: không nhận ra tùy chọn “%c%s”\n" #: lib/getopt.c:805 lib/getopt.c:808 #, c-format msgid "%s: invalid option -- '%c'\n" -msgstr "%s: tùy chọn không hợp lệ -- « %c »\n" +msgstr "%s: tùy chọn không hợp lệ -- “%c”\n" #: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 #, c-format msgid "%s: option requires an argument -- '%c'\n" -msgstr "%s: tùy chọn yêu cầu một đối số -- « %c »\n" +msgstr "%s: tùy chọn cần một đối số -- “%c”\n" #: lib/getopt.c:934 lib/getopt.c:950 #, c-format msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: tùy chọn « -W %s » vẫn mơ hồ\n" +msgstr "%s: tùy chọn “-W %s” không rõ ràng\n" #: lib/getopt.c:974 lib/getopt.c:992 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: tùy chọn « -W %s » không cho phép đối số\n" +msgstr "%s: tùy chọn “-W %s” không cho phép có đối số\n" #: lib/getopt.c:1013 lib/getopt.c:1031 #, c-format msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: tùy chọn « -W %s » yêu cầu một đối số\n" +msgstr "%s: tùy chọn “-W %s” cần một đối số\n" -#: lib/mkdir-p.c:196 src/install.c:483 +#: lib/mkdir-p.c:196 src/install.c:484 #, 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:2261 src/install.c:709 src/install.c:722 +#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722 #, 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:915 src/tac.c:435 +#: src/split.c:929 src/tac.c:434 #, c-format msgid "memory exhausted" msgstr "cạn bộ nhớ" @@ -270,7 +270,7 @@ msgstr "không ghi nhớ được thư mục làm việc hiện thời" #: lib/openat-die.c:57 src/find-mount-point.c:107 #, c-format msgid "failed to return to initial working directory" -msgstr "lỗi trở về thư mục làm việc khởi đầu" +msgstr "gặp lỗi khi trở về thư mục làm việc khởi đầu" #. TRANSLATORS: #. Get translations for open and closing quotation marks. @@ -295,86 +295,86 @@ msgstr "lỗi trở về thư mục làm việc khởi đầu" #. and use glyphs suitable for your language. #: lib/quotearg.c:312 msgid "`" -msgstr "« " +msgstr "“" #: lib/quotearg.c:313 msgid "'" -msgstr " »" +msgstr "”" #: lib/randread.c:128 #, c-format msgid "%s: end of file" -msgstr "%s: gặp kết thúc tệp tin" +msgstr "%s: gặp kết thúc tập tin" -#: lib/regcomp.c:130 +#: lib/regcomp.c:131 msgid "Success" msgstr "Thành công" -#: lib/regcomp.c:133 +#: lib/regcomp.c:134 msgid "No match" msgstr "Không tìm thấy" -#: lib/regcomp.c:136 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "Biểu thức chính quy không hợp lệ" -#: lib/regcomp.c:139 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "Ký tự đối chiếu không hợp lệ" -#: lib/regcomp.c:142 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "Sai tên hạng ký tự" -#: lib/regcomp.c:145 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "Có dấu chéo ngược theo sau" -#: lib/regcomp.c:148 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "Sai tham chiếu ngược" -#: lib/regcomp.c:151 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" -msgstr "Có một ký tự « [ » hay « [^ » riêng lẻ" +msgstr "Có một ký tự “[” hay “[^” lẻ đôi" -#: lib/regcomp.c:154 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" -msgstr "Có một ký tự « ( » hay « \\( » riêng lẻ" +msgstr "Có một ký tự “(” hay “\\(” lẻ đôi" -#: lib/regcomp.c:157 +#: lib/regcomp.c:158 msgid "Unmatched \\{" -msgstr "Có một ký tự « \\{ » riêng lẻ" +msgstr "Có một ký tự “\\{” lẻ đôi" -#: lib/regcomp.c:160 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" -msgstr "Nội dụng « \\{\\} » không hợp lệ" +msgstr "Nội dung “\\{\\}” không hợp lệ" -#: lib/regcomp.c:163 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "Sai kết thúc phạm vi" -#: lib/regcomp.c:166 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Cạn bộ nhớ" -#: lib/regcomp.c:169 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "Sai biểu thức chính quy đi trước" -#: lib/regcomp.c:172 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "Kết thúc sớm biểu thức chính quy" -#: lib/regcomp.c:175 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "Biểu thức chính quy quá lớn" -#: lib/regcomp.c:178 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" -msgstr "Có một ký tự « ) » hay « \\) » riêng lẻ" +msgstr "Có một ký tự “)” hay “\\)” lẻ đôi" -#: lib/regcomp.c:703 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "Không có biểu thức chính quy đi trước" @@ -391,7 +391,7 @@ msgstr "thực hiện đệ quy trên %s là rất nguy hiểm (cũng như %s)" #: lib/root-dev-ino.h:43 #, c-format msgid "use --no-preserve-root to override this failsafe" -msgstr "hãy dùng « --no-preserve-root » để bỏ qua kiểm tra này" +msgstr "hãy dùng “--no-preserve-root” để bỏ qua kiểm tra này" #. TRANSLATORS: A regular expression testing for an affirmative answer #. (english: "yes"). Testing the first character may be sufficient. @@ -401,7 +401,7 @@ msgstr "hãy dùng « --no-preserve-root » để bỏ qua kiểm tra này" #. locale -k LC_MESSAGES | grep '^yesexpr=' #: lib/rpmatch.c:147 msgid "^[yY]" -msgstr "^[yY]" +msgstr "^[yYcC]" #. TRANSLATORS: A regular expression testing for a negative answer #. (english: "no"). Testing the first character may be sufficient. @@ -411,16 +411,16 @@ msgstr "^[yY]" #. locale -k LC_MESSAGES | grep '^noexpr=' #: lib/rpmatch.c:160 msgid "^[nN]" -msgstr "^[nN]" +msgstr "^[nNkK]" -#: lib/set-mode-acl.c:695 src/copy.c:2284 src/cp.c:518 +#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516 #, c-format msgid "setting permissions for %s" msgstr "đang thiết lập quyền hạn cho %s" #: lib/siglist.h:31 msgid "Hangup" -msgstr "Ngừng nói" +msgstr "Treo" #: lib/siglist.h:34 msgid "Interrupt" @@ -444,7 +444,7 @@ msgstr "Bị hủy bỏ" #: lib/siglist.h:49 msgid "Floating point exception" -msgstr "Ngoại lệ điểm phù động" +msgstr "Ngoại lệ dấu chấm động" #: lib/siglist.h:52 msgid "Killed" @@ -452,11 +452,11 @@ msgstr "Bị giết" #: lib/siglist.h:55 msgid "Bus error" -msgstr "Lỗi mạch nối" +msgstr "Lỗi bus" #: lib/siglist.h:58 msgid "Segmentation fault" -msgstr "Lỗi chia ra từng đoạn" +msgstr "Lỗi phân đoạn" #: lib/siglist.h:61 msgid "Broken pipe" @@ -500,7 +500,7 @@ msgstr "Bị dừng (kết xuất TTY)" #: lib/siglist.h:91 msgid "I/O possible" -msgstr "V/R có thể làm" +msgstr "I/O có thể" #: lib/siglist.h:94 msgid "CPU time limit exceeded" @@ -508,7 +508,7 @@ msgstr "Vượt quá giới hạn thời gian CPU" #: lib/siglist.h:97 msgid "File size limit exceeded" -msgstr "Vượt quá giới hạn kích cỡ tệp tin" +msgstr "Vượt quá giới hạn kích cỡ tập tin" #: lib/siglist.h:100 msgid "Virtual timer expired" @@ -536,7 +536,7 @@ msgstr "Bẫy EMT" #: lib/siglist.h:120 msgid "Bad system call" -msgstr "Sai gọi hệ thống" +msgstr "Cú gọi hệ thống sai" #: lib/siglist.h:123 msgid "Stack fault" @@ -554,13 +554,13 @@ 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:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262 -#: lib/spawn-pipe.c:265 +#: 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:232 lib/spawn-pipe.c:346 lib/wait-process.c:282 +#: 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" @@ -576,27 +576,27 @@ msgstr "Tín hiệu thời gian thực %d" msgid "Unknown signal %d" msgstr "Không nhận ra tín hiệu %d" -#: lib/unicodeio.c:103 +#: lib/unicodeio.c:102 msgid "iconv function not usable" msgstr "hàm iconv không thể sử dụng được" -#: lib/unicodeio.c:105 +#: lib/unicodeio.c:104 msgid "iconv function not available" -msgstr "hàm iconv không sẵn sàng" +msgstr "hàm iconv không sẵn dùng" -#: lib/unicodeio.c:112 +#: lib/unicodeio.c:111 msgid "character out of range" -msgstr "ký tự ở ngoại phạm vi" +msgstr "ký tự nằm ngoài phạm vi" -#: lib/unicodeio.c:182 +#: lib/unicodeio.c:181 #, c-format msgid "cannot convert U+%04X to local character set" msgstr "không chuyển đổi được U+%04X thành bảng mã ký tự nội bộ" -#: lib/unicodeio.c:184 +#: lib/unicodeio.c:183 #, c-format msgid "cannot convert U+%04X to local character set: %s" -msgstr "không chuyển đổi được U+%04X thành bảng mã ký tự nội bộ : %s" +msgstr "không chuyển đổi được U+%04X thành bảng mã ký tự nội bộ: %s" #: lib/userspec.c:106 msgid "invalid user" @@ -642,9 +642,9 @@ msgid "" "\n" msgstr "" "\n" -"Giấy phép GPL pb3+ : Giấy phép Công cộng GNU phiên bản 3 hay sau\n" +"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" +"Đâ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" "\n" @@ -768,14 +768,14 @@ msgid "" msgstr "" "\n" "Gửi báo cáo lỗi tới: %s\n" -"Gửi báo cáo lỗi dịch (tiếng Việt) tới Clytie: <clytie@riverland.net.au>\n" +"Gửi báo cáo lỗi dịch tới <http://translationproject.org/team/vi.html>\n" #: lib/version-etc.c:247 #, c-format 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:562 +#: lib/version-etc.c:251 src/system.h:573 #, c-format msgid "%s home page: <%s>\n" msgstr "Trang chủ %s: <%s>\n" @@ -785,7 +785,7 @@ 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:563 +#: lib/version-etc.c:256 src/system.h:574 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" @@ -793,7 +793,7 @@ msgstr "" #: lib/w32spawn.h:43 #, c-format msgid "_open_osfhandle failed" -msgstr "_open_osfhandle bị lỗi" +msgstr "_open_osfhandle gặp lỗi" #: lib/w32spawn.h:84 #, c-format @@ -824,7 +824,7 @@ msgstr "đầu lỗi tiêu chuẩn" #: lib/xfreopen.c:38 msgid "unknown stream" -msgstr "không rõ luồng" +msgstr "không hiểu luồng dữ liệu" #: lib/xfreopen.c:39 #, c-format @@ -834,12 +834,12 @@ msgstr "không mở lại được %s với chế độ %s" #: lib/xmemcoll.c:39 src/expr.c:886 #, c-format msgid "string comparison failed" -msgstr "lỗi so sánh các chuỗi" +msgstr "gặp lỗi khi so sánh các chuỗi" #: lib/xmemcoll.c:40 #, c-format msgid "Set LC_ALL='C' to work around the problem." -msgstr "Hãy đặt « LC_ALL='C' » để giải quyết vấn đề." +msgstr "Hãy đặt “LC_ALL=”C” để giải quyết vấn đề." #: lib/xmemcoll.c:42 #, c-format @@ -854,17 +854,17 @@ msgstr "không thể thực hiện kết xuất đã định dạng" #: lib/xstrtol-error.c:63 #, c-format msgid "invalid %s%s argument '%s'" -msgstr "đối số %s%s không hợp lệ '%s'" +msgstr "đối số %s%s không hợp lệ “%s”" #: lib/xstrtol-error.c:68 #, c-format msgid "invalid suffix in %s%s argument '%s'" -msgstr "gặp hậu tố không hợp lệ trong %s%s đối số '%s'" +msgstr "gặp hậu tố không hợp lệ trong %s%s đối số “%s”" #: lib/xstrtol-error.c:72 #, c-format msgid "%s%s argument '%s' too large" -msgstr "%s%s đối số '%s' quá lớn" +msgstr "%s%s nhận đối số “%s” là quá lớn" #. This is a proper name. See the gettext manual, section Names. #: src/base64.c:40 @@ -872,18 +872,17 @@ msgid "Simon Josefsson" msgstr "Simon Josefsson" #: src/base64.c:60 -#, c-format +#, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" "Base64 encode or decode FILE, or standard input, to standard output.\n" -"\n" msgstr "" -"Sử dụng: %s [TÙY_CHỌN] [TẬP_TIN]\n" +"Cách dùng: %s [TÙY_CHỌN] [TẬP_TIN]\n" "\n" -"Mã hoá/giải mã Base64 TẬP_TIN, hay đầu vào tiêu chuẩn, ra đầu ra tiêu chuẩn\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:64 +#: src/base64.c:67 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -893,21 +892,22 @@ msgid "" "\n" msgstr "" " -d, --decode giải mã dữ liệu\n" -" -i, --ignore-garbage giải mã thì cũng bỏ qua ký tự khác bảng chữ cái\n" -" -w, --wrap=SỐ ngắt dòng mã hoá đẳng sau số các cột này (mặc định " -"76).\n" -" Giá trị 0 thì tắt chức năng ngắt dòng\n" +" -i, --ignore-garbage khi giải mã thì cũng bỏ qua ký tự\n" +" không nằm trong bảng chữ cái\n" +" -w, --wrap=SỐ ngắt dòng mã hoá sau số cột này (mặc định 76).\n" +" Giá trị 0 thì tắt chức năng ngắt dòng\n" "\n" -#: src/base64.c:73 src/cat.c:110 src/fmt.c:293 src/shuf.c:71 src/sum.c:70 +#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" msgstr "" "\n" -"Không có TẬP_TIN, hoặc TẬP_TIN là « - », thì đọc đầu vào tiêu chuẩn.\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.\n" -#: src/base64.c:76 +#: src/base64.c:79 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -919,40 +919,40 @@ msgstr "" "Dữ liệu được mã hoá như được diễn tả cho bảng chữ cái base64 trong tài liệu\n" "RFC 3564. Khi giải mã, kết nhập có thể chứa các ký tự dòng mới, thêm vào\n" "các byte của bảng chữ cái base64 hình thức. Hãy dùng tùy chọn\n" -"« --ignore-garbage » để thử phục hồi khi luồng đã mã hoá chứa byte khác chữ " +"”--ignore-garbage” để thử phục hồi khi luồng đã mã hoá chứa byte khác chữ " "cái.\n" -#: src/base64.c:171 src/base64.c:208 src/csplit.c:263 src/csplit.c:1435 -#: src/join.c:451 src/shuf.c:157 src/shuf.c:361 src/tac-pipe.c:74 +#: 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 #, c-format msgid "read error" msgstr "lỗi đọc" -#: src/base64.c:227 +#: src/base64.c:230 #, c-format msgid "invalid input" -msgstr "sai nhập vào" +msgstr "đầu vào sai" -#: src/base64.c:264 +#: src/base64.c:267 #, c-format msgid "invalid wrap size: %s" msgstr "sai kích cỡ ngắt dòng: %s" -#: src/base64.c:283 src/basename.c:173 src/comm.c:435 src/cp.c:607 -#: src/date.c:441 src/dircolors.c:447 src/du.c:894 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:169 src/install.c:929 src/join.c:961 -#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:157 src/mv.c:447 -#: src/od.c:1802 src/ptx.c:2081 src/readlink.c:154 src/seq.c:408 -#: src/shuf.c:320 src/shuf.c:339 src/sort.c:4477 src/split.c:1313 -#: src/tr.c:1797 src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:454 -#: src/uniq.c:471 src/unlink.c:81 src/uptime.c:250 src/users.c:146 -#: src/wc.c:666 src/who.c:836 src/whoami.c:79 +#: 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 #, c-format msgid "extra operand %s" msgstr "toán hạng thừa %s" -#: src/base64.c:315 src/cat.c:781 +#: src/base64.c:318 src/cat.c:781 #, c-format msgid "closing standard input" msgstr "đang đóng đầu vào tiêu chuẩn" @@ -960,15 +960,15 @@ 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/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:53 src/env.c:33 +#: 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/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:65 src/su.c:88 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 +#: 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 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -978,20 +978,20 @@ msgid "" "Usage: %s NAME [SUFFIX]\n" " or: %s OPTION... NAME...\n" msgstr "" -"Sử dụng: %s TÊN [HẬU_TỐ]\n" -" hoặc: %s TÙY_CHỌN...TÊN...\n" +"Cách dùng: %s TÊN [HẬU_TỐ]\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" -"\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" -#: src/basename.c:59 +#: 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" @@ -1002,7 +1002,7 @@ msgstr "" " -s, --suffix=SUFFIX gỡ bỏ đuôi phụ tố SUFFIX\n" " -z, --zero ngăn cách kết xuất với NUL thay vì dòng mới\n" -#: src/basename.c:66 +#: src/basename.c:67 #, c-format msgid "" "\n" @@ -1014,25 +1014,26 @@ msgid "" msgstr "" "\n" "Các ví dụ:\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\" theo sau bởi \"str2\"\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” theo sau bởi “str2”\n" -#: src/basename.c:167 src/chcon.c:531 src/chgrp.c:277 src/chmod.c:526 -#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1369 +#: 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:183 src/mkfifo.c:108 src/mknod.c:146 src/nohup.c:111 -#: src/pathchk.c:148 src/printf.c:674 src/readlink.c:146 src/realpath.c:236 -#: src/rm.c:314 src/rmdir.c:223 src/seq.c:402 src/setuidgid.c:137 -#: src/sleep.c:119 src/stat.c:1476 src/stdbuf.c:346 src/tr.c:1782 +#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 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 #, 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:52 src/split.c:49 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/split.c:49 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" @@ -1042,12 +1043,12 @@ msgstr "Torbjorn Granlund" msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:846 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4720 src/nl.c:182 src/paste.c:435 src/pr.c:2768 src/sum.c:58 +#: 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/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" -msgstr "Sử dụng: %s [TÙY_CHỌN]... [TẬP_TIN]...\n" +msgstr "Cách dùng: %s [TÙY_CHỌN]... [TẬP_TIN]...\n" #: src/cat.c:92 msgid "" @@ -1060,13 +1061,13 @@ msgid "" " -n, --number number all output lines\n" " -s, --squeeze-blank suppress repeated empty output lines\n" msgstr "" -"Ghép nối FILE, hoặc đầu vào tiêu chuẩn, xuất đầu ra chuẩn.\n" +"Ghép nối các FILE, hoặc đầu vào tiêu chuẩn, xuất đầu ra chuẩn.\n" "\n" -" -A, --show-all tương đương với « -vET »\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" -" -e tương đương với « -vE »\n" -" -E, --show-ends hiển thị « $ » tại cuối mỗi dòng\n" -" -n, --number đánh số tất cả những dòng của kết qủa\n" +" -e tương đương với “-vE”\n" +" -E, --show-ends hiển thị “$” tại cuối mỗi dòng\n" +" -n, --number đánh số tất cả những dòng của kết quả\n" " -s, --squeeze-blank không bao giờ có hơn một dòng rỗng đơn\n" #: src/cat.c:102 @@ -1076,10 +1077,10 @@ msgid "" " -u (ignored)\n" " -v, --show-nonprinting use ^ and M- notation, except for LFD and TAB\n" msgstr "" -" -t tương đương với « -vT »\n" -" -T, --show-tabs hiển thị ký tự TAB ở dạng « ^I »\n" +" -t tương đương với “-vT”\n" +" -T, --show-tabs hiển thị ký tự TAB ở dạng “^I”\n" " -u (bị bỏ qua)\n" -" -v, --show-nonprinting dùng ký hiệu « ^ » và « M- », trừ cho LFD và TAB\n" +" -v, --show-nonprinting dùng ký hiệu “^” và “M-”, trừ cho LFD và TAB\n" #: src/cat.c:114 #, c-format @@ -1090,25 +1091,25 @@ msgid "" " %s Copy standard input to standard output.\n" msgstr "" "\n" -"Ví dụ :\n" -" %s f - g Xuất nội dung của f, rồi đầu vào tiêu chuẩn, rồi nội dung của " -"g.\n" -" %s Sao chép đầu vào tiêu chuẩn vào đầu ra tiêu chuẩn.\n" +"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" #: 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:2209 src/sort.c:379 src/tee.c:165 src/yes.c:86 +#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86 #, c-format msgid "standard output" -msgstr "đầu ra tiêu chuẩn" +msgstr "đầu ra chuẩn" #: src/cat.c:716 #, c-format msgid "%s: input file is output file" -msgstr "%s: tệp tin đầu vào là tệp tin đầu ra" +msgstr "%s: tập tin đầu vào là tập tin đầu ra" #. This is a proper name. See the gettext manual, section Names. #: src/chcon.c:36 src/runcon.c:62 @@ -1117,46 +1118,46 @@ 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:55 src/head.c:46 src/hostid.c:33 +#: 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 msgid "Jim Meyering" msgstr "Jim Meyering" -#: src/chcon.c:100 src/runcon.c:203 src/runcon.c:234 +#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238 #, c-format msgid "failed to create security context: %s" -msgstr "lỗi tạo ngữ cảnh bảo mật: %s" +msgstr "gặp lỗi khi tạo ngữ cảnh bảo mật: %s" #: src/chcon.c:112 #, c-format msgid "failed to set %s security context component to %s" -msgstr "lỗi đặt thành phần ngữ cảnh bảo mật %s thanh %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:540 src/copy.c:2222 src/runcon.c:217 -#: src/stat.c:683 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221 +#: src/stat.c:702 #, c-format msgid "failed to get security context of %s" -msgstr "lỗi lấy ngữ cảnh bảo mật của %s" +msgstr "gặp lỗi khi lấy ngữ cảnh bảo mật của %s" #: src/chcon.c:166 #, c-format msgid "can't apply partial context to unlabeled file %s" -msgstr "không thể áp dụng ngữ cảnh bộ phận cho tệp tin không có nhãn %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 #, c-format msgid "failed to change context of %s to %s" -msgstr "lỗi thay đổi ngữ cảnh của %s thành %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:446 src/ls.c:2981 +#: src/du.c:457 src/ls.c:2981 #, c-format msgid "cannot access %s" -msgstr "không thể truy cập đến %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:426 +#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437 #, c-format msgid "cannot read directory %s" msgstr "không đọc được thư mục %s" @@ -1166,13 +1167,13 @@ 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:599 +#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562 #, 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:618 -#: src/remove.c:613 +#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642 +#: src/remove.c:576 #, c-format msgid "fts_close failed" msgstr "fts_close bị lỗi" @@ -1184,24 +1185,24 @@ msgid "" " or: %s [OPTION]... [-u USER] [-r ROLE] [-l RANGE] [-t TYPE] FILE...\n" " or: %s [OPTION]... --reference=RFILE FILE...\n" msgstr "" -"Sử dụng: %s [TÙY_CHỌN]... NGỬ_CẢNH TẬP_TIN...\n" -" hoặc: %s [TÙY_CHỌN]... [-u NGƯỜI_DÙNG] [-r VÀI_TRÒ] [-l PHẠM_VI] [-t " +"Cách dùng: %s [TÙY_CHỌN]... NGỮ_CẢNH TẬP_TIN...\n" +" hoặc: %s [TÙY_CHỌN]... [-u NGƯỜI_DÙNG] [-r VAI_TRÒ] [-l PHẠM_VI] [-t " "KIỂU] TẬP_TIN...\n" -" hoặc: %s [TÙY_CHỌN]... --reference=TẬP_TIN_R TẬP_TIN...\n" +" 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" "With --reference, change the security context of each FILE to that of " "RFILE.\n" -"\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, thay đổi ngữ cảnh bảo mật của mỗi TẬP_TIN thành điều của " -"TẬP_TIN_R.\n" +"Khi có --reference, ngữ cảnh bảo mật của từng TẬP_TIN được lấy từ " +"TẬP_TIN_TC.\n" "\n" -#: src/chcon.c:362 src/chgrp.c:123 src/chown.c:94 +#: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94 msgid "" " --dereference affect the referent of each symbolic link (this is\n" " the default), rather than the symbolic link itself\n" @@ -1212,43 +1213,51 @@ msgstr "" "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" +"chiếu đến tập tin\n" -#: src/chcon.c:367 +#: src/chcon.c:369 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" " -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=NGƯỜI_DÙNG đặt NGƯỜI_DÙNG trong ngữ cảnh bảo mật đích\n" -" -r, --role=VAI_TRÒ đặt VAI_TRÒ trong ngữ cảnh bảo mật đích\n" +" -u, --user=NGƯỜI_DÙNG đặt NGƯỜI_DÙNG trong ngữ cảnh bảo mật đích\n" +" -r, --role=VAI_TRÒ đặt VAI_TRÒ trong ngữ cảnh bảo mật đích\n" " -t, --type=KIỂU đặt KIỂU trong ngữ cảnh bảo mật đích\n" -" -l, --range=PHẠM_VI đặt PHẠM_VI trong ngữ cảnh bảo mật đích\n" +" -l, --range=PHẠM_VI đặt PHẠM_VI trong ngữ cảnh bảo mật đích\n" "\n" -#: src/chcon.c:373 +#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 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" +" --preserve-root không thực hiện đệ quy trên “/”\n" + +#: src/chcon.c:379 msgid "" " --reference=RFILE use RFILE's security context rather than " "specifying\n" " a CONTEXT value\n" msgstr "" -" --reference=TẬP_TIN_R sử dụng ngữ cảnh bảo mật của TẬP_TIN_R\n" +" --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" -#: src/chcon.c:377 src/chgrp.c:140 src/chown.c:118 +#: 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 thao tác trên các tệp tin và thư mục một cách đệ " +" -R, --recursive thao tác trên các tập tin và thư mục một cách đệ " "qui\n" -#: src/chcon.c:380 +#: src/chcon.c:386 msgid " -v, --verbose output a diagnostic for every file processed\n" msgstr "" -" -v, --verbose xuất ra các chuẩn đoán cho mọi quá trính xử lý tệp " +" -v, --verbose xuất ra các chuẩn đoán cho mọi quá trính xử lý tập " "tin\n" -#: src/chcon.c:383 src/chgrp.c:143 src/chown.c:121 +#: src/chcon.c:389 src/chgrp.c:143 src/chown.c:121 msgid "" "\n" "The following options modify how a hierarchy is traversed when the -R\n" @@ -1264,7 +1273,7 @@ msgid "" msgstr "" "\n" "Những tùy chọn sau sửa đổi cách đi qua cây thư mục khi có tùy chọn -R.\n" -"cũng được chỉ định, Nếu chỉ ra hơn một tùy chọn, thì chỉ tùy chọn cuối có\n" +"cũng được chỉ định. Nếu chỉ ra hơn một tùy chọn, thì chỉ tùy chọn cuối có\n" "hiệu lực.\n" "\n" " -H nếu đối số dòng lệnh là liên kết mềm tới một\n" @@ -1274,39 +1283,39 @@ 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:512 src/chgrp.c:264 src/chown.c:267 +#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267 #, c-format msgid "-R --dereference requires either -H or -L" -msgstr "-R --dereference yêu cầu hoặc « -H » hoặc « -L »" +msgstr "-R --dereference cần hoặc -H hoặc -L" -#: src/chcon.c:518 +#: src/chcon.c:524 #, c-format msgid "-R -h requires -P" -msgstr "-R -h yêu cầu -P" +msgstr "-R -h cần -P" -#: src/chcon.c:533 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282 -#: src/comm.c:429 src/csplit.c:1371 src/join.c:1149 src/link.c:79 -#: src/mknod.c:148 src/setuidgid.c:139 src/tr.c:1785 +#: 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 #, c-format msgid "missing operand after %s" -msgstr "thiếu toán hạng đằng sau %s" +msgstr "thiếu toán hạng sau %s" -#: src/chcon.c:556 src/runcon.c:247 +#: src/chcon.c:562 src/runcon.c:251 #, c-format msgid "invalid context: %s" msgstr "ngữ cảnh không hợp lệ: %s" -#: src/chcon.c:563 +#: src/chcon.c:569 #, 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:572 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:433 src/cp.c:493 -#: src/mv.c:96 src/pwd.c:273 src/rm.c:324 src/touch.c:351 +#: 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 #, c-format msgid "failed to get attributes of %s" -msgstr "lấy thuộc tính của %s không thành công" +msgstr "gặp lỗi khi lấy thuộc tính của %s" #: src/chgrp.c:92 #, c-format @@ -1319,8 +1328,8 @@ msgid "" "Usage: %s [OPTION]... GROUP FILE...\n" " or: %s [OPTION]... --reference=RFILE FILE...\n" msgstr "" -"Sử dụng: %s [TÙY_CHỌN]... NHÓM TẬP TIN...\n" -" hoặc: %s [TÙY_CHỌN]... --reference=TẬP_TIN_R TẬP_TIN...\n" +"Cách dùng: %s [TÙY_CHỌN]... NHÓM TẬP TIN...\n" +" hoặc: %s [TÙY_CHỌN]... --reference=TẬP_TIN_TC TẬP_TIN...\n" #: src/chgrp.c:113 msgid "" @@ -1329,7 +1338,7 @@ msgid "" "\n" msgstr "" "Thay đổi nhóm của mỗi TẬP_TIN thành NHÓM.\n" -"Khi có --reference, thay đổi nhóm của mỗi TẬP_TIN thành điều của TẬP_TIN_R.\n" +"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 @@ -1338,10 +1347,11 @@ msgid "" " -f, --silent, --quiet suppress most error messages\n" " -v, --verbose output a diagnostic for every file processed\n" msgstr "" -" -c, --changes giống với verbose nhưng chỉ thông báo những gì được " -"thay đổi\n" -" -f, --silent, --quiet ngăn chặn phần lớn các thông tin báo lỗi\n" -" -v, --verbose xuất là chuẩn đoán cho mọi quá trình xử lý tệp tin\n" +" -c, --changes giống với --verbose nhưng chỉ báo cáo khi có thay " +"đổi\n" +" nảy sinh\n" +" -f, --silent, --quiet chặn phần lớn các thông tin báo lỗi\n" +" -v, --verbose hiện chi tiết quá trình xử lý từng tập tin\n" #: src/chgrp.c:128 src/chown.c:99 msgid "" @@ -1351,20 +1361,12 @@ msgstr "" " (chỉ hữu dụng trên hệ thống có thể thay đổi\n" " quyền sở hữu của một liên kết mềm)\n" -#: src/chgrp.c:132 src/chmod.c:387 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" -" --preserve-root không thao tác đệ quy trên '/'\n" - #: src/chgrp.c:136 msgid "" " --reference=RFILE use RFILE's group rather than specifying a\n" " GROUP value\n" msgstr "" -" --reference=RFILE sử dụng nhóm của RFILE thay vì chỉ định\n" +" --reference=TẬP_TIN_TC sử dụng nhóm của TẬP_TIN_TC thay vì chỉ định\n" " một giá trị GROUP\n" #: src/chgrp.c:158 @@ -1376,15 +1378,14 @@ msgid "" " %s -hR staff /u Change the group of /u and subfiles to \"staff\".\n" msgstr "" "\n" -"Thí dụ :\n" -" %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 dưới thành « " -"staff ».\n" +"Ví dụ:\n" +" %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 #, c-format msgid "getting new attributes of %s" -msgstr "đang lấy thuộc tính mới của %s" +msgstr "lấy thuộc tính mới của %s" #: src/chmod.c:149 src/chown-core.c:147 #, c-format @@ -1394,12 +1395,12 @@ msgstr "liên kết mềm %s chưa thay đổi, đích đến cũng vậy\n" #: src/chmod.c:163 #, c-format msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n" -msgstr "chế độ của %s đã thay đổi %04lo (%s) thành %04lo (%s)\n" +msgstr "chế độ của %s đã thay đổi từ %04lo (%s) thành %04lo (%s)\n" #: src/chmod.c:166 #, c-format msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n" -msgstr "lỗi chuyển đổi chế độ của %s thành%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 #, c-format @@ -1409,12 +1410,13 @@ msgstr "chế độ của %s vẫn là %04lo (%s)\n" #: src/chmod.c:236 #, 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 theo sát %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 #, c-format msgid "changing permissions of %s" -msgstr "đang thay đổi quyền hạn của %s" +msgstr "thay đổi quyền hạn của %s" #: src/chmod.c:311 #, c-format @@ -1428,9 +1430,9 @@ msgid "" " or: %s [OPTION]... OCTAL-MODE FILE...\n" " or: %s [OPTION]... --reference=RFILE FILE...\n" msgstr "" -"Sử dụng: %s [TÙY_CHỌN]... CHẾ_ĐỘ[,CHẾ_ĐỘ]... TẬP_TIN...\n" -" 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_R TẬP_TIN...\n" +"Cách dùng: %s [TÙY_CHỌN]... CHẾ_ĐỘ[,CHẾ_ĐỘ]... TẬP_TIN...\n" +" 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 msgid "" @@ -1438,19 +1440,21 @@ msgid "" "With --reference, change the mode of each FILE to that of RFILE.\n" "\n" msgstr "" -"Thay đổi chế độ của mỗi TẬP_TIN thành MODE.\n" -"Khi có --reference, thay đổi nhóm của mỗi TẬP_TIN thành điều của TẬP_TIN_R.\n" +"Thay đổi quyền truy cập của mỗi TẬP_TIN thành MODE.\n" +"Khi có --reference, gán quyền cho từng TẬP_TIN bằng giá trị này từ " +"TẬP_TIN_TC.\n" "\n" #: src/chmod.c:391 msgid " --reference=RFILE use RFILE's mode instead of MODE values\n" msgstr "" -" --reference=RFILE sử dụng chế độ của RFILE thay vì giá trị MODE\n" +" --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 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" +" -R, --recursive thay đổi các tập tin và thư mục một cách đệ qui\n" #: src/chmod.c:399 msgid "" @@ -1458,12 +1462,12 @@ msgid "" "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 #, c-format msgid "cannot combine mode and --reference options" -msgstr "không thể kết hợp chế độ và tùy chọn « --reference »" +msgstr "không thể dùng chung chế độ và tùy chọn --reference" #: src/chmod.c:544 #, c-format @@ -1473,12 +1477,12 @@ msgstr "chế độ sai: %s" #: src/chown-core.c:158 #, c-format msgid "changed ownership of %s from %s to %s\n" -msgstr "đã thay đổi quyền sở hữu của %s thành %s từ %s\n" +msgstr "đã thay đổi quyền sở hữu của %s từ %s thành %s\n" #: src/chown-core.c:159 #, c-format msgid "changed group of %s from %s to %s\n" -msgstr "đã thay đổi nhóm của %s thành %s từ %s\n" +msgstr "đã thay đổi nhóm của %s từ %s thành %s\n" #: src/chown-core.c:160 #, c-format @@ -1488,27 +1492,27 @@ msgstr "không thay đổi quyền sở hữu của %s\n" #: src/chown-core.c:165 #, c-format msgid "failed to change ownership of %s from %s to %s\n" -msgstr "thay đổi quyền sở hữu của %s thành %s từ %s thất bại\n" +msgstr "gặp lỗi khi thay đổi quyền sở hữu của %s từ %s thành %s\n" #: src/chown-core.c:166 #, c-format msgid "failed to change group of %s from %s to %s\n" -msgstr "thay đổi nhóm của %s thành %s từ %s thất bại\n" +msgstr "gặp lỗi khi thay đổi nhóm của %s từ %s thành %s\n" #: src/chown-core.c:167 src/chown-core.c:173 #, c-format msgid "failed to change ownership of %s\n" -msgstr "thay đổi quyền sở hữu của %s không thành công\n" +msgstr "gặp lỗi khi thay đổi quyền sở hữu của %s\n" #: src/chown-core.c:171 #, c-format msgid "failed to change ownership of %s to %s\n" -msgstr "thay đổi quyền sở hữu của %s thành %s không thành công\n" +msgstr "gặp lỗi khi thay đổi quyền sở hữu của %s thành %s\n" #: src/chown-core.c:172 #, c-format msgid "failed to change group of %s to %s\n" -msgstr "thay đổi nhóm của %s thành %s không thành công\n" +msgstr "gặp lỗi khi thay đổi nhóm của %s thành %s\n" #: src/chown-core.c:180 #, c-format @@ -1533,12 +1537,12 @@ msgstr "không truy cập được giá trị của %s" #: src/chown-core.c:467 #, c-format msgid "changing ownership of %s" -msgstr "đang thay đổi quyền sở hữu của %s" +msgstr "thay đổi quyền sở hữu của %s" #: src/chown-core.c:468 #, c-format msgid "changing group of %s" -msgstr "đang thay đổi nhóm của %s" +msgstr "thay đổi nhóm của %s" #: src/chown.c:79 #, c-format @@ -1546,8 +1550,8 @@ msgid "" "Usage: %s [OPTION]... [OWNER][:[GROUP]] FILE...\n" " or: %s [OPTION]... --reference=RFILE FILE...\n" msgstr "" -"Sử dụng: %s [TÙY_CHỌN]... [NGƯỜI_SỞ_HỮU][:[NHÓM]] TẬP_TIN...\n" -" hoặc: %s [TÙY_CHỌN]... --reference=TẬP_TIN_R TẬP_TIN...\n" +"Cách dùng: %s [TÙY_CHỌN]... [NGƯỜI_SỞ_HỮU][:[NHÓM]] TẬP_TIN...\n" +" hoặc: %s [TÙY_CHỌN]... --reference=TẬP_TIN_TC TẬP_TIN...\n" #: src/chown.c:84 msgid "" @@ -1557,8 +1561,8 @@ msgid "" "\n" msgstr "" "Thay đổi chủ sở hữu và/hoặc nhóm của từng FILE thành OWNER và/hoặc GROUP.\n" -"Với tùy chọn --reference, thay đổi chủ sở hữu và nhóm của từng FILE cho " -"giống với RFILE.\n" +"Với tùy chọn --reference, thay đổi chủ và nhóm của từng FILE giống với " +"TẬP_TIN_TC.\n" "\n" #: src/chown.c:103 @@ -1571,8 +1575,8 @@ msgid "" "match\n" " is not required for the omitted attribute\n" msgstr "" -" --from=SỞ_HỮU_HIỆN_CÓ:NHÓM_HIỆN_CÓ\n" -" thay đổi chủ sở hữu và/hoặc nhóm của mỗi tệp tin\n" +" --from=SỞ_HỮU_HIỆN_CÓ:NHÓM_HIỆN_TẠI\n" +" thay đổi chủ sở hữu và/hoặc nhóm của mỗi tập tin\n" " chỉ nếu chủ sở hữu và/hoặc nhóm hiện thời\n" " tương ứng với mẫu chỉ ra ở đây.\n" " Có thể bỏ sót một trong hai tham số,\n" @@ -1583,7 +1587,7 @@ msgid "" " --reference=RFILE use RFILE's owner and group rather than\n" " specifying OWNER:GROUP values\n" msgstr "" -" --reference=RFILE sử dụng owner nhóm của RFILE thay vì\n" +" --reference=TẬP_TIN_TC sử dụng owner nhóm của TẬP_TIN_TC thay vì\n" " chỉ định giá trị OWNER:GROUP\n" #: src/chown.c:136 @@ -1594,9 +1598,9 @@ msgid "" "OWNER and GROUP may be numeric as well as symbolic.\n" msgstr "" "\n" -"Chủ sở hữu thì không thay nếu bị thiếu. Nhóm thì không thay đổi nếu thiếu, " -"nhưng bị thay đổi\n" -"thành nhóm đăng nhập nếu đặt một dấu hai chấm « : » sau CHỦ_SỞ_HỮU tượng " +"Chủ sở hữu không thay nếu bị thiếu. Nhóm không thay đổi nếu thiếu, nhưng bị " +"thay đổi\n" +"thành nhóm đăng nhập nếu đặt một dấu hai chấm “:” sau CHỦ_SỞ_HỮU tượng " "trưng.\n" "CHỦ_SỞ_HỮU và NHÓM có thể là các giá trị số cũng như tượng trưng.\n" @@ -1610,18 +1614,18 @@ msgid "" " %s -hR root /u Change the owner of /u and subfiles to \"root\".\n" msgstr "" "\n" -"Thí dụ :\n" -" %s root /u Thay đổi người sở hữu /u thành « root ».\n" -" %s root:staff /u Cũng vậy, cũng thay đổi nhóm thành « staff ».\n" -" %s -hR root /u Thay đổi người sở hữu /u và các tệp tin dưới thành « " -"root ».\n" +"Ví dụ:\n" +" %s root /u Thay đổi người sở hữu /u thành “root”.\n" +" %s root:staff /u Cũng vậy, nhưng thay đổi nhóm của nó thành “staff”.\n" +" %s -hR root /u Thay đổi người sở hữu /u và các tập tin dưới thành " +"“root”.\n" #. This is a proper name. See the gettext manual, section Names. #: src/chroot.c:34 msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:97 src/install.c:575 src/setuidgid.c:110 src/setuidgid.c:120 +#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120 #, c-format msgid "invalid group %s" msgstr "nhóm không hợp lệ %s" @@ -1634,7 +1638,7 @@ 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 "lỗi đặt nhóm phụ" +msgstr "gặp lỗi khi đặt nhóm phụ" #: src/chroot.c:132 #, c-format @@ -1642,8 +1646,8 @@ msgid "" "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" " or: %s OPTION\n" msgstr "" -"Sử dụng: %s [TÙY_CHỌN] GỐC_MỚI [LỆNH [ĐỐI_SỐ]...]\n" -" or: %s TÙY_CHỌN\n" +"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 msgid "" @@ -1656,8 +1660,10 @@ 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=NGƯỜI_DÙNG:NHÓM chỉ ra người dùng và nhóm (theo mã số hay tên) " -"cần dùng\\n --groups=G_LIST chỉ ra các nhóm phụ kiểu g1,g2,..,gN\n" +" --userspec=NGƯỜI_DÙNG:NHÓM\n" +" chỉ ra người dùng và nhóm (theo mã số hay tên) cần " +"dùng\n" +" --groups=G_LIST chỉ ra các nhóm phụ kiểu g1,g2,..,gN\n" #: src/chroot.c:149 msgid "" @@ -1665,8 +1671,8 @@ msgid "" "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/sh -i').\n" +"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 #, c-format @@ -1681,18 +1687,18 @@ msgstr "không chuyển được sang thư mục gốc" #: src/chroot.c:247 #, c-format msgid "failed to set group-ID" -msgstr "lỗi đặt mã số nhóm (GID)" +msgstr "gặp lỗi khi đặt mã số nhóm (GID)" #: src/chroot.c:253 #, c-format msgid "failed to set user-ID" -msgstr "lỗi đặt mã số người dùng (UID)" +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:213 src/stdbuf.c:366 -#: src/timeout.c:402 +#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365 +#: src/timeout.c:454 #, c-format msgid "failed to run command %s" -msgstr "lỗi chạy câu lệnh %s" +msgstr "gặp lỗi khi chạy câu lệnh %s" #. This is a proper name. See the gettext manual, section Names. #: src/cksum.c:40 @@ -1702,7 +1708,7 @@ msgstr "Q. Frank Xia" #: src/cksum.c:216 #, c-format msgid "%s: file too long" -msgstr "%s: tệp tin quá dài" +msgstr "%s: tập tin quá dài" #: src/cksum.c:263 #, c-format @@ -1710,25 +1716,25 @@ msgid "" "Usage: %s [FILE]...\n" " or: %s [OPTION]\n" msgstr "" -"Sử dụng: %s [TẬP_TIN]...\n" -" hoặc: %s [TÙY_CHỌN]\n" +"Cách dùng: %s [TẬP_TIN]...\n" +" hoặc: %s [TÙY_CHỌN]\n" #: src/cksum.c:268 msgid "" "Print CRC checksum and byte counts of each FILE.\n" "\n" msgstr "" -"In ra tổng kiểm tra CRC và số đếm byte của mỗi TẬP_TIN.\n" +"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 #, c-format msgid "Usage: %s [OPTION]... FILE1 FILE2\n" -msgstr "Sử dụng: %s [TÙY_CHỌN]... TẬP_TIN1 TẬP_TIN2\n" +msgstr "Cách dùng: %s [TÙY_CHỌN]... TẬP_TIN1 TẬP_TIN2\n" #: src/comm.c:107 msgid "Compare sorted files FILE1 and FILE2 line by line.\n" -msgstr "So sánh các tệp tin đã sắp xếp TẬP_TIN1 và TẬP_TIN2 theo từng dòng.\n" +msgstr "So sánh các tập tin đã sắp xếp TẬP_TIN1 và TẬP_TIN2 theo từng dòng.\n" #: src/comm.c:110 msgid "" @@ -1752,7 +1758,7 @@ msgstr "" "\n" " -1 bỏ đi cột 1 (những dòng chỉ có trong TẬP_TIN1)\n" " -2 bỏ đi cột 2 (những dòng chỉ có trong TẬP_TIN2)\n" -" -3 bỏ đi cột 3 (những dòng có trong cả hai tệp tin)\n" +" -3 bỏ đi cột 3 (những dòng có trong cả hai tập tin)\n" #: src/comm.c:122 msgid "" @@ -1762,9 +1768,9 @@ 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,\n" -"\t\t\tthậm chí nếu mọi dòng nhập vào đều có thể kết đôi được\n" -" --nocheck-order do not check that the input is correctly sorted\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" +" --nocheck-order không kiểm tra xem đầu vào đã xắp xếp đúng chưa\n" #: src/comm.c:128 msgid " --output-delimiter=STR separate columns with STR\n" @@ -1776,7 +1782,7 @@ msgid "" "Note, comparisons honor the rules specified by 'LC_COLLATE'.\n" msgstr "" "\n" -"Ghi chú : sự so sánh thì tùy theo quy tắc chỉ định bởi « LC_COLLATE ».\n" +"Chú ý là so sánh tuân theo quy tắc quy định bởi “LC_COLLATE”.\n" #: src/comm.c:137 #, c-format @@ -1787,40 +1793,44 @@ msgid "" " %s -3 file1 file2 Print lines in file1 not in file2, and vice versa.\n" msgstr "" "\n" -"Ví dụ :\n" -" %s -12 tậptin1 tậptin2 In ra chỉ những dòng nằm trong cả hai tệp.\n" -" %s -3 tậptin1 tậptin2 In ra những dòng chỉ nằm trong một của hai tệp " +"Ví dụ:\n" +" %s -12 t.tin1 t.tin2 In ra chỉ những dòng nằm trong cả hai tập tin.\n" +" %s -3 t.tin1 t.tin2 In ra những dòng chỉ nằm trong một của hai tập tin " "này.\n" #: src/comm.c:222 #, c-format msgid "file %d is not in sorted order" -msgstr "tệp tin %d không phải theo thứ tự sắp xếp" +msgstr "tập tin %d không sắp đúng thứ tự" #: src/comm.c:407 #, c-format msgid "multiple delimiters specified" -msgstr "đã chỉ ra nhiều dấu tách" +msgstr "xác định nhiều hơn một dấu cách" #: src/comm.c:411 #, c-format msgid "empty %s not allowed" msgstr "không cho phép %s trống" -#: src/copy.c:168 src/dd.c:1609 src/dd.c:1976 +#: 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 #, c-format -msgid "reading %s" -msgstr "đang đọc %s" +msgid "error reading %s" +msgstr "lỗi đọc %s" -#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:426 +#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425 #, c-format msgid "cannot lseek %s" msgstr "không lseek được %s" -#: src/copy.c:206 src/dd.c:2039 src/dd.c:2102 +#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151 #, c-format -msgid "writing %s" -msgstr "đang ghi %s" +msgid "error writing %s" +msgstr "lỗi ghi %s" #: src/copy.c:313 #, c-format @@ -1835,36 +1845,36 @@ msgstr "%s: lỗi ghi" #: src/copy.c:442 src/copy.c:1083 #, c-format msgid "failed to extend %s" -msgstr "lỗi mở rộng %s" +msgstr "gặp lỗi khi mở rộng %s" #: src/copy.c:662 #, c-format msgid "clearing permissions for %s" msgstr "đang gột quyền hạn cho %s" -#: src/copy.c:697 src/copy.c:2470 src/cp.c:331 +#: src/copy.c:697 src/copy.c:2480 src/cp.c:329 #, c-format msgid "failed to preserve ownership for %s" -msgstr "lỗi bảo tồn quyền sở hữu của %sl" +msgstr "gặp lỗi khi giữ lại quyền sở hữu của %s" #: src/copy.c:723 #, c-format msgid "failed to lookup file %s" -msgstr "lỗi tra tìm tệp tin %s" +msgstr "gặp lỗi khi tìm kiếm tập tin %s" #: src/copy.c:728 #, c-format msgid "failed to preserve authorship for %s" -msgstr "lỗi bảo tồn nguồn tác giả của %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:638 src/du.c:901 src/fmt.c:449 src/head.c:847 -#: src/sort.c:4489 src/split.c:1329 src/tail.c:1756 src/wc.c:678 +#: 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 "không mở được %s để đọc" -#: src/copy.c:810 src/copy.c:972 src/dd.c:1546 src/dd.c:2114 src/dd.c:2252 -#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:141 +#: 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 #, c-format msgid "cannot fstat %s" msgstr "không fstat được %s" @@ -1872,29 +1882,29 @@ msgstr "không fstat được %s" #: src/copy.c:820 #, 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" +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 "lỗi lấy ngữ cảnh tạo hệ thống tệp tin" +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 "lỗi đặt ngữ cảnh bảo mật của %s thành %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:1574 src/copy.c:1777 src/copy.c:1935 src/ln.c:314 -#: src/remove.c:267 src/remove.c:293 src/remove.c:444 src/remove.c:465 +#: 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 #, c-format msgid "cannot remove %s" msgstr "không gỡ bỏ được %s" -#: src/copy.c:886 src/copy.c:1578 src/copy.c:1772 src/copy.c:1940 -#: src/remove.c:418 +#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945 +#: src/remove.c:375 #, c-format msgid "removed %s\n" -msgstr "đã gỡ bỏ %s\n" +msgstr "đã xóa %s\n" #: src/copy.c:926 #, c-format @@ -1904,226 +1914,212 @@ msgstr "không phải ghi qua liên kết mềm theo sát %s" #: src/copy.c:964 #, c-format msgid "cannot create regular file %s" -msgstr "không tạo được tệp tin thông thường %s" +msgstr "không tạo được tập tin thông thường %s" #: src/copy.c:985 #, c-format msgid "failed to clone %s from %s" -msgstr "lỗi nhân bản %s từ %s" +msgstr "gặp lỗi khi nhân bản %s từ %s" -#: src/copy.c:1098 src/copy.c:2531 +#: src/copy.c:1098 src/copy.c:2541 #, c-format msgid "preserving times for %s" -msgstr "đang bảo tồn các thời gian cho %s" +msgstr "bảo tồn các giá trị thời gian cho %s" -#: src/copy.c:1170 src/copy.c:1176 src/head.c:855 src/touch.c:175 -#: src/truncate.c:413 -#, c-format -msgid "closing %s" -msgstr "đang đóng %s" +#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172 +#: src/truncate.c:417 +#, fuzzy, c-format +msgid "failed to close %s" +msgstr "gặp lỗi khi mở %s" -#: src/copy.c:1466 +#: src/copy.c:1471 #, 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)? " +msgstr "%s: thử ghi đè lên %s, cũng có quyền cao hơn chế độ %04lo (%s)? " -#: src/copy.c:1473 +#: src/copy.c:1478 #, c-format msgid "%s: overwrite %s? " -msgstr "%s: ghi đề lên %s? " +msgstr "%s: ghi đè %s? " -#: src/copy.c:1542 +#: src/copy.c:1547 #, c-format msgid " (backup: %s)" -msgstr " (sao lưu : %s)" +msgstr " (sao lưu: %s)" -#: src/copy.c:1552 +#: src/copy.c:1557 #, c-format msgid "failed to restore the default file creation context" -msgstr "lỗi phục hồi ngữ cảnh tạo tệp tin mặc định" +msgstr "gặp lỗi khi phục hồi ngữ cảnh tạo tập tin mặc định" -#: src/copy.c:1584 +#: src/copy.c:1589 #, 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:1637 src/copy.c:1689 src/copy.c:2272 src/copy.c:2589 +#: 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:1220 src/truncate.c:365 +#: src/stat.c:1239 src/truncate.c:363 #, c-format msgid "cannot stat %s" -msgstr "không thể lấy trạng thái (stat) về %s" +msgstr "không thể stat %s" -#: src/copy.c:1645 +#: src/copy.c:1650 #, c-format msgid "omitting directory %s" -msgstr "bỏ quên thư mục %s" +msgstr "bỏ qua thư mục %s" -#: src/copy.c:1659 +#: src/copy.c:1664 #, c-format msgid "warning: source file %s specified more than once" -msgstr "cảnh báo : tệp tin nguồn %s được ghi rõ nhiều lần" +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:1707 src/ln.c:246 +#: src/copy.c:1712 src/ln.c:246 #, c-format msgid "%s and %s are the same file" -msgstr "%s và %s là cùng một tệp tin" +msgstr "%s và %s là cùng một tập tin" -#: src/copy.c:1806 +#: src/copy.c:1811 #, c-format msgid "cannot overwrite non-directory %s with directory %s" -msgstr "không ghi chèn được cái không phải thư mục %s bằng thư mục %s" +msgstr "không thể ghi đè %s (không phải thư mục) bằng thư mục %s" -#: src/copy.c:1824 src/ln.c:214 +#: src/copy.c:1829 src/ln.c:214 #, c-format msgid "will not overwrite just-created %s with %s" -msgstr "sẽ không ghi chèn %s vừa mới tạo bằng %s" +msgstr "sẽ không ghi đè %s vừa mới tạo bằng %s" -#: src/copy.c:1842 +#: src/copy.c:1847 #, c-format msgid "cannot overwrite directory %s with non-directory" -msgstr "không ghi chèn được thư mục %s bằng cái không phải thư mục" +msgstr "không thể ghi đè thư mục %s bằng cái không phải thư mục" -#: src/copy.c:1856 +#: src/copy.c:1861 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" -msgstr "không di chuyển được thư mục vào cái không phải thư mục: %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:1886 +#: src/copy.c:1891 #, c-format msgid "backing up %s would destroy source; %s not moved" -msgstr "sao lưu %s sẽ phá hủy nguồn nên không di chuyển %s" +msgstr "sao lưu %s sẽ phá hủy nguồn; không di chuyển %s" -#: src/copy.c:1887 +#: src/copy.c:1892 #, c-format msgid "backing up %s would destroy source; %s not copied" -msgstr "sao lưu %s sẽ phá hủy nguồn nên không sao chép %s" +msgstr "sao lưu %s sẽ phá hủy nguồn; không sao chép %s" -#: src/copy.c:1910 src/ln.c:276 +#: src/copy.c:1915 src/ln.c:276 #, c-format msgid "cannot backup %s" msgstr "không sao lưu được %s" -#: src/copy.c:1974 +#: src/copy.c:1979 #, 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:2051 +#: src/copy.c:2056 #, 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:2068 +#: src/copy.c:2073 #, 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:2118 +#: src/copy.c:2123 #, 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:2161 +#: src/copy.c:2166 #, c-format msgid "cannot move %s to %s" msgstr "không di chuyển được %s vào %s" -#: src/copy.c:2173 +#: src/copy.c:2178 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" -"di chuyển không thành công giữa các thiết bị: %s tới %s; không xóa được đích" +"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:2207 src/install.c:905 src/mkdir.c:189 src/mkfifo.c:114 -#: src/mknod.c:167 +#: 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 "lỗi đặt ngữ cảnh tạo tệp tin mặc định thành %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:2241 +#: src/copy.c:2246 #, 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:2350 +#: src/copy.c:2355 #, 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:2357 +#: src/copy.c:2362 #, 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:2406 src/mkfifo.c:133 +#: src/copy.c:2416 src/mkfifo.c:132 #, c-format msgid "cannot create fifo %s" -msgstr "không tạo được fifo (vào trước, ra trước) %s" +msgstr "không tạo được fifo %s" -#: src/copy.c:2415 +#: src/copy.c:2425 #, c-format msgid "cannot create special file %s" -msgstr "không tạo được tệp tin đặc biệt %s" +msgstr "không tạo được tập tin đặc biệt %s" -#: src/copy.c:2426 src/ls.c:3191 src/stat.c:902 +#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921 #, c-format msgid "cannot read symbolic link %s" msgstr "không đọc được liên kết mềm %s" -#: src/copy.c:2453 +#: src/copy.c:2463 #, c-format msgid "cannot create symbolic link %s" msgstr "không tạo được liên kết mềm %s" -#: src/copy.c:2485 +#: src/copy.c:2495 #, c-format msgid "%s has unknown file type" -msgstr "%s có kiểu tệp tin không rõ" +msgstr "%s có kiểu tập tin chưa lạ" -#: src/copy.c:2629 src/ln.c:358 +#: src/copy.c:2644 src/ln.c:358 #, c-format msgid "cannot un-backup %s" msgstr "không thể hủy sao lưu %s" -#: src/copy.c:2633 +#: src/copy.c:2648 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (hủy sao lưu)\n" -#: src/cp.c:156 src/mv.c:284 +#: src/cp.c:156 src/mv.c:286 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" " or: %s [OPTION]... SOURCE... DIRECTORY\n" " or: %s [OPTION]... -t DIRECTORY SOURCE...\n" msgstr "" -"Sử dụng: %s [TÙY_CHỌN]... [-T] NGUỒN ĐÍCH\n" -" 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" +"Cách dùng: %s [TÙY_CHỌN]... [-T] NGUỒN ĐÍCH\n" +" 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 -msgid "" -"Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" -"\n" +#, fuzzy +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" -#: src/cp.c:166 src/csplit.c:1458 src/cut.c:197 src/df.c:852 src/du.c:268 -#: src/expand.c:112 src/fmt.c:275 src/fold.c:75 src/head.c:115 -#: src/install.c:612 src/kill.c:86 src/ln.c:392 src/ls.c:4726 src/mkdir.c:61 -#: src/mkfifo.c:56 src/mknod.c:58 src/mv.c:294 src/nl.c:191 src/paste.c:445 -#: src/pr.c:2777 src/ptx.c:1825 src/shred.c:153 src/shuf.c:58 src/sort.c:399 -#: src/split.c:211 src/stdbuf.c:95 src/tac.c:142 src/tail.c:268 -#: src/touch.c:226 src/truncate.c:107 src/unexpand.c:122 src/uniq.c:145 -msgid "" -"Mandatory arguments to long options are mandatory for short options too.\n" -msgstr "" -"Mọi đối số bắt buộc phải sử dụng với tùy chọn dài cũng bắt buộc với tùy chọn " -"ngắn.\n" - -#: src/cp.c:169 +#: src/cp.c:168 msgid "" " -a, --archive same as -dR --preserve=all\n" " --attributes-only don't copy the file data, just the " @@ -2136,55 +2132,59 @@ msgid "" "recursive\n" " -d same as --no-dereference --preserve=links\n" msgstr "" -" -a, --archive giống như « -dR --preserve=all »\n" -" --backup[=ĐIỀUKHIỂN] tạo bản sao lưu cho mỗi tệp tin đích đã tồn " +" -a, --archive giống như “-dR --preserve=all”\n" +" --backup[=ĐIỀUKHIỂN] tạo bản sao lưu cho mỗi tập tin đích đã tồn " "tại\n" -" -b giống « --backup » nhưng không chấp nhận đối " +" -b giống “--backup” nhưng không chấp nhận đối " "số\n" -" --copy-contents sao chép nội dung của tệp tin đặc biệt khi đệ " +" --copy-contents sao chép nội dung của tập tin đặc biệt khi đệ " "quy\n" -" -d giống như « --no-dereference --preserve=links " -"»\n" +" -d giống như “--no-dereference --" +"preserve=links”\n" -#: src/cp.c:178 +#: src/cp.c:177 +#, fuzzy msgid "" " -f, --force if an existing destination file cannot be\n" -" opened, remove it and try again (redundant " -"if\n" -" the -n option is used)\n" +" opened, remove it and try again (this " +"option\n" +" is ignored when the -n option is also " +"used)\n" " -i, --interactive prompt before overwrite (overrides a previous " "-n\n" " option)\n" " -H follow command-line symbolic links in SOURCE\n" msgstr "" -" -f, --force nếu không mở được tệp tin đích\n" -" thì xoá nó và thử lại (dư nếu dùng tuỳ chọn " -"« -n »)\n" -" -i, --interactive hỏi lại trước khi ghi chèn\n" -"\t\t\t\t\t(có quyền cao hơn một tuỳ chọn « -n » đặt trước)\n" +" -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" +" -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" " -H đi theo các liên kết mềm của dòng lệnh trong " "NGUỒN\n" -#: src/cp.c:188 +#: src/cp.c:186 msgid "" " -l, --link hard link files instead of copying\n" " -L, --dereference always follow symbolic links in SOURCE\n" msgstr "" -" -l, --link liên kết tệp tin thay vào sao chép\n" +" -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:192 +#: src/cp.c:190 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 không ghi đè lên một tệp tin đã có\n" -"\t\t\t\t\t(có quyền cao hơn một tuỳ chọn « -i » đặt trước)\n" +" -n, --no-clobber không ghi đè lên một tập tin đã có\n" +" (có quyền cao hơn một tùy chọn “-i” đặt " +"trước)\n" " -P, --no-dereference không bao giờ nên theo liên kết mềm trong " "NGUỒN\n" -#: src/cp.c:197 +#: src/cp.c:195 msgid "" " -p same as --preserve=mode,ownership,timestamps\n" " --preserve[=ATTR_LIST] preserve the specified attributes (default:\n" @@ -2193,28 +2193,27 @@ msgid "" "xattr,\n" " all\n" msgstr "" -" -p giống như « --preserve=mode,ownership," -"timestamps »\n" -" --preserve[=DANH_SÁCH_THUỘC_TÍNH] bảo tồn các thuộc tính chỉ ra\n" -" (mặc định:\n" -" • mode chế độ\n" -" • ownership quyền sở hữu\n" -" • timestamps nhãn thời gian)\n" -" nếu có thể, cũng có thuộc tính:\n" -"\t\t\t\t\t • context\tngữ cảnh\n" -"\t\t\t\t\t • links\tcác liên kết\n" -"\t\t\t\t\t • xattr\n" -"\t\t\t\t\t • all\ttất cả\n" - -#: src/cp.c:205 +" -p giống như “--preserve=mode,ownership, " +"timestamps”\n" +" --preserve[=DS_T.TÍNH] bảo tồn các thuộc tính chỉ ra (mặc định:\n" +" * mode chế độ\n" +" * ownership quyền sở hữu\n" +" * timestamps dấu vết thời gian)\n" +" cũng có thể có các thuộc tính mở rộng:\n" +" * context ngữ cảnh\n" +" * links các liên kết\n" +" * xattr\n" +" * all tất cả\n" + +#: src/cp.c:203 msgid "" " --no-preserve=ATTR_LIST don't preserve the specified attributes\n" " --parents use full source file name under DIRECTORY\n" 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" +" --parents dùng tên tập tin nguồn đầy đủ dưới THƯ_MỤC\n" -#: src/cp.c:209 +#: src/cp.c:207 msgid "" " -R, -r, --recursive copy directories recursively\n" " --reflink[=WHEN] control clone/CoW copies. See below\n" @@ -2223,23 +2222,25 @@ msgid "" "force)\n" msgstr "" " -R, -r, --recursive sao chép đệ quy các thư mục\n" -" --reflink[=KHI_NÀO]\tđiều khiển việc sao chép clone/CoW. Xem dưới.\n" -" --remove-destination gỡ bỏ mỗi tệp tin đích đến đã có\n" -" trước khi thử mở nó (khác với « --force »)\n" +" --reflink[=KHI_NÀO] điều khiển việc sao chép clone/CoW. Xem " +"dưới.\n" +" --remove-destination gỡ bỏ mỗi tập tin đích đến đã có\n" +" trước khi thử mở nó (tương phản với “--" +"force”)\n" -#: src/cp.c:215 +#: src/cp.c:213 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=KHI_NÀO điều khiển việc tạo tệp tin sparse. Xem " +" --sparse=KHI_NÀO điều khiển việc tạo tập tin sparse. Xem " "dưới.\n" -" --strip-trailing-slashes \t\tgỡ bỏ mọi dấu xuyệc đi theo khỏi mỗi đối " -"số NGUỒN\n" +" --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:220 +#: src/cp.c:218 msgid "" " -s, --symbolic-link make symbolic links instead of copying\n" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -2250,9 +2251,9 @@ msgstr "" " -s, --symbolic-link tạo liên kết mềm thay cho việc sao chép\n" " -S, --suffix=HẬU_TỐ thay cho hậu tố thường dùng để sao lưu\n" " -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" +" -T, --no-target-directory coi ĐÍCH là một tập tin thông thường\n" -#: src/cp.c:226 +#: src/cp.c:224 msgid "" " -u, --update copy only when the SOURCE file is newer\n" " than the destination file or when the\n" @@ -2260,13 +2261,13 @@ msgid "" " -v, --verbose explain what is being done\n" " -x, --one-file-system stay on this file system\n" msgstr "" -" -u, --update chỉ sao chép nếu tệp tin NGUỒN mới hơn\n" -" tệp tin đích đến hoặc khi thiếu tệp tin " -"đích đến\n" +" -u, --update chỉ sao chép nếu tập tin NGUỒN mới hơn\n" +" tập tin đích đến hoặc khi thiếu tập tin\n" +" đích đến\n" " -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" +" -x, --one-file-system chỉ thực hiện trên hệ thống tập tin này\n" -#: src/cp.c:235 +#: src/cp.c:233 msgid "" "\n" "By default, sparse SOURCE files are detected by a crude heuristic and the\n" @@ -2282,20 +2283,20 @@ msgid "" "fails, or if --reflink=auto is specified, fall back to a standard copy.\n" msgstr "" "\n" -"Mặc định là tệp tin NGUỒN sparse nhận ra thô sơ và tệp tin ĐÍCH tương ứng\n" -"cũng được sparse. Tính năng này lựa chọn bởi « --sparse=auto ». Hãy chỉ ra\n" -"« --sparse=always » để tạo một tệp tin ĐÍCH sparse kể cả khi tệp tin NGUỒN\n" +"Mặc định là tập tin NGUỒN sparse nhận ra thô sơ và tập tin ĐÍCH tương ứng\n" +"cũng được sparse. Tính năng này lựa chọn bởi “--sparse=auto”. Hãy chỉ ra\n" +"”--sparse=always” để tạo một tập tin ĐÍCH sparse kể cả khi tập tin NGUỒN\n" "chứa một chuỗi byte số không đủ dài.\n" -"Hãy dùng « --sparse=never » để ngăn chặn việc tạo các tệp tin sparse.\n" +"Hãy dùng “--sparse=never” để ngăn chặn việc tạo các tập tin sparse.\n" "\n" -"Khi « --reflink[=always] » được chỉ ra, hãy chạy một thao tác sao chép nhẹ " +"Khi “--reflink[=always]” được chỉ ra, hãy chạy một thao tác sao chép nhẹ " "nhàng,\n" "trong đó mỗi khối dữ liệu được sao chép chỉ nếu bị sửa đổi. Không thể làm " "như thế,\n" -"không sao chép được hay « --reflink=auto » được chỉ ra thì phục hồi việc sao " +"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:247 src/install.c:649 src/ln.c:421 src/mv.c:321 +#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322 msgid "" "\n" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -2305,26 +2306,26 @@ msgid "" "\n" msgstr "" "\n" -"Hậu tố sao lưu là « ~ », trừ khi đặt với « --suffix » hoặc " +"Hậu tố sao lưu là “~”, trừ khi đặt với “--suffix” hoặc " "SIMPLE_BACKUP_SUFFIX.\n" -"Phương pháp điều khiển phiên bản có thể chọn qua tùy chọn « --backup »\n" +"Phương pháp điều khiển phiên bản có thể chọn qua tùy chọn “--backup”\n" "hoặc qua biến môi trường VERSION_CONTROL. Có những giá trị sau:\n" "\n" -#: src/cp.c:254 src/install.c:656 src/mv.c:328 +#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329 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 không bao giờ tạo bản sao lưu (dù đưa ra « --backup »)\n" +" none, off không bao giờ tạo bản sao lưu (dù đưa ra “--backup”)\n" " numbered, t tạo các bản sao lưu đã đánh số\n" " existing, nil đánh số nếu có bản sao lưu đánh số, nếu không thì đơn " "giản\n" " simple, never luôn luôn tạo sao lưu đơn giản\n" -#: src/cp.c:260 +#: src/cp.c:258 msgid "" "\n" "As a special case, cp makes a backup of SOURCE when the force and backup\n" @@ -2334,238 +2335,235 @@ msgstr "" "\n" "Như một trường hợp đặc biệt, cp tạo bản sao lưu của NGUỒN\n" "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" +"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:319 +#: src/cp.c:317 #, c-format msgid "failed to preserve times for %s" -msgstr "giữ các thời gian cho %s không thành công" +msgstr "gặp lỗi khi bảo tồn các thời gian cho %s" -#: src/cp.c:350 +#: src/cp.c:348 #, c-format msgid "failed to preserve permissions for %s" -msgstr "giữ quyền hạn cho %s không thành công" +msgstr "gặp lỗi bảo tồn quyền hạn cho %s" -#: src/cp.c:477 +#: src/cp.c:475 #, c-format msgid "cannot make directory %s" msgstr "không tạo được thư mục %s" -#: src/cp.c:526 src/cp.c:545 +#: src/cp.c:524 src/cp.c:543 #, c-format msgid "%s exists but is not a directory" -msgstr "%s tồn tại nhưng không phải là một thư mục" +msgstr "%s có nhưng không phải là thư mục" -#: src/cp.c:572 src/cp.c:1068 src/install.c:401 src/install.c:844 src/ln.c:123 -#: src/ln.c:181 src/ln.c:202 src/ln.c:516 src/mv.c:152 src/mv.c:399 -#, c-format -msgid "accessing %s" -msgstr "đang truy cập %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 +#, fuzzy, c-format +msgid "failed to access %s" +msgstr "gặp lỗi khi mở %s" -#: src/cp.c:592 src/install.c:914 src/ln.c:546 src/mv.c:432 src/shred.c:1182 -#: src/touch.c:433 src/truncate.c:356 +#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181 +#: src/touch.c:429 src/truncate.c:354 #, c-format msgid "missing file operand" -msgstr "thiếu toán hạng tệp tin" +msgstr "thiếu toán hạng tập tin" -#: src/cp.c:594 src/install.c:916 src/ln.c:560 src/mv.c:434 +#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436 #, c-format msgid "missing destination file operand after %s" -msgstr "thiếu toán hạng tệp tin đích đến ở sau %s" +msgstr "thiếu toán hạng tập tin đích đến sau %s" -#: src/cp.c:603 src/install.c:925 src/mv.c:443 +#: src/cp.c:601 src/install.c:926 src/mv.c:445 #, c-format msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)" msgstr "" -"Không kết hợp được hai tùy chọn « --target-directory » (-t) và « --no-target-" -"directory » (-T) [loại từ lẫn nhau !]" +"không thể kết hợp --target-directory (-t) và --no-target-directory (-T)" -#: src/cp.c:619 src/cp.c:1070 src/install.c:403 src/install.c:846 -#: src/install.c:938 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:401 -#: src/mv.c:457 +#: 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 #, 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:730 +#: src/cp.c:728 #, c-format msgid "with --parents, the destination must be a directory" -msgstr "đặt tùy chọn « --parents » thì đích đến phải là một thư mục" +msgstr "khi dùng tùy chọn “--parents” thì đích đến phải là thư mục" -#: src/cp.c:1063 src/install.c:839 src/ln.c:511 src/mv.c:394 +#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395 #, c-format msgid "multiple target directories specified" -msgstr "đã chỉ ra nhiều thư mục đích đến" +msgstr "đã chỉ ra nhiều hơn một thư mục đích" -#: src/cp.c:1108 +#: src/cp.c:1110 #, c-format msgid "cannot make both hard and symbolic links" -msgstr "không tạo được đồng thời liên kết mềm và cứng" +msgstr "không thể tạo được đồng thời liên kết mềm và cứng" -#: src/cp.c:1115 src/mv.c:464 +#: src/cp.c:1117 src/mv.c:466 #, 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" +msgstr "hai tùy chọn “-backup” và “-no-clobber” loại từ lẫn nhau" -#: src/cp.c:1121 +#: src/cp.c:1123 #, c-format msgid "--reflink can be used only with --sparse=auto" -msgstr "« --reflink » chỉ dùng được với « --sparse=auto »" +msgstr "--reflink chỉ có thể dùng với --sparse=auto" -#: src/cp.c:1129 src/install.c:899 src/ln.c:582 src/mv.c:472 +#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474 msgid "backup type" msgstr "kiểu sao lưu" -#: src/cp.c:1154 +#: src/cp.c:1156 #, 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 khi với hạt nhân không hiệu lực SELinux." +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:1160 +#: src/cp.c:1162 #, c-format msgid "cannot preserve extended attributes, cp is built without xattr support" msgstr "" -"không thể bảo tồn các thuộc tính mở rộng, cp được xây dựng mà không hỗ trợ " -"xattr" +"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 msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:529 +#: src/csplit.c:531 #, c-format msgid "input disappeared" msgstr "đầu vào đã biến mất" -#: src/csplit.c:658 src/csplit.c:669 +#: src/csplit.c:660 src/csplit.c:671 #, c-format msgid "%s: line number out of range" -msgstr "%s: số thứ tự dòng vượt quá giới hạn" +msgstr "%s: số dòng vượt quá giới hạn" -#: src/csplit.c:698 +#: src/csplit.c:700 #, c-format msgid "%s: %s: line number out of range" -msgstr "%s: %s: số thứ tự dòng vượt quá giới hạn" +msgstr "%s: %s: số dòng vượt quá giới hạn" -#: src/csplit.c:701 src/csplit.c:750 +#: src/csplit.c:703 src/csplit.c:752 #, c-format msgid " on repetition %s\n" msgstr " khi lặp lại %s\n" -#: src/csplit.c:744 +#: src/csplit.c:746 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: không tìm thấy" -#: src/csplit.c:808 src/csplit.c:848 src/nl.c:359 src/tac.c:274 +#: src/csplit.c:810 src/csplit.c:850 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:981 +#: src/csplit.c:983 #, c-format msgid "write error for %s" -msgstr "lỗi ghi nhớ cho %s" +msgstr "lỗi ghi cho %s" -#: src/csplit.c:1057 +#: src/csplit.c:1059 #, c-format msgid "%s: integer expected after delimiter" -msgstr "%s: chờ đợi một số nguyên sau dấu phân cách" +msgstr "%s: cần số nguyên sau dấu phân cách" -#: src/csplit.c:1073 +#: src/csplit.c:1075 #, c-format msgid "%s: '}' is required in repeat count" -msgstr "%s: yêu cầu « } » trong số đếm lặp lại" +msgstr "%s: cần “}” trong số lượng lặp lại" -#: src/csplit.c:1083 +#: src/csplit.c:1085 #, c-format msgid "%s}: integer required between '{' and '}'" -msgstr "%s}: yêu cầu số nguyên giữa ngoặc « { » và « } »" +msgstr "%s}: cần số nguyên giữa “{” và “}”" -#: src/csplit.c:1110 +#: src/csplit.c:1112 #, c-format msgid "%s: closing delimiter '%c' missing" -msgstr "%s: thiếu dấu phân cách đóng « %c »" +msgstr "%s: thiếu dấu phân cách đóng “%c”" -#: src/csplit.c:1127 +#: src/csplit.c:1129 #, 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:1160 +#: src/csplit.c:1162 #, c-format msgid "%s: invalid pattern" msgstr "%s: mẫu sai" -#: src/csplit.c:1163 +#: src/csplit.c:1165 #, c-format msgid "%s: line number must be greater than zero" -msgstr "%s: số thứ tự dòng phải lớn hơn số không" +msgstr "%s: số thứ tự dòng phải lớn hơn không" -#: src/csplit.c:1169 +#: src/csplit.c:1171 #, 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" +msgstr "số thứ tự dòng %s nhỏ hơn số thứ tự dòng đứng trước, %s" -#: src/csplit.c:1175 +#: src/csplit.c:1177 #, 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" +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:1253 +#: src/csplit.c:1255 #, c-format msgid "missing conversion specifier in suffix" msgstr "hậu tố thiếu sự xác định chuyển đổi" -#: src/csplit.c:1259 +#: src/csplit.c:1261 #, 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:1262 +#: src/csplit.c:1264 #, 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:1267 +#: src/csplit.c:1269 #, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "Cờ sai trong chỉ định hoán đổi: %%%c%c" -#: src/csplit.c:1284 +#: src/csplit.c:1286 #, 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:1298 +#: src/csplit.c:1300 #, c-format msgid "missing %% conversion specification in suffix" msgstr "hậu tố thiếu sự xác định chuyển đổi %%" -#: src/csplit.c:1345 +#: src/csplit.c:1347 #, c-format msgid "%s: invalid number" msgstr "%s: số sai" -#: src/csplit.c:1449 +#: src/csplit.c:1451 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" -msgstr "Sử dụng: %s [TÙY_CHỌN]... TẬP_TIN MẪU...\n" +msgstr "Cách dùng: %s [TÙY_CHỌN]... TẬP_TIN MẪU...\n" -#: src/csplit.c:1453 +#: src/csplit.c:1455 +#, 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" -"\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 " -"`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" +"“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:1461 +#: src/csplit.c:1462 #, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2573,28 +2571,28 @@ msgid "" " -k, --keep-files do not remove output files on errors\n" msgstr "" " -b, --suffix-format=ĐỊNH_DẠNG dùng sprintf ĐỊNH_DẠNG thay cho %02d\n" -" -f, --prefix=TIỀN_TỐ dùng TIỀN_TỐ thay cho « xx »\n" +" -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:1466 +#: src/csplit.c:1467 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=CHỮ_SỐ dùng số chữ số CHỮ_SỐ thay cho 2\n" -" -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" +" -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:1473 +#: src/csplit.c:1474 msgid "" "\n" "Read standard input if FILE is -. Each PATTERN may be:\n" msgstr "" "\n" -"Đọc đầu vào tiêu chuẩn nếu TẬP_TIN là « - » Mỗi MẪU có thể là:\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:1477 +#: src/csplit.c:1478 msgid "" "\n" " INTEGER copy up to but not including specified line number\n" @@ -2606,51 +2604,51 @@ msgid "" "A line OFFSET is a required '+' or '-' followed by a positive integer.\n" msgstr "" "\n" -" SỐ_NGUYÊN sao chép đến (nhưng không chứa) số thứ tự dòng đã chỉ ra\n" -" /BTCQ/[HIỆU] sao chép đến (nhưng không chứa) một dòng tương ứng\n" -" %BTCQ%[HIỆU] nhảy tới (nhưng không chứa) một dòng tương ứng\n" -" {SỐ_NGUYÊN} lặp lại mẫu trước với số lần đã chỉ ra\n" -" {*} lặp lại mẫu trước càng nhiều lần càng tốt\n" +" SỐ_NGUYÊN sao chép đến (nhưng không chứa) số thứ tự dòng đã chỉ " +"ra\n" +" /BTCQ/[HIỆU] sao chép đến (nhưng không chứa) một dòng tương ứng\n" +" %BTCQ%[HIỆU] nhảy tới (nhưng không chứa) một dòng tương ứng\n" +" {SỐ_NGUYÊN} lặp lại mẫu trước với số lần đã chỉ ra\n" +" {*} lặp lại mẫu trước càng nhiều lần càng tốt\n" "\n" "BTCQ: biểu thức chính quy\n" "\n" -"HIỆU dòng phải là dấu cộng « + » hay dấu trừ « - » với một số nguyên dương " -"theo sau.\n" +"HIỆU dòng phải là dấu cộng “+” hay dấu trừ “-” với một số nguyên dương theo " +"sau.\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: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 #, c-format msgid "Usage: %s OPTION... [FILE]...\n" -msgstr "Sử dụng: %s TÙY_CHỌN... [TẬP_TIN]...\n" +msgstr "Cách dùng: %s TÙY_CHỌN... [TẬP_TIN]...\n" #: src/cut.c:193 -msgid "" -"Print selected parts of lines from each FILE to standard output.\n" -"\n" +#, fuzzy +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" -#: src/cut.c:200 +#: src/cut.c:199 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=DANH_SÁCH chỉ chọn những byte này\n" +" -b, --bytes=DANH_SÁCH chỉ chọn những byte này\n" " -c, --characters=DANH_SÁCH chỉ chọn những ký tự này\n" " -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:205 +#: src/cut.c:204 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2659,10 +2657,10 @@ msgid "" msgstr "" " -f, --fields=DANH_SÁCH chỉ chọn những trường này, đồng thời in mọi\n" " dòng không có ký tự phân cách, trừ khi đưa\n" -" ra tùy chọn « -s »\n" -" -n (bị lờ đi)\n" +" ra tùy chọn “-s”\n" +" -n (bị bỏ qua)\n" -#: src/cut.c:211 +#: src/cut.c:210 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" @@ -2670,7 +2668,7 @@ msgstr "" " --complement bổ sung tập hợp các byte, ký tự hoặc trường đã " "chọn\n" -#: src/cut.c:215 +#: src/cut.c:214 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2681,7 +2679,7 @@ msgstr "" " kết quả in ra. Mặc định là ký tự phân cách đầu " "vào.\n" -#: src/cut.c:222 +#: src/cut.c:221 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2689,12 +2687,12 @@ msgid "" "in the same order that it is read, and is written exactly once.\n" msgstr "" "\n" -"Dùng chỉ một của những tùy chọn « -b », « -c » và « -f ».\n" +"Dùng chỉ một của những tùy chọn “-b”, “-c” và “-f”.\n" "Mỗi DANH_SÁCH chứa một phạm vi, hoặc nhiều phạm vi định giới\n" "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:228 +#: src/cut.c:227 msgid "" "Each range is one of:\n" "\n" @@ -2712,47 +2710,49 @@ msgstr "" " N-M Từ byte, ký tự hoặc trường thứ N đến M (tính cả M)\n" " -M Từ byte, ký tự hoặc trường đầu tiên đến thứ M (tính cả M)\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" +"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:368 src/cut.c:489 -msgid "invalid byte or field list" +#: src/cut.c:367 src/cut.c:493 +#, fuzzy +msgid "invalid byte, character or field list" msgstr "sai danh sách byte hoặc trường" -#: src/cut.c:385 +#: src/cut.c:387 msgid "invalid range with no endpoint: -" msgstr "phạm vi sai không có điểm cuối: -" -#: src/cut.c:399 +#: src/cut.c:403 msgid "invalid decreasing range" msgstr "phạm vi giảm dần sai" -#: src/cut.c:478 +#: src/cut.c:482 #, c-format msgid "byte offset %s is too large" -msgstr "hiệu byte %s là quá lớn" +msgstr "offset theo byte %s là quá lớn" -#: src/cut.c:481 +#: src/cut.c:485 #, c-format msgid "field number %s is too large" msgstr "số trường %s là quá lớn" -#: src/cut.c:789 src/cut.c:797 +#: src/cut.c:795 src/cut.c:803 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:806 +#: src/cut.c:812 src/numfmt.c:1408 +#, 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:841 +#: src/cut.c:847 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:844 +#: src/cut.c:850 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:848 +#: src/cut.c:854 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2760,11 +2760,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:864 +#: src/cut.c:870 msgid "missing list of fields" msgstr "thiếu danh sách các trường" -#: src/cut.c:866 +#: src/cut.c:872 msgid "missing list of positions" msgstr "thiếu danh sách các vị trí" @@ -2774,28 +2774,19 @@ msgid "" "Usage: %s [OPTION]... [+FORMAT]\n" " or: %s [-u|--utc|--universal] [MMDDhhmm[[CC]YY][.ss]]\n" msgstr "" -"Sử dụng: %s [TÙY_CHỌN]... [+ĐỊNH_DẠNG]\n" -" hoặc: %s [-u|--utc|--universal] [MMDDhhmm[[CC]YY][.ss]]\n" -"\n" -" • u, utc, universal thời gian thế giới (v.d. 18:22+0930)\n" -" • C viết tắt \"century\": thế kỷ\n" -" • Y viết tắt \"year\": năm\n" -" • M viết tắt \"month\": tháng\n" -" • D viết tắt \"day\": ngày\n" -" • h viết tắt \"hour\": giờ\n" -" • m viết tắt \"minute\": phút\n" -" • s viết tắt \"second\": giây\n" -"Hai ký tự thì hai chữ số, v.d. « MM » cho Tháng Ba là « 03 ».\n" -"Lời thí dụ đầy đủ :\n" -"Lúc sáu giờ hai mươi bảy phút mười ba giây vào ngày chín, tháng Tư, năm " -"2007:\n" -"[04090627[[20]07][.13]]\n" +"Cách dùng: %s [TÙY_CHỌN]... [+ĐỊNH_DẠNG]\n" +" hoặc: %s [-u|--utc|--universal] [MMDDhhmm[[CC]YY][.ss]]\n" "\n" +"C là viết tắt của thế kỷ, Y năm, M tháng, D ngày, h giờ, m phút và s\n" +"giây.\n" #: src/date.c:128 +msgid "Display the current time in the given FORMAT, or set the system date.\n" +msgstr "" + +#: src/date.c:134 +#, 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" " -I[TIMESPEC], --iso-8601[=TIMESPEC] output date/time in ISO 8601 format.\n" @@ -2807,15 +2798,15 @@ msgstr "" "thống.\n" "\n" " -d, --date=STRING hiển thị thời gian theo STRING, không phải " -"`now'\n" +"“now”\n" " -f, --file=DATEFILE giống --date một lần cho mỗi dòng của DATEFILE\n" " -I[TIMESPEC], --iso-8601[=TIMESPEC] đưa ra ngày/giờ ở dạng ISO 8601.\n" -" TIMESPEC=`date' chỉ cho ngày (mặc định),\n" -" `hours', `minutes', `seconds', hoặc `ns' cho " +" 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" -#: src/date.c:138 +#: src/date.c:142 msgid "" " -r, --reference=FILE display the last modification time of FILE\n" " -R, --rfc-2822 output date and time in RFC 2822 format.\n" @@ -2823,9 +2814,9 @@ msgid "" msgstr "" " -r, --reference=TẬP_TIN hiển thị lần sửa cuối cùng của TẬP_TIN\n" " -R, --rfc-2822 đưa ra ngày tháng dạng tương thích RFC 2822\n" -" Thí dụ : T2, 07 Th8 2006 12:34:56 -0600\n" +" Thí dụ: T2, 07 Th8 2006 12:34:56 -0600\n" -#: src/date.c:143 +#: src/date.c:147 msgid "" " --rfc-3339=TIMESPEC output date and time in RFC 3339 format.\n" " TIMESPEC='date', 'seconds', or 'ns' for\n" @@ -2836,16 +2827,15 @@ msgid "" " -u, --utc, --universal print or set Coordinated Universal Time\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Ờ yêu cầu mức chính xác:\n" -" • date ngày tháng\n" -" • seconds giây\n" -" • ns nanô-giây\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" +" 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" -#: src/date.c:154 +#: src/date.c:158 msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" @@ -2859,7 +2849,7 @@ msgstr "" " %% một chữ cái %\n" " %a tên viết tắt của ngày trong tuần của miền địa phương (Th 3..CN)\n" -#: src/date.c:161 +#: src/date.c:165 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2874,7 +2864,7 @@ msgstr "" " %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" -#: src/date.c:167 +#: src/date.c:171 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2887,7 +2877,7 @@ msgstr "" " %e ngày của tháng, để trống thay cho việc dùng 0 ( 1..31), giống như " "%_d\n" -#: src/date.c:173 +#: src/date.c:177 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -2897,7 +2887,7 @@ msgstr "" " %g hai chữ số cuối cùng của năm của số thứ tự tuần ISO (xem %G)\n" " %G năm của số thứ tự tuần ISO (xem %V); thường chỉ có ích cùng với %V\n" -#: src/date.c:178 +#: src/date.c:182 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2909,19 +2899,19 @@ msgstr "" " %I giờ (01..12)\n" " %j ngày của năm (001..366)\n" -#: src/date.c:184 +#: src/date.c:188 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" " %m month (01..12)\n" " %M minute (00..59)\n" msgstr "" -" %k giờ , có khoảng trống, tương tự như %_H\n" -" %l giờ , có khoảng trống, tương tự như %_H\n" +" %k giờ, có khoảng trống, tương tự như %_H\n" +" %l giờ, có khoảng trống, tương tự như %_H\n" " %m tháng (01..12)\n" " %M phút (00..59)\n" -#: src/date.c:190 +#: src/date.c:194 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2940,7 +2930,7 @@ msgstr "" " %R thời gian, tính theo 24 giờ (giống như %H:%M)\n" " %s số giây kể từ 1970-01-01 00:00:00 UTC (một sự mở rộng GNU)\n" -#: src/date.c:199 +#: src/date.c:203 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2952,7 +2942,7 @@ msgstr "" " %T thời gian (giống như %H:%M:%S)\n" " %u ngày của tuần (1..7); 1 tương ứng với Thứ Hai\n" -#: src/date.c:205 +#: src/date.c:209 msgid "" " %U week number of year, with Sunday as first day of week (00..53)\n" " %V ISO week number, with Monday as first day of week (01..53)\n" @@ -2964,7 +2954,7 @@ msgstr "" " %w ngày trong tuần (0..6); 0 là Chủ Nhật\n" " %W số thứ tự của tuần trong năm với Thứ Hai là ngày đầu tuần (00..53)\n" -#: src/date.c:211 +#: src/date.c:215 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -2976,7 +2966,7 @@ msgstr "" " %y hai chữ số cuối cùng của năm (00..99)\n" " %Y năm (v.d. 2007)\n" -#: src/date.c:217 +#: src/date.c:221 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -2987,16 +2977,16 @@ msgid "" "\n" "By default, date pads numeric fields with zeroes.\n" msgstr "" -" %z +hhmm mũi giờ thuộc số (v.d., -0400)\n" -" %:z +hh:mm mũi giờ thuộc số (v.d., -04:00)\n" -" %::z +hh:mm:ss mũi giờ thuộc số (v.d., -04:00:00)\n" -" %:::z mũi giờ thuộc số có « : » đến mức chính xác đã yêu cầu (v.d., -04, " +" %z +hhmm múi giờ dạng số (v.d., -0400)\n" +" %:z +hh:mm múi giờ dạng số (v.d., -04:00)\n" +" %::z +hh:mm:ss múi giờ dạng số (v.d., -04:00:00)\n" +" %:::z múi giờ dạng số có “:” đến mức chính xác đã yêu cầu (v.d., -04, " "+05:30)\n" -" %Z viết tắt mũi giờ theo abc (v.d., EDT, CST)\n" +" %Z viết tắt múi giờ theo kiểu bảng chữ cái (v.d., EDT, CST)\n" "\n" -"Mặc định là ngày tháng đệm trường số bằng số không (0).\n" +"Mặc định là lệnh ngày tháng đệm trường số bằng số không (0).\n" -#: src/date.c:226 +#: src/date.c:230 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -3006,15 +2996,15 @@ msgid "" " ^ use upper case if possible\n" " # use opposite case if possible\n" msgstr "" -"Theo sau « % » có thể đặt những tuỳ chọn cờ sau:\n" +"Theo sau “%” có thể đặt những tùy chọn cờ sau:\n" "\n" -" - (dấu gạch nối) đừng đệm trường\n" +" - (dấu gạch nối) không đệm trường\n" " _ (dấu gạch dưới) đệm trường bằng dấu cách\n" " 0 (số không) đệm trường bằng số không\n" " ^ in ra chữ hoa nếu có thể\n" " # in ra chữ đối diện nếu có thể\n" -#: src/date.c:235 +#: src/date.c:239 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -3025,11 +3015,11 @@ msgstr "" "\n" "Sau mỗi cờ cũng có thể đặt bề rộng trường (theo số thập phân);\n" "rồi (cũng tùy chọn) sự sửa đổi, hoặc:\n" -"E để dùng các sự đại diện xen kẽ của miền địa phương (néu có)\n" +"E để dùng các sự đại diện xen kẽ của miền địa phương (nếu có)\n" "hoặc\n" -"O để dùng các ký hiệu thuộc số xen kẽ của miền địa phương (néu có)\n" +"O để dùng các ký hiệu thuộc số xen kẽ của miền địa phương (nếu có)\n" -#: src/date.c:242 +#: src/date.c:246 msgid "" "\n" "Examples:\n" @@ -3045,79 +3035,79 @@ msgstr "" "\n" "Ví dụ:\n" "Chuyển giây từ epoch (1970-01-01 UTC) thành ngày\n" -" $ date --date='@2147483647'\n" +" $ date --date=\"@2147483647\"\n" "\n" "Hiển thị thời gian bờ tây nước Mỹ (dùng tzselect(1) để tìm TZ)\n" -" $ TZ='America/Los_Angeles' date\n" +" $ TZ=\"America/Los_Angeles\" date\n" "\n" "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" +" $ date --date=\"TZ=\"America/Los_Angeles\" 09:00 next Fri”\n" -#: src/date.c:275 src/dd.c:2193 src/head.c:838 src/md5sum.c:477 -#: src/md5sum.c:798 src/od.c:863 src/od.c:1914 src/pr.c:1176 src/pr.c:1372 -#: src/pr.c:1494 src/stty.c:842 src/tac.c:563 src/tail.c:343 src/tee.c:126 +#: 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 #, c-format msgid "standard input" -msgstr "đầu vào tiêu chuẩn" +msgstr "đầu vào chuẩn" -#: src/date.c:303 src/date.c:523 +#: src/date.c:307 src/date.c:527 #, c-format msgid "invalid date %s" -msgstr "ngày sai %s'" +msgstr "ngày sai %s”" -#: src/date.c:414 src/date.c:448 +#: src/date.c:418 src/date.c:452 #, c-format msgid "multiple output formats specified" msgstr "đã chỉ ra nhiều định dạng kết quả" -#: src/date.c:426 +#: src/date.c:430 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "những tùy chọn chỉ ra ngày để hiển thị loại trừ lẫn nhau" -#: src/date.c:433 +#: src/date.c:437 #, c-format msgid "the options to print and set the time may not be used together" msgstr "những tùy chọn để in ra và đặt thời gian không sử dụng được cùng nhau" -#: src/date.c:454 +#: src/date.c:458 #, 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 "" -"đối số %s thiếu dấu cộng « + » ở đầu;\n" +"đối số %s thiếu dấu cộng “+” ở đầu;\n" "khi sử dụng một tùy chọn để chỉ ra (các) ngày tháng,\n" "mỗi đối số không tùy chọn phải là một chuỗi bắt đầu với dấu cộng" -#: src/date.c:531 +#: src/date.c:535 #, c-format msgid "cannot set date" msgstr "không đặt được ngày" -#: src/date.c:554 src/du.c:360 +#: src/date.c:558 src/du.c:371 #, c-format msgid "time %s is out of range" msgstr "thời gian %s vượt ra ngoài giới hạn" #. This is a proper name. See the gettext manual, section Names. -#: src/dd.c:44 src/factor.c:43 src/rm.c:41 src/tail.c:69 src/touch.c:41 +#: 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 "Paul Rubin" -#: src/dd.c:517 +#: src/dd.c:521 #, c-format msgid "" "Usage: %s [OPERAND]...\n" " or: %s OPTION\n" msgstr "" -"Sử dụng: %s [TOÁN_HẠNG]...\n" -" hoặc: %s TÙY_CHỌN\n" +"Cách dùng: %s [TOÁN_HẠNG]...\n" +" hoặc: %s TÙY_CHỌN\n" -#: src/dd.c:522 +#: src/dd.c:526 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -3127,16 +3117,16 @@ msgid "" " count=N copy only N input blocks\n" " ibs=BYTES read up to BYTES bytes at a time (default: 512)\n" msgstr "" -"Sao chép tệp tin, chuyển đổi và định dạng theo các toán hạng.\n" +"Sao chép tập tin, chuyển đổi và định dạng theo các toán hạng.\n" "\n" " bs=BYTES đọc và ghi BYTES byte mỗi lần\n" " cbs=BYTES chuyển đổi BYTES byte mỗi lần\n" -" conv=CONVS chuyển đổi tệp tin tùy theo danh sách các ký hiệu, phân " -"cách nhau bởi dấu phẩy\n" -" count=SỐ chỉ sao chép SỐ khối đầu vào\n" +" conv=CONVS chuyển đổi tập tin tùy theo danh sách các ký hiệu,\n" +" phân cách nhau bởi dấu phẩy\n" +" 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:531 +#: src/dd.c:535 msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -3145,7 +3135,8 @@ msgid "" " oflag=FLAGS write as per the comma separated symbol list\n" " seek=N skip N obs-sized blocks at start of output\n" " skip=N skip N ibs-sized blocks at start of input\n" -" status=noxfer suppress transfer statistics\n" +" status=WHICH WHICH info to suppress outputting to stderr;\n" +" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" msgstr "" " if=TẬP_TIN đọc từ TẬP_TIN thay cho đầu vào tiêu chuẩn\n" " iflag=CỜ đọc tùy theo danh sách các ký hiệu phân cách bởi dấu phẩy\n" @@ -3154,12 +3145,13 @@ msgstr "" " oflag=CỜ ghi tùy theo danh sách các ký hiệu phân cách bởi dấu phẩy\n" " 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=noxfer bỏ đi thông kê truyền tải\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" -#: src/dd.c:541 +#: src/dd.c:546 msgid "" "\n" -"BLOCKS and BYTES may be followed by the following multiplicative suffixes:\n" +"N and BYTES may be followed by the following multiplicative suffixes:\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, and so on for T, P, E, Z, Y.\n" "\n" @@ -3167,22 +3159,23 @@ msgid "" "\n" msgstr "" "\n" -"Theo sau KHỐI và BYTES có thể đặt các hậu tố nhân sau :\n" -"c \t1\n" -"w\t2\n" -"b \t512\n" -"kB\t1000\n" -"K\t1024\n" -"MB\t1000*1000\n" -"M\t1024*1024\n" -"GB\t1000*1000*1000\n" -"G\t1024*1024*1024\n" +"N và BYTES có thể được theo sau bởi các đơn vị sau:\n" +"c=1\n" +"w=2\n" +"b=512\n" +"kB=1000\n" +"K=1024\n" +"MB=1000*1000\n" +"M=1024*1024,\n" +"xM =M\n" +"GB=1000*1000*1000\n" +"G=1024*1024*1024\n" "và tương tự với T, P, E, Z, Y.\n" "\n" "Mỗi ký hiệu CONV có thể là:\n" "\n" -#: src/dd.c:550 +#: src/dd.c:555 msgid "" " ascii from EBCDIC to ASCII\n" " ebcdic from ASCII to EBCDIC\n" @@ -3202,15 +3195,15 @@ msgstr "" " block thêm mục ghi dừng dòng mới với khoảng trắng đến kích cỡ cbs\n" " unblock thay thế khoảng trắng theo sau trong mục ghi kích cỡ cbs bằng " "dòng mới\n" -" lcase thay đổi chữ hoa thành chữ thường\n" -" ucase thay đổi chữ thường thành chữ hoa\n" +" lcase thay đổi chữ HOA thành chữ thường\n" +" ucase thay đổi chữ thường thành chữ HOA\n" " sparse thử thay đổi vị trí thay vì ghi kết xuất cho khối đầu vào NUL\n" " swab trao đổi mọi cặp byte đưa vào\n" " sync thêm mọi khối đầu vào với NUL đến kích thước ibs; khi\n" -" sử dụng với block hoặc unblock, thêm bằng khoảng trắng thay vì " +" sử dụng với block hoặc unblock, thêm bằng khoảng trắng thay vì " "NUL\n" -#: src/dd.c:563 +#: src/dd.c:568 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3219,14 +3212,14 @@ msgid "" " fdatasync physically write output file data before finishing\n" " fsync likewise, but also write metadata\n" msgstr "" -" excl lỗi nếu tệp tin kết quả đã có\n" -" nocreat không tạo tệp tin kết quả\n" -" notrunc không cắt ngắn tệp tin kết quả\n" +" excl lỗi nếu tập tin kết quả đã có\n" +" nocreat không tạo tập tin kết quả\n" +" notrunc không cắt ngắn tập tin kết quả\n" " noerror tiếp tục sau khi gặp lỗi đọc\n" -" fdatasync ghi vật lý dữ liệu tệp tin kết quả lên đĩa trước khi thoát\n" +" 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:571 +#: src/dd.c:576 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3237,78 +3230,78 @@ msgstr "" "\n" "Mỗi ký hiệu CỜ có thể là:\n" "\n" -" append chế độ phụ thêm\n" -" (chỉ có ích cho kết quả ra; cũng đề nghị « conv=notrunc »)\n" +" append chế độ nối thêm\n" +" (chỉ có ích cho đầu ra; cũng đề nghị “conv=notrunc”)\n" -#: src/dd.c:578 +#: src/dd.c:583 msgid " cio use concurrent I/O for data\n" -msgstr " cio dùng V/R đồng quy cho dữ liệu\n" +msgstr " cio dùng I/O đồng quy cho dữ liệu\n" -#: src/dd.c:580 +#: src/dd.c:585 msgid " direct use direct I/O for data\n" -msgstr " direct sử dụng V/R thẳng cho dữ liệu\n" +msgstr " direct sử dụng I/O trực tiếp cho dữ liệu\n" -#: src/dd.c:582 +#: src/dd.c:587 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:584 +#: src/dd.c:589 msgid " dsync use synchronized I/O for data\n" -msgstr " dsync dùng V/R đã đồng bộ cho dữ liệu\n" +msgstr " dsync dùng I/O đã đồng bộ cho dữ liệu\n" -#: src/dd.c:586 +#: src/dd.c:591 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:587 +#: src/dd.c:592 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" -#: src/dd.c:590 +#: src/dd.c:595 msgid " nonblock use non-blocking I/O\n" -msgstr " nonblock sử dụng V/R không đặt khối\n" +msgstr " nonblock sử dụng I/O không đặt khối\n" -#: src/dd.c:592 +#: src/dd.c:597 msgid " noatime do not update access time\n" msgstr " noatime không cập nhật giờ truy cập\n" -#: src/dd.c:595 +#: src/dd.c:600 msgid " nocache discard cached data\n" -msgstr " nochace bỏ qua dữ liệu tạm lưu\n" +msgstr " nochace bỏ qua dữ liệu tạm lưu\n" -#: src/dd.c:598 +#: src/dd.c:603 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" +msgstr " noctty không ấn định thiết bị cuối điều khiển từ tập tin\n" -#: src/dd.c:601 +#: src/dd.c:606 msgid " nofollow do not follow symlinks\n" msgstr " nofollow không đi theo liên kết mềm\n" -#: src/dd.c:603 +#: src/dd.c:608 msgid " nolinks fail if multiply-linked\n" msgstr " nolinks lỗi nếu có nhiều liên kết\n" -#: src/dd.c:605 +#: src/dd.c:610 msgid " binary use binary I/O for data\n" -msgstr " binary sử dụng V/R nhị phân cho dữ liệu\n" +msgstr " binary sử dụng I/O nhị phân cho dữ liệu\n" -#: src/dd.c:607 +#: src/dd.c:612 msgid " text use text I/O for data\n" -msgstr " text sử dụng V/R văn bản cho dữ liệu\n" +msgstr " text sử dụng I/O văn bản cho dữ liệu\n" -#: src/dd.c:609 +#: src/dd.c:614 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:612 +#: src/dd.c:617 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:615 +#: src/dd.c:620 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:620 +#: src/dd.c:625 #, c-format msgid "" "\n" @@ -3325,8 +3318,8 @@ msgid "" "\n" msgstr "" "\n" -"Gửi một tín hiệu %s tới tiến trình « dd » đang chạy để nó in\n" -"thống kê V/R ra đầu lỗi tiêu chuẩn, sau đó tiếp tục sao chép.\n" +"Gửi một tín hiệu %s tới tiến trình “dd” đang chạy để nó in\n" +"thống kê I/O ra đầu lỗi tiêu chuẩn và coi là nó đang sao chép.\n" "\n" " $ dd if=/dev/zero of=/dev/null& pid=$!\n" " $ kill -%s $pid; sleep 1; kill $pid\n" @@ -3337,7 +3330,7 @@ msgstr "" "Tùy chọn:\n" "\n" -#: src/dd.c:676 +#: src/dd.c:683 #, c-format msgid "" "%<PRIuMAX>+%<PRIuMAX> records in\n" @@ -3346,19 +3339,19 @@ msgstr "" "%<PRIuMAX>+%<PRIuMAX> mục ghi vào\n" "%<PRIuMAX>+%<PRIuMAX> mục ghi ra\n" -#: src/dd.c:682 +#: src/dd.c:689 #, 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:694 +#: src/dd.c:701 #, c-format msgid "%<PRIuMAX> byte (%s) copied" msgid_plural "%<PRIuMAX> bytes (%s) copied" msgstr[0] "%<PRIuMAX> byte (%s) đã sao chép" -#: src/dd.c:712 +#: src/dd.c:720 msgid "Infinity B" msgstr "B vô cùng" @@ -3372,243 +3365,265 @@ 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:725 +#: src/dd.c:733 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g s, %s/s\n" -#: src/dd.c:804 +#: src/dd.c:812 #, c-format msgid "closing input file %s" -msgstr "đang đóng tệp tin vào %s" +msgstr "đóng tập tin vào %s" -#: src/dd.c:811 +#: src/dd.c:819 #, c-format msgid "closing output file %s" -msgstr "đang đóng tệp tin ra %s" +msgstr "đóng tập tin ra %s" -#: src/dd.c:1014 +#: src/dd.c:1022 #, c-format msgid "failed to turn off O_DIRECT: %s" -msgstr "không tắt được O_DIRECT: %s" +msgstr "gặp lỗi khi tắt O_DIRECT: %s" -#: src/dd.c:1085 src/dd.c:1934 +#: src/dd.c:1093 src/dd.c:1942 #, c-format msgid "writing to %s" -msgstr "đang ghi tới %s" +msgstr "đang ghi vào %s" -#: src/dd.c:1199 src/dd.c:1253 +#: src/dd.c:1207 src/dd.c:1261 #, c-format msgid "unrecognized operand %s" msgstr "toán hạng không nhận ra %s" -#: src/dd.c:1210 +#: src/dd.c:1218 msgid "invalid conversion" msgstr "sai chuyển đổi" -#: src/dd.c:1213 src/dd.c:1289 +#: src/dd.c:1221 src/dd.c:1297 msgid "invalid input flag" msgstr "cờ đầu vào không hợp lệ" -#: src/dd.c:1216 src/dd.c:1283 src/dd.c:1295 +#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303 msgid "invalid output flag" msgstr "cờ đầu ra không hợp lệ" -#: src/dd.c:1219 +#: src/dd.c:1227 msgid "invalid status flag" msgstr "cờ trạng thái không hợp lệ" -#: src/dd.c:1258 src/truncate.c:312 +#: src/dd.c:1266 src/truncate.c:310 #, c-format msgid "invalid number %s" msgstr "số không hợp lệ %s" -#: src/dd.c:1340 +#: src/dd.c:1348 #, 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:1342 +#: src/dd.c:1350 #, c-format msgid "cannot combine block and unblock" msgstr "không thể kết hợp block và unblock" -#: src/dd.c:1344 +#: src/dd.c:1352 #, c-format msgid "cannot combine lcase and ucase" -msgstr "không thể kết hợp lcase (chữ thường) và ucase (chữ hoa)" +msgstr "không thể kết hợp lcase (chữ thường) và ucase (chữ HOA)" -#: src/dd.c:1346 +#: src/dd.c:1354 #, c-format msgid "cannot combine excl and nocreat" msgstr "không thể kết hợp excl và nocreat" -#: src/dd.c:1349 +#: src/dd.c:1357 #, c-format msgid "cannot combine direct and nocache" msgstr "không thể kết hợp direct và nocache" -#: src/dd.c:1506 +#: src/dd.c:1514 #, 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 "" -"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 dạng" +"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:1593 +#: src/dd.c:1601 #, c-format msgid "%s: cannot skip" msgstr "%s: không thể bỏ qua" -#: src/dd.c:1595 src/dd.c:1614 src/dd.c:1675 +#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683 #, c-format msgid "%s: cannot seek" -msgstr "%s: không thể tìm nơi" +msgstr "%s: không thể di chuyển vị trí đọc" -#: src/dd.c:1655 +#: src/dd.c:1663 #, c-format msgid "offset overflow while reading file %s" -msgstr "vùng hiệu bị tràn khi đọc tệp tin %s" +msgstr "offset bị tràn khi đọc tập tin %s" -#: src/dd.c:1667 +#: src/dd.c:1675 #, c-format msgid "warning: invalid file offset after failed read" -msgstr "cảnh báo : vùng hiệu tệp tin không hợp lệ sau lỗi đọc" +msgstr "cảnh báo: offset tập tin không hợp lệ sau lỗi đọc" -#: src/dd.c:1671 +#: src/dd.c:1679 #, 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:1814 +#: src/dd.c:1822 #, c-format msgid "setting flags for %s" msgstr "đang thiết lập cờ cho %s" -#: src/dd.c:1867 +#: 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:1881 +#: 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:1914 +#: src/dd.c:1922 #, c-format msgid "%s: cannot skip to specified offset" -msgstr "%s: không thể tìm nơi tới rìa đưa ra" +msgstr "%s: không thể nhảy đến tới offset đưa ra" -#: src/dd.c:2125 src/dd.c:2258 -#, c-format -msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" -msgstr "lỗi cắt ngắn ở %<PRIuMAX> byte trong tệp tin kết quả %s" +#: src/dd.c:2133 +#, fuzzy, 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" -#: src/dd.c:2138 +#: src/dd.c:2146 #, c-format msgid "fdatasync failed for %s" msgstr "fdatasync bị lỗi cho %s" -#: src/dd.c:2148 +#: src/dd.c:2156 #, c-format msgid "fsync failed for %s" msgstr "fsync bị lỗi cho %s" -#: src/dd.c:2199 src/dd.c:2228 +#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165 #, c-format -msgid "opening %s" -msgstr "đang mở %s" +msgid "failed to open %s" +msgstr "gặp lỗi khi mở %s" -#: src/dd.c:2237 +#: src/dd.c:2246 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) " "blocks" msgstr "" -"vùng hiệu quá lớn: không thể cắt ngắn thành chiều dài seek=%<PRIuMAX> (%lu-" +"độ 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:2274 src/dd.c:2280 +#: src/dd.c:2267 +#, 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 #, 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:54 src/expr.c:153 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:39 src/sleep.c:35 src/sort.c:66 +#: 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 msgid "Paul Eggert" msgstr "Paul Eggert" -#: src/df.c:140 +#: src/df.c:172 msgid "Filesystem" -msgstr "Filesystem" +msgstr "Hệ thống tập tin" -#: src/df.c:141 +#: src/df.c:175 msgid "Type" msgstr "Kiểu" -#: src/df.c:142 +#: src/df.c:178 src/df.c:542 msgid "blocks" -msgstr "Khối" - -#: src/df.c:142 -msgid "Inodes" -msgstr "Inode" +msgstr "khối" -#: src/df.c:142 -msgid "Size" -msgstr "Cỡ" - -#: src/df.c:143 +#: src/df.c:181 msgid "Used" msgstr "Dùng" -#: src/df.c:143 -msgid "IUsed" -msgstr "IDùng" - -#: src/df.c:144 +#: src/df.c:184 msgid "Available" msgstr "Còn" -#: src/df.c:144 -msgid "IFree" -msgstr "ITrống" - -#: src/df.c:144 -msgid "Avail" -msgstr "Còn" - -#: src/df.c:145 +#: src/df.c:187 msgid "Use%" msgstr "%Dùng" -#: src/df.c:145 +#: src/df.c:190 +msgid "Inodes" +msgstr "Inode" + +#: src/df.c:193 +msgid "IUsed" +msgstr "IDùng" + +#: src/df.c:196 +msgid "IFree" +msgstr "ITrống" + +#: src/df.c:199 msgid "IUse%" msgstr "%IDùng" -#: src/df.c:145 -msgid "Capacity" -msgstr "năng" - -#: src/df.c:146 +#: src/df.c:202 msgid "Mounted on" msgstr "Gắn vào" -#: src/df.c:847 +#: src/df.c:383 +#, c-format +msgid "option --output: field '%s' unknown" +msgstr "" + +#: 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:410 src/df.c:449 +msgid "Size" +msgstr "Cỡ" + +#: src/df.c:414 src/df.c:451 +msgid "Avail" +msgstr "Còn" + +#: src/df.c:474 +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 +#, c-format +msgid "%s-%s" +msgstr "%2$s-%1$s" + +#: src/df.c:1210 +#, fuzzy msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" -"\n" msgstr "" -"Hiển thị thông tin về hệ thống tệp tin chứa mỗi TẬP_TIN,\n" -"hoặc tất cả các tệp tin theo mặc định.\n" +"Hiển thị thông tin về hệ thống tập tin chứa mỗi TẬP_TIN,\n" +"hoặc tất cả các tập tin theo mặc định.\n" "\n" -#: src/df.c:855 +#: src/df.c:1217 msgid "" " -a, --all include dummy file systems\n" " -B, --block-size=SIZE scale sizes by SIZE before printing them. E.g.,\n" @@ -3619,15 +3634,15 @@ msgid "" "2G)\n" " -H, --si likewise, but use powers of 1000 not 1024\n" msgstr "" -" -a, --all gồm cả những hệ thống tệp tin giả\n" -" -B, --block-size=SIZE dùng khối kích cỡ SIZE 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 SIZE dưới đây.\n" -" --total xuất một tổng số tổng quát\n" +" -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 1000 lũy thừa thay cho 1024\n" +" -H, --si như trên, nhưng dùng số mũ 1000 thay cho 1024\n" -#: src/df.c:865 +#: src/df.c:1227 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3636,13 +3651,17 @@ msgid "" "(default)\n" msgstr "" " -i, --inodes liêt kê thông tin về inode thay cho sử dụng khối\n" -" -k giống như « --block-size=1K »\n" -" -l, --local chỉ liệt kê hệ thống tệp tin cục bộ\n" +" -k giống như “--block-size=1K”\n" +" -l, --local chỉ liệt kê hệ thống tập tin cục bộ\n" " --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:872 +#: src/df.c:1234 +#, fuzzy msgid "" +" --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" +" or print all fields if FIELD_LIST is " +"omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" " -t, --type=TYPE limit listing to file systems of type TYPE\n" @@ -3652,28 +3671,49 @@ msgid "" msgstr "" " -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" -" -v (bị lờ đi)\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" +" -v (bị bỏ qua)\n" + +#: src/df.c:1248 +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" +msgstr "" + +#: src/df.c:1285 +#, fuzzy, 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:1027 +#: 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ỏ" + +#: src/df.c:1442 #, 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ỏ" +msgstr "dạng hệ thống tập tin %s đã được cả chọn và loại bỏ" -#: src/df.c:1075 +#: src/df.c:1500 msgid "Warning: " -msgstr "Cảnh báo : " +msgstr "Cảnh báo: " -#: src/df.c:1077 src/stat.c:795 +#: src/df.c:1502 src/stat.c:814 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" +msgstr "không đọc được bảng các hệ thống tập tin đã gắn" -#: src/df.c:1107 +#: src/df.c:1539 #, c-format msgid "no file systems processed" -msgstr "không có hệ thống tệp tin được xử lý" +msgstr "không có hệ thống tập tin được xử lý" #. This is a proper name. See the gettext manual, section Names. #: src/dircolors.c:35 @@ -3683,7 +3723,7 @@ msgstr "H. Peter Anvin" #: src/dircolors.c:97 src/uptime.c:196 src/users.c:105 #, c-format msgid "Usage: %s [OPTION]... [FILE]\n" -msgstr "Sử dụng: %s [TÙY_CHỌN]... [TẬP_TIN]\n" +msgstr "Cách dùng: %s [TÙY_CHỌN]... [TẬP_TIN]\n" #: src/dircolors.c:98 msgid "" @@ -3694,11 +3734,11 @@ msgid "" " -c, --csh, --c-shell output C shell code to set LS_COLORS\n" " -p, --print-database output defaults\n" msgstr "" -"Đưa ra các câu lệnh đặt biên môi trường LS_COLORS.\n" +"Đưa ra các câu lệnh đặt biến môi trường LS_COLORS.\n" "\n" "Nhận ra định dạng kết quả:\n" -" -b, --sh, --bourne-shell đưa ra mã trình bao Bourne đặt LS_COLORS\n" -" -c, --csh, --c-shell đưa ra mã trình bao C shell đặt LS_COLORS\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" " -p, --print-database xuất các giá trị mặc định\n" #: src/dircolors.c:108 @@ -3712,8 +3752,8 @@ msgstr "" "Nếu chỉ ra TẬP_TIN, thì đọc nó để tìm ra màu nào sử dụng cho dạng tập tin\n" "và phần mở rộng tập tin nào. Nếu không, sử dụng cơ sở dữ liệu đã biên dịch " "từ trước.\n" -"Để xem chi tiết về định dạng của những tập tin này, chạy « dircolors --print-" -"database ».\n" +"Để xem chi tiết về định dạng của những tập tin này, chạy “dircolors --print-" +"database”.\n" #: src/dircolors.c:286 #, c-format @@ -3735,24 +3775,22 @@ msgid "" "the options to output dircolors' internal database and\n" "to select a shell syntax are mutually exclusive" msgstr "" -"tùy chọn để đưa ra cơ sở dữ liệu nội bộ của dircolors và\n" -"tùy chọn để chọn một cú pháp trình bao loại trừ lẫn nhau" +"các tùy chọn để đưa ra cơ sở dữ liệu nội bộ của “dircolors” và\n" +"để chọn một cú pháp shell loại trừ lẫn nhau" #: src/dircolors.c:450 msgid "file operands cannot be combined with --print-database (-p)" -msgstr "toán hạng tệp tin không thể kết hợp với « --print-database » (-p)" +msgstr "toán hạng tập tin không thể kết hợp với “--print-database (-p)”" #: src/dircolors.c:473 #, c-format msgid "no SHELL environment variable, and no shell type option given" -msgstr "" -"không có biến môi trường SHELL (trình bao), và không đưa ra tùy chọn kiểu " -"trình bao" +msgstr "không có biến môi trường SHELL, và không đưa ra tùy chọn kiểu shell" #: src/dirname.c:50 #, c-format msgid "Usage: %s [OPTION] NAME...\n" -msgstr "Sử dụng: %s [TÙYCHỌN] TÊN...\n" +msgstr "Cách dùng: %s [TÙY-CHỌN] TÊN...\n" #: src/dirname.c:54 msgid "" @@ -3761,16 +3799,15 @@ msgid "" "directory).\n" "\n" msgstr "" -"In ra từng TÊN không có dấu gách chéo ở đầu và cuối; nếu TÊN không chứa « / " -"» nào,\n" -"thì in ra « . » (có nghĩa là thư mục hiện thời).\n" +"In ra từng TÊN không có dấu gách chéo ở đầu và cuối; nếu TÊN không chứa “/” " +"nào,\n" +"thì in ra “.” (có nghĩa là thư mục hiện thời).\n" "\n" #: src/dirname.c:59 msgid " -z, --zero separate output with NUL rather than 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 " -"mới\n" +" -0, --null ngắt dòng bằng NUL thay vì kí tự xuống dòng ở đầu ra\n" #: src/dirname.c:64 #, c-format @@ -3782,30 +3819,32 @@ msgid "" " %s stdio.h -> \".\"\n" msgstr "" "\n" -"Thí dụ :\n" -" %s /usr/bin/ Xuất « /usr».\n" -" %s dir1/str dir2/str -> \"dir1\" theo sau bởi \"dir2\"\n" -" %s stdio.h Xuất « . ».\n" +"Thí dụ:\n" +" %s /usr/bin/ -> “/usr”.\n" +" %s dir1/str dir2/str -> “dir1” theo sau bởi “dir2”\n" +" %s stdio.h -> “.”.\n" -#: src/du.c:260 src/sort.c:390 src/wc.c:112 +#: src/du.c:270 src/sort.c:394 src/wc.c:112 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" " or: %s [OPTION]... --files0-from=F\n" msgstr "" -"Sử dụng: %s [TÙY_CHỌN]... [TẬP_TIN]...\n" -" hoặc: %s [TÙY_CHỌN]... --files0-from=F\n" +"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:264 -msgid "" -"Summarize disk usage of each FILE, recursively for directories.\n" -"\n" +#: src/du.c:274 +#, fuzzy +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 mỗi thư mục.\n" +"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" -#: src/du.c:271 +#: src/du.c:280 +#, fuzzy msgid "" +" -0, --null end each output line with 0 byte rather than " +"newline\n" " -a, --all write counts for all files, not just directories\n" " --apparent-size print apparent sizes, rather than disk usage; " "although\n" @@ -3817,11 +3856,12 @@ msgstr "" " --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" -" sự phân mảnh, khối gián tiếp, và tương tự\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:279 +#: src/du.c:289 +#, 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" @@ -3830,16 +3870,22 @@ msgid "" " -c, --total produce a grand total\n" " -D, --dereference-args dereference only symlinks that are listed on the\n" " command line\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 "" " -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" +" ”-BM” sẽ in đơn vị dạng 1,048,576 bytes.\n" " Xem định dạng SIZE dưới đây.\n" -" -b, --bytes tương đương « --apparent-size --block-size=1 »\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" " -D, --dereference-args không theo liên kết mềm được \n" -" liệt kê trên dòng lệnh\n" +" liệt kê trên dòng lệnh\n" -#: src/du.c:288 +#: src/du.c:302 +#, fuzzy msgid "" " --files0-from=F summarize disk usage of the NUL-terminated file\n" " names specified in file F;\n" @@ -3847,34 +3893,33 @@ msgid "" " -H equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" --si like -h, but use powers of 1000 not 1024\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 " +" --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" -" -H tương đương với « --dereference-args » (-D)\n" +" NUL chỉ ra trong tập tin F\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" +" --si giống “-h”, nhưng dùng 1000 lũy thừa thay cho 1024\n" -#: src/du.c:297 +#: src/du.c:310 +#, fuzzy 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 giống « --block-size=1K »\n" +" -k giống “--block-size=1K”\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" +" -m giống “--block-size=1M”\n" -#: src/du.c:302 +#: src/du.c:316 +#, fuzzy msgid "" -" -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " "default)\n" -" -0, --null end each output line with 0 byte rather than " -"newline\n" " -S, --separate-dirs 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" @@ -3884,28 +3929,11 @@ msgstr "" " -S, --separate-dirs không thêm kích cơ của thư mục con\n" " -s, --summarize chỉ hiển thị tổng số cho mỗi đối số\n" -#: src/du.c:309 -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 bỏ qua thư mục trên hệ thống tệp tin khác\n" -" -X, --exclude-from=FILE bỏ những tệp tin tương ứng với mẫu trong FILE\n" -" --exclude=PATTERN bỏ những tệp tin tương ứng với PATTERN\n" -" --max-depth=N in ra tổng số cho một thư mục (hoặc tệp tin, với « " -"--all »)\n" -" chỉ nếu nó nằm ≤ N bậc dưới đối số dòng lệnh;\n" -" « --max-depth=0 » là tương tự như « --summarize " -"»\n" - -#: src/du.c:318 +#: src/du.c:322 +#, fuzzy msgid "" +" -t, --threshold=SIZE exclude entries smaller than SIZE if positive,\n" +" or entries greater than SIZE if negative\n" " --time show time of the last modification of any file in " "the\n" " directory, or any of its subdirectories\n" @@ -3920,77 +3948,85 @@ msgstr "" " trong thư mục, hoặc của bất cứ thư mục con nào 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" -" • use giờ dùng\n" -" • ctime giờ thay đổi inode\n" -" • status giờ lấy trạng thái\n" +" * atime giờ truy cập\n" +" * access giờ truy cập\n" +" * use giờ dùng\n" +" * ctime giờ thay đổi inode\n" +" * status giờ lấy trạng thái\n" " --time-style=KIỂU_DÁNG hiển thị giờ theo kiểu dáng KIỂU_DÁNG:\n" -" • full-iso ISO đầy đủ\n" -" • long-iso ISO dài\n" -" • iso ISO\n" -" • +ĐỊNH_DẠNG\n" -" ĐỊNH_DẠNG được giải thích như « date »\n" +" * full-iso ISO đầy đủ\n" +" * long-iso ISO dài\n" +" * iso ISO\n" +" * +ĐỊNH_DẠNG\n" +" ĐỊNH_DẠNG dùng như của lệnh “date”\n" -#: src/du.c:375 -#, fuzzy +#: src/du.c:333 +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 msgid "Infinity" -msgstr "B vô cùng" +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:600 +#: src/du.c:624 #, c-format msgid "fts_read failed: %s" -msgstr "fts_read lỗi: %s" +msgstr "fts_read gặp lỗi: %s" -#: src/du.c:724 +#: src/du.c:780 #, c-format msgid "invalid maximum depth %s" -msgstr "sai độ sâu tối đa %s" +msgstr "độ sâu tối đa “%s” không hợp lệ" + +#: src/du.c:809 +#, fuzzy, c-format +msgid "invalid --threshold argument '-0'" +msgstr "sai đối số “--%s” %s" -#: src/du.c:817 +#: src/du.c:887 #, 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:824 +#: src/du.c:894 #, 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 »" +msgstr "cảnh báo: tóm tắt là giống với sử dụng “--max-depth=0”" -#: src/du.c:830 +#: src/du.c:900 #, 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 »" +msgstr "cảnh báo: tóm tắt xung đột với “--max-depth=%lu”" -#: src/du.c:896 src/sort.c:4479 src/wc.c:668 +#: src/du.c:966 src/sort.c:4533 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 »" +msgstr "toán hạng tập tin không thể kết hợp với “--file0-from”" -#: src/du.c:949 src/md5sum.c:587 src/od.c:903 src/tac.c:239 src/tac.c:350 -#: src/tac.c:506 src/tac.c:586 src/wc.c:733 +#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 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:963 src/sort.c:4508 src/wc.c:747 +#: src/du.c:1040 src/sort.c:4562 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" +"đọ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:980 src/du.c:988 src/wc.c:760 src/wc.c:768 +#: src/du.c:1057 src/du.c:1065 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:1007 src/head.c:149 src/head.c:262 src/head.c:334 src/head.c:538 -#: src/head.c:620 src/head.c:692 src/head.c:750 src/head.c:774 src/tail.c:412 -#: src/tail.c:500 src/tail.c:549 src/tail.c:642 src/tail.c:770 src/tail.c:818 -#: src/tail.c:855 src/tail.c:1782 src/tail.c:1812 src/uniq.c:395 -#, c-format -msgid "error reading %s" -msgstr "lỗi đọc %s" +msgstr "sai tên tập tin chiều dài bằng không" -#: src/du.c:1010 src/ls.c:2649 src/wc.c:791 +#: src/du.c:1088 src/ls.c:2649 src/wc.c:791 msgid "total" msgstr "tổng" @@ -4010,8 +4046,8 @@ msgid "" "Usage: %s [SHORT-OPTION]... [STRING]...\n" " or: %s LONG-OPTION\n" msgstr "" -"Sử dụng: %s [TÙY_CHỌN_NGẮN]... [CHUỖI]...\n" -" hoặc: %s TÙY_CHỌN-DÀI\n" +"Cách dùng: %s [TÙY_CHỌN_NGẮN]... [CHUỖI]...\n" +" hoặc: %s TÙY-CHỌN-DÀI\n" #: src/echo.c:45 msgid "" @@ -4028,16 +4064,15 @@ msgid "" " -e enable interpretation of backslash escapes (default)\n" " -E disable interpretation of backslash escapes\n" msgstr "" -" -e hiệu lực khả năng biên dịch ký tự thoát xuyệc ngược (mặc " -"định)\n" -" -E tắt khả năng biên dịch ký tự thoát xuyệc ngược\n" +" -e bật chức năng biên dịch ký tự thoát gạch ngược (mặc định)\n" +" -E tắt khả năng biên dịch ký tự thoát gạch ngược\n" #: src/echo.c:54 msgid "" " -e enable interpretation of backslash escapes\n" " -E disable interpretation of backslash escapes (default)\n" msgstr "" -" -e hiệu lực chức năng đọc ký tự thoát chéo ngược\n" +" -e bật chức năng đọc ký tự thoát chéo ngược\n" " -E tắt chức năng đọc ký tự thoát chéo ngược (mặc định)\n" #: src/echo.c:60 @@ -4047,7 +4082,7 @@ msgid "" "\n" msgstr "" "\n" -"« -e » có hiệu lực thì cũng nhận ra những dãy theo đây:\n" +"”-e” có hiệu lực thì cũng nhận ra những dãy theo đây:\n" "\n" #: src/echo.c:65 src/printf.c:105 @@ -4065,11 +4100,12 @@ msgid "" msgstr "" " \\\\ sổ chéo ngược\n" " \\a cảnh giác (BEL)\n" -" \\b xoá lùi\n" +" \\b xóa lùi\n" " \\c không xuất gì thêm nữa\n" " \\e thoát\n" " \\f kéo trang\n" -" \\n\tdòng mới \\r xuống dòng\n" +" \\n dòng mới\n" +" \\r xuống dòng\n" " \\t cột tab theo chiều ngang\n" " \\v cột tab theo chiều dọc\n" @@ -4089,12 +4125,15 @@ msgstr "Richard Mlynarik" #: src/env.c:52 #, c-format msgid "Usage: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n" -msgstr "Sử dụng: %s [TÙY_CHỌN]... [-] [TÊN=GIÁ_TRỊ]... [LỆNH [ĐỐI_SỐ]...]\n" +msgstr "Cách dùng: %s [TÙY_CHỌN]... [-] [TÊN=GIÁ_TRỊ]... [LỆNH [Đ.SỐ]...]\n" #: src/env.c:55 +msgid "Set each NAME to VALUE in the environment and run COMMAND.\n" +msgstr "" + +#: src/env.c:61 +#, fuzzy msgid "" -"Set each NAME to VALUE in the environment and run COMMAND.\n" -"\n" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with 0 byte rather than newline\n" " -u, --unset=NAME remove variable from the environment\n" @@ -4102,81 +4141,81 @@ 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 0 byte 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" +" -u, --unset=TÊN xóa biến TÊN khỏi môi trường\n" -#: src/env.c:64 +#: src/env.c:68 msgid "" "\n" "A mere - implies -i. If no COMMAND, print the resulting environment.\n" msgstr "" "\n" -"Một « - » nghĩa là « -i ». Nếu không có câu LỆNH, thì in ra môi trường kết " +"Một “-” nghĩa là “-i”. Nếu không có câu LỆNH, thì in ra môi trường kết " "quả.\n" -#: src/env.c:120 +#: src/env.c:124 #, c-format msgid "cannot unset %s" msgstr "không thể bỏ đặt %s" -#: src/env.c:131 +#: src/env.c:135 #, c-format msgid "cannot set %s" msgstr "không thể đặt %s" -#: src/env.c:148 +#: src/env.c:152 #, c-format msgid "cannot specify --null (-0) with command" -msgstr "không thể xác định « --null (0) » với câu lệnh" +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" -"\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" +"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/expand.c:115 +#: src/expand.c:114 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 không chuyển đổi tab nằm sau ký tự không phải trống\n" -" -t, --tabs=SỐ dùng SỐ cho số ký tự của tab, không phải 8\n" +" -i, --initial không chuyển đổi tab nằm sau ký tự không phải trống\n" +" -t, --tabs=SỐ dùng SỐ cho số ký tự của tab, không phải 8\n" -#: src/expand.c:119 +#: src/expand.c:118 msgid "" " -t, --tabs=LIST use comma separated list of explicit tab positions\n" msgstr "" -" -t, --tabs=DANH_SÁCH dùng danh sách các vị trí chính xác của tab (phân " -"cách bởi dấu phẩy)\n" +" -t, --tabs=D.SÁCH dùng danh sách các vị trí chính xác của tab\n" +" (phân cách bởi dấu phẩy)\n" -#: src/expand.c:172 src/unexpand.c:191 +#: src/expand.c:171 src/unexpand.c:190 #, c-format msgid "tab stop is too large %s" msgstr "chiều dài tab là quá lớn %s" -#: src/expand.c:180 src/unexpand.c:199 +#: src/expand.c:179 src/unexpand.c:198 #, c-format msgid "tab size contains invalid character(s): %s" msgstr "kích cỡ tab chứa ký tự không cho phép: %s" -#: src/expand.c:206 src/unexpand.c:225 +#: src/expand.c:205 src/unexpand.c:224 #, c-format msgid "tab size cannot be 0" msgstr "kích cỡ tab không thể là 0" -#: src/expand.c:208 src/unexpand.c:227 +#: src/expand.c:207 src/unexpand.c:226 #, c-format msgid "tab sizes must be ascending" msgstr "kích cỡ tab phải tăng dần" -#: src/expand.c:326 src/expand.c:345 src/unexpand.c:374 src/unexpand.c:419 +#: 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" @@ -4197,8 +4236,8 @@ msgid "" "Usage: %s EXPRESSION\n" " or: %s OPTION\n" msgstr "" -"Sử dụng: %s BIỂU_THỨC\n" -" hoặc: %s TÙY_CHỌN\n" +"Cách dùng: %s BIỂU_THỨC\n" +" hoặc: %s TÙY_CHỌN\n" #: src/expr.c:211 msgid "" @@ -4214,11 +4253,11 @@ msgstr "" "In giá trị của BIỂU_THỨC ra đầu ra tiêu chuẩn. Một dòng trắng ở dưới\n" "phân cách các nhóm có quyền ưu tiên tăng dần. BIỂU_THỨC có thể là:\n" "\n" -" ĐỐI_SỐ1 | ĐỐI_SỐ2 ĐỐI_SỐ1 nếu nó không phải rỗng hoặc 0, nếu không thì " -"ĐỐI_SỐ2\n" +" Đ.SỐ1 | Đ.SỐ2 Đ.SỐ1 nếu nó không phải rỗng hoặc 0, nếu không thì Đ." +"SỐ2\n" "\n" -" ĐỐI_SỐ1 & ĐỐI_SỐ2 ĐỐI_SỐ1 nếu mỗi đối số không phải rỗng hay 0, ngược " -"lại thì 0\n" +" Đ.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 msgid "" @@ -4231,12 +4270,12 @@ msgid "" " ARG1 > ARG2 ARG1 is greater than ARG2\n" msgstr "" "\n" -" ĐỐI_SỐ1 < ĐỐI_SỐ2 ĐỐI_SỐ1 nhỏ hơn ĐỐI_SỐ2\n" -" ĐỐI_SỐ1 <= ĐỐI_SỐ2 ĐỐI_SỐ1 nhỏ hơn hoặc bằng ĐỐI_SỐ2\n" -" ĐỐI_SỐ1 = ĐỐI_SỐ2 ĐỐI_SỐ1 bằng ĐỐI_SỐ2\n" -" ĐỐI_SỐ1 != ĐỐI_SỐ2 ĐỐI_SỐ1 khác ĐỐI_SỐ2\n" -" ĐỐI_SỐ1 >= ĐỐI_SỐ2 ĐỐI_SỐ1 lớn hơn hoặc bằng ĐỐI_SỐ2\n" -" ĐỐI_SỐ1 > ĐỐI_SỐ2 ĐỐI_SỐ1 lớn hơn ĐỐI_SỐ2\n" +" Đ.SỐ1 < Đ.SỐ2 Đ.SỐ1 nhỏ hơn Đ.SỐ2\n" +" Đ.SỐ1 <= Đ.SỐ2 Đ.SỐ1 nhỏ hơn hoặc bằng Đ.SỐ2\n" +" Đ.SỐ1 = Đ.SỐ2 Đ.SỐ1 bằng Đ.SỐ2\n" +" Đ.SỐ1 != Đ.SỐ2 Đ.SỐ1 khác Đ.SỐ2\n" +" Đ.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 msgid "" @@ -4245,8 +4284,8 @@ msgid "" " ARG1 - ARG2 arithmetic difference of ARG1 and ARG2\n" msgstr "" "\n" -" ĐỐI_SỐ1 + ĐỐI_SỐ2 tổng số học của ĐỐI_SỐ1 và ĐỐI_SỐ2\n" -" ĐỐI_SỐ1 - ĐỐI_SỐ2 hiệu số học của ĐỐI_SỐ1 và ĐỐI_SỐ2\n" +" Đ.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 #, no-c-format @@ -4257,9 +4296,9 @@ msgid "" " ARG1 % ARG2 arithmetic remainder of ARG1 divided by ARG2\n" msgstr "" "\n" -" ĐỐI_SỐ1 * ĐỐI_SỐ2 tích số học của ĐỐI_SỐ1 và ĐỐI_SỐ2\n" -" ĐỐI_SỐ1 / ĐỐI_SỐ2 thương số học của ĐỐI_SỐ1 chia cho ĐỐI_SỐ2\n" -" ĐỐI_SỐ1 % ĐỐI_SỐ2 phần dư khi ĐỐI_SỐ1 chia cho ĐỐI_SỐ2\n" +" Đ.SỐ1 * Đ.SỐ2 tích số học của Đ.SỐ1 và Đ.SỐ2\n" +" Đ.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 msgid "" @@ -4274,10 +4313,11 @@ msgstr "" "\n" " CHUỖI : BTCQ đánh dấu tương ứng của BTCQ trong CHUỖI\n" "\n" -" match CHUỖI BTCQ giống như CHUỖI : BTCQ\n" -" substr CHUỖI VỊ_TRÍ DÀI chuỗi con của CHUỖI, VỊ_TRÍ đếm từ 1\n" -" index CHUỖI KÝ_TỰ chỉ mục trong CHUỖI ở đó tìm thấy KÝ_TỰ, hoặc 0\n" -" length CHUỖI chiều dài CHUỖI\n" +" match CHUỖI BTCQ giống như CHUỖI : BTCQ\n" +" substr CHUỖI VỊ_TRÍ DÀI chuỗi con của CHUỖI, VỊ_TRÍ đếm từ 1\n" +" index CHUỖI KÝ_TỰ chỉ mục trong CHUỖI ở đó tìm thấy KÝ_TỰ, hoặc " +"0\n" +" length CHUỖI chiều dài CHUỖI\n" #: src/expr.c:251 msgid "" @@ -4286,11 +4326,12 @@ msgid "" "\n" " ( EXPRESSION ) value of EXPRESSION\n" msgstr "" -" + HIỆU_BÀI hiểu HIỆU_BÀI như một chuỗi, thậm chí cả khi nó\n" -" là một từ khóa như « match » hay một toán tử " -"như « / »\n" +" + HIỆU_BÀI hiểu HIỆU_BÀI như một chuỗi, thậm chí cả khi " +"nó\n" +" là một từ khóa như “match” hay một toán tử " +"như “/”\n" "\n" -" ( BIỂU_THỨC ) giá trị của BIỂU_THỨC\n" +" ( BIỂU_THỨC ) giá trị của BIỂU_THỨC\n" #: src/expr.c:257 msgid "" @@ -4304,12 +4345,11 @@ msgstr "" "\n" "Cần biết rằng rất nhiều toán tử cần đặt sau ký tự thoát hoặc trong dấu " "ngoặc\n" -"khi gõ vào trong trình bao.\n" -"So sánh sẽ là số học nếu cả hai ĐỐI_SỐ đều là số, nếu không sẽ là so sánh " +"khi gõ vào trong shell.\n" +"So sánh sẽ là số học nếu cả hai Đ.SỐ đều là số, nếu không sẽ là so sánh " "nghĩa từ.\n" -"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" +"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 msgid "" @@ -4320,10 +4360,10 @@ msgid "" msgstr "" "\n" "Trạng thái thoát là:\n" -" • 0 nếu BIỂU_THỨC không phải rỗng hoặc 0.\n" -" • 1 nếu BIỂU_THỨC là rỗng hoặc 0\n" -" • 2 nếu BIỂU_THỨC sai cú pháp\n" -" • 3 nếu gặp lỗi.\n" +" * 0 nếu BIỂU_THỨC không phải rỗng hoặc 0.\n" +" * 1 nếu BIỂU_THỨC là rỗng hoặc 0\n" +" * 2 nếu BIỂU_THỨC sai cú pháp\n" +" * 3 nếu gặp lỗi.\n" #: src/expr.c:278 #, c-format @@ -4340,49 +4380,56 @@ msgstr "lỗi trong hàm khớp biểu thức chính quy" msgid "non-integer argument" msgstr "đối số không phải số nguyên" -#: src/expr.c:793 src/truncate.c:316 +#: src/expr.c:793 src/truncate.c:314 #, c-format msgid "division by zero" msgstr "chia cho không" -#: src/expr.c:887 src/sort.c:2029 +#: src/expr.c:887 src/sort.c:2044 #, c-format msgid "set LC_ALL='C' to work around the problem" -msgstr "hãy đặt « LC_ALL='C' » để giải quyết vấn đề" +msgstr "đặt “LC_ALL=”C”” để tránh vấn đề" #: src/expr.c:889 #, c-format msgid "the strings compared were %s and %s" msgstr "đã so sánh hai chuỗi %s và %s" -#: src/factor.c:449 -msgid "using arbitrary-precision arithmetic" -msgstr "đang sử dụng chức năng sự tính chính xác tuỳ ý" +#. This is a proper name. See the gettext manual, section Names. +#: src/factor.c:111 +msgid "Niels Moller" +msgstr "Niels Moller" -#: src/factor.c:460 -msgid "using single-precision arithmetic" -msgstr "đang sử dụng chức năng sự tính chính xác đơn" +#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459 +#, 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:465 src/od.c:1640 src/od.c:1709 +#: src/factor.c:2092 #, c-format -msgid "%s is too large" -msgstr "%s là quá lớn" +msgid "squfof queue overflow" +msgstr "tràn hàng đợi squfof" -#: src/factor.c:469 +#: src/factor.c:2419 #, 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:494 +#: src/factor.c:2442 src/od.c:1646 src/od.c:1715 +#, c-format +msgid "%s is too large" +msgstr "%s là quá lớn" + +#: src/factor.c:2454 #, c-format msgid "" "Usage: %s [NUMBER]...\n" " or: %s OPTION\n" msgstr "" -"Sử dụng: %s [SỐ]...\n" -" hoặc: %s TÙY_CHỌN\n" +"Cách dùng: %s [SỐ]...\n" +" hoặc: %s TÙY_CHỌN\n" -#: src/factor.c:499 +#: src/factor.c:2459 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" @@ -4400,32 +4447,32 @@ msgstr "không lấy được thư mục hiện thời" #: src/find-mount-point.c:92 #, c-format msgid "cannot change to directory %s" -msgstr "không chuyển đổi được sang thư mục %s" +msgstr "không thể chuyển sang thư mục %s" #: src/find-mount-point.c:70 #, c-format msgid "cannot stat current directory (now %s)" -msgstr "không lấy được trạng thái về thư mục hiện thời (bây giờ %s)" +msgstr "không stat được thư mục hiện thời (bây giờ %s)" #. This is a proper name. See the gettext manual, section Names. -#: src/fmt.c:37 +#: src/fmt.c:38 msgid "Ross Paterson" msgstr "Ross Paterson" -#: src/fmt.c:269 +#: src/fmt.c:270 #, c-format msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n" -msgstr "Sử dụng: %s [-RỘNG] [TÙY_CHỌN]... [TẬP_TIN]...\n" +msgstr "Cách dùng: %s [-RỘNG] [TÙY_CHỌN]... [TẬP_TIN]...\n" -#: src/fmt.c:270 +#: 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" -"\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" +"Tùy chọn “-RỘNG” viết tắt tùy chọn “--width=CHỮ_SỐ”.\n" #: src/fmt.c:278 msgid "" @@ -4440,43 +4487,46 @@ msgstr "" "lại\n" " -s, --split-only chia những dòng dài, nhưng không điền lại\n" -#: src/fmt.c:285 -#, fuzzy, c-format +#: src/fmt.c:287 +#, 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 thụt dòng đầu tiên khác với dòng thứ hai\n" +" -t, --tagged-paragraph thụt dòng của dòng đầu tiên khác với dòng thứ " +"hai\n" " -u, --uniform-spacing một khoảng trống giữa các từ, hai giữa các câu\n" -" -w, --width=RỘNG bề rộng dòng tối đa (mặc định là 75 cột)\n" +" -w, --width=RỘNG độ rộng dòng tối đa (mặc định là 75 cột)\n" +" -g, --goal=RỘNG độ rộng mục đích (mặc định là bằng 93% of chiều " +"rộng)\n" -#: src/fmt.c:357 +#: src/fmt.c:359 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" "option; use -w N instead" msgstr "" -"tùy chọn sai « -- %c »; « -WIDTH » chỉ nhận ra khi nó là tùy chọn đầu tiên;\n" -"dùng « -w N » (N là số) để thay thế" +"tùy chọn sai “-- %c”; “-WIDTH” chỉ nhận ra khi nó là tùy chọn đầu tiên;\n" +"dùng “-w N” (N là số) để thay thế" -#: src/fmt.c:403 src/fmt.c:414 +#: src/fmt.c:405 src/fmt.c:416 #, c-format 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" -"\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" "ghi ra đầu ra tiêu chuẩn.\n" "\n" -#: src/fold.c:78 +#: src/fold.c:77 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4486,13 +4536,13 @@ msgstr "" " -s, --spaces ngắt dòng ở khoảng trắng\n" " -w, --width=RỘNG dùng RỘNG cột thay cho 80\n" -#: src/fold.c:289 src/pr.c:836 +#: src/fold.c:288 src/pr.c:832 #, c-format 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:75 +#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 #: src/truncate.c:37 msgid "Padraig Brady" msgstr "Padraig Brady" @@ -4500,7 +4550,7 @@ msgstr "Padraig Brady" #: src/getlimits.c:65 #, c-format msgid "Usage: %s\n" -msgstr "Sử dụng: %s\n" +msgstr "Cách dùng: %s\n" #: src/getlimits.c:69 msgid "" @@ -4508,20 +4558,20 @@ msgid "" "\n" msgstr "" "Giới hạn phụ thuộc vào nền tảng kết xuất theo một định dạng thích hợp với " -"văn lệnh trình bao.\n" +"văn lệnh shell.\n" "\n" -#: src/group-list.c:69 src/id.c:345 src/setuidgid.c:184 +#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184 #, c-format msgid "failed to get groups for user %s" -msgstr "lỗi lấy các nhóm cho người dùng %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:350 +#: src/group-list.c:74 src/id.c:370 #, c-format msgid "failed to get groups for the current process" -msgstr "lỗi lấy các nhóm cho tiến trình hiện thời" +msgstr "gặp lỗi khi lấy các nhóm cho tiến trình hiện thời" -#: src/group-list.c:104 +#: src/group-list.c:114 #, c-format msgid "cannot find name for group ID %lu" msgstr "không tìm thấy tên cho nhóm ID %lu" @@ -4529,7 +4579,7 @@ msgstr "không tìm thấy tên cho nhóm ID %lu" #: src/groups.c:53 #, c-format msgid "Usage: %s [OPTION]... [USERNAME]...\n" -msgstr "Sử dụng: %s [TÙY_CHỌN]... [TÊN_NGƯỜI_DÙNG]...\n" +msgstr "Cách dùng: %s [TÙY_CHỌN]... [TÊN_NGƯỜI_DÙNG]...\n" #: src/groups.c:54 msgid "" @@ -4559,22 +4609,22 @@ msgstr "không thể lấy GID thực" #: src/groups.c:128 src/id.c:206 #, c-format msgid "%s: no such user" -msgstr "%s: không có người dùng như vậy" +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" -"\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 " +"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" +"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/head.c:118 +#: src/head.c:117 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -4584,21 +4634,21 @@ msgid "" " K lines of each file\n" msgstr "" " -c, --bytes=[-]K in ra K byte đầu tiên của mỗi tập tin;\n" -" khi có « - » ở đầu, in ra tất cả trừ K byte\n" +" khi có “-” ở đầu, in ra tất cả trừ K byte\n" " cuối cùng của mỗi tập tin\n" " -n, --lines=[-]K in ra K dòng đầu tiên thay vì 10;\n" -" khi có « - » ở đầu, in ra tất cả trừ K dòng\n" +" khi có “-” ở đầu, in ra tất cả trừ K dòng\n" " cuối cùng của mỗi tập tin\n" -#: src/head.c:126 +#: 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 không in ra phần đầu cho biết tên tệp tin\n" -" -v, --verbose luôn luôn in ra phần đầu cho biết tên tệp tin\n" +" -q, --quiet, --silent không in ra phần đầu cho biết tên tập tin\n" +" -v, --verbose luôn luôn in ra phần đầu cho biết tên tập tin\n" -#: src/head.c:132 +#: src/head.c:131 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -4606,65 +4656,65 @@ msgid "" "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n" msgstr "" "\n" -"K có thể đặt các hậu tố nhân sau :\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" -#: src/head.c:152 -#, c-format -msgid "error writing %s" -msgstr "lỗi ghi %s" - -#: src/head.c:155 +#: src/head.c:154 #, c-format msgid "%s: file has shrunk too much" -msgstr "%s: tệp tin đã rút ngắt quá nhiều" +msgstr "%s: tập tin đã rút ngắt quá nhiều" -#: src/head.c:228 src/head.c:1044 +#: src/head.c:227 src/head.c:1051 #, c-format msgid "%s: number of bytes is too large" msgstr "%s: số byte quá lớn" -#: src/head.c:441 +#: 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:613 src/head.c:684 src/tail.c:450 +#: src/head.c:612 src/head.c:691 src/tail.c:449 #, c-format msgid "%s: cannot seek to offset %s" -msgstr "%s: không thể tìm tới hiệu %s" +msgstr "%s: không thể tìm tới offset %s" -#: src/head.c:791 +#: src/head.c:673 +#, 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" +msgstr "không thể đặt lại vị trí của cái chỉ tập tin cho %s" -#: src/head.c:878 +#: src/head.c:885 #, 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:879 +#: src/head.c:886 msgid "number of lines" -msgstr "số các dòng" +msgstr "số dòng" -#: src/head.c:879 +#: src/head.c:886 msgid "number of bytes" -msgstr "số các byte" +msgstr "số byte" -#: src/head.c:886 src/tail.c:1947 +#: src/head.c:893 src/tail.c:1947 msgid "invalid number of lines" -msgstr "sai số các dòng" +msgstr "sai số dòng" -#: src/head.c:887 src/tail.c:1948 +#: src/head.c:894 src/tail.c:1948 msgid "invalid number of bytes" -msgstr "sai số các byte" +msgstr "sai số byte" -#: src/head.c:974 src/head.c:1032 +#: src/head.c:981 src/head.c:1039 #, c-format msgid "invalid trailing option -- %c" -msgstr "sai tùy chọn theo sau « -- %c »" +msgstr "sai tùy chọn theo sau “-- %c”" #: src/hostid.c:42 #, c-format @@ -4673,7 +4723,7 @@ msgid "" "Print the numeric identifier (in hexadecimal) for the current host.\n" "\n" msgstr "" -"Sử dụng: %s [TÙY_CHỌN]\n" +"Cách dùng: %s [TÙY_CHỌN]\n" "In ra số nhận diện (thập lục) máy chủ hiện thời.\n" "\n" @@ -4685,8 +4735,8 @@ msgid "" "Print or set the hostname of the current system.\n" "\n" msgstr "" -"Sử dụng: %s [TÊN]\n" -" hoặc: %s TÙY_CHỌN\n" +"Cách dùng: %s [TÊN]\n" +" hoặc: %s TÙY_CHỌN\n" "In hoặc đặt tên máy cho hệ thống hiện thời.\n" "\n" @@ -4713,7 +4763,7 @@ msgstr "Arnold Robbins" #: src/id.c:81 #, c-format msgid "Usage: %s [OPTION]... [USERNAME]\n" -msgstr "Sử dụng: %s [TÙY_CHỌN]... [TÊN_NGƯỜI_DÙNG]\n" +msgstr "Cách dùng: %s [TÙY_CHỌN]... [TÊN_NGƯỜI_DÙNG]\n" #: src/id.c:82 msgid "" @@ -4731,12 +4781,12 @@ 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" "\n" -" -a lờ đi để 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" +" -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" +" -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 @@ -4750,7 +4800,7 @@ msgstr "" #: src/id.c:140 #, c-format msgid "--context (-Z) works only on an SELinux-enabled kernel" -msgstr "--context (-Z) chỉ hoạt động với hạt nhân hiệu lực SELinux" +msgstr "--context (-Z) chỉ hoạt động với hệ thống hỗ trợ SELinux" #: src/id.c:175 #, c-format @@ -4760,7 +4810,7 @@ msgstr "không thể in ngữ cảnh bảo mật khi ghi rõ người dùng" #: src/id.c:178 #, c-format msgid "cannot print \"only\" of more than one choice" -msgstr "không thể in « only » (chỉ in) trong nhiều sự chọn" +msgstr "không thể dùng “only” (chỉ in) nếu có nhiều lựa chọn" #: src/id.c:185 #, c-format @@ -4777,86 +4827,86 @@ msgstr "không thể lấy ngữ cảnh tiến trình" msgid "cannot get effective UID" msgstr "không thể lấy UID kết quả" -#: src/id.c:289 -#, fuzzy, c-format -msgid "cannot find name for user ID %lu" -msgstr "không tìm thấy tên cho ID %lu" +#: src/id.c:311 +#, 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:309 -#, fuzzy, c-format -msgid "uid=%lu" -msgstr "uid=%lu" +#: src/id.c:329 +#, c-format +msgid "uid=%s" +msgstr "uid=%s" -#: src/id.c:314 -#, fuzzy, c-format -msgid " gid=%lu" -msgstr " egid=%lu" +#: src/id.c:334 +#, c-format +msgid " gid=%s" +msgstr " gid=%s" -#: src/id.c:321 -#, fuzzy, c-format -msgid " euid=%lu" -msgstr " egid=%lu" +#: src/id.c:341 +#, c-format +msgid " euid=%s" +msgstr " euid=%s" -#: src/id.c:329 +#: src/id.c:349 #, c-format -msgid " egid=%lu" -msgstr " egid=%lu" +msgid " egid=%s" +msgstr " egid=%s" -#: src/id.c:357 +#: src/id.c:377 msgid " groups=" msgstr " nhóm=" -#: src/id.c:373 +#: src/id.c:393 #, c-format msgid " context=%s" msgstr "ngữ cảnh=%s" -#: src/install.c:372 +#: src/install.c:373 #, 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" +msgstr "cảnh báo: %s lỗi thay đổi ngữ cảnh thành %s" -#: src/install.c:413 +#: src/install.c:414 #, c-format msgid "creating directory %s" msgstr "đang tạo thư mục %s" -#: src/install.c:481 +#: src/install.c:482 #, 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:505 +#: src/install.c:506 #, c-format msgid "cannot set time stamps for %s" msgstr "không đặt được nhãn thời gian cho %s" -#: src/install.c:526 src/split.c:412 src/timeout.c:387 +#: src/install.c:527 src/split.c:426 src/timeout.c:439 #, 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:530 +#: src/install.c:531 #, c-format msgid "cannot run %s" msgstr "không chạy được %s" -#: src/install.c:534 +#: src/install.c:535 #, c-format msgid "waiting for strip" msgstr "đang đợi strip" -#: src/install.c:536 +#: src/install.c:537 #, c-format msgid "strip process terminated abnormally" msgstr "tiến trình strip đã kết thúc bất thường" -#: src/install.c:557 +#: src/install.c:558 #, c-format msgid "invalid user %s" msgstr "sai người dùng %s" -#: src/install.c:593 +#: src/install.c:594 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -4864,12 +4914,13 @@ msgid "" " or: %s [OPTION]... -t DIRECTORY SOURCE...\n" " or: %s [OPTION]... -d DIRECTORY...\n" msgstr "" -"Sử dụng: %s [TÙY_CHỌN]... [-T] NGUỒN ĐÍCH\n" -" 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" -" hoặc: %s [TÙY_CHỌN]... -d THƯ_MỤC...\n" +"Cách dùng: %s [TÙY_CHỌN]... [-T] NGUỒN ĐÍCH\n" +" 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" +" hoặc: %s [TÙY_CHỌN]... -d THƯ_MỤC...\n" -#: src/install.c:600 +#: src/install.c:601 +#, fuzzy msgid "" "\n" "This install program copies files (often just compiled) into destination\n" @@ -4881,10 +4932,9 @@ msgid "" "In the first three forms, copy SOURCE to DEST or multiple SOURCE(s) to\n" "the existing DIRECTORY, while setting permission modes and owner/group.\n" "In the 4th form, create all components of the given DIRECTORY(ies).\n" -"\n" 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" +"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" @@ -4907,10 +4957,10 @@ msgid "" " -d, --directory treat all arguments as directory names; create all\n" " components of the specified directories\n" msgstr "" -" --backup[=ĐIỀU_KHIỂN] tạo bản sao lưu 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" -" -c (bị lờ đi)\n" -" -C, --compare so sánh mỗi cặp tệp tin nguồn và đích,\n" +" --backup[=ĐIỀU_KHIỂN] tạo bản sao lưu 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" +" -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" @@ -4927,14 +4977,14 @@ msgid "" "x\n" " -o, --owner=OWNER set ownership (super-user only)\n" msgstr "" -" -D tạo mọi thành phần đi trước của mỗi ĐÍCH trừ cái " +" -D tạo mọi thành phần đi trước của mỗi ĐÍCH trừ cái " "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" +" 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" -" -m, --mode=CHẾ_ĐỘ đặt chế độ quyền hạn (như trong chmod),\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" +" -m, --mode=CHẾ_ĐỘ đặt chế độ quyền hạn (như trong chmod),\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 msgid "" @@ -4950,13 +5000,13 @@ msgid "" " -v, --verbose print the name of each directory as it is created\n" msgstr "" " -p, --preserve-timestamps áp dụng thời gian truy cập/sửa đổi cho các\n" -" tệp tin NGUỒN tới các tệp tin đích tương ứng\n" -" -s, --strip cắt bỏ các bảng ký hiệu\n" -" --strip-program=TRÌNH chương trình dùng để cắt bỏ tệp tin nhị phân\n" -" -S, --suffix=HẬU_TỐ ghi chèn hậu số sao lưu thường dùng\n" +" tập tin NGUỒN tới các tập tin đích tương ứng\n" +" -s, --strip cắt bỏ các bảng ký hiệu\n" +" --strip-program=TRÌNH chương trình dùng để cắt bỏ tập tin nhị phân\n" +" -S, --suffix=HẬU_TỐ ghi đè hậu số sao lưu thường dùng\n" " -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 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" +" -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 msgid "" @@ -4964,71 +5014,68 @@ msgid "" " -Z, --context=CONTEXT set SELinux security context of files and " "directories\n" msgstr "" -" --preserve-context \tbảo tồn ngữ cảnh bảo mật SELinux\n" -" -Z, --context=NGỮ_CẢNH \tđặt ngữ cảnh bảo mật SELinux\n" -"\t\t\t\t\t\t\tcủa các tệp tin và thư mục\n" +" --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" -#: src/install.c:858 +#: src/install.c:859 #, c-format msgid "" "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled" -msgstr "" -"CẢNH BÁO : lờ đi « --preserve-context » vì hạt nhân này không hiệu lực " -"SELinux" +msgstr "CẢNH BÁO: bỏ qua --preserve-context vì hệ thống không hỗ trợ SELinux" -#: src/install.c:868 +#: src/install.c:869 #, c-format msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled" -msgstr "" -"CẢNH BÁO : lờ đi « -context » (-Z) vì hạt nhân này không hiệu lực SELinux" +msgstr "CẢNH BÁO: bỏ qua -context (-Z) vì hệ thống không hỗ trợ SELinux" -#: src/install.c:885 +#: src/install.c:886 #, c-format msgid "the strip option may not be used when installing a directory" -msgstr "không dùng được tùy chọn strip khi cài đặt một thư mục" +msgstr "không được dùng tùy chọn strip khi cài đặt thư mục" -#: src/install.c:888 +#: src/install.c:889 #, 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 một thư mục" +msgstr "không cho phép dùng thư mục đích khi cài đặt thư mục" -#: src/install.c:892 +#: 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:946 src/mkdir.c:202 src/stdbuf.c:327 +#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326 #, c-format msgid "invalid mode %s" msgstr "chế độ sai %s" -#: src/install.c:953 +#: src/install.c:954 #, c-format msgid "WARNING: ignoring --strip-program option as -s option was not specified" -msgstr "CẢNH BÁO : lờ đi « --strip-program » vì không đưa ra tùy chọn « -s »" +msgstr "CẢNH BÁO: bỏ qua “--strip-program” vì không đưa ra tùy chọn “-s”" -#: src/install.c:958 +#: src/install.c:959 #, c-format msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive" msgstr "" -"hai tuỳ chọn « --compare » (-C) và « --preserve-timestamps » loại từ lẫn nhau" +"hai tùy chọn “--compare” (-C) và “--preserve-timestamps” loại từ lẫn nhau" -#: src/install.c:965 +#: src/install.c:966 #, c-format msgid "options --compare (-C) and --strip are mutually exclusive" -msgstr "hai tuỳ chọn « --compare » (-C) và « --strip » loại từ lẫn nhau" +msgstr "hai tùy chọn “--compare” (-C) và “--strip” loại từ lẫn nhau" -#: src/install.c:971 +#: src/install.c:972 #, c-format msgid "" "the --compare (-C) option is ignored when you specify a mode with non-" "permission bits" msgstr "" -"tuỳ chọn « --compare » (-C) bị bỏ qua khi bạn chỉ định một chế độ có bit " -"không cho phép" +"tùy chọn “--compare” (-C) bị bỏ qua khi bạn chỉ định một chế độ có bit không " +"cho phép" #. This is a proper name. See the gettext manual, section Names. -#: src/join.c:40 src/sort.c:65 +#: src/join.c:40 src/sort.c:66 msgid "Mike Haertel" msgstr "Mike Haertel" @@ -5045,12 +5092,12 @@ msgstr "" "Với mỗi cặp dòng văn bản đưa vào với trường để gia nhập giống nhau,\n" "ghi một dòng văn bản ra đầu ra tiêu chuẩn. Trường để gia nhập mặc định\n" "là đầu tiên, giới hạn bở khoảng trắng.\n" -"Khi FILE1 hoặc FILE2 (không đồng thời) là « - », đọc đầu vào tiêu chuẩn.\n" +"Khi FILE1 hoặc FILE2 (không đồng thời) là “-”, đọc đầu vào tiêu chuẩn.\n" "\n" -" -a FILENUM in ra dòng không có cặp từ tệp tin số FILENUM, ở đó\n" +" -a FILENUM in ra dòng không có cặp từ tập tin số FILENUM, ở đó\n" " FILENUM là 1 hoặc 2, tương ứng với FILENUM1 hoặc " "FILENUM2\n" -" -e EMPTY thay thế các trường nhập thiếu bằng EMPTY\n" +" -e EMPTY thay thế các trường nhập thiếu bằng EMPTY\n" #: src/join.c:200 msgid "" @@ -5059,9 +5106,9 @@ msgid "" " -o FORMAT obey FORMAT while constructing output line\n" " -t CHAR use CHAR as input and output field separator\n" msgstr "" -" -i, --ignore-case lờ đi sự khác nhau về kiểu chữ HOA/thường khi so sánh " +" -i, --ignore-case bỏ qua sự khác nhau về kiểu chữ HOA/thường khi so sánh " "các trường\n" -" -j TRƯỜNG tương đương với « -1 TRƯỜNG -2 TRƯỜNG »\n" +" -j TRƯỜNG tương đương với “-1 TRƯỜNG -2 TRƯỜNG”\n" " -o ĐỊNH_DẠNG tuân theo ĐỊNH_DẠNG khi tạo ra dòng kết quả\n" " -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" @@ -5077,16 +5124,16 @@ msgid "" " --header treat the first line in each file as field headers,\n" " print them without trying to pair them\n" msgstr "" -" -v TẬP_TIN_SỐ giống như « -a TẬP_TIN_SỐ »,\n" -"\t\t\t\tnhư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" +" -v TẬP_TIN_SỐ giống như “-a TẬP_TIN_SỐ”,\n" +" 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" -"\t\t\t\tthậm chí nếu tất cả các dòng nhập vào\n" -"\t\t\t\tcó khả năng ghép cặp\n" +" thậm chí nếu tất cả các dòng nhập 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" -" --header\t\txử lý dòng đầu của từng tệp tin là dòng đầu trường,\n" -"\t\t\tin ra mà không thử kết đôi\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 msgid "" @@ -5107,43 +5154,43 @@ msgid "" "warning message will be given.\n" msgstr "" "\n" -"Trừ phi đưa ra tuỳ chọn « -t CHAR », ký tự trắng nào đi trước\n" -"sẽ phân cách các trường và bị lờ đi, không thì thì phân cách bởi CHAR.\n" +"Trừ phi đưa ra tùy chọn “-t CHAR”, ký tự trắng nào đi trước\n" +"sẽ phân cách các trường và bị bỏ qua, không thì thì phân cách bởi CHAR.\n" "Mỗi FIELD được đánh số và bắt đầu đếm từ 1.\n" "FORMAT là một hoặc vài định dạng phân cách bởi một hay hơn\n" -"khoảng trắng hoặc dấu phẩy, với cấu trúc « FILENUM. FIELD »\n" -"hoặc « 0 ». FORMAT kết xuất mặc định đưa ra trường để nối lại,\n" +"khoảng trắng hoặc dấu phẩy, với cấu trúc “FILENUM. FIELD”\n" +"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" -"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ế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ó tuỳ chọn.\n" -"Ghi chú : việc so sánh tùy theo quy tắc của « LC_COLLATE ».\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" +"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 -#, c-format -msgid "%s:%ju: is not sorted: %.*s" +#, fuzzy, c-format +msgid "%s:%<PRIuMAX>: is not sorted: %.*s" msgstr "%s:%ju: chưa được sắp xếp: %.*s" #: src/join.c:840 src/join.c:1038 #, c-format msgid "invalid field number: %s" -msgstr "số thứ tự vùng sai: %s" +msgstr "số thứ tự trường sai: %s" #: src/join.c:861 src/join.c:870 #, c-format msgid "invalid field specifier: %s" -msgstr "sự xác định vùng sai: %s" +msgstr "sự xác định trường sai: %s" #: src/join.c:877 #, 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" +msgstr "sai số thứ tự tập tin trong sự xác định trường: %s" #: src/join.c:920 #, c-format @@ -5155,12 +5202,12 @@ msgstr "không tương thích nối lại hai trường %lu, %lu" 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:4414 +#: src/join.c:1101 src/sort.c:4468 #, c-format msgid "multi-character tab %s" msgstr "khoảng tab đa ký tự %s" -#: src/join.c:1105 src/sort.c:4419 +#: src/join.c:1105 src/sort.c:4473 #, c-format msgid "incompatible tabs" msgstr "các khoảng tab không tương thích với nhau" @@ -5168,7 +5215,7 @@ msgstr "các khoảng tab không tương thích với nhau" #: src/join.c:1174 #, c-format msgid "both files cannot be standard input" -msgstr "cả hai tệp tin không thể là đầu vào tiêu chuẩn" +msgstr "cả hai tập tin không thể là đầu vào chuẩn" #: src/kill.c:76 #, c-format @@ -5177,19 +5224,18 @@ msgid "" " or: %s -l [SIGNAL]...\n" " or: %s -t [SIGNAL]...\n" msgstr "" -"Sử dụng: %s [-s TÍN_HIỆU | -TÍN_HIỆU] PID...\n" -" hoặc: %s -l [TÍN_HIỆU]...\n" -" hoặc: %s -t [TÍN_HIỆU]...\n" +"Cách dùng: %s [-s TÍN_HIỆU | -TÍN_HIỆU] PID...\n" +" hoặc: %s -l [TÍN_HIỆU]...\n" +" hoặc: %s -t [TÍN_HIỆU]...\n" #: src/kill.c:82 -msgid "" -"Send signals to processes, or list signals.\n" -"\n" +#, 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" -#: src/kill.c:89 +#: src/kill.c:88 msgid "" " -s, --signal=SIGNAL, -SIGNAL\n" " specify the name or number of the signal to be sent\n" @@ -5203,7 +5249,7 @@ msgstr "" "tới/từ các số\n" " -t, --table in ra bảng thông tin về tín hiệu\n" -#: src/kill.c:97 +#: src/kill.c:96 msgid "" "\n" "SIGNAL may be a signal name like 'HUP', or a signal number like '1',\n" @@ -5211,37 +5257,37 @@ msgid "" "PID is an integer; if negative it identifies a process group.\n" msgstr "" "\n" -"TÍN_HIỆU có thể là một tên tín hiệu như « HUP » (treo, gác), hoặc một số thứ " -"tự tín hiệu như « 1 »,\n" +"TÍN_HIỆU có thể là một tên tín hiệu như “HUP” (treo, gác), hoặc một số thứ " +"tự tín hiệu như “1”,\n" "hoặc trạng thái thoát của một tiến trình dừng bởi một tín hiệu.\n" "PID là một số nguyên, nếu âm thì đại diện cho một nhóm tiến trình.\n" -#: src/kill.c:206 +#: src/kill.c:205 #, c-format msgid "%s: invalid process id" msgstr "%s: mã số tiến trình sai" -#: src/kill.c:260 +#: src/kill.c:259 #, c-format msgid "invalid option -- %c" msgstr "tùy chọn sai -- %c" -#: src/kill.c:269 +#: src/kill.c:268 #, c-format msgid "%s: multiple signals specified" msgstr "%s: đã chỉ ra nhiều tín hiệu" -#: src/kill.c:283 +#: src/kill.c:282 #, c-format msgid "multiple -l or -t options specified" -msgstr "đã chỉ ra vài tùy chọn « -l » hoặc « -t »" +msgstr "xác định nhiều tùy chọn “-l” hoặc “-t”" -#: src/kill.c:300 +#: src/kill.c:299 #, c-format msgid "cannot combine signal with -l or -t" -msgstr "không thể kết hợp tín hiệu với « -l » hoặc « -t »" +msgstr "không thể kết hợp tín hiệu với “-l” hoặc “-t”" -#: src/kill.c:306 +#: src/kill.c:305 #, c-format msgid "no process ID specified" msgstr "chưa ghi rõ ID tiến trình" @@ -5249,7 +5295,7 @@ msgstr "chưa ghi rõ ID tiến trình" #: src/libstdbuf.c:109 #, c-format msgid "failed to allocate a %<PRIuMAX> byte stdio buffer\n" -msgstr "lỗi cấp phát một vùng đệm V/R tiêu chuẩn %<PRIuMAX> byte\n" +msgstr "gặp lỗi khi cấp phát một vùng đệm I/O tiêu chuẩn %<PRIuMAX> byte\n" #: src/libstdbuf.c:116 #, c-format @@ -5272,8 +5318,8 @@ msgid "" "Usage: %s FILE1 FILE2\n" " or: %s OPTION\n" msgstr "" -"Sử dụng: %s TẬP_TIN1 TẬP_TIN2\n" -" hoặc: %s TÙY_CHỌN\n" +"Cách dùng: %s TẬP_TIN1 TẬP_TIN2\n" +" hoặc: %s TÙY_CHỌN\n" #: src/link.c:48 msgid "" @@ -5296,7 +5342,7 @@ msgstr "%s: không cho phép liên kết cứng tới thư mục" #: src/ln.c:255 #, c-format msgid "%s: cannot overwrite directory" -msgstr "%s: không ghi chèn được thư mục" +msgstr "%s: không ghi đè được thư mục" #: src/ln.c:260 #, c-format @@ -5336,12 +5382,13 @@ msgid "" " or: %s [OPTION]... TARGET... DIRECTORY (3rd form)\n" " or: %s [OPTION]... -t DIRECTORY TARGET... (4th form)\n" msgstr "" -"Sử dụng: %s [TÙY_CHỌN]... [-T] ĐÍCH TÊN_LIÊN_KẾT (dạng thứ 1)\n" -" hoặc: %s [TÙY_CHỌN]... ĐÍCH (dạng thứ 2)\n" -" 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" +"Cách dùng: %s [TÙY_CHỌN]... [-T] ĐÍCH TÊN_LIÊN_KẾT (dạng thứ 1)\n" +" hoặc: %s [TÙY_CHỌN]... ĐÍCH (dạng thứ 2)\n" +" 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 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" @@ -5351,7 +5398,6 @@ msgid "" "When creating hard links, each TARGET must exist. Symbolic links\n" "can hold arbitrary text; if later resolved, a relative link is\n" "interpreted in relation to its parent directory.\n" -"\n" 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" @@ -5364,7 +5410,7 @@ msgstr "" "được hiểu là mối quan hệ với thư mục cấp trên.\n" "\n" -#: src/ln.c:395 +#: src/ln.c:394 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -5376,19 +5422,17 @@ msgid "" "superuser)\n" " -f, --force remove existing destination files\n" msgstr "" -" --backup[=ĐIỀU_KHIỂN] tạo bản sao lưu của mỗi tệp tin tồn tại ở nơi " +" --backup[=ĐIỀU_KHIỂN] tạo bản sao lưu của mỗi tập tin tồn tại ở nơi " "đến\n" -" -b giống « --backup » nhưng không chấp nhận đối " -"số\n" +" -b giống “--backup” nhưng không chấp nhận đối số\n" " -d, -F, --directory cho phép siêu người dùng thử tạo liên kết " "cứng\n" -" tới thư mục (ghi chú : rất có thể sẽ không " -"thành công\n" -" do hạn chế của hệ thống, 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" +" tới thư mục (chú ý: rất có thể sẽ không\n" +" thành công do hạn chế của hệ thống,\n" +" 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:403 +#: src/ln.c:402 msgid "" " -i, --interactive prompt whether to remove destinations\n" " -L, --logical dereference TARGETs that are symbolic links\n" @@ -5402,9 +5446,9 @@ 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" -" -n, --no-dereference xử lý LINK_NAME như các tệp tin thông thường " -"nếu nó là\n" -" liên kết tượng trưng đến một thư mục\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í " @@ -5412,7 +5456,7 @@ msgstr "" " -s, --symbolic tạo liên kết tượng trưng thay cho liên kết " "cứng\n" -#: src/ln.c:412 +#: src/ln.c:411 msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" " -t, --target-directory=DIRECTORY specify the DIRECTORY in which to " @@ -5423,33 +5467,19 @@ msgid "" msgstr "" " -S, --suffix=HẬU_TỐ dùng thay cho hậu tố sao lưu thông thường\n" " -t, --target-directory=THƯ_MỤC chỉ ra THƯ_MỤC đến đó cần tạo\n" -" liên kết\n" -" -T, --no-target-directory luôn coi TÊN_LIÊN_KẾT là một tệp tin thông " +" các liên kết\n" +" -T, --no-target-directory luôn coi TÊN_LIÊN_KẾT là một tập tin thông " "thường\n" -" -v, --verbose in ra tên của mỗi tệp tin đã liên kết\n" +" -v, --verbose in ra tên của mỗi tập tin đã liên kết\n" -#: src/ln.c:428 +#: src/ln.c:433 +#, fuzzy, c-format 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 không bao giờ tạo bản sao lưu (dù có đưa ra --backup)\n" -" numbered, t tạo các bản sao lưu đã đánh số\n" -" existing, nil đánh số nếu có bản sao lưu đánh số, nếu không thì dùng " -"dạng đơn giản\n" -" simple, never luôn luôn tạo sao lưu dạng đơn giản\n" "\n" - -#: src/ln.c:435 -#, c-format -msgid "" "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 tuỳ chọn -s thì lờ cả hai -L và -P. Không thì tuỳ chọn đưa ra cuối " +"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 " "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" @@ -5457,23 +5487,23 @@ msgstr "" #, 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 !]" +"không thể kết hợp “--target-directory” và “--no-target-directory” [loại từ " +"lẫn nhau !]" #: src/ln.c:588 #, c-format msgid "cannot do --relative without --symbolic" -msgstr "không thực hiện tuỳ chọn --relative mà không có --symbolic" +msgstr "không thực hiện tùy chọn --relative mà không có --symbolic" #. This is a proper name. See the gettext manual, section Names. #: src/logname.c:30 msgid "FIXME: unknown" -msgstr "SỬA ĐI: không rõ" +msgstr "FIXME: không hiểu" #: src/logname.c:39 src/sync.c:40 #, c-format msgid "Usage: %s [OPTION]\n" -msgstr "Sử dụng: %s [TÙY_CHỌN]\n" +msgstr "Cách dùng: %s [TÙY_CHỌN]\n" #: src/logname.c:40 msgid "" @@ -5495,7 +5525,7 @@ msgstr "không có tên đăng nhập" #. will count bytes rather than characters in multibyte locales. #: src/ls.c:732 msgid "%b %e %Y" -msgstr "%b %e %Y" +msgstr "%e %b %Y" #. TRANSLATORS: ls output needs to be aligned for ease of reading, #. so be wary of using variable width fields from the locale. @@ -5504,26 +5534,26 @@ msgstr "%b %e %Y" #. will count bytes rather than characters in multibyte locales. #: src/ls.c:745 msgid "%b %e %H:%M" -msgstr "%b %e %H:%M" +msgstr "%H:%M %e %b" #: src/ls.c:1580 #, c-format msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" msgstr "" -"đang lờ đi giá trị sai của biến môi trường kiểu dáng trích dẫn " +"đ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 #, c-format msgid "ignoring invalid width in environment variable COLUMNS: %s" -msgstr "đang lờ đi bề rộng sai trong biến môi trường cột 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 #, c-format msgid "ignoring invalid tab size in environment variable TABSIZE: %s" -msgstr "đang lờ đi kích cỡ tab sai trong biến môi trường 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:1976 +#: src/ls.c:1750 src/ptx.c:1975 #, c-format msgid "invalid line width: %s" msgstr "sai bề rộng dòng: %s" @@ -5544,22 +5574,23 @@ msgstr "Đối số không hợp lệ là:\n" #: src/ls.c:2061 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" +msgstr " - +FORMAT (e.g., +%H:%M) cho định dạng “date”-style\n" #: src/ls.c:2096 #, c-format msgid "error initializing month strings" -msgstr "lỗi sơ khởi các chuỗi tháng" +msgstr "lỗi khởi tạo các chuỗi tháng" #: src/ls.c:2407 #, c-format msgid "unrecognized prefix: %s" -msgstr "tiền tố không nhận ra: %s" +msgstr "không hiểu tiền tố: %s" #: src/ls.c:2437 #, 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 màu sắc LS_COLORS" +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 #, c-format @@ -5586,23 +5617,22 @@ msgstr "đang đọc thư mục %s" msgid "closing directory %s" msgstr "đang đóng thư mục %s" -#: src/ls.c:3301 +#: src/ls.c:3302 #, 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" +msgstr "không so sánh được tên tập tin %s và %s" #: src/ls.c:4721 +#, 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" -"\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" +"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" -#: src/ls.c:4729 +#: src/ls.c:4728 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -5610,13 +5640,13 @@ msgid "" " -b, --escape print C-style escapes for nongraphic " "characters\n" msgstr "" -" -a, --all đừng bỏ qua mục bắt đầu với « . »\n" -" -A, --almost-all đừng liệt kê « . » và « .. » đã ngụ ý\n" -" --author với « -l » thì in ra tác giả của mỗi tệp tin\n" -" -b, --escape in ra giá trị thoát kiểu C cho ký tự không phải " -"đồ họa\n" +" -a, --all đừng bỏ qua mục bắt đầu với “.”\n" +" -A, --almost-all đừng liệt kê “.” và “..” theo ngầm định\n" +" --author với “-l” thì in ra tác giả của mỗi tập tin\n" +" -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:4735 +#: src/ls.c:4734 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them. E." "g.,\n" @@ -5631,20 +5661,20 @@ msgid "" msgstr "" " --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 kết thúc « ~ » đã ngụ ý\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 " -"trạng thái tệp tin)\n" -" với « -l »: hiển thị ctime và sắp xếp theo " -"tên\n" -" nếu không: sắp xếp theo ctime, sớm nhất xếp " -"đầu tiên\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" +" 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:4745 +#: src/ls.c:4744 msgid "" " -C list entries by columns\n" " --color[=WHEN] colorize the output. WHEN defaults to " @@ -5658,16 +5688,16 @@ 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" -" • never không bao giờ\n" -" • always luôn luôn (mặc định)\n" -" • auto tự động\n" +" * never không bao giờ\n" +" * always luôn luôn (mặc định)\n" +" * auto tự động\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, --dired tạo kết xuất thích hợp với chế độ dired của " "Emacs\n" -#: src/ls.c:4753 +#: src/ls.c:4752 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -5676,27 +5706,26 @@ msgid "" " single-column -1, verbose -l, vertical -C\n" " --full-time like -l --time-style=full-iso\n" msgstr "" -" -f không sắp xếp, dùng « -aU », tắt « -ls --color " -"»\n" -" -F, --classify phụ thêm chỉ thị (một trong « */=>@| ») vào các " +" -f không sắp xếp, dùng “-aU”, tắt “-ls --color”\n" +" -F, --classify nối thêm chỉ thị (một trong “*/=>@|”) vào các " "mục\n" -" --file-type cũng vậy, trừ không phụ thêm « * »\n" +" --file-type cũng vậy, nhưng không nối thêm “*”\n" " --format=TỪ TỪ là:\n" -" • across -x ngang qua\n" -" • commas -m dấu phẩy\n" -" • horizontal -x nằm ngang\n" -" • long -l dài\n" -" • single-column -1 cột đơn\n" -" • verbose -l xuất chi tiết\n" -" • vertical -C thẳng đứng\n" -" --full-time giống « -l --time-style=full-iso »\n" - -#: src/ls.c:4761 +" * across -x ngang qua\n" +" * commas -m dấu phẩy\n" +" * horizontal -x nằm ngang\n" +" * long -l dài\n" +" * single-column -1 cột đơn\n" +" * verbose -l xuất chi tiết\n" +" * vertical -C thẳng đứng\n" +" --full-time giống “-l --time-style=full-iso”\n" + +#: src/ls.c:4760 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" +" -g giống “-l”, nhưng không liệt kê người sở hữu\n" -#: src/ls.c:4764 +#: src/ls.c:4763 msgid "" " --group-directories-first\n" " group directories before files.\n" @@ -5704,12 +5733,12 @@ msgid "" " use of --sort=none (-U) disables grouping\n" msgstr "" " --group-directories-first\n" -" nhóm lại các thư mục trước các tệp tin.\n" -"\t\t\t\tLàm tăng lên với tùy chọn « --sort »,\n" -"\t\t\t\tnhưng bất cứ lần nào dùng « --sort=none » (-U)\n" -"\t\t\t\tsẽ tắt chức năng nhóm lại.\n" +" nhóm lại các thư mục trước các tập tin.\n" +" Làm tăng lên với tùy chọn “--sort”,\n" +" 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:4770 +#: src/ls.c:4769 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" @@ -5717,12 +5746,12 @@ msgid "" " --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”, 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 " "phải 1024\n" -#: src/ls.c:4776 +#: src/ls.c:4775 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5740,10 +5769,10 @@ msgstr "" " đi theo mỗi liên kết mềm trên dòng lệnh\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 " -"trình bao\n" -" (ghi chèn bởi « -a » hoặc « -A »)\n" +"shell\n" +" (ghi đè bởi “-a” hoặc “-A”)\n" -#: src/ls.c:4786 +#: src/ls.c:4785 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -5754,15 +5783,15 @@ msgid "" "PATTERN\n" " -k, --kibibytes use 1024-byte blocks\n" msgstr "" -" --indicator-style=TỪ phụ thêm vào tên mục chỉ thị với dạng TỪ :\n" -" không có(mặc định), dấu xuyệc (-p)\n" -" kiểu tệp tin(--file-type), phân loại(-F)\n" -" -i, --inode in ra số chỉ mục của mỗi tệp tin\n" +" --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" +" -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 " -"trình bao\n" +"shell\n" " -k, --kibibytes sử dụng khối 1024-byte\n" -#: src/ls.c:4796 +#: src/ls.c:4795 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5773,13 +5802,13 @@ msgid "" msgstr "" " -l dùng dạng danh sách dài\n" " -L, --dereference khi hiển thị thông tin cho một liên kết mềm,\n" -" hiển thị thông tin cho tệp tin mà liên kết " +" hiển thị thông tin cho tập tin mà liên kết " "chỉ\n" " đến thay cho bản thân liên kết\n" " -m liệt kê liền nhau các mục, cách nhau bởi dấu " "phẩy\n" -#: src/ls.c:4804 +#: src/ls.c:4803 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. " @@ -5789,15 +5818,15 @@ msgid "" " -p, --indicator-style=slash\n" " append / indicator to directories\n" msgstr "" -" -n, --numeric-uid-gid giống « -l », nhưng liệt kê UID và GID dạng số\n" +" -n, --numeric-uid-gid giống “-l”, nhưng liệt kê UID và GID dạng số\n" " -N, --literal in ra tên thô của các mục (v.d. không coi các\n" " ký tự điều khiển là đặc biệt)\n" -" -o giống « -l », nhưng không liệt kê thông tin về " +" -o giống “-l”, nhưng không liệt kê thông tin về " "nhóm\n" " -p, --indicator-style=slash\n" -" phụ thêm vào thư mục chỉ thị « / »\n" +" nối thêm vào thư mục chỉ thị “/”\n" -#: src/ls.c:4812 +#: src/ls.c:4811 msgid "" " -q, --hide-control-chars print ? instead of non graphic characters\n" " --show-control-chars show non graphic characters as-is (default\n" @@ -5808,23 +5837,23 @@ msgid "" " 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 đồ " +" -q, --hide-control-chars in dấu “?” thay cho các ký tự không phải đồ " "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à " +" (mặc định trừ khi chương trình là “ls” và " "đầu\n" " ra là thiết bị cuối)\n" " -Q, --quote-name đặt tên các mục trong ngoặc kép\n" " --quoting-style=TỪ dùng dạng trích dẫn TỪ cho tên các mục:\n" -" • literal nghĩa chữ\n" -" • locale miền địa phương\n" -" • shell trình bao\n" -" • shell-always luôn luôn trình bao\n" -" • c\n" -" • escape thoát\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" +" * c\n" +" * escape thoát\n" -#: src/ls.c:4821 +#: src/ls.c:4820 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -5833,10 +5862,10 @@ msgid "" msgstr "" " -r, --reverse đảo ngược thứ tự khi sắp xếp\n" " -R, --recursive liệt kê đệ quy các thư mục con\n" -" -s, --size in kích cỡ đã cấp phát của mỗi tệp tin, theo " +" -s, --size in kích cỡ đã cấp phát của mỗi tập tin, theo " "khối\n" -#: src/ls.c:4826 +#: src/ls.c:4825 msgid "" " -S sort by file size\n" " --sort=WORD sort by WORD instead of name: none -U,\n" @@ -5847,25 +5876,25 @@ msgid "" " or status -c; use specified time as sort key\n" " if --sort=time\n" msgstr "" -" -S sắp xếp theo kích cỡ tệp tin\n" +" -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" -" --time=TỪ với « -l », hiển thị thời gian theo TỪ\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" +" --time=TỪ với “-l”, hiển thị thời gian theo TỪ\n" " thay vì thời gian sửa đổi:\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 " +" * 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" +" * status -c thời gian lấy trạng thái\n" " dùng thời gian chỉ ra làm tiêu\n" -" chuẩn sắp xếp nếu « --sort=time »\n" +" chuẩn sắp xếp nếu “--sort=time”\n" -#: src/ls.c:4836 +#: src/ls.c:4835 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, +FORMAT.\n" @@ -5876,27 +5905,26 @@ msgid "" " 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 " +" --time-style=KIỂU_DÁNG với “-l”, hiển thị các thời gian theo " "KIỂU_DÁNG:\n" -" • full-iso ISO đầy đủ\n" -" • long-iso ISO dài\n" -" • 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" -" nếu ĐỊNH_DẠNG là « " -"ĐỊ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 " -"phải vừa mở,\n" -" và ĐỊNH_DẠNG2 áp dụng cho các tập tin vừa " -"mở;\n" -" nếu KIỂU_DÁNG có tiền tố « posix- » đứng " +" * full-iso ISO đầy đủ\n" +" * long-iso ISO dài\n" +" * 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" +" nếu ĐỊNH_DẠNG là " +"”ĐỊ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" -#: src/ls.c:4845 +#: src/ls.c:4844 msgid "" " -t sort by modification time, newest first\n" " -T, --tabsize=COLS assume tab stops at each COLS instead of 8\n" @@ -5904,7 +5932,7 @@ 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:4849 +#: src/ls.c:4848 msgid "" " -u with -lt: sort by, and show, access time\n" " with -l: show access time and sort by name\n" @@ -5912,17 +5940,17 @@ msgid "" " -U do not sort; list entries in directory order\n" " -v natural sort of (version) numbers within text\n" msgstr "" -" -u với « -lt »: sắp xếp theo, và hiển thị thời " -"gian truy cập\n" -" với « -l »: hiển thị thời gian truy cập và " -"sắp xếp theo tên\n" +" -u với “-lt”: sắp xếp theo, và hiển thị thời gian " +"truy cập\n" +" 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 " "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:4856 +#: src/ls.c:4855 msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" @@ -5935,11 +5963,11 @@ msgstr "" "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 \t 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" +" -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:4866 +#: src/ls.c:4865 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5948,15 +5976,15 @@ msgid "" "variable can change the settings. Use the dircolors command to set it.\n" msgstr "" "\n" -"Chức năng sử dụng màu sắc để phân biệt các kiểu tệp tin khác nhau\n" -"cũng bị tắt theo mặc định và khi dùng tuỳ chọn « --color=never »\n" -"(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 nó.\n" +"Chức năng sử dụng màu sắc để phân biệt các kiểu tập tin khác nhau\n" +"cũng bị tắt theo mặc định và khi dùng tùy chọn “--color=never”\n" +"(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 " +"nó.\n" -#: src/ls.c:4873 +#: src/ls.c:4872 msgid "" "\n" "Exit status:\n" @@ -5967,7 +5995,7 @@ msgstr "" "\n" "Trạng thái thoát:\n" " 0 nếu ổn,\n" -" 1 nếu gặp lỗi không đáng kể (v.d. không thể truy cập đến thư mục con),\n" +" 1 nếu gặp lỗi nhỏ (v.d. không thể truy cập đến thư mục con),\n" " 2 nếu gặp lỗi nghiêm trọng (v.d. không thể truy cập đến đối số dòng lệnh)\n" #. This is a proper name. See the gettext manual, section Names. @@ -5985,7 +6013,7 @@ msgstr "Scott Miller" msgid "David Madore" msgstr "David Madore" -#: src/md5sum.c:162 +#: src/md5sum.c:164 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -5993,40 +6021,44 @@ msgid "" "With no FILE, or when FILE is -, read standard input.\n" "\n" msgstr "" -"Sử dụng: %s [TÙY_CHỌN]... [TẬP_TIN]...\n" +"Cách dùng: %s [TÙY_CHỌN]... [TẬP_TIN]...\n" "In hoặc tính tổng kiểm tra %s (%d bit).\n" -"Nếu không có TẬP_TIN, hoặc khi TẬP_TIN là « - », đọc đầu vào tiêu chuẩn.\n" +"Nếu không có TẬP_TIN, hoặc khi TẬP_TIN là “-”, đọc đầu vào tiêu chuẩn.\n" "\n" -#: src/md5sum.c:172 +#: src/md5sum.c:174 msgid "" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr "" -" -b, --binary đọc ở chế độ nhị phân\n" -" (mặc định trừ khi đọc đầu vào tiêu chuẩn tty)\n" +" -b, --binary đọc ở chế độ nhị phân\n" +" (mặc định trừ khi đọc đầu vào tiêu chuẩn tty)\n" -#: src/md5sum.c:176 +#: src/md5sum.c:178 msgid " -b, --binary read in binary mode\n" -msgstr " -b, --binary đọc ở chế độ nhị phân \n" +msgstr " -b, --binary đọc ở chế độ nhị phân \n" -#: src/md5sum.c:179 +#: src/md5sum.c:181 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" -msgstr " -c, --check đọc tổng %s từ các FILE và kiểm tra\n" +msgstr " -c, --check đọc tổng %s từ các FILE và kiểm tra\n" + +#: src/md5sum.c:184 +msgid " --tag create a BSD-style checksum\n" +msgstr " --tag tạo tổng kiểm tra kiểu-BSD\n" -#: src/md5sum.c:183 +#: src/md5sum.c:188 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" -" -t, --text đọc ở chế độ văn bản\n" -" (mặc định khi đọc đầu vào tiêu chuẩn tty\n" +" -t, --text đọc ở chế độ văn bản\n" +" (mặc định khi đọc đầu vào tiêu chuẩn tty\n" -#: src/md5sum.c:187 +#: src/md5sum.c:192 msgid " -t, --text read in text mode (default)\n" -msgstr " -t, --text đọc ở chế độ văn bản (mặc định) \n" +msgstr " -t, --text đọc ở chế độ văn bản (mặc định) \n" -#: src/md5sum.c:190 +#: src/md5sum.c:195 msgid "" "\n" "The following three options are useful only when verifying checksums:\n" @@ -6037,20 +6069,20 @@ msgid "" msgstr "" "\n" "Ba tùy chọn sau chỉ có ích khi tính tổng kiểm tra (checksum):\n" -" --quiet đừng in ra OK cho mỗi tệp tin được thẩm tra đúng\n" -" --status không đưa ra gì cả, mã trạng thái cho biết thành công\n" -" -w, --warn cảnh báo về những dòng tổng kiểm tra có định dạng không " -"đúng\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" +" -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:198 +#: 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 " -"0 với đầu vào bất kỳ\n" +" --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:203 +#: src/md5sum.c:208 #, c-format msgid "" "\n" @@ -6062,96 +6094,104 @@ msgstr "" "\n" "Tổng được tính như mô tả trong %s. Khi kiểm tra, dữ liệu vào phải là\n" "dữ liệu ra trước đây của chương trình này. Chế độ mặc định là in ra\n" -"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" +"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:502 +#: src/md5sum.c:523 #, c-format msgid "%s: too many checksum lines" msgstr "%s: quá nhiều dòng tổng kiểm tra" -#: src/md5sum.c:526 +#: src/md5sum.c:547 #, 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:551 +#: src/md5sum.c:572 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: mở hoặc đọc BỊ LỖI\n" -#: src/md5sum.c:574 +#: src/md5sum.c:595 msgid "FAILED" msgstr "BỊ LỖI" -#: src/md5sum.c:576 +#: src/md5sum.c:597 msgid "OK" msgstr "OK" -#: src/md5sum.c:600 +#: src/md5sum.c:621 #, 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:610 +#: src/md5sum.c:631 #, 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:618 +#: src/md5sum.c:639 #, 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>" +msgstr[0] "CẢNH BÁO: không đọc được %<PRIuMAX>" -#: src/md5sum.c:626 +#: src/md5sum.c:647 #, 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" +msgstr[0] "CẢNH BÁO: %<PRIuMAX> đã kiểm tra KHÔNG tương ứng" -#: src/md5sum.c:704 +#: src/md5sum.c:760 +#, c-format +msgid "--tag does not support --text mode" +msgstr "--tag không hỗ trợ chế độ --text" + +#: src/md5sum.c:766 +#, 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 #, 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" +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:712 +#: src/md5sum.c:781 #, 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" +msgstr "tùy chọn “--status” chỉ có ý nghĩa khi tính tổng kiểm tra" -#: src/md5sum.c:719 +#: src/md5sum.c:788 #, 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" +msgstr "tùy chọn “--warn” chỉ có ý nghĩa khi tính tổng kiểm tra" -#: src/md5sum.c:726 +#: src/md5sum.c:795 #, 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" +msgstr "tùy chọn “--quiet” chỉ có ý nghĩa khi tính tổng kiểm tra" -#: src/md5sum.c:733 +#: src/md5sum.c:802 #, 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" +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 #, c-format msgid "Usage: %s [OPTION]... DIRECTORY...\n" -msgstr "Sử dụng: %s [TÙY_CHỌN]... THƯ_MỤC...\n" +msgstr "Cách dùng: %s [TÙY_CHỌN]... THƯ_MỤC...\n" #: src/mkdir.c:57 -msgid "" -"Create the DIRECTORY(ies), if they do not already exist.\n" -"\n" +#, fuzzy +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" -#: src/mkdir.c:64 +#: src/mkdir.c:63 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" @@ -6159,14 +6199,14 @@ msgid "" " -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" +" -m, --mode=CHẾ_ĐỘ đặt chế độ tập tin (giống như chmod),\n" +" thay cho “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" -"\t\t\t\t\t\tcủa mỗi thư mục đã tạo thành NGỮ_CẢNH\n" +" của mỗi thư mục đã tạo thành NGỮ_CẢNH\n" -#: src/mkdir.c:169 +#: src/mkdir.c:168 #, c-format msgid "created directory %s" msgstr "đã tạo thư mục %s" @@ -6174,60 +6214,58 @@ msgstr "đã tạo thư mục %s" #: src/mkfifo.c:51 src/pathchk.c:89 #, c-format msgid "Usage: %s [OPTION]... NAME...\n" -msgstr "Sử dụng: %s [TÙY_CHỌN]... TÊN...\n" +msgstr "Cách dùng: %s [TÙY_CHỌN]... TÊN...\n" #: src/mkfifo.c:52 -msgid "" -"Create named pipes (FIFOs) with the given NAMEs.\n" -"\n" +#, fuzzy +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" -#: src/mkfifo.c:59 src/mknod.c:61 +#: src/mkfifo.c:58 src/mknod.c:60 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" +" -m, --mode=CHẾ_ĐỘ đặt quyền hạn tập tin thành CHẾ_ĐỘ,\n" +" thay cho “a=rw - umask”\n" -#: src/mkfifo.c:62 +#: src/mkfifo.c:61 msgid "" " -Z, --context=CTX set the SELinux security context of each NAME to CTX\n" msgstr "" -" -Z, --context=NGỮ_CẢNH đặt ngữ cảnh bảo mật SELinux\n" -"\t\t\t\t\t\tcủa mỗi TÊN thành NGỮ_CẢNH\n" +" -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" -#: src/mkfifo.c:122 src/mknod.c:128 +#: src/mkfifo.c:121 src/mknod.c:127 #, c-format msgid "invalid mode" msgstr "chế độ không hợp lệ" -#: src/mkfifo.c:127 src/mknod.c:133 +#: src/mkfifo.c:126 src/mknod.c:132 #, 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" +msgstr "chế độ phải xác định chỉ các bit đặt quyền hạn tập tin" #: src/mknod.c:52 #, c-format msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n" -msgstr "Sử dụng: %s [TÙY_CHỌN]... TÊN KIỂU [LỚN NHỎ]\n" +msgstr "Cách dùng: %s [TÙY_CHỌN]... TÊN KIỂU [LỚN NHỎ]\n" #: src/mknod.c:54 -msgid "" -"Create the special file NAME of the given TYPE.\n" -"\n" +#, fuzzy +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" +"Tạo tập tin đặc biệt với TÊN và KIỂU đưa ra.\n" "\n" -#: src/mknod.c:64 +#: 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" -"\t\t\t\t\t\tcủa TÊN thành NGỮ_CẢNH\n" +" -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:69 +#: src/mknod.c:68 msgid "" "\n" "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n" @@ -6240,12 +6278,12 @@ msgstr "" "và phải bỏ đi khi KIỂU là p.\n" "Nếu LỚN hoặc NHỎ bắt đầu với:\n" " tiền tố giải thích dạng\n" -" • 0x hoặc 0X thập lục\n" -" • 0 bát phân\n" -" • gì khác thập phân\n" +" * 0x hoặc 0X thập lục\n" +" * 0 bát phân\n" +" * gì khác thập phân\n" "KIỂU có thể là:\n" -#: src/mknod.c:76 +#: src/mknod.c:75 msgid "" "\n" " b create a block (buffered) special file\n" @@ -6253,44 +6291,44 @@ msgid "" " p create a FIFO\n" msgstr "" "\n" -" b tạo một tệp tin đặc biệt kiểu khối (có bộ đệm)\n" -" c, u tạo một tệp tin đặc biệt kiểu ký tự (không có bộ đệm)\n" +" b tạo một tập tin đặc biệt kiểu khối (có bộ đệm)\n" +" 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:151 +#: src/mknod.c:150 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ỏ." +msgstr "Tập tin đặc biệt yêu cầu các số thiết bị lớn và nhỏ." -#: src/mknod.c:161 +#: src/mknod.c:160 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:177 +#: src/mknod.c:176 #, c-format msgid "block special files not supported" -msgstr "không hỗ trợ tệp tin đặc biệt kiểu khối" +msgstr "không hỗ trợ tập tin đặc biệt kiểu khối" -#: src/mknod.c:186 +#: src/mknod.c:185 #, c-format msgid "character special files not supported" -msgstr "không hỗ trợ tệp tin đặc biệt kiểu ký tự" +msgstr "không hỗ trợ tập tin đặc biệt kiểu ký tự" -#: src/mknod.c:202 +#: src/mknod.c:201 #, c-format msgid "invalid major device number %s" msgstr "sai số lớn của thiết bị %s" -#: src/mknod.c:207 +#: src/mknod.c:206 #, c-format msgid "invalid minor device number %s" msgstr "sai số nhỏ của thiết bị %s" -#: src/mknod.c:212 +#: src/mknod.c:211 #, c-format msgid "invalid device %s %s" msgstr "sai thiết bị %s %s" -#: src/mknod.c:226 +#: src/mknod.c:225 #, c-format msgid "invalid device type %s" msgstr "sai kiểu thiết bị %s" @@ -6304,7 +6342,7 @@ msgstr "Eric Blake" #: src/mktemp.c:68 #, c-format msgid "Usage: %s [OPTION]... [TEMPLATE]\n" -msgstr "Sử dụng: %s [TÙY_CHỌN]... [MẪU]\n" +msgstr "Cách dùng: %s [TÙY_CHỌN]... [MẪU]\n" #: src/mktemp.c:69 msgid "" @@ -6314,12 +6352,12 @@ msgid "" 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" +"Không ghi rõ MẪU thì dùng “tmp.XXXXXXXXXX”, và “--tmpdir” được dùng.\n" #: src/mktemp.c:74 msgid "" "Files are created u+rw, and directories u+rwx, minus umask restrictions.\n" -msgstr "Tệp đượ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 u+rw, và thư mục u+rwu, không có ràng buộc umask.\n" #: src/mktemp.c:78 msgid "" @@ -6327,9 +6365,9 @@ msgid "" " -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 tạo một thư mục, không phải một tệp tin\n" +" -d, --directory tạo một thư mục, không phải một tập tin\n" " -u, --dry-run đừng tạo gì, chỉ in ra một tên (không an toàn)\n" -" -q, --quiet thu hồi các hàm chẩn đoán về lỗi tạo tệp tin hay thư " +" -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 @@ -6339,9 +6377,10 @@ msgid "" " This option is implied if TEMPLATE does not end in " "X.\n" msgstr "" -" --suffix=HẬU_TỐ phụ 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\t\tTuỳ chọn này được ngụ ý nếu MẪU không kết thúc bằng chữ X.\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 msgid "" @@ -6351,12 +6390,13 @@ msgid "" " 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.\n" -"\t\t\tKhông ghi rõ THƯ_MỤC thì dùng $TMPDIR (nếu đặt),\n" -"\t\t\tkhông thì « /tmp ».\n" -"\t\t\tKhi dùng tùy chọn này, MẪU không thể là một tên tuyệt đối.\n" -"\t\t\tKhông giống như « -t », MẪU có thể chứa dấu xuyệc,\n" -"\t\t\tnhưng mktemp chỉ tạo thành phần cuối cùng.\n" +" --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ì “/" +"tmp”.\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" #: src/mktemp.c:95 msgid "" @@ -6365,67 +6405,65 @@ msgid "" " 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 THƯ_MỤC làm tiền tố ; ngụ ý « -t » [bị phản " -"đối]\n" -" -t giải thích MẪU là một thành phần tên tệp tin đơn,\n" -"\t\t\ttương đối so với một thư mục: $TMPDIR, nếu đặt;\n" -"\t\t\tkhông thì thư mục được ghi rõ với « -p »;\n" -"\t\t\tkhông thì « /tmp » [bị phản đối]\n" +" -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" -#: src/mktemp.c:222 +#: 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:228 +#: src/mktemp.c:229 #, c-format msgid "too many templates" msgstr "quá nhiều mẫu" -#: src/mktemp.c:248 +#: src/mktemp.c:249 #, 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" +msgstr "dùng “--suffix” (hậu tố) thì mẫu %s phải kết thúc bằng chữ X" -#: src/mktemp.c:273 src/split.c:1117 +#: src/mktemp.c:274 src/split.c:1130 #, 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:278 +#: src/mktemp.c:279 #, c-format msgid "too few X's in template %s" msgstr "quá ít X trong mẫu %s" -#: src/mktemp.c:291 +#: src/mktemp.c:292 #, 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:305 +#: src/mktemp.c:306 #, 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" +msgstr "mẫu không hợp lệ, %s; với “--tmpdir” thì không thể là tuyệt đối" -#: src/mktemp.c:325 +#: src/mktemp.c:326 #, c-format msgid "failed to create directory via template %s" -msgstr "lỗi tạo thư mục thông qua mẫu %s" +msgstr "gặp lỗi khi tạo thư mục thông qua mẫu %s" -#: src/mktemp.c:335 +#: src/mktemp.c:336 #, c-format msgid "failed to create file via template %s" -msgstr "lỗi tạo tệp tin thông qua mẫu %s" +msgstr "gặp lỗi khi tạo tập tin thông qua mẫu %s" -#: src/mv.c:290 -msgid "" -"Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" -"\n" +#: src/mv.c:292 +#, fuzzy +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" -#: src/mv.c:297 +#: src/mv.c:298 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -6437,29 +6475,28 @@ 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" -" -b giống « --backup » nhưng không chấp nhận đối " +" --backup[=ĐIỀU_KHIỂN] tạo bản sao lưu 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 chèn\n" -" -i, --interactive hỏi lại trước khi ghi chèn\n" -" -n, --no-clobber không ghi đè lên tệp tin đã có\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 tuỳ chọn « -i », « -f » và « -n »\n" -"thì chỉ tuỳ chọn cuối cùng có tác động.\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" -#: src/mv.c:306 +#: src/mv.c:307 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 xóa mọi dấu xuyệc nằm theo khỏi mỗi đối số " +" --strip-trailing-slashes xóa mọi dấu gạch nằm theo khỏi mỗi đối số " "NGUỒN\n" -" -S, --suffix=HẬU_TỐ dùng HẬU_TỐ thay cho đuôi để sao lưu thông " -"thường\n" +" -S, --suffix=HẬU_TỐ ghi đè lên HẬU_TỐ thông thường\n" -#: src/mv.c:311 +#: src/mv.c:312 msgid "" " -t, --target-directory=DIRECTORY move all SOURCE arguments into " "DIRECTORY\n" @@ -6470,51 +6507,53 @@ msgid "" " -v, --verbose explain what is being done\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" -" -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 " +" -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" -" tệp tin ở nơi đến\n" -" -v, --verbose nói rõ về những gì đang xảy ra\n" +" ở nơi đến\n" +" -v, --verbose nói rõ về những gì đang thực hiện\n" #: src/nice.c:72 #, c-format msgid "Usage: %s [OPTION] [COMMAND [ARG]...]\n" -msgstr "Sử dụng: %s [TÙY_CHỌN] [LỆNH [ĐỐI_SỐ]...]\n" +msgstr "Cách dùng: %s [TÙY_CHỌN] [LỆNH [Đ.SỐ]...]\n" #: src/nice.c:73 -#, c-format +#, fuzzy, c-format msgid "" "Run COMMAND with an adjusted niceness, which affects process scheduling.\n" -"With no COMMAND, print the current niceness. Nicenesses range from\n" -"%d (most favorable scheduling) to %d (least favorable).\n" -"\n" -" -n, --adjustment=N add integer N to the niceness (default 10)\n" +"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 "" -"Chạy câu LỆNH với giá trị ưu tiên (nice) khác để gây ảnh hưởng lên quyền ưu " -"tiên xử lý.\n" -"Khi không có câu LỆNH, in ra giá trị nice hiện thời. Giá trị nice nằm trong " +"Chạy câu LỆNH với giá trị ưu tiên (nice) khác để thay đổi quyền ưu tiên xử " +"lý.\n" +"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:168 +#: src/nice.c:82 +msgid " -n, --adjustment=N add integer N to the niceness (default 10)\n" +msgstr "" + +#: src/nice.c:172 #, c-format msgid "invalid adjustment %s" msgstr "điều chỉnh sai %s" -#: src/nice.c:177 +#: src/nice.c:181 #, c-format msgid "a command must be given with an adjustment" msgstr "phải đưa ra một câu lệnh với một điều chỉnh" -#: src/nice.c:184 src/nice.c:195 +#: src/nice.c:188 src/nice.c:199 #, c-format msgid "cannot get niceness" msgstr "không lấy được giá trị ưu tiên" -#: src/nice.c:201 +#: src/nice.c:205 #, c-format msgid "cannot set niceness" msgstr "không đặt được giá trị ưu tiên" @@ -6524,29 +6563,29 @@ msgstr "không đặt được giá trị ưu tiên" msgid "Scott Bartram" msgstr "Scott Bartram" -#: src/nl.c:186 +#: 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" -"\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" -"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à “-”, đọc đầu vào tiêu chuẩn.\n" "\n" -#: src/nl.c:194 +#: src/nl.c:186 msgid "" " -b, --body-numbering=STYLE use STYLE for numbering body lines\n" " -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=KIỂU_DÁNG dùng KIỂU_DÁNG để đánh số các dòng phần " +" -b, --body-numbering=KIỂU_DÁNG dùng KIỂU_DÁNG để đánh số dòng phần " "thân\n" " -d, --section-delimiter=CC dùng CC để phân cách cách trang lôgíc\n" -" -f, --footer-numbering=KIỂU_DÁNG dùng KIỂU_DÁNG để đánh số các dòng phần " +" -f, --footer-numbering=KIỂU_DÁNG dùng KIỂU_DÁNG để đánh số dòng phần " "chân\n" -#: src/nl.c:199 +#: src/nl.c:191 msgid "" " -h, --header-numbering=STYLE use STYLE for numbering header lines\n" " -i, --line-increment=NUMBER line number increment at each line\n" @@ -6557,8 +6596,7 @@ msgid "" "pages\n" " -s, --number-separator=STRING add STRING after (possible) line number\n" msgstr "" -" -h, --header-numbering=KIỂU_DÁNG dùng KIỂU_DÁNG để đánh số các dòng phần " -"đầu\n" +" -h, --header-numbering=KIỂU_DÁNG dùng KIỂU_DÁNG để đánh số dòng phần đầu\n" " -i, --page-increment=SỐ độ tăng số thứ tự dòng\n" " -l, --join-blank-lines=SỐ đếm SỐ dòng rỗng như một dòng\n" " -n, --number-format=ĐỊNH_DẠNG chèn số thứ tự dòng theo ĐỊNH_DẠNG\n" @@ -6567,16 +6605,16 @@ msgstr "" " -s, --number-separator=CHUỖI thêm CHUỖI vào sau số thứ tự dòng (có " "thể)\n" -#: src/nl.c:207 +#: src/nl.c:199 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, --starting-line-number=SỐ số thứ tự dòng đầu tiên trên mỗi trang " -"luận lý\n" -" -w, --number-width=SỐ dùng SỐ cột để hiển thị số thứ tự dòng\n" +" -v, --starting-line-number=SỐ số thứ tự dòng đầu tiên trên mỗi trang " +"lôgíc\n" +" -w, --number-width=SỐ dùng SỐ cột để hiển thị số thứ tự dòng\n" -#: src/nl.c:213 +#: src/nl.c:205 msgid "" "\n" "By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC are\n" @@ -6584,14 +6622,12 @@ msgid "" "second character implies :. Type \\\\ for \\. STYLE is one of:\n" msgstr "" "\n" -"Theo mặc định, chọn « -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn ».\n" +"Theo mặc định, chọn “-v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn”.\n" "CC là hai ký tự phân cách dùng để chia các trang lôgíc;\n" -"khi thiếu ký tự thứ hai thì nó ngầm hiểu là « : ».\n" -"Gõ « \\\\ » để dùng « \\ ».\n" -"\n" -"STYLE là một trong:\n" +"khi thiếu ký tự thứ hai thì nó ngầm hiểu là “:”.\n" +"Gõ “\\\\” để dùng “\\”. STYLE là một trong:\n" -#: src/nl.c:219 +#: src/nl.c:211 msgid "" "\n" " a number all lines\n" @@ -6608,11 +6644,11 @@ msgid "" "\n" msgstr "" "\n" -" a đánh số mọi dòng\n" -" t chỉ đánh số những dòng không rỗng\n" -" n không đánh số dòng\n" -" pBRE chỉ dánh số những dòng chứa tương ứng với\n" -" biểu thức chính quy cơ bản, BRE\n" +" a đánh số mọi dòng\n" +" t chỉ đánh số những dòng không rỗng\n" +" n không đánh số dòng\n" +" pBRE chỉ dánh số những dòng chứa tương ứng với\n" +" biểu thức chính quy cơ bản, BRE\n" "\n" "ĐỊNH_DẠNG là một trong:\n" "\n" @@ -6620,54 +6656,47 @@ msgstr "" " rn canh hàng phải, không có các số 0 ở đầu\n" " rz canh hàng phải, có các số 0 ở đầu\n" -#: src/nl.c:286 +#: src/nl.c:278 #, c-format msgid "line number overflow" msgstr "vượt quá số dòng có thể" -#: src/nl.c:486 +#: src/nl.c:478 #, c-format msgid "invalid header numbering style: %s" -msgstr "sai dạng đánh số vào phần đầu : %s" +msgstr "sai dạng đánh số vào phần đầu: %s" -#: src/nl.c:494 +#: src/nl.c:486 #, c-format msgid "invalid body numbering style: %s" msgstr "sai dạng đánh số vào phần thân: %s" -#: src/nl.c:502 +#: src/nl.c:494 #, c-format msgid "invalid footer numbering style: %s" msgstr "sai dạng đánh số vài phần chân: %s" -#: src/nl.c:511 +#: src/nl.c:503 #, c-format msgid "invalid starting line number: %s" msgstr "sai số của dòng bắt đầu: %s" -#: src/nl.c:517 -#, c-format -msgid "WARNING: --page-increment is deprecated; use --line-increment instead" -msgstr "" -"CẢNH BÁO : « --page-increment » bị phản đối, nên thay thế bằng « --line-" -"increment »" - -#: src/nl.c:524 +#: src/nl.c:512 #, c-format msgid "invalid line number increment: %s" msgstr "sai độ tăng số của dòng: %s" -#: src/nl.c:536 +#: src/nl.c:524 #, c-format msgid "invalid number of blank lines: %s" msgstr "sai số dòng trắng: %s" -#: src/nl.c:550 +#: src/nl.c:538 #, c-format msgid "invalid line number field width: %s" msgstr "sai chiều dài trường số của dòng: %s" -#: src/nl.c:569 +#: src/nl.c:557 #, c-format msgid "invalid line numbering format: %s" msgstr "sai định dạng đánh số dòng: %s" @@ -6678,15 +6707,15 @@ msgid "" "Usage: %s COMMAND [ARG]...\n" " or: %s OPTION\n" msgstr "" -"Sử dụng: %s LỆNH [ĐỐI_SỐ]...\n" -" hoặc: %s TÙY_CHỌN\n" +"Cách dùng: %s LỆNH [Đ.SỐ]...\n" +" hoặc: %s TÙY_CHỌN\n" #: src/nohup.c:59 msgid "" "Run COMMAND, ignoring hangup signals.\n" "\n" msgstr "" -"Chạy câu LỆNH, và lờ đi tín hiệu treo (hangup).\n" +"Chạy câu LỆNH, và bỏ qua tín hiệu treo (hangup).\n" "\n" #: src/nohup.c:65 @@ -6700,48 +6729,43 @@ msgid "" "To save output to FILE, use '%s COMMAND > FILE'.\n" msgstr "" "\n" -"Đầu vào tiêu chuẩn là thiết bị cuối thì chuyển tiếp nó từ « /dev/null ».\n" -"Đầu ra tiêu chuẩn là thiết bị cuối thì phụ thêm kết xuất vào\n" -"« nohup.out » nếu có thể, không thì « $HOME/nohup.out ».\n" +"Đầu vào tiêu chuẩn là thiết bị cuối thì chuyển tiếp nó từ “/dev/null”.\n" +"Đầu ra tiêu chuẩn là thiết bị cuối thì nối thêm kết xuất vào\n" +"”nohup.out” nếu có thể, không thì “$HOME/nohup.out”.\n" "Đầu lỗi tiêu chuẩn là thiết bị cuối thì chuyển tiếp nó vào đầu ra tiêu " "chuẩn.\n" -"Để lưu kết xuất vào tập tin, dùng « %s LỆNH > TẬP_TIN ».\n" +"Để lưu kết xuất vào tập tin, dùng “%s LỆNH > TẬP_TIN”.\n" #: src/nohup.c:127 #, c-format msgid "failed to render standard input unusable" -msgstr "lỗi vô hiệu hoá đầu vào tiêu chuẩn" +msgstr "gặp lỗi khi vô hiệu hoá đầu vào tiêu chuẩn" #: src/nohup.c:131 #, c-format msgid "ignoring input" -msgstr "đang lờ đi dữ liệu vào" - -#: src/nohup.c:163 src/nohup.c:165 -#, c-format -msgid "failed to open %s" -msgstr "lỗi mở %s" +msgstr "đang bỏ qua dữ liệu vào" #: src/nohup.c:175 #, c-format msgid "ignoring input and appending output to %s" -msgstr "đang lờ đi dữ liệu vào và phụ thêm vào %s kết xuất" +msgstr "đang bỏ qua dữ liệu vào và nối thêm kết xuất vào %s" #: src/nohup.c:176 #, c-format msgid "appending output to %s" -msgstr "đang phụ thêm kết xuất vào %s" +msgstr "nối thêm kết xuất vào %s" #: src/nohup.c:193 #, c-format msgid "failed to set the copy of stderr to close on exec" -msgstr "lỗi khi đặt bản sao của lỗi tiêu chuẩn để đóng khi thực hiện" +msgstr "gặp lỗi khi khi đặt bản sao của lỗi tiêu chuẩn để đóng khi thực hiện" #: src/nohup.c:198 #, c-format msgid "ignoring input and redirecting stderr to stdout" msgstr "" -"đang lờ đi dữ liệu vào và chuyển hướng lỗi tiêu chuẩn tới đầu vào tiêu chuẩn" +"đang bỏ qua dữ liệu vào và chuyển hướng lỗi tiêu chuẩn tới đầu vào tiêu chuẩn" #: src/nohup.c:199 #, c-format @@ -6756,38 +6780,378 @@ msgstr "chuyển hướng đầu lỗi tiêu chuẩn không thành công" # Họ tên Ý #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:32 +#: src/nproc.c:33 msgid "Giuseppe Scrivano" msgstr "Giuseppe Scrivano" -#: src/nproc.c:56 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 +#: src/nproc.c:57 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 #, c-format msgid "Usage: %s [OPTION]...\n" -msgstr "Sử dụng: %s [TÙY_CHỌN]...\n" +msgstr "Cách dùng: %s [TÙY_CHỌN]...\n" -#: src/nproc.c:57 +#: src/nproc.c:58 msgid "" "Print the number of processing units available to the current process,\n" "which may be less than the number of online processors\n" "\n" msgstr "" -"In ra số các đơn vị xử lý sẵn sàng cho tiến trình hiện thời,\n" -"một số có thể nhỏ hơn số các bộ xử lý trực tuyến\n" +"In ra số đơn vị xử lý sẵn sàng cho tiến trình hiện thời,\n" +"một số có thể nhỏ hơn số bộ xử lý trực tuyến\n" "\n" -#: src/nproc.c:62 +#: src/nproc.c:63 msgid "" " --all print the number of installed processors\n" " --ignore=N if possible, exclude N processing units\n" msgstr "" -" --all in ra số các bộ xử lý được cài đặt\n" -" --ignore=SỐ nếu có thể thì loại trừ SỐ đơn vị xử lý\n" +" --all in ra số bộ xử lý được cài đặt\n" +" --ignore=SỐ nếu có thể thì loại trừ SỐ đơn vị xử lý\n" -#: src/nproc.c:106 +#: src/nproc.c:107 #, c-format 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 +msgid "Assaf Gordon" +msgstr "" + +#: 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:680 +#, fuzzy, c-format +msgid "invalid number: '%s'" +msgstr "số không hợp lệ %s" + +#: src/numfmt.c:684 +#, c-format +msgid "rejecting suffix in input: '%s' (consider using --from)" +msgstr "" + +#: 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:692 +#, c-format +msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)" +msgstr "" + +#: src/numfmt.c:723 +#, fuzzy, c-format +msgid "failed to prepare value '%Lf' for printing" +msgstr "mở %s để ghi gặp lỗi" + +#: 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 +#, c-format +msgid "out of memory (requested %zu bytes)" +msgstr "" + +#: src/numfmt.c:813 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [NUMBER]...\n" +msgstr "Cách dùng: %s [TÙY_CHỌN]... [NGƯỜI_DÙNG]...\n" + +#: src/numfmt.c:816 +msgid "" +"Reformat NUMBER(s), or the numbers from standard input if none are " +"specified.\n" +msgstr "" + +#: src/numfmt.c:820 +#, fuzzy +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" + +#: src/numfmt.c:823 +msgid "" +" -d, --delimiter=X use X instead of whitespace for field delimiter\n" +msgstr "" + +#: src/numfmt.c:826 +msgid "" +" --field=N replace the number in input field N (default is 1)\n" +msgstr "" + +#: src/numfmt.c:829 +msgid "" +" --format=FORMAT use printf style floating-point FORMAT;\n" +" see FORMAT below for details\n" +msgstr "" + +#: src/numfmt.c:833 +msgid "" +" --from=UNIT auto-scale input numbers to UNITs; default is " +"'none';\n" +" see UNIT below\n" +msgstr "" + +#: src/numfmt.c:837 +msgid "" +" --from-unit=N specify the input unit size (instead of the default " +"1)\n" +msgstr "" + +#: src/numfmt.c:840 +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 "" + +#: src/numfmt.c:844 +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 +msgid "" +" --invalid=MODE failure mode for invalid numbers: MODE can be:\n" +" abort (default), fail, warn, ignore\n" +msgstr "" + +#: src/numfmt.c:852 +msgid "" +" --padding=N pad the output to N characters; positive N will\n" +" right-align; negative N will left-align;\n" +" padding is ignored if the output is wider than N;\n" +" the default is to automatically pad if a " +"whitespace\n" +" is found\n" +msgstr "" + +#: src/numfmt.c:859 +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 +msgid "" +" --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" +" SUFFIX in input numbers\n" +msgstr "" + +#: src/numfmt.c:867 +msgid "" +" --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" +msgstr "" + +#: src/numfmt.c:870 +msgid "" +" --to-unit=N the output unit size (instead of the default 1)\n" +msgstr "" + +#: src/numfmt.c:877 +#, fuzzy +msgid "" +"\n" +"UNIT options:\n" +msgstr "" +"Tùy chọn khác:\n" +"\n" + +#: src/numfmt.c:880 +msgid " none no auto-scaling is done; suffixes will trigger an error\n" +msgstr "" + +#: src/numfmt.c:883 +msgid "" +" auto accept optional single/two letter suffix:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" +msgstr "" + +#: src/numfmt.c:889 +msgid "" +" si accept optional single letter suffix:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:894 +msgid "" +" iec accept optional single letter suffix:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:899 +msgid "" +" iec-i accept optional two-letter suffix:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:905 +#, 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" +msgstr "" + +#: src/numfmt.c:912 +#, c-format +msgid "" +"\n" +"Exit status is 0 if all input numbers were successfully converted.\n" +"By default, %s will stop at the first conversion error with exit status 2.\n" +"With --invalid='fail' a warning is printed for each conversion error\n" +"and the exit status is 2. With --invalid='warn' each conversion error is\n" +"diagnosed, but the exit status is 0. With --invalid='ignore' conversion\n" +"errors are not diagnosed and the exit status is 0.\n" +msgstr "" + +#: src/numfmt.c:921 +#, c-format +msgid "" +"\n" +"Examples:\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" +msgstr "" + +#: src/numfmt.c:974 src/seq.c:212 +#, 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 +msgid "invalid format %s (width overflow)" +msgstr "định dạng chiều dài sai" + +#: src/numfmt.c:1007 src/seq.c:229 +#, c-format +msgid "format %s ends in %%" +msgstr "định dạng %s kết thúc bằng %%" + +#: src/numfmt.c:1010 +#, c-format +msgid "invalid format %s, directive must be %%['][-][N]f" +msgstr "" + +#: src/numfmt.c:1018 src/seq.c:236 +#, 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:1092 +#, c-format +msgid "value too large to be printed: '%Lg' (consider using --to)" +msgstr "" + +#: src/numfmt.c:1100 +#, c-format +msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" +msgstr "" + +#: src/numfmt.c:1184 +#, c-format +msgid "large input value '%s': possible precision loss" +msgstr "" + +#: src/numfmt.c:1293 +#, 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 "sai phạm vi trang %s" + +#: src/numfmt.c:1401 +#, fuzzy, c-format +msgid "invalid field value '%s'" +msgstr "số thứ tự trường sai: %s" + +#: src/numfmt.c:1430 +#, fuzzy, c-format +msgid "invalid header value '%s'" +msgstr "ngày sai %s”" + +#: src/numfmt.c:1456 +#, fuzzy, 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”" + +#: 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 +msgid "no conversion option specified" +msgstr "đã chỉ ra nhiều tùy chọn “-i”" + +#: src/numfmt.c:1471 +#, fuzzy, 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”" + +#: src/numfmt.c:1473 +#, c-format +msgid "grouping has no effect in this locale" +msgstr "" + +#: src/numfmt.c:1486 +#, c-format +msgid "--header ignored with command-line input" +msgstr "" + +#: src/numfmt.c:1511 +#, fuzzy, c-format +msgid "error reading input" +msgstr "lỗi đọc %s" + +#: src/numfmt.c:1520 +#, fuzzy, 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" + #: src/od.c:294 #, c-format msgid "" @@ -6796,10 +7160,10 @@ msgid "" " or: %s --traditional [OPTION]... [FILE] [[+]OFFSET[.][b] [+][LABEL][.]" "[b]]\n" msgstr "" -"Sử dụng: %s [TÙY_CHỌN]... [TẬP_TIN]...\n" -" hoặc: %s [-abcdfilosx]... [TẬP_TIN] [[+]HIỆU[.][b]]\n" -" hoặc: %s --traditional [TÙY_CHỌN]... [TẬP_TIN] [[+]HIỆU[.][b] [+][NHÃN][.]" -"[b]]\n" +"Cách dùng: %s [TÙY_CHỌN]... [TẬP_TIN]...\n" +" hoặc: %s [-abcdfilosx]... [TẬP_TIN] [[+]HIỆU[.][b]]\n" +" hoặc: %s --traditional [TÙY_CHỌN]... [TẬP_TIN] [[+]HIỆU[.][b] [+][NHÃN]" +"[.][b]]\n" #: src/od.c:300 msgid "" @@ -6815,44 +7179,64 @@ msgstr "" "định.\n" "Khi có vài đối số TẬP_TIN, thì nối chúng với nhau theo thứ tự liệt kê để tạo " "dữ liệu vào.\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à “-”, đọc đầu vào tiêu chuẩn.\n" "\n" #: src/od.c:307 -msgid "All arguments to long options are mandatory for short options.\n" +#, fuzzy +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" +"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" +"at first byte printed, incremented when dump is progressing.\n" +"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 "" -"Mọi đối số bắt buộc phải sử dụng với tùy chọn dài cũng bắt buộc với tùy chọn " -"ngắn.\n" +"\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" +"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:310 +#: src/od.c:318 +#, fuzzy msgid "" -" -A, --address-radix=RADIX decide how file offsets are printed\n" +" -A, --address-radix=RADIX output format for file offsets. RADIX is one\n" +" of [doxn], for Decimal, Octal, Hex or None\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" +" -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" -#: src/od.c:314 +#: src/od.c:323 +#, 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" -" --traditional accept arguments in traditional form\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" +" -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" -" -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" +" -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" -#: src/od.c:324 +#: src/od.c:336 +#, fuzzy 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" @@ -6862,12 +7246,12 @@ msgstr "" "\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, 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 xuyệc ngược\n" -" -d -t u2 đơn vị hai byte thập phân không có chữ ký\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" -#: src/od.c:332 +#: src/od.c:345 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -6877,47 +7261,29 @@ msgid "" " -x same as -t x2, select hexadecimal 2-byte units\n" msgstr "" " tham số giống như chọn\n" -" -f -t fF sự trôi\n" -" -i -t dI số nguyên thập phân\n" -" -l -t dL chiều dài thập phân\n" -" -o -t o2 đơn vị 2 byte bát phân\n" -" -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:340 +" -f -t fF dấu chấm động\n" +" -i -t dI số nguyên thập phân\n" +" -l -t dL chiều dài thập phân\n" +" -o -t o2 đơn vị 2 byte bát phân\n" +" -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 msgid "" "\n" -"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" -"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" -"at first byte printed, incremented when dump is progressing.\n" -"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" -"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:349 -msgid "" "\n" "TYPE is made up of one or more of these specifications:\n" -"\n" " a named character, ignoring high-order bit\n" " c ASCII 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, lờ đi bit bậc cao\n" -" c ký tự ASCII hoặc thoát xuyệc ngược\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" -#: src/od.c:356 +#: src/od.c:360 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -6926,16 +7292,17 @@ msgid "" " x[SIZE] hexadecimal, SIZE bytes per integer\n" msgstr "" "Đặt CỠ thì xuất CỠ byte cho mỗi số nguyên:\n" -" d[CỠ] số thập phân đã ký\n" -" f[C] điểm trôi\n" -" o[CỠ] số bát phân\n" -" u[CỠ] số thập phân chưa ký\n" -" x[CỠ] số thập lục\n" +" d[CỠ] số thập phân không dấu\n" +" f[CỠ] dấu chấm động\n" +" o[CỠ] số bát phân\n" +" u[CỠ] số thập phân không dấu\n" +" x[CỠ] số thập lục\n" -#: src/od.c:363 +#: src/od.c:367 +#, fuzzy msgid "" "\n" -"SIZE is a number. For TYPE in doux, SIZE may also be C for\n" +"SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" "sizeof(char), S for sizeof(short), I for sizeof(int) or L for\n" "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" @@ -6947,58 +7314,41 @@ msgstr "" " 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ỡ trôi\n" -" D sizeof(double) kích cỡ đôi\n" -" L sizeof(long double) kích cỡ đôi dài\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" -#: src/od.c:370 +#: src/od.c:374 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" +"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 +msgid "" +"\n" +"\n" +"BYTES is hex with 0x or 0X prefix, and may have a multiplier suffix:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"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, 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" -"CƠ SÔ:\n" -" d thập lục\n" -" o bát phân\n" -" x thập lục\n" -" n không có\n" -"BYTES:\n" -"có tiền tố số\n" -" 0x hoặc 0X thập lục\n" -"có hậu tố bội số\n" -" b 512\n" -" kB 1000\n" -" K\t\t 1024\n" -" MB \t1000*1000\n" -" M \t\t1024*1024\n" -" GB \t\t1000*1000*1000\n" -" G \t\t1024*1024*1024\n" -"v.v. cho T, P, E, Z, Y.\n" -"Một hậu tố đuôi z trong bất kỳ dạng nào thêm các ký tự có thể in ra\n" -"vào cuối mỗi dòng kết quả.\n" - -#: src/od.c:380 -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 » không kèm theo số ngầm hiểu là 3.\n" -"«--width » không kèm theo số ngầm hiểu là 32.\n" -"Theo mặc định, « od » sử dụng « -A o -t oS -w16 ».\n" - -#: src/od.c:633 src/od.c:753 +"GB 1000*1000*1000, G 1024*1024*1024, và tương tự với T, P, E, Z, Y.\n" + +#: src/od.c:639 src/od.c:759 #, c-format msgid "invalid type string %s" msgstr "sai chuỗi kiểu %s" -#: src/od.c:643 +#: src/od.c:649 #, c-format msgid "" "invalid type string %s;\n" @@ -7007,48 +7357,48 @@ 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:764 +#: src/od.c:770 #, c-format msgid "" "invalid type string %s;\n" "this system doesn't provide a %lu-byte floating point type" msgstr "" "sai chuỗi kiểu %s;\n" -"hệ thống này không cung cấp kiểu điểm trôi %lu byte" +"hệ thống này không cung cấp kiểu dấu chấm động %lu byte" -#: src/od.c:822 +#: src/od.c:828 #, c-format msgid "invalid character '%c' in type string %s" -msgstr "sai ký tự « %c » trong chuỗi kiểu %s" +msgstr "sai ký tự “%c” trong chuỗi kiểu %s" -#: src/od.c:1047 +#: src/od.c:1053 #, 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:1603 +#: src/od.c:1609 #, c-format msgid "invalid output address radix '%c'; it must be one character from [doxn]" -msgstr "sai cơ số địa chỉ kết quả ra « %c »; nó phải là một ký tự trong [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:1729 +#: src/od.c:1735 #, 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:1804 +#: src/od.c:1810 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" +msgstr "chế độ tương thích hỗ trợ nhiều nhất một tập tin" -#: src/od.c:1825 +#: src/od.c:1831 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "skip-bytes + read-bytes là quá lớn" -#: src/od.c:1868 +#: src/od.c:1874 #, 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ế" +msgstr "cảnh báo: sai chiều rộng %lu nên dùng %d thay thế" #: src/operand2sig.c:69 #, c-format @@ -7061,18 +7411,18 @@ 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" -"\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" "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" +"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:448 +#: 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" @@ -7081,7 +7431,7 @@ msgstr "" "\t\t\t\tsử dụng lại các ký tự từ DANH_SÁCH thay cho TAB\n" " -s, --serial dán một dòng cho mỗi lần thay vì dán song song\n" -#: src/paste.c:509 +#: src/paste.c:508 #, c-format msgid "delimiter list ends with an unescaped backslash: %s" msgstr "danh sách dấu tách kết thúc bằng một gạch chéo không được thoát: %s" @@ -7094,43 +7444,43 @@ msgid "" " -P check for empty names and leading \"-\"\n" " --portability check for all POSIX systems (equivalent to -p -P)\n" msgstr "" -"Chẩn đoán tên tệp tin không hợp lệ hay tên tệp tin không thể mang được.\n" +"Chẩn đoán tên tập tin không hợp lệ hay tên tập tin không khả chuyển.\n" "\n" " -p kiểm tra có hệ thống POSIX (nhận ra phần lớn)\n" -" -P kiểm tra có tên rỗng và dấu gạch nối đứng trước « - »\n" +" -P kiểm tra có tên rỗng và dấu gạch nối đứng trước “-”\n" " --portability kiểm tra có hệ thống POSIX (nhận ra tất cả);\n" -" bằng tùy chọn « -p -P »\n" +" bằng tùy chọn “-p -P”\n" #: src/pathchk.c:170 #, c-format msgid "leading '-' in a component of file name %s" -msgstr "dấu gạch nối « - » đứng trước trong phần của tên tập tin %s" +msgstr "dấu gạch nối “-” đứng trước trong phần của tên tập tin %s" #: src/pathchk.c:196 #, c-format msgid "nonportable character %s in file name %s" -msgstr "ký tự không mang được %s trong tên tệp tin %s" +msgstr "ký tự không khả chuyển %s trong tên tập tin %s" #: src/pathchk.c:272 #, c-format msgid "empty file name" -msgstr "tên tệp tin rỗng" +msgstr "tên tập tin rỗng" #: src/pathchk.c:314 #, c-format msgid "%s: unable to determine maximum file name length" -msgstr "%s: không nhận ra chiều dài tên tệp tin tối đa" +msgstr "%s: không nhận ra chiều dài tên tập tin tối đa" #: src/pathchk.c:325 #, c-format msgid "limit %lu exceeded by length %lu of file name %s" -msgstr "giới hạn %lu bị vượt quá theo chiều dài %lu của tên tệp tin %s" +msgstr "giới hạn %lu bị vượt quá theo chiều dài %lu của tên tập tin %s" #: src/pathchk.c:411 #, c-format msgid "limit %lu exceeded by length %lu of file name component %s" msgstr "" -"giới hạn %lu bị vượt quá theo chiều dài %lu của thành phần tên tệp tin %s" +"giới hạn %lu bị vượt quá theo chiều dài %lu của thành phần tên tập tin %s" #. 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 @@ -7143,80 +7493,80 @@ msgid "Kaveh Ghazi" msgstr "Kaveh Ghazi" #. TRANSLATORS: Real name is unknown; at most 19 characters. -#: src/pinky.c:250 +#: src/pinky.c:242 msgid " ???" msgstr " ???" #. TRANSLATORS: Idle time is unknown; at most 5 characters. -#: src/pinky.c:274 +#: src/pinky.c:266 msgid "?????" msgstr "?????" -#: src/pinky.c:323 +#: src/pinky.c:314 #, c-format msgid "Login name: " msgstr "Tên đăng nhập: " -#: src/pinky.c:326 +#: src/pinky.c:317 #, c-format msgid "In real life: " msgstr "Tên thật: " #. TRANSLATORS: Real name is unknown; no hard limit. -#: src/pinky.c:330 +#: src/pinky.c:321 msgid "???\n" msgstr "???\n" -#: src/pinky.c:350 +#: src/pinky.c:341 #, c-format msgid "Directory: " msgstr "Thư mục: " -#: src/pinky.c:352 +#: src/pinky.c:343 #, c-format msgid "Shell: " -msgstr "Trình bao : " +msgstr "Shell: " -#: src/pinky.c:371 +#: src/pinky.c:362 #, c-format msgid "Project: " msgstr "Dự án: " -#: src/pinky.c:395 +#: src/pinky.c:386 #, c-format msgid "Plan:\n" msgstr "Kế hoạch:\n" -#: src/pinky.c:414 +#: src/pinky.c:405 msgid "Login" msgstr "Đăng nhập" -#: src/pinky.c:416 +#: src/pinky.c:407 msgid "Name" msgstr "Tên" -#: src/pinky.c:417 +#: src/pinky.c:408 msgid " TTY" msgstr " TTY" -#: src/pinky.c:419 +#: src/pinky.c:410 msgid "Idle" msgstr "Nghỉ" -#: src/pinky.c:420 +#: src/pinky.c:411 msgid "When" msgstr "Lúc" -#: src/pinky.c:423 +#: src/pinky.c:414 msgid "Where" msgstr "Tại" -#: src/pinky.c:502 +#: src/pinky.c:493 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" -msgstr "Sử dụng: %s [TÙY_CHỌN]... [NGƯỜI_DÙNG]...\n" +msgstr "Cách dùng: %s [TÙY_CHỌN]... [NGƯỜI_DÙNG]...\n" -#: src/pinky.c:503 +#: src/pinky.c:494 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7227,13 +7577,13 @@ msgid "" msgstr "" "\n" " -l đưa ra kết quả dạng dài cho (các) NGƯỜI_DÙNG\n" -" -b bỏ đi thư mục cá nhân của người dùng và trình bao trong " -"dạng dài\n" -" -h bỏ đi tệp tin dự án của người dùng trong dạng dài\n" -" -p bỏ đi tệp tin kế hoạch của người dùng trong dạng dài\n" +" -b bỏ đi thư mục cá nhân của người dùng và shell trong dạng " +"dài\n" +" -h bỏ đi tập tin dự án của người dùng trong dạng dài\n" +" -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:511 +#: src/pinky.c:502 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7249,7 +7599,7 @@ msgstr "" "nghỉ\n" " trong dạng ngắn\n" -#: src/pinky.c:520 +#: src/pinky.c:511 #, c-format msgid "" "\n" @@ -7257,15 +7607,15 @@ msgid "" "The utmp file will be %s.\n" msgstr "" "\n" -"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" +"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:604 +#: src/pinky.c:595 #, 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 « " -"-l »" +"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. #: src/pr.c:330 @@ -7277,85 +7627,84 @@ msgstr "Pete TerMaat" msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:912 +#: src/pr.c:908 #, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" -msgstr "thiếu tham số « --pages=TRANG_ĐẦU[:TRANG_CUỐI] »" +msgstr "thiếu tham số “--pages=TRANG_ĐẦU[:TRANG_CUỐI]”" -#: src/pr.c:914 +#: src/pr.c:910 #, c-format msgid "invalid page range %s" msgstr "sai phạm vi trang %s" -#: src/pr.c:979 +#: src/pr.c:975 #, c-format msgid "'-l PAGE_LENGTH' invalid number of lines: %s" -msgstr "« -l CHIỀU_DÀI_TRANG » sai số của dòng: %s" +msgstr "”-l CHIỀU_DÀI_TRANG” sai số của dòng: %s" -#: src/pr.c:1003 +#: src/pr.c:999 #, c-format msgid "'-N NUMBER' invalid starting line number: %s" -msgstr "« -N SỐ » sai số dòng bắt đầu: %s" +msgstr "”-N SỐ” sai số dòng bắt đầu: %s" -#: src/pr.c:1015 +#: src/pr.c:1011 #, c-format msgid "'-o MARGIN' invalid line offset: %s" -msgstr "« -o LỀ » sai vị trí tương đối dòng: %s" +msgstr "”-o LỀ” sai vị trí tương đối dòng: %s" -#: src/pr.c:1056 +#: src/pr.c:1052 #, c-format msgid "'-w PAGE_WIDTH' invalid number of characters: %s" -msgstr "« -w CHIỀU_RỘNG_TRANG » sai số ký tự: %s" +msgstr "”-w CHIỀU_RỘNG_TRANG” sai số ký tự: %s" -#: src/pr.c:1070 +#: src/pr.c:1066 #, c-format msgid "'-W PAGE_WIDTH' invalid number of characters: %s" -msgstr "« -W CHIỀU_RỘNG_TRANG » sai số ký tự: %s" +msgstr "”-W CHIỀU_RỘNG_TRANG” sai số ký tự: %s" -#: src/pr.c:1100 +#: src/pr.c:1096 #, c-format msgid "cannot specify number of columns when printing in parallel" -msgstr "không chỉ ra được số các cột khi in ra song song" +msgstr "không chỉ ra được số cột khi in ra song song" -#: src/pr.c:1104 +#: src/pr.c:1100 #, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "không thể đồng thời in ra chéo nhau và in ra song song." -#: src/pr.c:1200 +#: src/pr.c:1196 #, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" -msgstr "« -%c » ký tự mở rộng hoặc số sai trong đối số: %s" +msgstr "”-%c” ký tự mở rộng hoặc số sai trong đối số: %s" -#: src/pr.c:1304 +#: src/pr.c:1293 #, c-format msgid "page width too narrow" msgstr "chiều rộng trang quá hẹp" -#: src/pr.c:2369 +#: src/pr.c:2353 #, c-format msgid "starting page number %<PRIuMAX> exceeds page count %<PRIuMAX>" msgstr "số trang bắt đầu %<PRIuMAX> vượt quá số đếm trang %<PRIuMAX>" -#: src/pr.c:2396 +#: src/pr.c:2380 #, c-format msgid "page number overflow" msgstr "tràn số thứ tự trang" -#: src/pr.c:2401 +#: src/pr.c:2385 #, c-format msgid "Page %<PRIuMAX>" msgstr "Trang %<PRIuMAX>" -#: src/pr.c:2773 -msgid "" -"Paginate or columnate FILE(s) for printing.\n" -"\n" +#: 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" -#: src/pr.c:2780 +#: src/pr.c:2763 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -7368,10 +7717,10 @@ msgstr "" " bắt đầu [dừng] in ấn ở trang TRANG_ĐẦU[_CUỐI]\n" " -CỘT, --columns=CỘT\n" " đưa ra CỘT cột và in ra các cột xuống dưới,\n" -" trừ khi dùng « -a ». Cân bằng số các dòng trong các cột\n" +" trừ khi dùng “-a”. Cân bằng số dòng trong các cột\n" " trên mỗi trang.\n" -#: src/pr.c:2788 +#: src/pr.c:2771 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7381,13 +7730,13 @@ msgid "" " double space the output\n" msgstr "" " -a, --across in các cột bắt chéo nhau thay vì in xuống,\n" -" sử dụng cùng với « -CỘT »\n" +" sử dụng cùng với “-CỘT”\n" " -c, --show-control-chars\n" -" dùng ký hiệu mũ (^G) và cách ghi xuyệc ngược bát phân\n" +" dùng ký hiệu mũ (^G) và cách ghi gạch ngược bát phân\n" " -d, --double-space\n" " nhân đôi khoảng trắng trong kết quả\n" -#: src/pr.c:2796 +#: src/pr.c:2779 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7405,10 +7754,10 @@ msgstr "" "(8)\n" " -F, -f, --form-feed\n" " dùng các dạng khác để chia trang thay cho dòng mới\n" -" (3 dòng phần đầu của trang với « -F »,\n" -" hoặc 5 dòng phần đầu và gạch dài khi không có « -F »)\n" +" (3 dòng phần đầu của trang với “-F”,\n" +" hoặc 5 dòng phần đầu và gạch dài khi không có “-F”)\n" -#: src/pr.c:2806 +#: src/pr.c:2789 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -7421,17 +7770,17 @@ msgid "" " alignment, --sep-string[=STRING] sets separators\n" msgstr "" " -h ĐẦU_TRANG, --header=ĐẦU_TRANG\n" -" dùng một phần ĐẦU_TRANG ở giữa thay cho tên tệp tin\n" +" dùng một phần ĐẦU_TRANG ở giữa thay cho tên tập tin\n" " trong phần đầu trang,\n" -" « -h \"\" » in một dòng trắng, đừng sử dụng « -h\"\" »\n" +" -h \"\" in một dòng trắng, đừng sử dụng -h\"\"\n" " -i[KÝ_TỰ[RỘNG]], --output-tabs[=KÝ_TỰ[RỘNG]]\n" " thay thế khoảng trắng với các KÝ_TỰ (TAB) thành chiều " "RỘNG tab (8)\n" -" -J, --join-lines gộp lại các dòng đầy đủ, tắt bỏ cắt dòng « -W »,\n" +" -J, --join-lines gộp lại các dòng đầy đủ, tắt bỏ cắt dòng -W,\n" " không sắp hàng các cột,\n" -" --sep-string[=CHUỖI] đặt ký tự phân chia\n" +" alignment, --sep-string[=CHUỖI] đặt ký tự phân chia\n" -#: src/pr.c:2815 +#: src/pr.c:2798 msgid "" " -l, --length=PAGE_LENGTH\n" " set the page length to PAGE_LENGTH (66) lines\n" @@ -7441,13 +7790,13 @@ msgid "" msgstr "" " -l, --length=DÀI_TRANG\n" " đặt chiều dài trang thành chiều DÀI_TRANG (66) dòng\n" -" (số dòng mặc định của văn bản là 56, có « -F » thì 63)\n" -" -m, --merge in song song tất cả các tệp tin, mỗi tệp tin trên một " +" (số dòng mặc định của văn bản là 56, có “-F” thì 63)\n" +" -m, --merge in song song tất cả các tập tin, mỗi tập tin trên một " "cột\n" -" cắt ngắn các dòng, có « -J » thì cũng nhập các dòng\n" +" cắt ngắn các dòng, có “-J” thì cũng nhập các dòng\n" " có chiều dài đầy đủ.\n" -#: src/pr.c:2822 +#: src/pr.c:2805 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -7459,13 +7808,13 @@ 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 nhập " "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" -" trang in đầu tiên (xem « +TRANG_ĐẦU »)\n" +" trang in đầu tiên (xem “+TRANG_ĐẦU”)\n" -#: src/pr.c:2830 +#: src/pr.c:2813 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -7475,12 +7824,12 @@ msgid "" msgstr "" " -o, --indent=LỀ\n" " thụt mỗi dòng với LỀ (số không) khoảng trắng,\n" -" không ảnh hưởng « -w » hoặc « -W »,\n" +" không ảnh hưởng “-w” hoặc “-W”,\n" " LỀ sẽ được thêm vào chiều RỘNG_TRANG\n" " -r, --no-file-warnings\n" -" bỏ đi cảnh báo khi không mở được một tệp tin\n" +" bỏ đi cảnh báo khi không mở được một tập tin\n" -#: src/pr.c:2837 +#: src/pr.c:2820 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -7491,13 +7840,13 @@ msgid "" 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" -" « -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" +" mặc định cho KÝ_TỰ là ký tự <TAB> không có “-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:2844 +#: src/pr.c:2827 msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" @@ -7508,13 +7857,12 @@ msgid "" msgstr "" " -S[CHUỖI], --sep-string[=CHUỖI]\n" " phân chia các cột bằng CHUỖI,\n" -" không có « -S »: Ký tự phân chia mặc định <TAB>\n" -" với « -J » và <dấu_cách> nếu không (giống như « -S\" \" " -"»),\n" +" không có -S: Ký tự phân chia mặc định <TAB>\n" +" bằng -J và <dấu_cách> nếu không (giống như -S\" \"),\n" " 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:2851 +#: src/pr.c:2834 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -7529,15 +7877,14 @@ msgid "" msgstr "" " -T, --omit-pagination\n" " bỏ qua phần đầu và phần đi theo của trang,\n" -" loại trừ sự dàn trang bởi mẫu trong tệp tin đưa vào\n" +" loại trừ sự dàn trang bởi mẫu trong tập tin đưa vào\n" " -v, --show-nonprinting\n" -" sử dụng ký hiệu xuyệc ngược bát phân\n" +" sử dụng ký hiệu gạch ngược bát phân\n" " -w, --width=RỘNG_TRANG\n" " đặ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" +" chỉ cho kết quả đa cột văn bản, “-s[ký_tự]” tắt đi (72)\n" -#: src/pr.c:2861 +#: src/pr.c:2844 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -7548,18 +7895,18 @@ msgstr "" " -W, --page-width=RỘNG_TRANG\n" " đặt chiều rộng trang thành luôn luôn RỘNG_TRANG (72) ký " "tự,\n" -" 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" +" 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:2869 +#: src/pr.c:2852 msgid "" "\n" "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" "standard input.\n" msgstr "" "\n" -"« -t » được ngụ ý nếu CHIỀU_DÀI_TRANG ≤ 10.\n" -"Không có TẬP_TIN, hoặc TẬP_TIN là « - » thì đọc đầu vào tiêu chuẩn.\n" +"”-t” là ngầm định nếu CHIỀU_DÀI_TRANG ≤ 10.\n" +"Không có TẬP_TIN, hoặc TẬP_TIN là “-” thì đọc đầu vào tiêu chuẩn.\n" #: src/printenv.c:62 #, c-format @@ -7569,7 +7916,7 @@ msgid "" "If no VARIABLE is specified, print name and value pairs for them all.\n" "\n" msgstr "" -"Sử dụng: %s [TÙY_CHỌN]... [BIẾN]...\n" +"Cách dùng: %s [TÙY_CHỌN]... [BIẾN]...\n" "In ra các giá trị của (những) biến môi trường đưa ra.\n" "Không đưa ra BIẾN môi trường thì in cặp tên/giá_trị cho mỗi biến.\n" "\n" @@ -7584,7 +7931,7 @@ msgstr "" #, c-format msgid "" "warning: %s: character(s) following character constant have been ignored" -msgstr "cảnh báo : %s: lờ đi các ký tự theo sau hằng ký tự" +msgstr "cảnh báo: %s: bỏ qua các ký tự theo sau hằng ký tự" #: src/printf.c:88 #, c-format @@ -7592,15 +7939,15 @@ msgid "" "Usage: %s FORMAT [ARGUMENT]...\n" " or: %s OPTION\n" msgstr "" -"Sử dụng: %s ĐỊNH_DẠNG [ĐỐI_SỐ]...\n" -" hoặc: %s TÙY_CHỌN\n" +"Cách dùng: %s ĐỊNH_DẠNG [Đ.SỐ]...\n" +" hoặc: %s TÙY_CHỌN\n" #: src/printf.c:93 msgid "" "Print ARGUMENT(s) according to FORMAT, or execute according to OPTION:\n" "\n" msgstr "" -"In (các) ĐỐI_SỐ theo ĐỊNH_DẠNG, hoặc thực hiện tùy theo TÙY_CHỌN:\n" +"In (các) Đ.SỐ theo ĐỊNH_DẠNG, hoặc thực hiện tùy theo TÙY_CHỌN:\n" "\n" #: src/printf.c:99 @@ -7625,9 +7972,9 @@ msgid "" msgstr "" " \\NNN byte có giá trị bát phân NNN (1 đến 3 chữ số)\n" " \\xHH byte có giá trị thập lục HH (1 đến 2 chữ số)\n" -" \\uHHHH ký tự Unicode (ISO/IEC 10646) có giá trị thập lục HHHH (4 chữ " +" \\uHHHH ký tự Unicode (ISO/IEC 10646) có giá trị thập lục HHHH (4 chữ " "số)\n" -" \\UHHHHHHHH ký tự Unicode có giá trị thập lục HHHHHHHH (8 chữ số)\n" +" \\UHHHHHHHH ký tự Unicode có giá trị thập lục HHHHHHHH (8 chữ số)\n" #: src/printf.c:123 msgid "" @@ -7639,17 +7986,17 @@ msgid "" "ARGUMENTs converted to proper type first. Variable widths are handled.\n" msgstr "" " %% một dấu % đơn\n" -" %b ĐỐI_SỐ là một chuỗi có các ký tự thoát « \\ » đã biên dịch,\n" -" trừ khi dãy thoát bát phân có dạng « \\0 » hoặc « \\0NNN »\n" +" %b ĐỐI_SỐ là một chuỗi có các ký tự thoát “\\” đã biên dịch,\n" +" trừ khi dãy thoát bát phân có dạng “\\0” hoặc “\\0NNN”\n" "\n" -"và tất cả các dạng C kết thúc bởi một trong « diouxXfeEgGcs »,\n" +"và tất cả các dạng C kết thúc bởi một trong “diouxXfeEgGcs”,\n" "và đầu tiên các ĐỐI SỐ đã chuyển đổi tới dạng thích hợp.\n" "Chiều dài các biến được điều khiển.\n" #: src/printf.c:148 #, c-format msgid "%s: expected a numeric value" -msgstr "%s: đã mong đợi một giá trị số" +msgstr "%s: cần một số" #: src/printf.c:150 #, c-format @@ -7664,7 +8011,7 @@ msgstr "thiếu số thập lục trong dãy thoát" #: src/printf.c:286 #, c-format msgid "invalid universal character name \\%c%0*x" -msgstr "sai tên ký tự chung « \\%c%0*x »" +msgstr "sai tên ký tự chung “\\%c%0*x”" #: src/printf.c:547 #, c-format @@ -7684,7 +8031,7 @@ msgstr "%.*s: sai sự xác định chuyển đổi" #: src/printf.c:692 #, c-format msgid "warning: ignoring excess arguments, starting with %s" -msgstr "cảnh báo : lờ đi các đối số thừa nên bắt đầu từ %s" +msgstr "cảnh báo: bỏ qua các đối số thừa nên bắt đầu từ %s" #. TRANSLATORS: Please translate "F. Pinard" to "François Pinard" #. if "ç" (c-with-cedilla) is available in the translation's character @@ -7705,30 +8052,30 @@ msgid "" "Usage: %s [OPTION]... [INPUT]... (without -G)\n" " or: %s -G [OPTION]... [INPUT [OUTPUT]]\n" msgstr "" -"Sử 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" +"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 msgid "" "Output a permuted index, including context, of the words in the input " "files.\n" -"\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" +"của những từ trong các tập tin đưa vào.\n" "\n" -#: src/ptx.c:1828 +#: src/ptx.c:1827 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 đưa ra sự chỉ đến đã tạo ra tự động\n" -" -G, --traditional làm việc giống với « ptx » của System V\n" +" -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:1833 +#: src/ptx.c:1832 msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" " -O, --format=roff generate output as roff directives\n" @@ -7736,15 +8083,15 @@ 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=CHUỖI tên vĩ lệnh để sử dụng thay cho « xx »\n" +" -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:1840 +#: src/ptx.c:1839 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -7759,10 +8106,10 @@ msgstr "" " -f, --ignore-case đưa chữ thường thành hoa để sắp xếp\n" " -g, --gap-size=SỐ kích cỡ chỗ trống trong các cột giữa\n" " các trường kết quả\n" -" -i, --ignore-file=TẬP_TIN đọc danh sách từ lờ đi từ TẬP_TIN\n" +" -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:1848 +#: src/ptx.c:1847 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -7775,16 +8122,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:1855 +#: src/ptx.c:1854 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" +"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" -#: src/ptx.c:1949 +#: src/ptx.c:1948 #, c-format msgid "invalid gap width: %s" msgstr "chiều rộng chỗ trống sai: %s" @@ -7802,19 +8149,19 @@ 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 " +" -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" +" -P, --physical tránh mọi liên kết tượng trưng\n" #: src/pwd.c:166 #, c-format msgid "failed to chdir to %s" -msgstr "lỗi chdir (chuyển đổi thư mục) sang %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/pwd.c:170 src/pwd.c:277 src/split.c:373 #, c-format msgid "failed to stat %s" -msgstr "lỗi stat (lấy trạng thái về) %s" +msgstr "gặp lỗi khi stat (lấy trạng thái về) %s" #: src/pwd.c:235 #, c-format @@ -7824,24 +8171,25 @@ msgstr "không tìm thấy mục nhập thư mục trong %s có inode tương #: src/pwd.c:362 #, c-format msgid "ignoring non-option arguments" -msgstr "đang lờ đi các đối số không tùy chọn" +msgstr "đang bỏ qua các đối số không-phải-tùy-chọn" #. This is a proper name. See the gettext manual, section Names. -#: src/readlink.c:33 +#: src/readlink.c:32 msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 +#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147 +#: src/stat.c:1349 src/touch.c:212 #, c-format -msgid "Usage: %s [OPTION]... FILE\n" -msgstr "Sử dụng: %s [TÙY_CHỌN]... TẬP_TIN\n" +msgid "Usage: %s [OPTION]... FILE...\n" +msgstr "Cách dùng: %s [TÙY_CHỌN]... TẬP_TIN...\n" #: src/readlink.c:63 msgid "" "Print value of a symbolic link or canonical file name\n" "\n" msgstr "" -"Hiển thị giá trị của một liên kết mềm hoặc tên tệp tin chuẩn tắc.\n" +"Hiển thị giá trị của một liên kết mềm hoặc tên tập tin chuẩn tắc.\n" "\n" #: src/readlink.c:65 @@ -7864,16 +8212,19 @@ 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 " "recursively,\n" " without requirements on components " "existence\n" -" -n, --no-newline do not output the trailing newline\n" +" -n, --no-newline do not output the trailing delimiter\n" " -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" 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" @@ -7883,11 +8234,10 @@ msgstr "" " -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" -#: src/realpath.c:71 src/rm.c:134 src/shred.c:147 src/stat.c:1330 -#: src/touch.c:215 -#, c-format -msgid "Usage: %s [OPTION]... FILE...\n" -msgstr "Sử dụng: %s [TÙY_CHỌN]... TẬP_TIN...\n" +#: src/readlink.c:152 +#, fuzzy, 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" #: src/realpath.c:72 msgid "" @@ -7895,7 +8245,7 @@ msgid "" "all but the last component must exist\n" "\n" msgstr "" -"In ra tên tệp tin tuyệt đối đã phân giải;\n" +"In ra tên tập tin tuyệt đối đã phân giải;\n" "tất cả nhưng thành phần cuối cùng phải tồn tại sẵn\n" "\n" @@ -7913,16 +8263,16 @@ msgid "" "\n" msgstr "" " -e, --canonicalize-existing tất cả các bộ phận hợp thành đường đẫn phải " -"tồn tại\n" +"có sẵn\n" " -m, --canonicalize-missing không cần thành phần hợp thành đường dẫn tồn " "tại\n" -" -L, --logical giải quyết thành phần `..' trước liên kết " +" -L, --logical giải quyết thành phần “..” trước liên kết " "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 " -"đường dẫn nằm trong\n" +" --relative-base=FILE in ra đường dẫn tuyệt đối với FILE 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 " "mới\n" @@ -7932,12 +8282,12 @@ msgstr "" msgid "generating relative path" msgstr "tạo đường dẫn tương đối" -#: src/remove.c:286 +#: src/remove.c:273 #, c-format msgid "%s: descend into write-protected directory %s? " -msgstr "%s: đi vào thư mục đã bảo vệ khỏi ghi %s không? " +msgstr "%s: đi vào thư mục đã bảo vệ chống ghi %s không? " -#: src/remove.c:287 +#: src/remove.c:274 #, c-format msgid "%s: descend into directory %s? " msgstr "%s: đi vào thư mục %s không? " @@ -7946,37 +8296,37 @@ msgstr "%s: đi vào thư mục %s không? " #. translate "%s: remove %s (write-protected) %s? " #. instead. It should avoid grammatical problems #. with the output of file_type. -#: src/remove.c:303 +#: src/remove.c:290 #, c-format msgid "%s: remove write-protected %s %s? " -msgstr "%s: xóa %s đã bảo vệ khỏi ghi %s không? " +msgstr "%s: xóa %s có bảo vệ chống ghi đè %s không?(k/c) " -#: src/remove.c:304 +#: src/remove.c:291 #, c-format msgid "%s: remove %s %s? " -msgstr "%s: xoá %s %s không? " +msgstr "%s: xóa %s %s không?(k/c) " -#: src/remove.c:417 +#: src/remove.c:374 #, c-format msgid "removed directory: %s\n" msgstr "đã xóa thư mục: %s\n" -#: src/remove.c:481 +#: src/remove.c:444 #, c-format msgid "cannot remove directory: %s" -msgstr "không xoá được thư mục: %s" +msgstr "không xóa được thư mục: %s" -#: src/remove.c:537 +#: src/remove.c:500 #, c-format msgid "skipping %s, since it's on a different device" -msgstr "đang nhảy qua %s, vì nó nằm trên thiết bị khác" +msgstr "đang bỏ qua %s, vì nó nằm trên thiết bị khác" -#: src/remove.c:557 +#: src/remove.c:520 #, c-format msgid "traversal failed: %s" msgstr "lỗi theo cây: %s" -#: src/remove.c:563 +#: src/remove.c:526 #, c-format msgid "" "unexpected failure: fts_info=%d: %s\n" @@ -7985,12 +8335,12 @@ msgstr "" "gặp lỗi bất thường: fts_info=%d: %s\n" "xin hãy thông báo cho %s" -#: src/rm.c:118 +#: src/rm.c:119 #, c-format msgid "Try '%s ./%s' to remove the file %s.\n" -msgstr "Thử lệnh « %s ./%s » để xoá tập tin %s.\n" +msgstr "Thử lệnh “%s ./%s” để xóa tập tin %s.\n" -#: src/rm.c:135 +#: src/rm.c:136 msgid "" "Remove (unlink) the FILE(s).\n" "\n" @@ -8000,11 +8350,11 @@ msgid "" msgstr "" "Xoá (hủy liên kết) các TẬP_TIN.\n" "\n" -" -f, --force lờ đi tệp tin không tồn tại, không bao giờ hỏi " +" -f, --force bỏ qua tập tin không tồn tại, không bao giờ hỏi " "trước\n" -" -i hỏi trước mỗi lần xoá\n" +" -i hỏi trước mỗi lần xóa\n" -#: src/rm.c:141 +#: src/rm.c:142 msgid "" " -I prompt once before removing more than three files, " "or\n" @@ -8015,40 +8365,41 @@ msgid "" " --interactive[=WHEN] prompt according to WHEN: never, once (-I), or\n" " always (-i). Without WHEN, prompt always\n" msgstr "" -" -I hỏi một lần trước khi xoá hơn 3 tệp tin, hoặc khi xoá đệ " -"quy.\n" -" Ít xâm nhập hơn « -i », vẫn còn bảo vệ khỏi phần lớn " -"lỗi.\n" +" -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" -" • never không bao giờ\n" -" • once (-l) một lần\n" -" • always (-i) luôn luôn\n" +" * never không bao giờ\n" +" * once (-I) một lần\n" +" * always (-i) luôn luôn\n" " không có KHI thì luôn luôn hỏi trước\n" -#: src/rm.c:148 +#: src/rm.c:149 msgid "" " --one-file-system when removing a hierarchy recursively, skip any\n" " directory that is on a file system different from\n" " that of the corresponding command line argument\n" msgstr "" -" --one-file-system khi xoá đệ quy một phân cấp,\n" -" nhảy qua thư mục nằm trên hệ thống tệp tin " -"khác\n" -" với hệ thống có đối số dòng lệnh tượng ứng.\n" +" --one-file-system khi xóa đệ quy một phân cấp,\n" +" nhảy qua thư mục nằm trên hệ thống tập tin khác\n" +" với hệ thống có đối số dòng lệnh tượng ứng.\n" -#: src/rm.c:153 +#: src/rm.c:154 msgid "" " --no-preserve-root do not treat '/' specially\n" " --preserve-root do not remove '/' (default)\n" " -r, -R, --recursive remove directories and their contents recursively\n" +" -d, --dir remove empty directories\n" " -v, --verbose explain what is being done\n" msgstr "" -" --no-preserve-root không coi « / » là đặc biệt\n" -" --preserve-root không xóa « / » (mặc định)\n" -" -r, -R, --recursive xóa đệ quy các thư mục và nội dung\n" +" --no-preserve-root không coi “/” là đặc biệt\n" +" --preserve-root không xóa “/” (mặc định)\n" +" -r, -R, --recursive xóa đệ quy các thư mục và nội dung của chúng\n" +" -d, --dir xóa bỏ thư mục rỗng\n" " -v, --verbose cho biết những gì đang thực hiện\n" -#: src/rm.c:161 +#: src/rm.c:163 msgid "" "\n" "By default, rm does not remove directories. Use the --recursive (-r or -R)\n" @@ -8056,12 +8407,10 @@ msgid "" "contents.\n" msgstr "" "\n" -"Mặc định là chức năng « rm » không xoá thư mục.\n" -"Hãy dùng tùy chọn « --recursive » (-r hoặc -R) để xoá mỗi thư mục đã liệt " -"kê,\n" -"cùng với nội dung hoàn toàn.\n" +"Mặc định, “rm” không xóa thư mục. Hãy dùng tùy chọn “--recursive”\n" +"(-r hoặc -R) để xóa từng thư mục đã liệt kê, cùng với nội dung của chúng.\n" -#: src/rm.c:166 +#: src/rm.c:168 #, c-format msgid "" "\n" @@ -8072,13 +8421,13 @@ msgid "" " %s ./-foo\n" msgstr "" "\n" -"Để xóa một tập tin có tên bắt đầu với một « - », ví dụ « -foo »,\n" +"Để xóa một tập tin có tên bắt đầu với một “-”, ví dụ “-foo”,\n" "sử dụng một trong các câu lệnh sau:\n" " %s -- -foo\n" "\n" " %s ./-foo\n" -#: src/rm.c:175 +#: src/rm.c:177 msgid "" "\n" "Note that if you use rm to remove a file, it might be possible to recover\n" @@ -8086,17 +8435,17 @@ msgid "" "assurance that the contents are truly unrecoverable, consider using shred.\n" msgstr "" "\n" -"Chú ý rằng nếu dùng chức năng « rm » để xoá bở một tệp tin nào đó,\n" -"có thể là cũng có khả năng phục hồi một phần nội dung\n" +"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 “shred”.\n" -#: src/rm.c:335 +#: src/rm.c:342 #, c-format msgid "%s: remove all arguments recursively? " -msgstr "%s: xoá đệ quy mọi đối số không? " +msgstr "%s: xóa đệ quy mọi đối số không? " -#: src/rm.c:336 +#: src/rm.c:343 #, c-format msgid "%s: remove all arguments? " msgstr "%s: xóa mọi đối số không? " @@ -8109,7 +8458,7 @@ msgstr "đang xóa thư mục, %s" #: src/rmdir.c:148 #, c-format msgid "failed to remove directory %s" -msgstr "lỗi gỡ bỏ thư mục %s" +msgstr "gặp lỗi khi gỡ bỏ thư mục %s" #: src/rmdir.c:165 msgid "" @@ -8122,7 +8471,7 @@ msgstr "" "Gỡ bỏ mỗi THƯ_MỤC trống.\n" "\n" " --ignore-fail-on-non-empty\n" -" lờ đi mỗi lần thất bại chỉ do thư mục không trống gây ra\n" +" bỏ qua mỗi lần thất bại do thư mục không trống gây ra\n" #: src/rmdir.c:172 msgid "" @@ -8131,15 +8480,14 @@ msgid "" " similar to 'rmdir a/b/c a/b a'\n" " -v, --verbose output a diagnostic for every directory processed\n" msgstr "" -" -p, --parents gỡ bỏ THƯ_MỤC và các thư mục cấp trên,\n" -" v.d. « rmdir -p a/b/c » tương tự với « rmdir a/b/c a/b a " -"».\n" +" -p, --parents gỡ bỏ THƯ_MỤC và các thư mục cấp trên nó;\n" +" v.d. “rmdir -p a/b/c” tương tự với “rmdir a/b/c a/b a”.\n" " -v, --verbose đưa ra chuẩn đoán cho mỗi thư mục được xử lý\n" #: src/rmdir.c:242 #, c-format msgid "failed to remove %s" -msgstr "lỗi gỡ bỏ %s" +msgstr "gặp lỗi khi gỡ bỏ %s" #: src/runcon.c:83 #, c-format @@ -8147,15 +8495,19 @@ msgid "" "Usage: %s CONTEXT COMMAND [args]\n" " or: %s [ -c ] [-u USER] [-r ROLE] [-t TYPE] [-l RANGE] COMMAND [args]\n" msgstr "" -"Sử dụng: %s NGỮ_CẢNH LỆNH [đối_số...]\n" -" hoặc: %s [ -c ] [-u NGƯỜI_DÙNG] [-r VAI_TRÒ] [-t KIỂU] [-l PHẠM_VI] LỆNH " -"[đối_số...]\n" +"Cách dùng: %s NGỮ_CẢNH LỆNH [đối_số...]\n" +" hoặc: %s [ -c ] [-u NGƯỜI_DÙNG] [-r VAI_TRÒ] [-t KIỂU] [-l PHẠM_VI] " +"LỆNH [đối_số...]\n" #: src/runcon.c:87 msgid "" "Run a program in a different security context.\n" "With neither CONTEXT nor COMMAND, print the current security context.\n" -"\n" +msgstr "" + +#: src/runcon.c:94 +#, fuzzy +msgid "" " CONTEXT Complete security context\n" " -c, --compute compute process transition context before modifying\n" " -t, --type=TYPE type (for same role as parent)\n" @@ -8169,79 +8521,78 @@ msgstr "" "\n" " NGỮ_CẢNH ngữ cảnh bảo mật hoàn toàn\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 \t\tkiểu (cho cùng một vai trỏ với điều mẹ)\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" -" -r, --role=VAI_TRÒ \t\tvai trò\n" -" -l, --range=PHẠM_VI \tphạm vi cấp\n" +" -r, --role=VAI_TRÒ vai trò\n" +" -l, --range=PHẠM_VI phạm vi cấp\n" "\n" -#: src/runcon.c:140 +#: src/runcon.c:144 #, c-format msgid "multiple roles" msgstr "đa vai trò" -#: src/runcon.c:145 +#: src/runcon.c:149 #, c-format msgid "multiple types" msgstr "đa kiểu" -#: src/runcon.c:150 +#: src/runcon.c:154 #, c-format msgid "multiple users" msgstr "đa người dùng" -#: src/runcon.c:155 +#: src/runcon.c:159 #, c-format msgid "multiple levelranges" msgstr "đa phạm vi cấp" -#: src/runcon.c:173 src/runcon.c:209 +#: src/runcon.c:177 src/runcon.c:213 #, c-format msgid "failed to get current context" -msgstr "lỗi lấy ngữ cảnh hiện thời" +msgstr "gặp lỗi khi lấy ngữ cảnh hiện thời" -#: src/runcon.c:183 +#: 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 ghi rõ tùy chọn “-c”, “-t”, “-u”, “-l”, “-r” hay ngữ cảnh" -#: src/runcon.c:191 +#: src/runcon.c:195 #, c-format msgid "no command specified" msgstr "chưa ghi rõ lệnh" -#: src/runcon.c:197 +#: src/runcon.c:201 #, 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:223 +#: src/runcon.c:227 #, c-format msgid "failed to compute a new context" -msgstr "lỗi tính ngữ cảnh mới" +msgstr "gặp lỗi khi tính ngữ cảnh mới" -#: src/runcon.c:237 +#: src/runcon.c:241 #, c-format msgid "failed to set new user %s" -msgstr "lỗi đặt người dùng mới %s" +msgstr "gặp lỗi khi đặt người dùng mới %s" -#: src/runcon.c:239 +#: src/runcon.c:243 #, c-format msgid "failed to set new type %s" -msgstr "lỗi đặt kiểu mới %s" +msgstr "gặp lỗi khi đặt kiểu mới %s" -#: src/runcon.c:241 +#: src/runcon.c:245 #, c-format msgid "failed to set new range %s" -msgstr "lỗi đặt phạm vi mới %s" +msgstr "gặp lỗi khi đặt phạm vi mới %s" -#: src/runcon.c:243 +#: src/runcon.c:247 #, c-format msgid "failed to set new role %s" -msgstr "lỗi đặt vai trò mới %s" +msgstr "gặp lỗi khi đặt vai trò mới %s" -#: src/runcon.c:251 +#: src/runcon.c:255 #, c-format msgid "unable to set security context %s" msgstr "không thể đặt ngữ cảnh bảo mật %s" @@ -8253,26 +8604,29 @@ msgid "" " or: %s [OPTION]... FIRST LAST\n" " or: %s [OPTION]... FIRST INCREMENT LAST\n" msgstr "" -"Sử 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" +"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" #: src/seq.c:73 +msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" +msgstr "" + +#: src/seq.c:79 +#, fuzzy msgid "" -"Print numbers from FIRST to LAST, in steps of INCREMENT.\n" -"\n" " -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 điểm trôi kiểu printf\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 " "đầu\n" -#: src/seq.c:82 +#: src/seq.c:86 msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" @@ -8284,47 +8638,32 @@ 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ị điểm trôi.\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" -#: src/seq.c:90 +#: src/seq.c:94 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" -"đều là số điểm cứng thập phân có độ chính xác tối đa PREC, và nếu không thì " -"là %g.\n" +"ĐỊ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" +"đề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:136 +#: src/seq.c:140 #, c-format msgid "invalid floating point argument: %s" -msgstr "sai đối số điểm trôi: %s" - -#: src/seq.c:193 -#, c-format -msgid "format %s has no %% directive" -msgstr "định dạng %s không có chỉ thị %%" - -#: src/seq.c:210 -#, c-format -msgid "format %s ends in %%" -msgstr "định dạng %s kết thúc bằng %%" +msgstr "sai đối số dấu chấm động: %s" -#: src/seq.c:213 +#: src/seq.c:232 #, c-format msgid "format %s has unknown %%%c directive" -msgstr "định dạng %s có chỉ thị %%%c không rõ" - -#: src/seq.c:217 -#, c-format -msgid "format %s has too many %% directives" -msgstr "định dạng %s có quá nhiều chỉ thị %%" +msgstr "không hiểu định dạng %s có chỉ thị %%%c" -#: src/seq.c:431 +#: src/seq.c:555 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" @@ -8336,8 +8675,8 @@ msgid "" "Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n" " or: %s LONG-OPTION\n" msgstr "" -"Sử 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" +"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 "" @@ -8364,29 +8703,29 @@ msgid "" " (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" -"\t\tvà (nếu chỉ ra) đặt các ID nhóm phụ thành GID1, ...\n" +" và (nếu chỉ ra) đặt các ID nhóm phụ thành GID1, ...\n" -#: src/setuidgid.c:163 +#: src/setuidgid.c:162 #, c-format msgid "unknown user-ID: %s" -msgstr "ID người dùng không rõ : %s" +msgstr "ID người dùng lạ: %s" -#: src/setuidgid.c:174 +#: 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 »" +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:191 +#: src/setuidgid.c:190 #, c-format msgid "failed to set supplemental group(s)" -msgstr "lỗi đặt (các) nhóm phụ" +msgstr "gặp lỗi khi đặt (các) nhóm phụ" -#: src/setuidgid.c:201 +#: 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:205 +#: 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" @@ -8397,16 +8736,16 @@ msgid "Colin Plumb" msgstr "Colin Plumb" #: src/shred.c:148 +#, 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" -"\n" msgstr "" -"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" +"Ghi đè 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:156 +#: src/shred.c:155 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -8415,12 +8754,12 @@ 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 chèn 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" +" -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:162 +#: src/shred.c:161 msgid "" " -u, --remove truncate and remove file after overwriting\n" " -v, --verbose show progress\n" @@ -8428,14 +8767,14 @@ msgid "" " 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 chèn\n" +" -u, --remove cắt ngắn và xóa tập tin sau khi ghi đè\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 chèn cuối cùng bằng các số 0 để giấu việc " +" -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:171 +#: src/shred.c:170 msgid "" "\n" "If FILE is -, shred standard output.\n" @@ -8447,16 +8786,16 @@ msgid "" "\n" msgstr "" "\n" -"Nếu TẬP_TIN là « - », shred đầu ra tiêu chuẩn.\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" -"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" +"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" +"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" "\n" -#: src/shred.c:181 +#: src/shred.c:180 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" @@ -8467,14 +8806,14 @@ msgid "" "\n" msgstr "" "CẨN THẬN: Chú ý rằng chức năng shred dựa trên một tính chất quan trọng:\n" -"đó là hệ thống tệp tin ghi chèn dữ liệu tại chỗ. Đây là cách truyền\n" -"thống để thực hiện, nhưng nhiều hệ thống tệp tin mới có thiết kế\n" -"không thoả mãn. Dưới đây là những hệ thống tệp tin mà shred\n" -"không thực hiện được trên chúng, hoặc không bảo hành shred\n" -"thực hiện được trên chúng ở mọi chế độ của hệ thống tệp tin:\n" +"đó là hệ thống tập tin ghi đè dữ liệu tại chỗ. Đây là cách truyền\n" +"thống để thực hiện, nhưng nhiều hệ thống tập tin mới có thiết kế\n" +"không thoả mãn. Dưới đây là những hệ thống tập tin mà shred\n" +"không thực hiện được trên chúng, hoặc shred không chắc chắn là có thể\n" +"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:189 +#: src/shred.c:188 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -8485,17 +8824,17 @@ msgid "" "* file systems that make snapshots, such as Network Appliance's NFS server\n" "\n" msgstr "" -"• các hệ thống tệp tin cấu trúc log hoặc journal, như những hệ thống của\n" +"* các hệ thống tập tin cấu trúc log hoặc journal, như những hệ thống của\n" " AIX và Solaris (và JFS, ReiserFS, XFS, Ext3, v.v...)\n" "\n" -"• hệ thống tệp tin ghi dữ liệu thừa và phục hồi khi có lỗi ghi nhớ\n" -" như các hệ thống tệp tin dựa trên RAID\n" +"* hệ thống tập tin ghi dữ liệu thừa và phục hồi khi có lỗi ghi nhớ\n" +" chẳng hạn như các hệ thống tập tin dựa trên RAID\n" "\n" -"• hệ thống tệp tin tạo ảnh chụp (hiện trạng), như của các máy phục vụ\n" +"* hệ thống tập tin tạo ảnh chụp (hiện trạng), như của các máy phục vụ\n" " NFS Network Appliance\n" "\n" -#: src/shred.c:199 +#: src/shred.c:198 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -8503,13 +8842,13 @@ msgid "" "* compressed file systems\n" "\n" msgstr "" -"• hệ thống tệp tin nhớ tạm ở vị trí tạm thời, như trình khách NFS phiên bản " +"* hệ thống tập tin nhớ tạm ở vị trí tạm thời, như trình khách NFS phiên bản " "3\n" "\n" -"• hệ thống tệp tin đã nén\n" +"* hệ thống tập tin đã nén\n" "\n" -#: src/shred.c:206 +#: src/shred.c:205 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" @@ -8520,147 +8859,146 @@ msgid "" "as documented in the mount man page (man mount).\n" "\n" msgstr "" -"Trong trường hợp của hệ thống tệp tin ext3, sự từ bỏ trên là thích hợp\n" -"(thì shred chỉ có tác động bị hạn chế) chỉ ở chế độ « data=journal »\n" +"Trong trường hợp của hệ thống tập tin ext3, sự từ bỏ trên là thích hợp\n" +"(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" +"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ẫ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" +"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:216 +#: src/shred.c:215 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" -"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ị xé vụn bởi shred.\n" +"Thêm vào đó, bản sao lưu hệ thống tập tin và máy nhân ở 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:296 +#: src/shred.c:295 #, c-format msgid "%s: fdatasync failed" msgstr "%s: fdatasync bị lỗi" -#: src/shred.c:307 +#: src/shred.c:306 #, c-format msgid "%s: fsync failed" msgstr "%s: fsync bị lỗi" -#: src/shred.c:384 +#: src/shred.c:383 #, c-format msgid "%s: cannot rewind" msgstr "%s: không thể tua lại" -#: src/shred.c:403 +#: src/shred.c:402 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: thực hiện %lu/%lu (%s)..." -#: src/shred.c:453 +#: src/shred.c:452 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: lỗi ghi tại hiệu %s" -#: src/shred.c:471 +#: src/shred.c:470 #, c-format msgid "%s: lseek failed" msgstr "%s: lseek bị lỗi" -#: src/shred.c:482 +#: src/shred.c:481 #, c-format msgid "%s: file too large" -msgstr "%s: tệp tin quá lớn" +msgstr "%s: tập tin quá lớn" -#: src/shred.c:505 +#: src/shred.c:504 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" -msgstr "%s: thực hiện %lu/%lu (%s)...%s" +msgstr "%s: lần %lu/%lu (%s)...%s" -#: src/shred.c:521 +#: src/shred.c:520 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" -msgstr "%s: thực hiện %lu/%lu (%s)...%s/%s %d%%" +msgstr "%s: lần %lu/%lu (%s)...%s/%s %d%%" -#: src/shred.c:768 +#: src/shred.c:767 #, c-format msgid "%s: fstat failed" msgstr "%s: fstat bị lỗi" -#: src/shred.c:779 +#: src/shred.c:778 #, c-format msgid "%s: invalid file type" -msgstr "%s: sai dạng tệp tin" +msgstr "%s: sai dạng tập tin" -#: src/shred.c:798 +#: src/shred.c:797 #, c-format msgid "%s: file has negative size" -msgstr "%s: tệp tin có kích cỡ âm" +msgstr "%s: tập tin có kích cỡ âm" -#: src/shred.c:865 +#: src/shred.c:864 src/sort.c:932 src/split.c:378 #, c-format msgid "%s: error truncating" msgstr "%s: lỗi cắt ngắn" -#: src/shred.c:881 +#: src/shred.c:880 #, c-format msgid "%s: fcntl failed" msgstr "%s: fcntl bị lỗi" -#: src/shred.c:886 +#: src/shred.c:885 #, 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 phụ thêm vào" +msgstr "%s: không thể shred mô tả tập tin chỉ cho phép nối thêm vào" -#: src/shred.c:968 +#: src/shred.c:967 #, c-format msgid "%s: removing" msgstr "%s: đang xóa" -#: src/shred.c:992 +#: src/shred.c:991 #, c-format msgid "%s: renamed to %s" msgstr "%s: đã đổi tên thành %s" -#: src/shred.c:1014 +#: src/shred.c:1013 #, c-format msgid "%s: failed to remove" -msgstr "%s: lỗi xoá" +msgstr "%s: lỗi xóa" -#: src/shred.c:1018 +#: src/shred.c:1017 #, c-format msgid "%s: removed" msgstr "%s: đã xóa" -#: src/shred.c:1025 src/shred.c:1068 +#: src/shred.c:1024 src/shred.c:1067 #, c-format msgid "%s: failed to close" msgstr "%s: lỗi đóng" -#: src/shred.c:1061 +#: src/shred.c:1060 #, c-format msgid "%s: failed to open for writing" msgstr "%s: lỗi mở để ghi" -#: src/shred.c:1126 +#: src/shred.c:1125 #, c-format msgid "%s: invalid number of passes" msgstr "%s: sai số lần thực hiện" -#: src/shred.c:1135 src/shuf.c:291 src/sort.c:4387 +#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441 #, c-format msgid "multiple random sources specified" msgstr "đã chỉ ra nhiều nguồn ngẫu nhiên" -#: src/shred.c:1149 +#: src/shred.c:1148 #, c-format msgid "%s: invalid file size" -msgstr "%s: sai kích cỡ tệp tin" +msgstr "%s: sai kích cỡ tập tin" #: src/shuf.c:48 #, c-format @@ -8669,20 +9007,19 @@ msgid "" " or: %s -e [OPTION]... [ARG]...\n" " or: %s -i LO-HI [OPTION]...\n" msgstr "" -"Sử dụng: %s [TÙY_CHỌN]... [TẬP_TIN]\n" -" hoặc: %s -e [TÙY_CHỌN]... [ĐỐI_SỐ]...\n" -" hoặc: %s -i LO-HI [TÙY_CHỌN]...\n" +"Cách dùng: %s [TÙY_CHỌN]... [TẬP_TIN]\n" +" 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 -msgid "" -"Write a random permutation of the input lines to standard output.\n" -"\n" +#, fuzzy +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" -#: src/shuf.c:61 +#: src/shuf.c:60 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 " @@ -8692,40 +9029,40 @@ msgid "" " --random-source=FILE get random bytes from FILE\n" " -z, --zero-terminated end lines with 0 byte, not newline\n" msgstr "" -" -e, --echo coi mỗi ĐỐ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à một dòng " -"nhập vào\n" -" -n, --head-count=SỐ xuất nhiều nhất SỐ dòng\n" -" -o, --output=TẬP_TIN ghi kết quả vào tệp tin này, 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" +" -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" +" -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" -#: src/shuf.c:245 +#: src/shuf.c:244 #, c-format msgid "multiple -i options specified" -msgstr "đã chỉ ra nhiều tùy chọn « -i »" +msgstr "đã chỉ ra nhiều tùy chọn “-i”" -#: src/shuf.c:265 +#: src/shuf.c:264 #, c-format msgid "invalid input range %s" msgstr "sai phạm vi nhập vào %s" -#: src/shuf.c:278 +#: src/shuf.c:277 #, c-format msgid "invalid line count %s" msgstr "sai đếm dòng %s" -#: src/shuf.c:285 src/sort.c:4381 +#: src/shuf.c:284 src/sort.c:4435 #, c-format msgid "multiple output files specified" -msgstr "đã chỉ ra nhiều tệp tin kết quả" +msgstr "đã chỉ ra nhiều tập tin kết quả" -#: src/shuf.c:311 +#: src/shuf.c:310 #, 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 »" +msgstr "không thể kết hợp hai tùy chọn “-e” và “-i”" #: src/sleep.c:44 #, c-format @@ -8740,21 +9077,21 @@ msgid "" "specified by the sum of their values.\n" "\n" msgstr "" -"Sử dụng: %s SỐ[HẬU_TỐ]...\n" -" hoặc: %s TÙY_CHỌN\n" +"Cách dùng: %s SỐ[HẬU_TỐ]...\n" +" hoặc: %s TÙY_CHỌN\n" "Tạm dừng trong vòng SỐ giây.\n" "HẬU_TỐ có thể là:\n" -" • s giây (mặc định)\n" -" • m phút\n" -" • h giờ\n" -" • d ngày\n" +" * s giây (mặc định)\n" +" * 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" "\n" -#: src/sleep.c:135 src/timeout.c:295 +#: src/sleep.c:135 src/timeout.c:320 #, c-format msgid "invalid time interval %s" msgstr "sai khoảng thời gian %s" @@ -8764,15 +9101,14 @@ msgstr "sai khoảng thời gian %s" msgid "cannot read realtime clock" msgstr "không đọc được đồng hồ thời gian thực" -#: src/sort.c:395 -msgid "" -"Write sorted concatenation of all FILE(s) to standard output.\n" -"\n" +#: src/sort.c:399 +#, fuzzy +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" -#: src/sort.c:402 +#: src/sort.c:405 msgid "" "Ordering options:\n" "\n" @@ -8780,18 +9116,18 @@ msgstr "" "Tùy chọn sắp xếp:\n" "\n" -#: src/sort.c:406 +#: src/sort.c:409 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 lờ đi nhưng khoảng trắng ở đầu\n" -" -d, --dictionary-order tính chỉ các dấu cách và các ký tự chữ cái/số\n" +" -b, --ignore-leading-blanks bỏ qua những khoảng trắng ở đầu\n" +" -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:412 +#: src/sort.c:415 msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" " -i, --ignore-nonprinting consider only printable characters\n" @@ -8799,15 +9135,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 rõ) < « Th1 » < ... < « Th12 »\n" +" -M, --month-sort so sánh (không hiểu) < “Th1” < ... < ”Th12”\n" -#: src/sort.c:417 +#: src/sort.c:420 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:420 +#: src/sort.c:423 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -8816,10 +9152,10 @@ msgid "" msgstr "" " -n, --numeric-sort so sánh theo giá trị thuộc số kiểu chuỗi\n" " -R, --random-sort sắp xếp theo hash ngẫu nhiên của khoá\n" -" --random-source=TẬP_TIN lấy các byte ngẫu nhiên từ tệp tin này\n" +" --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:426 +#: src/sort.c:429 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -8828,18 +9164,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:434 +#: src/sort.c:437 msgid "" "Other options:\n" "\n" @@ -8847,15 +9183,15 @@ msgstr "" "Tùy chọn khác:\n" "\n" -#: src/sort.c:438 +#: src/sort.c:441 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" msgstr "" -" --batch-size=SỐ gộp lại đồng thời nhiều nhất SỐ đầu vào ;\n" -"\t\t\tcho một số lớn hơn, hãy sử dụng các tệp tin tạm thời\n" +" --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:442 +#: src/sort.c:445 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 " @@ -8866,13 +9202,13 @@ msgstr "" " -c, --check, --check=diagnose-first\n" " kiểm tra có đầu vào đã sắp xếp; không nên sắp xếp\n" " -C, --check=quiet, --check=silent\n" -" giống « -c », nhưng không thông báo dòng sai thứ " +" giống “-c”, nhưng không thông báo dòng sai thứ " "nhất\n" " --compress-program=PROG\n" " 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" +" để giải nén cũng đặt “-d”\n" -#: src/sort.c:449 +#: src/sort.c:452 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -8886,29 +9222,29 @@ msgstr "" " NUL-terminated names in file F;\n" " If F is - then read names from standard input\n" -#: src/sort.c:456 +#: src/sort.c:459 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 sắp xếp qua khóa, KEYDEF chỉ ra vị trí và kiểu\n" -" -m, --merge hòa trộn các tệp đã sắp xếp rồi; chứ không sắp " -"xếp\n" +"-k, --key=KEYDEF sắp xếp qua khóa, KEYDEF chỉ ra vị trí và kiểu\n" +" -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:460 +#: src/sort.c:463 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=TẬP_TIN ghi kết quả vào tệp tin này thay cho đầu ra tiêu " +" -o, --output=TẬP_TIN ghi kết quả vào tập tin này thay cho đầu ra tiêu " "chuẩn\n" -" -s, --stable ổn định sắp xếp bằng việc tắt so sánh sắp xếp lại " -"cuối cùng\n" -" -S, --buffer-size=CỠ dùng CỠ cho bộ nhớ đệm chính\n" +" -s, --stable ổn định sắp xếp bằng việc tắt so sánh sắp xếp " +"lại cuối cùng\n" +" -S, --buffer-size=CỠ dùng CỠ cho bộ nhớ đệm chính\n" -#: src/sort.c:466 +#: src/sort.c:469 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -8924,20 +9260,19 @@ msgid "" msgstr "" " -t, --field-separator=SEP phân cách các trường bằng SEP này thay ký tự " "trống\n" -" -T, --temporary-directory=DIR dùng DIR làm thư mục tạm thời, không phải " -"$TMPDIR hay %s;\n" +" -T, --temporary-directory=DIR dùng DIR làm thư mục tạm thời, không phải\n" +" $TMPDIR hay %s;\n" " có thể chỉ định nhiều thư mục\n" -" --parallel=N thay đổi số các sắp xếp chạy đồng thời là N\n" -" -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" +" --parallel=N thay đổi số sắp xếp chạy đồng thời là N\n" +" -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:475 +#: 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:480 +#: src/sort.c:483 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -8969,7 +9304,7 @@ msgstr "" "\n" "CỠ có thể theo bởi hậu tố là bội số của:\n" -#: src/sort.c:493 +#: src/sort.c:496 msgid "" "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n" "\n" @@ -8983,269 +9318,273 @@ msgstr "" "% 1% của bộ nhớ, b 1, K 1024 (mặc định), và tương tự cho M, G, T, P, E, Z, " "Y.\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" +"Khi không có TẬP_TIN, hoặc khi TẬP_TIN là “-”, đọc đầu vào tiêu chuẩn.\n" "\n" "*** CẢNH BÁO ***\n" "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" +"Đặ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:694 +#: src/sort.c:697 #, c-format msgid "waiting for %s [-d]" msgstr "đang đợi %s [-d]" -#: src/sort.c:699 +#: src/sort.c:702 #, c-format msgid "%s [-d] terminated abnormally" msgstr "%s [-d] đã chấm dứt bất thường" -#: src/sort.c:853 +#: src/sort.c:856 #, c-format msgid "cannot create temporary file in %s" -msgstr "không tạo được tệp tin tạm thời trong %s" +msgstr "không tạo được tập tin tạm thời trong %s" -#: src/sort.c:939 src/sort.c:2010 src/sort.c:3056 src/sort.c:3755 -#: src/sort.c:3758 +#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713 +#: src/sort.c:3804 src/sort.c:3807 msgid "open failed" -msgstr "lỗi mở" +msgstr "gặp lỗi khi mở" -#: src/sort.c:959 +#: src/sort.c:970 msgid "fflush failed" msgstr "fflush bị lỗi" -#: src/sort.c:964 src/sort.c:2013 src/sort.c:4646 +#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706 msgid "close failed" -msgstr "lỗi đóng" +msgstr "gặp lỗi khi đóng" -#: src/sort.c:973 +#: src/sort.c:986 #, c-format msgid "dup2 failed" msgstr "dup2 bị lỗi" -#: src/sort.c:1090 +#: src/sort.c:1103 #, c-format msgid "couldn't execute %s" msgstr "không thể thực hiện %s" -#: src/sort.c:1097 +#: src/sort.c:1110 msgid "couldn't create temporary file" -msgstr "không tạo được tệp tin tạm thời" +msgstr "không tạo được tập tin tạm thời" -#: src/sort.c:1136 +#: src/sort.c:1149 #, 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:1150 +#: 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:1209 +#: src/sort.c:1220 #, c-format msgid "warning: cannot remove: %s" -msgstr "cảnh báo : không xoá được: %s" +msgstr "cảnh báo: không xóa được: %s" -#: src/sort.c:1295 +#: src/sort.c:1306 #, c-format msgid "invalid --%s argument %s" -msgstr "sai đối số « --%s » %s" +msgstr "sai đối số “--%s” %s" -#: src/sort.c:1298 +#: src/sort.c:1309 #, c-format msgid "minimum --%s argument is %s" -msgstr "đối số « --%s » tối thiểu là %s" +msgstr "đối số “--%s” tối thiểu là %s" -#: src/sort.c:1313 +#: src/sort.c:1324 #, c-format msgid "--%s argument %s too large" -msgstr "đối số « --%s » %s vẫn quá lớn" +msgstr "tùy chọn --%s nhận đối số %s quá lớn" -#: src/sort.c:1316 +#: src/sort.c:1327 #, 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" +msgstr "đối số “--%s” tối đa theo giới hạn rlimit hiện thời là %s" -#: src/sort.c:1398 +#: src/sort.c:1409 #, c-format msgid "number in parallel must be nonzero" msgstr "số song song không thể là không" -#: src/sort.c:1479 +#: src/sort.c:1494 msgid "stat failed" -msgstr "lỗi lấy trạng thái về tệp tin" +msgstr "gặp lỗi khi lấy trạng thái về tập tin" -#: src/sort.c:1740 +#: src/sort.c:1755 msgid "read failed" -msgstr "lỗi đọc" +msgstr "gặp lỗi khi đọc" -#: src/sort.c:2028 +#: src/sort.c:2043 #, c-format msgid "string transformation failed" -msgstr "lỗi chuyển dạng chuỗi" +msgstr "gặp lỗi khi chuyển dạng chuỗi" -#: src/sort.c:2031 +#: src/sort.c:2046 #, c-format msgid "the untransformed string was %s" msgstr "chuỗi chưa được chuyển dạng là %s" -#: src/sort.c:2194 +#: src/sort.c:2209 #, c-format msgid "^ no match for key\n" msgstr "^ không có kết quả khớp\n" -#: src/sort.c:2374 +#: src/sort.c:2389 #, 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ế" +msgstr "đang dùng khóa cũ “%s”; hãy dùng khóa mới “%s” để thay thế" -#: src/sort.c:2380 +#: src/sort.c:2395 #, 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:2391 +#: src/sort.c:2406 #, 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'" +msgstr "có dấu cách ở đầu là quan trọng trong khóa %lu; hãy chỉ định “b”" -#: src/sort.c:2404 +#: src/sort.c:2419 #, 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:2436 +#: src/sort.c:2451 #, 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" +msgstr[0] "các tùy chọn “-%s” bị bỏ qua" -#: src/sort.c:2442 +#: src/sort.c:2457 #, 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:2716 src/sort.c:2725 +#: src/sort.c:2731 src/sort.c:2740 msgid "write failed" -msgstr "lỗi ghi" +msgstr "gặp lỗi khi ghi" -#: src/sort.c:2768 +#: src/sort.c:2783 #, c-format msgid "%s: %s:%s: disorder: " -msgstr "%s: %s:%s: sai thứ tự : " +msgstr "%s: %s:%s: sai thứ tự: " -#: src/sort.c:2771 +#: src/sort.c:2786 msgid "standard error" msgstr "lỗi tiêu chuẩn" -#: src/sort.c:3926 +#: src/sort.c:3698 +msgid "cannot read" +msgstr "không thể đọc" + +#: src/sort.c:3976 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: sai xác định trường %s" -#: src/sort.c:3937 +#: src/sort.c:3987 #, c-format msgid "options '-%s' are incompatible" -msgstr "các tùy chọn « -%s » không tương thích với nhau" +msgstr "các tùy chọn “-%s” không tương thích với nhau" -#: src/sort.c:3988 +#: src/sort.c:4038 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s: sai số đếm tại đầu của %s" -#: src/sort.c:4245 +#: src/sort.c:4295 msgid "invalid number after '-'" -msgstr "số sai ở sau « - »" +msgstr "số sai nằm sau “-”" -#: src/sort.c:4248 src/sort.c:4334 src/sort.c:4362 +#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416 msgid "invalid number after '.'" -msgstr "số sai ở sau « . »" +msgstr "số sai nằm sau “.”" -#: src/sort.c:4261 src/sort.c:4367 +#: src/sort.c:4315 src/sort.c:4421 msgid "stray character in field spec" msgstr "ký tự rác trong lời xác định trường" -#: src/sort.c:4308 +#: src/sort.c:4362 #, c-format msgid "multiple compress programs specified" msgstr "đã chỉ ra nhiều chương trình nén" -#: src/sort.c:4325 +#: src/sort.c:4379 msgid "invalid number at field start" msgstr "số sai tại đầu trường" -#: src/sort.c:4329 src/sort.c:4357 +#: src/sort.c:4383 src/sort.c:4411 msgid "field number is zero" msgstr "số của trường là không" -#: src/sort.c:4338 +#: src/sort.c:4392 msgid "character offset is zero" msgstr "hiệu ký tự là không" -#: src/sort.c:4353 +#: src/sort.c:4407 msgid "invalid number after ','" -msgstr "số sai ở sau « , »" +msgstr "số sai ở sau “,”" -#: src/sort.c:4403 +#: src/sort.c:4457 #, c-format msgid "empty tab" msgstr "khoảng tab trống" -#: src/sort.c:4496 src/wc.c:692 +#: src/sort.c:4550 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" +msgstr "không đọc được tên tập tin từ %s" -#: src/sort.c:4518 +#: src/sort.c:4572 #, 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" +msgstr "%s:%lu: sai tên tập tin chiều dài không" -#: src/sort.c:4524 +#: src/sort.c:4578 #, c-format msgid "no input from %s" msgstr "không có dữ liệu nhập vào từ %s" -#: src/sort.c:4570 +#: src/sort.c:4624 #, c-format msgid "using %s sorting rules" msgstr "dùng luật sắp xếp %s" -#: src/sort.c:4573 +#: src/sort.c:4627 #, c-format msgid "using simple byte comparison" msgstr "dùng so sánh byte đơn giản" -#: src/sort.c:4604 +#: src/sort.c:4658 #, 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 »" +msgstr "không cho phép toán hạng thêm %s với “-%c”" -#: src/split.c:184 +#: src/split.c:187 #, 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:201 +#: src/split.c:204 #, c-format msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" -msgstr "Sử dụng: %s [TÙY_CHỌN]... [VÀO [TIỀN_TỐ]]\n" +msgstr "Cách dùng: %s [TÙY_CHỌN]... [ĐẦU_VÀO [TIỀN_TỐ]]\n" -#: src/split.c:205 +#: src/split.c:208 +#, fuzzy 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" -"\n" msgstr "" "Tạo ra các phần có kích cỡ xác định của dữ liệu VÀO với tên TIỀN_TỐaa,\n" "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" +"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:214 +#: src/split.c:216 #, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" @@ -9264,29 +9603,28 @@ msgid "" " -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" -" -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 " +" --additional-suffix=SUFFIX nối thêm hậu tố SUFFIX vàp têm 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=COMMAND viết vào shell COMMAND; với tên tệp $FILE\n" -" -l, --lines=NUMBER đặt NUMBER dòng cho mỗi tệp tin kết quả\n" -" -n, --number=CHUNKS sinh CHUNKS tệp. 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 " -"r/...'\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" +" -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 " +"r/...”\n" -#: src/split.c:227 +#: src/split.c:229 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" msgstr "" " --verbose in thông tin chẩn đoán đúng trước\n" -"\t\t\tkhi mở mỗi tệp tin kết xuất\n" +" khi mở mỗi tập tin kết xuất\n" -#: src/split.c:234 +#: src/split.c:236 msgid "" "\n" "CHUNKS may be:\n" @@ -9299,193 +9637,198 @@ msgid "" msgstr "" "\n" "CHUNKS có thể là:\n" -"N chia nhỏ thành N tệp theo cỡ của đầu vào\n" +"N chia nhỏ thành N tập tin theo cỡ của đầu vào\n" "K/N đầu ra thứ K trên N của stdout\n" -"l/N chia nhỏ thành N tệp không có dòng chia cắt\n" +"l/N chia nhỏ thành N tập tin không có dòng chia cắt\n" "l/K/N đầu ra thứ K trên N trong stdout không có dòng chia cắt\n" -"r/N tương tự `l' nhưng dùng phân phối round-robin\n" +"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:352 +#: src/split.c:354 #, c-format msgid "output file suffixes exhausted" msgstr "cạn các đuôi (hậu tố) kết xuất" -#: src/split.c:364 +#: src/split.c:366 #, c-format msgid "creating file %s\n" -msgstr "đang tạo tệp tin %s\n" +msgstr "đang tạo tập tin %s\n" + +#: src/split.c:375 +#, c-format +msgid "%s would overwrite input; aborting" +msgstr "%s muốn ghi đè kết xuất; đang bỏ qua" -#: src/split.c:377 +#: src/split.c:391 #, c-format msgid "failed to set FILE environment variable" msgstr "Không đặt được biến môi trường FILE" -#: src/split.c:379 +#: src/split.c:393 #, c-format msgid "executing with FILE=%s\n" msgstr "thực thi với FILE=%s\n" -#: src/split.c:381 +#: src/split.c:395 #, c-format msgid "failed to create pipe" msgstr "không tạo được pipe" -#: src/split.c:395 +#: src/split.c:409 #, c-format msgid "closing prior pipe" msgstr "đóng pipe trước" -#: src/split.c:397 +#: src/split.c:411 #, c-format msgid "closing output pipe" msgstr "đóng pipe xuất ra" -#: src/split.c:401 +#: src/split.c:415 #, c-format msgid "moving input pipe" msgstr "di chuyển pipe đầu vào" -#: src/split.c:403 +#: src/split.c:417 #, c-format msgid "closing input pipe" msgstr "đóng pipe đầu vào" -#: src/split.c:408 +#: src/split.c:422 #, c-format msgid "failed to run command: \"%s -c %s\"" -msgstr "lỗi chạy câu lệnh: \"%s -c %s\"" +msgstr "gặp lỗi khi chạy câu lệnh: “%s -c %s”" -#: src/split.c:414 +#: src/split.c:428 #, c-format msgid "failed to close input pipe" msgstr "không thể đóng pipe đầu vào" -#: src/split.c:450 +#: src/split.c:464 #, c-format msgid "waiting for child process" msgstr "đợi tiến trình con" -#: src/split.c:460 +#: src/split.c:474 #, 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:468 +#: src/split.c:482 #, 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:475 src/timeout.c:449 +#: src/split.c:489 src/timeout.c:494 #, c-format msgid "unknown status from command (0x%X)" -msgstr "nhận được trạng thái không rõ từ câu lệnh (0x%X)" +msgstr "trạng thái chưa được biết đến từ câu lệnh (0x%X)" -#: src/split.c:1037 +#: src/split.c:1052 #, c-format msgid "cannot split in more than one way" msgstr "không thể chia theo vài cách" -#: src/split.c:1050 src/split.c:1192 src/split.c:1363 +#: src/split.c:1065 src/split.c:1205 src/split.c:1376 #, c-format msgid "%s: invalid number of chunks" -msgstr "%s: sai số các gói" +msgstr "%s: sai số gói" -#: src/split.c:1054 +#: src/split.c:1069 #, c-format msgid "%s: invalid chunk number" -msgstr "%s: sai số các gói" +msgstr "%s: sai số mảnh" -#: src/split.c:1106 +#: src/split.c:1119 #, c-format msgid "%s: invalid suffix length" msgstr "%s: sai chiều dài hậu tố" -#: src/split.c:1131 src/split.c:1139 src/split.c:1162 src/split.c:1167 +#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180 #, c-format msgid "%s: invalid number of bytes" msgstr "%s: số byte sai" -#: src/split.c:1150 src/split.c:1297 +#: src/split.c:1163 src/split.c:1310 #, c-format msgid "%s: invalid number of lines" msgstr "%s: số dòng sai" -#: src/split.c:1223 +#: src/split.c:1236 #, 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" +msgstr "tùy chọn số đếm dòng “-%s%c...” là quá lớn" -#: src/split.c:1235 +#: src/split.c:1248 #, c-format msgid "%s: invalid start value for numerical suffix" -msgstr "%s: sai giá trị bắt đầu cjp hậu tố dạng số" +msgstr "%s: sai giá trị bắt đầu cho hậu tố dạng số" -#: src/split.c:1263 +#: src/split.c:1276 #, c-format msgid "%s: invalid IO block size" msgstr "%s: cỡ khối IO không hợp lệ" -#: src/split.c:1284 +#: src/split.c:1297 #, 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:1321 +#: src/split.c:1334 #, 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:1356 +#: src/split.c:1369 #, c-format msgid "%s: cannot determine file size" -msgstr "%s: không thể xác định cỡ tệp" +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:169 +#: src/stat.c:173 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:838 +#: src/stat.c:857 #, c-format msgid "failed to canonicalize %s" msgstr "không thể chuẩn hóa %s" -#: src/stat.c:1050 +#: src/stat.c:1069 #, c-format msgid "warning: unrecognized escape '\\%c'" -msgstr "cảnh báo: không nhận ra dãy thoát « \\%c »" +msgstr "cảnh báo: không nhận ra dãy thoát “\\%c”" -#: src/stat.c:1105 +#: src/stat.c:1124 #, c-format msgid "%s: invalid directive" msgstr "%s: sai chỉ thị" -#: src/stat.c:1151 +#: src/stat.c:1170 #, c-format msgid "warning: backslash at end of format" -msgstr "cảnh báo : định dạng kết thúc bằng xuyệc ngược" +msgstr "cảnh báo: định dạng kết thúc bằng gạch ngược" -#: src/stat.c:1182 +#: src/stat.c:1201 #, 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" +"hệ thống tập tin" -#: src/stat.c:1189 +#: src/stat.c:1208 #, 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" +msgstr "không đọc được thông tin hệ thống tập tin cho %s" -#: src/stat.c:1209 +#: src/stat.c:1228 #, 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:1245 +#: src/stat.c:1264 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -9493,48 +9836,48 @@ msgid "" "Blocks: Total: %-10b Free: %-10f Available: %a\n" "Inodes: Total: %-10c Free: %d\n" msgstr "" -" Tệp: \"%n\"\n" +" 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 Dư: %a\n" +"Block: 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:1268 +#: src/stat.c:1287 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" msgstr "" -" Tệp: %N\n" +" Tập tin: %N\n" " Cỡ: %-10s\tBlock: %-10b IO Block: %-6o %F\n" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1278 +#: src/stat.c:1297 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" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1286 +#: src/stat.c:1305 msgid "Device: %Dh/%dd\tInode: %-10i Links: %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:1295 +#: src/stat.c:1314 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" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1305 +#: src/stat.c:1324 #, c-format msgid "Context: %C\n" -msgstr "ngữ cảnh %C\n" +msgstr "Ngữ cảnh: %C\n" -#: src/stat.c:1313 +#: src/stat.c:1332 msgid "" "Access: %x\n" "Modify: %y\n" @@ -9542,24 +9885,27 @@ msgid "" " Birth: %w\n" msgstr "" "Truy cập: %x\n" -"Sửa đổi: %y\n" +"Ngày sửa: %y\n" "Thay đổi: %z\n" -" Sinh mới: %w\n" +"Ngày tạo: %w\n" + +#: src/stat.c:1350 +msgid "Display file or file system status.\n" +msgstr "" -#: src/stat.c:1331 +#: src/stat.c:1356 +#, fuzzy msgid "" -"Display file or file system status.\n" -"\n" " -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" +"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" +" -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" -#: src/stat.c:1337 +#: src/stat.c:1360 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -9568,18 +9914,17 @@ msgid "" " 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 »,\n" -" \tcòn cũng giải thích các dãy thoát kiểu xuyệc ngược,\t\t" -"\tvà không bắt buộc phải xuất ký tự dòng mới đi theo.\n" -" Muốn tạo dòng mới thì bao gồm « \\n » trong " +" -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 " "ĐỊNH_DẠNG.\n" " -t, --terse in ra thông tin dưới dạng ngắn\n" -#: src/stat.c:1348 +#: src/stat.c:1371 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -9599,7 +9944,7 @@ msgstr "" " %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:1357 +#: src/stat.c:1380 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -9615,7 +9960,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:1365 +#: src/stat.c:1388 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -9629,15 +9974,15 @@ msgid "" 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" +" %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" " %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" -#: src/stat.c:1376 +#: src/stat.c:1399 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -9653,8 +9998,8 @@ msgid "" msgstr "" " %u ID 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, con người đọc được; - nếu không rõ\n" -" %W thời điểm sinh ra tệp; số giây từ Epoch; 0 nếu không rõ\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" " %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" @@ -9663,7 +10008,7 @@ msgstr "" " %Z thời gian thay đổi cuối cùng, theo giây kể từ Epoch\n" "\n" -#: src/stat.c:1390 +#: src/stat.c:1413 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -9673,15 +10018,15 @@ msgid "" " %d free file nodes in file system\n" " %f free blocks in file system\n" msgstr "" -"Các dãy định dạng đúng cho hệ thống tệp tin:\n" +"Các dãy định dạng đúng cho hệ thống tập tin:\n" "\n" " %a các khối còn trống cho người dùng không phải siêu người dùng\n" -" %b tổng số khối dữ liệu trong hệ thống tệp tin\n" -" %c tổng số nút tệp tin trong hệ thống tệp tin\n" -" %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" +" %b tổng số khối dữ liệu trong hệ thống tập tin\n" +" %c tổng số nút tập tin trong hệ thống tập tin\n" +" %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:1399 +#: src/stat.c:1422 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -9696,54 +10041,54 @@ msgstr "" " %n tên tập tin\n" " %s kích cỡ khối (để truyền nhanh hơn)\n" " %S kích cỡ khối cơ sở (để đếm các khối)\n" -" %t kiểu tệp tin theo dạng thập lục\n" -" %T kiểu hệ thống tệp tin theo dạng người dễ đọc\n" +" %t kiểu tập tin theo dạng thập lục\n" +" %T kiểu hệ thống tập tin theo dạng người dễ đọc\n" #: src/stdbuf.c:90 #, c-format msgid "Usage: %s OPTION... COMMAND\n" -msgstr "Sử dụng: %s TÙY_CHỌN... LỆNH\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" -"\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" -#: src/stdbuf.c:98 +#: src/stdbuf.c:97 msgid "" " -i, --input=MODE adjust standard input stream buffering\n" " -o, --output=MODE adjust standard output stream buffering\n" " -e, --error=MODE adjust standard error stream buffering\n" msgstr "" -" -i, --input=CHẾ_ĐỘ điều chỉnh việc chuyển hoán đệm luồng đầu vào tiêu " +" -i, --input=CHẾ_ĐỘ điều chỉnh việc chuyển hoán đệm luồng đầu vào tiêu " "chuẩn\n" -" -o, --output=CHẾ_ĐỘ điều chỉnh việc chuyển hoán đệm luồng đầu ra tiêu " +" -o, --output=CHẾ_ĐỘ điều chỉnh việc chuyển hoán đệm luồng đầu ra tiêu " "chuẩn\n" -" -e, --error=CHẾ_ĐỘ điều chỉnh việc chuyển hoán đệm luồng lỗi tiêu chuẩn\n" +" -e, --error=CHẾ_ĐỘ điều chỉnh việc chuyển hoán đệm luồng lỗi tiêu chuẩn\n" -#: src/stdbuf.c:105 +#: src/stdbuf.c:104 msgid "" "\n" "If MODE is 'L' the corresponding stream will be line buffered.\n" "This option is invalid with standard input.\n" msgstr "" "\n" -"Nếu CHẾ_ĐỘ là « L » thì luồng tương ứng được chuyển hoán đệm theo dòng.\n" -"Tuỳ chọn này không hợp lệ với đầu vào tiêu chuẩn.\n" +"Nếu CHẾ_ĐỘ là “L” thì luồng tương ứng được chuyển hoán đệm theo dòng.\n" +"Tùy chọn này không hợp lệ với đầu vào tiêu chuẩn.\n" -#: src/stdbuf.c:108 +#: src/stdbuf.c:107 msgid "" "\n" "If MODE is '0' the corresponding stream will be unbuffered.\n" msgstr "" "\n" -"Nếu CHẾ_ĐỘ là « 0 » thì luồng tương ứng không được chuyển hoán đệm.\n" +"Nếu CHẾ_ĐỘ là “0” thì luồng tương ứng không được chuyển hoán đệm.\n" -#: src/stdbuf.c:111 +#: src/stdbuf.c:110 msgid "" "\n" "Otherwise MODE is a number which may be followed by one of the following:\n" @@ -9759,7 +10104,7 @@ msgstr "" "Trong trường hợp này, luồng tương ứng được chuyển hoán đệm một cách đầy đủ,\n" "với kích cỡ vùng đệm được đặt thành CHẾ_ĐỘ byte.\n" -#: src/stdbuf.c:117 +#: src/stdbuf.c:116 msgid "" "\n" "NOTE: If COMMAND adjusts the buffering of its standard streams ('tee' does\n" @@ -9769,66 +10114,69 @@ msgid "" "and are thus unaffected by 'stdbuf' settings.\n" 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 " +"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" -"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 V/R,\n" -"thì không bị tác động bởi thiết lập « stdbuf ».\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" -#: src/stdbuf.c:227 +#: src/stdbuf.c:226 #, c-format msgid "failed to find %s" msgstr "không tìm thấy %s" -#: src/stdbuf.c:247 src/stdbuf.c:279 +#: src/stdbuf.c:246 src/stdbuf.c:278 #, c-format msgid "failed to update the environment with %s" -msgstr "lỗi cập nhật môi trường dùng %s" +msgstr "gặp lỗi khi cập nhật môi trường dùng %s" -#: src/stdbuf.c:321 +#: src/stdbuf.c:320 #, 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:509 +#: src/stty.c:513 #, 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 "" -"Sử dụng: %s [-F THIẾT_BỊ | --file=THIẾT_BỊ] [THIẾT_LẬP]...\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" +"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 +msgid "Print or change terminal characteristics.\n" +msgstr "" -#: src/stty.c:515 +#: src/stty.c:525 +#, fuzzy msgid "" -"Print or change terminal characteristics.\n" -"\n" " -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 " +" -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=THIẾT_BỊ mở và dùng THIẾT_BỊ thay cho đầu vào tiêu chuẩn\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" -#: src/stty.c:524 +#: src/stty.c:532 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" +"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" -#: src/stty.c:529 +#: src/stty.c:537 msgid "" "\n" "Special characters:\n" @@ -9838,48 +10186,48 @@ msgid "" 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" +" * 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" -" eol KÝ_TỰ KÝ_TỰ sẽ kết thúc dòng\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" +" eol KÝ_TỰ KÝ_TỰ sẽ kết thúc dòng\n" -#: src/stty.c:536 +#: src/stty.c:544 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 KÝ_TỰ KÝ_TỰ xen kẽ để kết thúc dòng\n" -" erase KÝ_TỰ KÝ_TỰ sẽ xóa ký tự cuối cùng gõ vào\n" -" 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" +" * eol2 KÝ_TỰ KÝ_TỰ xen kẽ để kết thúc dòng\n" +" erase KÝ_TỰ KÝ_TỰ sẽ xóa ký tự cuối cùng gõ vào\n" +" 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:542 +#: src/stty.c:550 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 KÝ_TỰ KÝ_TỰ sẽ nhập ký tự tiếp theo trong ngoặc\n" -" quit KÝ_TỰ KÝ_TỰ sẽ gửi một tín hiệu thoát\n" -" * 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" +" * lnext KÝ_TỰ KÝ_TỰ sẽ nhập ký tự tiếp theo trong ngoặc\n" +" quit KÝ_TỰ KÝ_TỰ sẽ gửi một tín hiệu thoát\n" +" * 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:548 +#: src/stty.c:556 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 KÝ_TỰ KÝ_TỰ sẽ dừng kết quả\n" -" susp KÝ_TỰ KÝ_TỰ sẽ gửi một tín hiệu dừng của thiết bị cuối\n" -" * swtch KÝ_TỰ KÝ_TỰ sẽ chuyển sang một lớp trình bao khác\n" -" * werase KÝ_TỰ KÝ_TỰ sẽ xóa từ đã gõ cuối cùng\n" +" stop KÝ_TỰ KÝ_TỰ sẽ dừng kết quả\n" +" susp KÝ_TỰ KÝ_TỰ sẽ gửi một tín hiệu dừng của thiết bị cuối\n" +" * 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:554 +#: src/stty.c:562 msgid "" "\n" "Special settings:\n" @@ -9889,11 +10237,11 @@ msgid "" 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" -" * 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" +" N đặt tốc độ nhập 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:561 +#: src/stty.c:569 msgid "" " ispeed N set the input speed to N\n" " * line N use line discipline N\n" @@ -9901,12 +10249,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" -" * 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" +" ispeed N đặt tốc độ nhập 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:567 +#: src/stty.c:575 msgid "" " * rows N tell the kernel that the terminal has N rows\n" " * size print the number of rows and columns according to the " @@ -9914,45 +10262,47 @@ msgid "" " speed print the terminal speed\n" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" -" * rows N cho nhân biết thiết bị cuối có N dòng\n" -" * size in ra số hàng và số cột theo thông tin của nhân\n" -" speed in ra tốc độ của thiết bị cuối\n" -" 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" +" * rows N cho nhân biết thiết bị cuối có N dòng\n" +" * size in ra số hàng và số cột theo thông tin của nhân\n" +" speed in ra tốc độ của thiết bị cuối\n" +" 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:573 +#: src/stty.c:581 +#, fuzzy msgid "" "\n" "Control settings:\n" " [-]clocal disable modem control signals\n" " [-]cread allow input to be received\n" " * [-]crtscts enable RTS/CTS handshaking\n" +" * [-]cdtrdsr enable DTR/DSR handshaking\n" " csN set character size to N bits, N in [5..8]\n" msgstr "" "\n" "Thiết lập đ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" -" csN đặt kích cỡ ký tự thành N bit, N nằm trong [5..8]\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" +" csN đặt kích cỡ ký tự thành N bit, N nằm trong [5..8]\n" -#: src/stty.c:581 +#: src/stty.c:590 msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" " [-]hupcl same as [-]hup\n" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" -" [-]parodd set odd parity (even with '-')\n" +" [-]parodd set odd parity (or even parity with '-')\n" msgstr "" -" [-]cstopb dùng hai bit dừng cho mỗi ký tự (đặt « - » thì một bit)\n" -" [-]hup gửi tín hiệu treo khi tiến trình cuối cùng đóng tty\n" -" [-]hupcl như « [-]hup »\n" -" [-]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ẻ (đặt « - » thì chẵn)\n" +" [-]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" +" [-]hupcl như “[-]hup”\n" +" [-]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" -#: src/stty.c:588 +#: src/stty.c:597 msgid "" "\n" "Input settings:\n" @@ -9963,12 +10313,12 @@ msgid "" msgstr "" "\n" "Thiết lập đầ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 lờ đi ký tự ngắt\n" -" [-]igncr lờ đi return\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:596 +#: src/stty.c:605 msgid "" " [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" @@ -9976,18 +10326,18 @@ msgid "" " [-]inpck enable input parity checking\n" " [-]istrip clear high (8th) bit of input characters\n" msgstr "" -" [-]ignpar lờ đi các ký tự với lỗi tính chẵn lẻ\n" -" * [-]imaxbel bíp và không làm tràn bộ đệm đầu vào đầy khi nhận một ký " +" [-]ignpar bỏ qua các ký tự với lỗi tính chẵn lẻ\n" +" * [-]imaxbel bíp và không làm tràn bộ đệm đầu vào đầy khi nhận một ký " "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" +" [-]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" -#: src/stty.c:603 +#: src/stty.c:612 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" +msgstr " * [-]iutf8 coi như các ký tự đưa vào được mã hóa UTF-8\n" -#: src/stty.c:606 +#: src/stty.c:615 msgid "" " * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" @@ -9996,15 +10346,15 @@ msgid "" " [-]parmrk mark parity errors (with a 255-0-character sequence)\n" " [-]tandem same as [-]ixoff\n" msgstr "" -" * [-]iuclc chuyển ký tự viết hoa thành viết thường\n" -" * [-]ixany bất kỳ ký tự nào không chỉ ký tự khởi động cũng chạy lại " +" * [-]iuclc chuyển ký tự viết hoa thành viết thường\n" +" * [-]ixany bất kỳ ký tự nào không chỉ ký tự khởi động cũng chạy lại " "đầu vào\n" -" [-]ixoff bật dùng việc gửi ký tự chạy/dừng\n" -" [-]ixon bật dùng điều khiển luồng XON/XOFF\n" -" [-]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" +" [-]ixoff bật dùng việc gửi ký tự chạy/dừng\n" +" [-]ixon bật dùng điều khiển luồng XON/XOFF\n" +" [-]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:614 +#: src/stty.c:623 msgid "" "\n" "Output settings:\n" @@ -10015,12 +10365,12 @@ msgid "" msgstr "" "\n" "Thiết lập đầu ra:\n" -" * bsN kiểu trì hoãn của xoá 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" +" * 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:622 +#: src/stty.c:631 msgid "" " * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of null characters\n" @@ -10029,15 +10379,15 @@ msgid "" " * [-]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" -" * [-]ofill dùng các ký tự làm đầy (độn thêm) thay cho thời gian trì " +" * [-]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" +" * [-]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" -" * [-]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" +" * [-]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:630 +#: src/stty.c:639 msgid "" " * [-]onocr do not print carriage returns in the first column\n" " [-]opost postprocess output\n" @@ -10046,14 +10396,14 @@ msgid "" " * -tabs same as tab3\n" " * vtN vertical tab delay style, N in [0..1]\n" msgstr "" -" * [-]onocr không in ra return trong cột đầu tiên\n" -" [-]opost xử lý cuối cùng kết quả\n" -" * tabN kiểu trì hoãn của tab ngang, N nằm trong [0..3]\n" -" * tabs giống như « tab0 »\n" -" * -tabs giống như « tab3 »\n" -" * vtN kiểu trì hoãn của tab dọc, N nằm trong [0..1]\n" +" * [-]onocr không in ra return trong cột đầu tiên\n" +" [-]opost xử lý cuối cùng kết quả\n" +" * tabN kiểu trì hoãn của tab ngang, N nằm trong [0..3]\n" +" * tabs giống như “tab0”\n" +" * -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:638 +#: src/stty.c:647 msgid "" "\n" "Local settings:\n" @@ -10062,12 +10412,12 @@ msgid "" " * -crtkill kill all line by obeying the echoctl and echok settings\n" msgstr "" "\n" -"Thiết lập 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" +"Thiết lập 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" -#: src/stty.c:645 +#: src/stty.c:654 msgid "" " * [-]ctlecho echo control characters in hat notation ('^c')\n" " [-]echo echo input characters\n" @@ -10075,13 +10425,13 @@ msgid "" " [-]echoe same as [-]crterase\n" " [-]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" -" * [-]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" +" * [-]ctlecho đưa ra ký tự control ở dạng mũ (“^c”)\n" +" [-]echo đưa ra ký tự nhập 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:652 +#: src/stty.c:661 msgid "" " * [-]echoke same as [-]crtkill\n" " [-]echonl echo newline even if not echoing other characters\n" @@ -10089,13 +10439,13 @@ msgid "" " [-]icanon enable erase, kill, werase, and rprnt special characters\n" " [-]iexten enable non-POSIX special characters\n" msgstr "" -" * [-]echoke giống như « [-]crtkill »\n" -" [-]echonl đưa ra một dòng mới thậm chí nếu không đưa ra ký tự khác\n" -" * [-]echoprt đưa ra ngược lại ký tự bị xóa, giữa « \\ » và « / »\n" -" [-]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" +" * [-]echoke giống như “[-]crtkill”\n" +" [-]echonl đưa ra một dòng mới thậm chí nếu không đưa ra ký tự khác\n" +" * [-]echoprt đưa ra ngược lại ký tự bị xóa, giữa “\\” và “/”\n" +" [-]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:659 +#: src/stty.c:668 msgid "" " [-]isig enable interrupt, quit, and suspend special characters\n" " [-]noflsh disable flushing after interrupt and quit special " @@ -10104,14 +10454,13 @@ msgid "" " * [-]tostop stop background jobs that try to write to the terminal\n" " * [-]xcase with icanon, escape with '\\' for uppercase characters\n" msgstr "" -" [-]isig bật dùng các ký tự đặc ngắt, thoát, và ngưng\n" -" [-]noflsh tắt bỏ làm tràn sau các ký tự đặc biệt gián đoạn và " -"thoát\n" -" * [-]prterase giống như « [-]echoprt »\n" -" * [-]tostop dừng các công việc nền mà thử ghi tới thiết bị cuối\n" -" * [-]xcase với « icanon », thoát với « \\ » cho các ký tự viết hoa\n" +" [-]isig bật dùng các ký tự đặc ngắt, thoát, và ngưng\n" +" [-]noflsh tắt bỏ làm tràn sau các ký tự đặc biệt gián đoạn và thoát\n" +" * [-]prterase giống như “[-]echoprt”\n" +" * [-]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:666 +#: src/stty.c:675 msgid "" "\n" "Combination settings:\n" @@ -10121,24 +10470,24 @@ msgid "" msgstr "" "\n" "Thiết lập tổ hợp:\n" -" * [-]LCASE giống như « [-]lcase »\n" -" cbreak giống như « -icanon »\n" -" -cbreak giống như « icanon »\n" +" * [-]LCASE giống như “[-]lcase”\n" +" cbreak giống như “-icanon”\n" +" -cbreak giống như “icanon”\n" -#: src/stty.c:673 +#: src/stty.c:682 msgid "" " cooked same as brkint ignpar istrip icrnl ixon opost isig\n" " icanon, eof and eol characters to their default values\n" " -cooked same as raw\n" " crt same as echoe echoctl echoke\n" msgstr "" -" cooked giống như « brkint ignpar istrip icrnl ixon opost isig " -"icanon »\n" -" các ký tự eof và eol tới giá trị mặc định của chúng\n" -" -cooked giống như « raw »\n" -" crt giống như « echoe echoctl echoke »\n" +" cooked giống như “brkint ignpar istrip icrnl ixon opost isig " +"icanon”\n" +" các ký tự eof và eol tới giá trị mặc định của chúng\n" +" -cooked giống như “raw”\n" +" crt giống như “echoe echoctl echoke”\n" -#: src/stty.c:679 +#: src/stty.c:688 msgid "" " dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" " kill ^u\n" @@ -10146,14 +10495,13 @@ msgid "" " ek erase and kill characters to their default values\n" " evenp same as parenb -parodd cs7\n" msgstr "" -" dec giống như\n" -" « echoe echoctl echoke -ixany intr ^c erase 0177 kill " -"^u »\n" -" * [-]decctlq giống như « [-]ixany »\n" -" 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" +" dec giống như\n" +" “echoe echoctl echoke -ixany intr ^c erase 0177 kill ^u”\n" +" * [-]decctlq giống như “[-]ixany”\n" +" 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:686 +#: src/stty.c:695 msgid "" " -evenp same as -parenb cs8\n" " * [-]lcase same as xcase iuclc olcuc\n" @@ -10162,14 +10510,14 @@ msgid "" " nl same as -icrnl -onlcr\n" " -nl same as icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" msgstr "" -" -evenp giống như « -parenb cs8 »\n" -" * [-]lcase giống như « xcase iuclc olcuc »\n" -" litout giống như « -parenb -istrip -opost cs8 »\n" -" -litout giống như « parenb istrip opost cs7 »\n" -" nl giống như « -icrnl -onlcr »\n" -" -nl giống như « icrnl -inlcr -igncr onlcr -ocrnl -onlret »\n" +" -evenp giống như “-parenb cs8”\n" +" * [-]lcase giống như “xcase iuclc olcuc”\n" +" litout giống như “-parenb -istrip -opost cs8”\n" +" -litout giống như “parenb istrip opost cs7”\n" +" nl giống như “-icrnl -onlcr”\n" +" -nl giống như “icrnl -inlcr -igncr onlcr -ocrnl -onlret”\n" -#: src/stty.c:694 +#: src/stty.c:703 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -10177,26 +10525,26 @@ msgid "" " pass8 same as -parenb -istrip cs8\n" " -pass8 same as parenb istrip cs7\n" msgstr "" -" oddp giống như « parenb parodd cs7 »\n" -" -oddp giống như « -parenb cs8 »\n" -" [-]parity giống như « [-]evenp »\n" -" pass8 giống như « -parenb -istrip cs8 »\n" -" -pass8 giống như « parenb istrip cs7 »\n" +" oddp giống như “parenb parodd cs7”\n" +" -oddp giống như “-parenb cs8”\n" +" [-]parity giống như “[-]evenp”\n" +" pass8 giống như “-parenb -istrip cs8”\n" +" -pass8 giống như “parenb istrip cs7”\n" -#: src/stty.c:701 +#: src/stty.c:710 msgid "" " raw same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" " -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n" " -imaxbel -opost -isig -icanon -xcase min 1 time 0\n" " -raw same as cooked\n" msgstr "" -" raw giống như\n" -" « -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" -" -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n" -" -imaxbel -opost -isig -icanon -xcase min 1 time 0 »\n" -" -raw giống như « cooked »\n" +" raw giống như\n" +" “-ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" +" -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n" +" -imaxbel -opost -isig -icanon -xcase min 1 time 0”\n" +" -raw giống như “cooked”\n" -#: src/stty.c:707 +#: src/stty.c:716 msgid "" " sane same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" " -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n" @@ -10205,15 +10553,15 @@ msgid "" " -xcase -tostop -echoprt echoctl echoke, all special\n" " characters to their default values\n" msgstr "" -" sane giống như :\n" -"\t\t« cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" +" sane giống như:\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" -"\tmỗi ký tự đặc biệt cũng có giá trị mặc định\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:715 +#: src/stty.c:724 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -10227,14 +10575,14 @@ msgstr "" "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" -"giá trị đặc biệt « ^- » hoặc « undef » dùng để tắt bỏ các ký tự đặc biệt.\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:787 +#: src/stty.c:796 #, c-format msgid "only one device may be specified" msgstr "chỉ có thể đưa ra một thiết bị" -#: src/stty.c:817 +#: src/stty.c:826 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" @@ -10243,126 +10591,47 @@ 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:823 +#: src/stty.c:832 #, 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:838 +#: src/stty.c:847 #, 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:883 src/stty.c:993 +#: src/stty.c:892 src/stty.c:1002 #, c-format msgid "invalid argument %s" msgstr "đối số sai %s" -#: src/stty.c:894 src/stty.c:911 src/stty.c:923 src/stty.c:936 src/stty.c:948 -#: src/stty.c:968 +#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957 +#: src/stty.c:977 #, c-format msgid "missing argument to %s" msgstr "thiếu đối số cho %s" -#: src/stty.c:974 +#: src/stty.c:983 #, c-format msgid "invalid line discipline %s" msgstr "sai kỷ luật của dòng %s" -#: src/stty.c:1044 +#: src/stty.c:1053 #, 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:1390 +#: src/stty.c:1399 #, 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:1904 +#: src/stty.c:1920 #, c-format msgid "invalid integer argument %s" msgstr "sai đối số kiểu số nguyên %s" -#: src/su.c:229 -msgid "Password:" -msgstr "Mật khẩu :" - -#: src/su.c:232 -#, c-format -msgid "getpass: cannot open /dev/tty" -msgstr "getpass: không mở được « /dev/tty »" - -#: src/su.c:290 -#, c-format -msgid "cannot set groups" -msgstr "không đặt được các nhóm" - -#: src/su.c:294 -#, c-format -msgid "cannot set group id" -msgstr "không đặt được ID nhóm" - -#: src/su.c:296 -#, c-format -msgid "cannot set user id" -msgstr "không đặt được ID người dùng" - -#: src/su.c:371 -#, c-format -msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" -msgstr "Sử dụng: %s [TÙY_CHỌN]... [-] [NGƯỜI_DÙNG [ĐỐI_SỐ]...]\n" - -#: src/su.c:372 -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 "" -"Thay đổi id người dùng và id nhóm hoạt động thành của NGƯỜIDÙNG.\n" -"\n" -" -, -l, --login khiến trình bao thành trình bao đăng nhập\n" -" -c, --command=LỆNH đưa một câu LỆNH đơn tới trình bao với « -c " -"»\n" -" -f, --fast đưa « -f » tới trình bao (cho csh hoặc tcsh)\n" -" -m, --preserve-environment không đặt lại các biến môi trường\n" -" -p giống như « -m »\n" -" -s, --shell=TRÌNH_BAO chạy TRÌNH_BAO nếu « /etc/shells » cho phép\n" - -#: src/su.c:384 -msgid "" -"\n" -"A mere - implies -l. If USER not given, assume root.\n" -msgstr "" -"\n" -"Một « - » ý nói « -l ». Nếu không đưa ra NGƯỜI_DÙNG, thì coi như người chủ " -"(root).\n" - -#: src/su.c:461 -#, c-format -msgid "user %s does not exist" -msgstr "người dùng %s không tồn tại" - -#: src/su.c:484 -#, c-format -msgid "incorrect password" -msgstr "sai mật khẩu" - -#: src/su.c:501 -#, c-format -msgid "using restricted shell %s" -msgstr "sử dụng trình bao bị giới hạn %s" - -#: src/su.c:509 -#, c-format -msgid "warning: cannot change directory to %s" -msgstr "cảnh báo : không thể chuyển đổi thư mục sang %s" - #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 msgid "Kayvan Aghaiepour" @@ -10377,8 +10646,9 @@ msgid "" msgstr "" "In ra tổng kiểm tra và số đếm khối cho mỗi TẬP_TIN.\n" "\n" -" -r dùng thuật toán tính tổng BSD, dùng các khối 1K\n" -" -s, --sysv dùng thuật toán tính tổng System V, dùng các khối 512 byte\n" +" -r dùng thuật toán tính tổng BSD, dùng các khối 1K\n" +" -s, --sysv dùng thuật toán tính tổng System V, dùng các khối 512 " +"byte\n" #: src/sync.c:41 msgid "" @@ -10391,9 +10661,9 @@ msgstr "" #: src/sync.c:69 #, c-format msgid "ignoring all arguments" -msgstr "đang lờ đi mọi đối số" +msgstr "đang bỏ qua mọi đối số" -#: src/system.h:340 +#: src/system.h:343 #, c-format msgid "" "\n" @@ -10402,20 +10672,29 @@ msgid "" "for details about the options it supports.\n" msgstr "" "\n" -"GHI CHÚ : có lẽ bạn có trình bao với một phiên bản %s riêng,\n" -"mà thường có quyền cao hơn phiên bản nói trên.\n" -"Hãy tham chiếu đến tài liệu hướng dẫn của trình bao\n" +"GHI 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" -#: src/system.h:346 +#: src/system.h:349 msgid " --help display this help and exit\n" -msgstr " --help hiển thị trợ giúp này rồi thoát\n" +msgstr " --help hiển thị trợ giúp này rồi thoát\n" -#: src/system.h:348 +#: src/system.h:351 msgid " --version output version information and exit\n" -msgstr " --version đưa ra thông tin phiên bản rồi thoát\n" +msgstr " --version đưa ra thông tin phiên bản rồi thoát\n" + +#: src/system.h:544 +#, fuzzy +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" -#: src/system.h:541 +#: src/system.h:552 msgid "" "\n" "SIZE is an integer and optional unit (example: 10M is 10*1024*1024). Units\n" @@ -10428,7 +10707,7 @@ msgstr "" "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:550 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -10437,41 +10716,42 @@ msgid "" "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n" msgstr "" "\n" -"Giá trị hiển thị theo đơn vị kích CỠ sẵn có đầu tiên từ « --block-size »,\n" +"Giá trị hiển thị theo đơn vị kích CỠ sẵn có đầu tiên từ “--block-size”,\n" "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:560 +#: src/system.h:571 #, c-format msgid "" "\n" "Report %s bugs to %s\n" msgstr "" "\n" -"Thông báo lỗi %s tới %s\n" +"Thông báo lỗi “%s” cho <%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:574 +#: src/system.h:585 #, 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/>\n" +msgstr "" +"Hãy thông báo lỗi dịch “%s” cho <http://translationproject.org/team/vi." +"html>\n" -#: src/system.h:578 +#: src/system.h:589 #, c-format msgid "For complete documentation, run: info coreutils '%s invocation'\n" msgstr "" -"Để thấy tài liệu hướng dẫn hoàn toàn, hãy chạy câu lệnh: info coreutils '%s " -"invocation'\n" +"Để xem tài liệu hướng dẫn đầy đủ, hãy đọc: info coreutils \"%s invocation\"\n" -#: src/system.h:585 +#: src/system.h:596 #, c-format msgid "Try '%s --help' for more information.\n" -msgstr "Hãy thử lệnh «%s --help» (trợ giúp) để xem thông tin thêm.\n" +msgstr "Hãy thử lệnh “%s --help” (trợ giúp) để biết thêm thông tin.\n" -#: src/system.h:617 +#: src/system.h:628 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -10480,9 +10760,9 @@ msgid "" "The following directory is part of the cycle:\n" " %s\n" msgstr "" -"CẢNH BÁO : cấu trúc thư mục vòng quanh.\n" -"Gần chắc chắn là hệ thống tệp tin đã bị hỏng.\n" -"HÃY THÔNG BÁO CHO NHÀ QUẢN LÝ HỆ THỐNG.\n" +"CẢNH BÁO: cấu trúc thư mục vòng quanh.\n" +"Gần chắc chắn là hệ thống tập tin đã bị hỏng.\n" +"HÃY THÔNG BÁO CHO NGƯỜI QUẢN LÝ HỆ THỐNG.\n" "Thư mục sau nằm trong vòng quay:\n" " %s\n" @@ -10492,65 +10772,65 @@ 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" -"\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" +"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/tac.c:145 +#: src/tac.c:144 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 gắn ký tự phân chia ở trước thay vì sau\n" -" -r, --regex biên dịch ký tự phân chia như một biểu thức chính " +" -b, --before gắn ký tự phân chia ở trước thay vì sau\n" +" -r, --regex biên dịch ký tự phân chia như là biểu thức chính " "quy\n" -" -s, --separator=CHUỖI dùng CHUỖI làm ký tự phân chia thay cho dòng mới\n" +" -s, --separator=CHUỖI dùng CHUỖI làm ký tự phân chia thay cho dòng mới\n" -#: src/tac.c:235 src/tac.c:336 +#: src/tac.c:234 src/tac.c:335 #, c-format msgid "%s: seek failed" -msgstr "%s: lỗi tìm nơi" +msgstr "%s: di chuyển vị trí để đọc gặp lỗi" -#: src/tac.c:264 +#: src/tac.c:263 #, c-format msgid "record too large" msgstr "mục ghi quá lớn" -#: src/tac.c:451 +#: src/tac.c:450 #, c-format msgid "failed to create temporary file in %s" -msgstr "tạo tập tin tạm %s gặp lỗi" +msgstr "gặp lỗi khi tạo tập tin tạm trong %s " -#: src/tac.c:459 +#: src/tac.c:458 #, c-format msgid "failed to open %s for writing" msgstr "mở %s để ghi gặp lỗi" -#: src/tac.c:476 +#: src/tac.c:475 #, c-format msgid "failed to rewind stream for %s" msgstr "Đặt lại dòng dữ liệu cho %s gặp lỗi" -#: src/tac.c:512 src/tac.c:519 +#: src/tac.c:511 src/tac.c:518 #, c-format msgid "%s: write error" msgstr "%s: lỗi ghi nhớ" -#: src/tac.c:572 +#: src/tac.c:571 #, c-format msgid "failed to open %s for reading" msgstr "mở %s để đọc gặp lỗi" -#: src/tac.c:630 +#: src/tac.c:629 #, c-format msgid "separator cannot be empty" -msgstr "cái phân chia không thể là rỗng" +msgstr "ký tự dùng để phân chia không thể là rỗng" #. This is a proper name. See the gettext manual, section Names. #: src/tail.c:71 @@ -10558,30 +10838,28 @@ msgid "Ian Lance Taylor" msgstr "Ian Lance Taylor" #: src/tail.c:262 -#, c-format +#, fuzzy, 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" -"\n" 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 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" "\n" -#: src/tail.c:271 +#: 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" msgstr "" -" -c, --bytes=K xuất K byte cuối cùng;\n" -"\thoặc dùng « -c +K » để xuất các byte bắt đầu với byte thứ K của mỗi tệp " -"tin\n" +" -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" -#: src/tail.c:275 +#: src/tail.c:274 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -10590,12 +10868,11 @@ msgid "" " -F same as --follow=name --retry\n" msgstr "" " -f, --follow[={tên|mô_tả}]\n" -" in ra dữ liệu đã phụ thêm vào cuối tệp tin;\n" -" « -f », « --follow », và « --follow=mô_tả » là tương " -"đương\n" -" -F giống như « --follow=tên --retry »\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 giống như “--follow=tên --retry”\n" -#: src/tail.c:282 +#: src/tail.c:281 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -10608,19 +10885,19 @@ msgid "" " (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\n" -" hoặc dùng « -n +K » để xuất các dòng bắt đầu với dòng " -"thứ K\n" +" -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" " --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" -" để 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 đã " -"quay vòng).\n" -" Khi đã có inotify, chức năng này trở nên không cần " -"thiết.\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" +" để 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" -#: src/tail.c:295 +#: src/tail.c:294 msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" " -q, --quiet, --silent never output headers giving file names\n" @@ -10628,14 +10905,14 @@ msgid "" " becomes inaccessible; useful when following by\n" " name, i.e., with --follow=name\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" -"\t\t\t\tnó vẫn (hoặc trở thành) không tới được;\n" -"\t\t\t\tcó ích khi đi theo tên, tức là dùng « --follow=name »\n" +" --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" -#: src/tail.c:302 +#: src/tail.c:301 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations.\n" @@ -10643,14 +10920,14 @@ msgid "" " 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 " -"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" +" -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" +" 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:311 +#: src/tail.c:310 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -10661,7 +10938,7 @@ msgid "" "\n" msgstr "" "\n" -"Nếu ký tự đầu tiên của K (số byte hoặc số dòng) là một « + »,\n" +"Nếu ký tự đầu tiên của K (số byte hoặc số dòng) là một “+”,\n" "thì in ra đầu tiên với mục thứ K từ đầu mỗi tập tin,\n" "không thì in K mục cuối cùng trong tập tin.\n" "K có thể có các đuôi bội số:\n" @@ -10669,7 +10946,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:320 +#: src/tail.c:319 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" @@ -10678,76 +10955,76 @@ 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 "" -"Dùng « --follow » (-f) thì tail mặc định theo bộ mô tả tệp tin.\n" -"Có nghĩa là ngay cả khi tệp tin được tail cũng bị thay tên, tail cứ theo dõi " +"Dùng “--follow” (-f) thì tail mặc định theo bộ mô tả tập tin.\n" +"Có nghĩa là ngay cả khi tập tin được tail cũng bị thay tên, tail cứ theo dõi " "kết thúc của nó.\n" "Ứng xử mặc định này không có giá trị khi người dùng thực sự muốn\n" -"theo dõi tên thật của tệp tin, chứ không phải bộ mô tả tệp tin (ví dụ, quay\n" +"theo dõi tên thật của tập tin, chứ không phải bộ mô tả tập tin (ví dụ, quay\n" "vòng sổ theo dõi).\n" -"Hãy dùng « --follow=tên » trong trường hợp đó.\n" -"Nó khiến tail theo dõi tệp tin có tên đưa ra\n" +"Hãy dùng “--follow=tên” trong trường hợp đó.\n" +"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:379 +#: src/tail.c:378 #, c-format msgid "closing %s (fd=%d)" msgstr "đang đóng %s (fd=%d)" -#: src/tail.c:454 +#: src/tail.c:453 #, c-format msgid "%s: cannot seek to relative offset %s" -msgstr "%s: không thể tìm nơi tới rìa tương đối %s" +msgstr "%s: không thể di chuyển tới offset tương đối %s" -#: src/tail.c:458 +#: src/tail.c:457 #, c-format msgid "%s: cannot seek to end-relative offset %s" -msgstr "%s: không thể tìm seek tới hiệu tương đối với cuối %s" +msgstr "%s: không thể di chuyển vị trí đọc tới offset đối với cuối %s" -#: src/tail.c:895 +#: src/tail.c:894 #, 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:907 +#: src/tail.c:906 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" 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 " +"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:964 +#: src/tail.c:963 #, c-format msgid "%s has become inaccessible" msgstr "%s đã trở thành không thể truy cập" -#: src/tail.c:981 +#: src/tail.c:980 #, 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" +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:990 +#: src/tail.c:989 #, 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" +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:1011 +#: src/tail.c:1010 #, c-format msgid "%s has become accessible" msgstr "%s đã trở thành có thể truy cập" -#: src/tail.c:1019 +#: src/tail.c:1018 #, 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" +msgstr "%s đã xuất hiện; đi theo cuối của tập tin mới" -#: src/tail.c:1030 +#: src/tail.c:1029 #, 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" +msgstr "%s bị thay thế; đi theo cuối của tập tin mới" -#: src/tail.c:1131 +#: src/tail.c:1130 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: không thay đổi được chế độ không chặn" @@ -10755,12 +11032,12 @@ msgstr "%s: không thay đổi được chế độ không chặn" #: src/tail.c:1172 src/tail.c:1287 #, c-format msgid "%s: file truncated" -msgstr "%s: tệp tin đã bị cắt ngắn" +msgstr "%s: tập tin đã bị cắt ngắn" #: src/tail.c:1196 src/tail.c:1442 #, c-format msgid "no files remaining" -msgstr "không còn tệp tin nào" +msgstr "không còn tập tin nào" #: src/tail.c:1369 #, c-format @@ -10790,7 +11067,7 @@ msgstr "gặp lỗi khi đọc sự kiện inotify" #: src/tail.c:1786 #, 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" +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 #, c-format @@ -10820,17 +11097,17 @@ msgstr "tùy chọn dùng theo ngữ cảnh sai -- %c" #: src/tail.c:2034 #, 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" +msgstr "cảnh báo: “--retry” thường có ích khi theo sau theo tên" #: src/tail.c:2038 #, 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" +msgstr "cảnh báo: PID bị bỏ qua; “--pid=PID” chỉ có ích khi theo sau" #: src/tail.c:2041 #, 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" +msgstr "cảnh báo: không hỗ trợ “--pid=PID” trên hệ thống này" #: src/tail.c:2142 #, c-format @@ -10841,8 +11118,8 @@ msgstr "không thể theo sau %s theo tên" #, 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" +"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 #, c-format @@ -10859,8 +11136,8 @@ msgstr "" "Sao chép đầu vào tiêu chuẩn vào mỗi TẬP_TIN, và đồng thời vào đầu ra tiêu " "chuẩn.\n" "\n" -" -a, --append phụ thêm vào các TẬP_TIN chỉ ra, không ghi chèn\n" -" -i, --ignore-interrupts lờ đi tín hiệu gián đoạn\n" +" -a, --append nối thêm vào các TẬP_TIN chỉ ra, không ghi đè\n" +" -i, --ignore-interrupts bỏ qua tín hiệu gián đoạn\n" #: src/tee.c:71 msgid "" @@ -10868,7 +11145,7 @@ msgid "" "If a FILE is -, copy again to standard output.\n" msgstr "" "\n" -"Nếu TẬP_TIN là « - », sao chép trở lại đầu ra tiêu chuẩn.\n" +"Nếu TẬP_TIN là “-”, sao chép trở lại đầu ra tiêu chuẩn.\n" #: src/test.c:123 #, c-format @@ -10882,38 +11159,38 @@ msgstr "sai số nguyên %s" #: src/test.c:241 msgid "')' expected" -msgstr "đã mong đợi « ) »" +msgstr "cần ”)”" #: src/test.c:244 #, c-format msgid "')' expected, found %s" -msgstr "đã mong đợi « ) », còn tìm thấy %s" +msgstr "cần “)”, tìm thấy %s" #: src/test.c:260 src/test.c:618 #, c-format msgid "%s: unary operator expected" -msgstr "%s: đã mong đợi toán tử nguyên phân" +msgstr "%s: cần toán tử một ngôi" #: src/test.c:329 msgid "-nt does not accept -l" -msgstr "« -nt » không chấp nhận « -l »" +msgstr "-nt không chấp nhận -l" #: src/test.c:342 msgid "-ef does not accept -l" -msgstr "« -ef » không chấp nhận « -l »" +msgstr "-ef không chấp nhận -l" #: src/test.c:358 msgid "-ot does not accept -l" -msgstr "« -ot » không chấp nhận « -l »" +msgstr "-ot không chấp nhận -l" #: src/test.c:367 msgid "unknown binary operator" -msgstr "không rõ toán tử nhị phân" +msgstr "toán tử hai ngôi lạ" #: src/test.c:646 #, c-format msgid "%s: binary operator expected" -msgstr "%s: đã mong đợi toán tử nhị phân" +msgstr "%s: cần toán tử hai ngôi" #: src/test.c:704 msgid "" @@ -10923,11 +11200,11 @@ msgid "" " or: [ ]\n" " or: [ OPTION\n" msgstr "" -"Sử dụng: test BIỂU_THỨC\n" -" hoặc: test\n" -" hoặc: [ BIỂU_THỨC ]\n" -" hoặc: [ ]\n" -" hoặc: [ TÙY_CHỌN\n" +"Cách dùng: test BIỂU_THỨC\n" +" hoặc: test\n" +" hoặc: [ BIỂU_THỨC ]\n" +" hoặc: [ ]\n" +" hoặc: [ TÙY_CHỌN\n" #: src/test.c:711 msgid "" @@ -10974,7 +11251,7 @@ msgid "" msgstr "" "\n" " -n CHUỖI CHUỖI có chiều dài khác không\n" -" CHUỖI tương đương với « -n CHUỖI »\n" +" CHUỖI tương đương với “-n CHUỖI”\n" " -z CHUỖI CHUỖI có chiều dài là không\n" " CHUỖI1 = CHUỖI2 các chuỗi bằng nhau\n" " CHUỖI1 != CHUỖI2 các chuỗi khác nhau\n" @@ -10990,12 +11267,12 @@ msgid "" " INTEGER1 -ne INTEGER2 INTEGER1 is not equal to INTEGER2\n" msgstr "" "\n" -" SỐ_NGUYÊN1 -eq SỐ_NGUYÊN2 SỐ_NGUYÊN1 bằng SỐ_NGUYÊN2\n" -" SỐ_NGUYÊN1 -ge SỐ_NGUYÊN2 SỐ_NGUYÊN1 lớn hơn hoặc bằng SỐ_NGUYÊN2\n" -" SỐ_NGUYÊN1 -gt SỐ_NGUYÊN2 SỐ_NGUYÊN1 lớn hơn SỐ_NGUYÊN2\n" -" SỐ_NGUYÊN1 -le SỐ_NGUYÊN2 SỐ_NGUYÊN1 nhỏ hơn hoặc bằng SỐ_NGUYÊN2\n" -" SỐ_NGUYÊN1 -lt SỐ_NGUYÊN2 SỐ_NGUYÊN1 nhỏ hơn SỐ_NGUYÊN2\n" -" SỐ_NGUYÊN1 -ne SỐ_NGUYÊN2 SỐ_NGUYÊN1 khác (không bằng) SỐ_NGUYÊN2\n" +" S.NGUYÊN1 -eq S.NGUYÊN2 S.NGUYÊN1 bằng S.NGUYÊN2\n" +" S.NGUYÊN1 -ge S.NGUYÊN2 S.NGUYÊN1 lớn hơn hoặc bằng S.NGUYÊN2\n" +" S.NGUYÊN1 -gt S.NGUYÊN2 S.NGUYÊN1 lớn hơn S.NGUYÊN2\n" +" S.NGUYÊN1 -le S.NGUYÊN2 S.NGUYÊN1 nhỏ hơn hoặc bằng S.NGUYÊN2\n" +" S.NGUYÊN1 -lt S.NGUYÊN2 S.NGUYÊN1 nhỏ hơn S.NGUYÊN2\n" +" S.NGUYÊN1 -ne S.NGUYÊN2 S.NGUYÊN1 khác (không bằng) SỐ_NGUYÊN2\n" #: src/test.c:746 msgid "" @@ -11005,10 +11282,9 @@ msgid "" " FILE1 -ot FILE2 FILE1 is older than FILE2\n" msgstr "" "\n" -" TẬP_TIN1 -ef TẬP_TIN2 TẬP_TIN1 và TẬP_TIN2 có cùng số hiệu thiết bị và " -"inode\n" -" TẬP_TIN1 -nt TẬP_TIN2 TẬP_TIN1 mới hơn (theo ngày sửa) TẬP_TIN2\n" -" TẬP_TIN1 -ot TẬP_TIN2 TẬP_TIN1 cũ hơn TẬP_TIN2\n" +" T.TIN1 -ef T.TIN2 T.TIN1 và T.TIN2 có cùng số hiệu thiết bị và inode\n" +" T.TIN1 -nt T.TIN2 T.TIN1 mới hơn (theo ngày sửa) T.TIN2\n" +" T.TIN1 -ot T.TIN2 T.TIN1 cũ hơn T.TIN2\n" #: src/test.c:752 msgid "" @@ -11019,10 +11295,10 @@ msgid "" " -e FILE FILE exists\n" msgstr "" "\n" -" -b TẬP_TIN TẬP_TIN tồn tại và là cái đặc biệt kiểu khối\n" -" -c TẬP_TIN TẬP_TIN tồn tại và là cái đặc biệt kiểu ký tự\n" -" -d TẬP_TIN TẬP_TIN tồn tại và là thư mục\n" -" -e TẬP_TIN TẬP_TIN tồn tại\n" +" -b TẬP_TIN TẬP_TIN tồn tại và là cái đặc biệt kiểu khối\n" +" -c TẬP_TIN TẬP_TIN tồn tại và là cái đặc biệt kiểu ký tự\n" +" -d TẬP_TIN TẬP_TIN tồn tại và là thư mục\n" +" -e TẬP_TIN TẬP_TIN tồn tại\n" #: src/test.c:759 msgid "" @@ -11032,11 +11308,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 TẬP_TIN TẬP_TIN tồn tại và là một tệp tin thông thường\n" -" -g TẬP_TIN TẬP_TIN tồn tại và có đặt ID nhóm (set-group-ID)\n" -" -G TẬP_TIN TẬP_TIN tồn tại và sở hữu bởi ID nhóm hoạt động\n" -" -h TẬP_TIN TẬP_TIN tồn tại và là một liên kết mềm (giống như « -L »)\n" -" -k TẬP_TIN TẬP_TIN tồn tại và có đặc bit dính (sticky)\n" +" -f TẬP_TIN TẬP_TIN tồn tại và là một tập tin thông thường\n" +" -g TẬP_TIN TẬP_TIN tồn tại và có đặt ID nhóm (set-group-ID)\n" +" -G TẬP_TIN TẬP_TIN tồn tại và sở hữu bởi ID nhóm hoạt động\n" +" -h TẬP_TIN TẬP_TIN tồn tại và là một liên kết mềm (giống như “-L”)\n" +" -k TẬP_TIN TẬP_TIN tồn tại và có đặc bit dính (sticky)\n" #: src/test.c:766 msgid "" @@ -11046,11 +11322,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 TẬP_TIN TẬP_TIN tồn tại và là một liên kết mềm (giống như « -h »)\n" -" -O TẬP_TIN TẬP_TIN tồn tại và sở hữu bởi ID người dùng hoạt động\n" -" -p TẬP_TIN TẬP_TIN tồn tại và là một đường ống có tên\n" -" -r TẬP_TIN TẬP_TIN tồn tại và cho phép đọc\n" -" -s TẬP_TIN TẬP_TIN tồn tại và có kích cỡ lớn hơn không\n" +" -L TẬP_TIN TẬP_TIN tồn tại và là một liên kết mềm (giống như “-h”)\n" +" -O TẬP_TIN TẬP_TIN tồn tại và sở hữu bởi ID người dùng hoạt động\n" +" -p TẬP_TIN TẬP_TIN tồn tại và là một đường ống có tên\n" +" -r TẬP_TIN TẬP_TIN tồn tại và cho phép đọc\n" +" -s TẬP_TIN TẬP_TIN tồn tại và có kích cỡ lớn hơn không\n" #: src/test.c:773 msgid "" @@ -11060,12 +11336,11 @@ 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 TẬP_TIN TẬP_TIN tồn tại và là một ổ cắm\n" -" -t FD mô tả tệp tin FD được mở trên một thiết bị cuối\n" -" -u TẬP_TIN TẬP_TIN tồn tại và có bit ID người dùng đã đặt (set-user-" -"ID)\n" -" -w TẬP_TIN TẬP_TIN tồn tại và cho phép ghi\n" -" -x TẬP_TIN TẬP_TIN tồn tại và cho phép thực hiện (hoặc tìm kiếm)\n" +" -S TẬP_TIN TẬP_TIN tồn tại và là một ổ cắm\n" +" -t FD mô tả tập tin FD được mở trên một thiết bị cuối\n" +" -u TẬP_TIN TẬP_TIN tồn tại và có bit ID người dùng đã đặt (set-user-ID)\n" +" -w TẬP_TIN TẬP_TIN tồn tại và cho phép ghi\n" +" -x TẬP_TIN TẬP_TIN tồn tại và cho phép thực hiện (hoặc tìm kiếm)\n" #: src/test.c:780 msgid "" @@ -11076,10 +11351,10 @@ msgid "" "INTEGER may also be -l STRING, which evaluates to the length of STRING.\n" msgstr "" "\n" -"Trừ đối với « -h » và « -L », mọi thử nghiệm có liên quan đến TẬP_TIN\n" +"Trừ đối với “-h” và “-L”, mọi thử nghiệm có liên quan đến TẬP_TIN\n" "sẽ bỏ tham chiếu của liên kết mềm.\n" -"Cần thoát các dấu ngoặc (ví dụ, bằng xuyệc ngược) đối trong trình bao.\n" -"SỐ_NGUYÊN có thể đồng thời là « -l CHUỖI » tính chiều dài của CHUỖI.\n" +"Cần thoát các dấu ngoặc (ví dụ, bằng gạch ngược) đối trong shell.\n" +"SỐ_NGUYÊN có thể đồng thời là “-l CHUỖI” tính chiều dài của CHUỖI.\n" #: src/test.c:786 msgid "" @@ -11088,13 +11363,13 @@ msgid "" "test treats each of those as it treats any other nonempty STRING.\n" msgstr "" "\n" -"GHI CHÚ : [ tùy theo hai tùy chọn « --help » (trợ giúp)\n" -"và « --version » (phiên bản), còn test (thử) không phải.\n" +"GHI CHÚ: [ tùy theo hai tùy chọn “--help” (trợ giúp)\n" +"và “--version” (phiên bản), còn test (thử) không phải.\n" "test xử lý mỗi tùy chọn này giống như CHUỖI khác rỗng.\n" #: src/test.c:791 msgid "test and/or [" -msgstr "thử và/hoậc « [ »" +msgstr "thử và/hoặc “[”" #. This is a proper name. See the gettext manual, section Names. #: src/test.c:803 @@ -11108,45 +11383,52 @@ msgstr "Matthew Bradburn" #: src/test.c:858 msgid "missing ']'" -msgstr "thiếu « ] »" +msgstr "thiếu “]”" #: src/test.c:872 #, c-format msgid "extra argument %s" msgstr "tham số thêm %s" -#: src/timeout.c:124 +#: src/timeout.c:112 +#, fuzzy, c-format +msgid "warning: sigprocmask" +msgstr "cảnh báo: timer_create" + +#: src/timeout.c:145 #, c-format msgid "warning: timer_settime" msgstr "cảnh báo: timer_settime" -#: src/timeout.c:129 +#: src/timeout.c:150 #, c-format msgid "warning: timer_create" msgstr "cảnh báo: timer_create" -#: src/timeout.c:204 +#: src/timeout.c:225 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" " or: %s [OPTION]\n" msgstr "" -"Sử dụng: %s [TÙY_CHỌN] THỜI_LƯỢNG LỆNH [ĐỐI_SỐ]...]\n" +"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:208 -msgid "" -"Start COMMAND, and kill it if still running after DURATION.\n" -"\n" -"Mandatory arguments to long options are mandatory for short options too.\n" +#: src/timeout.c:229 +#, fuzzy +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" -"Mọi đối số bắt buộc phải sử dụng với tùy chọn dài cũng bắt buộc với tùy chọn " -"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" -#: src/timeout.c:213 +#: src/timeout.c:235 +#, fuzzy msgid "" +" --preserve-status\n" +" exit with the same status as COMMAND, even when the\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 " @@ -11165,17 +11447,16 @@ msgstr "" " 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 " -"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" +" 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" " -s, --signal=TÍN_HIỆU\n" -" ghi rõ 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" +" ghi rõ 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" +" Xem “kill -l” để thấy một danh sách các tín hiệu.\n" -#: src/timeout.c:229 +#: src/timeout.c:254 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -11183,18 +11464,19 @@ msgid "" "days.\n" msgstr "" "\n" -"DURATION là một số thực chấm động với hậu số tuỳ chọn:\n" -"`s' cho giây (mặc định), `m' cho phút, `h' cho giờ và `d' cho ngày.\n" +"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:234 +#: src/timeout.c:259 +#, fuzzy msgid "" "\n" -"If the command times out, then exit with status 124. Otherwise, exit\n" -"with the status of COMMAND. If no signal is specified, send the TERM\n" -"signal upon timeout. The TERM signal kills any process that does not\n" -"block or catch that signal. For other processes, it may be necessary to\n" -"use the KILL (9) signal, since this signal cannot be caught. If the\n" -"KILL (9) signal is sent, the exit status is 128+9 rather than 124.\n" +"If the command times out, and --preserve-status is not set, then exit with\n" +"status 124. Otherwise, exit with the status of COMMAND. If no signal\n" +"is specified, send the TERM signal upon timeout. The TERM signal kills\n" +"any process that does not block or catch that signal. It may be necessary\n" +"to use the KILL (9) signal, since this signal cannot be caught, in which\n" +"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" @@ -11206,15 +11488,20 @@ msgstr "" "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" -#: src/timeout.c:419 +#: src/timeout.c:363 +#, 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 #, c-format msgid "error waiting for command" msgstr "gặp lỗi khi đợi câu lệnh" -#: src/timeout.c:441 +#: src/timeout.c:482 #, c-format -msgid "warning: disabling core dumps failed" -msgstr "cảnh báo: không thể tắt core dump" +msgid "the monitored command dumped core" +msgstr "lệnh theo dõi đã đổ lõi" #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 @@ -11226,22 +11513,23 @@ msgstr "Jim Kingdon" msgid "Randy Smith" msgstr "Randy Smith" -#: src/touch.c:115 src/touch.c:313 +#: src/touch.c:115 src/touch.c:309 #, c-format msgid "invalid date format %s" msgstr "sai định dạng ngày tháng %s" -#: src/touch.c:194 +#: src/touch.c:191 #, c-format msgid "cannot touch %s" msgstr "không sờ (touch) được %s" -#: src/touch.c:200 +#: src/touch.c:197 #, c-format msgid "setting times of %s" msgstr "đang đặt thời gian của %s" -#: src/touch.c:216 +#: src/touch.c:213 +#, fuzzy msgid "" "Update the access and modification times of each FILE to the current time.\n" "\n" @@ -11250,19 +11538,18 @@ msgid "" "\n" "A FILE argument string of - is handled specially and causes touch to\n" "change the times of the file associated with standard output.\n" -"\n" 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ế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" +"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" "\n" -#: src/touch.c:229 +#: src/touch.c:225 msgid "" " -a change only the access time\n" " -c, --no-create do not create any files\n" @@ -11270,12 +11557,12 @@ msgid "" " -f (ignored)\n" msgstr "" " -a chỉ thay đổi thời gian truy cập\n" -" -c, --no-create không tạo tệp tin nào\n" +" -c, --no-create không tạo tập tin nào\n" " -d, --date=CHUỖI phân tích cú pháp của CHUỖI và dùng nó thay cho " "thời gian hiện tại\n" -" -f (bị lờ đi)\n" +" -f (bị bỏ qua)\n" -#: src/touch.c:235 +#: src/touch.c:231 msgid "" " -h, --no-dereference affect each symbolic link instead of any " "referenced\n" @@ -11283,57 +11570,57 @@ msgid "" " timestamps of a symlink)\n" " -m change only the modification time\n" msgstr "" -" -h, --no-dereference ảnh hưởng mỗi liên kết mềm chứ không ảnh hưởng tệp " -"tin\n" +" -h, --no-dereference ảnh hưởng mỗi liên kết mềm chứ không ảnh hưởng tập " +"tin tin\n" " đích (chỉ có tác dụng trên hệ thống có thể thay " "đổi\n" " quyền sở hữu của một liên kết mềm)\n" -" -m thay đổi chỉ thời gian sửa đổi\n" +" -m thay đổi chỉ thời gian sửa đổi\n" -#: src/touch.c:241 +#: src/touch.c:237 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" -" --time=WORD change the specified time:\n" +" --time=WORD change the specified time:\n" " WORD is access, atime, or use: equivalent to -a\n" " WORD is modify or mtime: equivalent to -m\n" msgstr "" -" -r, --reference=TẬP_TIN dùng thời gian của tệp tin này thay cho thời gian " -"hiện thời\n" +" -r, --reference=TẬP_TIN dùng thời gian của tập tin này thay cho thời\n" +" gian hiện thời\n" " -t TEM dùng [[CC]YY]MMDDhhmm[.ss] thay cho thời gian hiện " -"thời\n" -" --time=TỪ thay đổi thời gian chỉ ra:\n" -" TỪ là access, atime, hoặc use: tương đương với « -" -"a »\n" -" TỪ là modify hoặc mtime: tương đương với « -m »\n" +"tại\n" +" --time=TỪ thay đổi thời gian chỉ ra:\n" +" TỪ là access, atime, hoặc use: tương đương với “-" +"a”\n" +" TỪ là modify hoặc mtime: tương đương với “-m”\n" -#: src/touch.c:250 +#: src/touch.c:246 msgid "" "\n" "Note that the -d and -t options accept different time-date formats.\n" msgstr "" "\n" -"Ghi chú rằng hai tùy chọn « -d » và « -t » chấp nhận\n" +"Ghi chú rằng hai tùy chọn “-d” và “-t” chấp nhận\n" "định dạng ngày/giờ khác nhau.\n" "\n" -#: src/touch.c:339 +#: src/touch.c:335 #, c-format msgid "cannot specify times from more than one source" msgstr "không chỉ ra được thời gian từ vài nguồn" -#: src/touch.c:413 +#: src/touch.c:409 #, c-format 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." -"%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 #, c-format msgid "Usage: %s [OPTION]... SET1 [SET2]\n" -msgstr "Sử dụng: %s [TÙY_CHỌN]... TẬP_HỢP1 [TẬP_HỢP2]\n" +msgstr "Cách dùng: %s [TÙY_CHỌN]... TẬP_HỢP1 [TẬP_HỢP2]\n" #: src/tr.c:290 msgid "" @@ -11378,14 +11665,14 @@ msgstr "" "TẬP_HỢP là chuỗi các ký tự. Hầu hết tập hợp tự đại diện.\n" "Các chuỗi được biên dịch là:\n" "\n" -" \\NNN ký tự với giá trị bát phân NNN (1 tới 3 chữ số)\n" -" \\\\ xuyệc ngược\n" -" \\a tiếng chuông BEL nghe rõ\n" -" \\b xoá lùi\n" -" \\f thụt dòng\n" -" \\n dòng mới\n" -" \\r return\n" -" \\t tab ngang\n" +" \\NNN ký tự với giá trị bát phân NNN (1 tới 3 chữ số)\n" +" \\\\ gạch ngược\n" +" \\a tiếng chuông BEL nghe rõ\n" +" \\b xóa lùi\n" +" \\f thụt dòng\n" +" \\n dòng mới\n" +" \\r return\n" +" \\t tab ngang\n" #: src/tr.c:317 msgid "" @@ -11399,7 +11686,7 @@ msgid "" " [:cntrl:] all control characters\n" " [:digit:] all digits\n" msgstr "" -" \\v tab đúng\n" +" \\v tab đứng\n" " KÝ_TỰ1-KÝ_TỰ2 mọi ký tự từ KÝ_TỰ1 đến KÝ_TỰ2 theo thứ tự tăng dần\n" " [KÝ_TỰ*] trong TẬP_HỢP2, sao chép KÝ_TỰ tới chiều dài của TẬP_HỢP1\n" " [KÝ_TỰ*REPEAT] LẶP LẠI sao chép của KÝ_TỰ, LẶP LẠI bát phân nếu bằt đầu " @@ -11423,7 +11710,7 @@ msgid "" msgstr "" " [:graph:] mọi ký tự có thể in, trừ khoảng trắng\n" " [:lower:] mọi chữ cái viết thường\n" -" [:print:] mọi ký tự có thể in, gồm cả khoảng trắng\n" +" [:print:] mọi ký tự có thể in, lấy cả khoảng trắng\n" " [:punct:] mọi ký tự chấm câu\n" " [:space:] mọi khoảng trắng nằm ngang hoặc đứng\n" " [:upper:] mọi chữ cái viết hoa\n" @@ -11443,9 +11730,9 @@ msgid "" "translation or deletion.\n" msgstr "" "\n" -"Sự chuyển đổi xảy ra nếu không đưa ra tùy chọn « -d »\n" +"Sự chuyển đổi xảy ra nếu không đưa ra tùy chọn “-d”\n" "và cả hai TẬP_HỢP1 và TẬP_HỢP2 xuất hiện.\n" -"Tùy chọn « -t » chỉ có thể đưa ra khi chuyển đổi.\n" +"Tùy chọn “-t” chỉ có thể đưa ra khi chuyển đổi.\n" "TẬP_HỢP2 kéo dài thành chiều dài của TẬP_HỢP1\n" "bằng cách lặp lại ký tự cuối cùng theo yêu cầu.\n" "Ký tự thừa trong TẬP_HỢP2 vẫn bị bỏ qua.\n" @@ -11453,10 +11740,10 @@ msgstr "" "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" -"Tùy chọn « -s » dùng TẬP_HỢP1\n" -"nếu không chuyển đổi và cũng không xoá;\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" -"đằng sau việc chuyển đổi hay xoá.\n" +"đằng sau việc chuyển đổi hay xóa.\n" #: src/tr.c:509 #, c-format @@ -11464,34 +11751,34 @@ msgid "" "warning: the ambiguous octal escape \\%c%c%c is being\n" "\tinterpreted as the 2-byte sequence \\0%c%c, %c" msgstr "" -"cảnh báo : dãy thoát bát phân mơ hồ « \\%c%c%c »\n" -"đang được biên dịch như dãy 2 byte \\0%c%c, `%c'" +"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”" #: src/tr.c:518 #, c-format msgid "warning: an unescaped backslash at end of string is not portable" msgstr "" -"cảnh báo : không thể mang được dấu xuyệc ngược chưa thoát ở kết thúc chuỗi" +"cảnh báo: không thể mang được dấu gạch ngược chưa thoát ở kết thúc chuỗi" #: src/tr.c:673 #, c-format msgid "range-endpoints of '%s-%s' are in reverse collating sequence order" -msgstr "các điểm cuối phạm vi của « %s-%s » đang ở trong thứ tự dãy ngược lại" +msgstr "các điểm cuối phạm vi của “%s-%s” đang ở trong thứ tự dãy ngược lại" #: src/tr.c:829 #, c-format msgid "invalid repeat count %s in [c*n] construct" -msgstr "sai số đếm lặp %s trong cấu trúc « [c*n] »" +msgstr "sai số đếm lặp %s trong cấu trúc “[c*n]”" #: src/tr.c:910 #, c-format msgid "missing character class name '[::]'" -msgstr "thiếu tên lớp của ký tự `[::]'" +msgstr "thiếu tên lớp của ký tự “[::]”" #: src/tr.c:913 #, c-format msgid "missing equivalence class character '[==]'" -msgstr "thiếu ký tự lớp tương đương « [==] »" +msgstr "thiếu ký tự lớp tương đương “[==]”" #: src/tr.c:928 #, c-format @@ -11506,7 +11793,7 @@ msgstr "%s: toán hạng hạng tương đương phải là một ký tự đơn #: src/tr.c:1229 #, c-format msgid "misaligned [:upper:] and/or [:lower:] construct" -msgstr "sắp hàng sai cấu trúc « [:upper:] » và/hoặc « [:lower:] »" +msgstr "sắp hàng sai cấu trúc “[:upper:]” và/hoặc “[:lower:]”" #: src/tr.c:1335 #, c-format @@ -11525,17 +11812,17 @@ msgstr "" #: src/tr.c:1480 #, c-format msgid "the [c*] repeat construct may not appear in string1" -msgstr "cấu trúc lặp « [c*] » không được có trong chuỗi1" +msgstr "cấu trúc lặp “[c*]” không được có trong chuỗi1" #: src/tr.c:1490 #, c-format msgid "only one [c*] repeat construct may appear in string2" -msgstr "chỉ một cấu trúc lặp « [c*] » có thể nằm trong chuỗi2" +msgstr "chỉ một cấu trúc lặp “[c*]” có thể nằm trong chuỗi2" #: src/tr.c:1498 #, c-format msgid "[=c=] expressions may not appear in string2 when translating" -msgstr "biểu thức « [=c=] » không được có trong chuỗi2 khi chuyển đổi" +msgstr "biểu thức “[=c=]” không được có trong chuỗi2 khi chuyển đổi" #: src/tr.c:1505 #, c-format @@ -11544,7 +11831,7 @@ msgid "" "string2 are 'upper' and 'lower'" msgstr "" "khi chuyển đổi, chỉ các lớp ký tự có cái mà xuất hiện trong\n" -"chuỗi2 là « upper » và « lower »" +"chuỗi2 là “upper” và “lower”" #: src/tr.c:1520 #, c-format @@ -11563,11 +11850,11 @@ msgstr "" #: src/tr.c:1538 #, c-format msgid "the [c*] construct may appear in string2 only when translating" -msgstr "cấu trúc « [c*] » chỉ có thể nằm trong chuỗi2 khi chuyển đổi" +msgstr "cấu trúc “[c*]” chỉ có thể nằm trong chuỗi2 khi chuyển đổi" #: src/tr.c:1788 msgid "Two strings must be given when both deleting and squeezing repeats." -msgstr "Chỉ được đưa ra hai chuỗi khi làm cả hai việc xoá và vắt việc lặp lại." +msgstr "Chỉ được đưa ra hai chuỗi khi làm cả hai việc xóa và vắt việc lặp lại." #: src/tr.c:1790 msgid "Two strings must be given when translating." @@ -11583,23 +11870,24 @@ msgid "" "Usage: %s [ignored command line arguments]\n" " or: %s OPTION\n" msgstr "" -"Sử dụng: %s [các đối số dòng lệnh bị bỏ qua]\n" -" hoặc: %s TÙY_CHỌN\n" +"Cách dùng: %s [các đối số dòng lệnh bị bỏ qua]\n" +" hoặc: %s TÙY_CHỌN\n" #: src/true.c:45 msgid "Exit with a status code indicating success." -msgstr "Thoát với mã trạng thái ngụ ý thành công." +msgstr "Thoát với mã trạng thái thành công." #: src/true.c:46 msgid "Exit with a status code indicating failure." -msgstr "Thoát với mã trạng thái ngụ ý thất bại." +msgstr "Thoát với mã trạng thái thất bại." #: src/truncate.c:96 #, c-format msgid "Usage: %s OPTION... FILE...\n" -msgstr "Sử dụng: %s TÙY_CHỌN... TẬP_TIN...\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" @@ -11608,37 +11896,35 @@ msgid "" "If a FILE is larger than the specified size, the extra data is lost.\n" "If a FILE is shorter, it is extended and the extended part (hole)\n" "reads as zero bytes.\n" -"\n" 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" +"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" "\n" -#: src/truncate.c:110 +#: src/truncate.c:109 msgid " -c, --no-create do not create any files\n" -msgstr " -c, --no-create không tạo tệp tin nào\n" +msgstr " -c, --no-create không tạo tập tin nào\n" -#: src/truncate.c:113 +#: src/truncate.c:112 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" -" -o, --io-blocks tính kích CỠ là một số các khối VR thay cho các " -"byte\n" +" -o, --io-blocks tính kích CỠ là một số khối VR thay cho các byte\n" -#: src/truncate.c:116 +#: 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" msgstr "" -" -r, --reference=FILE dựa trên cỡ của RFILE\n" -" -s, --size=SIZE đặt hoặc điều chỉnh cỡ tệp bằng SIZE\n" +" -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" -#: src/truncate.c:122 +#: src/truncate.c:121 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -11647,60 +11933,60 @@ 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:150 +#: src/truncate.c:149 #, c-format msgid "overflow in %<PRIdMAX> * %<PRIdMAX> byte blocks for file %s" -msgstr "tràn các khối byte %<PRIdMAX> * %<PRIdMAX> cho tệp tin %s" +msgstr "tràn các khối byte %<PRIdMAX> * %<PRIdMAX> cho tập tin %s" -#: src/truncate.c:174 +#: 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" -#: src/truncate.c:184 src/truncate.c:379 +#: src/truncate.c:183 src/truncate.c:384 #, c-format msgid "cannot get the size of %s" msgstr "không lấy được cỡ của %s" -#: src/truncate.c:206 +#: src/truncate.c:205 #, c-format msgid "overflow rounding up size of file %s" -msgstr "tràn việc làm tròn kích cỡ tệp tin %s lên" +msgstr "tràn việc làm tròn kích cỡ tập tin %s lên" -#: src/truncate.c:216 +#: src/truncate.c:215 #, c-format msgid "overflow extending size of file %s" -msgstr "tràn việc mở rộng kích cỡ của tệp tin %s" +msgstr "tràn việc mở rộng kích cỡ của tập tin %s" -#: src/truncate.c:231 +#: src/truncate.c:230 #, c-format msgid "failed to truncate %s at %<PRIdMAX> bytes" msgstr "không cắt được %s ở byte thứ %<PRIdMAX> " -#: src/truncate.c:305 +#: src/truncate.c:303 #, c-format msgid "multiple relative modifiers specified" msgstr "đã chỉ ra nhiều ký tự sửa đổi tương ứng" -#: src/truncate.c:335 +#: src/truncate.c:333 #, c-format msgid "you must specify either %s or %s" msgstr "bạn phải chỉ định %s hoặc %s" -#: src/truncate.c:342 +#: src/truncate.c:340 #, c-format msgid "you must specify a relative %s with %s" msgstr "phải phải chỉ định mối quan hệ giữa %s và %s" -#: src/truncate.c:349 +#: src/truncate.c:347 #, c-format msgid "%s was specified but %s was not" msgstr "%s đưa ra còn %s không phải" -#: src/truncate.c:400 +#: src/truncate.c:404 #, c-format msgid "cannot open %s for writing" msgstr "không mở được %s để ghi" @@ -11718,10 +12004,10 @@ msgid "" "With no FILE, or when FILE is -, read standard input.\n" "\n" msgstr "" -"Sử dụng: %s [TÙY_CHỌN] [TẬP_TIN]\n" +"Cách dùng: %s [TÙY_CHỌN] [TẬP_TIN]\n" "Ghi danh sách đã sắp xếp hoàn toàn mà thích hợp\n" "với sự sắp xếp một phần trong 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à “-”, đọc đầu vào tiêu chuẩn.\n" "\n" #: src/tsort.c:472 @@ -11740,9 +12026,9 @@ msgid "" "\n" " -s, --silent, --quiet print nothing, only return an exit status\n" msgstr "" -"In ra tên tệp tin của thiết bị cuối đã kết nối với đầu vào tiêu chuẩn.\n" +"In ra tên tập tin của thiết bị cuối đã kết nối với đầu vào tiêu chuẩn.\n" "\n" -" -s, --silent, --quiet không in gì, chỉ trả lại trạng thái thoát\n" +" -s, --silent, --quiet không in gì, chỉ trả lại trạng thái thoát\n" #: src/tty.c:120 msgid "not a tty" @@ -11758,11 +12044,10 @@ msgid "" " -n, --nodename print the network node hostname\n" " -r, --kernel-release print the kernel release\n" msgstr "" -"In ra vài thông tin nào đó về hệ thống. Không có TÙY_CHỌN thì giống như « -" -"s ».\n" +"In ra một số thông tin về hệ thống. Không có TÙY_CHỌN thì giống như “-s”.\n" "\n" " -a, --all in ra mọi thông tin, theo thứ tự sau,\n" -" trừ bỏ đi « -p » và « -i » nếu không rõ :\n" +" bỏ đi “-p” và “-i” nếu không biết:\n" " -s, --kernel-name in ra tên nhân\n" " -n, --nodename in ra tên máy của nút mạng\n" " -r, --kernel-release in ra bản phát hành nhân\n" @@ -11777,8 +12062,8 @@ msgid "" msgstr "" " -v, --kernel-version in ra phiên bản nhân\n" " -m, --machine in ra tên phần cứng của máy tính\n" -" -p, --processor in ra kiểu của bộ xử lý, hoặc « không rõ »\n" -" -i, --hardware-platform in ra tên kiến trúc phần cứng, hoặc « không rõ »\n" +" -p, --processor in ra kiểu của bộ xử lý, hoặc \"không rõ\"\n" +" -i, --hardware-platform in ra tên kiến trúc phần cứng, hoặc \"không rõ\"\n" " -o, --operating-system in ra tên hệ điều hành\n" #: src/uname.c:143 @@ -11795,37 +12080,37 @@ 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" -"\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" +"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/unexpand.c:125 +#: src/unexpand.c:124 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 chuyển đổi mọi khoảng trắng,\n" -" thay vì chỉ những khoảng trắng đầu tiên\n" -" --first-only chỉ chuyển đổi những dãy khoảng trắng đầu tiên\n" -" (ghi chèn « -a »)\n" -" -t, --tabs=N tab có N ký tự thay vì 8 (bật dùng « -a »)\n" -" -t, --tabs=DANH_SÁCH dùng DANH_SÁCH các vị trí tab định giới bằng dấu " +" -a, --all chuyển đổi mọi khoảng trắng,\n" +" thay vì chỉ những khoảng trắng đầu tiên\n" +" --first-only chỉ chuyển đổi những dãy khoảng trắng đầu tiên\n" +" (bỏ qua “-a”)\n" +" -t, --tabs=N tab có N ký tự thay vì 8 (bật dùng “-a”)\n" +" -t, --tabs=DANH_SÁCH dùng DANH_SÁCH các vị trí tab định giới bằng dấu " "phẩy\n" -" (bật « -a »)\n" +" (bật “-a”)\n" -#: src/unexpand.c:153 +#: src/unexpand.c:152 #, c-format msgid "tabs are too far apart" msgstr "tab phân cách nhau quá xa" -#: src/unexpand.c:505 +#: src/unexpand.c:504 #, c-format msgid "tab stop value is too large" msgstr "chiều dài tab là quá lớn" @@ -11833,24 +12118,24 @@ msgstr "chiều dài tab là quá lớn" #: src/uniq.c:134 #, c-format msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n" -msgstr "Sử dụng: %s [TÙY_CHỌN]... [VÀO [RA]]\n" +msgstr "Cách dùng: %s [TÙY_CHỌN]... [VÀO [RA]]\n" #: src/uniq.c:138 +#, fuzzy 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" -"\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ó tuỳ chọn thì các dòng tương ứng được gộp lại đối với lần gặp thứ " +"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" "\n" -#: src/uniq.c:148 +#: src/uniq.c:147 msgid "" " -c, --count prefix lines by the number of occurrences\n" " -d, --repeated only print duplicate lines\n" @@ -11858,7 +12143,7 @@ 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" -#: src/uniq.c:152 +#: src/uniq.c:151 msgid "" " -D, --all-repeated[=delimit-method] print all duplicate lines\n" " delimit-method={none(default),prepend,separate}\n" @@ -11872,22 +12157,22 @@ msgstr "" " -D, --all-repeated[=phương_pháp_định_giới]\n" " in mọi dòng trùng\n" " phương_pháp_định_giới là:\n" -" • none không có (mặc định)\n" -" • prepend thêm vào trước\n" -" • separate phân cách\n" +" * none không có (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" " -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\t\tkết thúc dòng với 0 byte,\n" -"\t\t\t\t\t\tkhông phải ký tự dòng mới\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:162 +#: src/uniq.c:161 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:167 +#: src/uniq.c:166 msgid "" "\n" "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n" @@ -11898,7 +12183,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:172 +#: src/uniq.c:171 msgid "" "\n" "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n" @@ -11906,29 +12191,29 @@ msgid "" "Also, comparisons honor the rules specified by 'LC_COLLATE'.\n" 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" -"Hơn nữa, sự so sánh tùy theo quy tắc của « LC_COLLATE ».\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" +"Hơn nữa, sự so sánh tùy theo quy tắc của “LC_COLLATE”.\n" -#: src/uniq.c:359 +#: src/uniq.c:358 #, c-format msgid "too many repeated lines" msgstr "quá nhiều dòng lặp lại" -#: src/uniq.c:522 +#: src/uniq.c:521 msgid "invalid number of fields to skip" msgstr "sai số trường cần bỏ qua" -#: src/uniq.c:531 +#: src/uniq.c:530 msgid "invalid number of bytes to skip" msgstr "sai số byte cần bỏ qua" -#: src/uniq.c:540 +#: src/uniq.c:539 msgid "invalid number of bytes to compare" msgstr "sai số byte cần so sánh" -#: src/uniq.c:559 +#: src/uniq.c:558 #, 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" @@ -11939,15 +12224,15 @@ msgid "" "Usage: %s FILE\n" " or: %s OPTION\n" msgstr "" -"Sử dụng: %s TẬP_TIN\n" -" hoặc: %s TÙY_CHỌN\n" +"Cách dùng: %s TẬP_TIN\n" +" hoặc: %s TÙY_CHỌN\n" #: src/unlink.c:48 msgid "" "Call the unlink function to remove the specified FILE.\n" "\n" msgstr "" -"Gọi hàm « unlink » để xóa TẬP_TIN chỉ ra.\n" +"Gọi hàm “unlink” để xóa TẬP_TIN chỉ ra.\n" "\n" #: src/unlink.c:86 @@ -11973,13 +12258,18 @@ msgstr " ??:???? " #: src/uptime.c:140 #, c-format msgid "up ???? days ??:??, " -msgstr "lên ???? ngày ??:??, " +msgstr "chạy ???? ngày ??:??, " #: src/uptime.c:144 #, c-format msgid "up %ld day %2d:%02d, " msgid_plural "up %ld days %2d:%02d, " -msgstr[0] "lên %ld ngày %2d:%02d, " +msgstr[0] "chạy %ld ngày %2d:%02d, " + +#: src/uptime.c:149 +#, fuzzy, c-format +msgid "up %2d:%02d, " +msgstr "chạy %ld ngày %2d:%02d, " #: src/uptime.c:151 #, c-format @@ -11990,7 +12280,7 @@ msgstr[0] "%lu người dùng" #: src/uptime.c:161 #, c-format msgid ", load average: %.2f" -msgstr ", trọng tải trung bình: %.2f" +msgstr ", mức tải trung bình: %.2f" #: src/uptime.c:197 #, c-format @@ -11999,8 +12289,8 @@ msgid "" "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 "" -"In ra thời gian hiện thời, thời gian hệ thống đã chạy liên tục,\n" -"số các người dùng trên hệ thống, và số trung bình các công việc\n" +"In ra thời gian hiện tại, thời gian hệ thống đã chạy liên tục,\n" +"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 @@ -12009,8 +12299,8 @@ msgid "" " Processes in\n" "an uninterruptible sleep state also contribute to the load average.\n" msgstr "" -"Các tiến trình đang ngủ một cách không gián đoạn được\n" -" thì cũng được tính trong trọng tải trung bình.\n" +" 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 #, c-format @@ -12024,7 +12314,7 @@ msgid "" "\n" msgstr "" "Nếu không đưa ra TẬP_TIN, thì sử dụng %s.\n" -"%s là TẬP_TIN chung.\n" +"%s được dùng như là TẬP_TIN chung.\n" "\n" #: src/users.c:106 @@ -12051,9 +12341,9 @@ msgid "" " -m, --chars print the character counts\n" " -l, --lines print the newline counts\n" msgstr "" -"In số các dòng mới, từ, và byte của mỗi FILE, và tổng số dòng\n" +"In số dòng mới, từ, và byte của mỗi FILE, và tổng số dòng\n" "cũng in dòng tổng số riêng nếu chỉ ra nhiều FILE.\n" -"Khi không có FILE, hoặc khi FILE là « - »,\n" +"Khi không có FILE, hoặc khi FILE là “-”,\n" "đọc đầu vào tiêu chuẩn.\n" "Một từ là một dãy ký tự định giới bằng khoảng trắng\n" "mà không có chiều dài số không.\n" @@ -12071,9 +12361,9 @@ msgid "" " -L, --max-line-length print the length of the longest line\n" " -w, --words print the word counts\n" msgstr "" -" --files0-from=F đọc dữ liệu vào từ những tệp tin chỉ ra bởi\n" -" các tệp tin chấm dứt rỗng (NUL) trong tệp tin F\n" -"\t\t\t\t\tNếu F là « - » thì đọc các tên từ đầu vào tiêu chuẩn\n" +" --files0-from=F đọc dữ liệu vào từ những tập tin chỉ ra bởi\n" +" các tập tin chấm dứt rỗng (NUL) trong tập tin F\n" +" Nếu F là “-” thì đọc các tên từ đầu vào tiêu chuẩn\n" " -L, --max-line-length in chiều dài của dòng dài nhất\n" " -w, --words in các số đếm từ\n" @@ -12081,39 +12371,39 @@ msgstr "" msgid " old " msgstr " cũ " -#: src/who.c:449 +#: src/who.c:440 msgid "system boot" msgstr "hệ thống khởi động" -#: src/who.c:456 src/who.c:458 +#: src/who.c:447 src/who.c:449 msgid "id=" msgstr "id=" -#: src/who.c:471 src/who.c:476 +#: src/who.c:462 src/who.c:467 msgid "term=" msgstr "term=" -#: src/who.c:473 src/who.c:477 +#: src/who.c:464 src/who.c:468 msgid "exit=" msgstr "thoát=" -#: src/who.c:494 +#: src/who.c:485 msgid "LOGIN" msgstr "ĐĂNG_NHẬP" -#: src/who.c:514 +#: src/who.c:505 msgid "clock change" msgstr "thay đổi giờ" -#: src/who.c:526 src/who.c:527 +#: src/who.c:517 src/who.c:518 msgid "run-level" -msgstr "bậc chạy" +msgstr "mức-chạy" -#: src/who.c:530 src/who.c:531 +#: src/who.c:521 src/who.c:522 msgid "last=" msgstr "cuối=" -#: src/who.c:562 +#: src/who.c:553 #, c-format msgid "" "\n" @@ -12122,44 +12412,44 @@ msgstr "" "\n" "# người dùng=%lu\n" -#: src/who.c:568 +#: src/who.c:559 msgid "NAME" msgstr "TÊN" -#: src/who.c:568 +#: src/who.c:559 msgid "LINE" msgstr "ĐƯỜNG" -#: src/who.c:568 +#: src/who.c:559 msgid "TIME" msgstr "GIỜ" -#: src/who.c:568 +#: src/who.c:559 msgid "IDLE" msgstr "NGHỈ" -#: src/who.c:569 +#: src/who.c:560 msgid "PID" msgstr "PID" -#: src/who.c:569 +#: src/who.c:560 msgid "COMMENT" msgstr "CHÚ_THÍCH" -#: src/who.c:569 +#: src/who.c:560 msgid "EXIT" msgstr "THOÁT" -#: src/who.c:649 +#: src/who.c:640 #, c-format msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n" -msgstr "Sử dụng: %s [TÙY_CHỌN]... [ TẬP_TIN | ĐỐI_SỐ1 ĐỐI_SỐ2 ]\n" +msgstr "Cách dùng: %s [TÙY_CHỌN]... [ TẬP_TIN | Đ.SỐ1 Đ.SỐ2 ]\n" -#: src/who.c:650 +#: src/who.c:641 msgid "Print information about users who are currently logged in.\n" msgstr "In ra thông tin về những người dùng chưa đăng xuất.\n" -#: src/who.c:653 +#: src/who.c:644 msgid "" "\n" " -a, --all same as -b -d --login -p -r -t -T -u\n" @@ -12168,16 +12458,16 @@ msgid "" " -H, --heading print line of column headings\n" msgstr "" "\n" -" -a, --all giống như « -b -d --login -p -r -t -T -u »\n" +" -a, --all giống như “-b -d --login -p -r -t -T -u”\n" " -b, --boot thời gian của lần khởi động cuối\n" " -d, --dead in ra các tiến trình chết\n" " -H, --heading in dòng chứa các tiêu đề của cột\n" -#: src/who.c:660 +#: src/who.c:651 msgid " -l, --login print system login processes\n" msgstr " -l, --login in ra các tiến trình đăng nhập của hệ thống\n" -#: src/who.c:663 +#: src/who.c:654 msgid "" " --lookup attempt to canonicalize hostnames via DNS\n" " -m only hostname and user associated with stdin\n" @@ -12188,7 +12478,7 @@ msgstr "" "chuẩn\n" " -p, --process in các tiến trình hoạt động sinh ra bởi init\n" -#: src/who.c:668 +#: src/who.c:659 msgid "" " -q, --count all login names and number of users logged on\n" " -r, --runlevel print current runlevel\n" @@ -12200,20 +12490,20 @@ msgstr "" " -s, --short chỉ in tên, dòng và thời gian (mặc định)\n" " -t, --time in sự thay đổi đồng hồ hệ thống cuối cùng\n" -#: src/who.c:674 +#: src/who.c:665 msgid "" " -T, -w, --mesg add user's message status as +, - or ?\n" " -u, --users list users logged in\n" " --message same as -T\n" " --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" +" -T, -w, --mesg thêm trạng thái thư của người dùng như “+”, “-” hoặc " +"”?”\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" +" --message giống như “-T”\n" +" --writable giống như “-T”\n" -#: src/who.c:682 +#: src/who.c:673 #, c-format msgid "" "\n" @@ -12222,8 +12512,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 ĐỐI_SỐ1 ĐỐI_SỐ2, giả sử « -m »: thường là « am i » hoặc « mom " -"likes ».\n" +"Nếu đưa ra Đ.SỐ1 Đ.SỐ2, giả sử “-m”: thường là “am i” hoặc “mom likes”.\n" #: src/whoami.c:45 msgid "" @@ -12232,7 +12521,7 @@ msgid "" "\n" msgstr "" "In ra tên người dùng tương ứng với ID người dùng hiện thời hoạt động.\n" -"Giống như « id -un ».\n" +"Giống như “id -un”.\n" "\n" #: src/whoami.c:91 @@ -12246,42 +12535,213 @@ msgid "" "Usage: %s [STRING]...\n" " or: %s OPTION\n" msgstr "" -"Sử dụng: %s [CHUỖI]...\n" -" hoặc: %s TÙY_CHỌN\n" +"Cách dùng: %s [CHUỖI]...\n" +" hoặc: %s TÙY_CHỌN\n" #: src/yes.c:47 msgid "" "Repeatedly output a line with all specified STRING(s), or 'y'.\n" "\n" msgstr "" -"In lặp lại một dòng với tất cả CHUỖI chỉ ra, hoặc « y ».\n" +"In lặp lại một dòng với tất cả CHUỖI chỉ ra, hoặc “y”.\n" "\n" +#~ msgid "using single-precision arithmetic" +#~ msgstr "đang sử dụng chức năng sự tính chính xác đơn" + +#~ msgid "using arbitrary-precision arithmetic" +#~ 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" + #, fuzzy -#~ msgid " gid=%s" -#~ msgstr " gid=%lu" +#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n" +#~ msgstr "Cách dùng: %s [TÙY-CHỌN] TÊN...\n" #, fuzzy -#~ msgid " euid=%s" -#~ msgstr " euid=%lu" +#~ msgid "no valid suffix found\n" +#~ msgstr "%s: sai chiều dài hậu tố" + +#~ msgid "reading %s" +#~ msgstr "đọc %s" + +#~ msgid "writing %s" +#~ msgstr "ghi %s" + +#~ msgid "closing %s" +#~ msgstr "đóng %s" + +#~ msgid "accessing %s" +#~ msgstr "truy cập %s" + +#~ msgid "opening %s" +#~ msgstr "đang mở %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 bỏ qua thư mục trên hệ thống tập tin khác\n" +#~ " -X, --exclude-from=FILE bỏ những tập tin tương ứng với mẫu trong FILE\n" +#~ " --exclude=PATTERN bỏ những tập tin tương ứng với PATTERN\n" +#~ " --max-depth=N in ra tổng số cho một thư mục (hoặc tập tin, với " +#~ "”--all”)\n" +#~ " chỉ nếu nó nằm ≤ N bậc dưới đối số dòng lệnh;\n" +#~ " “--max-depth=0” là tương tự như “--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 không bao giờ tạo bản sao lưu (dù có đưa ra --backup)\n" +#~ " numbered, t tạo các bản sao lưu đã đánh số\n" +#~ " existing, nil đánh số nếu có bản sao lưu đánh số, nếu không thì dùng " +#~ "dạng đơn giản\n" +#~ " simple, never luôn luôn tạo sao lưu dạng đơn giản\n" +#~ "\n" + +#~ msgid "" +#~ "WARNING: --page-increment is deprecated; use --line-increment instead" +#~ msgstr "" +#~ "CẢNH BÁO: “--page-increment” bị phản đối, nên thay thế bằng “--line-" +#~ "increment”" + +#~ msgid "All arguments to long options are mandatory for short options.\n" +#~ msgstr "" +#~ "Mọi đối số dùng cùng với tùy chọn dài thì cũng bắt buộc với tùy chọn " +#~ "ngắn.\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" +#~ "CƠ SỐ:\n" +#~ " d thập lục\n" +#~ " o bát phân\n" +#~ " x thập lục\n" +#~ " n không có\n" +#~ "BYTES:\n" +#~ "có tiền tố số\n" +#~ " 0x hoặc 0X thập lục\n" +#~ "có hậu tố bội số\n" +#~ " b 512\n" +#~ " kB 1000\n" +#~ " K 1024\n" +#~ " MB 1000*1000\n" +#~ " M 1024*1024\n" +#~ " GB 1000*1000*1000\n" +#~ " G 1024*1024*1024\n" +#~ "v.v. cho T, P, E, Z, Y.\n" +#~ "Một hậu tố đuôi z trong bất kỳ dạng nào thêm các ký tự có thể in ra\n" +#~ "vào cuối mỗi dòng kết quả.\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” không kèm theo số ngầm hiểu là 3.\n" +#~ "”--width” không kèm theo số ngầm hiểu là 32.\n" +#~ "Theo mặc định, “od” sử dụng “-A o -t oS -w16”.\n" + +#~ msgid "Usage: %s [OPTION]... FILE\n" +#~ msgstr "Cách dùng: %s [TÙY_CHỌN]... TẬP_TIN\n" + +#~ msgid "Password:" +#~ msgstr "Mật khẩu:" + +#~ msgid "getpass: cannot open /dev/tty" +#~ msgstr "getpass: không mở được “/dev/tty”" + +#~ msgid "cannot set groups" +#~ msgstr "không đặt được các nhóm" + +#~ msgid "cannot set group id" +#~ msgstr "không đặt được ID nhóm" + +#~ msgid "cannot set user id" +#~ msgstr "không đặt được ID người dùng" + +#~ msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" +#~ msgstr "Cách dùng: %s [TÙY_CHỌN]... [-] [NGƯỜI_DÙNG [Đ.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 "" +#~ "Thay đổi id người dùng và id nhóm hoạt động thành của NGƯỜIDÙNG.\n" +#~ "\n" +#~ " -, -l, --login khiến shell thành shell đăng nhập\n" +#~ " -c, --command=LỆNH đưa một câu LỆNH đơn tới shell với “-c”\n" +#~ " -f, --fast đưa “-f” tới shell (cho csh hoặc tcsh)\n" +#~ " -m, --preserve-environment không đặt lại các biến môi trường\n" +#~ " -p giống như “-m”\n" +#~ " -s, --shell=TRÌNH_BAO chạy TRÌNH_BAO nếu “/etc/shells” cho phép\n" + +#~ msgid "" +#~ "\n" +#~ "A mere - implies -l. If USER not given, assume root.\n" +#~ msgstr "" +#~ "\n" +#~ "Một “-” ý nói “-l”. Nếu không đưa ra NGƯỜI_DÙNG, thì coi như người chủ " +#~ "(root).\n" + +#~ msgid "user %s does not exist" +#~ msgstr "người dùng %s không tồn tại" + +#~ msgid "incorrect password" +#~ msgstr "sai mật khẩu" + +#~ msgid "using restricted shell %s" +#~ msgstr "sử dụng shell bị giới hạn %s" + +#~ msgid "warning: cannot change directory to %s" +#~ msgstr "cảnh báo: không thể chuyển đổi thư mục sang %s" #~ msgid "" #~ "\n" #~ "Examples:\n" -#~ " %s /usr/bin/sort Output \"sort\".\n" -#~ " %s include/stdio.h .h Output \"stdio\".\n" +#~ " %s /usr/bin/sort Output `sort'.\n" +#~ " %s include/stdio.h .h Output `stdio'.\n" #~ msgstr "" #~ "\n" -#~ "Ví dụ :\n" -#~ " %s /usr/bin/sort Xuất « sort ».\n" -#~ " %s include/stdio.h .h Xuất « stdio ».\n" +#~ "Ví dụ:\n" +#~ " %s /usr/bin/sort Xuất “sort”.\n" +#~ " %s include/stdio.h .h Xuất “stdio”.\n" #~ msgid "" #~ "Usage: %s NAME\n" #~ " or: %s OPTION\n" #~ msgstr "" -#~ "Sử dụng: %s TÊN\n" -#~ " hoặc: %s TÙY_CHỌN\n" +#~ "Cách dùng: %s TÊN\n" +#~ " hoặc: %s TÙY_CHỌN\n" #~ msgid "--relative-base requires --relative-to" #~ msgstr "--relative-base yêu cầu --relative-to" @@ -12298,8 +12758,8 @@ msgstr "" #~ "itself\n" #~ msgstr "" #~ "Thay đổi nhóm của mỗi TẬP_TIN thành NHÓM.\n" -#~ "Khi có « --reference », thay đổi nhóm của mỗi TẬP_TIN thành nhóm của " -#~ "TẬP_TIN_R.\n" +#~ "Khi có “--reference”, thay đổi nhóm của mỗi TẬP_TIN thành nhóm của " +#~ "TẬP_TIN_TC.\n" #~ "\n" #~ " -c, --changes giống verbose nhưng chỉ thông báo khi có thay " #~ "đổi\n" @@ -12315,10 +12775,10 @@ msgstr "" #~ "\n" #~ msgstr "" #~ " -f, --silent, --quiet bỏ qua phần lớn các thông báo lỗi\n" -#~ " --reference=TẬP_TIN_R sử dụng nhóm của TẬP_TIN_R\n" +#~ " --reference=TẬP_TIN_TC sử dụng nhóm của TẬP_TIN_TC\n" #~ " thay cho giá trị NHÓM chỉ ra\n" -#~ " -R, --recursive thực hiện đệ quy trên tệp tin và thư mục\n" -#~ " -v, --verbose đưa ra thông tin chuẩn đoán cho mọi tệp tin\n" +#~ " -R, --recursive thực hiện đệ quy trên tập tin và thư mục\n" +#~ " -v, --verbose đưa ra thông tin chuẩn đoán cho mọi tập tin\n" #~ "\n" #~ msgid "" @@ -12336,8 +12796,8 @@ msgstr "" #~ " --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" -#~ " --preserve-root không thao tác đệ quy trên `/'\n" +#~ " --no-preserve-root không coi “/” là đặc biệt (mặc định)\n" +#~ " --preserve-root không thao tác đệ quy trên “/”\n" #~ msgid "" #~ " -f, --silent, --quiet suppress most error messages\n" @@ -12346,10 +12806,11 @@ msgstr "" #~ " -R, --recursive change files and directories recursively\n" #~ msgstr "" #~ " -f, --silent, --quiet bỏ qua phần lớn các thông báo lỗi\n" -#~ " -v, --verbose đưa ra thông tin chuẩn đoán cho mọi tệp tin " +#~ " -v, --verbose đưa ra thông tin chuẩn đoán cho mọi tập tin " #~ "được xử lý\n" -#~ " --reference=TẬP_TIN_R dùng chế độ của TẬP_TIN_R thay cho CHẾ_ĐỘ\n" -#~ " -R, --recursive thực hiện đệ quy trên tệp tin và thư mục\n" +#~ " --reference=TẬP_TIN_TC dùng chế độ của TẬP_TIN_TC thay cho " +#~ "CHẾ_ĐỘ\n" +#~ " -R, --recursive thực hiện đệ quy trên tập tin và thư mục\n" #~ msgid "" #~ "Change the owner and/or group of each FILE to OWNER and/or GROUP.\n" @@ -12365,9 +12826,9 @@ msgstr "" #~ msgstr "" #~ "Thay đổi người sở hữu và/hoặc nhóm của mỗi TẬP_TIN thành NGƯỜI_SỞ_HỮU và/" #~ "hoặc\n" -#~ "NHÓM. Với « --reference », thay đổi người sở hữu và nhóm của mỗi TẬP_TIN " +#~ "NHÓM. Với “--reference”, thay đổi người sở hữu và nhóm của mỗi TẬP_TIN " #~ "thành\n" -#~ "như TẬP_TIN_R.\n" +#~ "như TẬP_TIN_TC.\n" #~ "\n" #~ " -c, --changes giống verbose nhưng chỉ báo cáo khi có thay đổi\n" #~ " --dereference ảnh hưởng đích đến của mỗi liên kết mềm\n" @@ -12382,11 +12843,11 @@ msgstr "" #~ "\n" #~ msgstr "" #~ " -f, --silent, --quiet bỏ qua phần lớn các thông báo lỗi\n" -#~ " --reference=TẬP_TIN_R dùng người sở hữu và nhóm của TẬP_TIN_R " +#~ " --reference=TẬP_TIN_TC dùng người sở hữu và nhóm của TẬP_TIN_TC " #~ "thay\n" #~ " cho giá trị CHỦ_SỞ_HỮU:NHÓM chỉ ra\n" -#~ " -R, --recursive thực hiện đệ quy trên tệp tin và thư mục\n" -#~ " -v, --verbose đưa ra thông tin chuẩn đoán cho mọi tệp tin được " +#~ " -R, --recursive thực hiện đệ quy trên tập tin và thư mục\n" +#~ " -v, --verbose đưa ra thông tin chuẩn đoán cho mọi tập tin được " #~ "xử lý\n" #~ msgid "" @@ -12399,8 +12860,8 @@ msgstr "" #~ "thống.\n" #~ "\n" #~ " -d, --date=CHUỖI hiển thị thời gian theo CHUỖI, không phải " -#~ "`now'\n" -#~ " -f, --file=TẬP_TIN_NGÀY giống « --date » một lần cho mỗi dòng của " +#~ "“now”\n" +#~ " -f, --file=TẬP_TIN_NGÀY giống “--date” một lần cho mỗi dòng của " #~ "TẬP_TIN_NGÀY\n" #~ msgid "" @@ -12424,17 +12885,14 @@ msgstr "" #~ msgid "cannot create link %s" #~ msgstr "không tạo được liên kết %s" -#~ msgid "invalid format width" -#~ msgstr "định dạng chiều dài sai" - #~ msgid "invalid format precision" #~ msgstr "định dạng độ chính xác sai" #~ msgid "" #~ "WARNING: --preserve_context is deprecated; use --preserve-context instead" #~ msgstr "" -#~ "CẢNH BÁO : « --preserve_context » bị phản đối, nên thay thế bằng « --" -#~ "preserve-context »" +#~ "CẢNH BÁO: “--preserve_context” bị phản đối, nên thay thế bằng “--preserve-" +#~ "context”" #~ msgid "creating symbolic link %s" #~ msgstr "đang tạo liên kết mềm %s" @@ -12461,15 +12919,15 @@ msgstr "" #~ "the --context (-Z) option is obsolete and will be removed\n" #~ "in a future release" #~ msgstr "" -#~ "tùy chọn « --context » (-Z) quá cũ\n" +#~ "tùy chọn “--context” (-Z) quá cũ\n" #~ "và sẽ bị gỡ bỏ trong một phiên bản sau" #~ msgid "warning: the --%s option is obsolete; use --reference" -#~ msgstr "cảnh báo : tuỳ chọn « --%s » quá cũ, hãy dùng « --reference »" +#~ msgstr "cảnh báo: tùy chọn “--%s” quá cũ, hãy dùng “--reference”" #~ msgid "" #~ "\n" #~ "Note that the -r and -s options are mutually exclusive.\n" #~ msgstr "" #~ "\n" -#~ "Ghi chú rằng hai tùy chọn « -r » và « -s » loại từ lẫn nhau.\n" +#~ "Ghi chú rằng hai tùy chọn “-r” và “-s” loại từ lẫn nhau.\n" diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo index 22d65965..3febf9d7 100644 Binary files a/po/zh_CN.gmo and b/po/zh_CN.gmo differ diff --git a/po/zh_CN.po b/po/zh_CN.po index a0a26ed9..ff3d381b 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: 2012-05-10 19:35+0200\n" +"POT-Creation-Date: 2013-02-14 15:56+0000\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,19 +40,19 @@ msgstr "有效的参数为：" msgid "error closing file" msgstr "关闭文件时出错" -#: lib/closeout.c:112 src/base64.c:109 src/base64.c:121 src/base64.c:127 -#: src/base64.c:168 src/base64.c:224 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:330 src/expand.c:355 src/head.c:298 -#: src/head.c:348 src/head.c:756 src/head.c:797 src/mktemp.c:350 src/od.c:919 -#: src/paste.c:160 src/shuf.c:369 src/split.c:727 src/split.c:964 -#: src/split.c:969 src/tail.c:350 src/tail.c:1201 src/tail.c:1307 +#: 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 -#: src/unexpand.c:427 src/unexpand.c:443 +#: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "写入错误" -#: lib/copy-acl.c:611 src/copy.c:1160 src/copy.c:2602 +#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617 #, c-format msgid "preserving permissions for %s" msgstr "%s 的保留权限" @@ -244,18 +244,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:483 +#: lib/mkdir-p.c:196 src/install.c:484 #, c-format msgid "cannot change permissions of %s" msgstr "无法更改%s 的权限" -#: lib/mkdir-p.c:206 src/copy.c:2261 src/install.c:709 src/install.c:722 +#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722 #, 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:915 src/tac.c:435 +#: src/split.c:929 src/tac.c:434 #, c-format msgid "memory exhausted" msgstr "内存耗尽" @@ -304,75 +304,75 @@ msgstr "\"" msgid "%s: end of file" msgstr "%s：文件结束" -#: lib/regcomp.c:130 +#: lib/regcomp.c:131 msgid "Success" msgstr "成功" -#: lib/regcomp.c:133 +#: lib/regcomp.c:134 msgid "No match" msgstr "无匹配" -#: lib/regcomp.c:136 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "无效的正则表达式" -#: lib/regcomp.c:139 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "无效的校勘字符" -#: lib/regcomp.c:142 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "无效的字符类型名" -#: lib/regcomp.c:145 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "末尾的反斜杠" -#: lib/regcomp.c:148 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "无效的后向引用" -#: lib/regcomp.c:151 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "未匹配的[ 或[^" -#: lib/regcomp.c:154 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "未匹配的( 或\\(" -#: lib/regcomp.c:157 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "未匹配的\\{" -#: lib/regcomp.c:160 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "\\{\\} 中内容无效" -#: lib/regcomp.c:163 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "无效的范围结束符" -#: lib/regcomp.c:166 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "内存耗尽" -#: lib/regcomp.c:169 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "无效的前置正则表达式" -#: lib/regcomp.c:172 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "正则表达式异常结束" -#: lib/regcomp.c:175 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "正则表达式过长" -#: lib/regcomp.c:178 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "未匹配的 ) 或 \\)" -#: lib/regcomp.c:703 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "缺少之前的正则表达式" @@ -411,7 +411,7 @@ msgstr "^[yY]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-mode-acl.c:695 src/copy.c:2284 src/cp.c:518 +#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516 #, c-format msgid "setting permissions for %s" msgstr "设置%s 的权限" @@ -552,13 +552,13 @@ msgstr "电源错误" msgid "Resource lost" msgstr "资源丢失" -#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262 -#: lib/spawn-pipe.c:265 +#: 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:232 lib/spawn-pipe.c:346 lib/wait-process.c:282 +#: 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" @@ -574,24 +574,24 @@ msgstr "实时信号%d" msgid "Unknown signal %d" msgstr "未知信号%d" -#: lib/unicodeio.c:103 +#: lib/unicodeio.c:102 msgid "iconv function not usable" msgstr "iconv 函数无法使用" -#: lib/unicodeio.c:105 +#: lib/unicodeio.c:104 msgid "iconv function not available" msgstr "iconv 函数不存在" -#: lib/unicodeio.c:112 +#: lib/unicodeio.c:111 msgid "character out of range" msgstr "字符值超出可接受的范围以外" -#: lib/unicodeio.c:182 +#: lib/unicodeio.c:181 #, c-format msgid "cannot convert U+%04X to local character set" msgstr "无法将U+%04X 转换至用户的字符集" -#: lib/unicodeio.c:184 +#: lib/unicodeio.c:183 #, c-format msgid "cannot convert U+%04X to local character set: %s" msgstr "无法将U+%04X 转换至用户的字符集：%s" @@ -772,7 +772,7 @@ msgstr "" msgid "Report %s bugs to: %s\n" msgstr "请向 %2$s 报告 %1$s 的错误\n" -#: lib/version-etc.c:251 src/system.h:562 +#: lib/version-etc.c:251 src/system.h:573 #, c-format msgid "%s home page: <%s>\n" msgstr "%s 的主页：<%s>\n" @@ -782,7 +782,7 @@ 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:563 +#: lib/version-etc.c:256 src/system.h:574 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "GNU 软件一般性帮助：<http://www.gnu.org/gethelp/>\n" @@ -868,17 +868,16 @@ msgid "Simon Josefsson" msgstr "Simon Josefsson" #: src/base64.c:60 -#, c-format +#, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" "Base64 encode or decode FILE, or standard input, to standard output.\n" -"\n" msgstr "" "用法：%s [选项]... [文件]\n" "使用 Base64 编码/解码文件或标准输入输出。\n" "\n" -#: src/base64.c:64 +#: src/base64.c:67 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -892,7 +891,7 @@ msgstr "" " -w, --wrap=字符数\t在指定的字符数后自动换行(默认为76)，0 为禁用自动换行\n" "\n" -#: src/base64.c:73 src/cat.c:110 src/fmt.c:293 src/shuf.c:71 src/sum.c:70 +#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -900,7 +899,7 @@ msgstr "" "\n" "如果没有指定文件，或者文件为\"-\"，则从标准输入读取。\n" -#: src/base64.c:76 +#: src/base64.c:79 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -913,37 +912,37 @@ msgstr "" "包含一些非有效 Base64 字符的新行字符。可以尝试用 --ignore-garbage 选项来恢复" "加密流中任何非 base64 字符。\n" -#: src/base64.c:171 src/base64.c:208 src/csplit.c:263 src/csplit.c:1435 -#: src/join.c:451 src/shuf.c:157 src/shuf.c:361 src/tac-pipe.c:74 +#: 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 #, c-format msgid "read error" msgstr "读取错误" -#: src/base64.c:227 +#: src/base64.c:230 #, c-format msgid "invalid input" msgstr "输入无效" -#: src/base64.c:264 +#: src/base64.c:267 #, c-format msgid "invalid wrap size: %s" msgstr "无效的换行字符数：%s" -#: src/base64.c:283 src/basename.c:173 src/comm.c:435 src/cp.c:607 -#: src/date.c:441 src/dircolors.c:447 src/du.c:894 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:169 src/install.c:929 src/join.c:961 -#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:157 src/mv.c:447 -#: src/od.c:1802 src/ptx.c:2081 src/readlink.c:154 src/seq.c:408 -#: src/shuf.c:320 src/shuf.c:339 src/sort.c:4477 src/split.c:1313 -#: src/tr.c:1797 src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:454 -#: src/uniq.c:471 src/unlink.c:81 src/uptime.c:250 src/users.c:146 -#: src/wc.c:666 src/who.c:836 src/whoami.c:79 +#: 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 #, c-format msgid "extra operand %s" msgstr "额外的操作数 %s" -#: src/base64.c:315 src/cat.c:781 +#: src/base64.c:318 src/cat.c:781 #, c-format msgid "closing standard input" msgstr "关闭标准输入" @@ -951,15 +950,15 @@ 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/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:53 src/env.c:33 +#: 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/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:65 src/su.c:88 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 +#: 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 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -973,23 +972,23 @@ msgstr "" "　或：%s 选项\n" #: src/basename.c:53 +#, fuzzy msgid "" "Print NAME with any leading directory components removed.\n" "If specified, also remove a trailing SUFFIX.\n" -"\n" msgstr "" "去掉前导的目录部分后打印\"名称\"。\n" "如果指定的话，还会去掉尾随的\"后缀\"。\n" "\n" -#: src/basename.c:59 +#: 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" msgstr "" -#: src/basename.c:66 +#: src/basename.c:67 #, c-format msgid "" "\n" @@ -1000,20 +999,21 @@ msgid "" " %s -a any/str1 any/str2 -> \"str1\" followed by \"str2\"\n" msgstr "" -#: src/basename.c:167 src/chcon.c:531 src/chgrp.c:277 src/chmod.c:526 -#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1369 +#: 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:183 src/mkfifo.c:108 src/mknod.c:146 src/nohup.c:111 -#: src/pathchk.c:148 src/printf.c:674 src/readlink.c:146 src/realpath.c:236 -#: src/rm.c:314 src/rmdir.c:223 src/seq.c:402 src/setuidgid.c:137 -#: src/sleep.c:119 src/stat.c:1476 src/stdbuf.c:346 src/tr.c:1782 +#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 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 #, 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:52 src/split.c:49 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/split.c:49 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" @@ -1023,8 +1023,8 @@ msgstr "Torbjorn Granlund" msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:846 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4720 src/nl.c:182 src/paste.c:435 src/pr.c:2768 src/sum.c:58 +#: 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/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 +1080,7 @@ msgstr "" msgid "cannot do ioctl on %s" msgstr "无法在 %s 上执行 ioctrl" -#: src/cat.c:637 src/dd.c:2209 src/sort.c:379 src/tee.c:165 src/yes.c:86 +#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86 #, c-format msgid "standard output" msgstr "标准输出" @@ -1097,14 +1097,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:55 src/head.c:46 src/hostid.c:33 +#: 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 msgid "Jim Meyering" msgstr "Jim Meyering" -#: src/chcon.c:100 src/runcon.c:203 src/runcon.c:234 +#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238 #, c-format msgid "failed to create security context: %s" msgstr "创建安全环境失败：%s" @@ -1114,8 +1114,8 @@ msgstr "创建安全环境失败：%s" msgid "failed to set %s security context component to %s" msgstr "设置%s 安全环境组件到%s 失败" -#: src/chcon.c:156 src/chcon.c:540 src/copy.c:2222 src/runcon.c:217 -#: src/stat.c:683 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221 +#: src/stat.c:702 #, c-format msgid "failed to get security context of %s" msgstr "无法取得%s 的安全环境" @@ -1131,12 +1131,12 @@ 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:446 src/ls.c:2981 +#: src/du.c:457 src/ls.c:2981 #, c-format msgid "cannot access %s" msgstr "无法访问%s" -#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:426 +#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437 #, c-format msgid "cannot read directory %s" msgstr "无法读取目录%s" @@ -1146,13 +1146,13 @@ 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:599 +#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562 #, 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:618 -#: src/remove.c:613 +#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642 +#: src/remove.c:576 #, c-format msgid "fts_close failed" msgstr "fts_close 失败" @@ -1174,14 +1174,13 @@ msgid "" "Change the security context of each FILE to CONTEXT.\n" "With --reference, change the security context of each FILE to that of " "RFILE.\n" -"\n" msgstr "" "将每个文件的安全环境变更至指定环境。\n" "使用 --reference 选项时，把指定文件的安全环境设置为与参考文件相同。\n" "\n" " -h, --no-dereference\t\t影响符号连接而非引用的文件。\n" -#: src/chcon.c:362 src/chgrp.c:123 src/chown.c:94 +#: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94 msgid "" " --dereference affect the referent of each symbolic link (this is\n" " the default), rather than the symbolic link itself\n" @@ -1189,7 +1188,7 @@ msgid "" "file\n" msgstr "" -#: src/chcon.c:367 +#: src/chcon.c:369 #, fuzzy msgid "" " -u, --user=USER set user USER in the target security context\n" @@ -1203,7 +1202,16 @@ msgstr "" " -l, --range=范围 \t\t设置指定范围的目标安全环境\n" "\n" -#: src/chcon.c:373 +#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110 +#, fuzzy +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" + +#: src/chcon.c:379 #, fuzzy msgid "" " --reference=RFILE use RFILE's security context rather than " @@ -1214,15 +1222,15 @@ msgstr "" " -R, --recursive \t递归处理所有的文件及子目录\n" " -v, --verbose \t为处理的所有文件显示诊断信息\n" -#: src/chcon.c:377 src/chgrp.c:140 src/chown.c:118 +#: 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:380 +#: src/chcon.c:386 msgid " -v, --verbose output a diagnostic for every file processed\n" msgstr "" -#: src/chcon.c:383 src/chgrp.c:143 src/chown.c:121 +#: src/chcon.c:389 src/chgrp.c:143 src/chown.c:121 #, fuzzy msgid "" "\n" @@ -1245,36 +1253,36 @@ msgstr "" " -P 不遍历任何符号链接(默认)\n" "\n" -#: src/chcon.c:512 src/chgrp.c:264 src/chown.c:267 +#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267 #, c-format msgid "-R --dereference requires either -H or -L" msgstr "-R --dereference 需要-H 或-L 其中之一" -#: src/chcon.c:518 +#: src/chcon.c:524 #, c-format msgid "-R -h requires -P" msgstr "-R -h 需要-P" -#: src/chcon.c:533 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282 -#: src/comm.c:429 src/csplit.c:1371 src/join.c:1149 src/link.c:79 -#: src/mknod.c:148 src/setuidgid.c:139 src/tr.c:1785 +#: 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 #, c-format msgid "missing operand after %s" msgstr "%s 后缺少操作数" -#: src/chcon.c:556 src/runcon.c:247 +#: src/chcon.c:562 src/runcon.c:251 #, c-format msgid "invalid context: %s" msgstr "无效模式：%s" -#: src/chcon.c:563 +#: src/chcon.c:569 #, c-format msgid "conflicting security context specifiers given" msgstr "给出的安全环境说明冲突" -#: src/chcon.c:572 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:433 src/cp.c:493 -#: src/mv.c:96 src/pwd.c:273 src/rm.c:324 src/touch.c:351 +#: 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 #, c-format msgid "failed to get attributes of %s" msgstr "无法取得%s 的属性" @@ -1321,15 +1329,6 @@ msgstr "" " -h, --no-dereference\t\t会影响符号链接本身，而非符号链接所指示的目的地\n" "\t\t\t\t(当系统支持更改符号链接的所有者时，此选项才有用)\n" -#: src/chgrp.c:132 src/chmod.c:387 src/chown.c:110 -#, fuzzy -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" - #: src/chgrp.c:136 msgid "" " --reference=RFILE use RFILE's group rather than specifying a\n" @@ -1413,8 +1412,12 @@ msgstr "" " -h, --no-dereference\t\t影响符号连接而非引用的文件。\n" #: src/chmod.c:391 +#, fuzzy 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 msgid " -R, --recursive change files and directories recursively\n" @@ -1579,7 +1582,7 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:97 src/install.c:575 src/setuidgid.c:110 src/setuidgid.c:120 +#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120 #, c-format msgid "invalid group %s" msgstr "无效的组%s" @@ -1648,8 +1651,8 @@ msgstr "设置组ID 失败" msgid "failed to set user-ID" msgstr "设置用户ID 失败" -#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:213 src/stdbuf.c:366 -#: src/timeout.c:402 +#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365 +#: src/timeout.c:454 #, c-format msgid "failed to run command %s" msgstr "无法运行命令%s" @@ -1765,20 +1768,24 @@ msgstr "已定义多重分隔符" msgid "empty %s not allowed" msgstr "不允许空的%s" -#: src/copy.c:168 src/dd.c:1609 src/dd.c:1976 +#: 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 #, c-format -msgid "reading %s" -msgstr "正在读入%s" +msgid "error reading %s" +msgstr "读取%s 时出错" -#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:426 +#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425 #, c-format msgid "cannot lseek %s" msgstr "无法lseek %s" -#: src/copy.c:206 src/dd.c:2039 src/dd.c:2102 +#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151 #, c-format -msgid "writing %s" -msgstr "正在写入%s" +msgid "error writing %s" +msgstr "写入%s 出错" #: src/copy.c:313 #, c-format @@ -1800,7 +1807,7 @@ msgstr "扩展%s 失败" msgid "clearing permissions for %s" msgstr "清除%s 的权限" -#: src/copy.c:697 src/copy.c:2470 src/cp.c:331 +#: src/copy.c:697 src/copy.c:2480 src/cp.c:329 #, c-format msgid "failed to preserve ownership for %s" msgstr "无法保留%s 的所有者" @@ -1815,14 +1822,14 @@ msgstr "查阅文件%s 失败" msgid "failed to preserve authorship for %s" msgstr "保留%s 的作者失败" -#: src/copy.c:804 src/csplit.c:638 src/du.c:901 src/fmt.c:449 src/head.c:847 -#: src/sort.c:4489 src/split.c:1329 src/tail.c:1756 src/wc.c:678 +#: 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 "无法打开%s 读取数据" -#: src/copy.c:810 src/copy.c:972 src/dd.c:1546 src/dd.c:2114 src/dd.c:2252 -#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:141 +#: 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 #, c-format msgid "cannot fstat %s" msgstr "无法获取%s 的文件状态(fstat)" @@ -1842,14 +1849,14 @@ msgstr "获取文件系统创建环境失败" msgid "failed to set the security context of %s to %s" msgstr "设置%s 的安全环境为%s 失败" -#: src/copy.c:881 src/copy.c:1574 src/copy.c:1777 src/copy.c:1935 src/ln.c:314 -#: src/remove.c:267 src/remove.c:293 src/remove.c:444 src/remove.c:465 +#: 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 #, c-format msgid "cannot remove %s" msgstr "无法删除%s" -#: src/copy.c:886 src/copy.c:1578 src/copy.c:1772 src/copy.c:1940 -#: src/remove.c:418 +#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945 +#: src/remove.c:375 #, c-format msgid "removed %s\n" msgstr "已删除%s\n" @@ -1869,186 +1876,186 @@ msgstr "无法创建普通文件%s" msgid "failed to clone %s from %s" msgstr "克隆%s 失败" -#: src/copy.c:1098 src/copy.c:2531 +#: src/copy.c:1098 src/copy.c:2541 #, c-format msgid "preserving times for %s" msgstr "正在保留 %s 的时间" -#: src/copy.c:1170 src/copy.c:1176 src/head.c:855 src/touch.c:175 -#: src/truncate.c:413 -#, c-format -msgid "closing %s" -msgstr "正在关闭 %s" +#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172 +#: src/truncate.c:417 +#, fuzzy, c-format +msgid "failed to close %s" +msgstr "打开%s 失败" -#: src/copy.c:1466 +#: src/copy.c:1471 #, c-format msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? " msgstr "%s：是否覆盖%s，而不理会权限模式%04lo (%s)？ " -#: src/copy.c:1473 +#: src/copy.c:1478 #, c-format msgid "%s: overwrite %s? " msgstr "%s：是否覆盖%s？ " -#: src/copy.c:1542 +#: src/copy.c:1547 #, c-format msgid " (backup: %s)" msgstr " (备份：%s)" -#: src/copy.c:1552 +#: src/copy.c:1557 #, c-format msgid "failed to restore the default file creation context" msgstr "恢复默认文件创建环境失败" -#: src/copy.c:1584 +#: src/copy.c:1589 #, c-format msgid "cannot create hard link %s to %s" msgstr "无法创建指向%2$s 的硬链接%1$s" -#: src/copy.c:1637 src/copy.c:1689 src/copy.c:2272 src/copy.c:2589 +#: 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:1220 src/truncate.c:365 +#: src/stat.c:1239 src/truncate.c:363 #, c-format msgid "cannot stat %s" msgstr "无法获取%s 的文件状态(stat)" -#: src/copy.c:1645 +#: src/copy.c:1650 #, c-format msgid "omitting directory %s" msgstr "略过目录%s" -#: src/copy.c:1659 +#: src/copy.c:1664 #, c-format msgid "warning: source file %s specified more than once" msgstr "警告：指定来源文件%s 多于一次" -#: src/copy.c:1707 src/ln.c:246 +#: src/copy.c:1712 src/ln.c:246 #, c-format msgid "%s and %s are the same file" msgstr "%s 与%s 为同一文件" -#: src/copy.c:1806 +#: src/copy.c:1811 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "无法以目录%2$s 来覆盖非目录%1$s" -#: src/copy.c:1824 src/ln.c:214 +#: src/copy.c:1829 src/ln.c:214 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "不会以%2$s 覆盖刚创建的%1$s" -#: src/copy.c:1842 +#: src/copy.c:1847 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "无法以非目录来覆盖目录%s" -#: src/copy.c:1856 +#: src/copy.c:1861 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "无法将目录移动至非目录：%s -> %s" -#: src/copy.c:1886 +#: src/copy.c:1891 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "备份%s 会破坏源文件；未移动%s" -#: src/copy.c:1887 +#: src/copy.c:1892 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "备份%s 会破坏源文件；未复制%s" -#: src/copy.c:1910 src/ln.c:276 +#: src/copy.c:1915 src/ln.c:276 #, c-format msgid "cannot backup %s" msgstr "无法备份%s" -#: src/copy.c:1974 +#: src/copy.c:1979 #, c-format msgid "will not copy %s through just-created symlink %s" msgstr "不会以%s 覆盖刚创建的%s" -#: src/copy.c:2051 +#: src/copy.c:2056 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "无法将目录%s 复制到自己%s" -#: src/copy.c:2068 +#: src/copy.c:2073 #, c-format msgid "will not create hard link %s to directory %s" msgstr "不会创建指向目录%2$s 的硬链接%1$s" -#: src/copy.c:2118 +#: src/copy.c:2123 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "无法将目录%s 移动至自身的子目录%s 下" -#: src/copy.c:2161 +#: src/copy.c:2166 #, c-format msgid "cannot move %s to %s" msgstr "无法将%s 移动至%s" -#: src/copy.c:2173 +#: src/copy.c:2178 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "无法进行跨设备的移动：%s 至%s；无法删除目标" -#: src/copy.c:2207 src/install.c:905 src/mkdir.c:189 src/mkfifo.c:114 -#: src/mknod.c:167 +#: 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:2241 +#: src/copy.c:2246 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "无法复制循环的符号链接%s" -#: src/copy.c:2350 +#: src/copy.c:2355 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "%s：只能于当前目录中创建相对的符号链接" -#: src/copy.c:2357 +#: src/copy.c:2362 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "无法创建指向%2$s 的符号链接%1$s" -#: src/copy.c:2406 src/mkfifo.c:133 +#: src/copy.c:2416 src/mkfifo.c:132 #, c-format msgid "cannot create fifo %s" msgstr "无法创建先进先出文件%s" -#: src/copy.c:2415 +#: src/copy.c:2425 #, c-format msgid "cannot create special file %s" msgstr "无法创建特殊文件%s" -#: src/copy.c:2426 src/ls.c:3191 src/stat.c:902 +#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921 #, c-format msgid "cannot read symbolic link %s" msgstr "无法读取符号链接%s" -#: src/copy.c:2453 +#: src/copy.c:2463 #, c-format msgid "cannot create symbolic link %s" msgstr "无法创建符号链接%s" -#: src/copy.c:2485 +#: src/copy.c:2495 #, c-format msgid "%s has unknown file type" msgstr "%s 的文件类型不详" -#: src/copy.c:2629 src/ln.c:358 +#: src/copy.c:2644 src/ln.c:358 #, c-format msgid "cannot un-backup %s" msgstr "无法将%s 的备份还原" -#: src/copy.c:2633 +#: src/copy.c:2648 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (还原备份)\n" -#: src/cp.c:156 src/mv.c:284 +#: src/cp.c:156 src/mv.c:286 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -2060,25 +2067,13 @@ msgstr "" "　或：%s [选项]... -t 目录 源文件...\n" #: src/cp.c:162 -msgid "" -"Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" -"\n" +#, fuzzy +msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" msgstr "" "将源文件复制至目标文件，或将多个源文件复制至目标目录。\n" "\n" -#: src/cp.c:166 src/csplit.c:1458 src/cut.c:197 src/df.c:852 src/du.c:268 -#: src/expand.c:112 src/fmt.c:275 src/fold.c:75 src/head.c:115 -#: src/install.c:612 src/kill.c:86 src/ln.c:392 src/ls.c:4726 src/mkdir.c:61 -#: src/mkfifo.c:56 src/mknod.c:58 src/mv.c:294 src/nl.c:191 src/paste.c:445 -#: src/pr.c:2777 src/ptx.c:1825 src/shred.c:153 src/shuf.c:58 src/sort.c:399 -#: src/split.c:211 src/stdbuf.c:95 src/tac.c:142 src/tail.c:268 -#: src/touch.c:226 src/truncate.c:107 src/unexpand.c:122 src/uniq.c:145 -msgid "" -"Mandatory arguments to long options are mandatory for short options too.\n" -msgstr "长选项必须使用的参数对于短选项时也是必需使用的。\n" - -#: src/cp.c:169 +#: src/cp.c:168 msgid "" " -a, --archive same as -dR --preserve=all\n" " --attributes-only don't copy the file data, just the " @@ -2098,12 +2093,14 @@ msgstr "" " --copy-contents\t\t在递归处理是复制特殊文件内容\n" " -d\t\t\t\t等于--no-dereference --preserve=links\n" -#: src/cp.c:178 +#: src/cp.c:177 +#, fuzzy msgid "" " -f, --force if an existing destination file cannot be\n" -" opened, remove it and try again (redundant " -"if\n" -" the -n option is used)\n" +" opened, remove it and try again (this " +"option\n" +" is ignored when the -n option is also " +"used)\n" " -i, --interactive prompt before overwrite (overrides a previous " "-n\n" " option)\n" @@ -2114,7 +2111,7 @@ msgstr "" " -i, --interactive\t\t覆盖前询问(使前面的 -n 选项失效)\n" " -H\t\t\t\t跟随源文件中的命令行符号链接\n" -#: src/cp.c:188 +#: src/cp.c:186 #, fuzzy msgid "" " -l, --link hard link files instead of copying\n" @@ -2123,7 +2120,7 @@ msgstr "" " -l, --link\t\t\t链接文件而不复制\n" " -L, --dereference\t\t总是跟随符号链接\n" -#: src/cp.c:192 +#: src/cp.c:190 msgid "" " -n, --no-clobber do not overwrite an existing file (overrides\n" " a previous -i option)\n" @@ -2132,7 +2129,7 @@ msgstr "" " -n, --no-clobber\t\t不要覆盖已存在的文件(使前面的 -i 选项失效)\n" " -P, --no-dereference\t\t不跟随源文件中的符号链接\n" -#: src/cp.c:197 +#: src/cp.c:195 msgid "" " -p same as --preserve=mode,ownership,timestamps\n" " --preserve[=ATTR_LIST] preserve the specified attributes (default:\n" @@ -2145,7 +2142,7 @@ msgstr "" " --preserve[=属性列表\t保持指定的属性(默认：模式,所有权,时间戳)，如果\n" "\t\t\t\t\t可能保持附加属性：环境、链接、xattr 等\n" -#: src/cp.c:205 +#: src/cp.c:203 msgid "" " --no-preserve=ATTR_LIST don't preserve the specified attributes\n" " --parents use full source file name under DIRECTORY\n" @@ -2153,7 +2150,7 @@ msgstr "" " --sno-preserve=属性列表\t不保留指定的文件属性\n" " --parents\t\t\t复制前在目标目录创建来源文件路径中的所有目录\n" -#: src/cp.c:209 +#: src/cp.c:207 msgid "" " -R, -r, --recursive copy directories recursively\n" " --reflink[=WHEN] control clone/CoW copies. See below\n" @@ -2166,7 +2163,7 @@ msgstr "" " --remove-destination\t尝试打开目标文件前先删除已存在的目的地\n" "\t\t\t\t\t文件 (相对于 --force 选项)\n" -#: src/cp.c:215 +#: src/cp.c:213 msgid "" " --sparse=WHEN control creation of sparse files. See below\n" " --strip-trailing-slashes remove any trailing slashes from each " @@ -2176,7 +2173,7 @@ msgstr "" " --sparse=WHEN\t\t控制创建稀疏文件的方式\n" " --strip-trailing-slashes\t删除参数中所有源文件/目录末端的斜杠\n" -#: src/cp.c:220 +#: src/cp.c:218 msgid "" " -s, --symbolic-link make symbolic links instead of copying\n" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -2190,7 +2187,7 @@ msgstr "" " 复制至目标目录\n" " -T, --no-target-directory\t将目标目录视作普通文件\n" -#: src/cp.c:226 +#: src/cp.c:224 msgid "" " -u, --update copy only when the SOURCE file is newer\n" " than the destination file or when the\n" @@ -2203,7 +2200,7 @@ msgstr "" " -v, --verbose\t\t显示详细的进行步骤\n" " -x, --one-file-system\t不跨越文件系统进行操作\n" -#: src/cp.c:235 +#: src/cp.c:233 msgid "" "\n" "By default, sparse SOURCE files are detected by a crude heuristic and the\n" @@ -2229,7 +2226,7 @@ msgstr "" "情况下才复制。如果复制失败或者同时指定了--reflink=auto，则返回标准复制模" "式。\n" -#: src/cp.c:247 src/install.c:649 src/ln.c:421 src/mv.c:321 +#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322 #, fuzzy msgid "" "\n" @@ -2245,7 +2242,7 @@ msgstr "" "变量来选择。以下是可用的变量值：\n" "\n" -#: src/cp.c:254 src/install.c:656 src/mv.c:328 +#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329 msgid "" " none, off never make backups (even if --backup is given)\n" " numbered, t make numbered backups\n" @@ -2258,7 +2255,7 @@ msgstr "" "份\n" " simple, never 永远使用普通方式备份\n" -#: src/cp.c:260 +#: src/cp.c:258 msgid "" "\n" "As a special case, cp makes a backup of SOURCE when the force and backup\n" @@ -2269,90 +2266,90 @@ msgstr "" "有一个特别情况：如果同时指定--force 和--backup 选项，而源文件和目标文件\n" "是同一个已存在的一般文件的话，cp 会将源文件备份。\n" -#: src/cp.c:319 +#: src/cp.c:317 #, c-format msgid "failed to preserve times for %s" msgstr "无法保留%s 的时间" -#: src/cp.c:350 +#: src/cp.c:348 #, c-format msgid "failed to preserve permissions for %s" msgstr "保留%s 的权限失败" -#: src/cp.c:477 +#: src/cp.c:475 #, c-format msgid "cannot make directory %s" msgstr "无法创建目录%s" -#: src/cp.c:526 src/cp.c:545 +#: src/cp.c:524 src/cp.c:543 #, c-format msgid "%s exists but is not a directory" msgstr "%s 存在但并非目录" -#: src/cp.c:572 src/cp.c:1068 src/install.c:401 src/install.c:844 src/ln.c:123 -#: src/ln.c:181 src/ln.c:202 src/ln.c:516 src/mv.c:152 src/mv.c:399 -#, c-format -msgid "accessing %s" -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 +#, fuzzy, c-format +msgid "failed to access %s" +msgstr "打开%s 失败" -#: src/cp.c:592 src/install.c:914 src/ln.c:546 src/mv.c:432 src/shred.c:1182 -#: src/touch.c:433 src/truncate.c:356 +#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181 +#: src/touch.c:429 src/truncate.c:354 #, c-format msgid "missing file operand" msgstr "缺少了文件操作数" -#: src/cp.c:594 src/install.c:916 src/ln.c:560 src/mv.c:434 +#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436 #, c-format msgid "missing destination file operand after %s" msgstr "在%s 后缺少了要操作的目标文件" -#: src/cp.c:603 src/install.c:925 src/mv.c:443 +#: src/cp.c:601 src/install.c:926 src/mv.c:445 #, c-format msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)" msgstr "无法同时使用--target-directory (-t) 和--no-target-directory (-T) 选项" -#: src/cp.c:619 src/cp.c:1070 src/install.c:403 src/install.c:846 -#: src/install.c:938 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:401 -#: src/mv.c:457 +#: 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 #, c-format msgid "target %s is not a directory" msgstr "目标%s 不是目录" -#: src/cp.c:730 +#: src/cp.c:728 #, c-format msgid "with --parents, the destination must be a directory" msgstr "当跟随--parents 选项时，目的地必须是目录" -#: src/cp.c:1063 src/install.c:839 src/ln.c:511 src/mv.c:394 +#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395 #, c-format msgid "multiple target directories specified" msgstr "指定了多个目标目录" -#: src/cp.c:1108 +#: src/cp.c:1110 #, c-format msgid "cannot make both hard and symbolic links" msgstr "无法同时创建硬链接及符号链接" -#: src/cp.c:1115 src/mv.c:464 +#: src/cp.c:1117 src/mv.c:466 #, c-format msgid "options --backup and --no-clobber are mutually exclusive" msgstr "选项--backup 和 --no-clobber 互斥" -#: src/cp.c:1121 +#: src/cp.c:1123 #, c-format msgid "--reflink can be used only with --sparse=auto" msgstr "--reflink 只能与--sparse=auto 一起用" -#: src/cp.c:1129 src/install.c:899 src/ln.c:582 src/mv.c:472 +#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474 msgid "backup type" msgstr "备份方式" -#: src/cp.c:1154 +#: src/cp.c:1156 #, c-format msgid "cannot preserve security context without an SELinux-enabled kernel" msgstr "无法在未启用SELinux 支持的内核上使用安全环境" -#: src/cp.c:1160 +#: src/cp.c:1162 #, c-format msgid "cannot preserve extended attributes, cp is built without xattr support" msgstr "无法保留扩展属性，当前使用的 cp 副本编译时没有启用 xattr 支持" @@ -2362,138 +2359,137 @@ msgstr "无法保留扩展属性，当前使用的 cp 副本编译时没有启 msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:529 +#: src/csplit.c:531 #, c-format msgid "input disappeared" msgstr "输入消失" -#: src/csplit.c:658 src/csplit.c:669 +#: src/csplit.c:660 src/csplit.c:671 #, c-format msgid "%s: line number out of range" msgstr "%s：行数超出范围" -#: src/csplit.c:698 +#: src/csplit.c:700 #, c-format msgid "%s: %s: line number out of range" msgstr "%s：%s：行数超出范围" -#: src/csplit.c:701 src/csplit.c:750 +#: src/csplit.c:703 src/csplit.c:752 #, c-format msgid " on repetition %s\n" msgstr " 在循环位%s\n" -#: src/csplit.c:744 +#: src/csplit.c:746 #, c-format msgid "%s: %s: match not found" msgstr "%s：%s：无匹配" -#: src/csplit.c:808 src/csplit.c:848 src/nl.c:359 src/tac.c:274 +#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273 #, c-format msgid "error in regular expression search" msgstr "正则表达式搜索时出错" -#: src/csplit.c:981 +#: src/csplit.c:983 #, c-format msgid "write error for %s" msgstr "写入%s 时出错" -#: src/csplit.c:1057 +#: src/csplit.c:1059 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s：分界符后应该跟随整数" -#: src/csplit.c:1073 +#: src/csplit.c:1075 #, fuzzy, c-format msgid "%s: '}' is required in repeat count" msgstr "%s：在重复计数中需要\"}\"字符" -#: src/csplit.c:1083 +#: src/csplit.c:1085 #, fuzzy, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}：在\"{\"和\"}\"之间需要一个整数声明" -#: src/csplit.c:1110 +#: src/csplit.c:1112 #, fuzzy, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s：闭合定义符\"%c\"缺失" -#: src/csplit.c:1127 +#: src/csplit.c:1129 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s：无效的正则表达式：%s" -#: src/csplit.c:1160 +#: src/csplit.c:1162 #, c-format msgid "%s: invalid pattern" msgstr "%s：无效的模式" -#: src/csplit.c:1163 +#: src/csplit.c:1165 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s：行号必须大于0" -#: src/csplit.c:1169 +#: src/csplit.c:1171 #, c-format msgid "line number %s is smaller than preceding line number, %s" msgstr "行号%s 比先前的行号%s 更小" -#: src/csplit.c:1175 +#: src/csplit.c:1177 #, c-format msgid "warning: line number %s is the same as preceding line number" msgstr "警告：行号%s 比先前的行号更小" -#: src/csplit.c:1253 +#: src/csplit.c:1255 #, c-format msgid "missing conversion specifier in suffix" msgstr "下标中丢失了转换规格" -#: src/csplit.c:1259 +#: src/csplit.c:1261 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "下标中出现无效的转换规格：%c" -#: src/csplit.c:1262 +#: src/csplit.c:1264 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "下标中出现无效的转换规格：\\%.3o" -#: src/csplit.c:1267 +#: src/csplit.c:1269 #, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "无效的转换声明%%%c%c" -#: src/csplit.c:1284 +#: src/csplit.c:1286 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "下标中出现过多的%% 转换规格字符" -#: src/csplit.c:1298 +#: src/csplit.c:1300 #, c-format msgid "missing %% conversion specification in suffix" msgstr "下标中丢失了%% 转换规格字符" -#: src/csplit.c:1345 +#: src/csplit.c:1347 #, c-format msgid "%s: invalid number" msgstr "%s：无效数字" -#: src/csplit.c:1449 +#: src/csplit.c:1451 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "用法：%s [选项]... 文件 格式...\n" -#: src/csplit.c:1453 +#: src/csplit.c:1455 #, 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" -"\n" msgstr "" "按照指定的格式将文件分块为\"xx00\"、\"xx01\"...并输出。\n" "同时每个分块文件的字节数也将被输出到标准输出。\n" "\n" -#: src/csplit.c:1461 +#: src/csplit.c:1462 #, fuzzy, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2504,7 +2500,7 @@ msgstr "" " -f, --prefix=前缀\t\t使用指定前缀代替\"xx\"\n" " -k, --keep-files\t\t不移除错误的输出文件\n" -#: src/csplit.c:1466 +#: src/csplit.c:1467 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" @@ -2514,7 +2510,7 @@ msgstr "" " -s, --quiet, --silent\t不显示输出文件的尺寸计数\n" " -z, --elide-empty-files\t删除空的输出文件\n" -#: src/csplit.c:1473 +#: src/csplit.c:1474 msgid "" "\n" "Read standard input if FILE is -. Each PATTERN may be:\n" @@ -2522,7 +2518,7 @@ msgstr "" "\n" "如果文件为\"-\"，则读取标准输入。每个\"格式\"可以是：\n" -#: src/csplit.c:1477 +#: src/csplit.c:1478 #, fuzzy msgid "" "\n" @@ -2548,7 +2544,7 @@ msgstr "" msgid "David M. Ihnat" msgstr "David M. Ihnat" -#: src/cut.c:64 +#: src/cut.c:64 src/cut.c:372 msgid "fields and positions are numbered from 1" msgstr "序号从1 开始计数" @@ -2558,14 +2554,13 @@ msgid "Usage: %s OPTION... [FILE]...\n" msgstr "用法：%s [选项]... [文件]...\n" #: src/cut.c:193 -msgid "" -"Print selected parts of lines from each FILE to standard output.\n" -"\n" +#, fuzzy +msgid "Print selected parts of lines from each FILE to standard output.\n" msgstr "" "从每个文件中输出指定部分到标准输出。\n" "\n" -#: src/cut.c:200 +#: src/cut.c:199 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2575,7 +2570,7 @@ msgstr "" " -c, --characters=列表\t\t只选中指定的这些字符\n" " -d, --delimiter=分界符\t使用指定分界符代替制表符作为区域分界\n" -#: src/cut.c:205 +#: src/cut.c:204 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2586,13 +2581,13 @@ msgstr "" "\t\t\t\t行，除非-s 选项被指定\n" " -n\t\t\t\t(忽略)\n" -#: src/cut.c:211 +#: src/cut.c:210 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" msgstr " --complement\t\t补全选中的字节、字符或域\n" -#: src/cut.c:215 +#: src/cut.c:214 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2603,7 +2598,7 @@ msgstr "" "入\n" "\t\t\t\t的分界符\n" -#: src/cut.c:222 +#: src/cut.c:221 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2615,7 +2610,7 @@ msgstr "" "用逗号隔\n" "开要同时显示的不同类别。您的输入顺序将作为读取顺序，每个仅能输入一次。\n" -#: src/cut.c:228 +#: src/cut.c:227 msgid "" "Each range is one of:\n" "\n" @@ -2634,45 +2629,47 @@ msgstr "" "\n" "当没有文件参数，或者文件不存在时，从标准输入读取\n" -#: src/cut.c:368 src/cut.c:489 -msgid "invalid byte or field list" +#: src/cut.c:367 src/cut.c:493 +#, fuzzy +msgid "invalid byte, character or field list" msgstr "无效的字节或域列表" -#: src/cut.c:385 +#: src/cut.c:387 msgid "invalid range with no endpoint: -" msgstr "无终点的无效的范围：-" -#: src/cut.c:399 +#: src/cut.c:403 msgid "invalid decreasing range" msgstr "无效的缩小的范围" -#: src/cut.c:478 +#: src/cut.c:482 #, c-format msgid "byte offset %s is too large" msgstr "字节偏移量%s 过大" -#: src/cut.c:481 +#: src/cut.c:485 #, c-format msgid "field number %s is too large" msgstr "域编号%s 过大" -#: src/cut.c:789 src/cut.c:797 +#: src/cut.c:795 src/cut.c:803 msgid "only one type of list may be specified" msgstr "只能指定列表中的一种类型" -#: src/cut.c:806 +#: src/cut.c:812 src/numfmt.c:1408 +#, c-format msgid "the delimiter must be a single character" msgstr "分界符必须是单个字符" -#: src/cut.c:841 +#: src/cut.c:847 msgid "you must specify a list of bytes, characters, or fields" msgstr "您必须指定一组字节、字符或域的列表" -#: src/cut.c:844 +#: src/cut.c:850 msgid "an input delimiter may be specified only when operating on fields" msgstr "只有当操作域时才可以指定输入分界符" -#: src/cut.c:848 +#: src/cut.c:854 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2680,11 +2677,11 @@ msgstr "" "清除没有分界符的行只有在\n" "\t操作域时才有意义" -#: src/cut.c:864 +#: src/cut.c:870 msgid "missing list of fields" msgstr "缺少域列表" -#: src/cut.c:866 +#: src/cut.c:872 msgid "missing list of positions" msgstr "缺少位置列表" @@ -2698,9 +2695,11 @@ msgstr "" "　或：%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 "" + +#: src/date.c:134 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" " -I[TIMESPEC], --iso-8601[=TIMESPEC] output date/time in ISO 8601 format.\n" @@ -2709,7 +2708,7 @@ msgid "" " and time to the indicated precision.\n" msgstr "" -#: src/date.c:138 +#: src/date.c:142 msgid "" " -r, --reference=FILE display the last modification time of FILE\n" " -R, --rfc-2822 output date and time in RFC 2822 format.\n" @@ -2719,7 +2718,7 @@ msgstr "" " -R, --rfc-2822\t\t以RFC 2822格式输出日期和时间\n" "\t\t\t\t例如：2006年8月7日，星期一 12:34:56 -0600\n" -#: src/date.c:143 +#: src/date.c:147 #, fuzzy msgid "" " --rfc-3339=TIMESPEC output date and time in RFC 3339 format.\n" @@ -2738,7 +2737,7 @@ msgstr "" " -s, --set=字符串 \t设置指定字符串来分开时间\n" " -u, --utc, --universal\t输出或者设置协调的通用时间\n" -#: src/date.c:154 +#: src/date.c:158 msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" @@ -2752,7 +2751,7 @@ msgstr "" " %%\t一个文字的 %\n" " %a\t当前locale 的星期名缩写(例如： 日，代表星期日)\n" -#: src/date.c:161 +#: src/date.c:165 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2764,7 +2763,7 @@ msgstr "" " %B\t当前locale 的月名全称 (如：一月)\n" " %c\t当前locale 的日期和时间 (如：2005年3月3日 星期四 23:05:25)\n" -#: src/date.c:167 +#: src/date.c:171 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2776,7 +2775,7 @@ msgstr "" " %D\t按月计的日期；等于%m/%d/%y\n" " %e\t按月计的日期，添加空格，等于%_d\n" -#: src/date.c:173 +#: src/date.c:177 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -2786,7 +2785,7 @@ msgstr "" " %g\tISO-8601 格式年份的最后两位 (参见%G)\n" " %G\tISO-8601 格式年份 (参见%V)，一般只和 %V 结合使用\n" -#: src/date.c:178 +#: src/date.c:182 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2798,7 +2797,7 @@ msgstr "" " %I\t小时(00-12)\n" " %j\t按年计的日期(001-366)\n" -#: src/date.c:184 +#: src/date.c:188 #, fuzzy msgid "" " %k hour, space padded ( 0..23); same as %_H\n" @@ -2811,7 +2810,7 @@ msgstr "" " %m\t月份(01-12)\n" " %M\t分(00-59)\n" -#: src/date.c:190 +#: src/date.c:194 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2829,7 +2828,7 @@ msgstr "" " %R\t24 小时时间的时和分，等价于 %H:%M\n" " %s\t自UTC 时间 1970-01-01 00:00:00 以来所经过的秒数\n" -#: src/date.c:199 +#: src/date.c:203 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2841,7 +2840,7 @@ msgstr "" " %T\t时间，等于%H:%M:%S\n" " %u\t星期，1 代表星期一\n" -#: src/date.c:205 +#: src/date.c:209 msgid "" " %U week number of year, with Sunday as first day of week (00..53)\n" " %V ISO week number, with Monday as first day of week (01..53)\n" @@ -2853,7 +2852,7 @@ msgstr "" " %w\t一星期中的第几日(0-6)，0 代表周一\n" " %W\t一年中的第几周，以周一为每星期第一天(00-53)\n" -#: src/date.c:211 +#: src/date.c:215 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -2865,7 +2864,7 @@ msgstr "" " %y\t年份最后两位数位 (00-99)\n" " %Y\t年份\n" -#: src/date.c:217 +#: src/date.c:221 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -2884,7 +2883,7 @@ msgstr "" "\n" "默认情况下，日期的数字区域以0 填充。\n" -#: src/date.c:226 +#: src/date.c:230 #, fuzzy msgid "" "The following optional flags may follow '%':\n" @@ -2903,7 +2902,7 @@ msgstr "" " ^ 如果可能，使用大写字母\n" " # 如果可能，使用相反的大小写\n" -#: src/date.c:235 +#: src/date.c:239 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -2916,7 +2915,7 @@ msgstr "" "作为一个可选的修饰声明，它可以是E，在可能的情况下使用本地环境关联的\n" "表示方式；或者是O，在可能的情况下使用本地环境关联的数字符号。\n" -#: src/date.c:242 +#: src/date.c:246 msgid "" "\n" "Examples:\n" @@ -2930,35 +2929,35 @@ msgid "" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:275 src/dd.c:2193 src/head.c:838 src/md5sum.c:477 -#: src/md5sum.c:798 src/od.c:863 src/od.c:1914 src/pr.c:1176 src/pr.c:1372 -#: src/pr.c:1494 src/stty.c:842 src/tac.c:563 src/tail.c:343 src/tee.c:126 +#: 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 #, c-format msgid "standard input" msgstr "标准输入" -#: src/date.c:303 src/date.c:523 +#: src/date.c:307 src/date.c:527 #, c-format msgid "invalid date %s" msgstr "无效的日期%s" -#: src/date.c:414 src/date.c:448 +#: src/date.c:418 src/date.c:452 #, c-format msgid "multiple output formats specified" msgstr "指定了多种输出格式" -#: src/date.c:426 +#: src/date.c:430 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "被指定的这几种日期显示选项是相互抵触的" -#: src/date.c:433 +#: src/date.c:437 #, c-format msgid "the options to print and set the time may not be used together" msgstr "显示与设置时间的选项不能同时使用" -#: src/date.c:454 +#: src/date.c:458 #, fuzzy, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -2968,23 +2967,23 @@ msgstr "" "参数%s 缺少前导的\"+\"；\n" "当使用选项来描述日期是，任何非选项参数都必须以\"+\"所引导的字符串出现" -#: src/date.c:531 +#: src/date.c:535 #, c-format msgid "cannot set date" msgstr "无法设置日期" -#: src/date.c:554 src/du.c:360 +#: src/date.c:558 src/du.c:371 #, c-format msgid "time %s is out of range" msgstr "时间%s 超出范围" #. This is a proper name. See the gettext manual, section Names. -#: src/dd.c:44 src/factor.c:43 src/rm.c:41 src/tail.c:69 src/touch.c:41 +#: 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 "Paul Rubin" -#: src/dd.c:517 +#: src/dd.c:521 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -2993,7 +2992,7 @@ msgstr "" "用法：%s [操作数] ...\n" "　或：%s 选项\n" -#: src/dd.c:522 +#: src/dd.c:526 #, fuzzy msgid "" "Copy a file, converting and formatting according to the operands.\n" @@ -3012,7 +3011,7 @@ msgstr "" " count=块数\t只将指定个块数复制到块\n" " ibs=比特数\t一次读取的比特数(默认：512)\n" -#: src/dd.c:531 +#: src/dd.c:535 #, fuzzy msgid "" " if=FILE read from FILE instead of stdin\n" @@ -3022,7 +3021,8 @@ msgid "" " oflag=FLAGS write as per the comma separated symbol list\n" " seek=N skip N obs-sized blocks at start of output\n" " skip=N skip N ibs-sized blocks at start of input\n" -" status=noxfer suppress transfer statistics\n" +" status=WHICH WHICH info to suppress outputting to stderr;\n" +" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" msgstr "" " if=文件\t从指定文件中读取\n" " iflag=符号\t按照以逗号分隔的符号列表指定的方式读取\n" @@ -3033,10 +3033,11 @@ msgstr "" " skip=块数\t在输入开始处跳过指定的块数\n" " status=noxfer\t禁止传输统计\n" -#: src/dd.c:541 +#: src/dd.c:546 +#, fuzzy msgid "" "\n" -"BLOCKS and BYTES may be followed by the following multiplicative suffixes:\n" +"N and BYTES may be followed by the following multiplicative suffixes:\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, and so on for T, P, E, Z, Y.\n" "\n" @@ -3051,7 +3052,7 @@ msgstr "" "每个 CONV 符号可能为：\n" "\n" -#: src/dd.c:550 +#: src/dd.c:555 #, fuzzy msgid "" " ascii from EBCDIC to ASCII\n" @@ -3077,7 +3078,7 @@ msgstr "" " sync\t\t将每个输入数据块以NUL 字符填满至ibs 的大小；当配合block\n" "\t\t或unblock 时，会以空格代替NUL 字符填充\n" -#: src/dd.c:563 +#: src/dd.c:568 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3093,7 +3094,7 @@ msgstr "" " fdatasync\t结束前将输出文件数据写入磁盘\n" " fsync\t类似上面，但是元数据也一同写入\n" -#: src/dd.c:571 +#: src/dd.c:576 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3106,75 +3107,75 @@ msgstr "" "\n" " append\t追加模式(仅对输出有意义；隐含了conv=notrunc)\n" -#: src/dd.c:578 +#: src/dd.c:583 msgid " cio use concurrent I/O for data\n" msgstr " cio\t使用并行I/O 存取模式\n" -#: src/dd.c:580 +#: src/dd.c:585 msgid " direct use direct I/O for data\n" msgstr " direct\t使用直接I/O 存取模式\n" -#: src/dd.c:582 +#: src/dd.c:587 msgid " directory fail unless a directory\n" msgstr " directory\t除非是目录，否则 directory 失败\n" -#: src/dd.c:584 +#: src/dd.c:589 msgid " dsync use synchronized I/O for data\n" msgstr " dsync\t\t使用同步I/O 存取模式\n" -#: src/dd.c:586 +#: src/dd.c:591 msgid " sync likewise, but also for metadata\n" msgstr " sync\t\t与上者类似，但同时也对元数据生效\n" -#: src/dd.c:587 +#: src/dd.c:592 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr " fullblock\t为输入积累完整块(仅iflag)\n" -#: src/dd.c:590 +#: src/dd.c:595 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock\t使用无阻塞I/O 存取模式\n" -#: src/dd.c:592 +#: src/dd.c:597 msgid " noatime do not update access time\n" msgstr " noatime\t不更新存取时间\n" -#: src/dd.c:595 +#: src/dd.c:600 msgid " nocache discard cached data\n" msgstr " nocache\t丢弃缓存数据\n" -#: src/dd.c:598 +#: src/dd.c:603 msgid " noctty do not assign controlling terminal from file\n" msgstr " noctty\t不根据文件指派控制终端\n" -#: src/dd.c:601 +#: src/dd.c:606 msgid " nofollow do not follow symlinks\n" msgstr " nofollow\t不跟随链接文件\n" -#: src/dd.c:603 +#: src/dd.c:608 msgid " nolinks fail if multiply-linked\n" msgstr " nolinks\t如果有多重链接，则nolinks 失败\n" -#: src/dd.c:605 +#: src/dd.c:610 msgid " binary use binary I/O for data\n" msgstr " binary\t使用二进制I/O 存取模式\n" -#: src/dd.c:607 +#: src/dd.c:612 msgid " text use text I/O for data\n" msgstr " text\t使用文本I/O 存取模式\n" -#: src/dd.c:609 +#: src/dd.c:614 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:612 +#: src/dd.c:617 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:615 +#: src/dd.c:620 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:620 +#: src/dd.c:625 #, fuzzy, c-format msgid "" "\n" @@ -3203,7 +3204,7 @@ msgstr "" "可用选项有：\n" "\n" -#: src/dd.c:676 +#: src/dd.c:683 #, c-format msgid "" "%<PRIuMAX>+%<PRIuMAX> records in\n" @@ -3212,19 +3213,19 @@ msgstr "" "记录了%<PRIuMAX>+%<PRIuMAX> 的读入\n" "记录了%<PRIuMAX>+%<PRIuMAX> 的写出\n" -#: src/dd.c:682 +#: src/dd.c:689 #, c-format msgid "%<PRIuMAX> truncated record\n" msgid_plural "%<PRIuMAX> truncated records\n" msgstr[0] "%<PRIuMAX> 个被截断了的块\n" -#: src/dd.c:694 +#: src/dd.c:701 #, c-format msgid "%<PRIuMAX> byte (%s) copied" msgid_plural "%<PRIuMAX> bytes (%s) copied" msgstr[0] "%<PRIuMAX>字节(%s)已复制" -#: src/dd.c:712 +#: src/dd.c:720 msgid "Infinity B" msgstr "无穷量 B" @@ -3238,83 +3239,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:725 +#: src/dd.c:733 #, c-format msgid ", %g s, %s/s\n" msgstr "，%g 秒，%s/秒\n" -#: src/dd.c:804 +#: src/dd.c:812 #, c-format msgid "closing input file %s" msgstr "正在关闭输入文件%s" -#: src/dd.c:811 +#: src/dd.c:819 #, c-format msgid "closing output file %s" msgstr "正在关闭输出文件%s" -#: src/dd.c:1014 +#: src/dd.c:1022 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "无法关闭O_DIRECT：%s" -#: src/dd.c:1085 src/dd.c:1934 +#: src/dd.c:1093 src/dd.c:1942 #, c-format msgid "writing to %s" msgstr "正在写入%s" -#: src/dd.c:1199 src/dd.c:1253 +#: src/dd.c:1207 src/dd.c:1261 #, c-format msgid "unrecognized operand %s" msgstr "无法识别的操作数%s" -#: src/dd.c:1210 +#: src/dd.c:1218 msgid "invalid conversion" msgstr "转换无效" -#: src/dd.c:1213 src/dd.c:1289 +#: src/dd.c:1221 src/dd.c:1297 msgid "invalid input flag" msgstr "输入标志无效" -#: src/dd.c:1216 src/dd.c:1283 src/dd.c:1295 +#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303 msgid "invalid output flag" msgstr "输出标志无效" -#: src/dd.c:1219 +#: src/dd.c:1227 msgid "invalid status flag" msgstr "状态标志无效" -#: src/dd.c:1258 src/truncate.c:312 +#: src/dd.c:1266 src/truncate.c:310 #, c-format msgid "invalid number %s" msgstr "无效的数字%s" -#: src/dd.c:1340 +#: src/dd.c:1348 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "不可将{ascii、ebcdic、idm}中的任意两个结合使用" -#: src/dd.c:1342 +#: src/dd.c:1350 #, c-format msgid "cannot combine block and unblock" msgstr "不可将block 和unblock 结合使用" -#: src/dd.c:1344 +#: src/dd.c:1352 #, c-format msgid "cannot combine lcase and ucase" msgstr "不可将lcase 和ucase 结合使用" -#: src/dd.c:1346 +#: src/dd.c:1354 #, c-format msgid "cannot combine excl and nocreat" msgstr "不可将excl 和nocreat 结合使用" -#: src/dd.c:1349 +#: src/dd.c:1357 #, c-format msgid "cannot combine direct and nocache" msgstr "不可将direct 和nocreat 结合使用" -#: src/dd.c:1506 +#: src/dd.c:1514 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3323,156 +3324,178 @@ msgstr "" "警告：暂时避免有关文件%s 的lseek 内核错误\n" " 错误地址在mt_type=0x%0lx -- 有关mt_type 类型的列表请参考<sys/mtio.h>" -#: src/dd.c:1593 +#: src/dd.c:1601 #, c-format msgid "%s: cannot skip" msgstr "%s：无法跳过" -#: src/dd.c:1595 src/dd.c:1614 src/dd.c:1675 +#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683 #, c-format msgid "%s: cannot seek" msgstr "%s：无法搜索" -#: src/dd.c:1655 +#: src/dd.c:1663 #, c-format msgid "offset overflow while reading file %s" msgstr "读入文件%s 时偏移量溢出" -#: src/dd.c:1667 +#: src/dd.c:1675 #, c-format msgid "warning: invalid file offset after failed read" msgstr "警告：文件读取失败后偏移错误" -#: src/dd.c:1671 +#: src/dd.c:1679 #, c-format msgid "cannot work around kernel bug after all" msgstr "无法避免内核的错误" -#: src/dd.c:1814 +#: src/dd.c:1822 #, c-format msgid "setting flags for %s" msgstr "正在设置%s 的标记" -#: src/dd.c:1867 +#: src/dd.c:1875 #, c-format msgid "memory exhausted by input buffer of size %zu bytes (%s)" msgstr "%zu 字节的输入缓冲导致内存耗尽(%s)" -#: src/dd.c:1881 +#: src/dd.c:1889 #, c-format msgid "memory exhausted by output buffer of size %zu bytes (%s)" msgstr "%zu 字节的输出缓冲导致内存耗尽(%s)" -#: src/dd.c:1914 +#: src/dd.c:1922 #, c-format msgid "%s: cannot skip to specified offset" msgstr "%s：无法跳至指定偏移量" -#: src/dd.c:2125 src/dd.c:2258 -#, c-format -msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" +#: src/dd.c:2133 +#, fuzzy, c-format +msgid "failed to truncate to %<PRIdMAX> bytes in output file %s" msgstr "无法针对输出文件%2$s 的%1$<PRIuMAX> 字节处实施截断" -#: src/dd.c:2138 +#: src/dd.c:2146 #, c-format msgid "fdatasync failed for %s" msgstr "%s 的fdatasync 失败" -#: src/dd.c:2148 +#: src/dd.c:2156 #, c-format msgid "fsync failed for %s" msgstr "%s 的fsync 失败" -#: src/dd.c:2199 src/dd.c:2228 +#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165 #, c-format -msgid "opening %s" -msgstr "正在打开%s" +msgid "failed to open %s" +msgstr "打开%s 失败" -#: src/dd.c:2237 +#: src/dd.c:2246 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) " "blocks" msgstr "偏移量过大：无法在seek=%<PRIuMAX> (%lu-字节) 块的长度上实施截断" -#: src/dd.c:2274 src/dd.c:2280 +#: src/dd.c:2267 +#, 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 #, 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:54 src/expr.c:153 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:39 src/sleep.c:35 src/sort.c:66 +#: 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 msgid "Paul Eggert" msgstr "Paul Eggert" # ## Proof reading to here. -#: src/df.c:140 +#: src/df.c:172 msgid "Filesystem" msgstr "文件系统" -#: src/df.c:141 +#: src/df.c:175 msgid "Type" msgstr "类型" -#: src/df.c:142 +#: src/df.c:178 src/df.c:542 msgid "blocks" msgstr "块" -#: src/df.c:142 -msgid "Inodes" -msgstr "Inode" - -#: src/df.c:142 -msgid "Size" -msgstr "容量" - -#: src/df.c:143 +#: src/df.c:181 msgid "Used" msgstr "已用" -#: src/df.c:143 -msgid "IUsed" -msgstr "已用(I)" - -#: src/df.c:144 +#: src/df.c:184 msgid "Available" msgstr "可用" -#: src/df.c:144 -msgid "IFree" -msgstr "可用(I)" - -#: src/df.c:144 -msgid "Avail" -msgstr "可用" - -#: src/df.c:145 +#: src/df.c:187 msgid "Use%" msgstr "已用%" -#: src/df.c:145 +#: src/df.c:190 +msgid "Inodes" +msgstr "Inode" + +#: src/df.c:193 +msgid "IUsed" +msgstr "已用(I)" + +#: src/df.c:196 +msgid "IFree" +msgstr "可用(I)" + +#: src/df.c:199 msgid "IUse%" msgstr "已用(I)%" -#: src/df.c:145 +#: src/df.c:202 +msgid "Mounted on" +msgstr "挂载点" + +#: src/df.c:383 +#, c-format +msgid "option --output: field '%s' unknown" +msgstr "" + +#: src/df.c:390 +#, fuzzy, c-format +msgid "option --output: field '%s' used more than once" +msgstr "警告：指定来源文件%s 多于一次" + +#: src/df.c:410 src/df.c:449 +msgid "Size" +msgstr "容量" + +#: src/df.c:414 src/df.c:451 +msgid "Avail" +msgstr "可用" + +#: src/df.c:474 msgid "Capacity" msgstr "配额" -#: src/df.c:146 -msgid "Mounted on" -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 +#, c-format +msgid "%s-%s" +msgstr "" -#: src/df.c:847 +#: src/df.c:1210 +#, fuzzy msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" -"\n" msgstr "" "显示每个文件所在的文件系统的信息，默认是显示所有文件系统。\n" "\n" -#: src/df.c:855 +#: src/df.c:1217 #, fuzzy msgid "" " -a, --all include dummy file systems\n" @@ -3490,7 +3513,7 @@ msgstr "" " -h, --human-readable\t以可读性较好的格式显示尺寸(例如：1K 234M 2G)\n" " -H, --si\t\t计算时使用1000 为基底而非1024\n" -#: src/df.c:865 +#: src/df.c:1227 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3503,8 +3526,12 @@ msgstr "" " -l, --local\t\t只显示本机的文件系统\n" " --no-sync\t\t取得使用量数据前不进行同步动作(默认)\n" -#: src/df.c:872 +#: src/df.c:1234 +#, fuzzy msgid "" +" --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" +" or print all fields if FIELD_LIST is " +"omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" " -t, --type=TYPE limit listing to file systems of type TYPE\n" @@ -3519,20 +3546,42 @@ msgstr "" " -x, --exclude-type=类型\t只显示文件系统不是指定类型信息\n" " -v\t\t\t(忽略)\n" -#: src/df.c:1027 +#: src/df.c:1248 +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" +msgstr "" + +#: src/df.c:1285 +#, 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 #, c-format msgid "file system type %s both selected and excluded" msgstr "不能同时选择和排除文件系统类型%s" -#: src/df.c:1075 +#: src/df.c:1500 msgid "Warning: " msgstr "警告：" -#: src/df.c:1077 src/stat.c:795 +#: src/df.c:1502 src/stat.c:814 msgid "cannot read table of mounted file systems" msgstr "%s 无法读取已挂载上的文件系统的目录" -#: src/df.c:1107 +#: src/df.c:1539 #, c-format msgid "no file systems processed" msgstr "未处理文件系统" @@ -3644,7 +3693,7 @@ msgstr "" " %s /usr/bin/\t输出\"/usr\"。\n" " %s stdio.h\t\t输出\".\"。\n" -#: src/du.c:260 src/sort.c:390 src/wc.c:112 +#: src/du.c:270 src/sort.c:394 src/wc.c:112 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3653,17 +3702,18 @@ msgstr "" "用法：%s [选项]... [文件]...\n" "　或：%s [选项]... --files0-from=F\n" -#: src/du.c:264 -msgid "" -"Summarize disk usage of each FILE, recursively for directories.\n" -"\n" +#: src/du.c:274 +#, fuzzy +msgid "Summarize disk usage of each FILE, recursively for directories.\n" msgstr "" "计算每个文件的磁盘用量，目录则取总用量。\n" "\n" -#: src/du.c:271 +#: src/du.c:280 #, fuzzy msgid "" +" -0, --null end each output line with 0 byte rather than " +"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,7 +3726,7 @@ msgstr "" "\t\t\t小一些，但有时它会因为稀疏文件间的\"洞\"、内部碎\n" "\t\t\t片、非直接引用的块等原因而变大。\n" -#: src/du.c:279 +#: src/du.c:289 #, fuzzy msgid "" " -B, --block-size=SIZE scale sizes by SIZE before printing them. E.g.,\n" @@ -3686,6 +3736,11 @@ msgid "" " -c, --total produce a grand total\n" " -D, --dereference-args dereference only symlinks that are listed on the\n" " command line\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 "" " -B, --block-size=大小\t使用指定字节数的块。例如-BM 以 1,048,576\n" "\t\t\t字节为单位显示大小。参看SIZE 格式。 -b, --bytes\t\t等于--apparent-" @@ -3693,7 +3748,8 @@ msgstr "" " -c, --total\t\t显示总计信息\n" " -D, --dereference-args\t解除命令行中列出的符号连接\n" -#: src/du.c:288 +#: src/du.c:302 +#, fuzzy msgid "" " --files0-from=F summarize disk usage of the NUL-terminated file\n" " names specified in file F;\n" @@ -3701,7 +3757,6 @@ msgid "" " -H equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" --si like -h, but use powers of 1000 not 1024\n" msgstr "" " --files0-from=F\t计算文件F 中以NUL 结尾的文件名对应占用的磁盘空间\n" "\t\t\t如果F 的值是\"-\"，则从标准输入读入文件名\n" @@ -3709,9 +3764,11 @@ msgstr "" " -h, --human-readable\t以可读性较好的方式显示尺寸(例如：1K 234M 2G)\n" " --si\t\t类似-h，但在计算时使用1000 为基底而非1024\n" -#: src/du.c:297 +#: src/du.c:310 +#, fuzzy 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 "" @@ -3719,14 +3776,13 @@ msgstr "" " -l, --count-links\t如果是硬连接，就多次计算其尺寸\n" " -m\t\t\t等于--block-size=1M\n" -#: src/du.c:302 +#: src/du.c:316 +#, fuzzy msgid "" -" -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " "default)\n" -" -0, --null end each output line with 0 byte rather than " -"newline\n" " -S, --separate-dirs 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\t找出任何符号链接指示的真正目的地\n" @@ -3735,27 +3791,11 @@ msgstr "" " -S, --separate-dirs\t不包括子目录的占用量\n" " -s, --summarize\t只分别计算命令列中每个参数所占的总用量\n" -#: src/du.c:309 -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\t\t跳过处于不同文件系统之上的目录\n" -" -X, --exclude-from=文件\t排除与指定文件中描述的模式相符的文件\n" -" --exclude=PATTERN\t\t排除与PATTERN 中描述的模式相符的文件\n" -" --max-depth=N\t显示目录总计(与--all 一起使用计算文件)\n" -"\t\t\t当N 为指定数值时计算深度为N；\n" -"\t\t\t--max-depth=0 等于--summarize\n" - -#: src/du.c:318 +#: src/du.c:322 #, fuzzy msgid "" +" -t, --threshold=SIZE exclude entries smaller than SIZE if positive,\n" +" or entries greater than SIZE if negative\n" " --time show time of the last modification of any file in " "the\n" " directory, or any of its subdirectories\n" @@ -3771,64 +3811,73 @@ msgstr "" " --time-style=样式\t按照指定样式显示时间(样式解释规则同\"date\"命令)：\n" "\t\t\tfull-iso，long-iso，iso，+FORMAT\n" -#: src/du.c:375 +#: src/du.c:333 +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 msgid "Infinity" msgstr "无穷量 B" -#: src/du.c:600 +#: src/du.c:507 +#, c-format +msgid "mount point %s already traversed" +msgstr "" + +#: src/du.c:624 #, c-format msgid "fts_read failed: %s" msgstr "fts_read 失败：%s" -#: src/du.c:724 +#: src/du.c:780 #, c-format msgid "invalid maximum depth %s" msgstr "目录最大深度%s 无效" -#: src/du.c:817 +#: src/du.c:809 +#, fuzzy, c-format +msgid "invalid --threshold argument '-0'" +msgstr "无效的 --%s 参数%s" + +#: src/du.c:887 #, c-format msgid "cannot both summarize and show all entries" msgstr "不能既显示总用量，同时又显示每个项目" -#: src/du.c:824 +#: src/du.c:894 #, c-format msgid "warning: summarizing is the same as using --max-depth=0" msgstr "警告：显示总用量等价于使用--max-depth=0" -#: src/du.c:830 +#: src/du.c:900 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "警告：显示总用量的选项和--max-depth=%lu 互斥" -#: src/du.c:896 src/sort.c:4479 src/wc.c:668 +#: src/du.c:966 src/sort.c:4533 src/wc.c:668 msgid "file operands cannot be combined with --files0-from" msgstr "文件操作数不能于--files0-from 参数一起使用" -#: src/du.c:949 src/md5sum.c:587 src/od.c:903 src/tac.c:239 src/tac.c:350 -#: src/tac.c:506 src/tac.c:586 src/wc.c:733 +#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 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:963 src/sort.c:4508 src/wc.c:747 +#: src/du.c:1040 src/sort.c:4562 src/wc.c:747 #, c-format msgid "when reading file names from stdin, no file name of %s allowed" msgstr "当从标准输入读取时，不允许指定文件名%s" -#: src/du.c:980 src/du.c:988 src/wc.c:760 src/wc.c:768 +#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768 msgid "invalid zero-length file name" msgstr "无效的零长度文件名" -#: src/du.c:1007 src/head.c:149 src/head.c:262 src/head.c:334 src/head.c:538 -#: src/head.c:620 src/head.c:692 src/head.c:750 src/head.c:774 src/tail.c:412 -#: src/tail.c:500 src/tail.c:549 src/tail.c:642 src/tail.c:770 src/tail.c:818 -#: src/tail.c:855 src/tail.c:1782 src/tail.c:1812 src/uniq.c:395 -#, c-format -msgid "error reading %s" -msgstr "读取%s 时出错" - -#: src/du.c:1010 src/ls.c:2649 src/wc.c:791 +#: src/du.c:1088 src/ls.c:2649 src/wc.c:791 msgid "total" msgstr "总用量" @@ -3930,9 +3979,12 @@ msgid "Usage: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n" msgstr "用法：%s [选项]... [-] [名称=值]... [命令 [参数]...]\n" #: src/env.c:55 +msgid "Set each NAME to VALUE in the environment and run COMMAND.\n" +msgstr "" + +#: src/env.c:61 +#, fuzzy msgid "" -"Set each NAME to VALUE in the environment and run COMMAND.\n" -"\n" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with 0 byte rather than newline\n" " -u, --unset=NAME remove variable from the environment\n" @@ -3943,7 +3995,7 @@ msgstr "" " -0, --null 以空字符而非新行符结束每一输出行\n" " -u, --unset=名称 从当前环境中撤消一个变量\n" -#: src/env.c:64 +#: src/env.c:68 msgid "" "\n" "A mere - implies -i. If no COMMAND, print the resulting environment.\n" @@ -3951,32 +4003,32 @@ msgstr "" "\n" "单纯的 - 意味着 -i。如果没有命令，则打印结果环境。\n" -#: src/env.c:120 +#: src/env.c:124 #, c-format msgid "cannot unset %s" msgstr "无法撤消 %s" -#: src/env.c:131 +#: src/env.c:135 #, c-format msgid "cannot set %s" msgstr "无法设定 %s" -#: src/env.c:148 +#: src/env.c:152 #, c-format msgid "cannot specify --null (-0) with command" msgstr "无法以命令指定--null (-0)" #: 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" -"\n" msgstr "" "将每个文件中的制表符转换为空格，写到标准输出。\n" "如果不指定文件，或者文件为\"-\"，程序将从标准输入读取数据。\n" "\n" -#: src/expand.c:115 +#: src/expand.c:114 msgid "" " -i, --initial do not convert tabs after non blanks\n" " -t, --tabs=NUMBER have tabs NUMBER characters apart, not 8\n" @@ -3984,32 +4036,32 @@ msgstr "" " -i, --initial\t\t不转换非空白符后的制表符\n" " -t, --tabs=数字\t设置每个制表符为指定数字的宽度，而不是默认的8\n" -#: src/expand.c:119 +#: src/expand.c:118 msgid "" " -t, --tabs=LIST use comma separated list of explicit tab positions\n" msgstr " -t, --tabs=列表\t指定制表符位置列表，用逗号分隔\n" -#: src/expand.c:172 src/unexpand.c:191 +#: src/expand.c:171 src/unexpand.c:190 #, c-format msgid "tab stop is too large %s" msgstr "%s：制表符跳格量过大" -#: src/expand.c:180 src/unexpand.c:199 +#: src/expand.c:179 src/unexpand.c:198 #, c-format msgid "tab size contains invalid character(s): %s" msgstr "制表符尺寸中包含无效字符：%s" -#: src/expand.c:206 src/unexpand.c:225 +#: src/expand.c:205 src/unexpand.c:224 #, c-format msgid "tab size cannot be 0" msgstr "制表符尺寸不可为0" -#: src/expand.c:208 src/unexpand.c:227 +#: src/expand.c:207 src/unexpand.c:226 #, c-format msgid "tab sizes must be ascending" msgstr "制表符尺寸必须是升序的" -#: src/expand.c:326 src/expand.c:345 src/unexpand.c:374 src/unexpand.c:419 +#: 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 "输入行太长" @@ -4166,12 +4218,12 @@ msgstr "正则表达式匹配器出错" msgid "non-integer argument" msgstr "非整数参数" -#: src/expr.c:793 src/truncate.c:316 +#: src/expr.c:793 src/truncate.c:314 #, c-format msgid "division by zero" msgstr "除以零" -#: src/expr.c:887 src/sort.c:2029 +#: src/expr.c:887 src/sort.c:2044 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "请设置LC_ALL='C' 以避免出现问题。" @@ -4181,25 +4233,32 @@ msgstr "请设置LC_ALL='C' 以避免出现问题。" msgid "the strings compared were %s and %s" msgstr "已比较的字符串为%s 和%s" -#: src/factor.c:449 -msgid "using arbitrary-precision arithmetic" -msgstr "使用任意精度运算" +#. This is a proper name. See the gettext manual, section Names. +#: src/factor.c:111 +msgid "Niels Moller" +msgstr "" -#: src/factor.c:460 -msgid "using single-precision arithmetic" -msgstr "使用单精度运算" +#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459 +#, c-format +msgid "Lucas prime test failure. This should not happen" +msgstr "" -#: src/factor.c:465 src/od.c:1640 src/od.c:1709 +#: src/factor.c:2092 #, c-format -msgid "%s is too large" -msgstr "%s 太大" +msgid "squfof queue overflow" +msgstr "" -#: src/factor.c:469 +#: src/factor.c:2419 #, c-format msgid "%s is not a valid positive integer" msgstr "%s 不是有效的正整数" -#: src/factor.c:494 +#: src/factor.c:2442 src/od.c:1646 src/od.c:1715 +#, c-format +msgid "%s is too large" +msgstr "%s 太大" + +#: src/factor.c:2454 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4208,7 +4267,7 @@ msgstr "" "用法：%s [数字]...\n" "　或：%s 选项\n" -#: src/factor.c:499 +#: src/factor.c:2459 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" @@ -4232,20 +4291,20 @@ msgid "cannot stat current directory (now %s)" msgstr "无法获取当前目录的文件状态(stat，当前目录是%s)" #. This is a proper name. See the gettext manual, section Names. -#: src/fmt.c:37 +#: src/fmt.c:38 msgid "Ross Paterson" msgstr "Ross Paterson" -#: src/fmt.c:269 +#: src/fmt.c:270 #, c-format msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n" msgstr "用法：%s [-宽度] [选项]... [文件]...\n" -#: src/fmt.c:270 +#: 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" -"\n" msgstr "" "重新格式化文件中每个段落并输出到标准输出\n" "选项 \"-宽度\" 是\"--width=数字\" 的缩写。\n" @@ -4263,8 +4322,8 @@ msgstr "" "\t\t\t\t将前缀重新附着到被重新格式化的行上\n" " -s, --split-only\t\t分割过长的行，但不自动补足\n" -#: src/fmt.c:285 -#, fuzzy, c-format +#: src/fmt.c:287 +#, fuzzy, 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" @@ -4275,29 +4334,29 @@ msgstr "" " -u, --uniform-spacing\t\t每两个单词间保留一个空格，每句之后保留两个空格\n" " -w, --width=宽度\t\t最大行宽(默认为75 列宽度)\n" -#: src/fmt.c:357 +#: src/fmt.c:359 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" "option; use -w N instead" msgstr "无效选项 -- %c；宽度必须是第一个选项才能被正确识别；请使用 -w N" -#: src/fmt.c:403 src/fmt.c:414 +#: src/fmt.c:405 src/fmt.c:416 #, c-format msgid "invalid width: %s" msgstr "无效的宽度：%s" #: src/fold.c:70 +#, fuzzy msgid "" "Wrap input lines in each FILE (standard input by default), writing to\n" "standard output.\n" -"\n" msgstr "" "对每个指定的文件(默认由标准输入读取)设置自动换行，并将重新排版后的结果输出到" "标准输出。\n" "\n" -#: src/fold.c:78 +#: src/fold.c:77 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4307,13 +4366,13 @@ msgstr "" " -s, --spaces\t\t在空格处断行\n" " -w, --width=宽度\t使用指定的列宽度代替默认的80\n" -#: src/fold.c:289 src/pr.c:836 +#: src/fold.c:288 src/pr.c:832 #, c-format 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:75 +#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 #: src/truncate.c:37 msgid "Padraig Brady" msgstr "Padraig Brady" @@ -4331,17 +4390,17 @@ msgstr "" "为Shell 脚本格式输出基于操作平台的限制参数。\n" "\n" -#: src/group-list.c:69 src/id.c:345 src/setuidgid.c:184 +#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184 #, c-format msgid "failed to get groups for user %s" msgstr "获取用户%s 的属组失败" -#: src/group-list.c:74 src/id.c:350 +#: src/group-list.c:74 src/id.c:370 #, c-format msgid "failed to get groups for the current process" msgstr "获取当前进程用户组失败" -#: src/group-list.c:104 +#: src/group-list.c:114 #, c-format msgid "cannot find name for group ID %lu" msgstr "无法找到ID 为%lu 的用户的属组" @@ -4382,18 +4441,18 @@ msgid "%s: no such user" msgstr "%s：无此用户" #: 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" -"\n" msgstr "" "将每个指定文件的头10 行显示到标准输出。\n" "如果指定了多于一个文件，在每一段输出前会给出文件名作为文件头。\n" "如果不指定文件，或者文件为\"-\"，则从标准输入读取数据。\n" "\n" -#: src/head.c:118 +#: src/head.c:117 #, fuzzy msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" @@ -4410,7 +4469,7 @@ msgstr "" "\t\t\t如果附加\"-\"参数，则除了每个文件的最后K 行外显示\n" "\t\t\t剩余全部内容\n" -#: src/head.c:126 +#: src/head.c:125 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4418,7 +4477,7 @@ msgstr "" " -q, --quiet, --silent\t不显示包含给定文件名的文件头\n" " -v, --verbose\t\t总是显示包含给定文件名的文件头\n" -#: src/head.c:132 +#: src/head.c:131 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -4430,58 +4489,58 @@ 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:152 -#, c-format -msgid "error writing %s" -msgstr "写入%s 出错" - -#: src/head.c:155 +#: src/head.c:154 #, c-format msgid "%s: file has shrunk too much" msgstr "%s：文件被过度收缩" -#: src/head.c:228 src/head.c:1044 +#: src/head.c:227 src/head.c:1051 #, c-format msgid "%s: number of bytes is too large" msgstr "%s：字节数过大" -#: src/head.c:441 +#: src/head.c:440 #, c-format msgid "%s: cannot lseek back to original position" msgstr "%s：lseek 无法回溯到初始位置" -#: src/head.c:613 src/head.c:684 src/tail.c:450 +#: src/head.c:612 src/head.c:691 src/tail.c:449 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s：无法检索到偏移量%s" -#: src/head.c:791 +#: src/head.c:673 +#, 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 的文件指针" -#: src/head.c:878 +#: src/head.c:885 #, c-format msgid "%s: %s is so large that it is not representable" msgstr "%s：%s 过大以至于无法表示" -#: src/head.c:879 +#: src/head.c:886 msgid "number of lines" msgstr "参数数目错误" -#: src/head.c:879 +#: src/head.c:886 msgid "number of bytes" msgstr "字节数" -#: src/head.c:886 src/tail.c:1947 +#: src/head.c:893 src/tail.c:1947 msgid "invalid number of lines" msgstr "无效的号码%s" -#: src/head.c:887 src/tail.c:1948 +#: src/head.c:894 src/tail.c:1948 msgid "invalid number of bytes" msgstr "无效的号码%s" -#: src/head.c:974 src/head.c:1032 +#: src/head.c:981 src/head.c:1039 #, c-format msgid "invalid trailing option -- %c" msgstr "无效的加附选项 -- %c" @@ -4596,86 +4655,86 @@ msgstr "不能得到进程环境" msgid "cannot get effective UID" msgstr "无法取消%s 的引用" -#: src/id.c:289 +#: src/id.c:311 #, fuzzy, c-format -msgid "cannot find name for user ID %lu" +msgid "cannot find name for user ID %s" msgstr "无法找到ID 为%lu 的用户的名称" -#: src/id.c:309 +#: src/id.c:329 #, fuzzy, c-format -msgid "uid=%lu" +msgid "uid=%s" msgstr "uid=%lu" -#: src/id.c:314 +#: src/id.c:334 #, fuzzy, c-format -msgid " gid=%lu" -msgstr " egid=%lu" +msgid " gid=%s" +msgstr " gid=%lu" -#: src/id.c:321 +#: src/id.c:341 #, fuzzy, c-format -msgid " euid=%lu" -msgstr " egid=%lu" +msgid " euid=%s" +msgstr " euid=%lu" -#: src/id.c:329 -#, c-format -msgid " egid=%lu" +#: src/id.c:349 +#, fuzzy, c-format +msgid " egid=%s" msgstr " egid=%lu" -#: src/id.c:357 +#: src/id.c:377 msgid " groups=" msgstr " 组=" -#: src/id.c:373 +#: src/id.c:393 #, c-format msgid " context=%s" msgstr " 环境=%s" -#: src/install.c:372 +#: src/install.c:373 #, c-format msgid "warning: %s: failed to change context to %s" msgstr "警告：%s：切换到%s 用户环境失败" -#: src/install.c:413 +#: src/install.c:414 #, c-format msgid "creating directory %s" msgstr "正在创建目录%s" -#: src/install.c:481 +#: src/install.c:482 #, c-format msgid "cannot change ownership of %s" msgstr "无法更改%s 的所有权" -#: src/install.c:505 +#: src/install.c:506 #, c-format msgid "cannot set time stamps for %s" msgstr "无法设置%s 的时间戳" -#: src/install.c:526 src/split.c:412 src/timeout.c:387 +#: src/install.c:527 src/split.c:426 src/timeout.c:439 #, c-format msgid "fork system call failed" msgstr "创建系统进程(fork)出错" -#: src/install.c:530 +#: src/install.c:531 #, c-format msgid "cannot run %s" msgstr "无法运行%s" -#: src/install.c:534 +#: src/install.c:535 #, c-format msgid "waiting for strip" msgstr "等待拆解" -#: src/install.c:536 +#: src/install.c:537 #, c-format msgid "strip process terminated abnormally" msgstr "拆解过程非正常中止" -#: src/install.c:557 +#: src/install.c:558 #, c-format msgid "invalid user %s" msgstr "无效的用户%s" -#: src/install.c:593 +#: src/install.c:594 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -4688,7 +4747,8 @@ msgstr "" "　或：%s [选项]... -t 目录 源文件...\n" "　或：%s [选项]... -d 目录...\n" -#: src/install.c:600 +#: src/install.c:601 +#, fuzzy msgid "" "\n" "This install program copies files (often just compiled) into destination\n" @@ -4700,7 +4760,6 @@ msgid "" "In the first three forms, copy SOURCE to DEST or multiple SOURCE(s) to\n" "the existing DIRECTORY, while setting permission modes and owner/group.\n" "In the 4th form, create all components of the given DIRECTORY(ies).\n" -"\n" msgstr "" "\n" "此install 将文件(通常仅是编译后的文件)复制到您所选择的目的位置。\n" @@ -4775,53 +4834,53 @@ msgstr "" " --preserve-context\t保持SELinux 的安全环境\n" " -Z, --context=CONTEXT\t\t设置文件和目录的SELinux 安全环境\n" -#: src/install.c:858 +#: src/install.c:859 #, c-format msgid "" "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled" msgstr "警告：忽略--preserve-context 参数，当前运行的内核没有启用SELinux 支持" -#: src/install.c:868 +#: src/install.c:869 #, c-format msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled" msgstr "警告：忽略--context (-Z) 参数，当前运行的内核没有启用SELinux 支持" -#: src/install.c:885 +#: src/install.c:886 #, c-format msgid "the strip option may not be used when installing a directory" msgstr "安装目录时不能用strip 选项" -#: src/install.c:888 +#: src/install.c:889 #, c-format msgid "target directory not allowed when installing a directory" msgstr "安装目录时不能用目标目录选项" -#: src/install.c:892 +#: src/install.c:893 #, c-format msgid "cannot force target context to %s and preserve it" msgstr "无法对%s 强制为目标环境，保持原样" -#: src/install.c:946 src/mkdir.c:202 src/stdbuf.c:327 +#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326 #, c-format msgid "invalid mode %s" msgstr "无效模式%s" -#: src/install.c:953 +#: src/install.c:954 #, c-format msgid "WARNING: ignoring --strip-program option as -s option was not specified" msgstr "警告：忽略--strip-program 选项，因为-s 选项没有指明" -#: src/install.c:958 +#: src/install.c:959 #, c-format msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive" msgstr "选项--compare (-C) 和--preserve-timestamps 是互斥的" -#: src/install.c:965 +#: src/install.c:966 #, c-format msgid "options --compare (-C) and --strip are mutually exclusive" msgstr "选项--compare (-C) 和--strip 是互斥的" -#: src/install.c:971 +#: src/install.c:972 #, c-format msgid "" "the --compare (-C) option is ignored when you specify a mode with non-" @@ -4829,7 +4888,7 @@ msgid "" msgstr "当您使用不允许的比特数指定模式是--compare (-C) 选项被忽略" #. This is a proper name. See the gettext manual, section Names. -#: src/join.c:40 src/sort.c:65 +#: src/join.c:40 src/sort.c:66 msgid "Mike Haertel" msgstr "Mike Haertel" @@ -4916,7 +4975,7 @@ msgstr "" #: src/join.c:403 #, c-format -msgid "%s:%ju: is not sorted: %.*s" +msgid "%s:%<PRIuMAX>: is not sorted: %.*s" msgstr "" #: src/join.c:840 src/join.c:1038 @@ -4944,12 +5003,12 @@ msgstr "不兼容的连接区块%lu，%lu" msgid "conflicting empty-field replacement strings" msgstr "有冲突的空区块替换字符串" -#: src/join.c:1101 src/sort.c:4414 +#: src/join.c:1101 src/sort.c:4468 #, c-format msgid "multi-character tab %s" msgstr "多字符标签%s" -#: src/join.c:1105 src/sort.c:4419 +#: src/join.c:1105 src/sort.c:4473 #, c-format msgid "incompatible tabs" msgstr "不兼容的标签" @@ -4971,14 +5030,13 @@ msgstr "" "　或：%s -t [信号]...\n" #: src/kill.c:82 -msgid "" -"Send signals to processes, or list signals.\n" -"\n" +#, fuzzy +msgid "Send signals to processes, or list signals.\n" msgstr "" "向进程发送信号，或是列出可用信号。\n" "\n" -#: src/kill.c:89 +#: src/kill.c:88 msgid "" " -s, --signal=SIGNAL, -SIGNAL\n" " specify the name or number of the signal to be sent\n" @@ -4991,7 +5049,7 @@ msgstr "" " -l, --list \t列出可用的信号名称，同时提供信号名与信号代码的对照\n" " -t, --table \t显示一个有关信号具体信息的表格。\n" -#: src/kill.c:97 +#: src/kill.c:96 #, fuzzy msgid "" "\n" @@ -5005,32 +5063,32 @@ msgstr "" "信号终止后的退出状态号。\n" "进程号(PID) 是一个整数，如果为负数则表示一个进程组。\n" -#: src/kill.c:206 +#: src/kill.c:205 #, c-format msgid "%s: invalid process id" msgstr "%s：无效的进程号" -#: src/kill.c:260 +#: src/kill.c:259 #, c-format msgid "invalid option -- %c" msgstr "无效的选项 -- %c" -#: src/kill.c:269 +#: src/kill.c:268 #, c-format msgid "%s: multiple signals specified" msgstr "%s：同时指定了多个信号" -#: src/kill.c:283 +#: src/kill.c:282 #, c-format msgid "multiple -l or -t options specified" msgstr "同时指定了多个-l 或-t 选项" -#: src/kill.c:300 +#: src/kill.c:299 #, c-format msgid "cannot combine signal with -l or -t" msgstr "无法将-l 或-t 选项结合使用" -#: src/kill.c:306 +#: src/kill.c:305 #, c-format msgid "no process ID specified" msgstr "未指定进程号" @@ -5141,7 +5199,6 @@ msgid "" "When creating hard links, each TARGET must exist. Symbolic links\n" "can hold arbitrary text; if later resolved, a relative link is\n" "interpreted in relation to its parent directory.\n" -"\n" msgstr "" "在第一种格式中，创建指定名称且指向指定目标链接。\n" "在第二种格式中，在当前目录创建指向目标位置的链接。\n" @@ -5151,7 +5208,7 @@ msgstr "" "当链接解析正常时，将其解析为一个与其父目录关联的链接。\n" "\n" -#: src/ln.c:395 +#: src/ln.c:394 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -5168,7 +5225,7 @@ msgstr "" " -d, -F, --directory\t\t创建指向目录的硬链接(只适用于超级用户)\n" " -f, --force\t\t\t强行删除任何已存在的目标文件\n" -#: src/ln.c:403 +#: src/ln.c:402 #, fuzzy msgid "" " -i, --interactive prompt whether to remove destinations\n" @@ -5187,7 +5244,7 @@ msgstr "" "\t\t\t\t接备份或删除\n" " -s, --symbolic\t\t创建符号链接而非硬链接\n" -#: src/ln.c:412 +#: src/ln.c:411 #, fuzzy msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -5202,24 +5259,10 @@ msgstr "" " -T, --no-target-directory\t将链接名称当作普通文件\n" " -v, --verbose\t\t链接前先列出每个文件的名称\n" -#: src/ln.c:428 -#, 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" - -#: src/ln.c:435 +#: src/ln.c:433 #, fuzzy, 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 "" @@ -5293,7 +5336,7 @@ msgstr "忽略无效的环境变量 COLUMNS 所示的宽度值：%s" msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "忽略无效的环境变量 TABSIZE 所示的制表符尺寸值：%s" -#: src/ls.c:1750 src/ptx.c:1976 +#: src/ls.c:1750 src/ptx.c:1975 #, c-format msgid "invalid line width: %s" msgstr "无效的行宽：%s" @@ -5357,7 +5400,7 @@ msgstr "正在读取目录%s" msgid "closing directory %s" msgstr "关闭目录%s" -#: src/ls.c:3301 +#: src/ls.c:3302 #, c-format msgid "cannot compare file names %s and %s" msgstr "无法比较文件名%s 和 %s" @@ -5367,13 +5410,12 @@ msgstr "无法比较文件名%s 和 %s" msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" -"\n" msgstr "" "列出 FILE 的信息(默认为当前目录)。\n" "如果不指定-cftuvSUX 或--sort 选项，则根据字母大小排序。\n" "\n" -#: src/ls.c:4729 +#: src/ls.c:4728 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -5386,7 +5428,7 @@ msgstr "" " --author\t\t\t与-l 同时使用时列出每个文件的作者\n" " -b, --escape\t\t\t以八进制溢出序列表示不可打印的字符\n" -#: src/ls.c:4735 +#: src/ls.c:4734 #, fuzzy msgid "" " --block-size=SIZE scale sizes by SIZE before printing them. E." @@ -5407,7 +5449,7 @@ msgstr "" "\t\t\t\t状态最后更改的时间)\n" "\t\t\t\t配合-l：显示ctime 但根据名称排序\t\t\t\t其他情况：按ctime 排序\n" -#: src/ls.c:4745 +#: src/ls.c:4744 #, fuzzy msgid "" " -C list entries by columns\n" @@ -5425,7 +5467,7 @@ msgstr "" " -d, --directory\t\t当遇到目录时列出目录本身而非目录内的文件\n" " -D, --dired\t\t\t产生适合Emacs 的dired 模式使用的结果\n" -#: src/ls.c:4753 +#: src/ls.c:4752 #, fuzzy msgid "" " -f do not sort, enable -aU, disable -ls --color\n" @@ -5441,11 +5483,11 @@ msgstr "" "\t\t\t\t单栏-1，详细-l，垂直-C\n" " --full-time\t\t即-l --time-style=full-iso\n" -#: src/ls.c:4761 +#: src/ls.c:4760 msgid " -g like -l, but do not list owner\n" msgstr " -g\t\t\t\t类似-l，但不列出所有者\n" -#: src/ls.c:4764 +#: src/ls.c:4763 msgid "" " --group-directories-first\n" " group directories before files.\n" @@ -5456,7 +5498,7 @@ msgstr "" "\t\t\t在文件前分组目录。此选项可与--sort 一起使用，\n" "\t\t\t但是一旦使用--sort=none (-U)将禁用分组\n" -#: src/ls.c:4770 +#: src/ls.c:4769 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" @@ -5468,7 +5510,7 @@ msgstr "" "\t\t\t\t(例如 1K 234M 2G)\n" " --si\t\t\t同上面类似，但是使用1000 为基底而非1024\n" -#: src/ls.c:4776 +#: src/ls.c:4775 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5487,7 +5529,7 @@ msgstr "" " --hide=PATTERN \t隐藏符合PATTERN 模式的项目\n" "\t\t\t\t(-a 或 -A 将覆盖此选项)\n" -#: src/ls.c:4786 +#: src/ls.c:4785 #, fuzzy msgid "" " --indicator-style=WORD append indicator with style WORD to entry " @@ -5505,7 +5547,7 @@ msgstr "" " -I, --ignore=PATTERN\t\t不显示任何符合指定shell PATTERN 的项目\n" " -k\t\t\t\t即--block-size=1K\n" -#: src/ls.c:4796 +#: src/ls.c:4795 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5519,7 +5561,7 @@ msgstr "" "\t\t\t\t的对象而并非符号链接本身的信息\n" " -m\t\t\t\t所有项目以逗号分隔，并填满整行行宽\n" -#: src/ls.c:4804 +#: src/ls.c:4803 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. " @@ -5534,7 +5576,7 @@ msgstr "" " -o\t\t\t\t类似 -l，但不列出有关组的信息\n" " -p, --indicator-style=slash\t对目录加上表示符号\"/\"\n" -#: src/ls.c:4812 +#: src/ls.c:4811 #, fuzzy msgid "" " -q, --hide-control-chars print ? instead of non graphic characters\n" @@ -5553,7 +5595,7 @@ msgstr "" " --quoting-style=方式\t使用指定的quoting 方式显示条目的名称：\n" "\t\t\t\tliteral、locale、shell、shell-always、c、escape\n" -#: src/ls.c:4821 +#: src/ls.c:4820 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -5564,7 +5606,7 @@ msgstr "" " -R, --recursive\t\t递归显示子目录\n" " -s, --size\t\t\t以块数形式显示每个文件分配的尺寸\n" -#: src/ls.c:4826 +#: src/ls.c:4825 msgid "" " -S sort by file size\n" " --sort=WORD sort by WORD instead of name: none -U,\n" @@ -5586,7 +5628,7 @@ msgstr "" "\t\t\t\t间：atime、access、use、ctime 或status；加上\n" "\t\t\t\t--sort=time 选项时会以指定时间作为排序关键字\n" -#: src/ls.c:4836 +#: src/ls.c:4835 #, fuzzy msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" @@ -5608,7 +5650,7 @@ msgstr "" " -t\t\t\t\t根据修改时间排序\n" " -T, --tabsize=宽度\t指定制表符(Tab)的宽度，而非8 个字符\n" -#: src/ls.c:4845 +#: src/ls.c:4844 #, fuzzy msgid "" " -t sort by modification time, newest first\n" @@ -5617,7 +5659,7 @@ msgstr "" " -t\t\t\t按修改时间排序\n" " -T, --tabsize=COLS\t指定制表符(Tab)的宽度，而非8个字符\n" -#: src/ls.c:4849 +#: src/ls.c:4848 msgid "" " -u with -lt: sort by, and show, access time\n" " with -l: show access time and sort by name\n" @@ -5631,7 +5673,7 @@ msgstr "" " -U\t\t\t不进行排序；按照目录顺序列出项目\n" " -v\t\t\t在文本中进行数字(版本)的自然排序\n" -#: src/ls.c:4856 +#: src/ls.c:4855 msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" @@ -5645,7 +5687,7 @@ msgstr "" " -X\t\t\t根据扩展名排序\n" " -1\t\t\t每行只列出一个文件\n" -#: src/ls.c:4866 +#: src/ls.c:4865 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5660,7 +5702,7 @@ msgstr "" "LS_COLORS 环境变量可改变此设置，可使用 dircolors 命令来设置。\n" "\n" -#: src/ls.c:4873 +#: src/ls.c:4872 msgid "" "\n" "Exit status:\n" @@ -5689,7 +5731,7 @@ msgstr "Scott Miller" msgid "David Madore" msgstr "David Madore" -#: src/md5sum.c:162 +#: src/md5sum.c:164 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -5702,31 +5744,35 @@ msgstr "" "若没有文件选项，或者文件处为\"-\"，则从标准输入读取。\n" "\n" -#: src/md5sum.c:172 +#: src/md5sum.c:174 msgid "" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr " -b, --binary\t\t以二进制模式读取(除非从tty 标准输入读取否则为默认)\n" -#: src/md5sum.c:176 +#: src/md5sum.c:178 msgid " -b, --binary read in binary mode\n" msgstr " -b, --binary\t\t以二进制模式读取\n" -#: src/md5sum.c:179 +#: src/md5sum.c:181 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr " -c, --check\t\t从文件中读取%s 的校验值并予以检查\n" -#: src/md5sum.c:183 +#: src/md5sum.c:184 +msgid " --tag create a BSD-style checksum\n" +msgstr "" + +#: src/md5sum.c:188 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr " -t, --text\t\t以纯文本模式读取(从tty 标准输入读取时为默认)\n" -#: src/md5sum.c:187 +#: src/md5sum.c:192 msgid " -t, --text read in text mode (default)\n" msgstr " -t, --text\t\t以纯文本模式读取(默认)\n" -#: src/md5sum.c:190 +#: src/md5sum.c:195 msgid "" "\n" "The following three options are useful only when verifying checksums:\n" @@ -5742,12 +5788,12 @@ msgstr "" " -w, --warn\t\t对格式不准确的校验和行进行警告\n" "\n" -#: src/md5sum.c:198 +#: src/md5sum.c:203 msgid "" " --strict with --check, exit non-zero for any invalid input\n" msgstr "" -#: src/md5sum.c:203 +#: src/md5sum.c:208 #, fuzzy, c-format msgid "" "\n" @@ -5761,74 +5807,84 @@ msgstr "" "样板格式相同。默认的输出模式时输出一行校验和的校验结果，并有一个字符来\n" "表示文件类型(\"*\"代表二进制，\" \"代表纯文本)，并同时显示每个文件的名称。\n" -#: src/md5sum.c:502 +#: src/md5sum.c:523 #, c-format msgid "%s: too many checksum lines" msgstr "%s：校验和的行数过多" -#: src/md5sum.c:526 +#: src/md5sum.c:547 #, c-format msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line" msgstr "%s：%<PRIuMAX>：%s 的校验和行目格式不适当" -#: src/md5sum.c:551 +#: src/md5sum.c:572 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s：打开或读取失败\n" -#: src/md5sum.c:574 +#: src/md5sum.c:595 msgid "FAILED" msgstr "失败" -#: src/md5sum.c:576 +#: src/md5sum.c:597 msgid "OK" msgstr "确定" -#: src/md5sum.c:600 +#: src/md5sum.c:621 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "%s：找不到格式适用的%s 校验和" -#: src/md5sum.c:610 +#: src/md5sum.c:631 #, c-format msgid "WARNING: %<PRIuMAX> line is improperly formatted" msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted" msgstr[0] "警告：%<PRIuMAX> 行的格式不适当" -#: src/md5sum.c:618 +#: src/md5sum.c:639 #, 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:626 +#: src/md5sum.c:647 #, 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:704 +#: src/md5sum.c:760 +#, c-format +msgid "--tag does not support --text mode" +msgstr "" + +#: src/md5sum.c:766 +#, fuzzy, c-format +msgid "the --tag option is meaningless when verifying checksums" +msgstr "只有在校验时--status 选项才有意义" + +#: src/md5sum.c:773 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" msgstr "在校验时--binary 和--text 选项是无意义的" -#: src/md5sum.c:712 +#: src/md5sum.c:781 #, c-format msgid "the --status option is meaningful only when verifying checksums" msgstr "只有在校验时--status 选项才有意义" -#: src/md5sum.c:719 +#: src/md5sum.c:788 #, c-format msgid "the --warn option is meaningful only when verifying checksums" msgstr "只有在校验时--warn 选项才有意义" -#: src/md5sum.c:726 +#: src/md5sum.c:795 #, c-format msgid "the --quiet option is meaningful only when verifying checksums" msgstr "只有在校验时--quiet 选项才有意义" -#: src/md5sum.c:733 +#: src/md5sum.c:802 #, fuzzy, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "只有在校验时--status 选项才有意义" @@ -5839,14 +5895,13 @@ msgid "Usage: %s [OPTION]... DIRECTORY...\n" msgstr "用法：%s [选项]... 目录...\n" #: src/mkdir.c:57 -msgid "" -"Create the DIRECTORY(ies), if they do not already exist.\n" -"\n" +#, fuzzy +msgid "Create the DIRECTORY(ies), if they do not already exist.\n" msgstr "" "若指定目录不存在则创建目录。\n" "\n" -#: src/mkdir.c:64 +#: src/mkdir.c:63 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" @@ -5860,7 +5915,7 @@ msgstr "" " -v, --verbose \t每次创建新目录都显示信息\n" " -Z, --context=CTX \t将每个创建的目录的SELinux 安全环境设置为CTX\n" -#: src/mkdir.c:169 +#: src/mkdir.c:168 #, c-format msgid "created directory %s" msgstr "已创建目录 %s" @@ -5871,30 +5926,29 @@ msgid "Usage: %s [OPTION]... NAME...\n" msgstr "用法：%s [选项]... 名称...\n" #: src/mkfifo.c:52 -msgid "" -"Create named pipes (FIFOs) with the given NAMEs.\n" -"\n" +#, fuzzy +msgid "Create named pipes (FIFOs) with the given NAMEs.\n" msgstr "" "以指定的名称创建先进先出文件(FIFO)。\n" "\n" -#: src/mkfifo.c:59 src/mknod.c:61 +#: src/mkfifo.c:58 src/mknod.c:60 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:62 +#: src/mkfifo.c:61 msgid "" " -Z, --context=CTX set the SELinux security context of each NAME to CTX\n" msgstr " -Z, --context=CTX \t将每个创建的目录的SELinux 安全环境设置为CTX\n" -#: src/mkfifo.c:122 src/mknod.c:128 +#: src/mkfifo.c:121 src/mknod.c:127 #, c-format msgid "invalid mode" msgstr "无效的权限模式" -#: src/mkfifo.c:127 src/mknod.c:133 +#: src/mkfifo.c:126 src/mknod.c:132 #, c-format msgid "mode must specify only file permission bits" msgstr "模式必须只指定文件许可位" @@ -5905,18 +5959,17 @@ msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n" msgstr "用法：%s [选项]... 名称 类型 [主设备号 次设备号]\n" #: src/mknod.c:54 -msgid "" -"Create the special file NAME of the given TYPE.\n" -"\n" +#, fuzzy +msgid "Create the special file NAME of the given TYPE.\n" msgstr "" "创建指定类型和名称的特殊文件。\n" "\n" -#: src/mknod.c:64 +#: 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:69 +#: src/mknod.c:68 msgid "" "\n" "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n" @@ -5930,7 +5983,7 @@ msgstr "" "解析；如果以\"0\"开头，则被视作八进制数；其余情况下被视作十进制数。\n" "可用的类型包括：\n" -#: src/mknod.c:76 +#: src/mknod.c:75 msgid "" "\n" " b create a block (buffered) special file\n" @@ -5942,40 +5995,40 @@ msgstr "" " c, u 创建(没有缓冲的)字符特殊文件\n" " p 创建先进先出(FIFO)特殊文件\n" -#: src/mknod.c:151 +#: src/mknod.c:150 msgid "Special files require major and minor device numbers." msgstr "创建块设备文件时，必需指定主、次设备号。" -#: src/mknod.c:161 +#: src/mknod.c:160 msgid "Fifos do not have major and minor device numbers." msgstr "先进先出(FIFO)文件不需要指定主、次设备号。" -#: src/mknod.c:177 +#: src/mknod.c:176 #, c-format msgid "block special files not supported" msgstr "不支持区块特殊文件" -#: src/mknod.c:186 +#: src/mknod.c:185 #, c-format msgid "character special files not supported" msgstr "不支持字符特殊文件" -#: src/mknod.c:202 +#: src/mknod.c:201 #, c-format msgid "invalid major device number %s" msgstr "无效的主设备号 %s" -#: src/mknod.c:207 +#: src/mknod.c:206 #, c-format msgid "invalid minor device number %s" msgstr "无效的次设备号 %s" -#: src/mknod.c:212 +#: src/mknod.c:211 #, c-format msgid "invalid device %s %s" msgstr "无效的设备文件%s %s" -#: src/mknod.c:226 +#: src/mknod.c:225 #, c-format msgid "invalid device type %s" msgstr "无效的设备类型 %s" @@ -6052,60 +6105,59 @@ msgstr "" "\t\t\t(如果设置了该参数的话)；此目录也可以通过-p 指定；还可\n" "\t\t\t以通过/tmp指定[不推荐]\n" -#: src/mktemp.c:222 +#: src/mktemp.c:223 #, c-format msgid "failed to redirect stderr to /dev/null" msgstr "重定向标准错误到/dev/null 失败" -#: src/mktemp.c:228 +#: src/mktemp.c:229 #, c-format msgid "too many templates" msgstr "模板过多" -#: src/mktemp.c:248 +#: src/mktemp.c:249 #, c-format msgid "with --suffix, template %s must end in X" msgstr "使用 --suffix，模板 %s 必须以 X 结尾" -#: src/mktemp.c:273 src/split.c:1117 +#: src/mktemp.c:274 src/split.c:1130 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "无效后缀 %s，含有目录分隔符" -#: src/mktemp.c:278 +#: src/mktemp.c:279 #, c-format msgid "too few X's in template %s" msgstr "模板%s 中X 太少" -#: src/mktemp.c:291 +#: src/mktemp.c:292 #, c-format msgid "invalid template, %s, contains directory separator" msgstr "无效模板，%s，包含目录分隔符" -#: src/mktemp.c:305 +#: src/mktemp.c:306 #, c-format msgid "invalid template, %s; with --tmpdir, it may not be absolute" msgstr "无效模板，%s；如果与--tmpdir 同时使用则不可以是绝对路径" -#: src/mktemp.c:325 +#: src/mktemp.c:326 #, c-format msgid "failed to create directory via template %s" msgstr "无法通过模板%s 创建目录" -#: src/mktemp.c:335 +#: src/mktemp.c:336 #, c-format msgid "failed to create file via template %s" msgstr "无法通过模板%s 创建文件" -#: src/mv.c:290 -msgid "" -"Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" -"\n" +#: src/mv.c:292 +#, fuzzy +msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" msgstr "" "将源文件重命名为目标文件，或将源文件移动至指定目录。\n" "\n" -#: src/mv.c:297 +#: src/mv.c:298 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -6124,7 +6176,7 @@ msgstr "" " -n, --no-clobber 不覆盖已存在文件\n" "如果您指定了-i、-f、-n 中的多个，仅最后一个生效。\n" -#: src/mv.c:306 +#: src/mv.c:307 msgid "" " --strip-trailing-slashes remove any trailing slashes from each " "SOURCE\n" @@ -6134,7 +6186,7 @@ msgstr "" " --strip-trailing-slashes\t去掉每个源文件参数尾部的斜线\n" " -S, --suffix=SUFFIX\t\t替换常用的备份文件后缀\n" -#: src/mv.c:311 +#: src/mv.c:312 msgid "" " -t, --target-directory=DIRECTORY move all SOURCE arguments into " "DIRECTORY\n" @@ -6157,13 +6209,11 @@ msgid "Usage: %s [OPTION] [COMMAND [ARG]...]\n" msgstr "用法：%s [选项] [命令 [参数]...]\n" #: src/nice.c:73 -#, c-format +#, fuzzy, c-format msgid "" "Run COMMAND with an adjusted niceness, which affects process scheduling.\n" -"With no COMMAND, print the current niceness. Nicenesses range from\n" -"%d (most favorable scheduling) to %d (least favorable).\n" -"\n" -" -n, --adjustment=N add integer N to the niceness (default 10)\n" +"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 "" "以指定的优先级运行命令，这会影响相应进程的调度。\n" "如果不指定命令，程序会显示当前的优先级。优先级的范围是从 %d\n" @@ -6171,22 +6221,26 @@ msgstr "" "\n" " -n, --adjustment=N 对优先级数值加上指定整数N (默认为10)\n" -#: src/nice.c:168 +#: src/nice.c:82 +msgid " -n, --adjustment=N add integer N to the niceness (default 10)\n" +msgstr "" + +#: src/nice.c:172 #, c-format msgid "invalid adjustment %s" msgstr "无效的调整值%s" -#: src/nice.c:177 +#: src/nice.c:181 #, c-format msgid "a command must be given with an adjustment" msgstr "命令必须和调整值配合指定" -#: src/nice.c:184 src/nice.c:195 +#: src/nice.c:188 src/nice.c:199 #, c-format msgid "cannot get niceness" msgstr "无法获取优先级" -#: src/nice.c:201 +#: src/nice.c:205 #, c-format msgid "cannot set niceness" msgstr "无法设置优先级" @@ -6196,17 +6250,17 @@ msgstr "无法设置优先级" msgid "Scott Bartram" msgstr "Scott Bartram" -#: src/nl.c:186 +#: 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" -"\n" msgstr "" "将指定的各个文件添加行号标注后写到标准输出。\n" "如果不指定文件或指定文件为\"-\" ，程序将从标准输入读取数据。\n" "\n" -#: src/nl.c:194 +#: src/nl.c:186 msgid "" " -b, --body-numbering=STYLE use STYLE for numbering body lines\n" " -d, --section-delimiter=CC use CC for separating logical pages\n" @@ -6216,7 +6270,7 @@ msgstr "" " -d, --section-delimiter=CC\t使用指定的CC 分割逻辑页数\n" " -f, --footer-numbering=样式\t使用指定样式编号文件的页脚行目\n" -#: src/nl.c:199 +#: src/nl.c:191 msgid "" " -h, --header-numbering=STYLE use STYLE for numbering header lines\n" " -i, --line-increment=NUMBER line number increment at each line\n" @@ -6234,7 +6288,7 @@ msgstr "" " -p, --no-renumber\t\t在逻辑页数切换时不将行号值复位\n" " -s, --number-separator=字符串\t可能的话在行号后添加字符串\n" -#: src/nl.c:207 +#: src/nl.c:199 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" @@ -6242,7 +6296,7 @@ msgstr "" " -v, --starting-line-number=数字\t每个逻辑页上的第一行的行号\n" " -w, --number-width=数字\t为行号使用指定的栏数\n" -#: src/nl.c:213 +#: src/nl.c:205 msgid "" "\n" "By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC are\n" @@ -6254,7 +6308,7 @@ msgstr "" "逻辑页数的两个分界符，其中缺失的第二个字符暗含了\":\"，如果您要指定\"\\\"，\n" "请输入\"\\\\\"。可用的样式如下：\n" -#: src/nl.c:219 +#: src/nl.c:211 msgid "" "\n" " a number all lines\n" @@ -6283,52 +6337,47 @@ msgstr "" " rz \t右对齐，空格用0 填充\n" "\n" -#: src/nl.c:286 +#: src/nl.c:278 #, c-format msgid "line number overflow" msgstr "行号溢出" -#: src/nl.c:486 +#: src/nl.c:478 #, c-format msgid "invalid header numbering style: %s" msgstr "无效的页眉号样式：%s" -#: src/nl.c:494 +#: src/nl.c:486 #, c-format msgid "invalid body numbering style: %s" msgstr "无效的正文号样式：%s" -#: src/nl.c:502 +#: src/nl.c:494 #, c-format msgid "invalid footer numbering style: %s" msgstr "无效的页脚号样式：%s" -#: src/nl.c:511 +#: src/nl.c:503 #, c-format msgid "invalid starting line number: %s" msgstr "无效的起始行号：%s" -#: src/nl.c:517 -#, c-format -msgid "WARNING: --page-increment is deprecated; use --line-increment instead" -msgstr "警告：不推荐使用--page-increment，请使用--line-increment" - -#: src/nl.c:524 +#: src/nl.c:512 #, c-format msgid "invalid line number increment: %s" msgstr "无效的行号递增值：%s" -#: src/nl.c:536 +#: src/nl.c:524 #, c-format msgid "invalid number of blank lines: %s" msgstr "无效的空行数：%s" -#: src/nl.c:550 +#: src/nl.c:538 #, c-format msgid "invalid line number field width: %s" msgstr "无效的行宽数值：%s" -#: src/nl.c:569 +#: src/nl.c:557 #, c-format msgid "invalid line numbering format: %s" msgstr "无效的编号格式：%s" @@ -6377,11 +6426,6 @@ msgstr "标准输入不可用，无法重定向" msgid "ignoring input" msgstr "忽略输入" -#: src/nohup.c:163 src/nohup.c:165 -#, c-format -msgid "failed to open %s" -msgstr "打开%s 失败" - #: src/nohup.c:175 #, c-format msgid "ignoring input and appending output to %s" @@ -6413,16 +6457,16 @@ msgid "failed to redirect standard error" msgstr "重定向标准错误失败" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:32 +#: src/nproc.c:33 msgid "Giuseppe Scrivano" msgstr "Giuseppe Scrivano" -#: src/nproc.c:56 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 +#: src/nproc.c:57 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "用法：%s [选项]...\n" -#: src/nproc.c:57 +#: src/nproc.c:58 msgid "" "Print the number of processing units available to the current process,\n" "which may be less than the number of online processors\n" @@ -6432,7 +6476,7 @@ msgstr "" "此数目可能小于实际工作数\n" "\n" -#: src/nproc.c:62 +#: src/nproc.c:63 msgid "" " --all print the number of installed processors\n" " --ignore=N if possible, exclude N processing units\n" @@ -6440,11 +6484,348 @@ msgstr "" " --all 打印所拥有的处理器数目\n" " --ignore=N 如果有可能，忽略 N 个处理器\n" -#: src/nproc.c:106 +#: src/nproc.c:107 #, c-format msgid "%s: invalid number to ignore" msgstr "%s：无效的忽略数" +#. This is a proper name. See the gettext manual, section Names. +#: src/numfmt.c:35 +msgid "Assaf Gordon" +msgstr "" + +#: src/numfmt.c:676 +#, fuzzy, c-format +msgid "value too large to be converted: '%s'" +msgstr "%s：给定值不能完全转换" + +#: src/numfmt.c:680 +#, fuzzy, c-format +msgid "invalid number: '%s'" +msgstr "无效的数字%s" + +#: src/numfmt.c:684 +#, c-format +msgid "rejecting suffix in input: '%s' (consider using --from)" +msgstr "" + +#: src/numfmt.c:688 +#, fuzzy, c-format +msgid "invalid suffix in input: '%s'" +msgstr "非法的后缀在%s%s 参数\"%s\"" + +#: src/numfmt.c:692 +#, c-format +msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)" +msgstr "" + +#: src/numfmt.c:723 +#, fuzzy, c-format +msgid "failed to prepare value '%Lf' for printing" +msgstr "%s：无法以写模式打开" + +#: src/numfmt.c:787 +#, fuzzy, c-format +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 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [NUMBER]...\n" +msgstr "用法: %s [选项]... [用户]...\n" + +#: src/numfmt.c:816 +msgid "" +"Reformat NUMBER(s), or the numbers from standard input if none are " +"specified.\n" +msgstr "" + +#: src/numfmt.c:820 +msgid " --debug print warnings about invalid input\n" +msgstr "" + +#: src/numfmt.c:823 +msgid "" +" -d, --delimiter=X use X instead of whitespace for field delimiter\n" +msgstr "" + +#: src/numfmt.c:826 +msgid "" +" --field=N replace the number in input field N (default is 1)\n" +msgstr "" + +#: src/numfmt.c:829 +msgid "" +" --format=FORMAT use printf style floating-point FORMAT;\n" +" see FORMAT below for details\n" +msgstr "" + +#: src/numfmt.c:833 +msgid "" +" --from=UNIT auto-scale input numbers to UNITs; default is " +"'none';\n" +" see UNIT below\n" +msgstr "" + +#: src/numfmt.c:837 +msgid "" +" --from-unit=N specify the input unit size (instead of the default " +"1)\n" +msgstr "" + +#: src/numfmt.c:840 +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 "" + +#: src/numfmt.c:844 +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 +msgid "" +" --invalid=MODE failure mode for invalid numbers: MODE can be:\n" +" abort (default), fail, warn, ignore\n" +msgstr "" + +#: src/numfmt.c:852 +msgid "" +" --padding=N pad the output to N characters; positive N will\n" +" right-align; negative N will left-align;\n" +" padding is ignored if the output is wider than N;\n" +" the default is to automatically pad if a " +"whitespace\n" +" is found\n" +msgstr "" + +#: src/numfmt.c:859 +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 +msgid "" +" --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" +" SUFFIX in input numbers\n" +msgstr "" + +#: src/numfmt.c:867 +msgid "" +" --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" +msgstr "" + +#: src/numfmt.c:870 +msgid "" +" --to-unit=N the output unit size (instead of the default 1)\n" +msgstr "" + +#: src/numfmt.c:877 +#, fuzzy +msgid "" +"\n" +"UNIT options:\n" +msgstr "" +"其他选项：\n" +"\n" + +#: src/numfmt.c:880 +msgid " none no auto-scaling is done; suffixes will trigger an error\n" +msgstr "" + +#: src/numfmt.c:883 +msgid "" +" auto accept optional single/two letter suffix:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" +msgstr "" + +#: src/numfmt.c:889 +msgid "" +" si accept optional single letter suffix:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:894 +msgid "" +" iec accept optional single letter suffix:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:899 +msgid "" +" iec-i accept optional two-letter suffix:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:905 +#, 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" +msgstr "" + +#: src/numfmt.c:912 +#, c-format +msgid "" +"\n" +"Exit status is 0 if all input numbers were successfully converted.\n" +"By default, %s will stop at the first conversion error with exit status 2.\n" +"With --invalid='fail' a warning is printed for each conversion error\n" +"and the exit status is 2. With --invalid='warn' each conversion error is\n" +"diagnosed, but the exit status is 0. With --invalid='ignore' conversion\n" +"errors are not diagnosed and the exit status is 0.\n" +msgstr "" + +#: src/numfmt.c:921 +#, c-format +msgid "" +"\n" +"Examples:\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" +msgstr "" + +#: src/numfmt.c:974 src/seq.c:212 +#, c-format +msgid "format %s has no %% directive" +msgstr "格式%s 没有%% 指令" + +#: src/numfmt.c:990 +#, fuzzy, c-format +msgid "invalid format %s (width overflow)" +msgstr "无效的格式宽度" + +#: src/numfmt.c:1007 src/seq.c:229 +#, c-format +msgid "format %s ends in %%" +msgstr "格式%s 以%% 结束" + +#: src/numfmt.c:1010 +#, c-format +msgid "invalid format %s, directive must be %%['][-][N]f" +msgstr "" + +#: src/numfmt.c:1018 src/seq.c:236 +#, c-format +msgid "format %s has too many %% directives" +msgstr "格式%s 中%% 指令过多" + +#: src/numfmt.c:1070 +#, fuzzy, c-format +msgid "invalid suffix in input '%s': '%s'" +msgstr "非法的后缀在%s%s 参数\"%s\"" + +#: src/numfmt.c:1092 +#, c-format +msgid "value too large to be printed: '%Lg' (consider using --to)" +msgstr "" + +#: src/numfmt.c:1100 +#, c-format +msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" +msgstr "" + +#: src/numfmt.c:1184 +#, c-format +msgid "large input value '%s': possible precision loss" +msgstr "" + +#: src/numfmt.c:1293 +#, 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 "页码范围%s 无效" + +#: src/numfmt.c:1401 +#, fuzzy, c-format +msgid "invalid field value '%s'" +msgstr "无效的区块编号%s" + +#: src/numfmt.c:1430 +#, fuzzy, c-format +msgid "invalid header value '%s'" +msgstr "无效的日期%s" + +#: src/numfmt.c:1456 +#, 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 +#, fuzzy, c-format +msgid "no conversion option specified" +msgstr "指定了多个-i 选项" + +#: src/numfmt.c:1471 +#, fuzzy, c-format +msgid "grouping cannot be combined with --to" +msgstr "文件操作数不能于--files0-from 参数一起使用" + +#: src/numfmt.c:1473 +#, c-format +msgid "grouping has no effect in this locale" +msgstr "" + +#: src/numfmt.c:1486 +#, c-format +msgid "--header ignored with command-line input" +msgstr "" + +#: src/numfmt.c:1511 +#, fuzzy, c-format +msgid "error reading input" +msgstr "读取%s 时出错" + +#: src/numfmt.c:1520 +#, fuzzy, c-format +msgid "failed to convert some of the input numbers" +msgstr "标准输入不可用，无法重定向" + #: src/od.c:294 #, c-format msgid "" @@ -6473,27 +6854,44 @@ msgstr "" "\n" #: src/od.c:307 -msgid "All arguments to long options are mandatory for short options.\n" -msgstr "长选项必须用的参数在使用短选项时也是必须的。\n" +#, fuzzy +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" +"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" +"at first byte printed, incremented when dump is progressing.\n" +"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" +"(如果有两个运算量)的情况下采用第二种格式。\n" +"偏移量是指 -j 偏移量。标签是第一个字节的伪地址，\n" +"随着累积过程递增。偏移量和标签如果冠以\"0x\"或\"0X\"前缀则\n" +"表示十六进制数；后缀\".\"代表八进制数，后缀\"b\"表示乘以 512。\n" -#: src/od.c:310 +#: src/od.c:318 +#, fuzzy msgid "" -" -A, --address-radix=RADIX decide how file offsets are printed\n" +" -A, --address-radix=RADIX output format for file offsets. RADIX is one\n" +" of [doxn], for Decimal, Octal, Hex or None\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:314 +#: src/od.c:323 #, 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" -" --traditional accept arguments in traditional form\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=字节数\t限制要转储的输入字节为指定的字节数\n" " -S, --strings[=字节数]\t输出至少包含指定字节数的字符相应的字串\n" @@ -6502,9 +6900,11 @@ msgstr "" " -w, --width[=字节数]\t\t每一行只输出指定的字节数\n" " --traditional\t\t接受传统形式提交的参数\n" -#: src/od.c:324 +#: src/od.c:336 +#, fuzzy 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" @@ -6518,7 +6918,7 @@ msgstr "" " -c\t即 -t c， 使用ASCII 字符，或者反斜杠正名的特殊字符\n" " -d\t即 -t u2，使用无符号十进制双字节字符\n" -#: src/od.c:332 +#: src/od.c:345 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -6534,28 +6934,12 @@ msgstr "" " -s\t即 -t d2，指定双字节单位十进制数的对照输出格式\n" " -x\t即 -t x2，指定双字节单位十六进制数的对照输出格式\n" -#: src/od.c:340 +#: src/od.c:353 +#, fuzzy msgid "" "\n" -"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" -"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" -"at first byte printed, incremented when dump is progressing.\n" -"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" -"(如果有两个运算量)的情况下采用第二种格式。\n" -"偏移量是指 -j 偏移量。标签是第一个字节的伪地址，\n" -"随着累积过程递增。偏移量和标签如果冠以\"0x\"或\"0X\"前缀则\n" -"表示十六进制数；后缀\".\"代表八进制数，后缀\"b\"表示乘以 512。\n" - -#: src/od.c:349 -msgid "" "\n" "TYPE is made up of one or more of these specifications:\n" -"\n" " a named character, ignoring high-order bit\n" " c ASCII character or backslash escape\n" msgstr "" @@ -6565,7 +6949,7 @@ msgstr "" " a\t\t重定义字符，忽略高位字节\n" " c\t\tASCII 码字符或者是反斜线字串(如\\n)\n" -#: src/od.c:356 +#: src/od.c:360 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -6579,10 +6963,11 @@ msgstr "" " u[尺寸]\t无符号十进制数，每个整形数占指定尺寸的字节\n" " x[尺寸]\t十六进制数，每个整形数占指定尺寸的字节\n" -#: src/od.c:363 +#: src/od.c:367 +#, fuzzy msgid "" "\n" -"SIZE is a number. For TYPE in doux, SIZE may also be C for\n" +"SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" "sizeof(char), S for sizeof(short), I for sizeof(int) or L for\n" "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" @@ -6595,40 +6980,37 @@ msgstr "" "F 代表 sizeof(float)、D 代表sizeof(double)，或 L 代表\n" "sizeof(long double)。\n" -#: src/od.c:370 +#: src/od.c:374 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" +"Adding a z suffix to any type displays printable characters at the end of\n" +"each output line.\n" msgstr "" -"\n" -"当 RADIX 为\"d\"时代表十进制，为\"o\"时代表八进制，为\"x\"时代表十六进制，\n" -"\"n\"则代表无。\n" -"BYTES 是以0x 或0X 为前缀的十六进制数，可能有以下几种后缀：\n" -"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" -"为任何类型添加\"z\"后缀都将在每个输出行的行尾显示可显示字符\n" -#: src/od.c:380 +#: src/od.c:379 +#, 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" +"\n" +"\n" +"BYTES is hex with 0x or 0X prefix, and may have a multiplier suffix:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"and so on for G, T, P, E, Z, Y.\n" msgstr "" -"不带数字的--string 选项代表3；不带数字的--width 选项代表32。\n" -"默认情况下od 使用 -A o -t oS -w16 参数。\n" +"\n" +"K 后面可以跟乘号:\n" +"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:633 src/od.c:753 +#: src/od.c:639 src/od.c:759 #, c-format msgid "invalid type string %s" msgstr "无效类型的字符串%s" -#: src/od.c:643 +#: src/od.c:649 #, c-format msgid "" "invalid type string %s;\n" @@ -6637,7 +7019,7 @@ msgstr "" "无效的类型字符串%s；\n" "系统无法提供对%lu-字节整形类型数值的支持" -#: src/od.c:764 +#: src/od.c:770 #, c-format msgid "" "invalid type string %s;\n" @@ -6646,36 +7028,36 @@ msgstr "" "无效的类型字符串%s；\n" "系统无法提供对%lu-字节浮点类型数值的支持" -#: src/od.c:822 +#: src/od.c:828 #, fuzzy, c-format msgid "invalid character '%c' in type string %s" msgstr "无效字符\"%c\"出现在类型字符串%s 中" -#: src/od.c:1047 +#: src/od.c:1053 #, c-format msgid "cannot skip past end of combined input" msgstr "无法略过输入内容的报尾" -#: src/od.c:1603 +#: src/od.c:1609 #, fuzzy, c-format msgid "invalid output address radix '%c'; it must be one character from [doxn]" msgstr "无效的输出地址基数\"%c\"，它必须是 [doxn] 四个字符中的一个" -#: src/od.c:1729 +#: src/od.c:1735 #, c-format msgid "no type may be specified when dumping strings" msgstr "在转储字符串时不能指定类型" -#: src/od.c:1804 +#: src/od.c:1810 msgid "compatibility mode supports at most one file" msgstr "兼容模式最多支持一个文件" -#: src/od.c:1825 +#: src/od.c:1831 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "略过字节数+ 读入字节数的值过大" -#: src/od.c:1868 +#: src/od.c:1874 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "警告：无效的宽度值%lu，已使用%d 代替" @@ -6691,17 +7073,17 @@ msgid "standard input is closed" 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" -"\n" msgstr "" "将每个指定文件里的每一行整合到对应一行里写到标准输出，之间用制表符分隔。\n" "如果没有指定文件，或指定文件为\"-\"，程序将从标准输入读取数据。\n" "\n" -#: src/paste.c:448 +#: 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" @@ -6709,7 +7091,7 @@ msgstr "" " -d, --delimiters=列表\t改用指定列表里的字符替代制表分隔符\n" " -s, --serial\t\t不使用平行的行目输出模式，而是每个文件占用一行\n" -#: src/paste.c:509 +#: src/paste.c:508 #, c-format msgid "delimiter list ends with an unescaped backslash: %s" msgstr "分割符列表以一个未跳过的反斜线结束：%s" @@ -6769,80 +7151,80 @@ msgid "Kaveh Ghazi" msgstr "Kaveh Ghazi" #. TRANSLATORS: Real name is unknown; at most 19 characters. -#: src/pinky.c:250 +#: src/pinky.c:242 msgid " ???" msgstr " ???" #. TRANSLATORS: Idle time is unknown; at most 5 characters. -#: src/pinky.c:274 +#: src/pinky.c:266 msgid "?????" msgstr "?????" -#: src/pinky.c:323 +#: src/pinky.c:314 #, c-format msgid "Login name: " msgstr "登录名： " -#: src/pinky.c:326 +#: src/pinky.c:317 #, c-format msgid "In real life: " msgstr "实名： " #. TRANSLATORS: Real name is unknown; no hard limit. -#: src/pinky.c:330 +#: src/pinky.c:321 msgid "???\n" msgstr "???\n" -#: src/pinky.c:350 +#: src/pinky.c:341 #, c-format msgid "Directory: " msgstr "主目录： " -#: src/pinky.c:352 +#: src/pinky.c:343 #, c-format msgid "Shell: " msgstr "Shell： " -#: src/pinky.c:371 +#: src/pinky.c:362 #, c-format msgid "Project: " msgstr "项目： " -#: src/pinky.c:395 +#: src/pinky.c:386 #, c-format msgid "Plan:\n" msgstr "计划：\n" -#: src/pinky.c:414 +#: src/pinky.c:405 msgid "Login" msgstr "登录" -#: src/pinky.c:416 +#: src/pinky.c:407 msgid "Name" msgstr "名字" -#: src/pinky.c:417 +#: src/pinky.c:408 msgid " TTY" msgstr " TTY" -#: src/pinky.c:419 +#: src/pinky.c:410 msgid "Idle" msgstr "空闲" -#: src/pinky.c:420 +#: src/pinky.c:411 msgid "When" msgstr "从" -#: src/pinky.c:423 +#: src/pinky.c:414 msgid "Where" msgstr "来自" -#: src/pinky.c:502 +#: src/pinky.c:493 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "用法: %s [选项]... [用户]...\n" -#: src/pinky.c:503 +#: src/pinky.c:494 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -6858,7 +7240,7 @@ msgstr "" " -p\t在长格式中省略用户的计划文件\n" " -s\t输出短格式信息(默认)\n" -#: src/pinky.c:511 +#: src/pinky.c:502 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -6871,7 +7253,7 @@ msgstr "" " -i\t在短格式中省略用户全名以及远程主机\n" " -q\t在短格式中省略用户全名、远程主机以及空闲时间\n" -#: src/pinky.c:520 +#: src/pinky.c:511 #, fuzzy, c-format msgid "" "\n" @@ -6882,7 +7264,7 @@ msgstr "" "一个轻量级的\"finger\"程序，用于显示用户信息。\n" "用到的utmp 文件为%s。\n" -#: src/pinky.c:604 +#: src/pinky.c:595 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "没有指定用户名，当使用-l 选项时至少需要指定一个" @@ -6897,85 +7279,84 @@ msgstr "Pete TerMaat" msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:912 +#: src/pr.c:908 #, fuzzy, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "\"--pages=首页[:末页]\"缺失参数" -#: src/pr.c:914 +#: src/pr.c:910 #, c-format msgid "invalid page range %s" msgstr "页码范围%s 无效" -#: src/pr.c:979 +#: src/pr.c:975 #, fuzzy, c-format msgid "'-l PAGE_LENGTH' invalid number of lines: %s" msgstr "\"-l 页长\"中含有无效的行号：%s" -#: src/pr.c:1003 +#: src/pr.c:999 #, fuzzy, c-format msgid "'-N NUMBER' invalid starting line number: %s" msgstr "\"-N 编号\"中含有无效的起始行号：%s" -#: src/pr.c:1015 +#: src/pr.c:1011 #, fuzzy, c-format msgid "'-o MARGIN' invalid line offset: %s" msgstr "\"-o 页边距\"中含有无效的行偏移量：%s" -#: src/pr.c:1056 +#: src/pr.c:1052 #, fuzzy, c-format msgid "'-w PAGE_WIDTH' invalid number of characters: %s" msgstr "\"-w \"中含有无效的字符数：%s" -#: src/pr.c:1070 +#: src/pr.c:1066 #, fuzzy, c-format msgid "'-W PAGE_WIDTH' invalid number of characters: %s" msgstr "\"-w \"中含有无效的字符数：%s" -#: src/pr.c:1100 +#: src/pr.c:1096 #, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "在平行输出参数时不能指定栏数" -#: src/pr.c:1104 +#: src/pr.c:1100 #, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "无法同时指定相交输出和平行输出参数" -#: src/pr.c:1200 +#: src/pr.c:1196 #, fuzzy, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "有多余字符\"-%c\"或无效数字出现在参数%s 中" -#: src/pr.c:1304 +#: src/pr.c:1293 #, c-format msgid "page width too narrow" msgstr "过窄" -#: src/pr.c:2369 +#: src/pr.c:2353 #, c-format msgid "starting page number %<PRIuMAX> exceeds page count %<PRIuMAX>" msgstr "起始页码%<PRIuMAX> 超出了最大页数%<PRIuMAX>" -#: src/pr.c:2396 +#: src/pr.c:2380 #, c-format msgid "page number overflow" msgstr "页码溢出" -#: src/pr.c:2401 +#: src/pr.c:2385 #, c-format msgid "Page %<PRIuMAX>" msgstr "第 %<PRIuMAX> 页" -#: src/pr.c:2773 -msgid "" -"Paginate or columnate FILE(s) for printing.\n" -"\n" +#: src/pr.c:2757 +#, fuzzy +msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" "对指定文件附注打印所需的页码或聚焦。\n" "\n" -#: src/pr.c:2780 +#: src/pr.c:2763 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -6990,7 +7371,7 @@ msgstr "" "\t\t\t输出指定的列数。如果指定了-a 选项，则从上到下列印。\n" "\t\t\t程序会自动在每一页均衡每列占用的行数。\n" -#: src/pr.c:2788 +#: src/pr.c:2771 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7004,7 +7385,7 @@ msgstr "" "\t\t\t使用头标(^G)和八进制反斜杠标记\n" " -d, --double-space\t加倍输出空白区域\n" -#: src/pr.c:2796 +#: src/pr.c:2779 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7022,7 +7403,7 @@ msgstr "" " -F, -f, --form-feed\t使用出纸页页标代替新行作为页面间的分隔符\n" "\t\t\t(使用-F 选项时报头为3 行,不使用时为5 行)\n" -#: src/pr.c:2806 +#: src/pr.c:2789 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -7041,7 +7422,7 @@ msgstr "" " -J, --join-lines\t合并整个行，关闭-W 选项的行截断，不使用栏调整，使用\n" "\t\t\t\t--sep-string[=字符串] 设置分隔符\n" -#: src/pr.c:2815 +#: src/pr.c:2798 msgid "" " -l, --length=PAGE_LENGTH\n" " set the page length to PAGE_LENGTH (66) lines\n" @@ -7055,7 +7436,7 @@ msgstr "" " -m, --merge\t\t在同一行显示所有文件，每个文件占用一栏，分割行，但是当\n" "\t\t\t使用-J 时将行合并到完整长度\n" -#: src/pr.c:2822 +#: src/pr.c:2805 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -7070,7 +7451,7 @@ msgstr "" " -N, --first-line-number=数字\n" "\t\t\t从首页的首行以指定数字开始计数(参看\"+首页\")\n" -#: src/pr.c:2830 +#: src/pr.c:2813 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -7084,7 +7465,7 @@ msgstr "" " -r, --no-file-warnings\n" "\t\t\t当文件无法打开时忽略警告\n" -#: src/pr.c:2837 +#: src/pr.c:2820 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -7098,7 +7479,7 @@ msgstr "" "\t\t\t另外除非-w 选项被指定，否则\"-s[CHAR]\"会屏蔽三个列相关\n" "\t\t\t的截行选项(-COLUMN|-a -COLUMN|-m)\n" -#: src/pr.c:2844 +#: src/pr.c:2827 #, fuzzy msgid "" " -S[STRING], --sep-string[=STRING]\n" @@ -7114,7 +7495,7 @@ msgstr "" "\t\t\t分栏选项无影响\n" " -t, --omit-header\t忽略页眉和页脚\n" -#: src/pr.c:2851 +#: src/pr.c:2834 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -7135,7 +7516,7 @@ msgstr "" "\t\t\t为多栏页面输出将设置为指定的字符数(默认72)，\n" "\t\t\t仅当-s[char] 选项不启用时有效(即保持默认值 72)。\n" -#: src/pr.c:2861 +#: src/pr.c:2844 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -7147,7 +7528,7 @@ msgstr "" "\t\t\t总是将页宽设置为指定的(默认72)字符数，\n" "\t\t\t除非-J 选项启用总是截断行，此参数与-S 或-s 冲突\n" -#: src/pr.c:2869 +#: src/pr.c:2852 msgid "" "\n" "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" @@ -7301,15 +7682,15 @@ msgstr "" "　或：%s -G [选项]... [输入 [输出]]\n" #: src/ptx.c:1821 +#, fuzzy msgid "" "Output a permuted index, including context, of the words in the input " "files.\n" -"\n" msgstr "" "输出一串预排的文件索引信息，包括输入文件中各单词的环境。\n" "\n" -#: src/ptx.c:1828 +#: src/ptx.c:1827 #, fuzzy msgid "" " -A, --auto-reference output automatically generated references\n" @@ -7320,7 +7701,7 @@ msgstr "" " -G,--traditional\t\t行为类似System V 的\"ptx\"\n" " -F,--flag-trunctaion=字符串\t使用指定字符串来标识行的截断\n" -#: src/ptx.c:1833 +#: src/ptx.c:1832 #, fuzzy msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" @@ -7335,7 +7716,7 @@ msgstr "" " -S, --sentence-regexp=正则表达式\t用于匹配行末或句末\n" " -T, --format=tex\t\t生成TeX 格式输出\n" -#: src/ptx.c:1840 +#: src/ptx.c:1839 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -7351,7 +7732,7 @@ msgstr "" " -i, --ignore-file=文件\t从指定文件中读取忽略单词的列表\n" " -o, --only-file=文件\t\t只从指定文件中读取单词列表\n" -#: src/ptx.c:1848 +#: src/ptx.c:1847 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -7362,7 +7743,7 @@ msgstr "" " -t, --typeset-mode\t\t -- 此功能尚未实现 --\n" " -w, --width=数值\t\t每列的输出宽度，不计关联引用\n" -#: src/ptx.c:1855 +#: src/ptx.c:1854 #, fuzzy msgid "" "\n" @@ -7372,7 +7753,7 @@ msgstr "" "如果不指定文件，或者文件为 \"-\"，程序将从标准输入读取数据。默认时隐含\n" "\"-F /\"选项。\n" -#: src/ptx.c:1949 +#: src/ptx.c:1948 #, c-format msgid "invalid gap width: %s" msgstr "无效的间隙宽度：%s" @@ -7398,7 +7779,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "无法切换到目录%s" -#: src/pwd.c:170 src/pwd.c:277 +#: src/pwd.c:170 src/pwd.c:277 src/split.c:373 #, c-format msgid "failed to stat %s" msgstr "获取%s 的文件状态失败(stat)" @@ -7414,14 +7795,15 @@ msgid "ignoring non-option arguments" msgstr "忽略不是选项的参数" #. This is a proper name. See the gettext manual, section Names. -#: src/readlink.c:33 +#: src/readlink.c:32 msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 +#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147 +#: src/stat.c:1349 src/touch.c:212 #, c-format -msgid "Usage: %s [OPTION]... FILE\n" -msgstr "用法：%s [选项]... 文件\n" +msgid "Usage: %s [OPTION]... FILE...\n" +msgstr "用法：%s [选项]... 文件...\n" #: src/readlink.c:63 msgid "" @@ -7448,16 +7830,19 @@ msgstr "" "\t\t\t\t所有组件都必须存在\n" #: src/readlink.c:75 +#, fuzzy msgid "" " -m, --canonicalize-missing canonicalize by following every symlink in\n" " every component of the given name " "recursively,\n" " without requirements on components " "existence\n" -" -n, --no-newline do not output the trailing newline\n" +" -n, --no-newline do not output the trailing delimiter\n" " -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" msgstr "" " -m, --canonicalize-missing\t递归跟随给出文件名的所有符号链接以标准化，\n" "\t\t\t\t但不对组件存在性作出要求\n" @@ -7466,11 +7851,10 @@ msgstr "" " -s, --silent\t\t缩减大多数的错误消息\n" " -v, --verbose\t\t报告所有错误消息\n" -#: src/realpath.c:71 src/rm.c:134 src/shred.c:147 src/stat.c:1330 -#: src/touch.c:215 -#, c-format -msgid "Usage: %s [OPTION]... FILE...\n" -msgstr "用法：%s [选项]... 文件...\n" +#: src/readlink.c:152 +#, fuzzy, c-format +msgid "ignoring --no-newline with multiple arguments" +msgstr "忽略不是选项的参数" #: src/realpath.c:72 msgid "" @@ -7497,12 +7881,12 @@ msgstr "" msgid "generating relative path" msgstr "" -#: src/remove.c:286 +#: src/remove.c:273 #, c-format msgid "%s: descend into write-protected directory %s? " msgstr "%s：是否进入有写保护的目录%s ？" -#: src/remove.c:287 +#: src/remove.c:274 #, c-format msgid "%s: descend into directory %s? " msgstr "%s：是否进入目录%s? " @@ -7511,37 +7895,37 @@ msgstr "%s：是否进入目录%s? " #. translate "%s: remove %s (write-protected) %s? " #. instead. It should avoid grammatical problems #. with the output of file_type. -#: src/remove.c:303 +#: src/remove.c:290 #, c-format msgid "%s: remove write-protected %s %s? " msgstr "%s：是否删除有写保护的%s %s？" -#: src/remove.c:304 +#: src/remove.c:291 #, c-format msgid "%s: remove %s %s? " msgstr "%s：是否删除%s %s？" -#: src/remove.c:417 +#: src/remove.c:374 #, c-format msgid "removed directory: %s\n" msgstr "已删除目录：%s\n" -#: src/remove.c:481 +#: src/remove.c:444 #, c-format msgid "cannot remove directory: %s" msgstr "无法删除目录：%s" -#: src/remove.c:537 +#: src/remove.c:500 #, c-format msgid "skipping %s, since it's on a different device" msgstr "跳过%s，因为它位于不同的设备上" -#: src/remove.c:557 +#: src/remove.c:520 #, c-format msgid "traversal failed: %s" msgstr "遍历失败：%s" -#: src/remove.c:563 +#: src/remove.c:526 #, c-format msgid "" "unexpected failure: fts_info=%d: %s\n" @@ -7550,12 +7934,12 @@ msgstr "" "异常错误：fts_info=%d: %s\n" "请报告给 %s" -#: src/rm.c:118 +#: src/rm.c:119 #, fuzzy, c-format msgid "Try '%s ./%s' to remove the file %s.\n" msgstr "尝试使用\"%s ./%s\"删除文件%s。\n" -#: src/rm.c:135 +#: src/rm.c:136 #, fuzzy msgid "" "Remove (unlink) the FILE(s).\n" @@ -7569,7 +7953,7 @@ msgstr "" " -f, --force\t\t强制删除。忽略不存在的文件，不提示确认\n" " -i\t\t\t在删除前需要确认\n" -#: src/rm.c:141 +#: src/rm.c:142 msgid "" " -I prompt once before removing more than three files, " "or\n" @@ -7585,7 +7969,7 @@ msgstr "" " --interactive[=WHEN]\t根据指定的WHEN 进行确认提示：never，once (-I)，\n" "\t\t\t\t或者always (-i)。如果此参数不加WHEN 则总是提示\n" -#: src/rm.c:148 +#: src/rm.c:149 msgid "" " --one-file-system when removing a hierarchy recursively, skip any\n" " directory that is on a file system different from\n" @@ -7594,12 +7978,13 @@ msgstr "" " --one-file-system\t\t递归删除一个层级时，跳过所有不符合命令行参\n" "\t\t\t\t数的文件系统上的文件\n" -#: src/rm.c:153 +#: src/rm.c:154 #, fuzzy msgid "" " --no-preserve-root do not treat '/' specially\n" " --preserve-root do not remove '/' (default)\n" " -r, -R, --recursive remove directories and their contents recursively\n" +" -d, --dir remove empty directories\n" " -v, --verbose explain what is being done\n" msgstr "" " --no-preserve-roo\t不特殊对待\"/\"\n" @@ -7607,7 +7992,7 @@ msgstr "" " -r, -R, --recursive\t递归删除目录及其内容\n" " -v, --verbose\t\t详细显示进行的步骤\n" -#: src/rm.c:161 +#: src/rm.c:163 msgid "" "\n" "By default, rm does not remove directories. Use the --recursive (-r or -R)\n" @@ -7618,7 +8003,7 @@ msgstr "" "默认时，rm 不会删除目录。使用--recursive(-r 或-R)选项可删除每个给定\n" "的目录，以及其下所有的内容。\n" -#: src/rm.c:166 +#: src/rm.c:168 #, fuzzy, c-format msgid "" "\n" @@ -7633,7 +8018,7 @@ msgstr "" " %s -- -foo\n" " %s ./-foo\n" -#: src/rm.c:175 +#: src/rm.c:177 msgid "" "\n" "Note that if you use rm to remove a file, it might be possible to recover\n" @@ -7644,12 +8029,12 @@ msgstr "" "请注意，如果使用rm 来删除文件，通常仍可以将该文件恢复原状。如果想保证\n" "该文件的内容无法还原，请考虑使用shred。\n" -#: src/rm.c:335 +#: src/rm.c:342 #, c-format msgid "%s: remove all arguments recursively? " msgstr "%s：递归删除所有参数？" -#: src/rm.c:336 +#: src/rm.c:343 #, c-format msgid "%s: remove all arguments? " msgstr "%s：删除所有参数？" @@ -7707,7 +8092,11 @@ msgstr "" msgid "" "Run a program in a different security context.\n" "With neither CONTEXT nor COMMAND, print the current security context.\n" -"\n" +msgstr "" + +#: src/runcon.c:94 +#, fuzzy +msgid "" " CONTEXT Complete security context\n" " -c, --compute compute process transition context before modifying\n" " -t, --type=TYPE type (for same role as parent)\n" @@ -7727,72 +8116,72 @@ msgstr "" " -l, --range=范围\t级别范围\n" "\n" -#: src/runcon.c:140 +#: src/runcon.c:144 #, c-format msgid "multiple roles" msgstr "多角色" -#: src/runcon.c:145 +#: src/runcon.c:149 #, c-format msgid "multiple types" msgstr "多类型" -#: src/runcon.c:150 +#: src/runcon.c:154 #, c-format msgid "multiple users" msgstr "多用户" -#: src/runcon.c:155 +#: src/runcon.c:159 #, c-format msgid "multiple levelranges" msgstr "复合级别范围" -#: src/runcon.c:173 src/runcon.c:209 +#: src/runcon.c:177 src/runcon.c:213 #, c-format msgid "failed to get current context" msgstr "无法获得当前安全环境" -#: src/runcon.c:183 +#: src/runcon.c:187 #, c-format msgid "you must specify -c, -t, -u, -l, -r, or context" msgstr "您必须指定-c，-t，-u，-l，-r 或环境" -#: src/runcon.c:191 +#: src/runcon.c:195 #, c-format msgid "no command specified" msgstr "没有指定命令" -#: src/runcon.c:197 +#: src/runcon.c:201 #, c-format msgid "%s may be used only on a SELinux kernel" msgstr "%s 只能用于启用了SELinux 支持的内核" -#: src/runcon.c:223 +#: src/runcon.c:227 #, c-format msgid "failed to compute a new context" msgstr "计算新的环境失败" -#: src/runcon.c:237 +#: src/runcon.c:241 #, c-format msgid "failed to set new user %s" msgstr "设置新用户%s 失败" -#: src/runcon.c:239 +#: src/runcon.c:243 #, c-format msgid "failed to set new type %s" msgstr "设置新类型%s 失败" -#: src/runcon.c:241 +#: src/runcon.c:245 #, c-format msgid "failed to set new range %s" msgstr "设置新范围%s 失败" -#: src/runcon.c:243 +#: src/runcon.c:247 #, c-format msgid "failed to set new role %s" msgstr "设置新角色%s 失败" -#: src/runcon.c:251 +#: src/runcon.c:255 #, c-format msgid "unable to set security context %s" msgstr "无法设置安全环境%s" @@ -7809,9 +8198,12 @@ msgstr "" "　或：%s [选项]... 首数 增量 尾数\n" #: src/seq.c:73 +msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" +msgstr "" + +#: src/seq.c:79 +#, fuzzy msgid "" -"Print numbers from FIRST to LAST, in steps of INCREMENT.\n" -"\n" " -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" @@ -7822,7 +8214,7 @@ msgstr "" " -s, --separator=字符串\t使用指定字符串分隔数字(默认使用：\\n)\n" " -w, --equal-width\t在列前添加0 使得宽度相同\n" -#: src/seq.c:82 +#: src/seq.c:86 msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" @@ -7836,7 +8228,7 @@ msgstr "" "首数、增量和尾数均以浮点数形式解释。当首数小于尾数时增量一般为正值，\n" "相反在首数大于尾数时增量一般为负数。\n" -#: src/seq.c:90 +#: src/seq.c:94 #, fuzzy msgid "" "FORMAT must be suitable for printing one argument of type 'double';\n" @@ -7846,32 +8238,17 @@ msgstr "" "指定的格式必须适用于显示\"double\"类型的参数；当首数、增量和尾数均为指定\n" "精确度的定点十进制数时默认为\"%.精确度f\"，否则默认为\"%g\"。\n" -#: src/seq.c:136 +#: src/seq.c:140 #, c-format msgid "invalid floating point argument: %s" msgstr "无效的浮点参数：%s" -#: src/seq.c:193 -#, c-format -msgid "format %s has no %% directive" -msgstr "格式%s 没有%% 指令" - -#: src/seq.c:210 -#, c-format -msgid "format %s ends in %%" -msgstr "格式%s 以%% 结束" - -#: src/seq.c:213 +#: src/seq.c:232 #, c-format msgid "format %s has unknown %%%c directive" msgstr "格式%s 中包含未知%%%c 指令" -#: src/seq.c:217 -#, c-format -msgid "format %s has too many %% directives" -msgstr "格式%s 中%% 指令过多" - -#: src/seq.c:431 +#: src/seq.c:555 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "当输出等宽字符串时不应再指定格式字符串" @@ -7910,27 +8287,27 @@ msgstr "" " -g GID[,GID1...]\t将主组ID 设置为指定的数字GID，如果指定了GID1，\n" "\t\t\t\t则同时添加这些附加组ID，...\n" -#: src/setuidgid.c:163 +#: src/setuidgid.c:162 #, c-format msgid "unknown user-ID: %s" msgstr "未知的用户ID：%s" -#: src/setuidgid.c:174 +#: 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:191 +#: src/setuidgid.c:190 #, c-format msgid "failed to set supplemental group(s)" msgstr "设置附加组失败" -#: src/setuidgid.c:201 +#: src/setuidgid.c:200 #, c-format msgid "cannot set group-ID to %lu" msgstr "无法设置组ID 为%lu" -#: src/setuidgid.c:205 +#: src/setuidgid.c:204 #, c-format msgid "cannot set user-ID to %lu" msgstr "无法设置用户ID 为%lu" @@ -7941,15 +8318,15 @@ msgid "Colin Plumb" msgstr "Colin Plumb" #: src/shred.c:148 +#, 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" -"\n" msgstr "" "多次覆盖文件，使得即使是昂贵的硬件探测仪器也难以将数据复原。\n" "\n" -#: src/shred.c:156 +#: src/shred.c:155 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -7962,7 +8339,7 @@ msgstr "" " --random-source=文件\t从指定文件中取出随机字节\n" " -s, --size=N\t\t粉碎数据为指定字节的碎片(可使用K、M 和G 作为单位)\n" -#: src/shred.c:162 +#: src/shred.c:161 msgid "" " -u, --remove truncate and remove file after overwriting\n" " -v, --verbose show progress\n" @@ -7975,7 +8352,7 @@ msgstr "" " -x, --exact\t\t不将文件大小增加至最接近的块大小\n" " -z, --zero \t\t最后一次使用0 进行覆盖以隐藏覆盖动作\n" -#: src/shred.c:171 +#: src/shred.c:170 msgid "" "\n" "If FILE is -, shred standard output.\n" @@ -7994,7 +8371,7 @@ msgstr "" "一般文件时，绝大多数人都会使用--remove 选项。\n" "\n" -#: src/shred.c:181 +#: src/shred.c:180 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" @@ -8010,7 +8387,7 @@ msgstr "" "例子：\n" "\n" -#: src/shred.c:189 +#: src/shred.c:188 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -8030,7 +8407,7 @@ msgstr "" "* 会不时进行快照记录的文件系统，像Network Applicance 的NFS 服务器\n" "\n" -#: src/shred.c:199 +#: src/shred.c:198 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -8043,7 +8420,7 @@ msgstr "" "* 压缩文件系统\n" "\n" -#: src/shred.c:206 +#: src/shred.c:205 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" @@ -8061,7 +8438,7 @@ msgstr "" "您可以查看mount 的man 页面以获得详细信息。\n" "\n" -#: src/shred.c:216 +#: src/shred.c:215 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" @@ -8071,122 +8448,122 @@ msgstr "" "包含不能被删除的文件副本，这将会\n" "允许碎片文件被恢复。\n" -#: src/shred.c:296 +#: src/shred.c:295 #, c-format msgid "%s: fdatasync failed" msgstr "%s：fadatsync 失败" -#: src/shred.c:307 +#: src/shred.c:306 #, c-format msgid "%s: fsync failed" msgstr "%s：fsync 失败" -#: src/shred.c:384 +#: src/shred.c:383 #, c-format msgid "%s: cannot rewind" msgstr "%s：无法反绕操作" -#: src/shred.c:403 +#: src/shred.c:402 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s：第%lu 次，共%lu 次 (%s)..." -#: src/shred.c:453 +#: src/shred.c:452 #, c-format msgid "%s: error writing at offset %s" msgstr "%s：在位置%s 写入时出现错误" -#: src/shred.c:471 +#: src/shred.c:470 #, c-format msgid "%s: lseek failed" msgstr "%s：lseek 失败" -#: src/shred.c:482 +#: src/shred.c:481 #, c-format msgid "%s: file too large" msgstr "%s：文件过大" -#: src/shred.c:505 +#: src/shred.c:504 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s：第%lu 次，共%lu 次 (%s)...%s" -#: src/shred.c:521 +#: src/shred.c:520 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s：第%lu 次，共%lu 次 (%s)...%s/%s %d%%" -#: src/shred.c:768 +#: src/shred.c:767 #, c-format msgid "%s: fstat failed" msgstr "%s：获取文件状态失败(fstat)" -#: src/shred.c:779 +#: src/shred.c:778 #, c-format msgid "%s: invalid file type" msgstr "%s：无效的文件类型" -#: src/shred.c:798 +#: src/shred.c:797 #, c-format msgid "%s: file has negative size" msgstr "%s：文件的大小为负数" -#: src/shred.c:865 +#: src/shred.c:864 src/sort.c:932 src/split.c:378 #, c-format msgid "%s: error truncating" msgstr "%s：截断文件时出错" -#: src/shred.c:881 +#: src/shred.c:880 #, c-format msgid "%s: fcntl failed" msgstr "%s：文件控制操作失败(fcntl)" -#: src/shred.c:886 +#: src/shred.c:885 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "%s：不能对只可追加数据的文件描述符(file descriptor) 进行粉碎" -#: src/shred.c:968 +#: src/shred.c:967 #, c-format msgid "%s: removing" msgstr "%s：正在删除" -#: src/shred.c:992 +#: src/shred.c:991 #, c-format msgid "%s: renamed to %s" msgstr "%s：名称已更改为 %s" -#: src/shred.c:1014 +#: src/shred.c:1013 #, c-format msgid "%s: failed to remove" msgstr "%s：删除失败" -#: src/shred.c:1018 +#: src/shred.c:1017 #, c-format msgid "%s: removed" msgstr "%s：已删除" -#: src/shred.c:1025 src/shred.c:1068 +#: src/shred.c:1024 src/shred.c:1067 #, c-format msgid "%s: failed to close" msgstr "%s：无法关闭" -#: src/shred.c:1061 +#: src/shred.c:1060 #, c-format msgid "%s: failed to open for writing" msgstr "%s：无法以写模式打开" -#: src/shred.c:1126 +#: src/shred.c:1125 #, c-format msgid "%s: invalid number of passes" msgstr "%s：覆盖次数无效" -#: src/shred.c:1135 src/shuf.c:291 src/sort.c:4387 +#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441 #, c-format msgid "multiple random sources specified" msgstr "指定了多个随机源" -#: src/shred.c:1149 +#: src/shred.c:1148 #, c-format msgid "%s: invalid file size" msgstr "%s：文件大小无效" @@ -8203,14 +8580,13 @@ msgstr "" "　或者: %s -i LO-HI [选项]...\n" #: src/shuf.c:54 -msgid "" -"Write a random permutation of the input lines to standard output.\n" -"\n" +#, fuzzy +msgid "Write a random permutation of the input lines to standard output.\n" msgstr "" "把输入行按随机顺序输出到标准输出。\n" "\n" -#: src/shuf.c:61 +#: src/shuf.c:60 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 " @@ -8227,27 +8603,27 @@ msgstr "" " --random-source=文件\t从指定文件获得随机比特\n" " -z, --zero-terminated\t以0 结束行而非新行\n" -#: src/shuf.c:245 +#: src/shuf.c:244 #, c-format msgid "multiple -i options specified" msgstr "指定了多个-i 选项" -#: src/shuf.c:265 +#: src/shuf.c:264 #, c-format msgid "invalid input range %s" msgstr "无效的输入范围：%s" -#: src/shuf.c:278 +#: src/shuf.c:277 #, c-format msgid "invalid line count %s" msgstr "无效的行数%s" -#: src/shuf.c:285 src/sort.c:4381 +#: src/shuf.c:284 src/sort.c:4435 #, c-format msgid "multiple output files specified" msgstr "指定了多个输出文件" -#: src/shuf.c:311 +#: src/shuf.c:310 #, c-format msgid "cannot combine -e and -i options" msgstr "不能同时指定-e 和-i 选项" @@ -8272,7 +8648,7 @@ msgstr "" "如果参数个数超过2 个，暂停的总时间为各个参数的值的和。\n" "\n" -#: src/sleep.c:135 src/timeout.c:295 +#: src/sleep.c:135 src/timeout.c:320 #, c-format msgid "invalid time interval %s" msgstr "无效的时间间隔%s" @@ -8282,15 +8658,14 @@ msgstr "无效的时间间隔%s" msgid "cannot read realtime clock" msgstr "无法读取实时时钟" -#: src/sort.c:395 -msgid "" -"Write sorted concatenation of all FILE(s) to standard output.\n" -"\n" +#: src/sort.c:399 +#, fuzzy +msgid "Write sorted concatenation of all FILE(s) to standard output.\n" msgstr "" "串联排序所有指定文件并将结果写到标准输出。\n" "\n" -#: src/sort.c:402 +#: src/sort.c:405 msgid "" "Ordering options:\n" "\n" @@ -8298,7 +8673,7 @@ msgstr "" "排序选项：\n" "\n" -#: src/sort.c:406 +#: src/sort.c:409 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -8309,7 +8684,7 @@ msgstr "" " -d, --dictionary-order\t只考虑空白区域和字母字符\n" " -f, --ignore-case\t\t忽略字母大小写\n" -#: src/sort.c:412 +#: src/sort.c:415 #, fuzzy msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" @@ -8321,12 +8696,12 @@ msgstr "" " -M, --month-sort\t\t比较 (未知) < \"一月\" < ... < \"十二月\"\n" "\t\t\t\t在LC_ALL=C 时为(unknown) < `JAN' < ... < `DEC'\n" -#: src/sort.c:417 +#: src/sort.c:420 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:420 +#: src/sort.c:423 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -8338,7 +8713,7 @@ msgstr "" " --random-source=文件\t从指定文件中获得随机字节\n" " -r, --reverse\t\t\t逆序输出排序结果\n" -#: src/sort.c:426 +#: src/sort.c:429 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -8353,7 +8728,7 @@ msgstr "" " -V, --version-sort\t\t在文本内进行自然版本排序\n" "\n" -#: src/sort.c:434 +#: src/sort.c:437 msgid "" "Other options:\n" "\n" @@ -8361,7 +8736,7 @@ msgstr "" "其他选项：\n" "\n" -#: src/sort.c:438 +#: src/sort.c:441 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" @@ -8369,7 +8744,7 @@ msgstr "" " --batch-size=NMERGE\t一次最多合并NMERGE 个输入；如果输入更多\n" "\t\t\t\t\t则使用临时文件\n" -#: src/sort.c:442 +#: src/sort.c:445 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 " @@ -8383,7 +8758,7 @@ msgstr "" " --compress-program=程序\t使用指定程序压缩临时文件；使用该程序\n" "\t\t\t\t\t的-d 参数解压缩文件\n" -#: src/sort.c:449 +#: src/sort.c:452 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -8396,7 +8771,7 @@ msgstr "" " --files0-from=文件\t从指定文件读取以NUL 终止的名称，如果该文件被\n" "\t\t\t\t\t指定为\"-\"则从标准输入读文件名\n" -#: src/sort.c:456 +#: src/sort.c:459 #, fuzzy msgid "" " -k, --key=KEYDEF sort via a key; KEYDEF gives location and type\n" @@ -8406,7 +8781,7 @@ msgstr "" "\t\t\t\t参看POS 语法。\n" " -m, --merge\t\t\t合并已排序的文件，不再进行排序\n" -#: src/sort.c:460 +#: src/sort.c:463 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -8417,7 +8792,7 @@ msgstr "" " -s, --stable\t\t\t禁用last-resort 比较以稳定比较算法\n" " -S, --buffer-size=大小\t指定主内存缓存大小\n" -#: src/sort.c:466 +#: src/sort.c:469 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -8437,11 +8812,11 @@ msgstr "" " --parallel=N\t\t将同时运行的排序数改变为N\n" " -u, --unique\t\t配合-c，严格校验排序；不配合-c，则只输出一次排序结果\n" -#: src/sort.c:475 +#: 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:480 +#: src/sort.c:483 #, fuzzy msgid "" "\n" @@ -8469,7 +8844,7 @@ msgstr "" "\n" "指定的大小可以使用以下单位之一：\n" -#: src/sort.c:493 +#: src/sort.c:496 msgid "" "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n" "\n" @@ -8488,266 +8863,270 @@ msgstr "" "本地环境变量会影响排序结果。\n" "如果希望以字节的自然值获得最传统的排序结果，请设置LC_ALL=C。\n" -#: src/sort.c:694 +#: src/sort.c:697 #, c-format msgid "waiting for %s [-d]" msgstr "等待 %s [-d]" -#: src/sort.c:699 +#: src/sort.c:702 #, c-format msgid "%s [-d] terminated abnormally" msgstr "%s [-d] 不正常结束" -#: src/sort.c:853 +#: src/sort.c:856 #, c-format msgid "cannot create temporary file in %s" msgstr "无法在%s 创建临时文件" -#: src/sort.c:939 src/sort.c:2010 src/sort.c:3056 src/sort.c:3755 -#: src/sort.c:3758 +#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713 +#: src/sort.c:3804 src/sort.c:3807 msgid "open failed" msgstr "打开失败" -#: src/sort.c:959 +#: src/sort.c:970 msgid "fflush failed" msgstr "冲洗流失败(fflush)" -#: src/sort.c:964 src/sort.c:2013 src/sort.c:4646 +#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706 msgid "close failed" msgstr "关闭失败" -#: src/sort.c:973 +#: src/sort.c:986 #, c-format msgid "dup2 failed" msgstr "复制已打开文件描述符失败(dup2)" -#: src/sort.c:1090 +#: src/sort.c:1103 #, c-format msgid "couldn't execute %s" msgstr "无法执行%s" -#: src/sort.c:1097 +#: src/sort.c:1110 msgid "couldn't create temporary file" msgstr "无法创建临时文件" -#: src/sort.c:1136 +#: src/sort.c:1149 #, c-format msgid "couldn't create process for %s -d" msgstr "无法创建进程%s -d" -#: src/sort.c:1150 +#: src/sort.c:1161 #, c-format msgid "couldn't execute %s -d" msgstr "无法执行%s -d" -#: src/sort.c:1209 +#: src/sort.c:1220 #, c-format msgid "warning: cannot remove: %s" msgstr "警告：无法删除：%s" -#: src/sort.c:1295 +#: src/sort.c:1306 #, c-format msgid "invalid --%s argument %s" msgstr "无效的 --%s 参数%s" -#: src/sort.c:1298 +#: src/sort.c:1309 #, c-format msgid "minimum --%s argument is %s" msgstr "最小 --%s 参数是%s" -#: src/sort.c:1313 +#: src/sort.c:1324 #, c-format msgid "--%s argument %s too large" msgstr "--%s 参数%s 太长" -#: src/sort.c:1316 +#: src/sort.c:1327 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "最大 --%s 参数在当前资源限制(rlimit)设置下是%s" -#: src/sort.c:1398 +#: src/sort.c:1409 #, c-format msgid "number in parallel must be nonzero" msgstr "单个的数字必须不为零" -#: src/sort.c:1479 +#: src/sort.c:1494 msgid "stat failed" msgstr "获取文件状态失败(stat)" -#: src/sort.c:1740 +#: src/sort.c:1755 msgid "read failed" msgstr "读取失败" -#: src/sort.c:2028 +#: src/sort.c:2043 #, c-format msgid "string transformation failed" msgstr "字符串转换失败" -#: src/sort.c:2031 +#: src/sort.c:2046 #, c-format msgid "the untransformed string was %s" msgstr "未转换的字符串为%s" -#: src/sort.c:2194 +#: src/sort.c:2209 #, c-format msgid "^ no match for key\n" msgstr "^ 没有匹配项\n" -#: src/sort.c:2374 +#: src/sort.c:2389 #, fuzzy, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "使用了旧的值%s，考虑转为使用%s" -#: src/sort.c:2380 +#: src/sort.c:2395 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "值%lu 宽度为零，忽略" -#: src/sort.c:2391 +#: src/sort.c:2406 #, fuzzy, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "值%lu 开头有大量空格，考虑同时指定\"b\"" -#: src/sort.c:2404 +#: src/sort.c:2419 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "值%lu 为数字且跨多个域" -#: src/sort.c:2436 +#: src/sort.c:2451 #, fuzzy, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" msgstr[0] "选项\"-%s\"被忽略" -#: src/sort.c:2442 +#: src/sort.c:2457 #, fuzzy, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "选项\"-r\" 仅用于last-resort 比较" -#: src/sort.c:2716 src/sort.c:2725 +#: src/sort.c:2731 src/sort.c:2740 msgid "write failed" msgstr "写入失败" -#: src/sort.c:2768 +#: src/sort.c:2783 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s：%s:%s：无序： " -#: src/sort.c:2771 +#: src/sort.c:2786 msgid "standard error" msgstr "标准错误" -#: src/sort.c:3926 +#: src/sort.c:3698 +#, fuzzy +msgid "cannot read" +msgstr "%s：无法反绕操作" + +#: src/sort.c:3976 #, c-format msgid "%s: invalid field specification %s" msgstr "%s：无效的区块规格%s" -#: src/sort.c:3937 +#: src/sort.c:3987 #, fuzzy, c-format msgid "options '-%s' are incompatible" msgstr "选项\"-%s\"不兼容" -#: src/sort.c:3988 +#: src/sort.c:4038 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s：在%s 处的计数无效" -#: src/sort.c:4245 +#: src/sort.c:4295 #, fuzzy msgid "invalid number after '-'" msgstr "在\"-\"后的编号无效" -#: src/sort.c:4248 src/sort.c:4334 src/sort.c:4362 +#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416 #, fuzzy msgid "invalid number after '.'" msgstr "在\".\"后的编号无效" -#: src/sort.c:4261 src/sort.c:4367 +#: src/sort.c:4315 src/sort.c:4421 msgid "stray character in field spec" msgstr "区块中有孤立字符" -#: src/sort.c:4308 +#: src/sort.c:4362 #, c-format msgid "multiple compress programs specified" msgstr "指定了多个压缩程序" -#: src/sort.c:4325 +#: src/sort.c:4379 msgid "invalid number at field start" msgstr "区块起始处的编号无效" -#: src/sort.c:4329 src/sort.c:4357 +#: src/sort.c:4383 src/sort.c:4411 msgid "field number is zero" msgstr "区块编号为零" -#: src/sort.c:4338 +#: src/sort.c:4392 msgid "character offset is zero" msgstr "字符偏移量为零" -#: src/sort.c:4353 +#: src/sort.c:4407 #, fuzzy msgid "invalid number after ','" msgstr "在\",\"后的编号无效" -#: src/sort.c:4403 +#: src/sort.c:4457 #, c-format msgid "empty tab" msgstr "空标签" -#: src/sort.c:4496 src/wc.c:692 +#: src/sort.c:4550 src/wc.c:692 #, c-format msgid "cannot read file names from %s" msgstr "无法从%s 中读取文件名" -#: src/sort.c:4518 +#: src/sort.c:4572 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s：%lu：无效的 0 长度文件名" -#: src/sort.c:4524 +#: src/sort.c:4578 #, c-format msgid "no input from %s" msgstr "没有来自%s 的输入" -#: src/sort.c:4570 +#: src/sort.c:4624 #, c-format msgid "using %s sorting rules" msgstr "使用%s 排序规则" -#: src/sort.c:4573 +#: src/sort.c:4627 #, c-format msgid "using simple byte comparison" msgstr "使用简单字节比较" -#: src/sort.c:4604 +#: src/sort.c:4658 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "不允许额外的操作数%s 与-%c 一起使用" -#: src/split.c:184 +#: src/split.c:187 #, c-format msgid "the suffix length needs to be at least %zu" msgstr "后缀长度至少应为%zu" -#: src/split.c:201 +#: src/split.c:204 #, c-format msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" msgstr "用法：%s [选项]... [输入 [前缀]]\n" -#: src/split.c:205 +#: src/split.c:208 #, fuzzy 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" -"\n" msgstr "" "将输入内容拆分为固定大小的分片并输出到\"前缀aa\"、\"前缀ab\",...；\n" "默认以 1000 行为拆分单位，默认前缀为\"x\"。如果不指定文件，或\n" "者文件为\"-\"，则从标准输入读取数据。\n" "\n" -#: src/split.c:214 +#: src/split.c:216 #, fuzzy, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" @@ -8774,13 +9153,13 @@ msgstr "" " -n, --number=块数\t\t生成块数输出文件。参看下面的说明。\n" " -u, --unbuffered\t\t立即使用-n r/... 复制输入到输出\n" -#: src/split.c:227 +#: src/split.c:229 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" msgstr " --verbose\t\t在每个输出文件打开前输出文件特征\n" -#: src/split.c:234 +#: src/split.c:236 #, fuzzy msgid "" "\n" @@ -8801,184 +9180,189 @@ msgstr "" "r/N\t类似l 但使用轮询分配\n" "r/K/N\t类似r/N 但尽将N 个文件中的第K 个输出到标准输出\n" -#: src/split.c:352 +#: src/split.c:354 #, c-format msgid "output file suffixes exhausted" msgstr "已排除输出文件后缀" -#: src/split.c:364 +#: src/split.c:366 #, c-format msgid "creating file %s\n" msgstr "正在创建文件%s\n" -#: src/split.c:377 +#: src/split.c:375 +#, c-format +msgid "%s would overwrite input; aborting" +msgstr "" + +#: src/split.c:391 #, fuzzy, c-format msgid "failed to set FILE environment variable" msgstr "更新%s 的环境失败" -#: src/split.c:379 +#: src/split.c:393 #, c-format msgid "executing with FILE=%s\n" msgstr "" -#: src/split.c:381 +#: src/split.c:395 #, fuzzy, c-format msgid "failed to create pipe" msgstr "无法创建硬链接%s" -#: src/split.c:395 +#: src/split.c:409 #, fuzzy, c-format msgid "closing prior pipe" msgstr "关闭目录%s" -#: src/split.c:397 +#: src/split.c:411 #, fuzzy, c-format msgid "closing output pipe" msgstr "正在关闭输出文件%s" -#: src/split.c:401 +#: src/split.c:415 #, fuzzy, c-format msgid "moving input pipe" msgstr "正在关闭输入文件%s" -#: src/split.c:403 +#: src/split.c:417 #, fuzzy, c-format msgid "closing input pipe" msgstr "正在关闭输入文件%s" -#: src/split.c:408 +#: src/split.c:422 #, fuzzy, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "无法运行命令%s" -#: src/split.c:414 +#: src/split.c:428 #, fuzzy, c-format msgid "failed to close input pipe" msgstr "关闭目录 %s 失败" -#: src/split.c:450 +#: src/split.c:464 #, fuzzy, c-format msgid "waiting for child process" msgstr "等待拆解" -#: src/split.c:460 +#: src/split.c:474 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "" -#: src/split.c:468 +#: src/split.c:482 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:475 src/timeout.c:449 +#: src/split.c:489 src/timeout.c:494 #, c-format msgid "unknown status from command (0x%X)" msgstr "来自命令的未知状态 (0x%X)" -#: src/split.c:1037 +#: src/split.c:1052 #, c-format msgid "cannot split in more than one way" msgstr "无法以多于一种的方式切分输入" -#: src/split.c:1050 src/split.c:1192 src/split.c:1363 +#: src/split.c:1065 src/split.c:1205 src/split.c:1376 #, c-format msgid "%s: invalid number of chunks" msgstr "%s：无效的块数" -#: src/split.c:1054 +#: src/split.c:1069 #, c-format msgid "%s: invalid chunk number" msgstr "%s：无效块数" -#: src/split.c:1106 +#: src/split.c:1119 #, c-format msgid "%s: invalid suffix length" msgstr "%s：文件类型无效" -#: src/split.c:1131 src/split.c:1139 src/split.c:1162 src/split.c:1167 +#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180 #, c-format msgid "%s: invalid number of bytes" msgstr "%s：无效的字节数" -#: src/split.c:1150 src/split.c:1297 +#: src/split.c:1163 src/split.c:1310 #, c-format msgid "%s: invalid number of lines" msgstr "%s：无效的行数" -#: src/split.c:1223 +#: src/split.c:1236 #, c-format msgid "line count option -%s%c... is too large" msgstr "行数选项-%s%c... 过大" -#: src/split.c:1235 +#: src/split.c:1248 #, fuzzy, c-format msgid "%s: invalid start value for numerical suffix" msgstr "无效的起始行号：%s" -#: src/split.c:1263 +#: src/split.c:1276 #, c-format msgid "%s: invalid IO block size" msgstr "%s：无效的IO 块大小" -#: src/split.c:1284 +#: src/split.c:1297 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1321 +#: src/split.c:1334 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1356 +#: src/split.c:1369 #, c-format msgid "%s: cannot determine file size" msgstr "%s：无法确定文件大小" #. This is a proper name. See the gettext manual, section Names. -#: src/stat.c:169 +#: src/stat.c:173 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:838 +#: src/stat.c:857 #, c-format msgid "failed to canonicalize %s" msgstr "标准化%s 失败" -#: src/stat.c:1050 +#: src/stat.c:1069 #, fuzzy, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "警告：无法识别的转义字符\"\\%c\"" -#: src/stat.c:1105 +#: src/stat.c:1124 #, c-format msgid "%s: invalid directive" msgstr "%s：无效指令" -#: src/stat.c:1151 +#: src/stat.c:1170 #, c-format msgid "warning: backslash at end of format" msgstr "警告：格式末尾出现反斜杠" -#: src/stat.c:1182 +#: src/stat.c:1201 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "用 %s 进行标准输入在文件系统模式下无法工作" -#: src/stat.c:1189 +#: src/stat.c:1208 #, c-format msgid "cannot read file system information for %s" msgstr "无法为 %s 读取文件系统信息" -#: src/stat.c:1209 +#: src/stat.c:1228 #, 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:1245 +#: src/stat.c:1264 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -8994,7 +9378,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1268 +#: src/stat.c:1287 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -9004,30 +9388,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1278 +#: src/stat.c:1297 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:1286 +#: src/stat.c:1305 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:1295 +#: src/stat.c:1314 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:1305 +#: src/stat.c:1324 #, c-format msgid "Context: %C\n" msgstr "环境：%C\n" -#: src/stat.c:1313 +#: src/stat.c:1332 msgid "" "Access: %x\n" "Modify: %y\n" @@ -9039,10 +9423,13 @@ msgstr "" "最近改动：%z\n" "创建时间：%w\n" -#: src/stat.c:1331 +#: src/stat.c:1350 +msgid "Display file or file system status.\n" +msgstr "" + +#: src/stat.c:1356 +#, fuzzy msgid "" -"Display file or file system status.\n" -"\n" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" @@ -9051,7 +9438,7 @@ msgstr "" " -L, --dereference\t跟随链接\n" " -f, --file-system\t显示文件系统状态而非文件状态\n" -#: src/stat.c:1337 +#: src/stat.c:1360 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -9066,7 +9453,7 @@ msgstr "" "\t\t\t\t加入\"\\n\"\n" " -t, --terse\t\t使用简洁格式输出\n" -#: src/stat.c:1348 +#: src/stat.c:1371 #, fuzzy msgid "" "\n" @@ -9087,7 +9474,7 @@ msgstr "" " %B 以字节为单位输出%b 所报告的每个块的大小\n" " %C SELinux 安全环境字符串\n" -#: src/stat.c:1357 +#: src/stat.c:1380 #, fuzzy msgid "" " %d device number in decimal\n" @@ -9104,7 +9491,7 @@ msgstr "" " %g\t文件的属组ID\n" " %G\t文件的属组组名\n" -#: src/stat.c:1365 +#: src/stat.c:1388 #, fuzzy msgid "" " %h number of hard links\n" @@ -9127,7 +9514,7 @@ msgstr "" " %t\t十六进制主设备类型\n" " %T\t十六进制子设备类型\n" -#: src/stat.c:1376 +#: src/stat.c:1399 #, fuzzy msgid "" " %u user ID of owner\n" @@ -9154,7 +9541,7 @@ msgstr "" " %Z\t从UNIX 元年起以秒计的上次更改时间\n" "\n" -#: src/stat.c:1390 +#: src/stat.c:1413 #, fuzzy msgid "" "Valid format sequences for file systems:\n" @@ -9173,7 +9560,7 @@ msgstr "" " %d\t文件系统中空闲文件节点数\n" " %f\t文件系统中空闲块数\n" -#: src/stat.c:1399 +#: src/stat.c:1422 #, fuzzy msgid "" " %i file system ID in hex\n" @@ -9198,14 +9585,14 @@ msgid "Usage: %s OPTION... COMMAND\n" msgstr "用法：%s [选项]... 命令\n" #: src/stdbuf.c:91 +#, fuzzy msgid "" "Run COMMAND, with modified buffering operations for its standard streams.\n" -"\n" msgstr "" "运行标准流缓冲区操作已改变的 COMMAND。\n" "\n" -#: src/stdbuf.c:98 +#: src/stdbuf.c:97 msgid "" " -i, --input=MODE adjust standard input stream buffering\n" " -o, --output=MODE adjust standard output stream buffering\n" @@ -9215,7 +9602,7 @@ msgstr "" " -o, --output=MODE 调整标准输出流缓冲区\n" " -e, --error=MODE 调整标准错误流缓冲区\n" -#: src/stdbuf.c:105 +#: src/stdbuf.c:104 #, fuzzy msgid "" "\n" @@ -9226,7 +9613,7 @@ msgstr "" "若 MODE 是 L，则相应的流将是行缓冲模式。\n" "标准输入流下此选项无效。\n" -#: src/stdbuf.c:108 +#: src/stdbuf.c:107 #, fuzzy msgid "" "\n" @@ -9235,7 +9622,7 @@ msgstr "" "\n" "若 MODE 是 0，则相应的流将不缓冲。\n" -#: src/stdbuf.c:111 +#: src/stdbuf.c:110 msgid "" "\n" "Otherwise MODE is a number which may be followed by one of the following:\n" @@ -9250,7 +9637,7 @@ msgstr "" "在此情况下，相应的流将缓冲由 MODE 指定大小的缓冲字节。\n" "\n" -#: src/stdbuf.c:117 +#: src/stdbuf.c:116 #, fuzzy msgid "" "\n" @@ -9266,22 +9653,22 @@ msgstr "" "还有某些滤件程序(如dd 和cat 之类)，它们不使用输入输出流，\n" "因此不受stdbuf 设置的影响。\n" -#: src/stdbuf.c:227 +#: src/stdbuf.c:226 #, c-format msgid "failed to find %s" msgstr "查找%s 失败" -#: src/stdbuf.c:247 src/stdbuf.c:279 +#: src/stdbuf.c:246 src/stdbuf.c:278 #, c-format msgid "failed to update the environment with %s" msgstr "更新%s 的环境失败" -#: src/stdbuf.c:321 +#: src/stdbuf.c:320 #, c-format msgid "line buffering stdin is meaningless" msgstr "对标准输入进行行缓冲无意义" -#: src/stty.c:509 +#: src/stty.c:513 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -9292,10 +9679,13 @@ msgstr "" "　或：%s [-F 设备 | --file=设备] [-a|--all]\n" "　或：%s [-F 设备 | --file=设备] [-g|--save]\n" -#: src/stty.c:515 +#: src/stty.c:519 +msgid "Print or change terminal characteristics.\n" +msgstr "" + +#: src/stty.c:525 +#, fuzzy msgid "" -"Print or change terminal characteristics.\n" -"\n" " -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" @@ -9306,7 +9696,7 @@ msgstr "" " -g, --save\t\t以stty 可读取的格式输出当前全部设置\n" " -F, --file=设备\t打开并使用指定设备代替标准输入\n" -#: src/stty.c:524 +#: src/stty.c:532 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -9316,7 +9706,7 @@ msgstr "" "可选- 在设置前的指示中，* 标记出了非POSIX 标准的设置。以下系\n" "统定义象征了哪些设置是有效的。\n" -#: src/stty.c:529 +#: src/stty.c:537 msgid "" "\n" "Special characters:\n" @@ -9330,7 +9720,7 @@ msgstr "" " eof\t字符\t表示文件末尾而发送的字符(用于终止输入)\n" " eol\t字符\t为表示行尾而发送的字符\n" -#: src/stty.c:536 +#: src/stty.c:544 msgid "" " * eol2 CHAR alternate CHAR for ending the line\n" " erase CHAR CHAR will erase the last character typed\n" @@ -9342,7 +9732,7 @@ msgstr "" " intr 字符\t用于发送中断信号的字符\n" " kill 字符\t用于擦除当前终端行的字符\n" -#: src/stty.c:542 +#: src/stty.c:550 msgid "" " * lnext CHAR CHAR will enter the next character quoted\n" " quit CHAR CHAR will send a quit signal\n" @@ -9354,7 +9744,7 @@ msgstr "" " * rprnt 字符\t用于重绘当前行的字符\n" " start 字符\t在停止后重新开启输出的字符\n" -#: src/stty.c:548 +#: src/stty.c:556 msgid "" " stop CHAR CHAR will stop the output\n" " susp CHAR CHAR will send a terminal stop signal\n" @@ -9366,7 +9756,7 @@ msgstr "" " * swtch 字符\t在不同的shell 层次间切换的字符\n" " * werase 字符\t擦除前一个输入的单词的字符\n" -#: src/stty.c:554 +#: src/stty.c:562 msgid "" "\n" "Special settings:\n" @@ -9380,7 +9770,7 @@ msgstr "" " * cols N\t统治内核终端上有N 栏\n" " * columns N\t等于cols N\n" -#: src/stty.c:561 +#: src/stty.c:569 msgid "" " ispeed N set the input speed to N\n" " * line N use line discipline N\n" @@ -9393,7 +9783,7 @@ msgstr "" " min N\t和 -icanon 配合使用，设置每次一完整读入的最小字符数为<N>\n" " ospeed N\t设置输出速度为N 波特\n" -#: src/stty.c:567 +#: src/stty.c:575 msgid "" " * rows N tell the kernel that the terminal has N rows\n" " * size print the number of rows and columns according to the " @@ -9406,13 +9796,15 @@ msgstr "" " speed\t输出终端速度(单位为波特)\n" " time N\t和-icanon 配合使用，设置读取超时为N 个十分之一秒\n" -#: src/stty.c:573 +#: src/stty.c:581 +#, fuzzy msgid "" "\n" "Control settings:\n" " [-]clocal disable modem control signals\n" " [-]cread allow input to be received\n" " * [-]crtscts enable RTS/CTS handshaking\n" +" * [-]cdtrdsr enable DTR/DSR handshaking\n" " csN set character size to N bits, N in [5..8]\n" msgstr "" "\n" @@ -9422,7 +9814,7 @@ msgstr "" " * [-]crtscts\t启用RTS/CTS 握手\n" " csN\t\t设置字符大小为N 位，N 的范围为5 到8\n" -#: src/stty.c:581 +#: src/stty.c:590 #, fuzzy msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" @@ -9430,7 +9822,7 @@ msgid "" " [-]hupcl same as [-]hup\n" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" -" [-]parodd set odd parity (even with '-')\n" +" [-]parodd set odd parity (or even parity with '-')\n" msgstr "" " [-]cstopb\t每个字符使用2 位停止位 (要恢复成1 位配合\"-\"即可)\n" " [-]hup\t当最后一个进程关闭标准终端后发送挂起信号\n" @@ -9438,7 +9830,7 @@ msgstr "" " [-]parenb\t对输出生成奇偶校验位并等待输入的奇偶校验位\n" " [-]parodd\t设置校验位为奇数 (配合\"-\"则为偶数)\n" -#: src/stty.c:588 +#: src/stty.c:597 msgid "" "\n" "Input settings:\n" @@ -9454,7 +9846,7 @@ msgstr "" " [-]ignbrk\t忽略中断字符\n" " [-]igncr\t忽略回车\n" -#: src/stty.c:596 +#: src/stty.c:605 msgid "" " [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" @@ -9468,11 +9860,11 @@ msgstr "" " [-]inpck\t启用输入奇偶性校验\n" " [-]istrip\t剥除输入字符的高8 位比特\n" -#: src/stty.c:603 +#: src/stty.c:612 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr " * [-]iutf8\t假定输入字符都是UTF-8 编码\n" -#: src/stty.c:606 +#: src/stty.c:615 msgid "" " * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" @@ -9488,7 +9880,7 @@ msgstr "" " [-]parmrk\t标记奇偶校验错误 (结合255-0 字符序列)\n" " [-]tandem\t等于[-]ixoff\n" -#: src/stty.c:614 +#: src/stty.c:623 msgid "" "\n" "Output settings:\n" @@ -9504,7 +9896,7 @@ msgstr "" " * ffN\t\t换页延迟的风格，N 的值为0 至1\n" " * nlN\t\t换行延迟的风格，N 的值为0 至1\n" -#: src/stty.c:622 +#: src/stty.c:631 msgid "" " * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of null characters\n" @@ -9520,7 +9912,7 @@ msgstr "" " * [-]onlcr\t将换行符转换为回车\n" " * [-]onlret\t使得换行符的行为表现和回车相同\n" -#: src/stty.c:630 +#: src/stty.c:639 msgid "" " * [-]onocr do not print carriage returns in the first column\n" " [-]opost postprocess output\n" @@ -9536,7 +9928,7 @@ msgstr "" " * -tabs\t等于tab3\n" " * vtN\t\t垂直制表符延迟的风格，N 的值为0 至1\n" -#: src/stty.c:638 +#: src/stty.c:647 msgid "" "\n" "Local settings:\n" @@ -9550,7 +9942,7 @@ msgstr "" " * crtkill\t依照echoprt 和echoe 的设置清除所有行\n" " * -crtkill\t依照echoctl 和echol 的设置清除所有行\n" -#: src/stty.c:645 +#: src/stty.c:654 #, fuzzy msgid "" " * [-]ctlecho echo control characters in hat notation ('^c')\n" @@ -9565,7 +9957,7 @@ msgstr "" " [-]echoe 等于[-]crterase\n" " [-]echok\t在每清除一个字符后输出一次换行\n" -#: src/stty.c:652 +#: src/stty.c:661 #, fuzzy msgid "" " * [-]echoke same as [-]crtkill\n" @@ -9580,7 +9972,7 @@ msgstr "" " [-]icanon\t启用erase、kill、werase 和rprnt 等特殊字符\n" " [-]iexten\t允许POSIX 标准以外的特殊字符\n" -#: src/stty.c:659 +#: src/stty.c:668 #, fuzzy msgid "" " [-]isig enable interrupt, quit, and suspend special characters\n" @@ -9596,7 +9988,7 @@ msgstr "" " * [-]tostop\t中止尝试向终端写入数据的后台任务\n" " * [-]xcase\t和icanon 配合使用，用转义符\"\\\"退出大写状态\n" -#: src/stty.c:666 +#: src/stty.c:675 msgid "" "\n" "Combination settings:\n" @@ -9610,7 +10002,7 @@ msgstr "" " cbreak\t等于-icanon\n" " -cbreak\t等于icanon\n" -#: src/stty.c:673 +#: src/stty.c:682 msgid "" " cooked same as brkint ignpar istrip icrnl ixon opost isig\n" " icanon, eof and eol characters to their default values\n" @@ -9622,7 +10014,7 @@ msgstr "" " -cooked\t等于-raw\n" " crt\t\t等于echoe echoctl echoke\n" -#: src/stty.c:679 +#: src/stty.c:688 msgid "" " dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" " kill ^u\n" @@ -9635,7 +10027,7 @@ msgstr "" " ek\t\t清除所有字符，将它们回溯为默认值\n" " evenp\t等于parenb -parodd cs7\n" -#: src/stty.c:686 +#: src/stty.c:695 msgid "" " -evenp same as -parenb cs8\n" " * [-]lcase same as xcase iuclc olcuc\n" @@ -9651,7 +10043,7 @@ msgstr "" " nl\t\t等于-icrnl -onlcr\n" " -nl\t\t等于icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" -#: src/stty.c:694 +#: src/stty.c:703 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -9665,7 +10057,7 @@ msgstr "" " pass8\t等于-parenb -istrip cs8\n" " -pass8\t等于parenb istrip cs7\n" -#: src/stty.c:701 +#: src/stty.c:710 msgid "" " raw same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" " -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n" @@ -9677,7 +10069,7 @@ msgstr "" " -imaxbel -opost -isig -icanon -xcase min 1 time 0\n" " -raw\t等于cooked\n" -#: src/stty.c:707 +#: src/stty.c:716 msgid "" " sane same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" " -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n" @@ -9693,7 +10085,7 @@ msgstr "" "\t\t-xcase -tostop -echoprt echoctl echoke，所有特殊字符均\n" "\t\t使用默认值\n" -#: src/stty.c:715 +#: src/stty.c:724 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -9707,136 +10099,59 @@ msgstr "" "规则以及与标准stty 设置间的偏差。在设置中，字符会被逐字读取或是被编码为^c、\n" "0x37、0177 或127 这样的字符，其中有特殊值^- 或undef 被用于禁止特殊字符。\n" -#: src/stty.c:787 +#: src/stty.c:796 #, c-format msgid "only one device may be specified" msgstr "只能指定一个设备" -#: src/stty.c:817 +#: src/stty.c:826 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" "mutually exclusive" msgstr "verbose 和 stty-readable 两种输入风格的选项是互相抵触的" -#: src/stty.c:823 +#: src/stty.c:832 #, c-format msgid "when specifying an output style, modes may not be set" msgstr "当指定了输出风格时，模式不能再被设置" -#: src/stty.c:838 +#: src/stty.c:847 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s：无法重置非阻塞模式" -#: src/stty.c:883 src/stty.c:993 +#: src/stty.c:892 src/stty.c:1002 #, c-format msgid "invalid argument %s" msgstr "无效的参数 %s" -#: src/stty.c:894 src/stty.c:911 src/stty.c:923 src/stty.c:936 src/stty.c:948 -#: src/stty.c:968 +#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957 +#: src/stty.c:977 #, c-format msgid "missing argument to %s" msgstr "缺少%s 的参数" -#: src/stty.c:974 +#: src/stty.c:983 #, c-format msgid "invalid line discipline %s" msgstr "无效的行约束%s" -#: src/stty.c:1044 +#: src/stty.c:1053 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s：无法执行所有请求的操作" -#: src/stty.c:1390 +#: src/stty.c:1399 #, c-format msgid "%s: no size information for this device" msgstr "%s：此设备没有大小信息" -#: src/stty.c:1904 +#: src/stty.c:1920 #, c-format msgid "invalid integer argument %s" msgstr "无效的整数参数%s" -#: src/su.c:229 -msgid "Password:" -msgstr "密码：" - -#: src/su.c:232 -#, c-format -msgid "getpass: cannot open /dev/tty" -msgstr "getpass：无法打开 /dev/tty" - -#: src/su.c:290 -#, c-format -msgid "cannot set groups" -msgstr "无法设置组" - -#: src/su.c:294 -#, c-format -msgid "cannot set group id" -msgstr "无法设置组ID" - -#: src/su.c:296 -#, c-format -msgid "cannot set user id" -msgstr "无法设置用户ID" - -#: src/su.c:371 -#, c-format -msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" -msgstr "用法：%s [选项]... [-] [用户 [参数]... ]\n" - -#: src/su.c:372 -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 "" -"更改有效用户ID 和组ID 为指定用户。\n" -"\n" -" -, -l, --login\t\t使该shell 成为登录shell\n" -" -c, --command=命令\t\t向shell 传递单一命令\n" -" -f, --fast 针对csh 或tcsh 传递-f\n" -" -m, --preserve-environment\t不重设环境变量\n" -" -p\t\t\t\t等于-m\n" -" -s, --shell=SHELL\t\t如果/etc/shells allows 则运行指定的SHELL\n" - -#: src/su.c:384 -msgid "" -"\n" -"A mere - implies -l. If USER not given, assume root.\n" -msgstr "" -"\n" -"单独的\"-\"选项隐含了-l。如果不指定用户，则假设其为root。\n" - -#: src/su.c:461 -#, c-format -msgid "user %s does not exist" -msgstr "用户%s 不存在" - -#: src/su.c:484 -#, c-format -msgid "incorrect password" -msgstr "密码不正确" - -#: src/su.c:501 -#, c-format -msgid "using restricted shell %s" -msgstr "正在使用受限的shell %s" - -#: src/su.c:509 -#, c-format -msgid "warning: cannot change directory to %s" -msgstr "警告：无法切换到目录%s" - #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 msgid "Kayvan Aghaiepour" @@ -9867,7 +10182,7 @@ msgstr "" msgid "ignoring all arguments" msgstr "忽略任何参数" -#: src/system.h:340 +#: src/system.h:343 #, c-format msgid "" "\n" @@ -9879,15 +10194,22 @@ msgstr "" "注意：您的shell 内含自己的%s 程序版本，它会覆盖这里所提及的相应\n" "版本。请查阅您的shell 文档获知它所支持的选项。\n" -#: src/system.h:346 +#: src/system.h:349 msgid " --help display this help and exit\n" msgstr " --help\t\t显示此帮助信息并退出\n" -#: src/system.h:348 +#: src/system.h:351 msgid " --version output version information and exit\n" msgstr " --version\t\t显示版本信息并退出\n" -#: src/system.h:541 +#: src/system.h:544 +#, fuzzy +msgid "" +"\n" +"Mandatory arguments to long options are mandatory for short options too.\n" +msgstr "长选项必须使用的参数对于短选项时也是必需使用的。\n" + +#: src/system.h:552 msgid "" "\n" "SIZE is an integer and optional unit (example: 10M is 10*1024*1024). Units\n" @@ -9895,7 +10217,7 @@ msgid "" "1000).\n" msgstr "" -#: src/system.h:550 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -9908,7 +10230,7 @@ msgstr "" "及 BLOCKSIZE 环境变量中第一个可用的 SIZE 单位。\n" "否则，默认单位是 1024 字节(或是 512，若设定 POSIXLY_CORRECT 的话)。\n" -#: src/system.h:560 +#: src/system.h:571 #, c-format msgid "" "\n" @@ -9921,23 +10243,23 @@ msgstr "" #. <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:574 +#: src/system.h:585 #, 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:578 +#: src/system.h:589 #, c-format msgid "For complete documentation, run: info coreutils '%s invocation'\n" msgstr "要获取完整文档，请运行：info coreutils '%s invocation'\n" -#: src/system.h:585 +#: src/system.h:596 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "请尝试执行\"%s --help\"来获取更多信息。\n" -#: src/system.h:617 +#: src/system.h:628 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -9958,16 +10280,16 @@ 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" -"\n" msgstr "" "将每个指定文件按行倒置并写到标准输出。\n" "如果不指定文件，或文件为\"-\"，则从标准输入读取数据。\n" "\n" -#: src/tac.c:145 +#: src/tac.c:144 msgid "" " -b, --before attach the separator before instead of after\n" " -r, --regex interpret the separator as a regular expression\n" @@ -9977,42 +10299,42 @@ msgstr "" " -r, --regex\t\t\t将分隔标志视作正则表达式来解析\n" " -s, --separator=字符串\t使用指定字符串代替换行作为分隔标志\n" -#: src/tac.c:235 src/tac.c:336 +#: src/tac.c:234 src/tac.c:335 #, c-format msgid "%s: seek failed" msgstr "%s：检索失败" -#: src/tac.c:264 +#: src/tac.c:263 #, c-format msgid "record too large" msgstr "记录数据过大" -#: src/tac.c:451 +#: src/tac.c:450 #, fuzzy, c-format msgid "failed to create temporary file in %s" msgstr "无法在%s 创建临时文件" -#: src/tac.c:459 +#: src/tac.c:458 #, fuzzy, c-format msgid "failed to open %s for writing" msgstr "%s：无法以写模式打开" -#: src/tac.c:476 +#: src/tac.c:475 #, fuzzy, c-format msgid "failed to rewind stream for %s" msgstr "无法保留%s 的时间" -#: src/tac.c:512 src/tac.c:519 +#: src/tac.c:511 src/tac.c:518 #, c-format msgid "%s: write error" msgstr "%s：写入出错" -#: src/tac.c:572 +#: src/tac.c:571 #, fuzzy, c-format msgid "failed to open %s for reading" msgstr "无法打开%s 读取数据" -#: src/tac.c:630 +#: src/tac.c:629 #, c-format msgid "separator cannot be empty" msgstr "分隔符不能为空" @@ -10023,19 +10345,18 @@ msgid "Ian Lance Taylor" msgstr "Ian Lance Taylor" #: src/tail.c:262 -#, c-format +#, fuzzy, 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" -"\n" msgstr "" "显示每个指定文件的最后%d 行到标准输出。\n" "若指定了多于一个文件，程序会在每段输出的开始添加相应文件名作为头。\n" "如果不指定文件或文件为\"-\" ，则从标准输入读取数据。\n" "\n" -#: src/tail.c:271 +#: src/tail.c:270 msgid "" " -c, --bytes=K output the last K bytes; alternatively, use -c " "+K\n" @@ -10045,7 +10366,7 @@ msgstr "" " -c, --bytes=K\t\t输出最后K 字节；另外，使用-c +K 从每个文件的\n" "\t\t\t第K 字节输出\n" -#: src/tail.c:275 +#: src/tail.c:274 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -10058,7 +10379,7 @@ msgstr "" "\t\t\t-f, --follow 等于--follow=descriptor \n" " -F\t\t即--follow=name --retry\n" -#: src/tail.c:282 +#: src/tail.c:281 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -10079,7 +10400,7 @@ msgstr "" "\t\t\t\t接或重命名(这是循环日志文件的通常情况)。\n" "\t\t\t\t由于有inotify，这个选项很少使用。\n" -#: src/tail.c:295 +#: src/tail.c:294 msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" " -q, --quiet, --silent never output headers giving file names\n" @@ -10092,7 +10413,7 @@ msgstr "" " --retry\t\t即使目标文件不可访问依然试图打开；在与参数\n" "\t\t\t--follow=name 同时使用时常常有用。\n" -#: src/tail.c:302 +#: src/tail.c:301 #, fuzzy msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" @@ -10105,7 +10426,7 @@ msgstr "" "\t\t\t\t(默认1.0 秒)\n" " -v, --verbose\t\t总是输出给出文件名的头\n" -#: src/tail.c:311 +#: src/tail.c:310 #, fuzzy msgid "" "\n" @@ -10124,7 +10445,7 @@ msgstr "" "GB 1000*1000*1000，G 1024*1024*1024，以及T，P，E，Z，Y。\n" "\n" -#: src/tail.c:320 +#: src/tail.c:319 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" @@ -10138,64 +10459,64 @@ msgstr "" "tail 定期追踪打开给定名称的文件，以确认它是否被删除或被其它某些程序重新创建" "过。\n" -#: src/tail.c:379 +#: src/tail.c:378 #, c-format msgid "closing %s (fd=%d)" msgstr "正在关闭 %s (fd=%d)" -#: src/tail.c:454 +#: src/tail.c:453 #, c-format msgid "%s: cannot seek to relative offset %s" msgstr "%s：无法检索相对偏移量 %s" -#: src/tail.c:458 +#: src/tail.c:457 #, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "%s：无法检索相对偏移量的末尾 %s" -#: src/tail.c:895 +#: src/tail.c:894 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "无法定位 %s 的位置，回归为 polling 机制" -#: src/tail.c:907 -#, fuzzy, c-format +#: src/tail.c:906 +#, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" -msgstr "无法定位 %s 的位置，回归为 polling 机制" +msgstr "" -#: src/tail.c:964 +#: src/tail.c:963 #, c-format msgid "%s has become inaccessible" msgstr "%s 已不可访问" -#: src/tail.c:981 +#: src/tail.c:980 #, c-format msgid "%s has been replaced with an untailable file; giving up on this name" msgstr "%s 已被替换为tail 无法处理的文件，放弃跟踪" -#: src/tail.c:990 +#: src/tail.c:989 #, c-format msgid "%s has been replaced with a remote file. giving up on this name" msgstr "%s 已被替换为一个远程文件，放弃跟踪" -#: src/tail.c:1011 +#: src/tail.c:1010 #, c-format msgid "%s has become accessible" msgstr "%s 已经可以访问" -#: src/tail.c:1019 +#: src/tail.c:1018 #, c-format msgid "%s has appeared; following end of new file" msgstr "%s 已被建立，正在跟随新文件的末尾" -#: src/tail.c:1030 +#: src/tail.c:1029 #, c-format msgid "%s has been replaced; following end of new file" msgstr "%s 已被替换，正在跟随新文件的末尾" -#: src/tail.c:1131 +#: src/tail.c:1130 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s：无法更改非阻塞模式" @@ -10555,17 +10876,22 @@ msgstr "缺少\"]\"" msgid "extra argument %s" msgstr "多余的参数%s" -#: src/timeout.c:124 +#: src/timeout.c:112 +#, c-format +msgid "warning: sigprocmask" +msgstr "" + +#: src/timeout.c:145 #, c-format msgid "warning: timer_settime" msgstr "" -#: src/timeout.c:129 +#: src/timeout.c:150 #, c-format msgid "warning: timer_create" msgstr "" -#: src/timeout.c:204 +#: src/timeout.c:225 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -10574,19 +10900,20 @@ msgstr "" "用法：%s [选项] 停留时间 命令 [参数]...\n" "　或：%s 选项\n" -#: src/timeout.c:208 -msgid "" -"Start COMMAND, and kill it if still running after DURATION.\n" -"\n" -"Mandatory arguments to long options are mandatory for short options too.\n" +#: src/timeout.c:229 +#, fuzzy +msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "" "运行指定命令，在指定的停留时间后若该命令仍在运行则将其中止。\n" "\n" "长选项必须使用的参数对于短选项时也是必需使用的。\n" -#: src/timeout.c:213 +#: src/timeout.c:235 #, fuzzy msgid "" +" --preserve-status\n" +" exit with the same status as COMMAND, even when the\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 " @@ -10606,7 +10933,7 @@ msgstr "" "\t\t指定在超时时发送的信号。信号可以是类似\"HUP\"的信号名或是信号数。\n" "\t\t查看\"kill -l\"以获得信号列表\n" -#: src/timeout.c:229 +#: src/timeout.c:254 #, fuzzy msgid "" "\n" @@ -10619,16 +10946,16 @@ msgstr "" "\"s\"代表秒(默认值)，\"m\"代表分，\"h\"代表小时，\"d\"代表天。\n" "\n" -#: src/timeout.c:234 +#: src/timeout.c:259 #, fuzzy msgid "" "\n" -"If the command times out, then exit with status 124. Otherwise, exit\n" -"with the status of COMMAND. If no signal is specified, send the TERM\n" -"signal upon timeout. The TERM signal kills any process that does not\n" -"block or catch that signal. For other processes, it may be necessary to\n" -"use the KILL (9) signal, since this signal cannot be caught. If the\n" -"KILL (9) signal is sent, the exit status is 128+9 rather than 124.\n" +"If the command times out, and --preserve-status is not set, then exit with\n" +"status 124. Otherwise, exit with the status of COMMAND. If no signal\n" +"is specified, send the TERM signal upon timeout. The TERM signal kills\n" +"any process that does not block or catch that signal. It may be necessary\n" +"to use the KILL (9) signal, since this signal cannot be caught, in which\n" +"case the exit status is 128+9 rather than 124.\n" msgstr "" "\n" "如果程序超时则退出状态数为124，否则返回程序退出状态。\n" @@ -10636,14 +10963,19 @@ msgstr "" "程。\n" "对于另一些进程可能需要使用KILL (9)信号，当然此信号不能被捕获。\n" -#: src/timeout.c:419 +#: src/timeout.c:363 +#, c-format +msgid "warning: disabling core dumps failed" +msgstr "" + +#: src/timeout.c:471 #, c-format msgid "error waiting for command" msgstr "等待命令出错" -#: src/timeout.c:441 +#: src/timeout.c:482 #, c-format -msgid "warning: disabling core dumps failed" +msgid "the monitored command dumped core" msgstr "" #. This is a proper name. See the gettext manual, section Names. @@ -10656,22 +10988,23 @@ msgstr "Jim Kingdon" msgid "Randy Smith" msgstr "Randy Smith" -#: src/touch.c:115 src/touch.c:313 +#: src/touch.c:115 src/touch.c:309 #, c-format msgid "invalid date format %s" msgstr "日期格式%s 无效" -#: src/touch.c:194 +#: src/touch.c:191 #, c-format msgid "cannot touch %s" msgstr "无法创建%s" -#: src/touch.c:200 +#: src/touch.c:197 #, c-format msgid "setting times of %s" msgstr "正在设置%s 的时间" -#: src/touch.c:216 +#: src/touch.c:213 +#, fuzzy msgid "" "Update the access and modification times of each FILE to the current time.\n" "\n" @@ -10680,7 +11013,6 @@ msgid "" "\n" "A FILE argument string of - is handled specially and causes touch to\n" "change the times of the file associated with standard output.\n" -"\n" msgstr "" "将每个文件的访问时间和修改时间改为当前时间。\n" "\n" @@ -10689,7 +11021,7 @@ msgstr "" "如果文件名为\"-\"则特殊处理，更改与标准输出相关的文件的访问时间。\n" "\n" -#: src/touch.c:229 +#: src/touch.c:225 msgid "" " -a change only the access time\n" " -c, --no-create do not create any files\n" @@ -10701,7 +11033,7 @@ msgstr "" " -d, --date=字符串\t使用指定字符串表示时间而非当前时间\n" " -f\t\t\t(忽略)\n" -#: src/touch.c:235 +#: src/touch.c:231 msgid "" " -h, --no-dereference affect each symbolic link instead of any " "referenced\n" @@ -10713,11 +11045,12 @@ msgstr "" "\t\t\t\t(当系统支持更改符号链接的所有者时，此选项才有用)\n" " -m\t\t\t只更改修改时间\n" -#: src/touch.c:241 +#: 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" -" --time=WORD change the specified time:\n" +" --time=WORD change the specified time:\n" " WORD is access, atime, or use: equivalent to -a\n" " WORD is modify or mtime: equivalent to -m\n" msgstr "" @@ -10726,7 +11059,7 @@ msgstr "" " --time=WORD\t\t使用WORD 指定的时间：access、atime、use 都等于-a\n" "\t\t\t选项的效果，而modify、mtime 等于-m 选项的效果\n" -#: src/touch.c:250 +#: src/touch.c:246 msgid "" "\n" "Note that the -d and -t options accept different time-date formats.\n" @@ -10734,12 +11067,12 @@ msgstr "" "\n" "请注意，-d 和-t 选项可接受不同的时间/日期格式。\n" -#: src/touch.c:339 +#: src/touch.c:335 #, c-format msgid "cannot specify times from more than one source" msgstr "无法由多于一种的来源来指定时间" -#: src/touch.c:413 +#: src/touch.c:409 #, fuzzy, c-format msgid "" "warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'" @@ -10998,6 +11331,7 @@ msgid "Usage: %s OPTION... FILE...\n" msgstr "用法：%s 选项... 文件...\n" #: src/truncate.c:97 +#, fuzzy msgid "" "Shrink or extend the size of each FILE to the specified size\n" "\n" @@ -11006,7 +11340,6 @@ msgid "" "If a FILE is larger than the specified size, the extra data is lost.\n" "If a FILE is shorter, it is extended and the extended part (hole)\n" "reads as zero bytes.\n" -"\n" msgstr "" "将文件缩减或扩展至指定大小。\n" "\n" @@ -11016,16 +11349,16 @@ msgstr "" "如果指定文件小于指定大小则用0 补足。\n" "\n" -#: src/truncate.c:110 +#: src/truncate.c:109 msgid " -c, --no-create do not create any files\n" msgstr " -c, --no-create\t不创建文件\n" -#: src/truncate.c:113 +#: src/truncate.c:112 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr " -o, --io-blocks\t将SIZE 视为IO 块数而不使用字节数\n" -#: src/truncate.c:116 +#: 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" @@ -11033,7 +11366,7 @@ msgstr "" " -r, --reference=文件 使用此文件的大小\n" " -s, --size=大小\t使用此大小\n" -#: src/truncate.c:122 +#: src/truncate.c:121 #, fuzzy msgid "" "\n" @@ -11050,57 +11383,57 @@ msgstr "" "\"/\" 运算的数学计算式为 m / n * n；\n" "\"%\" 运算的数学计算式为( m + n - 1 ) / n * n\n" -#: src/truncate.c:150 +#: src/truncate.c:149 #, c-format msgid "overflow in %<PRIdMAX> * %<PRIdMAX> byte blocks for file %s" msgstr "在文件%3$s 的%1$<PRIdMAX> * %2$<PRIdMAX> 字节块中溢出" -#: src/truncate.c:174 +#: src/truncate.c:173 #, c-format msgid "%s has unusable, apparently negative size" msgstr "%s 的文件大小为负数，无法使用" -#: src/truncate.c:184 src/truncate.c:379 +#: src/truncate.c:183 src/truncate.c:384 #, c-format msgid "cannot get the size of %s" msgstr "无法获得%s 的大小" -#: src/truncate.c:206 +#: src/truncate.c:205 #, c-format msgid "overflow rounding up size of file %s" msgstr "处理大于等于文件%s 的指定大小的最大倍数时溢出" -#: src/truncate.c:216 +#: src/truncate.c:215 #, c-format msgid "overflow extending size of file %s" msgstr "扩展文件%s 大小时溢出" -#: src/truncate.c:231 +#: src/truncate.c:230 #, c-format msgid "failed to truncate %s at %<PRIdMAX> bytes" msgstr "在%2$<PRIdMAX> 字节处截断%1$s 失败" -#: src/truncate.c:305 +#: src/truncate.c:303 #, c-format msgid "multiple relative modifiers specified" msgstr "指定了多个相关修饰符" -#: src/truncate.c:335 +#: src/truncate.c:333 #, c-format msgid "you must specify either %s or %s" msgstr "您必须在%s 或%s 中指定一个" -#: src/truncate.c:342 +#: src/truncate.c:340 #, c-format msgid "you must specify a relative %s with %s" msgstr "您必须为%2$s 中指定一个相关的%1$s" -#: src/truncate.c:349 +#: src/truncate.c:347 #, c-format msgid "%s was specified but %s was not" msgstr "已指定%s 但未指定%s" -#: src/truncate.c:400 +#: src/truncate.c:404 #, c-format msgid "cannot open %s for writing" msgstr "无法打开%s 读取数据" @@ -11193,16 +11526,16 @@ msgid "cannot get system name" 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" -"\n" msgstr "" "将每个指定文件中的空白字符转换为制表符并写到标准输出。\n" "如果不指定文件，或者文件为\"-\"，则从标准输入读取数据。\n" "\n" -#: src/unexpand.c:125 +#: src/unexpand.c:124 msgid "" " -a, --all convert all blanks, instead of just initial blanks\n" " --first-only convert only leading sequences of blanks (overrides -a)\n" @@ -11214,12 +11547,12 @@ msgstr "" " -t, --tabs=N\t\t设置制表符宽度为N 而非默认的8(启用-a 选项)\n" " -t, --tabs=列表\t使用逗号分隔的列表列出制表符位置(启用-a 选项)\n" -#: src/unexpand.c:153 +#: src/unexpand.c:152 #, c-format msgid "tabs are too far apart" msgstr "制表符过于分散" -#: src/unexpand.c:505 +#: src/unexpand.c:504 #, c-format msgid "tab stop value is too large" msgstr "制表符限长过大" @@ -11230,19 +11563,19 @@ msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n" msgstr "用法：%s [选项]... [文件]\n" #: src/uniq.c:138 +#, fuzzy 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" -"\n" msgstr "" "从输入文件或者标准输入中筛选相邻的匹配行并写入到输出文件或标准输出。\n" "\n" "不附加任何选项时匹配行将在首次出现处被合并。\n" "\n" -#: src/uniq.c:148 +#: src/uniq.c:147 msgid "" " -c, --count prefix lines by the number of occurrences\n" " -d, --repeated only print duplicate lines\n" @@ -11250,7 +11583,7 @@ msgstr "" " -c, --count\t\t在每行前加上表示相应行目出现次数的前缀编号\n" " -d, --repeated\t只输出重复的行\n" -#: src/uniq.c:152 +#: src/uniq.c:151 msgid "" " -D, --all-repeated[=delimit-method] print all duplicate lines\n" " delimit-method={none(default),prepend,separate}\n" @@ -11270,11 +11603,11 @@ msgstr "" " -u, --unique\t\t只显示唯一的行\n" " -z, --zero-terminated\t使用'\\0'作为行结束符，而不是新换行\n" -#: src/uniq.c:162 +#: src/uniq.c:161 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:167 +#: src/uniq.c:166 msgid "" "\n" "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n" @@ -11284,7 +11617,7 @@ msgstr "" "若域中为先空字符(通常包括空格以及制表符)，然后非空字符，域中字符前的空字符将" "被跳过。\n" -#: src/uniq.c:172 +#: src/uniq.c:171 #, fuzzy msgid "" "\n" @@ -11297,24 +11630,24 @@ msgstr "" "如果您想先对输入排序，使用没有uniq 的\"sort -u\"。\n" "同时，比较服从\"LC_COLLATE\" 变量所指定的规则。\n" -#: src/uniq.c:359 +#: src/uniq.c:358 #, c-format msgid "too many repeated lines" msgstr "重复行过多" -#: src/uniq.c:522 +#: src/uniq.c:521 msgid "invalid number of fields to skip" msgstr "要略过的区块数量无效" -#: src/uniq.c:531 +#: src/uniq.c:530 msgid "invalid number of bytes to skip" msgstr "要略过的字节数量无效" -#: src/uniq.c:540 +#: src/uniq.c:539 msgid "invalid number of bytes to compare" msgstr "要对照的字节数量无效" -#: src/uniq.c:559 +#: src/uniq.c:558 #, c-format msgid "printing all duplicated lines and repeat counts is meaningless" msgstr "同时输出重复的行和重复计数是没有意义的" @@ -11367,6 +11700,11 @@ msgid "up %ld day %2d:%02d, " msgid_plural "up %ld days %2d:%02d, " msgstr[0] "已启动%ld 天%2d:%02d，" +#: src/uptime.c:149 +#, fuzzy, c-format +msgid "up %2d:%02d, " +msgstr "已启动%ld 天%2d:%02d，" + #: src/uptime.c:151 #, c-format msgid "%lu user" @@ -11457,39 +11795,39 @@ msgstr "" msgid " old " msgstr " 旧的 " -#: src/who.c:449 +#: src/who.c:440 msgid "system boot" msgstr "系统引导" -#: src/who.c:456 src/who.c:458 +#: src/who.c:447 src/who.c:449 msgid "id=" msgstr "id=" -#: src/who.c:471 src/who.c:476 +#: src/who.c:462 src/who.c:467 msgid "term=" msgstr "终端=" -#: src/who.c:473 src/who.c:477 +#: src/who.c:464 src/who.c:468 msgid "exit=" msgstr "退出=" -#: src/who.c:494 +#: src/who.c:485 msgid "LOGIN" msgstr "登录" -#: src/who.c:514 +#: src/who.c:505 msgid "clock change" msgstr "时钟更改" -#: src/who.c:526 src/who.c:527 +#: src/who.c:517 src/who.c:518 msgid "run-level" msgstr "运行级别" -#: src/who.c:530 src/who.c:531 +#: src/who.c:521 src/who.c:522 msgid "last=" msgstr "最近=" -#: src/who.c:562 +#: src/who.c:553 #, c-format msgid "" "\n" @@ -11498,44 +11836,44 @@ msgstr "" "\n" "# 用户数=%lu\n" -#: src/who.c:568 +#: src/who.c:559 msgid "NAME" msgstr "名称" -#: src/who.c:568 +#: src/who.c:559 msgid "LINE" msgstr "线路" -#: src/who.c:568 +#: src/who.c:559 msgid "TIME" msgstr "时间" -#: src/who.c:568 +#: src/who.c:559 msgid "IDLE" msgstr "空闲" -#: src/who.c:569 +#: src/who.c:560 msgid "PID" msgstr "进程号" -#: src/who.c:569 +#: src/who.c:560 msgid "COMMENT" msgstr "备注" -#: src/who.c:569 +#: src/who.c:560 msgid "EXIT" msgstr "退出" -#: src/who.c:649 +#: src/who.c:640 #, c-format msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n" msgstr "用法：%s [选项]... [ 文件 | 参数1 参数2 ]\n" -#: src/who.c:650 +#: src/who.c:641 msgid "Print information about users who are currently logged in.\n" msgstr "显示当前已登录的用户信息。\n" -#: src/who.c:653 +#: src/who.c:644 msgid "" "\n" " -a, --all same as -b -d --login -p -r -t -T -u\n" @@ -11549,11 +11887,11 @@ msgstr "" " -d, --dead\t\t显示已死的进程\n" " -H, --heading\t输出头部的标题列\n" -#: src/who.c:660 +#: src/who.c:651 msgid " -l, --login print system login processes\n" msgstr " -l，--login\t\t显示系统登录进程\n" -#: src/who.c:663 +#: src/who.c:654 msgid "" " --lookup attempt to canonicalize hostnames via DNS\n" " -m only hostname and user associated with stdin\n" @@ -11563,7 +11901,7 @@ msgstr "" " -m\t\t\t只面对和标准输入有直接交互的主机和用户\n" " -p, --process\t显示由 init 进程衍生的活动进程\n" -#: src/who.c:668 +#: src/who.c:659 msgid "" " -q, --count all login names and number of users logged on\n" " -r, --runlevel print current runlevel\n" @@ -11574,7 +11912,7 @@ msgstr "" " -r, --runlevel\t显示当前的运行级别\n" " -s, --short\t\t只显示名称、线路和时间(默认)\n" -#: src/who.c:674 +#: src/who.c:665 msgid "" " -T, -w, --mesg add user's message status as +, - or ?\n" " -u, --users list users logged in\n" @@ -11586,7 +11924,7 @@ msgstr "" " --message\t等于-T\n" " --writable\t等于-T\n" -#: src/who.c:682 +#: src/who.c:673 #, fuzzy, c-format msgid "" "\n" @@ -11631,20 +11969,23 @@ msgstr "" "重复输出一行指定的字符串，或者重复输出\"y\"。\n" "\n" +#~ msgid "using single-precision arithmetic" +#~ msgstr "使用单精度运算" + +#~ msgid "using arbitrary-precision arithmetic" +#~ msgstr "使用任意精度运算" + #, fuzzy -#~ msgid " gid=%s" -#~ msgstr " gid=%lu" +#~ msgid " returning value: '%s'\n" +#~ msgstr "正在创建文件%s\n" #, fuzzy -#~ msgid " euid=%s" -#~ msgstr " euid=%lu" +#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n" +#~ msgstr "用法：%s [选项] 名称...\n" -#~ msgid "" -#~ "Usage: %s NAME\n" -#~ " or: %s OPTION\n" -#~ msgstr "" -#~ "用法：%s 名称\n" -#~ "　或：%s 选项\n" +#, fuzzy +#~ msgid "no valid suffix found\n" +#~ msgstr "%s：文件类型无效" #~ msgid "" #~ "\n" @@ -11657,19 +11998,164 @@ msgstr "" #~ " %s /usr/bin/sort 输出\"sort\"。\n" #~ " %s include/stdio.h .h 输出\"stdio\"。\n" -#~ msgid "Usage: %s [OPTION] FILE...\n" -#~ msgstr "用法：%s [选项] 文件...\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" + +#~ 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\t\t跳过处于不同文件系统之上的目录\n" +#~ " -X, --exclude-from=文件\t排除与指定文件中描述的模式相符的文件\n" +#~ " --exclude=PATTERN\t\t排除与PATTERN 中描述的模式相符的文件\n" +#~ " --max-depth=N\t显示目录总计(与--all 一起使用计算文件)\n" +#~ "\t\t\t当N 为指定数值时计算深度为N；\n" +#~ "\t\t\t--max-depth=0 等于--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 不进行备份(即使使用了--backup 选项)\n" +#~ " numbered, t 备份文件加上数字进行排序\n" +#~ " existing, nil 若有数字的备份文件已经存在则使用数字，否则使用普通方式备" +#~ "份\n" +#~ " simple, never 永远使用普通方式备份\n" + +#~ msgid "" +#~ "WARNING: --page-increment is deprecated; use --line-increment instead" +#~ msgstr "警告：不推荐使用--page-increment，请使用--line-increment" + +#~ msgid "All arguments to long options are mandatory for short options.\n" +#~ msgstr "长选项必须用的参数在使用短选项时也是必须的。\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 为\"d\"时代表十进制，为\"o\"时代表八进制，为\"x\"时代表十六进" +#~ "制，\n" +#~ "\"n\"则代表无。\n" +#~ "BYTES 是以0x 或0X 为前缀的十六进制数，可能有以下几种后缀：\n" +#~ "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" +#~ "为任何类型添加\"z\"后缀都将在每个输出行的行尾显示可显示字符\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 选项代表3；不带数字的--width 选项代表32。\n" +#~ "默认情况下od 使用 -A o -t oS -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 "无法设置组ID" + +#~ msgid "cannot set user id" +#~ msgstr "无法设置用户ID" +#~ 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 "" +#~ "更改有效用户ID 和组ID 为指定用户。\n" +#~ "\n" +#~ " -, -l, --login\t\t使该shell 成为登录shell\n" +#~ " -c, --command=命令\t\t向shell 传递单一命令\n" +#~ " -f, --fast 针对csh 或tcsh 传递-f\n" +#~ " -m, --preserve-environment\t不重设环境变量\n" +#~ " -p\t\t\t\t等于-m\n" +#~ " -s, --shell=SHELL\t\t如果/etc/shells allows 则运行指定的SHELL\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 "正在使用受限的shell %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" -#~ " --dereference affect the referent of each symbolic link (this " -#~ "is\n" -#~ " the default), rather than the symbolic link " -#~ "itself\n" +#~ " -f, --silent, --quiet suppress most error messages\n" +#~ " -v, --verbose output a diagnostic for every file processed\n" #~ msgstr "" #~ "将每个指定文件的所属组设置为指定值。\n" #~ "如果使用 --reference，则将每个文件的所属组设置为与指定参考文件相同。\n" @@ -11678,6 +12164,13 @@ msgstr "" #~ " --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" @@ -11702,13 +12195,6 @@ msgstr "" #~ "\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" @@ -11753,25 +12239,21 @@ msgstr "" #~ " -v, --verbose\t\t\t为处理的所有文件显示诊断信息\n" #~ "\n" -#, fuzzy -#~ msgid "Usage: %s [OPTION]... PATH START\n" -#~ msgstr "用法：%s [选项]... SET1 [SET2]\n" - -#, fuzzy #~ msgid "" -#~ " -n, --no-newline do not output the trailing " -#~ "newline\n" -#~ " " +#~ "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 "" -#~ "将 STRING 回显到标准输出。\n" +#~ "以给定的格式显示当前时间，或是设置系统日期。\n" #~ "\n" -#~ " -n\t\t不尾随换行符\n" +#~ " -d,--date=字符串\t\t显示指定字符串所描述的时间，而非当前时间\n" +#~ " -f,--file=日期文件\t\t类似--date，从日期文件中按行读入时间描述\n" -#, fuzzy #~ msgid "" #~ "\n" -#~ "SIZE is an integer with an optional suffix (example: 10MB). Suffixes " -#~ "are:\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 "" @@ -11779,24 +12261,9 @@ msgstr "" #~ "SIZE 可以是一个可选的整数，后面跟着以下单位中的一个：\n" #~ "KB 1000，K 1024，MB 1000*1000，M 1024*1024，还有 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 "" -#~ "以给定的格式显示当前时间，或是设置系统日期。\n" -#~ "\n" -#~ " -d,--date=字符串\t\t显示指定字符串所描述的时间，而非当前时间\n" -#~ " -f,--file=日期文件\t\t类似--date，从日期文件中按行读入时间描述\n" - #~ msgid "cannot create link %s" #~ msgstr "无法创建链接%s" -#, fuzzy -#~ msgid "%s: option '%s' is ambiguous\n" -#~ msgstr "%s：选项\"-W %s\"歧义\n" - #~ msgid "" #~ "WARNING: --preserve_context is deprecated; use --preserve-context instead" #~ msgstr "警告：不推荐使用--preserve_context，请使用--preserve-context" @@ -11807,9 +12274,6 @@ msgstr "" #~ msgid "invalid number of lines: 0" #~ msgstr "无效的行数：0" -#~ msgid "invalid format width" -#~ msgstr "无效的格式宽度" - #~ msgid "invalid format precision" #~ msgstr "无效的格式精确度" @@ -12107,6 +12571,9 @@ msgstr "" #~ " -k 即--block-size=1K\n" #~ " -l, --count-links 连硬链接的大小也计算在内\n" +#~ msgid "Usage: %s [OPTION] FILE...\n" +#~ msgstr "用法：%s [选项] 文件...\n" + #~ msgid "???? days ??:??, " #~ msgstr "???? 天 ??:??， " diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo index 0f7009bd..f8fb1357 100644 Binary files a/po/zh_TW.gmo and b/po/zh_TW.gmo differ diff --git a/po/zh_TW.po b/po/zh_TW.po index 3e0ddd03..fb56c53f 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: 2012-05-10 19:35+0200\n" +"POT-Creation-Date: 2013-02-14 15:56+0000\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,19 +42,19 @@ msgstr "有效的參數為：" msgid "error closing file" msgstr "正在關閉輸入檔 %s" -#: lib/closeout.c:112 src/base64.c:109 src/base64.c:121 src/base64.c:127 -#: src/base64.c:168 src/base64.c:224 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:330 src/expand.c:355 src/head.c:298 -#: src/head.c:348 src/head.c:756 src/head.c:797 src/mktemp.c:350 src/od.c:919 -#: src/paste.c:160 src/shuf.c:369 src/split.c:727 src/split.c:964 -#: src/split.c:969 src/tail.c:350 src/tail.c:1201 src/tail.c:1307 +#: 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 -#: src/unexpand.c:427 src/unexpand.c:443 +#: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "寫入時發生錯誤" -#: lib/copy-acl.c:611 src/copy.c:1160 src/copy.c:2602 +#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617 #, fuzzy, c-format msgid "preserving permissions for %s" msgstr "正在更改 %s 的權限" @@ -252,18 +252,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:483 +#: lib/mkdir-p.c:196 src/install.c:484 #, c-format msgid "cannot change permissions of %s" msgstr "無法更改%s的權限" -#: lib/mkdir-p.c:206 src/copy.c:2261 src/install.c:709 src/install.c:722 +#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722 #, 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:915 src/tac.c:435 +#: src/split.c:929 src/tac.c:434 #, c-format msgid "memory exhausted" msgstr "記憶體耗盡" @@ -312,82 +312,82 @@ msgstr "’" msgid "%s: end of file" msgstr "關閉時發生錯誤" -#: lib/regcomp.c:130 +#: lib/regcomp.c:131 msgid "Success" msgstr "" -#: lib/regcomp.c:133 +#: lib/regcomp.c:134 msgid "No match" msgstr "" -#: lib/regcomp.c:136 +#: lib/regcomp.c:137 #, fuzzy msgid "Invalid regular expression" msgstr "%s：無效的正規表示式：%s" -#: lib/regcomp.c:139 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "" -#: lib/regcomp.c:142 +#: lib/regcomp.c:143 #, fuzzy msgid "Invalid character class name" msgstr "無效的字元種類‘%s’" -#: lib/regcomp.c:145 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "" -#: lib/regcomp.c:148 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "" -#: lib/regcomp.c:151 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "" -#: lib/regcomp.c:154 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "" -#: lib/regcomp.c:157 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "" -#: lib/regcomp.c:160 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "" -#: lib/regcomp.c:163 +#: lib/regcomp.c:164 #, fuzzy msgid "Invalid range end" msgstr "無效的類型‘%s’" -#: lib/regcomp.c:166 +#: lib/regcomp.c:167 #, fuzzy msgid "Memory exhausted" msgstr "記憶體耗盡" -#: lib/regcomp.c:169 +#: lib/regcomp.c:170 #, fuzzy msgid "Invalid preceding regular expression" msgstr "%s：無效的正規表示式：%s" -#: lib/regcomp.c:172 +#: lib/regcomp.c:173 #, fuzzy msgid "Premature end of regular expression" msgstr "在正規運算式搜尋時發生錯誤" -#: lib/regcomp.c:175 +#: lib/regcomp.c:176 #, fuzzy msgid "Regular expression too big" msgstr "在正規運算式搜尋時發生錯誤" -#: lib/regcomp.c:178 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:703 +#: lib/regcomp.c:704 #, fuzzy msgid "No previous regular expression" msgstr "在正規運算式搜尋時發生錯誤" @@ -427,7 +427,7 @@ msgstr "^[yY]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-mode-acl.c:695 src/copy.c:2284 src/cp.c:518 +#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516 #, c-format msgid "setting permissions for %s" msgstr "正在更改 %s 的權限" @@ -574,13 +574,13 @@ msgstr "開啟時發生錯誤" msgid "Resource lost" msgstr "" -#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262 -#: lib/spawn-pipe.c:265 +#: 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:232 lib/spawn-pipe.c:346 lib/wait-process.c:282 +#: 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" @@ -596,24 +596,24 @@ msgstr "" msgid "Unknown signal %d" msgstr "" -#: lib/unicodeio.c:103 +#: lib/unicodeio.c:102 msgid "iconv function not usable" msgstr "iconv 功能無法使用" -#: lib/unicodeio.c:105 +#: lib/unicodeio.c:104 msgid "iconv function not available" msgstr "iconv 功能不存在" -#: lib/unicodeio.c:112 +#: lib/unicodeio.c:111 msgid "character out of range" msgstr "字元值超出可接受的範圍以外" -#: lib/unicodeio.c:182 +#: lib/unicodeio.c:181 #, c-format msgid "cannot convert U+%04X to local character set" msgstr "無法將 U+%04X 轉換至使用者的字元集" -#: lib/unicodeio.c:184 +#: lib/unicodeio.c:183 #, c-format msgid "cannot convert U+%04X to local character set: %s" msgstr "無法將 U+%04X 轉換至使用者的字元集：%s" @@ -790,7 +790,7 @@ msgstr "" "\n" "請向 <%s> 回報錯誤。\n" -#: lib/version-etc.c:251 src/system.h:562 +#: lib/version-etc.c:251 src/system.h:573 #, c-format msgid "%s home page: <%s>\n" msgstr "" @@ -800,7 +800,7 @@ msgstr "" msgid "%s home page: <http://www.gnu.org/software/%s/>\n" msgstr "" -#: lib/version-etc.c:256 src/system.h:563 +#: lib/version-etc.c:256 src/system.h:574 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" @@ -887,14 +887,17 @@ msgid "Simon Josefsson" msgstr "" #: src/base64.c:60 -#, c-format +#, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" "Base64 encode or decode FILE, or standard input, to standard output.\n" -"\n" msgstr "" +"用法：%s [選項] [檔案]...\n" +" 或：%s [選項] --check [檔案]\n" +"印出或檢查 %s (%d 位元) 總和檢查值。\n" +"如果沒有指定 <檔案> 或 <檔案> 是 -，則由標準輸入讀取資料。\n" -#: src/base64.c:64 +#: src/base64.c:67 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -904,7 +907,7 @@ msgid "" "\n" msgstr "" -#: src/base64.c:73 src/cat.c:110 src/fmt.c:293 src/shuf.c:71 src/sum.c:70 +#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -912,7 +915,7 @@ msgstr "" "\n" "如果沒有指定<檔案>或<檔案>是 -，則由標準輸入讀取資料。\n" -#: src/base64.c:76 +#: src/base64.c:79 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -921,37 +924,37 @@ msgid "" "from any other non-alphabet bytes in the encoded stream.\n" msgstr "" -#: src/base64.c:171 src/base64.c:208 src/csplit.c:263 src/csplit.c:1435 -#: src/join.c:451 src/shuf.c:157 src/shuf.c:361 src/tac-pipe.c:74 +#: 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 #, c-format msgid "read error" msgstr "讀取時發生錯誤" -#: src/base64.c:227 +#: src/base64.c:230 #, fuzzy, c-format msgid "invalid input" msgstr "輸入旗標無效：%s" -#: src/base64.c:264 +#: src/base64.c:267 #, fuzzy, c-format msgid "invalid wrap size: %s" msgstr "無效的類型‘%s’" -#: src/base64.c:283 src/basename.c:173 src/comm.c:435 src/cp.c:607 -#: src/date.c:441 src/dircolors.c:447 src/du.c:894 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:169 src/install.c:929 src/join.c:961 -#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:157 src/mv.c:447 -#: src/od.c:1802 src/ptx.c:2081 src/readlink.c:154 src/seq.c:408 -#: src/shuf.c:320 src/shuf.c:339 src/sort.c:4477 src/split.c:1313 -#: src/tr.c:1797 src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:454 -#: src/uniq.c:471 src/unlink.c:81 src/uptime.c:250 src/users.c:146 -#: src/wc.c:666 src/who.c:836 src/whoami.c:79 +#: 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 #, c-format msgid "extra operand %s" msgstr "出現多餘的參數 %s" -#: src/base64.c:315 src/cat.c:781 +#: src/base64.c:318 src/cat.c:781 #, c-format msgid "closing standard input" msgstr "關閉標準輸入" @@ -959,15 +962,15 @@ 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/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:53 src/env.c:33 +#: 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/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:65 src/su.c:88 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 +#: 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 "Stuart Kemp 及 David MacKenzie" @@ -982,22 +985,22 @@ msgstr "" " 或：%s [選項]\n" #: src/basename.c:53 +#, fuzzy msgid "" "Print NAME with any leading directory components removed.\n" "If specified, also remove a trailing SUFFIX.\n" -"\n" msgstr "" "印出 <檔案名稱>，而且減去前面所有目錄的名稱。\n" "如果指定了 <末端字元> 的話，也會嘗試從 <檔案名稱> 末端清除該等字元。\n" -#: src/basename.c:59 +#: 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" msgstr "" -#: src/basename.c:66 +#: src/basename.c:67 #, c-format msgid "" "\n" @@ -1008,20 +1011,21 @@ msgid "" " %s -a any/str1 any/str2 -> \"str1\" followed by \"str2\"\n" msgstr "" -#: src/basename.c:167 src/chcon.c:531 src/chgrp.c:277 src/chmod.c:526 -#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1369 +#: 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:183 src/mkfifo.c:108 src/mknod.c:146 src/nohup.c:111 -#: src/pathchk.c:148 src/printf.c:674 src/readlink.c:146 src/realpath.c:236 -#: src/rm.c:314 src/rmdir.c:223 src/seq.c:402 src/setuidgid.c:137 -#: src/sleep.c:119 src/stat.c:1476 src/stdbuf.c:346 src/tr.c:1782 +#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 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 #, 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:52 src/split.c:49 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/split.c:49 msgid "Torbjorn Granlund" msgstr "" @@ -1032,8 +1036,8 @@ msgstr "" msgid "Richard M. Stallman" msgstr "Torbjorn Granlund 及 Richard M. Stallman" -#: src/cat.c:88 src/df.c:846 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4720 src/nl.c:182 src/paste.c:435 src/pr.c:2768 src/sum.c:58 +#: 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/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 +1091,7 @@ msgstr "" msgid "cannot do ioctl on %s" msgstr "無法對‘%s’執行輸出入控制 (ioctl)" -#: src/cat.c:637 src/dd.c:2209 src/sort.c:379 src/tee.c:165 src/yes.c:86 +#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86 #, c-format msgid "standard output" msgstr "標準輸出" @@ -1104,14 +1108,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:55 src/head.c:46 src/hostid.c:33 +#: 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 msgid "Jim Meyering" msgstr "" -#: src/chcon.c:100 src/runcon.c:203 src/runcon.c:234 +#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238 #, fuzzy, c-format msgid "failed to create security context: %s" msgstr "無法更改 %s 的擁有者\n" @@ -1121,8 +1125,8 @@ msgstr "無法更改 %s 的擁有者\n" msgid "failed to set %s security context component to %s" msgstr "" -#: src/chcon.c:156 src/chcon.c:540 src/copy.c:2222 src/runcon.c:217 -#: src/stat.c:683 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221 +#: src/stat.c:702 #, fuzzy, c-format msgid "failed to get security context of %s" msgstr "無法取得 %s 的屬性" @@ -1138,12 +1142,12 @@ 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:446 src/ls.c:2981 +#: src/du.c:457 src/ls.c:2981 #, c-format msgid "cannot access %s" msgstr "無法存取 %s" -#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:426 +#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437 #, c-format msgid "cannot read directory %s" msgstr "無法讀取目錄 %s 的內容" @@ -1153,13 +1157,13 @@ 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:599 +#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562 #, 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:618 -#: src/remove.c:613 +#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642 +#: src/remove.c:576 #, fuzzy, c-format msgid "fts_close failed" msgstr "關閉時發生錯誤" @@ -1180,10 +1184,9 @@ msgid "" "Change the security context of each FILE to CONTEXT.\n" "With --reference, change the security context of each FILE to that of " "RFILE.\n" -"\n" msgstr "" -#: src/chcon.c:362 src/chgrp.c:123 src/chown.c:94 +#: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94 msgid "" " --dereference affect the referent of each symbolic link (this is\n" " the default), rather than the symbolic link itself\n" @@ -1191,7 +1194,7 @@ msgid "" "file\n" msgstr "" -#: src/chcon.c:367 +#: src/chcon.c:369 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" @@ -1199,7 +1202,21 @@ msgid "" " -l, --range=RANGE set range RANGE in the target security context\n" msgstr "" -#: src/chcon.c:373 +#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110 +#, fuzzy +msgid "" +" --no-preserve-root do not treat '/' specially (the default)\n" +" --preserve-root fail to operate recursively on '/'\n" +msgstr "" +"移除指定的 <檔案>。\n" +"\n" +" -d, --directory 移除可能仍有資料的目錄 (只限最大權力使用者使用)\n" +" -f, --force 略過不存在的檔案，不顯示任何訊息\n" +" -i, --interactive 進行任何移除操作前必須先確認\n" +" -r, -R, --recursive 同時移除該目錄下的所有目錄層\n" +" -v, --verbose 詳細顯示進行的步驟\n" + +#: src/chcon.c:379 #, fuzzy msgid "" " --reference=RFILE use RFILE's security context rather than " @@ -1211,15 +1228,15 @@ msgstr "" " -R, --recursive 同時處理目錄之下的所有的檔案及子目錄\n" " -v, --verbose 處理每個檔案時都會顯示訊息\n" -#: src/chcon.c:377 src/chgrp.c:140 src/chown.c:118 +#: 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:380 +#: src/chcon.c:386 msgid " -v, --verbose output a diagnostic for every file processed\n" msgstr "" -#: src/chcon.c:383 src/chgrp.c:143 src/chown.c:121 +#: src/chcon.c:389 src/chgrp.c:143 src/chown.c:121 msgid "" "\n" "The following options modify how a hierarchy is traversed when the -R\n" @@ -1234,36 +1251,36 @@ msgid "" "\n" msgstr "" -#: src/chcon.c:512 src/chgrp.c:264 src/chown.c:267 +#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267 #, c-format msgid "-R --dereference requires either -H or -L" msgstr "同時使用 -R --dereference 時還需要 -H 或 -L 選項" -#: src/chcon.c:518 +#: src/chcon.c:524 #, c-format msgid "-R -h requires -P" msgstr "同時使用 -R -h 時還需要 -P 選項" -#: src/chcon.c:533 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282 -#: src/comm.c:429 src/csplit.c:1371 src/join.c:1149 src/link.c:79 -#: src/mknod.c:148 src/setuidgid.c:139 src/tr.c:1785 +#: 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 #, c-format msgid "missing operand after %s" msgstr "%s 後面缺少了參數" -#: src/chcon.c:556 src/runcon.c:247 +#: src/chcon.c:562 src/runcon.c:251 #, fuzzy, c-format msgid "invalid context: %s" msgstr "權限無效: %s" -#: src/chcon.c:563 +#: src/chcon.c:569 #, c-format msgid "conflicting security context specifiers given" msgstr "" -#: src/chcon.c:572 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:433 src/cp.c:493 -#: src/mv.c:96 src/pwd.c:273 src/rm.c:324 src/touch.c:351 +#: 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 #, c-format msgid "failed to get attributes of %s" msgstr "無法取得 %s 的屬性" @@ -1305,20 +1322,6 @@ msgstr "" " -h, --no-dereference 影響符號鏈結本身，而不是符號鏈結指定的目的地檔案\n" " (只有系統支援更改符號鏈結的擁有者，這個選項才有效)\n" -#: src/chgrp.c:132 src/chmod.c:387 src/chown.c:110 -#, fuzzy -msgid "" -" --no-preserve-root do not treat '/' specially (the default)\n" -" --preserve-root fail to operate recursively on '/'\n" -msgstr "" -"移除指定的 <檔案>。\n" -"\n" -" -d, --directory 移除可能仍有資料的目錄 (只限最大權力使用者使用)\n" -" -f, --force 略過不存在的檔案，不顯示任何訊息\n" -" -i, --interactive 進行任何移除操作前必須先確認\n" -" -r, -R, --recursive 同時移除該目錄下的所有目錄層\n" -" -v, --verbose 詳細顯示進行的步驟\n" - #: src/chgrp.c:136 msgid "" " --reference=RFILE use RFILE's group rather than specifying a\n" @@ -1393,8 +1396,13 @@ msgid "" msgstr "" #: src/chmod.c:391 +#, fuzzy 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 msgid " -R, --recursive change files and directories recursively\n" @@ -1553,7 +1561,7 @@ msgstr "" msgid "Roland McGrath" msgstr "" -#: src/chroot.c:97 src/install.c:575 src/setuidgid.c:110 src/setuidgid.c:120 +#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120 #, c-format msgid "invalid group %s" msgstr "群組 %s 無效" @@ -1617,8 +1625,8 @@ msgstr "無法取得%s的屬性" msgid "failed to set user-ID" msgstr "無法取得%s的屬性" -#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:213 src/stdbuf.c:366 -#: src/timeout.c:402 +#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365 +#: src/timeout.c:454 #, fuzzy, c-format msgid "failed to run command %s" msgstr "無法執行 %s 指令" @@ -1725,20 +1733,24 @@ msgstr "正在關閉輸出檔%s" msgid "empty %s not allowed" msgstr "使用 -c 時不允許指定額外的參數‘%s’" -#: src/copy.c:168 src/dd.c:1609 src/dd.c:1976 +#: 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 #, c-format -msgid "reading %s" -msgstr "讀取 %s" +msgid "error reading %s" +msgstr "讀取 %s 時發生錯誤" -#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:426 +#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425 #, c-format msgid "cannot lseek %s" msgstr "無法 lseek %s" -#: src/copy.c:206 src/dd.c:2039 src/dd.c:2102 +#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151 #, c-format -msgid "writing %s" -msgstr "寫入 %s" +msgid "error writing %s" +msgstr "寫入 %s 時發生錯誤" #: src/copy.c:313 #, fuzzy, c-format @@ -1760,7 +1772,7 @@ msgstr "無法保留%s的時間" msgid "clearing permissions for %s" msgstr "正在更改 %s 的權限" -#: src/copy.c:697 src/copy.c:2470 src/cp.c:331 +#: src/copy.c:697 src/copy.c:2480 src/cp.c:329 #, c-format msgid "failed to preserve ownership for %s" msgstr "無法保留%s的擁有者及所屬群組" @@ -1775,14 +1787,14 @@ msgstr "" msgid "failed to preserve authorship for %s" msgstr "無法保留%s的著作者" -#: src/copy.c:804 src/csplit.c:638 src/du.c:901 src/fmt.c:449 src/head.c:847 -#: src/sort.c:4489 src/split.c:1329 src/tail.c:1756 src/wc.c:678 +#: 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 "無法開啟 %s 來讀取資料" -#: src/copy.c:810 src/copy.c:972 src/dd.c:1546 src/dd.c:2114 src/dd.c:2252 -#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:141 +#: 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 #, c-format msgid "cannot fstat %s" msgstr "無法 fstat %s" @@ -1802,14 +1814,14 @@ msgstr "" msgid "failed to set the security context of %s to %s" msgstr "無法將 %s 的所屬群組更改為 %s\n" -#: src/copy.c:881 src/copy.c:1574 src/copy.c:1777 src/copy.c:1935 src/ln.c:314 -#: src/remove.c:267 src/remove.c:293 src/remove.c:444 src/remove.c:465 +#: 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 #, c-format msgid "cannot remove %s" msgstr "無法移除 %s" -#: src/copy.c:886 src/copy.c:1578 src/copy.c:1772 src/copy.c:1940 -#: src/remove.c:418 +#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945 +#: src/remove.c:375 #, c-format msgid "removed %s\n" msgstr "已移除%s\n" @@ -1829,186 +1841,186 @@ msgstr "無法建立普通檔案 %s" msgid "failed to clone %s from %s" msgstr "無法保留%s的時間" -#: src/copy.c:1098 src/copy.c:2531 +#: src/copy.c:1098 src/copy.c:2541 #, c-format msgid "preserving times for %s" msgstr "保留%s的時間" -#: src/copy.c:1170 src/copy.c:1176 src/head.c:855 src/touch.c:175 -#: src/truncate.c:413 -#, c-format -msgid "closing %s" -msgstr "關閉 %s" +#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172 +#: src/truncate.c:417 +#, fuzzy, c-format +msgid "failed to close %s" +msgstr "無法保留%s的時間" -#: src/copy.c:1466 +#: src/copy.c:1471 #, fuzzy, c-format msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? " msgstr "%s：是否覆寫 %s，而不理會權限模式 %04lo? " -#: src/copy.c:1473 +#: src/copy.c:1478 #, c-format msgid "%s: overwrite %s? " msgstr "%s：是否覆寫 %s? " -#: src/copy.c:1542 +#: src/copy.c:1547 #, c-format msgid " (backup: %s)" msgstr " (備份：%s)" -#: src/copy.c:1552 +#: src/copy.c:1557 #, c-format msgid "failed to restore the default file creation context" msgstr "" -#: src/copy.c:1584 +#: src/copy.c:1589 #, c-format msgid "cannot create hard link %s to %s" msgstr "不可以建立連至 %2$s 的實際鏈結 (hard link) %1$s" -#: src/copy.c:1637 src/copy.c:1689 src/copy.c:2272 src/copy.c:2589 +#: 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:1220 src/truncate.c:365 +#: src/stat.c:1239 src/truncate.c:363 #, c-format msgid "cannot stat %s" msgstr "無法 stat %s" -#: src/copy.c:1645 +#: src/copy.c:1650 #, c-format msgid "omitting directory %s" msgstr "略過 %s 目錄" -#: src/copy.c:1659 +#: src/copy.c:1664 #, c-format msgid "warning: source file %s specified more than once" msgstr "警告：指定了來源檔 %s 多於一次" -#: src/copy.c:1707 src/ln.c:246 +#: src/copy.c:1712 src/ln.c:246 #, c-format msgid "%s and %s are the same file" msgstr "%s 及 %s 為同一檔案" -#: src/copy.c:1806 +#: src/copy.c:1811 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "不可以將目錄 %2$s 覆寫非目錄 %1$s" -#: src/copy.c:1824 src/ln.c:214 +#: src/copy.c:1829 src/ln.c:214 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "不會以 %2$s 覆寫剛建立的 %1$s" -#: src/copy.c:1842 +#: src/copy.c:1847 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "不可以將目錄 %s 覆寫成非目錄" -#: src/copy.c:1856 +#: src/copy.c:1861 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "移動目錄時目的地不可以不是目錄：%s -> %s" -#: src/copy.c:1886 +#: src/copy.c:1891 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "將 %s 備份會破壞來源檔，因此不移動 %s。" -#: src/copy.c:1887 +#: src/copy.c:1892 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "將 %s 備份會破壞來源檔，因此不複製 %s。" -#: src/copy.c:1910 src/ln.c:276 +#: src/copy.c:1915 src/ln.c:276 #, c-format msgid "cannot backup %s" msgstr "無法備份%s" -#: src/copy.c:1974 +#: src/copy.c:1979 #, fuzzy, c-format msgid "will not copy %s through just-created symlink %s" msgstr "不會以 %2$s 覆寫剛建立的 %1$s" -#: src/copy.c:2051 +#: src/copy.c:2056 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "不可以將目錄 %s 複製成為自身 (%s)" -#: src/copy.c:2068 +#: src/copy.c:2073 #, c-format msgid "will not create hard link %s to directory %s" msgstr "不會建立連至目錄 %2$s 的實際鏈結 (hard link) %1$s" -#: src/copy.c:2118 +#: src/copy.c:2123 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "不可以將目錄 %s 複製至自身的子目錄 (%s)" -#: src/copy.c:2161 +#: src/copy.c:2166 #, c-format msgid "cannot move %s to %s" msgstr "無法將 %s 移動至 %s" -#: src/copy.c:2173 +#: src/copy.c:2178 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "無法進行跨裝置的移動 (%s至%s)；無法移除目標檔案或目錄" -#: src/copy.c:2207 src/install.c:905 src/mkdir.c:189 src/mkfifo.c:114 -#: src/mknod.c:167 +#: 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:2241 +#: src/copy.c:2246 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "無法複製循環的符號鏈結%s" -#: src/copy.c:2350 +#: src/copy.c:2355 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "%s：只能於目前的目錄中建立相對符號鏈結" -#: src/copy.c:2357 +#: src/copy.c:2362 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "不可以建立連至 %2$s 的符號鏈結 %1$s" -#: src/copy.c:2406 src/mkfifo.c:133 +#: src/copy.c:2416 src/mkfifo.c:132 #, c-format msgid "cannot create fifo %s" msgstr "無法建立 FIFO %s" -#: src/copy.c:2415 +#: src/copy.c:2425 #, c-format msgid "cannot create special file %s" msgstr "無法建立特殊檔案 %s" -#: src/copy.c:2426 src/ls.c:3191 src/stat.c:902 +#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921 #, c-format msgid "cannot read symbolic link %s" msgstr "無法讀取符號鏈結 %s" -#: src/copy.c:2453 +#: src/copy.c:2463 #, c-format msgid "cannot create symbolic link %s" msgstr "無法建立符號鏈結 %s" -#: src/copy.c:2485 +#: src/copy.c:2495 #, c-format msgid "%s has unknown file type" msgstr "%s的檔案類型不詳" -#: src/copy.c:2629 src/ln.c:358 +#: src/copy.c:2644 src/ln.c:358 #, c-format msgid "cannot un-backup %s" msgstr "無法將 %s 的備份還原" -#: src/copy.c:2633 +#: src/copy.c:2648 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (還原備份)\n" -#: src/cp.c:156 src/mv.c:284 +#: src/cp.c:156 src/mv.c:286 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -2020,25 +2032,13 @@ msgstr "" " 或：%s [選項]... -t 目錄 來源...\n" #: src/cp.c:162 -msgid "" -"Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" -"\n" +#, fuzzy +msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" msgstr "" "將 <來源> 檔案複製至 <目的地>，或將多個 <檔案> 複製至指定 <目錄>。\n" "\n" -#: src/cp.c:166 src/csplit.c:1458 src/cut.c:197 src/df.c:852 src/du.c:268 -#: src/expand.c:112 src/fmt.c:275 src/fold.c:75 src/head.c:115 -#: src/install.c:612 src/kill.c:86 src/ln.c:392 src/ls.c:4726 src/mkdir.c:61 -#: src/mkfifo.c:56 src/mknod.c:58 src/mv.c:294 src/nl.c:191 src/paste.c:445 -#: src/pr.c:2777 src/ptx.c:1825 src/shred.c:153 src/shuf.c:58 src/sort.c:399 -#: src/split.c:211 src/stdbuf.c:95 src/tac.c:142 src/tail.c:268 -#: src/touch.c:226 src/truncate.c:107 src/unexpand.c:122 src/uniq.c:145 -msgid "" -"Mandatory arguments to long options are mandatory for short options too.\n" -msgstr "長選項必須用的參數在使用短選項時也是必須的。\n" - -#: src/cp.c:169 +#: src/cp.c:168 #, fuzzy msgid "" " -a, --archive same as -dR --preserve=all\n" @@ -2058,13 +2058,14 @@ msgstr "" " --copy-contents 當使用遞迴模式時複製特殊檔案的內容\n" " -d 等於 --no-dereference --preserve=link\n" -#: src/cp.c:178 +#: src/cp.c:177 #, fuzzy msgid "" " -f, --force if an existing destination file cannot be\n" -" opened, remove it and try again (redundant " -"if\n" -" the -n option is used)\n" +" opened, remove it and try again (this " +"option\n" +" is ignored when the -n option is also " +"used)\n" " -i, --interactive prompt before overwrite (overrides a previous " "-n\n" " option)\n" @@ -2076,20 +2077,20 @@ msgstr "" " -i, --interactive 覆寫檔案前需要確認\n" " -H 使用指令列中的符號鏈結指示的真正目的地\n" -#: src/cp.c:188 +#: src/cp.c:186 msgid "" " -l, --link hard link files instead of copying\n" " -L, --dereference always follow symbolic links in SOURCE\n" msgstr "" -#: src/cp.c:192 +#: src/cp.c:190 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:197 +#: src/cp.c:195 #, fuzzy msgid "" " -p same as --preserve=mode,ownership,timestamps\n" @@ -2106,7 +2107,7 @@ msgstr "" " (預設值為：mode,ownership,timestamps)\n" " 額外的屬性有：links、all\n" -#: src/cp.c:205 +#: src/cp.c:203 #, fuzzy msgid "" " --no-preserve=ATTR_LIST don't preserve the specified attributes\n" @@ -2116,7 +2117,7 @@ msgstr "" " --parents 複製前先在 <目錄> 建立來源路徑中的所有目錄\n" " -P 等於 ‘--no-dereference’\n" -#: src/cp.c:209 +#: src/cp.c:207 #, fuzzy msgid "" " -R, -r, --recursive copy directories recursively\n" @@ -2129,7 +2130,7 @@ msgstr "" " --remove-destination 嘗試開啟目的地檔案前先移除已存在的目的地\n" " 檔案 (與 --force 選項不同)\n" -#: src/cp.c:215 +#: src/cp.c:213 #, fuzzy msgid "" " --sparse=WHEN control creation of sparse files. See below\n" @@ -2141,7 +2142,7 @@ msgstr "" " --sparse=WHEN 控制建立 sparse 檔案的方式\n" " --strip-trailing-slashes 移除參數中所有 <來源> 檔案/目錄末端的斜號\n" -#: src/cp.c:220 +#: src/cp.c:218 msgid "" " -s, --symbolic-link make symbolic links instead of copying\n" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -2154,7 +2155,7 @@ msgstr "" " -t, --target-directory=目錄 將所有 <來源> 檔案/目錄複製至指定的 <目錄>\n" " -T, --no-target-directory 將 <目的地> 看作普通檔案處理\n" -#: src/cp.c:226 +#: src/cp.c:224 msgid "" " -u, --update copy only when the SOURCE file is newer\n" " than the destination file or when the\n" @@ -2167,7 +2168,7 @@ msgstr "" " -v, --verbose 詳細顯示進行的步驟\n" " -x, --one-file-system 不會跨越檔案系統進行操作\n" -#: src/cp.c:235 +#: src/cp.c:233 #, fuzzy msgid "" "\n" @@ -2190,7 +2191,7 @@ msgstr "" "<目的地> 檔案。使用 --sparse=never 會禁止產生 sparse 檔案。\n" "\n" -#: src/cp.c:247 src/install.c:649 src/ln.c:421 src/mv.c:321 +#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322 #, fuzzy msgid "" "\n" @@ -2206,7 +2207,7 @@ msgstr "" "變數來選擇。以下是可用的變數值：\n" "\n" -#: src/cp.c:254 src/install.c:656 src/mv.c:328 +#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329 msgid "" " none, off never make backups (even if --backup is given)\n" " numbered, t make numbered backups\n" @@ -2218,7 +2219,7 @@ msgstr "" " existing, nil 若有數字的備份檔已經存在則使用數字，否則使用普通方式備份\n" " simple, never 永遠使用普通方式備份\n" -#: src/cp.c:260 +#: src/cp.c:258 msgid "" "\n" "As a special case, cp makes a backup of SOURCE when the force and backup\n" @@ -2229,90 +2230,90 @@ msgstr "" "有一個特別情況：如果同時指定 --force 和 --backup 選項，而且 <來源> 和\n" "<目的地> 是同一個已存在的普通檔案的話，cp 會將 <來源> 檔案備份。\n" -#: src/cp.c:319 +#: src/cp.c:317 #, c-format msgid "failed to preserve times for %s" msgstr "無法保留 %s 的時間" -#: src/cp.c:350 +#: src/cp.c:348 #, c-format msgid "failed to preserve permissions for %s" msgstr "無法保留 %s 的權限" -#: src/cp.c:477 +#: src/cp.c:475 #, c-format msgid "cannot make directory %s" msgstr "無法建立目錄 %s" -#: src/cp.c:526 src/cp.c:545 +#: src/cp.c:524 src/cp.c:543 #, c-format msgid "%s exists but is not a directory" msgstr "%s已存在但不是目錄" -#: src/cp.c:572 src/cp.c:1068 src/install.c:401 src/install.c:844 src/ln.c:123 -#: src/ln.c:181 src/ln.c:202 src/ln.c:516 src/mv.c:152 src/mv.c:399 -#, c-format -msgid "accessing %s" -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 +#, fuzzy, c-format +msgid "failed to access %s" +msgstr "無法保留%s的時間" -#: src/cp.c:592 src/install.c:914 src/ln.c:546 src/mv.c:432 src/shred.c:1182 -#: src/touch.c:433 src/truncate.c:356 +#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181 +#: src/touch.c:429 src/truncate.c:354 #, c-format msgid "missing file operand" msgstr "缺少了檔案作為參數" -#: src/cp.c:594 src/install.c:916 src/ln.c:560 src/mv.c:434 +#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436 #, c-format msgid "missing destination file operand after %s" msgstr "%s 後缺少了目的地檔案" -#: src/cp.c:603 src/install.c:925 src/mv.c:443 +#: src/cp.c:601 src/install.c:926 src/mv.c:445 #, 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:619 src/cp.c:1070 src/install.c:403 src/install.c:846 -#: src/install.c:938 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:401 -#: src/mv.c:457 +#: 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 #, c-format msgid "target %s is not a directory" msgstr "目的地 %s 不是目錄" -#: src/cp.c:730 +#: src/cp.c:728 #, fuzzy, c-format msgid "with --parents, the destination must be a directory" msgstr "當保留路徑時，目的地必須是目錄" -#: src/cp.c:1063 src/install.c:839 src/ln.c:511 src/mv.c:394 +#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395 #, c-format msgid "multiple target directories specified" msgstr "指定了多於一個目的地目錄" -#: src/cp.c:1108 +#: src/cp.c:1110 #, c-format msgid "cannot make both hard and symbolic links" msgstr "無法同時建立實際及符號鏈結" -#: src/cp.c:1115 src/mv.c:464 +#: src/cp.c:1117 src/mv.c:466 #, fuzzy, c-format msgid "options --backup and --no-clobber are mutually exclusive" msgstr "不能同時使用 --string 及 --check 選項" -#: src/cp.c:1121 +#: src/cp.c:1123 #, c-format msgid "--reflink can be used only with --sparse=auto" msgstr "" -#: src/cp.c:1129 src/install.c:899 src/ln.c:582 src/mv.c:472 +#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474 msgid "backup type" msgstr "備份方式" -#: src/cp.c:1154 +#: src/cp.c:1156 #, c-format msgid "cannot preserve security context without an SELinux-enabled kernel" msgstr "" -#: src/cp.c:1160 +#: src/cp.c:1162 #, c-format msgid "cannot preserve extended attributes, cp is built without xattr support" msgstr "" @@ -2322,137 +2323,136 @@ msgstr "" msgid "Stuart Kemp" msgstr "" -#: src/csplit.c:529 +#: src/csplit.c:531 #, c-format msgid "input disappeared" msgstr "輸入資料消失了" -#: src/csplit.c:658 src/csplit.c:669 +#: src/csplit.c:660 src/csplit.c:671 #, c-format msgid "%s: line number out of range" msgstr "%s：行號超出範圍以外" -#: src/csplit.c:698 +#: src/csplit.c:700 #, fuzzy, c-format msgid "%s: %s: line number out of range" msgstr "%s：‘%s’：行號超出範圍以外" -#: src/csplit.c:701 src/csplit.c:750 +#: src/csplit.c:703 src/csplit.c:752 #, c-format msgid " on repetition %s\n" msgstr "" -#: src/csplit.c:744 +#: src/csplit.c:746 #, fuzzy, c-format msgid "%s: %s: match not found" msgstr "%s：‘%s’：找不到符合的字串" -#: src/csplit.c:808 src/csplit.c:848 src/nl.c:359 src/tac.c:274 +#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273 #, c-format msgid "error in regular expression search" msgstr "在正規運算式搜尋時發生錯誤" -#: src/csplit.c:981 +#: src/csplit.c:983 #, fuzzy, c-format msgid "write error for %s" msgstr "寫入‘%s’時發生錯誤" -#: src/csplit.c:1057 +#: src/csplit.c:1059 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s：分隔符號後應該是整數" -#: src/csplit.c:1073 +#: src/csplit.c:1075 #, fuzzy, c-format msgid "%s: '}' is required in repeat count" msgstr "%s：重複的數目後應該是 ‘}’ 字元" -#: src/csplit.c:1083 +#: src/csplit.c:1085 #, fuzzy, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}：‘{’ 和 ‘}’ 之間必須是整數" -#: src/csplit.c:1110 +#: src/csplit.c:1112 #, fuzzy, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s：缺少了封閉分隔符號 ‘%c’" -#: src/csplit.c:1127 +#: src/csplit.c:1129 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s：無效的正規表示式：%s" -#: src/csplit.c:1160 +#: src/csplit.c:1162 #, c-format msgid "%s: invalid pattern" msgstr "%s：無效的樣式" -#: src/csplit.c:1163 +#: src/csplit.c:1165 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s：行號必須大於零" -#: src/csplit.c:1169 +#: src/csplit.c:1171 #, fuzzy, c-format msgid "line number %s is smaller than preceding line number, %s" msgstr "行號 ‘%s’ 小於之前的行號 ‘%s’" -#: src/csplit.c:1175 +#: src/csplit.c:1177 #, fuzzy, c-format msgid "warning: line number %s is the same as preceding line number" msgstr "警告：行號 ‘%s’ 和之前的行號一樣" -#: src/csplit.c:1253 +#: src/csplit.c:1255 #, c-format msgid "missing conversion specifier in suffix" msgstr "後置字串缺少了字串轉換字符" -#: src/csplit.c:1259 +#: src/csplit.c:1261 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "後置字串的字串轉換字符無效：%c" -#: src/csplit.c:1262 +#: src/csplit.c:1264 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "後置字串的字串轉換字符無效：\\%.3o" -#: src/csplit.c:1267 +#: src/csplit.c:1269 #, fuzzy, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "%s：無效的欄位規格‘%s’" -#: src/csplit.c:1284 +#: src/csplit.c:1286 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "後置字串含有過多的 %% 字串轉換規格" -#: src/csplit.c:1298 +#: src/csplit.c:1300 #, c-format msgid "missing %% conversion specification in suffix" msgstr "後置字串缺少了 %% 字串轉換規格" -#: src/csplit.c:1345 +#: src/csplit.c:1347 #, c-format msgid "%s: invalid number" msgstr "%s：無效的號碼" -#: src/csplit.c:1449 +#: src/csplit.c:1451 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "用法：%s [選項]... 檔案 樣式...\n" -#: src/csplit.c:1453 +#: src/csplit.c:1455 #, 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" -"\n" msgstr "" "根據 <樣式> 分割 <檔案>，並將之輸出至 ‘xx01’、‘xx02’ 等等的檔案，\n" "同時在標準輸出顯示每個分割部份的位元組數目。\n" -#: src/csplit.c:1461 +#: src/csplit.c:1462 #, fuzzy, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2463,7 +2463,7 @@ msgstr "" " -f, --prefix=前置字串 以 <前置字串> 代替 ‘xx’\n" " -k, --keep-files 遇到錯誤時不移除輸出檔\n" -#: src/csplit.c:1466 +#: src/csplit.c:1467 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 +2473,7 @@ msgstr "" " -s, --quiet, --silent 不印出輸出檔的大小\n" " -z, --elide-empty-files 移除空白的輸出檔\n" -#: src/csplit.c:1473 +#: src/csplit.c:1474 msgid "" "\n" "Read standard input if FILE is -. Each PATTERN may be:\n" @@ -2481,7 +2481,7 @@ msgstr "" "\n" "若 <檔案> 是 - 則由標準輸入讀取資料。每一個 <樣式> 可以是：\n" -#: src/csplit.c:1477 +#: src/csplit.c:1478 #, fuzzy msgid "" "\n" @@ -2507,7 +2507,7 @@ msgstr "" msgid "David M. Ihnat" msgstr "" -#: src/cut.c:64 +#: src/cut.c:64 src/cut.c:372 msgid "fields and positions are numbered from 1" msgstr "" @@ -2517,12 +2517,11 @@ msgid "Usage: %s OPTION... [FILE]...\n" msgstr "用法：%s [選項]... [檔案]...\n" #: src/cut.c:193 -msgid "" -"Print selected parts of lines from each FILE to standard output.\n" -"\n" +#, fuzzy +msgid "Print selected parts of lines from each FILE to standard output.\n" msgstr "在標準輸出中顯示每個 <檔案> 每一行中指定的部份。\n" -#: src/cut.c:200 +#: src/cut.c:199 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2532,7 +2531,7 @@ msgstr "" " -c, --characters=LIST 只顯示指定的字元\n" " -d, --delimiter=DELIM 以 DELIM 字元代替 TAB 作為欄位的分隔符號\n" -#: src/cut.c:205 +#: src/cut.c:204 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2543,14 +2542,14 @@ msgstr "" " 每一行，除非配合 -s 選項一起使用\n" " -n (不會作任何處理)\n" -#: src/cut.c:211 +#: src/cut.c:210 #, fuzzy msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" msgstr " --verbose 開啟每個輸出檔之前都在標準錯誤輸出顯示訊息\n" -#: src/cut.c:215 +#: src/cut.c:214 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2560,7 +2559,7 @@ msgstr "" " --output-delimiter=字串 以 <字串> 作為輸出資料的分隔符號\n" " 預設是使用輸入資料的分隔符號\n" -#: src/cut.c:222 +#: src/cut.c:221 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2568,7 +2567,7 @@ msgid "" "in the same order that it is read, and is written exactly once.\n" msgstr "" -#: src/cut.c:228 +#: src/cut.c:227 #, fuzzy msgid "" "Each range is one of:\n" @@ -2592,57 +2591,59 @@ msgstr "" "\n" "如果沒有指定 <檔案> 或 <檔案> 是 -，則由標準輸入讀取資料。\n" -#: src/cut.c:368 src/cut.c:489 -msgid "invalid byte or field list" +#: src/cut.c:367 src/cut.c:493 +#, fuzzy +msgid "invalid byte, character or field list" msgstr "無效的位元組或欄位選項" -#: src/cut.c:385 +#: src/cut.c:387 #, fuzzy msgid "invalid range with no endpoint: -" msgstr "無效的寬度選項：‘%s’" -#: src/cut.c:399 +#: src/cut.c:403 #, fuzzy msgid "invalid decreasing range" msgstr "無效的類型‘%s’" -#: src/cut.c:478 +#: src/cut.c:482 #, c-format msgid "byte offset %s is too large" msgstr "位元組位置 %s 過大" -#: src/cut.c:481 +#: src/cut.c:485 #, c-format msgid "field number %s is too large" msgstr "欄位數目 %s 過大" -#: src/cut.c:789 src/cut.c:797 +#: src/cut.c:795 src/cut.c:803 msgid "only one type of list may be specified" msgstr "指定位置時只能使用一種格式" -#: src/cut.c:806 +#: src/cut.c:812 src/numfmt.c:1408 +#, c-format msgid "the delimiter must be a single character" msgstr "分隔符號必須是恰好一個字元" -#: src/cut.c:841 +#: src/cut.c:847 msgid "you must specify a list of bytes, characters, or fields" msgstr "必須指定一系列的位元組、字元或欄位" -#: src/cut.c:844 +#: src/cut.c:850 msgid "an input delimiter may be specified only when operating on fields" msgstr "只有在處理欄位時才能指定分隔符號" -#: src/cut.c:848 +#: src/cut.c:854 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" msgstr "只有在處理欄位時才可以去除沒有分隔符號的每一行" -#: src/cut.c:864 +#: src/cut.c:870 msgid "missing list of fields" msgstr "缺少了欄位數值" -#: src/cut.c:866 +#: src/cut.c:872 msgid "missing list of positions" msgstr "缺少了表示位置的數值" @@ -2654,9 +2655,11 @@ msgid "" msgstr "" #: src/date.c:128 +msgid "Display the current time in the given FORMAT, or set the system date.\n" +msgstr "" + +#: src/date.c:134 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" " -I[TIMESPEC], --iso-8601[=TIMESPEC] output date/time in ISO 8601 format.\n" @@ -2665,14 +2668,14 @@ msgid "" " and time to the indicated precision.\n" msgstr "" -#: src/date.c:138 +#: src/date.c:142 msgid "" " -r, --reference=FILE display the last modification time of FILE\n" " -R, --rfc-2822 output date and time in RFC 2822 format.\n" " Example: Mon, 07 Aug 2006 12:34:56 -0600\n" msgstr "" -#: src/date.c:143 +#: src/date.c:147 msgid "" " --rfc-3339=TIMESPEC output date and time in RFC 3339 format.\n" " TIMESPEC='date', 'seconds', or 'ns' for\n" @@ -2683,7 +2686,7 @@ msgid "" " -u, --utc, --universal print or set Coordinated Universal Time\n" msgstr "" -#: src/date.c:154 +#: src/date.c:158 msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" @@ -2692,7 +2695,7 @@ msgid "" " %a locale's abbreviated weekday name (e.g., Sun)\n" msgstr "" -#: src/date.c:161 +#: src/date.c:165 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2700,7 +2703,7 @@ msgid "" " %c locale's date and time (e.g., Thu Mar 3 23:05:25 2005)\n" msgstr "" -#: src/date.c:167 +#: src/date.c:171 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2708,14 +2711,14 @@ msgid "" " %e day of month, space padded; same as %_d\n" msgstr "" -#: src/date.c:173 +#: src/date.c:177 msgid "" " %F full date; same as %Y-%m-%d\n" " %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 "" -#: src/date.c:178 +#: src/date.c:182 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2723,7 +2726,7 @@ msgid "" " %j day of year (001..366)\n" msgstr "" -#: src/date.c:184 +#: src/date.c:188 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -2731,7 +2734,7 @@ msgid "" " %M minute (00..59)\n" msgstr "" -#: src/date.c:190 +#: src/date.c:194 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2742,7 +2745,7 @@ msgid "" " %s seconds since 1970-01-01 00:00:00 UTC\n" msgstr "" -#: src/date.c:199 +#: src/date.c:203 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2750,7 +2753,7 @@ msgid "" " %u day of week (1..7); 1 is Monday\n" msgstr "" -#: src/date.c:205 +#: src/date.c:209 msgid "" " %U week number of year, with Sunday as first day of week (00..53)\n" " %V ISO week number, with Monday as first day of week (01..53)\n" @@ -2758,7 +2761,7 @@ msgid "" " %W week number of year, with Monday as first day of week (00..53)\n" msgstr "" -#: src/date.c:211 +#: src/date.c:215 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -2766,7 +2769,7 @@ msgid "" " %Y year\n" msgstr "" -#: src/date.c:217 +#: src/date.c:221 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -2778,7 +2781,7 @@ msgid "" "By default, date pads numeric fields with zeroes.\n" msgstr "" -#: src/date.c:226 +#: src/date.c:230 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -2789,7 +2792,7 @@ msgid "" " # use opposite case if possible\n" msgstr "" -#: src/date.c:235 +#: src/date.c:239 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -2798,7 +2801,7 @@ msgid "" "O to use the locale's alternate numeric symbols if available.\n" msgstr "" -#: src/date.c:242 +#: src/date.c:246 msgid "" "\n" "Examples:\n" @@ -2812,35 +2815,35 @@ msgid "" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:275 src/dd.c:2193 src/head.c:838 src/md5sum.c:477 -#: src/md5sum.c:798 src/od.c:863 src/od.c:1914 src/pr.c:1176 src/pr.c:1372 -#: src/pr.c:1494 src/stty.c:842 src/tac.c:563 src/tail.c:343 src/tee.c:126 +#: 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 #, c-format msgid "standard input" msgstr "標準輸出" -#: src/date.c:303 src/date.c:523 +#: src/date.c:307 src/date.c:527 #, fuzzy, c-format msgid "invalid date %s" msgstr "日期無效：‘%s’" -#: src/date.c:414 src/date.c:448 +#: src/date.c:418 src/date.c:452 #, fuzzy, c-format msgid "multiple output formats specified" msgstr "正在關閉輸出檔%s" -#: src/date.c:426 +#: src/date.c:430 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "印出日期所用的選項是互相矛盾的" -#: src/date.c:433 +#: src/date.c:437 #, c-format msgid "the options to print and set the time may not be used together" msgstr "印出日期和設定日期的選項不可以同時使用" -#: src/date.c:454 +#: src/date.c:458 #, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -2848,23 +2851,23 @@ msgid "" "argument must be a format string beginning with '+'" msgstr "" -#: src/date.c:531 +#: src/date.c:535 #, c-format msgid "cannot set date" msgstr "無法設定時間" -#: src/date.c:554 src/du.c:360 +#: src/date.c:558 src/du.c:371 #, c-format msgid "time %s is out of range" msgstr "時間 %s 超出可接受的範圍" #. This is a proper name. See the gettext manual, section Names. -#: src/dd.c:44 src/factor.c:43 src/rm.c:41 src/tail.c:69 src/touch.c:41 +#: 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 "" -#: src/dd.c:517 +#: src/dd.c:521 #, fuzzy, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -2873,7 +2876,7 @@ msgstr "" "用法：%s [檔案]...\n" " 或：%s [選項]\n" -#: src/dd.c:522 +#: src/dd.c:526 #, fuzzy msgid "" "Copy a file, converting and formatting according to the operands.\n" @@ -2892,7 +2895,7 @@ msgstr "" " count=區段數目 只複製指定 <區段數目> 的輸入資料\n" " ibs=位元組 每次讀取指定的 <位元組>\n" -#: src/dd.c:531 +#: src/dd.c:535 #, fuzzy msgid "" " if=FILE read from FILE instead of stdin\n" @@ -2902,7 +2905,8 @@ msgid "" " oflag=FLAGS write as per the comma separated symbol list\n" " seek=N skip N obs-sized blocks at start of output\n" " skip=N skip N ibs-sized blocks at start of input\n" -" status=noxfer suppress transfer statistics\n" +" status=WHICH WHICH info to suppress outputting to stderr;\n" +" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" msgstr "" " if=檔案 讀取 <檔案> 內容而非標準輸入的資料\n" " obs=位元組 每次寫入指定的 <位元組>\n" @@ -2911,11 +2915,11 @@ msgstr "" " skip=區段數目 先略過以 ibs 為單位的指定 <區段數目> 的輸入資料\n" " status=noxfer 不顯示輸入/輸出結果\n" -#: src/dd.c:541 +#: src/dd.c:546 #, fuzzy msgid "" "\n" -"BLOCKS and BYTES may be followed by the following multiplicative suffixes:\n" +"N and BYTES may be followed by the following multiplicative suffixes:\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, and so on for T, P, E, Z, Y.\n" "\n" @@ -2928,7 +2932,7 @@ msgstr "" "GB=1000*1000*1000，G=1024*1024*1024，還有 T/P/E/Z/Y 如此類推。\n" "每個 <關鍵字> 可以是：\n" -#: src/dd.c:550 +#: src/dd.c:555 #, fuzzy msgid "" " ascii from EBCDIC to ASCII\n" @@ -2956,7 +2960,7 @@ msgstr "" " sync 將每個輸入資料區段以 NUL 字元填滿至 ibs 的大小；\n" " 當配合 block 或 unblock 時，會以空格代替 NUL 字元填充\n" -#: src/dd.c:563 +#: src/dd.c:568 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -2972,7 +2976,7 @@ msgstr "" " fdatasync 真正將資料寫入磁碟後才結束程式\n" " fsync 類似 fdatasync，並寫入元資料\n" -#: src/dd.c:571 +#: src/dd.c:576 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -2981,76 +2985,76 @@ msgid "" "suggested)\n" msgstr "" -#: src/dd.c:578 +#: src/dd.c:583 msgid " cio use concurrent I/O for data\n" msgstr "" -#: src/dd.c:580 +#: src/dd.c:585 msgid " direct use direct I/O for data\n" msgstr "" -#: src/dd.c:582 +#: src/dd.c:587 #, fuzzy msgid " directory fail unless a directory\n" msgstr "建立目錄時不能指定目的地目錄" -#: src/dd.c:584 +#: src/dd.c:589 msgid " dsync use synchronized I/O for data\n" msgstr "" -#: src/dd.c:586 +#: src/dd.c:591 msgid " sync likewise, but also for metadata\n" msgstr "" -#: src/dd.c:587 +#: src/dd.c:592 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr "" -#: src/dd.c:590 +#: src/dd.c:595 msgid " nonblock use non-blocking I/O\n" msgstr "" -#: src/dd.c:592 +#: src/dd.c:597 msgid " noatime do not update access time\n" msgstr "" -#: src/dd.c:595 +#: src/dd.c:600 msgid " nocache discard cached data\n" msgstr "" -#: src/dd.c:598 +#: src/dd.c:603 msgid " noctty do not assign controlling terminal from file\n" msgstr "" -#: src/dd.c:601 +#: src/dd.c:606 msgid " nofollow do not follow symlinks\n" msgstr "" -#: src/dd.c:603 +#: src/dd.c:608 msgid " nolinks fail if multiply-linked\n" msgstr "" -#: src/dd.c:605 +#: src/dd.c:610 msgid " binary use binary I/O for data\n" msgstr "" -#: src/dd.c:607 +#: src/dd.c:612 msgid " text use text I/O for data\n" msgstr "" -#: src/dd.c:609 +#: src/dd.c:614 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:612 +#: src/dd.c:617 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:615 +#: src/dd.c:620 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:620 +#: src/dd.c:625 #, fuzzy, c-format msgid "" "\n" @@ -3079,26 +3083,26 @@ msgstr "" "選項包括：\n" "\n" -#: src/dd.c:676 +#: src/dd.c:683 #, c-format msgid "" "%<PRIuMAX>+%<PRIuMAX> records in\n" "%<PRIuMAX>+%<PRIuMAX> records out\n" msgstr "" -#: src/dd.c:682 +#: src/dd.c:689 #, fuzzy, c-format msgid "%<PRIuMAX> truncated record\n" msgid_plural "%<PRIuMAX> truncated records\n" msgstr[0] "個被截斷了的區段" -#: src/dd.c:694 +#: src/dd.c:701 #, fuzzy, c-format msgid "%<PRIuMAX> byte (%s) copied" msgid_plural "%<PRIuMAX> bytes (%s) copied" msgstr[0] "複製了 %s 位元組 (%s)" -#: src/dd.c:712 +#: src/dd.c:720 #, fuzzy msgid "Infinity B" msgstr "無限" @@ -3113,87 +3117,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:725 +#: src/dd.c:733 #, fuzzy, c-format msgid ", %g s, %s/s\n" msgstr "，%g 秒，%s/s\n" -#: src/dd.c:804 +#: src/dd.c:812 #, c-format msgid "closing input file %s" msgstr "正在關閉輸入檔 %s" -#: src/dd.c:811 +#: src/dd.c:819 #, c-format msgid "closing output file %s" msgstr "正在關閉輸出檔%s" -#: src/dd.c:1014 +#: src/dd.c:1022 #, fuzzy, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "無法更改%s的所屬群組為 %s\n" -#: src/dd.c:1085 src/dd.c:1934 +#: src/dd.c:1093 src/dd.c:1942 #, c-format msgid "writing to %s" msgstr "正在寫入 %s" -#: src/dd.c:1199 src/dd.c:1253 +#: src/dd.c:1207 src/dd.c:1261 #, c-format msgid "unrecognized operand %s" msgstr "無法識別參數 %s" -#: src/dd.c:1210 +#: src/dd.c:1218 #, fuzzy msgid "invalid conversion" msgstr "轉換用的關鍵字無效：%s" -#: src/dd.c:1213 src/dd.c:1289 +#: src/dd.c:1221 src/dd.c:1297 #, fuzzy msgid "invalid input flag" msgstr "輸入旗標無效：%s" -#: src/dd.c:1216 src/dd.c:1283 src/dd.c:1295 +#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303 #, fuzzy msgid "invalid output flag" msgstr "輸出旗標無效：%s" -#: src/dd.c:1219 +#: src/dd.c:1227 #, fuzzy msgid "invalid status flag" msgstr "狀態旗標無效：%s" -#: src/dd.c:1258 src/truncate.c:312 +#: src/dd.c:1266 src/truncate.c:310 #, c-format msgid "invalid number %s" msgstr "數字 %s 無效" -#: src/dd.c:1340 +#: src/dd.c:1348 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "不可同時使用 ascii, ebcdic, ibm 中的任何二個" -#: src/dd.c:1342 +#: src/dd.c:1350 #, c-format msgid "cannot combine block and unblock" msgstr "不可同時使用 block 和 unblock" -#: src/dd.c:1344 +#: src/dd.c:1352 #, c-format msgid "cannot combine lcase and ucase" msgstr "不可同時使用 lcase 和 ucase" -#: src/dd.c:1346 +#: src/dd.c:1354 #, c-format msgid "cannot combine excl and nocreat" msgstr "不可同時使用 excl 和 nocreat" -#: src/dd.c:1349 +#: src/dd.c:1357 #, fuzzy, c-format msgid "cannot combine direct and nocache" msgstr "不可同時使用 excl 和 nocreat" -#: src/dd.c:1506 +#: src/dd.c:1514 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3202,155 +3206,177 @@ msgstr "" "警告：暫時避免有關檔案 (%s) 的 lseek 核心錯誤，檔案的 mt_type=0x%0lx ─\n" " 有關 mt_type 類型的清單請參考 <sys/mtio.h>" -#: src/dd.c:1593 +#: src/dd.c:1601 #, fuzzy, c-format msgid "%s: cannot skip" msgstr "%s：無法搜尋" -#: src/dd.c:1595 src/dd.c:1614 src/dd.c:1675 +#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683 #, c-format msgid "%s: cannot seek" msgstr "%s：無法搜尋" -#: src/dd.c:1655 +#: src/dd.c:1663 #, c-format msgid "offset overflow while reading file %s" msgstr "" -#: src/dd.c:1667 +#: src/dd.c:1675 #, fuzzy, c-format msgid "warning: invalid file offset after failed read" msgstr "警告：寬度 %lu 是無效的；以 %d 代替" -#: src/dd.c:1671 +#: src/dd.c:1679 #, c-format msgid "cannot work around kernel bug after all" msgstr "無法避開系統核心的錯誤" -#: src/dd.c:1814 +#: src/dd.c:1822 #, c-format msgid "setting flags for %s" msgstr "" -#: src/dd.c:1867 +#: src/dd.c:1875 #, c-format msgid "memory exhausted by input buffer of size %zu bytes (%s)" msgstr "" -#: src/dd.c:1881 +#: src/dd.c:1889 #, c-format msgid "memory exhausted by output buffer of size %zu bytes (%s)" msgstr "" -#: src/dd.c:1914 +#: src/dd.c:1922 #, fuzzy, c-format msgid "%s: cannot skip to specified offset" msgstr "%s：無法搜尋至相對位置 %s%s" -#: src/dd.c:2125 src/dd.c:2258 +#: src/dd.c:2133 #, fuzzy, c-format -msgid "failed to truncate to %<PRIuMAX> bytes in output file %s" +msgid "failed to truncate to %<PRIdMAX> bytes in output file %s" msgstr "略過輸出檔%2$s的最初 %1$s 個位元組" -#: src/dd.c:2138 +#: src/dd.c:2146 #, c-format msgid "fdatasync failed for %s" msgstr "%s 的 fdatasync 失敗" -#: src/dd.c:2148 +#: src/dd.c:2156 #, c-format msgid "fsync failed for %s" msgstr "%s 的 fsync 失敗" -#: src/dd.c:2199 src/dd.c:2228 -#, c-format -msgid "opening %s" -msgstr "開啟 %s 中" +#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165 +#, fuzzy, c-format +msgid "failed to open %s" +msgstr "無法保留%s的時間" -#: src/dd.c:2237 +#: src/dd.c:2246 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) " "blocks" msgstr "" -#: src/dd.c:2274 src/dd.c:2280 +#: src/dd.c:2267 +#, 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 #, 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:54 src/expr.c:153 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:39 src/sleep.c:35 src/sort.c:66 +#: 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 msgid "Paul Eggert" msgstr "" -#: src/df.c:140 +#: src/df.c:172 msgid "Filesystem" msgstr "檔案系統" -#: src/df.c:141 +#: src/df.c:175 msgid "Type" msgstr "類型" -#: src/df.c:142 +#: src/df.c:178 src/df.c:542 msgid "blocks" msgstr "區段" -#: src/df.c:142 -msgid "Inodes" -msgstr "Inode" - -#: src/df.c:142 -msgid "Size" -msgstr "容量" - -#: src/df.c:143 +#: src/df.c:181 msgid "Used" msgstr "已用" -#: src/df.c:143 -msgid "IUsed" -msgstr "I已用" - -#: src/df.c:144 +#: src/df.c:184 msgid "Available" msgstr "可用" -#: src/df.c:144 -msgid "IFree" -msgstr "I可用" - -#: src/df.c:144 -msgid "Avail" -msgstr "可用" - -#: src/df.c:145 +#: src/df.c:187 msgid "Use%" msgstr "已用%" -#: src/df.c:145 +#: src/df.c:190 +msgid "Inodes" +msgstr "Inode" + +#: src/df.c:193 +msgid "IUsed" +msgstr "I已用" + +#: src/df.c:196 +msgid "IFree" +msgstr "I可用" + +#: src/df.c:199 msgid "IUse%" msgstr "I已用%" -#: src/df.c:145 +#: src/df.c:202 +msgid "Mounted on" +msgstr "掛載點" + +#: src/df.c:383 +#, c-format +msgid "option --output: field '%s' unknown" +msgstr "" + +#: src/df.c:390 +#, fuzzy, c-format +msgid "option --output: field '%s' used more than once" +msgstr "警告：指定了來源檔 %s 多於一次" + +#: src/df.c:410 src/df.c:449 +msgid "Size" +msgstr "容量" + +#: src/df.c:414 src/df.c:451 +msgid "Avail" +msgstr "可用" + +#: src/df.c:474 msgid "Capacity" msgstr "容量" -#: src/df.c:146 -msgid "Mounted on" -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 +#, c-format +msgid "%s-%s" +msgstr "" -#: src/df.c:847 +#: src/df.c:1210 +#, fuzzy msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" -"\n" msgstr "" "顯示每個 <檔案> 所在的檔案系統的資訊，預設是顯示所有檔案系統。\n" "\n" -#: src/df.c:855 +#: src/df.c:1217 #, fuzzy msgid "" " -a, --all include dummy file systems\n" @@ -3367,7 +3393,7 @@ msgstr "" " -h, --human-readable 以容易理解的格式印出檔案系統大小 (例如 1K 234M 2G)\n" " -H, --si 類似 -h，但以 1000 為單位而不是 1024\n" -#: src/df.c:865 +#: src/df.c:1227 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3380,8 +3406,12 @@ msgstr "" " -l, --local 只顯示本機的檔案系統\n" " --no-sync 取得使用量資料前不進行 sync 動作 (預設)\n" -#: src/df.c:872 +#: src/df.c:1234 +#, fuzzy msgid "" +" --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" +" or print all fields if FIELD_LIST is " +"omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" " -t, --type=TYPE limit listing to file systems of type TYPE\n" @@ -3396,21 +3426,43 @@ msgstr "" " -x, --exclude-type=類型 只印出不是指定 <類型> 的檔案系統資訊\n" " -v (此選項不作處理)\n" -#: src/df.c:1027 +#: src/df.c:1248 +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" +msgstr "" + +#: src/df.c:1285 +#, 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 #, c-format msgid "file system type %s both selected and excluded" msgstr "不能同時選擇和排除檔案系統類型 %s" -#: src/df.c:1075 +#: src/df.c:1500 msgid "Warning: " msgstr "警告：" -#: src/df.c:1077 src/stat.c:795 +#: src/df.c:1502 src/stat.c:814 #, fuzzy msgid "cannot read table of mounted file systems" msgstr "%s 無法讀取已掛載的檔案系統的名單" -#: src/df.c:1107 +#: src/df.c:1539 #, c-format msgid "no file systems processed" msgstr "" @@ -3519,7 +3571,7 @@ msgid "" " %s stdio.h -> \".\"\n" msgstr "" -#: src/du.c:260 src/sort.c:390 src/wc.c:112 +#: src/du.c:270 src/sort.c:394 src/wc.c:112 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3528,18 +3580,19 @@ msgstr "" "用法：%s [選項]... [檔案]...\n" " 或：%s [選項]... --files0-from=F\n" -#: src/du.c:264 -msgid "" -"Summarize disk usage of each FILE, recursively for directories.\n" -"\n" +#: src/du.c:274 +#, fuzzy +msgid "Summarize disk usage of each FILE, recursively for directories.\n" msgstr "" "總結每個 <檔案> 的磁碟用量，目錄則取總用量。\n" "\n" # (Abel) doesn't need to translate into such detail for --apparent-size -#: src/du.c:271 +#: src/du.c:280 #, fuzzy msgid "" +" -0, --null end each output line with 0 byte rather than " +"newline\n" " -a, --all write counts for all files, not just directories\n" " --apparent-size print apparent sizes, rather than disk usage; " "although\n" @@ -3556,7 +3609,7 @@ msgstr "" " -c, --total 印出所有項目相加後的總用量\n" " -D, --dereference-args 只找出符號鏈結所指示的真正目的地\n" -#: src/du.c:279 +#: src/du.c:289 #, fuzzy msgid "" " -B, --block-size=SIZE scale sizes by SIZE before printing them. E.g.,\n" @@ -3566,13 +3619,20 @@ msgid "" " -c, --total produce a grand total\n" " -D, --dereference-args dereference only symlinks that are listed on the\n" " command line\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 "" -" -a, --all 包括大小為 0 個區段的檔案系統\n" -" -B, --block-size=大小 區段以指定 <大小> 的位元組為單位\n" -" -h, --human-readable 以容易理解的格式印出檔案系統大小 (例如 1K 234M 2G)\n" -" -H, --si 類似 -h，但以 1000 為單位而不是 1024\n" +" -x, --one-file-system 忽略屬於其它檔案系統的目錄\n" +" -X 檔案, --exclude-from=檔案 由 <檔案> 讀取應排除的檔案的樣式\n" +" --exclude=樣式 排除符合指定 <樣式> 的檔案\n" +" --max-depth=N 只顯示參數指定的目錄 N 層或以內的子目錄的總用量\n" +" (若使用 --all 選項，也會顯示檔案的佔用量)；\n" +" --max-depth=0 的效果等於 --summarize\n" -#: src/du.c:288 +#: src/du.c:302 #, fuzzy msgid "" " --files0-from=F summarize disk usage of the NUL-terminated file\n" @@ -3581,7 +3641,6 @@ msgid "" " -H equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" --si like -h, but use powers of 1000 not 1024\n" msgstr "" " --files0-from=F 總結檔案 F 中所有檔案名稱的使用量，而且所有檔案名稱\n" " 都以 NUL 字元作為結尾\n" @@ -3592,21 +3651,21 @@ msgstr "" " -k 即 --block-size=1K\n" " -l, --count-links 將所有實際鏈結 (hard link) 的大小也計算在內\n" -#: src/du.c:297 +#: src/du.c:310 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 "" -#: src/du.c:302 +#: src/du.c:316 +#, fuzzy msgid "" -" -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " "default)\n" -" -0, --null end each output line with 0 byte rather than " -"newline\n" " -S, --separate-dirs 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 找出任何符號鏈結指示的真正目的地\n" @@ -3615,28 +3674,11 @@ msgstr "" " -S, --separate-dirs 不包括子目錄的佔用量\n" " -s, --summarize 只分別計算每個檔案參數所佔的總用量\n" -#: src/du.c:309 -#, 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 忽略屬於其它檔案系統的目錄\n" -" -X 檔案, --exclude-from=檔案 由 <檔案> 讀取應排除的檔案的樣式\n" -" --exclude=樣式 排除符合指定 <樣式> 的檔案\n" -" --max-depth=N 只顯示參數指定的目錄 N 層或以內的子目錄的總用量\n" -" (若使用 --all 選項，也會顯示檔案的佔用量)；\n" -" --max-depth=0 的效果等於 --summarize\n" - -#: src/du.c:318 +#: src/du.c:322 #, fuzzy msgid "" +" -t, --threshold=SIZE exclude entries smaller than SIZE if positive,\n" +" or entries greater than SIZE if negative\n" " --time show time of the last modification of any file in " "the\n" " directory, or any of its subdirectories\n" @@ -3657,65 +3699,74 @@ msgstr "" " atime、access、use、ctime 或 status；加上\n" " --sort=time 選項時會以指定時間作為排序索引\n" -#: src/du.c:375 +#: src/du.c:333 +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 msgid "Infinity" msgstr "無限" -#: src/du.c:600 +#: src/du.c:507 +#, c-format +msgid "mount point %s already traversed" +msgstr "" + +#: src/du.c:624 #, fuzzy, c-format msgid "fts_read failed: %s" msgstr "fts_read 失敗" -#: src/du.c:724 +#: src/du.c:780 #, c-format msgid "invalid maximum depth %s" msgstr "最大深度 %s 無效" -#: src/du.c:817 +#: src/du.c:809 +#, fuzzy, c-format +msgid "invalid --threshold argument '-0'" +msgstr "參數無效: %s" + +#: src/du.c:887 #, c-format msgid "cannot both summarize and show all entries" msgstr "不能只顯示總用量，同時又顯示每個項目" -#: src/du.c:824 +#: src/du.c:894 #, c-format msgid "warning: summarizing is the same as using --max-depth=0" msgstr "警告：顯示總用量等於使用 --max-depth=0" -#: src/du.c:830 +#: src/du.c:900 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "警告：顯示總用量的選項和 --max-depth=%lu 互相抵觸" -#: src/du.c:896 src/sort.c:4479 src/wc.c:668 +#: src/du.c:966 src/sort.c:4533 src/wc.c:668 #, fuzzy msgid "file operands cannot be combined with --files0-from" msgstr "有檔案作為參數時不可和 --files0-from 一起使用。" -#: src/du.c:949 src/md5sum.c:587 src/od.c:903 src/tac.c:239 src/tac.c:350 -#: src/tac.c:506 src/tac.c:586 src/wc.c:733 +#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 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:963 src/sort.c:4508 src/wc.c:747 +#: src/du.c:1040 src/sort.c:4562 src/wc.c:747 #, c-format msgid "when reading file names from stdin, no file name of %s allowed" msgstr "" -#: src/du.c:980 src/du.c:988 src/wc.c:760 src/wc.c:768 +#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768 msgid "invalid zero-length file name" msgstr "檔案名稱無效 (長度為零)" -#: src/du.c:1007 src/head.c:149 src/head.c:262 src/head.c:334 src/head.c:538 -#: src/head.c:620 src/head.c:692 src/head.c:750 src/head.c:774 src/tail.c:412 -#: src/tail.c:500 src/tail.c:549 src/tail.c:642 src/tail.c:770 src/tail.c:818 -#: src/tail.c:855 src/tail.c:1782 src/tail.c:1812 src/uniq.c:395 -#, c-format -msgid "error reading %s" -msgstr "讀取 %s 時發生錯誤" - -#: src/du.c:1010 src/ls.c:2649 src/wc.c:791 +#: src/du.c:1088 src/ls.c:2649 src/wc.c:791 msgid "total" msgstr "總計" @@ -3809,15 +3860,17 @@ msgid "Usage: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n" msgstr "用法：%s [選項]... [-] [NAME=VALUE]... [指令 [參數]...]\n" #: src/env.c:55 +msgid "Set each NAME to VALUE in the environment and run COMMAND.\n" +msgstr "" + +#: src/env.c:61 msgid "" -"Set each NAME to VALUE in the environment and run COMMAND.\n" -"\n" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with 0 byte rather than newline\n" " -u, --unset=NAME remove variable from the environment\n" msgstr "" -#: src/env.c:64 +#: src/env.c:68 msgid "" "\n" "A mere - implies -i. If no COMMAND, print the resulting environment.\n" @@ -3825,31 +3878,31 @@ msgstr "" "\n" "僅用 - 已經等於 -i 選項。如果沒有指定 <指令>，則顯示所有環境變數。\n" -#: src/env.c:120 +#: src/env.c:124 #, fuzzy, c-format msgid "cannot unset %s" msgstr "無法 stat %s" -#: src/env.c:131 +#: src/env.c:135 #, fuzzy, c-format msgid "cannot set %s" msgstr "無法 stat %s" -#: src/env.c:148 +#: src/env.c:152 #, c-format msgid "cannot specify --null (-0) with command" msgstr "" #: 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" -"\n" msgstr "" "將每個 <檔案> 中的 tab 轉換為空格，並在標準輸出顯示。\n" "如果沒有指定 <檔案> 或 <檔案> 是 -，則由標準輸入讀取資料。\n" -#: src/expand.c:115 +#: src/expand.c:114 msgid "" " -i, --initial do not convert tabs after non blanks\n" " -t, --tabs=NUMBER have tabs NUMBER characters apart, not 8\n" @@ -3857,32 +3910,32 @@ msgstr "" " -i, --initial 不轉換非空白字元後的 TAB 字元\n" " -t, --tabs=數目 將 tab 轉換為指定 <數目> 的空格而不是 8 個\n" -#: src/expand.c:119 +#: src/expand.c:118 msgid "" " -t, --tabs=LIST use comma separated list of explicit tab positions\n" msgstr " -t, --tabs=LIST 用以逗號分隔的數字來指定 tab 的位置\n" -#: src/expand.c:172 src/unexpand.c:191 +#: src/expand.c:171 src/unexpand.c:190 #, c-format msgid "tab stop is too large %s" msgstr "tab 字元寬度 %s 過長" -#: src/expand.c:180 src/unexpand.c:199 +#: src/expand.c:179 src/unexpand.c:198 #, c-format msgid "tab size contains invalid character(s): %s" msgstr "tab 字元寬度含有無效的字元：%s" -#: src/expand.c:206 src/unexpand.c:225 +#: src/expand.c:205 src/unexpand.c:224 #, c-format msgid "tab size cannot be 0" msgstr "tab 字元寬度不可為 0" -#: src/expand.c:208 src/unexpand.c:227 +#: src/expand.c:207 src/unexpand.c:226 #, c-format msgid "tab sizes must be ascending" msgstr "tab 字元位置必須由小至大" -#: src/expand.c:326 src/expand.c:345 src/unexpand.c:374 src/unexpand.c:419 +#: 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 "輸入內容過長" @@ -3996,12 +4049,12 @@ msgstr "在正規運算式搜尋時發生錯誤" msgid "non-integer argument" msgstr "參數結果不是數字" -#: src/expr.c:793 src/truncate.c:316 +#: src/expr.c:793 src/truncate.c:314 #, c-format msgid "division by zero" msgstr "被 0 整除" -#: src/expr.c:887 src/sort.c:2029 +#: src/expr.c:887 src/sort.c:2044 #, fuzzy, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "請設定 LC_ALL='C' 避免問題出現。" @@ -4011,25 +4064,32 @@ msgstr "請設定 LC_ALL='C' 避免問題出現。" msgid "the strings compared were %s and %s" msgstr "要比較的字串為%s及%s。" -#: src/factor.c:449 -msgid "using arbitrary-precision arithmetic" +#. This is a proper name. See the gettext manual, section Names. +#: src/factor.c:111 +msgid "Niels Moller" msgstr "" -#: src/factor.c:460 -msgid "using single-precision arithmetic" +#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459 +#, c-format +msgid "Lucas prime test failure. This should not happen" msgstr "" -#: src/factor.c:465 src/od.c:1640 src/od.c:1709 +#: src/factor.c:2092 #, c-format -msgid "%s is too large" -msgstr "%s 過長" +msgid "squfof queue overflow" +msgstr "" -#: src/factor.c:469 +#: src/factor.c:2419 #, fuzzy, c-format msgid "%s is not a valid positive integer" msgstr "‘%s’ 不是有效的正整數" -#: src/factor.c:494 +#: src/factor.c:2442 src/od.c:1646 src/od.c:1715 +#, c-format +msgid "%s is too large" +msgstr "%s 過長" + +#: src/factor.c:2454 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4038,7 +4098,7 @@ msgstr "" "用法：%s [數字]...\n" " 或：%s 選項\n" -#: src/factor.c:499 +#: src/factor.c:2459 #, fuzzy msgid "" "Print the prime factors of each specified integer NUMBER. If none\n" @@ -4065,21 +4125,20 @@ msgid "cannot stat current directory (now %s)" msgstr "無法 stat 目前的目錄 (現在是 %s)" #. This is a proper name. See the gettext manual, section Names. -#: src/fmt.c:37 +#: src/fmt.c:38 msgid "Ross Paterson" msgstr "" -#: src/fmt.c:269 +#: src/fmt.c:270 #, fuzzy, c-format msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n" msgstr "用法：%s [-數字] [選項]... [檔案]...\n" -#: src/fmt.c:270 +#: 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" -"\n" msgstr "" "重新編排 <檔案> 中的每一段文字，並在標準輸出顯示結果。\n" "如果沒有指定 <檔案> 或 <檔案> 是‘-’，則由標準輸入讀取資料。\n" @@ -4097,8 +4156,8 @@ msgstr "" " 的結果重新加上 <字串>\n" " -s, --split-only 只將一行過長的資料分開，而不合併多於一行的資料\n" -#: src/fmt.c:285 -#, fuzzy, c-format +#: src/fmt.c:287 +#, fuzzy, 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" @@ -4109,28 +4168,28 @@ msgstr "" " -u, --uniform-spacing 每兩個字之間以一個空格分隔，句子後則用兩個空格\n" " -w, --width=數字 最大的行寬 (預設為 75 個字元)\n" -#: src/fmt.c:357 +#: src/fmt.c:359 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" "option; use -w N instead" msgstr "" -#: src/fmt.c:403 src/fmt.c:414 +#: src/fmt.c:405 src/fmt.c:416 #, c-format msgid "invalid width: %s" msgstr "寬度無效：%s" #: src/fold.c:70 +#, fuzzy msgid "" "Wrap input lines in each FILE (standard input by default), writing to\n" "standard output.\n" -"\n" msgstr "" "將 <檔案> (預設為標準輸入) 中的每一行進行自動換行，並在標準輸出顯示結果。\n" "\n" -#: src/fold.c:78 +#: src/fold.c:77 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4140,13 +4199,13 @@ msgstr "" " -s, --spaces 只在空格位置斷開\n" " -w, --width=寬度 使用指定的 <寬度> 作為行寬而非 80\n" -#: src/fold.c:289 src/pr.c:836 +#: src/fold.c:288 src/pr.c:832 #, fuzzy, c-format 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:75 +#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 #: src/truncate.c:37 msgid "Padraig Brady" msgstr "" @@ -4162,17 +4221,17 @@ msgid "" "\n" msgstr "" -#: src/group-list.c:69 src/id.c:345 src/setuidgid.c:184 +#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184 #, fuzzy, c-format msgid "failed to get groups for user %s" msgstr "無法將 %s 的所屬群組更改為 %s\n" -#: src/group-list.c:74 src/id.c:350 +#: src/group-list.c:74 src/id.c:370 #, fuzzy, c-format msgid "failed to get groups for the current process" msgstr "無法將 %s 的所屬群組更改為 %s\n" -#: src/group-list.c:104 +#: src/group-list.c:114 #, fuzzy, c-format msgid "cannot find name for group ID %lu" msgstr "%s: 找不到 UID 為 %lu 的用戶名稱\n" @@ -4210,17 +4269,17 @@ msgid "%s: no such user" msgstr "%s：此用戶不存在" #: 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" -"\n" msgstr "" "在標準輸出顯示每個 <檔案> 的最初 10 行。\n" "當多於一個 <檔案> 時，顯示時會先加上表示檔案名稱的標頭。\n" "如果沒有指定 <檔案> 或 <檔案> 是 -，則由標準輸入讀取資料。\n" -#: src/head.c:118 +#: src/head.c:117 #, fuzzy msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" @@ -4235,7 +4294,7 @@ msgstr "" " -n, --lines=[-]N 顯示每個檔案的最初 N 行；如果附有 ‘-’ 號，\n" " 則顯示整個檔案減去最後 N 行\n" -#: src/head.c:126 +#: src/head.c:125 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4243,7 +4302,7 @@ msgstr "" " -q, --quiet, --silent 絕不顯示含有檔案名稱的標頭\n" " -v, --verbose 一定顯示含有檔案名稱的標頭\n" -#: src/head.c:132 +#: src/head.c:131 #, fuzzy msgid "" "\n" @@ -4257,58 +4316,58 @@ msgstr "" "GB=1000*1000*1000，G=1024*1024*1024，還有 T/P/E/Z/Y 如此類推。\n" "每個 <關鍵字> 可以是：\n" -#: src/head.c:152 -#, c-format -msgid "error writing %s" -msgstr "寫入 %s 時發生錯誤" - -#: src/head.c:155 +#: src/head.c:154 #, c-format msgid "%s: file has shrunk too much" msgstr "" -#: src/head.c:228 src/head.c:1044 +#: src/head.c:227 src/head.c:1051 #, c-format msgid "%s: number of bytes is too large" msgstr "%s：位元組數目過大" -#: src/head.c:441 +#: src/head.c:440 #, fuzzy, c-format msgid "%s: cannot lseek back to original position" msgstr "%s：無法搜尋至原來位置" -#: src/head.c:613 src/head.c:684 src/tail.c:450 +#: src/head.c:612 src/head.c:691 src/tail.c:449 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s：無法搜尋至位置 %s" -#: src/head.c:791 +#: src/head.c:673 +#, 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 的檔案指標重新定位" -#: src/head.c:878 +#: src/head.c:885 #, c-format msgid "%s: %s is so large that it is not representable" msgstr "%s：%s過大，因此無法表示" -#: src/head.c:879 +#: src/head.c:886 msgid "number of lines" msgstr "行數" -#: src/head.c:879 +#: src/head.c:886 msgid "number of bytes" msgstr "位元組數目" -#: src/head.c:886 src/tail.c:1947 +#: src/head.c:893 src/tail.c:1947 msgid "invalid number of lines" msgstr "無效的行數" -#: src/head.c:887 src/tail.c:1948 +#: src/head.c:894 src/tail.c:1948 msgid "invalid number of bytes" msgstr "無效的位元組數目" -#: src/head.c:974 src/head.c:1032 +#: src/head.c:981 src/head.c:1039 #, fuzzy, c-format msgid "invalid trailing option -- %c" msgstr "選項無效 ─ %c" @@ -4422,86 +4481,86 @@ msgstr "" msgid "cannot get effective UID" msgstr "無法設定時間" -#: src/id.c:289 +#: src/id.c:311 #, fuzzy, c-format -msgid "cannot find name for user ID %lu" +msgid "cannot find name for user ID %s" msgstr "%s: 找不到 UID 為 %lu 的用戶名稱\n" -#: src/id.c:309 +#: src/id.c:329 #, c-format -msgid "uid=%lu" +msgid "uid=%s" msgstr "" -#: src/id.c:314 +#: src/id.c:334 #, c-format -msgid " gid=%lu" +msgid " gid=%s" msgstr "" -#: src/id.c:321 +#: src/id.c:341 #, c-format -msgid " euid=%lu" +msgid " euid=%s" msgstr "" -#: src/id.c:329 +#: src/id.c:349 #, c-format -msgid " egid=%lu" +msgid " egid=%s" msgstr "" -#: src/id.c:357 +#: src/id.c:377 msgid " groups=" msgstr "" -#: src/id.c:373 +#: src/id.c:393 #, c-format msgid " context=%s" msgstr "" -#: src/install.c:372 +#: src/install.c:373 #, fuzzy, c-format msgid "warning: %s: failed to change context to %s" msgstr "無法建立目錄%s" -#: src/install.c:413 +#: src/install.c:414 #, c-format msgid "creating directory %s" msgstr "正在建立目錄 %s" -#: src/install.c:481 +#: src/install.c:482 #, c-format msgid "cannot change ownership of %s" msgstr "無法更改 %s 的擁有權" -#: src/install.c:505 +#: src/install.c:506 #, c-format msgid "cannot set time stamps for %s" msgstr "無法設定 %s 的檔案時間" -#: src/install.c:526 src/split.c:412 src/timeout.c:387 +#: src/install.c:527 src/split.c:426 src/timeout.c:439 #, c-format msgid "fork system call failed" msgstr "調用 fork() 系統函式失敗" -#: src/install.c:530 +#: src/install.c:531 #, fuzzy, c-format msgid "cannot run %s" msgstr "無法執行 strip 指令" -#: src/install.c:534 +#: src/install.c:535 #, fuzzy, c-format msgid "waiting for strip" msgstr "正在寫入 %s" -#: src/install.c:536 +#: src/install.c:537 #, c-format msgid "strip process terminated abnormally" msgstr "" -#: src/install.c:557 +#: src/install.c:558 #, c-format msgid "invalid user %s" msgstr "使用者 %s 無效" -#: src/install.c:593 +#: src/install.c:594 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -4514,7 +4573,7 @@ msgstr "" " 或：%s [選項]... -t 目錄 來源...\n" " 或：%s [選項]... -d 目錄...\n" -#: src/install.c:600 +#: src/install.c:601 #, fuzzy msgid "" "\n" @@ -4527,7 +4586,6 @@ msgid "" "In the first three forms, copy SOURCE to DEST or multiple SOURCE(s) to\n" "the existing DIRECTORY, while setting permission modes and owner/group.\n" "In the 4th form, create all components of the given DIRECTORY(ies).\n" -"\n" msgstr "" "在最初三種格式中，會將 <來源> 複製至 <目的地> 或將多個 <來源>\n" "複製至已存在的 <目錄>，同時設定權限模式及擁有者/所屬群組。\n" @@ -4598,53 +4656,53 @@ msgid "" "directories\n" msgstr "" -#: src/install.c:858 +#: src/install.c:859 #, c-format msgid "" "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled" msgstr "" -#: src/install.c:868 +#: src/install.c:869 #, c-format msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled" msgstr "" -#: src/install.c:885 +#: src/install.c:886 #, c-format msgid "the strip option may not be used when installing a directory" msgstr "建立目錄時不能用 strip 選項" -#: src/install.c:888 +#: src/install.c:889 #, c-format msgid "target directory not allowed when installing a directory" msgstr "建立目錄時不能指定目的地目錄" -#: src/install.c:892 +#: src/install.c:893 #, c-format msgid "cannot force target context to %s and preserve it" msgstr "" -#: src/install.c:946 src/mkdir.c:202 src/stdbuf.c:327 +#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326 #, c-format msgid "invalid mode %s" msgstr "權限模式 %s 無效" -#: src/install.c:953 +#: src/install.c:954 #, c-format msgid "WARNING: ignoring --strip-program option as -s option was not specified" msgstr "" -#: src/install.c:958 +#: src/install.c:959 #, fuzzy, c-format msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive" msgstr "不能同時使用 --string 及 --check 選項" -#: src/install.c:965 +#: src/install.c:966 #, fuzzy, c-format msgid "options --compare (-C) and --strip are mutually exclusive" msgstr "印出日期所用的選項是互相矛盾的" -#: src/install.c:971 +#: src/install.c:972 #, c-format msgid "" "the --compare (-C) option is ignored when you specify a mode with non-" @@ -4652,7 +4710,7 @@ msgid "" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/join.c:40 src/sort.c:65 +#: src/join.c:40 src/sort.c:66 msgid "Mike Haertel" msgstr "" @@ -4729,7 +4787,7 @@ msgstr "" #: src/join.c:403 #, c-format -msgid "%s:%ju: is not sorted: %.*s" +msgid "%s:%<PRIuMAX>: is not sorted: %.*s" msgstr "" #: src/join.c:840 src/join.c:1038 @@ -4757,12 +4815,12 @@ msgstr "" msgid "conflicting empty-field replacement strings" msgstr "" -#: src/join.c:1101 src/sort.c:4414 +#: src/join.c:1101 src/sort.c:4468 #, fuzzy, c-format msgid "multi-character tab %s" msgstr "分隔欄位字元‘%s’多於一個字元" -#: src/join.c:1105 src/sort.c:4419 +#: src/join.c:1105 src/sort.c:4473 #, c-format msgid "incompatible tabs" msgstr "" @@ -4781,12 +4839,10 @@ msgid "" msgstr "" #: src/kill.c:82 -msgid "" -"Send signals to processes, or list signals.\n" -"\n" +msgid "Send signals to processes, or list signals.\n" msgstr "" -#: src/kill.c:89 +#: src/kill.c:88 msgid "" " -s, --signal=SIGNAL, -SIGNAL\n" " specify the name or number of the signal to be sent\n" @@ -4795,7 +4851,7 @@ msgid "" " -t, --table print a table of signal information\n" msgstr "" -#: src/kill.c:97 +#: src/kill.c:96 msgid "" "\n" "SIGNAL may be a signal name like 'HUP', or a signal number like '1',\n" @@ -4803,32 +4859,32 @@ msgid "" "PID is an integer; if negative it identifies a process group.\n" msgstr "" -#: src/kill.c:206 +#: src/kill.c:205 #, c-format msgid "%s: invalid process id" msgstr "%s：進程編號無效" -#: src/kill.c:260 +#: src/kill.c:259 #, c-format msgid "invalid option -- %c" msgstr "選項無效 ─ %c" -#: src/kill.c:269 +#: src/kill.c:268 #, c-format msgid "%s: multiple signals specified" msgstr "%s：使用了多於一個訊號" -#: src/kill.c:283 +#: src/kill.c:282 #, c-format msgid "multiple -l or -t options specified" msgstr "-l 或 -t 選項使用了多於一次" -#: src/kill.c:300 +#: src/kill.c:299 #, c-format msgid "cannot combine signal with -l or -t" msgstr "使用 -l 或 -t 時不能同時指定訊號" -#: src/kill.c:306 +#: src/kill.c:305 #, c-format msgid "no process ID specified" msgstr "未指定進程編號" @@ -4938,7 +4994,6 @@ msgid "" "When creating hard links, each TARGET must exist. Symbolic links\n" "can hold arbitrary text; if later resolved, a relative link is\n" "interpreted in relation to its parent directory.\n" -"\n" msgstr "" "建立連至指定 <目標> 的鏈結，並可選擇指定 <鏈結名稱>。\n" "如果沒有指定 <鏈結名稱>，會在目前的目錄中建立一個和 <目標> 名稱一樣的鏈結。\n" @@ -4948,7 +5003,7 @@ msgstr "" "都必須存在。\n" "\n" -#: src/ln.c:395 +#: src/ln.c:394 #, fuzzy msgid "" " --backup[=CONTROL] make a backup of each existing destination " @@ -4967,7 +5022,7 @@ msgstr "" "者)\n" " -f, --force 強迫移除任何已存在的目的地檔案\n" -#: src/ln.c:403 +#: src/ln.c:402 #, fuzzy msgid "" " -i, --interactive prompt whether to remove destinations\n" @@ -4985,7 +5040,7 @@ msgstr "" " -i, --interactive 確認是否移除目的地檔案\n" " -s, --symbolic 建立符號鏈結而不是實際鏈結\n" -#: src/ln.c:412 +#: src/ln.c:411 #, fuzzy msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -4999,25 +5054,12 @@ msgstr "" " --target-directory=目錄 在指定 <目錄> 中建立鏈結\n" " -v, --verbose 連結前先印出每個檔案的名稱\n" -#: src/ln.c:428 -#, fuzzy +#: src/ln.c:433 +#, c-format 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" - -#: src/ln.c:435 -#, c-format -msgid "" -"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" +"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 "" #: src/ln.c:554 @@ -5086,7 +5128,7 @@ msgstr "忽略無效的環境變數 COLUMNS 的寬度數值：%s" msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "忽略無效的環境變數 TABSIZE 的 tab 字元定位值：%s" -#: src/ls.c:1750 src/ptx.c:1976 +#: src/ls.c:1750 src/ptx.c:1975 #, fuzzy, c-format msgid "invalid line width: %s" msgstr "無效的寬度：‘%s’" @@ -5150,7 +5192,7 @@ msgstr "無法建立目錄%s" msgid "closing directory %s" msgstr "無法進入%s目錄" -#: src/ls.c:3301 +#: src/ls.c:3302 #, fuzzy, c-format msgid "cannot compare file names %s and %s" msgstr "要比較的字串為%s及%s。" @@ -5160,13 +5202,12 @@ msgstr "要比較的字串為%s及%s。" msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" -"\n" msgstr "" "列出 <檔案> 的資訊 (預設為目前的目錄)。\n" "如果不指定 -cftuSUX 或 --sort 任何一個選項，則根據字母大小排序。\n" "\n" -#: src/ls.c:4729 +#: src/ls.c:4728 #, fuzzy msgid "" " -a, --all do not ignore entries starting with .\n" @@ -5180,7 +5221,7 @@ msgstr "" " --author 印出每個檔案的著作者\n" " -b, --escape 以八進位溢出序列表示不可列印的字元\n" -#: src/ls.c:4735 +#: src/ls.c:4734 #, fuzzy msgid "" " --block-size=SIZE scale sizes by SIZE before printing them. E." @@ -5201,7 +5242,7 @@ msgstr "" " 配合 -l ：顯示 ctime 但根據名稱排序\n" " 否則 ：根據 ctime 排序\n" -#: src/ls.c:4745 +#: src/ls.c:4744 #, fuzzy msgid "" " -C list entries by columns\n" @@ -5219,7 +5260,7 @@ msgstr "" " -d, --directory 當遇到目錄時列出目錄本身而非目錄內的檔案\n" " -D, --dired 產生適合 Emacs 的 dired 模式使用的結果\n" -#: src/ls.c:4753 +#: src/ls.c:4752 #, fuzzy msgid "" " -f do not sort, enable -aU, disable -ls --color\n" @@ -5235,11 +5276,11 @@ msgstr "" " single-column -1，verbose -l，vertical -C\n" " --full-time 即 -l --time-style=full-iso\n" -#: src/ls.c:4761 +#: src/ls.c:4760 msgid " -g like -l, but do not list owner\n" msgstr "" -#: src/ls.c:4764 +#: src/ls.c:4763 msgid "" " --group-directories-first\n" " group directories before files.\n" @@ -5247,7 +5288,7 @@ msgid "" " use of --sort=none (-U) disables grouping\n" msgstr "" -#: src/ls.c:4770 +#: src/ls.c:4769 #, fuzzy msgid "" " -G, --no-group in a long listing, don't print group names\n" @@ -5260,7 +5301,7 @@ msgstr "" " -h, --human-readable 以容易理解的格式印出檔案系統大小 (例如 1K 234M 2G)\n" " -H, --si 類似 -h，但以 1000 為單位而不是 1024\n" -#: src/ls.c:4776 +#: src/ls.c:4775 #, fuzzy msgid "" " -H, --dereference-command-line\n" @@ -5279,7 +5320,7 @@ msgstr "" " --si 類似 -h，但取 1000 的次方而不是 1024\n" " -H, --dereference-command-line 使用指令列中的符號鏈結指示的真正目的地\n" -#: src/ls.c:4786 +#: src/ls.c:4785 #, fuzzy msgid "" " --indicator-style=WORD append indicator with style WORD to entry " @@ -5297,7 +5338,7 @@ msgstr "" " -I, --ignore=樣式 不印出任何符合 shell 萬用字元 <樣式> 的項目\n" " -k 即 --block-size=1K\n" -#: src/ls.c:4796 +#: src/ls.c:4795 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5311,7 +5352,7 @@ msgstr "" " 的目標而並非符號鏈結本身的資訊\n" " -m 所有項目以逗號分隔，並填滿整行行寬\n" -#: src/ls.c:4804 +#: src/ls.c:4803 #, fuzzy msgid "" " -n, --numeric-uid-gid like -l, but list numeric user and group IDs\n" @@ -5328,7 +5369,7 @@ msgstr "" " -o 類似 -l，但不列出有關群組的資訊\n" " -p, --file-type 加上檔案類型的指示符號 (/=@| 其中一個)\n" -#: src/ls.c:4812 +#: src/ls.c:4811 #, fuzzy msgid "" " -q, --hide-control-chars print ? instead of non graphic characters\n" @@ -5348,7 +5389,7 @@ msgstr "" " literal、locale、shell、shell-always、c、" "escape\n" -#: src/ls.c:4821 +#: src/ls.c:4820 #, fuzzy msgid "" " -r, --reverse reverse order while sorting\n" @@ -5360,7 +5401,7 @@ msgstr "" " -R, --recursive 同時列出所有子目錄層\n" " -s, --size 以區段大小為單位列出所有檔案的大小\n" -#: src/ls.c:4826 +#: src/ls.c:4825 #, fuzzy msgid "" " -S sort by file size\n" @@ -5383,7 +5424,7 @@ msgstr "" " atime、access、use、ctime 或 status；加上\n" " --sort=time 選項時會以指定時間作為排序索引\n" -#: src/ls.c:4836 +#: src/ls.c:4835 #, fuzzy msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" @@ -5405,13 +5446,13 @@ msgstr "" " -t 根據修改時間排序\n" " -T, --tabsize=寬度 另行指定 tab 的 <寬度>，而非 8 個字元\n" -#: src/ls.c:4845 +#: src/ls.c:4844 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:4849 +#: src/ls.c:4848 #, fuzzy msgid "" " -u with -lt: sort by, and show, access time\n" @@ -5426,7 +5467,7 @@ msgstr "" " -U 不進行排序；依檔案系統原有的次序列出項目\n" " -v 根據版本進行排序\n" -#: src/ls.c:4856 +#: src/ls.c:4855 #, fuzzy msgid "" " -w, --width=COLS assume screen width instead of current value\n" @@ -5440,7 +5481,7 @@ msgstr "" " 每一行，除非使用了 -s 選項\n" " -n (不會作任何處理)\n" -#: src/ls.c:4866 +#: src/ls.c:4865 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5449,7 +5490,7 @@ msgid "" "variable can change the settings. Use the dircolors command to set it.\n" msgstr "" -#: src/ls.c:4873 +#: src/ls.c:4872 msgid "" "\n" "Exit status:\n" @@ -5474,7 +5515,7 @@ msgstr "" msgid "David Madore" msgstr "" -#: src/md5sum.c:162 +#: src/md5sum.c:164 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -5487,13 +5528,13 @@ msgstr "" "印出或檢查 %s (%d 位元) 總和檢查值。\n" "如果沒有指定 <檔案> 或 <檔案> 是 -，則由標準輸入讀取資料。\n" -#: src/md5sum.c:172 +#: src/md5sum.c:174 msgid "" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr "" -#: src/md5sum.c:176 +#: src/md5sum.c:178 #, fuzzy msgid " -b, --binary read in binary mode\n" msgstr "" @@ -5501,21 +5542,25 @@ msgstr "" " -B, --binary (DOS/Windows)以二元碼模式將資料輸出至畫面。\n" "\n" -#: src/md5sum.c:179 +#: src/md5sum.c:181 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr "" -#: src/md5sum.c:183 +#: src/md5sum.c:184 +msgid " --tag create a BSD-style checksum\n" +msgstr "" + +#: src/md5sum.c:188 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" -#: src/md5sum.c:187 +#: src/md5sum.c:192 msgid " -t, --text read in text mode (default)\n" msgstr "" -#: src/md5sum.c:190 +#: src/md5sum.c:195 #, fuzzy msgid "" "\n" @@ -5529,12 +5574,12 @@ msgstr "" " --status 不顯示任何結果，只用回傳值表示是否成功\n" " -w, --warn 對於每一行含有不正確格式的總和檢查值都顯示警告\n" -#: src/md5sum.c:198 +#: src/md5sum.c:203 msgid "" " --strict with --check, exit non-zero for any invalid input\n" msgstr "" -#: src/md5sum.c:203 +#: src/md5sum.c:208 #, fuzzy, c-format msgid "" "\n" @@ -5548,76 +5593,86 @@ msgstr "" "的輸出結果。預設模式是印出總和檢查值，一個代表檔案類型的字元 (‘*’表示二元\n" "碼，‘ ’[空格] 表示文字)，及每個 <檔案> 的名稱。\n" -#: src/md5sum.c:502 +#: src/md5sum.c:523 #, fuzzy, c-format msgid "%s: too many checksum lines" msgstr "%s：找不到正確格式的 %s 總和檢查值" -#: src/md5sum.c:526 +#: src/md5sum.c:547 #, fuzzy, c-format msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line" msgstr "%s：%lu：該行的 %s 總和檢查值格式不正確" -#: src/md5sum.c:551 +#: src/md5sum.c:572 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s：開啟或讀取時發生錯誤\n" -#: src/md5sum.c:574 +#: src/md5sum.c:595 msgid "FAILED" msgstr "錯誤" -#: src/md5sum.c:576 +#: src/md5sum.c:597 msgid "OK" msgstr "正確" -#: src/md5sum.c:600 +#: src/md5sum.c:621 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "%s：找不到正確格式的 %s 總和檢查值" -#: src/md5sum.c:610 +#: src/md5sum.c:631 #, 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:618 +#: src/md5sum.c:639 #, 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:626 +#: src/md5sum.c:647 #, 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:704 +#: src/md5sum.c:760 +#, c-format +msgid "--tag does not support --text mode" +msgstr "" + +#: src/md5sum.c:766 +#, fuzzy, c-format +msgid "the --tag option is meaningless when verifying checksums" +msgstr "選項 --status 只有在驗證總和檢查值時才有意義" + +#: src/md5sum.c:773 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" msgstr "當驗證總和檢查值時，選項 --binary 及 --text 是沒有意義的" -#: src/md5sum.c:712 +#: src/md5sum.c:781 #, c-format msgid "the --status option is meaningful only when verifying checksums" msgstr "選項 --status 只有在驗證總和檢查值時才有意義" -#: src/md5sum.c:719 +#: src/md5sum.c:788 #, c-format msgid "the --warn option is meaningful only when verifying checksums" msgstr "選項 --warn 只有在驗證總和檢查值時才有意義" -#: src/md5sum.c:726 +#: src/md5sum.c:795 #, fuzzy, c-format msgid "the --quiet option is meaningful only when verifying checksums" msgstr "選項 --status 只有在驗證總和檢查值時才有意義" -#: src/md5sum.c:733 +#: src/md5sum.c:802 #, fuzzy, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "選項 --status 只有在驗證總和檢查值時才有意義" @@ -5628,14 +5683,13 @@ msgid "Usage: %s [OPTION]... DIRECTORY...\n" msgstr "用法：%s [選項]... [檔案]...\n" #: src/mkdir.c:57 -msgid "" -"Create the DIRECTORY(ies), if they do not already exist.\n" -"\n" +#, fuzzy +msgid "Create the DIRECTORY(ies), if they do not already exist.\n" msgstr "" "若目錄不是已經存在則建立目錄。\n" "\n" -#: src/mkdir.c:64 +#: src/mkdir.c:63 #, fuzzy msgid "" " -m, --mode=MODE set file mode (as in chmod), not a=rwx - umask\n" @@ -5648,7 +5702,7 @@ msgstr "" " -p, --parents 需要時建立上層目錄，如目錄早已存在則不當作錯誤\n" " -v, --verbose 每次建立新目錄都顯示訊息\n" -#: src/mkdir.c:169 +#: src/mkdir.c:168 #, fuzzy, c-format msgid "created directory %s" msgstr "無法建立目錄%s" @@ -5659,30 +5713,29 @@ msgid "Usage: %s [OPTION]... NAME...\n" msgstr "用法：%s [選項]... [檔案]...\n" #: src/mkfifo.c:52 -msgid "" -"Create named pipes (FIFOs) with the given NAMEs.\n" -"\n" +#, fuzzy +msgid "Create named pipes (FIFOs) with the given NAMEs.\n" msgstr "" "以指定的 <名稱> 建立 named pipe (FIFO)。\n" "\n" -#: src/mkfifo.c:59 src/mknod.c:61 +#: src/mkfifo.c:58 src/mknod.c:60 #, 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:62 +#: src/mkfifo.c:61 msgid "" " -Z, --context=CTX set the SELinux security context of each NAME to CTX\n" msgstr "" -#: src/mkfifo.c:122 src/mknod.c:128 +#: src/mkfifo.c:121 src/mknod.c:127 #, fuzzy, c-format msgid "invalid mode" msgstr "無效的數字" -#: src/mkfifo.c:127 src/mknod.c:133 +#: src/mkfifo.c:126 src/mknod.c:132 #, c-format msgid "mode must specify only file permission bits" msgstr "" @@ -5693,18 +5746,17 @@ msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n" msgstr "用法：%s [選項]... SET1 [SET2]\n" #: src/mknod.c:54 -msgid "" -"Create the special file NAME of the given TYPE.\n" -"\n" +#, fuzzy +msgid "Create the special file NAME of the given TYPE.\n" msgstr "" "建立指定 <類型> 及 <名稱> 的特殊檔案。\n" "\n" -#: src/mknod.c:64 +#: src/mknod.c:63 msgid " -Z, --context=CTX set the SELinux security context of NAME to CTX\n" msgstr "" -#: src/mknod.c:69 +#: src/mknod.c:68 msgid "" "\n" "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n" @@ -5713,7 +5765,7 @@ msgid "" "otherwise, as decimal. TYPE may be:\n" msgstr "" -#: src/mknod.c:76 +#: src/mknod.c:75 #, fuzzy msgid "" "\n" @@ -5729,42 +5781,42 @@ msgstr "" " c, u 建立 (沒有緩衝的) 字元特殊檔案\n" " p 建立 FIFO 特殊檔案\n" -#: src/mknod.c:151 +#: src/mknod.c:150 #, fuzzy msgid "Special files require major and minor device numbers." msgstr "建立區塊特殊檔案時，必需指定 major 和 minor 裝置編號" -#: src/mknod.c:161 +#: src/mknod.c:160 #, fuzzy msgid "Fifos do not have major and minor device numbers." msgstr "無效的開始行號：‘%s’" -#: src/mknod.c:177 +#: src/mknod.c:176 #, fuzzy, c-format msgid "block special files not supported" msgstr "區塊特殊檔案" -#: src/mknod.c:186 +#: src/mknod.c:185 #, fuzzy, c-format msgid "character special files not supported" msgstr "字元特殊檔案" -#: src/mknod.c:202 +#: src/mknod.c:201 #, fuzzy, c-format msgid "invalid major device number %s" msgstr "無效的開始行號：‘%s’" -#: src/mknod.c:207 +#: src/mknod.c:206 #, fuzzy, c-format msgid "invalid minor device number %s" msgstr "無效的開始行號：‘%s’" -#: src/mknod.c:212 +#: src/mknod.c:211 #, fuzzy, c-format msgid "invalid device %s %s" msgstr "%2$s的參數%1$s無效" -#: src/mknod.c:226 +#: src/mknod.c:225 #, fuzzy, c-format msgid "invalid device type %s" msgstr "%2$s的參數%1$s無效" @@ -5823,60 +5875,59 @@ msgid "" " directory specified via -p; else /tmp [deprecated]\n" msgstr "" -#: src/mktemp.c:222 +#: src/mktemp.c:223 #, fuzzy, c-format msgid "failed to redirect stderr to /dev/null" msgstr "標準輸出" -#: src/mktemp.c:228 +#: src/mktemp.c:229 #, fuzzy, c-format msgid "too many templates" msgstr "重複的行數過多" -#: src/mktemp.c:248 +#: src/mktemp.c:249 #, c-format msgid "with --suffix, template %s must end in X" msgstr "" -#: src/mktemp.c:273 src/split.c:1117 +#: src/mktemp.c:274 src/split.c:1130 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "" -#: src/mktemp.c:278 +#: src/mktemp.c:279 #, c-format msgid "too few X's in template %s" msgstr "" -#: src/mktemp.c:291 +#: src/mktemp.c:292 #, c-format msgid "invalid template, %s, contains directory separator" msgstr "" -#: src/mktemp.c:305 +#: src/mktemp.c:306 #, c-format msgid "invalid template, %s; with --tmpdir, it may not be absolute" msgstr "" -#: src/mktemp.c:325 +#: src/mktemp.c:326 #, fuzzy, c-format msgid "failed to create directory via template %s" msgstr "無法建立目錄%s" -#: src/mktemp.c:335 +#: src/mktemp.c:336 #, fuzzy, c-format msgid "failed to create file via template %s" msgstr "無法保留 %s 的時間" -#: src/mv.c:290 -msgid "" -"Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" -"\n" +#: src/mv.c:292 +#, fuzzy +msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" msgstr "" "將 <來源> 名稱更改為 <目的地> 名稱，或將 <來源> 檔案移動至 <目錄>。\n" "\n" -#: src/mv.c:297 +#: src/mv.c:298 #, fuzzy msgid "" " --backup[=CONTROL] make a backup of each existing destination " @@ -5894,7 +5945,7 @@ msgstr "" " -f, --force 覆寫檔案前不會進行確認，等於 --reply=yes\n" " -i, --interactive 覆寫檔案前必須先確認，等於 --reply=query\n" -#: src/mv.c:306 +#: src/mv.c:307 #, fuzzy msgid "" " --strip-trailing-slashes remove any trailing slashes from each " @@ -5906,7 +5957,7 @@ msgstr "" " --strip-trailing-slashes 移除參數中所有 <來源> 檔案/目錄末端的斜號\n" " -S, --suffix=後置字串 自行指定備份檔的 <後置字串>\n" -#: src/mv.c:311 +#: src/mv.c:312 #, fuzzy msgid "" " -t, --target-directory=DIRECTORY move all SOURCE arguments into " @@ -5931,28 +5982,30 @@ msgstr "用法：%s [選項] [檔案]...\n" #, c-format msgid "" "Run COMMAND with an adjusted niceness, which affects process scheduling.\n" -"With no COMMAND, print the current niceness. Nicenesses range from\n" -"%d (most favorable scheduling) to %d (least favorable).\n" -"\n" -" -n, --adjustment=N add integer N to the niceness (default 10)\n" +"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 "" + +#: src/nice.c:82 +msgid " -n, --adjustment=N add integer N to the niceness (default 10)\n" msgstr "" -#: src/nice.c:168 +#: src/nice.c:172 #, fuzzy, c-format msgid "invalid adjustment %s" msgstr "%2$s的參數%1$s無效" -#: src/nice.c:177 +#: src/nice.c:181 #, c-format msgid "a command must be given with an adjustment" msgstr "" -#: src/nice.c:184 src/nice.c:195 +#: src/nice.c:188 src/nice.c:199 #, fuzzy, c-format msgid "cannot get niceness" msgstr "無法建立暫存檔" -#: src/nice.c:201 +#: src/nice.c:205 #, fuzzy, c-format msgid "cannot set niceness" msgstr "無法設定時間" @@ -5962,17 +6015,17 @@ msgstr "無法設定時間" msgid "Scott Bartram" msgstr "" -#: src/nl.c:186 +#: 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" -"\n" msgstr "" "將每個 <檔案> 的內容在標準輸出顯示，並加上行號。\n" "如果沒有指定 <檔案> 或 <檔案> 是 -，則由標準輸入讀取資料。\n" "\n" -#: src/nl.c:194 +#: src/nl.c:186 msgid "" " -b, --body-numbering=STYLE use STYLE for numbering body lines\n" " -d, --section-delimiter=CC use CC for separating logical pages\n" @@ -5982,7 +6035,7 @@ msgstr "" " -d, --section-delimiter=CC 使用 CC 字元分辨標頭、內容和註腳\n" " -f, --footer-numbering=方式 決定將註腳加上行號的 <方式>\n" -#: src/nl.c:199 +#: src/nl.c:191 #, fuzzy msgid "" " -h, --header-numbering=STYLE use STYLE for numbering header lines\n" @@ -6002,7 +6055,7 @@ msgstr "" " -s, --number-separator=字串 以 <字串> 分隔行號和內容\n" # I can't imagine manpage and --help output are so outdated -- Abel -#: src/nl.c:207 +#: src/nl.c:199 #, fuzzy msgid "" " -v, --starting-line-number=NUMBER first line number on each logical page\n" @@ -6011,7 +6064,7 @@ msgstr "" " -v, --starting-line-number=數字 每頁第一行的行號\n" " -w, --number-width=數字 以指定 <數字> 的字元作為顯示行數的寬度\n" -#: src/nl.c:213 +#: src/nl.c:205 msgid "" "\n" "By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC are\n" @@ -6023,7 +6076,7 @@ msgstr "" "分辨每頁的標頭、內容和註腳的字元；如果沒有指定第二個字元則表示是 :。\n" "請輸入 \\\\ 表示 \\ 字元。<方式> 可以是以下其中一個：\n" -#: src/nl.c:219 +#: src/nl.c:211 #, fuzzy msgid "" "\n" @@ -6051,52 +6104,47 @@ msgstr "" " rn 向右對齊，前面不加零補位\n" " rz 向右對齊，前面加零補位\n" -#: src/nl.c:286 +#: src/nl.c:278 #, fuzzy, c-format msgid "line number overflow" msgstr "欄位是 0" -#: src/nl.c:486 +#: src/nl.c:478 #, fuzzy, c-format msgid "invalid header numbering style: %s" msgstr "無效的欄位號碼：‘%s’" -#: src/nl.c:494 +#: src/nl.c:486 #, fuzzy, c-format msgid "invalid body numbering style: %s" msgstr "無效的數字" -#: src/nl.c:502 +#: src/nl.c:494 #, fuzzy, c-format msgid "invalid footer numbering style: %s" msgstr "欄位規格中含有無效的檔案編號：‘%s’" -#: src/nl.c:511 +#: src/nl.c:503 #, fuzzy, c-format msgid "invalid starting line number: %s" msgstr "無效的開始行號：‘%s’" -#: src/nl.c:517 -#, c-format -msgid "WARNING: --page-increment is deprecated; use --line-increment instead" -msgstr "" - -#: src/nl.c:524 +#: src/nl.c:512 #, fuzzy, c-format msgid "invalid line number increment: %s" msgstr "無效的行號增加值：‘%s’" -#: src/nl.c:536 +#: src/nl.c:524 #, fuzzy, c-format msgid "invalid number of blank lines: %s" msgstr "無效的空白行數目：‘%s’" -#: src/nl.c:550 +#: src/nl.c:538 #, fuzzy, c-format msgid "invalid line number field width: %s" msgstr "無效的行號欄位寬度：‘%s’" -#: src/nl.c:569 +#: src/nl.c:557 #, fuzzy, c-format msgid "invalid line numbering format: %s" msgstr "無效的行號增加值：‘%s’" @@ -6137,11 +6185,6 @@ msgstr "標準輸出" msgid "ignoring input" msgstr "參數過多" -#: src/nohup.c:163 src/nohup.c:165 -#, fuzzy, c-format -msgid "failed to open %s" -msgstr "無法保留%s的時間" - #: src/nohup.c:175 #, fuzzy, c-format msgid "ignoring input and appending output to %s" @@ -6173,33 +6216,367 @@ msgid "failed to redirect standard error" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:32 +#: src/nproc.c:33 msgid "Giuseppe Scrivano" msgstr "" -#: src/nproc.c:56 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 +#: src/nproc.c:57 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 #, fuzzy, c-format msgid "Usage: %s [OPTION]...\n" msgstr "用法：%s [選項] [檔案]...\n" -#: src/nproc.c:57 +#: src/nproc.c:58 msgid "" "Print the number of processing units available to the current process,\n" "which may be less than the number of online processors\n" "\n" msgstr "" -#: src/nproc.c:62 +#: src/nproc.c:63 msgid "" " --all print the number of installed processors\n" " --ignore=N if possible, exclude N processing units\n" msgstr "" -#: src/nproc.c:106 +#: src/nproc.c:107 #, fuzzy, c-format msgid "%s: invalid number to ignore" msgstr "%s：無效的行數" +#. This is a proper name. See the gettext manual, section Names. +#: src/numfmt.c:35 +msgid "Assaf Gordon" +msgstr "" + +#: src/numfmt.c:676 +#, c-format +msgid "value too large to be converted: '%s'" +msgstr "" + +#: src/numfmt.c:680 +#, fuzzy, c-format +msgid "invalid number: '%s'" +msgstr "數字 %s 無效" + +#: src/numfmt.c:684 +#, c-format +msgid "rejecting suffix in input: '%s' (consider using --from)" +msgstr "" + +#: src/numfmt.c:688 +#, fuzzy, c-format +msgid "invalid suffix in input: '%s'" +msgstr "無效的行號增加值：‘%s’" + +#: src/numfmt.c:692 +#, c-format +msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)" +msgstr "" + +#: src/numfmt.c:723 +#, fuzzy, c-format +msgid "failed to prepare value '%Lf' for printing" +msgstr "%s：無法開啟來寫入資料" + +#: src/numfmt.c:787 +#, fuzzy, c-format +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 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [NUMBER]...\n" +msgstr "用法：%s [選項]... [檔案]...\n" + +#: src/numfmt.c:816 +msgid "" +"Reformat NUMBER(s), or the numbers from standard input if none are " +"specified.\n" +msgstr "" + +#: src/numfmt.c:820 +msgid " --debug print warnings about invalid input\n" +msgstr "" + +#: src/numfmt.c:823 +msgid "" +" -d, --delimiter=X use X instead of whitespace for field delimiter\n" +msgstr "" + +#: src/numfmt.c:826 +msgid "" +" --field=N replace the number in input field N (default is 1)\n" +msgstr "" + +#: src/numfmt.c:829 +msgid "" +" --format=FORMAT use printf style floating-point FORMAT;\n" +" see FORMAT below for details\n" +msgstr "" + +#: src/numfmt.c:833 +msgid "" +" --from=UNIT auto-scale input numbers to UNITs; default is " +"'none';\n" +" see UNIT below\n" +msgstr "" + +#: src/numfmt.c:837 +msgid "" +" --from-unit=N specify the input unit size (instead of the default " +"1)\n" +msgstr "" + +#: src/numfmt.c:840 +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 "" + +#: src/numfmt.c:844 +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 +msgid "" +" --invalid=MODE failure mode for invalid numbers: MODE can be:\n" +" abort (default), fail, warn, ignore\n" +msgstr "" + +#: src/numfmt.c:852 +msgid "" +" --padding=N pad the output to N characters; positive N will\n" +" right-align; negative N will left-align;\n" +" padding is ignored if the output is wider than N;\n" +" the default is to automatically pad if a " +"whitespace\n" +" is found\n" +msgstr "" + +#: src/numfmt.c:859 +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 +msgid "" +" --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" +" SUFFIX in input numbers\n" +msgstr "" + +#: src/numfmt.c:867 +msgid "" +" --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" +msgstr "" + +#: src/numfmt.c:870 +msgid "" +" --to-unit=N the output unit size (instead of the default 1)\n" +msgstr "" + +#: src/numfmt.c:877 +msgid "" +"\n" +"UNIT options:\n" +msgstr "" + +#: src/numfmt.c:880 +msgid " none no auto-scaling is done; suffixes will trigger an error\n" +msgstr "" + +#: src/numfmt.c:883 +msgid "" +" auto accept optional single/two letter suffix:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" +msgstr "" + +#: src/numfmt.c:889 +msgid "" +" si accept optional single letter suffix:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:894 +msgid "" +" iec accept optional single letter suffix:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:899 +msgid "" +" iec-i accept optional two-letter suffix:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ...\n" +msgstr "" + +#: src/numfmt.c:905 +#, 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" +msgstr "" + +#: src/numfmt.c:912 +#, c-format +msgid "" +"\n" +"Exit status is 0 if all input numbers were successfully converted.\n" +"By default, %s will stop at the first conversion error with exit status 2.\n" +"With --invalid='fail' a warning is printed for each conversion error\n" +"and the exit status is 2. With --invalid='warn' each conversion error is\n" +"diagnosed, but the exit status is 0. With --invalid='ignore' conversion\n" +"errors are not diagnosed and the exit status is 0.\n" +msgstr "" + +#: src/numfmt.c:921 +#, c-format +msgid "" +"\n" +"Examples:\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" +msgstr "" + +#: src/numfmt.c:974 src/seq.c:212 +#, fuzzy, c-format +msgid "format %s has no %% directive" +msgstr "目的地 %s 不是目錄" + +#: src/numfmt.c:990 +#, fuzzy, c-format +msgid "invalid format %s (width overflow)" +msgstr "%2$s的參數%1$s無效" + +#: src/numfmt.c:1007 src/seq.c:229 +#, c-format +msgid "format %s ends in %%" +msgstr "" + +#: src/numfmt.c:1010 +#, c-format +msgid "invalid format %s, directive must be %%['][-][N]f" +msgstr "" + +#: src/numfmt.c:1018 src/seq.c:236 +#, 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 "無效的行號增加值：‘%s’" + +#: src/numfmt.c:1092 +#, c-format +msgid "value too large to be printed: '%Lg' (consider using --to)" +msgstr "" + +#: src/numfmt.c:1100 +#, c-format +msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" +msgstr "" + +#: src/numfmt.c:1184 +#, c-format +msgid "large input value '%s': possible precision loss" +msgstr "" + +#: src/numfmt.c:1293 +#, 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 "無效的類型‘%s’" + +#: src/numfmt.c:1401 +#, fuzzy, c-format +msgid "invalid field value '%s'" +msgstr "無效的欄位號碼：‘%s’" + +#: src/numfmt.c:1430 +#, fuzzy, c-format +msgid "invalid header value '%s'" +msgstr "日期無效：‘%s’" + +#: src/numfmt.c:1456 +#, 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 +#, fuzzy, c-format +msgid "no conversion option specified" +msgstr "-l 或 -t 選項使用了多於一次" + +#: src/numfmt.c:1471 +#, fuzzy, c-format +msgid "grouping cannot be combined with --to" +msgstr "有檔案作為參數時不可和 --files0-from 一起使用。" + +#: src/numfmt.c:1473 +#, c-format +msgid "grouping has no effect in this locale" +msgstr "" + +#: src/numfmt.c:1486 +#, c-format +msgid "--header ignored with command-line input" +msgstr "" + +#: src/numfmt.c:1511 +#, fuzzy, c-format +msgid "error reading input" +msgstr "讀取 %s 時發生錯誤" + +#: src/numfmt.c:1520 +#, fuzzy, c-format +msgid "failed to convert some of the input numbers" +msgstr "標準輸出" + #: src/od.c:294 #, fuzzy, c-format msgid "" @@ -6228,27 +6605,48 @@ msgstr "" "\n" #: src/od.c:307 -msgid "All arguments to long options are mandatory for short options.\n" -msgstr "長選項必須用的參數在使用短選項時也是必須的。\n" +#, fuzzy +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" +"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" +"at first byte printed, incremented when dump is progressing.\n" +"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" +"對於舊式的語法 (第二種調用的格式)，<偏移值> 等於‘-j <偏移值>’。<標號>\n" +"是第一個位元組的虛擬地址(本來是 0)，會在傾印資料時相應增加。對於 <偏移值>\n" +"和 <標號>，前面加上 0x 或 0X 表示是十六進位數字；後面加上 . 表示是八進位\n" +"數字，加上 b 則表示乘以 512。\n" +"\n" +"<格式> 可以是下列一個或多個的規格：\n" +"\n" +" a ASCII 字元或以 ASCII 字元代表的控制字元\n" +" c ASCII 字兀或反斜號溢出序列\n" -#: src/od.c:310 +#: src/od.c:318 +#, fuzzy msgid "" -" -A, --address-radix=RADIX decide how file offsets are printed\n" +" -A, --address-radix=RADIX output format for file offsets. RADIX is one\n" +" of [doxn], for Decimal, Octal, Hex or None\n" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" " -A, --address-radix=RADIX 決定基準位址的單位\n" " -j, --skip-bytes=位元組 先略過指定 <位元組> 的輸入資料\n" -#: src/od.c:314 +#: src/od.c:323 #, 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" -" --traditional accept arguments in traditional form\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" @@ -6257,10 +6655,11 @@ msgstr "" " -w, --width[=位元組] 每行顯示指定的 <位元組> 數目\n" " --traditional 接受舊式的選項\n" -#: src/od.c:324 +#: src/od.c:336 #, fuzzy 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" @@ -6274,55 +6673,33 @@ msgstr "" " -c 等於 -t c， 顯示 ASCII 字元或反斜號溢出序列\n" " -d 等於 -t u2， 顯示十進位 unsigned short\n" -#: src/od.c:332 +#: src/od.c:345 #, fuzzy msgid "" -" -f same as -t fF, select floats\n" -" -i same as -t dI, select decimal ints\n" -" -l same as -t dL, select decimal longs\n" -" -o same as -t o2, select octal 2-byte units\n" -" -s same as -t d2, select decimal 2-byte units\n" -" -x same as -t x2, select hexadecimal 2-byte units\n" -msgstr "" -" -f 等於 -t fF， 顯示浮點數\n" -" -h 等於 -t x2， 顯示十六進位 short integer\n" -" -i 等於 -t d2， 顯示十進位 short integer\n" -" -l 等於 -t d4， 顯示十進位 long integer\n" -" -o 等於 -t o2， 顯示八進位 short integer\n" -" -x 等於 -t x2， 顯示十六進位 short integer\n" - -#: src/od.c:340 -#, fuzzy -msgid "" -"\n" -"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" -"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n" -"at first byte printed, incremented when dump is progressing.\n" -"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" -"對於舊式的語法 (第二種調用的格式)，<偏移值> 等於‘-j <偏移值>’。<標號>\n" -"是第一個位元組的虛擬地址(本來是 0)，會在傾印資料時相應增加。對於 <偏移值>\n" -"和 <標號>，前面加上 0x 或 0X 表示是十六進位數字；後面加上 . 表示是八進位\n" -"數字，加上 b 則表示乘以 512。\n" -"\n" -"<格式> 可以是下列一個或多個的規格：\n" -"\n" -" a ASCII 字元或以 ASCII 字元代表的控制字元\n" -" c ASCII 字兀或反斜號溢出序列\n" +" -f same as -t fF, select floats\n" +" -i same as -t dI, select decimal ints\n" +" -l same as -t dL, select decimal longs\n" +" -o same as -t o2, select octal 2-byte units\n" +" -s same as -t d2, select decimal 2-byte units\n" +" -x same as -t x2, select hexadecimal 2-byte units\n" +msgstr "" +" -f 等於 -t fF， 顯示浮點數\n" +" -h 等於 -t x2， 顯示十六進位 short integer\n" +" -i 等於 -t d2， 顯示十進位 short integer\n" +" -l 等於 -t d4， 顯示十進位 long integer\n" +" -o 等於 -t o2， 顯示八進位 short integer\n" +" -x 等於 -t x2， 顯示十六進位 short integer\n" -#: src/od.c:349 +#: src/od.c:353 msgid "" "\n" -"TYPE is made up of one or more of these specifications:\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" msgstr "" -#: src/od.c:356 +#: src/od.c:360 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -6336,10 +6713,11 @@ msgstr "" " u[大小] 無正負號的十進位數，每個整數佔指定 <大小> 的位元組\n" " x[大小] 十六進位數，每個整數佔指定 <大小> 的位元組\n" -#: src/od.c:363 +#: src/od.c:367 +#, fuzzy msgid "" "\n" -"SIZE is a number. For TYPE in doux, SIZE may also be C for\n" +"SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" "sizeof(char), S for sizeof(short), I for sizeof(int) or L for\n" "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" @@ -6350,41 +6728,38 @@ msgstr "" "表示 sizeof(long) 的 L。如果 <格式> 是 f，<大小> 可以是表示 sizeof(float)\n" "的 F、表示 sizeof(double) 的 D 或表示 sizeof(long double) 的 L。\n" -#: src/od.c:370 -#, fuzzy +#: src/od.c:374 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" +"Adding a z suffix to any type displays printable characters at the end of\n" +"each output line.\n" msgstr "" -"\n" -"RADIX 的選擇為：d 表示十進位，o 表示八進位，h 表示十六進位，或 n 表示\n" -"不顯示基準位址。<位元組> 可以是前置 0x 或 0X 的十六進位數字；如果 <位元組>\n" -"後加上 b 字元表示將數字乘以 512，加上 k 表示乘以 1024，加上 m 表示乘以\n" -"1048576。在任何 <格式> 後加上 z 字元會在每行輸出後顯示相應的可列印字元。" -#: src/od.c:380 +#: src/od.c:379 #, 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" +"\n" +"\n" +"BYTES is hex with 0x or 0X prefix, and may have a multiplier suffix:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"and so on for G, T, P, E, Z, Y.\n" msgstr "" -" \n" -"--string 不加數字表示字串長度是 3。--width 不加數字表示寬度是 32。預設\n" -"od 使用的選項是 -A o -t d2 -w 16。\n" +"\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" -#: src/od.c:633 src/od.c:753 +#: src/od.c:639 src/od.c:759 #, fuzzy, c-format msgid "invalid type string %s" msgstr "無效的類型‘%s’" -#: src/od.c:643 +#: src/od.c:649 #, fuzzy, c-format msgid "" "invalid type string %s;\n" @@ -6393,7 +6768,7 @@ msgstr "" "‘%s’是無效的類型；\n" "此系統不支援 %lu 位元組的整數" -#: src/od.c:764 +#: src/od.c:770 #, fuzzy, c-format msgid "" "invalid type string %s;\n" @@ -6402,37 +6777,37 @@ msgstr "" "‘%s’是無效的類型；\n" "此系統不支援 %lu 位元組的浮點數" -#: src/od.c:822 +#: src/od.c:828 #, fuzzy, c-format msgid "invalid character '%c' in type string %s" msgstr "類型‘%2$s’中含有無效的字元‘%1$c’。" -#: src/od.c:1047 +#: src/od.c:1053 #, c-format msgid "cannot skip past end of combined input" msgstr "無法移至合併後的輸入資料的末端之後" -#: src/od.c:1603 +#: src/od.c:1609 #, fuzzy, c-format msgid "invalid output address radix '%c'; it must be one character from [doxn]" msgstr "輸出位址的基數‘%c’是無效的；基數必須是 [doxn] 四個字元其中之一" -#: src/od.c:1729 +#: src/od.c:1735 #, c-format msgid "no type may be specified when dumping strings" msgstr "傾印字串時不能指定類型" -#: src/od.c:1804 +#: src/od.c:1810 #, fuzzy msgid "compatibility mode supports at most one file" msgstr "在相容性模式下，最多只能有三個參數" -#: src/od.c:1825 +#: src/od.c:1831 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "" -#: src/od.c:1868 +#: src/od.c:1874 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "警告：寬度 %lu 是無效的；以 %d 代替" @@ -6448,16 +6823,16 @@ msgid "standard input is closed" 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" -"\n" msgstr "" "將每個 <檔案> 相應的每一行用 TAB 隔開，在標準輸出中並排顯示。\n" "如果沒有指定 <檔案> 或 <檔案> 是 -，則由標準輸入讀取資料。\n" -#: src/paste.c:448 +#: 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" @@ -6465,7 +6840,7 @@ msgstr "" " -d, --delimiters=列表 反覆使用 <列表> 中的字元代替 TAB\n" " -s, --serial 每次合併一個檔案中的每一行，而非所有檔案的某一行\n" -#: src/paste.c:509 +#: src/paste.c:508 #, c-format msgid "delimiter list ends with an unescaped backslash: %s" msgstr "" @@ -6520,80 +6895,80 @@ msgid "Kaveh Ghazi" msgstr "" #. TRANSLATORS: Real name is unknown; at most 19 characters. -#: src/pinky.c:250 +#: src/pinky.c:242 msgid " ???" msgstr "" #. TRANSLATORS: Idle time is unknown; at most 5 characters. -#: src/pinky.c:274 +#: src/pinky.c:266 msgid "?????" msgstr "" -#: src/pinky.c:323 +#: src/pinky.c:314 #, c-format msgid "Login name: " msgstr "" -#: src/pinky.c:326 +#: src/pinky.c:317 #, c-format msgid "In real life: " msgstr "" #. TRANSLATORS: Real name is unknown; no hard limit. -#: src/pinky.c:330 +#: src/pinky.c:321 msgid "???\n" msgstr "" -#: src/pinky.c:350 +#: src/pinky.c:341 #, fuzzy, c-format msgid "Directory: " msgstr "目錄" -#: src/pinky.c:352 +#: src/pinky.c:343 #, c-format msgid "Shell: " msgstr "" -#: src/pinky.c:371 +#: src/pinky.c:362 #, c-format msgid "Project: " msgstr "" -#: src/pinky.c:395 +#: src/pinky.c:386 #, c-format msgid "Plan:\n" msgstr "" -#: src/pinky.c:414 +#: src/pinky.c:405 msgid "Login" msgstr "" -#: src/pinky.c:416 +#: src/pinky.c:407 msgid "Name" msgstr "" -#: src/pinky.c:417 +#: src/pinky.c:408 msgid " TTY" msgstr "" -#: src/pinky.c:419 +#: src/pinky.c:410 msgid "Idle" msgstr "" -#: src/pinky.c:420 +#: src/pinky.c:411 msgid "When" msgstr "" -#: src/pinky.c:423 +#: src/pinky.c:414 msgid "Where" msgstr "" -#: src/pinky.c:502 +#: src/pinky.c:493 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "用法：%s [選項]... [檔案]...\n" -#: src/pinky.c:503 +#: src/pinky.c:494 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -6603,7 +6978,7 @@ msgid "" " -s do short format output, this is the default\n" msgstr "" -#: src/pinky.c:511 +#: src/pinky.c:502 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -6612,7 +6987,7 @@ msgid "" " in short format\n" msgstr "" -#: src/pinky.c:520 +#: src/pinky.c:511 #, c-format msgid "" "\n" @@ -6620,7 +6995,7 @@ msgid "" "The utmp file will be %s.\n" msgstr "" -#: src/pinky.c:604 +#: src/pinky.c:595 #, fuzzy, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "使用選項 --string 時不能再指定檔案" @@ -6635,85 +7010,84 @@ msgstr "" msgid "Roland Huebner" msgstr "" -#: src/pr.c:912 +#: src/pr.c:908 #, fuzzy, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "‘--pages=開始頁碼[:結束頁碼]’缺少了參數" -#: src/pr.c:914 +#: src/pr.c:910 #, fuzzy, c-format msgid "invalid page range %s" msgstr "無效的類型‘%s’" -#: src/pr.c:979 +#: src/pr.c:975 #, fuzzy, c-format msgid "'-l PAGE_LENGTH' invalid number of lines: %s" msgstr "‘-l 每頁行數’的行數無效：‘%s’" -#: src/pr.c:1003 +#: src/pr.c:999 #, fuzzy, c-format msgid "'-N NUMBER' invalid starting line number: %s" msgstr "‘-N 行號’的開始行號無效：‘%s’" -#: src/pr.c:1015 +#: src/pr.c:1011 #, fuzzy, c-format msgid "'-o MARGIN' invalid line offset: %s" msgstr "‘-o 邊界’的字元偏移值無效：‘%s’" -#: src/pr.c:1056 +#: src/pr.c:1052 #, fuzzy, c-format msgid "'-w PAGE_WIDTH' invalid number of characters: %s" msgstr "‘-w 頁寬’的字元數目無效：‘%s’" -#: src/pr.c:1070 +#: src/pr.c:1066 #, fuzzy, c-format msgid "'-W PAGE_WIDTH' invalid number of characters: %s" msgstr "‘-W 頁寬’的字元數目無效：‘%s’" -#: src/pr.c:1100 +#: src/pr.c:1096 #, fuzzy, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "並排列印時不能同時指定欄位數目。" -#: src/pr.c:1104 +#: src/pr.c:1100 #, fuzzy, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "不能同時指定橫向列印與並排列印。" -#: src/pr.c:1200 +#: src/pr.c:1196 #, fuzzy, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "參數‘%2$s’含有多餘的字元‘-%1$c’或無效的數字" -#: src/pr.c:1304 +#: src/pr.c:1293 #, c-format msgid "page width too narrow" msgstr "頁面太窄" -#: src/pr.c:2369 +#: src/pr.c:2353 #, c-format msgid "starting page number %<PRIuMAX> exceeds page count %<PRIuMAX>" msgstr "" -#: src/pr.c:2396 +#: src/pr.c:2380 #, fuzzy, c-format msgid "page number overflow" msgstr "欄位是 0" -#: src/pr.c:2401 +#: src/pr.c:2385 #, c-format msgid "Page %<PRIuMAX>" msgstr "" -#: src/pr.c:2773 -msgid "" -"Paginate or columnate FILE(s) for printing.\n" -"\n" +#: src/pr.c:2757 +#, fuzzy +msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" "將 <檔案> 分頁或分欄以便列印。\n" "\n" -#: src/pr.c:2780 +#: src/pr.c:2763 #, fuzzy msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" @@ -6729,7 +7103,7 @@ msgstr "" " 將輸出分為指定的 <欄數> 顯示，而每一欄都是向下列印的，\n" " 除非使用 -a 選項。它也會平均分佈每頁中所有欄位的行數。\n" -#: src/pr.c:2788 +#: src/pr.c:2771 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -6746,7 +7120,7 @@ msgstr "" " 隔行顯示結果\n" # -F and -f are just the same, help text is ambiguous -- maddog -#: src/pr.c:2796 +#: src/pr.c:2779 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -6766,7 +7140,7 @@ msgstr "" " 使用 form feed 而不是 newline 字元來分頁 (使用此選項\n" " 時只會印出三行標頭，否則會印出五行標頭再加註腳)\n" -#: src/pr.c:2806 +#: src/pr.c:2789 #, fuzzy msgid "" " -h, --header=HEADER\n" @@ -6787,7 +7161,7 @@ msgstr "" " -J, --join-lines 將每行資料完整地合併；會關閉 -W 選項將每行截斷的效果；\n" " 不將每欄對齊；--sep-string[=字串] 選項可設定分隔字串\n" -#: src/pr.c:2815 +#: src/pr.c:2798 #, fuzzy msgid "" " -l, --length=PAGE_LENGTH\n" @@ -6802,7 +7176,7 @@ msgstr "" " -m, --merge 並排顯示所有檔案 (每欄一個檔案)；會將資料截短至符合\n" " 欄寬，但使用 -J 選項則不會截短任何一行\n" -#: src/pr.c:2822 +#: src/pr.c:2805 #, fuzzy msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" @@ -6818,7 +7192,7 @@ msgstr "" " -N 行號, --first-line-number=行號\n" " 指定每個檔案第一行的 <行號> (請參考 +開始頁碼 的說明)\n" -#: src/pr.c:2830 +#: src/pr.c:2813 #, fuzzy msgid "" " -o, --indent=MARGIN\n" @@ -6833,7 +7207,7 @@ msgstr "" " -r, --no-file-warnings\n" " 無法開啟檔案時不會印出警告訊息\n" -#: src/pr.c:2837 +#: src/pr.c:2820 #, fuzzy msgid "" " -s[CHAR], --separator[=CHAR]\n" @@ -6850,7 +7224,7 @@ msgstr "" " 和欄位有關的選項截斷每行的資料： -欄位、-a -欄位、\n" " -m\n" -#: src/pr.c:2844 +#: src/pr.c:2827 #, fuzzy msgid "" " -S[STRING], --sep-string[=STRING]\n" @@ -6866,7 +7240,7 @@ msgstr "" " 欄位有關的選項\n" " -t, --omit-header 不印出標頭和註腳\n" -#: src/pr.c:2851 +#: src/pr.c:2834 #, fuzzy msgid "" " -T, --omit-pagination\n" @@ -6890,7 +7264,7 @@ msgstr "" "元]\n" " 會關閉此效果\n" -#: src/pr.c:2861 +#: src/pr.c:2844 #, fuzzy msgid "" " -W, --page-width=PAGE_WIDTH\n" @@ -6904,7 +7278,7 @@ msgstr "" " 強行截短至符合頁寬，除非同時使用 -J 選項；不會影響 -S\n" " 或 -s 選項\n" -#: src/pr.c:2869 +#: src/pr.c:2852 #, fuzzy msgid "" "\n" @@ -7039,22 +7413,22 @@ msgstr "" " 或：%s -G [選項]... [輸入 [輸出]]\n" #: src/ptx.c:1821 +#, fuzzy msgid "" "Output a permuted index, including context, of the words in the input " "files.\n" -"\n" msgstr "" "顯示輸入檔中所有字詞排列後的索引，並包括該字詞前後的文字。\n" "\n" -#: src/ptx.c:1828 +#: src/ptx.c:1827 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:1833 +#: src/ptx.c:1832 msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" " -O, --format=roff generate output as roff directives\n" @@ -7063,7 +7437,7 @@ msgid "" " -T, --format=tex generate output as TeX directives\n" msgstr "" -#: src/ptx.c:1840 +#: src/ptx.c:1839 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -7073,7 +7447,7 @@ msgid "" " -o, --only-file=FILE read only word list from this FILE\n" msgstr "" -#: src/ptx.c:1848 +#: src/ptx.c:1847 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -7081,7 +7455,7 @@ msgid "" "excluded\n" msgstr "" -#: src/ptx.c:1855 +#: src/ptx.c:1854 #, fuzzy msgid "" "\n" @@ -7091,7 +7465,7 @@ msgstr "" "如果沒有指定 <檔案> 或 <檔案> 是 -，則由標準輸入讀入資料。\n" "預設使用‘-F /’選項。\n" -#: src/ptx.c:1949 +#: src/ptx.c:1948 #, fuzzy, c-format msgid "invalid gap width: %s" msgstr "無效的寬度：‘%s’" @@ -7113,7 +7487,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "無法更改%s的所屬群組為 %s\n" -#: src/pwd.c:170 src/pwd.c:277 +#: src/pwd.c:170 src/pwd.c:277 src/split.c:373 #, fuzzy, c-format msgid "failed to stat %s" msgstr "無法取得%s的屬性" @@ -7129,13 +7503,14 @@ msgid "ignoring non-option arguments" msgstr "非選項的參數過多" #. This is a proper name. See the gettext manual, section Names. -#: src/readlink.c:33 +#: src/readlink.c:32 msgid "Dmitry V. Levin" msgstr "" -#: src/readlink.c:62 +#: 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 -msgid "Usage: %s [OPTION]... FILE\n" +msgid "Usage: %s [OPTION]... FILE...\n" msgstr "用法：%s [選項]... [檔案]...\n" #: src/readlink.c:63 @@ -7163,17 +7538,18 @@ msgid "" "recursively,\n" " without requirements on components " "existence\n" -" -n, --no-newline do not output the trailing newline\n" +" -n, --no-newline do not output the trailing delimiter\n" " -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" msgstr "" -#: src/realpath.c:71 src/rm.c:134 src/shred.c:147 src/stat.c:1330 -#: src/touch.c:215 +#: src/readlink.c:152 #, fuzzy, c-format -msgid "Usage: %s [OPTION]... FILE...\n" -msgstr "用法：%s [選項]... [檔案]...\n" +msgid "ignoring --no-newline with multiple arguments" +msgstr "非選項的參數過多" #: src/realpath.c:72 msgid "" @@ -7200,12 +7576,12 @@ msgstr "" msgid "generating relative path" msgstr "" -#: src/remove.c:286 +#: src/remove.c:273 #, fuzzy, c-format msgid "%s: descend into write-protected directory %s? " msgstr "無法建立目錄%s" -#: src/remove.c:287 +#: src/remove.c:274 #, fuzzy, c-format msgid "%s: descend into directory %s? " msgstr "無法進入%s目錄" @@ -7214,49 +7590,49 @@ msgstr "無法進入%s目錄" #. translate "%s: remove %s (write-protected) %s? " #. instead. It should avoid grammatical problems #. with the output of file_type. -#: src/remove.c:303 +#: src/remove.c:290 #, c-format msgid "%s: remove write-protected %s %s? " msgstr "%s：是否移除有防寫保護的%s%s? " -#: src/remove.c:304 +#: src/remove.c:291 #, c-format msgid "%s: remove %s %s? " msgstr "%s：是否移除%s%s? " -#: src/remove.c:417 +#: src/remove.c:374 #, fuzzy, c-format msgid "removed directory: %s\n" msgstr "無法建立目錄%s" -#: src/remove.c:481 +#: src/remove.c:444 #, fuzzy, c-format msgid "cannot remove directory: %s" msgstr "無法建立目錄%s" -#: src/remove.c:537 +#: src/remove.c:500 #, c-format msgid "skipping %s, since it's on a different device" msgstr "" -#: src/remove.c:557 +#: src/remove.c:520 #, fuzzy, c-format msgid "traversal failed: %s" msgstr "讀入時發生錯誤" -#: src/remove.c:563 +#: src/remove.c:526 #, c-format msgid "" "unexpected failure: fts_info=%d: %s\n" "please report to %s" msgstr "" -#: src/rm.c:118 +#: src/rm.c:119 #, c-format msgid "Try '%s ./%s' to remove the file %s.\n" msgstr "" -#: src/rm.c:135 +#: src/rm.c:136 msgid "" "Remove (unlink) the FILE(s).\n" "\n" @@ -7265,7 +7641,7 @@ msgid "" " -i prompt before every removal\n" msgstr "" -#: src/rm.c:141 +#: src/rm.c:142 msgid "" " -I prompt once before removing more than three files, " "or\n" @@ -7277,19 +7653,20 @@ msgid "" " always (-i). Without WHEN, prompt always\n" msgstr "" -#: src/rm.c:148 +#: src/rm.c:149 msgid "" " --one-file-system when removing a hierarchy recursively, skip any\n" " directory that is on a file system different from\n" " that of the corresponding command line argument\n" msgstr "" -#: src/rm.c:153 +#: src/rm.c:154 #, fuzzy msgid "" " --no-preserve-root do not treat '/' specially\n" " --preserve-root do not remove '/' (default)\n" " -r, -R, --recursive remove directories and their contents recursively\n" +" -d, --dir remove empty directories\n" " -v, --verbose explain what is being done\n" msgstr "" "移除指定的 <檔案>。\n" @@ -7300,7 +7677,7 @@ msgstr "" " -r, -R, --recursive 同時移除該目錄下的所有目錄層\n" " -v, --verbose 詳細顯示進行的步驟\n" -#: src/rm.c:161 +#: src/rm.c:163 msgid "" "\n" "By default, rm does not remove directories. Use the --recursive (-r or -R)\n" @@ -7308,7 +7685,7 @@ msgid "" "contents.\n" msgstr "" -#: src/rm.c:166 +#: src/rm.c:168 #, fuzzy, c-format msgid "" "\n" @@ -7324,7 +7701,7 @@ msgstr "" "\n" " %s ./-foo\n" -#: src/rm.c:175 +#: src/rm.c:177 #, fuzzy msgid "" "\n" @@ -7336,12 +7713,12 @@ msgstr "" "請注意，如果使用 rm 來移除檔案，通常仍可以將該檔案恢復原狀。如果想保證\n" "該檔案的內容無法還原，請考慮使用 shred。\n" -#: src/rm.c:335 +#: src/rm.c:342 #, c-format msgid "%s: remove all arguments recursively? " msgstr "" -#: src/rm.c:336 +#: src/rm.c:343 #, fuzzy, c-format msgid "%s: remove all arguments? " msgstr "%s：是否移除%s%s? " @@ -7398,7 +7775,10 @@ msgstr "" msgid "" "Run a program in a different security context.\n" "With neither CONTEXT nor COMMAND, print the current security context.\n" -"\n" +msgstr "" + +#: src/runcon.c:94 +msgid "" " CONTEXT Complete security context\n" " -c, --compute compute process transition context before modifying\n" " -t, --type=TYPE type (for same role as parent)\n" @@ -7408,72 +7788,72 @@ msgid "" "\n" msgstr "" -#: src/runcon.c:140 +#: src/runcon.c:144 #, c-format msgid "multiple roles" msgstr "" -#: src/runcon.c:145 +#: src/runcon.c:149 #, c-format msgid "multiple types" msgstr "" -#: src/runcon.c:150 +#: src/runcon.c:154 #, c-format msgid "multiple users" msgstr "" -#: src/runcon.c:155 +#: src/runcon.c:159 #, c-format msgid "multiple levelranges" msgstr "" -#: src/runcon.c:173 src/runcon.c:209 +#: src/runcon.c:177 src/runcon.c:213 #, fuzzy, c-format msgid "failed to get current context" msgstr "無法取得 %s 的屬性" -#: src/runcon.c:183 +#: src/runcon.c:187 #, c-format msgid "you must specify -c, -t, -u, -l, -r, or context" msgstr "" -#: src/runcon.c:191 +#: src/runcon.c:195 #, fuzzy, c-format msgid "no command specified" msgstr "未指定進程編號" -#: src/runcon.c:197 +#: src/runcon.c:201 #, c-format msgid "%s may be used only on a SELinux kernel" msgstr "" -#: src/runcon.c:223 +#: src/runcon.c:227 #, fuzzy, c-format msgid "failed to compute a new context" msgstr "無法保留%s的時間" -#: src/runcon.c:237 +#: src/runcon.c:241 #, fuzzy, c-format msgid "failed to set new user %s" msgstr "無法取得%s的屬性" -#: src/runcon.c:239 +#: src/runcon.c:243 #, fuzzy, c-format msgid "failed to set new type %s" msgstr "無法取得%s的屬性" -#: src/runcon.c:241 +#: src/runcon.c:245 #, fuzzy, c-format msgid "failed to set new range %s" msgstr "無法取得%s的屬性" -#: src/runcon.c:243 +#: src/runcon.c:247 #, fuzzy, c-format msgid "failed to set new role %s" msgstr "無法取得%s的屬性" -#: src/runcon.c:251 +#: src/runcon.c:255 #, c-format msgid "unable to set security context %s" msgstr "" @@ -7489,15 +7869,17 @@ msgstr "" " 或：%s -G [選項]... [輸入 [輸出]]\n" #: src/seq.c:73 +msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" +msgstr "" + +#: src/seq.c:79 msgid "" -"Print numbers from FIRST to LAST, in steps of INCREMENT.\n" -"\n" " -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 "" -#: src/seq.c:82 +#: src/seq.c:86 msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" @@ -7507,39 +7889,24 @@ msgid "" "INCREMENT is usually negative if FIRST is greater than LAST.\n" msgstr "" -#: src/seq.c:90 +#: src/seq.c:94 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:136 +#: src/seq.c:140 #, fuzzy, c-format msgid "invalid floating point argument: %s" msgstr "無效的開始行號：‘%s’" -#: src/seq.c:193 -#, fuzzy, c-format -msgid "format %s has no %% directive" -msgstr "目的地 %s 不是目錄" - -#: src/seq.c:210 -#, c-format -msgid "format %s ends in %%" -msgstr "" - -#: src/seq.c:213 +#: src/seq.c:232 #, fuzzy, c-format msgid "format %s has unknown %%%c directive" msgstr "%s的檔案類型不詳" -#: src/seq.c:217 -#, c-format -msgid "format %s has too many %% directives" -msgstr "" - -#: src/seq.c:431 +#: src/seq.c:555 #, fuzzy, c-format msgid "format string may not be specified when printing equal width strings" msgstr "傾印字串時不能指定類型" @@ -7571,27 +7938,27 @@ msgid "" " (if specified) supplemental group IDs to GID1, ...\n" msgstr "" -#: src/setuidgid.c:163 +#: src/setuidgid.c:162 #, c-format msgid "unknown user-ID: %s" msgstr "" -#: src/setuidgid.c:174 +#: src/setuidgid.c:173 #, c-format msgid "to use user-ID %s you need to use -g too" msgstr "" -#: src/setuidgid.c:191 +#: src/setuidgid.c:190 #, fuzzy, c-format msgid "failed to set supplemental group(s)" msgstr "無法改變所屬群組至沒有名稱的群組" -#: src/setuidgid.c:201 +#: src/setuidgid.c:200 #, fuzzy, c-format msgid "cannot set group-ID to %lu" msgstr "不可同時省略使用者和所屬群組" -#: src/setuidgid.c:205 +#: src/setuidgid.c:204 #, fuzzy, c-format msgid "cannot set user-ID to %lu" msgstr "不可同時省略使用者和所屬群組" @@ -7602,13 +7969,13 @@ msgid "Colin Plumb" msgstr "" #: src/shred.c:148 +#, 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" -"\n" msgstr "重複覆寫 <檔案>，使得即使是昂貴的硬體偵測儀器也難以將資料復原。\n" -#: src/shred.c:156 +#: src/shred.c:155 #, fuzzy, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -7620,7 +7987,7 @@ msgstr "" " -n, --iterations=N 自行指定重複覆寫的次數 (預設為 %d 次)\n" " -s, --size=N 覆寫指定的位元組數目 (可接受 K、M、G 等等的單位)\n" -#: src/shred.c:162 +#: src/shred.c:161 msgid "" " -u, --remove truncate and remove file after overwriting\n" " -v, --verbose show progress\n" @@ -7634,7 +8001,7 @@ msgstr "" " 預設會使用這種模式\n" " -z, --zero 最後一次會使用 0 位元組進行覆寫來隱藏覆寫動作\n" -#: src/shred.c:171 +#: src/shred.c:170 msgid "" "\n" "If FILE is -, shred standard output.\n" @@ -7652,7 +8019,7 @@ msgstr "" "因為覆寫像 /dev/hda 等的裝置檔案是很普遍的，而這些檔案通常不應移除。\n" "當覆寫普通檔案時，絕大多數人都應該使用 --remove 選項。\n" -#: src/shred.c:181 +#: src/shred.c:180 #, fuzzy msgid "" "CAUTION: Note that shred relies on a very important assumption:\n" @@ -7668,7 +8035,7 @@ msgstr "" "的檔案系統都不符合條件。以下是會令 shred 無效的檔案系統的例子：\n" "\n" -#: src/shred.c:189 +#: src/shred.c:188 #, fuzzy msgid "" "* log-structured or journaled file systems, such as those supplied with\n" @@ -7689,7 +8056,7 @@ msgstr "" "● 會不時進行快照紀錄的檔案系統，例如 Network Applicance 的 NFS 伺服器\n" "\n" -#: src/shred.c:199 +#: src/shred.c:198 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -7698,7 +8065,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:206 +#: src/shred.c:205 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" @@ -7710,7 +8077,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:216 +#: src/shred.c:215 #, fuzzy msgid "" "In addition, file system backups and remote mirrors may contain copies\n" @@ -7724,122 +8091,122 @@ msgstr "" "另外，檔案系統的備份及遠端的 mirror 都可能擁有該檔案的複製本，這些複製本\n" "都是無法移除的，而且可以用來將以 shred 處理過的檔案恢復原狀。\n" -#: src/shred.c:296 +#: src/shred.c:295 #, c-format msgid "%s: fdatasync failed" msgstr "%s：fdatasync 發生錯誤" -#: src/shred.c:307 +#: src/shred.c:306 #, c-format msgid "%s: fsync failed" msgstr "%s：fsync 發生錯誤" -#: src/shred.c:384 +#: src/shred.c:383 #, c-format msgid "%s: cannot rewind" msgstr "%s：無法向後搜尋" -#: src/shred.c:403 +#: src/shred.c:402 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%1$s：%3$lu 次之第 %2$lu 次 (%4$s)..." -#: src/shred.c:453 +#: src/shred.c:452 #, c-format msgid "%s: error writing at offset %s" msgstr "%s：在 %s 位置寫入資料時發生錯誤" -#: src/shred.c:471 +#: src/shred.c:470 #, c-format msgid "%s: lseek failed" msgstr "%s：lseek 發生錯誤" -#: src/shred.c:482 +#: src/shred.c:481 #, c-format msgid "%s: file too large" msgstr "%s：檔案過大" -#: src/shred.c:505 +#: src/shred.c:504 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%1$s：%3$lu 次之第 %2$lu 次 (%4$s)...%5$s" -#: src/shred.c:521 +#: src/shred.c:520 #, 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:768 +#: src/shred.c:767 #, c-format msgid "%s: fstat failed" msgstr "%s：fstat 發生錯誤" -#: src/shred.c:779 +#: src/shred.c:778 #, c-format msgid "%s: invalid file type" msgstr "%s：檔案類型不正確" -#: src/shred.c:798 +#: src/shred.c:797 #, c-format msgid "%s: file has negative size" msgstr "%s：檔案的大小為負數" -#: src/shred.c:865 +#: src/shred.c:864 src/sort.c:932 src/split.c:378 #, c-format msgid "%s: error truncating" msgstr "%s：截斷檔案時發生錯誤" -#: src/shred.c:881 +#: src/shred.c:880 #, c-format msgid "%s: fcntl failed" msgstr "%s：fcntl 發生錯誤" -#: src/shred.c:886 +#: src/shred.c:885 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "%s：不能將只可加上資料的檔案描述子 (file descriptor) 進行 shred 動作" -#: src/shred.c:968 +#: src/shred.c:967 #, c-format msgid "%s: removing" msgstr "%s：正在移除" -#: src/shred.c:992 +#: src/shred.c:991 #, c-format msgid "%s: renamed to %s" msgstr "%s：更改名稱為 %s" -#: src/shred.c:1014 +#: src/shred.c:1013 #, c-format msgid "%s: failed to remove" msgstr "%s：無法移除" -#: src/shred.c:1018 +#: src/shred.c:1017 #, c-format msgid "%s: removed" msgstr "%s：已經移除" -#: src/shred.c:1025 src/shred.c:1068 +#: src/shred.c:1024 src/shred.c:1067 #, c-format msgid "%s: failed to close" msgstr "%s：無法關閉" -#: src/shred.c:1061 +#: src/shred.c:1060 #, c-format msgid "%s: failed to open for writing" msgstr "%s：無法開啟來寫入資料" -#: src/shred.c:1126 +#: src/shred.c:1125 #, c-format msgid "%s: invalid number of passes" msgstr "" -#: src/shred.c:1135 src/shuf.c:291 src/sort.c:4387 +#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441 #, fuzzy, c-format msgid "multiple random sources specified" msgstr "正在關閉輸出檔%s" -#: src/shred.c:1149 +#: src/shred.c:1148 #, c-format msgid "%s: invalid file size" msgstr "" @@ -7856,12 +8223,10 @@ msgstr "" #: src/shuf.c:54 #, fuzzy -msgid "" -"Write a random permutation of the input lines to standard output.\n" -"\n" +msgid "Write a random permutation of the input lines to standard output.\n" msgstr "在標準輸出中顯示每個 <檔案> 每一行中指定的部份。\n" -#: src/shuf.c:61 +#: src/shuf.c:60 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 " @@ -7872,27 +8237,27 @@ msgid "" " -z, --zero-terminated end lines with 0 byte, not newline\n" msgstr "" -#: src/shuf.c:245 +#: src/shuf.c:244 #, fuzzy, c-format msgid "multiple -i options specified" msgstr "-l 或 -t 選項使用了多於一次" -#: src/shuf.c:265 +#: src/shuf.c:264 #, fuzzy, c-format msgid "invalid input range %s" msgstr "輸入旗標無效：%s" -#: src/shuf.c:278 +#: src/shuf.c:277 #, fuzzy, c-format msgid "invalid line count %s" msgstr "無效的寬度：‘%s’" -#: src/shuf.c:285 src/sort.c:4381 +#: src/shuf.c:284 src/sort.c:4435 #, fuzzy, c-format msgid "multiple output files specified" msgstr "正在關閉輸出檔%s" -#: src/shuf.c:311 +#: src/shuf.c:310 #, fuzzy, c-format msgid "cannot combine -e and -i options" msgstr "如果自行指定權限，不可同時配合 --reference 選項一起使用" @@ -7911,7 +8276,7 @@ msgid "" "\n" msgstr "" -#: src/sleep.c:135 src/timeout.c:295 +#: src/sleep.c:135 src/timeout.c:320 #, fuzzy, c-format msgid "invalid time interval %s" msgstr "無效的欄位號碼：‘%s’" @@ -7921,24 +8286,22 @@ msgstr "無效的欄位號碼：‘%s’" msgid "cannot read realtime clock" msgstr "無法建立鏈結%s" -#: src/sort.c:395 +#: src/sort.c:399 #, fuzzy -msgid "" -"Write sorted concatenation of all FILE(s) to standard output.\n" -"\n" +msgid "Write sorted concatenation of all FILE(s) to standard output.\n" msgstr "" "將所有 <檔案> 內容合併和排序，並在標準輸出顯示結果。\n" "\n" "排序選項：\n" "\n" -#: src/sort.c:402 +#: src/sort.c:405 msgid "" "Ordering options:\n" "\n" msgstr "" -#: src/sort.c:406 +#: src/sort.c:409 #, fuzzy msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" @@ -7950,7 +8313,7 @@ msgstr "" " -d, --dictionary-order 只考慮空白字元、英文字和數字\n" " -f, --ignore-case 排序前先將小寫字元轉換為大寫\n" -#: src/sort.c:412 +#: src/sort.c:415 #, fuzzy msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" @@ -7964,12 +8327,12 @@ msgstr "" " -r, --reverse 以相反的次序排列\n" "\n" -#: src/sort.c:417 +#: src/sort.c:420 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" -#: src/sort.c:420 +#: src/sort.c:423 #, fuzzy msgid "" " -n, --numeric-sort compare according to string numerical value\n" @@ -7984,7 +8347,7 @@ msgstr "" " -r, --reverse 以相反的次序排列\n" "\n" -#: src/sort.c:426 +#: src/sort.c:429 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -7994,19 +8357,19 @@ msgid "" "\n" msgstr "" -#: src/sort.c:434 +#: src/sort.c:437 msgid "" "Other options:\n" "\n" msgstr "" -#: src/sort.c:438 +#: src/sort.c:441 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" msgstr "" -#: src/sort.c:442 +#: src/sort.c:445 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 " @@ -8015,7 +8378,7 @@ msgid "" " decompress them with PROG -d\n" msgstr "" -#: src/sort.c:449 +#: src/sort.c:452 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -8024,13 +8387,13 @@ msgid "" " If F is - then read names from standard input\n" msgstr "" -#: src/sort.c:456 +#: src/sort.c:459 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:460 +#: src/sort.c:463 #, fuzzy msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" @@ -8048,7 +8411,7 @@ msgstr "" " -s, --stable 不進行最後的整行比較排序\n" " -S, --buffer-size=大小 指定記憶緩衝區的 <大小>\n" -#: src/sort.c:466 +#: src/sort.c:469 #, fuzzy, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -8068,12 +8431,12 @@ msgstr "" " -u, --unique 配合 -c：嚴格檢查資料是否依次序排列\n" " 沒有 -c：遇到多行相同的資料時只顯示第一行\n" -#: src/sort.c:475 +#: 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:480 +#: src/sort.c:483 #, fuzzy msgid "" "\n" @@ -8099,7 +8462,7 @@ msgstr "" "\n" "<大小> 可以加上如下的單位：\n" -#: src/sort.c:493 +#: src/sort.c:496 msgid "" "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n" "\n" @@ -8118,268 +8481,272 @@ msgstr "" "和語系有關的環境變數會影響排序結果。\n" "如果要以位元組數值作為排列次序，請設定環境變數 LC_ALL=C。\n" -#: src/sort.c:694 +#: src/sort.c:697 #, fuzzy, c-format msgid "waiting for %s [-d]" msgstr "正在寫入 %s" -#: src/sort.c:699 +#: src/sort.c:702 #, c-format msgid "%s [-d] terminated abnormally" msgstr "" -#: src/sort.c:853 +#: src/sort.c:856 #, fuzzy, c-format msgid "cannot create temporary file in %s" msgstr "無法建立暫存檔" -#: src/sort.c:939 src/sort.c:2010 src/sort.c:3056 src/sort.c:3755 -#: src/sort.c:3758 +#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713 +#: src/sort.c:3804 src/sort.c:3807 msgid "open failed" msgstr "開啟時發生錯誤" -#: src/sort.c:959 +#: src/sort.c:970 #, fuzzy msgid "fflush failed" msgstr "關閉時發生錯誤" -#: src/sort.c:964 src/sort.c:2013 src/sort.c:4646 +#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706 msgid "close failed" msgstr "關閉時發生錯誤" -#: src/sort.c:973 +#: src/sort.c:986 #, fuzzy, c-format msgid "dup2 failed" msgstr "開啟時發生錯誤" -#: src/sort.c:1090 +#: src/sort.c:1103 #, c-format msgid "couldn't execute %s" msgstr "" -#: src/sort.c:1097 +#: src/sort.c:1110 #, fuzzy msgid "couldn't create temporary file" msgstr "無法建立暫存檔" -#: src/sort.c:1136 +#: src/sort.c:1149 #, fuzzy, c-format msgid "couldn't create process for %s -d" msgstr "無法建立目錄%s" -#: src/sort.c:1150 +#: src/sort.c:1161 #, c-format msgid "couldn't execute %s -d" msgstr "" -#: src/sort.c:1209 +#: src/sort.c:1220 #, fuzzy, c-format msgid "warning: cannot remove: %s" msgstr "無法建立目錄%s" -#: src/sort.c:1295 +#: src/sort.c:1306 #, fuzzy, c-format msgid "invalid --%s argument %s" msgstr "參數無效: %s" -#: src/sort.c:1298 +#: src/sort.c:1309 #, fuzzy, c-format msgid "minimum --%s argument is %s" msgstr "%2$s的參數%1$s不明確" -#: src/sort.c:1313 +#: src/sort.c:1324 #, fuzzy, c-format msgid "--%s argument %s too large" msgstr "%s：數字‘%.*s’過大" -#: src/sort.c:1316 +#: src/sort.c:1327 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "" -#: src/sort.c:1398 +#: src/sort.c:1409 #, c-format msgid "number in parallel must be nonzero" msgstr "" -#: src/sort.c:1479 +#: src/sort.c:1494 msgid "stat failed" msgstr "stat 時發生錯誤" -#: src/sort.c:1740 +#: src/sort.c:1755 msgid "read failed" msgstr "讀入時發生錯誤" -#: src/sort.c:2028 +#: src/sort.c:2043 #, fuzzy, c-format msgid "string transformation failed" msgstr "字串比較出現錯誤" -#: src/sort.c:2031 +#: src/sort.c:2046 #, c-format msgid "the untransformed string was %s" msgstr "" -#: src/sort.c:2194 +#: src/sort.c:2209 #, c-format msgid "^ no match for key\n" msgstr "" -#: src/sort.c:2374 +#: src/sort.c:2389 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "" -#: src/sort.c:2380 +#: src/sort.c:2395 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "" -#: src/sort.c:2391 +#: src/sort.c:2406 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" -#: src/sort.c:2404 +#: src/sort.c:2419 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "" -#: src/sort.c:2436 +#: src/sort.c:2451 #, fuzzy, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" msgstr[0] "%s：選項‘%s’不明確\n" -#: src/sort.c:2442 +#: src/sort.c:2457 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "" -#: src/sort.c:2716 src/sort.c:2725 +#: src/sort.c:2731 src/sort.c:2740 msgid "write failed" msgstr "寫入時發生錯誤" -#: src/sort.c:2768 +#: src/sort.c:2783 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s： %s：%s：次序不正確：" -#: src/sort.c:2771 +#: src/sort.c:2786 msgid "standard error" msgstr "標準錯誤輸出" -#: src/sort.c:3926 +#: src/sort.c:3698 +#, fuzzy +msgid "cannot read" +msgstr "%s：無法向後搜尋" + +#: src/sort.c:3976 #, fuzzy, c-format msgid "%s: invalid field specification %s" msgstr "%s：無效的欄位規格‘%s’" -#: src/sort.c:3937 +#: src/sort.c:3987 #, fuzzy, c-format msgid "options '-%s' are incompatible" msgstr "%s：選項‘%s’不明確\n" -#: src/sort.c:3988 +#: src/sort.c:4038 #, fuzzy, c-format msgid "%s: invalid count at start of %s" msgstr "%s：‘%s’開始部份的數字無效" -#: src/sort.c:4245 +#: src/sort.c:4295 #, fuzzy msgid "invalid number after '-'" msgstr "‘-’後的數字無效" -#: src/sort.c:4248 src/sort.c:4334 src/sort.c:4362 +#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416 #, fuzzy msgid "invalid number after '.'" msgstr "‘.’後的數字無效" -#: src/sort.c:4261 src/sort.c:4367 +#: src/sort.c:4315 src/sort.c:4421 msgid "stray character in field spec" msgstr "欄位規格出現不合法的字元" -#: src/sort.c:4308 +#: src/sort.c:4362 #, fuzzy, c-format msgid "multiple compress programs specified" msgstr "指定了多於一個目的地目錄" -#: src/sort.c:4325 +#: src/sort.c:4379 msgid "invalid number at field start" msgstr "欄位規格開始部份的數字無效" -#: src/sort.c:4329 src/sort.c:4357 +#: src/sort.c:4383 src/sort.c:4411 msgid "field number is zero" msgstr "欄位是 0" -#: src/sort.c:4338 +#: src/sort.c:4392 msgid "character offset is zero" msgstr "字元偏移值是 0" -#: src/sort.c:4353 +#: src/sort.c:4407 #, fuzzy msgid "invalid number after ','" msgstr "‘,’後的數字無效" -#: src/sort.c:4403 +#: src/sort.c:4457 #, c-format msgid "empty tab" msgstr "" -#: src/sort.c:4496 src/wc.c:692 +#: src/sort.c:4550 src/wc.c:692 #, c-format msgid "cannot read file names from %s" msgstr "無法從 %s 讀取檔案名稱" -#: src/sort.c:4518 +#: src/sort.c:4572 #, fuzzy, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "檔案名稱無效 (長度為零)" -#: src/sort.c:4524 +#: src/sort.c:4578 #, fuzzy, c-format msgid "no input from %s" msgstr "正在關閉輸入檔 %s" -#: src/sort.c:4570 +#: src/sort.c:4624 #, c-format msgid "using %s sorting rules" msgstr "" -#: src/sort.c:4573 +#: src/sort.c:4627 #, c-format msgid "using simple byte comparison" msgstr "" -#: src/sort.c:4604 +#: src/sort.c:4658 #, fuzzy, c-format msgid "extra operand %s not allowed with -%c" msgstr "使用 -c 時不允許指定額外的參數‘%s’" -#: src/split.c:184 +#: src/split.c:187 #, c-format msgid "the suffix length needs to be at least %zu" msgstr "" -#: src/split.c:201 +#: src/split.c:204 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" msgstr "用法：%s [選項] [輸入 [前置字串]]\n" -#: src/split.c:205 +#: src/split.c:208 #, fuzzy 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" -"\n" msgstr "" "將 <輸入> 資料分割為固定大小的部份，並將結果寫入‘<前置字串>aa’、\n" "‘<前置字串>ab’等等；預設的 <前置字串> 為‘x’。如果沒有指定 <輸入>\n" "或 <輸入> 是 -，則由標準輸入讀入資料。\n" "\n" -#: src/split.c:214 +#: src/split.c:216 #, fuzzy, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" @@ -8403,14 +8770,14 @@ msgstr "" " 超出指定位元組數目\n" " -l, --lines=行數 每個輸出檔放入指定 <行數> 的資料\n" -#: src/split.c:227 +#: src/split.c:229 #, fuzzy msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" msgstr " --verbose 開啟每個輸出檔之前都在標準錯誤輸出顯示訊息\n" -#: src/split.c:234 +#: src/split.c:236 msgid "" "\n" "CHUNKS may be:\n" @@ -8422,184 +8789,189 @@ msgid "" "r/K/N likewise but only output Kth of N to stdout\n" msgstr "" -#: src/split.c:352 +#: src/split.c:354 #, fuzzy, c-format msgid "output file suffixes exhausted" msgstr "輸出檔的後置字串已用盡" -#: src/split.c:364 +#: src/split.c:366 #, fuzzy, c-format msgid "creating file %s\n" msgstr "正在建立檔案‘%s’\n" -#: src/split.c:377 +#: src/split.c:375 +#, c-format +msgid "%s would overwrite input; aborting" +msgstr "" + +#: src/split.c:391 #, fuzzy, c-format msgid "failed to set FILE environment variable" -msgstr "無法取得%s的屬性" +msgstr "LS_COLORS 環境變數中存在無法分析的值" -#: src/split.c:379 +#: src/split.c:393 #, c-format msgid "executing with FILE=%s\n" msgstr "" -#: src/split.c:381 +#: src/split.c:395 #, fuzzy, c-format msgid "failed to create pipe" -msgstr "不可以建立連至 %2$s 的實際鏈結 (hard link) %1$s" +msgstr "無法取得%s的屬性" -#: src/split.c:395 +#: src/split.c:409 #, fuzzy, c-format msgid "closing prior pipe" msgstr "無法進入%s目錄" -#: src/split.c:397 +#: src/split.c:411 #, fuzzy, c-format msgid "closing output pipe" msgstr "正在關閉輸出檔%s" -#: src/split.c:401 +#: src/split.c:415 #, fuzzy, c-format msgid "moving input pipe" msgstr "正在關閉輸入檔 %s" -#: src/split.c:403 +#: src/split.c:417 #, fuzzy, c-format msgid "closing input pipe" msgstr "正在關閉輸入檔 %s" -#: src/split.c:408 +#: src/split.c:422 #, fuzzy, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "無法執行 %s 指令" -#: src/split.c:414 +#: src/split.c:428 #, fuzzy, c-format msgid "failed to close input pipe" msgstr "%s：無法關閉" -#: src/split.c:450 -#, fuzzy, c-format +#: src/split.c:464 +#, c-format msgid "waiting for child process" -msgstr "正在寫入 %s" +msgstr "" -#: src/split.c:460 +#: src/split.c:474 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "" -#: src/split.c:468 +#: src/split.c:482 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:475 src/timeout.c:449 +#: src/split.c:489 src/timeout.c:494 #, c-format msgid "unknown status from command (0x%X)" msgstr "" -#: src/split.c:1037 +#: src/split.c:1052 #, c-format msgid "cannot split in more than one way" msgstr "不能用超過一種方式進行分割" -#: src/split.c:1050 src/split.c:1192 src/split.c:1363 +#: src/split.c:1065 src/split.c:1205 src/split.c:1376 #, fuzzy, c-format msgid "%s: invalid number of chunks" msgstr "%s：無效的秒數" -#: src/split.c:1054 +#: src/split.c:1069 #, fuzzy, c-format msgid "%s: invalid chunk number" msgstr "%s：無效的號碼" -#: src/split.c:1106 +#: src/split.c:1119 #, c-format msgid "%s: invalid suffix length" msgstr "%s：無效的後置字串長度" -#: src/split.c:1131 src/split.c:1139 src/split.c:1162 src/split.c:1167 +#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180 #, c-format msgid "%s: invalid number of bytes" msgstr "%s：無效的位元組數目" -#: src/split.c:1150 src/split.c:1297 +#: src/split.c:1163 src/split.c:1310 #, c-format msgid "%s: invalid number of lines" msgstr "%s：無效的行數" -#: src/split.c:1223 +#: src/split.c:1236 #, fuzzy, c-format msgid "line count option -%s%c... is too large" msgstr "%s：數字‘%.*s’過大" -#: src/split.c:1235 +#: src/split.c:1248 #, fuzzy, c-format msgid "%s: invalid start value for numerical suffix" msgstr "無效的開始行號：‘%s’" -#: src/split.c:1263 +#: src/split.c:1276 #, fuzzy, c-format msgid "%s: invalid IO block size" msgstr "%s：進程編號無效" -#: src/split.c:1284 +#: src/split.c:1297 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1321 +#: src/split.c:1334 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1356 +#: src/split.c:1369 #, fuzzy, c-format msgid "%s: cannot determine file size" msgstr "無法決定主機名稱" #. This is a proper name. See the gettext manual, section Names. -#: src/stat.c:169 +#: src/stat.c:173 msgid "Michael Meskes" msgstr "" -#: src/stat.c:838 +#: src/stat.c:857 #, fuzzy, c-format msgid "failed to canonicalize %s" msgstr "無法保留%s的時間" -#: src/stat.c:1050 +#: src/stat.c:1069 #, fuzzy, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "%s：無法識別的選項‘%c%s’\n" -#: src/stat.c:1105 +#: src/stat.c:1124 #, fuzzy, c-format msgid "%s: invalid directive" msgstr "%s：檔案類型不正確" -#: src/stat.c:1151 +#: src/stat.c:1170 #, fuzzy, c-format msgid "warning: backslash at end of format" msgstr "字串末端的反斜號溢出序列無效" -#: src/stat.c:1182 +#: src/stat.c:1201 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" -#: src/stat.c:1189 +#: src/stat.c:1208 #, fuzzy, c-format msgid "cannot read file system information for %s" msgstr "無法將 %s 的檔案指標重新定位" -#: src/stat.c:1209 +#: src/stat.c:1228 #, 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:1245 +#: src/stat.c:1264 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -8610,7 +8982,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1268 +#: src/stat.c:1287 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -8618,30 +8990,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1278 +#: src/stat.c:1297 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:1286 +#: src/stat.c:1305 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:1295 +#: src/stat.c:1314 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:1305 +#: src/stat.c:1324 #, c-format msgid "Context: %C\n" msgstr "" -#: src/stat.c:1313 +#: src/stat.c:1332 msgid "" "Access: %x\n" "Modify: %y\n" @@ -8649,15 +9021,17 @@ msgid "" " Birth: %w\n" msgstr "" -#: src/stat.c:1331 +#: src/stat.c:1350 +msgid "Display file or file system status.\n" +msgstr "" + +#: src/stat.c:1356 msgid "" -"Display file or file system status.\n" -"\n" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" -#: src/stat.c:1337 +#: src/stat.c:1360 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -8667,7 +9041,7 @@ msgid "" " -t, --terse print the information in terse form\n" msgstr "" -#: src/stat.c:1348 +#: src/stat.c:1371 #, fuzzy msgid "" "\n" @@ -8686,7 +9060,7 @@ msgstr "" " %a - 以八進位數字方式表示存取權限\n" " %b - 佔用的磁碟區段數目\n" -#: src/stat.c:1357 +#: src/stat.c:1380 #, fuzzy msgid "" " %d device number in decimal\n" @@ -8703,7 +9077,7 @@ msgstr "" " %G - 所屬群組的名稱\n" " %g - 所屬群組的號碼\n" -#: src/stat.c:1365 +#: src/stat.c:1388 #, fuzzy msgid "" " %h number of hard links\n" @@ -8725,7 +9099,7 @@ msgstr "" " %T - 特殊檔案或裝置檔案的十六進位 minor 號碼\n" " %t - 特殊檔案或裝置檔案的十六進位 major 號碼\n" -#: src/stat.c:1376 +#: src/stat.c:1399 #, fuzzy msgid "" " %u user ID of owner\n" @@ -8749,7 +9123,7 @@ msgstr "" " %Z - 由 Epoch 時間至最後更改 inode 資訊的時間之間經過的秒數\n" " %z - 最後更改 inode 資訊的時間\n" -#: src/stat.c:1390 +#: src/stat.c:1413 #, fuzzy msgid "" "Valid format sequences for file systems:\n" @@ -8768,7 +9142,7 @@ msgstr "" " %d - 檔案系統剩餘可用的最大檔案數目\n" " %f - 檔案系統的剩餘空間\n" -#: src/stat.c:1399 +#: src/stat.c:1422 #, fuzzy msgid "" " %i file system ID in hex\n" @@ -8794,30 +9168,29 @@ msgstr "用法：%s [選項] [檔案]...\n" #: src/stdbuf.c:91 msgid "" "Run COMMAND, with modified buffering operations for its standard streams.\n" -"\n" msgstr "" -#: src/stdbuf.c:98 +#: src/stdbuf.c:97 msgid "" " -i, --input=MODE adjust standard input stream buffering\n" " -o, --output=MODE adjust standard output stream buffering\n" " -e, --error=MODE adjust standard error stream buffering\n" msgstr "" -#: src/stdbuf.c:105 +#: src/stdbuf.c:104 msgid "" "\n" "If MODE is 'L' the corresponding stream will be line buffered.\n" "This option is invalid with standard input.\n" msgstr "" -#: src/stdbuf.c:108 +#: src/stdbuf.c:107 msgid "" "\n" "If MODE is '0' the corresponding stream will be unbuffered.\n" msgstr "" -#: src/stdbuf.c:111 +#: src/stdbuf.c:110 msgid "" "\n" "Otherwise MODE is a number which may be followed by one of the following:\n" @@ -8827,7 +9200,7 @@ msgid "" "size set to MODE bytes.\n" msgstr "" -#: src/stdbuf.c:117 +#: src/stdbuf.c:116 msgid "" "\n" "NOTE: If COMMAND adjusts the buffering of its standard streams ('tee' does\n" @@ -8837,22 +9210,22 @@ msgid "" "and are thus unaffected by 'stdbuf' settings.\n" msgstr "" -#: src/stdbuf.c:227 +#: src/stdbuf.c:226 #, fuzzy, c-format msgid "failed to find %s" msgstr "無法保留%s的時間" -#: src/stdbuf.c:247 src/stdbuf.c:279 +#: src/stdbuf.c:246 src/stdbuf.c:278 #, c-format msgid "failed to update the environment with %s" msgstr "" -#: src/stdbuf.c:321 +#: src/stdbuf.c:320 #, c-format msgid "line buffering stdin is meaningless" msgstr "" -#: src/stty.c:509 +#: src/stty.c:513 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -8860,23 +9233,25 @@ msgid "" " or: %s [-F DEVICE | --file=DEVICE] [-g|--save]\n" msgstr "" -#: src/stty.c:515 +#: src/stty.c:519 +msgid "Print or change terminal characteristics.\n" +msgstr "" + +#: src/stty.c:525 msgid "" -"Print or change terminal characteristics.\n" -"\n" " -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:524 +#: src/stty.c:532 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:529 +#: src/stty.c:537 msgid "" "\n" "Special characters:\n" @@ -8885,7 +9260,7 @@ msgid "" " eol CHAR CHAR will end the line\n" msgstr "" -#: src/stty.c:536 +#: src/stty.c:544 msgid "" " * eol2 CHAR alternate CHAR for ending the line\n" " erase CHAR CHAR will erase the last character typed\n" @@ -8893,7 +9268,7 @@ msgid "" " kill CHAR CHAR will erase the current line\n" msgstr "" -#: src/stty.c:542 +#: src/stty.c:550 msgid "" " * lnext CHAR CHAR will enter the next character quoted\n" " quit CHAR CHAR will send a quit signal\n" @@ -8901,7 +9276,7 @@ msgid "" " start CHAR CHAR will restart the output after stopping it\n" msgstr "" -#: src/stty.c:548 +#: src/stty.c:556 msgid "" " stop CHAR CHAR will stop the output\n" " susp CHAR CHAR will send a terminal stop signal\n" @@ -8909,7 +9284,7 @@ msgid "" " * werase CHAR CHAR will erase the last word typed\n" msgstr "" -#: src/stty.c:554 +#: src/stty.c:562 msgid "" "\n" "Special settings:\n" @@ -8918,7 +9293,7 @@ msgid "" " * columns N same as cols N\n" msgstr "" -#: src/stty.c:561 +#: src/stty.c:569 msgid "" " ispeed N set the input speed to N\n" " * line N use line discipline N\n" @@ -8927,7 +9302,7 @@ msgid "" " ospeed N set the output speed to N\n" msgstr "" -#: src/stty.c:567 +#: src/stty.c:575 msgid "" " * rows N tell the kernel that the terminal has N rows\n" " * size print the number of rows and columns according to the " @@ -8936,27 +9311,28 @@ msgid "" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" -#: src/stty.c:573 +#: src/stty.c:581 msgid "" "\n" "Control settings:\n" " [-]clocal disable modem control signals\n" " [-]cread allow input to be received\n" " * [-]crtscts enable RTS/CTS handshaking\n" +" * [-]cdtrdsr enable DTR/DSR handshaking\n" " csN set character size to N bits, N in [5..8]\n" msgstr "" -#: src/stty.c:581 +#: src/stty.c:590 msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" " [-]hupcl same as [-]hup\n" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" -" [-]parodd set odd parity (even with '-')\n" +" [-]parodd set odd parity (or even parity with '-')\n" msgstr "" -#: src/stty.c:588 +#: src/stty.c:597 msgid "" "\n" "Input settings:\n" @@ -8966,7 +9342,7 @@ msgid "" " [-]igncr ignore carriage return\n" msgstr "" -#: src/stty.c:596 +#: src/stty.c:605 msgid "" " [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" @@ -8975,11 +9351,11 @@ msgid "" " [-]istrip clear high (8th) bit of input characters\n" msgstr "" -#: src/stty.c:603 +#: src/stty.c:612 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr "" -#: src/stty.c:606 +#: src/stty.c:615 msgid "" " * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" @@ -8989,7 +9365,7 @@ msgid "" " [-]tandem same as [-]ixoff\n" msgstr "" -#: src/stty.c:614 +#: src/stty.c:623 msgid "" "\n" "Output settings:\n" @@ -8999,7 +9375,7 @@ msgid "" " * nlN newline delay style, N in [0..1]\n" msgstr "" -#: src/stty.c:622 +#: src/stty.c:631 msgid "" " * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of null characters\n" @@ -9009,7 +9385,7 @@ msgid "" " * [-]onlret newline performs a carriage return\n" msgstr "" -#: src/stty.c:630 +#: src/stty.c:639 msgid "" " * [-]onocr do not print carriage returns in the first column\n" " [-]opost postprocess output\n" @@ -9019,7 +9395,7 @@ msgid "" " * vtN vertical tab delay style, N in [0..1]\n" msgstr "" -#: src/stty.c:638 +#: src/stty.c:647 msgid "" "\n" "Local settings:\n" @@ -9028,7 +9404,7 @@ msgid "" " * -crtkill kill all line by obeying the echoctl and echok settings\n" msgstr "" -#: src/stty.c:645 +#: src/stty.c:654 msgid "" " * [-]ctlecho echo control characters in hat notation ('^c')\n" " [-]echo echo input characters\n" @@ -9037,7 +9413,7 @@ msgid "" " [-]echok echo a newline after a kill character\n" msgstr "" -#: src/stty.c:652 +#: src/stty.c:661 msgid "" " * [-]echoke same as [-]crtkill\n" " [-]echonl echo newline even if not echoing other characters\n" @@ -9046,7 +9422,7 @@ msgid "" " [-]iexten enable non-POSIX special characters\n" msgstr "" -#: src/stty.c:659 +#: src/stty.c:668 msgid "" " [-]isig enable interrupt, quit, and suspend special characters\n" " [-]noflsh disable flushing after interrupt and quit special " @@ -9056,7 +9432,7 @@ msgid "" " * [-]xcase with icanon, escape with '\\' for uppercase characters\n" msgstr "" -#: src/stty.c:666 +#: src/stty.c:675 msgid "" "\n" "Combination settings:\n" @@ -9065,7 +9441,7 @@ msgid "" " -cbreak same as icanon\n" msgstr "" -#: src/stty.c:673 +#: src/stty.c:682 msgid "" " cooked same as brkint ignpar istrip icrnl ixon opost isig\n" " icanon, eof and eol characters to their default values\n" @@ -9073,7 +9449,7 @@ msgid "" " crt same as echoe echoctl echoke\n" msgstr "" -#: src/stty.c:679 +#: src/stty.c:688 msgid "" " dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" " kill ^u\n" @@ -9082,7 +9458,7 @@ msgid "" " evenp same as parenb -parodd cs7\n" msgstr "" -#: src/stty.c:686 +#: src/stty.c:695 msgid "" " -evenp same as -parenb cs8\n" " * [-]lcase same as xcase iuclc olcuc\n" @@ -9092,7 +9468,7 @@ msgid "" " -nl same as icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" msgstr "" -#: src/stty.c:694 +#: src/stty.c:703 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -9101,7 +9477,7 @@ msgid "" " -pass8 same as parenb istrip cs7\n" msgstr "" -#: src/stty.c:701 +#: src/stty.c:710 msgid "" " raw same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" " -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n" @@ -9109,7 +9485,7 @@ msgid "" " -raw same as cooked\n" msgstr "" -#: src/stty.c:707 +#: src/stty.c:716 msgid "" " sane same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" " -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n" @@ -9119,7 +9495,7 @@ msgid "" " characters to their default values\n" msgstr "" -#: src/stty.c:715 +#: src/stty.c:724 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -9128,126 +9504,59 @@ msgid "" "127; special values ^- or undef used to disable special characters.\n" msgstr "" -#: src/stty.c:787 +#: src/stty.c:796 #, fuzzy, c-format msgid "only one device may be specified" msgstr "只能指定一個參數" -#: src/stty.c:817 +#: src/stty.c:826 #, fuzzy, c-format msgid "" "the options for verbose and stty-readable output styles are\n" "mutually exclusive" msgstr "不能同時使用 --string 及 --check 選項" -#: src/stty.c:823 +#: src/stty.c:832 #, c-format msgid "when specifying an output style, modes may not be set" msgstr "" -#: src/stty.c:838 +#: src/stty.c:847 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "" -#: src/stty.c:883 src/stty.c:993 +#: src/stty.c:892 src/stty.c:1002 #, fuzzy, c-format msgid "invalid argument %s" msgstr "參數無效: %s" -#: src/stty.c:894 src/stty.c:911 src/stty.c:923 src/stty.c:936 src/stty.c:948 -#: src/stty.c:968 +#: 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 msgid "missing argument to %s" msgstr "%2$s的參數%1$s不明確" -#: src/stty.c:974 +#: src/stty.c:983 #, fuzzy, c-format msgid "invalid line discipline %s" msgstr "無效的欄位規格：‘%s’" -#: src/stty.c:1044 +#: src/stty.c:1053 #, c-format msgid "%s: unable to perform all requested operations" msgstr "" -#: src/stty.c:1390 +#: src/stty.c:1399 #, c-format msgid "%s: no size information for this device" msgstr "" -#: src/stty.c:1904 +#: src/stty.c:1920 #, fuzzy, c-format msgid "invalid integer argument %s" msgstr "無效的行號增加值：‘%s’" -#: src/su.c:229 -msgid "Password:" -msgstr "" - -#: src/su.c:232 -#, fuzzy, c-format -msgid "getpass: cannot open /dev/tty" -msgstr "無法開啟目錄%s" - -#: src/su.c:290 -#, fuzzy, c-format -msgid "cannot set groups" -msgstr "不可同時省略使用者和所屬群組" - -#: src/su.c:294 -#, fuzzy, c-format -msgid "cannot set group id" -msgstr "不可同時省略使用者和所屬群組" - -#: src/su.c:296 -#, fuzzy, c-format -msgid "cannot set user id" -msgstr "不可同時省略使用者和所屬群組" - -#: src/su.c:371 -#, fuzzy, c-format -msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" -msgstr "用法：%s [選項]... [檔案]...\n" - -#: src/su.c:372 -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 "" - -#: src/su.c:384 -msgid "" -"\n" -"A mere - implies -l. If USER not given, assume root.\n" -msgstr "" - -#: src/su.c:461 -#, c-format -msgid "user %s does not exist" -msgstr "" - -#: src/su.c:484 -#, c-format -msgid "incorrect password" -msgstr "" - -#: src/su.c:501 -#, c-format -msgid "using restricted shell %s" -msgstr "" - -#: src/su.c:509 -#, fuzzy, c-format -msgid "warning: cannot change directory to %s" -msgstr "無法建立目錄%s" - #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 msgid "Kayvan Aghaiepour" @@ -9279,7 +9588,7 @@ msgstr "" msgid "ignoring all arguments" msgstr "參數過多" -#: src/system.h:340 +#: src/system.h:343 #, c-format msgid "" "\n" @@ -9288,15 +9597,22 @@ msgid "" "for details about the options it supports.\n" msgstr "" -#: src/system.h:346 +#: src/system.h:349 msgid " --help display this help and exit\n" msgstr " --help 顯示此求助說明並離開\n" -#: src/system.h:348 +#: src/system.h:351 msgid " --version output version information and exit\n" msgstr " --version 顯示版本資訊並離開\n" -#: src/system.h:541 +#: src/system.h:544 +#, fuzzy +msgid "" +"\n" +"Mandatory arguments to long options are mandatory for short options too.\n" +msgstr "長選項必須用的參數在使用短選項時也是必須的。\n" + +#: src/system.h:552 msgid "" "\n" "SIZE is an integer and optional unit (example: 10M is 10*1024*1024). Units\n" @@ -9304,7 +9620,7 @@ msgid "" "1000).\n" msgstr "" -#: src/system.h:550 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -9313,7 +9629,7 @@ msgid "" "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n" msgstr "" -#: src/system.h:560 +#: src/system.h:571 #, fuzzy, c-format msgid "" "\n" @@ -9326,22 +9642,22 @@ msgstr "" #. <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:574 +#: src/system.h:585 #, c-format msgid "Report %s translation bugs to <http://translationproject.org/team/>\n" msgstr "" -#: src/system.h:578 +#: src/system.h:589 #, c-format msgid "For complete documentation, run: info coreutils '%s invocation'\n" msgstr "" -#: src/system.h:585 +#: src/system.h:596 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "請嘗試執行‘%s --help’來獲取更多資訊。\n" -#: src/system.h:617 +#: src/system.h:628 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -9362,16 +9678,16 @@ 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" -"\n" msgstr "" "將每個 <檔案> 由最後一行開始在標準輸出顯示出來。\n" "如果沒有指定 <檔案> 或 <檔案> 是 -，則由標準輸入讀取資料。\n" "\n" -#: src/tac.c:145 +#: src/tac.c:144 msgid "" " -b, --before attach the separator before instead of after\n" " -r, --regex interpret the separator as a regular expression\n" @@ -9381,42 +9697,42 @@ msgstr "" " -r, --regex 將分隔字串理解為正規表示式\n" " -s, --separator=字串 用 <字串> 作為分隔字串，而不是 newline 字元\n" -#: src/tac.c:235 src/tac.c:336 +#: src/tac.c:234 src/tac.c:335 #, fuzzy, c-format msgid "%s: seek failed" msgstr "關閉時發生錯誤" -#: src/tac.c:264 +#: src/tac.c:263 #, fuzzy, c-format msgid "record too large" msgstr "%s：檔案過大" -#: src/tac.c:451 +#: src/tac.c:450 #, fuzzy, c-format msgid "failed to create temporary file in %s" msgstr "無法建立暫存檔" -#: src/tac.c:459 +#: src/tac.c:458 #, fuzzy, c-format msgid "failed to open %s for writing" msgstr "%s：無法開啟來寫入資料" -#: src/tac.c:476 +#: src/tac.c:475 #, fuzzy, c-format msgid "failed to rewind stream for %s" msgstr "無法保留 %s 的時間" -#: src/tac.c:512 src/tac.c:519 +#: src/tac.c:511 src/tac.c:518 #, fuzzy, c-format msgid "%s: write error" msgstr "寫入時發生錯誤" -#: src/tac.c:572 +#: src/tac.c:571 #, fuzzy, c-format msgid "failed to open %s for reading" msgstr "無法開啟 %s 來讀取資料" -#: src/tac.c:630 +#: src/tac.c:629 #, c-format msgid "separator cannot be empty" msgstr "分隔字串不可以是空的" @@ -9427,19 +9743,18 @@ msgid "Ian Lance Taylor" msgstr "" #: src/tail.c:262 -#, c-format +#, fuzzy, 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" -"\n" msgstr "" "在標準輸出顯示每個 <檔案> 的最後 %d 行。\n" "當指定多於一個 <檔案> 時，會先印出表示每個檔案名稱的標頭。\n" "如果沒有指定 <檔案> 或 <檔案> 是 -，則由標準輸入讀取資料。\n" "\n" -#: src/tail.c:271 +#: src/tail.c:270 msgid "" " -c, --bytes=K output the last K bytes; alternatively, use -c " "+K\n" @@ -9447,7 +9762,7 @@ msgid "" "file\n" msgstr "" -#: src/tail.c:275 +#: src/tail.c:274 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -9461,7 +9776,7 @@ msgstr "" " -F 等於 --follow=name --retry\n" # --max-consecutive-size-changes is undocumented -- maddog -#: src/tail.c:282 +#: src/tail.c:281 #, fuzzy, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -9484,7 +9799,7 @@ msgstr "" " 配合 --follow=name 時，如果 <檔案> 連續 N 次\n" " 改變大小，則認定此檔案已經被改名。\n" -#: src/tail.c:295 +#: src/tail.c:294 #, fuzzy msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" @@ -9500,8 +9815,7 @@ msgstr "" " (預設為 1 秒)\n" " -v, --verbose 一定顯示任何標明檔案名稱的標頭\n" -#: src/tail.c:302 -#, fuzzy +#: src/tail.c:301 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations.\n" @@ -9509,14 +9823,8 @@ msgid "" " least once every N seconds.\n" " -v, --verbose always output headers giving file names\n" msgstr "" -" --pid=PID 配合 -f 選項時，tail 會在指定的程序 (識別碼\n" -" 為 PID) 退出後中止\n" -" -q, --quiet, --silent 不顯示任何標明檔案名稱的標頭\n" -" -s, --sleep-interval=S 配合 -f 選項時，每兩次檢查相隔約 S 秒\n" -" (預設為 1 秒)\n" -" -v, --verbose 一定顯示任何標明檔案名稱的標頭\n" -#: src/tail.c:311 +#: src/tail.c:310 #, fuzzy msgid "" "\n" @@ -9533,7 +9841,7 @@ msgstr "" "m 則是 1048576 (1M)。\n" "\n" -#: src/tail.c:320 +#: src/tail.c:319 #, fuzzy msgid "" "With --follow (-f), tail defaults to following the file descriptor, which\n" @@ -9549,64 +9857,64 @@ msgstr "" "的檔案，方法是重複地開啟檔案，看看它是否已被移除和其它程式會否再產生該\n" "檔案。\n" -#: src/tail.c:379 +#: src/tail.c:378 #, c-format msgid "closing %s (fd=%d)" msgstr "正在關閉 %s (fd=%d)" -#: src/tail.c:454 +#: src/tail.c:453 #, fuzzy, c-format msgid "%s: cannot seek to relative offset %s" msgstr "%s：無法搜尋至相對位置 %s%s" -#: src/tail.c:458 +#: src/tail.c:457 #, fuzzy, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "%s：無法搜尋至末端相對位置 %s%s" -#: src/tail.c:895 +#: src/tail.c:894 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "" -#: src/tail.c:907 +#: src/tail.c:906 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" msgstr "" -#: src/tail.c:964 +#: src/tail.c:963 #, fuzzy, c-format msgid "%s has become inaccessible" msgstr "已無法存取‘%s’" -#: src/tail.c:981 +#: src/tail.c:980 #, fuzzy, c-format msgid "%s has been replaced with an untailable file; giving up on this name" msgstr "%s：被一個無法 tail 的檔案取代；不會再檢查此檔案名稱" -#: src/tail.c:990 +#: src/tail.c:989 #, fuzzy, c-format msgid "%s has been replaced with a remote file. giving up on this name" msgstr "%s：被一個無法 tail 的檔案取代；不會再檢查此檔案名稱" -#: src/tail.c:1011 +#: src/tail.c:1010 #, fuzzy, c-format msgid "%s has become accessible" msgstr "已經可以存取‘%s’" -#: src/tail.c:1019 +#: src/tail.c:1018 #, fuzzy, c-format msgid "%s has appeared; following end of new file" msgstr "‘%s’已出現；正在檢查新檔案的末端" -#: src/tail.c:1030 +#: src/tail.c:1029 #, fuzzy, c-format msgid "%s has been replaced; following end of new file" msgstr "‘%s’已被取代；正在檢查新檔案的末端" -#: src/tail.c:1131 +#: src/tail.c:1130 #, fuzzy, c-format msgid "%s: cannot change nonblocking mode" msgstr "無法更改%s的擁有者和/或所屬群組" @@ -9904,17 +10212,22 @@ msgstr "" msgid "extra argument %s" msgstr "參數過多" -#: src/timeout.c:124 +#: src/timeout.c:112 +#, c-format +msgid "warning: sigprocmask" +msgstr "" + +#: src/timeout.c:145 #, c-format msgid "warning: timer_settime" msgstr "" -#: src/timeout.c:129 +#: src/timeout.c:150 #, c-format msgid "warning: timer_create" msgstr "" -#: src/timeout.c:204 +#: src/timeout.c:225 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -9923,16 +10236,16 @@ msgstr "" "用法：%s [檔案]...\n" " 或：%s [選項]\n" -#: src/timeout.c:208 +#: src/timeout.c:229 #, fuzzy -msgid "" -"Start COMMAND, and kill it if still running after DURATION.\n" -"\n" -"Mandatory arguments to long options are mandatory for short options too.\n" +msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "長選項必須用的參數在使用短選項時也是必須的。\n" -#: src/timeout.c:213 +#: src/timeout.c:235 msgid "" +" --preserve-status\n" +" exit with the same status as COMMAND, even when the\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 " @@ -9947,7 +10260,7 @@ msgid "" " See 'kill -l' for a list of signals\n" msgstr "" -#: src/timeout.c:229 +#: src/timeout.c:254 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -9955,25 +10268,30 @@ msgid "" "days.\n" msgstr "" -#: src/timeout.c:234 +#: src/timeout.c:259 msgid "" "\n" -"If the command times out, then exit with status 124. Otherwise, exit\n" -"with the status of COMMAND. If no signal is specified, send the TERM\n" -"signal upon timeout. The TERM signal kills any process that does not\n" -"block or catch that signal. For other processes, it may be necessary to\n" -"use the KILL (9) signal, since this signal cannot be caught. If the\n" -"KILL (9) signal is sent, the exit status is 128+9 rather than 124.\n" +"If the command times out, and --preserve-status is not set, then exit with\n" +"status 124. Otherwise, exit with the status of COMMAND. If no signal\n" +"is specified, send the TERM signal upon timeout. The TERM signal kills\n" +"any process that does not block or catch that signal. It may be necessary\n" +"to use the KILL (9) signal, since this signal cannot be caught, in which\n" +"case the exit status is 128+9 rather than 124.\n" +msgstr "" + +#: src/timeout.c:363 +#, c-format +msgid "warning: disabling core dumps failed" msgstr "" -#: src/timeout.c:419 +#: src/timeout.c:471 #, fuzzy, c-format msgid "error waiting for command" msgstr "寫入 %s 時發生錯誤" -#: src/timeout.c:441 +#: src/timeout.c:482 #, c-format -msgid "warning: disabling core dumps failed" +msgid "the monitored command dumped core" msgstr "" #. This is a proper name. See the gettext manual, section Names. @@ -9986,22 +10304,22 @@ msgstr "" msgid "Randy Smith" msgstr "" -#: src/touch.c:115 src/touch.c:313 +#: src/touch.c:115 src/touch.c:309 #, fuzzy, c-format msgid "invalid date format %s" msgstr "%2$s的參數%1$s無效" -#: src/touch.c:194 +#: src/touch.c:191 #, fuzzy, c-format msgid "cannot touch %s" msgstr "無法對‘%s’執行輸出入控制 (ioctl)" -#: src/touch.c:200 +#: src/touch.c:197 #, c-format msgid "setting times of %s" msgstr "正在設定%s的時間" -#: src/touch.c:216 +#: src/touch.c:213 msgid "" "Update the access and modification times of each FILE to the current time.\n" "\n" @@ -10010,10 +10328,9 @@ msgid "" "\n" "A FILE argument string of - is handled specially and causes touch to\n" "change the times of the file associated with standard output.\n" -"\n" msgstr "" -#: src/touch.c:229 +#: src/touch.c:225 #, fuzzy msgid "" " -a change only the access time\n" @@ -10027,7 +10344,7 @@ msgstr "" " -f (此選項不作處理)\n" " -m 只更改修改時間\n" -#: src/touch.c:235 +#: src/touch.c:231 #, fuzzy msgid "" " -h, --no-dereference affect each symbolic link instead of any " @@ -10039,12 +10356,12 @@ msgstr "" " -h, --no-dereference 影響符號鏈結本身，而不是符號鏈結指定的目的地檔案\n" " (只有系統支援更改符號鏈結的擁有者，這個選項才有效)\n" -#: src/touch.c:241 +#: 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" -" --time=WORD change the specified time:\n" +" --time=WORD change the specified time:\n" " WORD is access, atime, or use: equivalent to -a\n" " WORD is modify or mtime: equivalent to -m\n" msgstr "" @@ -10054,7 +10371,7 @@ msgstr "" " --time=WORD 使用 WORD 指定的時間：access、atime、use 都等於 -a\n" " 選項的效果，而 modify、mtime 等於 -m 選項的效果\n" -#: src/touch.c:250 +#: src/touch.c:246 msgid "" "\n" "Note that the -d and -t options accept different time-date formats.\n" @@ -10062,12 +10379,12 @@ msgstr "" "\n" "請注意，-d 和 -t 選項可接受不同的時間/日期格式。\n" -#: src/touch.c:339 +#: src/touch.c:335 #, fuzzy, c-format msgid "cannot specify times from more than one source" msgstr "不能用超過一種方式進行分割" -#: src/touch.c:413 +#: src/touch.c:409 #, fuzzy, c-format msgid "" "warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'" @@ -10332,25 +10649,24 @@ msgid "" "If a FILE is larger than the specified size, the extra data is lost.\n" "If a FILE is shorter, it is extended and the extended part (hole)\n" "reads as zero bytes.\n" -"\n" msgstr "" -#: src/truncate.c:110 +#: src/truncate.c:109 msgid " -c, --no-create do not create any files\n" msgstr "" -#: src/truncate.c:113 +#: src/truncate.c:112 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" -#: src/truncate.c:116 +#: 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" msgstr "" -#: src/truncate.c:122 +#: src/truncate.c:121 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -10358,57 +10674,57 @@ msgid "" "'/' round down to multiple of, '%' round up to multiple of.\n" msgstr "" -#: src/truncate.c:150 +#: src/truncate.c:149 #, c-format msgid "overflow in %<PRIdMAX> * %<PRIdMAX> byte blocks for file %s" msgstr "" -#: src/truncate.c:174 +#: src/truncate.c:173 #, fuzzy, c-format msgid "%s has unusable, apparently negative size" msgstr "%s：檔案的大小為負數" -#: src/truncate.c:184 src/truncate.c:379 +#: src/truncate.c:183 src/truncate.c:384 #, fuzzy, c-format msgid "cannot get the size of %s" msgstr "無法讀取時間" -#: src/truncate.c:206 +#: src/truncate.c:205 #, c-format msgid "overflow rounding up size of file %s" msgstr "" -#: src/truncate.c:216 +#: src/truncate.c:215 #, c-format msgid "overflow extending size of file %s" msgstr "" -#: src/truncate.c:231 +#: src/truncate.c:230 #, c-format msgid "failed to truncate %s at %<PRIdMAX> bytes" msgstr "" -#: src/truncate.c:305 +#: src/truncate.c:303 #, fuzzy, c-format msgid "multiple relative modifiers specified" msgstr "指定了多於一個目的地目錄" -#: src/truncate.c:335 +#: src/truncate.c:333 #, fuzzy, c-format msgid "you must specify either %s or %s" msgstr "必須指定一系列的位元組、字元或欄位" -#: src/truncate.c:342 +#: src/truncate.c:340 #, c-format msgid "you must specify a relative %s with %s" msgstr "" -#: src/truncate.c:349 +#: src/truncate.c:347 #, c-format msgid "%s was specified but %s was not" msgstr "" -#: src/truncate.c:400 +#: src/truncate.c:404 #, fuzzy, c-format msgid "cannot open %s for writing" msgstr "無法開啟%s來讀取資料" @@ -10489,13 +10805,12 @@ msgstr "無法建立暫存檔" msgid "" "Convert blanks in each FILE to tabs, writing to standard output.\n" "With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" "將每個 <檔案> 中的空格轉換為 tab，並在標準輸出顯示結果。\n" "如果沒有指定 <檔案> 或 <檔案> 是 -，則由標準輸入讀取資料。\n" "\n" -#: src/unexpand.c:125 +#: src/unexpand.c:124 #, fuzzy msgid "" " -a, --all convert all blanks, instead of just initial blanks\n" @@ -10508,12 +10823,12 @@ msgstr "" " -t, --tabs=數字 將指定 <數字> 的空格轉換為 tab，而非 8 個\n" " -t, --tabs=LIST 用以逗號分隔的數字特別指定 tab 的位置\n" -#: src/unexpand.c:153 +#: src/unexpand.c:152 #, c-format msgid "tabs are too far apart" msgstr "" -#: src/unexpand.c:505 +#: src/unexpand.c:504 #, fuzzy, c-format msgid "tab stop value is too large" msgstr "tab 字元寬度 %s 過長" @@ -10529,10 +10844,9 @@ msgid "" "writing to OUTPUT (or standard output).\n" "\n" "With no options, matching lines are merged to the first occurrence.\n" -"\n" msgstr "" -#: src/uniq.c:148 +#: src/uniq.c:147 msgid "" " -c, --count prefix lines by the number of occurrences\n" " -d, --repeated only print duplicate lines\n" @@ -10540,7 +10854,7 @@ msgstr "" " -c, --count 每行前加上出現次數\n" " -d, --repeated 只印出重複的資料\n" -#: src/uniq.c:152 +#: src/uniq.c:151 #, fuzzy msgid "" " -D, --all-repeated[=delimit-method] print all duplicate lines\n" @@ -10561,11 +10875,11 @@ msgstr "" " -s, --skip-chars=N 不比較最初的 N 個字元\n" " -u, --unique 只印出沒有重複的資料\n" -#: src/uniq.c:162 +#: src/uniq.c:161 msgid " -w, --check-chars=N compare no more than N characters in lines\n" msgstr " -w, --check-chars=N 每行比較不多於 N 個字元\n" -#: src/uniq.c:167 +#: src/uniq.c:166 #, fuzzy msgid "" "\n" @@ -10576,7 +10890,7 @@ msgstr "" "一個欄位是由一組空白字元加上一組非空白的字元組成的。\n" "當同時指定略過欄位和略過字元不作比較時，會先略過欄位。\n" -#: src/uniq.c:172 +#: src/uniq.c:171 msgid "" "\n" "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n" @@ -10584,24 +10898,24 @@ msgid "" "Also, comparisons honor the rules specified by 'LC_COLLATE'.\n" msgstr "" -#: src/uniq.c:359 +#: src/uniq.c:358 #, c-format msgid "too many repeated lines" msgstr "重複的行數過多" -#: src/uniq.c:522 +#: src/uniq.c:521 msgid "invalid number of fields to skip" msgstr "要略過的欄位數目無效" -#: src/uniq.c:531 +#: src/uniq.c:530 msgid "invalid number of bytes to skip" msgstr "要略過的位元組數目無效" -#: src/uniq.c:540 +#: src/uniq.c:539 msgid "invalid number of bytes to compare" msgstr "要比較的位元組數目無效" -#: src/uniq.c:559 +#: src/uniq.c:558 #, c-format msgid "printing all duplicated lines and repeat counts is meaningless" msgstr "顯示每行重複的資籵又計算該行的重複次數是沒有意義的" @@ -10654,6 +10968,11 @@ msgid "up %ld day %2d:%02d, " msgid_plural "up %ld days %2d:%02d, " msgstr[0] "" +#: src/uptime.c:149 +#, c-format +msgid "up %2d:%02d, " +msgstr "" + #: src/uptime.c:151 #, c-format msgid "%lu user" @@ -10736,39 +11055,39 @@ msgstr "" msgid " old " msgstr "" -#: src/who.c:449 +#: src/who.c:440 msgid "system boot" msgstr "" -#: src/who.c:456 src/who.c:458 +#: src/who.c:447 src/who.c:449 msgid "id=" msgstr "" -#: src/who.c:471 src/who.c:476 +#: src/who.c:462 src/who.c:467 msgid "term=" msgstr "" -#: src/who.c:473 src/who.c:477 +#: src/who.c:464 src/who.c:468 msgid "exit=" msgstr "" -#: src/who.c:494 +#: src/who.c:485 msgid "LOGIN" msgstr "" -#: src/who.c:514 +#: src/who.c:505 msgid "clock change" msgstr "" -#: src/who.c:526 src/who.c:527 +#: src/who.c:517 src/who.c:518 msgid "run-level" msgstr "" -#: src/who.c:530 src/who.c:531 +#: src/who.c:521 src/who.c:522 msgid "last=" msgstr "" -#: src/who.c:562 +#: src/who.c:553 #, c-format msgid "" "\n" @@ -10777,44 +11096,44 @@ msgstr "" "\n" "登入用家數目=%lu\n" -#: src/who.c:568 +#: src/who.c:559 msgid "NAME" msgstr "名稱" -#: src/who.c:568 +#: src/who.c:559 msgid "LINE" msgstr "" -#: src/who.c:568 +#: src/who.c:559 msgid "TIME" msgstr "時間" -#: src/who.c:568 +#: src/who.c:559 msgid "IDLE" msgstr "" -#: src/who.c:569 +#: src/who.c:560 msgid "PID" msgstr "PID" -#: src/who.c:569 +#: src/who.c:560 msgid "COMMENT" msgstr "備註" -#: src/who.c:569 +#: src/who.c:560 msgid "EXIT" msgstr "離開" -#: src/who.c:649 +#: src/who.c:640 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n" msgstr "用法：%s [選項]... 檔案1 檔案2\n" -#: src/who.c:650 +#: src/who.c:641 msgid "Print information about users who are currently logged in.\n" msgstr "" -#: src/who.c:653 +#: src/who.c:644 msgid "" "\n" " -a, --all same as -b -d --login -p -r -t -T -u\n" @@ -10823,18 +11142,18 @@ msgid "" " -H, --heading print line of column headings\n" msgstr "" -#: src/who.c:660 +#: src/who.c:651 msgid " -l, --login print system login processes\n" msgstr "" -#: src/who.c:663 +#: src/who.c:654 msgid "" " --lookup attempt to canonicalize hostnames via DNS\n" " -m only hostname and user associated with stdin\n" " -p, --process print active processes spawned by init\n" msgstr "" -#: src/who.c:668 +#: src/who.c:659 msgid "" " -q, --count all login names and number of users logged on\n" " -r, --runlevel print current runlevel\n" @@ -10842,7 +11161,7 @@ msgid "" " -t, --time print last system clock change\n" msgstr "" -#: src/who.c:674 +#: src/who.c:665 msgid "" " -T, -w, --mesg add user's message status as +, - or ?\n" " -u, --users list users logged in\n" @@ -10850,7 +11169,7 @@ msgid "" " --writable same as -T\n" msgstr "" -#: src/who.c:682 +#: src/who.c:673 #, fuzzy, c-format msgid "" "\n" @@ -10890,6 +11209,33 @@ 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" @@ -10898,8 +11244,78 @@ msgstr "" #~ " 或：%s 選項\n" #, fuzzy -#~ msgid "Usage: %s [OPTION] FILE...\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" +#~ msgstr "" +#~ " none, off 不會進行備份 (即使使用了 --backup 選項也不會)\n" +#~ " numbered, t 備份檔會加上數字\n" +#~ " existing, nil 若有數字的備份檔已經存在則使用數字，否則使用普通方式備" +#~ "份\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" +#~ "RADIX 的選擇為：d 表示十進位，o 表示八進位，h 表示十六進位，或 n 表示\n" +#~ "不顯示基準位址。<位元組> 可以是前置 0x 或 0X 的十六進位數字；如果 <位元組" +#~ ">\n" +#~ "後加上 b 字元表示將數字乘以 512，加上 k 表示乘以 1024，加上 m 表示乘以\n" +#~ "1048576。在任何 <格式> 後加上 z 字元會在每行輸出後顯示相應的可列印字元。" + +#, 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 "" +#~ " \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 "不可同時省略使用者和所屬群組" + +#, fuzzy +#~ msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" +#~ msgstr "用法：%s [選項]... [檔案]...\n" + +#, fuzzy +#~ msgid "warning: cannot change directory to %s" +#~ msgstr "無法建立目錄%s" #, fuzzy #~ msgid "" @@ -10908,10 +11324,8 @@ 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" +#~ " -f, --silent, --quiet suppress most error messages\n" +#~ " -v, --verbose output a diagnostic for every file processed\n" #~ msgstr "" #~ "將每個 <檔案> 的所屬群組設定為 <群組>。\n" #~ "加上 --reference 的話，會參考 <參考檔> 的群組來設定。\n" @@ -10989,25 +11403,11 @@ msgstr "" #~ " -R, --recursive 處理所有目錄中的檔案及子目錄\n" #~ " -v, --verbose 處理任何檔案都會顯示訊息\n" -#, fuzzy -#~ msgid "Usage: %s [OPTION]... PATH START\n" -#~ msgstr "用法：%s [選項]... SET1 [SET2]\n" - -#, fuzzy -#~ msgid "" -#~ " -n, --no-newline do not output the trailing " -#~ "newline\n" -#~ " " -#~ msgstr "" -#~ "在標準輸出顯示指定 <字串>。\n" -#~ "\n" -#~ " -n 不加上最後的換行字元\n" - #, fuzzy #~ msgid "" #~ "\n" -#~ "SIZE is an integer with an optional suffix (example: 10MB). Suffixes " -#~ "are:\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 "" @@ -11015,13 +11415,6 @@ msgstr "" #~ "<大小> 可以是以下的單位 (單位前可加上整數)：\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 鏈結" - -#, fuzzy -#~ msgid "%s: option '%s' is ambiguous\n" -#~ msgstr "%s：選項‘-W %s’不明確\n" - #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s：不合法的選項 ─ %c\n" @@ -11064,6 +11457,9 @@ msgstr "" #~ msgid "cannot overwrite directory %s" #~ msgstr "無法覆寫 %s 目錄" +#~ msgid "cannot create link %s" +#~ msgstr "無法建立 %s 鏈結" + #~ msgid "" #~ "The backup suffix is `~', unless set with --suffix or " #~ "SIMPLE_BACKUP_SUFFIX.\n" @@ -11204,9 +11600,6 @@ 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’" @@ -11442,6 +11835,10 @@ msgstr "" #~ msgid "invalid number of lines: 0" #~ msgstr "無效的行數" +#, fuzzy +#~ msgid "Usage: %s [OPTION] FILE...\n" +#~ msgstr "用法：%s [選項] [檔案]...\n" + # How come the real behavior of -L is exactly the opposite of what docs # say? -- Abel #, fuzzy diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index 06ab6152..00000000 --- a/src/Makefile.am +++ /dev/null @@ -1,724 +0,0 @@ -## Process this file with automake to produce Makefile.in -*-Makefile-*- - -## Copyright (C) 1990-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 -## 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/>. - -# These are the names of programs that are not installed by default. -# This list is *not* intended for programs like who, nice, chroot, etc., -# that are built only when certain requisite system features are detected. -# Hence, if you want to install programs from this list anyway, say A and B, -# use --enable-install-program=A,B -no_install__progs = \ - arch hostname su - -build_if_possible__progs = \ - chroot \ - df \ - hostid \ - libstdbuf.so \ - nice \ - pinky \ - stdbuf \ - stty \ - su \ - uptime \ - users \ - who - -AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) - -EXTRA_PROGRAMS = \ - $(no_install__progs) \ - $(build_if_possible__progs) \ - [ \ - base64 \ - basename \ - cat \ - chcon \ - chgrp \ - chmod \ - chown \ - cksum \ - comm \ - cp \ - csplit \ - cut \ - date \ - dd \ - dir \ - dircolors \ - dirname \ - du \ - echo \ - env \ - expand \ - expr \ - factor \ - false \ - fmt \ - fold \ - ginstall \ - groups \ - head \ - id \ - join \ - kill \ - link \ - ln \ - logname \ - ls \ - md5sum \ - mkdir \ - mkfifo \ - mknod \ - mktemp \ - mv \ - nl \ - nproc \ - nohup \ - od \ - paste \ - pathchk \ - pr \ - printenv \ - printf \ - ptx \ - pwd \ - readlink \ - realpath \ - rm \ - rmdir \ - runcon \ - seq \ - sha1sum \ - sha224sum \ - sha256sum \ - sha384sum \ - sha512sum \ - shred \ - shuf \ - sleep \ - sort \ - split \ - stat \ - sum \ - sync \ - tac \ - tail \ - tee \ - test \ - timeout \ - touch \ - tr \ - true \ - truncate \ - tsort \ - tty \ - uname \ - unexpand \ - uniq \ - unlink \ - vdir \ - wc \ - whoami \ - yes - -bin_PROGRAMS = $(OPTIONAL_BIN_PROGS) - -noinst_PROGRAMS = setuidgid getlimits - -pkglibexec_PROGRAMS = $(OPTIONAL_PKGLIB_PROGS) - -noinst_HEADERS = \ - chown-core.h \ - copy.h \ - cp-hash.h \ - dircolors.h \ - fiemap.h \ - find-mount-point.h \ - fs.h \ - fs-is-local.h \ - group-list.h \ - ioblksize.h \ - ls.h \ - operand2sig.h \ - prog-fprintf.h \ - remove.h \ - system.h \ - wheel-size.h \ - wheel.h \ - uname.h - -EXTRA_DIST = dcgen dircolors.hin tac-pipe.c \ - wheel-gen.pl extract-magic c99-to-c89.diff -BUILT_SOURCES = -CLEANFILES = $(SCRIPTS) su - -# Also remove these sometimes-built programs. -# For example, even when excluded, they're built via _sc_check-AUTHORS. -CLEANFILES += $(no_install__progs) - -AM_CPPFLAGS = -I$(top_srcdir)/lib - -noinst_LIBRARIES = libver.a -nodist_libver_a_SOURCES = version.c version.h - -# Tell the linker to omit references to unused shared libraries. -AM_LDFLAGS = $(IGNORE_UNUSED_LIBRARIES_CFLAGS) - -# Sometimes, the expansion of $(LIBINTL) includes -lc which may -# include modules defining variables like 'optind', so libcoreutils.a -# must precede $(LIBINTL) in order to ensure we use GNU getopt. -# But libcoreutils.a must also follow $(LIBINTL), since libintl uses -# replacement functions defined in libcoreutils.a. -LDADD = libver.a ../lib/libcoreutils.a $(LIBINTL) ../lib/libcoreutils.a - -# First, list all programs, to make listing per-program libraries easier. -# See [ below. -arch_LDADD = $(LDADD) -base64_LDADD = $(LDADD) -basename_LDADD = $(LDADD) -cat_LDADD = $(LDADD) -chcon_LDADD = $(LDADD) -chgrp_LDADD = $(LDADD) -chmod_LDADD = $(LDADD) -chown_LDADD = $(LDADD) -chroot_LDADD = $(LDADD) -cksum_LDADD = $(LDADD) -comm_LDADD = $(LDADD) -nproc_LDADD = $(LDADD) -cp_LDADD = $(LDADD) -csplit_LDADD = $(LDADD) -cut_LDADD = $(LDADD) -date_LDADD = $(LDADD) -dd_LDADD = $(LDADD) -df_LDADD = $(LDADD) -# See dir_LDADD below -dircolors_LDADD = $(LDADD) -dirname_LDADD = $(LDADD) -du_LDADD = $(LDADD) -echo_LDADD = $(LDADD) -env_LDADD = $(LDADD) -expand_LDADD = $(LDADD) -expr_LDADD = $(LDADD) -factor_LDADD = $(LDADD) -false_LDADD = $(LDADD) -fmt_LDADD = $(LDADD) -fold_LDADD = $(LDADD) -getlimits_LDADD = $(LDADD) -ginstall_LDADD = $(LDADD) -groups_LDADD = $(LDADD) -head_LDADD = $(LDADD) -hostid_LDADD = $(LDADD) -hostname_LDADD = $(LDADD) -id_LDADD = $(LDADD) -join_LDADD = $(LDADD) -kill_LDADD = $(LDADD) -link_LDADD = $(LDADD) -ln_LDADD = $(LDADD) -logname_LDADD = $(LDADD) -ls_LDADD = $(LDADD) -md5sum_LDADD = $(LDADD) -mkdir_LDADD = $(LDADD) -mkfifo_LDADD = $(LDADD) -mknod_LDADD = $(LDADD) -mktemp_LDADD = $(LDADD) -mv_LDADD = $(LDADD) -nice_LDADD = $(LDADD) -nl_LDADD = $(LDADD) -nohup_LDADD = $(LDADD) -od_LDADD = $(LDADD) -paste_LDADD = $(LDADD) -pathchk_LDADD = $(LDADD) -pinky_LDADD = $(LDADD) -pr_LDADD = $(LDADD) -printenv_LDADD = $(LDADD) -printf_LDADD = $(LDADD) -ptx_LDADD = $(LDADD) -pwd_LDADD = $(LDADD) -readlink_LDADD = $(LDADD) -realpath_LDADD = $(LDADD) -rm_LDADD = $(LDADD) -rmdir_LDADD = $(LDADD) -runcon_LDADD = $(LDADD) -seq_LDADD = $(LDADD) -setuidgid_LDADD = $(LDADD) -sha1sum_LDADD = $(LDADD) -sha224sum_LDADD = $(LDADD) -sha256sum_LDADD = $(LDADD) -sha384sum_LDADD = $(LDADD) -sha512sum_LDADD = $(LDADD) -shred_LDADD = $(LDADD) -shuf_LDADD = $(LDADD) -sleep_LDADD = $(LDADD) -sort_LDADD = $(LDADD) -split_LDADD = $(LDADD) -stat_LDADD = $(LDADD) -stdbuf_LDADD = $(LDADD) -stty_LDADD = $(LDADD) -su_LDADD = $(LDADD) -sum_LDADD = $(LDADD) -sync_LDADD = $(LDADD) -tac_LDADD = $(LDADD) -tail_LDADD = $(LDADD) -tee_LDADD = $(LDADD) -test_LDADD = $(LDADD) -timeout_LDADD = $(LDADD) -touch_LDADD = $(LDADD) -tr_LDADD = $(LDADD) -true_LDADD = $(LDADD) -truncate_LDADD = $(LDADD) -tsort_LDADD = $(LDADD) -tty_LDADD = $(LDADD) -uname_LDADD = $(LDADD) -unexpand_LDADD = $(LDADD) -uniq_LDADD = $(LDADD) -unlink_LDADD = $(LDADD) -uptime_LDADD = $(LDADD) -users_LDADD = $(LDADD) -# See vdir_LDADD below -wc_LDADD = $(LDADD) -who_LDADD = $(LDADD) -whoami_LDADD = $(LDADD) -yes_LDADD = $(LDADD) - -# Synonyms. Recall that Automake transliterates '[' to '_'. -__LDADD = $(test_LDADD) -dir_LDADD = $(ls_LDADD) -vdir_LDADD = $(ls_LDADD) - -# Shared files -copy_LDADD = -cp_LDADD += $(copy_LDADD) -ginstall_LDADD += $(copy_LDADD) -mv_LDADD += $(copy_LDADD) - -remove_LDADD = -mv_LDADD += $(remove_LDADD) -rm_LDADD += $(remove_LDADD) - -# for eaccess, euidaccess -copy_LDADD += $(LIB_EACCESS) -remove_LDADD += $(LIB_EACCESS) -test_LDADD += $(LIB_EACCESS) - -# for selinux use -chcon_LDADD += $(LIB_SELINUX) -copy_LDADD += $(LIB_SELINUX) -ginstall_LDADD += $(LIB_SELINUX) -id_LDADD += $(LIB_SELINUX) -ls_LDADD += $(LIB_SELINUX) -mkdir_LDADD += $(LIB_SELINUX) -mkfifo_LDADD += $(LIB_SELINUX) -mknod_LDADD += $(LIB_SELINUX) -runcon_LDADD += $(LIB_SELINUX) -stat_LDADD += $(LIB_SELINUX) - -# for gettime, settime, utimecmp, utimens -copy_LDADD += $(LIB_CLOCK_GETTIME) -date_LDADD += $(LIB_CLOCK_GETTIME) -ginstall_LDADD += $(LIB_CLOCK_GETTIME) -ls_LDADD += $(LIB_CLOCK_GETTIME) -pr_LDADD += $(LIB_CLOCK_GETTIME) -timeout_LDADD += $(LIB_TIMER_TIME) -touch_LDADD += $(LIB_CLOCK_GETTIME) - -# for gethrxtime -dd_LDADD += $(LIB_GETHRXTIME) - -# for cap_get_file -ls_LDADD += $(LIB_CAP) - -# for fdatasync -dd_LDADD += $(LIB_FDATASYNC) -shred_LDADD += $(LIB_FDATASYNC) - -# for xnanosleep -sleep_LDADD += $(LIB_NANOSLEEP) -sort_LDADD += $(LIB_NANOSLEEP) -tail_LDADD += $(LIB_NANOSLEEP) - -# for various GMP functions -expr_LDADD += $(LIB_GMP) -factor_LDADD += $(LIB_GMP) - -# for getloadavg -uptime_LDADD += $(GETLOADAVG_LIBS) - -# for crypt -su_LDADD += $(LIB_CRYPT) - -# for various ACL functions -copy_LDADD += $(LIB_ACL) -ls_LDADD += $(LIB_ACL) - -# for various xattr functions -copy_LDADD += $(LIB_XATTR) - -# for print_unicode_char, proper_name_utf8 -cat_LDADD += $(LIBICONV) -cp_LDADD += $(LIBICONV) -df_LDADD += $(LIBICONV) -du_LDADD += $(LIBICONV) -getlimits_LDADD += $(LIBICONV) -printf_LDADD += $(LIBICONV) -ptx_LDADD += $(LIBICONV) -realpath_LDADD += $(LIBICONV) -split_LDADD += $(LIBICONV) -stdbuf_LDADD += $(LIBICONV) -timeout_LDADD += $(LIBICONV) -truncate_LDADD += $(LIBICONV) - -# for canon_host -pinky_LDADD += $(GETADDRINFO_LIB) -who_LDADD += $(GETADDRINFO_LIB) - -# for gethostname, uname -hostname_LDADD += $(GETHOSTNAME_LIB) -uname_LDADD += $(GETHOSTNAME_LIB) - -# for strsignal -kill_LDADD += $(LIBTHREAD) - -# for pthread -sort_LDADD += $(LIB_PTHREAD) - -$(PROGRAMS): ../lib/libcoreutils.a - -# Get the release year from ../lib/version-etc.c. -RELEASE_YEAR = \ - `sed -n '/.*COPYRIGHT_YEAR = \([0-9][0-9][0-9][0-9]\) };/s//\1/p' \ - $(top_srcdir)/lib/version-etc.c` - -all-local: su$(EXEEXT) - -installed_su = $(DESTDIR)$(bindir)/`echo su|sed '$(transform)'` - -setuid_root_mode = a=rx,u+s - -install_su = \ - if test "$(INSTALL_SU)" = yes; then \ - p=su; \ - echo " $(INSTALL_PROGRAM) $$p $(installed_su)"; \ - $(INSTALL_PROGRAM) $$p $(installed_su); \ - echo " chown root $(installed_su)"; \ - chown root $(installed_su); \ - echo " chmod $(setuid_root_mode) $(installed_su)"; \ - chmod $(setuid_root_mode) $(installed_su); \ - else \ - :; \ - fi - -install-root: su$(EXEEXT) - @$(install_su) - -install-exec-hook: su$(EXEEXT) - @if test "$(INSTALL_SU)" = yes; then \ - TMPFILE=$(DESTDIR)$(bindir)/.su-$$$$; \ - rm -f $$TMPFILE; \ - echo > $$TMPFILE; \ -## See if we can create a setuid root executable in $(bindir). -## If not, then don't even try to install su. - can_create_suid_root_executable=no; \ - chown root $$TMPFILE > /dev/null 2>&1 \ - && chmod $(setuid_root_mode) $$TMPFILE > /dev/null 2>&1 \ - && can_create_suid_root_executable=yes; \ - rm -f $$TMPFILE; \ - if test $$can_create_suid_root_executable = yes; then \ - $(install_su); \ - else \ - echo "WARNING: insufficient access; not installing su"; \ - echo "NOTE: to install su, run 'make install-root' as root"; \ - rm -f $(installed_su); \ - fi; \ - else :; \ - fi - -uninstall-local: -# Remove su only if it's one we installed. - @if test "$(INSTALL_SU)" = yes; then \ - if grep '$(PACKAGE_NAME)' $(installed_su) > /dev/null 2>&1; then \ - echo " rm -f $(installed_su)"; \ - rm -f $(installed_su); \ - else :; \ - fi; \ - fi - -copy_sources = copy.c cp-hash.c extent-scan.c extent-scan.h - -# Use 'ginstall' in the definition of PROGRAMS and in dependencies to avoid -# confusion with the 'install' target. The install rule transforms 'ginstall' -# to install before applying any user-specified name transformations. - -transform = s/ginstall/install/; $(program_transform_name) -ginstall_SOURCES = install.c prog-fprintf.c $(copy_sources) - -# This is for the '[' program. Automake transliterates '[' to '_'. -__SOURCES = lbracket.c - -cp_SOURCES = cp.c $(copy_sources) -dir_SOURCES = ls.c ls-dir.c -vdir_SOURCES = ls.c ls-vdir.c -id_SOURCES = id.c group-list.c -groups_SOURCES = groups.c group-list.c -ls_SOURCES = ls.c ls-ls.c -ln_SOURCES = ln.c relpath.c relpath.h -chown_SOURCES = chown.c chown-core.c -chgrp_SOURCES = chgrp.c chown-core.c -kill_SOURCES = kill.c operand2sig.c -realpath_SOURCES = realpath.c relpath.c relpath.h -timeout_SOURCES = timeout.c operand2sig.c - -mv_SOURCES = mv.c remove.c $(copy_sources) -rm_SOURCES = rm.c remove.c - -mkdir_SOURCES = mkdir.c prog-fprintf.c -rmdir_SOURCES = rmdir.c prog-fprintf.c - -df_SOURCES = df.c find-mount-point.c -stat_SOURCES = stat.c find-mount-point.c - -uname_SOURCES = uname.c uname-uname.c -arch_SOURCES = uname.c uname-arch.c - -md5sum_CPPFLAGS = -DHASH_ALGO_MD5=1 $(AM_CPPFLAGS) -sha1sum_SOURCES = md5sum.c -sha1sum_CPPFLAGS = -DHASH_ALGO_SHA1=1 $(AM_CPPFLAGS) -sha224sum_SOURCES = md5sum.c -sha224sum_CPPFLAGS = -DHASH_ALGO_SHA224=1 $(AM_CPPFLAGS) -sha256sum_SOURCES = md5sum.c -sha256sum_CPPFLAGS = -DHASH_ALGO_SHA256=1 $(AM_CPPFLAGS) -sha384sum_SOURCES = md5sum.c -sha384sum_CPPFLAGS = -DHASH_ALGO_SHA384=1 $(AM_CPPFLAGS) -sha512sum_SOURCES = md5sum.c -sha512sum_CPPFLAGS = -DHASH_ALGO_SHA512=1 $(AM_CPPFLAGS) - -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 -libstdbuf_so_LDADD = - -# 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. -libstdbuf_so_LDFLAGS = -shared -libstdbuf_so_CFLAGS = -fPIC $(AM_CFLAGS) - -editpl = sed -e 's,@''PERL''@,$(PERL),g' - -BUILT_SOURCES += dircolors.h -dircolors.h: dcgen dircolors.hin - $(AM_V_GEN)rm -f $@ $@-t - $(AM_V_at)$(PERL) -w -- $(srcdir)/dcgen $(srcdir)/dircolors.hin > $@-t - $(AM_V_at)chmod a-w $@-t - $(AM_V_at)mv $@-t $@ - -wheel_size = 5 - -BUILT_SOURCES += wheel-size.h -wheel-size.h: Makefile.am - $(AM_V_GEN)rm -f $@ $@-t - $(AM_V_at)echo '#define WHEEL_SIZE $(wheel_size)' > $@-t - $(AM_V_at)chmod a-w $@-t - $(AM_V_at)mv $@-t $@ - -BUILT_SOURCES += wheel.h -wheel.h: wheel-gen.pl Makefile.am - $(AM_V_GEN)rm -f $@ $@-t - $(AM_V_at)$(srcdir)/wheel-gen.pl $(wheel_size) > $@-t - $(AM_V_at)chmod a-w $@-t - $(AM_V_at)mv $@-t $@ - -# false exits nonzero even with --help or --version. -# test doesn't support --help or --version. -# Tell automake to exempt then from that installcheck test. -AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = false test - -# Compare fs.h with the list of file system names/magic-numbers in the -# Linux statfs man page. This target prints any new name/number pairs. -# Also compare against /usr/include/linux/magic.h -.PHONY: fs-magic-compare -fs-magic-compare: fs-magic fs-kernel-magic fs-def - join -v1 -t@ fs-magic fs-def - join -v1 -t@ fs-kernel-magic fs-def - -CLEANFILES += fs-def -fs-def: fs.h - grep '^# *define ' $< | $(ASSORT) > $@-t && mv $@-t $@ - -# Massage bits of the statfs man page and definitions from -# /usr/include/linux/magic.h to be in a form consistent with what's in fs.h. -fs_normalize_perl_subst = \ - -e 's/MINIX_SUPER_MAGIC\b/MINIX/;' \ - -e 's/MINIX_SUPER_MAGIC2\b/MINIX_30/;' \ - -e 's/MINIX2_SUPER_MAGIC\b/MINIX_V2/;' \ - -e 's/MINIX2_SUPER_MAGIC2\b/MINIX_V2_30/;' \ - -e 's/MINIX3_SUPER_MAGIC\b/MINIX_V3/;' \ - -e 's/CIFS_MAGIC_NUMBER/CIFS/;' \ - -e 's/(_SUPER)?_MAGIC//;' \ - -e 's/\s+0x(\S+)/" 0x" . uc $$1/e;' \ - -e 's/(\s+0x)(\X{3})\b/$${1}0$$2/;' \ - -e 's/(\s+0x)(\X{6})\b/$${1}00$$2/;' \ - -e 's/(\s+0x)(\X{7})\b/$${1}0$$2/;' \ - -e 's/^\s+//;' \ - -e 's/^\043define\s+//;' \ - -e 's/^_(XIAFS)/$$1/;' \ - -e 's/^USBDEVICE/USBDEVFS/;' \ - -e 's/NTFS_SB/NTFS/;' \ - -e 's/^/\043 define S_MAGIC_/;' \ - -e 's,\s*/\* .*? \*/,,;' - -CLEANFILES += fs-magic -fs-magic: Makefile - 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' \ - | LC_ALL=C sort \ - > $@-t && mv $@-t $@ - -CLEANFILES += fs-kernel-magic -fs-kernel-magic: Makefile - perl -ne '/^#define.*0x/ and print' /usr/include/linux/magic.h \ - | perl -p \ - $(fs_normalize_perl_subst) \ - | grep -Ev 'S_MAGIC_EXT[34]|STACK_END' \ - | LC_ALL=C sort \ - > $@-t && mv $@-t $@ - -BUILT_SOURCES += fs-is-local.h -fs-is-local.h: stat.c extract-magic - $(AM_V_GEN)rm -f $@ - $(AM_V_at)$(PERL) $(srcdir)/extract-magic --local $(srcdir)/stat.c \ - > $@t - $(AM_V_at)chmod a-w $@t - $(AM_V_at)mv $@t $@ - -BUILT_SOURCES += fs.h -fs.h: stat.c extract-magic - $(AM_V_GEN)rm -f $@ - $(AM_V_at)$(PERL) $(srcdir)/extract-magic $(srcdir)/stat.c > $@t - $(AM_V_at)chmod a-w $@t - $(AM_V_at)mv $@t $@ - -BUILT_SOURCES += version.c -version.c: Makefile - $(AM_V_GEN)rm -f $@ - $(AM_V_at)printf '#include <config.h>\n' > $@t - $(AM_V_at)printf 'char const *Version = "$(PACKAGE_VERSION)";\n' >> $@t - $(AM_V_at)chmod a-w $@t - $(AM_V_at)mv $@t $@ - -BUILT_SOURCES += version.h -version.h: Makefile - $(AM_V_GEN)rm -f $@ - $(AM_V_at)printf 'extern char const *Version;\n' > $@t - $(AM_V_at)chmod a-w $@t - $(AM_V_at)mv $@t $@ - -DISTCLEANFILES = version.c version.h -MAINTAINERCLEANFILES = $(BUILT_SOURCES) - -# Sort in traditional ASCII order, regardless of the current locale; -# otherwise we may get into trouble with distinct strings that the -# current locale considers to be equal. -ASSORT = LC_ALL=C sort - -all_programs = \ - $(bin_PROGRAMS) \ - $(bin_SCRIPTS) \ - $(EXTRA_PROGRAMS) - -built_programs.list: - @echo $(bin_PROGRAMS) $(bin_SCRIPTS) | tr ' ' '\n' \ - | sed -e 's,$(EXEEXT)$$,,' | $(ASSORT) -u | tr '\n' ' ' - -all_programs.list: - @echo $(all_programs) | tr ' ' '\n' | sed -e 's,$(EXEEXT)$$,,' \ - | sed /libstdbuf/d \ - | $(ASSORT) -u - -# This is required because we have broken 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. -dist-hook: $(all_programs) - -# Ensure that all programs are built so we can for example -# subsequently syntax check all man pages. -.PHONY: all_programs -all_programs: $(all_programs) - -pm = progs-makefile -pr = progs-readme -# Ensure that the list of programs in README matches the list -# of programs we can build. -check: check-README check-duplicate-no-install -.PHONY: check-README -check-README: - $(AM_V_GEN)rm -rf $(pr) $(pm) - $(AM_V_at)echo $(all_programs) \ - | tr -s ' ' '\n' | sed -e 's,$(EXEEXT)$$,,;s/ginstall/install/' \ - | sed /libstdbuf/d \ - | $(ASSORT) -u > $(pm) && \ - sed -n '/^The programs .* are:/,/^[a-zA-Z]/p' $(top_srcdir)/README \ - | sed -n '/^ */s///p' | tr -s ' ' '\n' > $(pr) - $(AM_V_at)diff $(pm) $(pr) && rm -rf $(pr) $(pm) - -# Ensure that a by-default-not-installed program (listed in -# $(no_install__progs) is not also listed in $(EXTRA_PROGRAMS), because -# if that were to happen, it *would* be installed by default. -.PHONY: check-duplicate-no-install -check-duplicate-no-install: tr - $(AM_V_GEN)test -z "`echo '$(EXTRA_PROGRAMS)'| ./tr ' ' '\n' | uniq -d`" - -# Ensure that the list of programs and author names is accurate. -# We need a UTF8 locale. If a lack of locale support or a missing -# translation inhibits printing of UTF-8 names, just skip this test. -au_dotdot = authors-dotdot -au_actual = authors-actual -.PHONY: _sc_check-AUTHORS -_sc_check-AUTHORS: $(all_programs) - @locale=en_US.UTF-8; \ - LC_ALL=$$locale ./cat --version \ - | grep ' Torbjorn ' > /dev/null \ - && { echo "$@: skipping this check"; exit 0; }; \ - rm -f $(au_actual) $(au_dotdot); \ - for i in `ls $(all_programs) | sed -e 's,$(EXEEXT)$$,,' \ - | sed /libstdbuf/d \ - | $(ASSORT) -u`; do \ - test "$$i" = '[' && continue; \ - exe=$$i; \ - if test "$$i" = install; then \ - exe=ginstall; \ - elif test "$$i" = test; then \ - exe='['; \ - fi; \ - LC_ALL=$$locale ./$$exe --version \ - | perl -0 -pi -e 's/,\n/, /gm' \ - | sed -n -e '/Written by /{ s//'"$$i"': /;' \ - -e 's/,* and /, /; s/\.$$//; p; }'; \ - done > $(au_actual) && \ - sed -n '/^[^ ][^ ]*:/p' $(top_srcdir)/AUTHORS > $(au_dotdot) && \ - diff $(au_actual) $(au_dotdot) && rm -f $(au_actual) $(au_dotdot) - -# Use the just-built ./ginstall, when not cross-compiling. -if CROSS_COMPILING -cu_install_program = @INSTALL_PROGRAM@ -else -cu_install_program = ./ginstall -endif -INSTALL_PROGRAM = $(cu_install_program) diff --git a/src/Makefile.in b/src/Makefile.in deleted file mode 100644 index da1f3c4b..00000000 --- a/src/Makefile.in +++ /dev/null @@ -1,3547 +0,0 @@ -# Makefile.in generated by automake 1.12a from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2012 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. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - - - -VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ - 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;; \ - esac; \ - test $$am__dry = yes; \ - } -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -EXTRA_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) [$(EXEEXT) \ - base64$(EXEEXT) basename$(EXEEXT) cat$(EXEEXT) chcon$(EXEEXT) \ - chgrp$(EXEEXT) chmod$(EXEEXT) chown$(EXEEXT) cksum$(EXEEXT) \ - comm$(EXEEXT) cp$(EXEEXT) csplit$(EXEEXT) cut$(EXEEXT) \ - date$(EXEEXT) dd$(EXEEXT) dir$(EXEEXT) dircolors$(EXEEXT) \ - dirname$(EXEEXT) du$(EXEEXT) echo$(EXEEXT) env$(EXEEXT) \ - expand$(EXEEXT) expr$(EXEEXT) factor$(EXEEXT) false$(EXEEXT) \ - fmt$(EXEEXT) fold$(EXEEXT) ginstall$(EXEEXT) groups$(EXEEXT) \ - head$(EXEEXT) id$(EXEEXT) join$(EXEEXT) kill$(EXEEXT) \ - link$(EXEEXT) ln$(EXEEXT) logname$(EXEEXT) ls$(EXEEXT) \ - md5sum$(EXEEXT) mkdir$(EXEEXT) mkfifo$(EXEEXT) mknod$(EXEEXT) \ - mktemp$(EXEEXT) mv$(EXEEXT) nl$(EXEEXT) nproc$(EXEEXT) \ - nohup$(EXEEXT) od$(EXEEXT) paste$(EXEEXT) pathchk$(EXEEXT) \ - pr$(EXEEXT) printenv$(EXEEXT) printf$(EXEEXT) ptx$(EXEEXT) \ - pwd$(EXEEXT) readlink$(EXEEXT) realpath$(EXEEXT) rm$(EXEEXT) \ - rmdir$(EXEEXT) runcon$(EXEEXT) seq$(EXEEXT) sha1sum$(EXEEXT) \ - sha224sum$(EXEEXT) sha256sum$(EXEEXT) sha384sum$(EXEEXT) \ - sha512sum$(EXEEXT) shred$(EXEEXT) shuf$(EXEEXT) sleep$(EXEEXT) \ - sort$(EXEEXT) split$(EXEEXT) stat$(EXEEXT) sum$(EXEEXT) \ - sync$(EXEEXT) tac$(EXEEXT) tail$(EXEEXT) tee$(EXEEXT) \ - test$(EXEEXT) timeout$(EXEEXT) touch$(EXEEXT) tr$(EXEEXT) \ - true$(EXEEXT) truncate$(EXEEXT) tsort$(EXEEXT) tty$(EXEEXT) \ - uname$(EXEEXT) unexpand$(EXEEXT) uniq$(EXEEXT) unlink$(EXEEXT) \ - vdir$(EXEEXT) wc$(EXEEXT) whoami$(EXEEXT) yes$(EXEEXT) -noinst_PROGRAMS = setuidgid$(EXEEXT) getlimits$(EXEEXT) -subdir = src -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/build-aux/depcomp $(noinst_HEADERS) -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/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 \ - $(top_srcdir)/m4/close-stream.m4 $(top_srcdir)/m4/close.m4 \ - $(top_srcdir)/m4/closedir.m4 $(top_srcdir)/m4/closein.m4 \ - $(top_srcdir)/m4/closeout.m4 $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/config-h.m4 $(top_srcdir)/m4/configmake.m4 \ - $(top_srcdir)/m4/ctype.m4 $(top_srcdir)/m4/cycle-check.m4 \ - $(top_srcdir)/m4/d-ino.m4 $(top_srcdir)/m4/d-type.m4 \ - $(top_srcdir)/m4/dirent-safer.m4 $(top_srcdir)/m4/dirent_h.m4 \ - $(top_srcdir)/m4/dirfd.m4 $(top_srcdir)/m4/dirname.m4 \ - $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup.m4 \ - $(top_srcdir)/m4/dup2.m4 $(top_srcdir)/m4/eealloc.m4 \ - $(top_srcdir)/m4/environ.m4 $(top_srcdir)/m4/errno_h.m4 \ - $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/euidaccess.m4 \ - $(top_srcdir)/m4/exponentd.m4 $(top_srcdir)/m4/exponentf.m4 \ - $(top_srcdir)/m4/exponentl.m4 $(top_srcdir)/m4/extensions.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/fd-reopen.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/freading.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/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 \ - $(top_srcdir)/m4/getgroups.m4 $(top_srcdir)/m4/gethostname.m4 \ - $(top_srcdir)/m4/gethrxtime.m4 $(top_srcdir)/m4/getline.m4 \ - $(top_srcdir)/m4/getloadavg.m4 $(top_srcdir)/m4/getlogin.m4 \ - $(top_srcdir)/m4/getndelim2.m4 $(top_srcdir)/m4/getopt.m4 \ - $(top_srcdir)/m4/getpagesize.m4 $(top_srcdir)/m4/getpass.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/gmp.m4 $(top_srcdir)/m4/gnu-make.m4 \ - $(top_srcdir)/m4/gnulib-common.m4 \ - $(top_srcdir)/m4/gnulib-comp.m4 \ - $(top_srcdir)/m4/group-member.m4 \ - $(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/host-os.m4 \ - $(top_srcdir)/m4/hostent.m4 $(top_srcdir)/m4/human.m4 \ - $(top_srcdir)/m4/i-ring.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/iconv_h.m4 $(top_srcdir)/m4/iconv_open.m4 \ - $(top_srcdir)/m4/idcache.m4 \ - $(top_srcdir)/m4/include-exclude-prog.m4 \ - $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inet_ntop.m4 \ - $(top_srcdir)/m4/inet_pton.m4 $(top_srcdir)/m4/inline.m4 \ - $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intmax_t.m4 \ - $(top_srcdir)/m4/inttostr.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ - $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ - $(top_srcdir)/m4/ioctl.m4 $(top_srcdir)/m4/isapipe.m4 \ - $(top_srcdir)/m4/isatty.m4 $(top_srcdir)/m4/isblank.m4 \ - $(top_srcdir)/m4/isnand.m4 $(top_srcdir)/m4/isnanf.m4 \ - $(top_srcdir)/m4/isnanl.m4 $(top_srcdir)/m4/iswblank.m4 \ - $(top_srcdir)/m4/jm-macros.m4 $(top_srcdir)/m4/jm-winsz1.m4 \ - $(top_srcdir)/m4/jm-winsz2.m4 $(top_srcdir)/m4/langinfo_h.m4 \ - $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lchmod.m4 \ - $(top_srcdir)/m4/lchown.m4 $(top_srcdir)/m4/lcmessage.m4 \ - $(top_srcdir)/m4/ldexp.m4 $(top_srcdir)/m4/ldexpl.m4 \ - $(top_srcdir)/m4/lib-check.m4 $(top_srcdir)/m4/lib-ignore.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/libunistring-base.m4 \ - $(top_srcdir)/m4/link-follow.m4 $(top_srcdir)/m4/link.m4 \ - $(top_srcdir)/m4/linkat.m4 $(top_srcdir)/m4/localcharset.m4 \ - $(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \ - $(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \ - $(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localeconv.m4 \ - $(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \ - $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/ls-mntd-fs.m4 \ - $(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \ - $(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \ - $(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/math_h.m4 \ - $(top_srcdir)/m4/mbchar.m4 $(top_srcdir)/m4/mbiter.m4 \ - $(top_srcdir)/m4/mbrlen.m4 $(top_srcdir)/m4/mbrtowc.m4 \ - $(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbslen.m4 \ - $(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbswidth.m4 $(top_srcdir)/m4/mbtowc.m4 \ - $(top_srcdir)/m4/md5.m4 $(top_srcdir)/m4/memcasecmp.m4 \ - $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/memcoll.m4 \ - $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \ - $(top_srcdir)/m4/mgetgroups.m4 $(top_srcdir)/m4/mkancesdirs.m4 \ - $(top_srcdir)/m4/mkdir-p.m4 $(top_srcdir)/m4/mkdir.m4 \ - $(top_srcdir)/m4/mkfifo.m4 $(top_srcdir)/m4/mknod.m4 \ - $(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mktime.m4 \ - $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \ - $(top_srcdir)/m4/modechange.m4 $(top_srcdir)/m4/mountlist.m4 \ - $(top_srcdir)/m4/mpsort.m4 $(top_srcdir)/m4/msvc-inval.m4 \ - $(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \ - $(top_srcdir)/m4/nanosleep.m4 $(top_srcdir)/m4/netdb_h.m4 \ - $(top_srcdir)/m4/netinet_in_h.m4 \ - $(top_srcdir)/m4/nl_langinfo.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/nproc.m4 \ - $(top_srcdir)/m4/off_t.m4 $(top_srcdir)/m4/open.m4 \ - $(top_srcdir)/m4/openat.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/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/root-dev-ino.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/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/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/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 \ - $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stdbool.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/strcase.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/strings_h.m4 $(top_srcdir)/m4/strncat.m4 \ - $(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \ - $(top_srcdir)/m4/strnumcmp.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 \ - $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \ - $(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/sys_uio_h.m4 \ - $(top_srcdir)/m4/sys_utsname_h.m4 \ - $(top_srcdir)/m4/sys_wait_h.m4 $(top_srcdir)/m4/tempname.m4 \ - $(top_srcdir)/m4/termios_h.m4 $(top_srcdir)/m4/thread.m4 \ - $(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/time_h.m4 \ - $(top_srcdir)/m4/time_r.m4 $(top_srcdir)/m4/timer_time.m4 \ - $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tls.m4 \ - $(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/tzset.m4 \ - $(top_srcdir)/m4/uname.m4 $(top_srcdir)/m4/ungetc.m4 \ - $(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \ - $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink-busy.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/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/xfts.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)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/lib/config.h -CONFIG_CLEAN_FILES = -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 = @ -libver_a_AR = $(AR) $(ARFLAGS) -libver_a_LIBADD = -nodist_libver_a_OBJECTS = version.$(OBJEXT) -libver_a_OBJECTS = $(nodist_libver_a_OBJECTS) -am__EXEEXT_1 = arch$(EXEEXT) hostname$(EXEEXT) su$(EXEEXT) -am__EXEEXT_2 = chroot$(EXEEXT) df$(EXEEXT) hostid$(EXEEXT) \ - libstdbuf.so$(EXEEXT) nice$(EXEEXT) pinky$(EXEEXT) \ - stdbuf$(EXEEXT) stty$(EXEEXT) su$(EXEEXT) uptime$(EXEEXT) \ - users$(EXEEXT) who$(EXEEXT) -am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibexecdir)" -PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) $(pkglibexec_PROGRAMS) -am___OBJECTS = lbracket.$(OBJEXT) -__OBJECTS = $(am___OBJECTS) -am__DEPENDENCIES_1 = -am__DEPENDENCIES_2 = libver.a ../lib/libcoreutils.a \ - $(am__DEPENDENCIES_1) ../lib/libcoreutils.a -am__DEPENDENCIES_3 = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) -__DEPENDENCIES = $(am__DEPENDENCIES_3) -am_arch_OBJECTS = uname.$(OBJEXT) uname-arch.$(OBJEXT) -arch_OBJECTS = $(am_arch_OBJECTS) -arch_DEPENDENCIES = $(am__DEPENDENCIES_2) -base64_SOURCES = base64.c -base64_OBJECTS = base64.$(OBJEXT) -base64_DEPENDENCIES = $(am__DEPENDENCIES_2) -basename_SOURCES = basename.c -basename_OBJECTS = basename.$(OBJEXT) -basename_DEPENDENCIES = $(am__DEPENDENCIES_2) -cat_SOURCES = cat.c -cat_OBJECTS = cat.$(OBJEXT) -cat_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) -chcon_SOURCES = chcon.c -chcon_OBJECTS = chcon.$(OBJEXT) -chcon_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) -am_chgrp_OBJECTS = chgrp.$(OBJEXT) chown-core.$(OBJEXT) -chgrp_OBJECTS = $(am_chgrp_OBJECTS) -chgrp_DEPENDENCIES = $(am__DEPENDENCIES_2) -chmod_SOURCES = chmod.c -chmod_OBJECTS = chmod.$(OBJEXT) -chmod_DEPENDENCIES = $(am__DEPENDENCIES_2) -am_chown_OBJECTS = chown.$(OBJEXT) chown-core.$(OBJEXT) -chown_OBJECTS = $(am_chown_OBJECTS) -chown_DEPENDENCIES = $(am__DEPENDENCIES_2) -chroot_SOURCES = chroot.c -chroot_OBJECTS = chroot.$(OBJEXT) -chroot_DEPENDENCIES = $(am__DEPENDENCIES_2) -cksum_SOURCES = cksum.c -cksum_OBJECTS = cksum.$(OBJEXT) -cksum_DEPENDENCIES = $(am__DEPENDENCIES_2) -comm_SOURCES = comm.c -comm_OBJECTS = comm.$(OBJEXT) -comm_DEPENDENCIES = $(am__DEPENDENCIES_2) -am__objects_1 = copy.$(OBJEXT) cp-hash.$(OBJEXT) extent-scan.$(OBJEXT) -am_cp_OBJECTS = cp.$(OBJEXT) $(am__objects_1) -cp_OBJECTS = $(am_cp_OBJECTS) -am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) -cp_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_4) \ - $(am__DEPENDENCIES_1) -csplit_SOURCES = csplit.c -csplit_OBJECTS = csplit.$(OBJEXT) -csplit_DEPENDENCIES = $(am__DEPENDENCIES_2) -cut_SOURCES = cut.c -cut_OBJECTS = cut.$(OBJEXT) -cut_DEPENDENCIES = $(am__DEPENDENCIES_2) -date_SOURCES = date.c -date_OBJECTS = date.$(OBJEXT) -date_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) -dd_SOURCES = dd.c -dd_OBJECTS = dd.$(OBJEXT) -dd_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) -am_df_OBJECTS = df.$(OBJEXT) find-mount-point.$(OBJEXT) -df_OBJECTS = $(am_df_OBJECTS) -df_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) -am_dir_OBJECTS = ls.$(OBJEXT) ls-dir.$(OBJEXT) -dir_OBJECTS = $(am_dir_OBJECTS) -am__DEPENDENCIES_5 = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) -dir_DEPENDENCIES = $(am__DEPENDENCIES_5) -dircolors_SOURCES = dircolors.c -dircolors_OBJECTS = dircolors.$(OBJEXT) -dircolors_DEPENDENCIES = $(am__DEPENDENCIES_2) -dirname_SOURCES = dirname.c -dirname_OBJECTS = dirname.$(OBJEXT) -dirname_DEPENDENCIES = $(am__DEPENDENCIES_2) -du_SOURCES = du.c -du_OBJECTS = du.$(OBJEXT) -du_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) -echo_SOURCES = echo.c -echo_OBJECTS = echo.$(OBJEXT) -echo_DEPENDENCIES = $(am__DEPENDENCIES_2) -env_SOURCES = env.c -env_OBJECTS = env.$(OBJEXT) -env_DEPENDENCIES = $(am__DEPENDENCIES_2) -expand_SOURCES = expand.c -expand_OBJECTS = expand.$(OBJEXT) -expand_DEPENDENCIES = $(am__DEPENDENCIES_2) -expr_SOURCES = expr.c -expr_OBJECTS = expr.$(OBJEXT) -expr_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) -factor_SOURCES = factor.c -factor_OBJECTS = factor.$(OBJEXT) -factor_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) -false_SOURCES = false.c -false_OBJECTS = false.$(OBJEXT) -false_DEPENDENCIES = $(am__DEPENDENCIES_2) -fmt_SOURCES = fmt.c -fmt_OBJECTS = fmt.$(OBJEXT) -fmt_DEPENDENCIES = $(am__DEPENDENCIES_2) -fold_SOURCES = fold.c -fold_OBJECTS = fold.$(OBJEXT) -fold_DEPENDENCIES = $(am__DEPENDENCIES_2) -getlimits_SOURCES = getlimits.c -getlimits_OBJECTS = getlimits.$(OBJEXT) -getlimits_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) -am__objects_2 = ginstall-copy.$(OBJEXT) ginstall-cp-hash.$(OBJEXT) \ - ginstall-extent-scan.$(OBJEXT) -am_ginstall_OBJECTS = ginstall-install.$(OBJEXT) \ - ginstall-prog-fprintf.$(OBJEXT) $(am__objects_2) -ginstall_OBJECTS = $(am_ginstall_OBJECTS) -ginstall_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_4) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -am_groups_OBJECTS = groups.$(OBJEXT) group-list.$(OBJEXT) -groups_OBJECTS = $(am_groups_OBJECTS) -groups_DEPENDENCIES = $(am__DEPENDENCIES_2) -head_SOURCES = head.c -head_OBJECTS = head.$(OBJEXT) -head_DEPENDENCIES = $(am__DEPENDENCIES_2) -hostid_SOURCES = hostid.c -hostid_OBJECTS = hostid.$(OBJEXT) -hostid_DEPENDENCIES = $(am__DEPENDENCIES_2) -hostname_SOURCES = hostname.c -hostname_OBJECTS = hostname.$(OBJEXT) -hostname_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) -am_id_OBJECTS = id.$(OBJEXT) group-list.$(OBJEXT) -id_OBJECTS = $(am_id_OBJECTS) -id_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) -join_SOURCES = join.c -join_OBJECTS = join.$(OBJEXT) -join_DEPENDENCIES = $(am__DEPENDENCIES_2) -am_kill_OBJECTS = kill.$(OBJEXT) operand2sig.$(OBJEXT) -kill_OBJECTS = $(am_kill_OBJECTS) -kill_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) -libstdbuf_so_SOURCES = libstdbuf.c -libstdbuf_so_OBJECTS = libstdbuf_so-libstdbuf.$(OBJEXT) -libstdbuf_so_DEPENDENCIES = -libstdbuf_so_LINK = $(CCLD) $(libstdbuf_so_CFLAGS) $(CFLAGS) \ - $(libstdbuf_so_LDFLAGS) $(LDFLAGS) -o $@ -link_SOURCES = link.c -link_OBJECTS = link.$(OBJEXT) -link_DEPENDENCIES = $(am__DEPENDENCIES_2) -am_ln_OBJECTS = ln.$(OBJEXT) relpath.$(OBJEXT) -ln_OBJECTS = $(am_ln_OBJECTS) -ln_DEPENDENCIES = $(am__DEPENDENCIES_2) -logname_SOURCES = logname.c -logname_OBJECTS = logname.$(OBJEXT) -logname_DEPENDENCIES = $(am__DEPENDENCIES_2) -am_ls_OBJECTS = ls.$(OBJEXT) ls-ls.$(OBJEXT) -ls_OBJECTS = $(am_ls_OBJECTS) -ls_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) -md5sum_SOURCES = md5sum.c -md5sum_OBJECTS = md5sum-md5sum.$(OBJEXT) -md5sum_DEPENDENCIES = $(am__DEPENDENCIES_2) -am_mkdir_OBJECTS = mkdir.$(OBJEXT) prog-fprintf.$(OBJEXT) -mkdir_OBJECTS = $(am_mkdir_OBJECTS) -mkdir_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) -mkfifo_SOURCES = mkfifo.c -mkfifo_OBJECTS = mkfifo.$(OBJEXT) -mkfifo_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) -mknod_SOURCES = mknod.c -mknod_OBJECTS = mknod.$(OBJEXT) -mknod_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) -mktemp_SOURCES = mktemp.c -mktemp_OBJECTS = mktemp.$(OBJEXT) -mktemp_DEPENDENCIES = $(am__DEPENDENCIES_2) -am_mv_OBJECTS = mv.$(OBJEXT) remove.$(OBJEXT) $(am__objects_1) -mv_OBJECTS = $(am_mv_OBJECTS) -am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1) -mv_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_4) \ - $(am__DEPENDENCIES_6) -nice_SOURCES = nice.c -nice_OBJECTS = nice.$(OBJEXT) -nice_DEPENDENCIES = $(am__DEPENDENCIES_2) -nl_SOURCES = nl.c -nl_OBJECTS = nl.$(OBJEXT) -nl_DEPENDENCIES = $(am__DEPENDENCIES_2) -nohup_SOURCES = nohup.c -nohup_OBJECTS = nohup.$(OBJEXT) -nohup_DEPENDENCIES = $(am__DEPENDENCIES_2) -nproc_SOURCES = nproc.c -nproc_OBJECTS = nproc.$(OBJEXT) -nproc_DEPENDENCIES = $(am__DEPENDENCIES_2) -od_SOURCES = od.c -od_OBJECTS = od.$(OBJEXT) -od_DEPENDENCIES = $(am__DEPENDENCIES_2) -paste_SOURCES = paste.c -paste_OBJECTS = paste.$(OBJEXT) -paste_DEPENDENCIES = $(am__DEPENDENCIES_2) -pathchk_SOURCES = pathchk.c -pathchk_OBJECTS = pathchk.$(OBJEXT) -pathchk_DEPENDENCIES = $(am__DEPENDENCIES_2) -pinky_SOURCES = pinky.c -pinky_OBJECTS = pinky.$(OBJEXT) -pinky_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) -pr_SOURCES = pr.c -pr_OBJECTS = pr.$(OBJEXT) -pr_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) -printenv_SOURCES = printenv.c -printenv_OBJECTS = printenv.$(OBJEXT) -printenv_DEPENDENCIES = $(am__DEPENDENCIES_2) -printf_SOURCES = printf.c -printf_OBJECTS = printf.$(OBJEXT) -printf_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) -ptx_SOURCES = ptx.c -ptx_OBJECTS = ptx.$(OBJEXT) -ptx_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) -pwd_SOURCES = pwd.c -pwd_OBJECTS = pwd.$(OBJEXT) -pwd_DEPENDENCIES = $(am__DEPENDENCIES_2) -readlink_SOURCES = readlink.c -readlink_OBJECTS = readlink.$(OBJEXT) -readlink_DEPENDENCIES = $(am__DEPENDENCIES_2) -am_realpath_OBJECTS = realpath.$(OBJEXT) relpath.$(OBJEXT) -realpath_OBJECTS = $(am_realpath_OBJECTS) -realpath_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) -am_rm_OBJECTS = rm.$(OBJEXT) remove.$(OBJEXT) -rm_OBJECTS = $(am_rm_OBJECTS) -rm_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_6) -am_rmdir_OBJECTS = rmdir.$(OBJEXT) prog-fprintf.$(OBJEXT) -rmdir_OBJECTS = $(am_rmdir_OBJECTS) -rmdir_DEPENDENCIES = $(am__DEPENDENCIES_2) -runcon_SOURCES = runcon.c -runcon_OBJECTS = runcon.$(OBJEXT) -runcon_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) -seq_SOURCES = seq.c -seq_OBJECTS = seq.$(OBJEXT) -seq_DEPENDENCIES = $(am__DEPENDENCIES_2) -setuidgid_SOURCES = setuidgid.c -setuidgid_OBJECTS = setuidgid.$(OBJEXT) -setuidgid_DEPENDENCIES = $(am__DEPENDENCIES_2) -am_sha1sum_OBJECTS = sha1sum-md5sum.$(OBJEXT) -sha1sum_OBJECTS = $(am_sha1sum_OBJECTS) -sha1sum_DEPENDENCIES = $(am__DEPENDENCIES_2) -am_sha224sum_OBJECTS = sha224sum-md5sum.$(OBJEXT) -sha224sum_OBJECTS = $(am_sha224sum_OBJECTS) -sha224sum_DEPENDENCIES = $(am__DEPENDENCIES_2) -am_sha256sum_OBJECTS = sha256sum-md5sum.$(OBJEXT) -sha256sum_OBJECTS = $(am_sha256sum_OBJECTS) -sha256sum_DEPENDENCIES = $(am__DEPENDENCIES_2) -am_sha384sum_OBJECTS = sha384sum-md5sum.$(OBJEXT) -sha384sum_OBJECTS = $(am_sha384sum_OBJECTS) -sha384sum_DEPENDENCIES = $(am__DEPENDENCIES_2) -am_sha512sum_OBJECTS = sha512sum-md5sum.$(OBJEXT) -sha512sum_OBJECTS = $(am_sha512sum_OBJECTS) -sha512sum_DEPENDENCIES = $(am__DEPENDENCIES_2) -shred_SOURCES = shred.c -shred_OBJECTS = shred.$(OBJEXT) -shred_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) -shuf_SOURCES = shuf.c -shuf_OBJECTS = shuf.$(OBJEXT) -shuf_DEPENDENCIES = $(am__DEPENDENCIES_2) -sleep_SOURCES = sleep.c -sleep_OBJECTS = sleep.$(OBJEXT) -sleep_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) -sort_SOURCES = sort.c -sort_OBJECTS = sort.$(OBJEXT) -sort_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) -split_SOURCES = split.c -split_OBJECTS = split.$(OBJEXT) -split_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) -am_stat_OBJECTS = stat.$(OBJEXT) find-mount-point.$(OBJEXT) -stat_OBJECTS = $(am_stat_OBJECTS) -stat_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) -stdbuf_SOURCES = stdbuf.c -stdbuf_OBJECTS = stdbuf.$(OBJEXT) -stdbuf_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) -stty_SOURCES = stty.c -stty_OBJECTS = stty.$(OBJEXT) -stty_DEPENDENCIES = $(am__DEPENDENCIES_2) -su_SOURCES = su.c -su_OBJECTS = su.$(OBJEXT) -su_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) -sum_SOURCES = sum.c -sum_OBJECTS = sum.$(OBJEXT) -sum_DEPENDENCIES = $(am__DEPENDENCIES_2) -sync_SOURCES = sync.c -sync_OBJECTS = sync.$(OBJEXT) -sync_DEPENDENCIES = $(am__DEPENDENCIES_2) -tac_SOURCES = tac.c -tac_OBJECTS = tac.$(OBJEXT) -tac_DEPENDENCIES = $(am__DEPENDENCIES_2) -tail_SOURCES = tail.c -tail_OBJECTS = tail.$(OBJEXT) -tail_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) -tee_SOURCES = tee.c -tee_OBJECTS = tee.$(OBJEXT) -tee_DEPENDENCIES = $(am__DEPENDENCIES_2) -test_SOURCES = test.c -test_OBJECTS = test.$(OBJEXT) -test_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) -am_timeout_OBJECTS = timeout.$(OBJEXT) operand2sig.$(OBJEXT) -timeout_OBJECTS = $(am_timeout_OBJECTS) -timeout_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) -touch_SOURCES = touch.c -touch_OBJECTS = touch.$(OBJEXT) -touch_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) -tr_SOURCES = tr.c -tr_OBJECTS = tr.$(OBJEXT) -tr_DEPENDENCIES = $(am__DEPENDENCIES_2) -true_SOURCES = true.c -true_OBJECTS = true.$(OBJEXT) -true_DEPENDENCIES = $(am__DEPENDENCIES_2) -truncate_SOURCES = truncate.c -truncate_OBJECTS = truncate.$(OBJEXT) -truncate_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) -tsort_SOURCES = tsort.c -tsort_OBJECTS = tsort.$(OBJEXT) -tsort_DEPENDENCIES = $(am__DEPENDENCIES_2) -tty_SOURCES = tty.c -tty_OBJECTS = tty.$(OBJEXT) -tty_DEPENDENCIES = $(am__DEPENDENCIES_2) -am_uname_OBJECTS = uname.$(OBJEXT) uname-uname.$(OBJEXT) -uname_OBJECTS = $(am_uname_OBJECTS) -uname_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) -unexpand_SOURCES = unexpand.c -unexpand_OBJECTS = unexpand.$(OBJEXT) -unexpand_DEPENDENCIES = $(am__DEPENDENCIES_2) -uniq_SOURCES = uniq.c -uniq_OBJECTS = uniq.$(OBJEXT) -uniq_DEPENDENCIES = $(am__DEPENDENCIES_2) -unlink_SOURCES = unlink.c -unlink_OBJECTS = unlink.$(OBJEXT) -unlink_DEPENDENCIES = $(am__DEPENDENCIES_2) -uptime_SOURCES = uptime.c -uptime_OBJECTS = uptime.$(OBJEXT) -uptime_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) -users_SOURCES = users.c -users_OBJECTS = users.$(OBJEXT) -users_DEPENDENCIES = $(am__DEPENDENCIES_2) -am_vdir_OBJECTS = ls.$(OBJEXT) ls-vdir.$(OBJEXT) -vdir_OBJECTS = $(am_vdir_OBJECTS) -vdir_DEPENDENCIES = $(am__DEPENDENCIES_5) -wc_SOURCES = wc.c -wc_OBJECTS = wc.$(OBJEXT) -wc_DEPENDENCIES = $(am__DEPENDENCIES_2) -who_SOURCES = who.c -who_OBJECTS = who.$(OBJEXT) -who_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) -whoami_SOURCES = whoami.c -whoami_OBJECTS = whoami.$(OBJEXT) -whoami_DEPENDENCIES = $(am__DEPENDENCIES_2) -yes_SOURCES = yes.c -yes_OBJECTS = yes.$(OBJEXT) -yes_DEPENDENCIES = $(am__DEPENDENCIES_2) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/lib -depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp -am__depfiles_maybe = depfiles -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 -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 " $@; -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 " $@; -SOURCES = $(nodist_libver_a_SOURCES) $(__SOURCES) $(arch_SOURCES) \ - base64.c basename.c cat.c chcon.c $(chgrp_SOURCES) chmod.c \ - $(chown_SOURCES) chroot.c cksum.c comm.c $(cp_SOURCES) \ - csplit.c cut.c date.c dd.c $(df_SOURCES) $(dir_SOURCES) \ - dircolors.c dirname.c du.c echo.c env.c expand.c expr.c \ - factor.c false.c fmt.c fold.c getlimits.c $(ginstall_SOURCES) \ - $(groups_SOURCES) head.c hostid.c hostname.c $(id_SOURCES) \ - join.c $(kill_SOURCES) libstdbuf.c link.c $(ln_SOURCES) \ - logname.c $(ls_SOURCES) md5sum.c $(mkdir_SOURCES) mkfifo.c \ - mknod.c mktemp.c $(mv_SOURCES) nice.c nl.c nohup.c nproc.c \ - od.c paste.c pathchk.c pinky.c pr.c printenv.c printf.c ptx.c \ - pwd.c readlink.c $(realpath_SOURCES) $(rm_SOURCES) \ - $(rmdir_SOURCES) runcon.c seq.c setuidgid.c $(sha1sum_SOURCES) \ - $(sha224sum_SOURCES) $(sha256sum_SOURCES) $(sha384sum_SOURCES) \ - $(sha512sum_SOURCES) shred.c shuf.c sleep.c sort.c split.c \ - $(stat_SOURCES) stdbuf.c stty.c su.c sum.c sync.c tac.c tail.c \ - tee.c test.c $(timeout_SOURCES) touch.c tr.c true.c truncate.c \ - tsort.c tty.c $(uname_SOURCES) unexpand.c uniq.c unlink.c \ - uptime.c users.c $(vdir_SOURCES) wc.c who.c whoami.c yes.c -DIST_SOURCES = $(__SOURCES) $(arch_SOURCES) base64.c basename.c cat.c \ - chcon.c $(chgrp_SOURCES) chmod.c $(chown_SOURCES) chroot.c \ - cksum.c comm.c $(cp_SOURCES) csplit.c cut.c date.c dd.c \ - $(df_SOURCES) $(dir_SOURCES) dircolors.c dirname.c du.c echo.c \ - env.c expand.c expr.c factor.c false.c fmt.c fold.c \ - getlimits.c $(ginstall_SOURCES) $(groups_SOURCES) head.c \ - hostid.c hostname.c $(id_SOURCES) join.c $(kill_SOURCES) \ - libstdbuf.c link.c $(ln_SOURCES) logname.c $(ls_SOURCES) \ - md5sum.c $(mkdir_SOURCES) mkfifo.c mknod.c mktemp.c \ - $(mv_SOURCES) nice.c nl.c nohup.c nproc.c od.c paste.c \ - pathchk.c pinky.c pr.c printenv.c printf.c ptx.c pwd.c \ - readlink.c $(realpath_SOURCES) $(rm_SOURCES) $(rmdir_SOURCES) \ - runcon.c seq.c setuidgid.c $(sha1sum_SOURCES) \ - $(sha224sum_SOURCES) $(sha256sum_SOURCES) $(sha384sum_SOURCES) \ - $(sha512sum_SOURCES) shred.c shuf.c sleep.c sort.c split.c \ - $(stat_SOURCES) stdbuf.c stty.c su.c sum.c sync.c tac.c tail.c \ - tee.c test.c $(timeout_SOURCES) touch.c tr.c true.c truncate.c \ - tsort.c tty.c $(uname_SOURCES) unexpand.c uniq.c unlink.c \ - uptime.c users.c $(vdir_SOURCES) wc.c who.c whoami.c yes.c -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -HEADERS = $(noinst_HEADERS) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -pkglibexecdir = @pkglibexecdir@ - -# Use 'ginstall' in the definition of PROGRAMS and in dependencies to avoid -# confusion with the 'install' target. The install rule transforms 'ginstall' -# to install before applying any user-specified name transformations. -transform = s/ginstall/install/; $(program_transform_name) -ACLOCAL = @ACLOCAL@ -ALLOCA = @ALLOCA@ -ALLOCA_H = @ALLOCA_H@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ -AR = @AR@ -ARFLAGS = @ARFLAGS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BITSIZEOF_PTRDIFF_T = @BITSIZEOF_PTRDIFF_T@ -BITSIZEOF_SIG_ATOMIC_T = @BITSIZEOF_SIG_ATOMIC_T@ -BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@ -BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@ -BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CONFIG_INCLUDE = @CONFIG_INCLUDE@ -CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFAULT_POSIX2_VERSION = @DEFAULT_POSIX2_VERSION@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EMULTIHOP_HIDDEN = @EMULTIHOP_HIDDEN@ -EMULTIHOP_VALUE = @EMULTIHOP_VALUE@ -ENOLINK_HIDDEN = @ENOLINK_HIDDEN@ -ENOLINK_VALUE = @ENOLINK_VALUE@ -EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ -EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ -ERRNO_H = @ERRNO_H@ -EXEEXT = @EXEEXT@ -FLOAT_H = @FLOAT_H@ -FNMATCH_H = @FNMATCH_H@ -GETADDRINFO_LIB = @GETADDRINFO_LIB@ -GETHOSTNAME_LIB = @GETHOSTNAME_LIB@ -GETLOADAVG_LIBS = @GETLOADAVG_LIBS@ -GETOPT_H = @GETOPT_H@ -GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ -GLIBC21 = @GLIBC21@ -GMSGFMT = @GMSGFMT@ -GMSGFMT_015 = @GMSGFMT_015@ -GNULIB_ACCEPT = @GNULIB_ACCEPT@ -GNULIB_ACCEPT4 = @GNULIB_ACCEPT4@ -GNULIB_ACOSF = @GNULIB_ACOSF@ -GNULIB_ACOSL = @GNULIB_ACOSL@ -GNULIB_ALPHASORT = @GNULIB_ALPHASORT@ -GNULIB_ASINF = @GNULIB_ASINF@ -GNULIB_ASINL = @GNULIB_ASINL@ -GNULIB_ATAN2F = @GNULIB_ATAN2F@ -GNULIB_ATANF = @GNULIB_ATANF@ -GNULIB_ATANL = @GNULIB_ATANL@ -GNULIB_ATOLL = @GNULIB_ATOLL@ -GNULIB_BIND = @GNULIB_BIND@ -GNULIB_BTOWC = @GNULIB_BTOWC@ -GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@ -GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@ -GNULIB_CBRT = @GNULIB_CBRT@ -GNULIB_CBRTF = @GNULIB_CBRTF@ -GNULIB_CBRTL = @GNULIB_CBRTL@ -GNULIB_CEIL = @GNULIB_CEIL@ -GNULIB_CEILF = @GNULIB_CEILF@ -GNULIB_CEILL = @GNULIB_CEILL@ -GNULIB_CHDIR = @GNULIB_CHDIR@ -GNULIB_CHOWN = @GNULIB_CHOWN@ -GNULIB_CLOSE = @GNULIB_CLOSE@ -GNULIB_CLOSEDIR = @GNULIB_CLOSEDIR@ -GNULIB_CONNECT = @GNULIB_CONNECT@ -GNULIB_COPYSIGN = @GNULIB_COPYSIGN@ -GNULIB_COPYSIGNF = @GNULIB_COPYSIGNF@ -GNULIB_COPYSIGNL = @GNULIB_COPYSIGNL@ -GNULIB_COSF = @GNULIB_COSF@ -GNULIB_COSHF = @GNULIB_COSHF@ -GNULIB_COSL = @GNULIB_COSL@ -GNULIB_DIRFD = @GNULIB_DIRFD@ -GNULIB_DPRINTF = @GNULIB_DPRINTF@ -GNULIB_DUP = @GNULIB_DUP@ -GNULIB_DUP2 = @GNULIB_DUP2@ -GNULIB_DUP3 = @GNULIB_DUP3@ -GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@ -GNULIB_ENVIRON = @GNULIB_ENVIRON@ -GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@ -GNULIB_EXP2 = @GNULIB_EXP2@ -GNULIB_EXP2F = @GNULIB_EXP2F@ -GNULIB_EXP2L = @GNULIB_EXP2L@ -GNULIB_EXPF = @GNULIB_EXPF@ -GNULIB_EXPL = @GNULIB_EXPL@ -GNULIB_EXPM1 = @GNULIB_EXPM1@ -GNULIB_EXPM1F = @GNULIB_EXPM1F@ -GNULIB_EXPM1L = @GNULIB_EXPM1L@ -GNULIB_FABSF = @GNULIB_FABSF@ -GNULIB_FABSL = @GNULIB_FABSL@ -GNULIB_FACCESSAT = @GNULIB_FACCESSAT@ -GNULIB_FCHDIR = @GNULIB_FCHDIR@ -GNULIB_FCHMODAT = @GNULIB_FCHMODAT@ -GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@ -GNULIB_FCLOSE = @GNULIB_FCLOSE@ -GNULIB_FCNTL = @GNULIB_FCNTL@ -GNULIB_FDATASYNC = @GNULIB_FDATASYNC@ -GNULIB_FDOPEN = @GNULIB_FDOPEN@ -GNULIB_FDOPENDIR = @GNULIB_FDOPENDIR@ -GNULIB_FFLUSH = @GNULIB_FFLUSH@ -GNULIB_FFS = @GNULIB_FFS@ -GNULIB_FFSL = @GNULIB_FFSL@ -GNULIB_FFSLL = @GNULIB_FFSLL@ -GNULIB_FGETC = @GNULIB_FGETC@ -GNULIB_FGETS = @GNULIB_FGETS@ -GNULIB_FLOOR = @GNULIB_FLOOR@ -GNULIB_FLOORF = @GNULIB_FLOORF@ -GNULIB_FLOORL = @GNULIB_FLOORL@ -GNULIB_FMA = @GNULIB_FMA@ -GNULIB_FMAF = @GNULIB_FMAF@ -GNULIB_FMAL = @GNULIB_FMAL@ -GNULIB_FMOD = @GNULIB_FMOD@ -GNULIB_FMODF = @GNULIB_FMODF@ -GNULIB_FMODL = @GNULIB_FMODL@ -GNULIB_FOPEN = @GNULIB_FOPEN@ -GNULIB_FPRINTF = @GNULIB_FPRINTF@ -GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@ -GNULIB_FPURGE = @GNULIB_FPURGE@ -GNULIB_FPUTC = @GNULIB_FPUTC@ -GNULIB_FPUTS = @GNULIB_FPUTS@ -GNULIB_FREAD = @GNULIB_FREAD@ -GNULIB_FREOPEN = @GNULIB_FREOPEN@ -GNULIB_FREXP = @GNULIB_FREXP@ -GNULIB_FREXPF = @GNULIB_FREXPF@ -GNULIB_FREXPL = @GNULIB_FREXPL@ -GNULIB_FSCANF = @GNULIB_FSCANF@ -GNULIB_FSEEK = @GNULIB_FSEEK@ -GNULIB_FSEEKO = @GNULIB_FSEEKO@ -GNULIB_FSTAT = @GNULIB_FSTAT@ -GNULIB_FSTATAT = @GNULIB_FSTATAT@ -GNULIB_FSYNC = @GNULIB_FSYNC@ -GNULIB_FTELL = @GNULIB_FTELL@ -GNULIB_FTELLO = @GNULIB_FTELLO@ -GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@ -GNULIB_FUTIMENS = @GNULIB_FUTIMENS@ -GNULIB_FWRITE = @GNULIB_FWRITE@ -GNULIB_GETADDRINFO = @GNULIB_GETADDRINFO@ -GNULIB_GETC = @GNULIB_GETC@ -GNULIB_GETCHAR = @GNULIB_GETCHAR@ -GNULIB_GETCWD = @GNULIB_GETCWD@ -GNULIB_GETDELIM = @GNULIB_GETDELIM@ -GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@ -GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@ -GNULIB_GETGROUPS = @GNULIB_GETGROUPS@ -GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@ -GNULIB_GETLINE = @GNULIB_GETLINE@ -GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@ -GNULIB_GETLOGIN = @GNULIB_GETLOGIN@ -GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ -GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ -GNULIB_GETPEERNAME = @GNULIB_GETPEERNAME@ -GNULIB_GETRUSAGE = @GNULIB_GETRUSAGE@ -GNULIB_GETSOCKNAME = @GNULIB_GETSOCKNAME@ -GNULIB_GETSOCKOPT = @GNULIB_GETSOCKOPT@ -GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@ -GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ -GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ -GNULIB_GL_UNISTD_H_GETOPT = @GNULIB_GL_UNISTD_H_GETOPT@ -GNULIB_GRANTPT = @GNULIB_GRANTPT@ -GNULIB_GROUP_MEMBER = @GNULIB_GROUP_MEMBER@ -GNULIB_HYPOT = @GNULIB_HYPOT@ -GNULIB_HYPOTF = @GNULIB_HYPOTF@ -GNULIB_HYPOTL = @GNULIB_HYPOTL@ -GNULIB_ICONV = @GNULIB_ICONV@ -GNULIB_ILOGB = @GNULIB_ILOGB@ -GNULIB_ILOGBF = @GNULIB_ILOGBF@ -GNULIB_ILOGBL = @GNULIB_ILOGBL@ -GNULIB_IMAXABS = @GNULIB_IMAXABS@ -GNULIB_IMAXDIV = @GNULIB_IMAXDIV@ -GNULIB_INET_NTOP = @GNULIB_INET_NTOP@ -GNULIB_INET_PTON = @GNULIB_INET_PTON@ -GNULIB_IOCTL = @GNULIB_IOCTL@ -GNULIB_ISATTY = @GNULIB_ISATTY@ -GNULIB_ISBLANK = @GNULIB_ISBLANK@ -GNULIB_ISFINITE = @GNULIB_ISFINITE@ -GNULIB_ISINF = @GNULIB_ISINF@ -GNULIB_ISNAN = @GNULIB_ISNAN@ -GNULIB_ISNAND = @GNULIB_ISNAND@ -GNULIB_ISNANF = @GNULIB_ISNANF@ -GNULIB_ISNANL = @GNULIB_ISNANL@ -GNULIB_ISWBLANK = @GNULIB_ISWBLANK@ -GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@ -GNULIB_LCHMOD = @GNULIB_LCHMOD@ -GNULIB_LCHOWN = @GNULIB_LCHOWN@ -GNULIB_LDEXPF = @GNULIB_LDEXPF@ -GNULIB_LDEXPL = @GNULIB_LDEXPL@ -GNULIB_LINK = @GNULIB_LINK@ -GNULIB_LINKAT = @GNULIB_LINKAT@ -GNULIB_LISTEN = @GNULIB_LISTEN@ -GNULIB_LOCALECONV = @GNULIB_LOCALECONV@ -GNULIB_LOG = @GNULIB_LOG@ -GNULIB_LOG10 = @GNULIB_LOG10@ -GNULIB_LOG10F = @GNULIB_LOG10F@ -GNULIB_LOG10L = @GNULIB_LOG10L@ -GNULIB_LOG1P = @GNULIB_LOG1P@ -GNULIB_LOG1PF = @GNULIB_LOG1PF@ -GNULIB_LOG1PL = @GNULIB_LOG1PL@ -GNULIB_LOG2 = @GNULIB_LOG2@ -GNULIB_LOG2F = @GNULIB_LOG2F@ -GNULIB_LOG2L = @GNULIB_LOG2L@ -GNULIB_LOGB = @GNULIB_LOGB@ -GNULIB_LOGBF = @GNULIB_LOGBF@ -GNULIB_LOGBL = @GNULIB_LOGBL@ -GNULIB_LOGF = @GNULIB_LOGF@ -GNULIB_LOGL = @GNULIB_LOGL@ -GNULIB_LSEEK = @GNULIB_LSEEK@ -GNULIB_LSTAT = @GNULIB_LSTAT@ -GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ -GNULIB_MBRLEN = @GNULIB_MBRLEN@ -GNULIB_MBRTOWC = @GNULIB_MBRTOWC@ -GNULIB_MBSCASECMP = @GNULIB_MBSCASECMP@ -GNULIB_MBSCASESTR = @GNULIB_MBSCASESTR@ -GNULIB_MBSCHR = @GNULIB_MBSCHR@ -GNULIB_MBSCSPN = @GNULIB_MBSCSPN@ -GNULIB_MBSINIT = @GNULIB_MBSINIT@ -GNULIB_MBSLEN = @GNULIB_MBSLEN@ -GNULIB_MBSNCASECMP = @GNULIB_MBSNCASECMP@ -GNULIB_MBSNLEN = @GNULIB_MBSNLEN@ -GNULIB_MBSNRTOWCS = @GNULIB_MBSNRTOWCS@ -GNULIB_MBSPBRK = @GNULIB_MBSPBRK@ -GNULIB_MBSPCASECMP = @GNULIB_MBSPCASECMP@ -GNULIB_MBSRCHR = @GNULIB_MBSRCHR@ -GNULIB_MBSRTOWCS = @GNULIB_MBSRTOWCS@ -GNULIB_MBSSEP = @GNULIB_MBSSEP@ -GNULIB_MBSSPN = @GNULIB_MBSSPN@ -GNULIB_MBSSTR = @GNULIB_MBSSTR@ -GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@ -GNULIB_MBTOWC = @GNULIB_MBTOWC@ -GNULIB_MEMCHR = @GNULIB_MEMCHR@ -GNULIB_MEMMEM = @GNULIB_MEMMEM@ -GNULIB_MEMPCPY = @GNULIB_MEMPCPY@ -GNULIB_MEMRCHR = @GNULIB_MEMRCHR@ -GNULIB_MKDIRAT = @GNULIB_MKDIRAT@ -GNULIB_MKDTEMP = @GNULIB_MKDTEMP@ -GNULIB_MKFIFO = @GNULIB_MKFIFO@ -GNULIB_MKFIFOAT = @GNULIB_MKFIFOAT@ -GNULIB_MKNOD = @GNULIB_MKNOD@ -GNULIB_MKNODAT = @GNULIB_MKNODAT@ -GNULIB_MKOSTEMP = @GNULIB_MKOSTEMP@ -GNULIB_MKOSTEMPS = @GNULIB_MKOSTEMPS@ -GNULIB_MKSTEMP = @GNULIB_MKSTEMP@ -GNULIB_MKSTEMPS = @GNULIB_MKSTEMPS@ -GNULIB_MKTIME = @GNULIB_MKTIME@ -GNULIB_MODF = @GNULIB_MODF@ -GNULIB_MODFF = @GNULIB_MODFF@ -GNULIB_MODFL = @GNULIB_MODFL@ -GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@ -GNULIB_NL_LANGINFO = @GNULIB_NL_LANGINFO@ -GNULIB_NONBLOCKING = @GNULIB_NONBLOCKING@ -GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@ -GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ -GNULIB_OPEN = @GNULIB_OPEN@ -GNULIB_OPENAT = @GNULIB_OPENAT@ -GNULIB_OPENDIR = @GNULIB_OPENDIR@ -GNULIB_PCLOSE = @GNULIB_PCLOSE@ -GNULIB_PERROR = @GNULIB_PERROR@ -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@ -GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@ -GNULIB_PSELECT = @GNULIB_PSELECT@ -GNULIB_PTHREAD_SIGMASK = @GNULIB_PTHREAD_SIGMASK@ -GNULIB_PTSNAME = @GNULIB_PTSNAME@ -GNULIB_PTSNAME_R = @GNULIB_PTSNAME_R@ -GNULIB_PUTC = @GNULIB_PUTC@ -GNULIB_PUTCHAR = @GNULIB_PUTCHAR@ -GNULIB_PUTENV = @GNULIB_PUTENV@ -GNULIB_PUTS = @GNULIB_PUTS@ -GNULIB_PWRITE = @GNULIB_PWRITE@ -GNULIB_RAISE = @GNULIB_RAISE@ -GNULIB_RANDOM = @GNULIB_RANDOM@ -GNULIB_RANDOM_R = @GNULIB_RANDOM_R@ -GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ -GNULIB_READ = @GNULIB_READ@ -GNULIB_READDIR = @GNULIB_READDIR@ -GNULIB_READLINK = @GNULIB_READLINK@ -GNULIB_READLINKAT = @GNULIB_READLINKAT@ -GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@ -GNULIB_REALPATH = @GNULIB_REALPATH@ -GNULIB_RECV = @GNULIB_RECV@ -GNULIB_RECVFROM = @GNULIB_RECVFROM@ -GNULIB_REMAINDER = @GNULIB_REMAINDER@ -GNULIB_REMAINDERF = @GNULIB_REMAINDERF@ -GNULIB_REMAINDERL = @GNULIB_REMAINDERL@ -GNULIB_REMOVE = @GNULIB_REMOVE@ -GNULIB_RENAME = @GNULIB_RENAME@ -GNULIB_RENAMEAT = @GNULIB_RENAMEAT@ -GNULIB_REWINDDIR = @GNULIB_REWINDDIR@ -GNULIB_RINT = @GNULIB_RINT@ -GNULIB_RINTF = @GNULIB_RINTF@ -GNULIB_RINTL = @GNULIB_RINTL@ -GNULIB_RMDIR = @GNULIB_RMDIR@ -GNULIB_ROUND = @GNULIB_ROUND@ -GNULIB_ROUNDF = @GNULIB_ROUNDF@ -GNULIB_ROUNDL = @GNULIB_ROUNDL@ -GNULIB_RPMATCH = @GNULIB_RPMATCH@ -GNULIB_SCANDIR = @GNULIB_SCANDIR@ -GNULIB_SCANF = @GNULIB_SCANF@ -GNULIB_SELECT = @GNULIB_SELECT@ -GNULIB_SEND = @GNULIB_SEND@ -GNULIB_SENDTO = @GNULIB_SENDTO@ -GNULIB_SETENV = @GNULIB_SETENV@ -GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@ -GNULIB_SETLOCALE = @GNULIB_SETLOCALE@ -GNULIB_SETSOCKOPT = @GNULIB_SETSOCKOPT@ -GNULIB_SHUTDOWN = @GNULIB_SHUTDOWN@ -GNULIB_SIGACTION = @GNULIB_SIGACTION@ -GNULIB_SIGNAL_H_SIGPIPE = @GNULIB_SIGNAL_H_SIGPIPE@ -GNULIB_SIGNBIT = @GNULIB_SIGNBIT@ -GNULIB_SIGPROCMASK = @GNULIB_SIGPROCMASK@ -GNULIB_SINF = @GNULIB_SINF@ -GNULIB_SINHF = @GNULIB_SINHF@ -GNULIB_SINL = @GNULIB_SINL@ -GNULIB_SLEEP = @GNULIB_SLEEP@ -GNULIB_SNPRINTF = @GNULIB_SNPRINTF@ -GNULIB_SOCKET = @GNULIB_SOCKET@ -GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@ -GNULIB_SQRTF = @GNULIB_SQRTF@ -GNULIB_SQRTL = @GNULIB_SQRTL@ -GNULIB_STAT = @GNULIB_STAT@ -GNULIB_STDIO_H_NONBLOCKING = @GNULIB_STDIO_H_NONBLOCKING@ -GNULIB_STDIO_H_SIGPIPE = @GNULIB_STDIO_H_SIGPIPE@ -GNULIB_STPCPY = @GNULIB_STPCPY@ -GNULIB_STPNCPY = @GNULIB_STPNCPY@ -GNULIB_STRCASESTR = @GNULIB_STRCASESTR@ -GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@ -GNULIB_STRDUP = @GNULIB_STRDUP@ -GNULIB_STRERROR = @GNULIB_STRERROR@ -GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ -GNULIB_STRNCAT = @GNULIB_STRNCAT@ -GNULIB_STRNDUP = @GNULIB_STRNDUP@ -GNULIB_STRNLEN = @GNULIB_STRNLEN@ -GNULIB_STRPBRK = @GNULIB_STRPBRK@ -GNULIB_STRPTIME = @GNULIB_STRPTIME@ -GNULIB_STRSEP = @GNULIB_STRSEP@ -GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@ -GNULIB_STRSTR = @GNULIB_STRSTR@ -GNULIB_STRTOD = @GNULIB_STRTOD@ -GNULIB_STRTOIMAX = @GNULIB_STRTOIMAX@ -GNULIB_STRTOK_R = @GNULIB_STRTOK_R@ -GNULIB_STRTOLL = @GNULIB_STRTOLL@ -GNULIB_STRTOULL = @GNULIB_STRTOULL@ -GNULIB_STRTOUMAX = @GNULIB_STRTOUMAX@ -GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@ -GNULIB_SYMLINK = @GNULIB_SYMLINK@ -GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@ -GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@ -GNULIB_TANF = @GNULIB_TANF@ -GNULIB_TANHF = @GNULIB_TANHF@ -GNULIB_TANL = @GNULIB_TANL@ -GNULIB_TCGETSID = @GNULIB_TCGETSID@ -GNULIB_TEST_WARN_CFLAGS = @GNULIB_TEST_WARN_CFLAGS@ -GNULIB_TIMEGM = @GNULIB_TIMEGM@ -GNULIB_TIME_R = @GNULIB_TIME_R@ -GNULIB_TMPFILE = @GNULIB_TMPFILE@ -GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@ -GNULIB_TRUNC = @GNULIB_TRUNC@ -GNULIB_TRUNCF = @GNULIB_TRUNCF@ -GNULIB_TRUNCL = @GNULIB_TRUNCL@ -GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@ -GNULIB_UNAME = @GNULIB_UNAME@ -GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@ -GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ -GNULIB_UNLINK = @GNULIB_UNLINK@ -GNULIB_UNLINKAT = @GNULIB_UNLINKAT@ -GNULIB_UNLOCKPT = @GNULIB_UNLOCKPT@ -GNULIB_UNSETENV = @GNULIB_UNSETENV@ -GNULIB_USLEEP = @GNULIB_USLEEP@ -GNULIB_UTIMENSAT = @GNULIB_UTIMENSAT@ -GNULIB_VASPRINTF = @GNULIB_VASPRINTF@ -GNULIB_VDPRINTF = @GNULIB_VDPRINTF@ -GNULIB_VFPRINTF = @GNULIB_VFPRINTF@ -GNULIB_VFPRINTF_POSIX = @GNULIB_VFPRINTF_POSIX@ -GNULIB_VFSCANF = @GNULIB_VFSCANF@ -GNULIB_VPRINTF = @GNULIB_VPRINTF@ -GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@ -GNULIB_VSCANF = @GNULIB_VSCANF@ -GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@ -GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@ -GNULIB_WAITPID = @GNULIB_WAITPID@ -GNULIB_WARN_CFLAGS = @GNULIB_WARN_CFLAGS@ -GNULIB_WCPCPY = @GNULIB_WCPCPY@ -GNULIB_WCPNCPY = @GNULIB_WCPNCPY@ -GNULIB_WCRTOMB = @GNULIB_WCRTOMB@ -GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@ -GNULIB_WCSCAT = @GNULIB_WCSCAT@ -GNULIB_WCSCHR = @GNULIB_WCSCHR@ -GNULIB_WCSCMP = @GNULIB_WCSCMP@ -GNULIB_WCSCOLL = @GNULIB_WCSCOLL@ -GNULIB_WCSCPY = @GNULIB_WCSCPY@ -GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ -GNULIB_WCSDUP = @GNULIB_WCSDUP@ -GNULIB_WCSLEN = @GNULIB_WCSLEN@ -GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ -GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ -GNULIB_WCSNCMP = @GNULIB_WCSNCMP@ -GNULIB_WCSNCPY = @GNULIB_WCSNCPY@ -GNULIB_WCSNLEN = @GNULIB_WCSNLEN@ -GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@ -GNULIB_WCSPBRK = @GNULIB_WCSPBRK@ -GNULIB_WCSRCHR = @GNULIB_WCSRCHR@ -GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@ -GNULIB_WCSSPN = @GNULIB_WCSSPN@ -GNULIB_WCSSTR = @GNULIB_WCSSTR@ -GNULIB_WCSTOK = @GNULIB_WCSTOK@ -GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@ -GNULIB_WCSXFRM = @GNULIB_WCSXFRM@ -GNULIB_WCTOB = @GNULIB_WCTOB@ -GNULIB_WCTOMB = @GNULIB_WCTOMB@ -GNULIB_WCTRANS = @GNULIB_WCTRANS@ -GNULIB_WCTYPE = @GNULIB_WCTYPE@ -GNULIB_WCWIDTH = @GNULIB_WCWIDTH@ -GNULIB_WMEMCHR = @GNULIB_WMEMCHR@ -GNULIB_WMEMCMP = @GNULIB_WMEMCMP@ -GNULIB_WMEMCPY = @GNULIB_WMEMCPY@ -GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@ -GNULIB_WMEMSET = @GNULIB_WMEMSET@ -GNULIB_WRITE = @GNULIB_WRITE@ -GNULIB__EXIT = @GNULIB__EXIT@ -GREP = @GREP@ -HAVE_ACCEPT4 = @HAVE_ACCEPT4@ -HAVE_ACOSF = @HAVE_ACOSF@ -HAVE_ACOSL = @HAVE_ACOSL@ -HAVE_ALPHASORT = @HAVE_ALPHASORT@ -HAVE_ARPA_INET_H = @HAVE_ARPA_INET_H@ -HAVE_ASINF = @HAVE_ASINF@ -HAVE_ASINL = @HAVE_ASINL@ -HAVE_ATAN2F = @HAVE_ATAN2F@ -HAVE_ATANF = @HAVE_ATANF@ -HAVE_ATANL = @HAVE_ATANL@ -HAVE_ATOLL = @HAVE_ATOLL@ -HAVE_BTOWC = @HAVE_BTOWC@ -HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ -HAVE_CBRT = @HAVE_CBRT@ -HAVE_CBRTF = @HAVE_CBRTF@ -HAVE_CBRTL = @HAVE_CBRTL@ -HAVE_CHOWN = @HAVE_CHOWN@ -HAVE_CLOSEDIR = @HAVE_CLOSEDIR@ -HAVE_COPYSIGN = @HAVE_COPYSIGN@ -HAVE_COPYSIGNL = @HAVE_COPYSIGNL@ -HAVE_COSF = @HAVE_COSF@ -HAVE_COSHF = @HAVE_COSHF@ -HAVE_COSL = @HAVE_COSL@ -HAVE_DECL_ACOSL = @HAVE_DECL_ACOSL@ -HAVE_DECL_ASINL = @HAVE_DECL_ASINL@ -HAVE_DECL_ATANL = @HAVE_DECL_ATANL@ -HAVE_DECL_CBRTF = @HAVE_DECL_CBRTF@ -HAVE_DECL_CBRTL = @HAVE_DECL_CBRTL@ -HAVE_DECL_CEILF = @HAVE_DECL_CEILF@ -HAVE_DECL_CEILL = @HAVE_DECL_CEILL@ -HAVE_DECL_COPYSIGNF = @HAVE_DECL_COPYSIGNF@ -HAVE_DECL_COSL = @HAVE_DECL_COSL@ -HAVE_DECL_DIRFD = @HAVE_DECL_DIRFD@ -HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ -HAVE_DECL_EXP2 = @HAVE_DECL_EXP2@ -HAVE_DECL_EXP2F = @HAVE_DECL_EXP2F@ -HAVE_DECL_EXP2L = @HAVE_DECL_EXP2L@ -HAVE_DECL_EXPL = @HAVE_DECL_EXPL@ -HAVE_DECL_EXPM1L = @HAVE_DECL_EXPM1L@ -HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ -HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@ -HAVE_DECL_FDOPENDIR = @HAVE_DECL_FDOPENDIR@ -HAVE_DECL_FLOORF = @HAVE_DECL_FLOORF@ -HAVE_DECL_FLOORL = @HAVE_DECL_FLOORL@ -HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@ -HAVE_DECL_FREEADDRINFO = @HAVE_DECL_FREEADDRINFO@ -HAVE_DECL_FREXPL = @HAVE_DECL_FREXPL@ -HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@ -HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@ -HAVE_DECL_GAI_STRERROR = @HAVE_DECL_GAI_STRERROR@ -HAVE_DECL_GETADDRINFO = @HAVE_DECL_GETADDRINFO@ -HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@ -HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ -HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ -HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@ -HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ -HAVE_DECL_GETNAMEINFO = @HAVE_DECL_GETNAMEINFO@ -HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ -HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ -HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ -HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ -HAVE_DECL_INET_NTOP = @HAVE_DECL_INET_NTOP@ -HAVE_DECL_INET_PTON = @HAVE_DECL_INET_PTON@ -HAVE_DECL_LDEXPL = @HAVE_DECL_LDEXPL@ -HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@ -HAVE_DECL_LOG10L = @HAVE_DECL_LOG10L@ -HAVE_DECL_LOG2 = @HAVE_DECL_LOG2@ -HAVE_DECL_LOG2F = @HAVE_DECL_LOG2F@ -HAVE_DECL_LOG2L = @HAVE_DECL_LOG2L@ -HAVE_DECL_LOGB = @HAVE_DECL_LOGB@ -HAVE_DECL_LOGL = @HAVE_DECL_LOGL@ -HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ -HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ -HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ -HAVE_DECL_REMAINDER = @HAVE_DECL_REMAINDER@ -HAVE_DECL_REMAINDERL = @HAVE_DECL_REMAINDERL@ -HAVE_DECL_RINTF = @HAVE_DECL_RINTF@ -HAVE_DECL_ROUND = @HAVE_DECL_ROUND@ -HAVE_DECL_ROUNDF = @HAVE_DECL_ROUNDF@ -HAVE_DECL_ROUNDL = @HAVE_DECL_ROUNDL@ -HAVE_DECL_SETENV = @HAVE_DECL_SETENV@ -HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@ -HAVE_DECL_SINL = @HAVE_DECL_SINL@ -HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@ -HAVE_DECL_SQRTL = @HAVE_DECL_SQRTL@ -HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ -HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@ -HAVE_DECL_STRNCASECMP = @HAVE_DECL_STRNCASECMP@ -HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@ -HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@ -HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ -HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ -HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ -HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ -HAVE_DECL_TANL = @HAVE_DECL_TANL@ -HAVE_DECL_TCGETSID = @HAVE_DECL_TCGETSID@ -HAVE_DECL_TRUNC = @HAVE_DECL_TRUNC@ -HAVE_DECL_TRUNCF = @HAVE_DECL_TRUNCF@ -HAVE_DECL_TRUNCL = @HAVE_DECL_TRUNCL@ -HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ -HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ -HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ -HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ -HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ -HAVE_DIRENT_H = @HAVE_DIRENT_H@ -HAVE_DPRINTF = @HAVE_DPRINTF@ -HAVE_DUP2 = @HAVE_DUP2@ -HAVE_DUP3 = @HAVE_DUP3@ -HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ -HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ -HAVE_EXPF = @HAVE_EXPF@ -HAVE_EXPL = @HAVE_EXPL@ -HAVE_EXPM1 = @HAVE_EXPM1@ -HAVE_EXPM1F = @HAVE_EXPM1F@ -HAVE_FABSF = @HAVE_FABSF@ -HAVE_FABSL = @HAVE_FABSL@ -HAVE_FACCESSAT = @HAVE_FACCESSAT@ -HAVE_FCHDIR = @HAVE_FCHDIR@ -HAVE_FCHMODAT = @HAVE_FCHMODAT@ -HAVE_FCHOWNAT = @HAVE_FCHOWNAT@ -HAVE_FCNTL = @HAVE_FCNTL@ -HAVE_FDATASYNC = @HAVE_FDATASYNC@ -HAVE_FDOPENDIR = @HAVE_FDOPENDIR@ -HAVE_FEATURES_H = @HAVE_FEATURES_H@ -HAVE_FFS = @HAVE_FFS@ -HAVE_FFSL = @HAVE_FFSL@ -HAVE_FFSLL = @HAVE_FFSLL@ -HAVE_FMA = @HAVE_FMA@ -HAVE_FMAF = @HAVE_FMAF@ -HAVE_FMAL = @HAVE_FMAL@ -HAVE_FMODF = @HAVE_FMODF@ -HAVE_FMODL = @HAVE_FMODL@ -HAVE_FREXPF = @HAVE_FREXPF@ -HAVE_FSEEKO = @HAVE_FSEEKO@ -HAVE_FSTATAT = @HAVE_FSTATAT@ -HAVE_FSYNC = @HAVE_FSYNC@ -HAVE_FTELLO = @HAVE_FTELLO@ -HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ -HAVE_FUTIMENS = @HAVE_FUTIMENS@ -HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ -HAVE_GETGROUPS = @HAVE_GETGROUPS@ -HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@ -HAVE_GETLOGIN = @HAVE_GETLOGIN@ -HAVE_GETOPT_H = @HAVE_GETOPT_H@ -HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ -HAVE_GETRUSAGE = @HAVE_GETRUSAGE@ -HAVE_GETSUBOPT = @HAVE_GETSUBOPT@ -HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@ -HAVE_GRANTPT = @HAVE_GRANTPT@ -HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@ -HAVE_HYPOTF = @HAVE_HYPOTF@ -HAVE_HYPOTL = @HAVE_HYPOTL@ -HAVE_ILOGB = @HAVE_ILOGB@ -HAVE_ILOGBF = @HAVE_ILOGBF@ -HAVE_ILOGBL = @HAVE_ILOGBL@ -HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ -HAVE_ISBLANK = @HAVE_ISBLANK@ -HAVE_ISNAND = @HAVE_ISNAND@ -HAVE_ISNANF = @HAVE_ISNANF@ -HAVE_ISNANL = @HAVE_ISNANL@ -HAVE_ISWBLANK = @HAVE_ISWBLANK@ -HAVE_ISWCNTRL = @HAVE_ISWCNTRL@ -HAVE_LANGINFO_CODESET = @HAVE_LANGINFO_CODESET@ -HAVE_LANGINFO_ERA = @HAVE_LANGINFO_ERA@ -HAVE_LANGINFO_H = @HAVE_LANGINFO_H@ -HAVE_LANGINFO_T_FMT_AMPM = @HAVE_LANGINFO_T_FMT_AMPM@ -HAVE_LANGINFO_YESEXPR = @HAVE_LANGINFO_YESEXPR@ -HAVE_LCHMOD = @HAVE_LCHMOD@ -HAVE_LCHOWN = @HAVE_LCHOWN@ -HAVE_LDEXPF = @HAVE_LDEXPF@ -HAVE_LINK = @HAVE_LINK@ -HAVE_LINKAT = @HAVE_LINKAT@ -HAVE_LOG10F = @HAVE_LOG10F@ -HAVE_LOG10L = @HAVE_LOG10L@ -HAVE_LOG1P = @HAVE_LOG1P@ -HAVE_LOG1PF = @HAVE_LOG1PF@ -HAVE_LOG1PL = @HAVE_LOG1PL@ -HAVE_LOGBF = @HAVE_LOGBF@ -HAVE_LOGBL = @HAVE_LOGBL@ -HAVE_LOGF = @HAVE_LOGF@ -HAVE_LOGL = @HAVE_LOGL@ -HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ -HAVE_LSTAT = @HAVE_LSTAT@ -HAVE_MBRLEN = @HAVE_MBRLEN@ -HAVE_MBRTOWC = @HAVE_MBRTOWC@ -HAVE_MBSINIT = @HAVE_MBSINIT@ -HAVE_MBSLEN = @HAVE_MBSLEN@ -HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ -HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ -HAVE_MEMCHR = @HAVE_MEMCHR@ -HAVE_MEMPCPY = @HAVE_MEMPCPY@ -HAVE_MKDIRAT = @HAVE_MKDIRAT@ -HAVE_MKDTEMP = @HAVE_MKDTEMP@ -HAVE_MKFIFO = @HAVE_MKFIFO@ -HAVE_MKFIFOAT = @HAVE_MKFIFOAT@ -HAVE_MKNOD = @HAVE_MKNOD@ -HAVE_MKNODAT = @HAVE_MKNODAT@ -HAVE_MKOSTEMP = @HAVE_MKOSTEMP@ -HAVE_MKOSTEMPS = @HAVE_MKOSTEMPS@ -HAVE_MKSTEMP = @HAVE_MKSTEMP@ -HAVE_MKSTEMPS = @HAVE_MKSTEMPS@ -HAVE_MODFF = @HAVE_MODFF@ -HAVE_MODFL = @HAVE_MODFL@ -HAVE_MSVC_INVALID_PARAMETER_HANDLER = @HAVE_MSVC_INVALID_PARAMETER_HANDLER@ -HAVE_NANOSLEEP = @HAVE_NANOSLEEP@ -HAVE_NETDB_H = @HAVE_NETDB_H@ -HAVE_NETINET_IN_H = @HAVE_NETINET_IN_H@ -HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@ -HAVE_OPENAT = @HAVE_OPENAT@ -HAVE_OPENDIR = @HAVE_OPENDIR@ -HAVE_OS_H = @HAVE_OS_H@ -HAVE_PCLOSE = @HAVE_PCLOSE@ -HAVE_PIPE = @HAVE_PIPE@ -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@ -HAVE_PTHREAD_H = @HAVE_PTHREAD_H@ -HAVE_PTHREAD_SIGMASK = @HAVE_PTHREAD_SIGMASK@ -HAVE_PTHREAD_SPINLOCK_T = @HAVE_PTHREAD_SPINLOCK_T@ -HAVE_PTHREAD_T = @HAVE_PTHREAD_T@ -HAVE_PTSNAME = @HAVE_PTSNAME@ -HAVE_PTSNAME_R = @HAVE_PTSNAME_R@ -HAVE_PWRITE = @HAVE_PWRITE@ -HAVE_RAISE = @HAVE_RAISE@ -HAVE_RANDOM = @HAVE_RANDOM@ -HAVE_RANDOM_H = @HAVE_RANDOM_H@ -HAVE_RANDOM_R = @HAVE_RANDOM_R@ -HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@ -HAVE_READDIR = @HAVE_READDIR@ -HAVE_READLINK = @HAVE_READLINK@ -HAVE_READLINKAT = @HAVE_READLINKAT@ -HAVE_REALPATH = @HAVE_REALPATH@ -HAVE_REMAINDER = @HAVE_REMAINDER@ -HAVE_REMAINDERF = @HAVE_REMAINDERF@ -HAVE_RENAMEAT = @HAVE_RENAMEAT@ -HAVE_REWINDDIR = @HAVE_REWINDDIR@ -HAVE_RINT = @HAVE_RINT@ -HAVE_RINTL = @HAVE_RINTL@ -HAVE_RPMATCH = @HAVE_RPMATCH@ -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_SETENV = @HAVE_SETENV@ -HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@ -HAVE_SIGACTION = @HAVE_SIGACTION@ -HAVE_SIGHANDLER_T = @HAVE_SIGHANDLER_T@ -HAVE_SIGINFO_T = @HAVE_SIGINFO_T@ -HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ -HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@ -HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@ -HAVE_SIGSET_T = @HAVE_SIGSET_T@ -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@ -HAVE_STPCPY = @HAVE_STPCPY@ -HAVE_STPNCPY = @HAVE_STPNCPY@ -HAVE_STRCASECMP = @HAVE_STRCASECMP@ -HAVE_STRCASESTR = @HAVE_STRCASESTR@ -HAVE_STRCHRNUL = @HAVE_STRCHRNUL@ -HAVE_STRINGS_H = @HAVE_STRINGS_H@ -HAVE_STRPBRK = @HAVE_STRPBRK@ -HAVE_STRPTIME = @HAVE_STRPTIME@ -HAVE_STRSEP = @HAVE_STRSEP@ -HAVE_STRTOD = @HAVE_STRTOD@ -HAVE_STRTOLL = @HAVE_STRTOLL@ -HAVE_STRTOULL = @HAVE_STRTOULL@ -HAVE_STRUCT_ADDRINFO = @HAVE_STRUCT_ADDRINFO@ -HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@ -HAVE_STRUCT_SCHED_PARAM = @HAVE_STRUCT_SCHED_PARAM@ -HAVE_STRUCT_SIGACTION_SA_SIGACTION = @HAVE_STRUCT_SIGACTION_SA_SIGACTION@ -HAVE_STRUCT_SOCKADDR_STORAGE = @HAVE_STRUCT_SOCKADDR_STORAGE@ -HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY = @HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY@ -HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@ -HAVE_STRUCT_UTSNAME = @HAVE_STRUCT_UTSNAME@ -HAVE_STRVERSCMP = @HAVE_STRVERSCMP@ -HAVE_SYMLINK = @HAVE_SYMLINK@ -HAVE_SYMLINKAT = @HAVE_SYMLINKAT@ -HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@ -HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@ -HAVE_SYS_IOCTL_H = @HAVE_SYS_IOCTL_H@ -HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@ -HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ -HAVE_SYS_RESOURCE_H = @HAVE_SYS_RESOURCE_H@ -HAVE_SYS_SELECT_H = @HAVE_SYS_SELECT_H@ -HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ -HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ -HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ -HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ -HAVE_SYS_UTSNAME_H = @HAVE_SYS_UTSNAME_H@ -HAVE_TANF = @HAVE_TANF@ -HAVE_TANHF = @HAVE_TANHF@ -HAVE_TANL = @HAVE_TANL@ -HAVE_TERMIOS_H = @HAVE_TERMIOS_H@ -HAVE_TIMEGM = @HAVE_TIMEGM@ -HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ -HAVE_UNAME = @HAVE_UNAME@ -HAVE_UNISTD_H = @HAVE_UNISTD_H@ -HAVE_UNLINKAT = @HAVE_UNLINKAT@ -HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ -HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ -HAVE_USLEEP = @HAVE_USLEEP@ -HAVE_UTIMENSAT = @HAVE_UTIMENSAT@ -HAVE_VASPRINTF = @HAVE_VASPRINTF@ -HAVE_VDPRINTF = @HAVE_VDPRINTF@ -HAVE_WCHAR_H = @HAVE_WCHAR_H@ -HAVE_WCHAR_T = @HAVE_WCHAR_T@ -HAVE_WCPCPY = @HAVE_WCPCPY@ -HAVE_WCPNCPY = @HAVE_WCPNCPY@ -HAVE_WCRTOMB = @HAVE_WCRTOMB@ -HAVE_WCSCASECMP = @HAVE_WCSCASECMP@ -HAVE_WCSCAT = @HAVE_WCSCAT@ -HAVE_WCSCHR = @HAVE_WCSCHR@ -HAVE_WCSCMP = @HAVE_WCSCMP@ -HAVE_WCSCOLL = @HAVE_WCSCOLL@ -HAVE_WCSCPY = @HAVE_WCSCPY@ -HAVE_WCSCSPN = @HAVE_WCSCSPN@ -HAVE_WCSDUP = @HAVE_WCSDUP@ -HAVE_WCSLEN = @HAVE_WCSLEN@ -HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@ -HAVE_WCSNCAT = @HAVE_WCSNCAT@ -HAVE_WCSNCMP = @HAVE_WCSNCMP@ -HAVE_WCSNCPY = @HAVE_WCSNCPY@ -HAVE_WCSNLEN = @HAVE_WCSNLEN@ -HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@ -HAVE_WCSPBRK = @HAVE_WCSPBRK@ -HAVE_WCSRCHR = @HAVE_WCSRCHR@ -HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@ -HAVE_WCSSPN = @HAVE_WCSSPN@ -HAVE_WCSSTR = @HAVE_WCSSTR@ -HAVE_WCSTOK = @HAVE_WCSTOK@ -HAVE_WCSWIDTH = @HAVE_WCSWIDTH@ -HAVE_WCSXFRM = @HAVE_WCSXFRM@ -HAVE_WCTRANS_T = @HAVE_WCTRANS_T@ -HAVE_WCTYPE_H = @HAVE_WCTYPE_H@ -HAVE_WCTYPE_T = @HAVE_WCTYPE_T@ -HAVE_WINSOCK2_H = @HAVE_WINSOCK2_H@ -HAVE_WINT_T = @HAVE_WINT_T@ -HAVE_WMEMCHR = @HAVE_WMEMCHR@ -HAVE_WMEMCMP = @HAVE_WMEMCMP@ -HAVE_WMEMCPY = @HAVE_WMEMCPY@ -HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ -HAVE_WMEMSET = @HAVE_WMEMSET@ -HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@ -HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ -HAVE__BOOL = @HAVE__BOOL@ -HAVE__EXIT = @HAVE__EXIT@ -HELP2MAN = @HELP2MAN@ -HOSTENT_LIB = @HOSTENT_LIB@ -ICONV_CONST = @ICONV_CONST@ -ICONV_H = @ICONV_H@ -IGNORE_UNUSED_LIBRARIES_CFLAGS = @IGNORE_UNUSED_LIBRARIES_CFLAGS@ -INCLUDE_NEXT = @INCLUDE_NEXT@ -INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@ -INET_NTOP_LIB = @INET_NTOP_LIB@ -INET_PTON_LIB = @INET_PTON_LIB@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = $(cu_install_program) -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTALL_SU = @INSTALL_SU@ -INT32_MAX_LT_INTMAX_MAX = @INT32_MAX_LT_INTMAX_MAX@ -INT64_MAX_EQ_LONG_MAX = @INT64_MAX_EQ_LONG_MAX@ -INTLLIBS = @INTLLIBS@ -INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ -LDFLAGS = @LDFLAGS@ -LIBCOREUTILS_LIBDEPS = @LIBCOREUTILS_LIBDEPS@ -LIBCOREUTILS_LTLIBDEPS = @LIBCOREUTILS_LTLIBDEPS@ -LIBICONV = @LIBICONV@ -LIBINTL = @LIBINTL@ -LIBMULTITHREAD = @LIBMULTITHREAD@ -LIBOBJS = @LIBOBJS@ -LIBPTH = @LIBPTH@ -LIBPTH_PREFIX = @LIBPTH_PREFIX@ -LIBS = @LIBS@ -LIBSOCKET = @LIBSOCKET@ -LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@ -LIBTHREAD = @LIBTHREAD@ -LIBUNISTRING_UNISTR_H = @LIBUNISTRING_UNISTR_H@ -LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@ -LIBUNISTRING_UNIWIDTH_H = @LIBUNISTRING_UNIWIDTH_H@ -LIB_ACL = @LIB_ACL@ -LIB_CAP = @LIB_CAP@ -LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ -LIB_CRYPT = @LIB_CRYPT@ -LIB_EACCESS = @LIB_EACCESS@ -LIB_FDATASYNC = @LIB_FDATASYNC@ -LIB_GETHRXTIME = @LIB_GETHRXTIME@ -LIB_GMP = @LIB_GMP@ -LIB_NANOSLEEP = @LIB_NANOSLEEP@ -LIB_PTHREAD = @LIB_PTHREAD@ -LIB_SELECT = @LIB_SELECT@ -LIB_SELINUX = @LIB_SELINUX@ -LIB_TIMER_TIME = @LIB_TIMER_TIME@ -LIB_XATTR = @LIB_XATTR@ -LN_S = @LN_S@ -LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@ -LOCALE_FR = @LOCALE_FR@ -LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@ -LOCALE_JA = @LOCALE_JA@ -LOCALE_TR_UTF8 = @LOCALE_TR_UTF8@ -LOCALE_ZH_CN = @LOCALE_ZH_CN@ -LTLIBICONV = @LTLIBICONV@ -LTLIBINTL = @LTLIBINTL@ -LTLIBMULTITHREAD = @LTLIBMULTITHREAD@ -LTLIBOBJS = @LTLIBOBJS@ -LTLIBPTH = @LTLIBPTH@ -LTLIBTHREAD = @LTLIBTHREAD@ -MAKEINFO = @MAKEINFO@ -MAN = @MAN@ -MKDIR_P = @MKDIR_P@ -MSGFMT = @MSGFMT@ -MSGFMT_015 = @MSGFMT_015@ -MSGMERGE = @MSGMERGE@ -NETINET_IN_H = @NETINET_IN_H@ -NEXT_ARPA_INET_H = @NEXT_ARPA_INET_H@ -NEXT_AS_FIRST_DIRECTIVE_ARPA_INET_H = @NEXT_AS_FIRST_DIRECTIVE_ARPA_INET_H@ -NEXT_AS_FIRST_DIRECTIVE_CTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_CTYPE_H@ -NEXT_AS_FIRST_DIRECTIVE_DIRENT_H = @NEXT_AS_FIRST_DIRECTIVE_DIRENT_H@ -NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@ -NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@ -NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@ -NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ -NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@ -NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@ -NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@ -NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@ -NEXT_AS_FIRST_DIRECTIVE_MATH_H = @NEXT_AS_FIRST_DIRECTIVE_MATH_H@ -NEXT_AS_FIRST_DIRECTIVE_NETDB_H = @NEXT_AS_FIRST_DIRECTIVE_NETDB_H@ -NEXT_AS_FIRST_DIRECTIVE_NETINET_IN_H = @NEXT_AS_FIRST_DIRECTIVE_NETINET_IN_H@ -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@ -NEXT_AS_FIRST_DIRECTIVE_STDIO_H = @NEXT_AS_FIRST_DIRECTIVE_STDIO_H@ -NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@ -NEXT_AS_FIRST_DIRECTIVE_STRINGS_H = @NEXT_AS_FIRST_DIRECTIVE_STRINGS_H@ -NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_IOCTL_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_IOCTL_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_RESOURCE_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_RESOURCE_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_UTSNAME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UTSNAME_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H@ -NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H = @NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H@ -NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ -NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ -NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@ -NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@ -NEXT_CTYPE_H = @NEXT_CTYPE_H@ -NEXT_DIRENT_H = @NEXT_DIRENT_H@ -NEXT_ERRNO_H = @NEXT_ERRNO_H@ -NEXT_FCNTL_H = @NEXT_FCNTL_H@ -NEXT_FLOAT_H = @NEXT_FLOAT_H@ -NEXT_GETOPT_H = @NEXT_GETOPT_H@ -NEXT_ICONV_H = @NEXT_ICONV_H@ -NEXT_INTTYPES_H = @NEXT_INTTYPES_H@ -NEXT_LANGINFO_H = @NEXT_LANGINFO_H@ -NEXT_LOCALE_H = @NEXT_LOCALE_H@ -NEXT_MATH_H = @NEXT_MATH_H@ -NEXT_NETDB_H = @NEXT_NETDB_H@ -NEXT_NETINET_IN_H = @NEXT_NETINET_IN_H@ -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@ -NEXT_STDIO_H = @NEXT_STDIO_H@ -NEXT_STDLIB_H = @NEXT_STDLIB_H@ -NEXT_STRINGS_H = @NEXT_STRINGS_H@ -NEXT_STRING_H = @NEXT_STRING_H@ -NEXT_SYS_IOCTL_H = @NEXT_SYS_IOCTL_H@ -NEXT_SYS_RESOURCE_H = @NEXT_SYS_RESOURCE_H@ -NEXT_SYS_SELECT_H = @NEXT_SYS_SELECT_H@ -NEXT_SYS_SOCKET_H = @NEXT_SYS_SOCKET_H@ -NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ -NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@ -NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ -NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ -NEXT_SYS_UTSNAME_H = @NEXT_SYS_UTSNAME_H@ -NEXT_SYS_WAIT_H = @NEXT_SYS_WAIT_H@ -NEXT_TERMIOS_H = @NEXT_TERMIOS_H@ -NEXT_TIME_H = @NEXT_TIME_H@ -NEXT_UNISTD_H = @NEXT_UNISTD_H@ -NEXT_WCHAR_H = @NEXT_WCHAR_H@ -NEXT_WCTYPE_H = @NEXT_WCTYPE_H@ -NO_INSTALL_PROGS_DEFAULT = @NO_INSTALL_PROGS_DEFAULT@ -OBJEXT = @OBJEXT@ -OPTIONAL_BIN_PROGS = @OPTIONAL_BIN_PROGS@ -OPTIONAL_PKGLIB_PROGS = @OPTIONAL_PKGLIB_PROGS@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL = @PERL@ -POSIX_SHELL = @POSIX_SHELL@ -POSUB = @POSUB@ -PRAGMA_COLUMNS = @PRAGMA_COLUMNS@ -PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ -PREFERABLY_POSIX_SHELL = @PREFERABLY_POSIX_SHELL@ -PRIPTR_PREFIX = @PRIPTR_PREFIX@ -PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ -PTHREAD_H = @PTHREAD_H@ -PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ -PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ -RANLIB = @RANLIB@ -REPLACE_BTOWC = @REPLACE_BTOWC@ -REPLACE_CALLOC = @REPLACE_CALLOC@ -REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ -REPLACE_CBRTF = @REPLACE_CBRTF@ -REPLACE_CBRTL = @REPLACE_CBRTL@ -REPLACE_CEIL = @REPLACE_CEIL@ -REPLACE_CEILF = @REPLACE_CEILF@ -REPLACE_CEILL = @REPLACE_CEILL@ -REPLACE_CHOWN = @REPLACE_CHOWN@ -REPLACE_CLOSE = @REPLACE_CLOSE@ -REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@ -REPLACE_DIRFD = @REPLACE_DIRFD@ -REPLACE_DPRINTF = @REPLACE_DPRINTF@ -REPLACE_DUP = @REPLACE_DUP@ -REPLACE_DUP2 = @REPLACE_DUP2@ -REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@ -REPLACE_EXP2 = @REPLACE_EXP2@ -REPLACE_EXP2L = @REPLACE_EXP2L@ -REPLACE_EXPM1 = @REPLACE_EXPM1@ -REPLACE_EXPM1F = @REPLACE_EXPM1F@ -REPLACE_FABSL = @REPLACE_FABSL@ -REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ -REPLACE_FCLOSE = @REPLACE_FCLOSE@ -REPLACE_FCNTL = @REPLACE_FCNTL@ -REPLACE_FDOPEN = @REPLACE_FDOPEN@ -REPLACE_FDOPENDIR = @REPLACE_FDOPENDIR@ -REPLACE_FFLUSH = @REPLACE_FFLUSH@ -REPLACE_FLOOR = @REPLACE_FLOOR@ -REPLACE_FLOORF = @REPLACE_FLOORF@ -REPLACE_FLOORL = @REPLACE_FLOORL@ -REPLACE_FMA = @REPLACE_FMA@ -REPLACE_FMAF = @REPLACE_FMAF@ -REPLACE_FMAL = @REPLACE_FMAL@ -REPLACE_FMOD = @REPLACE_FMOD@ -REPLACE_FMODF = @REPLACE_FMODF@ -REPLACE_FMODL = @REPLACE_FMODL@ -REPLACE_FOPEN = @REPLACE_FOPEN@ -REPLACE_FPRINTF = @REPLACE_FPRINTF@ -REPLACE_FPURGE = @REPLACE_FPURGE@ -REPLACE_FREOPEN = @REPLACE_FREOPEN@ -REPLACE_FREXP = @REPLACE_FREXP@ -REPLACE_FREXPF = @REPLACE_FREXPF@ -REPLACE_FREXPL = @REPLACE_FREXPL@ -REPLACE_FSEEK = @REPLACE_FSEEK@ -REPLACE_FSEEKO = @REPLACE_FSEEKO@ -REPLACE_FSTAT = @REPLACE_FSTAT@ -REPLACE_FSTATAT = @REPLACE_FSTATAT@ -REPLACE_FTELL = @REPLACE_FTELL@ -REPLACE_FTELLO = @REPLACE_FTELLO@ -REPLACE_FTRUNCATE = @REPLACE_FTRUNCATE@ -REPLACE_FUTIMENS = @REPLACE_FUTIMENS@ -REPLACE_GAI_STRERROR = @REPLACE_GAI_STRERROR@ -REPLACE_GETCWD = @REPLACE_GETCWD@ -REPLACE_GETDELIM = @REPLACE_GETDELIM@ -REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ -REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ -REPLACE_GETLINE = @REPLACE_GETLINE@ -REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ -REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ -REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ -REPLACE_HUGE_VAL = @REPLACE_HUGE_VAL@ -REPLACE_HYPOT = @REPLACE_HYPOT@ -REPLACE_HYPOTF = @REPLACE_HYPOTF@ -REPLACE_HYPOTL = @REPLACE_HYPOTL@ -REPLACE_ICONV = @REPLACE_ICONV@ -REPLACE_ICONV_OPEN = @REPLACE_ICONV_OPEN@ -REPLACE_ICONV_UTF = @REPLACE_ICONV_UTF@ -REPLACE_ILOGB = @REPLACE_ILOGB@ -REPLACE_ILOGBF = @REPLACE_ILOGBF@ -REPLACE_INET_NTOP = @REPLACE_INET_NTOP@ -REPLACE_INET_PTON = @REPLACE_INET_PTON@ -REPLACE_IOCTL = @REPLACE_IOCTL@ -REPLACE_ISATTY = @REPLACE_ISATTY@ -REPLACE_ISFINITE = @REPLACE_ISFINITE@ -REPLACE_ISINF = @REPLACE_ISINF@ -REPLACE_ISNAN = @REPLACE_ISNAN@ -REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ -REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ -REPLACE_ITOLD = @REPLACE_ITOLD@ -REPLACE_LCHOWN = @REPLACE_LCHOWN@ -REPLACE_LDEXPL = @REPLACE_LDEXPL@ -REPLACE_LINK = @REPLACE_LINK@ -REPLACE_LINKAT = @REPLACE_LINKAT@ -REPLACE_LOCALECONV = @REPLACE_LOCALECONV@ -REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@ -REPLACE_LOG = @REPLACE_LOG@ -REPLACE_LOG10 = @REPLACE_LOG10@ -REPLACE_LOG10F = @REPLACE_LOG10F@ -REPLACE_LOG10L = @REPLACE_LOG10L@ -REPLACE_LOG1P = @REPLACE_LOG1P@ -REPLACE_LOG1PF = @REPLACE_LOG1PF@ -REPLACE_LOG1PL = @REPLACE_LOG1PL@ -REPLACE_LOG2 = @REPLACE_LOG2@ -REPLACE_LOG2F = @REPLACE_LOG2F@ -REPLACE_LOG2L = @REPLACE_LOG2L@ -REPLACE_LOGB = @REPLACE_LOGB@ -REPLACE_LOGBF = @REPLACE_LOGBF@ -REPLACE_LOGBL = @REPLACE_LOGBL@ -REPLACE_LOGF = @REPLACE_LOGF@ -REPLACE_LOGL = @REPLACE_LOGL@ -REPLACE_LSEEK = @REPLACE_LSEEK@ -REPLACE_LSTAT = @REPLACE_LSTAT@ -REPLACE_MALLOC = @REPLACE_MALLOC@ -REPLACE_MBRLEN = @REPLACE_MBRLEN@ -REPLACE_MBRTOWC = @REPLACE_MBRTOWC@ -REPLACE_MBSINIT = @REPLACE_MBSINIT@ -REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@ -REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@ -REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@ -REPLACE_MBTOWC = @REPLACE_MBTOWC@ -REPLACE_MEMCHR = @REPLACE_MEMCHR@ -REPLACE_MEMMEM = @REPLACE_MEMMEM@ -REPLACE_MKDIR = @REPLACE_MKDIR@ -REPLACE_MKFIFO = @REPLACE_MKFIFO@ -REPLACE_MKNOD = @REPLACE_MKNOD@ -REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ -REPLACE_MKTIME = @REPLACE_MKTIME@ -REPLACE_MODF = @REPLACE_MODF@ -REPLACE_MODFF = @REPLACE_MODFF@ -REPLACE_MODFL = @REPLACE_MODFL@ -REPLACE_NAN = @REPLACE_NAN@ -REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@ -REPLACE_NL_LANGINFO = @REPLACE_NL_LANGINFO@ -REPLACE_NULL = @REPLACE_NULL@ -REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@ -REPLACE_OPEN = @REPLACE_OPEN@ -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@ -REPLACE_PTHREAD_SIGMASK = @REPLACE_PTHREAD_SIGMASK@ -REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@ -REPLACE_PUTENV = @REPLACE_PUTENV@ -REPLACE_PWRITE = @REPLACE_PWRITE@ -REPLACE_RAISE = @REPLACE_RAISE@ -REPLACE_RANDOM_R = @REPLACE_RANDOM_R@ -REPLACE_READ = @REPLACE_READ@ -REPLACE_READLINK = @REPLACE_READLINK@ -REPLACE_REALLOC = @REPLACE_REALLOC@ -REPLACE_REALPATH = @REPLACE_REALPATH@ -REPLACE_REMAINDER = @REPLACE_REMAINDER@ -REPLACE_REMAINDERF = @REPLACE_REMAINDERF@ -REPLACE_REMAINDERL = @REPLACE_REMAINDERL@ -REPLACE_REMOVE = @REPLACE_REMOVE@ -REPLACE_RENAME = @REPLACE_RENAME@ -REPLACE_RENAMEAT = @REPLACE_RENAMEAT@ -REPLACE_RMDIR = @REPLACE_RMDIR@ -REPLACE_ROUND = @REPLACE_ROUND@ -REPLACE_ROUNDF = @REPLACE_ROUNDF@ -REPLACE_ROUNDL = @REPLACE_ROUNDL@ -REPLACE_SELECT = @REPLACE_SELECT@ -REPLACE_SETENV = @REPLACE_SETENV@ -REPLACE_SETLOCALE = @REPLACE_SETLOCALE@ -REPLACE_SIGNBIT = @REPLACE_SIGNBIT@ -REPLACE_SIGNBIT_USING_GCC = @REPLACE_SIGNBIT_USING_GCC@ -REPLACE_SLEEP = @REPLACE_SLEEP@ -REPLACE_SNPRINTF = @REPLACE_SNPRINTF@ -REPLACE_SPRINTF = @REPLACE_SPRINTF@ -REPLACE_SQRTL = @REPLACE_SQRTL@ -REPLACE_STAT = @REPLACE_STAT@ -REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@ -REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@ -REPLACE_STPNCPY = @REPLACE_STPNCPY@ -REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ -REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ -REPLACE_STRDUP = @REPLACE_STRDUP@ -REPLACE_STRERROR = @REPLACE_STRERROR@ -REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ -REPLACE_STRNCAT = @REPLACE_STRNCAT@ -REPLACE_STRNDUP = @REPLACE_STRNDUP@ -REPLACE_STRNLEN = @REPLACE_STRNLEN@ -REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@ -REPLACE_STRSTR = @REPLACE_STRSTR@ -REPLACE_STRTOD = @REPLACE_STRTOD@ -REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@ -REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ -REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@ -REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ -REPLACE_SYMLINK = @REPLACE_SYMLINK@ -REPLACE_TIMEGM = @REPLACE_TIMEGM@ -REPLACE_TMPFILE = @REPLACE_TMPFILE@ -REPLACE_TOWLOWER = @REPLACE_TOWLOWER@ -REPLACE_TRUNC = @REPLACE_TRUNC@ -REPLACE_TRUNCF = @REPLACE_TRUNCF@ -REPLACE_TRUNCL = @REPLACE_TRUNCL@ -REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@ -REPLACE_UNLINK = @REPLACE_UNLINK@ -REPLACE_UNLINKAT = @REPLACE_UNLINKAT@ -REPLACE_UNSETENV = @REPLACE_UNSETENV@ -REPLACE_USLEEP = @REPLACE_USLEEP@ -REPLACE_UTIMENSAT = @REPLACE_UTIMENSAT@ -REPLACE_VASPRINTF = @REPLACE_VASPRINTF@ -REPLACE_VDPRINTF = @REPLACE_VDPRINTF@ -REPLACE_VFPRINTF = @REPLACE_VFPRINTF@ -REPLACE_VPRINTF = @REPLACE_VPRINTF@ -REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@ -REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ -REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ -REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ -REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ -REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ -REPLACE_WCTOB = @REPLACE_WCTOB@ -REPLACE_WCTOMB = @REPLACE_WCTOMB@ -REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ -REPLACE_WRITE = @REPLACE_WRITE@ -SCHED_H = @SCHED_H@ -SELINUX_CONTEXT_H = @SELINUX_CONTEXT_H@ -SEQ_LIBM = @SEQ_LIBM@ -SERVENT_LIB = @SERVENT_LIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ -SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ -STDALIGN_H = @STDALIGN_H@ -STDARG_H = @STDARG_H@ -STDBOOL_H = @STDBOOL_H@ -STDDEF_H = @STDDEF_H@ -STDINT_H = @STDINT_H@ -STRIP = @STRIP@ -SYS_IOCTL_H_HAVE_WINSOCK2_H = @SYS_IOCTL_H_HAVE_WINSOCK2_H@ -SYS_IOCTL_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @SYS_IOCTL_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ -SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ -TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ -UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@ -UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@ -UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ -UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ -UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ -USE_ACL = @USE_ACL@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WARN_CFLAGS = @WARN_CFLAGS@ -WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ -WERROR_CFLAGS = @WERROR_CFLAGS@ -WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@ -WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@ -WINT_T_SUFFIX = @WINT_T_SUFFIX@ -XGETTEXT = @XGETTEXT@ -XGETTEXT_015 = @XGETTEXT_015@ -XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ -YACC = @YACC@ -YFLAGS = @YFLAGS@ -YIELD_LIB = @YIELD_LIB@ -abs_aux_dir = @abs_aux_dir@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -gl_LIBOBJS = @gl_LIBOBJS@ -gl_LTLIBOBJS = @gl_LTLIBOBJS@ -gltests_LIBOBJS = @gltests_LIBOBJS@ -gltests_LTLIBOBJS = @gltests_LTLIBOBJS@ -gltests_WITNESS = @gltests_WITNESS@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -lispdir = @lispdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ - -# These are the names of programs that are not installed by default. -# This list is *not* intended for programs like who, nice, chroot, etc., -# that are built only when certain requisite system features are detected. -# Hence, if you want to install programs from this list anyway, say A and B, -# use --enable-install-program=A,B -no_install__progs = \ - arch hostname su - -build_if_possible__progs = \ - chroot \ - df \ - hostid \ - libstdbuf.so \ - nice \ - pinky \ - stdbuf \ - stty \ - su \ - uptime \ - users \ - who - -AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) -bin_PROGRAMS = $(OPTIONAL_BIN_PROGS) -pkglibexec_PROGRAMS = $(OPTIONAL_PKGLIB_PROGS) -noinst_HEADERS = \ - chown-core.h \ - copy.h \ - cp-hash.h \ - dircolors.h \ - fiemap.h \ - find-mount-point.h \ - fs.h \ - fs-is-local.h \ - group-list.h \ - ioblksize.h \ - ls.h \ - operand2sig.h \ - prog-fprintf.h \ - remove.h \ - system.h \ - wheel-size.h \ - wheel.h \ - uname.h - -EXTRA_DIST = dcgen dircolors.hin tac-pipe.c \ - wheel-gen.pl extract-magic c99-to-c89.diff - -BUILT_SOURCES = dircolors.h wheel-size.h wheel.h fs-is-local.h fs.h \ - version.c version.h - -# Also remove these sometimes-built programs. -# For example, even when excluded, they're built via _sc_check-AUTHORS. -CLEANFILES = $(SCRIPTS) su $(no_install__progs) fs-def fs-magic \ - fs-kernel-magic -AM_CPPFLAGS = -I$(top_srcdir)/lib -noinst_LIBRARIES = libver.a -nodist_libver_a_SOURCES = version.c version.h - -# Tell the linker to omit references to unused shared libraries. -AM_LDFLAGS = $(IGNORE_UNUSED_LIBRARIES_CFLAGS) - -# Sometimes, the expansion of $(LIBINTL) includes -lc which may -# include modules defining variables like 'optind', so libcoreutils.a -# must precede $(LIBINTL) in order to ensure we use GNU getopt. -# But libcoreutils.a must also follow $(LIBINTL), since libintl uses -# replacement functions defined in libcoreutils.a. -LDADD = libver.a ../lib/libcoreutils.a $(LIBINTL) ../lib/libcoreutils.a - -# First, list all programs, to make listing per-program libraries easier. -# See [ below. -arch_LDADD = $(LDADD) -base64_LDADD = $(LDADD) -basename_LDADD = $(LDADD) - -# for print_unicode_char, proper_name_utf8 -cat_LDADD = $(LDADD) $(LIBICONV) - -# for selinux use -chcon_LDADD = $(LDADD) $(LIB_SELINUX) -chgrp_LDADD = $(LDADD) -chmod_LDADD = $(LDADD) -chown_LDADD = $(LDADD) -chroot_LDADD = $(LDADD) -cksum_LDADD = $(LDADD) -comm_LDADD = $(LDADD) -nproc_LDADD = $(LDADD) -cp_LDADD = $(LDADD) $(copy_LDADD) $(LIBICONV) -csplit_LDADD = $(LDADD) -cut_LDADD = $(LDADD) -date_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) - -# for gethrxtime - -# for fdatasync -dd_LDADD = $(LDADD) $(LIB_GETHRXTIME) $(LIB_FDATASYNC) -df_LDADD = $(LDADD) $(LIBICONV) -# See dir_LDADD below -dircolors_LDADD = $(LDADD) -dirname_LDADD = $(LDADD) -du_LDADD = $(LDADD) $(LIBICONV) -echo_LDADD = $(LDADD) -env_LDADD = $(LDADD) -expand_LDADD = $(LDADD) - -# for various GMP functions -expr_LDADD = $(LDADD) $(LIB_GMP) -factor_LDADD = $(LDADD) $(LIB_GMP) -false_LDADD = $(LDADD) -fmt_LDADD = $(LDADD) -fold_LDADD = $(LDADD) -getlimits_LDADD = $(LDADD) $(LIBICONV) -ginstall_LDADD = $(LDADD) $(copy_LDADD) $(LIB_SELINUX) \ - $(LIB_CLOCK_GETTIME) -groups_LDADD = $(LDADD) -head_LDADD = $(LDADD) -hostid_LDADD = $(LDADD) - -# for gethostname, uname -hostname_LDADD = $(LDADD) $(GETHOSTNAME_LIB) -id_LDADD = $(LDADD) $(LIB_SELINUX) -join_LDADD = $(LDADD) - -# for strsignal -kill_LDADD = $(LDADD) $(LIBTHREAD) -link_LDADD = $(LDADD) -ln_LDADD = $(LDADD) -logname_LDADD = $(LDADD) - -# for cap_get_file -ls_LDADD = $(LDADD) $(LIB_SELINUX) $(LIB_CLOCK_GETTIME) $(LIB_CAP) \ - $(LIB_ACL) -md5sum_LDADD = $(LDADD) -mkdir_LDADD = $(LDADD) $(LIB_SELINUX) -mkfifo_LDADD = $(LDADD) $(LIB_SELINUX) -mknod_LDADD = $(LDADD) $(LIB_SELINUX) -mktemp_LDADD = $(LDADD) -mv_LDADD = $(LDADD) $(copy_LDADD) $(remove_LDADD) -nice_LDADD = $(LDADD) -nl_LDADD = $(LDADD) -nohup_LDADD = $(LDADD) -od_LDADD = $(LDADD) -paste_LDADD = $(LDADD) -pathchk_LDADD = $(LDADD) - -# for canon_host -pinky_LDADD = $(LDADD) $(GETADDRINFO_LIB) -pr_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) -printenv_LDADD = $(LDADD) -printf_LDADD = $(LDADD) $(LIBICONV) -ptx_LDADD = $(LDADD) $(LIBICONV) -pwd_LDADD = $(LDADD) -readlink_LDADD = $(LDADD) -realpath_LDADD = $(LDADD) $(LIBICONV) -rm_LDADD = $(LDADD) $(remove_LDADD) -rmdir_LDADD = $(LDADD) -runcon_LDADD = $(LDADD) $(LIB_SELINUX) -seq_LDADD = $(LDADD) -setuidgid_LDADD = $(LDADD) -sha1sum_LDADD = $(LDADD) -sha224sum_LDADD = $(LDADD) -sha256sum_LDADD = $(LDADD) -sha384sum_LDADD = $(LDADD) -sha512sum_LDADD = $(LDADD) -shred_LDADD = $(LDADD) $(LIB_FDATASYNC) -shuf_LDADD = $(LDADD) - -# for xnanosleep -sleep_LDADD = $(LDADD) $(LIB_NANOSLEEP) - -# for pthread -sort_LDADD = $(LDADD) $(LIB_NANOSLEEP) $(LIB_PTHREAD) -split_LDADD = $(LDADD) $(LIBICONV) -stat_LDADD = $(LDADD) $(LIB_SELINUX) -stdbuf_LDADD = $(LDADD) $(LIBICONV) -stty_LDADD = $(LDADD) - -# for crypt -su_LDADD = $(LDADD) $(LIB_CRYPT) -sum_LDADD = $(LDADD) -sync_LDADD = $(LDADD) -tac_LDADD = $(LDADD) -tail_LDADD = $(LDADD) $(LIB_NANOSLEEP) -tee_LDADD = $(LDADD) -test_LDADD = $(LDADD) $(LIB_EACCESS) -timeout_LDADD = $(LDADD) $(LIB_TIMER_TIME) $(LIBICONV) -touch_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) -tr_LDADD = $(LDADD) -true_LDADD = $(LDADD) -truncate_LDADD = $(LDADD) $(LIBICONV) -tsort_LDADD = $(LDADD) -tty_LDADD = $(LDADD) -uname_LDADD = $(LDADD) $(GETHOSTNAME_LIB) -unexpand_LDADD = $(LDADD) -uniq_LDADD = $(LDADD) -unlink_LDADD = $(LDADD) - -# for getloadavg -uptime_LDADD = $(LDADD) $(GETLOADAVG_LIBS) -users_LDADD = $(LDADD) -# See vdir_LDADD below -wc_LDADD = $(LDADD) -who_LDADD = $(LDADD) $(GETADDRINFO_LIB) -whoami_LDADD = $(LDADD) -yes_LDADD = $(LDADD) - -# Synonyms. Recall that Automake transliterates '[' to '_'. -__LDADD = $(test_LDADD) -dir_LDADD = $(ls_LDADD) -vdir_LDADD = $(ls_LDADD) - -# Shared files - -# for eaccess, euidaccess - -# for gettime, settime, utimecmp, utimens - -# for various ACL functions - -# for various xattr functions -copy_LDADD = $(LIB_EACCESS) $(LIB_SELINUX) $(LIB_CLOCK_GETTIME) \ - $(LIB_ACL) $(LIB_XATTR) -remove_LDADD = $(LIB_EACCESS) - -# Get the release year from ../lib/version-etc.c. -RELEASE_YEAR = \ - `sed -n '/.*COPYRIGHT_YEAR = \([0-9][0-9][0-9][0-9]\) };/s//\1/p' \ - $(top_srcdir)/lib/version-etc.c` - -installed_su = $(DESTDIR)$(bindir)/`echo su|sed '$(transform)'` -setuid_root_mode = a=rx,u+s -install_su = \ - if test "$(INSTALL_SU)" = yes; then \ - p=su; \ - echo " $(INSTALL_PROGRAM) $$p $(installed_su)"; \ - $(INSTALL_PROGRAM) $$p $(installed_su); \ - echo " chown root $(installed_su)"; \ - chown root $(installed_su); \ - echo " chmod $(setuid_root_mode) $(installed_su)"; \ - chmod $(setuid_root_mode) $(installed_su); \ - else \ - :; \ - fi - -copy_sources = copy.c cp-hash.c extent-scan.c extent-scan.h -ginstall_SOURCES = install.c prog-fprintf.c $(copy_sources) - -# This is for the '[' program. Automake transliterates '[' to '_'. -__SOURCES = lbracket.c -cp_SOURCES = cp.c $(copy_sources) -dir_SOURCES = ls.c ls-dir.c -vdir_SOURCES = ls.c ls-vdir.c -id_SOURCES = id.c group-list.c -groups_SOURCES = groups.c group-list.c -ls_SOURCES = ls.c ls-ls.c -ln_SOURCES = ln.c relpath.c relpath.h -chown_SOURCES = chown.c chown-core.c -chgrp_SOURCES = chgrp.c chown-core.c -kill_SOURCES = kill.c operand2sig.c -realpath_SOURCES = realpath.c relpath.c relpath.h -timeout_SOURCES = timeout.c operand2sig.c -mv_SOURCES = mv.c remove.c $(copy_sources) -rm_SOURCES = rm.c remove.c -mkdir_SOURCES = mkdir.c prog-fprintf.c -rmdir_SOURCES = rmdir.c prog-fprintf.c -df_SOURCES = df.c find-mount-point.c -stat_SOURCES = stat.c find-mount-point.c -uname_SOURCES = uname.c uname-uname.c -arch_SOURCES = uname.c uname-arch.c -md5sum_CPPFLAGS = -DHASH_ALGO_MD5=1 $(AM_CPPFLAGS) -sha1sum_SOURCES = md5sum.c -sha1sum_CPPFLAGS = -DHASH_ALGO_SHA1=1 $(AM_CPPFLAGS) -sha224sum_SOURCES = md5sum.c -sha224sum_CPPFLAGS = -DHASH_ALGO_SHA224=1 $(AM_CPPFLAGS) -sha256sum_SOURCES = md5sum.c -sha256sum_CPPFLAGS = -DHASH_ALGO_SHA256=1 $(AM_CPPFLAGS) -sha384sum_SOURCES = md5sum.c -sha384sum_CPPFLAGS = -DHASH_ALGO_SHA384=1 $(AM_CPPFLAGS) -sha512sum_SOURCES = md5sum.c -sha512sum_CPPFLAGS = -DHASH_ALGO_SHA512=1 $(AM_CPPFLAGS) -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 -libstdbuf_so_LDADD = - -# 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. -libstdbuf_so_LDFLAGS = -shared -libstdbuf_so_CFLAGS = -fPIC $(AM_CFLAGS) -editpl = sed -e 's,@''PERL''@,$(PERL),g' -wheel_size = 5 - -# false exits nonzero even with --help or --version. -# test doesn't support --help or --version. -# Tell automake to exempt then from that installcheck test. -AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = false test - -# Massage bits of the statfs man page and definitions from -# /usr/include/linux/magic.h to be in a form consistent with what's in fs.h. -fs_normalize_perl_subst = \ - -e 's/MINIX_SUPER_MAGIC\b/MINIX/;' \ - -e 's/MINIX_SUPER_MAGIC2\b/MINIX_30/;' \ - -e 's/MINIX2_SUPER_MAGIC\b/MINIX_V2/;' \ - -e 's/MINIX2_SUPER_MAGIC2\b/MINIX_V2_30/;' \ - -e 's/MINIX3_SUPER_MAGIC\b/MINIX_V3/;' \ - -e 's/CIFS_MAGIC_NUMBER/CIFS/;' \ - -e 's/(_SUPER)?_MAGIC//;' \ - -e 's/\s+0x(\S+)/" 0x" . uc $$1/e;' \ - -e 's/(\s+0x)(\X{3})\b/$${1}0$$2/;' \ - -e 's/(\s+0x)(\X{6})\b/$${1}00$$2/;' \ - -e 's/(\s+0x)(\X{7})\b/$${1}0$$2/;' \ - -e 's/^\s+//;' \ - -e 's/^\043define\s+//;' \ - -e 's/^_(XIAFS)/$$1/;' \ - -e 's/^USBDEVICE/USBDEVFS/;' \ - -e 's/NTFS_SB/NTFS/;' \ - -e 's/^/\043 define S_MAGIC_/;' \ - -e 's,\s*/\* .*? \*/,,;' - -DISTCLEANFILES = version.c version.h -MAINTAINERCLEANFILES = $(BUILT_SOURCES) - -# Sort in traditional ASCII order, regardless of the current locale; -# otherwise we may get into trouble with distinct strings that the -# current locale considers to be equal. -ASSORT = LC_ALL=C sort -all_programs = \ - $(bin_PROGRAMS) \ - $(bin_SCRIPTS) \ - $(EXTRA_PROGRAMS) - -pm = progs-makefile -pr = progs-readme - -# Ensure that the list of programs and author names is accurate. -# We need a UTF8 locale. If a lack of locale support or a missing -# translation inhibits printing of UTF-8 names, just skip this test. -au_dotdot = authors-dotdot -au_actual = authors-actual -@CROSS_COMPILING_FALSE@cu_install_program = ./ginstall - -# Use the just-built ./ginstall, when not cross-compiling. -@CROSS_COMPILING_TRUE@cu_install_program = @INSTALL_PROGRAM@ -all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - -.SUFFIXES: -.SUFFIXES: .c .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -clean-noinstLIBRARIES: - -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -libver.a: $(libver_a_OBJECTS) $(libver_a_DEPENDENCIES) $(EXTRA_libver_a_DEPENDENCIES) - $(AM_V_at)-rm -f libver.a - $(AM_V_AR)$(libver_a_AR) libver.a $(libver_a_OBJECTS) $(libver_a_LIBADD) - $(AM_V_at)$(RANLIB) libver.a -install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ - 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; \ - done | \ - 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 } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) files[d] = files[d] " " $$1; \ - else { print "f", $$3 "/" $$4, $$1; } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ - $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) - @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)/' `; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(bindir)" && rm -f $$files - -clean-binPROGRAMS: - -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) > /dev/null 2>&1 || /bin/rm -f $(bin_PROGRAMS) - -clean-noinstPROGRAMS: - -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) -install-pkglibexecPROGRAMS: $(pkglibexec_PROGRAMS) - @$(NORMAL_INSTALL) - @list='$(pkglibexec_PROGRAMS)'; test -n "$(pkglibexecdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(pkglibexecdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(pkglibexecdir)" || exit 1; \ - 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; \ - done | \ - 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 } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) files[d] = files[d] " " $$1; \ - else { print "f", $$3 "/" $$4, $$1; } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(pkglibexecdir)$$dir'"; \ - $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(pkglibexecdir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-pkglibexecPROGRAMS: - @$(NORMAL_UNINSTALL) - @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)/' `; \ - 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) -[$(EXEEXT): $(__OBJECTS) $(__DEPENDENCIES) $(EXTRA___DEPENDENCIES) - @rm -f [$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(__OBJECTS) $(__LDADD) $(LIBS) -arch$(EXEEXT): $(arch_OBJECTS) $(arch_DEPENDENCIES) $(EXTRA_arch_DEPENDENCIES) - @rm -f arch$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(arch_OBJECTS) $(arch_LDADD) $(LIBS) -base64$(EXEEXT): $(base64_OBJECTS) $(base64_DEPENDENCIES) $(EXTRA_base64_DEPENDENCIES) - @rm -f base64$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(base64_OBJECTS) $(base64_LDADD) $(LIBS) -basename$(EXEEXT): $(basename_OBJECTS) $(basename_DEPENDENCIES) $(EXTRA_basename_DEPENDENCIES) - @rm -f basename$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(basename_OBJECTS) $(basename_LDADD) $(LIBS) -cat$(EXEEXT): $(cat_OBJECTS) $(cat_DEPENDENCIES) $(EXTRA_cat_DEPENDENCIES) - @rm -f cat$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(cat_OBJECTS) $(cat_LDADD) $(LIBS) -chcon$(EXEEXT): $(chcon_OBJECTS) $(chcon_DEPENDENCIES) $(EXTRA_chcon_DEPENDENCIES) - @rm -f chcon$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(chcon_OBJECTS) $(chcon_LDADD) $(LIBS) -chgrp$(EXEEXT): $(chgrp_OBJECTS) $(chgrp_DEPENDENCIES) $(EXTRA_chgrp_DEPENDENCIES) - @rm -f chgrp$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(chgrp_OBJECTS) $(chgrp_LDADD) $(LIBS) -chmod$(EXEEXT): $(chmod_OBJECTS) $(chmod_DEPENDENCIES) $(EXTRA_chmod_DEPENDENCIES) - @rm -f chmod$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(chmod_OBJECTS) $(chmod_LDADD) $(LIBS) -chown$(EXEEXT): $(chown_OBJECTS) $(chown_DEPENDENCIES) $(EXTRA_chown_DEPENDENCIES) - @rm -f chown$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(chown_OBJECTS) $(chown_LDADD) $(LIBS) -chroot$(EXEEXT): $(chroot_OBJECTS) $(chroot_DEPENDENCIES) $(EXTRA_chroot_DEPENDENCIES) - @rm -f chroot$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(chroot_OBJECTS) $(chroot_LDADD) $(LIBS) -cksum$(EXEEXT): $(cksum_OBJECTS) $(cksum_DEPENDENCIES) $(EXTRA_cksum_DEPENDENCIES) - @rm -f cksum$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(cksum_OBJECTS) $(cksum_LDADD) $(LIBS) -comm$(EXEEXT): $(comm_OBJECTS) $(comm_DEPENDENCIES) $(EXTRA_comm_DEPENDENCIES) - @rm -f comm$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(comm_OBJECTS) $(comm_LDADD) $(LIBS) -cp$(EXEEXT): $(cp_OBJECTS) $(cp_DEPENDENCIES) $(EXTRA_cp_DEPENDENCIES) - @rm -f cp$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(cp_OBJECTS) $(cp_LDADD) $(LIBS) -csplit$(EXEEXT): $(csplit_OBJECTS) $(csplit_DEPENDENCIES) $(EXTRA_csplit_DEPENDENCIES) - @rm -f csplit$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(csplit_OBJECTS) $(csplit_LDADD) $(LIBS) -cut$(EXEEXT): $(cut_OBJECTS) $(cut_DEPENDENCIES) $(EXTRA_cut_DEPENDENCIES) - @rm -f cut$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(cut_OBJECTS) $(cut_LDADD) $(LIBS) -date$(EXEEXT): $(date_OBJECTS) $(date_DEPENDENCIES) $(EXTRA_date_DEPENDENCIES) - @rm -f date$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(date_OBJECTS) $(date_LDADD) $(LIBS) -dd$(EXEEXT): $(dd_OBJECTS) $(dd_DEPENDENCIES) $(EXTRA_dd_DEPENDENCIES) - @rm -f dd$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(dd_OBJECTS) $(dd_LDADD) $(LIBS) -df$(EXEEXT): $(df_OBJECTS) $(df_DEPENDENCIES) $(EXTRA_df_DEPENDENCIES) - @rm -f df$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(df_OBJECTS) $(df_LDADD) $(LIBS) -dir$(EXEEXT): $(dir_OBJECTS) $(dir_DEPENDENCIES) $(EXTRA_dir_DEPENDENCIES) - @rm -f dir$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(dir_OBJECTS) $(dir_LDADD) $(LIBS) -dircolors$(EXEEXT): $(dircolors_OBJECTS) $(dircolors_DEPENDENCIES) $(EXTRA_dircolors_DEPENDENCIES) - @rm -f dircolors$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(dircolors_OBJECTS) $(dircolors_LDADD) $(LIBS) -dirname$(EXEEXT): $(dirname_OBJECTS) $(dirname_DEPENDENCIES) $(EXTRA_dirname_DEPENDENCIES) - @rm -f dirname$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(dirname_OBJECTS) $(dirname_LDADD) $(LIBS) -du$(EXEEXT): $(du_OBJECTS) $(du_DEPENDENCIES) $(EXTRA_du_DEPENDENCIES) - @rm -f du$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(du_OBJECTS) $(du_LDADD) $(LIBS) -echo$(EXEEXT): $(echo_OBJECTS) $(echo_DEPENDENCIES) $(EXTRA_echo_DEPENDENCIES) - @rm -f echo$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(echo_OBJECTS) $(echo_LDADD) $(LIBS) -env$(EXEEXT): $(env_OBJECTS) $(env_DEPENDENCIES) $(EXTRA_env_DEPENDENCIES) - @rm -f env$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(env_OBJECTS) $(env_LDADD) $(LIBS) -expand$(EXEEXT): $(expand_OBJECTS) $(expand_DEPENDENCIES) $(EXTRA_expand_DEPENDENCIES) - @rm -f expand$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(expand_OBJECTS) $(expand_LDADD) $(LIBS) -expr$(EXEEXT): $(expr_OBJECTS) $(expr_DEPENDENCIES) $(EXTRA_expr_DEPENDENCIES) - @rm -f expr$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(expr_OBJECTS) $(expr_LDADD) $(LIBS) -factor$(EXEEXT): $(factor_OBJECTS) $(factor_DEPENDENCIES) $(EXTRA_factor_DEPENDENCIES) - @rm -f factor$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(factor_OBJECTS) $(factor_LDADD) $(LIBS) -false$(EXEEXT): $(false_OBJECTS) $(false_DEPENDENCIES) $(EXTRA_false_DEPENDENCIES) - @rm -f false$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(false_OBJECTS) $(false_LDADD) $(LIBS) -fmt$(EXEEXT): $(fmt_OBJECTS) $(fmt_DEPENDENCIES) $(EXTRA_fmt_DEPENDENCIES) - @rm -f fmt$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(fmt_OBJECTS) $(fmt_LDADD) $(LIBS) -fold$(EXEEXT): $(fold_OBJECTS) $(fold_DEPENDENCIES) $(EXTRA_fold_DEPENDENCIES) - @rm -f fold$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(fold_OBJECTS) $(fold_LDADD) $(LIBS) -getlimits$(EXEEXT): $(getlimits_OBJECTS) $(getlimits_DEPENDENCIES) $(EXTRA_getlimits_DEPENDENCIES) - @rm -f getlimits$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(getlimits_OBJECTS) $(getlimits_LDADD) $(LIBS) -ginstall$(EXEEXT): $(ginstall_OBJECTS) $(ginstall_DEPENDENCIES) $(EXTRA_ginstall_DEPENDENCIES) - @rm -f ginstall$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ginstall_OBJECTS) $(ginstall_LDADD) $(LIBS) -groups$(EXEEXT): $(groups_OBJECTS) $(groups_DEPENDENCIES) $(EXTRA_groups_DEPENDENCIES) - @rm -f groups$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(groups_OBJECTS) $(groups_LDADD) $(LIBS) -head$(EXEEXT): $(head_OBJECTS) $(head_DEPENDENCIES) $(EXTRA_head_DEPENDENCIES) - @rm -f head$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(head_OBJECTS) $(head_LDADD) $(LIBS) -hostid$(EXEEXT): $(hostid_OBJECTS) $(hostid_DEPENDENCIES) $(EXTRA_hostid_DEPENDENCIES) - @rm -f hostid$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(hostid_OBJECTS) $(hostid_LDADD) $(LIBS) -hostname$(EXEEXT): $(hostname_OBJECTS) $(hostname_DEPENDENCIES) $(EXTRA_hostname_DEPENDENCIES) - @rm -f hostname$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(hostname_OBJECTS) $(hostname_LDADD) $(LIBS) -id$(EXEEXT): $(id_OBJECTS) $(id_DEPENDENCIES) $(EXTRA_id_DEPENDENCIES) - @rm -f id$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(id_OBJECTS) $(id_LDADD) $(LIBS) -join$(EXEEXT): $(join_OBJECTS) $(join_DEPENDENCIES) $(EXTRA_join_DEPENDENCIES) - @rm -f join$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(join_OBJECTS) $(join_LDADD) $(LIBS) -kill$(EXEEXT): $(kill_OBJECTS) $(kill_DEPENDENCIES) $(EXTRA_kill_DEPENDENCIES) - @rm -f kill$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(kill_OBJECTS) $(kill_LDADD) $(LIBS) -libstdbuf.so$(EXEEXT): $(libstdbuf_so_OBJECTS) $(libstdbuf_so_DEPENDENCIES) $(EXTRA_libstdbuf_so_DEPENDENCIES) - @rm -f libstdbuf.so$(EXEEXT) - $(AM_V_CCLD)$(libstdbuf_so_LINK) $(libstdbuf_so_OBJECTS) $(libstdbuf_so_LDADD) $(LIBS) -link$(EXEEXT): $(link_OBJECTS) $(link_DEPENDENCIES) $(EXTRA_link_DEPENDENCIES) - @rm -f link$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(link_OBJECTS) $(link_LDADD) $(LIBS) -ln$(EXEEXT): $(ln_OBJECTS) $(ln_DEPENDENCIES) $(EXTRA_ln_DEPENDENCIES) - @rm -f ln$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ln_OBJECTS) $(ln_LDADD) $(LIBS) -logname$(EXEEXT): $(logname_OBJECTS) $(logname_DEPENDENCIES) $(EXTRA_logname_DEPENDENCIES) - @rm -f logname$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(logname_OBJECTS) $(logname_LDADD) $(LIBS) -ls$(EXEEXT): $(ls_OBJECTS) $(ls_DEPENDENCIES) $(EXTRA_ls_DEPENDENCIES) - @rm -f ls$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ls_OBJECTS) $(ls_LDADD) $(LIBS) -md5sum$(EXEEXT): $(md5sum_OBJECTS) $(md5sum_DEPENDENCIES) $(EXTRA_md5sum_DEPENDENCIES) - @rm -f md5sum$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(md5sum_OBJECTS) $(md5sum_LDADD) $(LIBS) -mkdir$(EXEEXT): $(mkdir_OBJECTS) $(mkdir_DEPENDENCIES) $(EXTRA_mkdir_DEPENDENCIES) - @rm -f mkdir$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(mkdir_OBJECTS) $(mkdir_LDADD) $(LIBS) -mkfifo$(EXEEXT): $(mkfifo_OBJECTS) $(mkfifo_DEPENDENCIES) $(EXTRA_mkfifo_DEPENDENCIES) - @rm -f mkfifo$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(mkfifo_OBJECTS) $(mkfifo_LDADD) $(LIBS) -mknod$(EXEEXT): $(mknod_OBJECTS) $(mknod_DEPENDENCIES) $(EXTRA_mknod_DEPENDENCIES) - @rm -f mknod$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(mknod_OBJECTS) $(mknod_LDADD) $(LIBS) -mktemp$(EXEEXT): $(mktemp_OBJECTS) $(mktemp_DEPENDENCIES) $(EXTRA_mktemp_DEPENDENCIES) - @rm -f mktemp$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(mktemp_OBJECTS) $(mktemp_LDADD) $(LIBS) -mv$(EXEEXT): $(mv_OBJECTS) $(mv_DEPENDENCIES) $(EXTRA_mv_DEPENDENCIES) - @rm -f mv$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(mv_OBJECTS) $(mv_LDADD) $(LIBS) -nice$(EXEEXT): $(nice_OBJECTS) $(nice_DEPENDENCIES) $(EXTRA_nice_DEPENDENCIES) - @rm -f nice$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(nice_OBJECTS) $(nice_LDADD) $(LIBS) -nl$(EXEEXT): $(nl_OBJECTS) $(nl_DEPENDENCIES) $(EXTRA_nl_DEPENDENCIES) - @rm -f nl$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(nl_OBJECTS) $(nl_LDADD) $(LIBS) -nohup$(EXEEXT): $(nohup_OBJECTS) $(nohup_DEPENDENCIES) $(EXTRA_nohup_DEPENDENCIES) - @rm -f nohup$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(nohup_OBJECTS) $(nohup_LDADD) $(LIBS) -nproc$(EXEEXT): $(nproc_OBJECTS) $(nproc_DEPENDENCIES) $(EXTRA_nproc_DEPENDENCIES) - @rm -f nproc$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(nproc_OBJECTS) $(nproc_LDADD) $(LIBS) -od$(EXEEXT): $(od_OBJECTS) $(od_DEPENDENCIES) $(EXTRA_od_DEPENDENCIES) - @rm -f od$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(od_OBJECTS) $(od_LDADD) $(LIBS) -paste$(EXEEXT): $(paste_OBJECTS) $(paste_DEPENDENCIES) $(EXTRA_paste_DEPENDENCIES) - @rm -f paste$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(paste_OBJECTS) $(paste_LDADD) $(LIBS) -pathchk$(EXEEXT): $(pathchk_OBJECTS) $(pathchk_DEPENDENCIES) $(EXTRA_pathchk_DEPENDENCIES) - @rm -f pathchk$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pathchk_OBJECTS) $(pathchk_LDADD) $(LIBS) -pinky$(EXEEXT): $(pinky_OBJECTS) $(pinky_DEPENDENCIES) $(EXTRA_pinky_DEPENDENCIES) - @rm -f pinky$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pinky_OBJECTS) $(pinky_LDADD) $(LIBS) -pr$(EXEEXT): $(pr_OBJECTS) $(pr_DEPENDENCIES) $(EXTRA_pr_DEPENDENCIES) - @rm -f pr$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pr_OBJECTS) $(pr_LDADD) $(LIBS) -printenv$(EXEEXT): $(printenv_OBJECTS) $(printenv_DEPENDENCIES) $(EXTRA_printenv_DEPENDENCIES) - @rm -f printenv$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(printenv_OBJECTS) $(printenv_LDADD) $(LIBS) -printf$(EXEEXT): $(printf_OBJECTS) $(printf_DEPENDENCIES) $(EXTRA_printf_DEPENDENCIES) - @rm -f printf$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(printf_OBJECTS) $(printf_LDADD) $(LIBS) -ptx$(EXEEXT): $(ptx_OBJECTS) $(ptx_DEPENDENCIES) $(EXTRA_ptx_DEPENDENCIES) - @rm -f ptx$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ptx_OBJECTS) $(ptx_LDADD) $(LIBS) -pwd$(EXEEXT): $(pwd_OBJECTS) $(pwd_DEPENDENCIES) $(EXTRA_pwd_DEPENDENCIES) - @rm -f pwd$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pwd_OBJECTS) $(pwd_LDADD) $(LIBS) -readlink$(EXEEXT): $(readlink_OBJECTS) $(readlink_DEPENDENCIES) $(EXTRA_readlink_DEPENDENCIES) - @rm -f readlink$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(readlink_OBJECTS) $(readlink_LDADD) $(LIBS) -realpath$(EXEEXT): $(realpath_OBJECTS) $(realpath_DEPENDENCIES) $(EXTRA_realpath_DEPENDENCIES) - @rm -f realpath$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(realpath_OBJECTS) $(realpath_LDADD) $(LIBS) -rm$(EXEEXT): $(rm_OBJECTS) $(rm_DEPENDENCIES) $(EXTRA_rm_DEPENDENCIES) - @rm -f rm > /dev/null 2>&1 || /bin/rm -f rm$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(rm_OBJECTS) $(rm_LDADD) $(LIBS) -rmdir$(EXEEXT): $(rmdir_OBJECTS) $(rmdir_DEPENDENCIES) $(EXTRA_rmdir_DEPENDENCIES) - @rm -f rmdir$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(rmdir_OBJECTS) $(rmdir_LDADD) $(LIBS) -runcon$(EXEEXT): $(runcon_OBJECTS) $(runcon_DEPENDENCIES) $(EXTRA_runcon_DEPENDENCIES) - @rm -f runcon$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(runcon_OBJECTS) $(runcon_LDADD) $(LIBS) -seq$(EXEEXT): $(seq_OBJECTS) $(seq_DEPENDENCIES) $(EXTRA_seq_DEPENDENCIES) - @rm -f seq$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(seq_OBJECTS) $(seq_LDADD) $(LIBS) -setuidgid$(EXEEXT): $(setuidgid_OBJECTS) $(setuidgid_DEPENDENCIES) $(EXTRA_setuidgid_DEPENDENCIES) - @rm -f setuidgid$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(setuidgid_OBJECTS) $(setuidgid_LDADD) $(LIBS) -sha1sum$(EXEEXT): $(sha1sum_OBJECTS) $(sha1sum_DEPENDENCIES) $(EXTRA_sha1sum_DEPENDENCIES) - @rm -f sha1sum$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(sha1sum_OBJECTS) $(sha1sum_LDADD) $(LIBS) -sha224sum$(EXEEXT): $(sha224sum_OBJECTS) $(sha224sum_DEPENDENCIES) $(EXTRA_sha224sum_DEPENDENCIES) - @rm -f sha224sum$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(sha224sum_OBJECTS) $(sha224sum_LDADD) $(LIBS) -sha256sum$(EXEEXT): $(sha256sum_OBJECTS) $(sha256sum_DEPENDENCIES) $(EXTRA_sha256sum_DEPENDENCIES) - @rm -f sha256sum$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(sha256sum_OBJECTS) $(sha256sum_LDADD) $(LIBS) -sha384sum$(EXEEXT): $(sha384sum_OBJECTS) $(sha384sum_DEPENDENCIES) $(EXTRA_sha384sum_DEPENDENCIES) - @rm -f sha384sum$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(sha384sum_OBJECTS) $(sha384sum_LDADD) $(LIBS) -sha512sum$(EXEEXT): $(sha512sum_OBJECTS) $(sha512sum_DEPENDENCIES) $(EXTRA_sha512sum_DEPENDENCIES) - @rm -f sha512sum$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(sha512sum_OBJECTS) $(sha512sum_LDADD) $(LIBS) -shred$(EXEEXT): $(shred_OBJECTS) $(shred_DEPENDENCIES) $(EXTRA_shred_DEPENDENCIES) - @rm -f shred$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(shred_OBJECTS) $(shred_LDADD) $(LIBS) -shuf$(EXEEXT): $(shuf_OBJECTS) $(shuf_DEPENDENCIES) $(EXTRA_shuf_DEPENDENCIES) - @rm -f shuf$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(shuf_OBJECTS) $(shuf_LDADD) $(LIBS) -sleep$(EXEEXT): $(sleep_OBJECTS) $(sleep_DEPENDENCIES) $(EXTRA_sleep_DEPENDENCIES) - @rm -f sleep$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(sleep_OBJECTS) $(sleep_LDADD) $(LIBS) -sort$(EXEEXT): $(sort_OBJECTS) $(sort_DEPENDENCIES) $(EXTRA_sort_DEPENDENCIES) - @rm -f sort$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(sort_OBJECTS) $(sort_LDADD) $(LIBS) -split$(EXEEXT): $(split_OBJECTS) $(split_DEPENDENCIES) $(EXTRA_split_DEPENDENCIES) - @rm -f split$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(split_OBJECTS) $(split_LDADD) $(LIBS) -stat$(EXEEXT): $(stat_OBJECTS) $(stat_DEPENDENCIES) $(EXTRA_stat_DEPENDENCIES) - @rm -f stat$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(stat_OBJECTS) $(stat_LDADD) $(LIBS) -stdbuf$(EXEEXT): $(stdbuf_OBJECTS) $(stdbuf_DEPENDENCIES) $(EXTRA_stdbuf_DEPENDENCIES) - @rm -f stdbuf$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(stdbuf_OBJECTS) $(stdbuf_LDADD) $(LIBS) -stty$(EXEEXT): $(stty_OBJECTS) $(stty_DEPENDENCIES) $(EXTRA_stty_DEPENDENCIES) - @rm -f stty$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(stty_OBJECTS) $(stty_LDADD) $(LIBS) -su$(EXEEXT): $(su_OBJECTS) $(su_DEPENDENCIES) $(EXTRA_su_DEPENDENCIES) - @rm -f su$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(su_OBJECTS) $(su_LDADD) $(LIBS) -sum$(EXEEXT): $(sum_OBJECTS) $(sum_DEPENDENCIES) $(EXTRA_sum_DEPENDENCIES) - @rm -f sum$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(sum_OBJECTS) $(sum_LDADD) $(LIBS) -sync$(EXEEXT): $(sync_OBJECTS) $(sync_DEPENDENCIES) $(EXTRA_sync_DEPENDENCIES) - @rm -f sync$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(sync_OBJECTS) $(sync_LDADD) $(LIBS) -tac$(EXEEXT): $(tac_OBJECTS) $(tac_DEPENDENCIES) $(EXTRA_tac_DEPENDENCIES) - @rm -f tac$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(tac_OBJECTS) $(tac_LDADD) $(LIBS) -tail$(EXEEXT): $(tail_OBJECTS) $(tail_DEPENDENCIES) $(EXTRA_tail_DEPENDENCIES) - @rm -f tail$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(tail_OBJECTS) $(tail_LDADD) $(LIBS) -tee$(EXEEXT): $(tee_OBJECTS) $(tee_DEPENDENCIES) $(EXTRA_tee_DEPENDENCIES) - @rm -f tee$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(tee_OBJECTS) $(tee_LDADD) $(LIBS) -test$(EXEEXT): $(test_OBJECTS) $(test_DEPENDENCIES) $(EXTRA_test_DEPENDENCIES) - @rm -f test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_OBJECTS) $(test_LDADD) $(LIBS) -timeout$(EXEEXT): $(timeout_OBJECTS) $(timeout_DEPENDENCIES) $(EXTRA_timeout_DEPENDENCIES) - @rm -f timeout$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(timeout_OBJECTS) $(timeout_LDADD) $(LIBS) -touch$(EXEEXT): $(touch_OBJECTS) $(touch_DEPENDENCIES) $(EXTRA_touch_DEPENDENCIES) - @rm -f touch$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(touch_OBJECTS) $(touch_LDADD) $(LIBS) -tr$(EXEEXT): $(tr_OBJECTS) $(tr_DEPENDENCIES) $(EXTRA_tr_DEPENDENCIES) - @rm -f tr$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(tr_OBJECTS) $(tr_LDADD) $(LIBS) -true$(EXEEXT): $(true_OBJECTS) $(true_DEPENDENCIES) $(EXTRA_true_DEPENDENCIES) - @rm -f true$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(true_OBJECTS) $(true_LDADD) $(LIBS) -truncate$(EXEEXT): $(truncate_OBJECTS) $(truncate_DEPENDENCIES) $(EXTRA_truncate_DEPENDENCIES) - @rm -f truncate$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(truncate_OBJECTS) $(truncate_LDADD) $(LIBS) -tsort$(EXEEXT): $(tsort_OBJECTS) $(tsort_DEPENDENCIES) $(EXTRA_tsort_DEPENDENCIES) - @rm -f tsort$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(tsort_OBJECTS) $(tsort_LDADD) $(LIBS) -tty$(EXEEXT): $(tty_OBJECTS) $(tty_DEPENDENCIES) $(EXTRA_tty_DEPENDENCIES) - @rm -f tty$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(tty_OBJECTS) $(tty_LDADD) $(LIBS) -uname$(EXEEXT): $(uname_OBJECTS) $(uname_DEPENDENCIES) $(EXTRA_uname_DEPENDENCIES) - @rm -f uname$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(uname_OBJECTS) $(uname_LDADD) $(LIBS) -unexpand$(EXEEXT): $(unexpand_OBJECTS) $(unexpand_DEPENDENCIES) $(EXTRA_unexpand_DEPENDENCIES) - @rm -f unexpand$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(unexpand_OBJECTS) $(unexpand_LDADD) $(LIBS) -uniq$(EXEEXT): $(uniq_OBJECTS) $(uniq_DEPENDENCIES) $(EXTRA_uniq_DEPENDENCIES) - @rm -f uniq$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(uniq_OBJECTS) $(uniq_LDADD) $(LIBS) -unlink$(EXEEXT): $(unlink_OBJECTS) $(unlink_DEPENDENCIES) $(EXTRA_unlink_DEPENDENCIES) - @rm -f unlink$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(unlink_OBJECTS) $(unlink_LDADD) $(LIBS) -uptime$(EXEEXT): $(uptime_OBJECTS) $(uptime_DEPENDENCIES) $(EXTRA_uptime_DEPENDENCIES) - @rm -f uptime$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(uptime_OBJECTS) $(uptime_LDADD) $(LIBS) -users$(EXEEXT): $(users_OBJECTS) $(users_DEPENDENCIES) $(EXTRA_users_DEPENDENCIES) - @rm -f users$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(users_OBJECTS) $(users_LDADD) $(LIBS) -vdir$(EXEEXT): $(vdir_OBJECTS) $(vdir_DEPENDENCIES) $(EXTRA_vdir_DEPENDENCIES) - @rm -f vdir$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(vdir_OBJECTS) $(vdir_LDADD) $(LIBS) -wc$(EXEEXT): $(wc_OBJECTS) $(wc_DEPENDENCIES) $(EXTRA_wc_DEPENDENCIES) - @rm -f wc$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(wc_OBJECTS) $(wc_LDADD) $(LIBS) -who$(EXEEXT): $(who_OBJECTS) $(who_DEPENDENCIES) $(EXTRA_who_DEPENDENCIES) - @rm -f who$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(who_OBJECTS) $(who_LDADD) $(LIBS) -whoami$(EXEEXT): $(whoami_OBJECTS) $(whoami_DEPENDENCIES) $(EXTRA_whoami_DEPENDENCIES) - @rm -f whoami$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(whoami_OBJECTS) $(whoami_LDADD) $(LIBS) -yes$(EXEEXT): $(yes_OBJECTS) $(yes_DEPENDENCIES) $(EXTRA_yes_DEPENDENCIES) - @rm -f yes$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(yes_OBJECTS) $(yes_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/base64.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basename.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cat.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chcon.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chgrp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chmod.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chown-core.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chown.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chroot.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cksum.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/comm.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/copy.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cp-hash.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/csplit.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cut.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/date.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dd.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/df.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dircolors.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dirname.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/du.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/echo.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/env.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/expand.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/expr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/extent-scan.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/factor.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/false.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/find-mount-point.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fmt.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fold.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getlimits.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ginstall-copy.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ginstall-cp-hash.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ginstall-extent-scan.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ginstall-install.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ginstall-prog-fprintf.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/group-list.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/groups.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/head.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hostid.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hostname.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/id.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/join.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kill.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lbracket.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libstdbuf_so-libstdbuf.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/link.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ln.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logname.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ls-dir.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ls-ls.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ls-vdir.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ls.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5sum-md5sum.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkdir.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkfifo.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mknod.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mktemp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mv.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nice.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nl.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nohup.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nproc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/od.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/operand2sig.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/paste.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pathchk.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pinky.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printenv.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printf.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prog-fprintf.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptx.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pwd.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readlink.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/realpath.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/relpath.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remove.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rm.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rmdir.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runcon.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seq.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/setuidgid.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha1sum-md5sum.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha224sum-md5sum.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha256sum-md5sum.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha384sum-md5sum.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha512sum-md5sum.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shred.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shuf.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sleep.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sort.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/split.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stat.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stdbuf.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stty.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/su.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sum.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sync.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tac.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tail.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tee.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timeout.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/touch.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/true.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/truncate.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tsort.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tty.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uname-arch.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uname-uname.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uname.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unexpand.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uniq.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unlink.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uptime.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/users.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/who.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/whoami.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yes.Po@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< - -.c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` - -ginstall-install.o: install.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ginstall_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ginstall-install.o -MD -MP -MF $(DEPDIR)/ginstall-install.Tpo -c -o ginstall-install.o `test -f 'install.c' || echo '$(srcdir)/'`install.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ginstall-install.Tpo $(DEPDIR)/ginstall-install.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='install.c' object='ginstall-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) $(ginstall_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ginstall-install.o `test -f 'install.c' || echo '$(srcdir)/'`install.c - -ginstall-install.obj: install.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ginstall_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ginstall-install.obj -MD -MP -MF $(DEPDIR)/ginstall-install.Tpo -c -o ginstall-install.obj `if test -f 'install.c'; then $(CYGPATH_W) 'install.c'; else $(CYGPATH_W) '$(srcdir)/install.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ginstall-install.Tpo $(DEPDIR)/ginstall-install.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='install.c' object='ginstall-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) $(ginstall_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ginstall-install.obj `if test -f 'install.c'; then $(CYGPATH_W) 'install.c'; else $(CYGPATH_W) '$(srcdir)/install.c'; fi` - -ginstall-prog-fprintf.o: prog-fprintf.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ginstall_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ginstall-prog-fprintf.o -MD -MP -MF $(DEPDIR)/ginstall-prog-fprintf.Tpo -c -o ginstall-prog-fprintf.o `test -f 'prog-fprintf.c' || echo '$(srcdir)/'`prog-fprintf.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ginstall-prog-fprintf.Tpo $(DEPDIR)/ginstall-prog-fprintf.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='prog-fprintf.c' object='ginstall-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) $(ginstall_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ginstall-prog-fprintf.o `test -f 'prog-fprintf.c' || echo '$(srcdir)/'`prog-fprintf.c - -ginstall-prog-fprintf.obj: prog-fprintf.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ginstall_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ginstall-prog-fprintf.obj -MD -MP -MF $(DEPDIR)/ginstall-prog-fprintf.Tpo -c -o ginstall-prog-fprintf.obj `if test -f 'prog-fprintf.c'; then $(CYGPATH_W) 'prog-fprintf.c'; else $(CYGPATH_W) '$(srcdir)/prog-fprintf.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ginstall-prog-fprintf.Tpo $(DEPDIR)/ginstall-prog-fprintf.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='prog-fprintf.c' object='ginstall-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) $(ginstall_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ginstall-prog-fprintf.obj `if test -f 'prog-fprintf.c'; then $(CYGPATH_W) 'prog-fprintf.c'; else $(CYGPATH_W) '$(srcdir)/prog-fprintf.c'; fi` - -ginstall-copy.o: copy.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ginstall_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ginstall-copy.o -MD -MP -MF $(DEPDIR)/ginstall-copy.Tpo -c -o ginstall-copy.o `test -f 'copy.c' || echo '$(srcdir)/'`copy.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ginstall-copy.Tpo $(DEPDIR)/ginstall-copy.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='copy.c' object='ginstall-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) $(ginstall_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ginstall-copy.o `test -f 'copy.c' || echo '$(srcdir)/'`copy.c - -ginstall-copy.obj: copy.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ginstall_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ginstall-copy.obj -MD -MP -MF $(DEPDIR)/ginstall-copy.Tpo -c -o ginstall-copy.obj `if test -f 'copy.c'; then $(CYGPATH_W) 'copy.c'; else $(CYGPATH_W) '$(srcdir)/copy.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ginstall-copy.Tpo $(DEPDIR)/ginstall-copy.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='copy.c' object='ginstall-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) $(ginstall_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ginstall-copy.obj `if test -f 'copy.c'; then $(CYGPATH_W) 'copy.c'; else $(CYGPATH_W) '$(srcdir)/copy.c'; fi` - -ginstall-cp-hash.o: cp-hash.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ginstall_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ginstall-cp-hash.o -MD -MP -MF $(DEPDIR)/ginstall-cp-hash.Tpo -c -o ginstall-cp-hash.o `test -f 'cp-hash.c' || echo '$(srcdir)/'`cp-hash.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ginstall-cp-hash.Tpo $(DEPDIR)/ginstall-cp-hash.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cp-hash.c' object='ginstall-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) $(ginstall_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ginstall-cp-hash.o `test -f 'cp-hash.c' || echo '$(srcdir)/'`cp-hash.c - -ginstall-cp-hash.obj: cp-hash.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ginstall_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ginstall-cp-hash.obj -MD -MP -MF $(DEPDIR)/ginstall-cp-hash.Tpo -c -o ginstall-cp-hash.obj `if test -f 'cp-hash.c'; then $(CYGPATH_W) 'cp-hash.c'; else $(CYGPATH_W) '$(srcdir)/cp-hash.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ginstall-cp-hash.Tpo $(DEPDIR)/ginstall-cp-hash.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cp-hash.c' object='ginstall-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) $(ginstall_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ginstall-cp-hash.obj `if test -f 'cp-hash.c'; then $(CYGPATH_W) 'cp-hash.c'; else $(CYGPATH_W) '$(srcdir)/cp-hash.c'; fi` - -ginstall-extent-scan.o: extent-scan.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ginstall_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ginstall-extent-scan.o -MD -MP -MF $(DEPDIR)/ginstall-extent-scan.Tpo -c -o ginstall-extent-scan.o `test -f 'extent-scan.c' || echo '$(srcdir)/'`extent-scan.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ginstall-extent-scan.Tpo $(DEPDIR)/ginstall-extent-scan.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='extent-scan.c' object='ginstall-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) $(ginstall_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ginstall-extent-scan.o `test -f 'extent-scan.c' || echo '$(srcdir)/'`extent-scan.c - -ginstall-extent-scan.obj: extent-scan.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ginstall_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ginstall-extent-scan.obj -MD -MP -MF $(DEPDIR)/ginstall-extent-scan.Tpo -c -o ginstall-extent-scan.obj `if test -f 'extent-scan.c'; then $(CYGPATH_W) 'extent-scan.c'; else $(CYGPATH_W) '$(srcdir)/extent-scan.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ginstall-extent-scan.Tpo $(DEPDIR)/ginstall-extent-scan.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='extent-scan.c' object='ginstall-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) $(ginstall_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ginstall-extent-scan.obj `if test -f 'extent-scan.c'; then $(CYGPATH_W) 'extent-scan.c'; else $(CYGPATH_W) '$(srcdir)/extent-scan.c'; fi` - -libstdbuf_so-libstdbuf.o: libstdbuf.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libstdbuf_so_CFLAGS) $(CFLAGS) -MT libstdbuf_so-libstdbuf.o -MD -MP -MF $(DEPDIR)/libstdbuf_so-libstdbuf.Tpo -c -o libstdbuf_so-libstdbuf.o `test -f 'libstdbuf.c' || echo '$(srcdir)/'`libstdbuf.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libstdbuf_so-libstdbuf.Tpo $(DEPDIR)/libstdbuf_so-libstdbuf.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libstdbuf.c' object='libstdbuf_so-libstdbuf.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) $(libstdbuf_so_CFLAGS) $(CFLAGS) -c -o libstdbuf_so-libstdbuf.o `test -f 'libstdbuf.c' || echo '$(srcdir)/'`libstdbuf.c - -libstdbuf_so-libstdbuf.obj: libstdbuf.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libstdbuf_so_CFLAGS) $(CFLAGS) -MT libstdbuf_so-libstdbuf.obj -MD -MP -MF $(DEPDIR)/libstdbuf_so-libstdbuf.Tpo -c -o libstdbuf_so-libstdbuf.obj `if test -f 'libstdbuf.c'; then $(CYGPATH_W) 'libstdbuf.c'; else $(CYGPATH_W) '$(srcdir)/libstdbuf.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libstdbuf_so-libstdbuf.Tpo $(DEPDIR)/libstdbuf_so-libstdbuf.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libstdbuf.c' object='libstdbuf_so-libstdbuf.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) $(libstdbuf_so_CFLAGS) $(CFLAGS) -c -o libstdbuf_so-libstdbuf.obj `if test -f 'libstdbuf.c'; then $(CYGPATH_W) 'libstdbuf.c'; else $(CYGPATH_W) '$(srcdir)/libstdbuf.c'; fi` - -md5sum-md5sum.o: md5sum.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(md5sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT md5sum-md5sum.o -MD -MP -MF $(DEPDIR)/md5sum-md5sum.Tpo -c -o md5sum-md5sum.o `test -f 'md5sum.c' || echo '$(srcdir)/'`md5sum.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/md5sum-md5sum.Tpo $(DEPDIR)/md5sum-md5sum.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='md5sum.c' object='md5sum-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) $(md5sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o md5sum-md5sum.o `test -f 'md5sum.c' || echo '$(srcdir)/'`md5sum.c - -md5sum-md5sum.obj: md5sum.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(md5sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT md5sum-md5sum.obj -MD -MP -MF $(DEPDIR)/md5sum-md5sum.Tpo -c -o md5sum-md5sum.obj `if test -f 'md5sum.c'; then $(CYGPATH_W) 'md5sum.c'; else $(CYGPATH_W) '$(srcdir)/md5sum.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/md5sum-md5sum.Tpo $(DEPDIR)/md5sum-md5sum.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='md5sum.c' object='md5sum-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) $(md5sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o md5sum-md5sum.obj `if test -f 'md5sum.c'; then $(CYGPATH_W) 'md5sum.c'; else $(CYGPATH_W) '$(srcdir)/md5sum.c'; fi` - -sha1sum-md5sum.o: md5sum.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sha1sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sha1sum-md5sum.o -MD -MP -MF $(DEPDIR)/sha1sum-md5sum.Tpo -c -o sha1sum-md5sum.o `test -f 'md5sum.c' || echo '$(srcdir)/'`md5sum.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/sha1sum-md5sum.Tpo $(DEPDIR)/sha1sum-md5sum.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='md5sum.c' object='sha1sum-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) $(sha1sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sha1sum-md5sum.o `test -f 'md5sum.c' || echo '$(srcdir)/'`md5sum.c - -sha1sum-md5sum.obj: md5sum.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sha1sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sha1sum-md5sum.obj -MD -MP -MF $(DEPDIR)/sha1sum-md5sum.Tpo -c -o sha1sum-md5sum.obj `if test -f 'md5sum.c'; then $(CYGPATH_W) 'md5sum.c'; else $(CYGPATH_W) '$(srcdir)/md5sum.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/sha1sum-md5sum.Tpo $(DEPDIR)/sha1sum-md5sum.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='md5sum.c' object='sha1sum-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) $(sha1sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sha1sum-md5sum.obj `if test -f 'md5sum.c'; then $(CYGPATH_W) 'md5sum.c'; else $(CYGPATH_W) '$(srcdir)/md5sum.c'; fi` - -sha224sum-md5sum.o: md5sum.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sha224sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sha224sum-md5sum.o -MD -MP -MF $(DEPDIR)/sha224sum-md5sum.Tpo -c -o sha224sum-md5sum.o `test -f 'md5sum.c' || echo '$(srcdir)/'`md5sum.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/sha224sum-md5sum.Tpo $(DEPDIR)/sha224sum-md5sum.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='md5sum.c' object='sha224sum-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) $(sha224sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sha224sum-md5sum.o `test -f 'md5sum.c' || echo '$(srcdir)/'`md5sum.c - -sha224sum-md5sum.obj: md5sum.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sha224sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sha224sum-md5sum.obj -MD -MP -MF $(DEPDIR)/sha224sum-md5sum.Tpo -c -o sha224sum-md5sum.obj `if test -f 'md5sum.c'; then $(CYGPATH_W) 'md5sum.c'; else $(CYGPATH_W) '$(srcdir)/md5sum.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/sha224sum-md5sum.Tpo $(DEPDIR)/sha224sum-md5sum.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='md5sum.c' object='sha224sum-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) $(sha224sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sha224sum-md5sum.obj `if test -f 'md5sum.c'; then $(CYGPATH_W) 'md5sum.c'; else $(CYGPATH_W) '$(srcdir)/md5sum.c'; fi` - -sha256sum-md5sum.o: md5sum.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sha256sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sha256sum-md5sum.o -MD -MP -MF $(DEPDIR)/sha256sum-md5sum.Tpo -c -o sha256sum-md5sum.o `test -f 'md5sum.c' || echo '$(srcdir)/'`md5sum.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/sha256sum-md5sum.Tpo $(DEPDIR)/sha256sum-md5sum.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='md5sum.c' object='sha256sum-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) $(sha256sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sha256sum-md5sum.o `test -f 'md5sum.c' || echo '$(srcdir)/'`md5sum.c - -sha256sum-md5sum.obj: md5sum.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sha256sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sha256sum-md5sum.obj -MD -MP -MF $(DEPDIR)/sha256sum-md5sum.Tpo -c -o sha256sum-md5sum.obj `if test -f 'md5sum.c'; then $(CYGPATH_W) 'md5sum.c'; else $(CYGPATH_W) '$(srcdir)/md5sum.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/sha256sum-md5sum.Tpo $(DEPDIR)/sha256sum-md5sum.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='md5sum.c' object='sha256sum-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) $(sha256sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sha256sum-md5sum.obj `if test -f 'md5sum.c'; then $(CYGPATH_W) 'md5sum.c'; else $(CYGPATH_W) '$(srcdir)/md5sum.c'; fi` - -sha384sum-md5sum.o: md5sum.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sha384sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sha384sum-md5sum.o -MD -MP -MF $(DEPDIR)/sha384sum-md5sum.Tpo -c -o sha384sum-md5sum.o `test -f 'md5sum.c' || echo '$(srcdir)/'`md5sum.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/sha384sum-md5sum.Tpo $(DEPDIR)/sha384sum-md5sum.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='md5sum.c' object='sha384sum-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) $(sha384sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sha384sum-md5sum.o `test -f 'md5sum.c' || echo '$(srcdir)/'`md5sum.c - -sha384sum-md5sum.obj: md5sum.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sha384sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sha384sum-md5sum.obj -MD -MP -MF $(DEPDIR)/sha384sum-md5sum.Tpo -c -o sha384sum-md5sum.obj `if test -f 'md5sum.c'; then $(CYGPATH_W) 'md5sum.c'; else $(CYGPATH_W) '$(srcdir)/md5sum.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/sha384sum-md5sum.Tpo $(DEPDIR)/sha384sum-md5sum.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='md5sum.c' object='sha384sum-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) $(sha384sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sha384sum-md5sum.obj `if test -f 'md5sum.c'; then $(CYGPATH_W) 'md5sum.c'; else $(CYGPATH_W) '$(srcdir)/md5sum.c'; fi` - -sha512sum-md5sum.o: md5sum.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sha512sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sha512sum-md5sum.o -MD -MP -MF $(DEPDIR)/sha512sum-md5sum.Tpo -c -o sha512sum-md5sum.o `test -f 'md5sum.c' || echo '$(srcdir)/'`md5sum.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/sha512sum-md5sum.Tpo $(DEPDIR)/sha512sum-md5sum.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='md5sum.c' object='sha512sum-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) $(sha512sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sha512sum-md5sum.o `test -f 'md5sum.c' || echo '$(srcdir)/'`md5sum.c - -sha512sum-md5sum.obj: md5sum.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sha512sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sha512sum-md5sum.obj -MD -MP -MF $(DEPDIR)/sha512sum-md5sum.Tpo -c -o sha512sum-md5sum.obj `if test -f 'md5sum.c'; then $(CYGPATH_W) 'md5sum.c'; else $(CYGPATH_W) '$(srcdir)/md5sum.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/sha512sum-md5sum.Tpo $(DEPDIR)/sha512sum-md5sum.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='md5sum.c' object='sha512sum-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) $(sha512sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sha512sum-md5sum.obj `if test -f 'md5sum.c'; then $(CYGPATH_W) 'md5sum.c'; else $(CYGPATH_W) '$(srcdir)/md5sum.c'; fi` - -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: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - 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; }; }'`; \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: CTAGS -CTAGS: $(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; }; }'`; \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" - -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ - 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 - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" distdir="$(distdir)" \ - dist-hook -check-am: all-am -check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am -all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(HEADERS) all-local -installdirs: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibexecdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) -clean: clean-am - -clean-am: clean-binPROGRAMS clean-generic clean-noinstLIBRARIES \ - clean-noinstPROGRAMS clean-pkglibexecPROGRAMS mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: install-binPROGRAMS install-pkglibexecPROGRAMS - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-exec-hook -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-binPROGRAMS uninstall-local \ - uninstall-pkglibexecPROGRAMS - -.MAKE: all check install install-am install-exec-am install-strip - -.PHONY: CTAGS GTAGS all all-am all-local check check-am clean \ - clean-binPROGRAMS clean-generic clean-noinstLIBRARIES \ - clean-noinstPROGRAMS clean-pkglibexecPROGRAMS cscopelist ctags \ - dist-hook 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-exec-hook install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-pkglibexecPROGRAMS install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ - ps ps-am tags uninstall uninstall-am uninstall-binPROGRAMS \ - uninstall-local uninstall-pkglibexecPROGRAMS - - -$(PROGRAMS): ../lib/libcoreutils.a - -all-local: su$(EXEEXT) - -install-root: su$(EXEEXT) - @$(install_su) - -install-exec-hook: su$(EXEEXT) - @if test "$(INSTALL_SU)" = yes; then \ - TMPFILE=$(DESTDIR)$(bindir)/.su-$$$$; \ - rm -f $$TMPFILE; \ - echo > $$TMPFILE; \ - can_create_suid_root_executable=no; \ - chown root $$TMPFILE > /dev/null 2>&1 \ - && chmod $(setuid_root_mode) $$TMPFILE > /dev/null 2>&1 \ - && can_create_suid_root_executable=yes; \ - rm -f $$TMPFILE; \ - if test $$can_create_suid_root_executable = yes; then \ - $(install_su); \ - else \ - echo "WARNING: insufficient access; not installing su"; \ - echo "NOTE: to install su, run 'make install-root' as root"; \ - rm -f $(installed_su); \ - fi; \ - else :; \ - fi - -uninstall-local: -# Remove su only if it's one we installed. - @if test "$(INSTALL_SU)" = yes; then \ - if grep '$(PACKAGE_NAME)' $(installed_su) > /dev/null 2>&1; then \ - echo " rm -f $(installed_su)"; \ - rm -f $(installed_su); \ - else :; \ - fi; \ - fi -dircolors.h: dcgen dircolors.hin - $(AM_V_GEN)rm -f $@ $@-t - $(AM_V_at)$(PERL) -w -- $(srcdir)/dcgen $(srcdir)/dircolors.hin > $@-t - $(AM_V_at)chmod a-w $@-t - $(AM_V_at)mv $@-t $@ -wheel-size.h: Makefile.am - $(AM_V_GEN)rm -f $@ $@-t - $(AM_V_at)echo '#define WHEEL_SIZE $(wheel_size)' > $@-t - $(AM_V_at)chmod a-w $@-t - $(AM_V_at)mv $@-t $@ -wheel.h: wheel-gen.pl Makefile.am - $(AM_V_GEN)rm -f $@ $@-t - $(AM_V_at)$(srcdir)/wheel-gen.pl $(wheel_size) > $@-t - $(AM_V_at)chmod a-w $@-t - $(AM_V_at)mv $@-t $@ - -# Compare fs.h with the list of file system names/magic-numbers in the -# Linux statfs man page. This target prints any new name/number pairs. -# Also compare against /usr/include/linux/magic.h -.PHONY: fs-magic-compare -fs-magic-compare: fs-magic fs-kernel-magic fs-def - join -v1 -t@ fs-magic fs-def - join -v1 -t@ fs-kernel-magic fs-def -fs-def: fs.h - grep '^# *define ' $< | $(ASSORT) > $@-t && mv $@-t $@ -fs-magic: Makefile - 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' \ - | LC_ALL=C sort \ - > $@-t && mv $@-t $@ -fs-kernel-magic: Makefile - perl -ne '/^#define.*0x/ and print' /usr/include/linux/magic.h \ - | perl -p \ - $(fs_normalize_perl_subst) \ - | grep -Ev 'S_MAGIC_EXT[34]|STACK_END' \ - | LC_ALL=C sort \ - > $@-t && mv $@-t $@ -fs-is-local.h: stat.c extract-magic - $(AM_V_GEN)rm -f $@ - $(AM_V_at)$(PERL) $(srcdir)/extract-magic --local $(srcdir)/stat.c \ - > $@t - $(AM_V_at)chmod a-w $@t - $(AM_V_at)mv $@t $@ -fs.h: stat.c extract-magic - $(AM_V_GEN)rm -f $@ - $(AM_V_at)$(PERL) $(srcdir)/extract-magic $(srcdir)/stat.c > $@t - $(AM_V_at)chmod a-w $@t - $(AM_V_at)mv $@t $@ -version.c: Makefile - $(AM_V_GEN)rm -f $@ - $(AM_V_at)printf '#include <config.h>\n' > $@t - $(AM_V_at)printf 'char const *Version = "$(PACKAGE_VERSION)";\n' >> $@t - $(AM_V_at)chmod a-w $@t - $(AM_V_at)mv $@t $@ -version.h: Makefile - $(AM_V_GEN)rm -f $@ - $(AM_V_at)printf 'extern char const *Version;\n' > $@t - $(AM_V_at)chmod a-w $@t - $(AM_V_at)mv $@t $@ - -built_programs.list: - @echo $(bin_PROGRAMS) $(bin_SCRIPTS) | tr ' ' '\n' \ - | sed -e 's,$(EXEEXT)$$,,' | $(ASSORT) -u | tr '\n' ' ' - -all_programs.list: - @echo $(all_programs) | tr ' ' '\n' | sed -e 's,$(EXEEXT)$$,,' \ - | sed /libstdbuf/d \ - | $(ASSORT) -u - -# This is required because we have broken 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. -dist-hook: $(all_programs) - -# Ensure that all programs are built so we can for example -# subsequently syntax check all man pages. -.PHONY: all_programs -all_programs: $(all_programs) -# Ensure that the list of programs in README matches the list -# of programs we can build. -check: check-README check-duplicate-no-install -.PHONY: check-README -check-README: - $(AM_V_GEN)rm -rf $(pr) $(pm) - $(AM_V_at)echo $(all_programs) \ - | tr -s ' ' '\n' | sed -e 's,$(EXEEXT)$$,,;s/ginstall/install/' \ - | sed /libstdbuf/d \ - | $(ASSORT) -u > $(pm) && \ - sed -n '/^The programs .* are:/,/^[a-zA-Z]/p' $(top_srcdir)/README \ - | sed -n '/^ */s///p' | tr -s ' ' '\n' > $(pr) - $(AM_V_at)diff $(pm) $(pr) && rm -rf $(pr) $(pm) - -# Ensure that a by-default-not-installed program (listed in -# $(no_install__progs) is not also listed in $(EXTRA_PROGRAMS), because -# if that were to happen, it *would* be installed by default. -.PHONY: check-duplicate-no-install -check-duplicate-no-install: tr - $(AM_V_GEN)test -z "`echo '$(EXTRA_PROGRAMS)'| ./tr ' ' '\n' | uniq -d`" -.PHONY: _sc_check-AUTHORS -_sc_check-AUTHORS: $(all_programs) - @locale=en_US.UTF-8; \ - LC_ALL=$$locale ./cat --version \ - | grep ' Torbjorn ' > /dev/null \ - && { echo "$@: skipping this check"; exit 0; }; \ - rm -f $(au_actual) $(au_dotdot); \ - for i in `ls $(all_programs) | sed -e 's,$(EXEEXT)$$,,' \ - | sed /libstdbuf/d \ - | $(ASSORT) -u`; do \ - test "$$i" = '[' && continue; \ - exe=$$i; \ - if test "$$i" = install; then \ - exe=ginstall; \ - elif test "$$i" = test; then \ - exe='['; \ - fi; \ - LC_ALL=$$locale ./$$exe --version \ - | perl -0 -pi -e 's/,\n/, /gm' \ - | sed -n -e '/Written by /{ s//'"$$i"': /;' \ - -e 's/,* and /, /; s/\.$$//; p; }'; \ - done > $(au_actual) && \ - sed -n '/^[^ ][^ ]*:/p' $(top_srcdir)/AUTHORS > $(au_dotdot) && \ - diff $(au_actual) $(au_dotdot) && rm -f $(au_actual) $(au_dotdot) - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/src/base64.c b/src/base64.c index 682cb913..0a400680 100644 --- a/src/base64.c +++ b/src/base64.c @@ -1,5 +1,5 @@ /* Base64 encode/decode strings or files. - Copyright (C) 2004-2012 Free Software Foundation, Inc. + Copyright (C) 2004-2013 Free Software Foundation, Inc. This file is part of Base64. @@ -60,7 +60,10 @@ usage (int status) printf (_("\ Usage: %s [OPTION]... [FILE]\n\ Base64 encode or decode FILE, or standard input, to standard output.\n\ -\n"), program_name); +"), program_name); + + emit_mandatory_arg_note (); + fputs (_("\ -d, --decode decode data\n\ -i, --ignore-garbage when decoding, ignore non-alphabet characters\n\ diff --git a/src/basename.c b/src/basename.c index 353ff084..074d284d 100644 --- a/src/basename.c +++ b/src/basename.c @@ -1,5 +1,5 @@ /* basename -- strip directory and suffix from file names - Copyright (C) 1990-2012 Free Software Foundation, Inc. + Copyright (C) 1990-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 @@ -53,9 +53,10 @@ Usage: %s NAME [SUFFIX]\n\ fputs (_("\ Print NAME with any leading directory components removed.\n\ If specified, also remove a trailing SUFFIX.\n\ -\n\ "), stdout); + emit_mandatory_arg_note (); + fputs (_("\ -a, --multiple support multiple arguments and treat each as a NAME\n\ -s, --suffix=SUFFIX remove a trailing SUFFIX\n\ diff --git a/src/cat.c b/src/cat.c index 9e901e0c..650cb20f 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-2012 Free Software Foundation, Inc. + Copyright (C) 1988-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 diff --git a/src/chcon.c b/src/chcon.c index 34e92e41..56f2caa5 100644 --- a/src/chcon.c +++ b/src/chcon.c @@ -1,5 +1,5 @@ /* chcon -- change security context of files - Copyright (C) 2005-2012 Free Software Foundation, Inc. + Copyright (C) 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 @@ -357,8 +357,10 @@ Usage: %s [OPTION]... CONTEXT FILE...\n\ fputs (_("\ Change the security context of each FILE to CONTEXT.\n\ With --reference, change the security context of each FILE to that of RFILE.\n\ -\n\ "), stdout); + + emit_mandatory_arg_note (); + fputs (_("\ --dereference affect the referent of each symbolic link (this is\n\ the default), rather than the symbolic link itself\n\ @@ -369,6 +371,10 @@ With --reference, change the security context of each FILE to that of RFILE.\n\ -r, --role=ROLE set role ROLE in the target security context\n\ -t, --type=TYPE set type TYPE in the target security context\n\ -l, --range=RANGE set range RANGE in the target security context\n\ +"), stdout); + fputs (_("\ + --no-preserve-root do not treat '/' specially (the default)\n\ + --preserve-root fail to operate recursively on '/'\n\ "), stdout); fputs (_("\ --reference=RFILE use RFILE's security context rather than specifying\n\ diff --git a/src/chgrp.c b/src/chgrp.c index 16b5e96d..c70855d3 100644 --- a/src/chgrp.c +++ b/src/chgrp.c @@ -1,5 +1,5 @@ /* chgrp -- change group ownership of files - Copyright (C) 1989-2012 Free Software Foundation, Inc. + Copyright (C) 1989-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 diff --git a/src/chmod.c b/src/chmod.c index a54078c0..2c25ce6d 100644 --- a/src/chmod.c +++ b/src/chmod.c @@ -1,5 +1,5 @@ /* chmod -- change permission modes of files - Copyright (C) 1989-2012 Free Software Foundation, Inc. + Copyright (C) 1989-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 diff --git a/src/chown-core.c b/src/chown-core.c index b7de4320..3a3044e0 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-2012 Free Software Foundation, Inc. + Copyright (C) 2000-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 diff --git a/src/chown-core.h b/src/chown-core.h index 38b3ba11..f6c808bc 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-2012 Free Software Foundation, Inc. + Copyright (C) 2000-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 diff --git a/src/chown.c b/src/chown.c index 8b4add79..9db0a569 100644 --- a/src/chown.c +++ b/src/chown.c @@ -1,5 +1,5 @@ /* chown -- change user and group ownership of files - Copyright (C) 1989-2012 Free Software Foundation, Inc. + Copyright (C) 1989-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 diff --git a/src/chroot.c b/src/chroot.c index dbb5c6da..1c1a9769 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-2012 Free Software Foundation, Inc. + Copyright (C) 1995-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 diff --git a/src/cksum.c b/src/cksum.c index d3ce0f8e..26571c7c 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-2012 Free Software Foundation, Inc. + Copyright (C) 1992-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 @@ -290,6 +290,10 @@ main (int argc, char **argv) atexit (close_stdout); + /* Line buffer stdout to ensure lines are written atomically and immediately + so that processes running in parallel do not intersperse their output. */ + setvbuf (stdout, NULL, _IOLBF, 0); + parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE, Version, usage, AUTHORS, (char const *) NULL); if (getopt_long (argc, argv, "", NULL, NULL) != -1) diff --git a/src/comm.c b/src/comm.c index 748147aa..b3248101 100644 --- a/src/comm.c +++ b/src/comm.c @@ -1,5 +1,5 @@ /* comm -- compare two sorted files line by line. - Copyright (C) 1986-2012 Free Software Foundation, Inc. + Copyright (C) 1986-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 diff --git a/src/copy.c b/src/copy.c index 2558fea1..3f2cc2b0 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-2012 Free Software Foundation, Inc. + Copyright (C) 1989-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 @@ -165,7 +165,7 @@ sparse_copy (int src_fd, int dest_fd, char *buf, size_t buf_size, { if (errno == EINTR) continue; - error (0, errno, _("reading %s"), quote (src_name)); + error (0, errno, _("error reading %s"), quote (src_name)); return false; } if (n_read == 0) @@ -203,7 +203,7 @@ sparse_copy (int src_fd, int dest_fd, char *buf, size_t buf_size, size_t n = n_read; if (full_write (dest_fd, buf, n) != n) { - error (0, errno, _("writing %s"), quote (dst_name)); + error (0, errno, _("error writing %s"), quote (dst_name)); return false; } @@ -1151,6 +1151,11 @@ preserve_metadata: if (set_acl (dst_name, dest_desc, x->mode) != 0) return_val = false; } + else if (x->explicit_no_preserve_mode) + { + if (set_acl (dst_name, dest_desc, 0666 & ~cached_umask ()) != 0) + return_val = false; + } else if (omitted_permissions) { omitted_permissions &= ~ cached_umask (); @@ -1167,13 +1172,13 @@ preserve_metadata: close_src_and_dst_desc: if (close (dest_desc) < 0) { - error (0, errno, _("closing %s"), quote (dst_name)); + error (0, errno, _("failed to close %s"), quote (dst_name)); return_val = false; } close_src_desc: if (close (source_desc) < 0) { - error (0, errno, _("closing %s"), quote (src_name)); + error (0, errno, _("failed to close %s"), quote (src_name)); return_val = false; } @@ -2389,8 +2394,13 @@ copy_internal (char const *src_name, char const *dst_name, /* POSIX says the permission bits of the source file must be used as the 3rd argument in the open call. Historical practice passed all the source mode bits to 'open', but the extra - bits were ignored, so it should be the same either way. */ - if (! copy_reg (src_name, dst_name, x, src_mode & S_IRWXUGO, + bits were ignored, so it should be the same either way. + + This call uses DST_MODE_BITS, not SRC_MODE. These are + normally the same, and the exception (where x->set_mode) is + used only by 'install', which POSIX does not specify and + where DST_MODE_BITS is what's wanted. */ + if (! copy_reg (src_name, dst_name, x, dst_mode_bits & S_IRWXUGO, omitted_permissions, &new_dst, &src_sb)) goto un_backup; } @@ -2570,6 +2580,11 @@ copy_internal (char const *src_name, char const *dst_name, if (set_acl (dst_name, -1, x->mode) != 0) return false; } + else if (x->explicit_no_preserve_mode) + { + if (set_acl (dst_name, -1, 0777 & ~cached_umask ()) != 0) + return false; + } else { if (omitted_permissions) diff --git a/src/copy.h b/src/copy.h index d70c09ea..cf72d3cc 100644 --- a/src/copy.h +++ b/src/copy.h @@ -1,5 +1,5 @@ /* core functions for copying files and directories - Copyright (C) 1989-2012 Free Software Foundation, Inc. + Copyright (C) 1989-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 @@ -157,6 +157,7 @@ struct cp_options bool preserve_ownership; bool preserve_mode; bool preserve_timestamps; + bool explicit_no_preserve_mode; /* Enabled for mv, and for cp by the --preserve=links option. If true, attempt to preserve in the destination files any diff --git a/src/cp-hash.c b/src/cp-hash.c index 77fd993c..9ef23fc4 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-2012 Free Software Foundation, Inc. + Copyright (C) 1989-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 diff --git a/src/cp.c b/src/cp.c index 6649af2e..e235b326 100644 --- a/src/cp.c +++ b/src/cp.c @@ -1,5 +1,5 @@ /* cp.c -- file copying (main routines) - Copyright (C) 1989-2012 Free Software Foundation, Inc. + Copyright (C) 1989-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 @@ -161,11 +161,10 @@ Usage: %s [OPTION]... [-T] SOURCE DEST\n\ program_name, program_name, program_name); fputs (_("\ Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n\ -\n\ -"), stdout); - fputs (_("\ -Mandatory arguments to long options are mandatory for short options too.\n\ "), stdout); + + emit_mandatory_arg_note (); + fputs (_("\ -a, --archive same as -dR --preserve=all\n\ --attributes-only don't copy the file data, just the attributes\n\ @@ -177,9 +176,8 @@ Mandatory arguments to long options are mandatory for short options too.\n\ "), stdout); fputs (_("\ -f, --force if an existing destination file cannot be\n\ - opened, remove it and try again (redundant if\ -\n\ - the -n option is used)\n\ + opened, remove it and try again (this option\n\ + is ignored when the -n option is also used)\n\ -i, --interactive prompt before overwrite (overrides a previous -n\ \n\ option)\n\ @@ -569,7 +567,7 @@ target_directory_operand (char const *file, struct stat *st, bool *new_dst) if (err) { if (err != ENOENT) - error (EXIT_FAILURE, err, _("accessing %s"), quote (file)); + error (EXIT_FAILURE, err, _("failed to access %s"), quote (file)); *new_dst = true; } return is_a_dir; @@ -783,6 +781,7 @@ cp_option_init (struct cp_options *x) x->preserve_links = false; 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_xattr = false; @@ -860,6 +859,7 @@ decode_preserve_arg (char const *arg, struct cp_options *x, bool on_off) { case PRESERVE_MODE: x->preserve_mode = on_off; + x->explicit_no_preserve_mode = !on_off; break; case PRESERVE_TIMESTAMPS: @@ -889,6 +889,7 @@ decode_preserve_arg (char const *arg, struct cp_options *x, bool on_off) x->preserve_timestamps = on_off; x->preserve_ownership = on_off; x->preserve_links = on_off; + x->explicit_no_preserve_mode = !on_off; if (selinux_enabled) x->preserve_security_context = on_off; x->preserve_xattr = on_off; @@ -1065,7 +1066,8 @@ main (int argc, char **argv) { struct stat st; if (stat (optarg, &st) != 0) - error (EXIT_FAILURE, errno, _("accessing %s"), quote (optarg)); + 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)); diff --git a/src/csplit.c b/src/csplit.c index fb43350a..22f3ad4b 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-2012 Free Software Foundation, Inc. + Copyright (C) 1991-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 @@ -425,6 +425,7 @@ free_buffer (struct buffer_record *buf) free (l); l = n; } + buf->line_start = NULL; free (buf->buffer); buf->buffer = NULL; } @@ -499,8 +500,6 @@ load_buffer (void) b->bytes_used += read_input (p, bytes_avail); lines_found = record_line_starts (b); - if (!lines_found) - free_buffer (b); if (lines_found || have_read_eof) break; @@ -515,7 +514,10 @@ load_buffer (void) if (lines_found) save_buffer (b); else - free (b); + { + free_buffer (b); + free (b); + } return lines_found != 0; } @@ -1453,11 +1455,10 @@ Usage: %s [OPTION]... FILE PATTERN...\n\ fputs (_("\ Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n\ and output byte counts of each piece to standard output.\n\ -\n\ -"), stdout); - fputs (_("\ -Mandatory arguments to long options are mandatory for short options too.\n\ "), stdout); + + emit_mandatory_arg_note (); + fputs (_("\ -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n\ -f, --prefix=PREFIX use PREFIX instead of 'xx'\n\ diff --git a/src/cu-progs.mk b/src/cu-progs.mk new file mode 100644 index 00000000..dba03ad0 --- /dev/null +++ b/src/cu-progs.mk @@ -0,0 +1,110 @@ +## 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/hostname +build_if_possible__progs = +build_if_possible__progs += src/chroot +build_if_possible__progs += src/df +build_if_possible__progs += src/hostid +build_if_possible__progs += src/libstdbuf.so +build_if_possible__progs += src/nice +build_if_possible__progs += src/pinky +build_if_possible__progs += src/stdbuf +build_if_possible__progs += src/stty +build_if_possible__progs += src/uptime +build_if_possible__progs += src/users +build_if_possible__progs += src/who +default__progs = +default__progs += src/[ +default__progs += src/base64 +default__progs += src/basename +default__progs += src/cat +default__progs += src/chcon +default__progs += src/chgrp +default__progs += src/chmod +default__progs += src/chown +default__progs += src/cksum +default__progs += src/comm +default__progs += src/cp +default__progs += src/csplit +default__progs += src/cut +default__progs += src/date +default__progs += src/dd +default__progs += src/dir +default__progs += src/dircolors +default__progs += src/dirname +default__progs += src/du +default__progs += src/echo +default__progs += src/env +default__progs += src/expand +default__progs += src/expr +default__progs += src/factor +default__progs += src/false +default__progs += src/fmt +default__progs += src/fold +default__progs += src/ginstall +default__progs += src/groups +default__progs += src/head +default__progs += src/id +default__progs += src/join +default__progs += src/kill +default__progs += src/link +default__progs += src/ln +default__progs += src/logname +default__progs += src/ls +default__progs += src/md5sum +default__progs += src/mkdir +default__progs += src/mkfifo +default__progs += src/mknod +default__progs += src/mktemp +default__progs += src/mv +default__progs += src/nl +default__progs += src/nproc +default__progs += src/nohup +default__progs += src/numfmt +default__progs += src/od +default__progs += src/paste +default__progs += src/pathchk +default__progs += src/pr +default__progs += src/printenv +default__progs += src/printf +default__progs += src/ptx +default__progs += src/pwd +default__progs += src/readlink +default__progs += src/realpath +default__progs += src/rm +default__progs += src/rmdir +default__progs += src/runcon +default__progs += src/seq +default__progs += src/sha1sum +default__progs += src/sha224sum +default__progs += src/sha256sum +default__progs += src/sha384sum +default__progs += src/sha512sum +default__progs += src/shred +default__progs += src/shuf +default__progs += src/sleep +default__progs += src/sort +default__progs += src/split +default__progs += src/stat +default__progs += src/sum +default__progs += src/sync +default__progs += src/tac +default__progs += src/tail +default__progs += src/tee +default__progs += src/test +default__progs += src/timeout +default__progs += src/touch +default__progs += src/tr +default__progs += src/true +default__progs += src/truncate +default__progs += src/tsort +default__progs += src/tty +default__progs += src/uname +default__progs += src/unexpand +default__progs += src/uniq +default__progs += src/unlink +default__progs += src/vdir +default__progs += src/wc +default__progs += src/whoami +default__progs += src/yes diff --git a/src/cut.c b/src/cut.c index 87380ac6..494aad77 100644 --- a/src/cut.c +++ b/src/cut.c @@ -1,5 +1,5 @@ /* cut - remove parts of lines of files - Copyright (C) 1997-2012 Free Software Foundation, Inc. + Copyright (C) 1997-2013 Free Software Foundation, Inc. Copyright (C) 1984 David M. Ihnat This program is free software: you can redistribute it and/or modify @@ -192,11 +192,10 @@ Usage: %s OPTION... [FILE]...\n\ program_name); fputs (_("\ Print selected parts of lines from each FILE to standard output.\n\ -\n\ -"), stdout); - fputs (_("\ -Mandatory arguments to long options are mandatory for short options too.\n\ "), stdout); + + emit_mandatory_arg_note (); + fputs (_("\ -b, --bytes=LIST select only these bytes\n\ -c, --characters=LIST select only these characters\n\ @@ -365,10 +364,13 @@ set_fields (const char *fieldstr) in_digits = false; /* Starting a range. */ if (dash_found) - FATAL_ERROR (_("invalid byte or field list")); + FATAL_ERROR (_("invalid byte, character or field list")); dash_found = true; fieldstr++; + if (lhs_specified && !value) + FATAL_ERROR (_("fields and positions are numbered from 1")); + initial = (lhs_specified ? value : 1); value = 0; } @@ -388,8 +390,10 @@ 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. */ - eol_range_start = initial; + /* '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; field_found = true; } else @@ -486,7 +490,7 @@ set_fields (const char *fieldstr) fieldstr++; } else - FATAL_ERROR (_("invalid byte or field list")); + FATAL_ERROR (_("invalid byte, character or field list")); } max_range_endpoint = 0; @@ -495,37 +499,40 @@ set_fields (const char *fieldstr) if (rp[i].hi > max_range_endpoint) max_range_endpoint = rp[i].hi; } - if (max_range_endpoint < eol_range_start) - max_range_endpoint = eol_range_start; /* 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. */ - printable_field = xzalloc (max_range_endpoint / CHAR_BIT + 1); + if (max_range_endpoint) + printable_field = xzalloc (max_range_endpoint / CHAR_BIT + 1); qsort (rp, n_rp, sizeof (rp[0]), compare_ranges); /* Set the array entries corresponding to integers in the ranges of RP. */ for (i = 0; i < n_rp; i++) { - size_t j; - size_t rsi_candidate; + /* 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. */ - rsi_candidate = complement ? rp[i].hi + 1 : rp[i].lo; + 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 (j = rp[i].lo; j <= rp[i].hi; j++) + for (size_t j = rp[i].lo; j <= rp[i].hi; j++) mark_printable_field (j); } if (output_delimiter_specified && !complement - && eol_range_start && !is_printable_field (eol_range_start)) + && eol_range_start + && max_range_endpoint + && (max_range_endpoint < eol_range_start + || !is_printable_field (eol_range_start))) mark_range_start (eol_range_start); free (rp); @@ -596,6 +603,7 @@ cut_fields (FILE *stream) return; ungetc (c, stream); + c = 0; /* To support the semantics of the -s flag, we may have to buffer all of the first field to determine whether it is 'delimited.' @@ -611,6 +619,7 @@ 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); @@ -626,12 +635,15 @@ cut_fields (FILE *stream) n_bytes = len; 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) + if (to_uchar (field_1_buffer[n_bytes - 1]) != delim || got_line) { - if (suppress_non_delimited) + if (suppress_non_delimited && !(got_line && delim == '\n')) { /* Empty. */ } @@ -639,8 +651,9 @@ cut_fields (FILE *stream) { fwrite (field_1_buffer, sizeof (char), n_bytes, stdout); /* Make sure the output line is newline terminated. */ - if (field_1_buffer[n_bytes - 1] != '\n') + if (! got_line) putchar ('\n'); + c = '\n'; } continue; } @@ -653,53 +666,46 @@ cut_fields (FILE *stream) ++field_idx; } - if (c != EOF) + int prev_c = c; + + if (print_kth (field_idx, NULL)) { - if (print_kth (field_idx, NULL)) + if (found_any_selected_field) { - if (found_any_selected_field) - { - fwrite (output_delimiter_string, sizeof (char), - output_delimiter_length, stdout); - } - found_any_selected_field = true; - - while ((c = getc (stream)) != delim && c != '\n' && c != EOF) - { - putchar (c); - } + fwrite (output_delimiter_string, sizeof (char), + output_delimiter_length, stdout); } - else + found_any_selected_field = true; + + while ((c = getc (stream)) != delim && c != '\n' && c != EOF) { - while ((c = getc (stream)) != delim && c != '\n' && c != EOF) - { - /* Empty. */ - } + putchar (c); + prev_c = c; } } - - if (c == '\n') + else { - c = getc (stream); - if (c != EOF) + while ((c = getc (stream)) != delim && c != '\n' && c != EOF) { - ungetc (c, stream); - c = '\n'; + prev_c = c; } } - if (c == delim) - ++field_idx; - else if (c == '\n' || c == EOF) + if (c == '\n' || c == EOF) { if (found_any_selected_field || !(suppress_non_delimited && field_idx == 1)) - putchar ('\n'); + { + if (c == '\n' || prev_c != '\n') + putchar ('\n'); + } if (c == EOF) break; field_idx = 1; found_any_selected_field = false; } + else if (c == delim) + field_idx++; } } @@ -840,7 +846,7 @@ main (int argc, char **argv) if (operating_mode == undefined_mode) FATAL_ERROR (_("you must specify a list of bytes, characters, or fields")); - if (delim != '\0' && operating_mode != field_mode) + if (delim_specified && operating_mode != field_mode) FATAL_ERROR (_("an input delimiter may be specified only\ when operating on fields")); diff --git a/src/date.c b/src/date.c index b03efff6..ec66f767 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-2012 Free Software Foundation, Inc. + Copyright (C) 1989-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 @@ -127,7 +127,11 @@ Usage: %s [OPTION]... [+FORMAT]\n\ program_name, program_name); fputs (_("\ Display the current time in the given FORMAT, or set the system date.\n\ -\n\ +"), stdout); + + emit_mandatory_arg_note (); + + fputs (_("\ -d, --date=STRING display time described by STRING, not 'now'\n\ -f, --file=DATEFILE like --date once for each line of DATEFILE\n\ -I[TIMESPEC], --iso-8601[=TIMESPEC] output date/time in ISO 8601 format.\n\ diff --git a/src/dcgen b/src/dcgen index 17efffc7..233fefd0 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-2012 Free Software Foundation, Inc. +# Copyright (C) 1996-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 diff --git a/src/dd.c b/src/dd.c index 163d514c..c98e578f 100644 --- a/src/dd.c +++ b/src/dd.c @@ -1,5 +1,5 @@ /* dd -- convert a file while copying it. - Copyright (C) 1985-2012 Free Software Foundation, Inc. + Copyright (C) 1985-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 @@ -135,7 +135,10 @@ enum /* Status bit masks. */ enum { - STATUS_NOXFER = 01 + STATUS_NOXFER = 01, + STATUS_NOCOUNTS = 02, + STATUS_LAST = STATUS_NOCOUNTS, + STATUS_NONE = STATUS_LAST | (STATUS_LAST - 1) }; /* The name of the input file, or NULL for the standard input. */ @@ -370,6 +373,7 @@ static struct symbol_value const flags[] = static struct symbol_value const statuses[] = { {"noxfer", STATUS_NOXFER}, + {"none", STATUS_NONE}, {"", 0} }; @@ -536,11 +540,12 @@ Copy a file, converting and formatting according to the operands.\n\ oflag=FLAGS write as per the comma separated symbol list\n\ seek=N skip N obs-sized blocks at start of output\n\ skip=N skip N ibs-sized blocks at start of input\n\ - status=noxfer suppress transfer statistics\n\ + status=WHICH WHICH info to suppress outputting to stderr;\n\ + 'noxfer' suppresses transfer stats, 'none' suppresses all\n\ "), stdout); fputs (_("\ \n\ -BLOCKS and BYTES may be followed by the following multiplicative suffixes:\n\ +N and BYTES may be followed by the following multiplicative suffixes:\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, and so on for T, P, E, Z, Y.\n\ \n\ @@ -664,7 +669,6 @@ multiple_bits_set (int i) static void print_stats (void) { - xtime_t now = gethrxtime (); char hbuf[LONGEST_HUMAN_READABLE + 1]; int human_opts = (human_autoscale | human_round_to_nearest @@ -672,6 +676,9 @@ print_stats (void) double delta_s; char const *bytes_per_second; + if ((status_flags & STATUS_NONE) == STATUS_NONE) + return; + fprintf (stderr, _("%"PRIuMAX"+%"PRIuMAX" records in\n" "%"PRIuMAX"+%"PRIuMAX" records out\n"), @@ -697,6 +704,7 @@ print_stats (void) w_bytes, human_readable (w_bytes, hbuf, human_opts, 1, 1)); + xtime_t now = gethrxtime (); if (start_time < now) { double XTIME_PRECISIONe0 = XTIME_PRECISION; @@ -1606,7 +1614,7 @@ skip (int fdesc, char const *file, uintmax_t records, size_t blocksize, { if (fdesc == STDIN_FILENO) { - error (0, errno, _("reading %s"), quote (file)); + error (0, errno, _("error reading %s"), quote (file)); if (conversions_mask & C_NOERROR) print_stats (); } @@ -1973,7 +1981,7 @@ dd_copy (void) if (nread < 0) { - error (0, errno, _("reading %s"), quote (input_file)); + error (0, errno, _("error reading %s"), quote (input_file)); if (conversions_mask & C_NOERROR) { print_stats (); @@ -2036,7 +2044,7 @@ dd_copy (void) w_bytes += nwritten; if (nwritten != n_bytes_read) { - error (0, errno, _("writing %s"), quote (output_file)); + error (0, errno, _("error writing %s"), quote (output_file)); return EXIT_FAILURE; } else if (n_bytes_read == input_blocksize) @@ -2099,7 +2107,7 @@ dd_copy (void) w_partial++; if (nwritten != oc) { - error (0, errno, _("writing %s"), quote (output_file)); + error (0, errno, _("error writing %s"), quote (output_file)); return EXIT_FAILURE; } } @@ -2122,9 +2130,9 @@ dd_copy (void) if (ftruncate (STDOUT_FILENO, output_offset) != 0) { error (0, errno, - _("failed to truncate to %"PRIuMAX" bytes" + _("failed to truncate to %" PRIdMAX " bytes" " in output file %s"), - output_offset, quote (output_file)); + (intmax_t) output_offset, quote (output_file)); return EXIT_FAILURE; } } @@ -2196,7 +2204,7 @@ main (int argc, char **argv) else { if (fd_reopen (STDIN_FILENO, input_file, O_RDONLY | input_flags, 0) < 0) - error (EXIT_FAILURE, errno, _("opening %s"), quote (input_file)); + error (EXIT_FAILURE, errno, _("failed to open %s"), quote (input_file)); } offset = lseek (STDIN_FILENO, 0, SEEK_CUR); @@ -2211,7 +2219,7 @@ main (int argc, char **argv) } else { - mode_t perms = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH; + mode_t perms = MODE_RW_UGO; int opts = (output_flags | (conversions_mask & C_NOCREAT ? 0 : O_CREAT) @@ -2225,7 +2233,8 @@ main (int argc, char **argv) || fd_reopen (STDOUT_FILENO, output_file, O_RDWR | opts, perms) < 0) && (fd_reopen (STDOUT_FILENO, output_file, O_WRONLY | opts, perms) < 0)) - error (EXIT_FAILURE, errno, _("opening %s"), quote (output_file)); + error (EXIT_FAILURE, errno, _("failed to open %s"), + quote (output_file)); if (seek_records != 0 && !(conversions_mask & C_NOTRUNC)) { diff --git a/src/df.c b/src/df.c index e99fedff..05151319 100644 --- a/src/df.c +++ b/src/df.c @@ -1,5 +1,5 @@ /* df - summarize free disk space - Copyright (C) 1991-2012 Free Software Foundation, Inc. + Copyright (C) 1991-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 @@ -43,11 +43,17 @@ proper_name ("David MacKenzie"), \ proper_name ("Paul Eggert") -/* If true, show inode information. */ -static bool inode_format; +/* Filled with device numbers of examined file systems to avoid + duplicities in output. */ +struct devlist +{ + dev_t dev_num; + struct mount_entry *me; + struct devlist *next; +}; /* If true, show even file systems with zero size or - uninteresting types. */ + uninteresting types. */ static bool show_all_fs; /* If true, show only local file systems. */ @@ -63,9 +69,6 @@ static int human_output_opts; /* The units to use when printing sizes. */ static uintmax_t output_block_size; -/* If true, use the POSIX output format. */ -static bool posix_format; - /* True if a file system has been processed for output. */ static bool file_systems_processed; @@ -78,7 +81,7 @@ static bool require_sync; /* Desired exit status. */ static int exit_status; -/* A file system type to display. */ +/* A file system type to display. */ struct fs_type_list { @@ -104,7 +107,7 @@ static struct fs_type_list *fs_select_list; static struct fs_type_list *fs_exclude_list; -/* Linked list of mounted file systems. */ +/* Linked list of mounted file systems. */ static struct mount_entry *mount_list; /* If true, print file system type as well. */ @@ -113,48 +116,113 @@ static bool print_type; /* If true, print a grand total at the end. */ static bool print_grand_total; -/* Grand total data. */ +/* Grand total data. */ static struct fs_usage grand_fsu; /* Display modes. */ -enum { DEFAULT_MODE, INODES_MODE, HUMAN_MODE, POSIX_MODE, NMODES }; +enum +{ + DEFAULT_MODE, + INODES_MODE, + HUMAN_MODE, + POSIX_MODE, + OUTPUT_MODE +}; static int header_mode = DEFAULT_MODE; /* Displayable fields. */ -enum +typedef enum { - DEV_FIELD, /* file system */ - TYPE_FIELD, /* FS type */ - TOTAL_FIELD, /* blocks or inodes */ - USED_FIELD, /* ditto */ - FREE_FIELD, /* ditto */ - PCENT_FIELD, /* percent used */ - MNT_FIELD, /* mount point */ - NFIELDS -}; + SOURCE_FIELD, /* file system */ + FSTYPE_FIELD, /* FS type */ + SIZE_FIELD, /* FS size */ + USED_FIELD, /* FS size used */ + AVAIL_FIELD, /* FS size available */ + PCENT_FIELD, /* percent used */ + ITOTAL_FIELD, /* inode total */ + IUSED_FIELD, /* inodes used */ + IAVAIL_FIELD, /* inodes available */ + IPCENT_FIELD, /* inodes used in percent */ + TARGET_FIELD /* mount point */ +} display_field_t; + +/* Flag if a field contains a block, an inode or another value. */ +typedef enum +{ + BLOCK_FLD, /* Block values field */ + INODE_FLD, /* Inode values field */ + OTHER_FLD /* Neutral field, e.g. target */ +} field_type_t; -/* Header strings for the above fields in each mode. - NULL means to use the header for the default mode. */ -static const char *headers[NFIELDS][NMODES] = { -/* DEFAULT_MODE INODES_MODE HUMAN_MODE POSIX_MODE */ - { N_("Filesystem"), NULL, NULL, NULL }, - { N_("Type"), NULL, NULL, NULL }, - { N_("blocks"), N_("Inodes"), N_("Size"), NULL }, - { N_("Used"), N_("IUsed"), NULL, NULL }, - { N_("Available"), N_("IFree"), N_("Avail"), NULL }, - { N_("Use%"), N_("IUse%"), NULL, N_("Capacity") }, - { N_("Mounted on"), NULL, NULL, NULL } +/* Attributes of a display field. */ +struct field_data_t +{ + display_field_t field; + char const *arg; + field_type_t field_type; + const char *caption;/* NULL means to use the default header of this field. */ + size_t width; /* Auto adjusted (up) widths used to align columns. */ + mbs_align_t align; /* Alignment for this field. */ + bool used; }; -/* Alignments for the 3 textual and 4 numeric fields. */ -static mbs_align_t alignments[NFIELDS] = { - MBS_ALIGN_LEFT, MBS_ALIGN_LEFT, - MBS_ALIGN_RIGHT, MBS_ALIGN_RIGHT, MBS_ALIGN_RIGHT, MBS_ALIGN_RIGHT, - MBS_ALIGN_LEFT +/* Header strings, minimum width and alignment for the above fields. */ +static struct field_data_t field_data[] = { + [SOURCE_FIELD] = { SOURCE_FIELD, + "source", OTHER_FLD, N_("Filesystem"), 14, MBS_ALIGN_LEFT, false }, + + [FSTYPE_FIELD] = { FSTYPE_FIELD, + "fstype", OTHER_FLD, N_("Type"), 4, MBS_ALIGN_LEFT, false }, + + [SIZE_FIELD] = { SIZE_FIELD, + "size", BLOCK_FLD, N_("blocks"), 5, MBS_ALIGN_RIGHT, false }, + + [USED_FIELD] = { USED_FIELD, + "used", BLOCK_FLD, N_("Used"), 5, MBS_ALIGN_RIGHT, false }, + + [AVAIL_FIELD] = { AVAIL_FIELD, + "avail", BLOCK_FLD, N_("Available"), 5, MBS_ALIGN_RIGHT, false }, + + [PCENT_FIELD] = { PCENT_FIELD, + "pcent", BLOCK_FLD, N_("Use%"), 4, MBS_ALIGN_RIGHT, false }, + + [ITOTAL_FIELD] = { ITOTAL_FIELD, + "itotal", INODE_FLD, N_("Inodes"), 5, MBS_ALIGN_RIGHT, false }, + + [IUSED_FIELD] = { IUSED_FIELD, + "iused", INODE_FLD, N_("IUsed"), 5, MBS_ALIGN_RIGHT, false }, + + [IAVAIL_FIELD] = { IAVAIL_FIELD, + "iavail", INODE_FLD, N_("IFree"), 5, MBS_ALIGN_RIGHT, false }, + + [IPCENT_FIELD] = { IPCENT_FIELD, + "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 } }; -/* Auto adjusted (up) widths used to align columns. */ -static size_t widths[NFIELDS] = { 14, 4, 5, 5, 5, 4, 0 }; +static char const *all_args_string = + "source,fstype,itotal,iused,iavail,ipcent,size,used,avail,pcent,target"; + +/* Storage for the definition of output columns. */ +static struct field_data_t **columns; + +/* The current number of output columns. */ +static size_t ncolumns; + +/* Field values. */ +struct field_values_t +{ + uintmax_t input_units; + uintmax_t output_units; + uintmax_t total; + uintmax_t available; + bool negate_available; + uintmax_t available_to_root; + uintmax_t used; + bool negate_used; +}; /* Storage for pointers for each string (cell of table). */ static char ***table; @@ -167,7 +235,10 @@ static size_t nrows; enum { NO_SYNC_OPTION = CHAR_MAX + 1, - SYNC_OPTION + SYNC_OPTION, + TOTAL_OPTION, + OUTPUT_OPTION, + MEGABYTES_OPTION /* FIXME: remove long opt in Aug 2013 */ }; static struct option const long_options[] = @@ -178,12 +249,13 @@ 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, 'm'}, /* obsolescent */ + {"megabytes", no_argument, NULL, MEGABYTES_OPTION}, /* obsolescent, */ + {"output", optional_argument, NULL, OUTPUT_OPTION}, {"portability", no_argument, NULL, 'P'}, {"print-type", no_argument, NULL, 'T'}, {"sync", no_argument, NULL, SYNC_OPTION}, {"no-sync", no_argument, NULL, NO_SYNC_OPTION}, - {"total", no_argument, NULL, 'c'}, + {"total", no_argument, NULL, TOTAL_OPTION}, {"type", required_argument, NULL, 't'}, {"exclude-type", required_argument, NULL, 'x'}, {GETOPT_HELP_OPTION_DECL}, @@ -191,6 +263,23 @@ static struct option const long_options[] = {NULL, 0, NULL, 0} }; +/* Replace problematic chars with '?'. + Since only control characters are currently considered, + this should work in all encodings. */ + +static char* +hide_problematic_chars (char *cell) +{ + char *p = cell; + while (*p) + { + if (iscntrl (to_uchar (*p))) + *p = '?'; + p++; + } + return cell; +} + /* Dynamically allocate a row of pointers in TABLE, which can then be accessed with standard 2D array notation. */ @@ -199,7 +288,7 @@ alloc_table_row (void) { nrows++; table = xnrealloc (table, nrows, sizeof (char *)); - table[nrows-1] = xnmalloc (NFIELDS, sizeof (char *)); + table[nrows - 1] = xnmalloc (ncolumns, sizeof (char *)); } /* Output each cell in the table, accounting for the @@ -208,32 +297,33 @@ alloc_table_row (void) static void print_table (void) { - size_t field, row; + size_t row; - for (row = 0; row < nrows; row ++) + for (row = 0; row < nrows; row++) { - for (field = 0; field < NFIELDS; field++) + size_t col; + for (col = 0; col < ncolumns; col++) { - size_t width = widths[field]; - char *cell = table[row][field]; - if (!cell) /* Missing type column, or mount point etc. */ - continue; + char *cell = table[row][col]; - /* Note the DEV_FIELD used to be displayed on it's own line + /* Note the SOURCE_FIELD used to be displayed on it's own line if (!posix_format && mbswidth (cell) > 20), but that - functionality is probably more problematic than helpful. */ - if (field != 0) + functionality was probably more problematic than helpful, + hence changed in commit v8.10-40-g99679ff. */ + if (col != 0) putchar (' '); - if (field == MNT_FIELD) /* The last one. */ - fputs (cell, stdout); - else - { - cell = ambsalign (cell, &width, alignments[field], 0); - /* When ambsalign fails, output unaligned data. */ - fputs (cell ? cell : table[row][field], stdout); - free (cell); - } - IF_LINT (free (table[row][field])); + + int flags = 0; + if (col == ncolumns - 1) /* The last one. */ + flags = MBA_NO_RIGHT_PAD; + + size_t width = columns[col]->width; + cell = ambsalign (cell, &width, columns[col]->align, flags); + /* When ambsalign fails, output unaligned data. */ + fputs (cell ? cell : table[row][col], stdout); + free (cell); + + IF_LINT (free (table[row][col])); } putchar ('\n'); IF_LINT (free (table[row])); @@ -242,29 +332,180 @@ print_table (void) IF_LINT (free (table)); } -/* Obtain the appropriate header entries. */ +/* Dynamically allocate a struct field_t in COLUMNS, which + can then be accessed with standard array notation. */ static void -get_header (void) +alloc_field (int f, const char *c) { - size_t field; + ncolumns++; + columns = xnrealloc (columns, ncolumns, sizeof (struct field_data_t *)); + columns[ncolumns - 1] = &field_data[f]; + if (c != NULL) + columns[ncolumns - 1]->caption = c; - alloc_table_row (); + if (field_data[f].used) + assert (!"field used"); + + /* Mark field as used. */ + field_data[f].used = true; +} + + +/* Given a string, ARG, containing a comma-separated list of arguments + to the --output option, add the appropriate fields to columns. */ +static void +decode_output_arg (char const *arg) +{ + char *arg_writable = xstrdup (arg); + char *s = arg_writable; + do + { + /* find next comma */ + char *comma = strchr (s, ','); + + /* If we found a comma, put a NUL in its place and advance. */ + if (comma) + *comma++ = 0; + + /* process S. */ + display_field_t field = -1; + for (unsigned int i = 0; i < ARRAY_CARDINALITY (field_data); i++) + { + if (STREQ (field_data[i].arg, s)) + { + field = i; + break; + } + } + if (field == -1) + { + error (0, 0, _("option --output: field '%s' unknown"), s); + usage (EXIT_FAILURE); + } - for (field = 0; field < NFIELDS; field++) + 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); + usage (EXIT_FAILURE); + } + + switch (field) + { + case SOURCE_FIELD: + case FSTYPE_FIELD: + case USED_FIELD: + case PCENT_FIELD: + case ITOTAL_FIELD: + case IUSED_FIELD: + case IAVAIL_FIELD: + case IPCENT_FIELD: + case TARGET_FIELD: + alloc_field (field, NULL); + break; + + case SIZE_FIELD: + alloc_field (field, N_("Size")); + break; + + case AVAIL_FIELD: + alloc_field (field, N_("Avail")); + break; + + default: + assert (!"invalid field"); + } + s = comma; + } + while (s); + + free (arg_writable); +} + +/* Get the appropriate columns for the mode. */ +static void +get_field_list (void) +{ + switch (header_mode) { - if (field == TYPE_FIELD && !print_type) + case DEFAULT_MODE: + alloc_field (SOURCE_FIELD, NULL); + if (print_type) + alloc_field (FSTYPE_FIELD, NULL); + alloc_field (SIZE_FIELD, NULL); + alloc_field (USED_FIELD, NULL); + alloc_field (AVAIL_FIELD, NULL); + alloc_field (PCENT_FIELD, NULL); + alloc_field (TARGET_FIELD, NULL); + break; + + case HUMAN_MODE: + alloc_field (SOURCE_FIELD, NULL); + if (print_type) + alloc_field (FSTYPE_FIELD, NULL); + + alloc_field (SIZE_FIELD, N_("Size")); + alloc_field (USED_FIELD, NULL); + alloc_field (AVAIL_FIELD, N_("Avail")); + alloc_field (PCENT_FIELD, NULL); + alloc_field (TARGET_FIELD, NULL); + break; + + case INODES_MODE: + alloc_field (SOURCE_FIELD, NULL); + if (print_type) + alloc_field (FSTYPE_FIELD, NULL); + alloc_field (ITOTAL_FIELD, NULL); + alloc_field (IUSED_FIELD, NULL); + alloc_field (IAVAIL_FIELD, NULL); + alloc_field (IPCENT_FIELD, NULL); + alloc_field (TARGET_FIELD, NULL); + break; + + case POSIX_MODE: + alloc_field (SOURCE_FIELD, NULL); + if (print_type) + alloc_field (FSTYPE_FIELD, NULL); + alloc_field (SIZE_FIELD, NULL); + alloc_field (USED_FIELD, NULL); + alloc_field (AVAIL_FIELD, NULL); + alloc_field (PCENT_FIELD, N_("Capacity")); + alloc_field (TARGET_FIELD, NULL); + break; + + case OUTPUT_MODE: + if (!ncolumns) { - table[nrows-1][field] = NULL; - continue; + /* Add all fields if --output was given without a field list. */ + decode_output_arg (all_args_string); } + break; + default: + assert (!"invalid header_mode"); + } +} + +/* Obtain the appropriate header entries. */ + +static void +get_header (void) +{ + size_t col; + + alloc_table_row (); + + for (col = 0; col < ncolumns; col++) + { char *cell = NULL; - char const *header = _(headers[field][header_mode]); - if (!header) - header = _(headers[field][DEFAULT_MODE]); + char const *header = _(columns[col]->caption); - if (header_mode == DEFAULT_MODE && field == TOTAL_FIELD) + if (columns[col]->field == SIZE_FIELD + && (header_mode == DEFAULT_MODE + || (header_mode == OUTPUT_MODE + && !(human_output_opts & human_autoscale)))) { char buf[LONGEST_HUMAN_READABLE + 1]; @@ -297,15 +538,20 @@ get_header (void) char *num = human_readable (output_block_size, buf, opts, 1, 1); - if (asprintf (&cell, "%s-%s", num, header) == -1) + /* Reset the header back to the default in OUTPUT_MODE. */ + header = N_("blocks"); + + /* TRANSLATORS: this is the "1K-blocks" header in "df" output. */ + if (asprintf (&cell, _("%s-%s"), num, header) == -1) cell = NULL; } - else if (header_mode == POSIX_MODE && field == TOTAL_FIELD) + else if (header_mode == POSIX_MODE && columns[col]->field == SIZE_FIELD) { char buf[INT_BUFSIZE_BOUND (uintmax_t)]; char *num = umaxtostr (output_block_size, buf); - if (asprintf (&cell, "%s-%s", num, header) == -1) + /* TRANSLATORS: this is the "1024-blocks" header in "df -P". */ + if (asprintf (&cell, _("%s-%s"), num, header) == -1) cell = NULL; } else @@ -314,9 +560,11 @@ get_header (void) if (!cell) xalloc_die (); - table[nrows-1][field] = cell; + hide_problematic_chars (cell); + + table[nrows - 1][col] = cell; - widths[field] = MAX (widths[field], mbswidth (cell, 0)); + columns[col]->width = MAX (columns[col]->width, mbswidth (cell, 0)); } } @@ -350,6 +598,78 @@ excluded_fstype (const char *fstype) return false; } +/* Filter mount list by skipping duplicate entries. + In the case of duplicities - based on to 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. */ + +static void +filter_mount_list (void) +{ + 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) + { + struct stat buf; + struct devlist *devlist; + + if (-1 == stat (me->me_mountdir, &buf)) + { + ; /* Stat failed - add ME to be able to complain about it later. */ + } + 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 (devlist) + { + /* 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. */ + } + } + } + + /* 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; + } + + /* Finally rebuild the mount_list from the devlist. */ + mount_list = NULL; + while (devlist_head) + { + /* 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; + } +} + /* Return true if N is a known integer value. On many file systems, UINTMAX_MAX represents an unknown value; on AIX, UINTMAX_MAX - 1 represents unknown. Use a rule that works on AIX file systems, and @@ -387,7 +707,7 @@ df_readable (bool negative, uintmax_t n, char *buf, #define LOG_EQ(a, b) (!(a) == !(b)) /* Add integral value while using uintmax_t for value part and separate - negation flag. It adds value of SRC and SRC_NEG to DEST and DEST_NEG. + negation flag. It adds value of SRC and SRC_NEG to DEST and DEST_NEG. The result will be in DEST and DEST_NEG. See df_readable to understand how the negation flag is used. */ static void @@ -429,6 +749,65 @@ has_uuid_suffix (char const *s) && strspn (s + len - 36, "-0123456789abcdefABCDEF") == 36); } +/* Obtain the block values BV and inode values IV + from the file system usage FSU. */ +static void +get_field_values (struct field_values_t *bv, + struct field_values_t *iv, + const struct fs_usage *fsu) +{ + /* Inode values. */ + iv->input_units = iv->output_units = 1; + iv->total = fsu->fsu_files; + iv->available = iv->available_to_root = fsu->fsu_ffree; + iv->negate_available = false; + + iv->used = UINTMAX_MAX; + iv->negate_used = false; + if (known_value (iv->total) && known_value (iv->available_to_root)) + { + iv->used = iv->total - iv->available_to_root; + iv->negate_used = (iv->total < iv->available_to_root); + } + + /* Block values. */ + bv->input_units = fsu->fsu_blocksize; + bv->output_units = output_block_size; + bv->total = fsu->fsu_blocks; + bv->available = fsu->fsu_bavail; + bv->available_to_root = fsu->fsu_bfree; + bv->negate_available = (fsu->fsu_bavail_top_bit_set + && known_value (fsu->fsu_bavail)); + + bv->used = UINTMAX_MAX; + bv->negate_used = false; + if (known_value (bv->total) && known_value (bv->available_to_root)) + { + bv->used = bv->total - bv->available_to_root; + bv->negate_used = (bv->total < bv->available_to_root); + } +} + +/* Add block and inode values to grand total. */ +static void +add_to_grand_total (struct field_values_t *bv, struct field_values_t *iv) +{ + if (known_value (iv->total)) + grand_fsu.fsu_files += iv->total; + if (known_value (iv->available)) + grand_fsu.fsu_ffree += iv->available; + + if (known_value (bv->total)) + grand_fsu.fsu_blocks += bv->input_units * bv->total; + if (known_value (bv->available_to_root)) + grand_fsu.fsu_bfree += bv->input_units * bv->available_to_root; + if (known_value (bv->available)) + add_uint_with_neg_flag (&grand_fsu.fsu_bavail, + &grand_fsu.fsu_bavail_top_bit_set, + bv->input_units * bv->available, + bv->negate_available); +} + /* Obtain a space listing for the disk device with absolute file name DISK. If MOUNT_POINT is non-NULL, it is the name of the root of the file system on DISK. @@ -451,20 +830,6 @@ get_dev (char const *disk, char const *mount_point, const struct fs_usage *force_fsu, bool process_all) { - struct fs_usage fsu; - char buf[LONGEST_HUMAN_READABLE + 2]; - uintmax_t input_units; - uintmax_t output_units; - uintmax_t total; - uintmax_t available; - bool negate_available; - uintmax_t available_to_root; - uintmax_t used; - bool negate_used; - double pct = -1; - char* cell; - size_t field; - if (me_remote && show_local_fs) return; @@ -481,6 +846,7 @@ get_dev (char const *disk, char const *mount_point, if (!stat_file) stat_file = mount_point ? mount_point : disk; + struct fs_usage fsu; if (force_fsu) fsu = *force_fsu; else if (get_fs_usage (stat_file, disk, &fsu)) @@ -493,11 +859,8 @@ get_dev (char const *disk, char const *mount_point, if (fsu.fsu_blocks == 0 && !show_all_fs && !show_listed_fs) return; - if (! file_systems_processed) - { - file_systems_processed = true; - get_header (); - } + if (! force_fsu) + file_systems_processed = true; alloc_table_row (); @@ -524,145 +887,142 @@ get_dev (char const *disk, char const *mount_point, if (! fstype) fstype = "-"; /* unknown */ - if (inode_format) - { - input_units = output_units = 1; - total = fsu.fsu_files; - available = fsu.fsu_ffree; - negate_available = false; - available_to_root = available; - - if (known_value (total)) - grand_fsu.fsu_files += total; - if (known_value (available)) - grand_fsu.fsu_ffree += available; - } - else - { - input_units = fsu.fsu_blocksize; - output_units = output_block_size; - total = fsu.fsu_blocks; - available = fsu.fsu_bavail; - negate_available = (fsu.fsu_bavail_top_bit_set - && known_value (available)); - available_to_root = fsu.fsu_bfree; - - if (known_value (total)) - grand_fsu.fsu_blocks += input_units * total; - if (known_value (available_to_root)) - grand_fsu.fsu_bfree += input_units * available_to_root; - if (known_value (available)) - add_uint_with_neg_flag (&grand_fsu.fsu_bavail, - &grand_fsu.fsu_bavail_top_bit_set, - input_units * available, negate_available); - } + struct field_values_t block_values; + struct field_values_t inode_values; + get_field_values (&block_values, &inode_values, &fsu); - used = UINTMAX_MAX; - negate_used = false; - if (known_value (total) && known_value (available_to_root)) - { - used = total - available_to_root; - negate_used = (total < available_to_root); - } + /* Add to grand total unless processing grand total line. */ + if (print_grand_total && ! force_fsu) + add_to_grand_total (&block_values, &inode_values); - for (field = 0; field < NFIELDS; field++) + size_t col; + for (col = 0; col < ncolumns; col++) { - switch (field) + char buf[LONGEST_HUMAN_READABLE + 2]; + char *cell; + + struct field_values_t *v; + switch (columns[col]->field_type) + { + case BLOCK_FLD: + v = &block_values; + break; + case INODE_FLD: + v = &inode_values; + break; + case OTHER_FLD: + v = NULL; + break; + default: + assert (!"bad field_type"); + } + + switch (columns[col]->field) { - case DEV_FIELD: - cell = dev_name; + case SOURCE_FIELD: + cell = xstrdup (dev_name); break; - case TYPE_FIELD: - cell = print_type ? xstrdup (fstype) : NULL; + case FSTYPE_FIELD: + cell = xstrdup (fstype); break; - case TOTAL_FIELD: - cell = xstrdup (df_readable (false, total, buf, - input_units, output_units)); + case SIZE_FIELD: + case ITOTAL_FIELD: + cell = xstrdup (df_readable (false, v->total, buf, + v->input_units, v->output_units)); break; + case USED_FIELD: - cell = xstrdup (df_readable (negate_used, used, buf, - input_units, output_units)); + case IUSED_FIELD: + cell = xstrdup (df_readable (v->negate_used, v->used, buf, + v->input_units, v->output_units)); break; - case FREE_FIELD: - cell = xstrdup (df_readable (negate_available, available, buf, - input_units, output_units)); + + case AVAIL_FIELD: + case IAVAIL_FIELD: + cell = xstrdup (df_readable (v->negate_available, v->available, buf, + v->input_units, v->output_units)); break; case PCENT_FIELD: - if (! known_value (used) || ! known_value (available)) - ; - else if (!negate_used - && used <= TYPE_MAXIMUM (uintmax_t) / 100 - && used + available != 0 - && (used + available < used) == negate_available) - { - uintmax_t u100 = used * 100; - uintmax_t nonroot_total = used + available; - pct = u100 / nonroot_total + (u100 % nonroot_total != 0); - } - else - { - /* The calculation cannot be done easily with integer - arithmetic. Fall back on floating point. This can suffer - from minor rounding errors, but doing it exactly requires - multiple precision arithmetic, and it's not worth the - aggravation. */ - double u = negate_used ? - (double) - used : used; - double a = negate_available ? - (double) - available : available; - double nonroot_total = u + a; - if (nonroot_total) - { - long int lipct = pct = u * 100 / nonroot_total; - double ipct = lipct; + case IPCENT_FIELD: + { + double pct = -1; + if (! known_value (v->used) || ! known_value (v->available)) + ; + else if (!v->negate_used + && v->used <= TYPE_MAXIMUM (uintmax_t) / 100 + && v->used + v->available != 0 + && (v->used + v->available < v->used) + == v->negate_available) + { + uintmax_t u100 = v->used * 100; + uintmax_t nonroot_total = v->used + v->available; + pct = u100 / nonroot_total + (u100 % nonroot_total != 0); + } + else + { + /* The calculation cannot be done easily with integer + arithmetic. Fall back on floating point. This can suffer + from minor rounding errors, but doing it exactly requires + multiple precision arithmetic, and it's not worth the + aggravation. */ + double u = v->negate_used ? - (double) - v->used : v->used; + double a = v->negate_available + ? - (double) - v->available : v->available; + double nonroot_total = u + a; + if (nonroot_total) + { + long int lipct = pct = u * 100 / nonroot_total; + double ipct = lipct; - /* Like 'pct = ceil (dpct);', but avoid ceil so that - the math library needn't be linked. */ - if (ipct - 1 < pct && pct <= ipct + 1) - pct = ipct + (ipct < pct); - } - } + /* Like 'pct = ceil (dpct);', but avoid ceil so that + the math library needn't be linked. */ + if (ipct - 1 < pct && pct <= ipct + 1) + pct = ipct + (ipct < pct); + } + } - if (0 <= pct) - { - if (asprintf (&cell, "%.0f%%", pct) == -1) - cell = NULL; - } - else - cell = strdup ("-"); + if (0 <= pct) + { + if (asprintf (&cell, "%.0f%%", pct) == -1) + cell = NULL; + } + else + cell = strdup ("-"); - if (!cell) - xalloc_die (); + if (!cell) + xalloc_die (); - break; + break; + } - case MNT_FIELD: - if (mount_point) - { + case TARGET_FIELD: #ifdef HIDE_AUTOMOUNT_PREFIX - /* Don't print the first directory name in MOUNT_POINT if it's an - artifact of an automounter. This is a bit too aggressive to be - the default. */ - if (STRNCMP_LIT (mount_point, "/auto/") == 0) - mount_point += 5; - else if (STRNCMP_LIT (mount_point, "/tmp_mnt/") == 0) - mount_point += 8; + /* Don't print the first directory name in MOUNT_POINT if it's an + artifact of an automounter. This is a bit too aggressive to be + the default. */ + if (STRNCMP_LIT (mount_point, "/auto/") == 0) + mount_point += 5; + else if (STRNCMP_LIT (mount_point, "/tmp_mnt/") == 0) + mount_point += 8; #endif - cell = xstrdup (mount_point); - } - else - cell = NULL; + cell = xstrdup (mount_point); break; default: assert (!"unhandled field"); } - if (cell) - widths[field] = MAX (widths[field], mbswidth (cell, 0)); - table[nrows-1][field] = cell; + if (!cell) + assert (!"empty cell"); + + hide_problematic_chars (cell); + columns[col]->width = MAX (columns[col]->width, mbswidth (cell, 0)); + table[nrows - 1][col] = cell; } + free (dev_name); } /* If DISK corresponds to a mount point, show its usage @@ -746,7 +1106,7 @@ get_point (const char *point, const struct stat *statp) exit_status = EXIT_FAILURE; } - /* So we won't try and fail repeatedly. */ + /* So we won't try and fail repeatedly. */ me->me_dev = (dev_t) -2; } } @@ -798,19 +1158,22 @@ get_entry (char const *name, struct stat const *statp) } /* Show all mounted file systems, except perhaps those that are of - an unselected type or are empty. */ + an unselected type or are empty. */ static void get_all_entries (void) { struct mount_entry *me; + if (!show_all_fs) + filter_mount_list (); + for (me = mount_list; me; me = me->me_next) get_dev (me->me_devname, me->me_mountdir, NULL, me->me_type, me->me_dummy, me->me_remote, NULL, true); } -/* Add FSTYPE to the list of file system types to display. */ +/* Add FSTYPE to the list of file system types to display. */ static void add_fs_type (const char *fstype) @@ -823,7 +1186,7 @@ add_fs_type (const char *fstype) fs_select_list = fsp; } -/* Add FSTYPE to the list of file system types to be omitted. */ +/* Add FSTYPE to the list of file system types to be omitted. */ static void add_excluded_fs_type (const char *fstype) @@ -847,11 +1210,10 @@ usage (int status) fputs (_("\ Show information about the file system on which each FILE resides,\n\ or all file systems by default.\n\ -\n\ -"), stdout); - fputs (_("\ -Mandatory arguments to long options are mandatory for short options too.\n\ "), stdout); + + emit_mandatory_arg_note (); + fputs (_("\ -a, --all include dummy file systems\n\ -B, --block-size=SIZE scale sizes by SIZE before printing them. E.g.,\n\ @@ -870,6 +1232,8 @@ Mandatory arguments to long options are mandatory for short options too.\n\ \n\ "), stdout); fputs (_("\ + --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n\ + or print all fields if FIELD_LIST is omitted.\n\ -P, --portability use the POSIX output format\n\ --sync invoke sync before getting usage info\n\ -t, --type=TYPE limit listing to file systems of type TYPE\n\ @@ -881,6 +1245,11 @@ Mandatory arguments to long options are mandatory for short options too.\n\ fputs (VERSION_OPTION_DESCRIPTION, stdout); emit_blocksize_note ("DF"); emit_size_note (); + 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\ +"), stdout); emit_ancillary_info (); } exit (status); @@ -901,17 +1270,20 @@ main (int argc, char **argv) fs_select_list = NULL; fs_exclude_list = NULL; - inode_format = false; show_all_fs = false; show_listed_fs = false; human_output_opts = -1; print_type = false; file_systems_processed = false; - posix_format = false; exit_status = EXIT_SUCCESS; print_grand_total = false; grand_fsu.fsu_blocksize = 1; + /* If true, use the POSIX output format. */ + bool posix_format = false; + + const char *msg_mut_excl = _("options %s and %s are mutually exclusive"); + while (true) { int oi = -1; @@ -934,7 +1306,12 @@ main (int argc, char **argv) } break; case 'i': - inode_format = true; + if (header_mode == OUTPUT_MODE) + { + error (0, 0, msg_mut_excl, "-i", "--output"); + usage (EXIT_FAILURE); + } + header_mode = INODES_MODE; break; case 'h': human_output_opts = human_autoscale | human_SI | human_base_1024; @@ -951,14 +1328,31 @@ main (int argc, char **argv) case 'l': show_local_fs = true; break; - case 'm': /* obsolescent */ + 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; break; case 'T': + if (header_mode == OUTPUT_MODE) + { + error (0, 0, msg_mut_excl, "-T", "--output"); + usage (EXIT_FAILURE); + } print_type = true; break; case 'P': + if (header_mode == OUTPUT_MODE) + { + error (0, 0, msg_mut_excl, "-P", "--output"); + usage (EXIT_FAILURE); + } posix_format = true; break; case SYNC_OPTION: @@ -974,14 +1368,35 @@ main (int argc, char **argv) add_fs_type (optarg); break; - case 'v': /* For SysV compatibility. */ + case 'v': /* For SysV compatibility. */ /* ignore */ break; case 'x': add_excluded_fs_type (optarg); break; - case 'c': + case OUTPUT_OPTION: + if (header_mode == INODES_MODE) + { + error (0, 0, msg_mut_excl, "-i", "--output"); + usage (EXIT_FAILURE); + } + if (posix_format && header_mode == DEFAULT_MODE) + { + error (0, 0, msg_mut_excl, "-P", "--output"); + usage (EXIT_FAILURE); + } + if (print_type) + { + error (0, 0, msg_mut_excl, "-T", "--output"); + usage (EXIT_FAILURE); + } + header_mode = OUTPUT_MODE; + if (optarg) + decode_output_arg (optarg); + break; + + case TOTAL_OPTION: print_grand_total = true; break; @@ -1005,8 +1420,8 @@ main (int argc, char **argv) &human_output_opts, &output_block_size); } - if (inode_format) - header_mode = INODES_MODE; + if (header_mode == INODES_MODE || header_mode == OUTPUT_MODE) + ; else if (human_output_opts & human_autoscale) header_mode = HUMAN_MODE; else if (posix_format) @@ -1064,15 +1479,25 @@ main (int argc, char **argv) read_file_system_list ((fs_select_list != NULL || fs_exclude_list != NULL || print_type + || field_data[FSTYPE_FIELD].used || show_local_fs)); if (mount_list == NULL) { /* Couldn't read the table of mounted file systems. - Fail if df was invoked with no file name arguments; - Otherwise, merely give a warning and proceed. */ - int status = (optind < argc ? 0 : EXIT_FAILURE); - const char *warning = (optind < argc ? _("Warning: ") : ""); + Fail if df was invoked with no file name arguments, + or when either of -a, -l, -t or -x is used with file name + arguments. Otherwise, merely give a warning and proceed. */ + int status = 0; + if ( ! (optind < argc) + || (show_all_fs + || show_local_fs + || fs_select_list != NULL + || fs_exclude_list != NULL)) + { + status = EXIT_FAILURE; + } + const char *warning = (status == 0 ? _("Warning: ") : ""); error (status, errno, "%s%s", warning, _("cannot read table of mounted file systems")); } @@ -1080,11 +1505,14 @@ main (int argc, char **argv) if (require_sync) sync (); + get_field_list (); + get_header (); + if (optind < argc) { int i; - /* Display explicitly requested empty file systems. */ + /* Display explicitly requested empty file systems. */ show_listed_fs = true; for (i = optind; i < argc; ++i) @@ -1094,17 +1522,24 @@ main (int argc, char **argv) else get_all_entries (); - if (print_grand_total) + if (file_systems_processed) { - if (inode_format) - grand_fsu.fsu_blocks = 1; - get_dev ("total", NULL, NULL, NULL, false, false, &grand_fsu, false); - } + if (print_grand_total) + get_dev ("total", + (field_data[SOURCE_FIELD].used ? "-" : "total"), + NULL, NULL, false, false, &grand_fsu, false); - print_table (); + print_table (); + } + else + { + /* Print the "no FS processed" diagnostic only if there was no preceding + diagnostic, e.g., if all have been excluded. */ + if (exit_status == EXIT_SUCCESS) + error (EXIT_FAILURE, 0, _("no file systems processed")); + } - if (! file_systems_processed) - error (EXIT_FAILURE, 0, _("no file systems processed")); + IF_LINT (free (columns)); exit (exit_status); } diff --git a/src/dircolors.c b/src/dircolors.c index cc68d6fa..5610f083 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-2012 Free Software Foundation, Inc. + Copyright (C) 1996-2013 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 5f01f7ee..f243c192 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','2',' ','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','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','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, @@ -51,6 +51,8 @@ static char const G_line[] = 'T','E','R','M',' ','s','c','r','e','e','n','.','E','t','e','r','m',0, 'T','E','R','M',' ','s','c','r','e','e','n','.','r','x','v','t',0, 'T','E','R','M',' ','s','c','r','e','e','n','.','l','i','n','u','x',0, + 'T','E','R','M',' ','s','t',0, + 'T','E','R','M',' ','s','t','-','2','5','6','c','o','l','o','r',0, 'T','E','R','M',' ','t','e','r','m','i','n','a','t','o','r',0, 'T','E','R','M',' ','v','t','1','0','0',0, 'T','E','R','M',' ','x','t','e','r','m',0, diff --git a/src/dircolors.hin b/src/dircolors.hin index 4606d1a2..6dfd1136 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-2012 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 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. @@ -52,6 +52,8 @@ TERM screen-w TERM screen.Eterm TERM screen.rxvt TERM screen.linux +TERM st +TERM st-256color TERM terminator TERM vt100 TERM xterm diff --git a/src/dirname.c b/src/dirname.c index ac218d5d..94eec9de 100644 --- a/src/dirname.c +++ b/src/dirname.c @@ -1,6 +1,6 @@ /* dirname -- strip suffix from file name - Copyright (C) 1990-2012 Free Software Foundation, Inc. + Copyright (C) 1990-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 diff --git a/src/du.c b/src/du.c index 73339412..a80a1770 100644 --- a/src/du.c +++ b/src/du.c @@ -1,5 +1,5 @@ /* du -- summarize disk usage - Copyright (C) 1988-2012 Free Software Foundation, Inc. + Copyright (C) 1988-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 @@ -35,6 +35,7 @@ #include "exclude.h" #include "fprintftime.h" #include "human.h" +#include "mountlist.h" #include "quote.h" #include "quotearg.h" #include "stat-size.h" @@ -60,8 +61,12 @@ extern bool fts_debug; # define FTS_CROSS_CHECK(Fts) #endif -/* A set of dev/ino pairs. */ -static struct di_set *di_set; +/* A set of dev/ino pairs to help identify files and directories + whose sizes have already been counted. */ +static struct di_set *di_files; + +/* A set containing a dev/ino pair for each local mount point directory. */ +static struct di_set *di_mnt; /* Keep track of the preceding "level" (depth in hierarchy) from one call of process_file to the next. */ @@ -142,6 +147,10 @@ static bool opt_separate_dirs = false; is at level 0, so 'du --max-depth=0' is equivalent to 'du -s'. */ static size_t max_depth = SIZE_MAX; +/* Only output entries with at least this SIZE if positive, + or at most if negative. See --threshold option. */ +static intmax_t opt_threshold = 0; + /* Human-readable options for output. */ static int human_output_opts; @@ -213,6 +222,7 @@ static struct option const long_options[] = {"separate-dirs", no_argument, NULL, 'S'}, {"summarize", no_argument, NULL, 's'}, {"total", no_argument, NULL, 'c'}, + {"threshold", required_argument, NULL, 't'}, {"time", optional_argument, NULL, TIME_OPTION}, {"time-style", required_argument, NULL, TIME_STYLE_OPTION}, {GETOPT_HELP_OPTION_DECL}, @@ -263,12 +273,12 @@ Usage: %s [OPTION]... [FILE]...\n\ "), program_name, program_name); fputs (_("\ Summarize disk usage of each FILE, recursively for directories.\n\ -\n\ -"), stdout); - fputs (_("\ -Mandatory arguments to long options are mandatory for short options too.\n\ "), stdout); + + emit_mandatory_arg_note (); + fputs (_("\ + -0, --null end each output line with 0 byte rather than newline\n\ -a, --all write counts for all files, not just directories\n\ --apparent-size print apparent sizes, rather than disk usage; although\ \n\ @@ -284,6 +294,10 @@ Mandatory arguments to long options are mandatory for short options too.\n\ -c, --total produce a grand total\n\ -D, --dereference-args dereference only symlinks that are listed on the\n\ command line\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\ "), stdout); fputs (_("\ --files0-from=F summarize disk usage of the NUL-terminated file\n\ @@ -292,30 +306,22 @@ Mandatory arguments to long options are mandatory for short options too.\n\ -H equivalent to --dereference-args (-D)\n\ -h, --human-readable print sizes in human readable format (e.g., 1K 234M 2G)\ \n\ - --si like -h, but use powers of 1000 not 1024\n\ "), stdout); fputs (_("\ -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\ "), stdout); fputs (_("\ - -L, --dereference dereference all symbolic links\n\ -P, --no-dereference don't follow any symbolic links (this is the default)\n\ - -0, --null end each output line with 0 byte rather than newline\n\ -S, --separate-dirs 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); fputs (_("\ - -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\ -"), stdout); - fputs (_("\ + -t, --threshold=SIZE exclude entries smaller than SIZE if positive,\n\ + or entries greater than SIZE if negative\n\ --time show time of the last modification of any file in the\n\ directory, or any of its subdirectories\n\ --time=WORD show time as WORD instead of modification time:\n\ @@ -323,6 +329,11 @@ Mandatory arguments to long options are mandatory for short options too.\n\ --time-style=STYLE show times using style STYLE:\n\ full-iso, long-iso, iso, +FORMAT\n\ FORMAT is interpreted like 'date'\n\ +"), stdout); + fputs (_("\ + -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\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); @@ -333,11 +344,11 @@ Mandatory arguments to long options are mandatory for short options too.\n\ exit (status); } -/* Try to insert the INO/DEV pair into the global table, HTAB. +/* Try to insert the INO/DEV pair into DI_SET. Return true if the pair is successfully inserted, - false if the pair is already in the table. */ + false if the pair was already there. */ static bool -hash_ins (ino_t ino, dev_t dev) +hash_ins (struct di_set *di_set, ino_t ino, dev_t dev) { int inserted = di_set_insert (di_set, dev, ino); if (inserted < 0) @@ -461,7 +472,7 @@ process_file (FTS *fts, FTSENT *ent) if (excluded || (! opt_count_all && (hash_all || (! S_ISDIR (sb->st_mode) && 1 < sb->st_nlink)) - && ! hash_ins (sb->st_ino, sb->st_dev))) + && ! hash_ins (di_files, sb->st_ino, sb->st_dev))) { /* If ignoring a directory in preorder, skip its children. Ignore the next fts_read output too, as it's a postorder @@ -490,7 +501,13 @@ process_file (FTS *fts, FTSENT *ent) case FTS_DC: if (cycle_warning_required (fts, ent)) { - emit_cycle_warning (file); + /* 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); return false; } return true; @@ -568,8 +585,15 @@ process_file (FTS *fts, FTSENT *ent) duinfo_add (&tot_dui, &dui); if ((IS_DIR_TYPE (info) && level <= max_depth) - || ((opt_all && level <= max_depth) || level == 0)) - print_size (&dui_to_print, file); + || (opt_all && level <= max_depth) + || level == 0) + { + /* Print or elide this entry according to the --threshold option. */ + if (opt_threshold < 0 + ? dui_to_print.size <= -opt_threshold + : dui_to_print.size >= opt_threshold) + print_size (&dui_to_print, file); + } return ok; } @@ -623,6 +647,38 @@ du_files (char **files, int bit_flags) return ok; } +/* Fill the di_mnt set with local mount point dev/ino pairs. */ + +static void +fill_mount_table (void) +{ + struct mount_entry *mnt_ent = read_file_system_list (false); + while (mnt_ent) + { + struct mount_entry *mnt_free; + if (!mnt_ent->me_remote && !mnt_ent->me_dummy) + { + struct stat buf; + if (!stat (mnt_ent->me_mountdir, &buf)) + hash_ins (di_mnt, buf.st_ino, buf.st_dev); + else + { + /* Ignore stat failure. False positives are too common. + E.g., "Permission denied" on /run/user/<name>/gvfs. */ + } + } + + 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); + } +} + int main (int argc, char **argv) { @@ -660,7 +716,7 @@ main (int argc, char **argv) while (true) { int oi = -1; - int c = getopt_long (argc, argv, "0abd:chHklmsxB:DLPSX:", + int c = getopt_long (argc, argv, "0abd:chHklmst:xB:DLPSX:", long_options, &oi); if (c == -1) break; @@ -741,6 +797,20 @@ main (int argc, char **argv) opt_summarize_only = true; break; + case 't': + { + enum strtol_error e; + e = xstrtoimax (optarg, NULL, 0, &opt_threshold, "kKmMGTPEZY0"); + if (e != LONGINT_OK) + xstrtol_fatal (e, oi, c, long_options, optarg); + if (opt_threshold == 0 && *optarg == '-') + { + /* Do not allow -0, as this wouldn't make sense anyway. */ + error (EXIT_FAILURE, 0, _("invalid --threshold argument '-0'")); + } + } + break; + case 'x': bit_flags |= FTS_XDEV; break; @@ -922,8 +992,15 @@ main (int argc, char **argv) xalloc_die (); /* Initialize the set of dev,inode pairs. */ - di_set = di_set_alloc (); - if (!di_set) + + di_mnt = di_set_alloc (); + if (!di_mnt) + xalloc_die (); + + fill_mount_table (); + + di_files = di_set_alloc (); + if (!di_files) xalloc_die (); /* If not hashing everything, process_file won't find cycles on its @@ -1001,7 +1078,8 @@ main (int argc, char **argv) argv_iter_done: argv_iter_free (ai); - di_set_free (di_set); + di_set_free (di_files); + di_set_free (di_mnt); if (files_from && (ferror (stdin) || fclose (stdin) != 0) && ok) error (EXIT_FAILURE, 0, _("error reading %s"), quote (files_from)); diff --git a/src/echo.c b/src/echo.c index 8c3da597..58e69751 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-2012 Free Software Foundation, Inc. + Copyright (C) 1987-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 diff --git a/src/env.c b/src/env.c index 20d5fb8b..c31d1658 100644 --- a/src/env.c +++ b/src/env.c @@ -1,5 +1,5 @@ /* env - run a program in a modified environment - Copyright (C) 1986-2012 Free Software Foundation, Inc. + Copyright (C) 1986-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 @@ -54,7 +54,11 @@ Usage: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n"), program_name); fputs (_("\ Set each NAME to VALUE in the environment and run COMMAND.\n\ -\n\ +"), stdout); + + emit_mandatory_arg_note (); + + fputs (_("\ -i, --ignore-environment start with an empty environment\n\ -0, --null end each output line with 0 byte rather than newline\n\ -u, --unset=NAME remove variable from the environment\n\ diff --git a/src/expand.c b/src/expand.c index 56e5db6f..0b12b025 100644 --- a/src/expand.c +++ b/src/expand.c @@ -1,5 +1,5 @@ /* expand - convert tabs to spaces - Copyright (C) 1989-2012 Free Software Foundation, Inc. + Copyright (C) 1989-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 @@ -107,11 +107,10 @@ Usage: %s [OPTION]... [FILE]...\n\ fputs (_("\ Convert tabs in each FILE to spaces, writing to standard output.\n\ With no FILE, or when FILE is -, read standard input.\n\ -\n\ -"), stdout); - fputs (_("\ -Mandatory arguments to long options are mandatory for short options too.\n\ "), stdout); + + emit_mandatory_arg_note (); + fputs (_("\ -i, --initial do not convert tabs after non blanks\n\ -t, --tabs=NUMBER have tabs NUMBER characters apart, not 8\n\ diff --git a/src/expr.c b/src/expr.c index 700e4afd..b4fa808a 100644 --- a/src/expr.c +++ b/src/expr.c @@ -1,5 +1,5 @@ /* expr -- evaluate expressions. - Copyright (C) 1986-2012 Free Software Foundation, Inc. + Copyright (C) 1986-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 diff --git a/src/extent-scan.c b/src/extent-scan.c index 0c25c570..5d25b9aa 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-2012 Free Software Foundation, Inc. + Copyright (C) 2010-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 @@ -89,7 +89,7 @@ extern bool extent_scan_read (struct extent_scan *scan) { unsigned int si = 0; - struct extent_info *last_ei IF_LINT ( = scan->ext_info); + struct extent_info *last_ei = scan->ext_info; while (true) { @@ -127,8 +127,14 @@ extent_scan_read (struct extent_scan *scan) assert (scan->ei_count <= SIZE_MAX - fiemap->fm_mapped_extents); scan->ei_count += fiemap->fm_mapped_extents; - scan->ext_info = xnrealloc (scan->ext_info, scan->ei_count, - sizeof (struct extent_info)); + { + /* last_ei points into a buffer that may be freed via xnrealloc. + Record its offset and adjust after allocation. */ + size_t prev_idx = last_ei - scan->ext_info; + scan->ext_info = xnrealloc (scan->ext_info, scan->ei_count, + sizeof (struct extent_info)); + last_ei = scan->ext_info + prev_idx; + } unsigned int i = 0; for (i = 0; i < fiemap->fm_mapped_extents; i++) diff --git a/src/extent-scan.h b/src/extent-scan.h index d3d57457..c2c318c9 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-2012 Free Software Foundation, Inc. + Copyright (C) 2010-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 diff --git a/src/extract-magic b/src/extract-magic index 9601ddd1..98e9d871 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-2012 Free Software Foundation, Inc. +# 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 diff --git a/src/factor.c b/src/factor.c index 1d558050..8f1542a2 100644 --- a/src/factor.c +++ b/src/factor.c @@ -1,5 +1,5 @@ /* factor -- print prime factors of n. - Copyright (C) 1986-2012 Free Software Foundation, Inc. + Copyright (C) 1986-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 @@ -14,19 +14,84 @@ 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 Rubin <phr@ocf.berkeley.edu>. +/* Originally written by Paul Rubin <phr@ocf.berkeley.edu>. Adapted for GNU, fixed to factor UINT_MAX by Jim Meyering. Arbitrary-precision code adapted by James Youngman from Torbjörn Granlund's factorize.c, from GNU MP version 4.2.2. + In 2012, the core was rewritten by Torbjörn Granlund and Niels Möller. + Contains code from GNU MP. */ + +/* Efficiently factor numbers that fit in one or two words (word = uintmax_t), + or, with GMP, numbers of any size. + + Code organisation: + + There are several variants of many functions, for handling one word, two + words, and GMP's mpz_t type. If the one-word variant is called foo, the + two-word variant will be foo2, and the one for mpz_t will be mp_foo. In + some cases, the plain function variants will handle both one-word and + two-word numbers, evidenced by function arguments. + + The factoring code for two words will fall into the code for one word when + progress allows that. + + Using GMP is optional. Define HAVE_GMP to make this code include GMP + factoring code. The GMP factoring code is based on GMP's demos/factorize.c + (last synched 2012-09-07). The GMP-based factoring code will stay in GMP + factoring code even if numbers get small enough for using the two-word + code. + + Algorithm: + + (1) Perform trial division using a small primes table, but without hardware + division since the primes table store inverses modulo the word base. + (The GMP variant of this code doesn't make use of the precomputed + inverses, but instead relies on GMP for fast divisibility testing.) + (2) Check the nature of any non-factored part using Miller-Rabin for + detecting composites, and Lucas for detecting primes. + (3) Factor any remaining composite part using the Pollard-Brent rho + algorithm or the SQUFOF algorithm, checking status of found factors + again using Miller-Rabin and Lucas. + + We prefer using Hensel norm in the divisions, not the more familiar + Euclidian norm, since the former leads to much faster code. In the + Pollard-Brent rho code and the prime testing code, we use Montgomery's + trick of multiplying all n-residues by the word base, allowing cheap Hensel + reductions mod n. + + Improvements: + + * Use modular inverses also for exact division in the Lucas code, and + elsewhere. A problem is to locate the inverses not from an index, but + from a prime. We might instead compute the inverse on-the-fly. + + * Tune trial division table size (not forgetting that this is a standalone + program where the table will be read from disk for each invocation). + + * Implement less naive powm, using k-ary exponentiation for k = 3 or + perhaps k = 4. + + * Try to speed trial division code for single uintmax_t numbers, i.e., the + code using DIVBLOCK. It currently runs at 2 cycles per prime (Intel SBR, + IBR), 3 cycles per prime (AMD Stars) and 5 cycles per prime (AMD BD) when + using gcc 4.6 and 4.7. Some software pipelining should help; 1, 2, and 4 + respectively cycles ought to be possible. + + * The redcify function could be vastly improved by using (plain Euclidian) + pre-inversion (such as GMP's invert_limb) and udiv_qrnnd_preinv (from + GMP's gmp-impl.h). The redcify2 function could be vastly improved using + similar methoods. These functions currently dominate run time when using + the -w option. */ #include <config.h> #include <getopt.h> -#include <stdarg.h> #include <stdio.h> -#include <sys/types.h> #if HAVE_GMP # include <gmp.h> +# if !HAVE_DECL_MPZ_INITS +# include <stdarg.h> +# endif #endif #include <assert.h> @@ -40,22 +105,598 @@ /* The official name of this program (e.g., no 'g' prefix). */ #define PROGRAM_NAME "factor" -#define AUTHORS proper_name ("Paul Rubin") +#define AUTHORS \ + proper_name ("Paul Rubin"), \ + proper_name_utf8 ("Torbjorn Granlund", "Torbj\303\266rn Granlund"), \ + proper_name_utf8 ("Niels Moller", "Niels M\303\266ller") /* Token delimiters when reading from a file. */ #define DELIM "\n\t " -static bool verbose = false; +#ifndef STAT_SQUFOF +# define STAT_SQUFOF 0 +#endif + +#ifndef USE_LONGLONG_H +/* With the way we use longlong.h, it's only safe to use + when UWtype = UHWtype, as there were various cases + (as can be seen in the history for longlong.h) where + for example, _LP64 was required to enable W_TYPE_SIZE==64 code, + to avoid compile time or run time issues. */ +# if LONG_MAX == INTMAX_MAX +# define USE_LONGLONG_H 1 +# endif +#endif + +#if USE_LONGLONG_H + +/* Make definitions for longlong.h to make it do what it can do for us */ + +/* bitcount for uintmax_t */ +# if UINTMAX_MAX == UINT32_MAX +# define W_TYPE_SIZE 32 +# elif UINTMAX_MAX == UINT64_MAX +# define W_TYPE_SIZE 64 +# elif UINTMAX_MAX == UINT128_MAX +# define W_TYPE_SIZE 128 +# endif + +# define UWtype uintmax_t +# define UHWtype unsigned long int +# undef UDWtype +# if HAVE_ATTRIBUTE_MODE +typedef unsigned int UQItype __attribute__ ((mode (QI))); +typedef int SItype __attribute__ ((mode (SI))); +typedef unsigned int USItype __attribute__ ((mode (SI))); +typedef int DItype __attribute__ ((mode (DI))); +typedef unsigned int UDItype __attribute__ ((mode (DI))); +# else +typedef unsigned char UQItype; +typedef long SItype; +typedef unsigned long int USItype; +# if HAVE_LONG_LONG_INT +typedef long long int DItype; +typedef unsigned long long int UDItype; +# else /* Assume `long' gives us a wide enough type. Needed for hppa2.0w. */ +typedef long int DItype; +typedef unsigned long int UDItype; +# endif +# endif +# define LONGLONG_STANDALONE /* Don't require GMP's longlong.h mdep files */ +# define ASSERT(x) /* FIXME make longlong.h really standalone */ +# define __GMP_DECLSPEC /* FIXME make longlong.h really standalone */ +# define __clz_tab factor_clz_tab /* Rename to avoid glibc collision */ +# ifndef __GMP_GNUC_PREREQ +# define __GMP_GNUC_PREREQ(a,b) 1 +# endif + +/* These stub macros are only used in longlong.h in certain system compiler + combinations, so ensure usage to avoid -Wunused-macros warnings. */ +# if __GMP_GNUC_PREREQ (1,1) && defined __clz_tab +ASSERT (1) +__GMP_DECLSPEC +# endif + +# if _ARCH_PPC +# define HAVE_HOST_CPU_FAMILY_powerpc 1 +# endif +# include "longlong.h" +# ifdef COUNT_LEADING_ZEROS_NEED_CLZ_TAB +const unsigned char factor_clz_tab[129] = +{ + 1,2,3,3,4,4,4,4,5,5,5,5,5,5,5,5,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6, + 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, + 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, + 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, + 9 +}; +# endif + +#else /* not USE_LONGLONG_H */ + +# define W_TYPE_SIZE (8 * sizeof (uintmax_t)) +# define __ll_B ((uintmax_t) 1 << (W_TYPE_SIZE / 2)) +# define __ll_lowpart(t) ((uintmax_t) (t) & (__ll_B - 1)) +# define __ll_highpart(t) ((uintmax_t) (t) >> (W_TYPE_SIZE / 2)) + +#endif + +#if !defined __clz_tab && !defined UHWtype +/* Without this seemingly useless conditional, gcc -Wunused-macros + warns that each of the two tested macros is unused on Fedora 18. + FIXME: this is just an ugly band-aid. Fix it properly. */ +#endif + +enum alg_type { ALG_POLLARD_RHO = 1, ALG_SQUFOF = 2 }; + +static enum alg_type alg; + +/* 2*3*5*7*11...*101 is 128 bits, and has 26 prime factors */ +#define MAX_NFACTS 26 + +enum +{ + DEV_DEBUG_OPTION = CHAR_MAX + 1 +}; + +static struct option const long_options[] = +{ + {"-debug", no_argument, NULL, DEV_DEBUG_OPTION}, + {GETOPT_HELP_OPTION_DECL}, + {GETOPT_VERSION_OPTION_DECL}, + {NULL, 0, NULL, 0} +}; + +struct factors +{ + uintmax_t plarge[2]; /* Can have a single large factor */ + uintmax_t p[MAX_NFACTS]; + unsigned char e[MAX_NFACTS]; + unsigned char nfactors; +}; #if HAVE_GMP -static mpz_t *factor = NULL; -static size_t nfactors_found = 0; -static size_t nfactors_allocated = 0; +struct mp_factors +{ + mpz_t *p; + unsigned long int *e; + unsigned long int nfactors; +}; +#endif + +static void factor (uintmax_t, uintmax_t, struct factors *); + +#ifndef umul_ppmm +# define umul_ppmm(w1, w0, u, v) \ + do { \ + uintmax_t __x0, __x1, __x2, __x3; \ + unsigned long int __ul, __vl, __uh, __vh; \ + uintmax_t __u = (u), __v = (v); \ + \ + __ul = __ll_lowpart (__u); \ + __uh = __ll_highpart (__u); \ + __vl = __ll_lowpart (__v); \ + __vh = __ll_highpart (__v); \ + \ + __x0 = (uintmax_t) __ul * __vl; \ + __x1 = (uintmax_t) __ul * __vh; \ + __x2 = (uintmax_t) __uh * __vl; \ + __x3 = (uintmax_t) __uh * __vh; \ + \ + __x1 += __ll_highpart (__x0);/* this can't give carry */ \ + __x1 += __x2; /* but this indeed can */ \ + if (__x1 < __x2) /* did we get it? */ \ + __x3 += __ll_B; /* yes, add it in the proper pos. */ \ + \ + (w1) = __x3 + __ll_highpart (__x1); \ + (w0) = (__x1 << W_TYPE_SIZE / 2) + __ll_lowpart (__x0); \ + } while (0) +#endif + +#if !defined udiv_qrnnd || defined UDIV_NEEDS_NORMALIZATION +/* Define our own, not needing normalization. This function is + currently not performance critical, so keep it simple. Similar to + the mod macro below. */ +# undef udiv_qrnnd +# define udiv_qrnnd(q, r, n1, n0, d) \ + do { \ + uintmax_t __d1, __d0, __q, __r1, __r0; \ + \ + assert ((n1) < (d)); \ + __d1 = (d); __d0 = 0; \ + __r1 = (n1); __r0 = (n0); \ + __q = 0; \ + for (unsigned int __i = W_TYPE_SIZE; __i > 0; __i--) \ + { \ + rsh2 (__d1, __d0, __d1, __d0, 1); \ + __q <<= 1; \ + if (ge2 (__r1, __r0, __d1, __d0)) \ + { \ + __q++; \ + sub_ddmmss (__r1, __r0, __r1, __r0, __d1, __d0); \ + } \ + } \ + (r) = __r0; \ + (q) = __q; \ + } while (0) +#endif + +#if !defined add_ssaaaa +# define add_ssaaaa(sh, sl, ah, al, bh, bl) \ + do { \ + uintmax_t _add_x; \ + _add_x = (al) + (bl); \ + (sh) = (ah) + (bh) + (_add_x < (al)); \ + (sl) = _add_x; \ + } while (0) +#endif + +#define rsh2(rh, rl, ah, al, cnt) \ + do { \ + (rl) = ((ah) << (W_TYPE_SIZE - (cnt))) | ((al) >> (cnt)); \ + (rh) = (ah) >> (cnt); \ + } while (0) + +#define lsh2(rh, rl, ah, al, cnt) \ + do { \ + (rh) = ((ah) << cnt) | ((al) >> (W_TYPE_SIZE - (cnt))); \ + (rl) = (al) << (cnt); \ + } while (0) + +#define ge2(ah, al, bh, bl) \ + ((ah) > (bh) || ((ah) == (bh) && (al) >= (bl))) + +#define gt2(ah, al, bh, bl) \ + ((ah) > (bh) || ((ah) == (bh) && (al) > (bl))) + +#ifndef sub_ddmmss +# define sub_ddmmss(rh, rl, ah, al, bh, bl) \ + do { \ + uintmax_t _cy; \ + _cy = (al) < (bl); \ + (rl) = (al) - (bl); \ + (rh) = (ah) - (bh) - _cy; \ + } while (0) +#endif + +#ifndef count_leading_zeros +# define count_leading_zeros(count, x) do { \ + uintmax_t __clz_x = (x); \ + unsigned int __clz_c; \ + for (__clz_c = 0; \ + (__clz_x & ((uintmax_t) 0xff << (W_TYPE_SIZE - 8))) == 0; \ + __clz_c += 8) \ + __clz_x <<= 8; \ + for (; (intmax_t)__clz_x >= 0; __clz_c++) \ + __clz_x <<= 1; \ + (count) = __clz_c; \ + } while (0) +#endif + +#ifndef count_trailing_zeros +# define count_trailing_zeros(count, x) do { \ + uintmax_t __ctz_x = (x); \ + unsigned int __ctz_c = 0; \ + while ((__ctz_x & 1) == 0) \ + { \ + __ctz_x >>= 1; \ + __ctz_c++; \ + } \ + (count) = __ctz_c; \ + } while (0) +#endif + +/* Requires that a < n and b <= n */ +#define submod(r,a,b,n) \ + do { \ + uintmax_t _t = - (uintmax_t) (a < b); \ + (r) = ((n) & _t) + (a) - (b); \ + } while (0) + +#define addmod(r,a,b,n) \ + submod ((r), (a), ((n) - (b)), (n)) + +/* Modular two-word addition and subtraction. For performance reasons, the + most significant bit of n1 must be clear. The destination variables must be + distinct from the mod operand. */ +#define addmod2(r1, r0, a1, a0, b1, b0, n1, n0) \ + do { \ + add_ssaaaa ((r1), (r0), (a1), (a0), (b1), (b0)); \ + if (ge2 ((r1), (r0), (n1), (n0))) \ + sub_ddmmss ((r1), (r0), (r1), (r0), (n1), (n0)); \ + } while (0) +#define submod2(r1, r0, a1, a0, b1, b0, n1, n0) \ + do { \ + sub_ddmmss ((r1), (r0), (a1), (a0), (b1), (b0)); \ + if ((intmax_t) (r1) < 0) \ + add_ssaaaa ((r1), (r0), (r1), (r0), (n1), (n0)); \ + } while (0) + +#define HIGHBIT_TO_MASK(x) \ + (((intmax_t)-1 >> 1) < 0 \ + ? (uintmax_t)((intmax_t)(x) >> (W_TYPE_SIZE - 1)) \ + : ((x) & ((uintmax_t) 1 << (W_TYPE_SIZE - 1)) \ + ? UINTMAX_MAX : (uintmax_t) 0)) + +/* Compute r = a mod d, where r = <*t1,retval>, a = <a1,a0>, d = <d1,d0>. + Requires that d1 != 0. */ +static uintmax_t +mod2 (uintmax_t *r1, uintmax_t a1, uintmax_t a0, uintmax_t d1, uintmax_t d0) +{ + int cntd, cnta; + + assert (d1 != 0); + + if (a1 == 0) + { + *r1 = 0; + return a0; + } + + count_leading_zeros (cntd, d1); + count_leading_zeros (cnta, a1); + int cnt = cntd - cnta; + lsh2 (d1, d0, d1, d0, cnt); + for (int i = 0; i < cnt; i++) + { + if (ge2 (a1, a0, d1, d0)) + sub_ddmmss (a1, a0, a1, a0, d1, d0); + rsh2 (d1, d0, d1, d0, 1); + } + + *r1 = a1; + return a0; +} + +static uintmax_t _GL_ATTRIBUTE_CONST +gcd_odd (uintmax_t a, uintmax_t b) +{ + if ( (b & 1) == 0) + { + uintmax_t t = b; + b = a; + a = t; + } + if (a == 0) + return b; + + /* Take out least significant one bit, to make room for sign */ + b >>= 1; + + for (;;) + { + uintmax_t t; + uintmax_t bgta; + + while ((a & 1) == 0) + a >>= 1; + a >>= 1; + + t = a - b; + if (t == 0) + return (a << 1) + 1; + + bgta = HIGHBIT_TO_MASK (t); + + /* b <-- min (a, b) */ + b += (bgta & t); + + /* a <-- |a - b| */ + a = (t ^ bgta) - bgta; + } +} + +static uintmax_t +gcd2_odd (uintmax_t *r1, uintmax_t a1, uintmax_t a0, uintmax_t b1, uintmax_t b0) +{ + while ((a0 & 1) == 0) + rsh2 (a1, a0, a1, a0, 1); + while ((b0 & 1) == 0) + rsh2 (b1, b0, b1, b0, 1); + + for (;;) + { + if ((b1 | a1) == 0) + { + *r1 = 0; + return gcd_odd (b0, a0); + } + + if (gt2 (a1, a0, b1, b0)) + { + sub_ddmmss (a1, a0, a1, a0, b1, b0); + do + rsh2 (a1, a0, a1, a0, 1); + while ((a0 & 1) == 0); + } + else if (gt2 (b1, b0, a1, a0)) + { + sub_ddmmss (b1, b0, b1, b0, a1, a0); + do + rsh2 (b1, b0, b1, b0, 1); + while ((b0 & 1) == 0); + } + else + break; + } + + *r1 = a1; + return a0; +} static void -debug (char const *fmt, ...) +factor_insert_multiplicity (struct factors *factors, + uintmax_t prime, unsigned int m) { - if (verbose) + unsigned int nfactors = factors->nfactors; + uintmax_t *p = factors->p; + unsigned char *e = factors->e; + + /* Locate position for insert new or increment e. */ + int i; + for (i = nfactors - 1; i >= 0; i--) + { + if (p[i] <= prime) + break; + } + + if (i < 0 || p[i] != prime) + { + for (int j = nfactors - 1; j > i; j--) + { + p[j + 1] = p[j]; + e[j + 1] = e[j]; + } + p[i + 1] = prime; + e[i + 1] = m; + factors->nfactors = nfactors + 1; + } + else + { + e[i] += m; + } +} + +#define factor_insert(f, p) factor_insert_multiplicity (f, p, 1) + +static void +factor_insert_large (struct factors *factors, + uintmax_t p1, uintmax_t p0) +{ + if (p1 > 0) + { + assert (factors->plarge[1] == 0); + factors->plarge[0] = p0; + factors->plarge[1] = p1; + } + else + factor_insert (factors, p0); +} + +#if HAVE_GMP + +# if !HAVE_DECL_MPZ_INITS + +# define mpz_inits(...) mpz_va_init (mpz_init, __VA_ARGS__) +# define mpz_clears(...) mpz_va_init (mpz_clear, __VA_ARGS__) + +static void +mpz_va_init (void (*mpz_single_init)(mpz_t), ...) +{ + va_list ap; + + va_start (ap, mpz_single_init); + + mpz_t *mpz; + while ((mpz = va_arg (ap, mpz_t *))) + mpz_single_init (*mpz); + + va_end (ap); +} +# endif + +static void mp_factor (mpz_t, struct mp_factors *); + +static void +mp_factor_init (struct mp_factors *factors) +{ + factors->p = NULL; + factors->e = NULL; + factors->nfactors = 0; +} + +static void +mp_factor_clear (struct mp_factors *factors) +{ + for (unsigned int i = 0; i < factors->nfactors; i++) + mpz_clear (factors->p[i]); + + free (factors->p); + free (factors->e); +} + +static void +mp_factor_insert (struct mp_factors *factors, mpz_t prime) +{ + unsigned long int nfactors = factors->nfactors; + mpz_t *p = factors->p; + unsigned long int *e = factors->e; + long i; + + /* Locate position for insert new or increment e. */ + for (i = nfactors - 1; i >= 0; i--) + { + if (mpz_cmp (p[i], prime) <= 0) + break; + } + + if (i < 0 || mpz_cmp (p[i], prime) != 0) + { + p = xrealloc (p, (nfactors + 1) * sizeof p[0]); + e = xrealloc (e, (nfactors + 1) * sizeof e[0]); + + mpz_init (p[nfactors]); + for (long j = nfactors - 1; j > i; j--) + { + mpz_set (p[j + 1], p[j]); + e[j + 1] = e[j]; + } + mpz_set (p[i + 1], prime); + e[i + 1] = 1; + + factors->p = p; + factors->e = e; + factors->nfactors = nfactors + 1; + } + else + { + e[i] += 1; + } +} + +static void +mp_factor_insert_ui (struct mp_factors *factors, unsigned long int prime) +{ + mpz_t pz; + + mpz_init_set_ui (pz, prime); + mp_factor_insert (factors, pz); + mpz_clear (pz); +} +#endif /* HAVE_GMP */ + + +/* Number of bits in an uintmax_t. */ +enum { W = sizeof (uintmax_t) * CHAR_BIT }; + +/* Verify that uintmax_t does not have holes in its representation. */ +verify (UINTMAX_MAX >> (W - 1) == 1); + +#define P(a,b,c,d) a, +static const unsigned char primes_diff[] = { +#include "primes.h" +0,0,0,0,0,0,0 /* 7 sentinels for 8-way loop */ +}; +#undef P + +#define PRIMES_PTAB_ENTRIES \ + (sizeof (primes_diff) / sizeof (primes_diff[0]) - 8 + 1) + +#define P(a,b,c,d) b, +static const unsigned char primes_diff8[] = { +#include "primes.h" +0,0,0,0,0,0,0 /* 7 sentinels for 8-way loop */ +}; +#undef P + +struct primes_dtab +{ + uintmax_t binv, lim; +}; + +#define P(a,b,c,d) {c,d}, +static const struct primes_dtab primes_dtab[] = { +#include "primes.h" +{1,0},{1,0},{1,0},{1,0},{1,0},{1,0},{1,0} /* 7 sentinels for 8-way loop */ +}; +#undef P + +/* Verify that uintmax_t is not wider than + the integers used to generate primes.h. */ +verify (W <= WIDE_UINT_BITS); + +/* debugging for developers. Enables devmsg(). + 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); @@ -64,366 +705,1684 @@ debug (char const *fmt, ...) } } +/* Prove primality or run probabilistic tests. */ +static bool flag_prove_primality = true; + +/* Number of Miller-Rabin tests to run when not proving primality. */ +#define MR_REPS 25 + +#ifdef __GNUC__ +# define LIKELY(cond) __builtin_expect ((cond), 1) +# define UNLIKELY(cond) __builtin_expect ((cond), 0) +#else +# define LIKELY(cond) (cond) +# define UNLIKELY(cond) (cond) +#endif + static void -emit_factor (mpz_t n) +factor_insert_refind (struct factors *factors, uintmax_t p, unsigned int i, + unsigned int off) { - if (nfactors_found == nfactors_allocated) - factor = X2NREALLOC (factor, &nfactors_allocated); - mpz_init (factor[nfactors_found]); - mpz_set (factor[nfactors_found], n); - ++nfactors_found; + for (unsigned int j = 0; j < off; j++) + p += primes_diff[i + j]; + factor_insert (factors, p); +} + +/* Trial division with odd primes uses the following trick. + + Let p be an odd prime, and B = 2^{W_TYPE_SIZE}. For simplicity, + consider the case t < B (this is the second loop below). + + From our tables we get + + binv = p^{-1} (mod B) + lim = floor ( (B-1) / p ). + + First assume that t is a multiple of p, t = q * p. Then 0 <= q <= lim + (and all quotients in this range occur for some t). + + Then t = q * p is true also (mod B), and p is invertible we get + + q = t * binv (mod B). + + Next, assume that t is *not* divisible by p. Since multiplication + by binv (mod B) is a one-to-one mapping, + + t * binv (mod B) > lim, + + because all the smaller values are already taken. + + This can be summed up by saying that the function + + q(t) = binv * t (mod B) + + is a permutation of the range 0 <= t < B, with the curious property + that it maps the multiples of p onto the range 0 <= q <= lim, in + order, and the non-multiples of p onto the range lim < q < B. + */ + +static uintmax_t +factor_using_division (uintmax_t *t1p, uintmax_t t1, uintmax_t t0, + struct factors *factors) +{ + if (t0 % 2 == 0) + { + unsigned int cnt; + + if (t0 == 0) + { + count_trailing_zeros (cnt, t1); + t0 = t1 >> cnt; + t1 = 0; + cnt += W_TYPE_SIZE; + } + else + { + count_trailing_zeros (cnt, t0); + rsh2 (t1, t0, t1, t0, cnt); + } + + factor_insert_multiplicity (factors, 2, cnt); + } + + uintmax_t p = 3; + unsigned int i; + for (i = 0; t1 > 0 && i < PRIMES_PTAB_ENTRIES; i++) + { + for (;;) + { + uintmax_t q1, q0, hi, lo ATTRIBUTE_UNUSED; + + q0 = t0 * primes_dtab[i].binv; + umul_ppmm (hi, lo, q0, p); + if (hi > t1) + break; + hi = t1 - hi; + q1 = hi * primes_dtab[i].binv; + if (LIKELY (q1 > primes_dtab[i].lim)) + break; + t1 = q1; t0 = q0; + factor_insert (factors, p); + } + p += primes_diff[i + 1]; + } + if (t1p) + *t1p = t1; + +#define DIVBLOCK(I) \ + do { \ + for (;;) \ + { \ + q = t0 * pd[I].binv; \ + if (LIKELY (q > pd[I].lim)) \ + break; \ + t0 = q; \ + factor_insert_refind (factors, p, i + 1, I); \ + } \ + } while (0) + + for (; i < PRIMES_PTAB_ENTRIES; i += 8) + { + uintmax_t q; + const struct primes_dtab *pd = &primes_dtab[i]; + DIVBLOCK (0); + DIVBLOCK (1); + DIVBLOCK (2); + DIVBLOCK (3); + DIVBLOCK (4); + DIVBLOCK (5); + DIVBLOCK (6); + DIVBLOCK (7); + + p += primes_diff8[i]; + if (p * p > t0) + break; + } + + return t0; } +#if HAVE_GMP static void -emit_ul_factor (unsigned long int i) +mp_factor_using_division (mpz_t t, struct mp_factors *factors) { - mpz_t t; - mpz_init (t); - mpz_set_ui (t, i); - emit_factor (t); - mpz_clear (t); + mpz_t q; + unsigned long int p; + + devmsg ("[trial division] "); + + mpz_init (q); + + p = mpz_scan1 (t, 0); + mpz_div_2exp (t, t, p); + while (p) + { + mp_factor_insert_ui (factors, 2); + --p; + } + + p = 3; + for (unsigned int i = 1; i <= PRIMES_PTAB_ENTRIES;) + { + if (! mpz_divisible_ui_p (t, p)) + { + p += primes_diff[i++]; + if (mpz_cmp_ui (t, p * p) < 0) + break; + } + else + { + mpz_tdiv_q_ui (t, t, p); + mp_factor_insert_ui (factors, p); + } + } + + mpz_clear (q); +} +#endif + +/* Entry i contains (2i+1)^(-1) mod 2^8. */ +static const unsigned char binvert_table[128] = +{ + 0x01, 0xAB, 0xCD, 0xB7, 0x39, 0xA3, 0xC5, 0xEF, + 0xF1, 0x1B, 0x3D, 0xA7, 0x29, 0x13, 0x35, 0xDF, + 0xE1, 0x8B, 0xAD, 0x97, 0x19, 0x83, 0xA5, 0xCF, + 0xD1, 0xFB, 0x1D, 0x87, 0x09, 0xF3, 0x15, 0xBF, + 0xC1, 0x6B, 0x8D, 0x77, 0xF9, 0x63, 0x85, 0xAF, + 0xB1, 0xDB, 0xFD, 0x67, 0xE9, 0xD3, 0xF5, 0x9F, + 0xA1, 0x4B, 0x6D, 0x57, 0xD9, 0x43, 0x65, 0x8F, + 0x91, 0xBB, 0xDD, 0x47, 0xC9, 0xB3, 0xD5, 0x7F, + 0x81, 0x2B, 0x4D, 0x37, 0xB9, 0x23, 0x45, 0x6F, + 0x71, 0x9B, 0xBD, 0x27, 0xA9, 0x93, 0xB5, 0x5F, + 0x61, 0x0B, 0x2D, 0x17, 0x99, 0x03, 0x25, 0x4F, + 0x51, 0x7B, 0x9D, 0x07, 0x89, 0x73, 0x95, 0x3F, + 0x41, 0xEB, 0x0D, 0xF7, 0x79, 0xE3, 0x05, 0x2F, + 0x31, 0x5B, 0x7D, 0xE7, 0x69, 0x53, 0x75, 0x1F, + 0x21, 0xCB, 0xED, 0xD7, 0x59, 0xC3, 0xE5, 0x0F, + 0x11, 0x3B, 0x5D, 0xC7, 0x49, 0x33, 0x55, 0xFF +}; + +/* Compute n^(-1) mod B, using a Newton iteration. */ +#define binv(inv,n) \ + do { \ + uintmax_t __n = (n); \ + uintmax_t __inv; \ + \ + __inv = binvert_table[(__n / 2) & 0x7F]; /* 8 */ \ + if (W_TYPE_SIZE > 8) __inv = 2 * __inv - __inv * __inv * __n; \ + if (W_TYPE_SIZE > 16) __inv = 2 * __inv - __inv * __inv * __n; \ + if (W_TYPE_SIZE > 32) __inv = 2 * __inv - __inv * __inv * __n; \ + \ + if (W_TYPE_SIZE > 64) \ + { \ + int __invbits = 64; \ + do { \ + __inv = 2 * __inv - __inv * __inv * __n; \ + __invbits *= 2; \ + } while (__invbits < W_TYPE_SIZE); \ + } \ + \ + (inv) = __inv; \ + } while (0) + +/* q = u / d, assuming d|u. */ +#define divexact_21(q1, q0, u1, u0, d) \ + do { \ + uintmax_t _di, _q0; \ + binv (_di, (d)); \ + _q0 = (u0) * _di; \ + if ((u1) >= (d)) \ + { \ + uintmax_t _p1, _p0 ATTRIBUTE_UNUSED; \ + umul_ppmm (_p1, _p0, _q0, d); \ + (q1) = ((u1) - _p1) * _di; \ + (q0) = _q0; \ + } \ + else \ + { \ + (q0) = _q0; \ + (q1) = 0; \ + } \ + } while (0) + +/* x B (mod n). */ +#define redcify(r_prim, r, n) \ + do { \ + uintmax_t _redcify_q ATTRIBUTE_UNUSED; \ + udiv_qrnnd (_redcify_q, r_prim, r, 0, n); \ + } while (0) + +/* x B^2 (mod n). Requires x > 0, n1 < B/2 */ +#define redcify2(r1, r0, x, n1, n0) \ + do { \ + uintmax_t _r1, _r0, _i; \ + if ((x) < (n1)) \ + { \ + _r1 = (x); _r0 = 0; \ + _i = W_TYPE_SIZE; \ + } \ + else \ + { \ + _r1 = 0; _r0 = (x); \ + _i = 2*W_TYPE_SIZE; \ + } \ + while (_i-- > 0) \ + { \ + lsh2 (_r1, _r0, _r1, _r0, 1); \ + if (ge2 (_r1, _r0, (n1), (n0))) \ + sub_ddmmss (_r1, _r0, _r1, _r0, (n1), (n0)); \ + } \ + (r1) = _r1; \ + (r0) = _r0; \ + } while (0) + +/* Modular two-word multiplication, r = a * b mod m, with mi = m^(-1) mod B. + Both a and b must be in redc form, the result will be in redc form too. */ +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; + + umul_ppmm (rh, rl, a, b); + q = rl * mi; + umul_ppmm (th, tl, q, m); + xh = rh - th; + if (rh < th) + xh += m; + + return xh; +} + +/* Modular two-word multiplication, r = a * b mod m, with mi = m^(-1) mod B. + Both a and b must be in redc form, the result will be in redc form too. + For performance reasons, the most significant bit of m must be clear. */ +static uintmax_t +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; + mi = -mi; + assert ( (a1 >> (W_TYPE_SIZE - 1)) == 0); + assert ( (b1 >> (W_TYPE_SIZE - 1)) == 0); + assert ( (m1 >> (W_TYPE_SIZE - 1)) == 0); + + /* First compute a0 * <b1, b0> B^{-1} + +-----+ + |a0 b0| + +--+--+--+ + |a0 b1| + +--+--+--+ + |q0 m0| + +--+--+--+ + |q0 m1| + -+--+--+--+ + |r1|r0| 0| + +--+--+--+ + */ + umul_ppmm (t1, t0, a0, b0); + umul_ppmm (r1, r0, a0, b1); + q = mi * t0; + umul_ppmm (p1, p0, q, m0); + umul_ppmm (s1, s0, q, m1); + r0 += (t0 != 0); /* Carry */ + add_ssaaaa (r1, r0, r1, r0, 0, p1); + add_ssaaaa (r1, r0, r1, r0, 0, t1); + add_ssaaaa (r1, r0, r1, r0, s1, s0); + + /* Next, (a1 * <b1, b0> + <r1, r0> B^{-1} + +-----+ + |a1 b0| + +--+--+ + |r1|r0| + +--+--+--+ + |a1 b1| + +--+--+--+ + |q1 m0| + +--+--+--+ + |q1 m1| + -+--+--+--+ + |r1|r0| 0| + +--+--+--+ + */ + umul_ppmm (t1, t0, a1, b0); + umul_ppmm (s1, s0, a1, b1); + add_ssaaaa (t1, t0, t1, t0, 0, r0); + q = mi * t0; + add_ssaaaa (r1, r0, s1, s0, 0, r1); + umul_ppmm (p1, p0, q, m0); + umul_ppmm (s1, s0, q, m1); + r0 += (t0 != 0); /* Carry */ + add_ssaaaa (r1, r0, r1, r0, 0, p1); + add_ssaaaa (r1, r0, r1, r0, 0, t1); + add_ssaaaa (r1, r0, r1, r0, s1, s0); + + if (ge2 (r1, r0, m1, m0)) + sub_ddmmss (r1, r0, r1, r0, m1, m0); + + *r1p = r1; + return r0; +} + +static uintmax_t _GL_ATTRIBUTE_CONST +powm (uintmax_t b, uintmax_t e, uintmax_t n, uintmax_t ni, uintmax_t one) +{ + uintmax_t y = one; + + if (e & 1) + y = b; + + while (e != 0) + { + b = mulredc (b, b, n, ni); + e >>= 1; + + if (e & 1) + y = mulredc (y, b, n, ni); + } + + return y; +} + +static uintmax_t +powm2 (uintmax_t *r1m, + const uintmax_t *bp, const uintmax_t *ep, const uintmax_t *np, + uintmax_t ni, const uintmax_t *one) +{ + uintmax_t r1, r0, b1, b0, n1, n0; + unsigned int i; + uintmax_t e; + + b0 = bp[0]; + b1 = bp[1]; + n0 = np[0]; + n1 = np[1]; + + r0 = one[0]; + r1 = one[1]; + + for (e = ep[0], i = W_TYPE_SIZE; i > 0; i--, e >>= 1) + { + if (e & 1) + { + r0 = mulredc2 (r1m, r1, r0, b1, b0, n1, n0, ni); + r1 = *r1m; + } + b0 = mulredc2 (r1m, b1, b0, b1, b0, n1, n0, ni); + b1 = *r1m; + } + for (e = ep[1]; e > 0; e >>= 1) + { + if (e & 1) + { + r0 = mulredc2 (r1m, r1, r0, b1, b0, n1, n0, ni); + r1 = *r1m; + } + b0 = mulredc2 (r1m, b1, b0, b1, b0, n1, n0, ni); + b1 = *r1m; + } + *r1m = r1; + return r0; +} + +static bool _GL_ATTRIBUTE_CONST +millerrabin (uintmax_t n, uintmax_t ni, uintmax_t b, uintmax_t q, + unsigned int k, uintmax_t one) +{ + uintmax_t y = powm (b, q, n, ni, one); + + uintmax_t nm1 = n - one; /* -1, but in redc representation. */ + + if (y == one || y == nm1) + return true; + + for (unsigned int i = 1; i < k; i++) + { + y = mulredc (y, y, n, ni); + + if (y == nm1) + return true; + if (y == one) + return false; + } + return false; +} + +static bool +millerrabin2 (const uintmax_t *np, uintmax_t ni, const uintmax_t *bp, + const uintmax_t *qp, unsigned int k, const uintmax_t *one) +{ + uintmax_t y1, y0, nm1_1, nm1_0, r1m; + + y0 = powm2 (&r1m, bp, qp, np, ni, one); + y1 = r1m; + + if (y0 == one[0] && y1 == one[1]) + return true; + + sub_ddmmss (nm1_1, nm1_0, np[1], np[0], one[1], one[0]); + + if (y0 == nm1_0 && y1 == nm1_1) + return true; + + for (unsigned int i = 1; i < k; i++) + { + y0 = mulredc2 (&r1m, y1, y0, y1, y0, np[1], np[0], ni); + y1 = r1m; + + if (y0 == nm1_0 && y1 == nm1_1) + return true; + if (y0 == one[0] && y1 == one[1]) + return false; + } + return false; +} + +#if HAVE_GMP +static bool +mp_millerrabin (mpz_srcptr n, mpz_srcptr nm1, mpz_ptr x, mpz_ptr y, + mpz_srcptr q, unsigned long int k) +{ + mpz_powm (y, x, q, n); + + if (mpz_cmp_ui (y, 1) == 0 || mpz_cmp (y, nm1) == 0) + return true; + + for (unsigned long int i = 1; i < k; i++) + { + mpz_powm_ui (y, y, 2, n); + if (mpz_cmp (y, nm1) == 0) + return true; + if (mpz_cmp_ui (y, 1) == 0) + return false; + } + return false; +} +#endif + +/* Lucas' prime test. The number of iterations vary greatly, up to a few dozen + have been observed. The average seem to be about 2. */ +static bool +prime_p (uintmax_t n) +{ + int k; + bool is_prime; + uintmax_t a_prim, one, ni; + struct factors factors; + + if (n <= 1) + return false; + + /* We have already casted out small primes. */ + if (n < (uintmax_t) FIRST_OMITTED_PRIME * FIRST_OMITTED_PRIME) + return true; + + /* Precomputation for Miller-Rabin. */ + uintmax_t q = n - 1; + for (k = 0; (q & 1) == 0; k++) + q >>= 1; + + uintmax_t a = 2; + binv (ni, n); /* ni <- 1/n mod B */ + redcify (one, 1, n); + addmod (a_prim, one, one, n); /* i.e., redcify a = 2 */ + + /* Perform a Miller-Rabin test, finds most composites quickly. */ + if (!millerrabin (n, ni, a_prim, q, k, one)) + return false; + + if (flag_prove_primality) + { + /* Factor n-1 for Lucas. */ + factor (0, n - 1, &factors); + } + + /* Loop until Lucas proves our number prime, or Miller-Rabin proves our + number composite. */ + for (unsigned int r = 0; r < PRIMES_PTAB_ENTRIES; r++) + { + if (flag_prove_primality) + { + is_prime = true; + for (unsigned int i = 0; i < factors.nfactors && is_prime; i++) + { + is_prime + = powm (a_prim, (n - 1) / factors.p[i], n, ni, one) != one; + } + } + else + { + /* After enough Miller-Rabin runs, be content. */ + is_prime = (r == MR_REPS - 1); + } + + if (is_prime) + return true; + + a += primes_diff[r]; /* Establish new base. */ + + /* The following is equivalent to redcify (a_prim, a, n). It runs faster + on most processors, since it avoids udiv_qrnnd. If we go down the + udiv_qrnnd_preinv path, this code should be replaced. */ + { + uintmax_t s1, s0; + umul_ppmm (s1, s0, one, a); + if (LIKELY (s1 == 0)) + a_prim = s0 % n; + else + { + uintmax_t dummy ATTRIBUTE_UNUSED; + udiv_qrnnd (dummy, a_prim, s1, s0, n); + } + } + + if (!millerrabin (n, ni, a_prim, q, k, one)) + return false; + } + + error (0, 0, _("Lucas prime test failure. This should not happen")); + abort (); +} + +static bool +prime2_p (uintmax_t n1, uintmax_t n0) +{ + uintmax_t q[2], nm1[2]; + uintmax_t a_prim[2]; + uintmax_t one[2]; + uintmax_t na[2]; + uintmax_t ni; + unsigned int k; + struct factors factors; + + if (n1 == 0) + return prime_p (n0); + + nm1[1] = n1 - (n0 == 0); + nm1[0] = n0 - 1; + if (nm1[0] == 0) + { + count_trailing_zeros (k, nm1[1]); + + q[0] = nm1[1] >> k; + q[1] = 0; + k += W_TYPE_SIZE; + } + else + { + count_trailing_zeros (k, nm1[0]); + rsh2 (q[1], q[0], nm1[1], nm1[0], k); + } + + uintmax_t a = 2; + binv (ni, n0); + redcify2 (one[1], one[0], 1, n1, n0); + addmod2 (a_prim[1], a_prim[0], one[1], one[0], one[1], one[0], n1, n0); + + /* FIXME: Use scalars or pointers in arguments? Some consistency needed. */ + na[0] = n0; + na[1] = n1; + + if (!millerrabin2 (na, ni, a_prim, q, k, one)) + return false; + + if (flag_prove_primality) + { + /* Factor n-1 for Lucas. */ + factor (nm1[1], nm1[0], &factors); + } + + /* Loop until Lucas proves our number prime, or Miller-Rabin proves our + number composite. */ + for (unsigned int r = 0; r < PRIMES_PTAB_ENTRIES; r++) + { + bool is_prime; + uintmax_t e[2], y[2]; + + if (flag_prove_primality) + { + is_prime = true; + if (factors.plarge[1]) + { + uintmax_t pi; + binv (pi, factors.plarge[0]); + e[0] = pi * nm1[0]; + e[1] = 0; + y[0] = powm2 (&y[1], a_prim, e, na, ni, one); + is_prime = (y[0] != one[0] || y[1] != one[1]); + } + for (unsigned int i = 0; i < factors.nfactors && is_prime; i++) + { + /* FIXME: We always have the factor 2. Do we really need to + handle it here? We have done the same powering as part + of millerrabin. */ + if (factors.p[i] == 2) + rsh2 (e[1], e[0], nm1[1], nm1[0], 1); + else + divexact_21 (e[1], e[0], nm1[1], nm1[0], factors.p[i]); + y[0] = powm2 (&y[1], a_prim, e, na, ni, one); + is_prime = (y[0] != one[0] || y[1] != one[1]); + } + } + else + { + /* After enough Miller-Rabin runs, be content. */ + is_prime = (r == MR_REPS - 1); + } + + if (is_prime) + return true; + + a += primes_diff[r]; /* Establish new base. */ + redcify2 (a_prim[1], a_prim[0], a, n1, n0); + + if (!millerrabin2 (na, ni, a_prim, q, k, one)) + return false; + } + + error (0, 0, _("Lucas prime test failure. This should not happen")); + abort (); +} + +#if HAVE_GMP +static bool +mp_prime_p (mpz_t n) +{ + bool is_prime; + mpz_t q, a, nm1, tmp; + struct mp_factors factors; + + if (mpz_cmp_ui (n, 1) <= 0) + return false; + + /* We have already casted out small primes. */ + if (mpz_cmp_ui (n, (long) FIRST_OMITTED_PRIME * FIRST_OMITTED_PRIME) < 0) + return true; + + mpz_inits (q, a, nm1, tmp, NULL); + + /* Precomputation for Miller-Rabin. */ + mpz_sub_ui (nm1, n, 1); + + /* Find q and k, where q is odd and n = 1 + 2**k * q. */ + unsigned long int k = mpz_scan1 (nm1, 0); + mpz_tdiv_q_2exp (q, nm1, k); + + mpz_set_ui (a, 2); + + /* Perform a Miller-Rabin test, finds most composites quickly. */ + if (!mp_millerrabin (n, nm1, a, tmp, q, k)) + { + is_prime = false; + goto ret2; + } + + if (flag_prove_primality) + { + /* Factor n-1 for Lucas. */ + mpz_set (tmp, nm1); + mp_factor (tmp, &factors); + } + + /* Loop until Lucas proves our number prime, or Miller-Rabin proves our + number composite. */ + for (unsigned int r = 0; r < PRIMES_PTAB_ENTRIES; r++) + { + if (flag_prove_primality) + { + is_prime = true; + for (unsigned long int i = 0; i < factors.nfactors && is_prime; i++) + { + mpz_divexact (tmp, nm1, factors.p[i]); + mpz_powm (tmp, a, tmp, n); + is_prime = mpz_cmp_ui (tmp, 1) != 0; + } + } + else + { + /* After enough Miller-Rabin runs, be content. */ + is_prime = (r == MR_REPS - 1); + } + + if (is_prime) + goto ret1; + + mpz_add_ui (a, a, primes_diff[r]); /* Establish new base. */ + + if (!mp_millerrabin (n, nm1, a, tmp, q, k)) + { + is_prime = false; + goto ret1; + } + } + + error (0, 0, _("Lucas prime test failure. This should not happen")); + abort (); + + ret1: + if (flag_prove_primality) + mp_factor_clear (&factors); + ret2: + mpz_clears (q, a, nm1, tmp, NULL); + + return is_prime; +} +#endif + +static void +factor_using_pollard_rho (uintmax_t n, unsigned long int a, + struct factors *factors) +{ + uintmax_t x, z, y, P, t, ni, g; + + unsigned long int k = 1; + unsigned long int l = 1; + + redcify (P, 1, n); + addmod (x, P, P, n); /* i.e., redcify(2) */ + y = z = x; + + while (n != 1) + { + assert (a < n); + + binv (ni, n); /* FIXME: when could we use old 'ni' value? */ + + for (;;) + { + do + { + x = mulredc (x, x, n, ni); + addmod (x, x, a, n); + + submod (t, z, x, n); + P = mulredc (P, t, n, ni); + + if (k % 32 == 1) + { + if (gcd_odd (P, n) != 1) + goto factor_found; + y = x; + } + } + while (--k != 0); + + z = x; + k = l; + l = 2 * l; + for (unsigned long int i = 0; i < k; i++) + { + x = mulredc (x, x, n, ni); + addmod (x, x, a, n); + } + y = x; + } + + factor_found: + do + { + y = mulredc (y, y, n, ni); + addmod (y, y, a, n); + + submod (t, z, y, n); + g = gcd_odd (t, n); + } + while (g == 1); + + n = n / g; + + if (!prime_p (g)) + factor_using_pollard_rho (g, a + 1, factors); + else + factor_insert (factors, g); + + if (prime_p (n)) + { + factor_insert (factors, n); + break; + } + + x = x % n; + z = z % n; + y = y % n; + } } static void -factor_using_division (mpz_t t, unsigned int limit) +factor_using_pollard_rho2 (uintmax_t n1, uintmax_t n0, unsigned long int a, + struct factors *factors) { - mpz_t q, r; - unsigned long int f; - int ai; - static unsigned int const add[] = {4, 2, 4, 2, 4, 6, 2, 6}; - unsigned int const *addv = add; - unsigned int failures; + uintmax_t x1, x0, z1, z0, y1, y0, P1, P0, t1, t0, ni, g1, g0, r1m; + + unsigned long int k = 1; + unsigned long int l = 1; + + redcify2 (P1, P0, 1, n1, n0); + addmod2 (x1, x0, P1, P0, P1, P0, n1, n0); /* i.e., redcify(2) */ + y1 = z1 = x1; + y0 = z0 = x0; + + while (n1 != 0 || n0 != 1) + { + binv (ni, n0); + + for (;;) + { + do + { + x0 = mulredc2 (&r1m, x1, x0, x1, x0, n1, n0, ni); + x1 = r1m; + addmod2 (x1, x0, x1, x0, 0, (uintmax_t) a, n1, n0); + + submod2 (t1, t0, z1, z0, x1, x0, n1, n0); + P0 = mulredc2 (&r1m, P1, P0, t1, t0, n1, n0, ni); + P1 = r1m; + + if (k % 32 == 1) + { + g0 = gcd2_odd (&g1, P1, P0, n1, n0); + if (g1 != 0 || g0 != 1) + goto factor_found; + y1 = x1; y0 = x0; + } + } + while (--k != 0); + + z1 = x1; z0 = x0; + k = l; + l = 2 * l; + for (unsigned long int i = 0; i < k; i++) + { + x0 = mulredc2 (&r1m, x1, x0, x1, x0, n1, n0, ni); + x1 = r1m; + addmod2 (x1, x0, x1, x0, 0, (uintmax_t) a, n1, n0); + } + y1 = x1; y0 = x0; + } - debug ("[trial division (%u)] ", limit); + factor_found: + do + { + y0 = mulredc2 (&r1m, y1, y0, y1, y0, n1, n0, ni); + y1 = r1m; + addmod2 (y1, y0, y1, y0, 0, (uintmax_t) a, n1, n0); - mpz_init (q); - mpz_init (r); + submod2 (t1, t0, z1, z0, y1, y0, n1, n0); + g0 = gcd2_odd (&g1, t1, t0, n1, n0); + } + while (g1 == 0 && g0 == 1); - f = mpz_scan1 (t, 0); - mpz_div_2exp (t, t, f); - while (f) - { - emit_ul_factor (2); - --f; - } + if (g1 == 0) + { + /* The found factor is one word. */ + divexact_21 (n1, n0, n1, n0, g0); /* n = n / g */ - while (true) - { - mpz_tdiv_qr_ui (q, r, t, 3); - if (mpz_cmp_ui (r, 0) != 0) - break; - mpz_set (t, q); - emit_ul_factor (3); - } + if (!prime_p (g0)) + factor_using_pollard_rho (g0, a + 1, factors); + else + factor_insert (factors, g0); + } + else + { + /* The found factor is two words. This is highly unlikely, thus hard + to trigger. Please be careful before you change this code! */ + uintmax_t ginv; - while (true) - { - mpz_tdiv_qr_ui (q, r, t, 5); - if (mpz_cmp_ui (r, 0) != 0) - break; - mpz_set (t, q); - emit_ul_factor (5); - } + binv (ginv, g0); /* Compute n = n / g. Since the result will */ + n0 = ginv * n0; /* fit one word, we can compute the quotient */ + n1 = 0; /* modulo B, ignoring the high divisor word. */ - failures = 0; - f = 7; - ai = 0; - while (mpz_cmp_ui (t, 1) != 0) - { - mpz_tdiv_qr_ui (q, r, t, f); - if (mpz_cmp_ui (r, 0) != 0) + if (!prime2_p (g1, g0)) + factor_using_pollard_rho2 (g1, g0, a + 1, factors); + else + factor_insert_large (factors, g1, g0); + } + + if (n1 == 0) { - f += addv[ai]; - if (mpz_cmp_ui (q, f) < 0) - break; - ai = (ai + 1) & 7; - failures++; - if (failures > limit) - break; + if (prime_p (n0)) + { + factor_insert (factors, n0); + break; + } + + factor_using_pollard_rho (n0, a, factors); + return; } - else + + if (prime2_p (n1, n0)) { - mpz_swap (t, q); - emit_ul_factor (f); - failures = 0; + factor_insert_large (factors, n1, n0); + break; } - } - mpz_clear (q); - mpz_clear (r); + x0 = mod2 (&x1, x1, x0, n1, n0); + z0 = mod2 (&z1, z1, z0, n1, n0); + y0 = mod2 (&y1, y1, y0, n1, n0); + } } +#if HAVE_GMP static void -factor_using_pollard_rho (mpz_t n, int a_int) +mp_factor_using_pollard_rho (mpz_t n, unsigned long int a, + struct mp_factors *factors) { - mpz_t x, x1, y, P; - mpz_t a; - mpz_t g; - mpz_t t1, t2; - int k, l, c; - - debug ("[pollard-rho (%d)] ", a_int); + mpz_t x, z, y, P; + mpz_t t, t2; - mpz_init (g); - mpz_init (t1); - mpz_init (t2); + devmsg ("[pollard-rho (%lu)] ", a); - mpz_init_set_si (a, a_int); + mpz_inits (t, t2, NULL); mpz_init_set_si (y, 2); mpz_init_set_si (x, 2); - mpz_init_set_si (x1, 2); - k = 1; - l = 1; + mpz_init_set_si (z, 2); mpz_init_set_ui (P, 1); - c = 0; + + unsigned long long int k = 1; + unsigned long long int l = 1; while (mpz_cmp_ui (n, 1) != 0) { -S2: - mpz_mul (x, x, x); mpz_add (x, x, a); mpz_mod (x, x, n); - - mpz_sub (t1, x1, x); mpz_mul (t2, P, t1); mpz_mod (P, t2, n); - c++; - if (c == 20) + for (;;) { - c = 0; - mpz_gcd (g, P, n); - if (mpz_cmp_ui (g, 1) != 0) - goto S4; + do + { + mpz_mul (t, x, x); + mpz_mod (x, t, n); + mpz_add_ui (x, x, a); + + mpz_sub (t, z, x); + mpz_mul (t2, P, t); + mpz_mod (P, t2, n); + + if (k % 32 == 1) + { + mpz_gcd (t, P, n); + if (mpz_cmp_ui (t, 1) != 0) + goto factor_found; + mpz_set (y, x); + } + } + while (--k != 0); + + mpz_set (z, x); + k = l; + l = 2 * l; + for (unsigned long long int i = 0; i < k; i++) + { + mpz_mul (t, x, x); + mpz_mod (x, t, n); + mpz_add_ui (x, x, a); + } mpz_set (y, x); } - k--; - if (k > 0) - goto S2; - - mpz_gcd (g, P, n); - if (mpz_cmp_ui (g, 1) != 0) - goto S4; - - mpz_set (x1, x); - k = l; - l = 2 * l; - unsigned int i; - for (i = 0; i < k; i++) - { - mpz_mul (x, x, x); mpz_add (x, x, a); mpz_mod (x, x, n); - } - mpz_set (y, x); - c = 0; - goto S2; -S4: + factor_found: do { - mpz_mul (y, y, y); mpz_add (y, y, a); mpz_mod (y, y, n); - mpz_sub (t1, x1, y); mpz_gcd (g, t1, n); + mpz_mul (t, y, y); + mpz_mod (y, t, n); + mpz_add_ui (y, y, a); + + mpz_sub (t, z, y); + mpz_gcd (t, t, n); } - while (mpz_cmp_ui (g, 1) == 0); + while (mpz_cmp_ui (t, 1) == 0); - mpz_div (n, n, g); /* divide by g, before g is overwritten */ + mpz_divexact (n, n, t); /* divide by t, before t is overwritten */ - if (!mpz_probab_prime_p (g, 3)) + if (!mp_prime_p (t)) { - do - { - mp_limb_t a_limb; - mpn_random (&a_limb, (mp_size_t) 1); - a_int = (int) a_limb; - } - while (a_int == -2 || a_int == 0); - - debug ("[composite factor--restarting pollard-rho] "); - factor_using_pollard_rho (g, a_int); + devmsg ("[composite factor--restarting pollard-rho] "); + mp_factor_using_pollard_rho (t, a + 1, factors); } else { - emit_factor (g); + mp_factor_insert (factors, t); } - mpz_mod (x, x, n); - mpz_mod (x1, x1, n); - mpz_mod (y, y, n); - if (mpz_probab_prime_p (n, 3)) + + if (mp_prime_p (n)) { - emit_factor (n); + mp_factor_insert (factors, n); break; } + + mpz_mod (x, x, n); + mpz_mod (z, z, n); + mpz_mod (y, y, n); } - mpz_clear (g); - mpz_clear (P); - mpz_clear (t2); - mpz_clear (t1); - mpz_clear (a); - mpz_clear (x1); - mpz_clear (x); - mpz_clear (y); + mpz_clears (P, t2, t, z, x, y, NULL); } +#endif -#else - -static void -debug (char const *fmt ATTRIBUTE_UNUSED, ...) +/* FIXME: Maybe better to use an iteration converging to 1/sqrt(n)? If + algorithm is replaced, consider also returning the remainder. */ +static uintmax_t _GL_ATTRIBUTE_CONST +isqrt (uintmax_t n) { + uintmax_t x; + unsigned c; + if (n == 0) + return 0; + + count_leading_zeros (c, n); + + /* Make x > sqrt(n). This will be invariant through the loop. */ + x = (uintmax_t) 1 << ((W_TYPE_SIZE + 1 - c) / 2); + + for (;;) + { + uintmax_t y = (x + n/x) / 2; + if (y >= x) + return x; + + x = y; + } } -#endif +static uintmax_t _GL_ATTRIBUTE_CONST +isqrt2 (uintmax_t nh, uintmax_t nl) +{ + unsigned int shift; + uintmax_t x; + + /* Ensures the remainder fits in an uintmax_t. */ + assert (nh < ((uintmax_t) 1 << (W_TYPE_SIZE - 2))); + + if (nh == 0) + return isqrt (nl); + + count_leading_zeros (shift, nh); + shift &= ~1; + + /* Make x > sqrt(n) */ + x = isqrt ( (nh << shift) + (nl >> (W_TYPE_SIZE - shift))) + 1; + x <<= (W_TYPE_SIZE - shift) / 2; + + /* Do we need more than one iteration? */ + for (;;) + { + uintmax_t r ATTRIBUTE_UNUSED; + uintmax_t q, y; + udiv_qrnnd (q, r, nh, nl, x); + y = (x + q) / 2; + + if (y >= x) + { + uintmax_t hi, lo; + umul_ppmm (hi, lo, x + 1, x + 1); + assert (gt2 (hi, lo, nh, nl)); -/* The maximum number of factors, including -1, for negative numbers. */ -#define MAX_N_FACTORS (sizeof (uintmax_t) * CHAR_BIT) + umul_ppmm (hi, lo, x, x); + assert (ge2 (nh, nl, hi, lo)); + sub_ddmmss (hi, lo, nh, nl, hi, lo); + assert (hi == 0); -/* The trial divisor increment wheel. Use it to skip over divisors that - are composites of 2, 3, 5, 7, or 11. The part from WHEEL_START up to - WHEEL_END is reused periodically, while the "lead in" is used to test - for those primes and to jump onto the wheel. For more information, see - http://www.utm.edu/research/primes/glossary/WheelFactorization.html */ + return x; + } + + x = y; + } +} + +/* MAGIC[N] has a bit i set iff i is a quadratic residue mod N. */ +#define MAGIC64 ((uint64_t) 0x0202021202030213ULL) +#define MAGIC63 ((uint64_t) 0x0402483012450293ULL) +#define MAGIC65 ((uint64_t) 0x218a019866014613ULL) +#define MAGIC11 0x23b + +/* Return the square root if the input is a square, otherwise 0. */ +static uintmax_t _GL_ATTRIBUTE_CONST +is_square (uintmax_t x) +{ + /* Uses the tests suggested by Cohen. Excludes 99% of the non-squares before + computing the square root. */ + if (((MAGIC64 >> (x & 63)) & 1) + && ((MAGIC63 >> (x % 63)) & 1) + /* Both 0 and 64 are squares mod (65) */ + && ((MAGIC65 >> ((x % 65) & 63)) & 1) + && ((MAGIC11 >> (x % 11) & 1))) + { + uintmax_t r = isqrt (x); + if (r*r == x) + return r; + } + return 0; +} -#include "wheel-size.h" /* For the definition of WHEEL_SIZE. */ -static const unsigned char wheel_tab[] = +/* invtab[i] = floor(0x10000 / (0x100 + i) */ +static const unsigned short invtab[0x81] = { -#include "wheel.h" + 0x200, + 0x1fc, 0x1f8, 0x1f4, 0x1f0, 0x1ec, 0x1e9, 0x1e5, 0x1e1, + 0x1de, 0x1da, 0x1d7, 0x1d4, 0x1d0, 0x1cd, 0x1ca, 0x1c7, + 0x1c3, 0x1c0, 0x1bd, 0x1ba, 0x1b7, 0x1b4, 0x1b2, 0x1af, + 0x1ac, 0x1a9, 0x1a6, 0x1a4, 0x1a1, 0x19e, 0x19c, 0x199, + 0x197, 0x194, 0x192, 0x18f, 0x18d, 0x18a, 0x188, 0x186, + 0x183, 0x181, 0x17f, 0x17d, 0x17a, 0x178, 0x176, 0x174, + 0x172, 0x170, 0x16e, 0x16c, 0x16a, 0x168, 0x166, 0x164, + 0x162, 0x160, 0x15e, 0x15c, 0x15a, 0x158, 0x157, 0x155, + 0x153, 0x151, 0x150, 0x14e, 0x14c, 0x14a, 0x149, 0x147, + 0x146, 0x144, 0x142, 0x141, 0x13f, 0x13e, 0x13c, 0x13b, + 0x139, 0x138, 0x136, 0x135, 0x133, 0x132, 0x130, 0x12f, + 0x12e, 0x12c, 0x12b, 0x129, 0x128, 0x127, 0x125, 0x124, + 0x123, 0x121, 0x120, 0x11f, 0x11e, 0x11c, 0x11b, 0x11a, + 0x119, 0x118, 0x116, 0x115, 0x114, 0x113, 0x112, 0x111, + 0x10f, 0x10e, 0x10d, 0x10c, 0x10b, 0x10a, 0x109, 0x108, + 0x107, 0x106, 0x105, 0x104, 0x103, 0x102, 0x101, 0x100, }; -#define WHEEL_START (wheel_tab + WHEEL_SIZE) -#define WHEEL_END (wheel_tab + ARRAY_CARDINALITY (wheel_tab)) +/* Compute q = [u/d], r = u mod d. Avoids slow hardware division for the case + that q < 0x40; here it instead uses a table of (Euclidian) inverses. */ +#define div_smallq(q, r, u, d) \ + do { \ + if ((u) / 0x40 < (d)) \ + { \ + int _cnt; \ + uintmax_t _dinv, _mask, _q, _r; \ + count_leading_zeros (_cnt, (d)); \ + _r = (u); \ + if (UNLIKELY (_cnt > (W_TYPE_SIZE - 8))) \ + { \ + _dinv = invtab[((d) << (_cnt + 8 - W_TYPE_SIZE)) - 0x80]; \ + _q = _dinv * _r >> (8 + W_TYPE_SIZE - _cnt); \ + } \ + else \ + { \ + _dinv = invtab[((d) >> (W_TYPE_SIZE - 8 - _cnt)) - 0x7f]; \ + _q = _dinv * (_r >> (W_TYPE_SIZE - 3 - _cnt)) >> 11; \ + } \ + _r -= _q*(d); \ + \ + _mask = -(uintmax_t) (_r >= (d)); \ + (r) = _r - (_mask & (d)); \ + (q) = _q - _mask; \ + assert ( (q) * (d) + (r) == u); \ + } \ + else \ + { \ + uintmax_t _q = (u) / (d); \ + (r) = (u) - _q * (d); \ + (q) = _q; \ + } \ + } while (0) + +/* Notes: Example N = 22117019. After first phase we find Q1 = 6314, Q + = 3025, P = 1737, representing F_{18} = (-6314, 2* 1737, 3025), + with 3025 = 55^2. + + Constructing the square root, we get Q1 = 55, Q = 8653, P = 4652, + representing G_0 = (-55, 2*4652, 8653). + + In the notation of the paper: + + S_{-1} = 55, S_0 = 8653, R_0 = 4652 + + Put + + t_0 = floor([q_0 + R_0] / S0) = 1 + R_1 = t_0 * S_0 - R_0 = 4001 + S_1 = S_{-1} +t_0 (R_0 - R_1) = 706 +*/ + +/* Multipliers, in order of efficiency: + 0.7268 3*5*7*11 = 1155 = 3 (mod 4) + 0.7317 3*5*7 = 105 = 1 + 0.7820 3*5*11 = 165 = 1 + 0.7872 3*5 = 15 = 3 + 0.8101 3*7*11 = 231 = 3 + 0.8155 3*7 = 21 = 1 + 0.8284 5*7*11 = 385 = 1 + 0.8339 5*7 = 35 = 3 + 0.8716 3*11 = 33 = 1 + 0.8774 3 = 3 = 3 + 0.8913 5*11 = 55 = 3 + 0.8972 5 = 5 = 1 + 0.9233 7*11 = 77 = 1 + 0.9295 7 = 7 = 3 + 0.9934 11 = 11 = 3 +*/ +#define QUEUE_SIZE 50 -/* FIXME: comment */ +#if STAT_SQUFOF +# define Q_FREQ_SIZE 50 +/* Element 0 keeps the total */ +static unsigned int q_freq[Q_FREQ_SIZE + 1]; +# define MIN(a,b) ((a) < (b) ? (a) : (b)) +#endif -static size_t -factor_wheel (uintmax_t n0, size_t max_n_factors, uintmax_t *factors) +/* Return true on success. Expected to fail only for numbers + >= 2^{2*W_TYPE_SIZE - 2}, or close to that limit. */ +static bool +factor_using_squfof (uintmax_t n1, uintmax_t n0, struct factors *factors) { - uintmax_t n = n0, d, q; - size_t n_factors = 0; - unsigned char const *w = wheel_tab; + /* Uses algorithm and notation from - if (n <= 1) - return n_factors; + SQUARE FORM FACTORIZATION + JASON E. GOWER AND SAMUEL S. WAGSTAFF, JR. - /* The exit condition in the following loop is correct because - any time it is tested one of these 3 conditions holds: - (1) d divides n - (2) n is prime - (3) n is composite but has no factors less than d. - If (1) or (2) obviously the right thing happens. - If (3), then since n is composite it is >= d^2. */ + http://homes.cerias.purdue.edu/~ssw/squfof.pdf + */ - d = 2; - do + static const unsigned int multipliers_1[] = + { /* = 1 (mod 4) */ + 105, 165, 21, 385, 33, 5, 77, 1, 0 + }; + static const unsigned int multipliers_3[] = + { /* = 3 (mod 4) */ + 1155, 15, 231, 35, 3, 55, 7, 11, 0 + }; + + const unsigned int *m; + + struct { uintmax_t Q; uintmax_t P; } queue[QUEUE_SIZE]; + + if (n1 >= ((uintmax_t) 1 << (W_TYPE_SIZE - 2))) + return false; + + uintmax_t sqrt_n = isqrt2 (n1, n0); + + if (n0 == sqrt_n * sqrt_n) { - q = n / d; - while (n == q * d) + uintmax_t p1, p0; + + umul_ppmm (p1, p0, sqrt_n, sqrt_n); + assert (p0 == n0); + + if (n1 == p1) { - assert (n_factors < max_n_factors); - factors[n_factors++] = d; - n = q; - q = n / d; + if (prime_p (sqrt_n)) + factor_insert_multiplicity (factors, sqrt_n, 2); + else + { + struct factors f; + + f.nfactors = 0; + if (!factor_using_squfof (0, sqrt_n, &f)) + { + /* Try pollard rho instead */ + factor_using_pollard_rho (sqrt_n, 1, &f); + } + /* Duplicate the new factors */ + for (unsigned int i = 0; i < f.nfactors; i++) + factor_insert_multiplicity (factors, f.p[i], 2*f.e[i]); + } + return true; } - d += *(w++); - if (w == WHEEL_END) - w = WHEEL_START; } - while (d <= q); - if (n != 1 || n0 == 1) + /* Select multipliers so we always get n * mu = 3 (mod 4) */ + for (m = (n0 % 4 == 1) ? multipliers_3 : multipliers_1; + *m; m++) { - assert (n_factors < max_n_factors); - factors[n_factors++] = n; - } + uintmax_t S, Dh, Dl, Q1, Q, P, L, L1, B; + unsigned int i; + unsigned int mu = *m; + unsigned int qpos = 0; + + assert (mu * n0 % 4 == 3); + + /* In the notation of the paper, with mu * n == 3 (mod 4), we + get \Delta = 4 mu * n, and the paper's \mu is 2 mu. As far as + I understand it, the necessary bound is 4 \mu^3 < n, or 32 + mu^3 < n. + + However, this seems insufficient: With n = 37243139 and mu = + 105, we get a trivial factor, from the square 38809 = 197^2, + without any corresponding Q earlier in the iteration. + + Requiring 64 mu^3 < n seems sufficient. */ + if (n1 == 0) + { + if ((uintmax_t) mu*mu*mu >= n0 / 64) + continue; + } + else + { + if (n1 > ((uintmax_t) 1 << (W_TYPE_SIZE - 2)) / mu) + continue; + } + umul_ppmm (Dh, Dl, n0, mu); + Dh += n1 * mu; + + assert (Dl % 4 != 1); + assert (Dh < (uintmax_t) 1 << (W_TYPE_SIZE - 2)); + + S = isqrt2 (Dh, Dl); + + Q1 = 1; + P = S; + + /* Square root remainder fits in one word, so ignore high part. */ + Q = Dl - P*P; + /* FIXME: When can this differ from floor(sqrt(2 sqrt(D)))? */ + L = isqrt (2*S); + B = 2*L; + L1 = mu * 2 * L; + + /* The form is (+/- Q1, 2P, -/+ Q), of discriminant 4 (P^2 + Q Q1) = + 4 D. */ + + for (i = 0; i <= B; i++) + { + uintmax_t q, P1, t, rem; + + div_smallq (q, rem, S+P, Q); + P1 = S - rem; /* P1 = q*Q - P */ + +#if STAT_SQUFOF + assert (q > 0); + q_freq[0]++; + q_freq[MIN (q, Q_FREQ_SIZE)]++; +#endif - return n_factors; + if (Q <= L1) + { + uintmax_t g = Q; + + if ( (Q & 1) == 0) + g /= 2; + + g /= gcd_odd (g, mu); + + if (g <= L) + { + if (qpos >= QUEUE_SIZE) + error (EXIT_FAILURE, 0, _("squfof queue overflow")); + queue[qpos].Q = g; + queue[qpos].P = P % g; + qpos++; + } + } + + /* I think the difference can be either sign, but mod + 2^W_TYPE_SIZE arithmetic should be fine. */ + t = Q1 + q * (P - P1); + Q1 = Q; + Q = t; + P = P1; + + if ( (i & 1) == 0) + { + uintmax_t r = is_square (Q); + if (r) + { + for (unsigned int j = 0; j < qpos; j++) + { + if (queue[j].Q == r) + { + if (r == 1) + /* Traversed entire cycle. */ + goto next_multiplier; + + /* Need the absolute value for divisibility test. */ + if (P >= queue[j].P) + t = P - queue[j].P; + else + t = queue[j].P - P; + if (t % r == 0) + { + /* Delete entries up to and including entry + j, which matched. */ + memmove (queue, queue + j + 1, + (qpos - j - 1) * sizeof (queue[0])); + qpos -= (j + 1); + } + goto next_i; + } + } + + /* We have found a square form, which should give a + factor. */ + Q1 = r; + assert (S >= P); /* What signs are possible? */ + P += r * ((S - P) / r); + + /* Note: Paper says (N - P*P) / Q1, that seems incorrect + for the case D = 2N. */ + /* Compute Q = (D - P*P) / Q1, but we need double + precision. */ + uintmax_t hi, lo; + umul_ppmm (hi, lo, P, P); + sub_ddmmss (hi, lo, Dh, Dl, hi, lo); + udiv_qrnnd (Q, rem, hi, lo, Q1); + assert (rem == 0); + + for (;;) + { + /* Note: There appears to by a typo in the paper, + Step 4a in the algorithm description says q <-- + floor([S+P]/\hat Q), but looking at the equations + in Sec. 3.1, it should be q <-- floor([S+P] / Q). + (In this code, \hat Q is Q1). */ + div_smallq (q, rem, S+P, Q); + P1 = S - rem; /* P1 = q*Q - P */ + +#if STAT_SQUFOF + q_freq[0]++; + q_freq[MIN (q, Q_FREQ_SIZE)]++; +#endif + if (P == P1) + break; + t = Q1 + q * (P - P1); + Q1 = Q; + Q = t; + P = P1; + } + + if ( (Q & 1) == 0) + Q /= 2; + Q /= gcd_odd (Q, mu); + + assert (Q > 1 && (n1 || Q < n0)); + + if (prime_p (Q)) + factor_insert (factors, Q); + else if (!factor_using_squfof (0, Q, factors)) + factor_using_pollard_rho (Q, 2, factors); + + divexact_21 (n1, n0, n1, n0, Q); + + if (prime2_p (n1, n0)) + factor_insert_large (factors, n1, n0); + else + { + if (!factor_using_squfof (n1, n0, factors)) + { + if (n1 == 0) + factor_using_pollard_rho (n0, 1, factors); + else + factor_using_pollard_rho2 (n1, n0, 1, factors); + } + } + + return true; + } + } + next_i:; + } + next_multiplier:; + } + return false; } -/* Single-precision factoring */ +/* Compute the prime factors of the 128-bit number (T1,T0), and put the + results in FACTORS. Use the algorithm selected by the global ALG. */ static void -print_factors_single (uintmax_t n) +factor (uintmax_t t1, uintmax_t t0, struct factors *factors) { - uintmax_t factors[MAX_N_FACTORS]; - size_t n_factors = factor_wheel (n, MAX_N_FACTORS, factors); - size_t i; - char buf[INT_BUFSIZE_BOUND (uintmax_t)]; + factors->nfactors = 0; + factors->plarge[1] = 0; - printf ("%s:", umaxtostr (n, buf)); - for (i = 0; i < n_factors; i++) - printf (" %s", umaxtostr (factors[i], buf)); - putchar ('\n'); + if (t1 == 0 && t0 < 2) + return; + + t0 = factor_using_division (&t1, t1, t0, factors); + + if (t1 == 0 && t0 < 2) + return; + + if (prime2_p (t1, t0)) + factor_insert_large (factors, t1, t0); + else + { + if (alg == ALG_SQUFOF) + if (factor_using_squfof (t1, t0, factors)) + return; + + if (t1 == 0) + factor_using_pollard_rho (t0, 1, factors); + else + factor_using_pollard_rho2 (t1, t0, 1, factors); + } } #if HAVE_GMP -static int -mpcompare (const void *av, const void *bv) +/* Use Pollard-rho to compute the prime factors of + arbitrary-precision T, and put the results in FACTORS. */ +static void +mp_factor (mpz_t t, struct mp_factors *factors) { - mpz_t *const *a = av; - mpz_t *const *b = bv; - return mpz_cmp (**a, **b); + mp_factor_init (factors); + + if (mpz_sgn (t) != 0) + { + mp_factor_using_division (t, factors); + + if (mpz_cmp_ui (t, 1) != 0) + { + devmsg ("[is number prime?] "); + if (mp_prime_p (t)) + mp_factor_insert (factors, t); + else + mp_factor_using_pollard_rho (t, 1, factors); + } + } } +#endif -static void -sort_and_print_factors (void) +static strtol_error +strto2uintmax (uintmax_t *hip, uintmax_t *lop, const char *s) { - mpz_t **faclist; - size_t i; + unsigned int lo_carry; + uintmax_t hi = 0, lo = 0; - faclist = xcalloc (nfactors_found, sizeof *faclist); - for (i = 0; i < nfactors_found; ++i) + strtol_error err = LONGINT_INVALID; + + /* Skip initial spaces and '+'. */ + for (;;) { - faclist[i] = &factor[i]; + char c = *s; + if (c == ' ') + s++; + else if (c == '+') + { + s++; + break; + } + else + break; } - qsort (faclist, nfactors_found, sizeof *faclist, mpcompare); - for (i = 0; i < nfactors_found; ++i) + /* Initial scan for invalid digits. */ + const char *p = s; + for (;;) { - fputc (' ', stdout); - mpz_out_str (stdout, 10, *faclist[i]); + unsigned int c = *p++; + if (c == 0) + break; + + if (UNLIKELY (!ISDIGIT (c))) + { + err = LONGINT_INVALID; + break; + } + + err = LONGINT_OK; /* we've seen at least one valid digit */ } - putchar ('\n'); - free (faclist); + + for (;err == LONGINT_OK;) + { + unsigned int c = *s++; + if (c == 0) + break; + + c -= '0'; + + if (UNLIKELY (hi > ~(uintmax_t)0 / 10)) + { + err = LONGINT_OVERFLOW; + break; + } + hi = 10 * hi; + + lo_carry = (lo >> (W_TYPE_SIZE - 3)) + (lo >> (W_TYPE_SIZE - 1)); + lo_carry += 10 * lo < 2 * lo; + + lo = 10 * lo; + lo += c; + + lo_carry += lo < c; + hi += lo_carry; + if (UNLIKELY (hi < lo_carry)) + { + err = LONGINT_OVERFLOW; + break; + } + } + + *hip = hi; + *lop = lo; + + return err; } static void -free_factors (void) +print_uintmaxes (uintmax_t t1, uintmax_t t0) { - size_t i; + uintmax_t q, r; - for (i = 0; i < nfactors_found; ++i) + if (t1 == 0) + printf ("%"PRIuMAX, t0); + else { - mpz_clear (factor[i]); + /* Use very plain code here since it seems hard to write fast code + without assuming a specific word size. */ + q = t1 / 1000000000; + r = t1 % 1000000000; + udiv_qrnnd (t0, r, r, t0, 1000000000); + print_uintmaxes (q, t0); + printf ("%09u", (int) r); } - /* Don't actually free factor[] because in the case where we are - reading numbers from stdin, we may be about to use it again. */ - nfactors_found = 0; } -/* Arbitrary-precision factoring */ +/* Single-precision factoring */ static void -print_factors_multi (mpz_t t) +print_factors_single (uintmax_t t1, uintmax_t t0) { - mpz_out_str (stdout, 10, t); + struct factors factors; + + print_uintmaxes (t1, t0); putchar (':'); - if (mpz_sgn (t) != 0) - { - /* Set the trial division limit according to the size of t. */ - size_t n_bits = mpz_sizeinbase (t, 2); - unsigned int division_limit = MIN (n_bits, 1000); - division_limit *= division_limit; + factor (t1, t0, &factors); - factor_using_division (t, division_limit); + for (unsigned int j = 0; j < factors.nfactors; j++) + for (unsigned int k = 0; k < factors.e[j]; k++) + { + char buf[INT_BUFSIZE_BOUND (uintmax_t)]; + putchar (' '); + fputs (umaxtostr (factors.p[j], buf), stdout); + } - if (mpz_cmp_ui (t, 1) != 0) - { - debug ("[is number prime?] "); - if (mpz_probab_prime_p (t, 3)) - emit_factor (t); - else - factor_using_pollard_rho (t, 1); - } + if (factors.plarge[1]) + { + putchar (' '); + print_uintmaxes (factors.plarge[1], factors.plarge[0]); } - - mpz_clear (t); - sort_and_print_factors (); - free_factors (); + putchar ('\n'); } -#endif - /* Emit the factors of the indicated number. If we have the option of using either algorithm, we select on the basis of the length of the number. @@ -431,58 +2390,59 @@ print_factors_multi (mpz_t t) has enough digits, because the algorithm is better. The turnover point depends on the value. */ static bool -print_factors (char const *s) +print_factors (const char *input) { - uintmax_t n; - strtol_error err = xstrtoumax (s, NULL, 10, &n, ""); + uintmax_t t1, t0; -#if HAVE_GMP - enum { GMP_TURNOVER_POINT = 100000 }; + /* Try converting the number to one or two words. If it fails, use GMP or + print an error message. The 2nd condition checks that the most + significant bit of the two-word number is clear, in a typesize neutral + way. */ + strtol_error err = strto2uintmax (&t1, &t0, input); - if (err == LONGINT_OVERFLOW - || (err == LONGINT_OK && GMP_TURNOVER_POINT <= n)) + switch (err) { - mpz_t t; - mpz_init (t); - if (gmp_sscanf (s, "%Zd", t) == 1) + case LONGINT_OK: + if (((t1 << 1) >> 1) == t1) { - debug ("[%s]", _("using arbitrary-precision arithmetic")); - print_factors_multi (t); + devmsg ("[using single-precision arithmetic] "); + print_factors_single (t1, t0); return true; } - err = LONGINT_INVALID; - } -#endif - - switch (err) - { - case LONGINT_OK: - debug ("[%s]", _("using single-precision arithmetic")); - print_factors_single (n); - return true; + break; case LONGINT_OVERFLOW: - error (0, 0, _("%s is too large"), quote (s)); - return false; + /* Try GMP. */ + break; default: - error (0, 0, _("%s is not a valid positive integer"), quote (s)); + error (0, 0, _("%s is not a valid positive integer"), quote (input)); return false; } -} -enum -{ - VERBOSE_OPTION = CHAR_MAX + 1 -}; +#if HAVE_GMP + devmsg ("[using arbitrary-precision arithmetic] "); + mpz_t t; + struct mp_factors factors; -static struct option const long_options[] = -{ - {"verbose", no_argument, NULL, VERBOSE_OPTION}, - {GETOPT_HELP_OPTION_DECL}, - {GETOPT_VERSION_OPTION_DECL}, - {NULL, 0, NULL, 0} -}; + mpz_init_set_str (t, input, 10); + + gmp_printf ("%Zd:", t); + mp_factor (t, &factors); + + for (unsigned int j = 0; j < factors.nfactors; j++) + for (unsigned int k = 0; k < factors.e[j]; k++) + gmp_printf (" %Zd", factors.p[j]); + + mp_factor_clear (&factors); + mpz_clear (t); + putchar ('\n'); + return true; +#else + error (0, 0, _("%s is too large"), quote (input)); + return false; +#endif +} void usage (int status) @@ -532,9 +2492,6 @@ do_stdin (void) int main (int argc, char **argv) { - bool ok; - int c; - initialize_main (&argc, &argv); set_program_name (argv[0]); setlocale (LC_ALL, ""); @@ -543,12 +2500,23 @@ main (int argc, char **argv) atexit (close_stdout); + alg = ALG_POLLARD_RHO; /* Default to Pollard rho */ + + int c; while ((c = getopt_long (argc, argv, "", long_options, NULL)) != -1) { switch (c) { - case VERBOSE_OPTION: - verbose = true; + case DEV_DEBUG_OPTION: + dev_debug = true; + break; + + case 's': + alg = ALG_SQUFOF; + break; + + case 'w': + flag_prove_primality = false; break; case_GETOPT_HELP_CHAR; @@ -560,18 +2528,36 @@ main (int argc, char **argv) } } +#if STAT_SQUFOF + if (alg == ALG_SQUFOF) + memset (q_freq, 0, sizeof (q_freq)); +#endif + + bool ok; if (argc <= optind) ok = do_stdin (); else { - int i; ok = true; - for (i = optind; i < argc; i++) + for (int i = optind; i < argc; i++) if (! print_factors (argv[i])) ok = false; } -#if HAVE_GMP - free (factor); + +#if STAT_SQUFOF + if (alg == ALG_SQUFOF && q_freq[0] > 0) + { + double acc_f; + printf ("q freq. cum. freq.(total: %d)\n", q_freq[0]); + for (unsigned int i = 1, acc_f = 0.0; i <= Q_FREQ_SIZE; i++) + { + double f = (double) q_freq[i] / q_freq[0]; + acc_f += f; + printf ("%s%d %.2f%% %.2f%%\n", i == Q_FREQ_SIZE ? ">=" : "", i, + 100.0 * f, 100.0 * acc_f); + } + } #endif + exit (ok ? EXIT_SUCCESS : EXIT_FAILURE); } diff --git a/src/find-mount-point.c b/src/find-mount-point.c index 28735e99..662e46fc 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-2012 Free Software Foundation, Inc. + Copyright (C) 2010-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 diff --git a/src/find-mount-point.h b/src/find-mount-point.h index cf501590..52213db7 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-2012 Free Software Foundation, Inc. + Copyright (C) 2010-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 diff --git a/src/fmt.c b/src/fmt.c index 308b6455..d3f53690 100644 --- a/src/fmt.c +++ b/src/fmt.c @@ -1,5 +1,5 @@ /* GNU fmt -- simple text formatter. - Copyright (C) 1994-2012 Free Software Foundation, Inc. + Copyright (C) 1994-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 @@ -20,6 +20,7 @@ #include <stdio.h> #include <sys/types.h> #include <getopt.h> +#include <assert.h> /* Redefine. Otherwise, systems (Unicos for one) with headers that define it to be a type get syntax errors for the variable declaration below. */ @@ -270,11 +271,10 @@ usage (int status) fputs (_("\ Reformat each paragraph in the FILE(s), writing to standard output.\n\ The option -WIDTH is an abbreviated form of --width=DIGITS.\n\ -\n\ -"), stdout); - fputs (_("\ -Mandatory arguments to long options are mandatory for short options too.\n\ "), stdout); + + emit_mandatory_arg_note (); + fputs (_("\ -c, --crown-margin preserve indentation of first two lines\n\ -p, --prefix=STRING reformat only lines beginning with STRING,\n\ @@ -282,6 +282,8 @@ Mandatory arguments to long options are mandatory for short options too.\n\ -s, --split-only split long lines, but do not refill\n\ "), stdout); + /* Tell xgettext that the "% o" below is not a printf-style + format string: xgettext:no-c-format */ fputs (_("\ -t, --tagged-paragraph indentation of first line different from second\n\ -u, --uniform-spacing one space between words, two after sentences\n\ @@ -610,6 +612,11 @@ get_paragraph (FILE *f) while (same_para (c) && in_column == other_indent) c = get_line (f, c); } + + /* Tell static analysis tools that using word_limit[-1] is ok. + word_limit is guaranteed to have been incremented by get_line. */ + assert (word < word_limit); + (word_limit - 1)->period = (word_limit - 1)->final = true; next_char = c; return true; diff --git a/src/fold.c b/src/fold.c index d2291503..e2358651 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-2012 Free Software Foundation, Inc. + Copyright (C) 1991-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 @@ -70,11 +70,10 @@ Usage: %s [OPTION]... [FILE]...\n\ fputs (_("\ Wrap input lines in each FILE (standard input by default), writing to\n\ standard output.\n\ -\n\ -"), stdout); - fputs (_("\ -Mandatory arguments to long options are mandatory for short options too.\n\ "), stdout); + + emit_mandatory_arg_note (); + fputs (_("\ -b, --bytes count bytes rather than columns\n\ -s, --spaces break at spaces\n\ diff --git a/src/fs-is-local.h b/src/fs-is-local.h index aba1607f..f44f1e72 100644 --- a/src/fs-is-local.h +++ b/src/fs-is-local.h @@ -10,12 +10,14 @@ is_local_fs_type (unsigned long int magic) case S_MAGIC_AFFS: return 1; case S_MAGIC_AFS: return 0; case S_MAGIC_ANON_INODE_FS: return 1; + case S_MAGIC_AUFS: return 0; case S_MAGIC_AUTOFS: return 1; case S_MAGIC_BEFS: return 1; case S_MAGIC_BDEVFS: return 1; case S_MAGIC_BFS: return 1; case S_MAGIC_BINFMTFS: return 1; case S_MAGIC_BTRFS: return 1; + case S_MAGIC_CEPH: return 0; case S_MAGIC_CGROUP: return 1; case S_MAGIC_CIFS: return 0; case S_MAGIC_CODA: return 0; @@ -64,6 +66,7 @@ is_local_fs_type (unsigned long int magic) case S_MAGIC_NTFS: return 1; case S_MAGIC_OPENPROM: return 1; case S_MAGIC_OCFS2: return 0; + case S_MAGIC_PANFS: return 0; case S_MAGIC_PIPEFS: return 0; case S_MAGIC_PROC: return 1; case S_MAGIC_PSTOREFS: return 1; @@ -87,11 +90,14 @@ is_local_fs_type (unsigned long int magic) 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_VZFS: return 1; case S_MAGIC_XENFS: return 1; case S_MAGIC_XENIX: return 1; case S_MAGIC_XFS: return 1; case S_MAGIC_XIAFS: return 1; + case S_MAGIC_ZFS: return 1; default: return -1; } } diff --git a/src/fs.h b/src/fs.h index ee845335..721f1516 100644 --- a/src/fs.h +++ b/src/fs.h @@ -1,18 +1,20 @@ /* Define the magic numbers as given by statfs(2). Please send additions to bug-coreutils@gnu.org and meskes@debian.org. - This file is generated automatically from ./stat.c. */ + This file is generated automatically from ./src/stat.c. */ #if defined __linux__ # define S_MAGIC_ADFS 0xADF5 # define S_MAGIC_AFFS 0xADFF # define S_MAGIC_AFS 0x5346414F # define S_MAGIC_ANON_INODE_FS 0x09041934 +# define S_MAGIC_AUFS 0x61756673 # define S_MAGIC_AUTOFS 0x0187 # define S_MAGIC_BEFS 0x42465331 # define S_MAGIC_BDEVFS 0x62646576 # define S_MAGIC_BFS 0x1BADFACE # define S_MAGIC_BINFMTFS 0x42494E4D # define S_MAGIC_BTRFS 0x9123683E +# define S_MAGIC_CEPH 0x00C36400 # define S_MAGIC_CGROUP 0x0027E0EB # define S_MAGIC_CIFS 0xFF534D42 # define S_MAGIC_CODA 0x73757245 @@ -61,6 +63,7 @@ # define S_MAGIC_NTFS 0x5346544E # define S_MAGIC_OPENPROM 0x9FA1 # define S_MAGIC_OCFS2 0x7461636f +# define S_MAGIC_PANFS 0xAAD7AAEA # define S_MAGIC_PIPEFS 0x50495045 # define S_MAGIC_PROC 0x9FA0 # define S_MAGIC_PSTOREFS 0x6165676C @@ -84,11 +87,14 @@ # define S_MAGIC_UFS_BYTESWAPPED 0x54190100 # define S_MAGIC_USBDEVFS 0x9FA2 # define S_MAGIC_V9FS 0x01021997 +# define S_MAGIC_VMHGFS 0xBACBACBC # define S_MAGIC_VXFS 0xA501FCF5 +# define S_MAGIC_VZFS 0x565A4653 # define S_MAGIC_XENFS 0xABBA1974 # define S_MAGIC_XENIX 0x012FF7B4 # define S_MAGIC_XFS 0x58465342 # define S_MAGIC_XIAFS 0x012FD16D +# define S_MAGIC_ZFS 0x2FC12FC1 #elif defined __GNU__ # include <hurd/hurd_types.h> #endif diff --git a/src/getlimits.c b/src/getlimits.c index 1403ee58..7c1fbe26 100644 --- a/src/getlimits.c +++ b/src/getlimits.c @@ -1,5 +1,5 @@ /* getlimits - print various platform dependent limits. - Copyright (C) 2008-2012 Free Software Foundation, Inc. + 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 diff --git a/src/group-list.c b/src/group-list.c index edbb3421..7d4995b5 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-2012 Free Software Foundation, Inc. + Copyright (C) 1989-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 @@ -88,6 +88,16 @@ print_group_list (const char *username, return ok; } +/* Convert a gid_t to string. Do not use this function directly. + Instead, use it via the gidtostr macro. + Beware that it returns a pointer to static storage. */ +static char * +gidtostr_ptr (gid_t const *gid) +{ + static char buf[INT_BUFSIZE_BOUND (uintmax_t)]; + return umaxtostr (*gid, buf); +} +#define gidtostr(g) gidtostr_ptr (&(g)) /* Print the name or value of group ID GID. */ extern bool @@ -107,9 +117,7 @@ print_group (gid_t gid, bool use_name) } } - if (grp == NULL) - printf ("%lu", (unsigned long int) gid); - else - printf ("%s", grp->gr_name); + char *s = grp ? grp->gr_name : gidtostr (gid); + fputs (s, stdout); return ok; } diff --git a/src/group-list.h b/src/group-list.h index c6fb6b44..3fac8871 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-2012 Free Software Foundation, Inc. + 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 diff --git a/src/groups.c b/src/groups.c index 0449fa78..53332d56 100644 --- a/src/groups.c +++ b/src/groups.c @@ -1,5 +1,5 @@ /* groups -- print the groups a user is in - Copyright (C) 1989-2012 Free Software Foundation, Inc. + Copyright (C) 1989-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 diff --git a/src/head.c b/src/head.c index d7e83b71..d79d5f7d 100644 --- a/src/head.c +++ b/src/head.c @@ -1,5 +1,5 @@ /* head -- output first part of file(s) - Copyright (C) 1989-2012 Free Software Foundation, Inc. + Copyright (C) 1989-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 @@ -110,11 +110,10 @@ Usage: %s [OPTION]... [FILE]...\n\ 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\ -\n\ -"), stdout); - fputs (_("\ -Mandatory arguments to long options are mandatory for short options too.\n\ "), stdout); + + emit_mandatory_arg_note (); + fputs (_("\ -c, --bytes=[-]K print the first K bytes of each file;\n\ with the leading '-', print all but the last\n\ @@ -667,6 +666,14 @@ elide_tail_lines_seekable (const char *pretty_filename, int fd, Don't bother testing for failure for such a small amount. Any failure will be detected upon close. */ fwrite (buffer, 1, n + 1, stdout); + + /* 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; } } @@ -852,7 +859,7 @@ head_file (const char *filename, uintmax_t n_units, bool count_lines, ok = head (filename, fd, n_units, count_lines, elide_from_end); if (!is_stdin && close (fd) != 0) { - error (0, errno, _("closing %s"), quote (filename)); + error (0, errno, _("failed to close %s"), quote (filename)); return false; } return ok; diff --git a/src/hostid.c b/src/hostid.c index 622a3d71..b2d218cc 100644 --- a/src/hostid.c +++ b/src/hostid.c @@ -1,6 +1,6 @@ /* print the hexadecimal identifier for the current host - Copyright (C) 1997-2012 Free Software Foundation, Inc. + Copyright (C) 1997-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 diff --git a/src/hostname.c b/src/hostname.c index f6d91568..d0a4d754 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-2012 Free Software Foundation, Inc. + Copyright (C) 1994-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 diff --git a/src/id.c b/src/id.c index 41ae0249..b5a7214d 100644 --- a/src/id.c +++ b/src/id.c @@ -1,5 +1,5 @@ /* id -- print real and effective UIDs and GIDs - Copyright (C) 1989-2012 Free Software Foundation, Inc. + Copyright (C) 1989-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 @@ -274,6 +274,28 @@ main (int argc, char **argv) exit (ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* Convert a gid_t to string. Do not use this function directly. + Instead, use it via the gidtostr macro. + Beware that it returns a pointer to static storage. */ +static char * +gidtostr_ptr (gid_t const *gid) +{ + static char buf[INT_BUFSIZE_BOUND (uintmax_t)]; + return umaxtostr (*gid, buf); +} +#define gidtostr(g) gidtostr_ptr (&(g)) + +/* Convert a uid_t to string. Do not use this function directly. + Instead, use it via the uidtostr macro. + Beware that it returns a pointer to static storage. */ +static char * +uidtostr_ptr (uid_t const *uid) +{ + static char buf[INT_BUFSIZE_BOUND (uintmax_t)]; + return umaxtostr (*uid, buf); +} +#define uidtostr(u) uidtostr_ptr (&(u)) + /* Print the name or value of user ID UID. */ static void @@ -286,16 +308,14 @@ print_user (uid_t uid) pwd = getpwuid (uid); if (pwd == NULL) { - error (0, 0, _("cannot find name for user ID %lu"), - (unsigned long int) uid); + error (0, 0, _("cannot find name for user ID %s"), + uidtostr (uid)); ok = false; } } - if (pwd == NULL) - printf ("%lu", (unsigned long int) uid); - else - printf ("%s", pwd->pw_name); + char *s = pwd ? pwd->pw_name : uidtostr (uid); + fputs (s, stdout); } /* Print all of the info about the user's user and group IDs. */ @@ -306,19 +326,19 @@ print_full_info (const char *username) struct passwd *pwd; struct group *grp; - printf (_("uid=%lu"), (unsigned long int) ruid); + printf (_("uid=%s"), uidtostr (ruid)); pwd = getpwuid (ruid); if (pwd) printf ("(%s)", pwd->pw_name); - printf (_(" gid=%lu"), (unsigned long int) rgid); + printf (_(" gid=%s"), gidtostr (rgid)); grp = getgrgid (rgid); if (grp) printf ("(%s)", grp->gr_name); if (euid != ruid) { - printf (_(" euid=%lu"), (unsigned long int) euid); + printf (_(" euid=%s"), uidtostr (euid)); pwd = getpwuid (euid); if (pwd) printf ("(%s)", pwd->pw_name); @@ -326,7 +346,7 @@ print_full_info (const char *username) if (egid != rgid) { - printf (_(" egid=%lu"), (unsigned long int) egid); + printf (_(" egid=%s"), gidtostr (egid)); grp = getgrgid (egid); if (grp) printf ("(%s)", grp->gr_name); @@ -359,7 +379,7 @@ print_full_info (const char *username) { if (i > 0) putchar (','); - printf ("%lu", (unsigned long int) groups[i]); + fputs (gidtostr (groups[i]), stdout); grp = getgrgid (groups[i]); if (grp) printf ("(%s)", grp->gr_name); diff --git a/src/install.c b/src/install.c index 854436aa..94374df3 100644 --- a/src/install.c +++ b/src/install.c @@ -1,5 +1,5 @@ /* install - copy files and set attributes - Copyright (C) 1989-2012 Free Software Foundation, Inc. + Copyright (C) 1989-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 @@ -275,6 +275,7 @@ cp_option_init (struct cp_options *x) x->preserve_links = false; x->preserve_mode = false; x->preserve_timestamps = false; + x->explicit_no_preserve_mode = false; x->reduce_diagnostics=false; x->data_copy_required = true; x->require_preserve = false; @@ -398,7 +399,7 @@ target_directory_operand (char const *file) int err = (stat (file, &st) == 0 ? 0 : errno); bool is_a_dir = !err && S_ISDIR (st.st_mode); if (err && err != ENOENT) - error (EXIT_FAILURE, err, _("accessing %s"), quote (file)); + 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)); return is_a_dir; @@ -607,11 +608,10 @@ like yum(1) or apt-get(1).\n\ In the first three forms, copy SOURCE to DEST or multiple SOURCE(s) to\n\ the existing DIRECTORY, while setting permission modes and owner/group.\n\ In the 4th form, create all components of the given DIRECTORY(ies).\n\ -\n\ -"), stdout); - fputs (_("\ -Mandatory arguments to long options are mandatory for short options too.\n\ "), stdout); + + emit_mandatory_arg_note (); + fputs (_("\ --backup[=CONTROL] make a backup of each existing destination file\n\ -b like --backup but does not accept an argument\n\ @@ -841,7 +841,8 @@ main (int argc, char **argv) { struct stat st; if (stat (optarg, &st) != 0) - error (EXIT_FAILURE, errno, _("accessing %s"), quote (optarg)); + 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)); diff --git a/src/ioblksize.h b/src/ioblksize.h index aaea9fff..1ae93255 100644 --- a/src/ioblksize.h +++ b/src/ioblksize.h @@ -1,5 +1,5 @@ /* I/O block size definitions for coreutils - Copyright (C) 1989-2012 Free Software Foundation, Inc. + Copyright (C) 1989-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 diff --git a/src/join.c b/src/join.c index e39ed872..11e647cf 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-2012 Free Software Foundation, Inc. + Copyright (C) 1991-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 @@ -400,7 +400,7 @@ check_order (const struct line *prev, error ((check_input_order == CHECK_ORDER_ENABLED ? EXIT_FAILURE : 0), - 0, _("%s:%ju: is not sorted: %.*s"), + 0, _("%s:%"PRIuMAX": is not sorted: %.*s"), g_names[whatfile - 1], line_no[whatfile - 1], (int) len, current->buf.buffer); diff --git a/src/kill.c b/src/kill.c index ad09321d..d1b836b6 100644 --- a/src/kill.c +++ b/src/kill.c @@ -1,5 +1,5 @@ /* kill -- send a signal to a process - Copyright (C) 2002-2012 Free Software Foundation, Inc. + Copyright (C) 2002-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 @@ -81,11 +81,10 @@ Usage: %s [-s SIGNAL | -SIGNAL] PID...\n\ program_name, program_name, program_name); fputs (_("\ Send signals to processes, or list signals.\n\ -\n\ -"), stdout); - fputs (_("\ -Mandatory arguments to long options are mandatory for short options too.\n\ "), stdout); + + emit_mandatory_arg_note (); + fputs (_("\ -s, --signal=SIGNAL, -SIGNAL\n\ specify the name or number of the signal to be sent\n\ diff --git a/src/libstdbuf.c b/src/libstdbuf.c index 9d464f10..ac7a1339 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-2012 Free Software Foundation, Inc. + 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 diff --git a/src/link.c b/src/link.c index 84911b6f..4611107a 100644 --- a/src/link.c +++ b/src/link.c @@ -1,5 +1,5 @@ /* link utility for GNU. - Copyright (C) 2001-2012 Free Software Foundation, Inc. + Copyright (C) 2001-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 diff --git a/src/ln.c b/src/ln.c index e7ab3487..1aa14732 100644 --- a/src/ln.c +++ b/src/ln.c @@ -1,5 +1,5 @@ /* 'ln' program to create links between files. - Copyright (C) 1986-2012 Free Software Foundation, Inc. + Copyright (C) 1986-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 @@ -120,7 +120,7 @@ target_directory_operand (char const *file) int err = (stat_result == 0 ? 0 : errno); bool is_a_dir = !err && S_ISDIR (st.st_mode); if (err && err != ENOENT) - error (EXIT_FAILURE, err, _("accessing %s"), quote (file)); + 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)); return is_a_dir; @@ -178,7 +178,7 @@ do_link (const char *source, const char *dest) : lstat (source, &source_stats)) != 0) { - error (0, errno, _("accessing %s"), quote (source)); + error (0, errno, _("failed to access %s"), quote (source)); return false; } @@ -199,7 +199,7 @@ do_link (const char *source, const char *dest) dest_lstat_ok = (lstat (dest, &dest_stats) == 0); if (!dest_lstat_ok && errno != ENOENT) { - error (0, errno, _("accessing %s"), quote (dest)); + error (0, errno, _("failed to access %s"), quote (dest)); return false; } } @@ -387,11 +387,10 @@ By default, each destination (name of new link) should not already exist.\n\ When creating hard links, each TARGET must exist. Symbolic links\n\ can hold arbitrary text; if later resolved, a relative link is\n\ interpreted in relation to its parent directory.\n\ -\n\ -"), stdout); - fputs (_("\ -Mandatory arguments to long options are mandatory for short options too.\n\ "), stdout); + + emit_mandatory_arg_note (); + fputs (_("\ --backup[=CONTROL] make a backup of each existing destination file\n\ -b like --backup but does not accept an argument\n\ @@ -430,9 +429,9 @@ the VERSION_CONTROL environment variable. Here are the values:\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\ "), stdout); printf (_("\ +\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\ "), LINK_FOLLOWS_SYMLINKS ? "-L" : "-P"); @@ -513,7 +512,8 @@ main (int argc, char **argv) { struct stat st; if (stat (optarg, &st) != 0) - error (EXIT_FAILURE, errno, _("accessing %s"), quote (optarg)); + 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)); diff --git a/src/local.mk b/src/local.mk new file mode 100644 index 00000000..982cd4da --- /dev/null +++ b/src/local.mk @@ -0,0 +1,526 @@ +# Make coreutils programs. -*-Makefile-*- +# This is included by the top-level Makefile.am. + +## Copyright (C) 1990-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/>. + +# FIXME: once lib/ and gnulib-tests/ are also converted, hoist to Makefile.am +AM_CFLAGS = $(WERROR_CFLAGS) + +# The list of all programs (separated in different variables to express +# the how and when they should be installed) is defined in this makefile +# fragment, autogenerated by the 'gen-lists-of-programs.sh' auxiliary +# script. +include $(srcdir)/src/cu-progs.mk + +EXTRA_PROGRAMS = \ + $(no_install__progs) \ + $(build_if_possible__progs) \ + $(default__progs) + +# The user can tweak these lists at configure time. +bin_PROGRAMS = @bin_PROGRAMS@ +pkglibexec_PROGRAMS = @pkglibexec_PROGRAMS@ + +# Needed by the testsuite. +noinst_PROGRAMS = \ + src/getlimits \ + src/make-prime-list \ + src/setuidgid + +noinst_HEADERS = \ + src/chown-core.h \ + src/copy.h \ + src/cp-hash.h \ + src/dircolors.h \ + src/fiemap.h \ + src/find-mount-point.h \ + src/fs.h \ + src/fs-is-local.h \ + src/group-list.h \ + src/ioblksize.h \ + src/longlong.h \ + src/ls.h \ + src/operand2sig.h \ + src/prog-fprintf.h \ + src/remove.h \ + src/system.h \ + src/uname.h + +EXTRA_DIST += \ + src/dcgen \ + src/dircolors.hin \ + src/primes.h \ + src/tac-pipe.c \ + src/extract-magic \ + src/c99-to-c89.diff + +CLEANFILES += $(SCRIPTS) + +# Also remove these sometimes-built programs. +# For example, even when excluded, they're built via 'sc_check-AUTHORS' +# or 'dist'. +CLEANFILES += $(no_install__progs) + +noinst_LIBRARIES += src/libver.a +nodist_src_libver_a_SOURCES = src/version.c src/version.h + +# Tell the linker to omit references to unused shared libraries. +AM_LDFLAGS = $(IGNORE_UNUSED_LIBRARIES_CFLAGS) + +# Extra libraries needed by more than one program. Will be updated later. +copy_ldadd = +remove_ldadd = + +# Sometimes, the expansion of $(LIBINTL) includes -lc which may +# include modules defining variables like 'optind', so libcoreutils.a +# must precede $(LIBINTL) in order to ensure we use GNU getopt. +# But libcoreutils.a must also follow $(LIBINTL), since libintl uses +# replacement functions defined in libcoreutils.a. +LDADD = src/libver.a lib/libcoreutils.a $(LIBINTL) lib/libcoreutils.a + +# First, list all programs, to make listing per-program libraries easier. +# See [ below. +src_arch_LDADD = $(LDADD) +src_base64_LDADD = $(LDADD) +src_basename_LDADD = $(LDADD) +src_cat_LDADD = $(LDADD) +src_chcon_LDADD = $(LDADD) +src_chgrp_LDADD = $(LDADD) +src_chmod_LDADD = $(LDADD) +src_chown_LDADD = $(LDADD) +src_chroot_LDADD = $(LDADD) +src_cksum_LDADD = $(LDADD) +src_comm_LDADD = $(LDADD) +src_nproc_LDADD = $(LDADD) +src_cp_LDADD = $(LDADD) +src_csplit_LDADD = $(LDADD) +src_cut_LDADD = $(LDADD) +src_date_LDADD = $(LDADD) +src_dd_LDADD = $(LDADD) +src_df_LDADD = $(LDADD) +# See dir_LDADD below +src_dircolors_LDADD = $(LDADD) +src_dirname_LDADD = $(LDADD) +src_du_LDADD = $(LDADD) +src_echo_LDADD = $(LDADD) +src_env_LDADD = $(LDADD) +src_expand_LDADD = $(LDADD) +src_expr_LDADD = $(LDADD) +src_factor_LDADD = $(LDADD) +src_false_LDADD = $(LDADD) +src_fmt_LDADD = $(LDADD) +src_fold_LDADD = $(LDADD) +src_getlimits_LDADD = $(LDADD) +src_ginstall_LDADD = $(LDADD) +src_groups_LDADD = $(LDADD) +src_head_LDADD = $(LDADD) +src_hostid_LDADD = $(LDADD) +src_hostname_LDADD = $(LDADD) +src_id_LDADD = $(LDADD) +src_join_LDADD = $(LDADD) +src_kill_LDADD = $(LDADD) +src_link_LDADD = $(LDADD) +src_ln_LDADD = $(LDADD) +src_logname_LDADD = $(LDADD) +src_ls_LDADD = $(LDADD) + +# 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) +src_mkfifo_LDADD = $(LDADD) +src_mknod_LDADD = $(LDADD) +src_mktemp_LDADD = $(LDADD) +src_mv_LDADD = $(LDADD) +src_nice_LDADD = $(LDADD) +src_nl_LDADD = $(LDADD) +src_nohup_LDADD = $(LDADD) +src_od_LDADD = $(LDADD) +src_paste_LDADD = $(LDADD) +src_pathchk_LDADD = $(LDADD) +src_pinky_LDADD = $(LDADD) +src_pr_LDADD = $(LDADD) +src_printenv_LDADD = $(LDADD) +src_printf_LDADD = $(LDADD) +src_ptx_LDADD = $(LDADD) +src_pwd_LDADD = $(LDADD) +src_readlink_LDADD = $(LDADD) +src_realpath_LDADD = $(LDADD) +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) +src_sha384sum_LDADD = $(LDADD) +src_sha512sum_LDADD = $(LDADD) +src_shred_LDADD = $(LDADD) +src_shuf_LDADD = $(LDADD) +src_sleep_LDADD = $(LDADD) +src_sort_LDADD = $(LDADD) +src_split_LDADD = $(LDADD) +src_stat_LDADD = $(LDADD) +src_stdbuf_LDADD = $(LDADD) +src_stty_LDADD = $(LDADD) +src_sum_LDADD = $(LDADD) +src_sync_LDADD = $(LDADD) +src_tac_LDADD = $(LDADD) +src_tail_LDADD = $(LDADD) +src_tee_LDADD = $(LDADD) +src_test_LDADD = $(LDADD) +src_timeout_LDADD = $(LDADD) +src_touch_LDADD = $(LDADD) +src_tr_LDADD = $(LDADD) +src_true_LDADD = $(LDADD) +src_truncate_LDADD = $(LDADD) +src_tsort_LDADD = $(LDADD) +src_tty_LDADD = $(LDADD) +src_uname_LDADD = $(LDADD) +src_unexpand_LDADD = $(LDADD) +src_uniq_LDADD = $(LDADD) +src_unlink_LDADD = $(LDADD) +src_uptime_LDADD = $(LDADD) +src_users_LDADD = $(LDADD) +# See vdir_LDADD below +src_wc_LDADD = $(LDADD) +src_who_LDADD = $(LDADD) +src_whoami_LDADD = $(LDADD) +src_yes_LDADD = $(LDADD) + +# Synonyms. Recall that Automake transliterates '[' and '/' to '_'. +src___LDADD = $(src_test_LDADD) +src_dir_LDADD = $(src_ls_LDADD) +src_vdir_LDADD = $(src_ls_LDADD) + +src_cp_LDADD += $(copy_ldadd) +src_ginstall_LDADD += $(copy_ldadd) +src_mv_LDADD += $(copy_ldadd) + +src_mv_LDADD += $(remove_ldadd) +src_rm_LDADD += $(remove_ldadd) + +# for eaccess, euidaccess +copy_ldadd += $(LIB_EACCESS) +remove_ldadd += $(LIB_EACCESS) +src_sort_LDADD += $(LIB_EACCESS) +src_test_LDADD += $(LIB_EACCESS) + +# for selinux use +copy_ldadd += $(LIB_SELINUX) +src_chcon_LDADD += $(LIB_SELINUX) +src_ginstall_LDADD += $(LIB_SELINUX) +src_id_LDADD += $(LIB_SELINUX) +src_ls_LDADD += $(LIB_SELINUX) +src_mkdir_LDADD += $(LIB_SELINUX) +src_mkfifo_LDADD += $(LIB_SELINUX) +src_mknod_LDADD += $(LIB_SELINUX) +src_runcon_LDADD += $(LIB_SELINUX) +src_stat_LDADD += $(LIB_SELINUX) + +# for gettime, settime, utimecmp, utimens +copy_ldadd += $(LIB_CLOCK_GETTIME) +src_date_LDADD += $(LIB_CLOCK_GETTIME) +src_ginstall_LDADD += $(LIB_CLOCK_GETTIME) +src_ls_LDADD += $(LIB_CLOCK_GETTIME) +src_pr_LDADD += $(LIB_CLOCK_GETTIME) +src_timeout_LDADD += $(LIB_TIMER_TIME) +src_touch_LDADD += $(LIB_CLOCK_GETTIME) + +# for gethrxtime +src_dd_LDADD += $(LIB_GETHRXTIME) + +# for cap_get_file +src_ls_LDADD += $(LIB_CAP) + +# for fdatasync +src_dd_LDADD += $(LIB_FDATASYNC) +src_shred_LDADD += $(LIB_FDATASYNC) + +# for xnanosleep +src_sleep_LDADD += $(LIB_NANOSLEEP) +src_sort_LDADD += $(LIB_NANOSLEEP) +src_tail_LDADD += $(LIB_NANOSLEEP) + +# for various GMP functions +src_expr_LDADD += $(LIB_GMP) +src_factor_LDADD += $(LIB_GMP) + +# for getloadavg +src_uptime_LDADD += $(GETLOADAVG_LIBS) + +# for various ACL functions +copy_ldadd += $(LIB_ACL) +src_ls_LDADD += $(LIB_ACL) + +# for various xattr functions +copy_ldadd += $(LIB_XATTR) + +# for print_unicode_char, proper_name_utf8 +src_cat_LDADD += $(LIBICONV) +src_cp_LDADD += $(LIBICONV) +src_df_LDADD += $(LIBICONV) +src_du_LDADD += $(LIBICONV) +src_factor_LDADD += $(LIBICONV) +src_getlimits_LDADD += $(LIBICONV) +src_printf_LDADD += $(LIBICONV) +src_ptx_LDADD += $(LIBICONV) +src_realpath_LDADD += $(LIBICONV) +src_split_LDADD += $(LIBICONV) +src_stdbuf_LDADD += $(LIBICONV) +src_timeout_LDADD += $(LIBICONV) +src_truncate_LDADD += $(LIBICONV) + +# for canon_host +src_pinky_LDADD += $(GETADDRINFO_LIB) +src_who_LDADD += $(GETADDRINFO_LIB) + +# for gethostname, uname +src_hostname_LDADD += $(GETHOSTNAME_LIB) +src_uname_LDADD += $(GETHOSTNAME_LIB) + +# for strsignal +src_kill_LDADD += $(LIBTHREAD) + +# for pthread +src_sort_LDADD += $(LIB_PTHREAD) + +# Get the release year from lib/version-etc.c. +RELEASE_YEAR = \ + `sed -n '/.*COPYRIGHT_YEAR = \([0-9][0-9][0-9][0-9]\) };/s//\1/p' \ + $(top_srcdir)/lib/version-etc.c` + +copy_sources = \ + src/copy.c \ + src/cp-hash.c \ + src/extent-scan.c \ + src/extent-scan.h + +# Use 'ginstall' in the definition of PROGRAMS and in dependencies to avoid +# confusion with the 'install' target. The install rule transforms 'ginstall' +# 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) + +# This is for the '[' program. Automake transliterates '[' and '/' to '_'. +src___SOURCES = src/lbracket.c + +src_cp_SOURCES = src/cp.c $(copy_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 +src_groups_SOURCES = src/groups.c src/group-list.c +src_ls_SOURCES = src/ls.c src/ls-ls.c +src_ln_SOURCES = src/ln.c src/relpath.c src/relpath.h +src_chown_SOURCES = src/chown.c src/chown-core.c +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_rm_SOURCES = src/rm.c src/remove.c + +src_mkdir_SOURCES = src/mkdir.c src/prog-fprintf.c +src_rmdir_SOURCES = src/rmdir.c src/prog-fprintf.c + +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 +src_arch_SOURCES = src/uname.c src/uname-arch.c + +src_md5sum_CPPFLAGS = -DHASH_ALGO_MD5=1 $(AM_CPPFLAGS) +src_sha1sum_SOURCES = src/md5sum.c +src_sha1sum_CPPFLAGS = -DHASH_ALGO_SHA1=1 $(AM_CPPFLAGS) +src_sha224sum_SOURCES = src/md5sum.c +src_sha224sum_CPPFLAGS = -DHASH_ALGO_SHA224=1 $(AM_CPPFLAGS) +src_sha256sum_SOURCES = src/md5sum.c +src_sha256sum_CPPFLAGS = -DHASH_ALGO_SHA256=1 $(AM_CPPFLAGS) +src_sha384sum_SOURCES = src/md5sum.c +src_sha384sum_CPPFLAGS = -DHASH_ALGO_SHA384=1 $(AM_CPPFLAGS) +src_sha512sum_SOURCES = src/md5sum.c +src_sha512sum_CPPFLAGS = -DHASH_ALGO_SHA512=1 $(AM_CPPFLAGS) + +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 = + +# 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) + +BUILT_SOURCES += src/dircolors.h +src/dircolors.h: src/dcgen src/dircolors.hin + $(AM_V_GEN)rm -f $@ $@-t + $(AM_V_at)$(PERL) -w -- $(srcdir)/src/dcgen \ + $(srcdir)/src/dircolors.hin > $@-t + $(AM_V_at)chmod a-w $@-t + $(AM_V_at)mv $@-t $@ + +# This file is built by maintainers. It's architecture-independent, +# and it needs to be built on a widest-known-int architecture, so it's +# built only if absent. It is not cleaned because we don't want to +# insist that maintainers must build on hosts that support the widest +# known ints (currently 128-bit). +BUILT_SOURCES += $(top_srcdir)/src/primes.h +$(top_srcdir)/src/primes.h: + $(MAKE) src/make-prime-list$(EXEEXT) + $(AM_V_GEN)rm -f $@ $@-t + $(AM_V_at)src/make-prime-list$(EXEEXT) 5000 > $@-t + $(AM_V_at)chmod a-w $@-t + $(AM_V_at)mv $@-t $@ + +# false exits nonzero even with --help or --version. +# test doesn't support --help or --version. +# Tell automake to exempt then from that installcheck test. +AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = src/false src/test + +# Compare fs.h with the list of file system names/magic-numbers in the +# Linux statfs man page. This target prints any new name/number pairs. +# 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 + +CLEANFILES += src/fs-def +src/fs-def: src/fs.h + grep '^# *define ' src/fs.h | $(ASSORT) > $@-t && mv $@-t $@ + +# Massage bits of the statfs man page and definitions from +# /usr/include/linux/magic.h to be in a form consistent with what's in fs.h. +fs_normalize_perl_subst = \ + -e 's/MINIX_SUPER_MAGIC\b/MINIX/;' \ + -e 's/MINIX_SUPER_MAGIC2\b/MINIX_30/;' \ + -e 's/MINIX2_SUPER_MAGIC\b/MINIX_V2/;' \ + -e 's/MINIX2_SUPER_MAGIC2\b/MINIX_V2_30/;' \ + -e 's/MINIX3_SUPER_MAGIC\b/MINIX_V3/;' \ + -e 's/CIFS_MAGIC_NUMBER/CIFS/;' \ + -e 's/(_SUPER)?_MAGIC//;' \ + -e 's/\s+0x(\S+)/" 0x" . uc $$1/e;' \ + -e 's/(\s+0x)(\X{3})\b/$${1}0$$2/;' \ + -e 's/(\s+0x)(\X{6})\b/$${1}00$$2/;' \ + -e 's/(\s+0x)(\X{7})\b/$${1}0$$2/;' \ + -e 's/^\s+//;' \ + -e 's/^\043define\s+//;' \ + -e 's/^_(XIAFS)/$$1/;' \ + -e 's/^USBDEVICE/USBDEVFS/;' \ + -e 's/NTFS_SB/NTFS/;' \ + -e 's/^/\043 define S_MAGIC_/;' \ + -e 's,\s*/\* .*? \*/,,;' + +CLEANFILES += src/fs-magic +src/fs-magic: Makefile + 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 $@ + +CLEANFILES += src/fs-kernel-magic +src/fs-kernel-magic: Makefile + perl -ne '/^#define.*0x/ and print' /usr/include/linux/magic.h \ + | perl -p \ + $(fs_normalize_perl_subst) \ + | grep -Ev 'S_MAGIC_EXT[34]|STACK_END' \ + | $(ASSORT) \ + > $@-t && mv $@-t $@ + +BUILT_SOURCES += src/fs-is-local.h +src/fs-is-local.h: src/stat.c src/extract-magic + $(AM_V_GEN)rm -f $@ + $(AM_V_at)$(PERL) $(srcdir)/src/extract-magic \ + --local $(srcdir)/src/stat.c > $@t + $(AM_V_at)chmod a-w $@t + $(AM_V_at)mv $@t $@ + +BUILT_SOURCES += src/fs.h +src/fs.h: src/stat.c src/extract-magic + $(AM_V_GEN)rm -f $@ + $(AM_V_at)$(PERL) $(srcdir)/src/extract-magic \ + $(srcdir)/src/stat.c > $@t + $(AM_V_at)chmod a-w $@t + $(AM_V_at)mv $@t $@ + +BUILT_SOURCES += src/version.c +src/version.c: Makefile + $(AM_V_GEN)rm -f $@ + $(AM_V_at)printf '#include <config.h>\n' > $@t + $(AM_V_at)printf 'char const *Version = "$(PACKAGE_VERSION)";\n' >> $@t + $(AM_V_at)chmod a-w $@t + $(AM_V_at)mv $@t $@ + +BUILT_SOURCES += src/version.h +src/version.h: Makefile + $(AM_V_GEN)rm -f $@ + $(AM_V_at)printf 'extern char const *Version;\n' > $@t + $(AM_V_at)chmod a-w $@t + $(AM_V_at)mv $@t $@ + +DISTCLEANFILES += src/version.c src/version.h +MAINTAINERCLEANFILES += $(BUILT_SOURCES) + +all_programs = \ + $(bin_PROGRAMS) \ + $(bin_SCRIPTS) \ + $(EXTRA_PROGRAMS) + +pm = progs-makefile +pr = progs-readme +# Ensure that the list of programs in README matches the list +# of programs we can build. +check-local: check-README check-duplicate-no-install +.PHONY: check-README +check-README: + $(AM_V_GEN)rm -rf $(pr) $(pm) + $(AM_V_at)echo $(all_programs) \ + | tr -s ' ' '\n' \ + | sed -e 's,$(EXEEXT)$$,,' \ + -e 's,^src/,,' \ + -e 's/^ginstall$$/install/' \ + | sed /libstdbuf/d \ + | $(ASSORT) -u > $(pm) && \ + sed -n '/^The programs .* are:/,/^[a-zA-Z]/p' $(top_srcdir)/README \ + | sed -n '/^ */s///p' | tr -s ' ' '\n' > $(pr) + $(AM_V_at)diff $(pm) $(pr) && rm -rf $(pr) $(pm) + +# Ensure that a by-default-not-installed program (listed in +# $(no_install__progs) is not also listed as another $(EXTRA_PROGRAMS) +# entry, because if that were to happen, it *would* be installed +# by default. +.PHONY: check-duplicate-no-install +check-duplicate-no-install: src/tr + $(AM_V_GEN)test -z "`echo '$(EXTRA_PROGRAMS)' | tr ' ' '\n' | uniq -d`" + +# Use the just-built 'ginstall', when not cross-compiling. +if CROSS_COMPILING +cu_install_program = @INSTALL_PROGRAM@ +else +cu_install_program = src/ginstall +endif +INSTALL_PROGRAM = $(cu_install_program) diff --git a/src/logname.c b/src/logname.c index a7aa2fa9..b655e4a2 100644 --- a/src/logname.c +++ b/src/logname.c @@ -1,5 +1,5 @@ /* logname -- print user's login name - Copyright (C) 1990-2012 Free Software Foundation, Inc. + Copyright (C) 1990-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 diff --git a/src/longlong.h b/src/longlong.h new file mode 100644 index 00000000..46816429 --- /dev/null +++ b/src/longlong.h @@ -0,0 +1,2155 @@ +/* longlong.h -- definitions for mixed size 32/64 bit arithmetic. + +Copyright 1991-2013 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 +Software Foundation; either version 3 of the License, or (at your option) any +later version. + +This file is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A +PARTICULAR PURPOSE. See the GNU Lesser General Public License for more +details. + +You should have received a copy of the GNU Lesser General Public License +along with this file. If not, see http://www.gnu.org/licenses/. */ + +/* You have to define the following before including this file: + + UWtype -- An unsigned type, default type for operations (typically a "word") + UHWtype -- An unsigned type, at least half the size of UWtype + UDWtype -- An unsigned type, at least twice as large a UWtype + W_TYPE_SIZE -- size in bits of UWtype + + SItype, USItype -- Signed and unsigned 32 bit types + DItype, UDItype -- Signed and unsigned 64 bit types + + On a 32 bit machine UWtype should typically be USItype; + on a 64 bit machine, UWtype should typically be UDItype. + + Optionally, define: + + LONGLONG_STANDALONE -- Avoid code that needs machine-dependent support files + NO_ASM -- Disable inline asm + + + CAUTION! Using this version of longlong.h outside of GMP is not safe. You + need to include gmp.h and gmp-impl.h, or certain things might not work as + expected. +*/ + +#define __BITS4 (W_TYPE_SIZE / 4) +#define __ll_B ((UWtype) 1 << (W_TYPE_SIZE / 2)) +#define __ll_lowpart(t) ((UWtype) (t) & (__ll_B - 1)) +#define __ll_highpart(t) ((UWtype) (t) >> (W_TYPE_SIZE / 2)) + +/* This is used to make sure no undesirable sharing between different libraries + that use this file takes place. */ +#ifndef __MPN +#define __MPN(x) __##x +#endif + +/* Define auxiliary asm macros. + + 1) umul_ppmm(high_prod, low_prod, multiplier, multiplicand) multiplies two + UWtype integers MULTIPLIER and MULTIPLICAND, and generates a two UWtype + word product in HIGH_PROD and LOW_PROD. + + 2) __umulsidi3(a,b) multiplies two UWtype integers A and B, and returns a + UDWtype product. This is just a variant of umul_ppmm. + + 3) udiv_qrnnd(quotient, remainder, high_numerator, low_numerator, + denominator) divides a UDWtype, composed by the UWtype integers + HIGH_NUMERATOR and LOW_NUMERATOR, by DENOMINATOR and places the quotient + in QUOTIENT and the remainder in REMAINDER. HIGH_NUMERATOR must be less + than DENOMINATOR for correct operation. If, in addition, the most + significant bit of DENOMINATOR must be 1, then the pre-processor symbol + UDIV_NEEDS_NORMALIZATION is defined to 1. + + 4) sdiv_qrnnd(quotient, remainder, high_numerator, low_numerator, + denominator). Like udiv_qrnnd but the numbers are signed. The quotient + is rounded towards 0. + + 5) count_leading_zeros(count, x) counts the number of zero-bits from the + msb to the first non-zero bit in the UWtype X. This is the number of + steps X needs to be shifted left to set the msb. Undefined for X == 0, + unless the symbol COUNT_LEADING_ZEROS_0 is defined to some value. + + 6) count_trailing_zeros(count, x) like count_leading_zeros, but counts + from the least significant end. + + 7) add_ssaaaa(high_sum, low_sum, high_addend_1, low_addend_1, + high_addend_2, low_addend_2) adds two UWtype integers, composed by + HIGH_ADDEND_1 and LOW_ADDEND_1, and HIGH_ADDEND_2 and LOW_ADDEND_2 + respectively. The result is placed in HIGH_SUM and LOW_SUM. Overflow + (i.e. carry out) is not stored anywhere, and is lost. + + 8) sub_ddmmss(high_difference, low_difference, high_minuend, low_minuend, + high_subtrahend, low_subtrahend) subtracts two two-word UWtype integers, + composed by HIGH_MINUEND_1 and LOW_MINUEND_1, and HIGH_SUBTRAHEND_2 and + LOW_SUBTRAHEND_2 respectively. The result is placed in HIGH_DIFFERENCE + and LOW_DIFFERENCE. Overflow (i.e. carry out) is not stored anywhere, + and is lost. + + If any of these macros are left undefined for a particular CPU, + C macros are used. + + + Notes: + + For add_ssaaaa the two high and two low addends can both commute, but + unfortunately gcc only supports one "%" commutative in each asm block. + This has always been so but is only documented in recent versions + (eg. pre-release 3.3). Having two or more "%"s can cause an internal + compiler error in certain rare circumstances. + + Apparently it was only the last "%" that was ever actually respected, so + the code has been updated to leave just that. Clearly there's a free + choice whether high or low should get it, if there's a reason to favour + one over the other. Also obviously when the constraints on the two + operands are identical there's no benefit to the reloader in any "%" at + all. + + */ + +/* The CPUs come in alphabetical order below. + + Please add support for more CPUs here, or improve the current support + for the CPUs below! */ + + +/* count_leading_zeros_gcc_clz is count_leading_zeros implemented with gcc + 3.4 __builtin_clzl or __builtin_clzll, according to our limb size. + Similarly count_trailing_zeros_gcc_ctz using __builtin_ctzl or + __builtin_ctzll. + + These builtins are only used when we check what code comes out, on some + chips they're merely libgcc calls, where we will instead want an inline + in that case (either asm or generic C). + + These builtins are better than an asm block of the same insn, since an + asm block doesn't give gcc any information about scheduling or resource + usage. We keep an asm block for use on prior versions of gcc though. + + For reference, __builtin_ffs existed in gcc prior to __builtin_clz, but + it's not used (for count_leading_zeros) because it generally gives extra + code to ensure the result is 0 when the input is 0, which we don't need + or want. */ + +#ifdef _LONG_LONG_LIMB +#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); \ + } while (0) +#endif + +#ifdef _LONG_LONG_LIMB +#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); \ + } while (0) +#endif + + +/* FIXME: The macros using external routines like __MPN(count_leading_zeros) + don't need to be under !NO_ASM */ +#if ! defined (NO_ASM) + +#if defined (__alpha) && W_TYPE_SIZE == 64 +/* Most alpha-based machines, except Cray systems. */ +#if defined (__GNUC__) +#if __GMP_GNUC_PREREQ (3,3) +#define umul_ppmm(ph, pl, m0, m1) \ + do { \ + UDItype __m0 = (m0), __m1 = (m1); \ + (ph) = __builtin_alpha_umulh (__m0, __m1); \ + (pl) = __m0 * __m1; \ + } while (0) +#else +#define umul_ppmm(ph, pl, m0, m1) \ + do { \ + UDItype __m0 = (m0), __m1 = (m1); \ + __asm__ ("umulh %r1,%2,%0" \ + : "=r" (ph) \ + : "%rJ" (m0), "rI" (m1)); \ + (pl) = __m0 * __m1; \ + } while (0) +#endif +#define UMUL_TIME 18 +#else /* ! __GNUC__ */ +#include <machine/builtins.h> +#define umul_ppmm(ph, pl, m0, m1) \ + do { \ + UDItype __m0 = (m0), __m1 = (m1); \ + (ph) = __UMULH (m0, m1); \ + (pl) = __m0 * __m1; \ + } while (0) +#endif +#ifndef LONGLONG_STANDALONE +#define udiv_qrnnd(q, r, n1, n0, d) \ + do { UWtype __di; \ + __di = __MPN(invert_limb) (d); \ + udiv_qrnnd_preinv (q, r, n1, n0, d, __di); \ + } while (0) +#define UDIV_PREINV_ALWAYS 1 +#define UDIV_NEEDS_NORMALIZATION 1 +#define UDIV_TIME 220 +#endif /* LONGLONG_STANDALONE */ + +/* clz_tab is required in all configurations, since mpn/alpha/cntlz.asm + always goes into libgmp.so, even when not actually used. */ +#define COUNT_LEADING_ZEROS_NEED_CLZ_TAB + +#if defined (__GNUC__) && HAVE_HOST_CPU_alpha_CIX +#define count_leading_zeros(COUNT,X) \ + __asm__("ctlz %1,%0" : "=r"(COUNT) : "r"(X)) +#define count_trailing_zeros(COUNT,X) \ + __asm__("cttz %1,%0" : "=r"(COUNT) : "r"(X)) +#endif /* clz/ctz using cix */ + +#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) \ + 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; \ + } while (0) +#define COUNT_LEADING_ZEROS_NEED_CLZ_TAB +#endif /* clz using cmpbge */ + +#if ! defined (count_leading_zeros) && ! defined (LONGLONG_STANDALONE) +#if HAVE_ATTRIBUTE_CONST +long __MPN(count_leading_zeros) (UDItype) __attribute__ ((const)); +#else +long __MPN(count_leading_zeros) (UDItype); +#endif +#define count_leading_zeros(count, x) \ + ((count) = __MPN(count_leading_zeros) (x)) +#endif /* clz using mpn */ +#endif /* __alpha */ + +#if defined (__AVR) && W_TYPE_SIZE == 8 +#define umul_ppmm(ph, pl, m0, m1) \ + do { \ + unsigned short __p = (unsigned short) (m0) * (m1); \ + (ph) = __p >> 8; \ + (pl) = __p; \ + } while (0) +#endif /* AVR */ + +#if defined (_CRAY) && W_TYPE_SIZE == 64 +#include <intrinsics.h> +#define UDIV_PREINV_ALWAYS 1 +#define UDIV_NEEDS_NORMALIZATION 1 +#define UDIV_TIME 220 +long __MPN(count_leading_zeros) (UDItype); +#define count_leading_zeros(count, x) \ + ((count) = _leadz ((UWtype) (x))) +#if defined (_CRAYIEEE) /* I.e., Cray T90/ieee, T3D, and T3E */ +#define umul_ppmm(ph, pl, m0, m1) \ + do { \ + UDItype __m0 = (m0), __m1 = (m1); \ + (ph) = _int_mult_upper (m0, m1); \ + (pl) = __m0 * __m1; \ + } while (0) +#ifndef LONGLONG_STANDALONE +#define udiv_qrnnd(q, r, n1, n0, d) \ + do { UWtype __di; \ + __di = __MPN(invert_limb) (d); \ + udiv_qrnnd_preinv (q, r, n1, n0, d, __di); \ + } while (0) +#endif /* LONGLONG_STANDALONE */ +#endif /* _CRAYIEEE */ +#endif /* _CRAY */ + +#if defined (__ia64) && W_TYPE_SIZE == 64 +/* This form encourages gcc (pre-release 3.4 at least) to emit predicated + "sub r=r,r" and "sub r=r,r,1", giving a 2 cycle latency. The generic + 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; \ + } while (0) +#if defined (__GNUC__) && ! defined (__INTEL_COMPILER) +/* Do both product parts in assembly, since that gives better code with + all gcc versions. Some callers will just use the upper part, and in + that situation we waste an instruction, but not any cycles. */ +#define umul_ppmm(ph, pl, m0, m1) \ + __asm__ ("xma.hu %0 = %2, %3, f0\n\txma.l %1 = %2, %3, f0" \ + : "=&f" (ph), "=f" (pl) \ + : "f" (m0), "f" (m1)) +#define UMUL_TIME 14 +#define count_leading_zeros(count, x) \ + do { \ + UWtype _x = (x), _y, _a, _c; \ + __asm__ ("mux1 %0 = %1, @rev" : "=r" (_y) : "r" (_x)); \ + __asm__ ("czx1.l %0 = %1" : "=r" (_a) : "r" (-_y | _y)); \ + _c = (_a - 1) << 3; \ + _x >>= _c; \ + if (_x >= 1 << 4) \ + _x >>= 4, _c += 4; \ + if (_x >= 1 << 2) \ + _x >>= 2, _c += 2; \ + _c += _x >> 1; \ + (count) = W_TYPE_SIZE - 1 - _c; \ + } while (0) +/* similar to what gcc does for __builtin_ffs, but 0 based rather than 1 + based, and we don't need a special case for x==0 here */ +#define count_trailing_zeros(count, x) \ + do { \ + UWtype __ctz_x = (x); \ + __asm__ ("popcnt %0 = %1" \ + : "=r" (count) \ + : "r" ((__ctz_x-1) & ~__ctz_x)); \ + } while (0) +#endif +#if defined (__INTEL_COMPILER) +#include <ia64intrin.h> +#define umul_ppmm(ph, pl, m0, m1) \ + do { \ + UWtype _m0 = (m0), _m1 = (m1); \ + ph = _m64_xmahu (_m0, _m1, 0); \ + pl = _m0 * _m1; \ + } while (0) +#endif +#ifndef LONGLONG_STANDALONE +#define udiv_qrnnd(q, r, n1, n0, d) \ + do { UWtype __di; \ + __di = __MPN(invert_limb) (d); \ + udiv_qrnnd_preinv (q, r, n1, n0, d, __di); \ + } while (0) +#define UDIV_PREINV_ALWAYS 1 +#define UDIV_NEEDS_NORMALIZATION 1 +#endif +#define UDIV_TIME 220 +#endif + + +#if defined (__GNUC__) + +/* We sometimes need to clobber "cc" with gcc2, but that would not be + understood by gcc1. Use cpp to avoid major code duplication. */ +#if __GNUC__ < 2 +#define __CLOBBER_CC +#define __AND_CLOBBER_CC +#else /* __GNUC__ >= 2 */ +#define __CLOBBER_CC : "cc" +#define __AND_CLOBBER_CC , "cc" +#endif /* __GNUC__ < 2 */ + +#if (defined (__a29k__) || defined (_AM29K)) && W_TYPE_SIZE == 32 +#define add_ssaaaa(sh, sl, ah, al, bh, bl) \ + __asm__ ("add %1,%4,%5\n\taddc %0,%2,%3" \ + : "=r" (sh), "=&r" (sl) \ + : "r" (ah), "rI" (bh), "%r" (al), "rI" (bl)) +#define sub_ddmmss(sh, sl, ah, al, bh, bl) \ + __asm__ ("sub %1,%4,%5\n\tsubc %0,%2,%3" \ + : "=r" (sh), "=&r" (sl) \ + : "r" (ah), "rI" (bh), "r" (al), "rI" (bl)) +#define umul_ppmm(xh, xl, m0, m1) \ + do { \ + USItype __m0 = (m0), __m1 = (m1); \ + __asm__ ("multiplu %0,%1,%2" \ + : "=r" (xl) \ + : "r" (__m0), "r" (__m1)); \ + __asm__ ("multmu %0,%1,%2" \ + : "=r" (xh) \ + : "r" (__m0), "r" (__m1)); \ + } while (0) +#define udiv_qrnnd(q, r, n1, n0, d) \ + __asm__ ("dividu %0,%3,%4" \ + : "=r" (q), "=q" (r) \ + : "1" (n1), "r" (n0), "r" (d)) +#define count_leading_zeros(count, x) \ + __asm__ ("clz %0,%1" \ + : "=r" (count) \ + : "r" (x)) +#define COUNT_LEADING_ZEROS_0 32 +#endif /* __a29k__ */ + +#if defined (__arc__) +#define add_ssaaaa(sh, sl, ah, al, bh, bl) \ + __asm__ ("add.f\t%1, %4, %5\n\tadc\t%0, %2, %3" \ + : "=r" (sh), \ + "=&r" (sl) \ + : "r" ((USItype) (ah)), \ + "rIJ" ((USItype) (bh)), \ + "%r" ((USItype) (al)), \ + "rIJ" ((USItype) (bl))) +#define sub_ddmmss(sh, sl, ah, al, bh, bl) \ + __asm__ ("sub.f\t%1, %4, %5\n\tsbc\t%0, %2, %3" \ + : "=r" (sh), \ + "=&r" (sl) \ + : "r" ((USItype) (ah)), \ + "rIJ" ((USItype) (bh)), \ + "r" ((USItype) (al)), \ + "rIJ" ((USItype) (bl))) +#endif + +#if defined (__arm__) && 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) \ + : "r" (ah), "rI" (bh), "%r" (al), "rI" (bl) __CLOBBER_CC) +#define sub_ddmmss(sh, sl, ah, al, bh, bl) \ + do { \ + if (__builtin_constant_p (al)) \ + { \ + if (__builtin_constant_p (ah)) \ + __asm__ ("rsbs\t%1, %5, %4\n\trsc\t%0, %3, %2" \ + : "=r" (sh), "=&r" (sl) \ + : "rI" (ah), "r" (bh), "rI" (al), "r" (bl) __CLOBBER_CC); \ + else \ + __asm__ ("rsbs\t%1, %5, %4\n\tsbc\t%0, %2, %3" \ + : "=r" (sh), "=&r" (sl) \ + : "r" (ah), "rI" (bh), "rI" (al), "r" (bl) __CLOBBER_CC); \ + } \ + else if (__builtin_constant_p (ah)) \ + { \ + if (__builtin_constant_p (bl)) \ + __asm__ ("subs\t%1, %4, %5\n\trsc\t%0, %3, %2" \ + : "=r" (sh), "=&r" (sl) \ + : "rI" (ah), "r" (bh), "r" (al), "rI" (bl) __CLOBBER_CC); \ + else \ + __asm__ ("rsbs\t%1, %5, %4\n\trsc\t%0, %3, %2" \ + : "=r" (sh), "=&r" (sl) \ + : "rI" (ah), "r" (bh), "rI" (al), "r" (bl) __CLOBBER_CC); \ + } \ + else if (__builtin_constant_p (bl)) \ + { \ + if (__builtin_constant_p (bh)) \ + __asm__ ("subs\t%1, %4, %5\n\tsbc\t%0, %2, %3" \ + : "=r" (sh), "=&r" (sl) \ + : "r" (ah), "rI" (bh), "r" (al), "rI" (bl) __CLOBBER_CC); \ + else \ + __asm__ ("subs\t%1, %4, %5\n\trsc\t%0, %3, %2" \ + : "=r" (sh), "=&r" (sl) \ + : "rI" (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), "rI" (bh), "r" (al), "rI" (bl) __CLOBBER_CC);\ + } while (0) +#if 1 || defined (__arm_m__) /* `M' series has widening multiply support */ +#define umul_ppmm(xh, xl, a, b) \ + __asm__ ("umull %0,%1,%2,%3" : "=&r" (xl), "=&r" (xh) : "r" (a), "r" (b)) +#define UMUL_TIME 5 +#define smul_ppmm(xh, xl, a, b) \ + __asm__ ("smull %0,%1,%2,%3" : "=&r" (xl), "=&r" (xh) : "r" (a), "r" (b)) +#ifndef LONGLONG_STANDALONE +#define udiv_qrnnd(q, r, n1, n0, d) \ + do { UWtype __di; \ + __di = __MPN(invert_limb) (d); \ + udiv_qrnnd_preinv (q, r, n1, n0, d, __di); \ + } while (0) +#define UDIV_PREINV_ALWAYS 1 +#define UDIV_NEEDS_NORMALIZATION 1 +#define UDIV_TIME 70 +#endif /* LONGLONG_STANDALONE */ +#else +#define umul_ppmm(xh, xl, a, b) \ + __asm__ ("%@ Inlined umul_ppmm\n" \ +" mov %|r0, %2, lsr #16\n" \ +" mov %|r2, %3, lsr #16\n" \ +" bic %|r1, %2, %|r0, lsl #16\n" \ +" bic %|r2, %3, %|r2, lsl #16\n" \ +" mul %1, %|r1, %|r2\n" \ +" mul %|r2, %|r0, %|r2\n" \ +" mul %|r1, %0, %|r1\n" \ +" mul %0, %|r0, %0\n" \ +" adds %|r1, %|r2, %|r1\n" \ +" addcs %0, %0, #65536\n" \ +" adds %1, %1, %|r1, lsl #16\n" \ +" adc %0, %0, %|r1, lsr #16" \ + : "=&r" (xh), "=r" (xl) \ + : "r" (a), "r" (b) \ + : "r0", "r1", "r2") +#define UMUL_TIME 20 +#ifndef LONGLONG_STANDALONE +#define udiv_qrnnd(q, r, n1, n0, d) \ + do { UWtype __r; \ + (q) = __MPN(udiv_qrnnd) (&__r, (n1), (n0), (d)); \ + (r) = __r; \ + } while (0) +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. */ +#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__) || \ + defined (__ARM_ARCH_6K__) || defined (__ARM_ARCH_6Z__) || \ + defined (__ARM_ARCH_6ZK__)|| defined (__ARM_ARCH_6T2__)|| \ + defined (__ARM_ARCH_6M__) || defined (__ARM_ARCH_7__) || \ + defined (__ARM_ARCH_7A__) || defined (__ARM_ARCH_7R__) || \ + defined (__ARM_ARCH_7M__) || defined (__ARM_ARCH_7EM__) +#define count_leading_zeros(count, x) \ + __asm__ ("clz\t%0, %1" : "=r" (count) : "r" (x)) +#define COUNT_LEADING_ZEROS_0 32 +#endif +#endif /* __arm__ */ + +#if defined (__aarch64__) && W_TYPE_SIZE == 64 +#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) \ + : "r" (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) +#define umul_ppmm(ph, pl, m0, m1) \ + do { \ + UDItype __m0 = (m0), __m1 = (m1); \ + __asm__ ("umulh\t%0, %1, %2" : "=r" (ph) : "r" (m0), "r" (m1)); \ + (pl) = __m0 * __m1; \ + } while (0) +#define count_leading_zeros(count, x) \ + __asm__ ("clz\t%0, %1" : "=r" (count) : "r" (x)) +#define COUNT_LEADING_ZEROS_0 64 +#endif /* __aarch64__ */ + +#if defined (__clipper__) && W_TYPE_SIZE == 32 +#define umul_ppmm(w1, w0, u, v) \ + ({union {UDItype __ll; \ + struct {USItype __l, __h;} __i; \ + } __x; \ + __asm__ ("mulwux %2,%0" \ + : "=r" (__x.__ll) \ + : "%0" ((USItype)(u)), "r" ((USItype)(v))); \ + (w1) = __x.__i.__h; (w0) = __x.__i.__l;}) +#define smul_ppmm(w1, w0, u, v) \ + ({union {DItype __ll; \ + struct {SItype __l, __h;} __i; \ + } __x; \ + __asm__ ("mulwx %2,%0" \ + : "=r" (__x.__ll) \ + : "%0" ((SItype)(u)), "r" ((SItype)(v))); \ + (w1) = __x.__i.__h; (w0) = __x.__i.__l;}) +#define __umulsidi3(u, v) \ + ({UDItype __w; \ + __asm__ ("mulwux %2,%0" \ + : "=r" (__w) : "%0" ((USItype)(u)), "r" ((USItype)(v))); \ + __w; }) +#endif /* __clipper__ */ + +/* Fujitsu vector computers. */ +#if defined (__uxp__) && W_TYPE_SIZE == 32 +#define umul_ppmm(ph, pl, u, v) \ + do { \ + union {UDItype __ll; \ + struct {USItype __h, __l;} __i; \ + } __x; \ + __asm__ ("mult.lu %1,%2,%0" : "=r" (__x.__ll) : "%r" (u), "rK" (v));\ + (ph) = __x.__i.__h; \ + (pl) = __x.__i.__l; \ + } while (0) +#define smul_ppmm(ph, pl, u, v) \ + do { \ + union {UDItype __ll; \ + struct {USItype __h, __l;} __i; \ + } __x; \ + __asm__ ("mult.l %1,%2,%0" : "=r" (__x.__ll) : "%r" (u), "rK" (v)); \ + (ph) = __x.__i.__h; \ + (pl) = __x.__i.__l; \ + } while (0) +#endif + +#if defined (__gmicro__) && W_TYPE_SIZE == 32 +#define add_ssaaaa(sh, sl, ah, al, bh, bl) \ + __asm__ ("add.w %5,%1\n\taddx %3,%0" \ + : "=g" (sh), "=&g" (sl) \ + : "0" ((USItype)(ah)), "g" ((USItype)(bh)), \ + "%1" ((USItype)(al)), "g" ((USItype)(bl))) +#define sub_ddmmss(sh, sl, ah, al, bh, bl) \ + __asm__ ("sub.w %5,%1\n\tsubx %3,%0" \ + : "=g" (sh), "=&g" (sl) \ + : "0" ((USItype)(ah)), "g" ((USItype)(bh)), \ + "1" ((USItype)(al)), "g" ((USItype)(bl))) +#define umul_ppmm(ph, pl, m0, m1) \ + __asm__ ("mulx %3,%0,%1" \ + : "=g" (ph), "=r" (pl) \ + : "%0" ((USItype)(m0)), "g" ((USItype)(m1))) +#define udiv_qrnnd(q, r, nh, nl, d) \ + __asm__ ("divx %4,%0,%1" \ + : "=g" (q), "=r" (r) \ + : "1" ((USItype)(nh)), "0" ((USItype)(nl)), "g" ((USItype)(d))) +#define count_leading_zeros(count, x) \ + __asm__ ("bsch/1 %1,%0" \ + : "=g" (count) : "g" ((USItype)(x)), "0" ((USItype)0)) +#endif + +#if defined (__hppa) && W_TYPE_SIZE == 32 +#define add_ssaaaa(sh, sl, ah, al, bh, bl) \ + __asm__ ("add%I5 %5,%r4,%1\n\taddc %r2,%r3,%0" \ + : "=r" (sh), "=&r" (sl) \ + : "rM" (ah), "rM" (bh), "%rM" (al), "rI" (bl)) +#define sub_ddmmss(sh, sl, ah, al, bh, bl) \ + __asm__ ("sub%I4 %4,%r5,%1\n\tsubb %r2,%r3,%0" \ + : "=r" (sh), "=&r" (sl) \ + : "rM" (ah), "rM" (bh), "rI" (al), "rM" (bl)) +#if defined (_PA_RISC1_1) +#define umul_ppmm(wh, wl, u, v) \ + do { \ + union {UDItype __ll; \ + struct {USItype __h, __l;} __i; \ + } __x; \ + __asm__ ("xmpyu %1,%2,%0" : "=*f" (__x.__ll) : "*f" (u), "*f" (v)); \ + (wh) = __x.__i.__h; \ + (wl) = __x.__i.__l; \ + } while (0) +#define UMUL_TIME 8 +#define UDIV_TIME 60 +#else +#define UMUL_TIME 40 +#define UDIV_TIME 80 +#endif +#define count_leading_zeros(count, x) \ + do { \ + USItype __tmp; \ + __asm__ ( \ + "ldi 1,%0\n" \ +" extru,= %1,15,16,%%r0 ; Bits 31..16 zero?\n" \ +" extru,tr %1,15,16,%1 ; No. Shift down, skip add.\n" \ +" ldo 16(%0),%0 ; Yes. Perform add.\n" \ +" extru,= %1,23,8,%%r0 ; Bits 15..8 zero?\n" \ +" extru,tr %1,23,8,%1 ; No. Shift down, skip add.\n" \ +" ldo 8(%0),%0 ; Yes. Perform add.\n" \ +" extru,= %1,27,4,%%r0 ; Bits 7..4 zero?\n" \ +" extru,tr %1,27,4,%1 ; No. Shift down, skip add.\n" \ +" ldo 4(%0),%0 ; Yes. Perform add.\n" \ +" extru,= %1,29,2,%%r0 ; Bits 3..2 zero?\n" \ +" extru,tr %1,29,2,%1 ; No. Shift down, skip add.\n" \ +" ldo 2(%0),%0 ; Yes. Perform add.\n" \ +" extru %1,30,1,%1 ; Extract bit 1.\n" \ +" sub %0,%1,%0 ; Subtract it.\n" \ + : "=r" (count), "=r" (__tmp) : "1" (x)); \ + } while (0) +#endif /* hppa */ + +/* These macros are for ABI=2.0w. In ABI=2.0n they can't be used, since GCC + (3.2) puts longlong into two adjacent 32-bit registers. Presumably this + is just a case of no direct support for 2.0n but treating it like 1.0. */ +#if defined (__hppa) && W_TYPE_SIZE == 64 && ! defined (_LONG_LONG_LIMB) +#define add_ssaaaa(sh, sl, ah, al, bh, bl) \ + __asm__ ("add%I5 %5,%r4,%1\n\tadd,dc %r2,%r3,%0" \ + : "=r" (sh), "=&r" (sl) \ + : "rM" (ah), "rM" (bh), "%rM" (al), "rI" (bl)) +#define sub_ddmmss(sh, sl, ah, al, bh, bl) \ + __asm__ ("sub%I4 %4,%r5,%1\n\tsub,db %r2,%r3,%0" \ + : "=r" (sh), "=&r" (sl) \ + : "rM" (ah), "rM" (bh), "rI" (al), "rM" (bl)) +#endif /* hppa */ + +#if (defined (__i370__) || defined (__s390__) || defined (__mvs__)) && W_TYPE_SIZE == 32 +#if defined (__zarch__) || defined (HAVE_HOST_CPU_s390_zarch) +#define add_ssaaaa(sh, sl, ah, al, bh, bl) \ + do { \ +/* if (__builtin_constant_p (bl)) \ + __asm__ ("alfi\t%1,%o5\n\talcr\t%0,%3" \ + : "=r" (sh), "=&r" (sl) \ + : "0" (ah), "r" (bh), "%1" (al), "n" (bl) __CLOBBER_CC);\ + else \ +*/ __asm__ ("alr\t%1,%5\n\talcr\t%0,%3" \ + : "=r" (sh), "=&r" (sl) \ + : "0" (ah), "r" (bh), "%1" (al), "r" (bl)__CLOBBER_CC); \ + } while (0) +#define sub_ddmmss(sh, sl, ah, al, bh, bl) \ + do { \ +/* if (__builtin_constant_p (bl)) \ + __asm__ ("slfi\t%1,%o5\n\tslbr\t%0,%3" \ + : "=r" (sh), "=&r" (sl) \ + : "0" (ah), "r" (bh), "1" (al), "n" (bl) __CLOBBER_CC); \ + else \ +*/ __asm__ ("slr\t%1,%5\n\tslbr\t%0,%3" \ + : "=r" (sh), "=&r" (sl) \ + : "0" (ah), "r" (bh), "1" (al), "r" (bl) __CLOBBER_CC); \ + } while (0) +#if __GMP_GNUC_PREREQ (4,5) +#define umul_ppmm(xh, xl, m0, m1) \ + do { \ + union {UDItype __ll; \ + struct {USItype __h, __l;} __i; \ + } __x; \ + __x.__ll = (UDItype) (m0) * (UDItype) (m1); \ + (xh) = __x.__i.__h; (xl) = __x.__i.__l; \ + } while (0) +#else +#if 0 +/* FIXME: this fails if gcc knows about the 64-bit registers. Use only + with a new enough processor pretending we have 32-bit registers. */ +#define umul_ppmm(xh, xl, m0, m1) \ + do { \ + union {UDItype __ll; \ + struct {USItype __h, __l;} __i; \ + } __x; \ + __asm__ ("mlr\t%0,%2" \ + : "=r" (__x.__ll) \ + : "%0" (m0), "r" (m1)); \ + (xh) = __x.__i.__h; (xl) = __x.__i.__l; \ + } while (0) +#else +#define umul_ppmm(xh, xl, m0, m1) \ + do { \ + /* When we have 64-bit regs and gcc is aware of that, we cannot simply use + DImode for the product, since that would be allocated to a single 64-bit + register, whereas mlr uses the low 32-bits of an even-odd register pair. + */ \ + register USItype __r0 __asm__ ("0"); \ + register USItype __r1 __asm__ ("1") = (m0); \ + __asm__ ("mlr\t%0,%3" \ + : "=r" (__r0), "=r" (__r1) \ + : "r" (__r1), "r" (m1)); \ + (xh) = __r0; (xl) = __r1; \ + } while (0) +#endif /* if 0 */ +#endif +#if 0 +/* FIXME: this fails if gcc knows about the 64-bit registers. Use only + with a new enough processor pretending we have 32-bit registers. */ +#define udiv_qrnnd(q, r, n1, n0, d) \ + do { \ + union {UDItype __ll; \ + struct {USItype __h, __l;} __i; \ + } __x; \ + __x.__i.__h = n1; __x.__i.__l = n0; \ + __asm__ ("dlr\t%0,%2" \ + : "=r" (__x.__ll) \ + : "0" (__x.__ll), "r" (d)); \ + (q) = __x.__i.__l; (r) = __x.__i.__h; \ + } while (0) +#else +#define udiv_qrnnd(q, r, n1, n0, d) \ + do { \ + register USItype __r0 __asm__ ("0") = (n1); \ + register USItype __r1 __asm__ ("1") = (n0); \ + __asm__ ("dlr\t%0,%4" \ + : "=r" (__r0), "=r" (__r1) \ + : "r" (__r0), "r" (__r1), "r" (d)); \ + (q) = __r1; (r) = __r0; \ + } while (0) +#endif /* if 0 */ +#else /* if __zarch__ */ +/* FIXME: this fails if gcc knows about the 64-bit registers. */ +#define smul_ppmm(xh, xl, m0, m1) \ + do { \ + union {DItype __ll; \ + struct {USItype __h, __l;} __i; \ + } __x; \ + __asm__ ("mr\t%0,%2" \ + : "=r" (__x.__ll) \ + : "%0" (m0), "r" (m1)); \ + (xh) = __x.__i.__h; (xl) = __x.__i.__l; \ + } while (0) +/* FIXME: this fails if gcc knows about the 64-bit registers. */ +#define sdiv_qrnnd(q, r, n1, n0, d) \ + do { \ + union {DItype __ll; \ + struct {USItype __h, __l;} __i; \ + } __x; \ + __x.__i.__h = n1; __x.__i.__l = n0; \ + __asm__ ("dr\t%0,%2" \ + : "=r" (__x.__ll) \ + : "0" (__x.__ll), "r" (d)); \ + (q) = __x.__i.__l; (r) = __x.__i.__h; \ + } while (0) +#endif /* if __zarch__ */ +#endif + +#if defined (__s390x__) && W_TYPE_SIZE == 64 +/* We need to cast operands with register constraints, otherwise their types + will be assumed to be SImode by gcc. For these machines, such operations + will insert a value into the low 32 bits, and leave the high 32 bits with + garbage. */ +#define add_ssaaaa(sh, sl, ah, al, bh, bl) \ + do { \ + __asm__ ("algr\t%1,%5\n\talcgr\t%0,%3" \ + : "=r" (sh), "=&r" (sl) \ + : "0" ((UDItype)(ah)), "r" ((UDItype)(bh)), \ + "%1" ((UDItype)(al)), "r" ((UDItype)(bl)) __CLOBBER_CC); \ + } while (0) +#define sub_ddmmss(sh, sl, ah, al, bh, bl) \ + do { \ + __asm__ ("slgr\t%1,%5\n\tslbgr\t%0,%3" \ + : "=r" (sh), "=&r" (sl) \ + : "0" ((UDItype)(ah)), "r" ((UDItype)(bh)), \ + "1" ((UDItype)(al)), "r" ((UDItype)(bl)) __CLOBBER_CC); \ + } while (0) +#define umul_ppmm(xh, xl, m0, m1) \ + do { \ + union {unsigned int __attribute__ ((mode(TI))) __ll; \ + struct {UDItype __h, __l;} __i; \ + } __x; \ + __asm__ ("mlgr\t%0,%2" \ + : "=r" (__x.__ll) \ + : "%0" ((UDItype)(m0)), "r" ((UDItype)(m1))); \ + (xh) = __x.__i.__h; (xl) = __x.__i.__l; \ + } while (0) +#define udiv_qrnnd(q, r, n1, n0, d) \ + do { \ + union {unsigned int __attribute__ ((mode(TI))) __ll; \ + struct {UDItype __h, __l;} __i; \ + } __x; \ + __x.__i.__h = n1; __x.__i.__l = n0; \ + __asm__ ("dlgr\t%0,%2" \ + : "=r" (__x.__ll) \ + : "0" (__x.__ll), "r" ((UDItype)(d))); \ + (q) = __x.__i.__l; (r) = __x.__i.__h; \ + } while (0) +#if 0 /* FIXME: Enable for z10 (?) */ +#define count_leading_zeros(cnt, x) \ + do { \ + union {unsigned int __attribute__ ((mode(TI))) __ll; \ + struct {UDItype __h, __l;} __i; \ + } __clr_cnt; \ + __asm__ ("flogr\t%0,%1" \ + : "=r" (__clr_cnt.__ll) \ + : "r" (x) __CLOBBER_CC); \ + (cnt) = __clr_cnt.__i.__h; \ + } while (0) +#endif +#endif + +#if (defined (__i386__) || defined (__i486__)) && W_TYPE_SIZE == 32 +#define add_ssaaaa(sh, sl, ah, al, bh, bl) \ + __asm__ ("addl %5,%k1\n\tadcl %3,%k0" \ + : "=r" (sh), "=&r" (sl) \ + : "0" ((USItype)(ah)), "g" ((USItype)(bh)), \ + "%1" ((USItype)(al)), "g" ((USItype)(bl))) +#define sub_ddmmss(sh, sl, ah, al, bh, bl) \ + __asm__ ("subl %5,%k1\n\tsbbl %3,%k0" \ + : "=r" (sh), "=&r" (sl) \ + : "0" ((USItype)(ah)), "g" ((USItype)(bh)), \ + "1" ((USItype)(al)), "g" ((USItype)(bl))) +#define umul_ppmm(w1, w0, u, v) \ + __asm__ ("mull %3" \ + : "=a" (w0), "=d" (w1) \ + : "%0" ((USItype)(u)), "rm" ((USItype)(v))) +#define udiv_qrnnd(q, r, n1, n0, dx) /* d renamed to dx avoiding "=d" */\ + __asm__ ("divl %4" /* stringification in K&R C */ \ + : "=a" (q), "=d" (r) \ + : "0" ((USItype)(n0)), "1" ((USItype)(n1)), "rm" ((USItype)(dx))) + +#if HAVE_HOST_CPU_i586 || HAVE_HOST_CPU_pentium || HAVE_HOST_CPU_pentiummmx +/* Pentium bsrl takes between 10 and 72 cycles depending where the most + significant 1 bit is, hence the use of the following alternatives. bsfl + is slow too, between 18 and 42 depending where the least significant 1 + bit is, so let the generic count_trailing_zeros below make use of the + count_leading_zeros here too. */ + +#if HAVE_HOST_CPU_pentiummmx && ! defined (LONGLONG_STANDALONE) +/* The following should be a fixed 14 or 15 cycles, but possibly plus an L1 + cache miss reading from __clz_tab. For P55 it's favoured over the float + below so as to avoid mixing MMX and x87, since the penalty for switching + between the two is about 100 cycles. + + The asm block sets __shift to -3 if the high 24 bits are clear, -2 for + 16, -1 for 8, or 0 otherwise. This could be written equivalently as + follows, but as of gcc 2.95.2 it results in conditional jumps. + + __shift = -(__n < 0x1000000); + __shift -= (__n < 0x10000); + __shift -= (__n < 0x100); + + The middle two sbbl and cmpl's pair, and with luck something gcc + generates might pair with the first cmpl and the last sbbl. The "32+1" + constant could be folded into __clz_tab[], but it doesn't seem worth + making a different table just for that. */ + +#define count_leading_zeros(c,n) \ + do { \ + USItype __n = (n); \ + USItype __shift; \ + __asm__ ("cmpl $0x1000000, %1\n" \ + "sbbl %0, %0\n" \ + "cmpl $0x10000, %1\n" \ + "sbbl $0, %0\n" \ + "cmpl $0x100, %1\n" \ + "sbbl $0, %0\n" \ + : "=&r" (__shift) : "r" (__n)); \ + __shift = __shift*8 + 24 + 1; \ + (c) = 32 + 1 - __shift - __clz_tab[__n >> __shift]; \ + } while (0) +#define COUNT_LEADING_ZEROS_NEED_CLZ_TAB +#define COUNT_LEADING_ZEROS_0 31 /* n==0 indistinguishable from n==1 */ + +#else /* ! pentiummmx || LONGLONG_STANDALONE */ +/* The following should be a fixed 14 cycles or so. Some scheduling + opportunities should be available between the float load/store too. This + sort of code is used in gcc 3 for __builtin_ffs (with "n&-n") and is + apparently suggested by the Intel optimizing manual (don't know exactly + where). gcc 2.95 or up will be best for this, so the "double" is + correctly aligned on the stack. */ +#define count_leading_zeros(c,n) \ + do { \ + union { \ + double d; \ + unsigned a[2]; \ + } __u; \ + ASSERT ((n) != 0); \ + __u.d = (UWtype) (n); \ + (c) = 0x3FF + 31 - (__u.a[1] >> 20); \ + } while (0) +#define COUNT_LEADING_ZEROS_0 (0x3FF + 31) +#endif /* pentiummx */ + +#else /* ! pentium */ + +#if __GMP_GNUC_PREREQ (3,4) /* using bsrl */ +#define count_leading_zeros(count,x) count_leading_zeros_gcc_clz(count,x) +#endif /* gcc clz */ + +/* On P6, gcc prior to 3.0 generates a partial register stall for + __cbtmp^31, due to using "xorb $31" instead of "xorl $31", the former + 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 \ + && (HAVE_HOST_CPU_i386 \ + || HAVE_HOST_CPU_i686 \ + || HAVE_HOST_CPU_pentiumpro \ + || HAVE_HOST_CPU_pentium2 \ + || HAVE_HOST_CPU_pentium3) +#define count_leading_zeros(count, x) \ + do { \ + USItype __cbtmp; \ + ASSERT ((x) != 0); \ + __asm__ ("bsrl %1,%0" : "=r" (__cbtmp) : "rm" ((USItype)(x))); \ + (count) = 31 - __cbtmp; \ + } while (0) +#endif /* gcc<3 asm bsrl */ + +#ifndef count_leading_zeros +#define count_leading_zeros(count, x) \ + do { \ + USItype __cbtmp; \ + ASSERT ((x) != 0); \ + __asm__ ("bsrl %1,%0" : "=r" (__cbtmp) : "rm" ((USItype)(x))); \ + (count) = __cbtmp ^ 31; \ + } while (0) +#endif /* asm bsrl */ + +#if __GMP_GNUC_PREREQ (3,4) /* using bsfl */ +#define count_trailing_zeros(count,x) count_trailing_zeros_gcc_ctz(count,x) +#endif /* gcc ctz */ + +#ifndef count_trailing_zeros +#define count_trailing_zeros(count, x) \ + do { \ + ASSERT ((x) != 0); \ + __asm__ ("bsfl %1,%k0" : "=r" (count) : "rm" ((USItype)(x))); \ + } while (0) +#endif /* asm bsfl */ + +#endif /* ! pentium */ + +#ifndef UMUL_TIME +#define UMUL_TIME 10 +#endif +#ifndef UDIV_TIME +#define UDIV_TIME 40 +#endif +#endif /* 80x86 */ + +#if defined (__amd64__) && W_TYPE_SIZE == 64 +#define add_ssaaaa(sh, sl, ah, al, bh, bl) \ + __asm__ ("addq %5,%q1\n\tadcq %3,%q0" \ + : "=r" (sh), "=&r" (sl) \ + : "0" ((UDItype)(ah)), "rme" ((UDItype)(bh)), \ + "%1" ((UDItype)(al)), "rme" ((UDItype)(bl))) +#define sub_ddmmss(sh, sl, ah, al, bh, bl) \ + __asm__ ("subq %5,%q1\n\tsbbq %3,%q0" \ + : "=r" (sh), "=&r" (sl) \ + : "0" ((UDItype)(ah)), "rme" ((UDItype)(bh)), \ + "1" ((UDItype)(al)), "rme" ((UDItype)(bl))) +#define umul_ppmm(w1, w0, u, v) \ + __asm__ ("mulq %3" \ + : "=a" (w0), "=d" (w1) \ + : "%0" ((UDItype)(u)), "rm" ((UDItype)(v))) +#define udiv_qrnnd(q, r, n1, n0, dx) /* d renamed to dx avoiding "=d" */\ + __asm__ ("divq %4" /* stringification in K&R C */ \ + : "=a" (q), "=d" (r) \ + : "0" ((UDItype)(n0)), "1" ((UDItype)(n1)), "rm" ((UDItype)(dx))) +/* bsrq destination must be a 64-bit register, hence UDItype for __cbtmp. */ +#define count_leading_zeros(count, x) \ + do { \ + UDItype __cbtmp; \ + ASSERT ((x) != 0); \ + __asm__ ("bsrq %1,%0" : "=r" (__cbtmp) : "rm" ((UDItype)(x))); \ + (count) = __cbtmp ^ 63; \ + } while (0) +/* bsfq destination must be a 64-bit register, "%q0" forces this in case + count is only an int. */ +#define count_trailing_zeros(count, x) \ + do { \ + ASSERT ((x) != 0); \ + __asm__ ("bsfq %1,%q0" : "=r" (count) : "rm" ((UDItype)(x))); \ + } while (0) +#endif /* x86_64 */ + +#if defined (__i860__) && W_TYPE_SIZE == 32 +#define rshift_rhlc(r,h,l,c) \ + __asm__ ("shr %3,r0,r0\;shrd %1,%2,%0" \ + "=r" (r) : "r" (h), "r" (l), "rn" (c)) +#endif /* i860 */ + +#if defined (__i960__) && W_TYPE_SIZE == 32 +#define add_ssaaaa(sh, sl, ah, al, bh, bl) \ + __asm__ ("cmpo 1,0\;addc %5,%4,%1\;addc %3,%2,%0" \ + : "=r" (sh), "=&r" (sl) \ + : "dI" (ah), "dI" (bh), "%dI" (al), "dI" (bl)) +#define sub_ddmmss(sh, sl, ah, al, bh, bl) \ + __asm__ ("cmpo 0,0\;subc %5,%4,%1\;subc %3,%2,%0" \ + : "=r" (sh), "=&r" (sl) \ + : "dI" (ah), "dI" (bh), "dI" (al), "dI" (bl)) +#define umul_ppmm(w1, w0, u, v) \ + ({union {UDItype __ll; \ + struct {USItype __l, __h;} __i; \ + } __x; \ + __asm__ ("emul %2,%1,%0" \ + : "=d" (__x.__ll) : "%dI" (u), "dI" (v)); \ + (w1) = __x.__i.__h; (w0) = __x.__i.__l;}) +#define __umulsidi3(u, v) \ + ({UDItype __w; \ + __asm__ ("emul %2,%1,%0" : "=d" (__w) : "%dI" (u), "dI" (v)); \ + __w; }) +#define udiv_qrnnd(q, r, nh, nl, d) \ + do { \ + union {UDItype __ll; \ + struct {USItype __l, __h;} __i; \ + } __nn; \ + __nn.__i.__h = (nh); __nn.__i.__l = (nl); \ + __asm__ ("ediv %d,%n,%0" \ + : "=d" (__rq.__ll) : "dI" (__nn.__ll), "dI" (d)); \ + (r) = __rq.__i.__l; (q) = __rq.__i.__h; \ + } while (0) +#define count_leading_zeros(count, x) \ + do { \ + USItype __cbtmp; \ + __asm__ ("scanbit %1,%0" : "=r" (__cbtmp) : "r" (x)); \ + (count) = __cbtmp ^ 31; \ + } while (0) +#define COUNT_LEADING_ZEROS_0 (-32) /* sic */ +#if defined (__i960mx) /* what is the proper symbol to test??? */ +#define rshift_rhlc(r,h,l,c) \ + do { \ + union {UDItype __ll; \ + struct {USItype __l, __h;} __i; \ + } __nn; \ + __nn.__i.__h = (h); __nn.__i.__l = (l); \ + __asm__ ("shre %2,%1,%0" : "=d" (r) : "dI" (__nn.__ll), "dI" (c)); \ + } +#endif /* i960mx */ +#endif /* i960 */ + +#if (defined (__mc68000__) || defined (__mc68020__) || defined(mc68020) \ + || defined (__m68k__) || defined (__mc5200__) || defined (__mc5206e__) \ + || defined (__mc5307__)) && W_TYPE_SIZE == 32 +#define add_ssaaaa(sh, sl, ah, al, bh, bl) \ + __asm__ ("add%.l %5,%1\n\taddx%.l %3,%0" \ + : "=d" (sh), "=&d" (sl) \ + : "0" ((USItype)(ah)), "d" ((USItype)(bh)), \ + "%1" ((USItype)(al)), "g" ((USItype)(bl))) +#define sub_ddmmss(sh, sl, ah, al, bh, bl) \ + __asm__ ("sub%.l %5,%1\n\tsubx%.l %3,%0" \ + : "=d" (sh), "=&d" (sl) \ + : "0" ((USItype)(ah)), "d" ((USItype)(bh)), \ + "1" ((USItype)(al)), "g" ((USItype)(bl))) +/* The '020, '030, '040 and CPU32 have 32x32->64 and 64/32->32q-32r. */ +#if defined (__mc68020__) || defined(mc68020) \ + || defined (__mc68030__) || defined (mc68030) \ + || defined (__mc68040__) || defined (mc68040) \ + || defined (__mcpu32__) || defined (mcpu32) \ + || defined (__NeXT__) +#define umul_ppmm(w1, w0, u, v) \ + __asm__ ("mulu%.l %3,%1:%0" \ + : "=d" (w0), "=d" (w1) \ + : "%0" ((USItype)(u)), "dmi" ((USItype)(v))) +#define UMUL_TIME 45 +#define udiv_qrnnd(q, r, n1, n0, d) \ + __asm__ ("divu%.l %4,%1:%0" \ + : "=d" (q), "=d" (r) \ + : "0" ((USItype)(n0)), "1" ((USItype)(n1)), "dmi" ((USItype)(d))) +#define UDIV_TIME 90 +#define sdiv_qrnnd(q, r, n1, n0, d) \ + __asm__ ("divs%.l %4,%1:%0" \ + : "=d" (q), "=d" (r) \ + : "0" ((USItype)(n0)), "1" ((USItype)(n1)), "dmi" ((USItype)(d))) +#else /* for other 68k family members use 16x16->32 multiplication */ +#define umul_ppmm(xh, xl, a, b) \ + do { USItype __umul_tmp1, __umul_tmp2; \ + __asm__ ("| Inlined umul_ppmm\n" \ +" move%.l %5,%3\n" \ +" move%.l %2,%0\n" \ +" move%.w %3,%1\n" \ +" swap %3\n" \ +" swap %0\n" \ +" mulu%.w %2,%1\n" \ +" mulu%.w %3,%0\n" \ +" mulu%.w %2,%3\n" \ +" swap %2\n" \ +" mulu%.w %5,%2\n" \ +" add%.l %3,%2\n" \ +" jcc 1f\n" \ +" add%.l %#0x10000,%0\n" \ +"1: move%.l %2,%3\n" \ +" clr%.w %2\n" \ +" swap %2\n" \ +" swap %3\n" \ +" clr%.w %3\n" \ +" add%.l %3,%1\n" \ +" addx%.l %2,%0\n" \ +" | End inlined umul_ppmm" \ + : "=&d" (xh), "=&d" (xl), \ + "=d" (__umul_tmp1), "=&d" (__umul_tmp2) \ + : "%2" ((USItype)(a)), "d" ((USItype)(b))); \ + } while (0) +#define UMUL_TIME 100 +#define UDIV_TIME 400 +#endif /* not mc68020 */ +/* The '020, '030, '040 and '060 have bitfield insns. + GCC 3.4 defines __mc68020__ when in CPU32 mode, check for __mcpu32__ to + exclude bfffo on that chip (bitfield insns not available). */ +#if (defined (__mc68020__) || defined (mc68020) \ + || defined (__mc68030__) || defined (mc68030) \ + || defined (__mc68040__) || defined (mc68040) \ + || defined (__mc68060__) || defined (mc68060) \ + || defined (__NeXT__)) \ + && ! defined (__mcpu32__) +#define count_leading_zeros(count, x) \ + __asm__ ("bfffo %1{%b2:%b2},%0" \ + : "=d" (count) \ + : "od" ((USItype) (x)), "n" (0)) +#define COUNT_LEADING_ZEROS_0 32 +#endif +#endif /* mc68000 */ + +#if defined (__m88000__) && W_TYPE_SIZE == 32 +#define add_ssaaaa(sh, sl, ah, al, bh, bl) \ + __asm__ ("addu.co %1,%r4,%r5\n\taddu.ci %0,%r2,%r3" \ + : "=r" (sh), "=&r" (sl) \ + : "rJ" (ah), "rJ" (bh), "%rJ" (al), "rJ" (bl)) +#define sub_ddmmss(sh, sl, ah, al, bh, bl) \ + __asm__ ("subu.co %1,%r4,%r5\n\tsubu.ci %0,%r2,%r3" \ + : "=r" (sh), "=&r" (sl) \ + : "rJ" (ah), "rJ" (bh), "rJ" (al), "rJ" (bl)) +#define count_leading_zeros(count, x) \ + do { \ + USItype __cbtmp; \ + __asm__ ("ff1 %0,%1" : "=r" (__cbtmp) : "r" (x)); \ + (count) = __cbtmp ^ 31; \ + } while (0) +#define COUNT_LEADING_ZEROS_0 63 /* sic */ +#if defined (__m88110__) +#define umul_ppmm(wh, wl, u, v) \ + do { \ + union {UDItype __ll; \ + struct {USItype __h, __l;} __i; \ + } __x; \ + __asm__ ("mulu.d %0,%1,%2" : "=r" (__x.__ll) : "r" (u), "r" (v)); \ + (wh) = __x.__i.__h; \ + (wl) = __x.__i.__l; \ + } while (0) +#define udiv_qrnnd(q, r, n1, n0, d) \ + ({union {UDItype __ll; \ + struct {USItype __h, __l;} __i; \ + } __x, __q; \ + __x.__i.__h = (n1); __x.__i.__l = (n0); \ + __asm__ ("divu.d %0,%1,%2" \ + : "=r" (__q.__ll) : "r" (__x.__ll), "r" (d)); \ + (r) = (n0) - __q.__l * (d); (q) = __q.__l; }) +#define UMUL_TIME 5 +#define UDIV_TIME 25 +#else +#define UMUL_TIME 17 +#define UDIV_TIME 150 +#endif /* __m88110__ */ +#endif /* __m88000__ */ + +#if defined (__mips) && W_TYPE_SIZE == 32 +#if __GMP_GNUC_PREREQ (4,4) +#define umul_ppmm(w1, w0, u, v) \ + do { \ + UDItype __ll = (UDItype)(u) * (v); \ + w1 = __ll >> 32; \ + w0 = __ll; \ + } while (0) +#endif +#if !defined (umul_ppmm) && __GMP_GNUC_PREREQ (2,7) +#define umul_ppmm(w1, w0, u, v) \ + __asm__ ("multu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v)) +#endif +#if !defined (umul_ppmm) +#define umul_ppmm(w1, w0, u, v) \ + __asm__ ("multu %2,%3\n\tmflo %0\n\tmfhi %1" \ + : "=d" (w0), "=d" (w1) : "d" (u), "d" (v)) +#endif +#define UMUL_TIME 10 +#define UDIV_TIME 100 +#endif /* __mips */ + +#if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64 +#if __GMP_GNUC_PREREQ (4,4) +#define umul_ppmm(w1, w0, u, v) \ + do { \ + typedef unsigned int __ll_UTItype __attribute__((mode(TI))); \ + __ll_UTItype __ll = (__ll_UTItype)(u) * (v); \ + w1 = __ll >> 64; \ + w0 = __ll; \ + } while (0) +#endif +#if !defined (umul_ppmm) && __GMP_GNUC_PREREQ (2,7) +#define umul_ppmm(w1, w0, u, v) \ + __asm__ ("dmultu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v)) +#endif +#if !defined (umul_ppmm) +#define umul_ppmm(w1, w0, u, v) \ + __asm__ ("dmultu %2,%3\n\tmflo %0\n\tmfhi %1" \ + : "=d" (w0), "=d" (w1) : "d" (u), "d" (v)) +#endif +#define UMUL_TIME 20 +#define UDIV_TIME 140 +#endif /* __mips */ + +#if defined (__mmix__) && W_TYPE_SIZE == 64 +#define umul_ppmm(w1, w0, u, v) \ + __asm__ ("MULU %0,%2,%3" : "=r" (w0), "=z" (w1) : "r" (u), "r" (v)) +#endif + +#if defined (__ns32000__) && W_TYPE_SIZE == 32 +#define umul_ppmm(w1, w0, u, v) \ + ({union {UDItype __ll; \ + struct {USItype __l, __h;} __i; \ + } __x; \ + __asm__ ("meid %2,%0" \ + : "=g" (__x.__ll) \ + : "%0" ((USItype)(u)), "g" ((USItype)(v))); \ + (w1) = __x.__i.__h; (w0) = __x.__i.__l;}) +#define __umulsidi3(u, v) \ + ({UDItype __w; \ + __asm__ ("meid %2,%0" \ + : "=g" (__w) \ + : "%0" ((USItype)(u)), "g" ((USItype)(v))); \ + __w; }) +#define udiv_qrnnd(q, r, n1, n0, d) \ + ({union {UDItype __ll; \ + struct {USItype __l, __h;} __i; \ + } __x; \ + __x.__i.__h = (n1); __x.__i.__l = (n0); \ + __asm__ ("deid %2,%0" \ + : "=g" (__x.__ll) \ + : "0" (__x.__ll), "g" ((USItype)(d))); \ + (r) = __x.__i.__l; (q) = __x.__i.__h; }) +#define count_trailing_zeros(count,x) \ + do { \ + __asm__ ("ffsd %2,%0" \ + : "=r" (count) \ + : "0" ((USItype) 0), "r" ((USItype) (x))); \ + } while (0) +#endif /* __ns32000__ */ + +/* In the past we had a block of various #defines tested + _ARCH_PPC - AIX + _ARCH_PWR - AIX + __powerpc__ - gcc + __POWERPC__ - BEOS + __ppc__ - Darwin + PPC - old gcc, GNU/Linux, SysV + The plain PPC test was not good for vxWorks, since PPC is defined on all + CPUs there (eg. m68k too), as a constant one is expected to compare + CPU_FAMILY against. + + At any rate, this was pretty unattractive and a bit fragile. The use of + HAVE_HOST_CPU_FAMILY is designed to cut through it all and be sure of + getting the desired effect. + + ENHANCE-ME: We should test _IBMR2 here when we add assembly support for + the system vendor compilers. (Is that vendor compilers with inline asm, + or what?) */ + +#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));\ + 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));\ + else \ + __asm__ ("{a%I5|add%I5c} %1,%4,%5\n\t{ae|adde} %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" \ + : "=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" \ + : "=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) == ~(USItype) 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)); \ + } while (0) +#define count_leading_zeros(count, x) \ + __asm__ ("{cntlz|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) +#define umul_ppmm(w1, w0, u, v) \ + do { \ + UDItype __ll = (UDItype)(u) * (v); \ + w1 = __ll >> 32; \ + w0 = __ll; \ + } while (0) +#endif +#if !defined (umul_ppmm) +#define umul_ppmm(ph, pl, m0, m1) \ + do { \ + USItype __m0 = (m0), __m1 = (m1); \ + __asm__ ("mulhwu %0,%1,%2" : "=r" (ph) : "%r" (m0), "r" (m1)); \ + (pl) = __m0 * __m1; \ + } while (0) +#endif +#define UMUL_TIME 15 +#define smul_ppmm(ph, pl, m0, m1) \ + do { \ + SItype __m0 = (m0), __m1 = (m1); \ + __asm__ ("mulhw %0,%1,%2" : "=r" (ph) : "%r" (m0), "r" (m1)); \ + (pl) = __m0 * __m1; \ + } while (0) +#define SMUL_TIME 14 +#define UDIV_TIME 120 +#else +#define UMUL_TIME 8 +#define smul_ppmm(xh, xl, m0, m1) \ + __asm__ ("mul %0,%2,%3" : "=r" (xh), "=q" (xl) : "r" (m0), "r" (m1)) +#define SMUL_TIME 4 +#define sdiv_qrnnd(q, r, nh, nl, d) \ + __asm__ ("div %0,%2,%4" : "=r" (q), "=q" (r) : "r" (nh), "1" (nl), "r" (d)) +#define UDIV_TIME 100 +#endif +#endif /* 32-bit POWER architecture variants. */ + +/* We should test _IBMR2 here when we add assembly support for the system + vendor compilers. */ +#if HAVE_HOST_CPU_FAMILY_powerpc && W_TYPE_SIZE == 64 +#if !defined (_LONG_LONG_LIMB) +/* _LONG_LONG_LIMB is ABI=mode32 where adde operates on 32-bit values. So + use adde etc only when not _LONG_LONG_LIMB. */ +#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));\ + 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));\ + else \ + __asm__ ("{a%I5|add%I5c} %1,%4,%5\n\t{ae|adde} %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" \ + : "=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" \ + : "=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" \ + : "=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" \ + : "=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)); \ + } \ + } while (0) +#endif /* ! _LONG_LONG_LIMB */ +#define count_leading_zeros(count, x) \ + __asm__ ("cntlzd %0,%1" : "=r" (count) : "r" (x)) +#define COUNT_LEADING_ZEROS_0 64 +#if 0 && __GMP_GNUC_PREREQ (4,4) /* Disable, this results in libcalls! */ +#define umul_ppmm(w1, w0, u, v) \ + do { \ + typedef unsigned int __ll_UTItype __attribute__((mode(TI))); \ + __ll_UTItype __ll = (__ll_UTItype)(u) * (v); \ + w1 = __ll >> 64; \ + w0 = __ll; \ + } while (0) +#endif +#if !defined (umul_ppmm) +#define umul_ppmm(ph, pl, m0, m1) \ + do { \ + UDItype __m0 = (m0), __m1 = (m1); \ + __asm__ ("mulhdu %0,%1,%2" : "=r" (ph) : "%r" (m0), "r" (m1)); \ + (pl) = __m0 * __m1; \ + } while (0) +#endif +#define UMUL_TIME 15 +#define smul_ppmm(ph, pl, m0, m1) \ + do { \ + DItype __m0 = (m0), __m1 = (m1); \ + __asm__ ("mulhd %0,%1,%2" : "=r" (ph) : "%r" (m0), "r" (m1)); \ + (pl) = __m0 * __m1; \ + } while (0) +#define SMUL_TIME 14 /* ??? */ +#define UDIV_TIME 120 /* ??? */ +#endif /* 64-bit PowerPC. */ + +#if defined (__pyr__) && W_TYPE_SIZE == 32 +#define add_ssaaaa(sh, sl, ah, al, bh, bl) \ + __asm__ ("addw %5,%1\n\taddwc %3,%0" \ + : "=r" (sh), "=&r" (sl) \ + : "0" ((USItype)(ah)), "g" ((USItype)(bh)), \ + "%1" ((USItype)(al)), "g" ((USItype)(bl))) +#define sub_ddmmss(sh, sl, ah, al, bh, bl) \ + __asm__ ("subw %5,%1\n\tsubwb %3,%0" \ + : "=r" (sh), "=&r" (sl) \ + : "0" ((USItype)(ah)), "g" ((USItype)(bh)), \ + "1" ((USItype)(al)), "g" ((USItype)(bl))) +/* This insn works on Pyramids with AP, XP, or MI CPUs, but not with SP. */ +#define umul_ppmm(w1, w0, u, v) \ + ({union {UDItype __ll; \ + struct {USItype __h, __l;} __i; \ + } __x; \ + __asm__ ("movw %1,%R0\n\tuemul %2,%0" \ + : "=&r" (__x.__ll) \ + : "g" ((USItype) (u)), "g" ((USItype)(v))); \ + (w1) = __x.__i.__h; (w0) = __x.__i.__l;}) +#endif /* __pyr__ */ + +#if defined (__ibm032__) /* RT/ROMP */ && W_TYPE_SIZE == 32 +#define add_ssaaaa(sh, sl, ah, al, bh, bl) \ + __asm__ ("a %1,%5\n\tae %0,%3" \ + : "=r" (sh), "=&r" (sl) \ + : "0" ((USItype)(ah)), "r" ((USItype)(bh)), \ + "%1" ((USItype)(al)), "r" ((USItype)(bl))) +#define sub_ddmmss(sh, sl, ah, al, bh, bl) \ + __asm__ ("s %1,%5\n\tse %0,%3" \ + : "=r" (sh), "=&r" (sl) \ + : "0" ((USItype)(ah)), "r" ((USItype)(bh)), \ + "1" ((USItype)(al)), "r" ((USItype)(bl))) +#define smul_ppmm(ph, pl, m0, m1) \ + __asm__ ( \ + "s r2,r2\n" \ +" mts r10,%2\n" \ +" m r2,%3\n" \ +" m r2,%3\n" \ +" m r2,%3\n" \ +" m r2,%3\n" \ +" m r2,%3\n" \ +" m r2,%3\n" \ +" m r2,%3\n" \ +" m r2,%3\n" \ +" m r2,%3\n" \ +" m r2,%3\n" \ +" m r2,%3\n" \ +" m r2,%3\n" \ +" m r2,%3\n" \ +" m r2,%3\n" \ +" m r2,%3\n" \ +" m r2,%3\n" \ +" cas %0,r2,r0\n" \ +" mfs r10,%1" \ + : "=r" (ph), "=r" (pl) \ + : "%r" ((USItype)(m0)), "r" ((USItype)(m1)) \ + : "r2") +#define UMUL_TIME 20 +#define UDIV_TIME 200 +#define count_leading_zeros(count, x) \ + do { \ + if ((x) >= 0x10000) \ + __asm__ ("clz %0,%1" \ + : "=r" (count) : "r" ((USItype)(x) >> 16)); \ + else \ + { \ + __asm__ ("clz %0,%1" \ + : "=r" (count) : "r" ((USItype)(x))); \ + (count) += 16; \ + } \ + } while (0) +#endif /* RT/ROMP */ + +#if (defined (__SH2__) || defined (__SH3__) || defined (__SH4__)) && W_TYPE_SIZE == 32 +#define umul_ppmm(w1, w0, u, v) \ + __asm__ ("dmulu.l %2,%3\n\tsts macl,%1\n\tsts mach,%0" \ + : "=r" (w1), "=r" (w0) : "r" (u), "r" (v) : "macl", "mach") +#define UMUL_TIME 5 +#endif + +#if defined (__sparc__) && W_TYPE_SIZE == 32 +#define add_ssaaaa(sh, sl, ah, al, bh, bl) \ + __asm__ ("addcc %r4,%5,%1\n\taddx %r2,%3,%0" \ + : "=r" (sh), "=&r" (sl) \ + : "rJ" (ah), "rI" (bh),"%rJ" (al), "rI" (bl) \ + __CLOBBER_CC) +#define sub_ddmmss(sh, sl, ah, al, bh, bl) \ + __asm__ ("subcc %r4,%5,%1\n\tsubx %r2,%3,%0" \ + : "=r" (sh), "=&r" (sl) \ + : "rJ" (ah), "rI" (bh), "rJ" (al), "rI" (bl) \ + __CLOBBER_CC) +/* FIXME: When gcc -mcpu=v9 is used on solaris, gcc/config/sol2-sld-64.h + doesn't define anything to indicate that to us, it only sets __sparcv8. */ +#if defined (__sparc_v9__) || defined (__sparcv9) +/* Perhaps we should use floating-point operations here? */ +#if 0 +/* Triggers a bug making mpz/tests/t-gcd.c fail. + Perhaps we simply need explicitly zero-extend the inputs? */ +#define umul_ppmm(w1, w0, u, v) \ + __asm__ ("mulx %2,%3,%%g1; srl %%g1,0,%1; srlx %%g1,32,%0" : \ + "=r" (w1), "=r" (w0) : "r" (u), "r" (v) : "g1") +#else +/* Use v8 umul until above bug is fixed. */ +#define umul_ppmm(w1, w0, u, v) \ + __asm__ ("umul %2,%3,%1;rd %%y,%0" : "=r" (w1), "=r" (w0) : "r" (u), "r" (v)) +#endif +/* Use a plain v8 divide for v9. */ +#define udiv_qrnnd(q, r, n1, n0, d) \ + do { \ + USItype __q; \ + __asm__ ("mov %1,%%y;nop;nop;nop;udiv %2,%3,%0" \ + : "=r" (__q) : "r" (n1), "r" (n0), "r" (d)); \ + (r) = (n0) - __q * (d); \ + (q) = __q; \ + } while (0) +#else +#if defined (__sparc_v8__) /* gcc normal */ \ + || defined (__sparcv8) /* gcc solaris */ \ + || HAVE_HOST_CPU_supersparc +/* Don't match immediate range because, 1) it is not often useful, + 2) the 'I' flag thinks of the range as a 13 bit signed interval, + while we want to match a 13 bit interval, sign extended to 32 bits, + but INTERPRETED AS UNSIGNED. */ +#define umul_ppmm(w1, w0, u, v) \ + __asm__ ("umul %2,%3,%1;rd %%y,%0" : "=r" (w1), "=r" (w0) : "r" (u), "r" (v)) +#define UMUL_TIME 5 + +#if HAVE_HOST_CPU_supersparc +#define UDIV_TIME 60 /* SuperSPARC timing */ +#else +/* Don't use this on SuperSPARC because its udiv only handles 53 bit + dividends and will trap to the kernel for the rest. */ +#define udiv_qrnnd(q, r, n1, n0, d) \ + do { \ + USItype __q; \ + __asm__ ("mov %1,%%y;nop;nop;nop;udiv %2,%3,%0" \ + : "=r" (__q) : "r" (n1), "r" (n0), "r" (d)); \ + (r) = (n0) - __q * (d); \ + (q) = __q; \ + } while (0) +#define UDIV_TIME 25 +#endif /* HAVE_HOST_CPU_supersparc */ + +#else /* ! __sparc_v8__ */ +#if defined (__sparclite__) +/* This has hardware multiply but not divide. It also has two additional + instructions scan (ffs from high bit) and divscc. */ +#define umul_ppmm(w1, w0, u, v) \ + __asm__ ("umul %2,%3,%1;rd %%y,%0" : "=r" (w1), "=r" (w0) : "r" (u), "r" (v)) +#define UMUL_TIME 5 +#define udiv_qrnnd(q, r, n1, n0, d) \ + __asm__ ("! Inlined udiv_qrnnd\n" \ +" wr %%g0,%2,%%y ! Not a delayed write for sparclite\n" \ +" tst %%g0\n" \ +" divscc %3,%4,%%g1\n" \ +" divscc %%g1,%4,%%g1\n" \ +" divscc %%g1,%4,%%g1\n" \ +" divscc %%g1,%4,%%g1\n" \ +" divscc %%g1,%4,%%g1\n" \ +" divscc %%g1,%4,%%g1\n" \ +" divscc %%g1,%4,%%g1\n" \ +" divscc %%g1,%4,%%g1\n" \ +" divscc %%g1,%4,%%g1\n" \ +" divscc %%g1,%4,%%g1\n" \ +" divscc %%g1,%4,%%g1\n" \ +" divscc %%g1,%4,%%g1\n" \ +" divscc %%g1,%4,%%g1\n" \ +" divscc %%g1,%4,%%g1\n" \ +" divscc %%g1,%4,%%g1\n" \ +" divscc %%g1,%4,%%g1\n" \ +" divscc %%g1,%4,%%g1\n" \ +" divscc %%g1,%4,%%g1\n" \ +" divscc %%g1,%4,%%g1\n" \ +" divscc %%g1,%4,%%g1\n" \ +" divscc %%g1,%4,%%g1\n" \ +" divscc %%g1,%4,%%g1\n" \ +" divscc %%g1,%4,%%g1\n" \ +" divscc %%g1,%4,%%g1\n" \ +" divscc %%g1,%4,%%g1\n" \ +" divscc %%g1,%4,%%g1\n" \ +" divscc %%g1,%4,%%g1\n" \ +" divscc %%g1,%4,%%g1\n" \ +" divscc %%g1,%4,%%g1\n" \ +" divscc %%g1,%4,%%g1\n" \ +" divscc %%g1,%4,%%g1\n" \ +" divscc %%g1,%4,%0\n" \ +" rd %%y,%1\n" \ +" bl,a 1f\n" \ +" add %1,%4,%1\n" \ +"1: ! End of inline udiv_qrnnd" \ + : "=r" (q), "=r" (r) : "r" (n1), "r" (n0), "rI" (d) \ + : "%g1" __AND_CLOBBER_CC) +#define UDIV_TIME 37 +#define count_leading_zeros(count, x) \ + __asm__ ("scan %1,1,%0" : "=r" (count) : "r" (x)) +/* Early sparclites return 63 for an argument of 0, but they warn that future + implementations might change this. Therefore, leave COUNT_LEADING_ZEROS_0 + undefined. */ +#endif /* __sparclite__ */ +#endif /* __sparc_v8__ */ +#endif /* __sparc_v9__ */ +/* Default to sparc v7 versions of umul_ppmm and udiv_qrnnd. */ +#ifndef umul_ppmm +#define umul_ppmm(w1, w0, u, v) \ + __asm__ ("! Inlined umul_ppmm\n" \ +" wr %%g0,%2,%%y ! SPARC has 0-3 delay insn after a wr\n" \ +" sra %3,31,%%g2 ! Don't move this insn\n" \ +" and %2,%%g2,%%g2 ! Don't move this insn\n" \ +" andcc %%g0,0,%%g1 ! Don't move this insn\n" \ +" mulscc %%g1,%3,%%g1\n" \ +" mulscc %%g1,%3,%%g1\n" \ +" mulscc %%g1,%3,%%g1\n" \ +" mulscc %%g1,%3,%%g1\n" \ +" mulscc %%g1,%3,%%g1\n" \ +" mulscc %%g1,%3,%%g1\n" \ +" mulscc %%g1,%3,%%g1\n" \ +" mulscc %%g1,%3,%%g1\n" \ +" mulscc %%g1,%3,%%g1\n" \ +" mulscc %%g1,%3,%%g1\n" \ +" mulscc %%g1,%3,%%g1\n" \ +" mulscc %%g1,%3,%%g1\n" \ +" mulscc %%g1,%3,%%g1\n" \ +" mulscc %%g1,%3,%%g1\n" \ +" mulscc %%g1,%3,%%g1\n" \ +" mulscc %%g1,%3,%%g1\n" \ +" mulscc %%g1,%3,%%g1\n" \ +" mulscc %%g1,%3,%%g1\n" \ +" mulscc %%g1,%3,%%g1\n" \ +" mulscc %%g1,%3,%%g1\n" \ +" mulscc %%g1,%3,%%g1\n" \ +" mulscc %%g1,%3,%%g1\n" \ +" mulscc %%g1,%3,%%g1\n" \ +" mulscc %%g1,%3,%%g1\n" \ +" mulscc %%g1,%3,%%g1\n" \ +" mulscc %%g1,%3,%%g1\n" \ +" mulscc %%g1,%3,%%g1\n" \ +" mulscc %%g1,%3,%%g1\n" \ +" mulscc %%g1,%3,%%g1\n" \ +" mulscc %%g1,%3,%%g1\n" \ +" mulscc %%g1,%3,%%g1\n" \ +" mulscc %%g1,%3,%%g1\n" \ +" mulscc %%g1,0,%%g1\n" \ +" add %%g1,%%g2,%0\n" \ +" rd %%y,%1" \ + : "=r" (w1), "=r" (w0) : "%rI" (u), "r" (v) \ + : "%g1", "%g2" __AND_CLOBBER_CC) +#define UMUL_TIME 39 /* 39 instructions */ +#endif +#ifndef udiv_qrnnd +#ifndef LONGLONG_STANDALONE +#define udiv_qrnnd(q, r, n1, n0, d) \ + do { UWtype __r; \ + (q) = __MPN(udiv_qrnnd) (&__r, (n1), (n0), (d)); \ + (r) = __r; \ + } while (0) +extern UWtype __MPN(udiv_qrnnd) (UWtype *, UWtype, UWtype, UWtype); +#ifndef UDIV_TIME +#define UDIV_TIME 140 +#endif +#endif /* LONGLONG_STANDALONE */ +#endif /* udiv_qrnnd */ +#endif /* __sparc__ */ + +#if defined (__sparc__) && W_TYPE_SIZE == 64 +#define add_ssaaaa(sh, sl, ah, al, bh, bl) \ + __asm__ ( \ + "addcc %r4,%5,%1\n" \ + " addccc %r6,%7,%%g0\n" \ + " addc %r2,%3,%0" \ + : "=r" (sh), "=&r" (sl) \ + : "rJ" (ah), "rI" (bh), "%rJ" (al), "rI" (bl), \ + "%rJ" ((al) >> 32), "rI" ((bl) >> 32) \ + __CLOBBER_CC) +#define sub_ddmmss(sh, sl, ah, al, bh, bl) \ + __asm__ ( \ + "subcc %r4,%5,%1\n" \ + " subccc %r6,%7,%%g0\n" \ + " subc %r2,%3,%0" \ + : "=r" (sh), "=&r" (sl) \ + : "rJ" (ah), "rI" (bh), "rJ" (al), "rI" (bl), \ + "rJ" ((al) >> 32), "rI" ((bl) >> 32) \ + __CLOBBER_CC) +#endif + +#if 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) \ + : "0" ((USItype)(ah)), "g" ((USItype)(bh)), \ + "%1" ((USItype)(al)), "g" ((USItype)(bl))) +#define sub_ddmmss(sh, sl, ah, al, bh, bl) \ + __asm__ ("subl2 %5,%1\n\tsbwc %3,%0" \ + : "=g" (sh), "=&g" (sl) \ + : "0" ((USItype)(ah)), "g" ((USItype)(bh)), \ + "1" ((USItype)(al)), "g" ((USItype)(bl))) +#define smul_ppmm(xh, xl, m0, m1) \ + do { \ + union {UDItype __ll; \ + struct {USItype __l, __h;} __i; \ + } __x; \ + USItype __m0 = (m0), __m1 = (m1); \ + __asm__ ("emul %1,%2,$0,%0" \ + : "=g" (__x.__ll) : "g" (__m0), "g" (__m1)); \ + (xh) = __x.__i.__h; (xl) = __x.__i.__l; \ + } while (0) +#define sdiv_qrnnd(q, r, n1, n0, d) \ + do { \ + union {DItype __ll; \ + struct {SItype __l, __h;} __i; \ + } __x; \ + __x.__i.__h = n1; __x.__i.__l = n0; \ + __asm__ ("ediv %3,%2,%0,%1" \ + : "=g" (q), "=g" (r) : "g" (__x.__ll), "g" (d)); \ + } while (0) +#if 0 +/* FIXME: This instruction appears to be unimplemented on some systems (vax + 8800 maybe). */ +#define count_trailing_zeros(count,x) \ + do { \ + __asm__ ("ffs 0, 31, %1, %0" \ + : "=g" (count) \ + : "g" ((USItype) (x))); \ + } while (0) +#endif +#endif /* __vax__ */ + +#if defined (__z8000__) && W_TYPE_SIZE == 16 +#define add_ssaaaa(sh, sl, ah, al, bh, bl) \ + __asm__ ("add %H1,%H5\n\tadc %H0,%H3" \ + : "=r" (sh), "=&r" (sl) \ + : "0" ((unsigned int)(ah)), "r" ((unsigned int)(bh)), \ + "%1" ((unsigned int)(al)), "rQR" ((unsigned int)(bl))) +#define sub_ddmmss(sh, sl, ah, al, bh, bl) \ + __asm__ ("sub %H1,%H5\n\tsbc %H0,%H3" \ + : "=r" (sh), "=&r" (sl) \ + : "0" ((unsigned int)(ah)), "r" ((unsigned int)(bh)), \ + "1" ((unsigned int)(al)), "rQR" ((unsigned int)(bl))) +#define umul_ppmm(xh, xl, m0, m1) \ + do { \ + union {long int __ll; \ + struct {unsigned int __h, __l;} __i; \ + } __x; \ + unsigned int __m0 = (m0), __m1 = (m1); \ + __asm__ ("mult %S0,%H3" \ + : "=r" (__x.__i.__h), "=r" (__x.__i.__l) \ + : "%1" (m0), "rQR" (m1)); \ + (xh) = __x.__i.__h; (xl) = __x.__i.__l; \ + (xh) += ((((signed int) __m0 >> 15) & __m1) \ + + (((signed int) __m1 >> 15) & __m0)); \ + } while (0) +#endif /* __z8000__ */ + +#endif /* __GNUC__ */ + +#endif /* NO_ASM */ + + +/* FIXME: "sidi" here is highly doubtful, should sometimes be "diti". */ +#if !defined (umul_ppmm) && defined (__umulsidi3) +#define umul_ppmm(ph, pl, m0, m1) \ + { \ + UDWtype __ll = __umulsidi3 (m0, m1); \ + ph = (UWtype) (__ll >> W_TYPE_SIZE); \ + pl = (UWtype) __ll; \ + } +#endif + +#if !defined (__umulsidi3) +#define __umulsidi3(u, v) \ + ({UWtype __hi, __lo; \ + umul_ppmm (__hi, __lo, u, v); \ + ((UDWtype) __hi << W_TYPE_SIZE) | __lo; }) +#endif + + +/* Use mpn_umul_ppmm or mpn_udiv_qrnnd functions, if they exist. The "_r" + forms have "reversed" arguments, meaning the pointer is last, which + sometimes allows better parameter passing, in particular on 64-bit + hppa. */ + +#define mpn_umul_ppmm __MPN(umul_ppmm) +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; \ + } while (0) +#endif + +#define mpn_umul_ppmm_r __MPN(umul_ppmm_r) +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; \ + } while (0) +#endif + +#define mpn_udiv_qrnnd __MPN(udiv_qrnnd) +extern UWtype mpn_udiv_qrnnd (UWtype *, UWtype, UWtype, UWtype); + +#if ! defined (udiv_qrnnd) && HAVE_NATIVE_mpn_udiv_qrnnd \ + && ! defined (LONGLONG_STANDALONE) +#define udiv_qrnnd(q, r, n1, n0, d) \ + do { \ + UWtype __udiv_qrnnd__r; \ + (q) = mpn_udiv_qrnnd (&__udiv_qrnnd__r, \ + (UWtype) (n1), (UWtype) (n0), (UWtype) d); \ + (r) = __udiv_qrnnd__r; \ + } while (0) +#endif + +#define mpn_udiv_qrnnd_r __MPN(udiv_qrnnd_r) +extern UWtype mpn_udiv_qrnnd_r (UWtype, UWtype, UWtype, UWtype *); + +#if ! defined (udiv_qrnnd) && HAVE_NATIVE_mpn_udiv_qrnnd_r \ + && ! defined (LONGLONG_STANDALONE) +#define udiv_qrnnd(q, r, n1, n0, d) \ + do { \ + UWtype __udiv_qrnnd__r; \ + (q) = mpn_udiv_qrnnd_r ((UWtype) (n1), (UWtype) (n0), (UWtype) d, \ + &__udiv_qrnnd__r); \ + (r) = __udiv_qrnnd__r; \ + } while (0) +#endif + + +/* If this machine has no inline assembler, use C macros. */ + +#if !defined (add_ssaaaa) +#define add_ssaaaa(sh, sl, ah, al, bh, bl) \ + do { \ + UWtype __x; \ + __x = (al) + (bl); \ + (sh) = (ah) + (bh) + (__x < (al)); \ + (sl) = __x; \ + } while (0) +#endif + +#if !defined (sub_ddmmss) +#define sub_ddmmss(sh, sl, ah, al, bh, bl) \ + do { \ + UWtype __x; \ + __x = (al) - (bl); \ + (sh) = (ah) - (bh) - ((al) < (bl)); \ + (sl) = __x; \ + } while (0) +#endif + +/* If we lack umul_ppmm but have smul_ppmm, define umul_ppmm in terms of + smul_ppmm. */ +#if !defined (umul_ppmm) && defined (smul_ppmm) +#define umul_ppmm(w1, w0, u, v) \ + do { \ + UWtype __w1; \ + UWtype __xm0 = (u), __xm1 = (v); \ + smul_ppmm (__w1, w0, __xm0, __xm1); \ + (w1) = __w1 + (-(__xm0 >> (W_TYPE_SIZE - 1)) & __xm1) \ + + (-(__xm1 >> (W_TYPE_SIZE - 1)) & __xm0); \ + } while (0) +#endif + +/* If we still don't have umul_ppmm, define it using plain C. + + For reference, when this code is used for squaring (ie. u and v identical + expressions), gcc recognises __x1 and __x2 are the same and generates 3 + multiplies, not 4. The subsequent additions could be optimized a bit, + but the only place GMP currently uses such a square is mpn_sqr_basecase, + and chips obliged to use this generic C umul will have plenty of worse + performance problems than a couple of extra instructions on the diagonal + of sqr_basecase. */ + +#if !defined (umul_ppmm) +#define umul_ppmm(w1, w0, u, v) \ + do { \ + UWtype __x0, __x1, __x2, __x3; \ + UHWtype __ul, __vl, __uh, __vh; \ + UWtype __u = (u), __v = (v); \ + \ + __ul = __ll_lowpart (__u); \ + __uh = __ll_highpart (__u); \ + __vl = __ll_lowpart (__v); \ + __vh = __ll_highpart (__v); \ + \ + __x0 = (UWtype) __ul * __vl; \ + __x1 = (UWtype) __ul * __vh; \ + __x2 = (UWtype) __uh * __vl; \ + __x3 = (UWtype) __uh * __vh; \ + \ + __x1 += __ll_highpart (__x0);/* this can't give carry */ \ + __x1 += __x2; /* but this indeed can */ \ + if (__x1 < __x2) /* did we get it? */ \ + __x3 += __ll_B; /* yes, add it in the proper pos. */ \ + \ + (w1) = __x3 + __ll_highpart (__x1); \ + (w0) = (__x1 << W_TYPE_SIZE/2) + __ll_lowpart (__x0); \ + } while (0) +#endif + +/* If we don't have smul_ppmm, define it using umul_ppmm (which surely will + exist in one form or another. */ +#if !defined (smul_ppmm) +#define smul_ppmm(w1, w0, u, v) \ + do { \ + UWtype __w1; \ + UWtype __xm0 = (u), __xm1 = (v); \ + umul_ppmm (__w1, w0, __xm0, __xm1); \ + (w1) = __w1 - (-(__xm0 >> (W_TYPE_SIZE - 1)) & __xm1) \ + - (-(__xm1 >> (W_TYPE_SIZE - 1)) & __xm0); \ + } while (0) +#endif + +/* Define this unconditionally, so it can be used for debugging. */ +#define __udiv_qrnnd_c(q, r, n1, n0, d) \ + do { \ + UWtype __d1, __d0, __q1, __q0, __r1, __r0, __m; \ + \ + ASSERT ((d) != 0); \ + ASSERT ((n1) < (d)); \ + \ + __d1 = __ll_highpart (d); \ + __d0 = __ll_lowpart (d); \ + \ + __q1 = (n1) / __d1; \ + __r1 = (n1) - __q1 * __d1; \ + __m = __q1 * __d0; \ + __r1 = __r1 * __ll_B | __ll_highpart (n0); \ + if (__r1 < __m) \ + { \ + __q1--, __r1 += (d); \ + if (__r1 >= (d)) /* i.e. we didn't get carry when adding to __r1 */\ + if (__r1 < __m) \ + __q1--, __r1 += (d); \ + } \ + __r1 -= __m; \ + \ + __q0 = __r1 / __d1; \ + __r0 = __r1 - __q0 * __d1; \ + __m = __q0 * __d0; \ + __r0 = __r0 * __ll_B | __ll_lowpart (n0); \ + if (__r0 < __m) \ + { \ + __q0--, __r0 += (d); \ + if (__r0 >= (d)) \ + if (__r0 < __m) \ + __q0--, __r0 += (d); \ + } \ + __r0 -= __m; \ + \ + (q) = __q1 * __ll_B | __q0; \ + (r) = __r0; \ + } while (0) + +/* If the processor has no udiv_qrnnd but sdiv_qrnnd, go through + __udiv_w_sdiv (defined in libgcc or elsewhere). */ +#if !defined (udiv_qrnnd) && defined (sdiv_qrnnd) +#define udiv_qrnnd(q, r, nh, nl, d) \ + do { \ + UWtype __r; \ + (q) = __MPN(udiv_w_sdiv) (&__r, nh, nl, d); \ + (r) = __r; \ + } while (0) +__GMP_DECLSPEC UWtype __MPN(udiv_w_sdiv) (UWtype *, UWtype, UWtype, UWtype); +#endif + +/* If udiv_qrnnd was not defined for this processor, use __udiv_qrnnd_c. */ +#if !defined (udiv_qrnnd) +#define UDIV_NEEDS_NORMALIZATION 1 +#define udiv_qrnnd __udiv_qrnnd_c +#endif + +#if !defined (count_leading_zeros) +#define count_leading_zeros(count, x) \ + do { \ + UWtype __xr = (x); \ + UWtype __a; \ + \ + if (W_TYPE_SIZE == 32) \ + { \ + __a = __xr < ((UWtype) 1 << 2*__BITS4) \ + ? (__xr < ((UWtype) 1 << __BITS4) ? 1 : __BITS4 + 1) \ + : (__xr < ((UWtype) 1 << 3*__BITS4) ? 2*__BITS4 + 1 \ + : 3*__BITS4 + 1); \ + } \ + else \ + { \ + for (__a = W_TYPE_SIZE - 8; __a > 0; __a -= 8) \ + if (((__xr >> __a) & 0xff) != 0) \ + break; \ + ++__a; \ + } \ + \ + (count) = W_TYPE_SIZE + 1 - __a - __clz_tab[__xr >> __a]; \ + } while (0) +/* This version gives a well-defined value for zero. */ +#define COUNT_LEADING_ZEROS_0 (W_TYPE_SIZE - 1) +#define COUNT_LEADING_ZEROS_NEED_CLZ_TAB +#define COUNT_LEADING_ZEROS_SLOW +#endif + +/* clz_tab needed by mpn/x86/pentium/mod_1.asm in a fat binary */ +#if HAVE_HOST_CPU_FAMILY_x86 && WANT_FAT_BINARY +#define COUNT_LEADING_ZEROS_NEED_CLZ_TAB +#endif + +#ifdef COUNT_LEADING_ZEROS_NEED_CLZ_TAB +extern const unsigned char __GMP_DECLSPEC __clz_tab[129]; +#endif + +#if !defined (count_trailing_zeros) +#if !defined (COUNT_LEADING_ZEROS_SLOW) +/* Define count_trailing_zeros using an asm count_leading_zeros. */ +#define count_trailing_zeros(count, x) \ + do { \ + UWtype __ctz_x = (x); \ + UWtype __ctz_c; \ + ASSERT (__ctz_x != 0); \ + count_leading_zeros (__ctz_c, __ctz_x & -__ctz_x); \ + (count) = W_TYPE_SIZE - 1 - __ctz_c; \ + } while (0) +#else +/* Define count_trailing_zeros in plain C, assuming small counts are common. + We use clz_tab without ado, since the C count_leading_zeros above will have + pulled it in. */ +#define count_trailing_zeros(count, x) \ + do { \ + UWtype __ctz_x = (x); \ + int __ctz_c; \ + \ + if (LIKELY ((__ctz_x & 0xff) != 0)) \ + (count) = __clz_tab[__ctz_x & -__ctz_x] - 2; \ + else \ + { \ + for (__ctz_c = 8 - 2; __ctz_c < W_TYPE_SIZE - 2; __ctz_c += 8) \ + { \ + __ctz_x >>= 8; \ + if (LIKELY ((__ctz_x & 0xff) != 0)) \ + break; \ + } \ + \ + (count) = __ctz_c + __clz_tab[__ctz_x & -__ctz_x]; \ + } \ + } while (0) +#endif +#endif + +#ifndef UDIV_NEEDS_NORMALIZATION +#define UDIV_NEEDS_NORMALIZATION 0 +#endif + +/* Whether udiv_qrnnd is actually implemented with udiv_qrnnd_preinv, and + that hence the latter should always be used. */ +#ifndef UDIV_PREINV_ALWAYS +#define UDIV_PREINV_ALWAYS 0 +#endif + +/* Give defaults for UMUL_TIME and UDIV_TIME. */ +#ifndef UMUL_TIME +#define UMUL_TIME 1 +#endif + +#ifndef UDIV_TIME +#define UDIV_TIME UMUL_TIME +#endif diff --git a/src/ls.c b/src/ls.c index 397e4ea9..f1ed43bd 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-2012 Free Software Foundation, Inc. + Copyright (C) 1985-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 @@ -3064,12 +3064,6 @@ gobble_file (char const *name, enum filetype type, ino_t inode, free (linkname); } - /* When not distinguishing types of symlinks, pretend we know that - it is stat'able, so that it will be colored as a regular symlink, - and not as an orphan. */ - if (S_ISLNK (f->stat.st_mode) && !check_symlink_color) - f->linkok = true; - if (S_ISLNK (f->stat.st_mode)) f->filetype = symbolic_link; else if (S_ISDIR (f->stat.st_mode)) @@ -3213,7 +3207,14 @@ make_link_name (char const *name, char const *linkname) return xstrdup (linkname); char *p = xmalloc (prefix_len + 1 + strlen (linkname) + 1); - stpcpy (stpncpy (p, name, prefix_len + 1), linkname); + + /* PREFIX_LEN usually specifies a string not ending in slash. + In that case, extend it by one, since the next byte *is* a slash. + Otherwise, the prefix is "/", so leave the length unchanged. */ + if ( ! ISSLASH (name[prefix_len - 1])) + ++prefix_len; + + stpcpy (stpncpy (p, name, prefix_len), linkname); return p; } @@ -4286,7 +4287,7 @@ print_color_indicator (const struct fileinfo *f, bool symlink_target) /* Is this a nonexistent file? If so, linkok == -1. */ - if (linkok == -1 && color_indicator[C_MISSING].string != NULL) + if (linkok == -1 && is_colored (C_MISSING)) type = C_MISSING; else if (!f->stat_ok) { @@ -4361,8 +4362,7 @@ print_color_indicator (const struct fileinfo *f, bool symlink_target) /* Adjust the color for orphaned symlinks. */ if (type == C_LINK && !linkok) { - if (color_symlink_as_referent - || color_indicator[C_ORPHAN].string) + if (color_symlink_as_referent || is_colored (C_ORPHAN)) type = C_ORPHAN; } @@ -4721,11 +4721,10 @@ usage (int status) fputs (_("\ List information about the FILEs (the current directory by default).\n\ Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n\ -\n\ -"), stdout); - fputs (_("\ -Mandatory arguments to long options are mandatory for short options too.\n\ "), stdout); + + emit_mandatory_arg_note (); + fputs (_("\ -a, --all do not ignore entries starting with .\n\ -A, --almost-all do not list implied . and ..\n\ diff --git a/src/make-prime-list.c b/src/make-prime-list.c new file mode 100644 index 00000000..4ec01cf3 --- /dev/null +++ b/src/make-prime-list.c @@ -0,0 +1,227 @@ +/* Factoring of uintmax_t numbers. Generation of needed tables. + + 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. + +This 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 <limits.h> +#include <stdint.h> +#include <inttypes.h> +#include <stdio.h> +#include <string.h> +#include <stdlib.h> +#include <errno.h> + +/* Deactivate config.h's "rpl_"-prefixed definitions of these symbols. */ +#undef fclose +#undef malloc +#undef strerror + +/* An unsigned type that is no narrower than 32 bits and no narrower + than unsigned int. It's best to make it as wide as possible. + For GCC 4.6 and later, use a heuristic to guess whether unsigned + __int128 works on your platform. If this heuristic does not work + for you, please report a bug; in the meantime compile with, e.g., + -Dwide_uint='unsigned __int128' to override the heuristic. */ +#ifndef wide_uint +# if 4 < __GNUC__ + (6 <= __GNUC_MINOR__) && ULONG_MAX >> 31 >> 31 >> 1 != 0 +typedef unsigned __int128 wide_uint; +# else +typedef uintmax_t wide_uint; +# endif +#endif + +struct prime +{ + unsigned p; + wide_uint pinv; /* Inverse mod b = 2^{bitsize of wide_uint} */ + wide_uint lim; /* floor ((wide_uint) -1 / p) */ +}; + +static wide_uint _GL_ATTRIBUTE_CONST +binvert (wide_uint a) +{ + wide_uint x = 0xf5397db1 >> (4*((a/2) & 0x7)); + for (;;) + { + wide_uint y = 2*x - x*x*a; + if (y == x) + return x; + x = y; + } +} + +static void +process_prime (struct prime *info, unsigned p) +{ + wide_uint max = -1; + info->p = p; + info->pinv = binvert (p); + info->lim = max / p; +} + +static void +print_wide_uint (wide_uint n, int nesting, unsigned wide_uint_bits) +{ + /* Number of bits per integer literal. 8 is too many, because + uintmax_t is 32 bits on some machines so we cannot shift by 32 bits. + So use 7. */ + int hex_digits_per_literal = 7; + int bits_per_literal = hex_digits_per_literal * 4; + + unsigned remainder = n & ((1 << bits_per_literal) - 1); + + if (n != remainder) + { + int needs_parentheses = n >> bits_per_literal >> bits_per_literal != 0; + if (needs_parentheses) + printf ("("); + print_wide_uint (n >> bits_per_literal, nesting + 1, wide_uint_bits); + if (needs_parentheses) + printf (")\n%*s", nesting + 3, ""); + printf (" << %d | ", bits_per_literal); + } + else if (nesting) + { + printf ("(uintmax_t) "); + hex_digits_per_literal + = ((wide_uint_bits - 1) % bits_per_literal) % 4 + 1; + } + + printf ("0x%0*xU", hex_digits_per_literal, remainder); +} + +static void +output_primes (const struct prime *primes, unsigned nprimes) +{ + unsigned i; + unsigned p; + int is_prime; + + /* Compute wide_uint_bits by repeated shifting, rather than by + multiplying sizeof by CHAR_BIT, as this works even if the + wide_uint representation has holes. */ + unsigned wide_uint_bits = 0; + wide_uint mask = -1; + for (wide_uint_bits = 0; mask; wide_uint_bits++) + mask >>= 1; + + puts ("/* Generated file -- DO NOT EDIT */\n"); + printf ("#define WIDE_UINT_BITS %u\n", wide_uint_bits); + + for (i = 0, p = 2; i < nprimes; i++) + { + unsigned int d8 = i + 8 < nprimes ? primes[i + 8].p - primes[i].p : 0xff; + if (255 < d8) /* this happens at 668221 */ + abort (); + printf ("P (%u, %u,\n (", primes[i].p - p, d8); + print_wide_uint (primes[i].pinv, 0, wide_uint_bits); + printf ("),\n UINTMAX_MAX / %d)\n", primes[i].p); + p = primes[i].p; + } + + printf ("\n#undef FIRST_OMITTED_PRIME\n"); + + /* Find next prime */ + do + { + p += 2; + for (i = 0, is_prime = 1; is_prime; i++) + { + if (primes[i].p * primes[i].p > p) + break; + if (p * primes[i].pinv <= primes[i].lim) + { + is_prime = 0; + break; + } + } + } + while (!is_prime); + + printf ("#define FIRST_OMITTED_PRIME %u\n", p); +} + +static void * +xalloc (size_t s) +{ + void *p = malloc (s); + if (p) + return p; + + fprintf (stderr, "Virtual memory exhausted.\n"); + exit (EXIT_FAILURE); +} + +int +main (int argc, char **argv) +{ + int limit; + + char *sieve; + size_t size, i; + + struct prime *prime_list; + unsigned nprimes; + + if (argc != 2) + { + fprintf (stderr, "Usage: %s LIMIT\n" + "Produces a list of odd primes <= LIMIT\n", argv[0]); + return EXIT_FAILURE; + } + limit = atoi (argv[1]); + if (limit < 3) + exit (EXIT_SUCCESS); + + /* Make limit odd */ + if ( !(limit & 1)) + limit--; + + size = (limit-1)/2; + /* sieve[i] represents 3+2*i */ + sieve = xalloc (size); + memset (sieve, 1, size); + + prime_list = xalloc (size * sizeof (*prime_list)); + nprimes = 0; + + for (i = 0; i < size;) + { + unsigned p = 3+2*i; + unsigned j; + + process_prime (&prime_list[nprimes++], p); + + for (j = (p*p - 3)/2; j < size; j+= p) + sieve[j] = 0; + + while (i < size && sieve[++i] == 0) + ; + } + + output_primes (prime_list, nprimes); + + if (ferror (stdout) + fclose (stdout)) + { + fprintf (stderr, "write error: %s\n", strerror (errno)); + return EXIT_FAILURE; + } + + return EXIT_SUCCESS; +} diff --git a/src/md5sum.c b/src/md5sum.c index f7e08491..b4378115 100644 --- a/src/md5sum.c +++ b/src/md5sum.c @@ -1,5 +1,5 @@ /* Compute checksums of files or strings. - Copyright (C) 1995-2012 Free Software Foundation, Inc. + Copyright (C) 1995-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 @@ -135,7 +135,8 @@ enum { STATUS_OPTION = CHAR_MAX + 1, QUIET_OPTION, - STRICT_OPTION + STRICT_OPTION, + TAG_OPTION }; static struct option const long_options[] = @@ -147,6 +148,7 @@ static struct option const long_options[] = { "text", no_argument, NULL, 't' }, { "warn", no_argument, NULL, 'w' }, { "strict", no_argument, NULL, STRICT_OPTION }, + { "tag", no_argument, NULL, TAG_OPTION }, { GETOPT_HELP_OPTION_DECL }, { GETOPT_VERSION_OPTION_DECL }, { NULL, 0, NULL, 0 } @@ -179,6 +181,9 @@ With no FILE, or when FILE is -, read standard input.\n\ printf (_("\ -c, --check read %s sums from the FILEs and check them\n"), DIGEST_TYPE_STRING); + fputs (_("\ + --tag create a BSD-style checksum\n\ +"), stdout); if (O_BINARY) fputs (_("\ -t, --text read in text mode (default if reading tty stdin)\n\ @@ -215,23 +220,73 @@ space for text), and name for each FILE.\n"), #define ISWHITE(c) ((c) == ' ' || (c) == '\t') +/* Given a file name, S of length S_LEN, that is not NUL-terminated, + modify it in place, performing the equivalent of this sed substitution: + 's/\\n/\n/g;s/\\\\/\\/g' i.e., replacing each "\\n" string with a newline + and each "\\\\" with a single backslash, NUL-terminate it and return S. + If S is not a valid escaped file name, i.e., if it ends with an odd number + of backslashes or if it contains a backslash followed by anything other + than "n" or another backslash, return NULL. */ + +static char * +filename_unescape (char *s, size_t s_len) +{ + char *dst = s; + + for (size_t i = 0; i < s_len; i++) + { + switch (s[i]) + { + case '\\': + if (i == s_len - 1) + { + /* File name ends with an unescaped backslash: invalid. */ + return NULL; + } + ++i; + switch (s[i]) + { + case 'n': + *dst++ = '\n'; + break; + case '\\': + *dst++ = '\\'; + break; + default: + /* Only '\' or 'n' may follow a backslash. */ + return NULL; + } + break; + + case '\0': + /* The file name may not contain a NUL. */ + return NULL; + + default: + *dst++ = s[i]; + break; + } + } + if (dst < s + s_len) + *dst = '\0'; + + return s; +} + /* Split the checksum string S (of length S_LEN) from a BSD 'md5' or 'sha1' command into two parts: a hexadecimal digest, and the file name. S is modified. Return true if successful. */ static bool bsd_split_3 (char *s, size_t s_len, unsigned char **hex_digest, - char **file_name) + char **file_name, bool escaped_filename) { size_t i; if (s_len == 0) return false; - *file_name = s; - - /* Find end of filename. The BSD 'md5' and 'sha1' commands do not escape - filenames, so search backwards for the last ')'. */ + /* Find end of filename. */ i = s_len - 1; while (i && s[i] != ')') i--; @@ -239,6 +294,11 @@ bsd_split_3 (char *s, size_t s_len, unsigned char **hex_digest, if (s[i] != ')') return false; + *file_name = s; + + if (escaped_filename && filename_unescape (s, i) == NULL) + return false; + s[i++] = '\0'; while (ISWHITE (s[i])) @@ -271,7 +331,14 @@ split_3 (char *s, size_t s_len, while (ISWHITE (s[i])) ++i; + if (s[i] == '\\') + { + ++i; + escaped_filename = true; + } + /* Check for BSD-style checksum line. */ + algo_name_len = strlen (DIGEST_TYPE_STRING); if (STREQ_LEN (s + i, DIGEST_TYPE_STRING, algo_name_len)) { @@ -282,7 +349,7 @@ split_3 (char *s, size_t s_len, *binary = 0; return bsd_split_3 (s + i + algo_name_len + 1, s_len - (i + algo_name_len + 1), - hex_digest, file_name); + hex_digest, file_name, escaped_filename); } } @@ -293,11 +360,6 @@ split_3 (char *s, size_t s_len, if (s_len - i < min_digest_line_length + (s[i] == '\\')) return false; - if (s[i] == '\\') - { - ++i; - escaped_filename = true; - } *hex_digest = (unsigned char *) &s[i]; /* The first field has to be the n-character hexadecimal @@ -333,49 +395,8 @@ split_3 (char *s, size_t s_len, *file_name = &s[i]; if (escaped_filename) - { - /* Translate each '\n' string in the file name to a NEWLINE, - and each '\\' string to a backslash. */ - - char *dst = &s[i]; - - while (i < s_len) - { - switch (s[i]) - { - case '\\': - if (i == s_len - 1) - { - /* A valid line does not end with a backslash. */ - return false; - } - ++i; - switch (s[i++]) - { - case 'n': - *dst++ = '\n'; - break; - case '\\': - *dst++ = '\\'; - break; - default: - /* Only '\' or 'n' may follow a backslash. */ - return false; - } - break; - - case '\0': - /* The file name may not contain a NUL. */ - return false; - break; + return filename_unescape (&s[i], s_len - i) != NULL; - default: - *dst++ = s[i++]; - break; - } - } - *dst = '\0'; - } return true; } @@ -636,6 +657,31 @@ digest_check (const char *checkfile_name) && (!strict || n_improperly_formatted_lines == 0)); } +static void +print_filename (char const *file) +{ + /* Translate each NEWLINE byte to the string, "\\n", + and each backslash to "\\\\". */ + while (*file) + { + switch (*file) + { + case '\n': + fputs ("\\n", stdout); + break; + + case '\\': + fputs ("\\\\", stdout); + break; + + default: + putchar (*file); + break; + } + file++; + } +} + int main (int argc, char **argv) { @@ -646,6 +692,7 @@ main (int argc, char **argv) int opt; bool ok = true; int binary = -1; + bool prefix_tag = false; /* Setting values of global variables. */ initialize_main (&argc, &argv); @@ -690,6 +737,10 @@ main (int argc, char **argv) case STRICT_OPTION: strict = true; break; + case TAG_OPTION: + prefix_tag = true; + binary = 1; + break; case_GETOPT_HELP_CHAR; case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: @@ -699,6 +750,24 @@ main (int argc, char **argv) min_digest_line_length = MIN_DIGEST_LINE_LENGTH; digest_hex_bytes = DIGEST_HEX_BYTES; + if (prefix_tag && !binary) + { + /* This could be supported in a backwards compatible way + by prefixing the output line with a space in text mode. + However that's invasive enough that it was agreed to + not support this mode with --tag, as --text use cases + are adequately supported by the default output format. */ + error (0, 0, _("--tag does not support --text mode")); + usage (EXIT_FAILURE); + } + + if (prefix_tag && do_check) + { + error (0, 0, _("the --tag option is meaningless when " + "verifying checksums")); + usage (EXIT_FAILURE); + } + if (0 <= binary && do_check) { error (0, 0, _("the --binary and --text options are meaningless when " @@ -754,41 +823,36 @@ main (int argc, char **argv) ok = false; else { + if (prefix_tag) + { + if (strchr (file, '\n') || strchr (file, '\\')) + putchar ('\\'); + + fputs (DIGEST_TYPE_STRING, stdout); + fputs (" (", stdout); + print_filename (file); + fputs (") = ", stdout); + } + size_t i; /* Output a leading backslash if the file name contains a newline or backslash. */ - if (strchr (file, '\n') || strchr (file, '\\')) + if (!prefix_tag && (strchr (file, '\n') || strchr (file, '\\'))) putchar ('\\'); for (i = 0; i < (digest_hex_bytes / 2); ++i) printf ("%02x", bin_buffer[i]); - putchar (' '); - if (file_is_binary) - putchar ('*'); - else - putchar (' '); - - /* Translate each NEWLINE byte to the string, "\\n", - and each backslash to "\\\\". */ - for (i = 0; i < strlen (file); ++i) + if (!prefix_tag) { - switch (file[i]) - { - case '\n': - fputs ("\\n", stdout); - break; - - case '\\': - fputs ("\\\\", stdout); - break; - - default: - putchar (file[i]); - break; - } + putchar (' '); + + putchar (file_is_binary ? '*' : ' '); + + print_filename (file); } + putchar ('\n'); } } diff --git a/src/mkdir.c b/src/mkdir.c index 32f79d4e..a94f96e1 100644 --- a/src/mkdir.c +++ b/src/mkdir.c @@ -1,5 +1,5 @@ /* mkdir -- make directories - Copyright (C) 1990-2012 Free Software Foundation, Inc. + Copyright (C) 1990-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 @@ -56,11 +56,10 @@ usage (int status) printf (_("Usage: %s [OPTION]... DIRECTORY...\n"), program_name); fputs (_("\ Create the DIRECTORY(ies), if they do not already exist.\n\ -\n\ -"), stdout); - fputs (_("\ -Mandatory arguments to long options are mandatory for short options too.\n\ "), stdout); + + emit_mandatory_arg_note (); + fputs (_("\ -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\ diff --git a/src/mkfifo.c b/src/mkfifo.c index e5c871d1..76291e5b 100644 --- a/src/mkfifo.c +++ b/src/mkfifo.c @@ -1,5 +1,5 @@ /* mkfifo -- make fifo's (named pipes) - Copyright (C) 1990-2012 Free Software Foundation, Inc. + Copyright (C) 1990-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 @@ -51,11 +51,10 @@ usage (int status) printf (_("Usage: %s [OPTION]... NAME...\n"), program_name); fputs (_("\ Create named pipes (FIFOs) with the given NAMEs.\n\ -\n\ -"), stdout); - fputs (_("\ -Mandatory arguments to long options are mandatory for short options too.\n\ "), stdout); + + emit_mandatory_arg_note (); + fputs (_("\ -m, --mode=MODE set file permission bits to MODE, not a=rw - umask\n\ "), stdout); @@ -114,7 +113,7 @@ main (int argc, char **argv) _("failed to set default file creation context to %s"), quote (scontext)); - newmode = (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH); + newmode = MODE_RW_UGO; if (specified_mode) { struct mode_change *change = mode_compile (specified_mode); diff --git a/src/mknod.c b/src/mknod.c index 3a6d695a..7cfc708d 100644 --- a/src/mknod.c +++ b/src/mknod.c @@ -1,5 +1,5 @@ /* mknod -- make special files - Copyright (C) 1990-2012 Free Software Foundation, Inc. + Copyright (C) 1990-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 @@ -53,11 +53,10 @@ usage (int status) program_name); fputs (_("\ Create the special file NAME of the given TYPE.\n\ -\n\ -"), stdout); - fputs (_("\ -Mandatory arguments to long options are mandatory for short options too.\n\ "), stdout); + + emit_mandatory_arg_note (); + fputs (_("\ -m, --mode=MODE set file permission bits to MODE, not a=rw - umask\n\ "), stdout); @@ -120,7 +119,7 @@ main (int argc, char **argv) } } - newmode = (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH); + newmode = MODE_RW_UGO; if (specified_mode) { struct mode_change *change = mode_compile (specified_mode); diff --git a/src/mktemp.c b/src/mktemp.c index bab0c2bf..aef140af 100644 --- a/src/mktemp.c +++ b/src/mktemp.c @@ -1,5 +1,5 @@ /* Create a temporary file or directory, safely. - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 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 @@ -206,7 +206,8 @@ main (int argc, char **argv) case_GETOPT_HELP_CHAR; - case 'V': /* Undocumented alias. FIXME: remove in 2011. */ + case 'V': /* Undocumented alias, for compatibility with the original + mktemp program. */ case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (EXIT_FAILURE); diff --git a/src/mv.c b/src/mv.c index ee2f5a10..1cfcd82f 100644 --- a/src/mv.c +++ b/src/mv.c @@ -1,5 +1,5 @@ /* mv -- move or rename files - Copyright (C) 1986-2012 Free Software Foundation, Inc. + Copyright (C) 1986-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 @@ -73,6 +73,7 @@ static void rm_option_init (struct rm_options *x) { x->ignore_missing_files = false; + x->remove_empty_directories = true; x->recursive = true; x->one_file_system = false; @@ -117,6 +118,7 @@ cp_option_init (struct cp_options *x) x->preserve_links = true; x->preserve_mode = true; x->preserve_timestamps = true; + x->explicit_no_preserve_mode= false; x->preserve_security_context = selinux_enabled; x->reduce_diagnostics = false; x->data_copy_required = true; @@ -149,7 +151,7 @@ target_directory_operand (char const *file) int err = (stat (file, &st) == 0 ? 0 : errno); bool is_a_dir = !err && S_ISDIR (st.st_mode); if (err && err != ENOENT) - error (EXIT_FAILURE, err, _("accessing %s"), quote (file)); + error (EXIT_FAILURE, err, _("failed to access %s"), quote (file)); return is_a_dir; } @@ -289,11 +291,10 @@ Usage: %s [OPTION]... [-T] SOURCE DEST\n\ program_name, program_name, program_name); fputs (_("\ Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n\ -\n\ -"), stdout); - fputs (_("\ -Mandatory arguments to long options are mandatory for short options too.\n\ "), stdout); + + emit_mandatory_arg_note (); + fputs (_("\ --backup[=CONTROL] make a backup of each existing destination file\ \n\ @@ -396,7 +397,8 @@ main (int argc, char **argv) { struct stat st; if (stat (optarg, &st) != 0) - error (EXIT_FAILURE, errno, _("accessing %s"), quote (optarg)); + 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)); diff --git a/src/nice.c b/src/nice.c index 1a90320e..04fd3bf6 100644 --- a/src/nice.c +++ b/src/nice.c @@ -1,5 +1,5 @@ /* nice -- run a program with modified niceness - Copyright (C) 1990-2012 Free Software Foundation, Inc. + Copyright (C) 1990-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 @@ -72,12 +72,16 @@ usage (int status) printf (_("Usage: %s [OPTION] [COMMAND [ARG]...]\n"), program_name); printf (_("\ Run COMMAND with an adjusted niceness, which affects process scheduling.\n\ -With no COMMAND, print the current niceness. Nicenesses range from\n\ -%d (most favorable scheduling) to %d (least favorable).\n\ -\n\ - -n, --adjustment=N add integer N to the niceness (default 10)\n\ +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\ "), - NZERO, NZERO - 1); + + emit_mandatory_arg_note (); + + fputs (_("\ + -n, --adjustment=N add integer N to the niceness (default 10)\n\ +"), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME); diff --git a/src/nl.c b/src/nl.c index 21d4c4d9..96716aa1 100644 --- a/src/nl.c +++ b/src/nl.c @@ -1,5 +1,5 @@ /* nl -- number lines of files - Copyright (C) 1989-2012 Free Software Foundation, Inc. + Copyright (C) 1989-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 @@ -145,11 +145,6 @@ static intmax_t line_no; /* True if we have ever read standard input. */ static bool have_read_stdin; -enum -{ - PAGE_INCREMENT_OPTION_DEPRECATED = CHAR_MAX + 1 -}; - static struct option const longopts[] = { {"header-numbering", required_argument, NULL, 'h'}, @@ -157,8 +152,6 @@ static struct option const longopts[] = {"footer-numbering", required_argument, NULL, 'f'}, {"starting-line-number", required_argument, NULL, 'v'}, {"line-increment", required_argument, NULL, 'i'}, - /* FIXME: page-increment is deprecated, remove in dec-2011. */ - {"page-increment", required_argument, NULL, PAGE_INCREMENT_OPTION_DEPRECATED}, {"no-renumber", no_argument, NULL, 'p'}, {"join-blank-lines", required_argument, NULL, 'l'}, {"number-separator", required_argument, NULL, 's'}, @@ -186,11 +179,10 @@ Usage: %s [OPTION]... [FILE]...\n\ fputs (_("\ Write each FILE to standard output, with line numbers added.\n\ With no FILE, or when FILE is -, read standard input.\n\ -\n\ -"), stdout); - fputs (_("\ -Mandatory arguments to long options are mandatory for short options too.\n\ "), stdout); + + emit_mandatory_arg_note (); + fputs (_("\ -b, --body-numbering=STYLE use STYLE for numbering body lines\n\ -d, --section-delimiter=CC use CC for separating logical pages\n\ @@ -513,10 +505,6 @@ main (int argc, char **argv) ok = false; } break; - case PAGE_INCREMENT_OPTION_DEPRECATED: - error (0, 0, _("WARNING: --page-increment is deprecated; " - "use --line-increment instead")); - /* fall through */ case 'i': if (! (xstrtoimax (optarg, NULL, 10, &page_incr, "") == LONGINT_OK && 0 < page_incr)) diff --git a/src/nohup.c b/src/nohup.c index f46ab1eb..075c4cda 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-2012 Free Software Foundation, Inc. + 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 diff --git a/src/nproc.c b/src/nproc.c index a93ee536..5bd6610d 100644 --- a/src/nproc.c +++ b/src/nproc.c @@ -1,5 +1,5 @@ /* nproc - print the number of processors. - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 @@ -24,6 +24,7 @@ #include "system.h" #include "error.h" #include "nproc.h" +#include "quote.h" #include "xstrtol.h" /* The official name of this program (e.g., no 'g' prefix). */ @@ -113,6 +114,12 @@ main (int argc, char **argv) } } + if (argc != optind) + { + error (0, 0, _("extra operand %s"), quote (argv[optind])); + usage (EXIT_FAILURE); + } + nproc = num_processors (mode); if (ignore < nproc) diff --git a/src/numfmt.c b/src/numfmt.c new file mode 100644 index 00000000..8c21c2b3 --- /dev/null +++ b/src/numfmt.c @@ -0,0 +1,1527 @@ +/* Reformat numbers like 11505426432 to the more human-readable 11G + Copyright (C) 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 + 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 <float.h> +#include <getopt.h> +#include <stdio.h> +#include <sys/types.h> +#include <langinfo.h> + +#include "mbsalign.h" +#include "argmatch.h" +#include "error.h" +#include "quote.h" +#include "system.h" +#include "xstrtol.h" +#include "xstrndup.h" + +/* The official name of this program (e.g., no 'g' prefix). */ +#define PROGRAM_NAME "numfmt" + +#define AUTHORS proper_name ("Assaf Gordon") + +/* Exit code when some numbers fail to convert. */ +enum { EXIT_CONVERSION_WARNINGS = 2 }; + +enum +{ + FROM_OPTION = CHAR_MAX + 1, + FROM_UNIT_OPTION, + TO_OPTION, + TO_UNIT_OPTION, + ROUND_OPTION, + SUFFIX_OPTION, + GROUPING_OPTION, + PADDING_OPTION, + FIELD_OPTION, + DEBUG_OPTION, + DEV_DEBUG_OPTION, + HEADER_OPTION, + FORMAT_OPTION, + INVALID_OPTION +}; + +enum scale_type +{ + scale_none, /* the default: no scaling. */ + scale_auto, /* --from only. */ + scale_SI, + scale_IEC, + scale_IEC_I /* 'i' suffix is required. */ +}; + +static char const *const scale_from_args[] = +{ + "none", "auto", "si", "iec", "iec-i", NULL +}; + +static enum scale_type const scale_from_types[] = +{ + scale_none, scale_auto, scale_SI, scale_IEC, scale_IEC_I +}; + +static char const *const scale_to_args[] = +{ + "none", "si", "iec", "iec-i", NULL +}; + +static enum scale_type const scale_to_types[] = +{ + scale_none, scale_SI, scale_IEC, scale_IEC_I +}; + + +enum round_type +{ + round_ceiling, + round_floor, + round_from_zero, + round_to_zero, + round_nearest, +}; + +static char const *const round_args[] = +{ + "up", "down", "from-zero", "towards-zero", "nearest", NULL +}; + +static enum round_type const round_types[] = +{ + round_ceiling, round_floor, round_from_zero, round_to_zero, round_nearest +}; + + +enum inval_type +{ + inval_abort, + inval_fail, + inval_warn, + inval_ignore +}; + +static char const *const inval_args[] = +{ + "abort", "fail", "warn", "ignore", NULL +}; + +static enum inval_type const inval_types[] = +{ + inval_abort, inval_fail, inval_warn, inval_ignore +}; + +static struct option const longopts[] = +{ + {"from", required_argument, NULL, FROM_OPTION}, + {"from-unit", required_argument, NULL, FROM_UNIT_OPTION}, + {"to", required_argument, NULL, TO_OPTION}, + {"to-unit", required_argument, NULL, TO_UNIT_OPTION}, + {"round", required_argument, NULL, ROUND_OPTION}, + {"padding", required_argument, NULL, PADDING_OPTION}, + {"suffix", required_argument, NULL, SUFFIX_OPTION}, + {"grouping", no_argument, NULL, GROUPING_OPTION}, + {"delimiter", required_argument, NULL, 'd'}, + {"field", required_argument, NULL, FIELD_OPTION}, + {"debug", no_argument, NULL, DEBUG_OPTION}, + {"-debug", no_argument, NULL, DEV_DEBUG_OPTION}, + {"header", optional_argument, NULL, HEADER_OPTION}, + {"format", required_argument, NULL, FORMAT_OPTION}, + {"invalid", required_argument, NULL, INVALID_OPTION}, + {GETOPT_HELP_OPTION_DECL}, + {GETOPT_VERSION_OPTION_DECL}, + {NULL, 0, NULL, 0} +}; + +/* If delimiter has this value, blanks separate fields. */ +enum { DELIMITER_DEFAULT = CHAR_MAX + 1 }; + +/* Maximum number of digits we can safely handle + without precision loss, if scaling is 'none'. */ +enum { MAX_UNSCALED_DIGITS = 18 }; + +/* Maximum number of digits we can work with. + This is equivalent to 999Y. + NOTE: 'long double' can handle more than that, but there's + no official suffix assigned beyond Yotta (1000^8). */ +enum { MAX_ACCEPTABLE_DIGITS = 27 }; + +static enum scale_type scale_from = scale_none; +static enum scale_type scale_to = scale_none; +static enum round_type _round = round_from_zero; +static enum inval_type _invalid = inval_abort; +static const char *suffix = NULL; +static uintmax_t from_unit_size = 1; +static uintmax_t to_unit_size = 1; +static int grouping = 0; +static char *padding_buffer = NULL; +static size_t padding_buffer_size = 0; +static long int padding_width = 0; +static const char *format_str = NULL; +static char *format_str_prefix = NULL; +static char *format_str_suffix = NULL; + +/* By default, any conversion error will terminate the program. */ +static int conv_exit_code = EXIT_CONVERSION_WARNINGS; + + +/* auto-pad each line based on skipped whitespace. */ +static int auto_padding = 0; +static mbs_align_t padding_alignment = MBS_ALIGN_RIGHT; +static long int field = 1; +static int delimiter = DELIMITER_DEFAULT; + +/* if non-zero, the first 'header' lines from STDIN are skipped. */ +static uintmax_t header = 0; + +/* Debug for users: print warnings to STDERR about possible + error (similar to sort's debug). */ +static bool debug; + +/* will be set according to the current locale. */ +static const char *decimal_point; +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) +{ + switch (scale) + { + case scale_IEC: + case scale_IEC_I: + return 1024; + + case scale_none: + case scale_auto: + case scale_SI: + default: + return 1000; + } +} + +static inline int +valid_suffix (const char suf) +{ + static const char *valid_suffixes = "KMGTPEZY"; + return (strchr (valid_suffixes, suf) != NULL); +} + +static inline int +suffix_power (const char suf) +{ + switch (suf) + { + case 'K': /* kilo or kibi. */ + return 1; + + case 'M': /* mega or mebi. */ + return 2; + + case 'G': /* giga or gibi. */ + return 3; + + case 'T': /* tera or tebi. */ + return 4; + + case 'P': /* peta or pebi. */ + return 5; + + case 'E': /* exa or exbi. */ + return 6; + + case 'Z': /* zetta or 2**70. */ + return 7; + + case 'Y': /* yotta or 2**80. */ + return 8; + + default: /* should never happen. assert? */ + return 0; + } +} + +static inline const char * +suffix_power_character (unsigned int power) +{ + switch (power) + { + case 0: + return ""; + + case 1: + return "K"; + + case 2: + return "M"; + + case 3: + return "G"; + + case 4: + return "T"; + + case 5: + return "P"; + + case 6: + return "E"; + + case 7: + return "Z"; + + case 8: + return "Y"; + + default: + return "(error)"; + } +} + +/* Similar to 'powl(3)' but without requiring 'libm'. */ +static long double +powerld (long double base, unsigned int x) +{ + long double result = base; + if (x == 0) + return 1; /* note for test coverage: this is never + reached, as 'powerld' won't be called if + there's no suffix, hence, no "power". */ + + /* TODO: check for overflow, inf? */ + while (--x) + result *= base; + return result; +} + +/* Similar to 'fabs(3)' but without requiring 'libm'. */ +static inline long double +absld (long double val) +{ + return val < 0 ? -val : val; +} + +/* Scale down 'val', returns 'updated val' and 'x', such that + val*base^X = original val + Similar to "frexpl(3)" but without requiring 'libm', + allowing only integer scale, limited functionality and error checking. */ +static long double +expld (long double val, unsigned int base, unsigned int /*output */ *x) +{ + unsigned int power = 0; + + if (val >= -LDBL_MAX && val <= LDBL_MAX) + { + while (absld (val) >= base) + { + ++power; + val /= base; + } + } + if (x) + *x = power; + return val; +} + +/* EXTREMELY limited 'ceil' - without 'libm'. + Assumes values that fit in intmax_t. */ +static inline intmax_t +simple_round_ceiling (long double val) +{ + intmax_t intval = val; + if (intval < val) + intval++; + return intval; +} + +/* EXTREMELY limited 'floor' - without 'libm'. + Assumes values that fit in intmax_t. */ +static inline intmax_t +simple_round_floor (long double val) +{ + return -simple_round_ceiling (-val); +} + +/* EXTREMELY limited 'round away from zero'. + Assumes values that fit in intmax_t. */ +static inline intmax_t +simple_round_from_zero (long double val) +{ + return val < 0 ? simple_round_floor (val) : simple_round_ceiling (val); +} + +/* EXTREMELY limited 'round away to zero'. + Assumes values that fit in intmax_t. */ +static inline intmax_t +simple_round_to_zero (long double val) +{ + return val; +} + +/* EXTREMELY limited 'round' - without 'libm'. + Assumes values that fit in intmax_t. */ +static inline intmax_t +simple_round_nearest (long double val) +{ + return val < 0 ? val - 0.5 : val + 0.5; +} + +static inline intmax_t +simple_round (long double val, enum round_type t) +{ + switch (t) + { + case round_ceiling: + return simple_round_ceiling (val); + + case round_floor: + return simple_round_floor (val); + + case round_from_zero: + return simple_round_from_zero (val); + + case round_to_zero: + return simple_round_to_zero (val); + + case round_nearest: + return simple_round_nearest (val); + + default: + /* to silence the compiler - this should never happen. */ + return 0; + } +} + +enum simple_strtod_error +{ + SSE_OK = 0, + SSE_OK_PRECISION_LOSS, + SSE_OVERFLOW, + SSE_INVALID_NUMBER, + + /* the following are returned by 'simple_strtod_human'. */ + SSE_VALID_BUT_FORBIDDEN_SUFFIX, + SSE_INVALID_SUFFIX, + SSE_MISSING_I_SUFFIX +}; + +/* Read an *integer* INPUT_STR, + but return the integer value in a 'long double' VALUE + hence, no UINTMAX_MAX limitation. + NEGATIVE is updated, and is stored separately from the VALUE + so that signbit() isn't required to determine the sign of -0.. + ENDPTR is required (unlike strtod) and is used to store a pointer + to the character after the last character used in the conversion. + + Note locale'd grouping is not supported, + nor is skipping of white-space supported. + + Returns: + SSE_OK - valid number. + SSE_OK_PRECISION_LOSS - if more than 18 digits were used. + SSE_OVERFLOW - if more than 27 digits (999Y) were used. + SSE_INVALID_NUMBER - if no digits were found. */ +static enum simple_strtod_error +simple_strtod_int (const char *input_str, + char **endptr, long double *value, bool *negative) +{ + enum simple_strtod_error e = SSE_OK; + + long double val = 0; + unsigned int digits = 0; + + if (*input_str == '-') + { + input_str++; + *negative = true; + } + else + *negative = false; + + *endptr = (char *) input_str; + while (*endptr && 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; + + ++digits; + if (digits > MAX_ACCEPTABLE_DIGITS) + return SSE_OVERFLOW; + + val *= 10; + val += digit; + + ++(*endptr); + } + if (digits == 0) + return SSE_INVALID_NUMBER; + if (*negative) + val = -val; + + if (value) + *value = val; + + return e; +} + +/* Read a floating-point INPUT_STR represented as "NNNN[.NNNNN]", + and return the value in a 'long double' VALUE. + ENDPTR is required (unlike strtod) and is used to store a pointer + to the character after the last character used in the conversion. + PRECISION is optional and used to indicate fractions are present. + + Note locale'd grouping is not supported, + nor is skipping of white-space supported. + + Returns: + SSE_OK - valid number. + SSE_OK_PRECISION_LOSS - if more than 18 digits were used. + SSE_OVERFLOW - if more than 27 digits (999Y) were used. + SSE_INVALID_NUMBER - if no digits were found. */ +static enum simple_strtod_error +simple_strtod_float (const char *input_str, + char **endptr, + long double *value, + size_t *precision) +{ + bool negative; + enum simple_strtod_error e = SSE_OK; + + if (precision) + *precision = 0; + + /* TODO: accept locale'd grouped values for the integral part. */ + e = simple_strtod_int (input_str, endptr, value, &negative); + if (e != SSE_OK && e != SSE_OK_PRECISION_LOSS) + return e; + + + /* optional decimal point + fraction. */ + if (STREQ_LEN (*endptr, decimal_point, decimal_point_length)) + { + char *ptr2; + long double val_frac = 0; + bool neg_frac; + + (*endptr) += decimal_point_length; + enum simple_strtod_error e2 = + simple_strtod_int (*endptr, &ptr2, &val_frac, &neg_frac); + if (e2 != SSE_OK && e2 != SSE_OK_PRECISION_LOSS) + return e2; + if (e2 == SSE_OK_PRECISION_LOSS) + e = e2; /* propagate warning. */ + if (neg_frac) + return SSE_INVALID_NUMBER; + + /* number of digits in the fractions. */ + size_t exponent = ptr2 - *endptr; + + val_frac = ((long double) val_frac) / powerld (10, exponent); + + if (value) + { + if (negative) + *value -= val_frac; + else + *value += val_frac; + } + + if (precision) + *precision = exponent; + + *endptr = ptr2; + } + return e; +} + +/* Read a 'human' INPUT_STR represented as "NNNN[.NNNNN] + suffix", + and return the value in a 'long double' VALUE, + with the precision of the input returned in PRECISION. + ENDPTR is required (unlike strtod) and is used to store a pointer + to the character after the last character used in the conversion. + ALLOWED_SCALING determines the scaling supported. + + TODO: + support locale'd grouping + accept scentific and hex floats (probably use strtold directly) + + Returns: + SSE_OK - valid number. + SSE_OK_PRECISION_LOSS - if more than 18 digits were used. + SSE_OVERFLOW - if more than 27 digits (999Y) were used. + SSE_INVALID_NUMBER - if no digits were found. + SSE_VALID_BUT_FORBIDDEN_SUFFIX + SSE_INVALID_SUFFIX + SSE_MISSING_I_SUFFIX */ +static enum simple_strtod_error +simple_strtod_human (const char *input_str, + char **endptr, long double *value, size_t *precision, + enum scale_type allowed_scaling) +{ + int power = 0; + /* '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); + + enum simple_strtod_error e = + simple_strtod_float (input_str, endptr, value, precision); + if (e != SSE_OK && e != SSE_OK_PRECISION_LOSS) + return e; + + devmsg (" parsed numeric value: %Lf\n" + " input precision = %d\n", *value, (int)*precision); + + if (**endptr != '\0') + { + /* process suffix. */ + + /* Skip any blanks between the number and suffix. */ + while (isblank (**endptr)) + (*endptr)++; + + if (!valid_suffix (**endptr)) + return SSE_INVALID_SUFFIX; + + if (allowed_scaling == scale_none) + return SSE_VALID_BUT_FORBIDDEN_SUFFIX; + + power = suffix_power (**endptr); + (*endptr)++; /* skip first suffix character. */ + + if (allowed_scaling == scale_auto && **endptr == 'i') + { + /* auto-scaling enabled, and the first suffix character + is followed by an 'i' (e.g. Ki, Mi, Gi). */ + scale_base = 1024; + (*endptr)++; /* skip second ('i') suffix character. */ + devmsg (" Auto-scaling, found 'i', switching to base %d\n", + scale_base); + } + + *precision = 0; /* Reset, to select precision based on scale. */ + } + + if (allowed_scaling == scale_IEC_I) + { + if (**endptr == 'i') + (*endptr)++; + else + return SSE_MISSING_I_SUFFIX; + } + + long double multiplier = powerld (scale_base, power); + + devmsg (" suffix power=%d^%d = %Lf\n", scale_base, power, multiplier); + + /* TODO: detect loss of precision and overflows. */ + (*value) = (*value) * multiplier; + + devmsg (" returning value: %Lf (%LG)\n", *value, *value); + + return e; +} + + +static void +simple_strtod_fatal (enum simple_strtod_error err, char const *input_str) +{ + char const *msgid = NULL; + + switch (err) + { + case SSE_OK_PRECISION_LOSS: + case SSE_OK: + /* should never happen - this function isn't called when OK. */ + abort (); + + case SSE_OVERFLOW: + msgid = N_("value too large to be converted: '%s'"); + break; + + case SSE_INVALID_NUMBER: + msgid = N_("invalid number: '%s'"); + break; + + case SSE_VALID_BUT_FORBIDDEN_SUFFIX: + msgid = N_("rejecting suffix in input: '%s' (consider using --from)"); + break; + + case SSE_INVALID_SUFFIX: + 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)"); + break; + + } + + if (_invalid != inval_ignore) + error (conv_exit_code, 0, gettext (msgid), input_str); +} + +/* Convert VAL to a human format string in BUF. */ +static void +double_to_human (long double val, int precision, + char *buf, size_t buf_size, + enum scale_type scale, int group, enum round_type round) +{ + devmsg ("double_to_human:\n"); + + if (scale == scale_none) + { + val *= powerld (10, precision); + val = simple_round (val, round); + val /= powerld (10, precision); + + devmsg ((group) ? + " 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) + error (EXIT_FAILURE, 0, + _("failed to prepare value '%Lf' for printing"), val); + return; + } + + /* Scaling requested by user. */ + double scale_base = default_scale_base (scale); + + /* Normalize val to scale. */ + unsigned int power = 0; + val = expld (val, scale_base, &power); + devmsg (" scaled value to %Lf * %0.f ^ %d\n", val, scale_base, power); + + /* Perform rounding. */ + int ten_or_less = 0; + if (absld (val) < 10) + { + /* for values less than 10, we allow one decimal-point digit, + so adjust before rounding. */ + ten_or_less = 1; + val *= 10; + } + val = simple_round (val, round); + /* two special cases after rounding: + 1. a "999.99" can turn into 1000 - so scale down + 2. a "9.99" can turn into 10 - so don't display decimal-point. */ + if (absld (val) >= scale_base) + { + val /= scale_base; + power++; + } + if (ten_or_less) + val /= 10; + + /* should "7.0" be printed as "7" ? + if removing the ".0" is preferred, enable the fourth condition. */ + int show_decimal_point = (val != 0) && (absld (val) < 10) && (power > 0); + /* && (absld (val) > simple_round_floor (val))) */ + + 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)); + + if (scale == scale_IEC_I && power > 0) + strncat (buf, "i", buf_size - strlen (buf) - 1); + + devmsg (" returning value: '%s'\n", buf); + + return; +} + +/* Convert a string of decimal digits, N_STRING, with an optional suffix + to an integral value. Upon successful conversion, return that value. + If it cannot be converted, give a diagnostic and exit. */ +static uintmax_t +unit_to_umax (const char *n_string) +{ + strtol_error s_err; + char *end = NULL; + uintmax_t n; + + 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); + + return n; +} + + +static void +setup_padding_buffer (size_t min_size) +{ + if (padding_buffer_size > 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); +} + +void +usage (int status) +{ + if (status != EXIT_SUCCESS) + emit_try_help (); + else + { + printf (_("\ +Usage: %s [OPTION]... [NUMBER]...\n\ +"), program_name); + fputs (_("\ +Reformat NUMBER(s), or the numbers from standard input if none are specified.\n\ +"), stdout); + emit_mandatory_arg_note (); + fputs (_("\ + --debug print warnings about invalid input\n\ +"), stdout); + fputs (_("\ + -d, --delimiter=X use X instead of whitespace for field delimiter\n\ +"), stdout); + fputs (_("\ + --field=N replace the number in input field N (default is 1)\n\ +"), stdout); + fputs (_("\ + --format=FORMAT use printf style floating-point FORMAT;\n\ + see FORMAT below for details\n\ +"), stdout); + fputs (_("\ + --from=UNIT auto-scale input numbers to UNITs; default is 'none';\n\ + see UNIT below\n\ +"), stdout); + fputs (_("\ + --from-unit=N specify the input unit size (instead of the default 1)\n\ +"), stdout); + fputs (_("\ + --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\ +"), stdout); + fputs (_("\ + --header[=N] print (without converting) the first N header lines;\n\ + N defaults to 1 if not specified\n\ +"), stdout); + fputs (_("\ + --invalid=MODE failure mode for invalid numbers: MODE can be:\n\ + abort (default), fail, warn, ignore\n\ +"), stdout); + fputs (_("\ + --padding=N pad the output to N characters; positive N will\n\ + right-align; negative N will left-align;\n\ + padding is ignored if the output is wider than N;\n\ + the default is to automatically pad if a whitespace\n\ + is found\n\ +"), stdout); + fputs (_("\ + --round=METHOD use METHOD for rounding when scaling; METHOD can be:\n\ + up, down, from-zero (default), towards-zero, nearest\n\ +"), stdout); + fputs (_("\ + --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n\ + SUFFIX in input numbers\n\ +"), stdout); + fputs (_("\ + --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n\ +"), stdout); + fputs (_("\ + --to-unit=N the output unit size (instead of the default 1)\n\ +"), stdout); + + fputs (HELP_OPTION_DESCRIPTION, stdout); + fputs (VERSION_OPTION_DESCRIPTION, stdout); + + fputs (_("\ +\n\ +UNIT options:\n"), stdout); + fputs (_("\ + none no auto-scaling is done; suffixes will trigger an error\n\ +"), stdout); + fputs (_("\ + auto accept optional single/two letter suffix:\n\ + 1K = 1000,\n\ + 1Ki = 1024,\n\ + 1M = 1000000,\n\ + 1Mi = 1048576,\n"), stdout); + fputs (_("\ + si accept optional single letter suffix:\n\ + 1K = 1000,\n\ + 1M = 1000000,\n\ + ...\n"), stdout); + fputs (_("\ + iec accept optional single letter suffix:\n\ + 1K = 1024,\n\ + 1M = 1048576,\n\ + ...\n"), stdout); + fputs (_("\ + iec-i accept optional two-letter suffix:\n\ + 1Ki = 1024,\n\ + 1Mi = 1048576,\n\ + ...\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\ +"), stdout); + + printf (_("\n\ +Exit status is 0 if all input numbers were successfully converted.\n\ +By default, %s will stop at the first conversion error with exit status 2.\n\ +With --invalid='fail' a warning is printed for each conversion error\n\ +and the exit status is 2. With --invalid='warn' each conversion error is\n\ +diagnosed, but the exit status is 0. With --invalid='ignore' conversion\n\ +errors are not diagnosed and the exit status is 0.\n\ +"), program_name); + + printf (_("\n\ +Examples:\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"), + program_name, program_name, program_name, + program_name, program_name, program_name, + program_name, program_name, program_name); + emit_ancillary_info (); + } + exit (status); +} + +/* Given 'fmt' (a printf(3) compatible format string), extracts the following: + 1. padding (e.g. %20f) + 2. alignment (e.g. %-20f) + 3. grouping (e.g. %'f) + + Only a limited subset of printf(3) syntax is supported. + + TODO: + support .precision + support %e %g etc. rather than just %f + + NOTES: + 1. This function sets the global variables: + padding_width, padding_alignment, grouping, + format_str_prefix, format_str_suffix + 2. The function aborts on any errors. */ +static void +parse_format_string (char const *fmt) +{ + size_t i; + size_t prefix_len = 0; + size_t suffix_pos; + long int pad = 0; + char *endptr = NULL; + + for (i = 0; !(fmt[i] == '%' && fmt[i + 1] != '%'); i += (fmt[i] == '%') + 1) + { + if (!fmt[i]) + error (EXIT_FAILURE, 0, + _("format %s has no %% directive"), quote (fmt)); + prefix_len++; + } + + i++; + i += strspn (fmt + i, " "); + if (fmt[i] == '\'') + { + grouping = 1; + i++; + } + i += strspn (fmt + i, " "); + errno = 0; + pad = strtol (fmt + i, &endptr, 10); + if (errno == ERANGE) + error (EXIT_FAILURE, 0, + _("invalid format %s (width overflow)"), quote (fmt)); + + if (endptr != (fmt + i) && pad != 0) + { + if (pad < 0) + { + padding_alignment = MBS_ALIGN_LEFT; + padding_width = -pad; + } + else + { + padding_width = pad; + } + } + i = endptr - fmt; + + if (fmt[i] == '\0') + error (EXIT_FAILURE, 0, _("format %s ends in %%"), quote (fmt)); + + if (fmt[i] != 'f') + error (EXIT_FAILURE, 0, _("invalid format %s," + " directive must be %%['][-][N]f"), + quote (fmt)); + i++; + suffix_pos = i; + + for (; fmt[i] != '\0'; i += (fmt[i] == '%') + 1) + if (fmt[i] == '%' && fmt[i + 1] != '%') + error (EXIT_FAILURE, 0, _("format %s has too many %% directives"), + 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); + } + 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)); + } + + 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", + padding_width, + (padding_alignment == MBS_ALIGN_LEFT) ? "Left" : "Right", + format_str_prefix, format_str_suffix); +} + +/* Parse a numeric value (with optional suffix) from a string. + Returns a long double value, with input precision. + + If there's an error converting the string to value - exits with + an error. + + If there are any trailing characters after the number + (besides a valid suffix) - exits with an error. */ +static enum simple_strtod_error +parse_human_number (const char *str, long double /*output */ *value, + size_t *precision) +{ + char *ptr = NULL; + + enum simple_strtod_error e = + simple_strtod_human (str, &ptr, value, precision, scale_from); + if (e != SSE_OK && e != SSE_OK_PRECISION_LOSS) + { + simple_strtod_fatal (e, str); + return e; + } + + if (ptr && *ptr != '\0') + { + if (_invalid != inval_ignore) + error (conv_exit_code, 0, _("invalid suffix in input '%s': '%s'"), + str, ptr); + e = SSE_INVALID_SUFFIX; + } + return e; +} + + +/* Print the given VAL, using the requested representation. + The number is printed to STDOUT, with padding and alignment. */ +static int +prepare_padded_number (const long double val, size_t precision) +{ + /* Generate Output. */ + char buf[128]; + + /* Can't reliably print too-large values without auto-scaling. */ + unsigned int x; + expld (val, 10, &x); + if (scale_to == scale_none && x > MAX_UNSCALED_DIGITS) + { + if (_invalid != inval_ignore) + error (conv_exit_code, 0, _("value too large to be printed: '%Lg'" + " (consider using --to)"), val); + return 0; + } + + if (x > MAX_ACCEPTABLE_DIGITS - 1) + { + if (_invalid != inval_ignore) + error (conv_exit_code, 0, _("value too large to be printed: '%Lg'" + " (cannot handle values > 999Y)"), val); + return 0; + } + + double_to_human (val, precision, buf, sizeof (buf), scale_to, grouping, + _round); + if (suffix) + strncat (buf, suffix, sizeof (buf) - strlen (buf) -1); + + devmsg ("formatting output:\n value: %Lf\n humanized: '%s'\n", val, buf); + + if (padding_width && strlen (buf) < padding_width) + { + size_t w = padding_width; + mbsalign (buf, padding_buffer, padding_buffer_size, &w, + padding_alignment, MBA_UNIBYTE_ONLY); + + devmsg (" After padding: '%s'\n", padding_buffer); + } + else + { + setup_padding_buffer (strlen (buf) + 1); + strcpy (padding_buffer, buf); + } + + return 1; +} + +static void +print_padded_number (void) +{ + if (format_str_prefix) + fputs (format_str_prefix, stdout); + + fputs (padding_buffer, stdout); + + if (format_str_suffix) + fputs (format_str_suffix, stdout); +} + +/* Converts the TEXT number string to the requested representation, + and handles automatic suffix addition. */ +static int +process_suffixed_number (char *text, long double *result, size_t *precision) +{ + if (suffix && strlen (text) > strlen (suffix)) + { + char *possible_suffix = text + strlen (text) - strlen (suffix); + + if (STREQ (suffix, possible_suffix)) + { + /* trim suffix, ONLY if it's at the end of the text. */ + *possible_suffix = '\0'; + devmsg ("trimming suffix '%s'\n", suffix); + } + else + devmsg ("no valid suffix found\n"); + } + + /* Skip white space - always. */ + char *p = text; + while (*p && isblank (*p)) + ++p; + const unsigned int skip_count = text - p; + + /* setup auto-padding. */ + if (auto_padding) + { + if (skip_count > 0 || field > 1) + { + padding_width = strlen (text); + setup_padding_buffer (padding_width); + } + else + { + padding_width = 0; + } + devmsg ("setting Auto-Padding to %ld characters\n", padding_width); + } + + 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); + + if (from_unit_size != 1 || to_unit_size != 1) + val = (val * from_unit_size) / to_unit_size; + + *result = val; + + return (e == SSE_OK || e == SSE_OK_PRECISION_LOSS); +} + +/* 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)) +skip_fields (char *buf, int fields) +{ + char *ptr = buf; + if (delimiter != DELIMITER_DEFAULT) + { + if (*ptr == delimiter) + fields--; + while (*ptr && fields--) + { + while (*ptr && *ptr == delimiter) + ++ptr; + while (*ptr && *ptr != delimiter) + ++ptr; + } + } + else + while (*ptr && fields--) + { + while (*ptr && isblank (*ptr)) + ++ptr; + while (*ptr && !isblank (*ptr)) + ++ptr; + } + return ptr; +} + +/* Parse a delimited string, and extracts the requested field. + NOTE: the input buffer is modified. + + TODO: + Maybe support multiple fields, though can always pipe output + into another numfmt to process other fields. + Maybe default to processing all fields rather than just first? + + Output: + _PREFIX, _DATA, _SUFFIX will point to the relevant positions + in the input string, or be NULL if such a part doesn't exist. */ +static void +extract_fields (char *line, int _field, + char ** _prefix, char ** _data, char ** _suffix) +{ + char *ptr = line; + *_prefix = NULL; + *_data = NULL; + *_suffix = NULL; + + devmsg ("extracting Fields:\n input: '%s'\n field: %d\n", line, _field); + + if (field > 1) + { + /* skip the requested number of fields. */ + *_prefix = line; + ptr = skip_fields (line, field - 1); + if (*ptr == '\0') + { + /* not enough fields in the input - print warning? */ + devmsg (" TOO FEW FIELDS!\n prefix: '%s'\n", *_prefix); + return; + } + + *ptr = '\0'; + ++ptr; + } + + *_data = ptr; + *_suffix = skip_fields (*_data, 1); + if (**_suffix) + { + /* there is a suffix (i.e. the field is not the last on the line), + so null-terminate the _data before it. */ + **_suffix = '\0'; + ++(*_suffix); + } + else + *_suffix = NULL; + + devmsg (" prefix: '%s'\n number: '%s'\n suffix: '%s'\n", + *_prefix, *_data, *_suffix); +} + + +/* Convert a number in a given line of text. + NEWLINE specifies whether to output a '\n' for this "line". */ +static int +process_line (char *line, bool newline) +{ + char *pre, *num, *suf; + long double val = 0; + size_t precision = 0; + int valid_number = 0; + + extract_fields (line, field, &pre, &num, &suf); + if (!num) + if (_invalid != inval_ignore) + error (conv_exit_code, 0, _("input line is too short, " + "no numbers found to convert in field %ld"), + field); + + if (num) + { + valid_number = process_suffixed_number (num, &val, &precision); + if (valid_number) + valid_number = prepare_padded_number (val, precision); + } + + if (pre) + fputs (pre, stdout); + + if (pre && num) + fputc ((delimiter == DELIMITER_DEFAULT) ? ' ' : delimiter, stdout); + + if (valid_number) + { + print_padded_number (); + } + else + { + if (num) + fputs (num, stdout); + } + + if (suf) + { + fputc ((delimiter == DELIMITER_DEFAULT) ? ' ' : delimiter, stdout); + fputs (suf, stdout); + } + + if (newline) + putchar ('\n'); + + return valid_number; +} + +int +main (int argc, char **argv) +{ + int valid_numbers = 1; + + initialize_main (&argc, &argv); + set_program_name (argv[0]); + setlocale (LC_ALL, ""); + bindtextdomain (PACKAGE, LOCALEDIR); + textdomain (PACKAGE); + + decimal_point = nl_langinfo (RADIXCHAR); + if (decimal_point == NULL || strlen (decimal_point) == 0) + decimal_point = "."; + decimal_point_length = strlen (decimal_point); + + atexit (close_stdout); + + while (true) + { + int c = getopt_long (argc, argv, "d:", longopts, NULL); + + if (c == -1) + break; + + switch (c) + { + case FROM_OPTION: + scale_from = XARGMATCH ("--from", optarg, + scale_from_args, scale_from_types); + break; + + case FROM_UNIT_OPTION: + from_unit_size = unit_to_umax (optarg); + break; + + case TO_OPTION: + scale_to = + XARGMATCH ("--to", optarg, scale_to_args, scale_to_types); + break; + + case TO_UNIT_OPTION: + to_unit_size = unit_to_umax (optarg); + break; + + case ROUND_OPTION: + _round = XARGMATCH ("--round", optarg, round_args, round_types); + break; + + case GROUPING_OPTION: + grouping = 1; + break; + + case PADDING_OPTION: + if (xstrtol (optarg, NULL, 10, &padding_width, "") != LONGINT_OK + || padding_width == 0) + error (EXIT_FAILURE, 0, _("invalid padding value '%s'"), optarg); + if (padding_width < 0) + { + padding_alignment = MBS_ALIGN_LEFT; + padding_width = -padding_width; + } + /* TODO: We probably want to apply a specific --padding + to --header lines too. */ + break; + + case FIELD_OPTION: + if (xstrtol (optarg, NULL, 10, &field, "") != LONGINT_OK + || field <= 0) + error (EXIT_FAILURE, 0, _("invalid field value '%s'"), optarg); + break; + + case 'd': + /* Interpret -d '' to mean 'use the NUL byte as the delimiter.' */ + if (optarg[0] != '\0' && optarg[1] != '\0') + error (EXIT_FAILURE, 0, + _("the delimiter must be a single character")); + delimiter = optarg[0]; + break; + + case SUFFIX_OPTION: + suffix = optarg; + break; + + case DEBUG_OPTION: + debug = true; + break; + + case DEV_DEBUG_OPTION: + dev_debug = true; + debug = true; + break; + + case HEADER_OPTION: + if (optarg) + { + if (xstrtoumax (optarg, NULL, 10, &header, "") != LONGINT_OK + || header == 0) + error (EXIT_FAILURE, 0, _("invalid header value '%s'"), + optarg); + } + else + { + header = 1; + } + break; + + case FORMAT_OPTION: + format_str = optarg; + break; + + case INVALID_OPTION: + _invalid = XARGMATCH ("--invalid", optarg, inval_args, inval_types); + break; + + case_GETOPT_HELP_CHAR; + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + + default: + usage (EXIT_FAILURE); + } + } + + 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 + && !grouping && (padding_width == 0) && (format_str == NULL)) + error (0, 0, _("no conversion option specified")); + + if (format_str) + parse_format_string (format_str); + + if (grouping) + { + if (scale_to != scale_none) + error (EXIT_FAILURE, 0, _("grouping cannot be combined with --to")); + if (debug && (strlen (nl_langinfo (THOUSEP)) == 0)) + error (0, 0, _("grouping has no effect in this locale")); + } + + + setup_padding_buffer (padding_width); + auto_padding = (padding_width == 0 && delimiter == DELIMITER_DEFAULT); + + if (_invalid != inval_abort) + conv_exit_code = 0; + + if (argc > optind) + { + if (debug && header) + error (0, 0, _("--header ignored with command-line input")); + + for (; optind < argc; optind++) + valid_numbers &= process_line (argv[optind], true); + } + else + { + char *line = NULL; + size_t line_allocated = 0; + ssize_t len; + + while (header-- && getline (&line, &line_allocated, stdin) > 0) + fputs (line, stdout); + + while ((len = getline (&line, &line_allocated, stdin)) > 0) + { + bool newline = line[len - 1] == '\n'; + if (newline) + line[len - 1] = '\0'; + valid_numbers &= process_line (line, newline); + } + + IF_LINT (free (line)); + + if (ferror (stdin)) + error (0, errno, _("error reading input")); + } + + free (padding_buffer); + free (format_str_prefix); + free (format_str_suffix); + + + if (debug && !valid_numbers) + error (0, 0, _("failed to convert some of the input numbers")); + + int exit_status = EXIT_SUCCESS; + if (!valid_numbers && _invalid != inval_warn && _invalid != inval_ignore) + exit_status = EXIT_CONVERSION_WARNINGS; + + exit (exit_status); +} diff --git a/src/od.c b/src/od.c index a25f9650..ffccd741 100644 --- a/src/od.c +++ b/src/od.c @@ -1,5 +1,5 @@ /* od -- dump files in octal and other formats - Copyright (C) 1992-2012 Free Software Foundation, Inc. + Copyright (C) 1992-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 @@ -305,24 +305,37 @@ With no FILE, or when FILE is -, read standard input.\n\ \n\ "), stdout); fputs (_("\ -All arguments to long options are mandatory for short options.\n\ +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\ +An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n\ +at first byte printed, incremented when dump is progressing.\n\ +For OFFSET and LABEL, a 0x or 0X prefix indicates hexadecimal;\n\ +suffixes may be . for octal and b for multiply by 512.\n\ "), stdout); + + emit_mandatory_arg_note (); + fputs (_("\ - -A, --address-radix=RADIX decide how file offsets are printed\n\ + -A, --address-radix=RADIX output format for file offsets. RADIX is one\n\ + of [doxn], for Decimal, Octal, Hex or None\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\n\ + -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\ - --traditional accept arguments in traditional form\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); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); fputs (_("\ \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\ @@ -339,17 +352,8 @@ Traditional format specifications may be intermixed; they accumulate:\n\ "), stdout); fputs (_("\ \n\ -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\ -An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n\ -at first byte printed, incremented when dump is progressing.\n\ -For OFFSET and LABEL, a 0x or 0X prefix indicates hexadecimal;\n\ -suffixes may be . for octal and b for multiply by 512.\n\ -"), stdout); - fputs (_("\ \n\ TYPE is made up of one or more of these specifications:\n\ -\n\ a named character, ignoring high-order bit\n\ c ASCII character or backslash escape\n\ "), stdout); @@ -362,24 +366,26 @@ TYPE is made up of one or more of these specifications:\n\ "), stdout); fputs (_("\ \n\ -SIZE is a number. For TYPE in doux, SIZE may also be C for\n\ +SIZE is a number. For TYPE in [doux], SIZE may also be C for\n\ sizeof(char), S for sizeof(short), I for sizeof(int) or L for\n\ 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\ "), stdout); fputs (_("\ \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\ +Adding a z suffix to any type displays printable characters at the end of\n\ +each output line.\n\ "), stdout); fputs (_("\ -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\ +\n\ +BYTES is hex with 0x or 0X prefix, and may have a multiplier suffix:\n\ + b 512\n\ + KB 1000\n\ + K 1024\n\ + MB 1000*1000\n\ + M 1024*1024\n\ +and so on for G, T, P, E, Z, Y.\n\ "), stdout); emit_ancillary_info (); } diff --git a/src/operand2sig.c b/src/operand2sig.c index 9a28d153..6936f1d2 100644 --- a/src/operand2sig.c +++ b/src/operand2sig.c @@ -1,5 +1,5 @@ /* operand2sig.c -- common function for parsing signal specifications - Copyright (C) 2008-2012 Free Software Foundation, Inc. + 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 diff --git a/src/operand2sig.h b/src/operand2sig.h index 046a79f6..4a799176 100644 --- a/src/operand2sig.h +++ b/src/operand2sig.h @@ -1,6 +1,6 @@ /* operand2sig.h -- prototype for signal specification function - Copyright (C) 2008-2012 Free Software Foundation, Inc. + 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 diff --git a/src/paste.c b/src/paste.c index 812a242d..bc9fa76c 100644 --- a/src/paste.c +++ b/src/paste.c @@ -1,5 +1,5 @@ /* paste - merge lines of files - Copyright (C) 1997-2012 Free Software Foundation, Inc. + Copyright (C) 1997-2013 Free Software Foundation, Inc. Copyright (C) 1984 David M. Ihnat This program is free software: you can redistribute it and/or modify @@ -440,11 +440,10 @@ Usage: %s [OPTION]... [FILE]...\n\ 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\ -\n\ -"), stdout); - fputs (_("\ -Mandatory arguments to long options are mandatory for short options too.\n\ "), stdout); + + emit_mandatory_arg_note (); + fputs (_("\ -d, --delimiters=LIST reuse characters from LIST instead of TABs\n\ -s, --serial paste one file at a time instead of in parallel\n\ diff --git a/src/pathchk.c b/src/pathchk.c index 194de22e..28567d08 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-2012 Free Software Foundation, Inc. + Copyright (C) 1991-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 diff --git a/src/pinky.c b/src/pinky.c index 597bc56c..e6838ae6 100644 --- a/src/pinky.c +++ b/src/pinky.c @@ -1,5 +1,5 @@ /* GNU's pinky. - Copyright (C) 1992-2012 Free Software Foundation, Inc. + Copyright (C) 1992-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 @@ -208,21 +208,14 @@ print_entry (const STRUCT_UTMP *utmp_ent) #define DEV_DIR_LEN (sizeof (DEV_DIR_WITH_TRAILING_SLASH) - 1) char line[sizeof (utmp_ent->ut_line) + DEV_DIR_LEN + 1]; + char *p = line; /* Copy ut_line into LINE, prepending '/dev/' if ut_line is not already an absolute file name. Some system may put the full, absolute file name in ut_line. */ - if (utmp_ent->ut_line[0] == '/') - { - strncpy (line, utmp_ent->ut_line, sizeof (utmp_ent->ut_line)); - line[sizeof (utmp_ent->ut_line)] = '\0'; - } - else - { - strcpy (line, DEV_DIR_WITH_TRAILING_SLASH); - strncpy (line + DEV_DIR_LEN, utmp_ent->ut_line, sizeof utmp_ent->ut_line); - line[DEV_DIR_LEN + sizeof (utmp_ent->ut_line)] = '\0'; - } + if ( ! IS_ABSOLUTE_FILE_NAME (utmp_ent->ut_line)) + p = stpcpy (p, DEV_DIR_WITH_TRAILING_SLASH); + stzncpy (p, utmp_ent->ut_line, sizeof (utmp_ent->ut_line)); if (stat (line, &stats) == 0) { @@ -242,8 +235,7 @@ print_entry (const STRUCT_UTMP *utmp_ent) struct passwd *pw; char name[UT_USER_SIZE + 1]; - strncpy (name, UT_USER (utmp_ent), UT_USER_SIZE); - name[UT_USER_SIZE] = '\0'; + stzncpy (name, UT_USER (utmp_ent), UT_USER_SIZE); pw = getpwnam (name); if (pw == NULL) /* TRANSLATORS: Real name is unknown; at most 19 characters. */ @@ -284,8 +276,7 @@ print_entry (const STRUCT_UTMP *utmp_ent) char *display = NULL; /* Copy the host name into UT_HOST, and ensure it's nul terminated. */ - strncpy (ut_host, utmp_ent->ut_host, (int) sizeof (utmp_ent->ut_host)); - ut_host[sizeof (utmp_ent->ut_host)] = '\0'; + stzncpy (ut_host, utmp_ent->ut_host, sizeof (utmp_ent->ut_host)); /* Look for an X display. */ display = strchr (ut_host, ':'); diff --git a/src/pr.c b/src/pr.c index e97c4344..f4b0b694 100644 --- a/src/pr.c +++ b/src/pr.c @@ -1,5 +1,5 @@ /* pr -- convert text files for printing. - Copyright (C) 1988-2012 Free Software Foundation, Inc. + Copyright (C) 1988-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 @@ -630,10 +630,6 @@ static uintmax_t page_number; 2 moo 4 hoo 6 zoo */ static int line_number; -/* With line_number overflow, we use power_10 to cut off the higher-order - digits of the line_number */ -static int power_10; - /* (-n) True means lines should be preceded by numbers. */ static bool numbered_lines = false; @@ -1268,7 +1264,6 @@ init_parameters (int number_of_files) if (numbered_lines) { - int tmp_i; int chars_per_default_tab = 8; line_count = start_line_num; @@ -1289,12 +1284,6 @@ init_parameters (int number_of_files) printing files in parallel. */ if (parallel_files) chars_used_by_number = number_width; - - /* We use power_10 to cut off the higher-order digits of the - line_number in function add_line_number */ - tmp_i = chars_per_number; - for (power_10 = 1; tmp_i > 0; --tmp_i) - power_10 = 10 * power_10; } chars_per_column = (chars_per_line - chars_used_by_number @@ -1306,7 +1295,8 @@ init_parameters (int number_of_files) if (numbered_lines) { free (number_buff); - number_buff = xmalloc (2 * chars_per_number); + number_buff = xmalloc (MAX (chars_per_number, + INT_STRLEN_BOUND (line_number)) + 1); } /* Pick the maximum between the tab width and the width of an @@ -2029,19 +2019,13 @@ add_line_number (COLUMN *p) { int i; char *s; - int left_cut; + int num_width; /* Cutting off the higher-order digits is more informative than - lower-order cut off*/ - if (line_number < power_10) - sprintf (number_buff, "%*d", chars_per_number, line_number); - else - { - left_cut = line_number % power_10; - sprintf (number_buff, "%0*d", chars_per_number, left_cut); - } + lower-order cut off. */ + num_width = sprintf (number_buff, "%*d", chars_per_number, line_number); line_number++; - s = number_buff; + s = number_buff + (num_width - chars_per_number); for (i = chars_per_number; i > 0; i--) (p->char_func) (*s++); @@ -2772,11 +2756,10 @@ Usage: %s [OPTION]... [FILE]...\n\ fputs (_("\ Paginate or columnate FILE(s) for printing.\n\ -\n\ -"), stdout); - fputs (_("\ -Mandatory arguments to long options are mandatory for short options too.\n\ "), stdout); + + emit_mandatory_arg_note (); + fputs (_("\ +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n\ begin [stop] printing with page FIRST_[LAST_]PAGE\n\ diff --git a/src/primes.h b/src/primes.h new file mode 100644 index 00000000..f608966b --- /dev/null +++ b/src/primes.h @@ -0,0 +1,4014 @@ +/* Generated file -- DO NOT EDIT */ + +#define WIDE_UINT_BITS 128 +P (1, 26, + (((((uintmax_t) 0xaaaaU << 28 | 0xaaaaaaaU) + << 28 | 0xaaaaaaaU) + << 28 | 0xaaaaaaaU) + << 28 | 0xaaaaaabU), + UINTMAX_MAX / 3) +P (2, 26, + (((((uintmax_t) 0xccccU << 28 | 0xcccccccU) + << 28 | 0xcccccccU) + << 28 | 0xcccccccU) + << 28 | 0xccccccdU), + UINTMAX_MAX / 5) +P (2, 30, + (((((uintmax_t) 0xb6dbU << 28 | 0x6db6db6U) + << 28 | 0xdb6db6dU) + << 28 | 0xb6db6dbU) + << 28 | 0x6db6db7U), + UINTMAX_MAX / 7) +P (4, 30, + (((((uintmax_t) 0xa2e8U << 28 | 0xba2e8baU) + << 28 | 0x2e8ba2eU) + << 28 | 0x8ba2e8bU) + << 28 | 0xa2e8ba3U), + UINTMAX_MAX / 11) +P (2, 30, + (((((uintmax_t) 0xc4ecU << 28 | 0x4ec4ec4U) + << 28 | 0xec4ec4eU) + << 28 | 0xc4ec4ecU) + << 28 | 0x4ec4ec5U), + UINTMAX_MAX / 13) +P (4, 30, + (((((uintmax_t) 0xf0f0U << 28 | 0xf0f0f0fU) + << 28 | 0x0f0f0f0U) + << 28 | 0xf0f0f0fU) + << 28 | 0x0f0f0f1U), + UINTMAX_MAX / 17) +P (2, 34, + (((((uintmax_t) 0xbca1U << 28 | 0xaf286bcU) + << 28 | 0xa1af286U) + << 28 | 0xbca1af2U) + << 28 | 0x86bca1bU), + UINTMAX_MAX / 19) +P (4, 36, + (((((uintmax_t) 0x4de9U << 28 | 0xbd37a6fU) + << 28 | 0x4de9bd3U) + << 28 | 0x7a6f4deU) + << 28 | 0x9bd37a7U), + UINTMAX_MAX / 23) +P (6, 32, + (((((uintmax_t) 0xc234U << 28 | 0xf72c234U) + << 28 | 0xf72c234U) + << 28 | 0xf72c234U) + << 28 | 0xf72c235U), + UINTMAX_MAX / 29) +P (2, 36, + (((((uintmax_t) 0xdef7U << 28 | 0xbdef7bdU) + << 28 | 0xef7bdefU) + << 28 | 0x7bdef7bU) + << 28 | 0xdef7bdfU), + UINTMAX_MAX / 31) +P (6, 34, + (((((uintmax_t) 0xc1baU << 28 | 0xcf914c1U) + << 28 | 0xbacf914U) + << 28 | 0xc1bacf9U) + << 28 | 0x14c1badU), + UINTMAX_MAX / 37) +P (4, 32, + (((((uintmax_t) 0x18f9U << 28 | 0xc18f9c1U) + << 28 | 0x8f9c18fU) + << 28 | 0x9c18f9cU) + << 28 | 0x18f9c19U), + UINTMAX_MAX / 41) +P (2, 36, + (((((uintmax_t) 0xbe82U << 28 | 0xfa0be82U) + << 28 | 0xfa0be82U) + << 28 | 0xfa0be82U) + << 28 | 0xfa0be83U), + UINTMAX_MAX / 43) +P (4, 36, + (((((uintmax_t) 0x3677U << 28 | 0xd46cefaU) + << 28 | 0x8d9df51U) + << 28 | 0xb3bea36U) + << 28 | 0x77d46cfU), + UINTMAX_MAX / 47) +P (6, 36, + (((((uintmax_t) 0x1352U << 28 | 0x1cfb2b7U) + << 28 | 0x8c13521U) + << 28 | 0xcfb2b78U) + << 28 | 0xc13521dU), + UINTMAX_MAX / 53) +P (6, 38, + (((((uintmax_t) 0x8f2fU << 28 | 0xba93868U) + << 28 | 0x22b63cbU) + << 28 | 0xeea4e1aU) + << 28 | 0x08ad8f3U), + UINTMAX_MAX / 59) +P (2, 40, + (((((uintmax_t) 0x14fbU << 28 | 0xcda3ac1U) + << 28 | 0x0c9714fU) + << 28 | 0xbcda3acU) + << 28 | 0x10c9715U), + UINTMAX_MAX / 61) +P (6, 36, + (((((uintmax_t) 0xc2ddU << 28 | 0x9ca81e9U) + << 28 | 0x131abf0U) + << 28 | 0xb7672a0U) + << 28 | 0x7a44c6bU), + UINTMAX_MAX / 67) +P (4, 36, + (((((uintmax_t) 0x4f52U << 28 | 0xedf8c9eU) + << 28 | 0xa5dbf19U) + << 28 | 0x3d4bb7eU) + << 28 | 0x327a977U), + UINTMAX_MAX / 71) +P (2, 36, + (((((uintmax_t) 0x3f1fU << 28 | 0x8fc7e3fU) + << 28 | 0x1f8fc7eU) + << 28 | 0x3f1f8fcU) + << 28 | 0x7e3f1f9U), + UINTMAX_MAX / 73) +P (6, 34, + (((((uintmax_t) 0xd5dfU << 28 | 0x984dc5aU) + << 28 | 0xbbf309bU) + << 28 | 0x8b577e6U) + << 28 | 0x13716afU), + UINTMAX_MAX / 79) +P (4, 44, + (((((uintmax_t) 0x2818U << 28 | 0xacb90f6U) + << 28 | 0xbf3a9a3U) + << 28 | 0x784a062U) + << 28 | 0xb2e43dbU), + UINTMAX_MAX / 83) +P (6, 42, + (((((uintmax_t) 0xd1faU << 28 | 0x3f47e8fU) + << 28 | 0xd1fa3f4U) + << 28 | 0x7e8fd1fU) + << 28 | 0xa3f47e9U), + UINTMAX_MAX / 89) +P (8, 40, + (((((uintmax_t) 0x5f02U << 28 | 0xa3a0fd5U) + << 28 | 0xc5f02a3U) + << 28 | 0xa0fd5c5U) + << 28 | 0xf02a3a1U), + UINTMAX_MAX / 97) +P (4, 38, + (((((uintmax_t) 0xc32bU << 28 | 0x16cfd77U) + << 28 | 0x20f353aU) + << 28 | 0x4c0a237U) + << 28 | 0xc32b16dU), + UINTMAX_MAX / 101) +P (2, 46, + (((((uintmax_t) 0xd0c6U << 28 | 0xd5bf60eU) + << 28 | 0xe9a18daU) + << 28 | 0xb7ec1ddU) + << 28 | 0x3431b57U), + UINTMAX_MAX / 103) +P (4, 44, + (((((uintmax_t) 0xa2b1U << 28 | 0x0bf66e0U) + << 28 | 0xe5aea77U) + << 28 | 0xa04c8f8U) + << 28 | 0xd28ac43U), + UINTMAX_MAX / 107) +P (2, 48, + (((((uintmax_t) 0xc096U << 28 | 0x4fda6c0U) + << 28 | 0x964fda6U) + << 28 | 0xc0964fdU) + << 28 | 0xa6c0965U), + UINTMAX_MAX / 109) +P (4, 50, + (((((uintmax_t) 0xc090U << 28 | 0xfdbc090U) + << 28 | 0xfdbc090U) + << 28 | 0xfdbc090U) + << 28 | 0xfdbc091U), + UINTMAX_MAX / 113) +P (14, 40, + (((((uintmax_t) 0xbf7eU << 28 | 0xfdfbf7eU) + << 28 | 0xfdfbf7eU) + << 28 | 0xfdfbf7eU) + << 28 | 0xfdfbf7fU), + UINTMAX_MAX / 127) +P (4, 42, + (((((uintmax_t) 0xf82eU << 28 | 0xe6986d6U) + << 28 | 0xf63aa03U) + << 28 | 0xe88cb3cU) + << 28 | 0x9484e2bU), + UINTMAX_MAX / 131) +P (6, 42, + (((((uintmax_t) 0x21a2U << 28 | 0x91c0779U) + << 28 | 0x75b8fe2U) + << 28 | 0x1a291c0U) + << 28 | 0x77975b9U), + UINTMAX_MAX / 137) +P (2, 42, + (((((uintmax_t) 0xa212U << 28 | 0x6ad1f4fU) + << 28 | 0x31ba03aU) + << 28 | 0xef6ca97U) + << 28 | 0x0586723U), + UINTMAX_MAX / 139) +P (10, 42, + (((((uintmax_t) 0x93c2U << 28 | 0x25cc74dU) + << 28 | 0x50c06dfU) + << 28 | 0x5b0f768U) + << 28 | 0xce2cabdU), + UINTMAX_MAX / 149) +P (2, 42, + (((((uintmax_t) 0x26feU << 28 | 0x4dfc9bfU) + << 28 | 0x937f26fU) + << 28 | 0xe4dfc9bU) + << 28 | 0xf937f27U), + UINTMAX_MAX / 151) +P (6, 40, + (((((uintmax_t) 0x0685U << 28 | 0xb4fe5e9U) + << 28 | 0x2c0685bU) + << 28 | 0x4fe5e92U) + << 28 | 0xc0685b5U), + UINTMAX_MAX / 157) +P (6, 36, + (((((uintmax_t) 0x8bc7U << 28 | 0x75ca99eU) + << 28 | 0xa03241fU) + << 28 | 0x693a1c4U) + << 28 | 0x51ab30bU), + UINTMAX_MAX / 163) +P (4, 44, + (((((uintmax_t) 0x513eU << 28 | 0xd9ad38bU) + << 28 | 0x7f3bc8dU) + << 28 | 0x07aa27dU) + << 28 | 0xb35a717U), + UINTMAX_MAX / 167) +P (6, 50, + (((((uintmax_t) 0x133cU << 28 | 0xaba736cU) + << 28 | 0x05eb488U) + << 28 | 0x2383b30U) + << 28 | 0xd516325U), + UINTMAX_MAX / 173) +P (6, 48, + (((((uintmax_t) 0x0e4dU << 28 | 0x3aa30a0U) + << 28 | 0x2dc3eedU) + << 28 | 0x6866f8dU) + << 28 | 0x962ae7bU), + UINTMAX_MAX / 179) +P (2, 48, + (((((uintmax_t) 0x6fbcU << 28 | 0x1c498c0U) + << 28 | 0x5a84f34U) + << 28 | 0x54dca41U) + << 28 | 0x0f8ed9dU), + UINTMAX_MAX / 181) +P (10, 42, + (((((uintmax_t) 0x7749U << 28 | 0xb79f7f5U) + << 28 | 0x470961dU) + << 28 | 0x7ca632eU) + << 28 | 0xe936f3fU), + UINTMAX_MAX / 191) +P (2, 46, + (((((uintmax_t) 0x9094U << 28 | 0x8f40feaU) + << 28 | 0xc6f6b70U) + << 28 | 0xbf01539U) + << 28 | 0x0948f41U), + UINTMAX_MAX / 193) +P (4, 44, + (((((uintmax_t) 0x0bb2U << 28 | 0x07cc053U) + << 28 | 0x2ae21c9U) + << 28 | 0x6bdb9d3U) + << 28 | 0xd137e0dU), + UINTMAX_MAX / 197) +P (2, 52, + (((((uintmax_t) 0x7a36U << 28 | 0x07b7f5bU) + << 28 | 0x5630e26U) + << 28 | 0x97cc8aeU) + << 28 | 0xf46c0f7U), + UINTMAX_MAX / 199) +P (12, 46, + (((((uintmax_t) 0x2f51U << 28 | 0x4a026d3U) + << 28 | 0x1be7bc0U) + << 28 | 0xe8f2a76U) + << 28 | 0xe68575bU), + UINTMAX_MAX / 211) +P (12, 40, + (((((uintmax_t) 0xdd8fU << 28 | 0x7f6d0eeU) + << 28 | 0xc7bfb68U) + << 28 | 0x7763dfdU) + << 28 | 0xb43bb1fU), + UINTMAX_MAX / 223) +P (4, 42, + (((((uintmax_t) 0x766aU << 28 | 0x024168eU) + << 28 | 0x18cf81bU) + << 28 | 0x10ea929U) + << 28 | 0xba144cbU), + UINTMAX_MAX / 227) +P (2, 42, + (((((uintmax_t) 0x0c4cU << 28 | 0x0478bbcU) + << 28 | 0xecfee1dU) + << 28 | 0x10c4c04U) + << 28 | 0x78bbcedU), + UINTMAX_MAX / 229) +P (4, 44, + (((((uintmax_t) 0x758fU << 28 | 0xee6bac7U) + << 28 | 0xf735d63U) + << 28 | 0xfb9aeb1U) + << 28 | 0xfdcd759U), + UINTMAX_MAX / 233) +P (6, 42, + (((((uintmax_t) 0x077fU << 28 | 0x76e538cU) + << 28 | 0x5167e64U) + << 28 | 0xafaa4f4U) + << 28 | 0x37b2e0fU), + UINTMAX_MAX / 239) +P (2, 42, + (((((uintmax_t) 0x10feU << 28 | 0xf010fefU) + << 28 | 0x010fef0U) + << 28 | 0x10fef01U) + << 28 | 0x0fef011U), + UINTMAX_MAX / 241) +P (10, 42, + (((((uintmax_t) 0xa020U << 28 | 0xa32fefaU) + << 28 | 0xe680828U) + << 28 | 0xcbfbeb9U) + << 28 | 0xa020a33U), + UINTMAX_MAX / 251) +P (6, 50, + (((((uintmax_t) 0xff00U << 28 | 0xff00ff0U) + << 28 | 0x0ff00ffU) + << 28 | 0x00ff00fU) + << 28 | 0xf00ff01U), + UINTMAX_MAX / 257) +P (6, 48, + (((((uintmax_t) 0xf836U << 28 | 0x826ef73U) + << 28 | 0xd52bcd6U) + << 28 | 0x24fd147U) + << 28 | 0x0e99cb7U), + UINTMAX_MAX / 263) +P (6, 44, + (((((uintmax_t) 0x3ce8U << 28 | 0x354b2eaU) + << 28 | 0x1c8cd8fU) + << 28 | 0xb3ddbd6U) + << 28 | 0x205b5c5U), + UINTMAX_MAX / 269) +P (2, 46, + (((((uintmax_t) 0x8715U << 28 | 0xba188f9U) + << 28 | 0x63302d5U) + << 28 | 0x7da36caU) + << 28 | 0x27acdefU), + UINTMAX_MAX / 271) +P (6, 54, + (((((uintmax_t) 0xb25eU << 28 | 0x4463cffU) + << 28 | 0x13686eeU) + << 28 | 0x70c03b2U) + << 28 | 0x5e4463dU), + UINTMAX_MAX / 277) +P (4, 56, + (((((uintmax_t) 0x6c69U << 28 | 0xae01d27U) + << 28 | 0x2ca3fc5U) + << 28 | 0xb1a6b80U) + << 28 | 0x749cb29U), + UINTMAX_MAX / 281) +P (2, 64, + (((((uintmax_t) 0xf26eU << 28 | 0x5c44bfcU) + << 28 | 0x61b2347U) + << 28 | 0x768073cU) + << 28 | 0x9b97113U), + UINTMAX_MAX / 283) +P (10, 56, + (((((uintmax_t) 0xb07dU << 28 | 0xd0d1b15U) + << 28 | 0xd7cf125U) + << 28 | 0x91e9488U) + << 28 | 0x4ce32adU), + UINTMAX_MAX / 293) +P (14, 46, + (((((uintmax_t) 0xd2f8U << 28 | 0x7ebfcaaU) + << 28 | 0x1c5a0f0U) + << 28 | 0x2806abcU) + << 28 | 0x74be1fbU), + UINTMAX_MAX / 307) +P (4, 48, + (((((uintmax_t) 0xbe25U << 28 | 0xdd6d7aaU) + << 28 | 0x646ca7eU) + << 28 | 0xc3e8f3aU) + << 28 | 0x7198487U), + UINTMAX_MAX / 311) +P (2, 54, + (((((uintmax_t) 0xbc1dU << 28 | 0x71afd8bU) + << 28 | 0xdc03458U) + << 28 | 0x550f8a3U) + << 28 | 0x9409d09U), + UINTMAX_MAX / 313) +P (4, 56, + (((((uintmax_t) 0x2ed6U << 28 | 0xd05a72aU) + << 28 | 0xcd1f7ecU) + << 28 | 0x9e48ae6U) + << 28 | 0xf71de15U), + UINTMAX_MAX / 317) +P (14, 48, + (((((uintmax_t) 0x62ffU << 28 | 0x3a018bfU) + << 28 | 0xce8062fU) + << 28 | 0xf3a018bU) + << 28 | 0xfce8063U), + UINTMAX_MAX / 331) +P (6, 46, + (((((uintmax_t) 0x3fcfU << 28 | 0x61fe7b0U) + << 28 | 0xff3d87fU) + << 28 | 0x9ec3fcfU) + << 28 | 0x61fe7b1U), + UINTMAX_MAX / 337) +P (10, 42, + (((((uintmax_t) 0x398bU << 28 | 0x6f668c2U) + << 28 | 0xc43df89U) + << 28 | 0xf5abe57U) + << 28 | 0x0e046d3U), + UINTMAX_MAX / 347) +P (2, 48, + (((((uintmax_t) 0x8c1aU << 28 | 0x682913cU) + << 28 | 0xe1ecedaU) + << 28 | 0x971b23fU) + << 28 | 0x1545af5U), + UINTMAX_MAX / 349) +P (4, 48, + (((((uintmax_t) 0x0b9aU << 28 | 0x7862a0fU) + << 28 | 0xf465879U) + << 28 | 0xd5f00b9U) + << 28 | 0xa7862a1U), + UINTMAX_MAX / 353) +P (6, 50, + (((((uintmax_t) 0xe7c1U << 28 | 0x3f77161U) + << 28 | 0xb18f54dU) + << 28 | 0xba1df32U) + << 28 | 0xa128a57U), + UINTMAX_MAX / 359) +P (8, 52, + (((((uintmax_t) 0x7318U << 28 | 0x6a06f9bU) + << 28 | 0x8d9a287U) + << 28 | 0x530217bU) + << 28 | 0x7747d8fU), + UINTMAX_MAX / 367) +P (6, 48, + (((((uintmax_t) 0x7c39U << 28 | 0xa6c708eU) + << 28 | 0xc18b530U) + << 28 | 0xbaae53bU) + << 28 | 0xb5e06ddU), + UINTMAX_MAX / 373) +P (6, 52, + (((((uintmax_t) 0x3763U << 28 | 0x4af9ebbU) + << 28 | 0xc742deeU) + << 28 | 0x70206c1U) + << 28 | 0x2e9b5b3U), + UINTMAX_MAX / 379) +P (4, 50, + (((((uintmax_t) 0x5035U << 28 | 0x78fb523U) + << 28 | 0x6cf34cdU) + << 28 | 0xde9462eU) + << 28 | 0xc9dbe7fU), + UINTMAX_MAX / 383) +P (6, 50, + (((((uintmax_t) 0xbcdfU << 28 | 0xc0d2975U) + << 28 | 0xccab1afU) + << 28 | 0xb64b05eU) + << 28 | 0xc41cf4dU), + UINTMAX_MAX / 389) +P (8, 46, + (((((uintmax_t) 0xf5aeU << 28 | 0xc02944fU) + << 28 | 0xf5aec02U) + << 28 | 0x944ff5aU) + << 28 | 0xec02945U), + UINTMAX_MAX / 397) +P (4, 48, + (((((uintmax_t) 0xc7d2U << 28 | 0x08f00a3U) + << 28 | 0x6e71a2cU) + << 28 | 0xb033128U) + << 28 | 0x382df71U), + UINTMAX_MAX / 401) +P (8, 48, + (((((uintmax_t) 0xd38fU << 28 | 0x55c0280U) + << 28 | 0xf05a21cU) + << 28 | 0xcacc0c8U) + << 28 | 0x4b1c2a9U), + UINTMAX_MAX / 409) +P (10, 42, + (((((uintmax_t) 0xca3bU << 28 | 0xe03aa76U) + << 28 | 0x87a3219U) + << 28 | 0xa93db57U) + << 28 | 0x5eb3a0bU), + UINTMAX_MAX / 419) +P (2, 42, + (((((uintmax_t) 0x6a69U << 28 | 0xce2344bU) + << 28 | 0x66c3cceU) + << 28 | 0xbeef94fU) + << 28 | 0xa86fe2dU), + UINTMAX_MAX / 421) +P (10, 36, + (((((uintmax_t) 0xfecfU << 28 | 0xe37d53bU) + << 28 | 0xfd9fc6fU) + << 28 | 0xaa77fb3U) + << 28 | 0xf8df54fU), + UINTMAX_MAX / 431) +P (2, 46, + (((((uintmax_t) 0xa58aU << 28 | 0xf00975aU) + << 28 | 0x750ff68U) + << 28 | 0xa58af00U) + << 28 | 0x975a751U), + UINTMAX_MAX / 433) +P (6, 48, + (((((uintmax_t) 0xdc6dU << 28 | 0xa187df5U) + << 28 | 0x80dfed5U) + << 28 | 0x6e36d0cU) + << 28 | 0x3efac07U), + UINTMAX_MAX / 439) +P (4, 48, + (((((uintmax_t) 0x8fe4U << 28 | 0x4308ab0U) + << 28 | 0xd4a8bd8U) + << 28 | 0xb44c47aU) + << 28 | 0x8299b73U), + UINTMAX_MAX / 443) +P (6, 50, + (((((uintmax_t) 0xf1bfU << 28 | 0x0091f5bU) + << 28 | 0xcb8bb02U) + << 28 | 0xd9ccaf9U) + << 28 | 0xba70e41U), + UINTMAX_MAX / 449) +P (8, 46, + (((((uintmax_t) 0x5e1cU << 28 | 0x023d9e8U) + << 28 | 0x78ff709U) + << 28 | 0x85e1c02U) + << 28 | 0x3d9e879U), + UINTMAX_MAX / 457) +P (4, 48, + (((((uintmax_t) 0x7880U << 28 | 0xd53da3dU) + << 28 | 0x15a842aU) + << 28 | 0x343316cU) + << 28 | 0x494d305U), + UINTMAX_MAX / 461) +P (2, 58, + (((((uintmax_t) 0x1ddbU << 28 | 0x81ef699U) + << 28 | 0xb5e8c70U) + << 28 | 0xcb7916aU) + << 28 | 0xb67652fU), + UINTMAX_MAX / 463) +P (4, 56, + (((((uintmax_t) 0xf364U << 28 | 0x5121706U) + << 28 | 0x07acad3U) + << 28 | 0x98f132fU) + << 28 | 0xb10fe5bU), + UINTMAX_MAX / 467) +P (12, 62, + (((((uintmax_t) 0xadb1U << 28 | 0xf8848afU) + << 28 | 0x4c6d06fU) + << 28 | 0x2a38a6bU) + << 28 | 0xf54fa1fU), + UINTMAX_MAX / 479) +P (8, 60, + (((((uintmax_t) 0xd9a0U << 28 | 0x541b55aU) + << 28 | 0xf0c1721U) + << 28 | 0x1df689bU) + << 28 | 0x98f81d7U), + UINTMAX_MAX / 487) +P (4, 66, + (((((uintmax_t) 0x673bU << 28 | 0xf592825U) + << 28 | 0x8a2ac0eU) + << 28 | 0x994983eU) + << 28 | 0x90f1ec3U), + UINTMAX_MAX / 491) +P (8, 64, + (((((uintmax_t) 0x0ddaU << 28 | 0x093c062U) + << 28 | 0x8041aadU) + << 28 | 0x671e44bU) + << 28 | 0xed87f3bU), + UINTMAX_MAX / 499) +P (4, 66, + (((((uintmax_t) 0xa9fcU << 28 | 0xf24229bU) + << 28 | 0xbcd1af9U) + << 28 | 0x623a051U) + << 28 | 0x6e70fc7U), + UINTMAX_MAX / 503) +P (6, 62, + (((((uintmax_t) 0xcbb1U << 28 | 0x8a4f773U) + << 28 | 0x2cc324bU) + << 28 | 0x7129be9U) + << 28 | 0xdece355U), + UINTMAX_MAX / 509) +P (12, 56, + (((((uintmax_t) 0x01f7U << 28 | 0x27cce5fU) + << 28 | 0x530a519U) + << 28 | 0x0f3b747U) + << 28 | 0x3f62c39U), + UINTMAX_MAX / 521) +P (2, 64, + (((((uintmax_t) 0x6da4U << 28 | 0xf4bdeb7U) + << 28 | 0x1121c63U) + << 28 | 0xdacc9aaU) + << 28 | 0xd46f9a3U), + UINTMAX_MAX / 523) +P (18, 52, + (((((uintmax_t) 0x4d9aU << 28 | 0xbc552cfU) + << 28 | 0x42b88c1U) + << 28 | 0x108fda2U) + << 28 | 0x4e8d035U), + UINTMAX_MAX / 541) +P (6, 52, + (((((uintmax_t) 0x141fU << 28 | 0xd312409U) + << 28 | 0x5c328b7U) + << 28 | 0x7578472U) + << 28 | 0x319bd8bU), + UINTMAX_MAX / 547) +P (10, 44, + (((((uintmax_t) 0xddfdU << 28 | 0x3e0bf32U) + << 28 | 0x18d1947U) + << 28 | 0x3d20a1cU) + << 28 | 0x7ed9da5U), + UINTMAX_MAX / 557) +P (6, 44, + (((((uintmax_t) 0xdb2bU << 28 | 0x3278f3bU) + << 28 | 0x910d2fbU) + << 28 | 0xe85af0fU) + << 28 | 0xea2c8fbU), + UINTMAX_MAX / 563) +P (6, 44, + (((((uintmax_t) 0xcb5cU << 28 | 0x3b636e3U) + << 28 | 0xa7d1358U) + << 28 | 0xa1f7e6cU) + << 28 | 0xe0f4c09U), + UINTMAX_MAX / 569) +P (2, 46, + (((((uintmax_t) 0x1bcbU << 28 | 0xfe34e75U) + << 28 | 0x76cf21aU) + << 28 | 0x00e58c5U) + << 28 | 0x44986f3U), + UINTMAX_MAX / 571) +P (6, 42, + (((((uintmax_t) 0x6b5eU << 28 | 0x80aa5efU) + << 28 | 0x23f0071U) + << 28 | 0x94a17f5U) + << 28 | 0x5a10dc1U), + UINTMAX_MAX / 577) +P (10, 44, + (((((uintmax_t) 0x9a62U << 28 | 0x8feb110U) + << 28 | 0x22e3a70U) + << 28 | 0x8494478U) + << 28 | 0x5e33763U), + UINTMAX_MAX / 587) +P (6, 48, + (((((uintmax_t) 0xbe61U << 28 | 0x909eddeU) + << 28 | 0x53c01baU) + << 28 | 0x10679bdU) + << 28 | 0x84886b1U), + UINTMAX_MAX / 593) +P (6, 44, + (((((uintmax_t) 0x4febU << 28 | 0x7c5e05fU) + << 28 | 0xbb9e8ebU) + << 28 | 0xe9c6bb3U) + << 28 | 0x1260967U), + UINTMAX_MAX / 599) +P (2, 46, + (((((uintmax_t) 0x1ff2U << 28 | 0x5e8ff92U) + << 28 | 0xf47fc97U) + << 28 | 0xa3fe4bdU) + << 28 | 0x1ff25e9U), + UINTMAX_MAX / 601) +P (6, 46, + (((((uintmax_t) 0x3014U << 28 | 0x3e6b1faU) + << 28 | 0x187616cU) + << 28 | 0x6388395U) + << 28 | 0xb84d99fU), + UINTMAX_MAX / 607) +P (6, 46, + (((((uintmax_t) 0xd491U << 28 | 0x54c6c94U) + << 28 | 0xac0f08cU) + << 28 | 0x51da6a1U) + << 28 | 0x335df6dU), + UINTMAX_MAX / 613) +P (4, 44, + (((((uintmax_t) 0x9b97U << 28 | 0x71454a4U) + << 28 | 0x4e00d46U) + << 28 | 0xf323447U) + << 28 | 0x5d5add9U), + UINTMAX_MAX / 617) +P (2, 54, + (((((uintmax_t) 0x3abaU << 28 | 0x1b4baefU) + << 28 | 0x0b2a990U) + << 28 | 0x5605ca3U) + << 28 | 0xc619a43U), + UINTMAX_MAX / 619) +P (12, 46, + (((((uintmax_t) 0xcc11U << 28 | 0xd9dd1bfU) + << 28 | 0xe608eceU) + << 28 | 0xe8dff30U) + << 28 | 0x4767747U), + UINTMAX_MAX / 631) +P (10, 42, + (((((uintmax_t) 0xff99U << 28 | 0xc27f006U) + << 28 | 0x63d80ffU) + << 28 | 0x99c27f0U) + << 28 | 0x0663d81U), + UINTMAX_MAX / 641) +P (2, 48, + (((((uintmax_t) 0x111eU << 28 | 0xa8032f6U) + << 28 | 0x0bf1aacU) + << 28 | 0xca407f6U) + << 28 | 0x71ddc2bU), + UINTMAX_MAX / 643) +P (4, 54, + (((((uintmax_t) 0xdd93U << 28 | 0x95f5b66U) + << 28 | 0x7aa88e7U) + << 28 | 0x1298bacU) + << 28 | 0x1e12337U), + UINTMAX_MAX / 647) +P (6, 56, + (((((uintmax_t) 0xa7caU << 28 | 0xaed9303U) + << 28 | 0x8740afaU) + << 28 | 0x1e94309U) + << 28 | 0xcd09045U), + UINTMAX_MAX / 653) +P (6, 60, + (((((uintmax_t) 0x2be5U << 28 | 0x958f582U) + << 28 | 0xe9db7beU) + << 28 | 0xbccb8e9U) + << 28 | 0x1496b9bU), + UINTMAX_MAX / 659) +P (2, 66, + (((((uintmax_t) 0x995eU << 28 | 0x1ca8dbfU) + << 28 | 0xb5a3d31U) + << 28 | 0x2fa30ccU) + << 28 | 0x7d7b8bdU), + UINTMAX_MAX / 661) +P (12, 60, + (((((uintmax_t) 0x9f00U << 28 | 0x6160ff9U) + << 28 | 0xe9f0061U) + << 28 | 0x60ff9e9U) + << 28 | 0xf006161U), + UINTMAX_MAX / 673) +P (4, 62, + (((((uintmax_t) 0xb33cU << 28 | 0xe15ee9bU) + << 28 | 0x097416bU) + << 28 | 0x03673b5U) + << 28 | 0xe28152dU), + UINTMAX_MAX / 677) +P (6, 60, + (((((uintmax_t) 0xfa00U << 28 | 0xbfe802fU) + << 28 | 0xfa00bfeU) + << 28 | 0x802ffa0U) + << 28 | 0x0bfe803U), + UINTMAX_MAX / 683) +P (8, 60, + (((((uintmax_t) 0x1c28U << 28 | 0x02f6bcfU) + << 28 | 0x18d26e6U) + << 28 | 0x6fe25c9U) + << 28 | 0xe907c7bU), + UINTMAX_MAX / 691) +P (10, 56, + (((((uintmax_t) 0xcf6dU << 28 | 0xec4793eU) + << 28 | 0x72aba3fU) + << 28 | 0x8b236c7U) + << 28 | 0x6528895U), + UINTMAX_MAX / 701) +P (8, 52, + (((((uintmax_t) 0x1e54U << 28 | 0x7da72d2U) + << 28 | 0x24d44f6U) + << 28 | 0xf923bf0U) + << 28 | 0x1ce2c0dU), + UINTMAX_MAX / 709) +P (10, 50, + (((((uintmax_t) 0x7746U << 28 | 0xda9d5fcU) + << 28 | 0x708306cU) + << 28 | 0x3d3d98bU) + << 28 | 0xed7c42fU), + UINTMAX_MAX / 719) +P (8, 46, + (((((uintmax_t) 0xcdffU << 28 | 0x4bb5591U) + << 28 | 0x6e37a30U) + << 28 | 0x981efcdU) + << 28 | 0x4b010e7U), + UINTMAX_MAX / 727) +P (6, 54, + (((((uintmax_t) 0x2c01U << 28 | 0x65a1b3dU) + << 28 | 0xd13356fU) + << 28 | 0x691fc81U) + << 28 | 0xebbe575U), + UINTMAX_MAX / 733) +P (6, 58, + (((((uintmax_t) 0xa802U << 28 | 0xc574bddU) + << 28 | 0x5bccbb1U) + << 28 | 0x0480ddbU) + << 28 | 0x47b52cbU), + UINTMAX_MAX / 739) +P (4, 66, + (((((uintmax_t) 0x5411U << 28 | 0xeaa350fU) + << 28 | 0x8134b74U) + << 28 | 0xcd59ed6U) + << 28 | 0x4f3f0d7U), + UINTMAX_MAX / 743) +P (8, 60, + (((((uintmax_t) 0xfceeU << 28 | 0x9d7c6bbU) + << 28 | 0x7bbd301U) + << 28 | 0x05cb813U) + << 28 | 0x16d6c0fU), + UINTMAX_MAX / 751) +P (6, 64, + (((((uintmax_t) 0x4248U << 28 | 0x5eb0874U) + << 28 | 0x553879bU) + << 28 | 0xe64c6d9U) + << 28 | 0x1c1195dU), + UINTMAX_MAX / 757) +P (4, 62, + (((((uintmax_t) 0xe060U << 28 | 0xe20f797U) + << 28 | 0x0b19e71U) + << 28 | 0xb3f945aU) + << 28 | 0x27b1f49U), + UINTMAX_MAX / 761) +P (8, 58, + (((((uintmax_t) 0x782dU << 28 | 0x463deb5U) + << 28 | 0xc369877U) + << 28 | 0xd80d50eU) + << 28 | 0x508fd01U), + UINTMAX_MAX / 769) +P (4, 56, + (((((uintmax_t) 0x4a2fU << 28 | 0x06f468aU) + << 28 | 0x6e9cfa5U) + << 28 | 0xeb778e1U) + << 28 | 0x33551cdU), + UINTMAX_MAX / 773) +P (14, 52, + (((((uintmax_t) 0xda44U << 28 | 0x4f5ea87U) + << 28 | 0xf831718U) + << 28 | 0x657d3c2U) + << 28 | 0xd8a3f1bU), + UINTMAX_MAX / 787) +P (10, 56, + (((((uintmax_t) 0xfb80U << 28 | 0xcd9225eU) + << 28 | 0x6f2302eU) + << 28 | 0x40e220cU) + << 28 | 0x34ad735U), + UINTMAX_MAX / 797) +P (12, 48, + (((((uintmax_t) 0x1719U << 28 | 0xa1b36beU) + << 28 | 0x7f357a7U) + << 28 | 0x6593c70U) + << 28 | 0xa714919U), + UINTMAX_MAX / 809) +P (2, 48, + (((((uintmax_t) 0x2867U << 28 | 0x894fdcaU) + << 28 | 0x567da1eU) + << 28 | 0xef45212U) + << 28 | 0x4eea383U), + UINTMAX_MAX / 811) +P (10, 42, + (((((uintmax_t) 0x8932U << 28 | 0xd36914eU) + << 28 | 0x43f9c38U) + << 28 | 0x206dc24U) + << 28 | 0x2ba771dU), + UINTMAX_MAX / 821) +P (2, 54, + (((((uintmax_t) 0xdeb7U << 28 | 0x8610cc0U) + << 28 | 0xdafbf4cU) + << 28 | 0xd4c3580U) + << 28 | 0x7772287U), + UINTMAX_MAX / 823) +P (4, 54, + (((((uintmax_t) 0x8fa1U << 28 | 0xe560e3dU) + << 28 | 0x4a9a283U) + << 28 | 0xde917d5U) + << 28 | 0xe69ddf3U), + UINTMAX_MAX / 827) +P (2, 54, + (((((uintmax_t) 0x6724U << 28 | 0x2159dccU) + << 28 | 0xbcfd388U) + << 28 | 0x2ef0403U) + << 28 | 0xb4a6c15U), + UINTMAX_MAX / 829) +P (10, 48, + (((((uintmax_t) 0x5e96U << 28 | 0xbb58ca9U) + << 28 | 0xa64b0f8U) + << 28 | 0xfb6c51cU) + << 28 | 0x606b677U), + UINTMAX_MAX / 839) +P (14, 54, + (((((uintmax_t) 0x2450U << 28 | 0x6e7171bU) + << 28 | 0xe930eb4U) + << 28 | 0xabaac44U) + << 28 | 0x6d3e1fdU), + UINTMAX_MAX / 853) +P (4, 54, + (((((uintmax_t) 0x3743U << 28 | 0x3611535U) + << 28 | 0x7861fa9U) + << 28 | 0xf83bbe4U) + << 28 | 0x84a14e9U), + UINTMAX_MAX / 857) +P (2, 60, + (((((uintmax_t) 0x232aU << 28 | 0x9df37baU) + << 28 | 0xdbf080bU) + << 28 | 0xebbc0d1U) + << 28 | 0xce874d3U), + UINTMAX_MAX / 859) +P (4, 66, + (((((uintmax_t) 0x569eU << 28 | 0x67d2e92U) + << 28 | 0x8a3bebdU) + << 28 | 0x418eaf0U) + << 28 | 0x473189fU), + UINTMAX_MAX / 863) +P (14, 60, + (((((uintmax_t) 0x7e1aU << 28 | 0x457923eU) + << 28 | 0x77ae444U) + << 28 | 0xe3af6f3U) + << 28 | 0x72b7e65U), + UINTMAX_MAX / 877) +P (4, 60, + (((((uintmax_t) 0x9764U << 28 | 0x3fed672U) + << 28 | 0x7cf2ec8U) + << 28 | 0x7fdace4U) + << 28 | 0xf9e5d91U), + UINTMAX_MAX / 881) +P (2, 64, + (((((uintmax_t) 0xea8bU << 28 | 0xbde5e83U) + << 28 | 0x9fbf0ecU) + << 28 | 0x93479c4U) + << 28 | 0x46bd9bbU), + UINTMAX_MAX / 883) +P (4, 66, + (((((uintmax_t) 0x3d2fU << 28 | 0x9f06a35U) + << 28 | 0xae9c6daU) + << 28 | 0xc4d592eU) + << 28 | 0x777c647U), + UINTMAX_MAX / 887) +P (20, 60, + (((((uintmax_t) 0x81d5U << 28 | 0xa9a1ba9U) + << 28 | 0x11379a6U) + << 28 | 0x3ea8c8fU) + << 28 | 0x61f0c23U), + UINTMAX_MAX / 907) +P (4, 60, + (((((uintmax_t) 0x752eU << 28 | 0x5ddb77fU) + << 28 | 0xdc07de4U) + << 28 | 0x76062eaU) + << 28 | 0x5cbbb6fU), + UINTMAX_MAX / 911) +P (8, 58, + (((((uintmax_t) 0x1abdU << 28 | 0xfafc60fU) + << 28 | 0x0add2dfU) + << 28 | 0x68761c6U) + << 28 | 0x9daac27U), + UINTMAX_MAX / 919) +P (10, 54, + (((((uintmax_t) 0xac3aU << 28 | 0x6b786c0U) + << 28 | 0x582e4b8U) + << 28 | 0x13d7376U) + << 28 | 0x37aa061U), + UINTMAX_MAX / 929) +P (8, 54, + (((((uintmax_t) 0x131fU << 28 | 0xf741d81U) + << 28 | 0xc6a01a3U) + << 28 | 0xa77aac1U) + << 28 | 0xfb15099U), + UINTMAX_MAX / 937) +P (4, 56, + (((((uintmax_t) 0xc53cU << 28 | 0xaad918cU) + << 28 | 0x1b34817U) + << 28 | 0xf0c3e07U) + << 28 | 0x12c5825U), + UINTMAX_MAX / 941) +P (6, 62, + (((((uintmax_t) 0xea1aU << 28 | 0x7df8f8bU) + << 28 | 0x37f52fdU) + << 28 | 0x912a70fU) + << 28 | 0xf30637bU), + UINTMAX_MAX / 947) +P (6, 60, + (((((uintmax_t) 0xbb3bU << 28 | 0x5dc0113U) + << 28 | 0x1288ffbU) + << 28 | 0xb3b5dc0U) + << 28 | 0x1131289U), + UINTMAX_MAX / 953) +P (14, 52, + (((((uintmax_t) 0x50beU << 28 | 0x9c31c53U) + << 28 | 0xa81b885U) + << 28 | 0x6d560a0U) + << 28 | 0xf5acdf7U), + UINTMAX_MAX / 967) +P (4, 50, + (((((uintmax_t) 0x6580U << 28 | 0xec3a008U) + << 28 | 0x6fc9296U) + << 28 | 0x472f314U) + << 28 | 0xd3f89e3U), + UINTMAX_MAX / 971) +P (6, 54, + (((((uintmax_t) 0x1108U << 28 | 0x1f71752U) + << 28 | 0x03ab1a7U) + << 28 | 0x6f5c7edU) + << 28 | 0x2253531U), + UINTMAX_MAX / 977) +P (6, 50, + (((((uintmax_t) 0xb81fU << 28 | 0x4053563U) + << 28 | 0x3908981U) + << 28 | 0x6eae7c7U) + << 28 | 0xbf69fe7U), + UINTMAX_MAX / 983) +P (8, 48, + (((((uintmax_t) 0x9c8bU << 28 | 0x7ed668eU) + << 28 | 0x14263b6U) + << 28 | 0xa2bea4cU) + << 28 | 0xfb1781fU), + UINTMAX_MAX / 991) +P (6, 52, + (((((uintmax_t) 0x0291U << 28 | 0x54fdb06U) + << 28 | 0x6b547a3U) + << 28 | 0x900c533U) + << 28 | 0x18e81edU), + UINTMAX_MAX / 997) +P (12, 42, + (((((uintmax_t) 0x2240U << 28 | 0x71aa3e6U) + << 28 | 0xa0db360U) + << 28 | 0xaa7f5d9U) + << 28 | 0xf148d11U), + UINTMAX_MAX / 1009) +P (4, 48, + (((((uintmax_t) 0x02c7U << 28 | 0xa505cffU) + << 28 | 0xbf4e16bU) + << 28 | 0xe8c0102U) + << 28 | 0xc7a505dU), + UINTMAX_MAX / 1013) +P (6, 44, + (((((uintmax_t) 0xcafdU << 28 | 0xbd2c779U) + << 28 | 0x57ad98fU) + << 28 | 0xf3f0ed2U) + << 28 | 0x8728f33U), + UINTMAX_MAX / 1019) +P (2, 48, + (((((uintmax_t) 0x513cU << 28 | 0xedb245bU) + << 28 | 0x4473568U) + << 28 | 0x0e0a87eU) + << 28 | 0x5ec7155U), + UINTMAX_MAX / 1021) +P (10, 56, + (((((uintmax_t) 0x2e6eU << 28 | 0xbe33267U) + << 28 | 0xca5ddbbU) + << 28 | 0xf70fa49U) + << 28 | 0xfe829b7U), + UINTMAX_MAX / 1031) +P (2, 58, + (((((uintmax_t) 0x007eU << 28 | 0xe2825abU) + << 28 | 0x3eb2ed6U) + << 28 | 0x9d1e7b6U) + << 28 | 0xa50ca39U), + UINTMAX_MAX / 1033) +P (6, 54, + (((((uintmax_t) 0x2f8dU << 28 | 0xacb84cdU) + << 28 | 0xfb90a1aU) + << 28 | 0x1e0f46bU) + << 28 | 0x6d26aefU), + UINTMAX_MAX / 1039) +P (10, 48, + (((((uintmax_t) 0x01f3U << 28 | 0xcc435b0U) + << 28 | 0x713c474U) + << 28 | 0x29f9a7aU) + << 28 | 0x8251829U), + UINTMAX_MAX / 1049) +P (2, 52, + (((((uintmax_t) 0x8c0eU << 28 | 0x9d59e14U) + << 28 | 0xf29a6d9U) + << 28 | 0xc2219d1U) + << 28 | 0xb863613U), + UINTMAX_MAX / 1051) +P (10, 48, + (((((uintmax_t) 0x6e81U << 28 | 0xcf42d5cU) + << 28 | 0x6932e91U) + << 28 | 0x406c182U) + << 28 | 0x0d077adU), + UINTMAX_MAX / 1061) +P (2, 54, + (((((uintmax_t) 0x9c4cU << 28 | 0x1a02688U) + << 28 | 0x4efdd52U) + << 28 | 0x1f4ec02U) + << 28 | 0xe3d2b97U), + UINTMAX_MAX / 1063) +P (6, 54, + (((((uintmax_t) 0x7bcfU << 28 | 0x2599067U) + << 28 | 0x74255bbU) + << 28 | 0x8283b63U) + << 28 | 0xdc8eba5U), + UINTMAX_MAX / 1069) +P (18, 42, + (((((uintmax_t) 0x46a7U << 28 | 0x3667275U) + << 28 | 0x48c5d43U) + << 28 | 0x1eda153U) + << 28 | 0x229ebbfU), + UINTMAX_MAX / 1087) +P (4, 60, + (((((uintmax_t) 0xe720U << 28 | 0x9daecfeU) + << 28 | 0x5b832afU) + << 28 | 0x0bf78d7U) + << 28 | 0xe01686bU), + UINTMAX_MAX / 1091) +P (2, 60, + (((((uintmax_t) 0x194bU << 28 | 0xa6ff4c1U) + << 28 | 0xeeaafa9U) + << 28 | 0xced0742U) + << 28 | 0xc086e8dU), + UINTMAX_MAX / 1093) +P (4, 66, + (((((uintmax_t) 0x777bU << 28 | 0x730c5e4U) + << 28 | 0x768c7c2U) + << 28 | 0x6458ad9U) + << 28 | 0xf632df9U), + UINTMAX_MAX / 1097) +P (6, 68, + (((((uintmax_t) 0x2aefU << 28 | 0xfc49577U) + << 28 | 0xfe24abbU) + << 28 | 0xff1255dU) + << 28 | 0xff892afU), + UINTMAX_MAX / 1103) +P (6, 72, + (((((uintmax_t) 0xf1b0U << 28 | 0x213da24U) + << 28 | 0x78f59cbU) + << 28 | 0xd49a333U) + << 28 | 0xf04d8fdU), + UINTMAX_MAX / 1109) +P (8, 70, + (((((uintmax_t) 0x8822U << 28 | 0xd60f205U) + << 28 | 0x0ac58ecU) + << 28 | 0x84ed6f9U) + << 28 | 0xcfdeff5U), + UINTMAX_MAX / 1117) +P (6, 70, + (((((uintmax_t) 0x3606U << 28 | 0xd6bd351U) + << 28 | 0xd682d97U) + << 28 | 0x980cc40U) + << 28 | 0xbda9d4bU), + UINTMAX_MAX / 1123) +P (6, 72, + (((((uintmax_t) 0x0122U << 28 | 0x3d38ea0U) + << 28 | 0x15c4977U) + << 28 | 0x7f34d52U) + << 28 | 0x4f5cbd9U), + UINTMAX_MAX / 1129) +P (22, 62, + (((((uintmax_t) 0x78feU << 28 | 0x716e8a5U) + << 28 | 0x7a1b227U) + << 28 | 0x97051d9U) + << 28 | 0x4cbbb7fU), + UINTMAX_MAX / 1151) +P (2, 64, + (((((uintmax_t) 0xd6ecU << 28 | 0xaef5908U) + << 28 | 0xa8be0eaU) + << 28 | 0x769051bU) + << 28 | 0x4f43b81U), + UINTMAX_MAX / 1153) +P (10, 60, + (((((uintmax_t) 0x7867U << 28 | 0xe595e6eU) + << 28 | 0x801c2ceU) + << 28 | 0x7910f30U) + << 28 | 0x34d4323U), + UINTMAX_MAX / 1163) +P (8, 58, + (((((uintmax_t) 0xa705U << 28 | 0xe713e4eU) + << 28 | 0x43c5692U) + << 28 | 0x791d137U) + << 28 | 0x4f5b99bU), + UINTMAX_MAX / 1171) +P (10, 50, + (((((uintmax_t) 0x92c0U << 28 | 0x0ddf7c3U) + << 28 | 0x4e40989U) + << 28 | 0xa5645ccU) + << 28 | 0x68ea1b5U), + UINTMAX_MAX / 1181) +P (6, 50, + (((((uintmax_t) 0xab06U << 28 | 0xaf8e205U) + << 28 | 0x9b7f75fU) + << 28 | 0x8aacf79U) + << 28 | 0x6c0cf0bU), + UINTMAX_MAX / 1187) +P (6, 56, + (((((uintmax_t) 0xe187U << 28 | 0x673725fU) + << 28 | 0xb4774f2U) + << 28 | 0xe90a15eU) + << 28 | 0x33edf99U), + UINTMAX_MAX / 1193) +P (8, 58, + (((((uintmax_t) 0x57d1U << 28 | 0xf5579b6U) + << 28 | 0x3f8538eU) + << 28 | 0x99e5febU) + << 28 | 0x897c451U), + UINTMAX_MAX / 1201) +P (12, 64, + (((((uintmax_t) 0x5f64U << 28 | 0xab5ec29U) + << 28 | 0x5d7e6acU) + << 28 | 0xa2eda38U) + << 28 | 0xfb91695U), + UINTMAX_MAX / 1213) +P (4, 62, + (((((uintmax_t) 0x48c8U << 28 | 0x41a1574U) + << 28 | 0xbf0035dU) + << 28 | 0x9b737beU) + << 28 | 0x5ea8b41U), + UINTMAX_MAX / 1217) +P (6, 60, + (((((uintmax_t) 0x348aU << 28 | 0x26ef0b8U) + << 28 | 0x33e964aU) + << 28 | 0xefe1db9U) + << 28 | 0x3fd7cf7U), + UINTMAX_MAX / 1223) +P (6, 60, + (((((uintmax_t) 0x5247U << 28 | 0x3d081faU) + << 28 | 0x958f1a0U) + << 28 | 0x994ef20U) + << 28 | 0xb3f8805U), + UINTMAX_MAX / 1229) +P (2, 60, + (((((uintmax_t) 0x0ec3U << 28 | 0xe6367c5U) + << 28 | 0xc55ae10U) + << 28 | 0x3890bdaU) + << 28 | 0x912822fU), + UINTMAX_MAX / 1231) +P (6, 60, + (((((uintmax_t) 0xb57fU << 28 | 0x46921bbU) + << 28 | 0xb4ab5b4U) + << 28 | 0x41659d1U) + << 28 | 0x3a9147dU), + UINTMAX_MAX / 1237) +P (12, 52, + (((((uintmax_t) 0xb2eeU << 28 | 0xfcecf03U) + << 28 | 0x7c00d1eU) + << 28 | 0x2134440U) + << 28 | 0xc4c3f21U), + UINTMAX_MAX / 1249) +P (10, 44, + (((((uintmax_t) 0xed4bU << 28 | 0x07ee1b3U) + << 28 | 0xf3ccc26U) + << 28 | 0x3a27727U) + << 28 | 0xa6883c3U), + UINTMAX_MAX / 1259) +P (18, 30, + (((((uintmax_t) 0x435bU << 28 | 0x9d5e6bdU) + << 28 | 0xa4fc978U) + << 28 | 0xe221472U) + << 28 | 0xab33855U), + UINTMAX_MAX / 1277) +P (2, 40, + (((((uintmax_t) 0x6013U << 28 | 0x370b023U) + << 28 | 0x3a3ed95U) + << 28 | 0xeac88e8U) + << 28 | 0x2e6faffU), + UINTMAX_MAX / 1279) +P (4, 38, + (((((uintmax_t) 0x3447U << 28 | 0x089473bU) + << 28 | 0xa900ff6U) + << 28 | 0x6c25831U) + << 28 | 0x7be8dabU), + UINTMAX_MAX / 1283) +P (6, 38, + (((((uintmax_t) 0x0f7dU << 28 | 0xb74fa3dU) + << 28 | 0x912de09U) + << 28 | 0xee202c7U) + << 28 | 0xcb91939U), + UINTMAX_MAX / 1289) +P (2, 70, + (((((uintmax_t) 0x5316U << 28 | 0x02c6b14U) + << 28 | 0x6caa88dU) + << 28 | 0x2fca104U) + << 28 | 0x2a09ea3U), + UINTMAX_MAX / 1291) +P (6, 70, + (((((uintmax_t) 0x2128U << 28 | 0xdb7c26aU) + << 28 | 0xfaabb82U) + << 28 | 0x779c856U) + << 28 | 0xd8b8bf1U), + UINTMAX_MAX / 1297) +P (4, 72, + (((((uintmax_t) 0xb01cU << 28 | 0x55cadf2U) + << 28 | 0x39d9d38U) + << 28 | 0x79361cbU) + << 28 | 0xa8a223dU), + UINTMAX_MAX / 1301) +P (2, 78, + (((((uintmax_t) 0x3d4cU << 28 | 0x6d3cb58U) + << 28 | 0x9b9a9f2U) + << 28 | 0x3f43639U) + << 28 | 0xc3182a7U), + UINTMAX_MAX / 1303) +P (4, 92, + (((((uintmax_t) 0x0bc0U << 28 | 0x89e42fcU) + << 28 | 0xab94aa0U) + << 28 | 0x3868fc4U) + << 28 | 0x74bcd13U), + UINTMAX_MAX / 1307) +P (12, 90, + (((((uintmax_t) 0x34fcU << 28 | 0x4ff6af1U) + << 28 | 0x0e2b165U) + << 28 | 0x1e78b8cU) + << 28 | 0x5311a97U), + UINTMAX_MAX / 1319) +P (2, 102, + (((((uintmax_t) 0x18ffU << 28 | 0xce639c0U) + << 28 | 0x0c6718fU) + << 28 | 0xfce639cU) + << 28 | 0x00c6719U), + UINTMAX_MAX / 1321) +P (6, 100, + (((((uintmax_t) 0x9b4cU << 28 | 0x33b39aeU) + << 28 | 0x96dc4f7U) + << 28 | 0xb460754U) + << 28 | 0xb0b61cfU), + UINTMAX_MAX / 1327) +P (34, 68, + (((((uintmax_t) 0xbbe8U << 28 | 0xad0c9a3U) + << 28 | 0xd51d27bU) + << 28 | 0x03f3359U) + << 28 | 0xb8e63b1U), + UINTMAX_MAX / 1361) +P (6, 66, + (((((uintmax_t) 0xa28dU << 28 | 0x33dfca1U) + << 28 | 0x0dabba5U) + << 28 | 0x5c53260U) + << 28 | 0x41eb667U), + UINTMAX_MAX / 1367) +P (6, 66, + (((((uintmax_t) 0x677bU << 28 | 0x3ed5acdU) + << 28 | 0x78a2964U) + << 28 | 0x7f88ab8U) + << 28 | 0x96a76f5U), + UINTMAX_MAX / 1373) +P (8, 66, + (((((uintmax_t) 0xf4e0U << 28 | 0xac06ac6U) + << 28 | 0x595988fU) + << 28 | 0xd971434U) + << 28 | 0xa55a46dU), + UINTMAX_MAX / 1381) +P (18, 52, + (((((uintmax_t) 0x3ba7U << 28 | 0x6f12d90U) + << 28 | 0x609e19fU) + << 28 | 0xbf96995U) + << 28 | 0x8046447U), + UINTMAX_MAX / 1399) +P (10, 44, + (((((uintmax_t) 0x3d69U << 28 | 0x32b0f71U) + << 28 | 0x8e43399U) + << 28 | 0x86feba6U) + << 28 | 0x9be3a81U), + UINTMAX_MAX / 1409) +P (14, 36, + (((((uintmax_t) 0xb7adU << 28 | 0xf701426U) + << 28 | 0x239eda6U) + << 28 | 0x68b3e6dU) + << 28 | 0x053796fU), + UINTMAX_MAX / 1423) +P (4, 44, + (((((uintmax_t) 0xd0d1U << 28 | 0x893d2caU) + << 28 | 0xb80fc97U) + << 28 | 0x694e658U) + << 28 | 0x9f4e09bU), + UINTMAX_MAX / 1427) +P (2, 52, + (((((uintmax_t) 0xc00bU << 28 | 0x7721dbcU) + << 28 | 0xffd2237U) + << 28 | 0x890c00bU) + << 28 | 0x7721dbdU), + UINTMAX_MAX / 1429) +P (4, 50, + (((((uintmax_t) 0xe9d9U << 28 | 0x0e1cf0dU) + << 28 | 0x0a8a45aU) + << 28 | 0xc094a23U) + << 28 | 0x5f37ea9U), + UINTMAX_MAX / 1433) +P (6, 48, + (((((uintmax_t) 0x8489U << 28 | 0x56fe661U) + << 28 | 0xd881831U) + << 28 | 0xcff775fU) + << 28 | 0x2d5d65fU), + UINTMAX_MAX / 1439) +P (8, 42, + (((((uintmax_t) 0xfd85U << 28 | 0xed3f28dU) + << 28 | 0xe356dddU) + << 28 | 0xad8e6b3U) + << 28 | 0x6505217U), + UINTMAX_MAX / 1447) +P (4, 42, + (((((uintmax_t) 0x0a68U << 28 | 0xcca8aacU) + << 28 | 0x8c7035aU) + << 28 | 0x27df897U) + << 28 | 0x062cd03U), + UINTMAX_MAX / 1451) +P (2, 46, + (((((uintmax_t) 0x57eaU << 28 | 0xdb877ceU) + << 28 | 0xaae6ce2U) + << 28 | 0x396fe0fU) + << 28 | 0xdb5a625U), + UINTMAX_MAX / 1453) +P (6, 52, + (((((uintmax_t) 0x1c12U << 28 | 0xf330f43U) + << 28 | 0xe76f6b3U) + << 28 | 0x52a4957U) + << 28 | 0xe82317bU), + UINTMAX_MAX / 1459) +P (12, 52, + (((((uintmax_t) 0x472dU << 28 | 0xc52d6c1U) + << 28 | 0x2cb9dd8U) + << 28 | 0xab3f2c6U) + << 28 | 0x0c2ea3fU), + UINTMAX_MAX / 1471) +P (10, 50, + (((((uintmax_t) 0xda51U << 28 | 0x3e0e2c9U) + << 28 | 0x8ce0b68U) + << 28 | 0x93f702fU) + << 28 | 0x0452479U), + UINTMAX_MAX / 1481) +P (2, 60, + (((((uintmax_t) 0x442fU << 28 | 0xa4dae2dU) + << 28 | 0x3a2c896U) + << 28 | 0x86fdc18U) + << 28 | 0x2acf7e3U), + UINTMAX_MAX / 1483) +P (4, 62, + (((((uintmax_t) 0x091fU << 28 | 0xd96fbb2U) + << 28 | 0x2f2be68U) + << 28 | 0x5403717U) + << 28 | 0x3dce12fU), + UINTMAX_MAX / 1487) +P (2, 64, + (((((uintmax_t) 0x3accU << 28 | 0x97fbdfaU) + << 28 | 0xd798d7fU) + << 28 | 0x0ded168U) + << 28 | 0x5c27331U), + UINTMAX_MAX / 1489) +P (4, 66, + (((((uintmax_t) 0x4d54U << 28 | 0xe047548U) + << 28 | 0x87cd3eeU) + << 28 | 0xda72e1fU) + << 28 | 0xe490b7dU), + UINTMAX_MAX / 1493) +P (6, 68, + (((((uintmax_t) 0x7e8cU << 28 | 0x61afbbbU) + << 28 | 0x013209eU) + << 28 | 0x7bfc959U) + << 28 | 0xa8e6e53U), + UINTMAX_MAX / 1499) +P (12, 60, + (((((uintmax_t) 0xc4b3U << 28 | 0x96f4fccU) + << 28 | 0x7ebab49U) + << 28 | 0xb314d6dU) + << 28 | 0x4753dd7U), + UINTMAX_MAX / 1511) +P (12, 56, + (((((uintmax_t) 0x9eadU << 28 | 0x21c933fU) + << 28 | 0x089292eU) + << 28 | 0x8f8c5acU) + << 28 | 0x4aa1b3bU), + UINTMAX_MAX / 1523) +P (8, 52, + (((((uintmax_t) 0x0584U << 28 | 0x992a4deU) + << 28 | 0xb99aab8U) + << 28 | 0xef72348U) + << 28 | 0x1163d33U), + UINTMAX_MAX / 1531) +P (12, 54, + (((((uintmax_t) 0x8b08U << 28 | 0x7620d9aU) + << 28 | 0xcb6806aU) + << 28 | 0x2ec96a5U) + << 28 | 0x94287b7U), + UINTMAX_MAX / 1543) +P (6, 52, + (((((uintmax_t) 0xc108U << 28 | 0x6dbce6bU) + << 28 | 0x6c94bdbU) + << 28 | 0xa41c6d1U) + << 28 | 0x3aab8c5U), + UINTMAX_MAX / 1549) +P (4, 54, + (((((uintmax_t) 0xe478U << 28 | 0xaa1e005U) + << 28 | 0x46633c2U) + << 28 | 0xadbe648U) + << 28 | 0xdc3aaf1U), + UINTMAX_MAX / 1553) +P (6, 50, + (((((uintmax_t) 0x5cf1U << 28 | 0x0e9d4faU) + << 28 | 0x40b2a87U) + << 28 | 0xa2bade5U) + << 28 | 0x65f91a7U), + UINTMAX_MAX / 1559) +P (8, 46, + (((((uintmax_t) 0x9ecbU << 28 | 0x8ef2c45U) + << 28 | 0xec11a4dU) + << 28 | 0x6fe8798U) + << 28 | 0xc01f5dfU), + UINTMAX_MAX / 1567) +P (4, 48, + (((((uintmax_t) 0xfb99U << 28 | 0xaa49543U) + << 28 | 0xf39d937U) + << 28 | 0x91310c8U) + << 28 | 0xc23d98bU), + UINTMAX_MAX / 1571) +P (8, 42, + (((((uintmax_t) 0x7abbU << 28 | 0x187b379U) + << 28 | 0xc2112f8U) + << 28 | 0x0e446b0U) + << 28 | 0x1228883U), + UINTMAX_MAX / 1579) +P (4, 44, + (((((uintmax_t) 0x3cceU << 28 | 0x5a3d212U) + << 28 | 0x6f95e9aU) + << 28 | 0xed1436fU) + << 28 | 0xbf500cfU), + UINTMAX_MAX / 1583) +P (14, 40, + (((((uintmax_t) 0xc6eeU << 28 | 0xd90c05cU) + << 28 | 0x5547a78U) + << 28 | 0x39b54ccU) + << 28 | 0x8b24115U), + UINTMAX_MAX / 1597) +P (4, 56, + (((((uintmax_t) 0x8798U << 28 | 0x627f99aU) + << 28 | 0x9f948c1U) + << 28 | 0x28c646aU) + << 28 | 0xd0309c1U), + UINTMAX_MAX / 1601) +P (6, 56, + (((((uintmax_t) 0x5233U << 28 | 0x4bab403U) + << 28 | 0x2fa1b14U) + << 28 | 0xde63162U) + << 28 | 0x4a3c377U), + UINTMAX_MAX / 1607) +P (2, 58, + (((((uintmax_t) 0x0e51U << 28 | 0xc7ad43fU) + << 28 | 0x016e93fU) + << 28 | 0x7b9fe68U) + << 28 | 0xb0ecbf9U), + UINTMAX_MAX / 1609) +P (4, 56, + (((((uintmax_t) 0x00a2U << 28 | 0x84ffd75U) + << 28 | 0xec00a28U) + << 28 | 0x4ffd75eU) + << 28 | 0xc00a285U), + UINTMAX_MAX / 1613) +P (6, 74, + (((((uintmax_t) 0xe72cU << 28 | 0xbfa4ebeU) + << 28 | 0xb20bb37U) + << 28 | 0x803cb80U) + << 28 | 0xdea2ddbU), + UINTMAX_MAX / 1619) +P (2, 76, + (((((uintmax_t) 0x22beU << 28 | 0x75d04e5U) + << 28 | 0x4f6ff86U) + << 28 | 0xb63f7c9U) + << 28 | 0xac4c6fdU), + UINTMAX_MAX / 1621) +P (6, 72, + (((((uintmax_t) 0x84f4U << 28 | 0xd419cdfU) + << 28 | 0x6dfbe8bU) + << 28 | 0x6851d1bU) + << 28 | 0xd99b9d3U), + UINTMAX_MAX / 1627) +P (10, 72, + (((((uintmax_t) 0xe83aU << 28 | 0xccdcd04U) + << 28 | 0xd90f7b6U) + << 28 | 0x2fda77cU) + << 28 | 0xa343b6dU), + UINTMAX_MAX / 1637) +P (20, 64, + (((((uintmax_t) 0x9e34U << 28 | 0x383c8ffU) + << 28 | 0xd872f1fU) + << 28 | 0x0dc009eU) + << 28 | 0x34383c9U), + UINTMAX_MAX / 1657) +P (6, 60, + (((((uintmax_t) 0x2e7dU << 28 | 0x4e5ad2eU) + << 28 | 0x55e5d49U) + << 28 | 0x6dc21ddU) + << 28 | 0xd35b97fU), + UINTMAX_MAX / 1663) +P (4, 66, + (((((uintmax_t) 0xe596U << 28 | 0x098573aU) + << 28 | 0x33e80b0U) + << 28 | 0xe96ce17U) + << 28 | 0x090f82bU), + UINTMAX_MAX / 1667) +P (2, 72, + (((((uintmax_t) 0x7181U << 28 | 0x4dc42e0U) + << 28 | 0x3fceeaaU) + << 28 | 0xdf05acdU) + << 28 | 0xd7d024dU), + UINTMAX_MAX / 1669) +P (24, 54, + (((((uintmax_t) 0xa4abU << 28 | 0x2bb32f5U) + << 28 | 0x43975cbU) + << 28 | 0x1381967U) + << 28 | 0x46eafb5U), + UINTMAX_MAX / 1693) +P (4, 56, + (((((uintmax_t) 0xa2ecU << 28 | 0x3cf1f87U) + << 28 | 0x5102434U) + << 28 | 0x7f52373U) + << 28 | 0x6755d61U), + UINTMAX_MAX / 1697) +P (2, 60, + (((((uintmax_t) 0x6ff3U << 28 | 0xf223422U) + << 28 | 0x5ab51d1U) + << 28 | 0x4a48a05U) + << 28 | 0x1f7dd0bU), + UINTMAX_MAX / 1699) +P (10, 68, + (((((uintmax_t) 0x6c00U << 28 | 0x9963e9dU) + << 28 | 0x48f3447U) + << 28 | 0x4d71b1cU) + << 28 | 0xe914d25U), + UINTMAX_MAX / 1709) +P (12, 62, + (((((uintmax_t) 0x894cU << 28 | 0x02f99a8U) + << 28 | 0xd502d38U) + << 28 | 0x6063f5eU) + << 28 | 0x28c1f89U), + UINTMAX_MAX / 1721) +P (2, 64, + (((((uintmax_t) 0xc8e0U << 28 | 0xa6684d4U) + << 28 | 0x2b6281dU) + << 28 | 0xb7325e3U) + << 28 | 0x2d04e73U), + UINTMAX_MAX / 1723) +P (10, 56, + (((((uintmax_t) 0xf8c2U << 28 | 0xfdc8c0aU) + << 28 | 0x0b85afeU) + << 28 | 0xf748d38U) + << 28 | 0x93b880dU), + UINTMAX_MAX / 1733) +P (8, 60, + (((((uintmax_t) 0xd0a7U << 28 | 0x0a25594U) + << 28 | 0x123bb2fU) + << 28 | 0x3351506U) + << 28 | 0xe935605U), + UINTMAX_MAX / 1741) +P (6, 64, + (((((uintmax_t) 0xdb5dU << 28 | 0xa31878bU) + << 28 | 0xf158a7aU) + << 28 | 0x3637fa2U) + << 28 | 0x376415bU), + UINTMAX_MAX / 1747) +P (6, 70, + (((((uintmax_t) 0x75b4U << 28 | 0x5a8abbcU) + << 28 | 0xd2e004aU) + << 28 | 0xc525d2bU) + << 28 | 0xaa21969U), + UINTMAX_MAX / 1753) +P (6, 72, + (((((uintmax_t) 0x7e53U << 28 | 0x89d2e22U) + << 28 | 0xa34af3aU) + << 28 | 0x11c16b4U) + << 28 | 0x2cd351fU), + UINTMAX_MAX / 1759) +P (18, 70, + (((((uintmax_t) 0xeaf7U << 28 | 0x801270aU) + << 28 | 0x843ff6cU) + << 28 | 0x7abde00U) + << 28 | 0x49c2a11U), + UINTMAX_MAX / 1777) +P (6, 78, + (((((uintmax_t) 0x1ad9U << 28 | 0x60a0cecU) + << 28 | 0x0ae9754U) + << 28 | 0xdad0303U) + << 28 | 0xe069ac7U), + UINTMAX_MAX / 1783) +P (4, 80, + (((((uintmax_t) 0x082aU << 28 | 0x676e737U) + << 28 | 0x70be3ebU) + << 28 | 0xf1ac9fdU) + << 28 | 0xfe91433U), + UINTMAX_MAX / 1787) +P (2, 82, + (((((uintmax_t) 0x50b4U << 28 | 0xdfcda14U) + << 28 | 0x51d9efaU) + << 28 | 0xfdda823U) + << 28 | 0x7cec655U), + UINTMAX_MAX / 1789) +P (12, 72, + (((((uintmax_t) 0x1ffbU << 28 | 0x738ffdbU) + << 28 | 0x9c7fedcU) + << 28 | 0xe3ff6e7U) + << 28 | 0x1ffb739U), + UINTMAX_MAX / 1801) +P (10, 66, + (((((uintmax_t) 0xa660U << 28 | 0xf8ca6cdU) + << 28 | 0x88f9ebeU) + << 28 | 0xd5737d6U) + << 28 | 0x286db1bU), + UINTMAX_MAX / 1811) +P (12, 56, + (((((uintmax_t) 0xed52U << 28 | 0xb6467eaU) + << 28 | 0xa7abbe4U) + << 28 | 0x79e431fU) + << 28 | 0xe08b4dfU), + UINTMAX_MAX / 1823) +P (8, 58, + (((((uintmax_t) 0xdaf2U << 28 | 0xff4d09aU) + << 28 | 0x5ae119dU) + << 28 | 0xd9b0dd7U) + << 28 | 0x742f897U), + UINTMAX_MAX / 1831) +P (16, 54, + (((((uintmax_t) 0x6054U << 28 | 0x454d33bU) + << 28 | 0x2efc88fU) + << 28 | 0x09d7402U) + << 28 | 0xc5a5e87U), + UINTMAX_MAX / 1847) +P (14, 46, + (((((uintmax_t) 0xf545U << 28 | 0x31625b1U) + << 28 | 0x0a51292U) + << 28 | 0x16d5c4dU) + << 28 | 0x958738dU), + UINTMAX_MAX / 1861) +P (6, 46, + (((((uintmax_t) 0x6df8U << 28 | 0x0c1100aU) + << 28 | 0xf82f2b3U) + << 28 | 0x139ba11U) + << 28 | 0xd34ca63U), + UINTMAX_MAX / 1867) +P (4, 60, + (((((uintmax_t) 0xaf8bU << 28 | 0xf8e2952U) + << 28 | 0x3b61d47U) + << 28 | 0xd54f7edU) + << 28 | 0x644afafU), + UINTMAX_MAX / 1871) +P (2, 60, + (((((uintmax_t) 0x4d5cU << 28 | 0x4227171U) + << 28 | 0x9491f92U) + << 28 | 0xa81d85cU) + << 28 | 0xf11a1b1U), + UINTMAX_MAX / 1873) +P (4, 72, + (((((uintmax_t) 0xf78bU << 28 | 0x4082eeaU) + << 28 | 0xdc21475U) + << 28 | 0x4b26533U) + << 28 | 0x253bdfdU), + UINTMAX_MAX / 1877) +P (2, 72, + (((((uintmax_t) 0xf354U << 28 | 0x558f76aU) + << 28 | 0xad92bbbU) + << 28 | 0xe0efc98U) + << 28 | 0x0bfd467U), + UINTMAX_MAX / 1879) +P (10, 84, + (((((uintmax_t) 0x0ab4U << 28 | 0xc91d231U) + << 28 | 0x99d11c0U) + << 28 | 0xd8d594fU) + << 28 | 0x024dca1U), + UINTMAX_MAX / 1889) +P (12, 78, + (((((uintmax_t) 0x1b56U << 28 | 0x52256feU) + << 28 | 0x84c7d82U) + << 28 | 0x38d43bcU) + << 28 | 0xaac1a65U), + UINTMAX_MAX / 1901) +P (6, 80, + (((((uintmax_t) 0xaca2U << 28 | 0xb39dbc1U) + << 28 | 0x2cb3e27U) + << 28 | 0x779c1faU) + << 28 | 0xe6175bbU), + UINTMAX_MAX / 1907) +P (6, 80, + (((((uintmax_t) 0x3856U << 28 | 0xb755c78U) + << 28 | 0x7068ea7U) + << 28 | 0x46ca9afU) + << 28 | 0x708b2c9U), + UINTMAX_MAX / 1913) +P (18, 66, + (((((uintmax_t) 0x052bU << 28 | 0x9de5385U) + << 28 | 0x8076c93U) + << 28 | 0xf3cd9f3U) + << 28 | 0x89be823U), + UINTMAX_MAX / 1931) +P (2, 66, + (((((uintmax_t) 0x820dU << 28 | 0x822f698U) + << 28 | 0xd4f545cU) + << 28 | 0xb4a4c04U) + << 28 | 0xc489345U), + UINTMAX_MAX / 1933) +P (16, 54, + (((((uintmax_t) 0xcd09U << 28 | 0x536828fU) + << 28 | 0xb23dbbfU) + << 28 | 0x6047743U) + << 28 | 0xe85b6b5U), + UINTMAX_MAX / 1949) +P (2, 60, + (((((uintmax_t) 0x8486U << 28 | 0xe386c1eU) + << 28 | 0xf778961U) + << 28 | 0xc147831U) + << 28 | 0x563545fU), + UINTMAX_MAX / 1951) +P (22, 44, + (((((uintmax_t) 0xec68U << 28 | 0x5200c74U) + << 28 | 0xc6c78edU) + << 28 | 0xb47c0aeU) + << 28 | 0x62dee9dU), + UINTMAX_MAX / 1973) +P (6, 48, + (((((uintmax_t) 0xd8acU << 28 | 0xd298624U) + << 28 | 0xff1830aU) + << 28 | 0x3824386U) + << 28 | 0x673a573U), + UINTMAX_MAX / 1979) +P (8, 42, + (((((uintmax_t) 0x03ddU << 28 | 0x78b87ecU) + << 28 | 0x6aad6a4U) + << 28 | 0xa77d19eU) + << 28 | 0x575a0ebU), + UINTMAX_MAX / 1987) +P (6, 46, + (((((uintmax_t) 0x8950U << 28 | 0x062a636U) + << 28 | 0xb8325a2U) + << 28 | 0xbee045eU) + << 28 | 0x066c279U), + UINTMAX_MAX / 1993) +P (4, 56, + (((((uintmax_t) 0xa9daU << 28 | 0xd301275U) + << 28 | 0xae369c2U) + << 28 | 0x3618de8U) + << 28 | 0xab43d05U), + UINTMAX_MAX / 1997) +P (2, 64, + (((((uintmax_t) 0xfa3cU << 28 | 0xb3cd496U) + << 28 | 0x174ec26U) + << 28 | 0x6b51521U) + << 28 | 0x6cb9f2fU), + UINTMAX_MAX / 1999) +P (4, 66, + (((((uintmax_t) 0x5c05U << 28 | 0x9fa1eedU) + << 28 | 0xfaa1ce2U) + << 28 | 0x79edd9eU) + << 28 | 0x9c2e85bU), + UINTMAX_MAX / 2003) +P (8, 70, + (((((uintmax_t) 0x8e52U << 28 | 0x3c5712bU) + << 28 | 0x68c48d0U) + << 28 | 0xc591c22U) + << 28 | 0x1dc9c53U), + UINTMAX_MAX / 2011) +P (6, 66, + (((((uintmax_t) 0x8de5U << 28 | 0xdaaf67bU) + << 28 | 0x1d10a06U) + << 28 | 0xda8ee9cU) + << 28 | 0x9ee7c21U), + UINTMAX_MAX / 2017) +P (10, 60, + (((((uintmax_t) 0xec2bU << 28 | 0xf35ed8fU) + << 28 | 0x98f179dU) + << 28 | 0xfebcaf4U) + << 28 | 0xc27e8c3U), + UINTMAX_MAX / 2027) +P (2, 60, + (((((uintmax_t) 0xe8c8U << 28 | 0xdd0cfedU) + << 28 | 0xd4d9849U) + << 28 | 0xaeff9f1U) + << 28 | 0x9dd6de5U), + UINTMAX_MAX / 2029) +P (10, 60, + (((((uintmax_t) 0x65f2U << 28 | 0xb107280U) + << 28 | 0xd0eb086U) + << 28 | 0x976a57aU) + << 28 | 0x296e9c7U), + UINTMAX_MAX / 2039) +P (14, 58, + (((((uintmax_t) 0x44b5U << 28 | 0x0ed6b9cU) + << 28 | 0xbe093a3U) + << 28 | 0xb9abf48U) + << 28 | 0x72b84cdU), + UINTMAX_MAX / 2053) +P (10, 50, + (((((uintmax_t) 0x9e96U << 28 | 0xa5899dfU) + << 28 | 0x7cf5b34U) + << 28 | 0xfca6483U) + << 28 | 0x895e6efU), + UINTMAX_MAX / 2063) +P (6, 60, + (((((uintmax_t) 0x49beU << 28 | 0x6c24212U) + << 28 | 0x8f47e34U) + << 28 | 0xb5a3339U) + << 28 | 0x88f873dU), + UINTMAX_MAX / 2069) +P (12, 50, + (((((uintmax_t) 0xd1fdU << 28 | 0xc922526U) + << 28 | 0xc0275d9U) + << 28 | 0xdd4f19bU) + << 28 | 0x5f17be1U), + UINTMAX_MAX / 2081) +P (2, 54, + (((((uintmax_t) 0xb8d7U << 28 | 0x51f95d0U) + << 28 | 0x8f8bfb9U) + << 28 | 0x35b507fU) + << 28 | 0xd0ce78bU), + UINTMAX_MAX / 2083) +P (4, 54, + (((((uintmax_t) 0x971fU << 28 | 0x47835f8U) + << 28 | 0xe2aeeb4U) + << 28 | 0x50f5540U) + << 28 | 0x660e797U), + UINTMAX_MAX / 2087) +P (2, 54, + (((((uintmax_t) 0x418fU << 28 | 0xfe0a0c7U) + << 28 | 0xff05063U) + << 28 | 0xff82831U) + << 28 | 0xffc1419U), + UINTMAX_MAX / 2089) +P (10, 54, + (((((uintmax_t) 0xd06fU << 28 | 0x3ae8760U) + << 28 | 0xf5e0889U) + << 28 | 0x92f718cU) + << 28 | 0x22a32fbU), + UINTMAX_MAX / 2099) +P (12, 50, + (((((uintmax_t) 0x16adU << 28 | 0x6a5a779U) + << 28 | 0x25f515fU) + << 28 | 0x3253ad0U) + << 28 | 0xd37e7bfU), + UINTMAX_MAX / 2111) +P (2, 66, + (((((uintmax_t) 0xfe0fU << 28 | 0xc007c0fU) + << 28 | 0xfe0fc00U) + << 28 | 0x7c0ffe0U) + << 28 | 0xfc007c1U), + UINTMAX_MAX / 2113) +P (16, 74, + (((((uintmax_t) 0x9763U << 28 | 0x3395b43U) + << 28 | 0xf020b4dU) + << 28 | 0x8ebadc0U) + << 28 | 0xc0640b1U), + UINTMAX_MAX / 2129) +P (2, 76, + (((((uintmax_t) 0x9a20U << 28 | 0xea7f195U) + << 28 | 0x90471e2U) + << 28 | 0x729af83U) + << 28 | 0x1037bdbU), + UINTMAX_MAX / 2131) +P (6, 76, + (((((uintmax_t) 0x7285U << 28 | 0xee07e80U) + << 28 | 0xa8ab8b8U) + << 28 | 0xf64bf30U) + << 28 | 0xfeebfe9U), + UINTMAX_MAX / 2137) +P (4, 80, + (((((uintmax_t) 0x3dd1U << 28 | 0x5e1a10fU) + << 28 | 0xa9e8cdaU) + << 28 | 0x93124b5U) + << 28 | 0x44c0bf5U), + UINTMAX_MAX / 2141) +P (2, 94, + (((((uintmax_t) 0x4f14U << 28 | 0xe7bff85U) + << 28 | 0xac9e29cU) + << 28 | 0xf7ff0b5U) + << 28 | 0x93c539fU), + UINTMAX_MAX / 2143) +P (10, 86, + (((((uintmax_t) 0x12e7U << 28 | 0xdccdf10U) + << 28 | 0x4a322d6U) + << 28 | 0xbd8861fU) + << 28 | 0xa0e07d9U), + UINTMAX_MAX / 2153) +P (8, 82, + (((((uintmax_t) 0xd7b8U << 28 | 0xebfac9aU) + << 28 | 0x00b5f5cU) + << 28 | 0xfe75c0bU) + << 28 | 0xd8ab891U), + UINTMAX_MAX / 2161) +P (18, 72, + (((((uintmax_t) 0xae1cU << 28 | 0xe6bd9efU) + << 28 | 0x512ea43U) + << 28 | 0xe808757U) + << 28 | 0xc2e862bU), + UINTMAX_MAX / 2179) +P (24, 64, + (((((uintmax_t) 0x459bU << 28 | 0x5dc70f3U) + << 28 | 0x90e8690U) + << 28 | 0xcaa96d5U) + << 28 | 0x95c9d93U), + UINTMAX_MAX / 2203) +P (4, 62, + (((((uintmax_t) 0x4ec2U << 28 | 0xa38d65bU) + << 28 | 0xa2bd88fU) + << 28 | 0xd550625U) + << 28 | 0xd07135fU), + UINTMAX_MAX / 2207) +P (6, 60, + (((((uintmax_t) 0x525dU << 28 | 0x3cf6a14U) + << 28 | 0x20da676U) + << 28 | 0xb010a86U) + << 28 | 0xe209f2dU), + UINTMAX_MAX / 2213) +P (8, 60, + (((((uintmax_t) 0x716bU << 28 | 0x4f6a9e5U) + << 28 | 0xf3522ecU) + << 28 | 0xc042644U) + << 28 | 0x7769b25U), + UINTMAX_MAX / 2221) +P (16, 50, + (((((uintmax_t) 0x48abU << 28 | 0x336212fU) + << 28 | 0xf32ece3U) + << 28 | 0x81339caU) + << 28 | 0xabe3295U), + UINTMAX_MAX / 2237) +P (2, 54, + (((((uintmax_t) 0xbde9U << 28 | 0xd1944b7U) + << 28 | 0x656aad1U) + << 28 | 0xb190a2dU) + << 28 | 0x0c7673fU), + UINTMAX_MAX / 2239) +P (4, 54, + (((((uintmax_t) 0xb595U << 28 | 0xdb3fccdU) + << 28 | 0xe54afc3U) + << 28 | 0xbce3cf2U) + << 28 | 0x6b0e7ebU), + UINTMAX_MAX / 2243) +P (8, 58, + (((((uintmax_t) 0x8a10U << 28 | 0x9aab45fU) + << 28 | 0x137285fU) + << 28 | 0x87e76f5U) + << 28 | 0x6c61ce3U), + UINTMAX_MAX / 2251) +P (16, 44, + (((((uintmax_t) 0x2e69U << 28 | 0x78b763bU) + << 28 | 0x65f88c0U) + << 28 | 0x6c6857aU) + << 28 | 0x124b353U), + UINTMAX_MAX / 2267) +P (2, 64, + (((((uintmax_t) 0x7e40U << 28 | 0x4f6dc75U) + << 28 | 0xca11d38U) + << 28 | 0xc040fcbU) + << 28 | 0xa630f75U), + UINTMAX_MAX / 2269) +P (4, 66, + (((((uintmax_t) 0xa706U << 28 | 0x6b72173U) + << 28 | 0x37865d0U) + << 28 | 0x78bc4fbU) + << 28 | 0xd533b21U), + UINTMAX_MAX / 2273) +P (8, 60, + (((((uintmax_t) 0x1165U << 28 | 0x5853800U) + << 28 | 0xe5d99deU) + << 28 | 0x8e15c5dU) + << 28 | 0xd354f59U), + UINTMAX_MAX / 2281) +P (6, 60, + (((((uintmax_t) 0xad0dU << 28 | 0xfdfc31bU) + << 28 | 0x33610caU) + << 28 | 0x61d53d7U) + << 28 | 0x414260fU), + UINTMAX_MAX / 2287) +P (6, 58, + (((((uintmax_t) 0x65b5U << 28 | 0x32cc4f0U) + << 28 | 0xb46abb5U) + << 28 | 0x6bf5ba8U) + << 28 | 0xeae635dU), + UINTMAX_MAX / 2293) +P (4, 60, + (((((uintmax_t) 0xcdbcU << 28 | 0x7622fecU) + << 28 | 0x6285844U) + << 28 | 0xa72cb0fU) + << 28 | 0xb6e3949U), + UINTMAX_MAX / 2297) +P (12, 62, + (((((uintmax_t) 0x37c4U << 28 | 0x92cae49U) + << 28 | 0xd6fa587U) + << 28 | 0x9839a71U) + << 28 | 0x4f45bcdU), + UINTMAX_MAX / 2309) +P (2, 66, + (((((uintmax_t) 0xc031U << 28 | 0xa083283U) + << 28 | 0x60ed802U) + << 28 | 0xa8994fdU) + << 28 | 0xe5314b7U), + UINTMAX_MAX / 2311) +P (22, 48, + (((((uintmax_t) 0xc841U << 28 | 0xd685a6aU) + << 28 | 0xe081eb9U) + << 28 | 0x71920cfU) + << 28 | 0x2b90135U), + UINTMAX_MAX / 2333) +P (6, 44, + (((((uintmax_t) 0xc4c9U << 28 | 0xd2b0364U) + << 28 | 0x9549a8aU) + << 28 | 0x8fd0b7dU) + << 28 | 0xf9a6e8bU), + UINTMAX_MAX / 2339) +P (2, 48, + (((((uintmax_t) 0xe3c9U << 28 | 0x5290213U) + << 28 | 0xe7112b3U) + << 28 | 0x1f9a84cU) + << 28 | 0x1c6eaadU), + UINTMAX_MAX / 2341) +P (6, 46, + (((((uintmax_t) 0xf02fU << 28 | 0x1ede4bbU) + << 28 | 0x2c64c92U) + << 28 | 0x293b028U) + << 28 | 0x23c6d83U), + UINTMAX_MAX / 2347) +P (4, 48, + (((((uintmax_t) 0x83f9U << 28 | 0x7773bffU) + << 28 | 0x907f2eeU) + << 28 | 0xe77ff20U) + << 28 | 0xfe5ddcfU), + UINTMAX_MAX / 2351) +P (6, 54, + (((((uintmax_t) 0xd472U << 28 | 0x42b02b7U) + << 28 | 0x1ef460eU) + << 28 | 0x1ea0f6cU) + << 28 | 0x496c11dU), + UINTMAX_MAX / 2357) +P (14, 46, + (((((uintmax_t) 0xd905U << 28 | 0xb8f4727U) + << 28 | 0x318f0fdU) + << 28 | 0xf2d3d6fU) + << 28 | 0x88ccb6bU), + UINTMAX_MAX / 2371) +P (6, 46, + (((((uintmax_t) 0xf2c0U << 28 | 0xc7e3914U) + << 28 | 0x920a1faU) + << 28 | 0x9d74a34U) + << 28 | 0x57738f9U), + UINTMAX_MAX / 2377) +P (4, 56, + (((((uintmax_t) 0x6c7cU << 28 | 0x4a67008U) + << 28 | 0x99f72efU) + << 28 | 0xc3ca3dbU) + << 28 | 0x71a5785U), + UINTMAX_MAX / 2381) +P (2, 58, + (((((uintmax_t) 0x7e55U << 28 | 0xba2c0b9U) + << 28 | 0xa289b8eU) + << 28 | 0x2071718U) + << 28 | 0xd0d6dafU), + UINTMAX_MAX / 2383) +P (6, 58, + (((((uintmax_t) 0xbf46U << 28 | 0xd4d0be4U) + << 28 | 0xff091bcU) + << 28 | 0x0fdbfebU) + << 28 | 0x6cfabfdU), + UINTMAX_MAX / 2389) +P (4, 66, + (((((uintmax_t) 0x1908U << 28 | 0x738977bU) + << 28 | 0x58af71eU) + << 28 | 0xeab613eU) + << 28 | 0x5e5aee9U), + UINTMAX_MAX / 2393) +P (6, 68, + (((((uintmax_t) 0x6a48U << 28 | 0xc6e8d7fU) + << 28 | 0xbbb472dU) + << 28 | 0x2388e90U) + << 28 | 0xe9e929fU), + UINTMAX_MAX / 2399) +P (12, 62, + (((((uintmax_t) 0x9f7bU << 28 | 0x7cc2f24U) + << 28 | 0xd82eb81U) + << 28 | 0xdbafba5U) + << 28 | 0x88ddb43U), + UINTMAX_MAX / 2411) +P (6, 60, + (((((uintmax_t) 0x57ceU << 28 | 0x01e8101U) + << 28 | 0x96b8152U) + << 28 | 0xeebc51cU) + << 28 | 0x4799791U), + UINTMAX_MAX / 2417) +P (6, 80, + (((((uintmax_t) 0x22c2U << 28 | 0x9d6cb7dU) + << 28 | 0x695651cU) + << 28 | 0x6bc4693U) + << 28 | 0xb45a047U), + UINTMAX_MAX / 2423) +P (14, 84, + (((((uintmax_t) 0x366aU << 28 | 0x190050aU) + << 28 | 0xd1e2606U) + << 28 | 0xeee0974U) + << 28 | 0x498874dU), + UINTMAX_MAX / 2437) +P (4, 90, + (((((uintmax_t) 0x7708U << 28 | 0x7eb0665U) + << 28 | 0xba929d8U) + << 28 | 0x5b7377aU) + << 28 | 0x9953cb9U), + UINTMAX_MAX / 2441) +P (6, 92, + (((((uintmax_t) 0x8f53U << 28 | 0x96f6b06U) + << 28 | 0x2c2614bU) + << 28 | 0x6df412dU) + << 28 | 0x4caf56fU), + UINTMAX_MAX / 2447) +P (12, 84, + (((((uintmax_t) 0x0c2eU << 28 | 0x394250fU) + << 28 | 0xedad56bU) + << 28 | 0x8afbbb4U) + << 28 | 0xa053493U), + UINTMAX_MAX / 2459) +P (8, 82, + (((((uintmax_t) 0x78afU << 28 | 0x29d1b7fU) + << 28 | 0xbd965ccU) + << 28 | 0x5299c96U) + << 28 | 0xac7720bU), + UINTMAX_MAX / 2467) +P (6, 78, + (((((uintmax_t) 0x1287U << 28 | 0x9bcb69bU) + << 28 | 0x11e89adU) + << 28 | 0xce84b5cU) + << 28 | 0x710aa99U), + UINTMAX_MAX / 2473) +P (4, 80, + (((((uintmax_t) 0x92c2U << 28 | 0x17c54bfU) + << 28 | 0x67de19dU) + << 28 | 0x673f5aaU) + << 28 | 0x3804225U), + UINTMAX_MAX / 2477) +P (26, 76, + (((((uintmax_t) 0xd46eU << 28 | 0x0ce30e3U) + << 28 | 0x76f2ce6U) + << 28 | 0x541268eU) + << 28 | 0xfbce7f7U), + UINTMAX_MAX / 2503) +P (18, 70, + (((((uintmax_t) 0xa49bU << 28 | 0x91ec4ccU) + << 28 | 0x5004dfcU) + << 28 | 0xf41e76cU) + << 28 | 0xf5be669U), + UINTMAX_MAX / 2521) +P (10, 62, + (((((uintmax_t) 0x6098U << 28 | 0x1f8eb77U) + << 28 | 0xa7cd05cU) + << 28 | 0x3eb5dc3U) + << 28 | 0x1c383cbU), + UINTMAX_MAX / 2531) +P (8, 70, + (((((uintmax_t) 0x62e9U << 28 | 0x505bf44U) + << 28 | 0xdd6a930U) + << 28 | 0x1832d11U) + << 28 | 0xd8ad6c3U), + UINTMAX_MAX / 2539) +P (4, 74, + (((((uintmax_t) 0xb3cbU << 28 | 0x3fecabfU) + << 28 | 0x119df2eU) + << 28 | 0x9c0942fU) + << 28 | 0x1ce450fU), + UINTMAX_MAX / 2543) +P (6, 72, + (((((uintmax_t) 0xef3aU << 28 | 0x59c92a1U) + << 28 | 0x4b05b97U) + << 28 | 0xf3f2be3U) + << 28 | 0x7a39a5dU), + UINTMAX_MAX / 2549) +P (2, 82, + (((((uintmax_t) 0xe69cU << 28 | 0x5983c36U) + << 28 | 0x30c57e8U) + << 28 | 0xb7d8a96U) + << 28 | 0x54187c7U), + UINTMAX_MAX / 2551) +P (6, 90, + (((((uintmax_t) 0x437aU << 28 | 0xa4cb09bU) + << 28 | 0x61d08b5U) + << 28 | 0xd024d7dU) + << 28 | 0xa5b1b55U), + UINTMAX_MAX / 2557) +P (22, 78, + (((((uintmax_t) 0x1b65U << 28 | 0x8bdca98U) + << 28 | 0xaabb9b8U) + << 28 | 0xba9d6e7U) + << 28 | 0xae3501bU), + UINTMAX_MAX / 2579) +P (12, 68, + (((((uintmax_t) 0x3ea4U << 28 | 0x3624f3dU) + << 28 | 0x8dfb0f5U) + << 28 | 0x0865f71U) + << 28 | 0xb90f1dfU), + UINTMAX_MAX / 2591) +P (2, 70, + (((((uintmax_t) 0x2d05U << 28 | 0x08fbf3cU) + << 28 | 0x1ffcd73U) + << 28 | 0x9c16828U) + << 28 | 0x47df9e1U), + UINTMAX_MAX / 2593) +P (16, 62, + (((((uintmax_t) 0xc716U << 28 | 0xdcc634cU) + << 28 | 0xa218ec4U) + << 28 | 0x70a4d84U) + << 28 | 0x2b90ed1U), + UINTMAX_MAX / 2609) +P (8, 60, + (((((uintmax_t) 0xe30bU << 28 | 0x71f669dU) + << 28 | 0x7e49c1fU) + << 28 | 0xb1be116U) + << 28 | 0x98cc409U), + UINTMAX_MAX / 2617) +P (4, 62, + (((((uintmax_t) 0xa624U << 28 | 0x238d871U) + << 28 | 0x4cde4d8U) + << 28 | 0xd5512a7U) + << 28 | 0xcd35d15U), + UINTMAX_MAX / 2621) +P (12, 54, + (((((uintmax_t) 0x6488U << 28 | 0x81e55c1U) + << 28 | 0x30e7ca5U) + << 28 | 0x4968217U) + << 28 | 0x23e07f9U), + UINTMAX_MAX / 2633) +P (14, 42, + (((((uintmax_t) 0x8513U << 28 | 0xd3830beU) + << 28 | 0x54ea0bcU) + << 28 | 0xc8c6d7aU) + << 28 | 0xbaa8167U), + UINTMAX_MAX / 2647) +P (10, 36, + (((((uintmax_t) 0x49b5U << 28 | 0x0a4f32fU) + << 28 | 0x800c552U) + << 28 | 0xc396c95U) + << 28 | 0xeb619a1U), + UINTMAX_MAX / 2657) +P (2, 40, + (((((uintmax_t) 0xa1f0U << 28 | 0x049f0c9U) + << 28 | 0xcbd166eU) + << 28 | 0xb7e3808U) + << 28 | 0x78ec74bU), + UINTMAX_MAX / 2659) +P (4, 44, + (((((uintmax_t) 0x25f8U << 28 | 0xe2df380U) + << 28 | 0xb892e3dU) + << 28 | 0x5513b50U) + << 28 | 0x4537157U), + UINTMAX_MAX / 2663) +P (8, 40, + (((((uintmax_t) 0x1654U << 28 | 0xeb02967U) + << 28 | 0x9b8e231U) + << 28 | 0x4391f88U) + << 28 | 0x62e948fU), + UINTMAX_MAX / 2671) +P (6, 36, + (((((uintmax_t) 0x304aU << 28 | 0xf935d6eU) + << 28 | 0x11c97dcU) + << 28 | 0x0b17cfcU) + << 28 | 0xd81f5ddU), + UINTMAX_MAX / 2677) +P (6, 36, + (((((uintmax_t) 0xef7eU << 28 | 0x3c1c9feU) + << 28 | 0xaa07d2fU) + << 28 | 0x6bea3ecU) + << 28 | 0x89044b3U), + UINTMAX_MAX / 2683) +P (4, 42, + (((((uintmax_t) 0xd02cU << 28 | 0x34f8dabU) + << 28 | 0xf7ff3ceU) + << 28 | 0x13a0586U) + << 28 | 0x9f1b57fU), + UINTMAX_MAX / 2687) +P (2, 42, + (((((uintmax_t) 0xca7fU << 28 | 0x00185f3U) + << 28 | 0x3e2ad75U) + << 28 | 0x93474e8U) + << 28 | 0xace3581U), + UINTMAX_MAX / 2689) +P (4, 48, + (((((uintmax_t) 0x613fU << 28 | 0x67e6e76U) + << 28 | 0x10ebc07U) + << 28 | 0xfc32929U) + << 28 | 0x5a05e4dU), + UINTMAX_MAX / 2693) +P (6, 50, + (((((uintmax_t) 0x91e1U << 28 | 0x1433fa4U) + << 28 | 0xf1ad7b0U) + << 28 | 0x5377cbaU) + << 28 | 0x4908d23U), + UINTMAX_MAX / 2699) +P (8, 46, + (((((uintmax_t) 0x99c5U << 28 | 0x2d7ced2U) + << 28 | 0xe3e9ae7U) + << 28 | 0xb2131a6U) + << 28 | 0x28aa39bU), + UINTMAX_MAX / 2707) +P (4, 56, + (((((uintmax_t) 0xe699U << 28 | 0x2a662c6U) + << 28 | 0x1d45f90U) + << 28 | 0x31dbed7U) + << 28 | 0xde01527U), + UINTMAX_MAX / 2711) +P (2, 64, + (((((uintmax_t) 0x86efU << 28 | 0x7ca673aU) + << 28 | 0xf9ad876U) + << 28 | 0x844b1c6U) + << 28 | 0x70aa9a9U), + UINTMAX_MAX / 2713) +P (6, 70, + (((((uintmax_t) 0xb29bU << 28 | 0x59ea585U) + << 28 | 0x098266aU) + << 28 | 0x03f4533U) + << 28 | 0xb08915fU), + UINTMAX_MAX / 2719) +P (10, 62, + (((((uintmax_t) 0x2d67U << 28 | 0x181bc45U) + << 28 | 0x6ad8b1dU) + << 28 | 0xbca579dU) + << 28 | 0xb0a3999U), + UINTMAX_MAX / 2729) +P (2, 66, + (((((uintmax_t) 0xffa0U << 28 | 0x02ffe80U) + << 28 | 0x0bffa00U) + << 28 | 0x2ffe800U) + << 28 | 0xbffa003U), + UINTMAX_MAX / 2731) +P (10, 60, + (((((uintmax_t) 0xef00U << 28 | 0x778c303U) + << 28 | 0x1503a47U) + << 28 | 0x8ab1a3eU) + << 28 | 0x936139dU), + UINTMAX_MAX / 2741) +P (8, 54, + (((((uintmax_t) 0xd453U << 28 | 0x113a63aU) + << 28 | 0x4bcdb66U) + << 28 | 0xe722bc4U) + << 28 | 0xc5cc095U), + UINTMAX_MAX / 2749) +P (4, 66, + (((((uintmax_t) 0x01c4U << 28 | 0x4cfeca8U) + << 28 | 0x7f35a7aU) + << 28 | 0x8f63c71U) + << 28 | 0x7278541U), + UINTMAX_MAX / 2753) +P (14, 66, + (((((uintmax_t) 0x3887U << 28 | 0x72a189cU) + << 28 | 0x2c09fdfU) + << 28 | 0x6eee24dU) + << 28 | 0x292bc2fU), + UINTMAX_MAX / 2767) +P (10, 60, + (((((uintmax_t) 0x835dU << 28 | 0x625cbd2U) + << 28 | 0xa50339fU) + << 28 | 0xc20d172U) + << 28 | 0x37dd569U), + UINTMAX_MAX / 2777) +P (12, 54, + (((((uintmax_t) 0x8052U << 28 | 0x3e3ba9bU) + << 28 | 0x7da8ccdU) + << 28 | 0xf993235U) + << 28 | 0x6bda2edU), + UINTMAX_MAX / 2789) +P (2, 60, + (((((uintmax_t) 0xced6U << 28 | 0x1518ac7U) + << 28 | 0x0a2e697U) + << 28 | 0xb5e332eU) + << 28 | 0x80f68d7U), + UINTMAX_MAX / 2791) +P (6, 60, + (((((uintmax_t) 0x42d0U << 28 | 0x7f67b31U) + << 28 | 0xe1cbd46U) + << 28 | 0xeee26fdU) + << 28 | 0x875e2e5U), + UINTMAX_MAX / 2797) +P (4, 60, + (((((uintmax_t) 0xa787U << 28 | 0x5b7cc16U) + << 28 | 0x4cf4935U) + << 28 | 0x48a8e65U) + << 28 | 0x157a611U), + UINTMAX_MAX / 2801) +P (2, 76, + (((((uintmax_t) 0x69abU << 28 | 0x6d816a6U) + << 28 | 0x6791ac2U) + << 28 | 0x88d03beU) + << 28 | 0x9b71e3bU), + UINTMAX_MAX / 2803) +P (16, 68, + (((((uintmax_t) 0xace8U << 28 | 0x1dc954bU) + << 28 | 0xa58d081U) + << 28 | 0x51186dbU) + << 28 | 0x38937abU), + UINTMAX_MAX / 2819) +P (14, 64, + (((((uintmax_t) 0x7c3fU << 28 | 0xfa377bbU) + << 28 | 0x52dd078U) + << 28 | 0x00b9108U) + << 28 | 0x95a45f1U), + UINTMAX_MAX / 2833) +P (4, 66, + (((((uintmax_t) 0x1f0aU << 28 | 0x8ec0eccU) + << 28 | 0x79a36aeU) + << 28 | 0xe0b0241U) + << 28 | 0x82eec3dU), + UINTMAX_MAX / 2837) +P (6, 66, + (((((uintmax_t) 0x609eU << 28 | 0x7b00a15U) + << 28 | 0xca83496U) + << 28 | 0x323eda1U) + << 28 | 0x73b5713U), + UINTMAX_MAX / 2843) +P (8, 66, + (((((uintmax_t) 0x7362U << 28 | 0x52ca08cU) + << 28 | 0xcba690eU) + << 28 | 0xd0dbd03U) + << 28 | 0xae77c8bU), + UINTMAX_MAX / 2851) +P (6, 70, + (((((uintmax_t) 0xa370U << 28 | 0x463ffa4U) + << 28 | 0x3eb91f7U) + << 28 | 0x3800b78U) + << 28 | 0x28dc119U), + UINTMAX_MAX / 2857) +P (4, 78, + (((((uintmax_t) 0x4586U << 28 | 0x7cbbe80U) + << 28 | 0x502c61bU) + << 28 | 0x61715ecU) + << 28 | 0x22b7ca5U), + UINTMAX_MAX / 2861) +P (18, 74, + (((((uintmax_t) 0x508fU << 28 | 0xb1c027dU) + << 28 | 0x607a5a8U) + << 28 | 0x533a991U) + << 28 | 0xead64bfU), + UINTMAX_MAX / 2879) +P (8, 70, + (((((uintmax_t) 0xbc40U << 28 | 0xe8adccbU) + << 28 | 0xf2e057fU) + << 28 | 0x6c7290eU) + << 28 | 0x46c2e77U), + UINTMAX_MAX / 2887) +P (10, 66, + (((((uintmax_t) 0x73d9U << 28 | 0x78cc4e1U) + << 28 | 0xdde3e63U) + << 28 | 0x25e8d90U) + << 28 | 0x7b01db1U), + UINTMAX_MAX / 2897) +P (6, 66, + (((((uintmax_t) 0x1c21U << 28 | 0x8299f86U) + << 28 | 0xa86ec28U) + << 28 | 0x909f701U) + << 28 | 0x52a1067U), + UINTMAX_MAX / 2903) +P (6, 62, + (((((uintmax_t) 0x5da2U << 28 | 0x8a842e1U) + << 28 | 0xd0a78eaU) + << 28 | 0x7077af0U) + << 28 | 0x997a0f5U), + UINTMAX_MAX / 2909) +P (8, 82, + (((((uintmax_t) 0x21f6U << 28 | 0xb281b61U) + << 28 | 0xadae07eU) + << 28 | 0x605cad1U) + << 28 | 0x0c32e6dU), + UINTMAX_MAX / 2917) +P (10, 74, + (((((uintmax_t) 0x2e9dU << 28 | 0xf4a1477U) + << 28 | 0x4c2dd47U) + << 28 | 0x1b33570U) + << 28 | 0x635b38fU), + UINTMAX_MAX / 2927) +P (12, 72, + (((((uintmax_t) 0x891aU << 28 | 0x37ebcabU) + << 28 | 0x12ba3abU) + << 28 | 0x559fa99U) + << 28 | 0x7a61bb3U), + UINTMAX_MAX / 2939) +P (14, 66, + (((((uintmax_t) 0xccadU << 28 | 0xbad1f78U) + << 28 | 0x11569adU) + << 28 | 0x4bdae56U) + << 28 | 0x2bddab9U), + UINTMAX_MAX / 2953) +P (4, 66, + (((((uintmax_t) 0xb335U << 28 | 0x6a92a82U) + << 28 | 0x08d4a05U) + << 28 | 0x5e1b2f2U) + << 28 | 0xed62f45U), + UINTMAX_MAX / 2957) +P (6, 74, + (((((uintmax_t) 0x58bbU << 28 | 0x5017802U) + << 28 | 0x12d5c03U) + << 28 | 0xcd328b1U) + << 28 | 0xa2dca9bU), + UINTMAX_MAX / 2963) +P (6, 72, + (((((uintmax_t) 0x7501U << 28 | 0xa365242U) + << 28 | 0x0c3e6d2U) + << 28 | 0x8f4e087U) + << 28 | 0x33218a9U), + UINTMAX_MAX / 2969) +P (2, 78, + (((((uintmax_t) 0x18a4U << 28 | 0xbffa7c4U) + << 28 | 0x073ceb6U) + << 28 | 0x800b077U) + << 28 | 0xf186293U), + UINTMAX_MAX / 2971) +P (28, 62, + (((((uintmax_t) 0xa633U << 28 | 0x0bdd838U) + << 28 | 0xae2356fU) + << 28 | 0xbd138c3U) + << 28 | 0xfd9c207U), + UINTMAX_MAX / 2999) +P (2, 66, + (((((uintmax_t) 0xe2ffU << 28 | 0x0fc80a3U) + << 28 | 0xc9104b1U) + << 28 | 0x17ccd12U) + << 28 | 0xae88a89U), + UINTMAX_MAX / 3001) +P (10, 68, + (((((uintmax_t) 0x1183U << 28 | 0xb2cce6eU) + << 28 | 0xb2b722fU) + << 28 | 0x1a1a044U) + << 28 | 0x046bcebU), + UINTMAX_MAX / 3011) +P (8, 64, + (((((uintmax_t) 0xbfb9U << 28 | 0x73118d8U) + << 28 | 0x666f154U) + << 28 | 0x8aba0b0U) + << 28 | 0x60541e3U), + UINTMAX_MAX / 3019) +P (4, 66, + (((((uintmax_t) 0xa152U << 28 | 0xbc81bc6U) + << 28 | 0xc0e90cfU) + << 28 | 0x4e808ceU) + << 28 | 0xa111b2fU), + UINTMAX_MAX / 3023) +P (14, 72, + (((((uintmax_t) 0xaebdU << 28 | 0xa92d6f2U) + << 28 | 0xef39bdbU) + << 28 | 0xec1b4faU) + << 28 | 0x855a475U), + UINTMAX_MAX / 3037) +P (4, 78, + (((((uintmax_t) 0x890cU << 28 | 0xb62bf18U) + << 28 | 0x542ece3U) + << 28 | 0xf794eb6U) + << 28 | 0x00d7821U), + UINTMAX_MAX / 3041) +P (8, 72, + (((((uintmax_t) 0x699fU << 28 | 0xc793db6U) + << 28 | 0x480a134U) + << 28 | 0xfae0d9aU) + << 28 | 0x11f7c59U), + UINTMAX_MAX / 3049) +P (12, 76, + (((((uintmax_t) 0x14fdU << 28 | 0xe8c0055U) + << 28 | 0xa3d62f0U) + << 28 | 0x06b0ccbU) + << 28 | 0xbac085dU), + UINTMAX_MAX / 3061) +P (6, 96, + (((((uintmax_t) 0xa99cU << 28 | 0x01006adU) + << 28 | 0x72efe3fU) + << 28 | 0x45076dcU) + << 28 | 0x3114733U), + UINTMAX_MAX / 3067) +P (12, 88, + (((((uintmax_t) 0x59e0U << 28 | 0xe778f96U) + << 28 | 0xe7f8aeeU) + << 28 | 0xf49bfa5U) + << 28 | 0x8a1a1b7U), + UINTMAX_MAX / 3079) +P (4, 86, + (((((uintmax_t) 0x6edaU << 28 | 0x627b0f3U) + << 28 | 0x2121a12U) + << 28 | 0xc4218beU) + << 28 | 0xa691fa3U), + UINTMAX_MAX / 3083) +P (6, 92, + (((((uintmax_t) 0xf88aU << 28 | 0x9107df8U) + << 28 | 0x35b3ebcU) + << 28 | 0x7504e3bU) + << 28 | 0xd5e64f1U), + UINTMAX_MAX / 3089) +P (20, 78, + (((((uintmax_t) 0xcddaU << 28 | 0x9dee60fU) + << 28 | 0xf969a4eU) + << 28 | 0xe21c292U) + << 28 | 0xbb92fadU), + UINTMAX_MAX / 3109) +P (10, 72, + (((((uintmax_t) 0x4ff1U << 28 | 0x8de982bU) + << 28 | 0xfe5bc34U) + << 28 | 0x338b732U) + << 28 | 0x7a4bacfU), + UINTMAX_MAX / 3119) +P (2, 82, + (((((uintmax_t) 0x8fdfU << 28 | 0x30a40ccU) + << 28 | 0xbc0053fU) + << 28 | 0xe5c0833U) + << 28 | 0xd6fccd1U), + UINTMAX_MAX / 3121) +P (16, 72, + (((((uintmax_t) 0x0ca6U << 28 | 0x26ae799U) + << 28 | 0x8087cb1U) + << 28 | 0xe707435U) + << 28 | 0x35203c1U), + UINTMAX_MAX / 3137) +P (26, 54, + (((((uintmax_t) 0x3a1cU << 28 | 0xa6ba507U) + << 28 | 0x340aaefU) + << 28 | 0xbb5dcdfU) + << 28 | 0xb4e43d3U), + UINTMAX_MAX / 3163) +P (4, 54, + (((((uintmax_t) 0x340eU << 28 | 0x8ccfe76U) + << 28 | 0xd34c8caU) + << 28 | 0x68467caU) + << 28 | 0x5394f9fU), + UINTMAX_MAX / 3167) +P (2, 60, + (((((uintmax_t) 0xe94cU << 28 | 0xd3010cdU) + << 28 | 0x82c978cU) + << 28 | 0x51c0814U) + << 28 | 0x08b97a1U), + UINTMAX_MAX / 3169) +P (12, 70, + (((((uintmax_t) 0x69d4U << 28 | 0x0f213ccU) + << 28 | 0x2c1a132U) + << 28 | 0x75a899dU) + << 28 | 0xfa5dd65U), + UINTMAX_MAX / 3181) +P (6, 66, + (((((uintmax_t) 0xcc45U << 28 | 0x14a4d46U) + << 28 | 0x1ff849eU) + << 28 | 0x674cb62U) + << 28 | 0xe1b78bbU), + UINTMAX_MAX / 3187) +P (4, 66, + (((((uintmax_t) 0x6351U << 28 | 0xbffadd9U) + << 28 | 0x54cc6a3U) + << 28 | 0x7ff5bb2U) + << 28 | 0xa998d47U), + UINTMAX_MAX / 3191) +P (12, 56, + (((((uintmax_t) 0x77baU << 28 | 0x4e2aae1U) + << 28 | 0x3a95c79U) + << 28 | 0x2a999dbU) + << 28 | 0x131a22bU), + UINTMAX_MAX / 3203) +P (6, 62, + (((((uintmax_t) 0x8d1fU << 28 | 0x82e96c6U) + << 28 | 0xa42da1bU) + << 28 | 0x48841bcU) + << 28 | 0x30d29b9U), + UINTMAX_MAX / 3209) +P (8, 82, + (((((uintmax_t) 0x0ef5U << 28 | 0xe4c8da5U) + << 28 | 0xc2683f0U) + << 28 | 0x6721d20U) + << 28 | 0x11d3471U), + UINTMAX_MAX / 3217) +P (4, 80, + (((((uintmax_t) 0x9ccfU << 28 | 0x98fef77U) + << 28 | 0xeed5293U) + << 28 | 0xfd2386dU) + << 28 | 0xff85ebdU), + UINTMAX_MAX / 3221) +P (8, 78, + (((((uintmax_t) 0x9c06U << 28 | 0xa8de9f5U) + << 28 | 0xb182e4cU) + << 28 | 0xe72f54cU) + << 28 | 0x07ed9b5U), + UINTMAX_MAX / 3229) +P (22, 62, + (((((uintmax_t) 0xdcf5U << 28 | 0x5e929f8U) + << 28 | 0x99148d6U) + << 28 | 0xd0fd3e7U) + << 28 | 0x1dd827bU), + UINTMAX_MAX / 3251) +P (2, 66, + (((((uintmax_t) 0xcebcU << 28 | 0x664e397U) + << 28 | 0x2d17d85U) + << 28 | 0x6405fb1U) + << 28 | 0xeed819dU), + UINTMAX_MAX / 3253) +P (4, 66, + (((((uintmax_t) 0x921eU << 28 | 0x0671f84U) + << 28 | 0xc15b18eU) + << 28 | 0xa8aceb7U) + << 28 | 0xc443989U), + UINTMAX_MAX / 3257) +P (2, 70, + (((((uintmax_t) 0x4223U << 28 | 0xfa07b2bU) + << 28 | 0x4830634U) + << 28 | 0xa13026fU) + << 28 | 0x62e5873U), + UINTMAX_MAX / 3259) +P (12, 60, + (((((uintmax_t) 0x4ceeU << 28 | 0xdc3bcb1U) + << 28 | 0x806e31eU) + << 28 | 0xea0208eU) + << 28 | 0xc0af4f7U), + UINTMAX_MAX / 3271) +P (28, 44, + (((((uintmax_t) 0x969eU << 28 | 0xc4a2f55U) + << 28 | 0xe703563U) + << 28 | 0x679853cU) + << 28 | 0xea598cbU), + UINTMAX_MAX / 3299) +P (2, 46, + (((((uintmax_t) 0xd886U << 28 | 0xa176bb8U) + << 28 | 0x577a9c3U) + << 28 | 0x0b3ebd6U) + << 28 | 0x1f2d0edU), + UINTMAX_MAX / 3301) +P (6, 52, + (((((uintmax_t) 0xaaecU << 28 | 0xb97a633U) + << 28 | 0xdda117eU) + << 28 | 0xb9037bcU) + << 28 | 0x7f43bc3U), + UINTMAX_MAX / 3307) +P (6, 48, + (((((uintmax_t) 0x1a59U << 28 | 0x7af0505U) + << 28 | 0xcb9c2a5U) + << 28 | 0x83e6f6cU) + << 28 | 0xe016411U), + UINTMAX_MAX / 3313) +P (6, 52, + (((((uintmax_t) 0x76c8U << 28 | 0x6358785U) + << 28 | 0x34d5cf1U) + << 28 | 0x938d895U) + << 28 | 0xf1a74c7U), + UINTMAX_MAX / 3319) +P (4, 50, + (((((uintmax_t) 0xb781U << 28 | 0xa8058bfU) + << 28 | 0xac2e880U) + << 28 | 0xcf1491cU) + << 28 | 0x1e81e33U), + UINTMAX_MAX / 3323) +P (6, 60, + (((((uintmax_t) 0xc604U << 28 | 0x75cf8d9U) + << 28 | 0x2a5f33cU) + << 28 | 0x0f12886U) + << 28 | 0xba8f301U), + UINTMAX_MAX / 3329) +P (2, 60, + (((((uintmax_t) 0x9d2aU << 28 | 0x8009d65U) + << 28 | 0x861c20eU) + << 28 | 0x4b786e0U) + << 28 | 0xdfcc5abU), + UINTMAX_MAX / 3331) +P (12, 64, + (((((uintmax_t) 0x4053U << 28 | 0x511894dU) + << 28 | 0xe137367U) + << 28 | 0x2684c93U) + << 28 | 0xf2d41efU), + UINTMAX_MAX / 3343) +P (4, 66, + (((((uintmax_t) 0xcbfdU << 28 | 0x3f19edcU) + << 28 | 0xbd615e0U) + << 28 | 0x0757badU) + << 28 | 0xb35c51bU), + UINTMAX_MAX / 3347) +P (12, 74, + (((((uintmax_t) 0x303eU << 28 | 0x309fbe2U) + << 28 | 0x6de63d6U) + << 28 | 0xd84afe6U) + << 28 | 0x6472edfU), + UINTMAX_MAX / 3359) +P (2, 88, + (((((uintmax_t) 0x1123U << 28 | 0x440491fU) + << 28 | 0x00137fbU) + << 28 | 0xbc0eedcU) + << 28 | 0xbbfb6e1U), + UINTMAX_MAX / 3361) +P (10, 86, + (((((uintmax_t) 0x5ae7U << 28 | 0x03df7f3U) + << 28 | 0x3de4825U) + << 28 | 0x0f43aa0U) + << 28 | 0x8a84983U), + UINTMAX_MAX / 3371) +P (2, 88, + (((((uintmax_t) 0x11fcU << 28 | 0xcff5122U) + << 28 | 0x3abe804U) + << 28 | 0x400e927U) + << 28 | 0xb1acaa5U), + UINTMAX_MAX / 3373) +P (16, 74, + (((((uintmax_t) 0x80cbU << 28 | 0x0c29652U) + << 28 | 0x5643d56U) + << 28 | 0x572be34U) + << 28 | 0xb9d3215U), + UINTMAX_MAX / 3389) +P (2, 76, + (((((uintmax_t) 0xc57dU << 28 | 0xffd958dU) + << 28 | 0xb3c0487U) + << 28 | 0x964ef77U) + << 28 | 0x81c62bfU), + UINTMAX_MAX / 3391) +P (16, 62, + (((((uintmax_t) 0x9c4aU << 28 | 0x3cdce8eU) + << 28 | 0xea48e29U) + << 28 | 0xed84051U) + << 28 | 0xc06e9afU), + UINTMAX_MAX / 3407) +P (6, 78, + (((((uintmax_t) 0x0cf9U << 28 | 0xeca5ea8U) + << 28 | 0xc4381b0U) + << 28 | 0x0acd11eU) + << 28 | 0xd3f87fdU), + UINTMAX_MAX / 3413) +P (20, 66, + (((((uintmax_t) 0xfe48U << 28 | 0xee074edU) + << 28 | 0x223a506U) + << 28 | 0x3078817U) + << 28 | 0x44152d9U), + UINTMAX_MAX / 3433) +P (16, 62, + (((((uintmax_t) 0xa409U << 28 | 0x342e04eU) + << 28 | 0x6187e7aU) + << 28 | 0x786459fU) + << 28 | 0x5c1ccc9U), + UINTMAX_MAX / 3449) +P (8, 60, + (((((uintmax_t) 0xe4e5U << 28 | 0x902e357U) + << 28 | 0x74c7f13U) + << 28 | 0x08125d7U) + << 28 | 0x4563281U), + UINTMAX_MAX / 3457) +P (4, 66, + (((((uintmax_t) 0x7588U << 28 | 0x9dfe5f6U) + << 28 | 0xae1e539U) + << 28 | 0x5310a48U) + << 28 | 0x0b3e34dU), + UINTMAX_MAX / 3461) +P (2, 66, + (((((uintmax_t) 0x3784U << 28 | 0x6603fdeU) + << 28 | 0xe1c3d35U) + << 28 | 0x985baa8U) + << 28 | 0xb202837U), + UINTMAX_MAX / 3463) +P (4, 66, + (((((uintmax_t) 0xb450U << 28 | 0xa1daeecU) + << 28 | 0xba5ea96U) + << 28 | 0x304a6e0U) + << 28 | 0x52b3223U), + UINTMAX_MAX / 3467) +P (2, 70, + (((((uintmax_t) 0xfbf0U << 28 | 0xf20d6e5U) + << 28 | 0x363d8bdU) + << 28 | 0x8265fc9U) + << 28 | 0xaf8fd45U), + UINTMAX_MAX / 3469) +P (22, 50, + (((((uintmax_t) 0xeeb1U << 28 | 0x9bd44b6U) + << 28 | 0x27bee1bU) + << 28 | 0x6d0b383U) + << 28 | 0xec58e0bU), + UINTMAX_MAX / 3491) +P (8, 48, + (((((uintmax_t) 0x7386U << 28 | 0x8c53fdfU) + << 28 | 0x38fe9c2U) + << 28 | 0x1a7c3b6U) + << 28 | 0x8b28503U), + UINTMAX_MAX / 3499) +P (12, 46, + (((((uintmax_t) 0xba13U << 28 | 0x65219cfU) + << 28 | 0xbb2b623U) + << 28 | 0x6fa180fU) + << 28 | 0xbfd6007U), + UINTMAX_MAX / 3511) +P (6, 42, + (((((uintmax_t) 0xe16dU << 28 | 0xb1887adU) + << 28 | 0xe4c6dc4U) + << 28 | 0x2accd44U) + << 28 | 0x0ed9595U), + UINTMAX_MAX / 3517) +P (10, 44, + (((((uintmax_t) 0x4cf0U << 28 | 0x1ab5e49U) + << 28 | 0x04b7c7aU) + << 28 | 0xcf71282U) + << 28 | 0x36ba3f7U), + UINTMAX_MAX / 3527) +P (2, 52, + (((((uintmax_t) 0x6374U << 28 | 0x6df92e5U) + << 28 | 0xaad5ff9U) + << 28 | 0x09367a9U) + << 28 | 0x87b9c79U), + UINTMAX_MAX / 3529) +P (4, 50, + (((((uintmax_t) 0x3fc3U << 28 | 0xb6abbabU) + << 28 | 0xa82dcb6U) + << 28 | 0x4efb252U) + << 28 | 0xbfba705U), + UINTMAX_MAX / 3533) +P (6, 54, + (((((uintmax_t) 0x82b6U << 28 | 0x6ef6f53U) + << 28 | 0x8c8ce98U) + << 28 | 0x0d4f5a7U) + << 28 | 0xe4cd25bU), + UINTMAX_MAX / 3539) +P (2, 66, + (((((uintmax_t) 0x20c0U << 28 | 0x04a07f3U) + << 28 | 0xdab1fe1U) + << 28 | 0xecc4ef2U) + << 28 | 0x7b0c37dU), + UINTMAX_MAX / 3541) +P (6, 66, + (((((uintmax_t) 0xfb2aU << 28 | 0x13c68cbU) + << 28 | 0xd185291U) + << 28 | 0x11aebb8U) + << 28 | 0x1d72653U), + UINTMAX_MAX / 3547) +P (10, 60, + (((((uintmax_t) 0x8908U << 28 | 0x46d1b90U) + << 28 | 0x96d9c89U) + << 28 | 0x51f985cU) + << 28 | 0xb2c67edU), + UINTMAX_MAX / 3557) +P (2, 64, + (((((uintmax_t) 0xf7baU << 28 | 0x5f17856U) + << 28 | 0xe44e8c4U) + << 28 | 0x39d4fc5U) + << 28 | 0x4e0b5d7U), + UINTMAX_MAX / 3559) +P (12, 60, + (((((uintmax_t) 0x811cU << 28 | 0x75db26eU) + << 28 | 0xd4a0de8U) + << 28 | 0x57bf318U) + << 28 | 0x96d533bU), + UINTMAX_MAX / 3571) +P (10, 56, + (((((uintmax_t) 0x6fbcU << 28 | 0x83d31afU) + << 28 | 0x37d51b6U) + << 28 | 0x14bb4cbU) + << 28 | 0x5023755U), + UINTMAX_MAX / 3581) +P (2, 60, + (((((uintmax_t) 0xdf7dU << 28 | 0xad8c657U) + << 28 | 0x4f61193U) + << 28 | 0x8a89e54U) + << 28 | 0x73bf1ffU), + UINTMAX_MAX / 3583) +P (10, 66, + (((((uintmax_t) 0x48beU << 28 | 0xf2f618aU) + << 28 | 0x70259eaU) + << 28 | 0xc481acaU) + << 28 | 0x34de039U), + UINTMAX_MAX / 3593) +P (14, 64, + (((((uintmax_t) 0x5c8cU << 28 | 0x86d951dU) + << 28 | 0x4fd8414U) + << 28 | 0xb961badU) + << 28 | 0xf4809a7U), + UINTMAX_MAX / 3607) +P (6, 60, + (((((uintmax_t) 0x3e35U << 28 | 0xfddfd4eU) + << 28 | 0xb85d876U) + << 28 | 0x784fecbU) + << 28 | 0xa352435U), + UINTMAX_MAX / 3613) +P (4, 60, + (((((uintmax_t) 0x3f46U << 28 | 0x480d05dU) + << 28 | 0xfde06efU) + << 28 | 0xa689bb5U) + << 28 | 0x8aef5e1U), + UINTMAX_MAX / 3617) +P (6, 68, + (((((uintmax_t) 0xa7f5U << 28 | 0x427da20U) + << 28 | 0x5cb49b2U) + << 28 | 0xb2c4db9U) + << 28 | 0xc3a8197U), + UINTMAX_MAX / 3623) +P (8, 66, + (((((uintmax_t) 0x1756U << 28 | 0x39f44bdU) + << 28 | 0xcbf7d25U) + << 28 | 0x03bc992U) + << 28 | 0x279f8cfU), + UINTMAX_MAX / 3631) +P (6, 64, + (((((uintmax_t) 0xf7b1U << 28 | 0xba9905dU) + << 28 | 0x798f3d2U) + << 28 | 0xab9aec5U) + << 28 | 0xca1541dU), + UINTMAX_MAX / 3637) +P (6, 66, + (((((uintmax_t) 0x0ec1U << 28 | 0xcf3b3d3U) + << 28 | 0x4ea253eU) + << 28 | 0x78ba146U) + << 28 | 0x0f99af3U), + UINTMAX_MAX / 3643) +P (16, 60, + (((((uintmax_t) 0x694bU << 28 | 0xe954ddeU) + << 28 | 0xd63b30aU) + << 28 | 0x0142657U) + << 28 | 0x2cfcb63U), + UINTMAX_MAX / 3659) +P (12, 56, + (((((uintmax_t) 0xd628U << 28 | 0x9612455U) + << 28 | 0x13dfebeU) + << 28 | 0xa857968U) + << 28 | 0xf3cbd67U), + UINTMAX_MAX / 3671) +P (2, 60, + (((((uintmax_t) 0x63bcU << 28 | 0xcfb30dbU) + << 28 | 0xaffca78U) + << 28 | 0xdb213eeU) + << 28 | 0xfe659e9U), + UINTMAX_MAX / 3673) +P (4, 62, + (((((uintmax_t) 0x7cf8U << 28 | 0xb08fb32U) + << 28 | 0x328ba96U) + << 28 | 0x3e8541aU) + << 28 | 0x74d35f5U), + UINTMAX_MAX / 3677) +P (14, 70, + (((((uintmax_t) 0x99e7U << 28 | 0xb98849cU) + << 28 | 0xbfb489eU) + << 28 | 0x22d1527U) + << 28 | 0x76f2e43U), + UINTMAX_MAX / 3691) +P (6, 70, + (((((uintmax_t) 0x1767U << 28 | 0xa90721dU) + << 28 | 0xc686c05U) + << 28 | 0xd10d39dU) + << 28 | 0x1e1f291U), + UINTMAX_MAX / 3697) +P (4, 68, + (((((uintmax_t) 0x817cU << 28 | 0xb6e3047U) + << 28 | 0xeff3d37U) + << 28 | 0x4468dccU) + << 28 | 0xaced1ddU), + UINTMAX_MAX / 3701) +P (8, 70, + (((((uintmax_t) 0x916dU << 28 | 0x896be15U) + << 28 | 0xac3548dU) + << 28 | 0x145c7d1U) + << 28 | 0x10c5ad5U), + UINTMAX_MAX / 3709) +P (10, 74, + (((((uintmax_t) 0x50e1U << 28 | 0xc7f7bd5U) + << 28 | 0xdf5f332U) + << 28 | 0x51a39f5U) + << 28 | 0xacb5737U), + UINTMAX_MAX / 3719) +P (8, 70, + (((((uintmax_t) 0xc1e7U << 28 | 0xf58f36eU) + << 28 | 0x1b567a6U) + << 28 | 0x6e50171U) + << 28 | 0x443506fU), + UINTMAX_MAX / 3727) +P (6, 70, + (((((uintmax_t) 0xe72cU << 28 | 0xc7f8de3U) + << 28 | 0x0f6e112U) + << 28 | 0x4f69ad9U) + << 28 | 0x1dd4cbdU), + UINTMAX_MAX / 3733) +P (6, 82, + (((((uintmax_t) 0x81e2U << 28 | 0x02e029aU) + << 28 | 0x0d485ecU) + << 28 | 0x24f8f2aU) + << 28 | 0x61a2793U), + UINTMAX_MAX / 3739) +P (22, 62, + (((((uintmax_t) 0x66a5U << 28 | 0x216bc00U) + << 28 | 0x45b35b4U) + << 28 | 0x72148e6U) + << 28 | 0x56b7a51U), + UINTMAX_MAX / 3761) +P (6, 66, + (((((uintmax_t) 0x3442U << 28 | 0x9973536U) + << 28 | 0x29ba00aU) + << 28 | 0xdf9570eU) + << 28 | 0x1142f07U), + UINTMAX_MAX / 3767) +P (2, 78, + (((((uintmax_t) 0xc952U << 28 | 0x869f58aU) + << 28 | 0x38eb489U) + << 28 | 0xbf33b06U) + << 28 | 0x5119789U), + UINTMAX_MAX / 3769) +P (10, 72, + (((((uintmax_t) 0xc462U << 28 | 0xe78b7b7U) + << 28 | 0xebf2b8fU) + << 28 | 0x0149803U) + << 28 | 0xcb291ebU), + UINTMAX_MAX / 3779) +P (14, 60, + (((((uintmax_t) 0xa7b8U << 28 | 0x300e09dU) + << 28 | 0xa9be883U) + << 28 | 0x34b63afU) + << 28 | 0xd190a31U), + UINTMAX_MAX / 3793) +P (4, 66, + (((((uintmax_t) 0x678fU << 28 | 0x45607afU) + << 28 | 0xa226292U) + << 28 | 0x0908d50U) + << 28 | 0xd6aba7dU), + UINTMAX_MAX / 3797) +P (6, 74, + (((((uintmax_t) 0x3066U << 28 | 0x51b882dU) + << 28 | 0xc63e557U) + << 28 | 0xd8b018cU) + << 28 | 0x5a33d53U), + UINTMAX_MAX / 3803) +P (18, 60, + (((((uintmax_t) 0x03f3U << 28 | 0xf0b9737U) + << 28 | 0x01682eaU) + << 28 | 0x1773092U) + << 28 | 0xdc27ee5U), + UINTMAX_MAX / 3821) +P (2, 66, + (((((uintmax_t) 0x824fU << 28 | 0x6b12f35U) + << 28 | 0x80e76caU) + << 28 | 0xe5f38b7U) + << 28 | 0xbf2e00fU), + UINTMAX_MAX / 3823) +P (10, 74, + (((((uintmax_t) 0xba8aU << 28 | 0x4084821U) + << 28 | 0xa94f02bU) + << 28 | 0xd02df34U) + << 28 | 0xf695349U), + UINTMAX_MAX / 3833) +P (14, 64, + (((((uintmax_t) 0x1f9bU << 28 | 0xea70762U) + << 28 | 0xf3f48ddU) + << 28 | 0xfecd5beU) + << 28 | 0x62e2eb7U), + UINTMAX_MAX / 3847) +P (4, 66, + (((((uintmax_t) 0xb7acU << 28 | 0x817ee73U) + << 28 | 0x45119dbU) + << 28 | 0xf849ebeU) + << 28 | 0xc96c4a3U), + UINTMAX_MAX / 3851) +P (2, 66, + (((((uintmax_t) 0xf8c2U << 28 | 0x0286585U) + << 28 | 0xe14dcdaU) + << 28 | 0x31d4d01U) + << 28 | 0x87357c5U), + UINTMAX_MAX / 3853) +P (10, 60, + (((((uintmax_t) 0x7727U << 28 | 0x2a58ab3U) + << 28 | 0xdb276e3U) + << 28 | 0x4e21cc2U) + << 28 | 0xd5418a7U), + UINTMAX_MAX / 3863) +P (14, 52, + (((((uintmax_t) 0x61caU << 28 | 0x83edc68U) + << 28 | 0xdb38968U) + << 28 | 0xca5137aU) + << 28 | 0x9e574adU), + UINTMAX_MAX / 3877) +P (4, 50, + (((((uintmax_t) 0x74f3U << 28 | 0x8879e60U) + << 28 | 0x2c53a3eU) + << 28 | 0xaa0d0f8U) + << 28 | 0x04bfd19U), + UINTMAX_MAX / 3881) +P (8, 54, + (((((uintmax_t) 0x1c6fU << 28 | 0xe7c6996U) + << 28 | 0x04df055U) + << 28 | 0x4fb753cU) + << 28 | 0xc20e9d1U), + UINTMAX_MAX / 3889) +P (18, 40, + (((((uintmax_t) 0x374dU << 28 | 0x408a62aU) + << 28 | 0xda31679U) + << 28 | 0x7afcca1U) + << 28 | 0x300756bU), + UINTMAX_MAX / 3907) +P (4, 56, + (((((uintmax_t) 0xc8e2U << 28 | 0xbdb1524U) + << 28 | 0x758f48bU) + << 28 | 0x8d950b5U) + << 28 | 0x2eeea77U), + UINTMAX_MAX / 3911) +P (6, 72, + (((((uintmax_t) 0xbfc1U << 28 | 0x421336fU) + << 28 | 0x6ea5dfbU) + << 28 | 0x6cd166aU) + << 28 | 0xcabc185U), + UINTMAX_MAX / 3917) +P (2, 82, + (((((uintmax_t) 0x7daeU << 28 | 0x58b5560U) + << 28 | 0x7b5454eU) + << 28 | 0xb6c5ed9U) + << 28 | 0x437a7afU), + UINTMAX_MAX / 3919) +P (4, 80, + (((((uintmax_t) 0xf1f8U << 28 | 0x4cbdc3dU) + << 28 | 0x573f5d1U) + << 28 | 0xeddbd91U) + << 28 | 0xb790cdbU), + UINTMAX_MAX / 3923) +P (6, 78, + (((((uintmax_t) 0xa6abU << 28 | 0x9f4ec63U) + << 28 | 0x4c6db93U) + << 28 | 0xd714ea4U) + << 28 | 0xd8948e9U), + UINTMAX_MAX / 3929) +P (2, 82, + (((((uintmax_t) 0x8198U << 28 | 0x742e1b7U) + << 28 | 0xb68a73cU) + << 28 | 0xa13ed81U) + << 28 | 0x45188d3U), + UINTMAX_MAX / 3931) +P (12, 76, + (((((uintmax_t) 0x5ab3U << 28 | 0x52c7947U) + << 28 | 0xbe09382U) + << 28 | 0x9086016U) + << 28 | 0xda89c57U), + UINTMAX_MAX / 3943) +P (4, 74, + (((((uintmax_t) 0xec69U << 28 | 0x9751239U) + << 28 | 0xb9900d7U) + << 28 | 0xda1f432U) + << 28 | 0x124a543U), + UINTMAX_MAX / 3947) +P (20, 60, + (((((uintmax_t) 0xa4e1U << 28 | 0x58dc715U) + << 28 | 0x1a22b7eU) + << 28 | 0xad55816U) + << 28 | 0x32fb07fU), + UINTMAX_MAX / 3967) +P (22, 60, + (((((uintmax_t) 0x4cd1U << 28 | 0xba8fa08U) + << 28 | 0x1613a35U) + << 28 | 0x443837fU) + << 28 | 0x63ec3bdU), + UINTMAX_MAX / 3989) +P (12, 50, + (((((uintmax_t) 0x48afU << 28 | 0x92759a4U) + << 28 | 0x3f37589U) + << 28 | 0xe2b200eU) + << 28 | 0x5519461U), + UINTMAX_MAX / 4001) +P (2, 54, + (((((uintmax_t) 0x9293U << 28 | 0xfc29b25U) + << 28 | 0xcbafee9U) + << 28 | 0xae44f0bU) + << 28 | 0x7289c0bU), + UINTMAX_MAX / 4003) +P (4, 66, + (((((uintmax_t) 0xc02cU << 28 | 0xfa2fa91U) + << 28 | 0xcaf9094U) + << 28 | 0x387a277U) + << 28 | 0xb9fa817U), + UINTMAX_MAX / 4007) +P (6, 66, + (((((uintmax_t) 0x15c0U << 28 | 0xd8627efU) + << 28 | 0x28a2cc8U) + << 28 | 0x4f1a58aU) + << 28 | 0xbfc2c25U), + UINTMAX_MAX / 4013) +P (6, 72, + (((((uintmax_t) 0x1143U << 28 | 0x12ca6e3U) + << 28 | 0x2522b71U) + << 28 | 0x101d8e3U) + << 28 | 0xc83377bU), + UINTMAX_MAX / 4019) +P (2, 72, + (((((uintmax_t) 0xcfadU << 28 | 0x7d3b04aU) + << 28 | 0x5c91ec0U) + << 28 | 0x24abe5cU) + << 28 | 0x50ba69dU), + UINTMAX_MAX / 4021) +P (6, 72, + (((((uintmax_t) 0x9d46U << 28 | 0x3eef687U) + << 28 | 0x26d7815U) + << 28 | 0xde4eb36U) + << 28 | 0x5a65d73U), + UINTMAX_MAX / 4027) +P (22, 62, + (((((uintmax_t) 0xe98eU << 28 | 0x1152e37U) + << 28 | 0xc3cf309U) + << 28 | 0xed28a76U) + << 28 | 0xbcca931U), + UINTMAX_MAX / 4049) +P (2, 76, + (((((uintmax_t) 0xa002U << 28 | 0x05affefU) + << 28 | 0xd280081U) + << 28 | 0x6bffbf4U) + << 28 | 0xa00205bU), + UINTMAX_MAX / 4051) +P (6, 72, + (((((uintmax_t) 0x1d87U << 28 | 0xfb74ed0U) + << 28 | 0x1b4271fU) + << 28 | 0x5c71543U) + << 28 | 0xd558069U), + UINTMAX_MAX / 4057) +P (16, 60, + (((((uintmax_t) 0x7051U << 28 | 0x751852fU) + << 28 | 0x74370f2U) + << 28 | 0x5c64d0eU) + << 28 | 0xc53b859U), + UINTMAX_MAX / 4073) +P (6, 60, + (((((uintmax_t) 0x88e1U << 28 | 0x6f867eeU) + << 28 | 0x6d54296U) + << 28 | 0xc02c2efU) + << 28 | 0x1e0ff0fU), + UINTMAX_MAX / 4079) +P (12, 62, + (((((uintmax_t) 0xe8e8U << 28 | 0xc8bebb9U) + << 28 | 0xaa05219U) + << 28 | 0xa804816U) + << 28 | 0x870a333U), + UINTMAX_MAX / 4091) +P (2, 64, + (((((uintmax_t) 0xc605U << 28 | 0x20f62e2U) + << 28 | 0x8a79f6dU) + << 28 | 0xe49add0U) + << 28 | 0x971c555U), + UINTMAX_MAX / 4093) +P (6, 60, + (((((uintmax_t) 0x46c2U << 28 | 0xbb7cd89U) + << 28 | 0x7639d52U) + << 28 | 0x8087e68U) + << 28 | 0x4c71aabU), + UINTMAX_MAX / 4099) +P (12, 66, + (((((uintmax_t) 0xfc73U << 28 | 0x53e15cbU) + << 28 | 0x9127ea9U) + << 28 | 0x4152c26U) + << 28 | 0x9bcdeefU), + UINTMAX_MAX / 4111) +P (16, 74, + (((((uintmax_t) 0x3d78U << 28 | 0xe5c2d68U) + << 28 | 0x0673803U) + << 28 | 0x79450a3U) + << 28 | 0xc2b6bdfU), + UINTMAX_MAX / 4127) +P (2, 82, + (((((uintmax_t) 0x4a66U << 28 | 0x8c7e3baU) + << 28 | 0x4fbb8d2U) + << 28 | 0xcd38bafU) + << 28 | 0xe5373e1U), + UINTMAX_MAX / 4129) +P (4, 84, + (((((uintmax_t) 0x616eU << 28 | 0xb008eb5U) + << 28 | 0xfb2b2c2U) + << 28 | 0x9df2beaU) + << 28 | 0x71d8badU), + UINTMAX_MAX / 4133) +P (6, 80, + (((((uintmax_t) 0x12bdU << 28 | 0xa25ba9aU) + << 28 | 0x80c5ec1U) + << 28 | 0x5862775U) + << 28 | 0xf302e83U), + UINTMAX_MAX / 4139) +P (14, 76, + (((((uintmax_t) 0x98dfU << 28 | 0x642b264U) + << 28 | 0x7a0d310U) + << 28 | 0x16af2feU) + << 28 | 0x55ede09U), + UINTMAX_MAX / 4153) +P (4, 74, + (((((uintmax_t) 0xcc45U << 28 | 0x381a1c7U) + << 28 | 0x3878b3dU) + << 28 | 0x26dbd9dU) + << 28 | 0x1910715U), + UINTMAX_MAX / 4157) +P (2, 82, + (((((uintmax_t) 0x1344U << 28 | 0x23b36d8U) + << 28 | 0x0d4ba62U) + << 28 | 0x1dab2dfU) + << 28 | 0xaf3dfbfU), + UINTMAX_MAX / 4159) +P (18, 66, + (((((uintmax_t) 0xd614U << 28 | 0x399c587U) + << 28 | 0xff827b6U) + << 28 | 0xf1d7ac2U) + << 28 | 0x87338b1U), + UINTMAX_MAX / 4177) +P (24, 52, + (((((uintmax_t) 0x5c04U << 28 | 0x24ce751U) + << 28 | 0xf620c8dU) + << 28 | 0x9e9f0c3U) + << 28 | 0xf9e7fd9U), + UINTMAX_MAX / 4201) +P (10, 48, + (((((uintmax_t) 0xa4cfU << 28 | 0x6d1fac5U) + << 28 | 0x93e8e60U) + << 28 | 0xa93f876U) + << 28 | 0x2e914bbU), + UINTMAX_MAX / 4211) +P (6, 44, + (((((uintmax_t) 0x16b4U << 28 | 0x4c7d8a9U) + << 28 | 0x7e358b1U) + << 28 | 0x4371f24U) + << 28 | 0x7c159c9U), + UINTMAX_MAX / 4217) +P (2, 52, + (((((uintmax_t) 0x7d2dU << 28 | 0xb0c132cU) + << 28 | 0x9926a6dU) + << 28 | 0xd3b4844U) + << 28 | 0x71d4eb3U), + UINTMAX_MAX / 4219) +P (10, 44, + (((((uintmax_t) 0xc12aU << 28 | 0x5044c45U) + << 28 | 0xfa4f4cdU) + << 28 | 0x172f470U) + << 28 | 0x1c1684dU), + UINTMAX_MAX / 4229) +P (2, 52, + (((((uintmax_t) 0x3b6aU << 28 | 0xabf51beU) + << 28 | 0x4a6c103U) + << 28 | 0x72e686eU) + << 28 | 0xd8bb537U), + UINTMAX_MAX / 4231) +P (10, 48, + (((((uintmax_t) 0x0b0bU << 28 | 0xe43ba38U) + << 28 | 0x61105bcU) + << 28 | 0x07f7ca6U) + << 28 | 0x5c5b071U), + UINTMAX_MAX / 4241) +P (2, 54, + (((((uintmax_t) 0x1841U << 28 | 0x2954499U) + << 28 | 0xbb949abU) + << 28 | 0x2b6170cU) + << 28 | 0x3f78d9bU), + UINTMAX_MAX / 4243) +P (10, 74, + (((((uintmax_t) 0x67e4U << 28 | 0x8d552c3U) + << 28 | 0xde0d1f3U) + << 28 | 0xd74f461U) + << 28 | 0xfe6f5b5U), + UINTMAX_MAX / 4253) +P (6, 78, + (((((uintmax_t) 0xa030U << 28 | 0x161ea7bU) + << 28 | 0x38ae8dbU) + << 28 | 0xc13f4b3U) + << 28 | 0x1f3230bU), + UINTMAX_MAX / 4259) +P (2, 78, + (((((uintmax_t) 0xf2a9U << 28 | 0x8b90bb7U) + << 28 | 0x2eec1d1U) + << 28 | 0x420716eU) + << 28 | 0x3f1572dU), + UINTMAX_MAX / 4261) +P (10, 78, + (((((uintmax_t) 0xa0c1U << 28 | 0xb926e68U) + << 28 | 0x69f8ed5U) + << 28 | 0xbe2fd4dU) + << 28 | 0x805464fU), + UINTMAX_MAX / 4271) +P (2, 84, + (((((uintmax_t) 0xc4edU << 28 | 0x7ccb753U) + << 28 | 0xef76ec6U) + << 28 | 0x8b97c13U) + << 28 | 0x6943851U), + UINTMAX_MAX / 4273) +P (10, 80, + (((((uintmax_t) 0x5305U << 28 | 0xada2a32U) + << 28 | 0xce35e9eU) + << 28 | 0x27918afU) + << 28 | 0x7cfb473U), + UINTMAX_MAX / 4283) +P (6, 84, + (((((uintmax_t) 0x0b38U << 28 | 0xa4bcd9fU) + << 28 | 0xaa0cc5eU) + << 28 | 0xc8ab6c3U) + << 28 | 0x6ac7f41U), + UINTMAX_MAX / 4289) +P (8, 94, + (((((uintmax_t) 0xc8f3U << 28 | 0x8c6bf3dU) + << 28 | 0x8adf696U) + << 28 | 0x4076331U) + << 28 | 0xdd90979U), + UINTMAX_MAX / 4297) +P (30, 70, + (((((uintmax_t) 0x3ed4U << 28 | 0xdeb0e60U) + << 28 | 0x6fb3530U) + << 28 | 0x198eff7U) + << 28 | 0x7b002d7U), + UINTMAX_MAX / 4327) +P (10, 72, + (((((uintmax_t) 0xe304U << 28 | 0x8b8a2eaU) + << 28 | 0x19da93aU) + << 28 | 0xf7cb958U) + << 28 | 0x3ece011U), + UINTMAX_MAX / 4337) +P (2, 82, + (((((uintmax_t) 0x63b5U << 28 | 0xa908ca7U) + << 28 | 0xcb9bb34U) + << 28 | 0xce06f64U) + << 28 | 0x3d9883bU), + UINTMAX_MAX / 4339) +P (10, 74, + (((((uintmax_t) 0xd58fU << 28 | 0x1940b11U) + << 28 | 0x0300879U) + << 28 | 0xf767e52U) + << 28 | 0x8708c55U), + UINTMAX_MAX / 4349) +P (8, 84, + (((((uintmax_t) 0xa973U << 28 | 0xcee1454U) + << 28 | 0x5fa7a18U) + << 28 | 0x5332d2eU) + << 28 | 0xf2313cdU), + UINTMAX_MAX / 4357) +P (6, 84, + (((((uintmax_t) 0xc544U << 28 | 0x1f37189U) + << 28 | 0x5bd3a43U) + << 28 | 0xb611b84U) + << 28 | 0xc8332a3U), + UINTMAX_MAX / 4363) +P (10, 78, + (((((uintmax_t) 0xc201U << 28 | 0x49b4038U) + << 28 | 0x330c3c2U) + << 28 | 0xe215e4fU) + << 28 | 0x43bb63dU), + UINTMAX_MAX / 4373) +P (18, 66, + (((((uintmax_t) 0xfcf7U << 28 | 0xe56a2a8U) + << 28 | 0xf4dd4f9U) + << 28 | 0x4b9dd22U) + << 28 | 0xce44e97U), + UINTMAX_MAX / 4391) +P (6, 66, + (((((uintmax_t) 0xc364U << 28 | 0x3300862U) + << 28 | 0x47258d8U) + << 28 | 0x95834a1U) + << 28 | 0xdb166a5U), + UINTMAX_MAX / 4397) +P (12, 72, + (((((uintmax_t) 0xa5f1U << 28 | 0xb76bd2bU) + << 28 | 0x5f83834U) + << 28 | 0x7d2f16dU) + << 28 | 0x19b8d09U), + UINTMAX_MAX / 4409) +P (12, 62, + (((((uintmax_t) 0x9b97U << 28 | 0x89df750U) + << 28 | 0x6e4081bU) + << 28 | 0x54d4dc4U) + << 28 | 0x5b7d98dU), + UINTMAX_MAX / 4421) +P (2, 70, + (((((uintmax_t) 0x612dU << 28 | 0xe5f44efU) + << 28 | 0x2839e11U) + << 28 | 0x7ac30d9U) + << 28 | 0xa044877U), + UINTMAX_MAX / 4423) +P (18, 66, + (((((uintmax_t) 0x9811U << 28 | 0x1015369U) + << 28 | 0x6e9ec0eU) + << 28 | 0x10b78a6U) + << 28 | 0x7a526e9U), + UINTMAX_MAX / 4441) +P (6, 66, + (((((uintmax_t) 0xa197U << 28 | 0x1cf4c64U) + << 28 | 0x2a99792U) + << 28 | 0xda68a81U) + << 28 | 0x8688a9fU), + UINTMAX_MAX / 4447) +P (4, 66, + (((((uintmax_t) 0x0f02U << 28 | 0xeeeb01cU) + << 28 | 0x870bacfU) + << 28 | 0x2b6c87fU) + << 28 | 0x741f84bU), + UINTMAX_MAX / 4451) +P (6, 62, + (((((uintmax_t) 0x8d2eU << 28 | 0x94fe559U) + << 28 | 0x50d09d2U) + << 28 | 0x64f9bd4U) + << 28 | 0x1e18ed9U), + UINTMAX_MAX / 4457) +P (6, 60, + (((((uintmax_t) 0xa84bU << 28 | 0xb74450fU) + << 28 | 0xe38c973U) + << 28 | 0x3cbeaa9U) + << 28 | 0x7166d8fU), + UINTMAX_MAX / 4463) +P (18, 66, + (((((uintmax_t) 0x495aU << 28 | 0xe4dcfaaU) + << 28 | 0xfd8b1c9U) + << 28 | 0xf475b02U) + << 28 | 0x1d22e81U), + UINTMAX_MAX / 4481) +P (2, 66, + (((((uintmax_t) 0x6837U << 28 | 0x46fb256U) + << 28 | 0x74d6073U) + << 28 | 0x1f76f2eU) + << 28 | 0xc4c852bU), + UINTMAX_MAX / 4483) +P (10, 68, + (((((uintmax_t) 0xf6ffU << 28 | 0x5f8d222U) + << 28 | 0x12931daU) + << 28 | 0xf6f0c97U) + << 28 | 0x8f69945U), + UINTMAX_MAX / 4493) +P (14, 60, + (((((uintmax_t) 0xd49aU << 28 | 0xb982b2bU) + << 28 | 0x1c92174U) + << 28 | 0x9c8ad20U) + << 28 | 0xc61ec93U), + UINTMAX_MAX / 4507) +P (6, 70, + (((((uintmax_t) 0x2f4fU << 28 | 0x04983ffU) + << 28 | 0xc5e9e09U) + << 28 | 0x307ff8bU) + << 28 | 0xd3c1261U), + UINTMAX_MAX / 4513) +P (4, 74, + (((((uintmax_t) 0xadefU << 28 | 0x566dd5fU) + << 28 | 0x282eb33U) + << 28 | 0x4a69fb5U) + << 28 | 0xa486e2dU), + UINTMAX_MAX / 4517) +P (2, 78, + (((((uintmax_t) 0xd118U << 28 | 0x137ccc9U) + << 28 | 0xe647f1fU) + << 28 | 0x36c7bf3U) + << 28 | 0x1578617U), + UINTMAX_MAX / 4519) +P (4, 80, + (((((uintmax_t) 0x01cfU << 28 | 0xa9f7f67U) + << 28 | 0xdc3aa31U) + << 28 | 0xebbcc27U) + << 28 | 0x9ea6103U), + UINTMAX_MAX / 4523) +P (24, 74, + (((((uintmax_t) 0x9c1fU << 28 | 0x4da38ddU) + << 28 | 0x2657442U) + << 28 | 0xe2aad11U) + << 28 | 0x9f466ebU), + UINTMAX_MAX / 4547) +P (2, 88, + (((((uintmax_t) 0x41acU << 28 | 0x994bcdcU) + << 28 | 0xd3d2c10U) + << 28 | 0x6ec05a0U) + << 28 | 0xab1450dU), + UINTMAX_MAX / 4549) +P (12, 78, + (((((uintmax_t) 0x556dU << 28 | 0x480324aU) + << 28 | 0x6d002b1U) + << 28 | 0xb38db92U) + << 28 | 0xa99e731U), + UINTMAX_MAX / 4561) +P (6, 76, + (((((uintmax_t) 0x9c39U << 28 | 0x2ce6456U) + << 28 | 0x52d9278U) + << 28 | 0x4ae377eU) + << 28 | 0x67071e7U), + UINTMAX_MAX / 4567) +P (16, 66, + (((((uintmax_t) 0xcdc8U << 28 | 0x79fec56U) + << 28 | 0x781893eU) + << 28 | 0x9e1471bU) + << 28 | 0xa6671d7U), + UINTMAX_MAX / 4583) +P (8, 60, + (((((uintmax_t) 0x375eU << 28 | 0xf621586U) + << 28 | 0x1b19982U) + << 28 | 0xc29b59dU) + << 28 | 0x4d73d0fU), + UINTMAX_MAX / 4591) +P (6, 60, + (((((uintmax_t) 0x75c7U << 28 | 0xfa35597U) + << 28 | 0xdcce0c2U) + << 28 | 0x3dd0712U) + << 28 | 0x8b5525dU), + UINTMAX_MAX / 4597) +P (6, 60, + (((((uintmax_t) 0x4083U << 28 | 0xb2ce1ccU) + << 28 | 0xf1d164dU) + << 28 | 0x4e5ce0eU) + << 28 | 0x9245133U), + UINTMAX_MAX / 4603) +P (18, 52, + (((((uintmax_t) 0x9d9cU << 28 | 0x64622aeU) + << 28 | 0x10824c8U) + << 28 | 0xfd1057cU) + << 28 | 0x09f8cc5U), + UINTMAX_MAX / 4621) +P (16, 42, + (((((uintmax_t) 0x02b4U << 28 | 0x87cfdbcU) + << 28 | 0x89230eaU) + << 28 | 0x1516e94U) + << 28 | 0xf394035U), + UINTMAX_MAX / 4637) +P (2, 52, + (((((uintmax_t) 0x32e1U << 28 | 0x4328c7fU) + << 28 | 0xce8e0b5U) + << 28 | 0xe3319c5U) + << 28 | 0x64ee9dfU), + UINTMAX_MAX / 4639) +P (4, 60, + (((((uintmax_t) 0xf929U << 28 | 0xbd10602U) + << 28 | 0x894a612U) + << 28 | 0x6a69f90U) + << 28 | 0xd822d8bU), + UINTMAX_MAX / 4643) +P (6, 72, + (((((uintmax_t) 0xa0bcU << 28 | 0x8b6d15cU) + << 28 | 0x03be950U) + << 28 | 0x1ed6348U) + << 28 | 0x857aa19U), + UINTMAX_MAX / 4649) +P (2, 72, + (((((uintmax_t) 0xf169U << 28 | 0xf4a94f1U) + << 28 | 0x86231deU) + << 28 | 0x344a324U) + << 28 | 0xeee1c83U), + UINTMAX_MAX / 4651) +P (6, 72, + (((((uintmax_t) 0xafdaU << 28 | 0x2e10d23U) + << 28 | 0x58ab11dU) + << 28 | 0xd9690cbU) + << 28 | 0x2c406d1U), + UINTMAX_MAX / 4657) +P (6, 70, + (((((uintmax_t) 0x70eeU << 28 | 0x0c3017bU) + << 28 | 0x7881908U) + << 28 | 0xd6c5178U) + << 28 | 0xd5e4387U), + UINTMAX_MAX / 4663) +P (10, 78, + (((((uintmax_t) 0x2b47U << 28 | 0x45bd0e3U) + << 28 | 0x051844cU) + << 28 | 0xea4050aU) + << 28 | 0x3e8fdc1U), + UINTMAX_MAX / 4673) +P (6, 80, + (((((uintmax_t) 0x5aa8U << 28 | 0x9fc2b8dU) + << 28 | 0x1a891c1U) + << 28 | 0x14a06acU) + << 28 | 0xc83f777U), + UINTMAX_MAX / 4679) +P (12, 92, + (((((uintmax_t) 0x834dU << 28 | 0x385f9c7U) + << 28 | 0x5a89320U) + << 28 | 0xb060ebcU) + << 28 | 0x0ea01dbU), + UINTMAX_MAX / 4691) +P (12, 84, + (((((uintmax_t) 0xcbb0U << 28 | 0x86fea3aU) + << 28 | 0x06a40feU) + << 28 | 0x50045acU) + << 28 | 0xb78c99fU), + UINTMAX_MAX / 4703) +P (18, 68, + (((((uintmax_t) 0x4bceU << 28 | 0xc35242bU) + << 28 | 0x29eaa29U) + << 28 | 0x1a68705U) + << 28 | 0xb196e91U), + UINTMAX_MAX / 4721) +P (2, 70, + (((((uintmax_t) 0x1cf1U << 28 | 0xbea1a20U) + << 28 | 0x324cdc1U) + << 28 | 0x042c724U) + << 28 | 0x273e2bbU), + UINTMAX_MAX / 4723) +P (6, 70, + (((((uintmax_t) 0x530aU << 28 | 0xaa16d83U) + << 28 | 0x622522cU) + << 28 | 0xee680bbU) + << 28 | 0x165b7c9U), + UINTMAX_MAX / 4729) +P (4, 68, + (((((uintmax_t) 0x6dbeU << 28 | 0xc4fd598U) + << 28 | 0x42343fdU) + << 28 | 0x2ff9f12U) + << 28 | 0xe0776d5U), + UINTMAX_MAX / 4733) +P (18, 62, + (((((uintmax_t) 0x9327U << 28 | 0xd1e0357U) + << 28 | 0x3cba016U) + << 28 | 0x6a5da63U) + << 28 | 0xaf2cc6fU), + UINTMAX_MAX / 4751) +P (8, 58, + (((((uintmax_t) 0xfe7eU << 28 | 0x69c1b53U) + << 28 | 0xa5d7dedU) + << 28 | 0xd16a593U) + << 28 | 0x0408d27U), + UINTMAX_MAX / 4759) +P (24, 48, + (((((uintmax_t) 0xdba8U << 28 | 0x6fc17c3U) + << 28 | 0xa04d12aU) + << 28 | 0xdf30c26U) + << 28 | 0x528844fU), + UINTMAX_MAX / 4783) +P (4, 74, + (((((uintmax_t) 0x4928U << 28 | 0x7ba43b4U) + << 28 | 0x0f9d99aU) + << 28 | 0x48d6572U) + << 28 | 0xb5eec7bU), + UINTMAX_MAX / 4787) +P (2, 82, + (((((uintmax_t) 0xfd7cU << 28 | 0xd1c2bd5U) + << 28 | 0x72fbc6eU) + << 28 | 0x8bf2877U) + << 28 | 0x503cb9dU), + UINTMAX_MAX / 4789) +P (4, 84, + (((((uintmax_t) 0x1951U << 28 | 0x21b3d5eU) + << 28 | 0x975e0eaU) + << 28 | 0x27a191aU) + << 28 | 0x7045389U), + UINTMAX_MAX / 4793) +P (6, 90, + (((((uintmax_t) 0xced1U << 28 | 0x00e827bU) + << 28 | 0x0325b6eU) + << 28 | 0xb091f34U) + << 28 | 0xdd45d3fU), + UINTMAX_MAX / 4799) +P (2, 102, + (((((uintmax_t) 0xe394U << 28 | 0x4a02e12U) + << 28 | 0x05dd8dcU) + << 28 | 0x8a6cabbU) + << 28 | 0x2937d41U), + UINTMAX_MAX / 4801) +P (12, 96, + (((((uintmax_t) 0x3e2dU << 28 | 0xa2eb33fU) + << 28 | 0x746e6bcU) + << 28 | 0x2f04f25U) + << 28 | 0x4922a05U), + UINTMAX_MAX / 4813) +P (4, 102, + (((((uintmax_t) 0xf205U << 28 | 0xd890fadU) + << 28 | 0x84cf441U) + << 28 | 0x431f4d6U) + << 28 | 0xeb38631U), + UINTMAX_MAX / 4817) +P (14, 100, + (((((uintmax_t) 0x7974U << 28 | 0xa2271b8U) + << 28 | 0x09c017bU) + << 28 | 0xd717435U) + << 28 | 0xa08291fU), + UINTMAX_MAX / 4831) +P (30, 72, + (((((uintmax_t) 0xf434U << 28 | 0x0837312U) + << 28 | 0x2b4a342U) + << 28 | 0x32df9c9U) + << 28 | 0x1fc1a55U), + UINTMAX_MAX / 4861) +P (10, 66, + (((((uintmax_t) 0x4c78U << 28 | 0x09ab985U) + << 28 | 0xc13f8a4U) + << 28 | 0x651e1d5U) + << 28 | 0x382eab7U), + UINTMAX_MAX / 4871) +P (6, 66, + (((((uintmax_t) 0x9273U << 28 | 0x60376e4U) + << 28 | 0x8c0bf7cU) + << 28 | 0xfb5409dU) + << 28 | 0xe4cf3c5U), + UINTMAX_MAX / 4877) +P (12, 62, + (((((uintmax_t) 0x47a1U << 28 | 0xbf627e6U) + << 28 | 0x7276dcdU) + << 28 | 0xd636fb0U) + << 28 | 0x68b9929U), + UINTMAX_MAX / 4889) +P (14, 54, + (((((uintmax_t) 0x3f55U << 28 | 0x93b5db8U) + << 28 | 0xe2d01eeU) + << 28 | 0x8f95e74U) + << 28 | 0x0462c97U), + UINTMAX_MAX / 4903) +P (6, 58, + (((((uintmax_t) 0x29aaU << 28 | 0xc9d12b8U) + << 28 | 0xb650349U) + << 28 | 0x0f97b3aU) + << 28 | 0x758b4a5U), + UINTMAX_MAX / 4909) +P (10, 50, + (((((uintmax_t) 0x3c51U << 28 | 0x65394caU) + << 28 | 0x8d3eb64U) + << 28 | 0x1431563U) + << 28 | 0xc441287U), + UINTMAX_MAX / 4919) +P (12, 42, + (((((uintmax_t) 0xf258U << 28 | 0x91c808bU) + << 28 | 0x8d292b7U) + << 28 | 0x43dad3eU) + << 28 | 0xc45916bU), + UINTMAX_MAX / 4931) +P (2, 54, + (((((uintmax_t) 0x708fU << 28 | 0xa57e92aU) + << 28 | 0x8098c7bU) + << 28 | 0x188be8fU) + << 28 | 0x55c878dU), + UINTMAX_MAX / 4933) +P (4, 56, + (((((uintmax_t) 0x983dU << 28 | 0xcf2775dU) + << 28 | 0xcd7ead8U) + << 28 | 0x05648b2U) + << 28 | 0xca54ef9U), + UINTMAX_MAX / 4937) +P (6, 56, + (((((uintmax_t) 0x729cU << 28 | 0xb7c09bcU) + << 28 | 0x91a2776U) + << 28 | 0xdbe6eefU) + << 28 | 0x60123afU), + UINTMAX_MAX / 4943) +P (8, 255, + (((((uintmax_t) 0xe8f0U << 28 | 0x5536727U) + << 28 | 0xa8b8137U) + << 28 | 0x11525e6U) + << 28 | 0xa9e8867U), + UINTMAX_MAX / 4951) +P (6, 255, + (((((uintmax_t) 0xbdf2U << 28 | 0x781fd01U) + << 28 | 0x3014a85U) + << 28 | 0xc2215cbU) + << 28 | 0x383d8f5U), + UINTMAX_MAX / 4957) +P (10, 255, + (((((uintmax_t) 0x0439U << 28 | 0xee5f8e3U) + << 28 | 0x30656e5U) + << 28 | 0x8f554c8U) + << 28 | 0x9825857U), + UINTMAX_MAX / 4967) +P (2, 255, + (((((uintmax_t) 0x77adU << 28 | 0xfb283c9U) + << 28 | 0x63b0a8fU) + << 28 | 0xbd3b17cU) + << 28 | 0x01dacd9U), + UINTMAX_MAX / 4969) +P (4, 255, + (((((uintmax_t) 0x5d7bU << 28 | 0xe851f3fU) + << 28 | 0x443554cU) + << 28 | 0x8c39dc7U) + << 28 | 0xaedee65U), + UINTMAX_MAX / 4973) +P (14, 255, + (((((uintmax_t) 0x373cU << 28 | 0x1c8a99bU) + << 28 | 0x1412465U) + << 28 | 0x3ac6ddaU) + << 28 | 0x86cd3b3U), + UINTMAX_MAX / 4987) +P (6, 255, + (((((uintmax_t) 0x5b50U << 28 | 0xa687decU) + << 28 | 0x6a07b0dU) + << 28 | 0x61c6791U) + << 28 | 0xa9c2c81U), + UINTMAX_MAX / 4993) +P (6, 255, + (((((uintmax_t) 0x0b44U << 28 | 0x292c4bfU) + << 28 | 0xef9cdb6U) + << 28 | 0x27a3009U) + << 28 | 0x0354237U), + UINTMAX_MAX / 4999) + +#undef FIRST_OMITTED_PRIME +#define FIRST_OMITTED_PRIME 5003 diff --git a/src/printenv.c b/src/printenv.c index 5c01f8d8..066649d3 100644 --- a/src/printenv.c +++ b/src/printenv.c @@ -1,5 +1,5 @@ /* printenv -- print all or part of environment - Copyright (C) 1989-2012 Free Software Foundation, Inc. + Copyright (C) 1989-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 diff --git a/src/printf.c b/src/printf.c index a5317864..fd795a3d 100644 --- a/src/printf.c +++ b/src/printf.c @@ -1,5 +1,5 @@ /* printf - format and print data - Copyright (C) 1990-2012 Free Software Foundation, Inc. + Copyright (C) 1990-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 diff --git a/src/prog-fprintf.c b/src/prog-fprintf.c index b4ae0089..e800f867 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-2012 Free Software Foundation, Inc. + 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 diff --git a/src/prog-fprintf.h b/src/prog-fprintf.h index 1d72dbe3..10282f07 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-2012 Free Software Foundation, Inc. + 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 diff --git a/src/ptx.c b/src/ptx.c index a5b22d4b..f9936732 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-2012 Free Software Foundation, Inc. + Copyright (C) 1990-2013 Free Software Foundation, Inc. François Pinard <pinard@iro.umontreal.ca>, 1988. This program is free software: you can redistribute it and/or modify @@ -1820,11 +1820,10 @@ Usage: %s [OPTION]... [INPUT]... (without -G)\n\ program_name, program_name); fputs (_("\ Output a permuted index, including context, of the words in the input files.\n\ -\n\ -"), stdout); - fputs (_("\ -Mandatory arguments to long options are mandatory for short options too.\n\ "), stdout); + + emit_mandatory_arg_note (); + fputs (_("\ -A, --auto-reference output automatically generated references\n\ -G, --traditional behave more like System V 'ptx'\n\ diff --git a/src/pwd.c b/src/pwd.c index 23b7c53a..ea8a767e 100644 --- a/src/pwd.c +++ b/src/pwd.c @@ -1,5 +1,5 @@ /* pwd - print current directory - Copyright (C) 1994-2012 Free Software Foundation, Inc. + Copyright (C) 1994-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 diff --git a/src/readlink.c b/src/readlink.c index e025bf91..665a25cf 100644 --- a/src/readlink.c +++ b/src/readlink.c @@ -1,5 +1,5 @@ /* readlink -- display value of a symbolic link. - Copyright (C) 2002-2012 Free Software Foundation, Inc. + Copyright (C) 2002-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 @@ -25,7 +25,6 @@ #include "canonicalize.h" #include "error.h" #include "areadlink.h" -#include "quote.h" /* The official name of this program (e.g., no 'g' prefix). */ #define PROGRAM_NAME "readlink" @@ -47,6 +46,7 @@ static struct option const longopts[] = {"quiet", no_argument, NULL, 'q'}, {"silent", no_argument, NULL, 's'}, {"verbose", no_argument, NULL, 'v'}, + {"zero", no_argument, NULL, 'z'}, {GETOPT_HELP_OPTION_DECL}, {GETOPT_VERSION_OPTION_DECL}, {NULL, 0, NULL, 0} @@ -59,7 +59,7 @@ usage (int status) emit_try_help (); else { - printf (_("Usage: %s [OPTION]... FILE\n"), program_name); + printf (_("Usage: %s [OPTION]... FILE...\n"), program_name); fputs (_("Print value of a symbolic link or canonical file name\n\n"), stdout); fputs (_("\ @@ -77,10 +77,11 @@ usage (int status) every component of the given name recursively,\ \n\ without requirements on components existence\n\ - -n, --no-newline do not output the trailing newline\n\ + -n, --no-newline do not output the trailing delimiter\n\ -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\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); @@ -94,14 +95,9 @@ main (int argc, char **argv) { /* If not -1, use this method to canonicalize. */ int can_mode = -1; - - /* File name to canonicalize. */ - const char *fname; - - /* Result of canonicalize. */ - char *value; - + int status = EXIT_SUCCESS; int optc; + bool use_nuls = false; initialize_main (&argc, &argv); set_program_name (argv[0]); @@ -111,7 +107,7 @@ main (int argc, char **argv) atexit (close_stdout); - while ((optc = getopt_long (argc, argv, "efmnqsv", longopts, NULL)) != -1) + while ((optc = getopt_long (argc, argv, "efmnqsvz", longopts, NULL)) != -1) { switch (optc) { @@ -134,6 +130,9 @@ main (int argc, char **argv) case 'v': verbose = true; break; + case 'z': + use_nuls = true; + break; case_GETOPT_HELP_CHAR; case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: @@ -147,26 +146,33 @@ main (int argc, char **argv) usage (EXIT_FAILURE); } - fname = argv[optind++]; - - if (optind < argc) + if (argc - optind > 1) { - error (0, 0, _("extra operand %s"), quote (argv[optind])); - usage (EXIT_FAILURE); + if (no_newline) + error (0, 0, _("ignoring --no-newline with multiple arguments")); + no_newline = false; } - value = (can_mode != -1 - ? canonicalize_filename_mode (fname, can_mode) - : areadlink_with_size (fname, 63)); - if (value) + for (; optind < argc; ++optind) { - printf ("%s%s", value, (no_newline ? "" : "\n")); - free (value); - return EXIT_SUCCESS; + const char *fname = argv[optind]; + char *value = (can_mode != -1 + ? canonicalize_filename_mode (fname, can_mode) + : areadlink_with_size (fname, 63)); + if (value) + { + fputs (value, stdout); + if (! no_newline) + putchar (use_nuls ? '\0' : '\n'); + free (value); + } + else + { + status = EXIT_FAILURE; + if (verbose) + error (0, errno, "%s", fname); + } } - if (verbose) - error (EXIT_FAILURE, errno, "%s", fname); - - return EXIT_FAILURE; + return status; } diff --git a/src/realpath.c b/src/realpath.c index cd595b8c..292c8f3b 100644 --- a/src/realpath.c +++ b/src/realpath.c @@ -1,5 +1,5 @@ /* realpath - print the resolved path - Copyright (C) 2011-2012 Free Software Foundation, Inc. + 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 diff --git a/src/relpath.c b/src/relpath.c index 4405361c..5a93afe4 100644 --- a/src/relpath.c +++ b/src/relpath.c @@ -1,5 +1,5 @@ /* relpath - print the relative path - Copyright (C) 2012 Free Software Foundation, Inc. + Copyright (C) 2012-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 diff --git a/src/relpath.h b/src/relpath.h index e25f82b2..0439d330 100644 --- a/src/relpath.h +++ b/src/relpath.h @@ -1,5 +1,5 @@ /* relpath - print the relative path - Copyright (C) 2012 Free Software Foundation, Inc. + Copyright (C) 2012-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 diff --git a/src/remove.c b/src/remove.c index f44a9821..cdbbec5b 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-2012 Free Software Foundation, Inc. + Copyright (C) 1988-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 @@ -88,20 +88,6 @@ cache_stat_init (struct stat *st) return st; } -/* Return true if *ST has been statted. */ -static inline bool -cache_statted (struct stat *st) -{ - return (st->st_size != -1); -} - -/* Return true if *ST has been statted successfully. */ -static inline bool -cache_stat_ok (struct stat *st) -{ - return (0 <= st->st_size); -} - /* Return 1 if FILE is an unwritable non-symlink, 0 if it is writable or some other type of file, -1 and set errno if there is some problem in determining the answer. @@ -204,6 +190,13 @@ prompt (FTS const *fts, FTSENT const *ent, bool is_dir, int dirent_type = is_dir ? DT_DIR : DT_UNKNOWN; int write_protected = 0; + bool is_empty = false; + if (is_empty_p) + { + is_empty = is_empty_dir (fd_cwd, filename); + *is_empty_p = is_empty ? T_YES : T_NO; + } + /* When nonzero, this indicates that we failed to remove a child entry, either because the user declined an interactive prompt, or due to some other failure, like permissions. */ @@ -252,7 +245,10 @@ prompt (FTS const *fts, FTSENT const *ent, bool is_dir, break; case DT_DIR: - if (!x->recursive) + /* Unless we're either deleting directories or deleting + recursively, we want to raise an EISDIR error rather than + prompting the user */ + if ( ! (x->recursive || (x->remove_empty_directories && is_empty))) { write_protected = -1; wp_errno = EISDIR; @@ -268,15 +264,6 @@ prompt (FTS const *fts, FTSENT const *ent, bool is_dir, return RM_ERROR; } - bool is_empty; - if (is_empty_p) - { - is_empty = is_empty_dir (fd_cwd, filename); - *is_empty_p = is_empty ? T_YES : T_NO; - } - else - is_empty = false; - /* Issue the prompt. */ if (dirent_type == DT_DIR && mode == PA_DESCEND_INTO_DIR @@ -311,36 +298,6 @@ prompt (FTS const *fts, FTSENT const *ent, bool is_dir, return RM_OK; } -/* Return true if FILENAME is a directory (and not a symlink to a directory). - Otherwise, including the case in which lstat fails, return false. - *ST is FILENAME's tstatus. - Do not modify errno. */ -static inline bool -is_dir_lstat (int fd_cwd, char const *filename, struct stat *st) -{ - int saved_errno = errno; - bool is_dir = - (cache_fstatat (fd_cwd, filename, st, AT_SYMLINK_NOFOLLOW) == 0 - && S_ISDIR (st->st_mode)); - errno = saved_errno; - return is_dir; -} - -/* Return true if FILENAME is a non-directory. - Otherwise, including the case in which lstat fails, return false. - *ST is FILENAME's tstatus. - Do not modify errno. */ -static inline bool -is_nondir_lstat (int fd_cwd, char const *filename, struct stat *st) -{ - int saved_errno = errno; - bool is_non_dir = - (cache_fstatat (fd_cwd, filename, st, AT_SYMLINK_NOFOLLOW) == 0 - && !S_ISDIR (st->st_mode)); - errno = saved_errno; - return is_non_dir; -} - /* When a function like unlink, rmdir, or fstatat fails with an errno value of ERRNUM, return true if the specified file system object is guaranteed not to exist; otherwise, return false. */ @@ -435,11 +392,15 @@ excise (FTS *fts, FTSENT *ent, struct rm_options const *x, bool is_dir) if (ignorable_missing (x, errno)) return RM_OK; - /* When failing to rmdir an unreadable directory, the typical - errno value is EISDIR, but that is not as useful to the user - as the errno value from the failed open (probably EPERM). - Use the earlier, more descriptive errno value. */ - if (ent->fts_info == FTS_DNR) + /* When failing to rmdir an unreadable directory, we see errno values + like EISDIR or ENOTDIR (or, on Solaris 10, EEXIST), but they would be + meaningless in a diagnostic. When that happens and the errno value + from the failed open is EPERM or EACCES, use the earlier, more + descriptive errno value. */ + if (ent->fts_info == FTS_DNR + && (errno == ENOTEMPTY || errno == EISDIR || errno == ENOTDIR + || errno == EEXIST) + && (ent->fts_errno == EPERM || ent->fts_errno == EACCES)) errno = ent->fts_errno; error (0, errno, _("cannot remove %s"), quote (ent->fts_path)); mark_ancestor_dirs (ent); @@ -458,11 +419,16 @@ rm_fts (FTS *fts, FTSENT *ent, struct rm_options const *x) switch (ent->fts_info) { case FTS_D: /* preorder directory */ - if (! x->recursive) + if (! x->recursive + && !(x->remove_empty_directories + && is_empty_dir (fts->fts_cwd_fd, ent->fts_accpath))) { - /* This is the first (pre-order) encounter with a directory. - Not recursive, so arrange to skip contents. */ - error (0, EISDIR, _("cannot remove %s"), quote (ent->fts_path)); + /* This is the first (pre-order) encounter with a directory + that we cannot delete. + Not recursive, and it's not an empty directory (if we're removing + them) so arrange to skip contents. */ + int err = x->remove_empty_directories ? ENOTEMPTY : EISDIR; + error (0, err, _("cannot remove %s"), quote (ent->fts_path)); mark_ancestor_dirs (ent); fts_skip_tree (fts, ent); return RM_ERROR; @@ -471,9 +437,6 @@ 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 (strip_trailing_slashes (ent->fts_path)) - ent->fts_pathlen = strlen (ent->fts_path); - /* 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))) diff --git a/src/remove.h b/src/remove.h index 4eab2821..9ac54d43 100644 --- a/src/remove.h +++ b/src/remove.h @@ -1,6 +1,6 @@ /* Remove directory entries. - Copyright (C) 1998-2012 Free Software Foundation, Inc. + Copyright (C) 1998-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 @@ -49,6 +49,9 @@ struct rm_options /* If true, recursively remove directories. */ bool recursive; + /* If true, remove empty directories. */ + bool remove_empty_directories; + /* Pointer to the device and inode numbers of '/', when --recursive and preserving '/'. Otherwise NULL. */ struct dev_ino *root_dev_ino; diff --git a/src/rm.c b/src/rm.c index 02809f21..3e187cf8 100644 --- a/src/rm.c +++ b/src/rm.c @@ -1,5 +1,5 @@ /* 'rm' file deletion utility for GNU. - Copyright (C) 1988-2012 Free Software Foundation, Inc. + Copyright (C) 1988-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 @@ -77,6 +77,7 @@ static struct option const long_opts[] = {"-presume-input-tty", no_argument, NULL, PRESUME_INPUT_TTY_OPTION}, {"recursive", no_argument, NULL, 'r'}, + {"dir", no_argument, NULL, 'd'}, {"verbose", no_argument, NULL, 'v'}, {GETOPT_HELP_OPTION_DECL}, {GETOPT_VERSION_OPTION_DECL}, @@ -154,6 +155,7 @@ Remove (unlink) the FILE(s).\n\ --no-preserve-root do not treat '/' specially\n\ --preserve-root do not remove '/' (default)\n\ -r, -R, --recursive remove directories and their contents recursively\n\ + -d, --dir remove empty directories\n\ -v, --verbose explain what is being done\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); @@ -189,6 +191,7 @@ rm_option_init (struct rm_options *x) x->ignore_missing_files = false; x->interactive = RMI_SOMETIMES; x->one_file_system = false; + x->remove_empty_directories = false; x->recursive = false; x->root_dev_ino = NULL; x->stdin_tty = isatty (STDIN_FILENO); @@ -220,10 +223,14 @@ main (int argc, char **argv) /* Try to disable the ability to unlink a directory. */ priv_set_remove_linkdir (); - while ((c = getopt_long (argc, argv, "firvIR", long_opts, NULL)) != -1) + while ((c = getopt_long (argc, argv, "dfirvIR", long_opts, NULL)) != -1) { switch (c) { + case 'd': + x.remove_empty_directories = true; + break; + case 'f': x.interactive = RMI_NEVER; x.ignore_missing_files = true; diff --git a/src/rmdir.c b/src/rmdir.c index 38850c81..81ef2a99 100644 --- a/src/rmdir.c +++ b/src/rmdir.c @@ -1,6 +1,6 @@ /* rmdir -- remove directories - Copyright (C) 1990-2012 Free Software Foundation, Inc. + Copyright (C) 1990-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 diff --git a/src/runcon.c b/src/runcon.c index 875441f3..8a0b34e9 100644 --- a/src/runcon.c +++ b/src/runcon.c @@ -1,5 +1,5 @@ /* runcon -- run command with specified security context - Copyright (C) 2005-2012 Free Software Foundation, Inc. + Copyright (C) 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 @@ -87,7 +87,11 @@ Usage: %s CONTEXT COMMAND [args]\n\ fputs (_("\ Run a program in a different security context.\n\ With neither CONTEXT nor COMMAND, print the current security context.\n\ -\n\ +"), stdout); + + emit_mandatory_arg_note (); + + fputs (_("\ CONTEXT Complete security context\n\ -c, --compute compute process transition context before modifying\n\ -t, --type=TYPE type (for same role as parent)\n\ diff --git a/src/seq.c b/src/seq.c index 90e9fc15..acbe2350 100644 --- a/src/seq.c +++ b/src/seq.c @@ -1,5 +1,5 @@ /* seq - print sequence of numbers to standard output. - Copyright (C) 1994-2012 Free Software Foundation, Inc. + Copyright (C) 1994-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 @@ -72,7 +72,11 @@ Usage: %s [OPTION]... LAST\n\ "), program_name, program_name, program_name); fputs (_("\ Print numbers from FIRST to LAST, in steps of INCREMENT.\n\ -\n\ +"), stdout); + + emit_mandatory_arg_note (); + + fputs (_("\ -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\ @@ -166,6 +170,21 @@ scan_arg (const char *arg) { long exponent = strtol (e + 1, NULL, 10); ret.precision += exponent < 0 ? -exponent : 0; + /* Don't account for e.... in the width since this is not output. */ + ret.width -= strlen (arg) - (e - arg); + /* Adjust the width as per the exponent. */ + if (exponent < 0) + { + if (decimal_point) + { + if (e == decimal_point + 1) /* undo #. -> # above */ + ret.width++; + } + else + ret.width++; + exponent = -exponent; + } + ret.width += exponent; } } @@ -317,6 +336,8 @@ get_default_format (operand first, operand step, operand last) last_width--; /* don't include space for '.' */ if (last.precision == 0 && prec) last_width++; /* include space for '.' */ + if (first.precision == 0 && prec) + first_width++; /* include space for '.' */ size_t width = MAX (first_width, last_width); if (width <= INT_MAX) { @@ -335,6 +356,122 @@ get_default_format (operand first, operand step, operand last) return "%Lg"; } +/* The NUL-terminated string S0 of length S_LEN represents a valid + non-negative decimal integer. Adjust the string and length so + that the pair describe the next-larger value. */ +static void +incr (char **s0, size_t *s_len) +{ + char *s = *s0; + char *endp = s + *s_len - 1; + + do + { + if ((*endp)++ < '9') + return; + *endp-- = '0'; + } + while (endp >= s); + *--(*s0) = '1'; + ++*s_len; +} + +/* Compare A and B (each a NUL-terminated digit string), with lengths + given by A_LEN and B_LEN. Return +1 if A < B, -1 if B < A, else 0. */ +static int +cmp (char const *a, size_t a_len, char const *b, size_t b_len) +{ + if (a_len < b_len) + return -1; + if (b_len < a_len) + return 1; + return (strcmp (a, b)); +} + +/* Trim leading 0's from S, but if S is all 0's, leave one. + Return a pointer to the trimmed string. */ +static char const * _GL_ATTRIBUTE_PURE +trim_leading_zeros (char const *s) +{ + char const *p = s; + while (*s == '0') + ++s; + + /* If there were only 0's, back up, to leave one. */ + if (!*s && s != p) + --s; + return s; +} + +/* Print all whole numbers from A to B, inclusive -- to stdout, each + followed by a newline. If B < A, return false and print nothing. + Otherwise, return true. */ +static bool +seq_fast (char const *a, char const *b) +{ + /* Skip past any leading 0's. Without this, our naive cmp + function would declare 000 to be larger than 99. */ + a = trim_leading_zeros (a); + b = trim_leading_zeros (b); + + size_t p_len = strlen (a); + size_t q_len = strlen (b); + size_t n = MAX (p_len, q_len); + char *p0 = xmalloc (n + 1); + char *p = memcpy (p0 + n - p_len, a, p_len + 1); + char *q0 = xmalloc (n + 1); + char *q = memcpy (q0 + n - q_len, b, q_len + 1); + + bool ok = cmp (p, p_len, q, q_len) <= 0; + if (ok) + { + /* Buffer at least this many numbers per fwrite call. + This gives a speed-up of more than 2x over the unbuffered code + when printing the first 10^9 integers. */ + enum {N = 40}; + char *buf = xmalloc (N * (n + 1)); + char const *buf_end = buf + N * (n + 1); + + char *z = buf; + + /* Write first number to buffer. */ + z = mempcpy (z, p, p_len); + + /* Append separator then number. */ + while (cmp (p, p_len, q, q_len) < 0) + { + *z++ = *separator; + incr (&p, &p_len); + z = mempcpy (z, p, p_len); + /* If no place for another separator + number then + output buffer so far, and reset to start of buffer. */ + if (buf_end - (n + 1) < z) + { + fwrite (buf, z - buf, 1, stdout); + z = buf; + } + } + + /* Write any remaining buffered output, and the terminator. */ + *z++ = *terminator; + fwrite (buf, z - buf, 1, stdout); + + IF_LINT (free (buf)); + } + + free (p0); + free (q0); + return ok; +} + +/* Return true if S consists of at least one digit and no non-digits. */ +static bool _GL_ATTRIBUTE_PURE +all_digits_p (char const *s) +{ + size_t n = strlen (s); + return ISDIGIT (s[0]) && n == strspn (s, "0123456789"); +} + int main (int argc, char **argv) { @@ -397,13 +534,14 @@ main (int argc, char **argv) } } - if (argc - optind < 1) + unsigned int n_args = argc - optind; + if (n_args < 1) { error (0, 0, _("missing operand")); usage (EXIT_FAILURE); } - if (3 < argc - optind) + if (3 < n_args) { error (0, 0, _("extra operand %s"), quote (argv[optind + 3])); usage (EXIT_FAILURE); @@ -412,6 +550,33 @@ main (int argc, char **argv) if (format_str) format_str = long_double_format (format_str, &layout); + if (format_str != NULL && equal_width) + { + error (0, 0, _("format string may not be specified" + " when printing equal width strings")); + usage (EXIT_FAILURE); + } + + /* If the following hold: + - no format string, [FIXME: relax this, eventually] + - integer start (or no start) + - integer end + - increment == 1 or not specified [FIXME: relax this, eventually] + then use the much more efficient integer-only code. */ + if (all_digits_p (argv[optind]) + && (n_args == 1 || all_digits_p (argv[optind + 1])) + && (n_args < 3 || (STREQ ("1", argv[optind + 1]) + && all_digits_p (argv[optind + 2]))) + && !equal_width && !format_str && strlen (separator) == 1) + { + char const *s1 = n_args == 1 ? "1" : argv[optind]; + char const *s2 = argv[optind + (n_args - 1)]; + if (seq_fast (s1, s2)) + exit (EXIT_SUCCESS); + + /* Upon any failure, let the more general code deal with it. */ + } + last = scan_arg (argv[optind++]); if (optind < argc) @@ -426,11 +591,27 @@ main (int argc, char **argv) } } - if (format_str != NULL && equal_width) + if (first.precision == 0 && step.precision == 0 && last.precision == 0 + && 0 <= first.value && step.value == 1 && 0 <= last.value + && !equal_width && !format_str && strlen (separator) == 1) { - error (0, 0, _("format string may not be specified" - " when printing equal width strings")); - usage (EXIT_FAILURE); + char *s1; + char *s2; + if (asprintf (&s1, "%0.Lf", first.value) < 0) + xalloc_die (); + if (asprintf (&s2, "%0.Lf", last.value) < 0) + xalloc_die (); + + if (seq_fast (s1, s2)) + { + IF_LINT (free (s1)); + IF_LINT (free (s2)); + exit (EXIT_SUCCESS); + } + + free (s1); + free (s2); + /* Upon any failure, let the more general code deal with it. */ } if (format_str == NULL) diff --git a/src/setuidgid.c b/src/setuidgid.c index 39044ce9..ed6b65d2 100644 --- a/src/setuidgid.c +++ b/src/setuidgid.c @@ -1,5 +1,5 @@ /* setuidgid - run a command with the UID and GID of a specified user - Copyright (C) 2003-2012 Free Software Foundation, Inc. + 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 @@ -107,7 +107,7 @@ main (int argc, char **argv) { if (! (xstrtoul (gr, &ptr, 10, &tmp_ul, NULL) == LONGINT_OK && tmp_ul <= GID_T_MAX)) - error (EXIT_FAILURE, 0, _("invalid group %s"), + error (SETUIDGID_FAILURE, 0, _("invalid group %s"), quote (gr)); if (n_gids == n_gids_allocated) gids = X2NREALLOC (gids, &n_gids_allocated); @@ -159,8 +159,7 @@ main (int argc, char **argv) pwd = getpwnam (user); if (pwd == NULL) { - error (SETUIDGID_FAILURE, errno, - _("unknown user-ID: %s"), quote (user)); + error (0, errno, _("unknown user-ID: %s"), quote (user)); usage (SETUIDGID_FAILURE); } uid = pwd->pw_uid; @@ -170,7 +169,7 @@ main (int argc, char **argv) pwd = getpwuid (uid); if (pwd == NULL) { - error (SETUIDGID_FAILURE, errno, + error (0, errno, _("to use user-ID %s you need to use -g too"), quote (user)); usage (SETUIDGID_FAILURE); } @@ -181,8 +180,8 @@ main (int argc, char **argv) { int n = xgetgroups (pwd->pw_name, pwd->pw_gid, &gids); if (n <= 0) - error (EXIT_FAILURE, errno, _("failed to get groups for user %s"), - quote (pwd->pw_name)); + error (SETUIDGID_FAILURE, errno, + _("failed to get groups for user %s"), quote (pwd->pw_name)); n_gids = n; } diff --git a/src/shred.c b/src/shred.c index 7a282601..9b869cdc 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-2012 Free Software Foundation, Inc. + Copyright (C) 1999-2013 Free Software Foundation, Inc. Copyright (C) 1997, 1998, 1999 Colin Plumb. This program is free software: you can redistribute it and/or modify @@ -148,11 +148,10 @@ usage (int status) fputs (_("\ Overwrite the specified FILE(s) repeatedly, in order to make it harder\n\ for even very expensive hardware probing to recover the data.\n\ -\n\ -"), stdout); - fputs (_("\ -Mandatory arguments to long options are mandatory for short options too.\n\ "), stdout); + + emit_mandatory_arg_note (); + printf (_("\ -f, --force change permissions to allow writing if necessary\n\ -n, --iterations=N overwrite N times instead of the default (%d)\n\ @@ -485,10 +484,11 @@ dopass (int fd, char const *qname, off_t *sizep, int type, offset += soff; + bool done = offset == size; + /* Time to print progress? */ - if (n - && ((offset == size && *previous_human_offset) - || thresh <= (now = time (NULL)))) + if (n && ((done && *previous_human_offset) + || thresh <= (now = time (NULL)))) { char offset_buf[LONGEST_HUMAN_READABLE + 1]; char size_buf[LONGEST_HUMAN_READABLE + 1]; @@ -498,8 +498,7 @@ dopass (int fd, char const *qname, off_t *sizep, int type, = human_readable (offset, offset_buf, human_floor | human_progress_opts, 1, 1); - if (offset == size - || !STREQ (previous_human_offset, human_offset)) + if (done || !STREQ (previous_human_offset, human_offset)) { if (size < 0) error (0, 0, _("%s: pass %lu/%lu (%s)...%s"), @@ -516,7 +515,7 @@ dopass (int fd, char const *qname, off_t *sizep, int type, = human_readable (size, size_buf, human_ceiling | human_progress_opts, 1, 1); - if (offset == size) + if (done) human_offset = human_size; error (0, 0, _("%s: pass %lu/%lu (%s)...%s/%s %d%%"), qname, k, n, pass_string, human_offset, human_size, diff --git a/src/shuf.c b/src/shuf.c index bb4736ca..71ac3e60 100644 --- a/src/shuf.c +++ b/src/shuf.c @@ -1,6 +1,6 @@ /* Shuffle lines of text. - Copyright (C) 2006-2012 Free Software Foundation, Inc. + Copyright (C) 2006-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 @@ -53,11 +53,10 @@ Usage: %s [OPTION]... [FILE]\n\ program_name, program_name, program_name); fputs (_("\ Write a random permutation of the input lines to standard output.\n\ -\n\ -"), stdout); - fputs (_("\ -Mandatory arguments to long options are mandatory for short options too.\n\ "), stdout); + + emit_mandatory_arg_note (); + fputs (_("\ -e, --echo treat each ARG as an input line\n\ -i, --input-range=LO-HI treat each number LO through HI as an input line\n\ diff --git a/src/sleep.c b/src/sleep.c index 3aec9379..b9163bc4 100644 --- a/src/sleep.c +++ b/src/sleep.c @@ -1,5 +1,5 @@ /* sleep - delay for a specified amount of time. - Copyright (C) 1984-2012 Free Software Foundation, Inc. + Copyright (C) 1984-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 diff --git a/src/sort.c b/src/sort.c index 493e7f17..7410abca 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-2012 Free Software Foundation, Inc. + Copyright (C) 1988-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 @@ -28,6 +28,7 @@ #include <sys/types.h> #include <sys/wait.h> #include <signal.h> +#include <assert.h> #include "system.h" #include "argmatch.h" #include "error.h" @@ -261,6 +262,9 @@ struct merge_node_queue when popping. */ }; +/* Used to implement --unique (-u). */ +static struct line saved_line; + /* FIXME: None of these tables work with multibyte character sets. Also, there are many other bugs when handling multibyte characters. One way to fix this is to rewrite 'sort' to use wide characters @@ -394,11 +398,10 @@ Usage: %s [OPTION]... [FILE]...\n\ program_name, program_name); fputs (_("\ Write sorted concatenation of all FILE(s) to standard output.\n\ -\n\ -"), stdout); - fputs (_("\ -Mandatory arguments to long options are mandatory for short options too.\n\ "), stdout); + + emit_mandatory_arg_note (); + fputs (_("\ Ordering options:\n\ \n\ @@ -910,11 +913,10 @@ create_temp_file (int *pfd, bool survive_fd_exhaustion) static FILE * stream_open (char const *file, char const *how) { - if (!file) - return stdout; + FILE *fp; + if (*how == 'r') { - FILE *fp; if (STREQ (file, "-")) { have_read_stdin = true; @@ -923,9 +925,18 @@ stream_open (char const *file, char const *how) else fp = fopen (file, how); fadvise (fp, FADVISE_SEQUENTIAL); - return fp; } - return fopen (file, how); + else if (*how == 'w') + { + if (file && ftruncate (STDOUT_FILENO, 0) != 0) + error (SORT_FAILURE, errno, _("%s: error truncating"), + quote (file)); + fp = stdout; + } + else + assert (!"unexpected mode passed to stream_open"); + + return fp; } /* Same as stream_open, except always return a non-null value; die on @@ -967,10 +978,14 @@ xfclose (FILE *fp, char const *file) } static void -dup2_or_die (int oldfd, int newfd) +move_fd_or_die (int oldfd, int newfd) { - if (dup2 (oldfd, newfd) < 0) - error (SORT_FAILURE, errno, _("dup2 failed")); + if (oldfd != newfd) + { + if (dup2 (oldfd, newfd) < 0) + error (SORT_FAILURE, errno, _("dup2 failed")); + close (oldfd); + } } /* Fork a child process for piping to and do common cleanup. The @@ -1081,10 +1096,8 @@ maybe_create_temp (FILE **pfp, bool survive_fd_exhaustion) else if (node->pid == 0) { close (pipefds[1]); - dup2_or_die (tempfd, STDOUT_FILENO); - close (tempfd); - dup2_or_die (pipefds[0], STDIN_FILENO); - close (pipefds[0]); + 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"), @@ -1141,10 +1154,8 @@ open_temp (struct tempnode *temp) case 0: close (pipefds[0]); - dup2_or_die (tempfd, STDIN_FILENO); - close (tempfd); - dup2_or_die (pipefds[1], STDOUT_FILENO); - close (pipefds[1]); + 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"), @@ -1399,22 +1410,16 @@ specify_nthreads (int oi, char c, char const *s) return nthreads; } - /* Return the default sort size. */ static size_t default_sort_size (void) { - /* Let MEM be available memory or 1/8 of total memory, whichever - is greater. */ - double avail = physmem_available (); - double total = physmem_total (); - double mem = MAX (avail, total / 8); - struct rlimit rlimit; - - /* Let SIZE be MEM, but no more than the maximum object size or - system resource limits. Don't bother to check for values like - RLIM_INFINITY since in practice they are not much less than SIZE_MAX. */ + /* Let SIZE be MEM, but no more than the maximum object size, + total memory, or system resource limits. Don't bother to check + for values like RLIM_INFINITY since in practice they are not much + less than SIZE_MAX. */ size_t size = SIZE_MAX; + struct rlimit rlimit; if (getrlimit (RLIMIT_DATA, &rlimit) == 0 && rlimit.rlim_cur < size) size = rlimit.rlim_cur; #ifdef RLIMIT_AS @@ -1433,6 +1438,16 @@ default_sort_size (void) size = rlimit.rlim_cur / 16 * 15; #endif + /* Let MEM be available memory or 1/8 of total memory, whichever + is greater. */ + double avail = physmem_available (); + double total = physmem_total (); + double mem = MAX (avail, total / 8); + + /* Leave a 1/4 margin for physical memory. */ + if (total * 0.75 < size) + size = total * 0.75; + /* Return the minimum of MEM and SIZE, but no less than MIN_SORT_SIZE. Avoid the MIN macro here, as it is not quite right when only one argument is floating point. */ @@ -1800,7 +1815,7 @@ fillbuf (struct buffer *buf, FILE *fp, char const *file) { /* The current input line is too long to fit in the buffer. - Double the buffer size and try again, keeping it properly + Increase the buffer size and try again, keeping it properly aligned. */ size_t line_alloc = buf->alloc / sizeof (struct line); buf->buf = x2nrealloc (buf->buf, &line_alloc, sizeof (struct line)); @@ -3335,13 +3350,11 @@ queue_pop (struct merge_node_queue *queue) static void write_unique (struct line const *line, FILE *tfp, char const *temp_output) { - static struct line saved; - if (unique) { - if (saved.text && ! compare (line, &saved)) + if (saved_line.text && ! compare (line, &saved_line)) return; - saved = *line; + saved_line = *line; } write_line (line, tfp, temp_output); @@ -3636,10 +3649,7 @@ avoid_trashing_input (struct sortfile *files, size_t ntemps, { if (! got_outstat) { - if ((outfile - ? stat (outfile, &outstat) - : fstat (STDOUT_FILENO, &outstat)) - != 0) + if (fstat (STDOUT_FILENO, &outstat) != 0) break; got_outstat = true; } @@ -3666,6 +3676,45 @@ avoid_trashing_input (struct sortfile *files, size_t ntemps, } } +/* Scan the input files to ensure all are accessible. + Otherwise exit with a diagnostic. + + Note this will catch common issues with permissions etc. + but will fail to notice issues where you can open() but not read(), + like when a directory is specified on some systems. + Catching these obscure cases could slow down performance in + common cases. */ + +static void +check_inputs (char *const *files, size_t nfiles) +{ + size_t i; + for (i = 0; i < nfiles; i++) + { + if (STREQ (files[i], "-")) + continue; + + if (euidaccess (files[i], R_OK) != 0) + die (_("cannot read"), files[i]); + } +} + +/* Ensure a specified output file can be created or written to, + and point stdout to it. Do not truncate the file. + Exit with a diagnostic on failure. */ + +static void +check_output (char const *outfile) +{ + if (outfile) + { + int outfd = open (outfile, O_WRONLY | O_CREAT | O_BINARY, MODE_RW_UGO); + if (outfd < 0) + die (_("open failed"), outfile); + move_fd_or_die (outfd, STDOUT_FILENO); + } +} + /* Merge the input FILES. NTEMPS is the number of files at the start of FILES that are temporary; it is zero at the top level. NFILES is the total number of files. Put the output in @@ -3843,6 +3892,7 @@ sort (char *const *files, size_t nfiles, char const *output_file, break; } + saved_line.text = NULL; line = buffer_linelim (&buf); if (buf.eof && !nfiles && !ntemps && !buf.left) { @@ -4243,6 +4293,10 @@ main (int argc, char **argv) char const *optarg1 = argv[optind++]; s = parse_field_count (optarg1 + 1, &key->eword, N_("invalid number after '-'")); + /* When called with a non-NULL message ID, + parse_field_count cannot return NULL. Tell static + analysis tools that dereferencing S is safe. */ + assert (s); if (*s == '.') s = parse_field_count (s + 1, &key->echar, N_("invalid number after '.'")); @@ -4616,6 +4670,12 @@ main (int argc, char **argv) exit (check (files[0], checkonly) ? EXIT_SUCCESS : SORT_OUT_OF_ORDER); } + /* Check all inputs are accessible, or exit immediately. */ + check_inputs (files, nfiles); + + /* Check output is writable, or exit immediately. */ + check_output (outfile); + if (mergeonly) { struct sortfile *sortfiles = xcalloc (nfiles, sizeof *sortfiles); diff --git a/src/split.c b/src/split.c index 53ee2719..e5e75f0f 100644 --- a/src/split.c +++ b/src/split.c @@ -1,5 +1,5 @@ /* split.c -- split a file into pieces. - Copyright (C) 1988-2012 Free Software Foundation, Inc. + Copyright (C) 1988-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 @@ -92,6 +92,9 @@ static char const *additional_suffix; /* Name of input file. May be "-". */ static char *infile; +/* stat buf for input file. */ +static struct stat in_stat_buf; + /* Descriptor on which output file is open. */ static int output_desc = -1; @@ -206,11 +209,10 @@ Usage: %s [OPTION]... [INPUT [PREFIX]]\n\ 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\ -\n\ -"), stdout); - fputs (_("\ -Mandatory arguments to long options are mandatory for short options too.\n\ "), stdout); + + emit_mandatory_arg_note (); + 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\ @@ -362,8 +364,20 @@ create (const char *name) { if (verbose) fprintf (stdout, _("creating file %s\n"), quote (name)); - return open (name, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, - (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); + + int fd = open (name, O_WRONLY | O_CREAT | O_BINARY, MODE_RW_UGO); + if (fd < 0) + return fd; + struct stat out_stat_buf; + if (fstat (fd, &out_stat_buf) != 0) + error (EXIT_FAILURE, errno, _("failed to stat %s"), quote (name)); + if (SAME_INODE (in_stat_buf, out_stat_buf)) + error (EXIT_FAILURE, 0, _("%s would overwrite input; aborting"), + quote (name)); + if (ftruncate (fd, 0) != 0) + error (EXIT_FAILURE, errno, _("%s: error truncating"), quote (name)); + + return fd; } else { @@ -1029,6 +1043,7 @@ no_filters: files[i_file].ofd = OFD_APPEND; } } + IF_LINT (free (files)); } #define FAIL_ONLY_ONE_WAY() \ @@ -1058,10 +1073,8 @@ parse_chunk (uintmax_t *k_units, uintmax_t *n_units, char *slash) int main (int argc, char **argv) { - struct stat stat_buf; enum Split_type split_type = type_undef; size_t in_blk_size = 0; /* optimal block size of input file device */ - char *buf; /* file i/o buffer */ size_t page_size = getpagesize (); uintmax_t k_units = 0; uintmax_t n_units; @@ -1335,16 +1348,16 @@ main (int argc, char **argv) /* Get the optimal block size of input device and make a buffer. */ - if (fstat (STDIN_FILENO, &stat_buf) != 0) + if (fstat (STDIN_FILENO, &in_stat_buf) != 0) error (EXIT_FAILURE, errno, "%s", infile); if (in_blk_size == 0) - in_blk_size = io_blksize (stat_buf); + in_blk_size = io_blksize (in_stat_buf); if (split_type == type_chunk_bytes || split_type == type_chunk_lines) { off_t input_offset = lseek (STDIN_FILENO, 0, SEEK_CUR); - if (usable_st_size (&stat_buf)) - file_size = stat_buf.st_size; + if (usable_st_size (&in_stat_buf)) + file_size = in_stat_buf.st_size; else if (0 <= input_offset) { file_size = lseek (STDIN_FILENO, 0, SEEK_END); @@ -1368,7 +1381,8 @@ main (int argc, char **argv) file_size = MAX (file_size, n_units); } - buf = ptr_align (xmalloc (in_blk_size + 1 + page_size - 1), page_size); + void *b = xmalloc (in_blk_size + 1 + page_size - 1); + char *buf = ptr_align (b, page_size); /* When filtering, closure of one pipe must not terminate the process, as there may still be other streams expecting input from us. */ @@ -1418,6 +1432,8 @@ main (int argc, char **argv) abort (); } + IF_LINT (free (b)); + if (close (STDIN_FILENO) != 0) error (EXIT_FAILURE, errno, "%s", infile); closeout (NULL, output_desc, filter_pid, outfile); diff --git a/src/stat.c b/src/stat.c index c6747a6b..dd210d18 100644 --- a/src/stat.c +++ b/src/stat.c @@ -1,5 +1,5 @@ /* stat.c -- display file or file system status - Copyright (C) 2001-2012 Free Software Foundation, Inc. + Copyright (C) 2001-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 @@ -126,7 +126,11 @@ statfs (char const *filename, struct fs_info *buf) # else # define STRUCT_STATVFS struct statfs # define STRUCT_STATXFS_F_FSID_IS_INTEGER STRUCT_STATFS_F_FSID_IS_INTEGER -# define STATFS_FRSIZE(S) 0 +# if HAVE_STRUCT_STATFS_F_FRSIZE +# define STATFS_FRSIZE(S) ((S)->f_frsize) +# else +# define STATFS_FRSIZE(S) 0 +# endif # endif #endif @@ -245,6 +249,11 @@ human_fstype (STRUCT_STATVFS const *statfsbuf) return "afs"; case S_MAGIC_ANON_INODE_FS: /* 0x09041934 local */ return "anon-inode FS"; + case S_MAGIC_AUFS: /* 0x61756673 remote */ + /* FIXME: change syntax or add an optional attribute like "inotify:no". + The above is labeled as "remote" so that tail always uses polling, + but this isn't really a remote file system type. */ + return "aufs"; case S_MAGIC_AUTOFS: /* 0x0187 local */ return "autofs"; case S_MAGIC_BEFS: /* 0x42465331 local */ @@ -257,6 +266,8 @@ human_fstype (STRUCT_STATVFS const *statfsbuf) return "binfmt_misc"; case S_MAGIC_BTRFS: /* 0x9123683E local */ return "btrfs"; + case S_MAGIC_CEPH: /* 0x00C36400 remote */ + return "ceph"; case S_MAGIC_CGROUP: /* 0x0027E0EB local */ return "cgroupfs"; case S_MAGIC_CIFS: /* 0xFF534D42 remote */ @@ -353,6 +364,8 @@ human_fstype (STRUCT_STATVFS const *statfsbuf) return "openprom"; case S_MAGIC_OCFS2: /* 0x7461636f remote */ return "ocfs2"; + case S_MAGIC_PANFS: /* 0xAAD7AAEA remote */ + return "panfs"; case S_MAGIC_PIPEFS: /* 0x50495045 remote */ /* FIXME: change syntax or add an optional attribute like "inotify:no". The above is labeled as "remote" so that tail always uses polling, @@ -402,8 +415,12 @@ human_fstype (STRUCT_STATVFS const *statfsbuf) return "usbdevfs"; case S_MAGIC_V9FS: /* 0x01021997 local */ return "v9fs"; + case S_MAGIC_VMHGFS: /* 0xBACBACBC remote */ + return "vmhgfs"; case S_MAGIC_VXFS: /* 0xA501FCF5 local */ return "vxfs"; + case S_MAGIC_VZFS: /* 0x565A4653 local */ + return "vzfs"; case S_MAGIC_XENFS: /* 0xABBA1974 local */ return "xenfs"; case S_MAGIC_XENIX: /* 0x012FF7B4 local */ @@ -412,6 +429,8 @@ human_fstype (STRUCT_STATVFS const *statfsbuf) return "xfs"; case S_MAGIC_XIAFS: /* 0x012FD16D local */ return "xia"; + case S_MAGIC_ZFS: /* 0x2FC12FC1 local */ + return "zfs"; # elif __GNU__ case FSTYPE_UFS: @@ -1330,7 +1349,11 @@ usage (int status) printf (_("Usage: %s [OPTION]... FILE...\n"), program_name); fputs (_("\ Display file or file system status.\n\ -\n\ +"), stdout); + + emit_mandatory_arg_note (); + + fputs (_("\ -L, --dereference follow links\n\ -f, --file-system display file system status instead of file status\n\ "), stdout); diff --git a/src/stdbuf.c b/src/stdbuf.c index 178f9e24..38e9bee7 100644 --- a/src/stdbuf.c +++ b/src/stdbuf.c @@ -1,5 +1,5 @@ /* stdbuf -- setup the standard streams for a command - Copyright (C) 2009-2012 Free Software Foundation, Inc. + 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 @@ -90,11 +90,10 @@ usage (int status) printf (_("Usage: %s OPTION... COMMAND\n"), program_name); fputs (_("\ Run COMMAND, with modified buffering operations for its standard streams.\n\ -\n\ -"), stdout); - fputs (_("\ -Mandatory arguments to long options are mandatory for short options too.\n\ "), stdout); + + emit_mandatory_arg_note (); + fputs (_("\ -i, --input=MODE adjust standard input stream buffering\n\ -o, --output=MODE adjust standard output stream buffering\n\ diff --git a/src/stty.c b/src/stty.c index eb07f853..ee891a59 100644 --- a/src/stty.c +++ b/src/stty.c @@ -1,5 +1,5 @@ /* stty -- change and print terminal line settings - Copyright (C) 1990-2012 Free Software Foundation, Inc. + Copyright (C) 1990-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 @@ -52,6 +52,7 @@ #endif #include <getopt.h> #include <stdarg.h> +#include <assert.h> #include "system.h" #include "error.h" @@ -216,6 +217,9 @@ static struct mode_info const mode_info[] = #ifdef CRTSCTS {"crtscts", control, REV, CRTSCTS, 0}, #endif +#ifdef CDTRDSR + {"cdtrdsr", control, REV, CDTRDSR, 0}, +#endif {"ignbrk", input, SANE_UNSET | REV, IGNBRK, 0}, {"brkint", input, SANE_SET | REV, BRKINT, 0}, @@ -514,7 +518,11 @@ Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n\ program_name, program_name, program_name); fputs (_("\ Print or change terminal characteristics.\n\ -\n\ +"), stdout); + + emit_mandatory_arg_note (); + + fputs (_("\ -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\ @@ -576,6 +584,7 @@ Control settings:\n\ [-]clocal disable modem control signals\n\ [-]cread allow input to be received\n\ * [-]crtscts enable RTS/CTS handshaking\n\ + * [-]cdtrdsr enable DTR/DSR handshaking\n\ csN set character size to N bits, N in [5..8]\n\ "), stdout); fputs (_("\ @@ -583,7 +592,7 @@ Control settings:\n\ [-]hup send a hangup signal when the last process closes the tty\n\ [-]hupcl same as [-]hup\n\ [-]parenb generate parity bit in output and expect parity bit in input\n\ - [-]parodd set odd parity (even with '-')\n\ + [-]parodd set odd parity (or even parity with '-')\n\ "), stdout); fputs (_("\ \n\ @@ -729,14 +738,14 @@ main (int argc, char **argv) { /* Initialize to all zeroes so there is no risk memcmp will report a spurious difference in an uninitialized portion of the structure. */ - struct termios mode = { 0, }; + static struct termios mode; enum output_type output_type; int optc; int argi = 0; int opti = 1; bool require_set_attr; - bool speed_was_set; + bool speed_was_set ATTRIBUTE_UNUSED; bool verbose_output; bool recoverable_output; int k; @@ -1002,7 +1011,7 @@ main (int argc, char **argv) { /* Initialize to all zeroes so there is no risk memcmp will report a spurious difference in an uninitialized portion of the structure. */ - struct termios new_mode = { 0, }; + static struct termios new_mode; if (tcsetattr (STDIN_FILENO, TCSADRAIN, &mode)) error (EXIT_FAILURE, errno, "%s", device_name); @@ -1538,6 +1547,12 @@ display_changed (struct termios *mode) bitsp = mode_type_flag (mode_info[i].type, mode); mask = mode_info[i].mask ? mode_info[i].mask : mode_info[i].bits; + + /* bitsp would be NULL only for "combination" modes, yet those + are filtered out above via the OMIT flag. Tell static analysis + tools that it's ok to dereference bitsp here. */ + assert (bitsp); + if ((*bitsp & mask) == mode_info[i].bits) { if (mode_info[i].flags & SANE_UNSET) @@ -1615,6 +1630,7 @@ display_all (struct termios *mode, char const *device_name) bitsp = mode_type_flag (mode_info[i].type, mode); mask = mode_info[i].mask ? mode_info[i].mask : mode_info[i].bits; + assert (bitsp); /* See the identical assertion and comment above. */ if ((*bitsp & mask) == mode_info[i].bits) wrapf ("%s", mode_info[i].name); else if (mode_info[i].flags & REV) diff --git a/src/su.c b/src/su.c deleted file mode 100644 index bb54cc33..00000000 --- a/src/su.c +++ /dev/null @@ -1,520 +0,0 @@ -/* su for GNU. Run a shell with substitute user and group IDs. - Copyright (C) 1992-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 - 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/>. */ - -/* Run a shell with the real and effective UID and GID and groups - of USER, default 'root'. - - The shell run is taken from USER's password entry, /bin/sh if - none is specified there. If the account has a password, su - prompts for a password unless run by a user with real UID 0. - - Does not change the current directory. - Sets 'HOME' and 'SHELL' from the password entry for USER, and if - USER is not root, sets 'USER' and 'LOGNAME' to USER. - The subshell is not a login shell. - - If one or more ARGs are given, they are passed as additional - arguments to the subshell. - - Does not handle /bin/sh or other shells specially - (setting argv[0] to "-su", passing -c only to certain shells, etc.). - I don't see the point in doing that, and it's ugly. - - This program intentionally does not support a "wheel group" that - restricts who can su to UID 0 accounts. RMS considers that to - be fascist. - - Compile-time options: - -DSYSLOG_SUCCESS Log successful su's (by default, to root) with syslog. - -DSYSLOG_FAILURE Log failed su's (by default, to root) with syslog. - - -DSYSLOG_NON_ROOT Log all su's, not just those to root (UID 0). - Never logs attempted su's to nonexistent accounts. - - Written by David MacKenzie <djm@gnu.ai.mit.edu>. */ - -#include <config.h> -#include <stdio.h> -#include <getopt.h> -#include <sys/types.h> -#include <pwd.h> -#include <grp.h> - -#include "system.h" -#include "getpass.h" - -#if HAVE_SYSLOG_H && HAVE_SYSLOG -# include <syslog.h> -#else -# undef SYSLOG_SUCCESS -# undef SYSLOG_FAILURE -# undef SYSLOG_NON_ROOT -#endif - -#if HAVE_SYS_PARAM_H -# include <sys/param.h> -#endif - -#ifndef HAVE_ENDGRENT -# define endgrent() ((void) 0) -#endif - -#ifndef HAVE_ENDPWENT -# define endpwent() ((void) 0) -#endif - -#if HAVE_SHADOW_H -# include <shadow.h> -#endif - -#include "error.h" - -/* The official name of this program (e.g., no 'g' prefix). */ -#define PROGRAM_NAME "su" - -#define AUTHORS proper_name ("David MacKenzie") - -#if HAVE_PATHS_H -# include <paths.h> -#endif - -/* The default PATH for simulated logins to non-superuser accounts. */ -#ifdef _PATH_DEFPATH -# define DEFAULT_LOGIN_PATH _PATH_DEFPATH -#else -# define DEFAULT_LOGIN_PATH ":/usr/ucb:/bin:/usr/bin" -#endif - -/* The default PATH for simulated logins to superuser accounts. */ -#ifdef _PATH_DEFPATH_ROOT -# define DEFAULT_ROOT_LOGIN_PATH _PATH_DEFPATH_ROOT -#else -# define DEFAULT_ROOT_LOGIN_PATH "/usr/ucb:/bin:/usr/bin:/etc" -#endif - -/* The shell to run if none is given in the user's passwd entry. */ -#define DEFAULT_SHELL "/bin/sh" - -/* The user to become if none is specified. */ -#define DEFAULT_USER "root" - -char *crypt (char const *key, char const *salt); - -static void run_shell (char const *, char const *, char **, size_t) - ATTRIBUTE_NORETURN; - -/* If true, pass the '-f' option to the subshell. */ -static bool fast_startup; - -/* If true, simulate a login instead of just starting a shell. */ -static bool simulate_login; - -/* If true, change some environment vars to indicate the user su'd to. */ -static bool change_environment; - -static struct option const longopts[] = -{ - {"command", required_argument, NULL, 'c'}, - {"fast", no_argument, NULL, 'f'}, - {"login", no_argument, NULL, 'l'}, - {"preserve-environment", no_argument, NULL, 'p'}, - {"shell", required_argument, NULL, 's'}, - {GETOPT_HELP_OPTION_DECL}, - {GETOPT_VERSION_OPTION_DECL}, - {NULL, 0, NULL, 0} -}; - -/* Add NAME=VAL to the environment, checking for out of memory errors. */ - -static void -xsetenv (char const *name, char const *val) -{ - size_t namelen = strlen (name); - size_t vallen = strlen (val); - char *string = xmalloc (namelen + 1 + vallen + 1); - strcpy (string, name); - string[namelen] = '='; - strcpy (string + namelen + 1, val); - if (putenv (string) != 0) - xalloc_die (); -} - -#if defined SYSLOG_SUCCESS || defined SYSLOG_FAILURE -/* Log the fact that someone has run su to the user given by PW; - if SUCCESSFUL is true, they gave the correct password, etc. */ - -static void -log_su (struct passwd const *pw, bool successful) -{ - const char *new_user, *old_user, *tty; - -# ifndef SYSLOG_NON_ROOT - if (pw->pw_uid) - return; -# endif - new_user = pw->pw_name; - /* The utmp entry (via getlogin) is probably the best way to identify - the user, especially if someone su's from a su-shell. */ - old_user = getlogin (); - if (!old_user) - { - /* getlogin can fail -- usually due to lack of utmp entry. - Resort to getpwuid. */ - errno = 0; - uid_t ruid = getuid (); - uid_t NO_UID = -1; - struct passwd *pwd = (ruid == NO_UID && errno ? NULL : getpwuid (ruid)); - old_user = (pwd ? pwd->pw_name : ""); - } - tty = ttyname (STDERR_FILENO); - if (!tty) - tty = "none"; - /* 4.2BSD openlog doesn't have the third parameter. */ - openlog (last_component (program_name), 0 -# ifdef LOG_AUTH - , LOG_AUTH -# endif - ); - syslog (LOG_NOTICE, -# ifdef SYSLOG_NON_ROOT - "%s(to %s) %s on %s", -# else - "%s%s on %s", -# endif - successful ? "" : "FAILED SU ", -# ifdef SYSLOG_NON_ROOT - new_user, -# endif - old_user, tty); - closelog (); -} -#endif - -/* Ask the user for a password. - Return true if the user gives the correct password for entry PW, - false if not. Return true without asking for a password if run by UID 0 - or if PW has an empty password. */ - -static bool -correct_password (const struct passwd *pw) -{ - char *unencrypted, *encrypted, *correct; -#if HAVE_GETSPNAM && HAVE_STRUCT_SPWD_SP_PWDP - /* Shadow passwd stuff for SVR3 and maybe other systems. */ - struct spwd *sp = getspnam (pw->pw_name); - - endspent (); - if (sp) - correct = sp->sp_pwdp; - else -#endif - correct = pw->pw_passwd; - - if (getuid () == 0 || !correct || correct[0] == '\0') - return true; - - unencrypted = getpass (_("Password:")); - if (!unencrypted) - { - error (0, 0, _("getpass: cannot open /dev/tty")); - return false; - } - encrypted = crypt (unencrypted, correct); - memset (unencrypted, 0, strlen (unencrypted)); - return STREQ (encrypted, correct); -} - -/* Update 'environ' for the new shell based on PW, with SHELL being - the value for the SHELL environment variable. */ - -static void -modify_environment (const struct passwd *pw, const char *shell) -{ - if (simulate_login) - { - /* Leave TERM unchanged. Set HOME, SHELL, USER, LOGNAME, PATH. - Unset all other environment variables. */ - char const *term = getenv ("TERM"); - if (term) - term = xstrdup (term); - environ = xmalloc ((6 + !!term) * sizeof (char *)); - environ[0] = NULL; - if (term) - xsetenv ("TERM", term); - xsetenv ("HOME", pw->pw_dir); - xsetenv ("SHELL", shell); - xsetenv ("USER", pw->pw_name); - xsetenv ("LOGNAME", pw->pw_name); - xsetenv ("PATH", (pw->pw_uid - ? DEFAULT_LOGIN_PATH - : DEFAULT_ROOT_LOGIN_PATH)); - } - else - { - /* Set HOME, SHELL, and if not becoming a super-user, - USER and LOGNAME. */ - if (change_environment) - { - xsetenv ("HOME", pw->pw_dir); - xsetenv ("SHELL", shell); - if (pw->pw_uid) - { - xsetenv ("USER", pw->pw_name); - xsetenv ("LOGNAME", pw->pw_name); - } - } - } -} - -/* Become the user and group(s) specified by PW. */ - -static void -change_identity (const struct passwd *pw) -{ -#ifdef HAVE_INITGROUPS - errno = 0; - if (initgroups (pw->pw_name, pw->pw_gid) == -1) - error (EXIT_CANCELED, errno, _("cannot set groups")); - endgrent (); -#endif - if (setgid (pw->pw_gid)) - error (EXIT_CANCELED, errno, _("cannot set group id")); - if (setuid (pw->pw_uid)) - error (EXIT_CANCELED, errno, _("cannot set user id")); -} - -/* Run SHELL, or DEFAULT_SHELL if SHELL is empty. - If COMMAND is nonzero, pass it to the shell with the -c option. - Pass ADDITIONAL_ARGS to the shell as more arguments; there - are N_ADDITIONAL_ARGS extra arguments. */ - -static void -run_shell (char const *shell, char const *command, char **additional_args, - size_t n_additional_args) -{ - size_t n_args = 1 + fast_startup + 2 * !!command + n_additional_args + 1; - char const **args = xnmalloc (n_args, sizeof *args); - size_t argno = 1; - - if (simulate_login) - { - char *arg0; - char *shell_basename; - - shell_basename = last_component (shell); - arg0 = xmalloc (strlen (shell_basename) + 2); - arg0[0] = '-'; - strcpy (arg0 + 1, shell_basename); - args[0] = arg0; - } - else - args[0] = last_component (shell); - if (fast_startup) - args[argno++] = "-f"; - if (command) - { - args[argno++] = "-c"; - args[argno++] = command; - } - memcpy (args + argno, additional_args, n_additional_args * sizeof *args); - args[argno + n_additional_args] = NULL; - execv (shell, (char **) args); - - { - int exit_status = (errno == ENOENT ? EXIT_ENOENT : EXIT_CANNOT_INVOKE); - error (0, errno, "%s", shell); - exit (exit_status); - } -} - -/* Return true if SHELL is a restricted shell (one not returned by - getusershell), else false, meaning it is a standard shell. */ - -static bool -restricted_shell (const char *shell) -{ - char *line; - - setusershell (); - while ((line = getusershell ()) != NULL) - { - if (*line != '#' && STREQ (line, shell)) - { - endusershell (); - return false; - } - } - endusershell (); - return true; -} - -void -usage (int status) -{ - if (status != EXIT_SUCCESS) - emit_try_help (); - else - { - printf (_("Usage: %s [OPTION]... [-] [USER [ARG]...]\n"), program_name); - fputs (_("\ -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\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); - fputs (_("\ -\n\ -A mere - implies -l. If USER not given, assume root.\n\ -"), stdout); - emit_ancillary_info (); - } - exit (status); -} - -int -main (int argc, char **argv) -{ - int optc; - const char *new_user = DEFAULT_USER; - char *command = NULL; - char *shell = NULL; - struct passwd *pw; - struct passwd pw_copy; - - initialize_main (&argc, &argv); - set_program_name (argv[0]); - setlocale (LC_ALL, ""); - bindtextdomain (PACKAGE, LOCALEDIR); - textdomain (PACKAGE); - - initialize_exit_failure (EXIT_CANCELED); - atexit (close_stdout); - - fast_startup = false; - simulate_login = false; - change_environment = true; - - while ((optc = getopt_long (argc, argv, "c:flmps:", longopts, NULL)) != -1) - { - switch (optc) - { - case 'c': - command = optarg; - break; - - case 'f': - fast_startup = true; - break; - - case 'l': - simulate_login = true; - break; - - case 'm': - case 'p': - change_environment = false; - break; - - case 's': - shell = optarg; - break; - - case_GETOPT_HELP_CHAR; - - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); - - default: - usage (EXIT_CANCELED); - } - } - - if (optind < argc && STREQ (argv[optind], "-")) - { - simulate_login = true; - ++optind; - } - if (optind < argc) - new_user = argv[optind++]; - - pw = getpwnam (new_user); - if (! (pw && pw->pw_name && pw->pw_name[0] && pw->pw_dir && pw->pw_dir[0] - && pw->pw_passwd)) - error (EXIT_CANCELED, 0, _("user %s does not exist"), new_user); - - /* Make a copy of the password information and point pw at the local - copy instead. Otherwise, some systems (e.g. GNU/Linux) would clobber - the static data through the getlogin call from log_su. - Also, make sure pw->pw_shell is a nonempty string. - It may be NULL when NEW_USER is a username that is retrieved via NIS (YP), - but that doesn't have a default shell listed. */ - pw_copy = *pw; - pw = &pw_copy; - pw->pw_name = xstrdup (pw->pw_name); - pw->pw_passwd = xstrdup (pw->pw_passwd); - pw->pw_dir = xstrdup (pw->pw_dir); - pw->pw_shell = xstrdup (pw->pw_shell && pw->pw_shell[0] - ? pw->pw_shell - : DEFAULT_SHELL); - endpwent (); - - if (!correct_password (pw)) - { -#ifdef SYSLOG_FAILURE - log_su (pw, false); -#endif - error (EXIT_CANCELED, 0, _("incorrect password")); - } -#ifdef SYSLOG_SUCCESS - else - { - log_su (pw, true); - } -#endif - - if (!shell && !change_environment) - shell = getenv ("SHELL"); - if (shell && getuid () != 0 && restricted_shell (pw->pw_shell)) - { - /* The user being su'd to has a nonstandard shell, and so is - probably a uucp account or has restricted access. Don't - compromise the account by allowing access with a standard - shell. */ - error (0, 0, _("using restricted shell %s"), pw->pw_shell); - shell = NULL; - } - shell = xstrdup (shell ? shell : pw->pw_shell); - modify_environment (pw, shell); - - change_identity (pw); - if (simulate_login && chdir (pw->pw_dir) != 0) - error (0, errno, _("warning: cannot change directory to %s"), pw->pw_dir); - - /* error() flushes stderr, but does not check for write failure. - Normally, we would catch this via our atexit() hook of - close_stdout, but execv() gets in the way. If stderr - encountered a write failure, there is no need to try calling - error() again. */ - if (ferror (stderr)) - exit (EXIT_CANCELED); - - run_shell (shell, command, argv + optind, MAX (0, argc - optind)); -} diff --git a/src/sum.c b/src/sum.c index df012072..9ebcc424 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-2012 Free Software Foundation, Inc. + Copyright (C) 1986-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 diff --git a/src/sync.c b/src/sync.c index 95db2f38..03b8e530 100644 --- a/src/sync.c +++ b/src/sync.c @@ -1,5 +1,5 @@ /* sync - update the super block - Copyright (C) 1994-2012 Free Software Foundation, Inc. + Copyright (C) 1994-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 diff --git a/src/system.h b/src/system.h index 06f09cba..1677999e 100644 --- a/src/system.h +++ b/src/system.h @@ -1,5 +1,5 @@ /* system-dependent definitions for coreutils - Copyright (C) 1989-2012 Free Software Foundation, Inc. + Copyright (C) 1989-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 @@ -30,6 +30,9 @@ you must include <sys/types.h> before including this file #include <sys/stat.h> +/* Commonly used file permission combination. */ +#define MODE_RW_UGO (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH) + #if !defined HAVE_MKFIFO # define mkfifo(name, mode) mknod (name, (mode) | S_IFIFO, 0) #endif @@ -535,6 +538,14 @@ is_nul (const char *buf, size_t bufsize) ? false : (((Accum) = (Accum) * 10 + (Digit_val)), true)) \ ) +static inline void +emit_mandatory_arg_note (void) +{ + fputs (_("\n\ +Mandatory arguments to long options are mandatory for short options too.\n\ +"), stdout); +} + static inline void emit_size_note (void) { @@ -623,6 +634,21 @@ The following directory is part of the cycle:\n %s\n"), \ } \ while (0) +/* Like stpncpy, but do ensure that the result is NUL-terminated, + and do not NUL-pad out to LEN. I.e., when strnlen (src, len) == len, + this function writes a NUL byte into dest[len]. Thus, the length + of the destination buffer must be at least LEN + 1. + The DEST and SRC buffers must not overlap. */ +static inline char * +stzncpy (char *restrict dest, char const *restrict src, size_t len) +{ + char const *src_end = src + len; + while (src < src_end && *src) + *dest++ = *src++; + *dest = 0; + return dest; +} + #ifndef ARRAY_CARDINALITY # define ARRAY_CARDINALITY(Array) (sizeof (Array) / sizeof *(Array)) #endif diff --git a/src/tac-pipe.c b/src/tac-pipe.c index fc2201f0..f29db43c 100644 --- a/src/tac-pipe.c +++ b/src/tac-pipe.c @@ -1,6 +1,6 @@ /* tac from a pipe. - Copyright (C) 1997-2012 Free Software Foundation, Inc. + Copyright (C) 1997-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 diff --git a/src/tac.c b/src/tac.c index 8bef4439..c6a8cf69 100644 --- a/src/tac.c +++ b/src/tac.c @@ -1,5 +1,5 @@ /* tac - concatenate and print files in reverse - Copyright (C) 1988-2012 Free Software Foundation, Inc. + Copyright (C) 1988-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 @@ -137,11 +137,10 @@ Usage: %s [OPTION]... [FILE]...\n\ fputs (_("\ Write each FILE to standard output, last line first.\n\ With no FILE, or when FILE is -, read standard input.\n\ -\n\ -"), stdout); - fputs (_("\ -Mandatory arguments to long options are mandatory for short options too.\n\ "), stdout); + + emit_mandatory_arg_note (); + fputs (_("\ -b, --before attach the separator before instead of after\n\ -r, --regex interpret the separator as a regular expression\n\ diff --git a/src/tail.c b/src/tail.c index 29ddabd6..ca851ee6 100644 --- a/src/tail.c +++ b/src/tail.c @@ -1,5 +1,5 @@ /* tail -- output the last part of file(s) - Copyright (C) 1989-2012 Free Software Foundation, Inc. + Copyright (C) 1989-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 @@ -263,11 +263,10 @@ Usage: %s [OPTION]... [FILE]...\n\ 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\ -\n\ "), DEFAULT_N_LINES); - fputs (_("\ -Mandatory arguments to long options are mandatory for short options too.\n\ -"), stdout); + + 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\ @@ -1141,6 +1140,7 @@ tail_forever (struct File_spec *f, size_t n_files, double sleep_interval) f[i].fd = -1; f[i].errnum = errno; error (0, errno, "%s", name); + close (fd); /* ignore failure */ continue; } @@ -1276,9 +1276,9 @@ check_fspec (struct File_spec *fspec, int wd, int *prev_wd) if (fstat (fspec->fd, &stats) != 0) { + fspec->errnum = errno; close_fd (fspec->fd, name); fspec->fd = -1; - fspec->errnum = errno; return; } diff --git a/src/tee.c b/src/tee.c index 2d82577e..e5165de1 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-2012 Free Software Foundation, Inc. + Copyright (C) 1985-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 diff --git a/src/test.c b/src/test.c index 45f2206b..20382097 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-2012 Free Software Foundation, Inc. +/* Copyright (C) 1987-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 diff --git a/src/timeout.c b/src/timeout.c index c0a25274..2ffd2b11 100644 --- a/src/timeout.c +++ b/src/timeout.c @@ -1,5 +1,5 @@ /* timeout -- run a command with bounded time - Copyright (C) 2008-2012 Free Software Foundation, Inc. + 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 @@ -49,6 +49,9 @@ #include <stdio.h> #include <sys/types.h> #include <signal.h> +#if HAVE_PRCTL +# include <sys/prctl.h> +#endif #include <sys/wait.h> #include "system.h" @@ -78,12 +81,14 @@ static int timed_out; static int term_signal = SIGTERM; /* same default as kill command. */ static int monitored_pid; static double kill_after; -static bool foreground; /* whether to use another program group. */ +static bool foreground; /* whether to use another program group. */ +static bool preserve_status; /* whether to use a timeout status or not. */ /* for long options with no corresponding short option, use enum */ enum { - FOREGROUND_OPTION = CHAR_MAX + 1 + FOREGROUND_OPTION = CHAR_MAX + 1, + PRESERVE_STATUS_OPTION }; static struct option const long_options[] = @@ -91,11 +96,22 @@ static struct option const long_options[] = {"kill-after", required_argument, NULL, 'k'}, {"signal", required_argument, NULL, 's'}, {"foreground", no_argument, NULL, FOREGROUND_OPTION}, + {"preserve-status", no_argument, NULL, PRESERVE_STATUS_OPTION}, {GETOPT_HELP_OPTION_DECL}, {GETOPT_VERSION_OPTION_DECL}, {NULL, 0, NULL, 0} }; +static void +unblock_signal (int sig) +{ + sigset_t unblock_set; + sigemptyset (&unblock_set); + sigaddset (&unblock_set, sig); + if (sigprocmask (SIG_UNBLOCK, &unblock_set, NULL) != 0) + error (0, errno, _("warning: sigprocmask")); +} + /* Start the timeout after which we'll receive a SIGALRM. Round DURATION up to the next representable value. Treat out-of-range values as if they were maximal, @@ -104,6 +120,11 @@ static struct option const long_options[] = static void settimeout (double duration) { + + /* We configure timers below so that SIGALRM is sent on expiry. + Therefore ensure we don't inherit a mask blocking SIGALRM. */ + unblock_signal (SIGALRM); + /* timer_settime() provides potentially nanosecond resolution. setitimer() is more portable (to Darwin for example), but only provides microsecond resolution and thus is @@ -207,10 +228,14 @@ Usage: %s [OPTION] DURATION COMMAND [ARG]...\n\ fputs (_("\ Start COMMAND, and kill it if still running after DURATION.\n\ -\n\ -Mandatory arguments to long options are mandatory for short options too.\n\ "), stdout); + + emit_mandatory_arg_note (); + fputs (_("\ + --preserve-status\n\ + exit with the same status as COMMAND, even when the\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\ @@ -232,12 +257,12 @@ DURATION is a floating point number with an optional suffix:\n\ or 'd' for days.\n"), stdout); fputs (_("\n\ -If the command times out, then exit with status 124. Otherwise, exit\n\ -with the status of COMMAND. If no signal is specified, send the TERM\n\ -signal upon timeout. The TERM signal kills any process that does not\n\ -block or catch that signal. For other processes, it may be necessary to\n\ -use the KILL (9) signal, since this signal cannot be caught. If the\n\ -KILL (9) signal is sent, the exit status is 128+9 rather than 124.\n"), stdout); +If the command times out, and --preserve-status is not set, then exit with\n\ +status 124. Otherwise, exit with the status of COMMAND. If no signal\n\ +is specified, send the TERM signal upon timeout. The TERM signal kills\n\ +any process that does not block or catch that signal. It may be necessary\n\ +to use the KILL (9) signal, since this signal cannot be caught, in which\n\ +case the exit status is 128+9 rather than 124.\n"), stdout); emit_ancillary_info (); } exit (status); @@ -316,6 +341,29 @@ install_signal_handlers (int sigterm) sigaction (sigterm, &sa, NULL); /* user specified termination signal. */ } +/* Try to disable core dumps for this process. + Return TRUE if successful, FALSE otherwise. */ +static bool +disable_core_dumps (void) +{ +#if HAVE_PRCTL && defined PR_SET_DUMPABLE + if (prctl (PR_SET_DUMPABLE, 0) == 0) + return true; + +#elif HAVE_SETRLIMIT && defined RLIMIT_CORE + /* Note this doesn't disable processing by a filter in + /proc/sys/kernel/core_pattern on Linux. */ + if (setrlimit (RLIMIT_CORE, &(struct rlimit) {0,0}) == 0) + return true; + +#else + return false; +#endif + + error (0, errno, _("warning: disabling core dumps failed")); + return false; +} + int main (int argc, char **argv) { @@ -350,6 +398,10 @@ main (int argc, char **argv) foreground = true; break; + case PRESERVE_STATUS_OPTION: + preserve_status = true; + break; + case_GETOPT_HELP_CHAR; case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); @@ -426,21 +478,14 @@ main (int argc, char **argv) else if (WIFSIGNALED (status)) { int sig = WTERMSIG (status); -/* The following is not used as one cannot disable processing - by a filter in /proc/sys/kernel/core_pattern on Linux. */ -#if 0 && HAVE_SETRLIMIT && defined RLIMIT_CORE - if (!timed_out) + if (WCOREDUMP (status)) + error (0, 0, _("the monitored command dumped core")); + if (!timed_out && disable_core_dumps ()) { - /* exit with the signal flag set, but avoid core files. */ - if (setrlimit (RLIMIT_CORE, &(struct rlimit) {0,0}) == 0) - { - signal (sig, SIG_DFL); - raise (sig); - } - else - error (0, errno, _("warning: disabling core dumps failed")); + /* exit with the signal flag set. */ + signal (sig, SIG_DFL); + raise (sig); } -#endif status = sig + 128; /* what sh returns for signaled processes. */ } else @@ -451,7 +496,7 @@ main (int argc, char **argv) } } - if (timed_out) + if (timed_out && !preserve_status) return EXIT_TIMEDOUT; else return status; diff --git a/src/touch.c b/src/touch.c index 368516e7..3a3ffbe0 100644 --- a/src/touch.c +++ b/src/touch.c @@ -1,5 +1,5 @@ /* touch -- change modification and access times of files - Copyright (C) 1987-2012 Free Software Foundation, Inc. + Copyright (C) 1987-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 @@ -131,11 +131,8 @@ touch (const char *file) else if (! (no_create || no_dereference)) { /* Try to open FILE, creating it if necessary. */ - int default_permissions = - S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH; fd = fd_reopen (STDIN_FILENO, file, - O_WRONLY | O_CREAT | O_NONBLOCK | O_NOCTTY, - default_permissions); + O_WRONLY | O_CREAT | O_NONBLOCK | O_NOCTTY, MODE_RW_UGO); /* Don't save a copy of errno if it's EISDIR, since that would lead touch to give a bogus diagnostic for e.g., 'touch /' (assuming @@ -172,7 +169,7 @@ touch (const char *file) { if (close (STDIN_FILENO) != 0) { - error (0, errno, _("closing %s"), quote (file)); + error (0, errno, _("failed to close %s"), quote (file)); return false; } } @@ -221,11 +218,10 @@ is supplied.\n\ \n\ A FILE argument string of - is handled specially and causes touch to\n\ change the times of the file associated with standard output.\n\ -\n\ -"), stdout); - fputs (_("\ -Mandatory arguments to long options are mandatory for short options too.\n\ "), stdout); + + emit_mandatory_arg_note (); + fputs (_("\ -a change only the access time\n\ -c, --no-create do not create any files\n\ @@ -241,7 +237,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\ fputs (_("\ -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\ - --time=WORD change the specified time:\n\ + --time=WORD change the specified time:\n\ WORD is access, atime, or use: equivalent to -a\n\ WORD is modify or mtime: equivalent to -m\n\ "), stdout); diff --git a/src/tr.c b/src/tr.c index 2a86b5a9..d45e3dff 100644 --- a/src/tr.c +++ b/src/tr.c @@ -1,5 +1,5 @@ /* tr -- a filter to translate characters - Copyright (C) 1991-2012 Free Software Foundation, Inc. + Copyright (C) 1991-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 diff --git a/src/true.c b/src/true.c index b37ac543..804141c0 100644 --- a/src/true.c +++ b/src/true.c @@ -1,5 +1,5 @@ /* Exit with a status code indicating success. - Copyright (C) 1999-2012 Free Software Foundation, Inc. + Copyright (C) 1999-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 diff --git a/src/truncate.c b/src/truncate.c index e37ab380..8349cb61 100644 --- a/src/truncate.c +++ b/src/truncate.c @@ -1,5 +1,5 @@ /* truncate -- truncate or extend the length of files. - Copyright (C) 2008-2012 Free Software Foundation, Inc. + 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 @@ -102,11 +102,10 @@ A FILE argument that does not exist is created.\n\ If a FILE is larger than the specified size, the extra data is lost.\n\ If a FILE is shorter, it is extended and the extended part (hole)\n\ reads as zero bytes.\n\ -\n\ -"), stdout); - fputs (_("\ -Mandatory arguments to long options are mandatory for short options too.\n\ "), stdout); + + emit_mandatory_arg_note (); + fputs (_("\ -c, --no-create do not create any files\n\ "), stdout); @@ -244,7 +243,6 @@ main (int argc, char **argv) off_t size IF_LINT ( = 0); off_t rsize = -1; rel_mode_t rel_mode = rm_abs; - mode_t omode; int c, fd = -1, oflags; char const *fname; @@ -371,8 +369,15 @@ main (int argc, char **argv) if (0 <= ref_fd) { off_t file_end = lseek (ref_fd, 0, SEEK_END); - if (0 <= file_end && close (ref_fd) == 0) + int saved_errno = errno; + close (ref_fd); /* ignore failure */ + if (0 <= file_end) file_size = file_end; + else + { + /* restore, in case close clobbered it. */ + errno = saved_errno; + } } } if (file_size < 0) @@ -385,11 +390,10 @@ main (int argc, char **argv) } oflags = O_WRONLY | (no_create ? 0 : O_CREAT) | O_NONBLOCK; - omode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH; while ((fname = *argv++) != NULL) { - if ((fd = open (fname, oflags, omode)) == -1) + if ((fd = open (fname, oflags, MODE_RW_UGO)) == -1) { /* 'truncate -s0 -c no-such-file' shouldn't gen error 'truncate -s0 no-such-dir/file' should gen ENOENT error @@ -410,7 +414,7 @@ main (int argc, char **argv) errors |= !do_ftruncate (fd, fname, size, rsize, rel_mode); if (close (fd) != 0) { - error (0, errno, _("closing %s"), quote (fname)); + error (0, errno, _("failed to close %s"), quote (fname)); errors = true; } } diff --git a/src/tsort.c b/src/tsort.c index 04ddbcd3..d22f1f05 100644 --- a/src/tsort.c +++ b/src/tsort.c @@ -1,5 +1,5 @@ /* tsort - topological sort. - Copyright (C) 1998-2012 Free Software Foundation, Inc. + Copyright (C) 1998-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 diff --git a/src/tty.c b/src/tty.c index 63598a0f..312bf422 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-2012 Free Software Foundation, Inc. + Copyright (C) 1990-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 diff --git a/src/uname.c b/src/uname.c index 0eb123b6..cfcd0a33 100644 --- a/src/uname.c +++ b/src/uname.c @@ -1,6 +1,6 @@ /* uname -- print system information - Copyright (C) 1989-2012 Free Software Foundation, Inc. + Copyright (C) 1989-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 diff --git a/src/unexpand.c b/src/unexpand.c index ea0fc710..1803cd57 100644 --- a/src/unexpand.c +++ b/src/unexpand.c @@ -1,5 +1,5 @@ /* unexpand - convert blanks to tabs - Copyright (C) 1989-2012 Free Software Foundation, Inc. + Copyright (C) 1989-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 @@ -117,11 +117,10 @@ Usage: %s [OPTION]... [FILE]...\n\ fputs (_("\ Convert blanks in each FILE to tabs, writing to standard output.\n\ With no FILE, or when FILE is -, read standard input.\n\ -\n\ -"), stdout); - fputs (_("\ -Mandatory arguments to long options are mandatory for short options too.\n\ "), stdout); + + emit_mandatory_arg_note (); + fputs (_("\ -a, --all convert all blanks, instead of just initial blanks\n\ --first-only convert only leading sequences of blanks (overrides -a)\n\ diff --git a/src/uniq.c b/src/uniq.c index 9ed59d78..5efdad7d 100644 --- a/src/uniq.c +++ b/src/uniq.c @@ -1,5 +1,5 @@ /* uniq -- remove duplicate lines from a sorted file - Copyright (C) 1986-2012 Free Software Foundation, Inc. + Copyright (C) 1986-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 @@ -140,11 +140,10 @@ 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\ -\n\ -"), stdout); - fputs (_("\ -Mandatory arguments to long options are mandatory for short options too.\n\ "), stdout); + + emit_mandatory_arg_note (); + fputs (_("\ -c, --count prefix lines by the number of occurrences\n\ -d, --repeated only print duplicate lines\n\ diff --git a/src/unlink.c b/src/unlink.c index e2bab5a2..e822fd69 100644 --- a/src/unlink.c +++ b/src/unlink.c @@ -1,5 +1,5 @@ /* unlink utility for GNU. - Copyright (C) 2001-2012 Free Software Foundation, Inc. + Copyright (C) 2001-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 diff --git a/src/uptime.c b/src/uptime.c index f8c7cfab..8e8f2ca6 100644 --- a/src/uptime.c +++ b/src/uptime.c @@ -1,5 +1,5 @@ /* GNU's uptime. - Copyright (C) 1992-2012 Free Software Foundation, Inc. + Copyright (C) 1992-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 @@ -146,9 +146,9 @@ print_uptime (size_t n, const STRUCT_UTMP *this) select_plural (updays)), updays, uphours, upmins); else - printf ("up %2d:%02d, ", uphours, upmins); + printf (_("up %2d:%02d, "), uphours, upmins); } - printf (ngettext ("%lu user", "%lu users", entries), + printf (ngettext ("%lu user", "%lu users", select_plural (entries)), (unsigned long int) entries); loads = getloadavg (avg, 3); diff --git a/src/users.c b/src/users.c index 48940aaa..d1c8137f 100644 --- a/src/users.c +++ b/src/users.c @@ -1,5 +1,5 @@ /* GNU's users. - Copyright (C) 1992-2012 Free Software Foundation, Inc. + Copyright (C) 1992-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 diff --git a/src/wc.c b/src/wc.c index 50173773..93decd7e 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-2012 Free Software Foundation, Inc. + Copyright (C) 1985-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 diff --git a/src/wheel-gen.pl b/src/wheel-gen.pl deleted file mode 100755 index 65b60d12..00000000 --- a/src/wheel-gen.pl +++ /dev/null @@ -1,114 +0,0 @@ -#!/usr/bin/perl -w -# Generate the spokes of a wheel, for wheel factorization. - -# Copyright (C) 2001-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 -# 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/>. - -eval 'exec /usr/bin/perl -S $0 ${1+"$@"}' - if 0; - -use strict; -(my $ME = $0) =~ s|.*/||; - -# A global destructor to close standard output with error checking. -sub END -{ - defined fileno STDOUT - or return; - close STDOUT - and return; - warn "$ME: closing standard output: $!\n"; - $? ||= 1; -} - -sub is_prime ($) -{ - my ($n) = @_; - use integer; - - $n == 2 - and return 1; - - my $d = 2; - my $w = 1; - while (1) - { - my $q = $n / $d; - $n == $q * $d - and return 0; - $d += $w; - $q < $d - and last; - $w = 2; - } - return 1; -} - -{ - @ARGV == 1 - or die "$ME: missing argument\n"; - - my $wheel_size = $ARGV[0]; - - my @primes = (2); - my $product = $primes[0]; - my $n_primes = 1; - for (my $i = 3; ; $i += 2) - { - if (is_prime $i) - { - push @primes, $i; - $product *= $i; - ++$n_primes == $wheel_size - and last; - } - } - - my $ws_m1 = $wheel_size - 1; - print <<EOF; -/* The first $ws_m1 elements correspond to the incremental offsets of the - first $wheel_size primes (@primes). The $wheel_size(th) element is the - difference between that last prime and the next largest integer - that is not a multiple of those primes. The remaining numbers - define the wheel. For more information, see - http://www.utm.edu/research/primes/glossary/WheelFactorization.html. */ -EOF - - my @increments; - my $prev = 2; - for (my $i = 3; ; $i += 2) - { - my $rel_prime = 1; - foreach my $divisor (@primes) - { - $i != $divisor && $i % $divisor == 0 - and $rel_prime = 0; - } - - if ($rel_prime) - { - #warn $i, ' ', $i - $prev, "\n"; - push @increments, $i - $prev; - $prev = $i; - - $product + 1 < $i - and last; - } - } - - print join (",\n", @increments), "\n"; - - exit 0; -} diff --git a/src/wheel-size.h b/src/wheel-size.h deleted file mode 100644 index 1f2d609d..00000000 --- a/src/wheel-size.h +++ /dev/null @@ -1 +0,0 @@ -#define WHEEL_SIZE 5 diff --git a/src/wheel.h b/src/wheel.h deleted file mode 100644 index 1c04d598..00000000 --- a/src/wheel.h +++ /dev/null @@ -1,491 +0,0 @@ -/* The first 4 elements correspond to the incremental offsets of the - first 5 primes (2 3 5 7 11). The 5(th) element is the - difference between that last prime and the next largest integer - that is not a multiple of those primes. The remaining numbers - define the wheel. For more information, see - http://www.utm.edu/research/primes/glossary/WheelFactorization.html. */ -1, -2, -2, -4, -2, -4, -2, -4, -6, -2, -6, -4, -2, -4, -6, -6, -2, -6, -4, -2, -6, -4, -6, -8, -4, -2, -4, -2, -4, -14, -4, -6, -2, -10, -2, -6, -6, -4, -2, -4, -6, -2, -10, -2, -4, -2, -12, -10, -2, -4, -2, -4, -6, -2, -6, -4, -6, -6, -6, -2, -6, -4, -2, -6, -4, -6, -8, -4, -2, -4, -6, -8, -6, -10, -2, -4, -6, -2, -6, -6, -4, -2, -4, -6, -2, -6, -4, -2, -6, -10, -2, -10, -2, -4, -2, -4, -6, -8, -4, -2, -4, -12, -2, -6, -4, -2, -6, -4, -6, -12, -2, -4, -2, -4, -8, -6, -4, -6, -2, -4, -6, -2, -6, -10, -2, -4, -6, -2, -6, -4, -2, -4, -2, -10, -2, -10, -2, -4, -6, -6, -2, -6, -6, -4, -6, -6, -2, -6, -4, -2, -6, -4, -6, -8, -4, -2, -6, -4, -8, -6, -4, -6, -2, -4, -6, -8, -6, -4, -2, -10, -2, -6, -4, -2, -4, -2, -10, -2, -10, -2, -4, -2, -4, -8, -6, -4, -2, -4, -6, -6, -2, -6, -4, -8, -4, -6, -8, -4, -2, -4, -2, -4, -8, -6, -4, -6, -6, -6, -2, -6, -6, -4, -2, -4, -6, -2, -6, -4, -2, -4, -2, -10, -2, -10, -2, -6, -4, -6, -2, -6, -4, -2, -4, -6, -6, -8, -4, -2, -6, -10, -8, -4, -2, -4, -2, -4, -8, -10, -6, -2, -4, -8, -6, -6, -4, -2, -4, -6, -2, -6, -4, -6, -2, -10, -2, -10, -2, -4, -2, -4, -6, -2, -6, -4, -2, -4, -6, -6, -2, -6, -6, -6, -4, -6, -8, -4, -2, -4, -2, -4, -8, -6, -4, -8, -4, -6, -2, -6, -6, -4, -2, -4, -6, -8, -4, -2, -4, -2, -10, -2, -10, -2, -4, -2, -4, -6, -2, -10, -2, -4, -6, -8, -6, -4, -2, -6, -4, -6, -8, -4, -6, -2, -4, -8, -6, -4, -6, -2, -4, -6, -2, -6, -6, -4, -6, -6, -2, -6, -6, -4, -2, -10, -2, -10, -2, -4, -2, -4, -6, -2, -6, -4, -2, -10, -6, -2, -6, -4, -2, -6, -4, -6, -8, -4, -2, -4, -2, -12, -6, -4, -6, -2, -4, -6, -2, -12, -4, -2, -4, -8, -6, -4, -2, -4, -2, -10, -2, -10, -6, -2, -4, -6, -2, -6, -4, -2, -4, -6, -6, -2, -6, -4, -2, -10, -6, -8, -6, -4, -2, -4, -8, -6, -4, -6, -2, -4, -6, -2, -6, -6, -6, -4, -6, -2, -6, -4, -2, -4, -2, -10, -12, -2, -4, -2, -10, -2, -6, -4, -2, -4, -6, -6, -2, -10, -2, -6, -4, -14, -4, -2, -4, -2, -4, -8, -6, -4, -6, -2, -4, -6, -2, -6, -6, -4, -2, -4, -6, -2, -6, -4, -2, -4, -12, -2, -12 diff --git a/src/who.c b/src/who.c index c875b1de..6b44c4bb 100644 --- a/src/who.c +++ b/src/who.c @@ -1,5 +1,5 @@ /* GNU's who. - Copyright (C) 1992-2012 Free Software Foundation, Inc. + Copyright (C) 1992-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 @@ -342,23 +342,15 @@ print_user (const STRUCT_UTMP *utmp_ent, time_t boottime) #define DEV_DIR_LEN (sizeof (DEV_DIR_WITH_TRAILING_SLASH) - 1) char line[sizeof (utmp_ent->ut_line) + DEV_DIR_LEN + 1]; + char *p = line; PIDSTR_DECL_AND_INIT (pidstr, utmp_ent); /* Copy ut_line into LINE, prepending '/dev/' if ut_line is not already an absolute file name. Some systems may put the full, absolute file name in ut_line. */ - if (utmp_ent->ut_line[0] == '/') - { - strncpy (line, utmp_ent->ut_line, sizeof (utmp_ent->ut_line)); - line[sizeof (utmp_ent->ut_line)] = '\0'; - } - else - { - strcpy (line, DEV_DIR_WITH_TRAILING_SLASH); - strncpy (line + DEV_DIR_LEN, utmp_ent->ut_line, - sizeof (utmp_ent->ut_line)); - line[DEV_DIR_LEN + sizeof (utmp_ent->ut_line)] = '\0'; - } + if ( ! IS_ABSOLUTE_FILE_NAME (utmp_ent->ut_line)) + p = stpcpy (p, DEV_DIR_WITH_TRAILING_SLASH); + stzncpy (p, utmp_ent->ut_line, sizeof (utmp_ent->ut_line)); if (stat (line, &stats) == 0) { @@ -384,8 +376,7 @@ print_user (const STRUCT_UTMP *utmp_ent, time_t boottime) char *display = NULL; /* Copy the host name into UT_HOST, and ensure it's nul terminated. */ - strncpy (ut_host, utmp_ent->ut_host, sizeof (utmp_ent->ut_host)); - ut_host[sizeof (utmp_ent->ut_host)] = '\0'; + stzncpy (ut_host, utmp_ent->ut_host, sizeof (utmp_ent->ut_host)); /* Look for an X display. */ display = strchr (ut_host, ':'); diff --git a/src/whoami.c b/src/whoami.c index 4e090f6f..dfa28da3 100644 --- a/src/whoami.c +++ b/src/whoami.c @@ -1,6 +1,6 @@ /* whoami -- print effective userid - Copyright (C) 1989-2012 Free Software Foundation, Inc. + Copyright (C) 1989-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 diff --git a/src/yes.c b/src/yes.c index cc445466..b87b5430 100644 --- a/src/yes.c +++ b/src/yes.c @@ -1,5 +1,5 @@ /* yes - output a string repeatedly until killed - Copyright (C) 1991-2012 Free Software Foundation, Inc. + Copyright (C) 1991-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 diff --git a/tests/Coreutils.pm b/tests/Coreutils.pm index 0c8bb82c..71b15165 100644 --- a/tests/Coreutils.pm +++ b/tests/Coreutils.pm @@ -1,7 +1,7 @@ package Coreutils; # This is a testing framework. -# Copyright (C) 1998-2012 Free Software Foundation, Inc. +# Copyright (C) 1998-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 @@ -33,7 +33,7 @@ my @Types = qw (IN IN_PIPE OUT ERR AUX CMP EXIT PRE POST OUT_SUBST my %Types = map {$_ => 1} @Types; my %Zero_one_type = map {$_ => 1} qw (OUT ERR EXIT PRE POST OUT_SUBST ERR_SUBST ENV); -my $srcdir = $ENV{srcdir}; +my $srcdir = "$ENV{srcdir}"; my $Global_count = 1; # When running in a DJGPP environment, make $ENV{SHELL} point to bash. @@ -46,7 +46,7 @@ defined $ENV{DJDIR} # ================ # 'contents' contents only (file name is derived from test name) # {filename => 'contents'} filename and contents -# {filename => undef} filename only -- $(srcdir)/filename must exist +# {filename => undef} filename only -- $(srcdir)/tests/filename must exist # # FIXME: If there is more than one input file, then you can't specify 'REDIR'. # PIPE is still ok. @@ -130,14 +130,14 @@ sub _compare_files ($$$$$) { my ($program_name, $test_name, $in_or_out, $actual, $expected) = @_; - my $differ = compare ($expected, $actual); + my $differ = compare ($actual, $expected); if ($differ) { my $info = (defined $in_or_out ? "std$in_or_out " : ''); warn "$program_name: test $test_name: ${info}mismatch, comparing " - . "$actual (actual) and $expected (expected)\n"; + . "$expected (expected) and $actual (actual)\n"; # Ignore any failure, discard stderr. - system "diff -c $actual $expected 2>/dev/null"; + system "diff -c $expected $actual 2>/dev/null"; } return $differ; @@ -185,7 +185,7 @@ sub _process_file_spec ($$$$$) # FIXME: put $srcdir in here somewhere warn "$program_name: $test_name: specified file '$file' does" . " not exist\n" - if ! -f "$srcdir/$file"; + if ! -f "$srcdir/tests/$file"; } return $file; diff --git a/tests/CuSkip.pm b/tests/CuSkip.pm index 0ae15cec..b296fcbc 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-2012 Free Software Foundation, Inc. +# 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 diff --git a/tests/CuTmpdir.pm b/tests/CuTmpdir.pm index efa64621..024b1bc9 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-2012 Free Software Foundation, Inc. +# Copyright (C) 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 diff --git a/tests/GNUmakefile b/tests/GNUmakefile new file mode 100644 index 00000000..3c178a2c --- /dev/null +++ b/tests/GNUmakefile @@ -0,0 +1,20 @@ +# Provide a compatibility layer so that the commands used before the +# conversion of tests/ to non-recursive make still work. To do that, we +# must rerun the "make check" from the parent, and with tests/ prefixed +# onto any TESTS values. The SUBDIRS=. is to prevent the top-level check +# rules from descending into e.g., gnulib-test/. + +.PHONY: all +all: + @echo 'tests/GNUmakefile: did you mean to make "check"?' 1>&2 + @exit 1 + +ifeq ($(TESTS),) +tests = +else +tests = TESTS=$(addprefix tests/,$(TESTS)) +endif + +.PHONY: check +check: + cd .. && $(MAKE) $@ $(tests) SUBDIRS=. diff --git a/tests/Makefile.am b/tests/Makefile.am deleted file mode 100644 index a4370a6d..00000000 --- a/tests/Makefile.am +++ /dev/null @@ -1,707 +0,0 @@ -## Process this file with automake to produce Makefile.in -*-Makefile-*-. - -# Sort in traditional ASCII order, regardless of the current locale; -# otherwise we may get into trouble with distinct strings that the -# current locale considers to be equal. -ASSORT = LC_ALL=C sort - -EXTRA_DIST = \ - Coreutils.pm \ - CuSkip.pm \ - CuTmpdir.pm \ - check.mk \ - d_type-check \ - envvar-check \ - filefrag-extent-compare \ - fiemap-capable \ - init.cfg \ - init.sh \ - lang-default \ - other-fs-tmpdir \ - sample-test \ - shell-or-perl \ - $(pr_data) - -root_tests = \ - chown/basic \ - cp/cp-a-selinux \ - cp/preserve-gid \ - cp/special-bits \ - cp/cp-mv-enotsup-xattr \ - cp/capability \ - cp/sparse-fiemap \ - dd/skip-seek-past-dev \ - install/install-C-root \ - ls/capability \ - ls/nameless-uid \ - misc/chcon \ - misc/chroot-credentials \ - misc/id-setgid \ - misc/selinux \ - misc/truncate-owned-by-other \ - mkdir/writable-under-readonly \ - mv/sticky-to-xpart \ - rm/fail-2eperm \ - rm/no-give-up \ - rm/one-file-system \ - rm/read-only \ - tail-2/append-only \ - touch/now-owned-by-other - -.PHONY: check-root -check-root: - $(MAKE) check TESTS='$(root_tests)' - -check-recursive: root-hint - -# Advertise 'check-root' target. -.PHONY: root-hint -root-hint: - @echo '***********************************************************' - @echo "NOTICE: Some tests may be run only as root." - @echo " See the 'Running tests as root' section in README." - @echo '***********************************************************' - -EXTRA_DIST += $(TESTS) - -# Do not choose a name that is a shell keyword like 'if', or a -# commonly-used utility like 'cat' or 'test', as the name of a test. -# Otherwise, VPATH builds will fail on hosts like Solaris, since they -# will expand 'if test ...' to 'if .../test ...', and the '.../test' -# will execute the test script rather than the standard utility. - -# Notes on the ordering of these tests: -# Place early in the list tests of the tools that -# are most commonly used in test scripts themselves. -# E.g., nearly every test script uses rm and chmod. -# help-version comes early because it's a basic sanity test. -# Put seq early, since lots of other tests use it. -# Put tests that sleep early, but not all together, so in parallel builds -# they share time with tests that burn CPU, not with others that sleep. -# Put head-elide-tail early, because it's long-running. - -TESTS = \ - misc/help-version \ - tail-2/inotify-race \ - misc/invalid-opt \ - rm/ext3-perf \ - rm/cycle \ - cp/link-heap \ - misc/tty-eof \ - tail-2/inotify-hash-abuse \ - tail-2/inotify-hash-abuse2 \ - tail-2/F-vs-missing \ - tail-2/F-vs-rename \ - tail-2/inotify-rotate \ - chmod/no-x \ - chgrp/basic \ - rm/dangling-symlink \ - misc/ls-time \ - rm/deep-1 \ - rm/deep-2 \ - rm/dir-no-w \ - rm/dir-nonrecur \ - rm/dot-rel \ - rm/isatty \ - rm/empty-inacc \ - rm/empty-name \ - rm/f-1 \ - rm/fail-eacces \ - rm/fail-eperm \ - tail-2/assert \ - rm/hash \ - rm/i-1 \ - rm/i-never \ - rm/i-no-r \ - tail-2/infloop-1 \ - rm/ignorable \ - rm/inaccessible \ - rm/interactive-always \ - rm/interactive-once \ - rm/ir-1 \ - rm/one-file-system2 \ - rm/r-1 \ - rm/r-2 \ - rm/r-3 \ - rm/r-4 \ - rm/readdir-bug \ - rm/rm1 \ - touch/empty-file \ - rm/rm2 \ - rm/rm3 \ - rm/rm4 \ - rm/rm5 \ - rm/sunos-1 \ - rm/unread2 \ - rm/unread3 \ - rm/unreadable \ - rm/v-slash \ - rm/many-dir-entries-vs-OOM \ - chgrp/default-no-deref \ - chgrp/deref \ - chgrp/no-x \ - chgrp/posix-H \ - chgrp/recurse \ - fmt/base \ - fmt/long-line \ - fmt/goal-option \ - misc/env \ - misc/ptx \ - misc/test \ - misc/seq \ - misc/seq-long-double \ - misc/head \ - misc/head-elide-tail \ - tail-2/tail-n0f \ - misc/ls-misc \ - misc/date \ - misc/date-next-dow \ - misc/ptx-overrun \ - misc/xstrtol \ - tail-2/pid \ - misc/od \ - misc/od-float \ - misc/mktemp \ - misc/arch \ - misc/pr \ - misc/join \ - pr/pr-tests \ - misc/df-P \ - misc/pwd-option \ - misc/chcon-fail \ - misc/cut \ - misc/wc \ - misc/wc-files0-from \ - misc/wc-files0 \ - misc/wc-parallel \ - misc/cat-proc \ - misc/cat-buf \ - misc/base64 \ - misc/basename \ - misc/close-stdout \ - misc/chroot-fail \ - misc/comm \ - misc/csplit \ - misc/csplit-1000 \ - misc/csplit-heap \ - misc/date-sec \ - misc/dircolors \ - misc/df \ - misc/dirname \ - misc/env-null \ - misc/expand \ - misc/expr \ - misc/factor \ - misc/false-status \ - misc/fold \ - misc/groups-dash \ - misc/groups-version \ - misc/head-c \ - misc/head-pos \ - misc/id-context \ - misc/id-groups \ - misc/id-setgid \ - misc/md5sum \ - misc/md5sum-bsd \ - misc/md5sum-newline \ - misc/md5sum-parallel \ - misc/mknod \ - misc/nice \ - misc/nice-fail \ - misc/nl \ - misc/nohup \ - misc/nproc-avail \ - misc/nproc-positive \ - misc/od-N \ - misc/od-multiple-t \ - misc/od-x8 \ - misc/paste \ - misc/pathchk1 \ - misc/printenv \ - misc/printf \ - misc/printf-cov \ - misc/printf-hex \ - misc/printf-surprise \ - misc/pwd-long \ - misc/readlink-fp-loop \ - misc/readlink-root \ - misc/realpath \ - misc/runcon-no-reorder \ - misc/sha1sum \ - misc/sha1sum-vec \ - misc/sha224sum \ - misc/sha256sum \ - misc/sha384sum \ - misc/sha512sum \ - misc/shred-exact \ - misc/shred-passes \ - misc/shred-remove \ - misc/shuf \ - misc/sort \ - misc/sort-benchmark-random \ - misc/sort-compress \ - misc/sort-compress-hang \ - misc/sort-compress-proc \ - misc/sort-continue \ - misc/sort-debug-keys \ - misc/sort-debug-warn \ - misc/sort-discrim \ - misc/sort-files0-from \ - misc/sort-float \ - misc/sort-merge \ - misc/sort-merge-fdlimit \ - misc/sort-month \ - misc/sort-rand \ - misc/sort-spinlock-abuse \ - misc/sort-stale-thread-mem \ - misc/sort-unique \ - misc/sort-unique-segv \ - misc/sort-version \ - misc/sort-NaN-infloop \ - split/filter \ - split/suffix-auto-length \ - split/suffix-length \ - split/additional-suffix \ - split/b-chunk \ - split/fail \ - split/lines \ - split/l-chunk \ - split/r-chunk \ - split/numeric \ - misc/stat-birthtime \ - misc/stat-fmt \ - misc/stat-hyphen \ - misc/stat-mount \ - misc/stat-nanoseconds \ - misc/stat-printf \ - misc/stat-slash \ - misc/stdbuf \ - misc/stty \ - misc/stty-invalid \ - misc/stty-pairs \ - misc/stty-row-col \ - misc/su-fail \ - misc/sum \ - misc/sum-sysv \ - misc/tac \ - misc/tac-continue \ - misc/tac-2-nonseekable \ - misc/tail \ - misc/tee \ - misc/tee-dash \ - misc/test-diag \ - misc/timeout \ - misc/timeout-group \ - misc/timeout-parameters \ - misc/tr \ - misc/tr-case-class \ - misc/truncate-dangling-symlink \ - misc/truncate-dir-fail \ - misc/truncate-fail-diag \ - misc/truncate-fifo \ - misc/truncate-no-create-missing \ - misc/truncate-overflow \ - misc/truncate-parameters \ - misc/truncate-relative \ - misc/tsort \ - misc/unexpand \ - misc/uniq \ - misc/uniq-perf \ - misc/xattr \ - tail-2/wait \ - chmod/c-option \ - chmod/equal-x \ - chmod/equals \ - chmod/inaccessible \ - chmod/octal \ - chmod/setgid \ - chmod/silent \ - chmod/thru-dangling \ - chmod/umask-x \ - chmod/usage \ - chown/deref \ - chown/preserve-root \ - chown/separator \ - cp/abuse \ - cp/acl \ - cp/attr-existing \ - cp/backup-1 \ - cp/backup-dir \ - cp/backup-is-src \ - cp/cp-HL \ - cp/cp-deref \ - cp/cp-i \ - cp/cp-mv-backup \ - cp/cp-parents \ - cp/deref-slink \ - cp/dir-rm-dest \ - cp/dir-slash \ - cp/dir-vs-file \ - cp/existing-perm-dir \ - cp/existing-perm-race \ - cp/fail-perm \ - cp/fiemap-empty \ - cp/fiemap-perf \ - cp/fiemap-2 \ - cp/file-perm-race \ - cp/into-self \ - cp/link \ - cp/link-no-deref \ - cp/link-preserve \ - cp/link-symlink \ - cp/nfs-removal-race \ - cp/no-deref-link1 \ - cp/no-deref-link2 \ - cp/no-deref-link3 \ - cp/parent-perm \ - cp/parent-perm-race \ - cp/perm \ - cp/preserve-2 \ - cp/preserve-link \ - cp/preserve-slink-time \ - cp/proc-short-read \ - cp/proc-zero-len \ - cp/r-vs-symlink \ - cp/reflink-auto \ - cp/reflink-perm \ - cp/same-file \ - cp/slink-2-slink \ - cp/sparse \ - cp/sparse-to-pipe \ - cp/special-f \ - cp/src-base-dot \ - cp/symlink-slash \ - cp/thru-dangling \ - df/unreadable \ - dd/direct \ - dd/misc \ - dd/nocache \ - dd/not-rewound \ - dd/reblock \ - dd/skip-seek \ - dd/skip-seek2 \ - dd/bytes \ - dd/skip-seek-past-file \ - dd/sparse \ - dd/stderr \ - dd/unblock \ - dd/unblock-sync \ - df/total-verify \ - du/2g \ - du/8gb \ - du/basic \ - du/bigtime \ - du/deref \ - du/deref-args \ - du/exclude \ - du/fd-leak \ - du/files0-from \ - du/files0-from-dir \ - du/hard-link \ - du/inacc-dest \ - du/inacc-dir \ - du/inaccessible-cwd \ - du/long-from-unreadable \ - du/long-sloop \ - du/max-depth \ - du/move-dir-while-traversing \ - du/no-deref \ - du/no-x \ - du/one-file-system \ - du/restore-wd \ - du/slash \ - du/slink \ - du/trailing-slash \ - du/two-args \ - id/gnu-zero-uids \ - id/no-context \ - install/basic-1 \ - install/create-leading \ - install/d-slashdot \ - install/install-C \ - install/install-C-selinux \ - install/strip-program \ - install/trap \ - ln/backup-1 \ - ln/hard-backup \ - ln/hard-to-sym \ - ln/misc \ - ln/relative \ - ln/sf-1 \ - ln/slash-decorated-nonexistent-dest \ - ln/target-1 \ - ls/abmon-align \ - ls/block-size \ - ls/color-clear-to-eol \ - ls/color-dtype-dir \ - ls/color-norm \ - ls/dangle \ - ls/dired \ - ls/file-type \ - ls/follow-slink \ - ls/getxattr-speedup \ - ls/infloop \ - ls/inode \ - ls/m-option \ - ls/multihardlink \ - ls/no-arg \ - ls/no-cap \ - ls/proc-selinux-segfault \ - ls/readdir-mountpoint-inode \ - ls/recursive \ - ls/rt-1 \ - ls/slink-acl \ - ls/stat-dtype \ - ls/stat-failed \ - ls/stat-free-color \ - ls/stat-free-symlinks \ - ls/stat-vs-dirent \ - ls/symlink-slash \ - ls/time-style-diag \ - ls/x-option \ - mkdir/p-1 \ - mkdir/p-2 \ - mkdir/p-3 \ - mkdir/p-slashdot \ - mkdir/p-thru-slink \ - mkdir/p-v \ - mkdir/parents \ - mkdir/perm \ - mkdir/selinux \ - mkdir/special-1 \ - mkdir/t-slash \ - mv/acl \ - mv/atomic \ - mv/atomic2 \ - mv/backup-dir \ - mv/backup-is-src \ - mv/childproof \ - mv/diag \ - mv/dir-file \ - mv/dir2dir \ - mv/dup-source \ - mv/force \ - mv/hard-2 \ - mv/hard-3 \ - mv/hard-4 \ - mv/hard-link-1 \ - mv/hard-verbose \ - mv/i-1 \ - mv/i-2 \ - mv/i-3 \ - mv/i-4 \ - mv/i-5 \ - mv/i-link-no \ - mv/into-self \ - mv/into-self-2 \ - mv/into-self-3 \ - mv/into-self-4 \ - mv/leak-fd \ - mv/mv-n \ - mv/mv-special-1 \ - mv/no-target-dir \ - mv/part-fail \ - mv/part-hardlink \ - mv/part-rename \ - mv/part-symlink \ - mv/partition-perm \ - mv/perm-1 \ - mv/symlink-onto-hardlink \ - mv/symlink-onto-hardlink-to-self \ - mv/to-symlink \ - mv/trailing-slash \ - mv/update \ - readlink/can-e \ - readlink/can-f \ - readlink/can-m \ - readlink/rl-1 \ - rmdir/fail-perm \ - rmdir/ignore \ - rmdir/t-slash \ - tail-2/assert-2 \ - tail-2/big-4gb \ - tail-2/flush-initial \ - tail-2/follow-name \ - tail-2/follow-stdin \ - tail-2/pipe-f \ - tail-2/pipe-f2 \ - tail-2/proc-ksyms \ - tail-2/start-middle \ - touch/60-seconds \ - touch/dangling-symlink \ - touch/dir-1 \ - touch/fail-diag \ - touch/fifo \ - touch/no-create-missing \ - touch/no-dereference \ - touch/no-rights \ - touch/not-owner \ - touch/obsolescent \ - touch/read-only \ - touch/relative \ - touch/trailing-slash \ - $(root_tests) - -pr_data = \ - pr/0F \ - pr/0FF \ - pr/0FFnt \ - pr/0FFt \ - pr/0FnFnt \ - pr/0FnFt \ - pr/0Fnt \ - pr/0Ft \ - pr/2-S_f-t_notab \ - pr/2-Sf-t_notab \ - pr/2f-t_notab \ - pr/2s_f-t_notab \ - pr/2s_w60f-t_nota \ - pr/2sf-t_notab \ - pr/2sw60f-t_notab \ - pr/2w60f-t_notab \ - pr/3-0F \ - pr/3-5l24f-t \ - pr/3-FF \ - pr/3a2l17-FF \ - pr/3a3f-0F \ - pr/3a3l15-t \ - pr/3a3l15f-t \ - pr/3b2l17-FF \ - pr/3b3f-0F \ - pr/3b3f-0FF \ - pr/3b3f-FF \ - pr/3b3l15-t \ - pr/3b3l15f-t \ - pr/3f-0F \ - pr/3f-FF \ - pr/3l24-t \ - pr/3l24f-t \ - pr/3ml24-FF \ - pr/3ml24-t \ - pr/3ml24-t-FF \ - pr/3ml24f-t \ - pr/4-7l24-FF \ - pr/4l24-FF \ - pr/FF \ - pr/FFn \ - pr/FFtn \ - pr/FnFn \ - pr/Ja3l24f-lm \ - pr/Jb3l24f-lm \ - pr/Jml24f-lm-lo \ - pr/W-72l24f-ll \ - pr/W20l24f-ll \ - pr/W26l24f-ll \ - pr/W27l24f-ll \ - pr/W28l24f-ll \ - pr/W35Ja3l24f-lm \ - pr/W35Jb3l24f-lm \ - pr/W35Jml24f-lmlo \ - pr/W35a3l24f-lm \ - pr/W35b3l24f-lm \ - pr/W35ml24f-lm-lo \ - pr/W72Jl24f-ll \ - pr/a2l15-FF \ - pr/a2l17-FF \ - pr/a3-0F \ - pr/a3f-0F \ - pr/a3f-0FF \ - pr/a3f-FF \ - pr/a3l15-t \ - pr/a3l15f-t \ - pr/a3l24f-lm \ - pr/b2l15-FF \ - pr/b2l17-FF \ - pr/b3-0F \ - pr/b3f-0F \ - pr/b3f-0FF \ - pr/b3f-FF \ - pr/b3l15-t \ - pr/b3l15f-t \ - pr/b3l24f-lm \ - pr/l24-FF \ - pr/l24-t \ - pr/l24f-t \ - pr/loli \ - pr/ml20-FF-t \ - pr/ml24-FF \ - pr/ml24-t \ - pr/ml24-t-FF \ - pr/ml24f-0F \ - pr/ml24f-lm-lo \ - pr/ml24f-t \ - pr/ml24f-t-0F \ - pr/n+2-5l24f-0FF \ - pr/n+2l24f-0FF \ - pr/n+2l24f-bl \ - pr/n+3-7l24-FF \ - pr/n+3l24f-0FF \ - pr/n+3l24f-bl \ - pr/n+3ml20f-bl-FF \ - pr/n+3ml24f-bl-tn \ - pr/n+3ml24f-tn-bl \ - pr/n+4-8a2l17-FF \ - pr/n+4b2l17f-0FF \ - pr/n+5-8b3l17f-FF \ - pr/n+5a3l13f-0FF \ - pr/n+6a2l17-FF \ - pr/n+6b3l13f-FF \ - pr/n+7l24-FF \ - pr/n+8l20-FF \ - pr/nJml24f-lmlmlo \ - pr/nJml24f-lmlolm \ - pr/nN1+3l24f-bl \ - pr/nN15l24f-bl \ - pr/nSml20-bl-FF \ - pr/nSml20-t-t-FF \ - pr/nSml20-t-tFFFF \ - pr/nSml24-bl-FF \ - pr/nSml24-t-t-FF \ - pr/nSml24-t-tFFFF \ - pr/nl24f-bl \ - pr/o3Jml24f-lm-lo \ - pr/o3a3Sl24f-tn \ - pr/o3a3Snl24f-tn \ - pr/o3a3l24f-tn \ - pr/o3b3Sl24f-tn \ - pr/o3b3Snl24f-tn \ - pr/o3b3l24f-tn \ - pr/o3mSl24f-bl-tn \ - pr/o3mSnl24fbltn \ - pr/o3ml24f-bl-tn \ - pr/t-0FF \ - pr/t-FF \ - pr/t-bl \ - pr/t-t \ - pr/tFFn \ - pr/tFFt \ - pr/tFFt-bl \ - pr/tFFt-ll \ - pr/tFFt-lm \ - pr/tFnFt \ - pr/t_notab \ - pr/t_tab \ - pr/t_tab_ \ - pr/ta3-0FF \ - pr/ta3-FF \ - pr/tb3-0FF \ - pr/tb3-FF \ - pr/tn \ - pr/tn2e5o3-t_tab \ - pr/tn2e8-t_tab \ - pr/tn2e8o3-t_tab \ - pr/tn_2e8-t_tab \ - pr/tn_2e8S-t_tab \ - pr/tne8-t_tab \ - pr/tne8o3-t_tab \ - pr/tt-0FF \ - pr/tt-FF \ - pr/tt-bl \ - pr/tt-t \ - pr/tta3-0FF \ - pr/tta3-FF \ - pr/ttb3-0FF \ - pr/ttb3-FF \ - pr/w72l24f-ll - -include $(srcdir)/check.mk diff --git a/tests/Makefile.in b/tests/Makefile.in deleted file mode 100644 index cb315b11..00000000 --- a/tests/Makefile.in +++ /dev/null @@ -1,6292 +0,0 @@ -# Makefile.in generated by automake 1.12a from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2012 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. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# Include this file at the end of each tests/*/Makefile.am. -# Copyright (C) 2007-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 -# 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/>. -VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ - 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;; \ - esac; \ - test $$am__dry = yes; \ - } -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -DIST_COMMON = $(srcdir)/check.mk $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/build-aux/test-driver -subdir = 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/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 \ - $(top_srcdir)/m4/close-stream.m4 $(top_srcdir)/m4/close.m4 \ - $(top_srcdir)/m4/closedir.m4 $(top_srcdir)/m4/closein.m4 \ - $(top_srcdir)/m4/closeout.m4 $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/config-h.m4 $(top_srcdir)/m4/configmake.m4 \ - $(top_srcdir)/m4/ctype.m4 $(top_srcdir)/m4/cycle-check.m4 \ - $(top_srcdir)/m4/d-ino.m4 $(top_srcdir)/m4/d-type.m4 \ - $(top_srcdir)/m4/dirent-safer.m4 $(top_srcdir)/m4/dirent_h.m4 \ - $(top_srcdir)/m4/dirfd.m4 $(top_srcdir)/m4/dirname.m4 \ - $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup.m4 \ - $(top_srcdir)/m4/dup2.m4 $(top_srcdir)/m4/eealloc.m4 \ - $(top_srcdir)/m4/environ.m4 $(top_srcdir)/m4/errno_h.m4 \ - $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/euidaccess.m4 \ - $(top_srcdir)/m4/exponentd.m4 $(top_srcdir)/m4/exponentf.m4 \ - $(top_srcdir)/m4/exponentl.m4 $(top_srcdir)/m4/extensions.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/fd-reopen.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/freading.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/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 \ - $(top_srcdir)/m4/getgroups.m4 $(top_srcdir)/m4/gethostname.m4 \ - $(top_srcdir)/m4/gethrxtime.m4 $(top_srcdir)/m4/getline.m4 \ - $(top_srcdir)/m4/getloadavg.m4 $(top_srcdir)/m4/getlogin.m4 \ - $(top_srcdir)/m4/getndelim2.m4 $(top_srcdir)/m4/getopt.m4 \ - $(top_srcdir)/m4/getpagesize.m4 $(top_srcdir)/m4/getpass.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/gmp.m4 $(top_srcdir)/m4/gnu-make.m4 \ - $(top_srcdir)/m4/gnulib-common.m4 \ - $(top_srcdir)/m4/gnulib-comp.m4 \ - $(top_srcdir)/m4/group-member.m4 \ - $(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/host-os.m4 \ - $(top_srcdir)/m4/hostent.m4 $(top_srcdir)/m4/human.m4 \ - $(top_srcdir)/m4/i-ring.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/iconv_h.m4 $(top_srcdir)/m4/iconv_open.m4 \ - $(top_srcdir)/m4/idcache.m4 \ - $(top_srcdir)/m4/include-exclude-prog.m4 \ - $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inet_ntop.m4 \ - $(top_srcdir)/m4/inet_pton.m4 $(top_srcdir)/m4/inline.m4 \ - $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intmax_t.m4 \ - $(top_srcdir)/m4/inttostr.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ - $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ - $(top_srcdir)/m4/ioctl.m4 $(top_srcdir)/m4/isapipe.m4 \ - $(top_srcdir)/m4/isatty.m4 $(top_srcdir)/m4/isblank.m4 \ - $(top_srcdir)/m4/isnand.m4 $(top_srcdir)/m4/isnanf.m4 \ - $(top_srcdir)/m4/isnanl.m4 $(top_srcdir)/m4/iswblank.m4 \ - $(top_srcdir)/m4/jm-macros.m4 $(top_srcdir)/m4/jm-winsz1.m4 \ - $(top_srcdir)/m4/jm-winsz2.m4 $(top_srcdir)/m4/langinfo_h.m4 \ - $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lchmod.m4 \ - $(top_srcdir)/m4/lchown.m4 $(top_srcdir)/m4/lcmessage.m4 \ - $(top_srcdir)/m4/ldexp.m4 $(top_srcdir)/m4/ldexpl.m4 \ - $(top_srcdir)/m4/lib-check.m4 $(top_srcdir)/m4/lib-ignore.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/libunistring-base.m4 \ - $(top_srcdir)/m4/link-follow.m4 $(top_srcdir)/m4/link.m4 \ - $(top_srcdir)/m4/linkat.m4 $(top_srcdir)/m4/localcharset.m4 \ - $(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \ - $(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \ - $(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localeconv.m4 \ - $(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \ - $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/ls-mntd-fs.m4 \ - $(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \ - $(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \ - $(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/math_h.m4 \ - $(top_srcdir)/m4/mbchar.m4 $(top_srcdir)/m4/mbiter.m4 \ - $(top_srcdir)/m4/mbrlen.m4 $(top_srcdir)/m4/mbrtowc.m4 \ - $(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbslen.m4 \ - $(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbswidth.m4 $(top_srcdir)/m4/mbtowc.m4 \ - $(top_srcdir)/m4/md5.m4 $(top_srcdir)/m4/memcasecmp.m4 \ - $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/memcoll.m4 \ - $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \ - $(top_srcdir)/m4/mgetgroups.m4 $(top_srcdir)/m4/mkancesdirs.m4 \ - $(top_srcdir)/m4/mkdir-p.m4 $(top_srcdir)/m4/mkdir.m4 \ - $(top_srcdir)/m4/mkfifo.m4 $(top_srcdir)/m4/mknod.m4 \ - $(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mktime.m4 \ - $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \ - $(top_srcdir)/m4/modechange.m4 $(top_srcdir)/m4/mountlist.m4 \ - $(top_srcdir)/m4/mpsort.m4 $(top_srcdir)/m4/msvc-inval.m4 \ - $(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \ - $(top_srcdir)/m4/nanosleep.m4 $(top_srcdir)/m4/netdb_h.m4 \ - $(top_srcdir)/m4/netinet_in_h.m4 \ - $(top_srcdir)/m4/nl_langinfo.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/nproc.m4 \ - $(top_srcdir)/m4/off_t.m4 $(top_srcdir)/m4/open.m4 \ - $(top_srcdir)/m4/openat.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/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/root-dev-ino.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/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/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/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 \ - $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stdbool.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/strcase.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/strings_h.m4 $(top_srcdir)/m4/strncat.m4 \ - $(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \ - $(top_srcdir)/m4/strnumcmp.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 \ - $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \ - $(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/sys_uio_h.m4 \ - $(top_srcdir)/m4/sys_utsname_h.m4 \ - $(top_srcdir)/m4/sys_wait_h.m4 $(top_srcdir)/m4/tempname.m4 \ - $(top_srcdir)/m4/termios_h.m4 $(top_srcdir)/m4/thread.m4 \ - $(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/time_h.m4 \ - $(top_srcdir)/m4/time_r.m4 $(top_srcdir)/m4/timer_time.m4 \ - $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tls.m4 \ - $(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/tzset.m4 \ - $(top_srcdir)/m4/uname.m4 $(top_srcdir)/m4/ungetc.m4 \ - $(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \ - $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink-busy.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/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/xfts.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)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/lib/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -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_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -SOURCES = -DIST_SOURCES = -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -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; \ -} -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -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. 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; \ -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='$@'; \ -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[\ \ ]*) \ - 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.test' and 'test-trs-basic.test'. -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) -AM_RECURSIVE_TARGETS = check recheck -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) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -pkglibexecdir = @pkglibexecdir@ -ACLOCAL = @ACLOCAL@ -ALLOCA = @ALLOCA@ -ALLOCA_H = @ALLOCA_H@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ -AR = @AR@ -ARFLAGS = @ARFLAGS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BITSIZEOF_PTRDIFF_T = @BITSIZEOF_PTRDIFF_T@ -BITSIZEOF_SIG_ATOMIC_T = @BITSIZEOF_SIG_ATOMIC_T@ -BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@ -BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@ -BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CONFIG_INCLUDE = @CONFIG_INCLUDE@ -CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFAULT_POSIX2_VERSION = @DEFAULT_POSIX2_VERSION@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EMULTIHOP_HIDDEN = @EMULTIHOP_HIDDEN@ -EMULTIHOP_VALUE = @EMULTIHOP_VALUE@ -ENOLINK_HIDDEN = @ENOLINK_HIDDEN@ -ENOLINK_VALUE = @ENOLINK_VALUE@ -EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ -EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ -ERRNO_H = @ERRNO_H@ -EXEEXT = @EXEEXT@ -FLOAT_H = @FLOAT_H@ -FNMATCH_H = @FNMATCH_H@ -GETADDRINFO_LIB = @GETADDRINFO_LIB@ -GETHOSTNAME_LIB = @GETHOSTNAME_LIB@ -GETLOADAVG_LIBS = @GETLOADAVG_LIBS@ -GETOPT_H = @GETOPT_H@ -GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ -GLIBC21 = @GLIBC21@ -GMSGFMT = @GMSGFMT@ -GMSGFMT_015 = @GMSGFMT_015@ -GNULIB_ACCEPT = @GNULIB_ACCEPT@ -GNULIB_ACCEPT4 = @GNULIB_ACCEPT4@ -GNULIB_ACOSF = @GNULIB_ACOSF@ -GNULIB_ACOSL = @GNULIB_ACOSL@ -GNULIB_ALPHASORT = @GNULIB_ALPHASORT@ -GNULIB_ASINF = @GNULIB_ASINF@ -GNULIB_ASINL = @GNULIB_ASINL@ -GNULIB_ATAN2F = @GNULIB_ATAN2F@ -GNULIB_ATANF = @GNULIB_ATANF@ -GNULIB_ATANL = @GNULIB_ATANL@ -GNULIB_ATOLL = @GNULIB_ATOLL@ -GNULIB_BIND = @GNULIB_BIND@ -GNULIB_BTOWC = @GNULIB_BTOWC@ -GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@ -GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@ -GNULIB_CBRT = @GNULIB_CBRT@ -GNULIB_CBRTF = @GNULIB_CBRTF@ -GNULIB_CBRTL = @GNULIB_CBRTL@ -GNULIB_CEIL = @GNULIB_CEIL@ -GNULIB_CEILF = @GNULIB_CEILF@ -GNULIB_CEILL = @GNULIB_CEILL@ -GNULIB_CHDIR = @GNULIB_CHDIR@ -GNULIB_CHOWN = @GNULIB_CHOWN@ -GNULIB_CLOSE = @GNULIB_CLOSE@ -GNULIB_CLOSEDIR = @GNULIB_CLOSEDIR@ -GNULIB_CONNECT = @GNULIB_CONNECT@ -GNULIB_COPYSIGN = @GNULIB_COPYSIGN@ -GNULIB_COPYSIGNF = @GNULIB_COPYSIGNF@ -GNULIB_COPYSIGNL = @GNULIB_COPYSIGNL@ -GNULIB_COSF = @GNULIB_COSF@ -GNULIB_COSHF = @GNULIB_COSHF@ -GNULIB_COSL = @GNULIB_COSL@ -GNULIB_DIRFD = @GNULIB_DIRFD@ -GNULIB_DPRINTF = @GNULIB_DPRINTF@ -GNULIB_DUP = @GNULIB_DUP@ -GNULIB_DUP2 = @GNULIB_DUP2@ -GNULIB_DUP3 = @GNULIB_DUP3@ -GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@ -GNULIB_ENVIRON = @GNULIB_ENVIRON@ -GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@ -GNULIB_EXP2 = @GNULIB_EXP2@ -GNULIB_EXP2F = @GNULIB_EXP2F@ -GNULIB_EXP2L = @GNULIB_EXP2L@ -GNULIB_EXPF = @GNULIB_EXPF@ -GNULIB_EXPL = @GNULIB_EXPL@ -GNULIB_EXPM1 = @GNULIB_EXPM1@ -GNULIB_EXPM1F = @GNULIB_EXPM1F@ -GNULIB_EXPM1L = @GNULIB_EXPM1L@ -GNULIB_FABSF = @GNULIB_FABSF@ -GNULIB_FABSL = @GNULIB_FABSL@ -GNULIB_FACCESSAT = @GNULIB_FACCESSAT@ -GNULIB_FCHDIR = @GNULIB_FCHDIR@ -GNULIB_FCHMODAT = @GNULIB_FCHMODAT@ -GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@ -GNULIB_FCLOSE = @GNULIB_FCLOSE@ -GNULIB_FCNTL = @GNULIB_FCNTL@ -GNULIB_FDATASYNC = @GNULIB_FDATASYNC@ -GNULIB_FDOPEN = @GNULIB_FDOPEN@ -GNULIB_FDOPENDIR = @GNULIB_FDOPENDIR@ -GNULIB_FFLUSH = @GNULIB_FFLUSH@ -GNULIB_FFS = @GNULIB_FFS@ -GNULIB_FFSL = @GNULIB_FFSL@ -GNULIB_FFSLL = @GNULIB_FFSLL@ -GNULIB_FGETC = @GNULIB_FGETC@ -GNULIB_FGETS = @GNULIB_FGETS@ -GNULIB_FLOOR = @GNULIB_FLOOR@ -GNULIB_FLOORF = @GNULIB_FLOORF@ -GNULIB_FLOORL = @GNULIB_FLOORL@ -GNULIB_FMA = @GNULIB_FMA@ -GNULIB_FMAF = @GNULIB_FMAF@ -GNULIB_FMAL = @GNULIB_FMAL@ -GNULIB_FMOD = @GNULIB_FMOD@ -GNULIB_FMODF = @GNULIB_FMODF@ -GNULIB_FMODL = @GNULIB_FMODL@ -GNULIB_FOPEN = @GNULIB_FOPEN@ -GNULIB_FPRINTF = @GNULIB_FPRINTF@ -GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@ -GNULIB_FPURGE = @GNULIB_FPURGE@ -GNULIB_FPUTC = @GNULIB_FPUTC@ -GNULIB_FPUTS = @GNULIB_FPUTS@ -GNULIB_FREAD = @GNULIB_FREAD@ -GNULIB_FREOPEN = @GNULIB_FREOPEN@ -GNULIB_FREXP = @GNULIB_FREXP@ -GNULIB_FREXPF = @GNULIB_FREXPF@ -GNULIB_FREXPL = @GNULIB_FREXPL@ -GNULIB_FSCANF = @GNULIB_FSCANF@ -GNULIB_FSEEK = @GNULIB_FSEEK@ -GNULIB_FSEEKO = @GNULIB_FSEEKO@ -GNULIB_FSTAT = @GNULIB_FSTAT@ -GNULIB_FSTATAT = @GNULIB_FSTATAT@ -GNULIB_FSYNC = @GNULIB_FSYNC@ -GNULIB_FTELL = @GNULIB_FTELL@ -GNULIB_FTELLO = @GNULIB_FTELLO@ -GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@ -GNULIB_FUTIMENS = @GNULIB_FUTIMENS@ -GNULIB_FWRITE = @GNULIB_FWRITE@ -GNULIB_GETADDRINFO = @GNULIB_GETADDRINFO@ -GNULIB_GETC = @GNULIB_GETC@ -GNULIB_GETCHAR = @GNULIB_GETCHAR@ -GNULIB_GETCWD = @GNULIB_GETCWD@ -GNULIB_GETDELIM = @GNULIB_GETDELIM@ -GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@ -GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@ -GNULIB_GETGROUPS = @GNULIB_GETGROUPS@ -GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@ -GNULIB_GETLINE = @GNULIB_GETLINE@ -GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@ -GNULIB_GETLOGIN = @GNULIB_GETLOGIN@ -GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ -GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ -GNULIB_GETPEERNAME = @GNULIB_GETPEERNAME@ -GNULIB_GETRUSAGE = @GNULIB_GETRUSAGE@ -GNULIB_GETSOCKNAME = @GNULIB_GETSOCKNAME@ -GNULIB_GETSOCKOPT = @GNULIB_GETSOCKOPT@ -GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@ -GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ -GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ -GNULIB_GL_UNISTD_H_GETOPT = @GNULIB_GL_UNISTD_H_GETOPT@ -GNULIB_GRANTPT = @GNULIB_GRANTPT@ -GNULIB_GROUP_MEMBER = @GNULIB_GROUP_MEMBER@ -GNULIB_HYPOT = @GNULIB_HYPOT@ -GNULIB_HYPOTF = @GNULIB_HYPOTF@ -GNULIB_HYPOTL = @GNULIB_HYPOTL@ -GNULIB_ICONV = @GNULIB_ICONV@ -GNULIB_ILOGB = @GNULIB_ILOGB@ -GNULIB_ILOGBF = @GNULIB_ILOGBF@ -GNULIB_ILOGBL = @GNULIB_ILOGBL@ -GNULIB_IMAXABS = @GNULIB_IMAXABS@ -GNULIB_IMAXDIV = @GNULIB_IMAXDIV@ -GNULIB_INET_NTOP = @GNULIB_INET_NTOP@ -GNULIB_INET_PTON = @GNULIB_INET_PTON@ -GNULIB_IOCTL = @GNULIB_IOCTL@ -GNULIB_ISATTY = @GNULIB_ISATTY@ -GNULIB_ISBLANK = @GNULIB_ISBLANK@ -GNULIB_ISFINITE = @GNULIB_ISFINITE@ -GNULIB_ISINF = @GNULIB_ISINF@ -GNULIB_ISNAN = @GNULIB_ISNAN@ -GNULIB_ISNAND = @GNULIB_ISNAND@ -GNULIB_ISNANF = @GNULIB_ISNANF@ -GNULIB_ISNANL = @GNULIB_ISNANL@ -GNULIB_ISWBLANK = @GNULIB_ISWBLANK@ -GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@ -GNULIB_LCHMOD = @GNULIB_LCHMOD@ -GNULIB_LCHOWN = @GNULIB_LCHOWN@ -GNULIB_LDEXPF = @GNULIB_LDEXPF@ -GNULIB_LDEXPL = @GNULIB_LDEXPL@ -GNULIB_LINK = @GNULIB_LINK@ -GNULIB_LINKAT = @GNULIB_LINKAT@ -GNULIB_LISTEN = @GNULIB_LISTEN@ -GNULIB_LOCALECONV = @GNULIB_LOCALECONV@ -GNULIB_LOG = @GNULIB_LOG@ -GNULIB_LOG10 = @GNULIB_LOG10@ -GNULIB_LOG10F = @GNULIB_LOG10F@ -GNULIB_LOG10L = @GNULIB_LOG10L@ -GNULIB_LOG1P = @GNULIB_LOG1P@ -GNULIB_LOG1PF = @GNULIB_LOG1PF@ -GNULIB_LOG1PL = @GNULIB_LOG1PL@ -GNULIB_LOG2 = @GNULIB_LOG2@ -GNULIB_LOG2F = @GNULIB_LOG2F@ -GNULIB_LOG2L = @GNULIB_LOG2L@ -GNULIB_LOGB = @GNULIB_LOGB@ -GNULIB_LOGBF = @GNULIB_LOGBF@ -GNULIB_LOGBL = @GNULIB_LOGBL@ -GNULIB_LOGF = @GNULIB_LOGF@ -GNULIB_LOGL = @GNULIB_LOGL@ -GNULIB_LSEEK = @GNULIB_LSEEK@ -GNULIB_LSTAT = @GNULIB_LSTAT@ -GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ -GNULIB_MBRLEN = @GNULIB_MBRLEN@ -GNULIB_MBRTOWC = @GNULIB_MBRTOWC@ -GNULIB_MBSCASECMP = @GNULIB_MBSCASECMP@ -GNULIB_MBSCASESTR = @GNULIB_MBSCASESTR@ -GNULIB_MBSCHR = @GNULIB_MBSCHR@ -GNULIB_MBSCSPN = @GNULIB_MBSCSPN@ -GNULIB_MBSINIT = @GNULIB_MBSINIT@ -GNULIB_MBSLEN = @GNULIB_MBSLEN@ -GNULIB_MBSNCASECMP = @GNULIB_MBSNCASECMP@ -GNULIB_MBSNLEN = @GNULIB_MBSNLEN@ -GNULIB_MBSNRTOWCS = @GNULIB_MBSNRTOWCS@ -GNULIB_MBSPBRK = @GNULIB_MBSPBRK@ -GNULIB_MBSPCASECMP = @GNULIB_MBSPCASECMP@ -GNULIB_MBSRCHR = @GNULIB_MBSRCHR@ -GNULIB_MBSRTOWCS = @GNULIB_MBSRTOWCS@ -GNULIB_MBSSEP = @GNULIB_MBSSEP@ -GNULIB_MBSSPN = @GNULIB_MBSSPN@ -GNULIB_MBSSTR = @GNULIB_MBSSTR@ -GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@ -GNULIB_MBTOWC = @GNULIB_MBTOWC@ -GNULIB_MEMCHR = @GNULIB_MEMCHR@ -GNULIB_MEMMEM = @GNULIB_MEMMEM@ -GNULIB_MEMPCPY = @GNULIB_MEMPCPY@ -GNULIB_MEMRCHR = @GNULIB_MEMRCHR@ -GNULIB_MKDIRAT = @GNULIB_MKDIRAT@ -GNULIB_MKDTEMP = @GNULIB_MKDTEMP@ -GNULIB_MKFIFO = @GNULIB_MKFIFO@ -GNULIB_MKFIFOAT = @GNULIB_MKFIFOAT@ -GNULIB_MKNOD = @GNULIB_MKNOD@ -GNULIB_MKNODAT = @GNULIB_MKNODAT@ -GNULIB_MKOSTEMP = @GNULIB_MKOSTEMP@ -GNULIB_MKOSTEMPS = @GNULIB_MKOSTEMPS@ -GNULIB_MKSTEMP = @GNULIB_MKSTEMP@ -GNULIB_MKSTEMPS = @GNULIB_MKSTEMPS@ -GNULIB_MKTIME = @GNULIB_MKTIME@ -GNULIB_MODF = @GNULIB_MODF@ -GNULIB_MODFF = @GNULIB_MODFF@ -GNULIB_MODFL = @GNULIB_MODFL@ -GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@ -GNULIB_NL_LANGINFO = @GNULIB_NL_LANGINFO@ -GNULIB_NONBLOCKING = @GNULIB_NONBLOCKING@ -GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@ -GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ -GNULIB_OPEN = @GNULIB_OPEN@ -GNULIB_OPENAT = @GNULIB_OPENAT@ -GNULIB_OPENDIR = @GNULIB_OPENDIR@ -GNULIB_PCLOSE = @GNULIB_PCLOSE@ -GNULIB_PERROR = @GNULIB_PERROR@ -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@ -GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@ -GNULIB_PSELECT = @GNULIB_PSELECT@ -GNULIB_PTHREAD_SIGMASK = @GNULIB_PTHREAD_SIGMASK@ -GNULIB_PTSNAME = @GNULIB_PTSNAME@ -GNULIB_PTSNAME_R = @GNULIB_PTSNAME_R@ -GNULIB_PUTC = @GNULIB_PUTC@ -GNULIB_PUTCHAR = @GNULIB_PUTCHAR@ -GNULIB_PUTENV = @GNULIB_PUTENV@ -GNULIB_PUTS = @GNULIB_PUTS@ -GNULIB_PWRITE = @GNULIB_PWRITE@ -GNULIB_RAISE = @GNULIB_RAISE@ -GNULIB_RANDOM = @GNULIB_RANDOM@ -GNULIB_RANDOM_R = @GNULIB_RANDOM_R@ -GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ -GNULIB_READ = @GNULIB_READ@ -GNULIB_READDIR = @GNULIB_READDIR@ -GNULIB_READLINK = @GNULIB_READLINK@ -GNULIB_READLINKAT = @GNULIB_READLINKAT@ -GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@ -GNULIB_REALPATH = @GNULIB_REALPATH@ -GNULIB_RECV = @GNULIB_RECV@ -GNULIB_RECVFROM = @GNULIB_RECVFROM@ -GNULIB_REMAINDER = @GNULIB_REMAINDER@ -GNULIB_REMAINDERF = @GNULIB_REMAINDERF@ -GNULIB_REMAINDERL = @GNULIB_REMAINDERL@ -GNULIB_REMOVE = @GNULIB_REMOVE@ -GNULIB_RENAME = @GNULIB_RENAME@ -GNULIB_RENAMEAT = @GNULIB_RENAMEAT@ -GNULIB_REWINDDIR = @GNULIB_REWINDDIR@ -GNULIB_RINT = @GNULIB_RINT@ -GNULIB_RINTF = @GNULIB_RINTF@ -GNULIB_RINTL = @GNULIB_RINTL@ -GNULIB_RMDIR = @GNULIB_RMDIR@ -GNULIB_ROUND = @GNULIB_ROUND@ -GNULIB_ROUNDF = @GNULIB_ROUNDF@ -GNULIB_ROUNDL = @GNULIB_ROUNDL@ -GNULIB_RPMATCH = @GNULIB_RPMATCH@ -GNULIB_SCANDIR = @GNULIB_SCANDIR@ -GNULIB_SCANF = @GNULIB_SCANF@ -GNULIB_SELECT = @GNULIB_SELECT@ -GNULIB_SEND = @GNULIB_SEND@ -GNULIB_SENDTO = @GNULIB_SENDTO@ -GNULIB_SETENV = @GNULIB_SETENV@ -GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@ -GNULIB_SETLOCALE = @GNULIB_SETLOCALE@ -GNULIB_SETSOCKOPT = @GNULIB_SETSOCKOPT@ -GNULIB_SHUTDOWN = @GNULIB_SHUTDOWN@ -GNULIB_SIGACTION = @GNULIB_SIGACTION@ -GNULIB_SIGNAL_H_SIGPIPE = @GNULIB_SIGNAL_H_SIGPIPE@ -GNULIB_SIGNBIT = @GNULIB_SIGNBIT@ -GNULIB_SIGPROCMASK = @GNULIB_SIGPROCMASK@ -GNULIB_SINF = @GNULIB_SINF@ -GNULIB_SINHF = @GNULIB_SINHF@ -GNULIB_SINL = @GNULIB_SINL@ -GNULIB_SLEEP = @GNULIB_SLEEP@ -GNULIB_SNPRINTF = @GNULIB_SNPRINTF@ -GNULIB_SOCKET = @GNULIB_SOCKET@ -GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@ -GNULIB_SQRTF = @GNULIB_SQRTF@ -GNULIB_SQRTL = @GNULIB_SQRTL@ -GNULIB_STAT = @GNULIB_STAT@ -GNULIB_STDIO_H_NONBLOCKING = @GNULIB_STDIO_H_NONBLOCKING@ -GNULIB_STDIO_H_SIGPIPE = @GNULIB_STDIO_H_SIGPIPE@ -GNULIB_STPCPY = @GNULIB_STPCPY@ -GNULIB_STPNCPY = @GNULIB_STPNCPY@ -GNULIB_STRCASESTR = @GNULIB_STRCASESTR@ -GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@ -GNULIB_STRDUP = @GNULIB_STRDUP@ -GNULIB_STRERROR = @GNULIB_STRERROR@ -GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ -GNULIB_STRNCAT = @GNULIB_STRNCAT@ -GNULIB_STRNDUP = @GNULIB_STRNDUP@ -GNULIB_STRNLEN = @GNULIB_STRNLEN@ -GNULIB_STRPBRK = @GNULIB_STRPBRK@ -GNULIB_STRPTIME = @GNULIB_STRPTIME@ -GNULIB_STRSEP = @GNULIB_STRSEP@ -GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@ -GNULIB_STRSTR = @GNULIB_STRSTR@ -GNULIB_STRTOD = @GNULIB_STRTOD@ -GNULIB_STRTOIMAX = @GNULIB_STRTOIMAX@ -GNULIB_STRTOK_R = @GNULIB_STRTOK_R@ -GNULIB_STRTOLL = @GNULIB_STRTOLL@ -GNULIB_STRTOULL = @GNULIB_STRTOULL@ -GNULIB_STRTOUMAX = @GNULIB_STRTOUMAX@ -GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@ -GNULIB_SYMLINK = @GNULIB_SYMLINK@ -GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@ -GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@ -GNULIB_TANF = @GNULIB_TANF@ -GNULIB_TANHF = @GNULIB_TANHF@ -GNULIB_TANL = @GNULIB_TANL@ -GNULIB_TCGETSID = @GNULIB_TCGETSID@ -GNULIB_TEST_WARN_CFLAGS = @GNULIB_TEST_WARN_CFLAGS@ -GNULIB_TIMEGM = @GNULIB_TIMEGM@ -GNULIB_TIME_R = @GNULIB_TIME_R@ -GNULIB_TMPFILE = @GNULIB_TMPFILE@ -GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@ -GNULIB_TRUNC = @GNULIB_TRUNC@ -GNULIB_TRUNCF = @GNULIB_TRUNCF@ -GNULIB_TRUNCL = @GNULIB_TRUNCL@ -GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@ -GNULIB_UNAME = @GNULIB_UNAME@ -GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@ -GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ -GNULIB_UNLINK = @GNULIB_UNLINK@ -GNULIB_UNLINKAT = @GNULIB_UNLINKAT@ -GNULIB_UNLOCKPT = @GNULIB_UNLOCKPT@ -GNULIB_UNSETENV = @GNULIB_UNSETENV@ -GNULIB_USLEEP = @GNULIB_USLEEP@ -GNULIB_UTIMENSAT = @GNULIB_UTIMENSAT@ -GNULIB_VASPRINTF = @GNULIB_VASPRINTF@ -GNULIB_VDPRINTF = @GNULIB_VDPRINTF@ -GNULIB_VFPRINTF = @GNULIB_VFPRINTF@ -GNULIB_VFPRINTF_POSIX = @GNULIB_VFPRINTF_POSIX@ -GNULIB_VFSCANF = @GNULIB_VFSCANF@ -GNULIB_VPRINTF = @GNULIB_VPRINTF@ -GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@ -GNULIB_VSCANF = @GNULIB_VSCANF@ -GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@ -GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@ -GNULIB_WAITPID = @GNULIB_WAITPID@ -GNULIB_WARN_CFLAGS = @GNULIB_WARN_CFLAGS@ -GNULIB_WCPCPY = @GNULIB_WCPCPY@ -GNULIB_WCPNCPY = @GNULIB_WCPNCPY@ -GNULIB_WCRTOMB = @GNULIB_WCRTOMB@ -GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@ -GNULIB_WCSCAT = @GNULIB_WCSCAT@ -GNULIB_WCSCHR = @GNULIB_WCSCHR@ -GNULIB_WCSCMP = @GNULIB_WCSCMP@ -GNULIB_WCSCOLL = @GNULIB_WCSCOLL@ -GNULIB_WCSCPY = @GNULIB_WCSCPY@ -GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ -GNULIB_WCSDUP = @GNULIB_WCSDUP@ -GNULIB_WCSLEN = @GNULIB_WCSLEN@ -GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ -GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ -GNULIB_WCSNCMP = @GNULIB_WCSNCMP@ -GNULIB_WCSNCPY = @GNULIB_WCSNCPY@ -GNULIB_WCSNLEN = @GNULIB_WCSNLEN@ -GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@ -GNULIB_WCSPBRK = @GNULIB_WCSPBRK@ -GNULIB_WCSRCHR = @GNULIB_WCSRCHR@ -GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@ -GNULIB_WCSSPN = @GNULIB_WCSSPN@ -GNULIB_WCSSTR = @GNULIB_WCSSTR@ -GNULIB_WCSTOK = @GNULIB_WCSTOK@ -GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@ -GNULIB_WCSXFRM = @GNULIB_WCSXFRM@ -GNULIB_WCTOB = @GNULIB_WCTOB@ -GNULIB_WCTOMB = @GNULIB_WCTOMB@ -GNULIB_WCTRANS = @GNULIB_WCTRANS@ -GNULIB_WCTYPE = @GNULIB_WCTYPE@ -GNULIB_WCWIDTH = @GNULIB_WCWIDTH@ -GNULIB_WMEMCHR = @GNULIB_WMEMCHR@ -GNULIB_WMEMCMP = @GNULIB_WMEMCMP@ -GNULIB_WMEMCPY = @GNULIB_WMEMCPY@ -GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@ -GNULIB_WMEMSET = @GNULIB_WMEMSET@ -GNULIB_WRITE = @GNULIB_WRITE@ -GNULIB__EXIT = @GNULIB__EXIT@ -GREP = @GREP@ -HAVE_ACCEPT4 = @HAVE_ACCEPT4@ -HAVE_ACOSF = @HAVE_ACOSF@ -HAVE_ACOSL = @HAVE_ACOSL@ -HAVE_ALPHASORT = @HAVE_ALPHASORT@ -HAVE_ARPA_INET_H = @HAVE_ARPA_INET_H@ -HAVE_ASINF = @HAVE_ASINF@ -HAVE_ASINL = @HAVE_ASINL@ -HAVE_ATAN2F = @HAVE_ATAN2F@ -HAVE_ATANF = @HAVE_ATANF@ -HAVE_ATANL = @HAVE_ATANL@ -HAVE_ATOLL = @HAVE_ATOLL@ -HAVE_BTOWC = @HAVE_BTOWC@ -HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ -HAVE_CBRT = @HAVE_CBRT@ -HAVE_CBRTF = @HAVE_CBRTF@ -HAVE_CBRTL = @HAVE_CBRTL@ -HAVE_CHOWN = @HAVE_CHOWN@ -HAVE_CLOSEDIR = @HAVE_CLOSEDIR@ -HAVE_COPYSIGN = @HAVE_COPYSIGN@ -HAVE_COPYSIGNL = @HAVE_COPYSIGNL@ -HAVE_COSF = @HAVE_COSF@ -HAVE_COSHF = @HAVE_COSHF@ -HAVE_COSL = @HAVE_COSL@ -HAVE_DECL_ACOSL = @HAVE_DECL_ACOSL@ -HAVE_DECL_ASINL = @HAVE_DECL_ASINL@ -HAVE_DECL_ATANL = @HAVE_DECL_ATANL@ -HAVE_DECL_CBRTF = @HAVE_DECL_CBRTF@ -HAVE_DECL_CBRTL = @HAVE_DECL_CBRTL@ -HAVE_DECL_CEILF = @HAVE_DECL_CEILF@ -HAVE_DECL_CEILL = @HAVE_DECL_CEILL@ -HAVE_DECL_COPYSIGNF = @HAVE_DECL_COPYSIGNF@ -HAVE_DECL_COSL = @HAVE_DECL_COSL@ -HAVE_DECL_DIRFD = @HAVE_DECL_DIRFD@ -HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ -HAVE_DECL_EXP2 = @HAVE_DECL_EXP2@ -HAVE_DECL_EXP2F = @HAVE_DECL_EXP2F@ -HAVE_DECL_EXP2L = @HAVE_DECL_EXP2L@ -HAVE_DECL_EXPL = @HAVE_DECL_EXPL@ -HAVE_DECL_EXPM1L = @HAVE_DECL_EXPM1L@ -HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ -HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@ -HAVE_DECL_FDOPENDIR = @HAVE_DECL_FDOPENDIR@ -HAVE_DECL_FLOORF = @HAVE_DECL_FLOORF@ -HAVE_DECL_FLOORL = @HAVE_DECL_FLOORL@ -HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@ -HAVE_DECL_FREEADDRINFO = @HAVE_DECL_FREEADDRINFO@ -HAVE_DECL_FREXPL = @HAVE_DECL_FREXPL@ -HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@ -HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@ -HAVE_DECL_GAI_STRERROR = @HAVE_DECL_GAI_STRERROR@ -HAVE_DECL_GETADDRINFO = @HAVE_DECL_GETADDRINFO@ -HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@ -HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ -HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ -HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@ -HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ -HAVE_DECL_GETNAMEINFO = @HAVE_DECL_GETNAMEINFO@ -HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ -HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ -HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ -HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ -HAVE_DECL_INET_NTOP = @HAVE_DECL_INET_NTOP@ -HAVE_DECL_INET_PTON = @HAVE_DECL_INET_PTON@ -HAVE_DECL_LDEXPL = @HAVE_DECL_LDEXPL@ -HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@ -HAVE_DECL_LOG10L = @HAVE_DECL_LOG10L@ -HAVE_DECL_LOG2 = @HAVE_DECL_LOG2@ -HAVE_DECL_LOG2F = @HAVE_DECL_LOG2F@ -HAVE_DECL_LOG2L = @HAVE_DECL_LOG2L@ -HAVE_DECL_LOGB = @HAVE_DECL_LOGB@ -HAVE_DECL_LOGL = @HAVE_DECL_LOGL@ -HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ -HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ -HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ -HAVE_DECL_REMAINDER = @HAVE_DECL_REMAINDER@ -HAVE_DECL_REMAINDERL = @HAVE_DECL_REMAINDERL@ -HAVE_DECL_RINTF = @HAVE_DECL_RINTF@ -HAVE_DECL_ROUND = @HAVE_DECL_ROUND@ -HAVE_DECL_ROUNDF = @HAVE_DECL_ROUNDF@ -HAVE_DECL_ROUNDL = @HAVE_DECL_ROUNDL@ -HAVE_DECL_SETENV = @HAVE_DECL_SETENV@ -HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@ -HAVE_DECL_SINL = @HAVE_DECL_SINL@ -HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@ -HAVE_DECL_SQRTL = @HAVE_DECL_SQRTL@ -HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ -HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@ -HAVE_DECL_STRNCASECMP = @HAVE_DECL_STRNCASECMP@ -HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@ -HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@ -HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ -HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ -HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ -HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ -HAVE_DECL_TANL = @HAVE_DECL_TANL@ -HAVE_DECL_TCGETSID = @HAVE_DECL_TCGETSID@ -HAVE_DECL_TRUNC = @HAVE_DECL_TRUNC@ -HAVE_DECL_TRUNCF = @HAVE_DECL_TRUNCF@ -HAVE_DECL_TRUNCL = @HAVE_DECL_TRUNCL@ -HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ -HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ -HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ -HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ -HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ -HAVE_DIRENT_H = @HAVE_DIRENT_H@ -HAVE_DPRINTF = @HAVE_DPRINTF@ -HAVE_DUP2 = @HAVE_DUP2@ -HAVE_DUP3 = @HAVE_DUP3@ -HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ -HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ -HAVE_EXPF = @HAVE_EXPF@ -HAVE_EXPL = @HAVE_EXPL@ -HAVE_EXPM1 = @HAVE_EXPM1@ -HAVE_EXPM1F = @HAVE_EXPM1F@ -HAVE_FABSF = @HAVE_FABSF@ -HAVE_FABSL = @HAVE_FABSL@ -HAVE_FACCESSAT = @HAVE_FACCESSAT@ -HAVE_FCHDIR = @HAVE_FCHDIR@ -HAVE_FCHMODAT = @HAVE_FCHMODAT@ -HAVE_FCHOWNAT = @HAVE_FCHOWNAT@ -HAVE_FCNTL = @HAVE_FCNTL@ -HAVE_FDATASYNC = @HAVE_FDATASYNC@ -HAVE_FDOPENDIR = @HAVE_FDOPENDIR@ -HAVE_FEATURES_H = @HAVE_FEATURES_H@ -HAVE_FFS = @HAVE_FFS@ -HAVE_FFSL = @HAVE_FFSL@ -HAVE_FFSLL = @HAVE_FFSLL@ -HAVE_FMA = @HAVE_FMA@ -HAVE_FMAF = @HAVE_FMAF@ -HAVE_FMAL = @HAVE_FMAL@ -HAVE_FMODF = @HAVE_FMODF@ -HAVE_FMODL = @HAVE_FMODL@ -HAVE_FREXPF = @HAVE_FREXPF@ -HAVE_FSEEKO = @HAVE_FSEEKO@ -HAVE_FSTATAT = @HAVE_FSTATAT@ -HAVE_FSYNC = @HAVE_FSYNC@ -HAVE_FTELLO = @HAVE_FTELLO@ -HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ -HAVE_FUTIMENS = @HAVE_FUTIMENS@ -HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ -HAVE_GETGROUPS = @HAVE_GETGROUPS@ -HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@ -HAVE_GETLOGIN = @HAVE_GETLOGIN@ -HAVE_GETOPT_H = @HAVE_GETOPT_H@ -HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ -HAVE_GETRUSAGE = @HAVE_GETRUSAGE@ -HAVE_GETSUBOPT = @HAVE_GETSUBOPT@ -HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@ -HAVE_GRANTPT = @HAVE_GRANTPT@ -HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@ -HAVE_HYPOTF = @HAVE_HYPOTF@ -HAVE_HYPOTL = @HAVE_HYPOTL@ -HAVE_ILOGB = @HAVE_ILOGB@ -HAVE_ILOGBF = @HAVE_ILOGBF@ -HAVE_ILOGBL = @HAVE_ILOGBL@ -HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ -HAVE_ISBLANK = @HAVE_ISBLANK@ -HAVE_ISNAND = @HAVE_ISNAND@ -HAVE_ISNANF = @HAVE_ISNANF@ -HAVE_ISNANL = @HAVE_ISNANL@ -HAVE_ISWBLANK = @HAVE_ISWBLANK@ -HAVE_ISWCNTRL = @HAVE_ISWCNTRL@ -HAVE_LANGINFO_CODESET = @HAVE_LANGINFO_CODESET@ -HAVE_LANGINFO_ERA = @HAVE_LANGINFO_ERA@ -HAVE_LANGINFO_H = @HAVE_LANGINFO_H@ -HAVE_LANGINFO_T_FMT_AMPM = @HAVE_LANGINFO_T_FMT_AMPM@ -HAVE_LANGINFO_YESEXPR = @HAVE_LANGINFO_YESEXPR@ -HAVE_LCHMOD = @HAVE_LCHMOD@ -HAVE_LCHOWN = @HAVE_LCHOWN@ -HAVE_LDEXPF = @HAVE_LDEXPF@ -HAVE_LINK = @HAVE_LINK@ -HAVE_LINKAT = @HAVE_LINKAT@ -HAVE_LOG10F = @HAVE_LOG10F@ -HAVE_LOG10L = @HAVE_LOG10L@ -HAVE_LOG1P = @HAVE_LOG1P@ -HAVE_LOG1PF = @HAVE_LOG1PF@ -HAVE_LOG1PL = @HAVE_LOG1PL@ -HAVE_LOGBF = @HAVE_LOGBF@ -HAVE_LOGBL = @HAVE_LOGBL@ -HAVE_LOGF = @HAVE_LOGF@ -HAVE_LOGL = @HAVE_LOGL@ -HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ -HAVE_LSTAT = @HAVE_LSTAT@ -HAVE_MBRLEN = @HAVE_MBRLEN@ -HAVE_MBRTOWC = @HAVE_MBRTOWC@ -HAVE_MBSINIT = @HAVE_MBSINIT@ -HAVE_MBSLEN = @HAVE_MBSLEN@ -HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ -HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ -HAVE_MEMCHR = @HAVE_MEMCHR@ -HAVE_MEMPCPY = @HAVE_MEMPCPY@ -HAVE_MKDIRAT = @HAVE_MKDIRAT@ -HAVE_MKDTEMP = @HAVE_MKDTEMP@ -HAVE_MKFIFO = @HAVE_MKFIFO@ -HAVE_MKFIFOAT = @HAVE_MKFIFOAT@ -HAVE_MKNOD = @HAVE_MKNOD@ -HAVE_MKNODAT = @HAVE_MKNODAT@ -HAVE_MKOSTEMP = @HAVE_MKOSTEMP@ -HAVE_MKOSTEMPS = @HAVE_MKOSTEMPS@ -HAVE_MKSTEMP = @HAVE_MKSTEMP@ -HAVE_MKSTEMPS = @HAVE_MKSTEMPS@ -HAVE_MODFF = @HAVE_MODFF@ -HAVE_MODFL = @HAVE_MODFL@ -HAVE_MSVC_INVALID_PARAMETER_HANDLER = @HAVE_MSVC_INVALID_PARAMETER_HANDLER@ -HAVE_NANOSLEEP = @HAVE_NANOSLEEP@ -HAVE_NETDB_H = @HAVE_NETDB_H@ -HAVE_NETINET_IN_H = @HAVE_NETINET_IN_H@ -HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@ -HAVE_OPENAT = @HAVE_OPENAT@ -HAVE_OPENDIR = @HAVE_OPENDIR@ -HAVE_OS_H = @HAVE_OS_H@ -HAVE_PCLOSE = @HAVE_PCLOSE@ -HAVE_PIPE = @HAVE_PIPE@ -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@ -HAVE_PTHREAD_H = @HAVE_PTHREAD_H@ -HAVE_PTHREAD_SIGMASK = @HAVE_PTHREAD_SIGMASK@ -HAVE_PTHREAD_SPINLOCK_T = @HAVE_PTHREAD_SPINLOCK_T@ -HAVE_PTHREAD_T = @HAVE_PTHREAD_T@ -HAVE_PTSNAME = @HAVE_PTSNAME@ -HAVE_PTSNAME_R = @HAVE_PTSNAME_R@ -HAVE_PWRITE = @HAVE_PWRITE@ -HAVE_RAISE = @HAVE_RAISE@ -HAVE_RANDOM = @HAVE_RANDOM@ -HAVE_RANDOM_H = @HAVE_RANDOM_H@ -HAVE_RANDOM_R = @HAVE_RANDOM_R@ -HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@ -HAVE_READDIR = @HAVE_READDIR@ -HAVE_READLINK = @HAVE_READLINK@ -HAVE_READLINKAT = @HAVE_READLINKAT@ -HAVE_REALPATH = @HAVE_REALPATH@ -HAVE_REMAINDER = @HAVE_REMAINDER@ -HAVE_REMAINDERF = @HAVE_REMAINDERF@ -HAVE_RENAMEAT = @HAVE_RENAMEAT@ -HAVE_REWINDDIR = @HAVE_REWINDDIR@ -HAVE_RINT = @HAVE_RINT@ -HAVE_RINTL = @HAVE_RINTL@ -HAVE_RPMATCH = @HAVE_RPMATCH@ -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_SETENV = @HAVE_SETENV@ -HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@ -HAVE_SIGACTION = @HAVE_SIGACTION@ -HAVE_SIGHANDLER_T = @HAVE_SIGHANDLER_T@ -HAVE_SIGINFO_T = @HAVE_SIGINFO_T@ -HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ -HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@ -HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@ -HAVE_SIGSET_T = @HAVE_SIGSET_T@ -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@ -HAVE_STPCPY = @HAVE_STPCPY@ -HAVE_STPNCPY = @HAVE_STPNCPY@ -HAVE_STRCASECMP = @HAVE_STRCASECMP@ -HAVE_STRCASESTR = @HAVE_STRCASESTR@ -HAVE_STRCHRNUL = @HAVE_STRCHRNUL@ -HAVE_STRINGS_H = @HAVE_STRINGS_H@ -HAVE_STRPBRK = @HAVE_STRPBRK@ -HAVE_STRPTIME = @HAVE_STRPTIME@ -HAVE_STRSEP = @HAVE_STRSEP@ -HAVE_STRTOD = @HAVE_STRTOD@ -HAVE_STRTOLL = @HAVE_STRTOLL@ -HAVE_STRTOULL = @HAVE_STRTOULL@ -HAVE_STRUCT_ADDRINFO = @HAVE_STRUCT_ADDRINFO@ -HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@ -HAVE_STRUCT_SCHED_PARAM = @HAVE_STRUCT_SCHED_PARAM@ -HAVE_STRUCT_SIGACTION_SA_SIGACTION = @HAVE_STRUCT_SIGACTION_SA_SIGACTION@ -HAVE_STRUCT_SOCKADDR_STORAGE = @HAVE_STRUCT_SOCKADDR_STORAGE@ -HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY = @HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY@ -HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@ -HAVE_STRUCT_UTSNAME = @HAVE_STRUCT_UTSNAME@ -HAVE_STRVERSCMP = @HAVE_STRVERSCMP@ -HAVE_SYMLINK = @HAVE_SYMLINK@ -HAVE_SYMLINKAT = @HAVE_SYMLINKAT@ -HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@ -HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@ -HAVE_SYS_IOCTL_H = @HAVE_SYS_IOCTL_H@ -HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@ -HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ -HAVE_SYS_RESOURCE_H = @HAVE_SYS_RESOURCE_H@ -HAVE_SYS_SELECT_H = @HAVE_SYS_SELECT_H@ -HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ -HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ -HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ -HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ -HAVE_SYS_UTSNAME_H = @HAVE_SYS_UTSNAME_H@ -HAVE_TANF = @HAVE_TANF@ -HAVE_TANHF = @HAVE_TANHF@ -HAVE_TANL = @HAVE_TANL@ -HAVE_TERMIOS_H = @HAVE_TERMIOS_H@ -HAVE_TIMEGM = @HAVE_TIMEGM@ -HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ -HAVE_UNAME = @HAVE_UNAME@ -HAVE_UNISTD_H = @HAVE_UNISTD_H@ -HAVE_UNLINKAT = @HAVE_UNLINKAT@ -HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ -HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ -HAVE_USLEEP = @HAVE_USLEEP@ -HAVE_UTIMENSAT = @HAVE_UTIMENSAT@ -HAVE_VASPRINTF = @HAVE_VASPRINTF@ -HAVE_VDPRINTF = @HAVE_VDPRINTF@ -HAVE_WCHAR_H = @HAVE_WCHAR_H@ -HAVE_WCHAR_T = @HAVE_WCHAR_T@ -HAVE_WCPCPY = @HAVE_WCPCPY@ -HAVE_WCPNCPY = @HAVE_WCPNCPY@ -HAVE_WCRTOMB = @HAVE_WCRTOMB@ -HAVE_WCSCASECMP = @HAVE_WCSCASECMP@ -HAVE_WCSCAT = @HAVE_WCSCAT@ -HAVE_WCSCHR = @HAVE_WCSCHR@ -HAVE_WCSCMP = @HAVE_WCSCMP@ -HAVE_WCSCOLL = @HAVE_WCSCOLL@ -HAVE_WCSCPY = @HAVE_WCSCPY@ -HAVE_WCSCSPN = @HAVE_WCSCSPN@ -HAVE_WCSDUP = @HAVE_WCSDUP@ -HAVE_WCSLEN = @HAVE_WCSLEN@ -HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@ -HAVE_WCSNCAT = @HAVE_WCSNCAT@ -HAVE_WCSNCMP = @HAVE_WCSNCMP@ -HAVE_WCSNCPY = @HAVE_WCSNCPY@ -HAVE_WCSNLEN = @HAVE_WCSNLEN@ -HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@ -HAVE_WCSPBRK = @HAVE_WCSPBRK@ -HAVE_WCSRCHR = @HAVE_WCSRCHR@ -HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@ -HAVE_WCSSPN = @HAVE_WCSSPN@ -HAVE_WCSSTR = @HAVE_WCSSTR@ -HAVE_WCSTOK = @HAVE_WCSTOK@ -HAVE_WCSWIDTH = @HAVE_WCSWIDTH@ -HAVE_WCSXFRM = @HAVE_WCSXFRM@ -HAVE_WCTRANS_T = @HAVE_WCTRANS_T@ -HAVE_WCTYPE_H = @HAVE_WCTYPE_H@ -HAVE_WCTYPE_T = @HAVE_WCTYPE_T@ -HAVE_WINSOCK2_H = @HAVE_WINSOCK2_H@ -HAVE_WINT_T = @HAVE_WINT_T@ -HAVE_WMEMCHR = @HAVE_WMEMCHR@ -HAVE_WMEMCMP = @HAVE_WMEMCMP@ -HAVE_WMEMCPY = @HAVE_WMEMCPY@ -HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ -HAVE_WMEMSET = @HAVE_WMEMSET@ -HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@ -HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ -HAVE__BOOL = @HAVE__BOOL@ -HAVE__EXIT = @HAVE__EXIT@ -HELP2MAN = @HELP2MAN@ -HOSTENT_LIB = @HOSTENT_LIB@ -ICONV_CONST = @ICONV_CONST@ -ICONV_H = @ICONV_H@ -IGNORE_UNUSED_LIBRARIES_CFLAGS = @IGNORE_UNUSED_LIBRARIES_CFLAGS@ -INCLUDE_NEXT = @INCLUDE_NEXT@ -INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@ -INET_NTOP_LIB = @INET_NTOP_LIB@ -INET_PTON_LIB = @INET_PTON_LIB@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTALL_SU = @INSTALL_SU@ -INT32_MAX_LT_INTMAX_MAX = @INT32_MAX_LT_INTMAX_MAX@ -INT64_MAX_EQ_LONG_MAX = @INT64_MAX_EQ_LONG_MAX@ -INTLLIBS = @INTLLIBS@ -INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ -LDFLAGS = @LDFLAGS@ -LIBCOREUTILS_LIBDEPS = @LIBCOREUTILS_LIBDEPS@ -LIBCOREUTILS_LTLIBDEPS = @LIBCOREUTILS_LTLIBDEPS@ -LIBICONV = @LIBICONV@ -LIBINTL = @LIBINTL@ -LIBMULTITHREAD = @LIBMULTITHREAD@ -LIBOBJS = @LIBOBJS@ -LIBPTH = @LIBPTH@ -LIBPTH_PREFIX = @LIBPTH_PREFIX@ -LIBS = @LIBS@ -LIBSOCKET = @LIBSOCKET@ -LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@ -LIBTHREAD = @LIBTHREAD@ -LIBUNISTRING_UNISTR_H = @LIBUNISTRING_UNISTR_H@ -LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@ -LIBUNISTRING_UNIWIDTH_H = @LIBUNISTRING_UNIWIDTH_H@ -LIB_ACL = @LIB_ACL@ -LIB_CAP = @LIB_CAP@ -LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ -LIB_CRYPT = @LIB_CRYPT@ -LIB_EACCESS = @LIB_EACCESS@ -LIB_FDATASYNC = @LIB_FDATASYNC@ -LIB_GETHRXTIME = @LIB_GETHRXTIME@ -LIB_GMP = @LIB_GMP@ -LIB_NANOSLEEP = @LIB_NANOSLEEP@ -LIB_PTHREAD = @LIB_PTHREAD@ -LIB_SELECT = @LIB_SELECT@ -LIB_SELINUX = @LIB_SELINUX@ -LIB_TIMER_TIME = @LIB_TIMER_TIME@ -LIB_XATTR = @LIB_XATTR@ -LN_S = @LN_S@ -LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@ -LOCALE_FR = @LOCALE_FR@ -LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@ -LOCALE_JA = @LOCALE_JA@ -LOCALE_TR_UTF8 = @LOCALE_TR_UTF8@ -LOCALE_ZH_CN = @LOCALE_ZH_CN@ -LTLIBICONV = @LTLIBICONV@ -LTLIBINTL = @LTLIBINTL@ -LTLIBMULTITHREAD = @LTLIBMULTITHREAD@ -LTLIBOBJS = @LTLIBOBJS@ -LTLIBPTH = @LTLIBPTH@ -LTLIBTHREAD = @LTLIBTHREAD@ -MAKEINFO = @MAKEINFO@ -MAN = @MAN@ -MKDIR_P = @MKDIR_P@ -MSGFMT = @MSGFMT@ -MSGFMT_015 = @MSGFMT_015@ -MSGMERGE = @MSGMERGE@ -NETINET_IN_H = @NETINET_IN_H@ -NEXT_ARPA_INET_H = @NEXT_ARPA_INET_H@ -NEXT_AS_FIRST_DIRECTIVE_ARPA_INET_H = @NEXT_AS_FIRST_DIRECTIVE_ARPA_INET_H@ -NEXT_AS_FIRST_DIRECTIVE_CTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_CTYPE_H@ -NEXT_AS_FIRST_DIRECTIVE_DIRENT_H = @NEXT_AS_FIRST_DIRECTIVE_DIRENT_H@ -NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@ -NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@ -NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@ -NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ -NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@ -NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@ -NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@ -NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@ -NEXT_AS_FIRST_DIRECTIVE_MATH_H = @NEXT_AS_FIRST_DIRECTIVE_MATH_H@ -NEXT_AS_FIRST_DIRECTIVE_NETDB_H = @NEXT_AS_FIRST_DIRECTIVE_NETDB_H@ -NEXT_AS_FIRST_DIRECTIVE_NETINET_IN_H = @NEXT_AS_FIRST_DIRECTIVE_NETINET_IN_H@ -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@ -NEXT_AS_FIRST_DIRECTIVE_STDIO_H = @NEXT_AS_FIRST_DIRECTIVE_STDIO_H@ -NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@ -NEXT_AS_FIRST_DIRECTIVE_STRINGS_H = @NEXT_AS_FIRST_DIRECTIVE_STRINGS_H@ -NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_IOCTL_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_IOCTL_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_RESOURCE_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_RESOURCE_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_UTSNAME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UTSNAME_H@ -NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H@ -NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H = @NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H@ -NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ -NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ -NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@ -NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@ -NEXT_CTYPE_H = @NEXT_CTYPE_H@ -NEXT_DIRENT_H = @NEXT_DIRENT_H@ -NEXT_ERRNO_H = @NEXT_ERRNO_H@ -NEXT_FCNTL_H = @NEXT_FCNTL_H@ -NEXT_FLOAT_H = @NEXT_FLOAT_H@ -NEXT_GETOPT_H = @NEXT_GETOPT_H@ -NEXT_ICONV_H = @NEXT_ICONV_H@ -NEXT_INTTYPES_H = @NEXT_INTTYPES_H@ -NEXT_LANGINFO_H = @NEXT_LANGINFO_H@ -NEXT_LOCALE_H = @NEXT_LOCALE_H@ -NEXT_MATH_H = @NEXT_MATH_H@ -NEXT_NETDB_H = @NEXT_NETDB_H@ -NEXT_NETINET_IN_H = @NEXT_NETINET_IN_H@ -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@ -NEXT_STDIO_H = @NEXT_STDIO_H@ -NEXT_STDLIB_H = @NEXT_STDLIB_H@ -NEXT_STRINGS_H = @NEXT_STRINGS_H@ -NEXT_STRING_H = @NEXT_STRING_H@ -NEXT_SYS_IOCTL_H = @NEXT_SYS_IOCTL_H@ -NEXT_SYS_RESOURCE_H = @NEXT_SYS_RESOURCE_H@ -NEXT_SYS_SELECT_H = @NEXT_SYS_SELECT_H@ -NEXT_SYS_SOCKET_H = @NEXT_SYS_SOCKET_H@ -NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ -NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@ -NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ -NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ -NEXT_SYS_UTSNAME_H = @NEXT_SYS_UTSNAME_H@ -NEXT_SYS_WAIT_H = @NEXT_SYS_WAIT_H@ -NEXT_TERMIOS_H = @NEXT_TERMIOS_H@ -NEXT_TIME_H = @NEXT_TIME_H@ -NEXT_UNISTD_H = @NEXT_UNISTD_H@ -NEXT_WCHAR_H = @NEXT_WCHAR_H@ -NEXT_WCTYPE_H = @NEXT_WCTYPE_H@ -NO_INSTALL_PROGS_DEFAULT = @NO_INSTALL_PROGS_DEFAULT@ -OBJEXT = @OBJEXT@ -OPTIONAL_BIN_PROGS = @OPTIONAL_BIN_PROGS@ -OPTIONAL_PKGLIB_PROGS = @OPTIONAL_PKGLIB_PROGS@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL = @PERL@ -POSIX_SHELL = @POSIX_SHELL@ -POSUB = @POSUB@ -PRAGMA_COLUMNS = @PRAGMA_COLUMNS@ -PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ -PREFERABLY_POSIX_SHELL = @PREFERABLY_POSIX_SHELL@ -PRIPTR_PREFIX = @PRIPTR_PREFIX@ -PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ -PTHREAD_H = @PTHREAD_H@ -PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ -PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ -RANLIB = @RANLIB@ -REPLACE_BTOWC = @REPLACE_BTOWC@ -REPLACE_CALLOC = @REPLACE_CALLOC@ -REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ -REPLACE_CBRTF = @REPLACE_CBRTF@ -REPLACE_CBRTL = @REPLACE_CBRTL@ -REPLACE_CEIL = @REPLACE_CEIL@ -REPLACE_CEILF = @REPLACE_CEILF@ -REPLACE_CEILL = @REPLACE_CEILL@ -REPLACE_CHOWN = @REPLACE_CHOWN@ -REPLACE_CLOSE = @REPLACE_CLOSE@ -REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@ -REPLACE_DIRFD = @REPLACE_DIRFD@ -REPLACE_DPRINTF = @REPLACE_DPRINTF@ -REPLACE_DUP = @REPLACE_DUP@ -REPLACE_DUP2 = @REPLACE_DUP2@ -REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@ -REPLACE_EXP2 = @REPLACE_EXP2@ -REPLACE_EXP2L = @REPLACE_EXP2L@ -REPLACE_EXPM1 = @REPLACE_EXPM1@ -REPLACE_EXPM1F = @REPLACE_EXPM1F@ -REPLACE_FABSL = @REPLACE_FABSL@ -REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ -REPLACE_FCLOSE = @REPLACE_FCLOSE@ -REPLACE_FCNTL = @REPLACE_FCNTL@ -REPLACE_FDOPEN = @REPLACE_FDOPEN@ -REPLACE_FDOPENDIR = @REPLACE_FDOPENDIR@ -REPLACE_FFLUSH = @REPLACE_FFLUSH@ -REPLACE_FLOOR = @REPLACE_FLOOR@ -REPLACE_FLOORF = @REPLACE_FLOORF@ -REPLACE_FLOORL = @REPLACE_FLOORL@ -REPLACE_FMA = @REPLACE_FMA@ -REPLACE_FMAF = @REPLACE_FMAF@ -REPLACE_FMAL = @REPLACE_FMAL@ -REPLACE_FMOD = @REPLACE_FMOD@ -REPLACE_FMODF = @REPLACE_FMODF@ -REPLACE_FMODL = @REPLACE_FMODL@ -REPLACE_FOPEN = @REPLACE_FOPEN@ -REPLACE_FPRINTF = @REPLACE_FPRINTF@ -REPLACE_FPURGE = @REPLACE_FPURGE@ -REPLACE_FREOPEN = @REPLACE_FREOPEN@ -REPLACE_FREXP = @REPLACE_FREXP@ -REPLACE_FREXPF = @REPLACE_FREXPF@ -REPLACE_FREXPL = @REPLACE_FREXPL@ -REPLACE_FSEEK = @REPLACE_FSEEK@ -REPLACE_FSEEKO = @REPLACE_FSEEKO@ -REPLACE_FSTAT = @REPLACE_FSTAT@ -REPLACE_FSTATAT = @REPLACE_FSTATAT@ -REPLACE_FTELL = @REPLACE_FTELL@ -REPLACE_FTELLO = @REPLACE_FTELLO@ -REPLACE_FTRUNCATE = @REPLACE_FTRUNCATE@ -REPLACE_FUTIMENS = @REPLACE_FUTIMENS@ -REPLACE_GAI_STRERROR = @REPLACE_GAI_STRERROR@ -REPLACE_GETCWD = @REPLACE_GETCWD@ -REPLACE_GETDELIM = @REPLACE_GETDELIM@ -REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ -REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ -REPLACE_GETLINE = @REPLACE_GETLINE@ -REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ -REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ -REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ -REPLACE_HUGE_VAL = @REPLACE_HUGE_VAL@ -REPLACE_HYPOT = @REPLACE_HYPOT@ -REPLACE_HYPOTF = @REPLACE_HYPOTF@ -REPLACE_HYPOTL = @REPLACE_HYPOTL@ -REPLACE_ICONV = @REPLACE_ICONV@ -REPLACE_ICONV_OPEN = @REPLACE_ICONV_OPEN@ -REPLACE_ICONV_UTF = @REPLACE_ICONV_UTF@ -REPLACE_ILOGB = @REPLACE_ILOGB@ -REPLACE_ILOGBF = @REPLACE_ILOGBF@ -REPLACE_INET_NTOP = @REPLACE_INET_NTOP@ -REPLACE_INET_PTON = @REPLACE_INET_PTON@ -REPLACE_IOCTL = @REPLACE_IOCTL@ -REPLACE_ISATTY = @REPLACE_ISATTY@ -REPLACE_ISFINITE = @REPLACE_ISFINITE@ -REPLACE_ISINF = @REPLACE_ISINF@ -REPLACE_ISNAN = @REPLACE_ISNAN@ -REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ -REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ -REPLACE_ITOLD = @REPLACE_ITOLD@ -REPLACE_LCHOWN = @REPLACE_LCHOWN@ -REPLACE_LDEXPL = @REPLACE_LDEXPL@ -REPLACE_LINK = @REPLACE_LINK@ -REPLACE_LINKAT = @REPLACE_LINKAT@ -REPLACE_LOCALECONV = @REPLACE_LOCALECONV@ -REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@ -REPLACE_LOG = @REPLACE_LOG@ -REPLACE_LOG10 = @REPLACE_LOG10@ -REPLACE_LOG10F = @REPLACE_LOG10F@ -REPLACE_LOG10L = @REPLACE_LOG10L@ -REPLACE_LOG1P = @REPLACE_LOG1P@ -REPLACE_LOG1PF = @REPLACE_LOG1PF@ -REPLACE_LOG1PL = @REPLACE_LOG1PL@ -REPLACE_LOG2 = @REPLACE_LOG2@ -REPLACE_LOG2F = @REPLACE_LOG2F@ -REPLACE_LOG2L = @REPLACE_LOG2L@ -REPLACE_LOGB = @REPLACE_LOGB@ -REPLACE_LOGBF = @REPLACE_LOGBF@ -REPLACE_LOGBL = @REPLACE_LOGBL@ -REPLACE_LOGF = @REPLACE_LOGF@ -REPLACE_LOGL = @REPLACE_LOGL@ -REPLACE_LSEEK = @REPLACE_LSEEK@ -REPLACE_LSTAT = @REPLACE_LSTAT@ -REPLACE_MALLOC = @REPLACE_MALLOC@ -REPLACE_MBRLEN = @REPLACE_MBRLEN@ -REPLACE_MBRTOWC = @REPLACE_MBRTOWC@ -REPLACE_MBSINIT = @REPLACE_MBSINIT@ -REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@ -REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@ -REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@ -REPLACE_MBTOWC = @REPLACE_MBTOWC@ -REPLACE_MEMCHR = @REPLACE_MEMCHR@ -REPLACE_MEMMEM = @REPLACE_MEMMEM@ -REPLACE_MKDIR = @REPLACE_MKDIR@ -REPLACE_MKFIFO = @REPLACE_MKFIFO@ -REPLACE_MKNOD = @REPLACE_MKNOD@ -REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ -REPLACE_MKTIME = @REPLACE_MKTIME@ -REPLACE_MODF = @REPLACE_MODF@ -REPLACE_MODFF = @REPLACE_MODFF@ -REPLACE_MODFL = @REPLACE_MODFL@ -REPLACE_NAN = @REPLACE_NAN@ -REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@ -REPLACE_NL_LANGINFO = @REPLACE_NL_LANGINFO@ -REPLACE_NULL = @REPLACE_NULL@ -REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@ -REPLACE_OPEN = @REPLACE_OPEN@ -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@ -REPLACE_PTHREAD_SIGMASK = @REPLACE_PTHREAD_SIGMASK@ -REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@ -REPLACE_PUTENV = @REPLACE_PUTENV@ -REPLACE_PWRITE = @REPLACE_PWRITE@ -REPLACE_RAISE = @REPLACE_RAISE@ -REPLACE_RANDOM_R = @REPLACE_RANDOM_R@ -REPLACE_READ = @REPLACE_READ@ -REPLACE_READLINK = @REPLACE_READLINK@ -REPLACE_REALLOC = @REPLACE_REALLOC@ -REPLACE_REALPATH = @REPLACE_REALPATH@ -REPLACE_REMAINDER = @REPLACE_REMAINDER@ -REPLACE_REMAINDERF = @REPLACE_REMAINDERF@ -REPLACE_REMAINDERL = @REPLACE_REMAINDERL@ -REPLACE_REMOVE = @REPLACE_REMOVE@ -REPLACE_RENAME = @REPLACE_RENAME@ -REPLACE_RENAMEAT = @REPLACE_RENAMEAT@ -REPLACE_RMDIR = @REPLACE_RMDIR@ -REPLACE_ROUND = @REPLACE_ROUND@ -REPLACE_ROUNDF = @REPLACE_ROUNDF@ -REPLACE_ROUNDL = @REPLACE_ROUNDL@ -REPLACE_SELECT = @REPLACE_SELECT@ -REPLACE_SETENV = @REPLACE_SETENV@ -REPLACE_SETLOCALE = @REPLACE_SETLOCALE@ -REPLACE_SIGNBIT = @REPLACE_SIGNBIT@ -REPLACE_SIGNBIT_USING_GCC = @REPLACE_SIGNBIT_USING_GCC@ -REPLACE_SLEEP = @REPLACE_SLEEP@ -REPLACE_SNPRINTF = @REPLACE_SNPRINTF@ -REPLACE_SPRINTF = @REPLACE_SPRINTF@ -REPLACE_SQRTL = @REPLACE_SQRTL@ -REPLACE_STAT = @REPLACE_STAT@ -REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@ -REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@ -REPLACE_STPNCPY = @REPLACE_STPNCPY@ -REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ -REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ -REPLACE_STRDUP = @REPLACE_STRDUP@ -REPLACE_STRERROR = @REPLACE_STRERROR@ -REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ -REPLACE_STRNCAT = @REPLACE_STRNCAT@ -REPLACE_STRNDUP = @REPLACE_STRNDUP@ -REPLACE_STRNLEN = @REPLACE_STRNLEN@ -REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@ -REPLACE_STRSTR = @REPLACE_STRSTR@ -REPLACE_STRTOD = @REPLACE_STRTOD@ -REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@ -REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ -REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@ -REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ -REPLACE_SYMLINK = @REPLACE_SYMLINK@ -REPLACE_TIMEGM = @REPLACE_TIMEGM@ -REPLACE_TMPFILE = @REPLACE_TMPFILE@ -REPLACE_TOWLOWER = @REPLACE_TOWLOWER@ -REPLACE_TRUNC = @REPLACE_TRUNC@ -REPLACE_TRUNCF = @REPLACE_TRUNCF@ -REPLACE_TRUNCL = @REPLACE_TRUNCL@ -REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@ -REPLACE_UNLINK = @REPLACE_UNLINK@ -REPLACE_UNLINKAT = @REPLACE_UNLINKAT@ -REPLACE_UNSETENV = @REPLACE_UNSETENV@ -REPLACE_USLEEP = @REPLACE_USLEEP@ -REPLACE_UTIMENSAT = @REPLACE_UTIMENSAT@ -REPLACE_VASPRINTF = @REPLACE_VASPRINTF@ -REPLACE_VDPRINTF = @REPLACE_VDPRINTF@ -REPLACE_VFPRINTF = @REPLACE_VFPRINTF@ -REPLACE_VPRINTF = @REPLACE_VPRINTF@ -REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@ -REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ -REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ -REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ -REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ -REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ -REPLACE_WCTOB = @REPLACE_WCTOB@ -REPLACE_WCTOMB = @REPLACE_WCTOMB@ -REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ -REPLACE_WRITE = @REPLACE_WRITE@ -SCHED_H = @SCHED_H@ -SELINUX_CONTEXT_H = @SELINUX_CONTEXT_H@ -SEQ_LIBM = @SEQ_LIBM@ -SERVENT_LIB = @SERVENT_LIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ -SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ -STDALIGN_H = @STDALIGN_H@ -STDARG_H = @STDARG_H@ -STDBOOL_H = @STDBOOL_H@ -STDDEF_H = @STDDEF_H@ -STDINT_H = @STDINT_H@ -STRIP = @STRIP@ -SYS_IOCTL_H_HAVE_WINSOCK2_H = @SYS_IOCTL_H_HAVE_WINSOCK2_H@ -SYS_IOCTL_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @SYS_IOCTL_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ -SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ -TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ -UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@ -UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@ -UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ -UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ -UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ -USE_ACL = @USE_ACL@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WARN_CFLAGS = @WARN_CFLAGS@ -WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ -WERROR_CFLAGS = @WERROR_CFLAGS@ -WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@ -WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@ -WINT_T_SUFFIX = @WINT_T_SUFFIX@ -XGETTEXT = @XGETTEXT@ -XGETTEXT_015 = @XGETTEXT_015@ -XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ -YACC = @YACC@ -YFLAGS = @YFLAGS@ -YIELD_LIB = @YIELD_LIB@ -abs_aux_dir = @abs_aux_dir@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -gl_LIBOBJS = @gl_LIBOBJS@ -gl_LTLIBOBJS = @gl_LTLIBOBJS@ -gltests_LIBOBJS = @gltests_LIBOBJS@ -gltests_LTLIBOBJS = @gltests_LTLIBOBJS@ -gltests_WITNESS = @gltests_WITNESS@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -lispdir = @lispdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ - -# Sort in traditional ASCII order, regardless of the current locale; -# otherwise we may get into trouble with distinct strings that the -# current locale considers to be equal. -ASSORT = LC_ALL=C sort -EXTRA_DIST = Coreutils.pm CuSkip.pm CuTmpdir.pm check.mk d_type-check \ - envvar-check filefrag-extent-compare fiemap-capable init.cfg \ - init.sh lang-default other-fs-tmpdir sample-test shell-or-perl \ - $(pr_data) $(TESTS) -root_tests = \ - chown/basic \ - cp/cp-a-selinux \ - cp/preserve-gid \ - cp/special-bits \ - cp/cp-mv-enotsup-xattr \ - cp/capability \ - cp/sparse-fiemap \ - dd/skip-seek-past-dev \ - install/install-C-root \ - ls/capability \ - ls/nameless-uid \ - misc/chcon \ - misc/chroot-credentials \ - misc/id-setgid \ - misc/selinux \ - misc/truncate-owned-by-other \ - mkdir/writable-under-readonly \ - mv/sticky-to-xpart \ - rm/fail-2eperm \ - rm/no-give-up \ - rm/one-file-system \ - rm/read-only \ - tail-2/append-only \ - touch/now-owned-by-other - - -# Do not choose a name that is a shell keyword like 'if', or a -# commonly-used utility like 'cat' or 'test', as the name of a test. -# Otherwise, VPATH builds will fail on hosts like Solaris, since they -# will expand 'if test ...' to 'if .../test ...', and the '.../test' -# will execute the test script rather than the standard utility. - -# Notes on the ordering of these tests: -# Place early in the list tests of the tools that -# are most commonly used in test scripts themselves. -# E.g., nearly every test script uses rm and chmod. -# help-version comes early because it's a basic sanity test. -# Put seq early, since lots of other tests use it. -# Put tests that sleep early, but not all together, so in parallel builds -# they share time with tests that burn CPU, not with others that sleep. -# Put head-elide-tail early, because it's long-running. -TESTS = \ - misc/help-version \ - tail-2/inotify-race \ - misc/invalid-opt \ - rm/ext3-perf \ - rm/cycle \ - cp/link-heap \ - misc/tty-eof \ - tail-2/inotify-hash-abuse \ - tail-2/inotify-hash-abuse2 \ - tail-2/F-vs-missing \ - tail-2/F-vs-rename \ - tail-2/inotify-rotate \ - chmod/no-x \ - chgrp/basic \ - rm/dangling-symlink \ - misc/ls-time \ - rm/deep-1 \ - rm/deep-2 \ - rm/dir-no-w \ - rm/dir-nonrecur \ - rm/dot-rel \ - rm/isatty \ - rm/empty-inacc \ - rm/empty-name \ - rm/f-1 \ - rm/fail-eacces \ - rm/fail-eperm \ - tail-2/assert \ - rm/hash \ - rm/i-1 \ - rm/i-never \ - rm/i-no-r \ - tail-2/infloop-1 \ - rm/ignorable \ - rm/inaccessible \ - rm/interactive-always \ - rm/interactive-once \ - rm/ir-1 \ - rm/one-file-system2 \ - rm/r-1 \ - rm/r-2 \ - rm/r-3 \ - rm/r-4 \ - rm/readdir-bug \ - rm/rm1 \ - touch/empty-file \ - rm/rm2 \ - rm/rm3 \ - rm/rm4 \ - rm/rm5 \ - rm/sunos-1 \ - rm/unread2 \ - rm/unread3 \ - rm/unreadable \ - rm/v-slash \ - rm/many-dir-entries-vs-OOM \ - chgrp/default-no-deref \ - chgrp/deref \ - chgrp/no-x \ - chgrp/posix-H \ - chgrp/recurse \ - fmt/base \ - fmt/long-line \ - fmt/goal-option \ - misc/env \ - misc/ptx \ - misc/test \ - misc/seq \ - misc/seq-long-double \ - misc/head \ - misc/head-elide-tail \ - tail-2/tail-n0f \ - misc/ls-misc \ - misc/date \ - misc/date-next-dow \ - misc/ptx-overrun \ - misc/xstrtol \ - tail-2/pid \ - misc/od \ - misc/od-float \ - misc/mktemp \ - misc/arch \ - misc/pr \ - misc/join \ - pr/pr-tests \ - misc/df-P \ - misc/pwd-option \ - misc/chcon-fail \ - misc/cut \ - misc/wc \ - misc/wc-files0-from \ - misc/wc-files0 \ - misc/wc-parallel \ - misc/cat-proc \ - misc/cat-buf \ - misc/base64 \ - misc/basename \ - misc/close-stdout \ - misc/chroot-fail \ - misc/comm \ - misc/csplit \ - misc/csplit-1000 \ - misc/csplit-heap \ - misc/date-sec \ - misc/dircolors \ - misc/df \ - misc/dirname \ - misc/env-null \ - misc/expand \ - misc/expr \ - misc/factor \ - misc/false-status \ - misc/fold \ - misc/groups-dash \ - misc/groups-version \ - misc/head-c \ - misc/head-pos \ - misc/id-context \ - misc/id-groups \ - misc/id-setgid \ - misc/md5sum \ - misc/md5sum-bsd \ - misc/md5sum-newline \ - misc/md5sum-parallel \ - misc/mknod \ - misc/nice \ - misc/nice-fail \ - misc/nl \ - misc/nohup \ - misc/nproc-avail \ - misc/nproc-positive \ - misc/od-N \ - misc/od-multiple-t \ - misc/od-x8 \ - misc/paste \ - misc/pathchk1 \ - misc/printenv \ - misc/printf \ - misc/printf-cov \ - misc/printf-hex \ - misc/printf-surprise \ - misc/pwd-long \ - misc/readlink-fp-loop \ - misc/readlink-root \ - misc/realpath \ - misc/runcon-no-reorder \ - misc/sha1sum \ - misc/sha1sum-vec \ - misc/sha224sum \ - misc/sha256sum \ - misc/sha384sum \ - misc/sha512sum \ - misc/shred-exact \ - misc/shred-passes \ - misc/shred-remove \ - misc/shuf \ - misc/sort \ - misc/sort-benchmark-random \ - misc/sort-compress \ - misc/sort-compress-hang \ - misc/sort-compress-proc \ - misc/sort-continue \ - misc/sort-debug-keys \ - misc/sort-debug-warn \ - misc/sort-discrim \ - misc/sort-files0-from \ - misc/sort-float \ - misc/sort-merge \ - misc/sort-merge-fdlimit \ - misc/sort-month \ - misc/sort-rand \ - misc/sort-spinlock-abuse \ - misc/sort-stale-thread-mem \ - misc/sort-unique \ - misc/sort-unique-segv \ - misc/sort-version \ - misc/sort-NaN-infloop \ - split/filter \ - split/suffix-auto-length \ - split/suffix-length \ - split/additional-suffix \ - split/b-chunk \ - split/fail \ - split/lines \ - split/l-chunk \ - split/r-chunk \ - split/numeric \ - misc/stat-birthtime \ - misc/stat-fmt \ - misc/stat-hyphen \ - misc/stat-mount \ - misc/stat-nanoseconds \ - misc/stat-printf \ - misc/stat-slash \ - misc/stdbuf \ - misc/stty \ - misc/stty-invalid \ - misc/stty-pairs \ - misc/stty-row-col \ - misc/su-fail \ - misc/sum \ - misc/sum-sysv \ - misc/tac \ - misc/tac-continue \ - misc/tac-2-nonseekable \ - misc/tail \ - misc/tee \ - misc/tee-dash \ - misc/test-diag \ - misc/timeout \ - misc/timeout-group \ - misc/timeout-parameters \ - misc/tr \ - misc/tr-case-class \ - misc/truncate-dangling-symlink \ - misc/truncate-dir-fail \ - misc/truncate-fail-diag \ - misc/truncate-fifo \ - misc/truncate-no-create-missing \ - misc/truncate-overflow \ - misc/truncate-parameters \ - misc/truncate-relative \ - misc/tsort \ - misc/unexpand \ - misc/uniq \ - misc/uniq-perf \ - misc/xattr \ - tail-2/wait \ - chmod/c-option \ - chmod/equal-x \ - chmod/equals \ - chmod/inaccessible \ - chmod/octal \ - chmod/setgid \ - chmod/silent \ - chmod/thru-dangling \ - chmod/umask-x \ - chmod/usage \ - chown/deref \ - chown/preserve-root \ - chown/separator \ - cp/abuse \ - cp/acl \ - cp/attr-existing \ - cp/backup-1 \ - cp/backup-dir \ - cp/backup-is-src \ - cp/cp-HL \ - cp/cp-deref \ - cp/cp-i \ - cp/cp-mv-backup \ - cp/cp-parents \ - cp/deref-slink \ - cp/dir-rm-dest \ - cp/dir-slash \ - cp/dir-vs-file \ - cp/existing-perm-dir \ - cp/existing-perm-race \ - cp/fail-perm \ - cp/fiemap-empty \ - cp/fiemap-perf \ - cp/fiemap-2 \ - cp/file-perm-race \ - cp/into-self \ - cp/link \ - cp/link-no-deref \ - cp/link-preserve \ - cp/link-symlink \ - cp/nfs-removal-race \ - cp/no-deref-link1 \ - cp/no-deref-link2 \ - cp/no-deref-link3 \ - cp/parent-perm \ - cp/parent-perm-race \ - cp/perm \ - cp/preserve-2 \ - cp/preserve-link \ - cp/preserve-slink-time \ - cp/proc-short-read \ - cp/proc-zero-len \ - cp/r-vs-symlink \ - cp/reflink-auto \ - cp/reflink-perm \ - cp/same-file \ - cp/slink-2-slink \ - cp/sparse \ - cp/sparse-to-pipe \ - cp/special-f \ - cp/src-base-dot \ - cp/symlink-slash \ - cp/thru-dangling \ - df/unreadable \ - dd/direct \ - dd/misc \ - dd/nocache \ - dd/not-rewound \ - dd/reblock \ - dd/skip-seek \ - dd/skip-seek2 \ - dd/bytes \ - dd/skip-seek-past-file \ - dd/sparse \ - dd/stderr \ - dd/unblock \ - dd/unblock-sync \ - df/total-verify \ - du/2g \ - du/8gb \ - du/basic \ - du/bigtime \ - du/deref \ - du/deref-args \ - du/exclude \ - du/fd-leak \ - du/files0-from \ - du/files0-from-dir \ - du/hard-link \ - du/inacc-dest \ - du/inacc-dir \ - du/inaccessible-cwd \ - du/long-from-unreadable \ - du/long-sloop \ - du/max-depth \ - du/move-dir-while-traversing \ - du/no-deref \ - du/no-x \ - du/one-file-system \ - du/restore-wd \ - du/slash \ - du/slink \ - du/trailing-slash \ - du/two-args \ - id/gnu-zero-uids \ - id/no-context \ - install/basic-1 \ - install/create-leading \ - install/d-slashdot \ - install/install-C \ - install/install-C-selinux \ - install/strip-program \ - install/trap \ - ln/backup-1 \ - ln/hard-backup \ - ln/hard-to-sym \ - ln/misc \ - ln/relative \ - ln/sf-1 \ - ln/slash-decorated-nonexistent-dest \ - ln/target-1 \ - ls/abmon-align \ - ls/block-size \ - ls/color-clear-to-eol \ - ls/color-dtype-dir \ - ls/color-norm \ - ls/dangle \ - ls/dired \ - ls/file-type \ - ls/follow-slink \ - ls/getxattr-speedup \ - ls/infloop \ - ls/inode \ - ls/m-option \ - ls/multihardlink \ - ls/no-arg \ - ls/no-cap \ - ls/proc-selinux-segfault \ - ls/readdir-mountpoint-inode \ - ls/recursive \ - ls/rt-1 \ - ls/slink-acl \ - ls/stat-dtype \ - ls/stat-failed \ - ls/stat-free-color \ - ls/stat-free-symlinks \ - ls/stat-vs-dirent \ - ls/symlink-slash \ - ls/time-style-diag \ - ls/x-option \ - mkdir/p-1 \ - mkdir/p-2 \ - mkdir/p-3 \ - mkdir/p-slashdot \ - mkdir/p-thru-slink \ - mkdir/p-v \ - mkdir/parents \ - mkdir/perm \ - mkdir/selinux \ - mkdir/special-1 \ - mkdir/t-slash \ - mv/acl \ - mv/atomic \ - mv/atomic2 \ - mv/backup-dir \ - mv/backup-is-src \ - mv/childproof \ - mv/diag \ - mv/dir-file \ - mv/dir2dir \ - mv/dup-source \ - mv/force \ - mv/hard-2 \ - mv/hard-3 \ - mv/hard-4 \ - mv/hard-link-1 \ - mv/hard-verbose \ - mv/i-1 \ - mv/i-2 \ - mv/i-3 \ - mv/i-4 \ - mv/i-5 \ - mv/i-link-no \ - mv/into-self \ - mv/into-self-2 \ - mv/into-self-3 \ - mv/into-self-4 \ - mv/leak-fd \ - mv/mv-n \ - mv/mv-special-1 \ - mv/no-target-dir \ - mv/part-fail \ - mv/part-hardlink \ - mv/part-rename \ - mv/part-symlink \ - mv/partition-perm \ - mv/perm-1 \ - mv/symlink-onto-hardlink \ - mv/symlink-onto-hardlink-to-self \ - mv/to-symlink \ - mv/trailing-slash \ - mv/update \ - readlink/can-e \ - readlink/can-f \ - readlink/can-m \ - readlink/rl-1 \ - rmdir/fail-perm \ - rmdir/ignore \ - rmdir/t-slash \ - tail-2/assert-2 \ - tail-2/big-4gb \ - tail-2/flush-initial \ - tail-2/follow-name \ - tail-2/follow-stdin \ - tail-2/pipe-f \ - tail-2/pipe-f2 \ - tail-2/proc-ksyms \ - tail-2/start-middle \ - touch/60-seconds \ - touch/dangling-symlink \ - touch/dir-1 \ - touch/fail-diag \ - touch/fifo \ - touch/no-create-missing \ - touch/no-dereference \ - touch/no-rights \ - touch/not-owner \ - touch/obsolescent \ - touch/read-only \ - touch/relative \ - touch/trailing-slash \ - $(root_tests) - -pr_data = \ - pr/0F \ - pr/0FF \ - pr/0FFnt \ - pr/0FFt \ - pr/0FnFnt \ - pr/0FnFt \ - pr/0Fnt \ - pr/0Ft \ - pr/2-S_f-t_notab \ - pr/2-Sf-t_notab \ - pr/2f-t_notab \ - pr/2s_f-t_notab \ - pr/2s_w60f-t_nota \ - pr/2sf-t_notab \ - pr/2sw60f-t_notab \ - pr/2w60f-t_notab \ - pr/3-0F \ - pr/3-5l24f-t \ - pr/3-FF \ - pr/3a2l17-FF \ - pr/3a3f-0F \ - pr/3a3l15-t \ - pr/3a3l15f-t \ - pr/3b2l17-FF \ - pr/3b3f-0F \ - pr/3b3f-0FF \ - pr/3b3f-FF \ - pr/3b3l15-t \ - pr/3b3l15f-t \ - pr/3f-0F \ - pr/3f-FF \ - pr/3l24-t \ - pr/3l24f-t \ - pr/3ml24-FF \ - pr/3ml24-t \ - pr/3ml24-t-FF \ - pr/3ml24f-t \ - pr/4-7l24-FF \ - pr/4l24-FF \ - pr/FF \ - pr/FFn \ - pr/FFtn \ - pr/FnFn \ - pr/Ja3l24f-lm \ - pr/Jb3l24f-lm \ - pr/Jml24f-lm-lo \ - pr/W-72l24f-ll \ - pr/W20l24f-ll \ - pr/W26l24f-ll \ - pr/W27l24f-ll \ - pr/W28l24f-ll \ - pr/W35Ja3l24f-lm \ - pr/W35Jb3l24f-lm \ - pr/W35Jml24f-lmlo \ - pr/W35a3l24f-lm \ - pr/W35b3l24f-lm \ - pr/W35ml24f-lm-lo \ - pr/W72Jl24f-ll \ - pr/a2l15-FF \ - pr/a2l17-FF \ - pr/a3-0F \ - pr/a3f-0F \ - pr/a3f-0FF \ - pr/a3f-FF \ - pr/a3l15-t \ - pr/a3l15f-t \ - pr/a3l24f-lm \ - pr/b2l15-FF \ - pr/b2l17-FF \ - pr/b3-0F \ - pr/b3f-0F \ - pr/b3f-0FF \ - pr/b3f-FF \ - pr/b3l15-t \ - pr/b3l15f-t \ - pr/b3l24f-lm \ - pr/l24-FF \ - pr/l24-t \ - pr/l24f-t \ - pr/loli \ - pr/ml20-FF-t \ - pr/ml24-FF \ - pr/ml24-t \ - pr/ml24-t-FF \ - pr/ml24f-0F \ - pr/ml24f-lm-lo \ - pr/ml24f-t \ - pr/ml24f-t-0F \ - pr/n+2-5l24f-0FF \ - pr/n+2l24f-0FF \ - pr/n+2l24f-bl \ - pr/n+3-7l24-FF \ - pr/n+3l24f-0FF \ - pr/n+3l24f-bl \ - pr/n+3ml20f-bl-FF \ - pr/n+3ml24f-bl-tn \ - pr/n+3ml24f-tn-bl \ - pr/n+4-8a2l17-FF \ - pr/n+4b2l17f-0FF \ - pr/n+5-8b3l17f-FF \ - pr/n+5a3l13f-0FF \ - pr/n+6a2l17-FF \ - pr/n+6b3l13f-FF \ - pr/n+7l24-FF \ - pr/n+8l20-FF \ - pr/nJml24f-lmlmlo \ - pr/nJml24f-lmlolm \ - pr/nN1+3l24f-bl \ - pr/nN15l24f-bl \ - pr/nSml20-bl-FF \ - pr/nSml20-t-t-FF \ - pr/nSml20-t-tFFFF \ - pr/nSml24-bl-FF \ - pr/nSml24-t-t-FF \ - pr/nSml24-t-tFFFF \ - pr/nl24f-bl \ - pr/o3Jml24f-lm-lo \ - pr/o3a3Sl24f-tn \ - pr/o3a3Snl24f-tn \ - pr/o3a3l24f-tn \ - pr/o3b3Sl24f-tn \ - pr/o3b3Snl24f-tn \ - pr/o3b3l24f-tn \ - pr/o3mSl24f-bl-tn \ - pr/o3mSnl24fbltn \ - pr/o3ml24f-bl-tn \ - pr/t-0FF \ - pr/t-FF \ - pr/t-bl \ - pr/t-t \ - pr/tFFn \ - pr/tFFt \ - pr/tFFt-bl \ - pr/tFFt-ll \ - pr/tFFt-lm \ - pr/tFnFt \ - pr/t_notab \ - pr/t_tab \ - pr/t_tab_ \ - pr/ta3-0FF \ - pr/ta3-FF \ - pr/tb3-0FF \ - pr/tb3-FF \ - pr/tn \ - pr/tn2e5o3-t_tab \ - pr/tn2e8-t_tab \ - pr/tn2e8o3-t_tab \ - pr/tn_2e8-t_tab \ - pr/tn_2e8S-t_tab \ - pr/tne8-t_tab \ - pr/tne8o3-t_tab \ - pr/tt-0FF \ - pr/tt-FF \ - pr/tt-bl \ - pr/tt-t \ - pr/tta3-0FF \ - pr/tta3-FF \ - pr/ttb3-0FF \ - pr/ttb3-FF \ - pr/w72l24f-ll - - -# Ensure that all version-controlled executable files are listed in TESTS. -# Collect test names from the line matching /^TESTS = \\$$/ to the following -# one that does not end in '\'. -_v = TESTS -_w = root_tests -CLEANFILES = .built-programs -LOG_COMPILER = \ - $(SHELL) $(srcdir)/shell-or-perl \ - --test-name "$$f" --srcdir '$(srcdir)' \ - --shell '$(SHELL)' --perl '$(PERL)' -- - - -# Note that the first lines are statements. They ensure that environment -# variables that can perturb tests are unset or set to expected values. -# The rest are envvar settings that propagate build-related Makefile -# variables to test scripts. -TESTS_ENVIRONMENT = \ - . $(srcdir)/lang-default; \ - tmp__=$${TMPDIR-/tmp}; \ - test -d "$$tmp__" && test -w "$$tmp__" || tmp__=.; \ - . $(srcdir)/envvar-check; \ - TMPDIR=$$tmp__; export TMPDIR; \ - export \ - VERSION='$(VERSION)' \ - LOCALE_FR='$(LOCALE_FR)' \ - LOCALE_FR_UTF8='$(LOCALE_FR_UTF8)' \ - abs_top_builddir='$(abs_top_builddir)' \ - abs_top_srcdir='$(abs_top_srcdir)' \ - abs_srcdir='$(abs_srcdir)' \ - built_programs="`cat .built-programs`" \ - host_os=$(host_os) \ - host_triplet='$(host_triplet)' \ - srcdir='$(srcdir)' \ - top_srcdir='$(top_srcdir)' \ - CONFIG_HEADER='$(abs_top_builddir)/$(CONFIG_INCLUDE)' \ - CU_TEST_NAME=`basename '$(abs_srcdir)'`,`echo $$tst|sed 's,^\./,,;s,/,-,g'` \ - CC='$(CC)' \ - AWK='$(AWK)' \ - EGREP='$(EGREP)' \ - EXEEXT='$(EXEEXT)' \ - MAKE=$(MAKE) \ - PACKAGE_BUGREPORT='$(PACKAGE_BUGREPORT)' \ - PACKAGE_VERSION=$(PACKAGE_VERSION) \ - PERL='$(PERL)' \ - PREFERABLY_POSIX_SHELL='$(PREFERABLY_POSIX_SHELL)' \ - REPLACE_GETCWD=$(REPLACE_GETCWD) \ - ; test -d /usr/xpg4/bin && PATH='/usr/xpg4/bin$(PATH_SEPARATOR)'"$$PATH"; \ - PATH='$(abs_top_builddir)/src$(PATH_SEPARATOR)'"$$PATH" \ - ; 9>&2 - -VERBOSE = yes -all: all-am - -.SUFFIXES: -.SUFFIXES: .log .test .test$(EXEEXT) .trs -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/check.mk $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu tests/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; -$(srcdir)/check.mk: - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - -cscope cscopelist: - - -# 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) $< - -$(TEST_SUITE_LOG): $(TEST_LOGS) - @$(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); \ - create_testsuite_report --no-color; \ - echo; \ - echo ".. contents:: :depth: 2"; \ - echo; \ - 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 $$success; then \ - col="$$grn"; \ - else \ - col="$$red"; \ - test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ - fi; \ - 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; \ - echo "$$col$$br$$std"; \ - fi; \ - $$success || exit 1 - -check-TESTS recheck: - @if test $@ != recheck; then \ - list='$(RECHECK_LOGS)'; \ - test -z "$$list" || rm -f $$list; \ - fi - @if test $@ != recheck; then \ - list='$(RECHECK_LOGS:.log=.trs)'; \ - test -z "$$list" || rm -f $$list; \ - fi - @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) - @$(am__set_TESTS_bases); \ - if test $@ = recheck; then \ - bases=`for i in $$bases; do echo $$i; done \ - | $(am__list_recheck_tests)` || exit 1; \ - fi; \ - 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`; \ - if test $@ != recheck || $(am__make_dryrun); then :; else \ - test -z "$$log_list" || rm -f $$log_list; \ - test -z "$$trs_list" || rm -f $$trs_list; \ - fi; \ - $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list" -recheck: all -misc/help-version.log: misc/help-version - @p='misc/help-version'; \ - b='misc/help-version'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -tail-2/inotify-race.log: tail-2/inotify-race - @p='tail-2/inotify-race'; \ - b='tail-2/inotify-race'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/invalid-opt.log: misc/invalid-opt - @p='misc/invalid-opt'; \ - b='misc/invalid-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) -rm/ext3-perf.log: rm/ext3-perf - @p='rm/ext3-perf'; \ - b='rm/ext3-perf'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -rm/cycle.log: rm/cycle - @p='rm/cycle'; \ - b='rm/cycle'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -cp/link-heap.log: cp/link-heap - @p='cp/link-heap'; \ - b='cp/link-heap'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/tty-eof.log: misc/tty-eof - @p='misc/tty-eof'; \ - b='misc/tty-eof'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -tail-2/inotify-hash-abuse.log: tail-2/inotify-hash-abuse - @p='tail-2/inotify-hash-abuse'; \ - b='tail-2/inotify-hash-abuse'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -tail-2/inotify-hash-abuse2.log: tail-2/inotify-hash-abuse2 - @p='tail-2/inotify-hash-abuse2'; \ - b='tail-2/inotify-hash-abuse2'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -tail-2/F-vs-missing.log: tail-2/F-vs-missing - @p='tail-2/F-vs-missing'; \ - b='tail-2/F-vs-missing'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -tail-2/F-vs-rename.log: tail-2/F-vs-rename - @p='tail-2/F-vs-rename'; \ - b='tail-2/F-vs-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) -tail-2/inotify-rotate.log: tail-2/inotify-rotate - @p='tail-2/inotify-rotate'; \ - b='tail-2/inotify-rotate'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -chmod/no-x.log: chmod/no-x - @p='chmod/no-x'; \ - b='chmod/no-x'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -chgrp/basic.log: chgrp/basic - @p='chgrp/basic'; \ - b='chgrp/basic'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -rm/dangling-symlink.log: rm/dangling-symlink - @p='rm/dangling-symlink'; \ - b='rm/dangling-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) -misc/ls-time.log: misc/ls-time - @p='misc/ls-time'; \ - b='misc/ls-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) -rm/deep-1.log: rm/deep-1 - @p='rm/deep-1'; \ - b='rm/deep-1'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -rm/deep-2.log: rm/deep-2 - @p='rm/deep-2'; \ - b='rm/deep-2'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -rm/dir-no-w.log: rm/dir-no-w - @p='rm/dir-no-w'; \ - b='rm/dir-no-w'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -rm/dir-nonrecur.log: rm/dir-nonrecur - @p='rm/dir-nonrecur'; \ - b='rm/dir-nonrecur'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -rm/dot-rel.log: rm/dot-rel - @p='rm/dot-rel'; \ - b='rm/dot-rel'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -rm/isatty.log: rm/isatty - @p='rm/isatty'; \ - b='rm/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) -rm/empty-inacc.log: rm/empty-inacc - @p='rm/empty-inacc'; \ - b='rm/empty-inacc'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -rm/empty-name.log: rm/empty-name - @p='rm/empty-name'; \ - b='rm/empty-name'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -rm/f-1.log: rm/f-1 - @p='rm/f-1'; \ - b='rm/f-1'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -rm/fail-eacces.log: rm/fail-eacces - @p='rm/fail-eacces'; \ - b='rm/fail-eacces'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -rm/fail-eperm.log: rm/fail-eperm - @p='rm/fail-eperm'; \ - b='rm/fail-eperm'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -tail-2/assert.log: tail-2/assert - @p='tail-2/assert'; \ - b='tail-2/assert'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -rm/hash.log: rm/hash - @p='rm/hash'; \ - b='rm/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) -rm/i-1.log: rm/i-1 - @p='rm/i-1'; \ - b='rm/i-1'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -rm/i-never.log: rm/i-never - @p='rm/i-never'; \ - b='rm/i-never'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -rm/i-no-r.log: rm/i-no-r - @p='rm/i-no-r'; \ - b='rm/i-no-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) -tail-2/infloop-1.log: tail-2/infloop-1 - @p='tail-2/infloop-1'; \ - b='tail-2/infloop-1'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -rm/ignorable.log: rm/ignorable - @p='rm/ignorable'; \ - b='rm/ignorable'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -rm/inaccessible.log: rm/inaccessible - @p='rm/inaccessible'; \ - b='rm/inaccessible'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -rm/interactive-always.log: rm/interactive-always - @p='rm/interactive-always'; \ - b='rm/interactive-always'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -rm/interactive-once.log: rm/interactive-once - @p='rm/interactive-once'; \ - b='rm/interactive-once'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -rm/ir-1.log: rm/ir-1 - @p='rm/ir-1'; \ - b='rm/ir-1'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -rm/one-file-system2.log: rm/one-file-system2 - @p='rm/one-file-system2'; \ - b='rm/one-file-system2'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -rm/r-1.log: rm/r-1 - @p='rm/r-1'; \ - b='rm/r-1'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -rm/r-2.log: rm/r-2 - @p='rm/r-2'; \ - b='rm/r-2'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -rm/r-3.log: rm/r-3 - @p='rm/r-3'; \ - b='rm/r-3'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -rm/r-4.log: rm/r-4 - @p='rm/r-4'; \ - b='rm/r-4'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -rm/readdir-bug.log: rm/readdir-bug - @p='rm/readdir-bug'; \ - b='rm/readdir-bug'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -rm/rm1.log: rm/rm1 - @p='rm/rm1'; \ - b='rm/rm1'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -touch/empty-file.log: touch/empty-file - @p='touch/empty-file'; \ - b='touch/empty-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) -rm/rm2.log: rm/rm2 - @p='rm/rm2'; \ - b='rm/rm2'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -rm/rm3.log: rm/rm3 - @p='rm/rm3'; \ - b='rm/rm3'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -rm/rm4.log: rm/rm4 - @p='rm/rm4'; \ - b='rm/rm4'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -rm/rm5.log: rm/rm5 - @p='rm/rm5'; \ - b='rm/rm5'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -rm/sunos-1.log: rm/sunos-1 - @p='rm/sunos-1'; \ - b='rm/sunos-1'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -rm/unread2.log: rm/unread2 - @p='rm/unread2'; \ - b='rm/unread2'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -rm/unread3.log: rm/unread3 - @p='rm/unread3'; \ - b='rm/unread3'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -rm/unreadable.log: rm/unreadable - @p='rm/unreadable'; \ - b='rm/unreadable'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -rm/v-slash.log: rm/v-slash - @p='rm/v-slash'; \ - b='rm/v-slash'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -rm/many-dir-entries-vs-OOM.log: rm/many-dir-entries-vs-OOM - @p='rm/many-dir-entries-vs-OOM'; \ - b='rm/many-dir-entries-vs-OOM'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -chgrp/default-no-deref.log: chgrp/default-no-deref - @p='chgrp/default-no-deref'; \ - b='chgrp/default-no-deref'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -chgrp/deref.log: chgrp/deref - @p='chgrp/deref'; \ - b='chgrp/deref'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -chgrp/no-x.log: chgrp/no-x - @p='chgrp/no-x'; \ - b='chgrp/no-x'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -chgrp/posix-H.log: chgrp/posix-H - @p='chgrp/posix-H'; \ - b='chgrp/posix-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) -chgrp/recurse.log: chgrp/recurse - @p='chgrp/recurse'; \ - b='chgrp/recurse'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -fmt/base.log: fmt/base - @p='fmt/base'; \ - b='fmt/base'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -fmt/long-line.log: fmt/long-line - @p='fmt/long-line'; \ - b='fmt/long-line'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -fmt/goal-option.log: fmt/goal-option - @p='fmt/goal-option'; \ - b='fmt/goal-option'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/env.log: misc/env - @p='misc/env'; \ - b='misc/env'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/ptx.log: misc/ptx - @p='misc/ptx'; \ - b='misc/ptx'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/test.log: misc/test - @p='misc/test'; \ - b='misc/test'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/seq.log: misc/seq - @p='misc/seq'; \ - b='misc/seq'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/seq-long-double.log: misc/seq-long-double - @p='misc/seq-long-double'; \ - b='misc/seq-long-double'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/head.log: misc/head - @p='misc/head'; \ - b='misc/head'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/head-elide-tail.log: misc/head-elide-tail - @p='misc/head-elide-tail'; \ - b='misc/head-elide-tail'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -tail-2/tail-n0f.log: tail-2/tail-n0f - @p='tail-2/tail-n0f'; \ - b='tail-2/tail-n0f'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/ls-misc.log: misc/ls-misc - @p='misc/ls-misc'; \ - b='misc/ls-misc'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/date.log: misc/date - @p='misc/date'; \ - b='misc/date'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/date-next-dow.log: misc/date-next-dow - @p='misc/date-next-dow'; \ - b='misc/date-next-dow'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/ptx-overrun.log: misc/ptx-overrun - @p='misc/ptx-overrun'; \ - b='misc/ptx-overrun'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/xstrtol.log: misc/xstrtol - @p='misc/xstrtol'; \ - b='misc/xstrtol'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -tail-2/pid.log: tail-2/pid - @p='tail-2/pid'; \ - b='tail-2/pid'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/od.log: misc/od - @p='misc/od'; \ - b='misc/od'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/od-float.log: misc/od-float - @p='misc/od-float'; \ - b='misc/od-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) -misc/mktemp.log: misc/mktemp - @p='misc/mktemp'; \ - b='misc/mktemp'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/arch.log: misc/arch - @p='misc/arch'; \ - b='misc/arch'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/pr.log: misc/pr - @p='misc/pr'; \ - b='misc/pr'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/join.log: misc/join - @p='misc/join'; \ - b='misc/join'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -pr/pr-tests.log: pr/pr-tests - @p='pr/pr-tests'; \ - b='pr/pr-tests'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/df-P.log: misc/df-P - @p='misc/df-P'; \ - b='misc/df-P'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/pwd-option.log: misc/pwd-option - @p='misc/pwd-option'; \ - b='misc/pwd-option'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/chcon-fail.log: misc/chcon-fail - @p='misc/chcon-fail'; \ - b='misc/chcon-fail'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/cut.log: misc/cut - @p='misc/cut'; \ - b='misc/cut'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/wc.log: misc/wc - @p='misc/wc'; \ - b='misc/wc'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/wc-files0-from.log: misc/wc-files0-from - @p='misc/wc-files0-from'; \ - b='misc/wc-files0-from'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/wc-files0.log: misc/wc-files0 - @p='misc/wc-files0'; \ - b='misc/wc-files0'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/wc-parallel.log: misc/wc-parallel - @p='misc/wc-parallel'; \ - b='misc/wc-parallel'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/cat-proc.log: misc/cat-proc - @p='misc/cat-proc'; \ - b='misc/cat-proc'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/cat-buf.log: misc/cat-buf - @p='misc/cat-buf'; \ - b='misc/cat-buf'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/base64.log: misc/base64 - @p='misc/base64'; \ - b='misc/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) -misc/basename.log: misc/basename - @p='misc/basename'; \ - b='misc/basename'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/close-stdout.log: misc/close-stdout - @p='misc/close-stdout'; \ - b='misc/close-stdout'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/chroot-fail.log: misc/chroot-fail - @p='misc/chroot-fail'; \ - b='misc/chroot-fail'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/comm.log: misc/comm - @p='misc/comm'; \ - b='misc/comm'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/csplit.log: misc/csplit - @p='misc/csplit'; \ - b='misc/csplit'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/csplit-1000.log: misc/csplit-1000 - @p='misc/csplit-1000'; \ - b='misc/csplit-1000'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/csplit-heap.log: misc/csplit-heap - @p='misc/csplit-heap'; \ - b='misc/csplit-heap'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/date-sec.log: misc/date-sec - @p='misc/date-sec'; \ - b='misc/date-sec'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/dircolors.log: misc/dircolors - @p='misc/dircolors'; \ - b='misc/dircolors'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/df.log: misc/df - @p='misc/df'; \ - b='misc/df'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/dirname.log: misc/dirname - @p='misc/dirname'; \ - b='misc/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) -misc/env-null.log: misc/env-null - @p='misc/env-null'; \ - b='misc/env-null'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/expand.log: misc/expand - @p='misc/expand'; \ - b='misc/expand'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/expr.log: misc/expr - @p='misc/expr'; \ - b='misc/expr'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/factor.log: misc/factor - @p='misc/factor'; \ - b='misc/factor'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/false-status.log: misc/false-status - @p='misc/false-status'; \ - b='misc/false-status'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/fold.log: misc/fold - @p='misc/fold'; \ - b='misc/fold'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/groups-dash.log: misc/groups-dash - @p='misc/groups-dash'; \ - b='misc/groups-dash'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/groups-version.log: misc/groups-version - @p='misc/groups-version'; \ - b='misc/groups-version'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/head-c.log: misc/head-c - @p='misc/head-c'; \ - b='misc/head-c'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/head-pos.log: misc/head-pos - @p='misc/head-pos'; \ - b='misc/head-pos'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/id-context.log: misc/id-context - @p='misc/id-context'; \ - b='misc/id-context'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/id-groups.log: misc/id-groups - @p='misc/id-groups'; \ - b='misc/id-groups'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/id-setgid.log: misc/id-setgid - @p='misc/id-setgid'; \ - b='misc/id-setgid'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/md5sum.log: misc/md5sum - @p='misc/md5sum'; \ - b='misc/md5sum'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/md5sum-bsd.log: misc/md5sum-bsd - @p='misc/md5sum-bsd'; \ - b='misc/md5sum-bsd'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/md5sum-newline.log: misc/md5sum-newline - @p='misc/md5sum-newline'; \ - b='misc/md5sum-newline'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/md5sum-parallel.log: misc/md5sum-parallel - @p='misc/md5sum-parallel'; \ - b='misc/md5sum-parallel'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/mknod.log: misc/mknod - @p='misc/mknod'; \ - b='misc/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) -misc/nice.log: misc/nice - @p='misc/nice'; \ - b='misc/nice'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/nice-fail.log: misc/nice-fail - @p='misc/nice-fail'; \ - b='misc/nice-fail'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/nl.log: misc/nl - @p='misc/nl'; \ - b='misc/nl'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/nohup.log: misc/nohup - @p='misc/nohup'; \ - b='misc/nohup'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/nproc-avail.log: misc/nproc-avail - @p='misc/nproc-avail'; \ - b='misc/nproc-avail'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/nproc-positive.log: misc/nproc-positive - @p='misc/nproc-positive'; \ - b='misc/nproc-positive'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/od-N.log: misc/od-N - @p='misc/od-N'; \ - b='misc/od-N'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/od-multiple-t.log: misc/od-multiple-t - @p='misc/od-multiple-t'; \ - b='misc/od-multiple-t'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/od-x8.log: misc/od-x8 - @p='misc/od-x8'; \ - b='misc/od-x8'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/paste.log: misc/paste - @p='misc/paste'; \ - b='misc/paste'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/pathchk1.log: misc/pathchk1 - @p='misc/pathchk1'; \ - b='misc/pathchk1'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/printenv.log: misc/printenv - @p='misc/printenv'; \ - b='misc/printenv'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/printf.log: misc/printf - @p='misc/printf'; \ - b='misc/printf'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/printf-cov.log: misc/printf-cov - @p='misc/printf-cov'; \ - b='misc/printf-cov'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/printf-hex.log: misc/printf-hex - @p='misc/printf-hex'; \ - b='misc/printf-hex'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/printf-surprise.log: misc/printf-surprise - @p='misc/printf-surprise'; \ - b='misc/printf-surprise'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/pwd-long.log: misc/pwd-long - @p='misc/pwd-long'; \ - b='misc/pwd-long'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/readlink-fp-loop.log: misc/readlink-fp-loop - @p='misc/readlink-fp-loop'; \ - b='misc/readlink-fp-loop'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/readlink-root.log: misc/readlink-root - @p='misc/readlink-root'; \ - b='misc/readlink-root'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/realpath.log: misc/realpath - @p='misc/realpath'; \ - b='misc/realpath'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/runcon-no-reorder.log: misc/runcon-no-reorder - @p='misc/runcon-no-reorder'; \ - b='misc/runcon-no-reorder'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/sha1sum.log: misc/sha1sum - @p='misc/sha1sum'; \ - b='misc/sha1sum'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/sha1sum-vec.log: misc/sha1sum-vec - @p='misc/sha1sum-vec'; \ - b='misc/sha1sum-vec'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/sha224sum.log: misc/sha224sum - @p='misc/sha224sum'; \ - b='misc/sha224sum'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/sha256sum.log: misc/sha256sum - @p='misc/sha256sum'; \ - b='misc/sha256sum'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/sha384sum.log: misc/sha384sum - @p='misc/sha384sum'; \ - b='misc/sha384sum'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/sha512sum.log: misc/sha512sum - @p='misc/sha512sum'; \ - b='misc/sha512sum'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/shred-exact.log: misc/shred-exact - @p='misc/shred-exact'; \ - b='misc/shred-exact'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/shred-passes.log: misc/shred-passes - @p='misc/shred-passes'; \ - b='misc/shred-passes'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/shred-remove.log: misc/shred-remove - @p='misc/shred-remove'; \ - b='misc/shred-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) -misc/shuf.log: misc/shuf - @p='misc/shuf'; \ - b='misc/shuf'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/sort.log: misc/sort - @p='misc/sort'; \ - b='misc/sort'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/sort-benchmark-random.log: misc/sort-benchmark-random - @p='misc/sort-benchmark-random'; \ - b='misc/sort-benchmark-random'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/sort-compress.log: misc/sort-compress - @p='misc/sort-compress'; \ - b='misc/sort-compress'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/sort-compress-hang.log: misc/sort-compress-hang - @p='misc/sort-compress-hang'; \ - b='misc/sort-compress-hang'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/sort-compress-proc.log: misc/sort-compress-proc - @p='misc/sort-compress-proc'; \ - b='misc/sort-compress-proc'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/sort-continue.log: misc/sort-continue - @p='misc/sort-continue'; \ - b='misc/sort-continue'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/sort-debug-keys.log: misc/sort-debug-keys - @p='misc/sort-debug-keys'; \ - b='misc/sort-debug-keys'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/sort-debug-warn.log: misc/sort-debug-warn - @p='misc/sort-debug-warn'; \ - b='misc/sort-debug-warn'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/sort-discrim.log: misc/sort-discrim - @p='misc/sort-discrim'; \ - b='misc/sort-discrim'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/sort-files0-from.log: misc/sort-files0-from - @p='misc/sort-files0-from'; \ - b='misc/sort-files0-from'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/sort-float.log: misc/sort-float - @p='misc/sort-float'; \ - b='misc/sort-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) -misc/sort-merge.log: misc/sort-merge - @p='misc/sort-merge'; \ - b='misc/sort-merge'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/sort-merge-fdlimit.log: misc/sort-merge-fdlimit - @p='misc/sort-merge-fdlimit'; \ - b='misc/sort-merge-fdlimit'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/sort-month.log: misc/sort-month - @p='misc/sort-month'; \ - b='misc/sort-month'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/sort-rand.log: misc/sort-rand - @p='misc/sort-rand'; \ - b='misc/sort-rand'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/sort-spinlock-abuse.log: misc/sort-spinlock-abuse - @p='misc/sort-spinlock-abuse'; \ - b='misc/sort-spinlock-abuse'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/sort-stale-thread-mem.log: misc/sort-stale-thread-mem - @p='misc/sort-stale-thread-mem'; \ - b='misc/sort-stale-thread-mem'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/sort-unique.log: misc/sort-unique - @p='misc/sort-unique'; \ - b='misc/sort-unique'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/sort-unique-segv.log: misc/sort-unique-segv - @p='misc/sort-unique-segv'; \ - b='misc/sort-unique-segv'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/sort-version.log: misc/sort-version - @p='misc/sort-version'; \ - b='misc/sort-version'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/sort-NaN-infloop.log: misc/sort-NaN-infloop - @p='misc/sort-NaN-infloop'; \ - b='misc/sort-NaN-infloop'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -split/filter.log: split/filter - @p='split/filter'; \ - b='split/filter'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -split/suffix-auto-length.log: split/suffix-auto-length - @p='split/suffix-auto-length'; \ - b='split/suffix-auto-length'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -split/suffix-length.log: split/suffix-length - @p='split/suffix-length'; \ - b='split/suffix-length'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -split/additional-suffix.log: split/additional-suffix - @p='split/additional-suffix'; \ - b='split/additional-suffix'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -split/b-chunk.log: split/b-chunk - @p='split/b-chunk'; \ - b='split/b-chunk'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -split/fail.log: split/fail - @p='split/fail'; \ - b='split/fail'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -split/lines.log: split/lines - @p='split/lines'; \ - b='split/lines'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -split/l-chunk.log: split/l-chunk - @p='split/l-chunk'; \ - b='split/l-chunk'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -split/r-chunk.log: split/r-chunk - @p='split/r-chunk'; \ - b='split/r-chunk'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -split/numeric.log: split/numeric - @p='split/numeric'; \ - b='split/numeric'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/stat-birthtime.log: misc/stat-birthtime - @p='misc/stat-birthtime'; \ - b='misc/stat-birthtime'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/stat-fmt.log: misc/stat-fmt - @p='misc/stat-fmt'; \ - b='misc/stat-fmt'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/stat-hyphen.log: misc/stat-hyphen - @p='misc/stat-hyphen'; \ - b='misc/stat-hyphen'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/stat-mount.log: misc/stat-mount - @p='misc/stat-mount'; \ - b='misc/stat-mount'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/stat-nanoseconds.log: misc/stat-nanoseconds - @p='misc/stat-nanoseconds'; \ - b='misc/stat-nanoseconds'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/stat-printf.log: misc/stat-printf - @p='misc/stat-printf'; \ - b='misc/stat-printf'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/stat-slash.log: misc/stat-slash - @p='misc/stat-slash'; \ - b='misc/stat-slash'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/stdbuf.log: misc/stdbuf - @p='misc/stdbuf'; \ - b='misc/stdbuf'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/stty.log: misc/stty - @p='misc/stty'; \ - b='misc/stty'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/stty-invalid.log: misc/stty-invalid - @p='misc/stty-invalid'; \ - b='misc/stty-invalid'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/stty-pairs.log: misc/stty-pairs - @p='misc/stty-pairs'; \ - b='misc/stty-pairs'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/stty-row-col.log: misc/stty-row-col - @p='misc/stty-row-col'; \ - b='misc/stty-row-col'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/su-fail.log: misc/su-fail - @p='misc/su-fail'; \ - b='misc/su-fail'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/sum.log: misc/sum - @p='misc/sum'; \ - b='misc/sum'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/sum-sysv.log: misc/sum-sysv - @p='misc/sum-sysv'; \ - b='misc/sum-sysv'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/tac.log: misc/tac - @p='misc/tac'; \ - b='misc/tac'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/tac-continue.log: misc/tac-continue - @p='misc/tac-continue'; \ - b='misc/tac-continue'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/tac-2-nonseekable.log: misc/tac-2-nonseekable - @p='misc/tac-2-nonseekable'; \ - b='misc/tac-2-nonseekable'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/tail.log: misc/tail - @p='misc/tail'; \ - b='misc/tail'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/tee.log: misc/tee - @p='misc/tee'; \ - b='misc/tee'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/tee-dash.log: misc/tee-dash - @p='misc/tee-dash'; \ - b='misc/tee-dash'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/test-diag.log: misc/test-diag - @p='misc/test-diag'; \ - b='misc/test-diag'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/timeout.log: misc/timeout - @p='misc/timeout'; \ - b='misc/timeout'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/timeout-group.log: misc/timeout-group - @p='misc/timeout-group'; \ - b='misc/timeout-group'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/timeout-parameters.log: misc/timeout-parameters - @p='misc/timeout-parameters'; \ - b='misc/timeout-parameters'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/tr.log: misc/tr - @p='misc/tr'; \ - b='misc/tr'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/tr-case-class.log: misc/tr-case-class - @p='misc/tr-case-class'; \ - b='misc/tr-case-class'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/truncate-dangling-symlink.log: misc/truncate-dangling-symlink - @p='misc/truncate-dangling-symlink'; \ - b='misc/truncate-dangling-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) -misc/truncate-dir-fail.log: misc/truncate-dir-fail - @p='misc/truncate-dir-fail'; \ - b='misc/truncate-dir-fail'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/truncate-fail-diag.log: misc/truncate-fail-diag - @p='misc/truncate-fail-diag'; \ - b='misc/truncate-fail-diag'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/truncate-fifo.log: misc/truncate-fifo - @p='misc/truncate-fifo'; \ - b='misc/truncate-fifo'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/truncate-no-create-missing.log: misc/truncate-no-create-missing - @p='misc/truncate-no-create-missing'; \ - b='misc/truncate-no-create-missing'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/truncate-overflow.log: misc/truncate-overflow - @p='misc/truncate-overflow'; \ - b='misc/truncate-overflow'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/truncate-parameters.log: misc/truncate-parameters - @p='misc/truncate-parameters'; \ - b='misc/truncate-parameters'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/truncate-relative.log: misc/truncate-relative - @p='misc/truncate-relative'; \ - b='misc/truncate-relative'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/tsort.log: misc/tsort - @p='misc/tsort'; \ - b='misc/tsort'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/unexpand.log: misc/unexpand - @p='misc/unexpand'; \ - b='misc/unexpand'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/uniq.log: misc/uniq - @p='misc/uniq'; \ - b='misc/uniq'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/uniq-perf.log: misc/uniq-perf - @p='misc/uniq-perf'; \ - b='misc/uniq-perf'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/xattr.log: misc/xattr - @p='misc/xattr'; \ - b='misc/xattr'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -tail-2/wait.log: tail-2/wait - @p='tail-2/wait'; \ - b='tail-2/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) -chmod/c-option.log: chmod/c-option - @p='chmod/c-option'; \ - b='chmod/c-option'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -chmod/equal-x.log: chmod/equal-x - @p='chmod/equal-x'; \ - b='chmod/equal-x'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -chmod/equals.log: chmod/equals - @p='chmod/equals'; \ - b='chmod/equals'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -chmod/inaccessible.log: chmod/inaccessible - @p='chmod/inaccessible'; \ - b='chmod/inaccessible'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -chmod/octal.log: chmod/octal - @p='chmod/octal'; \ - b='chmod/octal'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -chmod/setgid.log: chmod/setgid - @p='chmod/setgid'; \ - b='chmod/setgid'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -chmod/silent.log: chmod/silent - @p='chmod/silent'; \ - b='chmod/silent'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -chmod/thru-dangling.log: chmod/thru-dangling - @p='chmod/thru-dangling'; \ - b='chmod/thru-dangling'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -chmod/umask-x.log: chmod/umask-x - @p='chmod/umask-x'; \ - b='chmod/umask-x'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -chmod/usage.log: chmod/usage - @p='chmod/usage'; \ - b='chmod/usage'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -chown/deref.log: chown/deref - @p='chown/deref'; \ - b='chown/deref'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -chown/preserve-root.log: chown/preserve-root - @p='chown/preserve-root'; \ - b='chown/preserve-root'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -chown/separator.log: chown/separator - @p='chown/separator'; \ - b='chown/separator'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -cp/abuse.log: cp/abuse - @p='cp/abuse'; \ - b='cp/abuse'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -cp/acl.log: cp/acl - @p='cp/acl'; \ - b='cp/acl'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -cp/attr-existing.log: cp/attr-existing - @p='cp/attr-existing'; \ - b='cp/attr-existing'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -cp/backup-1.log: cp/backup-1 - @p='cp/backup-1'; \ - b='cp/backup-1'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -cp/backup-dir.log: cp/backup-dir - @p='cp/backup-dir'; \ - b='cp/backup-dir'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -cp/backup-is-src.log: cp/backup-is-src - @p='cp/backup-is-src'; \ - b='cp/backup-is-src'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -cp/cp-HL.log: cp/cp-HL - @p='cp/cp-HL'; \ - b='cp/cp-HL'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -cp/cp-deref.log: cp/cp-deref - @p='cp/cp-deref'; \ - b='cp/cp-deref'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -cp/cp-i.log: cp/cp-i - @p='cp/cp-i'; \ - b='cp/cp-i'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -cp/cp-mv-backup.log: cp/cp-mv-backup - @p='cp/cp-mv-backup'; \ - b='cp/cp-mv-backup'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -cp/cp-parents.log: cp/cp-parents - @p='cp/cp-parents'; \ - b='cp/cp-parents'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -cp/deref-slink.log: cp/deref-slink - @p='cp/deref-slink'; \ - b='cp/deref-slink'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -cp/dir-rm-dest.log: cp/dir-rm-dest - @p='cp/dir-rm-dest'; \ - b='cp/dir-rm-dest'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -cp/dir-slash.log: cp/dir-slash - @p='cp/dir-slash'; \ - b='cp/dir-slash'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -cp/dir-vs-file.log: cp/dir-vs-file - @p='cp/dir-vs-file'; \ - b='cp/dir-vs-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) -cp/existing-perm-dir.log: cp/existing-perm-dir - @p='cp/existing-perm-dir'; \ - b='cp/existing-perm-dir'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -cp/existing-perm-race.log: cp/existing-perm-race - @p='cp/existing-perm-race'; \ - b='cp/existing-perm-race'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -cp/fail-perm.log: cp/fail-perm - @p='cp/fail-perm'; \ - b='cp/fail-perm'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -cp/fiemap-empty.log: cp/fiemap-empty - @p='cp/fiemap-empty'; \ - b='cp/fiemap-empty'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -cp/fiemap-perf.log: cp/fiemap-perf - @p='cp/fiemap-perf'; \ - b='cp/fiemap-perf'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -cp/fiemap-2.log: cp/fiemap-2 - @p='cp/fiemap-2'; \ - b='cp/fiemap-2'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -cp/file-perm-race.log: cp/file-perm-race - @p='cp/file-perm-race'; \ - b='cp/file-perm-race'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -cp/into-self.log: cp/into-self - @p='cp/into-self'; \ - b='cp/into-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) -cp/link.log: cp/link - @p='cp/link'; \ - b='cp/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) -cp/link-no-deref.log: cp/link-no-deref - @p='cp/link-no-deref'; \ - b='cp/link-no-deref'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -cp/link-preserve.log: cp/link-preserve - @p='cp/link-preserve'; \ - b='cp/link-preserve'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -cp/link-symlink.log: cp/link-symlink - @p='cp/link-symlink'; \ - b='cp/link-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) -cp/nfs-removal-race.log: cp/nfs-removal-race - @p='cp/nfs-removal-race'; \ - b='cp/nfs-removal-race'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -cp/no-deref-link1.log: cp/no-deref-link1 - @p='cp/no-deref-link1'; \ - b='cp/no-deref-link1'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -cp/no-deref-link2.log: cp/no-deref-link2 - @p='cp/no-deref-link2'; \ - b='cp/no-deref-link2'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -cp/no-deref-link3.log: cp/no-deref-link3 - @p='cp/no-deref-link3'; \ - b='cp/no-deref-link3'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -cp/parent-perm.log: cp/parent-perm - @p='cp/parent-perm'; \ - b='cp/parent-perm'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -cp/parent-perm-race.log: cp/parent-perm-race - @p='cp/parent-perm-race'; \ - b='cp/parent-perm-race'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -cp/perm.log: cp/perm - @p='cp/perm'; \ - b='cp/perm'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -cp/preserve-2.log: cp/preserve-2 - @p='cp/preserve-2'; \ - b='cp/preserve-2'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -cp/preserve-link.log: cp/preserve-link - @p='cp/preserve-link'; \ - b='cp/preserve-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) -cp/preserve-slink-time.log: cp/preserve-slink-time - @p='cp/preserve-slink-time'; \ - b='cp/preserve-slink-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) -cp/proc-short-read.log: cp/proc-short-read - @p='cp/proc-short-read'; \ - b='cp/proc-short-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) -cp/proc-zero-len.log: cp/proc-zero-len - @p='cp/proc-zero-len'; \ - b='cp/proc-zero-len'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -cp/r-vs-symlink.log: cp/r-vs-symlink - @p='cp/r-vs-symlink'; \ - b='cp/r-vs-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) -cp/reflink-auto.log: cp/reflink-auto - @p='cp/reflink-auto'; \ - b='cp/reflink-auto'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -cp/reflink-perm.log: cp/reflink-perm - @p='cp/reflink-perm'; \ - b='cp/reflink-perm'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -cp/same-file.log: cp/same-file - @p='cp/same-file'; \ - b='cp/same-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) -cp/slink-2-slink.log: cp/slink-2-slink - @p='cp/slink-2-slink'; \ - b='cp/slink-2-slink'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -cp/sparse.log: cp/sparse - @p='cp/sparse'; \ - b='cp/sparse'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -cp/sparse-to-pipe.log: cp/sparse-to-pipe - @p='cp/sparse-to-pipe'; \ - b='cp/sparse-to-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) -cp/special-f.log: cp/special-f - @p='cp/special-f'; \ - b='cp/special-f'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -cp/src-base-dot.log: cp/src-base-dot - @p='cp/src-base-dot'; \ - b='cp/src-base-dot'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -cp/symlink-slash.log: cp/symlink-slash - @p='cp/symlink-slash'; \ - b='cp/symlink-slash'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -cp/thru-dangling.log: cp/thru-dangling - @p='cp/thru-dangling'; \ - b='cp/thru-dangling'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -df/unreadable.log: df/unreadable - @p='df/unreadable'; \ - b='df/unreadable'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -dd/direct.log: dd/direct - @p='dd/direct'; \ - b='dd/direct'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -dd/misc.log: dd/misc - @p='dd/misc'; \ - b='dd/misc'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -dd/nocache.log: dd/nocache - @p='dd/nocache'; \ - b='dd/nocache'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -dd/not-rewound.log: dd/not-rewound - @p='dd/not-rewound'; \ - b='dd/not-rewound'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -dd/reblock.log: dd/reblock - @p='dd/reblock'; \ - b='dd/reblock'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -dd/skip-seek.log: dd/skip-seek - @p='dd/skip-seek'; \ - b='dd/skip-seek'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -dd/skip-seek2.log: dd/skip-seek2 - @p='dd/skip-seek2'; \ - b='dd/skip-seek2'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -dd/bytes.log: dd/bytes - @p='dd/bytes'; \ - b='dd/bytes'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -dd/skip-seek-past-file.log: dd/skip-seek-past-file - @p='dd/skip-seek-past-file'; \ - b='dd/skip-seek-past-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) -dd/sparse.log: dd/sparse - @p='dd/sparse'; \ - b='dd/sparse'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -dd/stderr.log: dd/stderr - @p='dd/stderr'; \ - b='dd/stderr'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -dd/unblock.log: dd/unblock - @p='dd/unblock'; \ - b='dd/unblock'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -dd/unblock-sync.log: dd/unblock-sync - @p='dd/unblock-sync'; \ - b='dd/unblock-sync'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -df/total-verify.log: df/total-verify - @p='df/total-verify'; \ - b='df/total-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) -du/2g.log: du/2g - @p='du/2g'; \ - b='du/2g'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -du/8gb.log: du/8gb - @p='du/8gb'; \ - b='du/8gb'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -du/basic.log: du/basic - @p='du/basic'; \ - b='du/basic'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -du/bigtime.log: du/bigtime - @p='du/bigtime'; \ - b='du/bigtime'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -du/deref.log: du/deref - @p='du/deref'; \ - b='du/deref'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -du/deref-args.log: du/deref-args - @p='du/deref-args'; \ - b='du/deref-args'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -du/exclude.log: du/exclude - @p='du/exclude'; \ - b='du/exclude'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -du/fd-leak.log: du/fd-leak - @p='du/fd-leak'; \ - b='du/fd-leak'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -du/files0-from.log: du/files0-from - @p='du/files0-from'; \ - b='du/files0-from'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -du/files0-from-dir.log: du/files0-from-dir - @p='du/files0-from-dir'; \ - b='du/files0-from-dir'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -du/hard-link.log: du/hard-link - @p='du/hard-link'; \ - b='du/hard-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) -du/inacc-dest.log: du/inacc-dest - @p='du/inacc-dest'; \ - b='du/inacc-dest'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -du/inacc-dir.log: du/inacc-dir - @p='du/inacc-dir'; \ - b='du/inacc-dir'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -du/inaccessible-cwd.log: du/inaccessible-cwd - @p='du/inaccessible-cwd'; \ - b='du/inaccessible-cwd'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -du/long-from-unreadable.log: du/long-from-unreadable - @p='du/long-from-unreadable'; \ - b='du/long-from-unreadable'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -du/long-sloop.log: du/long-sloop - @p='du/long-sloop'; \ - b='du/long-sloop'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -du/max-depth.log: du/max-depth - @p='du/max-depth'; \ - b='du/max-depth'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -du/move-dir-while-traversing.log: du/move-dir-while-traversing - @p='du/move-dir-while-traversing'; \ - b='du/move-dir-while-traversing'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -du/no-deref.log: du/no-deref - @p='du/no-deref'; \ - b='du/no-deref'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -du/no-x.log: du/no-x - @p='du/no-x'; \ - b='du/no-x'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -du/one-file-system.log: du/one-file-system - @p='du/one-file-system'; \ - b='du/one-file-system'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -du/restore-wd.log: du/restore-wd - @p='du/restore-wd'; \ - b='du/restore-wd'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -du/slash.log: du/slash - @p='du/slash'; \ - b='du/slash'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -du/slink.log: du/slink - @p='du/slink'; \ - b='du/slink'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -du/trailing-slash.log: du/trailing-slash - @p='du/trailing-slash'; \ - b='du/trailing-slash'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -du/two-args.log: du/two-args - @p='du/two-args'; \ - b='du/two-args'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -id/gnu-zero-uids.log: id/gnu-zero-uids - @p='id/gnu-zero-uids'; \ - b='id/gnu-zero-uids'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -id/no-context.log: id/no-context - @p='id/no-context'; \ - b='id/no-context'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -install/basic-1.log: install/basic-1 - @p='install/basic-1'; \ - b='install/basic-1'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -install/create-leading.log: install/create-leading - @p='install/create-leading'; \ - b='install/create-leading'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -install/d-slashdot.log: install/d-slashdot - @p='install/d-slashdot'; \ - b='install/d-slashdot'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -install/install-C.log: install/install-C - @p='install/install-C'; \ - b='install/install-C'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -install/install-C-selinux.log: install/install-C-selinux - @p='install/install-C-selinux'; \ - b='install/install-C-selinux'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -install/strip-program.log: install/strip-program - @p='install/strip-program'; \ - b='install/strip-program'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -install/trap.log: install/trap - @p='install/trap'; \ - b='install/trap'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -ln/backup-1.log: ln/backup-1 - @p='ln/backup-1'; \ - b='ln/backup-1'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -ln/hard-backup.log: ln/hard-backup - @p='ln/hard-backup'; \ - b='ln/hard-backup'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -ln/hard-to-sym.log: ln/hard-to-sym - @p='ln/hard-to-sym'; \ - b='ln/hard-to-sym'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -ln/misc.log: ln/misc - @p='ln/misc'; \ - b='ln/misc'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -ln/relative.log: ln/relative - @p='ln/relative'; \ - b='ln/relative'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -ln/sf-1.log: ln/sf-1 - @p='ln/sf-1'; \ - b='ln/sf-1'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -ln/slash-decorated-nonexistent-dest.log: ln/slash-decorated-nonexistent-dest - @p='ln/slash-decorated-nonexistent-dest'; \ - b='ln/slash-decorated-nonexistent-dest'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -ln/target-1.log: ln/target-1 - @p='ln/target-1'; \ - b='ln/target-1'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -ls/abmon-align.log: ls/abmon-align - @p='ls/abmon-align'; \ - b='ls/abmon-align'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -ls/block-size.log: ls/block-size - @p='ls/block-size'; \ - b='ls/block-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) -ls/color-clear-to-eol.log: ls/color-clear-to-eol - @p='ls/color-clear-to-eol'; \ - b='ls/color-clear-to-eol'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -ls/color-dtype-dir.log: ls/color-dtype-dir - @p='ls/color-dtype-dir'; \ - b='ls/color-dtype-dir'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -ls/color-norm.log: ls/color-norm - @p='ls/color-norm'; \ - b='ls/color-norm'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -ls/dangle.log: ls/dangle - @p='ls/dangle'; \ - b='ls/dangle'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -ls/dired.log: ls/dired - @p='ls/dired'; \ - b='ls/dired'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -ls/file-type.log: ls/file-type - @p='ls/file-type'; \ - b='ls/file-type'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -ls/follow-slink.log: ls/follow-slink - @p='ls/follow-slink'; \ - b='ls/follow-slink'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -ls/getxattr-speedup.log: ls/getxattr-speedup - @p='ls/getxattr-speedup'; \ - b='ls/getxattr-speedup'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -ls/infloop.log: ls/infloop - @p='ls/infloop'; \ - b='ls/infloop'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -ls/inode.log: ls/inode - @p='ls/inode'; \ - b='ls/inode'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -ls/m-option.log: ls/m-option - @p='ls/m-option'; \ - b='ls/m-option'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -ls/multihardlink.log: ls/multihardlink - @p='ls/multihardlink'; \ - b='ls/multihardlink'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -ls/no-arg.log: ls/no-arg - @p='ls/no-arg'; \ - b='ls/no-arg'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -ls/no-cap.log: ls/no-cap - @p='ls/no-cap'; \ - b='ls/no-cap'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -ls/proc-selinux-segfault.log: ls/proc-selinux-segfault - @p='ls/proc-selinux-segfault'; \ - b='ls/proc-selinux-segfault'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -ls/readdir-mountpoint-inode.log: ls/readdir-mountpoint-inode - @p='ls/readdir-mountpoint-inode'; \ - b='ls/readdir-mountpoint-inode'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -ls/recursive.log: ls/recursive - @p='ls/recursive'; \ - b='ls/recursive'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -ls/rt-1.log: ls/rt-1 - @p='ls/rt-1'; \ - b='ls/rt-1'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -ls/slink-acl.log: ls/slink-acl - @p='ls/slink-acl'; \ - b='ls/slink-acl'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -ls/stat-dtype.log: ls/stat-dtype - @p='ls/stat-dtype'; \ - b='ls/stat-dtype'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -ls/stat-failed.log: ls/stat-failed - @p='ls/stat-failed'; \ - b='ls/stat-failed'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -ls/stat-free-color.log: ls/stat-free-color - @p='ls/stat-free-color'; \ - b='ls/stat-free-color'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -ls/stat-free-symlinks.log: ls/stat-free-symlinks - @p='ls/stat-free-symlinks'; \ - b='ls/stat-free-symlinks'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -ls/stat-vs-dirent.log: ls/stat-vs-dirent - @p='ls/stat-vs-dirent'; \ - b='ls/stat-vs-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) -ls/symlink-slash.log: ls/symlink-slash - @p='ls/symlink-slash'; \ - b='ls/symlink-slash'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -ls/time-style-diag.log: ls/time-style-diag - @p='ls/time-style-diag'; \ - b='ls/time-style-diag'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -ls/x-option.log: ls/x-option - @p='ls/x-option'; \ - b='ls/x-option'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -mkdir/p-1.log: mkdir/p-1 - @p='mkdir/p-1'; \ - b='mkdir/p-1'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -mkdir/p-2.log: mkdir/p-2 - @p='mkdir/p-2'; \ - b='mkdir/p-2'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -mkdir/p-3.log: mkdir/p-3 - @p='mkdir/p-3'; \ - b='mkdir/p-3'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -mkdir/p-slashdot.log: mkdir/p-slashdot - @p='mkdir/p-slashdot'; \ - b='mkdir/p-slashdot'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -mkdir/p-thru-slink.log: mkdir/p-thru-slink - @p='mkdir/p-thru-slink'; \ - b='mkdir/p-thru-slink'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -mkdir/p-v.log: mkdir/p-v - @p='mkdir/p-v'; \ - b='mkdir/p-v'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -mkdir/parents.log: mkdir/parents - @p='mkdir/parents'; \ - b='mkdir/parents'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -mkdir/perm.log: mkdir/perm - @p='mkdir/perm'; \ - b='mkdir/perm'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -mkdir/selinux.log: mkdir/selinux - @p='mkdir/selinux'; \ - b='mkdir/selinux'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -mkdir/special-1.log: mkdir/special-1 - @p='mkdir/special-1'; \ - b='mkdir/special-1'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -mkdir/t-slash.log: mkdir/t-slash - @p='mkdir/t-slash'; \ - b='mkdir/t-slash'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -mv/acl.log: mv/acl - @p='mv/acl'; \ - b='mv/acl'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -mv/atomic.log: mv/atomic - @p='mv/atomic'; \ - b='mv/atomic'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -mv/atomic2.log: mv/atomic2 - @p='mv/atomic2'; \ - b='mv/atomic2'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -mv/backup-dir.log: mv/backup-dir - @p='mv/backup-dir'; \ - b='mv/backup-dir'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -mv/backup-is-src.log: mv/backup-is-src - @p='mv/backup-is-src'; \ - b='mv/backup-is-src'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -mv/childproof.log: mv/childproof - @p='mv/childproof'; \ - b='mv/childproof'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -mv/diag.log: mv/diag - @p='mv/diag'; \ - b='mv/diag'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -mv/dir-file.log: mv/dir-file - @p='mv/dir-file'; \ - b='mv/dir-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) -mv/dir2dir.log: mv/dir2dir - @p='mv/dir2dir'; \ - b='mv/dir2dir'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -mv/dup-source.log: mv/dup-source - @p='mv/dup-source'; \ - b='mv/dup-source'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -mv/force.log: mv/force - @p='mv/force'; \ - b='mv/force'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -mv/hard-2.log: mv/hard-2 - @p='mv/hard-2'; \ - b='mv/hard-2'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -mv/hard-3.log: mv/hard-3 - @p='mv/hard-3'; \ - b='mv/hard-3'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -mv/hard-4.log: mv/hard-4 - @p='mv/hard-4'; \ - b='mv/hard-4'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -mv/hard-link-1.log: mv/hard-link-1 - @p='mv/hard-link-1'; \ - b='mv/hard-link-1'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -mv/hard-verbose.log: mv/hard-verbose - @p='mv/hard-verbose'; \ - b='mv/hard-verbose'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -mv/i-1.log: mv/i-1 - @p='mv/i-1'; \ - b='mv/i-1'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -mv/i-2.log: mv/i-2 - @p='mv/i-2'; \ - b='mv/i-2'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -mv/i-3.log: mv/i-3 - @p='mv/i-3'; \ - b='mv/i-3'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -mv/i-4.log: mv/i-4 - @p='mv/i-4'; \ - b='mv/i-4'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -mv/i-5.log: mv/i-5 - @p='mv/i-5'; \ - b='mv/i-5'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -mv/i-link-no.log: mv/i-link-no - @p='mv/i-link-no'; \ - b='mv/i-link-no'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -mv/into-self.log: mv/into-self - @p='mv/into-self'; \ - b='mv/into-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) -mv/into-self-2.log: mv/into-self-2 - @p='mv/into-self-2'; \ - b='mv/into-self-2'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -mv/into-self-3.log: mv/into-self-3 - @p='mv/into-self-3'; \ - b='mv/into-self-3'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -mv/into-self-4.log: mv/into-self-4 - @p='mv/into-self-4'; \ - b='mv/into-self-4'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -mv/leak-fd.log: mv/leak-fd - @p='mv/leak-fd'; \ - b='mv/leak-fd'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -mv/mv-n.log: mv/mv-n - @p='mv/mv-n'; \ - b='mv/mv-n'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -mv/mv-special-1.log: mv/mv-special-1 - @p='mv/mv-special-1'; \ - b='mv/mv-special-1'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -mv/no-target-dir.log: mv/no-target-dir - @p='mv/no-target-dir'; \ - b='mv/no-target-dir'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -mv/part-fail.log: mv/part-fail - @p='mv/part-fail'; \ - b='mv/part-fail'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -mv/part-hardlink.log: mv/part-hardlink - @p='mv/part-hardlink'; \ - b='mv/part-hardlink'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -mv/part-rename.log: mv/part-rename - @p='mv/part-rename'; \ - b='mv/part-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) -mv/part-symlink.log: mv/part-symlink - @p='mv/part-symlink'; \ - b='mv/part-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) -mv/partition-perm.log: mv/partition-perm - @p='mv/partition-perm'; \ - b='mv/partition-perm'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -mv/perm-1.log: mv/perm-1 - @p='mv/perm-1'; \ - b='mv/perm-1'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -mv/symlink-onto-hardlink.log: mv/symlink-onto-hardlink - @p='mv/symlink-onto-hardlink'; \ - b='mv/symlink-onto-hardlink'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -mv/symlink-onto-hardlink-to-self.log: mv/symlink-onto-hardlink-to-self - @p='mv/symlink-onto-hardlink-to-self'; \ - b='mv/symlink-onto-hardlink-to-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) -mv/to-symlink.log: mv/to-symlink - @p='mv/to-symlink'; \ - b='mv/to-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) -mv/trailing-slash.log: mv/trailing-slash - @p='mv/trailing-slash'; \ - b='mv/trailing-slash'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -mv/update.log: mv/update - @p='mv/update'; \ - b='mv/update'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -readlink/can-e.log: readlink/can-e - @p='readlink/can-e'; \ - b='readlink/can-e'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -readlink/can-f.log: readlink/can-f - @p='readlink/can-f'; \ - b='readlink/can-f'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -readlink/can-m.log: readlink/can-m - @p='readlink/can-m'; \ - b='readlink/can-m'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -readlink/rl-1.log: readlink/rl-1 - @p='readlink/rl-1'; \ - b='readlink/rl-1'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -rmdir/fail-perm.log: rmdir/fail-perm - @p='rmdir/fail-perm'; \ - b='rmdir/fail-perm'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -rmdir/ignore.log: rmdir/ignore - @p='rmdir/ignore'; \ - b='rmdir/ignore'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -rmdir/t-slash.log: rmdir/t-slash - @p='rmdir/t-slash'; \ - b='rmdir/t-slash'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -tail-2/assert-2.log: tail-2/assert-2 - @p='tail-2/assert-2'; \ - b='tail-2/assert-2'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -tail-2/big-4gb.log: tail-2/big-4gb - @p='tail-2/big-4gb'; \ - b='tail-2/big-4gb'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -tail-2/flush-initial.log: tail-2/flush-initial - @p='tail-2/flush-initial'; \ - b='tail-2/flush-initial'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -tail-2/follow-name.log: tail-2/follow-name - @p='tail-2/follow-name'; \ - b='tail-2/follow-name'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -tail-2/follow-stdin.log: tail-2/follow-stdin - @p='tail-2/follow-stdin'; \ - b='tail-2/follow-stdin'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -tail-2/pipe-f.log: tail-2/pipe-f - @p='tail-2/pipe-f'; \ - b='tail-2/pipe-f'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -tail-2/pipe-f2.log: tail-2/pipe-f2 - @p='tail-2/pipe-f2'; \ - b='tail-2/pipe-f2'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -tail-2/proc-ksyms.log: tail-2/proc-ksyms - @p='tail-2/proc-ksyms'; \ - b='tail-2/proc-ksyms'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -tail-2/start-middle.log: tail-2/start-middle - @p='tail-2/start-middle'; \ - b='tail-2/start-middle'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -touch/60-seconds.log: touch/60-seconds - @p='touch/60-seconds'; \ - b='touch/60-seconds'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -touch/dangling-symlink.log: touch/dangling-symlink - @p='touch/dangling-symlink'; \ - b='touch/dangling-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) -touch/dir-1.log: touch/dir-1 - @p='touch/dir-1'; \ - b='touch/dir-1'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -touch/fail-diag.log: touch/fail-diag - @p='touch/fail-diag'; \ - b='touch/fail-diag'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -touch/fifo.log: touch/fifo - @p='touch/fifo'; \ - b='touch/fifo'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -touch/no-create-missing.log: touch/no-create-missing - @p='touch/no-create-missing'; \ - b='touch/no-create-missing'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -touch/no-dereference.log: touch/no-dereference - @p='touch/no-dereference'; \ - b='touch/no-dereference'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -touch/no-rights.log: touch/no-rights - @p='touch/no-rights'; \ - b='touch/no-rights'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -touch/not-owner.log: touch/not-owner - @p='touch/not-owner'; \ - b='touch/not-owner'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -touch/obsolescent.log: touch/obsolescent - @p='touch/obsolescent'; \ - b='touch/obsolescent'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -touch/read-only.log: touch/read-only - @p='touch/read-only'; \ - b='touch/read-only'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -touch/relative.log: touch/relative - @p='touch/relative'; \ - b='touch/relative'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -touch/trailing-slash.log: touch/trailing-slash - @p='touch/trailing-slash'; \ - b='touch/trailing-slash'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -chown/basic.log: chown/basic - @p='chown/basic'; \ - b='chown/basic'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -cp/cp-a-selinux.log: cp/cp-a-selinux - @p='cp/cp-a-selinux'; \ - b='cp/cp-a-selinux'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -cp/preserve-gid.log: cp/preserve-gid - @p='cp/preserve-gid'; \ - b='cp/preserve-gid'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -cp/special-bits.log: cp/special-bits - @p='cp/special-bits'; \ - b='cp/special-bits'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -cp/cp-mv-enotsup-xattr.log: cp/cp-mv-enotsup-xattr - @p='cp/cp-mv-enotsup-xattr'; \ - b='cp/cp-mv-enotsup-xattr'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -cp/capability.log: cp/capability - @p='cp/capability'; \ - b='cp/capability'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -cp/sparse-fiemap.log: cp/sparse-fiemap - @p='cp/sparse-fiemap'; \ - b='cp/sparse-fiemap'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -dd/skip-seek-past-dev.log: dd/skip-seek-past-dev - @p='dd/skip-seek-past-dev'; \ - b='dd/skip-seek-past-dev'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -install/install-C-root.log: install/install-C-root - @p='install/install-C-root'; \ - b='install/install-C-root'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -ls/capability.log: ls/capability - @p='ls/capability'; \ - b='ls/capability'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -ls/nameless-uid.log: ls/nameless-uid - @p='ls/nameless-uid'; \ - b='ls/nameless-uid'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/chcon.log: misc/chcon - @p='misc/chcon'; \ - b='misc/chcon'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/chroot-credentials.log: misc/chroot-credentials - @p='misc/chroot-credentials'; \ - b='misc/chroot-credentials'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/selinux.log: misc/selinux - @p='misc/selinux'; \ - b='misc/selinux'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -misc/truncate-owned-by-other.log: misc/truncate-owned-by-other - @p='misc/truncate-owned-by-other'; \ - b='misc/truncate-owned-by-other'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -mkdir/writable-under-readonly.log: mkdir/writable-under-readonly - @p='mkdir/writable-under-readonly'; \ - b='mkdir/writable-under-readonly'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -mv/sticky-to-xpart.log: mv/sticky-to-xpart - @p='mv/sticky-to-xpart'; \ - b='mv/sticky-to-xpart'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -rm/fail-2eperm.log: rm/fail-2eperm - @p='rm/fail-2eperm'; \ - b='rm/fail-2eperm'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -rm/no-give-up.log: rm/no-give-up - @p='rm/no-give-up'; \ - b='rm/no-give-up'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -rm/one-file-system.log: rm/one-file-system - @p='rm/one-file-system'; \ - b='rm/one-file-system'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -rm/read-only.log: rm/read-only - @p='rm/read-only'; \ - b='rm/read-only'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -tail-2/append-only.log: tail-2/append-only - @p='tail-2/append-only'; \ - b='tail-2/append-only'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -touch/now-owned-by-other.log: touch/now-owned-by-other - @p='touch/now-owned-by-other'; \ - b='touch/now-owned-by-other'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.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__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__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) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am - $(MAKE) $(AM_MAKEFLAGS) check-TESTS -check: check-am -all-am: Makefile -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) - -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) - -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) - -clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: check-am install-am install-strip - -.PHONY: all all-am check check-TESTS check-am clean clean-generic \ - distclean distclean-generic distdir dvi dvi-am html html-am \ - info info-am install install-am 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-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic pdf pdf-am ps ps-am recheck \ - uninstall uninstall-am - - -.PHONY: check-root -check-root: - $(MAKE) check TESTS='$(root_tests)' - -check-recursive: root-hint - -# Advertise 'check-root' target. -.PHONY: root-hint -root-hint: - @echo '***********************************************************' - @echo "NOTICE: Some tests may be run only as root." - @echo " See the 'Running tests as root' section in README." - @echo '***********************************************************' -vc_exe_in_TESTS: Makefile - $(AM_V_GEN)if test -d $(top_srcdir)/.git && test $(srcdir) = .; then \ - { \ - for list in $(_v) $(_w); do \ - sed -n "/^$$list =[ ]*\\\\$$/,/[^\]$$/p" Makefile.am | \ - sed -n 's/^ *\([^$$ ]\{1,\}\).*/\1/p'; \ - done; \ - for f in `cd $(top_srcdir) && \ - build-aux/vc-list-files $(subdir) | sed 's!^$(subdir)/!!'`; do \ - test -f "$$f" && test -x "$$f" && echo "$$f"; \ - done; \ - } | sort | uniq -u | grep . && exit 1 ||:; \ - else :; fi - -check: vc_exe_in_TESTS -.PHONY: vc_exe_in_TESTS -check-am: .built-programs -.built-programs: $(top_srcdir)/src/Makefile.am - $(AM_V_GEN)(cd $(top_builddir)/src \ - && MAKEFLAGS= $(MAKE) -s built_programs.list) \ - > $@-t && mv $@-t $@ - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/tests/check.mk b/tests/check.mk deleted file mode 100644 index cb67b9dd..00000000 --- a/tests/check.mk +++ /dev/null @@ -1,95 +0,0 @@ -# Include this file at the end of each tests/*/Makefile.am. -# Copyright (C) 2007-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 -# 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/>. - -# Ensure that all version-controlled executable files are listed in TESTS. -# Collect test names from the line matching /^TESTS = \\$$/ to the following -# one that does not end in '\'. -_v = TESTS -_w = root_tests -vc_exe_in_TESTS: Makefile - $(AM_V_GEN)if test -d $(top_srcdir)/.git && test $(srcdir) = .; then \ - { \ - for list in $(_v) $(_w); do \ - sed -n "/^$$list =[ ]*\\\\$$/,/[^\]$$/p" Makefile.am | \ - sed -n 's/^ *\([^$$ ]\{1,\}\).*/\1/p'; \ - done; \ - for f in `cd $(top_srcdir) && \ - build-aux/vc-list-files $(subdir) | sed 's!^$(subdir)/!!'`; do \ - test -f "$$f" && test -x "$$f" && echo "$$f"; \ - done; \ - } | sort | uniq -u | grep . && exit 1 ||:; \ - else :; fi - -check: vc_exe_in_TESTS -.PHONY: vc_exe_in_TESTS - -CLEANFILES = -CLEANFILES += .built-programs -check-am: .built-programs -.built-programs: $(top_srcdir)/src/Makefile.am - $(AM_V_GEN)(cd $(top_builddir)/src \ - && MAKEFLAGS= $(MAKE) -s built_programs.list) \ - > $@-t && mv $@-t $@ - -## '$f' is set by the Automake-generated test harness to the path of the -## current test script stripped of VPATH components, and is used by the -## shell-or-perl script to determine the name of the temporary files to be -## used. Note that $f is a shell variable, not a make macro, so the use of -## '$$f' below is correct, and not a typo. -LOG_COMPILER = \ - $(SHELL) $(srcdir)/shell-or-perl \ - --test-name "$$f" --srcdir '$(srcdir)' \ - --shell '$(SHELL)' --perl '$(PERL)' -- - -# Note that the first lines are statements. They ensure that environment -# variables that can perturb tests are unset or set to expected values. -# The rest are envvar settings that propagate build-related Makefile -# variables to test scripts. -TESTS_ENVIRONMENT = \ - . $(srcdir)/lang-default; \ - tmp__=$${TMPDIR-/tmp}; \ - test -d "$$tmp__" && test -w "$$tmp__" || tmp__=.; \ - . $(srcdir)/envvar-check; \ - TMPDIR=$$tmp__; export TMPDIR; \ - export \ - VERSION='$(VERSION)' \ - LOCALE_FR='$(LOCALE_FR)' \ - LOCALE_FR_UTF8='$(LOCALE_FR_UTF8)' \ - abs_top_builddir='$(abs_top_builddir)' \ - abs_top_srcdir='$(abs_top_srcdir)' \ - abs_srcdir='$(abs_srcdir)' \ - built_programs="`cat .built-programs`" \ - host_os=$(host_os) \ - host_triplet='$(host_triplet)' \ - srcdir='$(srcdir)' \ - top_srcdir='$(top_srcdir)' \ - CONFIG_HEADER='$(abs_top_builddir)/$(CONFIG_INCLUDE)' \ - CU_TEST_NAME=`basename '$(abs_srcdir)'`,`echo $$tst|sed 's,^\./,,;s,/,-,g'` \ - CC='$(CC)' \ - AWK='$(AWK)' \ - EGREP='$(EGREP)' \ - EXEEXT='$(EXEEXT)' \ - MAKE=$(MAKE) \ - PACKAGE_BUGREPORT='$(PACKAGE_BUGREPORT)' \ - PACKAGE_VERSION=$(PACKAGE_VERSION) \ - PERL='$(PERL)' \ - PREFERABLY_POSIX_SHELL='$(PREFERABLY_POSIX_SHELL)' \ - REPLACE_GETCWD=$(REPLACE_GETCWD) \ - ; test -d /usr/xpg4/bin && PATH='/usr/xpg4/bin$(PATH_SEPARATOR)'"$$PATH"; \ - PATH='$(abs_top_builddir)/src$(PATH_SEPARATOR)'"$$PATH" \ - ; 9>&2 - -VERBOSE = yes diff --git a/tests/chgrp/basic b/tests/chgrp/basic deleted file mode 100755 index 8ce2f2dd..00000000 --- a/tests/chgrp/basic +++ /dev/null @@ -1,110 +0,0 @@ -#!/bin/sh -# make sure chgrp is reasonable - -# Copyright (C) 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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ chgrp -require_membership_in_two_groups_ - - -set _ $groups; shift -g1=$1 -g2=$2 -mkdir d -touch f f2 d/f3 -chgrp $g1 f || fail=1 -chgrp $g2 f || fail=1 -chgrp $g2 f2 || fail=1 -chgrp -R $g1 d || fail=1 - -d_files='d d/f3' - -chgrp $g1 f || fail=1 ; test $(stat --p=%g f) = $g1 || fail=1 -chgrp $g2 f || fail=1 ; test $(stat --p=%g f) = $g2 || fail=1 -chgrp $g2 f || fail=1 ; test $(stat --p=%g f) = $g2 || fail=1 -chgrp '' f || fail=1 ; test $(stat --p=%g f) = $g2 || fail=1 -chgrp $g1 f || fail=1 ; test $(stat --p=%g f) = $g1 || fail=1 -chgrp $g1 f || fail=1 ; test $(stat --p=%g f) = $g1 || fail=1 -chgrp --reference=f2 f ; test $(stat --p=%g f) = $g2 || fail=1 - -chgrp -R $g2 d ||fail=1; test $(stat --p=%g: $d_files) = "$g2:$g2:" || fail=1 -chgrp -R $g1 d ||fail=1; test $(stat --p=%g: $d_files) = "$g1:$g1:" || fail=1 -chgrp -R $g2 d ||fail=1; test $(stat --p=%g: $d_files) = "$g2:$g2:" || fail=1 -chgrp -R $g1 d ||fail=1; test $(stat --p=%g: $d_files) = "$g1:$g1:" || fail=1 -chgrp $g2 d ||fail=1; test $(stat --p=%g: $d_files) = "$g2:$g1:" || fail=1 - -rm -f f -touch f -ln -s f symlink -chgrp $g1 f -test $(stat --printf=%g f) = $g1 || fail=1 - -# This should not change the group of f. -chgrp -h $g2 symlink -test $(stat --printf=%g f) = $g1 || fail=1 - -# Don't fail if chgrp failed to set the group of a symlink. -# Some systems don't support that. -test $(stat --printf=%g symlink) = $g2 || - echo 'info: failed to set group of symlink' 1>&2 - -chown --from=:$g1 :$g2 f; test $(stat --printf=%g f) = $g2 || fail=1 - -# This *should* change the group of f. -# Though note that the diagnostic is misleading in that -# it says the 'group of 'symlink'' has been changed. -chgrp $g1 symlink; test $(stat --printf=%g f) = $g1 || fail=1 -chown --from=:$g1 :$g2 f; test $(stat --printf=%g f) = $g2 || fail=1 - -# If -R is specified without -H or L, -h is assumed. -chgrp -h $g1 f symlink; test $(stat --printf=%g symlink) = $g1 || fail=1 -chgrp -R $g2 symlink -chown --from=:$g1 :$g2 f; test $(stat --printf=%g f) = $g2 || fail=1 - -# Make sure we can change the group of inaccessible files. -chmod a-r f -chown --from=:$g2 :$g1 f; test $(stat --printf=%g f) = $g1 || fail=1 -chmod 0 f -chown --from=:$g1 :$g2 f; test $(stat --printf=%g f) = $g2 || fail=1 - -# chown() must not be optimized away even when -# the file's owner and group already have the desired value. -rm -f f g -touch f g -chgrp $g1 f g -chgrp $g2 g -sleep 1 -chgrp $g1 f - -# The following no-change chgrp command is supposed to update f's ctime, -# but on OpenBSD and Darwin 7.9.0-8.11.1 (aka MacOS X 10.3.9 - 10.4.11) -# it appears to be a no-op for some file system types (at least NFS) so g's -# ctime is more recent. This is not a big deal; -# this test works fine when the files are on a local file system (/tmp). -chgrp '' f -test "$(ls -C -c -t f g)" = 'f g' || \ - { - case $host_triplet in - *openbsd*) echo ignoring known OpenBSD-specific chgrp failure 1>&2 ;; - *darwin7.9.*|*darwin8.*) - echo ignoring known MacOS X-specific chgrp failure 1>&2 ;; - *) echo $host_triplet: no-change chgrp failed to update ctime 1>&2; - fail=1 ;; - esac - } - -Exit $fail diff --git a/tests/chgrp/basic.sh b/tests/chgrp/basic.sh new file mode 100755 index 00000000..4e0d1811 --- /dev/null +++ b/tests/chgrp/basic.sh @@ -0,0 +1,110 @@ +#!/bin/sh +# make sure chgrp is reasonable + +# Copyright (C) 2000-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ chgrp +require_membership_in_two_groups_ + + +set _ $groups; shift +g1=$1 +g2=$2 +mkdir d +touch f f2 d/f3 +chgrp $g1 f || fail=1 +chgrp $g2 f || fail=1 +chgrp $g2 f2 || fail=1 +chgrp -R $g1 d || fail=1 + +d_files='d d/f3' + +chgrp $g1 f || fail=1 ; test $(stat --p=%g f) = $g1 || fail=1 +chgrp $g2 f || fail=1 ; test $(stat --p=%g f) = $g2 || fail=1 +chgrp $g2 f || fail=1 ; test $(stat --p=%g f) = $g2 || fail=1 +chgrp '' f || fail=1 ; test $(stat --p=%g f) = $g2 || fail=1 +chgrp $g1 f || fail=1 ; test $(stat --p=%g f) = $g1 || fail=1 +chgrp $g1 f || fail=1 ; test $(stat --p=%g f) = $g1 || fail=1 +chgrp --reference=f2 f ; test $(stat --p=%g f) = $g2 || fail=1 + +chgrp -R $g2 d ||fail=1; test $(stat --p=%g: $d_files) = "$g2:$g2:" || fail=1 +chgrp -R $g1 d ||fail=1; test $(stat --p=%g: $d_files) = "$g1:$g1:" || fail=1 +chgrp -R $g2 d ||fail=1; test $(stat --p=%g: $d_files) = "$g2:$g2:" || fail=1 +chgrp -R $g1 d ||fail=1; test $(stat --p=%g: $d_files) = "$g1:$g1:" || fail=1 +chgrp $g2 d ||fail=1; test $(stat --p=%g: $d_files) = "$g2:$g1:" || fail=1 + +rm -f f +touch f +ln -s f symlink +chgrp $g1 f +test $(stat --printf=%g f) = $g1 || fail=1 + +# This should not change the group of f. +chgrp -h $g2 symlink +test $(stat --printf=%g f) = $g1 || fail=1 + +# Don't fail if chgrp failed to set the group of a symlink. +# Some systems don't support that. +test $(stat --printf=%g symlink) = $g2 || + echo 'info: failed to set group of symlink' 1>&2 + +chown --from=:$g1 :$g2 f; test $(stat --printf=%g f) = $g2 || fail=1 + +# This *should* change the group of f. +# Though note that the diagnostic is misleading in that +# it says the 'group of 'symlink'' has been changed. +chgrp $g1 symlink; test $(stat --printf=%g f) = $g1 || fail=1 +chown --from=:$g1 :$g2 f; test $(stat --printf=%g f) = $g2 || fail=1 + +# If -R is specified without -H or L, -h is assumed. +chgrp -h $g1 f symlink; test $(stat --printf=%g symlink) = $g1 || fail=1 +chgrp -R $g2 symlink +chown --from=:$g1 :$g2 f; test $(stat --printf=%g f) = $g2 || fail=1 + +# Make sure we can change the group of inaccessible files. +chmod a-r f +chown --from=:$g2 :$g1 f; test $(stat --printf=%g f) = $g1 || fail=1 +chmod 0 f +chown --from=:$g1 :$g2 f; test $(stat --printf=%g f) = $g2 || fail=1 + +# chown() must not be optimized away even when +# the file's owner and group already have the desired value. +rm -f f g +touch f g +chgrp $g1 f g +chgrp $g2 g +sleep 1 +chgrp $g1 f + +# The following no-change chgrp command is supposed to update f's ctime, +# but on OpenBSD and Darwin 7.9.0-8.11.1 (aka MacOS X 10.3.9 - 10.4.11) +# it appears to be a no-op for some file system types (at least NFS) so g's +# ctime is more recent. This is not a big deal; +# this test works fine when the files are on a local file system (/tmp). +chgrp '' f +test "$(ls -C -c -t f g)" = 'f g' || \ + { + case $host_triplet in + *openbsd*) echo ignoring known OpenBSD-specific chgrp failure 1>&2 ;; + *darwin7.9.*|*darwin8.*) + echo ignoring known MacOS X-specific chgrp failure 1>&2 ;; + *) echo $host_triplet: no-change chgrp failed to update ctime 1>&2; + fail=1 ;; + esac + } + +Exit $fail diff --git a/tests/chgrp/default-no-deref b/tests/chgrp/default-no-deref deleted file mode 100755 index 5d140a8d..00000000 --- a/tests/chgrp/default-no-deref +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -# Ensure that chgrp -R does not dereference symlinks. - -# Copyright (C) 2006-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ chgrp -require_membership_in_two_groups_ - -set _ $groups; shift -g2=$2 - -mkdir d && touch f && ln -s ../f d/s || framework_failure_ - - -g_init=$(stat --printf=%g f) -chgrp -R $g2 d || fail=1 -test $(stat --printf=%g f) = $g_init || fail=1 - -Exit $fail diff --git a/tests/chgrp/default-no-deref.sh b/tests/chgrp/default-no-deref.sh new file mode 100755 index 00000000..03849e50 --- /dev/null +++ b/tests/chgrp/default-no-deref.sh @@ -0,0 +1,33 @@ +#!/bin/sh +# Ensure that chgrp -R does not dereference symlinks. + +# Copyright (C) 2006-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ chgrp +require_membership_in_two_groups_ + +set _ $groups; shift +g2=$2 + +mkdir d && touch f && ln -s ../f d/s || framework_failure_ + + +g_init=$(stat --printf=%g f) +chgrp -R $g2 d || fail=1 +test $(stat --printf=%g f) = $g_init || fail=1 + +Exit $fail diff --git a/tests/chgrp/deref b/tests/chgrp/deref deleted file mode 100755 index 4c186ee8..00000000 --- a/tests/chgrp/deref +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/sh -# see if chgrp can change the group of a symlink - -# Copyright (C) 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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ chgrp -require_membership_in_two_groups_ - -set _ $groups; shift -g1=$1 -g2=$2 - -touch f -ln -s f symlink - -chgrp -h $g2 symlink 2> /dev/null -set _ $(ls -ln symlink) -g=$5 -test "$g" = $g2 || - skip_ "your system doesn't support changing the owner or group" \ - "of a symbolic link." - - -chgrp $g1 f -set _ $(ls -ln f); g=$5; test "$g" = $g1 || fail=1 - -chgrp -h $g2 symlink || fail=1 -set _ $(ls -ln f); g=$5; test "$g" = $g1 || fail=1 -set _ $(ls -ln symlink); g=$5; test "$g" = $g2 || fail=1 - -# This should not change the group of f. -chgrp -h $g2 symlink || fail=1 -set _ $(ls -ln f); g=$5; test "$g" = $g1 || fail=1 -set _ $(ls -ln symlink); g=$5; test "$g" = $g2 || fail=1 - -chgrp $g2 f -set _ $(ls -ln f); g=$5; test "$g" = $g2 || fail=1 - -# This *should* change the group of f. -# Though note that the diagnostic you'd get with -c is misleading in that -# it says the 'group of 'symlink'' has been changed. -chgrp --dereference $g1 symlink -set _ $(ls -ln f); g=$5; test "$g" = $g1 || fail=1 -set _ $(ls -ln symlink); g=$5; test "$g" = $g2 || fail=1 - -Exit $fail diff --git a/tests/chgrp/deref.sh b/tests/chgrp/deref.sh new file mode 100755 index 00000000..b7f6e8f9 --- /dev/null +++ b/tests/chgrp/deref.sh @@ -0,0 +1,60 @@ +#!/bin/sh +# see if chgrp can change the group of a symlink + +# Copyright (C) 2000-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ chgrp +require_membership_in_two_groups_ + +set _ $groups; shift +g1=$1 +g2=$2 + +touch f +ln -s f symlink + +chgrp -h $g2 symlink 2> /dev/null +set _ $(ls -ln symlink) +g=$5 +test "$g" = $g2 || + skip_ "your system doesn't support changing the owner or group" \ + "of a symbolic link." + + +chgrp $g1 f +set _ $(ls -ln f); g=$5; test "$g" = $g1 || fail=1 + +chgrp -h $g2 symlink || fail=1 +set _ $(ls -ln f); g=$5; test "$g" = $g1 || fail=1 +set _ $(ls -ln symlink); g=$5; test "$g" = $g2 || fail=1 + +# This should not change the group of f. +chgrp -h $g2 symlink || fail=1 +set _ $(ls -ln f); g=$5; test "$g" = $g1 || fail=1 +set _ $(ls -ln symlink); g=$5; test "$g" = $g2 || fail=1 + +chgrp $g2 f +set _ $(ls -ln f); g=$5; test "$g" = $g2 || fail=1 + +# This *should* change the group of f. +# Though note that the diagnostic you'd get with -c is misleading in that +# it says the 'group of 'symlink'' has been changed. +chgrp --dereference $g1 symlink +set _ $(ls -ln f); g=$5; test "$g" = $g1 || fail=1 +set _ $(ls -ln symlink); g=$5; test "$g" = $g2 || fail=1 + +Exit $fail diff --git a/tests/chgrp/no-x b/tests/chgrp/no-x deleted file mode 100755 index 6e9347f9..00000000 --- a/tests/chgrp/no-x +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh -# Make sure chgrp gives the right diagnostic for a readable, -# but inaccessible directory. - -# Copyright (C) 2003-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ chgrp -require_membership_in_two_groups_ -skip_if_root_ - -set _ $groups; shift -g1=$1 -g2=$2 - -mkdir -p d/no-x/y || framework_failure_ -chmod u=rw d/no-x || framework_failure_ - - -# This must exit nonzero. -chgrp -R $g2 d >/dev/null 2>out && fail=1 - -prog=chgrp -# NOTE: this code is the same for all tests/*/no-x tests. -# Depending on whether fts is using native fdopendir, we see one -# of the following diagnostics (note also the /y suffix in one case): -# prog: 'd/no-x': Permission denied -# prog: cannot access 'd/no-x/y': Permission denied -# prog: cannot read directory 'd/no-x': Permission denied -# Convert either of the latter two to the first one. -sed "s/^$prog: cannot access /$prog: /" out > t && mv t out -sed "s/^$prog: cannot read directory /$prog: /" out > t && mv t out -sed 's,d/no-x/y,d/no-x,' out > t && mv t out - -cat <<EOF > exp -$prog: 'd/no-x': Permission denied -EOF - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/chgrp/no-x.sh b/tests/chgrp/no-x.sh new file mode 100755 index 00000000..2f3239f3 --- /dev/null +++ b/tests/chgrp/no-x.sh @@ -0,0 +1,54 @@ +#!/bin/sh +# Make sure chgrp gives the right diagnostic for a readable, +# but inaccessible directory. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ chgrp +require_membership_in_two_groups_ +skip_if_root_ + +set _ $groups; shift +g1=$1 +g2=$2 + +mkdir -p d/no-x/y || framework_failure_ +chmod u=rw d/no-x || framework_failure_ + + +# This must exit nonzero. +chgrp -R $g2 d >/dev/null 2>out && fail=1 + +prog=chgrp +# NOTE: this code is the same for all tests/*/no-x tests. +# Depending on whether fts is using native fdopendir, we see one +# of the following diagnostics (note also the /y suffix in one case): +# prog: 'd/no-x': Permission denied +# prog: cannot access 'd/no-x/y': Permission denied +# prog: cannot read directory 'd/no-x': Permission denied +# Convert either of the latter two to the first one. +sed "s/^$prog: cannot access /$prog: /" out > t && mv t out +sed "s/^$prog: cannot read directory /$prog: /" out > t && mv t out +sed 's,d/no-x/y,d/no-x,' out > t && mv t out + +cat <<EOF > exp +$prog: 'd/no-x': Permission denied +EOF + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/chgrp/posix-H b/tests/chgrp/posix-H deleted file mode 100755 index 3965f1ff..00000000 --- a/tests/chgrp/posix-H +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/sh -# Test POSIX-mandated -H option. - -# Copyright (C) 2003-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ chgrp -require_membership_in_two_groups_ - -set _ $groups; shift -g1=$1 -g2=$2 - -mkdir 1 2 3 || framework_failure_ -touch 1/1F 2/2F 3/3F || framework_failure_ -ln -s 1 1s || framework_failure_ -ln -s ../3 2/2s || framework_failure_ -chgrp -R $g1 1 2 3 || framework_failure_ - - -chgrp --preserve-root -H -R $g2 1s 2 || fail=1 - -# These must have group $g2. -# ========================= -changed=' -1 -1/1F -2 -2/2F -3 -' -for i in $changed; do - # Filter out symlinks (entries that end in 's'), since it's not - # possible to change their group/owner information on some systems. - case $i in *s) continue;; esac - set _ $(ls -dgn $i); shift - group=$3 - test $group = $g2 || fail=1 -done - -# These must have group $g1. -# ========================= -not_changed=' -1s -2/2s -3/3F -' -for i in $not_changed; do - # Filter out symlinks (entries that end in 's'), since it's not - # possible to change their group/owner information on some systems. - case $i in *s) continue;; esac - set _ $(ls -dgn $i); shift - group=$3 - test $group = $g1 || fail=1 -done - -Exit $fail diff --git a/tests/chgrp/posix-H.sh b/tests/chgrp/posix-H.sh new file mode 100755 index 00000000..95676691 --- /dev/null +++ b/tests/chgrp/posix-H.sh @@ -0,0 +1,70 @@ +#!/bin/sh +# Test POSIX-mandated -H option. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ chgrp +require_membership_in_two_groups_ + +set _ $groups; shift +g1=$1 +g2=$2 + +mkdir 1 2 3 || framework_failure_ +touch 1/1F 2/2F 3/3F || framework_failure_ +ln -s 1 1s || framework_failure_ +ln -s ../3 2/2s || framework_failure_ +chgrp -R $g1 1 2 3 || framework_failure_ + + +chgrp --preserve-root -H -R $g2 1s 2 || fail=1 + +# These must have group $g2. +# ========================= +changed=' +1 +1/1F +2 +2/2F +3 +' +for i in $changed; do + # Filter out symlinks (entries that end in 's'), since it's not + # possible to change their group/owner information on some systems. + case $i in *s) continue;; esac + set _ $(ls -dgn $i); shift + group=$3 + test $group = $g2 || fail=1 +done + +# These must have group $g1. +# ========================= +not_changed=' +1s +2/2s +3/3F +' +for i in $not_changed; do + # Filter out symlinks (entries that end in 's'), since it's not + # possible to change their group/owner information on some systems. + case $i in *s) continue;; esac + set _ $(ls -dgn $i); shift + group=$3 + test $group = $g1 || fail=1 +done + +Exit $fail diff --git a/tests/chgrp/recurse b/tests/chgrp/recurse deleted file mode 100755 index 95a910f6..00000000 --- a/tests/chgrp/recurse +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh -# ad-hoc tests of chgrp with -R and -H or -L and symlinks - -# Copyright (C) 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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ chgrp -require_membership_in_two_groups_ - -set _ $groups; shift -g1=$1 -g2=$2 - - -# chgrp -R should not traverse a symlink to a directory. -mkdir d e -touch d/dd e/ee -ln -s ../e d/s -chgrp -R $g1 e/ee || fail=1 -# This should not should change the group of e/ee -chgrp -R $g2 d -set _ $(ls -ln e/ee); g=$5; test "$g" = $g1 || fail=1 -# This must change the group of e/ee, since -L makes -# chgrp traverse the symlink from d/s into e. -chgrp -L -R $g2 d -set _ $(ls -ln e/ee); g=$5; test "$g" = $g2 || fail=1 - -# This must *not* change the group of e/ee -chgrp -H -R $g1 d -set _ $(ls -ln e/ee); g=$5; test "$g" = $g2 || fail=1 - -ln -s d link - -# This shouldn't change the group of e/ee either. -chgrp -H -R $g1 link || fail=1 -set _ $(ls -ln e/ee); g=$5; test "$g" = $g2 || fail=1 -# But it *should* change d/dd. -set _ $(ls -ln d/dd); g=$5; test "$g" = $g1 || fail=1 - -Exit $fail diff --git a/tests/chgrp/recurse.sh b/tests/chgrp/recurse.sh new file mode 100755 index 00000000..6ad7a10c --- /dev/null +++ b/tests/chgrp/recurse.sh @@ -0,0 +1,53 @@ +#!/bin/sh +# ad-hoc tests of chgrp with -R and -H or -L and symlinks + +# Copyright (C) 2000-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ chgrp +require_membership_in_two_groups_ + +set _ $groups; shift +g1=$1 +g2=$2 + + +# chgrp -R should not traverse a symlink to a directory. +mkdir d e +touch d/dd e/ee +ln -s ../e d/s +chgrp -R $g1 e/ee || fail=1 +# This should not should change the group of e/ee +chgrp -R $g2 d +set _ $(ls -ln e/ee); g=$5; test "$g" = $g1 || fail=1 +# This must change the group of e/ee, since -L makes +# chgrp traverse the symlink from d/s into e. +chgrp -L -R $g2 d +set _ $(ls -ln e/ee); g=$5; test "$g" = $g2 || fail=1 + +# This must *not* change the group of e/ee +chgrp -H -R $g1 d +set _ $(ls -ln e/ee); g=$5; test "$g" = $g2 || fail=1 + +ln -s d link + +# This shouldn't change the group of e/ee either. +chgrp -H -R $g1 link || fail=1 +set _ $(ls -ln e/ee); g=$5; test "$g" = $g2 || fail=1 +# But it *should* change d/dd. +set _ $(ls -ln d/dd); g=$5; test "$g" = $g1 || fail=1 + +Exit $fail diff --git a/tests/chmod/c-option b/tests/chmod/c-option deleted file mode 100755 index 0fc83912..00000000 --- a/tests/chmod/c-option +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -# Verify that chmod's --changes (-c) option works. - -# Copyright (C) 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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ chmod - -umask 0 -file=f -touch $file || framework_failure_ -chmod 444 $file || framework_failure_ - -skip_if_setgid_ - - -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 -case "$(cat out)" in - "mode of 'f' changed from 0744 "?rwxr--r--?" to 0774 "?rwxrwxr--?) ;; - *) cat out; fail=1 ;; -esac - -Exit $fail diff --git a/tests/chmod/c-option.sh b/tests/chmod/c-option.sh new file mode 100755 index 00000000..23fffeab --- /dev/null +++ b/tests/chmod/c-option.sh @@ -0,0 +1,40 @@ +#!/bin/sh +# Verify that chmod's --changes (-c) option works. + +# Copyright (C) 2000-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ chmod + +umask 0 +file=f +touch $file || framework_failure_ +chmod 444 $file || framework_failure_ + +skip_if_setgid_ + + +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 +case "$(cat out)" in + "mode of 'f' changed from 0744 "?rwxr--r--?" to 0774 "?rwxrwxr--?) ;; + *) cat out; fail=1 ;; +esac + +Exit $fail diff --git a/tests/chmod/equal-x b/tests/chmod/equal-x deleted file mode 100755 index e2cac347..00000000 --- a/tests/chmod/equal-x +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# Test "chmod =x" and the like. - -# Copyright (C) 1999-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ chmod - -file=f -touch $file || framework_failure_ - -umask 005 -for mode in =x =xX =Xx =x,=X =X,=x; do - chmod a=r,$mode $file || fail=1 - case "$(ls -l $file)" in - ---x--x---*) ;; - *) fail=1; echo "after 'chmod $mode $file':"; ls -l $file ;; - esac -done - -Exit $fail diff --git a/tests/chmod/equal-x.sh b/tests/chmod/equal-x.sh new file mode 100755 index 00000000..de7ff547 --- /dev/null +++ b/tests/chmod/equal-x.sh @@ -0,0 +1,34 @@ +#!/bin/sh +# Test "chmod =x" and the like. + +# Copyright (C) 1999-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ chmod + +file=f +touch $file || framework_failure_ + +umask 005 +for mode in =x =xX =Xx =x,=X =X,=x; do + chmod a=r,$mode $file || fail=1 + case "$(ls -l $file)" in + ---x--x---*) ;; + *) fail=1; echo "after 'chmod $mode $file':"; ls -l $file ;; + esac +done + +Exit $fail diff --git a/tests/chmod/equals b/tests/chmod/equals deleted file mode 100755 index fd92055c..00000000 --- a/tests/chmod/equals +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh -# Make sure chmod mode arguments of the form A=B work properly. -# Before fileutils-4.1.2, some of them didn't. -# Also, before coreutils-5.3.1, =[ugo] sometimes didn't work. - -# Copyright (C) 2001-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ chmod - -touch f || framework_failure_ - - -expected_u=-rwx------ -expected_g=----rwx--- -expected_o=-------rwx - -for src in u g o; do - for dest in u g o; do - test $dest = $src && continue - chmod a=,$src=rwx,$dest=$src,$src= f || fail=1 - actual_perms=$(ls -l f|cut -b-10) - expected_perms=$(eval 'echo $expected_'$dest) - test "$actual_perms" = "$expected_perms" || fail=1 - done -done - -umask 027 -chmod a=,u=rwx,=u f || fail=1 -actual_perms=$(ls -l f|cut -b-10) -test "$actual_perms" = "-rwxr-x---" || fail=1 - -Exit $fail diff --git a/tests/chmod/equals.sh b/tests/chmod/equals.sh new file mode 100755 index 00000000..f0dc9e67 --- /dev/null +++ b/tests/chmod/equals.sh @@ -0,0 +1,46 @@ +#!/bin/sh +# Make sure chmod mode arguments of the form A=B work properly. +# 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. + +# This 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_ chmod + +touch f || framework_failure_ + + +expected_u=-rwx------ +expected_g=----rwx--- +expected_o=-------rwx + +for src in u g o; do + for dest in u g o; do + test $dest = $src && continue + chmod a=,$src=rwx,$dest=$src,$src= f || fail=1 + actual_perms=$(ls -l f|cut -b-10) + expected_perms=$(eval 'echo $expected_'$dest) + test "$actual_perms" = "$expected_perms" || fail=1 + done +done + +umask 027 +chmod a=,u=rwx,=u f || fail=1 +actual_perms=$(ls -l f|cut -b-10) +test "$actual_perms" = "-rwxr-x---" || fail=1 + +Exit $fail diff --git a/tests/chmod/inaccessible b/tests/chmod/inaccessible deleted file mode 100755 index c9040680..00000000 --- a/tests/chmod/inaccessible +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# Test for the bug fixed on 2006-09-20. - -# Copyright (C) 2006-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ chmod - -mkdir -p d/e || framework_failure_ -chmod 0 d/e d || framework_failure_ - - -chmod u+rwx d d/e || fail=1 - -Exit $fail diff --git a/tests/chmod/inaccessible.sh b/tests/chmod/inaccessible.sh new file mode 100755 index 00000000..0863a6e3 --- /dev/null +++ b/tests/chmod/inaccessible.sh @@ -0,0 +1,28 @@ +#!/bin/sh +# Test for the bug fixed on 2006-09-20. + +# Copyright (C) 2006-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ chmod + +mkdir -p d/e || framework_failure_ +chmod 0 d/e d || framework_failure_ + + +chmod u+rwx d d/e || fail=1 + +Exit $fail diff --git a/tests/chmod/no-x b/tests/chmod/no-x deleted file mode 100755 index e802b356..00000000 --- a/tests/chmod/no-x +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh -# Make sure chmod gives the right diagnostic for a readable, -# but inaccessible directory. - -# Copyright (C) 2003-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ chmod -skip_if_root_ - -mkdir -p d/no-x/y a/b || framework_failure_ -chmod u=rw d/no-x || framework_failure_ - - -# This must exit nonzero. -chmod -R o=r d >/dev/null 2>out && fail=1 - -prog=chmod -# NOTE: this code is the same for all tests/*/no-x tests. -# Depending on whether fts is using native fdopendir, we see one -# of the following diagnostics (note also the /y suffix in one case): -# prog: 'd/no-x': Permission denied -# prog: cannot access 'd/no-x/y': Permission denied -# prog: cannot read directory 'd/no-x': Permission denied -# Convert either of the latter two to the first one. -sed "s/^$prog: cannot access /$prog: /" out > t && mv t out -sed "s/^$prog: cannot read directory /$prog: /" out > t && mv t out -sed 's,d/no-x/y,d/no-x,' out > t && mv t out - -cat <<EOF > exp -$prog: 'd/no-x': Permission denied -EOF - -compare exp out || fail=1 - -cd a -# This will fail with ''chmod: fts_read failed: Permission denied'' -chmod a-x . b 2> /dev/null && fail=1 -# chmod must exit with status 1. -# Due to a bug in coreutils-5.93's fts.c, chmod would provoke -# an abort (exit with status 134) on recent glibc-based systems. -test $? = 1 || fail=1 - -Exit $fail diff --git a/tests/chmod/no-x.sh b/tests/chmod/no-x.sh new file mode 100755 index 00000000..76c8fa40 --- /dev/null +++ b/tests/chmod/no-x.sh @@ -0,0 +1,57 @@ +#!/bin/sh +# Make sure chmod gives the right diagnostic for a readable, +# but inaccessible directory. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ chmod +skip_if_root_ + +mkdir -p d/no-x/y a/b || framework_failure_ +chmod u=rw d/no-x || framework_failure_ + + +# This must exit nonzero. +chmod -R o=r d >/dev/null 2>out && fail=1 + +prog=chmod +# NOTE: this code is the same for all tests/*/no-x tests. +# Depending on whether fts is using native fdopendir, we see one +# of the following diagnostics (note also the /y suffix in one case): +# prog: 'd/no-x': Permission denied +# prog: cannot access 'd/no-x/y': Permission denied +# prog: cannot read directory 'd/no-x': Permission denied +# Convert either of the latter two to the first one. +sed "s/^$prog: cannot access /$prog: /" out > t && mv t out +sed "s/^$prog: cannot read directory /$prog: /" out > t && mv t out +sed 's,d/no-x/y,d/no-x,' out > t && mv t out + +cat <<EOF > exp +$prog: 'd/no-x': Permission denied +EOF + +compare exp out || fail=1 + +cd a +# This will fail with ''chmod: fts_read failed: Permission denied'' +chmod a-x . b 2> /dev/null && fail=1 +# chmod must exit with status 1. +# Due to a bug in coreutils-5.93's fts.c, chmod would provoke +# an abort (exit with status 134) on recent glibc-based systems. +test $? = 1 || fail=1 + +Exit $fail diff --git a/tests/chmod/octal b/tests/chmod/octal deleted file mode 100755 index 845116b2..00000000 --- a/tests/chmod/octal +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# ensure that chmod diagnoses a certain type of invalid mode string - -# Copyright (C) 2005-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ chmod - - -# Before coreutils-5.92, this would mistakenly succeed, -# and act like 'chmod 0 .'. -chmod 0-followed-by-anything . 2> /dev/null && fail=1 -chmod 7-followed-by-anything . 2> /dev/null && fail=1 -chmod 8 . 2> /dev/null && fail=1 - -Exit $fail diff --git a/tests/chmod/octal.sh b/tests/chmod/octal.sh new file mode 100755 index 00000000..eaf39208 --- /dev/null +++ b/tests/chmod/octal.sh @@ -0,0 +1,29 @@ +#!/bin/sh +# ensure that chmod diagnoses a certain type of invalid mode string + +# Copyright (C) 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 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_ chmod + + +# Before coreutils-5.92, this would mistakenly succeed, +# and act like 'chmod 0 .'. +chmod 0-followed-by-anything . 2> /dev/null && fail=1 +chmod 7-followed-by-anything . 2> /dev/null && fail=1 +chmod 8 . 2> /dev/null && fail=1 + +Exit $fail diff --git a/tests/chmod/setgid b/tests/chmod/setgid deleted file mode 100755 index 7fc6db21..00000000 --- a/tests/chmod/setgid +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/sh -# Make sure GNU chmod works the same way as those of Solaris, HPUX, AIX -# on directories with the setgid bit set. Also, check that the GNU octal -# notations work. - -# Copyright (C) 2001-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ chmod - -umask 0 -mkdir -m 755 d || framework_failure_ - -chmod g+s d 2> /dev/null && env -- test -g d || - { - # This is required because on some systems (at least NetBSD 1.4.2A), - # it may happen that when you create a directory, its group isn't one - # to which you belong. When that happens, the above chmod fails. So - # here, upon failure, we try to set the group, then rerun the chmod command. - - id_g=$(id -g) && - test -n "$id_g" && - chgrp "$id_g" d && - chmod g+s d || framework_failure_ - } - -# "chmod g+s d" does nothing on some NFS file systems. -env -- test -g d || - skip_ 'cannot create setgid directories' - -for mode in \ - + - g-s 00755 000755 =755 -2000 -7022 755 0755 \ - +2000 -5022 =7777,-5022 -do - chmod $mode d || fail=1 - - case $mode in - g-s | 00*755 | =755 | -2000 | -7022) - expected_mode=drwxr-xr-x ;; - *) expected_mode=drwxr-sr-x ;; - esac - ls_output=$(ls -ld d) - case $ls_output in - $expected_mode*) ;; - *) fail=1 ;; - esac - - chmod =2755 d || fail=1 -done - -Exit $fail diff --git a/tests/chmod/setgid.sh b/tests/chmod/setgid.sh new file mode 100755 index 00000000..fac37e84 --- /dev/null +++ b/tests/chmod/setgid.sh @@ -0,0 +1,64 @@ +#!/bin/sh +# Make sure GNU chmod works the same way as those of Solaris, HPUX, AIX +# on directories with the setgid bit set. Also, check that the GNU octal +# notations work. + +# Copyright (C) 2001-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ chmod + +umask 0 +mkdir -m 755 d || framework_failure_ + +chmod g+s d 2> /dev/null && env -- test -g d || + { + # This is required because on some systems (at least NetBSD 1.4.2A), + # it may happen that when you create a directory, its group isn't one + # to which you belong. When that happens, the above chmod fails. So + # here, upon failure, we try to set the group, then rerun the chmod command. + + id_g=$(id -g) && + test -n "$id_g" && + chgrp "$id_g" d && + chmod g+s d || framework_failure_ + } + +# "chmod g+s d" does nothing on some NFS file systems. +env -- test -g d || + skip_ 'cannot create setgid directories' + +for mode in \ + + - g-s 00755 000755 =755 -2000 -7022 755 0755 \ + +2000 -5022 =7777,-5022 +do + chmod $mode d || fail=1 + + case $mode in + g-s | 00*755 | =755 | -2000 | -7022) + expected_mode=drwxr-xr-x ;; + *) expected_mode=drwxr-sr-x ;; + esac + ls_output=$(ls -ld d) + case $ls_output in + $expected_mode*) ;; + *) fail=1 ;; + esac + + chmod =2755 d || fail=1 +done + +Exit $fail diff --git a/tests/chmod/silent b/tests/chmod/silent deleted file mode 100755 index 00e2348f..00000000 --- a/tests/chmod/silent +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# ensure that chgrp, chmod, chown -f don't print some diagnostics - -# Copyright (C) 2008-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ chgrp chmod chown - -chmod -f 0 no-such 2> out && fail=1 -chgrp -f 0 no-such 2>> out && fail=1 -chown -f 0:0 no-such 2>> out && fail=1 -touch exp || fail=1 - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/chmod/silent.sh b/tests/chmod/silent.sh new file mode 100755 index 00000000..30529ac1 --- /dev/null +++ b/tests/chmod/silent.sh @@ -0,0 +1,29 @@ +#!/bin/sh +# ensure that chgrp, chmod, chown -f don't print some diagnostics + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ chgrp chmod chown + +chmod -f 0 no-such 2> out && fail=1 +chgrp -f 0 no-such 2>> out && fail=1 +chown -f 0:0 no-such 2>> out && fail=1 +touch exp || fail=1 + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/chmod/thru-dangling b/tests/chmod/thru-dangling deleted file mode 100755 index 78124009..00000000 --- a/tests/chmod/thru-dangling +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# Test for proper error and exit code of chmod on a dangling symlink. - -# Copyright (C) 2007-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ chmod - -ln -s non-existent dangle || framework_failure_ - - -# This operation cannot succeed since the symbolic link dangles. -chmod 644 dangle 2> out && fail=1 - -echo "chmod: cannot operate on dangling symlink 'dangle'" > exp -compare exp out || fail=1 - -Exit $fail diff --git a/tests/chmod/thru-dangling.sh b/tests/chmod/thru-dangling.sh new file mode 100755 index 00000000..e6053d0f --- /dev/null +++ b/tests/chmod/thru-dangling.sh @@ -0,0 +1,31 @@ +#!/bin/sh +# Test for proper error and exit code of chmod on a dangling symlink. + +# Copyright (C) 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ chmod + +ln -s non-existent dangle || framework_failure_ + + +# This operation cannot succeed since the symbolic link dangles. +chmod 644 dangle 2> out && fail=1 + +echo "chmod: cannot operate on dangling symlink 'dangle'" > exp +compare exp out || fail=1 + +Exit $fail diff --git a/tests/chmod/umask-x b/tests/chmod/umask-x deleted file mode 100755 index dc133e18..00000000 --- a/tests/chmod/umask-x +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# Test that chmod -x file reports an error if the result is executable. - -# Copyright (C) 2005-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ chmod - -touch file -chmod 755 file -(umask 77 && chmod -x file) 2>/dev/null && fail=1 - -Exit $fail diff --git a/tests/chmod/umask-x.sh b/tests/chmod/umask-x.sh new file mode 100755 index 00000000..33166e41 --- /dev/null +++ b/tests/chmod/umask-x.sh @@ -0,0 +1,26 @@ +#!/bin/sh +# Test that chmod -x file reports an error if the result is executable. + +# Copyright (C) 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 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_ chmod + +touch file +chmod 755 file +(umask 77 && chmod -x file) 2>/dev/null && fail=1 + +Exit $fail diff --git a/tests/chmod/usage b/tests/chmod/usage deleted file mode 100755 index 9dd65f7c..00000000 --- a/tests/chmod/usage +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/sh -# Verify that chmod works correctly with odd option combinations. - -# Copyright (C) 2004-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ chmod - - -# Each line in this list is a set of arguments, followed by :, -# followed by the set of files it will attempt to chmod, -# or empty if the usage is erroneous. -# Many of these test cases are due to Glenn Fowler. -# These test cases assume GNU behavior for "options" like -w. -cases=' - -- : - -- -- : - -- -- -- f : -- f - -- -- -w f : -w f - -- -- f : f - -- -w : - -- -w -- f : -- f - -- -w -w f : -w f - -- -w f : f - -- f : - -w : - -w -- : - -w -- -- f : -- f - -w -- -w f : -w f - -w -- f : f - -w -w : - -w -w -- f : f - -w -w -w f : f - -w -w f : f - -w f : f - f : - f -- : - f -w : f - f f : - u+gr f : - ug,+x f : -' - -all_files=$(echo "$cases" | sed 's/.*://'|sort -u) - -old_IFS=$IFS -IFS=' -' -for case in $cases; do - IFS=$old_IFS - args=$(expr "$case" : ' *\(.*[^ ]\) *:') - files=$(expr "$case" : '.*: *\(.*\)') - - case $files in - '') - touch -- $all_files || framework_failure_ - chmod $args 2>/dev/null && fail=1 - ;; - ?*) - touch -- $files || framework_failure_ - chmod $args || fail=1 - for file in $files; do - # Test for misparsing args by creating all $files but $file. - # chmod has a bug if it succeeds even though $file is absent. - rm -f -- $all_files && touch -- $files && rm -- $file \ - || framework_failure_ - chmod $args 2>/dev/null && fail=1 - done - ;; - esac -done - -Exit $fail diff --git a/tests/chmod/usage.sh b/tests/chmod/usage.sh new file mode 100755 index 00000000..2187e35c --- /dev/null +++ b/tests/chmod/usage.sh @@ -0,0 +1,86 @@ +#!/bin/sh +# Verify that chmod works correctly with odd option combinations. + +# Copyright (C) 2004-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ chmod + + +# Each line in this list is a set of arguments, followed by :, +# followed by the set of files it will attempt to chmod, +# or empty if the usage is erroneous. +# Many of these test cases are due to Glenn Fowler. +# These test cases assume GNU behavior for "options" like -w. +cases=' + -- : + -- -- : + -- -- -- f : -- f + -- -- -w f : -w f + -- -- f : f + -- -w : + -- -w -- f : -- f + -- -w -w f : -w f + -- -w f : f + -- f : + -w : + -w -- : + -w -- -- f : -- f + -w -- -w f : -w f + -w -- f : f + -w -w : + -w -w -- f : f + -w -w -w f : f + -w -w f : f + -w f : f + f : + f -- : + f -w : f + f f : + u+gr f : + ug,+x f : +' + +all_files=$(echo "$cases" | sed 's/.*://'|sort -u) + +old_IFS=$IFS +IFS=' +' +for case in $cases; do + IFS=$old_IFS + args=$(expr "$case" : ' *\(.*[^ ]\) *:') + files=$(expr "$case" : '.*: *\(.*\)') + + case $files in + '') + touch -- $all_files || framework_failure_ + chmod $args 2>/dev/null && fail=1 + ;; + ?*) + touch -- $files || framework_failure_ + chmod $args || fail=1 + for file in $files; do + # Test for misparsing args by creating all $files but $file. + # chmod has a bug if it succeeds even though $file is absent. + rm -f -- $all_files && touch -- $files && rm -- $file \ + || framework_failure_ + chmod $args 2>/dev/null && fail=1 + done + ;; + esac +done + +Exit $fail diff --git a/tests/chown/basic b/tests/chown/basic deleted file mode 100755 index 7c8951c8..00000000 --- a/tests/chown/basic +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/sh -# make sure chown --from=... works - -# Copyright (C) 2001-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ chgrp -require_root_ - -touch f || framework_failure_ - -chown -R --preserve-root 0:1 f - -# Make sure the owner and group are 0 and 1 respectively. -set _ $(ls -n f); shift; test "$3:$4" = 0:1 || fail=1 - -# Make sure the correct diagnostic is output -# Note we output a name even though an id was specified. -chown -v --from=42 43 f > out || fail=1 -printf "ownership of 'f' retained as $(id -nu)\n" > exp -compare exp out || fail=1 - -# Ensure diagnostics work for non existent files. -chown -v 0 nf > out && fail=1 -printf "failed to change ownership of 'nf' to 0\n" > exp -compare exp out || fail=1 - -chown --from=0:1 2:010 f || fail=1 - -# And now they should be 2 and 10 respectively. -set _ $(ls -n f); shift; test "$3:$4" = 2:10 || fail=1 - -ln -s f slink -# Applying chown to a symlink with --no-dereference -# should change only the link. -chown --no-dereference 0:1 slink || fail=1 -# owner/group on the symlink should be set -set _ $(ls -n slink); shift; test "$3:$4" = 0:1 || fail=1 -# owner/group on the referent should remain unchanged -set _ $(ls -n f); shift; test "$3:$4" = 2:10 || fail=1 - -chown --no-dereference --from=0:1 2:010 slink || fail=1 -# owner/group on the symlink should be changed -set _ $(ls -n slink); shift; test "$3:$4" = 2:10 || fail=1 - -Exit $fail diff --git a/tests/chown/basic.sh b/tests/chown/basic.sh new file mode 100755 index 00000000..e80a065c --- /dev/null +++ b/tests/chown/basic.sh @@ -0,0 +1,59 @@ +#!/bin/sh +# make sure chown --from=... works + +# Copyright (C) 2001-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ chown +require_root_ + +touch f || framework_failure_ + +chown -R --preserve-root 0:1 f + +# Make sure the owner and group are 0 and 1 respectively. +set _ $(ls -n f); shift; test "$3:$4" = 0:1 || fail=1 + +# Make sure the correct diagnostic is output +# Note we output a name even though an id was specified. +chown -v --from=42 43 f > out || fail=1 +printf "ownership of 'f' retained as $(id -nu)\n" > exp +compare exp out || fail=1 + +# Ensure diagnostics work for non existent files. +chown -v 0 nf > out && fail=1 +printf "failed to change ownership of 'nf' to 0\n" > exp +compare exp out || fail=1 + +chown --from=0:1 2:010 f || fail=1 + +# And now they should be 2 and 10 respectively. +set _ $(ls -n f); shift; test "$3:$4" = 2:10 || fail=1 + +ln -s f slink +# Applying chown to a symlink with --no-dereference +# should change only the link. +chown --no-dereference 0:1 slink || fail=1 +# owner/group on the symlink should be set +set _ $(ls -n slink); shift; test "$3:$4" = 0:1 || fail=1 +# owner/group on the referent should remain unchanged +set _ $(ls -n f); shift; test "$3:$4" = 2:10 || fail=1 + +chown --no-dereference --from=0:1 2:010 slink || fail=1 +# owner/group on the symlink should be changed +set _ $(ls -n slink); shift; test "$3:$4" = 2:10 || fail=1 + +Exit $fail diff --git a/tests/chown/deref b/tests/chown/deref deleted file mode 100755 index d42a0541..00000000 --- a/tests/chown/deref +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh -# For coreutils-5.2.1 and earlier, chown --dereference would skip -# symlinks having owner/group matching the specified owner/group. - -# Copyright (C) 2004-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ chown - -ln -s no-such dangle || framework_failure_ - - -set _ $(ls -ldo dangle); shift; user=$3 - -# With 5.2.1 and earlier, this command would mistakenly succeed. -chown --dereference $user dangle 2> out1 && fail=1 -sed 's/: [^:]*$//' out1 > out - -cat <<\EOF > exp || fail=1 -chown: cannot dereference 'dangle' -EOF - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/chown/deref.sh b/tests/chown/deref.sh new file mode 100755 index 00000000..2372f98f --- /dev/null +++ b/tests/chown/deref.sh @@ -0,0 +1,38 @@ +#!/bin/sh +# 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. + +# This 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_ chown + +ln -s no-such dangle || framework_failure_ + + +set _ $(ls -ldo dangle); shift; user=$3 + +# With 5.2.1 and earlier, this command would mistakenly succeed. +chown --dereference $user dangle 2> out1 && fail=1 +sed 's/: [^:]*$//' out1 > out + +cat <<\EOF > exp || fail=1 +chown: cannot dereference 'dangle' +EOF + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/chown/preserve-root b/tests/chown/preserve-root deleted file mode 100755 index ffad2222..00000000 --- a/tests/chown/preserve-root +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/sh -# Verify that --preserve-root works. - -# Copyright (C) 2006-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ chown -skip_if_root_ - -mkdir d && ln -s / d/slink-to-root - - -# Even if --preserve-root were to malfunction, allowing the chown or -# chgrp to traverse through "/", since we're running as non-root, -# they would be very unlikely to cause any changes. -chown -R --preserve-root 0 / > out 2>&1 && fail=1 -chgrp -R --preserve-root 0 / >> out 2>&1 && fail=1 - -# Here, if --preserve-root were to malfunction, chmod could make changes, -# but only to files owned and unreadable by the user running this test, -# and then, only to make them readable by owner. -chmod -R --preserve-root u+r / >> out 2>&1 && fail=1 - -# With -RHh, --preserve-root should trigger nothing, -# since the symlink in question is not a command line argument. -# Contrary to the above commands, these two should succeed. -echo '==== test -RHh' >> out -chown -RHh --preserve-root $(id -u) d >> out 2>&1 || fail=1 -chgrp -RHh --preserve-root $(id -g) d >> out 2>&1 || fail=1 - -# These must fail. -echo '==== test -RLh' >> out -chown -RLh --preserve-root $(id -u) d >> out 2>&1 && fail=1 -chgrp -RLh --preserve-root $(id -g) d >> out 2>&1 && fail=1 - -cat <<\EOF > exp || fail=1 -chown: it is dangerous to operate recursively on '/' -chown: use --no-preserve-root to override this failsafe -chgrp: it is dangerous to operate recursively on '/' -chgrp: use --no-preserve-root to override this failsafe -chmod: it is dangerous to operate recursively on '/' -chmod: use --no-preserve-root to override this failsafe -==== test -RHh -==== test -RLh -chown: it is dangerous to operate recursively on 'd/slink-to-root' (same as '/') -chown: use --no-preserve-root to override this failsafe -chgrp: it is dangerous to operate recursively on 'd/slink-to-root' (same as '/') -chgrp: use --no-preserve-root to override this failsafe -EOF - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/chown/preserve-root.sh b/tests/chown/preserve-root.sh new file mode 100755 index 00000000..76594180 --- /dev/null +++ b/tests/chown/preserve-root.sh @@ -0,0 +1,66 @@ +#!/bin/sh +# Verify that --preserve-root works. + +# Copyright (C) 2006-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ chown +skip_if_root_ + +mkdir d && ln -s / d/slink-to-root + + +# Even if --preserve-root were to malfunction, allowing the chown or +# chgrp to traverse through "/", since we're running as non-root, +# they would be very unlikely to cause any changes. +chown -R --preserve-root 0 / > out 2>&1 && fail=1 +chgrp -R --preserve-root 0 / >> out 2>&1 && fail=1 + +# Here, if --preserve-root were to malfunction, chmod could make changes, +# but only to files owned and unreadable by the user running this test, +# and then, only to make them readable by owner. +chmod -R --preserve-root u+r / >> out 2>&1 && fail=1 + +# With -RHh, --preserve-root should trigger nothing, +# since the symlink in question is not a command line argument. +# Contrary to the above commands, these two should succeed. +echo '==== test -RHh' >> out +chown -RHh --preserve-root $(id -u) d >> out 2>&1 || fail=1 +chgrp -RHh --preserve-root $(id -g) d >> out 2>&1 || fail=1 + +# These must fail. +echo '==== test -RLh' >> out +chown -RLh --preserve-root $(id -u) d >> out 2>&1 && fail=1 +chgrp -RLh --preserve-root $(id -g) d >> out 2>&1 && fail=1 + +cat <<\EOF > exp || fail=1 +chown: it is dangerous to operate recursively on '/' +chown: use --no-preserve-root to override this failsafe +chgrp: it is dangerous to operate recursively on '/' +chgrp: use --no-preserve-root to override this failsafe +chmod: it is dangerous to operate recursively on '/' +chmod: use --no-preserve-root to override this failsafe +==== test -RHh +==== test -RLh +chown: it is dangerous to operate recursively on 'd/slink-to-root' (same as '/') +chown: use --no-preserve-root to override this failsafe +chgrp: it is dangerous to operate recursively on 'd/slink-to-root' (same as '/') +chgrp: use --no-preserve-root to override this failsafe +EOF + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/chown/separator b/tests/chown/separator deleted file mode 100755 index d4264a8c..00000000 --- a/tests/chown/separator +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/sh -# Make sure "chown USER:GROUP FILE" works, and similar tests with separators. - -# Copyright (C) 2004-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ chown - -id_u=$(id -u) || framework_failure_ -test -n "$id_u" || framework_failure_ - -id_un=$(id -un) || framework_failure_ -test -n "$id_un" || framework_failure_ - -id_g=$(id -g) || framework_failure_ -test -n "$id_g" || framework_failure_ - -id_gn=$(id -gn) || framework_failure_ -test -n "$id_gn" || framework_failure_ - -# 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. -case $host_triplet in - *-freebsd6.*) - case $id_gn in - *[^a-zA-Z0-9._-]*) skip_ "invalid group name: $id_gn";; - esac;; - *) ;; -esac - - -chown '' . || fail=1 - -for u in $id_u "$id_un" ''; do - for g in $id_g "$id_gn" ''; do - case $u$g in - *.*) seps=':' ;; - *) seps=': .' ;; - esac - for sep in $seps; do - case $u$sep$g in - [0-9]*$sep) chown "$u$sep$g" . 2> /dev/null && fail=1 ;; - *) chown "$u$sep$g" . || fail=1 ;; - esac - done - done -done - -Exit $fail diff --git a/tests/chown/separator.sh b/tests/chown/separator.sh new file mode 100755 index 00000000..2a05fb2d --- /dev/null +++ b/tests/chown/separator.sh @@ -0,0 +1,63 @@ +#!/bin/sh +# Make sure "chown USER:GROUP FILE" works, and similar tests with separators. + +# Copyright (C) 2004-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ chown + +id_u=$(id -u) || framework_failure_ +test -n "$id_u" || framework_failure_ + +id_un=$(id -un) || framework_failure_ +test -n "$id_un" || framework_failure_ + +id_g=$(id -g) || framework_failure_ +test -n "$id_g" || framework_failure_ + +id_gn=$(id -gn) || framework_failure_ +test -n "$id_gn" || framework_failure_ + +# 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. +case $host_triplet in + *-freebsd6.*) + case $id_gn in + *[^a-zA-Z0-9._-]*) skip_ "invalid group name: $id_gn";; + esac;; + *) ;; +esac + + +chown '' . || fail=1 + +for u in $id_u "$id_un" ''; do + for g in $id_g "$id_gn" ''; do + case $u$g in + *.*) seps=':' ;; + *) seps=': .' ;; + esac + for sep in $seps; do + case $u$sep$g in + [0-9]*$sep) chown "$u$sep$g" . 2> /dev/null && fail=1 ;; + *) chown "$u$sep$g" . || fail=1 ;; + esac + done + done +done + +Exit $fail diff --git a/tests/cp/abuse b/tests/cp/abuse deleted file mode 100755 index 6338e1f5..00000000 --- a/tests/cp/abuse +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh -# ensure that cp does not write through a just-copied symlink - -# Copyright (C) 2007-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp - -mkdir a b c || framework_failure_ -ln -s ../t a/1 || framework_failure_ -echo payload > b/1 || framework_failure_ - -echo "cp: will not copy 'b/1' through just-created symlink 'c/1'" \ - > exp || framework_failure_ - -# Check both cases: a dangling symlink, and one pointing to a writable file. - -for i in dangling-dest existing-dest; do - test $i = existing-dest && echo i > t - test $i = dangling-dest && rm -f t - - cp -dR a/1 b/1 c 2> out && fail=1 - - compare exp out || fail=1 - - # When the destination is a dangling symlink, - # ensure that cp does not create it. - test $i = dangling-dest \ - && test -f t && fail=1 - - # When the destination symlink points to a writable file, - # ensure that cp does not change it. - test $i = existing-dest \ - && case $(cat t) in i);; *) fail=1;; esac -done - -Exit $fail diff --git a/tests/cp/abuse.sh b/tests/cp/abuse.sh new file mode 100755 index 00000000..1a092dee --- /dev/null +++ b/tests/cp/abuse.sh @@ -0,0 +1,50 @@ +#!/bin/sh +# ensure that cp does not write through a just-copied symlink + +# Copyright (C) 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp + +mkdir a b c || framework_failure_ +ln -s ../t a/1 || framework_failure_ +echo payload > b/1 || framework_failure_ + +echo "cp: will not copy 'b/1' through just-created symlink 'c/1'" \ + > exp || framework_failure_ + +# Check both cases: a dangling symlink, and one pointing to a writable file. + +for i in dangling-dest existing-dest; do + test $i = existing-dest && echo i > t + test $i = dangling-dest && rm -f t + + cp -dR a/1 b/1 c 2> out && fail=1 + + compare exp out || fail=1 + + # When the destination is a dangling symlink, + # ensure that cp does not create it. + test $i = dangling-dest \ + && test -f t && fail=1 + + # When the destination symlink points to a writable file, + # ensure that cp does not change it. + test $i = existing-dest \ + && case $(cat t) in i);; *) fail=1;; esac +done + +Exit $fail diff --git a/tests/cp/acl b/tests/cp/acl deleted file mode 100755 index 26a7f420..00000000 --- a/tests/cp/acl +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/sh -# copy files/directories across file system boundaries -# and make sure acls are preserved appropriately - -# Copyright (C) 2005-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ mv getfacl setfacl - -require_acl_ - -# Skip this test if cp was built without ACL support: -grep '^#define USE_ACL 1' $CONFIG_HEADER > /dev/null || - skip_ "insufficient ACL support" - -mkdir -p a b || framework_failure_ -touch a/file || framework_failure_ - -# Ensure that setfacl and getfacl work on this file system. -skip=no -acl1=$(cd a && getfacl file) || skip=yes -setfacl -m user:bin:rw- a/file 2> /dev/null || skip=yes -test $skip = yes && - skip_ "'.' is not on a suitable file system for this test" - -# copy a file without preserving permissions -cp a/file b/ || fail=1 -acl2=$(cd b && getfacl file) || framework_failure_ -test "$acl1" = "$acl2" || fail=1 - -# Update with acl set above -acl1=$(cd a && getfacl file) || framework_failure_ - -# copy a file, preserving permissions -cp -p a/file b/ || fail=1 -acl2=$(cd b && getfacl file) || framework_failure_ -test "$acl1" = "$acl2" || fail=1 - -# copy a file, preserving permissions, with --attributes-only -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 -acl2=$(cd b && getfacl file) || framework_failure_ -test "$acl1" = "$acl2" || fail=1 - -Exit $fail diff --git a/tests/cp/acl.sh b/tests/cp/acl.sh new file mode 100755 index 00000000..d7c4f2ff --- /dev/null +++ b/tests/cp/acl.sh @@ -0,0 +1,60 @@ +#!/bin/sh +# copy files/directories across file system boundaries +# and make sure acls are preserved appropriately + +# Copyright (C) 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 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 getfacl setfacl + +require_acl_ + +# Skip this test if cp was built without ACL support: +grep '^#define USE_ACL 1' $CONFIG_HEADER > /dev/null || + skip_ "insufficient ACL support" + +mkdir -p a b || framework_failure_ +touch a/file || framework_failure_ + +# Ensure that setfacl and getfacl work on this file system. +skip=no +acl1=$(cd a && getfacl file) || skip=yes +setfacl -m user:bin:rw- a/file 2> /dev/null || skip=yes +test $skip = yes && + skip_ "'.' is not on a suitable file system for this test" + +# copy a file without preserving permissions +cp a/file b/ || fail=1 +acl2=$(cd b && getfacl file) || framework_failure_ +test "$acl1" = "$acl2" || fail=1 + +# Update with acl set above +acl1=$(cd a && getfacl file) || framework_failure_ + +# copy a file, preserving permissions +cp -p a/file b/ || fail=1 +acl2=$(cd b && getfacl file) || framework_failure_ +test "$acl1" = "$acl2" || fail=1 + +# copy a file, preserving permissions, with --attributes-only +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 +acl2=$(cd b && getfacl file) || framework_failure_ +test "$acl1" = "$acl2" || fail=1 + +Exit $fail diff --git a/tests/cp/attr-existing b/tests/cp/attr-existing deleted file mode 100755 index 9cf0ffcb..00000000 --- a/tests/cp/attr-existing +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# Make sure cp --attributes-only doesn't truncate existing data - -# Copyright 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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp - -printf '1' > file1 -printf '2' > file2 -printf '2' > file2.exp - -cp --attributes-only file1 file2 || fail=1 -cmp file2 file2.exp || fail=1 - -Exit $fail diff --git a/tests/cp/attr-existing.sh b/tests/cp/attr-existing.sh new file mode 100755 index 00000000..81334a2c --- /dev/null +++ b/tests/cp/attr-existing.sh @@ -0,0 +1,29 @@ +#!/bin/sh +# Make sure cp --attributes-only doesn't truncate existing data + +# Copyright 2012-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp + +printf '1' > file1 +printf '2' > file2 +printf '2' > file2.exp + +cp --attributes-only file1 file2 || fail=1 +cmp file2 file2.exp || fail=1 + +Exit $fail diff --git a/tests/cp/backup-1 b/tests/cp/backup-1 deleted file mode 100755 index c7ece5f4..00000000 --- a/tests/cp/backup-1 +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -# Test cp backup. - -# Copyright (C) 1997-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp - -suffix=.b -file=F -file_backup="$file$suffix" - -echo test > $file || fail=1 - -# Specify both version control and suffix so the environment variables -# (possibly set by the user running these tests) aren't used. -cp --force --backup=simple --suffix=$suffix $file $file || fail=1 -cp -T --force --backup=simple --suffix=$suffix $file $file || fail=1 - -test -f $file || fail=1 -test -f $file_backup || fail=1 -compare $file $file_backup > /dev/null || fail=1 - -Exit $fail diff --git a/tests/cp/backup-1.sh b/tests/cp/backup-1.sh new file mode 100755 index 00000000..1244de62 --- /dev/null +++ b/tests/cp/backup-1.sh @@ -0,0 +1,37 @@ +#!/bin/sh +# Test cp backup. + +# Copyright (C) 1997-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp + +suffix=.b +file=F +file_backup="$file$suffix" + +echo test > $file || fail=1 + +# Specify both version control and suffix so the environment variables +# (possibly set by the user running these tests) aren't used. +cp --force --backup=simple --suffix=$suffix $file $file || fail=1 +cp -T --force --backup=simple --suffix=$suffix $file $file || fail=1 + +test -f $file || fail=1 +test -f $file_backup || fail=1 +compare $file $file_backup > /dev/null || fail=1 + +Exit $fail diff --git a/tests/cp/backup-dir b/tests/cp/backup-dir deleted file mode 100755 index bc05bd9b..00000000 --- a/tests/cp/backup-dir +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# Ensure that cp -b doesn't back up directories. - -# Copyright (C) 2006-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp - -mkdir x y || framework_failure_ - - -cp -a x y || fail=1 - -# This would mistakenly create a backup of y/x (y/x~) in coreutils-6.3. -cp -ab x y || fail=1 -test -d y/x || fail=1 -test -d y/x~ && fail=1 - -Exit $fail diff --git a/tests/cp/backup-dir.sh b/tests/cp/backup-dir.sh new file mode 100755 index 00000000..9dc18acd --- /dev/null +++ b/tests/cp/backup-dir.sh @@ -0,0 +1,32 @@ +#!/bin/sh +# Ensure that cp -b doesn't back up directories. + +# Copyright (C) 2006-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp + +mkdir x y || framework_failure_ + + +cp -a x y || fail=1 + +# This would mistakenly create a backup of y/x (y/x~) in coreutils-6.3. +cp -ab x y || fail=1 +test -d y/x || fail=1 +test -d y/x~ && fail=1 + +Exit $fail diff --git a/tests/cp/backup-is-src b/tests/cp/backup-is-src deleted file mode 100755 index 98e2ed09..00000000 --- a/tests/cp/backup-is-src +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# Test cp backup to source file. - -# Copyright (C) 1998-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp - -echo a > a || framework_failure_ -echo a-tilde > a~ || framework_failure_ - -# This cp command should exit nonzero. -cp --b=simple a~ a > out 2>&1 && fail=1 - -sed "s,cp:,XXX:," out > out2 - -cat > exp <<\EOF -XXX: backing up 'a' would destroy source; 'a~' not copied -EOF - -compare exp out2 || fail=1 - -Exit $fail diff --git a/tests/cp/backup-is-src.sh b/tests/cp/backup-is-src.sh new file mode 100755 index 00000000..5b6f3138 --- /dev/null +++ b/tests/cp/backup-is-src.sh @@ -0,0 +1,36 @@ +#!/bin/sh +# Test cp backup to source file. + +# Copyright (C) 1998-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp + +echo a > a || framework_failure_ +echo a-tilde > a~ || framework_failure_ + +# This cp command should exit nonzero. +cp --b=simple a~ a > out 2>&1 && fail=1 + +sed "s,cp:,XXX:," out > out2 + +cat > exp <<\EOF +XXX: backing up 'a' would destroy source; 'a~' not copied +EOF + +compare exp out2 || fail=1 + +Exit $fail diff --git a/tests/cp/capability b/tests/cp/capability deleted file mode 100755 index 1338c940..00000000 --- a/tests/cp/capability +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh -# Ensure cp --preserves copies capabilities - -# Copyright (C) 2010-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ ls -require_root_ -working_umask_or_skip_ - - -grep '^#define HAVE_CAP 1' $CONFIG_HEADER > /dev/null \ - || skip_ "configured without libcap support" - -(setcap --help) 2>&1 |grep 'usage: setcap' > /dev/null \ - || skip_ "setcap utility not found" -(getcap --help) 2>&1 |grep 'usage: getcap' > /dev/null \ - || skip_ "getcap utility not found" - - -touch file || framework_failure_ -chown $NON_ROOT_USERNAME file || framework_failure_ - -setcap 'cap_net_bind_service=ep' file || - skip_ "setcap doesn't work" -getcap file | grep cap_net_bind_service >/dev/null || - skip_ "getcap doesn't work" - -cp --preserve=xattr file copy1 || fail=1 - -# Before coreutils 8.5 the capabilities would not be preserved, -# as the owner was set _after_ copying xattrs, thus clearing any capabilities. -cp --preserve=all file copy2 || fail=1 - -for file in copy1 copy2; do - getcap $file | grep cap_net_bind_service >/dev/null || fail=1 -done - -Exit $fail diff --git a/tests/cp/capability.sh b/tests/cp/capability.sh new file mode 100755 index 00000000..61a60cd0 --- /dev/null +++ b/tests/cp/capability.sh @@ -0,0 +1,52 @@ +#!/bin/sh +# Ensure cp --preserves copies capabilities + +# Copyright (C) 2010-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp +require_root_ +working_umask_or_skip_ + + +grep '^#define HAVE_CAP 1' $CONFIG_HEADER > /dev/null \ + || skip_ "configured without libcap support" + +(setcap --help) 2>&1 |grep 'usage: setcap' > /dev/null \ + || skip_ "setcap utility not found" +(getcap --help) 2>&1 |grep 'usage: getcap' > /dev/null \ + || skip_ "getcap utility not found" + + +touch file || framework_failure_ +chown $NON_ROOT_USERNAME file || framework_failure_ + +setcap 'cap_net_bind_service=ep' file || + skip_ "setcap doesn't work" +getcap file | grep cap_net_bind_service >/dev/null || + skip_ "getcap doesn't work" + +cp --preserve=xattr file copy1 || fail=1 + +# Before coreutils 8.5 the capabilities would not be preserved, +# as the owner was set _after_ copying xattrs, thus clearing any capabilities. +cp --preserve=all file copy2 || fail=1 + +for file in copy1 copy2; do + getcap $file | grep cap_net_bind_service >/dev/null || fail=1 +done + +Exit $fail diff --git a/tests/cp/cp-HL b/tests/cp/cp-HL deleted file mode 100755 index bbbd75a7..00000000 --- a/tests/cp/cp-HL +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -# test cp's -H and -L options - -# Copyright (C) 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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp - -mkdir src-dir dest-dir || framework_failure_ -echo f > f || framework_failure_ -ln -s f slink || framework_failure_ -ln -s no-such-file src-dir/slink || framework_failure_ - - -cp -H -R slink src-dir dest-dir || fail=1 -test -d src-dir || fail=1 -test -d dest-dir/src-dir || fail=1 - -# Expect this to succeed since this slink is not a symlink -cat dest-dir/slink > /dev/null 2>&1 || fail=1 - -# Expect this to fail since *this* slink is a dangling symlink. -cat dest-dir/src-dir/slink > /dev/null 2>&1 && fail=1 - -# FIXME: test -L, too. - -Exit $fail diff --git a/tests/cp/cp-HL.sh b/tests/cp/cp-HL.sh new file mode 100755 index 00000000..93052dd6 --- /dev/null +++ b/tests/cp/cp-HL.sh @@ -0,0 +1,40 @@ +#!/bin/sh +# test cp's -H and -L options + +# Copyright (C) 2000-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp + +mkdir src-dir dest-dir || framework_failure_ +echo f > f || framework_failure_ +ln -s f slink || framework_failure_ +ln -s no-such-file src-dir/slink || framework_failure_ + + +cp -H -R slink src-dir dest-dir || fail=1 +test -d src-dir || fail=1 +test -d dest-dir/src-dir || fail=1 + +# Expect this to succeed since this slink is not a symlink +cat dest-dir/slink > /dev/null 2>&1 || fail=1 + +# Expect this to fail since *this* slink is a dangling symlink. +cat dest-dir/src-dir/slink > /dev/null 2>&1 && fail=1 + +# FIXME: test -L, too. + +Exit $fail diff --git a/tests/cp/cp-a-selinux b/tests/cp/cp-a-selinux deleted file mode 100755 index b8529848..00000000 --- a/tests/cp/cp-a-selinux +++ /dev/null @@ -1,114 +0,0 @@ -#!/bin/sh -# Ensure that cp -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-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp -require_root_ -require_selinux_ - -cwd=$(pwd) -cleanup_() { cd /; umount "$cwd/mnt"; } - -# This context is special: it works even when mcstransd isn't running. -ctx=root:object_r:tmp_t:s0 - -# Check basic functionality - before check on fixed context mount -touch c || framework_failure_ -chcon $ctx c || framework_failure_ -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 -ls -Z e | grep $ctx || fail=1 -ls -Z f | grep $ctx || fail=1 - -skip=0 -# Create a file system, then mount it with the context=... option. -dd if=/dev/zero of=blob bs=8192 count=200 || skip=1 -mkdir mnt || skip=1 -mkfs -t ext2 -F blob || - skip_ "failed to create an ext2 file system" - -mount -oloop,context=$ctx blob mnt || skip=1 -test $skip = 1 \ - && skip_ "insufficient mount/ext2 support" - -cd mnt || framework_failure_ - -echo > f || framework_failure_ - -echo > g || framework_failure_ -# /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 -test -s g || fail=1 # The destination file must not be empty. -test -s err && fail=1 # There must be no stderr output. - -# ===================================================== -# 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 -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 -test -s g || fail=1 -grep "Operation not supported" err && fail=1 - -# An alternative to the following approach would be to run in a confined -# domain (maybe creating/loading it) that lacks the required permissions -# to the file type. -# Note: this test could also be run by a regular (non-root) user in an -# NFS mounted directory. When doing that, I get this diagnostic: -# cp: failed to set the security context of 'g' to 'system_u:object_r:nfs_t': \ -# Operation not supported -cat <<\EOF > exp || framework_failure_ -cp: failed to set the security context of -EOF - -rm -f g -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 -# Here, we *do* expect the destination to be empty. -test -s g && fail=1 -sed "s/ .g' to .*//" 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 -# Here, we *do* expect the destination to be empty. -test -s g && fail=1 -sed "s/ .g' to .*//" out2 > k -mv k out2 -compare exp out2 || fail=1 - -Exit $fail diff --git a/tests/cp/cp-a-selinux.sh b/tests/cp/cp-a-selinux.sh new file mode 100755 index 00000000..e7bdcf1d --- /dev/null +++ b/tests/cp/cp-a-selinux.sh @@ -0,0 +1,114 @@ +#!/bin/sh +# Ensure that cp -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. + +# This 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_root_ +require_selinux_ + +cwd=$(pwd) +cleanup_() { cd /; umount "$cwd/mnt"; } + +# This context is special: it works even when mcstransd isn't running. +ctx=root:object_r:tmp_t:s0 + +# Check basic functionality - before check on fixed context mount +touch c || framework_failure_ +chcon $ctx c || framework_failure_ +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 +ls -Z e | grep $ctx || fail=1 +ls -Z f | grep $ctx || fail=1 + +skip=0 +# Create a file system, then mount it with the context=... option. +dd if=/dev/zero of=blob bs=8192 count=200 || skip=1 +mkdir mnt || skip=1 +mkfs -t ext2 -F blob || + skip_ "failed to create an ext2 file system" + +mount -oloop,context=$ctx blob mnt || skip=1 +test $skip = 1 \ + && skip_ "insufficient mount/ext2 support" + +cd mnt || framework_failure_ + +echo > f || framework_failure_ + +echo > g || framework_failure_ +# /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 +test -s g || fail=1 # The destination file must not be empty. +test -s err && fail=1 # There must be no stderr output. + +# ===================================================== +# 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 +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 +test -s g || fail=1 +grep "Operation not supported" err && fail=1 + +# An alternative to the following approach would be to run in a confined +# domain (maybe creating/loading it) that lacks the required permissions +# to the file type. +# Note: this test could also be run by a regular (non-root) user in an +# NFS mounted directory. When doing that, I get this diagnostic: +# cp: failed to set the security context of 'g' to 'system_u:object_r:nfs_t': \ +# Operation not supported +cat <<\EOF > exp || framework_failure_ +cp: failed to set the security context of +EOF + +rm -f g +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 +# Here, we *do* expect the destination to be empty. +test -s g && fail=1 +sed "s/ .g' to .*//" 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 +# Here, we *do* expect the destination to be empty. +test -s g && fail=1 +sed "s/ .g' to .*//" out2 > k +mv k out2 +compare exp out2 || fail=1 + +Exit $fail diff --git a/tests/cp/cp-deref b/tests/cp/cp-deref deleted file mode 100755 index 08a1485f..00000000 --- a/tests/cp/cp-deref +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# 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-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp - -mkdir a b c d || framework_failure_ -ln -s ../c a || framework_failure_ -ln -s ../c b || framework_failure_ - - -# Before coreutils-5.94, the following would fail with this message: -# cp: will not create hard link 'd/b/c' to directory 'd/a/c' -cp -RL a b d || fail=1 -test -d a/c || fail=1 -test -d b/c || fail=1 - -Exit $fail diff --git a/tests/cp/cp-deref.sh b/tests/cp/cp-deref.sh new file mode 100755 index 00000000..3194fda9 --- /dev/null +++ b/tests/cp/cp-deref.sh @@ -0,0 +1,34 @@ +#!/bin/sh +# 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. + +# This 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 + +mkdir a b c d || framework_failure_ +ln -s ../c a || framework_failure_ +ln -s ../c b || framework_failure_ + + +# Before coreutils-5.94, the following would fail with this message: +# cp: will not create hard link 'd/b/c' to directory 'd/a/c' +cp -RL a b d || fail=1 +test -d a/c || fail=1 +test -d b/c || fail=1 + +Exit $fail diff --git a/tests/cp/cp-i b/tests/cp/cp-i deleted file mode 100755 index 746dc276..00000000 --- a/tests/cp/cp-i +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/sh -# Test whether cp -i prompts in the right place. - -# Copyright (C) 2006-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp - -mkdir -p a b/a/c || framework_failure_ -touch a/c || framework_failure_ - - -# coreutils 6.2 cp would neglect to prompt in this case. -echo n | cp -iR a b 2>/dev/null || fail=1 - -# test miscellaneous combinations of -f -i -n parameters -touch c d || framework_failure_ -echo "'c' -> 'd'" > out_copy -> out_empty - -# ask for overwrite, answer no -echo n | cp -vi c d 2>/dev/null > out1 || fail=1 -compare out1 out_empty || fail=1 - -# ask for overwrite, answer yes -echo y | cp -vi c d 2>/dev/null > out2 || fail=1 -compare out2 out_copy || fail=1 - -# -i wins over -n -echo y | cp -vni c d 2>/dev/null > out3 || fail=1 -compare out3 out_copy || fail=1 - -# -n wins over -i -echo y | cp -vin c d 2>/dev/null > out4 || fail=1 -compare out4 out_empty || fail=1 - -# ask for overwrite, answer yes -echo y | cp -vfi c d 2>/dev/null > out5 || fail=1 -compare out5 out_copy || fail=1 - -# do not ask, prevent from overwrite -echo n | cp -vfn c d 2>/dev/null > out6 || fail=1 -compare out6 out_empty || fail=1 - -# do not ask, prevent from overwrite -echo n | cp -vnf c d 2>/dev/null > out7 || fail=1 -compare out7 out_empty || fail=1 - -# options --backup and --no-clobber are mutually exclusive -cp -bn c d 2>/dev/null && fail=1 - -Exit $fail diff --git a/tests/cp/cp-i.sh b/tests/cp/cp-i.sh new file mode 100755 index 00000000..74e9b12f --- /dev/null +++ b/tests/cp/cp-i.sh @@ -0,0 +1,65 @@ +#!/bin/sh +# Test whether cp -i prompts in the right place. + +# Copyright (C) 2006-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp + +mkdir -p a b/a/c || framework_failure_ +touch a/c || framework_failure_ + + +# coreutils 6.2 cp would neglect to prompt in this case. +echo n | cp -iR a b 2>/dev/null || fail=1 + +# test miscellaneous combinations of -f -i -n parameters +touch c d || framework_failure_ +echo "'c' -> 'd'" > out_copy +> out_empty + +# ask for overwrite, answer no +echo n | cp -vi c d 2>/dev/null > out1 || fail=1 +compare out1 out_empty || fail=1 + +# ask for overwrite, answer yes +echo y | cp -vi c d 2>/dev/null > out2 || fail=1 +compare out2 out_copy || fail=1 + +# -i wins over -n +echo y | cp -vni c d 2>/dev/null > out3 || fail=1 +compare out3 out_copy || fail=1 + +# -n wins over -i +echo y | cp -vin c d 2>/dev/null > out4 || fail=1 +compare out4 out_empty || fail=1 + +# ask for overwrite, answer yes +echo y | cp -vfi c d 2>/dev/null > out5 || fail=1 +compare out5 out_copy || fail=1 + +# do not ask, prevent from overwrite +echo n | cp -vfn c d 2>/dev/null > out6 || fail=1 +compare out6 out_empty || fail=1 + +# do not ask, prevent from overwrite +echo n | cp -vnf c d 2>/dev/null > out7 || fail=1 +compare out7 out_empty || fail=1 + +# options --backup and --no-clobber are mutually exclusive +cp -bn c d 2>/dev/null && fail=1 + +Exit $fail diff --git a/tests/cp/cp-mv-backup b/tests/cp/cp-mv-backup deleted file mode 100755 index 030f722d..00000000 --- a/tests/cp/cp-mv-backup +++ /dev/null @@ -1,92 +0,0 @@ -#!/bin/sh -# Test basic --backup functionality for both cp and mv. - -# Copyright (C) 1999-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp - -umask 022 - -# Be careful to close $actual before removing the containing directory. -# Use '1>&2' rather than '1<&-' since the latter appears not to work -# with /bin/sh from powerpc-ibm-aix4.2.0.0. - -actual=actual -expected=expected - -exec 3>&1 1> $actual - -for prog in cp mv; do - for initial_files in 'x' 'x y' 'x y y~' 'x y y.~1~' 'x y y~ y.~1~'; do - for opt in none off numbered t existing nil simple never; do - touch $initial_files - $prog --backup=$opt x y || fail=1 - echo $initial_files $opt: $(ls [xy]*); rm -f x y y~ y.~?~ - done - done -done - -cat <<\EOF > $expected-tmp -x none: x y -x off: x y -x numbered: x y -x t: x y -x existing: x y -x nil: x y -x simple: x y -x never: x y -x y none: x y -x y off: x y -x y numbered: x y y.~1~ -x y t: x y y.~1~ -x y existing: x y y~ -x y nil: x y y~ -x y simple: x y y~ -x y never: x y y~ -x y y~ none: x y y~ -x y y~ off: x y y~ -x y y~ numbered: x y y.~1~ y~ -x y y~ t: x y y.~1~ y~ -x y y~ existing: x y y~ -x y y~ nil: x y y~ -x y y~ simple: x y y~ -x y y~ never: x y y~ -x y y.~1~ none: x y y.~1~ -x y y.~1~ off: x y y.~1~ -x y y.~1~ numbered: x y y.~1~ y.~2~ -x y y.~1~ t: x y y.~1~ y.~2~ -x y y.~1~ existing: x y y.~1~ y.~2~ -x y y.~1~ nil: x y y.~1~ y.~2~ -x y y.~1~ simple: x y y.~1~ y~ -x y y.~1~ never: x y y.~1~ y~ -x y y~ y.~1~ none: x y y.~1~ y~ -x y y~ y.~1~ off: x y y.~1~ y~ -x y y~ y.~1~ numbered: x y y.~1~ y.~2~ y~ -x y y~ y.~1~ t: x y y.~1~ y.~2~ y~ -x y y~ y.~1~ existing: x y y.~1~ y.~2~ y~ -x y y~ y.~1~ nil: x y y.~1~ y.~2~ y~ -x y y~ y.~1~ simple: x y y.~1~ y~ -x y y~ y.~1~ never: x y y.~1~ y~ -EOF - -sed 's/: x/:/' $expected-tmp |cat $expected-tmp - > $expected - -exec 1>&3 3>&- - -compare $expected $actual || fail=1 - -Exit $fail diff --git a/tests/cp/cp-mv-backup.sh b/tests/cp/cp-mv-backup.sh new file mode 100755 index 00000000..6ebd644c --- /dev/null +++ b/tests/cp/cp-mv-backup.sh @@ -0,0 +1,92 @@ +#!/bin/sh +# Test basic --backup functionality for both cp and mv. + +# Copyright (C) 1999-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp + +umask 022 + +# Be careful to close $actual before removing the containing directory. +# Use '1>&2' rather than '1<&-' since the latter appears not to work +# with /bin/sh from powerpc-ibm-aix4.2.0.0. + +actual=actual +expected=expected + +exec 3>&1 1> $actual + +for prog in cp mv; do + for initial_files in 'x' 'x y' 'x y y~' 'x y y.~1~' 'x y y~ y.~1~'; do + for opt in none off numbered t existing nil simple never; do + touch $initial_files + $prog --backup=$opt x y || fail=1 + echo $initial_files $opt: $(ls [xy]*); rm -f x y y~ y.~?~ + done + done +done + +cat <<\EOF > $expected-tmp +x none: x y +x off: x y +x numbered: x y +x t: x y +x existing: x y +x nil: x y +x simple: x y +x never: x y +x y none: x y +x y off: x y +x y numbered: x y y.~1~ +x y t: x y y.~1~ +x y existing: x y y~ +x y nil: x y y~ +x y simple: x y y~ +x y never: x y y~ +x y y~ none: x y y~ +x y y~ off: x y y~ +x y y~ numbered: x y y.~1~ y~ +x y y~ t: x y y.~1~ y~ +x y y~ existing: x y y~ +x y y~ nil: x y y~ +x y y~ simple: x y y~ +x y y~ never: x y y~ +x y y.~1~ none: x y y.~1~ +x y y.~1~ off: x y y.~1~ +x y y.~1~ numbered: x y y.~1~ y.~2~ +x y y.~1~ t: x y y.~1~ y.~2~ +x y y.~1~ existing: x y y.~1~ y.~2~ +x y y.~1~ nil: x y y.~1~ y.~2~ +x y y.~1~ simple: x y y.~1~ y~ +x y y.~1~ never: x y y.~1~ y~ +x y y~ y.~1~ none: x y y.~1~ y~ +x y y~ y.~1~ off: x y y.~1~ y~ +x y y~ y.~1~ numbered: x y y.~1~ y.~2~ y~ +x y y~ y.~1~ t: x y y.~1~ y.~2~ y~ +x y y~ y.~1~ existing: x y y.~1~ y.~2~ y~ +x y y~ y.~1~ nil: x y y.~1~ y.~2~ y~ +x y y~ y.~1~ simple: x y y.~1~ y~ +x y y~ y.~1~ never: x y y.~1~ y~ +EOF + +sed 's/: x/:/' $expected-tmp |cat $expected-tmp - > $expected + +exec 1>&3 3>&- + +compare $expected $actual || fail=1 + +Exit $fail diff --git a/tests/cp/cp-mv-enotsup-xattr b/tests/cp/cp-mv-enotsup-xattr deleted file mode 100755 index 66e54cf1..00000000 --- a/tests/cp/cp-mv-enotsup-xattr +++ /dev/null @@ -1,109 +0,0 @@ -#!/bin/sh -# Ensure that mv, cp -a and cp --preserve=xattr(all) options do work -# as expected on file system without their support and do show correct -# diagnostics when required - -# Copyright (C) 2009-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp mv - -require_root_ - -cwd=$(pwd) -cleanup_() { cd /; umount "$cwd/noxattr"; umount "$cwd/xattr"; } - -skip=0 - -# Mount an ext2 loopback file system at $WHERE with $OPTS -make_fs() { - where="$1" - opts="$2" - - fs="$where.bin" - - dd if=/dev/zero of="$fs" bs=8192 count=200 > /dev/null 2>&1 \ - || skip=1 - mkdir "$where" || skip=1 - mkfs -t ext2 -F "$fs" || - skip_ "failed to create ext2 file system" - mount -oloop,$opts "$fs" "$where" || skip=1 - echo test > "$where"/f || skip=1 - test -s "$where"/f || skip=1 - - test $skip = 1 && - skip_ "insufficient mount/ext2 support" -} - -make_fs noxattr nouser_xattr -make_fs xattr user_xattr - -# testing xattr name-value pair -xattr_name="user.foo" -xattr_value="bar" -xattr_pair="$xattr_name=\"$xattr_value\"" - -echo test > xattr/a || framework_failure_ -getfattr -d xattr/a >out_a || skip_ "failed to get xattr of file" -grep -F "$xattr_pair" out_a >/dev/null && framework_failure_ -setfattr -n "$xattr_name" -v "$xattr_value" xattr/a >out_a \ - || skip_ "failed to set xattr of file" -getfattr -d xattr/a >out_a || skip_ "failed to get xattr of file" -grep -F "$xattr_pair" out_a >/dev/null \ - || skip_ "failed to set xattr of file" - - -# 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 - -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 - -# 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 - -rm -f err noxattr/a - -# This should fail with coresponding diagnostics -cp -a --preserve=xattr xattr/a noxattr/ 2>err && fail=1 -if grep '^#define USE_XATTR 1' $CONFIG_HEADER > /dev/null; then -cat <<\EOF > exp -cp: setting attributes for 'noxattr/a': Operation not supported -EOF -else -cat <<\EOF > exp -cp: cannot preserve extended attributes, cp is built without xattr support -EOF -fi - -compare exp err || fail=1 - -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 - -Exit $fail diff --git a/tests/cp/cp-mv-enotsup-xattr.sh b/tests/cp/cp-mv-enotsup-xattr.sh new file mode 100755 index 00000000..e091b44b --- /dev/null +++ b/tests/cp/cp-mv-enotsup-xattr.sh @@ -0,0 +1,109 @@ +#!/bin/sh +# Ensure that mv, cp -a and cp --preserve=xattr(all) options do work +# as expected on file system without their support and do show correct +# diagnostics when required + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp mv + +require_root_ + +cwd=$(pwd) +cleanup_() { cd /; umount "$cwd/noxattr"; umount "$cwd/xattr"; } + +skip=0 + +# Mount an ext2 loopback file system at $WHERE with $OPTS +make_fs() { + where="$1" + opts="$2" + + fs="$where.bin" + + dd if=/dev/zero of="$fs" bs=8192 count=200 > /dev/null 2>&1 \ + || skip=1 + mkdir "$where" || skip=1 + mkfs -t ext2 -F "$fs" || + skip_ "failed to create ext2 file system" + mount -oloop,$opts "$fs" "$where" || skip=1 + echo test > "$where"/f || skip=1 + test -s "$where"/f || skip=1 + + test $skip = 1 && + skip_ "insufficient mount/ext2 support" +} + +make_fs noxattr nouser_xattr +make_fs xattr user_xattr + +# testing xattr name-value pair +xattr_name="user.foo" +xattr_value="bar" +xattr_pair="$xattr_name=\"$xattr_value\"" + +echo test > xattr/a || framework_failure_ +getfattr -d xattr/a >out_a || skip_ "failed to get xattr of file" +grep -F "$xattr_pair" out_a >/dev/null && framework_failure_ +setfattr -n "$xattr_name" -v "$xattr_value" xattr/a >out_a \ + || skip_ "failed to set xattr of file" +getfattr -d xattr/a >out_a || skip_ "failed to get xattr of file" +grep -F "$xattr_pair" out_a >/dev/null \ + || skip_ "failed to set xattr of file" + + +# 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 + +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 + +# 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 + +rm -f err noxattr/a + +# This should fail with coresponding diagnostics +cp -a --preserve=xattr xattr/a noxattr/ 2>err && fail=1 +if grep '^#define USE_XATTR 1' $CONFIG_HEADER > /dev/null; then +cat <<\EOF > exp +cp: setting attributes for 'noxattr/a': Operation not supported +EOF +else +cat <<\EOF > exp +cp: cannot preserve extended attributes, cp is built without xattr support +EOF +fi + +compare exp err || fail=1 + +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 + +Exit $fail diff --git a/tests/cp/cp-parents b/tests/cp/cp-parents deleted file mode 100755 index b325c722..00000000 --- a/tests/cp/cp-parents +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/sh -# cp -R --parents dir-specified-with-trailing-slash/ other-dir -# would get a failed assertion. - -# Copyright (C) 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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ mv - -working_umask_or_skip_ - -# Run the setgid check from the just-created directory. -skip_if_setgid_ - -mkdir foo bar || framework_failure_ -mkdir -p a/b/c d e g || framework_failure_ -ln -s d/a sym || framework_failure_ -touch f || framework_failure_ - - -# With 4.0.37 and earlier (back to when?), this would fail -# with the failed assertion from dirname.c. -cp -R --parents foo/ bar || fail=1 - -# Exercise the make_path and re_protect code in cp.c. -# FIXME: compare verbose output with expected output. -cp --verbose -a --parents a/b/c d > /dev/null 2>&1 || fail=1 -test -d d/a/b/c || fail=1 - -# With 6.7 and earlier, cp --parents f/g d would mistakenly create a -# directory d/f, even though f is a regular file. -cp --parents f/g d 2>/dev/null && fail=1 -test -d d/f && fail=1 - -# Check that re_protect works. -chmod go=w d/a || framework_failure_ -cp -a --parents d/a/b/c e || fail=1 -cp -a --parents sym/b/c g || fail=1 -p=$(ls -ld e/d|cut -b-10); case $p in drwxr-xr-x);; *) fail=1;; esac -p=$(ls -ld e/d/a|cut -b-10); case $p in drwx-w--w-);; *) fail=1;; esac -p=$(ls -ld g/sym|cut -b-10); case $p in drwx-w--w-);; *) fail=1;; esac -p=$(ls -ld e/d/a/b/c|cut -b-10); case $p in drwxr-xr-x);; *) fail=1;; esac -p=$(ls -ld g/sym/b/c|cut -b-10); case $p in drwxr-xr-x);; *) fail=1;; esac - -Exit $fail diff --git a/tests/cp/cp-parents.sh b/tests/cp/cp-parents.sh new file mode 100755 index 00000000..cebf672a --- /dev/null +++ b/tests/cp/cp-parents.sh @@ -0,0 +1,58 @@ +#!/bin/sh +# cp -R --parents dir-specified-with-trailing-slash/ other-dir +# would get a failed assertion. + +# Copyright (C) 2000-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp + +working_umask_or_skip_ + +# Run the setgid check from the just-created directory. +skip_if_setgid_ + +mkdir foo bar || framework_failure_ +mkdir -p a/b/c d e g || framework_failure_ +ln -s d/a sym || framework_failure_ +touch f || framework_failure_ + + +# With 4.0.37 and earlier (back to when?), this would fail +# with the failed assertion from dirname.c. +cp -R --parents foo/ bar || fail=1 + +# Exercise the make_path and re_protect code in cp.c. +# FIXME: compare verbose output with expected output. +cp --verbose -a --parents a/b/c d > /dev/null 2>&1 || fail=1 +test -d d/a/b/c || fail=1 + +# With 6.7 and earlier, cp --parents f/g d would mistakenly create a +# directory d/f, even though f is a regular file. +cp --parents f/g d 2>/dev/null && fail=1 +test -d d/f && fail=1 + +# Check that re_protect works. +chmod go=w d/a || framework_failure_ +cp -a --parents d/a/b/c e || fail=1 +cp -a --parents sym/b/c g || fail=1 +p=$(ls -ld e/d|cut -b-10); case $p in drwxr-xr-x);; *) fail=1;; esac +p=$(ls -ld e/d/a|cut -b-10); case $p in drwx-w--w-);; *) fail=1;; esac +p=$(ls -ld g/sym|cut -b-10); case $p in drwx-w--w-);; *) fail=1;; esac +p=$(ls -ld e/d/a/b/c|cut -b-10); case $p in drwxr-xr-x);; *) fail=1;; esac +p=$(ls -ld g/sym/b/c|cut -b-10); case $p in drwxr-xr-x);; *) fail=1;; esac + +Exit $fail diff --git a/tests/cp/deref-slink b/tests/cp/deref-slink deleted file mode 100755 index 93f5cb8a..00000000 --- a/tests/cp/deref-slink +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# Demonstrate bug when using -d with an existing destination file -# that is a symlink. - -# Copyright (C) 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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp - -touch f slink-target || framework_failure_ -ln -s slink-target slink || framework_failure_ - -cp -d f slink || fail=1 - -Exit $fail diff --git a/tests/cp/deref-slink.sh b/tests/cp/deref-slink.sh new file mode 100755 index 00000000..aa3c2507 --- /dev/null +++ b/tests/cp/deref-slink.sh @@ -0,0 +1,28 @@ +#!/bin/sh +# Demonstrate bug when using -d with an existing destination file +# that is a symlink. + +# Copyright (C) 2000-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp + +touch f slink-target || framework_failure_ +ln -s slink-target slink || framework_failure_ + +cp -d f slink || fail=1 + +Exit $fail diff --git a/tests/cp/dir-rm-dest b/tests/cp/dir-rm-dest deleted file mode 100755 index b2f0e72c..00000000 --- a/tests/cp/dir-rm-dest +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# verify that cp's --remove-destination option works with -R - -# Copyright (C) 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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp - -mkdir d e || framework_failure_ - -# Do it once with no destination... -cp -R --remove-destination d e || fail=1 - -# ...and again, with an existing destination. -cp -R --remove-destination d e || fail=1 - -Exit $fail diff --git a/tests/cp/dir-rm-dest.sh b/tests/cp/dir-rm-dest.sh new file mode 100755 index 00000000..83a1b4c9 --- /dev/null +++ b/tests/cp/dir-rm-dest.sh @@ -0,0 +1,30 @@ +#!/bin/sh +# verify that cp's --remove-destination option works with -R + +# Copyright (C) 2000-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp + +mkdir d e || framework_failure_ + +# Do it once with no destination... +cp -R --remove-destination d e || fail=1 + +# ...and again, with an existing destination. +cp -R --remove-destination d e || fail=1 + +Exit $fail diff --git a/tests/cp/dir-slash b/tests/cp/dir-slash deleted file mode 100755 index b14aad82..00000000 --- a/tests/cp/dir-slash +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# Make sure that cp -R DIR1 DIR2 does the right thing -# when DIR1 is written with a trailing slash. - -# Copyright (C) 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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp - -mkdir dir1 dir2 || framework_failure_ -touch dir1/file || framework_failure_ - -cp -R dir1/ dir2 || fail=1 - -# This file should not exist, but it did with fileutils-4.0w. -test -r dir2/file && fail=1 - -# These two should. -test -r dir2/dir1/file || fail=1 -test -r dir1/file || fail=1 - -Exit $fail diff --git a/tests/cp/dir-slash.sh b/tests/cp/dir-slash.sh new file mode 100755 index 00000000..5bbaa813 --- /dev/null +++ b/tests/cp/dir-slash.sh @@ -0,0 +1,35 @@ +#!/bin/sh +# 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. + +# This 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 + +mkdir dir1 dir2 || framework_failure_ +touch dir1/file || framework_failure_ + +cp -R dir1/ dir2 || fail=1 + +# This file should not exist, but it did with fileutils-4.0w. +test -r dir2/file && fail=1 + +# These two should. +test -r dir2/dir1/file || fail=1 +test -r dir1/file || fail=1 + +Exit $fail diff --git a/tests/cp/dir-vs-file b/tests/cp/dir-vs-file deleted file mode 100755 index c8e388fa..00000000 --- a/tests/cp/dir-vs-file +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -# A directory may not replace an existing file. - -# Copyright (C) 2001-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp - -mkdir dir || framework_failure_ -touch file || framework_failure_ - - -# In 4.0.35, this cp invocation silently succeeded. -cp -R dir file 2>/dev/null && fail=1 - -# Make sure file is not replaced with a directory. -# In 4.0.35, it was. -test -f file || fail=1 - -Exit $fail diff --git a/tests/cp/dir-vs-file.sh b/tests/cp/dir-vs-file.sh new file mode 100755 index 00000000..3c5f70c5 --- /dev/null +++ b/tests/cp/dir-vs-file.sh @@ -0,0 +1,33 @@ +#!/bin/sh +# A directory may not replace an existing file. + +# Copyright (C) 2001-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp + +mkdir dir || framework_failure_ +touch file || framework_failure_ + + +# In 4.0.35, this cp invocation silently succeeded. +cp -R dir file 2>/dev/null && fail=1 + +# Make sure file is not replaced with a directory. +# In 4.0.35, it was. +test -f file || fail=1 + +Exit $fail diff --git a/tests/cp/existing-perm-dir b/tests/cp/existing-perm-dir deleted file mode 100755 index 40b55a3f..00000000 --- a/tests/cp/existing-perm-dir +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# Make sure cp -p doesn't "restore" permissions it shouldn't (Bug#9170). - -# Copyright 2011-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp - -umask 002 -mkdir -p -m ug-s,u=rwx,g=rwx,o=rx src/dir || fail=1 -mkdir -p -m ug-s,u=rwx,g=,o= dst/dir || fail=1 - -cp -r src/. dst/ || fail=1 - -mode=$(stat --p=%A dst/dir) -test "$mode" = drwx------ || fail=1 - -Exit $fail diff --git a/tests/cp/existing-perm-dir.sh b/tests/cp/existing-perm-dir.sh new file mode 100755 index 00000000..4c167b98 --- /dev/null +++ b/tests/cp/existing-perm-dir.sh @@ -0,0 +1,31 @@ +#!/bin/sh +# Make sure cp -p doesn't "restore" permissions it shouldn't (Bug#9170). + +# Copyright 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp + +umask 002 +mkdir -p -m ug-s,u=rwx,g=rwx,o=rx src/dir || fail=1 +mkdir -p -m ug-s,u=rwx,g=,o= dst/dir || fail=1 + +cp -r src/. dst/ || fail=1 + +mode=$(stat --p=%A dst/dir) +test "$mode" = drwx------ || fail=1 + +Exit $fail diff --git a/tests/cp/existing-perm-race b/tests/cp/existing-perm-race deleted file mode 100755 index 35c1556f..00000000 --- a/tests/cp/existing-perm-race +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/sh -# Make sure cp -p isn't too generous with existing file permissions. - -# Copyright (C) 2006-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp - -require_membership_in_two_groups_ - -# cp -p gives ENOTSUP on NFS on Linux 2.6.9 at least -require_local_dir_ - -set _ $groups; shift -g1=$1 -g2=$2 - - -umask 077 -mkfifo_or_skip_ fifo - -touch fifo-copy && -chgrp $g1 fifo && -chgrp $g2 fifo-copy && -chmod g+r fifo-copy || framework-failure - -# Copy a fifo's contents. That way, we can examine the -# destination permissions before they're finalized. -cp -p --copy-contents fifo fifo-copy & -cp_pid=$! - -( - # Now 'cp' is reading the fifo. Wait for the destination file to - # be written to, encouraging things along by echoing to the fifo. - while test ! -s fifo-copy; do - echo foo - done - - # Check the permissions of the destination. - ls -l -n fifo-copy >ls.out && - - # Close the fifo so that "cp" can continue. But output first, - # before exiting, otherwise some shells would optimize away the file - # descriptor that holds the fifo open. - echo foo -) >fifo || fail=1 - -# Check that the destination mode is safe while the file is being copied. -read mode links owner group etc <ls.out || fail=1 -case $mode in - -rw-------*) ;; - - # FIXME: Remove the following case; the file mode should always be - # 600 while the data are being copied. This will require changing - # cp so that it also does not put $g1's data in a file that is - # accessible to $g2. This fix will not close a security hole, since - # a $g2 process can maintain an open file descriptor to the - # destination, but it's safer anyway. - -rw-r-----*) - # If the file has group $g1 and is group-readable, that is definitely bogus, - # as neither the source nor the destination was readable to group $g1. - test "$group" = "$g1" && fail=1;; - - *) fail=1;; -esac - -wait $cp_pid || fail=1 - -# Check that the final mode and group are right. -ls -l -n fifo-copy >ls.out && -read mode links owner group etc <ls.out || fail=1 -case $mode in - -rw-------*) test "$group" = "$g1" || fail=1;; - *) fail=1;; -esac - -Exit $fail diff --git a/tests/cp/existing-perm-race.sh b/tests/cp/existing-perm-race.sh new file mode 100755 index 00000000..d1b87776 --- /dev/null +++ b/tests/cp/existing-perm-race.sh @@ -0,0 +1,90 @@ +#!/bin/sh +# Make sure cp -p isn't too generous with existing file permissions. + +# Copyright (C) 2006-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp + +require_membership_in_two_groups_ + +# cp -p gives ENOTSUP on NFS on Linux 2.6.9 at least +require_local_dir_ + +set _ $groups; shift +g1=$1 +g2=$2 + + +umask 077 +mkfifo_or_skip_ fifo + +touch fifo-copy && +chgrp $g1 fifo && +chgrp $g2 fifo-copy && +chmod g+r fifo-copy || framework-failure + +# Copy a fifo's contents. That way, we can examine the +# destination permissions before they're finalized. +cp -p --copy-contents fifo fifo-copy & +cp_pid=$! + +( + # Now 'cp' is reading the fifo. Wait for the destination file to + # be written to, encouraging things along by echoing to the fifo. + while test ! -s fifo-copy; do + echo foo + done + + # Check the permissions of the destination. + ls -l -n fifo-copy >ls.out && + + # Close the fifo so that "cp" can continue. But output first, + # before exiting, otherwise some shells would optimize away the file + # descriptor that holds the fifo open. + echo foo +) >fifo || fail=1 + +# Check that the destination mode is safe while the file is being copied. +read mode links owner group etc <ls.out || fail=1 +case $mode in + -rw-------*) ;; + + # FIXME: Remove the following case; the file mode should always be + # 600 while the data are being copied. This will require changing + # cp so that it also does not put $g1's data in a file that is + # accessible to $g2. This fix will not close a security hole, since + # a $g2 process can maintain an open file descriptor to the + # destination, but it's safer anyway. + -rw-r-----*) + # If the file has group $g1 and is group-readable, that is definitely bogus, + # as neither the source nor the destination was readable to group $g1. + test "$group" = "$g1" && fail=1;; + + *) fail=1;; +esac + +wait $cp_pid || fail=1 + +# Check that the final mode and group are right. +ls -l -n fifo-copy >ls.out && +read mode links owner group etc <ls.out || fail=1 +case $mode in + -rw-------*) test "$group" = "$g1" || fail=1;; + *) fail=1;; +esac + +Exit $fail diff --git a/tests/cp/fail-perm b/tests/cp/fail-perm deleted file mode 100755 index 2c37d6fb..00000000 --- a/tests/cp/fail-perm +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/sh - -# Copyright (C) 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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp -skip_if_root_ - -chmod g-s . || framework_failure_ -mkdir D D/D || framework_failure_ -touch D/a || framework_failure_ -chmod 0 D/a || framework_failure_ -chmod u=rx,go=,-st D || framework_failure_ - - -# This is expected to exit non-zero, because it can't read D/a. -cp -pR D DD > /dev/null 2>&1 && fail=1 - -# Permissions on DD must be 'dr-x------' - -mode=$(ls -ld DD|cut -b-10) -test "$mode" = dr-x------ || fail=1 - -chmod 0 D -ln -s D/D symlink -touch F -cat > exp <<\EOF -cp: accessing 'symlink': Permission denied -EOF - -cp F symlink 2> out && fail=1 -# HPUX appears to fail with EACCES rather than EPERM. -# Transform their diagnostic -# ...: The file access permissions do not allow the specified action. -# to the expected one: -sed 's/: The file access permissions.*/: Permission denied/'<out>o1;mv o1 out -compare exp out || fail=1 - -cp --target-directory=symlink F 2> out && fail=1 -sed 's/: The file access permissions.*/: Permission denied/'<out>o1;mv o1 out -compare exp out || fail=1 - -chmod 700 D - -Exit $fail diff --git a/tests/cp/fail-perm.sh b/tests/cp/fail-perm.sh new file mode 100755 index 00000000..8665449a --- /dev/null +++ b/tests/cp/fail-perm.sh @@ -0,0 +1,58 @@ +#!/bin/sh + +# Copyright (C) 2000-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp +skip_if_root_ + +chmod g-s . || framework_failure_ +mkdir D D/D || framework_failure_ +touch D/a || framework_failure_ +chmod 0 D/a || framework_failure_ +chmod u=rx,go=,-st D || framework_failure_ + + +# This is expected to exit non-zero, because it can't read D/a. +cp -pR D DD > /dev/null 2>&1 && fail=1 + +# Permissions on DD must be 'dr-x------' + +mode=$(ls -ld DD|cut -b-10) +test "$mode" = dr-x------ || fail=1 + +chmod 0 D +ln -s D/D symlink +touch F +cat > exp <<\EOF +cp: failed to access 'symlink': Permission denied +EOF + +cp F symlink 2> out && fail=1 +# HPUX appears to fail with EACCES rather than EPERM. +# Transform their diagnostic +# ...: The file access permissions do not allow the specified action. +# to the expected one: +sed 's/: The file access permissions.*/: Permission denied/'<out>o1;mv o1 out +compare exp out || fail=1 + +cp --target-directory=symlink F 2> out && fail=1 +sed 's/: The file access permissions.*/: Permission denied/'<out>o1;mv o1 out +compare exp out || fail=1 + +chmod 700 D + +Exit $fail diff --git a/tests/cp/fiemap-2 b/tests/cp/fiemap-2 deleted file mode 100755 index f24baf28..00000000 --- a/tests/cp/fiemap-2 +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh -# Exercise a few more corners of the fiemap-copying code. - -# Copyright (C) 2011-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp - -# Require a fiemap-enabled FS. -touch fiemap_chk # check a file rather than current dir for best coverage -fiemap_capable_ fiemap_chk \ - || skip_ "this file system lacks FIEMAP support" - -# Exercise the code that handles a file ending in a hole. -printf x > k || framework_failure_ -dd bs=1k seek=128 of=k < /dev/null || framework_failure_ - -# The first time through the outer loop, the input file, K, ends with a hole. -# The second time through, we append a byte so that it does not. -for append in no yes; do - test $append = yes && printf y >> k - for i in always never; do - cp --sparse=$i k k2 || fail=1 - cmp k k2 || fail=1 - done -done - -# Ensure that --sparse=always can restore holes. -rm -f k -# Create a file starting with an "x", followed by 256K-1 0 bytes. -printf x > k || framework_failure_ -dd bs=1k seek=1 of=k count=255 < /dev/zero || framework_failure_ - -# cp should detect the all-zero blocks and convert some of them to holes. -# How many it detects/converts currently depends on io_blksize. -# Currently, on my F14/ext4 desktop, this K starts off with size 256KiB, -# (note that the K in the preceding test starts off with size 4KiB). -# cp from coreutils-8.9 with --sparse=always reduces the size to 32KiB. -cp --sparse=always k k2 || fail=1 -test $(stat -c %b k2) -lt $(stat -c %b k) || fail=1 - -Exit $fail diff --git a/tests/cp/fiemap-2.sh b/tests/cp/fiemap-2.sh new file mode 100755 index 00000000..3f8eb006 --- /dev/null +++ b/tests/cp/fiemap-2.sh @@ -0,0 +1,55 @@ +#!/bin/sh +# Exercise a few more corners of the fiemap-copying code. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp + +# Require a fiemap-enabled FS. +touch fiemap_chk # check a file rather than current dir for best coverage +fiemap_capable_ fiemap_chk \ + || skip_ "this file system lacks FIEMAP support" + +# Exercise the code that handles a file ending in a hole. +printf x > k || framework_failure_ +dd bs=1k seek=128 of=k < /dev/null || framework_failure_ + +# The first time through the outer loop, the input file, K, ends with a hole. +# The second time through, we append a byte so that it does not. +for append in no yes; do + test $append = yes && printf y >> k + for i in always never; do + cp --sparse=$i k k2 || fail=1 + cmp k k2 || fail=1 + done +done + +# Ensure that --sparse=always can restore holes. +rm -f k +# Create a file starting with an "x", followed by 256K-1 0 bytes. +printf x > k || framework_failure_ +dd bs=1k seek=1 of=k count=255 < /dev/zero || framework_failure_ + +# cp should detect the all-zero blocks and convert some of them to holes. +# How many it detects/converts currently depends on io_blksize. +# Currently, on my F14/ext4 desktop, this K starts off with size 256KiB, +# (note that the K in the preceding test starts off with size 4KiB). +# cp from coreutils-8.9 with --sparse=always reduces the size to 32KiB. +cp --sparse=always k k2 || fail=1 +test $(stat -c %b k2) -lt $(stat -c %b k) || fail=1 + +Exit $fail diff --git a/tests/cp/fiemap-FMR.sh b/tests/cp/fiemap-FMR.sh new file mode 100755 index 00000000..ad4dfed5 --- /dev/null +++ b/tests/cp/fiemap-FMR.sh @@ -0,0 +1,31 @@ +#!/bin/sh +# Trigger a free-memory read bug in cp from coreutils-[8.11..8.19] + +# Copyright (C) 2012-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp + +require_valgrind_ +require_perl_ +: ${PERL=perl} + +$PERL -e 'for (1..600) { sysseek (*STDOUT, 4096, 1)' \ + -e '&& syswrite (*STDOUT, "a" x 1024) or die "$!"}' > j || fail=1 +valgrind --quiet --error-exitcode=3 cp j j2 || fail=1 +cmp j j2 || fail=1 + +Exit $fail diff --git a/tests/cp/fiemap-empty b/tests/cp/fiemap-empty deleted file mode 100755 index 4ba4ee30..00000000 --- a/tests/cp/fiemap-empty +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/sh -# Test cp reads unwritten extents efficiently - -# Copyright (C) 2011-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp - -# FIXME: enable any part of this test that is still relevant, -# or, if none are relevant (now that cp does not handle unwritten -# extents), just remove the test altogether. -skip_ 'disabled for now' - -touch fiemap_chk -fiemap_capable_ fiemap_chk || - skip_ 'this file system lacks FIEMAP support' -rm fiemap_chk - -# TODO: rather than requiring $(fallocate), possible add -# this functionality to truncate --alloc -fallocate --help >/dev/null || skip_ 'The fallocate utility is required' -fallocate -l 1 -n falloc.test || - skip_ 'this file system lacks FALLOCATE support' -rm falloc.test - -# Require more space than we'll actually use, so that -# tests run in parallel do not run out of space. -# Otherwise, with inadequate space, simply running the following -# fallocate command would induce a temporary disk-full condition, -# which would cause failure of unrelated tests run in parallel. -require_file_system_bytes_free_ 800000000 - -fallocate -l 600MiB space.test || - skip_ 'this test needs at least 600MiB free space' - -# Disable this test on old BTRFS (e.g. Fedora 14) -# which reports ordinary extents for unwritten ones. -filefrag space.test || skip_ 'the 'filefrag' utility is missing' -filefrag -v space.test | grep -F 'unwritten' > /dev/null || - skip_ 'this file system does not report empty extents as "unwritten"' - -rm space.test - -# Ensure we read a large empty file quickly -fallocate -l 300MiB empty.big || framework_failure_ -timeout 3 cp --sparse=always empty.big cp.test || fail=1 -test $(stat -c %s empty.big) = $(stat -c %s cp.test) || fail=1 -rm empty.big cp.test - -# Ensure we handle extents beyond file size correctly. -# Note until we support fallocate, we will not maintain -# the file allocation. FIXME: amend this test when fallocate is supported. -fallocate -l 10MiB -n unwritten.withdata || framework_failure_ -dd count=10 if=/dev/urandom conv=notrunc iflag=fullblock of=unwritten.withdata -cp unwritten.withdata cp.test || fail=1 -test $(stat -c %s unwritten.withdata) = $(stat -c %s cp.test) || fail=1 -cmp unwritten.withdata cp.test || fail=1 -rm unwritten.withdata cp.test - -# The following to generate unaccounted extents followed by a hole, is not -# supported by ext4 at least. The ftruncate discards all extents not -# accounted for in the size. -# fallocate -l 10MiB -n unacc.withholes -# dd count=10 if=/dev/urandom conv=notrunc iflag=fullblock of=unacc.withholes -# truncate -s20M unacc.withholes - -# Ensure we handle a hole after empty extents correctly. -# Since all extents are accounted for in the size, -# we can maintain the allocation independently from -# fallocate() support. -fallocate -l 10MiB empty.withholes -truncate -s 20M empty.withholes -sectors_per_block=$(expr $(stat -c %o .) / 512) -cp empty.withholes cp.test || fail=1 -test $(stat -c %s empty.withholes) = $(stat -c %s cp.test) || fail=1 -# These are usually equal but can vary by an IO block due to alignment -alloc_diff=$(expr $(stat -c %b empty.withholes) - $(stat -c %b cp.test)) -alloc_diff=$(echo $alloc_diff | tr -d -- -) # abs() -test $alloc_diff -le $sectors_per_block || fail=1 -# Again with SPARSE_ALWAYS -cp --sparse=always empty.withholes cp.test || fail=1 -test $(stat -c %s empty.withholes) = $(stat -c %s cp.test) || fail=1 -# cp.test should take 0 space, but allowing for some systems -# that store default extended attributes in data blocks -test $(stat -c %b cp.test) -le $sectors_per_block || fail=1 -rm empty.withholes cp.test - -Exit $fail diff --git a/tests/cp/fiemap-empty.sh b/tests/cp/fiemap-empty.sh new file mode 100755 index 00000000..29439d7c --- /dev/null +++ b/tests/cp/fiemap-empty.sh @@ -0,0 +1,101 @@ +#!/bin/sh +# Test cp reads unwritten extents efficiently + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp + +# FIXME: enable any part of this test that is still relevant, +# or, if none are relevant (now that cp does not handle unwritten +# extents), just remove the test altogether. +skip_ 'disabled for now' + +touch fiemap_chk +fiemap_capable_ fiemap_chk || + skip_ 'this file system lacks FIEMAP support' +rm fiemap_chk + +# TODO: rather than requiring $(fallocate), possible add +# this functionality to truncate --alloc +fallocate --help >/dev/null || skip_ 'The fallocate utility is required' +fallocate -l 1 -n falloc.test || + skip_ 'this file system lacks FALLOCATE support' +rm falloc.test + +# Require more space than we'll actually use, so that +# tests run in parallel do not run out of space. +# Otherwise, with inadequate space, simply running the following +# fallocate command would induce a temporary disk-full condition, +# which would cause failure of unrelated tests run in parallel. +require_file_system_bytes_free_ 800000000 + +fallocate -l 600MiB space.test || + skip_ 'this test needs at least 600MiB free space' + +# Disable this test on old BTRFS (e.g. Fedora 14) +# which reports ordinary extents for unwritten ones. +filefrag space.test || skip_ 'the 'filefrag' utility is missing' +filefrag -v space.test | grep -F 'unwritten' > /dev/null || + skip_ 'this file system does not report empty extents as "unwritten"' + +rm space.test + +# Ensure we read a large empty file quickly +fallocate -l 300MiB empty.big || framework_failure_ +timeout 3 cp --sparse=always empty.big cp.test || fail=1 +test $(stat -c %s empty.big) = $(stat -c %s cp.test) || fail=1 +rm empty.big cp.test + +# Ensure we handle extents beyond file size correctly. +# Note until we support fallocate, we will not maintain +# the file allocation. FIXME: amend this test when fallocate is supported. +fallocate -l 10MiB -n unwritten.withdata || framework_failure_ +dd count=10 if=/dev/urandom conv=notrunc iflag=fullblock of=unwritten.withdata +cp unwritten.withdata cp.test || fail=1 +test $(stat -c %s unwritten.withdata) = $(stat -c %s cp.test) || fail=1 +cmp unwritten.withdata cp.test || fail=1 +rm unwritten.withdata cp.test + +# The following to generate unaccounted extents followed by a hole, is not +# supported by ext4 at least. The ftruncate discards all extents not +# accounted for in the size. +# fallocate -l 10MiB -n unacc.withholes +# dd count=10 if=/dev/urandom conv=notrunc iflag=fullblock of=unacc.withholes +# truncate -s20M unacc.withholes + +# Ensure we handle a hole after empty extents correctly. +# Since all extents are accounted for in the size, +# we can maintain the allocation independently from +# fallocate() support. +fallocate -l 10MiB empty.withholes +truncate -s 20M empty.withholes +sectors_per_block=$(expr $(stat -c %o .) / 512) +cp empty.withholes cp.test || fail=1 +test $(stat -c %s empty.withholes) = $(stat -c %s cp.test) || fail=1 +# These are usually equal but can vary by an IO block due to alignment +alloc_diff=$(expr $(stat -c %b empty.withholes) - $(stat -c %b cp.test)) +alloc_diff=$(echo $alloc_diff | tr -d -- -) # abs() +test $alloc_diff -le $sectors_per_block || fail=1 +# Again with SPARSE_ALWAYS +cp --sparse=always empty.withholes cp.test || fail=1 +test $(stat -c %s empty.withholes) = $(stat -c %s cp.test) || fail=1 +# cp.test should take 0 space, but allowing for some systems +# that store default extended attributes in data blocks +test $(stat -c %b cp.test) -le $sectors_per_block || fail=1 +rm empty.withholes cp.test + +Exit $fail diff --git a/tests/cp/fiemap-perf b/tests/cp/fiemap-perf deleted file mode 100755 index e418728e..00000000 --- a/tests/cp/fiemap-perf +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh -# ensure that a sparse file is copied efficiently, by default - -# Copyright (C) 2011-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp - -# Require a fiemap-enabled FS. -touch fiemap_chk -fiemap_capable_ fiemap_chk || - skip_ "this file system lacks FIEMAP support" - -# Exclude ext3 (or unknown fs types) -# as the emulated extent scanning is slow -df -t ext3 . >/dev/null && - skip_ "ext3 has known slow FIEMAP scanning" - -# Create a large-but-sparse file. -timeout 10 truncate -s1T f || framework_failure_ - -# Disable this test on old BTRFS (e.g. Fedora 14) -# which reports (unwritten) extents for holes. -filefrag f || skip_ 'the 'filefrag' utility is missing' -filefrag f | grep -F ': 0 extents found' > /dev/null || - skip_ 'this file system reports extents for holes' - -# Nothing can read (much less write) that many bytes in so little time. -timeout 10 cp f f2 || fail=1 - -# Ensure that the sparse file copied through fiemap has the same size -# in bytes as the original. -test "$(stat --printf %s f)" = "$(stat --printf %s f2)" || fail=1 - -Exit $fail diff --git a/tests/cp/fiemap-perf.sh b/tests/cp/fiemap-perf.sh new file mode 100755 index 00000000..d3747990 --- /dev/null +++ b/tests/cp/fiemap-perf.sh @@ -0,0 +1,49 @@ +#!/bin/sh +# ensure that a sparse file is copied efficiently, by default + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp + +# Require a fiemap-enabled FS. +touch fiemap_chk +fiemap_capable_ fiemap_chk || + skip_ "this file system lacks FIEMAP support" + +# Exclude ext[23] (or unknown fs types) +# as the emulated extent scanning can be slow +df -t ext2 -t ext3 . >/dev/null && + skip_ "ext[23] can have slow FIEMAP scanning" + +# Create a large-but-sparse file. +timeout 10 truncate -s1T f || + skip_ "unable to create a 1 TiB sparse file" + +# Disable this test on old BTRFS (e.g. Fedora 14) +# which reports (unwritten) extents for holes. +filefrag f || skip_ 'the 'filefrag' utility is missing' +filefrag f | grep -F ': 0 extents found' > /dev/null || + skip_ 'this file system reports extents for holes' + +# Nothing can read (much less write) that many bytes in so little time. +timeout 10 cp f f2 || fail=1 + +# Ensure that the sparse file copied through fiemap has the same size +# in bytes as the original. +test "$(stat --printf %s f)" = "$(stat --printf %s f2)" || fail=1 + +Exit $fail diff --git a/tests/cp/file-perm-race b/tests/cp/file-perm-race deleted file mode 100755 index fbc9a86e..00000000 --- a/tests/cp/file-perm-race +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh -# Make sure cp -p isn't too generous with file permissions. - -# Copyright (C) 2006-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp - -# cp -p gives ENOTSUP on NFS on Linux 2.6.9 at least -require_local_dir_ - -umask 022 -mkfifo_or_skip_ fifo - -# Copy a fifo's contents. That way, we can examine the -# destination permissions before they're finalized. -cp -p --copy-contents fifo fifo-copy & -cp_pid=$! - -( - # Now 'cp' is reading the fifo. Wait for the destination file to - # be created, encouraging things along by echoing to the fifo. - while test ! -f fifo-copy; do - echo foo - done - - # Check the permissions of the destination. - ls -l fifo-copy >ls.out - - # Close the fifo so that "cp" can continue. But output first, - # before exiting, otherwise some shells would optimize away the file - # descriptor that holds the fifo open. - echo foo -) >fifo - -case $(cat ls.out) in --???------*) ;; -*) fail=1;; -esac - -wait $cp_pid || fail=1 - -Exit $fail diff --git a/tests/cp/file-perm-race.sh b/tests/cp/file-perm-race.sh new file mode 100755 index 00000000..7157c923 --- /dev/null +++ b/tests/cp/file-perm-race.sh @@ -0,0 +1,56 @@ +#!/bin/sh +# Make sure cp -p isn't too generous with file permissions. + +# Copyright (C) 2006-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp + +# cp -p gives ENOTSUP on NFS on Linux 2.6.9 at least +require_local_dir_ + +umask 022 +mkfifo_or_skip_ fifo + +# Copy a fifo's contents. That way, we can examine the +# destination permissions before they're finalized. +cp -p --copy-contents fifo fifo-copy & +cp_pid=$! + +( + # Now 'cp' is reading the fifo. Wait for the destination file to + # be created, encouraging things along by echoing to the fifo. + while test ! -f fifo-copy; do + echo foo + done + + # Check the permissions of the destination. + ls -l fifo-copy >ls.out + + # Close the fifo so that "cp" can continue. But output first, + # before exiting, otherwise some shells would optimize away the file + # descriptor that holds the fifo open. + echo foo +) >fifo + +case $(cat ls.out) in +-???------*) ;; +*) fail=1;; +esac + +wait $cp_pid || fail=1 + +Exit $fail diff --git a/tests/cp/into-self b/tests/cp/into-self deleted file mode 100755 index 6121f0ad..00000000 --- a/tests/cp/into-self +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh -# Confirm that copying a directory into itself gets a proper diagnostic. - -# Copyright (C) 2001-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 -# 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/>. - -# In 4.0.35 and earlier, 'mkdir dir && cp -R dir dir' would produce this: -# cp: won't create hard link 'dir/dir/dir' to directory '' -# Now it gives this: -# cp: can't copy a directory 'dir' into itself 'dir/dir' - -. "${srcdir=.}/init.sh"; path_prepend_ ../src -print_ver_ cp - -mkdir a dir || framework_failure_ - - -# This command should exit nonzero. -cp -R dir dir 2> out && fail=1 -echo 1 >> out - -# This should, too. However, with coreutils-7.1 it would infloop. -cp -rl dir dir 2>> out && fail=1 -echo 2 >> out - -cp -rl a dir dir 2>> out && fail=1 -echo 3 >> out -cp -rl a dir dir 2>> out && fail=1 -echo 4 >> out - -cat > exp <<\EOF -cp: cannot copy a directory, 'dir', into itself, 'dir/dir' -1 -cp: cannot copy a directory, 'dir', into itself, 'dir/dir' -2 -cp: cannot copy a directory, 'dir', into itself, 'dir/dir' -3 -cp: cannot copy a directory, 'dir', into itself, 'dir/dir' -4 -EOF -#' - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/cp/into-self.sh b/tests/cp/into-self.sh new file mode 100755 index 00000000..347b8589 --- /dev/null +++ b/tests/cp/into-self.sh @@ -0,0 +1,57 @@ +#!/bin/sh +# Confirm that copying a directory into itself gets a proper diagnostic. + +# Copyright (C) 2001-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/>. + +# In 4.0.35 and earlier, 'mkdir dir && cp -R dir dir' would produce this: +# cp: won't create hard link 'dir/dir/dir' to directory '' +# Now it gives this: +# cp: can't copy a directory 'dir' into itself 'dir/dir' + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp + +mkdir a dir || framework_failure_ + + +# This command should exit nonzero. +cp -R dir dir 2> out && fail=1 +echo 1 >> out + +# This should, too. However, with coreutils-7.1 it would infloop. +cp -rl dir dir 2>> out && fail=1 +echo 2 >> out + +cp -rl a dir dir 2>> out && fail=1 +echo 3 >> out +cp -rl a dir dir 2>> out && fail=1 +echo 4 >> out + +cat > exp <<\EOF +cp: cannot copy a directory, 'dir', into itself, 'dir/dir' +1 +cp: cannot copy a directory, 'dir', into itself, 'dir/dir' +2 +cp: cannot copy a directory, 'dir', into itself, 'dir/dir' +3 +cp: cannot copy a directory, 'dir', into itself, 'dir/dir' +4 +EOF +#' + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/cp/link b/tests/cp/link deleted file mode 100755 index 3a899f31..00000000 --- a/tests/cp/link +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# 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-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp - -touch src || framework_failure_ -touch dest || framework_failure_ -touch dest2 || framework_failure_ - - -cp -f --link src dest || fail=1 -cp -f --symbolic-link src dest2 || fail=1 - -Exit $fail diff --git a/tests/cp/link-heap b/tests/cp/link-heap deleted file mode 100755 index 7e948de7..00000000 --- a/tests/cp/link-heap +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# ensure that cp --preserve=link --link doesn't waste heap - -# Copyright (C) 2008-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp -expensive_ -require_ulimit_ - -a=$(printf %031d 0) -b=$(printf %031d 1) -(mkdir $a \ - && cd $a \ - && seq --format=%031g 10000 |xargs touch \ - && seq --format=d%030g 10000 |xargs mkdir ) || framework_failure_ -cp -al $a $b || framework_failure_ -mkdir e || framework_failure_ -mv $a $b e || framework_failure_ - -(ulimit -v 20000; cp -al e f) || fail=1 - -Exit $fail diff --git a/tests/cp/link-heap.sh b/tests/cp/link-heap.sh new file mode 100755 index 00000000..62d7de00 --- /dev/null +++ b/tests/cp/link-heap.sh @@ -0,0 +1,37 @@ +#!/bin/sh +# ensure that cp --preserve=link --link doesn't waste heap + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp +expensive_ +require_ulimit_ + +a=$(printf %031d 0) +b=$(printf %031d 1) +(mkdir $a \ + && cd $a \ + && seq --format=%031g 10000 |xargs touch \ + && seq --format=d%030g 10000 |xargs mkdir ) || framework_failure_ +cp -al $a $b || framework_failure_ +mkdir e || framework_failure_ +mv $a $b e || framework_failure_ + +# Increased from 20000 to 22000 in 2012, for pre-F18 rawhide. +(ulimit -v 22000; cp -al e f) || fail=1 + +Exit $fail diff --git a/tests/cp/link-no-deref b/tests/cp/link-no-deref deleted file mode 100755 index af48fd08..00000000 --- a/tests/cp/link-no-deref +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# Ensure that cp --link --no-dereference works properly - -# Copyright (C) 2006-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp - -ln -s no-such-file dangling-slink || framework_failure_ - - -# Prior to coreutils-6.0, this would fail on non-Linux kernels, -# with link being applied to the dangling symlink. -cp --link --no-dereference dangling-slink d2 || fail=1 - -Exit $fail diff --git a/tests/cp/link-no-deref.sh b/tests/cp/link-no-deref.sh new file mode 100755 index 00000000..755d8922 --- /dev/null +++ b/tests/cp/link-no-deref.sh @@ -0,0 +1,29 @@ +#!/bin/sh +# Ensure that cp --link --no-dereference works properly + +# Copyright (C) 2006-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp + +ln -s no-such-file dangling-slink || framework_failure_ + + +# Prior to coreutils-6.0, this would fail on non-Linux kernels, +# with link being applied to the dangling symlink. +cp --link --no-dereference dangling-slink d2 || fail=1 + +Exit $fail diff --git a/tests/cp/link-preserve b/tests/cp/link-preserve deleted file mode 100755 index 9ca1705f..00000000 --- a/tests/cp/link-preserve +++ /dev/null @@ -1,91 +0,0 @@ -#!/bin/sh -# ensure that 'cp -d' preserves hard-links between command line arguments -# ensure that --preserve=links works with -RH and -RL - -# Copyright (C) 2001-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp - -touch a || framework_failure_ -ln a b || framework_failure_ -mkdir c || framework_failure_ -cp -d a b c || framework_failure_ -test -f c/a || framework_failure_ -test -f c/b || framework_failure_ - - -a_inode=$(ls -i c/a|sed 's,c/.*,,') -b_inode=$(ls -i c/b|sed 's,c/.*,,') -test "$a_inode" = "$b_inode" || fail=1 -# -------------------------------------- - -rm -rf a b c -touch a -ln -s a b -mkdir c -cp --preserve=links -R -H a b c -a_inode=$(ls -i c/a|sed 's,c/.*,,') -b_inode=$(ls -i c/b|sed 's,c/.*,,') -test "$a_inode" = "$b_inode" || fail=1 -# -------------------------------------- - -# Ensure that -L makes cp follow the b->a symlink -# and translates to hard-linked a and b in the destination dir. -rm -rf a b c d; mkdir d; (cd d; touch a; ln -s a b) -cp --preserve=links -R -L d c -a_inode=$(ls -i c/a|sed 's,c/.*,,') -b_inode=$(ls -i c/b|sed 's,c/.*,,') -test "$a_inode" = "$b_inode" || fail=1 -# -------------------------------------- - -# Same as above, but starting with a/b hard linked. -rm -rf a b c d; mkdir d; (cd d; touch a; ln a b) -cp --preserve=links -R -L d c -a_inode=$(ls -i c/a|sed 's,c/.*,,') -b_inode=$(ls -i c/b|sed 's,c/.*,,') -test "$a_inode" = "$b_inode" || fail=1 -# -------------------------------------- - -# Ensure that --no-preserve=links works. -rm -rf a b c d; mkdir d; (cd d; touch a; ln a b) -cp -dR --no-preserve=links d c -a_inode=$(ls -i c/a|sed 's,c/.*,,') -b_inode=$(ls -i c/b|sed 's,c/.*,,') -test "$a_inode" = "$b_inode" && fail=1 -# -------------------------------------- - -# Ensure that -d still preserves hard links. -rm -rf a b c d -touch a; ln a b -mkdir c -cp -d a b c -a_inode=$(ls -i c/a|sed 's,c/.*,,') -b_inode=$(ls -i c/b|sed 's,c/.*,,') -test "$a_inode" = "$b_inode" || fail=1 -# -------------------------------------- - -# Ensure that --no-preserve=mode works -rm -rf a b c d -touch a; chmod 731 a -umask 077 -cp -a --no-preserve=mode a b -mode=$(ls -l b|cut -b-10) -test "$mode" = "-rwx------" || fail=1 -umask 022 -# -------------------------------------- - -Exit $fail diff --git a/tests/cp/link-preserve.sh b/tests/cp/link-preserve.sh new file mode 100755 index 00000000..52df843c --- /dev/null +++ b/tests/cp/link-preserve.sh @@ -0,0 +1,91 @@ +#!/bin/sh +# 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. + +# This 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 + +touch a || framework_failure_ +ln a b || framework_failure_ +mkdir c || framework_failure_ +cp -d a b c || framework_failure_ +test -f c/a || framework_failure_ +test -f c/b || framework_failure_ + + +a_inode=$(ls -i c/a|sed 's,c/.*,,') +b_inode=$(ls -i c/b|sed 's,c/.*,,') +test "$a_inode" = "$b_inode" || fail=1 +# -------------------------------------- + +rm -rf a b c +touch a +ln -s a b +mkdir c +cp --preserve=links -R -H a b c || fail=1 +a_inode=$(ls -i c/a|sed 's,c/.*,,') +b_inode=$(ls -i c/b|sed 's,c/.*,,') +test "$a_inode" = "$b_inode" || fail=1 +# -------------------------------------- + +# Ensure that -L makes cp follow the b->a symlink +# and translates to hard-linked a and b in the destination dir. +rm -rf a b c d; mkdir d; (cd d; touch a; ln -s a b) +cp --preserve=links -R -L d c || fail=1 +a_inode=$(ls -i c/a|sed 's,c/.*,,') +b_inode=$(ls -i c/b|sed 's,c/.*,,') +test "$a_inode" = "$b_inode" || fail=1 +# -------------------------------------- + +# Same as above, but starting with a/b hard linked. +rm -rf a b c d; mkdir d; (cd d; touch a; ln a b) +cp --preserve=links -R -L d c || fail=1 +a_inode=$(ls -i c/a|sed 's,c/.*,,') +b_inode=$(ls -i c/b|sed 's,c/.*,,') +test "$a_inode" = "$b_inode" || fail=1 +# -------------------------------------- + +# Ensure that --no-preserve=links works. +rm -rf a b c d; mkdir d; (cd d; touch a; ln a b) +cp -dR --no-preserve=links d c || fail=1 +a_inode=$(ls -i c/a|sed 's,c/.*,,') +b_inode=$(ls -i c/b|sed 's,c/.*,,') +test "$a_inode" = "$b_inode" && fail=1 +# -------------------------------------- + +# Ensure that -d still preserves hard links. +rm -rf a b c d +touch a; ln a b +mkdir c +cp -d a b c || fail=1 +a_inode=$(ls -i c/a|sed 's,c/.*,,') +b_inode=$(ls -i c/b|sed 's,c/.*,,') +test "$a_inode" = "$b_inode" || fail=1 +# -------------------------------------- + +# Ensure that --no-preserve=mode works +rm -rf a b c d +touch a; chmod 731 a +umask 077 +cp -a --no-preserve=mode a b || fail=1 +mode=$(ls -l b|cut -b-10) +test "$mode" = "-rw-------" || fail=1 +umask 022 +# -------------------------------------- + +Exit $fail diff --git a/tests/cp/link-symlink b/tests/cp/link-symlink deleted file mode 100755 index 57bc9c71..00000000 --- a/tests/cp/link-symlink +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh -# Ensure that cp -a --link maintains timestamps if possible - -# Copyright (C) 2011-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp - -# Check that the timestamps of the symlink are copied -# if we're using hardlink to symlink emulation. -touch file -ln -s file link || framework_failure_ -touch -m -h -d 2011-01-01 link || - skip_ "Your system doesn't support updating symlink timestamps" -case $(stat --format=%y link) in - 2011-01-01*) ;; - *) skip_ "Your system doesn't support updating symlink timestamps" ;; -esac - -# link.cp is probably a hardlink, but may also be a symlink -# In either case the timestamp should match the original. -cp -al link link.cp -case $(stat --format=%y link.cp) in - 2011-01-01*) ;; - *) fail=1 ;; -esac - -Exit $fail diff --git a/tests/cp/link-symlink.sh b/tests/cp/link-symlink.sh new file mode 100755 index 00000000..b328b717 --- /dev/null +++ b/tests/cp/link-symlink.sh @@ -0,0 +1,41 @@ +#!/bin/sh +# Ensure that cp -a --link maintains timestamps if possible + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp + +# Check that the timestamps of the symlink are copied +# if we're using hardlink to symlink emulation. +touch file +ln -s file link || framework_failure_ +touch -m -h -d 2011-01-01 link || + skip_ "Your system doesn't support updating symlink timestamps" +case $(stat --format=%y link) in + 2011-01-01*) ;; + *) skip_ "Your system doesn't support updating symlink timestamps" ;; +esac + +# link.cp is probably a hardlink, but may also be a symlink +# In either case the timestamp should match the original. +cp -al link link.cp || fail=1 +case $(stat --format=%y link.cp) in + 2011-01-01*) ;; + *) fail=1 ;; +esac + +Exit $fail diff --git a/tests/cp/link.sh b/tests/cp/link.sh new file mode 100755 index 00000000..50e42bd8 --- /dev/null +++ b/tests/cp/link.sh @@ -0,0 +1,31 @@ +#!/bin/sh +# 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. + +# This 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 + +touch src || framework_failure_ +touch dest || framework_failure_ +touch dest2 || framework_failure_ + + +cp -f --link src dest || fail=1 +cp -f --symbolic-link src dest2 || fail=1 + +Exit $fail diff --git a/tests/cp/nfs-removal-race b/tests/cp/nfs-removal-race deleted file mode 100755 index cb8aba37..00000000 --- a/tests/cp/nfs-removal-race +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/sh -# Running cp S D on an NFS client while another client has just removed D -# would lead (w/coreutils-8.16 and earlier) to cp's initial stat call -# seeing (via stale NFS cache) that D exists, so that cp would then call -# open without the O_CREAT flag. Yet, the open must actually consult -# the server, which confesses that D has been deleted, thus causing the -# open call to fail with ENOENT. -# -# This test simulates that situation by intercepting stat for a nonexistent -# destination, D, and making the stat fill in the result struct for another -# file and return 0. -# -# 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 Free Software Foundation, Inc. - -# This 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp - -# Replace each stat call with a call to this wrapper. -cat > k.c <<'EOF' || framework_failure_ -#define _GNU_SOURCE -#include <sys/types.h> -#include <dlfcn.h> - -#define __xstat __xstat_orig - -#include <sys/stat.h> -#include <stddef.h> - -#undef __xstat - -int -__xstat (int ver, const char *path, struct stat *st) -{ - static int (*real_stat)(int ver, const char *path, struct stat *st) = NULL; - if (!real_stat) - real_stat = dlsym (RTLD_NEXT, "__xstat"); - /* When asked to stat nonexistent "d", - return results suggesting it exists. */ - return real_stat (ver, *path == 'd' && path[1] == 0 ? "d2" : path, st); -} -EOF - -# Then compile/link it: -$CC -shared -fPIC -O2 k.c -o k.so -ldl \ - || framework_failure_ 'failed to compile with -shared -fPIC' - -touch d2 || framework_failure_ -echo xyz > src || framework_failure_ - -# Finally, run the test: -LD_PRELOAD=./k.so cp src d || fail=1 - -compare src d || fail=1 -Exit $fail diff --git a/tests/cp/nfs-removal-race.sh b/tests/cp/nfs-removal-race.sh new file mode 100755 index 00000000..b606784e --- /dev/null +++ b/tests/cp/nfs-removal-race.sh @@ -0,0 +1,70 @@ +#!/bin/sh +# Running cp S D on an NFS client while another client has just removed D +# would lead (w/coreutils-8.16 and earlier) to cp's initial stat call +# seeing (via stale NFS cache) that D exists, so that cp would then call +# open without the O_CREAT flag. Yet, the open must actually consult +# the server, which confesses that D has been deleted, thus causing the +# open call to fail with ENOENT. +# +# This test simulates that situation by intercepting stat for a nonexistent +# destination, D, and making the stat fill in the result struct for another +# file and return 0. +# +# 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. + +# This 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 + +# Replace each stat call with a call to this wrapper. +cat > k.c <<'EOF' || framework_failure_ +#define _GNU_SOURCE +#include <sys/types.h> +#include <dlfcn.h> + +#define __xstat __xstat_orig + +#include <sys/stat.h> +#include <stddef.h> + +#undef __xstat + +int +__xstat (int ver, const char *path, struct stat *st) +{ + static int (*real_stat)(int ver, const char *path, struct stat *st) = NULL; + if (!real_stat) + real_stat = dlsym (RTLD_NEXT, "__xstat"); + /* When asked to stat nonexistent "d", + return results suggesting it exists. */ + return real_stat (ver, *path == 'd' && path[1] == 0 ? "d2" : path, st); +} +EOF + +# Then compile/link it: +$CC -shared -fPIC -O2 k.c -o k.so -ldl \ + || framework_failure_ 'failed to compile with -shared -fPIC' + +touch d2 || framework_failure_ +echo xyz > src || framework_failure_ + +# Finally, run the test: +LD_PRELOAD=./k.so cp src d || fail=1 + +compare src d || fail=1 +Exit $fail diff --git a/tests/cp/no-deref-link1 b/tests/cp/no-deref-link1 deleted file mode 100755 index c2a56579..00000000 --- a/tests/cp/no-deref-link1 +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -# cp from 3.16 fails this test - -# Copyright (C) 1997-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp - -mkdir a b -msg=bar -echo $msg > a/foo -cd b -ln -s ../a/foo . -cd .. - - -# It should fail with a message something like this: -# ./cp: 'a/foo' and 'b/foo' are the same file -cp -d a/foo b 2>/dev/null - -# Fail this test if the exit status is not 1 -test $? = 1 || fail=1 - -test "$(cat a/foo)" = $msg || fail=1 - -Exit $fail diff --git a/tests/cp/no-deref-link1.sh b/tests/cp/no-deref-link1.sh new file mode 100755 index 00000000..b950622f --- /dev/null +++ b/tests/cp/no-deref-link1.sh @@ -0,0 +1,39 @@ +#!/bin/sh +# cp from 3.16 fails this test + +# Copyright (C) 1997-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp + +mkdir a b +msg=bar +echo $msg > a/foo +cd b +ln -s ../a/foo . +cd .. + + +# It should fail with a message something like this: +# ./cp: 'a/foo' and 'b/foo' are the same file +cp -d a/foo b 2>/dev/null + +# Fail this test if the exit status is not 1 +test $? = 1 || fail=1 + +test "$(cat a/foo)" = $msg || fail=1 + +Exit $fail diff --git a/tests/cp/no-deref-link2 b/tests/cp/no-deref-link2 deleted file mode 100755 index 58402995..00000000 --- a/tests/cp/no-deref-link2 +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -# cp from 3.16 fails this test - -# Copyright (C) 1997-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp - -mkdir b -msg=bar -echo $msg > a -cd b -ln -s ../a . -cd .. - - -# It should fail with a message something like this: -# cp: 'a' and 'b/foo' are the same file -cp -d a b 2>/dev/null - -# Fail this test if the exit status is not 1 -test $? = 1 || fail=1 - -test "$(cat a)" = $msg || fail=1 - -Exit $fail diff --git a/tests/cp/no-deref-link2.sh b/tests/cp/no-deref-link2.sh new file mode 100755 index 00000000..dd8af5c6 --- /dev/null +++ b/tests/cp/no-deref-link2.sh @@ -0,0 +1,39 @@ +#!/bin/sh +# cp from 3.16 fails this test + +# Copyright (C) 1997-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp + +mkdir b +msg=bar +echo $msg > a +cd b +ln -s ../a . +cd .. + + +# It should fail with a message something like this: +# cp: 'a' and 'b/foo' are the same file +cp -d a b 2>/dev/null + +# Fail this test if the exit status is not 1 +test $? = 1 || fail=1 + +test "$(cat a)" = $msg || fail=1 + +Exit $fail diff --git a/tests/cp/no-deref-link3 b/tests/cp/no-deref-link3 deleted file mode 100755 index 5f63f269..00000000 --- a/tests/cp/no-deref-link3 +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# cp from 3.16 fails this test - -# Copyright (C) 1997-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp - -msg=bar -echo $msg > a -ln -s a b - - -# It should fail with a message something like this: -# cp: 'a' and 'b' are the same file -cp -d a b 2>/dev/null - -# Fail this test if the exit status is not 1 -test $? = 1 || fail=1 - -test "$(cat a)" = $msg || fail=1 - -Exit $fail diff --git a/tests/cp/no-deref-link3.sh b/tests/cp/no-deref-link3.sh new file mode 100755 index 00000000..c8dadee9 --- /dev/null +++ b/tests/cp/no-deref-link3.sh @@ -0,0 +1,36 @@ +#!/bin/sh +# cp from 3.16 fails this test + +# Copyright (C) 1997-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp + +msg=bar +echo $msg > a +ln -s a b + + +# It should fail with a message something like this: +# cp: 'a' and 'b' are the same file +cp -d a b 2>/dev/null + +# Fail this test if the exit status is not 1 +test $? = 1 || fail=1 + +test "$(cat a)" = $msg || fail=1 + +Exit $fail diff --git a/tests/cp/parent-perm b/tests/cp/parent-perm deleted file mode 100755 index bac38c68..00000000 --- a/tests/cp/parent-perm +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh -# Ensure that cp --parents works properly with a preexisting dest. directory - -# Copyright (C) 2008-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp - -working_umask_or_skip_ -# cp -p gives ENOTSUP on NFS on Linux 2.6.9 at least -require_local_dir_ - -mkdir -p a/b/c a/b/d e || framework_failure_ -touch a/b/c/foo a/b/d/foo || framework_failure_ -cp -p --parent a/b/c/foo e || framework_failure_ - -# Make permissions of e/a different, so that we exercise the -# code in cp -p --parents that propagates permissions even -# to a destination directory that it doesn't create. -chmod g-rx e/a e/a/b || framework_failure_ - -cp -p --parent a/b/d/foo e || fail=1 - -# Ensure that permissions on just-created directory, e/a/, -# are the same as those on original, a/. - -# The sed filter maps any 's' from an inherited set-GID bit -# to the usual 'x'. Otherwise, under unusual circumstances, this -# test would fail with e.g., drwxr-sr-x != drwxr-xr-x . -# For reference, the unusual circumstances is: build dir is set-gid, -# so "a/" inherits that. However, when the user does not belong to -# the group of the build directory, chmod ("a/e", 02755) returns 0, -# yet fails to set the S_ISGID bit. -for dir in a a/b a/b/d; do - test $(stat --printf %A $dir|sed s/s/x/g) \ - = $(stat --printf %A e/$dir|sed s/s/x/g) || - fail=1 -done - -Exit $fail diff --git a/tests/cp/parent-perm-race b/tests/cp/parent-perm-race deleted file mode 100755 index 41486fcb..00000000 --- a/tests/cp/parent-perm-race +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/sh -# Make sure cp -pR --parents isn't too generous with parent permissions. - -# Copyright (C) 2006-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp - -# cp -p gives ENOTSUP on NFS on Linux 2.6.9 at least -require_local_dir_ - -umask 002 -mkdir mode ownership d || framework_failure_ -chmod g+s d 2>/dev/null # The cp test is valid either way. - - -for attr in mode ownership -do - mkfifo_or_skip_ $attr/fifo - - # Copy a fifo's contents. That way, we can examine d/$attr's - # state while cp is running. - cp --preserve=$attr -R --copy-contents --parents $attr d & - cp_pid=$! - - ( - # Now 'cp' is reading the fifo. - # Check the permissions of the temporary destination - # directory that 'cp' has made. - ls -ld d/$attr >d/$attr.ls - - # Close the fifo so that "cp" can continue. But output first, - # before exiting, otherwise some shells would optimize away the file - # descriptor that holds the fifo open. - echo foo - ) >$attr/fifo - - ls_output=$(cat d/$attr.ls) || fail=1 - case $attr,$ls_output in - ownership,d???--[-S]--[-S]* | \ - mode,d????-??-?* | \ - mode,d??[-x]?w[-x]?-[-x]* ) - ;; - *) - fail=1;; - esac - - wait $cp_pid || fail=1 -done - -Exit $fail diff --git a/tests/cp/parent-perm-race.sh b/tests/cp/parent-perm-race.sh new file mode 100755 index 00000000..e46d1483 --- /dev/null +++ b/tests/cp/parent-perm-race.sh @@ -0,0 +1,64 @@ +#!/bin/sh +# Make sure cp -pR --parents isn't too generous with parent permissions. + +# Copyright (C) 2006-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp + +# cp -p gives ENOTSUP on NFS on Linux 2.6.9 at least +require_local_dir_ + +umask 002 +mkdir mode ownership d || framework_failure_ +chmod g+s d 2>/dev/null # The cp test is valid either way. + + +for attr in mode ownership +do + mkfifo_or_skip_ $attr/fifo + + # Copy a fifo's contents. That way, we can examine d/$attr's + # state while cp is running. + cp --preserve=$attr -R --copy-contents --parents $attr d & + cp_pid=$! + + ( + # Now 'cp' is reading the fifo. + # Check the permissions of the temporary destination + # directory that 'cp' has made. + ls -ld d/$attr >d/$attr.ls + + # Close the fifo so that "cp" can continue. But output first, + # before exiting, otherwise some shells would optimize away the file + # descriptor that holds the fifo open. + echo foo + ) >$attr/fifo + + ls_output=$(cat d/$attr.ls) || fail=1 + case $attr,$ls_output in + ownership,d???--[-S]--[-S]* | \ + mode,d????-??-?* | \ + mode,d??[-x]?w[-x]?-[-x]* ) + ;; + *) + fail=1;; + esac + + wait $cp_pid || fail=1 +done + +Exit $fail diff --git a/tests/cp/parent-perm.sh b/tests/cp/parent-perm.sh new file mode 100755 index 00000000..46869e27 --- /dev/null +++ b/tests/cp/parent-perm.sh @@ -0,0 +1,53 @@ +#!/bin/sh +# Ensure that cp --parents works properly with a preexisting dest. directory + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp + +working_umask_or_skip_ +# cp -p gives ENOTSUP on NFS on Linux 2.6.9 at least +require_local_dir_ + +mkdir -p a/b/c a/b/d e || framework_failure_ +touch a/b/c/foo a/b/d/foo || framework_failure_ +cp -p --parent a/b/c/foo e || framework_failure_ + +# Make permissions of e/a different, so that we exercise the +# code in cp -p --parents that propagates permissions even +# to a destination directory that it doesn't create. +chmod g-rx e/a e/a/b || framework_failure_ + +cp -p --parent a/b/d/foo e || fail=1 + +# Ensure that permissions on just-created directory, e/a/, +# are the same as those on original, a/. + +# The sed filter maps any 's' from an inherited set-GID bit +# to the usual 'x'. Otherwise, under unusual circumstances, this +# test would fail with e.g., drwxr-sr-x != drwxr-xr-x . +# For reference, the unusual circumstances is: build dir is set-gid, +# so "a/" inherits that. However, when the user does not belong to +# the group of the build directory, chmod ("a/e", 02755) returns 0, +# yet fails to set the S_ISGID bit. +for dir in a a/b a/b/d; do + test $(stat --printf %A $dir|sed s/s/x/g) \ + = $(stat --printf %A e/$dir|sed s/s/x/g) || + fail=1 +done + +Exit $fail diff --git a/tests/cp/perm b/tests/cp/perm deleted file mode 100755 index a93df718..00000000 --- a/tests/cp/perm +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/sh -# Make sure the permission-preserving code in copy.c (mv, cp, install) works. - -# Copyright (C) 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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp mv - -very_expensive_ - -umask 037 - - -# Now, try it with 'mv', with combinations of --force, no-f and -# existing-destination and not. -for u in 31 37 2; do - echo umask: $u - umask $u - for cmd in mv 'cp -p' cp; do - for force in '' -f; do - for existing_dest in yes no; do - for g_perm in r w x rw wx xr rwx; do - for o_perm in r w x rw wx xr rwx; do - touch src || exit 1 - chmod u=r,g=rx,o= src || exit 1 - expected_perms=$(stat --format=%A src) - rm -f dest - test $existing_dest = yes && { - touch dest || exit 1 - chmod u=rw,g=$g_perm,o=$o_perm dest || exit 1 - } - $cmd $force src dest || exit 1 - test "$cmd" = mv && test -f src && exit 1 - test "$cmd" = cp && { test -f src || exit 1; } - actual_perms=$(stat --format=%A dest) - - case "$cmd:$force:$existing_dest" in - cp:*:yes) - _g_perm=$(echo rwx|sed 's/[^'$g_perm']/-/g') - _o_perm=$(echo rwx|sed 's/[^'$o_perm']/-/g') - expected_perms=-rw-$_g_perm$_o_perm - ;; - cp:*:no) - test $u = 37 && - expected_perms=$( - echo $expected_perms | sed 's/.....$/-----/' - ) - test $u = 31 && - expected_perms=$( - echo $expected_perms | sed 's/..\(..\).$/--\1-/' - ) - ;; - esac - test _$actual_perms = _$expected_perms || exit 1 - # Perform only one iteration when there's no existing destination. - test $existing_dest = no && break 3 - done - done - done - done - done -done - -Exit $fail diff --git a/tests/cp/perm.sh b/tests/cp/perm.sh new file mode 100755 index 00000000..620bd55f --- /dev/null +++ b/tests/cp/perm.sh @@ -0,0 +1,77 @@ +#!/bin/sh +# Make sure the permission-preserving code in copy.c (mv, cp, install) works. + +# Copyright (C) 2000-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp mv + +very_expensive_ + +umask 037 + + +# Now, try it with 'mv', with combinations of --force, no-f and +# existing-destination and not. +for u in 31 37 2; do + echo umask: $u + umask $u + for cmd in mv 'cp -p' cp; do + for force in '' -f; do + for existing_dest in yes no; do + for g_perm in r w x rw wx xr rwx; do + for o_perm in r w x rw wx xr rwx; do + touch src || exit 1 + chmod u=r,g=rx,o= src || exit 1 + expected_perms=$(stat --format=%A src) + rm -f dest + test $existing_dest = yes && { + touch dest || exit 1 + chmod u=rw,g=$g_perm,o=$o_perm dest || exit 1 + } + $cmd $force src dest || exit 1 + test "$cmd" = mv && test -f src && exit 1 + test "$cmd" = cp && { test -f src || exit 1; } + actual_perms=$(stat --format=%A dest) + + case "$cmd:$force:$existing_dest" in + cp:*:yes) + _g_perm=$(echo rwx|sed 's/[^'$g_perm']/-/g') + _o_perm=$(echo rwx|sed 's/[^'$o_perm']/-/g') + expected_perms=-rw-$_g_perm$_o_perm + ;; + cp:*:no) + test $u = 37 && + expected_perms=$( + echo $expected_perms | sed 's/.....$/-----/' + ) + test $u = 31 && + expected_perms=$( + echo $expected_perms | sed 's/..\(..\).$/--\1-/' + ) + ;; + esac + test _$actual_perms = _$expected_perms || exit 1 + # Perform only one iteration when there's no existing destination. + test $existing_dest = no && break 3 + done + done + done + done + done +done + +Exit $fail diff --git a/tests/cp/preserve-2 b/tests/cp/preserve-2 deleted file mode 100755 index fea4b6c3..00000000 --- a/tests/cp/preserve-2 +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# ensure that cp's --preserve=X,Y option is parsed properly - -# Copyright (C) 2002-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp - -# cp -p gives ENOTSUP on NFS on Linux 2.6.9 at least -require_local_dir_ - -touch f || framework_failure_ - -cp --preserve=mode,links f g || fail=1 - -Exit $fail diff --git a/tests/cp/preserve-2.sh b/tests/cp/preserve-2.sh new file mode 100755 index 00000000..68369d37 --- /dev/null +++ b/tests/cp/preserve-2.sh @@ -0,0 +1,29 @@ +#!/bin/sh +# ensure that cp's --preserve=X,Y option is parsed properly + +# Copyright (C) 2002-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp + +# cp -p gives ENOTSUP on NFS on Linux 2.6.9 at least +require_local_dir_ + +touch f || framework_failure_ + +cp --preserve=mode,links f g || fail=1 + +Exit $fail diff --git a/tests/cp/preserve-gid b/tests/cp/preserve-gid deleted file mode 100755 index 746c57a6..00000000 --- a/tests/cp/preserve-gid +++ /dev/null @@ -1,136 +0,0 @@ -#!/bin/sh -# Verify that cp -p preserves GID when it is possible. - -# Copyright (C) 2007-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp - -require_root_ - -# Some of the tests expect a umask that grants group and/or world read access. -working_umask_or_skip_ - -# Record primary group number, usually 0. -# This is the group ID used when cp (without -p) creates a new file. -primary_group_num=$(id -g) - -create() { - echo "$1" > "$1" || exit 1 - chown "+$2:+$3" "$1" || exit 1 -} - -t0() { - f=$1; shift - u=$1; shift - g=$1; shift - rm -f b || exit 1 - "$@" "$f" b || exit 1 - s=$(stat -c '%u %g' b) - if test "x$s" != "x$u $g"; then - # Allow the actual group to match that of the parent directory - # (it was set to 0 above). - if test "x$s" = "x$u $primary_group_num"; then - : - else - echo "$0: $* $f b: $u $g != $s" 1>&2 - Exit 1 - fi - fi -} - -nameless_uid=$($PERL -le ' - foreach my $i (1000..16*1024-1) - { - getpwuid $i or (print $i), exit - } -') -nameless_gid1=$($PERL -le ' - foreach my $i (1000..16*1024) - { - getgrgid $i or (print $i), exit - } -') -nameless_gid2=$($PERL -le ' - foreach my $i ('"$nameless_gid1"'+1..16*1024) - { - getgrgid $i or (print $i), exit - } -') - -if test -z "$nameless_uid" \ - || test -z "$nameless_gid1" \ - || test -z "$nameless_gid2"; then - skip_ "couldn't find a nameless UID or GID" -fi - -chown "+$nameless_uid:+0" . - -create a0 0 0 -create b0 "$nameless_uid" "$nameless_gid1" -create b1 "$nameless_uid" "$nameless_gid2" -create c0 0 "$nameless_gid1" -create c1 0 "$nameless_gid2" - -t0 a0 0 0 cp -t0 b0 0 0 cp -t0 b1 0 0 cp -t0 c0 0 0 cp -t0 c1 0 0 cp - -t0 a0 0 0 cp -p -t0 b0 "$nameless_uid" "$nameless_gid1" cp -p -t0 b1 "$nameless_uid" "$nameless_gid2" cp -p -t0 c0 0 "$nameless_gid1" cp -p -t0 c1 0 "$nameless_gid2" cp -p - -# For the remaining tests, we need a cp binary that is accessible to a user -# with UID of $nameless_uid. The build directory may not be accessible, -# so create a temporary directory and copy cp into it, ensure that -# $nameless_uid can access it and then make that directory the search path. -tmp_path= -cleanup_() { rm -rf "$tmp_path"; } - -# Cause mktemp to create a directory directly under /tmp. -# Setting TMPDIR explicitly is required here, in case $TMPDIR -# is not readable by our nameless IDs. -test -d /tmp && TMPDIR=/tmp -tmp_path=$(mktemp -d) || fail_ "failed to create temporary directory" -cp "$abs_path_dir_/cp" "$tmp_path" -chmod -R a+rx "$tmp_path" - -t1() { - f=$1; shift - u=$1; shift - g=$1; shift - t0 "$f" "$u" "$g" \ - setuidgid -g "$nameless_gid1,$nameless_gid2" \ - "$nameless_uid" env PATH="$tmp_path" "$@" -} - -t1 a0 "$nameless_uid" "$nameless_gid1" cp -t1 b0 "$nameless_uid" "$nameless_gid1" cp -t1 b1 "$nameless_uid" "$nameless_gid1" cp -t1 c0 "$nameless_uid" "$nameless_gid1" cp -t1 c1 "$nameless_uid" "$nameless_gid1" cp - -t1 a0 "$nameless_uid" "$nameless_gid1" cp -p -t1 b0 "$nameless_uid" "$nameless_gid1" cp -p -t1 b1 "$nameless_uid" "$nameless_gid2" cp -p -t1 c0 "$nameless_uid" "$nameless_gid1" cp -p -t1 c1 "$nameless_uid" "$nameless_gid2" cp -p - -Exit $fail diff --git a/tests/cp/preserve-gid.sh b/tests/cp/preserve-gid.sh new file mode 100755 index 00000000..0a0bacdd --- /dev/null +++ b/tests/cp/preserve-gid.sh @@ -0,0 +1,136 @@ +#!/bin/sh +# Verify that cp -p preserves GID when it is possible. + +# Copyright (C) 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp + +require_root_ + +# Some of the tests expect a umask that grants group and/or world read access. +working_umask_or_skip_ + +# Record primary group number, usually 0. +# This is the group ID used when cp (without -p) creates a new file. +primary_group_num=$(id -g) + +create() { + echo "$1" > "$1" || exit 1 + chown "+$2:+$3" "$1" || exit 1 +} + +t0() { + f=$1; shift + u=$1; shift + g=$1; shift + rm -f b || exit 1 + "$@" "$f" b || exit 1 + s=$(stat -c '%u %g' b) + if test "x$s" != "x$u $g"; then + # Allow the actual group to match that of the parent directory + # (it was set to 0 above). + if test "x$s" = "x$u $primary_group_num"; then + : + else + echo "$0: $* $f b: $u $g != $s" 1>&2 + Exit 1 + fi + fi +} + +nameless_uid=$($PERL -le ' + foreach my $i (1000..16*1024-1) + { + getpwuid $i or (print $i), exit + } +') +nameless_gid1=$($PERL -le ' + foreach my $i (1000..16*1024) + { + getgrgid $i or (print $i), exit + } +') +nameless_gid2=$($PERL -le ' + foreach my $i ('"$nameless_gid1"'+1..16*1024) + { + getgrgid $i or (print $i), exit + } +') + +if test -z "$nameless_uid" \ + || test -z "$nameless_gid1" \ + || test -z "$nameless_gid2"; then + skip_ "couldn't find a nameless UID or GID" +fi + +chown "+$nameless_uid:+0" . + +create a0 0 0 +create b0 "$nameless_uid" "$nameless_gid1" +create b1 "$nameless_uid" "$nameless_gid2" +create c0 0 "$nameless_gid1" +create c1 0 "$nameless_gid2" + +t0 a0 0 0 cp +t0 b0 0 0 cp +t0 b1 0 0 cp +t0 c0 0 0 cp +t0 c1 0 0 cp + +t0 a0 0 0 cp -p +t0 b0 "$nameless_uid" "$nameless_gid1" cp -p +t0 b1 "$nameless_uid" "$nameless_gid2" cp -p +t0 c0 0 "$nameless_gid1" cp -p +t0 c1 0 "$nameless_gid2" cp -p + +# For the remaining tests, we need a cp binary that is accessible to a user +# with UID of $nameless_uid. The build directory may not be accessible, +# so create a temporary directory and copy cp into it, ensure that +# $nameless_uid can access it and then make that directory the search path. +tmp_path= +cleanup_() { rm -rf "$tmp_path"; } + +# Cause mktemp to create a directory directly under /tmp. +# Setting TMPDIR explicitly is required here, in case $TMPDIR +# is not readable by our nameless IDs. +test -d /tmp && TMPDIR=/tmp +tmp_path=$(mktemp -d) || fail_ "failed to create temporary directory" +cp "$abs_path_dir_/cp" "$tmp_path" +chmod -R a+rx "$tmp_path" + +t1() { + f=$1; shift + u=$1; shift + g=$1; shift + t0 "$f" "$u" "$g" \ + setuidgid -g "$nameless_gid1,$nameless_gid2" \ + "$nameless_uid" env PATH="$tmp_path" "$@" +} + +t1 a0 "$nameless_uid" "$nameless_gid1" cp +t1 b0 "$nameless_uid" "$nameless_gid1" cp +t1 b1 "$nameless_uid" "$nameless_gid1" cp +t1 c0 "$nameless_uid" "$nameless_gid1" cp +t1 c1 "$nameless_uid" "$nameless_gid1" cp + +t1 a0 "$nameless_uid" "$nameless_gid1" cp -p +t1 b0 "$nameless_uid" "$nameless_gid1" cp -p +t1 b1 "$nameless_uid" "$nameless_gid2" cp -p +t1 c0 "$nameless_uid" "$nameless_gid1" cp -p +t1 c1 "$nameless_uid" "$nameless_gid2" cp -p + +Exit $fail diff --git a/tests/cp/preserve-link b/tests/cp/preserve-link deleted file mode 100755 index 5f069af7..00000000 --- a/tests/cp/preserve-link +++ /dev/null @@ -1,92 +0,0 @@ -#!/bin/sh -# Exercise the fix for http://debbugs.gnu.org/8419 - -# Copyright (C) 2011-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp - -same_inode() -{ - local u v - u=$(stat --format %i "$1") && - v=$(stat --format %i "$2") && test "$u" = "$v" -} - -create_source_tree() -{ - rm -Rf s - mkdir s || framework_failure_ - - # a missing link in dest will be created - touch s/f || framework_failure_ - ln s/f s/linkm || framework_failure_ - - # an existing link in dest will be maintained - ln s/f s/linke || framework_failure_ - - # a separate older file in dest will be overwritten - ln s/f s/fileo || framework_failure_ - - # a separate newer file in dest will be overwritten! - ln s/f s/fileu || framework_failure_ -} - -create_target_tree() -{ - f=$1 # which of f or linkm to create in t/ - - rm -Rf t - mkdir -p t/s/ || framework_failure_ - - # a missing link in dest must be created - touch t/s/$f || framework_failure_ - - # an existing link must be maintained - ln t/s/$f t/s/linke || framework_failure_ - - # a separate older file in dest will be overwritten - touch -d '-1 hour' t/s/fileo || framework_failure_ - - # a separate newer file in dest will be overwritten! - touch -d '+1 hour' t/s/fileu || framework_failure_ -} - - -# Note we repeat this, creating either one of -# two hard linked files from source in the dest, so as to -# test both paths in $(cp) for creating the hard links. -# The path taken by cp is dependent on which cp encounters -# first in the source, which is non deterministic currently -# (I'm guessing that results are sorted by inode and -# beauses they're the same here, and due to the sort -# being unstable, either can be processed first). -create_source_tree - -for f in f linkm; do - create_target_tree $f - - # Copy all the hard links across. With cp from coreutils-8.12 - # and prior, it would sometimes mistakenly copy rather than link. - cp -au s t || fail=1 - - same_inode t/s/f t/s/linkm || fail=1 - same_inode t/s/f t/s/linke || fail=1 - same_inode t/s/f t/s/fileo || fail=1 - same_inode t/s/f t/s/fileu || fail=1 -done - -Exit $fail diff --git a/tests/cp/preserve-link.sh b/tests/cp/preserve-link.sh new file mode 100755 index 00000000..9497598b --- /dev/null +++ b/tests/cp/preserve-link.sh @@ -0,0 +1,92 @@ +#!/bin/sh +# Exercise the fix for http://debbugs.gnu.org/8419 + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp + +same_inode() +{ + local u v + u=$(stat --format %i "$1") && + v=$(stat --format %i "$2") && test "$u" = "$v" +} + +create_source_tree() +{ + rm -Rf s + mkdir s || framework_failure_ + + # a missing link in dest will be created + touch s/f || framework_failure_ + ln s/f s/linkm || framework_failure_ + + # an existing link in dest will be maintained + ln s/f s/linke || framework_failure_ + + # a separate older file in dest will be overwritten + ln s/f s/fileo || framework_failure_ + + # a separate newer file in dest will be overwritten! + ln s/f s/fileu || framework_failure_ +} + +create_target_tree() +{ + f=$1 # which of f or linkm to create in t/ + + rm -Rf t + mkdir -p t/s/ || framework_failure_ + + # a missing link in dest must be created + touch t/s/$f || framework_failure_ + + # an existing link must be maintained + ln t/s/$f t/s/linke || framework_failure_ + + # a separate older file in dest will be overwritten + touch -d '-1 hour' t/s/fileo || framework_failure_ + + # a separate newer file in dest will be overwritten! + touch -d '+1 hour' t/s/fileu || framework_failure_ +} + + +# Note we repeat this, creating either one of +# two hard linked files from source in the dest, so as to +# test both paths in $(cp) for creating the hard links. +# The path taken by cp is dependent on which cp encounters +# first in the source, which is non deterministic currently +# (I'm guessing that results are sorted by inode and +# beauses they're the same here, and due to the sort +# being unstable, either can be processed first). +create_source_tree + +for f in f linkm; do + create_target_tree $f + + # Copy all the hard links across. With cp from coreutils-8.12 + # and prior, it would sometimes mistakenly copy rather than link. + cp -au s t || fail=1 + + same_inode t/s/f t/s/linkm || fail=1 + same_inode t/s/f t/s/linke || fail=1 + same_inode t/s/f t/s/fileo || fail=1 + same_inode t/s/f t/s/fileu || fail=1 +done + +Exit $fail diff --git a/tests/cp/preserve-mode.sh b/tests/cp/preserve-mode.sh new file mode 100755 index 00000000..188a20e5 --- /dev/null +++ b/tests/cp/preserve-mode.sh @@ -0,0 +1,54 @@ +#!/bin/sh +# ensure that cp's --no-preserve=mode works correctly + +# Copyright (C) 2002-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp + +rm -f a b c +umask 0022 +touch a +touch b +chmod 600 b + +#regular file test +cp --no-preserve=mode b c || fail=1 +mode_a=$(ls -l a | gawk '{print $1}') +mode_c=$(ls -l c | gawk '{print $1}') +test "$mode_a" = "$mode_c" || fail=1 + +rm -rf d1 d2 d3 +mkdir d1 d2 +chmod 705 d2 + +#directory test +cp --no-preserve=mode -r d2 d3 || fail=1 +mode_d1=$(ls -l d1 | gawk '{print $1}') +mode_d3=$(ls -l d3 | gawk '{print $1}') +test "$mode_d1" = "$mode_d3" || fail=1 + +rm -f a b c +touch a +chmod 600 a + +#contradicting options test +cp --no-preserve=mode --preserve=all a b || fail=1 +mode_a=$(ls -l a | gawk '{print $1}') +mode_b=$(ls -l b | gawk '{print $1}') +test "$mode_a" = "$mode_b" || fail=1 + +Exit $fail diff --git a/tests/cp/preserve-slink-time b/tests/cp/preserve-slink-time deleted file mode 100755 index dc5d1cdd..00000000 --- a/tests/cp/preserve-slink-time +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh -# Verify that cp -Pp preserves times even on symlinks. - -# Copyright (C) 2009-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp - -grep '^#define HAVE_UTIMENSAT 1' "$CONFIG_HEADER" > /dev/null || -grep '^#define HAVE_LUTIMES 1' "$CONFIG_HEADER" > /dev/null || - skip_ 'this system lacks the utimensat function' - -ln -s no-such dangle || framework_failure_ - -# If the current file system lacks sub-second resolution, sleep for 2s to -# ensure that the times on the copy are different from those of the original. -case $(stat --format=%y dangle) in - ??:??:??.000000000) sleep 2;; -esac - -# Can't use --format=%x, as lstat() modifies atime on some platforms. -cp -Pp dangle d2 || framework_failure_ -stat --format=%y dangle > t1 || framework_failure_ -stat --format=%y d2 > t2 || framework_failure_ - -compare t1 t2 || fail=1 - -Exit $fail diff --git a/tests/cp/preserve-slink-time.sh b/tests/cp/preserve-slink-time.sh new file mode 100755 index 00000000..4c12679b --- /dev/null +++ b/tests/cp/preserve-slink-time.sh @@ -0,0 +1,41 @@ +#!/bin/sh +# Verify that cp -Pp preserves times even on symlinks. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp + +grep '^#define HAVE_UTIMENSAT 1' "$CONFIG_HEADER" > /dev/null || +grep '^#define HAVE_LUTIMES 1' "$CONFIG_HEADER" > /dev/null || + skip_ 'this system lacks the utimensat function' + +ln -s no-such dangle || framework_failure_ + +# If the current file system lacks sub-second resolution, sleep for 2s to +# ensure that the times on the copy are different from those of the original. +case $(stat --format=%y dangle) in + ??:??:??.000000000) sleep 2;; +esac + +# Can't use --format=%x, as lstat() modifies atime on some platforms. +cp -Pp dangle d2 || framework_failure_ +stat --format=%y dangle > t1 || framework_failure_ +stat --format=%y d2 > t2 || framework_failure_ + +compare t1 t2 || fail=1 + +Exit $fail diff --git a/tests/cp/proc-short-read b/tests/cp/proc-short-read deleted file mode 100755 index 632418e4..00000000 --- a/tests/cp/proc-short-read +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -# exercise cp's short-read failure when operating on >4KB files in /proc - -# Copyright (C) 2009-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp - -kall=/proc/kallsyms - -test -r $kall || skip_ "your system lacks $kall" - -# Before coreutils-7.3, cp would copy less than 4KiB of this 1MB+ file. -cp $kall 1 || fail=1 -cat $kall > 2 || fail=1 -compare 1 2 || fail=1 - -# Also check md5sum, just for good measure. -md5sum $kall > 3 || fail=1 -md5sum 2 > 4 || fail=1 - -# Remove each file name before comparing checksums. -sed 's/ .*//' 3 > sum.proc || fail=1 -sed 's/ .*//' 4 > sum.2 || fail=1 -compare sum.proc sum.2 || fail=1 - -Exit $fail diff --git a/tests/cp/proc-short-read.sh b/tests/cp/proc-short-read.sh new file mode 100755 index 00000000..f596aced --- /dev/null +++ b/tests/cp/proc-short-read.sh @@ -0,0 +1,40 @@ +#!/bin/sh +# exercise cp's short-read failure when operating on >4KB files in /proc + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp + +kall=/proc/kallsyms + +test -r $kall || skip_ "your system lacks $kall" + +# Before coreutils-7.3, cp would copy less than 4KiB of this 1MB+ file. +cp $kall 1 || fail=1 +cat $kall > 2 || fail=1 +compare 1 2 || fail=1 + +# Also check md5sum, just for good measure. +md5sum $kall > 3 || fail=1 +md5sum 2 > 4 || fail=1 + +# Remove each file name before comparing checksums. +sed 's/ .*//' 3 > sum.proc || fail=1 +sed 's/ .*//' 4 > sum.2 || fail=1 +compare sum.proc sum.2 || fail=1 + +Exit $fail diff --git a/tests/cp/proc-zero-len b/tests/cp/proc-zero-len deleted file mode 100755 index b8b9e9c6..00000000 --- a/tests/cp/proc-zero-len +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -# Ensure that cp copies contents of non-empty "regular" file with st_size==0 - -# Copyright (C) 2007-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp - -touch empty || framework_failure_ - -f=/proc/cpuinfo -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 - -# 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; } - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/cp/proc-zero-len.sh b/tests/cp/proc-zero-len.sh new file mode 100755 index 00000000..5416c7db --- /dev/null +++ b/tests/cp/proc-zero-len.sh @@ -0,0 +1,40 @@ +#!/bin/sh +# Ensure that cp copies contents of non-empty "regular" file with st_size==0 + +# Copyright (C) 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp + +touch empty || framework_failure_ + +f=/proc/cpuinfo +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 + +# 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; } + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/cp/r-vs-symlink b/tests/cp/r-vs-symlink deleted file mode 100755 index e96c5842..00000000 --- a/tests/cp/r-vs-symlink +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh -# cp -r should not create symlinks. Fixed in fileutils-4.1.5. - -# Copyright (C) 2001-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 -# 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/>. - -# Restored old behavior (whereby cp -r preserves symlinks) in 4.1.6, -# though now such usage evokes a warning: -# cp: 'slink': WARNING: using -r to copy symbolic links is not portable - -. "${srcdir=.}/init.sh"; path_prepend_ ../src -print_ver_ cp - -echo abc > foo || framework_failure_ -ln -s foo slink || framework_failure_ -ln -s no-such-file no-file || framework_failure_ - - -# This would fail in 4.1.5, not in 4.1.6. -cp -r no-file junk 2>/dev/null || fail=1 - -cp -r slink bar 2>/dev/null || fail=1 -set x $(ls -l bar); shift; mode=$1 -case $mode in - l*) ;; - *) fail=1;; -esac - -Exit $fail diff --git a/tests/cp/r-vs-symlink.sh b/tests/cp/r-vs-symlink.sh new file mode 100755 index 00000000..dfe01f31 --- /dev/null +++ b/tests/cp/r-vs-symlink.sh @@ -0,0 +1,41 @@ +#!/bin/sh +# cp -r should not create symlinks. Fixed in fileutils-4.1.5. + +# Copyright (C) 2001-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/>. + +# Restored old behavior (whereby cp -r preserves symlinks) in 4.1.6, +# though now such usage evokes a warning: +# cp: 'slink': WARNING: using -r to copy symbolic links is not portable + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp + +echo abc > foo || framework_failure_ +ln -s foo slink || framework_failure_ +ln -s no-such-file no-file || framework_failure_ + + +# This would fail in 4.1.5, not in 4.1.6. +cp -r no-file junk 2>/dev/null || fail=1 + +cp -r slink bar 2>/dev/null || fail=1 +set x $(ls -l bar); shift; mode=$1 +case $mode in + l*) ;; + *) fail=1;; +esac + +Exit $fail diff --git a/tests/cp/reflink-auto b/tests/cp/reflink-auto deleted file mode 100755 index 036148c4..00000000 --- a/tests/cp/reflink-auto +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh -# Test cp --reflink=auto - -# Copyright (C) 2009-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp - -cleanup_() { rm -rf "$other_partition_tmpdir"; } -. "$abs_srcdir/other-fs-tmpdir" -a_other="$other_partition_tmpdir/a" -rm -f "$a_other" || framework_failure_ - -echo non_zero_size > "$a_other" || framework_failure_ - -# we shouldn't be able to reflink() files on separate partitions -cp --reflink "$a_other" b && fail=1 - -# --reflink=auto should fall back to a normal copy -cp --reflink=auto "$a_other" b || fail=1 -test -s b || fail=1 - -# --reflink=auto should allow --sparse for fallback copies. -# This command can be used to create minimal sized copies. -cp --reflink=auto --sparse=always "$a_other" b || fail=1 -test -s b || fail=1 - -Exit $fail diff --git a/tests/cp/reflink-auto.sh b/tests/cp/reflink-auto.sh new file mode 100755 index 00000000..03560506 --- /dev/null +++ b/tests/cp/reflink-auto.sh @@ -0,0 +1,41 @@ +#!/bin/sh +# Test cp --reflink=auto + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp + +cleanup_() { rm -rf "$other_partition_tmpdir"; } +. "$abs_srcdir/tests/other-fs-tmpdir" +a_other="$other_partition_tmpdir/a" +rm -f "$a_other" || framework_failure_ + +echo non_zero_size > "$a_other" || framework_failure_ + +# we shouldn't be able to reflink() files on separate partitions +cp --reflink "$a_other" b && fail=1 + +# --reflink=auto should fall back to a normal copy +cp --reflink=auto "$a_other" b || fail=1 +test -s b || fail=1 + +# --reflink=auto should allow --sparse for fallback copies. +# This command can be used to create minimal sized copies. +cp --reflink=auto --sparse=always "$a_other" b || fail=1 +test -s b || fail=1 + +Exit $fail diff --git a/tests/cp/reflink-perm b/tests/cp/reflink-perm deleted file mode 100755 index c229993a..00000000 --- a/tests/cp/reflink-perm +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh -# Test cp --reflink copies permissions - -# Copyright (C) 2009-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp - - -: > 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" - -chmod a=rwx file || framework_failure_ -umask 077 -cp --reflink=auto --preserve file copy || fail=1 - -mode=$(stat --printf "%A" copy) -test "$mode" = "-rwxrwxrwx" || fail=1 - -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 -cp --reflink=always --preserve --attributes-only file2 empty_copy || fail=1 -test -s empty_copy && fail=1 - -Exit $fail diff --git a/tests/cp/reflink-perm.sh b/tests/cp/reflink-perm.sh new file mode 100755 index 00000000..3f22630e --- /dev/null +++ b/tests/cp/reflink-perm.sh @@ -0,0 +1,45 @@ +#!/bin/sh +# Test cp --reflink copies permissions + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp + + +: > 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" + +chmod a=rwx file || framework_failure_ +umask 077 +cp --reflink=auto --preserve file copy || fail=1 + +mode=$(stat --printf "%A" copy) +test "$mode" = "-rwxrwxrwx" || fail=1 + +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 +cp --reflink=always --preserve --attributes-only file2 empty_copy || fail=1 +test -s empty_copy && fail=1 + +Exit $fail diff --git a/tests/cp/same-file b/tests/cp/same-file deleted file mode 100755 index 2ca7bf6b..00000000 --- a/tests/cp/same-file +++ /dev/null @@ -1,220 +0,0 @@ -#!/bin/sh -# Test some of cp's options and how cp handles situations in -# which a naive implementation might overwrite the source file. - -# Copyright (C) 1998-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp - -# Unset CDPATH. Otherwise, output from the 'cd dir' command -# can make this test fail. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -VERSION_CONTROL=numbered; export VERSION_CONTROL - -# Determine whether a hard link to a symlink points to the symlink -# itself or to its referent. For example, the link from FreeBSD6.1 -# does dereference a symlink, but the one from Linux does not. -ln -s no-such dangling-slink -ln dangling-slink hard-link > /dev/null 2>&1 \ - && hard_link_to_symlink_does_the_deref=no \ - || hard_link_to_symlink_does_the_deref=yes -rm -f no-such dangling-slink hard-link - -test $hard_link_to_symlink_does_the_deref = yes \ - && remove_these_sed='/^0 -[bf]*l .*sl1 ->/d' \ - || remove_these_sed='/^ELIDE NO TEST OUTPUT/d' - -exec 3>&1 1> actual - -# FIXME: This should be bigger: like more than 8k -contents=XYZ - -for args in 'foo symlink' 'symlink foo' 'foo foo' 'sl1 sl2' 'foo hardlink'; do - for options in '' -d -f -df --rem -b -bd -bf -bdf \ - -l -dl -fl -dfl -bl -bdl -bfl -bdfl; do - case $args$options in - # These tests are not portable. - # They all involve making a hard link to a symbolic link. - # In the past, we've skipped the tests that are not portable, - # by doing "continue" here and eliminating the corresponding - # expected output lines below. Don't do that anymore. - 'symlink foo'-dfl) - continue;; - 'symlink foo'-bdl) - continue;; - 'symlink foo'-bdfl) - continue;; - 'sl1 sl2'-dfl) - continue;; - 'sl1 sl2'-bd*l) - continue;; - 'sl1 sl2'-dl) - continue;; - esac - - # cont'd Instead, skip them only on systems for which link does - # dereference a symlink. Detect and skip such tests here. - case $hard_link_to_symlink_does_the_deref:$args:$options in - 'yes:sl1 sl2:-fl') - continue ;; - 'yes:sl1 sl2:-bl') - continue ;; - 'yes:sl1 sl2:-bfl') - continue ;; - esac - - rm -rf dir - mkdir dir - cd dir - echo $contents > foo - case "$args" in *symlink*) ln -s foo symlink ;; esac - case "$args" in *hardlink*) ln foo hardlink ;; esac - case "$args" in *sl1*) ln -s foo sl1;; esac - case "$args" in *sl2*) ln -s foo sl2;; esac - ( - ( - # echo 1>&2 cp $options $args - cp $options $args 2>_err - echo $? $options - - # Normalize the program name and diagnostics in the error output, - # and put brackets around the output. - if test -s _err; then - sed ' - s/^[^:]*:\([^:]*\).*/cp:\1/ - 1s/^/[/ - $s/$/]/ - ' _err - fi - # Strip off all but the file names. - ls=$(ls -gG --ignore=_err . \ - | sed \ - -e '/^total /d' \ - -e 's/^[^ ]* *[^ ]* *[^ ]* *[^ ]* *[^ ]* *[^ ]* *//') - echo "($ls)" - # Make sure the original is unchanged and that - # the destination is a copy. - for f in $args; do - if test -f $f; then - case "$(cat $f)" in - "$contents") ;; - *) echo cp FAILED;; - esac - else - echo symlink-loop - fi - done - ) | tr '\n' ' ' - echo - ) | sed 's/ *$//' - cd .. - done - echo -done - -cat <<\EOF | sed "$remove_these_sed" > expected -1 [cp: 'foo' and 'symlink' are the same file] (foo symlink -> foo) -1 -d [cp: 'foo' and 'symlink' are the same file] (foo symlink -> foo) -1 -f [cp: 'foo' and 'symlink' are the same file] (foo symlink -> foo) -1 -df [cp: 'foo' and 'symlink' are the same file] (foo symlink -> foo) -0 --rem (foo symlink) -0 -b (foo symlink symlink.~1~ -> foo) -0 -bd (foo symlink symlink.~1~ -> foo) -0 -bf (foo symlink symlink.~1~ -> foo) -0 -bdf (foo symlink symlink.~1~ -> foo) -1 -l [cp: cannot create hard link 'symlink' to 'foo'] (foo symlink -> foo) -0 -dl (foo symlink -> foo) -0 -fl (foo symlink) -0 -dfl (foo symlink) -0 -bl (foo symlink symlink.~1~ -> foo) -0 -bdl (foo symlink symlink.~1~ -> foo) -0 -bfl (foo symlink symlink.~1~ -> foo) -0 -bdfl (foo symlink symlink.~1~ -> foo) - -1 [cp: 'symlink' and 'foo' are the same file] (foo symlink -> foo) -1 -d [cp: 'symlink' and 'foo' are the same file] (foo symlink -> foo) -1 -f [cp: 'symlink' and 'foo' are the same file] (foo symlink -> foo) -1 -df [cp: 'symlink' and 'foo' are the same file] (foo symlink -> foo) -1 --rem [cp: 'symlink' and 'foo' are the same file] (foo symlink -> foo) -1 -b [cp: 'symlink' and 'foo' are the same file] (foo symlink -> foo) -0 -bd (foo -> foo foo.~1~ symlink -> foo) symlink-loop symlink-loop -1 -bf [cp: 'symlink' and 'foo' are the same file] (foo symlink -> foo) -0 -bdf (foo -> foo foo.~1~ symlink -> foo) symlink-loop symlink-loop -0 -l (foo symlink -> foo) -0 -dl (foo symlink -> foo) -0 -fl (foo symlink -> foo) -0 -bl (foo symlink -> foo) -0 -bfl (foo symlink -> foo) - -1 [cp: 'foo' and 'foo' are the same file] (foo) -1 -d [cp: 'foo' and 'foo' are the same file] (foo) -1 -f [cp: 'foo' and 'foo' are the same file] (foo) -1 -df [cp: 'foo' and 'foo' are the same file] (foo) -1 --rem [cp: 'foo' and 'foo' are the same file] (foo) -1 -b [cp: 'foo' and 'foo' are the same file] (foo) -1 -bd [cp: 'foo' and 'foo' are the same file] (foo) -0 -bf (foo foo.~1~) -0 -bdf (foo foo.~1~) -0 -l (foo) -0 -dl (foo) -0 -fl (foo) -0 -dfl (foo) -0 -bl (foo) -0 -bdl (foo) -0 -bfl (foo foo.~1~) -0 -bdfl (foo foo.~1~) - -1 [cp: 'sl1' and 'sl2' are the same file] (foo sl1 -> foo sl2 -> foo) -0 -d (foo sl1 -> foo sl2 -> foo) -1 -f [cp: 'sl1' and 'sl2' are the same file] (foo sl1 -> foo sl2 -> foo) -0 -df (foo sl1 -> foo sl2 -> foo) -0 --rem (foo sl1 -> foo sl2) -0 -b (foo sl1 -> foo sl2 sl2.~1~ -> foo) -0 -bd (foo sl1 -> foo sl2 -> foo sl2.~1~ -> foo) -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) - -1 [cp: 'foo' and 'hardlink' are the same file] (foo hardlink) -1 -d [cp: 'foo' and 'hardlink' are the same file] (foo hardlink) -1 -f [cp: 'foo' and 'hardlink' are the same file] (foo hardlink) -1 -df [cp: 'foo' and 'hardlink' are the same file] (foo hardlink) -0 --rem (foo hardlink) -0 -b (foo hardlink hardlink.~1~) -0 -bd (foo hardlink hardlink.~1~) -0 -bf (foo hardlink hardlink.~1~) -0 -bdf (foo hardlink hardlink.~1~) -0 -l (foo hardlink) -0 -dl (foo hardlink) -0 -fl (foo hardlink) -0 -dfl (foo hardlink) -0 -bl (foo hardlink) -0 -bdl (foo hardlink) -0 -bfl (foo hardlink) -0 -bdfl (foo hardlink) - -EOF - -exec 1>&3 3>&- - -compare expected actual 1>&2 || fail=1 - -Exit $fail diff --git a/tests/cp/same-file.sh b/tests/cp/same-file.sh new file mode 100755 index 00000000..003a62ba --- /dev/null +++ b/tests/cp/same-file.sh @@ -0,0 +1,220 @@ +#!/bin/sh +# 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. + +# This 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 + +# Unset CDPATH. Otherwise, output from the 'cd dir' command +# can make this test fail. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +VERSION_CONTROL=numbered; export VERSION_CONTROL + +# Determine whether a hard link to a symlink points to the symlink +# itself or to its referent. For example, the link from FreeBSD6.1 +# does dereference a symlink, but the one from Linux does not. +ln -s no-such dangling-slink +ln dangling-slink hard-link > /dev/null 2>&1 \ + && hard_link_to_symlink_does_the_deref=no \ + || hard_link_to_symlink_does_the_deref=yes +rm -f no-such dangling-slink hard-link + +test $hard_link_to_symlink_does_the_deref = yes \ + && remove_these_sed='/^0 -[bf]*l .*sl1 ->/d' \ + || remove_these_sed='/^ELIDE NO TEST OUTPUT/d' + +exec 3>&1 1> actual + +# FIXME: This should be bigger: like more than 8k +contents=XYZ + +for args in 'foo symlink' 'symlink foo' 'foo foo' 'sl1 sl2' 'foo hardlink'; do + for options in '' -d -f -df --rem -b -bd -bf -bdf \ + -l -dl -fl -dfl -bl -bdl -bfl -bdfl; do + case $args$options in + # These tests are not portable. + # They all involve making a hard link to a symbolic link. + # In the past, we've skipped the tests that are not portable, + # by doing "continue" here and eliminating the corresponding + # expected output lines below. Don't do that anymore. + 'symlink foo'-dfl) + continue;; + 'symlink foo'-bdl) + continue;; + 'symlink foo'-bdfl) + continue;; + 'sl1 sl2'-dfl) + continue;; + 'sl1 sl2'-bd*l) + continue;; + 'sl1 sl2'-dl) + continue;; + esac + + # cont'd Instead, skip them only on systems for which link does + # dereference a symlink. Detect and skip such tests here. + case $hard_link_to_symlink_does_the_deref:$args:$options in + 'yes:sl1 sl2:-fl') + continue ;; + 'yes:sl1 sl2:-bl') + continue ;; + 'yes:sl1 sl2:-bfl') + continue ;; + esac + + rm -rf dir + mkdir dir + cd dir + echo $contents > foo + case "$args" in *symlink*) ln -s foo symlink ;; esac + case "$args" in *hardlink*) ln foo hardlink ;; esac + case "$args" in *sl1*) ln -s foo sl1;; esac + case "$args" in *sl2*) ln -s foo sl2;; esac + ( + ( + # echo 1>&2 cp $options $args + cp $options $args 2>_err + echo $? $options + + # Normalize the program name and diagnostics in the error output, + # and put brackets around the output. + if test -s _err; then + sed ' + s/^[^:]*:\([^:]*\).*/cp:\1/ + 1s/^/[/ + $s/$/]/ + ' _err + fi + # Strip off all but the file names. + ls=$(ls -gG --ignore=_err . \ + | sed \ + -e '/^total /d' \ + -e 's/^[^ ]* *[^ ]* *[^ ]* *[^ ]* *[^ ]* *[^ ]* *//') + echo "($ls)" + # Make sure the original is unchanged and that + # the destination is a copy. + for f in $args; do + if test -f $f; then + case "$(cat $f)" in + "$contents") ;; + *) echo cp FAILED;; + esac + else + echo symlink-loop + fi + done + ) | tr '\n' ' ' + echo + ) | sed 's/ *$//' + cd .. + done + echo +done + +cat <<\EOF | sed "$remove_these_sed" > expected +1 [cp: 'foo' and 'symlink' are the same file] (foo symlink -> foo) +1 -d [cp: 'foo' and 'symlink' are the same file] (foo symlink -> foo) +1 -f [cp: 'foo' and 'symlink' are the same file] (foo symlink -> foo) +1 -df [cp: 'foo' and 'symlink' are the same file] (foo symlink -> foo) +0 --rem (foo symlink) +0 -b (foo symlink symlink.~1~ -> foo) +0 -bd (foo symlink symlink.~1~ -> foo) +0 -bf (foo symlink symlink.~1~ -> foo) +0 -bdf (foo symlink symlink.~1~ -> foo) +1 -l [cp: cannot create hard link 'symlink' to 'foo'] (foo symlink -> foo) +0 -dl (foo symlink -> foo) +0 -fl (foo symlink) +0 -dfl (foo symlink) +0 -bl (foo symlink symlink.~1~ -> foo) +0 -bdl (foo symlink symlink.~1~ -> foo) +0 -bfl (foo symlink symlink.~1~ -> foo) +0 -bdfl (foo symlink symlink.~1~ -> foo) + +1 [cp: 'symlink' and 'foo' are the same file] (foo symlink -> foo) +1 -d [cp: 'symlink' and 'foo' are the same file] (foo symlink -> foo) +1 -f [cp: 'symlink' and 'foo' are the same file] (foo symlink -> foo) +1 -df [cp: 'symlink' and 'foo' are the same file] (foo symlink -> foo) +1 --rem [cp: 'symlink' and 'foo' are the same file] (foo symlink -> foo) +1 -b [cp: 'symlink' and 'foo' are the same file] (foo symlink -> foo) +0 -bd (foo -> foo foo.~1~ symlink -> foo) symlink-loop symlink-loop +1 -bf [cp: 'symlink' and 'foo' are the same file] (foo symlink -> foo) +0 -bdf (foo -> foo foo.~1~ symlink -> foo) symlink-loop symlink-loop +0 -l (foo symlink -> foo) +0 -dl (foo symlink -> foo) +0 -fl (foo symlink -> foo) +0 -bl (foo symlink -> foo) +0 -bfl (foo symlink -> foo) + +1 [cp: 'foo' and 'foo' are the same file] (foo) +1 -d [cp: 'foo' and 'foo' are the same file] (foo) +1 -f [cp: 'foo' and 'foo' are the same file] (foo) +1 -df [cp: 'foo' and 'foo' are the same file] (foo) +1 --rem [cp: 'foo' and 'foo' are the same file] (foo) +1 -b [cp: 'foo' and 'foo' are the same file] (foo) +1 -bd [cp: 'foo' and 'foo' are the same file] (foo) +0 -bf (foo foo.~1~) +0 -bdf (foo foo.~1~) +0 -l (foo) +0 -dl (foo) +0 -fl (foo) +0 -dfl (foo) +0 -bl (foo) +0 -bdl (foo) +0 -bfl (foo foo.~1~) +0 -bdfl (foo foo.~1~) + +1 [cp: 'sl1' and 'sl2' are the same file] (foo sl1 -> foo sl2 -> foo) +0 -d (foo sl1 -> foo sl2 -> foo) +1 -f [cp: 'sl1' and 'sl2' are the same file] (foo sl1 -> foo sl2 -> foo) +0 -df (foo sl1 -> foo sl2 -> foo) +0 --rem (foo sl1 -> foo sl2) +0 -b (foo sl1 -> foo sl2 sl2.~1~ -> foo) +0 -bd (foo sl1 -> foo sl2 -> foo sl2.~1~ -> foo) +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) + +1 [cp: 'foo' and 'hardlink' are the same file] (foo hardlink) +1 -d [cp: 'foo' and 'hardlink' are the same file] (foo hardlink) +1 -f [cp: 'foo' and 'hardlink' are the same file] (foo hardlink) +1 -df [cp: 'foo' and 'hardlink' are the same file] (foo hardlink) +0 --rem (foo hardlink) +0 -b (foo hardlink hardlink.~1~) +0 -bd (foo hardlink hardlink.~1~) +0 -bf (foo hardlink hardlink.~1~) +0 -bdf (foo hardlink hardlink.~1~) +0 -l (foo hardlink) +0 -dl (foo hardlink) +0 -fl (foo hardlink) +0 -dfl (foo hardlink) +0 -bl (foo hardlink) +0 -bdl (foo hardlink) +0 -bfl (foo hardlink) +0 -bdfl (foo hardlink) + +EOF + +exec 1>&3 3>&- + +compare expected actual 1>&2 || fail=1 + +Exit $fail diff --git a/tests/cp/slink-2-slink b/tests/cp/slink-2-slink deleted file mode 100755 index bf323873..00000000 --- a/tests/cp/slink-2-slink +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# 'test cp --update A B' where A and B are both symlinks that point -# to the same file - -# Copyright (C) 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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp - -touch file || framework_failure_ -ln -s file a || framework_failure_ -ln -s file b || framework_failure_ -ln -s no-such-file c || framework_failure_ -ln -s no-such-file d || framework_failure_ - -cp --update --no-dereference a b || fail=1 -cp --update --no-dereference c d || fail=1 - -Exit $fail diff --git a/tests/cp/slink-2-slink.sh b/tests/cp/slink-2-slink.sh new file mode 100755 index 00000000..cf469160 --- /dev/null +++ b/tests/cp/slink-2-slink.sh @@ -0,0 +1,32 @@ +#!/bin/sh +# '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. + +# This 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 + +touch file || framework_failure_ +ln -s file a || framework_failure_ +ln -s file b || framework_failure_ +ln -s no-such-file c || framework_failure_ +ln -s no-such-file d || framework_failure_ + +cp --update --no-dereference a b || fail=1 +cp --update --no-dereference c d || fail=1 + +Exit $fail diff --git a/tests/cp/sparse b/tests/cp/sparse deleted file mode 100755 index a5520287..00000000 --- a/tests/cp/sparse +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -# Test cp --sparse=always - -# Copyright (C) 2006-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp -require_sparse_support_ - -# Create a sparse file. -# It has to be at least 128K in order to be sparse on some systems. -# Make its size one larger than 128K, in order to tickle the -# bug in coreutils-6.0. -size=$(expr 128 \* 1024 + 1) -dd bs=1 seek=$size of=sparse < /dev/null 2> /dev/null || framework_failure_ - - -cp --sparse=always sparse copy || fail=1 - -# Ensure that the copy has the same block count as the original. -test $(stat --printf %b copy) -le $(stat --printf %b sparse) || fail=1 - -# Ensure that --sparse={always,never} with --reflink fail. -cp --sparse=always --reflink sparse copy && fail=1 -cp --sparse=never --reflink sparse copy && fail=1 - -Exit $fail diff --git a/tests/cp/sparse-fiemap b/tests/cp/sparse-fiemap deleted file mode 100755 index 61e807c0..00000000 --- a/tests/cp/sparse-fiemap +++ /dev/null @@ -1,116 +0,0 @@ -#!/bin/sh -# Test cp --sparse=always through fiemap copy - -# Copyright (C) 2010-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp -require_perl_ - -# The test was seen to fail on ext3 so exclude that type -# (or any file system where the type can't be determined) -touch fiemap_chk -if fiemap_capable_ fiemap_chk && ! df -t ext3 . >/dev/null; then - : # Current partition has working extents. Good! -else - # FIXME: temporarily(?) skip this variant, at least until after this bug - # is fixed: http://thread.gmane.org/gmane.comp.file-systems.ext4/24495 - skip_ "current file system has insufficient FIEMAP support" - - # It's not; we need to create one, hence we need root access. - require_root_ - - cwd=$PWD - cleanup_() { cd /; umount "$cwd/mnt"; } - - skip=0 - # Create an ext4 loopback file system - dd if=/dev/zero of=blob bs=32k count=1000 || skip=1 - mkdir mnt - mkfs -t ext4 -F blob || - skip_ "failed to create ext4 file system" - mount -oloop blob mnt || skip=1 - cd mnt || skip=1 - echo test > f || skip=1 - test -s f || skip=1 - - test $skip = 1 && - skip_ "insufficient mount/ext4 support" -fi - -# ================================================= -# Ensure that we exercise the FIEMAP-copying code enough -# to provoke at least two iterations of the do...while loop -# in which it calls ioctl (fd, FS_IOC_FIEMAP,... -# This also verifies that non-trivial extents are preserved. - -# Extract logical block number and length pairs from filefrag -v output. -# The initial sed is to remove the "eof" from the normally-empty "flags" field. -# Similarly, remove flags values like "unknown,delalloc,eof". -# That is required when that final extent has no number in the "expected" field. -f() -{ - sed 's/ [a-z,][a-z,]*$//' $@ \ - | awk '/^ *[0-9]/ {printf "%d %d ", $2, (NF<5 ? $NF : $5) } END {print ""}' -} - -for i in $(seq 1 2 21); do - for j in 1 2 31 100; do - $PERL -e '$n = '$i' * 1024; *F = *STDOUT;' \ - -e 'for (1..'$j') { sysseek (*F, $n, 1)' \ - -e '&& syswrite (*F, chr($_)x$n) or die "$!"}' > j1 || fail=1 - - # Note there is an implicit sync performed by cp on Linux kernels - # before 2.6.39 to work around bugs in EXT4 and BTRFS. - # Note also the -s parameter to the filefrag commands below - # for the same reasons. - cp --sparse=always j1 j2 || fail=1 - - cmp j1 j2 || fail_ "data loss i=$i j=$j" - if ! filefrag -vs j1 | grep -F extent >/dev/null; then - test $skip != 1 && warn_ 'skipping part; you lack filefrag' - skip=1 - else - # Here is sample filefrag output: - # $ perl -e 'BEGIN{$n=16*1024; *F=*STDOUT}' \ - # -e 'for (1..5) { sysseek(*F,$n,1)' \ - # -e '&& syswrite *F,"."x$n or die "$!"}' > j - # $ filefrag -v j - # File system type is: ef53 - # File size of j is 163840 (40 blocks, blocksize 4096) - # ext logical physical expected length flags - # 0 4 6258884 4 - # 1 12 6258892 6258887 4 - # 2 20 6258900 6258895 4 - # 3 28 6258908 6258903 4 - # 4 36 6258916 6258911 4 eof - # j: 6 extents found - - # exclude the physical block numbers; they always differ - filefrag -v j1 > ff1 || framework_failure_ - filefrag -vs j2 > ff2 || framework_failure_ - { f ff1; f ff2; } | $PERL $abs_top_srcdir/tests/filefrag-extent-compare \ - || { - warn_ ignoring filefrag-reported extent map differences - # Show the differing extent maps. - head -n99 ff1 ff2 - } - fi - test $fail = 1 && break 2 - done -done - -Exit $fail diff --git a/tests/cp/sparse-fiemap.sh b/tests/cp/sparse-fiemap.sh new file mode 100755 index 00000000..47ddf294 --- /dev/null +++ b/tests/cp/sparse-fiemap.sh @@ -0,0 +1,116 @@ +#!/bin/sh +# Test cp --sparse=always through fiemap copy + +# Copyright (C) 2010-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp +require_perl_ + +# The test was seen to fail on ext3 so exclude that type +# (or any file system where the type can't be determined) +touch fiemap_chk +if fiemap_capable_ fiemap_chk && ! df -t ext3 . >/dev/null; then + : # Current partition has working extents. Good! +else + # FIXME: temporarily(?) skip this variant, at least until after this bug + # is fixed: http://thread.gmane.org/gmane.comp.file-systems.ext4/24495 + skip_ "current file system has insufficient FIEMAP support" + + # It's not; we need to create one, hence we need root access. + require_root_ + + cwd=$PWD + cleanup_() { cd /; umount "$cwd/mnt"; } + + skip=0 + # Create an ext4 loopback file system + dd if=/dev/zero of=blob bs=32k count=1000 || skip=1 + mkdir mnt + mkfs -t ext4 -F blob || + skip_ "failed to create ext4 file system" + mount -oloop blob mnt || skip=1 + cd mnt || skip=1 + echo test > f || skip=1 + test -s f || skip=1 + + test $skip = 1 && + skip_ "insufficient mount/ext4 support" +fi + +# ================================================= +# Ensure that we exercise the FIEMAP-copying code enough +# to provoke at least two iterations of the do...while loop +# in which it calls ioctl (fd, FS_IOC_FIEMAP,... +# This also verifies that non-trivial extents are preserved. + +# Extract logical block number and length pairs from filefrag -v output. +# The initial sed is to remove the "eof" from the normally-empty "flags" field. +# Similarly, remove flags values like "unknown,delalloc,eof". +# That is required when that final extent has no number in the "expected" field. +f() +{ + sed 's/ [a-z,][a-z,]*$//' $@ \ + | $AWK '/^ *[0-9]/ {printf "%d %d ", $2, (NF<5 ? $NF : $5) } END {print ""}' +} + +for i in $(seq 1 2 21); do + for j in 1 2 31 100; do + $PERL -e '$n = '$i' * 1024; *F = *STDOUT;' \ + -e 'for (1..'$j') { sysseek (*F, $n, 1)' \ + -e '&& syswrite (*F, chr($_)x$n) or die "$!"}' > j1 || fail=1 + + # Note there is an implicit sync performed by cp on Linux kernels + # before 2.6.39 to work around bugs in EXT4 and BTRFS. + # Note also the -s parameter to the filefrag commands below + # for the same reasons. + cp --sparse=always j1 j2 || fail=1 + + cmp j1 j2 || fail_ "data loss i=$i j=$j" + if ! filefrag -vs j1 | grep -F extent >/dev/null; then + test $skip != 1 && warn_ 'skipping part; you lack filefrag' + skip=1 + else + # Here is sample filefrag output: + # $ perl -e 'BEGIN{$n=16*1024; *F=*STDOUT}' \ + # -e 'for (1..5) { sysseek(*F,$n,1)' \ + # -e '&& syswrite *F,"."x$n or die "$!"}' > j + # $ filefrag -v j + # File system type is: ef53 + # File size of j is 163840 (40 blocks, blocksize 4096) + # ext logical physical expected length flags + # 0 4 6258884 4 + # 1 12 6258892 6258887 4 + # 2 20 6258900 6258895 4 + # 3 28 6258908 6258903 4 + # 4 36 6258916 6258911 4 eof + # j: 6 extents found + + # exclude the physical block numbers; they always differ + filefrag -v j1 > ff1 || framework_failure_ + filefrag -vs j2 > ff2 || framework_failure_ + { f ff1; f ff2; } | $PERL $abs_srcdir/tests/filefrag-extent-compare \ + || { + warn_ ignoring filefrag-reported extent map differences + # Show the differing extent maps. + head -n99 ff1 ff2 + } + fi + test $fail = 1 && break 2 + done +done + +Exit $fail diff --git a/tests/cp/sparse-to-pipe b/tests/cp/sparse-to-pipe deleted file mode 100755 index 0cfda8d5..00000000 --- a/tests/cp/sparse-to-pipe +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# copy a sparse file to a pipe, to exercise some seldom-used parts of copy.c - -# Copyright (C) 2011-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp - -require_sparse_support_ - -mkfifo_or_skip_ pipe -timeout 10 cat pipe > copy & - -truncate -s1M sparse || framework_failure_ -cp sparse pipe || fail=1 - -# Ensure that the cat has completed before comparing. -wait - -cmp sparse copy || fail=1 - -Exit $fail diff --git a/tests/cp/sparse-to-pipe.sh b/tests/cp/sparse-to-pipe.sh new file mode 100755 index 00000000..f8c1d1e8 --- /dev/null +++ b/tests/cp/sparse-to-pipe.sh @@ -0,0 +1,35 @@ +#!/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. + +# This 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_sparse_support_ + +mkfifo_or_skip_ pipe +timeout 10 cat pipe > copy & + +truncate -s1M sparse || framework_failure_ +cp sparse pipe || fail=1 + +# Ensure that the cat has completed before comparing. +wait + +cmp sparse copy || fail=1 + +Exit $fail diff --git a/tests/cp/sparse.sh b/tests/cp/sparse.sh new file mode 100755 index 00000000..ed288ad8 --- /dev/null +++ b/tests/cp/sparse.sh @@ -0,0 +1,40 @@ +#!/bin/sh +# Test cp --sparse=always + +# Copyright (C) 2006-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp +require_sparse_support_ + +# Create a sparse file. +# It has to be at least 128K in order to be sparse on some systems. +# Make its size one larger than 128K, in order to tickle the +# bug in coreutils-6.0. +size=$(expr 128 \* 1024 + 1) +dd bs=1 seek=$size of=sparse < /dev/null 2> /dev/null || framework_failure_ + + +cp --sparse=always sparse copy || fail=1 + +# Ensure that the copy has the same block count as the original. +test $(stat --printf %b copy) -le $(stat --printf %b sparse) || fail=1 + +# Ensure that --sparse={always,never} with --reflink fail. +cp --sparse=always --reflink sparse copy && fail=1 +cp --sparse=never --reflink sparse copy && fail=1 + +Exit $fail diff --git a/tests/cp/special-bits b/tests/cp/special-bits deleted file mode 100755 index 4a00891d..00000000 --- a/tests/cp/special-bits +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh -# make sure 'cp -p' preserves special bits -# This works only when run as root. - -# Copyright (C) 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 -# 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 test would fail due to a bug introduced in 4.0y. -# The bug was fixed in 4.0z. - -. "${srcdir=.}/init.sh"; path_prepend_ ../src -print_ver_ cp -require_root_ - -touch a b c || framework_failure_ -chmod u+sx,go= a || framework_failure_ -chmod u=rwx,g=sx,o= b || framework_failure_ -chmod a=r,ug+sx c || framework_failure_ -chown $NON_ROOT_USERNAME . || framework_failure_ -chmod u=rwx,g=rx,o=rx . || framework_failure_ - - -cp -p a a2 || fail=1 -set _ $(ls -l a); shift; p1=$1 -set _ $(ls -l a2); shift; p2=$1 -test $p1 = $p2 || fail=1 - -cp -p b b2 || fail=1 -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 -set _ $(ls -l c); shift; p1=$1 -set _ $(ls -l c2); shift; p2=$1 -test $p1 = $p2 && fail=1 - -Exit $fail diff --git a/tests/cp/special-bits.sh b/tests/cp/special-bits.sh new file mode 100755 index 00000000..c8fb3dc1 --- /dev/null +++ b/tests/cp/special-bits.sh @@ -0,0 +1,50 @@ +#!/bin/sh +# make sure 'cp -p' preserves special bits +# This works only when run as root. + +# Copyright (C) 2000-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/>. + +# This test would fail due to a bug introduced in 4.0y. +# The bug was fixed in 4.0z. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp +require_root_ + +touch a b c || framework_failure_ +chmod u+sx,go= a || framework_failure_ +chmod u=rwx,g=sx,o= b || framework_failure_ +chmod a=r,ug+sx c || framework_failure_ +chown $NON_ROOT_USERNAME . || framework_failure_ +chmod u=rwx,g=rx,o=rx . || framework_failure_ + + +cp -p a a2 || fail=1 +set _ $(ls -l a); shift; p1=$1 +set _ $(ls -l a2); shift; p2=$1 +test $p1 = $p2 || fail=1 + +cp -p b b2 || fail=1 +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 +set _ $(ls -l c); shift; p1=$1 +set _ $(ls -l c2); shift; p2=$1 +test $p1 = $p2 && fail=1 + +Exit $fail diff --git a/tests/cp/special-f b/tests/cp/special-f deleted file mode 100755 index a47655ef..00000000 --- a/tests/cp/special-f +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# Ensure that "cp -Rf fifo E" unlinks E and retries. -# Up until coreutils-6.10.171, it would not. - -# Copyright (C) 2008-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp - -mkfifo_or_skip_ fifo - -touch e || framework-failure - - -# Without -f, expect it to fail. -cp -R fifo e || fail=1 - -# With -f, it must succeed. -cp -Rf fifo e || fail=1 -test -p fifo || fail=1 - -Exit $fail diff --git a/tests/cp/special-f.sh b/tests/cp/special-f.sh new file mode 100755 index 00000000..c416e126 --- /dev/null +++ b/tests/cp/special-f.sh @@ -0,0 +1,35 @@ +#!/bin/sh +# 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. + +# This 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 + +mkfifo_or_skip_ fifo + +touch e || framework-failure + + +# Without -f, expect it to fail. +cp -R fifo e || fail=1 + +# With -f, it must succeed. +cp -Rf fifo e || fail=1 +test -p fifo || fail=1 + +Exit $fail diff --git a/tests/cp/src-base-dot b/tests/cp/src-base-dot deleted file mode 100755 index 14438d09..00000000 --- a/tests/cp/src-base-dot +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# Ensure that "mkdir x y; cd y; cp -ab ../x/. ." is a successful, silent, no-op. - -# Copyright (C) 2006-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp - -mkdir x y || framework_failure_ - - -cd y -cp --verbose -ab ../x/. . > out 2>&1 || fail=1 -cat <<\EOF > exp || fail=1 -EOF - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/cp/src-base-dot.sh b/tests/cp/src-base-dot.sh new file mode 100755 index 00000000..3dbfa052 --- /dev/null +++ b/tests/cp/src-base-dot.sh @@ -0,0 +1,32 @@ +#!/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. + +# This 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 + +mkdir x y || framework_failure_ + + +cd y +cp --verbose -ab ../x/. . > out 2>&1 || fail=1 +cat <<\EOF > exp || fail=1 +EOF + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/cp/symlink-slash b/tests/cp/symlink-slash deleted file mode 100755 index 95c9cfa0..00000000 --- a/tests/cp/symlink-slash +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# Make sure that cp -dR dereferences a symlink arg if its name is -# written with a trailing slash. - -# Copyright (C) 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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp - -mkdir dir || framework_failure_ -ln -s dir symlink || framework_failure_ - -cp -dR symlink/ s || fail=1 -set $(ls -l s) - -# Prior to fileutils-4.0q, the following would have output ...'s -> dir' -# because the trailing slash was removed unconditionally (now you have to -# use the new --strip-trailing-slash option) causing cp to reproduce the -# symlink. Now, the trailing slash is interpreted by the stat library -# call and so cp ends up dereferencing the symlink and copying the directory. -test "$*" = 'total 0' && : || fail=1 - -Exit $fail diff --git a/tests/cp/symlink-slash.sh b/tests/cp/symlink-slash.sh new file mode 100755 index 00000000..85acb69c --- /dev/null +++ b/tests/cp/symlink-slash.sh @@ -0,0 +1,36 @@ +#!/bin/sh +# 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. + +# This 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 + +mkdir dir || framework_failure_ +ln -s dir symlink || framework_failure_ + +cp -dR symlink/ s || fail=1 +set $(ls -l s) + +# Prior to fileutils-4.0q, the following would have output ...'s -> dir' +# because the trailing slash was removed unconditionally (now you have to +# use the new --strip-trailing-slash option) causing cp to reproduce the +# symlink. Now, the trailing slash is interpreted by the stat library +# call and so cp ends up dereferencing the symlink and copying the directory. +test "$*" = 'total 0' && : || fail=1 + +Exit $fail diff --git a/tests/cp/thru-dangling b/tests/cp/thru-dangling deleted file mode 100755 index f8527af8..00000000 --- a/tests/cp/thru-dangling +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh -# Ensure that cp works as documented, when the destination is a dangling symlink - -# Copyright (C) 2007-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp - -ln -s no-such dangle || framework_failure_ -echo hi > f || framework_failure_ -echo hi > exp || framework_failure_ -echo "cp: not writing through dangling symlink 'dangle'" \ - > exp-err || framework_failure_ - - -# Starting with 6.9.90, this usage fails, by default: -cp f dangle > err 2>&1 && fail=1 - -compare exp-err err || fail=1 -test -f no-such && fail=1 - -# But you can set POSIXLY_CORRECT to get the historical behavior. -env POSIXLY_CORRECT=1 cp f dangle > out 2>&1 || fail=1 -cat no-such >> out || fail=1 - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/cp/thru-dangling.sh b/tests/cp/thru-dangling.sh new file mode 100755 index 00000000..383bf41f --- /dev/null +++ b/tests/cp/thru-dangling.sh @@ -0,0 +1,41 @@ +#!/bin/sh +# Ensure that cp works as documented, when the destination is a dangling symlink + +# Copyright (C) 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp + +ln -s no-such dangle || framework_failure_ +echo hi > f || framework_failure_ +echo hi > exp || framework_failure_ +echo "cp: not writing through dangling symlink 'dangle'" \ + > exp-err || framework_failure_ + + +# Starting with 6.9.90, this usage fails, by default: +cp f dangle > err 2>&1 && fail=1 + +compare exp-err err || fail=1 +test -f no-such && fail=1 + +# But you can set POSIXLY_CORRECT to get the historical behavior. +env POSIXLY_CORRECT=1 cp f dangle > out 2>&1 || fail=1 +cat no-such >> out || fail=1 + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/dd/bytes b/tests/dd/bytes deleted file mode 100755 index 2d40f064..00000000 --- a/tests/dd/bytes +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh - -# Copyright (C) 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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ dd - -# count_bytes -echo 0123456789abcdefghijklm > in || framework_failure_ -dd count=14 conv=swab iflag=count_bytes < in > out 2> /dev/null || fail=1 -case $(cat out) in - 1032547698badc) ;; - *) fail=1 ;; -esac - -# skip_bytes -echo 0123456789abcdefghijklm > in || framework_failure_ -dd skip=10 iflag=skip_bytes < in > out 2> /dev/null || fail=1 -case $(cat out) in - abcdefghijklm) ;; - *) fail=1 ;; -esac - -# skip records and bytes from pipe -echo 0123456789abcdefghijklm | - dd skip=10 bs=2 iflag=skip_bytes > out 2> /dev/null || fail=1 -case $(cat out) in - abcdefghijklm) ;; - *) fail=1 ;; -esac - -# seek bytes -echo abcdefghijklm | - dd bs=5 seek=8 oflag=seek_bytes > out 2> /dev/null || fail=1 -printf '\0\0\0\0\0\0\0\0abcdefghijklm\n' > expected -compare expected out || fail=1 - -# Just truncation, no I/O -dd bs=5 seek=8 oflag=seek_bytes of=out2 count=0 2> /dev/null || fail=1 -truncate -s8 expected2 -compare expected2 out2 || fail=1 - -Exit $fail diff --git a/tests/dd/bytes.sh b/tests/dd/bytes.sh new file mode 100755 index 00000000..a2734536 --- /dev/null +++ b/tests/dd/bytes.sh @@ -0,0 +1,56 @@ +#!/bin/sh + +# Copyright (C) 2012-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ dd + +# count_bytes +echo 0123456789abcdefghijklm > in || framework_failure_ +dd count=14 conv=swab iflag=count_bytes < in > out 2> /dev/null || fail=1 +case $(cat out) in + 1032547698badc) ;; + *) fail=1 ;; +esac + +# skip_bytes +echo 0123456789abcdefghijklm > in || framework_failure_ +dd skip=10 iflag=skip_bytes < in > out 2> /dev/null || fail=1 +case $(cat out) in + abcdefghijklm) ;; + *) fail=1 ;; +esac + +# skip records and bytes from pipe +echo 0123456789abcdefghijklm | + dd skip=10 bs=2 iflag=skip_bytes > out 2> /dev/null || fail=1 +case $(cat out) in + abcdefghijklm) ;; + *) fail=1 ;; +esac + +# seek bytes +echo abcdefghijklm | + dd bs=5 seek=8 oflag=seek_bytes > out 2> /dev/null || fail=1 +printf '\0\0\0\0\0\0\0\0abcdefghijklm\n' > expected +compare expected out || fail=1 + +# Just truncation, no I/O +dd bs=5 seek=8 oflag=seek_bytes of=out2 count=0 2> /dev/null || fail=1 +truncate -s8 expected2 +compare expected2 out2 || fail=1 + +Exit $fail diff --git a/tests/dd/direct b/tests/dd/direct deleted file mode 100755 index c231bee3..00000000 --- a/tests/dd/direct +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# ensure that dd's oflag=direct works - -# Copyright (C) 2009-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ dd - -truncate -s 8192 in || framework_failure_ -dd if=in oflag=direct of=out 2> /dev/null \ - || skip_ 'this file system lacks support for O_DIRECT' - -truncate -s 511 short || framework_failure_ -truncate -s 8191 m1 || framework_failure_ -truncate -s 8193 p1 || framework_failure_ - -for i in short m1 p1; do - rm -f out - dd if=$i oflag=direct of=out || fail=1 -done - -Exit $fail diff --git a/tests/dd/direct.sh b/tests/dd/direct.sh new file mode 100755 index 00000000..8870911d --- /dev/null +++ b/tests/dd/direct.sh @@ -0,0 +1,35 @@ +#!/bin/sh +# ensure that dd's oflag=direct works + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ dd + +truncate -s 8192 in || framework_failure_ +dd if=in oflag=direct of=out 2> /dev/null \ + || skip_ 'this file system lacks support for O_DIRECT' + +truncate -s 511 short || framework_failure_ +truncate -s 8191 m1 || framework_failure_ +truncate -s 8193 p1 || framework_failure_ + +for i in short m1 p1; do + rm -f out + dd if=$i oflag=direct of=out || fail=1 +done + +Exit $fail diff --git a/tests/dd/misc b/tests/dd/misc deleted file mode 100755 index 52a5b208..00000000 --- a/tests/dd/misc +++ /dev/null @@ -1,98 +0,0 @@ -#!/bin/sh -# Ensure dd treats '--' properly. -# Also test some flag values. - -# Copyright (C) 1999-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ dd - -tmp_in=dd-in -tmp_in2=dd-in2 -tmp_sym=dd-sym -tmp_out=dd-out - -warn=0 -echo data > $tmp_in || framework_failure_ -ln $tmp_in $tmp_in2 || framework_failure_ -ln -s $tmp_in $tmp_sym || framework_failure_ - -dd if=$tmp_in of=$tmp_out 2> /dev/null || fail=1 -compare $tmp_in $tmp_out || fail=1 - -rm $tmp_out -dd -- if=$tmp_in of=$tmp_out 2> /dev/null || fail=1 -compare $tmp_in $tmp_out || fail=1 - -if dd oflag=append if=$tmp_in of=$tmp_out 2> /dev/null; then - compare $tmp_in $tmp_out || fail=1 -fi - -case $(cat /dev/stdin <$tmp_in 2>/dev/null) in -(data) - rm -f $tmp_out - dd if=/dev/stdin of=$tmp_out <$tmp_in || fail=1 - compare $tmp_in $tmp_out || fail=1 -esac - -if dd iflag=nofollow if=$tmp_in count=0 2> /dev/null; then - dd iflag=nofollow if=$tmp_sym count=0 2> /dev/null && fail=1 -fi - -if dd iflag=directory if=. count=0 2> /dev/null; then - dd iflag=directory count=0 <. 2> /dev/null || fail=1 - dd iflag=directory count=0 <$tmp_in 2> /dev/null && fail=1 -fi - -old_ls=$(ls -u --full-time $tmp_in) -sleep 1 -if dd iflag=noatime if=$tmp_in of=$tmp_out 2> /dev/null; then - new_ls=$(ls -u --full-time $tmp_in) - if test "x$old_ls" != "x$new_ls"; then - cat >&2 <<EOF -================================================================= -$0: WARNING!!! -This operating system has the O_NOATIME file status flag, -but it is silently ignored in some cases. -Therefore, dd options like iflag=noatime may be silently ignored. -================================================================= -EOF - warn=77 - fi -fi - -if dd oflag=nolinks if=$tmp_in of=$tmp_out 2> /dev/null; then - dd iflag=nolinks if=$tmp_in > /dev/null 2>&1 && fail=1 - dd iflag=nolinks < $tmp_in > /dev/null 2>&1 && fail=1 - dd oflag=nolinks < $tmp_in > $tmp_out 2>&1 || fail=1 -fi - -outbytes=$(echo x | dd bs=3 ibs=10 obs=10 conv=sync 2>/dev/null | wc -c) -test "$outbytes" -eq 3 || fail=1 - -# A delay is required to trigger a failure. -# There might be some missed failures but it's unlikely. -(echo a; sleep .1; echo b) \ - | env LC_ALL=C dd bs=4 status=noxfer iflag=fullblock >out 2>err || fail=1 -printf 'a\nb\n' > out_ok || framework_failure_ -echo "1+0 records in -1+0 records out" > err_ok || framework_failure_ -compare out_ok out || fail=1 -compare err_ok err || fail=1 - -test $fail -eq 0 && fail=$warn - -Exit $fail diff --git a/tests/dd/misc.sh b/tests/dd/misc.sh new file mode 100755 index 00000000..b9ad31ab --- /dev/null +++ b/tests/dd/misc.sh @@ -0,0 +1,105 @@ +#!/bin/sh +# Ensure dd treats '--' properly. +# Also test some flag values. + +# Copyright (C) 1999-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ dd + +tmp_in=dd-in +tmp_in2=dd-in2 +tmp_sym=dd-sym +tmp_out=dd-out + +warn=0 +echo data > $tmp_in || framework_failure_ +ln $tmp_in $tmp_in2 || framework_failure_ +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 +# 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 + +dd if=$tmp_in of=$tmp_out 2> /dev/null || fail=1 +compare $tmp_in $tmp_out || fail=1 + +rm $tmp_out +dd -- if=$tmp_in of=$tmp_out 2> /dev/null || fail=1 +compare $tmp_in $tmp_out || fail=1 + +if dd oflag=append if=$tmp_in of=$tmp_out 2> /dev/null; then + compare $tmp_in $tmp_out || fail=1 +fi + +case $(cat /dev/stdin <$tmp_in 2>/dev/null) in +(data) + rm -f $tmp_out + dd if=/dev/stdin of=$tmp_out <$tmp_in || fail=1 + compare $tmp_in $tmp_out || fail=1 +esac + +if dd iflag=nofollow if=$tmp_in count=0 2> /dev/null; then + dd iflag=nofollow if=$tmp_sym count=0 2> /dev/null && fail=1 +fi + +if dd iflag=directory if=. count=0 2> /dev/null; then + dd iflag=directory count=0 <. 2> /dev/null || fail=1 + dd iflag=directory count=0 <$tmp_in 2> /dev/null && fail=1 +fi + +old_ls=$(ls -u --full-time $tmp_in) +sleep 1 +if dd iflag=noatime if=$tmp_in of=$tmp_out 2> /dev/null; then + new_ls=$(ls -u --full-time $tmp_in) + if test "x$old_ls" != "x$new_ls"; then + cat >&2 <<EOF +================================================================= +$0: WARNING!!! +This operating system has the O_NOATIME file status flag, +but it is silently ignored in some cases. +Therefore, dd options like iflag=noatime may be silently ignored. +================================================================= +EOF + warn=77 + fi +fi + +if dd oflag=nolinks if=$tmp_in of=$tmp_out 2> /dev/null; then + dd iflag=nolinks if=$tmp_in > /dev/null 2>&1 && fail=1 + dd iflag=nolinks < $tmp_in > /dev/null 2>&1 && fail=1 + dd oflag=nolinks < $tmp_in > $tmp_out 2>&1 || fail=1 +fi + +outbytes=$(echo x | dd bs=3 ibs=10 obs=10 conv=sync 2>/dev/null | wc -c) +test "$outbytes" -eq 3 || fail=1 + +# A delay is required to trigger a failure. +# There might be some missed failures but it's unlikely. +(echo a; sleep .1; echo b) \ + | env LC_ALL=C dd bs=4 status=noxfer iflag=fullblock >out 2>err || fail=1 +printf 'a\nb\n' > out_ok || framework_failure_ +echo "1+0 records in +1+0 records out" > err_ok || framework_failure_ +compare out_ok out || fail=1 +compare err_ok err || fail=1 + +test $fail -eq 0 && fail=$warn + +Exit $fail diff --git a/tests/dd/nocache b/tests/dd/nocache deleted file mode 100755 index 274bb8a0..00000000 --- a/tests/dd/nocache +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/sh -# Ensure dd handles the 'nocache' flag - -# Copyright (C) 2011-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ dd - -# This should not call posix_fadvise -dd iflag=nocache oflag=nocache if=/dev/null of=/dev/null || fail=1 - -# We should get an error for trying to process a pipe -dd count=0 | dd iflag=nocache count=0 && fail=1 - -# O_DIRECT is orthogonal to drop cache so mutually exclusive -dd iflag=nocache,direct if=/dev/null && fail=1 - -# The rest ensure that the documented uses cases -# proceed without error -for f in ifile ofile; do - dd if=/dev/zero of=$f conv=fdatasync count=100 || framework_failure_ -done - -# Advise to drop cache for whole file -if ! dd if=ifile iflag=nocache count=0 2>err; then - # We could check for 'Operation not supported' in err here, - # but that was seen to be brittle. HPUX returns ENOTTY for example. - # So assume that if this basic operation fails, it's due to lack - # of support by the system. - warn_ 'skipping part; this file system lacks support for posix_fadvise()' - skip=1 -fi - -if test "$skip" != 1; then - # Ensure drop cache for whole file - dd of=ofile oflag=nocache conv=notrunc,fdatasync count=0 || fail=1 - - # Drop cache for part of file - dd if=ifile iflag=nocache skip=10 count=10 of=/dev/null || fail=1 - - # Stream data just using readahead cache - dd if=ifile of=ofile iflag=nocache oflag=nocache || fail=1 -fi - -Exit $fail diff --git a/tests/dd/nocache.sh b/tests/dd/nocache.sh new file mode 100755 index 00000000..73774053 --- /dev/null +++ b/tests/dd/nocache.sh @@ -0,0 +1,58 @@ +#!/bin/sh +# Ensure dd handles the 'nocache' flag + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ dd + +# This should not call posix_fadvise +dd iflag=nocache oflag=nocache if=/dev/null of=/dev/null || fail=1 + +# We should get an error for trying to process a pipe +dd count=0 | dd iflag=nocache count=0 && fail=1 + +# O_DIRECT is orthogonal to drop cache so mutually exclusive +dd iflag=nocache,direct if=/dev/null && fail=1 + +# The rest ensure that the documented uses cases +# proceed without error +for f in ifile ofile; do + dd if=/dev/zero of=$f conv=fdatasync count=100 || framework_failure_ +done + +# Advise to drop cache for whole file +if ! dd if=ifile iflag=nocache count=0 2>err; then + # We could check for 'Operation not supported' in err here, + # but that was seen to be brittle. HPUX returns ENOTTY for example. + # So assume that if this basic operation fails, it's due to lack + # of support by the system. + warn_ 'skipping part; this file system lacks support for posix_fadvise()' + skip=1 +fi + +if test "$skip" != 1; then + # Ensure drop cache for whole file + dd of=ofile oflag=nocache conv=notrunc,fdatasync count=0 || fail=1 + + # Drop cache for part of file + dd if=ifile iflag=nocache skip=10 count=10 of=/dev/null || fail=1 + + # Stream data just using readahead cache + dd if=ifile of=ofile iflag=nocache oflag=nocache || fail=1 +fi + +Exit $fail diff --git a/tests/dd/not-rewound b/tests/dd/not-rewound deleted file mode 100755 index 5364f907..00000000 --- a/tests/dd/not-rewound +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# Make sure dd does the right thing when the input file descriptor -# is not rewound. - -# Copyright (C) 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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ dd - - -echo abcde > in -(dd skip=1 count=1 bs=1; dd skip=1 bs=1) < in > out 2> /dev/null || fail=1 -case $(cat out) in - bde) ;; - *) fail=1 ;; -esac - -Exit $fail diff --git a/tests/dd/not-rewound.sh b/tests/dd/not-rewound.sh new file mode 100755 index 00000000..c869eb83 --- /dev/null +++ b/tests/dd/not-rewound.sh @@ -0,0 +1,31 @@ +#!/bin/sh +# Make sure dd does the right thing when the input file descriptor +# is not rewound. + +# Copyright (C) 2000-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ dd + + +echo abcde > in +(dd skip=1 count=1 bs=1; dd skip=1 bs=1) < in > out 2> /dev/null || fail=1 +case $(cat out) in + bde) ;; + *) fail=1 ;; +esac + +Exit $fail diff --git a/tests/dd/reblock b/tests/dd/reblock deleted file mode 100755 index 92253fb1..00000000 --- a/tests/dd/reblock +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/sh -# test dd reblocking vs. bs= - -# Copyright (C) 2008-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ dd - -# 2 short reads -> 1 full write + 1 partial write -cat <<\EOF > exp-reblock || framework_failure_ -0+2 records in -1+1 records out -4 bytes (4 B) copied -EOF - -# 2 short reads -> 2 partial writes -cat <<\EOF > exp-no-reblock || framework_failure_ -0+2 records in -0+2 records out -4 bytes (4 B) copied -EOF - - -# Use a fifo rather than a pipe in the tests below -# so that the producer (printf subshell) will wait -# until the consumer (dd) opens the fifo therefore -# increasing the chance that dd will read the data -# from each printf separately. -mkfifo_or_skip_ dd.fifo - -dd_reblock_1() -{ - local delay="$1" - - # ensure that dd reblocks when bs= is not specified - dd ibs=3 obs=3 if=dd.fifo > out 2> err& - (printf 'ab'; sleep $delay; printf 'cd') > dd.fifo - wait #for dd to complete - sed 's/,.*//' err > k && mv k err - compare exp-reblock err -} - -retry_delay_ dd_reblock_1 .1 6 || fail=1 - -dd_reblock_2() -{ - local delay="$1" - - # Demonstrate that bs=N supersedes even following ibs= and obs= settings. - dd bs=3 ibs=1 obs=1 if=dd.fifo > out 2> err& - (printf 'ab'; sleep $delay; printf 'cd') > dd.fifo - wait #for dd to complete - sed 's/,.*//' err > k && mv k err - compare exp-no-reblock err -} - -retry_delay_ dd_reblock_2 .1 6 || fail=1 - -Exit $fail diff --git a/tests/dd/reblock.sh b/tests/dd/reblock.sh new file mode 100755 index 00000000..bba29f87 --- /dev/null +++ b/tests/dd/reblock.sh @@ -0,0 +1,72 @@ +#!/bin/sh +# test dd reblocking vs. bs= + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ dd + +# 2 short reads -> 1 full write + 1 partial write +cat <<\EOF > exp-reblock || framework_failure_ +0+2 records in +1+1 records out +4 bytes (4 B) copied +EOF + +# 2 short reads -> 2 partial writes +cat <<\EOF > exp-no-reblock || framework_failure_ +0+2 records in +0+2 records out +4 bytes (4 B) copied +EOF + + +# Use a fifo rather than a pipe in the tests below +# so that the producer (printf subshell) will wait +# until the consumer (dd) opens the fifo therefore +# increasing the chance that dd will read the data +# from each printf separately. +mkfifo_or_skip_ dd.fifo + +dd_reblock_1() +{ + local delay="$1" + + # ensure that dd reblocks when bs= is not specified + dd ibs=3 obs=3 if=dd.fifo > out 2> err& + (printf 'ab'; sleep $delay; printf 'cd') > dd.fifo + wait #for dd to complete + sed 's/,.*//' err > k && mv k err + compare exp-reblock err +} + +retry_delay_ dd_reblock_1 .1 6 || fail=1 + +dd_reblock_2() +{ + local delay="$1" + + # Demonstrate that bs=N supersedes even following ibs= and obs= settings. + dd bs=3 ibs=1 obs=1 if=dd.fifo > out 2> err& + (printf 'ab'; sleep $delay; printf 'cd') > dd.fifo + wait #for dd to complete + sed 's/,.*//' err > k && mv k err + compare exp-no-reblock err +} + +retry_delay_ dd_reblock_2 .1 6 || fail=1 + +Exit $fail diff --git a/tests/dd/skip-seek b/tests/dd/skip-seek deleted file mode 100755 index 33eb9b45..00000000 --- a/tests/dd/skip-seek +++ /dev/null @@ -1,78 +0,0 @@ -#!/usr/bin/perl -# Test dd's skip and seek options. - -# Copyright (C) 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 -# 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; - -(my $program_name = $0) =~ s|.*/||; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; -my $out = 'out'; - -my @Tests = - ( - [ - 'sk-seek1', - qw (bs=1 skip=1 seek=2 conv=notrunc count=3 status=noxfer of=@AUX@ < ), - {IN=> '0123456789abcdef'}, - {AUX=> 'zyxwvutsrqponmlkji'}, - {OUT=> ''}, - {ERR=> "3+0 records in\n3+0 records out\n"}, - {CMP=> ['zy123utsrqponmlkji', {'@AUX@'=> undef}]}, - ], - [ - 'sk-seek2', - qw (bs=5 skip=1 seek=1 conv=notrunc count=1 status=noxfer of=@AUX@ < ), - {IN=> '0123456789abcdef'}, - {AUX=> 'zyxwvutsrqponmlkji'}, - {OUT=> ''}, - {ERR=> "1+0 records in\n1+0 records out\n"}, - {CMP=> ['zyxwv56789ponmlkji', {'@AUX@'=> undef}]}, - ], - [ - 'sk-seek3', - qw (bs=5 skip=1 seek=1 count=1 status=noxfer of=@AUX@ < ), - {IN=> '0123456789abcdef'}, - {AUX=> 'zyxwvutsrqponmlkji'}, - {OUT=> ''}, - {ERR=> "1+0 records in\n1+0 records out\n"}, - {CMP=> ['zyxwv56789', {'@AUX@'=> undef}]}, - ], - [ - # Before fileutils-4.0.45, the last 10 bytes of output - # were these "\0\0\0\0\0\0\0\0 ". - 'block-sync-1', qw(ibs=10 cbs=10 status=noxfer), 'conv=block,sync', '<', - {IN=> "01234567\nabcdefghijkl\n"}, - {OUT=> "01234567 abcdefghij "}, - {ERR=> "2+1 records in\n0+1 records out\n1 truncated record\n"}, - ], - [ - # Before coreutils-5.93, this would output just "c\n". - 'sk-seek4', qw(bs=1 skip=1 status=noxfer), - {IN_PIPE=> "abc\n"}, - {OUT=> "bc\n"}, - {ERR=> "3+0 records in\n3+0 records out\n"}, - ], - ); - -my $save_temps = $ENV{DEBUG}; -my $verbose = $ENV{VERBOSE}; - -my $prog = 'dd'; -my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); -exit $fail; diff --git a/tests/dd/skip-seek-past-dev b/tests/dd/skip-seek-past-dev deleted file mode 100755 index f4184b1b..00000000 --- a/tests/dd/skip-seek-past-dev +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/sh -# test diagnostics are printed immediately when seeking beyond device. - -# Copyright (C) 2008-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ dd - -# need write access to local device -# (even though we don't actually write anything) -require_root_ -require_local_dir_ - -get_device_size() { - BLOCKDEV=blockdev - $BLOCKDEV -V >/dev/null 2>&1 || BLOCKDEV=/sbin/blockdev - $BLOCKDEV --getsize64 "$1" -} - - -# 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_ - -dev_size=$(get_device_size "$device") || - skip_ "failed to determine size of $device" - -# Don't use shell arithmetic as older versions of dash use longs -DEV_OFLOW=$(expr $dev_size + 1) - -timeout 10 dd bs=1 skip=$DEV_OFLOW count=0 status=noxfer < "$device" 2> err -test "$?" = "1" || fail=1 -echo "dd: 'standard input': cannot skip: Invalid argument -0+0 records in -0+0 records out" > err_ok || framework_failure_ -compare err_ok err || fail=1 - -timeout 10 dd bs=1 seek=$DEV_OFLOW count=0 status=noxfer > "$device" 2> err -test "$?" = "1" || fail=1 -echo "dd: 'standard output': cannot seek: Invalid argument -0+0 records in -0+0 records out" > err_ok || framework_failure_ -compare err_ok err || fail=1 - -Exit $fail diff --git a/tests/dd/skip-seek-past-dev.sh b/tests/dd/skip-seek-past-dev.sh new file mode 100755 index 00000000..87f6469e --- /dev/null +++ b/tests/dd/skip-seek-past-dev.sh @@ -0,0 +1,58 @@ +#!/bin/sh +# test diagnostics are printed immediately when seeking beyond device. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ dd + +# need write access to local device +# (even though we don't actually write anything) +require_root_ +require_local_dir_ + +get_device_size() { + BLOCKDEV=blockdev + $BLOCKDEV -V >/dev/null 2>&1 || BLOCKDEV=/sbin/blockdev + $BLOCKDEV --getsize64 "$1" +} + + +# 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_ + +dev_size=$(get_device_size "$device") || + skip_ "failed to determine size of $device" + +# Don't use shell arithmetic as older versions of dash use longs +DEV_OFLOW=$(expr $dev_size + 1) + +timeout 10 dd bs=1 skip=$DEV_OFLOW count=0 status=noxfer < "$device" 2> err +test "$?" = "1" || fail=1 +echo "dd: 'standard input': cannot skip: Invalid argument +0+0 records in +0+0 records out" > err_ok || framework_failure_ +compare err_ok err || fail=1 + +timeout 10 dd bs=1 seek=$DEV_OFLOW count=0 status=noxfer > "$device" 2> err +test "$?" = "1" || fail=1 +echo "dd: 'standard output': cannot seek: Invalid argument +0+0 records in +0+0 records out" > err_ok || framework_failure_ +compare err_ok err || fail=1 + +Exit $fail diff --git a/tests/dd/skip-seek-past-file b/tests/dd/skip-seek-past-file deleted file mode 100755 index 0a8e1fdc..00000000 --- a/tests/dd/skip-seek-past-file +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/sh -# test diagnostics are printed when seeking too far in seekable files. - -# Copyright (C) 2008-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ dd -require_sparse_support_ # for 'truncate --size=$OFF_T_MAX' -eval $(getlimits) # for OFF_T limits - - -printf "1234" > file || framework_failure_ - -echo "\ -dd: 'standard input': cannot skip to specified offset -0+0 records in -0+0 records out" > skip_err || framework_failure_ - -# skipping beyond number of blocks in file should issue a warning -dd bs=1 skip=5 count=0 status=noxfer < file 2> err || fail=1 -compare skip_err err || fail=1 - -# skipping beyond number of bytes in file should issue a warning -dd bs=3 skip=2 count=0 status=noxfer < file 2> err || fail=1 -compare skip_err err || fail=1 - -# skipping beyond number of blocks in pipe should issue a warning -cat file | dd bs=1 skip=5 count=0 status=noxfer 2> err || fail=1 -compare skip_err err || fail=1 - -# skipping beyond number of bytes in pipe should issue a warning -cat file | dd bs=3 skip=2 count=0 status=noxfer 2> err || fail=1 -compare skip_err err || fail=1 - -# Check seeking beyond file already offset into -# skipping beyond number of blocks in file should issue a warning -(dd bs=1 skip=1 count=0 2>/dev/null && - dd bs=1 skip=4 status=noxfer 2> err) < file || fail=1 -compare skip_err err || fail=1 - -# Check seeking beyond file already offset into -# skipping beyond number of bytes in file should issue a warning -(dd bs=1 skip=1 count=0 2>/dev/null && - dd bs=2 skip=2 status=noxfer 2> err) < file || fail=1 -compare skip_err err || fail=1 - -# seeking beyond end of file is OK -dd bs=1 seek=5 count=0 status=noxfer > file 2> err || fail=1 -echo "0+0 records in -0+0 records out" > err_ok || framework_failure_ -compare err_ok err || fail=1 - -# skipping > OFF_T_MAX should fail immediately -dd bs=1 skip=$OFF_T_OFLOW count=0 status=noxfer < file 2> err && fail=1 -# error message should be "... cannot skip: strerror(EOVERFLOW)" -grep "cannot skip:" err >/dev/null || fail=1 - -# skipping > max file size should fail immediately -if ! truncate --size=$OFF_T_MAX in 2>/dev/null; then - # truncate is to ensure file system doesn't actually support OFF_T_MAX files - dd bs=1 skip=$OFF_T_MAX count=0 status=noxfer < file 2> err \ - && lseek_ok=yes \ - || lseek_ok=no - - if test $lseek_ok = yes; then - # On Solaris 10 at least, lseek(>max file size) succeeds, - # so just check for the skip warning. - compare skip_err err || fail=1 - else - # On Linux kernels at least, lseek(>max file size) fails. - # error message should be "... cannot skip: strerror(EINVAL)" - grep "cannot skip:" err >/dev/null || fail=1 - fi -fi - -Exit $fail diff --git a/tests/dd/skip-seek-past-file.sh b/tests/dd/skip-seek-past-file.sh new file mode 100755 index 00000000..d379b753 --- /dev/null +++ b/tests/dd/skip-seek-past-file.sh @@ -0,0 +1,89 @@ +#!/bin/sh +# test diagnostics are printed when seeking too far in seekable files. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ dd +require_sparse_support_ # for 'truncate --size=$OFF_T_MAX' +eval $(getlimits) # for OFF_T limits + + +printf "1234" > file || framework_failure_ + +echo "\ +dd: 'standard input': cannot skip to specified offset +0+0 records in +0+0 records out" > skip_err || framework_failure_ + +# skipping beyond number of blocks in file should issue a warning +dd bs=1 skip=5 count=0 status=noxfer < file 2> err || fail=1 +compare skip_err err || fail=1 + +# skipping beyond number of bytes in file should issue a warning +dd bs=3 skip=2 count=0 status=noxfer < file 2> err || fail=1 +compare skip_err err || fail=1 + +# skipping beyond number of blocks in pipe should issue a warning +cat file | dd bs=1 skip=5 count=0 status=noxfer 2> err || fail=1 +compare skip_err err || fail=1 + +# skipping beyond number of bytes in pipe should issue a warning +cat file | dd bs=3 skip=2 count=0 status=noxfer 2> err || fail=1 +compare skip_err err || fail=1 + +# Check seeking beyond file already offset into +# skipping beyond number of blocks in file should issue a warning +(dd bs=1 skip=1 count=0 2>/dev/null && + dd bs=1 skip=4 status=noxfer 2> err) < file || fail=1 +compare skip_err err || fail=1 + +# Check seeking beyond file already offset into +# skipping beyond number of bytes in file should issue a warning +(dd bs=1 skip=1 count=0 2>/dev/null && + dd bs=2 skip=2 status=noxfer 2> err) < file || fail=1 +compare skip_err err || fail=1 + +# seeking beyond end of file is OK +dd bs=1 seek=5 count=0 status=noxfer > file 2> err || fail=1 +echo "0+0 records in +0+0 records out" > err_ok || framework_failure_ +compare err_ok err || fail=1 + +# skipping > OFF_T_MAX should fail immediately +dd bs=1 skip=$OFF_T_OFLOW count=0 status=noxfer < file 2> err && fail=1 +# error message should be "... cannot skip: strerror(EOVERFLOW)" +grep "cannot skip:" err >/dev/null || fail=1 + +# skipping > max file size should fail immediately +if ! truncate --size=$OFF_T_MAX in 2>/dev/null; then + # truncate is to ensure file system doesn't actually support OFF_T_MAX files + dd bs=1 skip=$OFF_T_MAX count=0 status=noxfer < file 2> err \ + && lseek_ok=yes \ + || lseek_ok=no + + if test $lseek_ok = yes; then + # On Solaris 10 at least, lseek(>max file size) succeeds, + # so just check for the skip warning. + compare skip_err err || fail=1 + else + # On Linux kernels at least, lseek(>max file size) fails. + # error message should be "... cannot skip: strerror(EINVAL)" + grep "cannot skip:" err >/dev/null || fail=1 + fi +fi + +Exit $fail diff --git a/tests/dd/skip-seek.pl b/tests/dd/skip-seek.pl new file mode 100755 index 00000000..bb574bde --- /dev/null +++ b/tests/dd/skip-seek.pl @@ -0,0 +1,78 @@ +#!/usr/bin/perl +# Test dd's skip and seek options. + +# Copyright (C) 2000-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/>. + +use strict; + +(my $program_name = $0) =~ s|.*/||; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; +my $out = 'out'; + +my @Tests = + ( + [ + 'sk-seek1', + qw (bs=1 skip=1 seek=2 conv=notrunc count=3 status=noxfer of=@AUX@ < ), + {IN=> '0123456789abcdef'}, + {AUX=> 'zyxwvutsrqponmlkji'}, + {OUT=> ''}, + {ERR=> "3+0 records in\n3+0 records out\n"}, + {CMP=> ['zy123utsrqponmlkji', {'@AUX@'=> undef}]}, + ], + [ + 'sk-seek2', + qw (bs=5 skip=1 seek=1 conv=notrunc count=1 status=noxfer of=@AUX@ < ), + {IN=> '0123456789abcdef'}, + {AUX=> 'zyxwvutsrqponmlkji'}, + {OUT=> ''}, + {ERR=> "1+0 records in\n1+0 records out\n"}, + {CMP=> ['zyxwv56789ponmlkji', {'@AUX@'=> undef}]}, + ], + [ + 'sk-seek3', + qw (bs=5 skip=1 seek=1 count=1 status=noxfer of=@AUX@ < ), + {IN=> '0123456789abcdef'}, + {AUX=> 'zyxwvutsrqponmlkji'}, + {OUT=> ''}, + {ERR=> "1+0 records in\n1+0 records out\n"}, + {CMP=> ['zyxwv56789', {'@AUX@'=> undef}]}, + ], + [ + # Before fileutils-4.0.45, the last 10 bytes of output + # were these "\0\0\0\0\0\0\0\0 ". + 'block-sync-1', qw(ibs=10 cbs=10 status=noxfer), 'conv=block,sync', '<', + {IN=> "01234567\nabcdefghijkl\n"}, + {OUT=> "01234567 abcdefghij "}, + {ERR=> "2+1 records in\n0+1 records out\n1 truncated record\n"}, + ], + [ + # Before coreutils-5.93, this would output just "c\n". + 'sk-seek4', qw(bs=1 skip=1 status=noxfer), + {IN_PIPE=> "abc\n"}, + {OUT=> "bc\n"}, + {ERR=> "3+0 records in\n3+0 records out\n"}, + ], + ); + +my $save_temps = $ENV{DEBUG}; +my $verbose = $ENV{VERBOSE}; + +my $prog = 'dd'; +my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); +exit $fail; diff --git a/tests/dd/skip-seek2 b/tests/dd/skip-seek2 deleted file mode 100755 index 7f5e0560..00000000 --- a/tests/dd/skip-seek2 +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh -# 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-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ dd - - -echo LA:3456789abcdef > in || fail=1 -(dd bs=1 skip=3 count=0 && dd bs=5) < in > out 2> /dev/null || fail=1 -case $(cat out) in - 3456789abcdef) ;; - *) fail=1 ;; -esac - -echo LA:3456789abcdef > in || fail=1 -(dd bs=1 skip=3 count=0 && dd bs=5 count=2) < in > out 2> /dev/null || fail=1 -case $(cat out) in - 3456789abc) ;; - *) fail=1 ;; -esac - -Exit $fail diff --git a/tests/dd/skip-seek2.sh b/tests/dd/skip-seek2.sh new file mode 100755 index 00000000..a85db9a9 --- /dev/null +++ b/tests/dd/skip-seek2.sh @@ -0,0 +1,38 @@ +#!/bin/sh +# 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. + +# This 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 + + +echo LA:3456789abcdef > in || fail=1 +(dd bs=1 skip=3 count=0 && dd bs=5) < in > out 2> /dev/null || fail=1 +case $(cat out) in + 3456789abcdef) ;; + *) fail=1 ;; +esac + +echo LA:3456789abcdef > in || fail=1 +(dd bs=1 skip=3 count=0 && dd bs=5 count=2) < in > out 2> /dev/null || fail=1 +case $(cat out) in + 3456789abc) ;; + *) fail=1 ;; +esac + +Exit $fail diff --git a/tests/dd/sparse b/tests/dd/sparse deleted file mode 100755 index 35ddda91..00000000 --- a/tests/dd/sparse +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/sh - -# Copyright (C) 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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ dd -require_sparse_support_ - -# Ensure basic sparse generation works -truncate -s1M sparse -dd bs=32K if=sparse of=sparse.dd conv=sparse -test $(stat -c %s sparse) = $(stat -c %s sparse.dd) || fail=1 - -# Demonstrate that conv=sparse with oflag=append, -# will do ineffective seeks in the output -printf 'a\000\000b' > file.in -printf 'ab' > exp -dd if=file.in bs=1 conv=sparse oflag=append > out -compare exp out || fail=1 - -# Demonstrate conv=sparse with conv=notrunc, -# where data in file.out is not overwritten with NULs -printf '____' > out -printf 'a__b' > exp -dd if=file.in bs=1 conv=sparse,notrunc of=out -compare exp out || fail=1 - -# Ensure we fall back to write if seek fails -dd if=file.in bs=1 conv=sparse | cat > file.out -cmp file.in file.out || fail=1 - -# Setup for block size tests: create a 3MiB file with a 1MiB -# stretch of NUL bytes in the middle. -rm -f file.in -dd if=/dev/urandom of=file.in bs=1M count=3 iflag=fullblock || fail=1 -dd if=/dev/zero of=file.in bs=1M count=1 seek=1 conv=notrunc || fail=1 - -kb_alloc() { du -k "$1"|cut -f1; } - -# If our just-created input file appears to be too small, -# skip the remaining tests. On at least Solaris 10 with NFS, -# file.in is reported to occupy <= 1KiB for about 50 seconds -# after its creation. -if test $(kb_alloc file.in) -gt 3000; then - - # Ensure NUL blocks smaller than the block size are not made sparse. - # Here, with a 2MiB block size, dd's conv=sparse must *not* introduce a hole. - dd if=file.in of=file.out bs=2M conv=sparse - test 2500 -lt $(kb_alloc file.out) || fail=1 - - # Ensure that this 1MiB string of NULs *is* converted to a hole. - dd if=file.in of=file.out bs=1M conv=sparse - test $(kb_alloc file.out) -lt 2500 || fail=1 - -fi - -Exit $fail diff --git a/tests/dd/sparse.sh b/tests/dd/sparse.sh new file mode 100755 index 00000000..d9de985a --- /dev/null +++ b/tests/dd/sparse.sh @@ -0,0 +1,70 @@ +#!/bin/sh + +# Copyright (C) 2012-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ dd +require_sparse_support_ + +# Ensure basic sparse generation works +truncate -s1M sparse +dd bs=32K if=sparse of=sparse.dd conv=sparse +test $(stat -c %s sparse) = $(stat -c %s sparse.dd) || fail=1 + +# Demonstrate that conv=sparse with oflag=append, +# will do ineffective seeks in the output +printf 'a\000\000b' > file.in +printf 'ab' > exp +dd if=file.in bs=1 conv=sparse oflag=append > out +compare exp out || fail=1 + +# Demonstrate conv=sparse with conv=notrunc, +# where data in file.out is not overwritten with NULs +printf '____' > out +printf 'a__b' > exp +dd if=file.in bs=1 conv=sparse,notrunc of=out +compare exp out || fail=1 + +# Ensure we fall back to write if seek fails +dd if=file.in bs=1 conv=sparse | cat > file.out +cmp file.in file.out || fail=1 + +# Setup for block size tests: create a 3MiB file with a 1MiB +# stretch of NUL bytes in the middle. +rm -f file.in +dd if=/dev/urandom of=file.in bs=1M count=3 iflag=fullblock || fail=1 +dd if=/dev/zero of=file.in bs=1M count=1 seek=1 conv=notrunc || fail=1 + +kb_alloc() { du -k "$1"|cut -f1; } + +# If our just-created input file appears to be too small, +# skip the remaining tests. On at least Solaris 10 with NFS, +# file.in is reported to occupy <= 1KiB for about 50 seconds +# after its creation. +if test $(kb_alloc file.in) -gt 3000; then + + # Ensure NUL blocks smaller than the block size are not made sparse. + # Here, with a 2MiB block size, dd's conv=sparse must *not* introduce a hole. + dd if=file.in of=file.out bs=2M conv=sparse + test 2500 -lt $(kb_alloc file.out) || fail=1 + + # Ensure that this 1MiB string of NULs *is* converted to a hole. + dd if=file.in of=file.out bs=1M conv=sparse + test $(kb_alloc file.out) -lt 2500 || fail=1 + +fi + +Exit $fail diff --git a/tests/dd/stderr b/tests/dd/stderr deleted file mode 100755 index 2c062787..00000000 --- a/tests/dd/stderr +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -# Ensure dd recognizes failure to write to stderr. - -# Copyright (C) 2009-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ dd - -p=$abs_top_builddir - - -# Ensure this exits successfully, even though stderr is closed, -# because it generates no stderr output. -dd --help >/dev/null 2>&- || fail=1 - -# If 2>&- works, ensure this fails, because stderr is closed and it -# *does* generate output. 2>&- apparently does not work in HP-UX 11.23. -# This test is ineffective unless /dev/stderr also works. -# This exposes a failure present in 6.11 through 7.5. -if "$p/src/test" -w /dev/stderr 2>/dev/null && - "$p/src/test" ! -w /dev/stderr 2>&-; then - : | dd 2>&- && fail=1 -fi - -# Likewise for /dev/full, if /dev/full works. -if test -w /dev/full && test -c /dev/full; then - : | dd 2>/dev/full && fail=1 -fi - -Exit $fail diff --git a/tests/dd/stderr.sh b/tests/dd/stderr.sh new file mode 100755 index 00000000..a1b0b894 --- /dev/null +++ b/tests/dd/stderr.sh @@ -0,0 +1,43 @@ +#!/bin/sh +# Ensure dd recognizes failure to write to stderr. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ dd + +p=$abs_top_builddir + + +# Ensure this exits successfully, even though stderr is closed, +# because it generates no stderr output. +dd --help >/dev/null 2>&- || fail=1 + +# If 2>&- works, ensure this fails, because stderr is closed and it +# *does* generate output. 2>&- apparently does not work in HP-UX 11.23. +# This test is ineffective unless /dev/stderr also works. +# This exposes a failure present in 6.11 through 7.5. +if "$p/src/test" -w /dev/stderr 2>/dev/null && + "$p/src/test" ! -w /dev/stderr 2>&-; then + : | dd 2>&- && fail=1 +fi + +# Likewise for /dev/full, if /dev/full works. +if test -w /dev/full && test -c /dev/full; then + : | dd 2>/dev/full && fail=1 +fi + +Exit $fail diff --git a/tests/dd/unblock b/tests/dd/unblock deleted file mode 100755 index d7187333..00000000 --- a/tests/dd/unblock +++ /dev/null @@ -1,59 +0,0 @@ -#!/usr/bin/perl -# Exercise dd's conv=unblock mode - -# Copyright (C) 2009-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 -# 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; - -(my $program_name = $0) =~ s|.*/||; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; -my $out = 'out'; - -my @t = - ( - # An empty test name signals that these are the arguments to use for the - # following tests. - ['', [qw (cbs=3 conv=unblock status=noxfer < )]], - ['0', '', ''], - ['1', "a\n ", "a\n\n\n"], - ['2', "a\n ", "a\n\n"], - ['3', "a ", "a\n"], - ['4', "a \n ", "a \n\n\n"], - ['5', "a \n", "a \n\n"], - ['6', "a ", "a\n\n"], - ['7', "a \n", "a\n\n\n"], - ); - -my @Tests; -my $args; -foreach my $t (@t) - { - $t->[0] eq '' - and $args = $t->[1], next; - - push @Tests, [$t->[0], @$args, {IN=>$t->[1]}, {OUT=>$t->[2]}, - {ERR_SUBST=>'s/^\d+\+\d+ records (?:in|out)$//'}, - {ERR=>"\n\n"}]; - } - -my $save_temps = $ENV{DEBUG}; -my $verbose = $ENV{VERBOSE}; - -my $prog = 'dd'; -my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); -exit $fail; diff --git a/tests/dd/unblock-sync b/tests/dd/unblock-sync deleted file mode 100755 index 68239f22..00000000 --- a/tests/dd/unblock-sync +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# Ensure that dd conv=unblock,sync works. - -# Copyright (C) 2003-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ dd - -printf 000100020003xx > in || framework_failure_ - - -dd cbs=4 ibs=4 conv=unblock,sync < in > out 2> /dev/null || fail=1 -cat <<\EOF > exp || fail=1 -0001 -0002 -0003 -xx -EOF - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/dd/unblock-sync.sh b/tests/dd/unblock-sync.sh new file mode 100755 index 00000000..239e2f2b --- /dev/null +++ b/tests/dd/unblock-sync.sh @@ -0,0 +1,35 @@ +#!/bin/sh +# Ensure that dd conv=unblock,sync works. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ dd + +printf 000100020003xx > in || framework_failure_ + + +dd cbs=4 ibs=4 conv=unblock,sync < in > out 2> /dev/null || fail=1 +cat <<\EOF > exp || fail=1 +0001 +0002 +0003 +xx +EOF + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/dd/unblock.pl b/tests/dd/unblock.pl new file mode 100755 index 00000000..6dc7efc0 --- /dev/null +++ b/tests/dd/unblock.pl @@ -0,0 +1,59 @@ +#!/usr/bin/perl +# Exercise dd's conv=unblock mode + +# 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/>. + +use strict; + +(my $program_name = $0) =~ s|.*/||; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; +my $out = 'out'; + +my @t = + ( + # An empty test name signals that these are the arguments to use for the + # following tests. + ['', [qw (cbs=3 conv=unblock status=noxfer < )]], + ['0', '', ''], + ['1', "a\n ", "a\n\n\n"], + ['2', "a\n ", "a\n\n"], + ['3', "a ", "a\n"], + ['4', "a \n ", "a \n\n\n"], + ['5', "a \n", "a \n\n"], + ['6', "a ", "a\n\n"], + ['7', "a \n", "a\n\n\n"], + ); + +my @Tests; +my $args; +foreach my $t (@t) + { + $t->[0] eq '' + and $args = $t->[1], next; + + push @Tests, [$t->[0], @$args, {IN=>$t->[1]}, {OUT=>$t->[2]}, + {ERR_SUBST=>'s/^\d+\+\d+ records (?:in|out)$//'}, + {ERR=>"\n\n"}]; + } + +my $save_temps = $ENV{DEBUG}; +my $verbose = $ENV{VERBOSE}; + +my $prog = 'dd'; +my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); +exit $fail; diff --git a/tests/df/df-P.sh b/tests/df/df-P.sh new file mode 100755 index 00000000..635b4cb2 --- /dev/null +++ b/tests/df/df-P.sh @@ -0,0 +1,37 @@ +#!/bin/sh +# Ensure that df -P is not affected by BLOCK_SIZE settings + +# Copyright (C) 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ df + + + df -P . > t1 || fail=1 +BLOCK_SIZE=1M df -P . > t2 || fail=1 + +# Since disk utilization may be changing, compare only df's header line. +# That records the block size. E.g., for "1M", it would be: +# Filesystem 1048576-blocks Used Available Capacity Mounted on +# while for 1K, it would be +# Filesystem 1024-blocks Used Available Capacity Mounted on + +head -n1 t1 > exp || fail=1 +head -n1 t2 > out || fail=1 + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/df/df-output.sh b/tests/df/df-output.sh new file mode 100644 index 00000000..a10f2706 --- /dev/null +++ b/tests/df/df-output.sh @@ -0,0 +1,130 @@ +#!/bin/sh +# Exercise df's --output option. + +# Copyright (C) 2012-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ df + +# Ensure that --output is mutually exclusive with -i, -P, and -T. +# Ensure that this limitation is not depending on the order of options. +cat <<\EOF > exp || framework_failure_ +df: options OPT and --output are mutually exclusive +Try 'df --help' for more information. +EOF + +df -i --output '.' 2>out && fail=1 +sed 's/ -i / OPT /' out > out2 +compare exp out2 || fail=1 + +df --output -i '.' 2>out && fail=1 +sed 's/ -i / OPT /' out > out2 +compare exp out2 || fail=1 + +df -P --output '.' 2>out && fail=1 +sed 's/ -P / OPT /' out > out2 +compare exp out2 || fail=1 + +df --output -P '.' 2>out && fail=1 +sed 's/ -P / OPT /' out > out2 +compare exp out2 || fail=1 + +df -T --output '.' 2>out && fail=1 +sed 's/ -T / OPT /' out > out2 +compare exp out2 || fail=1 + +df --output -T '.' 2>out && fail=1 +sed 's/ -T / OPT /' out > out2 +compare exp out2 || fail=1 + +# Ensure that each field is only used once for the --output argument. +cat <<\EOF > exp || framework_failure_ +df: option --output: field 'target' used more than once +Try 'df --help' for more information. +EOF + +df --output=target,source,target '.' 2>out && fail=1 +compare exp out || fail=1 + +# Ensure that this limitation also works for splitted --output options. +df --out=target,source --out=target '.' 2>out && fail=1 +compare exp out || fail=1 + +# Ensure that the full output includes all fields, and +# 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 +EOF + +df -h --o=source,fstype,itotal,iused,iavail,ipcent \ + --o=size,used,avail,pcent,target '.' >out || fail=1 +sed -e '1 { + s/ [ ]*/ /g + q + }' out > out2 +compare exp out2 || fail=1 + +df -h --output '.' >out || fail=1 +sed -e '1 { + s/ [ ]*/ /g + q + }' out > out2 +compare exp out2 || fail=1 + +# Ensure that --output indicates the block size +# when not using --human-readable +cat <<\EOF > exp || framework_failure_ +1K-blocks +EOF + +df -B1K --output=size '.' >out || fail=1 +sed -e '1 { + s/ // + q + }' out > out2 +compare exp out2 || fail=1 + +# Ensure that the grand total line now contains a "-" in the TARGET field ... +cat <<\EOF > exp || framework_failure_ +- +EOF + +df --output=source,target --total '.' >out || fail=1 +sed -n -e '3 { + s/^total[ ]*// + p + q + }' out > out2 +compare exp out2 || fail=1 + +# ... but it should read "total" if there is no SOURCE field. +cat <<\EOF > exp || framework_failure_ +total +EOF + +df --output=target --total '.' >out || fail=1 +sed -n -e '3 { + p + q + }' out > out2 +compare exp out2 || fail=1 + +# Ensure that --output is mentioned in the usage. +df --help > out || fail=1 +grep ' --output' out >/dev/null || { fail=1; cat out; } + +Exit $fail diff --git a/tests/df/header.sh b/tests/df/header.sh new file mode 100755 index 00000000..3e61ba71 --- /dev/null +++ b/tests/df/header.sh @@ -0,0 +1,28 @@ +#!/bin/sh +# Ensure that "df ." outputs a header. + +# Copyright (C) 2006-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ df + +case $(df .) in +*' +'*) ;; +*) fail=1;; +esac + +Exit $fail diff --git a/tests/df/no-mtab-status.sh b/tests/df/no-mtab-status.sh new file mode 100755 index 00000000..896a9fe5 --- /dev/null +++ b/tests/df/no-mtab-status.sh @@ -0,0 +1,80 @@ +#!/bin/sh +# 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. + +# This 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 + +df || skip_ "df fails" + +# Simulate "mtab" failure. +cat > k.c <<'EOF' || framework_failure_ +#include <stdio.h> +#include <errno.h> +#include <mntent.h> + +struct mntent *getmntent (FILE *fp) +{ + /* Prove that LD_PRELOAD works. */ + static int done = 0; + if (!done) + { + fclose (fopen ("x", "w")); + ++done; + } + /* Now simulate the failure. */ + errno = ENOENT; + return NULL; +} +EOF + +# Then compile/link it: +$CC -shared -fPIC -ldl -O2 k.c -o k.so \ + || skip_ "getmntent hack does not work on this platform" + +# Test if LD_PRELOAD works: +LD_PRELOAD=./k.so df +test -f x || skip_ "internal test failure: maybe LD_PRELOAD doesn't work?" + +# These tests are supposed to succeed: +LD_PRELOAD=./k.so df '.' || fail=1 +LD_PRELOAD=./k.so df -i '.' || fail=1 +LD_PRELOAD=./k.so df -T '.' || fail=1 +LD_PRELOAD=./k.so df -Ti '.' || fail=1 +LD_PRELOAD=./k.so df --total '.' || fail=1 + +# These tests are supposed to fail: +LD_PRELOAD=./k.so df && fail=1 +LD_PRELOAD=./k.so df -i && fail=1 +LD_PRELOAD=./k.so df -T && fail=1 +LD_PRELOAD=./k.so df -Ti && fail=1 +LD_PRELOAD=./k.so df --total && fail=1 + +LD_PRELOAD=./k.so df -a && fail=1 +LD_PRELOAD=./k.so df -a '.' && fail=1 + +LD_PRELOAD=./k.so df -l && fail=1 +LD_PRELOAD=./k.so df -l '.' && fail=1 + +LD_PRELOAD=./k.so df -t hello && fail=1 +LD_PRELOAD=./k.so df -t hello '.' && fail=1 + +LD_PRELOAD=./k.so df -x hello && fail=1 +LD_PRELOAD=./k.so df -x hello '.' && fail=1 + +Exit $fail diff --git a/tests/df/problematic-chars.sh b/tests/df/problematic-chars.sh new file mode 100755 index 00000000..86953213 --- /dev/null +++ b/tests/df/problematic-chars.sh @@ -0,0 +1,44 @@ +#!/bin/sh +# Ensure that df outputs one line per entry + +# Copyright (C) 2012-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ df +require_root_ + +mnt='mount +point' + +cwd=$(pwd) +cleanup_() { cd /; umount "$cwd/$mnt"; } + +skip=0 +# Create a file system, then mount it. +dd if=/dev/zero of=blob bs=8192 count=200 > /dev/null 2>&1 \ + || skip=1 +mkdir "$mnt" || skip=1 +mkfs -t ext2 -F blob \ + || skip_ "failed to create ext2 file system" + +mount -oloop blob "$mnt" || skip=1 + +test $skip = 1 \ + && skip_ "insufficient mount/ext2 support" + +test $(df "$mnt" | wc -l) = 2 || fail=1 + +Exit $fail diff --git a/tests/df/skip-duplicates.sh b/tests/df/skip-duplicates.sh new file mode 100755 index 00000000..ad5249b5 --- /dev/null +++ b/tests/df/skip-duplicates.sh @@ -0,0 +1,87 @@ +#!/bin/sh +# 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. + +# This 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 + +df || skip_ "df fails" + +# Simulate an mtab file with two entries of the same device number. +cat > k.c <<'EOF' || framework_failure_ +#include <stdio.h> +#include <mntent.h> + +struct mntent *getmntent (FILE *fp) +{ + /* Prove that LD_PRELOAD works. */ + static int done = 0; + if (!done) + { + fclose (fopen ("x", "w")); + ++done; + } + + static struct mntent mntent; + + while (done++ < 4) + { + /* 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; + } + 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" + +# 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 +# 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; } + +# 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; } + +# 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; } + +# Ensure that filtering duplicates does not affect +# argument processing (now without the fake getmntent()). +df '.' '.' >out || fail=1 +test $(wc -l <out) -eq 3 || { fail=1; cat out; } + +Exit $fail diff --git a/tests/df/skip-rootfs.sh b/tests/df/skip-rootfs.sh new file mode 100755 index 00000000..9c5d0a9f --- /dev/null +++ b/tests/df/skip-rootfs.sh @@ -0,0 +1,48 @@ +#!/bin/sh +# Test df's behavior for skipping the pseudo "rootfs" file system. + +# Copyright (C) 2012-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ df + +df || skip_ "df fails" + +# Verify that rootfs is in mtab (and shown when the -a option is specified). +df -a >out || fail=1 +grep '^rootfs' out || skip_ "no rootfs in mtab" + +# Ensure that rootfs is suppressed when no options is specified. +df >out || fail=1 +grep '^rootfs' out && { fail=1; cat out; } + +# Ensure that rootfs is yet skipped when explicitly specifying "-t rootfs". +# As df emits "no file systems processed" in this case, it would be a failure +# if df exited with status Zero. +df -t rootfs >out && fail=1 +grep '^rootfs' out && { fail=1; cat out; } + +# Ensure that the rootfs is shown when explicitly both specifying "-t rootfs" +# and the -a option. +df -t rootfs -a >out || fail=1 +grep '^rootfs' out || { fail=1; cat out; } + +# Ensure that the rootfs is omitted in all_fs mode when it is explicitly +# black-listed. +df -a -x rootfs >out || fail=1 +grep '^rootfs' out && { fail=1; cat out; } + +Exit $fail diff --git a/tests/df/total-unprocessed.sh b/tests/df/total-unprocessed.sh new file mode 100755 index 00000000..f6885d5e --- /dev/null +++ b/tests/df/total-unprocessed.sh @@ -0,0 +1,42 @@ +#!/bin/sh +# 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. + +# This 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_mount_list_ + +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 + +cat <<\EOF > exp || framework_failure_ +df: '_does_not_exist_': No such file or directory +EOF + +# Ensure that df writes the error message also in the following case. +df --total _does_not_exist_ 2>out && fail=1 +compare exp out || fail=1 + +Exit $fail diff --git a/tests/df/total-verify b/tests/df/total-verify deleted file mode 100755 index 948b002e..00000000 --- a/tests/df/total-verify +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/sh -# Ensure "df --total" computes accurate totals - -# Copyright (C) 2008-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ df -require_perl_ - -df || skip_ "df fails" - -cat <<\EOF > check-df || framework_failure_ -my ($total, $used, $avail) = (0, 0, 0); -while (<>) - { - $. == 1 - and next; # skip first (header) line - # Recognize df output lines like these: - # /dev/sdc1 0 0 0 - /c - # tmpfs 1536000 12965 1523035 1% /tmp - # total 5285932 787409 4498523 15% - /^(.*?) +(-?\d+|-) +(-?\d+|-) +(-?\d+|-) +(?:- |[0-9]+%)(.*)$/ - or die "$0: invalid input line\n: $_"; - if ($1 eq 'total' && $5 eq '') - { - $total == $2 or die "$total != $2"; - $used == $3 or die "$used != $3"; - $avail == $4 or die "$avail != $4"; - my $line = <>; - defined $line - and die "$0: extra line(s) after totals\n"; - exit 0; - } - $total += $2 unless $2 eq '-'; - $used += $3 unless $3 eq '-'; - $avail += $4 unless $4 eq '-'; - } -die "$0: missing line of totals\n"; -EOF - -# Use --block-size=512 to keep df from printing rounded-to-kilobyte -# numbers which wouldn't necessarily add up to the displayed total. -df --total -P --block-size=512 > space || framework_failure_ -cat space # this helps when debugging any test failure -df --total -i -P > inode || framework_failure_ -cat inode - -$PERL check-df space || fail=1 -$PERL check-df inode || fail=1 - -Exit $fail diff --git a/tests/df/total-verify.sh b/tests/df/total-verify.sh new file mode 100755 index 00000000..a045ccf9 --- /dev/null +++ b/tests/df/total-verify.sh @@ -0,0 +1,64 @@ +#!/bin/sh +# Ensure "df --total" computes accurate totals + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ df +require_perl_ + +df || skip_ "df fails" + +cat <<\EOF > check-df || framework_failure_ +my ($total, $used, $avail) = (0, 0, 0); +while (<>) + { + $. == 1 + and next; # skip first (header) line + # Recognize df output lines like these: + # /dev/sdc1 0 0 0 - /c + # tmpfs 1536000 12965 1523035 1% /tmp + # total 5285932 787409 4498523 15% - + /^(.*?) +(-?\d+|-) +(-?\d+|-) +(-?\d+|-) +(?:-|[0-9]+%) (.*)$/ + or die "$0: invalid input line\n: $_"; + if ($1 eq 'total' && $5 eq '-') + { + $total == $2 or die "$total != $2"; + $used == $3 or die "$used != $3"; + $avail == $4 or die "$avail != $4"; + my $line = <>; + defined $line + and die "$0: extra line(s) after totals\n"; + exit 0; + } + $total += $2 unless $2 eq '-'; + $used += $3 unless $3 eq '-'; + $avail += $4 unless $4 eq '-'; + } +die "$0: missing line of totals\n"; +EOF + +# Use --block-size=512 to keep df from printing rounded-to-kilobyte +# numbers which wouldn't necessarily add up to the displayed total. +df --total -P --block-size=512 > space || framework_failure_ +cat space # this helps when debugging any test failure +df --total -i -P > inode || framework_failure_ +cat inode + +$PERL check-df space || fail=1 +$PERL check-df inode || fail=1 + +Exit $fail diff --git a/tests/df/unreadable b/tests/df/unreadable deleted file mode 100755 index b0ef3fc8..00000000 --- a/tests/df/unreadable +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -# ensure that df can handle an unreadable argument - -# Copyright (C) 2009-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ df -skip_if_root_ - -touch unreadable || fail=1 -chmod a-r unreadable || fail=1 -df unreadable || fail=1 - -Exit $fail diff --git a/tests/df/unreadable.sh b/tests/df/unreadable.sh new file mode 100755 index 00000000..5ab2972b --- /dev/null +++ b/tests/df/unreadable.sh @@ -0,0 +1,27 @@ +#!/bin/sh +# ensure that df can handle an unreadable argument + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ df +skip_if_root_ + +touch unreadable || fail=1 +chmod a-r unreadable || fail=1 +df unreadable || fail=1 + +Exit $fail diff --git a/tests/du/2g b/tests/du/2g deleted file mode 100755 index 96cf62d7..00000000 --- a/tests/du/2g +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/sh -# Ensure that du can handle a 2GB file (i.e., a file of size 2^31 bytes) -# Before coreutils-5.93, on systems with a signed, 32-bit stat.st_blocks -# one of du's computations would overflow. - -# Copyright (C) 2005-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ du - -# Creating a 2GB file counts as 'very expensive'. -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/.* //') -case "$free_kb" in - [0-9]*) ;; - *) skip_ "invalid size from df: $free_kb";; -esac - -# Require about 3GB free. -min_kb=3000000 -test $min_kb -lt $free_kb || -{ - skip_ \ - "too little free space on current partition: $free_kb (need $min_kb KB)" -} - -big=big -rm -f $big -test -t 1 || printf 'creating a 2GB file...\n' -for i in $(seq 100); do - # Note: 2147483648 == 2^31. Print floor(2^31/100) per iteration. - printf %21474836s x >> $big || fail=1 - # On the final iteration, append the remaining 48 bytes. - test $i = 100 && { printf %48s x >> $big || fail=1; } - test -t 1 && printf 'creating a 2GB file: %d%% complete\r' $i -done -echo - -du -k $big > out1 || fail=1 -rm -f $big -sed 's/^2[0-9][0-9][0-9][0-9][0-9][0-9] '$big'$/~2M/' out1 > out - -cat <<\EOF > exp || fail=1 -~2M -EOF - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/du/2g.sh b/tests/du/2g.sh new file mode 100755 index 00000000..17ca13e1 --- /dev/null +++ b/tests/du/2g.sh @@ -0,0 +1,69 @@ +#!/bin/sh +# Ensure that du can handle a 2GB file (i.e., a file of size 2^31 bytes) +# 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. + +# This 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 + +# Creating a 2GB file counts as 'very expensive'. +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/.* //') +case "$free_kb" in + [0-9]*) ;; + *) skip_ "invalid size from df: $free_kb";; +esac + +# Require about 3GB free. +min_kb=3000000 +test $min_kb -lt $free_kb || +{ + skip_ \ + "too little free space on current partition: $free_kb (need $min_kb KB)" +} + +big=big +rm -f $big +test -t 1 || printf 'creating a 2GB file...\n' +for i in $(seq 100); do + # Note: 2147483648 == 2^31. Print floor(2^31/100) per iteration. + printf %21474836s x >> $big || fail=1 + # On the final iteration, append the remaining 48 bytes. + test $i = 100 && { printf %48s x >> $big || fail=1; } + test -t 1 && printf 'creating a 2GB file: %d%% complete\r' $i +done +echo + +du -k $big > out1 || fail=1 +rm -f $big +sed 's/^2[0-9][0-9][0-9][0-9][0-9][0-9] '$big'$/~2M/' out1 > out + +cat <<\EOF > exp || fail=1 +~2M +EOF + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/du/8gb b/tests/du/8gb deleted file mode 100755 index 556423e3..00000000 --- a/tests/du/8gb +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh -# Ensure that du does not rely on narrow types like size_t for -# file sizes or sums. - -# Copyright (C) 2003-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ du -require_sparse_support_ - -dd bs=1 seek=8G of=big < /dev/null 2> /dev/null -if test $? != 0; then - skip_ 'cannot create a file large enough for this test; possibly -because file offsets are only 32 bits on this file system' -fi - -# FIXME: this should be a test of dd. -# On some systems (at least linux-2.4.18 + NFS to disks on a Solaris system) -# the 'dd' command above mistakenly creates a file of length '0', yet -# doesn't fail. The root of that failure is that the ftruncate call -# returns zero but doesn't do its job. Detect this failure. -set x $(ls -gG big) -size=$4 -if test "$size" = 0; then - skip_ "cannot create a file large enough for this test -possibly because this system's NFS support is buggy -Consider rerunning this test on a different file system." -fi - - -# This would print '0 big' with coreutils-4.5.8. -du -ab big > out || fail=1 - -cat <<\EOF > exp -8589934592 big -EOF - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/du/8gb.sh b/tests/du/8gb.sh new file mode 100755 index 00000000..8c172397 --- /dev/null +++ b/tests/du/8gb.sh @@ -0,0 +1,53 @@ +#!/bin/sh +# 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. + +# This 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 +require_sparse_support_ + +dd bs=1 seek=8G of=big < /dev/null 2> /dev/null +if test $? != 0; then + skip_ 'cannot create a file large enough for this test; possibly +because file offsets are only 32 bits on this file system' +fi + +# FIXME: this should be a test of dd. +# On some systems (at least linux-2.4.18 + NFS to disks on a Solaris system) +# the 'dd' command above mistakenly creates a file of length '0', yet +# doesn't fail. The root of that failure is that the ftruncate call +# returns zero but doesn't do its job. Detect this failure. +set x $(ls -gG big) +size=$4 +if test "$size" = 0; then + skip_ "cannot create a file large enough for this test +possibly because this system's NFS support is buggy +Consider rerunning this test on a different file system." +fi + + +# This would print '0 big' with coreutils-4.5.8. +du -ab big > out || fail=1 + +cat <<\EOF > exp +8589934592 big +EOF + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/du/basic b/tests/du/basic deleted file mode 100755 index d8acf642..00000000 --- a/tests/du/basic +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/sh -# Compare actual numbers from du, assuming block size matches mine. - -# Copyright (C) 2003-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ du - -mkdir -p a/b d d/sub || framework_failure_ - -# Ensure that these files contain more than 64 bytes, so that we don't -# immediately disqualify file systems (e.g., NetApp) on which smaller -# files take up zero disk blocks. -printf '%*s' 257 make-sure-the-file-is-non-empty > a/b/F || framework_failure_ -printf %4096s x > d/1 -cp d/1 d/sub/2 - - -B=$(stat --format=%B a/b/F) - -du --block-size=$B -a a > out || fail=1 -echo === >> out -du --block-size=$B -a -S a >> out || fail=1 -echo === >> out -du --block-size=$B -s a >> out || fail=1 - -f=$(stat --format=%b a/b/F) -b=$(stat --format=%b a/b) -a=$(stat --format=%b a) -bf=$(expr $b + $f) -tot=$(expr $bf + $a) - -cat <<EOF | sed 's/ *#.*//' > exp -$f a/b/F -$bf a/b -$tot a -=== -$f a/b/F # size of file, a/b/F -$bf a/b # size of dir entry, a/b, + size of file, a/b/F -$a a # size of dir entry, a -=== -$tot a -EOF - -compare exp out || fail=1 - -# Perform this test only if "." is on a local file system. -# Otherwise, it would fail e.g., on an NFS-mounted Solaris ZFS file system. -if is_local_dir_ .; then - rm -f out exp - du --block-size=$B -a d | sort -r -k2,2 > out || fail=1 - echo === >> out - du --block-size=$B -S d | sort -r -k2,2 >> out || fail=1 - - t2=$(stat --format=%b d/sub/2) - ts=$(stat --format=%b d/sub) - t1=$(stat --format=%b d/1) - td=$(stat --format=%b d) - tot=$(expr $t1 + $t2 + $ts + $td) - d1=$(expr $td + $t1) - s2=$(expr $ts + $t2) - - cat <<EOF | sed 's/ *#.*//' > exp -$t2 d/sub/2 -$s2 d/sub -$t1 d/1 -$tot d -=== -$s2 d/sub -$d1 d # d + d/1; don't count the dir. entry for d/sub -EOF - - compare exp out || fail=1 -fi - -Exit $fail diff --git a/tests/du/basic.sh b/tests/du/basic.sh new file mode 100755 index 00000000..a97e08cc --- /dev/null +++ b/tests/du/basic.sh @@ -0,0 +1,89 @@ +#!/bin/sh +# Compare actual numbers from du, assuming block size matches mine. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ du + +mkdir -p a/b d d/sub || framework_failure_ + +# Ensure that these files contain more than 64 bytes, so that we don't +# immediately disqualify file systems (e.g., NetApp) on which smaller +# files take up zero disk blocks. +printf '%*s' 257 make-sure-the-file-is-non-empty > a/b/F || framework_failure_ +printf %4096s x > d/1 +cp d/1 d/sub/2 + + +B=$(stat --format=%B a/b/F) + +du --block-size=$B -a a > out || fail=1 +echo === >> out +du --block-size=$B -a -S a >> out || fail=1 +echo === >> out +du --block-size=$B -s a >> out || fail=1 + +f=$(stat --format=%b a/b/F) +b=$(stat --format=%b a/b) +a=$(stat --format=%b a) +bf=$(expr $b + $f) +tot=$(expr $bf + $a) + +cat <<EOF | sed 's/ *#.*//' > exp +$f a/b/F +$bf a/b +$tot a +=== +$f a/b/F # size of file, a/b/F +$bf a/b # size of dir entry, a/b, + size of file, a/b/F +$a a # size of dir entry, a +=== +$tot a +EOF + +compare exp out || fail=1 + +# Perform this test only if "." is on a local file system. +# Otherwise, it would fail e.g., on an NFS-mounted Solaris ZFS file system. +if is_local_dir_ .; then + rm -f out exp + du --block-size=$B -a d | sort -r -k2,2 > out || fail=1 + echo === >> out + du --block-size=$B -S d | sort -r -k2,2 >> out || fail=1 + + t2=$(stat --format=%b d/sub/2) + ts=$(stat --format=%b d/sub) + t1=$(stat --format=%b d/1) + td=$(stat --format=%b d) + tot=$(expr $t1 + $t2 + $ts + $td) + d1=$(expr $td + $t1) + s2=$(expr $ts + $t2) + + cat <<EOF | sed 's/ *#.*//' > exp +$t2 d/sub/2 +$s2 d/sub +$t1 d/1 +$tot d +=== +$s2 d/sub +$d1 d # d + d/1; don't count the dir. entry for d/sub +EOF + + compare exp out || fail=1 +fi + +Exit $fail diff --git a/tests/du/bigtime b/tests/du/bigtime deleted file mode 100755 index 964fb710..00000000 --- a/tests/du/bigtime +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/sh -# Exercise du on a file with a big time stamp. - -# Copyright (C) 2010-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 -# 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=.}/init.sh"; path_prepend_ ../src - -export LC_ALL=C -export TZ=UTC0 - -# 2**63 - 1 -bignum=9223372036854775807 - -touch -d @$bignum future 2>/dev/null && -future_time=$(ls -l future) && -case "$future_time" in -*" $bignum "*) - : ;; -*' Dec 4 300627798676 '*) - skip_ "file system and localtime both handle big timestamps" ;; -*) - skip_ "file system or localtime mishandles big time stamps:" \ - "$future_time" ;; -esac || skip_ "file system cannot represent big time stamps" - -printf "0\t$bignum\tfuture\n" > exp || framework_failure_ -printf "du: time $bignum is out of range\n" > err_ok || framework_failure_ - -du --time future >out 2>err || fail=1 - -# On some systems an empty file occupies 4 blocks. -# Map the number of blocks to 0. -sed 's/^[0-9][0-9]*/0/' out > k && mv k out - -compare exp out || fail=1 -compare err err_ok || fail=1 - -Exit $fail diff --git a/tests/du/bigtime.sh b/tests/du/bigtime.sh new file mode 100755 index 00000000..64e68610 --- /dev/null +++ b/tests/du/bigtime.sh @@ -0,0 +1,51 @@ +#!/bin/sh +# Exercise du on a file with a big time stamp. + +# Copyright (C) 2010-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src + +export LC_ALL=C +export TZ=UTC0 + +# 2**63 - 1 +bignum=9223372036854775807 + +touch -d @$bignum future 2>/dev/null && +future_time=$(ls -l future) && +case "$future_time" in +*" $bignum "*) + : ;; +*' Dec 4 300627798676 '*) + skip_ "file system and localtime both handle big timestamps" ;; +*) + skip_ "file system or localtime mishandles big time stamps:" \ + "$future_time" ;; +esac || skip_ "file system cannot represent big time stamps" + +printf "0\t$bignum\tfuture\n" > exp || framework_failure_ +printf "du: time $bignum is out of range\n" > err_ok || framework_failure_ + +du --time future >out 2>err || fail=1 + +# On some systems an empty file occupies 4 blocks. +# Map the number of blocks to 0. +sed 's/^[0-9][0-9]*/0/' out > k && mv k out + +compare exp out || fail=1 +compare err err_ok || fail=1 + +Exit $fail diff --git a/tests/du/bind-mount-dir-cycle.sh b/tests/du/bind-mount-dir-cycle.sh new file mode 100755 index 00000000..c70b41fb --- /dev/null +++ b/tests/du/bind-mount-dir-cycle.sh @@ -0,0 +1,38 @@ +#!/bin/sh +# Exercise du's new ability to handle bind-mount-induced dir cycles. + +# Copyright (C) 2012-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ du +require_root_ + +cleanup_() { umount a/b; } + +mkdir -p a/b || framework_failure_ +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 +sed 's/^[0-9][0-9]* //' out > k && mv k out + +compare exp-err err || fail=1 +compare exp out || fail=1 + +Exit $fail diff --git a/tests/du/deref b/tests/du/deref deleted file mode 100755 index 90b76503..00000000 --- a/tests/du/deref +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh -# prior to coreutils-4.5.3, du -D didn't work in some cases -# Based on an example from Andreas Schwab and/or Michal Svec. -# Also, up to coreutils-8.5, du -L sometimes incorrectly -# counted the space of the followed symlinks. - -# Copyright (C) 2002-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ du - -mkdir -p a/sub || framework_failure_ -ln -s a/sub slink || framework_failure_ -touch b || framework_failure_ -ln -s .. a/sub/dotdot || framework_failure_ -ln -s nowhere dangle || framework_failure_ - - -# This used to fail with the following diagnostic: -# du: 'b': No such file or directory -du -sD slink b > /dev/null 2>&1 || fail=1 - -# This used to fail to report the dangling symlink. -du -L dangle > /dev/null 2>&1 && fail=1 - -# du -L used to mess up, either by counting the symlink's disk space itself -# (-L should follow symlinks, not count their space) -# or (briefly in July 2010) by omitting the entry for "a". -du_L_output=$(du -L a) || fail=1 -du_lL_output=$(du -lL a) || fail=1 -du_x_output=$(du --exclude=dotdot a) || fail=1 -test "X$du_L_output" = "X$du_x_output" || fail=1 -test "X$du_lL_output" = "X$du_x_output" || fail=1 - -Exit $fail diff --git a/tests/du/deref-args b/tests/du/deref-args deleted file mode 100755 index 098e01a4..00000000 --- a/tests/du/deref-args +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh -# Ensure that --dereference-args (-D) gives reasonable names. -# This test would fail for coreutils-5.0.91. - -# Copyright (C) 2003-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ du - -mkdir -p dir/a || framework_failure_ -ln -s dir slink || framework_failure_ -printf %65536s x > 64k || framework_failure_ -ln -s 64k slink-to-64k || framework_failure_ - - -du -D slink | sed 's/^[0-9][0-9]* //' > out -# Ensure that the trailing slash is preserved and handled properly. -du -D slink/ | sed 's/^[0-9][0-9]* //' >> out - -# Ensure that -D makes du dereference even symlinks to non-directories. -# Be sure to use --apparent-size. Otherwise, we'd get varying block counts -# depending on file system type (e.g. 68 on ext3 vs. 64 on tmpfs and 72 -# on SELinux-enabled systems). -du --apparent-size --block-size=1K -D slink-to-64k >> out -cat <<\EOF > exp -slink/a -slink -slink/a -slink/ -64 slink-to-64k -EOF - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/du/deref-args.sh b/tests/du/deref-args.sh new file mode 100755 index 00000000..c1c5a4d4 --- /dev/null +++ b/tests/du/deref-args.sh @@ -0,0 +1,48 @@ +#!/bin/sh +# 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. + +# This 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 + +mkdir -p dir/a || framework_failure_ +ln -s dir slink || framework_failure_ +printf %65536s x > 64k || framework_failure_ +ln -s 64k slink-to-64k || framework_failure_ + + +du -D slink | sed 's/^[0-9][0-9]* //' > out +# Ensure that the trailing slash is preserved and handled properly. +du -D slink/ | sed 's/^[0-9][0-9]* //' >> out + +# Ensure that -D makes du dereference even symlinks to non-directories. +# Be sure to use --apparent-size. Otherwise, we'd get varying block counts +# depending on file system type (e.g. 68 on ext3 vs. 64 on tmpfs and 72 +# on SELinux-enabled systems). +du --apparent-size --block-size=1K -D slink-to-64k >> out +cat <<\EOF > exp +slink/a +slink +slink/a +slink/ +64 slink-to-64k +EOF + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/du/deref.sh b/tests/du/deref.sh new file mode 100755 index 00000000..7ac9aedb --- /dev/null +++ b/tests/du/deref.sh @@ -0,0 +1,48 @@ +#!/bin/sh +# prior to coreutils-4.5.3, du -D didn't work in some cases +# Based on an example from Andreas Schwab and/or Michal Svec. +# 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. + +# This 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 + +mkdir -p a/sub || framework_failure_ +ln -s a/sub slink || framework_failure_ +touch b || framework_failure_ +ln -s .. a/sub/dotdot || framework_failure_ +ln -s nowhere dangle || framework_failure_ + + +# This used to fail with the following diagnostic: +# du: 'b': No such file or directory +du -sD slink b > /dev/null 2>&1 || fail=1 + +# This used to fail to report the dangling symlink. +du -L dangle > /dev/null 2>&1 && fail=1 + +# du -L used to mess up, either by counting the symlink's disk space itself +# (-L should follow symlinks, not count their space) +# or (briefly in July 2010) by omitting the entry for "a". +du_L_output=$(du -L a) || fail=1 +du_lL_output=$(du -lL a) || fail=1 +du_x_output=$(du --exclude=dotdot a) || fail=1 +test "X$du_L_output" = "X$du_x_output" || fail=1 +test "X$du_lL_output" = "X$du_x_output" || fail=1 + +Exit $fail diff --git a/tests/du/exclude b/tests/du/exclude deleted file mode 100755 index cad2d7f8..00000000 --- a/tests/du/exclude +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/sh -# make sure du's --exclude option works - -# Copyright (C) 2003-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ du - -mkdir -p a/b/c a/x/y a/u/v || framework_failure_ - - -du --exclude=x a | sed 's/^[0-9][0-9]* //' | sort > out || fail=1 -printf '===\n' >> out -printf 'b\n' > excl -du --exclude-from=excl a | sed 's/^[0-9][0-9]* //' | sort >> out || fail=1 -printf '===\n' >> out -# Make sure that we can exclude an entire hierarchy. -du --exclude=a a >> out || fail=1 -# Make sure that we can exclude based on more than one component. -# Before coreutils-5.3.0, this part would fail. -printf '===\n' >> out -du --exclude=a/u --exclude=a/b a \ - | sed 's/^[0-9][0-9]* //' | sort >> out || fail=1 -cat <<\EOF > exp -a -a/b -a/b/c -a/u -a/u/v -=== -a -a/u -a/u/v -a/x -a/x/y -=== -=== -a -a/x -a/x/y -EOF - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/du/exclude.sh b/tests/du/exclude.sh new file mode 100755 index 00000000..c9e0ef56 --- /dev/null +++ b/tests/du/exclude.sh @@ -0,0 +1,58 @@ +#!/bin/sh +# make sure du's --exclude option works + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ du + +mkdir -p a/b/c a/x/y a/u/v || framework_failure_ + + +du --exclude=x a | sed 's/^[0-9][0-9]* //' | sort > out || fail=1 +printf '===\n' >> out +printf 'b\n' > excl +du --exclude-from=excl a | sed 's/^[0-9][0-9]* //' | sort >> out || fail=1 +printf '===\n' >> out +# Make sure that we can exclude an entire hierarchy. +du --exclude=a a >> out || fail=1 +# Make sure that we can exclude based on more than one component. +# Before coreutils-5.3.0, this part would fail. +printf '===\n' >> out +du --exclude=a/u --exclude=a/b a \ + | sed 's/^[0-9][0-9]* //' | sort >> out || fail=1 +cat <<\EOF > exp +a +a/b +a/b/c +a/u +a/u/v +=== +a +a/u +a/u/v +a/x +a/x/y +=== +=== +a +a/x +a/x/y +EOF + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/du/fd-leak b/tests/du/fd-leak deleted file mode 100755 index 84a22760..00000000 --- a/tests/du/fd-leak +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -# check for file descriptor leak - -# Copyright (C) 2003-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ du - -# Call this an expensive test. It's not that expensive, but command line -# limitations might induce failure on some losing systems. -expensive_ - -# Create 1296 (36^2) files. -# Their names and separating spaces take up 3887 bytes. -x='a b c d e f g h i j k l m n o p q r s t u v w x y z 0 1 2 3 4 5 6 7 8 9' -f= -for i in $x; do - for j in $x; do - f="$f $i$j" - done -done - -# This may fail due to command line limitations. -touch $f || framework_failure_ - - -# With coreutils-5.0, this would fail due to a file descriptor leak. -du $f > out || fail=1 - -Exit $fail diff --git a/tests/du/fd-leak.sh b/tests/du/fd-leak.sh new file mode 100755 index 00000000..e278e70e --- /dev/null +++ b/tests/du/fd-leak.sh @@ -0,0 +1,43 @@ +#!/bin/sh +# check for file descriptor leak + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ du + +# Call this an expensive test. It's not that expensive, but command line +# limitations might induce failure on some losing systems. +expensive_ + +# Create 1296 (36^2) files. +# Their names and separating spaces take up 3887 bytes. +x='a b c d e f g h i j k l m n o p q r s t u v w x y z 0 1 2 3 4 5 6 7 8 9' +f= +for i in $x; do + for j in $x; do + f="$f $i$j" + done +done + +# This may fail due to command line limitations. +touch $f || framework_failure_ + + +# With coreutils-5.0, this would fail due to a file descriptor leak. +du $f > out || fail=1 + +Exit $fail diff --git a/tests/du/files0-from b/tests/du/files0-from deleted file mode 100755 index e6de79f0..00000000 --- a/tests/du/files0-from +++ /dev/null @@ -1,94 +0,0 @@ -#!/usr/bin/perl -# Exercise du's --files0-from option. -# FIXME: keep this file in sync with tests/misc/wc-files0-from. - -# Copyright (C) 2004-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 -# 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; - -(my $program_name = $0) =~ s|.*/||; - -my $prog = 'du'; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -my @Tests = - ( - # invalid extra command line argument - ['f-extra-arg', '--files0-from=- no-such', {IN=>"a"}, {EXIT=>1}, - {ERR => "$prog: extra operand 'no-such'\n" - . "file operands cannot be combined with --files0-from\n" - . "Try '$prog --help' for more information.\n"} - ], - - # missing input file - ['missing', '--files0-from=missing', {EXIT=>1}, - {ERR => "$prog: cannot open 'missing' for reading: " - . "No such file or directory\n"}], - - # input file name of '-' - ['minus-in-stdin', '--files0-from=-', '<', {IN=>{f=>'-'}}, {EXIT=>1}, - {ERR => "$prog: when reading file names from stdin, no file name of" - . " '-' allowed\n"}], - - # empty input, regular file - ['empty', '--files0-from=@AUX@', {AUX=>''}], - - # empty input, from non-regular file - ['empty-nonreg', '--files0-from=/dev/null'], - - # one NUL - ['nul-1', '--files0-from=-', '<', {IN=>"\0"}, {EXIT=>1}, - {ERR => "$prog: -:1: invalid zero-length file name\n"}], - - # two NULs - ['nul-2', '--files0-from=-', '<', {IN=>"\0\0"}, {EXIT=>1}, - {ERR => "$prog: -:1: invalid zero-length file name\n" - . "$prog: -:2: invalid zero-length file name\n"}], - - # one file name, no NUL - ['1', '--files0-from=-', '<', - {IN=>{f=>"g"}}, {AUX=>{g=>''}}, - {OUT=>"0\tg\n"}, {OUT_SUBST=>'s/^\d+/0/'} ], - - # one file name, with NUL - ['1a', '--files0-from=-', '<', - {IN=>{f=>"g\0"}}, {AUX=>{g=>''}}, - {OUT=>"0\tg\n"}, {OUT_SUBST=>'s/^\d+/0/'} ], - - # two identical file names, no final NUL - ['2', '--files0-from=-', '<', - {IN=>{f=>"g\0g"}}, {AUX=>{g=>''}}, - {OUT=>"0\tg\n"}, {OUT_SUBST=>'s/^\d+/0/'} ], - - # two identical file names, with final NUL - ['2a', '--files0-from=-', '<', - {IN=>{f=>"g\0g\0"}}, {AUX=>{g=>''}}, - {OUT=>"0\tg\n"}, {OUT_SUBST=>'s/^\d+/0/'} ], - - # Ensure that $prog processes FILEs following a zero-length name. - ['zero-len', '--files0-from=-', '<', - {IN=>{f=>"\0g\0"}}, {AUX=>{g=>''}}, - {OUT=>"0\tg\n"}, {OUT_SUBST=>'s/^\d+/0/'}, - {ERR => "$prog: -:1: invalid zero-length file name\n"}, {EXIT=>1} ], - ); - -my $save_temps = $ENV{DEBUG}; -my $verbose = $ENV{VERBOSE}; - -my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); -exit $fail; diff --git a/tests/du/files0-from-dir b/tests/du/files0-from-dir deleted file mode 100755 index 86bfe269..00000000 --- a/tests/du/files0-from-dir +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -# ensure that du and wc handle --files0-from=DIR - -# Copyright (C) 2011-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ du wc - -mkdir dir - -# Skip this test if reading from a directory succeeds. -# In that case, using --files0-from=dir would yield garbage, -# interpreting the directory entry as a sequence of -# NUL-separated file names. -cat dir > /dev/null && skip_ "cat dir/ succeeds" - -for prog in du wc; do - $prog --files0-from=dir > /dev/null 2>err && fail=1 - printf "$prog: dir:\n" > exp || fail=1 - # The diagnostic string is usually "Is a directory" (ENOTDIR), - # but accept a different string or errno value. - sed 's/dir:.*/dir:/' err > k; mv k err - compare exp err || fail=1 -done - -Exit $fail diff --git a/tests/du/files0-from-dir.sh b/tests/du/files0-from-dir.sh new file mode 100755 index 00000000..d305fad0 --- /dev/null +++ b/tests/du/files0-from-dir.sh @@ -0,0 +1,39 @@ +#!/bin/sh +# ensure that du and wc handle --files0-from=DIR + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ du wc + +mkdir dir + +# Skip this test if reading from a directory succeeds. +# In that case, using --files0-from=dir would yield garbage, +# interpreting the directory entry as a sequence of +# NUL-separated file names. +cat dir > /dev/null && skip_ "cat dir/ succeeds" + +for prog in du wc; do + $prog --files0-from=dir > /dev/null 2>err && fail=1 + printf "$prog: dir:\n" > exp || fail=1 + # The diagnostic string is usually "Is a directory" (ENOTDIR), + # but accept a different string or errno value. + sed 's/dir:.*/dir:/' err > k; mv k err + compare exp err || fail=1 +done + +Exit $fail diff --git a/tests/du/files0-from.pl b/tests/du/files0-from.pl new file mode 100755 index 00000000..7bb82ab9 --- /dev/null +++ b/tests/du/files0-from.pl @@ -0,0 +1,94 @@ +#!/usr/bin/perl +# 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. + +# This 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; + +(my $program_name = $0) =~ s|.*/||; + +my $prog = 'du'; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +my @Tests = + ( + # invalid extra command line argument + ['f-extra-arg', '--files0-from=- no-such', {IN=>"a"}, {EXIT=>1}, + {ERR => "$prog: extra operand 'no-such'\n" + . "file operands cannot be combined with --files0-from\n" + . "Try '$prog --help' for more information.\n"} + ], + + # missing input file + ['missing', '--files0-from=missing', {EXIT=>1}, + {ERR => "$prog: cannot open 'missing' for reading: " + . "No such file or directory\n"}], + + # input file name of '-' + ['minus-in-stdin', '--files0-from=-', '<', {IN=>{f=>'-'}}, {EXIT=>1}, + {ERR => "$prog: when reading file names from stdin, no file name of" + . " '-' allowed\n"}], + + # empty input, regular file + ['empty', '--files0-from=@AUX@', {AUX=>''}], + + # empty input, from non-regular file + ['empty-nonreg', '--files0-from=/dev/null'], + + # one NUL + ['nul-1', '--files0-from=-', '<', {IN=>"\0"}, {EXIT=>1}, + {ERR => "$prog: -:1: invalid zero-length file name\n"}], + + # two NULs + ['nul-2', '--files0-from=-', '<', {IN=>"\0\0"}, {EXIT=>1}, + {ERR => "$prog: -:1: invalid zero-length file name\n" + . "$prog: -:2: invalid zero-length file name\n"}], + + # one file name, no NUL + ['1', '--files0-from=-', '<', + {IN=>{f=>"g"}}, {AUX=>{g=>''}}, + {OUT=>"0\tg\n"}, {OUT_SUBST=>'s/^\d+/0/'} ], + + # one file name, with NUL + ['1a', '--files0-from=-', '<', + {IN=>{f=>"g\0"}}, {AUX=>{g=>''}}, + {OUT=>"0\tg\n"}, {OUT_SUBST=>'s/^\d+/0/'} ], + + # two identical file names, no final NUL + ['2', '--files0-from=-', '<', + {IN=>{f=>"g\0g"}}, {AUX=>{g=>''}}, + {OUT=>"0\tg\n"}, {OUT_SUBST=>'s/^\d+/0/'} ], + + # two identical file names, with final NUL + ['2a', '--files0-from=-', '<', + {IN=>{f=>"g\0g\0"}}, {AUX=>{g=>''}}, + {OUT=>"0\tg\n"}, {OUT_SUBST=>'s/^\d+/0/'} ], + + # Ensure that $prog processes FILEs following a zero-length name. + ['zero-len', '--files0-from=-', '<', + {IN=>{f=>"\0g\0"}}, {AUX=>{g=>''}}, + {OUT=>"0\tg\n"}, {OUT_SUBST=>'s/^\d+/0/'}, + {ERR => "$prog: -:1: invalid zero-length file name\n"}, {EXIT=>1} ], + ); + +my $save_temps = $ENV{DEBUG}; +my $verbose = $ENV{VERBOSE}; + +my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); +exit $fail; diff --git a/tests/du/hard-link b/tests/du/hard-link deleted file mode 100755 index 0e0641e7..00000000 --- a/tests/du/hard-link +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/sh -# Ensure that hard-linked files are counted (and listed) only once. -# Likewise for excluded directories. -# Ensure that hard links _are_ listed twice when using --count-links. - -# Copyright (C) 2003-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ du - -mkdir -p dir/sub -( cd dir && - { echo non-empty > f1 - ln f1 f2 - ln -s f1 f3 - echo non-empty > sub/F; } ) - -du -a -L --exclude=sub --count-links dir \ - | sed 's/^[0-9][0-9]* //' | sort -r > out || fail=1 - -# For these tests, transform f1 or f2 or f3 (whichever name is find -# first) to f_. That is necessary because, depending on the type of -# file system, du could encounter any of those linked files first, -# thus listing that one and not the others. -for args in '-L' 'dir' '-L dir' -do - echo === >> out - du -a --exclude=sub $args dir \ - | sed 's/^[0-9][0-9]* //' | sed 's/f[123]/f_/' >> out || fail=1 -done - -cat <<\EOF > exp -dir/f3 -dir/f2 -dir/f1 -dir -=== -dir/f_ -dir -=== -dir/f_ -dir/f_ -dir -=== -dir/f_ -dir -EOF - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/du/hard-link.sh b/tests/du/hard-link.sh new file mode 100755 index 00000000..052cb4e3 --- /dev/null +++ b/tests/du/hard-link.sh @@ -0,0 +1,64 @@ +#!/bin/sh +# Ensure that hard-linked files are counted (and listed) only once. +# Likewise for excluded directories. +# Ensure that hard links _are_ listed twice when using --count-links. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ du + +mkdir -p dir/sub +( cd dir && + { echo non-empty > f1 + ln f1 f2 + ln -s f1 f3 + echo non-empty > sub/F; } ) + +du -a -L --exclude=sub --count-links dir \ + | sed 's/^[0-9][0-9]* //' | sort -r > out || fail=1 + +# For these tests, transform f1 or f2 or f3 (whichever name is find +# first) to f_. That is necessary because, depending on the type of +# file system, du could encounter any of those linked files first, +# thus listing that one and not the others. +for args in '-L' 'dir' '-L dir' +do + echo === >> out + du -a --exclude=sub $args dir \ + | sed 's/^[0-9][0-9]* //' | sed 's/f[123]/f_/' >> out || fail=1 +done + +cat <<\EOF > exp +dir/f3 +dir/f2 +dir/f1 +dir +=== +dir/f_ +dir +=== +dir/f_ +dir/f_ +dir +=== +dir/f_ +dir +EOF + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/du/inacc-dest b/tests/du/inacc-dest deleted file mode 100755 index c9c70975..00000000 --- a/tests/du/inacc-dest +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh -# 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-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ du -skip_if_root_ - -mkdir f && cd f && mkdir a b c d e && touch c/j && chmod a-x c \ - || framework_failure_ - -du > ../t 2>&1 && fail=1 - -# Accept either of the following outputs. -# You get the first from a system with openat _emulation_ (via /proc), -# the second from a system with native openat support. -# FIXME: there may well be a third output, for systems with neither -# /proc support, nor native openat support. - -sed 's/^[0-9][0-9]* //' ../t | sort -u > out -cat <<\EOF > exp || fail=1 -. -./a -./b -./c -./d -./e -du: cannot read directory './c': Permission denied -EOF - -# Map a diagnostic like this -# du: cannot access './c/j': Permission denied -# to this: -# du: cannot access './c': Permission denied -# And accept "cannot read directory" in place of "cannot access" -sed "s,/c/j': ,/c': ," out > t && mv t out -sed 's,cannot access,cannot read directory,' out > t && mv t out - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/du/inacc-dest.sh b/tests/du/inacc-dest.sh new file mode 100755 index 00000000..88e18945 --- /dev/null +++ b/tests/du/inacc-dest.sh @@ -0,0 +1,56 @@ +#!/bin/sh +# 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. + +# This 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 +skip_if_root_ + +mkdir f && cd f && mkdir a b c d e && touch c/j && chmod a-x c \ + || framework_failure_ + +du > ../t 2>&1 && fail=1 + +# Accept either of the following outputs. +# You get the first from a system with openat _emulation_ (via /proc), +# the second from a system with native openat support. +# FIXME: there may well be a third output, for systems with neither +# /proc support, nor native openat support. + +sed 's/^[0-9][0-9]* //' ../t | sort -u > out +cat <<\EOF > exp || fail=1 +. +./a +./b +./c +./d +./e +du: cannot read directory './c': Permission denied +EOF + +# Map a diagnostic like this +# du: cannot access './c/j': Permission denied +# to this: +# du: cannot access './c': Permission denied +# And accept "cannot read directory" in place of "cannot access" +sed "s,/c/j': ,/c': ," out > t && mv t out +sed 's,cannot access,cannot read directory,' out > t && mv t out + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/du/inacc-dir b/tests/du/inacc-dir deleted file mode 100755 index 8395c56e..00000000 --- a/tests/du/inacc-dir +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh -# Ensure that du counts the size of an inaccessible directory. -# Copyright (C) 2007-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ du -skip_if_root_ - -mkdir -p a/sub || framework_failure_ - - -du -s a > exp || fail=1 -chmod 0 a/sub || fail=1 -# Expect failure, ignore diagnostics. -du -s a > out 2> /dev/null && fail=1 - -compare exp out || fail=1 - -# Same as above, but don't use -s, so we print -# an entry for the unreadable "sub", too. -chmod 700 a/sub || fail=1 -du -k a > exp || fail=1 -chmod 0 a/sub || fail=1 -# Expect failure, ignore diagnostics. -du -k a > out 2> /dev/null && fail=1 - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/du/inacc-dir.sh b/tests/du/inacc-dir.sh new file mode 100755 index 00000000..911c04fc --- /dev/null +++ b/tests/du/inacc-dir.sh @@ -0,0 +1,42 @@ +#!/bin/sh +# Ensure that du counts the size of an inaccessible directory. +# Copyright (C) 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ du +skip_if_root_ + +mkdir -p a/sub || framework_failure_ + + +du -s a > exp || fail=1 +chmod 0 a/sub || fail=1 +# Expect failure, ignore diagnostics. +du -s a > out 2> /dev/null && fail=1 + +compare exp out || fail=1 + +# Same as above, but don't use -s, so we print +# an entry for the unreadable "sub", too. +chmod 700 a/sub || fail=1 +du -k a > exp || fail=1 +chmod 0 a/sub || fail=1 +# Expect failure, ignore diagnostics. +du -k a > out 2> /dev/null && fail=1 + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/du/inaccessible-cwd b/tests/du/inaccessible-cwd deleted file mode 100755 index bfc8cf92..00000000 --- a/tests/du/inaccessible-cwd +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -# Ensure that even when run from an inaccessible directory, du can still -# operate on accessible directories elsewhere. - -# Copyright (C) 2003-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 -# 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/>. - -# Before the switch to an fts-based implementation in coreutils 5.0.92, -# this test would fail. - -. "${srcdir=.}/init.sh"; path_prepend_ ../src -print_ver_ du - -# Skip this test if your system has neither the openat-style functions -# nor /proc/self/fd support with which to emulate them. -require_openat_support_ - -skip_if_root_ - -cwd=$(pwd) -mkdir -p no-x a/b || framework_failure_ -cd no-x || framework_failure_ -chmod 0 . || framework_failure_ - - -du "$cwd/a" > /dev/null || fail=1 - -Exit $fail diff --git a/tests/du/inaccessible-cwd.sh b/tests/du/inaccessible-cwd.sh new file mode 100755 index 00000000..cd00444b --- /dev/null +++ b/tests/du/inaccessible-cwd.sh @@ -0,0 +1,40 @@ +#!/bin/sh +# 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. + +# This 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/>. + +# Before the switch to an fts-based implementation in coreutils 5.0.92, +# this test would fail. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ du + +# Skip this test if your system has neither the openat-style functions +# nor /proc/self/fd support with which to emulate them. +require_openat_support_ + +skip_if_root_ + +cwd=$(pwd) +mkdir -p no-x a/b || framework_failure_ +cd no-x || framework_failure_ +chmod 0 . || framework_failure_ + + +du "$cwd/a" > /dev/null || fail=1 + +Exit $fail diff --git a/tests/du/long-from-unreadable b/tests/du/long-from-unreadable deleted file mode 100755 index 7fc129c1..00000000 --- a/tests/du/long-from-unreadable +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/sh -# Show fts fails on old-fashioned systems. - -# Copyright (C) 2006-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 -# 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/>. - -# Show that fts (hence du, chmod, chgrp, chown) fails when all of the -# following are true: -# - '.' is not readable -# - operating on a hierarchy containing a relative name longer than PATH_MAX -# - run on a system where gnulib's openat emulation must resort to using -# save_cwd and restore_cwd (which fail if '.' is not readable). -# Thus, the following du invocation should succeed on newer Linux and -# Solaris systems, yet it must fail on systems lacking both openat and -# /proc support. However, before coreutils-6.0 this test would fail even -# on Linux+PROC_FS systems because its fts implementation would revert -# unnecessarily to using FTS_NOCHDIR mode in this corner case. - -. "${srcdir=.}/init.sh"; path_prepend_ ../src -print_ver_ du - -proc_file=/proc/self/fd -if test ! -d $proc_file; then - skip_ 'This test would fail, since your system lacks /proc support.' -fi - -dir=$(printf '%200s\n' ' '|tr ' ' x) - -# Construct a hierarchy containing a relative file with a name -# longer than PATH_MAX. -# for i in $(seq 52); do -# mkdir $dir || framework_failure_ -# cd $dir || framework_failure_ -# done -# cd $tmp || framework_failure_ - -# Sheesh. Bash 3.1.5 can't create this hierarchy. I get -# cd: error retrieving current directory: getcwd: -# cannot access parent directories: -# (all on one line). - -cwd=$(pwd) -# Use perl instead: -: ${PERL=perl} -$PERL \ - -e 'my $d = '$dir'; foreach my $i (1..52)' \ - -e ' { mkdir ($d, 0700) && chdir $d or die "$!" }' \ - || framework_failure_ - -mkdir inaccessible || framework_failure_ -cd inaccessible || framework_failure_ -chmod 0 . || framework_failure_ - -du -s "$cwd/$dir" > /dev/null || fail=1 - -Exit $fail diff --git a/tests/du/long-from-unreadable.sh b/tests/du/long-from-unreadable.sh new file mode 100755 index 00000000..18bf384d --- /dev/null +++ b/tests/du/long-from-unreadable.sh @@ -0,0 +1,68 @@ +#!/bin/sh +# Show fts fails on old-fashioned systems. + +# Copyright (C) 2006-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/>. + +# Show that fts (hence du, chmod, chgrp, chown) fails when all of the +# following are true: +# - '.' is not readable +# - operating on a hierarchy containing a relative name longer than PATH_MAX +# - run on a system where gnulib's openat emulation must resort to using +# save_cwd and restore_cwd (which fail if '.' is not readable). +# Thus, the following du invocation should succeed on newer Linux and +# Solaris systems, yet it must fail on systems lacking both openat and +# /proc support. However, before coreutils-6.0 this test would fail even +# on Linux+PROC_FS systems because its fts implementation would revert +# unnecessarily to using FTS_NOCHDIR mode in this corner case. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ du + +proc_file=/proc/self/fd +if test ! -d $proc_file; then + skip_ 'This test would fail, since your system lacks /proc support.' +fi + +dir=$(printf '%200s\n' ' '|tr ' ' x) + +# Construct a hierarchy containing a relative file with a name +# longer than PATH_MAX. +# for i in $(seq 52); do +# mkdir $dir || framework_failure_ +# cd $dir || framework_failure_ +# done +# cd $tmp || framework_failure_ + +# Sheesh. Bash 3.1.5 can't create this hierarchy. I get +# cd: error retrieving current directory: getcwd: +# cannot access parent directories: +# (all on one line). + +cwd=$(pwd) +# Use perl instead: +: ${PERL=perl} +$PERL \ + -e 'my $d = '$dir'; foreach my $i (1..52)' \ + -e ' { mkdir ($d, 0700) && chdir $d or die "$!" }' \ + || framework_failure_ + +mkdir inaccessible || framework_failure_ +cd inaccessible || framework_failure_ +chmod 0 . || framework_failure_ + +du -s "$cwd/$dir" > /dev/null || fail=1 + +Exit $fail diff --git a/tests/du/long-sloop b/tests/du/long-sloop deleted file mode 100755 index 48e2e30a..00000000 --- a/tests/du/long-sloop +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/sh -# Use du to exercise a corner of fts's FTS_LOGICAL code. -# Show that du fails with ELOOP (Too many levels of symbolic links) -# when it encounters that condition. - -# Copyright (C) 2006-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ du - -# Create lots of directories, each containing a single symlink -# pointing at the next directory in the list. - -# This number should be larger than the number of symlinks allowed in -# file name resolution, but not too large as a number of entries -# in a single directory. -n=400 - -dir_list=$(seq $n) -mkdir $dir_list || framework_failure_ -file=1 -i_minus_1=0 -for i in $dir_list $(expr $n + 1); do - case $i_minus_1 in - 0) ;; - *) - ln -s ../$i $i_minus_1/s || framework_failure_ - file=$file/s;; - esac - i_minus_1=$i -done -echo foo > $i - -# If a system can handle this many symlinks in a file name, -# just skip this test. - -# The following also serves to record in 'err' the string -# corresponding to strerror (ELOOP). This is necessary because while -# Linux/libc gives 'Too many levels of symbolic links', Solaris -# renders it as "Number of symbolic links encountered during path -# name traversal exceeds MAXSYMLINKS". - -cat $file > /dev/null 2> err && - skip_ 'Your system appears to be able to handle more than $n symlinks -in file name resolution' -too_many=$(sed 's/.*: //' err) - - -# With coreutils-5.93 there was no failure. -# With coreutils-5.94 we get the desired diagnostic: -# du: cannot access '1/s/s/s/.../s': Too many levels of symbolic links -du -L 1 > /dev/null 2> out1 && fail=1 -sed "s, .1/s/s/s/[/s]*',," out1 > out || fail=1 - -echo "du: cannot access: $too_many" > exp || fail=1 - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/du/long-sloop.sh b/tests/du/long-sloop.sh new file mode 100755 index 00000000..faeabbf2 --- /dev/null +++ b/tests/du/long-sloop.sh @@ -0,0 +1,72 @@ +#!/bin/sh +# Use du to exercise a corner of fts's FTS_LOGICAL code. +# 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. + +# This 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 + +# Create lots of directories, each containing a single symlink +# pointing at the next directory in the list. + +# This number should be larger than the number of symlinks allowed in +# file name resolution, but not too large as a number of entries +# in a single directory. +n=400 + +dir_list=$(seq $n) +mkdir $dir_list || framework_failure_ +file=1 +i_minus_1=0 +for i in $dir_list $(expr $n + 1); do + case $i_minus_1 in + 0) ;; + *) + ln -s ../$i $i_minus_1/s || framework_failure_ + file=$file/s;; + esac + i_minus_1=$i +done +echo foo > $i + +# If a system can handle this many symlinks in a file name, +# just skip this test. + +# The following also serves to record in 'err' the string +# corresponding to strerror (ELOOP). This is necessary because while +# Linux/libc gives 'Too many levels of symbolic links', Solaris +# renders it as "Number of symbolic links encountered during path +# name traversal exceeds MAXSYMLINKS". + +cat $file > /dev/null 2> err && + skip_ 'Your system appears to be able to handle more than $n symlinks +in file name resolution' +too_many=$(sed 's/.*: //' err) + + +# With coreutils-5.93 there was no failure. +# With coreutils-5.94 we get the desired diagnostic: +# du: cannot access '1/s/s/s/.../s': Too many levels of symbolic links +du -L 1 > /dev/null 2> out1 && fail=1 +sed "s, .1/s/s/s/[/s]*',," out1 > out || fail=1 + +echo "du: cannot access: $too_many" > exp || fail=1 + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/du/max-depth b/tests/du/max-depth deleted file mode 100755 index 30671c4d..00000000 --- a/tests/du/max-depth +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh -# exercise du's --max-depth=N option - -# Copyright (C) 2010-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 -# 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=.}/init.sh"; path_prepend_ ../src - -mkdir -p a/b/c/d/e || framework_failure_ -printf 'a/b/c\na/b\na\n' > exp || framework_failure_ - -du --max-depth=2 a > out 2>err || fail=1 - -# Remove the sizes. They vary between file systems. -cut -f2- out > k && mv k out -compare exp out || fail=1 -compare /dev/null err || fail=1 - -# Repeat, but use -d 1. -printf 'a/b\na\n' > exp || framework_failure_ -du -d 1 a > out 2>err || fail=1 -cut -f2- out > k && mv k out -compare exp out || fail=1 -compare /dev/null err || fail=1 - -Exit $fail diff --git a/tests/du/max-depth.sh b/tests/du/max-depth.sh new file mode 100755 index 00000000..36167ff0 --- /dev/null +++ b/tests/du/max-depth.sh @@ -0,0 +1,38 @@ +#!/bin/sh +# exercise du's --max-depth=N option + +# Copyright (C) 2010-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src + +mkdir -p a/b/c/d/e || framework_failure_ +printf 'a/b/c\na/b\na\n' > exp || framework_failure_ + +du --max-depth=2 a > out 2>err || fail=1 + +# Remove the sizes. They vary between file systems. +cut -f2- out > k && mv k out +compare exp out || fail=1 +compare /dev/null err || fail=1 + +# Repeat, but use -d 1. +printf 'a/b\na\n' > exp || framework_failure_ +du -d 1 a > out 2>err || fail=1 +cut -f2- out > k && mv k out +compare exp out || fail=1 +compare /dev/null err || fail=1 + +Exit $fail diff --git a/tests/du/move-dir-while-traversing b/tests/du/move-dir-while-traversing deleted file mode 100755 index 4f603a0e..00000000 --- a/tests/du/move-dir-while-traversing +++ /dev/null @@ -1,96 +0,0 @@ -#!/bin/sh -# Trigger a failed assertion in coreutils-8.9 and earlier. - -# Copyright (C) 2011-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ du - -# We use a python-inotify script, so... -python -m pyinotify -h > /dev/null \ - || skip_ 'python inotify package not installed' - -# Move a directory "up" while du is processing its sub-directories. -# While du is processing a hierarchy .../B/C/D/... this script -# detects when du opens D/, and then moves C/ "up" one level -# so that it is a sibling of B/. -# Given the inherent race condition, we have to add enough "weight" -# under D/ so that in most cases, the monitor performs the single -# rename syscall before du finishes processing the subtree under D/. - -cat <<'EOF' > inotify-watch-for-dir-access.py -#!/usr/bin/env python -import pyinotify as pn -import os,sys - -dir = sys.argv[1] -dest_parent = os.path.dirname(os.path.dirname(dir)) -dest = os.path.join(dest_parent, os.path.basename(dir)) - -class ProcessDir(pn.ProcessEvent): - - def process_IN_OPEN(self, event): - os.rename(dir, dest) - sys.exit(0) - - def process_default(self, event): - pass - -wm = pn.WatchManager() -notifier = pn.Notifier(wm) -wm.watch_transient_file(dir, pn.IN_OPEN, ProcessDir) -sys.stdout.write('started\n') -sys.stdout.flush() -notifier.loop() -EOF -chmod a+x inotify-watch-for-dir-access.py - -t=T/U -mkdir d2 || framework_failure_ -long=d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z -# One iteration of this loop creates a tree with which -# du sometimes completes its traversal before the above rename. -# Five iterations was not enough in 2 of 7 "make -j20 check" runs on a -# 6/12-core system. However, using "10", I saw no failure in 20 trials. -# Using 10 iterations was not enough, either. -# Using 50, I saw no failure in 200 trials. -for i in $(seq 50); do - mkdir -p $t/3/a/b/c/$i/$long || framework_failure_ -done - -# Prohibit suspension, which could otherwise cause a timeout-induced FP failure. -trap '' TSTP - -timeout 6 ./inotify-watch-for-dir-access.py $t/3/a/b > start-msg & - -# Wait for the watcher to start... -nonempty() { test -s start-msg || { sleep $1; return 1; }; } -retry_delay_ nonempty .1 5 - -# The above watches for an IN_OPEN event on $t/3/a/b, -# and when it triggers, moves the parent, $t/3/a, up one level -# so it's directly under $t. - -du -a $t d2 2> err -# Before coreutils-8.10, du would abort. -test $? = 1 || fail=1 - -# check for the new diagnostic -printf "du: fts_read failed: $t/3/a/b: No such file or directory\n" > exp \ - || fail=1 -compare exp err || fail=1 - -Exit $fail diff --git a/tests/du/move-dir-while-traversing.sh b/tests/du/move-dir-while-traversing.sh new file mode 100755 index 00000000..ab670984 --- /dev/null +++ b/tests/du/move-dir-while-traversing.sh @@ -0,0 +1,96 @@ +#!/bin/sh +# Trigger a failed assertion in coreutils-8.9 and earlier. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ du + +# We use a python-inotify script, so... +python -m pyinotify -h > /dev/null \ + || skip_ 'python inotify package not installed' + +# Move a directory "up" while du is processing its sub-directories. +# While du is processing a hierarchy .../B/C/D/... this script +# detects when du opens D/, and then moves C/ "up" one level +# so that it is a sibling of B/. +# Given the inherent race condition, we have to add enough "weight" +# under D/ so that in most cases, the monitor performs the single +# rename syscall before du finishes processing the subtree under D/. + +cat <<'EOF' > inotify-watch-for-dir-access.py +#!/usr/bin/env python +import pyinotify as pn +import os,sys + +dir = sys.argv[1] +dest_parent = os.path.dirname(os.path.dirname(dir)) +dest = os.path.join(dest_parent, os.path.basename(dir)) + +class ProcessDir(pn.ProcessEvent): + + def process_IN_OPEN(self, event): + os.rename(dir, dest) + sys.exit(0) + + def process_default(self, event): + pass + +wm = pn.WatchManager() +notifier = pn.Notifier(wm) +wm.watch_transient_file(dir, pn.IN_OPEN, ProcessDir) +sys.stdout.write('started\n') +sys.stdout.flush() +notifier.loop() +EOF +chmod a+x inotify-watch-for-dir-access.py + +t=T/U +mkdir d2 || framework_failure_ +long=d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z +# One iteration of this loop creates a tree with which +# du sometimes completes its traversal before the above rename. +# Five iterations was not enough in 2 of 7 "make -j20 check" runs on a +# 6/12-core system. However, using "10", I saw no failure in 20 trials. +# Using 10 iterations was not enough, either. +# Using 50, I saw no failure in 200 trials. +for i in $(seq 50); do + mkdir -p $t/3/a/b/c/$i/$long || framework_failure_ +done + +# Prohibit suspension, which could otherwise cause a timeout-induced FP failure. +trap '' TSTP + +timeout 6 ./inotify-watch-for-dir-access.py $t/3/a/b > start-msg & + +# Wait for the watcher to start... +nonempty() { test -s start-msg || { sleep $1; return 1; }; } +retry_delay_ nonempty .1 5 + +# The above watches for an IN_OPEN event on $t/3/a/b, +# and when it triggers, moves the parent, $t/3/a, up one level +# so it's directly under $t. + +du -a $t d2 2> err +# Before coreutils-8.10, du would abort. +test $? = 1 || fail=1 + +# check for the new diagnostic +printf "du: fts_read failed: $t/3/a/b: No such file or directory\n" > exp \ + || fail=1 +compare exp err || fail=1 + +Exit $fail diff --git a/tests/du/no-deref b/tests/du/no-deref deleted file mode 100755 index 2f205512..00000000 --- a/tests/du/no-deref +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -# Ensure that by default, du doesn't dereference command-line symlinks. - -# Copyright (C) 2003-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ du - -mkdir -p dir/a/b || framework_failure_ -ln -s dir slink || framework_failure_ - - -du slink | sed 's/^[0-9][0-9]* //' > out -cat <<\EOF > exp -slink -EOF - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/du/no-deref.sh b/tests/du/no-deref.sh new file mode 100755 index 00000000..65e5e4ad --- /dev/null +++ b/tests/du/no-deref.sh @@ -0,0 +1,33 @@ +#!/bin/sh +# Ensure that by default, du doesn't dereference command-line symlinks. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ du + +mkdir -p dir/a/b || framework_failure_ +ln -s dir slink || framework_failure_ + + +du slink | sed 's/^[0-9][0-9]* //' > out +cat <<\EOF > exp +slink +EOF + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/du/no-x b/tests/du/no-x deleted file mode 100755 index 28f79768..00000000 --- a/tests/du/no-x +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -# Make sure du gives the right diagnostic for a readable, -# but inaccessible directory. - -# Copyright (C) 2003-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ du -skip_if_root_ - -mkdir -p d/no-x/y || framework_failure_ -chmod u=rw d/no-x || framework_failure_ - - -# This must exit nonzero. -du d >/dev/null 2>out && fail=1 - -prog=du -# NOTE: this code is the same for all tests/*/no-x tests. -# Depending on whether fts is using native fdopendir, we see one -# of the following diagnostics (note also the /y suffix in one case): -# prog: 'd/no-x': Permission denied -# prog: cannot access 'd/no-x/y': Permission denied -# prog: cannot read directory 'd/no-x': Permission denied -# Convert either of the latter two to the first one. -sed "s/^$prog: cannot access /$prog: /" out > t && mv t out -sed "s/^$prog: cannot read directory /$prog: /" out > t && mv t out -sed 's,d/no-x/y,d/no-x,' out > t && mv t out - -cat <<EOF > exp -$prog: 'd/no-x': Permission denied -EOF - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/du/no-x.sh b/tests/du/no-x.sh new file mode 100755 index 00000000..492bfa08 --- /dev/null +++ b/tests/du/no-x.sh @@ -0,0 +1,49 @@ +#!/bin/sh +# Make sure du gives the right diagnostic for a readable, +# but inaccessible directory. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ du +skip_if_root_ + +mkdir -p d/no-x/y || framework_failure_ +chmod u=rw d/no-x || framework_failure_ + + +# This must exit nonzero. +du d >/dev/null 2>out && fail=1 + +prog=du +# NOTE: this code is the same for all tests/*/no-x tests. +# Depending on whether fts is using native fdopendir, we see one +# of the following diagnostics (note also the /y suffix in one case): +# prog: 'd/no-x': Permission denied +# prog: cannot access 'd/no-x/y': Permission denied +# prog: cannot read directory 'd/no-x': Permission denied +# Convert either of the latter two to the first one. +sed "s/^$prog: cannot access /$prog: /" out > t && mv t out +sed "s/^$prog: cannot read directory /$prog: /" out > t && mv t out +sed 's,d/no-x/y,d/no-x,' out > t && mv t out + +cat <<EOF > exp +$prog: 'd/no-x': Permission denied +EOF + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/du/one-file-system b/tests/du/one-file-system deleted file mode 100755 index 110080f0..00000000 --- a/tests/du/one-file-system +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh -# Test for bugs in du's --one-file-system (-x) option. - -# Copyright (C) 2006-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ du -cleanup_() { rm -rf "$other_partition_tmpdir"; } -. "$abs_srcdir/other-fs-tmpdir" - -mkdir -p b/c y/z d "$other_partition_tmpdir/x" || framework_failure_ -ln -s "$other_partition_tmpdir/x" d || framework_failure_ - -# Due to a used-uninitialized variable, the "du -x" from coreutils-6.6 -# would not traverse into second and subsequent directories listed -# on the command line. -du -ax b y > t || fail=1 -sed 's/^[0-9][0-9]* //' t > out -cat <<\EOF > exp || fail=1 -b/c -b -y/z -y -EOF - -compare exp out || fail=1 - -# "du -xL" reported a zero count for a file in a different file system, -# instead of ignoring it. -du -xL d > u || fail=1 -sed 's/^[0-9][0-9]* //' u > out1 -echo d > exp1 || fail=1 -compare exp1 out1 || fail=1 - -# With coreutils-8.15, "du -xs FILE" would print no output. -touch f -for opt in -x -xs; do - du $opt f > u || fail=1 - sed 's/^[0-9][0-9]* //' u > out2 - echo f > exp2 || fail=1 - compare exp2 out2 || fail=1 -done - -Exit $fail diff --git a/tests/du/one-file-system.sh b/tests/du/one-file-system.sh new file mode 100755 index 00000000..f53b8853 --- /dev/null +++ b/tests/du/one-file-system.sh @@ -0,0 +1,57 @@ +#!/bin/sh +# Test for bugs in du's --one-file-system (-x) option. + +# Copyright (C) 2006-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ du +cleanup_() { rm -rf "$other_partition_tmpdir"; } +. "$abs_srcdir/tests/other-fs-tmpdir" + +mkdir -p b/c y/z d "$other_partition_tmpdir/x" || framework_failure_ +ln -s "$other_partition_tmpdir/x" d || framework_failure_ + +# Due to a used-uninitialized variable, the "du -x" from coreutils-6.6 +# would not traverse into second and subsequent directories listed +# on the command line. +du -ax b y > t || fail=1 +sed 's/^[0-9][0-9]* //' t > out +cat <<\EOF > exp || fail=1 +b/c +b +y/z +y +EOF + +compare exp out || fail=1 + +# "du -xL" reported a zero count for a file in a different file system, +# instead of ignoring it. +du -xL d > u || fail=1 +sed 's/^[0-9][0-9]* //' u > out1 +echo d > exp1 || fail=1 +compare exp1 out1 || fail=1 + +# With coreutils-8.15, "du -xs FILE" would print no output. +touch f +for opt in -x -xs; do + du $opt f > u || fail=1 + sed 's/^[0-9][0-9]* //' u > out2 + echo f > exp2 || fail=1 + compare exp2 out2 || fail=1 +done + +Exit $fail diff --git a/tests/du/restore-wd b/tests/du/restore-wd deleted file mode 100755 index 19ed5fa0..00000000 --- a/tests/du/restore-wd +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# 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-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ du - -mkdir a b || framework_failure_ - - -# With du from coreutils-4.5.5 and 4.5.6, this would fail with -# du: 'b': No such file or directory - -du a b > out || fail=1 - -Exit $fail diff --git a/tests/du/restore-wd.sh b/tests/du/restore-wd.sh new file mode 100755 index 00000000..5300554e --- /dev/null +++ b/tests/du/restore-wd.sh @@ -0,0 +1,31 @@ +#!/bin/sh +# 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. + +# This 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 + +mkdir a b || framework_failure_ + + +# With du from coreutils-4.5.5 and 4.5.6, this would fail with +# du: 'b': No such file or directory + +du a b > out || fail=1 + +Exit $fail diff --git a/tests/du/slash b/tests/du/slash deleted file mode 100755 index 95012411..00000000 --- a/tests/du/slash +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -# 'du /' would omit the '/' on the last line. - -# Copyright (C) 2003-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ du -require_readable_root_ - - -du --exclude='[^/]*' -x / > out-t || fail=1 -sed 's/^[0-9][0-9]* //' out-t > out -rm -f out-t -cat <<\EOF > exp -/ -EOF - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/du/slash.sh b/tests/du/slash.sh new file mode 100755 index 00000000..f0222784 --- /dev/null +++ b/tests/du/slash.sh @@ -0,0 +1,33 @@ +#!/bin/sh +# 'du /' would omit the '/' on the last line. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ du +require_readable_root_ + + +du --exclude='[^/]*' -x / > out-t || fail=1 +sed 's/^[0-9][0-9]* //' out-t > out +rm -f out-t +cat <<\EOF > exp +/ +EOF + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/du/slink b/tests/du/slink deleted file mode 100755 index 674e6a22..00000000 --- a/tests/du/slink +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh -# Ensure that the size of a long-named-symlink is > 0. - -# Copyright (C) 2002-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ du - -# Determine if '.' is on a local (would non-NFS be sufficient?) file system. -# At least on OSF/1 4.0d, when using an nfsv3 file system, -# each created symlink can end up having a size of 0. -require_local_dir_ - -if df --type=xfs . >/dev/null 2>&1; then - # At least on Irix-6.5.19, when using an xfs file system, - # each created symlink (name lengths up to 255) would have a size of '0'. - skip_ "'.' is on an XFS file system" -fi - -symlink_name_lengths='1 15 16 31 32 59 60 63 64 127 128 255 256 511 512 1024' -for len in $symlink_name_lengths; do - name=$(seq 1 $len|tr -c x y |head -c$len) - # Record the names of symlinks that are successfully created. - ln -fs $name $len > /dev/null 2>&1 \ - && symlinks="$symlinks $len" -done - -du -a $symlinks > out || fail=1 - -# Require that at least one of these symlinks has a non-zero size. -grep '^[1-9]' out > /dev/null || fail=1 - -Exit $fail diff --git a/tests/du/threshold.sh b/tests/du/threshold.sh new file mode 100644 index 00000000..ee5217db --- /dev/null +++ b/tests/du/threshold.sh @@ -0,0 +1,360 @@ +#!/bin/sh +# Exercise du's --threshold option. + +# Copyright (C) 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ du + +mkdir -p a/b a/c || framework_failure_ + +touch a/b/0 || framework_failure_ +printf '%1s' x > a/b/1 || framework_failure_ +printf '%2s' x > a/b/2 || framework_failure_ +printf '%3s' x > a/b/3 || framework_failure_ + +Ba=$(stat --format="%B * %b" a | xargs expr) +Bb=$(stat --format="%B * %b" a/b | xargs expr) +Bc=$(stat --format="%B * %b" a/c | xargs expr) +B0=$(stat --format="%B * %b" a/b/0 | xargs expr) +B1=$(stat --format="%B * %b" a/b/1 | xargs expr) +B2=$(stat --format="%B * %b" a/b/2 | xargs expr) +B3=$(stat --format="%B * %b" a/b/3 | xargs expr) + +Sa=$(stat --format=%s a ) +Sb=$(stat --format=%s a/b ) +Sc=$(stat --format=%s a/c ) +S0=$(stat --format=%s a/b/0) +S1=$(stat --format=%s a/b/1) +S2=$(stat --format=%s a/b/2) +S3=$(stat --format=%s a/b/3) + +Bb0123=$(expr $Bb + $B0 + $B1 + $B2 + $B3) +Sb0123=$(expr $Sb + $S0 + $S1 + $S2 + $S3) + +Bab0123=$(expr $Ba + $Bc + $Bb0123) +Sab0123=$(expr $Sa + $Sc + $Sb0123) + +# Sanity checks +test $Ba -gt 4 || skip_ "block size of a directory is smaller than 4 bytes" +test $Bc -gt 4 || skip_ "block size of an empty directory is smaller than 4 \ +bytes" +test $Sa -gt 4 || skip_ "apparent size of a directory is smaller than 4 bytes" +test $B1 -gt 4 || skip_ "block size of small file smaller than 4 bytes" +test $S3 -eq 3 || framework_failure_ +test $S2 -eq 2 || framework_failure_ +test $S1 -eq 1 || framework_failure_ +test $S0 -eq 0 || framework_failure_ +test $B0 -eq 0 || skip_ "block size of an empty file unequal Zero" +# block size of a/b/1 == a/b/2 +test $B1 -eq $B2 || framework_failure_ +# a is bigger than a/b. +test $Sab0123 -gt $Sb0123 || framework_failure_ +test $Bab0123 -gt $Bb0123 || framework_failure_ +# a/b is bigger than empty a/c. +test $Sb0123 -gt $Sc || framework_failure_ +test $Bb0123 -gt $Bc || framework_failure_ + +# Exercise a bad argument: unparsable number. +cat <<EOF > exp +du: invalid --threshold argument 'SIZE' +EOF +du --threshold=SIZE a > out 2>&1 && fail=1 +compare exp out || fail=1 + +cat <<EOF > exp +du: invalid -t argument 'SIZE' +EOF +du -t SIZE a > out 2>&1 && fail=1 +compare exp out || fail=1 + +# Exercise a bad argument: -0 is not valid. +cat <<EOF > exp +du: invalid --threshold argument '-0' +EOF +du --threshold=-0 a > out 2>&1 && fail=1 +compare exp out || fail=1 + +du -t -0 a > out 2>&1 && fail=1 +compare exp out || fail=1 + +du -t-0 a > out 2>&1 && fail=1 +compare exp out || fail=1 + +# Exercise a bad argument: empty argument. +cat <<EOF > exp +du: invalid --threshold argument '' +EOF +du --threshold= a > out 2>&1 && fail=1 +compare exp out || fail=1 + +# Exercise a bad argument: no argument. +du --threshold > out 2>&1 && fail=1 +cat <<EOF > exp +du: option '--threshold' requires an argument +Try 'du --help' for more information. +EOF +compare exp out || fail=1 +rm -f out + +dutest () +{ + args="$1" + exp="$2" + + rm -f exp out + + # Expected output. + if [ "$exp" = "" ] ; then + touch exp + else + printf "%s\n" $exp > exp + fi + + rc=0 + du -B1 $args a > out1 2>&1 || { cat out1 ; rc=1 ; } + + # Remove the size column and sort the output. + cut -f2- out1 | sort > out || framework_failure_ + + compare exp out || { cat out1 ; rc=1 ; } + return $rc +} + +# Check numbers around the total size of the main directory 'a'. +# One byte greater than 'a'. +s=$(expr $Sab0123 + 1) # apparent size +dutest "--app -t $s" '' || fail=1 +dutest "--app -a -t $s" '' || fail=1 +dutest "--app -S -t $s" '' || fail=1 +dutest "--app -a -S -t $s" '' || fail=1 +dutest "--app -t -$s" 'a a/b a/c' || fail=1 +dutest "--app -a -t -$s" 'a a/b a/b/0 a/b/1 a/b/2 a/b/3 a/c' || fail=1 +dutest "--app -S -t -$s" 'a a/b a/c' || fail=1 +dutest "--app -a -S -t -$s" 'a a/b a/b/0 a/b/1 a/b/2 a/b/3 a/c' || fail=1 +s=$(expr $Bab0123 + 1) # block size +dutest " -t $s" '' || fail=1 +dutest " -a -t $s" '' || fail=1 +dutest " -S -t $s" '' || fail=1 +dutest " -a -S -t $s" '' || fail=1 +dutest " -t -$s" 'a a/b a/c' || fail=1 +dutest " -a -t -$s" 'a a/b a/b/0 a/b/1 a/b/2 a/b/3 a/c' || fail=1 +dutest " -S -t -$s" 'a a/b a/c' || fail=1 +dutest " -a -S -t -$s" 'a a/b a/b/0 a/b/1 a/b/2 a/b/3 a/c' || fail=1 + +# Exactly the size of 'a'. +s=$Sab0123 # apparent size +dutest "--app --th=$s" 'a' || fail=1 +dutest "--app -a --th=$s" 'a' || fail=1 +dutest "--app -S --th=$s" '' || fail=1 +dutest "--app -a -S --th=$s" '' || fail=1 +dutest "--app --th=-$s" 'a a/b a/c' || fail=1 +dutest "--app -a --th=-$s" 'a a/b a/b/0 a/b/1 a/b/2 a/b/3 a/c' || fail=1 +dutest "--app -S --th=-$s" 'a a/b a/c' || fail=1 +dutest "--app -a -S --th=-$s" 'a a/b a/b/0 a/b/1 a/b/2 a/b/3 a/c' || fail=1 +s=$Bab0123 # block size +dutest " --th=$s" 'a' || fail=1 +dutest " -a --th=$s" 'a' || fail=1 +dutest " -S --th=$s" '' || fail=1 +dutest " -a -S --th=$s" '' || fail=1 +dutest " --th=-$s" 'a a/b a/c' || fail=1 +dutest " -a --th=-$s" 'a a/b a/b/0 a/b/1 a/b/2 a/b/3 a/c' || fail=1 +dutest " -S --th=-$s" 'a a/b a/c' || fail=1 +dutest " -a -S --th=-$s" 'a a/b a/b/0 a/b/1 a/b/2 a/b/3 a/c' || fail=1 + +# One byte smaller than 'a'. +s=$(expr $Sab0123 - 1) # apparent size +dutest "--app --th=$s" 'a' || fail=1 +dutest "--app -a --th=$s" 'a' || fail=1 +dutest "--app -S --th=$s" '' || fail=1 +dutest "--app -a -S --th=$s" '' || fail=1 +dutest "--app --th=-$s" 'a/b a/c' || fail=1 +dutest "--app -a --th=-$s" 'a/b a/b/0 a/b/1 a/b/2 a/b/3 a/c' || fail=1 +dutest "--app -S --th=-$s" 'a a/b a/c' || fail=1 +dutest "--app -a -S --th=-$s" 'a a/b a/b/0 a/b/1 a/b/2 a/b/3 a/c' || fail=1 +s=$(expr $Bab0123 - 1) # block size +dutest " --th=$s" 'a' || fail=1 +dutest " -a --th=$s" 'a' || fail=1 +dutest " -S --th=$s" '' || fail=1 +dutest " -a -S --th=$s" '' || fail=1 +dutest " --th=-$s" 'a/b a/c' || fail=1 +dutest " -a --th=-$s" 'a/b a/b/0 a/b/1 a/b/2 a/b/3 a/c' || fail=1 +dutest " -S --th=-$s" 'a a/b a/c' || fail=1 +dutest " -a -S --th=-$s" 'a a/b a/b/0 a/b/1 a/b/2 a/b/3 a/c' || fail=1 + + +# Check numbers around the total size of the sub directory 'a/b'. +# One byte greater than 'a/b'. +s=$(expr $Sb0123 + 1) # apparent size +dutest "--app --th=$s" 'a' || fail=1 +dutest "--app -a --th=$s" 'a' || fail=1 +dutest "--app -S --th=$s" '' || fail=1 +dutest "--app -a -S --th=$s" '' || fail=1 +dutest "--app --th=-$s" 'a/b a/c' || fail=1 +dutest "--app -a --th=-$s" 'a/b a/b/0 a/b/1 a/b/2 a/b/3 a/c' || fail=1 +dutest "--app -S --th=-$s" 'a a/b a/c' || fail=1 +dutest "--app -a -S --th=-$s" 'a a/b a/b/0 a/b/1 a/b/2 a/b/3 a/c' || fail=1 +s=$(expr $Bb0123 + 1) # block size +dutest " --th=$s" 'a' || fail=1 +dutest " -a --th=$s" 'a' || fail=1 +dutest " -S --th=$s" '' || fail=1 +dutest " -a -S --th=$s" '' || fail=1 +dutest " --th=-$s" 'a/b a/c' || fail=1 +dutest " -a --th=-$s" 'a/b a/b/0 a/b/1 a/b/2 a/b/3 a/c' || fail=1 +dutest " -S --th=-$s" 'a a/b a/c' || fail=1 +dutest " -a -S --th=-$s" 'a a/b a/b/0 a/b/1 a/b/2 a/b/3 a/c' || fail=1 + +# Exactly the size of 'a/b'. +s=$Sb0123 # apparent size +dutest "--app --th=$s" 'a a/b' || fail=1 +dutest "--app -a --th=$s" 'a a/b' || fail=1 +dutest "--app -S --th=$s" 'a/b' || fail=1 +dutest "--app -a -S --th=$s" 'a/b' || fail=1 +dutest "--app --th=-$s" 'a/b a/c' || fail=1 +dutest "--app -a --th=-$s" 'a/b a/b/0 a/b/1 a/b/2 a/b/3 a/c' || fail=1 +dutest "--app -S --th=-$s" 'a a/b a/c' || fail=1 +dutest "--app -a -S --th=-$s" 'a a/b a/b/0 a/b/1 a/b/2 a/b/3 a/c' || fail=1 +s=$Bb0123 # block size +dutest " --th=$s" 'a a/b' || fail=1 +dutest " -a --th=$s" 'a a/b' || fail=1 +dutest " -S --th=$s" 'a/b' || fail=1 +dutest " -a -S --th=$s" 'a/b' || fail=1 +dutest " --th=-$s" 'a/b a/c' || fail=1 +dutest " -a --th=-$s" 'a/b a/b/0 a/b/1 a/b/2 a/b/3 a/c' || fail=1 +dutest " -S --th=-$s" 'a a/b a/c' || fail=1 +dutest " -a -S --th=-$s" 'a a/b a/b/0 a/b/1 a/b/2 a/b/3 a/c' || fail=1 + +# One byte smaller than 'a/b'. +s=$(expr $Sb0123 - 1) # apparent size +dutest "--app --th=$s" 'a a/b' || fail=1 +dutest "--app -a --th=$s" 'a a/b' || fail=1 +dutest "--app -S --th=$s" 'a/b' || fail=1 +dutest "--app -a -S --th=$s" 'a/b' || fail=1 +dutest "--app --th=-$s" 'a/c' || fail=1 +dutest "--app -a --th=-$s" 'a/b/0 a/b/1 a/b/2 a/b/3 a/c' || fail=1 +dutest "--app -S --th=-$s" 'a a/c' || fail=1 +dutest "--app -a -S --th=-$s" 'a a/b/0 a/b/1 a/b/2 a/b/3 a/c' || fail=1 +s=$(expr $Bb0123 - 1) # block size +dutest " --th=$s" 'a a/b' || fail=1 +dutest " -a --th=$s" 'a a/b' || fail=1 +dutest " -S --th=$s" 'a/b' || fail=1 +dutest " -a -S --th=$s" 'a/b' || fail=1 +dutest " --th=-$s" 'a/c' || fail=1 +dutest " -a --th=-$s" 'a/b/0 a/b/1 a/b/2 a/b/3 a/c' || fail=1 +dutest " -S --th=-$s" 'a a/c' || fail=1 +dutest " -a -S --th=-$s" 'a a/b/0 a/b/1 a/b/2 a/b/3 a/c' || fail=1 + + +# Check numbers around the total size of the files a/b/[0123]'. +echo One byte greater than 'a/b/3'. +s=$(expr $S3 + 1) # apparent size +dutest "--app --th=$s" 'a a/b a/c' || fail=1 +dutest "--app -a --th=$s" 'a a/b a/c' || fail=1 +dutest "--app -S --th=$s" 'a a/b a/c' || fail=1 +dutest "--app -a -S --th=$s" 'a a/b a/c' || fail=1 +dutest "--app --th=-$s" '' || fail=1 +dutest "--app -a --th=-$s" 'a/b/0 a/b/1 a/b/2 a/b/3' || fail=1 +dutest "--app -S --th=-$s" '' || fail=1 +dutest "--app -a -S --th=-$s" 'a/b/0 a/b/1 a/b/2 a/b/3' || fail=1 +s=$(expr $B3 + 1) # block size +dutest " --th=$s" 'a a/b' || fail=1 +dutest " -a --th=$s" 'a a/b' || fail=1 +dutest " -S --th=$s" 'a/b' || fail=1 +dutest " -a -S --th=$s" 'a/b' || fail=1 +dutest " --th=-$s" 'a/c' || fail=1 +dutest " -a --th=-$s" 'a/b/0 a/b/1 a/b/2 a/b/3 a/c' || fail=1 +dutest " -S --th=-$s" 'a a/c' || fail=1 +dutest " -a -S --th=-$s" 'a a/b/0 a/b/1 a/b/2 a/b/3 a/c' || fail=1 + +# Exactly the size of 'a/b/3'. +echo Exactly the size of 'a/b/3'. +s=$S3 # apparent size +dutest "--app --th=$s" 'a a/b a/c' || fail=1 +dutest "--app -a --th=$s" 'a a/b a/b/3 a/c' || fail=1 +dutest "--app -S --th=$s" 'a a/b a/c' || fail=1 +dutest "--app -a -S --th=$s" 'a a/b a/b/3 a/c' || fail=1 +dutest "--app --th=-$s" '' || fail=1 +dutest "--app -a --th=-$s" 'a/b/0 a/b/1 a/b/2 a/b/3' || fail=1 +dutest "--app -S --th=-$s" '' || fail=1 +dutest "--app -a -S --th=-$s" 'a/b/0 a/b/1 a/b/2 a/b/3' || fail=1 +s=$B3 # block size +dutest " --th=$s" 'a a/b a/c' || fail=1 +dutest " -a --th=$s" 'a a/b a/b/1 a/b/2 a/b/3 a/c' || fail=1 +dutest " -S --th=$s" 'a a/b a/c' || fail=1 +dutest " -a -S --th=$s" 'a a/b a/b/1 a/b/2 a/b/3 a/c' || fail=1 +dutest " --th=-$s" 'a/c' || fail=1 +dutest " -a --th=-$s" 'a/b/0 a/b/1 a/b/2 a/b/3 a/c' || fail=1 +dutest " -S --th=-$s" 'a a/c' || fail=1 +dutest " -a -S --th=-$s" 'a a/b/0 a/b/1 a/b/2 a/b/3 a/c' || fail=1 + +# Exactly the size of 'a/b/2'. +echo Exactly the size of 'a/b/2'. +s=$S2 # apparent size +dutest "--app --th=$s" 'a a/b a/c' || fail=1 +dutest "--app -a --th=$s" 'a a/b a/b/2 a/b/3 a/c' || fail=1 +dutest "--app -S --th=$s" 'a a/b a/c' || fail=1 +dutest "--app -a -S --th=$s" 'a a/b a/b/2 a/b/3 a/c' || fail=1 +dutest "--app --th=-$s" '' || fail=1 +dutest "--app -a --th=-$s" 'a/b/0 a/b/1 a/b/2' || fail=1 +dutest "--app -S --th=-$s" '' || fail=1 +dutest "--app -a -S --th=-$s" 'a/b/0 a/b/1 a/b/2' || fail=1 +s=$B2 # block size +dutest " --th=$s" 'a a/b a/c' || fail=1 +dutest " -a --th=$s" 'a a/b a/b/1 a/b/2 a/b/3 a/c' || fail=1 +dutest " -S --th=$s" 'a a/b a/c' || fail=1 +dutest " -a -S --th=$s" 'a a/b a/b/1 a/b/2 a/b/3 a/c' || fail=1 +dutest " --th=-$s" 'a/c' || fail=1 +dutest " -a --th=-$s" 'a/b/0 a/b/1 a/b/2 a/b/3 a/c' || fail=1 +dutest " -S --th=-$s" 'a a/c' || fail=1 +dutest " -a -S --th=-$s" 'a a/b/0 a/b/1 a/b/2 a/b/3 a/c' || fail=1 + +# Exactly the size of 'a/b/1'. +echo Exactly the size of 'a/b/1'. +s=$S1 # apparent size +dutest "--app --th=$s" 'a a/b a/c' || fail=1 +dutest "--app -a --th=$s" 'a a/b a/b/1 a/b/2 a/b/3 a/c' || fail=1 +dutest "--app -S --th=$s" 'a a/b a/c' || fail=1 +dutest "--app -a -S --th=$s" 'a a/b a/b/1 a/b/2 a/b/3 a/c' || fail=1 +dutest "--app --th=-$s" '' || fail=1 +dutest "--app -a --th=-$s" 'a/b/0 a/b/1' || fail=1 +dutest "--app -S --th=-$s" '' || fail=1 +dutest "--app -a -S --th=-$s" 'a/b/0 a/b/1' || fail=1 +s=$B1 # block size +dutest " --th=$s" 'a a/b a/c' || fail=1 +dutest " -a --th=$s" 'a a/b a/b/1 a/b/2 a/b/3 a/c' || fail=1 +dutest " -S --th=$s" 'a a/b a/c' || fail=1 +dutest " -a -S --th=$s" 'a a/b a/b/1 a/b/2 a/b/3 a/c' || fail=1 +dutest " --th=-$s" 'a/c' || fail=1 +dutest " -a --th=-$s" 'a/b/0 a/b/1 a/b/2 a/b/3 a/c' || fail=1 +dutest " -S --th=-$s" 'a a/c' || fail=1 +dutest " -a -S --th=-$s" 'a a/b/0 a/b/1 a/b/2 a/b/3 a/c' || fail=1 + +# Exactly the size of 'a/b/0'. +echo Exactly the size of 'a/b/0'. +s=$S0 # apparent size +dutest "--app --th=$s" 'a a/b a/c' || fail=1 +dutest "--app -a --th=$s" 'a a/b a/b/0 a/b/1 a/b/2 a/b/3 a/c' || fail=1 +dutest "--app -S --th=$s" 'a a/b a/c' || fail=1 +dutest "--app -a -S --th=$s" 'a a/b a/b/0 a/b/1 a/b/2 a/b/3 a/c' || fail=1 +# (maximum tests (-0) not possible). +s=$B0 # block size +dutest " --th=$s" 'a a/b a/c' || fail=1 +dutest " -a --th=$s" 'a a/b a/b/0 a/b/1 a/b/2 a/b/3 a/c' || fail=1 +dutest " -S --th=$s" 'a a/b a/c' || fail=1 +dutest " -a -S --th=$s" 'a a/b a/b/0 a/b/1 a/b/2 a/b/3 a/c' || fail=1 +# (maximum tests (-0) not possible). + +Exit $fail diff --git a/tests/du/trailing-slash b/tests/du/trailing-slash deleted file mode 100755 index 4efda6c7..00000000 --- a/tests/du/trailing-slash +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh -# 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-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 -# 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/>. - -# Before coreutils-4.5.3, it would remove a single trailing slash. - -. "${srcdir=.}/init.sh"; path_prepend_ ../src -print_ver_ du - -mkdir -p dir/1/2 || framework_failure_ -ln -s dir slink || framework_failure_ - - -du slink/ | sed 's/^[0-9][0-9]* //' > out -echo === >> out - -# Ensure that with -L we get the same results (modulo the trailing slash -# on the third line) even without the trailing slash on the command line. -du -L slink | sed 's/^[0-9][0-9]* //' >> out -cat <<\EOF > exp -slink/1/2 -slink/1 -slink/ -=== -slink/1/2 -slink/1 -slink -EOF - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/du/trailing-slash.sh b/tests/du/trailing-slash.sh new file mode 100755 index 00000000..9fc51237 --- /dev/null +++ b/tests/du/trailing-slash.sh @@ -0,0 +1,47 @@ +#!/bin/sh +# 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. + +# This 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/>. + +# Before coreutils-4.5.3, it would remove a single trailing slash. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ du + +mkdir -p dir/1/2 || framework_failure_ +ln -s dir slink || framework_failure_ + + +du slink/ | sed 's/^[0-9][0-9]* //' > out +echo === >> out + +# Ensure that with -L we get the same results (modulo the trailing slash +# on the third line) even without the trailing slash on the command line. +du -L slink | sed 's/^[0-9][0-9]* //' >> out +cat <<\EOF > exp +slink/1/2 +slink/1 +slink/ +=== +slink/1/2 +slink/1 +slink +EOF + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/du/two-args b/tests/du/two-args deleted file mode 100755 index 10c0a057..00000000 --- a/tests/du/two-args +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -# Make sure 'du d/1 d/2' works. -# That command failed with du from fileutils-4.0q. - -# Copyright (C) 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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ du - -# Run this test from a sub-directory one level deeper than normal, -# so that the "du .." below doesn't traverse sibling directories -# that may be inaccessible due concurrently-running tests. -mkdir sub || framework_failure_ -cd sub || framework_failure_ - -t=t -mkdir -p $t/1 $t/2 || framework_failure_ - -test -d $t || fail=1 -du $t/1 $t/2 > /dev/null || fail=1 - -# Make sure 'du . $t' and 'du .. $t' work. -# These would fail prior to fileutils-4.0y. -du . $t > /dev/null || fail=1 -du .. $t > /dev/null || fail=1 - -Exit $fail diff --git a/tests/du/two-args.sh b/tests/du/two-args.sh new file mode 100755 index 00000000..f3dea761 --- /dev/null +++ b/tests/du/two-args.sh @@ -0,0 +1,40 @@ +#!/bin/sh +# 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. + +# This 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 + +# Run this test from a sub-directory one level deeper than normal, +# so that the "du .." below doesn't traverse sibling directories +# that may be inaccessible due concurrently-running tests. +mkdir sub || framework_failure_ +cd sub || framework_failure_ + +t=t +mkdir -p $t/1 $t/2 || framework_failure_ + +test -d $t || fail=1 +du $t/1 $t/2 > /dev/null || fail=1 + +# Make sure 'du . $t' and 'du .. $t' work. +# These would fail prior to fileutils-4.0y. +du . $t > /dev/null || fail=1 +du .. $t > /dev/null || fail=1 + +Exit $fail diff --git a/tests/envvar-check b/tests/envvar-check index 5bf9343d..3846caea 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-2012 Free Software Foundation, Inc. +# Copyright (C) 2000-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 diff --git a/tests/factor/create-test.sh b/tests/factor/create-test.sh new file mode 100755 index 00000000..c81a8283 --- /dev/null +++ b/tests/factor/create-test.sh @@ -0,0 +1,83 @@ +#!/bin/sh +# Create the factor test scripts. + +# Copyright (C) 2012-2013 Free Software Foundation, Inc. + +test_name=$1 +template=$2 + +# Extract the test name: remove .sh suffix from the basename. +t=`echo "$test_name"|sed 's,.*/,,;s,\.sh$,,'` + +# prefix of 2^64 +p=184467440737 + +# prefix of 2^96 +q=79228162514264337593543 + +# Each of these numbers has a Pollard rho factor larger than 2^64, +# and thus exercises some hard-to-reach code in factor.c. +t1=170141183460469225450570946617781744489 +t2=170141183460469229545748130981302223887 + +# Factors of the above: +# t1: 9223372036854775421 18446744073709551709 +# t2: 9223372036854775643 18446744073709551709 + +# Each test is a triple: lo, hi, sha1 of result. +# The test script, run.sh, runs seq lo hi|factor|sha1sum +# and verifies that the actual and expected checksums are the same. +# New tests must be added to tests/local.mk (factor_tests), too. +case $t in + t00) set 0 10000000 a451244522b1b662c86cb3cbb55aee3e085a61a0 ;; + t01) set 10000000 20000000 c792a2e02f1c8536b5121f624b04039d20187016 ;; + t02) set 20000000 30000000 8115e8dff97d1674134ec054598d939a2a5f6113 ;; + t03) set 30000000 40000000 fe7b832c8e0ed55035152c0f9ebd59de73224a60 ;; + t04) set 40000000 50000000 b8786d66c432e48bc5b342ee3c6752b7f096f206 ;; + t05) set 50000000 60000000 a74fe518c5f79873c2b9016745b88b42c8fd3ede ;; + t06) set 60000000 70000000 689bc70d681791e5d1b8ac1316a05d0c4473d6db ;; + t07) set 70000000 80000000 d370808f2ab8c865f64c2ff909c5722db5b7d58d ;; + t08) set 80000000 90000000 7978aa66bf2bdb446398336ea6f02605e9a77581 ;; + t09) set $t1 $t1 4622287c5f040cdb7b3bbe4d19d29a71ab277827 ;; + t10) set $t2 $t2 dea308253708b57afad357e8c0d2a111460ef50e ;; + t11) set ${p}08551616 ${p}08651615 66c57cd58f4fb572df7f088d17e4f4c1d4f01bb1 ;; + t12) set ${p}08651616 ${p}08751615 729228e693b1a568ecc85b199927424c7d16d410 ;; + t13) set ${p}08751616 ${p}08851615 5a0c985017c2d285e4698f836f5a059e0b684563 ;; + t14) set ${p}08851616 ${p}08951615 0482295c514e371c98ce9fd335deed0c9c44a4f4 ;; + t15) set ${p}08951616 ${p}09051615 9c0e1105ac7c45e27e7bbeb5e213f530d2ad1a71 ;; + t16) set ${p}09051616 ${p}09151615 604366d2b1d75371d0679e6a68962d66336cd383 ;; + t17) set ${p}09151616 ${p}09251615 9192d2bdee930135b28d7160e6d395a7027871da ;; + t18) set ${p}09251616 ${p}09351615 bcf56ae55d20d700690cff4d3327b78f83fc01bf ;; + t19) set ${p}09351616 ${p}09451615 16b106398749e5f24d278ba7c58229ae43f650ac ;; + t20) set ${p}09451616 ${p}09551615 ad2c6ed63525f8e7c83c4c416e7715fa1bebc54c ;; + t21) set ${p}09551616 ${p}09651615 2b6f9c11742d9de045515a6627c27a042c49f8ba ;; + t22) set ${p}09651616 ${p}09751615 54851acd51c4819beb666e26bc0100dc9adbc310 ;; + t23) set ${p}09751616 ${p}09851615 6939c2a7afd2d81f45f818a159b7c5226f83a50b ;; + t24) set ${p}09851616 ${p}09951615 0f2c8bc011d2a45e2afa01459391e68873363c6c ;; + t25) set ${p}09951616 ${p}10051615 630dc2ad72f4c222bad1405e6c5bea590f92a98c ;; + t26) set ${q}940336 ${q}942335 63cbd6313d78247b04d63bbbac50cb8f8d33ff71 ;; + t27) set ${q}942336 ${q}944335 0d03d63653767173182491b86fa18f8f680bb036 ;; + t28) set ${q}944336 ${q}946335 ca43bd38cd9f97cc5bb63613cb19643578640f0b ;; + t29) set ${q}946336 ${q}948335 86d59545a0c13567fa96811821ea5cde950611b1 ;; + t30) set ${q}948336 ${q}950335 c3740e702fa9c97e6cf00150860e0b936a141a6b ;; + t31) set ${q}950336 ${q}952335 551c3c4c4640d86fda311b5c3006dac45505c0ce ;; + t32) set ${q}952336 ${q}954335 b1b0b00463c2f853d70ef9c4f7a96de5cb614156 ;; + t33) set ${q}954336 ${q}956335 8938a484a9ef6bb16478091d294fcde9f8ecea69 ;; + t34) set ${q}956336 ${q}958335 d1ae6bc712d994f35edf55c785d71ddf31f16535 ;; + t35) set ${q}958336 ${q}960335 2374919a89196e1fce93adfe779cb4664556d4b6 ;; + t36) set ${q}960336 ${q}962335 569e4363e8d9e8830a187d9ab27365eef08abde1 ;; + *) + echo "$0: error: unknown test: '$test_name' -> '$t'" >&2 + exit 1 + ;; +esac + +TEMPLATE="TEST SCRIPT DERIVED FROM THE TEMPLATE $template" + +# Create the test script from the template for this test +# by substituting the START, the END and the CKSUM. +exec sed \ + -e "s/__START__/$1/" \ + -e "s/__END__/$2/" \ + -e "s/__CKSUM__/$3/" \ + -e "s!__TEMPLATE__!$TEMPLATE!" "$template" diff --git a/tests/factor/run.sh b/tests/factor/run.sh new file mode 100644 index 00000000..dfe11648 --- /dev/null +++ b/tests/factor/run.sh @@ -0,0 +1,32 @@ +#!/bin/sh + +# === THIS IS A __TEMPLATE__ === + +# Test the factor rewrite. +# The test is to run this command +# seq $START $END | factor | shasum -c --status <(echo $CKSUM -) +# I.e., to ensure that the factorizations of integers $1..$2 +# match what we expect. +# +# See: tests/factor/create-test.sh + +# Copyright (C) 2012-2013 Free Software Foundation, Inc. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src + +# Don't run these tests by default. +very_expensive_ + +print_ver_ factor seq sha1sum + +# Template variables. +START=__START__ + END=__END__ +CKSUM=__CKSUM__ + +echo "$CKSUM -" > exp + +f=1 +seq $START $END | factor | sha1sum -c --status exp && f=0 + +Exit $f diff --git a/tests/fmt/base b/tests/fmt/base deleted file mode 100755 index e94d6134..00000000 --- a/tests/fmt/base +++ /dev/null @@ -1,64 +0,0 @@ -#!/usr/bin/perl -# Basic tests for "fmt". - -# Copyright (C) 2001-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 -# 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; - -(my $program_name = $0) =~ s|.*/||; - -my @Tests = - ( - ['8-bit-pfx', qw (-p 'ç'), - {IN=> "ça\nçb\n"}, - {OUT=>"ça b\n"}], - ['wide-1', '-w 32768', - {ERR => "fmt: invalid width: '32768'\n"}, {EXIT => 1}], - ['wide-2', '-w 2147483647', - {ERR => "fmt: invalid width: '2147483647'\n"}, {EXIT => 1}], - ['bad-suffix', '-72x', {IN=> ''}, - {ERR => "fmt: invalid width: '72x'\n"}, {EXIT => 1}], - ['no-file', 'no-such-file', - {ERR => "fmt: cannot open 'no-such-file' for reading:" - . " No such file or directory\n"}, {EXIT => 1}], - ['obs-1', '-c -72', - {ERR => "fmt: invalid option -- 7; -WIDTH is recognized only when it" - . " is the first\noption; use -w N instead\n" - . "Try 'fmt --help' for more information.\n" }, {EXIT => 1}], - - # With --prefix=P, do not remove leading space on lines without the prefix. - ['pfx-1', qw (-p '>'), - {IN=> " 1\n 2\n\t3\n\t\t4\n> quoted\n> text\n"}, - {OUT=> " 1\n 2\n\t3\n\t\t4\n> quoted text\n"}], - - # Don't remove prefix from a prefix-only line. - ['pfx-only', qw (-p '>'), - {IN=> ">\n"}, - {OUT=> ">\n"}], - - # With a multi-byte prefix, say, "foo", don't empty a line that - # starts with a strict prefix (e.g. "fo") of that prefix. - # With fmt from coreutils-6.7, it would mistakenly output an empty line. - ['pfx-of-pfx', qw (-p 'foo'), - {IN=> "fo\n"}, - {OUT=> "fo\n"}], -); - -my $save_temps = $ENV{DEBUG}; -my $verbose = $ENV{VERBOSE}; -my $prog = 'fmt'; -my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); -exit $fail; diff --git a/tests/fmt/base.pl b/tests/fmt/base.pl new file mode 100755 index 00000000..d74c1643 --- /dev/null +++ b/tests/fmt/base.pl @@ -0,0 +1,64 @@ +#!/usr/bin/perl +# Basic tests for "fmt". + +# Copyright (C) 2001-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/>. + +use strict; + +(my $program_name = $0) =~ s|.*/||; + +my @Tests = + ( + ['8-bit-pfx', qw (-p 'ç'), + {IN=> "ça\nçb\n"}, + {OUT=>"ça b\n"}], + ['wide-1', '-w 32768', + {ERR => "fmt: invalid width: '32768'\n"}, {EXIT => 1}], + ['wide-2', '-w 2147483647', + {ERR => "fmt: invalid width: '2147483647'\n"}, {EXIT => 1}], + ['bad-suffix', '-72x', {IN=> ''}, + {ERR => "fmt: invalid width: '72x'\n"}, {EXIT => 1}], + ['no-file', 'no-such-file', + {ERR => "fmt: cannot open 'no-such-file' for reading:" + . " No such file or directory\n"}, {EXIT => 1}], + ['obs-1', '-c -72', + {ERR => "fmt: invalid option -- 7; -WIDTH is recognized only when it" + . " is the first\noption; use -w N instead\n" + . "Try 'fmt --help' for more information.\n" }, {EXIT => 1}], + + # With --prefix=P, do not remove leading space on lines without the prefix. + ['pfx-1', qw (-p '>'), + {IN=> " 1\n 2\n\t3\n\t\t4\n> quoted\n> text\n"}, + {OUT=> " 1\n 2\n\t3\n\t\t4\n> quoted text\n"}], + + # Don't remove prefix from a prefix-only line. + ['pfx-only', qw (-p '>'), + {IN=> ">\n"}, + {OUT=> ">\n"}], + + # With a multi-byte prefix, say, "foo", don't empty a line that + # starts with a strict prefix (e.g. "fo") of that prefix. + # With fmt from coreutils-6.7, it would mistakenly output an empty line. + ['pfx-of-pfx', qw (-p 'foo'), + {IN=> "fo\n"}, + {OUT=> "fo\n"}], +); + +my $save_temps = $ENV{DEBUG}; +my $verbose = $ENV{VERBOSE}; +my $prog = 'fmt'; +my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); +exit $fail; diff --git a/tests/fmt/goal-option b/tests/fmt/goal-option deleted file mode 100755 index 2efb8c5c..00000000 --- a/tests/fmt/goal-option +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh -# Exercise the fmt -g option. - -# Copyright (C) 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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ fmt - -cat <<\_EOF_ > base || fail=1 - -@command{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 @dfn{sentence break} is defined as either the end of a -paragraph or a word ending in any of @samp{.?!}, followed by two spaces or end -of line, ignoring any intervening parentheses or quotes. Like @TeX{}, -@command{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'', -@cite{Software---Practice & Experience} -@b{11}, 11 (November 1981), 1119--1184. -_EOF_ - -fmt -g 60 -w 72 base > out || fail=1 - -cat <<\_EOF_ > exp - -@command{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 @dfn{sentence break} -is defined as either the end of a paragraph or a word ending -in any of @samp{.?!}, followed by two spaces or end of line, -ignoring any intervening parentheses or quotes. Like @TeX{}, -@command{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'', @cite{Software---Practice & Experience} @b{11}, 11 -(November 1981), 1119--1184. -_EOF_ - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/fmt/goal-option.sh b/tests/fmt/goal-option.sh new file mode 100755 index 00000000..6f7b0e6c --- /dev/null +++ b/tests/fmt/goal-option.sh @@ -0,0 +1,56 @@ +#!/bin/sh +# Exercise the fmt -g option. + +# Copyright (C) 2012-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ fmt + +cat <<\_EOF_ > base || fail=1 + +@command{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 @dfn{sentence break} is defined as either the end of a +paragraph or a word ending in any of @samp{.?!}, followed by two spaces or end +of line, ignoring any intervening parentheses or quotes. Like @TeX{}, +@command{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'', +@cite{Software---Practice & Experience} +@b{11}, 11 (November 1981), 1119--1184. +_EOF_ + +fmt -g 60 -w 72 base > out || fail=1 + +cat <<\_EOF_ > exp + +@command{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 @dfn{sentence break} +is defined as either the end of a paragraph or a word ending +in any of @samp{.?!}, followed by two spaces or end of line, +ignoring any intervening parentheses or quotes. Like @TeX{}, +@command{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'', @cite{Software---Practice & Experience} @b{11}, 11 +(November 1981), 1119--1184. +_EOF_ + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/fmt/long-line b/tests/fmt/long-line deleted file mode 100755 index 04674e20..00000000 --- a/tests/fmt/long-line +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -# make sure fmt -s works even on long lines - -# Copyright (C) 2002-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ fmt - -printf '%2030s\n' ' '|sed 's/../ y/g' > in || framework_failure_ - -cat <<\EOF > exp || framework_failure_ - y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y - y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y - y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y - y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y - y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y - y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y - y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y - y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y - y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y - y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y - y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y - y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y - y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y - y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y - y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y - y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y - y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y - y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y - y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y - y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y - y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y - y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y - y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y - y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y - y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y - y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y - y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y - y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y - y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y -EOF - - -fmt -s in > out || fail=1 - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/fmt/long-line.sh b/tests/fmt/long-line.sh new file mode 100755 index 00000000..60f4a17e --- /dev/null +++ b/tests/fmt/long-line.sh @@ -0,0 +1,61 @@ +#!/bin/sh +# make sure fmt -s works even on long lines + +# Copyright (C) 2002-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ fmt + +printf '%2030s\n' ' '|sed 's/../ y/g' > in || framework_failure_ + +cat <<\EOF > exp || framework_failure_ + y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y + y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y + y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y + y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y + y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y + y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y + y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y + y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y + y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y + y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y + y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y + y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y + y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y + y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y + y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y + y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y + y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y + y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y + y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y + y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y + y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y + y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y + y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y + y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y + y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y + y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y + y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y + y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y + y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y y +EOF + + +fmt -s in > out || fail=1 + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/id/gnu-zero-uids b/tests/id/gnu-zero-uids deleted file mode 100755 index 6ca8dc65..00000000 --- a/tests/id/gnu-zero-uids +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# On GNU, 'id' must fail for processes with zero UIDs. - -# Copyright (C) 2011-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ id - -require_gnu_ - -sush - true || skip_ "the 'sush' command does not work" - -# Run 'id' with zero UIDs. It should exit with a non-zero status. -sush - id > out && fail=1 - -Exit $fail diff --git a/tests/id/gnu-zero-uids.sh b/tests/id/gnu-zero-uids.sh new file mode 100755 index 00000000..1b8739e1 --- /dev/null +++ b/tests/id/gnu-zero-uids.sh @@ -0,0 +1,29 @@ +#!/bin/sh +# On GNU, 'id' must fail for processes with zero UIDs. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ id + +require_gnu_ + +sush - true || skip_ "the 'sush' command does not work" + +# Run 'id' with zero UIDs. It should exit with a non-zero status. +sush - id > out && fail=1 + +Exit $fail diff --git a/tests/id/no-context b/tests/id/no-context deleted file mode 100755 index 94111b84..00000000 --- a/tests/id/no-context +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# With POSIXLY_CORRECT, id must not print context=... - -# Copyright (C) 2009-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ id - -# We don't need selinux *FS* support to test id, -# but this is as good a witness as any, in general. -require_selinux_ - - -# Require the context=... part by default. -id > out || fail=1 -grep context= out || fail=1 - -# Require no context=... part in conforming mode. -POSIXLY_CORRECT=1 id > out || fail=1 -grep context= out && fail=1 - -Exit $fail diff --git a/tests/id/no-context.sh b/tests/id/no-context.sh new file mode 100755 index 00000000..7038beb2 --- /dev/null +++ b/tests/id/no-context.sh @@ -0,0 +1,35 @@ +#!/bin/sh +# With POSIXLY_CORRECT, id must not print context=... + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ id + +# We don't need selinux *FS* support to test id, +# but this is as good a witness as any, in general. +require_selinux_ + + +# Require the context=... part by default. +id > out || fail=1 +grep context= out || fail=1 + +# Require no context=... part in conforming mode. +POSIXLY_CORRECT=1 id > out || fail=1 +grep context= out && fail=1 + +Exit $fail diff --git a/tests/init.cfg b/tests/init.cfg deleted file mode 100644 index 2e43c162..00000000 --- a/tests/init.cfg +++ /dev/null @@ -1,533 +0,0 @@ -# This file is sourced by init.sh, *before* its initialization. - -# Copyright (C) 2010-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 -# 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 goes hand in hand with the "exec 9>&2;" in tests/Makefile.am's -# TESTS_ENVIRONMENT definition. -stderr_fileno_=9 - -# Having an unsearchable directory in PATH causes execve to fail with EACCES -# when applied to an unresolvable program name, contrary to the desired ENOENT. -# Avoid the problem by rewriting PATH to exclude unsearchable directories. -# Also, if PATH lacks /sbin and/or /usr/sbin, append it/them. -sanitize_path_() -{ - # FIXME: remove double quotes around $IFS when all tests use init.sh. - # They constitute a work-around for a bug in FreeBSD 8.1's /bin/sh. - local saved_IFS="$IFS" - IFS=: - set -- $PATH - IFS=$saved_IFS - - local d d1 - local colon= - local new_path= - for d in "$@"; do - test -z "$d" && d1=. || d1=$d - if ls -d "$d1/." > /dev/null 2>&1; then - new_path="$new_path$colon$d" - colon=':' - fi - done - - for d in /sbin /usr/sbin ; do - case ":$new_path:" in - *:$d:*) ;; - *) new_path="$new_path:$d" ;; - esac - done - - PATH=$new_path - export PATH -} - -getlimits_() -{ - eval $(getlimits) - test "$INT_MAX" || fatal_ "running getlimits" -} - -require_acl_() -{ - getfacl --version < /dev/null > /dev/null 2>&1 \ - && setfacl --version < /dev/null > /dev/null 2>&1 \ - || skip_ "This test requires getfacl and setfacl." - - id -u bin > /dev/null 2>&1 \ - || skip_ "This test requires a local user named bin." -} - -is_local_dir_() -{ - test $# = 1 || framework_failure_ - df --local "$1" >/dev/null 2>&1 -} - -require_local_dir_() -{ - is_local_dir_ . || - skip_ "This test must be run on a local file system." -} - -# Skip this test if we're not in SELinux "enforcing" mode. -require_selinux_enforcing_() -{ - test "$(getenforce)" = Enforcing \ - || skip_ "This test is useful only with SELinux in Enforcing mode." -} - -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' - - _skip=yes - grep '^#define HAVE_OPENAT' "$CONFIG_HEADER" > /dev/null && _skip=no - test -d /proc/self/fd && _skip=no - if test $_skip = yes; then - skip_ 'this system lacks openat support' - fi -} - -require_ulimit_() -{ - ulimit_works=yes - # Expect to be able to exec a program in 10MB of virtual memory, - # but not in 20KB. I chose "date". It must not be a shell built-in - # function, so you can't use echo, printf, true, etc. - # Of course, in coreutils, I could use $top_builddir/src/true, - # but this should be able to work for other projects, too. - ( ulimit -v 10000; date ) > /dev/null 2>&1 || ulimit_works=no - ( ulimit -v 20; date ) > /dev/null 2>&1 && ulimit_works=no - - test $ulimit_works = no \ - && skip_ "this shell lacks ulimit support" -} - -require_readable_root_() -{ - test -r / || skip_ "/ is not readable" -} - -# Skip the current test if strace is not available or doesn't work -# with the named syscall. Usage: require_strace_ unlink -require_strace_() -{ - test $# = 1 || framework_failure_ - - strace -V < /dev/null > /dev/null 2>&1 || - skip_ 'no strace program' - - strace -qe "$1" echo > /dev/null 2>&1 || - skip_ 'strace -qe "'"$1"'" does not work' - - # On some linux/sparc64 systems, strace works fine on 32-bit executables, - # but prints only one line of output for every 64-bit executable. - strace -o log-help ls --help >/dev/null || framework_failure_ - n_lines_help=$(wc -l < log-help) - rm -f log-help - if test $n_lines_help = 0 || test $n_lines_help = 1; then - skip_ 'strace produces no more than one line of output' - fi -} - -require_setfacl_() -{ - setfacl -m user::rwx . \ - || skip_ "setfacl does not work on the current file system" -} - -# Require a controlling input 'terminal'. -require_controlling_input_terminal_() -{ - tty -s || have_input_tty=no - test -t 0 || have_input_tty=no - if test "$have_input_tty" = no; then - skip_ 'requires controlling input terminal -This test must have a controlling input "terminal", so it may not be -run via "batch", "at", or "ssh". On some systems, it may not even be -run in the background.' - fi -} - -require_built_() -{ - skip_=no - for i in "$@"; do - case " $built_programs " in - *" $i "*) ;; - *) echo "$i: not built" 1>&2; skip_=yes ;; - esac - done - - test $skip_ = yes && skip_ "required program(s) not built" -} - -require_file_system_bytes_free_() -{ - local req=$1 - local expr=$(stat -f --printf "$req / %S <= %a" .) - awk "BEGIN{ exit !($expr) }" \ - || skip_ "this test needs at least $req bytes of free space" -} - -uid_is_privileged_() -{ - # Make sure id -u succeeds. - my_uid=$(id -u) \ - || { echo "$0: cannot run 'id -u'" 1>&2; return 1; } - - # Make sure it gives valid output. - case $my_uid in - 0) ;; - *[!0-9]*) - echo "$0: invalid output ('$my_uid') from 'id -u'" 1>&2 - return 1 ;; - *) return 1 ;; - esac -} - -get_process_status_() -{ - sed -n '/^State:[ ]*\([[:alpha:]]\).*/s//\1/p' /proc/$1/status -} - -# Convert an ls-style permission string, like drwxr----x and -rw-r-x-wx -# to the equivalent chmod --mode (-m) argument, (=,u=rwx,g=r,o=x and -# =,u=rw,g=rx,o=wx). Ignore ACLs. -rwx_to_mode_() -{ - case $# in - 1) rwx=$1;; - *) echo "$0: wrong number of arguments" 1>&2 - echo "Usage: $0 ls-style-mode-string" 1>&2 - return;; - esac - - case $rwx in - [ld-][rwx-][rwx-][rwxsS-][rwx-][rwx-][rwxsS-][rwx-][rwx-][rwxtT-]) ;; - [ld-][rwx-][rwx-][rwxsS-][rwx-][rwx-][rwxsS-][rwx-][rwx-][rwxtT-][+.]) ;; - *) echo "$0: invalid mode string: $rwx" 1>&2; return;; - esac - - # Perform these conversions: - # S s - # s xs - # T t - # t xt - # The 'T' and 't' ones are only valid for 'other'. - s='s/S/@/;s/s/x@/;s/@/s/' - t='s/T/@/;s/t/x@/;s/@/t/' - - u=$(echo $rwx|sed 's/^.\(...\).*/,u=\1/;s/-//g;s/^,u=$//;'$s) - g=$(echo $rwx|sed 's/^....\(...\).*/,g=\1/;s/-//g;s/^,g=$//;'$s) - o=$(echo $rwx|sed 's/^.......\(...\).*/,o=\1/;s/-//g;s/^,o=$//;'$s';'$t) - echo "=$u$g$o" -} - -# Set the global variable stty_reversible_ to a space-separated list of the -# reversible settings from stty.c. stty_reversible_ also starts and ends -# with a space. -stty_reversible_init_() -{ - # Pad start with one space for the first option to match in query function. - stty_reversible_=' '$(perl -lne '/^ *{"(.*?)",.*\bREV\b/ and print $1' \ - $abs_top_srcdir/src/stty.c | tr '\n' ' ') - # Ensure that there are at least 62, i.e., so we're alerted if - # reformatting the source empties the list. - test 62 -le $(echo "$stty_reversible_"|wc -w) \ - || framework_failure_ "too few reversible settings" -} - -# Test whether $1 is one of stty's reversible options. -stty_reversible_query_() -{ - case $stty_reversible_ in - '') - framework_failure_ "stty_reversible_init_() not called?";; - *" $1 "*) - return 0;; - *) - return 1;; - esac -} - -skip_if_() -{ - case $1 in - root) skip_ must be run as root ;; - non-root) skip_ must be run as non-root ;; - *) ;; # FIXME? - 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 - skip_ 'very expensive: disabled by default -This test is very expensive, so it is disabled by default. -To run it anyway, rerun make check with the RUN_VERY_EXPENSIVE_TESTS -environment variable set to yes. E.g., - - env RUN_VERY_EXPENSIVE_TESTS=yes make check - -or use the shortcut target of the toplevel Makefile, - - make check-very-expensive -' - fi -} - -expensive_() -{ - if test "$RUN_EXPENSIVE_TESTS" != yes; then - skip_ 'expensive: disabled by default -This test is relatively expensive, so it is disabled by default. -To run it anyway, rerun make check with the RUN_EXPENSIVE_TESTS -environment variable set to yes. E.g., - - env RUN_EXPENSIVE_TESTS=yes make check - -or use the shortcut target of the toplevel Makefile, - - make check-expensive -' - fi -} - -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)} -} - -skip_if_root_() { uid_is_privileged_ && skip_ "must be run as non-root"; } - -# Set 'groups' to a space-separated list of at least two groups -# of which the user is a member. -require_membership_in_two_groups_() -{ - test $# = 0 || framework_failure_ - - groups=${COREUTILS_GROUPS-$( (id -G || /usr/xpg4/bin/id -G) 2>/dev/null)} - case "$groups" in - *' '*) ;; - *) skip_ 'requires membership in two groups -this test requires that you be a member of more than one group, -but running 'id -G'\'' either failed or found just one. If you really -are a member of at least two groups, then rerun this test with -COREUTILS_GROUPS set in your environment to the space-separated list -of group names or numbers. E.g., - - env COREUTILS_GROUPS='\''users cdrom'\'' make check - -' - ;; - esac -} - -# Is /proc/$PID/status supported? -require_proc_pid_status_() -{ - sleep 2 & - local pid=$! - sleep .5 - grep '^State:[ ]*[S]' /proc/$pid/status > /dev/null 2>&1 || - skip_ "/proc/$pid/status: missing or 'different'" - kill $pid -} - -# Return nonzero if the specified path is on a file system for -# which FIEMAP support exists. Note some file systems (like ext3 and btrfs) -# only support FIEMAP for files, not directories. -fiemap_capable_() -{ - if ! python < /dev/null; then - warn_ 'fiemap_capable_: python missing: assuming not fiemap capable' - return 1 - fi - python $abs_srcdir/fiemap-capable "$@" -} - -# Skip the current test if "." lacks d_type support. -require_dirent_d_type_() -{ - python < /dev/null \ - || skip_ python missing: assuming no d_type support - - # Manually exclude xfs, since the test would mistakenly report - # that it has d_type support: d_type == DT_DIR for "." and "..", - # but DT_UNKNOWN for all other types. - df -x xfs . > /dev/null 2>&1 \ - || skip_ requires d_type support - - python $abs_srcdir/d_type-check \ - || skip_ requires d_type support -} - -# Skip the current test if we lack Perl. -require_perl_() -{ - : ${PERL=perl} - $PERL -e 'use warnings' > /dev/null 2>&1 \ - || skip_ 'configure did not find a usable version of Perl' -} - -# Does the current (working-dir) file system support sparse files? -require_sparse_support_() -{ - test $# = 0 || framework_failure_ - # Test whether we can create a sparse file. - # For example, on Darwin6.5 with a file system of type hfs, it's not possible. - # NTFS requires 128K before a hole appears in a sparse file. - t=sparse.$$ - dd bs=1 seek=128K of=$t < /dev/null 2> /dev/null - set x $(du -sk $t) - kb_size=$2 - rm -f $t - if test $kb_size -ge 128; then - skip_ 'this file system does not support sparse files' - fi -} - -mkfifo_or_skip_() -{ - test $# = 1 || framework_failure_ - if ! mkfifo "$1"; then - # Make an exception of this case -- usually we interpret framework-creation - # failure as a test failure. However, in this case, when running on a SunOS - # system using a disk NFS mounted from OpenBSD, the above fails like this: - # mkfifo: cannot make fifo 'fifo-10558': Not owner - skip_ 'unable to create a fifo' - fi -} - -# Disable the current test if the working directory seems to have -# the setgid bit set. -skip_if_setgid_() -{ - setgid_tmpdir=setgid-$$ - (umask 77; mkdir $setgid_tmpdir) - perms=$(stat --printf %A $setgid_tmpdir) - rmdir $setgid_tmpdir - case $perms in - drwx------);; - drwxr-xr-x);; # Windows98 + DJGPP 2.03 - *) skip_ 'this directory has the setgid bit set';; - esac -} - -skip_if_mcstransd_is_running_() -{ - test $# = 0 || framework_failure_ - - # When mcstransd is running, you'll see only the 3-component - # version of file-system context strings. Detect that, - # and if it's running, skip this test. - __ctx=$(stat --printf='%C\n' .) || framework_failure_ - case $__ctx in - *:*:*:*) ;; # four components is ok - *) # anything else probably means mcstransd is running - skip_ "unexpected context '$__ctx'; turn off mcstransd" ;; - esac -} - -# Skip the current test if umask doesn't work as usual. -# This test should be run in the temporary directory that ends -# up being removed via the trap commands. -working_umask_or_skip_() -{ - umask 022 - touch file1 file2 - chmod 644 file2 - perms=$(ls -l file1 file2 | sed 's/ .*//' | uniq) - rm -f file1 file2 - - case $perms in - *' - '*) skip_ 'your build directory has unusual umask semantics' - esac -} - -# Retry a function requiring a sufficient delay to _pass_ -# using a truncated exponential backoff method. -# Example: retry_delay_ dd_reblock_1 .1 6 -# This example will call the dd_reblock_1 function with -# an initial delay of .1 second and call it at most 6 times -# with a max delay of 3.2s (doubled each time), or a total of 6.3s -# 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. -retry_delay_() -{ - local test_func=$1 - local init_delay=$2 - local max_n_tries=$3 - - local attempt=1 - local num_sleeps=$attempt - local time_fail - 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 - attempt=$(expr $attempt + 1) - num_sleeps=$(expr $num_sleeps '*' 2) - done - test "$time_fail" = 0 -} - -# Call this with a list of programs under test immediately after -# sourcing init.sh. -print_ver_() -{ - if test "$VERBOSE" = yes; then - local i - for i in $*; do - env $i --version - done - fi -} - -# Are we running on GNU/Hurd? -require_gnu_() -{ - test "$(uname)" = GNU \ - || skip_ 'not running on GNU/Hurd' -} - -sanitize_path_ diff --git a/tests/init.sh b/tests/init.sh index f525a7ca..bd2048e2 100644 --- a/tests/init.sh +++ b/tests/init.sh @@ -1,6 +1,6 @@ # source this file; set up for tests -# Copyright (C) 2009-2012 Free Software Foundation, Inc. +# 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 @@ -411,8 +411,7 @@ path_prepend_ () case $path_dir_ in '') fail_ "invalid path dir: '$1'";; /*) abs_path_dir_=$path_dir_;; - *) abs_path_dir_=`cd "$initial_cwd_/$path_dir_" && echo "$PWD"` \ - || fail_ "invalid path dir: $path_dir_";; + *) abs_path_dir_=$initial_cwd_/$path_dir_;; esac case $abs_path_dir_ in *:*) fail_ "invalid path dir: '$abs_path_dir_'";; @@ -448,7 +447,7 @@ setup_ () pfx_=`testdir_prefix_` test_dir_=`mktempd_ "$initial_cwd_" "$pfx_-$ME_.XXXX"` \ || fail_ "failed to create temporary directory in $initial_cwd_" - cd "$test_dir_" + cd "$test_dir_" || fail_ "failed to cd to temporary directory" # As autoconf-generated configure scripts do, ensure that IFS # is defined initially, so that saving and restoring $IFS works. diff --git a/tests/install/basic-1 b/tests/install/basic-1 deleted file mode 100755 index aa80fcf3..00000000 --- a/tests/install/basic-1 +++ /dev/null @@ -1,115 +0,0 @@ -#! /bin/sh -# Basic tests for "install". - -# Copyright (C) 1998-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ ginstall -skip_if_root_ - -dir=dir -file=file - -rm -rf $dir $file || framework_failure_ -mkdir -p $dir || framework_failure_ -echo foo > $file || framework_failure_ - -ginstall $file $dir || fail=1 -# Make sure the source file still exists. -test -f $file || fail=1 -# Make sure the dest file has been created. -test -f $dir/$file || fail=1 - -# Make sure strip works. -dd=dd$EXEEXT -dd2=dd2$EXEEXT - -just_built_dd=$abs_top_builddir/src/$dd - -test -r "$just_built_dd" \ - || warn_ "WARNING!!! Your just-built dd binary, $just_built_dd -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, -so skipping the test of install's --strip option." - -# 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 -# Make sure the source file is still around. -test -f $dd || fail=1 - -# Make sure that the destination file has the requested permissions. -mode=$(ls -l $dir/$dd|cut -b-10) -test "$mode" = -r-xr-xr-x || fail=1 - -# These failed in coreutils CVS from 2004-06-25 to 2004-08-11. -ginstall -d . || fail=1 -ginstall -d newdir || fail=1 -test -d newdir || fail=1 -ginstall -d newdir1 newdir2 newdir3 || fail=1 -test -d newdir1 || fail=1 -test -d newdir2 || fail=1 -test -d newdir3 || fail=1 - -# This fails because mkdir-p.c's make_dir_parents fails to return to its -# initial working directory ($iwd) after creating the first argument, and -# hence cannot do anything meaningful with the following relative-named dirs. -iwd=$(pwd) -mkdir sub || fail=1 -(cd sub && - chmod 0 . && - ginstall -d "$iwd/xx/yy" rel/sub1 rel/sub2 2> /dev/null -) && fail=1 -chmod 755 sub - -# Ensure that the first argument-dir has been created. -test -d xx/yy || fail=1 - -# Make sure that the 'rel' directory was not created... -test -d sub/rel && fail=1 -# and make sure it was not created in the wrong place. -test -d xx/rel && fail=1 - -# Test that we can install from an unreadable directory with an -# inaccessible parent. coreutils 5.97 fails this test. -# Perform this test only if "." is on a local file system. -# Otherwise, it would fail e.g., on an NFS-mounted file system. -if is_local_dir_ .; then - mkdir -p sub1/d || fail=1 - (cd sub1/d && chmod a-r . && chmod a-rx .. && - ginstall -d "$iwd/xx/zz" rel/a rel/b) || fail=1 - chmod 755 sub1 sub1/d || fail=1 - test -d xx/zz || fail=1 - test -d sub1/d/rel/a || fail=1 - test -d sub1/d/rel/b || fail=1 -fi - -touch file || fail=1 -ginstall -Dv file sub3/a/b/c/file >out 2>&1 || fail=1 -compare - out <<\EOF || fail=1 -ginstall: creating directory 'sub3' -ginstall: creating directory 'sub3/a' -ginstall: creating directory 'sub3/a/b' -ginstall: creating directory 'sub3/a/b/c' -'file' -> 'sub3/a/b/c/file' -EOF - -Exit $fail diff --git a/tests/install/basic-1.sh b/tests/install/basic-1.sh new file mode 100755 index 00000000..2e231645 --- /dev/null +++ b/tests/install/basic-1.sh @@ -0,0 +1,115 @@ +#! /bin/sh +# Basic tests for "install". + +# Copyright (C) 1998-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ ginstall +skip_if_root_ + +dir=dir +file=file + +rm -rf $dir $file || framework_failure_ +mkdir -p $dir || framework_failure_ +echo foo > $file || framework_failure_ + +ginstall $file $dir || fail=1 +# Make sure the source file still exists. +test -f $file || fail=1 +# Make sure the dest file has been created. +test -f $dir/$file || fail=1 + +# Make sure strip works. +dd=dd$EXEEXT +dd2=dd2$EXEEXT + +just_built_dd=$abs_top_builddir/src/$dd + +test -r "$just_built_dd" \ + || warn_ "WARNING!!! Your just-built dd binary, $just_built_dd +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, +so skipping the test of install's --strip option." + +# 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 +# Make sure the source file is still around. +test -f $dd || fail=1 + +# Make sure that the destination file has the requested permissions. +mode=$(ls -l $dir/$dd|cut -b-10) +test "$mode" = -r-xr-xr-x || fail=1 + +# These failed in coreutils CVS from 2004-06-25 to 2004-08-11. +ginstall -d . || fail=1 +ginstall -d newdir || fail=1 +test -d newdir || fail=1 +ginstall -d newdir1 newdir2 newdir3 || fail=1 +test -d newdir1 || fail=1 +test -d newdir2 || fail=1 +test -d newdir3 || fail=1 + +# This fails because mkdir-p.c's make_dir_parents fails to return to its +# initial working directory ($iwd) after creating the first argument, and +# hence cannot do anything meaningful with the following relative-named dirs. +iwd=$(pwd) +mkdir sub || fail=1 +(cd sub && + chmod 0 . && + ginstall -d "$iwd/xx/yy" rel/sub1 rel/sub2 2> /dev/null +) && fail=1 +chmod 755 sub + +# Ensure that the first argument-dir has been created. +test -d xx/yy || fail=1 + +# Make sure that the 'rel' directory was not created... +test -d sub/rel && fail=1 +# and make sure it was not created in the wrong place. +test -d xx/rel && fail=1 + +# Test that we can install from an unreadable directory with an +# inaccessible parent. coreutils 5.97 fails this test. +# Perform this test only if "." is on a local file system. +# Otherwise, it would fail e.g., on an NFS-mounted file system. +if is_local_dir_ .; then + mkdir -p sub1/d || fail=1 + (cd sub1/d && chmod a-r . && chmod a-rx .. && + ginstall -d "$iwd/xx/zz" rel/a rel/b) || fail=1 + chmod 755 sub1 sub1/d || fail=1 + test -d xx/zz || fail=1 + test -d sub1/d/rel/a || fail=1 + test -d sub1/d/rel/b || fail=1 +fi + +touch file || fail=1 +ginstall -Dv file sub3/a/b/c/file >out 2>&1 || fail=1 +compare - out <<\EOF || fail=1 +ginstall: creating directory 'sub3' +ginstall: creating directory 'sub3/a' +ginstall: creating directory 'sub3/a/b' +ginstall: creating directory 'sub3/a/b/c' +'file' -> 'sub3/a/b/c/file' +EOF + +Exit $fail diff --git a/tests/install/create-leading b/tests/install/create-leading deleted file mode 100755 index 0ecf4d95..00000000 --- a/tests/install/create-leading +++ /dev/null @@ -1,35 +0,0 @@ -#! /bin/sh -# Test -D option. - -# Copyright (C) 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 -# 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/>. - -# Note that the tests below use 'ginstall', not install, because -# that's the name of the binary in ../../src. - -. "${srcdir=.}/init.sh"; path_prepend_ ../src -print_ver_ ginstall - - -file=file -echo foo > $file - -# Before 4.0q, this would mistakenly create $file, not 'dest' -# in no-dir1/no-dir2/. -ginstall -D $file no-dir1/no-dir2/dest || fail=1 -test -d no-dir1/no-dir2 || fail=1 -test -r no-dir1/no-dir2/dest || fail=1 - -Exit $fail diff --git a/tests/install/create-leading.sh b/tests/install/create-leading.sh new file mode 100755 index 00000000..54a81b77 --- /dev/null +++ b/tests/install/create-leading.sh @@ -0,0 +1,35 @@ +#! /bin/sh +# Test -D option. + +# Copyright (C) 2000-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/>. + +# Note that the tests below use 'ginstall', not install, because +# that's the name of the binary in ../../src. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ ginstall + + +file=file +echo foo > $file + +# Before 4.0q, this would mistakenly create $file, not 'dest' +# in no-dir1/no-dir2/. +ginstall -D $file no-dir1/no-dir2/dest || fail=1 +test -d no-dir1/no-dir2 || fail=1 +test -r no-dir1/no-dir2/dest || fail=1 + +Exit $fail diff --git a/tests/install/d-slashdot b/tests/install/d-slashdot deleted file mode 100755 index 2abdd57a..00000000 --- a/tests/install/d-slashdot +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# Ensure that ginstall -d works with arguments specified with a trailing "/.". - -# Copyright (C) 2005-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ install - - -ginstall -d d1/. || fail=1 -test -d d1 || fail=1 - -ginstall -d d2/.. || fail=1 -test -d d2 || fail=1 - -Exit $fail diff --git a/tests/install/d-slashdot.sh b/tests/install/d-slashdot.sh new file mode 100755 index 00000000..d6751891 --- /dev/null +++ b/tests/install/d-slashdot.sh @@ -0,0 +1,29 @@ +#!/bin/sh +# Ensure that ginstall -d works with arguments specified with a trailing "/.". + +# Copyright (C) 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 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_ install + + +ginstall -d d1/. || fail=1 +test -d d1 || fail=1 + +ginstall -d d2/.. || fail=1 +test -d d2 || fail=1 + +Exit $fail diff --git a/tests/install/install-C b/tests/install/install-C deleted file mode 100755 index 0883d9e6..00000000 --- a/tests/install/install-C +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/sh -# Ensure "install -C" works. (basic tests) - -# Copyright (C) 2008-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ ginstall -skip_if_setgid_ - -mode1=0644 -mode2=0755 -mode3=2755 - - -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_ - -# destination file does not exist -ginstall -Cv -m$mode1 a b > out || fail=1 -compare out out_installed_first || fail=1 - -# destination file exists -ginstall -Cv -m$mode1 a b > out || fail=1 -compare out out_empty || fail=1 - -# destination file exists (long option) -ginstall -v --compare -m$mode1 a b > out || fail=1 -compare out out_empty || fail=1 - -# destination file exists but -C is not given -ginstall -v -m$mode1 a b > out || fail=1 -compare out out_installed_second || fail=1 - -# option -C ignored if any non-permission mode should be set -ginstall -Cv -m$mode3 a b > out || fail=1 -compare out out_installed_second || fail=1 -ginstall -Cv -m$mode3 a b > out || fail=1 -compare out out_installed_second || fail=1 - -# files are not regular files -ln -s a c || framework_failure_ -ln -s b d || framework_failure_ -ginstall -Cv -m$mode1 c d > out || fail=1 -echo "removed 'd' -'c' -> 'd'" > out_installed_second_cd -compare out out_installed_second_cd || fail=1 - -# destination file exists but content differs -echo test1 > a || framework_failure_ -ginstall -Cv -m$mode1 a b > out || fail=1 -compare out out_installed_second || fail=1 -ginstall -Cv -m$mode1 a b > out || fail=1 -compare out out_empty || fail=1 - -# destination file exists but content differs (same size) -echo test2 > a || framework_failure_ -ginstall -Cv -m$mode1 a b > out || fail=1 -compare out out_installed_second || fail=1 -ginstall -Cv -m$mode1 a b > out || fail=1 -compare out out_empty || fail=1 - -# destination file exists but mode differs -ginstall -Cv -m$mode2 a b > out || fail=1 -compare out out_installed_second || fail=1 -ginstall -Cv -m$mode2 a b > out || fail=1 -compare out out_empty || fail=1 - -# options -C and --preserve-timestamps are mutually exclusive -ginstall -C --preserve-timestamps a b && fail=1 - -# options -C and --strip are mutually exclusive -ginstall -C --strip --strip-program=echo a b && fail=1 - -Exit $fail diff --git a/tests/install/install-C-root b/tests/install/install-C-root deleted file mode 100755 index 5fbae058..00000000 --- a/tests/install/install-C-root +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/sh -# Ensure "install -C" compares owner and group. - -# Copyright (C) 2008-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ ginstall -require_root_ -skip_if_setgid_ - -u1=1 -u2=2 -g1=1 -g2=2 - - -echo test > a || framework_failure_ -echo "'a' -> 'b'" > out_installed_first -echo "removed 'b' -'a' -> 'b'" > out_installed_second -> out_empty - -# destination file does not exist -ginstall -Cv -o$u1 -g$g1 a b > out || fail=1 -compare out out_installed_first || fail=1 - -# destination file exists -ginstall -Cv -o$u1 -g$g1 a b > out || fail=1 -compare out out_empty || fail=1 - -# destination file exists but -C is not given -ginstall -v -o$u1 -g$g1 a b > out || fail=1 -compare out out_installed_second || fail=1 - -# destination file exists but owner differs -ginstall -Cv -o$u2 -g$g1 a b > out || fail=1 -compare out out_installed_second || fail=1 -ginstall -Cv -o$u2 -g$g1 a b > out || fail=1 -compare out out_empty || fail=1 - -# destination file exists but group differs -ginstall -Cv -o$u2 -g$g2 a b > out || fail=1 -compare out out_installed_second || fail=1 -ginstall -Cv -o$u2 -g$g2 a b > out || fail=1 -compare out out_empty || fail=1 - -# destination file exists but owner differs from getuid () -ginstall -Cv -o$u2 a b > out || fail=1 -compare out out_installed_second || fail=1 -ginstall -Cv a b > out || fail=1 -compare out out_installed_second || fail=1 -ginstall -Cv a b > out || fail=1 -compare out out_empty || fail=1 - -# destination file exists but group differs from getgid () -ginstall -Cv -g$g2 a b > out || fail=1 -compare out out_installed_second || fail=1 -ginstall -Cv a b > out || fail=1 -compare out out_installed_second || fail=1 -ginstall -Cv a b > out || fail=1 -compare out out_empty || fail=1 - -Exit $fail diff --git a/tests/install/install-C-root.sh b/tests/install/install-C-root.sh new file mode 100755 index 00000000..d8a8d846 --- /dev/null +++ b/tests/install/install-C-root.sh @@ -0,0 +1,76 @@ +#!/bin/sh +# Ensure "install -C" compares owner and group. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ ginstall +require_root_ +skip_if_setgid_ + +u1=1 +u2=2 +g1=1 +g2=2 + + +echo test > a || framework_failure_ +echo "'a' -> 'b'" > out_installed_first +echo "removed 'b' +'a' -> 'b'" > out_installed_second +> out_empty + +# destination file does not exist +ginstall -Cv -o$u1 -g$g1 a b > out || fail=1 +compare out out_installed_first || fail=1 + +# destination file exists +ginstall -Cv -o$u1 -g$g1 a b > out || fail=1 +compare out out_empty || fail=1 + +# destination file exists but -C is not given +ginstall -v -o$u1 -g$g1 a b > out || fail=1 +compare out out_installed_second || fail=1 + +# destination file exists but owner differs +ginstall -Cv -o$u2 -g$g1 a b > out || fail=1 +compare out out_installed_second || fail=1 +ginstall -Cv -o$u2 -g$g1 a b > out || fail=1 +compare out out_empty || fail=1 + +# destination file exists but group differs +ginstall -Cv -o$u2 -g$g2 a b > out || fail=1 +compare out out_installed_second || fail=1 +ginstall -Cv -o$u2 -g$g2 a b > out || fail=1 +compare out out_empty || fail=1 + +# destination file exists but owner differs from getuid () +ginstall -Cv -o$u2 a b > out || fail=1 +compare out out_installed_second || fail=1 +ginstall -Cv a b > out || fail=1 +compare out out_installed_second || fail=1 +ginstall -Cv a b > out || fail=1 +compare out out_empty || fail=1 + +# destination file exists but group differs from getgid () +ginstall -Cv -g$g2 a b > out || fail=1 +compare out out_installed_second || fail=1 +ginstall -Cv a b > out || fail=1 +compare out out_installed_second || fail=1 +ginstall -Cv a b > out || fail=1 +compare out out_empty || fail=1 + +Exit $fail diff --git a/tests/install/install-C-selinux b/tests/install/install-C-selinux deleted file mode 100755 index db2a5d22..00000000 --- a/tests/install/install-C-selinux +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/sh -# Ensure "install -C" compares SELinux context. - -# Copyright (C) 2008-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ ginstall -require_selinux_ - - -echo test > a || framework_failure_ -chcon -u system_u a || skip_ "chcon doesn't work" - -echo "'a' -> 'b'" > out_installed_first -echo "removed 'b' -'a' -> 'b'" > out_installed_second -> out_empty - -# destination file does not exist -ginstall -Cv --preserve-context a b > out || fail=1 -compare out out_installed_first || fail=1 - -# destination file exists -ginstall -Cv --preserve-context a b > out || fail=1 -compare out out_empty || fail=1 - -# destination file exists but -C is not given -ginstall -v --preserve-context a b > out || fail=1 -compare out out_installed_second || fail=1 - -# destination file exists but SELinux context differs -chcon -u unconfined_u a || skip_ "chcon doesn't work" -ginstall -Cv --preserve-context a b > out || fail=1 -compare out out_installed_second || fail=1 -ginstall -Cv --preserve-context a b > out || fail=1 -compare out out_empty || fail=1 - -Exit $fail diff --git a/tests/install/install-C-selinux.sh b/tests/install/install-C-selinux.sh new file mode 100755 index 00000000..8513d50b --- /dev/null +++ b/tests/install/install-C-selinux.sh @@ -0,0 +1,51 @@ +#!/bin/sh +# Ensure "install -C" compares SELinux context. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ ginstall +require_selinux_ + + +echo test > a || framework_failure_ +chcon -u system_u a || skip_ "chcon doesn't work" + +echo "'a' -> 'b'" > out_installed_first +echo "removed 'b' +'a' -> 'b'" > out_installed_second +> out_empty + +# destination file does not exist +ginstall -Cv --preserve-context a b > out || fail=1 +compare out out_installed_first || fail=1 + +# destination file exists +ginstall -Cv --preserve-context a b > out || fail=1 +compare out out_empty || fail=1 + +# destination file exists but -C is not given +ginstall -v --preserve-context a b > out || fail=1 +compare out out_installed_second || fail=1 + +# destination file exists but SELinux context differs +chcon -u unconfined_u a || skip_ "chcon doesn't work" +ginstall -Cv --preserve-context a b > out || fail=1 +compare out out_installed_second || fail=1 +ginstall -Cv --preserve-context a b > out || fail=1 +compare out out_empty || fail=1 + +Exit $fail diff --git a/tests/install/install-C.sh b/tests/install/install-C.sh new file mode 100755 index 00000000..7d3582c4 --- /dev/null +++ b/tests/install/install-C.sh @@ -0,0 +1,90 @@ +#!/bin/sh +# Ensure "install -C" works. (basic tests) + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ ginstall +skip_if_setgid_ + +mode1=0644 +mode2=0755 +mode3=2755 + + +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_ + +# destination file does not exist +ginstall -Cv -m$mode1 a b > out || fail=1 +compare out out_installed_first || fail=1 + +# destination file exists +ginstall -Cv -m$mode1 a b > out || fail=1 +compare out out_empty || fail=1 + +# destination file exists (long option) +ginstall -v --compare -m$mode1 a b > out || fail=1 +compare out out_empty || fail=1 + +# destination file exists but -C is not given +ginstall -v -m$mode1 a b > out || fail=1 +compare out out_installed_second || fail=1 + +# option -C ignored if any non-permission mode should be set +ginstall -Cv -m$mode3 a b > out || fail=1 +compare out out_installed_second || fail=1 +ginstall -Cv -m$mode3 a b > out || fail=1 +compare out out_installed_second || fail=1 + +# files are not regular files +ln -s a c || framework_failure_ +ln -s b d || framework_failure_ +ginstall -Cv -m$mode1 c d > out || fail=1 +echo "removed 'd' +'c' -> 'd'" > out_installed_second_cd +compare out out_installed_second_cd || fail=1 + +# destination file exists but content differs +echo test1 > a || framework_failure_ +ginstall -Cv -m$mode1 a b > out || fail=1 +compare out out_installed_second || fail=1 +ginstall -Cv -m$mode1 a b > out || fail=1 +compare out out_empty || fail=1 + +# destination file exists but content differs (same size) +echo test2 > a || framework_failure_ +ginstall -Cv -m$mode1 a b > out || fail=1 +compare out out_installed_second || fail=1 +ginstall -Cv -m$mode1 a b > out || fail=1 +compare out out_empty || fail=1 + +# destination file exists but mode differs +ginstall -Cv -m$mode2 a b > out || fail=1 +compare out out_installed_second || fail=1 +ginstall -Cv -m$mode2 a b > out || fail=1 +compare out out_empty || fail=1 + +# options -C and --preserve-timestamps are mutually exclusive +ginstall -C --preserve-timestamps a b && fail=1 + +# options -C and --strip are mutually exclusive +ginstall -C --strip --strip-program=echo a b && fail=1 + +Exit $fail diff --git a/tests/install/strip-program b/tests/install/strip-program deleted file mode 100755 index 59161411..00000000 --- a/tests/install/strip-program +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# Ensure "install -s --strip-program=PROGRAM" uses the program to strip - -# Copyright (C) 2008-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ ginstall - -working_umask_or_skip_ - -cat <<EOF > b || framework_failure_ -#!$PREFERABLY_POSIX_SHELL -sed s/b/B/ \$1 > \$1.t && mv \$1.t \$1 -EOF -chmod a+x b || framework_failure_ - - -echo abc > src || fail=1 -echo aBc > exp || fail=1 -ginstall src dest -s --strip-program=./b || fail=1 -compare exp dest || fail=1 - -Exit $fail diff --git a/tests/install/strip-program.sh b/tests/install/strip-program.sh new file mode 100755 index 00000000..8950d50c --- /dev/null +++ b/tests/install/strip-program.sh @@ -0,0 +1,36 @@ +#!/bin/sh +# Ensure "install -s --strip-program=PROGRAM" uses the program to strip + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ ginstall + +working_umask_or_skip_ + +cat <<EOF > b || framework_failure_ +#!$PREFERABLY_POSIX_SHELL +sed s/b/B/ \$1 > \$1.t && mv \$1.t \$1 +EOF +chmod a+x b || framework_failure_ + + +echo abc > src || fail=1 +echo aBc > exp || fail=1 +ginstall src dest -s --strip-program=./b || fail=1 +compare exp dest || fail=1 + +Exit $fail diff --git a/tests/install/trap b/tests/install/trap deleted file mode 100755 index e3ccf54a..00000000 --- a/tests/install/trap +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -# Ensure that 'install -s' doesn't infloop when its parent -# process traps CHLD signal. - -# Copyright (C) 2004-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 -# 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=.}/init.sh"; path_prepend_ ../src -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 - - # Before 2004-04-21, install would infloop, in the 'while (wait...' loop: - exec ginstall -s "$abs_top_builddir/src/ginstall$EXEEXT" . -) - -Exit $fail diff --git a/tests/install/trap.sh b/tests/install/trap.sh new file mode 100755 index 00000000..87887b2e --- /dev/null +++ b/tests/install/trap.sh @@ -0,0 +1,33 @@ +#!/bin/sh +# Ensure that 'install -s' doesn't infloop when its parent +# process traps CHLD signal. + +# Copyright (C) 2004-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +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 + + # Before 2004-04-21, install would infloop, in the 'while (wait...' loop: + exec ginstall -s "$abs_top_builddir/src/ginstall$EXEEXT" . +) + +Exit $fail diff --git a/tests/ln/backup-1 b/tests/ln/backup-1 deleted file mode 100755 index ffd630bc..00000000 --- a/tests/ln/backup-1 +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# 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-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 -# 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/>. - -# Based on a problem report from Jamie Lokier. - -. "${srcdir=.}/init.sh"; path_prepend_ ../src -print_ver_ ln - -touch a b || framework_failure_ - -ln b b~ || fail=1 -ln -f --b=simple a b || fail=1 - -Exit $fail diff --git a/tests/ln/backup-1.sh b/tests/ln/backup-1.sh new file mode 100755 index 00000000..d712b2f8 --- /dev/null +++ b/tests/ln/backup-1.sh @@ -0,0 +1,30 @@ +#!/bin/sh +# 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. + +# This 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/>. + +# Based on a problem report from Jamie Lokier. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ ln + +touch a b || framework_failure_ + +ln b b~ || fail=1 +ln -f --b=simple a b || fail=1 + +Exit $fail diff --git a/tests/ln/hard-backup b/tests/ln/hard-backup deleted file mode 100755 index bc38bbe5..00000000 --- a/tests/ln/hard-backup +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# Ensure that 'ln --backup F F' gives a proper diagnostic. - -# Copyright (C) 2006-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ ln - -touch f || framework_failure_ - - -ln --backup f f 2> out && fail=1 -cat <<\EOF > exp || fail=1 -ln: 'f' and 'f' are the same file -EOF - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/ln/hard-backup.sh b/tests/ln/hard-backup.sh new file mode 100755 index 00000000..18ed0311 --- /dev/null +++ b/tests/ln/hard-backup.sh @@ -0,0 +1,32 @@ +#!/bin/sh +# Ensure that 'ln --backup F F' gives a proper diagnostic. + +# Copyright (C) 2006-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ ln + +touch f || framework_failure_ + + +ln --backup f f 2> out && fail=1 +cat <<\EOF > exp || fail=1 +ln: 'f' and 'f' are the same file +EOF + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/ln/hard-to-sym b/tests/ln/hard-to-sym deleted file mode 100755 index 358b9300..00000000 --- a/tests/ln/hard-to-sym +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/sh -# Tests for ln -L/-P. - -# Copyright (C) 2009-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ ln - - -# =================================================== -# ensure -s silently overrides -L, -P -touch a || framework_failure_ -ln -L -s a symlink1 || fail=1 -ln -P -s symlink1 symlink2 || fail=1 -ln -s -L -P symlink2 symlink3 || fail=1 - -# =================================================== -# ensure that -L follows symlinks, and overrides -P -ln -P -L symlink3 hard-to-a || fail=1 -ls=$(ls -lG hard-to-a)x -case "$ls" in - *'hard-to-ax') ;; - *'hard-to-a -> '*x) fail=1 ;; - *) framework_failure_ ;; -esac - -# =================================================== -# ensure that -P links (or at least duplicates) symlinks, and overrides -L -ln -L -P symlink3 hard-to-3 || fail=1 -ls=$(ls -lG hard-to-3)x -case "$ls" in - *'hard-to-3 -> symlink2x') ;; - *'hard-to-3x') fail=1 ;; - *'hard-to-3 -> '*x) fail=1 ;; - *) framework_failure_ ;; -esac - -# =================================================== -# Create a hard link to a dangling symlink. -ln -s /no-such-dir || framework_failure_ -ln -L no-such-dir hard-to-dangle 2>err && fail=1 -case $(cat err) in - *" accessing 'no-such-dir'":*) ;; - *) fail=1 ;; -esac -ln -P no-such-dir hard-to-dangle || fail=1 - -# =================================================== -# Create a hard link to a symlink to a directory. -mkdir d || framework_failure_ -ln -s d link-to-dir || framework_failure_ -ln -L link-to-dir hard-to-dir-link 2>err && fail=1 -case $(cat err) in - *": 'link-to-dir': hard link not allowed for directory"*) ;; - *) fail=1 ;; -esac -ln -P link-to-dir/ hard-to-dir-link 2>err && fail=1 -case $(cat err) in - *": 'link-to-dir/': hard link not allowed for directory"*) ;; - *) fail=1 ;; -esac -ln -P link-to-dir hard-to-dir-link || fail=1 - -Exit $fail diff --git a/tests/ln/hard-to-sym.sh b/tests/ln/hard-to-sym.sh new file mode 100755 index 00000000..26de099a --- /dev/null +++ b/tests/ln/hard-to-sym.sh @@ -0,0 +1,77 @@ +#!/bin/sh +# Tests for ln -L/-P. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ ln + + +# =================================================== +# ensure -s silently overrides -L, -P +touch a || framework_failure_ +ln -L -s a symlink1 || fail=1 +ln -P -s symlink1 symlink2 || fail=1 +ln -s -L -P symlink2 symlink3 || fail=1 + +# =================================================== +# ensure that -L follows symlinks, and overrides -P +ln -P -L symlink3 hard-to-a || fail=1 +ls=$(ls -lG hard-to-a)x +case "$ls" in + *'hard-to-ax') ;; + *'hard-to-a -> '*x) fail=1 ;; + *) framework_failure_ ;; +esac + +# =================================================== +# ensure that -P links (or at least duplicates) symlinks, and overrides -L +ln -L -P symlink3 hard-to-3 || fail=1 +ls=$(ls -lG hard-to-3)x +case "$ls" in + *'hard-to-3 -> symlink2x') ;; + *'hard-to-3x') fail=1 ;; + *'hard-to-3 -> '*x) fail=1 ;; + *) framework_failure_ ;; +esac + +# =================================================== +# Create a hard link to a dangling symlink. +ln -s /no-such-dir || framework_failure_ +ln -L no-such-dir hard-to-dangle 2>err && fail=1 +case $(cat err) in + *" failed to access 'no-such-dir'":*) ;; + *) fail=1 ;; +esac +ln -P no-such-dir hard-to-dangle || fail=1 + +# =================================================== +# Create a hard link to a symlink to a directory. +mkdir d || framework_failure_ +ln -s d link-to-dir || framework_failure_ +ln -L link-to-dir hard-to-dir-link 2>err && fail=1 +case $(cat err) in + *": 'link-to-dir': hard link not allowed for directory"*) ;; + *) fail=1 ;; +esac +ln -P link-to-dir/ hard-to-dir-link 2>err && fail=1 +case $(cat err) in + *": 'link-to-dir/': hard link not allowed for directory"*) ;; + *) fail=1 ;; +esac +ln -P link-to-dir hard-to-dir-link || fail=1 + +Exit $fail diff --git a/tests/ln/misc b/tests/ln/misc deleted file mode 100755 index 4da0eda4..00000000 --- a/tests/ln/misc +++ /dev/null @@ -1,124 +0,0 @@ -#!/bin/sh -# Miscellaneous tests for "ln". - -# Copyright (C) 1998-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ ln - -t=tln-symlink -d=tln-subdir -ld=tln-symlink-to-subdir -f=tln-file - -# Create a simple symlink with both source and destination files -# in current directory. -touch $f || framework_failure_ -rm -f $t || framework_failure_ -ln -s $f $t || fail=1 -test -f $t || fail=1 -rm $t $f - -# Create a symlink with source file and explicit destination directory/file. -touch $f || framework_failure_ -rm -rf $d || framework_failure_ -mkdir $d || framework_failure_ -ln -s ../$f $d/$t || fail=1 -test -f $d/$t || fail=1 -rm -rf $d $f - -# Create a symlink with source file and destination directory. -touch $f || framework_failure_ -rm -rf $d || framework_failure_ -mkdir $d || framework_failure_ -ln -s ../$f $d || fail=1 -test -f $d/$f || fail=1 -rm -rf $d $f - -# See whether a trailing slash is followed too far. -touch $f || framework_failure_ -rm -rf $d || framework_failure_ -mkdir $d $d/$f || framework_failure_ -ln $f $d/ 2> /dev/null && fail=1 -ln -s $f $d/ 2> /dev/null && fail=1 -rm -rf $d $f - -# Make sure we get a failure with existing dest without -f option -touch $t || framework_failure_ -# FIXME: don't ignore the error message but rather test -# it to make sure it's the right one. -ln -s $t $t 2> /dev/null && fail=1 -rm $t - -# Make sure -sf fails when src and dest are the same -touch $t || framework_failure_ -ln -sf $t $t 2> /dev/null && fail=1 -rm $t - -# Create a symlink with source file and no explicit directory -rm -rf $d || framework_failure_ -mkdir $d || framework_failure_ -touch $d/$f || framework_failure_ -ln -s $d/$f || fail=1 -test -f $f || fail=1 -rm -rf $d $f - -# Create a symlink with source file and destination symlink-to-directory. -rm -rf $d $f $ld || framework_failure_ -touch $f || framework_failure_ -mkdir $d || framework_failure_ -ln -s $d $ld -ln -s ../$f $ld || fail=1 -test -f $d/$f || fail=1 -rm -rf $d $f $ld - -# Create a symlink with source file and destination symlink-to-directory. -# BUT use the new --no-dereference option. -rm -rf $d $f $ld || framework_failure_ -touch $f || framework_failure_ -mkdir $d || framework_failure_ -ln -s $d $ld -af=$(pwd)/$f -ln --no-dereference -fs "$af" $ld || fail=1 -test -f $ld || fail=1 -rm -rf $d $f $ld - -# 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. -touch a b || framework_failure_ -ln b b~ || framework_failure_ -ln -f --b=simple a b || fail=1 - -# =================================================== - -# Make sure ln can make simple backups. -# This was fixed in 4.0.34. Broken in 4.0r. -for cmd in ln cp mv ginstall; do - rm -rf a x a.orig - touch a x || framework_failure_ - $cmd --backup=simple --suffix=.orig x a || fail=1 - test -f a.orig || fail=1 -done - -# =================================================== -# With coreutils-5.2.1, this would mistakenly access argv[1][-1]. -# I'm including it here, in case some day programs like valgrind detect that. -# Purify probably would have done so. -ln foo '' 2> /dev/null - -# =================================================== - -Exit $fail diff --git a/tests/ln/misc.sh b/tests/ln/misc.sh new file mode 100755 index 00000000..5db1bacf --- /dev/null +++ b/tests/ln/misc.sh @@ -0,0 +1,124 @@ +#!/bin/sh +# Miscellaneous tests for "ln". + +# Copyright (C) 1998-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ ln + +t=tln-symlink +d=tln-subdir +ld=tln-symlink-to-subdir +f=tln-file + +# Create a simple symlink with both source and destination files +# in current directory. +touch $f || framework_failure_ +rm -f $t || framework_failure_ +ln -s $f $t || fail=1 +test -f $t || fail=1 +rm $t $f + +# Create a symlink with source file and explicit destination directory/file. +touch $f || framework_failure_ +rm -rf $d || framework_failure_ +mkdir $d || framework_failure_ +ln -s ../$f $d/$t || fail=1 +test -f $d/$t || fail=1 +rm -rf $d $f + +# Create a symlink with source file and destination directory. +touch $f || framework_failure_ +rm -rf $d || framework_failure_ +mkdir $d || framework_failure_ +ln -s ../$f $d || fail=1 +test -f $d/$f || fail=1 +rm -rf $d $f + +# See whether a trailing slash is followed too far. +touch $f || framework_failure_ +rm -rf $d || framework_failure_ +mkdir $d $d/$f || framework_failure_ +ln $f $d/ 2> /dev/null && fail=1 +ln -s $f $d/ 2> /dev/null && fail=1 +rm -rf $d $f + +# Make sure we get a failure with existing dest without -f option +touch $t || framework_failure_ +# FIXME: don't ignore the error message but rather test +# it to make sure it's the right one. +ln -s $t $t 2> /dev/null && fail=1 +rm $t + +# Make sure -sf fails when src and dest are the same +touch $t || framework_failure_ +ln -sf $t $t 2> /dev/null && fail=1 +rm $t + +# Create a symlink with source file and no explicit directory +rm -rf $d || framework_failure_ +mkdir $d || framework_failure_ +touch $d/$f || framework_failure_ +ln -s $d/$f || fail=1 +test -f $f || fail=1 +rm -rf $d $f + +# Create a symlink with source file and destination symlink-to-directory. +rm -rf $d $f $ld || framework_failure_ +touch $f || framework_failure_ +mkdir $d || framework_failure_ +ln -s $d $ld +ln -s ../$f $ld || fail=1 +test -f $d/$f || fail=1 +rm -rf $d $f $ld + +# Create a symlink with source file and destination symlink-to-directory. +# BUT use the new --no-dereference option. +rm -rf $d $f $ld || framework_failure_ +touch $f || framework_failure_ +mkdir $d || framework_failure_ +ln -s $d $ld +af=$(pwd)/$f +ln --no-dereference -fs "$af" $ld || fail=1 +test -f $ld || fail=1 +rm -rf $d $f $ld + +# 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. +touch a b || framework_failure_ +ln b b~ || framework_failure_ +ln -f --b=simple a b || fail=1 + +# =================================================== + +# Make sure ln can make simple backups. +# This was fixed in 4.0.34. Broken in 4.0r. +for cmd in ln cp mv ginstall; do + rm -rf a x a.orig + touch a x || framework_failure_ + $cmd --backup=simple --suffix=.orig x a || fail=1 + test -f a.orig || fail=1 +done + +# =================================================== +# With coreutils-5.2.1, this would mistakenly access argv[1][-1]. +# I'm including it here, in case some day programs like valgrind detect that. +# Purify probably would have done so. +ln foo '' 2> /dev/null + +# =================================================== + +Exit $fail diff --git a/tests/ln/relative b/tests/ln/relative deleted file mode 100755 index cfc34691..00000000 --- a/tests/ln/relative +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# Test "ln --relative". - -# Copyright (C) 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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ ln - -mkdir -p usr/bin || framework_failure_ -mkdir -p usr/lib/foo || framework_failure_ -touch usr/lib/foo/foo || framework_failure_ - -ln -sr usr/lib/foo/foo usr/bin/foo -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 - -Exit $fail diff --git a/tests/ln/relative.sh b/tests/ln/relative.sh new file mode 100755 index 00000000..0418b8a0 --- /dev/null +++ b/tests/ln/relative.sh @@ -0,0 +1,32 @@ +#!/bin/sh +# Test "ln --relative". + +# Copyright (C) 2012-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ ln + +mkdir -p usr/bin || framework_failure_ +mkdir -p usr/lib/foo || framework_failure_ +touch usr/lib/foo/foo || framework_failure_ + +ln -sr usr/lib/foo/foo usr/bin/foo +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 + +Exit $fail diff --git a/tests/ln/sf-1 b/tests/ln/sf-1 deleted file mode 100755 index 824c2243..00000000 --- a/tests/ln/sf-1 +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# Test "ln -sf". - -# Copyright (C) 1997-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ ln - -echo foo > a || framework_failure_ -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 - -Exit $fail diff --git a/tests/ln/sf-1.sh b/tests/ln/sf-1.sh new file mode 100755 index 00000000..cb864af4 --- /dev/null +++ b/tests/ln/sf-1.sh @@ -0,0 +1,31 @@ +#!/bin/sh +# Test "ln -sf". + +# Copyright (C) 1997-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ ln + +echo foo > a || framework_failure_ +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 + +Exit $fail diff --git a/tests/ln/slash-decorated-nonexistent-dest b/tests/ln/slash-decorated-nonexistent-dest deleted file mode 100755 index 5da855e6..00000000 --- a/tests/ln/slash-decorated-nonexistent-dest +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# ensure that touch f; ln -T f no-such-file/ does not mistakenly succeed - -# Copyright (C) 2009-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ ln - -touch f || framework_failure_ - - -# Before coreutils-7.6, this would succeed on Solaris 10 -ln -T f no-such-file/ && fail=1 -test -e no-such-file && fail=1 - -Exit $fail diff --git a/tests/ln/slash-decorated-nonexistent-dest.sh b/tests/ln/slash-decorated-nonexistent-dest.sh new file mode 100755 index 00000000..baf5f77f --- /dev/null +++ b/tests/ln/slash-decorated-nonexistent-dest.sh @@ -0,0 +1,29 @@ +#!/bin/sh +# ensure that touch f; ln -T f no-such-file/ does not mistakenly succeed + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ ln + +touch f || framework_failure_ + + +# Before coreutils-7.6, this would succeed on Solaris 10 +ln -T f no-such-file/ && fail=1 +test -e no-such-file && fail=1 + +Exit $fail diff --git a/tests/ln/target-1 b/tests/ln/target-1 deleted file mode 100755 index 1d511e5e..00000000 --- a/tests/ln/target-1 +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# Test "ln --target-dir" with one file. - -# Copyright (C) 2002-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 -# 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/>. - -# Before coreutils-4.5.3, --target-dir didn't work with one file. -# It would create the desired link, but would fail with a diagnosis like this: -# ln: 'd/.': cannot overwrite directory -# Based on a test case from Dmitry V. Levin. - -. "${srcdir=.}/init.sh"; path_prepend_ ../src -print_ver_ ln - -mkdir d || framework_failure_ -ln -s --target-dir=d ../f || fail=1 - -Exit $fail diff --git a/tests/ln/target-1.sh b/tests/ln/target-1.sh new file mode 100755 index 00000000..3e59cbc9 --- /dev/null +++ b/tests/ln/target-1.sh @@ -0,0 +1,30 @@ +#!/bin/sh +# Test "ln --target-dir" with one file. + +# Copyright (C) 2002-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/>. + +# Before coreutils-4.5.3, --target-dir didn't work with one file. +# It would create the desired link, but would fail with a diagnosis like this: +# ln: 'd/.': cannot overwrite directory +# Based on a test case from Dmitry V. Levin. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ ln + +mkdir d || framework_failure_ +ln -s --target-dir=d ../f || fail=1 + +Exit $fail diff --git a/tests/local.mk b/tests/local.mk new file mode 100644 index 00000000..9be19702 --- /dev/null +++ b/tests/local.mk @@ -0,0 +1,819 @@ +## Process this file with automake to produce Makefile.in -*-Makefile-*-. + +## Copyright (C) 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/>. + +# Indirections required so that we'll still be able to know the +# complete list of our tests even if the user overrides TESTS +# from the command line (as permitted by the test harness API). +TESTS = $(all_tests) $(factor_tests) +root_tests = $(all_root_tests) + +EXTRA_DIST += $(all_tests) + +TEST_EXTENSIONS = .sh .pl .xpl + +if HAVE_PERL +TESTSUITE_PERL = $(PERL) +else +TESTSUITE_PERL = $(SHELL) $(srcdir)/no-perl +endif + +# Options passed to the perl invocations running the perl test scripts. +TESTSUITE_PERL_OPTIONS = -w -I$(srcdir)/tests -MCoreutils -MCuSkip +# '$f' is set by the Automake-generated test harness to the path of the +# current test script stripped of VPATH components, and is used by the +# CuTmpdir module to determine the name of the temporary files to be +# used. Note that $f is a shell variable, not a make macro, so the use +# of '$$f' below is correct, and not a typo. +TESTSUITE_PERL_OPTIONS += -M"CuTmpdir qw($$f)" + +SH_LOG_COMPILER = $(SHELL) +PL_LOG_COMPILER = $(TESTSUITE_PERL) $(TESTSUITE_PERL_OPTIONS) +# Perl scripts that must be run in tainted mode. +XPL_LOG_COMPILER = $(TESTSUITE_PERL) -T $(TESTSUITE_PERL_OPTIONS) + +# We don't want this to go in the top-level directory. +TEST_SUITE_LOG = tests/test-suite.log + +# Note that the first lines are statements. They ensure that environment +# variables that can perturb tests are unset or set to expected values. +# The rest are envvar settings that propagate build-related Makefile +# variables to test scripts. +TESTS_ENVIRONMENT = \ + . $(srcdir)/tests/lang-default; \ + tmp__=$${TMPDIR-/tmp}; \ + test -d "$$tmp__" && test -w "$$tmp__" || tmp__=.; \ + . $(srcdir)/tests/envvar-check; \ + TMPDIR=$$tmp__; export TMPDIR; \ + export \ + VERSION='$(VERSION)' \ + LOCALE_FR='$(LOCALE_FR)' \ + LOCALE_FR_UTF8='$(LOCALE_FR_UTF8)' \ + abs_top_builddir='$(abs_top_builddir)' \ + abs_top_srcdir='$(abs_top_srcdir)' \ + abs_srcdir='$(abs_srcdir)' \ + built_programs='$(built_programs)' \ + host_os=$(host_os) \ + host_triplet='$(host_triplet)' \ + srcdir='$(srcdir)' \ + top_srcdir='$(top_srcdir)' \ + CONFIG_HEADER='$(abs_top_builddir)/$(CONFIG_INCLUDE)' \ + CU_TEST_NAME=`basename '$(abs_srcdir)'`,`echo $$tst|sed 's,^\./,,;s,/,-,g'` \ + CC='$(CC)' \ + AWK='$(AWK)' \ + EGREP='$(EGREP)' \ + EXEEXT='$(EXEEXT)' \ + MAKE=$(MAKE) \ + PACKAGE_BUGREPORT='$(PACKAGE_BUGREPORT)' \ + PACKAGE_VERSION=$(PACKAGE_VERSION) \ + PERL='$(PERL)' \ + PREFERABLY_POSIX_SHELL='$(PREFERABLY_POSIX_SHELL)' \ + ; test -d /usr/xpg4/bin && PATH='/usr/xpg4/bin$(PATH_SEPARATOR)'"$$PATH"; \ + PATH='$(abs_top_builddir)/src$(PATH_SEPARATOR)'"$$PATH" \ + ; 9>&2 + +# On failure, display the global testsuite log on stdout. +VERBOSE = yes + +EXTRA_DIST += \ + 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) + +all_root_tests = \ + tests/chown/basic.sh \ + tests/cp/cp-a-selinux.sh \ + tests/cp/preserve-gid.sh \ + tests/cp/special-bits.sh \ + tests/cp/cp-mv-enotsup-xattr.sh \ + tests/cp/capability.sh \ + tests/cp/sparse-fiemap.sh \ + tests/dd/skip-seek-past-dev.sh \ + tests/df/problematic-chars.sh \ + tests/du/bind-mount-dir-cycle.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/mv/sticky-to-xpart.sh \ + tests/rm/fail-2eperm.sh \ + tests/rm/no-give-up.sh \ + tests/rm/one-file-system.sh \ + tests/rm/read-only.sh \ + tests/tail-2/append-only.sh \ + tests/touch/now-owned-by-other.sh + +ALL_RECURSIVE_TARGETS += check-root +.PHONY: check-root +check-root: + $(MAKE) check TESTS='$(root_tests)' SUBDIRS=. + +# Do not choose a name that is a shell keyword like 'if', or a +# commonly-used utility like 'cat' or 'test', as the name of a test. +# Otherwise, VPATH builds will fail on hosts like Solaris, since they +# will expand 'if test ...' to 'if .../test ...', and the '.../test' +# will execute the test script rather than the standard utility. + +# Notes on the ordering of these tests: +# Place early in the list tests of the tools that +# are most commonly used in test scripts themselves. +# E.g., nearly every test script uses rm and chmod. +# help-version comes early because it's a basic sanity test. +# Put seq early, since lots of other tests use it. +# Put tests that sleep early, but not all together, so in parallel builds +# they share time with tests that burn CPU, not with others that sleep. +# Put head-elide-tail early, because it's long-running. + +all_tests = \ + tests/misc/help-version.sh \ + tests/tail-2/inotify-race.sh \ + tests/misc/invalid-opt.pl \ + tests/rm/ext3-perf.sh \ + tests/rm/cycle.sh \ + tests/cp/link-heap.sh \ + tests/misc/tty-eof.pl \ + tests/tail-2/inotify-hash-abuse.sh \ + tests/tail-2/inotify-hash-abuse2.sh \ + tests/tail-2/F-vs-missing.sh \ + tests/tail-2/F-vs-rename.sh \ + tests/tail-2/inotify-rotate.sh \ + tests/chmod/no-x.sh \ + tests/chgrp/basic.sh \ + tests/rm/dangling-symlink.sh \ + tests/misc/ls-time.sh \ + tests/rm/d-1.sh \ + tests/rm/d-2.sh \ + tests/rm/d-3.sh \ + tests/rm/deep-1.sh \ + tests/rm/deep-2.sh \ + tests/rm/dir-no-w.sh \ + tests/rm/dir-nonrecur.sh \ + tests/rm/dot-rel.sh \ + tests/rm/isatty.sh \ + tests/rm/empty-inacc.sh \ + tests/rm/empty-name.pl \ + tests/rm/f-1.sh \ + tests/rm/fail-eacces.sh \ + tests/rm/fail-eperm.xpl \ + tests/tail-2/assert.sh \ + tests/rm/hash.sh \ + tests/rm/i-1.sh \ + tests/rm/i-never.sh \ + tests/rm/i-no-r.sh \ + tests/tail-2/infloop-1.sh \ + tests/rm/ignorable.sh \ + tests/rm/inaccessible.sh \ + tests/rm/interactive-always.sh \ + tests/rm/interactive-once.sh \ + tests/rm/ir-1.sh \ + tests/rm/one-file-system2.sh \ + tests/rm/r-1.sh \ + tests/rm/r-2.sh \ + tests/rm/r-3.sh \ + tests/rm/r-4.sh \ + tests/rm/readdir-bug.sh \ + tests/rm/rm1.sh \ + tests/touch/empty-file.sh \ + tests/rm/rm2.sh \ + tests/rm/rm3.sh \ + tests/rm/rm4.sh \ + tests/rm/rm5.sh \ + tests/rm/sunos-1.sh \ + tests/rm/unread2.sh \ + tests/rm/unread3.sh \ + tests/rm/unreadable.pl \ + tests/rm/v-slash.sh \ + tests/rm/many-dir-entries-vs-OOM.sh \ + tests/chgrp/default-no-deref.sh \ + tests/chgrp/deref.sh \ + tests/chgrp/no-x.sh \ + tests/chgrp/posix-H.sh \ + tests/chgrp/recurse.sh \ + tests/fmt/base.pl \ + tests/fmt/long-line.sh \ + tests/fmt/goal-option.sh \ + tests/misc/env.sh \ + tests/misc/ptx.pl \ + tests/misc/test.pl \ + tests/misc/seq.pl \ + tests/misc/seq-long-double.sh \ + tests/misc/head.pl \ + tests/misc/head-elide-tail.pl \ + tests/tail-2/tail-n0f.sh \ + tests/misc/ls-misc.pl \ + tests/misc/date.pl \ + tests/misc/date-next-dow.pl \ + tests/misc/ptx-overrun.sh \ + tests/misc/xstrtol.pl \ + tests/tail-2/pid.sh \ + tests/misc/od.pl \ + tests/misc/od-float.sh \ + tests/misc/mktemp.pl \ + tests/misc/arch.sh \ + tests/misc/join.pl \ + tests/pr/pr-tests.pl \ + tests/misc/pwd-option.sh \ + tests/misc/chcon-fail.sh \ + tests/misc/cut.pl \ + tests/misc/cut-huge-to-eol-range.sh \ + tests/misc/wc.pl \ + tests/misc/wc-files0-from.pl \ + tests/misc/wc-files0.sh \ + tests/misc/wc-parallel.sh \ + tests/misc/cat-proc.sh \ + tests/misc/cat-buf.sh \ + tests/misc/base64.pl \ + tests/misc/basename.pl \ + tests/misc/close-stdout.sh \ + tests/misc/chroot-fail.sh \ + tests/misc/comm.pl \ + tests/misc/csplit.sh \ + tests/misc/csplit-1000.sh \ + tests/misc/csplit-heap.sh \ + tests/misc/date-sec.sh \ + tests/misc/dircolors.pl \ + tests/misc/dirname.pl \ + tests/misc/env-null.sh \ + tests/misc/expand.pl \ + tests/misc/expr.pl \ + tests/misc/factor.pl \ + tests/misc/false-status.sh \ + tests/misc/fold.pl \ + tests/misc/groups-dash.sh \ + 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/md5sum.pl \ + tests/misc/md5sum-bsd.sh \ + tests/misc/md5sum-newline.pl \ + tests/misc/md5sum-parallel.sh \ + tests/misc/mknod.sh \ + tests/misc/nice.sh \ + tests/misc/nice-fail.sh \ + tests/misc/nl.sh \ + tests/misc/nohup.sh \ + tests/misc/nproc-avail.sh \ + tests/misc/nproc-positive.sh \ + tests/misc/numfmt.pl \ + tests/misc/od-N.sh \ + tests/misc/od-multiple-t.sh \ + tests/misc/od-x8.sh \ + tests/misc/paste.pl \ + tests/misc/pathchk1.sh \ + tests/misc/printenv.sh \ + tests/misc/printf.sh \ + tests/misc/printf-cov.pl \ + tests/misc/printf-hex.sh \ + tests/misc/printf-surprise.sh \ + tests/misc/pwd-long.sh \ + tests/misc/readlink-fp-loop.sh \ + tests/misc/readlink-root.sh \ + tests/misc/realpath.sh \ + tests/misc/runcon-no-reorder.sh \ + tests/misc/sha1sum.pl \ + tests/misc/sha1sum-vec.pl \ + tests/misc/sha224sum.pl \ + tests/misc/sha256sum.pl \ + tests/misc/sha384sum.pl \ + tests/misc/sha512sum.pl \ + tests/misc/shred-exact.sh \ + tests/misc/shred-passes.sh \ + tests/misc/shred-remove.sh \ + tests/misc/shuf.sh \ + tests/misc/sort.pl \ + tests/misc/sort-benchmark-random.sh \ + tests/misc/sort-compress.sh \ + tests/misc/sort-compress-hang.sh \ + tests/misc/sort-compress-proc.sh \ + tests/misc/sort-continue.sh \ + tests/misc/sort-debug-keys.sh \ + tests/misc/sort-debug-warn.sh \ + tests/misc/sort-discrim.sh \ + tests/misc/sort-files0-from.pl \ + tests/misc/sort-float.sh \ + tests/misc/sort-merge.pl \ + tests/misc/sort-merge-fdlimit.sh \ + tests/misc/sort-month.sh \ + tests/misc/sort-exit-early.sh \ + tests/misc/sort-rand.sh \ + tests/misc/sort-spinlock-abuse.sh \ + tests/misc/sort-stale-thread-mem.sh \ + tests/misc/sort-unique.sh \ + tests/misc/sort-unique-segv.sh \ + tests/misc/sort-version.sh \ + tests/misc/sort-NaN-infloop.sh \ + tests/misc/sort-u-FMR.sh \ + tests/split/filter.sh \ + tests/split/suffix-auto-length.sh \ + tests/split/suffix-length.sh \ + tests/split/additional-suffix.sh \ + tests/split/b-chunk.sh \ + tests/split/fail.sh \ + tests/split/lines.sh \ + tests/split/l-chunk.sh \ + tests/split/r-chunk.sh \ + tests/split/numeric.sh \ + tests/split/guard-input.sh \ + tests/misc/stat-birthtime.sh \ + tests/misc/stat-fmt.sh \ + tests/misc/stat-hyphen.sh \ + tests/misc/stat-mount.sh \ + tests/misc/stat-nanoseconds.sh \ + tests/misc/stat-printf.pl \ + tests/misc/stat-slash.sh \ + tests/misc/stdbuf.sh \ + tests/misc/stty.sh \ + tests/misc/stty-invalid.sh \ + tests/misc/stty-pairs.sh \ + tests/misc/stty-row-col.sh \ + tests/misc/sum.pl \ + tests/misc/sum-sysv.sh \ + tests/misc/tac.pl \ + tests/misc/tac-continue.sh \ + tests/misc/tac-2-nonseekable.sh \ + tests/misc/tail.pl \ + tests/misc/tee.sh \ + tests/misc/tee-dash.sh \ + tests/misc/test-diag.pl \ + tests/misc/timeout.sh \ + tests/misc/timeout-blocked.pl \ + tests/misc/timeout-group.sh \ + tests/misc/timeout-parameters.sh \ + tests/misc/tr.pl \ + tests/misc/tr-case-class.sh \ + tests/misc/truncate-dangling-symlink.sh \ + tests/misc/truncate-dir-fail.sh \ + tests/misc/truncate-fail-diag.sh \ + tests/misc/truncate-fifo.sh \ + tests/misc/truncate-no-create-missing.sh \ + tests/misc/truncate-overflow.sh \ + tests/misc/truncate-parameters.sh \ + tests/misc/truncate-relative.sh \ + tests/misc/tsort.pl \ + tests/misc/unexpand.pl \ + tests/misc/uniq.pl \ + tests/misc/uniq-perf.sh \ + tests/misc/xattr.sh \ + tests/tail-2/wait.sh \ + tests/chmod/c-option.sh \ + tests/chmod/equal-x.sh \ + tests/chmod/equals.sh \ + tests/chmod/inaccessible.sh \ + tests/chmod/octal.sh \ + tests/chmod/setgid.sh \ + tests/chmod/silent.sh \ + tests/chmod/thru-dangling.sh \ + tests/chmod/umask-x.sh \ + tests/chmod/usage.sh \ + tests/chown/deref.sh \ + tests/chown/preserve-root.sh \ + tests/chown/separator.sh \ + tests/cp/abuse.sh \ + tests/cp/acl.sh \ + tests/cp/attr-existing.sh \ + tests/cp/backup-1.sh \ + tests/cp/backup-dir.sh \ + tests/cp/backup-is-src.sh \ + tests/cp/cp-HL.sh \ + tests/cp/cp-deref.sh \ + tests/cp/cp-i.sh \ + tests/cp/cp-mv-backup.sh \ + tests/cp/cp-parents.sh \ + tests/cp/deref-slink.sh \ + tests/cp/dir-rm-dest.sh \ + tests/cp/dir-slash.sh \ + tests/cp/dir-vs-file.sh \ + tests/cp/existing-perm-dir.sh \ + tests/cp/existing-perm-race.sh \ + tests/cp/fail-perm.sh \ + tests/cp/fiemap-empty.sh \ + tests/cp/fiemap-FMR.sh \ + tests/cp/fiemap-perf.sh \ + tests/cp/fiemap-2.sh \ + tests/cp/file-perm-race.sh \ + tests/cp/into-self.sh \ + tests/cp/link.sh \ + tests/cp/link-no-deref.sh \ + tests/cp/link-preserve.sh \ + tests/cp/link-symlink.sh \ + tests/cp/nfs-removal-race.sh \ + tests/cp/no-deref-link1.sh \ + tests/cp/no-deref-link2.sh \ + tests/cp/no-deref-link3.sh \ + tests/cp/parent-perm.sh \ + tests/cp/parent-perm-race.sh \ + tests/cp/perm.sh \ + tests/cp/preserve-2.sh \ + tests/cp/preserve-link.sh \ + tests/cp/preserve-mode.sh \ + tests/cp/preserve-slink-time.sh \ + tests/cp/proc-short-read.sh \ + tests/cp/proc-zero-len.sh \ + tests/cp/r-vs-symlink.sh \ + tests/cp/reflink-auto.sh \ + tests/cp/reflink-perm.sh \ + tests/cp/same-file.sh \ + tests/cp/slink-2-slink.sh \ + tests/cp/sparse.sh \ + tests/cp/sparse-to-pipe.sh \ + tests/cp/special-f.sh \ + tests/cp/src-base-dot.sh \ + tests/cp/symlink-slash.sh \ + tests/cp/thru-dangling.sh \ + tests/df/header.sh \ + tests/df/df-P.sh \ + tests/df/df-output.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/direct.sh \ + tests/dd/misc.sh \ + tests/dd/nocache.sh \ + tests/dd/not-rewound.sh \ + tests/dd/reblock.sh \ + tests/dd/skip-seek.pl \ + tests/dd/skip-seek2.sh \ + tests/dd/bytes.sh \ + tests/dd/skip-seek-past-file.sh \ + tests/dd/sparse.sh \ + tests/dd/stderr.sh \ + tests/dd/unblock.pl \ + tests/dd/unblock-sync.sh \ + tests/df/total-verify.sh \ + tests/du/2g.sh \ + tests/du/8gb.sh \ + tests/du/basic.sh \ + tests/du/bigtime.sh \ + tests/du/deref.sh \ + tests/du/deref-args.sh \ + tests/du/exclude.sh \ + tests/du/fd-leak.sh \ + tests/du/files0-from.pl \ + tests/du/files0-from-dir.sh \ + tests/du/hard-link.sh \ + tests/du/inacc-dest.sh \ + tests/du/inacc-dir.sh \ + tests/du/inaccessible-cwd.sh \ + tests/du/long-from-unreadable.sh \ + tests/du/long-sloop.sh \ + tests/du/max-depth.sh \ + tests/du/move-dir-while-traversing.sh \ + tests/du/no-deref.sh \ + tests/du/no-x.sh \ + tests/du/one-file-system.sh \ + tests/du/restore-wd.sh \ + tests/du/slash.sh \ + tests/du/threshold.sh \ + tests/du/trailing-slash.sh \ + tests/du/two-args.sh \ + tests/id/gnu-zero-uids.sh \ + tests/id/no-context.sh \ + tests/install/basic-1.sh \ + tests/install/create-leading.sh \ + tests/install/d-slashdot.sh \ + tests/install/install-C.sh \ + tests/install/install-C-selinux.sh \ + tests/install/strip-program.sh \ + tests/install/trap.sh \ + tests/ln/backup-1.sh \ + tests/ln/hard-backup.sh \ + tests/ln/hard-to-sym.sh \ + tests/ln/misc.sh \ + tests/ln/relative.sh \ + tests/ln/sf-1.sh \ + tests/ln/slash-decorated-nonexistent-dest.sh \ + tests/ln/target-1.sh \ + tests/ls/abmon-align.sh \ + tests/ls/block-size.sh \ + tests/ls/color-clear-to-eol.sh \ + tests/ls/color-dtype-dir.sh \ + tests/ls/color-norm.sh \ + tests/ls/dangle.sh \ + tests/ls/dired.sh \ + tests/ls/file-type.sh \ + tests/ls/follow-slink.sh \ + tests/ls/getxattr-speedup.sh \ + tests/ls/infloop.sh \ + tests/ls/inode.sh \ + tests/ls/m-option.sh \ + tests/ls/multihardlink.sh \ + tests/ls/no-arg.sh \ + tests/ls/no-cap.sh \ + tests/ls/proc-selinux-segfault.sh \ + tests/ls/readdir-mountpoint-inode.sh \ + tests/ls/recursive.sh \ + tests/ls/root-rel-symlink-color.sh \ + tests/ls/rt-1.sh \ + tests/ls/slink-acl.sh \ + tests/ls/stat-dtype.sh \ + tests/ls/stat-failed.sh \ + tests/ls/stat-free-color.sh \ + tests/ls/stat-free-symlinks.sh \ + tests/ls/stat-vs-dirent.sh \ + tests/ls/symlink-slash.sh \ + tests/ls/time-style-diag.sh \ + tests/ls/x-option.sh \ + tests/mkdir/p-1.sh \ + tests/mkdir/p-2.sh \ + tests/mkdir/p-3.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/special-1.sh \ + tests/mkdir/t-slash.sh \ + tests/mv/acl.sh \ + tests/mv/atomic.sh \ + tests/mv/atomic2.sh \ + tests/mv/backup-dir.sh \ + tests/mv/backup-is-src.sh \ + tests/mv/childproof.sh \ + tests/mv/diag.sh \ + tests/mv/dir-file.sh \ + tests/mv/dir2dir.sh \ + tests/mv/dup-source.sh \ + tests/mv/force.sh \ + tests/mv/hard-2.sh \ + tests/mv/hard-3.sh \ + tests/mv/hard-4.sh \ + tests/mv/hard-link-1.sh \ + tests/mv/hard-verbose.sh \ + tests/mv/i-1.pl \ + tests/mv/i-2.sh \ + tests/mv/i-3.sh \ + tests/mv/i-4.sh \ + tests/mv/i-5.sh \ + tests/mv/i-link-no.sh \ + tests/mv/into-self.sh \ + tests/mv/into-self-2.sh \ + tests/mv/into-self-3.sh \ + tests/mv/into-self-4.sh \ + tests/mv/leak-fd.sh \ + tests/mv/mv-n.sh \ + tests/mv/mv-special-1.sh \ + tests/mv/no-target-dir.sh \ + tests/mv/part-fail.sh \ + tests/mv/part-hardlink.sh \ + tests/mv/part-rename.sh \ + tests/mv/part-symlink.sh \ + tests/mv/partition-perm.sh \ + tests/mv/perm-1.sh \ + tests/mv/symlink-onto-hardlink.sh \ + tests/mv/symlink-onto-hardlink-to-self.sh \ + tests/mv/to-symlink.sh \ + tests/mv/trailing-slash.sh \ + tests/mv/update.sh \ + tests/readlink/can-e.sh \ + tests/readlink/can-f.sh \ + tests/readlink/can-m.sh \ + tests/readlink/multi.sh \ + tests/readlink/rl-1.sh \ + tests/rmdir/fail-perm.sh \ + tests/rmdir/ignore.sh \ + tests/rmdir/t-slash.sh \ + tests/tail-2/assert-2.sh \ + tests/tail-2/big-4gb.sh \ + tests/tail-2/flush-initial.sh \ + tests/tail-2/follow-name.sh \ + tests/tail-2/follow-stdin.sh \ + tests/tail-2/pipe-f.sh \ + tests/tail-2/pipe-f2.sh \ + tests/tail-2/proc-ksyms.sh \ + tests/tail-2/start-middle.sh \ + tests/touch/60-seconds.sh \ + tests/touch/dangling-symlink.sh \ + tests/touch/dir-1.sh \ + tests/touch/fail-diag.sh \ + tests/touch/fifo.sh \ + tests/touch/no-create-missing.sh \ + tests/touch/no-dereference.sh \ + tests/touch/no-rights.sh \ + tests/touch/not-owner.sh \ + tests/touch/obsolescent.sh \ + tests/touch/read-only.sh \ + tests/touch/relative.sh \ + tests/touch/trailing-slash.sh \ + $(all_root_tests) + +# See tests/factor/create-test.sh. +tf = tests/factor +factor_tests = \ + $(tf)/t00.sh $(tf)/t01.sh $(tf)/t02.sh $(tf)/t03.sh $(tf)/t04.sh \ + $(tf)/t05.sh $(tf)/t06.sh $(tf)/t07.sh $(tf)/t08.sh $(tf)/t09.sh \ + $(tf)/t10.sh $(tf)/t11.sh $(tf)/t12.sh $(tf)/t13.sh $(tf)/t14.sh \ + $(tf)/t15.sh $(tf)/t16.sh $(tf)/t17.sh $(tf)/t18.sh $(tf)/t19.sh \ + $(tf)/t20.sh $(tf)/t21.sh $(tf)/t22.sh $(tf)/t23.sh $(tf)/t24.sh \ + $(tf)/t25.sh $(tf)/t26.sh $(tf)/t27.sh $(tf)/t28.sh $(tf)/t29.sh \ + $(tf)/t30.sh $(tf)/t31.sh $(tf)/t32.sh $(tf)/t33.sh $(tf)/t34.sh \ + $(tf)/t35.sh $(tf)/t36.sh + +$(factor_tests): $(tf)/run.sh $(tf)/create-test.sh + $(AM_V_GEN)$(MKDIR_P) $(tf) + $(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 $@ + +CLEANFILES += $(factor_tests) + +pr_data = \ + tests/pr/0F \ + tests/pr/0FF \ + tests/pr/0FFnt \ + tests/pr/0FFt \ + tests/pr/0FnFnt \ + tests/pr/0FnFt \ + tests/pr/0Fnt \ + tests/pr/0Ft \ + tests/pr/2-S_f-t_notab \ + tests/pr/2-Sf-t_notab \ + tests/pr/2f-t_notab \ + tests/pr/2s_f-t_notab \ + tests/pr/2s_w60f-t_nota \ + tests/pr/2sf-t_notab \ + tests/pr/2sw60f-t_notab \ + tests/pr/2w60f-t_notab \ + tests/pr/3-0F \ + tests/pr/3-5l24f-t \ + tests/pr/3-FF \ + tests/pr/3a2l17-FF \ + tests/pr/3a3f-0F \ + tests/pr/3a3l15-t \ + tests/pr/3a3l15f-t \ + tests/pr/3b2l17-FF \ + tests/pr/3b3f-0F \ + tests/pr/3b3f-0FF \ + tests/pr/3b3f-FF \ + tests/pr/3b3l15-t \ + tests/pr/3b3l15f-t \ + tests/pr/3f-0F \ + tests/pr/3f-FF \ + tests/pr/3l24-t \ + tests/pr/3l24f-t \ + tests/pr/3ml24-FF \ + tests/pr/3ml24-t \ + tests/pr/3ml24-t-FF \ + tests/pr/3ml24f-t \ + tests/pr/4-7l24-FF \ + tests/pr/4l24-FF \ + tests/pr/FF \ + tests/pr/FFn \ + tests/pr/FFtn \ + tests/pr/FnFn \ + tests/pr/Ja3l24f-lm \ + tests/pr/Jb3l24f-lm \ + tests/pr/Jml24f-lm-lo \ + tests/pr/W-72l24f-ll \ + tests/pr/W20l24f-ll \ + tests/pr/W26l24f-ll \ + tests/pr/W27l24f-ll \ + tests/pr/W28l24f-ll \ + tests/pr/W35Ja3l24f-lm \ + tests/pr/W35Jb3l24f-lm \ + tests/pr/W35Jml24f-lmlo \ + tests/pr/W35a3l24f-lm \ + tests/pr/W35b3l24f-lm \ + tests/pr/W35ml24f-lm-lo \ + tests/pr/W72Jl24f-ll \ + tests/pr/a2l15-FF \ + tests/pr/a2l17-FF \ + tests/pr/a3-0F \ + tests/pr/a3f-0F \ + tests/pr/a3f-0FF \ + tests/pr/a3f-FF \ + tests/pr/a3l15-t \ + tests/pr/a3l15f-t \ + tests/pr/a3l24f-lm \ + tests/pr/b2l15-FF \ + tests/pr/b2l17-FF \ + tests/pr/b3-0F \ + tests/pr/b3f-0F \ + tests/pr/b3f-0FF \ + tests/pr/b3f-FF \ + tests/pr/b3l15-t \ + tests/pr/b3l15f-t \ + tests/pr/b3l24f-lm \ + tests/pr/l24-FF \ + tests/pr/l24-t \ + tests/pr/l24f-t \ + tests/pr/loli \ + tests/pr/ml20-FF-t \ + tests/pr/ml24-FF \ + tests/pr/ml24-t \ + tests/pr/ml24-t-FF \ + tests/pr/ml24f-0F \ + tests/pr/ml24f-lm-lo \ + tests/pr/ml24f-t \ + tests/pr/ml24f-t-0F \ + tests/pr/n+2-5l24f-0FF \ + tests/pr/n+2l24f-0FF \ + tests/pr/n+2l24f-bl \ + tests/pr/n+3-7l24-FF \ + tests/pr/n+3l24f-0FF \ + tests/pr/n+3l24f-bl \ + tests/pr/n+3ml20f-bl-FF \ + tests/pr/n+3ml24f-bl-tn \ + tests/pr/n+3ml24f-tn-bl \ + tests/pr/n+4-8a2l17-FF \ + tests/pr/n+4b2l17f-0FF \ + tests/pr/n+5-8b3l17f-FF \ + tests/pr/n+5a3l13f-0FF \ + tests/pr/n+6a2l17-FF \ + tests/pr/n+6b3l13f-FF \ + tests/pr/n+7l24-FF \ + tests/pr/n+8l20-FF \ + tests/pr/nJml24f-lmlmlo \ + tests/pr/nJml24f-lmlolm \ + tests/pr/nN1+3l24f-bl \ + tests/pr/nN15l24f-bl \ + tests/pr/nSml20-bl-FF \ + tests/pr/nSml20-t-t-FF \ + tests/pr/nSml20-t-tFFFF \ + tests/pr/nSml24-bl-FF \ + tests/pr/nSml24-t-t-FF \ + tests/pr/nSml24-t-tFFFF \ + tests/pr/nl24f-bl \ + tests/pr/o3Jml24f-lm-lo \ + tests/pr/o3a3Sl24f-tn \ + tests/pr/o3a3Snl24f-tn \ + tests/pr/o3a3l24f-tn \ + tests/pr/o3b3Sl24f-tn \ + tests/pr/o3b3Snl24f-tn \ + tests/pr/o3b3l24f-tn \ + tests/pr/o3mSl24f-bl-tn \ + tests/pr/o3mSnl24fbltn \ + tests/pr/o3ml24f-bl-tn \ + tests/pr/t-0FF \ + tests/pr/t-FF \ + tests/pr/t-bl \ + tests/pr/t-t \ + tests/pr/tFFn \ + tests/pr/tFFt \ + tests/pr/tFFt-bl \ + tests/pr/tFFt-ll \ + tests/pr/tFFt-lm \ + tests/pr/tFnFt \ + tests/pr/t_notab \ + tests/pr/t_tab \ + tests/pr/t_tab_ \ + tests/pr/ta3-0FF \ + tests/pr/ta3-FF \ + tests/pr/tb3-0FF \ + tests/pr/tb3-FF \ + tests/pr/tn \ + tests/pr/tn2e5o3-t_tab \ + tests/pr/tn2e8-t_tab \ + tests/pr/tn2e8o3-t_tab \ + tests/pr/tn_2e8-t_tab \ + tests/pr/tn_2e8S-t_tab \ + tests/pr/tne8-t_tab \ + tests/pr/tne8o3-t_tab \ + tests/pr/tt-0FF \ + tests/pr/tt-FF \ + tests/pr/tt-bl \ + tests/pr/tt-t \ + tests/pr/tta3-0FF \ + tests/pr/tta3-FF \ + tests/pr/ttb3-0FF \ + tests/pr/ttb3-FF \ + tests/pr/w72l24f-ll + +$(TEST_LOGS): $(PROGRAMS) diff --git a/tests/ls/abmon-align b/tests/ls/abmon-align deleted file mode 100755 index 4285d075..00000000 --- a/tests/ls/abmon-align +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -# Ensure ls output is aligned when using abbreviated months from the locale - -# Copyright (C) 2009-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ ls - -for mon in $(seq -w 12); do - touch -d"+$mon month" $mon.ts || framework_failure_ -done - - -# Note some of the following locales may be missing but if so -# we should fail back to the C locale which should be aligned - -for format in "%b" "[%b" "%b]" "[%b]"; do - for LOC in C gv_GB ga_IE fi_FI.utf8 zh_CN ar_SY $LOCALE_FR_UTF8; do - # The sed usage here is slightly different from the original, - # removing the \(.*\), to avoid triggering misbehavior in at least - # GNU sed 4.2 (possibly miscompiled) on Mac OS X (Darwin 9.8.0). - n_widths=$( - LC_ALL=$LOC TIME_STYLE=+"$format" ls -lgG *.ts | - LC_ALL=C sed 's/.\{15\}//;s/ ..\.ts$//;s/ /./g' | - while read mon; do echo "$mon" | LC_ALL=$LOC wc -L; done | - uniq | wc -l - ) - test "$n_widths" = "1" || { fail=1; break 2; } - done -done -if test "$fail" = "1"; then - echo "misalignment detected in $LOC locale:" - LC_ALL=$LOC TIME_STYLE=+%b ls -lgG *.ts -fi - -Exit $fail diff --git a/tests/ls/abmon-align.sh b/tests/ls/abmon-align.sh new file mode 100755 index 00000000..4c7dc296 --- /dev/null +++ b/tests/ls/abmon-align.sh @@ -0,0 +1,49 @@ +#!/bin/sh +# Ensure ls output is aligned when using abbreviated months from the locale + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ ls + +for mon in $(seq -w 12); do + touch -d"+$mon month" $mon.ts || framework_failure_ +done + + +# Note some of the following locales may be missing but if so +# we should fail back to the C locale which should be aligned + +for format in "%b" "[%b" "%b]" "[%b]"; do + for LOC in C gv_GB ga_IE fi_FI.utf8 zh_CN ar_SY $LOCALE_FR_UTF8; do + # The sed usage here is slightly different from the original, + # removing the \(.*\), to avoid triggering misbehavior in at least + # GNU sed 4.2 (possibly miscompiled) on Mac OS X (Darwin 9.8.0). + n_widths=$( + LC_ALL=$LOC TIME_STYLE=+"$format" ls -lgG *.ts | + LC_ALL=C sed 's/.\{15\}//;s/ ..\.ts$//;s/ /./g' | + while read mon; do echo "$mon" | LC_ALL=$LOC wc -L; done | + uniq | wc -l + ) + test "$n_widths" = "1" || { fail=1; break 2; } + done +done +if test "$fail" = "1"; then + echo "misalignment detected in $LOC locale:" + LC_ALL=$LOC TIME_STYLE=+%b ls -lgG *.ts +fi + +Exit $fail diff --git a/tests/ls/block-size b/tests/ls/block-size deleted file mode 100755 index 99750201..00000000 --- a/tests/ls/block-size +++ /dev/null @@ -1,173 +0,0 @@ -#!/bin/sh -# Exercise ls --block-size and related options. - -# Copyright (C) 2011-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ ls - -TZ=UTC0 -export TZ - -mkdir sub -cd sub - -for size in 1024 4096 262144; do - echo foo | dd conv=sync bs=$size >file$size || fail=1 -done -touch -d '2001-01-01 00:00' file* || fail=1 - -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 - -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 * - ) | sed "$size_etc" >>../out || fail=1 - done -done - -cd .. - -cat >exp <<'EOF' -1024 Jan 1 2001 file1024 -262144 Jan 1 2001 file262144 -4096 Jan 1 2001 file4096 -1024 Jan 1 2001 file1024 -262144 Jan 1 2001 file262144 -4096 Jan 1 2001 file4096 -1024 Jan 1 2001 file1024 -262144 Jan 1 2001 file262144 -4096 Jan 1 2001 file4096 -1024 Jan 1 2001 file1024 -262144 Jan 1 2001 file262144 -4096 Jan 1 2001 file4096 -1024 Jan 1 2001 file1024 -262144 Jan 1 2001 file262144 -4096 Jan 1 2001 file4096 -1024 Jan 1 2001 file1024 -262144 Jan 1 2001 file262144 -4096 Jan 1 2001 file4096 -1024 Jan 1 2001 file1024 -262144 Jan 1 2001 file262144 -4096 Jan 1 2001 file4096 -1024 Jan 1 2001 file1024 -262144 Jan 1 2001 file262144 -4096 Jan 1 2001 file4096 -2 Jan 1 2001 file1024 -512 Jan 1 2001 file262144 -8 Jan 1 2001 file4096 -1024 Jan 1 2001 file1024 -262144 Jan 1 2001 file262144 -4096 Jan 1 2001 file4096 -1024 Jan 1 2001 file1024 -262144 Jan 1 2001 file262144 -4096 Jan 1 2001 file4096 -1 Jan 1 2001 file1024 -256 Jan 1 2001 file262144 -4 Jan 1 2001 file4096 -1024 Jan 1 2001 file1024 -262144 Jan 1 2001 file262144 -4096 Jan 1 2001 file4096 -1024 Jan 1 2001 file1024 -262144 Jan 1 2001 file262144 -4096 Jan 1 2001 file4096 -1 Jan 1 2001 file1024 -256 Jan 1 2001 file262144 -4 Jan 1 2001 file4096 -1024 Jan 1 2001 file1024 -262144 Jan 1 2001 file262144 -4096 Jan 1 2001 file4096 -1024 Jan 1 2001 file1024 -262144 Jan 1 2001 file262144 -4096 Jan 1 2001 file4096 -1024 Jan 1 2001 file1024 -262144 Jan 1 2001 file262144 -4096 Jan 1 2001 file4096 -2 Jan 1 2001 file1024 -512 Jan 1 2001 file262144 -8 Jan 1 2001 file4096 -2 Jan 1 2001 file1024 -512 Jan 1 2001 file262144 -8 Jan 1 2001 file4096 -2 Jan 1 2001 file1024 -512 Jan 1 2001 file262144 -8 Jan 1 2001 file4096 -1 Jan 1 2001 file1024 -256 Jan 1 2001 file262144 -4 Jan 1 2001 file4096 -1 Jan 1 2001 file1024 -256 Jan 1 2001 file262144 -4 Jan 1 2001 file4096 -1 Jan 1 2001 file1024 -256 Jan 1 2001 file262144 -4 Jan 1 2001 file4096 -1 Jan 1 2001 file1024 -256 Jan 1 2001 file262144 -4 Jan 1 2001 file4096 -1 Jan 1 2001 file1024 -256 Jan 1 2001 file262144 -4 Jan 1 2001 file4096 -1 Jan 1 2001 file1024 -256 Jan 1 2001 file262144 -4 Jan 1 2001 file4096 -1024 Jan 1 2001 file1024 -262144 Jan 1 2001 file262144 -4096 Jan 1 2001 file4096 -1024 Jan 1 2001 file1024 -262144 Jan 1 2001 file262144 -4096 Jan 1 2001 file4096 -1024 Jan 1 2001 file1024 -262144 Jan 1 2001 file262144 -4096 Jan 1 2001 file4096 -2 Jan 1 2001 file1024 -512 Jan 1 2001 file262144 -8 Jan 1 2001 file4096 -2 Jan 1 2001 file1024 -512 Jan 1 2001 file262144 -8 Jan 1 2001 file4096 -2 Jan 1 2001 file1024 -512 Jan 1 2001 file262144 -8 Jan 1 2001 file4096 -1 Jan 1 2001 file1024 -256 Jan 1 2001 file262144 -4 Jan 1 2001 file4096 -1 Jan 1 2001 file1024 -256 Jan 1 2001 file262144 -4 Jan 1 2001 file4096 -1 Jan 1 2001 file1024 -256 Jan 1 2001 file262144 -4 Jan 1 2001 file4096 -1 Jan 1 2001 file1024 -256 Jan 1 2001 file262144 -4 Jan 1 2001 file4096 -1 Jan 1 2001 file1024 -256 Jan 1 2001 file262144 -4 Jan 1 2001 file4096 -1 Jan 1 2001 file1024 -256 Jan 1 2001 file262144 -4 Jan 1 2001 file4096 -EOF - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/ls/block-size.sh b/tests/ls/block-size.sh new file mode 100755 index 00000000..2ae5a0c5 --- /dev/null +++ b/tests/ls/block-size.sh @@ -0,0 +1,173 @@ +#!/bin/sh +# Exercise ls --block-size and related options. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ ls + +TZ=UTC0 +export TZ + +mkdir sub +cd sub + +for size in 1024 4096 262144; do + echo foo | dd conv=sync bs=$size >file$size || fail=1 +done +touch -d '2001-01-01 00:00' file* || fail=1 + +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 + +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 * + ) | sed "$size_etc" >>../out || fail=1 + done +done + +cd .. + +cat >exp <<'EOF' +1024 Jan 1 2001 file1024 +262144 Jan 1 2001 file262144 +4096 Jan 1 2001 file4096 +1024 Jan 1 2001 file1024 +262144 Jan 1 2001 file262144 +4096 Jan 1 2001 file4096 +1024 Jan 1 2001 file1024 +262144 Jan 1 2001 file262144 +4096 Jan 1 2001 file4096 +1024 Jan 1 2001 file1024 +262144 Jan 1 2001 file262144 +4096 Jan 1 2001 file4096 +1024 Jan 1 2001 file1024 +262144 Jan 1 2001 file262144 +4096 Jan 1 2001 file4096 +1024 Jan 1 2001 file1024 +262144 Jan 1 2001 file262144 +4096 Jan 1 2001 file4096 +1024 Jan 1 2001 file1024 +262144 Jan 1 2001 file262144 +4096 Jan 1 2001 file4096 +1024 Jan 1 2001 file1024 +262144 Jan 1 2001 file262144 +4096 Jan 1 2001 file4096 +2 Jan 1 2001 file1024 +512 Jan 1 2001 file262144 +8 Jan 1 2001 file4096 +1024 Jan 1 2001 file1024 +262144 Jan 1 2001 file262144 +4096 Jan 1 2001 file4096 +1024 Jan 1 2001 file1024 +262144 Jan 1 2001 file262144 +4096 Jan 1 2001 file4096 +1 Jan 1 2001 file1024 +256 Jan 1 2001 file262144 +4 Jan 1 2001 file4096 +1024 Jan 1 2001 file1024 +262144 Jan 1 2001 file262144 +4096 Jan 1 2001 file4096 +1024 Jan 1 2001 file1024 +262144 Jan 1 2001 file262144 +4096 Jan 1 2001 file4096 +1 Jan 1 2001 file1024 +256 Jan 1 2001 file262144 +4 Jan 1 2001 file4096 +1024 Jan 1 2001 file1024 +262144 Jan 1 2001 file262144 +4096 Jan 1 2001 file4096 +1024 Jan 1 2001 file1024 +262144 Jan 1 2001 file262144 +4096 Jan 1 2001 file4096 +1024 Jan 1 2001 file1024 +262144 Jan 1 2001 file262144 +4096 Jan 1 2001 file4096 +2 Jan 1 2001 file1024 +512 Jan 1 2001 file262144 +8 Jan 1 2001 file4096 +2 Jan 1 2001 file1024 +512 Jan 1 2001 file262144 +8 Jan 1 2001 file4096 +2 Jan 1 2001 file1024 +512 Jan 1 2001 file262144 +8 Jan 1 2001 file4096 +1 Jan 1 2001 file1024 +256 Jan 1 2001 file262144 +4 Jan 1 2001 file4096 +1 Jan 1 2001 file1024 +256 Jan 1 2001 file262144 +4 Jan 1 2001 file4096 +1 Jan 1 2001 file1024 +256 Jan 1 2001 file262144 +4 Jan 1 2001 file4096 +1 Jan 1 2001 file1024 +256 Jan 1 2001 file262144 +4 Jan 1 2001 file4096 +1 Jan 1 2001 file1024 +256 Jan 1 2001 file262144 +4 Jan 1 2001 file4096 +1 Jan 1 2001 file1024 +256 Jan 1 2001 file262144 +4 Jan 1 2001 file4096 +1024 Jan 1 2001 file1024 +262144 Jan 1 2001 file262144 +4096 Jan 1 2001 file4096 +1024 Jan 1 2001 file1024 +262144 Jan 1 2001 file262144 +4096 Jan 1 2001 file4096 +1024 Jan 1 2001 file1024 +262144 Jan 1 2001 file262144 +4096 Jan 1 2001 file4096 +2 Jan 1 2001 file1024 +512 Jan 1 2001 file262144 +8 Jan 1 2001 file4096 +2 Jan 1 2001 file1024 +512 Jan 1 2001 file262144 +8 Jan 1 2001 file4096 +2 Jan 1 2001 file1024 +512 Jan 1 2001 file262144 +8 Jan 1 2001 file4096 +1 Jan 1 2001 file1024 +256 Jan 1 2001 file262144 +4 Jan 1 2001 file4096 +1 Jan 1 2001 file1024 +256 Jan 1 2001 file262144 +4 Jan 1 2001 file4096 +1 Jan 1 2001 file1024 +256 Jan 1 2001 file262144 +4 Jan 1 2001 file4096 +1 Jan 1 2001 file1024 +256 Jan 1 2001 file262144 +4 Jan 1 2001 file4096 +1 Jan 1 2001 file1024 +256 Jan 1 2001 file262144 +4 Jan 1 2001 file4096 +1 Jan 1 2001 file1024 +256 Jan 1 2001 file262144 +4 Jan 1 2001 file4096 +EOF + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/ls/capability b/tests/ls/capability deleted file mode 100755 index d5d5ee04..00000000 --- a/tests/ls/capability +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/sh -# Ensure "ls --color" properly colorizes file with capability. - -# Copyright (C) 2008-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ ls -require_root_ - -grep '^#define HAVE_CAP 1' $CONFIG_HEADER > /dev/null \ - || skip_ "configured without libcap support" - -(setcap --help) 2>&1 |grep 'usage: setcap' > /dev/null \ - || skip_ "setcap utility not found" - -# Don't let a different umask perturb the results. -umask 22 - -# We create 2 files of the same name as -# before coreutils 8.1 only the name rather than -# the full path was used to read the capabilities -# thus giving false positives and negatives. -mkdir test test/dir -cd test -touch cap_pos dir/cap_pos dir/cap_neg -for file in cap_pos dir/cap_neg; do - setcap 'cap_net_bind_service=ep' $file || - skip_ "setcap doesn't work" -done - -code='30;41' -# Note we explicitly disable "executable" coloring -# so that capability coloring is not dependent on it, -# as was the case before coreutils 8.1 -for ex in '' ex=:; do - LS_COLORS="di=:${ex}ca=$code" \ - ls --color=always cap_pos dir > out || fail=1 - - env printf "\ -\e[0m\e[${code}mcap_pos\e[0m - -dir: -\e[${code}mcap_neg\e[0m -cap_pos -" > out_ok || framework_failure_ - - compare out out_ok || fail=1 -done - -Exit $fail diff --git a/tests/ls/capability.sh b/tests/ls/capability.sh new file mode 100755 index 00000000..6b41a39f --- /dev/null +++ b/tests/ls/capability.sh @@ -0,0 +1,63 @@ +#!/bin/sh +# Ensure "ls --color" properly colorizes file with capability. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ ls +require_root_ + +grep '^#define HAVE_CAP 1' $CONFIG_HEADER > /dev/null \ + || skip_ "configured without libcap support" + +(setcap --help) 2>&1 |grep 'usage: setcap' > /dev/null \ + || skip_ "setcap utility not found" + +# Don't let a different umask perturb the results. +umask 22 + +# We create 2 files of the same name as +# before coreutils 8.1 only the name rather than +# the full path was used to read the capabilities +# thus giving false positives and negatives. +mkdir test test/dir +cd test +touch cap_pos dir/cap_pos dir/cap_neg +for file in cap_pos dir/cap_neg; do + setcap 'cap_net_bind_service=ep' $file || + skip_ "setcap doesn't work" +done + +code='30;41' +# Note we explicitly disable "executable" coloring +# so that capability coloring is not dependent on it, +# as was the case before coreutils 8.1 +for ex in '' ex=:; do + LS_COLORS="di=:${ex}ca=$code" \ + ls --color=always cap_pos dir > out || fail=1 + + env printf "\ +\e[0m\e[${code}mcap_pos\e[0m + +dir: +\e[${code}mcap_neg\e[0m +cap_pos +" > out_ok || framework_failure_ + + compare out out_ok || fail=1 +done + +Exit $fail diff --git a/tests/ls/color-clear-to-eol b/tests/ls/color-clear-to-eol deleted file mode 100755 index 5dc6d16b..00000000 --- a/tests/ls/color-clear-to-eol +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh -# ensure that ls --color works well when a colored name is wrapped - -# Copyright (C) 2009-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ ls - -long_name=zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz.foo -touch $long_name || framework_failure_ - -e='\33' -color_code='0;31;42' -c_pre="$e[0m$e[${color_code}m" -c_post="$e[0m$e[K\n" -printf "$c_pre$long_name$c_post\n" > exp || framework_failure_ - -env TERM=xterm COLUMNS=80 LS_COLORS="*.foo=$color_code" TIME_STYLE=+T \ - ls -og --color=always $long_name > out || fail=1 - -# Append a newline, to accommodate less-capable versions of sed. -echo >> out || fail=1 - -sed 's/.*T //' out > k && mv k out - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/ls/color-clear-to-eol.sh b/tests/ls/color-clear-to-eol.sh new file mode 100755 index 00000000..3d393f47 --- /dev/null +++ b/tests/ls/color-clear-to-eol.sh @@ -0,0 +1,41 @@ +#!/bin/sh +# ensure that ls --color works well when a colored name is wrapped + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ ls + +long_name=zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz.foo +touch $long_name || framework_failure_ + +e='\33' +color_code='0;31;42' +c_pre="$e[0m$e[${color_code}m" +c_post="$e[0m$e[K\n" +printf "$c_pre$long_name$c_post\n" > exp || framework_failure_ + +env TERM=xterm COLUMNS=80 LS_COLORS="*.foo=$color_code" TIME_STYLE=+T \ + ls -og --color=always $long_name > out || fail=1 + +# Append a newline, to accommodate less-capable versions of sed. +echo >> out || fail=1 + +sed 's/.*T //' out > k && mv k out + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/ls/color-dtype-dir b/tests/ls/color-dtype-dir deleted file mode 100755 index 69dffd79..00000000 --- a/tests/ls/color-dtype-dir +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/sh -# Ensure "ls --color" properly colors other-writable and sticky directories. -# Before coreutils-6.2, this test would fail, coloring all three -# directories the same as the first one -- but only on a file system -# with dirent.d_type support. - -# Copyright (C) 2006-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ ls - -# Don't let a different umask perturb the results. -umask 22 - -mkdir d other-writable sticky || framework_failure_ -chmod o+w other-writable || framework_failure_ -chmod o+t sticky || framework_failure_ - - -ls --color=always > out || fail=1 -cat -A out > o1 || fail=1 -mv o1 out || fail=1 - -cat <<\EOF > exp || fail=1 -^[[0m^[[01;34md^[[0m$ -^[[34;42mother-writable^[[0m$ -out$ -^[[37;44msticky^[[0m$ -EOF - -compare exp out || fail=1 - -rm exp - -# Turn off colors for other-writable dirs and ensure -# we fall back to the color for standard directories. - -LS_COLORS="ow=:" ls --color=always > out || fail=1 -cat -A out > o1 || fail=1 -mv o1 out || fail=1 - -cat <<\EOF > exp || fail=1 -^[[0m^[[01;34md^[[0m$ -^[[01;34mother-writable^[[0m$ -out$ -^[[37;44msticky^[[0m$ -EOF - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/ls/color-dtype-dir.sh b/tests/ls/color-dtype-dir.sh new file mode 100755 index 00000000..fc96e21f --- /dev/null +++ b/tests/ls/color-dtype-dir.sh @@ -0,0 +1,64 @@ +#!/bin/sh +# Ensure "ls --color" properly colors other-writable and sticky directories. +# Before coreutils-6.2, this test would fail, coloring all three +# 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. + +# This 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 + +# Don't let a different umask perturb the results. +umask 22 + +mkdir d other-writable sticky || framework_failure_ +chmod o+w other-writable || framework_failure_ +chmod o+t sticky || framework_failure_ + + +ls --color=always > out || fail=1 +cat -A out > o1 || fail=1 +mv o1 out || fail=1 + +cat <<\EOF > exp || fail=1 +^[[0m^[[01;34md^[[0m$ +^[[34;42mother-writable^[[0m$ +out$ +^[[37;44msticky^[[0m$ +EOF + +compare exp out || fail=1 + +rm exp + +# Turn off colors for other-writable dirs and ensure +# we fall back to the color for standard directories. + +LS_COLORS="ow=:" ls --color=always > out || fail=1 +cat -A out > o1 || fail=1 +mv o1 out || fail=1 + +cat <<\EOF > exp || fail=1 +^[[0m^[[01;34md^[[0m$ +^[[01;34mother-writable^[[0m$ +out$ +^[[37;44msticky^[[0m$ +EOF + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/ls/color-norm b/tests/ls/color-norm deleted file mode 100755 index 28366fb5..00000000 --- a/tests/ls/color-norm +++ /dev/null @@ -1,84 +0,0 @@ -#!/bin/sh -# Ensure "ls --color" properly colors "normal" text and files. -# 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-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ ls - -# Don't let a different umask perturb the results. -umask 22 - -# Output time as something constant -export TIME_STYLE="+norm" - -# helper to strip ls columns up to "norm" time -qls() { sed 's/-r.*norm/norm/'; } - -touch exe || framework_failure_ -chmod u+x exe || framework_failure_ -touch nocolor || framework_failure_ - -TCOLORS="no=7:ex=01;32" - -# Non coloured files inherit NORMAL attributes -LS_COLORS=$TCOLORS ls -gGU --color exe nocolor | qls >> out || fail=1 -LS_COLORS=$TCOLORS ls -xU --color exe nocolor >> out || fail=1 -LS_COLORS=$TCOLORS ls -gGU --color nocolor exe | qls >> out || fail=1 -LS_COLORS=$TCOLORS ls -xU --color nocolor exe >> out || fail=1 - -# NORMAL does not override FILE though -LS_COLORS=$TCOLORS:fi=1 ls -gGU --color nocolor exe | qls >> out || fail=1 - -# Support uncolored ordinary files that do _not_ inherit from NORMAL. -# Note there is a redundant RESET output before a non colored -# file in this case which may be removed in future. -LS_COLORS=$TCOLORS:fi= ls -gGU --color nocolor exe | qls >> out || fail=1 -LS_COLORS=$TCOLORS:fi=0 ls -gGU --color nocolor exe | qls >> out || fail=1 - -# A caveat worth noting is that commas (-m), indicator chars (-F) -# and the "total" line, do not currently use NORMAL attributes -LS_COLORS=$TCOLORS ls -mFU --color nocolor exe >> out || fail=1 - -# Ensure no coloring is done unless enabled -LS_COLORS=$TCOLORS ls -gGU nocolor exe | qls >> out || fail=1 - -cat -A out > out.display || framework_failure_ -mv out.display out || framework_failure_ - -cat <<\EOF > exp || framework_failure_ -^[[0m^[[7mnorm ^[[m^[[01;32mexe^[[0m$ -^[[7mnorm nocolor^[[0m$ -^[[0m^[[7m^[[m^[[01;32mexe^[[0m ^[[7mnocolor^[[0m$ -^[[0m^[[7mnorm nocolor^[[0m$ -^[[7mnorm ^[[m^[[01;32mexe^[[0m$ -^[[0m^[[7mnocolor^[[0m ^[[7m^[[m^[[01;32mexe^[[0m$ -^[[0m^[[7mnorm ^[[m^[[1mnocolor^[[0m$ -^[[7mnorm ^[[m^[[01;32mexe^[[0m$ -^[[0m^[[7mnorm ^[[m^[[mnocolor^[[0m$ -^[[7mnorm ^[[m^[[01;32mexe^[[0m$ -^[[0m^[[7mnorm ^[[m^[[0mnocolor^[[0m$ -^[[7mnorm ^[[m^[[01;32mexe^[[0m$ -^[[0m^[[7mnocolor^[[0m, ^[[7m^[[m^[[01;32mexe^[[0m*$ -norm nocolor$ -norm exe$ -EOF - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/ls/color-norm.sh b/tests/ls/color-norm.sh new file mode 100755 index 00000000..9910903b --- /dev/null +++ b/tests/ls/color-norm.sh @@ -0,0 +1,84 @@ +#!/bin/sh +# Ensure "ls --color" properly colors "normal" text and files. +# 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. + +# This 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 + +# Don't let a different umask perturb the results. +umask 22 + +# Output time as something constant +export TIME_STYLE="+norm" + +# helper to strip ls columns up to "norm" time +qls() { sed 's/-r.*norm/norm/'; } + +touch exe || framework_failure_ +chmod u+x exe || framework_failure_ +touch nocolor || framework_failure_ + +TCOLORS="no=7:ex=01;32" + +# Non coloured files inherit NORMAL attributes +LS_COLORS=$TCOLORS ls -gGU --color exe nocolor | qls >> out || fail=1 +LS_COLORS=$TCOLORS ls -xU --color exe nocolor >> out || fail=1 +LS_COLORS=$TCOLORS ls -gGU --color nocolor exe | qls >> out || fail=1 +LS_COLORS=$TCOLORS ls -xU --color nocolor exe >> out || fail=1 + +# NORMAL does not override FILE though +LS_COLORS=$TCOLORS:fi=1 ls -gGU --color nocolor exe | qls >> out || fail=1 + +# Support uncolored ordinary files that do _not_ inherit from NORMAL. +# Note there is a redundant RESET output before a non colored +# file in this case which may be removed in future. +LS_COLORS=$TCOLORS:fi= ls -gGU --color nocolor exe | qls >> out || fail=1 +LS_COLORS=$TCOLORS:fi=0 ls -gGU --color nocolor exe | qls >> out || fail=1 + +# A caveat worth noting is that commas (-m), indicator chars (-F) +# and the "total" line, do not currently use NORMAL attributes +LS_COLORS=$TCOLORS ls -mFU --color nocolor exe >> out || fail=1 + +# Ensure no coloring is done unless enabled +LS_COLORS=$TCOLORS ls -gGU nocolor exe | qls >> out || fail=1 + +cat -A out > out.display || framework_failure_ +mv out.display out || framework_failure_ + +cat <<\EOF > exp || framework_failure_ +^[[0m^[[7mnorm ^[[m^[[01;32mexe^[[0m$ +^[[7mnorm nocolor^[[0m$ +^[[0m^[[7m^[[m^[[01;32mexe^[[0m ^[[7mnocolor^[[0m$ +^[[0m^[[7mnorm nocolor^[[0m$ +^[[7mnorm ^[[m^[[01;32mexe^[[0m$ +^[[0m^[[7mnocolor^[[0m ^[[7m^[[m^[[01;32mexe^[[0m$ +^[[0m^[[7mnorm ^[[m^[[1mnocolor^[[0m$ +^[[7mnorm ^[[m^[[01;32mexe^[[0m$ +^[[0m^[[7mnorm ^[[m^[[mnocolor^[[0m$ +^[[7mnorm ^[[m^[[01;32mexe^[[0m$ +^[[0m^[[7mnorm ^[[m^[[0mnocolor^[[0m$ +^[[7mnorm ^[[m^[[01;32mexe^[[0m$ +^[[0m^[[7mnocolor^[[0m, ^[[7m^[[m^[[01;32mexe^[[0m*$ +norm nocolor$ +norm exe$ +EOF + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/ls/dangle b/tests/ls/dangle deleted file mode 100755 index dbc24476..00000000 --- a/tests/ls/dangle +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/sh -# Make sure ls properly handles dangling symlinks vs. ls's -L, -H, options. - -# Copyright (C) 2003-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ ls - -ln -s no-such-file dangle || framework_failure_ -mkdir -p dir/sub || framework_failure_ -ln -s dir slink-to-dir || framework_failure_ -mkdir d || framework_failure_ -ln -s no-such d/dangle || framework_failure_ -printf '? dangle\n' > subdir_Li_exp || framework_failure_ -printf 'total 0\n? dangle\n' > subdir_Ls_exp || framework_failure_ - - -# This must exit nonzero. -ls -L dangle > /dev/null 2>&1 && fail=1 -# So must this. -ls -H dangle > /dev/null 2>&1 && fail=1 - -# This must exit successfully. -ls dangle >> out || fail=1 - -ls slink-to-dir >> out 2>&1 || fail=1 -ls -H slink-to-dir >> out 2>&1 || fail=1 -ls -L slink-to-dir >> out 2>&1 || fail=1 - -cat <<\EOF > exp -dangle -sub -sub -sub -EOF - -compare exp out || fail=1 - -# Ensure that ls -Li prints "?" as the inode of a dangling symlink. -rm -f out -ls -Li d > out 2>/dev/null && fail=1 -compare subdir_Li_exp out || fail=1 - -# Ensure that ls -Ls prints "?" as the allocation of a dangling symlink. -rm -f out -ls -Ls d > out 2>/dev/null && fail=1 -compare subdir_Ls_exp out || fail=1 - -Exit $fail diff --git a/tests/ls/dangle.sh b/tests/ls/dangle.sh new file mode 100755 index 00000000..e22519d9 --- /dev/null +++ b/tests/ls/dangle.sh @@ -0,0 +1,62 @@ +#!/bin/sh +# Make sure ls properly handles dangling symlinks vs. ls's -L, -H, options. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ ls + +ln -s no-such-file dangle || framework_failure_ +mkdir -p dir/sub || framework_failure_ +ln -s dir slink-to-dir || framework_failure_ +mkdir d || framework_failure_ +ln -s no-such d/dangle || framework_failure_ +printf '? dangle\n' > subdir_Li_exp || framework_failure_ +printf 'total 0\n? dangle\n' > subdir_Ls_exp || framework_failure_ + + +# This must exit nonzero. +ls -L dangle > /dev/null 2>&1 && fail=1 +# So must this. +ls -H dangle > /dev/null 2>&1 && fail=1 + +# This must exit successfully. +ls dangle >> out || fail=1 + +ls slink-to-dir >> out 2>&1 || fail=1 +ls -H slink-to-dir >> out 2>&1 || fail=1 +ls -L slink-to-dir >> out 2>&1 || fail=1 + +cat <<\EOF > exp +dangle +sub +sub +sub +EOF + +compare exp out || fail=1 + +# Ensure that ls -Li prints "?" as the inode of a dangling symlink. +rm -f out +ls -Li d > out 2>/dev/null && fail=1 +compare subdir_Li_exp out || fail=1 + +# Ensure that ls -Ls prints "?" as the allocation of a dangling symlink. +rm -f out +ls -Ls d > out 2>/dev/null && fail=1 +compare subdir_Ls_exp out || fail=1 + +Exit $fail diff --git a/tests/ls/dired b/tests/ls/dired deleted file mode 100755 index 6b55f435..00000000 --- a/tests/ls/dired +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# make sure --dired option works - -# Copyright (C) 2001-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ ls - -mkdir dir || framework_failure_ - - -LC_MESSAGES=C ls -lR --dired dir > out || fail=1 -cat <<EOF > exp - dir: - total 0 -//SUBDIRED// 2 5 -//DIRED-OPTIONS// --quoting-style=literal -EOF - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/ls/dired.sh b/tests/ls/dired.sh new file mode 100755 index 00000000..82110034 --- /dev/null +++ b/tests/ls/dired.sh @@ -0,0 +1,35 @@ +#!/bin/sh +# make sure --dired option works + +# Copyright (C) 2001-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ ls + +mkdir dir || framework_failure_ + + +LC_MESSAGES=C ls -lR --dired dir > out || fail=1 +cat <<EOF > exp + dir: + total 0 +//SUBDIRED// 2 5 +//DIRED-OPTIONS// --quoting-style=literal +EOF + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/ls/file-type b/tests/ls/file-type deleted file mode 100755 index 3bb7937a..00000000 --- a/tests/ls/file-type +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/sh -# contrast ls -F, ls -p, and ls --indicator-style=file-type - -# Copyright (C) 2002-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ ls - -mkdir sub -cd sub -mkdir dir -touch regular executable -chmod a+x executable -ln -s regular slink-reg -ln -s dir slink-dir -ln -s nowhere slink-dangle -mknod block b 20 20 2> /dev/null && block="block -" -mknod char c 10 10 2> /dev/null && char="char -" -mkfifo_or_skip_ fifo -cd .. - - - -ls -F sub > out || fail=1 -cat <<EOF > exp -$block${char}dir/ -executable* -fifo| -regular -slink-dangle@ -slink-dir@ -slink-reg@ -EOF - -sed 's/\*//' exp > exp2 -ls --indicator-style=file-type sub > out2 || fail=1 - -sed 's/[@|]$//' exp2 > exp3 -ls -p sub > out3 || fail=1 - -compare exp out || fail=1 - -compare exp2 out2 || fail=1 - -compare exp3 out3 || fail=1 - -ls --color=auto -F sub > out || fail=1 -compare exp out || fail=1 - -Exit $fail diff --git a/tests/ls/file-type.sh b/tests/ls/file-type.sh new file mode 100755 index 00000000..62a7dcf7 --- /dev/null +++ b/tests/ls/file-type.sh @@ -0,0 +1,65 @@ +#!/bin/sh +# contrast ls -F, ls -p, and ls --indicator-style=file-type + +# Copyright (C) 2002-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ ls + +mkdir sub +cd sub +mkdir dir +touch regular executable +chmod a+x executable +ln -s regular slink-reg +ln -s dir slink-dir +ln -s nowhere slink-dangle +mknod block b 20 20 2> /dev/null && block="block +" +mknod char c 10 10 2> /dev/null && char="char +" +mkfifo_or_skip_ fifo +cd .. + + + +ls -F sub > out || fail=1 +cat <<EOF > exp +$block${char}dir/ +executable* +fifo| +regular +slink-dangle@ +slink-dir@ +slink-reg@ +EOF + +sed 's/\*//' exp > exp2 +ls --indicator-style=file-type sub > out2 || fail=1 + +sed 's/[@|]$//' exp2 > exp3 +ls -p sub > out3 || fail=1 + +compare exp out || fail=1 + +compare exp2 out2 || fail=1 + +compare exp3 out3 || fail=1 + +ls --color=auto -F sub > out || fail=1 +compare exp out || fail=1 + +Exit $fail diff --git a/tests/ls/follow-slink b/tests/ls/follow-slink deleted file mode 100755 index d3c0d6ef..00000000 --- a/tests/ls/follow-slink +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -# make sure ls -L always follows symlinks - -# Copyright (C) 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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ ls - -# Isolate output files from directory being listed -mkdir dir dir/sub dir1 || framework_failure_ -cd dir || framework_failure_ -ln -s link link || framework_failure_ -ln -s ../../dir1 sub/link-to-dir || framework_failure_ - -# Make sure the symlink was created. -# 'ln -s link link' succeeds, but creates no file on -# systems running some DJGPP-2.03 libc. -ls -F link > /dev/null || framework_failure_ - - -# When explicitly listing a broken link, the command must fail. -ls -L link 2> /dev/null && fail=1 - -# When encountering a broken link implicitly, Solaris 9 and OpenBSD 3.4 -# list the link, provided no further information about the link needed -# to be printed. Since POSIX does not specify one way or the other, we -# opt for compatibility (this was broken in 5.3.0 through 5.94). -LC_ALL=C ls -L > ../out-L || fail=1 -LC_ALL=C ls -FLR sub > ../out-FLR-sub || fail=1 - -cd .. || fail=1 - -cat <<\EOF > exp-L -link -sub -EOF - -cat <<\EOF > exp-FLR-sub -sub: -link-to-dir/ - -sub/link-to-dir: -EOF - -compare exp-L out-L || fail=1 -compare exp-FLR-sub out-FLR-sub || fail=1 - -Exit $fail diff --git a/tests/ls/follow-slink.sh b/tests/ls/follow-slink.sh new file mode 100755 index 00000000..e099b602 --- /dev/null +++ b/tests/ls/follow-slink.sh @@ -0,0 +1,61 @@ +#!/bin/sh +# make sure ls -L always follows symlinks + +# Copyright (C) 2000-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ ls + +# Isolate output files from directory being listed +mkdir dir dir/sub dir1 || framework_failure_ +cd dir || framework_failure_ +ln -s link link || framework_failure_ +ln -s ../../dir1 sub/link-to-dir || framework_failure_ + +# Make sure the symlink was created. +# 'ln -s link link' succeeds, but creates no file on +# systems running some DJGPP-2.03 libc. +ls -F link > /dev/null || framework_failure_ + + +# When explicitly listing a broken link, the command must fail. +ls -L link 2> /dev/null && fail=1 + +# When encountering a broken link implicitly, Solaris 9 and OpenBSD 3.4 +# list the link, provided no further information about the link needed +# to be printed. Since POSIX does not specify one way or the other, we +# opt for compatibility (this was broken in 5.3.0 through 5.94). +LC_ALL=C ls -L > ../out-L || fail=1 +LC_ALL=C ls -FLR sub > ../out-FLR-sub || fail=1 + +cd .. || fail=1 + +cat <<\EOF > exp-L +link +sub +EOF + +cat <<\EOF > exp-FLR-sub +sub: +link-to-dir/ + +sub/link-to-dir: +EOF + +compare exp-L out-L || fail=1 +compare exp-FLR-sub out-FLR-sub || fail=1 + +Exit $fail diff --git a/tests/ls/getxattr-speedup b/tests/ls/getxattr-speedup deleted file mode 100755 index 967f7c95..00000000 --- a/tests/ls/getxattr-speedup +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/sh -# Show that we've eliminated most of ls' failing getxattr syscalls, -# regardless of how many files are in a directory we list. -# 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 Free Software Foundation, Inc. - -# This 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=.}/init.sh"; path_prepend_ ../src -print_ver_ ls - -# 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" -# via a global destructor. -cat > k.c <<'EOF' || framework_failure_ -#include <errno.h> -#include <stdio.h> -#include <sys/types.h> - -static unsigned long int n_calls; - -static void __attribute__ ((destructor)) -print_call_count (void) -{ - FILE *fp = fopen ("x", "w"); if (!fp) return; - fprintf (fp, "%lu\n", n_calls); fclose (fp); -} - -static ssize_t incr () { ++n_calls; errno = ENOTSUP; return -1; } -ssize_t getxattr (const char *path, const char *name, void *value, size_t size) -{ return incr (); } -ssize_t lgetxattr(const char *path, const char *name, void *value, size_t size) -{ return incr (); } -EOF - -# Then compile/link it: -$CC -shared -fPIC -O2 k.c -o k.so \ - || framework_failure_ 'failed to compile with -shared -fPIC' - -# Create a few files: -seq 20 | xargs touch || framework_failure_ - -# Finally, run the test: -LD_PRELOAD=./k.so ls --color=always -l . || fail=1 - -test -f x || skip_ "internal test failure: maybe LD_PRELOAD doesn't work?" - -# Ensure that there were no more than 3 *getxattr calls. -n_calls=$(cat x) -test "$n_calls" -le 3 || fail=1 - -Exit $fail diff --git a/tests/ls/getxattr-speedup.sh b/tests/ls/getxattr-speedup.sh new file mode 100755 index 00000000..224362f0 --- /dev/null +++ b/tests/ls/getxattr-speedup.sh @@ -0,0 +1,65 @@ +#!/bin/sh +# Show that we've eliminated most of ls' failing getxattr syscalls, +# regardless of how many files are in a directory we list. +# 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. + +# This 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 + +# 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" +# via a global destructor. +cat > k.c <<'EOF' || framework_failure_ +#include <errno.h> +#include <stdio.h> +#include <sys/types.h> + +static unsigned long int n_calls; + +static void __attribute__ ((destructor)) +print_call_count (void) +{ + FILE *fp = fopen ("x", "w"); if (!fp) return; + fprintf (fp, "%lu\n", n_calls); fclose (fp); +} + +static ssize_t incr () { ++n_calls; errno = ENOTSUP; return -1; } +ssize_t getxattr (const char *path, const char *name, void *value, size_t size) +{ return incr (); } +ssize_t lgetxattr(const char *path, const char *name, void *value, size_t size) +{ return incr (); } +EOF + +# Then compile/link it: +$CC -shared -fPIC -O2 k.c -o k.so \ + || framework_failure_ 'failed to compile with -shared -fPIC' + +# Create a few files: +seq 20 | xargs touch || framework_failure_ + +# Finally, run the test: +LD_PRELOAD=./k.so ls --color=always -l . || fail=1 + +test -f x || skip_ "internal test failure: maybe LD_PRELOAD doesn't work?" + +# Ensure that there were no more than 3 *getxattr calls. +n_calls=$(cat x) +test "$n_calls" -le 3 || fail=1 + +Exit $fail diff --git a/tests/ls/infloop b/tests/ls/infloop deleted file mode 100755 index 9652112c..00000000 --- a/tests/ls/infloop +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh -# 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-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ ls - -mkdir loop || framework_failure_ -ln -s ../loop loop/sub || framework_failure_ - -cat <<\EOF > exp-out || framework_failure_ -loop: -sub -EOF - -cat <<\EOF > exp-err || framework_failure_ -ls: loop/sub: not listing already-listed directory -EOF - -timeout 10 ls -RL loop >out 2>err -# Ensure that ls exits with status 2 upon detecting a cycle -test $? = 2 || fail=1 - -compare exp-err err || fail=1 -compare exp-out out || fail=1 - -Exit $fail diff --git a/tests/ls/infloop.sh b/tests/ls/infloop.sh new file mode 100755 index 00000000..a441ec2c --- /dev/null +++ b/tests/ls/infloop.sh @@ -0,0 +1,42 @@ +#!/bin/sh +# 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. + +# This 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 + +mkdir loop || framework_failure_ +ln -s ../loop loop/sub || framework_failure_ + +cat <<\EOF > exp-out || framework_failure_ +loop: +sub +EOF + +cat <<\EOF > exp-err || framework_failure_ +ls: loop/sub: not listing already-listed directory +EOF + +timeout 10 ls -RL loop >out 2>err +# Ensure that ls exits with status 2 upon detecting a cycle +test $? = 2 || fail=1 + +compare exp-err err || fail=1 +compare exp-out out || fail=1 + +Exit $fail diff --git a/tests/ls/inode b/tests/ls/inode deleted file mode 100755 index 8bf5ba15..00000000 --- a/tests/ls/inode +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/sh -# Make sure that ls -i works properly on symlinks. - -# Copyright (C) 2003-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ ls - -touch f || framework_failure_ -ln -s f slink || framework_failure_ - - -# When listed explicitly: - -set x $(ls -Ci f slink); shift -test $# = 4 || fail=1 -# The inode numbers should differ. -test "$1" != "$3" || fail=1 - -set x $(ls -CLi f slink); shift -test $# = 4 || fail=1 -# With -L, they must be the same. -test "$1" = "$3" || fail=1 - -set x $(ls -CHi f slink); shift -test $# = 4 || fail=1 -# With -H, they must be the same, too, from the command line. -# Note that POSIX says -H must make ls dereference only -# symlinks (specified on the command line) to directories, -# but the historical BSD meaning of -H is to dereference -# any symlink given on the command line. For compatibility GNU ls -# implements the BSD semantics. -test "$1" = "$3" || fail=1 - -# When listed from a directory: - -set x $(ls -Ci); shift -test $# = 4 || fail=1 -# The inode numbers should differ. -test "$1" != "$3" || fail=1 - -set x $(ls -CLi); shift -test $# = 4 || fail=1 -# With -L, they must be the same. -test "$1" = "$3" || fail=1 - -set x $(ls -CHi); shift -test $# = 4 || fail=1 -# With -H, they must be different from inside a directory. -test "$1" != "$3" || fail=1 - -Exit $fail diff --git a/tests/ls/inode.sh b/tests/ls/inode.sh new file mode 100755 index 00000000..8d4bc79d --- /dev/null +++ b/tests/ls/inode.sh @@ -0,0 +1,65 @@ +#!/bin/sh +# Make sure that ls -i works properly on symlinks. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ ls + +touch f || framework_failure_ +ln -s f slink || framework_failure_ + + +# When listed explicitly: + +set x $(ls -Ci f slink); shift +test $# = 4 || fail=1 +# The inode numbers should differ. +test "$1" != "$3" || fail=1 + +set x $(ls -CLi f slink); shift +test $# = 4 || fail=1 +# With -L, they must be the same. +test "$1" = "$3" || fail=1 + +set x $(ls -CHi f slink); shift +test $# = 4 || fail=1 +# With -H, they must be the same, too, from the command line. +# Note that POSIX says -H must make ls dereference only +# symlinks (specified on the command line) to directories, +# but the historical BSD meaning of -H is to dereference +# any symlink given on the command line. For compatibility GNU ls +# implements the BSD semantics. +test "$1" = "$3" || fail=1 + +# When listed from a directory: + +set x $(ls -Ci); shift +test $# = 4 || fail=1 +# The inode numbers should differ. +test "$1" != "$3" || fail=1 + +set x $(ls -CLi); shift +test $# = 4 || fail=1 +# With -L, they must be the same. +test "$1" = "$3" || fail=1 + +set x $(ls -CHi); shift +test $# = 4 || fail=1 +# With -H, they must be different from inside a directory. +test "$1" != "$3" || fail=1 + +Exit $fail diff --git a/tests/ls/m-option b/tests/ls/m-option deleted file mode 100755 index cc72e73c..00000000 --- a/tests/ls/m-option +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -# exercise the -m option - -# Copyright (C) 2003-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ ls - -seq 2000 > b || framework_failure_ -touch a || framework_failure_ - - -# Before coreutils-5.1.1, the following would output a space after the comma. -ls -w2 -m a b > out || fail=1 - -# Before coreutils-5.1.1, the following would produce leading white space. -# All of the sed business is because the sizes are not portable. -ls -sm a b | sed 's/^[0-9]/0/;s/, [0-9][0-9]* b/, 12 b/' >> out || fail=1 -cat <<\EOF > exp || fail=1 -a, -b -0 a, 12 b -EOF - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/ls/m-option.sh b/tests/ls/m-option.sh new file mode 100755 index 00000000..a66df9a9 --- /dev/null +++ b/tests/ls/m-option.sh @@ -0,0 +1,40 @@ +#!/bin/sh +# exercise the -m option + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ ls + +seq 2000 > b || framework_failure_ +touch a || framework_failure_ + + +# Before coreutils-5.1.1, the following would output a space after the comma. +ls -w2 -m a b > out || fail=1 + +# Before coreutils-5.1.1, the following would produce leading white space. +# All of the sed business is because the sizes are not portable. +ls -sm a b | sed 's/^[0-9]/0/;s/, [0-9][0-9]* b/, 12 b/' >> out || fail=1 +cat <<\EOF > exp || fail=1 +a, +b +0 a, 12 b +EOF + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/ls/multihardlink b/tests/ls/multihardlink deleted file mode 100755 index 68a58725..00000000 --- a/tests/ls/multihardlink +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/sh -# Ensure "ls --color" properly colorizes hard linked files. - -# Copyright (C) 2008-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ ls -working_umask_or_skip_ - -touch file file1 || framework_failure_ -ln file1 file2 || skip_ "can't create hard link" -code_mh='44;37' -code_ex='01;32' -code_png='01;35' -c0=$(printf '\033[0m') -c_mh=$(printf '\033[%sm' $code_mh) -c_ex=$(printf '\033[%sm' $code_ex) -c_png=$(printf '\033[%sm' $code_png) - -# regular file - not hard linked -LS_COLORS="mh=$code_mh" ls -U1 --color=always file > out || fail=1 -printf "file\n" > out_ok || framework_failure_ -compare out out_ok || fail=1 - -# hard links -LS_COLORS="mh=$code_mh" ls -U1 --color=always file1 file2 > out || fail=1 -printf "$c0${c_mh}file1$c0 -${c_mh}file2$c0 -" > out_ok || framework_failure_ -compare out out_ok || fail=1 - -# hard links and png (hard link coloring takes precedence) -mv file2 file2.png || framework_failure_ -LS_COLORS="mh=$code_mh:*.png=$code_png" ls -U1 --color=always file1 file2.png \ - > out || fail=1 -printf "$c0${c_mh}file1$c0 -${c_mh}file2.png$c0 -" > out_ok || framework_failure_ -compare out out_ok || fail=1 - -# hard links and exe (exe coloring takes precedence) -chmod a+x file2.png || framework_failure_ -LS_COLORS="mh=$code_mh:*.png=$code_png:ex=$code_ex" \ - ls -U1 --color=always file1 file2.png > out || fail=1 -chmod a-x file2.png || framework_failure_ -printf "$c0${c_ex}file1$c0 -${c_ex}file2.png$c0 -" > out_ok || framework_failure_ -compare out out_ok || fail=1 - -# hard links and png (hard link coloring disabled => png coloring enabled) -LS_COLORS="mh=00:*.png=$code_png" ls -U1 --color=always file1 file2.png > out \ - || fail=1 -printf "file1 -$c0${c_png}file2.png$c0 -" > out_ok || framework_failure_ -compare out out_ok || fail=1 - -# hard links and png (hard link coloring not enabled explicitly => png coloring) -LS_COLORS="*.png=$code_png" ls -U1 --color=always file1 file2.png > out \ - || fail=1 -printf "file1 -$c0${c_png}file2.png$c0 -" > out_ok || framework_failure_ -compare out out_ok || fail=1 - -Exit $fail diff --git a/tests/ls/multihardlink.sh b/tests/ls/multihardlink.sh new file mode 100755 index 00000000..a7344444 --- /dev/null +++ b/tests/ls/multihardlink.sh @@ -0,0 +1,80 @@ +#!/bin/sh +# Ensure "ls --color" properly colorizes hard linked files. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ ls +working_umask_or_skip_ + +touch file file1 || framework_failure_ +ln file1 file2 || skip_ "can't create hard link" +code_mh='44;37' +code_ex='01;32' +code_png='01;35' +c0=$(printf '\033[0m') +c_mh=$(printf '\033[%sm' $code_mh) +c_ex=$(printf '\033[%sm' $code_ex) +c_png=$(printf '\033[%sm' $code_png) + +# regular file - not hard linked +LS_COLORS="mh=$code_mh" ls -U1 --color=always file > out || fail=1 +printf "file\n" > out_ok || framework_failure_ +compare out out_ok || fail=1 + +# hard links +LS_COLORS="mh=$code_mh" ls -U1 --color=always file1 file2 > out || fail=1 +printf "$c0${c_mh}file1$c0 +${c_mh}file2$c0 +" > out_ok || framework_failure_ +compare out out_ok || fail=1 + +# hard links and png (hard link coloring takes precedence) +mv file2 file2.png || framework_failure_ +LS_COLORS="mh=$code_mh:*.png=$code_png" ls -U1 --color=always file1 file2.png \ + > out || fail=1 +printf "$c0${c_mh}file1$c0 +${c_mh}file2.png$c0 +" > out_ok || framework_failure_ +compare out out_ok || fail=1 + +# hard links and exe (exe coloring takes precedence) +chmod a+x file2.png || framework_failure_ +LS_COLORS="mh=$code_mh:*.png=$code_png:ex=$code_ex" \ + ls -U1 --color=always file1 file2.png > out || fail=1 +chmod a-x file2.png || framework_failure_ +printf "$c0${c_ex}file1$c0 +${c_ex}file2.png$c0 +" > out_ok || framework_failure_ +compare out out_ok || fail=1 + +# hard links and png (hard link coloring disabled => png coloring enabled) +LS_COLORS="mh=00:*.png=$code_png" ls -U1 --color=always file1 file2.png > out \ + || fail=1 +printf "file1 +$c0${c_png}file2.png$c0 +" > out_ok || framework_failure_ +compare out out_ok || fail=1 + +# hard links and png (hard link coloring not enabled explicitly => png coloring) +LS_COLORS="*.png=$code_png" ls -U1 --color=always file1 file2.png > out \ + || fail=1 +printf "file1 +$c0${c_png}file2.png$c0 +" > out_ok || framework_failure_ +compare out out_ok || fail=1 + +Exit $fail diff --git a/tests/ls/nameless-uid b/tests/ls/nameless-uid deleted file mode 100755 index 5b45b091..00000000 --- a/tests/ls/nameless-uid +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -# Ensure that ls -l works on files with nameless uid and/or gid - -# Copyright (C) 2006-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ ls - -require_root_ -require_perl_ - -nameless_uid=$($PERL -e ' - foreach my $i (1000..16*1024) { getpwuid $i or (print "$i\n"), exit } -') - -if test x$nameless_uid = x; then - skip_ "couldn't find a nameless UID" -fi - -touch f || framework_failure_ -chown $nameless_uid f || framework_failure_ - - -set -- $(ls -o f) || fail=1 -test $3 = $nameless_uid || fail=1 - -Exit $fail diff --git a/tests/ls/nameless-uid.sh b/tests/ls/nameless-uid.sh new file mode 100755 index 00000000..a7b9417c --- /dev/null +++ b/tests/ls/nameless-uid.sh @@ -0,0 +1,40 @@ +#!/bin/sh +# Ensure that ls -l works on files with nameless uid and/or gid + +# Copyright (C) 2006-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ ls + +require_root_ +require_perl_ + +nameless_uid=$($PERL -e ' + foreach my $i (1000..16*1024) { getpwuid $i or (print "$i\n"), exit } +') + +if test x$nameless_uid = x; then + skip_ "couldn't find a nameless UID" +fi + +touch f || framework_failure_ +chown $nameless_uid f || framework_failure_ + + +set -- $(ls -o f) || fail=1 +test $3 = $nameless_uid || fail=1 + +Exit $fail diff --git a/tests/ls/no-arg b/tests/ls/no-arg deleted file mode 100755 index 8e7d1d61..00000000 --- a/tests/ls/no-arg +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh -# make sure ls and 'ls -R' do the right thing when invoked with no arguments. - -# Copyright (C) 2001-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ ls - -mkdir -p dir/subdir || framework_failure_ -touch dir/subdir/file2 || framework_failure_ -ln -s f symlink || framework_failure_ - -cat > exp <<\EOF || framework_failure_ -dir -exp -out -symlink -EOF - - -ls -1 > out || fail=1 - -compare exp out || fail=1 - -cat > exp <<\EOF -.: -dir -exp -out -symlink - -./dir: -subdir - -./dir/subdir: -file2 -EOF - -ls -R1 > out || fail=1 - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/ls/no-arg.sh b/tests/ls/no-arg.sh new file mode 100755 index 00000000..a89780e0 --- /dev/null +++ b/tests/ls/no-arg.sh @@ -0,0 +1,56 @@ +#!/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. + +# This 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 + +mkdir -p dir/subdir || framework_failure_ +touch dir/subdir/file2 || framework_failure_ +ln -s f symlink || framework_failure_ + +cat > exp <<\EOF || framework_failure_ +dir +exp +out +symlink +EOF + + +ls -1 > out || fail=1 + +compare exp out || fail=1 + +cat > exp <<\EOF +.: +dir +exp +out +symlink + +./dir: +subdir + +./dir/subdir: +file2 +EOF + +ls -R1 > out || fail=1 + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/ls/no-cap b/tests/ls/no-cap deleted file mode 100755 index 5e1e7887..00000000 --- a/tests/ls/no-cap +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# ensure that an empty "ca=" attribute disables ls's capability-checking - -# Copyright (C) 2008-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ ls -require_strace_ capget - -strace -e capget ls --color=always > /dev/null 2> out || fail=1 -$EGREP 'capget\(' out || skip_ "your ls doesn't call capget" - -rm -f out -eval "$(TERM=xterm dircolors -b | sed 's/ca=[^:]*:/ca=:/')" -strace -e capget ls --color=always > /dev/null 2> out || fail=1 - -$EGREP 'capget\(' out && fail=1 - -Exit $fail diff --git a/tests/ls/no-cap.sh b/tests/ls/no-cap.sh new file mode 100755 index 00000000..283f4f42 --- /dev/null +++ b/tests/ls/no-cap.sh @@ -0,0 +1,32 @@ +#!/bin/sh +# ensure that an empty "ca=" attribute disables ls's capability-checking + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ ls +require_strace_ capget + +strace -e capget ls --color=always > /dev/null 2> out || fail=1 +$EGREP 'capget\(' out || skip_ "your ls doesn't call capget" + +rm -f out +eval "$(TERM=xterm dircolors -b | sed 's/ca=[^:]*:/ca=:/')" +strace -e capget ls --color=always > /dev/null 2> out || fail=1 + +$EGREP 'capget\(' out && fail=1 + +Exit $fail diff --git a/tests/ls/proc-selinux-segfault b/tests/ls/proc-selinux-segfault deleted file mode 100755 index da17ec4f..00000000 --- a/tests/ls/proc-selinux-segfault +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -# ls -l /proc/sys would segfault when built against libselinux1 2.0.15-2+b1 - -# Copyright (C) 2008-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ ls - -f=/proc/sys -test -r $f || f=. - -ls -l $f > out || fail=1 - -Exit $fail diff --git a/tests/ls/proc-selinux-segfault.sh b/tests/ls/proc-selinux-segfault.sh new file mode 100755 index 00000000..65790911 --- /dev/null +++ b/tests/ls/proc-selinux-segfault.sh @@ -0,0 +1,27 @@ +#!/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. + +# This 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 + +f=/proc/sys +test -r $f || f=. + +ls -l $f > out || fail=1 + +Exit $fail diff --git a/tests/ls/readdir-mountpoint-inode b/tests/ls/readdir-mountpoint-inode deleted file mode 100755 index d46208ba..00000000 --- a/tests/ls/readdir-mountpoint-inode +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/sh -# ensure that ls -i works also for mount points - -# Copyright (C) 2009-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 -# 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=.}/init.sh"; path_prepend_ ../src -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" - -# 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: -# ls -i -I '[^s]*' -I 's[^h]*' -I 'sh[^m]*' -I 'shm?*' -I '.?*' \ -# -I '?' -I '??' /dev - -ls_ignore_options() -{ - name=$1 - opts="-I '.?*' -I '$name?*'" - while :; do - glob=$(echo "$name"|sed 's/\(.*\)\(.\)$/\1[^\2]*/') - opts="$opts -I '$glob'" - name=$(echo "$name"|sed 's/.$//') - test -z "$name" && break - glob=$(echo "$name"|sed 's/./?/g') - opts="$opts -I '$glob'" - done - echo "$opts" -} - -inode_via_readdir() -{ - mount_point=$1 - 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/ .*//' -} - -for dir in $mount_points; do - readdir_inode=$(inode_via_readdir $dir) - test $? = 77 && continue - 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 - -Exit $fail diff --git a/tests/ls/readdir-mountpoint-inode.sh b/tests/ls/readdir-mountpoint-inode.sh new file mode 100755 index 00000000..07839713 --- /dev/null +++ b/tests/ls/readdir-mountpoint-inode.sh @@ -0,0 +1,70 @@ +#!/bin/sh +# ensure that ls -i works also for mount points + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +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" + +# 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: +# ls -i -I '[^s]*' -I 's[^h]*' -I 'sh[^m]*' -I 'shm?*' -I '.?*' \ +# -I '?' -I '??' /dev + +ls_ignore_options() +{ + name=$1 + opts="-I '.?*' -I '$name?*'" + while :; do + glob=$(echo "$name"|sed 's/\(.*\)\(.\)$/\1[^\2]*/') + opts="$opts -I '$glob'" + name=$(echo "$name"|sed 's/.$//') + test -z "$name" && break + glob=$(echo "$name"|sed 's/./?/g') + opts="$opts -I '$glob'" + done + echo "$opts" +} + +inode_via_readdir() +{ + mount_point=$1 + 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/ .*//' +} + +for dir in $mount_points; do + readdir_inode=$(inode_via_readdir $dir) + test $? = 77 && continue + 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 + +Exit $fail diff --git a/tests/ls/recursive b/tests/ls/recursive deleted file mode 100755 index 79fdc7f3..00000000 --- a/tests/ls/recursive +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/sh -# 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-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ ls - -mkdir x y a b c a/1 a/2 a/3 || framework_failure_ -touch f a/1/I a/1/II || framework_failure_ - - -# This first example is from Andreas Schwab's bug report. -ls -R1 a b c > out || fail=1 -cat <<EOF > exp -a: -1 -2 -3 - -a/1: -I -II - -a/2: - -a/3: - -b: - -c: -EOF - -compare exp out || fail=1 - -rm -rf out exp -ls -R1 x y f > out || fail=1 -cat <<EOF > exp -f - -x: - -y: -EOF - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/ls/recursive.sh b/tests/ls/recursive.sh new file mode 100755 index 00000000..94a414a2 --- /dev/null +++ b/tests/ls/recursive.sh @@ -0,0 +1,62 @@ +#!/bin/sh +# 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. + +# This 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 + +mkdir x y a b c a/1 a/2 a/3 || framework_failure_ +touch f a/1/I a/1/II || framework_failure_ + + +# This first example is from Andreas Schwab's bug report. +ls -R1 a b c > out || fail=1 +cat <<EOF > exp +a: +1 +2 +3 + +a/1: +I +II + +a/2: + +a/3: + +b: + +c: +EOF + +compare exp out || fail=1 + +rm -rf out exp +ls -R1 x y f > out || fail=1 +cat <<EOF > exp +f + +x: + +y: +EOF + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/ls/root-rel-symlink-color.sh b/tests/ls/root-rel-symlink-color.sh new file mode 100755 index 00000000..d90148da --- /dev/null +++ b/tests/ls/root-rel-symlink-color.sh @@ -0,0 +1,51 @@ +#!/bin/sh +# Exercise the 8.17 ls bug with coloring relative-named symlinks in "/". + +# Copyright (C) 2012-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ ls + +symlink_to_rel= +for i in /*; do + # Skip non-symlinks: + env test -h "$i" || continue + + # Skip dangling symlinks: + env test -e "$i" || continue + + # Skip any symlink-to-absolute-name: + case $(readlink "$i") in /*) continue ;; esac + + symlink_to_rel=$i + break +done + +test -z "$symlink_to_rel" \ + && skip_ no relative symlink in / + +e='\33' +color_code='01;36' +c_pre="$e[0m$e[${color_code}m" +c_post="$e[0m" +printf "$c_pre$symlink_to_rel$c_post\n" > exp || framework_failure_ + +env TERM=xterm LS_COLORS="ln=$color_code:or=1;31;42" \ + ls -d --color=always "$symlink_to_rel" > out || fail=1 + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/ls/rt-1 b/tests/ls/rt-1 deleted file mode 100755 index f7d78df6..00000000 --- a/tests/ls/rt-1 +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh -# Make sure name is used as secondary key when sorting on mtime or ctime. - -# Copyright (C) 1998-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ ls touch - -date=1998-01-15 - -touch -d "$date" c || framework_failure_ -touch -d "$date" a || framework_failure_ -touch -d "$date" b || framework_failure_ - - -ls -1t a b c > out || fail=1 -cat <<EOF > exp -a -b -c -EOF -compare exp out || fail=1 - -rm -rf out exp -ls -1rt a b c > out || fail=1 -cat <<EOF > exp -c -b -a -EOF -compare exp out || fail=1 - -Exit $fail diff --git a/tests/ls/rt-1.sh b/tests/ls/rt-1.sh new file mode 100755 index 00000000..50ad1fd2 --- /dev/null +++ b/tests/ls/rt-1.sh @@ -0,0 +1,46 @@ +#!/bin/sh +# Make sure name is used as secondary key when sorting on mtime or ctime. + +# Copyright (C) 1998-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ ls touch + +date=1998-01-15 + +touch -d "$date" c || framework_failure_ +touch -d "$date" a || framework_failure_ +touch -d "$date" b || framework_failure_ + + +ls -1t a b c > out || fail=1 +cat <<EOF > exp +a +b +c +EOF +compare exp out || fail=1 + +rm -rf out exp +ls -1rt a b c > out || fail=1 +cat <<EOF > exp +c +b +a +EOF +compare exp out || fail=1 + +Exit $fail diff --git a/tests/ls/slink-acl b/tests/ls/slink-acl deleted file mode 100755 index ae9af503..00000000 --- a/tests/ls/slink-acl +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -# verify that ls -lL works when applied to a symlink to an ACL'd file - -# Copyright (C) 2011-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ ls - -require_setfacl_ - -touch k || framework_failure_ -setfacl -m user::r-- k || framework_failure_ -ln -s k s || framework_failure_ - -set _ $(ls -Log s); shift; link=$1 -set _ $(ls -og k); shift; reg=$1 - -test "$link" = "$reg" || fail=1 - -Exit $fail diff --git a/tests/ls/slink-acl.sh b/tests/ls/slink-acl.sh new file mode 100755 index 00000000..e02478a4 --- /dev/null +++ b/tests/ls/slink-acl.sh @@ -0,0 +1,33 @@ +#!/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. + +# This 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 + +require_setfacl_ + +touch k || framework_failure_ +setfacl -m user::r-- k || framework_failure_ +ln -s k s || framework_failure_ + +set _ $(ls -Log s); shift; link=$1 +set _ $(ls -og k); shift; reg=$1 + +test "$link" = "$reg" || fail=1 + +Exit $fail diff --git a/tests/ls/stat-dtype b/tests/ls/stat-dtype deleted file mode 100755 index b84d5d51..00000000 --- a/tests/ls/stat-dtype +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -# Ensure that ls --file-type does not call stat unnecessarily. -# Also check for the dtype-related (and fs-type dependent) bug -# in coreutils-6.0 that made ls -CF columns misaligned. - -# Copyright (C) 2006-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 -# 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/>. - -# The trick is to create an un-stat'able symlink and to see if ls -# can report its type nonetheless, using dirent.d_type. - -. "${srcdir=.}/init.sh"; path_prepend_ ../src -print_ver_ ls - -# Skip this test unless "." is on a file system with useful d_type info. -# FIXME: This uses "ls -p" to decide whether to test "ls" with other options, -# but if ls's d_type code is buggy then "ls -p" might be buggy too. -mkdir -p c/d || framework_failure_ -chmod a-x c || framework_failure_ -if test "X$(ls -p c 2>&1)" != Xd/; then - skip_ "'.' is not on a suitable file system for this test" -fi - -mkdir d || framework_failure_ -ln -s / d/s || framework_failure_ -chmod 600 d || framework_failure_ - -mkdir -p e/a2345 e/b || framework_failure_ -chmod 600 e || framework_failure_ - - -ls --file-type d > out || fail=1 -cat <<\EOF > exp || fail=1 -s@ -EOF - -compare exp out || fail=1 - -rm -f out exp -# Check for the ls -CF misaligned-columns bug: -ls -CF e > out || fail=1 - -# coreutils-6.0 would print two spaces after the first slash, -# rather than the appropriate TAB. -printf 'a2345/\tb/\n' > exp || fail=1 - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/ls/stat-dtype.sh b/tests/ls/stat-dtype.sh new file mode 100755 index 00000000..8bfc69d1 --- /dev/null +++ b/tests/ls/stat-dtype.sh @@ -0,0 +1,61 @@ +#!/bin/sh +# Ensure that ls --file-type does not call stat unnecessarily. +# 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. + +# This 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/>. + +# The trick is to create an un-stat'able symlink and to see if ls +# can report its type nonetheless, using dirent.d_type. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ ls + +# Skip this test unless "." is on a file system with useful d_type info. +# FIXME: This uses "ls -p" to decide whether to test "ls" with other options, +# but if ls's d_type code is buggy then "ls -p" might be buggy too. +mkdir -p c/d || framework_failure_ +chmod a-x c || framework_failure_ +if test "X$(ls -p c 2>&1)" != Xd/; then + skip_ "'.' is not on a suitable file system for this test" +fi + +mkdir d || framework_failure_ +ln -s / d/s || framework_failure_ +chmod 600 d || framework_failure_ + +mkdir -p e/a2345 e/b || framework_failure_ +chmod 600 e || framework_failure_ + + +ls --file-type d > out || fail=1 +cat <<\EOF > exp || fail=1 +s@ +EOF + +compare exp out || fail=1 + +rm -f out exp +# Check for the ls -CF misaligned-columns bug: +ls -CF e > out || fail=1 + +# coreutils-6.0 would print two spaces after the first slash, +# rather than the appropriate TAB. +printf 'a2345/\tb/\n' > exp || fail=1 + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/ls/stat-failed b/tests/ls/stat-failed deleted file mode 100755 index 464406bd..00000000 --- a/tests/ls/stat-failed +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh -# Verify that ls works properly when it fails to stat a file that is -# not mentioned on the command line. - -# Copyright (C) 2006-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ ls -skip_if_root_ - -mkdir d || framework_failure_ -ln -s / d/s || framework_failure_ -chmod 600 d || framework_failure_ - - -ls -Log d > out -test $? = 1 || fail=1 - -cat <<\EOF > exp || fail=1 -total 0 -?????????? ? ? ? s -EOF - -sed 's/^l/?/' out | compare exp - || fail=1 - -# Ensure that the offsets in --dired output are accurate. -rm -f out exp -ls --dired -l d > out && fail=1 - -cat <<\EOF > exp || fail=1 - total 0 - ?????????? ? ? ? ? ? s -//DIRED// 44 45 -//DIRED-OPTIONS// --quoting-style=literal -EOF - -sed 's/^ l/ ?/' out | compare exp - || fail=1 - -Exit $fail diff --git a/tests/ls/stat-failed.sh b/tests/ls/stat-failed.sh new file mode 100755 index 00000000..cdd7a4e9 --- /dev/null +++ b/tests/ls/stat-failed.sh @@ -0,0 +1,52 @@ +#!/bin/sh +# 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. + +# This 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 +skip_if_root_ + +mkdir d || framework_failure_ +ln -s / d/s || framework_failure_ +chmod 600 d || framework_failure_ + + +ls -Log d > out +test $? = 1 || fail=1 + +cat <<\EOF > exp || fail=1 +total 0 +?????????? ? ? ? s +EOF + +sed 's/^l/?/' out | compare exp - || fail=1 + +# Ensure that the offsets in --dired output are accurate. +rm -f out exp +ls --dired -l d > out && fail=1 + +cat <<\EOF > exp || fail=1 + total 0 + ?????????? ? ? ? ? ? s +//DIRED// 44 45 +//DIRED-OPTIONS// --quoting-style=literal +EOF + +sed 's/^ l/ ?/' out | compare exp - || fail=1 + +Exit $fail diff --git a/tests/ls/stat-free-color b/tests/ls/stat-free-color deleted file mode 100755 index daff2eb5..00000000 --- a/tests/ls/stat-free-color +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/sh -# Show that --color need not use stat, as long as we have d_type support. - -# Copyright (C) 2011-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ ls -require_strace_ stat -require_dirent_d_type_ - -for i in 1 2 3; do - ln -s nowhere dangle-$i || framework_failure_ -done - -# Disable enough features via LS_COLORS so that ls --color -# can do its job without calling stat (other than the obligatory -# one-call-per-command-line argument). -cat <<EOF > color-without-stat || framework_failure_ -RESET 0 -DIR 01;34 -LINK 01;36 -FIFO 40;33 -SOCK 01;35 -DOOR 01;35 -BLK 40;33;01 -CHR 40;33;01 -ORPHAN 00 -SETUID 00 -SETGID 00 -CAPABILITY 00 -STICKY_OTHER_WRITABLE 00 -OTHER_WRITABLE 00 -STICKY 00 -EXEC 00 -MULTIHARDLINK 00 -EOF -eval $(dircolors -b color-without-stat) - -# The system may perform additional stat-like calls before main. -# 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 -n_lines_help=$(wc -l < log-help) - -strace -o log -e stat,lstat,stat64,lstat64 ls --color=always . || fail=1 -n_lines=$(wc -l < log) - -n_stat=$(expr $n_lines - $n_lines_help) - -# Expect one or two stat calls. -case $n_stat in - 1) ;; - *) fail=1; head -n30 log* ;; -esac - -Exit $fail diff --git a/tests/ls/stat-free-color.sh b/tests/ls/stat-free-color.sh new file mode 100755 index 00000000..3aacf961 --- /dev/null +++ b/tests/ls/stat-free-color.sh @@ -0,0 +1,70 @@ +#!/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. + +# This 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 +require_strace_ stat +require_dirent_d_type_ + +for i in 1 2 3; do + ln -s nowhere dangle-$i || framework_failure_ +done + +# Disable enough features via LS_COLORS so that ls --color +# can do its job without calling stat (other than the obligatory +# one-call-per-command-line argument). +cat <<EOF > color-without-stat || framework_failure_ +RESET 0 +DIR 01;34 +LINK 01;36 +FIFO 40;33 +SOCK 01;35 +DOOR 01;35 +BLK 40;33;01 +CHR 40;33;01 +ORPHAN 00 +SETUID 00 +SETGID 00 +CAPABILITY 00 +STICKY_OTHER_WRITABLE 00 +OTHER_WRITABLE 00 +STICKY 00 +EXEC 00 +MULTIHARDLINK 00 +EOF +eval $(dircolors -b color-without-stat) + +# The system may perform additional stat-like calls before main. +# 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 +n_lines_help=$(wc -l < log-help) + +strace -o log -e stat,lstat,stat64,lstat64 ls --color=always . || fail=1 +n_lines=$(wc -l < log) + +n_stat=$(expr $n_lines - $n_lines_help) + +# Expect one or two stat calls. +case $n_stat in + 1) ;; + *) fail=1; head -n30 log* ;; +esac + +Exit $fail diff --git a/tests/ls/stat-free-symlinks b/tests/ls/stat-free-symlinks deleted file mode 100755 index 8e04e2e8..00000000 --- a/tests/ls/stat-free-symlinks +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh -# ensure that ls does not stat a symlink in an unusual case - -# Copyright (C) 2007-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ ls -require_strace_ stat - -touch x || framework_failure_ -chmod a+x x || framework_failure_ -ln -s x link-to-x || framework_failure_ - - -# ls from coreutils 6.9 would unnecessarily stat a symlink in an unusual case: -# When not coloring orphan and missing entries, and without ln=target, -# ensure that ls -F (or -d, or -l: i.e., when not dereferencing) -# does not stat a symlink to directory, and does still color that -# symlink and an executable file properly. - -LS_COLORS='or=0:mi=0:ex=01;32:ln=01;35' \ - strace -qe stat ls -F --color=always x link-to-x > out.tmp 2> err || fail -# Elide info messages strace can send to stdout of the form: -# [ Process PID=1234 runs in 32 bit mode. ] -sed '/Process PID=/d' out.tmp > out - -# With coreutils 6.9 and earlier, this file would contain a -# line showing ls had called stat on "x". -grep '^stat("x"' err && fail=1 - -# Check that output is colorized, as requested, too. -{ - printf '\033[0m\033[01;35mlink-to-x\033[0m@\n' - printf '\033[01;32mx\033[0m*\n' -} > exp || fail=1 - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/ls/stat-free-symlinks.sh b/tests/ls/stat-free-symlinks.sh new file mode 100755 index 00000000..33cd16a8 --- /dev/null +++ b/tests/ls/stat-free-symlinks.sh @@ -0,0 +1,52 @@ +#!/bin/sh +# ensure that ls does not stat a symlink in an unusual case + +# Copyright (C) 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ ls +require_strace_ stat + +touch x || framework_failure_ +chmod a+x x || framework_failure_ +ln -s x link-to-x || framework_failure_ + + +# ls from coreutils 6.9 would unnecessarily stat a symlink in an unusual case: +# When not coloring orphan and missing entries, and without ln=target, +# ensure that ls -F (or -d, or -l: i.e., when not dereferencing) +# does not stat a symlink to directory, and does still color that +# symlink and an executable file properly. + +LS_COLORS='or=0:mi=0:ex=01;32:ln=01;35' \ + strace -qe stat ls -F --color=always x link-to-x > out.tmp 2> err || fail +# Elide info messages strace can send to stdout of the form: +# [ Process PID=1234 runs in 32 bit mode. ] +sed '/Process PID=/d' out.tmp > out + +# With coreutils 6.9 and earlier, this file would contain a +# line showing ls had called stat on "x". +grep '^stat("x"' err && fail=1 + +# Check that output is colorized, as requested, too. +{ + printf '\033[0m\033[01;35mlink-to-x\033[0m@\n' + printf '\033[01;32mx\033[0m*\n' +} > exp || fail=1 + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/ls/stat-vs-dirent b/tests/ls/stat-vs-dirent deleted file mode 100755 index 1dd6e662..00000000 --- a/tests/ls/stat-vs-dirent +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/sh -# Ensure that d_ino (from ls -di) and st_ino (from stat --format=%i) match. - -# Copyright (C) 2006-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ ls - - -root_dev_ino=$(stat --format=%d-%i /) -t=$(pwd) -while :; do - ls -i1 "$t" > tmp - if test $? = 0; then - # Extract the inode number from the first line of output from ls -i1. - # This value comes from dirent.d_ino, on systems with d_ino support. - 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) - - # Get its inode number (stat.st_ino) via stat(1)'s call to lstat. - st_ino=$(stat --format=%i "$t/$file") - - # Make sure that they are the same. - # We know from experience that there may be mismatches on some - # buggy file systems, at mount points. - # Note that when a directory contains only entries whose names - # start with ".", d_ino and file will both be empty. In that case, - # skip the test. - if test -n "$d_ino" && test "$d_ino" != "$st_ino"; then - echo "$0: test failed: $t/$file: d_ino($d_ino) != st_ino($st_ino) - This may indicate a flaw in your kernel or file system implementation. - The flaw isn't serious for coreutils, but it might break other tools, - so you should report it to your operating system vendor." 1>&2 - - fail=1 - break - fi - fi - - t=$(cd "$t/.."; pwd) - dev_ino=$(stat --format=%d-%i "$t") - test $dev_ino = $root_dev_ino && break -done - -Exit $fail diff --git a/tests/ls/stat-vs-dirent.sh b/tests/ls/stat-vs-dirent.sh new file mode 100755 index 00000000..b54f5503 --- /dev/null +++ b/tests/ls/stat-vs-dirent.sh @@ -0,0 +1,60 @@ +#!/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. + +# This 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 + + +root_dev_ino=$(stat --format=%d-%i /) +t=$(pwd) +while :; do + ls -i1 "$t" > tmp + if test $? = 0; then + # Extract the inode number from the first line of output from ls -i1. + # This value comes from dirent.d_ino, on systems with d_ino support. + 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) + + # Get its inode number (stat.st_ino) via stat(1)'s call to lstat. + st_ino=$(stat --format=%i "$t/$file") + + # Make sure that they are the same. + # We know from experience that there may be mismatches on some + # buggy file systems, at mount points. + # Note that when a directory contains only entries whose names + # start with ".", d_ino and file will both be empty. In that case, + # skip the test. + if test -n "$d_ino" && test "$d_ino" != "$st_ino"; then + echo "$0: test failed: $t/$file: d_ino($d_ino) != st_ino($st_ino) + This may indicate a flaw in your kernel or file system implementation. + The flaw isn't serious for coreutils, but it might break other tools, + so you should report it to your operating system vendor." 1>&2 + + fail=1 + break + fi + fi + + t=$(cd "$t/.."; pwd) + dev_ino=$(stat --format=%d-%i "$t") + test $dev_ino = $root_dev_ino && break +done + +Exit $fail diff --git a/tests/ls/symlink-slash b/tests/ls/symlink-slash deleted file mode 100755 index 28c7d32b..00000000 --- a/tests/ls/symlink-slash +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# Do dereference a symlink arg if its name is written with a trailing slash. - -# Copyright (C) 1999-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ ls - -mkdir dir || framework_failure_ -ln -s dir symlink || framework_failure_ - -set $(ls -l symlink/) - -# Prior to fileutils-4.0k, the following would have output '... symlink -> dir'. -test "$*" = 'total 0' && : || fail=1 - -Exit $fail diff --git a/tests/ls/symlink-slash.sh b/tests/ls/symlink-slash.sh new file mode 100755 index 00000000..5e64a52b --- /dev/null +++ b/tests/ls/symlink-slash.sh @@ -0,0 +1,30 @@ +#!/bin/sh +# Do dereference a symlink arg if its name is written with a trailing slash. + +# Copyright (C) 1999-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ ls + +mkdir dir || framework_failure_ +ln -s dir symlink || framework_failure_ + +set $(ls -l symlink/) + +# Prior to fileutils-4.0k, the following would have output '... symlink -> dir'. +test "$*" = 'total 0' && : || fail=1 + +Exit $fail diff --git a/tests/ls/time-style-diag b/tests/ls/time-style-diag deleted file mode 100755 index ae41c936..00000000 --- a/tests/ls/time-style-diag +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -# Ensure that an invalid --time-style=ARG is diagnosed the way we want. - -# Copyright (C) 2011-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ ls - -ls -l --time-style=XX > out 2> err -test $? = 2 || fail=1 - -cat <<\EOF > exp || fail=1 -ls: invalid argument 'XX' for 'time style' -Valid arguments are: - - [posix-]full-iso - - [posix-]long-iso - - [posix-]iso - - [posix-]locale - - +FORMAT (e.g., +%H:%M) for a 'date'-style format -Try 'ls --help' for more information. -EOF - -compare exp err || fail=1 -compare /dev/null out || fail=1 - -Exit $fail diff --git a/tests/ls/time-style-diag.sh b/tests/ls/time-style-diag.sh new file mode 100755 index 00000000..e9d32989 --- /dev/null +++ b/tests/ls/time-style-diag.sh @@ -0,0 +1,39 @@ +#!/bin/sh +# Ensure that an invalid --time-style=ARG is diagnosed the way we want. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ ls + +ls -l --time-style=XX > out 2> err +test $? = 2 || fail=1 + +cat <<\EOF > exp || fail=1 +ls: invalid argument 'XX' for 'time style' +Valid arguments are: + - [posix-]full-iso + - [posix-]long-iso + - [posix-]iso + - [posix-]locale + - +FORMAT (e.g., +%H:%M) for a 'date'-style format +Try 'ls --help' for more information. +EOF + +compare exp err || fail=1 +compare /dev/null out || fail=1 + +Exit $fail diff --git a/tests/ls/x-option b/tests/ls/x-option deleted file mode 100755 index 38faa72b..00000000 --- a/tests/ls/x-option +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -# Exercise the -x option. - -# Copyright (C) 2007-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ ls - -mkdir subdir || framework_failure_ -touch subdir/b || framework_failure_ -touch subdir/a || framework_failure_ - - -# Coreutils 6.8 and 6.9 would output this in the wrong order. -ls -x subdir > out || fail=1 -ls -rx subdir >> out || fail=1 -cat <<\EOF > exp || fail=1 -a b -b a -EOF - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/ls/x-option.sh b/tests/ls/x-option.sh new file mode 100755 index 00000000..f1bc69d9 --- /dev/null +++ b/tests/ls/x-option.sh @@ -0,0 +1,37 @@ +#!/bin/sh +# Exercise the -x option. + +# Copyright (C) 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ ls + +mkdir subdir || framework_failure_ +touch subdir/b || framework_failure_ +touch subdir/a || framework_failure_ + + +# Coreutils 6.8 and 6.9 would output this in the wrong order. +ls -x subdir > out || fail=1 +ls -rx subdir >> out || fail=1 +cat <<\EOF > exp || fail=1 +a b +b a +EOF + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/misc/arch b/tests/misc/arch deleted file mode 100755 index e1d73089..00000000 --- a/tests/misc/arch +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# Ensure that arch output is equal to uname -m - -# Copyright (C) 2007-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ arch - -require_built_ arch - -arch > out || fail=1 -uname -m > exp || fail=1 - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/misc/arch.sh b/tests/misc/arch.sh new file mode 100755 index 00000000..db2b784f --- /dev/null +++ b/tests/misc/arch.sh @@ -0,0 +1,29 @@ +#!/bin/sh +# Ensure that arch output is equal to uname -m + +# Copyright (C) 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ arch + +require_built_ arch + +arch > out || fail=1 +uname -m > exp || fail=1 + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/misc/base64 b/tests/misc/base64 deleted file mode 100755 index 44a79275..00000000 --- a/tests/misc/base64 +++ /dev/null @@ -1,154 +0,0 @@ -#!/usr/bin/perl -# Exercise base64. - -# Copyright (C) 2006-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 -# 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; - -(my $program_name = $0) =~ s|.*/||; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -# Return the encoding of a string of N 'a's. -sub enc($) -{ - my ($n) = @_; - my %remainder = ( 0 => '', 1 => 'YQ==', 2 => 'YWE=' ); - return 'YWFh' x ($n / 3) . $remainder{$n % 3}; -} - -# Construct an encoded string of length 4KB, using 3K "a"s. -my $a3k = enc 3072; -my @a3k_nl; -# A few copies, each with different number of newlines at the start. -for my $k (0..3) - { - (my $t = $a3k) =~ s/^/"\n"x $k/e; - push @a3k_nl, $t; - } - -# Return a copy of S, with newlines inserted every WIDTH bytes. -# Ensure that the result (if not the empty string) is newline-terminated. -sub wrap($$) -{ - my ($s, $width) = @_; - $s =~ s/(.{$width})/$1\n/g; - substr ($s, -1, 1) ne "\n" - and $s .= "\n"; - return $s; -} - -my @Tests = - ( - ['empty', {IN=>''}, {OUT=>""}], - ['inout', {IN=>'a'}, {OUT=>"YQ==\n"}], - ['wrap', '--wrap 0', {IN=>'foo'}, {OUT=>'Zm9v'}], - ['wrap5-39', '--wrap=5', {IN=>'a' x 39}, {OUT=>wrap enc(39),5}], - ['wrap5-40', '--wrap=5', {IN=>'a' x 40}, {OUT=>wrap enc(40),5}], - ['wrap5-41', '--wrap=5', {IN=>'a' x 41}, {OUT=>wrap enc(41),5}], - ['wrap5-42', '--wrap=5', {IN=>'a' x 42}, {OUT=>wrap enc(42),5}], - ['wrap5-43', '--wrap=5', {IN=>'a' x 43}, {OUT=>wrap enc(43),5}], - ['wrap5-44', '--wrap=5', {IN=>'a' x 44}, {OUT=>wrap enc(44),5}], - ['wrap5-45', '--wrap=5', {IN=>'a' x 45}, {OUT=>wrap enc(45),5}], - ['wrap5-46', '--wrap=5', {IN=>'a' x 46}, {OUT=>wrap enc(46),5}], - - ['buf-1', '--decode', {IN=>enc 1}, {OUT=>'a' x 1}], - ['buf-2', '--decode', {IN=>enc 2}, {OUT=>'a' x 2}], - ['buf-3', '--decode', {IN=>enc 3}, {OUT=>'a' x 3}], - ['buf-4', '--decode', {IN=>enc 4}, {OUT=>'a' x 4}], - # 4KB worth of input. - ['buf-4k0', '--decode', {IN=>enc 3072+0}, {OUT=>'a' x (3072+0)}], - ['buf-4k1', '--decode', {IN=>enc 3072+1}, {OUT=>'a' x (3072+1)}], - ['buf-4k2', '--decode', {IN=>enc 3072+2}, {OUT=>'a' x (3072+2)}], - ['buf-4k3', '--decode', {IN=>enc 3072+3}, {OUT=>'a' x (3072+3)}], - ['buf-4km1','--decode', {IN=>enc 3072-1}, {OUT=>'a' x (3072-1)}], - ['buf-4km2','--decode', {IN=>enc 3072-2}, {OUT=>'a' x (3072-2)}], - ['buf-4km3','--decode', {IN=>enc 3072-3}, {OUT=>'a' x (3072-3)}], - ['buf-4km4','--decode', {IN=>enc 3072-4}, {OUT=>'a' x (3072-4)}], - - # Exercise the case in which the final base-64 byte is - # in a buffer all by itself. - ['b4k-1', '--decode', {IN=>$a3k_nl[1]}, {OUT=>'a' x (3072+0)}], - ['b4k-2', '--decode', {IN=>$a3k_nl[2]}, {OUT=>'a' x (3072+0)}], - ['b4k-3', '--decode', {IN=>$a3k_nl[3]}, {OUT=>'a' x (3072+0)}], - - ['baddecode', '--decode', {IN=>'a'}, {OUT=>""}, - {ERR_SUBST => 's/.*: invalid input//'}, {ERR => "\n"}, {EXIT => 1}], - ['baddecode2', '--decode', {IN=>'ab'}, {OUT=>"i"}, - {ERR_SUBST => 's/.*: invalid input//'}, {ERR => "\n"}, {EXIT => 1}], - ['baddecode3', '--decode', {IN=>'Zzz'}, {OUT=>"g<"}, - {ERR_SUBST => 's/.*: invalid input//'}, {ERR => "\n"}, {EXIT => 1}], - ['baddecode4', '--decode', {IN=>'Zz='}, {OUT=>"g"}, - {ERR_SUBST => 's/.*: invalid input//'}, {ERR => "\n"}, {EXIT => 1}], - ['baddecode5', '--decode', {IN=>'Z==='}, {OUT=>""}, - {ERR_SUBST => 's/.*: invalid input//'}, {ERR => "\n"}, {EXIT => 1}] - ); - -# For each non-failing test, create a --decode test using the -# expected output as input. Also, add tests inserting newlines. -my @new; -foreach my $t (@Tests) - { - my $exit_val; - my $in; - my @out; - - # If the test has a single option of "--decode", then skip it. - !ref $t->[1] && $t->[1] eq '--decode' - and next; - - foreach my $e (@$t) - { - ref $e && ref $e eq 'HASH' - or next; - defined $e->{EXIT} - and $exit_val = $e->{EXIT}; - defined $e->{IN} - and $in = $e->{IN}; - if (defined $e->{OUT}) - { - my $t = $e->{OUT}; - push @out, $t; - my $len = length $t; - foreach my $i (0..$len) - { - my $u = $t; - substr ($u, $i, 0) = "\n"; - push @out, $u; - 10 <= $i - and last; - } - } - } - $exit_val - and next; - - my $i = 0; - foreach my $o (@out) - { - push @new, ["d$i-$t->[0]", '--decode', {IN => $o}, {OUT => $in}]; - ++$i; - } - } -push @Tests, @new; - -my $save_temps = $ENV{DEBUG}; -my $verbose = $ENV{VERBOSE}; - -my $prog = 'base64'; -my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); -exit $fail; diff --git a/tests/misc/base64.pl b/tests/misc/base64.pl new file mode 100755 index 00000000..5d1d2621 --- /dev/null +++ b/tests/misc/base64.pl @@ -0,0 +1,154 @@ +#!/usr/bin/perl +# Exercise base64. + +# Copyright (C) 2006-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/>. + +use strict; + +(my $program_name = $0) =~ s|.*/||; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +# Return the encoding of a string of N 'a's. +sub enc($) +{ + my ($n) = @_; + my %remainder = ( 0 => '', 1 => 'YQ==', 2 => 'YWE=' ); + return 'YWFh' x ($n / 3) . $remainder{$n % 3}; +} + +# Construct an encoded string of length 4KB, using 3K "a"s. +my $a3k = enc 3072; +my @a3k_nl; +# A few copies, each with different number of newlines at the start. +for my $k (0..3) + { + (my $t = $a3k) =~ s/^/"\n"x $k/e; + push @a3k_nl, $t; + } + +# Return a copy of S, with newlines inserted every WIDTH bytes. +# Ensure that the result (if not the empty string) is newline-terminated. +sub wrap($$) +{ + my ($s, $width) = @_; + $s =~ s/(.{$width})/$1\n/g; + substr ($s, -1, 1) ne "\n" + and $s .= "\n"; + return $s; +} + +my @Tests = + ( + ['empty', {IN=>''}, {OUT=>""}], + ['inout', {IN=>'a'}, {OUT=>"YQ==\n"}], + ['wrap', '--wrap 0', {IN=>'foo'}, {OUT=>'Zm9v'}], + ['wrap5-39', '--wrap=5', {IN=>'a' x 39}, {OUT=>wrap enc(39),5}], + ['wrap5-40', '--wrap=5', {IN=>'a' x 40}, {OUT=>wrap enc(40),5}], + ['wrap5-41', '--wrap=5', {IN=>'a' x 41}, {OUT=>wrap enc(41),5}], + ['wrap5-42', '--wrap=5', {IN=>'a' x 42}, {OUT=>wrap enc(42),5}], + ['wrap5-43', '--wrap=5', {IN=>'a' x 43}, {OUT=>wrap enc(43),5}], + ['wrap5-44', '--wrap=5', {IN=>'a' x 44}, {OUT=>wrap enc(44),5}], + ['wrap5-45', '--wrap=5', {IN=>'a' x 45}, {OUT=>wrap enc(45),5}], + ['wrap5-46', '--wrap=5', {IN=>'a' x 46}, {OUT=>wrap enc(46),5}], + + ['buf-1', '--decode', {IN=>enc 1}, {OUT=>'a' x 1}], + ['buf-2', '--decode', {IN=>enc 2}, {OUT=>'a' x 2}], + ['buf-3', '--decode', {IN=>enc 3}, {OUT=>'a' x 3}], + ['buf-4', '--decode', {IN=>enc 4}, {OUT=>'a' x 4}], + # 4KB worth of input. + ['buf-4k0', '--decode', {IN=>enc 3072+0}, {OUT=>'a' x (3072+0)}], + ['buf-4k1', '--decode', {IN=>enc 3072+1}, {OUT=>'a' x (3072+1)}], + ['buf-4k2', '--decode', {IN=>enc 3072+2}, {OUT=>'a' x (3072+2)}], + ['buf-4k3', '--decode', {IN=>enc 3072+3}, {OUT=>'a' x (3072+3)}], + ['buf-4km1','--decode', {IN=>enc 3072-1}, {OUT=>'a' x (3072-1)}], + ['buf-4km2','--decode', {IN=>enc 3072-2}, {OUT=>'a' x (3072-2)}], + ['buf-4km3','--decode', {IN=>enc 3072-3}, {OUT=>'a' x (3072-3)}], + ['buf-4km4','--decode', {IN=>enc 3072-4}, {OUT=>'a' x (3072-4)}], + + # Exercise the case in which the final base-64 byte is + # in a buffer all by itself. + ['b4k-1', '--decode', {IN=>$a3k_nl[1]}, {OUT=>'a' x (3072+0)}], + ['b4k-2', '--decode', {IN=>$a3k_nl[2]}, {OUT=>'a' x (3072+0)}], + ['b4k-3', '--decode', {IN=>$a3k_nl[3]}, {OUT=>'a' x (3072+0)}], + + ['baddecode', '--decode', {IN=>'a'}, {OUT=>""}, + {ERR_SUBST => 's/.*: invalid input//'}, {ERR => "\n"}, {EXIT => 1}], + ['baddecode2', '--decode', {IN=>'ab'}, {OUT=>"i"}, + {ERR_SUBST => 's/.*: invalid input//'}, {ERR => "\n"}, {EXIT => 1}], + ['baddecode3', '--decode', {IN=>'Zzz'}, {OUT=>"g<"}, + {ERR_SUBST => 's/.*: invalid input//'}, {ERR => "\n"}, {EXIT => 1}], + ['baddecode4', '--decode', {IN=>'Zz='}, {OUT=>"g"}, + {ERR_SUBST => 's/.*: invalid input//'}, {ERR => "\n"}, {EXIT => 1}], + ['baddecode5', '--decode', {IN=>'Z==='}, {OUT=>""}, + {ERR_SUBST => 's/.*: invalid input//'}, {ERR => "\n"}, {EXIT => 1}] + ); + +# For each non-failing test, create a --decode test using the +# expected output as input. Also, add tests inserting newlines. +my @new; +foreach my $t (@Tests) + { + my $exit_val; + my $in; + my @out; + + # If the test has a single option of "--decode", then skip it. + !ref $t->[1] && $t->[1] eq '--decode' + and next; + + foreach my $e (@$t) + { + ref $e && ref $e eq 'HASH' + or next; + defined $e->{EXIT} + and $exit_val = $e->{EXIT}; + defined $e->{IN} + and $in = $e->{IN}; + if (defined $e->{OUT}) + { + my $t = $e->{OUT}; + push @out, $t; + my $len = length $t; + foreach my $i (0..$len) + { + my $u = $t; + substr ($u, $i, 0) = "\n"; + push @out, $u; + 10 <= $i + and last; + } + } + } + $exit_val + and next; + + my $i = 0; + foreach my $o (@out) + { + push @new, ["d$i-$t->[0]", '--decode', {IN => $o}, {OUT => $in}]; + ++$i; + } + } +push @Tests, @new; + +my $save_temps = $ENV{DEBUG}; +my $verbose = $ENV{VERBOSE}; + +my $prog = 'base64'; +my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); +exit $fail; diff --git a/tests/misc/basename b/tests/misc/basename deleted file mode 100755 index d0ab57bf..00000000 --- a/tests/misc/basename +++ /dev/null @@ -1,83 +0,0 @@ -#!/usr/bin/perl -# Test basename. -# Copyright (C) 2006-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 -# 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 File::stat; - -(my $program_name = $0) =~ s|.*/||; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -my $stat_single = stat('/'); -my $stat_double = stat('//'); -my $double_slash = ($stat_single->dev == $stat_double->dev - && $stat_single->ino == $stat_double->ino) ? '/' : '//'; - -my $prog = 'basename'; - -my @Tests = - ( - ['fail-1', {ERR => "$prog: missing operand\n" - . "Try '$prog --help' for more information.\n"}, {EXIT => '1'}], - ['fail-2', qw(a b c), {ERR => "$prog: extra operand 'c'\n" - . "Try '$prog --help' for more information.\n"}, {EXIT => '1'}], - - ['a', qw(d/f), {OUT => 'f'}], - ['b', qw(/d/f), {OUT => 'f'}], - ['c', qw(d/f/), {OUT => 'f'}], - ['d', qw(d/f//), {OUT => 'f'}], - ['e', qw(f), {OUT => 'f'}], - ['f', qw(/), {OUT => '/'}], - ['g', qw(//), {OUT => "$double_slash"}], - ['h', qw(///), {OUT => '/'}], - ['i', qw(///a///), {OUT => 'a'}], - ['j', qw(''), {OUT => ''}], - ['k', qw(aa a), {OUT => 'a'}], - ['l', qw(-a a b), {OUT => "a\nb"}], - ['m', qw(-s a aa ba ab), {OUT => "a\nb\nab"}], - ['n', qw(a-a -a), {OUT => 'a'}], - ['1', qw(f.s .s), {OUT => 'f'}], - ['2', qw(fs s), {OUT => 'f'}], - ['3', qw(fs fs), {OUT => 'fs'}], - ['4', qw(fs/ s), {OUT => 'f'}], - ['5', qw(dir/file.suf .suf), {OUT => 'file'}], - ['6', qw(// /), {OUT => "$double_slash"}], - ['7', qw(// //), {OUT => "$double_slash"}], - ['8', qw(fs x), {OUT => 'fs'}], - ['9', qw(fs ''), {OUT => 'fs'}], - ['10', qw(fs/ s/), {OUT => 'fs'}], - ); - -# Append a newline to end of each expected 'OUT' string. -my $t; -foreach $t (@Tests) - { - my $arg1 = $t->[1]; - my $e; - foreach $e (@$t) - { - $e->{OUT} = "$e->{OUT}\n" - if ref $e eq 'HASH' and exists $e->{OUT}; - } - } - -my $save_temps = $ENV{SAVE_TEMPS}; -my $verbose = $ENV{VERBOSE}; - -my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); -exit $fail; diff --git a/tests/misc/basename.pl b/tests/misc/basename.pl new file mode 100755 index 00000000..b84412bb --- /dev/null +++ b/tests/misc/basename.pl @@ -0,0 +1,92 @@ +#!/usr/bin/perl +# Test basename. +# Copyright (C) 2006-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/>. + +use strict; +use File::stat; + +(my $program_name = $0) =~ s|.*/||; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +my $stat_single = stat('/'); +my $stat_double = stat('//'); +my $double_slash = ($stat_single->dev == $stat_double->dev + && $stat_single->ino == $stat_double->ino) ? '/' : '//'; + +my $prog = 'basename'; + +my @Tests = + ( + ['fail-1', {ERR => "$prog: missing operand\n" + . "Try '$prog --help' for more information.\n"}, {EXIT => '1'}], + ['fail-2', qw(a b c), {ERR => "$prog: extra operand 'c'\n" + . "Try '$prog --help' for more information.\n"}, {EXIT => '1'}], + + ['a', qw(d/f), {OUT => 'f'}], + ['b', qw(/d/f), {OUT => 'f'}], + ['c', qw(d/f/), {OUT => 'f'}], + ['d', qw(d/f//), {OUT => 'f'}], + ['e', qw(f), {OUT => 'f'}], + ['f', qw(/), {OUT => '/'}], + ['g', qw(//), {OUT => "$double_slash"}], + ['h', qw(///), {OUT => '/'}], + ['i', qw(///a///), {OUT => 'a'}], + ['j', qw(''), {OUT => ''}], + ['k', qw(aa a), {OUT => 'a'}], + ['l', qw(-a a b), {OUT => "a\nb"}], + ['m', qw(-s a aa ba ab), {OUT => "a\nb\nab"}], + ['n', qw(a-a -a), {OUT => 'a'}], + ['1', qw(f.s .s), {OUT => 'f'}], + ['2', qw(fs s), {OUT => 'f'}], + ['3', qw(fs fs), {OUT => 'fs'}], + ['4', qw(fs/ s), {OUT => 'f'}], + ['5', qw(dir/file.suf .suf), {OUT => 'file'}], + ['6', qw(// /), {OUT => "$double_slash"}], + ['7', qw(// //), {OUT => "$double_slash"}], + ['8', qw(fs x), {OUT => 'fs'}], + ['9', qw(fs ''), {OUT => 'fs'}], + ['10', qw(fs/ s/), {OUT => 'fs'}], + + # Exercise -z option. + ['z0', qw(-z a), {OUT => "a\0"}], + ['z1', qw(--zero a), {OUT => "a\0"}], + ['z2', qw(-za a b), {OUT => "a\0b\0"}], + ['z3', qw(-z ba a), {OUT => "b\0"}], + ['z4', qw(-z -s a ba), {OUT => "b\0"}], + ); + +# Append a newline to end of each expected 'OUT' string. +# Skip -z tests, i.e. those whose 'OUT' string has a trailing '\0'. +my $t; +foreach $t (@Tests) + { + my $arg1 = $t->[1]; + my $e; + foreach $e (@$t) + { + $e->{OUT} = "$e->{OUT}\n" + if ref $e eq 'HASH' and exists $e->{OUT} + and not $e->{OUT} =~ /\0$/; + } + } + +my $save_temps = $ENV{SAVE_TEMPS}; +my $verbose = $ENV{VERBOSE}; + +my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); +exit $fail; diff --git a/tests/misc/cat-buf b/tests/misc/cat-buf deleted file mode 100755 index 2b6ba2a6..00000000 --- a/tests/misc/cat-buf +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -# Ensure that cat outputs processed data immediately. - -# Copyright (C) 2009-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cat - -# Use a fifo rather than a pipe in the tests below -# so that the producer (cat) will wait until the -# consumer (dd) opens the fifo therefore increasing -# the chance that dd will read the data from each -# write separately. -mkfifo_or_skip_ fifo - - -echo 1 > exp - -cat_buf_1() -{ - local delay="$1" - - dd count=1 if=fifo > out & - (echo 1; sleep $delay; echo 2) | cat -v > fifo - wait # for dd to complete - compare exp out -} - -retry_delay_ cat_buf_1 .1 6 || fail=1 - -Exit $fail diff --git a/tests/misc/cat-buf.sh b/tests/misc/cat-buf.sh new file mode 100755 index 00000000..17fd936f --- /dev/null +++ b/tests/misc/cat-buf.sh @@ -0,0 +1,44 @@ +#!/bin/sh +# Ensure that cat outputs processed data immediately. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cat + +# Use a fifo rather than a pipe in the tests below +# so that the producer (cat) will wait until the +# consumer (dd) opens the fifo therefore increasing +# the chance that dd will read the data from each +# write separately. +mkfifo_or_skip_ fifo + + +echo 1 > exp + +cat_buf_1() +{ + local delay="$1" + + dd count=1 if=fifo > out & + (echo 1; sleep $delay; echo 2) | cat -v > fifo + wait # for dd to complete + compare exp out +} + +retry_delay_ cat_buf_1 .1 6 || fail=1 + +Exit $fail diff --git a/tests/misc/cat-proc b/tests/misc/cat-proc deleted file mode 100755 index 082c727e..00000000 --- a/tests/misc/cat-proc +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh -# Ensure that cat -E produces same output as cat, module '$'s, -# even when applied to a file in /proc. - -# Copyright (C) 2006-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cat - - -f=/proc/cpuinfo -test -f $f \ - || skip_ "no $f" - - -# Yes, parts of /proc/cpuinfo might change between cat runs. -# If that happens, consider choosing a file that's less likely to change, -# or just filter out the changing lines. The sed filter should help -# to avoid any spurious numeric differences. -cat -E $f | sed 's/[0-9][0-9]*/D/g' | tr -d '$' > out || fail=1 -cat $f | sed 's/[0-9][0-9]*/D/g' | tr -d '$' > exp || fail=1 - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/misc/cat-proc.sh b/tests/misc/cat-proc.sh new file mode 100755 index 00000000..77f548e4 --- /dev/null +++ b/tests/misc/cat-proc.sh @@ -0,0 +1,38 @@ +#!/bin/sh +# 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. + +# This 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_ cat + + +f=/proc/cpuinfo +test -f $f \ + || skip_ "no $f" + + +# Yes, parts of /proc/cpuinfo might change between cat runs. +# If that happens, consider choosing a file that's less likely to change, +# or just filter out the changing lines. The sed filter should help +# to avoid any spurious numeric differences. +cat -E $f | sed 's/[0-9][0-9]*/D/g' | tr -d '$' > out || fail=1 +cat $f | sed 's/[0-9][0-9]*/D/g' | tr -d '$' > exp || fail=1 + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/misc/chcon b/tests/misc/chcon deleted file mode 100755 index 6b445803..00000000 --- a/tests/misc/chcon +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/sh -# exercise chcon - -# Copyright (C) 2007-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ chcon -require_root_ -require_selinux_ -skip_if_mcstransd_is_running_ - -mkdir -p d/sub/s2 || framework_failure_ -touch f g d/sub/1 d/sub/2 || framework_failure_ - - -# Set to a specified context. -# Use root:object_r:tmp_t:s0. It is special in that -# it works even when mcstransd isn't running. -u1=root -r1=object_r -t1=tmp_t -range=s0 -ctx=$u1:$r1:$t1:$range -chcon $ctx f || fail=1 -stat --printf='f|%C\n' f > out || fail=1 - -# Use --reference. -chcon --ref=f g || fail=1 -stat --printf='g|%C\n' g >> out || fail=1 - -# Change the individual parts of the context, one by one. -u2=user_u -r2=object_r -t2=file_t -for i in --user=$u2 --role=$r2 --type=$t2 --range=$range; do - chcon $i f || fail=1 - stat --printf="f|$i|"'%C\n' f >> out || fail=1 -done - -# Same, but change back using the short-named options. -for i in -u$u1 -r$r1 -t$t1; do - chcon $i f || fail=1 - stat --printf="f|$i|"'%C\n' f >> out || fail=1 -done - -cat <<EOF > exp || fail=1 -f|$ctx -g|$ctx -f|--user=$u2|$u2:$r1:$t1:$range -f|--role=$r2|$u2:$r2:$t1:$range -f|--type=$t2|$u2:$r2:$t2:$range -f|--range=$range|$u2:$r2:$t2:$range -f|-uroot|root:object_r:file_t:$range -f|-robject_r|root:object_r:file_t:$range -f|-ttmp_t|root:object_r:tmp_t:$range -EOF - -compare exp out || fail=1 - -chcon --verbose -u$u1 f > out || fail=1 -echo "changing security context of 'f'" > exp -compare exp out || fail=1 - -Exit $fail diff --git a/tests/misc/chcon-fail b/tests/misc/chcon-fail deleted file mode 100755 index d9f6c21b..00000000 --- a/tests/misc/chcon-fail +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -# Ensure that chcon fails when it should. -# These tests don't use any actual SE Linux syscalls. - -# Copyright (C) 2007-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ chcon - - -# neither context nor file -chcon 2> /dev/null && fail=1 - -# No file -chcon CON 2> /dev/null && fail=1 - -# No file -touch f -chcon --reference=f 2> /dev/null && fail=1 - -# No file -chcon -u anyone 2> /dev/null && fail=1 - -Exit $fail diff --git a/tests/misc/chcon-fail.sh b/tests/misc/chcon-fail.sh new file mode 100755 index 00000000..c9b651b7 --- /dev/null +++ b/tests/misc/chcon-fail.sh @@ -0,0 +1,37 @@ +#!/bin/sh +# 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. + +# This 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_ chcon + + +# neither context nor file +chcon 2> /dev/null && fail=1 + +# No file +chcon CON 2> /dev/null && fail=1 + +# No file +touch f +chcon --reference=f 2> /dev/null && fail=1 + +# No file +chcon -u anyone 2> /dev/null && fail=1 + +Exit $fail diff --git a/tests/misc/chcon.sh b/tests/misc/chcon.sh new file mode 100755 index 00000000..aace5389 --- /dev/null +++ b/tests/misc/chcon.sh @@ -0,0 +1,77 @@ +#!/bin/sh +# exercise chcon + +# Copyright (C) 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ chcon +require_root_ +require_selinux_ +skip_if_mcstransd_is_running_ + +mkdir -p d/sub/s2 || framework_failure_ +touch f g d/sub/1 d/sub/2 || framework_failure_ + + +# Set to a specified context. +# Use root:object_r:tmp_t:s0. It is special in that +# it works even when mcstransd isn't running. +u1=root +r1=object_r +t1=tmp_t +range=s0 +ctx=$u1:$r1:$t1:$range +chcon $ctx f || fail=1 +stat --printf='f|%C\n' f > out || fail=1 + +# Use --reference. +chcon --ref=f g || fail=1 +stat --printf='g|%C\n' g >> out || fail=1 + +# Change the individual parts of the context, one by one. +u2=user_u +r2=object_r +t2=file_t +for i in --user=$u2 --role=$r2 --type=$t2 --range=$range; do + chcon $i f || fail=1 + stat --printf="f|$i|"'%C\n' f >> out || fail=1 +done + +# Same, but change back using the short-named options. +for i in -u$u1 -r$r1 -t$t1; do + chcon $i f || fail=1 + stat --printf="f|$i|"'%C\n' f >> out || fail=1 +done + +cat <<EOF > exp || fail=1 +f|$ctx +g|$ctx +f|--user=$u2|$u2:$r1:$t1:$range +f|--role=$r2|$u2:$r2:$t1:$range +f|--type=$t2|$u2:$r2:$t2:$range +f|--range=$range|$u2:$r2:$t2:$range +f|-uroot|root:object_r:file_t:$range +f|-robject_r|root:object_r:file_t:$range +f|-ttmp_t|root:object_r:tmp_t:$range +EOF + +compare exp out || fail=1 + +chcon --verbose -u$u1 f > out || fail=1 +echo "changing security context of 'f'" > exp +compare exp out || fail=1 + +Exit $fail diff --git a/tests/misc/chroot-credentials b/tests/misc/chroot-credentials deleted file mode 100755 index bae9d425..00000000 --- a/tests/misc/chroot-credentials +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh -# Verify that the credentials are changed correctly. - -# Copyright (C) 2009-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ chroot - -require_root_ - - -# Verify that root credentials are kept. -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 - -# 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 - -# 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 - -# 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 - -Exit $fail diff --git a/tests/misc/chroot-credentials.sh b/tests/misc/chroot-credentials.sh new file mode 100755 index 00000000..8eb658d9 --- /dev/null +++ b/tests/misc/chroot-credentials.sh @@ -0,0 +1,52 @@ +#!/bin/sh +# Verify that the credentials are changed correctly. + +# 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/>. + + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ chroot + +require_root_ + + +# Verify that root credentials are kept. +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 + +# 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 + +# 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 + +# 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 + +Exit $fail diff --git a/tests/misc/chroot-fail b/tests/misc/chroot-fail deleted file mode 100755 index 6a5ecf32..00000000 --- a/tests/misc/chroot-fail +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -# Verify that internal failure in chroot gives exact status. - -# Copyright (C) 2009-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ chroot - - -# These tests verify exact status of internal failure; since none of -# them actually run a command, we don't need root privileges -chroot # missing argument -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 - -Exit $fail diff --git a/tests/misc/chroot-fail.sh b/tests/misc/chroot-fail.sh new file mode 100755 index 00000000..86095f3c --- /dev/null +++ b/tests/misc/chroot-fail.sh @@ -0,0 +1,43 @@ +#!/bin/sh +# Verify that internal failure in chroot gives exact status. + +# 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/>. + + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ chroot + + +# These tests verify exact status of internal failure; since none of +# them actually run a command, we don't need root privileges +chroot # missing argument +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 + +Exit $fail diff --git a/tests/misc/close-stdout b/tests/misc/close-stdout deleted file mode 100755 index 8584dfea..00000000 --- a/tests/misc/close-stdout +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/sh -# 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-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ rm - -p=$abs_top_builddir - - -# Ensure these exit successfully, even though stdout is closed, -# because they generate no output. -touch a -cp a b >&- || fail=1 -test -f b || fail=1 -chmod o-w . >&- || fail=1 -ln a c >&- || fail=1 -rm c >&- || fail=1 -mkdir d >&- || fail=1 -mv d e >&- || fail=1 -rmdir e >&- || fail=1 -touch e >&- || fail=1 -sleep 0 >&- || fail=1 -"$p/src/true" >&- || fail=1 -"$p/src/printf" '' >&- || fail=1 - -# If >&- works, ensure these fail, because stdout is closed and they -# *do* generate output. >&- apparently does not work in HP-UX 11.23. -# This test is ineffective unless /dev/stdout also works. -if "$p/src/test" -w /dev/stdout >/dev/null && - "$p/src/test" ! -w /dev/stdout >&-; then - "$p/src/printf" 'foo' >&- 2>/dev/null && fail=1 - cp --verbose a b >&- 2>/dev/null && fail=1 - rm -Rf tmpfile-?????? || fail=1 - mktemp tmpfile-XXXXXX >&- 2>/dev/null && fail=1 - mktemp tmpfile-XXXXXX -q >&- 2>/dev/null && fail=1 - case $(echo tmpfile-??????) in 'tmpfile-??????') ;; *) fail=1 ;; esac -fi - -# Likewise for /dev/full, if /dev/full works. -if test -w /dev/full && test -c /dev/full; then - "$p/src/printf" 'foo' >/dev/full 2>/dev/null && fail=1 - cp --verbose a b >/dev/full 2>/dev/null && fail=1 - rm -Rf tmpdir-?????? || fail=1 - mktemp -d tmpdir-XXXXXX >/dev/full 2>/dev/null && fail=1 - mktemp -d -q tmpdir-XXXXXX >/dev/full 2>/dev/null && fail=1 - case $(echo tmpfile-??????) in 'tmpfile-??????') ;; *) fail=1 ;; esac -fi - -Exit $fail diff --git a/tests/misc/close-stdout.sh b/tests/misc/close-stdout.sh new file mode 100755 index 00000000..8ea08487 --- /dev/null +++ b/tests/misc/close-stdout.sh @@ -0,0 +1,65 @@ +#!/bin/sh +# 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. + +# This 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 + +p=$abs_top_builddir + + +# Ensure these exit successfully, even though stdout is closed, +# because they generate no output. +touch a +cp a b >&- || fail=1 +test -f b || fail=1 +chmod o-w . >&- || fail=1 +ln a c >&- || fail=1 +rm c >&- || fail=1 +mkdir d >&- || fail=1 +mv d e >&- || fail=1 +rmdir e >&- || fail=1 +touch e >&- || fail=1 +sleep 0 >&- || fail=1 +"$p/src/true" >&- || fail=1 +"$p/src/printf" '' >&- || fail=1 + +# If >&- works, ensure these fail, because stdout is closed and they +# *do* generate output. >&- apparently does not work in HP-UX 11.23. +# This test is ineffective unless /dev/stdout also works. +if "$p/src/test" -w /dev/stdout >/dev/null && + "$p/src/test" ! -w /dev/stdout >&-; then + "$p/src/printf" 'foo' >&- 2>/dev/null && fail=1 + cp --verbose a b >&- 2>/dev/null && fail=1 + rm -Rf tmpfile-?????? || fail=1 + mktemp tmpfile-XXXXXX >&- 2>/dev/null && fail=1 + mktemp tmpfile-XXXXXX -q >&- 2>/dev/null && fail=1 + case $(echo tmpfile-??????) in 'tmpfile-??????') ;; *) fail=1 ;; esac +fi + +# Likewise for /dev/full, if /dev/full works. +if test -w /dev/full && test -c /dev/full; then + "$p/src/printf" 'foo' >/dev/full 2>/dev/null && fail=1 + cp --verbose a b >/dev/full 2>/dev/null && fail=1 + rm -Rf tmpdir-?????? || fail=1 + mktemp -d tmpdir-XXXXXX >/dev/full 2>/dev/null && fail=1 + mktemp -d -q tmpdir-XXXXXX >/dev/full 2>/dev/null && fail=1 + case $(echo tmpfile-??????) in 'tmpfile-??????') ;; *) fail=1 ;; esac +fi + +Exit $fail diff --git a/tests/misc/comm b/tests/misc/comm deleted file mode 100755 index 0de4f699..00000000 --- a/tests/misc/comm +++ /dev/null @@ -1,152 +0,0 @@ -#!/usr/bin/perl -# -*- perl -*- -# Test comm - -# Copyright (C) 2008-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 -# 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/>. - -require 5.003; -use strict; - -(my $program_name = $0) =~ s|.*/||; - -my $prog = 'comm'; - -# Turn off localization of executable's ouput. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -my @inputs = ({IN=>{a=>"1\n3"}}, {IN=>{b=>"2\n3"}}); - -my @Tests = - ( - # basic operation - ['basic', @inputs, {OUT=>"1\n\t2\n\t\t3\n"} ], - - # suppress lines unique to file 1 - ['opt-1', '-1', @inputs, {OUT=>"2\n\t3\n"} ], - - # suppress lines unique to file 2 - ['opt-2', '-2', @inputs, {OUT=>"1\n\t3\n"} ], - - # suppress lines that appear in both files - ['opt-3', '-3', @inputs, {OUT=>"1\n\t2\n"} ], - - # suppress lines unique to file 1 and lines unique to file 2 - ['opt-12', '-1', '-2', @inputs, {OUT=>"3\n"} ], - - # suppress lines unique to file 1 and those that appear in both files - ['opt-13', '-1', '-3', @inputs, {OUT=>"2\n"} ], - - # suppress lines unique to file 2 and those that appear in both files - ['opt-23', '-2', '-3', @inputs, {OUT=>"1\n"} ], - - # suppress all output (really?) - ['opt-123', '-1', '-2', '-3', @inputs, {OUT=>""} ], - - # invalid missing command line argument (1) - ['missing-arg1', $inputs[0], {EXIT=>1}, - {ERR => "$prog: missing operand after 'a'\n" - . "Try '$prog --help' for more information.\n"}], - - # invalid missing command line argument (both) - ['missing-arg2', {EXIT=>1}, - {ERR => "$prog: missing operand\n" - . "Try '$prog --help' for more information.\n"}], - - # invalid extra command line argument - ['extra-arg', @inputs, 'no-such', {EXIT=>1}, - {ERR => "$prog: extra operand 'no-such'\n" - . "Try '$prog --help' for more information.\n"}], - - # out-of-order input - ['ooo', {IN=>{a=>"1\n3"}}, {IN=>{b=>"3\n2"}}, {EXIT=>1}, - {OUT => "1\n\t\t3\n\t2\n"}, - {ERR => "$prog: file 2 is not in sorted order\n"}], - - # out-of-order input, fatal - ['ooo2', '--check-order', {IN=>{a=>"1\n3"}}, {IN=>{b=>"3\n2"}}, {EXIT=>1}, - {OUT => "1\n\t\t3\n"}, - {ERR => "$prog: file 2 is not in sorted order\n"}], - - # out-of-order input, ignored - ['ooo3', '--nocheck-order', {IN=>{a=>"1\n3"}}, {IN=>{b=>"3\n2"}}, - {OUT => "1\n\t\t3\n\t2\n"}], - - # both inputs out-of-order - ['ooo4', {IN=>{a=>"3\n1\n0"}}, {IN=>{b=>"3\n2\n0"}}, {EXIT=>1}, - {OUT => "\t\t3\n1\n0\n\t2\n\t0\n"}, - {ERR => "$prog: file 1 is not in sorted order\n". - "$prog: file 2 is not in sorted order\n" }], - - # both inputs out-of-order on last pair - ['ooo5', {IN=>{a=>"3\n1"}}, {IN=>{b=>"3\n2"}}, {EXIT=>1}, - {OUT => "\t\t3\n1\n\t2\n"}, - {ERR => "$prog: file 1 is not in sorted order\n". - "$prog: file 2 is not in sorted order\n" }], - - # first input out-of-order extended - ['ooo5b', {IN=>{a=>"0\n3\n1"}}, {IN=>{b=>"2\n3"}}, {EXIT=>1}, - {OUT => "0\n\t2\n\t\t3\n1\n"}, - {ERR => "$prog: file 1 is not in sorted order\n"}], - - # second input out-of-order extended - ['ooo5c', {IN=>{a=>"0\n3"}}, {IN=>{b=>"2\n3\n1"}}, {EXIT=>1}, - {OUT => "0\n\t2\n\t\t3\n\t1\n"}, - {ERR => "$prog: file 2 is not in sorted order\n"}], - - # both inputs out-of-order, but fully pairable - ['ooo6', {IN=>{a=>"2\n1\n0"}}, {IN=>{b=>"2\n1\n0"}}, {EXIT=>0}, - {OUT => "\t\t2\n\t\t1\n\t\t0\n"}], - - # both inputs out-of-order, fully pairable, but forced to fail - ['ooo7', '--check-order', {IN=>{a=>"2\n1\n0"}}, {IN=>{b=>"2\n1\n0"}}, - {EXIT=>1}, - {OUT => "\t\t2\n"}, - {ERR => "$prog: file 1 is not in sorted order\n"}], - - # out-of-order, line 2 is a prefix of line 1 - # until coreutils-7.2, this test would fail -- no disorder detected - ['ooo-prefix', '--check-order', {IN=>{a=>"Xa\nX\n"}}, {IN=>{b=>""}}, - {EXIT=>1}, - {OUT => "Xa\n"}, - {ERR => "$prog: file 1 is not in sorted order\n"}], - - # alternate delimiter: ',' - ['delim-comma', '--output-delimiter=,', @inputs, - {OUT=>"1\n,2\n,,3\n"} ], - - # two-character alternate delimiter: '++' - ['delim-2char', '--output-delimiter=++', @inputs, - {OUT=>"1\n++2\n++++3\n"} ], - - # invalid empty delimiter - ['delim-empty', '--output-delimiter=', @inputs, {EXIT=>1}, - {ERR => "$prog: empty '--output-delimiter' not allowed\n"}], - - # invalid dual delimiter - ['delim-dual', '--output-delimiter=,', '--output-delimiter=+', - @inputs, {EXIT=>1}, {ERR => "$prog: multiple delimiters specified\n"}], - - # valid dual delimiter specification - ['delim-dual2', '--output-delimiter=,', '--output-delimiter=,', @inputs, - {OUT=>"1\n,2\n,,3\n"} ], - - ); - -my $save_temps = $ENV{DEBUG}; -my $verbose = $ENV{VERBOSE}; - -my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); -exit $fail; diff --git a/tests/misc/comm.pl b/tests/misc/comm.pl new file mode 100755 index 00000000..62711bda --- /dev/null +++ b/tests/misc/comm.pl @@ -0,0 +1,152 @@ +#!/usr/bin/perl +# -*- perl -*- +# Test comm + +# 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/>. + +require 5.003; +use strict; + +(my $program_name = $0) =~ s|.*/||; + +my $prog = 'comm'; + +# Turn off localization of executable's ouput. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +my @inputs = ({IN=>{a=>"1\n3"}}, {IN=>{b=>"2\n3"}}); + +my @Tests = + ( + # basic operation + ['basic', @inputs, {OUT=>"1\n\t2\n\t\t3\n"} ], + + # suppress lines unique to file 1 + ['opt-1', '-1', @inputs, {OUT=>"2\n\t3\n"} ], + + # suppress lines unique to file 2 + ['opt-2', '-2', @inputs, {OUT=>"1\n\t3\n"} ], + + # suppress lines that appear in both files + ['opt-3', '-3', @inputs, {OUT=>"1\n\t2\n"} ], + + # suppress lines unique to file 1 and lines unique to file 2 + ['opt-12', '-1', '-2', @inputs, {OUT=>"3\n"} ], + + # suppress lines unique to file 1 and those that appear in both files + ['opt-13', '-1', '-3', @inputs, {OUT=>"2\n"} ], + + # suppress lines unique to file 2 and those that appear in both files + ['opt-23', '-2', '-3', @inputs, {OUT=>"1\n"} ], + + # suppress all output (really?) + ['opt-123', '-1', '-2', '-3', @inputs, {OUT=>""} ], + + # invalid missing command line argument (1) + ['missing-arg1', $inputs[0], {EXIT=>1}, + {ERR => "$prog: missing operand after 'a'\n" + . "Try '$prog --help' for more information.\n"}], + + # invalid missing command line argument (both) + ['missing-arg2', {EXIT=>1}, + {ERR => "$prog: missing operand\n" + . "Try '$prog --help' for more information.\n"}], + + # invalid extra command line argument + ['extra-arg', @inputs, 'no-such', {EXIT=>1}, + {ERR => "$prog: extra operand 'no-such'\n" + . "Try '$prog --help' for more information.\n"}], + + # out-of-order input + ['ooo', {IN=>{a=>"1\n3"}}, {IN=>{b=>"3\n2"}}, {EXIT=>1}, + {OUT => "1\n\t\t3\n\t2\n"}, + {ERR => "$prog: file 2 is not in sorted order\n"}], + + # out-of-order input, fatal + ['ooo2', '--check-order', {IN=>{a=>"1\n3"}}, {IN=>{b=>"3\n2"}}, {EXIT=>1}, + {OUT => "1\n\t\t3\n"}, + {ERR => "$prog: file 2 is not in sorted order\n"}], + + # out-of-order input, ignored + ['ooo3', '--nocheck-order', {IN=>{a=>"1\n3"}}, {IN=>{b=>"3\n2"}}, + {OUT => "1\n\t\t3\n\t2\n"}], + + # both inputs out-of-order + ['ooo4', {IN=>{a=>"3\n1\n0"}}, {IN=>{b=>"3\n2\n0"}}, {EXIT=>1}, + {OUT => "\t\t3\n1\n0\n\t2\n\t0\n"}, + {ERR => "$prog: file 1 is not in sorted order\n". + "$prog: file 2 is not in sorted order\n" }], + + # both inputs out-of-order on last pair + ['ooo5', {IN=>{a=>"3\n1"}}, {IN=>{b=>"3\n2"}}, {EXIT=>1}, + {OUT => "\t\t3\n1\n\t2\n"}, + {ERR => "$prog: file 1 is not in sorted order\n". + "$prog: file 2 is not in sorted order\n" }], + + # first input out-of-order extended + ['ooo5b', {IN=>{a=>"0\n3\n1"}}, {IN=>{b=>"2\n3"}}, {EXIT=>1}, + {OUT => "0\n\t2\n\t\t3\n1\n"}, + {ERR => "$prog: file 1 is not in sorted order\n"}], + + # second input out-of-order extended + ['ooo5c', {IN=>{a=>"0\n3"}}, {IN=>{b=>"2\n3\n1"}}, {EXIT=>1}, + {OUT => "0\n\t2\n\t\t3\n\t1\n"}, + {ERR => "$prog: file 2 is not in sorted order\n"}], + + # both inputs out-of-order, but fully pairable + ['ooo6', {IN=>{a=>"2\n1\n0"}}, {IN=>{b=>"2\n1\n0"}}, {EXIT=>0}, + {OUT => "\t\t2\n\t\t1\n\t\t0\n"}], + + # both inputs out-of-order, fully pairable, but forced to fail + ['ooo7', '--check-order', {IN=>{a=>"2\n1\n0"}}, {IN=>{b=>"2\n1\n0"}}, + {EXIT=>1}, + {OUT => "\t\t2\n"}, + {ERR => "$prog: file 1 is not in sorted order\n"}], + + # out-of-order, line 2 is a prefix of line 1 + # until coreutils-7.2, this test would fail -- no disorder detected + ['ooo-prefix', '--check-order', {IN=>{a=>"Xa\nX\n"}}, {IN=>{b=>""}}, + {EXIT=>1}, + {OUT => "Xa\n"}, + {ERR => "$prog: file 1 is not in sorted order\n"}], + + # alternate delimiter: ',' + ['delim-comma', '--output-delimiter=,', @inputs, + {OUT=>"1\n,2\n,,3\n"} ], + + # two-character alternate delimiter: '++' + ['delim-2char', '--output-delimiter=++', @inputs, + {OUT=>"1\n++2\n++++3\n"} ], + + # invalid empty delimiter + ['delim-empty', '--output-delimiter=', @inputs, {EXIT=>1}, + {ERR => "$prog: empty '--output-delimiter' not allowed\n"}], + + # invalid dual delimiter + ['delim-dual', '--output-delimiter=,', '--output-delimiter=+', + @inputs, {EXIT=>1}, {ERR => "$prog: multiple delimiters specified\n"}], + + # valid dual delimiter specification + ['delim-dual2', '--output-delimiter=,', '--output-delimiter=,', @inputs, + {OUT=>"1\n,2\n,,3\n"} ], + + ); + +my $save_temps = $ENV{DEBUG}; +my $verbose = $ENV{VERBOSE}; + +my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); +exit $fail; diff --git a/tests/misc/csplit b/tests/misc/csplit deleted file mode 100755 index aea2e918..00000000 --- a/tests/misc/csplit +++ /dev/null @@ -1,103 +0,0 @@ -#!/bin/sh -# various csplit tests - -# Copyright (C) 2001-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ csplit - - -# csplit could get a failed assertion to 2.0.17 -(echo a; echo; echo) > in -csplit in '/^$/' 2 > out || fail=1 -cat <<EOF > exp -2 -0 -2 -EOF -compare exp out || fail=1 -rm -f in out exp - -# Ensure that xx02 contains just two newlines. -# This would fail due to reading from freed buffer with coreutils-5.0.91. -printf '\n\n' > exp -cp xx02 out || fail=1 -compare exp out || fail=1 -rm -f in out exp - -# csplit would infloop -(echo; echo a) > in -csplit in '/a/-1' '{*}' > out || fail=1 -cat <<EOF > exp -0 -3 -EOF -compare exp out || fail=1 -rm -f in out exp - -# 'echo |csplit - 1 1' used to abort. -echo > in -csplit in 1 1 > out 2> err || fail=1 -cat <<EOF > exp -0 -0 -1 -EOF -compare exp out || fail=1 -cat <<\EOF > experr -csplit: warning: line number '1' is the same as preceding line number -EOF -compare experr err || fail=1 -rm -f in out exp err experr - -# 'echo | csplit -b '%0#6.3x' - 1' incorrectly warned about the format -# up through coreutils 8.6. -echo > in -csplit -b '%0#6.3x' in 1 > out 2> err || fail=1 -cat <<EOF > exp -0 -1 -EOF -compare exp out || fail=1 -touch experr -compare experr err || fail=1 -compare 'xx 000' experr || fail=1 -compare 'xx 0x001' in || fail=1 -rm -f in out exp err experr xx* - -# make sure 'csplit FILE 0' fails. -echo > in -csplit in 0 > out 2> err && fail=1 -csplit in 2 1 > out 2>> err && fail=1 -csplit in 3 3 > out 2>> err && fail=1 -cat <<\EOF > experr -csplit: 0: line number must be greater than zero -csplit: line number '1' is smaller than preceding line number, 2 -csplit: warning: line number '3' is the same as preceding line number -csplit: '3': line number out of range -EOF -compare experr err || fail=1 - -# Ensure that lines longer than the initial buffer length don't cause -# trouble (e.g. reading from freed memory, resulting in corrupt output). -# This test failed at least in coreutils-5.2.1 and 5.3.0, and was fixed -# in 5.3.1. -rm -f in out exp err experr xx?? -printf 'x%8199s\nx\n%8199s\nx\n' x x > in -csplit in '/x\{1\}/' '{*}' > /dev/null || fail=1 -cat xx?? | compare - in || fail=1 - -Exit $fail diff --git a/tests/misc/csplit-1000 b/tests/misc/csplit-1000 deleted file mode 100755 index 217097e5..00000000 --- a/tests/misc/csplit-1000 +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# cause a 1-byte heap buffer overrun - -# Copyright (C) 2010-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ csplit - -# Before coreutils-8.7, this would overrun the 6-byte filename_space buffer. -# It's hard to detect that without using valgrind, so here, we simply -# run the demonstrator. -seq 1000 | csplit - '/./' '{*}' || fail=1 -test -f xx1000 || fail=1 -test -f xx1001 && fail=1 - -Exit $fail diff --git a/tests/misc/csplit-1000.sh b/tests/misc/csplit-1000.sh new file mode 100755 index 00000000..26cb8a8c --- /dev/null +++ b/tests/misc/csplit-1000.sh @@ -0,0 +1,29 @@ +#!/bin/sh +# cause a 1-byte heap buffer overrun + +# Copyright (C) 2010-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ csplit + +# Before coreutils-8.7, this would overrun the 6-byte filename_space buffer. +# It's hard to detect that without using valgrind, so here, we simply +# run the demonstrator. +seq 1000 | csplit - '/./' '{*}' || fail=1 +test -f xx1000 || fail=1 +test -f xx1001 && fail=1 + +Exit $fail diff --git a/tests/misc/csplit-heap b/tests/misc/csplit-heap deleted file mode 100755 index f12f9fe0..00000000 --- a/tests/misc/csplit-heap +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# ensure that csplit uses a bounded amount of memory - -# Copyright (C) 2010-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ csplit - -require_ulimit_ - -( - ulimit -v 20000 - { yes | head -n2500000; echo n; } | csplit -z - %n%1 -) || fail=1 - -Exit $fail diff --git a/tests/misc/csplit-heap.sh b/tests/misc/csplit-heap.sh new file mode 100755 index 00000000..82945a78 --- /dev/null +++ b/tests/misc/csplit-heap.sh @@ -0,0 +1,29 @@ +#!/bin/sh +# ensure that csplit uses a bounded amount of memory + +# Copyright (C) 2010-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ csplit + +require_ulimit_ + +( + ulimit -v 20000 + { yes | head -n2500000; echo n; } | csplit -z - %n%1 +) || fail=1 + +Exit $fail diff --git a/tests/misc/csplit.sh b/tests/misc/csplit.sh new file mode 100755 index 00000000..24c21aaf --- /dev/null +++ b/tests/misc/csplit.sh @@ -0,0 +1,103 @@ +#!/bin/sh +# various csplit tests + +# Copyright (C) 2001-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ csplit + + +# csplit could get a failed assertion to 2.0.17 +(echo a; echo; echo) > in +csplit in '/^$/' 2 > out || fail=1 +cat <<EOF > exp +2 +0 +2 +EOF +compare exp out || fail=1 +rm -f in out exp + +# Ensure that xx02 contains just two newlines. +# This would fail due to reading from freed buffer with coreutils-5.0.91. +printf '\n\n' > exp +cp xx02 out || fail=1 +compare exp out || fail=1 +rm -f in out exp + +# csplit would infloop +(echo; echo a) > in +csplit in '/a/-1' '{*}' > out || fail=1 +cat <<EOF > exp +0 +3 +EOF +compare exp out || fail=1 +rm -f in out exp + +# 'echo |csplit - 1 1' used to abort. +echo > in +csplit in 1 1 > out 2> err || fail=1 +cat <<EOF > exp +0 +0 +1 +EOF +compare exp out || fail=1 +cat <<\EOF > experr +csplit: warning: line number '1' is the same as preceding line number +EOF +compare experr err || fail=1 +rm -f in out exp err experr + +# 'echo | csplit -b '%0#6.3x' - 1' incorrectly warned about the format +# up through coreutils 8.6. +echo > in +csplit -b '%0#6.3x' in 1 > out 2> err || fail=1 +cat <<EOF > exp +0 +1 +EOF +compare exp out || fail=1 +touch experr +compare experr err || fail=1 +compare 'xx 000' experr || fail=1 +compare 'xx 0x001' in || fail=1 +rm -f in out exp err experr xx* + +# make sure 'csplit FILE 0' fails. +echo > in +csplit in 0 > out 2> err && fail=1 +csplit in 2 1 > out 2>> err && fail=1 +csplit in 3 3 > out 2>> err && fail=1 +cat <<\EOF > experr +csplit: 0: line number must be greater than zero +csplit: line number '1' is smaller than preceding line number, 2 +csplit: warning: line number '3' is the same as preceding line number +csplit: '3': line number out of range +EOF +compare experr err || fail=1 + +# Ensure that lines longer than the initial buffer length don't cause +# trouble (e.g. reading from freed memory, resulting in corrupt output). +# This test failed at least in coreutils-5.2.1 and 5.3.0, and was fixed +# in 5.3.1. +rm -f in out exp err experr xx?? +printf 'x%8199s\nx\n%8199s\nx\n' x x > in +csplit in '/x\{1\}/' '{*}' > /dev/null || fail=1 +cat xx?? | compare - in || fail=1 + +Exit $fail diff --git a/tests/misc/cut b/tests/misc/cut deleted file mode 100755 index 0ce051ab..00000000 --- a/tests/misc/cut +++ /dev/null @@ -1,198 +0,0 @@ -#!/usr/bin/perl -# Test "cut". - -# Copyright (C) 2006-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 -# 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; - -(my $ME = $0) =~ s|.*/||; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -my $mb_locale = $ENV{LOCALE_FR_UTF8}; -! defined $mb_locale || $mb_locale eq 'none' - and $mb_locale = 'C'; - -my $prog = 'cut'; -my $try = "Try '$prog --help' for more information.\n"; -my $from_1 = "$prog: fields and positions are numbered from 1\n$try"; -my $inval = "$prog: invalid byte or field list\n$try"; -my $no_endpoint = "$prog: invalid range with no endpoint: -\n$try"; - -my @Tests = - ( - # Provoke a double-free in cut from coreutils-6.7. - ['dbl-free', '-f2-', {IN=>{f=>'x'}}, {IN=>{g=>'y'}}, {OUT=>"x\ny\n"}], - - # This failed (as it should) even before coreutils-6.9.90, - # but cut from 6.9.90 produces a more useful diagnostic. - ['zero-1', '-b0', {ERR=>$from_1}, {EXIT => 1} ], - - # Up to coreutils-6.9, specifying a range of 0-2 was not an error. - # It was treated just like "-2". - ['zero-2', '-f0-2', {ERR=>$from_1}, {EXIT => 1} ], - - ['1', '-d:', '-f1,3-', {IN=>"a:b:c\n"}, {OUT=>"a:c\n"}], - ['2', '-d:', '-f1,3-', {IN=>"a:b:c\n"}, {OUT=>"a:c\n"}], - ['3', qw(-d: -f2-), {IN=>"a:b:c\n"}, {OUT=>"b:c\n"}], - ['4', qw(-d: -f4), {IN=>"a:b:c\n"}, {OUT=>"\n"}], - ['5', qw(-d: -f4), {IN=>""}, {OUT=>""}], - ['6', '-c4', {IN=>"123\n"}, {OUT=>"\n"}], - ['7', '-c4', {IN=>"123"}, {OUT=>"\n"}], - ['8', '-c4', {IN=>"123\n1"}, {OUT=>"\n\n"}], - ['9', '-c4', {IN=>""}, {OUT=>""}], - ['a', qw(-s -d:), '-f3-', {IN=>"a:b:c\n"}, {OUT=>"c\n"}], - ['b', qw(-s -d:), '-f2,3', {IN=>"a:b:c\n"}, {OUT=>"b:c\n"}], - ['c', qw(-s -d:), '-f1,3', {IN=>"a:b:c\n"}, {OUT=>"a:c\n"}], - # Trailing colon should not be output - ['d', qw(-s -d:), '-f1,3', {IN=>"a:b:c:\n"}, {OUT=>"a:c\n"}], - ['e', qw(-s -d:), '-f3-', {IN=>"a:b:c:\n"}, {OUT=>"c:\n"}], - ['f', qw(-s -d:), '-f3-4', {IN=>"a:b:c:\n"}, {OUT=>"c:\n"}], - ['g', qw(-s -d:), '-f3,4', {IN=>"a:b:c:\n"}, {OUT=>"c:\n"}], - # Make sure -s suppresses non-delimited lines - ['h', qw(-s -d:), '-f2,3', {IN=>"abc\n"}, {OUT=>""}], - # - ['i', qw(-d: -f1-3), {IN=>":::\n"}, {OUT=>"::\n"}], - ['j', qw(-d: -f1-4), {IN=>":::\n"}, {OUT=>":::\n"}], - ['k', qw(-d: -f2-3), {IN=>":::\n"}, {OUT=>":\n"}], - ['l', qw(-d: -f2-4), {IN=>":::\n"}, {OUT=>"::\n"}], - ['m', qw(-s -d: -f1-3), {IN=>":::\n"}, {OUT=>"::\n"}], - ['n', qw(-s -d: -f1-4), {IN=>":::\n"}, {OUT=>":::\n"}], - ['o', qw(-s -d: -f2-3), {IN=>":::\n"}, {OUT=>":\n"}], - ['p', qw(-s -d: -f2-4), {IN=>":::\n"}, {OUT=>"::\n"}], - ['q', qw(-s -d: -f2-4), {IN=>":::\n:\n"}, {OUT=>"::\n\n"}], - ['r', qw(-s -d: -f2-4), {IN=>":::\n:1\n"}, {OUT=>"::\n1\n"}], - ['s', qw(-s -d: -f1-4), {IN=>":::\n:a\n"}, {OUT=>":::\n:a\n"}], - ['t', qw(-s -d: -f3-), {IN=>":::\n:1\n"}, {OUT=>":\n\n"}], - # Make sure it handles empty input properly, with and without -s. - ['u', qw(-s -f3-), {IN=>""}, {OUT=>""}], - ['v', '-f3-', {IN=>""}, {OUT=>""}], - # Make sure it handles empty input properly. - ['w', qw(-b 1), {IN=>""}, {OUT=>""}], - ['x', qw(-s -d: -f2-4), {IN=>":\n"}, {OUT=>"\n"}], - # Errors - # -s may be used only with -f - ['y', qw(-s -b4), {IN=>":\n"}, {OUT=>""}, {EXIT=>1}, - {ERR=>"$prog: suppressing non-delimited lines makes sense\n" - . "\tonly when operating on fields\n$try"}], - # You must specify bytes or fields (or chars) - ['z', '', {IN=>":\n"}, {OUT=>""}, {EXIT=>1}, - {ERR=>"$prog: you must specify a list of bytes, characters, or fields\n$try"} - ], - # Empty field list - ['empty-fl', qw(-f ''), {IN=>":\n"}, {OUT=>""}, {EXIT=>1}, {ERR=>$from_1}], - # Missing field list - ['missing-fl', qw(-f --), {IN=>":\n"}, {OUT=>""}, {EXIT=>1}, {ERR=>$inval}], - # Empty byte list - ['empty-bl', qw(-b ''), {IN=>":\n"}, {OUT=>""}, {EXIT=>1}, {ERR=>$from_1}], - # Missing byte list - ['missing-bl', qw(-b --), {IN=>":\n"}, {OUT=>""}, {EXIT=>1}, {ERR=>$inval}], - - # This test fails with cut from textutils-1.22. - ['empty-f1', '-f1', {IN=>""}, {OUT=>""}], - - ['empty-f2', '-f2', {IN=>""}, {OUT=>""}], - - ['o-delim', qw(-d: --out=_), '-f2,3', {IN=>"a:b:c\n"}, {OUT=>"b_c\n"}], - ['nul-idelim', qw(-d '' --out=_), '-f2,3', {IN=>"a\0b\0c\n"}, {OUT=>"b_c\n"}], - ['nul-odelim', qw(-d: --out=), '-f2,3', {IN=>"a:b:c\n"}, {OUT=>"b\0c\n"}], - ['multichar-od', qw(-d: --out=_._), '-f2,3', {IN=>"a:b:c\n"}, - {OUT=>"b_._c\n"}], - - # Prior to 1.22i, you couldn't use a delimiter that would sign-extend. - ['8bit-delim', '-d', "\255", '--out=_', '-f2,3', {IN=>"a\255b\255c\n"}, - {OUT=>"b_c\n"}], - - # New functionality: - ['out-delim1', '-c1-3,5-', '--output-d=:', {IN=>"abcdefg\n"}, - {OUT=>"abc:efg\n"}], - # A totally overlapped field shouldn't change anything: - ['out-delim2', '-c1-3,2,5-', '--output-d=:', {IN=>"abcdefg\n"}, - {OUT=>"abc:efg\n"}], - # Partial overlap: index '2' is not at the start of a range. - ['out-delim3', '-c1-3,2-4,6', '--output-d=:', {IN=>"abcdefg\n"}, - {OUT=>"abcd:f\n"}], - ['out-delim3a', '-c1-3,2-4,6-', '--output-d=:', {IN=>"abcdefg\n"}, - {OUT=>"abcd:fg\n"}], - # Ensure that the following two commands produce the same output. - # Before an off-by-1 fix, the output from the former would not contain a ':'. - ['out-delim4', '-c4-,2-3', '--output-d=:', - {IN=>"abcdefg\n"}, {OUT=>"bc:defg\n"}], - ['out-delim5', '-c2-3,4-', '--output-d=:', - {IN=>"abcdefg\n"}, {OUT=>"bc:defg\n"}], - # This test would fail for cut from coreutils-5.0.1 and earlier. - ['out-delim6', '-c2,1-3', '--output-d=:', {IN=>"abc\n"}, {OUT=>"abc\n"}], - # - ['od-abut', '-b1-2,3-4', '--output-d=:', {IN=>"abcd\n"}, {OUT=>"ab:cd\n"}], - ['od-overlap', '-b1-2,2', '--output-d=:', {IN=>"abc\n"}, {OUT=>"ab\n"}], - ['od-overlap2', '-b1-2,2-', '--output-d=:', {IN=>"abc\n"}, {OUT=>"abc\n"}], - ['od-overlap3', '-b1-3,2-', '--output-d=:', {IN=>"abcd\n"}, {OUT=>"abcd\n"}], - ['od-overlap4', '-b1-3,2-3', '--output-d=:', {IN=>"abcd\n"}, {OUT=>"abc\n"}], - ['od-overlap5', '-b1-3,1-4', '--output-d=:', - {IN=>"abcde\n"}, {OUT=>"abcd\n"}], - - # None of the following invalid ranges provoked an error up to coreutils-6.9. - ['inval1', qw(-f 2-0), {IN=>''}, {OUT=>''}, {EXIT=>1}, - {ERR=>"$prog: invalid decreasing range\n$try"}], - ['inval2', qw(-f -), {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}], - ['inval3', '-f', '4,-', {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}], - ['inval4', '-f', '1-2,-', {IN=>''}, {OUT=>''}, {EXIT=>1}, - {ERR=>$no_endpoint}], - ['inval5', '-f', '1-,-', {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}], - ['inval6', '-f', '-1,-', {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}], - # This would evoke a segfault from 5.3.0..6.10 - ['big-unbounded-b', '--output-d=:', '-b1234567890-', {IN=>''}, {OUT=>''}], - ['big-unbounded-c', '--output-d=:', '-c1234567890-', {IN=>''}, {OUT=>''}], - ['big-unbounded-f', '--output-d=:', '-f1234567890-', {IN=>''}, {OUT=>''}], - ); - -if ($mb_locale ne 'C') - { - # Duplicate each test vector, appending "-mb" to the test name and - # inserting {ENV => "LC_ALL=$mb_locale"} in the copy, so that we - # provide coverage for the distro-added multi-byte code paths. - my @new; - foreach my $t (@Tests) - { - my @new_t = @$t; - my $test_name = shift @new_t; - - # Depending on whether cut is multi-byte-patched, - # it emits different diagnostics: - # non-MB: invalid byte or field list - # MB: invalid byte, character or field list - # Adjust the expected error output accordingly. - if (grep {ref $_ eq 'HASH' && exists $_->{ERR} && $_->{ERR} eq $inval} - (@new_t)) - { - my $sub = {ERR_SUBST => 's/, character//'}; - push @new_t, $sub; - push @$t, $sub; - } - push @new, ["$test_name-mb", @new_t, {ENV => "LC_ALL=$mb_locale"}]; - } - push @Tests, @new; - } - - -@Tests = triple_test \@Tests; - -my $save_temps = $ENV{DEBUG}; -my $verbose = $ENV{VERBOSE}; - -my $fail = run_tests ($ME, $prog, \@Tests, $save_temps, $verbose); -exit $fail; diff --git a/tests/misc/cut-huge-to-eol-range.sh b/tests/misc/cut-huge-to-eol-range.sh new file mode 100755 index 00000000..42cecfd7 --- /dev/null +++ b/tests/misc/cut-huge-to-eol-range.sh @@ -0,0 +1,30 @@ +#!/bin/sh +# Ensure that cut does not allocate mem for a range like -b9999999999999- + +# Copyright (C) 2012-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cut +require_ulimit_ +getlimits_ + +# 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 + +compare /dev/null err || fail=1 + +Exit $fail diff --git a/tests/misc/cut.pl b/tests/misc/cut.pl new file mode 100755 index 00000000..41e9e209 --- /dev/null +++ b/tests/misc/cut.pl @@ -0,0 +1,238 @@ +#!/usr/bin/perl +# Test "cut". + +# Copyright (C) 2006-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/>. + +use strict; + +(my $ME = $0) =~ s|.*/||; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +my $mb_locale = $ENV{LOCALE_FR_UTF8}; +! defined $mb_locale || $mb_locale eq 'none' + and $mb_locale = 'C'; + +my $prog = 'cut'; +my $try = "Try '$prog --help' for more information.\n"; +my $from_1 = "$prog: fields and positions are numbered from 1\n$try"; +my $inval = "$prog: invalid byte, character or field list\n$try"; +my $no_endpoint = "$prog: invalid range with no endpoint: -\n$try"; +my $nofield = "$prog: an input delimiter may be specified only when " . + "operating on fields\n$try"; + +my @Tests = + ( + # Provoke a double-free in cut from coreutils-6.7. + ['dbl-free', '-f2-', {IN=>{f=>'x'}}, {IN=>{g=>'y'}}, {OUT=>"x\ny\n"}], + + # This failed (as it should) even before coreutils-6.9.90, + # but cut from 6.9.90 produces a more useful diagnostic. + ['zero-1', '-b0', {ERR=>$from_1}, {EXIT => 1} ], + + # Up to coreutils-6.9, specifying a range of 0-2 was not an error. + # It was treated just like "-2". + ['zero-2', '-f0-2', {ERR=>$from_1}, {EXIT => 1} ], + + # Up to coreutils-8.20, specifying a range of 0- was not an error. + ['zero-3b', '-b0-', {ERR=>$from_1}, {EXIT => 1} ], + ['zero-3c', '-c0-', {ERR=>$from_1}, {EXIT => 1} ], + ['zero-3f', '-f0-', {ERR=>$from_1}, {EXIT => 1} ], + + ['1', '-d:', '-f1,3-', {IN=>"a:b:c\n"}, {OUT=>"a:c\n"}], + ['2', '-d:', '-f1,3-', {IN=>"a:b:c\n"}, {OUT=>"a:c\n"}], + ['3', qw(-d: -f2-), {IN=>"a:b:c\n"}, {OUT=>"b:c\n"}], + ['4', qw(-d: -f4), {IN=>"a:b:c\n"}, {OUT=>"\n"}], + ['5', qw(-d: -f4), {IN=>""}, {OUT=>""}], + ['6', '-c4', {IN=>"123\n"}, {OUT=>"\n"}], + ['7', '-c4', {IN=>"123"}, {OUT=>"\n"}], + ['8', '-c4', {IN=>"123\n1"}, {OUT=>"\n\n"}], + ['9', '-c4', {IN=>""}, {OUT=>""}], + ['a', qw(-s -d:), '-f3-', {IN=>"a:b:c\n"}, {OUT=>"c\n"}], + ['b', qw(-s -d:), '-f2,3', {IN=>"a:b:c\n"}, {OUT=>"b:c\n"}], + ['c', qw(-s -d:), '-f1,3', {IN=>"a:b:c\n"}, {OUT=>"a:c\n"}], + # Trailing colon should not be output + ['d', qw(-s -d:), '-f1,3', {IN=>"a:b:c:\n"}, {OUT=>"a:c\n"}], + ['e', qw(-s -d:), '-f3-', {IN=>"a:b:c:\n"}, {OUT=>"c:\n"}], + ['f', qw(-s -d:), '-f3-4', {IN=>"a:b:c:\n"}, {OUT=>"c:\n"}], + ['g', qw(-s -d:), '-f3,4', {IN=>"a:b:c:\n"}, {OUT=>"c:\n"}], + # Make sure -s suppresses non-delimited lines + ['h', qw(-s -d:), '-f2,3', {IN=>"abc\n"}, {OUT=>""}], + # + ['i', qw(-d: -f1-3), {IN=>":::\n"}, {OUT=>"::\n"}], + ['j', qw(-d: -f1-4), {IN=>":::\n"}, {OUT=>":::\n"}], + ['k', qw(-d: -f2-3), {IN=>":::\n"}, {OUT=>":\n"}], + ['l', qw(-d: -f2-4), {IN=>":::\n"}, {OUT=>"::\n"}], + ['m', qw(-s -d: -f1-3), {IN=>":::\n"}, {OUT=>"::\n"}], + ['n', qw(-s -d: -f1-4), {IN=>":::\n"}, {OUT=>":::\n"}], + ['o', qw(-s -d: -f2-3), {IN=>":::\n"}, {OUT=>":\n"}], + ['p', qw(-s -d: -f2-4), {IN=>":::\n"}, {OUT=>"::\n"}], + ['q', qw(-s -d: -f2-4), {IN=>":::\n:\n"}, {OUT=>"::\n\n"}], + ['r', qw(-s -d: -f2-4), {IN=>":::\n:1\n"}, {OUT=>"::\n1\n"}], + ['s', qw(-s -d: -f1-4), {IN=>":::\n:a\n"}, {OUT=>":::\n:a\n"}], + ['t', qw(-s -d: -f3-), {IN=>":::\n:1\n"}, {OUT=>":\n\n"}], + # Make sure it handles empty input properly, with and without -s. + ['u', qw(-s -f3-), {IN=>""}, {OUT=>""}], + ['v', '-f3-', {IN=>""}, {OUT=>""}], + # Make sure it handles empty input properly. + ['w', qw(-b 1), {IN=>""}, {OUT=>""}], + ['x', qw(-s -d: -f2-4), {IN=>":\n"}, {OUT=>"\n"}], + # Errors + # -s may be used only with -f + ['y', qw(-s -b4), {IN=>":\n"}, {OUT=>""}, {EXIT=>1}, + {ERR=>"$prog: suppressing non-delimited lines makes sense\n" + . "\tonly when operating on fields\n$try"}], + # You must specify bytes or fields (or chars) + ['z', '', {IN=>":\n"}, {OUT=>""}, {EXIT=>1}, + {ERR=>"$prog: you must specify a list of bytes, characters, or fields\n$try"} + ], + # Empty field list + ['empty-fl', qw(-f ''), {IN=>":\n"}, {OUT=>""}, {EXIT=>1}, {ERR=>$from_1}], + # Missing field list + ['missing-fl', qw(-f --), {IN=>":\n"}, {OUT=>""}, {EXIT=>1}, {ERR=>$inval}], + # Empty byte list + ['empty-bl', qw(-b ''), {IN=>":\n"}, {OUT=>""}, {EXIT=>1}, {ERR=>$from_1}], + # Missing byte list + ['missing-bl', qw(-b --), {IN=>":\n"}, {OUT=>""}, {EXIT=>1}, {ERR=>$inval}], + + # This test fails with cut from textutils-1.22. + ['empty-f1', '-f1', {IN=>""}, {OUT=>""}], + + ['empty-f2', '-f2', {IN=>""}, {OUT=>""}], + + ['o-delim', qw(-d: --out=_), '-f2,3', {IN=>"a:b:c\n"}, {OUT=>"b_c\n"}], + ['nul-idelim', qw(-d '' --out=_), '-f2,3', {IN=>"a\0b\0c\n"}, {OUT=>"b_c\n"}], + ['nul-odelim', qw(-d: --out=), '-f2,3', {IN=>"a:b:c\n"}, {OUT=>"b\0c\n"}], + ['multichar-od', qw(-d: --out=_._), '-f2,3', {IN=>"a:b:c\n"}, + {OUT=>"b_._c\n"}], + + # Ensure delim is not allowed without a field + # Prior to 8.21, a NUL delim was allowed without a field + ['delim-no-field1', qw(-d ''), '-b1', {EXIT=>1}, {ERR=>$nofield}], + ['delim-no-field2', qw(-d:), '-b1', {EXIT=>1}, {ERR=>$nofield}], + + # Prior to 1.22i, you couldn't use a delimiter that would sign-extend. + ['8bit-delim', '-d', "\255", '--out=_', '-f2,3', {IN=>"a\255b\255c\n"}, + {OUT=>"b_c\n"}], + + # newline processing for fields + ['newline-1', '-f1-', {IN=>"a\nb"}, {OUT=>"a\nb\n"}], + ['newline-2', '-f1-', {IN=>""}, {OUT=>""}], + ['newline-3', '-d:', '-f1', {IN=>"a:1\nb:2\n"}, {OUT=>"a\nb\n"}], + ['newline-4', '-d:', '-f1', {IN=>"a:1\nb:2"}, {OUT=>"a\nb\n"}], + ['newline-5', '-d:', '-f2', {IN=>"a:1\nb:2\n"}, {OUT=>"1\n2\n"}], + ['newline-6', '-d:', '-f2', {IN=>"a:1\nb:2"}, {OUT=>"1\n2\n"}], + ['newline-7', '-s', '-d:', '-f1', {IN=>"a:1\nb:2"}, {OUT=>"a\nb\n"}], + ['newline-8', '-s', '-d:', '-f1', {IN=>"a:1\nb:2\n"}, {OUT=>"a\nb\n"}], + ['newline-9', '-s', '-d:', '-f1', {IN=>"a1\nb2"}, {OUT=>""}], + ['newline-10', '-s', '-d:', '-f1,2', {IN=>"a:1\nb:2"}, {OUT=>"a:1\nb:2\n"}], + ['newline-11', '-s', '-d:', '-f1,2', {IN=>"a:1\nb:2\n"}, {OUT=>"a:1\nb:2\n"}], + ['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-15', '-s', "-d'\n'", '-f1', {IN=>"a:1\nb:"}, {OUT=>"a:1\n"}], + ['newline-16', '-s', "-d'\n'", '-f2', {IN=>"\nb"}, {OUT=>""}], + ['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-20', '-s', "-d'\n'", '-f1-', {IN=>"\n"}, {OUT=>"\n"}], + ['newline-21', '-s', "-d'\n'", '-f1-', {IN=>"\nb"}, {OUT=>"\n"}], + ['newline-22', "-d'\n'", '-f1-', {IN=>"\nb"}, {OUT=>"\nb\n"}], + + # New functionality: + ['out-delim1', '-c1-3,5-', '--output-d=:', {IN=>"abcdefg\n"}, + {OUT=>"abc:efg\n"}], + # A totally overlapped field shouldn't change anything: + ['out-delim2', '-c1-3,2,5-', '--output-d=:', {IN=>"abcdefg\n"}, + {OUT=>"abc:efg\n"}], + # Partial overlap: index '2' is not at the start of a range. + ['out-delim3', '-c1-3,2-4,6', '--output-d=:', {IN=>"abcdefg\n"}, + {OUT=>"abcd:f\n"}], + ['out-delim3a', '-c1-3,2-4,6-', '--output-d=:', {IN=>"abcdefg\n"}, + {OUT=>"abcd:fg\n"}], + # Ensure that the following two commands produce the same output. + # Before an off-by-1 fix, the output from the former would not contain a ':'. + ['out-delim4', '-c4-,2-3', '--output-d=:', + {IN=>"abcdefg\n"}, {OUT=>"bc:defg\n"}], + ['out-delim5', '-c2-3,4-', '--output-d=:', + {IN=>"abcdefg\n"}, {OUT=>"bc:defg\n"}], + # This test would fail for cut from coreutils-5.0.1 and earlier. + ['out-delim6', '-c2,1-3', '--output-d=:', {IN=>"abc\n"}, {OUT=>"abc\n"}], + # + ['od-abut', '-b1-2,3-4', '--output-d=:', {IN=>"abcd\n"}, {OUT=>"ab:cd\n"}], + ['od-overlap', '-b1-2,2', '--output-d=:', {IN=>"abc\n"}, {OUT=>"ab\n"}], + ['od-overlap2', '-b1-2,2-', '--output-d=:', {IN=>"abc\n"}, {OUT=>"abc\n"}], + ['od-overlap3', '-b1-3,2-', '--output-d=:', {IN=>"abcd\n"}, {OUT=>"abcd\n"}], + ['od-overlap4', '-b1-3,2-3', '--output-d=:', {IN=>"abcd\n"}, {OUT=>"abc\n"}], + ['od-overlap5', '-b1-3,1-4', '--output-d=:', + {IN=>"abcde\n"}, {OUT=>"abcd\n"}], + + # None of the following invalid ranges provoked an error up to coreutils-6.9. + ['inval1', qw(-f 2-0), {IN=>''}, {OUT=>''}, {EXIT=>1}, + {ERR=>"$prog: invalid decreasing range\n$try"}], + ['inval2', qw(-f -), {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}], + ['inval3', '-f', '4,-', {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}], + ['inval4', '-f', '1-2,-', {IN=>''}, {OUT=>''}, {EXIT=>1}, + {ERR=>$no_endpoint}], + ['inval5', '-f', '1-,-', {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}], + ['inval6', '-f', '-1,-', {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}], + # This would evoke a segfault from 5.3.0..8.10 + ['big-unbounded-b', '--output-d=:', '-b1234567890-', {IN=>''}, {OUT=>''}], + ['big-unbounded-b2a', '--output-d=:', '-b1,9-', {IN=>'123456789'}, + {OUT=>"1:9\n"}], + ['big-unbounded-b2b', '--output-d=:', '-b1,1234567890-', {IN=>''}, {OUT=>''}], + ['big-unbounded-c', '--output-d=:', '-c1234567890-', {IN=>''}, {OUT=>''}], + ['big-unbounded-f', '--output-d=:', '-f1234567890-', {IN=>''}, {OUT=>''}], + + ['overlapping-unbounded-1', '-b3-,2-', {IN=>"1234\n"}, {OUT=>"234\n"}], + ['overlapping-unbounded-2', '-b2-,3-', {IN=>"1234\n"}, {OUT=>"234\n"}], + + # When printing output delimiters, and with one or more ranges subsumed + # by a to-EOL range, cut 8.20 and earlier would print extraneous delimiters. + ['EOL-subsumed-1', '--output-d=: -b2-,3,4-4,5', + {IN=>"123456\n"}, {OUT=>"23456\n"}], + ['EOL-subsumed-2', '--output-d=: -b3,4-4,5,2-', + {IN=>"123456\n"}, {OUT=>"23456\n"}], + ['EOL-subsumed-3', '--complement -b3,4-4,5,2-', + {IN=>"123456\n"}, {OUT=>"1\n"}], + ); + +if ($mb_locale ne 'C') + { + # Duplicate each test vector, appending "-mb" to the test name and + # inserting {ENV => "LC_ALL=$mb_locale"} in the copy, so that we + # provide coverage for the distro-added multi-byte code paths. + my @new; + foreach my $t (@Tests) + { + my @new_t = @$t; + my $test_name = shift @new_t; + + push @new, ["$test_name-mb", @new_t, {ENV => "LC_ALL=$mb_locale"}]; + } + push @Tests, @new; + } + + +@Tests = triple_test \@Tests; + +my $save_temps = $ENV{DEBUG}; +my $verbose = $ENV{VERBOSE}; + +my $fail = run_tests ($ME, $prog, \@Tests, $save_temps, $verbose); +exit $fail; diff --git a/tests/misc/date b/tests/misc/date deleted file mode 100755 index 8a23ca9c..00000000 --- a/tests/misc/date +++ /dev/null @@ -1,318 +0,0 @@ -#!/usr/bin/perl -# Test "date". - -# Copyright (C) 2005-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 -# 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; - -(my $ME = $0) =~ s|.*/||; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -# Export TZ=UTC0 so that zone-dependent strings match. -$ENV{TZ} = 'UTC0'; - -my $t0 = '08:17:48'; -my $d0 = '1997-01-19'; -my $d1 = "$d0 $t0 +0"; -my $dT = "${d0}T$t0+0"; # ISO 8601 with "T" separator - -my $ts = '08:17:49'; # next second -my $tm = '08:18:48'; # next minute -my $th = '09:17:48'; # next hour - -my $dd = '1997-01-20'; # next day -my $dw = '1997-01-26'; # next week -my $dm = '1997-02-19'; # next month -my $dy = '1998-01-19'; # next month - -my $fmt = "'+%Y-%m-%d %T'"; - -# Determine a number of seconds that will provoke an invalid -# time diagnostic from date. If possible, use a number that -# is less than 2^64, yet so large that it would cause the resulting -# tm_year value to be too large for a 32-bit int. But some systems -# (Solaris 8) have a buggy localtime that mistakenly accepts such -# invalid times and give garbage in tm_year. Other systems might -# have an int type that is wider than 32. So if this localtime -# call succeeds, use 2^64 as the number of seconds. -my $n_seconds = 72057594037927935; -my @d = localtime ($n_seconds); -my $year = $d[5]; -defined $year - and $n_seconds = '18446744073709551616'; - -my @Tests = - ( - # test-name, [option, option, ...] {OUT=>"expected-output"} - # - ['1', "-d '$d1' +'%% %a %A %b %B'", {OUT=>"% Sun Sunday Jan January"}], - - # [Actually, skip it on *all* systems. -- this Perl code is run at - # distribution-build-time, not at configure/test time. ] - - # Skip the test of %c on SunOS4 systems. Such systems would fail this - # test because their underlying strftime doesn't handle the %c format - # properly. GNU strftime must rely on the underlying host library - # function to get locale-dependent behavior, as strftime is the only - # portable interface to that behavior. - # ['2', "-d '$d1' +'%c'", {OUT=>"Sun Jan 19 $t0 1997"}], - - ['3', "-d '$d1' +'%d_%D_%e_%h_%H'", {OUT=>"19_01/19/97_19_Jan_08"}], - ['3T',"-d '$dT' +'%d_%D_%e_%h_%H'", {OUT=>"19_01/19/97_19_Jan_08"}], - - ['4', "-d '$d1' +'%I_%j_%k_%l_%m'", {OUT=>"08_019_ 8_ 8_01"}], - ['5', "-d '$d1' +'%M_%n_%p_%r'", {OUT=>"17_\n_AM_$t0 AM"}], - ['6', "-d '$d1' +'%s_%S_%t_%T'", {OUT=>"853661868_48_\t_$t0"}], - ['7', "-d '$d1' +'%U_%V_%w_%W'", {OUT=>"03_03_0_02"}], - ['8', "-d '$d1' +'%x_%X_%y_%Y'", {OUT=>"01/19/97_${t0}_97_1997"}], - ['9', "-d '$d1' +'%z'", {OUT=>"+0000"}], - - ['leap-1', "--date '02/29/1996 1 year' +%Y-%m-%d", {OUT=>"1997-03-01"}], - - ['U95-1', "--date '1995-1-1' +%U", {OUT=>"01"}], - ['U95-2', "--date '1995-1-7' +%U", {OUT=>"01"}], - ['U95-3', "--date '1995-1-8' +%U", {OUT=>"02"}], - - ['U92-1', "--date '1992-1-1' +%U", {OUT=>"00"}], - ['U92-2', "--date '1992-1-4' +%U", {OUT=>"00"}], - ['U92-3', "--date '1992-1-5' +%U", {OUT=>"01"}], - - ['V92-1', "--date '1992-1-1' +%V", {OUT=>"01"}], - ['V92-2', "--date '1992-1-5' +%V", {OUT=>"01"}], - ['V92-3', "--date '1992-1-6' +%V", {OUT=>"02"}], - - ['W92-1', "--date '1992-1-1' +%W", {OUT=>"00"}], - ['W92-2', "--date '1992-1-5' +%W", {OUT=>"00"}], - ['W92-3', "--date '1992-1-6' +%W", {OUT=>"01"}], - - ['millen-1', "--date '1998-1-1 3 years' +%Y", {OUT=>"2001"}], - - ['rel-0', "-d '$d1 now' '+%Y-%m-%d %T'", {OUT=>"$d0 $t0"}], - - ['rel-1a', "-d '$d1 yesterday' $fmt", {OUT=>"1997-01-18 $t0"}], - ['rel-1b', "-d '$d1 tomorrow' $fmt", {OUT=>"1997-01-20 $t0"}], - - ['rel-2a', "-d '$d1 6 years ago' $fmt", {OUT=>"1991-01-19 $t0"}], - ['rel-2b', "-d '$d1 7 months ago' $fmt", {OUT=>"1996-06-19 $t0"}], - ['rel-2c', "-d '$d1 8 weeks ago' $fmt", {OUT=>"1996-11-24 $t0"}], - ['rel-2d', "-d '$d1 1 day ago' $fmt", {OUT=>"1997-01-18 $t0"}], - ['rel-2e', "-d '$d1 2 hours ago' $fmt", {OUT=>"$d0 06:17:48"}], - ['rel-2f', "-d '$d1 3 minutes ago' $fmt", {OUT=>"$d0 08:14:48"}], - ['rel-2g', "-d '$d1 4 seconds ago' $fmt", {OUT=>"$d0 08:17:44"}], - - ['rel-3a', "-d '$d1 4 seconds ago' $fmt", {OUT=>"$d0 08:17:44"}], - - # This has always worked, ... - ['rel-1day', "-d '20050101 1 day' +%F", {OUT=>"2005-01-02"}], - # ...but up to coreutils-6.9, this was rejected due to the "+". - ['rel-plus1', "-d '20050101 +1 day' +%F", {OUT=>"2005-01-02"}], - - ['next-s', "-d '$d1 next second' '+%Y-%m-%d %T'", {OUT=>"$d0 $ts"}], - ['next-m', "-d '$d1 next minute' '+%Y-%m-%d %T'", {OUT=>"$d0 $tm"}], - ['next-h', "-d '$d1 next hour' '+%Y-%m-%d %T'", {OUT=>"$d0 $th"}], - ['next-d', "-d '$d1 next day' '+%Y-%m-%d %T'", {OUT=>"$dd $t0"}], - ['next-w', "-d '$d1 next week' '+%Y-%m-%d %T'", {OUT=>"$dw $t0"}], - ['next-mo', "-d '$d1 next month' '+%Y-%m-%d %T'", {OUT=>"$dm $t0"}], - ['next-y', "-d '$d1 next year' '+%Y-%m-%d %T'", {OUT=>"$dy $t0"}], - - ['utc-0', "-u -d '08/01/97 6:00' '+%D,%H:%M'", {OUT=>"08/01/97,06:00"}, - {ENV => 'TZ=UTC+4'}], - - ['utc-0a', "-u -d '08/01/97 6:00 UTC +4 hours' '+%D,%H:%M'", - {OUT=>"08/01/97,10:00"}], - # Make sure --file=FILE works with -u. - ['utc-1', "-u --file=f '+%Y-%m-%d %T'", - {AUX=>{f=>"$d0 $t0\n$d0 $t0"}}, - {OUT=>"$d0 $t0\n$d0 $t0"}, - {ENV => 'TZ=UTC+1'}], - - ['utc-1a', "-u --file=f '+%Y-%m-%d %T'", - {AUX=>{f=>"$d0 $t0 UTC +1 hour\n$d0 $t0 UTC +1 hour"}}, - {OUT=>"$d0 $th\n$d0 $th"}], - - # From the examples in the documentation. - ['date2sec-0', "-d '1970-01-01 00:00:01' +%s", {OUT=>"7201"}, - {ENV => 'TZ=UTC+2'}], - - # Same as above, but don't rely on TZ in environment. - ['date2sec-0a', "-d '1970-01-01 00:00:01 UTC +2 hours' +%s", - {OUT=>"7201"}], - - ['date2sec-1', "-d 2000-01-01 +%s", {OUT=>"946684800"}], - ['sec2date-0', "-d '1970-01-01 UTC 946684800 sec' +'%Y-%m-%d %T %z'", - {OUT=>"2000-01-01 00:00:00 +0000"}], - - ['this-m', "-d '$d0 $t0 this minute' $fmt", {OUT=>"$d0 $t0"}], - ['this-h', "-d '$d0 $t0 this hour' $fmt", {OUT=>"$d0 $t0"}], - ['this-w', "-d '$d0 $t0 this week' $fmt", {OUT=>"$d0 $t0"}], - ['this-mo', "-d '$d0 $t0 this month' $fmt", {OUT=>"$d0 $t0"}], - ['this-y', "-d '$d0 $t0 this year' $fmt", {OUT=>"$d0 $t0"}], - - ['risks-1', "-d 'Nov 10 1996' $fmt", {OUT=>"1996-11-10 00:00:00"}], - - # This one would pass if TZ (with any, or even no, value) were in - # the environment. - ['regress-1', "-u -d '1996-11-10 0:00:00 +0' $fmt", - {OUT=>"1996-11-10 00:00:00"}, - {ENV =>'LANG=C'}], - - - ['datevtime-1', "-d 000909 $fmt", {OUT=>"2000-09-09 00:00:00"}], - - # test for RFC-822 conformance - ['rfc822-1', "-R -d '$d1'", {OUT=>"Sun, 19 Jan 1997 08:17:48 +0000"}, - # Solaris 5.9's /bin/sh emits this diagnostic to stderr - # if you don't have support for the named locale. - {ERR_SUBST => q!s/^couldn't set locale correctly\n//!}, - {ENV => 'LC_ALL=de_DE TZ=UTC0'}], - - # Relative seconds, with time. fixed in 2.0j - ['relative-1', "--utc -d '1970-01-01 00:00:00 UTC +961062237 sec' $fmt", - {OUT=>"2000-06-15 09:43:57"}], - - # Relative seconds, no time. - ['relative-2', "--utc -d '1970-01-01 UTC +961062237 sec' $fmt", - {OUT=>"2000-06-15 09:43:57"}, - {ENV => 'TZ=UTC+1'}], - - # Relative days, no time, across time zones. - ['relative-3', "-I -d '2006-04-23 21 days ago'", {OUT=>"2006-04-02"}, - {ENV=>'TZ=PST8PDT,M4.1.0,M10.5.0'}], - - # This would infloop (or appear to) prior to coreutils-4.5.5, - # due to a bug in strftime.c. - ['wide-fmt', "-d '1999-06-01'", '+%3004Y', {OUT=>'0' x 3000 . "1999"}], - - # Ensure that we can parse MONTHNAME-DAY-YEAR. - ['moname-d-y', '--iso -d May-23-2003', {OUT=>"2003-05-23"}], - ['moname-d-y-r', '--rfc-3339=date -d May-23-2003', {OUT=>"2003-05-23"}], - - ['epoch', '--iso=sec -d @31536000', - {OUT=>"1971-01-01T00:00:00+0000"}], - ['epoch-r', '--rfc-3339=sec -d @31536000', - {OUT=>"1971-01-01 00:00:00+00:00"}], - - ['ns-10', '--iso=ns', '-d "1969-12-31 13:00:00.00000001-1100"', - {OUT=>"1970-01-01T00:00:00,000000010+0000"}], - ['ns-10-r', '--rfc-3339=ns', '-d "1969-12-31 13:00:00.00000001-1100"', - {OUT=>"1970-01-01 00:00:00.000000010+00:00"}], - - ['ns-max32', '--iso=ns', '-d "2038-01-19 03:14:07.999999999"', - {OUT=>"2038-01-19T03:14:07,999999999+0000"}], - ['ns-max32-r', '--rfc-3339=ns', '-d "2038-01-19 03:14:07.999999999"', - {OUT=>"2038-01-19 03:14:07.999999999+00:00"}], - - ['tz-1', '+%:::z', {OUT=>"-12:34:56"}, {ENV=>'TZ=XXX12:34:56'}], - - ['tz-2', '+%:::z', {OUT=>"+12:34:56"}, {ENV=>'TZ=XXX-12:34:56'}], - - ['tz-3', '+%::z', {OUT=>"+01:02:03"}, {ENV=>'TZ=XXX-1:02:03'}], - - ['tz-4', '+%:::z', {OUT=>"+12"}, {ENV=>'TZ=XXX-12'}], - - ['tz-5', '+%:z', {OUT=>"-00:01"}, {ENV=>'TZ=XXX0:01'}], - - # Accept %:z with a field width before the ':'. - ['tz-5w','+%8:z', {OUT=>"-0000:01"}, {ENV=>'TZ=XXX0:01'}], - # Don't recognize %:z with a field width between the ':' and the 'z'. - ['tz-5wf', '+%:8z', {OUT=>"%:8z"}, {ENV=>'TZ=XXX0:01'}], - - ['ns-relative', - '--iso=ns', - "-d'1970-01-01 00:00:00.1234567 UTC +961062237.987654321 sec'", - {OUT=>"2000-06-15T09:43:58,111111021+0000"}], - ['ns-relativer', '--rfc-3339=ns', - "-d'1970-01-01 00:00:00.1234567 UTC +961062237.987654321 sec'", - {OUT=>"2000-06-15 09:43:58.111111021+00:00"}], - - # Since coreutils/lib/getdate.y revision 1.96 (post-coreutils-5.3.0), - # a command like the following would mistakenly exit nonzero with an - # 'invalid date ...' diagnostic, but when run in a time zone for - # which daylight savings time is in effect for the starting date. - # Unfortunately (for ease of testing), if you set TZ at all, this - # failure is not triggered, hence the removal of TZ from the environment. - ['cross-dst', "-d'2005-03-27 +1 day'", '+%Y', {OUT=>"2005"}, - {ENV_DEL => 'TZ'}, - ], - - ['empty-fmt', '+', {OUT=>""}], - - ['neg-secs', '-d @-22 +%05s', {OUT=>"-0022"}], - ['neg-secs2', '-d @-22 +%_5s', {OUT=>" -22"}], - - # Before today's fix, date would print uninitialized data - # to standard output for an out-of-range date: - # $ date -d @$(echo 2^56-1|bc) 2> /dev/null | od -a -N3 - # 0000000 p 4 6 - # 0000003 - ['uninit-64', "-d \@$n_seconds", - {OUT=>''}, - # Use ERR_SUBST to get around fact that the diagnostic - # you get on a system with 32-bit time_t is not the same as - # the one you get for a system where it's 64 bits wide: - # - date: time 72057594037927935 is out of range - # + date: invalid date '@72057594037927935' - {ERR_SUBST => 's/.*//'}, - {ERR => "\n"}, - {EXIT => 1}, - ], - - ['fill-1', '-d 1999-12-08 +%_3d', {OUT=>' 8'}], - ['fill-2', '-d 1999-12-08 +%03d', {OUT=>'008'}], - - # Test the combination of the to-upper-case modifier (^) and a conversion - # specifier that expands to a string containing lower case characters. - ['subfmt-up1', '-d "1999-12-08 7:30" "+%^c"', - # Solaris 5.9 prints 'WED DEC 08 07:30:00 1999', while - # most others print 'WED DEC 8 07:30:00 1999'. - {OUT_SUBST => 's/ [ 0]8.*//'}, - {OUT=>'WED DEC'}], - ); - -# Repeat the cross-dst test, using Jan 1, 2005 and every interval from 1..364. -foreach my $i (1..364) - { - push @Tests, ["cross-dst$i", - "-d'2005-01-01 +$i day'", '+%Y', {OUT=>"2005"}, - {ENV_DEL => 'TZ'}, - ]; - } - -# Append "\n" to each OUT=> RHS if the expected exit value is either -# zero or not specified (defaults to zero). -foreach my $t (@Tests) - { - my $exit_val; - foreach my $e (@$t) - { - ref $e && ref $e eq 'HASH' && defined $e->{EXIT} - and $exit_val = $e->{EXIT}; - } - foreach my $e (@$t) - { - ref $e && ref $e eq 'HASH' && defined $e->{OUT} && ! $exit_val - and $e->{OUT} .= "\n"; - } - } - -my $save_temps = $ENV{DEBUG}; -my $verbose = $ENV{VERBOSE}; - -my $prog = 'date'; -my $fail = run_tests ($ME, $prog, \@Tests, $save_temps, $verbose); -exit $fail; diff --git a/tests/misc/date-next-dow b/tests/misc/date-next-dow deleted file mode 100755 index 7c85d238..00000000 --- a/tests/misc/date-next-dow +++ /dev/null @@ -1,78 +0,0 @@ -#!/usr/bin/perl -# Test "date". - -# Copyright (C) 2005-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 -# 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 POSIX qw(strftime); - -(my $ME = $0) =~ s|.*/||; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -# Export TZ=UTC0 so that zone-dependent strings match. -$ENV{TZ} = 'UTC0'; - -my $now = time; -my @d = localtime ($now); -my @d_week = localtime ($now + 7 * 24 * 3600); -my $wday = $d[6]; -my $wday_str = qw(sun mon tue wed thu fri sat)[$wday]; - -my @Tests = - ( - # test-name, [option, option, ...] {OUT=>"expected-output"} - # - - # Running "date -d mon +%a" on a Monday must print Mon. - ['dow', "-d $wday_str +%a", {OUT => ucfirst $wday_str}], - # It had better be the same date, too. - ['dow2', "-d $wday_str +%Y-%m-%d", {OUT => strftime("%Y-%m-%d", @d)}], - - ['next-dow', "-d 'next $wday_str' +%Y-%m-%d", - {OUT => strftime("%Y-%m-%d", @d_week)}], - ); - -# Append "\n" to each OUT=> RHS if the expected exit value is either -# zero or not specified (defaults to zero). -foreach my $t (@Tests) - { - my $exit_val; - foreach my $e (@$t) - { - ref $e && ref $e eq 'HASH' && defined $e->{EXIT} - and $exit_val = $e->{EXIT}; - } - foreach my $e (@$t) - { - ref $e && ref $e eq 'HASH' && defined $e->{OUT} && ! $exit_val - and $e->{OUT} .= "\n"; - } - } - -my $save_temps = $ENV{DEBUG}; -my $verbose = $ENV{VERBOSE}; - -my $prog = 'date'; -my $fail = run_tests ($ME, $prog, \@Tests, $save_temps, $verbose); - -# Skip the test if the starting and stopping day numbers differ. -my @d_post = localtime (time); -$d_post[7] == $d[7] - or CuSkip::skip "$ME: test straddled a day boundary; skipped"; - -exit $fail; diff --git a/tests/misc/date-next-dow.pl b/tests/misc/date-next-dow.pl new file mode 100755 index 00000000..3c79e22a --- /dev/null +++ b/tests/misc/date-next-dow.pl @@ -0,0 +1,78 @@ +#!/usr/bin/perl +# Test "date". + +# Copyright (C) 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 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 POSIX qw(strftime); + +(my $ME = $0) =~ s|.*/||; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +# Export TZ=UTC0 so that zone-dependent strings match. +$ENV{TZ} = 'UTC0'; + +my $now = time; +my @d = localtime ($now); +my @d_week = localtime ($now + 7 * 24 * 3600); +my $wday = $d[6]; +my $wday_str = qw(sun mon tue wed thu fri sat)[$wday]; + +my @Tests = + ( + # test-name, [option, option, ...] {OUT=>"expected-output"} + # + + # Running "date -d mon +%a" on a Monday must print Mon. + ['dow', "-d $wday_str +%a", {OUT => ucfirst $wday_str}], + # It had better be the same date, too. + ['dow2', "-d $wday_str +%Y-%m-%d", {OUT => strftime("%Y-%m-%d", @d)}], + + ['next-dow', "-d 'next $wday_str' +%Y-%m-%d", + {OUT => strftime("%Y-%m-%d", @d_week)}], + ); + +# Append "\n" to each OUT=> RHS if the expected exit value is either +# zero or not specified (defaults to zero). +foreach my $t (@Tests) + { + my $exit_val; + foreach my $e (@$t) + { + ref $e && ref $e eq 'HASH' && defined $e->{EXIT} + and $exit_val = $e->{EXIT}; + } + foreach my $e (@$t) + { + ref $e && ref $e eq 'HASH' && defined $e->{OUT} && ! $exit_val + and $e->{OUT} .= "\n"; + } + } + +my $save_temps = $ENV{DEBUG}; +my $verbose = $ENV{VERBOSE}; + +my $prog = 'date'; +my $fail = run_tests ($ME, $prog, \@Tests, $save_temps, $verbose); + +# Skip the test if the starting and stopping day numbers differ. +my @d_post = localtime (time); +$d_post[7] == $d[7] + or CuSkip::skip "$ME: test straddled a day boundary; skipped"; + +exit $fail; diff --git a/tests/misc/date-sec b/tests/misc/date-sec deleted file mode 100755 index a46b4790..00000000 --- a/tests/misc/date-sec +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -# Ensure that a command like -# 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-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ date - - - -# It would be easier simply to sleep for two seconds between two runs -# of $(date --date="21:04 +0100" +%S) and ensure that both outputs -# are '00', but I prefer not to sleep unconditionally. 'make check' -# takes long enough as it is. - -n=0 -# See if the current number of seconds is '00' or just before. -s=$(date +%S) -case "$s" in - 58) n=3;; - 59) n=2;; - 00) n=1;; -esac - -# If necessary, wait for the system clock to pass the minute mark. -test $n = 0 || sleep $n - -s=$(date --date="21:04 +0100" +%S) -case "$s" in - 00) ;; - *) fail=1;; -esac - -Exit $fail diff --git a/tests/misc/date-sec.sh b/tests/misc/date-sec.sh new file mode 100755 index 00000000..67048c13 --- /dev/null +++ b/tests/misc/date-sec.sh @@ -0,0 +1,49 @@ +#!/bin/sh +# Ensure that a command like +# 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. + +# This 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_ date + + + +# It would be easier simply to sleep for two seconds between two runs +# of $(date --date="21:04 +0100" +%S) and ensure that both outputs +# are '00', but I prefer not to sleep unconditionally. 'make check' +# takes long enough as it is. + +n=0 +# See if the current number of seconds is '00' or just before. +s=$(date +%S) +case "$s" in + 58) n=3;; + 59) n=2;; + 00) n=1;; +esac + +# If necessary, wait for the system clock to pass the minute mark. +test $n = 0 || sleep $n + +s=$(date --date="21:04 +0100" +%S) +case "$s" in + 00) ;; + *) fail=1;; +esac + +Exit $fail diff --git a/tests/misc/date.pl b/tests/misc/date.pl new file mode 100755 index 00000000..d0b3517c --- /dev/null +++ b/tests/misc/date.pl @@ -0,0 +1,323 @@ +#!/usr/bin/perl +# Test "date". + +# Copyright (C) 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 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; + +(my $ME = $0) =~ s|.*/||; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +# Export TZ=UTC0 so that zone-dependent strings match. +$ENV{TZ} = 'UTC0'; + +my $t0 = '08:17:48'; +my $d0 = '1997-01-19'; +my $d1 = "$d0 $t0 +0"; +my $dT = "${d0}T$t0+0"; # ISO 8601 with "T" separator + +my $ts = '08:17:49'; # next second +my $tm = '08:18:48'; # next minute +my $th = '09:17:48'; # next hour + +my $dd = '1997-01-20'; # next day +my $dw = '1997-01-26'; # next week +my $dm = '1997-02-19'; # next month +my $dy = '1998-01-19'; # next month + +my $fmt = "'+%Y-%m-%d %T'"; + +# Determine a number of seconds that will provoke an invalid +# time diagnostic from date. If possible, use a number that +# is less than 2^64, yet so large that it would cause the resulting +# tm_year value to be too large for a 32-bit int. But some systems +# (Solaris 8) have a buggy localtime that mistakenly accepts such +# invalid times and give garbage in tm_year. Other systems might +# have an int type that is wider than 32. So if this localtime +# call succeeds, use 2^64 as the number of seconds. +my $n_seconds = 72057594037927935; +my @d = localtime ($n_seconds); +my $year = $d[5]; +defined $year + and $n_seconds = '18446744073709551616'; + +my @Tests = + ( + # test-name, [option, option, ...] {OUT=>"expected-output"} + # + ['1', "-d '$d1' +'%% %a %A %b %B'", {OUT=>"% Sun Sunday Jan January"}], + + # [Actually, skip it on *all* systems. -- this Perl code is run at + # distribution-build-time, not at configure/test time. ] + + # Skip the test of %c on SunOS4 systems. Such systems would fail this + # test because their underlying strftime doesn't handle the %c format + # properly. GNU strftime must rely on the underlying host library + # function to get locale-dependent behavior, as strftime is the only + # portable interface to that behavior. + # ['2', "-d '$d1' +'%c'", {OUT=>"Sun Jan 19 $t0 1997"}], + + ['3', "-d '$d1' +'%d_%D_%e_%h_%H'", {OUT=>"19_01/19/97_19_Jan_08"}], + ['3T',"-d '$dT' +'%d_%D_%e_%h_%H'", {OUT=>"19_01/19/97_19_Jan_08"}], + + ['4', "-d '$d1' +'%I_%j_%k_%l_%m'", {OUT=>"08_019_ 8_ 8_01"}], + ['5', "-d '$d1' +'%M_%n_%p_%r'", {OUT=>"17_\n_AM_$t0 AM"}], + ['6', "-d '$d1' +'%s_%S_%t_%T'", {OUT=>"853661868_48_\t_$t0"}], + ['7', "-d '$d1' +'%U_%V_%w_%W'", {OUT=>"03_03_0_02"}], + ['8', "-d '$d1' +'%x_%X_%y_%Y'", {OUT=>"01/19/97_${t0}_97_1997"}], + ['9', "-d '$d1' +'%z'", {OUT=>"+0000"}], + + ['leap-1', "--date '02/29/1996 1 year' +%Y-%m-%d", {OUT=>"1997-03-01"}], + + ['U95-1', "--date '1995-1-1' +%U", {OUT=>"01"}], + ['U95-2', "--date '1995-1-7' +%U", {OUT=>"01"}], + ['U95-3', "--date '1995-1-8' +%U", {OUT=>"02"}], + + ['U92-1', "--date '1992-1-1' +%U", {OUT=>"00"}], + ['U92-2', "--date '1992-1-4' +%U", {OUT=>"00"}], + ['U92-3', "--date '1992-1-5' +%U", {OUT=>"01"}], + + ['V92-1', "--date '1992-1-1' +%V", {OUT=>"01"}], + ['V92-2', "--date '1992-1-5' +%V", {OUT=>"01"}], + ['V92-3', "--date '1992-1-6' +%V", {OUT=>"02"}], + + ['W92-1', "--date '1992-1-1' +%W", {OUT=>"00"}], + ['W92-2', "--date '1992-1-5' +%W", {OUT=>"00"}], + ['W92-3', "--date '1992-1-6' +%W", {OUT=>"01"}], + + ['millen-1', "--date '1998-1-1 3 years' +%Y", {OUT=>"2001"}], + + ['rel-0', "-d '$d1 now' '+%Y-%m-%d %T'", {OUT=>"$d0 $t0"}], + + ['rel-1a', "-d '$d1 yesterday' $fmt", {OUT=>"1997-01-18 $t0"}], + ['rel-1b', "-d '$d1 tomorrow' $fmt", {OUT=>"1997-01-20 $t0"}], + + ['rel-2a', "-d '$d1 6 years ago' $fmt", {OUT=>"1991-01-19 $t0"}], + ['rel-2b', "-d '$d1 7 months ago' $fmt", {OUT=>"1996-06-19 $t0"}], + ['rel-2c', "-d '$d1 8 weeks ago' $fmt", {OUT=>"1996-11-24 $t0"}], + ['rel-2d', "-d '$d1 1 day ago' $fmt", {OUT=>"1997-01-18 $t0"}], + ['rel-2e', "-d '$d1 2 hours ago' $fmt", {OUT=>"$d0 06:17:48"}], + ['rel-2f', "-d '$d1 3 minutes ago' $fmt", {OUT=>"$d0 08:14:48"}], + ['rel-2g', "-d '$d1 4 seconds ago' $fmt", {OUT=>"$d0 08:17:44"}], + + ['rel-3a', "-d '$d1 4 seconds ago' $fmt", {OUT=>"$d0 08:17:44"}], + + # This has always worked, ... + ['rel-1day', "-d '20050101 1 day' +%F", {OUT=>"2005-01-02"}], + # ...but up to coreutils-6.9, this was rejected due to the "+". + ['rel-plus1', "-d '20050101 +1 day' +%F", {OUT=>"2005-01-02"}], + + ['next-s', "-d '$d1 next second' '+%Y-%m-%d %T'", {OUT=>"$d0 $ts"}], + ['next-m', "-d '$d1 next minute' '+%Y-%m-%d %T'", {OUT=>"$d0 $tm"}], + ['next-h', "-d '$d1 next hour' '+%Y-%m-%d %T'", {OUT=>"$d0 $th"}], + ['next-d', "-d '$d1 next day' '+%Y-%m-%d %T'", {OUT=>"$dd $t0"}], + ['next-w', "-d '$d1 next week' '+%Y-%m-%d %T'", {OUT=>"$dw $t0"}], + ['next-mo', "-d '$d1 next month' '+%Y-%m-%d %T'", {OUT=>"$dm $t0"}], + ['next-y', "-d '$d1 next year' '+%Y-%m-%d %T'", {OUT=>"$dy $t0"}], + + ['utc-0', "-u -d '08/01/97 6:00' '+%D,%H:%M'", {OUT=>"08/01/97,06:00"}, + {ENV => 'TZ=UTC+4'}], + + ['utc-0a', "-u -d '08/01/97 6:00 UTC +4 hours' '+%D,%H:%M'", + {OUT=>"08/01/97,10:00"}], + # Make sure --file=FILE works with -u. + ['utc-1', "-u --file=f '+%Y-%m-%d %T'", + {AUX=>{f=>"$d0 $t0\n$d0 $t0"}}, + {OUT=>"$d0 $t0\n$d0 $t0"}, + {ENV => 'TZ=UTC+1'}], + + ['utc-1a', "-u --file=f '+%Y-%m-%d %T'", + {AUX=>{f=>"$d0 $t0 UTC +1 hour\n$d0 $t0 UTC +1 hour"}}, + {OUT=>"$d0 $th\n$d0 $th"}], + + # From the examples in the documentation. + ['date2sec-0', "-d '1970-01-01 00:00:01' +%s", {OUT=>"7201"}, + {ENV => 'TZ=UTC+2'}], + + # Same as above, but don't rely on TZ in environment. + ['date2sec-0a', "-d '1970-01-01 00:00:01 UTC +2 hours' +%s", + {OUT=>"7201"}], + + ['date2sec-1', "-d 2000-01-01 +%s", {OUT=>"946684800"}], + ['sec2date-0', "-d '1970-01-01 UTC 946684800 sec' +'%Y-%m-%d %T %z'", + {OUT=>"2000-01-01 00:00:00 +0000"}], + + ['this-m', "-d '$d0 $t0 this minute' $fmt", {OUT=>"$d0 $t0"}], + ['this-h', "-d '$d0 $t0 this hour' $fmt", {OUT=>"$d0 $t0"}], + ['this-w', "-d '$d0 $t0 this week' $fmt", {OUT=>"$d0 $t0"}], + ['this-mo', "-d '$d0 $t0 this month' $fmt", {OUT=>"$d0 $t0"}], + ['this-y', "-d '$d0 $t0 this year' $fmt", {OUT=>"$d0 $t0"}], + + ['risks-1', "-d 'Nov 10 1996' $fmt", {OUT=>"1996-11-10 00:00:00"}], + + # This one would pass if TZ (with any, or even no, value) were in + # the environment. + ['regress-1', "-u -d '1996-11-10 0:00:00 +0' $fmt", + {OUT=>"1996-11-10 00:00:00"}, + {ENV =>'LANG=C'}], + + + ['datevtime-1', "-d 000909 $fmt", {OUT=>"2000-09-09 00:00:00"}], + + # test for RFC-822 conformance + ['rfc822-1', "-R -d '$d1'", {OUT=>"Sun, 19 Jan 1997 08:17:48 +0000"}, + # Solaris 5.9's /bin/sh emits this diagnostic to stderr + # if you don't have support for the named locale. + {ERR_SUBST => q!s/^couldn't set locale correctly\n//!}, + {ENV => 'LC_ALL=de_DE TZ=UTC0'}], + + # Relative seconds, with time. fixed in 2.0j + ['relative-1', "--utc -d '1970-01-01 00:00:00 UTC +961062237 sec' $fmt", + {OUT=>"2000-06-15 09:43:57"}], + + # Relative seconds, no time. + ['relative-2', "--utc -d '1970-01-01 UTC +961062237 sec' $fmt", + {OUT=>"2000-06-15 09:43:57"}, + {ENV => 'TZ=UTC+1'}], + + # Relative days, no time, across time zones. + ['relative-3', "-I -d '2006-04-23 21 days ago'", {OUT=>"2006-04-02"}, + {ENV=>'TZ=PST8PDT,M4.1.0,M10.5.0'}], + + # This would infloop (or appear to) prior to coreutils-4.5.5, + # due to a bug in strftime.c. + ['wide-fmt', "-d '1999-06-01'", '+%3004Y', {OUT=>'0' x 3000 . "1999"}], + + # Ensure that we can parse MONTHNAME-DAY-YEAR. + ['moname-d-y', '--iso -d May-23-2003', {OUT=>"2003-05-23"}], + ['moname-d-y-r', '--rfc-3339=date -d May-23-2003', {OUT=>"2003-05-23"}], + + ['epoch', '--iso=sec -d @31536000', + {OUT=>"1971-01-01T00:00:00+0000"}], + ['epoch-r', '--rfc-3339=sec -d @31536000', + {OUT=>"1971-01-01 00:00:00+00:00"}], + + ['ns-10', '--iso=ns', '-d "1969-12-31 13:00:00.00000001-1100"', + {OUT=>"1970-01-01T00:00:00,000000010+0000"}], + ['ns-10-r', '--rfc-3339=ns', '-d "1969-12-31 13:00:00.00000001-1100"', + {OUT=>"1970-01-01 00:00:00.000000010+00:00"}], + + ['ns-max32', '--iso=ns', '-d "2038-01-19 03:14:07.999999999"', + {OUT=>"2038-01-19T03:14:07,999999999+0000"}], + ['ns-max32-r', '--rfc-3339=ns', '-d "2038-01-19 03:14:07.999999999"', + {OUT=>"2038-01-19 03:14:07.999999999+00:00"}], + + ['tz-1', '+%:::z', {OUT=>"-12:34:56"}, {ENV=>'TZ=XXX12:34:56'}], + + ['tz-2', '+%:::z', {OUT=>"+12:34:56"}, {ENV=>'TZ=XXX-12:34:56'}], + + ['tz-3', '+%::z', {OUT=>"+01:02:03"}, {ENV=>'TZ=XXX-1:02:03'}], + + ['tz-4', '+%:::z', {OUT=>"+12"}, {ENV=>'TZ=XXX-12'}], + + ['tz-5', '+%:z', {OUT=>"-00:01"}, {ENV=>'TZ=XXX0:01'}], + + # Accept %:z with a field width before the ':'. + ['tz-5w','+%8:z', {OUT=>"-0000:01"}, {ENV=>'TZ=XXX0:01'}], + # Don't recognize %:z with a field width between the ':' and the 'z'. + ['tz-5wf', '+%:8z', {OUT=>"%:8z"}, {ENV=>'TZ=XXX0:01'}], + + ['ns-relative', + '--iso=ns', + "-d'1970-01-01 00:00:00.1234567 UTC +961062237.987654321 sec'", + {OUT=>"2000-06-15T09:43:58,111111021+0000"}], + ['ns-relativer', '--rfc-3339=ns', + "-d'1970-01-01 00:00:00.1234567 UTC +961062237.987654321 sec'", + {OUT=>"2000-06-15 09:43:58.111111021+00:00"}], + + # Since coreutils/lib/getdate.y revision 1.96 (post-coreutils-5.3.0), + # a command like the following would mistakenly exit nonzero with an + # 'invalid date ...' diagnostic, but when run in a time zone for + # which daylight savings time is in effect for the starting date. + # Unfortunately (for ease of testing), if you set TZ at all, this + # failure is not triggered, hence the removal of TZ from the environment. + ['cross-dst', "-d'2005-03-27 +1 day'", '+%Y', {OUT=>"2005"}, + {ENV_DEL => 'TZ'}, + ], + + ['empty-fmt', '+', {OUT=>""}], + + ['neg-secs', '-d @-22 +%05s', {OUT=>"-0022"}], + ['neg-secs2', '-d @-22 +%_5s', {OUT=>" -22"}], + + # Before today's fix, date would print uninitialized data + # to standard output for an out-of-range date: + # $ date -d @$(echo 2^56-1|bc) 2> /dev/null | od -a -N3 + # 0000000 p 4 6 + # 0000003 + ['uninit-64', "-d \@$n_seconds", + {OUT=>''}, + # Use ERR_SUBST to get around fact that the diagnostic + # you get on a system with 32-bit time_t is not the same as + # the one you get for a system where it's 64 bits wide: + # - date: time 72057594037927935 is out of range + # + date: invalid date '@72057594037927935' + {ERR_SUBST => 's/.*//'}, + {ERR => "\n"}, + {EXIT => 1}, + ], + + ['fill-1', '-d 1999-12-08 +%_3d', {OUT=>' 8'}], + ['fill-2', '-d 1999-12-08 +%03d', {OUT=>'008'}], + + # Test the combination of the to-upper-case modifier (^) and a conversion + # specifier that expands to a string containing lower case characters. + ['subfmt-up1', '-d "1999-12-08 7:30" "+%^c"', + # Solaris 5.9 prints 'WED DEC 08 07:30:00 1999', while + # most others print 'WED DEC 8 07:30:00 1999'. + {OUT_SUBST => 's/ [ 0]8.*//'}, + {OUT=>'WED DEC'}], + + ['invalid-high-bit-set', "-d '\xb0'", + {ERR => "date: invalid date '\\260'\n"}, + {EXIT => 1}, + ], + ); + +# Repeat the cross-dst test, using Jan 1, 2005 and every interval from 1..364. +foreach my $i (1..364) + { + push @Tests, ["cross-dst$i", + "-d'2005-01-01 +$i day'", '+%Y', {OUT=>"2005"}, + {ENV_DEL => 'TZ'}, + ]; + } + +# Append "\n" to each OUT=> RHS if the expected exit value is either +# zero or not specified (defaults to zero). +foreach my $t (@Tests) + { + my $exit_val; + foreach my $e (@$t) + { + ref $e && ref $e eq 'HASH' && defined $e->{EXIT} + and $exit_val = $e->{EXIT}; + } + foreach my $e (@$t) + { + ref $e && ref $e eq 'HASH' && defined $e->{OUT} && ! $exit_val + and $e->{OUT} .= "\n"; + } + } + +my $save_temps = $ENV{DEBUG}; +my $verbose = $ENV{VERBOSE}; + +my $prog = 'date'; +my $fail = run_tests ($ME, $prog, \@Tests, $save_temps, $verbose); +exit $fail; diff --git a/tests/misc/df b/tests/misc/df deleted file mode 100755 index 4fc626e8..00000000 --- a/tests/misc/df +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# Ensure that "df ." outputs a header. - -# Copyright (C) 2006-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ df - -case $(df .) in -*' -'*) ;; -*) fail=1;; -esac - -Exit $fail diff --git a/tests/misc/df-P b/tests/misc/df-P deleted file mode 100755 index dfce4141..00000000 --- a/tests/misc/df-P +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -# Ensure that df -P is not affected by BLOCK_SIZE settings - -# Copyright (C) 2007-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ df - - - df -P . > t1 || fail=1 -BLOCK_SIZE=1M df -P . > t2 || fail=1 - -# Since disk utilization may be changing, compare only df's header line. -# That records the block size. E.g., for "1M", it would be: -# Filesystem 1048576-blocks Used Available Capacity Mounted on -# while for 1K, it would be -# Filesystem 1024-blocks Used Available Capacity Mounted on - -head -n1 t1 > exp || fail=1 -head -n1 t2 > out || fail=1 - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/misc/dircolors b/tests/misc/dircolors deleted file mode 100755 index e2a703e3..00000000 --- a/tests/misc/dircolors +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/perl -# Simple dircolors tests. - -# Copyright (C) 1998-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 -# 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; - -(my $program_name = $0) =~ s|.*/||; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -my @Tests = - ( - ['a', '-b', {IN => {k => "exec\n"}}, - {ERR => "dircolors: k:1: invalid line; missing second token\n"}, - {EXIT => 1}], - ['quote', '-b', {IN => "exec 'echo Hello;:'\n"}, - {OUT => "LS_COLORS='ex='\\''echo Hello;\\:'\\'':';\n" - . "export LS_COLORS\n"}], - ['other-wr', '-b', {IN => "owt 40;33\n"}, - {OUT => "LS_COLORS='tw=40;33:';\nexport LS_COLORS\n"}], - - # CAREFUL: always specify the -b option, unless explicitly testing - # for csh syntax output. - ); - -my $save_temps = $ENV{DEBUG}; -my $verbose = $ENV{VERBOSE}; - -my $prog = 'dircolors'; -my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); -exit $fail; diff --git a/tests/misc/dircolors.pl b/tests/misc/dircolors.pl new file mode 100755 index 00000000..061e372f --- /dev/null +++ b/tests/misc/dircolors.pl @@ -0,0 +1,46 @@ +#!/usr/bin/perl +# Simple dircolors tests. + +# Copyright (C) 1998-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/>. + +use strict; + +(my $program_name = $0) =~ s|.*/||; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +my @Tests = + ( + ['a', '-b', {IN => {k => "exec\n"}}, + {ERR => "dircolors: k:1: invalid line; missing second token\n"}, + {EXIT => 1}], + ['quote', '-b', {IN => "exec 'echo Hello;:'\n"}, + {OUT => "LS_COLORS='ex='\\''echo Hello;\\:'\\'':';\n" + . "export LS_COLORS\n"}], + ['other-wr', '-b', {IN => "owt 40;33\n"}, + {OUT => "LS_COLORS='tw=40;33:';\nexport LS_COLORS\n"}], + + # CAREFUL: always specify the -b option, unless explicitly testing + # for csh syntax output. + ); + +my $save_temps = $ENV{DEBUG}; +my $verbose = $ENV{VERBOSE}; + +my $prog = 'dircolors'; +my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); +exit $fail; diff --git a/tests/misc/dirname b/tests/misc/dirname deleted file mode 100755 index 00218367..00000000 --- a/tests/misc/dirname +++ /dev/null @@ -1,72 +0,0 @@ -#!/usr/bin/perl -# Test "dirname". - -# Copyright (C) 2006-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 -# 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 File::stat; - -(my $program_name = $0) =~ s|.*/||; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -my $stat_single = stat('/'); -my $stat_double = stat('//'); -my $double_slash = ($stat_single->dev == $stat_double->dev - && $stat_single->ino == $stat_double->ino) ? '/' : '//'; - -my $prog = 'dirname'; - -my @Tests = - ( - ['fail-1', {ERR => "$prog: missing operand\n" - . "Try '$prog --help' for more information.\n"}, {EXIT => '1'}], - - ['a', qw(d/f), {OUT => 'd'}], - ['b', qw(/d/f), {OUT => '/d'}], - ['c', qw(d/f/), {OUT => 'd'}], - ['d', qw(d/f//), {OUT => 'd'}], - ['e', qw(f), {OUT => '.'}], - ['f', qw(/), {OUT => '/'}], - ['g', qw(//), {OUT => "$double_slash"}], - ['h', qw(///), {OUT => '/'}], - ['i', qw(//a//), {OUT => "$double_slash"}], - ['j', qw(///a///), {OUT => '/'}], - ['k', qw(///a///b), {OUT => '///a'}], - ['l', qw(///a//b/), {OUT => '///a'}], - ['m', qw(''), {OUT => '.'}], - ['n', qw(a/b c/d), {OUT => "a\nc"}], - ); - -# Append a newline to end of each expected 'OUT' string. -my $t; -foreach $t (@Tests) - { - my $arg1 = $t->[1]; - my $e; - foreach $e (@$t) - { - $e->{OUT} = "$e->{OUT}\n" - if ref $e eq 'HASH' and exists $e->{OUT}; - } - } - -my $save_temps = $ENV{SAVE_TEMPS}; -my $verbose = $ENV{VERBOSE}; - -my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); -exit $fail; diff --git a/tests/misc/dirname.pl b/tests/misc/dirname.pl new file mode 100755 index 00000000..43182a8c --- /dev/null +++ b/tests/misc/dirname.pl @@ -0,0 +1,72 @@ +#!/usr/bin/perl +# Test "dirname". + +# Copyright (C) 2006-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/>. + +use strict; +use File::stat; + +(my $program_name = $0) =~ s|.*/||; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +my $stat_single = stat('/'); +my $stat_double = stat('//'); +my $double_slash = ($stat_single->dev == $stat_double->dev + && $stat_single->ino == $stat_double->ino) ? '/' : '//'; + +my $prog = 'dirname'; + +my @Tests = + ( + ['fail-1', {ERR => "$prog: missing operand\n" + . "Try '$prog --help' for more information.\n"}, {EXIT => '1'}], + + ['a', qw(d/f), {OUT => 'd'}], + ['b', qw(/d/f), {OUT => '/d'}], + ['c', qw(d/f/), {OUT => 'd'}], + ['d', qw(d/f//), {OUT => 'd'}], + ['e', qw(f), {OUT => '.'}], + ['f', qw(/), {OUT => '/'}], + ['g', qw(//), {OUT => "$double_slash"}], + ['h', qw(///), {OUT => '/'}], + ['i', qw(//a//), {OUT => "$double_slash"}], + ['j', qw(///a///), {OUT => '/'}], + ['k', qw(///a///b), {OUT => '///a'}], + ['l', qw(///a//b/), {OUT => '///a'}], + ['m', qw(''), {OUT => '.'}], + ['n', qw(a/b c/d), {OUT => "a\nc"}], + ); + +# Append a newline to end of each expected 'OUT' string. +my $t; +foreach $t (@Tests) + { + my $arg1 = $t->[1]; + my $e; + foreach $e (@$t) + { + $e->{OUT} = "$e->{OUT}\n" + if ref $e eq 'HASH' and exists $e->{OUT}; + } + } + +my $save_temps = $ENV{SAVE_TEMPS}; +my $verbose = $ENV{VERBOSE}; + +my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); +exit $fail; diff --git a/tests/misc/env b/tests/misc/env deleted file mode 100755 index 6f8c064c..00000000 --- a/tests/misc/env +++ /dev/null @@ -1,152 +0,0 @@ -#!/bin/sh -# Verify behavior of env. - -# Copyright (C) 2009-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ env - - -# Verify clearing the environment -a=1 -export a -env - > out || fail=1 -test -s out && fail=1 -env -i > out || fail=1 -test -s out && fail=1 -env -u a -i -u a -- > out || fail=1 -test -s out && fail=1 -env -i -- a=b > out || fail=1 -echo a=b > exp || framework_failure_ -compare exp out || fail=1 - -# These tests verify exact status of internal failure. -env --- # unknown option -test $? = 125 || fail=1 -env -u # missing option argument -test $? = 125 || fail=1 -env sh -c 'exit 2' # exit status propagation -test $? = 2 || fail=2 -env . # invalid command -test $? = 126 || fail=1 -env no_such # no such command -test $? = 127 || fail=1 - -# POSIX is clear that environ may, but need not be, sorted. -# Environment variable values may contain newlines, which cannot be -# observed by merely inspecting output from env. -# Cygwin requires a minimal environment to launch new processes: execve -# adds missing variables SYSTEMROOT and WINDIR, which show up in a -# subsequent env. Cygwin also requires /bin to always be part of PATH, -# and attempts to unset or reduce PATH may cause execve to fail. -# -# For these reasons, it is more portable to grep that our desired changes -# took place, rather than comparing output of env over an entire environment. -if env | grep '^ENV_TEST' >/dev/null ; then - skip_ "environment has potential interference from ENV_TEST*" -fi - -ENV_TEST1=a -export ENV_TEST1 -: >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 -grep '^ENV_TEST' all | LC_ALL=C sort >> out || framework_failure_ -env ENV_TEST1=b > all || fail=1 -grep '^ENV_TEST' all | LC_ALL=C sort >> out || framework_failure_ -env ENV_TEST2= env > all || fail=1 -grep '^ENV_TEST' all | LC_ALL=C sort >> out || framework_failure_ -env -u ENV_TEST1 ENV_TEST3=c env > all || fail=1 -grep '^ENV_TEST' all | LC_ALL=C sort >> out || framework_failure_ -env ENV_TEST1=b env > all || fail=1 -grep '^ENV_TEST' all | LC_ALL=C sort >> out || framework_failure_ -cat <<EOF >exp || framework_failure_ -ENV_TEST1=a -ENV_TEST2= -ENV_TEST3=c -ENV_TEST1=b -ENV_TEST1=a -ENV_TEST2= -ENV_TEST3=c -ENV_TEST1=b -EOF -compare exp out || fail=1 - -# PATH modifications affect exec. -mkdir unlikely_name || framework_failure_ -cat <<EOF > unlikely_name/also_unlikely || framework_failure_ -#!/bin/sh -echo pass -EOF -chmod +x unlikely_name/also_unlikely || framework_failure_ -env also_unlikely && fail=1 -test x$(PATH=$PATH:unlikely_name env also_unlikely) = xpass || fail=1 -test x$(env PATH="$PATH":unlikely_name also_unlikely) = xpass || fail=1 - -# Explicitly put . on the PATH for the rest of this test. -PATH=$PATH: -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. -# Test -u, rather than -i, to minimize PATH problems. -ln -s "$abs_top_builddir/src/echo" ./-u || framework_failure_ -case $(env -u echo echo good) in - good) ;; - *) fail=1 ;; -esac -case $(env -u echo -- echo good) in - good) ;; - *) fail=1 ;; -esac -case $(env -- -u pass) in - 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_ -case $(env a=b -- true || echo fail) in - true) ;; - *) fail=1 ;; -esac - -# No way to directly invoke program name containing =. -cat <<EOF >./c=d || framework_failure_ -#!/bin/sh -echo pass -EOF -chmod +x c=d || framework_failure_ -test "x$(env c=d echo fail)" = xfail || fail=1 -test "x$(env -- c=d echo fail)" = xfail || fail=1 -test "x$(env ./c=d echo fail)" = xfail || fail=1 -test "x$(env sh -c 'exec "$@"' sh c=d echo fail)" = xpass || fail=1 -test "x$(sh -c '\c=d echo fail')" = xpass && #dash 0.5.4 fails so check first - { test "x$(env sh -c '\c=d echo fail')" = xpass || fail=1; } - -# catch unsetenv failure, broken through coreutils 8.0 -env -u a=b true && fail=1 -test $? = 125 || fail=1 -env -u '' true && fail=1 -test $? = 125 || fail=1 - -Exit $fail diff --git a/tests/misc/env-null b/tests/misc/env-null deleted file mode 100755 index 0190bf41..00000000 --- a/tests/misc/env-null +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -# Verify behavior of env -0 and printenv -0. - -# Copyright (C) 2009-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ env printenv - -# POSIX is clear that environ may, but need not be, sorted. -# Environment variable values may contain newlines, which cannot be -# observed by merely inspecting output from env. -# Cygwin requires a minimal environment to launch new processes: execve -# adds missing variables SYSTEMROOT and WINDIR, which show up in a -# subsequent env. Cygwin also requires /bin to always be part of PATH, -# and attempts to unset or reduce PATH may cause execve to fail. -# -# For these reasons, it is better to compare two outputs from distinct -# programs that should be the same, rather than building an exp file. -env -i PATH="$PATH" env -0 > out1 || fail=1 -env -i PATH="$PATH" printenv -0 > out2 || fail=1 -compare out1 out2 || fail=1 -env -i PATH="$PATH" env --null > out2 || fail=1 -compare out1 out2 || fail=1 -env -i PATH="$PATH" printenv --null > out2 || fail=1 -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 - -# Test env -0 on a one-variable environment. -printf 'a=b\nc=\0' > exp || framework_failure_ -env -i -0 "$(printf 'a=b\nc=')" > out || fail=1 -compare exp out || fail=1 - -# Test printenv -0 on particular values. -printf 'b\nc=\0' > exp || framework_failure_ -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 -env -u b "$(printf 'a=b\nc=')" printenv -0 b a > out -test $? = 1 || fail=1 -compare exp out || fail=1 - -Exit $fail diff --git a/tests/misc/env-null.sh b/tests/misc/env-null.sh new file mode 100755 index 00000000..3cbbcbd5 --- /dev/null +++ b/tests/misc/env-null.sh @@ -0,0 +1,61 @@ +#!/bin/sh +# Verify behavior of env -0 and printenv -0. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ env printenv + +# POSIX is clear that environ may, but need not be, sorted. +# Environment variable values may contain newlines, which cannot be +# observed by merely inspecting output from env. +# Cygwin requires a minimal environment to launch new processes: execve +# adds missing variables SYSTEMROOT and WINDIR, which show up in a +# subsequent env. Cygwin also requires /bin to always be part of PATH, +# and attempts to unset or reduce PATH may cause execve to fail. +# +# For these reasons, it is better to compare two outputs from distinct +# programs that should be the same, rather than building an exp file. +env -i PATH="$PATH" env -0 > out1 || fail=1 +env -i PATH="$PATH" printenv -0 > out2 || fail=1 +compare out1 out2 || fail=1 +env -i PATH="$PATH" env --null > out2 || fail=1 +compare out1 out2 || fail=1 +env -i PATH="$PATH" printenv --null > out2 || fail=1 +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 + +# Test env -0 on a one-variable environment. +printf 'a=b\nc=\0' > exp || framework_failure_ +env -i -0 "$(printf 'a=b\nc=')" > out || fail=1 +compare exp out || fail=1 + +# Test printenv -0 on particular values. +printf 'b\nc=\0' > exp || framework_failure_ +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 +env -u b "$(printf 'a=b\nc=')" printenv -0 b a > out +test $? = 1 || fail=1 +compare exp out || fail=1 + +Exit $fail diff --git a/tests/misc/env.sh b/tests/misc/env.sh new file mode 100755 index 00000000..7c9e8fdc --- /dev/null +++ b/tests/misc/env.sh @@ -0,0 +1,152 @@ +#!/bin/sh +# Verify behavior of env. + +# 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/>. + + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ env + + +# Verify clearing the environment +a=1 +export a +env - > out || fail=1 +test -s out && fail=1 +env -i > out || fail=1 +test -s out && fail=1 +env -u a -i -u a -- > out || fail=1 +test -s out && fail=1 +env -i -- a=b > out || fail=1 +echo a=b > exp || framework_failure_ +compare exp out || fail=1 + +# These tests verify exact status of internal failure. +env --- # unknown option +test $? = 125 || fail=1 +env -u # missing option argument +test $? = 125 || fail=1 +env sh -c 'exit 2' # exit status propagation +test $? = 2 || fail=2 +env . # invalid command +test $? = 126 || fail=1 +env no_such # no such command +test $? = 127 || fail=1 + +# POSIX is clear that environ may, but need not be, sorted. +# Environment variable values may contain newlines, which cannot be +# observed by merely inspecting output from env. +# Cygwin requires a minimal environment to launch new processes: execve +# adds missing variables SYSTEMROOT and WINDIR, which show up in a +# subsequent env. Cygwin also requires /bin to always be part of PATH, +# and attempts to unset or reduce PATH may cause execve to fail. +# +# For these reasons, it is more portable to grep that our desired changes +# took place, rather than comparing output of env over an entire environment. +if env | grep '^ENV_TEST' >/dev/null ; then + skip_ "environment has potential interference from ENV_TEST*" +fi + +ENV_TEST1=a +export ENV_TEST1 +: >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 +grep '^ENV_TEST' all | LC_ALL=C sort >> out || framework_failure_ +env ENV_TEST1=b > all || fail=1 +grep '^ENV_TEST' all | LC_ALL=C sort >> out || framework_failure_ +env ENV_TEST2= env > all || fail=1 +grep '^ENV_TEST' all | LC_ALL=C sort >> out || framework_failure_ +env -u ENV_TEST1 ENV_TEST3=c env > all || fail=1 +grep '^ENV_TEST' all | LC_ALL=C sort >> out || framework_failure_ +env ENV_TEST1=b env > all || fail=1 +grep '^ENV_TEST' all | LC_ALL=C sort >> out || framework_failure_ +cat <<EOF >exp || framework_failure_ +ENV_TEST1=a +ENV_TEST2= +ENV_TEST3=c +ENV_TEST1=b +ENV_TEST1=a +ENV_TEST2= +ENV_TEST3=c +ENV_TEST1=b +EOF +compare exp out || fail=1 + +# PATH modifications affect exec. +mkdir unlikely_name || framework_failure_ +cat <<EOF > unlikely_name/also_unlikely || framework_failure_ +#!/bin/sh +echo pass +EOF +chmod +x unlikely_name/also_unlikely || framework_failure_ +env also_unlikely && fail=1 +test x$(PATH=$PATH:unlikely_name env also_unlikely) = xpass || fail=1 +test x$(env PATH="$PATH":unlikely_name also_unlikely) = xpass || fail=1 + +# Explicitly put . on the PATH for the rest of this test. +PATH=$PATH: +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. +# Test -u, rather than -i, to minimize PATH problems. +ln -s "$abs_top_builddir/src/echo" ./-u || framework_failure_ +case $(env -u echo echo good) in + good) ;; + *) fail=1 ;; +esac +case $(env -u echo -- echo good) in + good) ;; + *) fail=1 ;; +esac +case $(env -- -u pass) in + 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_ +case $(env a=b -- true || echo fail) in + true) ;; + *) fail=1 ;; +esac + +# No way to directly invoke program name containing =. +cat <<EOF >./c=d || framework_failure_ +#!/bin/sh +echo pass +EOF +chmod +x c=d || framework_failure_ +test "x$(env c=d echo fail)" = xfail || fail=1 +test "x$(env -- c=d echo fail)" = xfail || fail=1 +test "x$(env ./c=d echo fail)" = xfail || fail=1 +test "x$(env sh -c 'exec "$@"' sh c=d echo fail)" = xpass || fail=1 +test "x$(sh -c '\c=d echo fail')" = xpass && #dash 0.5.4 fails so check first + { test "x$(env sh -c '\c=d echo fail')" = xpass || fail=1; } + +# catch unsetenv failure, broken through coreutils 8.0 +env -u a=b true && fail=1 +test $? = 125 || fail=1 +env -u '' true && fail=1 +test $? = 125 || fail=1 + +Exit $fail diff --git a/tests/misc/expand b/tests/misc/expand deleted file mode 100755 index 581a912d..00000000 --- a/tests/misc/expand +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/perl -# Exercise expand. - -# Copyright (C) 2004-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 -# 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; - -(my $program_name = $0) =~ s|.*/||; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -my @Tests = - ( - ['t1', '--tabs=3', {IN=>"a\tb"}, {OUT=>"a b"}], - ['t2', '--tabs=3,6,9', {IN=>"a\tb\tc\td\te"}, {OUT=>"a b c d e"}], - ['i1', '--tabs=3 -i', {IN=>"\ta\tb"}, {OUT=>" a\tb"}], - ['i2', '--tabs=3 -i', {IN=>" \ta\tb"}, {OUT=>" a\tb"}], - ); - -my $save_temps = $ENV{DEBUG}; -my $verbose = $ENV{VERBOSE}; - -my $prog = 'expand'; -my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); -exit $fail; diff --git a/tests/misc/expand.pl b/tests/misc/expand.pl new file mode 100755 index 00000000..30be9f91 --- /dev/null +++ b/tests/misc/expand.pl @@ -0,0 +1,39 @@ +#!/usr/bin/perl +# Exercise expand. + +# Copyright (C) 2004-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/>. + +use strict; + +(my $program_name = $0) =~ s|.*/||; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +my @Tests = + ( + ['t1', '--tabs=3', {IN=>"a\tb"}, {OUT=>"a b"}], + ['t2', '--tabs=3,6,9', {IN=>"a\tb\tc\td\te"}, {OUT=>"a b c d e"}], + ['i1', '--tabs=3 -i', {IN=>"\ta\tb"}, {OUT=>" a\tb"}], + ['i2', '--tabs=3 -i', {IN=>" \ta\tb"}, {OUT=>" a\tb"}], + ); + +my $save_temps = $ENV{DEBUG}; +my $verbose = $ENV{VERBOSE}; + +my $prog = 'expand'; +my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); +exit $fail; diff --git a/tests/misc/expr b/tests/misc/expr deleted file mode 100755 index c298d4c2..00000000 --- a/tests/misc/expr +++ /dev/null @@ -1,198 +0,0 @@ -#!/usr/bin/perl -# Basic tests for "expr". - -# Copyright (C) 2001-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 -# 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; - -(my $program_name = $0) =~ s|.*/||; -my $prog = 'expr'; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -my $big = '98782897298723498732987928734'; -my $big_p1 = '98782897298723498732987928735'; -my $big_sum = '197565794597446997465975857469'; -my $big_prod = '9758060798730154302876482828124348356960410232492450771490'; - -my @Tests = - ( - ['a', '5 + 6', {OUT => '11'}], - ['b', '5 - 6', {OUT => '-1'}], - ['c', '5 \* 6', {OUT => '30'}], - ['d', '100 / 6', {OUT => '16'}], - ['e', '100 % 6', {OUT => '4'}], - ['f', '3 + -2', {OUT => '1'}], - ['g', '-2 + -2', {OUT => '-4'}], - - # Verify option processing. - # Added when option processing broke in the 7.0 beta release - ['opt1', '-- -11 + 12', {OUT => '1'}], - ['opt2', '-11 + 12', {OUT => '1'}], - ['opt3', '-- -1 + 2', {OUT => '1'}], - ['opt4', '-1 + 2', {OUT => '1'}], - # This evoked a syntax error diagnostic before 2.0.12. - ['opt5', '-- 2 + 2', {OUT => '4'}], - - ['paren1', '\( 100 % 6 \)', {OUT => '4'}], - ['paren2', '\( 100 % 6 \) - 8', {OUT => '-4'}], - ['paren3', '9 / \( 100 % 6 \) - 8', {OUT => '-6'}], - ['paren4', '9 / \( \( 100 % 6 \) - 8 \)', {OUT => '-2'}], - ['paren5', '9 + \( 100 % 6 \)', {OUT => '13'}], - - # Before 2.0.12, this would output '1'. - ['0bang', '00 \< 0!', {OUT => '0'}, {EXIT => 1}], - - # In 5.1.3 and earlier, these would exit with status 0. - ['00', '00', {OUT => '00'}, {EXIT => 1}], - ['minus0', '-0', {OUT => '-0'}, {EXIT => 1}], - - # In 5.1.3 and earlier, these would report errors. - ['andand', '0 \& 1 / 0', {OUT => '0'}, {EXIT => 1}], - ['oror', '1 \| 1 / 0', {OUT => '1'}, {EXIT => 0}], - - # In 5.1.3 and earlier, this would output the empty string. - ['orempty', '"" \| ""', {OUT => '0'}, {EXIT => 1}], - - - # This erroneously succeeded and output '3' before 2.0.12. - ['fail-a', '3 + -', {ERR => "$prog: non-integer argument\n"}, - {EXIT => 2}], - - # This erroneously succeeded before 5.3.1. - ['bigcmp', '-- -2417851639229258349412352 \< 2417851639229258349412352', - {OUT => '1'}, {EXIT => 0}], - - # In 5.94 and earlier, anchors incorrectly matched newlines. - ['anchor', "'a\nb' : 'a\$'", {OUT => '0'}, {EXIT => 1}], - - # These tests are taken from grep/tests/bre.tests. - ['bre1', '"abc" : "a\\(b\\)c"', {OUT => 'b'}], - ['bre2', '"a(" : "a("', {OUT => '2'}], - ['bre3', '_ : "a\\("', - {ERR => "$prog: Unmatched ( or \\(\n"}, {EXIT => 2}], - ['bre4', '_ : "a\\(b"', - {ERR => "$prog: Unmatched ( or \\(\n"}, {EXIT => 2}], - ['bre5', '"a(b" : "a(b"', {OUT => '3'}], - ['bre6', '"a)" : "a)"', {OUT => '2'}], - ['bre7', '_ : "a\\)"', - {ERR => "$prog: Unmatched ) or \\)\n"}, {EXIT => 2}], - ['bre8', '_ : "\\)"', - {ERR => "$prog: Unmatched ) or \\)\n"}, {EXIT => 2}], - ['bre9', '"ab" : "a\\(\\)b"', {OUT => ''}, {EXIT => 1}], - ['bre10', '"a^b" : "a^b"', {OUT => '3'}], - ['bre11', '"a\$b" : "a\$b"', {OUT => '3'}], - ['bre12', '"" : "\\($\\)\\(^\\)"', {OUT => ''}, {EXIT => 1}], - ['bre13', '"b" : "a*\\(^b\$\\)c*"', {OUT => 'b'}], - ['bre14', '"X|" : "X\\(|\\)" : "(" "X|" : "X\\(|\\)" ")"', {OUT => '1'}], - ['bre15', '"X*" : "X\\(*\\)" : "(" "X*" : "X\\(*\\)" ")"', {OUT => '1'}], - ['bre16', '"abc" : "\\(\\)"', {OUT => ''}, {EXIT => 1}], - ['bre17', '"{1}a" : "\\(\\{1\\}a\\)"', {OUT => '{1}a'}], - ['bre18', '"X*" : "X\\(*\\)" : "^*"', {OUT => '1'}], - ['bre19', '"{1}" : "^\\{1\\}"', {OUT => '3'}], - ['bre20', '"{" : "{"', {OUT => '1'}], - ['bre21', '"abbcbd" : "a\\(b*\\)c\\1d"', {OUT => ''}, {EXIT => 1}], - ['bre22', '"abbcbbbd" : "a\\(b*\\)c\\1d"', {OUT => ''}, {EXIT => 1}], - ['bre23', '"abc" : "\\(.\\)\\1"', {OUT => ''}, {EXIT => 1}], - ['bre24', '"abbccd" : "a\\(\\([bc]\\)\\2\\)*d"', {OUT => 'cc'}], - ['bre25', '"abbcbd" : "a\\(\\([bc]\\)\\2\\)*d"', - {OUT => ''}, {EXIT => 1}], - ['bre26', '"abbbd" : "a\\(\\(b\\)*\\2\\)*d"', {OUT => 'bbb'}], - ['bre27', '"aabcd" : "\\(a\\)\\1bcd"', {OUT => 'a'}], - ['bre28', '"aabcd" : "\\(a\\)\\1bc*d"', {OUT => 'a'}], - ['bre29', '"aabd" : "\\(a\\)\\1bc*d"', {OUT => 'a'}], - ['bre30', '"aabcccd" : "\\(a\\)\\1bc*d"', {OUT => 'a'}], - ['bre31', '"aabcccd" : "\\(a\\)\\1bc*[ce]d"', {OUT => 'a'}], - ['bre32', '"aabcccd" : "\\(a\\)\\1b\\(c\\)*cd\$"', {OUT => 'a'}], - ['bre33', '"a*b" : "a\\(*\\)b"', {OUT => '*'}], - ['bre34', '"ab" : "a\\(**\\)b"', {OUT => ''}, {EXIT => 1}], - ['bre35', '"ab" : "a\\(***\\)b"', {OUT => ''}, {EXIT => 1}], - ['bre36', '"*a" : "*a"', {OUT => '2'}], - ['bre37', '"a" : "**a"', {OUT => '1'}], - ['bre38', '"a" : "***a"', {OUT => '1'}], - ['bre39', '"ab" : "a\\{1\\}b"', {OUT => '2'}], - ['bre40', '"ab" : "a\\{1,\\}b"', {OUT => '2'}], - ['bre41', '"aab" : "a\\{1,2\\}b"', {OUT => '3'}], - ['bre42', '_ : "a\\{1"', - {ERR => "$prog: Unmatched \\{\n"}, {EXIT => 2}], - ['bre43', '_ : "a\\{1a"', - {ERR => "$prog: Unmatched \\{\n"}, {EXIT => 2}], - ['bre44', '_ : "a\\{1a\\}"', - {ERR => "$prog: Invalid content of \\{\\}\n"}, {EXIT => 2}], - ['bre45', '"a" : "a\\{,2\\}"', {OUT => '1'}], - ['bre46', '"a" : "a\\{,\\}"', {OUT => '1'}], - ['bre47', '_ : "a\\{1,x\\}"', - {ERR => "$prog: Invalid content of \\{\\}\n"}, {EXIT => 2}], - ['bre48', '_ : "a\\{1,x"', - {ERR => "$prog: Unmatched \\{\n"}, {EXIT => 2}], - ['bre49', '_ : "a\\{32768\\}"', - {ERR => "$prog: Invalid content of \\{\\}\n"}, {EXIT => 2}, - # Map AIX-6's different diagnostic to the one we expect: - {ERR_SUBST => - 's,Regular expression too big,Invalid content of \\\\{\\\\},'}, - ], - ['bre50', '_ : "a\\{1,0\\}"', - {ERR => "$prog: Invalid content of \\{\\}\n"}, {EXIT => 2}], - ['bre51', '"acabc" : ".*ab\\{0,0\\}c"', {OUT => '2'}], - ['bre52', '"abcac" : "ab\\{0,1\\}c"', {OUT => '3'}], - ['bre53', '"abbcac" : "ab\\{0,3\\}c"', {OUT => '4'}], - ['bre54', '"abcac" : ".*ab\\{1,1\\}c"', {OUT => '3'}], - ['bre55', '"abcac" : ".*ab\\{1,3\\}c"', {OUT => '3'}], - ['bre56', '"abbcabc" : ".*ab\{2,2\}c"', {OUT => '4'}], - ['bre57', '"abbcabc" : ".*ab\{2,4\}c"', {OUT => '4'}], - ['bre58', '"aa" : "a\\{1\\}\\{1\\}"', {OUT => '1'}], - ['bre59', '"aa" : "a*\\{1\\}"', {OUT => '2'}], - ['bre60', '"aa" : "a\\{1\\}*"', {OUT => '2'}], - ['bre61', '"acd" : "a\\(b\\)?c\\1d"', {OUT => ''}, {EXIT => 1}], - ['bre62', '-- "-5" : "-\\{0,1\\}[0-9]*\$"', {OUT => '2'}], - - ['fail-b', '9 9', {ERR => "$prog: syntax error\n"}, - {EXIT => 2}], - ['fail-c', {ERR => "$prog: missing operand\n" - . "Try '$prog --help' for more information.\n"}, - {EXIT => 2}], - - ['bignum-add', "$big + 1", {OUT => $big_p1}], - ['bignum-add2', "$big + $big_p1", {OUT => $big_sum}], - ['bignum-sub', "$big_p1 - 1", {OUT => $big}], - ['bignum-sub2', "$big_sum - $big", {OUT => $big_p1}], - ['bignum-mul', "$big_p1 '*' $big", {OUT => $big_prod}], - ['bignum-div', "$big_prod / $big", {OUT => $big_p1}], - ); - -# If using big numbers fails, remove all /^bignum-/ tests -qx!expr $big_prod '*' $big_prod '*' $big_prod! - or @Tests = grep {$_->[0] !~ /^bignum-/} @Tests; - -# Append a newline to end of each expected 'OUT' string. -my $t; -foreach $t (@Tests) - { - my $arg1 = $t->[1]; - my $e; - foreach $e (@$t) - { - $e->{OUT} .= "\n" - if ref $e eq 'HASH' and exists $e->{OUT}; - } - } - -my $save_temps = $ENV{SAVE_TEMPS}; -my $verbose = $ENV{VERBOSE}; - -my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); -exit $fail; diff --git a/tests/misc/expr.pl b/tests/misc/expr.pl new file mode 100755 index 00000000..9b957a5c --- /dev/null +++ b/tests/misc/expr.pl @@ -0,0 +1,198 @@ +#!/usr/bin/perl +# Basic tests for "expr". + +# Copyright (C) 2001-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/>. + +use strict; + +(my $program_name = $0) =~ s|.*/||; +my $prog = 'expr'; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +my $big = '98782897298723498732987928734'; +my $big_p1 = '98782897298723498732987928735'; +my $big_sum = '197565794597446997465975857469'; +my $big_prod = '9758060798730154302876482828124348356960410232492450771490'; + +my @Tests = + ( + ['a', '5 + 6', {OUT => '11'}], + ['b', '5 - 6', {OUT => '-1'}], + ['c', '5 \* 6', {OUT => '30'}], + ['d', '100 / 6', {OUT => '16'}], + ['e', '100 % 6', {OUT => '4'}], + ['f', '3 + -2', {OUT => '1'}], + ['g', '-2 + -2', {OUT => '-4'}], + + # Verify option processing. + # Added when option processing broke in the 7.0 beta release + ['opt1', '-- -11 + 12', {OUT => '1'}], + ['opt2', '-11 + 12', {OUT => '1'}], + ['opt3', '-- -1 + 2', {OUT => '1'}], + ['opt4', '-1 + 2', {OUT => '1'}], + # This evoked a syntax error diagnostic before 2.0.12. + ['opt5', '-- 2 + 2', {OUT => '4'}], + + ['paren1', '\( 100 % 6 \)', {OUT => '4'}], + ['paren2', '\( 100 % 6 \) - 8', {OUT => '-4'}], + ['paren3', '9 / \( 100 % 6 \) - 8', {OUT => '-6'}], + ['paren4', '9 / \( \( 100 % 6 \) - 8 \)', {OUT => '-2'}], + ['paren5', '9 + \( 100 % 6 \)', {OUT => '13'}], + + # Before 2.0.12, this would output '1'. + ['0bang', '00 \< 0!', {OUT => '0'}, {EXIT => 1}], + + # In 5.1.3 and earlier, these would exit with status 0. + ['00', '00', {OUT => '00'}, {EXIT => 1}], + ['minus0', '-0', {OUT => '-0'}, {EXIT => 1}], + + # In 5.1.3 and earlier, these would report errors. + ['andand', '0 \& 1 / 0', {OUT => '0'}, {EXIT => 1}], + ['oror', '1 \| 1 / 0', {OUT => '1'}, {EXIT => 0}], + + # In 5.1.3 and earlier, this would output the empty string. + ['orempty', '"" \| ""', {OUT => '0'}, {EXIT => 1}], + + + # This erroneously succeeded and output '3' before 2.0.12. + ['fail-a', '3 + -', {ERR => "$prog: non-integer argument\n"}, + {EXIT => 2}], + + # This erroneously succeeded before 5.3.1. + ['bigcmp', '-- -2417851639229258349412352 \< 2417851639229258349412352', + {OUT => '1'}, {EXIT => 0}], + + # In 5.94 and earlier, anchors incorrectly matched newlines. + ['anchor', "'a\nb' : 'a\$'", {OUT => '0'}, {EXIT => 1}], + + # These tests are taken from grep/tests/bre.tests. + ['bre1', '"abc" : "a\\(b\\)c"', {OUT => 'b'}], + ['bre2', '"a(" : "a("', {OUT => '2'}], + ['bre3', '_ : "a\\("', + {ERR => "$prog: Unmatched ( or \\(\n"}, {EXIT => 2}], + ['bre4', '_ : "a\\(b"', + {ERR => "$prog: Unmatched ( or \\(\n"}, {EXIT => 2}], + ['bre5', '"a(b" : "a(b"', {OUT => '3'}], + ['bre6', '"a)" : "a)"', {OUT => '2'}], + ['bre7', '_ : "a\\)"', + {ERR => "$prog: Unmatched ) or \\)\n"}, {EXIT => 2}], + ['bre8', '_ : "\\)"', + {ERR => "$prog: Unmatched ) or \\)\n"}, {EXIT => 2}], + ['bre9', '"ab" : "a\\(\\)b"', {OUT => ''}, {EXIT => 1}], + ['bre10', '"a^b" : "a^b"', {OUT => '3'}], + ['bre11', '"a\$b" : "a\$b"', {OUT => '3'}], + ['bre12', '"" : "\\($\\)\\(^\\)"', {OUT => ''}, {EXIT => 1}], + ['bre13', '"b" : "a*\\(^b\$\\)c*"', {OUT => 'b'}], + ['bre14', '"X|" : "X\\(|\\)" : "(" "X|" : "X\\(|\\)" ")"', {OUT => '1'}], + ['bre15', '"X*" : "X\\(*\\)" : "(" "X*" : "X\\(*\\)" ")"', {OUT => '1'}], + ['bre16', '"abc" : "\\(\\)"', {OUT => ''}, {EXIT => 1}], + ['bre17', '"{1}a" : "\\(\\{1\\}a\\)"', {OUT => '{1}a'}], + ['bre18', '"X*" : "X\\(*\\)" : "^*"', {OUT => '1'}], + ['bre19', '"{1}" : "^\\{1\\}"', {OUT => '3'}], + ['bre20', '"{" : "{"', {OUT => '1'}], + ['bre21', '"abbcbd" : "a\\(b*\\)c\\1d"', {OUT => ''}, {EXIT => 1}], + ['bre22', '"abbcbbbd" : "a\\(b*\\)c\\1d"', {OUT => ''}, {EXIT => 1}], + ['bre23', '"abc" : "\\(.\\)\\1"', {OUT => ''}, {EXIT => 1}], + ['bre24', '"abbccd" : "a\\(\\([bc]\\)\\2\\)*d"', {OUT => 'cc'}], + ['bre25', '"abbcbd" : "a\\(\\([bc]\\)\\2\\)*d"', + {OUT => ''}, {EXIT => 1}], + ['bre26', '"abbbd" : "a\\(\\(b\\)*\\2\\)*d"', {OUT => 'bbb'}], + ['bre27', '"aabcd" : "\\(a\\)\\1bcd"', {OUT => 'a'}], + ['bre28', '"aabcd" : "\\(a\\)\\1bc*d"', {OUT => 'a'}], + ['bre29', '"aabd" : "\\(a\\)\\1bc*d"', {OUT => 'a'}], + ['bre30', '"aabcccd" : "\\(a\\)\\1bc*d"', {OUT => 'a'}], + ['bre31', '"aabcccd" : "\\(a\\)\\1bc*[ce]d"', {OUT => 'a'}], + ['bre32', '"aabcccd" : "\\(a\\)\\1b\\(c\\)*cd\$"', {OUT => 'a'}], + ['bre33', '"a*b" : "a\\(*\\)b"', {OUT => '*'}], + ['bre34', '"ab" : "a\\(**\\)b"', {OUT => ''}, {EXIT => 1}], + ['bre35', '"ab" : "a\\(***\\)b"', {OUT => ''}, {EXIT => 1}], + ['bre36', '"*a" : "*a"', {OUT => '2'}], + ['bre37', '"a" : "**a"', {OUT => '1'}], + ['bre38', '"a" : "***a"', {OUT => '1'}], + ['bre39', '"ab" : "a\\{1\\}b"', {OUT => '2'}], + ['bre40', '"ab" : "a\\{1,\\}b"', {OUT => '2'}], + ['bre41', '"aab" : "a\\{1,2\\}b"', {OUT => '3'}], + ['bre42', '_ : "a\\{1"', + {ERR => "$prog: Unmatched \\{\n"}, {EXIT => 2}], + ['bre43', '_ : "a\\{1a"', + {ERR => "$prog: Unmatched \\{\n"}, {EXIT => 2}], + ['bre44', '_ : "a\\{1a\\}"', + {ERR => "$prog: Invalid content of \\{\\}\n"}, {EXIT => 2}], + ['bre45', '"a" : "a\\{,2\\}"', {OUT => '1'}], + ['bre46', '"a" : "a\\{,\\}"', {OUT => '1'}], + ['bre47', '_ : "a\\{1,x\\}"', + {ERR => "$prog: Invalid content of \\{\\}\n"}, {EXIT => 2}], + ['bre48', '_ : "a\\{1,x"', + {ERR => "$prog: Unmatched \\{\n"}, {EXIT => 2}], + ['bre49', '_ : "a\\{32768\\}"', + {ERR => "$prog: Invalid content of \\{\\}\n"}, {EXIT => 2}, + # Map AIX-6's different diagnostic to the one we expect: + {ERR_SUBST => + 's,Regular expression too big,Invalid content of \\\\{\\\\},'}, + ], + ['bre50', '_ : "a\\{1,0\\}"', + {ERR => "$prog: Invalid content of \\{\\}\n"}, {EXIT => 2}], + ['bre51', '"acabc" : ".*ab\\{0,0\\}c"', {OUT => '2'}], + ['bre52', '"abcac" : "ab\\{0,1\\}c"', {OUT => '3'}], + ['bre53', '"abbcac" : "ab\\{0,3\\}c"', {OUT => '4'}], + ['bre54', '"abcac" : ".*ab\\{1,1\\}c"', {OUT => '3'}], + ['bre55', '"abcac" : ".*ab\\{1,3\\}c"', {OUT => '3'}], + ['bre56', '"abbcabc" : ".*ab\{2,2\}c"', {OUT => '4'}], + ['bre57', '"abbcabc" : ".*ab\{2,4\}c"', {OUT => '4'}], + ['bre58', '"aa" : "a\\{1\\}\\{1\\}"', {OUT => '1'}], + ['bre59', '"aa" : "a*\\{1\\}"', {OUT => '2'}], + ['bre60', '"aa" : "a\\{1\\}*"', {OUT => '2'}], + ['bre61', '"acd" : "a\\(b\\)?c\\1d"', {OUT => ''}, {EXIT => 1}], + ['bre62', '-- "-5" : "-\\{0,1\\}[0-9]*\$"', {OUT => '2'}], + + ['fail-b', '9 9', {ERR => "$prog: syntax error\n"}, + {EXIT => 2}], + ['fail-c', {ERR => "$prog: missing operand\n" + . "Try '$prog --help' for more information.\n"}, + {EXIT => 2}], + + ['bignum-add', "$big + 1", {OUT => $big_p1}], + ['bignum-add2', "$big + $big_p1", {OUT => $big_sum}], + ['bignum-sub', "$big_p1 - 1", {OUT => $big}], + ['bignum-sub2', "$big_sum - $big", {OUT => $big_p1}], + ['bignum-mul', "$big_p1 '*' $big", {OUT => $big_prod}], + ['bignum-div', "$big_prod / $big", {OUT => $big_p1}], + ); + +# If using big numbers fails, remove all /^bignum-/ tests +qx!expr $big_prod '*' $big_prod '*' $big_prod! + or @Tests = grep {$_->[0] !~ /^bignum-/} @Tests; + +# Append a newline to end of each expected 'OUT' string. +my $t; +foreach $t (@Tests) + { + my $arg1 = $t->[1]; + my $e; + foreach $e (@$t) + { + $e->{OUT} .= "\n" + if ref $e eq 'HASH' and exists $e->{OUT}; + } + } + +my $save_temps = $ENV{SAVE_TEMPS}; +my $verbose = $ENV{VERBOSE}; + +my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); +exit $fail; diff --git a/tests/misc/factor b/tests/misc/factor deleted file mode 100755 index 47f93430..00000000 --- a/tests/misc/factor +++ /dev/null @@ -1,99 +0,0 @@ -#!/usr/bin/perl -# Basic tests for "factor". - -# Copyright (C) 1998-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 -# 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; - -(my $program_name = $0) =~ s|.*/||; -my $prog = 'factor'; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -my @Tests = - ( - ['1', '9', {OUT => '3 3'}], - ['1a', '7', {OUT => '7'}], - ['2', '4294967291', {OUT => '4294967291'}], - ['3', '4294967292', {OUT => '2 2 3 3 7 11 31 151 331'}], - ['4', '4294967293', {OUT => '9241 464773'}], - - ['a', '4294966201', {OUT => '12197 352133'}], - ['b', '4294966339', {OUT => '13187 325697'}], - ['c', '4294966631', {OUT => '13729 312839'}], - ['d', '4294966457', {OUT => '14891 288427'}], - ['e', '4294966759', {OUT => '21649 198391'}], - ['f', '4294966573', {OUT => '23071 186163'}], - ['g', '4294967101', {OUT => '23603 181967'}], - ['h', '4294966519', {OUT => '34583 124193'}], - ['i', '4294966561', {OUT => '36067 119083'}], - ['j', '4294966901', {OUT => '37747 113783'}], - ['k', '4294966691', {OUT => '39241 109451'}], - ['l', '4294966969', {OUT => '44201 97169'}], - ['m', '4294967099', {OUT => '44483 96553'}], - ['n', '4294966271', {OUT => '44617 96263'}], - ['o', '4294966789', {OUT => '50411 85199'}], - ['p', '4294966189', {OUT => '53197 80737'}], - ['q', '4294967213', {OUT => '57139 75167'}], - ['s', '4294967071', {OUT => '65521 65551'}], - ['t', '4294966194', {OUT => '2 3 3 3 3 3 3 3 53 97 191'}], - ['u', '4294966272', {OUT => '2 2 2 2 2 2 2 2 2 2 3 23 89 683'}], - ['v', '4294966400', {OUT => '2 2 2 2 2 2 2 5 5 1342177'}], - ['w', '4294966464', {OUT => '2 2 2 2 2 2 3 3 3 2485513'}], - ['x', '4294966896', {OUT => '2 2 2 2 3 3 3 11 607 1489'}], - ['y', '4294966998', {OUT => '2 3 7 3917 26107'}], - ['z', '-1', - # Map newer glibc diagnostic to expected. - # Also map OpenBSD 5.1's "unknown option" to expected "invalid option". - {ERR_SUBST => q!s/'1'/1/;s/unknown/invalid/!}, - {ERR => "$prog: invalid option -- 1\n" - . "Try '$prog --help' for more information.\n"}, - {EXIT => 1}], - ['cont', 'a 4', - {OUT => "4: 2 2\n"}, - {ERR => "$prog: 'a' is not a valid positive integer\n"}, - {EXIT => 1}], - ); - -# Prepend the command line argument and append a newline to end -# of each expected 'OUT' string. -my $t; - -Test: -foreach $t (@Tests) - { - my $arg1 = $t->[1]; - - # Don't fiddle with expected OUT string if there's a nonzero exit status. - foreach my $e (@$t) - { - ref $e eq 'HASH' && exists $e->{EXIT} && $e->{EXIT} - and next Test; - } - - foreach my $e (@$t) - { - ref $e eq 'HASH' && exists $e->{OUT} - and $e->{OUT} = "$arg1: $e->{OUT}\n" - } - } - -my $save_temps = $ENV{SAVE_TEMPS}; -my $verbose = $ENV{VERBOSE}; - -my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); -exit $fail; diff --git a/tests/misc/factor.pl b/tests/misc/factor.pl new file mode 100755 index 00000000..042a8469 --- /dev/null +++ b/tests/misc/factor.pl @@ -0,0 +1,115 @@ +#!/usr/bin/perl +# Basic tests for "factor". + +# Copyright (C) 1998-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/>. + +use strict; + +(my $program_name = $0) =~ s|.*/||; +my $prog = 'factor'; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +my @Tests = + ( + ['1', '9', {OUT => '3 3'}], + ['1a', '7', {OUT => '7'}], + ['1b', ' +7', {OUT => '7'}], + ['2', '4294967291', {OUT => '4294967291'}], + ['3', '4294967292', {OUT => '2 2 3 3 7 11 31 151 331'}], + ['4', '4294967293', {OUT => '9241 464773'}], + + ['a', '4294966201', {OUT => '12197 352133'}], + ['b', '4294966339', {OUT => '13187 325697'}], + ['c', '4294966631', {OUT => '13729 312839'}], + ['d', '4294966457', {OUT => '14891 288427'}], + ['e', '4294966759', {OUT => '21649 198391'}], + ['f', '4294966573', {OUT => '23071 186163'}], + ['g', '4294967101', {OUT => '23603 181967'}], + ['h', '4294966519', {OUT => '34583 124193'}], + ['i', '4294966561', {OUT => '36067 119083'}], + ['j', '4294966901', {OUT => '37747 113783'}], + ['k', '4294966691', {OUT => '39241 109451'}], + ['l', '4294966969', {OUT => '44201 97169'}], + ['m', '4294967099', {OUT => '44483 96553'}], + ['n', '4294966271', {OUT => '44617 96263'}], + ['o', '4294966789', {OUT => '50411 85199'}], + ['p', '4294966189', {OUT => '53197 80737'}], + ['q', '4294967213', {OUT => '57139 75167'}], + ['s', '4294967071', {OUT => '65521 65551'}], + ['t', '4294966194', {OUT => '2 3 3 3 3 3 3 3 53 97 191'}], + ['u', '4294966272', {OUT => '2 2 2 2 2 2 2 2 2 2 3 23 89 683'}], + ['v', '4294966400', {OUT => '2 2 2 2 2 2 2 5 5 1342177'}], + ['w', '4294966464', {OUT => '2 2 2 2 2 2 3 3 3 2485513'}], + ['x', '4294966896', {OUT => '2 2 2 2 3 3 3 11 607 1489'}], + ['y', '4294966998', {OUT => '2 3 7 3917 26107'}], + ['z', '-1', + # Map newer glibc diagnostic to expected. + # Also map OpenBSD 5.1's "unknown option" to expected "invalid option". + {ERR_SUBST => q!s/'1'/1/;s/unknown/invalid/!}, + {ERR => "$prog: invalid option -- 1\n" + . "Try '$prog --help' for more information.\n"}, + {EXIT => 1}], + ['cont', 'a 4', + {OUT => "4: 2 2\n"}, + {ERR => "$prog: 'a' is not a valid positive integer\n"}, + {EXIT => 1}], + ['bug-2012-a', '465658903', {OUT => '15259 30517'}], + ['bug-2012-b', '2242724851', {OUT => '33487 66973'}], + ['bug-2012-c', '6635692801', {OUT => '57601 115201'}], + ['bug-2012-d', '17709149503', {OUT => '94099 188197'}], + ['bug-2012-e', '17754345703', {OUT => '94219 188437'}], + ); + +# If we have GMP support, append tests to exercise it. +(system "grep '^#define HAVE_GMP 1' $ENV{CONFIG_HEADER} > /dev/null") == 0 + and push (@Tests, + ['bug-gmp-2_sup_128', '340282366920938463463374607431768211456', + {OUT => '2 'x127 . '2'}], + ['bug-gmp-2_sup_256', + '115792089237316195423570985008687907853' + . '269984665640564039457584007913129639936', + {OUT => '2 'x255 . '2'}]); + +# Prepend the command line argument and append a newline to end +# of each expected 'OUT' string. +my $t; + +Test: +foreach $t (@Tests) + { + (my $arg1 = $t->[1]) =~ s| *\+?||; + + # Don't fiddle with expected OUT string if there's a nonzero exit status. + foreach my $e (@$t) + { + ref $e eq 'HASH' && exists $e->{EXIT} && $e->{EXIT} + and next Test; + } + + foreach my $e (@$t) + { + ref $e eq 'HASH' && exists $e->{OUT} + and $e->{OUT} = "$arg1: $e->{OUT}\n" + } + } + +my $save_temps = $ENV{SAVE_TEMPS}; +my $verbose = $ENV{VERBOSE}; + +my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); +exit $fail; diff --git a/tests/misc/false-status b/tests/misc/false-status deleted file mode 100755 index d192bbd7..00000000 --- a/tests/misc/false-status +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -# ensure that false exits nonzero even with --help or --version - -# Copyright (C) 2003-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ false - -false --version > /dev/null && fail=1 -false --help > /dev/null && fail=1 - -Exit $fail diff --git a/tests/misc/false-status.sh b/tests/misc/false-status.sh new file mode 100755 index 00000000..33afc0f3 --- /dev/null +++ b/tests/misc/false-status.sh @@ -0,0 +1,25 @@ +#!/bin/sh +# ensure that false exits nonzero even with --help or --version + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ false + +false --version > /dev/null && fail=1 +false --help > /dev/null && fail=1 + +Exit $fail diff --git a/tests/misc/fold b/tests/misc/fold deleted file mode 100755 index 8291a70e..00000000 --- a/tests/misc/fold +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/perl -# Exercise fold. - -# Copyright (C) 2003-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 -# 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; - -(my $program_name = $0) =~ s|.*/||; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -my @Tests = - ( - ['s1', '-w2 -s', {IN=>"a\t"}, {OUT=>"a\n\t"}], - ['s2', '-w4 -s', {IN=>"abcdef d\n"}, {OUT=>"abcd\nef d\n"}], - ['s3', '-w4 -s', {IN=>"a cd fgh\n"}, {OUT=>"a \ncd \nfgh\n"}], - ['s4', '-w4 -s', {IN=>"abc ef\n"}, {OUT=>"abc \nef\n"}], - ); - -my $save_temps = $ENV{DEBUG}; -my $verbose = $ENV{VERBOSE}; - -my $prog = 'fold'; -my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); -exit $fail; diff --git a/tests/misc/fold.pl b/tests/misc/fold.pl new file mode 100755 index 00000000..1d197bb4 --- /dev/null +++ b/tests/misc/fold.pl @@ -0,0 +1,39 @@ +#!/usr/bin/perl +# Exercise fold. + +# 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/>. + +use strict; + +(my $program_name = $0) =~ s|.*/||; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +my @Tests = + ( + ['s1', '-w2 -s', {IN=>"a\t"}, {OUT=>"a\n\t"}], + ['s2', '-w4 -s', {IN=>"abcdef d\n"}, {OUT=>"abcd\nef d\n"}], + ['s3', '-w4 -s', {IN=>"a cd fgh\n"}, {OUT=>"a \ncd \nfgh\n"}], + ['s4', '-w4 -s', {IN=>"abc ef\n"}, {OUT=>"abc \nef\n"}], + ); + +my $save_temps = $ENV{DEBUG}; +my $verbose = $ENV{VERBOSE}; + +my $prog = 'fold'; +my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); +exit $fail; diff --git a/tests/misc/groups-dash b/tests/misc/groups-dash deleted file mode 100755 index 24e7b9a7..00000000 --- a/tests/misc/groups-dash +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# ensure groups handles -- sanely - -# Copyright (C) 2007-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ groups -require_built_ groups - -# Coreutils 6.9 and earlier failed to display information on first argument -# if later argument was --. -groups none -- > out 2>&1 && fail=1 -echo $? >> out -groups -- none -- > exp 2>&1 && fail=1 -echo $? >> exp - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/misc/groups-dash.sh b/tests/misc/groups-dash.sh new file mode 100755 index 00000000..598c3164 --- /dev/null +++ b/tests/misc/groups-dash.sh @@ -0,0 +1,32 @@ +#!/bin/sh +# ensure groups handles -- sanely + +# Copyright (C) 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ groups +require_built_ groups + +# Coreutils 6.9 and earlier failed to display information on first argument +# if later argument was --. +groups none -- > out 2>&1 && fail=1 +echo $? >> out +groups -- none -- > exp 2>&1 && fail=1 +echo $? >> exp + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/misc/groups-version b/tests/misc/groups-version deleted file mode 100755 index 9a8bf392..00000000 --- a/tests/misc/groups-version +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# ensure groups --version output is similar to id --version - -# Copyright (C) 2007-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ groups -require_built_ groups - -groups --version | sed 's/^groups/id/; /^$/q' > out || fail=1 -id --version | sed '/^$/q' > exp || fail=1 - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/misc/groups-version.sh b/tests/misc/groups-version.sh new file mode 100755 index 00000000..5f87b325 --- /dev/null +++ b/tests/misc/groups-version.sh @@ -0,0 +1,28 @@ +#!/bin/sh +# ensure groups --version output is similar to id --version + +# Copyright (C) 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ groups +require_built_ groups + +groups --version | sed 's/^groups/id/; /^$/q' > out || fail=1 +id --version | sed '/^$/q' > exp || fail=1 + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/misc/head b/tests/misc/head deleted file mode 100755 index 2355e6ab..00000000 --- a/tests/misc/head +++ /dev/null @@ -1,83 +0,0 @@ -#!/usr/bin/perl -# test head - -# Copyright (C) 2008-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 -# 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; - -my $prog = 'head'; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -my $in = join ('', map { "$_\n" } 0..600); -my $in_1024 = substr $in, 0, 1024; - -# FIXME: set this properly -my $x32_bit_long = 0; - -my @Tests = -( - ['idem-0', {IN=>''}, {OUT=>''}], - ['idem-1', {IN=>'a'}, {OUT=>'a'}], - ['idem-2', {IN=>"\n"}, {OUT=>"\n"}], - ['idem-3', {IN=>"a\n"}, {OUT=>"a\n"}], - - ['basic-10', - {IN=>"1\n2\n3\n4\n5\n6\n7\n8\n9\n0\n"}, - {OUT=>"1\n2\n3\n4\n5\n6\n7\n8\n9\n0\n"}], - - ['basic-09', - {IN=>"1\n2\n3\n4\n5\n6\n7\n8\n9\n"}, - {OUT=>"1\n2\n3\n4\n5\n6\n7\n8\n9\n"}], - - ['basic-11', - {IN=>"1\n2\n3\n4\n5\n6\n7\n8\n9\n0\nb\n"}, - {OUT=>"1\n2\n3\n4\n5\n6\n7\n8\n9\n0\n"}], - - ['obs-0', '-1', {IN=>"1\n2\n"}, {OUT=>"1\n"}], - ['obs-1', '-1c', {IN=>''}, {OUT=>''}], - ['obs-2', '-1c', {IN=>'12'}, {OUT=>'1'}], - ['obs-3', '-14c', {IN=>'1234567890abcdefg'}, {OUT=>'1234567890abcd'}], - ['obs-4', '-2b', {IN=>$in}, {OUT=>$in_1024}], - ['obs-5', '-1k', {IN=>$in}, {OUT=>$in_1024}], - - # This test fails for textutils-1.22, because head let 4096m overflow to 0 - # and did not fail. Now head fails with a diagnostic. - # Disable this test because it fails on systems with 64-bit uintmax_t. - # ['fail-0', qw(-n 4096m), {IN=>"a\n"}, {EXIT=>1}], - - # In spite of its name, this test passes -- just to contrast with the above. - ['fail-1', qw(-n 2048m), {IN=>"a\n"}, {OUT=>"a\n"}], - - # Make sure we don't break like AIX 4.3.1 on files with \0 in them. - ['null-1', {IN=>"a\0a\n"}, {OUT=>"a\0a\n"}], - - # Make sure counts are interpreted as decimal. - # Before 2.0f, these would have been interpreted as octal - ['no-oct-1', '-08', {IN=>"\n"x12}, {OUT=>"\n"x8}], - ['no-oct-2', '-010', {IN=>"\n"x12}, {OUT=>"\n"x10}], - ['no-oct-3', '-n 08', {IN=>"\n"x12}, {OUT=>"\n"x8}], - ['no-oct-4', '-c 08', {IN=>"\n"x12}, {OUT=>"\n"x8}], -); - -@Tests = triple_test \@Tests; - -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/head-c b/tests/misc/head-c deleted file mode 100755 index 32f86d2f..00000000 --- a/tests/misc/head-c +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# exercise the fix of 2001-08-18, based on test case from Ian Bruce - -# Copyright (C) 2001-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ head - -echo abc > in || framework_failure_ - -(head -c1; head -c1) < in > out || fail=1 -case "$(cat out)" in - ab) ;; - *) fail=1 ;; -esac - -Exit $fail diff --git a/tests/misc/head-c.sh b/tests/misc/head-c.sh new file mode 100755 index 00000000..6807c4d5 --- /dev/null +++ b/tests/misc/head-c.sh @@ -0,0 +1,30 @@ +#!/bin/sh +# exercise the fix of 2001-08-18, based on test case from Ian Bruce + +# Copyright (C) 2001-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ head + +echo abc > in || framework_failure_ + +(head -c1; head -c1) < in > out || fail=1 +case "$(cat out)" in + ab) ;; + *) fail=1 ;; +esac + +Exit $fail diff --git a/tests/misc/head-elide-tail b/tests/misc/head-elide-tail deleted file mode 100755 index de4896bc..00000000 --- a/tests/misc/head-elide-tail +++ /dev/null @@ -1,107 +0,0 @@ -#!/usr/bin/perl -# Exercise head's --bytes=-N option. - -# Copyright (C) 2003-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 -# 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; - -(my $program_name = $0) =~ s|.*/||; - -$ENV{PROG} = 'head'; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -# This should match the definition in head.c. -my $READ_BUFSIZE = 4096; - -my @Tests = - ( - # Elide the exact size of the file. - ['elide-b1', "--bytes=-2", {IN=>"a\n"}, {OUT=>''}], - # Elide more than the size of the file. - ['elide-b2', "--bytes=-2", {IN=>"a"}, {OUT=>''}], - # Leave just one byte. - ['elide-b3', "--bytes=-2", {IN=>"abc"}, {OUT=>'a'}], - # Make it so the elided bytes straddle the end of the first - # $READ_BUFSIZE block. - ['elide-b4', "--bytes=-2", - {IN=> 'a' x ($READ_BUFSIZE-3) . "\nbcd"}, - {OUT=>'a' x ($READ_BUFSIZE-3) . "\nb"}], - # Make it so the elided bytes straddle the end of the 2nd - # $READ_BUFSIZE block. - ['elide-b5', "--bytes=-2", - {IN=> 'a' x (2 * $READ_BUFSIZE - 2) . 'bcd'}, - {OUT=>'a' x (2 * $READ_BUFSIZE - 2) . 'b'}], - - ['elide-l0', "--lines=-1", {IN=>''}, {OUT=>''}], - ['elide-l1', "--lines=-1", {IN=>"a\n"}, {OUT=>''}], - ['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"}], - ); - -if ($ENV{RUN_EXPENSIVE_TESTS}) - { - # Brute force: use all combinations of file sizes [0..20] and - # number of bytes to elide [0..20]. For better coverage, recompile - # head with -DHEAD_TAIL_PIPE_READ_BUFSIZE=4 and - # -DHEAD_TAIL_PIPE_BYTECOUNT_THRESHOLD=8 - my $s = "abcdefghijklmnopqrst"; - for my $file_size (0..20) - { - for my $n_elide (0..20) - { - my $input = substr $s, 0, $file_size; - my $out_len = $n_elide < $file_size ? $file_size - $n_elide : 0; - my $output = substr $input, 0, $out_len; - my $t = ["elideb$file_size-$n_elide", "--bytes=-$n_elide", - {IN=>$input}, {OUT=>$output}]; - push @Tests, $t; - my @u = @$t; - # Insert the ---presume-input-pipe option. - $u[0] .= 'p'; - $u[1] .= ' ---presume-input-pipe'; - push @Tests, \@u; - } - } - - $s =~ s/(.)/$1\n/g; - for my $file_size (0..20) - { - for my $n_elide (0..20) - { - my $input = substr $s, 0, 2 * $file_size; - my $out_len = $n_elide < $file_size ? $file_size - $n_elide : 0; - my $output = substr $input, 0, 2 * $out_len; - my $t = ["elidel$file_size-$n_elide", "--lines=-$n_elide", - {IN=>$input}, {OUT=>$output}]; - push @Tests, $t; - my @u = @$t; - # Insert the ---presume-input-pipe option. - $u[0] .= 'p'; - $u[1] .= ' ---presume-input-pipe'; - push @Tests, \@u; - } - } - } - -my $save_temps = $ENV{DEBUG}; -my $verbose = $ENV{VERBOSE}; - -my $prog = $ENV{PROG} || die "$0: \$PROG not specified in environment\n"; -my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); -exit $fail; diff --git a/tests/misc/head-elide-tail.pl b/tests/misc/head-elide-tail.pl new file mode 100755 index 00000000..71e00c6c --- /dev/null +++ b/tests/misc/head-elide-tail.pl @@ -0,0 +1,107 @@ +#!/usr/bin/perl +# Exercise head's --bytes=-N option. + +# 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/>. + +use strict; + +(my $program_name = $0) =~ s|.*/||; + +$ENV{PROG} = 'head'; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +# This should match the definition in head.c. +my $READ_BUFSIZE = 8192; + +my @Tests = + ( + # Elide the exact size of the file. + ['elide-b1', "--bytes=-2", {IN=>"a\n"}, {OUT=>''}], + # Elide more than the size of the file. + ['elide-b2', "--bytes=-2", {IN=>"a"}, {OUT=>''}], + # Leave just one byte. + ['elide-b3', "--bytes=-2", {IN=>"abc"}, {OUT=>'a'}], + # Make it so the elided bytes straddle the end of the first + # $READ_BUFSIZE block. + ['elide-b4', "--bytes=-2", + {IN=> 'a' x ($READ_BUFSIZE-3) . "\nbcd"}, + {OUT=>'a' x ($READ_BUFSIZE-3) . "\nb"}], + # Make it so the elided bytes straddle the end of the 2nd + # $READ_BUFSIZE block. + ['elide-b5', "--bytes=-2", + {IN=> 'a' x (2 * $READ_BUFSIZE - 2) . 'bcd'}, + {OUT=>'a' x (2 * $READ_BUFSIZE - 2) . 'b'}], + + ['elide-l0', "--lines=-1", {IN=>''}, {OUT=>''}], + ['elide-l1', "--lines=-1", {IN=>"a\n"}, {OUT=>''}], + ['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"}], + ); + +if ($ENV{RUN_EXPENSIVE_TESTS}) + { + # Brute force: use all combinations of file sizes [0..20] and + # number of bytes to elide [0..20]. For better coverage, recompile + # head with -DHEAD_TAIL_PIPE_READ_BUFSIZE=4 and + # -DHEAD_TAIL_PIPE_BYTECOUNT_THRESHOLD=8 + my $s = "abcdefghijklmnopqrst"; + for my $file_size (0..20) + { + for my $n_elide (0..20) + { + my $input = substr $s, 0, $file_size; + my $out_len = $n_elide < $file_size ? $file_size - $n_elide : 0; + my $output = substr $input, 0, $out_len; + my $t = ["elideb$file_size-$n_elide", "--bytes=-$n_elide", + {IN=>$input}, {OUT=>$output}]; + push @Tests, $t; + my @u = @$t; + # Insert the ---presume-input-pipe option. + $u[0] .= 'p'; + $u[1] .= ' ---presume-input-pipe'; + push @Tests, \@u; + } + } + + $s =~ s/(.)/$1\n/g; + for my $file_size (0..20) + { + for my $n_elide (0..20) + { + my $input = substr $s, 0, 2 * $file_size; + my $out_len = $n_elide < $file_size ? $file_size - $n_elide : 0; + my $output = substr $input, 0, 2 * $out_len; + my $t = ["elidel$file_size-$n_elide", "--lines=-$n_elide", + {IN=>$input}, {OUT=>$output}]; + push @Tests, $t; + my @u = @$t; + # Insert the ---presume-input-pipe option. + $u[0] .= 'p'; + $u[1] .= ' ---presume-input-pipe'; + push @Tests, \@u; + } + } + } + +my $save_temps = $ENV{DEBUG}; +my $verbose = $ENV{VERBOSE}; + +my $prog = $ENV{PROG} || die "$0: \$PROG not specified in environment\n"; +my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); +exit $fail; diff --git a/tests/misc/head-pos b/tests/misc/head-pos deleted file mode 100755 index 3d96261f..00000000 --- a/tests/misc/head-pos +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# When reading a specified number of lines, ensure that the output -# file pointer is positioned just after those lines. - -# Copyright (C) 2002-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ head - -(echo a; echo b) > in || framework_failure_ - -(head -n 1 >/dev/null; cat) < in > out || fail=1 -cat <<EOF > exp -b -EOF - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/misc/head-pos.sh b/tests/misc/head-pos.sh new file mode 100755 index 00000000..cb08d72e --- /dev/null +++ b/tests/misc/head-pos.sh @@ -0,0 +1,44 @@ +#!/bin/sh +# 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. + +# This 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 + +(echo a; echo b) > in || framework_failure_ +echo b > exp || framework_failure_ + +for i in -1 1; do + (head -n $i >/dev/null; cat) < in > out || fail=1 + compare exp out || fail=1 +done + +# Exercise the (start_pos < pos) block in elide_tail_lines_seekable. +# So far, this is the only test to do that. +# Do that by creating a file larger than BUFSIZ (I've seen 128K) and +# elide a suffix of it (by line count) that is also larger than BUFSIZ. +# 50000 lines times 6 bytes per line gives us enough leeway even on a +# system with a BUFSIZ of 256K. +n_lines=50000 +seq 70000 > in2 || framework_failure_ +echo $n_lines > exp-n || framework_failure_ + +(head -n-$n_lines>/dev/null; wc -l) < in2 > n +compare exp-n n || fail=1 + +Exit $fail diff --git a/tests/misc/head.pl b/tests/misc/head.pl new file mode 100755 index 00000000..d92a0a5c --- /dev/null +++ b/tests/misc/head.pl @@ -0,0 +1,83 @@ +#!/usr/bin/perl +# test head + +# 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/>. + +use strict; + +my $prog = 'head'; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +my $in = join ('', map { "$_\n" } 0..600); +my $in_1024 = substr $in, 0, 1024; + +# FIXME: set this properly +my $x32_bit_long = 0; + +my @Tests = +( + ['idem-0', {IN=>''}, {OUT=>''}], + ['idem-1', {IN=>'a'}, {OUT=>'a'}], + ['idem-2', {IN=>"\n"}, {OUT=>"\n"}], + ['idem-3', {IN=>"a\n"}, {OUT=>"a\n"}], + + ['basic-10', + {IN=>"1\n2\n3\n4\n5\n6\n7\n8\n9\n0\n"}, + {OUT=>"1\n2\n3\n4\n5\n6\n7\n8\n9\n0\n"}], + + ['basic-09', + {IN=>"1\n2\n3\n4\n5\n6\n7\n8\n9\n"}, + {OUT=>"1\n2\n3\n4\n5\n6\n7\n8\n9\n"}], + + ['basic-11', + {IN=>"1\n2\n3\n4\n5\n6\n7\n8\n9\n0\nb\n"}, + {OUT=>"1\n2\n3\n4\n5\n6\n7\n8\n9\n0\n"}], + + ['obs-0', '-1', {IN=>"1\n2\n"}, {OUT=>"1\n"}], + ['obs-1', '-1c', {IN=>''}, {OUT=>''}], + ['obs-2', '-1c', {IN=>'12'}, {OUT=>'1'}], + ['obs-3', '-14c', {IN=>'1234567890abcdefg'}, {OUT=>'1234567890abcd'}], + ['obs-4', '-2b', {IN=>$in}, {OUT=>$in_1024}], + ['obs-5', '-1k', {IN=>$in}, {OUT=>$in_1024}], + + # This test fails for textutils-1.22, because head let 4096m overflow to 0 + # and did not fail. Now head fails with a diagnostic. + # Disable this test because it fails on systems with 64-bit uintmax_t. + # ['fail-0', qw(-n 4096m), {IN=>"a\n"}, {EXIT=>1}], + + # In spite of its name, this test passes -- just to contrast with the above. + ['fail-1', qw(-n 2048m), {IN=>"a\n"}, {OUT=>"a\n"}], + + # Make sure we don't break like AIX 4.3.1 on files with \0 in them. + ['null-1', {IN=>"a\0a\n"}, {OUT=>"a\0a\n"}], + + # Make sure counts are interpreted as decimal. + # Before 2.0f, these would have been interpreted as octal + ['no-oct-1', '-08', {IN=>"\n"x12}, {OUT=>"\n"x8}], + ['no-oct-2', '-010', {IN=>"\n"x12}, {OUT=>"\n"x10}], + ['no-oct-3', '-n 08', {IN=>"\n"x12}, {OUT=>"\n"x8}], + ['no-oct-4', '-c 08', {IN=>"\n"x12}, {OUT=>"\n"x8}], +); + +@Tests = triple_test \@Tests; + +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/help-version b/tests/misc/help-version deleted file mode 100755 index 7416062f..00000000 --- a/tests/misc/help-version +++ /dev/null @@ -1,283 +0,0 @@ -#! /bin/sh -# Make sure all these programs work properly -# when invoked with --help or --version. - -# Copyright (C) 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 -# 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/>. - -# Ensure that $SHELL is set to *some* value and exported. -# This is required for dircolors, which would fail e.g., when -# invoked via debuild (which removes SHELL from the environment). -test "x$SHELL" = x && SHELL=/bin/sh -export SHELL - -. "${srcdir=.}/init.sh"; path_prepend_ ../src - -expected_failure_status_chroot=125 -expected_failure_status_env=125 -expected_failure_status_nice=125 -expected_failure_status_nohup=125 -expected_failure_status_stdbuf=125 -expected_failure_status_su=125 -expected_failure_status_timeout=125 -expected_failure_status_printenv=2 -expected_failure_status_tty=3 -expected_failure_status_sort=2 -expected_failure_status_expr=3 -expected_failure_status_lbracket=2 -expected_failure_status_dir=2 -expected_failure_status_ls=2 -expected_failure_status_vdir=2 - -expected_failure_status_cmp=2 -expected_failure_status_zcmp=2 -expected_failure_status_sdiff=2 -expected_failure_status_diff3=2 -expected_failure_status_diff=2 -expected_failure_status_zdiff=2 -expected_failure_status_zgrep=2 -expected_failure_status_zegrep=2 -expected_failure_status_zfgrep=2 - -expected_failure_status_grep=2 -expected_failure_status_egrep=2 -expected_failure_status_fgrep=2 - -test "$built_programs" \ - || fail_ "built_programs not specified!?!" - -test "$VERSION" \ - || fail_ "set envvar VERSION; it is required for a PATH sanity-check" - -# Extract version from --version output of the first program -for i in $built_programs; do - v=$(env $i --version | sed -n '1s/.* //p;q') - break -done - -# Ensure that it matches $VERSION. -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 - - # 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 - fi - done -done - -bigZ_in=bigZ-in.Z -zin=zin.gz -zin2=zin2.gz - -tmp=tmp-$$ -tmp_in=in-$$ -tmp_in2=in2-$$ -tmp_dir=dir-$$ -tmp_out=out-$$ -mkdir $tmp || fail=1 -cd $tmp || fail=1 - -comm_setup () { args="$tmp_in $tmp_in"; } -csplit_setup () { args="$tmp_in //"; } -cut_setup () { args='-f 1'; } -join_setup () { args="$tmp_in $tmp_in"; } -tr_setup () { args='a a'; } - -chmod_setup () { args="a+x $tmp_in"; } -# Punt on these. -chgrp_setup () { args=--version; } -chown_setup () { args=--version; } -mkfifo_setup () { args=--version; } -mknod_setup () { args=--version; } -# Punt on uptime, since it fails (e.g., failing to get boot time) -# on some systems, and we shouldn't let that stop 'make check'. -uptime_setup () { args=--version; } - -# Create a file in the current directory, not in $TMPDIR. -mktemp_setup () { args=mktemp.XXXX; } - -cmp_setup () { args="$tmp_in $tmp_in2"; } - -# Tell dd not to print the line with transfer rate and total. -# The transfer rate would vary between runs. -dd_setup () { args=status=noxfer; } - -zdiff_setup () { args="$zin $zin2"; } -zcmp_setup () { args="$zin $zin2"; } -zcat_setup () { args=$zin; } -gunzip_setup () { args=$zin; } -zmore_setup () { args=$zin; } -zless_setup () { args=$zin; } -znew_setup () { args=$bigZ_in; } -zforce_setup () { args=$zin; } -zgrep_setup () { args="z $zin"; } -zegrep_setup () { args="z $zin"; } -zfgrep_setup () { args="z $zin"; } -gzexe_setup () { args=$tmp_in; } - -# We know that $tmp_in contains a "0" -grep_setup () { args="0 $tmp_in"; } -egrep_setup () { args="0 $tmp_in"; } -fgrep_setup () { args="0 $tmp_in"; } - -diff_setup () { args="$tmp_in $tmp_in2"; } -sdiff_setup () { args="$tmp_in $tmp_in2"; } -diff3_setup () { args="$tmp_in $tmp_in2 $tmp_in2"; } -cp_setup () { args="$tmp_in $tmp_in2"; } -ln_setup () { args="$tmp_in ln-target"; } -ginstall_setup () { args="$tmp_in $tmp_in2"; } -mv_setup () { args="$tmp_in $tmp_in2"; } -mkdir_setup () { args=$tmp_dir/subdir; } -realpath_setup () { args=$tmp_in; } -rmdir_setup () { args=$tmp_dir; } -rm_setup () { args=$tmp_in; } -shred_setup () { args=$tmp_in; } -touch_setup () { args=$tmp_in2; } -truncate_setup () { args="--reference=$tmp_in $tmp_in2"; } - -mkid_setup () { printf 'f(){}\ntypedef int t;\n' > f.c; args=. ; } -lid_setup () { args=; } -fid_setup () { args=f.c; } -fnid_setup () { args=; } -xtokid_setup () { args=; } -aid_setup () { args=f; } -eid_setup () { args=--version; } -gid_setup () { args=f; } -defid_setup () { args=t; } - -basename_setup () { args=$tmp_in; } -dirname_setup () { args=$tmp_in; } -expr_setup () { args=foo; } - -# Punt, in case GNU 'id' hasn't been installed yet. -groups_setup () { args=--version; } - -pathchk_setup () { args=$tmp_in; } -yes_setup () { args=--version; } -logname_setup () { args=--version; } -nohup_setup () { args=--version; } -printf_setup () { args=foo; } -seq_setup () { args=10; } -sleep_setup () { args=0; } -su_setup () { args=--version; } -stdbuf_setup () { args="-oL true"; } -timeout_setup () { args=--version; } - -# I'd rather not run sync, since it spins up disks that I've -# deliberately caused to spin down (but not unmounted). -sync_setup () { args=--version; } - -test_setup () { args=foo; } - -# This is necessary in the unusual event that there is -# no valid entry in /etc/mtab. -df_setup () { args=/; } - -# This is necessary in the unusual event that getpwuid (getuid ()) fails. -id_setup () { args=-u; } - -# Use env to avoid invoking built-in sleep of Solaris 11's /bin/sh. -kill_setup () { - env sleep 31.5 & - args=$! -} - -link_setup () { args="$tmp_in link-target"; } -unlink_setup () { args=$tmp_in; } - -readlink_setup () { - ln -s . slink - args=slink; -} - -stat_setup () { args=$tmp_in; } -unlink_setup () { args=$tmp_in; } -lbracket_setup () { args=": ]"; } - -parted_setup () { args="-s $tmp_in mklabel gpt" - dd if=/dev/null of=$tmp_in seek=2000; } - -# Ensure that each program "works" (exits successfully) when doing -# 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 - - rm -rf $tmp_in $tmp_in2 $tmp_dir $tmp_out $bigZ_in $zin $zin2 - echo z |gzip > $zin - cp $zin $zin2 - cp $zin $bigZ_in - - # This is sort of kludgey: use numbers so this is valid input for factor, - # and two tokens so it's valid input for tsort. - echo 2147483647 0 > $tmp_in - # Make $tmp_in2 identical. Then, using $tmp_in and $tmp_in2 as arguments - # to the likes of cmp and diff makes them exit successfully. - cp $tmp_in $tmp_in2 - mkdir $tmp_dir - # echo ================== $i - test $i = [ && prog=lbracket || prog=$(echo $i|sed "s/$EXEEXT$//") - if type ${prog}_setup > /dev/null 2>&1; then - ${prog}_setup - else - args= - fi - if env $i $args < $tmp_in > $tmp_out; then - : # ok - else - echo FAIL: $i - fail=1 - fi - rm -rf $tmp_in $tmp_in2 $tmp_out $tmp_dir -done - -Exit $fail diff --git a/tests/misc/help-version.sh b/tests/misc/help-version.sh new file mode 100755 index 00000000..00f30cd0 --- /dev/null +++ b/tests/misc/help-version.sh @@ -0,0 +1,281 @@ +#! /bin/sh +# Make sure all of these programs work properly +# when invoked with --help or --version. + +# Copyright (C) 2000-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/>. + +# Ensure that $SHELL is set to *some* value and exported. +# This is required for dircolors, which would fail e.g., when +# invoked via debuild (which removes SHELL from the environment). +test "x$SHELL" = x && SHELL=/bin/sh +export SHELL + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src + +expected_failure_status_chroot=125 +expected_failure_status_env=125 +expected_failure_status_nice=125 +expected_failure_status_nohup=125 +expected_failure_status_stdbuf=125 +expected_failure_status_timeout=125 +expected_failure_status_printenv=2 +expected_failure_status_tty=3 +expected_failure_status_sort=2 +expected_failure_status_expr=3 +expected_failure_status_lbracket=2 +expected_failure_status_dir=2 +expected_failure_status_ls=2 +expected_failure_status_vdir=2 + +expected_failure_status_cmp=2 +expected_failure_status_zcmp=2 +expected_failure_status_sdiff=2 +expected_failure_status_diff3=2 +expected_failure_status_diff=2 +expected_failure_status_zdiff=2 +expected_failure_status_zgrep=2 +expected_failure_status_zegrep=2 +expected_failure_status_zfgrep=2 + +expected_failure_status_grep=2 +expected_failure_status_egrep=2 +expected_failure_status_fgrep=2 + +test "$built_programs" \ + || fail_ "built_programs not specified!?!" + +test "$VERSION" \ + || fail_ "set envvar VERSION; it is required for a PATH sanity-check" + +# Extract version from --version output of the first program +for i in $built_programs; do + v=$(env $i --version | sed -n '1s/.* //p;q') + break +done + +# Ensure that it matches $VERSION. +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 + + # 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 + fi + done +done + +bigZ_in=bigZ-in.Z +zin=zin.gz +zin2=zin2.gz + +tmp=tmp-$$ +tmp_in=in-$$ +tmp_in2=in2-$$ +tmp_dir=dir-$$ +tmp_out=out-$$ +mkdir $tmp || fail=1 +cd $tmp || fail=1 + +comm_setup () { args="$tmp_in $tmp_in"; } +csplit_setup () { args="$tmp_in //"; } +cut_setup () { args='-f 1'; } +join_setup () { args="$tmp_in $tmp_in"; } +tr_setup () { args='a a'; } + +chmod_setup () { args="a+x $tmp_in"; } +# Punt on these. +chgrp_setup () { args=--version; } +chown_setup () { args=--version; } +mkfifo_setup () { args=--version; } +mknod_setup () { args=--version; } +# Punt on uptime, since it fails (e.g., failing to get boot time) +# on some systems, and we shouldn't let that stop 'make check'. +uptime_setup () { args=--version; } + +# Create a file in the current directory, not in $TMPDIR. +mktemp_setup () { args=mktemp.XXXX; } + +cmp_setup () { args="$tmp_in $tmp_in2"; } + +# Tell dd not to print the line with transfer rate and total. +# The transfer rate would vary between runs. +dd_setup () { args=status=noxfer; } + +zdiff_setup () { args="$zin $zin2"; } +zcmp_setup () { args="$zin $zin2"; } +zcat_setup () { args=$zin; } +gunzip_setup () { args=$zin; } +zmore_setup () { args=$zin; } +zless_setup () { args=$zin; } +znew_setup () { args=$bigZ_in; } +zforce_setup () { args=$zin; } +zgrep_setup () { args="z $zin"; } +zegrep_setup () { args="z $zin"; } +zfgrep_setup () { args="z $zin"; } +gzexe_setup () { args=$tmp_in; } + +# We know that $tmp_in contains a "0" +grep_setup () { args="0 $tmp_in"; } +egrep_setup () { args="0 $tmp_in"; } +fgrep_setup () { args="0 $tmp_in"; } + +diff_setup () { args="$tmp_in $tmp_in2"; } +sdiff_setup () { args="$tmp_in $tmp_in2"; } +diff3_setup () { args="$tmp_in $tmp_in2 $tmp_in2"; } +cp_setup () { args="$tmp_in $tmp_in2"; } +ln_setup () { args="$tmp_in ln-target"; } +ginstall_setup () { args="$tmp_in $tmp_in2"; } +mv_setup () { args="$tmp_in $tmp_in2"; } +mkdir_setup () { args=$tmp_dir/subdir; } +realpath_setup () { args=$tmp_in; } +rmdir_setup () { args=$tmp_dir; } +rm_setup () { args=$tmp_in; } +shred_setup () { args=$tmp_in; } +touch_setup () { args=$tmp_in2; } +truncate_setup () { args="--reference=$tmp_in $tmp_in2"; } + +mkid_setup () { printf 'f(){}\ntypedef int t;\n' > f.c; args=. ; } +lid_setup () { args=; } +fid_setup () { args=f.c; } +fnid_setup () { args=; } +xtokid_setup () { args=; } +aid_setup () { args=f; } +eid_setup () { args=--version; } +gid_setup () { args=f; } +defid_setup () { args=t; } + +basename_setup () { args=$tmp_in; } +dirname_setup () { args=$tmp_in; } +expr_setup () { args=foo; } + +# Punt, in case GNU 'id' hasn't been installed yet. +groups_setup () { args=--version; } + +pathchk_setup () { args=$tmp_in; } +yes_setup () { args=--version; } +logname_setup () { args=--version; } +nohup_setup () { args=--version; } +printf_setup () { args=foo; } +seq_setup () { args=10; } +sleep_setup () { args=0; } +stdbuf_setup () { args="-oL true"; } +timeout_setup () { args=--version; } + +# I'd rather not run sync, since it spins up disks that I've +# deliberately caused to spin down (but not unmounted). +sync_setup () { args=--version; } + +test_setup () { args=foo; } + +# This is necessary in the unusual event that there is +# no valid entry in /etc/mtab. +df_setup () { args=/; } + +# This is necessary in the unusual event that getpwuid (getuid ()) fails. +id_setup () { args=-u; } + +# Use env to avoid invoking built-in sleep of Solaris 11's /bin/sh. +kill_setup () { + env sleep 31.5 & + args=$! +} + +link_setup () { args="$tmp_in link-target"; } +unlink_setup () { args=$tmp_in; } + +readlink_setup () { + ln -s . slink + args=slink; +} + +stat_setup () { args=$tmp_in; } +unlink_setup () { args=$tmp_in; } +lbracket_setup () { args=": ]"; } + +parted_setup () { args="-s $tmp_in mklabel gpt" + dd if=/dev/null of=$tmp_in seek=2000; } + +# Ensure that each program "works" (exits successfully) when doing +# 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 + + rm -rf $tmp_in $tmp_in2 $tmp_dir $tmp_out $bigZ_in $zin $zin2 + echo z |gzip > $zin + cp $zin $zin2 + cp $zin $bigZ_in + + # This is sort of kludgey: use numbers so this is valid input for factor, + # and two tokens so it's valid input for tsort. + echo 2147483647 0 > $tmp_in + # Make $tmp_in2 identical. Then, using $tmp_in and $tmp_in2 as arguments + # to the likes of cmp and diff makes them exit successfully. + cp $tmp_in $tmp_in2 + mkdir $tmp_dir + # echo ================== $i + test $i = [ && prog=lbracket || prog=$(echo $i|sed "s/$EXEEXT$//") + if type ${prog}_setup > /dev/null 2>&1; then + ${prog}_setup + else + args= + fi + if env $i $args < $tmp_in > $tmp_out; then + : # ok + else + echo FAIL: $i + fail=1 + fi + rm -rf $tmp_in $tmp_in2 $tmp_out $tmp_dir +done + +Exit $fail diff --git a/tests/misc/id-context b/tests/misc/id-context deleted file mode 100755 index 73645a0e..00000000 --- a/tests/misc/id-context +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# Ensure that "id" outputs SELinux context only without specified user -# Copyright (C) 2008-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ id -# Require selinux - when selinux is disabled, id never prints scontext. -require_selinux_ - - -# Check without specified user, context string should be present. -id | grep context= >/dev/null || fail=1 - -# Check with specified user, no context string should be present. -# But if the current user is nameless, skip this part. -id -nu > /dev/null \ - && id $(id -nu) | grep context= >/dev/null && fail=1 - -Exit $fail diff --git a/tests/misc/id-context.sh b/tests/misc/id-context.sh new file mode 100755 index 00000000..dc023033 --- /dev/null +++ b/tests/misc/id-context.sh @@ -0,0 +1,32 @@ +#!/bin/sh +# Ensure that "id" outputs SELinux context only without specified user +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ id +# Require selinux - when selinux is disabled, id never prints scontext. +require_selinux_ + + +# Check without specified user, context string should be present. +id | grep context= >/dev/null || fail=1 + +# Check with specified user, no context string should be present. +# But if the current user is nameless, skip this part. +id -nu > /dev/null \ + && id $(id -nu) | grep context= >/dev/null && fail=1 + +Exit $fail diff --git a/tests/misc/id-groups b/tests/misc/id-groups deleted file mode 100755 index 815dd552..00000000 --- a/tests/misc/id-groups +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# Ensure that "id" outputs groups for a user -# Copyright (C) 2009-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ id - -id -G $(id -nu) || fail=1 - -Exit $fail diff --git a/tests/misc/id-groups.sh b/tests/misc/id-groups.sh new file mode 100755 index 00000000..ff3dc59f --- /dev/null +++ b/tests/misc/id-groups.sh @@ -0,0 +1,23 @@ +#!/bin/sh +# Ensure that "id" outputs groups for a user +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ id + +id -G $(id -nu) || fail=1 + +Exit $fail diff --git a/tests/misc/id-setgid b/tests/misc/id-setgid deleted file mode 100755 index 12fab381..00000000 --- a/tests/misc/id-setgid +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# Verify that id -G prints the right group when run set-GID. - -# Copyright (C) 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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ id -require_root_ - -g=$(id -u $NON_ROOT_USERNAME) || framework_failure_ - -# Construct a different group number. -gp1=$(expr $g + 1) - -echo $gp1 > exp || framework_failure_ - -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 - -Exit $fail diff --git a/tests/misc/id-setgid.sh b/tests/misc/id-setgid.sh new file mode 100755 index 00000000..f29eec07 --- /dev/null +++ b/tests/misc/id-setgid.sh @@ -0,0 +1,34 @@ +#!/bin/sh +# Verify that id -G prints the right group when run set-GID. + +# Copyright (C) 2012-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ id +require_root_ + +g=$(id -u $NON_ROOT_USERNAME) || framework_failure_ + +# Construct a different group number. +gp1=$(expr $g + 1) + +echo $gp1 > exp || framework_failure_ + +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 + +Exit $fail diff --git a/tests/misc/invalid-opt b/tests/misc/invalid-opt deleted file mode 100755 index 8eae3c27..00000000 --- a/tests/misc/invalid-opt +++ /dev/null @@ -1,103 +0,0 @@ -#!/usr/bin/perl -# exercise the 'invalid option' handling code in each program - -# Copyright (C) 2008-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 -# 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/>. - -require 5.003; -use strict; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -my %exit_status = - ( - ls => 2, - dir => 2, - vdir => 2, - test => 2, - chroot => 125, - echo => 0, - env => 125, - expr => 0, - nice => 125, - nohup => 125, - sort => 2, - stdbuf => 125, - su => 125, - test => 0, - timeout => 125, - true => 0, - tty => 2, - printf => 0, - printenv => 2, - ); - -my %expected_out = - ( - echo => "-/\n", - expr => "-/\n", - printf => "-/", - ); - -my %expected_err = - ( - false => '', - stty => '', - ); - -my $fail = 0; -my @built_programs = split ' ', $ENV{built_programs}; -foreach my $prog (@built_programs) - { - $prog eq '[' - and next; - - my $try = "Try '$prog --help' for more information.\n"; - my $x = $exit_status{$prog}; - defined $x - or $x = 1; - - my $out = $expected_out{$prog}; - defined $out - or $out = ''; - - my $err = $expected_err{$prog}; - defined $err - or $err = $x == 0 ? '' : "$prog: invalid option -- /\n$try"; - - # Accommodate different syntax in glibc's getopt - # diagnostics by filtering out single quotes. - # Also accommodate BSD getopt. - my $err_subst = "s,'/',/,; s,unknown,invalid,"; - - # Depending on how this script is run, stty emits different - # diagnostics. Don't bother checking them. - $prog eq 'stty' - and $err_subst = 's/(.|\n)*//ms'; - - my @Tests = (["$prog-invalid-opt", '-/', {OUT=>$out}, - {ERR_SUBST => $err_subst}, - {EXIT=>$x}, {ERR=>$err}]); - - my $save_temps = $ENV{DEBUG}; - my $verbose = $ENV{VERBOSE}; - - my $f = run_tests ($prog, \$prog, \@Tests, $save_temps, $verbose); - $f - and $fail = 1; - } - -exit $fail; diff --git a/tests/misc/invalid-opt.pl b/tests/misc/invalid-opt.pl new file mode 100755 index 00000000..1d7701f0 --- /dev/null +++ b/tests/misc/invalid-opt.pl @@ -0,0 +1,102 @@ +#!/usr/bin/perl +# exercise the 'invalid option' handling code in each program + +# 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/>. + +require 5.003; +use strict; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +my %exit_status = + ( + ls => 2, + dir => 2, + vdir => 2, + test => 2, + chroot => 125, + echo => 0, + env => 125, + expr => 0, + nice => 125, + nohup => 125, + sort => 2, + stdbuf => 125, + test => 0, + timeout => 125, + true => 0, + tty => 2, + printf => 0, + printenv => 2, + ); + +my %expected_out = + ( + echo => "-/\n", + expr => "-/\n", + printf => "-/", + ); + +my %expected_err = + ( + false => '', + stty => '', + ); + +my $fail = 0; +my @built_programs = split ' ', $ENV{built_programs}; +foreach my $prog (@built_programs) + { + $prog eq '[' + and next; + + my $try = "Try '$prog --help' for more information.\n"; + my $x = $exit_status{$prog}; + defined $x + or $x = 1; + + my $out = $expected_out{$prog}; + defined $out + or $out = ''; + + my $err = $expected_err{$prog}; + defined $err + or $err = $x == 0 ? '' : "$prog: invalid option -- /\n$try"; + + # Accommodate different syntax in glibc's getopt + # diagnostics by filtering out single quotes. + # Also accommodate BSD getopt. + my $err_subst = "s,'/',/,; s,unknown,invalid,"; + + # Depending on how this script is run, stty emits different + # diagnostics. Don't bother checking them. + $prog eq 'stty' + and $err_subst = 's/(.|\n)*//ms'; + + my @Tests = (["$prog-invalid-opt", '-/', {OUT=>$out}, + {ERR_SUBST => $err_subst}, + {EXIT=>$x}, {ERR=>$err}]); + + my $save_temps = $ENV{DEBUG}; + my $verbose = $ENV{VERBOSE}; + + my $f = run_tests ($prog, \$prog, \@Tests, $save_temps, $verbose); + $f + and $fail = 1; + } + +exit $fail; diff --git a/tests/misc/join b/tests/misc/join deleted file mode 100755 index a3fd1a8f..00000000 --- a/tests/misc/join +++ /dev/null @@ -1,311 +0,0 @@ -#!/usr/bin/perl -# Test join. - -# Copyright (C) 2008-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 -# 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; - -my $limits = getlimits (); - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -my $prog = 'join'; - -my $delim = chr 0247; -sub t_subst ($) -{ - (my $s = $_[0]) =~ s/:/$delim/g; - return $s; -} - -my @tv = ( -# test name -# flags file-1 file-2 expected output expected return code -# -['1a', '-a1', ["a 1\n", "b\n"], "a 1\n", 0], -['1b', '-a2', ["a 1\n", "b\n"], "b\n", 0], # Got "\n" -['1c', '-a1 -a2', ["a 1\n", "b\n"], "a 1\nb\n", 0], # Got "a 1\n\n" -['1d', '-a1', ["a 1\nb\n", "b\n"], "a 1\nb\n", 0], -['1e', '-a2', ["a 1\nb\n", "b\n"], "b\n", 0], -['1f', '-a2', ["b\n", "a\nb\n"], "a\nb\n", 0], - -['2a', '-a1 -e .', ["a\nb\nc\n", "a x y\nb\nc\n"], "a x y\nb\nc\n", 0], -['2b', '-a1 -e . -o 2.1,2.2,2.3', ["a\nb\nc\n", "a x y\nb\nc\n"], - "a x y\nb . .\nc . .\n", 0], -['2c', '-a1 -e . -o 2.1,2.2,2.3', ["a\nb\nc\nd\n", "a x y\nb\nc\n"], - "a x y\nb . .\nc . .\n. . .\n", 0], - -['3a', '-t:', ["a:1\nb:1\n", "a:2:\nb:2:\n"], "a:1:2:\nb:1:2:\n", 0], - -# operate on whole line (as sort does by default) -['3b', '-t ""', ["a 1\nb 1\n", "a 1\nb 2\n"], "a 1\n", 0], -# use NUL as the field delimiter -['3c', '-t "\\0"', ["a\0a\n", "a\0b\n"], "a\0a\0b\n", 0], - -# Just like -a1 and -a2 when there are no pairable lines -['4a', '-v 1', ["a 1\n", "b\n"], "a 1\n", 0], -['4b', '-v 2', ["a 1\n", "b\n"], "b\n", 0], - -['4c', '-v 1', ["a 1\nb\n", "b\n"], "a 1\n", 0], -['4d', '-v 2', ["a 1\nb\n", "b\n"], "", 0], -['4e', '-v 2', ["b\n", "a 1\nb\n"], "a 1\n", 0], -['5a', '-a1 -e - -o 1.1,2.2', - ["a 1\nb 2\n", "a 11\nb\n"], "a 11\nb -\n", 0], -['5b', '-a1 -e - -o 1.1,2.2', - ["apr 15\naug 20\ndec 18\nfeb 05\n", "apr 06\naug 14\ndate\nfeb 15"], - "apr 06\naug 14\ndec -\nfeb 15\n", 0], -['5c', '-a1 -e - -o 1.1,2.2', - ["aug 20\ndec 18\n", "aug 14\ndate\nfeb 15"], - "aug 14\ndec -\n", 0], -['5d', '-a1 -e - -o 1.1,2.2', - ["dec 18\n", ""], "dec -\n", 0], -['5e', '-a2 -e - -o 1.1,2.2', - ["apr 15\naug 20\ndec 18\nfeb 05\n", "apr 06\naug 14\ndate\nfeb 15\n"], - "apr 06\naug 14\n- -\nfeb 15\n", 0], -['5f', '-a2 -e - -o 2.2,1.1', - ["apr 15\naug 20\ndec 18\nfeb 05\n", "apr 06\naug 14\ndate\nfeb 15\n"], - "06 apr\n14 aug\n- -\n15 feb\n", 0], -['5g', '-a1 -e - -o 2.2,1.1', - ["apr 15\naug 20\ndec 18\nfeb 05\n", "apr 06\naug 14\ndate\nfeb 15\n"], - "06 apr\n14 aug\n- dec\n15 feb\n", 0], - -['5h', '-a1 -e - -o 2.2,1.1', - ["apr 15\naug 20\ndec 18\nfeb 05\n", "apr 06\naug 14\ndate\n"], - "06 apr\n14 aug\n- dec\n- feb\n", 0], -['5i', '-a1 -e - -o 1.1,2.2', - ["apr 15\naug 20\ndec 18\nfeb 05\n", "apr 06\naug 14\ndate\n"], - "apr 06\naug 14\ndec -\nfeb -\n", 0], - -['5j', '-a2 -e - -o 2.2,1.1', - ["apr 15\naug 20\ndec 18\nfeb 05\n", "apr 06\naug 14\ndate\n"], - "06 apr\n14 aug\n- -\n", 0], -['5k', '-a2 -e - -o 2.2,1.1', - ["apr 15\naug 20\ndec 18\nfeb 05\n", "apr 06\naug 14\ndate\n"], - "06 apr\n14 aug\n- -\n", 0], - -['5l', '-a1 -e - -o 2.2,1.1', - ["apr 15\naug 20\ndec 18\n", "apr 06\naug 14\ndate\nfeb 15\n"], - "06 apr\n14 aug\n- dec\n", 0], -['5m', '-a2 -e - -o 2.2,1.1', - ["apr 15\naug 20\ndec 18\n", "apr 06\naug 14\ndate\nfeb 15\n"], - "06 apr\n14 aug\n- -\n15 -\n", 0], - -['6a', '-e -', - ["a 1\nb 2\nd 4\n", "a 21\nb 22\nc 23\nf 26\n"], - "a 1 21\nb 2 22\n", 0], -['6b', '-a1 -e -', - ["a 1\nb 2\nd 4\n", "a 21\nb 22\nc 23\nf 26\n"], - "a 1 21\nb 2 22\nd 4\n", 0], -['6c', '-a1 -e -', - ["a 21\nb 22\nc 23\nf 26\n", "a 1\nb 2\nd 4\n"], - "a 21 1\nb 22 2\nc 23\nf 26\n", 0], - -['7a', '-a1 -e . -o 2.7', - ["a\nb\nc\n", "a x y\nb\nc\n"], ".\n.\n.\n", 0], - -['8a', '-a1 -e . -o 0,1.2', - ["a\nb\nc\nd G\n", "a x y\nb\nc\ne\n"], - "a .\nb .\nc .\nd G\n", 0], -['8b', '-a1 -a2 -e . -o 0,1.2', - ["a\nb\nc\nd G\n", "a x y\nb\nc\ne\n"], - "a .\nb .\nc .\nd G\ne .\n", 0], - -# From David Dyck -['9a', '', [" a 1\n b 2\n", " a Y\n b Z\n"], "a 1 Y\nb 2 Z\n", 0], - -# -o 'auto' -['10a', '-a1 -a2 -e . -o auto', - ["a 1 2\nb 1\nd 1 2\n", "a 3 4\nb 3 4\nc 3 4\n"], - "a 1 2 3 4\nb 1 . 3 4\nc . . 3 4\nd 1 2 . .\n", 0], -['10b', '-a1 -a2 -j3 -e . -o auto', - ["a 1 2\nb 1\nd 1 2\n", "a 3 4\nb 3 4\nc 3 4\n"], - "2 a 1 . .\n. b 1 . .\n2 d 1 . .\n4 . . a 3\n4 . . b 3\n4 . . c 3\n"], -['10c', '-a1 -1 1 -2 4 -e. -o auto', - ["a 1 2\nb 1\nd 1 2\n", "a 3 4\nb 3 4\nc 3 4\n"], - "a 1 2 . . .\nb 1 . . . .\nd 1 2 . . .\n"], -['10d', '-a2 -1 1 -2 4 -e. -o auto', - ["a 1 2\nb 1\nd 1 2\n", "a 3 4\nb 3 4\nc 3 4\n"], - ". . . a 3 4\n. . . b 3 4\n. . . c 3 4\n"], -['10e', '-o auto', - ["a 1 2\nb 1 2 discard\n", "a 3 4\nb 3 4 discard\n"], - "a 1 2 3 4\nb 1 2 3 4\n"], -['10f', '-t, -o auto', - ["a,1,,2\nb,1,2\n", "a,3,4\nb,3,4\n"], - "a,1,,2,3,4\nb,1,2,,3,4\n"], - -# From Tim Smithers: fixed in 1.22l -['trailing-sp', '-t: -1 1 -2 1', ["a:x \n", "a:y \n"], "a:x :y \n", 0], - -# From Paul Eggert: fixed in 1.22n -['sp-vs-blank', '', ["\f 1\n", "\f 2\n"], "\f 1 2\n", 0], - -# From Paul Eggert: fixed in 1.22n (this would fail on Solaris7, -# with LC_ALL set to en_US). -# Unfortunately, that Solaris7's en_US locale folds case (making -# the first input file sorted) is not portable, so this test would -# fail on e.g. Linux systems, because the input to join isn't sorted. -# ['lc-collate', '', ["a 1a\nB 1B\n", "B 2B\n"], "B 1B 2B\n", 0], - -# Based on a report from Antonio Rendas. Fixed in 2.0.9. -['8-bit-t', t_subst "-t:", - [t_subst "a:1\nb:1\n", t_subst "a:2:\nb:2:\n"], - t_subst "a:1:2:\nb:1:2:\n", 0], - -# fields > SIZE_MAX are silently interpreted as SIZE_MAX -['bigfield1', "-1 $limits->{UINTMAX_OFLOW} -2 2", - ["a\n", "b\n"], " a b\n", 0], -['bigfield2', "-1 $limits->{SIZE_OFLOW} -2 2", - ["a\n", "b\n"], " a b\n", 0], - -# FIXME: change this to ensure the diagnostic makes sense -['invalid-j', '-j x', {}, "", 1, - "$prog: invalid field number: 'x'\n"], - -# With ordering check, inputs in order -['chkodr-1', '--check-order', - [" a 1\n b 2\n", " a Y\n b Z\n"], "a 1 Y\nb 2 Z\n", 0], - -# Without check, inputs in order -['chkodr-2', '--nocheck-order', - [" a 1\n b 2\n", " a Y\n b Z\n"], "a 1 Y\nb 2 Z\n", 0], - -# Without check, both inputs out of order (in fact, in reverse order) -# but all pairable. Support for this is a GNU extension. -['chkodr-3', '--nocheck-order', - [" b 1\n a 2\n", " b Y\n a Z\n"], "b 1 Y\na 2 Z\n", 0], - -# The extension should work without --nocheck-order, since that is the -# default. -['chkodr-4', '', - [" b 1\n a 2\n", " b Y\n a Z\n"], "b 1 Y\na 2 Z\n", 0], - -# With check, both inputs out of order (in fact, in reverse order) -['chkodr-5', '--check-order', - [" b 1\n a 2\n", " b Y\n a Z\n"], "", 1, - "$prog: chkodr-5.1:2: is not sorted: a 2\n"], - -# Similar, but with only file 2 not sorted. -['chkodr-5b', '--check-order', - [" a 2\n b 1\n", " b Y\n a Z\n"], "", 1, - "$prog: chkodr-5b.2:2: is not sorted: a Z\n"], - -# Similar, but with the offending line having length 0 (excluding newline). -['chkodr-5c', '--check-order', - [" a 2\n b 1\n", " b Y\n\n"], "", 1, - "$prog: chkodr-5c.2:2: is not sorted: \n"], - -# Similar, but elicit a warning for each input file (without --check-order). -['chkodr-5d', '', - ["a\nx\n\n", "b\ny\n\n"], "", 1, - "$prog: chkodr-5d.1:3: is not sorted: \n" . - "$prog: chkodr-5d.2:3: is not sorted: \n"], - -# Similar, but make it so each offending line has no newline. -['chkodr-5e', '', - ["a\nx\no", "b\ny\np"], "", 1, - "$prog: chkodr-5e.1:3: is not sorted: o\n" . - "$prog: chkodr-5e.2:3: is not sorted: p\n"], - -# Without order check, both inputs out of order and some lines -# unpairable. This is NOT supported by the GNU extension. All that -# we really care about for this test is that the return status is -# zero, since that is the only way to actually verify that the -# --nocheck-order option had any effect. We don't actually want to -# guarantee that join produces this output on stdout. -['chkodr-6', '--nocheck-order', - [" b 1\n a 2\n", " b Y\n c Z\n"], "b 1 Y\n", 0], - -# Before 6.10.143, this would mistakenly fail with the diagnostic: -# join: File 1 is not in sorted order -['chkodr-7', '-12', ["2 a\n1 b\n", "2 c\n1 d"], "", 0], - -# After 8.9, join doesn't report disorder by default -# when comparing against an empty input file. -['chkodr-8', '', ["2 a\n1 b\n", ""], "", 0], - -# Test '--header' feature -['header-1', '--header', - [ "ID Name\n1 A\n2 B\n", "ID Color\n1 red\n"], "ID Name Color\n1 A red\n", 0], - -# '--header' with '--check-order' : The header line is out-of-order but the -# actual data is in order. This join should succeed. -['header-2', '--header --check-order', - ["ID Name\n1 A\n2 B\n", "ID Color\n2 green\n"], - "ID Name Color\n2 B green\n", 0], - -# '--header' with '--check-order' : The header line is out-of-order AND the -# actual data out-of-order. This join should fail. -['header-3', '--header --check-order', - ["ID Name\n2 B\n1 A\n", "ID Color\n2 blue\n"], "ID Name Color\n", 1, - "$prog: header-3.1:3: is not sorted: 1 A\n"], - -# '--header' with specific output format '-o'. -# output header line should respect the requested format -['header-4', '--header -o "0,1.3,2.2"', - ["ID Group Name\n1 Foo A\n2 Bar B\n", "ID Color\n2 blue\n"], - "ID Name Color\n2 B blue\n", 0], - -# '--header' always outputs headers from the first file -# even if the headers from the second file don't match -['header-5', '--header', - [ "ID1 Name\n1 A\n2 B\n", "ID2 Color\n1 red\n"], - "ID1 Name Color\n1 A red\n", 0], - -# '--header' doesn't check order of a header -# even if there is no header in the second file -['header-6', '--header -a1', - [ "ID1 Name\n1 A\n", ""], - "ID1 Name\n1 A\n", 0], - -); - -# Convert the above old-style test vectors to the newer -# format used by Coreutils.pm. - -my @Tests; -foreach my $t (@tv) - { - my ($test_name, $flags, $in, $exp, $ret, $err_msg) = @$t; - my $new_ent = [$test_name, $flags]; - if (!ref $in) - { - push @$new_ent, {IN=>$in}; - } - elsif (ref $in eq 'HASH') - { - # ignore - } - else - { - foreach my $e (@$in) - { - push @$new_ent, {IN=>$e}; - } - } - push @$new_ent, {OUT=>$exp}; - $ret - and push @$new_ent, {EXIT=>$ret}, {ERR=>$err_msg}; - push @Tests, $new_ent; - } - -@Tests = triple_test \@Tests; - -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/join.pl b/tests/misc/join.pl new file mode 100755 index 00000000..9b93794d --- /dev/null +++ b/tests/misc/join.pl @@ -0,0 +1,315 @@ +#!/usr/bin/perl +# Test join. + +# 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/>. + +use strict; + +my $limits = getlimits (); + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +my $prog = 'join'; + +my $delim = chr 0247; +sub t_subst ($) +{ + (my $s = $_[0]) =~ s/:/$delim/g; + return $s; +} + +my @tv = ( +# test name +# flags file-1 file-2 expected output expected return code +# +['1a', '-a1', ["a 1\n", "b\n"], "a 1\n", 0], +['1b', '-a2', ["a 1\n", "b\n"], "b\n", 0], # Got "\n" +['1c', '-a1 -a2', ["a 1\n", "b\n"], "a 1\nb\n", 0], # Got "a 1\n\n" +['1d', '-a1', ["a 1\nb\n", "b\n"], "a 1\nb\n", 0], +['1e', '-a2', ["a 1\nb\n", "b\n"], "b\n", 0], +['1f', '-a2', ["b\n", "a\nb\n"], "a\nb\n", 0], + +['2a', '-a1 -e .', ["a\nb\nc\n", "a x y\nb\nc\n"], "a x y\nb\nc\n", 0], +['2b', '-a1 -e . -o 2.1,2.2,2.3', ["a\nb\nc\n", "a x y\nb\nc\n"], + "a x y\nb . .\nc . .\n", 0], +['2c', '-a1 -e . -o 2.1,2.2,2.3', ["a\nb\nc\nd\n", "a x y\nb\nc\n"], + "a x y\nb . .\nc . .\n. . .\n", 0], + +['3a', '-t:', ["a:1\nb:1\n", "a:2:\nb:2:\n"], "a:1:2:\nb:1:2:\n", 0], + +# operate on whole line (as sort does by default) +['3b', '-t ""', ["a 1\nb 1\n", "a 1\nb 2\n"], "a 1\n", 0], +# use NUL as the field delimiter +['3c', '-t "\\0"', ["a\0a\n", "a\0b\n"], "a\0a\0b\n", 0], + +# Just like -a1 and -a2 when there are no pairable lines +['4a', '-v 1', ["a 1\n", "b\n"], "a 1\n", 0], +['4b', '-v 2', ["a 1\n", "b\n"], "b\n", 0], + +['4c', '-v 1', ["a 1\nb\n", "b\n"], "a 1\n", 0], +['4d', '-v 2', ["a 1\nb\n", "b\n"], "", 0], +['4e', '-v 2', ["b\n", "a 1\nb\n"], "a 1\n", 0], +['5a', '-a1 -e - -o 1.1,2.2', + ["a 1\nb 2\n", "a 11\nb\n"], "a 11\nb -\n", 0], +['5b', '-a1 -e - -o 1.1,2.2', + ["apr 15\naug 20\ndec 18\nfeb 05\n", "apr 06\naug 14\ndate\nfeb 15"], + "apr 06\naug 14\ndec -\nfeb 15\n", 0], +['5c', '-a1 -e - -o 1.1,2.2', + ["aug 20\ndec 18\n", "aug 14\ndate\nfeb 15"], + "aug 14\ndec -\n", 0], +['5d', '-a1 -e - -o 1.1,2.2', + ["dec 18\n", ""], "dec -\n", 0], +['5e', '-a2 -e - -o 1.1,2.2', + ["apr 15\naug 20\ndec 18\nfeb 05\n", "apr 06\naug 14\ndate\nfeb 15\n"], + "apr 06\naug 14\n- -\nfeb 15\n", 0], +['5f', '-a2 -e - -o 2.2,1.1', + ["apr 15\naug 20\ndec 18\nfeb 05\n", "apr 06\naug 14\ndate\nfeb 15\n"], + "06 apr\n14 aug\n- -\n15 feb\n", 0], +['5g', '-a1 -e - -o 2.2,1.1', + ["apr 15\naug 20\ndec 18\nfeb 05\n", "apr 06\naug 14\ndate\nfeb 15\n"], + "06 apr\n14 aug\n- dec\n15 feb\n", 0], + +['5h', '-a1 -e - -o 2.2,1.1', + ["apr 15\naug 20\ndec 18\nfeb 05\n", "apr 06\naug 14\ndate\n"], + "06 apr\n14 aug\n- dec\n- feb\n", 0], +['5i', '-a1 -e - -o 1.1,2.2', + ["apr 15\naug 20\ndec 18\nfeb 05\n", "apr 06\naug 14\ndate\n"], + "apr 06\naug 14\ndec -\nfeb -\n", 0], + +['5j', '-a2 -e - -o 2.2,1.1', + ["apr 15\naug 20\ndec 18\nfeb 05\n", "apr 06\naug 14\ndate\n"], + "06 apr\n14 aug\n- -\n", 0], +['5k', '-a2 -e - -o 2.2,1.1', + ["apr 15\naug 20\ndec 18\nfeb 05\n", "apr 06\naug 14\ndate\n"], + "06 apr\n14 aug\n- -\n", 0], + +['5l', '-a1 -e - -o 2.2,1.1', + ["apr 15\naug 20\ndec 18\n", "apr 06\naug 14\ndate\nfeb 15\n"], + "06 apr\n14 aug\n- dec\n", 0], +['5m', '-a2 -e - -o 2.2,1.1', + ["apr 15\naug 20\ndec 18\n", "apr 06\naug 14\ndate\nfeb 15\n"], + "06 apr\n14 aug\n- -\n15 -\n", 0], + +['6a', '-e -', + ["a 1\nb 2\nd 4\n", "a 21\nb 22\nc 23\nf 26\n"], + "a 1 21\nb 2 22\n", 0], +['6b', '-a1 -e -', + ["a 1\nb 2\nd 4\n", "a 21\nb 22\nc 23\nf 26\n"], + "a 1 21\nb 2 22\nd 4\n", 0], +['6c', '-a1 -e -', + ["a 21\nb 22\nc 23\nf 26\n", "a 1\nb 2\nd 4\n"], + "a 21 1\nb 22 2\nc 23\nf 26\n", 0], + +['7a', '-a1 -e . -o 2.7', + ["a\nb\nc\n", "a x y\nb\nc\n"], ".\n.\n.\n", 0], + +['8a', '-a1 -e . -o 0,1.2', + ["a\nb\nc\nd G\n", "a x y\nb\nc\ne\n"], + "a .\nb .\nc .\nd G\n", 0], +['8b', '-a1 -a2 -e . -o 0,1.2', + ["a\nb\nc\nd G\n", "a x y\nb\nc\ne\n"], + "a .\nb .\nc .\nd G\ne .\n", 0], + +# From David Dyck +['9a', '', [" a 1\n b 2\n", " a Y\n b Z\n"], "a 1 Y\nb 2 Z\n", 0], + +# -o 'auto' +['10a', '-a1 -a2 -e . -o auto', + ["a 1 2\nb 1\nd 1 2\n", "a 3 4\nb 3 4\nc 3 4\n"], + "a 1 2 3 4\nb 1 . 3 4\nc . . 3 4\nd 1 2 . .\n", 0], +['10b', '-a1 -a2 -j3 -e . -o auto', + ["a 1 2\nb 1\nd 1 2\n", "a 3 4\nb 3 4\nc 3 4\n"], + "2 a 1 . .\n. b 1 . .\n2 d 1 . .\n4 . . a 3\n4 . . b 3\n4 . . c 3\n"], +['10c', '-a1 -1 1 -2 4 -e. -o auto', + ["a 1 2\nb 1\nd 1 2\n", "a 3 4\nb 3 4\nc 3 4\n"], + "a 1 2 . . .\nb 1 . . . .\nd 1 2 . . .\n"], +['10d', '-a2 -1 1 -2 4 -e. -o auto', + ["a 1 2\nb 1\nd 1 2\n", "a 3 4\nb 3 4\nc 3 4\n"], + ". . . a 3 4\n. . . b 3 4\n. . . c 3 4\n"], +['10e', '-o auto', + ["a 1 2\nb 1 2 discard\n", "a 3 4\nb 3 4 discard\n"], + "a 1 2 3 4\nb 1 2 3 4\n"], +['10f', '-t, -o auto', + ["a,1,,2\nb,1,2\n", "a,3,4\nb,3,4\n"], + "a,1,,2,3,4\nb,1,2,,3,4\n"], + +# For -v2, print the match field correctly with the default output format, +# when that match field is different between file 1 and file 2. Fixed in 8.10 +['v2-order', '-v2 -2 2', ["", "2 1\n"], "1 2\n", 0], + +# From Tim Smithers: fixed in 1.22l +['trailing-sp', '-t: -1 1 -2 1', ["a:x \n", "a:y \n"], "a:x :y \n", 0], + +# From Paul Eggert: fixed in 1.22n +['sp-vs-blank', '', ["\f 1\n", "\f 2\n"], "\f 1 2\n", 0], + +# From Paul Eggert: fixed in 1.22n (this would fail on Solaris7, +# with LC_ALL set to en_US). +# Unfortunately, that Solaris7's en_US locale folds case (making +# the first input file sorted) is not portable, so this test would +# fail on e.g. Linux systems, because the input to join isn't sorted. +# ['lc-collate', '', ["a 1a\nB 1B\n", "B 2B\n"], "B 1B 2B\n", 0], + +# Based on a report from Antonio Rendas. Fixed in 2.0.9. +['8-bit-t', t_subst "-t:", + [t_subst "a:1\nb:1\n", t_subst "a:2:\nb:2:\n"], + t_subst "a:1:2:\nb:1:2:\n", 0], + +# fields > SIZE_MAX are silently interpreted as SIZE_MAX +['bigfield1', "-1 $limits->{UINTMAX_OFLOW} -2 2", + ["a\n", "b\n"], " a b\n", 0], +['bigfield2', "-1 $limits->{SIZE_OFLOW} -2 2", + ["a\n", "b\n"], " a b\n", 0], + +# FIXME: change this to ensure the diagnostic makes sense +['invalid-j', '-j x', {}, "", 1, + "$prog: invalid field number: 'x'\n"], + +# With ordering check, inputs in order +['chkodr-1', '--check-order', + [" a 1\n b 2\n", " a Y\n b Z\n"], "a 1 Y\nb 2 Z\n", 0], + +# Without check, inputs in order +['chkodr-2', '--nocheck-order', + [" a 1\n b 2\n", " a Y\n b Z\n"], "a 1 Y\nb 2 Z\n", 0], + +# Without check, both inputs out of order (in fact, in reverse order) +# but all pairable. Support for this is a GNU extension. +['chkodr-3', '--nocheck-order', + [" b 1\n a 2\n", " b Y\n a Z\n"], "b 1 Y\na 2 Z\n", 0], + +# The extension should work without --nocheck-order, since that is the +# default. +['chkodr-4', '', + [" b 1\n a 2\n", " b Y\n a Z\n"], "b 1 Y\na 2 Z\n", 0], + +# With check, both inputs out of order (in fact, in reverse order) +['chkodr-5', '--check-order', + [" b 1\n a 2\n", " b Y\n a Z\n"], "", 1, + "$prog: chkodr-5.1:2: is not sorted: a 2\n"], + +# Similar, but with only file 2 not sorted. +['chkodr-5b', '--check-order', + [" a 2\n b 1\n", " b Y\n a Z\n"], "", 1, + "$prog: chkodr-5b.2:2: is not sorted: a Z\n"], + +# Similar, but with the offending line having length 0 (excluding newline). +['chkodr-5c', '--check-order', + [" a 2\n b 1\n", " b Y\n\n"], "", 1, + "$prog: chkodr-5c.2:2: is not sorted: \n"], + +# Similar, but elicit a warning for each input file (without --check-order). +['chkodr-5d', '', + ["a\nx\n\n", "b\ny\n\n"], "", 1, + "$prog: chkodr-5d.1:3: is not sorted: \n" . + "$prog: chkodr-5d.2:3: is not sorted: \n"], + +# Similar, but make it so each offending line has no newline. +['chkodr-5e', '', + ["a\nx\no", "b\ny\np"], "", 1, + "$prog: chkodr-5e.1:3: is not sorted: o\n" . + "$prog: chkodr-5e.2:3: is not sorted: p\n"], + +# Without order check, both inputs out of order and some lines +# unpairable. This is NOT supported by the GNU extension. All that +# we really care about for this test is that the return status is +# zero, since that is the only way to actually verify that the +# --nocheck-order option had any effect. We don't actually want to +# guarantee that join produces this output on stdout. +['chkodr-6', '--nocheck-order', + [" b 1\n a 2\n", " b Y\n c Z\n"], "b 1 Y\n", 0], + +# Before 6.10.143, this would mistakenly fail with the diagnostic: +# join: File 1 is not in sorted order +['chkodr-7', '-12', ["2 a\n1 b\n", "2 c\n1 d"], "", 0], + +# After 8.9, join doesn't report disorder by default +# when comparing against an empty input file. +['chkodr-8', '', ["2 a\n1 b\n", ""], "", 0], + +# Test '--header' feature +['header-1', '--header', + [ "ID Name\n1 A\n2 B\n", "ID Color\n1 red\n"], "ID Name Color\n1 A red\n", 0], + +# '--header' with '--check-order' : The header line is out-of-order but the +# actual data is in order. This join should succeed. +['header-2', '--header --check-order', + ["ID Name\n1 A\n2 B\n", "ID Color\n2 green\n"], + "ID Name Color\n2 B green\n", 0], + +# '--header' with '--check-order' : The header line is out-of-order AND the +# actual data out-of-order. This join should fail. +['header-3', '--header --check-order', + ["ID Name\n2 B\n1 A\n", "ID Color\n2 blue\n"], "ID Name Color\n", 1, + "$prog: header-3.1:3: is not sorted: 1 A\n"], + +# '--header' with specific output format '-o'. +# output header line should respect the requested format +['header-4', '--header -o "0,1.3,2.2"', + ["ID Group Name\n1 Foo A\n2 Bar B\n", "ID Color\n2 blue\n"], + "ID Name Color\n2 B blue\n", 0], + +# '--header' always outputs headers from the first file +# even if the headers from the second file don't match +['header-5', '--header', + [ "ID1 Name\n1 A\n2 B\n", "ID2 Color\n1 red\n"], + "ID1 Name Color\n1 A red\n", 0], + +# '--header' doesn't check order of a header +# even if there is no header in the second file +['header-6', '--header -a1', + [ "ID1 Name\n1 A\n", ""], + "ID1 Name\n1 A\n", 0], + +); + +# Convert the above old-style test vectors to the newer +# format used by Coreutils.pm. + +my @Tests; +foreach my $t (@tv) + { + my ($test_name, $flags, $in, $exp, $ret, $err_msg) = @$t; + my $new_ent = [$test_name, $flags]; + if (!ref $in) + { + push @$new_ent, {IN=>$in}; + } + elsif (ref $in eq 'HASH') + { + # ignore + } + else + { + foreach my $e (@$in) + { + push @$new_ent, {IN=>$e}; + } + } + push @$new_ent, {OUT=>$exp}; + $ret + and push @$new_ent, {EXIT=>$ret}, {ERR=>$err_msg}; + push @Tests, $new_ent; + } + +@Tests = triple_test \@Tests; + +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/ls-misc b/tests/misc/ls-misc deleted file mode 100755 index 71647f9d..00000000 --- a/tests/misc/ls-misc +++ /dev/null @@ -1,341 +0,0 @@ -#!/usr/bin/perl - -# Copyright (C) 1998-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 -# 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; - -(my $ME = $0) =~ s|.*/||; -my $prog = 'ls'; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -my $saved_ls_colors; - -sub push_ls_colors($) -{ - $saved_ls_colors = $ENV{LS_COLORS} || ''; - $ENV{LS_COLORS} = $_[0]; -} - -sub restore_ls_colors() -{ - $ENV{LS_COLORS} = $saved_ls_colors; -} - -# If the string $S is a well-behaved file name, simply return it. -# If it contains white space, quotes, etc., quote it, and return the new string. -sub shell_quote($) -{ - my ($s) = @_; - if ($s =~ m![^\w+/.,-]!) - { - # Convert each single quote to '\'' - $s =~ s/\'/\'\\\'\'/g; - # Then single quote the string. - $s = "'$s'"; - } - return $s; -} - -# Set up files used by the setuid-etc tests; skip this entire test if -# that cannot be done. -sub setuid_setup() -{ - my $test = shell_quote "$ENV{abs_top_builddir}/src/test"; - system (qq(touch setuid && chmod u+s setuid && $test -u setuid && - touch setgid && chmod g+s setgid && $test -g setgid && - mkdir sticky && chmod +t sticky && $test -k sticky && - mkdir owt && chmod +t,o+w owt && $test -k owt && - mkdir owr && chmod o+w owr)) == 0 - or CuSkip::skip "$ME: cannot create setuid/setgid/sticky files," - . "so can't run this test\n"; -} - -sub mk_file(@) -{ - foreach my $f (@_) - { - open (F, '>', $f) && close F - or die "creating $f: $!\n"; - } -} - -sub mkdir_d {mkdir 'd',0755 or die "d: $!\n"} -sub rmdir_d {rmdir 'd' or die "d: $!\n"} -my $mkdir = {PRE => sub {mkdir_d}}; -my $rmdir = {POST => sub {rmdir_d}}; -my $mkdir_reg = {PRE => sub {mkdir_d; mk_file 'd/f' }}; -my $rmdir_reg = {POST => sub {unlink 'd/f' or die "d/f: $!\n"; - rmdir 'd' or die "d: $!\n"}}; - -my $mkdir2 = {PRE => sub {mkdir 'd',0755 or die "d: $!\n"; - mkdir 'd/e',0755 or die "d/e: $!\n" }}; -my $rmdir2 = {POST => sub {rmdir 'd/e' or die "d/e: $!\n"; - rmdir 'd' or die "d: $!\n" }}; - -my $target = {PRE => sub { - mkdir 'd',0755 or die "d: $!\n"; - symlink '.', 'd/X' or die "d/X: $!\n"; - push_ls_colors('ln=target') - }}; -my $target2 = {POST => sub {unlink 'd/X' or die "d/X: $!\n"; - rmdir 'd' or die "d: $!\n"; - restore_ls_colors - }}; -my $slink_d = {PRE => sub {symlink '/', 'd' or die "d: $!\n"; - push_ls_colors('ln=01;36:di=01;34:or=40;31;01') - }}; -my $unlink_d = {POST => sub {unlink 'd' or die "d: $!\n"; restore_ls_colors}}; - -my $mkdir_d_slink = {PRE => sub {mkdir 'd',0755 or die "d: $!\n"; - symlink '/', 'd/s' or die "d/s: $!\n" }}; -my $rmdir_d_slink = {POST => sub {unlink 'd/s' or die "d/s: $!\n"; - rmdir 'd' or die "d: $!\n" }}; - -sub make_j_d () -{ - mkdir 'j', 0700 or die "creating j: $!\n"; - mk_file 'j/d'; - chmod 0555, 'j/d' or die "making j/d executable: $!\n"; -} - -my @v1 = (qw(0 9 A Z a z), 'zz~', 'zz', 'zz.~1~', 'zz.0'); -my @v_files = ((map { ".$_" } @v1), @v1); -my $exe_in_subdir = {PRE => sub { make_j_d (); push_ls_colors('ex=01;32') }}; -my $remove_j = {POST => sub {unlink 'j/d' or die "j/d: $!\n"; - rmdir 'j' or die "j: $!\n"; - restore_ls_colors }}; - -my $e = "\e[0m"; -my $q_bell = {IN => {"q\a" => ''}}; -my @Tests = - ( - # test-name options input expected-output - # - # quoting tests............................................ - ['q-', $q_bell, {OUT => "q\a\n"}, {EXIT => 0}], - ['q-N', '-N', $q_bell, {OUT => "q\a\n"}, {ERR => ''}], - ['q-q', '-q', $q_bell, {OUT => "q?\n"}], - ['q-Q', '-Q', $q_bell, {OUT => "\"q\\a\"\n"}], - - ['q-lit-q', '--quoting=literal -q', $q_bell, {OUT => "q?\n"}], - ['q-qs-lit', '--quoting=literal', $q_bell, {OUT => "q\a\n"}], - ['q-qs-sh', '--quoting=shell', $q_bell, {OUT => "q\a\n"}], - ['q-qs-sh-a', '--quoting=shell-always', $q_bell, {OUT => "'q\a'\n"}], - ['q-qs-c', '--quoting=c', $q_bell, {OUT => "\"q\\a\"\n"}], - ['q-qs-esc', '--quoting=escape', $q_bell, {OUT => "q\\a\n"}], - ['q-qs-c-1', '--quoting=c', - {IN => {"t\004" => ''}}, {OUT => "\"t\\004\"\n"}], - - ['emptydir', 'd', {OUT => ''}, $mkdir, $rmdir], - ['emptydir-x2', 'd d', {OUT => "d:\n\nd:\n"}, $mkdir, $rmdir], - ['emptydir-R', '-R d', {OUT => "d:\n"}, $mkdir, $rmdir], - - # test 'ls -R .' ............................................ - ['R-dot', '--ignore="[a-ce-zA-Z]*" -R .', {OUT => ".:\nd\n\n\./d:\n"}, - $mkdir, $rmdir], - - ['slink-dir-F', '-F d', {OUT => "d@\n"}, $slink_d, $unlink_d], - ['slink-dir-dF', '-dF d', {OUT => "d@\n"}, $slink_d, $unlink_d], - ['slinkdir-dFH', '-dFH d', {OUT => "d/\n"}, $slink_d, $unlink_d], - ['slinkdir-dFL', '-dFL d', {OUT => "d/\n"}, $slink_d, $unlink_d], - - # Test for a bug that was fixed in coreutils-4.5.4. - ['sl-F-color', '-F --color=always d', - {OUT => "$e\e[01;36md$e\@\n"}, - $slink_d, $unlink_d], - ['sl-dF-color', '-dF --color=always d', - {OUT => "$e\e[01;36md$e\@\n"}, - $slink_d, $unlink_d], - - # A listing with no output should have no color sequences at all. - ['no-c-empty', '--color=always d', {OUT => ""}, $mkdir, $rmdir], - # A listing with only regular files should have no color sequences at all. - ['no-c-reg', '--color=always d', {OUT => "f\n"}, $mkdir_reg, $rmdir_reg], - - # Test for a bug fixed after coreutils-6.9. - ['sl-target', '--color=always d', - {OUT => "$e\e[01;34mX$e\n"}, $target, $target2], - - # Test for another bug fixed after coreutils-6.9. - # This one bites only for a system/file system with d_type support. - ['sl-dangle', '--color=always d', - {OUT => "$e\e[40;31;01mX$e\n"}, - {PRE => sub { - mkdir 'd',0755 or die "d: $!\n"; - symlink 'non-existent', 'd/X' or die "d/X: $!\n"; - push_ls_colors('or=40;31;01') - }}, - {POST => sub {unlink 'd/X' or die "d/X: $!\n"; - rmdir 'd' or die "d: $!\n"; - restore_ls_colors; }}, - ], - - # Test for a bug fixed after coreutils-8.2. - ['sl-dangle2', '-o --time-style=+:TIME: --color=always l', - {OUT_SUBST => 's/.*:TIME: //'}, - {OUT => "l -> nowhere\n"}, - {PRE => sub {symlink 'nowhere', 'l' or die "l: $!\n"; - push_ls_colors('ln=target') - }}, - {POST => sub {unlink 'l' or die "l: $!\n"; - restore_ls_colors; }}, - ], - ['sl-dangle3', '-o --time-style=+:TIME: --color=always l', - {OUT_SUBST => 's/.*:TIME: //'}, - {OUT => "$e\e[40ml$e -> \e[34mnowhere$e\n"}, - {PRE => sub {symlink 'nowhere', 'l' or die "l: $!\n"; - push_ls_colors('ln=target:or=40:mi=34:') - }}, - {POST => sub {unlink 'l' or die "l: $!\n"; - restore_ls_colors; }}, - ], - ['sl-dangle4', '-o --time-style=+:TIME: --color=always l', - {OUT_SUBST => 's/.*:TIME: //'}, - {OUT => "$e\e[36ml$e -> \e[35mnowhere$e\n"}, - {PRE => sub {symlink 'nowhere', 'l' or die "l: $!\n"; - push_ls_colors('ln=34:mi=35:or=36:') - }}, - {POST => sub {unlink 'l' or die "l: $!\n"; - restore_ls_colors; }}, - ], - ['sl-dangle5', '-o --time-style=+:TIME: --color=always l', - {OUT_SUBST => 's/.*:TIME: //'}, - {OUT => "$e\e[34ml$e -> \e[35mnowhere$e\n"}, - {PRE => sub {symlink 'nowhere', 'l' or die "l: $!\n"; - push_ls_colors('ln=34:mi=35:') - }}, - {POST => sub {unlink 'l' or die "l: $!\n"; - restore_ls_colors; }}, - ], - - # Test for a bug fixed after coreutils-8.13 - # where 'argetm' was errenously printed for dangling links - # when ln=target was used in LS_COLORS - ['sl-dangle6', '-L --color=always d', - {OUT => "s\n"}, - {PRE => sub {mkdir 'd',0755 or die "d: $!\n"; - symlink 'dangle', 'd/s' or die "d/s: $!\n"; - push_ls_colors('ln=target') - }}, - {POST => sub {unlink 'd/s' or die "d/s: $!\n"; - rmdir 'd' or die "d: $!\n"; - restore_ls_colors; }}, - {ERR => "ls: cannot access d/s: No such file or directory\n"}, - {EXIT => 1} - ], - # Related to the above fix, is this case where - # the code simulates "linkok". In this case "linkmode" - # should always be zero, and hence not trigger any - # issues with type being set to C_LINK - ['sl-dangle7', '--color=always d', - {OUT => "$e\e[ms$e\n"}, - {PRE => sub {mkdir 'd',0755 or die "d: $!\n"; - symlink 'dangle', 'd/s' or die "d/s: $!\n"; - push_ls_colors('ln=target:or=:ex=:') - }}, - {POST => sub {unlink 'd/s' or die "d/s: $!\n"; - rmdir 'd' or die "d: $!\n"; - restore_ls_colors; }}, - ], - # Another case with simulated "linkok", that does - # actually use the value of 'ln' from $LS_COLORS. - # This path is not taken though when 'ln=target'. - ['sl-dangle8', '--color=always s', - {OUT => "$e\e[1;36ms$e\n"}, - {PRE => sub {symlink 'dangle', 's' or die "s: $!\n"; - push_ls_colors('ln=1;36:or=:') - }}, - {POST => sub {unlink 's' or die "s: $!\n"; - restore_ls_colors; }}, - ], - - # Test for a bug that was introduced in coreutils-4.5.4; fixed in 4.5.5. - # To demonstrate it, the file in question (with executable bit set) - # must not be a command line argument. - ['color-exe1', '--color=always j', - {OUT => "$e\e[01;32md$e\n"}, - $exe_in_subdir, $remove_j], - - # From Stéphane Chazelas. - ['no-a-isdir-b', 'no-dir d', - {OUT => "d:\n"}, - {ERR => "ls: cannot access no-dir: No such file or directory\n"}, - $mkdir, $rmdir, {EXIT => 2}], - - ['recursive-2', '-R d', {OUT => "d:\ne\n\nd/e:\n"}, $mkdir2, $rmdir2], - - ['setuid-etc', '-1 -d --color=always owr owt setgid setuid sticky', - {OUT => - "$e\e[34;42mowr$e\n" - . "\e[30;42mowt$e\n" - . "\e[30;43msetgid$e\n" - . "\e[37;41msetuid$e\n" - . "\e[37;44msticky$e\n" - }, - - {POST => sub { - unlink qw(setuid setgid); - foreach my $dir (qw(owr owt sticky)) {rmdir $dir} }}, - ], - - # For 5.97 and earlier, --file-type acted like --indicator-style=slash. - ['file-type', '--file-type d', {OUT => "s@\n"}, - $mkdir_d_slink, $rmdir_d_slink], - - # 7.1 had a regression in how -v -a ordered some files - ['version-sort', '-v -A ' . join (' ', @v_files), - {OUT => join ("\n", @v_files) . "\n"}, - {PRE => sub { mk_file @v_files }}, - {POST => sub { unlink @v_files }}, - ], - - # Test for the ls -1U bug fixed in coreutils-7.5. - # It is triggered only with -1U and with two or more arguments, - # at least one of which is a nonempty directory. - ['multi-arg-U1', '-U1 d no-such', - {OUT => "d:\nf\n"}, - {ERR_SUBST=>'s/ch:.*/ch:/'}, - {ERR => "$prog: cannot access no-such:\n"}, - $mkdir_reg, - $rmdir_reg, - {EXIT => 2}, - ], - ); - -umask 022; - -# Start with an unset LS_COLORS environment variable. -delete $ENV{LS_COLORS}; - -my $save_temps = $ENV{SAVE_TEMPS}; -my $verbose = $ENV{VERBOSE}; - -setuid_setup; -my $fail = run_tests ($ME, $prog, \@Tests, $save_temps, $verbose); -$fail - and exit 1; - -# Be careful to use the just-build dircolors. -my $env = qx/dircolors -b/; -$env =~ s/^LS_COLORS=\'//; -$env =~ s/\';.*//sm; -$ENV{LS_COLORS} = $env; - -setuid_setup; -$fail = run_tests ($ME, $prog, \@Tests, $save_temps, $verbose); -exit $fail; diff --git a/tests/misc/ls-misc.pl b/tests/misc/ls-misc.pl new file mode 100755 index 00000000..5bf7b9eb --- /dev/null +++ b/tests/misc/ls-misc.pl @@ -0,0 +1,356 @@ +#!/usr/bin/perl + +# Copyright (C) 1998-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/>. + +use strict; + +(my $ME = $0) =~ s|.*/||; +my $prog = 'ls'; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +my $saved_ls_colors; + +sub push_ls_colors($) +{ + $saved_ls_colors = $ENV{LS_COLORS} || ''; + $ENV{LS_COLORS} = $_[0]; +} + +sub restore_ls_colors() +{ + $ENV{LS_COLORS} = $saved_ls_colors; +} + +# If the string $S is a well-behaved file name, simply return it. +# If it contains white space, quotes, etc., quote it, and return the new string. +sub shell_quote($) +{ + my ($s) = @_; + if ($s =~ m![^\w+/.,-]!) + { + # Convert each single quote to '\'' + $s =~ s/\'/\'\\\'\'/g; + # Then single quote the string. + $s = "'$s'"; + } + return $s; +} + +# Set up files used by the setuid-etc tests; skip this entire test if +# that cannot be done. +sub setuid_setup() +{ + my $test = shell_quote "$ENV{abs_top_builddir}/src/test"; + system (qq(touch setuid && chmod u+s setuid && $test -u setuid && + touch setgid && chmod g+s setgid && $test -g setgid && + mkdir sticky && chmod +t sticky && $test -k sticky && + mkdir owt && chmod +t,o+w owt && $test -k owt && + mkdir owr && chmod o+w owr)) == 0 + or CuSkip::skip "$ME: cannot create setuid/setgid/sticky files," + . "so can't run this test\n"; +} + +sub mk_file(@) +{ + foreach my $f (@_) + { + open (F, '>', $f) && close F + or die "creating $f: $!\n"; + } +} + +sub mkdir_d {mkdir 'd',0755 or die "d: $!\n"} +sub rmdir_d {rmdir 'd' or die "d: $!\n"} +my $mkdir = {PRE => sub {mkdir_d}}; +my $rmdir = {POST => sub {rmdir_d}}; +my $mkdir_reg = {PRE => sub {mkdir_d; mk_file 'd/f' }}; +my $rmdir_reg = {POST => sub {unlink 'd/f' or die "d/f: $!\n"; + rmdir 'd' or die "d: $!\n"}}; + +my $mkdir2 = {PRE => sub {mkdir 'd',0755 or die "d: $!\n"; + mkdir 'd/e',0755 or die "d/e: $!\n" }}; +my $rmdir2 = {POST => sub {rmdir 'd/e' or die "d/e: $!\n"; + rmdir 'd' or die "d: $!\n" }}; + +my $target = {PRE => sub { + mkdir 'd',0755 or die "d: $!\n"; + symlink '.', 'd/X' or die "d/X: $!\n"; + push_ls_colors('ln=target') + }}; +my $target2 = {POST => sub {unlink 'd/X' or die "d/X: $!\n"; + rmdir 'd' or die "d: $!\n"; + restore_ls_colors + }}; +my $slink_d = {PRE => sub {symlink '/', 'd' or die "d: $!\n"; + push_ls_colors('ln=01;36:di=01;34:or=40;31;01') + }}; +my $unlink_d = {POST => sub {unlink 'd' or die "d: $!\n"; restore_ls_colors}}; + +my $mkdir_d_slink = {PRE => sub {mkdir 'd',0755 or die "d: $!\n"; + symlink '/', 'd/s' or die "d/s: $!\n" }}; +my $rmdir_d_slink = {POST => sub {unlink 'd/s' or die "d/s: $!\n"; + rmdir 'd' or die "d: $!\n" }}; + +sub make_j_d () +{ + mkdir 'j', 0700 or die "creating j: $!\n"; + mk_file 'j/d'; + chmod 0555, 'j/d' or die "making j/d executable: $!\n"; +} + +my @v1 = (qw(0 9 A Z a z), 'zz~', 'zz', 'zz.~1~', 'zz.0'); +my @v_files = ((map { ".$_" } @v1), @v1); +my $exe_in_subdir = {PRE => sub { make_j_d (); push_ls_colors('ex=01;32') }}; +my $remove_j = {POST => sub {unlink 'j/d' or die "j/d: $!\n"; + rmdir 'j' or die "j: $!\n"; + restore_ls_colors }}; + +my $e = "\e[0m"; +my $q_bell = {IN => {"q\a" => ''}}; +my @Tests = + ( + # test-name options input expected-output + # + # quoting tests............................................ + ['q-', $q_bell, {OUT => "q\a\n"}, {EXIT => 0}], + ['q-N', '-N', $q_bell, {OUT => "q\a\n"}, {ERR => ''}], + ['q-q', '-q', $q_bell, {OUT => "q?\n"}], + ['q-Q', '-Q', $q_bell, {OUT => "\"q\\a\"\n"}], + + ['q-lit-q', '--quoting=literal -q', $q_bell, {OUT => "q?\n"}], + ['q-qs-lit', '--quoting=literal', $q_bell, {OUT => "q\a\n"}], + ['q-qs-sh', '--quoting=shell', $q_bell, {OUT => "q\a\n"}], + ['q-qs-sh-a', '--quoting=shell-always', $q_bell, {OUT => "'q\a'\n"}], + ['q-qs-c', '--quoting=c', $q_bell, {OUT => "\"q\\a\"\n"}], + ['q-qs-esc', '--quoting=escape', $q_bell, {OUT => "q\\a\n"}], + ['q-qs-c-1', '--quoting=c', + {IN => {"t\004" => ''}}, {OUT => "\"t\\004\"\n"}], + + ['emptydir', 'd', {OUT => ''}, $mkdir, $rmdir], + ['emptydir-x2', 'd d', {OUT => "d:\n\nd:\n"}, $mkdir, $rmdir], + ['emptydir-R', '-R d', {OUT => "d:\n"}, $mkdir, $rmdir], + + # test 'ls -R .' ............................................ + ['R-dot', '--ignore="[a-ce-zA-Z]*" -R .', {OUT => ".:\nd\n\n\./d:\n"}, + $mkdir, $rmdir], + + ['slink-dir-F', '-F d', {OUT => "d@\n"}, $slink_d, $unlink_d], + ['slink-dir-dF', '-dF d', {OUT => "d@\n"}, $slink_d, $unlink_d], + ['slinkdir-dFH', '-dFH d', {OUT => "d/\n"}, $slink_d, $unlink_d], + ['slinkdir-dFL', '-dFL d', {OUT => "d/\n"}, $slink_d, $unlink_d], + + # Test for a bug that was fixed in coreutils-4.5.4. + ['sl-F-color', '-F --color=always d', + {OUT => "$e\e[01;36md$e\@\n"}, + $slink_d, $unlink_d], + ['sl-dF-color', '-dF --color=always d', + {OUT => "$e\e[01;36md$e\@\n"}, + $slink_d, $unlink_d], + + # A listing with no output should have no color sequences at all. + ['no-c-empty', '--color=always d', {OUT => ""}, $mkdir, $rmdir], + # A listing with only regular files should have no color sequences at all. + ['no-c-reg', '--color=always d', {OUT => "f\n"}, $mkdir_reg, $rmdir_reg], + + # Test for a bug fixed after coreutils-6.9. + ['sl-target', '--color=always d', + {OUT => "$e\e[01;34mX$e\n"}, $target, $target2], + + # Test for another bug fixed after coreutils-6.9. + # This one bites only for a system/file system with d_type support. + ['sl-dangle', '--color=always d', + {OUT => "$e\e[40;31;01mX$e\n"}, + {PRE => sub { + mkdir 'd',0755 or die "d: $!\n"; + symlink 'non-existent', 'd/X' or die "d/X: $!\n"; + push_ls_colors('or=40;31;01') + }}, + {POST => sub {unlink 'd/X' or die "d/X: $!\n"; + rmdir 'd' or die "d: $!\n"; + restore_ls_colors; }}, + ], + + # Test for a bug fixed after coreutils-8.2. + ['sl-dangle2', '-o --time-style=+:TIME: --color=always l', + {OUT_SUBST => 's/.*:TIME: //'}, + {OUT => "l -> nowhere\n"}, + {PRE => sub {symlink 'nowhere', 'l' or die "l: $!\n"; + push_ls_colors('ln=target') + }}, + {POST => sub {unlink 'l' or die "l: $!\n"; + restore_ls_colors; }}, + ], + ['sl-dangle3', '-o --time-style=+:TIME: --color=always l', + {OUT_SUBST => 's/.*:TIME: //'}, + {OUT => "$e\e[40ml$e -> \e[34mnowhere$e\n"}, + {PRE => sub {symlink 'nowhere', 'l' or die "l: $!\n"; + push_ls_colors('ln=target:or=40:mi=34:') + }}, + {POST => sub {unlink 'l' or die "l: $!\n"; + restore_ls_colors; }}, + ], + ['sl-dangle4', '-o --time-style=+:TIME: --color=always l', + {OUT_SUBST => 's/.*:TIME: //'}, + {OUT => "$e\e[36ml$e -> \e[35mnowhere$e\n"}, + {PRE => sub {symlink 'nowhere', 'l' or die "l: $!\n"; + push_ls_colors('ln=34:mi=35:or=36:') + }}, + {POST => sub {unlink 'l' or die "l: $!\n"; + restore_ls_colors; }}, + ], + ['sl-dangle5', '-o --time-style=+:TIME: --color=always l', + {OUT_SUBST => 's/.*:TIME: //'}, + {OUT => "$e\e[34ml$e -> \e[35mnowhere$e\n"}, + {PRE => sub {symlink 'nowhere', 'l' or die "l: $!\n"; + push_ls_colors('ln=34:mi=35:') + }}, + {POST => sub {unlink 'l' or die "l: $!\n"; + restore_ls_colors; }}, + ], + + # Test for a bug fixed after coreutils-8.13 + # where 'argetm' was errenously printed for dangling links + # when ln=target was used in LS_COLORS + ['sl-dangle6', '-L --color=always d', + {OUT => "s\n"}, + {PRE => sub {mkdir 'd',0755 or die "d: $!\n"; + symlink 'dangle', 'd/s' or die "d/s: $!\n"; + push_ls_colors('ln=target') + }}, + {POST => sub {unlink 'd/s' or die "d/s: $!\n"; + rmdir 'd' or die "d: $!\n"; + restore_ls_colors; }}, + {ERR => "ls: cannot access d/s: No such file or directory\n"}, + {EXIT => 1} + ], + # Related to the above fix, is this case where + # the code simulates "linkok". In this case "linkmode" + # should always be zero, and hence not trigger any + # issues with type being set to C_LINK + ['sl-dangle7', '--color=always d', + {OUT => "$e\e[ms$e\n"}, + {PRE => sub {mkdir 'd',0755 or die "d: $!\n"; + symlink 'dangle', 'd/s' or die "d/s: $!\n"; + push_ls_colors('ln=target:or=:ex=:') + }}, + {POST => sub {unlink 'd/s' or die "d/s: $!\n"; + rmdir 'd' or die "d: $!\n"; + restore_ls_colors; }}, + ], + # Another case with simulated "linkok", that does + # actually use the value of 'ln' from $LS_COLORS. + # This path is not taken though when 'ln=target'. + ['sl-dangle8', '--color=always s', + {OUT => "$e\e[1;36ms$e\n"}, + {PRE => sub {symlink 'dangle', 's' or die "s: $!\n"; + push_ls_colors('ln=1;36:or=:') + }}, + {POST => sub {unlink 's' or die "s: $!\n"; + restore_ls_colors; }}, + ], + # The patch associated with sl-dangle[678] introduced a regression + # that was fixed after coreutils-8.19. This edge case triggers when + # listing a dir containing dangling symlinks, but with orphans uncolored. + # I.E. the same as the previous test, but listing the directory + # rather than the symlink directly. + ['sl-dangle9', '--color=always d', + {OUT => "$e\e[1;36ms$e\n"}, + {PRE => sub {mkdir 'd',0755 or die "d: $!\n"; + symlink 'dangle', 'd/s' or die "d/s: $!\n"; + push_ls_colors('ln=1;36:or=:') + }}, + {POST => sub {unlink 'd/s' or die "d/s: $!\n"; + rmdir 'd' or die "d: $!\n"; + restore_ls_colors; }}, + ], + + # Test for a bug that was introduced in coreutils-4.5.4; fixed in 4.5.5. + # To demonstrate it, the file in question (with executable bit set) + # must not be a command line argument. + ['color-exe1', '--color=always j', + {OUT => "$e\e[01;32md$e\n"}, + $exe_in_subdir, $remove_j], + + # From Stéphane Chazelas. + ['no-a-isdir-b', 'no-dir d', + {OUT => "d:\n"}, + {ERR => "ls: cannot access no-dir: No such file or directory\n"}, + $mkdir, $rmdir, {EXIT => 2}], + + ['recursive-2', '-R d', {OUT => "d:\ne\n\nd/e:\n"}, $mkdir2, $rmdir2], + + ['setuid-etc', '-1 -d --color=always owr owt setgid setuid sticky', + {OUT => + "$e\e[34;42mowr$e\n" + . "\e[30;42mowt$e\n" + . "\e[30;43msetgid$e\n" + . "\e[37;41msetuid$e\n" + . "\e[37;44msticky$e\n" + }, + + {POST => sub { + unlink qw(setuid setgid); + foreach my $dir (qw(owr owt sticky)) {rmdir $dir} }}, + ], + + # For 5.97 and earlier, --file-type acted like --indicator-style=slash. + ['file-type', '--file-type d', {OUT => "s@\n"}, + $mkdir_d_slink, $rmdir_d_slink], + + # 7.1 had a regression in how -v -a ordered some files + ['version-sort', '-v -A ' . join (' ', @v_files), + {OUT => join ("\n", @v_files) . "\n"}, + {PRE => sub { mk_file @v_files }}, + {POST => sub { unlink @v_files }}, + ], + + # Test for the ls -1U bug fixed in coreutils-7.5. + # It is triggered only with -1U and with two or more arguments, + # at least one of which is a nonempty directory. + ['multi-arg-U1', '-U1 d no-such', + {OUT => "d:\nf\n"}, + {ERR_SUBST=>'s/ch:.*/ch:/'}, + {ERR => "$prog: cannot access no-such:\n"}, + $mkdir_reg, + $rmdir_reg, + {EXIT => 2}, + ], + ); + +umask 022; + +# Start with an unset LS_COLORS environment variable. +delete $ENV{LS_COLORS}; + +my $save_temps = $ENV{SAVE_TEMPS}; +my $verbose = $ENV{VERBOSE}; + +setuid_setup; +my $fail = run_tests ($ME, $prog, \@Tests, $save_temps, $verbose); +$fail + and exit 1; + +# Be careful to use the just-build dircolors. +my $env = qx/dircolors -b/; +$env =~ s/^LS_COLORS=\'//; +$env =~ s/\';.*//sm; +$ENV{LS_COLORS} = $env; + +setuid_setup; +$fail = run_tests ($ME, $prog, \@Tests, $save_temps, $verbose); +exit $fail; diff --git a/tests/misc/ls-time b/tests/misc/ls-time deleted file mode 100755 index 7d1f205f..00000000 --- a/tests/misc/ls-time +++ /dev/null @@ -1,145 +0,0 @@ -#!/bin/sh -# Test some of ls's sorting options. - -# Copyright (C) 1998-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ ls - -# Avoid any possible glitches due to daylight-saving changes near the -# time stamps used during the test. -TZ=UTC0 -export TZ - -t1='1998-01-15 21:00' -t2='1998-01-15 22:00' -t3='1998-01-15 23:00' - -u1='1998-01-14 11:00' -u2='1998-01-14 12:00' -u3='1998-01-14 13:00' - -touch -m -d "$t3" a || framework_failure_ -touch -m -d "$t2" b || framework_failure_ -touch -m -d "$t1" c || framework_failure_ - -touch -a -d "$u3" c || framework_failure_ -touch -a -d "$u2" b || framework_failure_ -# Make sure A has ctime at least 1 second more recent than C's. -sleep 2 -touch -a -d "$u1" a || framework_failure_ -# Updating the atime is usually enough to update the ctime, but on -# Solaris 10's tmpfs, ctime is not updated, so force an update here: -{ ln a a-ctime && rm a-ctime; } || framework_failure_ - - -# A has ctime more recent than C. -set $(ls -c a c) -test "$*" = 'a c' || fail=1 - -# Sleep so long in an attempt to avoid spurious failures -# due to NFS caching and/or clock skew. -sleep 2 - -# Create a link, updating c's ctime. -ln c d || framework_failure_ - -# Before we go any further, verify that touch's -m option works. -set -- $(ls --full -l a) -case "$*" in - *" $t3:00.000000000 +0000 a") ;; - *) - # This might be what's making HPUX 11 systems fail this test. - cat >&2 << EOF -A basic test of touch -m has just failed, so the subsequent -tests in this file will not be run. - -In the output below, the date of last modification for 'a' should -have been $t3. -EOF - ls --full -l a - framework_failure_ - ;; -esac - -# Ensure that touch's -a option works. -set -- $(ls --full -lu a) -case "$*" in - *" $u1:00.000000000 +0000 a") ;; - *) - # This might be what's making HPUX 11 systems fail this test. - cat >&2 << EOF -A fundamental touch -a test has just failed, so the subsequent -tests in this file will not be run. - -In the output below, the date of last access for 'a' should -have been $u1. -EOF - ls --full -lu a - Exit 77 - ;; -esac - -set $(ls -ut a b c) -test "$*" = 'c b a' && : || fail=1 -test $fail = 1 && ls -l --full-time --time=access a b c - -set $(ls -t a b c) -test "$*" = 'a b c' && : || fail=1 -test $fail = 1 && ls -l --full-time a b c - -# Now, C should have ctime more recent than A. -set $(ls -ct a c) -if test "$*" = 'c a'; then - : ok -else - # In spite of documentation, (e.g., stat(2)), neither link nor chmod - # update a file's st_ctime on SunOS4.1.4. - cat >&2 << \EOF -failed ls ctime test -- this failure is expected at least for SunOS4.1.4 -and for tmpfs file systems on Solaris 5.5.1. -It is also expected to fail on a btrfs file system until -http://bugzilla.redhat.com/591068 is addressed. - -In the output below, 'c' should have had a ctime more recent than -that of 'a', but does not. -EOF - #' - ls -ctl --full-time a c - fail=1 -fi - -# This check is ineffective if: -# en_US locale is not on the system. -# The system en_US message catalog has a specific TIME_FMT translation, -# which was inadvertently the case between coreutils 8.1 and 8.5 inclusive. - -if gettext --version >/dev/null 2>&1; then - - default_tf1='%b %e %Y' - en_tf1=$(LC_ALL=en_US gettext coreutils "$default_tf1") - - if test "$default_tf1" = "$en_tf1"; then - LC_ALL=en_US ls -l c >en_output - ls -l --time-style=long-iso c >liso_output - if compare en_output liso_output; then - fail=1 - echo "Long ISO TIME_FMT being used for en_US locale." >&2 - fi - fi -fi - -Exit $fail diff --git a/tests/misc/ls-time.sh b/tests/misc/ls-time.sh new file mode 100755 index 00000000..80e400f4 --- /dev/null +++ b/tests/misc/ls-time.sh @@ -0,0 +1,145 @@ +#!/bin/sh +# Test some of ls's sorting options. + +# Copyright (C) 1998-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ ls + +# Avoid any possible glitches due to daylight-saving changes near the +# time stamps used during the test. +TZ=UTC0 +export TZ + +t1='1998-01-15 21:00' +t2='1998-01-15 22:00' +t3='1998-01-15 23:00' + +u1='1998-01-14 11:00' +u2='1998-01-14 12:00' +u3='1998-01-14 13:00' + +touch -m -d "$t3" a || framework_failure_ +touch -m -d "$t2" b || framework_failure_ +touch -m -d "$t1" c || framework_failure_ + +touch -a -d "$u3" c || framework_failure_ +touch -a -d "$u2" b || framework_failure_ +# Make sure A has ctime at least 1 second more recent than C's. +sleep 2 +touch -a -d "$u1" a || framework_failure_ +# Updating the atime is usually enough to update the ctime, but on +# Solaris 10's tmpfs, ctime is not updated, so force an update here: +{ ln a a-ctime && rm a-ctime; } || framework_failure_ + + +# A has ctime more recent than C. +set $(ls -c a c) +test "$*" = 'a c' || fail=1 + +# Sleep so long in an attempt to avoid spurious failures +# due to NFS caching and/or clock skew. +sleep 2 + +# Create a link, updating c's ctime. +ln c d || framework_failure_ + +# Before we go any further, verify that touch's -m option works. +set -- $(ls --full -l a) +case "$*" in + *" $t3:00.000000000 +0000 a") ;; + *) + # This might be what's making HPUX 11 systems fail this test. + cat >&2 << EOF +A basic test of touch -m has just failed, so the subsequent +tests in this file will not be run. + +In the output below, the date of last modification for 'a' should +have been $t3. +EOF + ls --full -l a + framework_failure_ + ;; +esac + +# Ensure that touch's -a option works. +set -- $(ls --full -lu a) +case "$*" in + *" $u1:00.000000000 +0000 a") ;; + *) + # This might be what's making HPUX 11 systems fail this test. + cat >&2 << EOF +A fundamental touch -a test has just failed, so the subsequent +tests in this file will not be run. + +In the output below, the date of last access for 'a' should +have been $u1. +EOF + ls --full -lu a + Exit 77 + ;; +esac + +set $(ls -ut a b c) +test "$*" = 'c b a' && : || fail=1 +test $fail = 1 && ls -l --full-time --time=access a b c + +set $(ls -t a b c) +test "$*" = 'a b c' && : || fail=1 +test $fail = 1 && ls -l --full-time a b c + +# Now, C should have ctime more recent than A. +set $(ls -ct a c) +if test "$*" = 'c a'; then + : ok +else + # In spite of documentation, (e.g., stat(2)), neither link nor chmod + # update a file's st_ctime on SunOS4.1.4. + cat >&2 << \EOF +failed ls ctime test -- this failure is expected at least for SunOS4.1.4 +and for tmpfs file systems on Solaris 5.5.1. +It is also expected to fail on a btrfs file system until +http://bugzilla.redhat.com/591068 is addressed. + +In the output below, 'c' should have had a ctime more recent than +that of 'a', but does not. +EOF + #' + ls -ctl --full-time a c + fail=1 +fi + +# This check is ineffective if: +# en_US locale is not on the system. +# The system en_US message catalog has a specific TIME_FMT translation, +# which was inadvertently the case between coreutils 8.1 and 8.5 inclusive. + +if gettext --version >/dev/null 2>&1; then + + default_tf1='%b %e %Y' + en_tf1=$(LC_ALL=en_US gettext coreutils "$default_tf1") + + if test "$default_tf1" = "$en_tf1"; then + LC_ALL=en_US ls -l c >en_output + ls -l --time-style=long-iso c >liso_output + if compare en_output liso_output; then + fail=1 + echo "Long ISO TIME_FMT being used for en_US locale." >&2 + fi + fi +fi + +Exit $fail diff --git a/tests/misc/md5sum b/tests/misc/md5sum deleted file mode 100755 index 946eee86..00000000 --- a/tests/misc/md5sum +++ /dev/null @@ -1,143 +0,0 @@ -#!/usr/bin/perl -# Basic tests for "md5sum". - -# Copyright (C) 1998-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 -# 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; - -my $prog = 'md5sum'; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -my $degenerate = "d41d8cd98f00b204e9800998ecf8427e"; - -my @Tests = - ( - ['1', {IN=> {f=> ''}}, {OUT=>"$degenerate f\n"}], - ['2', {IN=> {f=> 'a'}}, {OUT=>"0cc175b9c0f1b6a831c399e269772661 f\n"}], - ['3', {IN=> {f=> 'abc'}}, {OUT=>"900150983cd24fb0d6963f7d28e17f72 f\n"}], - ['4', {IN=> {f=> 'message digest'}}, - {OUT=>"f96b697d7cb7938d525a2f31aaf161d0 f\n"}], - ['5', {IN=> {f=> 'abcdefghijklmnopqrstuvwxyz'}}, - {OUT=>"c3fcd3d76192e4007dfb496cca67e13b f\n"}], - ['6', {IN=> {f=> join ('', 'A'..'Z', 'a'..'z', '0'..'9')}}, - {OUT=>"d174ab98d277d9f5a5611c2c9f419d9f f\n"}], - ['7', {IN=> {f=> '1234567890' x 8}}, - {OUT=>"57edf4a22be3c955ac49da2e2107b67a f\n"}], - ['backslash', {IN=> {".\\foo"=> ''}}, - {OUT=>"\\$degenerate .\\\\foo\n"}], - ['check-1', '--check', {AUX=> {f=> ''}}, - {IN=> {'f.md5' => "$degenerate f\n"}}, - {OUT=>"f: OK\n"}], - - # Same as above, but with an added empty line, to provoke --strict. - ['ck-strict-1', '--check --strict', {AUX=> {f=> ''}}, - {IN=> {'f.md5' => "$degenerate f\n\n"}}, - {OUT=>"f: OK\n"}, - {ERR=>"md5sum: " - . "WARNING: 1 line is improperly formatted\n"}, - {EXIT=> 1}], - - # As above, but with the invalid line first, to ensure that following - # lines are processed in spite of the preceding invalid input line. - ['ck-strict-2', '--check --strict', {AUX=> {f=> ''}}, - {IN=> {'in.md5' => "\n$degenerate f\n"}}, - {OUT=>"f: OK\n"}, - {ERR=>"md5sum: " - . "WARNING: 1 line is improperly formatted\n"}, - {EXIT=> 1}], - ['check-2', '--check', '--status', {IN=>{'f.md5' => "$degenerate f\n"}}, - {AUX=> {f=> 'foo'}}, {EXIT=> 1}], - ['check-quiet1', '--check', '--quiet', {AUX=> {f=> ''}}, - {IN=> {'f.md5' => "$degenerate f\n"}}, - {OUT=>""}], - ['check-quiet2', '--check', '--quiet', - {IN=>{'f.md5' => "$degenerate f\n"}}, - {AUX=> {f=> 'foo'}}, {OUT=>"f: FAILED\n"}, - {ERR=>"md5sum: WARNING: 1 computed" - . " checksum did NOT match\n"}, - {EXIT=> 1}], - # Exercise new-after-8.6, easier-to-translate diagnostics. - ['check-multifail', '--check', - {IN=>{'f.md5' => - "$degenerate f\n" - . "$degenerate f\n" - . "invalid\n" }}, - {AUX=> {f=> 'foo'}}, - {OUT=>"f: FAILED\nf: FAILED\n"}, - {ERR=>"md5sum: WARNING: 1 line is improperly formatted\n" - . "md5sum: WARNING: 2 computed checksums did NOT match\n"}, - {EXIT=> 1}], - # Similar to the above, but use --warn to evoke one more diagnostic. - ['check-multifail-warn', '--check', '--warn', - {IN=>{'f.md5' => - "$degenerate f\n" - . "$degenerate f\n" - . "invalid\n" }}, - {AUX=> {f=> 'foo'}}, - {OUT=>"f: FAILED\nf: FAILED\n"}, - {ERR=>"md5sum: f.md5: 3: improperly formatted MD5 checksum line\n" - . "md5sum: WARNING: 1 line is improperly formatted\n" - . "md5sum: WARNING: 2 computed checksums did NOT match\n"}, - {EXIT=> 1}], - # The sha1sum and md5sum drivers share a lot of code. - # Ensure that md5sum does *not* share the part that makes - # sha1sum accept BSD format. - ['check-bsd', '--check', {IN=> {'f.sha1' => "SHA1 (f) = $degenerate\n"}}, - {AUX=> {f=> ''}}, - {ERR=>"md5sum: f.sha1: no properly formatted " - . "MD5 checksum lines found\n"}, - {EXIT=> 1}], - ['check-bsd2', '--check', {IN=> {'f.md5' => "MD5 (f) = $degenerate\n"}}, - {AUX=> {f=> ''}}, {OUT=>"f: OK\n"}], - ['check-bsd3', '--check', '--status', - {IN=> {'f.md5' => "MD5 (f) = $degenerate\n"}}, - {AUX=> {f=> 'bar'}}, {EXIT=> 1}], - ['check-openssl', '--check', {IN=> {'f.sha1' => "SHA1(f)= $degenerate\n"}}, - {AUX=> {f=> ''}}, - {ERR=>"md5sum: f.sha1: no properly formatted " - . "MD5 checksum lines found\n"}, - {EXIT=> 1}], - ['check-openssl2', '--check', {IN=> {'f.md5' => "MD5(f)= $degenerate\n"}}, - {AUX=> {f=> ''}}, {OUT=>"f: OK\n"}], - ['check-openssl3', '--check', '--status', - {IN=> {'f.md5' => "MD5(f)= $degenerate\n"}}, - {AUX=> {f=> 'bar'}}, {EXIT=> 1}], - ['bsd-segv', '--check', {IN=> {'z' => "MD5 ("}}, {EXIT=> 1}, - {ERR=> "$prog: z: no properly formatted MD5 checksum lines found\n"}], - - # Ensure that when there's a NUL byte among the checksum hex digits - # we detect the invalid formatting and don't even open the file. - # Up to coreutils-6.10, this would report: - # h: FAILED - # md5sum: WARNING: 1 of 1 computed checksum did NOT match - ['nul-in-cksum', '--check', {IN=> {'h'=>("\0"x32)." h\n"}}, {EXIT=> 1}, - {ERR=> "$prog: h: no properly formatted MD5 checksum lines found\n"}], - ); - -# Insert the '--text' argument for each test. -my $t; -foreach $t (@Tests) - { - splice @$t, 1, 0, '--text' unless @$t[1] =~ /--check/; - } - -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/md5sum-bsd b/tests/misc/md5sum-bsd deleted file mode 100755 index 8226d7ab..00000000 --- a/tests/misc/md5sum-bsd +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh -# make sure 'md5sum -c' works for alternate BSD format (md5 -r) - -# Copyright (C) 2011-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ md5sum - -# Note we start this list with a name -# that's unambiguous in BSD format. -# I.E. one not starting with ' ' or '*' -for i in 'a' ' b' '*c' 'dd' ' '; do - echo "$i" > "$i" - md5sum "$i" >> check.md5sum -done -sed 's/ / /' check.md5sum > check.md5 - -# Note only a single format is supported per run -md5sum --strict -c check.md5sum || fail=1 -md5sum --strict -c check.md5 || fail=1 - -# If we skip the first entry in the BSD format checksums -# then it'll be detected as standard format and error. -# This unlikely caveat was thought better than mandating -# an option to avoid the ambiguity. -tail -n+2 check.md5 | md5sum --strict -c && fail=1 - -Exit $fail diff --git a/tests/misc/md5sum-bsd.sh b/tests/misc/md5sum-bsd.sh new file mode 100755 index 00000000..6b70f21a --- /dev/null +++ b/tests/misc/md5sum-bsd.sh @@ -0,0 +1,88 @@ +#!/bin/sh +# 'md5sum' tests for generation and checking of +# BSD traditional and alternate formats (md5 [-r]) + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ md5sum + +## BSD alternate format tests ## + +# Ensure we can --check BSD alternate format. +# Note we start this list with a name +# that's unambiguous in BSD format. +# I.E. one not starting with ' ' or '*' +for i in 'a' ' b' '*c' 'dd' ' '; do + echo "$i" > "$i" + md5sum "$i" >> check.md5sum +done +sed 's/ / /' check.md5sum > check.md5 + +# Note only a single format is supported per run +md5sum --strict -c check.md5sum || fail=1 +md5sum --strict -c check.md5 || fail=1 + +# If we skip the first entry in the BSD format checksums +# then it'll be detected as standard format and error. +# This unlikely caveat was thought better than mandating +# an option to avoid the ambiguity. +tail -n+2 check.md5 | md5sum --strict -c && fail=1 + + +## BSD traditional format tests (--tag option) ## + +# Ensure --tag and --check are mutually exclusive +md5sum --tag --check /dev/null && fail=1 + +# Ensure --tag and --text are mutually exclusive +# We don't support --text with BSD tradition format, +# as that would complicate the output format, +# while providing little benefit over --text processing +# available with the default md5sum output format. +md5sum --tag --text /dev/null && fail=1 + +# Ensure we can --check BSD traditional format we produce +rm check.md5 +for i in 'a' ' b' '*c' 'dd' ' '; do + echo "$i" > "$i" + md5sum --tag "$i" >> check.md5 +done +md5sum --strict -c check.md5 || fail=1 + +# Ensure we can --check BSD traditional format we produce +# with the GNU extension of escaped newlines +nl=' +' +tab=' ' +rm check.md5 +for i in 'a\b' 'a\' "a${nl}b" "a${tab}b"; do + :> "$i" + md5sum --tag "$i" >> check.md5 +done +md5sum --strict -c check.md5 || fail=1 + +# Ensure BSD traditional format with GNU extension escapes +# is in the expected format +ex_file='test +\\file' +ex_output='\MD5 (test\n\\\\file) = d41d8cd98f00b204e9800998ecf8427e' +touch "$ex_file" +printf "%s\n" "$ex_output" > exp +md5sum --tag "$ex_file" > out +compare exp out || fail=1 + +Exit $fail diff --git a/tests/misc/md5sum-newline b/tests/misc/md5sum-newline deleted file mode 100755 index 777241ff..00000000 --- a/tests/misc/md5sum-newline +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/perl -# Newline tests for "md5sum". - -# Copyright (C) 1999-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 -# 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; - -(my $ME = $0) =~ s|.*/||; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -# See if we can create a file name that contains a newline. -# Use system, since Perl doesn't let you do this with "open". -system ('touch', "a\nb") == 0 - or CuSkip::skip "$ME: failed to create newline-containing file name\n"; - -my $degenerate = "d41d8cd98f00b204e9800998ecf8427e"; -my $t = '--text'; - -my @Tests = - ( - ['newline', $t, {IN=> {"a\nb"=> ''}}, {OUT=>"\\$degenerate a\\nb\n"}], - ); - -my $save_temps = $ENV{DEBUG}; -my $verbose = $ENV{VERBOSE}; - -my $prog = 'md5sum'; -my $fail = run_tests ($ME, $prog, \@Tests, $save_temps, $verbose); -exit $fail; diff --git a/tests/misc/md5sum-newline.pl b/tests/misc/md5sum-newline.pl new file mode 100755 index 00000000..ad1b6acb --- /dev/null +++ b/tests/misc/md5sum-newline.pl @@ -0,0 +1,44 @@ +#!/usr/bin/perl +# Newline tests for "md5sum". + +# Copyright (C) 1999-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/>. + +use strict; + +(my $ME = $0) =~ s|.*/||; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +# See if we can create a file name that contains a newline. +# Use system, since Perl doesn't let you do this with "open". +system ('touch', "a\nb") == 0 + or CuSkip::skip "$ME: failed to create newline-containing file name\n"; + +my $degenerate = "d41d8cd98f00b204e9800998ecf8427e"; +my $t = '--text'; + +my @Tests = + ( + ['newline', $t, {IN=> {"a\nb"=> ''}}, {OUT=>"\\$degenerate a\\nb\n"}], + ); + +my $save_temps = $ENV{DEBUG}; +my $verbose = $ENV{VERBOSE}; + +my $prog = 'md5sum'; +my $fail = run_tests ($ME, $prog, \@Tests, $save_temps, $verbose); +exit $fail; diff --git a/tests/misc/md5sum-parallel b/tests/misc/md5sum-parallel deleted file mode 100755 index 0bf5fa9c..00000000 --- a/tests/misc/md5sum-parallel +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# Ensure that md5sum prints each checksum atomically -# so that concurrent md5sums don't intersperse their output - -# Copyright (C) 2009-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ md5sum - -(mkdir tmp && cd tmp && seq 500 | xargs touch) - -# This will output at least 16KiB per process -# and start 3 processes, with 2 running concurrently, -# which triggers often on Fedora 11 at least. -(find tmp tmp tmp -type f | xargs -n500 -P2 md5sum) | -sed -n '/[0-9a-f]\{32\} /!p' | -grep . > /dev/null && fail=1 - -Exit $fail diff --git a/tests/misc/md5sum-parallel.sh b/tests/misc/md5sum-parallel.sh new file mode 100755 index 00000000..648bfa5b --- /dev/null +++ b/tests/misc/md5sum-parallel.sh @@ -0,0 +1,32 @@ +#!/bin/sh +# Ensure that md5sum prints each checksum atomically +# so that concurrent md5sums don't intersperse their output + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ md5sum + +(mkdir tmp && cd tmp && seq 500 | xargs touch) + +# This will output at least 16KiB per process +# and start 3 processes, with 2 running concurrently, +# which triggers often on Fedora 11 at least. +(find tmp tmp tmp -type f | xargs -n500 -P2 md5sum) | +sed -n '/[0-9a-f]\{32\} /!p' | +grep . > /dev/null && fail=1 + +Exit $fail diff --git a/tests/misc/md5sum.pl b/tests/misc/md5sum.pl new file mode 100755 index 00000000..5192d55f --- /dev/null +++ b/tests/misc/md5sum.pl @@ -0,0 +1,143 @@ +#!/usr/bin/perl +# Basic tests for "md5sum". + +# Copyright (C) 1998-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/>. + +use strict; + +my $prog = 'md5sum'; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +my $degenerate = "d41d8cd98f00b204e9800998ecf8427e"; + +my @Tests = + ( + ['1', {IN=> {f=> ''}}, {OUT=>"$degenerate f\n"}], + ['2', {IN=> {f=> 'a'}}, {OUT=>"0cc175b9c0f1b6a831c399e269772661 f\n"}], + ['3', {IN=> {f=> 'abc'}}, {OUT=>"900150983cd24fb0d6963f7d28e17f72 f\n"}], + ['4', {IN=> {f=> 'message digest'}}, + {OUT=>"f96b697d7cb7938d525a2f31aaf161d0 f\n"}], + ['5', {IN=> {f=> 'abcdefghijklmnopqrstuvwxyz'}}, + {OUT=>"c3fcd3d76192e4007dfb496cca67e13b f\n"}], + ['6', {IN=> {f=> join ('', 'A'..'Z', 'a'..'z', '0'..'9')}}, + {OUT=>"d174ab98d277d9f5a5611c2c9f419d9f f\n"}], + ['7', {IN=> {f=> '1234567890' x 8}}, + {OUT=>"57edf4a22be3c955ac49da2e2107b67a f\n"}], + ['backslash', {IN=> {".\\foo"=> ''}}, + {OUT=>"\\$degenerate .\\\\foo\n"}], + ['check-1', '--check', {AUX=> {f=> ''}}, + {IN=> {'f.md5' => "$degenerate f\n"}}, + {OUT=>"f: OK\n"}], + + # Same as above, but with an added empty line, to provoke --strict. + ['ck-strict-1', '--check --strict', {AUX=> {f=> ''}}, + {IN=> {'f.md5' => "$degenerate f\n\n"}}, + {OUT=>"f: OK\n"}, + {ERR=>"md5sum: " + . "WARNING: 1 line is improperly formatted\n"}, + {EXIT=> 1}], + + # As above, but with the invalid line first, to ensure that following + # lines are processed in spite of the preceding invalid input line. + ['ck-strict-2', '--check --strict', {AUX=> {f=> ''}}, + {IN=> {'in.md5' => "\n$degenerate f\n"}}, + {OUT=>"f: OK\n"}, + {ERR=>"md5sum: " + . "WARNING: 1 line is improperly formatted\n"}, + {EXIT=> 1}], + ['check-2', '--check', '--status', {IN=>{'f.md5' => "$degenerate f\n"}}, + {AUX=> {f=> 'foo'}}, {EXIT=> 1}], + ['check-quiet1', '--check', '--quiet', {AUX=> {f=> ''}}, + {IN=> {'f.md5' => "$degenerate f\n"}}, + {OUT=>""}], + ['check-quiet2', '--check', '--quiet', + {IN=>{'f.md5' => "$degenerate f\n"}}, + {AUX=> {f=> 'foo'}}, {OUT=>"f: FAILED\n"}, + {ERR=>"md5sum: WARNING: 1 computed" + . " checksum did NOT match\n"}, + {EXIT=> 1}], + # Exercise new-after-8.6, easier-to-translate diagnostics. + ['check-multifail', '--check', + {IN=>{'f.md5' => + "$degenerate f\n" + . "$degenerate f\n" + . "invalid\n" }}, + {AUX=> {f=> 'foo'}}, + {OUT=>"f: FAILED\nf: FAILED\n"}, + {ERR=>"md5sum: WARNING: 1 line is improperly formatted\n" + . "md5sum: WARNING: 2 computed checksums did NOT match\n"}, + {EXIT=> 1}], + # Similar to the above, but use --warn to evoke one more diagnostic. + ['check-multifail-warn', '--check', '--warn', + {IN=>{'f.md5' => + "$degenerate f\n" + . "$degenerate f\n" + . "invalid\n" }}, + {AUX=> {f=> 'foo'}}, + {OUT=>"f: FAILED\nf: FAILED\n"}, + {ERR=>"md5sum: f.md5: 3: improperly formatted MD5 checksum line\n" + . "md5sum: WARNING: 1 line is improperly formatted\n" + . "md5sum: WARNING: 2 computed checksums did NOT match\n"}, + {EXIT=> 1}], + # The sha1sum and md5sum drivers share a lot of code. + # Ensure that md5sum does *not* share the part that makes + # sha1sum accept BSD format. + ['check-bsd', '--check', {IN=> {'f.sha1' => "SHA1 (f) = $degenerate\n"}}, + {AUX=> {f=> ''}}, + {ERR=>"md5sum: f.sha1: no properly formatted " + . "MD5 checksum lines found\n"}, + {EXIT=> 1}], + ['check-bsd2', '--check', {IN=> {'f.md5' => "MD5 (f) = $degenerate\n"}}, + {AUX=> {f=> ''}}, {OUT=>"f: OK\n"}], + ['check-bsd3', '--check', '--status', + {IN=> {'f.md5' => "MD5 (f) = $degenerate\n"}}, + {AUX=> {f=> 'bar'}}, {EXIT=> 1}], + ['check-openssl', '--check', {IN=> {'f.sha1' => "SHA1(f)= $degenerate\n"}}, + {AUX=> {f=> ''}}, + {ERR=>"md5sum: f.sha1: no properly formatted " + . "MD5 checksum lines found\n"}, + {EXIT=> 1}], + ['check-openssl2', '--check', {IN=> {'f.md5' => "MD5(f)= $degenerate\n"}}, + {AUX=> {f=> ''}}, {OUT=>"f: OK\n"}], + ['check-openssl3', '--check', '--status', + {IN=> {'f.md5' => "MD5(f)= $degenerate\n"}}, + {AUX=> {f=> 'bar'}}, {EXIT=> 1}], + ['bsd-segv', '--check', {IN=> {'z' => "MD5 ("}}, {EXIT=> 1}, + {ERR=> "$prog: z: no properly formatted MD5 checksum lines found\n"}], + + # Ensure that when there's a NUL byte among the checksum hex digits + # we detect the invalid formatting and don't even open the file. + # Up to coreutils-6.10, this would report: + # h: FAILED + # md5sum: WARNING: 1 of 1 computed checksum did NOT match + ['nul-in-cksum', '--check', {IN=> {'h'=>("\0"x32)." h\n"}}, {EXIT=> 1}, + {ERR=> "$prog: h: no properly formatted MD5 checksum lines found\n"}], + ); + +# Insert the '--text' argument for each test. +my $t; +foreach $t (@Tests) + { + splice @$t, 1, 0, '--text' unless @$t[1] =~ /--check/; + } + +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/mknod b/tests/misc/mknod deleted file mode 100755 index b9e33ad2..00000000 --- a/tests/misc/mknod +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -# Ensure that mknod, mkfifo, mkdir -m MODE work with a restrictive umask - -# Copyright (C) 2004-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ mknod - -# Ensure fifos are supported -mkfifo_or_skip_ fifo - -umask 777 - -mknod -m 734 f1 p || fail=1 -mode=$(ls -dgo f1|cut -b-10) -test $mode = prwx-wxr-- || fail=1 - -mkfifo -m 734 f2 || fail=1 -mode=$(ls -dgo f2|cut -b-10) -test $mode = prwx-wxr-- || fail=1 - -mkdir -m 734 f3 || fail=1 -mode=$(ls -dgo f3|cut -b-10) -test $mode = drwx-wxr-- || test $mode = drwx-wsr-- || fail=1 - -Exit $fail diff --git a/tests/misc/mknod.sh b/tests/misc/mknod.sh new file mode 100755 index 00000000..30f363f6 --- /dev/null +++ b/tests/misc/mknod.sh @@ -0,0 +1,39 @@ +#!/bin/sh +# Ensure that mknod, mkfifo, mkdir -m MODE work with a restrictive umask + +# Copyright (C) 2004-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ mknod + +# Ensure fifos are supported +mkfifo_or_skip_ fifo + +umask 777 + +mknod -m 734 f1 p || fail=1 +mode=$(ls -dgo f1|cut -b-10) +test $mode = prwx-wxr-- || fail=1 + +mkfifo -m 734 f2 || fail=1 +mode=$(ls -dgo f2|cut -b-10) +test $mode = prwx-wxr-- || fail=1 + +mkdir -m 734 f3 || fail=1 +mode=$(ls -dgo f3|cut -b-10) +test $mode = drwx-wxr-- || test $mode = drwx-wsr-- || fail=1 + +Exit $fail diff --git a/tests/misc/mktemp b/tests/misc/mktemp deleted file mode 100755 index 49dfde49..00000000 --- a/tests/misc/mktemp +++ /dev/null @@ -1,204 +0,0 @@ -#!/usr/bin/perl -# Test "mktemp". - -# Copyright (C) 2007-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 -# 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; - -(my $ME = $0) =~ s|.*/||; - -sub check_tmp($$) -{ - my ($file, $file_or_dir) = @_; - - my (undef, undef, $mode, undef) = stat $file - or die "$ME: failed to stat $file: $!\n"; - my $required_mode; - if ($file_or_dir eq 'D') { - -d $file or die "$ME: $file isn't a directory\n"; - -x $file or die "$ME: $file isn't owner-searchable\n"; - $required_mode = 0700; - } elsif ($file_or_dir eq 'F') { - -f $file or die "$ME: $file isn't a regular file\n"; - $required_mode = 0600; - } - -r $file or die "$ME: $file isn't owner-readable\n"; - -w $file or die "$ME: $file isn't owner-writable\n"; - ($mode & 0777) == $required_mode - or die "$ME: $file doesn't have required permissions\n"; - - $file_or_dir eq 'D' - and do { rmdir $file or die "$ME: failed to rmdir $file: $!\n" }; - $file_or_dir eq 'F' - and do { unlink $file or die "$ME: failed to unlink $file: $!\n" }; -} - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; -my $prog = 'mktemp'; -my $bad_dir = 'no/such/dir'; - -my @Tests = - ( - # test-name, [option, option, ...] {OUT=>"expected-output"} - # - ['too-many', '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}, - {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,'}, - {POST => sub { my ($f) = @_; defined $f or return; chomp $f; - check_tmp $f, 'F'; }} - ], - - ['2f', '-- -XXXX', {OUT => "-ZZZZ\n"}, - {OUT_SUBST => 's,-....$,-ZZZZ,'}, - {POST => sub { my ($f) = @_; defined $f or return; chomp $f; - check_tmp $f, 'F'; }} - ], - - # Create a temporary directory. - ['1d', '-d f.XXXX', {OUT => "f.ZZZZ\n"}, - {OUT_SUBST => 's,\.....$,.ZZZZ,'}, - {POST => sub { my ($f) = @_; defined $f or return; chomp $f; - check_tmp $f, 'D'; }} - ], - - # Use a template consisting solely of X's - ['1d-allX', '-d XXXX', {OUT => "ZZZZ\n"}, - {PRE => sub {mkdir 'XXXX',0755 or die "XXXX: $!\n"}}, - {OUT_SUBST => 's,^....$,ZZZZ,'}, - {POST => sub { my ($f) = @_; defined $f or return; chomp $f; - check_tmp $f, 'D'; rmdir 'XXXX' or die "rmdir XXXX: $!\n"; }} - ], - - # Test -u - ['uf', '-u f.XXXX', {OUT => "f.ZZZZ\n"}, - {OUT_SUBST => 's,\.....$,.ZZZZ,'}, - {POST => sub { my ($f) = @_; defined $f or return; chomp $f; - -e $f and die "dry-run created file"; }}], - ['ud', '-d --dry-run d.XXXX', {OUT => "d.ZZZZ\n"}, - {OUT_SUBST => 's,\.....$,.ZZZZ,'}, - {POST => sub { my ($f) = @_; defined $f or return; chomp $f; - -e $f and die "dry-run created directory"; }}], - - # Test bad templates - ['invalid-tl', '-t a/bXXXX', - {ERR=>"$prog: invalid template, 'a/bXXXX', " - . "contains directory separator\n"}, {EXIT => 1} ], - - ['invalid-t2', '--tmpdir=a /bXXXX', - {ERR=>"$prog: invalid template, '/bXXXX'; " - . "with --tmpdir, it may not be absolute\n"}, {EXIT => 1} ], - - # Suffix after X. - ['suffix1f', 'aXXXXb', {OUT=>"aZZZZb\n"}, - {OUT_SUBST=>'s,a....b,aZZZZb,'}, - {POST => sub { my ($f) = @_; defined $f or return; chomp $f; - check_tmp $f, 'F'; }}], - ['suffix1d', '-d aXXXXb', {OUT=>"aZZZZb\n"}, - {OUT_SUBST=>'s,a....b,aZZZZb,'}, - {POST => sub { my ($f) = @_; defined $f or return; chomp $f; - check_tmp $f, 'D'; }}], - ['suffix1u', '-u aXXXXb', {OUT=>"aZZZZb\n"}, - {OUT_SUBST=>'s,a....b,aZZZZb,'}, - {POST => sub { my ($f) = @_; defined $f or return; chomp $f; - -e $f and die "dry-run created file"; }}], - - ['suffix2f', 'aXXXXaaXXXXa', {OUT=>"aXXXXaaZZZZa\n"}, - {OUT_SUBST=>'s,a....a$,aZZZZa,'}, - {POST => sub { my ($f) = @_; defined $f or return; chomp $f; - check_tmp $f, 'F'; }}], - ['suffix2d', '-d --suffix= aXXXXaaXXXX', {OUT=>"aXXXXaaZZZZ\n"}, - {OUT_SUBST=>'s,a....$,aZZZZ,'}, - {POST => sub { my ($f) = @_; defined $f or return; chomp $f; - check_tmp $f, 'D'; }}], - - ['suffix3f', '--suffix=b aXXXX', {OUT=>"aZZZZb\n"}, - {OUT_SUBST=>'s,a....b,aZZZZb,'}, - {POST => sub { my ($f) = @_; defined $f or return; chomp $f; - check_tmp $f, 'F'; }}], - - ['suffix4f', '--suffix=X aXXXX', {OUT=>"aZZZZX\n"}, - {OUT_SUBST=>'s,^a....,aZZZZ,'}, - {POST => sub { my ($f) = @_; defined $f or return; chomp $f; - check_tmp $f, 'F'; }}], - - ['suffix5f', '--suffix /b aXXXX', {EXIT=>1}, - {ERR=>"$prog: invalid suffix '/b', contains directory separator\n"}], - - ['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"}], - - ['suffix8f', 'aXXXX --suffix=b', {OUT=>"aZZZZb\n"}, - {OUT_SUBST=>'s,^a....,aZZZZ,'}, - {POST => sub { my ($f) = @_; defined $f or return; chomp $f; - check_tmp $f, 'F'; }}], - - ['suffix9f', 'aXXXX --suffix=b', {EXIT=>1}, - {ENV=>"POSIXLY_CORRECT=1"}, - {ERR=>"$prog: too many templates\n" - . "Try '$prog --help' for more information.\n"}], - - ['suffix10f', 'aXXb', {EXIT => 1}, - {ERR=>"$prog: too few X's in template 'aXXb'\n"}], - ['suffix10d', '-d --suffix=X aXX', {EXIT => 1}, - {ERR=>"$prog: too few X's in template 'aXXX'\n"}], - - ['suffix11f', '--suffix=.txt', {OUT=>"./tmp.ZZZZZZZZZZ.txt\n"}, - {ENV=>"TMPDIR=."}, - {OUT_SUBST=>'s,\..{10}\.,.ZZZZZZZZZZ.,'}, - {POST => sub { my ($f) = @_; defined $f or return; chomp $f; - check_tmp $f, 'F'; }}], - - - # Test template with subdirectory - ['tmp-w-slash', '--tmpdir=. a/bXXXX', - {PRE => sub {mkdir 'a',0755 or die "a: $!\n"}}, - {OUT_SUBST => 's,b....$,bZZZZ,'}, - {OUT => "./a/bZZZZ\n"}, - {POST => sub { my ($f) = @_; defined $f or return; chomp $f; - check_tmp $f, 'F'; unlink $f; rmdir 'a' or die "rmdir a: $!\n" }} - ], - - ['pipe-bad-tmpdir', - {ENV => "TMPDIR=$bad_dir"}, - {ERR_SUBST => "s,($bad_dir/)[^']+': .*,\$1...,"}, - {ERR => "$prog: failed to create file via template '$bad_dir/...\n"}, - {EXIT => 1}], - ['pipe-bad-tmpdir-u', '-u', {OUT => "$bad_dir/tmp.ZZZZZZZZZZ\n"}, - {ENV => "TMPDIR=$bad_dir"}, - {OUT_SUBST => 's,\..{10}$,.ZZZZZZZZZZ,'}], - ); - -my $save_temps = $ENV{DEBUG}; -my $verbose = $ENV{VERBOSE}; - -my $fail = run_tests ($ME, $prog, \@Tests, $save_temps, $verbose); -exit $fail; diff --git a/tests/misc/mktemp.pl b/tests/misc/mktemp.pl new file mode 100755 index 00000000..b15b6694 --- /dev/null +++ b/tests/misc/mktemp.pl @@ -0,0 +1,204 @@ +#!/usr/bin/perl +# Test "mktemp". + +# Copyright (C) 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/>. + +use strict; + +(my $ME = $0) =~ s|.*/||; + +sub check_tmp($$) +{ + my ($file, $file_or_dir) = @_; + + my (undef, undef, $mode, undef) = stat $file + or die "$ME: failed to stat $file: $!\n"; + my $required_mode; + if ($file_or_dir eq 'D') { + -d $file or die "$ME: $file isn't a directory\n"; + -x $file or die "$ME: $file isn't owner-searchable\n"; + $required_mode = 0700; + } elsif ($file_or_dir eq 'F') { + -f $file or die "$ME: $file isn't a regular file\n"; + $required_mode = 0600; + } + -r $file or die "$ME: $file isn't owner-readable\n"; + -w $file or die "$ME: $file isn't owner-writable\n"; + ($mode & 0777) == $required_mode + or die "$ME: $file doesn't have required permissions\n"; + + $file_or_dir eq 'D' + and do { rmdir $file or die "$ME: failed to rmdir $file: $!\n" }; + $file_or_dir eq 'F' + and do { unlink $file or die "$ME: failed to unlink $file: $!\n" }; +} + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; +my $prog = 'mktemp'; +my $bad_dir = 'no/such/dir'; + +my @Tests = + ( + # test-name, [option, option, ...] {OUT=>"expected-output"} + # + ['too-many', '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}, + {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,'}, + {POST => sub { my ($f) = @_; defined $f or return; chomp $f; + check_tmp $f, 'F'; }} + ], + + ['2f', '-- -XXXX', {OUT => "-ZZZZ\n"}, + {OUT_SUBST => 's,-....$,-ZZZZ,'}, + {POST => sub { my ($f) = @_; defined $f or return; chomp $f; + check_tmp $f, 'F'; }} + ], + + # Create a temporary directory. + ['1d', '-d f.XXXX', {OUT => "f.ZZZZ\n"}, + {OUT_SUBST => 's,\.....$,.ZZZZ,'}, + {POST => sub { my ($f) = @_; defined $f or return; chomp $f; + check_tmp $f, 'D'; }} + ], + + # Use a template consisting solely of X's + ['1d-allX', '-d XXXX', {OUT => "ZZZZ\n"}, + {PRE => sub {mkdir 'XXXX',0755 or die "XXXX: $!\n"}}, + {OUT_SUBST => 's,^....$,ZZZZ,'}, + {POST => sub { my ($f) = @_; defined $f or return; chomp $f; + check_tmp $f, 'D'; rmdir 'XXXX' or die "rmdir XXXX: $!\n"; }} + ], + + # Test -u + ['uf', '-u f.XXXX', {OUT => "f.ZZZZ\n"}, + {OUT_SUBST => 's,\.....$,.ZZZZ,'}, + {POST => sub { my ($f) = @_; defined $f or return; chomp $f; + -e $f and die "dry-run created file"; }}], + ['ud', '-d --dry-run d.XXXX', {OUT => "d.ZZZZ\n"}, + {OUT_SUBST => 's,\.....$,.ZZZZ,'}, + {POST => sub { my ($f) = @_; defined $f or return; chomp $f; + -e $f and die "dry-run created directory"; }}], + + # Test bad templates + ['invalid-tl', '-t a/bXXXX', + {ERR=>"$prog: invalid template, 'a/bXXXX', " + . "contains directory separator\n"}, {EXIT => 1} ], + + ['invalid-t2', '--tmpdir=a /bXXXX', + {ERR=>"$prog: invalid template, '/bXXXX'; " + . "with --tmpdir, it may not be absolute\n"}, {EXIT => 1} ], + + # Suffix after X. + ['suffix1f', 'aXXXXb', {OUT=>"aZZZZb\n"}, + {OUT_SUBST=>'s,a....b,aZZZZb,'}, + {POST => sub { my ($f) = @_; defined $f or return; chomp $f; + check_tmp $f, 'F'; }}], + ['suffix1d', '-d aXXXXb', {OUT=>"aZZZZb\n"}, + {OUT_SUBST=>'s,a....b,aZZZZb,'}, + {POST => sub { my ($f) = @_; defined $f or return; chomp $f; + check_tmp $f, 'D'; }}], + ['suffix1u', '-u aXXXXb', {OUT=>"aZZZZb\n"}, + {OUT_SUBST=>'s,a....b,aZZZZb,'}, + {POST => sub { my ($f) = @_; defined $f or return; chomp $f; + -e $f and die "dry-run created file"; }}], + + ['suffix2f', 'aXXXXaaXXXXa', {OUT=>"aXXXXaaZZZZa\n"}, + {OUT_SUBST=>'s,a....a$,aZZZZa,'}, + {POST => sub { my ($f) = @_; defined $f or return; chomp $f; + check_tmp $f, 'F'; }}], + ['suffix2d', '-d --suffix= aXXXXaaXXXX', {OUT=>"aXXXXaaZZZZ\n"}, + {OUT_SUBST=>'s,a....$,aZZZZ,'}, + {POST => sub { my ($f) = @_; defined $f or return; chomp $f; + check_tmp $f, 'D'; }}], + + ['suffix3f', '--suffix=b aXXXX', {OUT=>"aZZZZb\n"}, + {OUT_SUBST=>'s,a....b,aZZZZb,'}, + {POST => sub { my ($f) = @_; defined $f or return; chomp $f; + check_tmp $f, 'F'; }}], + + ['suffix4f', '--suffix=X aXXXX', {OUT=>"aZZZZX\n"}, + {OUT_SUBST=>'s,^a....,aZZZZ,'}, + {POST => sub { my ($f) = @_; defined $f or return; chomp $f; + check_tmp $f, 'F'; }}], + + ['suffix5f', '--suffix /b aXXXX', {EXIT=>1}, + {ERR=>"$prog: invalid suffix '/b', contains directory separator\n"}], + + ['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"}], + + ['suffix8f', 'aXXXX --suffix=b', {OUT=>"aZZZZb\n"}, + {OUT_SUBST=>'s,^a....,aZZZZ,'}, + {POST => sub { my ($f) = @_; defined $f or return; chomp $f; + check_tmp $f, 'F'; }}], + + ['suffix9f', 'aXXXX --suffix=b', {EXIT=>1}, + {ENV=>"POSIXLY_CORRECT=1"}, + {ERR=>"$prog: too many templates\n" + . "Try '$prog --help' for more information.\n"}], + + ['suffix10f', 'aXXb', {EXIT => 1}, + {ERR=>"$prog: too few X's in template 'aXXb'\n"}], + ['suffix10d', '-d --suffix=X aXX', {EXIT => 1}, + {ERR=>"$prog: too few X's in template 'aXXX'\n"}], + + ['suffix11f', '--suffix=.txt', {OUT=>"./tmp.ZZZZZZZZZZ.txt\n"}, + {ENV=>"TMPDIR=."}, + {OUT_SUBST=>'s,\..{10}\.,.ZZZZZZZZZZ.,'}, + {POST => sub { my ($f) = @_; defined $f or return; chomp $f; + check_tmp $f, 'F'; }}], + + + # Test template with subdirectory + ['tmp-w-slash', '--tmpdir=. a/bXXXX', + {PRE => sub {mkdir 'a',0755 or die "a: $!\n"}}, + {OUT_SUBST => 's,b....$,bZZZZ,'}, + {OUT => "./a/bZZZZ\n"}, + {POST => sub { my ($f) = @_; defined $f or return; chomp $f; + check_tmp $f, 'F'; unlink $f; rmdir 'a' or die "rmdir a: $!\n" }} + ], + + ['pipe-bad-tmpdir', + {ENV => "TMPDIR=$bad_dir"}, + {ERR_SUBST => "s,($bad_dir/)[^']+': .*,\$1...,"}, + {ERR => "$prog: failed to create file via template '$bad_dir/...\n"}, + {EXIT => 1}], + ['pipe-bad-tmpdir-u', '-u', {OUT => "$bad_dir/tmp.ZZZZZZZZZZ\n"}, + {ENV => "TMPDIR=$bad_dir"}, + {OUT_SUBST => 's,\..{10}$,.ZZZZZZZZZZ,'}], + ); + +my $save_temps = $ENV{DEBUG}; +my $verbose = $ENV{VERBOSE}; + +my $fail = run_tests ($ME, $prog, \@Tests, $save_temps, $verbose); +exit $fail; diff --git a/tests/misc/nice b/tests/misc/nice deleted file mode 100755 index ac8ea04e..00000000 --- a/tests/misc/nice +++ /dev/null @@ -1,94 +0,0 @@ -#! /bin/sh -# Test "nice". - -# Copyright (C) 2002-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ nice - -tests=' -0 empty 10 -1 -1 1 -2 -12 12 -3 -1:-2 2 -4 -n:1 1 -5 -n:1:-2 2 -6 -n:1:-+12 12 -7 -2:-n:1 1 -8 -2:-n:12 12 -9 -+1 1 -10 -+12 12 -11 -+1:-+12 12 -12 -n:+1 1 -13 --1:-2 2 -14 --1:-2:-13 13 -15 --1:-n:2 2 -16 --1:-n:2:-3 3 -17 --1:-n:2:-13 13 -18 -n:-1:-12 12 -19 --1:-12 12 -NA LAST NA -' -set $tests - -# Require that this test be run at 'nice' level 0. -niceness=$(nice) -if test "$niceness" = 0; then - : ok -else - skip_ "this test must be run at nice level 0" -fi - -while :; do - test_name=$1 - args=$2 - expected_result=$3 - test $args = empty && args='' - test x$args = xLAST && break - args=$(echo x$args|tr : ' '|sed 's/^x//') - if test "$VERBOSE" = yes; then - #echo "testing \$(nice $args nice\) = $expected_result ..." - echo "test $test_name... " | tr -d '\n' - fi - test x$(nice $args nice 2> /dev/null) = x$expected_result \ - && ok=ok || ok=FAIL fail=1 - test "$VERBOSE" = yes && echo $ok - shift; shift; shift -done - -# Test negative niceness - command must be run whether or not change happens. -if test x$(nice -n -1 nice 2> /dev/null) = x0 ; then - # unprivileged user - warn about failure to change - nice -n -1 true 2> err || fail=1 - test -s err || fail=1 - mv err exp || framework_failure_ - nice --1 true 2> err || fail=1 - compare exp err || fail=1 - # Failure to write advisory message is fatal. Buggy through coreutils 8.0. - 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 - fi -else - # superuser - change succeeds - nice -n -1 nice 2> err || fail=1 - test -s err && fail=1 - test x$(nice -n -1 nice) = x-1 || fail=1 - test x$(nice --1 nice) = x-1 || fail=1 -fi - -Exit $fail diff --git a/tests/misc/nice-fail b/tests/misc/nice-fail deleted file mode 100755 index 599c981f..00000000 --- a/tests/misc/nice-fail +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh -# Verify that internal failure in nice gives exact status. - -# Copyright (C) 2009-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ nice - - -# These tests verify exact status of internal failure. -nice -n 1 # missing command -test $? = 125 || fail=1 -nice --- # unknown option -test $? = 125 || fail=1 -nice -n 1a # invalid adjustment -test $? = 125 || fail=1 -nice sh -c 'exit 2' # exit status propagation -test $? = 2 || fail=2 -nice . # invalid command -test $? = 126 || fail=1 -nice no_such # no such command -test $? = 127 || fail=1 - -Exit $fail diff --git a/tests/misc/nice-fail.sh b/tests/misc/nice-fail.sh new file mode 100755 index 00000000..3e054354 --- /dev/null +++ b/tests/misc/nice-fail.sh @@ -0,0 +1,38 @@ +#!/bin/sh +# Verify that internal failure in nice gives exact status. + +# 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/>. + + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ nice + + +# These tests verify exact status of internal failure. +nice -n 1 # missing command +test $? = 125 || fail=1 +nice --- # unknown option +test $? = 125 || fail=1 +nice -n 1a # invalid adjustment +test $? = 125 || fail=1 +nice sh -c 'exit 2' # exit status propagation +test $? = 2 || fail=2 +nice . # invalid command +test $? = 126 || fail=1 +nice no_such # no such command +test $? = 127 || fail=1 + +Exit $fail diff --git a/tests/misc/nice.sh b/tests/misc/nice.sh new file mode 100755 index 00000000..acee0f44 --- /dev/null +++ b/tests/misc/nice.sh @@ -0,0 +1,94 @@ +#! /bin/sh +# Test "nice". + +# Copyright (C) 2002-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ nice + +tests=' +0 empty 10 +1 -1 1 +2 -12 12 +3 -1:-2 2 +4 -n:1 1 +5 -n:1:-2 2 +6 -n:1:-+12 12 +7 -2:-n:1 1 +8 -2:-n:12 12 +9 -+1 1 +10 -+12 12 +11 -+1:-+12 12 +12 -n:+1 1 +13 --1:-2 2 +14 --1:-2:-13 13 +15 --1:-n:2 2 +16 --1:-n:2:-3 3 +17 --1:-n:2:-13 13 +18 -n:-1:-12 12 +19 --1:-12 12 +NA LAST NA +' +set $tests + +# Require that this test be run at 'nice' level 0. +niceness=$(nice) +if test "$niceness" = 0; then + : ok +else + skip_ "this test must be run at nice level 0" +fi + +while :; do + test_name=$1 + args=$2 + expected_result=$3 + test $args = empty && args='' + test x$args = xLAST && break + args=$(echo x$args|tr : ' '|sed 's/^x//') + if test "$VERBOSE" = yes; then + #echo "testing \$(nice $args nice\) = $expected_result ..." + echo "test $test_name... " | tr -d '\n' + fi + test x$(nice $args nice 2> /dev/null) = x$expected_result \ + && ok=ok || ok=FAIL fail=1 + test "$VERBOSE" = yes && echo $ok + shift; shift; shift +done + +# Test negative niceness - command must be run whether or not change happens. +if test x$(nice -n -1 nice 2> /dev/null) = x0 ; then + # unprivileged user - warn about failure to change + nice -n -1 true 2> err || fail=1 + test -s err || fail=1 + mv err exp || framework_failure_ + nice --1 true 2> err || fail=1 + compare exp err || fail=1 + # Failure to write advisory message is fatal. Buggy through coreutils 8.0. + 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 + fi +else + # superuser - change succeeds + nice -n -1 nice 2> err || fail=1 + test -s err && fail=1 + test x$(nice -n -1 nice) = x-1 || fail=1 + test x$(nice --1 nice) = x-1 || fail=1 +fi + +Exit $fail diff --git a/tests/misc/nl b/tests/misc/nl deleted file mode 100755 index b5a4ac63..00000000 --- a/tests/misc/nl +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -# exercise nl functionality - -# Copyright (C) 2002-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ nl - - -echo a | nl > out || fail=1 -echo b | nl -s%n >> out || fail=1 -echo c | nl -n ln >> out || fail=1 -echo d | nl -n rn >> out || fail=1 -echo e | nl -n rz >> out || fail=1 -echo === >> out -printf 'a\n\n' | nl > t || fail=1; cat -A t >> out -cat <<\EOF > exp - 1 a - 1%nb -1 c - 1 d -000001 e -=== - 1^Ia$ - $ -EOF - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/misc/nl.sh b/tests/misc/nl.sh new file mode 100755 index 00000000..dfa7b237 --- /dev/null +++ b/tests/misc/nl.sh @@ -0,0 +1,43 @@ +#!/bin/sh +# exercise nl functionality + +# Copyright (C) 2002-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ nl + + +echo a | nl > out || fail=1 +echo b | nl -s%n >> out || fail=1 +echo c | nl -n ln >> out || fail=1 +echo d | nl -n rn >> out || fail=1 +echo e | nl -n rz >> out || fail=1 +echo === >> out +printf 'a\n\n' | nl > t || fail=1; cat -A t >> out +cat <<\EOF > exp + 1 a + 1%nb +1 c + 1 d +000001 e +=== + 1^Ia$ + $ +EOF + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/misc/nohup b/tests/misc/nohup deleted file mode 100755 index 76f676d8..00000000 --- a/tests/misc/nohup +++ /dev/null @@ -1,121 +0,0 @@ -#!/bin/sh -# test nohup - -# Copyright (C) 2003-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ nohup - - -nohup sh -c 'echo stdout; echo stderr 1>&2' 2>err || fail=1 - -# Be careful. The results of the above nohup command -# change depending on whether stdin and stdout are redirected. -if test -t 1; then - test "$(cat nohup.out)" = stdout || fail=1 - if test -t 0; then - echo 'nohup: ignoring input and appending output to 'nohup.out'\' - else - echo 'nohup: appending output to 'nohup.out'\' - fi >exp || fail=1 -else - # Here it should not even exist. - test -f nohup.out && fail=1 - if test -t 0; then - echo 'nohup: ignoring input' >exp - else - rm -f exp - fi || fail=1 -fi -echo 'stderr' >> exp || fail=1 - -compare exp err || fail=1 -rm -f nohup.out err exp -# ---------------------- - -# Be careful. The results of the following nohup command -# change depending on whether stderr is redirected. -nohup sh -c 'echo stdout; echo stderr 1>&2' >out || fail=1 -if test -t 2; then - test "$(cat out|tr '\n' -)" = stdout-stderr- || fail=1 -else - test "$(cat out|tr '\n' -)" = stdout- || fail=1 -fi -# It must *not* exist. -test -f nohup.out && fail=1 -rm -f nohup.out err -# ---------------------- - -# Bug present through coreutils 8.0: failure to print advisory message -# to stderr must be fatal. Requires stdout to be terminal. -if test -w /dev/full && test -c /dev/full; then -( - 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 - rm -f nohup.out - exit $fail -) || fail=1 -fi - -nohup no-such-command 2> err -errno=$? -if test -t 1; then - test $errno = 127 || fail=1 - # It must exist. - test -f nohup.out || fail=1 - # It must be empty. - test -s nohup.out && fail=1 -fi - -cat <<\EOF > exp || fail=1 -nohup: appending output to 'nohup.out' -nohup: cannot run command 'no-such-command': No such file or directory -EOF -# Disable these comparisons. Too much variation in 2nd line. -# compare exp err || fail=1 -rm -f nohup.out err exp -# ---------------------- - -touch k; chmod 0 k -nohup ./k 2> err -errno=$? -test $errno = 126 || fail=1 -if test -t 1; then - # It must exist. - test -f nohup.out || fail=1 - # It must be empty. - test -s nohup.out && fail=1 -fi - -cat <<\EOF > exp || fail=1 -nohup: appending output to 'nohup.out' -nohup: cannot run command './k': Permission denied -EOF -# Disable these comparisons. Too much variation in 2nd line. -# compare exp err || fail=1 - -# Make sure it fails with exit status of 125 when given too few arguments, -# except that POSIX requires 127 in this case. -nohup >/dev/null 2>&1 -test $? = 125 || fail=1 -POSIXLY_CORRECT=1 nohup >/dev/null 2>&1 -test $? = 127 || fail=1 - -Exit $fail diff --git a/tests/misc/nohup.sh b/tests/misc/nohup.sh new file mode 100755 index 00000000..91d9e6a2 --- /dev/null +++ b/tests/misc/nohup.sh @@ -0,0 +1,121 @@ +#!/bin/sh +# test nohup + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ nohup + + +nohup sh -c 'echo stdout; echo stderr 1>&2' 2>err || fail=1 + +# Be careful. The results of the above nohup command +# change depending on whether stdin and stdout are redirected. +if test -t 1; then + test "$(cat nohup.out)" = stdout || fail=1 + if test -t 0; then + echo 'nohup: ignoring input and appending output to 'nohup.out'\' + else + echo 'nohup: appending output to 'nohup.out'\' + fi >exp || fail=1 +else + # Here it should not even exist. + test -f nohup.out && fail=1 + if test -t 0; then + echo 'nohup: ignoring input' >exp + else + rm -f exp + fi || fail=1 +fi +echo 'stderr' >> exp || fail=1 + +compare exp err || fail=1 +rm -f nohup.out err exp +# ---------------------- + +# Be careful. The results of the following nohup command +# change depending on whether stderr is redirected. +nohup sh -c 'echo stdout; echo stderr 1>&2' >out || fail=1 +if test -t 2; then + test "$(cat out|tr '\n' -)" = stdout-stderr- || fail=1 +else + test "$(cat out|tr '\n' -)" = stdout- || fail=1 +fi +# It must *not* exist. +test -f nohup.out && fail=1 +rm -f nohup.out err +# ---------------------- + +# Bug present through coreutils 8.0: failure to print advisory message +# to stderr must be fatal. Requires stdout to be terminal. +if test -w /dev/full && test -c /dev/full; then +( + 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 + rm -f nohup.out + exit $fail +) || fail=1 +fi + +nohup no-such-command 2> err +errno=$? +if test -t 1; then + test $errno = 127 || fail=1 + # It must exist. + test -f nohup.out || fail=1 + # It must be empty. + test -s nohup.out && fail=1 +fi + +cat <<\EOF > exp || fail=1 +nohup: appending output to 'nohup.out' +nohup: cannot run command 'no-such-command': No such file or directory +EOF +# Disable these comparisons. Too much variation in 2nd line. +# compare exp err || fail=1 +rm -f nohup.out err exp +# ---------------------- + +touch k; chmod 0 k +nohup ./k 2> err +errno=$? +test $errno = 126 || fail=1 +if test -t 1; then + # It must exist. + test -f nohup.out || fail=1 + # It must be empty. + test -s nohup.out && fail=1 +fi + +cat <<\EOF > exp || fail=1 +nohup: appending output to 'nohup.out' +nohup: cannot run command './k': Permission denied +EOF +# Disable these comparisons. Too much variation in 2nd line. +# compare exp err || fail=1 + +# Make sure it fails with exit status of 125 when given too few arguments, +# except that POSIX requires 127 in this case. +nohup >/dev/null 2>&1 +test $? = 125 || fail=1 +POSIXLY_CORRECT=1 nohup >/dev/null 2>&1 +test $? = 127 || fail=1 + +Exit $fail diff --git a/tests/misc/nproc-avail b/tests/misc/nproc-avail deleted file mode 100755 index cf0846cc..00000000 --- a/tests/misc/nproc-avail +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -# Ensure that "nproc" is less than or equal to "nproc --all". - -# Copyright (C) 2009-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ nproc - -all=$(nproc --all) -available=$(OMP_NUM_THREADS= nproc) - -test $available -le $all || fail=1 - -Exit $fail diff --git a/tests/misc/nproc-avail.sh b/tests/misc/nproc-avail.sh new file mode 100755 index 00000000..8b0e8dcb --- /dev/null +++ b/tests/misc/nproc-avail.sh @@ -0,0 +1,27 @@ +#!/bin/sh +# Ensure that "nproc" is less than or equal to "nproc --all". + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ nproc + +all=$(nproc --all) +available=$(OMP_NUM_THREADS= nproc) + +test $available -le $all || fail=1 + +Exit $fail diff --git a/tests/misc/nproc-positive b/tests/misc/nproc-positive deleted file mode 100755 index d930fb89..00000000 --- a/tests/misc/nproc-positive +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -# Ensure that nproc prints a number > 0 - -# Copyright (C) 2009-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ nproc - -for mode in --all ''; do - procs=$(nproc $mode) - test "$procs" -gt 0 || fail=1 -done - -for i in -1000 0 1 1000; do - procs=$(OMP_NUM_THREADS=$i nproc) - test "$procs" -gt 0 || fail=1 -done - -for i in 0 ' 1' 1000; do - procs=$(nproc --ignore="$i") - test "$procs" -gt 0 || fail=1 -done - -for i in -1 N; do - nproc --ignore=$i && fail=1 -done - -procs=$(OMP_NUM_THREADS=42 nproc --ignore=40) -test "$procs" -eq 2 || fail=1 - -Exit $fail diff --git a/tests/misc/nproc-positive.sh b/tests/misc/nproc-positive.sh new file mode 100755 index 00000000..d82dc930 --- /dev/null +++ b/tests/misc/nproc-positive.sh @@ -0,0 +1,44 @@ +#!/bin/sh +# Ensure that nproc prints a number > 0 + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ nproc + +for mode in --all ''; do + procs=$(nproc $mode) + test "$procs" -gt 0 || fail=1 +done + +for i in -1000 0 1 1000; do + procs=$(OMP_NUM_THREADS=$i nproc) + test "$procs" -gt 0 || fail=1 +done + +for i in 0 ' 1' 1000; do + procs=$(nproc --ignore="$i") + test "$procs" -gt 0 || fail=1 +done + +for i in -1 N; do + nproc --ignore=$i && fail=1 +done + +procs=$(OMP_NUM_THREADS=42 nproc --ignore=40) +test "$procs" -eq 2 || fail=1 + +Exit $fail diff --git a/tests/misc/numfmt.pl b/tests/misc/numfmt.pl new file mode 100644 index 00000000..61917fb8 --- /dev/null +++ b/tests/misc/numfmt.pl @@ -0,0 +1,950 @@ +#!/usr/bin/perl +# Basic tests for "numfmt". + +# Copyright (C) 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 +# 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; + +(my $program_name = $0) =~ s|.*/||; +my $prog = 'numfmt'; + +# TODO: add localization tests with "grouping" +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +my $locale = $ENV{LOCALE_FR_UTF8}; +! defined $locale || $locale eq 'none' + and $locale = 'C'; + +my @Tests = + ( + ['1', '1234', {OUT => "1234"}], + ['2', '--from=si 1K', {OUT => "1000"}], + ['3', '--from=iec 1K', {OUT => "1024"}], + ['4', '--from=auto 1K', {OUT => "1000"}], + ['5', '--from=auto 1Ki', {OUT => "1024"}], + ['5.1', '--from=iec-i 1Ki', {OUT => "1024"}], + + ['6', {IN_PIPE => "1234\n"}, {OUT => "1234"}], + ['7', '--from=si', {IN_PIPE => "2K\n"}, {OUT => "2000"}], + ['7a', '--invalid=fail', {IN_PIPE => "no_NL"}, {OUT => "no_NL"}, + {ERR => "$prog: invalid number: 'no_NL'\n"}, + {EXIT => '2'}], + + ['8', '--to=si 2000', {OUT => "2.0K"}], + ['9', '--to=si 2001', {OUT => "2.1K"}], + ['10', '--to=si 1999', {OUT => "2.0K"}], + ['11', '--to=si --round=down 2001', {OUT => "2.0K"}], + ['12', '--to=si --round=down 1999', {OUT => "1.9K"}], + ['13', '--to=si --round=up 1901', {OUT => "2.0K"}], + ['14', '--to=si --round=down 1901', {OUT => "1.9K"}], + ['15', '--to=si --round=nearest 1901', {OUT => "1.9K"}], + ['16', '--to=si --round=nearest 1945', {OUT => "1.9K"}], + ['17', '--to=si --round=nearest 1955', {OUT => "2.0K"}], + + ['18', '--to=iec 2048', {OUT => "2.0K"}], + ['19', '--to=iec 2049', {OUT => "2.1K"}], + ['20', '--to=iec 2047', {OUT => "2.0K"}], + ['21', '--to=iec --round=down 2049', {OUT => "2.0K"}], + ['22', '--to=iec --round=down 2047', {OUT => "1.9K"}], + ['23', '--to=iec --round=up 2040', {OUT => "2.0K"}], + ['24', '--to=iec --round=down 2040', {OUT => "1.9K"}], + ['25', '--to=iec --round=nearest 1996', {OUT => "1.9K"}], + ['26', '--to=iec --round=nearest 1997', {OUT => "2.0K"}], + ['27', '--to=iec-i 2048', {OUT => "2.0Ki"}], + + ['neg-1', '-- -1234', {OUT => "-1234"}], + ['neg-2', '--padding=5 -- -1234', {OUT => "-1234"}], + ['neg-3', '--padding=6 -- -1234', {OUT => " -1234"}], + ['neg-4', '--to=iec -- 9100 -9100', {OUT => "8.9K\n-8.9K"}], + ['neg-5', '-- -0.1', {OUT => "-0.1"}], + ['neg-6', '-- -0', {OUT => "0"}], + ['neg-7', '-- -0.-1', + {ERR => "$prog: invalid number: '-0.-1'\n"}, + {EXIT => '2'}], + + ['float-1', '1.1', {OUT => "1.1"}], + ['float-2', '1.22', {OUT => "1.22"}], + ['float-3', '1.22.', + {ERR => "$prog: invalid suffix in input: '1.22.'\n"}, + {EXIT => '2'}], + + ['unit-1', '--from-unit=512 4', {OUT => "2048"}], + ['unit-2', '--to-unit=512 2048', {OUT => "4"}], + ['unit-3', '--from-unit=512 --from=si 4M', {OUT => "2048000000"}], + ['unit-4', '--from-unit=512 --from=iec --to=iec 4M', {OUT => "2.0G"}], + ['unit-5', '--from-unit=AA --from=iec --to=iec 4M', + {ERR => "$prog: invalid unit size: 'AA'\n"}, + {EXIT => '1'}], + ['unit-6', '--from-unit=54W --from=iec --to=iec 4M', + {ERR => "$prog: invalid unit size: '54W'\n"}, + {EXIT => '1'}], + # Not fully documented.. "--{from,to}-unit" can accept IEC suffixes + ['unit-7', '--from-unit=2K --to=iec 30', {OUT=>"60K"}], + ['unit-8', '--from-unit=1234567890123456789012345 --to=iec 30', + {ERR => "$prog: invalid unit size: '1234567890123456789012345'\n"}, + {EXIT => '1'}], + ['unit-9', '--from-unit=0 1', + {ERR => "$prog: invalid unit size: '0'\n"}, + {EXIT => '1'}], + ['unit-10', '--to-unit=0 1', + {ERR => "$prog: invalid unit size: '0'\n"}, + {EXIT => '1'}], + + # Test Suffix logic + ['suf-1', '4000', {OUT=>'4000'}], + ['suf-2', '4Q', + {ERR => "$prog: invalid suffix in input: '4Q'\n"}, + {EXIT => '2'}], + ['suf-2.1', '4M', + {ERR => "$prog: rejecting suffix " . + "in input: '4M' (consider using --from)\n"}, + {EXIT => '2'}], + ['suf-3', '--from=si 4M', {OUT=>'4000000'}], + ['suf-4', '--from=si 4Q', + {ERR => "$prog: invalid suffix in input: '4Q'\n"}, + {EXIT => '2'}], + ['suf-5', '--from=si 4MQ', + {ERR => "$prog: invalid suffix in input '4MQ': 'Q'\n"}, + {EXIT => '2'}], + + ['suf-6', '--from=iec 4M', {OUT=>'4194304'}], + ['suf-7', '--from=auto 4M', {OUT=>'4000000'}], + ['suf-8', '--from=auto 4Mi', {OUT=>'4194304'}], + ['suf-9', '--from=auto 4MiQ', + {ERR => "$prog: invalid suffix in input '4MiQ': 'Q'\n"}, + {EXIT => '2'}], + ['suf-10', '--from=auto 4QiQ', + {ERR => "$prog: invalid suffix in input: '4QiQ'\n"}, + {EXIT => '2'}], + + # characters after a white space are OK - printed as-is + ['suf-11', '"4 M"', {OUT=>'4 M'}], + + # Custom suffix + ['suf-12', '--suffix=Foo 70Foo', {OUT=>'70Foo'}], + ['suf-13', '--suffix=Foo 70', {OUT=>'70Foo'}], + ['suf-14', '--suffix=Foo --from=si 70K', {OUT=>'70000Foo'}], + ['suf-15', '--suffix=Foo --from=si 70KFoo', {OUT=>'70000Foo'}], + ['suf-16', '--suffix=Foo --to=si 7000Foo', {OUT=>'7.0KFoo'}], + ['suf-17', '--suffix=Foo --to=si 7000Bar', + {ERR => "$prog: invalid suffix in input: '7000Bar'\n"}, + {EXIT => '2'}], + ['suf-18', '--suffix=Foo --to=si 7000FooF', + {ERR => "$prog: invalid suffix in input: '7000FooF'\n"}, + {EXIT => '2'}], + # space(s) between number and suffix. Note only field 1 is used + # by default so specify the NUL delimiter to consider the whole "line". + ['suf-19', "-d '' --from=si '4.0 K'", {OUT => "4000"}], + + ## GROUPING + + # "C" locale - no grouping (locale-specific tests, below) + ['grp-1', '--from=si --grouping 7M', {OUT=>'7000000'}], + ['grp-2', '--from=si --to=si --grouping 7M', + {ERR => "$prog: grouping cannot be combined with --to\n"}, + {EXIT => '1'}], + + + ## Padding + ['pad-1', '--padding=10 5', {OUT=>' 5'}], + ['pad-2', '--padding=-10 5', {OUT=>'5 '}], + ['pad-3', '--padding=A 5', + {ERR => "$prog: invalid padding value 'A'\n"}, + {EXIT => '1'}], + ['pad-3.1', '--padding=0 5', + {ERR => "$prog: invalid padding value '0'\n"}, + {EXIT => '1'}], + ['pad-4', '--padding=10 --to=si 50000', {OUT=>' 50K'}], + ['pad-5', '--padding=-10 --to=si 50000', {OUT=>'50K '}], + + # padding too narrow + ['pad-6', '--padding=2 --to=si 1000', {OUT=>'1.0K'}], + + + # Padding + suffix + ['pad-7', '--padding=10 --suffix=foo --to=si 50000', + {OUT=>' 50Kfoo'}], + ['pad-8', '--padding=-10 --suffix=foo --to=si 50000', + {OUT=>'50Kfoo '}], + + + # Delimiters + ['delim-1', '--delimiter=: --from=auto 40M:', {OUT=>'40000000:'}], + ['delim-2', '--delimiter="" --from=auto "40 M"',{OUT=>'40000000'}], + ['delim-3', '--delimiter=" " --from=auto "40M Foo"',{OUT=>'40000000 Foo'}], + ['delim-4', '--delimiter=: --from=auto 40M:60M', {OUT=>'40000000:60M'}], + ['delim-5', '-d: --field=2 --from=auto :40M:60M', {OUT=>':40000000:60M'}], + ['delim-6', '--delimiter=: --field 3 --from=auto 40M:60M', + {EXIT=>2}, + {ERR=>"$prog: input line is too short, no numbers found " . + "to convert in field 3\n"}], + + #Fields + ['field-1', '--field A', + {ERR => "$prog: invalid field value 'A'\n"}, + {EXIT => '1'}], + ['field-1.1', '--field -5', + {ERR => "$prog: invalid field value '-5'\n"}, + {EXIT => '1'}], + ['field-2', '--field 2 --from=auto "Hello 40M World 90G"', + {OUT=>'Hello 40000000 World 90G'}], + ['field-3', '--field 3 --from=auto "Hello 40M World 90G"', + {ERR=>"$prog: invalid number: 'World'\n"}, + {EXIT => 2},], + # Last field - no text after number + ['field-4', '--field 4 --from=auto "Hello 40M World 90G"', + {OUT=>"Hello 40M World 90000000000"}], + # Last field - a delimiter after the number + ['field-5', '--field 4 --from=auto "Hello 40M World 90G "', + {OUT=>"Hello 40M World 90000000000 "}], + + # Mix Fields + Delimiters + ['field-6', '--delimiter=: --field 2 --from=auto "Hello:40M:World:90G"', + {OUT=>"Hello:40000000:World:90G"}], + + # not enough fields + ['field-8', '--field 3 --to=si "Hello World"', + {EXIT=>2}, + {ERR=>"$prog: input line is too short, no numbers found " . + "to convert in field 3\n"}], + + # Auto-consume white-space, setup auto-padding + ['whitespace-1', '--to=si --field 2 "A 500 B"', {OUT=>"A 500 B"}], + ['whitespace-2', '--to=si --field 2 "A 5000 B"', {OUT=>"A 5.0K B"}], + ['whitespace-3', '--to=si " 500"', {OUT=>" 500"}], + ['whitespace-4', '--to=si " 6500"', {OUT=>" 6.5K"}], + # NOTE: auto-padding is not enabled if the value is on the first + # field and there's no white-space before it. + ['whitespace-5', '--to=si "6000000"', {OUT=>"6.0M"}], + # but if there is whitespace, assume auto-padding is desired. + ['whitespace-6', '--to=si " 6000000"', {OUT=>" 6.0M"}], + + # auto-padding - lines have same padding-width + # (padding_buffer will be alloc'd just once) + ['whitespace-7', '--to=si --field 2', + {IN_PIPE=>"rootfs 100000\n" . + "udevxx 2000000\n"}, + {OUT =>"rootfs 100K\n" . + "udevxx 2.0M"}], + # auto-padding - second line requires a + # larger padding (padding-buffer needs to be realloc'd) + ['whitespace-8', '--to=si --field 2', + {IN_PIPE=>"rootfs 100000\n" . + "udev 20000000\n"}, + {OUT =>"rootfs 100K\n" . + "udev 20M"}], + + + # Corner-cases: + # weird mix of identical suffix,delimiters + # The priority is: + # 1. delimiters (and fields) are parsed (in process_line() + # 2. optional custom suffix is removed (in process_suffixed_number()) + # 3. Remaining suffixes must be valid SI/IEC (in human_xstrtol()) + + # custom suffix comes BEFORE SI/IEC suffix, + # so these are 40 of "M", not 40,000,000. + ['mix-1', '--suffix=M --from=si 40M', {OUT=>"40M"}], + + # These are fourty-million Ms . + ['mix-2', '--suffix=M --from=si 40MM', {OUT=>"40000000M"}], + + ['mix-3', '--suffix=M --from=auto 40MM', {OUT=>"40000000M"}], + ['mix-4', '--suffix=M --from=auto 40MiM', {OUT=>"41943040M"}], + ['mix-5', '--suffix=M --to=si --from=si 4MM', {OUT=>"4.0MM"}], + + # This might be confusing to the user, but it's legit: + # The M in the output is the custom suffix, not Mega. + ['mix-6', '--suffix=M 40', {OUT=>"40M"}], + ['mix-7', '--suffix=M 4000000', {OUT=>"4000000M"}], + ['mix-8', '--suffix=M --to=si 4000000', {OUT=>"4.0MM"}], + + # The output 'M' is the custom suffix. + ['mix-10', '--delimiter=M --suffix=M 40', {OUT=>"40M"}], + + # The INPUT 'M' is a delimiter (delimiters are top priority) + # The output contains one M for custom suffix, and one 'M' delimiter. + ['mix-11', '--delimiter=M --suffix=M 40M', {OUT=>"40MM"}], + + # Same as above, the "M" is NOT treated as a mega SI prefix, + ['mix-12', '--delimiter=M --from=si --suffix=M 40M', {OUT=>"40MM"}], + + # The 'M' is treated as a delimiter, and so the input value is '4000' + ['mix-13', '--delimiter=M --to=si --from=auto 4000M5000M9000', + {OUT=>"4.0KM5000M9000"}], + # 'M' is the delimiter, so the second input field is '5000' + ['mix-14', '--delimiter=M --field 2 --from=auto --to=si 4000M5000M9000', + {OUT=>"4000M5.0KM9000"}], + + + + ## Header testing + + # header - silently ignored with command line parameters + ['header-1', '--header --to=iec 4096', {OUT=>"4.0K"}], + + # header warning with --debug + ['header-2', '--debug --header --to=iec 4096', {OUT=>"4.0K"}, + {ERR=>"$prog: --header ignored with command-line input\n"}], + + ['header-3', '--header=A', + {ERR=>"$prog: invalid header value 'A'\n"}, + {EXIT => 1},], + ['header-4', '--header=0', + {ERR=>"$prog: invalid header value '0'\n"}, + {EXIT => 1},], + ['header-5', '--header=-6', + {ERR=>"$prog: invalid header value '-6'\n"}, + {EXIT => 1},], + ['header-6', '--debug --header --to=iec', + {IN_PIPE=>"size\n5000\n90000\n"}, + {OUT=>"size\n4.9K\n88K"}], + ['header-7', '--debug --header=3 --to=iec', + {IN_PIPE=>"hello\nworld\nsize\n5000\n90000\n"}, + {OUT=>"hello\nworld\nsize\n4.9K\n88K"}], + # header, but no actual content + ['header-8', '--header=2 --to=iec', + {IN_PIPE=>"hello\nworld\n"}, + {OUT=>"hello\nworld"}], + # not enough header lines + ['header-9', '--header=3 --to=iec', + {IN_PIPE=>"hello\nworld\n"}, + {OUT=>"hello\nworld"}], + + + ## human_strtod testing + + # NO_DIGITS_FOUND + ['strtod-1', '--from=si "foo"', + {ERR=>"$prog: invalid number: 'foo'\n"}, + {EXIT=> 2}], + ['strtod-2', '--from=si ""', + {ERR=>"$prog: invalid number: ''\n"}, + {EXIT=> 2}], + + # INTEGRAL_OVERFLOW + ['strtod-3', '--from=si "1234567890123456789012345678901234567890'. + '1234567890123456789012345678901234567890"', + {ERR=>"$prog: value too large to be converted: '" . + "1234567890123456789012345678901234567890" . + "1234567890123456789012345678901234567890'\n", + }, + {EXIT=> 2}], + + # FRACTION_NO_DIGITS_FOUND + ['strtod-5', '--from=si 12.', + {ERR=>"$prog: invalid number: '12.'\n"}, + {EXIT=>2}], + ['strtod-6', '--from=si 12.K', + {ERR=>"$prog: invalid number: '12.K'\n"}, + {EXIT=>2}], + + # whitespace is not allowed after decimal-point + ['strtod-6.1', '--from=si --delimiter=, "12. 2"', + {ERR=>"$prog: invalid number: '12. 2'\n"}, + {EXIT=>2}], + + # FRACTION_OVERFLOW + ['strtod-7', '--from=si "12.1234567890123456789012345678901234567890'. + '1234567890123456789012345678901234567890"', + {ERR=>"$prog: value too large to be converted: '" . + "12.1234567890123456789012345678901234567890" . + "1234567890123456789012345678901234567890'\n", + }, + {EXIT=> 2}], + + # INVALID_SUFFIX + ['strtod-9', '--from=si 12.2Q', + {ERR=>"$prog: invalid suffix in input: '12.2Q'\n"}, + {EXIT=>2}], + + # VALID_BUT_FORBIDDEN_SUFFIX + ['strtod-10', '12M', + {ERR => "$prog: rejecting suffix " . + "in input: '12M' (consider using --from)\n"}, + {EXIT=>2}], + + # MISSING_I_SUFFIX + ['strtod-11', '--from=iec-i 12M', + {ERR => "$prog: missing 'i' suffix in input: " . + "'12M' (e.g Ki/Mi/Gi)\n"}, + {EXIT=>2}], + + # + # Test double_to_human() + # + + # 1K and smaller + ['dbl-to-human-1','--to=si 800', {OUT=>"800"}], + ['dbl-to-human-2','--to=si 0', {OUT=>"0"}], + ['dbl-to-human-2.1','--to=si 999', {OUT=>"999"}], + ['dbl-to-human-2.2','--to=si 1000', {OUT=>"1.0K"}], + #NOTE: the following are consistent with "ls -lh" output + ['dbl-to-human-2.3','--to=iec 999', {OUT=>"999"}], + ['dbl-to-human-2.4','--to=iec 1023', {OUT=>"1023"}], + ['dbl-to-human-2.5','--to=iec 1024', {OUT=>"1.0K"}], + ['dbl-to-human-2.6','--to=iec 1025', {OUT=>"1.1K"}], + ['dbl-to-human-2.7','--to=iec 0', {OUT=>"0"}], + # no "i" suffix if output has no suffix + ['dbl-to-human-2.8','--to=iec-i 0', {OUT=>"0"}], + + # values resulting in "N.Nx" output + ['dbl-to-human-3','--to=si 8000', {OUT=>"8.0K"}], + ['dbl-to-human-3.1','--to=si 8001', {OUT=>"8.1K"}], + ['dbl-to-human-4','--to=si --round=down 8001', {OUT=>"8.0K"}], + + ['dbl-to-human-5','--to=si --round=down 3500', {OUT=>"3.5K"}], + ['dbl-to-human-6','--to=si --round=nearest 3500', {OUT=>"3.5K"}], + ['dbl-to-human-7','--to=si --round=up 3500', {OUT=>"3.5K"}], + + ['dbl-to-human-8','--to=si --round=down 3501', {OUT=>"3.5K"}], + ['dbl-to-human-9','--to=si --round=nearest 3501', {OUT=>"3.5K"}], + ['dbl-to-human-10','--to=si --round=up 3501', {OUT=>"3.6K"}], + + ['dbl-to-human-11','--to=si --round=nearest 3550', {OUT=>"3.6K"}], + ['dbl-to-human-12','--to=si --from=si 999.89K', {OUT=>"1.0M"}], + ['dbl-to-human-13','--to=si --from=si 9.9K', {OUT=>"9.9K"}], + ['dbl-to-human-14','--to=si 9900', {OUT=>"9.9K"}], + ['dbl-to-human-15','--to=iec --from=si 3.3K', {OUT=>"3.3K"}], + ['dbl-to-human-16','--to=iec --round=down --from=si 3.3K', {OUT=>"3.2K"}], + + # values resulting in 'NNx' output + ['dbl-to-human-17','--to=si 9999', {OUT=>"10K"}], + ['dbl-to-human-18','--to=si --round=down 35000', {OUT=>"35K"}], + ['dbl-to-human-19','--to=iec 35000', {OUT=>"35K"}], + ['dbl-to-human-20','--to=iec --round=down 35000', {OUT=>"34K"}], + ['dbl-to-human-21','--to=iec 35000000', {OUT=>"34M"}], + ['dbl-to-human-22','--to=iec --round=down 35000000', {OUT=>"33M"}], + ['dbl-to-human-23','--to=si 35000001', {OUT=>"36M"}], + ['dbl-to-human-24','--to=si --from=si 9.99M', {OUT=>"10M"}], + ['dbl-to-human-25','--to=si --from=iec 9.99M', {OUT=>"11M"}], + ['dbl-to-human-25.1','--to=iec 99999', {OUT=>"98K"}], + + # values resulting in 'NNNx' output + ['dbl-to-human-26','--to=si 999000000000', {OUT=>"999G"}], + ['dbl-to-human-27','--to=iec 999000000000', {OUT=>"931G"}], + ['dbl-to-human-28','--to=si 123600000000000', {OUT=>"124T"}], + ['dbl-to-human-29','--to=si 998123', {OUT=>"999K"}], + ['dbl-to-human-30','--to=si --round=nearest 998123', {OUT=>"998K"}], + ['dbl-to-human-31','--to=si 99999', {OUT=>"100K"}], + ['dbl-to-human-32','--to=iec 102399', {OUT=>"100K"}], + ['dbl-to-human-33','--to=iec-i 102399', {OUT=>"100Ki"}], + + + # Default --round=from-zero + ['round-1','--to-unit=1024 -- 6000 -6000', + {OUT=>"6\n-6"}], + ['round-2','--to-unit=1024 -- 6000.0 -6000.0', + {OUT=>"5.9\n-5.9"}], + ['round-3','--to-unit=1024 -- 6000.00 -6000.00', + {OUT=>"5.86\n-5.86"}], + ['round-4','--to-unit=1024 -- 6000.000 -6000.000', + {OUT=>"5.860\n-5.860"}], + ['round-5','--to-unit=1024 -- 6000.0000 -6000.0000', + {OUT=>"5.8594\n-5.8594"}], + # --round=up + ['round-1-up','--round=up --to-unit=1024 -- 6000 -6000', + {OUT=>"6\n-5"}], + ['round-2-up','--round=up --to-unit=1024 -- 6000.0 -6000.0', + {OUT=>"5.9\n-5.8"}], + ['round-3-up','--round=up --to-unit=1024 -- 6000.00 -6000.00', + {OUT=>"5.86\n-5.85"}], + ['round-4-up','--round=up --to-unit=1024 -- 6000.000 -6000.000', + {OUT=>"5.860\n-5.859"}], + ['round-5-up','--round=up --to-unit=1024 -- 6000.0000 -6000.0000', + {OUT=>"5.8594\n-5.8593"}], + # --round=down + ['round-1-down','--round=down --to-unit=1024 -- 6000 -6000', + {OUT=>"5\n-6"}], + ['round-2-down','--round=down --to-unit=1024 -- 6000.0 -6000.0', + {OUT=>"5.8\n-5.9"}], + ['round-3-down','--round=down --to-unit=1024 -- 6000.00 -6000.00', + {OUT=>"5.85\n-5.86"}], + ['round-4-down','--round=down --to-unit=1024 -- 6000.000 -6000.000', + {OUT=>"5.859\n-5.860"}], + ['round-5-down','--round=down --to-unit=1024 -- 6000.0000 -6000.0000', + {OUT=>"5.8593\n-5.8594"}], + # --round=towards-zero + ['round-1-to-zero','--ro=towards-zero --to-u=1024 -- 6000 -6000', + {OUT=>"5\n-5"}], + ['round-2-to-zero','--ro=towards-zero --to-u=1024 -- 6000.0 -6000.0', + {OUT=>"5.8\n-5.8"}], + ['round-3-to-zero','--ro=towards-zero --to-u=1024 -- 6000.00 -6000.00', + {OUT=>"5.85\n-5.85"}], + ['round-4-to-zero','--ro=towards-zero --to-u=1024 -- 6000.000 -6000.000', + {OUT=>"5.859\n-5.859"}], + ['round-5-to-zero','--ro=towards-zero --to-u=1024 -- 6000.0000 -6000.0000', + {OUT=>"5.8593\n-5.8593"}], + # --round=nearest + ['round-1-near','--ro=nearest --to-u=1024 -- 6000 -6000', + {OUT=>"6\n-6"}], + ['round-2-near','--ro=nearest --to-u=1024 -- 6000.0 -6000.0', + {OUT=>"5.9\n-5.9"}], + ['round-3-near','--ro=nearest --to-u=1024 -- 6000.00 -6000.00', + {OUT=>"5.86\n-5.86"}], + ['round-4-near','--ro=nearest --to-u=1024 -- 6000.000 -6000.000', + {OUT=>"5.859\n-5.859"}], + ['round-5-near','--ro=nearest --to-u=1024 -- 6000.0000 -6000.0000', + {OUT=>"5.8594\n-5.8594"}], + + + # Large Values + ['large-1','1000000000000000', {OUT=>"1000000000000000"}], + # 18 digits is OK + ['large-2','1000000000000000000', {OUT=>"1000000000000000000"}], + # 19 digits is too much (without output scaling) + ['large-3','10000000000000000000', + {ERR => "$prog: value too large to be printed: '1e+19' " . + "(consider using --to)\n"}, + {EXIT=>2}], + + # Test input: + # Up to 27 digits is OK. + ['large-3.1', '--to=si 1', {OUT=> "1"}], + ['large-3.2', '--to=si 10', {OUT=> "10"}], + ['large-3.3', '--to=si 100', {OUT=> "100"}], + ['large-3.4', '--to=si 1000', {OUT=>"1.0K"}], + ['large-3.5', '--to=si 10000', {OUT=> "10K"}], + ['large-3.6', '--to=si 100000', {OUT=>"100K"}], + ['large-3.7', '--to=si 1000000', {OUT=>"1.0M"}], + ['large-3.8', '--to=si 10000000', {OUT=> "10M"}], + ['large-3.9', '--to=si 100000000', {OUT=>"100M"}], + ['large-3.10','--to=si 1000000000', {OUT=>"1.0G"}], + ['large-3.11','--to=si 10000000000', {OUT=> "10G"}], + ['large-3.12','--to=si 100000000000', {OUT=>"100G"}], + ['large-3.13','--to=si 1000000000000', {OUT=>"1.0T"}], + ['large-3.14','--to=si 10000000000000', {OUT=> "10T"}], + ['large-3.15','--to=si 100000000000000', {OUT=>"100T"}], + ['large-3.16','--to=si 1000000000000000', {OUT=>"1.0P"}], + ['large-3.17','--to=si 10000000000000000', {OUT=> "10P"}], + ['large-3.18','--to=si 100000000000000000', {OUT=>"100P"}], + ['large-3.19','--to=si 1000000000000000000', {OUT=>"1.0E"}], + ['large-3.20','--to=si 10000000000000000000', {OUT=> "10E"}], + ['large-3.21','--to=si 210000000000000000000', {OUT=>"210E"}], + ['large-3.22','--to=si 3210000000000000000000', {OUT=>"3.3Z"}], + ['large-3.23','--to=si 43210000000000000000000', {OUT=> "44Z"}], + ['large-3.24','--to=si 543210000000000000000000', {OUT=>"544Z"}], + ['large-3.25','--to=si 6543210000000000000000000', {OUT=>"6.6Y"}], + ['large-3.26','--to=si 76543210000000000000000000', {OUT=> "77Y"}], + ['large-3.27','--to=si 876543210000000000000000000', {OUT=>"877Y"}], + + # More than 27 digits is not OK + ['large-3.28','--to=si 9876543210000000000000000000', + {ERR => "$prog: value too large to be converted: " . + "'9876543210000000000000000000'\n"}, + {EXIT => 2}], + + # Test Output + ['large-4.1', '--from=si 9.7M', {OUT=>"9700000"}], + ['large-4.2', '--from=si 10M', {OUT =>"10000000"}], + ['large-4.3', '--from=si 200M', {OUT =>"200000000"}], + ['large-4.4', '--from=si 3G', {OUT =>"3000000000"}], + ['large-4.5', '--from=si 40G', {OUT =>"40000000000"}], + ['large-4.6', '--from=si 500G', {OUT =>"500000000000"}], + ['large-4.7', '--from=si 6T', {OUT =>"6000000000000"}], + ['large-4.8', '--from=si 70T', {OUT =>"70000000000000"}], + ['large-4.9', '--from=si 800T', {OUT =>"800000000000000"}], + ['large-4.10','--from=si 9P', {OUT =>"9000000000000000"}], + ['large-4.11','--from=si 10P', {OUT =>"10000000000000000"}], + ['large-4.12','--from=si 200P', {OUT =>"200000000000000000"}], + ['large-4.13','--from=si 3E', {OUT =>"3000000000000000000"}], + + # More than 18 digits of output without scaling - no good. + ['large-4.14','--from=si 40E', + {ERR => "$prog: value too large to be printed: '4e+19' " . + "(consider using --to)\n"}, + {EXIT => 2}], + ['large-4.15','--from=si 500E', + {ERR => "$prog: value too large to be printed: '5e+20' " . + "(consider using --to)\n"}, + {EXIT => 2}], + ['large-4.16','--from=si 6Z', + {ERR => "$prog: value too large to be printed: '6e+21' " . + "(consider using --to)\n"}, + {EXIT => 2}], + ['large-4.17','--from=si 70Z', + {ERR => "$prog: value too large to be printed: '7e+22' " . + "(consider using --to)\n"}, + {EXIT => 2}], + ['large-4.18','--from=si 800Z', + {ERR => "$prog: value too large to be printed: '8e+23' " . + "(consider using --to)\n"}, + {EXIT => 2}], + ['large-4.19','--from=si 9Y', + {ERR => "$prog: value too large to be printed: '9e+24' " . + "(consider using --to)\n"}, + {EXIT => 2}], + ['large-4.20','--from=si 10Y', + {ERR => "$prog: value too large to be printed: '1e+25' " . + "(consider using --to)\n"}, + {EXIT => 2}], + ['large-4.21','--from=si 200Y', + {ERR => "$prog: value too large to be printed: '2e+26' " . + "(consider using --to)\n"}, + {EXIT => 2}], + + ['large-5.1','--to=si 1000000000000000000', {OUT=>"1.0E"}], + ['large-5','--from=si --to=si 2E', {OUT=>"2.0E"}], + ['large-6','--from=si --to=si 3.4Z', {OUT=>"3.4Z"}], + ['large-7','--from=si --to=si 80Y', {OUT=>"80Y"}], + ['large-8','--from=si --to=si 9000Z', {OUT=>"9.0Y"}], + + ['large-10','--from=si --to=si 999Y', {OUT=>"999Y"}], + ['large-11','--from=si --to=iec 999Y', {OUT=>"827Y"}], + ['large-12','--from=si --round=down --to=iec 999Y', {OUT=>"826Y"}], + + # units can also affect the output + ['large-13','--from=si --from-unit=1000000 9P', + {ERR => "$prog: value too large to be printed: '9e+21' " . + "(consider using --to)\n"}, + {EXIT => 2}], + ['large-13.1','--from=si --from-unit=1000000 --to=si 9P', {OUT=>"9.0Z"}], + + # Numbers>999Y are never acceptable, regardless of scaling + ['large-14','--from=si --to=si 999Y', {OUT=>"999Y"}], + ['large-14.1','--from=si --to=si 1000Y', + {ERR => "$prog: value too large to be printed: '1e+27' " . + "(cannot handle values > 999Y)\n"}, + {EXIT => 2}], + ['large-14.2','--from=si --to=si --from-unit=10000 1Y', + {ERR => "$prog: value too large to be printed: '1e+28' " . + "(cannot handle values > 999Y)\n"}, + {EXIT => 2}], + + # debug warnings + ['debug-1', '--debug 4096', {OUT=>"4096"}, + {ERR=>"$prog: no conversion option specified\n"}], + # '--padding' is a valid conversion option - no warning should be printed + ['debug-1.1', '--debug --padding 10 4096', {OUT=>" 4096"}], + ['debug-2', '--debug --grouping --from=si 4.0K', {OUT=>"4000"}, + {ERR=>"$prog: grouping has no effect in this locale\n"}], + ['debug-4', '--to=si --debug 12345678901234567890', + {OUT=>"13E"}, + {ERR=>"$prog: large input value '12345678901234567890':" . + " possible precision loss\n"}], + ['debug-5', '--to=si --from=si --debug 1.12345678901234567890Y', + {OUT=>"1.2Y"}, + {ERR=>"$prog: large input value '1.12345678901234567890Y':" . + " possible precision loss\n"}], + + # dev-debug messages - the actual messages don't matter + # just ensure the program works, and for code coverage testing. + ['devdebug-1', '---debug --from=si 4.9K', {OUT=>"4900"}, + {ERR=>""}, + {ERR_SUBST=>"s/.*//msg"}], + ['devdebug-2', '---debug 4900', {OUT=>"4900"}, + {ERR=>""}, + {ERR_SUBST=>"s/.*//msg"}], + ['devdebug-3', '---debug --from=auto 4Mi', {OUT=>"4194304"}, + {ERR=>""}, + {ERR_SUBST=>"s/.*//msg"}], + ['devdebug-4', '---debug --to=si 4000000', {OUT=>"4.0M"}, + {ERR=>""}, + {ERR_SUBST=>"s/.*//msg"}], + ['devdebug-5', '---debug --to=si --padding=5 4000000', {OUT=>" 4.0M"}, + {ERR=>""}, + {ERR_SUBST=>"s/.*//msg"}], + ['devdebug-6', '---debug --suffix=Foo 1234Foo', {OUT=>"1234Foo"}, + {ERR=>""}, + {ERR_SUBST=>"s/.*//msg"}], + ['devdebug-7', '---debug --suffix=Foo 1234', {OUT=>"1234Foo"}, + {ERR=>""}, + {ERR_SUBST=>"s/.*//msg"}], + ['devdebug-9', '---debug --grouping 10000', {OUT=>"10000"}, + {ERR=>""}, + {ERR_SUBST=>"s/.*//msg"}], + ['devdebug-10', '---debug --format %f 10000', {OUT=>"10000"}, + {ERR=>""}, + {ERR_SUBST=>"s/.*//msg"}], + ['devdebug-11', '---debug --format "%\'-10f" 10000',{OUT=>"10000 "}, + {ERR=>""}, + {ERR_SUBST=>"s/.*//msg"}], + ['devdebug-12', '---debug --field 2 A',{OUT=>""}, + {ERR=>""}, {EXIT=>2}, + {ERR_SUBST=>"s/.*//msg"}], + + # Invalid parameters + ['help-1', '--foobar', + {ERR=>"$prog: unrecognized option '--foobar'\n" . + "Try '$prog --help' for more information.\n"}, + {EXIT=>1}], + + ## Format string - check error detection + ['fmt-err-1', '--format ""', + {ERR=>"$prog: format '' has no % directive\n"}, + {EXIT=>1}], + ['fmt-err-2', '--format "hello"', + {ERR=>"$prog: format 'hello' has no % directive\n"}, + {EXIT=>1}], + ['fmt-err-3', '--format "hello%"', + {ERR=>"$prog: format 'hello%' ends in %\n"}, + {EXIT=>1}], + ['fmt-err-4', '--format "%d"', + {ERR=>"$prog: invalid format '%d', " . + "directive must be %['][-][N]f\n"}, + {EXIT=>1}], + ['fmt-err-5', '--format "% -43 f"', + {ERR=>"$prog: invalid format '% -43 f', " . + "directive must be %['][-][N]f\n"}, + {EXIT=>1}], + ['fmt-err-6', '--format "%f %f"', + {ERR=>"$prog: format '%f %f' has too many % directives\n"}, + {EXIT=>1}], + ['fmt-err-7', '--format "%123456789012345678901234567890f"', + {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}], + ['fmt-err-10', '--format "%\'f" --to=si', + {ERR=>"$prog: grouping cannot be combined with --to\n"}, + {EXIT=>1}], + ['fmt-err-11', '--debug --format "%\'f" 5000', {OUT=>"5000"}, + {ERR=>"$prog: grouping has no effect in this locale\n"}], + + ## Format string - check some corner cases + ['fmt-1', '--format "%% %f" 5000', {OUT=>"%%5000"}], + ['fmt-2', '--format "%f %%" 5000', {OUT=>"5000 %%"}], + + ['fmt-3', '--format "--%f--" 5000000', {OUT=>"--5000000--"}], + ['fmt-4', '--format "--%f--" --to=si 5000000', {OUT=>"--5.0M--"}], + + ['fmt-5', '--format "--%10f--" --to=si 5000000',{OUT=>"-- 5.0M--"}], + ['fmt-6', '--format "--%-10f--" --to=si 5000000',{OUT=>"--5.0M --"}], + ['fmt-7', '--format "--%10f--" 5000000',{OUT=>"-- 5000000--"}], + ['fmt-8', '--format "--%-10f--" 5000000',{OUT=>"--5000000 --"}], + + # too-short width + ['fmt-9', '--format "--%5f--" 5000000',{OUT=>"--5000000--"}], + + # Format + Suffix + ['fmt-10', '--format "--%10f--" --suffix Foo 50', {OUT=>"-- 50Foo--"}], + ['fmt-11', '--format "--%-10f--" --suffix Foo 50',{OUT=>"--50Foo --"}], + + # Grouping in C locale - no grouping effect + ['fmt-12', '--format "%\'f" 50000',{OUT=>"50000"}], + ['fmt-13', '--format "%\'10f" 50000', {OUT=>" 50000"}], + ['fmt-14', '--format "%\'-10f" 50000',{OUT=>"50000 "}], + + # Very large format strings + ['fmt-15', '--format "--%100000f--" --to=si 4200', + {OUT=>"--" . " " x 99996 . "4.2K--" }], + + + ## Check all errors again, this time with --invalid=fail + ## Input will be printed without conversion, + ## and exit code will be 2 + ['ign-err-1', '--invalid=fail 4Q', + {ERR => "$prog: invalid suffix in input: '4Q'\n"}, + {OUT => "4Q\n"}, + {EXIT => 2}], + ['ign-err-2', '--invalid=fail 4M', + {ERR => "$prog: rejecting suffix " . + "in input: '4M' (consider using --from)\n"}, + {OUT => "4M\n"}, + {EXIT => 2}], + ['ign-err-3', '--invalid=fail --from=si 4MQ', + {ERR => "$prog: invalid suffix in input '4MQ': 'Q'\n"}, + {OUT => "4MQ\n"}, + {EXIT => 2}], + ['ign-err-4', '--invalid=fail --suffix=Foo --to=si 7000FooF', + {ERR => "$prog: invalid suffix in input: '7000FooF'\n"}, + {OUT => "7000FooF\n"}, + {EXIT => 2}], + ['ign-err-5','--invalid=fail --field 3 --from=auto "Hello 40M World 90G"', + {ERR => "$prog: invalid number: 'World'\n"}, + {OUT => "Hello 40M World 90G\n"}, + {EXIT => 2}], + ['ign-err-6', '--invalid=fail --field 3 --to=si "Hello World"', + {ERR => "$prog: input line is too short, no numbers found " . + "to convert in field 3\n"}, + {OUT => "Hello World\n"}, + {EXIT => 2}], + ['ign-err-7', '--invalid=fail --from=si "foo"', + {ERR => "$prog: invalid number: 'foo'\n"}, + {OUT => "foo\n"}, + {EXIT=> 2}], + ['ign-err-8', '--invalid=fail 12M', + {ERR => "$prog: rejecting suffix " . + "in input: '12M' (consider using --from)\n"}, + {OUT => "12M\n"}, + {EXIT => 2}], + ['ign-err-9', '--invalid=fail --from=iec-i 12M', + {ERR => "$prog: missing 'i' suffix in input: " . + "'12M' (e.g Ki/Mi/Gi)\n"}, + {OUT => "12M\n"}, + {EXIT=>2}], + ['ign-err-10','--invalid=fail 10000000000000000000', + {ERR => "$prog: value too large to be printed: '1e+19' " . + "(consider using --to)\n"}, + {OUT => "10000000000000000000\n"}, + {EXIT=>2}], + ['ign-err-11','--invalid=fail --to=si 9876543210000000000000000000', + {ERR => "$prog: value too large to be converted: " . + "'9876543210000000000000000000'\n"}, + {OUT => "9876543210000000000000000000\n"}, + {EXIT => 2}], + + ## Ignore Errors with multiple conversions + ['ign-err-m1', '--invalid=ignore --to=si 1000 2000 bad 3000', + {OUT => "1.0K\n2.0K\nbad\n3.0K"}, + {EXIT => 0}], + ['ign-err-m1.1', '--invalid=ignore --to=si', + {IN_PIPE => "1000\n2000\nbad\n3000\n"}, + {OUT => "1.0K\n2.0K\nbad\n3.0K"}, + {EXIT => 0}], + ['ign-err-m1.3', '--invalid=fail --debug --to=si 1000 2000 3000', + {OUT => "1.0K\n2.0K\n3.0K"}, + {EXIT => 0}], + ['ign-err-m2', '--invalid=fail --to=si 1000 Foo 3000', + {OUT => "1.0K\nFoo\n3.0K\n"}, + {ERR => "$prog: invalid number: 'Foo'\n"}, + {EXIT => 2}], + ['ign-err-m2.1', '--invalid=warn --to=si', + {IN_PIPE => "1000\nFoo\n3000\n"}, + {OUT => "1.0K\nFoo\n3.0K"}, + {ERR => "$prog: invalid number: 'Foo'\n"}, + {EXIT => 0}], + + # --debug will trigger a final warning at EOF + ['ign-err-m2.2', '--invalid=fail --debug --to=si 1000 Foo 3000', + {OUT => "1.0K\nFoo\n3.0K\n"}, + {ERR => "$prog: invalid number: 'Foo'\n" . + "$prog: failed to convert some of the input numbers\n"}, + {EXIT => 2}], + + ['ign-err-m3', '--invalid=fail --field 2 --from=si --to=iec', + {IN_PIPE => "A 1K x\nB 2M y\nC 3G z\n"}, + {OUT => "A 1000 x\nB 2.0M y\nC 2.8G z"}, + {EXIT => 0}], + # invalid input on one of the fields + ['ign-err-m3.1', '--invalid=fail --field 2 --from=si --to=iec', + {IN_PIPE => "A 1K x\nB Foo y\nC 3G z\n"}, + {OUT => "A 1000 x\nB Foo y\nC 2.8G z\n"}, + {ERR => "$prog: invalid number: 'Foo'\n"}, + {EXIT => 2}], + # one of the lines is too short + ['ign-err-m3.2', '--invalid=fail --field 2 --from=si --to=iec', + {IN_PIPE => "A 1K x\nB\nC 3G z\n"}, + {OUT => "A 1000 x\nB\nC 2.8G z\n"}, + {ERR => "$prog: input line is too short, no numbers found " . + "to convert in field 2\n"}, + {EXIT => 2}], + ); + +my @Locale_Tests = + ( + # Locale that supports grouping, but without '--grouping' parameter + ['lcl-grp-1', '--from=si 7M', {OUT=>"7000000"}, + {ENV=>"LC_ALL=$locale"}], + + # Locale with grouping + ['lcl-grp-2', '--from=si --grouping 7M', {OUT=>"7 000 000"}, + {ENV=>"LC_ALL=$locale"}], + + # Locale with grouping and debug - no debug warning message + ['lcl-grp-3', '--from=si --debug --grouping 7M', {OUT=>"7 000 000"}, + {ENV=>"LC_ALL=$locale"}], + + # Input with locale'd decimal-point + ['lcl-stdtod-1', '--from=si 12,2K', {OUT=>"12200"}, + {ENV=>"LC_ALL=$locale"}], + + ['lcl-dbl-to-human-1', '--to=si 1100', {OUT=>"1,1K"}, + {ENV=>"LC_ALL=$locale"}], + + # Format + Grouping + ['lcl-fmt-1', '--format "%\'f" 50000',{OUT=>"50 000"}, + {ENV=>"LC_ALL=$locale"}], + ['lcl-fmt-2', '--format "--%\'10f--" 50000', {OUT=>"-- 50 000--"}, + {ENV=>"LC_ALL=$locale"}], + ['lcl-fmt-3', '--format "--%\'-10f--" 50000',{OUT=>"--50 000 --"}, + {ENV=>"LC_ALL=$locale"}], + ['lcl-fmt-4', '--format "--%-10f--" --to=si 5000000', + {OUT=>"--5,0M --"}, + {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|") + or die "Can't fork command: $!"; + my $loc_num = <LOC_NUM>; + close(LOC_NUM) || die "Failed to read grouped number from printf"; + if ($loc_num ne '1 234') + { + warn "skipping locale grouping tests as 1234 groups like $loc_num\n"; + $locale = 'C'; + } + } +push @Tests, @Locale_Tests if $locale ne 'C'; + +## Check all valid/invalid suffixes +foreach my $suf ( 'A' .. 'Z', 'a' .. 'z' ) { + if ( $suf =~ /^[KMGTPEZY]$/ ) + { + push @Tests, ["auto-suf-si-$suf","--from=si --to=si 1$suf", + {OUT=>"1.0$suf"}]; + push @Tests, ["auto-suf-iec-$suf","--from=iec --to=iec 1$suf", + {OUT=>"1.0$suf"}]; + push @Tests, ["auto-suf-auto-$suf","--from=auto --to=iec 1${suf}i", + {OUT=>"1.0$suf"}]; + push @Tests, ["auto-suf-iec-to-ieci-$suf","--from=iec --to=iec-i 1${suf}", + {OUT=>"1.0${suf}i"}]; + push @Tests, ["auto-suf-ieci-to-iec-$suf", + "--from=iec-i --to=iec 1${suf}i",{OUT=>"1.0${suf}"}]; + } + else + { + push @Tests, ["auto-suf-si-$suf","--from=si --to=si 1$suf", + {ERR=>"$prog: invalid suffix in input: '1${suf}'\n"}, + {EXIT=>2}]; + } +} + +# Prepend the command line argument and append a newline to end +# of each expected 'OUT' string. +my $t; + +Test: +foreach $t (@Tests) + { + # Don't fiddle with expected OUT string if there's a nonzero exit status. + foreach my $e (@$t) + { + ref $e eq 'HASH' && exists $e->{EXIT} && $e->{EXIT} + and next Test; + } + + foreach my $e (@$t) + { + ref $e eq 'HASH' && exists $e->{OUT} + and $e->{OUT} .= "\n" + } + } + +my $save_temps = $ENV{SAVE_TEMPS}; +my $verbose = $ENV{VERBOSE}; + +my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); +exit $fail; diff --git a/tests/misc/od b/tests/misc/od deleted file mode 100755 index 46d4601d..00000000 --- a/tests/misc/od +++ /dev/null @@ -1,67 +0,0 @@ -#!/usr/bin/perl -# Exercise od - -# Copyright (C) 2006-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 -# 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; - -(my $program_name = $0) =~ s|.*/||; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -# Use a file in /proc whose size is not likely to -# change between the wc and od invocations. -my $proc_file = '/proc/version'; --f $proc_file - or $proc_file = '/dev/null'; - -# Count the bytes in $proc_file, _by reading_. -my $len = 0; -open FH, '<', $proc_file - or die "$program_name: can't open '$proc_file' for reading: $!\n"; -while (defined (my $line = <FH>)) - { - $len += length $line; - } -close FH; -my $proc_file_byte_count = $len; - -my @Tests = - ( - # Skip the exact length of the input file. - # Up to coreutils-6.9, this would ignore the "-j 1". - ['j-bug1', '-c -j 1 -An', {IN=>{g=>'a'}}, {OUT=>''}], - ['j-bug2', '-c -j 2 -An', {IN=>{g=>'a'}}, {IN=>{h=>'b'}}, {OUT=>''}], - # Skip the sum of the lengths of the first three inputs. - ['j-bug3', '-c -j 3 -An', {IN=>{g=>'a'}}, {IN=>{h=>'b'}}, - {IN=>{i=>'c'}}, {OUT=>''}], - # Skip the sum of the lengths of the first three inputs, printing the 4th. - ['j-bug4', '-c -j 3 -An', {IN=>{g=>'a'}}, {IN=>{h=>'b'}}, - {IN=>{i=>'c'}}, {IN=>{j=>'d'}}, {OUT=>" d\n"}], - - # Ensure that od -j doesn't fseek across a nonempty file in /proc, - # 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"}], - ); - -my $save_temps = $ENV{DEBUG}; -my $verbose = $ENV{VERBOSE}; - -my $prog = 'od'; -my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); -exit $fail; diff --git a/tests/misc/od-N b/tests/misc/od-N deleted file mode 100755 index 00d956a5..00000000 --- a/tests/misc/od-N +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# Verify that 'od -N N' reads no more than N bytes of input. - -# Copyright (C) 2001-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ od - -echo abcdefg > in || framework_failure_ - - -(od -An -N3 -c; od -An -N3 -c) < in > out -cat <<EOF > exp || fail=1 - a b c - d e f -EOF -compare exp out || fail=1 - -Exit $fail diff --git a/tests/misc/od-N.sh b/tests/misc/od-N.sh new file mode 100755 index 00000000..8a741fb1 --- /dev/null +++ b/tests/misc/od-N.sh @@ -0,0 +1,32 @@ +#!/bin/sh +# Verify that 'od -N N' reads no more than N bytes of input. + +# Copyright (C) 2001-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ od + +echo abcdefg > in || framework_failure_ + + +(od -An -N3 -c; od -An -N3 -c) < in > out +cat <<EOF > exp || fail=1 + a b c + d e f +EOF +compare exp out || fail=1 + +Exit $fail diff --git a/tests/misc/od-float b/tests/misc/od-float deleted file mode 100755 index a23a8f35..00000000 --- a/tests/misc/od-float +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/sh -# Test od on floating-point values. - -# Copyright (C) 2010-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ od - -export LC_ALL=C - -# Test for a bug in coreutils up through 8.7: od was losing -# information when asked to parse floating-point values. The numeric -# tests are valid only on Intel-like hosts, but that should be good -# enough to detect regressions, as they are designed to succeed on -# non-Intel-like hosts. Also, test for another bug in coreutils 8.7 -# on x86: sometimes there was no space between the columns. - -set x $(echo aaaabaaa | tr ab '\376\377' | od -t fF) || - framework_failure_ -case "$*" in -*0-*) fail=1;; -esac -case $3,$4 in --1.694740e+38,-1.694740e+38) fail=1;; -esac - -set x $(echo aaaaaaaabaaaaaaa | tr ab '\376\377' | od -t fD) || - framework_failure_ -case "$*" in -*0-*) fail=1;; -esac -case $3,$4 in --5.314010372517808e+303,-5.314010372517808e+303) fail=1;; -esac - -set x $(echo aaaaaaaaaaaaaaaabaaaaaaaaaaaaaaa | tr ab '\376\377' | od -t fL) || - framework_failure_ -case "$*" in -*0-*) fail=1;; -esac -case $3,$4 in --1.023442870282055988e+4855,-1.023442870282055988e+4855) fail=1;; -esac - -Exit $fail diff --git a/tests/misc/od-float.sh b/tests/misc/od-float.sh new file mode 100755 index 00000000..306c3abe --- /dev/null +++ b/tests/misc/od-float.sh @@ -0,0 +1,58 @@ +#!/bin/sh +# Test od on floating-point values. + +# Copyright (C) 2010-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ od + +export LC_ALL=C + +# Test for a bug in coreutils up through 8.7: od was losing +# information when asked to parse floating-point values. The numeric +# tests are valid only on Intel-like hosts, but that should be good +# enough to detect regressions, as they are designed to succeed on +# non-Intel-like hosts. Also, test for another bug in coreutils 8.7 +# on x86: sometimes there was no space between the columns. + +set x $(echo aaaabaaa | tr ab '\376\377' | od -t fF) || + framework_failure_ +case "$*" in +*0-*) fail=1;; +esac +case $3,$4 in +-1.694740e+38,-1.694740e+38) fail=1;; +esac + +set x $(echo aaaaaaaabaaaaaaa | tr ab '\376\377' | od -t fD) || + framework_failure_ +case "$*" in +*0-*) fail=1;; +esac +case $3,$4 in +-5.314010372517808e+303,-5.314010372517808e+303) fail=1;; +esac + +set x $(echo aaaaaaaaaaaaaaaabaaaaaaaaaaaaaaa | tr ab '\376\377' | od -t fL) || + framework_failure_ +case "$*" in +*0-*) fail=1;; +esac +case $3,$4 in +-1.023442870282055988e+4855,-1.023442870282055988e+4855) fail=1;; +esac + +Exit $fail diff --git a/tests/misc/od-multiple-t b/tests/misc/od-multiple-t deleted file mode 100755 index 049273cd..00000000 --- a/tests/misc/od-multiple-t +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh -# verify that multiple -t specifiers to od align well -# This would fail before coreutils-6.13. - -# Copyright (C) 2008-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ od - -# Choose 48 bytes for the input, as that is lcm for 1, 2, 4, 8, 12, 16; -# we don't anticipate any other native object size on modern hardware. -seq 19 > in || framework_failure_ -test $(wc -c < in) -eq 48 || framework_failure_ - - -list='a c dC dS dI dL oC oS oI oL uC uS uI uL xC xS xI xL fF fD fL' -for format1 in $list; do - for format2 in $list; do - od -An -t${format1}z -t${format2}z in > out-raw || fail=1 - linewidth=$(head -n1 out-raw | wc -c) - linecount=$(wc -l < out-raw) - echo $format1 $format2 $(wc -c < out-raw) >> out - echo $format1 $format2 $(expr $linewidth '*' $linecount) >> exp - done -done - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/misc/od-multiple-t.sh b/tests/misc/od-multiple-t.sh new file mode 100755 index 00000000..2b8de711 --- /dev/null +++ b/tests/misc/od-multiple-t.sh @@ -0,0 +1,42 @@ +#!/bin/sh +# verify that multiple -t specifiers to od align well +# This would fail before coreutils-6.13. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ od + +# Choose 48 bytes for the input, as that is lcm for 1, 2, 4, 8, 12, 16; +# we don't anticipate any other native object size on modern hardware. +seq 19 > in || framework_failure_ +test $(wc -c < in) -eq 48 || framework_failure_ + + +list='a c dC dS dI dL oC oS oI oL uC uS uI uL xC xS xI xL fF fD fL' +for format1 in $list; do + for format2 in $list; do + od -An -t${format1}z -t${format2}z in > out-raw || fail=1 + linewidth=$(head -n1 out-raw | wc -c) + linecount=$(wc -l < out-raw) + echo $format1 $format2 $(wc -c < out-raw) >> out + echo $format1 $format2 $(expr $linewidth '*' $linecount) >> exp + done +done + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/misc/od-x8 b/tests/misc/od-x8 deleted file mode 100755 index 98a9fe97..00000000 --- a/tests/misc/od-x8 +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -# verify that od -t x8 works properly -# This would fail before coreutils-4.5.2. - -# Copyright (C) 2002-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ od - -od -t x8 /dev/null >/dev/null || - skip_ "od lacks support for 8-byte quantities" - -echo abcdefgh |tr -d '\n' > in || framework_failure_ - - -od -An -t x8 in > out-raw || fail=1 -sed 's/^ //;s/\(..\)/\1 /g;s/ $//' out-raw \ - | tr ' ' '\n' \ - | sort -n \ - > out - -od -An -t x1 in \ - | sed 's/^ //' \ - | tr ' ' '\n' \ - | sort -n \ - > exp - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/misc/od-x8.sh b/tests/misc/od-x8.sh new file mode 100755 index 00000000..f55e1b70 --- /dev/null +++ b/tests/misc/od-x8.sh @@ -0,0 +1,43 @@ +#!/bin/sh +# verify that od -t x8 works properly +# This would fail before coreutils-4.5.2. + +# Copyright (C) 2002-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ od + +od -t x8 /dev/null >/dev/null || + skip_ "od lacks support for 8-byte quantities" + +echo abcdefgh |tr -d '\n' > in || framework_failure_ + + +od -An -t x8 in > out-raw || fail=1 +sed 's/^ //;s/\(..\)/\1 /g;s/ $//' out-raw \ + | tr ' ' '\n' \ + | sort -n \ + > out + +od -An -t x1 in \ + | sed 's/^ //' \ + | tr ' ' '\n' \ + | sort -n \ + > exp + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/misc/od.pl b/tests/misc/od.pl new file mode 100755 index 00000000..0649b1c6 --- /dev/null +++ b/tests/misc/od.pl @@ -0,0 +1,67 @@ +#!/usr/bin/perl +# Exercise od + +# Copyright (C) 2006-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/>. + +use strict; + +(my $program_name = $0) =~ s|.*/||; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +# Use a file in /proc whose size is not likely to +# change between the wc and od invocations. +my $proc_file = '/proc/version'; +-f $proc_file + or $proc_file = '/dev/null'; + +# Count the bytes in $proc_file, _by reading_. +my $len = 0; +open FH, '<', $proc_file + or die "$program_name: can't open '$proc_file' for reading: $!\n"; +while (defined (my $line = <FH>)) + { + $len += length $line; + } +close FH; +my $proc_file_byte_count = $len; + +my @Tests = + ( + # Skip the exact length of the input file. + # Up to coreutils-6.9, this would ignore the "-j 1". + ['j-bug1', '-c -j 1 -An', {IN=>{g=>'a'}}, {OUT=>''}], + ['j-bug2', '-c -j 2 -An', {IN=>{g=>'a'}}, {IN=>{h=>'b'}}, {OUT=>''}], + # Skip the sum of the lengths of the first three inputs. + ['j-bug3', '-c -j 3 -An', {IN=>{g=>'a'}}, {IN=>{h=>'b'}}, + {IN=>{i=>'c'}}, {OUT=>''}], + # Skip the sum of the lengths of the first three inputs, printing the 4th. + ['j-bug4', '-c -j 3 -An', {IN=>{g=>'a'}}, {IN=>{h=>'b'}}, + {IN=>{i=>'c'}}, {IN=>{j=>'d'}}, {OUT=>" d\n"}], + + # Ensure that od -j doesn't fseek across a nonempty file in /proc, + # 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"}], + ); + +my $save_temps = $ENV{DEBUG}; +my $verbose = $ENV{VERBOSE}; + +my $prog = 'od'; +my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); +exit $fail; diff --git a/tests/misc/paste b/tests/misc/paste deleted file mode 100755 index 3d5b4119..00000000 --- a/tests/misc/paste +++ /dev/null @@ -1,65 +0,0 @@ -#!/usr/bin/perl -# Test paste. - -# Copyright (C) 2003-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 -# 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; - -(my $program_name = $0) =~ s|.*/||; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -my $prog = 'paste'; -my $msg = "$prog: delimiter list ends with an unescaped backslash: "; - -my @Tests = - ( - # Ensure that paste properly handles files lacking a final newline. - ['no-nl-1', {IN=>"a"}, {IN=>"b"}, {OUT=>"a\tb\n"}], - ['no-nl-2', {IN=>"a\n"}, {IN=>"b"}, {OUT=>"a\tb\n"}], - ['no-nl-3', {IN=>"a"}, {IN=>"b\n"}, {OUT=>"a\tb\n"}], - ['no-nl-4', {IN=>"a\n"}, {IN=>"b\n"}, {OUT=>"a\tb\n"}], - - # Same as above, but with a two lines in each input file and - # the addition of the -d option to make SPACE be the output delimiter. - ['no-nla1', '-d" "', {IN=>"1\na"}, {IN=>"2\nb"}, {OUT=>"1 2\na b\n"}], - ['no-nla2', '-d" "', {IN=>"1\na\n"}, {IN=>"2\nb"}, {OUT=>"1 2\na b\n"}], - ['no-nla3', '-d" "', {IN=>"1\na"}, {IN=>"2\nb\n"}, {OUT=>"1 2\na b\n"}], - ['no-nla4', '-d" "', {IN=>"1\na\n"}, {IN=>"2\nb\n"}, {OUT=>"1 2\na b\n"}], - - # Specifying a delimiter with a trailing backslash would overrun a - # malloc'd buffer. - ['delim-bs1', q!-d'\'!, {IN=>{'a'x50=>''}}, {EXIT => 1}, - # We print a single backslash into the expected output, so need four - # (two, each escaped) here. - {ERR => $msg . q!\\\\! . "\n"} ], - - # Prior to coreutils-5.1.2, this sort of abuse would make paste - # scribble on command-line arguments. With paste from coreutils-5.1.0, - # this example would mangle the first file name argument, if it contains - # accepted backslash-escapes: - # $ paste -d\\ '123\b\b\b.....@' 2>&1 |cat -A - # paste: 23^H^H^H.....@...@: No such file or directory$ - ['delim-bs2', q!-d'\'!, {IN=>{'123\b\b\b.....@'=>''}}, {EXIT => 1}, - {ERR => $msg . q!\\\\! . "\n"} ], - ); - -my $save_temps = $ENV{DEBUG}; -my $verbose = $ENV{VERBOSE}; - -my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); -exit $fail; diff --git a/tests/misc/paste.pl b/tests/misc/paste.pl new file mode 100755 index 00000000..783a5d42 --- /dev/null +++ b/tests/misc/paste.pl @@ -0,0 +1,65 @@ +#!/usr/bin/perl +# Test paste. + +# 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/>. + +use strict; + +(my $program_name = $0) =~ s|.*/||; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +my $prog = 'paste'; +my $msg = "$prog: delimiter list ends with an unescaped backslash: "; + +my @Tests = + ( + # Ensure that paste properly handles files lacking a final newline. + ['no-nl-1', {IN=>"a"}, {IN=>"b"}, {OUT=>"a\tb\n"}], + ['no-nl-2', {IN=>"a\n"}, {IN=>"b"}, {OUT=>"a\tb\n"}], + ['no-nl-3', {IN=>"a"}, {IN=>"b\n"}, {OUT=>"a\tb\n"}], + ['no-nl-4', {IN=>"a\n"}, {IN=>"b\n"}, {OUT=>"a\tb\n"}], + + # Same as above, but with a two lines in each input file and + # the addition of the -d option to make SPACE be the output delimiter. + ['no-nla1', '-d" "', {IN=>"1\na"}, {IN=>"2\nb"}, {OUT=>"1 2\na b\n"}], + ['no-nla2', '-d" "', {IN=>"1\na\n"}, {IN=>"2\nb"}, {OUT=>"1 2\na b\n"}], + ['no-nla3', '-d" "', {IN=>"1\na"}, {IN=>"2\nb\n"}, {OUT=>"1 2\na b\n"}], + ['no-nla4', '-d" "', {IN=>"1\na\n"}, {IN=>"2\nb\n"}, {OUT=>"1 2\na b\n"}], + + # Specifying a delimiter with a trailing backslash would overrun a + # malloc'd buffer. + ['delim-bs1', q!-d'\'!, {IN=>{'a'x50=>''}}, {EXIT => 1}, + # We print a single backslash into the expected output, so need four + # (two, each escaped) here. + {ERR => $msg . q!\\\\! . "\n"} ], + + # Prior to coreutils-5.1.2, this sort of abuse would make paste + # scribble on command-line arguments. With paste from coreutils-5.1.0, + # this example would mangle the first file name argument, if it contains + # accepted backslash-escapes: + # $ paste -d\\ '123\b\b\b.....@' 2>&1 |cat -A + # paste: 23^H^H^H.....@...@: No such file or directory$ + ['delim-bs2', q!-d'\'!, {IN=>{'123\b\b\b.....@'=>''}}, {EXIT => 1}, + {ERR => $msg . q!\\\\! . "\n"} ], + ); + +my $save_temps = $ENV{DEBUG}; +my $verbose = $ENV{VERBOSE}; + +my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); +exit $fail; diff --git a/tests/misc/pathchk1 b/tests/misc/pathchk1 deleted file mode 100755 index 373b545d..00000000 --- a/tests/misc/pathchk1 +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh -# pathchk tests - -# Copyright (C) 2002-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ pathchk -skip_if_root_ - -touch file || framework_failure_ - - -# This should exit nonzero. Before 2.0.13, it gave a diagnostic, -# but exited successfully. -pathchk file/x > /dev/null 2>&1 && fail=1 - -# This should exit nonzero. Through 5.3.0 it exited with status zero. -pathchk -p '' > /dev/null 2>&1 && fail=1 - -# This tests the new -P option. -pathchk -P '' > /dev/null 2>&1 && fail=1 -pathchk -P -- - > /dev/null 2>&1 && fail=1 -pathchk -p -P x/- > /dev/null 2>&1 && fail=1 - -Exit $fail diff --git a/tests/misc/pathchk1.sh b/tests/misc/pathchk1.sh new file mode 100755 index 00000000..eed71d5f --- /dev/null +++ b/tests/misc/pathchk1.sh @@ -0,0 +1,38 @@ +#!/bin/sh +# pathchk tests + +# Copyright (C) 2002-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ pathchk +skip_if_root_ + +touch file || framework_failure_ + + +# This should exit nonzero. Before 2.0.13, it gave a diagnostic, +# but exited successfully. +pathchk file/x > /dev/null 2>&1 && fail=1 + +# This should exit nonzero. Through 5.3.0 it exited with status zero. +pathchk -p '' > /dev/null 2>&1 && fail=1 + +# This tests the new -P option. +pathchk -P '' > /dev/null 2>&1 && fail=1 +pathchk -P -- - > /dev/null 2>&1 && fail=1 +pathchk -p -P x/- > /dev/null 2>&1 && fail=1 + +Exit $fail diff --git a/tests/misc/pr b/tests/misc/pr deleted file mode 100755 index 0f25e253..00000000 --- a/tests/misc/pr +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/perl -# Exercise a bug with pr -m -s - -# Copyright (C) 2007-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 -# 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; - -(my $program_name = $0) =~ s|.*/||; - -$ENV{PROG} = 'pr'; -my $ME = $ENV{PROG}; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -my @Tests = - ( - ['merge-w-tabs', '-m -s -t', - {IN=>{1=>"a\tb\tc\n"}}, - {IN=>{2=>"m\tn\to\n"}}, - {IN=>{3=>"x\ty\tz\n"}}, - {OUT=>join("\t", qw(a b c m n o x y z)) . "\n"} ], - ); - -my $save_temps = $ENV{DEBUG}; -my $verbose = $ENV{VERBOSE}; - -my $prog = $ENV{PROG} || die "$0: \$PROG not specified in environment\n"; -my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); -exit $fail; diff --git a/tests/misc/printenv b/tests/misc/printenv deleted file mode 100755 index bbce8ef0..00000000 --- a/tests/misc/printenv +++ /dev/null @@ -1,81 +0,0 @@ -#!/bin/sh -# Verify behavior of printenv. - -# Copyright (C) 2009-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ printenv - -# Without arguments, printenv behaves like env. Some shells provide -# printenv as a builtin, so we must invoke it via "env". -# But beware of $_, set by many shells to the last command run. -# Also, filter out LD_PRELOAD, which is set when running under valgrind. -env | grep -Ev '^(_|LD_PRELOAD=)' > exp || framework_failure_ -env -- printenv | grep -Ev '^(_|LD_PRELOAD=)' > out || fail=1 -compare exp out || fail=1 - -# POSIX is clear that environ may, but need not be, sorted. -# Environment variable values may contain newlines, which cannot be -# observed by merely inspecting output from printenv. -if env -- printenv | grep '^ENV_TEST' >/dev/null ; then - skip_ "environment has potential interference from ENV_TEST*" -fi - -# Printing a single variable's value. -env -- printenv ENV_TEST > out -test $? = 1 || fail=1 -test -s out && fail=1 -echo a > exp || framework_failure_ -ENV_TEST=a env -- printenv ENV_TEST > out || fail=1 -compare exp out || fail=1 - -# Printing multiple variables. Order follows command line. -ENV_TEST1=a ENV_TEST2=b env -- printenv ENV_TEST2 ENV_TEST1 ENV_TEST2 > out \ - || fail=1 -ENV_TEST1=a ENV_TEST2=b env -- printenv ENV_TEST1 ENV_TEST2 >> out || fail=1 -cat <<EOF > exp || framework_failure_ -b -a -b -a -b -EOF -compare exp out || fail=1 - -# Exit status reflects missing variable, but remaining arguments processed. -ENV_TEST1=a env -- printenv ENV_TEST2 ENV_TEST1 > out -test $? = 1 || fail=1 -ENV_TEST1=a env -- printenv ENV_TEST1 ENV_TEST2 >> out -test $? = 1 || fail=1 -cat <<EOF > exp || framework_failure_ -a -a -EOF -compare exp out || fail=1 - -# Non-standard environment variable name. Shells won't create it, but -# env can, and printenv must be able to deal with it. -echo b > exp || framework_failure_ -env -- -a=b printenv -- -a > out || fail=1 -compare exp out || fail=1 - -# Silently reject invalid env-var names. -# Bug present through coreutils 8.0. -env a=b=c printenv a=b > out -test $? = 1 || fail=1 -test -s out && fail=1 - -Exit $fail diff --git a/tests/misc/printenv.sh b/tests/misc/printenv.sh new file mode 100755 index 00000000..e7dbbeef --- /dev/null +++ b/tests/misc/printenv.sh @@ -0,0 +1,81 @@ +#!/bin/sh +# Verify behavior of printenv. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ printenv + +# Without arguments, printenv behaves like env. Some shells provide +# printenv as a builtin, so we must invoke it via "env". +# But beware of $_, set by many shells to the last command run. +# Also, filter out LD_PRELOAD, which is set when running under valgrind. +env | grep -Ev '^(_|LD_PRELOAD=)' > exp || framework_failure_ +env -- printenv | grep -Ev '^(_|LD_PRELOAD=)' > out || fail=1 +compare exp out || fail=1 + +# POSIX is clear that environ may, but need not be, sorted. +# Environment variable values may contain newlines, which cannot be +# observed by merely inspecting output from printenv. +if env -- printenv | grep '^ENV_TEST' >/dev/null ; then + skip_ "environment has potential interference from ENV_TEST*" +fi + +# Printing a single variable's value. +env -- printenv ENV_TEST > out +test $? = 1 || fail=1 +test -s out && fail=1 +echo a > exp || framework_failure_ +ENV_TEST=a env -- printenv ENV_TEST > out || fail=1 +compare exp out || fail=1 + +# Printing multiple variables. Order follows command line. +ENV_TEST1=a ENV_TEST2=b env -- printenv ENV_TEST2 ENV_TEST1 ENV_TEST2 > out \ + || fail=1 +ENV_TEST1=a ENV_TEST2=b env -- printenv ENV_TEST1 ENV_TEST2 >> out || fail=1 +cat <<EOF > exp || framework_failure_ +b +a +b +a +b +EOF +compare exp out || fail=1 + +# Exit status reflects missing variable, but remaining arguments processed. +ENV_TEST1=a env -- printenv ENV_TEST2 ENV_TEST1 > out +test $? = 1 || fail=1 +ENV_TEST1=a env -- printenv ENV_TEST1 ENV_TEST2 >> out +test $? = 1 || fail=1 +cat <<EOF > exp || framework_failure_ +a +a +EOF +compare exp out || fail=1 + +# Non-standard environment variable name. Shells won't create it, but +# env can, and printenv must be able to deal with it. +echo b > exp || framework_failure_ +env -- -a=b printenv -- -a > out || fail=1 +compare exp out || fail=1 + +# Silently reject invalid env-var names. +# Bug present through coreutils 8.0. +env a=b=c printenv a=b > out +test $? = 1 || fail=1 +test -s out && fail=1 + +Exit $fail diff --git a/tests/misc/printf b/tests/misc/printf deleted file mode 100755 index 987e452a..00000000 --- a/tests/misc/printf +++ /dev/null @@ -1,127 +0,0 @@ -#!/bin/sh -# basic tests for printf - -# Copyright (C) 2002-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 -# 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/>. - -prog='env printf' - -. "${srcdir=.}/init.sh"; path_prepend_ ../src -print_ver_ printf - -getlimits_ - - -# Verify the 3 methods of specifying "Escape": -test $($prog "\x1b\n\33\n\e\n" | uniq -u) && fail=1 - -# This would fail (by printing the '--') for printf in sh-utils -# and in coreutils 4.5.1. -$prog -- 'foo\n' > out || fail=1 -cat <<\EOF > exp -foo -EOF - -compare exp out || fail=1 - -rm -f out exp -# Until coreutils-4.5.10, this would elicit a segfault. -$prog '1 %*sy\n' -3 x > out || fail=1 - -# Until coreutils 5.2.2, this would succeed. -if POSIXLY_CORRECT=1 $prog '2 \x' >/dev/null 2>&1; then - fail=1 -else - echo '2 failed, as expected' >> out -fi - -# Until coreutils-4.5.12, these would fail. -$prog '3 \x40\n' >> out || fail=1 -POSIXLY_CORRECT=1 \ -$prog '4 \x40\n' >> out || fail=1 -$prog '5 % +d\n' 234 >> out || fail=1 - -# This should print "6 !\n", but don't rely on '!' being the -# one-byte representation of octal 041. With printf prior to -# coreutils-5.0.1, it would print six bytes: "6 \41\n". -$prog '6 \41\n' | tr '\41' '!' >> out - -# Note that as of coreutils-5.0.1, printf with a format of '\0002x' -# prints a NUL byte followed by the digit '2' and an 'x'. -# By contrast bash's printf outputs the same thing as $(printf '\2x') does. -$prog '7 \2y \02y \002y \0002y\n' |tr '\0\2' '*=' >> out - -$prog '8 %b %b %b %b\n' '\1y' '\01y' '\001y' '\0001y'|tr '\1' = >> out - -$prog '9 %*dx\n' -2 0 >>out || fail=1 - -$prog '10 %.*dx\n' $INT_UFLOW 0 >>out || fail=1 -$prog '%.*dx\n' $INT_OFLOW 0 >>out 2> /dev/null && fail=1 - -$prog '11 %*c\n' 2 x >>out || fail=1 - -$prog '%#d\n' 0 >>out 2> /dev/null && fail=1 - -$prog '%0s\n' 0 >>out 2> /dev/null && fail=1 - -$prog '%.9c\n' 0 >>out 2> /dev/null && fail=1 - -$prog '%'\''s\n' 0 >>out 2> /dev/null && fail=1 - -cat <<\EOF > exp -1 x y -2 failed, as expected -3 @ -4 @ -5 +234 -6 ! -7 =y =y =y *2y -8 =y =y =y =y -9 0 x -10 0x -11 x -EOF - -compare exp out || fail=1 - -# Verify handling of single quote chars (\' or \") - -$prog '%d\n' '"a' >out 2>err # valid -$prog '%d\n' '"a"' >>out 2>>err # invalid -$prog '%d\n' '"' >>out 2>>err # invalid -$prog '%d\n' 'a' >>out 2>>err # invalid - -cat <<EOF > exp -97 -97 -0 -0 -EOF - -# POSIX says strtoimax *may* set errno to EINVAL in the latter -# two cases. So far, that happens at least on MacOS X 10.5. -# Map that output to the more common expected output. -sed 's/: Invalid.*/: expected a numeric value/' err > k && mv k err - -cat <<EOF > exp_err -printf: warning: ": character(s) following character constant have been ignored -printf: ": expected a numeric value -printf: a: expected a numeric value -EOF - -compare exp out || fail=1 -compare exp_err err || fail=1 - -Exit $fail diff --git a/tests/misc/printf-cov b/tests/misc/printf-cov deleted file mode 100755 index 64f2d95b..00000000 --- a/tests/misc/printf-cov +++ /dev/null @@ -1,101 +0,0 @@ -#!/usr/bin/perl -# improve printf.c test coverage - -# Copyright (C) 2008-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 -# 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; - -my $prog = 'printf'; -my $try = "Try '$prog --help' for more information.\n"; -my $pow_2_31 = 2**31; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -my @Tests = -( - ['no-args', {EXIT=>1}, {ERR=>"$prog: missing operand\n$try"}], - ['no-arg2', '--', {EXIT=>1}, {ERR=>"$prog: missing operand\n$try"}], - ['escape-1', q('\a\b\f\n\r\t\v\z\c'), {OUT=>"\a\b\f\n\r\t\x0b\\z"}], - ['hex-ucX', '%X 999', {OUT=>"3E7"}], - ['hex-ucXw', '%4X 999', {OUT=>" 3E7"}], - ['hex-ucXp', '%.4X 999', {OUT=>"03E7"}], - ['hex-ucXwp', '%5.4X 999', {OUT=>" 03E7"}], - ['hex-vw', '%*X 4 42', {OUT=>" 2A"}], - ['hex-vp', '%.*X 4 42', {OUT=>"002A"}], - ['hex-vwvp', '%*.*X 3 2 15', {OUT=>" 0F"}], - ['b', q('nl\ntab\tx'), {OUT=>"nl\ntab\tx"}], - ['c1', '%c 123', {OUT=>"1"}], - ['cw', '%\*c 3 123', {OUT=>" 1"}], - ['d-ucXwp', '%5.4d 999', {OUT=>" 0999"}], - ['d-vw', '%*d 4 42', {OUT=>" 42"}], - ['d-vp', '%.*d 4 42', {OUT=>"0042"}], - ['d-vwvp', '%*.*d 3 2 15', {OUT=>" 15"}], - ['d-neg-prec', '%.*d -3 15', {OUT=>"15"}], - ['d-big-prec', "%.*d $pow_2_31 15", # INT_MAX - {EXIT=>1}, {ERR=>"$prog: invalid precision: $pow_2_31\n"}], - ['d-big-fwidth', "%*d $pow_2_31 15", # INT_MAX - {EXIT=>1}, {ERR=>"$prog: invalid field width: $pow_2_31\n"}], - ['F', '%F 1', {OUT=>"1.000000"}], - ['LF', '%LF 1', {OUT=>"1.000000"}], - ['E', '%E 2', {OUT=>"2.000000E+00"}], - ['LE', '%LE 2', {OUT=>"2.000000E+00"}], - ['s', '%s x', {OUT=>"x"}], - ['sw', '%\*s 2 x', {OUT=>" x"}], - ['sp', '%.\*s 2 abcd', {OUT=>"ab"}], - ['swp', '%\*.\*s 2 2 abcd', {OUT=>"ab"}], - ['sw-no-args', '%\*s'], - ['sw-no-args2', '%.\*s'], - ['G-ucXwp', '%5.4G 3', {OUT=>" 3"}], - ['G-vw', '%*G 4 42', {OUT=>" 42"}], - ['G-vp', '%.*G 4 42', {OUT=>"42"}], - ['G-vwvp', '%*.*G 5 3 15', {OUT=>" 15"}], - ['esc', q('\xaa\0377'), {OUT=>"\xaa\0377"}], - ['esc-bad-hex', q('\x'), {EXIT=>1}, - {ERR=>"$prog: missing hexadecimal number in escape\n"}], - # ['u4', q('\u09ac'), {OUT=>"\xe0a6ac"}], - ['u-invalid', q('\u0000'), {EXIT=>1}, - {ERR=>"$prog: invalid universal character name \\u0000\n"}], - ['u-missing', q('\u'), {EXIT=>1}, - {ERR=>"$prog: missing hexadecimal number in escape\n"}], - ['d-invalid', '%d no-num', {OUT=>'0'}, {EXIT=>1}, - # Depending on the strtol implementation we expect one of these: - # no-num: Invalid argument (FreeBSD6) - # no-num: expected a numeric value (glibc, Solaris 10) - {ERR_SUBST => 's/Invalid argument$/expected a numeric value/'}, - {ERR=>"$prog: no-num: expected a numeric value\n"}], - ['d-bad-suffix', '%d 9z', {OUT=>'9'}, {EXIT=>1}, - {ERR=>"$prog: 9z: value not completely converted\n"}], - ['d-out-of-range', '%d '.('9'x30), {EXIT=>1}, - {OUT=>"inaccurate"}, {OUT_SUBST => 's/\d+/inaccurate/'}, - {ERR=>"$prog: 9...9\n"}, {ERR_SUBST => 's/9+.*/9...9/'}], - ['excess', 'B 1', {OUT=>'B'}, - {ERR=>"$prog: warning: ignoring excess arguments, starting with '1'\n"}], - ['percent', '%%', {OUT=>'%'}], - ['d-sp', q('% d' 33), {OUT=>' 33'}], - ['d-plus', q('%+d' 33), {OUT=>'+33'}], - ['d-minus', q('%-d' 33), {OUT=> '33'}], - ['d-zero', q('%02d' 1), {OUT=> '01'}], - ['d-quote', q("%'d" 3333), {OUT=> '3333'}, {OUT_SUBST => 'tr/3//c'}], - ['d-hash', q("%#d" 3333), {EXIT=>1}, - {ERR=>"$prog: %#d: invalid conversion specification\n"}], -); - -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/printf-cov.pl b/tests/misc/printf-cov.pl new file mode 100755 index 00000000..44250aab --- /dev/null +++ b/tests/misc/printf-cov.pl @@ -0,0 +1,101 @@ +#!/usr/bin/perl +# improve printf.c test coverage + +# 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/>. + +use strict; + +my $prog = 'printf'; +my $try = "Try '$prog --help' for more information.\n"; +my $pow_2_31 = 2**31; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +my @Tests = +( + ['no-args', {EXIT=>1}, {ERR=>"$prog: missing operand\n$try"}], + ['no-arg2', '--', {EXIT=>1}, {ERR=>"$prog: missing operand\n$try"}], + ['escape-1', q('\a\b\f\n\r\t\v\z\c'), {OUT=>"\a\b\f\n\r\t\x0b\\z"}], + ['hex-ucX', '%X 999', {OUT=>"3E7"}], + ['hex-ucXw', '%4X 999', {OUT=>" 3E7"}], + ['hex-ucXp', '%.4X 999', {OUT=>"03E7"}], + ['hex-ucXwp', '%5.4X 999', {OUT=>" 03E7"}], + ['hex-vw', '%*X 4 42', {OUT=>" 2A"}], + ['hex-vp', '%.*X 4 42', {OUT=>"002A"}], + ['hex-vwvp', '%*.*X 3 2 15', {OUT=>" 0F"}], + ['b', q('nl\ntab\tx'), {OUT=>"nl\ntab\tx"}], + ['c1', '%c 123', {OUT=>"1"}], + ['cw', '%\*c 3 123', {OUT=>" 1"}], + ['d-ucXwp', '%5.4d 999', {OUT=>" 0999"}], + ['d-vw', '%*d 4 42', {OUT=>" 42"}], + ['d-vp', '%.*d 4 42', {OUT=>"0042"}], + ['d-vwvp', '%*.*d 3 2 15', {OUT=>" 15"}], + ['d-neg-prec', '%.*d -3 15', {OUT=>"15"}], + ['d-big-prec', "%.*d $pow_2_31 15", # INT_MAX + {EXIT=>1}, {ERR=>"$prog: invalid precision: $pow_2_31\n"}], + ['d-big-fwidth', "%*d $pow_2_31 15", # INT_MAX + {EXIT=>1}, {ERR=>"$prog: invalid field width: $pow_2_31\n"}], + ['F', '%F 1', {OUT=>"1.000000"}], + ['LF', '%LF 1', {OUT=>"1.000000"}], + ['E', '%E 2', {OUT=>"2.000000E+00"}], + ['LE', '%LE 2', {OUT=>"2.000000E+00"}], + ['s', '%s x', {OUT=>"x"}], + ['sw', '%\*s 2 x', {OUT=>" x"}], + ['sp', '%.\*s 2 abcd', {OUT=>"ab"}], + ['swp', '%\*.\*s 2 2 abcd', {OUT=>"ab"}], + ['sw-no-args', '%\*s'], + ['sw-no-args2', '%.\*s'], + ['G-ucXwp', '%5.4G 3', {OUT=>" 3"}], + ['G-vw', '%*G 4 42', {OUT=>" 42"}], + ['G-vp', '%.*G 4 42', {OUT=>"42"}], + ['G-vwvp', '%*.*G 5 3 15', {OUT=>" 15"}], + ['esc', q('\xaa\0377'), {OUT=>"\xaa\0377"}], + ['esc-bad-hex', q('\x'), {EXIT=>1}, + {ERR=>"$prog: missing hexadecimal number in escape\n"}], + # ['u4', q('\u09ac'), {OUT=>"\xe0a6ac"}], + ['u-invalid', q('\u0000'), {EXIT=>1}, + {ERR=>"$prog: invalid universal character name \\u0000\n"}], + ['u-missing', q('\u'), {EXIT=>1}, + {ERR=>"$prog: missing hexadecimal number in escape\n"}], + ['d-invalid', '%d no-num', {OUT=>'0'}, {EXIT=>1}, + # Depending on the strtol implementation we expect one of these: + # no-num: Invalid argument (FreeBSD6) + # no-num: expected a numeric value (glibc, Solaris 10) + {ERR_SUBST => 's/Invalid argument$/expected a numeric value/'}, + {ERR=>"$prog: no-num: expected a numeric value\n"}], + ['d-bad-suffix', '%d 9z', {OUT=>'9'}, {EXIT=>1}, + {ERR=>"$prog: 9z: value not completely converted\n"}], + ['d-out-of-range', '%d '.('9'x30), {EXIT=>1}, + {OUT=>"inaccurate"}, {OUT_SUBST => 's/\d+/inaccurate/'}, + {ERR=>"$prog: 9...9\n"}, {ERR_SUBST => 's/9+.*/9...9/'}], + ['excess', 'B 1', {OUT=>'B'}, + {ERR=>"$prog: warning: ignoring excess arguments, starting with '1'\n"}], + ['percent', '%%', {OUT=>'%'}], + ['d-sp', q('% d' 33), {OUT=>' 33'}], + ['d-plus', q('%+d' 33), {OUT=>'+33'}], + ['d-minus', q('%-d' 33), {OUT=> '33'}], + ['d-zero', q('%02d' 1), {OUT=> '01'}], + ['d-quote', q("%'d" 3333), {OUT=> '3333'}, {OUT_SUBST => 'tr/3//c'}], + ['d-hash', q("%#d" 3333), {EXIT=>1}, + {ERR=>"$prog: %#d: invalid conversion specification\n"}], +); + +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/printf-hex b/tests/misc/printf-hex deleted file mode 100755 index 23a218fa..00000000 --- a/tests/misc/printf-hex +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# make sure that only two hex. digits are consumed in a \xHHH sequence - -# Copyright (C) 2002-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ printf - -env printf '\x7e3\n' > out || fail=1 -cat <<\EOF > exp -~3 -EOF - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/misc/printf-hex.sh b/tests/misc/printf-hex.sh new file mode 100755 index 00000000..d59899cb --- /dev/null +++ b/tests/misc/printf-hex.sh @@ -0,0 +1,29 @@ +#!/bin/sh +# make sure that only two hex. digits are consumed in a \xHHH sequence + +# Copyright (C) 2002-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ printf + +env printf '\x7e3\n' > out || fail=1 +cat <<\EOF > exp +~3 +EOF + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/misc/printf-surprise b/tests/misc/printf-surprise deleted file mode 100755 index d15987bc..00000000 --- a/tests/misc/printf-surprise +++ /dev/null @@ -1,91 +0,0 @@ -#!/bin/sh -# Detect printf(3) failure even when it doesn't set stream error indicator - -# Copyright (C) 2007-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 -# 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/>. - -prog=printf - -. "${srcdir=.}/init.sh"; path_prepend_ ../src -print_ver_ printf - -require_ulimit_ - - -# Up to coreutils-6.9, "printf %.Nf 0" would encounter an ENOMEM internal -# error from glibc's printf(3) function whenever N was large relative to -# the size of available memory. As of Oct 2007, that internal stream- -# related failure was not reflected (for any libc I know of) in the usual -# stream error indicator that is tested by ferror. The result was that -# while the printf command obviously failed (generated no output), -# it mistakenly exited successfully (exit status of 0). - -# Testing it is tricky, because there is so much variance -# in quality for this corner of printf(3) implementations. -# Most implementations do attempt to allocate N bytes of storage. -# Using the maximum value for N (2^31-1) causes glibc-2.7 to try to -# allocate almost 2^64 bytes, while freeBSD 6.1's implementation -# correctly outputs almost 2GB worth of 0's, which takes too long. -# We want to test implementations that allocate N bytes, but without -# triggering the above extremes. - -# Some other versions of glibc-2.7 have a snprintf function that segfaults -# when an internal (technically unnecessary!) memory allocation fails. - -# The compromise is to limit virtual memory to something reasonable, -# and to make an N-byte-allocating-printf require more than that, thus -# triggering the printf(3) misbehavior -- which, btw, is required by ISO C99. - -mkfifo_or_skip_ fifo - -# Disable MALLOC_PERTURB_, to avoid triggering this bug -# http://bugs.debian.org/481543#77 -export MALLOC_PERTURB_=0 - -head -c 10 fifo > out & -( ulimit -v 10000; env $prog %20000000f 0 2>err-msg > fifo ) -exit=$? - -# Map this longer, and rarer, diagnostic to the common one. -# printf: cannot perform formatted output: Cannot allocate memory" \ -sed 's/cannot perform .*/write error/' err-msg > k && mv k err-msg -err_msg=$(cat err-msg|tr '\n' :) - -# By some bug, on Solaris 11 (5.11 snv_86), err_msg ends up -# containing '1> fifo:printf: write error:'. Recognize that, too. - -case $err_msg in - "$prog: write error:"*) diagnostic=y ;; - "1> fifo:$prog: write error:") diagnostic=y ;; - '') diagnostic=n ;; - *) diagnostic=unexpected ;; -esac -n_out=$(wc -c < out) - -case $n_out:$diagnostic:$exit in - 10:n:0) ;; # ok, succeeds w/no diagnostic: FreeBSD 6.1 - 0:y:1) ;; # ok, glibc-2.8 and newer, when printf(3) fails with ENOMEM - - # With MALLOC_PERTURB_=0, this no longer happens. - # *:139) # segfault; known bug at least in debian unstable's libc6 2.7-11 - # echo 1>&2 "$0: bug in snprintf causes low-mem use of printf to segfault" - # fail=77;; - - # 10:y) ;; # Fail: doesn't happen: nobody succeeds with a diagnostic - # 0:n) ;; # Fail pre-patch: no output, no diag - *) fail=1;; -esac - -Exit $fail diff --git a/tests/misc/printf-surprise.sh b/tests/misc/printf-surprise.sh new file mode 100755 index 00000000..0db6f7b1 --- /dev/null +++ b/tests/misc/printf-surprise.sh @@ -0,0 +1,94 @@ +#!/bin/sh +# Detect printf(3) failure even when it doesn't set stream error indicator + +# Copyright (C) 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/>. + +prog=printf + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ printf + +require_ulimit_ + + +# Up to coreutils-6.9, "printf %.Nf 0" would encounter an ENOMEM internal +# error from glibc's printf(3) function whenever N was large relative to +# the size of available memory. As of Oct 2007, that internal stream- +# related failure was not reflected (for any libc I know of) in the usual +# stream error indicator that is tested by ferror. The result was that +# while the printf command obviously failed (generated no output), +# it mistakenly exited successfully (exit status of 0). + +# Testing it is tricky, because there is so much variance +# in quality for this corner of printf(3) implementations. +# Most implementations do attempt to allocate N bytes of storage. +# Using the maximum value for N (2^31-1) causes glibc-2.7 to try to +# allocate almost 2^64 bytes, while freeBSD 6.1's implementation +# correctly outputs almost 2GB worth of 0's, which takes too long. +# We want to test implementations that allocate N bytes, but without +# triggering the above extremes. + +# Some other versions of glibc-2.7 have a snprintf function that segfaults +# when an internal (technically unnecessary!) memory allocation fails. + +# The compromise is to limit virtual memory to something reasonable, +# and to make an N-byte-allocating-printf require more than that, thus +# triggering the printf(3) misbehavior -- which, btw, is required by ISO C99. + +mkfifo_or_skip_ fifo + +# Disable MALLOC_PERTURB_, to avoid triggering this bug +# http://bugs.debian.org/481543#77 +export MALLOC_PERTURB_=0 + +head -c 10 fifo > out & + +# Choosing the virtual memory limit, 11000 is enough, but 10000 is too +# little and provokes a "memory exhausted" diagnostic on FreeBSD 9.0-p3. +( ulimit -v 15000; env $prog %20000000f 0 2>err-msg > fifo ) +exit=$? + +# Map this longer, and rarer, diagnostic to the common one. +# printf: cannot perform formatted output: Cannot allocate memory" \ +sed 's/cannot perform .*/write error/' err-msg > k && mv k err-msg +err_msg=$(cat err-msg|tr '\n' :) + +# By some bug, on Solaris 11 (5.11 snv_86), err_msg ends up +# containing '1> fifo:printf: write error:'. Recognize that, too. + +case $err_msg in + "$prog: write error:"*) diagnostic=y ;; + "1> fifo:$prog: write error:") diagnostic=y ;; + '') diagnostic=n ;; + *) diagnostic=unexpected ;; +esac +n_out=$(wc -c < out) + +case $n_out:$diagnostic:$exit in + 10:n:0) ;; # ok, succeeds w/no diagnostic: FreeBSD 6.1 + 0:y:1) ;; # ok, glibc-2.8 and newer, when printf(3) fails with ENOMEM + + # With MALLOC_PERTURB_=0, this no longer happens. + # *:139) # segfault; known bug at least in debian unstable's libc6 2.7-11 + # echo 1>&2 "$0: bug in snprintf causes low-mem use of printf to segfault" + # fail=77;; + + # 10:y) ;; # Fail: doesn't happen: nobody succeeds with a diagnostic + # 0:n) ;; # Fail pre-patch: no output, no diag + *) fail=1;; +esac + +Exit $fail diff --git a/tests/misc/printf.sh b/tests/misc/printf.sh new file mode 100755 index 00000000..d2ff3edb --- /dev/null +++ b/tests/misc/printf.sh @@ -0,0 +1,127 @@ +#!/bin/sh +# basic tests for printf + +# Copyright (C) 2002-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/>. + +prog='env printf' + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ printf + +getlimits_ + + +# Verify the 3 methods of specifying "Escape": +test $($prog "\x1b\n\33\n\e\n" | uniq -u) && fail=1 + +# This would fail (by printing the '--') for printf in sh-utils +# and in coreutils 4.5.1. +$prog -- 'foo\n' > out || fail=1 +cat <<\EOF > exp +foo +EOF + +compare exp out || fail=1 + +rm -f out exp +# Until coreutils-4.5.10, this would elicit a segfault. +$prog '1 %*sy\n' -3 x > out || fail=1 + +# Until coreutils 5.2.2, this would succeed. +if POSIXLY_CORRECT=1 $prog '2 \x' >/dev/null 2>&1; then + fail=1 +else + echo '2 failed, as expected' >> out +fi + +# Until coreutils-4.5.12, these would fail. +$prog '3 \x40\n' >> out || fail=1 +POSIXLY_CORRECT=1 \ +$prog '4 \x40\n' >> out || fail=1 +$prog '5 % +d\n' 234 >> out || fail=1 + +# This should print "6 !\n", but don't rely on '!' being the +# one-byte representation of octal 041. With printf prior to +# coreutils-5.0.1, it would print six bytes: "6 \41\n". +$prog '6 \41\n' | tr '\41' '!' >> out + +# Note that as of coreutils-5.0.1, printf with a format of '\0002x' +# prints a NUL byte followed by the digit '2' and an 'x'. +# By contrast bash's printf outputs the same thing as $(printf '\2x') does. +$prog '7 \2y \02y \002y \0002y\n' |tr '\0\2' '*=' >> out + +$prog '8 %b %b %b %b\n' '\1y' '\01y' '\001y' '\0001y'|tr '\1' = >> out + +$prog '9 %*dx\n' -2 0 >>out || fail=1 + +$prog '10 %.*dx\n' $INT_UFLOW 0 >>out || fail=1 +$prog '%.*dx\n' $INT_OFLOW 0 >>out 2> /dev/null && fail=1 + +$prog '11 %*c\n' 2 x >>out || fail=1 + +$prog '%#d\n' 0 >>out 2> /dev/null && fail=1 + +$prog '%0s\n' 0 >>out 2> /dev/null && fail=1 + +$prog '%.9c\n' 0 >>out 2> /dev/null && fail=1 + +$prog '%'\''s\n' 0 >>out 2> /dev/null && fail=1 + +cat <<\EOF > exp +1 x y +2 failed, as expected +3 @ +4 @ +5 +234 +6 ! +7 =y =y =y *2y +8 =y =y =y =y +9 0 x +10 0x +11 x +EOF + +compare exp out || fail=1 + +# Verify handling of single quote chars (\' or \") + +$prog '%d\n' '"a' >out 2>err # valid +$prog '%d\n' '"a"' >>out 2>>err # invalid +$prog '%d\n' '"' >>out 2>>err # invalid +$prog '%d\n' 'a' >>out 2>>err # invalid + +cat <<EOF > exp +97 +97 +0 +0 +EOF + +# POSIX says strtoimax *may* set errno to EINVAL in the latter +# two cases. So far, that happens at least on MacOS X 10.5. +# Map that output to the more common expected output. +sed 's/: Invalid.*/: expected a numeric value/' err > k && mv k err + +cat <<EOF > exp_err +printf: warning: ": character(s) following character constant have been ignored +printf: ": expected a numeric value +printf: a: expected a numeric value +EOF + +compare exp out || fail=1 +compare exp_err err || fail=1 + +Exit $fail diff --git a/tests/misc/ptx b/tests/misc/ptx deleted file mode 100755 index 50ee0e8d..00000000 --- a/tests/misc/ptx +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/perl - -# Copyright (C) 2008-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 -# 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; - -my $prog = 'ptx'; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -my @Tests = -( -["1tok", '-w10', {IN=>"bar\n"}, {OUT=>" bar\n"}], -["2tok", '-w10', {IN=>"foo bar\n"}, {OUT=>" / bar\n foo/\n"}], - -# with coreutils-6.12 and earlier, this would infloop with -wN, N < 10 -["narrow", '-w2', {IN=>"qux\n"}, {OUT=>" qux\n"}], -["narrow-g", '-g1 -w2', {IN=>"ta\n"}, {OUT=>" ta\n"}], - -# 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"}], -); - -@Tests = triple_test \@Tests; - -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/ptx-overrun b/tests/misc/ptx-overrun deleted file mode 100755 index e7eaf0b3..00000000 --- a/tests/misc/ptx-overrun +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# Trigger a heap-clobbering bug in ptx from coreutils-6.10 and earlier. - -# Copyright (C) 2008-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ ptx - -# 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 -ptx -S 'foo\' $f < /dev/null >> out || fail=1 -ptx -W 'bar\\\' $f < /dev/null >> out || fail=1 -compare out empty || fail=1 - -Exit $fail diff --git a/tests/misc/ptx-overrun.sh b/tests/misc/ptx-overrun.sh new file mode 100755 index 00000000..a89a1b2c --- /dev/null +++ b/tests/misc/ptx-overrun.sh @@ -0,0 +1,35 @@ +#!/bin/sh +# Trigger a heap-clobbering bug in ptx from coreutils-6.10 and earlier. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ ptx + +# 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 +ptx -S 'foo\' $f < /dev/null >> out || fail=1 +ptx -W 'bar\\\' $f < /dev/null >> out || fail=1 +compare out empty || fail=1 + +Exit $fail diff --git a/tests/misc/ptx.pl b/tests/misc/ptx.pl new file mode 100755 index 00000000..b36eeb98 --- /dev/null +++ b/tests/misc/ptx.pl @@ -0,0 +1,44 @@ +#!/usr/bin/perl + +# 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/>. + +use strict; + +my $prog = 'ptx'; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +my @Tests = +( +["1tok", '-w10', {IN=>"bar\n"}, {OUT=>" bar\n"}], +["2tok", '-w10', {IN=>"foo bar\n"}, {OUT=>" / bar\n foo/\n"}], + +# with coreutils-6.12 and earlier, this would infloop with -wN, N < 10 +["narrow", '-w2', {IN=>"qux\n"}, {OUT=>" qux\n"}], +["narrow-g", '-g1 -w2', {IN=>"ta\n"}, {OUT=>" ta\n"}], + +# 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"}], +); + +@Tests = triple_test \@Tests; + +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/pwd-long b/tests/misc/pwd-long deleted file mode 100755 index 051509a7..00000000 --- a/tests/misc/pwd-long +++ /dev/null @@ -1,124 +0,0 @@ -#!/bin/sh -# -*- perl -*- -# Ensure that pwd works even when run from a very deep directory. - -# Copyright (C) 2006-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ pwd - -require_readable_root_ -require_perl_ - -ARGV_0=$0 -export ARGV_0 - -# Don't use CuTmpdir here, since File::Temp's use of rmtree can't -# remove the deep tree we create. -$PERL -Tw -I"$abs_srcdir" -MCuSkip -- - <<\EOF - -# Show that pwd works even when the length of the resulting -# directory name is longer than PATH_MAX. -use strict; - -(my $ME = $ENV{ARGV_0}) =~ s|.*/||; - -sub normalize_to_cwd_relative ($$$) -{ - my ($dir, $dev, $ino) = @_; - my $slash = -1; - my $next_slash; - while (1) - { - $slash = index $dir, '/', $slash + 1; - $slash <= -1 - and die "$ME: $dir does not contain old CWD\n"; - my $dir_prefix = $slash ? substr ($dir, 0, $slash) : '/'; - my ($d, $i) = (stat $dir_prefix)[0, 1]; - defined $d && defined $i - or die "$ME: $dir_prefix: stat failed: $!\n"; - $d eq $dev && $i eq $ino - and return substr $dir, $slash + 1; - } -} - -# Set up a safe, well-known environment -delete @ENV{qw(BASH_ENV CDPATH ENV)}; -$ENV{IFS} = ''; - -# Taint checking requires a sanitized $PATH. This script performs no $PATH -# search, so on most Unix-based systems, it is fine simply to clear $ENV{PATH}. -# However, on Cygwin, it's used to find cygwin1.dll, so set it. -$ENV{PATH} = '/bin:/usr/bin'; - -# Save CWD's device and inode numbers. -my ($dev, $ino) = (stat '.')[0, 1]; - -# Construct the expected "."-relative part of pwd's output. -my $z = 'z' x 31; -my $n = 256; -my $expected = "/$z" x $n; -# Remove the leading "/". -substr ($expected, 0, 1) = ''; - -my $i = 0; -do - { - mkdir $z, 0700 - or CuSkip::skip "$ME: skipping this test; cannot create long " - . "directory name at depth $i: $!\n"; - chdir $z - } -until (++$i == $n); - -my $abs_top_builddir = $ENV{abs_top_builddir}; -$abs_top_builddir - or die "$ME: envvar abs_top_builddir not defined\n"; -my $build_src_dir = "$abs_top_builddir/src"; -$build_src_dir =~ m!^([-+.:/\w]+)$! - or CuSkip::skip "$ME: skipping this test; odd build source directory name:\n" - . "$build_src_dir\n"; -$build_src_dir = $1; - -my $pwd_binary = "$build_src_dir/pwd"; - --x $pwd_binary - or die "$ME: $pwd_binary is not an executable file\n"; -chomp (my $actual = qx!$pwd_binary!); - -# Convert the absolute name from pwd into a $CWD-relative name. -# This is necessary in order to avoid a spurious failure when run -# from a directory in a bind-mounted partition. What happens is -# pwd reads a ".." that contains two or more entries with identical -# dev,ino that match the ones we're looking for, and it chooses a -# name that does not correspond to the one already recorded in $CWD. -$actual = normalize_to_cwd_relative $actual, $dev, $ino; - -if ($expected ne $actual) - { - my $e_len = length $expected; - my $a_len = length $actual; - warn "expected len: $e_len\n"; - warn "actual len: $a_len\n"; - warn "expected: $expected\n"; - warn "actual: $actual\n"; - exit 1; - } -EOF - -fail=$? - -Exit $fail diff --git a/tests/misc/pwd-long.sh b/tests/misc/pwd-long.sh new file mode 100755 index 00000000..3b3f83d4 --- /dev/null +++ b/tests/misc/pwd-long.sh @@ -0,0 +1,124 @@ +#!/bin/sh +# -*- perl -*- +# Ensure that pwd works even when run from a very deep directory. + +# Copyright (C) 2006-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ pwd + +require_readable_root_ +require_perl_ + +ARGV_0=$0 +export ARGV_0 + +# Don't use CuTmpdir here, since File::Temp's use of rmtree can't +# remove the deep tree we create. +$PERL -Tw -I"$abs_srcdir/tests" -MCuSkip -- - <<\EOF + +# Show that pwd works even when the length of the resulting +# directory name is longer than PATH_MAX. +use strict; + +(my $ME = $ENV{ARGV_0}) =~ s|.*/||; + +sub normalize_to_cwd_relative ($$$) +{ + my ($dir, $dev, $ino) = @_; + my $slash = -1; + my $next_slash; + while (1) + { + $slash = index $dir, '/', $slash + 1; + $slash <= -1 + and die "$ME: $dir does not contain old CWD\n"; + my $dir_prefix = $slash ? substr ($dir, 0, $slash) : '/'; + my ($d, $i) = (stat $dir_prefix)[0, 1]; + defined $d && defined $i + or die "$ME: $dir_prefix: stat failed: $!\n"; + $d eq $dev && $i eq $ino + and return substr $dir, $slash + 1; + } +} + +# Set up a safe, well-known environment +delete @ENV{qw(BASH_ENV CDPATH ENV)}; +$ENV{IFS} = ''; + +# Taint checking requires a sanitized $PATH. This script performs no $PATH +# search, so on most Unix-based systems, it is fine simply to clear $ENV{PATH}. +# However, on Cygwin, it's used to find cygwin1.dll, so set it. +$ENV{PATH} = '/bin:/usr/bin'; + +# Save CWD's device and inode numbers. +my ($dev, $ino) = (stat '.')[0, 1]; + +# Construct the expected "."-relative part of pwd's output. +my $z = 'z' x 31; +my $n = 256; +my $expected = "/$z" x $n; +# Remove the leading "/". +substr ($expected, 0, 1) = ''; + +my $i = 0; +do + { + mkdir $z, 0700 + or CuSkip::skip "$ME: skipping this test; cannot create long " + . "directory name at depth $i: $!\n"; + chdir $z + } +until (++$i == $n); + +my $abs_top_builddir = $ENV{abs_top_builddir}; +$abs_top_builddir + or die "$ME: envvar abs_top_builddir not defined\n"; +my $build_src_dir = "$abs_top_builddir/src"; +$build_src_dir =~ m!^([-+.:/\w]+)$! + or CuSkip::skip "$ME: skipping this test; odd build source directory name:\n" + . "$build_src_dir\n"; +$build_src_dir = $1; + +my $pwd_binary = "$build_src_dir/pwd"; + +-x $pwd_binary + or die "$ME: $pwd_binary is not an executable file\n"; +chomp (my $actual = qx!$pwd_binary!); + +# Convert the absolute name from pwd into a $CWD-relative name. +# This is necessary in order to avoid a spurious failure when run +# from a directory in a bind-mounted partition. What happens is +# pwd reads a ".." that contains two or more entries with identical +# dev,ino that match the ones we're looking for, and it chooses a +# name that does not correspond to the one already recorded in $CWD. +$actual = normalize_to_cwd_relative $actual, $dev, $ino; + +if ($expected ne $actual) + { + my $e_len = length $expected; + my $a_len = length $actual; + warn "expected len: $e_len\n"; + warn "actual len: $a_len\n"; + warn "expected: $expected\n"; + warn "actual: $actual\n"; + exit 1; + } +EOF + +fail=$? + +Exit $fail diff --git a/tests/misc/pwd-option b/tests/misc/pwd-option deleted file mode 100755 index a7a4737e..00000000 --- a/tests/misc/pwd-option +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/sh -# Ensure that pwd options work. - -# Copyright (C) 2009-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ pwd - -mkdir -p a/b || framework_failure_ -ln -s a/b c || framework_failure_ -base=$(env -- pwd) - -# Remove any logical paths from $PWD. -cd "$base" || framework_failure_ -test "x$PWD" = "x$base" || framework_failure_ - -# Enter a logical directory. -cd c || framework_failure_ -test "x$PWD" = "x$base/c" || skip_ "cd does not properly update \$PWD" - -env -- pwd -L > out || fail=1 -printf %s\\n "$base/c" > exp || fail=1 - -env -- pwd --logical -P >> out || fail=1 -printf %s\\n "$base/a/b" >> exp || fail=1 - -env -- pwd --physical >> out || fail=1 -printf %s\\n "$base/a/b" >> exp || fail=1 - -# By default, we use -P unless POSIXLY_CORRECT. -env -- pwd >> out || fail=1 -printf %s\\n "$base/a/b" >> exp || fail=1 - -env -- POSIXLY_CORRECT=1 pwd >> out || fail=1 -printf %s\\n "$base/c" >> exp || fail=1 - -# Make sure we reject bogus values, and silently fall back to -P. -env -- PWD="$PWD/." pwd -L >> out || fail=1 -printf %s\\n "$base/a/b" >> exp || fail=1 - -env -- PWD=bogus pwd -L >> out || fail=1 -printf %s\\n "$base/a/b" >> exp || fail=1 - -env -- PWD="$base/a/../c" pwd -L >> out || fail=1 -printf %s\\n "$base/a/b" >> exp || fail=1 - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/misc/pwd-option.sh b/tests/misc/pwd-option.sh new file mode 100755 index 00000000..9733e108 --- /dev/null +++ b/tests/misc/pwd-option.sh @@ -0,0 +1,62 @@ +#!/bin/sh +# Ensure that pwd options work. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ pwd + +mkdir -p a/b || framework_failure_ +ln -s a/b c || framework_failure_ +base=$(env -- pwd) + +# Remove any logical paths from $PWD. +cd "$base" || framework_failure_ +test "x$PWD" = "x$base" || framework_failure_ + +# Enter a logical directory. +cd c || framework_failure_ +test "x$PWD" = "x$base/c" || skip_ "cd does not properly update \$PWD" + +env -- pwd -L > out || fail=1 +printf %s\\n "$base/c" > exp || fail=1 + +env -- pwd --logical -P >> out || fail=1 +printf %s\\n "$base/a/b" >> exp || fail=1 + +env -- pwd --physical >> out || fail=1 +printf %s\\n "$base/a/b" >> exp || fail=1 + +# By default, we use -P unless POSIXLY_CORRECT. +env -- pwd >> out || fail=1 +printf %s\\n "$base/a/b" >> exp || fail=1 + +env -- POSIXLY_CORRECT=1 pwd >> out || fail=1 +printf %s\\n "$base/c" >> exp || fail=1 + +# Make sure we reject bogus values, and silently fall back to -P. +env -- PWD="$PWD/." pwd -L >> out || fail=1 +printf %s\\n "$base/a/b" >> exp || fail=1 + +env -- PWD=bogus pwd -L >> out || fail=1 +printf %s\\n "$base/a/b" >> exp || fail=1 + +env -- PWD="$base/a/../c" pwd -L >> out || fail=1 +printf %s\\n "$base/a/b" >> exp || fail=1 + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/misc/readlink-fp-loop b/tests/misc/readlink-fp-loop deleted file mode 100755 index 65fab782..00000000 --- a/tests/misc/readlink-fp-loop +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/sh -# readlink from 6.9 would fail with a false-positive symlink loop error - -# Copyright (C) 2007-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ readlink -cwd=$("$abs_top_builddir/src/pwd") - -# To trigger this bug, we have to construct a name/situation during -# the resolution of which the code dereferences the same symlink (S) -# two different times with no actual loop. In addition, arrange -# so that the second and fourth calls to readlink operate on S. - -ln -s s p || framework_failure_ -ln -s d s || framework_failure_ -mkdir d || framework_failure_ -echo 2 > d/2 || framework_failure_ -ln -s ../s/2 d/1 || framework_failure_ - -# With coreutils-6.9, this would fail with ELOOP. -readlink -v -e p/1 > out || fail=1 -# readlink -e d/2 > exp || fail=1 -echo "$cwd/d/2" > exp || fail=1 -compare exp out || fail=1 - -# Construct a real loop and make sure readlink still detects it. -ln -sf ../s/1 d/2 || framework_failure_ -readlink -v -e p/1 2> out && fail=1 -readlink_msg=$(cat out) -case $readlink_msg in - 'readlink: p/1: '*) ;; - *) fail=1;; -esac -symlink_loop_msg=${readlink_msg#'readlink: p/1: '} - -# Exercise the hash table code. -ln -nsf ../s/3 d/2 || framework_failure_ -ln -nsf ../p/4 d/3 || framework_failure_ -ln -nsf ../p/5 d/4 || framework_failure_ -ln -nsf ../p/6 d/5 || framework_failure_ -ln -nsf ../p/7 d/6 || framework_failure_ -ln -nsf ../p/8 d/7 || framework_failure_ -echo x > d/8 || framework_failure_ -readlink -v -e p/1 > out || fail=1 -echo "$cwd/d/8" > exp || fail=1 -compare exp out || fail=1 - -# A trivial loop -ln -s loop loop -readlink -v -e loop 2> out && fail=1 -echo "readlink: loop: $symlink_loop_msg" > exp || framework_failure_ -compare exp out || fail=1 - -Exit $fail diff --git a/tests/misc/readlink-fp-loop.sh b/tests/misc/readlink-fp-loop.sh new file mode 100755 index 00000000..6c7f70ac --- /dev/null +++ b/tests/misc/readlink-fp-loop.sh @@ -0,0 +1,68 @@ +#!/bin/sh +# readlink from 6.9 would fail with a false-positive symlink loop error + +# Copyright (C) 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ readlink +cwd=$("$abs_top_builddir/src/pwd") + +# To trigger this bug, we have to construct a name/situation during +# the resolution of which the code dereferences the same symlink (S) +# two different times with no actual loop. In addition, arrange +# so that the second and fourth calls to readlink operate on S. + +ln -s s p || framework_failure_ +ln -s d s || framework_failure_ +mkdir d || framework_failure_ +echo 2 > d/2 || framework_failure_ +ln -s ../s/2 d/1 || framework_failure_ + +# With coreutils-6.9, this would fail with ELOOP. +readlink -v -e p/1 > out || fail=1 +# readlink -e d/2 > exp || fail=1 +echo "$cwd/d/2" > exp || fail=1 +compare exp out || fail=1 + +# Construct a real loop and make sure readlink still detects it. +ln -sf ../s/1 d/2 || framework_failure_ +readlink -v -e p/1 2> out && fail=1 +readlink_msg=$(cat out) +case $readlink_msg in + 'readlink: p/1: '*) ;; + *) fail=1;; +esac +symlink_loop_msg=${readlink_msg#'readlink: p/1: '} + +# Exercise the hash table code. +ln -nsf ../s/3 d/2 || framework_failure_ +ln -nsf ../p/4 d/3 || framework_failure_ +ln -nsf ../p/5 d/4 || framework_failure_ +ln -nsf ../p/6 d/5 || framework_failure_ +ln -nsf ../p/7 d/6 || framework_failure_ +ln -nsf ../p/8 d/7 || framework_failure_ +echo x > d/8 || framework_failure_ +readlink -v -e p/1 > out || fail=1 +echo "$cwd/d/8" > exp || fail=1 +compare exp out || fail=1 + +# A trivial loop +ln -s loop loop +readlink -v -e loop 2> out && fail=1 +echo "readlink: loop: $symlink_loop_msg" > exp || framework_failure_ +compare exp out || fail=1 + +Exit $fail diff --git a/tests/misc/readlink-root b/tests/misc/readlink-root deleted file mode 100755 index f69bad6a..00000000 --- a/tests/misc/readlink-root +++ /dev/null @@ -1,92 +0,0 @@ -#!/bin/sh -# tests for canonicalize-existing mode (readlink -e) on /. - -# Copyright (C) 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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ readlink - -stat_single=$(stat -c %d:%i /) || framework_failure_ -stat_double=$(stat -c %d:%i //) || framework_failure_ -double_slash=// -if test x"$stat_single" = x"$stat_double"; then - double_slash=/ -fi - -test -d /dev || framework_failure_ - -ln -s / one || framework_failure_ -ln -s // two || framework_failure_ -ln -s /// three || framework_failure_ -ln -s /./..// one-dots || framework_failure_ -ln -s //./..// two-dots || framework_failure_ -ln -s ///./..// three-dots || framework_failure_ -ln -s /dev one-dev || framework_failure_ -ln -s //dev two-dev || framework_failure_ -ln -s ///dev three-dev || framework_failure_ - -cat >exp <<EOF || framework_failure_ -/ -$double_slash -/ -/ -$double_slash -/ -/ -$double_slash -/ -/ -$double_slash -/ -/dev -${double_slash}dev -/dev -/dev -${double_slash}dev -/dev -/dev -${double_slash}dev -/dev -EOF - -{ - readlink -e / || fail=1 - readlink -e // || fail=1 - readlink -e /// || fail=1 - readlink -e /.//.. || fail=1 - readlink -e //.//.. || fail=1 - readlink -e ///.//.. || fail=1 - readlink -e one || fail=1 - readlink -e two || fail=1 - readlink -e three || fail=1 - readlink -e one-dots || fail=1 - readlink -e two-dots || fail=1 - readlink -e three-dots || fail=1 - readlink -e one-dev || fail=1 - # We know /dev exists, but cannot assume //dev exists - readlink -f two-dev || fail=1 - readlink -e three-dev || fail=1 - readlink -e one/dev || fail=1 - readlink -f two/dev || fail=1 - readlink -e three/dev || fail=1 - readlink -e one-dots/dev || fail=1 - readlink -f two-dots/dev || fail=1 - readlink -e three-dots/dev || fail=1 -} > out - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/misc/readlink-root.sh b/tests/misc/readlink-root.sh new file mode 100755 index 00000000..ddd49092 --- /dev/null +++ b/tests/misc/readlink-root.sh @@ -0,0 +1,92 @@ +#!/bin/sh +# tests for canonicalize-existing mode (readlink -e) on /. + +# Copyright (C) 2012-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ readlink + +stat_single=$(stat -c %d:%i /) || framework_failure_ +stat_double=$(stat -c %d:%i //) || framework_failure_ +double_slash=// +if test x"$stat_single" = x"$stat_double"; then + double_slash=/ +fi + +test -d /dev || framework_failure_ + +ln -s / one || framework_failure_ +ln -s // two || framework_failure_ +ln -s /// three || framework_failure_ +ln -s /./..// one-dots || framework_failure_ +ln -s //./..// two-dots || framework_failure_ +ln -s ///./..// three-dots || framework_failure_ +ln -s /dev one-dev || framework_failure_ +ln -s //dev two-dev || framework_failure_ +ln -s ///dev three-dev || framework_failure_ + +cat >exp <<EOF || framework_failure_ +/ +$double_slash +/ +/ +$double_slash +/ +/ +$double_slash +/ +/ +$double_slash +/ +/dev +${double_slash}dev +/dev +/dev +${double_slash}dev +/dev +/dev +${double_slash}dev +/dev +EOF + +{ + readlink -e / || fail=1 + readlink -e // || fail=1 + readlink -e /// || fail=1 + readlink -e /.//.. || fail=1 + readlink -e //.//.. || fail=1 + readlink -e ///.//.. || fail=1 + readlink -e one || fail=1 + readlink -e two || fail=1 + readlink -e three || fail=1 + readlink -e one-dots || fail=1 + readlink -e two-dots || fail=1 + readlink -e three-dots || fail=1 + readlink -e one-dev || fail=1 + # We know /dev exists, but cannot assume //dev exists + readlink -f two-dev || fail=1 + readlink -e three-dev || fail=1 + readlink -e one/dev || fail=1 + readlink -f two/dev || fail=1 + readlink -e three/dev || fail=1 + readlink -e one-dots/dev || fail=1 + readlink -f two-dots/dev || fail=1 + readlink -e three-dots/dev || fail=1 +} > out + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/misc/realpath b/tests/misc/realpath deleted file mode 100755 index 9484ac4c..00000000 --- a/tests/misc/realpath +++ /dev/null @@ -1,111 +0,0 @@ -#!/bin/sh -# Validate realpath operation - -# Copyright (C) 2011-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ realpath - -stat_single=$(stat -c %d:%i /) || framework_failure_ -stat_double=$(stat -c %d:%i //) || framework_failure_ -double_slash=// -if test x"$stat_single" = x"$stat_double"; then - double_slash=/ -fi -nl=' -' - -test -d /dev || framework_failure_ - -# Setup dir, file, symlink structure - -mkdir -p dir1/dir2 || framework_failure_ -ln -s dir1/dir2 ldir2 || framework_failure_ -touch dir1/f dir1/dir2/f || framework_failure_ -ln -s / one || framework_failure_ -ln -s // two || framework_failure_ -ln -s /// three || framework_failure_ - -# Basic operation -realpath -Pqz . >/dev/null || fail=1 -# Operand is required -realpath >/dev/null && fail=1 -realpath --relative-base . --relative-to . && fail=1 -realpath --relative-base . && fail=1 - -# -e --relative-* require directories -realpath -e --relative-to=dir1/f --relative-base=. . && fail=1 -realpath -e --relative-to=dir1/ --relative-base=. . || fail=1 - -# Note NUL params are unconditionally rejected by canonicalize_filename_mode -realpath -m '' && fail=1 -realpath --relative-base= --relative-to=. . && fail=1 - -# symlink resolution -this=$(realpath .) -test "$(realpath ldir2/..)" = "$this/dir1" || fail=1 -test "$(realpath -L ldir2/..)" = "$this" || fail=1 -test "$(realpath -s ldir2)" = "$this/ldir2" || fail=1 - -# relative string handling -test $(realpath -m --relative-to=prefix prefixed/1) = '../prefixed/1' || fail=1 -test $(realpath -m --relative-to=prefixed prefix/1) = '../prefix/1' || fail=1 -test $(realpath -m --relative-to=prefixed prefixed/1) = '1' || fail=1 - -# Ensure no redundant trailing '/' present, as was the case in v8.15 -test $(realpath -sm --relative-to=/usr /) = '..' || fail=1 -# Ensure no redundant leading '../' present, as was the case in v8.15 -test $(realpath -sm --relative-to=/ /usr) = 'usr' || fail=1 - -# Ensure --relative-base works -out=$(realpath -sm --relative-base=/usr --relative-to=/usr /tmp /usr) || fail=1 -test "$out" = "/tmp$nl." || fail=1 -out=$(realpath -sm --relative-base=/ --relative-to=/ / /usr) || fail=1 -test "$out" = ".${nl}usr" || fail=1 -# --relative-to defaults to the value of --relative-base -out=$(realpath -sm --relative-base=/usr /tmp /usr) || fail=1 -test "$out" = "/tmp$nl." || fail=1 -out=$(realpath -sm --relative-base=/ / /usr) || fail=1 -test "$out" = ".${nl}usr" || fail=1 -# For now, --relative-base must be a prefix of --relative-to, or all output -# will be absolute (compare to MacOS 'relpath -d dir start end'). -out=$(realpath -sm --relative-base=/usr/local --relative-to=/usr \ - /usr /usr/local) || fail=1 -test "$out" = "/usr${nl}/usr/local" || fail=1 - -# Ensure // is handled correctly. -test "$(realpath / // ///)" = "/$nl$double_slash$nl/" || fail=1 -test "$(realpath one two three)" = "/$nl$double_slash$nl/" || fail=1 -out=$(realpath -sm --relative-to=/ / // /dev //dev) || fail=1 -if test $double_slash = //; then - test "$out" = ".$nl//${nl}dev$nl//dev" || fail=1 -else - test "$out" = ".$nl.${nl}dev${nl}dev" || fail=1 -fi -out=$(realpath -sm --relative-to=// / // /dev //dev) || fail=1 -if test $double_slash = //; then - test "$out" = "/$nl.$nl/dev${nl}dev" || fail=1 -else - test "$out" = ".$nl.${nl}dev${nl}dev" || fail=1 -fi -out=$(realpath --relative-base=/ --relative-to=// / //) || fail=1 -if test $double_slash = //; then - test "$out" = "/$nl//" || fail=1 -else - test "$out" = ".$nl." || fail=1 -fi - -Exit $fail diff --git a/tests/misc/realpath.sh b/tests/misc/realpath.sh new file mode 100755 index 00000000..7a8bf497 --- /dev/null +++ b/tests/misc/realpath.sh @@ -0,0 +1,111 @@ +#!/bin/sh +# Validate realpath operation + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ realpath + +stat_single=$(stat -c %d:%i /) || framework_failure_ +stat_double=$(stat -c %d:%i //) || framework_failure_ +double_slash=// +if test x"$stat_single" = x"$stat_double"; then + double_slash=/ +fi +nl=' +' + +test -d /dev || framework_failure_ + +# Setup dir, file, symlink structure + +mkdir -p dir1/dir2 || framework_failure_ +ln -s dir1/dir2 ldir2 || framework_failure_ +touch dir1/f dir1/dir2/f || framework_failure_ +ln -s / one || framework_failure_ +ln -s // two || framework_failure_ +ln -s /// three || framework_failure_ + +# Basic operation +realpath -Pqz . >/dev/null || fail=1 +# Operand is required +realpath >/dev/null && fail=1 +realpath --relative-base . --relative-to . && fail=1 +realpath --relative-base . && fail=1 + +# -e --relative-* require directories +realpath -e --relative-to=dir1/f --relative-base=. . && fail=1 +realpath -e --relative-to=dir1/ --relative-base=. . || fail=1 + +# Note NUL params are unconditionally rejected by canonicalize_filename_mode +realpath -m '' && fail=1 +realpath --relative-base= --relative-to=. . && fail=1 + +# symlink resolution +this=$(realpath .) +test "$(realpath ldir2/..)" = "$this/dir1" || fail=1 +test "$(realpath -L ldir2/..)" = "$this" || fail=1 +test "$(realpath -s ldir2)" = "$this/ldir2" || fail=1 + +# relative string handling +test $(realpath -m --relative-to=prefix prefixed/1) = '../prefixed/1' || fail=1 +test $(realpath -m --relative-to=prefixed prefix/1) = '../prefix/1' || fail=1 +test $(realpath -m --relative-to=prefixed prefixed/1) = '1' || fail=1 + +# Ensure no redundant trailing '/' present, as was the case in v8.15 +test $(realpath -sm --relative-to=/usr /) = '..' || fail=1 +# Ensure no redundant leading '../' present, as was the case in v8.15 +test $(realpath -sm --relative-to=/ /usr) = 'usr' || fail=1 + +# Ensure --relative-base works +out=$(realpath -sm --relative-base=/usr --relative-to=/usr /tmp /usr) || fail=1 +test "$out" = "/tmp$nl." || fail=1 +out=$(realpath -sm --relative-base=/ --relative-to=/ / /usr) || fail=1 +test "$out" = ".${nl}usr" || fail=1 +# --relative-to defaults to the value of --relative-base +out=$(realpath -sm --relative-base=/usr /tmp /usr) || fail=1 +test "$out" = "/tmp$nl." || fail=1 +out=$(realpath -sm --relative-base=/ / /usr) || fail=1 +test "$out" = ".${nl}usr" || fail=1 +# For now, --relative-base must be a prefix of --relative-to, or all output +# will be absolute (compare to MacOS 'relpath -d dir start end'). +out=$(realpath -sm --relative-base=/usr/local --relative-to=/usr \ + /usr /usr/local) || fail=1 +test "$out" = "/usr${nl}/usr/local" || fail=1 + +# Ensure // is handled correctly. +test "$(realpath / // ///)" = "/$nl$double_slash$nl/" || fail=1 +test "$(realpath one two three)" = "/$nl$double_slash$nl/" || fail=1 +out=$(realpath -sm --relative-to=/ / // /dev //dev) || fail=1 +if test $double_slash = //; then + test "$out" = ".$nl//${nl}dev$nl//dev" || fail=1 +else + test "$out" = ".$nl.${nl}dev${nl}dev" || fail=1 +fi +out=$(realpath -sm --relative-to=// / // /dev //dev) || fail=1 +if test $double_slash = //; then + test "$out" = "/$nl.$nl/dev${nl}dev" || fail=1 +else + test "$out" = ".$nl.${nl}dev${nl}dev" || fail=1 +fi +out=$(realpath --relative-base=/ --relative-to=// / //) || fail=1 +if test $double_slash = //; then + test "$out" = "/$nl//" || fail=1 +else + test "$out" = ".$nl." || fail=1 +fi + +Exit $fail diff --git a/tests/misc/runcon-no-reorder b/tests/misc/runcon-no-reorder deleted file mode 100755 index 351896ef..00000000 --- a/tests/misc/runcon-no-reorder +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh -# Ensure that runcon does not reorder its arguments. - -# Copyright (C) 2007-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ runcon - -diag='runcon: runcon may be used only on a SELinux kernel' -echo "$diag" > exp || framework_failure_ - - -# This test works even on systems without SELinux. -# 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 - -# When run on a system with no /selinux/context (i.e., in a chroot), -# it chcon fails with this: "runcon: invalid context: \ -# root:system_r:unconfined_t:s0-s0:c0.c1023: No such file or directory" -# That diagnostic is ok, too, so map it to the more common one. -case $(cat out) in - 'runcon: invalid context: '*) echo "$diag" > out;; -esac - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/misc/runcon-no-reorder.sh b/tests/misc/runcon-no-reorder.sh new file mode 100755 index 00000000..27656c7d --- /dev/null +++ b/tests/misc/runcon-no-reorder.sh @@ -0,0 +1,42 @@ +#!/bin/sh +# Ensure that runcon does not reorder its arguments. + +# Copyright (C) 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ runcon + +diag='runcon: runcon may be used only on a SELinux kernel' +echo "$diag" > exp || framework_failure_ + + +# This test works even on systems without SELinux. +# 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 + +# When run on a system with no /selinux/context (i.e., in a chroot), +# it chcon fails with this: "runcon: invalid context: \ +# root:system_r:unconfined_t:s0-s0:c0.c1023: No such file or directory" +# That diagnostic is ok, too, so map it to the more common one. +case $(cat out) in + 'runcon: invalid context: '*) echo "$diag" > out;; +esac + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/misc/selinux b/tests/misc/selinux deleted file mode 100755 index 12ae15f4..00000000 --- a/tests/misc/selinux +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/sh -# Test SELinux-related options. - -# Copyright (C) 2007-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ chcon cp ls mv stat - -require_root_ -require_selinux_ -skip_if_mcstransd_is_running_ - -# Create a regular file, dir, fifo. -touch f || framework_failure_ -mkdir d s1 s2 || framework_failure_ -mkfifo_or_skip_ p - - -# special context that works both with and without mcstransd -ctx=root:object_r:tmp_t:s0 - -chcon $ctx f d p || - skip_ '"chcon '$ctx' ..." failed' - -# inspect that context with both ls -Z and stat. -for i in d f p; do - c=$(ls -dogZ $i|cut -d' ' -f3); test x$c = x$ctx || fail=1 - c=$(stat --printf %C $i); test x$c = x$ctx || fail=1 -done - -# ensure that ls -l output includes the ".". -c=$(ls -l f|cut -c11); test "$c" = . || fail=1 - -# 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 - c=$(stat --printf %C s1/$i); test x$c = x$ctx || fail=1 -done - -# Now, move each to a new directory and ensure that context is preserved. -mv d f p s2 || fail=1 -for i in d f p; do - c=$(stat --printf %C s2/$i); test x$c = x$ctx || fail=1 -done - -Exit $fail diff --git a/tests/misc/selinux.sh b/tests/misc/selinux.sh new file mode 100755 index 00000000..b30bcbcf --- /dev/null +++ b/tests/misc/selinux.sh @@ -0,0 +1,59 @@ +#!/bin/sh +# Test SELinux-related options. + +# Copyright (C) 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ chcon cp ls mv stat + +require_root_ +require_selinux_ +skip_if_mcstransd_is_running_ + +# Create a regular file, dir, fifo. +touch f || framework_failure_ +mkdir d s1 s2 || framework_failure_ +mkfifo_or_skip_ p + + +# special context that works both with and without mcstransd +ctx=root:object_r:tmp_t:s0 + +chcon $ctx f d p || + skip_ '"chcon '$ctx' ..." failed' + +# inspect that context with both ls -Z and stat. +for i in d f p; do + c=$(ls -dogZ $i|cut -d' ' -f3); test x$c = x$ctx || fail=1 + c=$(stat --printf %C $i); test x$c = x$ctx || fail=1 +done + +# ensure that ls -l output includes the ".". +c=$(ls -l f|cut -c11); test "$c" = . || fail=1 + +# 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 + c=$(stat --printf %C s1/$i); test x$c = x$ctx || fail=1 +done + +# Now, move each to a new directory and ensure that context is preserved. +mv d f p s2 || fail=1 +for i in d f p; do + c=$(stat --printf %C s2/$i); test x$c = x$ctx || fail=1 +done + +Exit $fail diff --git a/tests/misc/seq b/tests/misc/seq deleted file mode 100755 index 2517d999..00000000 --- a/tests/misc/seq +++ /dev/null @@ -1,128 +0,0 @@ -#!/usr/bin/perl -# Test "seq". - -# Copyright (C) 1999-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 -# 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; - -(my $program_name = $0) =~ s|.*/||; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -my $prog = 'seq'; -my $try_help = "Try '$prog --help' for more information.\n"; - -my $locale = $ENV{LOCALE_FR_UTF8}; -! defined $locale || $locale eq 'none' - and $locale = 'C'; - -my @Tests = - ( - ['onearg-1', qw(10), {OUT => [(1..10)]}], - ['onearg-2', qw(-1)], - ['empty-rev', qw(1 -1 3)], - ['neg-1', qw(-10 10 10), {OUT => [qw(-10 0 10)]}], - # ['neg-2', qw(-.1 .1 .11), {OUT => [qw(-0.1 0.0 0.1)]}], - ['neg-3', qw(1 -1 0), {OUT => [qw(1 0)]}], - ['neg-4', qw(1 -1 -1), {OUT => [qw(1 0 -1)]}], - - ['float-1', qw(0.8 0.1 0.9), {OUT => [qw(0.8 0.9)]}], - ['float-2', qw(0.1 0.99 1.99), {OUT => [qw(0.10 1.09)]}], - ['float-3', qw(10.8 0.1 10.95), {OUT => [qw(10.8 10.9)]}], - ['float-4', qw(0.1 -0.1 -0.2), {OUT => [qw(0.1 0.0 -0.1 -0.2)]}, - {OUT_SUBST => 's,^-0\.0$,0.0,'}, - ], - ['float-5', qw(0.8 1e-1 0.9), {OUT => [qw(0.8 0.9)]}], - # Don't append lots of zeros to that 0.9000...; for example, changing the - # number to 0.90000000000000000000 tickles a bug in Solaris 8 strtold - # that would cause the test to fail. - ['float-6', qw(0.8 0.1 0.9000000000000), {OUT => [qw(0.8 0.9)]}], - - ['wid-1', qw(.8 1e-2 .81), {OUT => [qw(0.80 0.81)]}], - ['wid-2', qw(.89999 1e-7 .8999901), {OUT => [qw(0.8999900 0.8999901)]}], - - ['eq-wid-1', qw(-w 1 -1 -1), {OUT => [qw(01 00 -1)]}], - # Prior to 2.0g, this test would fail on e.g., HPUX systems - # because it'd end up using %3.1f as the format instead of %4.1f. - ['eq-wid-2', qw(-w -.1 .1 .11),{OUT => [qw(-0.1 00.0 00.1)]}], - ['eq-wid-3', qw(-w 1 3.0), {OUT => [qw(1 2 3)]}], - ['eq-wid-4', qw(-w .8 1e-2 .81), {OUT => [qw(0.80 0.81)]}], - ['eq-wid-5', qw(-w 1 .5 2), {OUT => [qw(1.0 1.5 2.0)]}], - ['eq-wid-6', qw(-w +1 2), {OUT => [qw(1 2)]}], - ['eq-wid-7', qw(-w " .1" " .1"), {OUT => [qw(0.1)]}], - ['eq-wid-8', qw(-w 9 0.5 10), {OUT => [qw(09.0 09.5 10.0)]}], - - # Prior to coreutils-4.5.11, some of these were not accepted. - ['fmt-1', qw(-f %2.1f 1.5 .5 2),{OUT => [qw(1.5 2.0)]}], - ['fmt-2', qw(-f %0.1f 1.5 .5 2),{OUT => [qw(1.5 2.0)]}], - ['fmt-3', qw(-f %.1f 1.5 .5 2),{OUT => [qw(1.5 2.0)]}], - - ['fmt-4', qw(-f %3.0f 1 2), {OUT => [' 1', ' 2']}], - ['fmt-5', qw(-f %-3.0f 1 2), {OUT => ['1 ', '2 ']}], - ['fmt-6', qw(-f %+3.0f 1 2), {OUT => [' +1', ' +2']}], - ['fmt-7', qw(-f %0+3.0f 1 2), {OUT => [qw(+01 +02)]}], - ['fmt-8', qw(-f %0+.0f 1 2), {OUT => [qw(+1 +2)]}], - ['fmt-9', '-f "% -3.0f"', qw(-1 0), {OUT => ['-1 ', ' 0 ']}], - ['fmt-a', '-f "% -.0f"',qw(-1 0), {OUT => ['-1', ' 0']}], - ['fmt-b', qw(-f %%%g%% 1), {OUT => ['%1%']}], - - # In coreutils-[6.0..6.9], this would mistakenly succeed and print "%Lg". - ['fmt-c', qw(-f %%g 1), {EXIT => 1}, - {ERR => "seq: format '%%g' has no % directive\n"}], - - # In coreutils-6.9..6.10, this would fail with an erroneous diagnostic: - # "seq: memory exhausted". In coreutils-6.0..6.8, it would mistakenly - # succeed and print a blank line. - ['fmt-eos1', qw(-f % 1), {EXIT => 1}, - {ERR => "seq: format '%' ends in %\n"}], - ['fmt-eos2', qw(-f %g% 1), {EXIT => 1}, - {ERR => "seq: format '%g%' has too many % directives\n"}], - - ['fmt-d', qw(-f "" 1), {EXIT => 1}, - {ERR => "seq: format '' has no % directive\n"}], - ['fmt-e', qw(-f %g%g 1), {EXIT => 1}, - {ERR => "seq: format '%g%g' has too many % directives\n"}], - - # With coreutils-6.12 and earlier, with a UTF8 numeric locale that uses - # something other than "." as the decimal point, this use of seq would - # fail to print the "2,0" endpoint. - ['locale-dec-pt', qw(-0.1 0.1 2), - {OUT => [qw(-0.1 0.0 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1.0 - 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2.0)]}, - - {ENV => "LC_ALL=$locale"}, - {OUT_SUBST => 's/,/./g'}, - ], - ); - -# Append a newline to each entry in the OUT array. -my $t; -foreach $t (@Tests) - { - my $e; - foreach $e (@$t) - { - $e->{OUT} = join ("\n", @{$e->{OUT}}) . "\n" - if ref $e eq 'HASH' and exists $e->{OUT}; - } - } - -my $save_temps = $ENV{SAVE_TEMPS}; -my $verbose = $ENV{VERBOSE}; - -my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); -exit $fail; diff --git a/tests/misc/seq-long-double b/tests/misc/seq-long-double deleted file mode 100755 index 5a511d70..00000000 --- a/tests/misc/seq-long-double +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh -# Test for this fix: 461231f022bdb3ee392622d31dc475034adceeb2. -# Ensure that seq prints exactly two numbers for a 2-number integral -# range at the limit of floating point precision. - -# Copyright (C) 2008-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ seq -getlimits_ - -# Run this test only with glibc and sizeof (long double) > sizeof (double). -# Otherwise, there are known failures: -# http://thread.gmane.org/gmane.comp.gnu.coreutils.bugs/14939/focus=14944 -cat <<\EOF > long.c -#include <features.h> -#if defined __GNU_LIBRARY__ && __GLIBC__ >= 2 -int foo[sizeof (long double) - sizeof (double) - 1]; -#else -"run this test only with glibc" -#endif -EOF -$CC -c long.c \ - || skip_ \ - 'this test runs only on systems with glibc and long double != double' - -a=$INTMAX_MAX -b=$INTMAX_OFLOW - -seq $a $b > out || fail=1 -printf "$a\n$b\n" > exp || fail=1 -compare exp out || fail=1 - -Exit $fail diff --git a/tests/misc/seq-long-double.sh b/tests/misc/seq-long-double.sh new file mode 100755 index 00000000..45e2f05f --- /dev/null +++ b/tests/misc/seq-long-double.sh @@ -0,0 +1,47 @@ +#!/bin/sh +# Test for this fix: 461231f022bdb3ee392622d31dc475034adceeb2. +# 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. + +# This 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_ seq +getlimits_ + +# Run this test only with glibc and sizeof (long double) > sizeof (double). +# Otherwise, there are known failures: +# http://thread.gmane.org/gmane.comp.gnu.coreutils.bugs/14939/focus=14944 +cat <<\EOF > long.c +#include <features.h> +#if defined __GNU_LIBRARY__ && __GLIBC__ >= 2 +int foo[sizeof (long double) - sizeof (double) - 1]; +#else +"run this test only with glibc" +#endif +EOF +$CC -c long.c \ + || skip_ \ + 'this test runs only on systems with glibc and long double != double' + +a=$INTMAX_MAX +b=$INTMAX_OFLOW + +seq $a $b > out || fail=1 +printf "$a\n$b\n" > exp || fail=1 +compare exp out || fail=1 + +Exit $fail diff --git a/tests/misc/seq.pl b/tests/misc/seq.pl new file mode 100755 index 00000000..b3496d62 --- /dev/null +++ b/tests/misc/seq.pl @@ -0,0 +1,169 @@ +#!/usr/bin/perl +# Test "seq". + +# Copyright (C) 1999-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/>. + +use strict; + +(my $program_name = $0) =~ s|.*/||; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +my $prog = 'seq'; +my $try_help = "Try '$prog --help' for more information.\n"; + +my $locale = $ENV{LOCALE_FR_UTF8}; +! defined $locale || $locale eq 'none' + and $locale = 'C'; + +my $p = '9' x 81; +(my $q = $p) =~ s/9/0/g; +$q = "1$q"; +(my $r = $q) =~ s/0$/1/; + +my @Tests = + ( + ['onearg-1', qw(10), {OUT => [(1..10)]}], + ['onearg-2', qw(-1)], + ['empty-rev', qw(1 -1 3)], + ['neg-1', qw(-10 10 10), {OUT => [qw(-10 0 10)]}], + # ['neg-2', qw(-.1 .1 .11), {OUT => [qw(-0.1 0.0 0.1)]}], + ['neg-3', qw(1 -1 0), {OUT => [qw(1 0)]}], + ['neg-4', qw(1 -1 -1), {OUT => [qw(1 0 -1)]}], + + ['float-1', qw(0.8 0.1 0.9), {OUT => [qw(0.8 0.9)]}], + ['float-2', qw(0.1 0.99 1.99), {OUT => [qw(0.10 1.09)]}], + ['float-3', qw(10.8 0.1 10.95), {OUT => [qw(10.8 10.9)]}], + ['float-4', qw(0.1 -0.1 -0.2), {OUT => [qw(0.1 0.0 -0.1 -0.2)]}, + {OUT_SUBST => 's,^-0\.0$,0.0,'}, + ], + ['float-5', qw(0.8 1e-1 0.9), {OUT => [qw(0.8 0.9)]}], + # Don't append lots of zeros to that 0.9000...; for example, changing the + # number to 0.90000000000000000000 tickles a bug in Solaris 8 strtold + # that would cause the test to fail. + ['float-6', qw(0.8 0.1 0.9000000000000), {OUT => [qw(0.8 0.9)]}], + + ['wid-1', qw(.8 1e-2 .81), {OUT => [qw(0.80 0.81)]}], + ['wid-2', qw(.89999 1e-7 .8999901), {OUT => [qw(0.8999900 0.8999901)]}], + + ['eq-wid-1', qw(-w 1 -1 -1), {OUT => [qw(01 00 -1)]}], + # Prior to 2.0g, this test would fail on e.g., HPUX systems + # because it'd end up using %3.1f as the format instead of %4.1f. + ['eq-wid-2', qw(-w -.1 .1 .11),{OUT => [qw(-0.1 00.0 00.1)]}], + ['eq-wid-3', qw(-w 1 3.0), {OUT => [qw(1 2 3)]}], + ['eq-wid-4', qw(-w .8 1e-2 .81), {OUT => [qw(0.80 0.81)]}], + ['eq-wid-5', qw(-w 1 .5 2), {OUT => [qw(1.0 1.5 2.0)]}], + ['eq-wid-6', qw(-w +1 2), {OUT => [qw(1 2)]}], + ['eq-wid-7', qw(-w " .1" " .1"), {OUT => [qw(0.1)]}], + ['eq-wid-8', qw(-w 9 0.5 10), {OUT => [qw(09.0 09.5 10.0)]}], + # Prior to 8.21, these tests involving numbers in scentific notation + # would fail with misalignment or wrong widths. + ['eq-wid-9', qw(-w -1e-3 1), {OUT => [qw(-0.001 00.999)]}], + ['eq-wid-10',qw(-w -1e-003 1), {OUT => [qw(-0.001 00.999)]}], + ['eq-wid-11',qw(-w -1.e-3 1), {OUT => [qw(-0.001 00.999)]}], + ['eq-wid-12',qw(-w -1.0e-4 1), {OUT => [qw(-0.00010 00.99990)]}], + ['eq-wid-13',qw(-w 999 1e3), {OUT => [qw(0999 1000)]}], + # Prior to 8.21, if the start value hadn't a precision, while step did, + # then misalignment would occur if the sequence narrowed. + ['eq-wid-14',qw(-w -1 1.0 0), {OUT => [qw(-1.0 00.0)]}], + ['eq-wid-15',qw(-w 10 -.1 9.9), {OUT => [qw(10.0 09.9)]}], + + # Prior to coreutils-4.5.11, some of these were not accepted. + ['fmt-1', qw(-f %2.1f 1.5 .5 2),{OUT => [qw(1.5 2.0)]}], + ['fmt-2', qw(-f %0.1f 1.5 .5 2),{OUT => [qw(1.5 2.0)]}], + ['fmt-3', qw(-f %.1f 1.5 .5 2),{OUT => [qw(1.5 2.0)]}], + + ['fmt-4', qw(-f %3.0f 1 2), {OUT => [' 1', ' 2']}], + ['fmt-5', qw(-f %-3.0f 1 2), {OUT => ['1 ', '2 ']}], + ['fmt-6', qw(-f %+3.0f 1 2), {OUT => [' +1', ' +2']}], + ['fmt-7', qw(-f %0+3.0f 1 2), {OUT => [qw(+01 +02)]}], + ['fmt-8', qw(-f %0+.0f 1 2), {OUT => [qw(+1 +2)]}], + ['fmt-9', '-f "% -3.0f"', qw(-1 0), {OUT => ['-1 ', ' 0 ']}], + ['fmt-a', '-f "% -.0f"',qw(-1 0), {OUT => ['-1', ' 0']}], + ['fmt-b', qw(-f %%%g%% 1), {OUT => ['%1%']}], + + # In coreutils-[6.0..6.9], this would mistakenly succeed and print "%Lg". + ['fmt-c', qw(-f %%g 1), {EXIT => 1}, + {ERR => "seq: format '%%g' has no % directive\n"}], + + # In coreutils-6.9..6.10, this would fail with an erroneous diagnostic: + # "seq: memory exhausted". In coreutils-6.0..6.8, it would mistakenly + # succeed and print a blank line. + ['fmt-eos1', qw(-f % 1), {EXIT => 1}, + {ERR => "seq: format '%' ends in %\n"}], + ['fmt-eos2', qw(-f %g% 1), {EXIT => 1}, + {ERR => "seq: format '%g%' has too many % directives\n"}], + + ['fmt-d', qw(-f "" 1), {EXIT => 1}, + {ERR => "seq: format '' has no % directive\n"}], + ['fmt-e', qw(-f %g%g 1), {EXIT => 1}, + {ERR => "seq: format '%g%g' has too many % directives\n"}], + + # With coreutils-6.12 and earlier, with a UTF8 numeric locale that uses + # something other than "." as the decimal point, this use of seq would + # fail to print the "2,0" endpoint. + ['locale-dec-pt', qw(-0.1 0.1 2), + {OUT => [qw(-0.1 0.0 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1.0 + 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2.0)]}, + + {ENV => "LC_ALL=$locale"}, + {OUT_SUBST => 's/,/./g'}, + ], + + # With coreutils-8.19 and prior, this would infloop. + ['long-1', "$p $r", {OUT => [$p, $q, $r]}], + + # Exercise the code that trims leading zeros. + ['long-leading-zeros1', qw(000 2), {OUT => [qw(0 1 2)]}], + ['long-leading-zeros2', qw(000 02), {OUT => [qw(0 1 2)]}], + ['long-leading-zeros3', qw(00 02), {OUT => [qw(0 1 2)]}], + ['long-leading-zeros4', qw(0 02), {OUT => [qw(0 1 2)]}], + + # Exercise the -s option, which was broken in 8.20 + ['sep-1', qw(-s, 1 3), {OUT => [qw(1,2,3)]}], + ['sep-2', qw(-s, 1 1), {OUT => [qw(1)]}], + ['sep-3', qw(-s,, 1 3), {OUT => [qw(1,,2,,3)]}], + + # Exercise fast path avoidance logic. + # In 8.20 a step value != 1, with positive integer start and end was broken + ['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)], + + # Ensure the correct parameters are passed to the fast path + ['fast-1', qw(4), {OUT => [qw(1 2 3 4)]}], + ['fast-2', qw(1 4), {OUT => [qw(1 2 3 4)]}], + ['fast-3', qw(1 1 4), {OUT => [qw(1 2 3 4)]}], + ); + +# Append a newline to each entry in the OUT array. +my $t; +foreach $t (@Tests) + { + my $e; + foreach $e (@$t) + { + $e->{OUT} = join ("\n", @{$e->{OUT}}) . "\n" + if ref $e eq 'HASH' and exists $e->{OUT}; + } + } + +my $save_temps = $ENV{SAVE_TEMPS}; +my $verbose = $ENV{VERBOSE}; + +my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); +exit $fail; diff --git a/tests/misc/sha1sum b/tests/misc/sha1sum deleted file mode 100755 index 2b08c7fc..00000000 --- a/tests/misc/sha1sum +++ /dev/null @@ -1,90 +0,0 @@ -#!/usr/bin/perl -# Test "sha1sum". - -# Copyright (C) 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 -# 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; - -my $prog = 'sha1sum'; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -my $sha_degenerate = "da39a3ee5e6b4b0d3255bfef95601890afd80709"; - -my @Tests = - ( - ['s1', {IN=> {f=> ''}}, - {OUT=>"$sha_degenerate f\n"}], - ['s2', {IN=> {f=> 'a'}}, - {OUT=>"86f7e437faa5a7fce15d1ddcb9eaeaea377667b8 f\n"}], - ['s3', {IN=> {f=> 'abc'}}, - {OUT=>"a9993e364706816aba3e25717850c26c9cd0d89d f\n"}], - ['s4', - {IN=> {f=> 'abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq'}}, - {OUT=>"84983e441c3bd26ebaae4aa1f95129e5e54670f1 f\n"}], - ['s5', {IN=> {f=> 'abcdefghijklmnopqrstuvwxyz'}}, - {OUT=>"32d10c7b8cf96570ca04ce37f2a19d84240d3a89 f\n"}], - ['s6', {IN=> {f=> join ('', 'A'..'Z', 'a'..'z', '0'..'9')}}, - {OUT=>"761c457bf73b14d27e9e9265c46f4b4dda11f940 f\n"}], - ['s7', {IN=> {f=> '1234567890' x 8}}, - {OUT=>"50abf5706a150990a08b2c5ea40fa0e585554732 f\n"}], - ['million-a', {IN=> {f=> 'a' x 1000000}}, - {OUT=>"34aa973cd4c4daa4f61eeb2bdbad27316534016f f\n"}], - ['bs-sha', {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 - # md5sum accept BSD format. - ['check-bsd', '--check', {IN=> {'f.md5' => "MD5 (f) = $sha_degenerate\n"}}, - {AUX=> {f=> ''}}, - {ERR=>"sha1sum: f.md5: no properly formatted " - . "SHA1 checksum lines found\n"}, - {EXIT=> 1}], - ['check-bsd2', '--check', - {IN=> {'f.sha1' => "SHA1 (f) = $sha_degenerate\n"}}, - {AUX=> {f=> ''}}, {OUT=>"f: OK\n"}], - ['check-bsd3', '--check', '--status', - {IN=> {'f.sha1' => "SHA1 (f) = $sha_degenerate\n"}}, - {AUX=> {f=> 'bar'}}, {EXIT=> 1}], - ['check-openssl', '--check', - {IN=> {'f.md5' => "MD5(f)= $sha_degenerate\n"}}, - {AUX=> {f=> ''}}, - {ERR=>"sha1sum: f.md5: no properly formatted " - . "SHA1 checksum lines found\n"}, - {EXIT=> 1}], - ['check-openssl2', '--check', - {IN=> {'f.sha1' => "SHA1(f)= $sha_degenerate\n"}}, - {AUX=> {f=> ''}}, {OUT=>"f: OK\n"}], - ['check-openssl3', '--check', '--status', - {IN=> {'f.sha1' => "SHA1(f)= $sha_degenerate\n"}}, - {AUX=> {f=> 'bar'}}, {EXIT=> 1}], - ['bsd-segv', '--check', {IN=> {'z' => "SHA1 ("}}, {EXIT=> 1}, - {ERR=> "$prog: z: no properly formatted SHA1 checksum lines found\n"}], - ); - -# Insert the '--text' argument for each test. -my $t; -foreach $t (@Tests) - { - splice @$t, 1, 0, '--text' unless @$t[1] =~ /--check/; - } - -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/sha1sum-vec b/tests/misc/sha1sum-vec deleted file mode 100755 index 48da107d..00000000 --- a/tests/misc/sha1sum-vec +++ /dev/null @@ -1,534 +0,0 @@ -#!/usr/bin/perl -# Sample vectors for "sha1sum". - -# Copyright (C) 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 -# 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; - -(my $program_name = $0) =~ s|.*/||; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -# The data from which these tests were derived came from here: -# http://csrc.nist.gov/cryptval/shs/sha1-vectors.zip - -my @Tests = - ( - ['1', {IN=> {f=> '0 1 ^'}}, - {OUT=>'DA39A3EE5E6B4B0D3255BFEF95601890AFD80709'}], - ['2', {IN=> {f=> '5 0 2 1 2 1 2 ^'}}, - {OUT=>'3CDF2936DA2FC556BFA533AB1EB59CE710AC80E5'}], - ['3', {IN=> {f=> '5 0 1 3 4 4 4 ^'}}, - {OUT=>'19C1E2048FA7393CFBF2D310AD8209EC11D996E5'}], - ['4', {IN=> {f=> '7 0 4 3 4 4 1 4 4 ^'}}, - {OUT=>'CA775D8C80FAA6F87FA62BECA6CA6089D63B56E5'}], - ['5', {IN=> {f=> '10 0 4 1 5 3 4 4 3 1 3 4 ^'}}, - {OUT=>'71AC973D0E4B50AE9E5043FF4D615381120A25A0'}], - ['6', {IN=> {f=> '10 0 3 1 6 5 5 1 3 6 6 4 ^'}}, - {OUT=>'A6B5B9F854CFB76701C3BDDBF374B3094EA49CBA'}], - ['7', {IN=> {f=> '13 1 3 2 5 3 3 3 4 6 6 1 4 6 2 ^'}}, - {OUT=>'D87A0EE74E4B9AD72E6847C87BDEEB3D07844380'}], - ['8', {IN=> {f=> '16 1 3 5 5 1 2 1 3 3 6 3 5 2 3 5 7 2 ^'}}, - {OUT=>'1976B8DD509FE66BF09C9A8D33534D4EF4F63BFD'}], - ['9', {IN=> {f=> '15 1 8 1 5 3 2 7 4 5 6 7 3 3 1 6 3 ^'}}, - {OUT=>'5A78F439B6DB845BB8A558E4CEB106CD7B7FF783'}], - ['10', {IN=> {f=> '15 1 4 6 8 2 1 4 2 5 1 6 8 8 6 4 7 ^'}}, - {OUT=>'F871BCE62436C1E280357416695EE2EF9B83695C'}], - ['11', {IN=> {f=> '18 1 1 2 7 3 8 6 7 5 4 3 4 3 5 3 3 2 6 8 ^'}}, - {OUT=>'62B243D1B780E1D31CF1BA2DE3F01C72AEEA0E47'}], - ['12', {IN=> {f=> '16 0 9 8 1 8 1 7 6 7 7 1 2 6 9 5 4 7 ^'}}, - {OUT=>'1698994A273404848E56E7FDA4457B5900DE1342'}], - ['13', {IN=> {f=> '18 0 7 1 7 3 9 4 7 7 5 2 8 1 7 8 2 7 2 9 ^'}}, - {OUT=>'056F4CDC02791DA7ED1EB2303314F7667518DEEF'}], - ['14', {IN=> {f=> '19 1 2 3 1 8 8 6 9 10 3 10 8 9 2 4 1 5 1 5 9 ^'}}, - {OUT=>'9FE2DA967BD8441EEA1C32DF68DDAA9DC1FC8E4B'}], - ['15', {IN=> {f=> '19 1 8 5 4 8 1 3 9 5 7 7 2 7 2 7 8 7 4 8 10 ^'}}, - {OUT=>'73A31777B4ACE9384EFA8BBEAD45C51A71ABA6DD'}], - ['16', {IN=> {f=> '20 1 1 9 7 4 1 4 5 1 10 8 6 4 4 9 9 9 8 2 9 10 ^'}}, - {OUT=>'3F9D7C4E2384EDDABFF5DD8A31E23DE3D03F42AC'}], - ['17', {IN=> {f=> '19 1 11 6 7 7 2 6 2 6 10 6 9 10 5 11 1 6 8 11 4 ^'}}, - {OUT=>'4814908F72B93FFD011135BEE347DE9A08DA838F'}], - ['18', {IN=> {f=> '22 0 10 5 10 3 7 8 9 9 1 1 1 10 2 1 5 10 2 9 9 9 7 8 ^'}}, - {OUT=>'0978374B67A412A3102C5AA0B10E1A6596FC68EB'}], - ['19', {IN=> {f=> '21 0 1 10 1 6 9 4 2 5 2 11 8 12 12 9 8 1 3 10 7 11 12 ^'}}, - {OUT=>'44AD6CB618BD935460D46D3F921D87B99AB91C1E'}], - ['20', {IN=> {f=> '24 1 3 9 5 12 3 4 2 9 12 11 6 6 1 1 9 5 9 1 4 9 4 10 8 9 ^'}}, - {OUT=>'02DC989AF265B09CF8485640842128DCF95E9F39'}], - ['21', {IN=> {f=> '25 1 3 2 3 11 1 12 5 6 2 7 8 4 8 8 9 9 8 4 9 1 4 8 10 9 9 ^'}}, - {OUT=>'67507B8D497B35D6E99FC01976D73F54AECA75CF'}], - ['22', {IN=> {f=> '23 0 11 10 7 10 10 6 10 9 4 5 10 5 8 4 1 10 12 4 6 1 8 11 6 ^'}}, - {OUT=>'1EAE0373C1317CB60C36A42A867B716039D441F5'}], - ['23', {IN=> {f=> '22 0 12 8 10 4 3 8 5 5 7 11 13 11 12 11 4 12 3 6 5 11 10 5 ^'}}, - {OUT=>'9C3834589E5BFFAC9F50950E0199B3EC2620BEC8'}], - ['24', {IN=> {f=> '26 1 10 9 6 9 7 2 10 4 4 5 5 2 12 13 5 3 1 10 1 4 7 8 13 13 12 9 ^'}}, - {OUT=>'209F7ABC7F3B878EE46CDF3A1FBB9C21C3474F32'}], - ['25', {IN=> {f=> '31 0 2 6 5 4 7 3 10 6 13 6 3 9 6 2 10 5 3 8 4 1 11 3 5 3 7 11 1 12 9 12 5 ^'}}, - {OUT=>'05FC054B00D97753A9B3E2DA8FBBA3EE808CEF22'}], - ['26', {IN=> {f=> '27 1 14 5 1 3 7 2 3 9 3 4 14 4 4 10 8 5 14 1 11 12 12 10 4 13 7 11 9 ^'}}, - {OUT=>'0C4980EA3A46C757DFBFC5BAA38AC6C8E72DDCE7'}], - ['27', {IN=> {f=> '30 1 4 9 5 5 8 9 5 10 4 2 4 7 9 9 6 3 5 1 8 3 2 13 3 14 9 8 9 10 14 10 ^'}}, - {OUT=>'96A460D2972D276928B69864445BEA353BDCFFD2'}], - ['28', {IN=> {f=> '27 0 12 9 5 8 7 2 14 12 3 8 14 6 6 4 7 5 7 10 7 11 10 1 9 6 7 12 14 ^'}}, - {OUT=>'F3EF04D8FA8C6FA9850F394A4554C080956FA64B'}], - ['29', {IN=> {f=> '24 0 12 9 9 2 11 13 12 11 11 6 14 13 10 5 6 8 10 4 3 11 11 14 5 14 ^'}}, - {OUT=>'F2A31D875D1D7B30874D416C4D2EA6BAF0FFBAFE'}], - ['30', {IN=> {f=> '24 0 15 4 5 3 8 12 15 8 14 15 9 12 12 3 10 13 6 11 10 4 13 14 8 8 ^'}}, - {OUT=>'F4942D3B9E9588DCFDC6312A84DF75D05F111C20'}], - ['31', {IN=> {f=> '28 1 1 8 1 5 11 4 9 12 4 13 15 5 9 11 7 14 11 1 11 7 8 8 11 1 13 15 12 13 ^'}}, - {OUT=>'310207DF35B014E4676D30806FA34424813734DD'}], - ['32', {IN=> {f=> '32 1 5 8 3 8 10 7 8 1 5 13 12 14 5 3 6 4 12 15 6 6 10 11 13 9 1 11 6 10 3 7 14 2 ^'}}, - {OUT=>'4DA1955B2FA7C7E74E3F47D7360CE530BBF57CA3'}], - ['33', {IN=> {f=> '31 0 10 3 5 1 14 11 11 16 1 2 2 11 6 13 15 12 6 5 16 2 14 2 10 12 2 5 5 6 10 13 15 ^'}}, - {OUT=>'74C4BC5B26FB4A08602D40CCEC6C6161B6C11478'}], - ['34', {IN=> {f=> '34 0 3 10 8 16 9 5 12 15 4 11 13 3 6 5 10 8 1 3 9 3 11 1 2 16 12 10 6 1 9 1 16 5 6 14 ^'}}, - {OUT=>'0B103CE297338DFC7395F7715EE47539B556DDB6'}], - ['35', {IN=> {f=> '30 1 1 12 4 4 2 15 13 15 11 15 5 11 9 7 15 16 6 16 12 3 2 10 16 5 5 7 1 7 11 16 ^'}}, - {OUT=>'EFC72D99E3D2311CE14190C0B726BDC68F4B0821'}], - ['36', {IN=> {f=> '34 0 7 9 11 2 5 5 5 4 13 13 14 4 7 12 6 4 8 2 9 9 13 13 3 3 6 7 16 7 6 15 5 8 15 14 ^'}}, - {OUT=>'660EDAC0A8F4CE33DA0D8DBAE597650E97687250'}], - ['37', {IN=> {f=> '36 1 4 6 16 15 11 14 14 4 7 10 3 4 10 3 6 7 14 4 6 6 5 2 7 8 16 2 12 16 10 14 3 2 3 7 14 3 ^'}}, - {OUT=>'FE0A55A988B3B93946A63EB36B23785A5E6EFC3E'}], - ['38', {IN=> {f=> '32 0 15 10 9 1 14 10 14 6 6 16 3 2 3 8 3 12 8 11 17 3 9 7 16 14 4 11 15 5 13 9 5 17 ^'}}, - {OUT=>'0CBDF2A5781C59F907513147A0DE3CC774B54BF3'}], - ['39', {IN=> {f=> '30 0 17 17 13 8 2 6 8 16 1 12 5 17 2 9 8 10 13 14 11 17 12 5 14 9 11 9 11 4 11 12 ^'}}, - {OUT=>'663E40FEE5A44BFCB1C99EA5935A6B5BC9F583B0'}], - ['40', {IN=> {f=> '30 1 16 6 10 5 8 3 17 16 14 1 15 15 15 6 13 2 11 6 13 11 13 4 6 7 11 11 12 16 13 16 ^'}}, - {OUT=>'00162134256952DD9AE6B51EFB159B35C3C138C7'}], - ['41', {IN=> {f=> '33 1 16 16 14 16 2 4 16 11 6 15 7 4 17 6 5 7 6 3 14 16 5 17 11 13 1 1 14 13 3 6 14 5 16 ^'}}, - {OUT=>'CEB88E4736E354416E2010FC1061B3B53B81664B'}], - ['42', {IN=> {f=> '39 1 2 16 13 7 8 6 2 15 1 9 12 4 4 11 13 7 2 11 9 18 4 5 4 8 2 14 9 9 1 8 13 11 15 8 5 9 10 16 7 ^'}}, - {OUT=>'A6A2C4B6BCC41DDC67278F3DF4D8D0B9DD7784EF'}], - ['43', {IN=> {f=> '34 0 2 7 1 1 17 13 6 11 10 8 5 12 15 6 15 10 12 4 18 1 2 8 11 12 16 10 12 18 11 16 12 11 17 6 ^'}}, - {OUT=>'C23D083CD8820B57800A869F5F261D45E02DC55D'}], - ['44', {IN=> {f=> '34 1 4 7 13 7 10 7 10 6 1 12 7 18 11 18 2 10 15 10 14 8 18 9 9 12 12 3 13 12 6 4 9 17 13 17 ^'}}, - {OUT=>'E8AC31927B78DDEC41A31CA7A44EB7177165E7AB'}], - ['45', {IN=> {f=> '40 0 5 7 3 2 1 17 14 4 16 6 13 1 13 6 6 10 1 3 18 3 11 7 9 5 7 11 17 1 9 16 5 15 10 17 3 8 15 17 8 12 ^'}}, - {OUT=>'E864EC5DBAB0F9FF6984AB6AD43A8C9B81CC9F9C'}], - ['46', {IN=> {f=> '40 0 11 3 15 17 11 1 1 4 3 14 18 4 2 18 8 15 6 4 6 3 15 11 16 10 17 17 9 6 3 2 6 16 4 9 12 6 8 1 11 17 ^'}}, - {OUT=>'CFED6269069417A84D6DE2347220F4B858BCD530'}], - ['47', {IN=> {f=> '37 1 2 19 12 8 16 14 2 9 16 2 6 6 7 9 10 9 11 9 14 11 15 5 16 9 2 17 2 8 15 8 4 3 14 14 16 16 12 ^'}}, - {OUT=>'D9217BFB46C96348722C3783D29D4B1A3FEDA38C'}], - ['48', {IN=> {f=> '37 1 11 10 16 12 11 7 14 14 14 6 10 10 1 6 13 19 5 6 4 7 12 12 10 5 10 15 15 8 5 13 17 13 5 6 14 1 19 ^'}}, - {OUT=>'DEC24E5554F79697218D317315FA986229CE3350'}], - ['49', {IN=> {f=> '38 1 2 6 5 17 9 11 18 18 8 6 13 15 3 3 15 5 13 18 3 2 5 5 14 7 13 4 17 7 2 17 3 18 15 7 15 16 18 11 ^'}}, - {OUT=>'83A099DF7071437BA5495A5B0BFBFEFE1C0EF7F3'}], - ['50', {IN=> {f=> '38 1 12 8 6 3 17 12 13 19 15 9 7 17 16 15 3 11 11 5 2 13 19 16 2 4 16 7 8 1 2 9 17 12 3 5 18 19 11 9 ^'}}, - {OUT=>'AA3198E30891A83E33CE3BFA0587D86A197D4F80'}], - ['51', {IN=> {f=> '39 1 14 16 14 8 9 16 5 1 6 3 17 18 16 9 1 15 9 10 9 19 1 3 3 20 11 13 17 1 19 8 3 4 3 7 1 14 19 19 19 ^'}}, - {OUT=>'9B6ACBEB4989CBEE7015C7D515A75672FFDE3442'}], - ['52', {IN=> {f=> '37 1 18 13 11 5 18 4 19 10 6 19 11 17 10 10 7 9 13 16 9 10 18 4 12 5 16 5 20 12 3 8 10 1 18 1 6 20 14 ^'}}, - {OUT=>'B021EB08A436B02658EAA7BA3C88D49F1219C035'}], - ['53', {IN=> {f=> '36 0 8 9 6 12 11 7 7 3 17 13 6 20 17 9 20 16 10 12 17 8 11 8 11 10 5 10 14 18 8 19 9 12 12 2 20 19 ^'}}, - {OUT=>'CAE36DAB8AEA29F62E0855D9CB3CD8E7D39094B1'}], - ['54', {IN=> {f=> '39 0 12 16 20 3 9 9 19 17 13 13 4 17 2 11 7 14 3 6 16 13 10 13 5 16 10 2 8 2 17 19 4 17 7 19 6 9 15 15 6 ^'}}, - {OUT=>'02DE8BA699F3C1B0CB5AD89A01F2346E630459D7'}], - ['55', {IN=> {f=> '43 0 7 2 18 5 7 18 5 2 15 7 11 10 9 3 2 14 19 3 11 8 18 15 5 3 5 12 15 16 10 17 7 19 16 2 1 16 6 3 19 12 5 18 16 ^'}}, - {OUT=>'88021458847DD39B4495368F7254941859FAD44B'}], - ['56', {IN=> {f=> '49 1 9 11 2 1 12 11 14 12 14 10 4 11 6 8 16 7 5 11 20 8 17 4 14 4 15 3 2 2 4 3 2 3 14 15 10 2 12 7 3 7 20 20 19 10 2 3 1 10 20 ^'}}, - {OUT=>'91A165295C666FE85C2ADBC5A10329DAF0CB81A0'}], - ['57', {IN=> {f=> '36 0 19 20 12 5 19 21 5 21 11 14 19 1 17 8 9 4 19 3 17 1 14 21 14 7 6 5 20 14 21 20 4 6 21 7 11 12 ^'}}, - {OUT=>'4B31312EAF8B506811151A9DBD162961F7548C4B'}], - ['58', {IN=> {f=> '41 0 12 9 11 6 16 18 18 10 11 20 6 12 11 5 7 21 19 18 6 15 21 10 4 14 9 19 10 3 3 5 13 1 8 12 3 13 9 7 10 17 14 ^'}}, - {OUT=>'3FE70971B20558F7E9BAC303ED2BC14BDE659A62'}], - ['59', {IN=> {f=> '45 0 10 6 8 3 17 18 3 21 19 6 17 15 4 9 15 9 15 14 4 7 14 8 10 13 4 11 10 7 6 21 1 14 5 11 7 7 2 13 13 3 9 13 8 14 20 ^'}}, - {OUT=>'93FB769D5BF49D6C563685954E2AECC024DC02D6'}], - ['60', {IN=> {f=> '39 1 3 7 18 4 9 9 5 15 13 17 10 15 16 20 8 19 9 10 9 1 19 14 21 2 18 13 10 4 18 16 4 21 15 10 18 19 3 12 18 ^'}}, - {OUT=>'BC8827C3E614D515E83DEA503989DEA4FDA6EA13'}], - ['61', {IN=> {f=> '41 0 14 4 13 11 1 11 1 10 2 12 4 21 10 21 18 9 2 16 7 20 6 7 12 19 20 1 13 12 10 8 21 15 7 19 13 6 8 19 20 18 19 ^'}}, - {OUT=>'E83868DBE4A389AB48E61CFC4ED894F32AE112AC'}], - ['62', {IN=> {f=> '37 0 11 18 1 17 14 15 20 16 20 8 2 17 10 4 21 5 19 19 14 22 21 18 13 14 1 3 12 11 11 4 22 13 5 18 7 21 21 ^'}}, - {OUT=>'55C95459CDE4B33791B4B2BCAAF840930AF3F3BD'}], - ['63', {IN=> {f=> '48 0 9 22 19 12 8 16 5 17 5 9 1 2 9 6 12 6 1 7 4 3 15 1 14 1 12 3 10 2 10 14 21 13 17 6 6 17 1 21 2 14 16 17 9 11 20 21 11 18 ^'}}, - {OUT=>'36BB0E2BA438A3E03214D9ED2B28A4D5C578FCAA'}], - ['64', {IN=> {f=> '50 1 12 8 20 13 2 9 20 9 14 10 1 16 2 22 6 4 16 14 15 1 12 4 14 9 21 3 3 9 8 21 15 14 8 4 14 4 2 3 8 12 8 6 1 2 18 20 15 3 19 10 ^'}}, - {OUT=>'3ACBF874199763EBA20F3789DFC59572ACA4CF33'}], - ['65', {IN=> {f=> '44 0 10 20 14 6 3 4 21 1 12 4 18 2 6 7 6 9 20 14 10 10 19 17 21 12 15 17 7 10 11 8 10 12 1 19 19 9 18 21 4 18 11 9 22 5 ^'}}, - {OUT=>'86BE037C4D509C9202020767D860DAB039CADACE'}], - ['66', {IN=> {f=> '47 0 15 8 15 3 5 6 2 19 12 17 4 20 8 11 20 2 18 4 16 20 12 9 9 6 16 21 16 3 16 18 3 19 5 16 2 4 2 12 11 15 11 14 17 2 10 18 8 ^'}}, - {OUT=>'51B57D7080A87394EEC3EB2E0B242E553F2827C9'}], - ['67', {IN=> {f=> '48 1 5 13 3 21 5 3 6 18 18 10 1 21 21 7 1 13 12 19 1 14 6 8 21 19 21 11 19 13 2 13 4 1 10 22 16 4 9 4 10 16 3 7 15 11 9 13 17 12 ^'}}, - {OUT=>'1EFBFA78866315CE6A71E457F3A750A38FACAB41'}], - ['68', {IN=> {f=> '45 0 14 7 6 2 20 3 6 19 19 10 2 22 12 17 12 1 20 7 7 15 20 6 18 8 3 14 23 18 15 4 7 5 23 15 7 14 10 10 19 17 2 4 15 17 21 ^'}}, - {OUT=>'57D6CB41AEEC20236F365B3A490C61D0CFA39611'}], - ['69', {IN=> {f=> '45 1 15 11 8 9 17 5 12 18 14 6 20 17 21 12 16 9 22 9 20 15 2 22 11 2 6 11 9 8 2 4 14 19 3 21 21 23 8 2 11 4 8 4 20 22 11 ^'}}, - {OUT=>'C532CB64B4BA826372BCCF2B4B5793D5B88BB715'}], - ['70', {IN=> {f=> '38 0 21 18 22 10 19 9 14 17 23 21 10 7 15 13 16 5 4 10 13 14 20 23 12 20 23 18 10 12 8 21 11 6 12 7 19 14 18 17 ^'}}, - {OUT=>'15833B5631032663E783686A209C6A2B47A1080E'}], - ['71', {IN=> {f=> '40 0 18 22 6 9 22 5 23 13 6 8 23 20 22 5 22 15 19 20 9 9 1 13 13 10 14 13 5 22 14 21 9 21 19 14 14 4 18 13 12 14 ^'}}, - {OUT=>'D04F2043C96E10CD83B574B1E1C217052CD4A6B2'}], - ['72', {IN=> {f=> '48 1 7 3 15 5 17 14 23 14 5 17 22 11 1 8 13 23 6 21 3 6 11 7 23 8 6 21 4 4 22 19 13 8 5 19 7 5 23 1 4 19 11 23 11 21 14 1 3 21 ^'}}, - {OUT=>'E8882627C64DB743F7DB8B4413DD033FC63BEB20'}], - ['73', {IN=> {f=> '43 0 22 14 11 7 18 16 17 24 12 12 3 13 19 16 22 4 16 4 6 23 8 18 11 2 3 20 22 9 21 8 23 1 23 20 7 16 13 23 4 13 3 7 22 ^'}}, - {OUT=>'CD2D32286B8867BC124A0AF2236FC74BE3622199'}], - ['74', {IN=> {f=> '47 1 23 6 13 19 2 3 7 2 9 9 15 6 13 4 22 6 19 20 1 9 7 14 1 15 3 23 24 22 18 12 12 17 19 10 8 11 22 12 10 2 20 15 18 17 18 7 19 ^'}}, - {OUT=>'019B70D745375091ED5C7B218445EC986D0F5A82'}], - ['75', {IN=> {f=> '47 1 12 21 6 12 4 7 18 17 3 2 14 24 14 1 23 1 11 15 10 6 18 20 7 1 8 1 16 6 20 23 23 21 10 10 12 24 10 11 23 2 12 23 9 3 24 24 10 ^'}}, - {OUT=>'E5FF5FEC1DADBAED02BF2DAD4026BE6A96B3F2AF'}], - ['76', {IN=> {f=> '52 0 14 10 18 15 14 5 16 11 22 2 15 24 8 22 1 4 24 9 10 15 3 9 5 4 17 15 9 12 19 19 1 3 10 6 8 3 17 8 18 24 19 3 4 15 4 9 2 24 5 20 13 13 ^'}}, - {OUT=>'6F4E23B3F2E2C068D13921FE4E5E053FFED4E146'}], - ['77', {IN=> {f=> '42 0 20 17 19 22 13 8 10 19 15 11 1 14 17 20 22 10 7 11 16 9 21 22 17 23 12 15 4 24 7 21 18 2 21 16 1 19 18 20 11 3 15 17 ^'}}, - {OUT=>'25E179602A575C915067566FBA6DA930E97F8678'}], - ['78', {IN=> {f=> '50 0 18 1 6 14 5 5 5 19 13 10 24 19 16 24 15 13 2 19 15 24 21 17 4 13 17 1 1 9 1 10 2 18 1 21 19 5 18 12 2 22 16 23 15 19 6 18 9 1 23 5 ^'}}, - {OUT=>'67DED0E68E235C8A523E051E86108EEB757EFBFD'}], - ['79', {IN=> {f=> '51 0 21 13 14 11 18 12 13 3 19 9 20 22 20 2 11 12 6 1 12 16 18 2 9 8 4 3 11 17 11 5 4 19 16 11 23 13 18 1 20 8 2 16 16 21 4 19 5 5 20 24 16 ^'}}, - {OUT=>'AF78536EA83C822796745556D62A3EE82C7BE098'}], - ['80', {IN=> {f=> '53 1 20 25 17 11 8 4 19 25 17 7 16 21 6 4 8 2 15 9 2 9 19 3 6 3 3 10 25 13 15 7 8 20 21 12 10 12 5 24 11 20 3 13 13 16 9 13 10 3 9 16 3 7 25 ^'}}, - {OUT=>'64D7AC52E47834BE72455F6C64325F9C358B610D'}], - ['81', {IN=> {f=> '49 1 9 9 14 2 13 17 25 2 18 5 19 23 9 25 9 10 23 12 12 7 13 8 15 7 1 6 21 2 8 7 6 16 14 14 12 15 13 24 10 15 11 10 8 14 15 21 25 21 25 ^'}}, - {OUT=>'9D4866BAA3639C13E541F250FFA3D8BC157A491F'}], - ['82', {IN=> {f=> '47 0 9 18 20 22 21 20 11 14 23 22 10 13 14 8 19 12 2 11 20 23 13 4 10 6 5 7 23 11 3 16 8 21 4 8 18 5 12 14 8 6 20 19 24 8 23 17 23 ^'}}, - {OUT=>'2E258811961D3EB876F30E7019241A01F9517BEC'}], - ['83', {IN=> {f=> '48 1 7 19 1 18 1 14 22 13 14 5 8 22 18 14 25 17 11 12 22 2 12 12 16 12 13 18 17 12 17 14 18 8 25 9 23 5 3 8 14 24 17 7 3 3 23 17 22 19 ^'}}, - {OUT=>'8E0EBC487146F83BC9077A1630E0FB3AB3C89E63'}], - ['84', {IN=> {f=> '51 1 19 17 16 22 24 14 16 20 23 20 9 19 16 7 12 16 5 8 9 7 10 21 24 10 11 19 1 21 14 14 19 3 22 8 12 20 1 18 5 6 5 12 14 1 1 11 9 22 3 24 4 ^'}}, - {OUT=>'CE8953741FFF3425D2311FBBF4AB481B669DEF70'}], - ['85', {IN=> {f=> '52 1 6 1 11 16 1 12 8 11 11 17 10 22 7 3 10 2 6 4 24 16 24 19 4 5 18 11 12 9 20 21 25 2 21 18 10 20 25 21 3 17 17 5 8 22 25 19 8 10 19 7 11 18 ^'}}, - {OUT=>'789D1D2DAB52086BD90C0E137E2515ED9C6B59B5'}], - ['86', {IN=> {f=> '44 0 26 14 21 25 25 4 9 13 5 8 9 21 8 12 26 24 9 24 15 1 23 22 16 14 8 22 15 19 24 20 7 8 15 24 12 4 4 23 21 13 19 15 21 12 ^'}}, - {OUT=>'B76CE7472700DD68D6328B7AA8437FB051D15745'}], - ['87', {IN=> {f=> '59 1 15 7 3 21 20 8 22 14 23 26 19 2 10 18 3 5 3 1 9 15 15 3 7 13 23 9 7 1 13 17 14 25 9 16 2 2 6 13 7 19 25 17 1 5 21 2 7 22 5 6 25 3 12 19 6 2 4 24 17 ^'}}, - {OUT=>'F218669B596C5FFB0B1C14BD03C467FC873230A0'}], - ['88', {IN=> {f=> '60 0 9 18 20 19 4 11 14 1 6 8 26 6 9 22 4 10 2 7 21 9 8 24 25 14 22 12 22 3 23 3 3 20 6 11 23 6 1 7 5 18 5 15 25 26 1 1 10 11 11 4 12 11 20 3 14 2 3 2 23 15 ^'}}, - {OUT=>'1FF3BDBE0D504CB0CDFAB17E6C37ABA6B3CFFDED'}], - ['89', {IN=> {f=> '49 0 12 17 24 11 8 6 24 16 15 22 21 14 6 12 20 19 5 5 12 11 6 23 2 16 23 7 24 6 21 2 17 17 5 25 11 25 20 25 24 18 6 12 19 25 7 6 5 2 25 ^'}}, - {OUT=>'2F3CBACBB14405A4652ED52793C1814FD8C4FCE0'}], - ['90', {IN=> {f=> '54 1 12 16 1 15 7 1 26 19 19 13 20 11 17 6 20 5 24 24 1 21 11 9 20 21 15 10 19 26 3 2 6 7 12 9 10 8 14 10 15 5 17 8 21 1 20 25 6 19 8 3 22 16 16 20 ^'}}, - {OUT=>'982C8AB6CE164F481915AF59AAED9FFF2A391752'}], - ['91', {IN=> {f=> '63 0 17 13 11 10 17 15 12 6 13 14 17 4 12 10 24 5 13 24 3 5 2 5 11 14 8 5 10 17 16 8 4 14 21 15 3 6 17 25 8 2 3 3 19 10 13 22 22 8 2 13 25 17 2 1 19 1 14 20 2 5 4 15 24 ^'}}, - {OUT=>'5CD92012D488A07ECE0E47901D0E083B6BD93E3F'}], - ['92', {IN=> {f=> '49 0 14 20 7 25 20 26 20 16 7 17 17 22 1 13 6 5 1 18 14 15 23 15 10 5 19 18 18 26 12 13 3 25 12 21 16 24 4 16 3 6 26 26 10 20 13 1 20 24 15 ^'}}, - {OUT=>'69603FEC02920851D4B3B8782E07B92BB2963009'}], - ['93', {IN=> {f=> '56 0 3 8 14 5 5 7 11 13 11 26 11 4 26 17 20 19 11 10 3 10 14 9 6 9 7 16 10 4 4 19 19 2 26 13 19 17 15 24 15 4 21 22 13 13 12 22 2 14 20 5 18 7 17 24 20 20 ^'}}, - {OUT=>'3E90F76437B1EA44CF98A08D83EA24CECF6E6191'}], - ['94', {IN=> {f=> '58 1 6 17 9 20 2 10 19 3 22 4 1 11 3 5 3 21 11 15 12 23 26 5 2 27 6 5 16 6 3 2 23 5 3 20 20 4 24 2 18 21 7 14 10 27 23 6 24 6 19 23 3 9 22 16 21 17 19 23 ^'}}, - {OUT=>'34C09F107C42D990EB4881D4BF2DDDCAB01563AE'}], - ['95', {IN=> {f=> '58 1 17 7 21 19 6 16 15 15 20 14 2 25 19 14 18 19 7 9 1 14 11 10 16 3 23 14 26 10 11 1 18 1 12 24 19 19 1 7 2 3 24 7 12 9 2 8 16 20 24 5 26 26 4 9 2 7 25 17 ^'}}, - {OUT=>'474BE0E5892EB2382109BFC5E3C8249A9283B03D'}], - ['96', {IN=> {f=> '54 1 8 12 18 14 26 7 17 18 4 20 1 16 14 21 26 4 6 8 24 11 25 15 24 16 23 4 10 23 21 24 15 10 9 26 7 14 24 21 6 20 5 17 16 17 1 3 12 1 4 13 3 9 21 26 ^'}}, - {OUT=>'A04B4F75051786682483252438F6A75BF4705EC6'}], - ['97', {IN=> {f=> '56 1 7 18 11 1 19 20 23 12 12 27 13 13 15 16 13 1 16 15 12 26 3 16 16 8 17 13 21 4 6 5 19 14 16 4 16 11 14 18 18 27 9 13 21 3 26 22 3 7 6 4 26 3 15 8 25 21 ^'}}, - {OUT=>'BE88A6716083EB50ED9416719D6A247661299383'}], - ['98', {IN=> {f=> '50 1 20 13 9 11 20 6 11 21 27 25 20 7 4 18 26 16 27 5 12 19 7 23 6 25 25 2 11 13 25 21 18 17 6 12 14 13 24 11 14 19 26 27 25 6 1 15 4 7 27 15 ^'}}, - {OUT=>'C67E38717FEE1A5F65EC6C7C7C42AFC00CD37F04'}], - ['99', {IN=> {f=> '51 0 15 16 26 27 23 14 12 28 22 15 8 19 2 20 13 1 24 2 25 1 6 19 19 8 11 24 24 21 13 27 5 11 28 17 7 25 6 23 24 14 25 12 5 13 26 2 5 8 10 16 17 ^'}}, - {OUT=>'959AC4082388E19E9BE5DE571C047EF10C174A8D'}], - ['100', {IN=> {f=> '58 1 5 26 18 19 21 3 12 11 13 4 14 22 22 14 16 13 3 22 16 23 5 19 6 13 10 26 17 27 26 4 3 25 6 14 2 3 5 7 23 11 22 8 25 2 9 25 18 17 8 2 14 4 19 1 5 27 13 24 ^'}}, - {OUT=>'BAA7AA7B7753FA0ABDC4A541842B5D238D949F0A'}], - ['101', {IN=> {f=> '53 0 2 27 28 2 17 23 10 27 18 26 7 22 16 3 27 1 26 21 28 10 3 6 2 2 10 17 13 16 6 17 21 23 13 20 22 5 6 11 12 12 8 23 13 17 9 23 20 3 28 27 12 17 22 ^'}}, - {OUT=>'351394DCEBC08155D100FCD488578E6AE71D0E9C'}], - ['102', {IN=> {f=> '59 0 28 19 5 21 4 27 8 1 19 14 20 6 7 9 1 6 22 3 19 26 14 8 6 7 19 15 23 1 17 16 6 26 14 5 22 25 4 7 10 16 21 10 18 19 24 16 23 8 3 17 28 18 10 2 5 3 21 21 15 ^'}}, - {OUT=>'AB8BE94C5AF60D9477EF1252D604E58E27B2A9EE'}], - ['103', {IN=> {f=> '58 0 6 24 1 4 24 18 10 22 1 21 12 5 4 4 20 25 24 26 8 25 11 2 7 27 22 19 4 18 27 10 28 4 12 24 8 16 12 11 16 17 25 8 12 16 1 9 9 10 5 24 23 18 5 14 18 8 4 28 ^'}}, - {OUT=>'3429EC74A695FDD3228F152564952308AFE0680A'}], - ['104', {IN=> {f=> '61 0 5 17 8 28 1 22 4 11 3 2 17 3 14 9 27 13 18 24 9 8 7 28 25 14 21 27 24 6 18 16 2 12 15 9 14 10 1 8 17 4 6 15 26 11 15 2 28 20 26 16 3 7 5 8 9 26 10 12 25 11 22 ^'}}, - {OUT=>'907FA46C029BC67EAA8E4F46E3C2A232F85BD122'}], - ['105', {IN=> {f=> '53 0 9 13 24 15 20 2 4 8 2 22 20 19 4 15 14 28 13 25 10 10 12 28 24 22 26 28 15 9 11 26 19 22 27 2 21 8 20 23 26 12 10 21 9 15 13 25 7 26 1 13 5 9 20 ^'}}, - {OUT=>'2644C87D1FBBBC0FC8D65F64BCA2492DA15BAAE4'}], - ['106', {IN=> {f=> '58 0 3 9 21 22 7 1 23 28 1 2 8 22 12 18 28 5 18 14 7 11 17 20 20 7 21 13 8 28 21 22 2 16 20 15 28 9 3 22 13 10 23 4 16 11 14 1 10 8 14 14 15 18 13 12 21 18 25 28 ^'}}, - {OUT=>'110A3EEB408756E2E81ABAF4C5DCD4D4C6AFCF6D'}], - ['107', {IN=> {f=> '60 1 29 20 2 29 22 8 16 20 4 12 9 6 12 16 16 7 9 20 29 11 9 4 1 15 25 16 29 10 22 7 2 8 5 18 14 23 24 4 6 26 3 11 6 12 1 7 14 24 14 6 10 21 16 23 29 25 6 14 17 24 ^'}}, - {OUT=>'CD4FDC35FAC7E1ADB5DE40F47F256EF74D584959'}], - ['108', {IN=> {f=> '64 0 12 10 5 10 15 25 8 15 3 7 13 25 16 14 1 29 22 26 15 27 9 1 8 8 28 6 13 5 13 3 15 5 23 8 23 2 5 5 4 17 13 14 7 17 12 27 3 18 5 7 5 26 18 15 22 28 16 13 7 2 23 19 25 15 ^'}}, - {OUT=>'8E6E273208AC256F9ECCF296F3F5A37BC8A0F9F7'}], - ['109', {IN=> {f=> '56 1 17 7 16 25 23 11 11 15 2 13 9 26 2 24 26 7 28 11 2 29 7 22 23 5 28 19 1 27 29 1 24 11 18 20 3 13 11 7 3 15 17 24 1 18 13 6 3 25 27 16 28 18 24 8 23 22 ^'}}, - {OUT=>'FE0606100BDBC268DB39B503E0FDFE3766185828'}], - ['110', {IN=> {f=> '51 1 29 28 6 28 14 12 28 27 22 4 14 25 1 3 9 7 11 14 15 16 10 19 12 19 11 20 13 28 4 27 28 7 27 12 4 28 21 17 22 20 17 15 15 23 22 13 12 21 22 21 29 ^'}}, - {OUT=>'6C63C3E58047BCDB35A17F74EEBA4E9B14420809'}], - ['111', {IN=> {f=> '64 1 12 14 12 18 27 8 7 4 9 14 16 15 8 11 21 20 10 10 21 23 20 2 11 23 1 11 1 5 3 23 16 15 27 14 5 16 3 22 2 3 24 3 19 29 4 4 10 8 20 14 15 1 26 12 27 25 4 28 22 11 19 19 24 9 ^'}}, - {OUT=>'BCC2BD305F0BCDA8CF2D478EF9FE080486CB265F'}], - ['112', {IN=> {f=> '60 1 20 8 9 5 25 19 17 19 15 7 24 24 21 3 20 16 8 3 17 28 18 29 9 23 9 10 29 4 12 24 15 5 8 22 17 29 12 3 8 29 15 21 21 4 7 20 7 10 7 26 10 16 24 6 7 12 8 12 15 17 ^'}}, - {OUT=>'CE5223FD3DD920A3B666481D5625B16457DCB5E8'}], - ['113', {IN=> {f=> '60 0 9 17 11 28 12 26 26 6 29 13 10 20 6 23 10 4 3 26 26 14 20 20 25 14 13 15 24 14 11 4 23 27 24 20 9 16 17 24 13 12 6 1 14 26 25 7 8 21 1 19 3 2 2 17 21 13 5 9 21 11 ^'}}, - {OUT=>'948886776E42E4F5FAE1B2D0C906AC3759E3F8B0'}], - ['114', {IN=> {f=> '54 0 25 1 27 24 6 23 16 5 1 20 29 22 25 9 25 10 3 28 28 25 19 18 16 24 14 15 5 28 12 28 26 29 2 15 15 9 5 18 19 22 12 15 4 6 15 24 16 9 4 26 25 18 27 12 ^'}}, - {OUT=>'4C12A51FCFE242F832E3D7329304B11B75161EFB'}], - ['115', {IN=> {f=> '61 1 20 4 26 12 3 22 1 22 30 3 28 10 9 24 14 29 6 30 3 10 20 14 6 3 19 21 21 28 16 18 11 30 11 20 30 1 9 8 11 5 19 10 24 4 22 4 2 26 5 15 20 8 3 13 30 18 8 1 25 28 19 ^'}}, - {OUT=>'C54BDD2050504D92F551D378AD5FC72C9ED03932'}], - ['116', {IN=> {f=> '56 1 20 15 21 18 18 12 16 13 24 9 21 2 28 6 1 23 9 18 27 27 4 9 13 10 8 14 16 15 12 11 14 21 14 10 11 25 17 17 30 21 13 27 26 26 22 14 13 17 21 19 9 9 20 23 13 28 ^'}}, - {OUT=>'8F53E8FA79EA09FD1B682AF5ED1515ECA965604C'}], - ['117', {IN=> {f=> '59 1 10 28 24 10 22 27 23 27 8 17 14 6 4 21 26 15 1 8 29 27 6 28 15 3 27 25 25 14 19 13 29 8 24 2 8 2 4 12 19 11 10 6 26 14 22 24 30 10 11 12 2 12 17 23 8 8 12 28 12 ^'}}, - {OUT=>'2D7E17F6294524CE78B33EAB72CDD08E5FF6E313'}], - ['118', {IN=> {f=> '56 0 14 28 2 17 4 8 3 26 9 23 21 30 30 20 4 13 28 29 9 3 17 7 19 30 28 1 2 20 9 12 24 15 30 20 27 3 23 11 6 29 25 23 26 17 20 10 22 15 23 6 25 5 4 30 2 29 ^'}}, - {OUT=>'64582B4B57F782C9302BFE7D07F74AA176627A3A'}], - ['119', {IN=> {f=> '63 1 23 15 27 14 26 1 1 7 19 12 7 6 20 18 14 4 15 17 28 7 11 7 8 9 22 17 12 5 23 18 25 18 6 12 26 30 12 30 14 3 1 18 10 20 27 21 8 6 24 26 20 11 24 7 2 4 18 15 14 30 16 19 14 ^'}}, - {OUT=>'6D88795B71D3E386BBD1EB830FB9F161BA98869F'}], - ['120', {IN=> {f=> '52 0 27 15 4 19 25 29 29 7 14 18 9 11 9 27 11 15 29 9 28 20 2 30 26 21 17 8 28 17 22 29 24 8 11 18 29 15 6 7 27 27 17 24 18 23 11 19 8 30 5 24 22 24 ^'}}, - {OUT=>'86AD34A6463F12CEE6DE9596ABA72F0DF1397FD1'}], - ['121', {IN=> {f=> '66 1 25 15 28 23 5 10 21 5 8 7 3 10 19 17 6 9 15 29 10 7 4 1 16 21 16 29 13 18 5 3 8 15 8 21 29 20 5 27 2 13 27 7 7 30 2 18 26 10 2 5 29 21 15 25 26 24 8 12 20 3 9 10 30 7 12 29 ^'}}, - {OUT=>'7EB46685A57C0D466152DC339C8122548C757ED1'}], - ['122', {IN=> {f=> '53 1 30 26 20 11 22 19 27 2 16 10 6 4 24 17 20 25 20 15 8 23 23 20 30 18 16 3 30 15 26 23 28 7 21 8 7 31 31 14 26 18 3 1 26 28 15 25 11 31 3 25 9 21 30 ^'}}, - {OUT=>'E7A98FB0692684054407CC221ABC60C199D6F52A'}], - ['123', {IN=> {f=> '67 0 2 6 14 4 9 5 28 8 17 22 1 4 8 7 10 14 19 10 14 8 27 9 24 26 4 30 11 8 19 5 21 7 2 27 20 16 20 20 22 14 13 16 26 14 10 3 25 22 25 23 21 10 15 15 29 8 13 4 2 13 22 20 7 4 20 31 23 ^'}}, - {OUT=>'34DF1306662206FD0A5FC2969A4BEEC4EB0197F7'}], - ['124', {IN=> {f=> '65 0 2 2 28 13 19 14 12 23 27 6 2 14 2 22 6 25 30 29 31 13 14 16 31 12 16 30 5 14 31 11 4 1 1 25 21 13 26 22 21 5 22 14 29 1 21 3 14 30 4 2 29 12 15 23 3 15 5 1 6 23 22 13 1 14 23 ^'}}, - {OUT=>'56CF7EBF08D10F0CB9FE7EE3B63A5C3A02BCB450'}], - ['125', {IN=> {f=> '59 1 25 5 15 6 13 3 22 11 23 31 24 6 5 20 4 14 3 29 8 29 19 7 29 23 25 28 19 11 15 27 21 14 1 19 20 26 12 7 12 1 18 13 29 28 23 29 14 23 7 1 9 29 24 5 30 18 5 25 30 ^'}}, - {OUT=>'3BAE5CB8226642088DA760A6F78B0CF8EDDEA9F1'}], - ['126', {IN=> {f=> '55 1 31 25 13 7 24 25 24 1 12 19 9 7 6 28 20 14 28 21 19 31 20 20 6 24 18 27 24 4 18 21 1 31 15 1 15 2 27 4 26 25 4 23 19 2 31 22 30 21 22 5 27 12 30 28 31 ^'}}, - {OUT=>'6475DF681E061FA506672C27CBABFA9AA6DDFF62'}], - ['127', {IN=> {f=> '62 0 27 15 18 14 25 15 17 7 28 11 28 29 30 1 17 12 10 2 18 20 21 2 11 12 5 4 12 25 14 5 5 24 22 18 31 15 22 29 11 3 21 31 21 27 3 28 7 10 25 2 15 30 9 30 7 22 15 9 3 20 24 14 ^'}}, - {OUT=>'79D81991FA4E4957C8062753439DBFD47BBB277D'}], - ['128', {IN=> {f=> '60 0 28 14 18 9 27 14 22 27 31 10 8 14 7 15 7 20 5 26 1 29 7 17 17 8 3 13 27 18 8 31 27 28 22 22 17 19 18 18 11 19 13 25 10 19 6 28 4 31 23 10 18 26 31 5 10 13 12 8 15 27 ^'}}, - {OUT=>'BAE224477B20302E881F5249F52EC6C34DA8ECEF'}], - ['129', {IN=> {f=> '60 1 24 22 4 29 22 31 28 20 4 16 21 3 1 15 5 15 6 30 3 29 29 7 27 20 2 20 31 22 26 9 29 16 4 26 32 17 20 14 28 17 19 6 24 11 26 28 5 18 15 8 16 20 21 4 9 12 4 8 17 29 ^'}}, - {OUT=>'EDE4DEB4293CFE4138C2C056B7C46FF821CC0ACC'}], - ['130', {IN=> {f=> '69 1 5 3 11 15 12 24 31 23 1 6 28 2 8 31 6 7 30 5 19 23 12 6 9 31 19 17 24 25 22 6 12 16 3 7 9 9 11 29 4 11 2 5 13 29 10 12 30 32 18 28 18 27 3 30 4 4 26 6 13 31 13 2 11 7 24 4 17 29 12 ^'}}, - {OUT=>'A771FA5C812BD0C9596D869EC99E4F4AC988B13F'}], - ['131', {IN=> {f=> '95 0 21 19 21 23 11 42 36 2 13 4 1 33 22 16 27 9 4 33 16 3 30 15 11 32 13 17 38 32 9 38 4 36 15 32 27 19 42 18 6 36 22 10 29 12 25 40 15 29 23 28 30 4 8 11 24 9 10 31 28 43 23 16 29 33 5 40 26 3 19 12 36 43 5 35 37 5 14 11 45 35 16 10 8 32 4 15 35 26 2 39 22 37 22 30 29 ^'}}, - {OUT=>'E99D566212BBBCEEE903946F6100C9C96039A8F4'}], - ['132', {IN=> {f=> '106 1 18 14 51 2 6 32 51 9 32 50 44 46 51 8 11 53 45 55 16 10 3 52 8 20 20 46 46 13 32 2 46 50 43 25 54 9 31 29 2 47 15 29 24 45 44 18 37 14 28 39 36 44 47 16 50 10 44 24 53 35 22 40 20 15 51 22 18 22 42 6 54 49 38 21 7 13 30 16 7 52 16 22 13 38 7 11 44 33 9 25 13 37 42 14 45 53 30 38 5 25 5 35 38 22 28 53 ^'}}, - {OUT=>'B48CE6B1D13903E3925AE0C88CB931388C013F9C'}], - ['133', {IN=> {f=> '127 0 58 35 43 28 5 28 63 8 12 25 9 47 53 29 62 7 37 2 3 48 5 12 55 56 28 35 12 63 6 58 27 27 48 44 35 14 17 22 56 10 8 1 16 15 42 63 14 51 57 19 41 7 8 56 47 34 52 22 48 60 43 9 1 52 4 21 49 61 18 50 23 13 46 62 23 45 62 9 56 18 23 31 8 30 27 36 13 38 4 58 53 47 24 18 41 58 19 12 18 52 42 29 44 45 26 63 34 32 41 64 15 26 55 19 2 49 6 30 53 13 54 12 53 37 12 37 43 ^'}}, - {OUT=>'E647D5BAF670D4BF3AFC0A6B72A2424B0C64F194'}], - ['134', {IN=> {f=> '148 0 60 4 51 47 58 38 17 63 33 23 28 43 12 69 70 33 17 12 50 18 18 36 45 2 67 4 45 20 4 33 38 29 45 8 22 58 39 71 38 32 53 35 19 53 31 29 51 35 4 63 18 33 26 47 70 9 64 62 63 30 15 1 35 28 16 40 20 14 50 33 19 38 30 27 55 10 16 46 47 7 55 12 53 26 56 33 29 55 25 17 48 43 21 43 18 24 63 27 68 46 38 33 35 10 18 11 27 5 9 58 35 70 36 36 39 47 2 10 66 47 5 18 21 44 71 51 57 3 22 7 56 55 28 25 14 40 16 24 48 37 66 50 24 45 18 39 53 55 ^'}}, - {OUT=>'65C1CD932A06B05CD0B43AFB3BC7891F6BCEF45C'}], - ['135', {IN=> {f=> '165 1 15 62 35 29 15 40 19 76 67 4 5 71 46 61 26 8 77 48 1 23 12 60 40 24 44 33 29 42 73 66 49 61 20 30 1 54 52 42 39 64 23 65 37 24 20 11 26 66 22 77 22 57 7 38 57 33 61 73 7 64 1 49 35 76 14 27 21 45 68 38 58 73 13 72 47 73 33 8 66 23 38 4 56 77 47 10 71 13 20 31 41 6 51 3 18 17 61 47 14 48 76 46 28 34 43 1 56 4 25 7 65 41 1 34 37 23 59 59 27 26 13 15 14 75 60 14 1 28 59 26 65 61 16 23 17 28 6 19 2 35 49 30 29 48 2 63 73 59 1 3 76 41 11 19 18 43 54 63 67 51 4 9 78 60 66 ^'}}, - {OUT=>'70FFAE353A5CD0F8A65A8B2746D0F16281B25EC7'}], - ['136', {IN=> {f=> '181 0 18 19 84 17 12 10 57 18 77 51 52 16 39 74 49 52 63 38 72 2 15 64 83 62 49 56 11 26 68 58 83 33 23 50 63 71 53 27 84 22 39 41 52 58 11 64 7 60 45 70 22 5 73 38 30 30 48 21 75 80 40 21 8 53 9 26 30 34 81 71 71 51 23 75 33 41 23 32 5 8 66 40 72 40 16 66 45 14 48 34 21 41 27 3 55 27 37 23 41 65 4 57 51 74 22 19 75 42 16 19 46 16 10 48 20 19 37 41 14 57 9 17 55 38 5 60 7 46 20 43 36 39 52 20 10 62 45 23 46 7 35 75 29 70 35 36 34 25 12 15 84 26 10 6 71 29 79 33 32 25 59 76 82 64 58 7 8 19 41 74 2 53 65 24 1 55 51 36 21 79 7 ^'}}, - {OUT=>'CC8221F2B829B8CF39646BF46888317C3EB378EA'}], - ['137', {IN=> {f=> '184 1 60 66 66 6 3 9 73 12 7 40 70 18 71 70 65 51 14 14 27 50 9 87 81 50 22 19 40 37 16 79 12 34 37 76 82 10 61 7 81 49 67 26 45 82 50 81 63 45 69 31 31 76 51 9 59 34 51 54 34 83 10 33 51 86 81 82 69 18 8 22 64 19 86 62 58 33 37 17 34 5 29 83 42 76 50 54 66 39 9 1 36 43 17 65 6 35 56 72 71 83 88 10 1 8 87 22 6 21 78 25 89 43 62 40 55 85 31 89 74 63 46 28 24 26 31 17 7 8 27 19 12 85 17 20 27 77 10 2 54 80 17 52 74 76 69 78 11 20 80 4 29 24 85 75 18 39 23 70 83 29 57 67 72 70 33 4 15 46 42 2 69 13 53 33 69 64 33 64 14 40 69 59 78 54 ^'}}, - {OUT=>'26ACCC2D6D51FF7BF3E5895588907765111BB69B'}], - ['138', {IN=> {f=> '193 1 68 43 95 53 38 58 55 28 20 16 67 48 17 86 32 44 68 67 28 16 14 79 25 15 72 67 50 80 18 30 10 75 1 60 45 87 78 28 95 49 63 70 59 26 6 51 73 60 65 18 26 8 87 5 58 31 25 57 40 46 78 57 34 78 61 36 66 57 38 80 22 32 68 71 30 74 37 81 66 77 66 55 2 51 24 93 61 40 68 45 61 12 63 24 89 59 52 72 43 20 20 69 36 40 88 46 9 62 55 77 84 20 18 6 77 15 52 39 75 3 26 4 85 17 62 29 11 92 46 58 29 59 28 42 80 71 96 2 49 85 37 63 4 61 14 2 53 87 25 86 6 75 76 93 41 39 93 92 42 56 41 63 26 28 18 77 11 50 78 79 1 12 12 91 29 13 58 5 56 92 66 59 4 39 47 95 5 5 62 33 13 80 27 ^'}}, - {OUT=>'01072915B8E868D9B28E759CF2BC1AEA4BB92165'}], - ['139', {IN=> {f=> '203 1 35 28 11 7 20 7 17 3 3 30 89 13 65 56 66 63 22 82 16 31 55 56 77 91 91 71 101 13 10 85 101 95 17 99 98 91 33 14 20 48 32 7 64 29 38 35 25 4 95 23 34 1 85 81 23 31 96 71 84 50 15 79 47 25 51 45 35 66 19 61 60 9 31 93 64 70 30 42 86 53 1 71 46 42 22 38 96 10 99 34 76 26 55 73 63 63 97 23 92 81 64 46 1 30 31 35 86 91 88 64 87 16 37 69 84 94 60 100 3 47 52 8 71 87 57 29 76 43 18 45 46 15 65 12 44 42 66 60 15 68 19 58 39 62 76 9 92 101 57 32 4 34 15 41 62 32 89 71 43 35 31 41 21 17 82 33 96 27 62 29 82 57 46 62 15 24 99 37 83 40 52 46 56 80 98 3 91 74 6 27 7 58 94 10 41 79 97 84 77 74 26 99 35 ^'}}, - {OUT=>'3016115711D74236ADF0C371E47992F87A428598'}], - ['140', {IN=> {f=> '212 1 26 101 17 91 45 97 80 59 102 30 68 4 85 9 4 39 16 18 85 70 11 87 62 72 78 38 3 41 53 82 82 35 18 13 94 64 52 39 77 59 26 9 65 46 64 98 32 29 86 79 16 63 54 76 56 98 16 98 78 22 72 33 103 104 52 84 12 65 15 85 101 97 84 31 51 26 100 100 38 80 13 2 78 7 24 44 84 103 27 7 28 16 33 99 25 103 54 14 42 62 87 92 27 22 42 5 52 100 84 73 72 63 24 48 56 52 23 5 17 76 31 1 95 58 43 60 50 62 30 23 35 79 20 35 3 72 32 45 51 87 41 84 27 79 77 70 102 15 54 15 100 8 52 69 105 3 30 84 42 93 66 89 69 74 24 33 42 97 4 38 99 106 13 93 6 106 74 100 54 45 21 59 56 37 9 50 32 75 79 31 77 9 61 1 8 68 6 60 81 7 100 99 14 61 48 25 73 26 70 72 94 34 ^'}}, - {OUT=>'BF30417999C1368F008C1F19FECA4D18A5E1C3C9'}], - ['141', {IN=> {f=> '233 0 11 98 110 88 35 110 35 64 49 88 93 28 85 6 78 65 90 52 24 97 51 39 51 59 23 1 3 49 33 11 78 27 35 55 64 5 102 4 70 25 56 58 38 66 11 31 96 66 104 59 41 86 58 29 79 41 40 72 51 12 92 34 52 44 69 104 21 97 89 96 48 21 4 61 40 28 67 34 23 85 44 22 62 52 33 84 23 30 73 74 4 79 12 81 47 80 53 47 89 40 19 80 62 34 61 29 41 95 43 1 70 63 55 53 18 19 13 48 10 19 89 49 4 52 53 56 76 10 8 104 77 15 28 38 75 109 3 85 90 8 40 8 93 90 43 39 14 60 17 36 78 56 105 80 35 75 36 58 82 50 100 98 45 74 13 66 95 72 71 95 34 14 98 72 33 38 37 52 6 14 107 59 3 29 61 67 98 92 5 93 17 98 36 87 41 75 71 57 88 17 25 91 84 3 58 20 92 69 51 50 36 31 14 25 18 30 18 1 41 104 30 82 59 87 70 34 96 28 47 62 81 103 48 ^'}}, - {OUT=>'62BA49087185F2742C26E1C1F4844112178BF673'}], - ['142', {IN=> {f=> '234 1 63 90 108 108 102 64 82 88 4 111 76 97 22 1 108 41 34 91 33 20 25 24 26 8 83 11 31 7 85 109 106 4 105 85 68 28 33 99 53 8 16 12 11 74 17 83 66 70 16 30 9 67 68 34 24 81 47 92 72 47 37 33 38 92 17 8 28 88 22 62 69 32 89 75 3 72 96 85 13 105 24 38 37 94 115 83 72 108 114 24 93 76 103 60 99 102 9 43 10 59 95 46 33 93 15 26 69 44 2 86 107 55 45 61 65 92 66 9 55 39 70 83 29 98 67 13 111 15 20 31 62 8 2 51 20 19 33 44 14 115 71 112 97 10 41 28 53 51 26 57 15 38 98 55 106 22 56 31 50 95 107 110 84 70 10 108 96 73 100 25 36 55 88 71 63 96 30 90 96 79 22 7 30 23 28 59 89 8 51 99 47 86 34 18 43 65 98 104 107 49 7 79 71 8 57 21 29 80 2 74 78 44 57 9 61 22 13 68 52 91 74 98 43 30 58 68 95 101 72 102 76 42 99 61 ^'}}, - {OUT=>'E1F6B9536F384DD3098285BBFD495A474140DC5A'}], - ['143', {IN=> {f=> '249 0 27 117 45 119 80 2 59 52 8 76 20 94 102 69 96 42 46 106 67 9 110 89 71 69 34 31 15 85 16 29 100 82 37 62 68 95 108 44 23 114 34 36 56 93 11 30 96 12 31 67 14 114 14 66 70 30 81 46 53 119 85 6 104 47 92 72 70 5 70 15 115 68 105 33 97 13 85 106 14 61 29 22 86 45 57 69 91 38 38 28 66 13 60 95 103 3 15 5 113 38 23 62 5 65 94 107 73 104 37 47 102 117 3 78 35 7 95 56 78 45 52 28 46 43 37 32 53 19 55 29 47 97 76 115 83 71 11 45 62 73 99 116 2 24 116 7 28 41 2 29 37 52 23 5 118 79 31 57 89 61 24 101 78 50 93 73 41 7 33 45 47 24 1 48 73 36 3 25 87 46 28 108 54 68 53 67 119 28 36 118 104 42 88 27 112 4 74 85 1 63 39 97 71 74 75 76 10 49 12 79 11 50 103 118 94 117 118 37 27 12 94 60 28 51 47 82 110 17 15 105 23 52 43 12 21 22 81 41 12 74 90 42 108 117 98 67 4 69 85 ^'}}, - {OUT=>'B522DAE1D67726EBA7C4136D4E2F6D6D645AC43E'}], - ['144', {IN=> {f=> '243 0 76 81 26 101 13 68 62 106 87 19 98 32 81 63 79 93 31 121 123 75 52 11 66 41 54 87 38 5 104 62 51 38 55 29 31 120 44 16 48 94 46 105 91 66 78 27 43 6 64 2 55 79 75 84 113 22 4 113 109 31 33 17 96 11 29 63 98 103 107 116 34 14 9 95 38 18 51 75 33 109 118 55 66 4 76 7 75 70 82 74 23 1 26 69 40 112 99 47 65 31 70 119 52 103 88 85 86 28 16 12 76 25 22 78 64 21 86 27 61 77 72 108 2 18 106 119 121 54 16 85 72 2 73 26 88 66 60 80 35 24 117 63 24 44 67 52 122 119 33 72 16 99 98 69 54 19 42 28 53 114 32 117 81 100 57 49 123 56 21 68 80 53 95 1 45 95 107 98 87 1 27 24 99 116 16 67 1 113 91 84 25 40 25 72 3 28 90 87 112 80 16 117 45 77 36 90 105 59 88 122 64 108 108 71 98 18 50 115 93 105 77 35 6 46 55 47 102 4 26 87 111 120 81 113 4 57 105 3 84 94 115 61 73 ^'}}, - {OUT=>'E9A021C3EB0B9F2C710554D4BF21B19F78E09478'}], - ['145', {IN=> {f=> '255 1 91 47 51 9 57 9 55 94 61 61 68 46 107 6 35 81 114 78 96 74 14 89 73 67 67 69 113 107 11 98 113 109 20 92 17 67 70 88 57 10 124 9 60 122 93 91 45 7 15 24 51 5 98 115 24 49 90 104 117 66 128 94 64 80 12 43 91 46 111 59 58 77 30 14 88 60 123 68 41 44 68 40 104 118 41 43 93 90 105 92 16 127 26 54 125 114 79 71 24 48 21 25 118 40 103 49 91 44 67 65 25 119 109 18 48 23 69 112 38 61 64 87 84 104 119 110 122 92 22 1 8 83 34 100 32 62 41 46 112 34 102 76 56 39 4 127 30 13 19 110 124 7 16 128 95 4 124 11 104 116 126 49 95 3 55 96 70 90 101 4 122 96 75 118 39 128 99 92 18 42 20 87 83 35 75 111 61 67 71 28 101 9 56 34 105 95 71 23 73 71 26 57 15 23 76 55 99 89 128 98 117 68 43 88 62 38 62 39 2 83 36 15 26 60 128 96 73 74 10 1 12 42 22 2 77 33 33 32 57 13 14 82 57 12 39 3 58 80 14 87 85 44 69 109 119 ^'}}, - {OUT=>'DF13573188F3BF705E697A3E1F580145F2183377'}], - ['146', {IN=> {f=> '283 0 102 55 53 41 60 88 25 67 58 76 44 22 68 118 108 40 95 96 81 90 85 28 77 18 11 37 72 93 60 110 124 119 95 131 91 37 109 126 8 73 69 72 80 17 83 5 76 20 32 15 10 1 103 18 22 116 98 9 51 104 102 44 33 15 12 24 31 89 1 6 28 101 8 64 72 106 30 5 52 89 111 39 108 64 85 17 57 124 22 105 78 115 3 40 108 66 108 77 128 103 44 35 38 13 95 10 111 63 98 117 61 51 126 69 96 70 70 59 39 13 97 33 112 2 77 7 123 70 83 29 66 67 49 79 19 104 115 14 60 2 55 40 71 33 28 114 51 91 17 46 45 128 57 87 62 25 115 38 50 55 90 74 8 51 102 79 43 94 36 122 94 12 41 36 25 104 91 24 7 99 80 30 126 32 63 122 107 114 27 28 79 41 12 35 51 115 122 70 22 79 65 2 88 27 17 59 15 23 44 57 5 65 6 26 78 80 125 93 84 100 45 22 129 68 36 111 74 118 11 50 42 120 47 21 8 86 112 26 67 60 99 45 93 47 8 38 59 52 56 124 20 82 18 117 24 18 46 106 19 117 26 41 47 45 130 7 15 1 4 5 100 10 85 50 44 11 48 92 119 108 42 118 125 ^'}}, - {OUT=>'188835CFE52ECFA0C4135C2825F245DC29973970'}], - ['147', {IN=> {f=> '272 0 8 61 99 70 96 20 87 123 134 82 22 2 110 118 33 86 5 7 5 94 56 15 60 96 54 13 22 55 99 4 25 105 17 37 69 10 38 117 117 30 70 13 9 109 115 62 94 52 66 117 100 135 7 75 23 5 81 110 31 118 29 1 62 11 41 88 109 119 102 37 3 30 123 47 31 56 134 29 124 116 118 99 21 56 77 91 23 37 135 81 44 51 67 95 51 133 30 57 67 116 122 48 100 7 132 97 106 69 93 4 95 125 102 103 119 81 57 133 96 37 118 50 117 113 81 127 17 45 103 32 121 129 60 43 65 127 30 36 132 110 52 53 35 71 12 76 22 72 130 112 99 76 26 21 73 63 63 97 23 58 115 132 114 1 132 31 35 18 23 54 30 53 118 37 35 84 94 60 100 3 47 18 110 105 87 57 63 76 43 52 45 46 49 65 12 10 42 66 60 117 34 19 92 5 28 76 9 126 101 125 32 38 34 15 7 62 32 21 3 43 69 31 109 123 51 116 135 130 129 130 63 14 57 80 62 15 126 31 105 83 108 120 80 124 46 98 105 91 6 6 27 7 58 128 78 7 79 63 84 77 74 128 65 61 95 121 17 24 123 117 51 122 ^'}}, - {OUT=>'41B615A34EE2CEC9D84A91B141CFAB115821950B'}], - ['148', {IN=> {f=> '284 0 44 71 43 20 126 58 53 47 98 18 19 119 93 29 70 39 94 112 44 115 135 98 82 10 67 29 102 113 68 80 19 75 1 91 114 87 80 7 40 37 86 120 16 104 136 117 82 138 32 65 114 119 137 121 8 12 46 126 26 119 73 130 60 76 113 100 14 133 26 116 34 120 80 95 84 53 15 24 44 51 4 10 23 77 24 99 66 37 54 63 42 136 21 34 76 5 17 128 101 1 59 40 113 112 32 97 31 93 105 79 91 18 39 1 103 132 51 68 124 111 13 97 43 128 69 84 85 72 15 12 26 87 16 16 92 101 13 77 4 118 89 103 56 42 16 60 44 39 126 46 18 83 93 41 105 3 82 106 115 91 6 4 54 115 15 120 109 113 48 41 9 95 20 62 67 105 111 25 132 7 116 46 138 44 83 61 124 131 35 107 6 109 81 114 67 41 137 77 56 74 73 34 12 14 69 52 11 98 47 54 83 81 6 1 15 88 35 139 80 83 49 89 27 47 130 92 133 87 51 112 76 49 109 49 57 93 73 22 117 50 64 58 97 139 36 131 111 133 58 33 8 88 55 38 90 46 30 118 57 29 82 74 41 117 38 46 94 92 5 105 15 117 70 103 68 60 120 48 21 110 85 40 81 66 ^'}}, - {OUT=>'AB3DD6221D2AFE6613B815DA1C389EEC74AA0337'}], - ['149', {IN=> {f=> '291 0 46 113 52 134 79 74 64 57 18 23 9 52 8 16 103 57 138 59 59 65 92 2 7 130 92 8 34 40 86 131 140 100 112 4 42 1 110 108 43 37 15 67 19 35 94 61 130 98 35 88 34 65 104 56 126 118 50 87 10 81 109 90 86 118 32 6 114 88 39 38 39 62 3 12 134 72 137 35 75 81 115 106 140 112 11 123 41 103 45 95 84 71 107 13 26 110 96 62 16 109 84 59 53 38 27 8 28 13 32 137 17 138 41 122 36 99 65 99 83 36 112 29 49 70 96 126 136 131 116 3 18 17 126 142 14 37 141 141 123 42 13 20 83 42 139 83 54 49 58 42 7 137 29 48 16 121 127 34 52 140 106 128 58 36 124 83 24 69 54 61 112 17 6 95 97 24 57 86 124 59 71 119 67 1 109 54 68 49 57 132 32 5 71 113 40 80 104 75 106 133 31 126 130 104 62 9 39 44 66 116 141 135 96 132 19 41 121 126 124 77 8 4 60 82 6 101 124 89 51 123 48 40 85 77 21 112 10 69 66 115 87 16 108 30 84 65 80 103 32 131 134 73 47 10 63 39 50 93 37 135 114 69 48 34 58 23 27 133 37 9 40 98 41 115 99 70 83 29 42 67 133 55 79 80 91 122 12 2 115 112 47 ^'}}, - {OUT=>'0706D414B4AA7FB4A9051AA70D6856A7264054FB'}], - ['150', {IN=> {f=> '293 1 33 13 99 138 1 42 89 118 87 113 99 12 134 142 100 38 5 55 75 14 110 108 42 64 130 79 138 62 64 69 57 11 123 25 59 16 111 94 24 65 30 51 119 48 107 92 84 69 28 136 143 54 20 6 70 47 142 64 4 65 59 73 99 134 146 102 125 116 57 137 137 72 48 128 78 5 80 63 54 85 30 22 129 68 21 21 74 28 128 107 27 60 2 93 95 71 37 11 37 15 39 102 3 104 65 80 59 52 113 34 20 67 60 27 81 135 46 106 106 102 68 128 17 15 100 124 15 43 136 122 100 67 142 35 14 53 120 2 89 93 99 73 9 122 39 77 15 96 90 43 79 134 60 92 105 55 96 31 119 77 97 72 23 140 38 30 43 83 136 88 107 117 72 109 118 58 91 119 73 95 100 59 138 123 54 49 143 50 133 66 106 45 80 88 42 93 5 59 77 101 74 110 104 40 92 19 77 76 86 102 129 3 144 101 139 134 56 90 18 91 94 85 55 10 137 11 58 1 107 113 70 22 7 56 29 143 111 8 46 45 116 122 129 89 7 121 53 95 14 49 118 62 125 91 37 97 15 35 100 63 140 63 50 51 58 26 127 6 45 59 102 121 114 85 141 135 10 72 19 106 66 66 41 53 13 38 1 21 103 50 108 46 119 ^'}}, - {OUT=>'3CBF8151F3A00B1D5A809CBB8C4F3135055A6BD1'}], - ['151', {IN=> {f=> '297 1 46 31 132 112 28 63 124 97 129 43 40 72 99 107 132 137 96 139 99 145 121 144 118 37 81 39 94 60 55 109 47 109 110 75 42 12 139 137 43 128 106 107 19 126 12 101 148 127 15 117 125 125 62 96 13 76 70 96 101 110 138 8 95 76 143 17 32 97 79 149 39 31 94 123 21 41 135 55 84 70 33 135 118 50 62 121 81 1 45 144 93 60 5 64 137 8 105 91 82 67 27 113 119 53 18 98 79 48 84 32 135 128 5 1 20 76 17 85 108 72 36 141 140 49 150 105 104 3 149 14 54 18 148 64 49 125 37 28 28 101 22 104 91 32 82 117 12 114 69 58 2 58 115 9 108 47 59 65 14 92 7 4 86 98 16 82 92 95 38 94 10 10 48 97 104 66 115 97 142 115 122 119 40 97 16 32 47 34 88 89 26 50 12 76 80 51 40 9 133 24 44 40 122 84 108 22 142 140 99 44 15 54 8 42 125 150 130 21 79 124 62 46 119 15 29 91 57 150 42 138 71 61 68 80 114 6 1 70 121 18 35 113 56 87 86 10 73 14 29 41 72 89 1 133 87 101 123 59 90 142 77 133 52 78 48 34 138 134 27 17 60 131 147 61 93 148 39 132 49 62 71 36 91 4 139 49 100 120 43 113 144 30 94 73 127 40 125 ^'}}, - {OUT=>'DA5D6A0319272BBCCEA63ACFA6799756FFDA6840'}], - ['152', {IN=> {f=> '313 1 35 97 95 76 105 88 32 138 30 69 61 40 47 21 107 6 39 81 114 53 125 53 147 14 4 73 146 96 98 13 136 11 98 117 138 153 67 146 71 99 88 7 139 24 13 35 47 97 145 74 36 119 3 51 84 48 119 53 49 15 79 17 120 103 148 64 30 41 97 120 75 111 63 58 131 134 18 13 10 48 18 16 48 43 15 54 18 41 47 122 144 80 92 145 77 1 33 89 54 46 78 48 21 54 43 40 53 24 16 73 42 94 29 44 34 151 152 23 123 12 142 140 43 37 88 29 19 35 72 96 151 130 62 112 34 36 91 120 50 112 138 2 105 60 68 137 131 5 17 19 139 74 11 120 78 149 58 128 15 104 16 126 78 20 57 134 71 49 90 76 108 126 100 54 68 39 132 153 42 147 146 124 62 87 35 75 61 65 46 100 82 105 113 31 63 5 95 54 71 77 127 150 80 36 144 2 130 59 74 39 3 152 121 122 18 117 12 117 141 118 135 62 36 69 5 39 53 150 52 153 143 30 66 96 126 131 56 137 8 7 86 142 14 7 111 141 93 136 137 134 43 12 89 23 44 9 152 146 121 97 19 38 110 91 67 14 32 110 66 68 8 130 84 73 118 59 24 41 72 121 150 55 37 138 27 104 66 124 9 51 109 47 125 109 148 8 29 47 72 146 149 61 93 10 20 54 15 76 133 125 106 110 67 ^'}}, - {OUT=>'FB4429C95F6277B346D3B389413758DFFFEEDC98'}], - ['153', {IN=> {f=> '330 0 23 9 26 136 27 51 115 122 44 106 6 146 108 113 85 51 8 96 47 56 137 62 59 89 143 71 140 14 85 156 139 99 154 30 53 115 35 147 108 148 58 52 28 103 19 92 95 152 152 10 11 13 155 67 11 83 101 69 153 152 45 141 14 120 129 140 119 59 2 89 73 70 83 29 16 67 81 29 1 54 65 96 117 2 37 47 128 33 3 89 108 98 139 49 78 27 103 39 119 94 132 90 38 132 55 65 131 90 58 2 54 100 69 118 22 44 19 7 148 93 25 29 123 81 64 131 55 30 1 89 38 97 82 64 9 28 86 123 151 10 133 40 154 102 4 111 65 9 63 59 124 116 72 105 76 57 137 97 32 145 108 78 112 50 43 34 75 20 22 129 68 11 118 74 125 118 57 17 20 129 53 65 61 144 1 17 142 156 52 100 54 15 20 59 52 63 131 20 57 124 31 125 46 106 76 92 8 98 154 152 80 114 15 140 136 112 100 17 92 25 151 150 80 99 69 83 49 43 156 102 19 57 122 96 30 3 39 134 40 32 75 5 76 127 138 99 17 57 52 150 130 18 127 33 23 116 107 78 77 77 42 69 68 48 41 69 33 75 40 49 128 103 4 146 93 10 83 66 96 152 30 38 12 33 5 39 47 41 34 60 74 20 42 156 67 46 56 102 89 3 124 81 99 104 56 50 8 61 74 55 15 87 108 28 138 47 93 60 2 124 46 126 103 91 145 36 25 116 122 51 ^'}}, - {OUT=>'2C6E30D9C895B42DCCCFC84C906EC88C09B20DE1'}], - ['154', {IN=> {f=> '322 0 75 7 107 158 81 105 154 90 20 125 77 114 69 92 7 58 21 98 154 50 128 149 117 127 153 45 3 18 121 86 29 71 79 101 2 5 22 143 10 27 53 146 157 148 112 33 22 80 123 24 147 1 112 82 159 63 74 97 109 33 151 32 89 87 132 117 46 129 59 115 91 114 118 37 21 9 94 60 25 89 47 79 110 55 12 143 99 87 43 88 56 57 160 76 12 71 128 77 146 117 95 105 42 66 3 76 20 76 101 100 118 149 45 26 143 148 32 57 39 129 19 31 84 123 1 152 135 5 54 30 13 125 68 30 62 101 51 142 5 94 83 20 116 24 107 109 105 91 42 17 27 93 69 3 139 68 79 38 84 2 85 128 126 122 131 46 17 35 98 42 26 111 100 29 120 55 84 114 109 145 14 18 138 14 9 85 7 18 129 91 2 94 51 133 82 87 123 64 39 8 103 38 75 110 78 7 9 45 115 42 138 135 86 78 16 62 52 75 159 54 151 121 149 77 74 16 85 47 102 105 82 119 10 67 137 153 148 135 28 49 26 151 153 36 80 11 130 113 24 44 30 102 24 58 133 122 140 99 24 156 54 119 42 115 140 90 132 19 94 2 157 99 136 19 71 7 130 153 108 51 21 58 70 74 137 1 40 111 149 5 103 6 27 76 141 23 125 140 1 72 29 152 103 87 51 93 29 80 132 77 123 153 68 159 14 98 114 158 121 158 81 131 ^'}}, - {OUT=>'3DE3189A5E19F225CDCE254DFF23DACD22C61363'}], - ['155', {IN=> {f=> '322 0 35 93 109 125 119 10 10 19 135 26 4 74 135 35 120 129 113 92 17 29 47 88 14 159 149 87 45 36 75 68 22 138 20 59 61 144 151 11 107 6 153 81 114 43 85 157 97 148 118 73 126 56 58 137 96 11 98 67 98 103 57 146 21 59 88 151 139 148 127 25 17 47 115 34 160 109 107 51 64 28 69 13 49 149 69 141 90 93 118 64 10 1 67 80 35 111 13 58 101 124 132 147 154 18 162 6 162 33 5 34 142 41 161 82 114 70 92 145 57 155 137 114 79 44 36 48 48 21 14 13 40 33 14 150 33 32 54 143 14 4 101 142 23 93 136 132 120 147 17 38 163 143 5 52 46 151 130 32 72 34 124 150 51 100 112 128 126 65 10 28 87 81 159 131 19 99 54 125 110 58 119 28 78 129 104 140 126 38 154 27 114 61 153 90 66 98 76 50 158 48 39 82 123 22 147 136 114 52 37 35 75 41 15 150 60 52 55 103 21 23 129 95 24 71 47 97 130 50 140 144 106 100 9 64 19 117 122 71 92 8 77 156 97 121 98 85 2 36 39 109 143 23 120 156 133 93 154 36 66 116 131 160 127 162 161 46 142 14 141 81 141 63 86 117 104 3 146 39 127 34 133 102 106 91 57 9 28 60 61 7 158 12 80 26 8 122 80 44 63 68 49 158 21 32 81 150 15 141 108 161 64 46 124 123 31 99 27 105 109 98 112 144 ^'}}, - {OUT=>'93530A9BC9A817F6922518A73A1505C411D05DA2'}], - ['156', {IN=> {f=> '336 1 34 161 107 149 48 67 138 109 156 104 37 133 60 80 84 81 160 9 16 96 164 1 95 112 4 86 163 116 98 103 55 31 8 56 37 36 127 32 9 89 103 31 100 161 85 106 119 89 154 43 115 162 137 108 128 38 42 155 103 9 62 65 102 122 10 138 160 125 47 158 43 91 69 123 132 35 121 4 110 89 130 69 29 139 69 53 70 83 29 163 67 41 9 108 34 45 76 87 2 144 164 98 33 160 79 78 48 89 9 38 134 93 146 79 54 122 80 38 112 55 55 101 70 8 129 44 70 59 98 149 24 136 124 138 63 25 166 83 51 34 91 45 30 118 59 28 87 72 44 116 28 36 103 101 113 10 114 62 111 71 65 126 53 19 114 86 42 85 36 57 137 57 159 95 88 78 72 20 23 14 65 10 22 129 68 1 68 74 75 108 7 7 147 109 13 35 51 104 158 164 122 126 2 50 4 132 127 59 52 13 81 20 47 107 74 148 115 46 106 46 82 115 68 144 142 60 104 15 90 136 102 100 134 42 15 141 100 40 49 49 73 166 13 156 82 166 37 82 96 137 130 166 134 20 139 45 122 56 107 98 79 124 17 32 130 120 165 77 23 130 96 67 68 47 37 12 29 18 38 158 19 160 55 147 39 118 83 121 96 43 137 33 66 86 112 147 155 149 140 5 19 17 148 161 10 44 159 146 57 16 26 102 49 3 104 61 59 74 56 10 165 31 54 25 142 157 37 58 165 128 154 73 50 149 94 137 ^'}}, - {OUT=>'E31354345F832D31E05C1B842D405D4BD4588EC8'}], - ['157', {IN=> {f=> '330 1 61 51 65 132 23 169 116 122 14 66 7 98 131 72 69 127 72 163 125 68 69 51 47 159 31 164 71 118 50 83 113 81 127 153 45 137 134 121 68 163 26 43 65 127 166 138 98 144 18 53 137 139 148 76 158 4 62 78 167 102 144 94 55 141 63 29 97 91 24 115 166 80 69 132 99 1 120 23 88 64 87 118 37 137 152 94 60 168 71 47 52 110 37 155 125 63 42 43 52 11 12 151 31 12 44 110 32 128 117 68 87 24 39 164 76 145 58 101 91 100 140 151 143 130 32 21 3 111 1 31 75 123 153 116 135 130 27 164 165 116 23 12 62 83 24 133 139 49 74 154 80 158 80 64 105 91 6 142 27 75 24 128 112 41 79 29 84 145 40 128 99 95 95 19 17 160 89 15 17 84 64 11 93 10 66 78 73 127 148 18 129 139 143 49 150 9 84 82 154 85 15 88 82 60 87 19 12 133 58 20 39 65 51 141 134 27 70 167 120 117 86 60 16 44 16 57 132 18 142 85 104 59 47 141 58 2 66 96 46 119 153 40 110 126 103 90 144 13 26 106 144 80 145 134 103 95 24 44 21 84 140 13 97 104 140 99 6 147 54 83 42 106 131 54 96 135 67 118 121 81 109 10 53 132 112 117 81 33 155 49 61 38 119 1 13 102 131 148 94 131 143 67 123 148 89 104 135 72 145 152 76 87 6 66 2 71 123 77 114 108 59 123 166 62 96 140 94 149 116 169 ^'}}, - {OUT=>'3FF76957E80B60CF74D015AD431FCA147B3AF232'}], - ['158', {IN=> {f=> '349 0 125 17 93 82 80 110 156 147 156 99 154 4 29 90 163 120 84 113 56 8 157 29 61 169 141 113 78 48 50 13 138 11 50 61 99 106 2 107 6 117 81 114 34 49 112 52 130 82 73 108 20 22 110 60 11 98 22 62 58 48 146 149 23 88 142 139 121 91 16 163 2 88 171 133 100 62 51 46 10 24 150 49 131 60 114 63 84 91 64 165 138 40 44 172 111 141 58 74 115 96 129 145 164 153 170 126 24 169 16 115 41 125 46 87 61 92 145 39 155 92 78 70 35 27 21 48 21 151 159 40 15 5 132 170 23 18 107 160 150 56 133 23 66 109 123 102 102 172 166 145 116 151 34 1 151 130 5 36 34 97 114 15 82 128 112 119 99 29 138 165 42 36 159 95 19 63 36 89 101 40 92 1 33 93 104 113 126 2 136 96 52 108 90 57 89 31 5 113 30 39 37 96 4 147 127 105 43 165 35 75 23 143 105 24 25 10 94 12 160 102 95 170 71 20 70 112 23 95 144 61 73 137 55 1 81 95 26 65 172 41 147 79 103 80 40 121 36 12 64 98 169 93 111 115 48 127 9 39 107 131 115 118 162 161 10 142 14 123 54 141 36 41 99 77 140 128 167 82 25 106 57 70 64 21 19 15 34 126 149 167 53 163 127 86 35 8 54 23 40 140 3 169 45 150 152 96 81 143 28 28 124 87 13 90 9 87 109 53 67 164 28 131 89 149 42 55 126 79 132 74 19 133 30 68 72 75 148 9 10 72 152 144 83 106 153 74 163 98 152 ^'}}, - {OUT=>'34AE3B806BE143A84DCE82E4B830EB7D3D2BAC69'}], - ['159', {IN=> {f=> '375 1 94 28 13 8 20 28 18 118 5 140 89 67 171 64 152 85 61 101 80 154 149 34 115 135 128 108 110 20 33 128 103 35 38 57 95 10 111 151 98 29 149 7 82 69 96 114 26 103 171 101 53 121 24 2 121 51 35 70 83 29 154 67 5 167 63 16 27 58 60 2 99 128 71 33 160 70 51 3 44 149 2 89 84 101 43 18 113 71 38 94 55 46 74 52 139 102 35 43 50 80 122 6 100 88 129 36 25 148 47 24 7 55 36 30 82 32 19 78 63 26 71 28 167 85 56 167 95 159 78 26 66 35 65 90 44 159 105 59 15 67 57 137 21 132 50 70 78 36 169 5 172 56 1 22 129 68 168 23 74 30 99 138 174 120 91 153 8 42 68 158 155 104 99 133 5 135 96 82 59 52 144 36 20 38 62 29 112 106 46 106 19 73 70 41 135 133 42 95 15 45 136 93 100 98 173 6 132 55 4 4 31 64 130 162 156 64 157 19 46 96 92 103 139 134 2 94 18 86 38 89 62 61 79 157 14 112 111 156 32 14 85 78 31 59 20 1 161 169 149 29 122 150 133 37 102 30 109 65 85 51 174 110 164 66 77 76 111 119 131 95 5 1 166 103 134 141 17 158 123 137 48 165 175 102 13 3 86 43 23 47 56 150 165 4 36 174 115 157 168 13 147 119 109 55 41 140 67 27 31 27 53 126 17 163 116 122 160 60 7 92 113 66 45 109 60 151 125 62 39 39 17 153 13 152 53 94 50 53 89 57 127 153 45 119 104 121 56 145 172 19 41 103 166 108 68 126 12 53 131 127 148 52 134 168 50 48 155 72 132 82 37 129 63 175 160 ^'}}, - {OUT=>'D7447E53D66BB5E4C26E8B41F83EFD107BF4ADDA'}], - ['160', {IN=> {f=> '366 1 73 15 79 139 71 51 132 81 135 111 166 61 37 60 118 37 92 134 94 60 150 53 47 25 110 19 137 107 27 176 43 16 145 146 142 165 12 17 92 166 110 117 41 69 6 12 164 76 109 40 101 82 82 131 134 115 143 112 32 164 146 93 162 31 66 123 144 80 135 94 137 156 107 157 173 62 65 176 124 112 4 65 127 44 131 53 19 105 91 149 106 27 57 158 92 85 14 79 20 84 127 174 128 72 68 59 171 17 124 80 167 8 57 28 172 66 144 48 42 37 109 121 18 120 103 116 13 132 39 73 145 76 158 43 82 33 51 153 164 97 13 2 3 20 24 114 98 9 25 131 102 99 86 42 16 26 159 39 105 161 133 49 59 41 20 105 31 136 30 87 10 119 135 13 83 99 58 45 99 156 26 61 135 143 80 118 107 76 77 24 44 12 66 95 147 61 86 140 99 167 138 54 47 42 97 122 18 60 90 40 73 85 63 82 1 35 96 94 81 54 15 128 40 52 2 101 1 165 93 113 130 85 95 98 58 105 112 53 68 108 72 100 152 49 87 140 39 154 62 114 77 105 63 50 87 157 26 78 122 67 140 71 170 119 5 93 64 50 104 144 129 138 75 130 4 178 60 139 120 54 113 32 2 133 17 43 163 129 89 72 149 155 30 38 7 138 5 44 61 69 76 175 107 6 93 81 114 28 25 82 22 118 58 73 96 175 177 92 36 11 98 171 38 28 42 146 125 178 88 136 139 103 67 10 151 151 70 153 115 94 32 51 34 177 173 132 49 119 54 96 45 78 73 64 159 120 22 20 154 111 117 58 56 109 72 143 ^'}}, - {OUT=>'77DD2A4482705BC2E9DC96EC0A13395771AC850C'}], - ['161', {IN=> {f=> '372 1 136 146 144 170 90 15 169 180 88 41 89 10 60 52 92 145 21 155 47 42 61 26 18 176 48 21 124 141 40 179 178 114 143 14 164 71 142 132 11 124 23 39 82 114 84 57 163 130 127 89 133 16 138 151 130 160 34 70 78 161 64 92 112 110 72 175 102 138 179 173 159 59 19 27 18 53 92 22 65 156 170 57 104 86 126 148 118 155 78 43 63 90 48 80 168 142 68 12 39 174 69 168 147 118 96 34 129 35 75 5 107 60 170 180 147 85 3 133 75 95 152 71 175 43 94 178 50 144 16 46 101 46 165 45 68 163 38 172 5 138 61 85 62 177 76 36 167 19 53 151 66 66 97 3 100 164 12 98 131 70 109 162 161 156 142 14 105 27 141 9 178 81 50 113 110 131 37 16 79 12 34 37 167 173 10 152 7 81 140 158 26 136 82 50 172 154 45 160 31 122 167 142 9 150 125 51 54 125 174 10 124 51 177 81 173 69 109 8 22 155 19 86 62 149 33 37 108 34 96 29 174 133 167 50 54 66 130 9 1 36 134 108 65 97 126 56 163 71 83 88 10 1 8 178 22 6 112 169 116 89 43 153 40 146 85 31 89 74 154 137 28 115 117 122 108 98 8 27 110 103 176 17 20 27 77 10 93 145 80 17 143 165 76 69 78 102 20 91 171 95 29 115 176 166 109 39 23 70 83 29 148 67 163 161 33 4 15 46 42 2 69 104 53 33 160 64 33 155 14 131 160 59 78 71 19 176 107 65 38 82 55 40 56 40 115 84 29 25 44 68 104 176 76 64 123 18 25 136 23 6 171 31 30 30 58 14 13 72 57 14 41 177 ^'}}, - {OUT=>'EAA1465DB1F59DE3F25EB8629602B568E693BB57'}], - ['162', {IN=> {f=> '363 0 135 69 16 167 79 143 46 178 26 3 65 58 36 135 97 35 175 51 152 57 137 173 108 10 54 78 4 153 173 164 48 177 22 129 68 168 167 74 174 91 106 174 96 75 129 168 34 36 158 147 88 75 101 149 103 64 42 59 52 112 180 20 30 22 173 80 98 46 106 179 65 30 17 127 125 26 87 15 5 136 85 100 66 141 182 124 15 156 148 15 56 98 146 156 48 149 3 14 96 52 79 115 134 170 54 178 54 22 73 30 45 39 133 182 96 103 148 176 6 45 62 183 51 180 153 145 145 117 21 90 118 109 21 62 22 101 49 53 11 142 86 132 66 69 44 79 87 115 55 5 169 150 63 110 109 177 150 91 129 40 149 159 102 165 3 70 27 175 23 56 126 165 164 20 158 91 157 136 157 131 111 69 39 33 132 43 19 175 179 37 118 9 155 116 122 128 52 7 84 89 58 13 85 44 135 125 54 183 23 161 145 173 136 29 62 50 13 57 25 127 153 45 95 64 121 40 121 140 171 9 71 166 68 28 102 4 53 123 111 148 20 102 160 34 8 139 32 116 66 13 113 63 143 97 63 10 59 124 66 41 132 71 115 106 151 46 22 45 118 37 67 124 94 60 140 43 47 10 110 9 127 97 7 156 43 180 125 126 137 145 12 2 82 146 100 117 26 59 180 181 164 76 89 30 101 77 72 126 114 95 143 102 32 149 131 83 157 31 61 123 139 60 135 74 169 122 151 102 137 168 62 55 166 119 97 163 60 112 24 116 38 178 105 91 134 86 27 47 138 72 70 183 79 15 84 117 154 128 57 53 39 161 88 ^'}}, - {OUT=>'9329D5B40E0DC43AA25FED69A0FA9C211A948411'}], - ['163', {IN=> {f=> '393 1 92 72 151 33 183 164 42 112 32 10 5 93 97 18 112 71 92 168 116 179 186 65 137 68 134 3 82 9 19 121 148 65 160 173 158 167 90 66 180 172 99 86 83 86 26 16 10 135 23 81 137 125 17 19 25 183 73 7 104 185 79 165 119 119 176 59 75 18 5 59 132 26 21 127 119 80 94 83 52 61 24 44 4 50 55 115 29 70 140 99 159 130 54 15 42 89 114 173 28 50 16 33 53 47 58 180 19 64 78 49 30 186 104 32 44 157 85 1 149 85 97 114 77 63 58 50 89 80 21 36 84 72 60 152 25 87 108 15 138 54 106 77 97 23 42 55 149 181 62 106 43 132 31 138 111 176 93 40 10 96 128 105 114 43 98 4 146 20 107 120 14 113 181 101 1 19 155 113 57 64 117 131 6 22 186 138 184 36 61 29 36 175 107 6 61 81 114 20 180 42 169 102 26 73 80 151 153 68 4 11 98 139 6 175 34 146 93 154 88 128 139 79 35 2 135 119 46 129 91 86 179 51 18 169 141 108 49 103 46 72 21 70 49 64 151 96 185 175 130 111 85 58 32 101 40 101 131 136 139 170 70 10 169 175 73 41 69 177 45 47 92 145 11 155 22 22 56 21 13 166 48 21 109 131 40 174 178 104 128 9 149 51 132 122 173 119 23 24 67 109 74 32 158 110 117 74 123 6 118 151 130 150 167 34 55 58 146 54 72 112 105 57 160 82 123 159 153 159 39 19 7 8 33 87 12 50 146 150 37 104 71 126 133 108 145 68 38 38 90 43 75 148 122 43 2 39 154 54 163 147 113 91 29 109 35 75 182 87 35 155 170 127 80 185 118 60 95 142 71 165 28 84 168 25 144 178 31 81 41 160 25 53 143 ^'}}, - {OUT=>'E94C0B6AA62AA08C625FAF817DDF8F51EC645273'}], - ['164', {IN=> {f=> '381 1 14 172 163 130 45 69 46 145 36 36 151 169 13 135 42 26 81 153 76 148 178 90 131 30 101 162 161 132 142 14 89 3 141 175 146 65 26 89 94 99 187 8 55 162 2 13 143 173 2 120 173 41 132 150 2 112 42 18 140 130 37 128 23 106 159 118 167 150 101 11 30 109 150 184 124 19 169 73 165 53 109 158 172 147 11 46 38 149 25 21 92 184 64 179 158 133 135 34 38 58 114 9 183 4 118 76 49 89 102 40 163 47 75 80 176 175 8 154 14 180 104 153 84 89 11 129 8 138 85 181 73 66 154 121 20 115 93 114 108 82 182 19 86 103 176 183 186 177 53 10 69 137 56 1 135 141 68 69 54 86 12 75 171 87 187 107 144 150 93 23 7 70 83 29 140 67 139 153 183 178 189 30 18 2 29 72 29 33 160 56 9 123 164 107 136 19 70 31 177 152 99 57 38 66 55 32 32 24 83 60 21 1 36 52 80 168 44 32 115 184 25 120 181 172 155 189 22 30 26 180 5 64 49 188 1 28 111 57 176 167 67 131 22 160 186 169 65 34 30 117 91 17 163 39 134 57 137 155 90 170 42 78 170 141 167 158 42 177 22 129 68 168 143 74 150 85 82 174 78 63 111 156 28 12 158 141 76 57 77 125 79 40 12 59 52 88 156 20 24 182 149 56 92 46 106 167 59 189 121 119 14 81 15 165 136 79 100 42 117 182 118 175 138 124 3 50 74 134 156 36 143 181 180 96 22 61 97 134 164 24 166 30 10 61 6 33 9 115 176 84 97 142 152 15 50 165 45 168 135 133 127 93 15 66 94 91 9 32 16 95 37 29 171 118 68 108 66 63 20 55 186 ^'}}, - {OUT=>'7FF02B909D82AD668E31E547E0FB66CB8E213771'}], - ['165', {IN=> {f=> '396 1 97 10 5 160 132 18 83 73 159 141 55 120 31 131 141 102 138 3 52 9 148 189 56 99 165 146 2 140 64 157 100 121 113 102 24 21 24 123 16 10 139 152 19 109 146 116 122 92 43 7 75 62 49 170 58 26 117 125 45 147 5 125 136 155 118 2 26 50 161 21 182 127 153 45 68 19 121 22 94 104 144 166 35 166 23 176 75 188 53 114 93 148 177 66 151 16 156 121 180 98 48 179 95 63 107 97 45 1 23 97 57 23 132 53 79 97 124 19 188 18 118 37 22 106 94 60 122 25 47 176 110 184 109 79 164 120 43 153 89 90 128 109 12 168 64 110 82 117 192 41 171 163 164 76 53 12 101 68 54 117 78 59 143 84 32 122 104 65 148 31 52 123 130 24 135 38 151 95 142 93 101 159 62 37 148 110 70 127 51 85 181 89 11 142 105 91 107 50 27 29 102 36 43 165 79 6 84 99 118 128 30 26 3 143 17 68 66 139 187 15 165 158 24 88 20 179 174 81 79 18 106 47 74 150 104 179 162 59 131 62 116 166 82 184 188 97 136 41 136 167 140 143 175 72 42 174 148 75 74 71 86 14 16 191 117 11 63 119 119 186 182 13 171 49 182 80 167 73 147 119 107 164 41 57 181 168 29 114 26 184 121 101 80 76 65 34 49 24 44 191 38 25 91 5 58 140 99 153 124 54 184 42 83 108 155 4 20 191 3 29 35 40 180 7 40 66 25 12 180 86 26 38 139 73 1 137 79 85 102 71 39 28 44 77 56 190 12 66 72 30 152 7 87 84 190 126 48 100 77 91 186 36 31 143 163 50 94 25 126 1 114 105 170 93 22 173 90 116 87 96 19 74 4 122 183 83 120 177 113 169 181 77 182 1 149 186 ^'}}, - {OUT=>'5BB3570858FA1744123BAC2873B0BB9810F53FA1'}], - ['166', {IN=> {f=> '384 1 25 56 85 107 177 6 186 138 184 28 61 184 191 175 107 6 29 81 114 12 156 2 137 86 189 73 64 127 129 44 167 11 98 107 169 143 26 146 61 130 88 120 139 55 3 189 119 87 22 105 67 78 147 51 2 161 109 84 49 87 38 48 192 62 25 64 143 72 169 151 106 111 53 58 8 93 8 85 123 120 131 170 38 2 169 167 49 41 37 153 21 39 92 145 190 155 177 185 48 13 5 150 48 21 85 115 40 166 178 88 104 1 125 19 116 106 141 111 23 43 101 58 187 150 78 101 50 107 185 86 151 130 134 143 34 31 26 122 38 40 112 97 33 136 50 99 127 121 159 7 19 170 187 1 79 191 26 130 118 5 104 47 126 109 92 129 52 30 193 90 35 67 116 90 3 181 39 122 30 155 147 105 83 21 77 35 75 174 55 190 131 154 95 72 185 94 36 95 126 71 149 4 68 152 180 144 146 7 49 33 152 188 29 111 194 172 148 125 35 59 36 125 11 36 141 149 183 125 27 1 71 133 61 138 168 85 131 5 96 162 161 117 142 14 79 183 141 165 126 55 11 74 84 79 167 3 40 142 177 193 128 173 192 100 163 16 127 145 182 97 17 193 120 115 32 108 18 96 154 103 152 150 86 181 15 99 135 179 124 194 164 68 160 43 109 138 152 142 6 21 23 149 20 11 82 164 44 159 148 133 115 24 28 53 104 9 183 179 108 56 39 84 87 30 163 32 70 75 166 170 8 139 9 175 99 143 64 89 186 114 183 133 85 161 63 61 154 111 15 115 78 109 108 72 177 14 71 103 176 173 176 157 38 10 54 132 41 186 130 126 63 69 39 76 7 65 171 82 172 102 124 140 83 113 ^'}}, - {OUT=>'905F43940B3591CE39D1145ACB1ECA80AB5E43CD'}], - ['167', {IN=> {f=> '396 1 189 70 83 29 132 67 115 145 151 170 181 14 192 2 187 40 5 33 160 48 183 91 132 83 112 177 62 189 153 128 91 49 38 50 55 24 8 8 51 36 13 175 28 36 56 160 12 107 168 25 104 157 156 139 165 14 30 192 164 195 56 41 180 159 28 79 41 144 167 51 115 188 136 154 145 65 2 22 93 83 191 147 23 110 57 137 131 66 138 26 78 146 125 159 150 34 177 22 129 68 168 111 74 118 77 50 174 54 47 87 140 20 178 158 133 60 33 45 93 47 8 170 59 52 56 124 20 16 150 117 24 84 46 106 151 51 158 173 113 111 196 73 15 133 136 71 100 10 85 182 110 143 114 92 185 42 42 118 156 20 135 173 156 96 180 37 73 134 156 182 150 196 192 45 172 17 167 91 168 68 89 134 120 190 173 34 141 37 152 111 117 103 61 7 34 62 67 191 190 8 87 21 195 139 86 44 76 66 55 186 23 31 87 183 5 155 122 191 68 53 149 136 35 115 26 121 131 102 123 3 42 197 133 179 56 84 165 136 190 130 49 157 80 101 103 97 197 11 19 118 1 5 119 137 9 104 193 141 116 122 72 38 7 70 47 44 155 43 16 107 125 40 127 193 105 131 145 108 185 6 50 141 1 167 127 153 45 53 192 121 12 79 84 129 151 15 166 196 156 60 188 53 109 83 148 162 46 146 6 136 111 160 88 38 169 85 63 87 97 35 194 3 82 52 13 132 43 59 92 109 4 178 3 118 37 195 96 94 60 112 15 47 166 110 179 99 69 149 100 43 138 69 70 123 89 12 158 54 90 72 117 182 31 166 153 164 76 33 2 101 63 44 112 58 39 143 74 32 107 89 55 143 31 47 123 125 4 135 18 141 80 137 88 81 154 187 ^'}}, - {OUT=>'336C79FBD82F33E490C577E3F791C3CBFE842AFF'}], - ['168', {IN=> {f=> '406 0 23 134 103 49 99 44 64 160 68 190 114 105 91 86 22 27 15 74 8 22 151 79 199 84 85 90 128 9 5 175 129 17 40 59 125 187 194 144 151 3 60 6 158 153 67 58 18 99 19 53 129 90 179 134 52 124 55 95 138 82 170 167 69 122 13 108 160 119 115 161 51 14 167 120 47 60 57 86 16 184 96 197 42 98 112 165 154 199 157 21 168 52 146 66 126 119 93 150 20 36 153 140 194 93 26 156 114 80 80 55 44 13 35 24 44 191 24 190 63 177 44 140 99 146 117 54 163 42 76 101 134 176 185 177 168 1 21 19 180 193 12 52 197 191 173 65 19 31 118 59 1 123 72 71 88 64 11 193 37 63 28 169 184 45 72 195 152 186 87 56 176 112 41 93 77 84 158 29 3 136 142 36 80 4 119 166 86 98 163 93 1 145 83 102 66 75 191 46 4 94 155 55 120 149 113 148 181 49 175 180 142 87 5 51 65 92 167 196 186 138 184 23 61 164 171 175 107 6 9 81 114 7 141 177 117 76 174 73 54 112 114 29 152 11 98 87 154 123 21 146 41 115 88 115 139 40 183 189 109 67 7 90 52 73 127 51 192 156 89 69 49 77 33 33 182 57 10 64 138 57 159 136 91 111 33 58 193 88 188 75 118 110 126 170 18 197 169 162 34 41 17 138 6 34 92 145 185 155 157 170 43 8 140 48 21 70 105 40 161 178 78 89 196 110 199 106 96 121 106 23 185 28 96 48 167 145 58 91 35 97 180 66 151 130 124 128 34 16 6 107 28 20 112 92 18 121 30 84 107 101 159 187 19 155 182 181 74 186 11 120 98 185 104 32 126 94 82 119 42 25 173 90 30 62 96 70 178 176 39 102 15 150 147 100 78 16 57 35 75 169 35 170 116 144 75 146 ^'}}, - {OUT=>'5C6D07A6B44F7A75A64F6CE592F3BAE91E022210'}], - ['169', {IN=> {f=> '409 1 185 70 12 95 110 71 133 183 52 136 148 144 114 186 17 25 144 164 5 79 178 172 124 117 19 43 20 93 174 36 125 117 151 109 3 164 55 101 37 122 152 77 131 168 88 162 161 93 142 14 63 167 141 149 94 39 190 50 68 47 135 198 16 110 153 177 104 173 192 68 147 179 119 137 166 73 180 169 88 91 24 76 10 80 146 79 128 150 62 149 194 83 111 171 124 170 156 60 152 27 109 106 120 134 201 184 202 149 12 198 66 132 12 127 132 133 83 8 12 45 88 9 183 155 92 24 23 76 63 14 163 8 62 67 150 162 8 115 1 167 91 127 32 89 162 90 159 125 85 129 47 53 154 95 7 115 54 101 108 56 169 6 47 103 176 157 160 125 14 10 30 124 17 178 122 102 55 69 15 60 202 49 171 74 148 94 92 124 67 200 184 70 83 29 127 67 100 140 131 165 176 4 182 2 167 20 193 33 160 43 173 71 112 68 97 157 57 169 138 113 86 44 38 40 55 19 196 201 31 21 8 165 23 26 41 155 195 183 102 158 25 94 142 146 129 150 9 30 177 154 195 51 36 175 139 28 59 31 124 167 41 105 173 121 134 130 65 185 17 78 78 181 137 13 95 57 137 116 51 118 16 78 131 115 154 145 29 177 22 129 68 168 91 74 98 72 30 174 39 37 72 130 15 163 158 128 50 18 25 73 27 191 150 59 52 36 104 20 11 130 97 4 79 46 106 141 46 138 163 108 106 191 68 15 113 136 66 100 193 65 182 105 123 99 72 180 37 22 108 156 10 130 168 141 96 160 22 58 134 151 162 140 181 187 35 157 7 147 76 163 58 84 129 100 190 153 24 126 32 142 96 107 88 41 2 14 42 52 186 170 3 82 11 180 119 66 29 56 66 50 171 3 11 77 163 5 150 112 128 ^'}}, - {OUT=>'7E0D3E9D33127F4A30EB8D9C134A58409FA8695B'}], - ['170', {IN=> {f=> '413 1 47 25 135 129 7 108 19 107 117 102 102 3 28 190 112 165 56 63 165 122 183 116 28 157 52 73 89 90 169 202 12 111 185 203 91 116 200 97 193 134 116 122 44 31 7 63 26 37 134 22 2 93 125 33 99 186 77 124 131 94 171 183 50 113 178 146 127 153 45 32 164 121 203 58 56 108 130 192 166 168 128 39 188 53 102 69 148 141 18 139 197 108 97 132 74 24 155 71 63 59 97 21 194 180 61 45 204 132 29 31 85 88 188 164 187 118 37 167 82 94 60 98 1 47 152 110 172 85 55 128 72 43 117 41 42 116 61 12 144 40 62 58 117 168 17 159 139 164 76 5 193 101 56 30 105 30 11 143 60 32 86 68 41 136 31 40 123 118 181 135 195 127 59 130 81 53 147 62 13 124 98 34 79 39 49 145 53 180 94 105 91 71 2 27 5 54 193 7 141 79 199 84 75 70 128 199 195 160 119 17 20 54 115 187 184 129 146 193 40 201 143 138 57 43 18 94 204 38 114 80 179 114 47 119 50 80 118 82 160 152 49 112 198 88 155 104 95 151 36 199 162 100 27 50 47 86 195 16 179 81 192 27 83 107 150 134 194 147 1 158 32 131 61 111 119 83 140 5 21 133 120 174 78 26 136 109 65 80 40 29 203 25 24 44 191 14 170 43 162 34 140 99 141 112 54 148 42 71 96 119 161 165 167 148 186 11 4 180 188 197 42 182 181 168 50 14 26 103 49 1 113 67 61 78 59 196 173 32 53 8 154 169 30 72 175 152 176 87 36 166 102 36 88 77 79 138 24 188 131 127 26 70 194 114 146 66 93 158 93 191 125 78 92 51 60 176 26 4 74 135 35 120 129 113 133 181 29 170 170 137 77 190 46 45 77 157 191 186 138 184 18 61 144 151 175 107 6 194 81 114 2 126 110 ^'}}, - {OUT=>'9A5F50DFCFB19286206C229019F0ABF25283028C'}], - ['171', {IN=> {f=> '427 1 85 60 150 73 38 88 90 5 128 11 98 55 130 91 13 146 9 91 88 107 139 16 159 189 93 35 191 66 28 65 95 51 184 148 57 45 49 61 25 9 166 49 194 64 130 33 143 112 67 111 1 58 177 80 164 59 110 94 118 170 194 197 169 154 10 41 193 114 190 26 92 145 177 155 125 146 35 200 124 48 21 46 89 40 153 178 62 65 196 86 175 90 80 89 98 23 169 4 88 32 135 137 26 75 11 81 172 34 151 130 108 104 34 200 182 83 12 196 112 84 202 97 206 60 75 69 159 163 19 131 174 157 66 178 195 104 66 161 104 8 126 70 66 103 26 17 141 90 22 54 64 38 146 168 39 70 199 142 147 92 70 8 25 35 75 161 3 138 92 128 43 59 185 55 205 95 100 71 123 173 42 126 128 144 94 176 205 20 139 149 198 59 168 172 109 112 9 33 10 73 154 36 115 97 131 99 196 144 45 81 22 112 142 72 131 148 83 162 161 78 142 14 53 157 141 139 74 29 180 35 58 27 115 198 1 90 138 167 89 173 192 48 137 159 114 132 156 58 160 154 68 76 19 56 5 70 141 64 113 150 47 129 184 73 96 166 124 155 151 55 147 17 109 86 100 129 201 164 192 149 7 193 56 112 200 107 122 133 63 206 2 40 78 9 183 140 82 4 13 71 48 4 163 201 57 62 140 157 8 100 204 162 86 117 12 89 147 75 144 120 85 109 37 48 154 85 2 115 39 96 108 46 164 1 32 103 176 147 150 105 207 10 15 119 2 173 117 87 50 69 50 202 39 171 69 133 89 72 114 57 195 179 70 83 29 122 67 85 135 111 160 171 202 172 2 147 183 33 160 38 163 51 92 53 82 137 52 149 123 98 81 39 38 30 55 14 186 196 11 6 3 155 18 16 26 150 180 168 97 148 25 84 127 136 119 135 4 30 162 144 195 46 31 170 119 28 190 ^'}}, - {OUT=>'DCA737E269F9D8626D488988C996E06B352C0708'}], - ['172', {IN=> {f=> '443 1 17 96 167 27 91 152 100 106 109 65 164 10 57 71 167 123 209 74 57 137 95 30 90 2 78 110 101 147 138 22 177 22 129 68 168 63 74 70 65 2 174 18 23 51 116 8 142 158 121 36 207 207 45 209 170 122 59 52 8 76 20 4 102 69 186 72 46 106 127 39 110 149 101 99 184 61 15 85 136 59 100 172 37 182 98 95 78 44 173 30 204 94 156 206 123 161 120 96 132 1 37 134 144 134 126 160 180 21 136 203 119 55 156 44 77 122 72 190 125 10 105 25 128 75 93 67 13 205 196 14 31 179 142 206 75 207 159 91 38 8 28 66 43 150 185 193 63 135 5 143 98 143 32 5 125 124 197 103 14 97 107 102 87 3 18 185 97 155 56 48 165 112 178 106 13 157 32 53 79 85 149 197 7 106 175 203 71 101 195 92 193 129 116 122 24 26 7 58 11 32 119 7 202 83 125 28 79 181 57 119 121 84 161 168 50 93 163 131 127 153 45 17 144 121 198 43 36 93 115 177 166 148 108 24 188 53 97 59 148 126 208 134 192 88 87 112 64 14 145 61 63 39 97 11 194 165 46 40 199 132 19 11 80 73 178 154 177 118 37 147 72 94 60 88 201 47 142 110 167 75 45 113 52 43 102 21 22 111 41 12 134 30 42 48 117 158 7 154 129 164 76 195 188 101 51 20 100 10 201 143 50 32 71 53 31 131 31 35 123 113 166 135 180 117 44 125 76 33 142 62 3 114 93 19 59 34 34 130 38 170 74 105 91 56 192 27 205 34 178 202 131 79 199 84 65 50 128 189 185 145 109 17 49 105 187 174 114 141 183 20 196 128 123 47 28 18 89 189 23 99 70 179 94 42 114 45 65 98 82 150 137 29 102 183 68 150 89 75 141 21 184 157 80 7 40 37 86 190 16 174 66 187 12 68 102 135 114 189 137 191 148 12 116 56 96 119 73 130 200 6 113 100 154 63 26 116 104 50 80 25 14 193 83 ^'}}, - {OUT=>'B8FFC1D4972FCE63241E0E77850AC46DDE75DBFA'}], - ['173', {IN=> {f=> '436 1 24 44 191 211 138 11 138 18 140 99 133 104 54 124 42 63 88 95 137 133 151 116 162 208 193 180 180 173 26 158 165 160 26 6 18 79 33 1 97 59 45 62 51 172 141 24 37 189 130 145 6 72 143 152 160 87 4 150 86 28 80 77 71 106 16 164 123 103 10 54 178 106 114 34 85 150 93 175 93 70 76 27 36 152 207 4 42 103 3 120 97 113 109 181 210 162 154 129 61 166 38 13 53 141 183 186 138 184 10 61 112 119 175 107 6 170 81 114 207 102 125 65 50 135 73 28 73 75 203 113 11 98 35 115 71 8 146 202 76 88 102 139 1 144 189 83 15 181 51 13 60 75 51 179 143 37 30 49 51 20 207 156 44 184 64 125 18 133 97 52 111 194 58 167 75 149 49 105 84 113 170 179 197 169 149 208 41 178 99 180 21 92 145 172 155 105 131 30 208 200 114 48 21 31 79 40 148 178 52 50 196 71 160 80 70 69 93 23 159 202 83 22 115 132 6 65 209 71 167 14 151 130 98 89 34 190 167 68 2 181 112 79 192 82 191 45 55 49 159 148 19 116 169 142 61 173 185 94 46 146 104 206 126 55 56 93 16 12 121 90 17 49 44 18 126 163 39 50 189 137 147 87 65 3 5 35 75 156 196 118 77 118 23 54 185 40 195 95 90 71 113 163 32 116 108 144 74 166 190 15 134 134 188 39 158 172 94 107 212 23 53 134 36 105 77 111 89 186 124 35 61 7 102 132 67 131 128 78 162 161 63 142 14 43 147 141 129 54 19 170 20 48 7 95 198 199 70 123 157 74 173 192 28 127 139 109 127 146 43 140 139 48 61 14 36 60 136 49 98 150 32 109 174 63 81 161 124 140 146 50 142 7 109 66 80 124 201 144 182 149 2 188 46 92 185 87 112 133 43 201 205 35 68 9 183 125 72 197 3 66 33 207 163 191 52 57 130 152 8 85 204 157 81 107 205 187 ^'}}, - {OUT=>'E9C9BF41C8549354151B977003CE1D830BE667DB'}], - ['174', {IN=> {f=> '462 1 126 54 123 113 85 81 23 41 154 71 210 115 18 89 108 32 157 209 11 103 176 133 136 77 193 10 209 112 196 166 110 66 43 69 194 36 202 25 171 62 112 82 44 100 43 188 172 70 83 29 115 67 64 128 83 153 164 195 158 2 119 187 169 33 160 31 149 23 64 32 61 109 45 121 102 77 74 32 38 16 55 7 172 189 198 200 211 141 11 2 5 143 159 147 90 134 25 70 106 122 105 114 212 30 141 130 195 39 24 163 91 28 11 7 76 167 17 81 137 85 86 94 65 149 5 42 66 157 113 204 59 57 137 80 15 70 207 78 95 91 142 133 17 177 22 129 68 168 43 74 50 60 197 174 3 13 36 106 3 127 158 116 26 197 192 25 194 155 102 59 52 203 56 20 214 82 49 171 67 46 106 117 34 90 139 96 94 179 56 15 65 136 54 100 157 17 182 93 75 63 24 168 25 189 84 156 201 118 156 105 96 112 201 22 134 139 114 116 145 175 11 121 198 99 40 151 34 72 117 52 190 105 90 20 118 60 83 52 208 205 181 209 16 174 122 206 70 202 144 71 18 208 8 66 38 135 170 178 53 115 5 138 88 123 17 200 115 119 182 98 9 87 97 102 72 3 8 180 82 145 56 33 165 102 173 96 213 157 12 33 69 80 129 192 2 101 165 203 51 86 190 87 193 124 116 122 4 21 7 53 211 27 104 207 197 73 125 23 59 176 37 114 111 74 151 153 50 73 148 116 127 153 45 2 124 121 193 28 16 78 100 162 166 128 88 9 188 53 92 49 148 111 193 129 187 68 77 92 54 4 135 51 63 19 97 1 194 150 31 35 194 132 9 206 75 58 168 144 167 118 37 127 62 94 60 78 196 47 132 110 162 65 35 98 32 43 87 1 2 106 21 12 124 20 22 38 117 148 212 149 119 164 76 180 183 101 46 10 95 205 186 143 40 32 56 38 21 126 31 30 123 108 151 135 165 107 29 120 71 13 137 62 208 104 88 4 39 29 19 115 23 160 54 105 91 41 177 27 200 14 163 124 ^'}}, - {OUT=>'0942908960B54F96CB43452E583F4F9CB66E398A'}], - ['175', {IN=> {f=> '453 0 115 79 199 84 49 18 128 173 169 121 93 17 186 41 89 187 158 90 133 167 206 188 104 99 31 4 18 81 165 217 75 54 179 62 34 106 37 41 66 82 134 113 215 86 159 36 142 65 43 125 215 160 149 48 193 24 21 86 182 16 166 42 179 206 44 94 111 82 181 121 167 132 198 92 48 72 119 57 114 184 200 81 68 122 39 26 84 96 26 80 1 208 177 217 24 44 191 206 118 209 123 8 140 99 128 99 54 109 42 58 83 80 122 113 141 96 147 203 183 180 175 158 16 143 155 155 11 1 13 64 23 1 87 54 35 52 46 157 121 19 27 174 115 130 209 72 123 152 150 87 202 140 76 23 75 77 66 86 11 149 118 88 44 168 101 94 14 80 145 93 165 73 65 66 12 21 137 192 4 22 83 201 120 77 113 94 181 195 157 144 124 51 151 33 211 38 131 178 186 138 184 5 61 92 99 175 107 6 155 81 114 207 87 105 45 40 120 73 18 58 60 193 98 11 98 15 100 51 3 146 187 61 88 97 139 204 129 189 73 213 171 36 216 55 55 51 174 138 17 15 49 41 15 197 146 39 174 64 120 3 123 82 37 111 179 58 157 70 134 39 100 74 108 170 164 197 169 144 198 41 163 84 170 16 92 145 167 155 85 116 25 208 200 104 48 21 16 69 40 143 178 42 35 196 56 145 70 60 49 88 23 149 192 78 12 95 127 204 55 199 61 162 212 151 130 88 74 34 180 152 53 210 166 112 74 182 67 176 30 35 29 159 133 19 101 164 127 56 168 175 84 26 131 104 196 126 40 46 83 6 7 101 90 12 44 24 216 106 158 39 30 179 132 147 82 60 216 203 35 75 151 181 98 62 108 3 49 185 25 185 95 80 71 103 153 22 106 88 144 54 156 175 10 129 119 178 19 148 172 79 102 207 13 208 33 114 36 95 57 91 79 176 104 25 41 210 92 122 62 131 108 73 162 161 48 142 14 33 137 141 119 34 9 160 5 38 205 75 198 189 50 108 112 ^'}}, - {OUT=>'FCE34051C34D4B81B85DDC4B543CDE8007E284B3'}], - ['176', {IN=> {f=> '454 1 53 173 192 113 111 102 120 132 22 112 118 20 40 7 8 213 46 129 28 77 150 11 81 160 49 60 154 124 119 139 43 135 213 109 38 52 117 201 116 168 149 215 181 32 64 164 59 98 133 15 194 198 28 54 9 183 104 58 176 209 59 12 200 163 177 45 50 116 145 8 64 204 150 74 93 184 89 111 39 108 108 85 61 13 36 154 61 210 115 3 84 108 22 152 209 216 103 176 123 126 57 183 10 199 107 186 161 105 51 38 69 184 26 202 15 171 57 97 77 24 90 33 183 167 70 83 29 110 67 49 123 63 148 159 190 148 2 99 172 159 33 160 26 139 3 44 17 46 89 40 101 87 62 69 27 38 6 55 2 162 184 183 190 211 131 6 212 210 138 144 132 85 124 25 60 91 112 95 99 212 30 126 120 195 34 19 158 71 28 211 217 56 167 7 71 122 70 66 79 65 134 27 61 147 103 199 44 57 137 65 50 202 78 80 81 137 128 12 177 22 129 68 168 23 74 30 55 182 174 208 3 21 96 218 112 158 111 16 187 177 5 179 140 82 59 52 188 36 20 214 62 29 156 62 46 106 107 29 70 129 91 89 174 51 15 45 136 49 100 142 217 182 88 55 48 4 163 20 174 74 156 196 113 151 90 96 92 191 7 134 134 94 106 130 170 1 106 193 79 25 146 24 67 112 32 190 85 210 75 15 108 45 73 37 193 205 166 194 1 169 102 206 65 197 129 51 218 198 208 66 33 120 155 163 43 95 5 133 78 103 2 185 105 114 167 93 4 77 87 102 57 3 218 175 67 135 56 18 165 92 168 86 203 157 212 13 59 75 109 187 217 96 155 203 31 71 185 82 193 119 116 122 204 16 7 48 201 22 89 197 192 63 125 18 39 171 17 109 101 64 141 138 50 53 133 101 127 153 45 207 104 121 188 13 216 63 85 147 166 108 68 214 188 53 87 39 148 96 178 124 182 48 67 72 44 214 125 41 63 219 97 211 194 135 16 30 189 132 219 191 70 43 158 181 ^'}}, - {OUT=>'61E8916532503627F4024D13884640A46F1D61D4'}], - ['177', {IN=> {f=> '475 0 153 118 37 99 48 94 60 64 189 47 118 110 155 51 21 77 4 43 66 195 196 99 215 12 110 6 216 24 117 134 205 142 105 164 76 159 176 101 39 218 88 184 165 143 26 32 35 17 7 119 31 23 123 101 130 135 144 93 8 113 64 207 130 62 201 90 81 205 11 22 220 94 2 146 26 105 91 20 156 27 193 208 142 178 107 79 199 84 41 2 128 165 161 109 85 17 174 37 81 187 150 78 129 159 194 184 92 87 23 214 18 77 153 209 63 46 179 46 30 102 33 29 50 82 126 101 203 78 147 20 138 53 27 117 207 148 145 32 181 16 13 86 178 16 162 30 175 198 32 90 99 66 177 113 155 124 186 80 44 60 119 49 106 176 192 65 52 106 27 26 68 92 14 80 211 200 169 213 24 44 191 202 102 197 111 140 99 124 95 54 97 42 54 79 68 110 97 133 80 135 199 175 180 171 146 8 131 147 151 221 219 9 52 15 1 79 50 27 44 42 145 105 15 19 162 103 118 201 72 107 152 142 87 190 132 68 19 71 77 62 70 7 137 114 76 214 36 160 97 78 220 76 141 93 157 57 61 58 9 125 180 4 6 67 189 120 61 113 82 181 183 153 136 120 43 139 29 199 26 123 174 186 138 184 1 61 76 83 175 107 6 143 81 114 207 75 89 29 32 108 73 10 46 48 185 86 11 98 221 88 35 221 146 175 49 88 93 139 196 117 189 65 201 163 24 208 51 39 51 170 134 1 3 49 33 11 189 138 35 166 64 116 213 115 70 25 111 167 58 149 66 122 31 96 66 104 170 152 197 169 140 190 41 151 72 162 12 92 145 163 155 69 104 21 208 200 96 48 21 4 61 40 139 178 34 23 196 44 133 62 52 33 84 23 141 184 74 4 79 123 192 47 191 53 158 200 151 130 80 62 34 172 140 41 206 154 112 70 174 55 164 18 19 13 159 121 19 89 160 115 52 164 167 76 10 119 104 188 126 28 38 75 220 3 85 90 8 40 8 204 90 154 39 14 171 128 147 78 56 216 191 35 75 147 169 82 50 100 209 45 185 13 177 95 150 ^'}}, - {OUT=>'F008D5D7853B6A17B7466CD9E18BD135E520FAF4'}], - ['178', {IN=> {f=> '471 0 71 89 139 8 92 60 144 26 142 154 3 122 98 164 216 134 172 58 95 200 224 201 5 86 36 81 29 63 65 162 76 11 13 196 78 108 55 131 80 66 162 161 27 142 14 19 123 141 105 6 220 146 209 24 184 47 198 175 22 87 133 38 173 192 205 103 91 97 115 122 7 92 103 25 2 213 213 36 124 13 62 150 221 61 150 39 45 149 124 104 134 38 130 208 109 18 32 112 201 96 158 149 215 176 22 44 149 39 88 133 220 189 193 23 44 9 183 89 48 161 204 54 222 195 163 167 40 45 106 140 8 49 204 145 69 83 169 89 96 24 93 103 85 41 3 31 154 51 210 115 213 79 108 12 147 209 206 103 176 113 116 37 173 10 189 102 176 156 100 36 33 69 174 16 202 5 171 52 82 72 4 80 23 178 162 70 83 29 105 67 34 118 43 143 154 185 138 2 79 157 149 33 160 21 129 208 24 2 31 69 35 81 72 47 64 22 38 221 55 222 152 179 168 180 211 121 1 207 200 133 129 117 80 114 25 50 76 102 85 84 212 30 111 110 195 29 14 153 51 28 196 212 36 167 222 61 107 55 46 64 65 119 220 12 56 137 93 194 29 57 137 50 210 30 197 78 65 71 132 123 7 177 22 129 68 168 3 74 10 50 167 174 198 218 6 86 218 97 158 106 6 177 162 210 164 125 62 59 52 173 16 20 214 42 9 141 57 46 106 97 24 50 119 86 84 169 46 15 25 136 44 100 127 202 182 83 35 33 209 158 15 159 64 156 191 108 146 75 96 72 181 217 134 129 74 96 115 165 216 91 188 59 10 141 14 62 107 12 190 65 205 60 10 98 30 63 22 178 205 151 179 211 164 82 206 60 192 114 31 203 188 193 66 28 105 140 148 33 75 5 128 68 83 212 170 95 109 152 88 224 67 77 102 42 3 213 170 52 125 56 3 165 82 163 76 193 157 197 218 49 70 89 182 217 91 145 203 11 56 180 77 193 114 116 122 189 11 7 43 191 17 74 187 187 53 125 13 19 166 222 104 91 54 131 123 50 33 118 86 127 167 ^'}}, - {OUT=>'BD8D2E873CF659B5C77AAC1616827EF8A3B1A3B3'}], - ['179', {IN=> {f=> '480 1 45 193 76 121 181 219 195 42 64 126 166 80 40 200 188 53 80 25 148 75 157 117 175 20 53 44 30 207 111 27 63 198 97 204 194 114 222 23 182 132 212 170 63 22 144 120 143 118 37 79 38 94 60 54 184 47 108 110 150 41 11 62 211 43 51 180 181 94 200 12 100 223 201 14 117 124 200 137 95 164 76 144 171 101 34 213 83 169 150 143 16 32 20 2 224 114 31 18 123 96 115 135 129 83 220 108 59 192 125 62 196 80 76 195 218 17 210 79 214 136 6 105 91 5 141 27 188 193 127 168 97 79 199 84 31 209 128 155 151 94 75 17 159 32 71 187 140 63 124 149 179 179 77 72 13 204 18 72 138 199 48 36 179 26 25 97 28 14 30 82 116 86 188 68 132 133 38 7 107 197 133 140 12 166 6 3 86 173 16 157 15 170 188 17 85 84 46 172 103 140 114 171 65 39 45 119 39 96 166 182 45 32 86 12 26 48 87 226 80 201 190 159 208 24 44 191 197 82 182 96 217 140 99 119 90 54 82 42 49 74 53 95 77 123 60 120 194 165 180 166 131 225 116 137 146 211 219 4 37 5 1 69 45 17 34 37 130 85 10 9 147 88 103 191 72 87 152 132 87 175 122 58 14 66 77 57 50 2 122 109 61 209 26 150 92 58 205 71 136 93 147 37 56 48 212 221 110 165 4 213 47 174 120 41 113 67 181 168 148 126 115 33 124 24 184 11 113 169 186 138 184 223 61 56 63 175 107 6 128 81 114 207 60 69 9 22 93 73 31 33 175 71 11 98 206 73 15 221 146 160 34 88 88 139 186 102 189 55 186 153 9 198 46 19 51 165 129 208 215 49 23 6 179 128 30 156 64 111 203 105 55 10 111 152 58 139 61 107 21 91 56 99 170 137 197 169 135 180 41 136 57 152 7 92 145 158 155 49 89 16 208 200 86 48 21 216 51 40 134 178 24 8 196 29 118 52 42 13 79 23 131 174 69 221 59 118 177 37 181 43 153 185 151 130 70 47 34 162 125 26 201 139 112 65 164 40 149 3 226 220 159 106 19 74 155 100 47 159 157 193 ^'}}, - {OUT=>'B25A04DD425302ED211A1C2412D2410FA10C63B6'}], - ['180', {IN=> {f=> '471 0 211 98 104 174 126 7 24 61 213 225 57 90 1 33 209 183 62 147 39 215 157 121 147 71 49 216 170 35 75 140 148 54 29 86 188 38 185 221 163 95 58 71 81 131 84 44 144 10 134 142 228 118 86 156 204 126 172 46 91 196 220 197 218 70 36 73 13 47 57 154 60 3 226 188 70 100 51 131 64 62 162 161 15 142 14 11 115 141 97 219 216 138 201 16 172 31 198 167 6 75 125 26 173 192 193 95 75 93 111 114 224 76 91 213 13 227 201 213 28 120 1 50 150 213 45 142 31 33 145 124 92 130 34 126 204 109 2 16 108 201 80 150 149 215 172 14 28 137 23 80 133 208 185 189 19 36 9 183 77 40 149 200 50 214 191 163 159 36 41 98 136 8 37 204 141 65 75 157 89 84 12 81 99 85 25 224 27 154 43 210 115 205 75 108 4 143 209 198 103 176 105 108 21 165 10 181 98 168 152 96 24 29 69 166 8 202 226 171 48 70 68 217 72 15 174 158 70 83 29 101 67 22 114 27 139 150 181 130 2 63 145 141 33 160 17 121 196 8 219 19 53 31 65 60 35 60 18 38 217 55 222 144 175 156 172 211 113 226 203 192 129 117 105 76 106 25 42 64 94 77 72 212 30 99 102 195 25 10 149 35 28 184 208 20 167 218 53 95 43 30 52 65 107 220 52 129 85 190 17 57 137 38 202 14 193 78 53 63 128 119 3 177 22 129 68 168 216 74 223 46 155 174 190 214 223 78 218 85 158 102 227 169 150 198 152 113 46 59 52 161 20 214 26 222 129 53 46 106 89 20 34 111 82 80 165 42 15 9 136 40 100 115 190 182 79 19 21 197 154 11 147 56 156 187 104 142 63 96 56 173 209 134 125 58 88 103 161 212 79 184 43 227 137 6 58 103 225 190 49 201 48 6 90 18 55 10 166 205 139 167 203 160 66 206 56 188 102 15 191 180 181 66 24 93 128 136 25 59 5 124 60 67 204 158 87 105 140 84 224 59 69 102 30 3 209 166 40 117 56 220 165 74 159 68 185 157 185 206 41 66 167 ^'}}, - {OUT=>'A404E21588123E0893718B4B44E91414A785B91F'}], - ['181', {IN=> {f=> '490 1 176 217 85 133 203 218 38 174 71 193 108 116 122 171 5 7 37 179 11 56 175 181 41 125 7 226 160 204 98 79 42 119 105 50 9 100 68 127 153 45 185 60 121 177 211 183 30 52 114 166 64 24 192 188 53 76 17 148 63 145 113 171 4 45 28 22 203 103 19 63 186 97 200 194 102 214 19 178 132 208 158 59 10 136 112 135 118 37 63 30 94 60 46 180 47 100 110 146 33 3 50 199 43 39 168 169 90 188 12 92 219 189 6 117 116 196 133 87 164 76 132 167 101 30 209 79 157 138 143 8 32 8 221 220 110 31 14 123 92 103 135 117 75 212 104 55 180 121 62 192 72 72 187 206 13 202 67 206 128 221 105 91 224 129 27 184 181 115 160 89 79 199 84 23 197 128 147 143 82 67 17 147 28 63 187 132 51 120 141 167 175 65 60 5 196 18 68 126 191 36 28 179 10 21 93 24 2 14 82 108 74 176 60 120 215 129 26 222 99 189 121 136 227 154 229 226 86 169 16 153 3 166 180 5 81 72 30 168 95 128 106 159 53 35 33 119 31 88 158 174 29 16 70 26 32 83 218 80 193 182 151 204 24 44 191 193 66 170 84 213 140 99 115 86 54 70 42 45 70 41 83 61 115 44 108 190 157 180 162 119 221 104 129 142 203 219 25 228 1 61 41 9 26 33 118 69 6 1 135 76 91 183 72 71 152 124 87 163 114 50 10 62 77 53 34 229 110 105 49 205 18 142 88 42 193 67 132 93 139 21 52 40 204 213 98 153 4 201 31 162 120 25 113 55 181 156 144 118 111 25 112 20 172 230 105 165 186 138 184 223 61 40 47 175 107 6 116 81 114 207 48 53 224 14 81 73 223 19 21 167 59 11 98 194 61 230 221 146 148 22 88 84 139 178 90 189 47 174 145 228 190 42 3 51 161 125 196 207 49 15 2 171 120 26 148 64 107 195 97 43 229 111 140 58 131 57 95 13 87 48 95 170 125 197 169 131 172 41 124 45 144 3 92 145 154 155 33 77 12 208 200 78 48 21 208 43 40 130 178 16 227 196 17 106 44 34 228 75 23 123 166 65 217 43 114 165 29 173 35 200 ^'}}, - {OUT=>'A1E13BC55BF6DAD83CF3AABDA3287AD68681EA64'}], - ['182', {IN=> {f=> '479 0 167 151 130 58 29 34 150 107 8 195 121 112 59 152 22 131 218 208 202 159 88 19 56 149 82 41 153 145 54 199 86 104 166 126 228 16 53 209 225 41 90 230 29 197 171 46 143 39 203 149 117 147 67 45 216 158 35 75 136 136 38 17 78 176 34 185 213 155 95 50 71 73 123 225 76 28 144 227 126 130 228 114 74 148 192 118 172 34 87 192 216 193 206 54 36 65 230 31 49 146 44 228 214 180 62 92 47 131 48 58 162 161 3 142 14 3 107 141 89 207 212 130 193 8 160 15 198 159 223 63 117 14 173 192 181 87 59 89 107 106 216 60 79 201 1 227 189 213 20 116 222 38 150 205 29 134 23 21 141 124 80 126 30 122 200 109 219 104 201 64 142 149 215 168 6 12 125 7 72 133 196 181 185 15 28 9 183 65 32 137 196 46 206 187 163 151 32 37 90 132 8 25 204 137 61 67 145 89 72 69 95 85 9 220 23 154 35 210 115 197 71 108 229 139 209 190 103 176 97 100 5 157 10 173 94 160 148 92 12 25 69 158 202 222 171 44 58 64 205 64 7 170 154 70 83 29 97 67 10 110 11 135 146 177 122 2 47 133 133 33 160 13 113 184 225 211 7 37 27 49 48 23 56 14 38 213 55 222 136 171 144 164 211 105 226 199 184 125 105 93 72 98 25 34 52 86 69 60 212 30 87 94 195 21 6 145 19 28 172 204 4 167 214 45 83 31 14 40 65 95 220 221 48 121 77 186 5 57 137 26 194 231 189 78 41 55 124 115 232 177 22 129 68 168 204 74 211 42 143 174 182 210 215 70 218 73 158 98 223 161 138 186 140 101 30 59 52 149 217 20 214 10 210 117 49 46 106 81 16 18 103 78 76 161 38 15 226 136 36 100 103 178 182 75 3 9 185 150 7 135 48 156 183 100 138 51 96 40 165 201 134 121 42 80 91 157 208 67 180 27 219 133 231 54 99 213 190 33 197 36 2 82 6 47 231 154 205 127 155 195 156 50 206 52 184 90 232 179 172 169 66 20 81 116 124 17 43 5 120 52 51 196 146 79 101 128 80 224 65 ^'}}, - {OUT=>'D5FD35FFABED6733C92365929DF0FB4CAE864D15'}], - ['183', {IN=> {f=> '503 1 55 102 9 3 202 159 19 103 56 206 165 60 152 54 171 157 164 185 27 59 45 171 217 80 123 203 203 23 169 66 193 103 116 122 156 7 32 169 6 41 165 176 31 125 2 211 155 189 93 69 32 109 90 50 225 85 53 127 153 45 175 40 121 172 201 168 15 37 99 166 44 4 182 188 53 71 7 148 48 130 108 166 220 35 8 12 198 93 9 63 171 97 195 194 87 204 14 173 132 203 143 54 231 126 102 125 118 37 43 20 94 60 36 175 47 90 110 141 23 229 35 184 43 24 153 154 85 173 12 82 214 174 232 117 106 191 128 77 164 76 117 162 101 25 204 74 142 123 143 234 32 229 211 215 105 31 9 123 87 88 135 102 65 202 99 50 165 116 62 187 62 67 177 191 8 192 52 196 118 206 105 91 214 114 27 179 166 100 150 79 79 199 84 13 182 128 137 133 67 57 17 132 23 53 187 122 36 115 131 152 170 50 45 231 186 18 63 111 181 21 18 179 226 16 88 19 223 230 82 98 59 161 50 105 200 124 11 207 89 179 106 131 212 139 224 221 86 164 16 148 224 161 170 226 76 57 10 163 85 113 96 144 38 30 18 119 21 78 148 164 9 232 50 221 26 12 78 208 80 183 172 141 199 24 44 191 188 46 155 69 208 140 99 110 81 54 55 42 40 65 26 68 41 105 24 93 185 147 180 157 104 216 89 119 137 193 219 231 10 223 1 51 36 235 16 28 103 49 1 227 120 61 76 173 72 51 152 114 87 148 104 40 5 57 77 48 14 229 95 100 34 200 8 132 83 22 178 62 127 93 129 1 47 30 194 203 83 138 4 186 11 147 120 5 113 40 181 141 139 108 106 15 97 15 157 220 95 160 186 138 184 223 61 20 27 175 107 6 101 81 114 207 33 33 209 4 66 73 218 4 6 157 44 11 98 179 46 215 221 146 133 7 88 79 139 168 75 189 37 159 135 218 180 37 219 51 156 120 181 197 49 5 233 161 110 21 138 64 102 185 87 28 219 111 125 58 121 52 80 3 82 38 90 170 110 197 169 126 162 41 109 30 134 234 92 145 149 155 13 62 7 208 200 68 48 21 198 33 40 125 178 6 217 196 2 91 34 24 213 70 23 113 161 ^'}}, - {OUT=>'C12E9C280EE9C079E0506FF89F9B20536E0A83EF'}], - ['184', {IN=> {f=> '470 0 58 210 15 107 144 15 159 21 142 152 151 130 48 14 34 140 92 231 190 106 112 54 142 7 116 208 193 187 159 73 19 41 144 67 36 148 135 44 184 71 104 156 126 218 6 43 204 225 21 90 230 24 182 156 26 138 39 188 139 112 147 62 40 216 143 35 75 131 121 18 2 68 161 29 185 203 145 95 40 71 63 113 220 66 8 144 212 116 115 228 109 59 138 177 108 172 19 82 187 211 188 191 34 36 55 215 11 39 136 24 223 199 170 52 82 42 131 28 53 162 161 226 142 14 231 97 141 79 192 207 120 183 236 145 233 198 149 208 48 107 237 173 192 166 77 39 84 102 96 206 40 64 186 224 227 174 213 10 111 212 23 150 195 9 124 13 6 136 124 65 121 25 117 195 109 204 218 99 201 44 132 149 215 163 234 230 110 225 62 133 181 176 180 10 18 9 183 50 22 122 191 41 196 182 163 141 27 32 80 127 8 10 204 132 56 57 130 89 57 223 54 90 85 227 215 18 154 25 210 115 187 66 108 224 134 209 180 103 176 87 90 223 147 10 163 89 150 143 87 235 20 69 148 228 202 217 171 39 43 59 190 54 235 165 149 70 83 29 92 67 233 105 229 130 141 172 112 2 27 118 123 33 160 8 103 169 210 201 230 17 22 29 33 8 51 9 38 208 55 222 126 166 129 154 211 95 226 194 174 120 90 78 67 88 25 24 37 76 59 45 212 30 72 84 195 16 1 140 237 28 157 199 222 167 209 35 68 16 232 25 65 80 220 211 43 111 67 181 228 57 137 11 184 216 184 78 26 45 119 110 232 177 22 129 68 168 189 74 196 37 128 174 172 205 205 60 218 58 158 93 218 151 123 171 125 86 10 59 52 134 202 20 214 228 195 102 44 46 106 71 11 236 93 73 71 156 33 15 211 136 31 100 88 163 182 70 221 232 170 145 2 120 38 156 178 95 133 36 96 20 155 191 134 116 22 70 76 152 203 52 175 7 209 128 226 49 94 198 190 13 192 21 235 72 229 37 221 139 205 112 140 185 151 30 206 47 179 75 217 101 ^'}}, - {OUT=>'E22769DC00748A9BBD6C05BBC8E81F2CD1DC4E2D'}], - ['185', {IN=> {f=> '502 0 158 148 66 13 60 95 103 3 15 5 113 38 23 182 125 65 94 107 73 224 37 47 102 237 3 198 155 7 95 56 198 165 52 148 46 163 157 152 173 19 55 29 167 217 76 115 203 191 11 165 62 193 99 116 122 144 236 7 28 161 2 29 157 172 23 125 238 199 151 177 89 61 24 101 78 50 213 73 41 127 153 45 167 24 121 168 193 156 3 25 87 166 28 228 174 188 53 67 239 148 36 118 104 162 208 27 232 4 194 85 1 63 159 97 191 194 75 196 10 169 132 199 131 50 223 118 94 117 118 37 27 12 94 60 28 171 47 82 110 137 15 225 23 172 43 12 141 142 81 161 12 74 210 162 228 117 98 187 124 69 164 76 105 158 101 21 200 70 130 111 143 230 32 221 203 211 101 31 5 123 83 76 135 90 57 194 95 46 153 112 62 183 54 63 169 179 4 184 40 188 110 194 105 91 206 102 27 175 154 88 142 71 79 199 84 5 170 128 129 125 55 49 17 120 19 45 187 114 24 111 123 140 166 38 33 227 178 18 59 99 173 9 10 179 214 12 84 15 215 218 82 90 47 149 42 93 188 120 239 195 81 171 94 127 200 127 220 217 86 160 16 144 216 157 162 218 72 45 234 159 77 101 88 132 26 26 6 119 13 70 140 156 233 220 34 213 26 236 74 200 80 175 164 133 195 24 44 191 184 30 143 57 204 140 99 106 77 54 43 42 36 61 14 56 25 97 8 81 181 139 180 153 92 212 77 111 133 185 219 231 238 219 1 43 32 231 8 24 91 33 237 223 108 49 64 165 72 35 152 106 87 136 96 32 1 53 77 44 238 229 83 96 22 196 124 79 6 166 58 123 93 121 225 43 22 186 195 71 126 4 174 235 135 120 229 113 28 181 129 135 100 102 7 85 11 145 212 87 156 186 138 184 223 61 4 11 175 107 6 89 81 114 207 21 17 197 236 54 73 214 232 234 149 32 11 98 167 34 203 221 146 121 235 88 75 139 160 63 189 29 147 127 210 172 33 207 51 152 116 169 189 49 237 233 153 102 17 130 64 98 177 79 16 211 111 113 58 113 48 68 235 78 30 86 170 98 197 169 122 154 41 97 18 126 234 92 145 145 155 237 50 209 ^'}}, - {OUT=>'F29835A93475740E888E8C14318F3CA45A3C8606'}], - ['186', {IN=> {f=> '481 1 208 200 56 48 21 186 21 40 119 178 236 205 196 226 73 22 12 195 64 23 101 144 54 206 241 103 132 7 151 13 138 140 151 130 40 2 34 132 80 223 186 94 112 50 134 237 104 200 181 175 159 61 19 29 140 55 32 144 127 36 172 59 104 148 126 210 240 35 200 225 5 90 230 20 170 144 10 134 39 176 131 108 147 58 36 216 131 35 75 127 109 2 232 60 149 25 185 195 137 95 32 71 55 105 216 58 234 144 200 108 103 228 105 47 130 165 100 172 7 78 183 207 184 179 18 36 47 203 237 31 128 8 219 187 162 44 74 38 131 12 49 162 161 218 142 14 227 89 141 71 180 203 112 175 232 133 221 198 141 196 36 99 229 173 192 154 69 23 80 98 88 198 24 52 174 216 227 162 213 2 107 204 11 150 187 235 116 5 236 132 124 53 117 21 113 191 109 192 206 95 201 28 124 149 215 159 230 218 98 213 54 133 169 172 176 6 10 9 183 38 14 110 187 37 188 178 163 133 23 28 72 123 8 240 204 128 52 49 118 89 45 215 42 86 85 215 211 14 154 17 210 115 179 62 108 220 130 209 172 103 176 79 82 211 139 10 155 85 142 139 83 227 16 69 140 224 202 213 171 35 31 55 178 46 231 161 145 70 83 29 88 67 225 101 217 126 137 168 104 2 11 106 115 33 160 4 95 157 198 193 222 1 18 13 21 238 47 5 38 204 55 222 118 162 117 146 211 87 226 190 166 116 78 66 63 80 25 16 25 68 51 33 212 30 60 76 195 12 239 136 225 28 145 195 210 167 205 27 56 4 220 13 65 68 220 203 39 103 59 177 220 57 137 241 176 204 180 78 14 37 115 106 232 177 22 129 68 168 177 74 184 33 116 174 164 201 197 52 218 46 158 89 214 143 111 159 113 74 236 59 52 122 190 20 214 216 183 90 40 46 106 63 7 224 85 69 67 152 29 15 199 136 27 100 76 151 182 66 209 224 158 141 240 108 30 156 174 91 129 24 96 4 147 183 134 112 6 62 64 148 199 40 171 233 201 124 222 45 90 186 190 239 188 9 235 64 221 29 213 127 178 ^'}}, - {OUT=>'1A1D77C6D0F97C4B620FAA90F3F8644408E4B13D'}], - ['187', {IN=> {f=> '508 1 94 122 173 145 6 206 41 173 57 199 146 150 136 66 9 48 83 91 239 243 5 109 30 7 174 113 57 90 95 69 224 29 39 102 229 3 194 151 239 87 56 190 165 44 144 38 155 157 140 161 11 51 13 163 217 72 107 203 179 243 161 58 193 95 116 122 132 236 7 24 153 242 17 149 168 15 125 238 187 147 165 85 53 16 93 66 50 201 61 29 127 153 45 159 8 121 164 185 144 235 13 75 166 12 216 166 188 53 63 235 148 24 106 100 158 196 19 220 240 190 77 237 63 147 97 187 194 63 188 6 165 132 195 119 46 215 110 86 109 118 37 11 4 94 60 20 167 47 74 110 133 7 221 11 160 43 129 130 77 149 12 66 206 150 224 117 90 183 120 61 164 76 93 154 101 17 196 66 118 99 143 226 32 213 195 207 97 31 1 123 79 64 135 78 49 186 91 42 141 108 62 179 46 59 161 167 176 28 180 102 182 105 91 198 90 27 171 142 76 134 63 79 199 84 241 158 128 121 117 43 41 17 108 15 37 187 106 12 107 115 128 162 26 21 223 170 18 55 87 165 241 2 179 202 8 80 11 207 206 82 82 35 137 34 81 176 116 231 183 73 163 82 123 188 115 216 213 86 156 16 140 208 153 154 210 68 33 222 155 69 89 80 120 14 22 238 119 5 62 132 148 221 208 18 205 26 224 70 192 80 167 156 125 191 24 44 191 180 14 131 45 200 140 99 102 73 54 31 42 32 57 2 44 9 89 236 69 177 131 180 149 80 208 65 103 129 177 219 231 230 215 1 35 28 227 20 79 17 237 219 96 37 52 157 72 19 152 98 87 124 88 24 241 49 77 40 226 229 71 92 10 192 236 116 75 234 154 54 119 93 113 213 39 14 178 187 59 114 4 162 223 123 120 217 113 16 181 117 131 92 98 243 73 7 133 204 79 152 186 138 184 223 61 232 239 175 107 6 77 81 114 207 9 1 185 232 42 73 210 224 226 141 20 11 98 155 22 191 221 146 109 227 88 71 139 152 51 189 21 135 119 202 164 29 195 51 148 112 157 181 49 233 233 145 94 13 122 64 94 169 71 4 203 111 101 58 105 44 56 231 74 22 82 170 86 197 169 118 146 41 85 6 118 234 92 145 141 149 ^'}}, - {OUT=>'4EC84870E9BDD25F523C6DFB6EDD605052CA4EAA'}], - ['188', {IN=> {f=> '484 1 219 32 243 208 200 48 48 21 178 13 40 115 178 232 197 196 218 61 14 4 183 60 23 93 136 50 202 229 99 120 245 143 5 134 128 151 130 32 236 34 124 68 215 182 82 112 46 126 229 92 192 169 163 159 49 19 17 136 43 28 140 119 28 160 47 104 140 126 202 236 27 196 225 235 90 230 16 158 132 240 130 39 164 123 104 147 54 32 216 119 35 75 123 97 232 224 52 137 21 185 187 129 95 24 71 47 97 212 50 222 144 188 100 91 228 101 35 122 153 92 172 241 74 179 203 180 167 2 36 39 191 225 23 120 238 215 175 154 36 66 34 131 242 45 162 161 210 142 14 223 81 141 63 168 199 104 167 228 121 209 198 133 184 24 91 221 173 192 142 61 7 76 94 80 190 8 40 162 208 227 150 213 240 103 196 245 150 179 223 108 243 228 128 124 41 113 17 109 187 109 180 194 91 201 12 116 149 215 155 226 206 86 201 46 133 157 168 172 2 2 9 183 26 6 98 183 33 180 174 163 125 19 24 64 119 8 232 204 124 48 41 106 89 33 207 30 82 85 203 207 10 154 9 210 115 171 58 108 216 126 209 164 103 176 71 74 199 131 10 147 81 134 135 79 219 12 69 132 220 202 209 171 31 19 51 166 38 227 157 141 70 83 29 84 67 217 97 205 122 133 164 96 2 241 94 107 33 160 87 145 186 185 214 231 14 243 9 230 43 1 38 200 55 222 110 158 105 138 211 79 226 186 158 112 66 54 59 72 25 8 13 60 43 21 212 30 48 68 195 8 239 132 213 28 133 191 198 167 201 19 44 238 208 1 65 56 220 195 35 95 51 173 212 57 137 233 168 192 176 78 2 29 111 102 232 177 22 129 68 168 165 74 172 29 104 174 156 197 189 44 218 34 158 85 210 135 99 147 101 62 224 59 52 110 178 20 214 204 171 78 36 46 106 55 3 212 77 65 63 148 25 15 187 136 23 100 64 139 182 62 197 216 146 137 240 96 22 156 170 87 125 12 96 234 139 175 134 108 236 54 52 144 195 28 167 221 193 120 218 41 86 174 190 227 184 243 235 56 213 21 205 115 205 71 ^'}}, - {OUT=>'D689513FED08B80C39B67371959BC4E3FECB0537'}], - ['189', {IN=> {f=> '506 0 110 165 141 238 206 37 169 45 187 134 142 124 66 5 36 71 79 235 231 5 105 22 239 166 101 49 86 83 65 224 21 31 102 221 3 190 147 231 79 56 182 165 36 140 30 147 157 128 149 3 47 245 159 217 68 99 203 167 235 157 54 193 91 116 122 120 236 7 20 145 242 5 141 164 7 125 238 175 143 153 81 45 8 85 54 50 189 49 17 127 153 45 151 240 121 160 177 132 227 1 63 166 244 204 158 188 53 59 231 148 12 94 96 154 184 11 208 236 186 69 233 63 135 97 183 194 51 180 2 161 132 191 107 42 207 102 78 101 118 37 243 244 94 60 12 163 47 66 110 129 247 217 247 148 43 236 117 118 73 137 12 58 202 138 220 117 82 179 116 53 164 76 81 150 101 13 192 62 106 87 143 222 32 205 187 203 93 31 245 123 75 52 135 66 41 178 87 38 129 104 62 175 38 55 153 155 244 168 16 172 94 170 105 91 190 78 27 167 130 64 126 55 79 199 84 237 146 128 113 109 31 33 17 96 11 29 187 98 103 107 116 158 14 9 219 162 18 51 75 157 233 242 179 190 4 76 7 199 194 82 74 23 125 26 69 164 112 223 171 65 155 70 119 176 103 212 209 86 152 16 136 200 149 146 202 64 21 210 151 61 77 72 108 2 18 230 119 245 54 124 140 209 196 2 197 26 212 66 184 80 159 148 117 187 24 44 191 176 246 119 33 196 140 99 98 69 54 19 42 28 53 238 32 241 81 224 57 173 123 180 145 68 204 53 95 125 169 219 231 222 211 1 27 24 223 240 16 67 1 237 215 84 25 40 149 72 3 152 90 87 112 80 16 241 45 77 36 214 229 59 88 246 188 232 108 71 222 142 50 115 93 105 201 35 6 170 179 47 102 4 150 211 111 120 205 113 4 181 105 127 84 94 239 61 3 121 196 71 148 186 138 184 223 61 220 227 175 107 6 65 81 114 207 245 233 173 228 30 73 206 216 218 133 8 11 98 143 10 179 221 146 97 219 88 67 139 144 39 189 13 123 111 194 156 25 183 51 144 108 145 173 49 229 233 137 86 9 114 64 90 161 63 240 195 111 89 58 97 40 44 227 70 14 78 170 74 197 169 114 138 41 73 242 110 234 177 ^'}}, - {OUT=>'C4FED58F209FC3C34AD19F86A6DACADC86C04D33'}], - ['190', {IN=> {f=> '491 0 145 135 155 207 20 243 208 200 40 48 21 170 5 40 111 178 228 189 196 210 49 6 246 171 56 23 85 128 46 198 217 95 108 241 135 247 130 116 151 130 24 228 34 116 56 207 178 70 112 42 118 221 80 184 157 151 159 37 19 5 132 31 24 136 111 20 148 35 104 132 126 194 232 19 192 225 223 90 230 12 146 120 228 126 39 152 115 100 147 50 28 216 107 35 75 119 85 220 216 44 125 17 185 179 121 95 16 71 39 89 208 42 210 144 176 92 79 228 97 23 114 141 84 172 233 70 175 199 176 155 236 36 31 179 213 15 112 226 211 163 146 28 58 30 131 230 41 162 161 202 142 14 219 73 141 55 156 195 96 159 224 109 197 198 125 172 12 83 213 173 192 130 53 241 72 90 72 182 242 28 150 200 227 138 213 236 99 188 237 150 171 211 100 239 220 124 124 29 109 13 105 183 109 168 182 87 201 246 108 149 215 151 222 194 74 189 38 133 145 164 168 248 244 9 183 14 248 86 179 29 172 170 163 117 15 20 56 115 8 224 204 120 44 33 94 89 21 199 18 78 85 191 203 6 154 1 210 115 163 54 108 212 122 209 156 103 176 63 66 187 123 10 139 77 126 131 75 211 8 69 124 216 202 205 171 27 7 47 154 30 223 153 137 70 83 29 80 67 209 93 193 118 129 160 88 2 229 82 99 33 160 246 79 133 174 177 206 219 10 231 247 222 39 247 38 196 55 222 102 154 93 130 211 71 226 182 150 108 54 42 55 64 25 1 52 35 9 212 30 36 60 195 4 239 128 201 28 121 187 186 167 197 11 32 230 196 239 65 44 220 187 31 87 43 169 204 57 137 225 160 180 172 78 240 21 107 98 232 177 22 129 68 168 153 74 160 25 92 174 148 193 181 36 218 22 158 81 206 127 87 135 89 50 212 59 52 98 166 20 214 192 159 66 32 46 106 47 249 200 69 61 59 144 21 15 175 136 19 100 52 127 182 58 185 208 134 133 240 84 14 156 166 83 121 96 222 131 167 134 104 224 46 40 140 191 16 163 209 185 116 214 37 82 162 190 215 180 235 235 48 205 13 197 103 205 76 104 161 139 232 146 ^'}}, - {OUT=>'051888C6D00029C176DE792B84DECE2DC1C74B00'}], - ['191', {IN=> {f=> '516 0 33 165 33 175 122 134 112 66 1 24 59 67 231 219 5 101 14 227 158 89 41 82 71 61 224 13 23 102 213 3 186 143 223 71 56 174 165 28 136 22 139 157 116 137 247 43 233 155 217 64 91 203 155 227 153 50 193 87 116 122 108 236 7 16 137 242 245 133 160 251 125 238 163 139 141 77 37 77 42 50 177 37 5 127 153 45 143 228 121 156 169 120 219 241 51 166 232 192 150 188 53 55 227 148 82 92 150 172 3 196 232 182 61 229 63 123 97 179 194 39 172 250 157 132 187 95 38 199 94 70 93 118 37 231 240 94 60 4 159 47 58 110 125 243 213 239 136 43 228 105 106 69 125 12 50 198 126 216 117 74 175 112 45 164 76 69 146 101 9 188 58 94 75 143 218 32 197 179 199 89 31 245 123 71 40 135 54 33 170 83 34 117 100 62 171 30 51 145 143 244 160 4 164 86 158 105 91 182 66 27 163 118 52 118 47 79 199 84 233 134 128 105 101 19 25 17 84 7 21 187 90 240 99 99 104 154 2 249 215 154 18 47 63 149 225 238 179 178 72 3 191 182 82 66 11 113 18 57 152 108 215 159 57 147 58 115 164 91 208 205 86 148 16 132 192 145 138 194 60 9 198 147 53 65 64 96 242 14 222 119 241 46 116 132 197 184 238 189 26 200 62 176 80 151 140 109 183 24 44 191 172 234 107 21 192 140 99 94 65 54 7 42 24 49 230 20 229 73 212 45 169 115 180 141 56 200 41 87 121 161 219 231 214 207 1 19 20 219 236 12 55 237 237 211 72 13 28 141 72 239 152 82 87 100 72 8 241 41 77 32 202 229 47 84 238 184 228 100 67 210 130 46 111 93 97 189 31 250 162 171 35 90 4 138 199 99 120 193 113 244 181 93 123 76 90 235 49 251 109 188 63 144 186 138 184 223 61 208 215 175 107 6 53 81 114 207 237 221 161 224 18 73 202 208 210 125 248 11 98 131 250 167 221 146 85 211 88 63 139 136 27 189 5 111 103 186 148 21 171 51 140 104 133 165 49 225 233 129 78 5 106 64 86 153 55 232 187 111 77 58 89 36 32 223 66 6 74 170 62 197 169 110 130 41 61 234 102 234 92 145 133 155 201 14 243 208 200 36 48 21 166 1 40 109 178 147 ^'}}, - {OUT=>'1A3540BEE05518505827954F58B751C475AEECE0'}], - ['192', {IN=> {f=> '522 0 179 196 200 34 251 241 156 51 23 75 118 41 193 202 90 93 236 125 242 125 101 151 130 14 218 34 106 41 197 173 55 112 37 108 211 65 174 142 136 159 22 19 245 127 16 19 131 101 10 133 20 104 122 126 184 227 9 187 225 208 90 230 7 131 105 213 121 39 137 105 95 147 45 23 216 92 35 75 114 70 205 206 34 110 12 185 169 111 95 6 71 29 79 203 32 195 144 161 82 64 228 92 8 104 126 74 172 223 65 170 194 171 140 221 36 21 164 198 5 102 211 206 148 136 18 48 25 131 215 36 162 161 192 142 14 214 63 141 45 141 190 86 149 219 94 182 198 115 157 252 73 203 173 192 115 43 226 67 85 62 172 227 13 135 190 227 123 213 231 94 178 227 150 161 196 90 234 210 119 124 14 104 8 100 178 109 153 167 82 201 231 98 149 215 146 217 179 59 174 28 133 130 159 163 248 239 9 183 254 243 71 174 24 162 165 163 107 10 15 46 110 8 214 204 115 39 23 79 89 6 189 3 73 85 176 198 1 154 246 210 115 153 49 108 207 117 209 146 103 176 53 56 172 113 10 129 72 116 126 70 201 3 69 114 211 202 200 171 22 247 42 139 20 218 148 132 70 83 29 75 67 199 88 178 113 124 155 78 2 214 67 89 33 160 246 69 118 159 167 196 204 5 216 237 212 34 247 38 191 55 222 92 149 78 120 211 61 226 177 140 103 39 27 50 54 25 245 241 42 25 249 212 30 21 50 195 254 239 123 186 28 106 182 171 167 192 1 17 220 181 229 65 29 220 177 26 77 33 164 194 57 137 215 150 165 167 78 230 11 102 93 232 177 22 129 68 168 138 74 145 20 77 174 138 188 171 26 218 7 158 76 201 117 72 120 74 35 197 59 52 83 151 20 214 177 144 51 27 46 106 37 249 185 59 56 54 139 16 15 160 136 14 100 37 112 182 53 170 198 119 128 240 69 4 156 161 78 116 240 96 207 121 157 134 99 209 36 25 135 186 1 158 194 175 111 209 32 77 147 190 200 175 225 235 38 195 3 187 88 205 61 89 151 134 217 206 30 162 24 166 113 128 103 66 253 15 50 58 228 210 5 98 8 218 152 80 35 79 62 58 224 7 17 102 207 3 183 140 217 65 56 168 165 22 133 16 133 157 107 128 244 12 ^'}}, - {OUT=>'DFA19180359D5A7A38E842F172359CAF4208FC05'}], - ['193', {IN=> {f=> '517 1 218 150 217 59 81 203 140 217 148 45 193 82 116 122 93 236 7 11 127 242 235 123 155 246 125 238 148 134 126 72 27 247 67 27 50 162 22 247 127 153 45 133 213 121 151 159 105 209 231 36 166 217 177 140 188 53 50 222 148 242 67 87 145 157 250 181 227 177 51 224 63 108 97 174 194 24 162 250 152 132 182 80 33 189 84 60 83 118 37 216 235 94 60 251 154 47 48 110 120 238 208 229 121 43 218 90 91 64 110 12 40 193 111 211 117 64 170 107 35 164 76 54 141 101 4 183 53 79 60 143 213 32 187 169 194 84 31 245 123 66 25 135 39 23 160 78 29 102 95 62 166 20 46 135 128 244 150 246 154 76 143 105 91 172 51 27 158 103 37 108 37 79 199 84 228 119 128 95 91 4 15 17 69 2 11 187 80 230 94 89 89 149 244 239 210 144 18 42 48 139 215 233 179 163 252 67 255 181 167 82 56 253 98 8 42 137 103 205 144 47 137 43 110 149 76 203 200 86 143 16 127 182 140 128 184 55 251 183 142 43 50 54 81 232 9 212 119 236 36 106 122 182 169 223 179 26 185 57 166 80 141 130 99 178 24 44 191 167 219 92 6 187 140 99 89 60 54 249 42 19 44 220 5 214 63 197 30 164 105 180 136 41 195 26 77 116 151 219 231 204 202 1 9 15 214 231 7 40 222 237 206 57 255 13 131 72 224 152 72 87 85 62 255 241 36 77 27 187 229 32 79 228 179 223 90 62 195 115 41 106 93 87 174 26 245 152 161 20 75 4 123 184 84 120 178 113 234 181 78 118 66 85 230 34 251 94 178 53 139 186 138 184 223 61 193 200 175 107 6 38 81 114 207 227 206 146 219 3 73 197 198 200 115 238 11 98 116 240 152 221 146 70 201 88 58 139 126 12 189 252 96 93 176 138 16 156 51 135 99 118 155 49 220 233 119 68 96 64 81 143 45 222 177 111 62 58 79 31 17 218 61 253 69 170 47 197 169 105 120 41 46 224 92 234 92 145 128 155 186 256 243 208 200 26 48 21 156 248 40 104 178 221 175 196 196 28 249 239 150 49 23 71 114 39 191 196 88 87 234 121 240 123 95 151 130 10 214 34 102 35 193 171 49 112 35 104 207 59 170 136 130 159 16 19 241 125 213 ^'}}, - {OUT=>'7B0FA84EBBCFF7D7F4500F73D79660C4A3431B67'}], - ['194', {IN=> {f=> '529 1 15 127 93 2 121 8 104 114 126 176 223 1 183 225 196 90 230 3 119 93 201 117 39 125 97 91 147 41 19 216 80 35 75 110 58 193 198 26 98 8 185 161 103 95 257 71 21 71 199 24 183 144 149 74 52 228 88 255 96 114 66 172 215 61 166 190 167 128 209 36 13 152 186 256 94 199 202 136 128 10 40 21 131 203 32 162 161 184 142 14 210 55 141 37 129 186 78 141 215 82 170 198 107 145 244 65 195 173 192 103 35 214 63 81 54 164 215 1 123 182 227 111 213 227 90 170 219 150 153 184 82 230 202 115 124 2 100 4 96 174 109 141 155 78 201 219 90 149 215 142 213 167 47 162 20 133 118 155 159 248 235 9 183 246 239 59 170 20 154 161 163 99 6 11 38 106 8 206 204 111 35 15 67 89 253 181 250 69 85 164 194 256 154 242 210 115 145 45 108 203 113 209 138 103 176 45 48 160 105 10 121 68 108 122 66 193 258 69 106 207 202 196 171 18 239 38 127 12 214 144 128 70 83 29 71 67 191 84 166 109 120 151 70 2 202 55 81 33 160 246 61 106 147 159 188 192 1 204 229 204 30 247 38 187 55 222 84 145 66 112 211 53 226 173 132 99 27 15 46 46 25 241 233 34 17 241 212 30 9 42 195 254 239 119 174 28 94 178 159 167 188 252 5 212 169 221 65 17 220 169 22 69 25 160 186 57 137 207 142 153 163 78 222 3 98 89 232 177 22 129 68 168 126 74 133 16 65 174 130 184 163 18 218 254 158 72 197 109 60 108 62 23 185 59 52 71 139 20 214 165 132 39 23 46 106 29 249 173 51 52 50 135 12 15 148 136 10 100 25 100 182 49 158 190 107 124 240 57 255 156 157 74 112 232 96 195 113 149 134 95 197 28 13 131 182 248 154 182 167 107 205 28 73 135 190 188 171 217 235 30 187 254 179 76 205 49 77 143 130 205 206 26 158 12 154 101 120 91 66 253 3 38 46 224 198 5 94 206 144 68 27 75 50 54 224 258 9 102 199 3 179 136 209 57 56 160 165 14 129 8 125 157 95 116 240 36 212 148 217 57 77 203 134 213 146 43 193 80 116 122 87 236 7 9 123 242 231 119 153 244 125 238 142 132 120 70 23 245 63 21 50 156 16 243 127 153 45 129 207 121 149 155 99 205 227 30 166 211 57 ^'}}, - {OUT=>'9E886081C9ACAAD0F97B10810D1DE6FCDCE6B5F4'}], - ['195', {IN=> {f=> '548 0 134 188 53 47 219 148 236 58 84 142 148 247 172 224 174 45 221 63 99 97 171 194 15 156 250 149 132 179 71 30 183 78 54 77 118 37 207 232 94 60 248 151 47 42 110 117 235 205 223 112 43 212 81 82 61 101 12 34 190 102 208 117 58 167 104 29 164 76 45 138 101 1 180 50 70 51 143 210 32 181 163 191 81 31 245 123 63 16 135 30 17 154 75 26 93 92 62 163 14 43 129 119 244 144 240 148 70 134 105 91 166 42 27 155 94 28 102 31 79 199 84 225 110 128 89 85 255 9 17 60 259 5 187 74 224 91 83 80 146 238 233 207 138 18 39 39 133 209 230 179 154 252 64 255 175 158 82 50 247 89 2 33 128 100 199 135 41 131 34 107 140 67 200 197 86 140 16 124 176 137 122 178 52 245 174 139 37 41 48 72 226 6 206 119 233 30 100 116 173 160 214 173 26 176 54 160 80 135 124 93 175 24 44 191 164 210 83 257 184 140 99 86 57 54 243 42 16 41 214 256 205 57 188 21 161 99 180 133 32 192 17 71 113 145 219 231 198 199 1 3 12 211 228 4 31 213 237 203 48 249 4 125 72 215 152 66 87 76 56 252 241 33 77 24 178 229 23 76 222 176 220 84 59 186 106 38 103 93 81 165 23 242 146 155 11 66 4 114 175 75 120 169 113 228 181 69 115 60 82 227 25 251 85 172 47 136 186 138 184 223 61 184 191 175 107 6 29 81 114 207 221 197 137 216 254 73 194 192 194 109 232 11 98 107 234 143 221 146 61 195 88 55 139 120 3 189 249 87 87 170 132 13 147 51 132 96 109 149 49 217 233 113 62 257 90 64 78 137 39 216 171 111 53 58 73 28 8 215 58 250 66 170 38 197 169 102 114 41 37 218 86 234 92 145 125 155 177 250 243 208 200 20 48 21 150 245 40 101 178 218 169 196 190 19 246 236 141 46 23 65 108 36 188 187 85 78 231 115 237 120 86 151 130 4 208 34 96 26 187 168 40 112 32 98 201 50 164 127 121 159 7 19 235 122 1 14 126 91 118 5 104 112 126 174 222 259 182 225 193 90 230 2 116 90 198 116 39 122 95 90 147 40 18 216 77 35 75 109 55 190 196 24 95 7 185 159 101 95 256 71 19 69 198 22 180 144 146 72 49 228 87 253 94 111 64 172 213 60 165 189 166 125 206 36 11 149 183 255 92 196 201 133 126 8 38 20 131 213 ^'}}, - {OUT=>'A4D46E4BA0AE4B012F75B1B50D0534D578AE9CB6'}], - ['196', {IN=> {f=> '547 0 29 162 161 178 142 14 207 49 141 31 120 183 72 135 212 73 161 198 101 136 238 59 189 173 192 94 29 205 60 78 48 158 206 254 114 176 227 102 213 224 87 164 213 150 147 175 76 227 196 112 124 255 97 1 93 171 109 132 146 75 201 210 84 149 215 139 210 158 38 153 14 133 109 152 156 248 232 9 183 240 236 50 167 17 148 158 163 93 3 8 32 103 8 200 204 108 32 9 58 89 247 175 244 66 85 155 191 256 154 239 210 115 139 42 108 200 110 209 132 103 176 39 42 151 99 10 115 65 102 119 63 187 258 69 100 204 202 193 171 15 233 35 118 6 211 141 125 70 83 29 68 67 185 81 157 106 117 148 64 2 193 46 75 33 160 246 55 97 138 153 182 183 260 195 223 198 27 247 38 184 55 222 78 142 57 106 211 47 226 170 126 96 18 6 43 40 25 238 227 28 11 235 212 30 36 195 254 239 116 165 28 85 175 150 167 185 249 258 206 160 215 65 8 220 163 19 63 19 157 180 57 137 201 136 144 160 78 216 259 95 86 232 177 22 129 68 168 117 74 124 13 56 174 124 181 157 12 218 248 158 69 194 103 51 99 53 14 176 59 52 62 130 20 214 156 123 30 20 46 106 23 249 164 45 49 47 132 9 15 139 136 7 100 16 91 182 46 149 184 98 121 240 48 252 156 154 71 109 226 96 186 107 143 134 92 188 22 4 128 179 242 151 173 161 104 202 25 70 126 190 179 168 211 235 24 181 251 173 67 205 40 68 137 127 196 206 23 155 3 145 92 114 82 66 253 256 29 37 221 189 5 91 256 197 138 59 21 72 41 51 224 255 3 102 193 3 176 133 203 51 56 154 165 8 126 2 119 157 86 107 237 33 203 145 217 54 71 203 125 207 143 40 193 77 116 122 78 236 7 6 117 242 225 113 150 241 125 238 133 129 111 67 17 242 57 12 50 147 7 237 127 153 45 123 198 121 146 149 90 199 221 21 166 202 162 130 188 53 45 217 148 232 52 82 140 142 245 166 222 172 41 219 63 93 97 169 194 9 152 250 147 132 177 65 28 179 74 50 73 118 37 201 230 94 60 246 149 47 38 110 115 233 203 219 106 43 208 75 76 59 95 12 30 188 96 206 117 54 165 102 25 164 76 39 136 101 261 178 48 64 45 143 208 32 177 159 189 79 31 245 123 61 10 135 24 13 150 73 24 87 90 62 161 10 41 125 209 ^'}}, - {OUT=>'6342B199EE64C7B2C9CBCD4F2DCB65ACEF51516F'}], - ['197', {IN=> {f=> '542 1 244 136 232 140 62 122 105 91 158 30 27 151 82 16 94 23 79 199 84 221 98 128 81 77 247 1 17 48 259 261 187 66 216 87 75 68 142 230 225 203 130 18 35 27 125 201 226 179 142 252 60 255 167 146 82 42 239 77 258 21 116 96 191 123 33 123 22 103 128 55 196 193 86 136 16 120 168 133 114 170 48 237 162 135 29 29 40 60 218 2 198 119 229 22 92 108 161 148 202 165 26 164 50 152 80 127 116 85 171 24 44 191 160 198 71 249 180 140 99 82 53 54 235 42 12 37 206 248 193 49 176 9 157 91 180 129 20 188 5 63 109 137 219 231 190 195 1 259 8 207 224 19 201 237 199 36 241 256 117 72 203 152 58 87 64 48 248 241 29 77 20 166 229 11 72 214 172 216 76 55 174 94 34 99 93 73 153 19 238 138 147 263 54 4 102 163 63 120 157 113 220 181 57 111 52 78 223 13 251 73 164 39 132 186 138 184 223 61 172 179 175 107 6 17 81 114 207 213 185 125 212 246 73 190 184 186 101 224 11 98 95 226 131 221 146 49 187 88 51 139 112 255 189 245 75 79 162 124 9 135 51 128 92 97 141 49 213 233 105 54 257 82 64 74 129 31 208 163 111 41 58 65 24 260 211 54 246 62 170 26 197 169 98 106 41 25 210 78 234 92 145 121 155 165 242 243 208 200 12 48 21 142 241 40 97 178 214 161 196 182 7 242 232 129 42 23 57 100 32 184 175 81 66 227 107 233 116 74 151 130 260 200 34 88 14 179 164 28 112 28 90 193 38 156 115 109 159 259 19 227 118 253 10 122 83 256 106 257 104 104 126 166 218 255 178 225 181 90 230 262 104 78 186 112 39 110 87 86 147 36 14 216 65 35 75 105 43 178 188 16 83 3 185 151 93 95 252 71 11 61 194 14 168 144 134 64 37 228 83 245 86 99 56 172 205 56 161 185 162 113 194 36 3 137 171 251 84 184 197 121 118 30 16 131 188 27 162 161 174 142 14 205 45 141 27 114 181 68 131 210 67 155 198 97 130 234 55 185 173 192 88 25 199 58 76 44 154 200 250 108 172 227 96 213 222 85 160 209 150 143 169 72 225 192 110 124 251 95 263 91 169 109 126 140 73 201 204 80 149 215 137 208 152 32 147 10 133 103 150 154 248 230 9 183 236 234 44 165 15 144 156 163 89 1 6 28 101 8 196 204 106 164 ^'}}, - {OUT=>'AABFD63688EB678357869130083E1B52F6EA861D'}], - ['198', {IN=> {f=> '567 0 1 46 89 239 167 236 62 85 143 187 256 154 235 210 115 131 38 108 196 106 209 124 103 176 31 34 139 91 10 107 61 94 115 59 179 258 69 92 200 202 189 171 11 225 31 106 264 207 137 121 70 83 29 64 67 177 77 145 102 113 144 56 2 181 34 67 33 160 246 47 85 126 145 174 171 260 183 215 190 23 247 38 180 55 222 70 138 45 98 211 39 226 166 118 92 6 260 39 32 25 234 219 20 3 227 212 30 254 28 195 254 239 112 153 28 73 171 138 167 181 245 250 198 148 207 65 262 220 155 15 55 11 153 172 57 137 193 128 132 156 78 208 255 91 82 232 177 22 129 68 168 105 74 112 9 44 174 116 177 149 4 218 240 158 65 190 95 39 87 41 2 164 59 52 50 118 20 214 144 111 18 16 46 106 15 249 152 37 45 43 128 5 15 127 136 3 100 4 79 182 42 137 176 86 117 240 36 248 156 150 67 105 218 96 174 99 135 134 88 176 14 258 124 175 234 147 161 153 100 198 21 66 114 190 167 164 203 235 16 173 247 165 55 205 28 56 129 123 184 206 19 151 257 133 80 106 70 66 253 248 17 25 217 177 5 87 252 185 130 47 13 68 29 47 224 251 261 102 185 3 172 129 195 43 56 146 165 122 260 111 157 74 95 233 29 191 141 217 50 63 203 113 199 139 36 193 73 116 122 66 236 7 2 109 242 217 105 146 237 125 238 121 125 99 63 9 238 49 50 135 261 229 127 153 45 115 186 121 142 141 78 191 213 9 166 190 150 122 188 53 41 213 148 224 40 78 136 130 241 154 218 168 33 215 63 81 97 165 194 263 144 250 143 132 173 53 24 171 66 42 65 118 37 189 226 94 60 242 145 47 30 110 111 229 199 211 94 43 200 63 64 55 83 12 22 184 84 202 117 46 161 98 17 164 76 27 132 101 261 174 44 52 33 143 204 32 169 151 185 75 31 245 123 57 264 135 12 5 142 69 20 75 86 62 157 2 37 117 101 244 132 228 136 58 116 105 91 154 24 27 149 76 10 90 19 79 199 84 219 92 128 77 73 243 263 17 42 259 259 187 62 212 85 71 62 140 226 221 201 126 18 33 21 121 197 224 179 136 252 58 255 163 140 82 38 235 71 256 15 110 94 187 117 29 119 16 101 122 49 194 191 86 134 16 118 164 131 110 166 46 233 156 133 25 23 36 54 214 194 119 227 18 88 104 155 142 196 161 26 158 48 148 80 123 112 81 169 24 44 191 158 192 65 245 178 140 223 ^'}}, - {OUT=>'F732B7372DAF44801F81EFFE3108726239837936'}], - ['199', {IN=> {f=> '551 1 78 49 54 227 42 8 33 198 240 181 41 164 265 153 83 180 125 8 184 261 55 105 129 219 231 182 191 1 255 4 203 220 264 7 189 237 195 24 233 248 109 72 191 152 50 87 52 40 244 241 25 77 16 154 229 267 68 206 168 212 68 51 162 82 30 95 93 65 141 15 234 130 139 255 42 4 90 151 51 120 145 113 212 181 45 107 44 74 219 1 251 61 156 31 128 186 138 184 223 61 160 167 175 107 6 5 81 114 207 205 173 113 208 238 73 186 176 178 93 216 11 98 83 218 119 221 146 37 179 88 47 139 104 247 189 241 63 71 154 116 5 123 51 124 88 85 133 49 209 233 97 46 257 74 64 70 121 23 200 155 111 29 58 57 20 252 207 50 242 58 170 14 197 169 94 98 41 13 202 70 234 92 145 117 155 153 234 243 208 200 4 48 21 134 237 40 93 178 210 153 196 174 263 238 228 117 38 23 49 92 28 180 163 77 54 223 99 229 112 62 151 130 256 192 34 80 2 171 160 16 112 24 82 185 26 148 103 97 159 251 19 219 114 245 6 118 75 252 94 249 104 96 126 158 214 251 174 225 169 90 230 262 92 66 174 108 39 98 79 82 147 32 10 216 53 35 75 101 31 166 180 8 71 267 185 143 85 95 248 71 3 53 190 6 156 144 122 56 25 228 79 237 78 87 48 172 197 52 157 181 158 101 182 36 263 125 159 247 76 172 193 109 110 260 22 12 131 176 23 162 161 166 142 14 201 37 141 19 102 177 60 123 206 55 143 198 89 118 226 47 177 173 192 76 17 187 54 72 36 146 188 242 96 164 227 84 213 218 81 152 201 150 135 157 64 221 184 106 124 243 91 263 87 165 109 114 128 69 201 192 72 149 215 133 204 140 20 135 2 133 91 146 150 248 226 9 183 228 230 32 161 11 136 152 163 81 265 2 20 97 8 188 204 102 26 265 40 89 235 163 232 60 85 137 185 256 154 233 210 115 127 36 108 194 104 209 120 103 176 27 30 133 87 10 103 59 90 113 57 175 258 69 88 198 202 187 171 9 221 29 100 262 205 135 119 70 83 29 62 67 173 75 139 100 111 142 52 2 175 28 63 33 160 246 43 79 120 141 170 165 260 177 211 186 21 247 38 178 55 222 66 136 39 94 211 35 226 164 114 90 256 37 28 25 232 215 16 267 223 212 30 250 24 195 254 239 110 147 28 67 169 132 167 179 243 246 194 142 203 65 263 ^'}}, - {OUT=>'5E9347FE4574CDCB80281ED092191199BADD7B42'}], - ['200', {IN=> {f=> '578 0 220 147 11 47 3 149 164 57 137 185 120 120 152 78 200 251 87 78 232 177 22 129 68 168 93 74 100 5 32 174 108 173 141 266 218 232 158 61 186 87 27 75 29 260 152 59 52 38 106 20 214 132 99 6 12 46 106 7 249 140 29 41 39 124 1 15 115 136 269 100 262 67 182 38 125 168 74 113 240 24 244 156 146 63 101 210 96 162 91 127 134 84 164 6 250 120 171 226 143 149 145 96 194 17 62 102 190 155 160 195 235 8 165 243 157 43 205 16 44 121 119 172 206 15 147 249 121 68 98 58 66 253 240 5 13 213 165 5 83 248 173 122 35 5 64 17 43 224 247 257 102 177 3 168 125 187 35 56 138 165 262 118 256 103 157 62 83 229 25 179 137 217 46 55 203 101 191 135 32 193 69 116 122 54 236 7 268 101 242 209 97 142 233 125 238 109 121 87 59 1 234 41 258 50 123 253 221 127 153 45 107 174 121 138 133 66 183 205 267 166 178 138 114 188 53 37 209 148 216 28 74 132 118 237 142 214 164 25 211 63 69 97 161 194 255 136 250 139 132 169 41 20 163 58 34 57 118 37 177 222 94 60 238 141 47 22 110 107 225 195 203 82 43 192 51 52 51 71 12 14 180 72 198 117 38 157 94 9 164 76 15 128 101 261 170 40 40 21 143 200 32 161 143 181 71 31 245 123 53 256 135 267 134 65 16 63 82 62 153 264 33 109 89 244 124 220 128 50 104 105 91 146 12 27 145 64 268 82 11 79 199 84 215 80 128 69 65 235 259 17 30 259 255 187 54 204 81 63 50 136 218 213 197 118 18 29 9 113 189 220 179 124 252 54 255 155 128 82 30 227 59 252 3 98 90 179 105 21 111 4 97 110 37 190 187 86 130 16 114 156 127 102 158 42 225 144 129 17 11 28 42 206 266 186 119 223 10 80 96 143 130 184 153 26 146 44 140 80 115 104 73 165 24 44 191 154 180 53 237 174 140 99 76 47 54 223 42 6 31 194 236 175 37 158 261 151 79 180 123 2 182 257 51 103 125 219 231 178 189 1 253 2 201 218 264 1 183 237 193 18 229 244 105 72 185 152 46 87 46 36 242 241 23 77 14 148 229 263 66 202 166 210 64 49 156 76 28 93 93 61 135 13 232 126 135 251 36 4 84 145 45 120 139 113 208 181 39 105 40 72 217 265 251 55 152 27 126 186 138 184 223 61 154 161 175 107 6 269 81 114 207 201 167 107 206 234 73 184 172 174 89 212 11 98 77 214 113 221 146 31 175 88 45 139 100 243 189 213 ^'}}, - {OUT=>'D5776B7DFFF75C1358ABDBBB3F27A20BB6CA7C55'}], - ['201', {IN=> {f=> '578 1 51 63 146 108 1 111 51 120 84 73 125 49 205 233 89 38 257 66 64 66 113 15 192 147 111 17 58 49 16 244 203 46 238 54 170 2 197 169 90 90 41 1 194 62 234 92 145 113 155 141 226 243 208 200 268 48 21 126 233 40 89 178 206 145 196 166 255 234 224 105 34 23 41 84 24 176 151 73 42 219 91 225 108 50 151 130 252 184 34 72 262 163 156 4 112 20 74 177 14 140 91 85 159 243 19 211 110 237 2 114 67 248 82 241 104 88 126 150 210 247 170 225 157 90 230 262 80 54 162 104 39 86 71 78 147 28 6 216 41 35 75 97 19 154 172 59 267 185 135 77 95 244 71 267 45 186 270 144 144 110 48 13 228 75 229 70 75 40 172 189 48 153 177 154 89 170 36 259 113 147 243 68 160 189 97 102 256 14 8 131 164 19 162 161 158 142 14 197 29 141 11 90 173 52 115 202 43 131 198 81 106 218 39 169 173 192 64 9 175 50 68 28 138 176 234 84 156 227 72 213 214 77 144 193 150 127 145 56 217 176 102 124 235 87 263 83 161 109 102 116 65 201 180 64 149 215 129 200 128 8 123 266 133 79 142 146 248 222 9 183 220 226 20 157 7 128 148 163 73 265 270 12 93 8 180 204 98 22 261 28 89 227 155 224 56 85 125 181 256 154 229 210 115 119 32 108 190 100 209 112 103 176 19 22 121 79 10 95 55 82 109 53 167 258 69 80 194 202 183 171 5 213 25 88 258 201 131 115 70 83 29 58 67 165 71 127 96 107 138 44 2 163 16 55 33 160 246 35 67 108 133 162 153 260 165 203 178 17 247 38 174 55 222 58 132 27 86 211 27 226 160 106 86 260 248 33 20 25 228 207 8 263 215 212 30 242 16 195 254 239 106 135 28 55 165 120 167 175 239 238 186 130 195 65 250 220 143 9 43 271 147 160 57 137 181 116 114 150 78 196 249 85 76 232 177 22 129 68 168 87 74 94 3 26 174 104 171 137 264 218 228 158 59 184 83 21 69 23 256 146 59 52 32 100 20 214 126 93 10 46 106 3 249 134 25 39 37 122 271 15 109 136 269 100 258 61 182 36 119 164 68 111 240 18 242 156 144 61 99 206 96 156 87 123 134 82 158 2 246 118 169 222 141 143 141 94 192 15 60 96 190 149 158 191 235 4 161 241 153 37 205 10 38 117 117 166 206 13 145 245 115 62 94 52 66 253 236 271 7 211 159 5 81 246 167 118 29 1 62 11 41 224 245 255 102 173 3 166 123 183 31 56 134 165 260 116 254 81 ^'}}, - {OUT=>'022B7ADA472FB7A9DA9219621C9C5F563D3792F6'}], - ['202', {IN=> {f=> '583 1 157 50 71 225 21 167 133 217 42 47 203 89 183 131 28 193 65 116 122 42 236 7 268 93 242 201 89 138 229 125 238 97 117 75 55 267 230 33 250 50 111 245 213 127 153 45 99 162 121 134 125 54 175 197 259 166 166 126 106 188 53 33 205 148 208 16 70 128 106 233 130 210 160 17 207 63 57 97 157 194 247 128 250 135 132 165 29 16 155 50 26 49 118 37 165 218 94 60 234 137 47 14 110 103 221 191 195 70 43 184 39 40 47 59 12 6 176 60 194 117 30 153 90 1 164 76 3 124 101 261 166 36 28 9 143 196 32 153 135 177 67 31 245 123 49 248 135 262 263 126 61 12 51 78 62 149 260 29 101 77 244 116 212 120 42 92 105 91 138 27 141 52 260 74 3 79 199 84 211 68 128 61 57 227 255 17 18 259 251 187 46 196 77 55 38 132 210 205 193 110 18 25 271 105 181 216 179 112 252 50 255 147 116 82 22 219 47 248 265 86 86 171 93 13 103 266 93 98 25 186 183 86 126 16 110 148 123 94 150 38 217 132 125 9 273 20 30 198 266 178 119 219 2 72 88 131 118 172 145 26 134 40 132 80 107 96 65 161 24 44 191 150 168 41 229 170 140 99 72 43 54 215 42 2 27 186 228 163 29 146 253 147 71 180 119 264 178 249 43 99 117 219 231 170 185 1 249 272 197 214 264 263 171 237 189 6 221 236 97 72 173 152 38 87 34 28 238 241 19 77 10 136 229 255 62 194 162 206 56 45 144 64 24 89 93 53 123 9 228 118 127 243 24 4 72 133 33 120 127 113 200 181 27 101 32 68 213 257 251 43 144 19 122 186 138 184 223 61 142 149 175 107 6 261 81 114 207 193 155 95 202 226 73 180 164 166 81 204 11 98 65 206 101 221 146 19 167 88 41 139 92 235 189 235 45 59 142 104 273 105 51 118 82 67 121 49 203 233 85 34 257 62 64 64 109 11 188 143 111 11 58 45 14 240 201 44 236 52 170 270 197 169 88 86 41 269 190 58 234 92 145 111 155 135 222 243 208 200 266 48 21 122 231 40 87 178 204 141 196 162 251 232 222 99 32 23 37 80 22 174 145 71 36 217 87 223 106 44 151 130 250 180 34 68 258 159 154 272 112 18 70 173 8 136 85 79 159 239 19 207 108 233 112 63 246 76 237 104 84 126 146 208 245 168 225 151 90 230 262 74 48 156 102 39 80 67 76 147 26 4 216 35 35 75 95 13 148 168 270 53 267 185 131 73 95 242 71 265 41 184 268 138 144 104 44 7 228 73 225 66 69 36 272 ^'}}, - {OUT=>'7F1DE4ECA20362DA624653D225A5B3F7964A9FF2'}], - ['203', {IN=> {f=> '588 0 181 44 149 173 150 77 158 36 255 101 135 239 60 148 185 85 94 252 6 4 131 152 15 162 161 150 142 14 193 21 141 3 78 169 44 107 198 31 119 198 73 94 210 31 161 173 192 52 1 163 46 64 20 130 164 226 72 148 227 60 213 210 73 136 185 150 119 133 48 213 168 98 124 227 83 263 79 157 109 90 104 61 201 168 56 149 215 125 196 116 272 111 262 133 67 138 142 248 218 9 183 212 222 8 153 3 120 144 163 65 265 270 4 89 8 172 204 94 18 257 16 89 219 147 216 52 85 113 177 256 154 225 210 115 111 28 108 186 96 209 104 103 176 11 14 109 71 10 87 51 74 105 49 159 258 69 72 190 202 179 171 1 205 21 76 254 197 127 111 70 83 29 54 67 157 67 115 92 103 134 36 2 151 4 47 33 160 246 27 55 96 125 154 141 260 153 195 170 13 247 38 170 55 222 50 128 15 78 211 19 226 156 98 82 252 240 29 12 25 224 199 259 207 212 30 234 8 195 254 239 102 123 28 43 161 108 167 171 235 230 178 118 187 65 242 220 135 5 35 267 143 152 57 137 173 108 102 146 78 188 245 81 72 232 177 22 129 68 168 75 74 82 275 14 174 96 167 129 260 218 220 158 55 180 75 9 57 11 248 134 59 52 20 88 20 214 114 81 264 6 46 106 271 249 122 17 35 33 118 271 15 97 136 269 100 250 49 182 32 107 156 56 107 240 6 238 156 140 57 95 198 96 144 79 115 134 78 146 270 238 114 165 214 137 131 133 90 188 11 56 84 190 137 154 183 235 272 153 237 145 25 205 274 26 109 113 154 206 9 141 237 103 50 86 40 66 253 228 263 271 207 147 5 77 242 155 110 17 269 58 275 37 224 241 251 102 165 3 162 119 175 23 56 126 165 256 112 250 91 157 44 65 223 19 161 131 217 40 43 203 83 179 129 26 193 63 116 122 36 236 7 268 89 242 197 85 136 227 125 238 91 115 69 53 265 228 29 246 50 105 241 209 127 153 45 95 156 121 132 121 48 171 193 255 166 160 120 102 188 53 31 203 148 204 10 68 126 100 231 124 208 158 13 205 63 51 97 155 194 243 124 250 133 132 163 23 14 151 46 22 45 118 37 159 216 94 60 232 135 47 10 110 101 219 189 191 64 43 180 33 34 45 53 12 2 174 54 192 117 26 151 88 273 164 76 273 122 101 261 164 34 22 3 143 194 32 149 131 175 65 31 245 123 47 244 135 258 261 122 59 10 45 76 62 147 258 27 97 71 244 112 208 116 38 86 105 91 134 270 27 139 46 256 70 275 79 199 160 ^'}}, - {OUT=>'CA0F2B1BFB4469C11ED006A994734F0F2F5EFD17'}], - ['204', {IN=> {f=> '594 0 207 56 128 53 49 219 251 17 6 259 247 187 38 188 73 47 26 128 202 197 189 102 18 21 263 97 173 212 179 100 252 46 255 139 104 82 14 211 35 244 257 74 82 163 81 5 95 258 89 86 13 182 179 86 122 16 106 140 119 86 142 34 209 120 121 1 265 12 18 190 266 170 119 215 272 64 80 119 106 160 137 26 122 36 124 80 99 88 57 157 24 44 191 146 156 29 221 166 140 99 68 39 54 207 42 276 23 178 220 151 21 134 245 143 63 180 115 256 174 241 35 95 109 219 231 162 181 1 245 272 193 210 264 255 159 237 185 272 213 228 89 72 161 152 30 87 22 20 234 241 15 77 6 124 229 247 58 186 158 202 48 41 132 52 20 85 93 45 111 5 224 110 119 235 12 4 60 121 21 120 115 113 192 181 15 97 24 64 209 249 251 31 136 11 118 186 138 184 223 61 130 137 175 107 6 253 81 114 207 185 143 83 198 218 73 176 156 158 73 196 11 98 53 198 89 221 146 7 159 88 37 139 84 227 189 231 33 51 134 96 273 93 51 114 78 55 113 49 199 233 77 26 257 54 64 60 101 3 180 135 111 277 58 37 10 232 197 40 232 48 170 262 197 169 84 78 41 261 182 50 234 92 145 107 155 123 214 243 208 200 262 48 21 114 227 40 83 178 200 133 196 154 243 228 218 87 28 23 29 72 18 170 133 67 24 213 79 219 102 32 151 130 246 172 34 60 250 151 150 264 112 14 62 165 274 128 73 67 159 231 19 199 104 225 274 108 55 242 64 229 104 76 126 138 204 241 164 225 139 90 230 262 62 36 144 98 39 68 59 72 147 22 216 23 35 75 91 1 136 160 266 41 267 185 123 65 95 238 71 261 33 180 264 126 144 92 36 273 228 69 217 58 57 28 172 177 42 147 171 148 71 152 36 253 95 129 237 56 142 183 79 90 250 2 2 131 146 13 162 161 146 142 14 191 17 141 277 72 167 40 103 196 25 113 198 69 88 206 27 157 173 192 46 275 157 44 62 16 126 158 222 66 144 227 54 213 208 71 132 181 150 115 127 44 211 164 96 124 223 81 263 77 155 109 84 98 59 201 162 52 149 215 123 194 110 268 105 260 133 61 136 140 248 216 9 183 208 220 2 151 1 116 142 163 61 265 270 87 8 168 204 92 16 255 10 89 215 143 212 50 85 107 175 256 154 223 210 115 107 26 108 184 94 209 100 103 176 7 10 103 67 10 83 49 70 103 47 155 258 69 68 188 202 177 171 277 201 19 70 252 195 125 109 70 83 29 52 67 153 65 109 90 101 132 32 2 145 276 43 33 160 246 23 259 ^'}}, - {OUT=>'833D63F5C2EA0CD43EC15F2B9DD97FF12B030479'}], - ['205', {IN=> {f=> '600 1 87 119 148 132 260 144 189 164 10 247 38 167 55 222 44 125 6 72 211 13 226 153 92 79 246 234 26 6 25 221 193 273 256 201 212 30 228 2 195 254 239 99 114 28 34 158 99 167 168 232 224 172 109 181 65 236 220 129 2 29 264 140 146 57 137 167 102 93 143 78 182 242 78 69 232 177 22 129 68 168 66 74 73 275 5 174 90 164 123 257 218 214 158 52 177 69 48 2 242 125 59 52 11 79 20 214 105 72 258 3 46 106 268 249 113 11 32 30 115 271 15 88 136 269 100 244 40 182 29 98 150 47 104 240 276 235 156 137 54 92 192 96 135 73 109 134 75 137 267 232 111 162 208 134 122 127 87 185 8 53 75 190 128 151 177 235 269 147 234 139 16 205 268 17 103 110 145 206 6 138 231 94 41 80 31 66 253 222 257 265 204 138 5 74 239 146 104 8 266 55 269 34 224 238 248 102 159 3 159 116 169 17 56 120 165 253 109 247 85 157 35 56 220 16 152 128 217 37 37 203 74 173 126 23 193 60 116 122 27 236 7 268 83 242 191 79 133 224 125 238 82 112 60 50 262 225 23 240 50 96 235 203 127 153 45 89 147 121 129 115 39 165 187 249 166 151 111 96 188 53 28 200 148 198 1 65 123 91 228 115 205 155 7 202 63 42 97 152 194 237 118 250 130 132 160 14 11 145 40 16 39 118 37 150 213 94 60 229 132 47 4 110 98 216 186 185 55 43 174 24 25 42 44 12 275 171 45 189 117 20 148 85 270 164 76 267 119 101 261 161 31 13 273 143 191 32 143 125 172 62 31 245 123 44 238 135 252 258 116 56 7 36 73 62 144 255 24 91 62 244 106 202 110 32 77 105 91 128 264 27 136 37 250 64 272 79 199 84 206 53 128 51 47 217 250 17 3 259 246 187 36 186 72 45 23 127 200 195 188 100 18 20 261 95 171 211 179 97 252 45 255 137 101 82 12 209 32 243 255 71 81 161 78 3 93 256 88 83 10 181 178 86 121 16 105 138 118 84 140 33 207 117 120 278 263 10 15 188 266 168 119 214 271 62 78 116 103 157 135 26 119 35 122 80 97 86 55 156 24 44 191 145 153 26 219 165 140 99 67 38 54 205 42 276 22 176 218 148 19 131 243 142 61 180 114 254 173 239 33 94 107 219 231 160 180 1 244 272 192 209 264 253 156 237 184 270 211 226 87 72 158 152 28 87 19 18 233 241 14 77 5 121 229 245 57 184 157 201 46 40 129 49 19 84 93 43 108 4 223 108 117 233 9 4 57 118 18 120 112 113 190 181 12 96 22 63 208 247 251 28 134 9 117 186 138 184 223 61 127 216 ^'}}, - {OUT=>'14FD356190416C00592B86FF7CA50B622F85593A'}], - ['206', {IN=> {f=> '590 1 175 107 6 247 81 114 207 179 134 74 195 212 73 173 150 152 67 190 11 98 44 192 80 221 146 279 153 88 34 139 78 221 189 228 24 45 128 90 273 84 51 111 75 46 107 49 196 233 71 20 257 48 64 57 95 278 174 129 111 271 58 31 7 226 194 37 229 45 170 256 197 169 81 72 41 255 176 44 234 92 145 104 155 114 208 243 208 200 259 48 21 108 224 40 80 178 197 127 196 148 237 225 215 78 25 23 23 66 15 167 124 64 15 210 73 216 99 23 151 130 243 166 34 54 244 145 147 258 112 11 56 159 268 122 64 58 159 225 19 193 101 219 274 105 49 239 55 223 104 70 126 132 201 238 161 225 130 90 230 262 53 27 135 95 39 59 53 69 147 19 278 216 14 35 75 88 273 127 154 263 32 267 185 117 59 95 235 71 258 27 177 261 117 144 83 30 267 228 66 211 52 48 22 172 171 39 144 168 145 62 143 36 250 86 120 234 50 133 180 70 84 247 277 280 131 137 10 162 161 140 142 14 188 11 141 274 63 164 34 97 193 16 104 198 63 79 200 21 151 173 192 37 272 148 41 59 10 120 149 216 57 138 227 45 213 205 68 126 175 150 109 118 38 208 158 93 124 217 78 263 74 152 109 75 89 56 201 153 46 149 215 120 191 101 262 96 257 133 52 133 137 248 213 9 183 202 217 274 148 279 110 139 163 55 265 270 275 84 8 162 204 89 13 252 1 89 209 137 206 47 85 98 172 256 154 220 210 115 101 23 108 181 91 209 94 103 176 1 4 94 61 10 77 46 64 100 44 149 258 69 62 185 202 174 171 277 195 16 61 249 192 122 106 70 83 29 49 67 147 62 100 87 98 129 26 2 136 270 37 33 160 246 17 40 81 115 144 126 260 138 185 160 8 247 38 165 55 222 40 123 68 211 9 226 151 88 77 242 230 24 2 25 219 189 271 254 197 212 30 224 279 195 254 239 97 108 28 28 156 93 167 166 230 220 168 103 177 65 232 220 125 25 262 138 142 57 137 163 98 87 141 78 178 240 76 67 232 177 22 129 68 168 60 74 67 275 280 174 86 162 119 255 218 210 158 50 175 65 275 42 277 238 119 59 52 5 73 20 214 99 66 254 1 46 106 266 249 107 7 30 28 113 271 15 82 136 269 100 240 34 182 27 92 146 41 102 240 272 233 156 135 52 90 188 96 129 69 105 134 73 131 265 228 109 160 204 132 116 123 85 183 6 51 69 190 122 149 173 235 267 143 232 135 10 205 264 11 99 108 139 206 4 136 227 88 35 76 25 66 253 218 253 261 202 132 5 72 237 140 203 ^'}}, - {OUT=>'4AB6B57EDDEF1CE935622F935C1619AE7C1667D6'}], - ['207', {IN=> {f=> '620 0 279 262 51 261 30 224 234 244 102 151 3 155 112 161 9 56 112 165 249 105 243 77 157 23 44 216 12 140 124 217 33 29 203 62 165 122 19 193 56 116 122 15 236 7 268 75 242 183 71 129 220 125 238 70 108 48 46 258 221 15 232 50 84 227 195 127 153 45 81 135 121 125 107 27 157 179 241 166 139 99 88 188 53 24 196 148 190 272 61 119 79 224 103 201 151 282 198 63 30 97 148 194 229 110 250 126 132 156 2 7 137 32 8 31 118 37 138 209 94 60 225 128 47 279 110 94 212 182 177 43 43 166 12 13 38 32 12 271 167 33 185 117 12 144 81 266 164 76 259 115 101 261 157 27 1 265 143 187 32 135 117 168 58 31 245 123 40 230 135 244 254 108 52 3 24 69 62 140 251 20 83 50 244 98 194 102 24 65 105 91 120 256 27 132 25 242 56 268 79 199 84 202 41 128 43 39 209 246 17 274 259 242 187 28 178 68 37 11 123 192 187 184 92 18 16 253 87 163 207 179 85 252 41 255 129 89 82 4 201 20 239 247 59 77 153 66 278 85 248 84 71 281 177 174 86 117 16 101 130 114 76 132 29 199 105 116 274 255 2 3 180 266 160 119 210 267 54 70 104 91 145 127 26 107 31 114 80 89 78 47 152 24 44 191 141 141 14 211 161 140 99 63 34 54 197 42 276 18 168 210 136 11 119 235 138 53 180 110 246 169 231 25 90 99 219 231 152 176 1 240 272 188 205 264 245 144 237 180 262 203 218 79 72 146 152 20 87 7 10 229 241 10 77 1 109 229 237 53 176 153 197 38 36 117 37 15 80 93 35 96 219 100 109 225 280 4 45 106 6 120 100 113 182 181 92 14 59 204 239 251 16 126 1 113 186 138 184 223 61 115 122 175 107 6 243 81 114 207 175 128 68 193 208 73 171 146 148 63 186 11 98 38 188 74 221 146 275 149 88 32 139 74 217 189 226 18 41 124 86 273 78 51 109 73 40 103 49 194 233 67 16 257 44 64 55 91 276 170 125 111 267 58 27 5 222 192 35 227 43 170 252 197 169 79 68 41 251 172 40 234 92 145 102 155 108 204 243 208 200 257 48 21 104 222 40 78 178 195 123 196 144 233 223 213 72 23 23 19 62 13 165 118 62 9 208 69 214 97 17 151 130 241 162 34 50 240 141 145 254 112 9 52 155 264 118 58 52 159 221 19 189 99 215 274 103 45 237 49 219 104 66 126 128 199 236 159 225 124 90 230 262 47 21 129 93 39 53 49 67 147 17 278 216 8 35 75 86 269 121 150 261 26 267 185 113 55 95 233 71 256 23 175 259 111 144 77 26 263 228 64 207 48 42 18 172 167 37 142 166 143 56 137 36 248 80 114 232 46 127 257 ^'}}, - {OUT=>'B456A6A968ACD66CAA974F96A9A916E700AA3C5D'}], - ['208', {IN=> {f=> '605 1 58 76 243 273 280 131 125 6 162 161 132 142 14 184 3 141 270 51 160 26 89 189 4 92 198 55 67 192 13 143 173 192 25 268 136 37 55 2 112 137 208 45 130 227 33 213 201 64 118 167 150 101 106 30 204 150 89 124 209 74 263 70 148 109 63 77 52 201 141 38 149 215 116 187 89 254 84 253 133 40 129 133 248 209 9 183 194 213 266 144 279 102 135 163 47 265 270 271 80 8 154 204 85 9 248 274 89 201 129 198 43 85 86 168 256 154 216 210 115 93 19 108 177 87 209 86 103 176 278 281 82 53 10 69 42 56 96 40 141 258 69 54 181 202 170 171 277 187 12 49 245 188 118 102 70 83 29 45 67 139 58 88 83 94 125 18 2 124 262 29 33 160 246 9 28 69 107 136 114 260 126 177 152 4 247 38 161 55 222 32 119 273 60 211 1 226 147 80 73 234 222 20 279 25 215 181 267 250 189 212 30 216 275 195 254 239 93 96 28 16 152 81 167 162 226 212 160 91 169 65 224 220 117 281 17 258 134 134 57 137 155 90 75 137 78 170 236 72 63 232 177 22 129 68 168 48 74 55 275 272 174 78 158 111 251 218 202 158 46 171 57 267 30 269 230 107 59 52 278 61 20 214 87 54 246 282 46 106 262 249 95 284 26 24 109 271 15 70 136 269 100 232 22 182 23 80 138 29 98 240 264 229 156 131 48 86 180 96 117 61 97 134 69 119 261 220 105 156 196 128 104 115 81 179 2 47 57 190 110 145 165 235 263 135 228 127 283 205 256 284 91 104 127 206 132 219 76 23 68 13 66 253 210 245 253 198 120 5 68 233 128 92 275 260 49 257 28 224 232 242 102 147 3 153 110 157 5 56 108 165 247 103 241 73 157 17 38 214 10 134 122 217 31 25 203 56 161 120 17 193 54 116 122 9 236 7 268 71 242 179 67 127 218 125 238 64 106 42 44 256 219 11 228 50 78 223 191 127 153 45 77 129 121 123 103 21 153 175 237 166 133 93 84 188 53 22 194 148 186 268 59 117 73 222 97 199 149 280 196 63 24 97 146 194 225 106 250 124 132 154 281 5 133 28 4 27 118 37 132 207 94 60 223 126 47 277 110 92 210 180 173 37 43 162 6 7 36 26 12 269 165 27 183 117 8 142 79 264 164 76 255 113 101 261 155 25 280 261 143 185 32 131 113 166 56 31 245 123 38 226 135 240 252 104 50 1 18 67 62 138 249 18 79 44 244 94 190 98 20 59 105 91 116 252 27 130 19 238 52 266 79 199 84 200 35 128 39 35 205 244 17 270 259 240 187 24 174 66 33 5 121 188 183 182 88 18 14 249 83 159 205 179 79 252 186 ^'}}, - {OUT=>'FD1C257FE046B2A27E2F0CD55ED2DECA845F01D7'}], - ['209', {IN=> {f=> '615 0 255 121 77 82 283 193 8 235 239 47 73 145 54 274 77 240 80 59 273 173 170 86 113 16 97 122 110 68 124 25 191 93 112 270 247 281 278 172 266 152 119 206 263 46 62 92 79 133 119 26 95 27 106 80 81 70 39 148 24 44 191 137 129 2 203 157 140 99 59 30 54 189 42 276 14 160 202 124 3 107 227 134 45 180 106 238 165 223 17 86 91 219 231 144 172 1 236 272 184 201 264 237 132 237 176 254 195 210 71 72 134 152 12 87 282 2 225 241 6 77 284 97 229 229 49 168 149 193 30 32 105 25 11 76 93 27 84 283 215 92 101 217 272 4 33 94 281 120 88 113 174 181 275 88 6 55 200 231 251 4 118 280 109 186 138 184 223 61 103 110 175 107 6 235 81 114 207 167 116 56 189 200 73 167 138 140 55 178 11 98 26 180 62 221 146 267 141 88 28 139 66 209 189 222 6 33 116 78 273 66 51 105 69 28 95 49 190 233 59 8 257 36 64 51 83 272 162 117 111 259 58 19 1 214 188 31 223 39 170 244 197 169 75 60 41 243 164 32 234 92 145 98 155 96 196 243 208 200 253 48 21 96 218 40 74 178 191 115 196 136 225 219 209 60 19 23 11 54 9 161 106 58 284 204 61 210 93 5 151 130 237 154 34 42 232 133 141 246 112 5 44 147 256 110 46 40 159 213 19 181 95 207 274 99 37 233 37 211 104 58 126 120 195 232 155 225 112 90 230 262 35 9 117 89 39 41 41 63 147 13 278 216 283 35 75 82 261 109 142 257 14 267 185 105 47 95 229 71 252 15 171 255 99 144 65 18 255 228 60 199 40 30 10 172 159 33 138 162 139 44 125 36 244 68 102 228 38 115 174 52 72 241 271 280 131 119 4 162 161 128 142 14 182 286 141 268 45 158 22 85 187 285 86 198 51 61 188 9 139 173 192 19 266 130 35 53 285 108 131 204 39 126 227 27 213 199 62 114 163 150 97 100 26 202 146 87 124 205 72 263 68 146 109 57 71 50 201 135 34 149 215 114 185 83 250 78 251 133 34 127 131 248 207 9 183 190 211 262 142 279 98 133 163 43 265 270 269 78 8 150 204 83 7 246 270 89 197 125 194 41 85 80 166 256 154 214 210 115 89 17 108 175 85 209 82 103 176 276 279 76 49 10 65 40 52 94 38 137 258 69 50 179 202 168 171 277 183 10 43 243 186 116 100 70 83 29 43 67 135 56 82 81 92 123 14 2 118 258 25 33 160 246 5 22 63 103 132 108 260 120 173 148 2 247 38 159 55 222 28 117 269 56 211 284 226 145 76 71 230 218 18 277 25 213 177 265 248 185 212 30 212 273 195 254 239 91 90 28 10 150 75 167 160 224 175 ^'}}, - {OUT=>'66E0D01780F1063E2929EAAD74826BC64060E38C'}], - ['210', {IN=> {f=> '613 0 152 79 161 65 216 220 109 281 9 254 130 126 57 137 147 82 63 133 78 162 232 68 59 232 177 22 129 68 168 36 74 43 275 264 174 70 154 103 247 218 194 158 42 167 49 259 18 261 222 95 59 52 270 49 20 214 75 42 238 282 46 106 258 249 83 280 22 20 105 271 15 58 136 269 100 224 10 182 19 68 130 17 94 240 256 225 156 127 44 82 172 96 105 53 89 134 65 107 257 212 101 152 188 124 92 107 77 175 287 43 45 190 98 141 157 235 259 127 224 119 275 205 248 276 83 100 115 206 285 128 211 64 11 60 1 66 253 202 237 245 194 108 5 64 229 116 84 267 256 45 249 24 224 228 238 102 139 3 149 106 149 286 56 100 165 243 99 237 65 157 5 26 210 6 122 118 217 27 17 203 44 153 116 13 193 50 116 122 286 236 7 268 63 242 171 59 123 214 125 238 52 102 30 40 252 215 3 220 50 66 215 183 127 153 45 69 117 121 119 95 9 145 167 229 166 121 81 76 188 53 18 190 148 178 260 55 113 61 218 85 195 145 276 192 63 12 97 142 194 217 98 250 120 132 150 273 1 125 20 285 19 118 37 120 203 94 60 219 122 47 273 110 88 206 176 165 25 43 154 283 284 32 14 12 265 161 15 179 117 138 75 260 164 76 247 109 101 261 151 21 272 253 143 181 32 123 105 162 52 31 245 123 34 218 135 232 248 96 46 286 6 63 62 134 245 14 71 32 244 86 182 90 12 47 105 91 108 244 27 126 7 230 44 262 79 199 84 196 23 128 31 27 197 240 17 262 259 236 187 16 166 62 25 282 117 180 175 178 80 18 10 241 75 151 201 179 67 252 35 255 117 71 82 281 189 2 233 235 41 71 141 48 272 73 236 78 53 269 171 168 86 111 16 95 118 108 64 120 23 187 87 110 268 243 279 274 168 266 148 119 204 261 42 58 86 73 127 115 26 89 25 102 80 77 66 35 146 24 44 191 135 123 285 199 155 140 99 57 28 54 185 42 276 12 156 198 118 288 101 223 132 41 180 104 234 163 219 13 84 87 219 231 140 170 1 234 272 182 199 264 233 126 237 174 250 191 206 67 72 128 152 8 87 278 287 223 241 4 77 284 91 229 225 47 164 147 191 26 30 99 19 9 74 93 23 78 283 213 88 97 213 268 4 27 88 277 120 82 113 170 181 271 86 2 53 198 227 251 287 114 278 107 186 138 184 223 61 97 104 175 107 6 231 81 114 207 163 110 50 187 196 73 165 134 136 51 174 11 98 20 176 56 221 146 263 137 88 26 139 62 205 189 220 29 112 74 273 60 51 103 67 22 91 49 188 233 55 4 257 32 64 49 79 270 158 113 111 255 58 15 288 210 213 ^'}}, - {OUT=>'A8478DF406F179FD4EF97F4574D7F99EA1CE9EB8'}], - ['211', {IN=> {f=> '624 1 28 220 36 170 238 197 169 72 54 41 237 158 26 234 92 145 95 155 87 190 243 208 200 250 48 21 90 215 40 71 178 188 109 196 130 219 216 206 51 16 23 5 48 6 158 97 55 278 201 55 207 90 286 151 130 234 148 34 36 226 127 138 240 112 2 38 141 250 104 37 31 159 207 19 175 92 201 274 96 31 230 28 205 104 52 126 114 192 229 152 225 103 90 230 262 26 108 86 39 32 35 60 147 10 278 216 277 35 75 79 255 100 136 254 5 267 185 99 41 95 226 71 249 9 168 252 90 144 56 12 249 228 57 193 34 21 4 172 153 30 135 159 136 35 116 36 241 59 93 225 32 106 171 43 66 238 268 280 131 110 1 162 161 122 142 14 179 283 141 265 36 155 16 79 184 279 77 198 45 52 182 3 133 173 192 10 263 121 32 50 282 102 122 198 30 120 227 18 213 196 59 108 157 150 91 91 20 199 140 84 124 199 69 263 65 143 109 48 62 47 201 126 28 149 215 111 182 74 244 69 248 133 25 124 128 248 204 9 183 184 208 256 139 279 92 130 163 37 265 270 266 75 8 144 204 80 4 243 264 89 191 119 188 38 85 71 163 256 154 211 210 115 83 14 108 172 82 209 76 103 176 273 276 67 43 10 59 37 46 91 35 131 258 69 44 176 202 165 171 277 177 7 34 240 183 113 97 70 83 29 40 67 129 53 73 78 89 120 8 2 109 252 19 33 160 246 289 13 54 97 126 99 260 111 167 142 289 247 38 156 55 222 22 114 263 50 211 281 226 142 70 68 224 212 15 274 25 210 171 262 245 179 212 30 206 270 195 254 239 88 81 28 1 147 66 167 157 221 202 150 76 159 65 214 220 107 281 7 253 129 124 57 137 145 80 60 132 78 160 231 67 58 232 177 22 129 68 168 33 74 40 275 262 174 68 153 101 246 218 192 158 41 166 47 257 15 259 220 92 59 52 268 46 20 214 72 39 236 282 46 106 257 249 80 279 21 19 104 271 15 55 136 269 100 222 7 182 18 65 128 14 93 240 254 224 156 126 43 81 170 96 102 51 87 134 64 104 256 210 100 151 186 123 89 105 76 174 287 42 42 190 95 140 155 235 258 125 223 117 273 205 246 274 81 99 112 206 285 127 209 61 8 58 288 66 253 200 235 243 193 105 5 63 228 113 82 265 255 44 247 23 224 227 237 102 137 3 148 105 147 285 56 98 165 242 98 236 63 157 2 23 209 5 119 117 217 26 15 203 41 151 115 12 193 49 116 122 284 236 7 268 61 242 169 57 122 213 125 238 49 101 27 39 251 214 1 218 50 63 213 181 127 153 45 67 114 121 118 93 6 143 165 227 166 118 78 74 188 53 17 189 148 176 258 54 112 58 217 82 194 144 275 191 141 ^'}}, - {OUT=>'248E58CF09A372114FC2F93B09C5FC14F3D0059E'}], - ['212', {IN=> {f=> '628 1 3 97 139 194 211 92 250 117 132 147 267 290 119 14 282 13 118 37 111 200 94 60 216 119 47 270 110 85 203 173 159 16 43 148 277 278 29 5 12 262 158 6 176 117 286 135 72 257 164 76 241 106 101 261 148 18 266 247 143 178 32 117 99 159 49 31 245 123 31 212 135 226 245 90 43 286 289 60 62 131 242 11 65 23 244 80 176 84 6 38 105 91 102 238 27 123 290 224 38 259 79 199 84 193 14 128 25 21 191 237 17 256 259 233 187 10 160 59 19 276 114 174 169 175 74 18 7 235 69 145 198 179 58 252 32 255 111 62 82 278 183 285 230 229 32 68 135 39 269 67 230 75 44 263 168 165 86 108 16 92 112 105 58 114 20 181 78 107 265 237 276 268 162 266 142 119 201 258 36 52 77 64 118 109 26 80 22 96 80 71 60 29 143 24 44 191 132 114 279 193 152 140 99 54 25 54 179 42 276 9 150 192 109 285 92 217 129 35 180 101 228 160 213 7 81 81 219 231 134 167 1 231 272 179 196 264 227 117 237 171 244 185 200 61 72 119 152 2 87 272 284 220 241 1 77 284 82 229 219 44 158 144 188 20 27 90 10 6 71 93 17 69 283 210 82 91 207 262 4 18 79 271 120 73 113 164 181 265 83 288 50 195 221 251 281 108 275 104 186 138 184 223 61 88 95 175 107 6 225 81 114 207 157 101 41 184 190 73 162 128 130 45 168 11 98 11 170 47 221 146 257 131 88 23 139 56 199 189 217 283 23 106 68 273 51 51 100 64 13 85 49 185 233 49 290 257 26 64 46 73 267 152 107 111 249 58 9 288 204 183 26 218 34 170 234 197 169 70 50 41 233 154 22 234 92 145 93 155 81 186 243 208 200 248 48 21 86 213 40 69 178 186 105 196 126 215 214 204 45 14 23 1 44 4 156 91 53 274 199 51 205 88 282 151 130 232 144 34 32 222 123 136 236 112 34 137 246 100 31 25 159 203 19 171 90 197 274 94 27 228 22 201 104 48 126 110 190 227 150 225 97 90 230 262 20 286 102 84 39 26 31 58 147 8 278 216 273 35 75 77 251 94 132 252 291 267 185 95 37 95 224 71 247 5 166 250 84 144 50 8 245 228 55 189 30 15 172 149 28 133 157 134 29 110 36 239 53 87 223 28 100 169 37 62 236 266 280 131 104 291 162 161 118 142 14 177 281 141 263 30 153 12 75 182 275 71 198 41 46 178 291 129 173 192 4 261 115 30 48 280 98 116 194 24 116 227 12 213 194 57 104 153 150 87 85 16 197 136 82 124 195 67 263 63 141 109 42 56 45 201 120 24 149 215 109 180 68 240 63 246 133 19 122 126 248 202 9 183 180 206 252 137 279 88 128 163 33 265 270 264 73 8 140 204 78 2 241 76 ^'}}, - {OUT=>'F15767DE91796A6816977EFA4FCED4B7FD9B8A57'}], - ['213', {IN=> {f=> '622 0 89 183 111 180 34 85 59 159 256 154 207 210 115 75 10 108 168 78 209 68 103 176 269 272 55 35 10 51 33 38 87 31 123 258 69 36 172 202 161 171 277 169 3 22 236 179 109 93 70 83 29 36 67 121 49 61 74 85 116 2 97 244 11 33 160 246 285 1 42 89 118 87 260 99 159 134 289 247 38 152 55 222 14 110 255 42 211 277 226 138 62 64 216 204 11 270 25 206 163 258 241 171 212 30 198 266 195 254 239 84 69 28 283 143 54 167 153 217 194 142 64 151 65 206 220 99 281 293 249 125 116 57 137 137 72 48 128 78 152 227 63 54 232 177 22 129 68 168 21 74 28 275 254 174 60 149 93 242 218 184 158 37 162 39 249 3 251 212 80 59 52 260 34 20 214 60 27 228 282 46 106 253 249 68 275 17 15 100 271 15 43 136 269 100 214 289 182 14 53 120 2 89 240 246 220 156 122 39 77 162 96 90 43 79 134 60 92 252 202 96 147 178 119 77 97 72 170 287 38 30 190 83 136 147 235 254 117 219 109 265 205 238 266 73 95 100 206 285 123 201 49 290 50 280 66 253 192 227 235 189 93 5 59 224 101 74 257 251 40 239 19 224 223 233 102 129 3 144 101 139 281 56 90 165 238 94 232 55 157 284 11 205 1 107 113 217 22 7 203 29 143 111 8 193 45 116 122 276 236 7 268 53 242 161 49 118 209 125 238 37 97 15 35 247 210 287 210 50 51 205 173 127 153 45 59 102 121 114 85 288 135 157 219 166 106 66 66 188 53 13 185 148 168 250 50 108 46 213 70 190 140 271 187 63 291 97 137 194 207 88 250 115 132 145 263 290 115 10 280 9 118 37 105 198 94 60 214 117 47 268 110 83 201 171 155 10 43 144 273 274 27 293 12 260 156 174 117 284 133 70 255 164 76 237 104 101 261 146 16 262 243 143 176 32 113 95 157 47 31 245 123 29 208 135 222 243 86 41 286 285 58 62 129 240 9 61 17 244 76 172 80 2 32 105 91 98 234 27 121 286 220 34 257 79 199 84 191 8 128 21 17 187 235 17 252 259 231 187 6 156 57 15 272 112 170 165 173 70 18 5 231 65 141 196 179 52 252 30 255 107 56 82 276 179 281 228 225 26 66 131 33 267 63 226 73 38 259 166 163 86 106 16 90 108 103 54 110 18 177 72 105 263 233 274 264 158 266 138 119 199 256 32 48 71 58 112 105 26 74 20 92 80 67 56 25 141 24 44 191 130 108 275 189 150 140 99 52 23 54 175 42 276 7 146 188 103 283 86 213 127 31 180 99 224 158 209 3 79 77 219 231 130 165 1 229 272 177 194 264 223 111 237 169 240 181 196 57 72 113 152 292 87 268 282 218 241 293 77 284 76 229 80 ^'}}, - {OUT=>'36A6BC5E680E15675D9696338C88B36248BBBAF4'}], - ['214', {IN=> {f=> '635 1 40 150 140 184 12 23 78 294 2 67 93 9 57 283 206 74 83 199 254 4 6 67 263 120 61 113 156 181 257 79 284 46 191 213 251 273 100 271 100 186 138 184 223 61 76 83 175 107 6 217 81 114 207 149 89 29 180 182 73 158 120 122 37 160 11 98 295 162 35 221 146 249 123 88 19 139 48 191 189 213 275 15 98 60 273 39 51 96 60 1 77 49 181 233 41 286 257 18 64 42 65 263 144 99 111 241 58 1 288 196 179 22 214 30 170 226 197 169 66 42 41 225 146 14 234 92 145 89 155 69 178 243 208 200 244 48 21 78 209 40 65 178 182 97 196 118 207 210 200 33 10 23 289 36 152 79 49 266 195 43 201 84 274 151 130 228 136 34 24 214 115 132 228 112 292 26 129 238 92 19 13 159 195 19 163 86 189 274 90 19 224 10 193 104 40 126 102 186 223 146 225 85 90 230 262 8 278 90 80 39 14 23 54 147 4 278 216 265 35 75 73 243 82 124 248 283 267 185 87 29 95 220 71 243 293 162 246 72 144 38 237 228 51 181 22 3 288 172 141 24 129 153 130 17 98 36 235 41 75 219 20 88 165 25 54 232 262 280 131 92 291 162 161 110 142 14 173 277 141 259 18 149 4 67 178 267 59 198 33 34 170 287 121 173 192 288 257 103 26 44 276 90 104 186 12 108 227 213 190 53 96 145 150 79 73 8 193 128 78 124 187 63 263 59 137 109 30 44 41 201 108 16 149 215 105 176 56 232 51 242 133 7 118 122 248 198 9 183 172 202 244 133 279 80 124 163 25 265 270 260 69 8 132 204 74 294 237 252 89 179 107 176 32 85 53 157 256 154 205 210 115 71 8 108 166 76 209 64 103 176 267 270 49 31 10 47 31 34 85 29 119 258 69 32 170 202 159 171 277 165 1 16 234 177 107 91 70 83 29 34 67 117 47 55 72 83 114 292 2 91 240 7 33 160 246 283 291 36 85 114 81 260 93 155 130 289 247 38 150 55 222 10 108 251 38 211 275 226 136 58 62 212 200 9 268 25 204 159 256 239 167 212 30 194 264 195 254 239 82 63 28 279 141 48 167 151 215 190 138 58 147 65 202 220 95 281 291 247 123 112 57 137 133 68 42 126 78 148 225 61 52 232 177 22 129 68 168 15 74 22 275 250 174 56 147 89 240 218 180 158 35 160 35 245 293 247 208 74 59 52 256 28 20 214 54 21 224 282 46 106 251 249 62 273 15 13 98 271 15 37 136 269 100 210 285 182 12 47 116 292 87 240 242 218 156 120 37 75 158 96 84 39 75 134 58 86 250 198 94 145 174 117 71 93 70 168 287 36 24 190 77 134 143 235 252 113 217 105 261 205 234 262 69 93 94 206 285 121 197 43 286 46 276 66 253 188 223 231 187 87 5 57 222 95 285 ^'}}, - {OUT=>'4DEA6251B2A6DF017A8093AB066EE3863A4EC369'}], - ['215', {IN=> {f=> '636 0 251 248 37 233 16 224 220 230 102 123 3 141 98 133 278 56 84 165 235 91 229 49 157 278 2 202 295 98 110 217 19 1 203 20 137 108 5 193 42 116 122 270 236 7 268 47 242 155 43 115 206 125 238 28 94 6 32 244 207 284 204 50 42 199 167 127 153 45 53 93 121 111 79 282 129 151 213 166 97 57 60 188 53 10 182 148 162 244 47 105 37 210 61 187 137 268 184 63 285 97 134 194 201 82 250 112 132 142 257 290 109 4 277 3 118 37 96 195 94 60 211 114 47 265 110 80 198 168 149 1 43 138 267 268 24 287 12 257 153 288 171 117 281 130 67 252 164 76 231 101 101 261 143 13 256 237 143 173 32 107 89 154 44 31 245 123 26 202 135 216 240 80 38 286 279 55 62 126 237 6 55 8 244 70 166 74 293 23 105 91 92 228 27 118 280 214 28 254 79 199 84 188 296 128 15 11 181 232 17 246 259 228 187 150 54 9 266 109 164 159 170 64 18 2 225 59 135 193 179 43 252 27 255 101 47 82 273 173 275 225 219 17 63 125 24 264 57 220 70 29 253 163 160 86 103 16 87 102 100 48 104 15 171 63 102 260 227 271 258 152 266 132 119 196 253 26 42 62 49 103 99 26 65 17 86 80 61 50 19 138 24 44 191 127 99 269 183 147 140 99 49 20 54 169 42 276 4 140 182 94 280 77 207 124 25 180 96 218 155 203 294 76 71 219 231 124 162 1 226 272 174 191 264 217 102 237 166 234 175 190 51 72 104 152 289 87 262 279 215 241 293 77 284 67 229 209 39 148 139 183 10 22 75 292 1 66 93 7 54 283 205 72 81 197 252 4 3 64 261 120 58 113 154 181 255 78 283 45 190 211 251 271 98 270 99 186 138 184 223 61 73 80 175 107 6 215 81 114 207 147 86 26 179 180 73 157 118 120 35 158 11 98 293 160 32 221 146 247 121 88 18 139 46 189 189 212 273 13 96 58 273 36 51 95 59 295 75 49 180 233 39 285 257 16 64 41 63 262 142 97 111 239 58 296 288 194 178 21 213 29 170 224 197 169 65 40 41 223 144 12 234 92 145 88 155 66 176 243 208 200 243 48 21 76 208 40 64 178 181 95 196 116 205 209 199 30 9 23 288 34 296 151 76 48 264 194 41 200 83 272 151 130 227 134 34 22 212 113 131 226 112 292 24 127 236 90 16 10 159 193 19 161 85 187 274 89 17 223 7 191 104 38 126 100 185 222 145 225 82 90 230 262 5 276 87 79 39 11 21 53 147 3 278 216 263 35 75 72 241 79 122 247 281 267 185 85 27 95 219 71 242 292 161 245 69 144 35 295 235 228 50 179 20 287 172 139 23 128 152 129 14 95 36 234 38 72 218 18 85 164 22 52 231 261 280 131 89 291 162 161 108 142 14 172 276 91 ^'}}, - {OUT=>'D30E70E357D57E3D82CA554B8A3D58DFF528FA94'}], - ['216', {IN=> {f=> '635 1 256 9 146 297 61 175 261 50 198 27 25 164 284 115 173 192 282 254 94 23 41 273 84 95 180 3 102 227 290 213 187 50 90 139 150 73 64 2 190 122 75 124 181 60 263 56 134 109 21 35 38 201 99 10 149 215 102 173 47 226 42 239 133 297 115 119 248 195 9 183 166 199 238 130 279 74 121 163 19 265 270 257 66 8 126 204 71 294 234 246 89 173 101 170 29 85 44 154 256 154 202 210 115 65 5 108 163 73 209 58 103 176 264 267 40 25 10 41 28 28 82 26 113 258 69 26 167 202 156 171 277 159 297 7 231 174 104 88 70 83 29 31 67 111 44 46 69 80 111 289 2 82 234 1 33 160 246 280 285 27 79 108 72 260 84 149 124 289 247 38 147 55 222 4 105 245 32 211 272 226 133 52 59 206 194 6 265 25 201 153 253 236 161 212 30 188 261 195 254 239 79 54 28 273 138 39 167 148 212 184 132 49 141 65 196 220 89 281 288 244 120 106 57 137 127 62 33 123 78 142 222 58 49 232 177 22 129 68 168 6 74 13 275 244 174 50 144 83 237 218 174 158 32 157 29 239 287 241 202 65 59 52 250 19 20 214 45 12 218 282 46 106 248 249 53 270 12 10 95 271 15 28 136 269 100 204 279 182 9 38 110 286 84 240 236 215 156 117 34 72 152 96 75 33 69 134 55 77 247 192 91 142 168 114 62 87 67 165 287 33 15 190 68 131 137 235 249 107 214 99 255 205 228 256 63 90 85 206 285 118 191 34 280 40 270 66 253 182 217 225 184 78 5 54 219 86 64 247 246 35 229 14 224 218 228 102 119 3 139 96 129 276 56 80 165 233 89 227 45 157 274 295 200 295 92 108 217 17 296 203 14 133 106 3 193 40 116 122 266 236 7 268 43 242 151 39 113 204 125 238 22 92 30 242 205 282 200 50 36 195 163 127 153 45 49 87 121 109 75 278 125 147 209 166 91 51 56 188 53 8 180 148 158 240 45 103 31 208 55 185 135 266 182 63 281 97 132 194 197 78 250 110 132 140 253 290 105 275 298 118 37 90 193 94 60 209 112 47 263 110 78 196 166 145 294 43 134 263 264 22 283 12 255 151 284 169 117 279 128 65 250 164 76 227 99 101 261 141 11 252 233 143 171 32 103 85 152 42 31 245 123 24 198 135 212 238 76 36 286 275 53 62 124 235 4 51 2 244 66 162 70 291 17 105 91 88 224 27 116 276 210 24 252 79 199 84 186 292 128 11 7 177 230 17 242 259 226 187 295 146 52 5 262 107 160 155 168 60 18 221 55 131 191 179 37 252 25 255 97 41 82 271 169 271 223 215 11 61 121 18 262 53 216 68 23 249 161 158 86 101 16 85 98 98 44 100 13 167 57 100 258 223 269 254 148 266 128 119 194 251 22 38 56 43 275 ^'}}, - {OUT=>'70CA84D827F7FD61446233F88CF2F990B0F3E2AA'}], - ['217', {IN=> {f=> '642 0 91 26 53 13 78 80 53 42 11 134 24 44 191 123 87 261 175 143 140 99 45 16 54 161 42 276 132 174 82 276 65 199 120 17 180 92 210 151 195 290 72 63 219 231 116 158 1 222 272 170 187 264 209 90 237 162 226 167 182 43 72 92 152 285 87 254 275 211 241 293 77 284 55 229 201 35 140 135 179 2 18 63 284 298 62 93 300 42 283 201 64 73 189 244 4 292 52 253 120 46 113 146 181 247 74 279 41 186 203 251 263 90 266 95 186 138 184 223 61 61 68 175 107 6 207 81 114 207 139 74 14 175 172 73 153 110 112 27 150 11 98 285 152 20 221 146 239 113 88 14 139 38 181 189 208 265 5 88 50 273 24 51 91 55 287 67 49 176 233 31 281 257 8 64 37 55 258 134 89 111 231 58 292 288 186 174 17 209 25 170 216 197 169 61 32 41 215 136 4 234 92 145 84 155 54 168 243 208 200 239 48 21 68 204 40 60 178 177 87 196 108 197 205 195 18 5 23 284 26 296 147 64 44 256 190 33 196 79 264 151 130 223 126 34 14 204 105 127 218 112 292 16 119 228 82 4 299 159 185 19 153 81 179 274 85 9 219 296 183 104 30 126 92 181 218 141 225 70 90 230 262 294 268 75 75 39 300 13 49 147 300 278 216 255 35 75 68 233 67 114 243 273 267 185 77 19 95 215 71 238 288 157 241 57 144 23 291 227 228 46 171 12 289 283 172 131 19 124 148 125 2 83 36 230 26 60 214 10 73 160 10 44 227 257 280 131 77 291 162 161 100 142 14 168 272 141 254 3 144 295 57 173 257 44 198 23 19 160 282 111 173 192 278 252 88 21 39 271 80 89 176 298 98 227 286 213 185 48 86 135 150 69 58 299 188 118 73 124 177 58 263 54 132 109 15 29 36 201 93 6 149 215 100 171 41 222 36 237 133 293 113 117 248 193 9 183 162 197 234 128 279 70 119 163 15 265 270 255 64 8 122 204 69 294 232 242 89 169 97 166 27 85 38 152 256 154 200 210 115 61 3 108 161 71 209 54 103 176 262 265 34 21 10 37 26 24 80 24 109 258 69 22 165 202 154 171 277 155 297 1 229 172 102 86 70 83 29 29 67 107 42 40 67 78 109 287 2 76 230 298 33 160 246 278 281 21 75 104 66 260 78 145 120 289 247 38 145 55 222 103 241 28 211 270 226 131 48 57 202 190 4 263 25 199 149 251 234 157 212 30 184 259 195 254 239 77 48 28 269 136 33 167 146 210 180 128 43 137 65 192 220 85 281 286 242 118 102 57 137 123 58 27 121 78 138 220 56 47 232 177 22 129 68 168 74 7 275 240 174 46 142 79 235 218 170 158 30 155 25 235 283 237 198 59 59 52 246 13 20 214 39 6 214 282 46 106 246 249 47 268 10 8 93 271 15 22 136 269 100 200 275 42 ^'}}, - {OUT=>'8D500C9CFDE0288530A2106B70BED39326C52C3C'}], - ['218', {IN=> {f=> '644 0 6 29 104 280 81 240 230 212 156 114 31 69 146 96 66 27 63 134 52 68 244 186 88 139 162 111 53 81 64 162 287 30 6 190 59 128 131 235 246 101 211 93 249 205 222 250 57 87 76 206 285 115 185 25 274 34 264 66 253 176 211 219 181 69 5 51 216 77 58 241 243 32 223 11 224 215 225 102 113 3 136 93 123 273 56 74 165 230 86 224 39 157 268 289 197 295 83 105 217 14 293 203 5 127 103 193 37 116 122 260 236 7 268 37 242 145 33 110 201 125 238 13 89 293 27 239 202 279 194 50 27 189 157 127 153 45 43 78 121 106 69 272 119 141 203 166 82 42 50 188 53 5 177 148 152 234 42 100 22 205 46 182 132 263 179 63 275 97 129 194 191 72 250 107 132 137 247 290 99 296 272 295 118 37 81 190 94 60 206 109 47 260 110 75 193 163 139 288 43 128 257 258 19 277 12 252 148 278 166 117 276 125 62 247 164 76 221 96 101 261 138 8 246 227 143 168 32 97 79 149 39 31 245 123 21 192 135 206 235 70 33 286 269 50 62 121 232 1 45 295 244 60 156 64 288 8 105 91 82 218 27 113 270 204 18 249 79 199 84 183 286 128 5 1 171 227 17 236 259 223 187 292 140 49 301 256 104 154 149 165 54 18 299 215 49 125 188 179 28 252 22 255 91 32 82 268 163 265 220 209 2 58 115 9 259 47 210 65 14 243 158 155 86 98 16 82 92 95 38 94 10 161 48 97 255 217 266 248 142 266 122 119 191 248 16 32 47 34 88 89 26 50 12 76 80 51 40 9 133 24 44 191 122 84 259 173 142 140 99 44 15 54 159 42 276 301 130 172 79 275 62 197 119 15 180 91 208 150 193 289 71 61 219 231 114 157 1 221 272 169 186 264 207 87 237 161 224 165 180 41 72 89 152 284 87 252 274 210 241 293 77 284 52 229 199 34 138 134 178 17 60 282 298 61 93 299 39 283 200 62 71 187 242 4 290 49 251 120 43 113 144 181 245 73 278 40 185 201 251 261 88 265 94 186 138 184 223 61 58 65 175 107 6 205 81 114 207 137 71 11 174 170 73 152 108 110 25 148 11 98 283 150 17 221 146 237 111 88 13 139 36 179 189 207 263 3 86 48 273 21 51 90 54 285 65 49 175 233 29 280 257 6 64 36 53 257 132 87 111 229 58 291 288 184 173 16 208 24 170 214 197 169 60 30 41 213 134 2 234 92 145 83 155 51 166 243 208 200 238 48 21 66 203 40 59 178 176 85 196 106 195 204 194 15 4 23 283 24 296 146 61 43 254 189 31 195 78 262 151 130 222 124 34 12 202 103 126 216 112 292 14 117 226 80 1 297 159 183 19 151 80 177 274 84 7 218 294 181 104 28 126 90 180 217 140 225 67 90 230 262 292 266 72 74 39 298 11 48 147 300 278 216 253 265 ^'}}, - {OUT=>'F3D4D139EDFC24596377BC97A96FB7621F27FFC7'}], - ['219', {IN=> {f=> '638 1 75 65 227 58 108 240 267 267 185 71 13 95 212 71 235 285 154 238 48 144 14 288 221 228 43 165 6 283 280 172 125 16 121 145 122 297 74 36 227 17 51 211 4 64 157 1 38 224 254 280 131 68 291 162 161 94 142 14 165 269 141 251 298 141 292 51 170 251 35 198 17 10 154 279 105 173 192 272 249 79 18 36 268 74 80 170 292 92 227 280 213 182 45 80 129 150 63 49 296 185 112 70 124 171 55 263 51 129 109 6 20 33 201 84 149 215 97 168 32 216 27 234 133 287 110 114 248 190 9 183 156 194 228 125 279 64 116 163 9 265 270 252 61 8 116 204 66 294 229 236 89 163 91 160 24 85 29 149 256 154 197 210 115 55 108 158 68 209 48 103 176 259 262 25 15 10 31 23 18 77 21 103 258 69 16 162 202 151 171 277 149 297 296 226 169 99 83 70 83 29 26 67 101 39 31 64 75 106 284 2 67 224 295 33 160 246 275 275 12 69 98 57 260 69 139 114 289 247 38 142 55 222 298 100 235 22 211 267 226 128 42 54 196 184 1 260 25 196 143 248 231 151 212 30 178 256 195 254 239 74 39 28 263 133 24 167 143 207 174 122 34 131 65 186 220 79 281 283 239 115 96 57 137 117 52 18 118 78 132 217 53 44 232 177 22 129 68 168 295 74 302 275 234 174 40 139 73 232 218 164 158 27 152 19 229 277 231 192 50 59 52 240 4 20 214 30 301 208 282 46 106 243 249 38 265 7 5 90 271 15 13 136 269 100 194 269 182 4 23 100 276 79 240 226 210 156 112 29 67 142 96 60 23 59 134 50 62 242 182 86 137 158 109 47 77 62 160 287 28 190 53 126 127 235 244 97 209 89 245 205 218 246 53 85 70 206 285 113 181 19 270 30 260 66 253 172 207 215 179 63 5 49 214 71 54 237 241 30 219 9 224 213 223 102 109 3 134 91 119 271 56 70 165 228 84 222 35 157 264 285 195 295 77 103 217 12 291 203 303 123 101 302 193 35 116 122 256 236 7 268 33 242 141 29 108 199 125 238 7 87 289 25 237 200 277 190 50 21 185 153 127 153 45 39 72 121 104 65 268 115 137 199 166 76 36 46 188 53 3 175 148 148 230 40 98 16 203 40 180 130 261 177 63 271 97 127 194 187 68 250 105 132 135 243 290 95 294 270 293 118 37 75 188 94 60 204 107 47 258 110 73 191 161 135 284 43 124 253 254 17 273 12 250 146 274 164 117 274 123 60 245 164 76 217 94 101 261 136 6 242 223 143 166 32 93 75 147 37 31 245 123 19 188 135 202 233 66 31 286 265 48 62 119 230 303 41 291 244 56 152 60 286 2 105 91 78 214 27 111 266 200 14 247 79 199 84 181 282 128 1 301 167 225 17 232 259 221 187 290 136 47 299 252 102 150 145 163 157 ^'}}, - {OUT=>'5509BAFFAC6D507860CEFC5AB5832CB63CD4B687'}], - ['220', {IN=> {f=> '653 0 18 299 207 41 117 184 179 16 252 18 255 83 20 82 264 155 257 216 201 296 54 107 303 255 39 202 61 2 235 154 151 86 94 16 78 84 91 30 86 6 153 36 93 251 209 262 240 134 266 114 119 187 244 8 24 35 22 76 81 26 38 8 68 80 43 32 1 129 24 44 191 118 72 251 165 138 140 99 40 11 54 151 42 276 301 122 164 67 271 50 189 115 7 180 87 200 146 185 285 67 53 219 231 106 153 1 217 272 165 182 264 199 75 237 157 216 157 172 33 72 77 152 280 87 244 270 206 241 293 77 284 40 229 191 30 130 130 174 298 13 48 274 298 57 93 295 27 283 196 54 63 179 234 4 282 37 243 120 31 113 136 181 237 69 274 36 181 193 251 253 80 261 90 186 138 184 223 61 46 53 175 107 6 197 81 114 207 129 59 305 170 162 73 148 100 102 17 140 11 98 275 142 5 221 146 229 103 88 9 139 28 171 189 203 255 301 78 40 273 9 51 86 50 277 57 49 171 233 21 276 257 304 64 32 45 253 124 79 111 221 58 287 288 176 169 12 204 20 170 206 197 169 56 22 41 205 126 300 234 92 145 79 155 39 158 243 208 200 234 48 21 58 199 40 55 178 172 77 196 98 187 200 190 3 23 279 16 296 142 49 39 246 185 23 191 74 254 151 130 218 116 34 4 194 95 122 208 112 292 6 109 218 72 295 289 159 175 19 143 76 169 274 80 305 214 286 173 104 20 126 82 176 213 136 225 55 90 230 262 284 258 60 70 39 290 3 44 147 300 278 216 245 35 75 63 223 52 104 238 263 267 185 67 9 95 210 71 233 283 152 236 42 144 8 286 217 228 41 161 2 279 278 172 121 14 119 143 120 293 68 36 225 11 45 209 58 155 301 34 222 252 280 131 62 291 162 161 90 142 14 163 267 141 249 294 139 290 47 168 247 29 198 13 4 150 277 101 173 192 268 247 73 16 34 266 70 74 166 288 88 227 276 213 180 43 76 125 150 59 43 294 183 108 68 124 167 53 263 49 127 109 14 31 201 78 302 149 215 95 166 26 212 21 232 133 283 108 112 248 188 9 183 152 192 224 123 279 60 114 163 5 265 270 250 59 8 112 204 64 294 227 232 89 159 87 156 22 85 23 147 256 154 195 210 115 51 304 108 156 66 209 44 103 176 257 260 19 11 10 27 21 14 75 19 99 258 69 12 160 202 149 171 277 145 297 292 224 167 97 81 70 83 29 24 67 97 37 25 62 73 104 282 2 61 220 293 33 160 246 273 271 6 65 94 51 260 63 135 110 289 247 38 140 55 222 296 98 231 18 211 265 226 126 38 52 192 180 305 258 25 194 139 246 229 147 212 30 174 254 195 254 239 72 33 28 259 131 18 167 141 205 170 118 28 127 65 182 220 75 281 281 237 113 92 57 137 113 48 12 116 78 128 215 51 42 232 177 22 129 68 168 291 161 ^'}}, - {OUT=>'0C0AEA0C2FD7A620C77866B1A177481E26B4F592'}], - ['221', {IN=> {f=> '653 0 296 275 228 174 34 136 67 229 218 158 158 24 149 13 223 271 225 186 41 59 52 234 302 20 214 21 295 202 282 46 106 240 249 29 262 4 2 87 271 15 4 136 269 100 188 263 182 1 14 94 270 76 240 220 207 156 109 26 64 136 96 51 17 53 134 47 53 239 176 83 134 152 106 38 71 59 157 287 25 298 190 44 123 121 235 241 91 206 83 239 205 212 240 47 82 61 206 285 110 175 10 264 24 254 66 253 166 201 209 176 54 5 46 211 62 48 231 238 27 213 6 224 210 220 102 103 3 131 88 113 268 56 64 165 225 81 219 29 157 258 279 192 295 68 100 217 9 288 203 297 117 98 302 193 32 116 122 250 236 7 268 27 242 135 23 105 196 125 238 305 84 283 22 234 197 274 184 50 12 179 147 127 153 45 33 63 121 101 59 262 109 131 193 166 67 27 40 188 53 172 148 142 224 37 95 7 200 31 177 127 258 174 63 265 97 124 194 181 62 250 102 132 132 237 290 89 291 267 290 118 37 66 185 94 60 201 104 47 255 110 70 188 158 129 278 43 118 247 248 14 267 12 247 143 268 161 117 271 120 57 242 164 76 211 91 101 261 133 3 236 217 143 163 32 87 69 144 34 31 245 123 16 182 135 196 230 60 28 286 259 45 62 116 227 303 35 285 244 50 146 54 283 300 105 91 72 208 27 108 260 194 8 244 79 199 84 178 276 128 302 298 161 222 17 226 259 218 187 287 130 44 296 246 99 144 139 160 44 18 299 205 39 115 183 179 13 252 17 255 81 17 82 263 153 255 215 199 294 53 105 301 254 37 200 60 306 233 153 150 86 93 16 77 82 90 28 84 5 151 33 92 250 207 261 238 132 266 112 119 186 243 6 22 32 19 73 79 26 35 7 66 80 41 30 306 128 24 44 191 117 69 249 163 137 140 99 39 10 54 149 42 276 301 120 162 64 270 47 187 114 5 180 86 198 145 183 284 66 51 219 231 104 152 1 216 272 164 181 264 197 72 237 156 214 155 170 31 72 74 152 279 87 242 269 205 241 293 77 284 37 229 189 29 128 129 173 297 12 45 272 298 56 93 294 24 283 195 52 61 177 232 4 280 34 241 120 28 113 134 181 235 68 273 35 180 191 251 251 78 260 89 186 138 184 223 61 43 50 175 107 6 195 81 114 207 127 56 303 169 160 73 147 98 100 15 138 11 98 273 140 2 221 146 227 101 88 8 139 26 169 189 202 253 300 76 38 273 6 51 85 49 275 55 49 170 233 19 275 257 303 64 31 43 252 122 77 111 219 58 286 288 174 168 11 203 19 170 204 197 169 55 20 41 203 124 299 234 92 145 78 155 36 156 243 208 200 233 48 21 56 198 40 54 178 171 75 196 96 185 199 189 306 23 278 14 296 141 46 38 244 184 21 190 73 252 151 130 217 114 34 2 192 93 121 206 112 292 4 107 216 70 293 112 ^'}}, - {OUT=>'149176007FEE58A591E3F00F8DB658B605F8390C'}], - ['222', {IN=> {f=> '646 1 159 169 19 137 73 163 274 77 302 211 280 167 104 14 126 76 173 210 133 225 46 90 230 262 278 252 51 67 39 284 306 41 147 300 278 216 239 35 75 60 217 43 98 235 257 267 185 61 3 95 207 71 230 280 149 233 33 144 308 283 211 228 38 155 305 273 275 172 115 11 116 140 117 287 59 36 222 2 36 206 303 49 152 295 28 219 249 280 131 53 291 162 161 84 142 14 160 264 141 246 288 136 287 41 165 241 20 198 7 304 144 274 95 173 192 262 244 64 13 31 263 64 65 160 282 82 227 270 213 177 40 70 119 150 53 34 291 180 102 65 124 161 50 263 46 124 109 300 5 28 201 69 299 149 215 92 163 17 206 12 229 133 277 105 109 248 185 9 183 146 189 218 120 279 54 111 163 308 265 270 247 56 8 106 204 61 294 224 226 89 153 81 150 19 85 14 144 256 154 192 210 115 45 304 108 153 63 209 38 103 176 254 257 10 5 10 21 18 8 72 16 93 258 69 6 157 202 146 171 277 139 297 286 221 164 94 78 70 83 29 21 67 91 34 16 59 70 101 279 2 52 214 290 33 160 246 270 265 306 59 88 42 260 54 129 104 289 247 38 137 55 222 293 95 225 12 211 262 226 123 32 49 186 174 305 255 25 191 133 243 226 141 212 30 168 251 195 254 239 69 24 28 253 128 9 167 138 202 164 112 19 121 65 176 220 69 281 278 234 110 86 57 137 107 42 3 113 78 122 212 48 39 232 177 22 129 68 168 285 74 292 275 224 174 30 134 63 227 218 154 158 22 147 9 219 267 221 182 35 59 52 230 298 20 214 15 291 198 282 46 106 238 249 23 260 2 85 271 15 307 136 269 100 184 259 182 308 8 90 266 74 240 216 205 156 107 24 62 132 96 45 13 49 134 45 47 237 172 81 132 148 104 32 67 57 155 287 23 294 190 38 121 117 235 239 87 204 79 235 205 208 236 43 80 55 206 285 108 171 4 260 20 250 66 253 162 197 205 174 48 5 44 209 56 44 227 236 25 209 4 224 208 218 102 99 3 129 86 109 266 56 60 165 223 79 217 25 157 254 275 190 295 62 98 217 7 286 203 293 113 96 302 193 30 116 122 246 236 7 268 23 242 131 19 103 194 125 238 301 82 279 20 232 195 272 180 50 6 175 143 127 153 45 29 57 121 99 55 258 105 127 189 166 61 21 36 188 53 307 170 148 138 220 35 93 1 198 25 175 125 256 172 63 261 97 122 194 177 58 250 100 132 130 233 290 85 289 265 288 118 37 60 183 94 60 199 102 47 253 110 68 186 156 125 274 43 114 243 244 12 263 12 245 141 264 159 117 269 118 55 240 164 76 207 89 101 261 131 1 232 213 143 161 32 83 65 142 32 31 245 123 14 178 135 192 228 56 26 286 255 43 62 114 225 303 31 281 244 46 142 50 281 296 105 91 238 ^'}}, - {OUT=>'17C0D7B0256159F3626786FFDB20237AE154FA84'}], - ['223', {IN=> {f=> '647 0 200 27 104 252 186 240 79 199 84 174 268 128 298 294 153 218 17 218 259 214 187 283 122 40 292 238 95 136 131 156 36 18 299 197 31 107 179 179 1 252 13 255 73 5 82 259 145 247 211 191 286 49 97 293 250 29 192 56 298 225 149 146 86 89 16 73 74 86 20 76 1 143 21 88 246 199 257 230 124 266 104 119 182 239 309 14 20 7 61 71 26 23 3 58 80 33 22 302 124 24 44 191 113 57 241 155 133 140 99 35 6 54 141 42 276 301 112 154 52 266 35 179 110 308 180 82 190 141 175 280 62 43 219 231 96 148 1 212 272 160 177 264 189 60 237 152 206 147 162 23 72 62 152 275 87 234 265 201 241 293 77 284 25 229 181 25 120 125 169 293 8 33 264 298 52 93 290 12 283 191 44 53 169 224 4 272 22 233 120 16 113 126 181 227 64 269 31 176 183 251 243 70 256 85 186 138 184 223 61 31 38 175 107 6 187 81 114 207 119 44 295 165 152 73 143 90 92 7 130 11 98 265 132 301 221 146 219 93 88 4 139 18 161 189 198 245 296 68 30 273 305 51 81 45 267 47 49 166 233 11 271 257 299 64 27 35 248 114 69 111 211 58 282 288 166 164 7 199 15 170 196 197 169 51 12 41 195 116 295 234 92 145 74 155 24 148 243 208 200 229 48 21 48 194 40 50 178 167 67 196 88 177 195 185 299 306 23 274 6 296 137 34 34 236 180 13 186 69 244 151 130 213 106 34 305 184 85 117 198 112 292 307 99 208 62 285 279 159 165 19 133 71 159 274 75 300 209 276 163 104 10 126 72 171 208 131 225 40 90 230 262 274 248 45 65 39 280 304 39 147 300 278 216 235 35 75 58 213 37 94 233 253 267 185 57 310 95 205 71 228 278 147 231 27 144 304 281 207 228 36 151 303 269 273 172 111 9 114 138 115 283 53 36 220 307 30 204 301 43 150 291 24 217 247 280 131 47 291 162 161 80 142 14 158 262 141 244 284 134 285 37 163 237 14 198 3 300 140 272 91 173 192 258 242 58 11 29 261 60 59 156 278 78 227 266 213 175 38 66 115 150 49 28 289 178 98 63 124 157 48 263 44 122 109 296 310 26 201 63 297 149 215 90 161 11 202 6 227 133 273 103 107 248 183 9 183 142 187 214 118 279 50 109 163 306 265 270 245 54 8 102 204 59 294 222 222 89 149 77 146 17 85 8 142 256 154 190 210 115 41 304 108 151 61 209 34 103 176 252 255 4 1 10 17 16 4 70 14 89 258 69 2 155 202 144 171 277 135 297 282 219 162 92 76 70 83 29 19 67 87 32 10 57 68 99 277 2 46 210 288 33 160 246 268 261 302 55 84 36 260 48 125 100 289 247 38 135 55 222 291 93 221 8 211 260 226 121 28 47 182 170 305 253 25 189 129 241 224 137 212 30 164 249 195 254 239 86 ^'}}, - {OUT=>'741A58618ABEB1D983D67AFDCBC49AA397A3B8E0'}], - ['224', {IN=> {f=> '665 0 15 28 247 125 167 135 199 158 106 10 115 65 170 220 63 281 275 231 107 80 57 137 101 36 306 110 78 116 209 45 36 232 177 22 129 68 168 279 74 286 275 218 174 24 131 57 224 218 148 158 19 144 3 213 261 215 176 26 59 52 224 292 20 214 6 285 192 282 46 106 235 249 14 257 311 309 82 271 15 301 136 269 100 178 253 182 308 311 84 260 71 240 210 202 156 104 21 59 126 96 36 7 43 134 42 38 234 166 78 129 142 101 23 61 54 152 287 20 288 190 29 118 111 235 236 81 201 73 229 205 202 230 37 77 46 206 285 105 165 307 254 14 244 66 253 156 191 199 171 39 5 41 206 47 38 221 233 22 203 1 224 205 215 102 93 3 126 83 103 263 56 54 165 220 76 214 19 157 248 269 187 295 53 95 217 4 283 203 287 107 93 302 193 27 116 122 240 236 7 268 17 242 125 13 100 191 125 238 295 79 273 17 229 192 269 174 50 309 169 137 127 153 45 23 48 121 96 49 252 99 121 183 166 52 12 30 188 53 307 167 148 132 214 32 90 304 195 16 172 122 253 169 63 255 97 119 194 171 52 250 97 132 127 227 290 79 286 262 285 118 37 51 180 94 60 196 99 47 250 110 65 183 153 119 268 43 108 237 238 9 257 12 242 138 258 156 117 266 115 52 237 164 76 201 86 101 261 128 310 226 207 143 158 32 77 59 139 29 31 245 123 11 172 135 186 225 50 23 286 249 40 62 111 222 303 25 275 244 40 136 44 278 290 105 91 62 198 27 103 250 184 310 239 79 199 84 173 266 128 297 293 151 217 17 216 259 213 187 282 120 39 291 236 94 134 129 155 34 18 299 195 29 105 178 179 310 252 12 255 71 2 82 258 143 245 210 189 284 48 95 291 249 27 190 55 296 223 148 145 86 88 16 72 72 85 18 74 141 18 87 245 197 256 228 122 266 102 119 181 238 308 12 17 4 58 69 26 20 2 56 80 31 20 301 123 24 44 191 112 54 239 153 132 140 99 34 5 54 139 42 276 301 110 152 49 265 32 177 109 307 180 81 188 140 173 279 61 41 219 231 94 147 1 211 272 159 176 264 187 57 237 151 204 145 160 21 72 59 152 274 87 232 264 200 241 293 77 284 22 229 179 24 118 124 168 292 7 30 262 298 51 93 289 9 283 190 42 51 167 222 4 270 19 231 120 13 113 124 181 225 63 268 30 175 181 251 241 68 255 84 186 138 184 223 61 28 35 175 107 6 185 81 114 207 117 41 293 164 150 73 142 88 90 5 128 11 98 263 130 299 221 146 217 91 88 3 139 16 159 189 197 243 295 66 28 273 303 51 80 44 265 45 49 165 233 9 270 257 298 64 26 33 247 112 67 111 209 58 281 288 164 163 6 198 14 170 194 197 169 50 10 41 193 114 294 234 92 145 73 155 21 146 243 208 200 228 48 21 46 193 40 49 178 166 65 196 86 175 194 184 297 306 23 273 206 ^'}}, - {OUT=>'B738D6B3409EB9ED2F1719B84D13F7C36169CDEC'}], - ['225', {IN=> {f=> '641 0 296 134 25 31 230 177 7 183 66 238 151 130 210 100 34 302 178 79 114 192 112 292 304 93 202 56 279 273 159 159 19 127 68 153 274 72 297 206 270 157 104 4 126 66 168 205 128 225 31 90 230 262 268 242 36 62 39 274 301 36 147 300 278 216 229 35 75 55 207 28 88 230 247 267 185 51 307 95 202 71 225 275 144 228 18 144 298 278 201 228 33 145 300 263 270 172 105 6 111 135 112 277 44 36 217 301 21 201 298 34 147 285 18 214 244 280 131 38 291 162 161 74 142 14 155 259 141 241 278 131 282 31 160 231 5 198 311 294 134 269 85 173 192 252 239 49 8 26 258 54 50 150 272 72 227 260 213 172 35 60 109 150 43 19 286 175 92 60 124 151 45 263 41 119 109 290 304 23 201 54 294 149 215 87 158 2 196 311 224 133 267 100 104 248 180 9 183 136 184 208 115 279 44 106 163 303 265 270 242 51 8 96 204 56 294 219 216 89 143 71 140 14 85 313 139 256 154 187 210 115 35 304 108 148 58 209 28 103 176 249 252 309 309 10 11 13 312 67 11 83 258 69 310 152 202 141 171 277 129 297 276 216 159 89 73 70 83 29 16 67 81 29 1 54 65 96 274 2 37 204 285 33 160 246 265 255 296 49 78 27 260 39 119 94 289 247 38 132 55 222 288 90 215 2 211 257 226 118 22 44 176 164 305 250 25 186 123 238 221 131 212 30 158 246 195 254 239 64 9 28 243 123 308 167 133 197 154 102 4 111 65 166 220 59 281 273 229 105 76 57 137 97 32 302 108 78 112 207 43 34 232 177 22 129 68 168 275 74 282 275 214 174 20 129 53 222 218 144 158 17 142 313 209 257 211 172 20 59 52 220 288 20 214 281 188 282 46 106 233 249 8 255 311 309 80 271 15 297 136 269 100 174 249 182 308 307 80 256 69 240 206 200 156 102 19 57 122 96 30 3 39 134 40 32 232 162 76 127 138 99 17 57 52 150 287 18 284 190 23 116 107 235 234 77 199 69 225 205 198 226 33 75 40 206 285 103 161 303 250 10 240 66 253 152 187 195 169 33 5 39 204 41 34 217 231 20 199 313 224 203 213 102 89 3 124 81 99 261 56 50 165 218 74 212 15 157 244 265 185 295 47 93 217 2 281 203 283 103 91 302 193 25 116 122 236 236 7 268 13 242 121 9 98 189 125 238 291 77 269 15 227 190 267 170 50 305 165 133 127 153 45 19 42 121 94 45 248 95 117 179 166 46 6 26 188 53 307 165 148 128 210 30 88 300 193 10 170 120 251 167 63 251 97 117 194 167 48 250 95 132 125 223 290 75 284 260 283 118 37 45 178 94 60 194 97 47 248 110 63 181 151 115 264 43 104 233 234 7 253 12 240 136 254 154 117 264 113 50 235 164 76 197 84 101 261 126 310 222 203 143 276 ^'}}, - {OUT=>'3D33DE31F64055D3B128AC9A6AA3F92DFD4F5330'}], - ['226', {IN=> {f=> '656 0 32 69 51 135 25 31 245 123 7 164 135 178 221 42 19 286 241 36 62 107 218 303 17 267 244 32 128 36 274 282 105 91 54 190 27 99 242 176 306 235 79 199 84 169 258 128 293 289 143 213 17 208 259 209 187 278 112 35 287 228 90 126 121 151 26 18 299 187 21 97 174 179 302 252 8 255 63 306 82 254 135 237 206 181 276 44 87 283 245 19 182 51 288 215 144 141 86 84 16 68 64 81 10 66 312 133 6 83 241 189 252 220 114 266 94 119 177 234 304 4 5 308 46 61 26 8 314 48 80 23 12 297 119 24 44 191 108 42 231 145 128 140 99 30 1 54 131 42 276 301 102 144 37 261 20 169 105 303 180 77 180 136 165 275 57 33 219 231 86 143 1 207 272 155 172 264 179 45 237 147 196 137 152 13 72 47 152 270 87 224 260 196 241 293 77 284 10 229 171 20 110 120 164 288 3 18 254 298 47 93 285 313 283 186 34 43 159 214 4 262 7 223 120 1 113 116 181 217 59 264 26 171 173 251 233 60 251 80 186 138 184 223 61 16 23 175 107 6 177 81 114 207 109 29 285 160 142 73 138 80 82 313 120 11 98 255 122 291 221 146 209 83 88 315 139 8 151 189 193 235 291 58 20 273 295 51 76 40 257 37 49 161 233 1 266 257 294 64 22 25 243 104 59 111 201 58 277 288 156 159 2 194 10 170 186 197 169 46 2 41 185 106 290 234 92 145 69 155 9 138 243 208 200 224 48 21 38 189 40 45 178 162 57 196 78 167 190 180 289 306 23 269 312 296 132 19 29 226 175 3 181 64 234 151 130 208 96 34 300 174 75 112 188 112 292 302 89 198 52 275 269 159 155 19 123 66 149 274 70 295 204 266 153 104 126 62 166 203 126 225 25 90 230 262 264 238 30 60 39 270 299 34 147 300 278 216 225 35 75 53 203 22 84 228 243 267 185 47 305 95 200 71 223 273 142 226 12 144 294 276 197 228 31 141 298 259 268 172 101 4 109 133 110 273 38 36 215 297 15 199 296 28 145 281 14 212 242 280 131 32 291 162 161 70 142 14 153 257 141 239 274 129 280 27 158 227 315 198 309 290 130 267 81 173 192 248 237 43 6 24 256 50 44 146 268 68 227 256 213 170 33 56 105 150 39 13 284 173 88 58 124 147 43 263 39 117 109 286 300 21 201 48 292 149 215 85 156 312 192 307 222 133 263 98 102 248 178 9 183 132 182 204 113 279 40 104 163 301 265 270 240 49 8 92 204 54 294 217 212 89 139 67 136 12 85 309 137 256 154 185 210 115 31 304 108 146 56 209 24 103 176 247 250 305 307 10 7 11 310 65 9 79 258 69 308 150 202 139 171 277 125 297 272 214 157 87 71 70 83 29 14 67 77 27 311 52 63 94 272 2 31 200 283 33 160 246 263 251 292 45 74 21 260 33 115 90 289 247 38 130 55 222 286 88 211 227 ^'}}, - {OUT=>'B6925F4DF94949B8844C867428BA3DEDF4CF2B51'}], - ['227', {IN=> {f=> '668 0 211 254 226 115 16 41 170 158 305 247 25 183 117 235 218 125 212 30 152 243 195 254 239 61 28 237 120 302 167 130 194 148 96 312 105 65 160 220 53 281 270 226 102 70 57 137 91 26 296 105 78 106 204 40 31 232 177 22 129 68 168 269 74 276 275 208 174 14 126 47 219 218 138 158 14 139 310 203 251 205 166 11 59 52 214 282 20 214 308 275 182 282 46 106 230 249 316 252 311 309 77 271 15 291 136 269 100 168 243 182 308 301 74 250 66 240 200 197 156 99 16 54 116 96 21 314 33 134 37 23 229 156 73 124 132 96 8 51 49 147 287 15 278 190 14 113 101 235 231 71 196 63 219 205 192 220 27 72 31 206 285 100 155 297 244 4 234 66 253 146 181 189 166 24 5 36 201 32 28 211 228 17 193 313 224 200 210 102 83 3 121 78 93 258 56 44 165 215 71 209 9 157 238 259 182 295 38 90 217 316 278 203 277 97 88 302 193 22 116 122 230 236 7 268 7 242 115 3 95 186 125 238 285 74 263 12 224 187 264 164 50 299 159 127 127 153 45 13 33 121 91 39 242 89 111 173 166 37 314 20 188 53 307 162 148 122 204 27 85 294 190 1 167 117 248 164 63 245 97 114 194 161 42 250 92 132 122 217 290 69 281 257 280 118 37 36 175 94 60 191 94 47 245 110 60 178 148 109 258 43 98 227 228 4 247 12 237 133 248 151 117 261 110 47 232 164 76 191 81 101 261 123 310 216 197 143 153 32 67 49 134 24 31 245 123 6 162 135 176 220 40 18 286 239 35 62 106 217 303 15 265 244 30 126 34 273 280 105 91 52 188 27 98 240 174 305 234 79 199 84 168 256 128 292 288 141 212 17 206 259 208 187 277 110 34 286 226 89 124 119 150 24 18 299 185 19 95 173 179 300 252 7 255 61 304 82 253 133 235 205 179 274 43 85 281 244 17 180 50 286 213 143 140 86 83 16 67 62 80 8 64 312 131 3 82 240 187 251 218 112 266 92 119 176 233 303 2 2 306 43 59 26 5 314 46 80 21 10 296 118 24 44 191 107 39 229 143 127 140 99 29 54 129 42 276 301 100 142 34 260 17 167 104 302 180 76 178 135 163 274 56 31 219 231 84 142 1 206 272 154 171 264 177 42 237 146 194 135 150 11 72 44 152 269 87 222 259 195 241 293 77 284 7 229 169 19 108 119 163 287 2 15 252 298 46 93 284 311 283 185 32 41 157 212 4 260 4 221 120 315 113 114 181 215 58 263 25 170 171 251 231 58 250 79 186 138 184 223 61 13 20 175 107 6 175 81 114 207 107 26 283 159 140 73 137 78 80 312 118 11 98 253 120 289 221 146 207 81 88 315 139 6 149 189 192 233 290 56 18 273 293 51 75 39 255 35 49 160 233 316 265 257 293 64 21 23 242 102 57 111 199 58 276 288 154 158 1 193 9 170 184 197 169 45 41 183 104 289 234 92 145 68 155 6 136 243 208 203 ^'}}, - {OUT=>'CF5E7256292ABEC431D8E8B9CBEAF22AF072377E'}], - ['228', {IN=> {f=> '656 0 221 48 21 32 186 40 42 178 159 51 196 72 161 187 177 283 306 23 266 309 296 129 10 26 220 172 316 178 61 228 151 130 205 90 34 297 168 69 109 182 112 292 299 83 192 46 269 263 159 149 19 117 63 143 274 67 292 201 260 147 104 313 126 56 163 200 123 225 16 90 230 262 258 232 21 57 39 264 296 31 147 300 278 216 219 35 75 50 197 13 78 225 237 267 185 41 302 95 197 71 220 270 139 223 3 144 288 273 191 228 28 135 295 253 265 172 95 1 106 130 107 267 29 36 212 291 6 196 293 19 142 275 8 209 239 280 131 23 291 162 161 64 142 14 150 254 141 236 268 126 277 21 155 221 309 198 306 284 124 264 75 173 192 242 234 34 3 21 253 44 35 140 262 62 227 250 213 167 30 50 99 150 33 4 281 170 82 55 124 141 40 263 36 114 109 280 294 18 201 39 289 149 215 82 153 306 186 301 219 133 257 95 99 248 175 9 183 126 179 198 110 279 34 101 163 298 265 270 237 46 8 86 204 51 294 214 206 89 133 61 130 9 85 303 134 256 154 182 210 115 25 304 108 143 53 209 18 103 176 244 247 299 304 10 1 8 307 62 6 73 258 69 305 147 202 136 171 277 119 297 266 211 154 84 68 70 83 29 11 67 71 24 305 49 60 91 269 2 22 194 280 33 160 246 260 245 286 39 68 12 260 24 109 84 289 247 38 127 55 222 283 85 205 311 211 252 226 113 12 39 166 154 305 245 25 181 113 233 216 121 212 30 148 241 195 254 239 59 313 28 233 118 298 167 128 192 144 92 308 101 65 156 220 49 281 268 224 100 66 57 137 87 22 292 103 78 102 202 38 29 232 177 22 129 68 168 265 74 272 275 204 174 10 124 43 217 218 134 158 12 137 308 199 247 201 162 5 59 52 210 278 20 214 304 271 178 282 46 106 228 249 312 250 311 309 75 271 15 287 136 269 100 164 239 182 308 297 70 246 64 240 196 195 156 97 14 52 112 96 15 312 29 134 35 17 227 152 71 122 128 94 2 47 47 145 287 13 274 190 8 111 97 235 229 67 194 59 215 205 188 216 23 70 25 206 285 98 151 293 240 230 66 253 142 177 185 164 18 5 34 199 26 24 207 226 15 189 313 224 198 208 102 79 3 119 76 89 256 56 40 165 213 69 207 5 157 234 255 180 295 32 88 217 316 276 203 273 93 86 302 193 20 116 122 226 236 7 268 3 242 111 318 93 184 125 238 281 72 259 10 222 185 262 160 50 295 155 123 127 153 45 9 27 121 89 35 238 85 107 169 166 31 310 16 188 53 307 160 148 118 200 25 83 290 188 314 165 115 246 162 63 241 97 112 194 157 38 250 90 132 120 213 290 65 279 255 278 118 37 30 173 94 60 189 92 47 243 110 58 176 146 105 254 43 94 223 224 2 243 12 235 131 244 149 117 259 108 45 230 164 76 187 79 101 261 109 ^'}}, - {OUT=>'975DCE94902923977F129C0E4ACF40AD28DDB9AA'}], - ['229', {IN=> {f=> '656 0 310 208 189 143 149 32 59 41 130 20 31 245 123 2 154 135 168 216 32 14 286 231 31 62 102 213 303 7 257 244 22 118 26 269 272 105 91 44 180 27 94 232 166 301 230 79 199 84 164 248 128 288 284 133 208 17 198 259 204 187 273 102 30 282 218 85 116 111 146 16 18 299 177 11 87 169 179 292 252 3 255 53 296 82 249 125 227 201 171 266 39 77 273 240 9 172 46 278 205 139 136 86 79 16 63 54 76 56 312 123 312 78 236 179 247 210 104 266 84 119 172 229 299 315 311 298 31 51 26 314 314 38 80 13 2 292 114 24 44 191 103 27 221 135 123 140 99 25 317 54 121 42 276 301 92 134 22 256 5 159 100 298 180 72 170 131 155 270 52 23 219 231 76 138 1 202 272 150 167 264 169 30 237 142 186 127 142 3 72 32 152 265 87 214 255 191 241 293 77 284 316 229 161 15 100 115 159 283 319 3 244 298 42 93 280 303 283 181 24 33 149 204 4 252 313 213 120 307 113 106 181 207 54 259 21 166 163 251 223 50 246 75 186 138 184 223 61 1 8 175 107 6 167 81 114 207 99 14 275 155 132 73 133 70 72 308 110 11 98 245 112 281 221 146 199 73 88 315 139 319 141 189 188 225 286 48 10 273 285 51 71 35 247 27 49 156 233 312 261 257 289 64 17 15 238 94 49 111 191 58 272 288 146 154 318 189 5 170 176 197 169 41 313 41 175 96 285 234 92 145 64 155 315 128 243 208 200 219 48 21 28 184 40 40 178 157 47 196 68 157 185 175 279 306 23 264 307 296 127 4 24 216 170 314 176 59 224 151 130 203 86 34 295 164 65 107 178 112 292 297 79 188 42 265 259 159 145 19 113 61 139 274 65 290 199 256 143 104 311 126 52 161 198 121 225 10 90 230 262 254 228 15 55 39 260 294 29 147 300 278 216 215 35 75 48 193 7 74 223 233 267 185 37 300 95 195 71 218 268 137 221 318 144 284 271 187 228 26 131 293 249 263 172 91 320 104 128 105 263 23 36 210 287 194 291 13 140 271 4 207 237 280 131 17 291 162 161 60 142 14 148 252 141 234 264 124 275 17 153 217 305 198 304 280 120 262 71 173 192 238 232 28 1 19 251 40 29 136 258 58 227 246 213 165 28 46 95 150 29 319 279 168 78 53 124 137 38 263 34 112 109 276 290 16 201 33 287 149 215 80 151 302 182 297 217 133 253 93 97 248 173 9 183 122 177 194 108 279 30 99 163 296 265 270 235 44 8 82 204 49 294 212 202 89 129 57 126 7 85 299 132 256 154 180 210 115 21 304 108 141 51 209 14 103 176 242 245 295 302 10 318 6 305 60 4 69 258 69 303 145 202 134 171 277 115 297 262 209 152 82 66 70 83 29 9 67 67 22 301 47 58 89 267 2 16 190 278 33 160 246 258 241 282 35 64 6 260 18 105 80 289 247 38 125 55 292 ^'}}, - {OUT=>'333B0259B18CE64D6B52CF563DD3041E5F63A516'}], - ); - -sub binary_expand ($$) -{ - my ($test_name, $line) = @_; - my ($n, $b, $rest) = split ' ', $line, 3; - defined $n && defined $b or die "$test_name: too few args\n"; - my @a = split ' ', $rest, $n + 1; - my $caret = pop @a; - $caret eq '^' or die "test $test_name: @a missing '^'\n"; - $b eq '1' || $b eq '0' or die "test $test_name: bad 'b'=$b\n"; - my $n_bad = @a; - @a == $n or - die "test $test_name: wrong number of args (expected $n, found $n_bad)\n"; - my $bit_string = ''; - foreach my $a (@a) - { - $bit_string .= $b x $a; - $b = 1 - $b; - } - my $t = pack ("B*", $bit_string); - # print "$bit_string\n $t\n"; - return $t; -} - -my $t; -foreach $t (@Tests) - { - # Expand each input. - my $in = $t->[1]->{IN}; - $in->{f} = binary_expand $t->[0], $in->{f}; - - # Convert each expected output string to lower case, and append " f\n". - my $h = $t->[2]; - $h->{OUT} = lc $h->{OUT} . " f\n"; - - # Insert the '--text' argument for each test. - splice @$t, 1, 0, '--text'; - } - -my $save_temps = $ENV{DEBUG}; -my $verbose = $ENV{VERBOSE}; - -my $prog = 'sha1sum'; -my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); -exit $fail; diff --git a/tests/misc/sha1sum-vec.pl b/tests/misc/sha1sum-vec.pl new file mode 100755 index 00000000..6df91d64 --- /dev/null +++ b/tests/misc/sha1sum-vec.pl @@ -0,0 +1,534 @@ +#!/usr/bin/perl +# Sample vectors for "sha1sum". + +# Copyright (C) 2000-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/>. + +use strict; + +(my $program_name = $0) =~ s|.*/||; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +# The data from which these tests were derived came from here: +# http://csrc.nist.gov/cryptval/shs/sha1-vectors.zip + +my @Tests = + ( + ['1', {IN=> {f=> '0 1 ^'}}, + {OUT=>'DA39A3EE5E6B4B0D3255BFEF95601890AFD80709'}], + ['2', {IN=> {f=> '5 0 2 1 2 1 2 ^'}}, + {OUT=>'3CDF2936DA2FC556BFA533AB1EB59CE710AC80E5'}], + ['3', {IN=> {f=> '5 0 1 3 4 4 4 ^'}}, + {OUT=>'19C1E2048FA7393CFBF2D310AD8209EC11D996E5'}], + ['4', {IN=> {f=> '7 0 4 3 4 4 1 4 4 ^'}}, + {OUT=>'CA775D8C80FAA6F87FA62BECA6CA6089D63B56E5'}], + ['5', {IN=> {f=> '10 0 4 1 5 3 4 4 3 1 3 4 ^'}}, + {OUT=>'71AC973D0E4B50AE9E5043FF4D615381120A25A0'}], + ['6', {IN=> {f=> '10 0 3 1 6 5 5 1 3 6 6 4 ^'}}, + {OUT=>'A6B5B9F854CFB76701C3BDDBF374B3094EA49CBA'}], + ['7', {IN=> {f=> '13 1 3 2 5 3 3 3 4 6 6 1 4 6 2 ^'}}, + {OUT=>'D87A0EE74E4B9AD72E6847C87BDEEB3D07844380'}], + ['8', {IN=> {f=> '16 1 3 5 5 1 2 1 3 3 6 3 5 2 3 5 7 2 ^'}}, + {OUT=>'1976B8DD509FE66BF09C9A8D33534D4EF4F63BFD'}], + ['9', {IN=> {f=> '15 1 8 1 5 3 2 7 4 5 6 7 3 3 1 6 3 ^'}}, + {OUT=>'5A78F439B6DB845BB8A558E4CEB106CD7B7FF783'}], + ['10', {IN=> {f=> '15 1 4 6 8 2 1 4 2 5 1 6 8 8 6 4 7 ^'}}, + {OUT=>'F871BCE62436C1E280357416695EE2EF9B83695C'}], + ['11', {IN=> {f=> '18 1 1 2 7 3 8 6 7 5 4 3 4 3 5 3 3 2 6 8 ^'}}, + {OUT=>'62B243D1B780E1D31CF1BA2DE3F01C72AEEA0E47'}], + ['12', {IN=> {f=> '16 0 9 8 1 8 1 7 6 7 7 1 2 6 9 5 4 7 ^'}}, + {OUT=>'1698994A273404848E56E7FDA4457B5900DE1342'}], + ['13', {IN=> {f=> '18 0 7 1 7 3 9 4 7 7 5 2 8 1 7 8 2 7 2 9 ^'}}, + {OUT=>'056F4CDC02791DA7ED1EB2303314F7667518DEEF'}], + ['14', {IN=> {f=> '19 1 2 3 1 8 8 6 9 10 3 10 8 9 2 4 1 5 1 5 9 ^'}}, + {OUT=>'9FE2DA967BD8441EEA1C32DF68DDAA9DC1FC8E4B'}], + ['15', {IN=> {f=> '19 1 8 5 4 8 1 3 9 5 7 7 2 7 2 7 8 7 4 8 10 ^'}}, + {OUT=>'73A31777B4ACE9384EFA8BBEAD45C51A71ABA6DD'}], + ['16', {IN=> {f=> '20 1 1 9 7 4 1 4 5 1 10 8 6 4 4 9 9 9 8 2 9 10 ^'}}, + {OUT=>'3F9D7C4E2384EDDABFF5DD8A31E23DE3D03F42AC'}], + ['17', {IN=> {f=> '19 1 11 6 7 7 2 6 2 6 10 6 9 10 5 11 1 6 8 11 4 ^'}}, + {OUT=>'4814908F72B93FFD011135BEE347DE9A08DA838F'}], + ['18', {IN=> {f=> '22 0 10 5 10 3 7 8 9 9 1 1 1 10 2 1 5 10 2 9 9 9 7 8 ^'}}, + {OUT=>'0978374B67A412A3102C5AA0B10E1A6596FC68EB'}], + ['19', {IN=> {f=> '21 0 1 10 1 6 9 4 2 5 2 11 8 12 12 9 8 1 3 10 7 11 12 ^'}}, + {OUT=>'44AD6CB618BD935460D46D3F921D87B99AB91C1E'}], + ['20', {IN=> {f=> '24 1 3 9 5 12 3 4 2 9 12 11 6 6 1 1 9 5 9 1 4 9 4 10 8 9 ^'}}, + {OUT=>'02DC989AF265B09CF8485640842128DCF95E9F39'}], + ['21', {IN=> {f=> '25 1 3 2 3 11 1 12 5 6 2 7 8 4 8 8 9 9 8 4 9 1 4 8 10 9 9 ^'}}, + {OUT=>'67507B8D497B35D6E99FC01976D73F54AECA75CF'}], + ['22', {IN=> {f=> '23 0 11 10 7 10 10 6 10 9 4 5 10 5 8 4 1 10 12 4 6 1 8 11 6 ^'}}, + {OUT=>'1EAE0373C1317CB60C36A42A867B716039D441F5'}], + ['23', {IN=> {f=> '22 0 12 8 10 4 3 8 5 5 7 11 13 11 12 11 4 12 3 6 5 11 10 5 ^'}}, + {OUT=>'9C3834589E5BFFAC9F50950E0199B3EC2620BEC8'}], + ['24', {IN=> {f=> '26 1 10 9 6 9 7 2 10 4 4 5 5 2 12 13 5 3 1 10 1 4 7 8 13 13 12 9 ^'}}, + {OUT=>'209F7ABC7F3B878EE46CDF3A1FBB9C21C3474F32'}], + ['25', {IN=> {f=> '31 0 2 6 5 4 7 3 10 6 13 6 3 9 6 2 10 5 3 8 4 1 11 3 5 3 7 11 1 12 9 12 5 ^'}}, + {OUT=>'05FC054B00D97753A9B3E2DA8FBBA3EE808CEF22'}], + ['26', {IN=> {f=> '27 1 14 5 1 3 7 2 3 9 3 4 14 4 4 10 8 5 14 1 11 12 12 10 4 13 7 11 9 ^'}}, + {OUT=>'0C4980EA3A46C757DFBFC5BAA38AC6C8E72DDCE7'}], + ['27', {IN=> {f=> '30 1 4 9 5 5 8 9 5 10 4 2 4 7 9 9 6 3 5 1 8 3 2 13 3 14 9 8 9 10 14 10 ^'}}, + {OUT=>'96A460D2972D276928B69864445BEA353BDCFFD2'}], + ['28', {IN=> {f=> '27 0 12 9 5 8 7 2 14 12 3 8 14 6 6 4 7 5 7 10 7 11 10 1 9 6 7 12 14 ^'}}, + {OUT=>'F3EF04D8FA8C6FA9850F394A4554C080956FA64B'}], + ['29', {IN=> {f=> '24 0 12 9 9 2 11 13 12 11 11 6 14 13 10 5 6 8 10 4 3 11 11 14 5 14 ^'}}, + {OUT=>'F2A31D875D1D7B30874D416C4D2EA6BAF0FFBAFE'}], + ['30', {IN=> {f=> '24 0 15 4 5 3 8 12 15 8 14 15 9 12 12 3 10 13 6 11 10 4 13 14 8 8 ^'}}, + {OUT=>'F4942D3B9E9588DCFDC6312A84DF75D05F111C20'}], + ['31', {IN=> {f=> '28 1 1 8 1 5 11 4 9 12 4 13 15 5 9 11 7 14 11 1 11 7 8 8 11 1 13 15 12 13 ^'}}, + {OUT=>'310207DF35B014E4676D30806FA34424813734DD'}], + ['32', {IN=> {f=> '32 1 5 8 3 8 10 7 8 1 5 13 12 14 5 3 6 4 12 15 6 6 10 11 13 9 1 11 6 10 3 7 14 2 ^'}}, + {OUT=>'4DA1955B2FA7C7E74E3F47D7360CE530BBF57CA3'}], + ['33', {IN=> {f=> '31 0 10 3 5 1 14 11 11 16 1 2 2 11 6 13 15 12 6 5 16 2 14 2 10 12 2 5 5 6 10 13 15 ^'}}, + {OUT=>'74C4BC5B26FB4A08602D40CCEC6C6161B6C11478'}], + ['34', {IN=> {f=> '34 0 3 10 8 16 9 5 12 15 4 11 13 3 6 5 10 8 1 3 9 3 11 1 2 16 12 10 6 1 9 1 16 5 6 14 ^'}}, + {OUT=>'0B103CE297338DFC7395F7715EE47539B556DDB6'}], + ['35', {IN=> {f=> '30 1 1 12 4 4 2 15 13 15 11 15 5 11 9 7 15 16 6 16 12 3 2 10 16 5 5 7 1 7 11 16 ^'}}, + {OUT=>'EFC72D99E3D2311CE14190C0B726BDC68F4B0821'}], + ['36', {IN=> {f=> '34 0 7 9 11 2 5 5 5 4 13 13 14 4 7 12 6 4 8 2 9 9 13 13 3 3 6 7 16 7 6 15 5 8 15 14 ^'}}, + {OUT=>'660EDAC0A8F4CE33DA0D8DBAE597650E97687250'}], + ['37', {IN=> {f=> '36 1 4 6 16 15 11 14 14 4 7 10 3 4 10 3 6 7 14 4 6 6 5 2 7 8 16 2 12 16 10 14 3 2 3 7 14 3 ^'}}, + {OUT=>'FE0A55A988B3B93946A63EB36B23785A5E6EFC3E'}], + ['38', {IN=> {f=> '32 0 15 10 9 1 14 10 14 6 6 16 3 2 3 8 3 12 8 11 17 3 9 7 16 14 4 11 15 5 13 9 5 17 ^'}}, + {OUT=>'0CBDF2A5781C59F907513147A0DE3CC774B54BF3'}], + ['39', {IN=> {f=> '30 0 17 17 13 8 2 6 8 16 1 12 5 17 2 9 8 10 13 14 11 17 12 5 14 9 11 9 11 4 11 12 ^'}}, + {OUT=>'663E40FEE5A44BFCB1C99EA5935A6B5BC9F583B0'}], + ['40', {IN=> {f=> '30 1 16 6 10 5 8 3 17 16 14 1 15 15 15 6 13 2 11 6 13 11 13 4 6 7 11 11 12 16 13 16 ^'}}, + {OUT=>'00162134256952DD9AE6B51EFB159B35C3C138C7'}], + ['41', {IN=> {f=> '33 1 16 16 14 16 2 4 16 11 6 15 7 4 17 6 5 7 6 3 14 16 5 17 11 13 1 1 14 13 3 6 14 5 16 ^'}}, + {OUT=>'CEB88E4736E354416E2010FC1061B3B53B81664B'}], + ['42', {IN=> {f=> '39 1 2 16 13 7 8 6 2 15 1 9 12 4 4 11 13 7 2 11 9 18 4 5 4 8 2 14 9 9 1 8 13 11 15 8 5 9 10 16 7 ^'}}, + {OUT=>'A6A2C4B6BCC41DDC67278F3DF4D8D0B9DD7784EF'}], + ['43', {IN=> {f=> '34 0 2 7 1 1 17 13 6 11 10 8 5 12 15 6 15 10 12 4 18 1 2 8 11 12 16 10 12 18 11 16 12 11 17 6 ^'}}, + {OUT=>'C23D083CD8820B57800A869F5F261D45E02DC55D'}], + ['44', {IN=> {f=> '34 1 4 7 13 7 10 7 10 6 1 12 7 18 11 18 2 10 15 10 14 8 18 9 9 12 12 3 13 12 6 4 9 17 13 17 ^'}}, + {OUT=>'E8AC31927B78DDEC41A31CA7A44EB7177165E7AB'}], + ['45', {IN=> {f=> '40 0 5 7 3 2 1 17 14 4 16 6 13 1 13 6 6 10 1 3 18 3 11 7 9 5 7 11 17 1 9 16 5 15 10 17 3 8 15 17 8 12 ^'}}, + {OUT=>'E864EC5DBAB0F9FF6984AB6AD43A8C9B81CC9F9C'}], + ['46', {IN=> {f=> '40 0 11 3 15 17 11 1 1 4 3 14 18 4 2 18 8 15 6 4 6 3 15 11 16 10 17 17 9 6 3 2 6 16 4 9 12 6 8 1 11 17 ^'}}, + {OUT=>'CFED6269069417A84D6DE2347220F4B858BCD530'}], + ['47', {IN=> {f=> '37 1 2 19 12 8 16 14 2 9 16 2 6 6 7 9 10 9 11 9 14 11 15 5 16 9 2 17 2 8 15 8 4 3 14 14 16 16 12 ^'}}, + {OUT=>'D9217BFB46C96348722C3783D29D4B1A3FEDA38C'}], + ['48', {IN=> {f=> '37 1 11 10 16 12 11 7 14 14 14 6 10 10 1 6 13 19 5 6 4 7 12 12 10 5 10 15 15 8 5 13 17 13 5 6 14 1 19 ^'}}, + {OUT=>'DEC24E5554F79697218D317315FA986229CE3350'}], + ['49', {IN=> {f=> '38 1 2 6 5 17 9 11 18 18 8 6 13 15 3 3 15 5 13 18 3 2 5 5 14 7 13 4 17 7 2 17 3 18 15 7 15 16 18 11 ^'}}, + {OUT=>'83A099DF7071437BA5495A5B0BFBFEFE1C0EF7F3'}], + ['50', {IN=> {f=> '38 1 12 8 6 3 17 12 13 19 15 9 7 17 16 15 3 11 11 5 2 13 19 16 2 4 16 7 8 1 2 9 17 12 3 5 18 19 11 9 ^'}}, + {OUT=>'AA3198E30891A83E33CE3BFA0587D86A197D4F80'}], + ['51', {IN=> {f=> '39 1 14 16 14 8 9 16 5 1 6 3 17 18 16 9 1 15 9 10 9 19 1 3 3 20 11 13 17 1 19 8 3 4 3 7 1 14 19 19 19 ^'}}, + {OUT=>'9B6ACBEB4989CBEE7015C7D515A75672FFDE3442'}], + ['52', {IN=> {f=> '37 1 18 13 11 5 18 4 19 10 6 19 11 17 10 10 7 9 13 16 9 10 18 4 12 5 16 5 20 12 3 8 10 1 18 1 6 20 14 ^'}}, + {OUT=>'B021EB08A436B02658EAA7BA3C88D49F1219C035'}], + ['53', {IN=> {f=> '36 0 8 9 6 12 11 7 7 3 17 13 6 20 17 9 20 16 10 12 17 8 11 8 11 10 5 10 14 18 8 19 9 12 12 2 20 19 ^'}}, + {OUT=>'CAE36DAB8AEA29F62E0855D9CB3CD8E7D39094B1'}], + ['54', {IN=> {f=> '39 0 12 16 20 3 9 9 19 17 13 13 4 17 2 11 7 14 3 6 16 13 10 13 5 16 10 2 8 2 17 19 4 17 7 19 6 9 15 15 6 ^'}}, + {OUT=>'02DE8BA699F3C1B0CB5AD89A01F2346E630459D7'}], + ['55', {IN=> {f=> '43 0 7 2 18 5 7 18 5 2 15 7 11 10 9 3 2 14 19 3 11 8 18 15 5 3 5 12 15 16 10 17 7 19 16 2 1 16 6 3 19 12 5 18 16 ^'}}, + {OUT=>'88021458847DD39B4495368F7254941859FAD44B'}], + ['56', {IN=> {f=> '49 1 9 11 2 1 12 11 14 12 14 10 4 11 6 8 16 7 5 11 20 8 17 4 14 4 15 3 2 2 4 3 2 3 14 15 10 2 12 7 3 7 20 20 19 10 2 3 1 10 20 ^'}}, + {OUT=>'91A165295C666FE85C2ADBC5A10329DAF0CB81A0'}], + ['57', {IN=> {f=> '36 0 19 20 12 5 19 21 5 21 11 14 19 1 17 8 9 4 19 3 17 1 14 21 14 7 6 5 20 14 21 20 4 6 21 7 11 12 ^'}}, + {OUT=>'4B31312EAF8B506811151A9DBD162961F7548C4B'}], + ['58', {IN=> {f=> '41 0 12 9 11 6 16 18 18 10 11 20 6 12 11 5 7 21 19 18 6 15 21 10 4 14 9 19 10 3 3 5 13 1 8 12 3 13 9 7 10 17 14 ^'}}, + {OUT=>'3FE70971B20558F7E9BAC303ED2BC14BDE659A62'}], + ['59', {IN=> {f=> '45 0 10 6 8 3 17 18 3 21 19 6 17 15 4 9 15 9 15 14 4 7 14 8 10 13 4 11 10 7 6 21 1 14 5 11 7 7 2 13 13 3 9 13 8 14 20 ^'}}, + {OUT=>'93FB769D5BF49D6C563685954E2AECC024DC02D6'}], + ['60', {IN=> {f=> '39 1 3 7 18 4 9 9 5 15 13 17 10 15 16 20 8 19 9 10 9 1 19 14 21 2 18 13 10 4 18 16 4 21 15 10 18 19 3 12 18 ^'}}, + {OUT=>'BC8827C3E614D515E83DEA503989DEA4FDA6EA13'}], + ['61', {IN=> {f=> '41 0 14 4 13 11 1 11 1 10 2 12 4 21 10 21 18 9 2 16 7 20 6 7 12 19 20 1 13 12 10 8 21 15 7 19 13 6 8 19 20 18 19 ^'}}, + {OUT=>'E83868DBE4A389AB48E61CFC4ED894F32AE112AC'}], + ['62', {IN=> {f=> '37 0 11 18 1 17 14 15 20 16 20 8 2 17 10 4 21 5 19 19 14 22 21 18 13 14 1 3 12 11 11 4 22 13 5 18 7 21 21 ^'}}, + {OUT=>'55C95459CDE4B33791B4B2BCAAF840930AF3F3BD'}], + ['63', {IN=> {f=> '48 0 9 22 19 12 8 16 5 17 5 9 1 2 9 6 12 6 1 7 4 3 15 1 14 1 12 3 10 2 10 14 21 13 17 6 6 17 1 21 2 14 16 17 9 11 20 21 11 18 ^'}}, + {OUT=>'36BB0E2BA438A3E03214D9ED2B28A4D5C578FCAA'}], + ['64', {IN=> {f=> '50 1 12 8 20 13 2 9 20 9 14 10 1 16 2 22 6 4 16 14 15 1 12 4 14 9 21 3 3 9 8 21 15 14 8 4 14 4 2 3 8 12 8 6 1 2 18 20 15 3 19 10 ^'}}, + {OUT=>'3ACBF874199763EBA20F3789DFC59572ACA4CF33'}], + ['65', {IN=> {f=> '44 0 10 20 14 6 3 4 21 1 12 4 18 2 6 7 6 9 20 14 10 10 19 17 21 12 15 17 7 10 11 8 10 12 1 19 19 9 18 21 4 18 11 9 22 5 ^'}}, + {OUT=>'86BE037C4D509C9202020767D860DAB039CADACE'}], + ['66', {IN=> {f=> '47 0 15 8 15 3 5 6 2 19 12 17 4 20 8 11 20 2 18 4 16 20 12 9 9 6 16 21 16 3 16 18 3 19 5 16 2 4 2 12 11 15 11 14 17 2 10 18 8 ^'}}, + {OUT=>'51B57D7080A87394EEC3EB2E0B242E553F2827C9'}], + ['67', {IN=> {f=> '48 1 5 13 3 21 5 3 6 18 18 10 1 21 21 7 1 13 12 19 1 14 6 8 21 19 21 11 19 13 2 13 4 1 10 22 16 4 9 4 10 16 3 7 15 11 9 13 17 12 ^'}}, + {OUT=>'1EFBFA78866315CE6A71E457F3A750A38FACAB41'}], + ['68', {IN=> {f=> '45 0 14 7 6 2 20 3 6 19 19 10 2 22 12 17 12 1 20 7 7 15 20 6 18 8 3 14 23 18 15 4 7 5 23 15 7 14 10 10 19 17 2 4 15 17 21 ^'}}, + {OUT=>'57D6CB41AEEC20236F365B3A490C61D0CFA39611'}], + ['69', {IN=> {f=> '45 1 15 11 8 9 17 5 12 18 14 6 20 17 21 12 16 9 22 9 20 15 2 22 11 2 6 11 9 8 2 4 14 19 3 21 21 23 8 2 11 4 8 4 20 22 11 ^'}}, + {OUT=>'C532CB64B4BA826372BCCF2B4B5793D5B88BB715'}], + ['70', {IN=> {f=> '38 0 21 18 22 10 19 9 14 17 23 21 10 7 15 13 16 5 4 10 13 14 20 23 12 20 23 18 10 12 8 21 11 6 12 7 19 14 18 17 ^'}}, + {OUT=>'15833B5631032663E783686A209C6A2B47A1080E'}], + ['71', {IN=> {f=> '40 0 18 22 6 9 22 5 23 13 6 8 23 20 22 5 22 15 19 20 9 9 1 13 13 10 14 13 5 22 14 21 9 21 19 14 14 4 18 13 12 14 ^'}}, + {OUT=>'D04F2043C96E10CD83B574B1E1C217052CD4A6B2'}], + ['72', {IN=> {f=> '48 1 7 3 15 5 17 14 23 14 5 17 22 11 1 8 13 23 6 21 3 6 11 7 23 8 6 21 4 4 22 19 13 8 5 19 7 5 23 1 4 19 11 23 11 21 14 1 3 21 ^'}}, + {OUT=>'E8882627C64DB743F7DB8B4413DD033FC63BEB20'}], + ['73', {IN=> {f=> '43 0 22 14 11 7 18 16 17 24 12 12 3 13 19 16 22 4 16 4 6 23 8 18 11 2 3 20 22 9 21 8 23 1 23 20 7 16 13 23 4 13 3 7 22 ^'}}, + {OUT=>'CD2D32286B8867BC124A0AF2236FC74BE3622199'}], + ['74', {IN=> {f=> '47 1 23 6 13 19 2 3 7 2 9 9 15 6 13 4 22 6 19 20 1 9 7 14 1 15 3 23 24 22 18 12 12 17 19 10 8 11 22 12 10 2 20 15 18 17 18 7 19 ^'}}, + {OUT=>'019B70D745375091ED5C7B218445EC986D0F5A82'}], + ['75', {IN=> {f=> '47 1 12 21 6 12 4 7 18 17 3 2 14 24 14 1 23 1 11 15 10 6 18 20 7 1 8 1 16 6 20 23 23 21 10 10 12 24 10 11 23 2 12 23 9 3 24 24 10 ^'}}, + {OUT=>'E5FF5FEC1DADBAED02BF2DAD4026BE6A96B3F2AF'}], + ['76', {IN=> {f=> '52 0 14 10 18 15 14 5 16 11 22 2 15 24 8 22 1 4 24 9 10 15 3 9 5 4 17 15 9 12 19 19 1 3 10 6 8 3 17 8 18 24 19 3 4 15 4 9 2 24 5 20 13 13 ^'}}, + {OUT=>'6F4E23B3F2E2C068D13921FE4E5E053FFED4E146'}], + ['77', {IN=> {f=> '42 0 20 17 19 22 13 8 10 19 15 11 1 14 17 20 22 10 7 11 16 9 21 22 17 23 12 15 4 24 7 21 18 2 21 16 1 19 18 20 11 3 15 17 ^'}}, + {OUT=>'25E179602A575C915067566FBA6DA930E97F8678'}], + ['78', {IN=> {f=> '50 0 18 1 6 14 5 5 5 19 13 10 24 19 16 24 15 13 2 19 15 24 21 17 4 13 17 1 1 9 1 10 2 18 1 21 19 5 18 12 2 22 16 23 15 19 6 18 9 1 23 5 ^'}}, + {OUT=>'67DED0E68E235C8A523E051E86108EEB757EFBFD'}], + ['79', {IN=> {f=> '51 0 21 13 14 11 18 12 13 3 19 9 20 22 20 2 11 12 6 1 12 16 18 2 9 8 4 3 11 17 11 5 4 19 16 11 23 13 18 1 20 8 2 16 16 21 4 19 5 5 20 24 16 ^'}}, + {OUT=>'AF78536EA83C822796745556D62A3EE82C7BE098'}], + ['80', {IN=> {f=> '53 1 20 25 17 11 8 4 19 25 17 7 16 21 6 4 8 2 15 9 2 9 19 3 6 3 3 10 25 13 15 7 8 20 21 12 10 12 5 24 11 20 3 13 13 16 9 13 10 3 9 16 3 7 25 ^'}}, + {OUT=>'64D7AC52E47834BE72455F6C64325F9C358B610D'}], + ['81', {IN=> {f=> '49 1 9 9 14 2 13 17 25 2 18 5 19 23 9 25 9 10 23 12 12 7 13 8 15 7 1 6 21 2 8 7 6 16 14 14 12 15 13 24 10 15 11 10 8 14 15 21 25 21 25 ^'}}, + {OUT=>'9D4866BAA3639C13E541F250FFA3D8BC157A491F'}], + ['82', {IN=> {f=> '47 0 9 18 20 22 21 20 11 14 23 22 10 13 14 8 19 12 2 11 20 23 13 4 10 6 5 7 23 11 3 16 8 21 4 8 18 5 12 14 8 6 20 19 24 8 23 17 23 ^'}}, + {OUT=>'2E258811961D3EB876F30E7019241A01F9517BEC'}], + ['83', {IN=> {f=> '48 1 7 19 1 18 1 14 22 13 14 5 8 22 18 14 25 17 11 12 22 2 12 12 16 12 13 18 17 12 17 14 18 8 25 9 23 5 3 8 14 24 17 7 3 3 23 17 22 19 ^'}}, + {OUT=>'8E0EBC487146F83BC9077A1630E0FB3AB3C89E63'}], + ['84', {IN=> {f=> '51 1 19 17 16 22 24 14 16 20 23 20 9 19 16 7 12 16 5 8 9 7 10 21 24 10 11 19 1 21 14 14 19 3 22 8 12 20 1 18 5 6 5 12 14 1 1 11 9 22 3 24 4 ^'}}, + {OUT=>'CE8953741FFF3425D2311FBBF4AB481B669DEF70'}], + ['85', {IN=> {f=> '52 1 6 1 11 16 1 12 8 11 11 17 10 22 7 3 10 2 6 4 24 16 24 19 4 5 18 11 12 9 20 21 25 2 21 18 10 20 25 21 3 17 17 5 8 22 25 19 8 10 19 7 11 18 ^'}}, + {OUT=>'789D1D2DAB52086BD90C0E137E2515ED9C6B59B5'}], + ['86', {IN=> {f=> '44 0 26 14 21 25 25 4 9 13 5 8 9 21 8 12 26 24 9 24 15 1 23 22 16 14 8 22 15 19 24 20 7 8 15 24 12 4 4 23 21 13 19 15 21 12 ^'}}, + {OUT=>'B76CE7472700DD68D6328B7AA8437FB051D15745'}], + ['87', {IN=> {f=> '59 1 15 7 3 21 20 8 22 14 23 26 19 2 10 18 3 5 3 1 9 15 15 3 7 13 23 9 7 1 13 17 14 25 9 16 2 2 6 13 7 19 25 17 1 5 21 2 7 22 5 6 25 3 12 19 6 2 4 24 17 ^'}}, + {OUT=>'F218669B596C5FFB0B1C14BD03C467FC873230A0'}], + ['88', {IN=> {f=> '60 0 9 18 20 19 4 11 14 1 6 8 26 6 9 22 4 10 2 7 21 9 8 24 25 14 22 12 22 3 23 3 3 20 6 11 23 6 1 7 5 18 5 15 25 26 1 1 10 11 11 4 12 11 20 3 14 2 3 2 23 15 ^'}}, + {OUT=>'1FF3BDBE0D504CB0CDFAB17E6C37ABA6B3CFFDED'}], + ['89', {IN=> {f=> '49 0 12 17 24 11 8 6 24 16 15 22 21 14 6 12 20 19 5 5 12 11 6 23 2 16 23 7 24 6 21 2 17 17 5 25 11 25 20 25 24 18 6 12 19 25 7 6 5 2 25 ^'}}, + {OUT=>'2F3CBACBB14405A4652ED52793C1814FD8C4FCE0'}], + ['90', {IN=> {f=> '54 1 12 16 1 15 7 1 26 19 19 13 20 11 17 6 20 5 24 24 1 21 11 9 20 21 15 10 19 26 3 2 6 7 12 9 10 8 14 10 15 5 17 8 21 1 20 25 6 19 8 3 22 16 16 20 ^'}}, + {OUT=>'982C8AB6CE164F481915AF59AAED9FFF2A391752'}], + ['91', {IN=> {f=> '63 0 17 13 11 10 17 15 12 6 13 14 17 4 12 10 24 5 13 24 3 5 2 5 11 14 8 5 10 17 16 8 4 14 21 15 3 6 17 25 8 2 3 3 19 10 13 22 22 8 2 13 25 17 2 1 19 1 14 20 2 5 4 15 24 ^'}}, + {OUT=>'5CD92012D488A07ECE0E47901D0E083B6BD93E3F'}], + ['92', {IN=> {f=> '49 0 14 20 7 25 20 26 20 16 7 17 17 22 1 13 6 5 1 18 14 15 23 15 10 5 19 18 18 26 12 13 3 25 12 21 16 24 4 16 3 6 26 26 10 20 13 1 20 24 15 ^'}}, + {OUT=>'69603FEC02920851D4B3B8782E07B92BB2963009'}], + ['93', {IN=> {f=> '56 0 3 8 14 5 5 7 11 13 11 26 11 4 26 17 20 19 11 10 3 10 14 9 6 9 7 16 10 4 4 19 19 2 26 13 19 17 15 24 15 4 21 22 13 13 12 22 2 14 20 5 18 7 17 24 20 20 ^'}}, + {OUT=>'3E90F76437B1EA44CF98A08D83EA24CECF6E6191'}], + ['94', {IN=> {f=> '58 1 6 17 9 20 2 10 19 3 22 4 1 11 3 5 3 21 11 15 12 23 26 5 2 27 6 5 16 6 3 2 23 5 3 20 20 4 24 2 18 21 7 14 10 27 23 6 24 6 19 23 3 9 22 16 21 17 19 23 ^'}}, + {OUT=>'34C09F107C42D990EB4881D4BF2DDDCAB01563AE'}], + ['95', {IN=> {f=> '58 1 17 7 21 19 6 16 15 15 20 14 2 25 19 14 18 19 7 9 1 14 11 10 16 3 23 14 26 10 11 1 18 1 12 24 19 19 1 7 2 3 24 7 12 9 2 8 16 20 24 5 26 26 4 9 2 7 25 17 ^'}}, + {OUT=>'474BE0E5892EB2382109BFC5E3C8249A9283B03D'}], + ['96', {IN=> {f=> '54 1 8 12 18 14 26 7 17 18 4 20 1 16 14 21 26 4 6 8 24 11 25 15 24 16 23 4 10 23 21 24 15 10 9 26 7 14 24 21 6 20 5 17 16 17 1 3 12 1 4 13 3 9 21 26 ^'}}, + {OUT=>'A04B4F75051786682483252438F6A75BF4705EC6'}], + ['97', {IN=> {f=> '56 1 7 18 11 1 19 20 23 12 12 27 13 13 15 16 13 1 16 15 12 26 3 16 16 8 17 13 21 4 6 5 19 14 16 4 16 11 14 18 18 27 9 13 21 3 26 22 3 7 6 4 26 3 15 8 25 21 ^'}}, + {OUT=>'BE88A6716083EB50ED9416719D6A247661299383'}], + ['98', {IN=> {f=> '50 1 20 13 9 11 20 6 11 21 27 25 20 7 4 18 26 16 27 5 12 19 7 23 6 25 25 2 11 13 25 21 18 17 6 12 14 13 24 11 14 19 26 27 25 6 1 15 4 7 27 15 ^'}}, + {OUT=>'C67E38717FEE1A5F65EC6C7C7C42AFC00CD37F04'}], + ['99', {IN=> {f=> '51 0 15 16 26 27 23 14 12 28 22 15 8 19 2 20 13 1 24 2 25 1 6 19 19 8 11 24 24 21 13 27 5 11 28 17 7 25 6 23 24 14 25 12 5 13 26 2 5 8 10 16 17 ^'}}, + {OUT=>'959AC4082388E19E9BE5DE571C047EF10C174A8D'}], + ['100', {IN=> {f=> '58 1 5 26 18 19 21 3 12 11 13 4 14 22 22 14 16 13 3 22 16 23 5 19 6 13 10 26 17 27 26 4 3 25 6 14 2 3 5 7 23 11 22 8 25 2 9 25 18 17 8 2 14 4 19 1 5 27 13 24 ^'}}, + {OUT=>'BAA7AA7B7753FA0ABDC4A541842B5D238D949F0A'}], + ['101', {IN=> {f=> '53 0 2 27 28 2 17 23 10 27 18 26 7 22 16 3 27 1 26 21 28 10 3 6 2 2 10 17 13 16 6 17 21 23 13 20 22 5 6 11 12 12 8 23 13 17 9 23 20 3 28 27 12 17 22 ^'}}, + {OUT=>'351394DCEBC08155D100FCD488578E6AE71D0E9C'}], + ['102', {IN=> {f=> '59 0 28 19 5 21 4 27 8 1 19 14 20 6 7 9 1 6 22 3 19 26 14 8 6 7 19 15 23 1 17 16 6 26 14 5 22 25 4 7 10 16 21 10 18 19 24 16 23 8 3 17 28 18 10 2 5 3 21 21 15 ^'}}, + {OUT=>'AB8BE94C5AF60D9477EF1252D604E58E27B2A9EE'}], + ['103', {IN=> {f=> '58 0 6 24 1 4 24 18 10 22 1 21 12 5 4 4 20 25 24 26 8 25 11 2 7 27 22 19 4 18 27 10 28 4 12 24 8 16 12 11 16 17 25 8 12 16 1 9 9 10 5 24 23 18 5 14 18 8 4 28 ^'}}, + {OUT=>'3429EC74A695FDD3228F152564952308AFE0680A'}], + ['104', {IN=> {f=> '61 0 5 17 8 28 1 22 4 11 3 2 17 3 14 9 27 13 18 24 9 8 7 28 25 14 21 27 24 6 18 16 2 12 15 9 14 10 1 8 17 4 6 15 26 11 15 2 28 20 26 16 3 7 5 8 9 26 10 12 25 11 22 ^'}}, + {OUT=>'907FA46C029BC67EAA8E4F46E3C2A232F85BD122'}], + ['105', {IN=> {f=> '53 0 9 13 24 15 20 2 4 8 2 22 20 19 4 15 14 28 13 25 10 10 12 28 24 22 26 28 15 9 11 26 19 22 27 2 21 8 20 23 26 12 10 21 9 15 13 25 7 26 1 13 5 9 20 ^'}}, + {OUT=>'2644C87D1FBBBC0FC8D65F64BCA2492DA15BAAE4'}], + ['106', {IN=> {f=> '58 0 3 9 21 22 7 1 23 28 1 2 8 22 12 18 28 5 18 14 7 11 17 20 20 7 21 13 8 28 21 22 2 16 20 15 28 9 3 22 13 10 23 4 16 11 14 1 10 8 14 14 15 18 13 12 21 18 25 28 ^'}}, + {OUT=>'110A3EEB408756E2E81ABAF4C5DCD4D4C6AFCF6D'}], + ['107', {IN=> {f=> '60 1 29 20 2 29 22 8 16 20 4 12 9 6 12 16 16 7 9 20 29 11 9 4 1 15 25 16 29 10 22 7 2 8 5 18 14 23 24 4 6 26 3 11 6 12 1 7 14 24 14 6 10 21 16 23 29 25 6 14 17 24 ^'}}, + {OUT=>'CD4FDC35FAC7E1ADB5DE40F47F256EF74D584959'}], + ['108', {IN=> {f=> '64 0 12 10 5 10 15 25 8 15 3 7 13 25 16 14 1 29 22 26 15 27 9 1 8 8 28 6 13 5 13 3 15 5 23 8 23 2 5 5 4 17 13 14 7 17 12 27 3 18 5 7 5 26 18 15 22 28 16 13 7 2 23 19 25 15 ^'}}, + {OUT=>'8E6E273208AC256F9ECCF296F3F5A37BC8A0F9F7'}], + ['109', {IN=> {f=> '56 1 17 7 16 25 23 11 11 15 2 13 9 26 2 24 26 7 28 11 2 29 7 22 23 5 28 19 1 27 29 1 24 11 18 20 3 13 11 7 3 15 17 24 1 18 13 6 3 25 27 16 28 18 24 8 23 22 ^'}}, + {OUT=>'FE0606100BDBC268DB39B503E0FDFE3766185828'}], + ['110', {IN=> {f=> '51 1 29 28 6 28 14 12 28 27 22 4 14 25 1 3 9 7 11 14 15 16 10 19 12 19 11 20 13 28 4 27 28 7 27 12 4 28 21 17 22 20 17 15 15 23 22 13 12 21 22 21 29 ^'}}, + {OUT=>'6C63C3E58047BCDB35A17F74EEBA4E9B14420809'}], + ['111', {IN=> {f=> '64 1 12 14 12 18 27 8 7 4 9 14 16 15 8 11 21 20 10 10 21 23 20 2 11 23 1 11 1 5 3 23 16 15 27 14 5 16 3 22 2 3 24 3 19 29 4 4 10 8 20 14 15 1 26 12 27 25 4 28 22 11 19 19 24 9 ^'}}, + {OUT=>'BCC2BD305F0BCDA8CF2D478EF9FE080486CB265F'}], + ['112', {IN=> {f=> '60 1 20 8 9 5 25 19 17 19 15 7 24 24 21 3 20 16 8 3 17 28 18 29 9 23 9 10 29 4 12 24 15 5 8 22 17 29 12 3 8 29 15 21 21 4 7 20 7 10 7 26 10 16 24 6 7 12 8 12 15 17 ^'}}, + {OUT=>'CE5223FD3DD920A3B666481D5625B16457DCB5E8'}], + ['113', {IN=> {f=> '60 0 9 17 11 28 12 26 26 6 29 13 10 20 6 23 10 4 3 26 26 14 20 20 25 14 13 15 24 14 11 4 23 27 24 20 9 16 17 24 13 12 6 1 14 26 25 7 8 21 1 19 3 2 2 17 21 13 5 9 21 11 ^'}}, + {OUT=>'948886776E42E4F5FAE1B2D0C906AC3759E3F8B0'}], + ['114', {IN=> {f=> '54 0 25 1 27 24 6 23 16 5 1 20 29 22 25 9 25 10 3 28 28 25 19 18 16 24 14 15 5 28 12 28 26 29 2 15 15 9 5 18 19 22 12 15 4 6 15 24 16 9 4 26 25 18 27 12 ^'}}, + {OUT=>'4C12A51FCFE242F832E3D7329304B11B75161EFB'}], + ['115', {IN=> {f=> '61 1 20 4 26 12 3 22 1 22 30 3 28 10 9 24 14 29 6 30 3 10 20 14 6 3 19 21 21 28 16 18 11 30 11 20 30 1 9 8 11 5 19 10 24 4 22 4 2 26 5 15 20 8 3 13 30 18 8 1 25 28 19 ^'}}, + {OUT=>'C54BDD2050504D92F551D378AD5FC72C9ED03932'}], + ['116', {IN=> {f=> '56 1 20 15 21 18 18 12 16 13 24 9 21 2 28 6 1 23 9 18 27 27 4 9 13 10 8 14 16 15 12 11 14 21 14 10 11 25 17 17 30 21 13 27 26 26 22 14 13 17 21 19 9 9 20 23 13 28 ^'}}, + {OUT=>'8F53E8FA79EA09FD1B682AF5ED1515ECA965604C'}], + ['117', {IN=> {f=> '59 1 10 28 24 10 22 27 23 27 8 17 14 6 4 21 26 15 1 8 29 27 6 28 15 3 27 25 25 14 19 13 29 8 24 2 8 2 4 12 19 11 10 6 26 14 22 24 30 10 11 12 2 12 17 23 8 8 12 28 12 ^'}}, + {OUT=>'2D7E17F6294524CE78B33EAB72CDD08E5FF6E313'}], + ['118', {IN=> {f=> '56 0 14 28 2 17 4 8 3 26 9 23 21 30 30 20 4 13 28 29 9 3 17 7 19 30 28 1 2 20 9 12 24 15 30 20 27 3 23 11 6 29 25 23 26 17 20 10 22 15 23 6 25 5 4 30 2 29 ^'}}, + {OUT=>'64582B4B57F782C9302BFE7D07F74AA176627A3A'}], + ['119', {IN=> {f=> '63 1 23 15 27 14 26 1 1 7 19 12 7 6 20 18 14 4 15 17 28 7 11 7 8 9 22 17 12 5 23 18 25 18 6 12 26 30 12 30 14 3 1 18 10 20 27 21 8 6 24 26 20 11 24 7 2 4 18 15 14 30 16 19 14 ^'}}, + {OUT=>'6D88795B71D3E386BBD1EB830FB9F161BA98869F'}], + ['120', {IN=> {f=> '52 0 27 15 4 19 25 29 29 7 14 18 9 11 9 27 11 15 29 9 28 20 2 30 26 21 17 8 28 17 22 29 24 8 11 18 29 15 6 7 27 27 17 24 18 23 11 19 8 30 5 24 22 24 ^'}}, + {OUT=>'86AD34A6463F12CEE6DE9596ABA72F0DF1397FD1'}], + ['121', {IN=> {f=> '66 1 25 15 28 23 5 10 21 5 8 7 3 10 19 17 6 9 15 29 10 7 4 1 16 21 16 29 13 18 5 3 8 15 8 21 29 20 5 27 2 13 27 7 7 30 2 18 26 10 2 5 29 21 15 25 26 24 8 12 20 3 9 10 30 7 12 29 ^'}}, + {OUT=>'7EB46685A57C0D466152DC339C8122548C757ED1'}], + ['122', {IN=> {f=> '53 1 30 26 20 11 22 19 27 2 16 10 6 4 24 17 20 25 20 15 8 23 23 20 30 18 16 3 30 15 26 23 28 7 21 8 7 31 31 14 26 18 3 1 26 28 15 25 11 31 3 25 9 21 30 ^'}}, + {OUT=>'E7A98FB0692684054407CC221ABC60C199D6F52A'}], + ['123', {IN=> {f=> '67 0 2 6 14 4 9 5 28 8 17 22 1 4 8 7 10 14 19 10 14 8 27 9 24 26 4 30 11 8 19 5 21 7 2 27 20 16 20 20 22 14 13 16 26 14 10 3 25 22 25 23 21 10 15 15 29 8 13 4 2 13 22 20 7 4 20 31 23 ^'}}, + {OUT=>'34DF1306662206FD0A5FC2969A4BEEC4EB0197F7'}], + ['124', {IN=> {f=> '65 0 2 2 28 13 19 14 12 23 27 6 2 14 2 22 6 25 30 29 31 13 14 16 31 12 16 30 5 14 31 11 4 1 1 25 21 13 26 22 21 5 22 14 29 1 21 3 14 30 4 2 29 12 15 23 3 15 5 1 6 23 22 13 1 14 23 ^'}}, + {OUT=>'56CF7EBF08D10F0CB9FE7EE3B63A5C3A02BCB450'}], + ['125', {IN=> {f=> '59 1 25 5 15 6 13 3 22 11 23 31 24 6 5 20 4 14 3 29 8 29 19 7 29 23 25 28 19 11 15 27 21 14 1 19 20 26 12 7 12 1 18 13 29 28 23 29 14 23 7 1 9 29 24 5 30 18 5 25 30 ^'}}, + {OUT=>'3BAE5CB8226642088DA760A6F78B0CF8EDDEA9F1'}], + ['126', {IN=> {f=> '55 1 31 25 13 7 24 25 24 1 12 19 9 7 6 28 20 14 28 21 19 31 20 20 6 24 18 27 24 4 18 21 1 31 15 1 15 2 27 4 26 25 4 23 19 2 31 22 30 21 22 5 27 12 30 28 31 ^'}}, + {OUT=>'6475DF681E061FA506672C27CBABFA9AA6DDFF62'}], + ['127', {IN=> {f=> '62 0 27 15 18 14 25 15 17 7 28 11 28 29 30 1 17 12 10 2 18 20 21 2 11 12 5 4 12 25 14 5 5 24 22 18 31 15 22 29 11 3 21 31 21 27 3 28 7 10 25 2 15 30 9 30 7 22 15 9 3 20 24 14 ^'}}, + {OUT=>'79D81991FA4E4957C8062753439DBFD47BBB277D'}], + ['128', {IN=> {f=> '60 0 28 14 18 9 27 14 22 27 31 10 8 14 7 15 7 20 5 26 1 29 7 17 17 8 3 13 27 18 8 31 27 28 22 22 17 19 18 18 11 19 13 25 10 19 6 28 4 31 23 10 18 26 31 5 10 13 12 8 15 27 ^'}}, + {OUT=>'BAE224477B20302E881F5249F52EC6C34DA8ECEF'}], + ['129', {IN=> {f=> '60 1 24 22 4 29 22 31 28 20 4 16 21 3 1 15 5 15 6 30 3 29 29 7 27 20 2 20 31 22 26 9 29 16 4 26 32 17 20 14 28 17 19 6 24 11 26 28 5 18 15 8 16 20 21 4 9 12 4 8 17 29 ^'}}, + {OUT=>'EDE4DEB4293CFE4138C2C056B7C46FF821CC0ACC'}], + ['130', {IN=> {f=> '69 1 5 3 11 15 12 24 31 23 1 6 28 2 8 31 6 7 30 5 19 23 12 6 9 31 19 17 24 25 22 6 12 16 3 7 9 9 11 29 4 11 2 5 13 29 10 12 30 32 18 28 18 27 3 30 4 4 26 6 13 31 13 2 11 7 24 4 17 29 12 ^'}}, + {OUT=>'A771FA5C812BD0C9596D869EC99E4F4AC988B13F'}], + ['131', {IN=> {f=> '95 0 21 19 21 23 11 42 36 2 13 4 1 33 22 16 27 9 4 33 16 3 30 15 11 32 13 17 38 32 9 38 4 36 15 32 27 19 42 18 6 36 22 10 29 12 25 40 15 29 23 28 30 4 8 11 24 9 10 31 28 43 23 16 29 33 5 40 26 3 19 12 36 43 5 35 37 5 14 11 45 35 16 10 8 32 4 15 35 26 2 39 22 37 22 30 29 ^'}}, + {OUT=>'E99D566212BBBCEEE903946F6100C9C96039A8F4'}], + ['132', {IN=> {f=> '106 1 18 14 51 2 6 32 51 9 32 50 44 46 51 8 11 53 45 55 16 10 3 52 8 20 20 46 46 13 32 2 46 50 43 25 54 9 31 29 2 47 15 29 24 45 44 18 37 14 28 39 36 44 47 16 50 10 44 24 53 35 22 40 20 15 51 22 18 22 42 6 54 49 38 21 7 13 30 16 7 52 16 22 13 38 7 11 44 33 9 25 13 37 42 14 45 53 30 38 5 25 5 35 38 22 28 53 ^'}}, + {OUT=>'B48CE6B1D13903E3925AE0C88CB931388C013F9C'}], + ['133', {IN=> {f=> '127 0 58 35 43 28 5 28 63 8 12 25 9 47 53 29 62 7 37 2 3 48 5 12 55 56 28 35 12 63 6 58 27 27 48 44 35 14 17 22 56 10 8 1 16 15 42 63 14 51 57 19 41 7 8 56 47 34 52 22 48 60 43 9 1 52 4 21 49 61 18 50 23 13 46 62 23 45 62 9 56 18 23 31 8 30 27 36 13 38 4 58 53 47 24 18 41 58 19 12 18 52 42 29 44 45 26 63 34 32 41 64 15 26 55 19 2 49 6 30 53 13 54 12 53 37 12 37 43 ^'}}, + {OUT=>'E647D5BAF670D4BF3AFC0A6B72A2424B0C64F194'}], + ['134', {IN=> {f=> '148 0 60 4 51 47 58 38 17 63 33 23 28 43 12 69 70 33 17 12 50 18 18 36 45 2 67 4 45 20 4 33 38 29 45 8 22 58 39 71 38 32 53 35 19 53 31 29 51 35 4 63 18 33 26 47 70 9 64 62 63 30 15 1 35 28 16 40 20 14 50 33 19 38 30 27 55 10 16 46 47 7 55 12 53 26 56 33 29 55 25 17 48 43 21 43 18 24 63 27 68 46 38 33 35 10 18 11 27 5 9 58 35 70 36 36 39 47 2 10 66 47 5 18 21 44 71 51 57 3 22 7 56 55 28 25 14 40 16 24 48 37 66 50 24 45 18 39 53 55 ^'}}, + {OUT=>'65C1CD932A06B05CD0B43AFB3BC7891F6BCEF45C'}], + ['135', {IN=> {f=> '165 1 15 62 35 29 15 40 19 76 67 4 5 71 46 61 26 8 77 48 1 23 12 60 40 24 44 33 29 42 73 66 49 61 20 30 1 54 52 42 39 64 23 65 37 24 20 11 26 66 22 77 22 57 7 38 57 33 61 73 7 64 1 49 35 76 14 27 21 45 68 38 58 73 13 72 47 73 33 8 66 23 38 4 56 77 47 10 71 13 20 31 41 6 51 3 18 17 61 47 14 48 76 46 28 34 43 1 56 4 25 7 65 41 1 34 37 23 59 59 27 26 13 15 14 75 60 14 1 28 59 26 65 61 16 23 17 28 6 19 2 35 49 30 29 48 2 63 73 59 1 3 76 41 11 19 18 43 54 63 67 51 4 9 78 60 66 ^'}}, + {OUT=>'70FFAE353A5CD0F8A65A8B2746D0F16281B25EC7'}], + ['136', {IN=> {f=> '181 0 18 19 84 17 12 10 57 18 77 51 52 16 39 74 49 52 63 38 72 2 15 64 83 62 49 56 11 26 68 58 83 33 23 50 63 71 53 27 84 22 39 41 52 58 11 64 7 60 45 70 22 5 73 38 30 30 48 21 75 80 40 21 8 53 9 26 30 34 81 71 71 51 23 75 33 41 23 32 5 8 66 40 72 40 16 66 45 14 48 34 21 41 27 3 55 27 37 23 41 65 4 57 51 74 22 19 75 42 16 19 46 16 10 48 20 19 37 41 14 57 9 17 55 38 5 60 7 46 20 43 36 39 52 20 10 62 45 23 46 7 35 75 29 70 35 36 34 25 12 15 84 26 10 6 71 29 79 33 32 25 59 76 82 64 58 7 8 19 41 74 2 53 65 24 1 55 51 36 21 79 7 ^'}}, + {OUT=>'CC8221F2B829B8CF39646BF46888317C3EB378EA'}], + ['137', {IN=> {f=> '184 1 60 66 66 6 3 9 73 12 7 40 70 18 71 70 65 51 14 14 27 50 9 87 81 50 22 19 40 37 16 79 12 34 37 76 82 10 61 7 81 49 67 26 45 82 50 81 63 45 69 31 31 76 51 9 59 34 51 54 34 83 10 33 51 86 81 82 69 18 8 22 64 19 86 62 58 33 37 17 34 5 29 83 42 76 50 54 66 39 9 1 36 43 17 65 6 35 56 72 71 83 88 10 1 8 87 22 6 21 78 25 89 43 62 40 55 85 31 89 74 63 46 28 24 26 31 17 7 8 27 19 12 85 17 20 27 77 10 2 54 80 17 52 74 76 69 78 11 20 80 4 29 24 85 75 18 39 23 70 83 29 57 67 72 70 33 4 15 46 42 2 69 13 53 33 69 64 33 64 14 40 69 59 78 54 ^'}}, + {OUT=>'26ACCC2D6D51FF7BF3E5895588907765111BB69B'}], + ['138', {IN=> {f=> '193 1 68 43 95 53 38 58 55 28 20 16 67 48 17 86 32 44 68 67 28 16 14 79 25 15 72 67 50 80 18 30 10 75 1 60 45 87 78 28 95 49 63 70 59 26 6 51 73 60 65 18 26 8 87 5 58 31 25 57 40 46 78 57 34 78 61 36 66 57 38 80 22 32 68 71 30 74 37 81 66 77 66 55 2 51 24 93 61 40 68 45 61 12 63 24 89 59 52 72 43 20 20 69 36 40 88 46 9 62 55 77 84 20 18 6 77 15 52 39 75 3 26 4 85 17 62 29 11 92 46 58 29 59 28 42 80 71 96 2 49 85 37 63 4 61 14 2 53 87 25 86 6 75 76 93 41 39 93 92 42 56 41 63 26 28 18 77 11 50 78 79 1 12 12 91 29 13 58 5 56 92 66 59 4 39 47 95 5 5 62 33 13 80 27 ^'}}, + {OUT=>'01072915B8E868D9B28E759CF2BC1AEA4BB92165'}], + ['139', {IN=> {f=> '203 1 35 28 11 7 20 7 17 3 3 30 89 13 65 56 66 63 22 82 16 31 55 56 77 91 91 71 101 13 10 85 101 95 17 99 98 91 33 14 20 48 32 7 64 29 38 35 25 4 95 23 34 1 85 81 23 31 96 71 84 50 15 79 47 25 51 45 35 66 19 61 60 9 31 93 64 70 30 42 86 53 1 71 46 42 22 38 96 10 99 34 76 26 55 73 63 63 97 23 92 81 64 46 1 30 31 35 86 91 88 64 87 16 37 69 84 94 60 100 3 47 52 8 71 87 57 29 76 43 18 45 46 15 65 12 44 42 66 60 15 68 19 58 39 62 76 9 92 101 57 32 4 34 15 41 62 32 89 71 43 35 31 41 21 17 82 33 96 27 62 29 82 57 46 62 15 24 99 37 83 40 52 46 56 80 98 3 91 74 6 27 7 58 94 10 41 79 97 84 77 74 26 99 35 ^'}}, + {OUT=>'3016115711D74236ADF0C371E47992F87A428598'}], + ['140', {IN=> {f=> '212 1 26 101 17 91 45 97 80 59 102 30 68 4 85 9 4 39 16 18 85 70 11 87 62 72 78 38 3 41 53 82 82 35 18 13 94 64 52 39 77 59 26 9 65 46 64 98 32 29 86 79 16 63 54 76 56 98 16 98 78 22 72 33 103 104 52 84 12 65 15 85 101 97 84 31 51 26 100 100 38 80 13 2 78 7 24 44 84 103 27 7 28 16 33 99 25 103 54 14 42 62 87 92 27 22 42 5 52 100 84 73 72 63 24 48 56 52 23 5 17 76 31 1 95 58 43 60 50 62 30 23 35 79 20 35 3 72 32 45 51 87 41 84 27 79 77 70 102 15 54 15 100 8 52 69 105 3 30 84 42 93 66 89 69 74 24 33 42 97 4 38 99 106 13 93 6 106 74 100 54 45 21 59 56 37 9 50 32 75 79 31 77 9 61 1 8 68 6 60 81 7 100 99 14 61 48 25 73 26 70 72 94 34 ^'}}, + {OUT=>'BF30417999C1368F008C1F19FECA4D18A5E1C3C9'}], + ['141', {IN=> {f=> '233 0 11 98 110 88 35 110 35 64 49 88 93 28 85 6 78 65 90 52 24 97 51 39 51 59 23 1 3 49 33 11 78 27 35 55 64 5 102 4 70 25 56 58 38 66 11 31 96 66 104 59 41 86 58 29 79 41 40 72 51 12 92 34 52 44 69 104 21 97 89 96 48 21 4 61 40 28 67 34 23 85 44 22 62 52 33 84 23 30 73 74 4 79 12 81 47 80 53 47 89 40 19 80 62 34 61 29 41 95 43 1 70 63 55 53 18 19 13 48 10 19 89 49 4 52 53 56 76 10 8 104 77 15 28 38 75 109 3 85 90 8 40 8 93 90 43 39 14 60 17 36 78 56 105 80 35 75 36 58 82 50 100 98 45 74 13 66 95 72 71 95 34 14 98 72 33 38 37 52 6 14 107 59 3 29 61 67 98 92 5 93 17 98 36 87 41 75 71 57 88 17 25 91 84 3 58 20 92 69 51 50 36 31 14 25 18 30 18 1 41 104 30 82 59 87 70 34 96 28 47 62 81 103 48 ^'}}, + {OUT=>'62BA49087185F2742C26E1C1F4844112178BF673'}], + ['142', {IN=> {f=> '234 1 63 90 108 108 102 64 82 88 4 111 76 97 22 1 108 41 34 91 33 20 25 24 26 8 83 11 31 7 85 109 106 4 105 85 68 28 33 99 53 8 16 12 11 74 17 83 66 70 16 30 9 67 68 34 24 81 47 92 72 47 37 33 38 92 17 8 28 88 22 62 69 32 89 75 3 72 96 85 13 105 24 38 37 94 115 83 72 108 114 24 93 76 103 60 99 102 9 43 10 59 95 46 33 93 15 26 69 44 2 86 107 55 45 61 65 92 66 9 55 39 70 83 29 98 67 13 111 15 20 31 62 8 2 51 20 19 33 44 14 115 71 112 97 10 41 28 53 51 26 57 15 38 98 55 106 22 56 31 50 95 107 110 84 70 10 108 96 73 100 25 36 55 88 71 63 96 30 90 96 79 22 7 30 23 28 59 89 8 51 99 47 86 34 18 43 65 98 104 107 49 7 79 71 8 57 21 29 80 2 74 78 44 57 9 61 22 13 68 52 91 74 98 43 30 58 68 95 101 72 102 76 42 99 61 ^'}}, + {OUT=>'E1F6B9536F384DD3098285BBFD495A474140DC5A'}], + ['143', {IN=> {f=> '249 0 27 117 45 119 80 2 59 52 8 76 20 94 102 69 96 42 46 106 67 9 110 89 71 69 34 31 15 85 16 29 100 82 37 62 68 95 108 44 23 114 34 36 56 93 11 30 96 12 31 67 14 114 14 66 70 30 81 46 53 119 85 6 104 47 92 72 70 5 70 15 115 68 105 33 97 13 85 106 14 61 29 22 86 45 57 69 91 38 38 28 66 13 60 95 103 3 15 5 113 38 23 62 5 65 94 107 73 104 37 47 102 117 3 78 35 7 95 56 78 45 52 28 46 43 37 32 53 19 55 29 47 97 76 115 83 71 11 45 62 73 99 116 2 24 116 7 28 41 2 29 37 52 23 5 118 79 31 57 89 61 24 101 78 50 93 73 41 7 33 45 47 24 1 48 73 36 3 25 87 46 28 108 54 68 53 67 119 28 36 118 104 42 88 27 112 4 74 85 1 63 39 97 71 74 75 76 10 49 12 79 11 50 103 118 94 117 118 37 27 12 94 60 28 51 47 82 110 17 15 105 23 52 43 12 21 22 81 41 12 74 90 42 108 117 98 67 4 69 85 ^'}}, + {OUT=>'B522DAE1D67726EBA7C4136D4E2F6D6D645AC43E'}], + ['144', {IN=> {f=> '243 0 76 81 26 101 13 68 62 106 87 19 98 32 81 63 79 93 31 121 123 75 52 11 66 41 54 87 38 5 104 62 51 38 55 29 31 120 44 16 48 94 46 105 91 66 78 27 43 6 64 2 55 79 75 84 113 22 4 113 109 31 33 17 96 11 29 63 98 103 107 116 34 14 9 95 38 18 51 75 33 109 118 55 66 4 76 7 75 70 82 74 23 1 26 69 40 112 99 47 65 31 70 119 52 103 88 85 86 28 16 12 76 25 22 78 64 21 86 27 61 77 72 108 2 18 106 119 121 54 16 85 72 2 73 26 88 66 60 80 35 24 117 63 24 44 67 52 122 119 33 72 16 99 98 69 54 19 42 28 53 114 32 117 81 100 57 49 123 56 21 68 80 53 95 1 45 95 107 98 87 1 27 24 99 116 16 67 1 113 91 84 25 40 25 72 3 28 90 87 112 80 16 117 45 77 36 90 105 59 88 122 64 108 108 71 98 18 50 115 93 105 77 35 6 46 55 47 102 4 26 87 111 120 81 113 4 57 105 3 84 94 115 61 73 ^'}}, + {OUT=>'E9A021C3EB0B9F2C710554D4BF21B19F78E09478'}], + ['145', {IN=> {f=> '255 1 91 47 51 9 57 9 55 94 61 61 68 46 107 6 35 81 114 78 96 74 14 89 73 67 67 69 113 107 11 98 113 109 20 92 17 67 70 88 57 10 124 9 60 122 93 91 45 7 15 24 51 5 98 115 24 49 90 104 117 66 128 94 64 80 12 43 91 46 111 59 58 77 30 14 88 60 123 68 41 44 68 40 104 118 41 43 93 90 105 92 16 127 26 54 125 114 79 71 24 48 21 25 118 40 103 49 91 44 67 65 25 119 109 18 48 23 69 112 38 61 64 87 84 104 119 110 122 92 22 1 8 83 34 100 32 62 41 46 112 34 102 76 56 39 4 127 30 13 19 110 124 7 16 128 95 4 124 11 104 116 126 49 95 3 55 96 70 90 101 4 122 96 75 118 39 128 99 92 18 42 20 87 83 35 75 111 61 67 71 28 101 9 56 34 105 95 71 23 73 71 26 57 15 23 76 55 99 89 128 98 117 68 43 88 62 38 62 39 2 83 36 15 26 60 128 96 73 74 10 1 12 42 22 2 77 33 33 32 57 13 14 82 57 12 39 3 58 80 14 87 85 44 69 109 119 ^'}}, + {OUT=>'DF13573188F3BF705E697A3E1F580145F2183377'}], + ['146', {IN=> {f=> '283 0 102 55 53 41 60 88 25 67 58 76 44 22 68 118 108 40 95 96 81 90 85 28 77 18 11 37 72 93 60 110 124 119 95 131 91 37 109 126 8 73 69 72 80 17 83 5 76 20 32 15 10 1 103 18 22 116 98 9 51 104 102 44 33 15 12 24 31 89 1 6 28 101 8 64 72 106 30 5 52 89 111 39 108 64 85 17 57 124 22 105 78 115 3 40 108 66 108 77 128 103 44 35 38 13 95 10 111 63 98 117 61 51 126 69 96 70 70 59 39 13 97 33 112 2 77 7 123 70 83 29 66 67 49 79 19 104 115 14 60 2 55 40 71 33 28 114 51 91 17 46 45 128 57 87 62 25 115 38 50 55 90 74 8 51 102 79 43 94 36 122 94 12 41 36 25 104 91 24 7 99 80 30 126 32 63 122 107 114 27 28 79 41 12 35 51 115 122 70 22 79 65 2 88 27 17 59 15 23 44 57 5 65 6 26 78 80 125 93 84 100 45 22 129 68 36 111 74 118 11 50 42 120 47 21 8 86 112 26 67 60 99 45 93 47 8 38 59 52 56 124 20 82 18 117 24 18 46 106 19 117 26 41 47 45 130 7 15 1 4 5 100 10 85 50 44 11 48 92 119 108 42 118 125 ^'}}, + {OUT=>'188835CFE52ECFA0C4135C2825F245DC29973970'}], + ['147', {IN=> {f=> '272 0 8 61 99 70 96 20 87 123 134 82 22 2 110 118 33 86 5 7 5 94 56 15 60 96 54 13 22 55 99 4 25 105 17 37 69 10 38 117 117 30 70 13 9 109 115 62 94 52 66 117 100 135 7 75 23 5 81 110 31 118 29 1 62 11 41 88 109 119 102 37 3 30 123 47 31 56 134 29 124 116 118 99 21 56 77 91 23 37 135 81 44 51 67 95 51 133 30 57 67 116 122 48 100 7 132 97 106 69 93 4 95 125 102 103 119 81 57 133 96 37 118 50 117 113 81 127 17 45 103 32 121 129 60 43 65 127 30 36 132 110 52 53 35 71 12 76 22 72 130 112 99 76 26 21 73 63 63 97 23 58 115 132 114 1 132 31 35 18 23 54 30 53 118 37 35 84 94 60 100 3 47 18 110 105 87 57 63 76 43 52 45 46 49 65 12 10 42 66 60 117 34 19 92 5 28 76 9 126 101 125 32 38 34 15 7 62 32 21 3 43 69 31 109 123 51 116 135 130 129 130 63 14 57 80 62 15 126 31 105 83 108 120 80 124 46 98 105 91 6 6 27 7 58 128 78 7 79 63 84 77 74 128 65 61 95 121 17 24 123 117 51 122 ^'}}, + {OUT=>'41B615A34EE2CEC9D84A91B141CFAB115821950B'}], + ['148', {IN=> {f=> '284 0 44 71 43 20 126 58 53 47 98 18 19 119 93 29 70 39 94 112 44 115 135 98 82 10 67 29 102 113 68 80 19 75 1 91 114 87 80 7 40 37 86 120 16 104 136 117 82 138 32 65 114 119 137 121 8 12 46 126 26 119 73 130 60 76 113 100 14 133 26 116 34 120 80 95 84 53 15 24 44 51 4 10 23 77 24 99 66 37 54 63 42 136 21 34 76 5 17 128 101 1 59 40 113 112 32 97 31 93 105 79 91 18 39 1 103 132 51 68 124 111 13 97 43 128 69 84 85 72 15 12 26 87 16 16 92 101 13 77 4 118 89 103 56 42 16 60 44 39 126 46 18 83 93 41 105 3 82 106 115 91 6 4 54 115 15 120 109 113 48 41 9 95 20 62 67 105 111 25 132 7 116 46 138 44 83 61 124 131 35 107 6 109 81 114 67 41 137 77 56 74 73 34 12 14 69 52 11 98 47 54 83 81 6 1 15 88 35 139 80 83 49 89 27 47 130 92 133 87 51 112 76 49 109 49 57 93 73 22 117 50 64 58 97 139 36 131 111 133 58 33 8 88 55 38 90 46 30 118 57 29 82 74 41 117 38 46 94 92 5 105 15 117 70 103 68 60 120 48 21 110 85 40 81 66 ^'}}, + {OUT=>'AB3DD6221D2AFE6613B815DA1C389EEC74AA0337'}], + ['149', {IN=> {f=> '291 0 46 113 52 134 79 74 64 57 18 23 9 52 8 16 103 57 138 59 59 65 92 2 7 130 92 8 34 40 86 131 140 100 112 4 42 1 110 108 43 37 15 67 19 35 94 61 130 98 35 88 34 65 104 56 126 118 50 87 10 81 109 90 86 118 32 6 114 88 39 38 39 62 3 12 134 72 137 35 75 81 115 106 140 112 11 123 41 103 45 95 84 71 107 13 26 110 96 62 16 109 84 59 53 38 27 8 28 13 32 137 17 138 41 122 36 99 65 99 83 36 112 29 49 70 96 126 136 131 116 3 18 17 126 142 14 37 141 141 123 42 13 20 83 42 139 83 54 49 58 42 7 137 29 48 16 121 127 34 52 140 106 128 58 36 124 83 24 69 54 61 112 17 6 95 97 24 57 86 124 59 71 119 67 1 109 54 68 49 57 132 32 5 71 113 40 80 104 75 106 133 31 126 130 104 62 9 39 44 66 116 141 135 96 132 19 41 121 126 124 77 8 4 60 82 6 101 124 89 51 123 48 40 85 77 21 112 10 69 66 115 87 16 108 30 84 65 80 103 32 131 134 73 47 10 63 39 50 93 37 135 114 69 48 34 58 23 27 133 37 9 40 98 41 115 99 70 83 29 42 67 133 55 79 80 91 122 12 2 115 112 47 ^'}}, + {OUT=>'0706D414B4AA7FB4A9051AA70D6856A7264054FB'}], + ['150', {IN=> {f=> '293 1 33 13 99 138 1 42 89 118 87 113 99 12 134 142 100 38 5 55 75 14 110 108 42 64 130 79 138 62 64 69 57 11 123 25 59 16 111 94 24 65 30 51 119 48 107 92 84 69 28 136 143 54 20 6 70 47 142 64 4 65 59 73 99 134 146 102 125 116 57 137 137 72 48 128 78 5 80 63 54 85 30 22 129 68 21 21 74 28 128 107 27 60 2 93 95 71 37 11 37 15 39 102 3 104 65 80 59 52 113 34 20 67 60 27 81 135 46 106 106 102 68 128 17 15 100 124 15 43 136 122 100 67 142 35 14 53 120 2 89 93 99 73 9 122 39 77 15 96 90 43 79 134 60 92 105 55 96 31 119 77 97 72 23 140 38 30 43 83 136 88 107 117 72 109 118 58 91 119 73 95 100 59 138 123 54 49 143 50 133 66 106 45 80 88 42 93 5 59 77 101 74 110 104 40 92 19 77 76 86 102 129 3 144 101 139 134 56 90 18 91 94 85 55 10 137 11 58 1 107 113 70 22 7 56 29 143 111 8 46 45 116 122 129 89 7 121 53 95 14 49 118 62 125 91 37 97 15 35 100 63 140 63 50 51 58 26 127 6 45 59 102 121 114 85 141 135 10 72 19 106 66 66 41 53 13 38 1 21 103 50 108 46 119 ^'}}, + {OUT=>'3CBF8151F3A00B1D5A809CBB8C4F3135055A6BD1'}], + ['151', {IN=> {f=> '297 1 46 31 132 112 28 63 124 97 129 43 40 72 99 107 132 137 96 139 99 145 121 144 118 37 81 39 94 60 55 109 47 109 110 75 42 12 139 137 43 128 106 107 19 126 12 101 148 127 15 117 125 125 62 96 13 76 70 96 101 110 138 8 95 76 143 17 32 97 79 149 39 31 94 123 21 41 135 55 84 70 33 135 118 50 62 121 81 1 45 144 93 60 5 64 137 8 105 91 82 67 27 113 119 53 18 98 79 48 84 32 135 128 5 1 20 76 17 85 108 72 36 141 140 49 150 105 104 3 149 14 54 18 148 64 49 125 37 28 28 101 22 104 91 32 82 117 12 114 69 58 2 58 115 9 108 47 59 65 14 92 7 4 86 98 16 82 92 95 38 94 10 10 48 97 104 66 115 97 142 115 122 119 40 97 16 32 47 34 88 89 26 50 12 76 80 51 40 9 133 24 44 40 122 84 108 22 142 140 99 44 15 54 8 42 125 150 130 21 79 124 62 46 119 15 29 91 57 150 42 138 71 61 68 80 114 6 1 70 121 18 35 113 56 87 86 10 73 14 29 41 72 89 1 133 87 101 123 59 90 142 77 133 52 78 48 34 138 134 27 17 60 131 147 61 93 148 39 132 49 62 71 36 91 4 139 49 100 120 43 113 144 30 94 73 127 40 125 ^'}}, + {OUT=>'DA5D6A0319272BBCCEA63ACFA6799756FFDA6840'}], + ['152', {IN=> {f=> '313 1 35 97 95 76 105 88 32 138 30 69 61 40 47 21 107 6 39 81 114 53 125 53 147 14 4 73 146 96 98 13 136 11 98 117 138 153 67 146 71 99 88 7 139 24 13 35 47 97 145 74 36 119 3 51 84 48 119 53 49 15 79 17 120 103 148 64 30 41 97 120 75 111 63 58 131 134 18 13 10 48 18 16 48 43 15 54 18 41 47 122 144 80 92 145 77 1 33 89 54 46 78 48 21 54 43 40 53 24 16 73 42 94 29 44 34 151 152 23 123 12 142 140 43 37 88 29 19 35 72 96 151 130 62 112 34 36 91 120 50 112 138 2 105 60 68 137 131 5 17 19 139 74 11 120 78 149 58 128 15 104 16 126 78 20 57 134 71 49 90 76 108 126 100 54 68 39 132 153 42 147 146 124 62 87 35 75 61 65 46 100 82 105 113 31 63 5 95 54 71 77 127 150 80 36 144 2 130 59 74 39 3 152 121 122 18 117 12 117 141 118 135 62 36 69 5 39 53 150 52 153 143 30 66 96 126 131 56 137 8 7 86 142 14 7 111 141 93 136 137 134 43 12 89 23 44 9 152 146 121 97 19 38 110 91 67 14 32 110 66 68 8 130 84 73 118 59 24 41 72 121 150 55 37 138 27 104 66 124 9 51 109 47 125 109 148 8 29 47 72 146 149 61 93 10 20 54 15 76 133 125 106 110 67 ^'}}, + {OUT=>'FB4429C95F6277B346D3B389413758DFFFEEDC98'}], + ['153', {IN=> {f=> '330 0 23 9 26 136 27 51 115 122 44 106 6 146 108 113 85 51 8 96 47 56 137 62 59 89 143 71 140 14 85 156 139 99 154 30 53 115 35 147 108 148 58 52 28 103 19 92 95 152 152 10 11 13 155 67 11 83 101 69 153 152 45 141 14 120 129 140 119 59 2 89 73 70 83 29 16 67 81 29 1 54 65 96 117 2 37 47 128 33 3 89 108 98 139 49 78 27 103 39 119 94 132 90 38 132 55 65 131 90 58 2 54 100 69 118 22 44 19 7 148 93 25 29 123 81 64 131 55 30 1 89 38 97 82 64 9 28 86 123 151 10 133 40 154 102 4 111 65 9 63 59 124 116 72 105 76 57 137 97 32 145 108 78 112 50 43 34 75 20 22 129 68 11 118 74 125 118 57 17 20 129 53 65 61 144 1 17 142 156 52 100 54 15 20 59 52 63 131 20 57 124 31 125 46 106 76 92 8 98 154 152 80 114 15 140 136 112 100 17 92 25 151 150 80 99 69 83 49 43 156 102 19 57 122 96 30 3 39 134 40 32 75 5 76 127 138 99 17 57 52 150 130 18 127 33 23 116 107 78 77 77 42 69 68 48 41 69 33 75 40 49 128 103 4 146 93 10 83 66 96 152 30 38 12 33 5 39 47 41 34 60 74 20 42 156 67 46 56 102 89 3 124 81 99 104 56 50 8 61 74 55 15 87 108 28 138 47 93 60 2 124 46 126 103 91 145 36 25 116 122 51 ^'}}, + {OUT=>'2C6E30D9C895B42DCCCFC84C906EC88C09B20DE1'}], + ['154', {IN=> {f=> '322 0 75 7 107 158 81 105 154 90 20 125 77 114 69 92 7 58 21 98 154 50 128 149 117 127 153 45 3 18 121 86 29 71 79 101 2 5 22 143 10 27 53 146 157 148 112 33 22 80 123 24 147 1 112 82 159 63 74 97 109 33 151 32 89 87 132 117 46 129 59 115 91 114 118 37 21 9 94 60 25 89 47 79 110 55 12 143 99 87 43 88 56 57 160 76 12 71 128 77 146 117 95 105 42 66 3 76 20 76 101 100 118 149 45 26 143 148 32 57 39 129 19 31 84 123 1 152 135 5 54 30 13 125 68 30 62 101 51 142 5 94 83 20 116 24 107 109 105 91 42 17 27 93 69 3 139 68 79 38 84 2 85 128 126 122 131 46 17 35 98 42 26 111 100 29 120 55 84 114 109 145 14 18 138 14 9 85 7 18 129 91 2 94 51 133 82 87 123 64 39 8 103 38 75 110 78 7 9 45 115 42 138 135 86 78 16 62 52 75 159 54 151 121 149 77 74 16 85 47 102 105 82 119 10 67 137 153 148 135 28 49 26 151 153 36 80 11 130 113 24 44 30 102 24 58 133 122 140 99 24 156 54 119 42 115 140 90 132 19 94 2 157 99 136 19 71 7 130 153 108 51 21 58 70 74 137 1 40 111 149 5 103 6 27 76 141 23 125 140 1 72 29 152 103 87 51 93 29 80 132 77 123 153 68 159 14 98 114 158 121 158 81 131 ^'}}, + {OUT=>'3DE3189A5E19F225CDCE254DFF23DACD22C61363'}], + ['155', {IN=> {f=> '322 0 35 93 109 125 119 10 10 19 135 26 4 74 135 35 120 129 113 92 17 29 47 88 14 159 149 87 45 36 75 68 22 138 20 59 61 144 151 11 107 6 153 81 114 43 85 157 97 148 118 73 126 56 58 137 96 11 98 67 98 103 57 146 21 59 88 151 139 148 127 25 17 47 115 34 160 109 107 51 64 28 69 13 49 149 69 141 90 93 118 64 10 1 67 80 35 111 13 58 101 124 132 147 154 18 162 6 162 33 5 34 142 41 161 82 114 70 92 145 57 155 137 114 79 44 36 48 48 21 14 13 40 33 14 150 33 32 54 143 14 4 101 142 23 93 136 132 120 147 17 38 163 143 5 52 46 151 130 32 72 34 124 150 51 100 112 128 126 65 10 28 87 81 159 131 19 99 54 125 110 58 119 28 78 129 104 140 126 38 154 27 114 61 153 90 66 98 76 50 158 48 39 82 123 22 147 136 114 52 37 35 75 41 15 150 60 52 55 103 21 23 129 95 24 71 47 97 130 50 140 144 106 100 9 64 19 117 122 71 92 8 77 156 97 121 98 85 2 36 39 109 143 23 120 156 133 93 154 36 66 116 131 160 127 162 161 46 142 14 141 81 141 63 86 117 104 3 146 39 127 34 133 102 106 91 57 9 28 60 61 7 158 12 80 26 8 122 80 44 63 68 49 158 21 32 81 150 15 141 108 161 64 46 124 123 31 99 27 105 109 98 112 144 ^'}}, + {OUT=>'93530A9BC9A817F6922518A73A1505C411D05DA2'}], + ['156', {IN=> {f=> '336 1 34 161 107 149 48 67 138 109 156 104 37 133 60 80 84 81 160 9 16 96 164 1 95 112 4 86 163 116 98 103 55 31 8 56 37 36 127 32 9 89 103 31 100 161 85 106 119 89 154 43 115 162 137 108 128 38 42 155 103 9 62 65 102 122 10 138 160 125 47 158 43 91 69 123 132 35 121 4 110 89 130 69 29 139 69 53 70 83 29 163 67 41 9 108 34 45 76 87 2 144 164 98 33 160 79 78 48 89 9 38 134 93 146 79 54 122 80 38 112 55 55 101 70 8 129 44 70 59 98 149 24 136 124 138 63 25 166 83 51 34 91 45 30 118 59 28 87 72 44 116 28 36 103 101 113 10 114 62 111 71 65 126 53 19 114 86 42 85 36 57 137 57 159 95 88 78 72 20 23 14 65 10 22 129 68 1 68 74 75 108 7 7 147 109 13 35 51 104 158 164 122 126 2 50 4 132 127 59 52 13 81 20 47 107 74 148 115 46 106 46 82 115 68 144 142 60 104 15 90 136 102 100 134 42 15 141 100 40 49 49 73 166 13 156 82 166 37 82 96 137 130 166 134 20 139 45 122 56 107 98 79 124 17 32 130 120 165 77 23 130 96 67 68 47 37 12 29 18 38 158 19 160 55 147 39 118 83 121 96 43 137 33 66 86 112 147 155 149 140 5 19 17 148 161 10 44 159 146 57 16 26 102 49 3 104 61 59 74 56 10 165 31 54 25 142 157 37 58 165 128 154 73 50 149 94 137 ^'}}, + {OUT=>'E31354345F832D31E05C1B842D405D4BD4588EC8'}], + ['157', {IN=> {f=> '330 1 61 51 65 132 23 169 116 122 14 66 7 98 131 72 69 127 72 163 125 68 69 51 47 159 31 164 71 118 50 83 113 81 127 153 45 137 134 121 68 163 26 43 65 127 166 138 98 144 18 53 137 139 148 76 158 4 62 78 167 102 144 94 55 141 63 29 97 91 24 115 166 80 69 132 99 1 120 23 88 64 87 118 37 137 152 94 60 168 71 47 52 110 37 155 125 63 42 43 52 11 12 151 31 12 44 110 32 128 117 68 87 24 39 164 76 145 58 101 91 100 140 151 143 130 32 21 3 111 1 31 75 123 153 116 135 130 27 164 165 116 23 12 62 83 24 133 139 49 74 154 80 158 80 64 105 91 6 142 27 75 24 128 112 41 79 29 84 145 40 128 99 95 95 19 17 160 89 15 17 84 64 11 93 10 66 78 73 127 148 18 129 139 143 49 150 9 84 82 154 85 15 88 82 60 87 19 12 133 58 20 39 65 51 141 134 27 70 167 120 117 86 60 16 44 16 57 132 18 142 85 104 59 47 141 58 2 66 96 46 119 153 40 110 126 103 90 144 13 26 106 144 80 145 134 103 95 24 44 21 84 140 13 97 104 140 99 6 147 54 83 42 106 131 54 96 135 67 118 121 81 109 10 53 132 112 117 81 33 155 49 61 38 119 1 13 102 131 148 94 131 143 67 123 148 89 104 135 72 145 152 76 87 6 66 2 71 123 77 114 108 59 123 166 62 96 140 94 149 116 169 ^'}}, + {OUT=>'3FF76957E80B60CF74D015AD431FCA147B3AF232'}], + ['158', {IN=> {f=> '349 0 125 17 93 82 80 110 156 147 156 99 154 4 29 90 163 120 84 113 56 8 157 29 61 169 141 113 78 48 50 13 138 11 50 61 99 106 2 107 6 117 81 114 34 49 112 52 130 82 73 108 20 22 110 60 11 98 22 62 58 48 146 149 23 88 142 139 121 91 16 163 2 88 171 133 100 62 51 46 10 24 150 49 131 60 114 63 84 91 64 165 138 40 44 172 111 141 58 74 115 96 129 145 164 153 170 126 24 169 16 115 41 125 46 87 61 92 145 39 155 92 78 70 35 27 21 48 21 151 159 40 15 5 132 170 23 18 107 160 150 56 133 23 66 109 123 102 102 172 166 145 116 151 34 1 151 130 5 36 34 97 114 15 82 128 112 119 99 29 138 165 42 36 159 95 19 63 36 89 101 40 92 1 33 93 104 113 126 2 136 96 52 108 90 57 89 31 5 113 30 39 37 96 4 147 127 105 43 165 35 75 23 143 105 24 25 10 94 12 160 102 95 170 71 20 70 112 23 95 144 61 73 137 55 1 81 95 26 65 172 41 147 79 103 80 40 121 36 12 64 98 169 93 111 115 48 127 9 39 107 131 115 118 162 161 10 142 14 123 54 141 36 41 99 77 140 128 167 82 25 106 57 70 64 21 19 15 34 126 149 167 53 163 127 86 35 8 54 23 40 140 3 169 45 150 152 96 81 143 28 28 124 87 13 90 9 87 109 53 67 164 28 131 89 149 42 55 126 79 132 74 19 133 30 68 72 75 148 9 10 72 152 144 83 106 153 74 163 98 152 ^'}}, + {OUT=>'34AE3B806BE143A84DCE82E4B830EB7D3D2BAC69'}], + ['159', {IN=> {f=> '375 1 94 28 13 8 20 28 18 118 5 140 89 67 171 64 152 85 61 101 80 154 149 34 115 135 128 108 110 20 33 128 103 35 38 57 95 10 111 151 98 29 149 7 82 69 96 114 26 103 171 101 53 121 24 2 121 51 35 70 83 29 154 67 5 167 63 16 27 58 60 2 99 128 71 33 160 70 51 3 44 149 2 89 84 101 43 18 113 71 38 94 55 46 74 52 139 102 35 43 50 80 122 6 100 88 129 36 25 148 47 24 7 55 36 30 82 32 19 78 63 26 71 28 167 85 56 167 95 159 78 26 66 35 65 90 44 159 105 59 15 67 57 137 21 132 50 70 78 36 169 5 172 56 1 22 129 68 168 23 74 30 99 138 174 120 91 153 8 42 68 158 155 104 99 133 5 135 96 82 59 52 144 36 20 38 62 29 112 106 46 106 19 73 70 41 135 133 42 95 15 45 136 93 100 98 173 6 132 55 4 4 31 64 130 162 156 64 157 19 46 96 92 103 139 134 2 94 18 86 38 89 62 61 79 157 14 112 111 156 32 14 85 78 31 59 20 1 161 169 149 29 122 150 133 37 102 30 109 65 85 51 174 110 164 66 77 76 111 119 131 95 5 1 166 103 134 141 17 158 123 137 48 165 175 102 13 3 86 43 23 47 56 150 165 4 36 174 115 157 168 13 147 119 109 55 41 140 67 27 31 27 53 126 17 163 116 122 160 60 7 92 113 66 45 109 60 151 125 62 39 39 17 153 13 152 53 94 50 53 89 57 127 153 45 119 104 121 56 145 172 19 41 103 166 108 68 126 12 53 131 127 148 52 134 168 50 48 155 72 132 82 37 129 63 175 160 ^'}}, + {OUT=>'D7447E53D66BB5E4C26E8B41F83EFD107BF4ADDA'}], + ['160', {IN=> {f=> '366 1 73 15 79 139 71 51 132 81 135 111 166 61 37 60 118 37 92 134 94 60 150 53 47 25 110 19 137 107 27 176 43 16 145 146 142 165 12 17 92 166 110 117 41 69 6 12 164 76 109 40 101 82 82 131 134 115 143 112 32 164 146 93 162 31 66 123 144 80 135 94 137 156 107 157 173 62 65 176 124 112 4 65 127 44 131 53 19 105 91 149 106 27 57 158 92 85 14 79 20 84 127 174 128 72 68 59 171 17 124 80 167 8 57 28 172 66 144 48 42 37 109 121 18 120 103 116 13 132 39 73 145 76 158 43 82 33 51 153 164 97 13 2 3 20 24 114 98 9 25 131 102 99 86 42 16 26 159 39 105 161 133 49 59 41 20 105 31 136 30 87 10 119 135 13 83 99 58 45 99 156 26 61 135 143 80 118 107 76 77 24 44 12 66 95 147 61 86 140 99 167 138 54 47 42 97 122 18 60 90 40 73 85 63 82 1 35 96 94 81 54 15 128 40 52 2 101 1 165 93 113 130 85 95 98 58 105 112 53 68 108 72 100 152 49 87 140 39 154 62 114 77 105 63 50 87 157 26 78 122 67 140 71 170 119 5 93 64 50 104 144 129 138 75 130 4 178 60 139 120 54 113 32 2 133 17 43 163 129 89 72 149 155 30 38 7 138 5 44 61 69 76 175 107 6 93 81 114 28 25 82 22 118 58 73 96 175 177 92 36 11 98 171 38 28 42 146 125 178 88 136 139 103 67 10 151 151 70 153 115 94 32 51 34 177 173 132 49 119 54 96 45 78 73 64 159 120 22 20 154 111 117 58 56 109 72 143 ^'}}, + {OUT=>'77DD2A4482705BC2E9DC96EC0A13395771AC850C'}], + ['161', {IN=> {f=> '372 1 136 146 144 170 90 15 169 180 88 41 89 10 60 52 92 145 21 155 47 42 61 26 18 176 48 21 124 141 40 179 178 114 143 14 164 71 142 132 11 124 23 39 82 114 84 57 163 130 127 89 133 16 138 151 130 160 34 70 78 161 64 92 112 110 72 175 102 138 179 173 159 59 19 27 18 53 92 22 65 156 170 57 104 86 126 148 118 155 78 43 63 90 48 80 168 142 68 12 39 174 69 168 147 118 96 34 129 35 75 5 107 60 170 180 147 85 3 133 75 95 152 71 175 43 94 178 50 144 16 46 101 46 165 45 68 163 38 172 5 138 61 85 62 177 76 36 167 19 53 151 66 66 97 3 100 164 12 98 131 70 109 162 161 156 142 14 105 27 141 9 178 81 50 113 110 131 37 16 79 12 34 37 167 173 10 152 7 81 140 158 26 136 82 50 172 154 45 160 31 122 167 142 9 150 125 51 54 125 174 10 124 51 177 81 173 69 109 8 22 155 19 86 62 149 33 37 108 34 96 29 174 133 167 50 54 66 130 9 1 36 134 108 65 97 126 56 163 71 83 88 10 1 8 178 22 6 112 169 116 89 43 153 40 146 85 31 89 74 154 137 28 115 117 122 108 98 8 27 110 103 176 17 20 27 77 10 93 145 80 17 143 165 76 69 78 102 20 91 171 95 29 115 176 166 109 39 23 70 83 29 148 67 163 161 33 4 15 46 42 2 69 104 53 33 160 64 33 155 14 131 160 59 78 71 19 176 107 65 38 82 55 40 56 40 115 84 29 25 44 68 104 176 76 64 123 18 25 136 23 6 171 31 30 30 58 14 13 72 57 14 41 177 ^'}}, + {OUT=>'EAA1465DB1F59DE3F25EB8629602B568E693BB57'}], + ['162', {IN=> {f=> '363 0 135 69 16 167 79 143 46 178 26 3 65 58 36 135 97 35 175 51 152 57 137 173 108 10 54 78 4 153 173 164 48 177 22 129 68 168 167 74 174 91 106 174 96 75 129 168 34 36 158 147 88 75 101 149 103 64 42 59 52 112 180 20 30 22 173 80 98 46 106 179 65 30 17 127 125 26 87 15 5 136 85 100 66 141 182 124 15 156 148 15 56 98 146 156 48 149 3 14 96 52 79 115 134 170 54 178 54 22 73 30 45 39 133 182 96 103 148 176 6 45 62 183 51 180 153 145 145 117 21 90 118 109 21 62 22 101 49 53 11 142 86 132 66 69 44 79 87 115 55 5 169 150 63 110 109 177 150 91 129 40 149 159 102 165 3 70 27 175 23 56 126 165 164 20 158 91 157 136 157 131 111 69 39 33 132 43 19 175 179 37 118 9 155 116 122 128 52 7 84 89 58 13 85 44 135 125 54 183 23 161 145 173 136 29 62 50 13 57 25 127 153 45 95 64 121 40 121 140 171 9 71 166 68 28 102 4 53 123 111 148 20 102 160 34 8 139 32 116 66 13 113 63 143 97 63 10 59 124 66 41 132 71 115 106 151 46 22 45 118 37 67 124 94 60 140 43 47 10 110 9 127 97 7 156 43 180 125 126 137 145 12 2 82 146 100 117 26 59 180 181 164 76 89 30 101 77 72 126 114 95 143 102 32 149 131 83 157 31 61 123 139 60 135 74 169 122 151 102 137 168 62 55 166 119 97 163 60 112 24 116 38 178 105 91 134 86 27 47 138 72 70 183 79 15 84 117 154 128 57 53 39 161 88 ^'}}, + {OUT=>'9329D5B40E0DC43AA25FED69A0FA9C211A948411'}], + ['163', {IN=> {f=> '393 1 92 72 151 33 183 164 42 112 32 10 5 93 97 18 112 71 92 168 116 179 186 65 137 68 134 3 82 9 19 121 148 65 160 173 158 167 90 66 180 172 99 86 83 86 26 16 10 135 23 81 137 125 17 19 25 183 73 7 104 185 79 165 119 119 176 59 75 18 5 59 132 26 21 127 119 80 94 83 52 61 24 44 4 50 55 115 29 70 140 99 159 130 54 15 42 89 114 173 28 50 16 33 53 47 58 180 19 64 78 49 30 186 104 32 44 157 85 1 149 85 97 114 77 63 58 50 89 80 21 36 84 72 60 152 25 87 108 15 138 54 106 77 97 23 42 55 149 181 62 106 43 132 31 138 111 176 93 40 10 96 128 105 114 43 98 4 146 20 107 120 14 113 181 101 1 19 155 113 57 64 117 131 6 22 186 138 184 36 61 29 36 175 107 6 61 81 114 20 180 42 169 102 26 73 80 151 153 68 4 11 98 139 6 175 34 146 93 154 88 128 139 79 35 2 135 119 46 129 91 86 179 51 18 169 141 108 49 103 46 72 21 70 49 64 151 96 185 175 130 111 85 58 32 101 40 101 131 136 139 170 70 10 169 175 73 41 69 177 45 47 92 145 11 155 22 22 56 21 13 166 48 21 109 131 40 174 178 104 128 9 149 51 132 122 173 119 23 24 67 109 74 32 158 110 117 74 123 6 118 151 130 150 167 34 55 58 146 54 72 112 105 57 160 82 123 159 153 159 39 19 7 8 33 87 12 50 146 150 37 104 71 126 133 108 145 68 38 38 90 43 75 148 122 43 2 39 154 54 163 147 113 91 29 109 35 75 182 87 35 155 170 127 80 185 118 60 95 142 71 165 28 84 168 25 144 178 31 81 41 160 25 53 143 ^'}}, + {OUT=>'E94C0B6AA62AA08C625FAF817DDF8F51EC645273'}], + ['164', {IN=> {f=> '381 1 14 172 163 130 45 69 46 145 36 36 151 169 13 135 42 26 81 153 76 148 178 90 131 30 101 162 161 132 142 14 89 3 141 175 146 65 26 89 94 99 187 8 55 162 2 13 143 173 2 120 173 41 132 150 2 112 42 18 140 130 37 128 23 106 159 118 167 150 101 11 30 109 150 184 124 19 169 73 165 53 109 158 172 147 11 46 38 149 25 21 92 184 64 179 158 133 135 34 38 58 114 9 183 4 118 76 49 89 102 40 163 47 75 80 176 175 8 154 14 180 104 153 84 89 11 129 8 138 85 181 73 66 154 121 20 115 93 114 108 82 182 19 86 103 176 183 186 177 53 10 69 137 56 1 135 141 68 69 54 86 12 75 171 87 187 107 144 150 93 23 7 70 83 29 140 67 139 153 183 178 189 30 18 2 29 72 29 33 160 56 9 123 164 107 136 19 70 31 177 152 99 57 38 66 55 32 32 24 83 60 21 1 36 52 80 168 44 32 115 184 25 120 181 172 155 189 22 30 26 180 5 64 49 188 1 28 111 57 176 167 67 131 22 160 186 169 65 34 30 117 91 17 163 39 134 57 137 155 90 170 42 78 170 141 167 158 42 177 22 129 68 168 143 74 150 85 82 174 78 63 111 156 28 12 158 141 76 57 77 125 79 40 12 59 52 88 156 20 24 182 149 56 92 46 106 167 59 189 121 119 14 81 15 165 136 79 100 42 117 182 118 175 138 124 3 50 74 134 156 36 143 181 180 96 22 61 97 134 164 24 166 30 10 61 6 33 9 115 176 84 97 142 152 15 50 165 45 168 135 133 127 93 15 66 94 91 9 32 16 95 37 29 171 118 68 108 66 63 20 55 186 ^'}}, + {OUT=>'7FF02B909D82AD668E31E547E0FB66CB8E213771'}], + ['165', {IN=> {f=> '396 1 97 10 5 160 132 18 83 73 159 141 55 120 31 131 141 102 138 3 52 9 148 189 56 99 165 146 2 140 64 157 100 121 113 102 24 21 24 123 16 10 139 152 19 109 146 116 122 92 43 7 75 62 49 170 58 26 117 125 45 147 5 125 136 155 118 2 26 50 161 21 182 127 153 45 68 19 121 22 94 104 144 166 35 166 23 176 75 188 53 114 93 148 177 66 151 16 156 121 180 98 48 179 95 63 107 97 45 1 23 97 57 23 132 53 79 97 124 19 188 18 118 37 22 106 94 60 122 25 47 176 110 184 109 79 164 120 43 153 89 90 128 109 12 168 64 110 82 117 192 41 171 163 164 76 53 12 101 68 54 117 78 59 143 84 32 122 104 65 148 31 52 123 130 24 135 38 151 95 142 93 101 159 62 37 148 110 70 127 51 85 181 89 11 142 105 91 107 50 27 29 102 36 43 165 79 6 84 99 118 128 30 26 3 143 17 68 66 139 187 15 165 158 24 88 20 179 174 81 79 18 106 47 74 150 104 179 162 59 131 62 116 166 82 184 188 97 136 41 136 167 140 143 175 72 42 174 148 75 74 71 86 14 16 191 117 11 63 119 119 186 182 13 171 49 182 80 167 73 147 119 107 164 41 57 181 168 29 114 26 184 121 101 80 76 65 34 49 24 44 191 38 25 91 5 58 140 99 153 124 54 184 42 83 108 155 4 20 191 3 29 35 40 180 7 40 66 25 12 180 86 26 38 139 73 1 137 79 85 102 71 39 28 44 77 56 190 12 66 72 30 152 7 87 84 190 126 48 100 77 91 186 36 31 143 163 50 94 25 126 1 114 105 170 93 22 173 90 116 87 96 19 74 4 122 183 83 120 177 113 169 181 77 182 1 149 186 ^'}}, + {OUT=>'5BB3570858FA1744123BAC2873B0BB9810F53FA1'}], + ['166', {IN=> {f=> '384 1 25 56 85 107 177 6 186 138 184 28 61 184 191 175 107 6 29 81 114 12 156 2 137 86 189 73 64 127 129 44 167 11 98 107 169 143 26 146 61 130 88 120 139 55 3 189 119 87 22 105 67 78 147 51 2 161 109 84 49 87 38 48 192 62 25 64 143 72 169 151 106 111 53 58 8 93 8 85 123 120 131 170 38 2 169 167 49 41 37 153 21 39 92 145 190 155 177 185 48 13 5 150 48 21 85 115 40 166 178 88 104 1 125 19 116 106 141 111 23 43 101 58 187 150 78 101 50 107 185 86 151 130 134 143 34 31 26 122 38 40 112 97 33 136 50 99 127 121 159 7 19 170 187 1 79 191 26 130 118 5 104 47 126 109 92 129 52 30 193 90 35 67 116 90 3 181 39 122 30 155 147 105 83 21 77 35 75 174 55 190 131 154 95 72 185 94 36 95 126 71 149 4 68 152 180 144 146 7 49 33 152 188 29 111 194 172 148 125 35 59 36 125 11 36 141 149 183 125 27 1 71 133 61 138 168 85 131 5 96 162 161 117 142 14 79 183 141 165 126 55 11 74 84 79 167 3 40 142 177 193 128 173 192 100 163 16 127 145 182 97 17 193 120 115 32 108 18 96 154 103 152 150 86 181 15 99 135 179 124 194 164 68 160 43 109 138 152 142 6 21 23 149 20 11 82 164 44 159 148 133 115 24 28 53 104 9 183 179 108 56 39 84 87 30 163 32 70 75 166 170 8 139 9 175 99 143 64 89 186 114 183 133 85 161 63 61 154 111 15 115 78 109 108 72 177 14 71 103 176 173 176 157 38 10 54 132 41 186 130 126 63 69 39 76 7 65 171 82 172 102 124 140 83 113 ^'}}, + {OUT=>'905F43940B3591CE39D1145ACB1ECA80AB5E43CD'}], + ['167', {IN=> {f=> '396 1 189 70 83 29 132 67 115 145 151 170 181 14 192 2 187 40 5 33 160 48 183 91 132 83 112 177 62 189 153 128 91 49 38 50 55 24 8 8 51 36 13 175 28 36 56 160 12 107 168 25 104 157 156 139 165 14 30 192 164 195 56 41 180 159 28 79 41 144 167 51 115 188 136 154 145 65 2 22 93 83 191 147 23 110 57 137 131 66 138 26 78 146 125 159 150 34 177 22 129 68 168 111 74 118 77 50 174 54 47 87 140 20 178 158 133 60 33 45 93 47 8 170 59 52 56 124 20 16 150 117 24 84 46 106 151 51 158 173 113 111 196 73 15 133 136 71 100 10 85 182 110 143 114 92 185 42 42 118 156 20 135 173 156 96 180 37 73 134 156 182 150 196 192 45 172 17 167 91 168 68 89 134 120 190 173 34 141 37 152 111 117 103 61 7 34 62 67 191 190 8 87 21 195 139 86 44 76 66 55 186 23 31 87 183 5 155 122 191 68 53 149 136 35 115 26 121 131 102 123 3 42 197 133 179 56 84 165 136 190 130 49 157 80 101 103 97 197 11 19 118 1 5 119 137 9 104 193 141 116 122 72 38 7 70 47 44 155 43 16 107 125 40 127 193 105 131 145 108 185 6 50 141 1 167 127 153 45 53 192 121 12 79 84 129 151 15 166 196 156 60 188 53 109 83 148 162 46 146 6 136 111 160 88 38 169 85 63 87 97 35 194 3 82 52 13 132 43 59 92 109 4 178 3 118 37 195 96 94 60 112 15 47 166 110 179 99 69 149 100 43 138 69 70 123 89 12 158 54 90 72 117 182 31 166 153 164 76 33 2 101 63 44 112 58 39 143 74 32 107 89 55 143 31 47 123 125 4 135 18 141 80 137 88 81 154 187 ^'}}, + {OUT=>'336C79FBD82F33E490C577E3F791C3CBFE842AFF'}], + ['168', {IN=> {f=> '406 0 23 134 103 49 99 44 64 160 68 190 114 105 91 86 22 27 15 74 8 22 151 79 199 84 85 90 128 9 5 175 129 17 40 59 125 187 194 144 151 3 60 6 158 153 67 58 18 99 19 53 129 90 179 134 52 124 55 95 138 82 170 167 69 122 13 108 160 119 115 161 51 14 167 120 47 60 57 86 16 184 96 197 42 98 112 165 154 199 157 21 168 52 146 66 126 119 93 150 20 36 153 140 194 93 26 156 114 80 80 55 44 13 35 24 44 191 24 190 63 177 44 140 99 146 117 54 163 42 76 101 134 176 185 177 168 1 21 19 180 193 12 52 197 191 173 65 19 31 118 59 1 123 72 71 88 64 11 193 37 63 28 169 184 45 72 195 152 186 87 56 176 112 41 93 77 84 158 29 3 136 142 36 80 4 119 166 86 98 163 93 1 145 83 102 66 75 191 46 4 94 155 55 120 149 113 148 181 49 175 180 142 87 5 51 65 92 167 196 186 138 184 23 61 164 171 175 107 6 9 81 114 7 141 177 117 76 174 73 54 112 114 29 152 11 98 87 154 123 21 146 41 115 88 115 139 40 183 189 109 67 7 90 52 73 127 51 192 156 89 69 49 77 33 33 182 57 10 64 138 57 159 136 91 111 33 58 193 88 188 75 118 110 126 170 18 197 169 162 34 41 17 138 6 34 92 145 185 155 157 170 43 8 140 48 21 70 105 40 161 178 78 89 196 110 199 106 96 121 106 23 185 28 96 48 167 145 58 91 35 97 180 66 151 130 124 128 34 16 6 107 28 20 112 92 18 121 30 84 107 101 159 187 19 155 182 181 74 186 11 120 98 185 104 32 126 94 82 119 42 25 173 90 30 62 96 70 178 176 39 102 15 150 147 100 78 16 57 35 75 169 35 170 116 144 75 146 ^'}}, + {OUT=>'5C6D07A6B44F7A75A64F6CE592F3BAE91E022210'}], + ['169', {IN=> {f=> '409 1 185 70 12 95 110 71 133 183 52 136 148 144 114 186 17 25 144 164 5 79 178 172 124 117 19 43 20 93 174 36 125 117 151 109 3 164 55 101 37 122 152 77 131 168 88 162 161 93 142 14 63 167 141 149 94 39 190 50 68 47 135 198 16 110 153 177 104 173 192 68 147 179 119 137 166 73 180 169 88 91 24 76 10 80 146 79 128 150 62 149 194 83 111 171 124 170 156 60 152 27 109 106 120 134 201 184 202 149 12 198 66 132 12 127 132 133 83 8 12 45 88 9 183 155 92 24 23 76 63 14 163 8 62 67 150 162 8 115 1 167 91 127 32 89 162 90 159 125 85 129 47 53 154 95 7 115 54 101 108 56 169 6 47 103 176 157 160 125 14 10 30 124 17 178 122 102 55 69 15 60 202 49 171 74 148 94 92 124 67 200 184 70 83 29 127 67 100 140 131 165 176 4 182 2 167 20 193 33 160 43 173 71 112 68 97 157 57 169 138 113 86 44 38 40 55 19 196 201 31 21 8 165 23 26 41 155 195 183 102 158 25 94 142 146 129 150 9 30 177 154 195 51 36 175 139 28 59 31 124 167 41 105 173 121 134 130 65 185 17 78 78 181 137 13 95 57 137 116 51 118 16 78 131 115 154 145 29 177 22 129 68 168 91 74 98 72 30 174 39 37 72 130 15 163 158 128 50 18 25 73 27 191 150 59 52 36 104 20 11 130 97 4 79 46 106 141 46 138 163 108 106 191 68 15 113 136 66 100 193 65 182 105 123 99 72 180 37 22 108 156 10 130 168 141 96 160 22 58 134 151 162 140 181 187 35 157 7 147 76 163 58 84 129 100 190 153 24 126 32 142 96 107 88 41 2 14 42 52 186 170 3 82 11 180 119 66 29 56 66 50 171 3 11 77 163 5 150 112 128 ^'}}, + {OUT=>'7E0D3E9D33127F4A30EB8D9C134A58409FA8695B'}], + ['170', {IN=> {f=> '413 1 47 25 135 129 7 108 19 107 117 102 102 3 28 190 112 165 56 63 165 122 183 116 28 157 52 73 89 90 169 202 12 111 185 203 91 116 200 97 193 134 116 122 44 31 7 63 26 37 134 22 2 93 125 33 99 186 77 124 131 94 171 183 50 113 178 146 127 153 45 32 164 121 203 58 56 108 130 192 166 168 128 39 188 53 102 69 148 141 18 139 197 108 97 132 74 24 155 71 63 59 97 21 194 180 61 45 204 132 29 31 85 88 188 164 187 118 37 167 82 94 60 98 1 47 152 110 172 85 55 128 72 43 117 41 42 116 61 12 144 40 62 58 117 168 17 159 139 164 76 5 193 101 56 30 105 30 11 143 60 32 86 68 41 136 31 40 123 118 181 135 195 127 59 130 81 53 147 62 13 124 98 34 79 39 49 145 53 180 94 105 91 71 2 27 5 54 193 7 141 79 199 84 75 70 128 199 195 160 119 17 20 54 115 187 184 129 146 193 40 201 143 138 57 43 18 94 204 38 114 80 179 114 47 119 50 80 118 82 160 152 49 112 198 88 155 104 95 151 36 199 162 100 27 50 47 86 195 16 179 81 192 27 83 107 150 134 194 147 1 158 32 131 61 111 119 83 140 5 21 133 120 174 78 26 136 109 65 80 40 29 203 25 24 44 191 14 170 43 162 34 140 99 141 112 54 148 42 71 96 119 161 165 167 148 186 11 4 180 188 197 42 182 181 168 50 14 26 103 49 1 113 67 61 78 59 196 173 32 53 8 154 169 30 72 175 152 176 87 36 166 102 36 88 77 79 138 24 188 131 127 26 70 194 114 146 66 93 158 93 191 125 78 92 51 60 176 26 4 74 135 35 120 129 113 133 181 29 170 170 137 77 190 46 45 77 157 191 186 138 184 18 61 144 151 175 107 6 194 81 114 2 126 110 ^'}}, + {OUT=>'9A5F50DFCFB19286206C229019F0ABF25283028C'}], + ['171', {IN=> {f=> '427 1 85 60 150 73 38 88 90 5 128 11 98 55 130 91 13 146 9 91 88 107 139 16 159 189 93 35 191 66 28 65 95 51 184 148 57 45 49 61 25 9 166 49 194 64 130 33 143 112 67 111 1 58 177 80 164 59 110 94 118 170 194 197 169 154 10 41 193 114 190 26 92 145 177 155 125 146 35 200 124 48 21 46 89 40 153 178 62 65 196 86 175 90 80 89 98 23 169 4 88 32 135 137 26 75 11 81 172 34 151 130 108 104 34 200 182 83 12 196 112 84 202 97 206 60 75 69 159 163 19 131 174 157 66 178 195 104 66 161 104 8 126 70 66 103 26 17 141 90 22 54 64 38 146 168 39 70 199 142 147 92 70 8 25 35 75 161 3 138 92 128 43 59 185 55 205 95 100 71 123 173 42 126 128 144 94 176 205 20 139 149 198 59 168 172 109 112 9 33 10 73 154 36 115 97 131 99 196 144 45 81 22 112 142 72 131 148 83 162 161 78 142 14 53 157 141 139 74 29 180 35 58 27 115 198 1 90 138 167 89 173 192 48 137 159 114 132 156 58 160 154 68 76 19 56 5 70 141 64 113 150 47 129 184 73 96 166 124 155 151 55 147 17 109 86 100 129 201 164 192 149 7 193 56 112 200 107 122 133 63 206 2 40 78 9 183 140 82 4 13 71 48 4 163 201 57 62 140 157 8 100 204 162 86 117 12 89 147 75 144 120 85 109 37 48 154 85 2 115 39 96 108 46 164 1 32 103 176 147 150 105 207 10 15 119 2 173 117 87 50 69 50 202 39 171 69 133 89 72 114 57 195 179 70 83 29 122 67 85 135 111 160 171 202 172 2 147 183 33 160 38 163 51 92 53 82 137 52 149 123 98 81 39 38 30 55 14 186 196 11 6 3 155 18 16 26 150 180 168 97 148 25 84 127 136 119 135 4 30 162 144 195 46 31 170 119 28 190 ^'}}, + {OUT=>'DCA737E269F9D8626D488988C996E06B352C0708'}], + ['172', {IN=> {f=> '443 1 17 96 167 27 91 152 100 106 109 65 164 10 57 71 167 123 209 74 57 137 95 30 90 2 78 110 101 147 138 22 177 22 129 68 168 63 74 70 65 2 174 18 23 51 116 8 142 158 121 36 207 207 45 209 170 122 59 52 8 76 20 4 102 69 186 72 46 106 127 39 110 149 101 99 184 61 15 85 136 59 100 172 37 182 98 95 78 44 173 30 204 94 156 206 123 161 120 96 132 1 37 134 144 134 126 160 180 21 136 203 119 55 156 44 77 122 72 190 125 10 105 25 128 75 93 67 13 205 196 14 31 179 142 206 75 207 159 91 38 8 28 66 43 150 185 193 63 135 5 143 98 143 32 5 125 124 197 103 14 97 107 102 87 3 18 185 97 155 56 48 165 112 178 106 13 157 32 53 79 85 149 197 7 106 175 203 71 101 195 92 193 129 116 122 24 26 7 58 11 32 119 7 202 83 125 28 79 181 57 119 121 84 161 168 50 93 163 131 127 153 45 17 144 121 198 43 36 93 115 177 166 148 108 24 188 53 97 59 148 126 208 134 192 88 87 112 64 14 145 61 63 39 97 11 194 165 46 40 199 132 19 11 80 73 178 154 177 118 37 147 72 94 60 88 201 47 142 110 167 75 45 113 52 43 102 21 22 111 41 12 134 30 42 48 117 158 7 154 129 164 76 195 188 101 51 20 100 10 201 143 50 32 71 53 31 131 31 35 123 113 166 135 180 117 44 125 76 33 142 62 3 114 93 19 59 34 34 130 38 170 74 105 91 56 192 27 205 34 178 202 131 79 199 84 65 50 128 189 185 145 109 17 49 105 187 174 114 141 183 20 196 128 123 47 28 18 89 189 23 99 70 179 94 42 114 45 65 98 82 150 137 29 102 183 68 150 89 75 141 21 184 157 80 7 40 37 86 190 16 174 66 187 12 68 102 135 114 189 137 191 148 12 116 56 96 119 73 130 200 6 113 100 154 63 26 116 104 50 80 25 14 193 83 ^'}}, + {OUT=>'B8FFC1D4972FCE63241E0E77850AC46DDE75DBFA'}], + ['173', {IN=> {f=> '436 1 24 44 191 211 138 11 138 18 140 99 133 104 54 124 42 63 88 95 137 133 151 116 162 208 193 180 180 173 26 158 165 160 26 6 18 79 33 1 97 59 45 62 51 172 141 24 37 189 130 145 6 72 143 152 160 87 4 150 86 28 80 77 71 106 16 164 123 103 10 54 178 106 114 34 85 150 93 175 93 70 76 27 36 152 207 4 42 103 3 120 97 113 109 181 210 162 154 129 61 166 38 13 53 141 183 186 138 184 10 61 112 119 175 107 6 170 81 114 207 102 125 65 50 135 73 28 73 75 203 113 11 98 35 115 71 8 146 202 76 88 102 139 1 144 189 83 15 181 51 13 60 75 51 179 143 37 30 49 51 20 207 156 44 184 64 125 18 133 97 52 111 194 58 167 75 149 49 105 84 113 170 179 197 169 149 208 41 178 99 180 21 92 145 172 155 105 131 30 208 200 114 48 21 31 79 40 148 178 52 50 196 71 160 80 70 69 93 23 159 202 83 22 115 132 6 65 209 71 167 14 151 130 98 89 34 190 167 68 2 181 112 79 192 82 191 45 55 49 159 148 19 116 169 142 61 173 185 94 46 146 104 206 126 55 56 93 16 12 121 90 17 49 44 18 126 163 39 50 189 137 147 87 65 3 5 35 75 156 196 118 77 118 23 54 185 40 195 95 90 71 113 163 32 116 108 144 74 166 190 15 134 134 188 39 158 172 94 107 212 23 53 134 36 105 77 111 89 186 124 35 61 7 102 132 67 131 128 78 162 161 63 142 14 43 147 141 129 54 19 170 20 48 7 95 198 199 70 123 157 74 173 192 28 127 139 109 127 146 43 140 139 48 61 14 36 60 136 49 98 150 32 109 174 63 81 161 124 140 146 50 142 7 109 66 80 124 201 144 182 149 2 188 46 92 185 87 112 133 43 201 205 35 68 9 183 125 72 197 3 66 33 207 163 191 52 57 130 152 8 85 204 157 81 107 205 187 ^'}}, + {OUT=>'E9C9BF41C8549354151B977003CE1D830BE667DB'}], + ['174', {IN=> {f=> '462 1 126 54 123 113 85 81 23 41 154 71 210 115 18 89 108 32 157 209 11 103 176 133 136 77 193 10 209 112 196 166 110 66 43 69 194 36 202 25 171 62 112 82 44 100 43 188 172 70 83 29 115 67 64 128 83 153 164 195 158 2 119 187 169 33 160 31 149 23 64 32 61 109 45 121 102 77 74 32 38 16 55 7 172 189 198 200 211 141 11 2 5 143 159 147 90 134 25 70 106 122 105 114 212 30 141 130 195 39 24 163 91 28 11 7 76 167 17 81 137 85 86 94 65 149 5 42 66 157 113 204 59 57 137 80 15 70 207 78 95 91 142 133 17 177 22 129 68 168 43 74 50 60 197 174 3 13 36 106 3 127 158 116 26 197 192 25 194 155 102 59 52 203 56 20 214 82 49 171 67 46 106 117 34 90 139 96 94 179 56 15 65 136 54 100 157 17 182 93 75 63 24 168 25 189 84 156 201 118 156 105 96 112 201 22 134 139 114 116 145 175 11 121 198 99 40 151 34 72 117 52 190 105 90 20 118 60 83 52 208 205 181 209 16 174 122 206 70 202 144 71 18 208 8 66 38 135 170 178 53 115 5 138 88 123 17 200 115 119 182 98 9 87 97 102 72 3 8 180 82 145 56 33 165 102 173 96 213 157 12 33 69 80 129 192 2 101 165 203 51 86 190 87 193 124 116 122 4 21 7 53 211 27 104 207 197 73 125 23 59 176 37 114 111 74 151 153 50 73 148 116 127 153 45 2 124 121 193 28 16 78 100 162 166 128 88 9 188 53 92 49 148 111 193 129 187 68 77 92 54 4 135 51 63 19 97 1 194 150 31 35 194 132 9 206 75 58 168 144 167 118 37 127 62 94 60 78 196 47 132 110 162 65 35 98 32 43 87 1 2 106 21 12 124 20 22 38 117 148 212 149 119 164 76 180 183 101 46 10 95 205 186 143 40 32 56 38 21 126 31 30 123 108 151 135 165 107 29 120 71 13 137 62 208 104 88 4 39 29 19 115 23 160 54 105 91 41 177 27 200 14 163 124 ^'}}, + {OUT=>'0942908960B54F96CB43452E583F4F9CB66E398A'}], + ['175', {IN=> {f=> '453 0 115 79 199 84 49 18 128 173 169 121 93 17 186 41 89 187 158 90 133 167 206 188 104 99 31 4 18 81 165 217 75 54 179 62 34 106 37 41 66 82 134 113 215 86 159 36 142 65 43 125 215 160 149 48 193 24 21 86 182 16 166 42 179 206 44 94 111 82 181 121 167 132 198 92 48 72 119 57 114 184 200 81 68 122 39 26 84 96 26 80 1 208 177 217 24 44 191 206 118 209 123 8 140 99 128 99 54 109 42 58 83 80 122 113 141 96 147 203 183 180 175 158 16 143 155 155 11 1 13 64 23 1 87 54 35 52 46 157 121 19 27 174 115 130 209 72 123 152 150 87 202 140 76 23 75 77 66 86 11 149 118 88 44 168 101 94 14 80 145 93 165 73 65 66 12 21 137 192 4 22 83 201 120 77 113 94 181 195 157 144 124 51 151 33 211 38 131 178 186 138 184 5 61 92 99 175 107 6 155 81 114 207 87 105 45 40 120 73 18 58 60 193 98 11 98 15 100 51 3 146 187 61 88 97 139 204 129 189 73 213 171 36 216 55 55 51 174 138 17 15 49 41 15 197 146 39 174 64 120 3 123 82 37 111 179 58 157 70 134 39 100 74 108 170 164 197 169 144 198 41 163 84 170 16 92 145 167 155 85 116 25 208 200 104 48 21 16 69 40 143 178 42 35 196 56 145 70 60 49 88 23 149 192 78 12 95 127 204 55 199 61 162 212 151 130 88 74 34 180 152 53 210 166 112 74 182 67 176 30 35 29 159 133 19 101 164 127 56 168 175 84 26 131 104 196 126 40 46 83 6 7 101 90 12 44 24 216 106 158 39 30 179 132 147 82 60 216 203 35 75 151 181 98 62 108 3 49 185 25 185 95 80 71 103 153 22 106 88 144 54 156 175 10 129 119 178 19 148 172 79 102 207 13 208 33 114 36 95 57 91 79 176 104 25 41 210 92 122 62 131 108 73 162 161 48 142 14 33 137 141 119 34 9 160 5 38 205 75 198 189 50 108 112 ^'}}, + {OUT=>'FCE34051C34D4B81B85DDC4B543CDE8007E284B3'}], + ['176', {IN=> {f=> '454 1 53 173 192 113 111 102 120 132 22 112 118 20 40 7 8 213 46 129 28 77 150 11 81 160 49 60 154 124 119 139 43 135 213 109 38 52 117 201 116 168 149 215 181 32 64 164 59 98 133 15 194 198 28 54 9 183 104 58 176 209 59 12 200 163 177 45 50 116 145 8 64 204 150 74 93 184 89 111 39 108 108 85 61 13 36 154 61 210 115 3 84 108 22 152 209 216 103 176 123 126 57 183 10 199 107 186 161 105 51 38 69 184 26 202 15 171 57 97 77 24 90 33 183 167 70 83 29 110 67 49 123 63 148 159 190 148 2 99 172 159 33 160 26 139 3 44 17 46 89 40 101 87 62 69 27 38 6 55 2 162 184 183 190 211 131 6 212 210 138 144 132 85 124 25 60 91 112 95 99 212 30 126 120 195 34 19 158 71 28 211 217 56 167 7 71 122 70 66 79 65 134 27 61 147 103 199 44 57 137 65 50 202 78 80 81 137 128 12 177 22 129 68 168 23 74 30 55 182 174 208 3 21 96 218 112 158 111 16 187 177 5 179 140 82 59 52 188 36 20 214 62 29 156 62 46 106 107 29 70 129 91 89 174 51 15 45 136 49 100 142 217 182 88 55 48 4 163 20 174 74 156 196 113 151 90 96 92 191 7 134 134 94 106 130 170 1 106 193 79 25 146 24 67 112 32 190 85 210 75 15 108 45 73 37 193 205 166 194 1 169 102 206 65 197 129 51 218 198 208 66 33 120 155 163 43 95 5 133 78 103 2 185 105 114 167 93 4 77 87 102 57 3 218 175 67 135 56 18 165 92 168 86 203 157 212 13 59 75 109 187 217 96 155 203 31 71 185 82 193 119 116 122 204 16 7 48 201 22 89 197 192 63 125 18 39 171 17 109 101 64 141 138 50 53 133 101 127 153 45 207 104 121 188 13 216 63 85 147 166 108 68 214 188 53 87 39 148 96 178 124 182 48 67 72 44 214 125 41 63 219 97 211 194 135 16 30 189 132 219 191 70 43 158 181 ^'}}, + {OUT=>'61E8916532503627F4024D13884640A46F1D61D4'}], + ['177', {IN=> {f=> '475 0 153 118 37 99 48 94 60 64 189 47 118 110 155 51 21 77 4 43 66 195 196 99 215 12 110 6 216 24 117 134 205 142 105 164 76 159 176 101 39 218 88 184 165 143 26 32 35 17 7 119 31 23 123 101 130 135 144 93 8 113 64 207 130 62 201 90 81 205 11 22 220 94 2 146 26 105 91 20 156 27 193 208 142 178 107 79 199 84 41 2 128 165 161 109 85 17 174 37 81 187 150 78 129 159 194 184 92 87 23 214 18 77 153 209 63 46 179 46 30 102 33 29 50 82 126 101 203 78 147 20 138 53 27 117 207 148 145 32 181 16 13 86 178 16 162 30 175 198 32 90 99 66 177 113 155 124 186 80 44 60 119 49 106 176 192 65 52 106 27 26 68 92 14 80 211 200 169 213 24 44 191 202 102 197 111 140 99 124 95 54 97 42 54 79 68 110 97 133 80 135 199 175 180 171 146 8 131 147 151 221 219 9 52 15 1 79 50 27 44 42 145 105 15 19 162 103 118 201 72 107 152 142 87 190 132 68 19 71 77 62 70 7 137 114 76 214 36 160 97 78 220 76 141 93 157 57 61 58 9 125 180 4 6 67 189 120 61 113 82 181 183 153 136 120 43 139 29 199 26 123 174 186 138 184 1 61 76 83 175 107 6 143 81 114 207 75 89 29 32 108 73 10 46 48 185 86 11 98 221 88 35 221 146 175 49 88 93 139 196 117 189 65 201 163 24 208 51 39 51 170 134 1 3 49 33 11 189 138 35 166 64 116 213 115 70 25 111 167 58 149 66 122 31 96 66 104 170 152 197 169 140 190 41 151 72 162 12 92 145 163 155 69 104 21 208 200 96 48 21 4 61 40 139 178 34 23 196 44 133 62 52 33 84 23 141 184 74 4 79 123 192 47 191 53 158 200 151 130 80 62 34 172 140 41 206 154 112 70 174 55 164 18 19 13 159 121 19 89 160 115 52 164 167 76 10 119 104 188 126 28 38 75 220 3 85 90 8 40 8 204 90 154 39 14 171 128 147 78 56 216 191 35 75 147 169 82 50 100 209 45 185 13 177 95 150 ^'}}, + {OUT=>'F008D5D7853B6A17B7466CD9E18BD135E520FAF4'}], + ['178', {IN=> {f=> '471 0 71 89 139 8 92 60 144 26 142 154 3 122 98 164 216 134 172 58 95 200 224 201 5 86 36 81 29 63 65 162 76 11 13 196 78 108 55 131 80 66 162 161 27 142 14 19 123 141 105 6 220 146 209 24 184 47 198 175 22 87 133 38 173 192 205 103 91 97 115 122 7 92 103 25 2 213 213 36 124 13 62 150 221 61 150 39 45 149 124 104 134 38 130 208 109 18 32 112 201 96 158 149 215 176 22 44 149 39 88 133 220 189 193 23 44 9 183 89 48 161 204 54 222 195 163 167 40 45 106 140 8 49 204 145 69 83 169 89 96 24 93 103 85 41 3 31 154 51 210 115 213 79 108 12 147 209 206 103 176 113 116 37 173 10 189 102 176 156 100 36 33 69 174 16 202 5 171 52 82 72 4 80 23 178 162 70 83 29 105 67 34 118 43 143 154 185 138 2 79 157 149 33 160 21 129 208 24 2 31 69 35 81 72 47 64 22 38 221 55 222 152 179 168 180 211 121 1 207 200 133 129 117 80 114 25 50 76 102 85 84 212 30 111 110 195 29 14 153 51 28 196 212 36 167 222 61 107 55 46 64 65 119 220 12 56 137 93 194 29 57 137 50 210 30 197 78 65 71 132 123 7 177 22 129 68 168 3 74 10 50 167 174 198 218 6 86 218 97 158 106 6 177 162 210 164 125 62 59 52 173 16 20 214 42 9 141 57 46 106 97 24 50 119 86 84 169 46 15 25 136 44 100 127 202 182 83 35 33 209 158 15 159 64 156 191 108 146 75 96 72 181 217 134 129 74 96 115 165 216 91 188 59 10 141 14 62 107 12 190 65 205 60 10 98 30 63 22 178 205 151 179 211 164 82 206 60 192 114 31 203 188 193 66 28 105 140 148 33 75 5 128 68 83 212 170 95 109 152 88 224 67 77 102 42 3 213 170 52 125 56 3 165 82 163 76 193 157 197 218 49 70 89 182 217 91 145 203 11 56 180 77 193 114 116 122 189 11 7 43 191 17 74 187 187 53 125 13 19 166 222 104 91 54 131 123 50 33 118 86 127 167 ^'}}, + {OUT=>'BD8D2E873CF659B5C77AAC1616827EF8A3B1A3B3'}], + ['179', {IN=> {f=> '480 1 45 193 76 121 181 219 195 42 64 126 166 80 40 200 188 53 80 25 148 75 157 117 175 20 53 44 30 207 111 27 63 198 97 204 194 114 222 23 182 132 212 170 63 22 144 120 143 118 37 79 38 94 60 54 184 47 108 110 150 41 11 62 211 43 51 180 181 94 200 12 100 223 201 14 117 124 200 137 95 164 76 144 171 101 34 213 83 169 150 143 16 32 20 2 224 114 31 18 123 96 115 135 129 83 220 108 59 192 125 62 196 80 76 195 218 17 210 79 214 136 6 105 91 5 141 27 188 193 127 168 97 79 199 84 31 209 128 155 151 94 75 17 159 32 71 187 140 63 124 149 179 179 77 72 13 204 18 72 138 199 48 36 179 26 25 97 28 14 30 82 116 86 188 68 132 133 38 7 107 197 133 140 12 166 6 3 86 173 16 157 15 170 188 17 85 84 46 172 103 140 114 171 65 39 45 119 39 96 166 182 45 32 86 12 26 48 87 226 80 201 190 159 208 24 44 191 197 82 182 96 217 140 99 119 90 54 82 42 49 74 53 95 77 123 60 120 194 165 180 166 131 225 116 137 146 211 219 4 37 5 1 69 45 17 34 37 130 85 10 9 147 88 103 191 72 87 152 132 87 175 122 58 14 66 77 57 50 2 122 109 61 209 26 150 92 58 205 71 136 93 147 37 56 48 212 221 110 165 4 213 47 174 120 41 113 67 181 168 148 126 115 33 124 24 184 11 113 169 186 138 184 223 61 56 63 175 107 6 128 81 114 207 60 69 9 22 93 73 31 33 175 71 11 98 206 73 15 221 146 160 34 88 88 139 186 102 189 55 186 153 9 198 46 19 51 165 129 208 215 49 23 6 179 128 30 156 64 111 203 105 55 10 111 152 58 139 61 107 21 91 56 99 170 137 197 169 135 180 41 136 57 152 7 92 145 158 155 49 89 16 208 200 86 48 21 216 51 40 134 178 24 8 196 29 118 52 42 13 79 23 131 174 69 221 59 118 177 37 181 43 153 185 151 130 70 47 34 162 125 26 201 139 112 65 164 40 149 3 226 220 159 106 19 74 155 100 47 159 157 193 ^'}}, + {OUT=>'B25A04DD425302ED211A1C2412D2410FA10C63B6'}], + ['180', {IN=> {f=> '471 0 211 98 104 174 126 7 24 61 213 225 57 90 1 33 209 183 62 147 39 215 157 121 147 71 49 216 170 35 75 140 148 54 29 86 188 38 185 221 163 95 58 71 81 131 84 44 144 10 134 142 228 118 86 156 204 126 172 46 91 196 220 197 218 70 36 73 13 47 57 154 60 3 226 188 70 100 51 131 64 62 162 161 15 142 14 11 115 141 97 219 216 138 201 16 172 31 198 167 6 75 125 26 173 192 193 95 75 93 111 114 224 76 91 213 13 227 201 213 28 120 1 50 150 213 45 142 31 33 145 124 92 130 34 126 204 109 2 16 108 201 80 150 149 215 172 14 28 137 23 80 133 208 185 189 19 36 9 183 77 40 149 200 50 214 191 163 159 36 41 98 136 8 37 204 141 65 75 157 89 84 12 81 99 85 25 224 27 154 43 210 115 205 75 108 4 143 209 198 103 176 105 108 21 165 10 181 98 168 152 96 24 29 69 166 8 202 226 171 48 70 68 217 72 15 174 158 70 83 29 101 67 22 114 27 139 150 181 130 2 63 145 141 33 160 17 121 196 8 219 19 53 31 65 60 35 60 18 38 217 55 222 144 175 156 172 211 113 226 203 192 129 117 105 76 106 25 42 64 94 77 72 212 30 99 102 195 25 10 149 35 28 184 208 20 167 218 53 95 43 30 52 65 107 220 52 129 85 190 17 57 137 38 202 14 193 78 53 63 128 119 3 177 22 129 68 168 216 74 223 46 155 174 190 214 223 78 218 85 158 102 227 169 150 198 152 113 46 59 52 161 20 214 26 222 129 53 46 106 89 20 34 111 82 80 165 42 15 9 136 40 100 115 190 182 79 19 21 197 154 11 147 56 156 187 104 142 63 96 56 173 209 134 125 58 88 103 161 212 79 184 43 227 137 6 58 103 225 190 49 201 48 6 90 18 55 10 166 205 139 167 203 160 66 206 56 188 102 15 191 180 181 66 24 93 128 136 25 59 5 124 60 67 204 158 87 105 140 84 224 59 69 102 30 3 209 166 40 117 56 220 165 74 159 68 185 157 185 206 41 66 167 ^'}}, + {OUT=>'A404E21588123E0893718B4B44E91414A785B91F'}], + ['181', {IN=> {f=> '490 1 176 217 85 133 203 218 38 174 71 193 108 116 122 171 5 7 37 179 11 56 175 181 41 125 7 226 160 204 98 79 42 119 105 50 9 100 68 127 153 45 185 60 121 177 211 183 30 52 114 166 64 24 192 188 53 76 17 148 63 145 113 171 4 45 28 22 203 103 19 63 186 97 200 194 102 214 19 178 132 208 158 59 10 136 112 135 118 37 63 30 94 60 46 180 47 100 110 146 33 3 50 199 43 39 168 169 90 188 12 92 219 189 6 117 116 196 133 87 164 76 132 167 101 30 209 79 157 138 143 8 32 8 221 220 110 31 14 123 92 103 135 117 75 212 104 55 180 121 62 192 72 72 187 206 13 202 67 206 128 221 105 91 224 129 27 184 181 115 160 89 79 199 84 23 197 128 147 143 82 67 17 147 28 63 187 132 51 120 141 167 175 65 60 5 196 18 68 126 191 36 28 179 10 21 93 24 2 14 82 108 74 176 60 120 215 129 26 222 99 189 121 136 227 154 229 226 86 169 16 153 3 166 180 5 81 72 30 168 95 128 106 159 53 35 33 119 31 88 158 174 29 16 70 26 32 83 218 80 193 182 151 204 24 44 191 193 66 170 84 213 140 99 115 86 54 70 42 45 70 41 83 61 115 44 108 190 157 180 162 119 221 104 129 142 203 219 25 228 1 61 41 9 26 33 118 69 6 1 135 76 91 183 72 71 152 124 87 163 114 50 10 62 77 53 34 229 110 105 49 205 18 142 88 42 193 67 132 93 139 21 52 40 204 213 98 153 4 201 31 162 120 25 113 55 181 156 144 118 111 25 112 20 172 230 105 165 186 138 184 223 61 40 47 175 107 6 116 81 114 207 48 53 224 14 81 73 223 19 21 167 59 11 98 194 61 230 221 146 148 22 88 84 139 178 90 189 47 174 145 228 190 42 3 51 161 125 196 207 49 15 2 171 120 26 148 64 107 195 97 43 229 111 140 58 131 57 95 13 87 48 95 170 125 197 169 131 172 41 124 45 144 3 92 145 154 155 33 77 12 208 200 78 48 21 208 43 40 130 178 16 227 196 17 106 44 34 228 75 23 123 166 65 217 43 114 165 29 173 35 200 ^'}}, + {OUT=>'A1E13BC55BF6DAD83CF3AABDA3287AD68681EA64'}], + ['182', {IN=> {f=> '479 0 167 151 130 58 29 34 150 107 8 195 121 112 59 152 22 131 218 208 202 159 88 19 56 149 82 41 153 145 54 199 86 104 166 126 228 16 53 209 225 41 90 230 29 197 171 46 143 39 203 149 117 147 67 45 216 158 35 75 136 136 38 17 78 176 34 185 213 155 95 50 71 73 123 225 76 28 144 227 126 130 228 114 74 148 192 118 172 34 87 192 216 193 206 54 36 65 230 31 49 146 44 228 214 180 62 92 47 131 48 58 162 161 3 142 14 3 107 141 89 207 212 130 193 8 160 15 198 159 223 63 117 14 173 192 181 87 59 89 107 106 216 60 79 201 1 227 189 213 20 116 222 38 150 205 29 134 23 21 141 124 80 126 30 122 200 109 219 104 201 64 142 149 215 168 6 12 125 7 72 133 196 181 185 15 28 9 183 65 32 137 196 46 206 187 163 151 32 37 90 132 8 25 204 137 61 67 145 89 72 69 95 85 9 220 23 154 35 210 115 197 71 108 229 139 209 190 103 176 97 100 5 157 10 173 94 160 148 92 12 25 69 158 202 222 171 44 58 64 205 64 7 170 154 70 83 29 97 67 10 110 11 135 146 177 122 2 47 133 133 33 160 13 113 184 225 211 7 37 27 49 48 23 56 14 38 213 55 222 136 171 144 164 211 105 226 199 184 125 105 93 72 98 25 34 52 86 69 60 212 30 87 94 195 21 6 145 19 28 172 204 4 167 214 45 83 31 14 40 65 95 220 221 48 121 77 186 5 57 137 26 194 231 189 78 41 55 124 115 232 177 22 129 68 168 204 74 211 42 143 174 182 210 215 70 218 73 158 98 223 161 138 186 140 101 30 59 52 149 217 20 214 10 210 117 49 46 106 81 16 18 103 78 76 161 38 15 226 136 36 100 103 178 182 75 3 9 185 150 7 135 48 156 183 100 138 51 96 40 165 201 134 121 42 80 91 157 208 67 180 27 219 133 231 54 99 213 190 33 197 36 2 82 6 47 231 154 205 127 155 195 156 50 206 52 184 90 232 179 172 169 66 20 81 116 124 17 43 5 120 52 51 196 146 79 101 128 80 224 65 ^'}}, + {OUT=>'D5FD35FFABED6733C92365929DF0FB4CAE864D15'}], + ['183', {IN=> {f=> '503 1 55 102 9 3 202 159 19 103 56 206 165 60 152 54 171 157 164 185 27 59 45 171 217 80 123 203 203 23 169 66 193 103 116 122 156 7 32 169 6 41 165 176 31 125 2 211 155 189 93 69 32 109 90 50 225 85 53 127 153 45 175 40 121 172 201 168 15 37 99 166 44 4 182 188 53 71 7 148 48 130 108 166 220 35 8 12 198 93 9 63 171 97 195 194 87 204 14 173 132 203 143 54 231 126 102 125 118 37 43 20 94 60 36 175 47 90 110 141 23 229 35 184 43 24 153 154 85 173 12 82 214 174 232 117 106 191 128 77 164 76 117 162 101 25 204 74 142 123 143 234 32 229 211 215 105 31 9 123 87 88 135 102 65 202 99 50 165 116 62 187 62 67 177 191 8 192 52 196 118 206 105 91 214 114 27 179 166 100 150 79 79 199 84 13 182 128 137 133 67 57 17 132 23 53 187 122 36 115 131 152 170 50 45 231 186 18 63 111 181 21 18 179 226 16 88 19 223 230 82 98 59 161 50 105 200 124 11 207 89 179 106 131 212 139 224 221 86 164 16 148 224 161 170 226 76 57 10 163 85 113 96 144 38 30 18 119 21 78 148 164 9 232 50 221 26 12 78 208 80 183 172 141 199 24 44 191 188 46 155 69 208 140 99 110 81 54 55 42 40 65 26 68 41 105 24 93 185 147 180 157 104 216 89 119 137 193 219 231 10 223 1 51 36 235 16 28 103 49 1 227 120 61 76 173 72 51 152 114 87 148 104 40 5 57 77 48 14 229 95 100 34 200 8 132 83 22 178 62 127 93 129 1 47 30 194 203 83 138 4 186 11 147 120 5 113 40 181 141 139 108 106 15 97 15 157 220 95 160 186 138 184 223 61 20 27 175 107 6 101 81 114 207 33 33 209 4 66 73 218 4 6 157 44 11 98 179 46 215 221 146 133 7 88 79 139 168 75 189 37 159 135 218 180 37 219 51 156 120 181 197 49 5 233 161 110 21 138 64 102 185 87 28 219 111 125 58 121 52 80 3 82 38 90 170 110 197 169 126 162 41 109 30 134 234 92 145 149 155 13 62 7 208 200 68 48 21 198 33 40 125 178 6 217 196 2 91 34 24 213 70 23 113 161 ^'}}, + {OUT=>'C12E9C280EE9C079E0506FF89F9B20536E0A83EF'}], + ['184', {IN=> {f=> '470 0 58 210 15 107 144 15 159 21 142 152 151 130 48 14 34 140 92 231 190 106 112 54 142 7 116 208 193 187 159 73 19 41 144 67 36 148 135 44 184 71 104 156 126 218 6 43 204 225 21 90 230 24 182 156 26 138 39 188 139 112 147 62 40 216 143 35 75 131 121 18 2 68 161 29 185 203 145 95 40 71 63 113 220 66 8 144 212 116 115 228 109 59 138 177 108 172 19 82 187 211 188 191 34 36 55 215 11 39 136 24 223 199 170 52 82 42 131 28 53 162 161 226 142 14 231 97 141 79 192 207 120 183 236 145 233 198 149 208 48 107 237 173 192 166 77 39 84 102 96 206 40 64 186 224 227 174 213 10 111 212 23 150 195 9 124 13 6 136 124 65 121 25 117 195 109 204 218 99 201 44 132 149 215 163 234 230 110 225 62 133 181 176 180 10 18 9 183 50 22 122 191 41 196 182 163 141 27 32 80 127 8 10 204 132 56 57 130 89 57 223 54 90 85 227 215 18 154 25 210 115 187 66 108 224 134 209 180 103 176 87 90 223 147 10 163 89 150 143 87 235 20 69 148 228 202 217 171 39 43 59 190 54 235 165 149 70 83 29 92 67 233 105 229 130 141 172 112 2 27 118 123 33 160 8 103 169 210 201 230 17 22 29 33 8 51 9 38 208 55 222 126 166 129 154 211 95 226 194 174 120 90 78 67 88 25 24 37 76 59 45 212 30 72 84 195 16 1 140 237 28 157 199 222 167 209 35 68 16 232 25 65 80 220 211 43 111 67 181 228 57 137 11 184 216 184 78 26 45 119 110 232 177 22 129 68 168 189 74 196 37 128 174 172 205 205 60 218 58 158 93 218 151 123 171 125 86 10 59 52 134 202 20 214 228 195 102 44 46 106 71 11 236 93 73 71 156 33 15 211 136 31 100 88 163 182 70 221 232 170 145 2 120 38 156 178 95 133 36 96 20 155 191 134 116 22 70 76 152 203 52 175 7 209 128 226 49 94 198 190 13 192 21 235 72 229 37 221 139 205 112 140 185 151 30 206 47 179 75 217 101 ^'}}, + {OUT=>'E22769DC00748A9BBD6C05BBC8E81F2CD1DC4E2D'}], + ['185', {IN=> {f=> '502 0 158 148 66 13 60 95 103 3 15 5 113 38 23 182 125 65 94 107 73 224 37 47 102 237 3 198 155 7 95 56 198 165 52 148 46 163 157 152 173 19 55 29 167 217 76 115 203 191 11 165 62 193 99 116 122 144 236 7 28 161 2 29 157 172 23 125 238 199 151 177 89 61 24 101 78 50 213 73 41 127 153 45 167 24 121 168 193 156 3 25 87 166 28 228 174 188 53 67 239 148 36 118 104 162 208 27 232 4 194 85 1 63 159 97 191 194 75 196 10 169 132 199 131 50 223 118 94 117 118 37 27 12 94 60 28 171 47 82 110 137 15 225 23 172 43 12 141 142 81 161 12 74 210 162 228 117 98 187 124 69 164 76 105 158 101 21 200 70 130 111 143 230 32 221 203 211 101 31 5 123 83 76 135 90 57 194 95 46 153 112 62 183 54 63 169 179 4 184 40 188 110 194 105 91 206 102 27 175 154 88 142 71 79 199 84 5 170 128 129 125 55 49 17 120 19 45 187 114 24 111 123 140 166 38 33 227 178 18 59 99 173 9 10 179 214 12 84 15 215 218 82 90 47 149 42 93 188 120 239 195 81 171 94 127 200 127 220 217 86 160 16 144 216 157 162 218 72 45 234 159 77 101 88 132 26 26 6 119 13 70 140 156 233 220 34 213 26 236 74 200 80 175 164 133 195 24 44 191 184 30 143 57 204 140 99 106 77 54 43 42 36 61 14 56 25 97 8 81 181 139 180 153 92 212 77 111 133 185 219 231 238 219 1 43 32 231 8 24 91 33 237 223 108 49 64 165 72 35 152 106 87 136 96 32 1 53 77 44 238 229 83 96 22 196 124 79 6 166 58 123 93 121 225 43 22 186 195 71 126 4 174 235 135 120 229 113 28 181 129 135 100 102 7 85 11 145 212 87 156 186 138 184 223 61 4 11 175 107 6 89 81 114 207 21 17 197 236 54 73 214 232 234 149 32 11 98 167 34 203 221 146 121 235 88 75 139 160 63 189 29 147 127 210 172 33 207 51 152 116 169 189 49 237 233 153 102 17 130 64 98 177 79 16 211 111 113 58 113 48 68 235 78 30 86 170 98 197 169 122 154 41 97 18 126 234 92 145 145 155 237 50 209 ^'}}, + {OUT=>'F29835A93475740E888E8C14318F3CA45A3C8606'}], + ['186', {IN=> {f=> '481 1 208 200 56 48 21 186 21 40 119 178 236 205 196 226 73 22 12 195 64 23 101 144 54 206 241 103 132 7 151 13 138 140 151 130 40 2 34 132 80 223 186 94 112 50 134 237 104 200 181 175 159 61 19 29 140 55 32 144 127 36 172 59 104 148 126 210 240 35 200 225 5 90 230 20 170 144 10 134 39 176 131 108 147 58 36 216 131 35 75 127 109 2 232 60 149 25 185 195 137 95 32 71 55 105 216 58 234 144 200 108 103 228 105 47 130 165 100 172 7 78 183 207 184 179 18 36 47 203 237 31 128 8 219 187 162 44 74 38 131 12 49 162 161 218 142 14 227 89 141 71 180 203 112 175 232 133 221 198 141 196 36 99 229 173 192 154 69 23 80 98 88 198 24 52 174 216 227 162 213 2 107 204 11 150 187 235 116 5 236 132 124 53 117 21 113 191 109 192 206 95 201 28 124 149 215 159 230 218 98 213 54 133 169 172 176 6 10 9 183 38 14 110 187 37 188 178 163 133 23 28 72 123 8 240 204 128 52 49 118 89 45 215 42 86 85 215 211 14 154 17 210 115 179 62 108 220 130 209 172 103 176 79 82 211 139 10 155 85 142 139 83 227 16 69 140 224 202 213 171 35 31 55 178 46 231 161 145 70 83 29 88 67 225 101 217 126 137 168 104 2 11 106 115 33 160 4 95 157 198 193 222 1 18 13 21 238 47 5 38 204 55 222 118 162 117 146 211 87 226 190 166 116 78 66 63 80 25 16 25 68 51 33 212 30 60 76 195 12 239 136 225 28 145 195 210 167 205 27 56 4 220 13 65 68 220 203 39 103 59 177 220 57 137 241 176 204 180 78 14 37 115 106 232 177 22 129 68 168 177 74 184 33 116 174 164 201 197 52 218 46 158 89 214 143 111 159 113 74 236 59 52 122 190 20 214 216 183 90 40 46 106 63 7 224 85 69 67 152 29 15 199 136 27 100 76 151 182 66 209 224 158 141 240 108 30 156 174 91 129 24 96 4 147 183 134 112 6 62 64 148 199 40 171 233 201 124 222 45 90 186 190 239 188 9 235 64 221 29 213 127 178 ^'}}, + {OUT=>'1A1D77C6D0F97C4B620FAA90F3F8644408E4B13D'}], + ['187', {IN=> {f=> '508 1 94 122 173 145 6 206 41 173 57 199 146 150 136 66 9 48 83 91 239 243 5 109 30 7 174 113 57 90 95 69 224 29 39 102 229 3 194 151 239 87 56 190 165 44 144 38 155 157 140 161 11 51 13 163 217 72 107 203 179 243 161 58 193 95 116 122 132 236 7 24 153 242 17 149 168 15 125 238 187 147 165 85 53 16 93 66 50 201 61 29 127 153 45 159 8 121 164 185 144 235 13 75 166 12 216 166 188 53 63 235 148 24 106 100 158 196 19 220 240 190 77 237 63 147 97 187 194 63 188 6 165 132 195 119 46 215 110 86 109 118 37 11 4 94 60 20 167 47 74 110 133 7 221 11 160 43 129 130 77 149 12 66 206 150 224 117 90 183 120 61 164 76 93 154 101 17 196 66 118 99 143 226 32 213 195 207 97 31 1 123 79 64 135 78 49 186 91 42 141 108 62 179 46 59 161 167 176 28 180 102 182 105 91 198 90 27 171 142 76 134 63 79 199 84 241 158 128 121 117 43 41 17 108 15 37 187 106 12 107 115 128 162 26 21 223 170 18 55 87 165 241 2 179 202 8 80 11 207 206 82 82 35 137 34 81 176 116 231 183 73 163 82 123 188 115 216 213 86 156 16 140 208 153 154 210 68 33 222 155 69 89 80 120 14 22 238 119 5 62 132 148 221 208 18 205 26 224 70 192 80 167 156 125 191 24 44 191 180 14 131 45 200 140 99 102 73 54 31 42 32 57 2 44 9 89 236 69 177 131 180 149 80 208 65 103 129 177 219 231 230 215 1 35 28 227 20 79 17 237 219 96 37 52 157 72 19 152 98 87 124 88 24 241 49 77 40 226 229 71 92 10 192 236 116 75 234 154 54 119 93 113 213 39 14 178 187 59 114 4 162 223 123 120 217 113 16 181 117 131 92 98 243 73 7 133 204 79 152 186 138 184 223 61 232 239 175 107 6 77 81 114 207 9 1 185 232 42 73 210 224 226 141 20 11 98 155 22 191 221 146 109 227 88 71 139 152 51 189 21 135 119 202 164 29 195 51 148 112 157 181 49 233 233 145 94 13 122 64 94 169 71 4 203 111 101 58 105 44 56 231 74 22 82 170 86 197 169 118 146 41 85 6 118 234 92 145 141 149 ^'}}, + {OUT=>'4EC84870E9BDD25F523C6DFB6EDD605052CA4EAA'}], + ['188', {IN=> {f=> '484 1 219 32 243 208 200 48 48 21 178 13 40 115 178 232 197 196 218 61 14 4 183 60 23 93 136 50 202 229 99 120 245 143 5 134 128 151 130 32 236 34 124 68 215 182 82 112 46 126 229 92 192 169 163 159 49 19 17 136 43 28 140 119 28 160 47 104 140 126 202 236 27 196 225 235 90 230 16 158 132 240 130 39 164 123 104 147 54 32 216 119 35 75 123 97 232 224 52 137 21 185 187 129 95 24 71 47 97 212 50 222 144 188 100 91 228 101 35 122 153 92 172 241 74 179 203 180 167 2 36 39 191 225 23 120 238 215 175 154 36 66 34 131 242 45 162 161 210 142 14 223 81 141 63 168 199 104 167 228 121 209 198 133 184 24 91 221 173 192 142 61 7 76 94 80 190 8 40 162 208 227 150 213 240 103 196 245 150 179 223 108 243 228 128 124 41 113 17 109 187 109 180 194 91 201 12 116 149 215 155 226 206 86 201 46 133 157 168 172 2 2 9 183 26 6 98 183 33 180 174 163 125 19 24 64 119 8 232 204 124 48 41 106 89 33 207 30 82 85 203 207 10 154 9 210 115 171 58 108 216 126 209 164 103 176 71 74 199 131 10 147 81 134 135 79 219 12 69 132 220 202 209 171 31 19 51 166 38 227 157 141 70 83 29 84 67 217 97 205 122 133 164 96 2 241 94 107 33 160 87 145 186 185 214 231 14 243 9 230 43 1 38 200 55 222 110 158 105 138 211 79 226 186 158 112 66 54 59 72 25 8 13 60 43 21 212 30 48 68 195 8 239 132 213 28 133 191 198 167 201 19 44 238 208 1 65 56 220 195 35 95 51 173 212 57 137 233 168 192 176 78 2 29 111 102 232 177 22 129 68 168 165 74 172 29 104 174 156 197 189 44 218 34 158 85 210 135 99 147 101 62 224 59 52 110 178 20 214 204 171 78 36 46 106 55 3 212 77 65 63 148 25 15 187 136 23 100 64 139 182 62 197 216 146 137 240 96 22 156 170 87 125 12 96 234 139 175 134 108 236 54 52 144 195 28 167 221 193 120 218 41 86 174 190 227 184 243 235 56 213 21 205 115 205 71 ^'}}, + {OUT=>'D689513FED08B80C39B67371959BC4E3FECB0537'}], + ['189', {IN=> {f=> '506 0 110 165 141 238 206 37 169 45 187 134 142 124 66 5 36 71 79 235 231 5 105 22 239 166 101 49 86 83 65 224 21 31 102 221 3 190 147 231 79 56 182 165 36 140 30 147 157 128 149 3 47 245 159 217 68 99 203 167 235 157 54 193 91 116 122 120 236 7 20 145 242 5 141 164 7 125 238 175 143 153 81 45 8 85 54 50 189 49 17 127 153 45 151 240 121 160 177 132 227 1 63 166 244 204 158 188 53 59 231 148 12 94 96 154 184 11 208 236 186 69 233 63 135 97 183 194 51 180 2 161 132 191 107 42 207 102 78 101 118 37 243 244 94 60 12 163 47 66 110 129 247 217 247 148 43 236 117 118 73 137 12 58 202 138 220 117 82 179 116 53 164 76 81 150 101 13 192 62 106 87 143 222 32 205 187 203 93 31 245 123 75 52 135 66 41 178 87 38 129 104 62 175 38 55 153 155 244 168 16 172 94 170 105 91 190 78 27 167 130 64 126 55 79 199 84 237 146 128 113 109 31 33 17 96 11 29 187 98 103 107 116 158 14 9 219 162 18 51 75 157 233 242 179 190 4 76 7 199 194 82 74 23 125 26 69 164 112 223 171 65 155 70 119 176 103 212 209 86 152 16 136 200 149 146 202 64 21 210 151 61 77 72 108 2 18 230 119 245 54 124 140 209 196 2 197 26 212 66 184 80 159 148 117 187 24 44 191 176 246 119 33 196 140 99 98 69 54 19 42 28 53 238 32 241 81 224 57 173 123 180 145 68 204 53 95 125 169 219 231 222 211 1 27 24 223 240 16 67 1 237 215 84 25 40 149 72 3 152 90 87 112 80 16 241 45 77 36 214 229 59 88 246 188 232 108 71 222 142 50 115 93 105 201 35 6 170 179 47 102 4 150 211 111 120 205 113 4 181 105 127 84 94 239 61 3 121 196 71 148 186 138 184 223 61 220 227 175 107 6 65 81 114 207 245 233 173 228 30 73 206 216 218 133 8 11 98 143 10 179 221 146 97 219 88 67 139 144 39 189 13 123 111 194 156 25 183 51 144 108 145 173 49 229 233 137 86 9 114 64 90 161 63 240 195 111 89 58 97 40 44 227 70 14 78 170 74 197 169 114 138 41 73 242 110 234 177 ^'}}, + {OUT=>'C4FED58F209FC3C34AD19F86A6DACADC86C04D33'}], + ['190', {IN=> {f=> '491 0 145 135 155 207 20 243 208 200 40 48 21 170 5 40 111 178 228 189 196 210 49 6 246 171 56 23 85 128 46 198 217 95 108 241 135 247 130 116 151 130 24 228 34 116 56 207 178 70 112 42 118 221 80 184 157 151 159 37 19 5 132 31 24 136 111 20 148 35 104 132 126 194 232 19 192 225 223 90 230 12 146 120 228 126 39 152 115 100 147 50 28 216 107 35 75 119 85 220 216 44 125 17 185 179 121 95 16 71 39 89 208 42 210 144 176 92 79 228 97 23 114 141 84 172 233 70 175 199 176 155 236 36 31 179 213 15 112 226 211 163 146 28 58 30 131 230 41 162 161 202 142 14 219 73 141 55 156 195 96 159 224 109 197 198 125 172 12 83 213 173 192 130 53 241 72 90 72 182 242 28 150 200 227 138 213 236 99 188 237 150 171 211 100 239 220 124 124 29 109 13 105 183 109 168 182 87 201 246 108 149 215 151 222 194 74 189 38 133 145 164 168 248 244 9 183 14 248 86 179 29 172 170 163 117 15 20 56 115 8 224 204 120 44 33 94 89 21 199 18 78 85 191 203 6 154 1 210 115 163 54 108 212 122 209 156 103 176 63 66 187 123 10 139 77 126 131 75 211 8 69 124 216 202 205 171 27 7 47 154 30 223 153 137 70 83 29 80 67 209 93 193 118 129 160 88 2 229 82 99 33 160 246 79 133 174 177 206 219 10 231 247 222 39 247 38 196 55 222 102 154 93 130 211 71 226 182 150 108 54 42 55 64 25 1 52 35 9 212 30 36 60 195 4 239 128 201 28 121 187 186 167 197 11 32 230 196 239 65 44 220 187 31 87 43 169 204 57 137 225 160 180 172 78 240 21 107 98 232 177 22 129 68 168 153 74 160 25 92 174 148 193 181 36 218 22 158 81 206 127 87 135 89 50 212 59 52 98 166 20 214 192 159 66 32 46 106 47 249 200 69 61 59 144 21 15 175 136 19 100 52 127 182 58 185 208 134 133 240 84 14 156 166 83 121 96 222 131 167 134 104 224 46 40 140 191 16 163 209 185 116 214 37 82 162 190 215 180 235 235 48 205 13 197 103 205 76 104 161 139 232 146 ^'}}, + {OUT=>'051888C6D00029C176DE792B84DECE2DC1C74B00'}], + ['191', {IN=> {f=> '516 0 33 165 33 175 122 134 112 66 1 24 59 67 231 219 5 101 14 227 158 89 41 82 71 61 224 13 23 102 213 3 186 143 223 71 56 174 165 28 136 22 139 157 116 137 247 43 233 155 217 64 91 203 155 227 153 50 193 87 116 122 108 236 7 16 137 242 245 133 160 251 125 238 163 139 141 77 37 77 42 50 177 37 5 127 153 45 143 228 121 156 169 120 219 241 51 166 232 192 150 188 53 55 227 148 82 92 150 172 3 196 232 182 61 229 63 123 97 179 194 39 172 250 157 132 187 95 38 199 94 70 93 118 37 231 240 94 60 4 159 47 58 110 125 243 213 239 136 43 228 105 106 69 125 12 50 198 126 216 117 74 175 112 45 164 76 69 146 101 9 188 58 94 75 143 218 32 197 179 199 89 31 245 123 71 40 135 54 33 170 83 34 117 100 62 171 30 51 145 143 244 160 4 164 86 158 105 91 182 66 27 163 118 52 118 47 79 199 84 233 134 128 105 101 19 25 17 84 7 21 187 90 240 99 99 104 154 2 249 215 154 18 47 63 149 225 238 179 178 72 3 191 182 82 66 11 113 18 57 152 108 215 159 57 147 58 115 164 91 208 205 86 148 16 132 192 145 138 194 60 9 198 147 53 65 64 96 242 14 222 119 241 46 116 132 197 184 238 189 26 200 62 176 80 151 140 109 183 24 44 191 172 234 107 21 192 140 99 94 65 54 7 42 24 49 230 20 229 73 212 45 169 115 180 141 56 200 41 87 121 161 219 231 214 207 1 19 20 219 236 12 55 237 237 211 72 13 28 141 72 239 152 82 87 100 72 8 241 41 77 32 202 229 47 84 238 184 228 100 67 210 130 46 111 93 97 189 31 250 162 171 35 90 4 138 199 99 120 193 113 244 181 93 123 76 90 235 49 251 109 188 63 144 186 138 184 223 61 208 215 175 107 6 53 81 114 207 237 221 161 224 18 73 202 208 210 125 248 11 98 131 250 167 221 146 85 211 88 63 139 136 27 189 5 111 103 186 148 21 171 51 140 104 133 165 49 225 233 129 78 5 106 64 86 153 55 232 187 111 77 58 89 36 32 223 66 6 74 170 62 197 169 110 130 41 61 234 102 234 92 145 133 155 201 14 243 208 200 36 48 21 166 1 40 109 178 147 ^'}}, + {OUT=>'1A3540BEE05518505827954F58B751C475AEECE0'}], + ['192', {IN=> {f=> '522 0 179 196 200 34 251 241 156 51 23 75 118 41 193 202 90 93 236 125 242 125 101 151 130 14 218 34 106 41 197 173 55 112 37 108 211 65 174 142 136 159 22 19 245 127 16 19 131 101 10 133 20 104 122 126 184 227 9 187 225 208 90 230 7 131 105 213 121 39 137 105 95 147 45 23 216 92 35 75 114 70 205 206 34 110 12 185 169 111 95 6 71 29 79 203 32 195 144 161 82 64 228 92 8 104 126 74 172 223 65 170 194 171 140 221 36 21 164 198 5 102 211 206 148 136 18 48 25 131 215 36 162 161 192 142 14 214 63 141 45 141 190 86 149 219 94 182 198 115 157 252 73 203 173 192 115 43 226 67 85 62 172 227 13 135 190 227 123 213 231 94 178 227 150 161 196 90 234 210 119 124 14 104 8 100 178 109 153 167 82 201 231 98 149 215 146 217 179 59 174 28 133 130 159 163 248 239 9 183 254 243 71 174 24 162 165 163 107 10 15 46 110 8 214 204 115 39 23 79 89 6 189 3 73 85 176 198 1 154 246 210 115 153 49 108 207 117 209 146 103 176 53 56 172 113 10 129 72 116 126 70 201 3 69 114 211 202 200 171 22 247 42 139 20 218 148 132 70 83 29 75 67 199 88 178 113 124 155 78 2 214 67 89 33 160 246 69 118 159 167 196 204 5 216 237 212 34 247 38 191 55 222 92 149 78 120 211 61 226 177 140 103 39 27 50 54 25 245 241 42 25 249 212 30 21 50 195 254 239 123 186 28 106 182 171 167 192 1 17 220 181 229 65 29 220 177 26 77 33 164 194 57 137 215 150 165 167 78 230 11 102 93 232 177 22 129 68 168 138 74 145 20 77 174 138 188 171 26 218 7 158 76 201 117 72 120 74 35 197 59 52 83 151 20 214 177 144 51 27 46 106 37 249 185 59 56 54 139 16 15 160 136 14 100 37 112 182 53 170 198 119 128 240 69 4 156 161 78 116 240 96 207 121 157 134 99 209 36 25 135 186 1 158 194 175 111 209 32 77 147 190 200 175 225 235 38 195 3 187 88 205 61 89 151 134 217 206 30 162 24 166 113 128 103 66 253 15 50 58 228 210 5 98 8 218 152 80 35 79 62 58 224 7 17 102 207 3 183 140 217 65 56 168 165 22 133 16 133 157 107 128 244 12 ^'}}, + {OUT=>'DFA19180359D5A7A38E842F172359CAF4208FC05'}], + ['193', {IN=> {f=> '517 1 218 150 217 59 81 203 140 217 148 45 193 82 116 122 93 236 7 11 127 242 235 123 155 246 125 238 148 134 126 72 27 247 67 27 50 162 22 247 127 153 45 133 213 121 151 159 105 209 231 36 166 217 177 140 188 53 50 222 148 242 67 87 145 157 250 181 227 177 51 224 63 108 97 174 194 24 162 250 152 132 182 80 33 189 84 60 83 118 37 216 235 94 60 251 154 47 48 110 120 238 208 229 121 43 218 90 91 64 110 12 40 193 111 211 117 64 170 107 35 164 76 54 141 101 4 183 53 79 60 143 213 32 187 169 194 84 31 245 123 66 25 135 39 23 160 78 29 102 95 62 166 20 46 135 128 244 150 246 154 76 143 105 91 172 51 27 158 103 37 108 37 79 199 84 228 119 128 95 91 4 15 17 69 2 11 187 80 230 94 89 89 149 244 239 210 144 18 42 48 139 215 233 179 163 252 67 255 181 167 82 56 253 98 8 42 137 103 205 144 47 137 43 110 149 76 203 200 86 143 16 127 182 140 128 184 55 251 183 142 43 50 54 81 232 9 212 119 236 36 106 122 182 169 223 179 26 185 57 166 80 141 130 99 178 24 44 191 167 219 92 6 187 140 99 89 60 54 249 42 19 44 220 5 214 63 197 30 164 105 180 136 41 195 26 77 116 151 219 231 204 202 1 9 15 214 231 7 40 222 237 206 57 255 13 131 72 224 152 72 87 85 62 255 241 36 77 27 187 229 32 79 228 179 223 90 62 195 115 41 106 93 87 174 26 245 152 161 20 75 4 123 184 84 120 178 113 234 181 78 118 66 85 230 34 251 94 178 53 139 186 138 184 223 61 193 200 175 107 6 38 81 114 207 227 206 146 219 3 73 197 198 200 115 238 11 98 116 240 152 221 146 70 201 88 58 139 126 12 189 252 96 93 176 138 16 156 51 135 99 118 155 49 220 233 119 68 96 64 81 143 45 222 177 111 62 58 79 31 17 218 61 253 69 170 47 197 169 105 120 41 46 224 92 234 92 145 128 155 186 256 243 208 200 26 48 21 156 248 40 104 178 221 175 196 196 28 249 239 150 49 23 71 114 39 191 196 88 87 234 121 240 123 95 151 130 10 214 34 102 35 193 171 49 112 35 104 207 59 170 136 130 159 16 19 241 125 213 ^'}}, + {OUT=>'7B0FA84EBBCFF7D7F4500F73D79660C4A3431B67'}], + ['194', {IN=> {f=> '529 1 15 127 93 2 121 8 104 114 126 176 223 1 183 225 196 90 230 3 119 93 201 117 39 125 97 91 147 41 19 216 80 35 75 110 58 193 198 26 98 8 185 161 103 95 257 71 21 71 199 24 183 144 149 74 52 228 88 255 96 114 66 172 215 61 166 190 167 128 209 36 13 152 186 256 94 199 202 136 128 10 40 21 131 203 32 162 161 184 142 14 210 55 141 37 129 186 78 141 215 82 170 198 107 145 244 65 195 173 192 103 35 214 63 81 54 164 215 1 123 182 227 111 213 227 90 170 219 150 153 184 82 230 202 115 124 2 100 4 96 174 109 141 155 78 201 219 90 149 215 142 213 167 47 162 20 133 118 155 159 248 235 9 183 246 239 59 170 20 154 161 163 99 6 11 38 106 8 206 204 111 35 15 67 89 253 181 250 69 85 164 194 256 154 242 210 115 145 45 108 203 113 209 138 103 176 45 48 160 105 10 121 68 108 122 66 193 258 69 106 207 202 196 171 18 239 38 127 12 214 144 128 70 83 29 71 67 191 84 166 109 120 151 70 2 202 55 81 33 160 246 61 106 147 159 188 192 1 204 229 204 30 247 38 187 55 222 84 145 66 112 211 53 226 173 132 99 27 15 46 46 25 241 233 34 17 241 212 30 9 42 195 254 239 119 174 28 94 178 159 167 188 252 5 212 169 221 65 17 220 169 22 69 25 160 186 57 137 207 142 153 163 78 222 3 98 89 232 177 22 129 68 168 126 74 133 16 65 174 130 184 163 18 218 254 158 72 197 109 60 108 62 23 185 59 52 71 139 20 214 165 132 39 23 46 106 29 249 173 51 52 50 135 12 15 148 136 10 100 25 100 182 49 158 190 107 124 240 57 255 156 157 74 112 232 96 195 113 149 134 95 197 28 13 131 182 248 154 182 167 107 205 28 73 135 190 188 171 217 235 30 187 254 179 76 205 49 77 143 130 205 206 26 158 12 154 101 120 91 66 253 3 38 46 224 198 5 94 206 144 68 27 75 50 54 224 258 9 102 199 3 179 136 209 57 56 160 165 14 129 8 125 157 95 116 240 36 212 148 217 57 77 203 134 213 146 43 193 80 116 122 87 236 7 9 123 242 231 119 153 244 125 238 142 132 120 70 23 245 63 21 50 156 16 243 127 153 45 129 207 121 149 155 99 205 227 30 166 211 57 ^'}}, + {OUT=>'9E886081C9ACAAD0F97B10810D1DE6FCDCE6B5F4'}], + ['195', {IN=> {f=> '548 0 134 188 53 47 219 148 236 58 84 142 148 247 172 224 174 45 221 63 99 97 171 194 15 156 250 149 132 179 71 30 183 78 54 77 118 37 207 232 94 60 248 151 47 42 110 117 235 205 223 112 43 212 81 82 61 101 12 34 190 102 208 117 58 167 104 29 164 76 45 138 101 1 180 50 70 51 143 210 32 181 163 191 81 31 245 123 63 16 135 30 17 154 75 26 93 92 62 163 14 43 129 119 244 144 240 148 70 134 105 91 166 42 27 155 94 28 102 31 79 199 84 225 110 128 89 85 255 9 17 60 259 5 187 74 224 91 83 80 146 238 233 207 138 18 39 39 133 209 230 179 154 252 64 255 175 158 82 50 247 89 2 33 128 100 199 135 41 131 34 107 140 67 200 197 86 140 16 124 176 137 122 178 52 245 174 139 37 41 48 72 226 6 206 119 233 30 100 116 173 160 214 173 26 176 54 160 80 135 124 93 175 24 44 191 164 210 83 257 184 140 99 86 57 54 243 42 16 41 214 256 205 57 188 21 161 99 180 133 32 192 17 71 113 145 219 231 198 199 1 3 12 211 228 4 31 213 237 203 48 249 4 125 72 215 152 66 87 76 56 252 241 33 77 24 178 229 23 76 222 176 220 84 59 186 106 38 103 93 81 165 23 242 146 155 11 66 4 114 175 75 120 169 113 228 181 69 115 60 82 227 25 251 85 172 47 136 186 138 184 223 61 184 191 175 107 6 29 81 114 207 221 197 137 216 254 73 194 192 194 109 232 11 98 107 234 143 221 146 61 195 88 55 139 120 3 189 249 87 87 170 132 13 147 51 132 96 109 149 49 217 233 113 62 257 90 64 78 137 39 216 171 111 53 58 73 28 8 215 58 250 66 170 38 197 169 102 114 41 37 218 86 234 92 145 125 155 177 250 243 208 200 20 48 21 150 245 40 101 178 218 169 196 190 19 246 236 141 46 23 65 108 36 188 187 85 78 231 115 237 120 86 151 130 4 208 34 96 26 187 168 40 112 32 98 201 50 164 127 121 159 7 19 235 122 1 14 126 91 118 5 104 112 126 174 222 259 182 225 193 90 230 2 116 90 198 116 39 122 95 90 147 40 18 216 77 35 75 109 55 190 196 24 95 7 185 159 101 95 256 71 19 69 198 22 180 144 146 72 49 228 87 253 94 111 64 172 213 60 165 189 166 125 206 36 11 149 183 255 92 196 201 133 126 8 38 20 131 213 ^'}}, + {OUT=>'A4D46E4BA0AE4B012F75B1B50D0534D578AE9CB6'}], + ['196', {IN=> {f=> '547 0 29 162 161 178 142 14 207 49 141 31 120 183 72 135 212 73 161 198 101 136 238 59 189 173 192 94 29 205 60 78 48 158 206 254 114 176 227 102 213 224 87 164 213 150 147 175 76 227 196 112 124 255 97 1 93 171 109 132 146 75 201 210 84 149 215 139 210 158 38 153 14 133 109 152 156 248 232 9 183 240 236 50 167 17 148 158 163 93 3 8 32 103 8 200 204 108 32 9 58 89 247 175 244 66 85 155 191 256 154 239 210 115 139 42 108 200 110 209 132 103 176 39 42 151 99 10 115 65 102 119 63 187 258 69 100 204 202 193 171 15 233 35 118 6 211 141 125 70 83 29 68 67 185 81 157 106 117 148 64 2 193 46 75 33 160 246 55 97 138 153 182 183 260 195 223 198 27 247 38 184 55 222 78 142 57 106 211 47 226 170 126 96 18 6 43 40 25 238 227 28 11 235 212 30 36 195 254 239 116 165 28 85 175 150 167 185 249 258 206 160 215 65 8 220 163 19 63 19 157 180 57 137 201 136 144 160 78 216 259 95 86 232 177 22 129 68 168 117 74 124 13 56 174 124 181 157 12 218 248 158 69 194 103 51 99 53 14 176 59 52 62 130 20 214 156 123 30 20 46 106 23 249 164 45 49 47 132 9 15 139 136 7 100 16 91 182 46 149 184 98 121 240 48 252 156 154 71 109 226 96 186 107 143 134 92 188 22 4 128 179 242 151 173 161 104 202 25 70 126 190 179 168 211 235 24 181 251 173 67 205 40 68 137 127 196 206 23 155 3 145 92 114 82 66 253 256 29 37 221 189 5 91 256 197 138 59 21 72 41 51 224 255 3 102 193 3 176 133 203 51 56 154 165 8 126 2 119 157 86 107 237 33 203 145 217 54 71 203 125 207 143 40 193 77 116 122 78 236 7 6 117 242 225 113 150 241 125 238 133 129 111 67 17 242 57 12 50 147 7 237 127 153 45 123 198 121 146 149 90 199 221 21 166 202 162 130 188 53 45 217 148 232 52 82 140 142 245 166 222 172 41 219 63 93 97 169 194 9 152 250 147 132 177 65 28 179 74 50 73 118 37 201 230 94 60 246 149 47 38 110 115 233 203 219 106 43 208 75 76 59 95 12 30 188 96 206 117 54 165 102 25 164 76 39 136 101 261 178 48 64 45 143 208 32 177 159 189 79 31 245 123 61 10 135 24 13 150 73 24 87 90 62 161 10 41 125 209 ^'}}, + {OUT=>'6342B199EE64C7B2C9CBCD4F2DCB65ACEF51516F'}], + ['197', {IN=> {f=> '542 1 244 136 232 140 62 122 105 91 158 30 27 151 82 16 94 23 79 199 84 221 98 128 81 77 247 1 17 48 259 261 187 66 216 87 75 68 142 230 225 203 130 18 35 27 125 201 226 179 142 252 60 255 167 146 82 42 239 77 258 21 116 96 191 123 33 123 22 103 128 55 196 193 86 136 16 120 168 133 114 170 48 237 162 135 29 29 40 60 218 2 198 119 229 22 92 108 161 148 202 165 26 164 50 152 80 127 116 85 171 24 44 191 160 198 71 249 180 140 99 82 53 54 235 42 12 37 206 248 193 49 176 9 157 91 180 129 20 188 5 63 109 137 219 231 190 195 1 259 8 207 224 19 201 237 199 36 241 256 117 72 203 152 58 87 64 48 248 241 29 77 20 166 229 11 72 214 172 216 76 55 174 94 34 99 93 73 153 19 238 138 147 263 54 4 102 163 63 120 157 113 220 181 57 111 52 78 223 13 251 73 164 39 132 186 138 184 223 61 172 179 175 107 6 17 81 114 207 213 185 125 212 246 73 190 184 186 101 224 11 98 95 226 131 221 146 49 187 88 51 139 112 255 189 245 75 79 162 124 9 135 51 128 92 97 141 49 213 233 105 54 257 82 64 74 129 31 208 163 111 41 58 65 24 260 211 54 246 62 170 26 197 169 98 106 41 25 210 78 234 92 145 121 155 165 242 243 208 200 12 48 21 142 241 40 97 178 214 161 196 182 7 242 232 129 42 23 57 100 32 184 175 81 66 227 107 233 116 74 151 130 260 200 34 88 14 179 164 28 112 28 90 193 38 156 115 109 159 259 19 227 118 253 10 122 83 256 106 257 104 104 126 166 218 255 178 225 181 90 230 262 104 78 186 112 39 110 87 86 147 36 14 216 65 35 75 105 43 178 188 16 83 3 185 151 93 95 252 71 11 61 194 14 168 144 134 64 37 228 83 245 86 99 56 172 205 56 161 185 162 113 194 36 3 137 171 251 84 184 197 121 118 30 16 131 188 27 162 161 174 142 14 205 45 141 27 114 181 68 131 210 67 155 198 97 130 234 55 185 173 192 88 25 199 58 76 44 154 200 250 108 172 227 96 213 222 85 160 209 150 143 169 72 225 192 110 124 251 95 263 91 169 109 126 140 73 201 204 80 149 215 137 208 152 32 147 10 133 103 150 154 248 230 9 183 236 234 44 165 15 144 156 163 89 1 6 28 101 8 196 204 106 164 ^'}}, + {OUT=>'AABFD63688EB678357869130083E1B52F6EA861D'}], + ['198', {IN=> {f=> '567 0 1 46 89 239 167 236 62 85 143 187 256 154 235 210 115 131 38 108 196 106 209 124 103 176 31 34 139 91 10 107 61 94 115 59 179 258 69 92 200 202 189 171 11 225 31 106 264 207 137 121 70 83 29 64 67 177 77 145 102 113 144 56 2 181 34 67 33 160 246 47 85 126 145 174 171 260 183 215 190 23 247 38 180 55 222 70 138 45 98 211 39 226 166 118 92 6 260 39 32 25 234 219 20 3 227 212 30 254 28 195 254 239 112 153 28 73 171 138 167 181 245 250 198 148 207 65 262 220 155 15 55 11 153 172 57 137 193 128 132 156 78 208 255 91 82 232 177 22 129 68 168 105 74 112 9 44 174 116 177 149 4 218 240 158 65 190 95 39 87 41 2 164 59 52 50 118 20 214 144 111 18 16 46 106 15 249 152 37 45 43 128 5 15 127 136 3 100 4 79 182 42 137 176 86 117 240 36 248 156 150 67 105 218 96 174 99 135 134 88 176 14 258 124 175 234 147 161 153 100 198 21 66 114 190 167 164 203 235 16 173 247 165 55 205 28 56 129 123 184 206 19 151 257 133 80 106 70 66 253 248 17 25 217 177 5 87 252 185 130 47 13 68 29 47 224 251 261 102 185 3 172 129 195 43 56 146 165 122 260 111 157 74 95 233 29 191 141 217 50 63 203 113 199 139 36 193 73 116 122 66 236 7 2 109 242 217 105 146 237 125 238 121 125 99 63 9 238 49 50 135 261 229 127 153 45 115 186 121 142 141 78 191 213 9 166 190 150 122 188 53 41 213 148 224 40 78 136 130 241 154 218 168 33 215 63 81 97 165 194 263 144 250 143 132 173 53 24 171 66 42 65 118 37 189 226 94 60 242 145 47 30 110 111 229 199 211 94 43 200 63 64 55 83 12 22 184 84 202 117 46 161 98 17 164 76 27 132 101 261 174 44 52 33 143 204 32 169 151 185 75 31 245 123 57 264 135 12 5 142 69 20 75 86 62 157 2 37 117 101 244 132 228 136 58 116 105 91 154 24 27 149 76 10 90 19 79 199 84 219 92 128 77 73 243 263 17 42 259 259 187 62 212 85 71 62 140 226 221 201 126 18 33 21 121 197 224 179 136 252 58 255 163 140 82 38 235 71 256 15 110 94 187 117 29 119 16 101 122 49 194 191 86 134 16 118 164 131 110 166 46 233 156 133 25 23 36 54 214 194 119 227 18 88 104 155 142 196 161 26 158 48 148 80 123 112 81 169 24 44 191 158 192 65 245 178 140 223 ^'}}, + {OUT=>'F732B7372DAF44801F81EFFE3108726239837936'}], + ['199', {IN=> {f=> '551 1 78 49 54 227 42 8 33 198 240 181 41 164 265 153 83 180 125 8 184 261 55 105 129 219 231 182 191 1 255 4 203 220 264 7 189 237 195 24 233 248 109 72 191 152 50 87 52 40 244 241 25 77 16 154 229 267 68 206 168 212 68 51 162 82 30 95 93 65 141 15 234 130 139 255 42 4 90 151 51 120 145 113 212 181 45 107 44 74 219 1 251 61 156 31 128 186 138 184 223 61 160 167 175 107 6 5 81 114 207 205 173 113 208 238 73 186 176 178 93 216 11 98 83 218 119 221 146 37 179 88 47 139 104 247 189 241 63 71 154 116 5 123 51 124 88 85 133 49 209 233 97 46 257 74 64 70 121 23 200 155 111 29 58 57 20 252 207 50 242 58 170 14 197 169 94 98 41 13 202 70 234 92 145 117 155 153 234 243 208 200 4 48 21 134 237 40 93 178 210 153 196 174 263 238 228 117 38 23 49 92 28 180 163 77 54 223 99 229 112 62 151 130 256 192 34 80 2 171 160 16 112 24 82 185 26 148 103 97 159 251 19 219 114 245 6 118 75 252 94 249 104 96 126 158 214 251 174 225 169 90 230 262 92 66 174 108 39 98 79 82 147 32 10 216 53 35 75 101 31 166 180 8 71 267 185 143 85 95 248 71 3 53 190 6 156 144 122 56 25 228 79 237 78 87 48 172 197 52 157 181 158 101 182 36 263 125 159 247 76 172 193 109 110 260 22 12 131 176 23 162 161 166 142 14 201 37 141 19 102 177 60 123 206 55 143 198 89 118 226 47 177 173 192 76 17 187 54 72 36 146 188 242 96 164 227 84 213 218 81 152 201 150 135 157 64 221 184 106 124 243 91 263 87 165 109 114 128 69 201 192 72 149 215 133 204 140 20 135 2 133 91 146 150 248 226 9 183 228 230 32 161 11 136 152 163 81 265 2 20 97 8 188 204 102 26 265 40 89 235 163 232 60 85 137 185 256 154 233 210 115 127 36 108 194 104 209 120 103 176 27 30 133 87 10 103 59 90 113 57 175 258 69 88 198 202 187 171 9 221 29 100 262 205 135 119 70 83 29 62 67 173 75 139 100 111 142 52 2 175 28 63 33 160 246 43 79 120 141 170 165 260 177 211 186 21 247 38 178 55 222 66 136 39 94 211 35 226 164 114 90 256 37 28 25 232 215 16 267 223 212 30 250 24 195 254 239 110 147 28 67 169 132 167 179 243 246 194 142 203 65 263 ^'}}, + {OUT=>'5E9347FE4574CDCB80281ED092191199BADD7B42'}], + ['200', {IN=> {f=> '578 0 220 147 11 47 3 149 164 57 137 185 120 120 152 78 200 251 87 78 232 177 22 129 68 168 93 74 100 5 32 174 108 173 141 266 218 232 158 61 186 87 27 75 29 260 152 59 52 38 106 20 214 132 99 6 12 46 106 7 249 140 29 41 39 124 1 15 115 136 269 100 262 67 182 38 125 168 74 113 240 24 244 156 146 63 101 210 96 162 91 127 134 84 164 6 250 120 171 226 143 149 145 96 194 17 62 102 190 155 160 195 235 8 165 243 157 43 205 16 44 121 119 172 206 15 147 249 121 68 98 58 66 253 240 5 13 213 165 5 83 248 173 122 35 5 64 17 43 224 247 257 102 177 3 168 125 187 35 56 138 165 262 118 256 103 157 62 83 229 25 179 137 217 46 55 203 101 191 135 32 193 69 116 122 54 236 7 268 101 242 209 97 142 233 125 238 109 121 87 59 1 234 41 258 50 123 253 221 127 153 45 107 174 121 138 133 66 183 205 267 166 178 138 114 188 53 37 209 148 216 28 74 132 118 237 142 214 164 25 211 63 69 97 161 194 255 136 250 139 132 169 41 20 163 58 34 57 118 37 177 222 94 60 238 141 47 22 110 107 225 195 203 82 43 192 51 52 51 71 12 14 180 72 198 117 38 157 94 9 164 76 15 128 101 261 170 40 40 21 143 200 32 161 143 181 71 31 245 123 53 256 135 267 134 65 16 63 82 62 153 264 33 109 89 244 124 220 128 50 104 105 91 146 12 27 145 64 268 82 11 79 199 84 215 80 128 69 65 235 259 17 30 259 255 187 54 204 81 63 50 136 218 213 197 118 18 29 9 113 189 220 179 124 252 54 255 155 128 82 30 227 59 252 3 98 90 179 105 21 111 4 97 110 37 190 187 86 130 16 114 156 127 102 158 42 225 144 129 17 11 28 42 206 266 186 119 223 10 80 96 143 130 184 153 26 146 44 140 80 115 104 73 165 24 44 191 154 180 53 237 174 140 99 76 47 54 223 42 6 31 194 236 175 37 158 261 151 79 180 123 2 182 257 51 103 125 219 231 178 189 1 253 2 201 218 264 1 183 237 193 18 229 244 105 72 185 152 46 87 46 36 242 241 23 77 14 148 229 263 66 202 166 210 64 49 156 76 28 93 93 61 135 13 232 126 135 251 36 4 84 145 45 120 139 113 208 181 39 105 40 72 217 265 251 55 152 27 126 186 138 184 223 61 154 161 175 107 6 269 81 114 207 201 167 107 206 234 73 184 172 174 89 212 11 98 77 214 113 221 146 31 175 88 45 139 100 243 189 213 ^'}}, + {OUT=>'D5776B7DFFF75C1358ABDBBB3F27A20BB6CA7C55'}], + ['201', {IN=> {f=> '578 1 51 63 146 108 1 111 51 120 84 73 125 49 205 233 89 38 257 66 64 66 113 15 192 147 111 17 58 49 16 244 203 46 238 54 170 2 197 169 90 90 41 1 194 62 234 92 145 113 155 141 226 243 208 200 268 48 21 126 233 40 89 178 206 145 196 166 255 234 224 105 34 23 41 84 24 176 151 73 42 219 91 225 108 50 151 130 252 184 34 72 262 163 156 4 112 20 74 177 14 140 91 85 159 243 19 211 110 237 2 114 67 248 82 241 104 88 126 150 210 247 170 225 157 90 230 262 80 54 162 104 39 86 71 78 147 28 6 216 41 35 75 97 19 154 172 59 267 185 135 77 95 244 71 267 45 186 270 144 144 110 48 13 228 75 229 70 75 40 172 189 48 153 177 154 89 170 36 259 113 147 243 68 160 189 97 102 256 14 8 131 164 19 162 161 158 142 14 197 29 141 11 90 173 52 115 202 43 131 198 81 106 218 39 169 173 192 64 9 175 50 68 28 138 176 234 84 156 227 72 213 214 77 144 193 150 127 145 56 217 176 102 124 235 87 263 83 161 109 102 116 65 201 180 64 149 215 129 200 128 8 123 266 133 79 142 146 248 222 9 183 220 226 20 157 7 128 148 163 73 265 270 12 93 8 180 204 98 22 261 28 89 227 155 224 56 85 125 181 256 154 229 210 115 119 32 108 190 100 209 112 103 176 19 22 121 79 10 95 55 82 109 53 167 258 69 80 194 202 183 171 5 213 25 88 258 201 131 115 70 83 29 58 67 165 71 127 96 107 138 44 2 163 16 55 33 160 246 35 67 108 133 162 153 260 165 203 178 17 247 38 174 55 222 58 132 27 86 211 27 226 160 106 86 260 248 33 20 25 228 207 8 263 215 212 30 242 16 195 254 239 106 135 28 55 165 120 167 175 239 238 186 130 195 65 250 220 143 9 43 271 147 160 57 137 181 116 114 150 78 196 249 85 76 232 177 22 129 68 168 87 74 94 3 26 174 104 171 137 264 218 228 158 59 184 83 21 69 23 256 146 59 52 32 100 20 214 126 93 10 46 106 3 249 134 25 39 37 122 271 15 109 136 269 100 258 61 182 36 119 164 68 111 240 18 242 156 144 61 99 206 96 156 87 123 134 82 158 2 246 118 169 222 141 143 141 94 192 15 60 96 190 149 158 191 235 4 161 241 153 37 205 10 38 117 117 166 206 13 145 245 115 62 94 52 66 253 236 271 7 211 159 5 81 246 167 118 29 1 62 11 41 224 245 255 102 173 3 166 123 183 31 56 134 165 260 116 254 81 ^'}}, + {OUT=>'022B7ADA472FB7A9DA9219621C9C5F563D3792F6'}], + ['202', {IN=> {f=> '583 1 157 50 71 225 21 167 133 217 42 47 203 89 183 131 28 193 65 116 122 42 236 7 268 93 242 201 89 138 229 125 238 97 117 75 55 267 230 33 250 50 111 245 213 127 153 45 99 162 121 134 125 54 175 197 259 166 166 126 106 188 53 33 205 148 208 16 70 128 106 233 130 210 160 17 207 63 57 97 157 194 247 128 250 135 132 165 29 16 155 50 26 49 118 37 165 218 94 60 234 137 47 14 110 103 221 191 195 70 43 184 39 40 47 59 12 6 176 60 194 117 30 153 90 1 164 76 3 124 101 261 166 36 28 9 143 196 32 153 135 177 67 31 245 123 49 248 135 262 263 126 61 12 51 78 62 149 260 29 101 77 244 116 212 120 42 92 105 91 138 27 141 52 260 74 3 79 199 84 211 68 128 61 57 227 255 17 18 259 251 187 46 196 77 55 38 132 210 205 193 110 18 25 271 105 181 216 179 112 252 50 255 147 116 82 22 219 47 248 265 86 86 171 93 13 103 266 93 98 25 186 183 86 126 16 110 148 123 94 150 38 217 132 125 9 273 20 30 198 266 178 119 219 2 72 88 131 118 172 145 26 134 40 132 80 107 96 65 161 24 44 191 150 168 41 229 170 140 99 72 43 54 215 42 2 27 186 228 163 29 146 253 147 71 180 119 264 178 249 43 99 117 219 231 170 185 1 249 272 197 214 264 263 171 237 189 6 221 236 97 72 173 152 38 87 34 28 238 241 19 77 10 136 229 255 62 194 162 206 56 45 144 64 24 89 93 53 123 9 228 118 127 243 24 4 72 133 33 120 127 113 200 181 27 101 32 68 213 257 251 43 144 19 122 186 138 184 223 61 142 149 175 107 6 261 81 114 207 193 155 95 202 226 73 180 164 166 81 204 11 98 65 206 101 221 146 19 167 88 41 139 92 235 189 235 45 59 142 104 273 105 51 118 82 67 121 49 203 233 85 34 257 62 64 64 109 11 188 143 111 11 58 45 14 240 201 44 236 52 170 270 197 169 88 86 41 269 190 58 234 92 145 111 155 135 222 243 208 200 266 48 21 122 231 40 87 178 204 141 196 162 251 232 222 99 32 23 37 80 22 174 145 71 36 217 87 223 106 44 151 130 250 180 34 68 258 159 154 272 112 18 70 173 8 136 85 79 159 239 19 207 108 233 112 63 246 76 237 104 84 126 146 208 245 168 225 151 90 230 262 74 48 156 102 39 80 67 76 147 26 4 216 35 35 75 95 13 148 168 270 53 267 185 131 73 95 242 71 265 41 184 268 138 144 104 44 7 228 73 225 66 69 36 272 ^'}}, + {OUT=>'7F1DE4ECA20362DA624653D225A5B3F7964A9FF2'}], + ['203', {IN=> {f=> '588 0 181 44 149 173 150 77 158 36 255 101 135 239 60 148 185 85 94 252 6 4 131 152 15 162 161 150 142 14 193 21 141 3 78 169 44 107 198 31 119 198 73 94 210 31 161 173 192 52 1 163 46 64 20 130 164 226 72 148 227 60 213 210 73 136 185 150 119 133 48 213 168 98 124 227 83 263 79 157 109 90 104 61 201 168 56 149 215 125 196 116 272 111 262 133 67 138 142 248 218 9 183 212 222 8 153 3 120 144 163 65 265 270 4 89 8 172 204 94 18 257 16 89 219 147 216 52 85 113 177 256 154 225 210 115 111 28 108 186 96 209 104 103 176 11 14 109 71 10 87 51 74 105 49 159 258 69 72 190 202 179 171 1 205 21 76 254 197 127 111 70 83 29 54 67 157 67 115 92 103 134 36 2 151 4 47 33 160 246 27 55 96 125 154 141 260 153 195 170 13 247 38 170 55 222 50 128 15 78 211 19 226 156 98 82 252 240 29 12 25 224 199 259 207 212 30 234 8 195 254 239 102 123 28 43 161 108 167 171 235 230 178 118 187 65 242 220 135 5 35 267 143 152 57 137 173 108 102 146 78 188 245 81 72 232 177 22 129 68 168 75 74 82 275 14 174 96 167 129 260 218 220 158 55 180 75 9 57 11 248 134 59 52 20 88 20 214 114 81 264 6 46 106 271 249 122 17 35 33 118 271 15 97 136 269 100 250 49 182 32 107 156 56 107 240 6 238 156 140 57 95 198 96 144 79 115 134 78 146 270 238 114 165 214 137 131 133 90 188 11 56 84 190 137 154 183 235 272 153 237 145 25 205 274 26 109 113 154 206 9 141 237 103 50 86 40 66 253 228 263 271 207 147 5 77 242 155 110 17 269 58 275 37 224 241 251 102 165 3 162 119 175 23 56 126 165 256 112 250 91 157 44 65 223 19 161 131 217 40 43 203 83 179 129 26 193 63 116 122 36 236 7 268 89 242 197 85 136 227 125 238 91 115 69 53 265 228 29 246 50 105 241 209 127 153 45 95 156 121 132 121 48 171 193 255 166 160 120 102 188 53 31 203 148 204 10 68 126 100 231 124 208 158 13 205 63 51 97 155 194 243 124 250 133 132 163 23 14 151 46 22 45 118 37 159 216 94 60 232 135 47 10 110 101 219 189 191 64 43 180 33 34 45 53 12 2 174 54 192 117 26 151 88 273 164 76 273 122 101 261 164 34 22 3 143 194 32 149 131 175 65 31 245 123 47 244 135 258 261 122 59 10 45 76 62 147 258 27 97 71 244 112 208 116 38 86 105 91 134 270 27 139 46 256 70 275 79 199 160 ^'}}, + {OUT=>'CA0F2B1BFB4469C11ED006A994734F0F2F5EFD17'}], + ['204', {IN=> {f=> '594 0 207 56 128 53 49 219 251 17 6 259 247 187 38 188 73 47 26 128 202 197 189 102 18 21 263 97 173 212 179 100 252 46 255 139 104 82 14 211 35 244 257 74 82 163 81 5 95 258 89 86 13 182 179 86 122 16 106 140 119 86 142 34 209 120 121 1 265 12 18 190 266 170 119 215 272 64 80 119 106 160 137 26 122 36 124 80 99 88 57 157 24 44 191 146 156 29 221 166 140 99 68 39 54 207 42 276 23 178 220 151 21 134 245 143 63 180 115 256 174 241 35 95 109 219 231 162 181 1 245 272 193 210 264 255 159 237 185 272 213 228 89 72 161 152 30 87 22 20 234 241 15 77 6 124 229 247 58 186 158 202 48 41 132 52 20 85 93 45 111 5 224 110 119 235 12 4 60 121 21 120 115 113 192 181 15 97 24 64 209 249 251 31 136 11 118 186 138 184 223 61 130 137 175 107 6 253 81 114 207 185 143 83 198 218 73 176 156 158 73 196 11 98 53 198 89 221 146 7 159 88 37 139 84 227 189 231 33 51 134 96 273 93 51 114 78 55 113 49 199 233 77 26 257 54 64 60 101 3 180 135 111 277 58 37 10 232 197 40 232 48 170 262 197 169 84 78 41 261 182 50 234 92 145 107 155 123 214 243 208 200 262 48 21 114 227 40 83 178 200 133 196 154 243 228 218 87 28 23 29 72 18 170 133 67 24 213 79 219 102 32 151 130 246 172 34 60 250 151 150 264 112 14 62 165 274 128 73 67 159 231 19 199 104 225 274 108 55 242 64 229 104 76 126 138 204 241 164 225 139 90 230 262 62 36 144 98 39 68 59 72 147 22 216 23 35 75 91 1 136 160 266 41 267 185 123 65 95 238 71 261 33 180 264 126 144 92 36 273 228 69 217 58 57 28 172 177 42 147 171 148 71 152 36 253 95 129 237 56 142 183 79 90 250 2 2 131 146 13 162 161 146 142 14 191 17 141 277 72 167 40 103 196 25 113 198 69 88 206 27 157 173 192 46 275 157 44 62 16 126 158 222 66 144 227 54 213 208 71 132 181 150 115 127 44 211 164 96 124 223 81 263 77 155 109 84 98 59 201 162 52 149 215 123 194 110 268 105 260 133 61 136 140 248 216 9 183 208 220 2 151 1 116 142 163 61 265 270 87 8 168 204 92 16 255 10 89 215 143 212 50 85 107 175 256 154 223 210 115 107 26 108 184 94 209 100 103 176 7 10 103 67 10 83 49 70 103 47 155 258 69 68 188 202 177 171 277 201 19 70 252 195 125 109 70 83 29 52 67 153 65 109 90 101 132 32 2 145 276 43 33 160 246 23 259 ^'}}, + {OUT=>'833D63F5C2EA0CD43EC15F2B9DD97FF12B030479'}], + ['205', {IN=> {f=> '600 1 87 119 148 132 260 144 189 164 10 247 38 167 55 222 44 125 6 72 211 13 226 153 92 79 246 234 26 6 25 221 193 273 256 201 212 30 228 2 195 254 239 99 114 28 34 158 99 167 168 232 224 172 109 181 65 236 220 129 2 29 264 140 146 57 137 167 102 93 143 78 182 242 78 69 232 177 22 129 68 168 66 74 73 275 5 174 90 164 123 257 218 214 158 52 177 69 48 2 242 125 59 52 11 79 20 214 105 72 258 3 46 106 268 249 113 11 32 30 115 271 15 88 136 269 100 244 40 182 29 98 150 47 104 240 276 235 156 137 54 92 192 96 135 73 109 134 75 137 267 232 111 162 208 134 122 127 87 185 8 53 75 190 128 151 177 235 269 147 234 139 16 205 268 17 103 110 145 206 6 138 231 94 41 80 31 66 253 222 257 265 204 138 5 74 239 146 104 8 266 55 269 34 224 238 248 102 159 3 159 116 169 17 56 120 165 253 109 247 85 157 35 56 220 16 152 128 217 37 37 203 74 173 126 23 193 60 116 122 27 236 7 268 83 242 191 79 133 224 125 238 82 112 60 50 262 225 23 240 50 96 235 203 127 153 45 89 147 121 129 115 39 165 187 249 166 151 111 96 188 53 28 200 148 198 1 65 123 91 228 115 205 155 7 202 63 42 97 152 194 237 118 250 130 132 160 14 11 145 40 16 39 118 37 150 213 94 60 229 132 47 4 110 98 216 186 185 55 43 174 24 25 42 44 12 275 171 45 189 117 20 148 85 270 164 76 267 119 101 261 161 31 13 273 143 191 32 143 125 172 62 31 245 123 44 238 135 252 258 116 56 7 36 73 62 144 255 24 91 62 244 106 202 110 32 77 105 91 128 264 27 136 37 250 64 272 79 199 84 206 53 128 51 47 217 250 17 3 259 246 187 36 186 72 45 23 127 200 195 188 100 18 20 261 95 171 211 179 97 252 45 255 137 101 82 12 209 32 243 255 71 81 161 78 3 93 256 88 83 10 181 178 86 121 16 105 138 118 84 140 33 207 117 120 278 263 10 15 188 266 168 119 214 271 62 78 116 103 157 135 26 119 35 122 80 97 86 55 156 24 44 191 145 153 26 219 165 140 99 67 38 54 205 42 276 22 176 218 148 19 131 243 142 61 180 114 254 173 239 33 94 107 219 231 160 180 1 244 272 192 209 264 253 156 237 184 270 211 226 87 72 158 152 28 87 19 18 233 241 14 77 5 121 229 245 57 184 157 201 46 40 129 49 19 84 93 43 108 4 223 108 117 233 9 4 57 118 18 120 112 113 190 181 12 96 22 63 208 247 251 28 134 9 117 186 138 184 223 61 127 216 ^'}}, + {OUT=>'14FD356190416C00592B86FF7CA50B622F85593A'}], + ['206', {IN=> {f=> '590 1 175 107 6 247 81 114 207 179 134 74 195 212 73 173 150 152 67 190 11 98 44 192 80 221 146 279 153 88 34 139 78 221 189 228 24 45 128 90 273 84 51 111 75 46 107 49 196 233 71 20 257 48 64 57 95 278 174 129 111 271 58 31 7 226 194 37 229 45 170 256 197 169 81 72 41 255 176 44 234 92 145 104 155 114 208 243 208 200 259 48 21 108 224 40 80 178 197 127 196 148 237 225 215 78 25 23 23 66 15 167 124 64 15 210 73 216 99 23 151 130 243 166 34 54 244 145 147 258 112 11 56 159 268 122 64 58 159 225 19 193 101 219 274 105 49 239 55 223 104 70 126 132 201 238 161 225 130 90 230 262 53 27 135 95 39 59 53 69 147 19 278 216 14 35 75 88 273 127 154 263 32 267 185 117 59 95 235 71 258 27 177 261 117 144 83 30 267 228 66 211 52 48 22 172 171 39 144 168 145 62 143 36 250 86 120 234 50 133 180 70 84 247 277 280 131 137 10 162 161 140 142 14 188 11 141 274 63 164 34 97 193 16 104 198 63 79 200 21 151 173 192 37 272 148 41 59 10 120 149 216 57 138 227 45 213 205 68 126 175 150 109 118 38 208 158 93 124 217 78 263 74 152 109 75 89 56 201 153 46 149 215 120 191 101 262 96 257 133 52 133 137 248 213 9 183 202 217 274 148 279 110 139 163 55 265 270 275 84 8 162 204 89 13 252 1 89 209 137 206 47 85 98 172 256 154 220 210 115 101 23 108 181 91 209 94 103 176 1 4 94 61 10 77 46 64 100 44 149 258 69 62 185 202 174 171 277 195 16 61 249 192 122 106 70 83 29 49 67 147 62 100 87 98 129 26 2 136 270 37 33 160 246 17 40 81 115 144 126 260 138 185 160 8 247 38 165 55 222 40 123 68 211 9 226 151 88 77 242 230 24 2 25 219 189 271 254 197 212 30 224 279 195 254 239 97 108 28 28 156 93 167 166 230 220 168 103 177 65 232 220 125 25 262 138 142 57 137 163 98 87 141 78 178 240 76 67 232 177 22 129 68 168 60 74 67 275 280 174 86 162 119 255 218 210 158 50 175 65 275 42 277 238 119 59 52 5 73 20 214 99 66 254 1 46 106 266 249 107 7 30 28 113 271 15 82 136 269 100 240 34 182 27 92 146 41 102 240 272 233 156 135 52 90 188 96 129 69 105 134 73 131 265 228 109 160 204 132 116 123 85 183 6 51 69 190 122 149 173 235 267 143 232 135 10 205 264 11 99 108 139 206 4 136 227 88 35 76 25 66 253 218 253 261 202 132 5 72 237 140 203 ^'}}, + {OUT=>'4AB6B57EDDEF1CE935622F935C1619AE7C1667D6'}], + ['207', {IN=> {f=> '620 0 279 262 51 261 30 224 234 244 102 151 3 155 112 161 9 56 112 165 249 105 243 77 157 23 44 216 12 140 124 217 33 29 203 62 165 122 19 193 56 116 122 15 236 7 268 75 242 183 71 129 220 125 238 70 108 48 46 258 221 15 232 50 84 227 195 127 153 45 81 135 121 125 107 27 157 179 241 166 139 99 88 188 53 24 196 148 190 272 61 119 79 224 103 201 151 282 198 63 30 97 148 194 229 110 250 126 132 156 2 7 137 32 8 31 118 37 138 209 94 60 225 128 47 279 110 94 212 182 177 43 43 166 12 13 38 32 12 271 167 33 185 117 12 144 81 266 164 76 259 115 101 261 157 27 1 265 143 187 32 135 117 168 58 31 245 123 40 230 135 244 254 108 52 3 24 69 62 140 251 20 83 50 244 98 194 102 24 65 105 91 120 256 27 132 25 242 56 268 79 199 84 202 41 128 43 39 209 246 17 274 259 242 187 28 178 68 37 11 123 192 187 184 92 18 16 253 87 163 207 179 85 252 41 255 129 89 82 4 201 20 239 247 59 77 153 66 278 85 248 84 71 281 177 174 86 117 16 101 130 114 76 132 29 199 105 116 274 255 2 3 180 266 160 119 210 267 54 70 104 91 145 127 26 107 31 114 80 89 78 47 152 24 44 191 141 141 14 211 161 140 99 63 34 54 197 42 276 18 168 210 136 11 119 235 138 53 180 110 246 169 231 25 90 99 219 231 152 176 1 240 272 188 205 264 245 144 237 180 262 203 218 79 72 146 152 20 87 7 10 229 241 10 77 1 109 229 237 53 176 153 197 38 36 117 37 15 80 93 35 96 219 100 109 225 280 4 45 106 6 120 100 113 182 181 92 14 59 204 239 251 16 126 1 113 186 138 184 223 61 115 122 175 107 6 243 81 114 207 175 128 68 193 208 73 171 146 148 63 186 11 98 38 188 74 221 146 275 149 88 32 139 74 217 189 226 18 41 124 86 273 78 51 109 73 40 103 49 194 233 67 16 257 44 64 55 91 276 170 125 111 267 58 27 5 222 192 35 227 43 170 252 197 169 79 68 41 251 172 40 234 92 145 102 155 108 204 243 208 200 257 48 21 104 222 40 78 178 195 123 196 144 233 223 213 72 23 23 19 62 13 165 118 62 9 208 69 214 97 17 151 130 241 162 34 50 240 141 145 254 112 9 52 155 264 118 58 52 159 221 19 189 99 215 274 103 45 237 49 219 104 66 126 128 199 236 159 225 124 90 230 262 47 21 129 93 39 53 49 67 147 17 278 216 8 35 75 86 269 121 150 261 26 267 185 113 55 95 233 71 256 23 175 259 111 144 77 26 263 228 64 207 48 42 18 172 167 37 142 166 143 56 137 36 248 80 114 232 46 127 257 ^'}}, + {OUT=>'B456A6A968ACD66CAA974F96A9A916E700AA3C5D'}], + ['208', {IN=> {f=> '605 1 58 76 243 273 280 131 125 6 162 161 132 142 14 184 3 141 270 51 160 26 89 189 4 92 198 55 67 192 13 143 173 192 25 268 136 37 55 2 112 137 208 45 130 227 33 213 201 64 118 167 150 101 106 30 204 150 89 124 209 74 263 70 148 109 63 77 52 201 141 38 149 215 116 187 89 254 84 253 133 40 129 133 248 209 9 183 194 213 266 144 279 102 135 163 47 265 270 271 80 8 154 204 85 9 248 274 89 201 129 198 43 85 86 168 256 154 216 210 115 93 19 108 177 87 209 86 103 176 278 281 82 53 10 69 42 56 96 40 141 258 69 54 181 202 170 171 277 187 12 49 245 188 118 102 70 83 29 45 67 139 58 88 83 94 125 18 2 124 262 29 33 160 246 9 28 69 107 136 114 260 126 177 152 4 247 38 161 55 222 32 119 273 60 211 1 226 147 80 73 234 222 20 279 25 215 181 267 250 189 212 30 216 275 195 254 239 93 96 28 16 152 81 167 162 226 212 160 91 169 65 224 220 117 281 17 258 134 134 57 137 155 90 75 137 78 170 236 72 63 232 177 22 129 68 168 48 74 55 275 272 174 78 158 111 251 218 202 158 46 171 57 267 30 269 230 107 59 52 278 61 20 214 87 54 246 282 46 106 262 249 95 284 26 24 109 271 15 70 136 269 100 232 22 182 23 80 138 29 98 240 264 229 156 131 48 86 180 96 117 61 97 134 69 119 261 220 105 156 196 128 104 115 81 179 2 47 57 190 110 145 165 235 263 135 228 127 283 205 256 284 91 104 127 206 132 219 76 23 68 13 66 253 210 245 253 198 120 5 68 233 128 92 275 260 49 257 28 224 232 242 102 147 3 153 110 157 5 56 108 165 247 103 241 73 157 17 38 214 10 134 122 217 31 25 203 56 161 120 17 193 54 116 122 9 236 7 268 71 242 179 67 127 218 125 238 64 106 42 44 256 219 11 228 50 78 223 191 127 153 45 77 129 121 123 103 21 153 175 237 166 133 93 84 188 53 22 194 148 186 268 59 117 73 222 97 199 149 280 196 63 24 97 146 194 225 106 250 124 132 154 281 5 133 28 4 27 118 37 132 207 94 60 223 126 47 277 110 92 210 180 173 37 43 162 6 7 36 26 12 269 165 27 183 117 8 142 79 264 164 76 255 113 101 261 155 25 280 261 143 185 32 131 113 166 56 31 245 123 38 226 135 240 252 104 50 1 18 67 62 138 249 18 79 44 244 94 190 98 20 59 105 91 116 252 27 130 19 238 52 266 79 199 84 200 35 128 39 35 205 244 17 270 259 240 187 24 174 66 33 5 121 188 183 182 88 18 14 249 83 159 205 179 79 252 186 ^'}}, + {OUT=>'FD1C257FE046B2A27E2F0CD55ED2DECA845F01D7'}], + ['209', {IN=> {f=> '615 0 255 121 77 82 283 193 8 235 239 47 73 145 54 274 77 240 80 59 273 173 170 86 113 16 97 122 110 68 124 25 191 93 112 270 247 281 278 172 266 152 119 206 263 46 62 92 79 133 119 26 95 27 106 80 81 70 39 148 24 44 191 137 129 2 203 157 140 99 59 30 54 189 42 276 14 160 202 124 3 107 227 134 45 180 106 238 165 223 17 86 91 219 231 144 172 1 236 272 184 201 264 237 132 237 176 254 195 210 71 72 134 152 12 87 282 2 225 241 6 77 284 97 229 229 49 168 149 193 30 32 105 25 11 76 93 27 84 283 215 92 101 217 272 4 33 94 281 120 88 113 174 181 275 88 6 55 200 231 251 4 118 280 109 186 138 184 223 61 103 110 175 107 6 235 81 114 207 167 116 56 189 200 73 167 138 140 55 178 11 98 26 180 62 221 146 267 141 88 28 139 66 209 189 222 6 33 116 78 273 66 51 105 69 28 95 49 190 233 59 8 257 36 64 51 83 272 162 117 111 259 58 19 1 214 188 31 223 39 170 244 197 169 75 60 41 243 164 32 234 92 145 98 155 96 196 243 208 200 253 48 21 96 218 40 74 178 191 115 196 136 225 219 209 60 19 23 11 54 9 161 106 58 284 204 61 210 93 5 151 130 237 154 34 42 232 133 141 246 112 5 44 147 256 110 46 40 159 213 19 181 95 207 274 99 37 233 37 211 104 58 126 120 195 232 155 225 112 90 230 262 35 9 117 89 39 41 41 63 147 13 278 216 283 35 75 82 261 109 142 257 14 267 185 105 47 95 229 71 252 15 171 255 99 144 65 18 255 228 60 199 40 30 10 172 159 33 138 162 139 44 125 36 244 68 102 228 38 115 174 52 72 241 271 280 131 119 4 162 161 128 142 14 182 286 141 268 45 158 22 85 187 285 86 198 51 61 188 9 139 173 192 19 266 130 35 53 285 108 131 204 39 126 227 27 213 199 62 114 163 150 97 100 26 202 146 87 124 205 72 263 68 146 109 57 71 50 201 135 34 149 215 114 185 83 250 78 251 133 34 127 131 248 207 9 183 190 211 262 142 279 98 133 163 43 265 270 269 78 8 150 204 83 7 246 270 89 197 125 194 41 85 80 166 256 154 214 210 115 89 17 108 175 85 209 82 103 176 276 279 76 49 10 65 40 52 94 38 137 258 69 50 179 202 168 171 277 183 10 43 243 186 116 100 70 83 29 43 67 135 56 82 81 92 123 14 2 118 258 25 33 160 246 5 22 63 103 132 108 260 120 173 148 2 247 38 159 55 222 28 117 269 56 211 284 226 145 76 71 230 218 18 277 25 213 177 265 248 185 212 30 212 273 195 254 239 91 90 28 10 150 75 167 160 224 175 ^'}}, + {OUT=>'66E0D01780F1063E2929EAAD74826BC64060E38C'}], + ['210', {IN=> {f=> '613 0 152 79 161 65 216 220 109 281 9 254 130 126 57 137 147 82 63 133 78 162 232 68 59 232 177 22 129 68 168 36 74 43 275 264 174 70 154 103 247 218 194 158 42 167 49 259 18 261 222 95 59 52 270 49 20 214 75 42 238 282 46 106 258 249 83 280 22 20 105 271 15 58 136 269 100 224 10 182 19 68 130 17 94 240 256 225 156 127 44 82 172 96 105 53 89 134 65 107 257 212 101 152 188 124 92 107 77 175 287 43 45 190 98 141 157 235 259 127 224 119 275 205 248 276 83 100 115 206 285 128 211 64 11 60 1 66 253 202 237 245 194 108 5 64 229 116 84 267 256 45 249 24 224 228 238 102 139 3 149 106 149 286 56 100 165 243 99 237 65 157 5 26 210 6 122 118 217 27 17 203 44 153 116 13 193 50 116 122 286 236 7 268 63 242 171 59 123 214 125 238 52 102 30 40 252 215 3 220 50 66 215 183 127 153 45 69 117 121 119 95 9 145 167 229 166 121 81 76 188 53 18 190 148 178 260 55 113 61 218 85 195 145 276 192 63 12 97 142 194 217 98 250 120 132 150 273 1 125 20 285 19 118 37 120 203 94 60 219 122 47 273 110 88 206 176 165 25 43 154 283 284 32 14 12 265 161 15 179 117 138 75 260 164 76 247 109 101 261 151 21 272 253 143 181 32 123 105 162 52 31 245 123 34 218 135 232 248 96 46 286 6 63 62 134 245 14 71 32 244 86 182 90 12 47 105 91 108 244 27 126 7 230 44 262 79 199 84 196 23 128 31 27 197 240 17 262 259 236 187 16 166 62 25 282 117 180 175 178 80 18 10 241 75 151 201 179 67 252 35 255 117 71 82 281 189 2 233 235 41 71 141 48 272 73 236 78 53 269 171 168 86 111 16 95 118 108 64 120 23 187 87 110 268 243 279 274 168 266 148 119 204 261 42 58 86 73 127 115 26 89 25 102 80 77 66 35 146 24 44 191 135 123 285 199 155 140 99 57 28 54 185 42 276 12 156 198 118 288 101 223 132 41 180 104 234 163 219 13 84 87 219 231 140 170 1 234 272 182 199 264 233 126 237 174 250 191 206 67 72 128 152 8 87 278 287 223 241 4 77 284 91 229 225 47 164 147 191 26 30 99 19 9 74 93 23 78 283 213 88 97 213 268 4 27 88 277 120 82 113 170 181 271 86 2 53 198 227 251 287 114 278 107 186 138 184 223 61 97 104 175 107 6 231 81 114 207 163 110 50 187 196 73 165 134 136 51 174 11 98 20 176 56 221 146 263 137 88 26 139 62 205 189 220 29 112 74 273 60 51 103 67 22 91 49 188 233 55 4 257 32 64 49 79 270 158 113 111 255 58 15 288 210 213 ^'}}, + {OUT=>'A8478DF406F179FD4EF97F4574D7F99EA1CE9EB8'}], + ['211', {IN=> {f=> '624 1 28 220 36 170 238 197 169 72 54 41 237 158 26 234 92 145 95 155 87 190 243 208 200 250 48 21 90 215 40 71 178 188 109 196 130 219 216 206 51 16 23 5 48 6 158 97 55 278 201 55 207 90 286 151 130 234 148 34 36 226 127 138 240 112 2 38 141 250 104 37 31 159 207 19 175 92 201 274 96 31 230 28 205 104 52 126 114 192 229 152 225 103 90 230 262 26 108 86 39 32 35 60 147 10 278 216 277 35 75 79 255 100 136 254 5 267 185 99 41 95 226 71 249 9 168 252 90 144 56 12 249 228 57 193 34 21 4 172 153 30 135 159 136 35 116 36 241 59 93 225 32 106 171 43 66 238 268 280 131 110 1 162 161 122 142 14 179 283 141 265 36 155 16 79 184 279 77 198 45 52 182 3 133 173 192 10 263 121 32 50 282 102 122 198 30 120 227 18 213 196 59 108 157 150 91 91 20 199 140 84 124 199 69 263 65 143 109 48 62 47 201 126 28 149 215 111 182 74 244 69 248 133 25 124 128 248 204 9 183 184 208 256 139 279 92 130 163 37 265 270 266 75 8 144 204 80 4 243 264 89 191 119 188 38 85 71 163 256 154 211 210 115 83 14 108 172 82 209 76 103 176 273 276 67 43 10 59 37 46 91 35 131 258 69 44 176 202 165 171 277 177 7 34 240 183 113 97 70 83 29 40 67 129 53 73 78 89 120 8 2 109 252 19 33 160 246 289 13 54 97 126 99 260 111 167 142 289 247 38 156 55 222 22 114 263 50 211 281 226 142 70 68 224 212 15 274 25 210 171 262 245 179 212 30 206 270 195 254 239 88 81 28 1 147 66 167 157 221 202 150 76 159 65 214 220 107 281 7 253 129 124 57 137 145 80 60 132 78 160 231 67 58 232 177 22 129 68 168 33 74 40 275 262 174 68 153 101 246 218 192 158 41 166 47 257 15 259 220 92 59 52 268 46 20 214 72 39 236 282 46 106 257 249 80 279 21 19 104 271 15 55 136 269 100 222 7 182 18 65 128 14 93 240 254 224 156 126 43 81 170 96 102 51 87 134 64 104 256 210 100 151 186 123 89 105 76 174 287 42 42 190 95 140 155 235 258 125 223 117 273 205 246 274 81 99 112 206 285 127 209 61 8 58 288 66 253 200 235 243 193 105 5 63 228 113 82 265 255 44 247 23 224 227 237 102 137 3 148 105 147 285 56 98 165 242 98 236 63 157 2 23 209 5 119 117 217 26 15 203 41 151 115 12 193 49 116 122 284 236 7 268 61 242 169 57 122 213 125 238 49 101 27 39 251 214 1 218 50 63 213 181 127 153 45 67 114 121 118 93 6 143 165 227 166 118 78 74 188 53 17 189 148 176 258 54 112 58 217 82 194 144 275 191 141 ^'}}, + {OUT=>'248E58CF09A372114FC2F93B09C5FC14F3D0059E'}], + ['212', {IN=> {f=> '628 1 3 97 139 194 211 92 250 117 132 147 267 290 119 14 282 13 118 37 111 200 94 60 216 119 47 270 110 85 203 173 159 16 43 148 277 278 29 5 12 262 158 6 176 117 286 135 72 257 164 76 241 106 101 261 148 18 266 247 143 178 32 117 99 159 49 31 245 123 31 212 135 226 245 90 43 286 289 60 62 131 242 11 65 23 244 80 176 84 6 38 105 91 102 238 27 123 290 224 38 259 79 199 84 193 14 128 25 21 191 237 17 256 259 233 187 10 160 59 19 276 114 174 169 175 74 18 7 235 69 145 198 179 58 252 32 255 111 62 82 278 183 285 230 229 32 68 135 39 269 67 230 75 44 263 168 165 86 108 16 92 112 105 58 114 20 181 78 107 265 237 276 268 162 266 142 119 201 258 36 52 77 64 118 109 26 80 22 96 80 71 60 29 143 24 44 191 132 114 279 193 152 140 99 54 25 54 179 42 276 9 150 192 109 285 92 217 129 35 180 101 228 160 213 7 81 81 219 231 134 167 1 231 272 179 196 264 227 117 237 171 244 185 200 61 72 119 152 2 87 272 284 220 241 1 77 284 82 229 219 44 158 144 188 20 27 90 10 6 71 93 17 69 283 210 82 91 207 262 4 18 79 271 120 73 113 164 181 265 83 288 50 195 221 251 281 108 275 104 186 138 184 223 61 88 95 175 107 6 225 81 114 207 157 101 41 184 190 73 162 128 130 45 168 11 98 11 170 47 221 146 257 131 88 23 139 56 199 189 217 283 23 106 68 273 51 51 100 64 13 85 49 185 233 49 290 257 26 64 46 73 267 152 107 111 249 58 9 288 204 183 26 218 34 170 234 197 169 70 50 41 233 154 22 234 92 145 93 155 81 186 243 208 200 248 48 21 86 213 40 69 178 186 105 196 126 215 214 204 45 14 23 1 44 4 156 91 53 274 199 51 205 88 282 151 130 232 144 34 32 222 123 136 236 112 34 137 246 100 31 25 159 203 19 171 90 197 274 94 27 228 22 201 104 48 126 110 190 227 150 225 97 90 230 262 20 286 102 84 39 26 31 58 147 8 278 216 273 35 75 77 251 94 132 252 291 267 185 95 37 95 224 71 247 5 166 250 84 144 50 8 245 228 55 189 30 15 172 149 28 133 157 134 29 110 36 239 53 87 223 28 100 169 37 62 236 266 280 131 104 291 162 161 118 142 14 177 281 141 263 30 153 12 75 182 275 71 198 41 46 178 291 129 173 192 4 261 115 30 48 280 98 116 194 24 116 227 12 213 194 57 104 153 150 87 85 16 197 136 82 124 195 67 263 63 141 109 42 56 45 201 120 24 149 215 109 180 68 240 63 246 133 19 122 126 248 202 9 183 180 206 252 137 279 88 128 163 33 265 270 264 73 8 140 204 78 2 241 76 ^'}}, + {OUT=>'F15767DE91796A6816977EFA4FCED4B7FD9B8A57'}], + ['213', {IN=> {f=> '622 0 89 183 111 180 34 85 59 159 256 154 207 210 115 75 10 108 168 78 209 68 103 176 269 272 55 35 10 51 33 38 87 31 123 258 69 36 172 202 161 171 277 169 3 22 236 179 109 93 70 83 29 36 67 121 49 61 74 85 116 2 97 244 11 33 160 246 285 1 42 89 118 87 260 99 159 134 289 247 38 152 55 222 14 110 255 42 211 277 226 138 62 64 216 204 11 270 25 206 163 258 241 171 212 30 198 266 195 254 239 84 69 28 283 143 54 167 153 217 194 142 64 151 65 206 220 99 281 293 249 125 116 57 137 137 72 48 128 78 152 227 63 54 232 177 22 129 68 168 21 74 28 275 254 174 60 149 93 242 218 184 158 37 162 39 249 3 251 212 80 59 52 260 34 20 214 60 27 228 282 46 106 253 249 68 275 17 15 100 271 15 43 136 269 100 214 289 182 14 53 120 2 89 240 246 220 156 122 39 77 162 96 90 43 79 134 60 92 252 202 96 147 178 119 77 97 72 170 287 38 30 190 83 136 147 235 254 117 219 109 265 205 238 266 73 95 100 206 285 123 201 49 290 50 280 66 253 192 227 235 189 93 5 59 224 101 74 257 251 40 239 19 224 223 233 102 129 3 144 101 139 281 56 90 165 238 94 232 55 157 284 11 205 1 107 113 217 22 7 203 29 143 111 8 193 45 116 122 276 236 7 268 53 242 161 49 118 209 125 238 37 97 15 35 247 210 287 210 50 51 205 173 127 153 45 59 102 121 114 85 288 135 157 219 166 106 66 66 188 53 13 185 148 168 250 50 108 46 213 70 190 140 271 187 63 291 97 137 194 207 88 250 115 132 145 263 290 115 10 280 9 118 37 105 198 94 60 214 117 47 268 110 83 201 171 155 10 43 144 273 274 27 293 12 260 156 174 117 284 133 70 255 164 76 237 104 101 261 146 16 262 243 143 176 32 113 95 157 47 31 245 123 29 208 135 222 243 86 41 286 285 58 62 129 240 9 61 17 244 76 172 80 2 32 105 91 98 234 27 121 286 220 34 257 79 199 84 191 8 128 21 17 187 235 17 252 259 231 187 6 156 57 15 272 112 170 165 173 70 18 5 231 65 141 196 179 52 252 30 255 107 56 82 276 179 281 228 225 26 66 131 33 267 63 226 73 38 259 166 163 86 106 16 90 108 103 54 110 18 177 72 105 263 233 274 264 158 266 138 119 199 256 32 48 71 58 112 105 26 74 20 92 80 67 56 25 141 24 44 191 130 108 275 189 150 140 99 52 23 54 175 42 276 7 146 188 103 283 86 213 127 31 180 99 224 158 209 3 79 77 219 231 130 165 1 229 272 177 194 264 223 111 237 169 240 181 196 57 72 113 152 292 87 268 282 218 241 293 77 284 76 229 80 ^'}}, + {OUT=>'36A6BC5E680E15675D9696338C88B36248BBBAF4'}], + ['214', {IN=> {f=> '635 1 40 150 140 184 12 23 78 294 2 67 93 9 57 283 206 74 83 199 254 4 6 67 263 120 61 113 156 181 257 79 284 46 191 213 251 273 100 271 100 186 138 184 223 61 76 83 175 107 6 217 81 114 207 149 89 29 180 182 73 158 120 122 37 160 11 98 295 162 35 221 146 249 123 88 19 139 48 191 189 213 275 15 98 60 273 39 51 96 60 1 77 49 181 233 41 286 257 18 64 42 65 263 144 99 111 241 58 1 288 196 179 22 214 30 170 226 197 169 66 42 41 225 146 14 234 92 145 89 155 69 178 243 208 200 244 48 21 78 209 40 65 178 182 97 196 118 207 210 200 33 10 23 289 36 152 79 49 266 195 43 201 84 274 151 130 228 136 34 24 214 115 132 228 112 292 26 129 238 92 19 13 159 195 19 163 86 189 274 90 19 224 10 193 104 40 126 102 186 223 146 225 85 90 230 262 8 278 90 80 39 14 23 54 147 4 278 216 265 35 75 73 243 82 124 248 283 267 185 87 29 95 220 71 243 293 162 246 72 144 38 237 228 51 181 22 3 288 172 141 24 129 153 130 17 98 36 235 41 75 219 20 88 165 25 54 232 262 280 131 92 291 162 161 110 142 14 173 277 141 259 18 149 4 67 178 267 59 198 33 34 170 287 121 173 192 288 257 103 26 44 276 90 104 186 12 108 227 213 190 53 96 145 150 79 73 8 193 128 78 124 187 63 263 59 137 109 30 44 41 201 108 16 149 215 105 176 56 232 51 242 133 7 118 122 248 198 9 183 172 202 244 133 279 80 124 163 25 265 270 260 69 8 132 204 74 294 237 252 89 179 107 176 32 85 53 157 256 154 205 210 115 71 8 108 166 76 209 64 103 176 267 270 49 31 10 47 31 34 85 29 119 258 69 32 170 202 159 171 277 165 1 16 234 177 107 91 70 83 29 34 67 117 47 55 72 83 114 292 2 91 240 7 33 160 246 283 291 36 85 114 81 260 93 155 130 289 247 38 150 55 222 10 108 251 38 211 275 226 136 58 62 212 200 9 268 25 204 159 256 239 167 212 30 194 264 195 254 239 82 63 28 279 141 48 167 151 215 190 138 58 147 65 202 220 95 281 291 247 123 112 57 137 133 68 42 126 78 148 225 61 52 232 177 22 129 68 168 15 74 22 275 250 174 56 147 89 240 218 180 158 35 160 35 245 293 247 208 74 59 52 256 28 20 214 54 21 224 282 46 106 251 249 62 273 15 13 98 271 15 37 136 269 100 210 285 182 12 47 116 292 87 240 242 218 156 120 37 75 158 96 84 39 75 134 58 86 250 198 94 145 174 117 71 93 70 168 287 36 24 190 77 134 143 235 252 113 217 105 261 205 234 262 69 93 94 206 285 121 197 43 286 46 276 66 253 188 223 231 187 87 5 57 222 95 285 ^'}}, + {OUT=>'4DEA6251B2A6DF017A8093AB066EE3863A4EC369'}], + ['215', {IN=> {f=> '636 0 251 248 37 233 16 224 220 230 102 123 3 141 98 133 278 56 84 165 235 91 229 49 157 278 2 202 295 98 110 217 19 1 203 20 137 108 5 193 42 116 122 270 236 7 268 47 242 155 43 115 206 125 238 28 94 6 32 244 207 284 204 50 42 199 167 127 153 45 53 93 121 111 79 282 129 151 213 166 97 57 60 188 53 10 182 148 162 244 47 105 37 210 61 187 137 268 184 63 285 97 134 194 201 82 250 112 132 142 257 290 109 4 277 3 118 37 96 195 94 60 211 114 47 265 110 80 198 168 149 1 43 138 267 268 24 287 12 257 153 288 171 117 281 130 67 252 164 76 231 101 101 261 143 13 256 237 143 173 32 107 89 154 44 31 245 123 26 202 135 216 240 80 38 286 279 55 62 126 237 6 55 8 244 70 166 74 293 23 105 91 92 228 27 118 280 214 28 254 79 199 84 188 296 128 15 11 181 232 17 246 259 228 187 150 54 9 266 109 164 159 170 64 18 2 225 59 135 193 179 43 252 27 255 101 47 82 273 173 275 225 219 17 63 125 24 264 57 220 70 29 253 163 160 86 103 16 87 102 100 48 104 15 171 63 102 260 227 271 258 152 266 132 119 196 253 26 42 62 49 103 99 26 65 17 86 80 61 50 19 138 24 44 191 127 99 269 183 147 140 99 49 20 54 169 42 276 4 140 182 94 280 77 207 124 25 180 96 218 155 203 294 76 71 219 231 124 162 1 226 272 174 191 264 217 102 237 166 234 175 190 51 72 104 152 289 87 262 279 215 241 293 77 284 67 229 209 39 148 139 183 10 22 75 292 1 66 93 7 54 283 205 72 81 197 252 4 3 64 261 120 58 113 154 181 255 78 283 45 190 211 251 271 98 270 99 186 138 184 223 61 73 80 175 107 6 215 81 114 207 147 86 26 179 180 73 157 118 120 35 158 11 98 293 160 32 221 146 247 121 88 18 139 46 189 189 212 273 13 96 58 273 36 51 95 59 295 75 49 180 233 39 285 257 16 64 41 63 262 142 97 111 239 58 296 288 194 178 21 213 29 170 224 197 169 65 40 41 223 144 12 234 92 145 88 155 66 176 243 208 200 243 48 21 76 208 40 64 178 181 95 196 116 205 209 199 30 9 23 288 34 296 151 76 48 264 194 41 200 83 272 151 130 227 134 34 22 212 113 131 226 112 292 24 127 236 90 16 10 159 193 19 161 85 187 274 89 17 223 7 191 104 38 126 100 185 222 145 225 82 90 230 262 5 276 87 79 39 11 21 53 147 3 278 216 263 35 75 72 241 79 122 247 281 267 185 85 27 95 219 71 242 292 161 245 69 144 35 295 235 228 50 179 20 287 172 139 23 128 152 129 14 95 36 234 38 72 218 18 85 164 22 52 231 261 280 131 89 291 162 161 108 142 14 172 276 91 ^'}}, + {OUT=>'D30E70E357D57E3D82CA554B8A3D58DFF528FA94'}], + ['216', {IN=> {f=> '635 1 256 9 146 297 61 175 261 50 198 27 25 164 284 115 173 192 282 254 94 23 41 273 84 95 180 3 102 227 290 213 187 50 90 139 150 73 64 2 190 122 75 124 181 60 263 56 134 109 21 35 38 201 99 10 149 215 102 173 47 226 42 239 133 297 115 119 248 195 9 183 166 199 238 130 279 74 121 163 19 265 270 257 66 8 126 204 71 294 234 246 89 173 101 170 29 85 44 154 256 154 202 210 115 65 5 108 163 73 209 58 103 176 264 267 40 25 10 41 28 28 82 26 113 258 69 26 167 202 156 171 277 159 297 7 231 174 104 88 70 83 29 31 67 111 44 46 69 80 111 289 2 82 234 1 33 160 246 280 285 27 79 108 72 260 84 149 124 289 247 38 147 55 222 4 105 245 32 211 272 226 133 52 59 206 194 6 265 25 201 153 253 236 161 212 30 188 261 195 254 239 79 54 28 273 138 39 167 148 212 184 132 49 141 65 196 220 89 281 288 244 120 106 57 137 127 62 33 123 78 142 222 58 49 232 177 22 129 68 168 6 74 13 275 244 174 50 144 83 237 218 174 158 32 157 29 239 287 241 202 65 59 52 250 19 20 214 45 12 218 282 46 106 248 249 53 270 12 10 95 271 15 28 136 269 100 204 279 182 9 38 110 286 84 240 236 215 156 117 34 72 152 96 75 33 69 134 55 77 247 192 91 142 168 114 62 87 67 165 287 33 15 190 68 131 137 235 249 107 214 99 255 205 228 256 63 90 85 206 285 118 191 34 280 40 270 66 253 182 217 225 184 78 5 54 219 86 64 247 246 35 229 14 224 218 228 102 119 3 139 96 129 276 56 80 165 233 89 227 45 157 274 295 200 295 92 108 217 17 296 203 14 133 106 3 193 40 116 122 266 236 7 268 43 242 151 39 113 204 125 238 22 92 30 242 205 282 200 50 36 195 163 127 153 45 49 87 121 109 75 278 125 147 209 166 91 51 56 188 53 8 180 148 158 240 45 103 31 208 55 185 135 266 182 63 281 97 132 194 197 78 250 110 132 140 253 290 105 275 298 118 37 90 193 94 60 209 112 47 263 110 78 196 166 145 294 43 134 263 264 22 283 12 255 151 284 169 117 279 128 65 250 164 76 227 99 101 261 141 11 252 233 143 171 32 103 85 152 42 31 245 123 24 198 135 212 238 76 36 286 275 53 62 124 235 4 51 2 244 66 162 70 291 17 105 91 88 224 27 116 276 210 24 252 79 199 84 186 292 128 11 7 177 230 17 242 259 226 187 295 146 52 5 262 107 160 155 168 60 18 221 55 131 191 179 37 252 25 255 97 41 82 271 169 271 223 215 11 61 121 18 262 53 216 68 23 249 161 158 86 101 16 85 98 98 44 100 13 167 57 100 258 223 269 254 148 266 128 119 194 251 22 38 56 43 275 ^'}}, + {OUT=>'70CA84D827F7FD61446233F88CF2F990B0F3E2AA'}], + ['217', {IN=> {f=> '642 0 91 26 53 13 78 80 53 42 11 134 24 44 191 123 87 261 175 143 140 99 45 16 54 161 42 276 132 174 82 276 65 199 120 17 180 92 210 151 195 290 72 63 219 231 116 158 1 222 272 170 187 264 209 90 237 162 226 167 182 43 72 92 152 285 87 254 275 211 241 293 77 284 55 229 201 35 140 135 179 2 18 63 284 298 62 93 300 42 283 201 64 73 189 244 4 292 52 253 120 46 113 146 181 247 74 279 41 186 203 251 263 90 266 95 186 138 184 223 61 61 68 175 107 6 207 81 114 207 139 74 14 175 172 73 153 110 112 27 150 11 98 285 152 20 221 146 239 113 88 14 139 38 181 189 208 265 5 88 50 273 24 51 91 55 287 67 49 176 233 31 281 257 8 64 37 55 258 134 89 111 231 58 292 288 186 174 17 209 25 170 216 197 169 61 32 41 215 136 4 234 92 145 84 155 54 168 243 208 200 239 48 21 68 204 40 60 178 177 87 196 108 197 205 195 18 5 23 284 26 296 147 64 44 256 190 33 196 79 264 151 130 223 126 34 14 204 105 127 218 112 292 16 119 228 82 4 299 159 185 19 153 81 179 274 85 9 219 296 183 104 30 126 92 181 218 141 225 70 90 230 262 294 268 75 75 39 300 13 49 147 300 278 216 255 35 75 68 233 67 114 243 273 267 185 77 19 95 215 71 238 288 157 241 57 144 23 291 227 228 46 171 12 289 283 172 131 19 124 148 125 2 83 36 230 26 60 214 10 73 160 10 44 227 257 280 131 77 291 162 161 100 142 14 168 272 141 254 3 144 295 57 173 257 44 198 23 19 160 282 111 173 192 278 252 88 21 39 271 80 89 176 298 98 227 286 213 185 48 86 135 150 69 58 299 188 118 73 124 177 58 263 54 132 109 15 29 36 201 93 6 149 215 100 171 41 222 36 237 133 293 113 117 248 193 9 183 162 197 234 128 279 70 119 163 15 265 270 255 64 8 122 204 69 294 232 242 89 169 97 166 27 85 38 152 256 154 200 210 115 61 3 108 161 71 209 54 103 176 262 265 34 21 10 37 26 24 80 24 109 258 69 22 165 202 154 171 277 155 297 1 229 172 102 86 70 83 29 29 67 107 42 40 67 78 109 287 2 76 230 298 33 160 246 278 281 21 75 104 66 260 78 145 120 289 247 38 145 55 222 103 241 28 211 270 226 131 48 57 202 190 4 263 25 199 149 251 234 157 212 30 184 259 195 254 239 77 48 28 269 136 33 167 146 210 180 128 43 137 65 192 220 85 281 286 242 118 102 57 137 123 58 27 121 78 138 220 56 47 232 177 22 129 68 168 74 7 275 240 174 46 142 79 235 218 170 158 30 155 25 235 283 237 198 59 59 52 246 13 20 214 39 6 214 282 46 106 246 249 47 268 10 8 93 271 15 22 136 269 100 200 275 42 ^'}}, + {OUT=>'8D500C9CFDE0288530A2106B70BED39326C52C3C'}], + ['218', {IN=> {f=> '644 0 6 29 104 280 81 240 230 212 156 114 31 69 146 96 66 27 63 134 52 68 244 186 88 139 162 111 53 81 64 162 287 30 6 190 59 128 131 235 246 101 211 93 249 205 222 250 57 87 76 206 285 115 185 25 274 34 264 66 253 176 211 219 181 69 5 51 216 77 58 241 243 32 223 11 224 215 225 102 113 3 136 93 123 273 56 74 165 230 86 224 39 157 268 289 197 295 83 105 217 14 293 203 5 127 103 193 37 116 122 260 236 7 268 37 242 145 33 110 201 125 238 13 89 293 27 239 202 279 194 50 27 189 157 127 153 45 43 78 121 106 69 272 119 141 203 166 82 42 50 188 53 5 177 148 152 234 42 100 22 205 46 182 132 263 179 63 275 97 129 194 191 72 250 107 132 137 247 290 99 296 272 295 118 37 81 190 94 60 206 109 47 260 110 75 193 163 139 288 43 128 257 258 19 277 12 252 148 278 166 117 276 125 62 247 164 76 221 96 101 261 138 8 246 227 143 168 32 97 79 149 39 31 245 123 21 192 135 206 235 70 33 286 269 50 62 121 232 1 45 295 244 60 156 64 288 8 105 91 82 218 27 113 270 204 18 249 79 199 84 183 286 128 5 1 171 227 17 236 259 223 187 292 140 49 301 256 104 154 149 165 54 18 299 215 49 125 188 179 28 252 22 255 91 32 82 268 163 265 220 209 2 58 115 9 259 47 210 65 14 243 158 155 86 98 16 82 92 95 38 94 10 161 48 97 255 217 266 248 142 266 122 119 191 248 16 32 47 34 88 89 26 50 12 76 80 51 40 9 133 24 44 191 122 84 259 173 142 140 99 44 15 54 159 42 276 301 130 172 79 275 62 197 119 15 180 91 208 150 193 289 71 61 219 231 114 157 1 221 272 169 186 264 207 87 237 161 224 165 180 41 72 89 152 284 87 252 274 210 241 293 77 284 52 229 199 34 138 134 178 17 60 282 298 61 93 299 39 283 200 62 71 187 242 4 290 49 251 120 43 113 144 181 245 73 278 40 185 201 251 261 88 265 94 186 138 184 223 61 58 65 175 107 6 205 81 114 207 137 71 11 174 170 73 152 108 110 25 148 11 98 283 150 17 221 146 237 111 88 13 139 36 179 189 207 263 3 86 48 273 21 51 90 54 285 65 49 175 233 29 280 257 6 64 36 53 257 132 87 111 229 58 291 288 184 173 16 208 24 170 214 197 169 60 30 41 213 134 2 234 92 145 83 155 51 166 243 208 200 238 48 21 66 203 40 59 178 176 85 196 106 195 204 194 15 4 23 283 24 296 146 61 43 254 189 31 195 78 262 151 130 222 124 34 12 202 103 126 216 112 292 14 117 226 80 1 297 159 183 19 151 80 177 274 84 7 218 294 181 104 28 126 90 180 217 140 225 67 90 230 262 292 266 72 74 39 298 11 48 147 300 278 216 253 265 ^'}}, + {OUT=>'F3D4D139EDFC24596377BC97A96FB7621F27FFC7'}], + ['219', {IN=> {f=> '638 1 75 65 227 58 108 240 267 267 185 71 13 95 212 71 235 285 154 238 48 144 14 288 221 228 43 165 6 283 280 172 125 16 121 145 122 297 74 36 227 17 51 211 4 64 157 1 38 224 254 280 131 68 291 162 161 94 142 14 165 269 141 251 298 141 292 51 170 251 35 198 17 10 154 279 105 173 192 272 249 79 18 36 268 74 80 170 292 92 227 280 213 182 45 80 129 150 63 49 296 185 112 70 124 171 55 263 51 129 109 6 20 33 201 84 149 215 97 168 32 216 27 234 133 287 110 114 248 190 9 183 156 194 228 125 279 64 116 163 9 265 270 252 61 8 116 204 66 294 229 236 89 163 91 160 24 85 29 149 256 154 197 210 115 55 108 158 68 209 48 103 176 259 262 25 15 10 31 23 18 77 21 103 258 69 16 162 202 151 171 277 149 297 296 226 169 99 83 70 83 29 26 67 101 39 31 64 75 106 284 2 67 224 295 33 160 246 275 275 12 69 98 57 260 69 139 114 289 247 38 142 55 222 298 100 235 22 211 267 226 128 42 54 196 184 1 260 25 196 143 248 231 151 212 30 178 256 195 254 239 74 39 28 263 133 24 167 143 207 174 122 34 131 65 186 220 79 281 283 239 115 96 57 137 117 52 18 118 78 132 217 53 44 232 177 22 129 68 168 295 74 302 275 234 174 40 139 73 232 218 164 158 27 152 19 229 277 231 192 50 59 52 240 4 20 214 30 301 208 282 46 106 243 249 38 265 7 5 90 271 15 13 136 269 100 194 269 182 4 23 100 276 79 240 226 210 156 112 29 67 142 96 60 23 59 134 50 62 242 182 86 137 158 109 47 77 62 160 287 28 190 53 126 127 235 244 97 209 89 245 205 218 246 53 85 70 206 285 113 181 19 270 30 260 66 253 172 207 215 179 63 5 49 214 71 54 237 241 30 219 9 224 213 223 102 109 3 134 91 119 271 56 70 165 228 84 222 35 157 264 285 195 295 77 103 217 12 291 203 303 123 101 302 193 35 116 122 256 236 7 268 33 242 141 29 108 199 125 238 7 87 289 25 237 200 277 190 50 21 185 153 127 153 45 39 72 121 104 65 268 115 137 199 166 76 36 46 188 53 3 175 148 148 230 40 98 16 203 40 180 130 261 177 63 271 97 127 194 187 68 250 105 132 135 243 290 95 294 270 293 118 37 75 188 94 60 204 107 47 258 110 73 191 161 135 284 43 124 253 254 17 273 12 250 146 274 164 117 274 123 60 245 164 76 217 94 101 261 136 6 242 223 143 166 32 93 75 147 37 31 245 123 19 188 135 202 233 66 31 286 265 48 62 119 230 303 41 291 244 56 152 60 286 2 105 91 78 214 27 111 266 200 14 247 79 199 84 181 282 128 1 301 167 225 17 232 259 221 187 290 136 47 299 252 102 150 145 163 157 ^'}}, + {OUT=>'5509BAFFAC6D507860CEFC5AB5832CB63CD4B687'}], + ['220', {IN=> {f=> '653 0 18 299 207 41 117 184 179 16 252 18 255 83 20 82 264 155 257 216 201 296 54 107 303 255 39 202 61 2 235 154 151 86 94 16 78 84 91 30 86 6 153 36 93 251 209 262 240 134 266 114 119 187 244 8 24 35 22 76 81 26 38 8 68 80 43 32 1 129 24 44 191 118 72 251 165 138 140 99 40 11 54 151 42 276 301 122 164 67 271 50 189 115 7 180 87 200 146 185 285 67 53 219 231 106 153 1 217 272 165 182 264 199 75 237 157 216 157 172 33 72 77 152 280 87 244 270 206 241 293 77 284 40 229 191 30 130 130 174 298 13 48 274 298 57 93 295 27 283 196 54 63 179 234 4 282 37 243 120 31 113 136 181 237 69 274 36 181 193 251 253 80 261 90 186 138 184 223 61 46 53 175 107 6 197 81 114 207 129 59 305 170 162 73 148 100 102 17 140 11 98 275 142 5 221 146 229 103 88 9 139 28 171 189 203 255 301 78 40 273 9 51 86 50 277 57 49 171 233 21 276 257 304 64 32 45 253 124 79 111 221 58 287 288 176 169 12 204 20 170 206 197 169 56 22 41 205 126 300 234 92 145 79 155 39 158 243 208 200 234 48 21 58 199 40 55 178 172 77 196 98 187 200 190 3 23 279 16 296 142 49 39 246 185 23 191 74 254 151 130 218 116 34 4 194 95 122 208 112 292 6 109 218 72 295 289 159 175 19 143 76 169 274 80 305 214 286 173 104 20 126 82 176 213 136 225 55 90 230 262 284 258 60 70 39 290 3 44 147 300 278 216 245 35 75 63 223 52 104 238 263 267 185 67 9 95 210 71 233 283 152 236 42 144 8 286 217 228 41 161 2 279 278 172 121 14 119 143 120 293 68 36 225 11 45 209 58 155 301 34 222 252 280 131 62 291 162 161 90 142 14 163 267 141 249 294 139 290 47 168 247 29 198 13 4 150 277 101 173 192 268 247 73 16 34 266 70 74 166 288 88 227 276 213 180 43 76 125 150 59 43 294 183 108 68 124 167 53 263 49 127 109 14 31 201 78 302 149 215 95 166 26 212 21 232 133 283 108 112 248 188 9 183 152 192 224 123 279 60 114 163 5 265 270 250 59 8 112 204 64 294 227 232 89 159 87 156 22 85 23 147 256 154 195 210 115 51 304 108 156 66 209 44 103 176 257 260 19 11 10 27 21 14 75 19 99 258 69 12 160 202 149 171 277 145 297 292 224 167 97 81 70 83 29 24 67 97 37 25 62 73 104 282 2 61 220 293 33 160 246 273 271 6 65 94 51 260 63 135 110 289 247 38 140 55 222 296 98 231 18 211 265 226 126 38 52 192 180 305 258 25 194 139 246 229 147 212 30 174 254 195 254 239 72 33 28 259 131 18 167 141 205 170 118 28 127 65 182 220 75 281 281 237 113 92 57 137 113 48 12 116 78 128 215 51 42 232 177 22 129 68 168 291 161 ^'}}, + {OUT=>'0C0AEA0C2FD7A620C77866B1A177481E26B4F592'}], + ['221', {IN=> {f=> '653 0 296 275 228 174 34 136 67 229 218 158 158 24 149 13 223 271 225 186 41 59 52 234 302 20 214 21 295 202 282 46 106 240 249 29 262 4 2 87 271 15 4 136 269 100 188 263 182 1 14 94 270 76 240 220 207 156 109 26 64 136 96 51 17 53 134 47 53 239 176 83 134 152 106 38 71 59 157 287 25 298 190 44 123 121 235 241 91 206 83 239 205 212 240 47 82 61 206 285 110 175 10 264 24 254 66 253 166 201 209 176 54 5 46 211 62 48 231 238 27 213 6 224 210 220 102 103 3 131 88 113 268 56 64 165 225 81 219 29 157 258 279 192 295 68 100 217 9 288 203 297 117 98 302 193 32 116 122 250 236 7 268 27 242 135 23 105 196 125 238 305 84 283 22 234 197 274 184 50 12 179 147 127 153 45 33 63 121 101 59 262 109 131 193 166 67 27 40 188 53 172 148 142 224 37 95 7 200 31 177 127 258 174 63 265 97 124 194 181 62 250 102 132 132 237 290 89 291 267 290 118 37 66 185 94 60 201 104 47 255 110 70 188 158 129 278 43 118 247 248 14 267 12 247 143 268 161 117 271 120 57 242 164 76 211 91 101 261 133 3 236 217 143 163 32 87 69 144 34 31 245 123 16 182 135 196 230 60 28 286 259 45 62 116 227 303 35 285 244 50 146 54 283 300 105 91 72 208 27 108 260 194 8 244 79 199 84 178 276 128 302 298 161 222 17 226 259 218 187 287 130 44 296 246 99 144 139 160 44 18 299 205 39 115 183 179 13 252 17 255 81 17 82 263 153 255 215 199 294 53 105 301 254 37 200 60 306 233 153 150 86 93 16 77 82 90 28 84 5 151 33 92 250 207 261 238 132 266 112 119 186 243 6 22 32 19 73 79 26 35 7 66 80 41 30 306 128 24 44 191 117 69 249 163 137 140 99 39 10 54 149 42 276 301 120 162 64 270 47 187 114 5 180 86 198 145 183 284 66 51 219 231 104 152 1 216 272 164 181 264 197 72 237 156 214 155 170 31 72 74 152 279 87 242 269 205 241 293 77 284 37 229 189 29 128 129 173 297 12 45 272 298 56 93 294 24 283 195 52 61 177 232 4 280 34 241 120 28 113 134 181 235 68 273 35 180 191 251 251 78 260 89 186 138 184 223 61 43 50 175 107 6 195 81 114 207 127 56 303 169 160 73 147 98 100 15 138 11 98 273 140 2 221 146 227 101 88 8 139 26 169 189 202 253 300 76 38 273 6 51 85 49 275 55 49 170 233 19 275 257 303 64 31 43 252 122 77 111 219 58 286 288 174 168 11 203 19 170 204 197 169 55 20 41 203 124 299 234 92 145 78 155 36 156 243 208 200 233 48 21 56 198 40 54 178 171 75 196 96 185 199 189 306 23 278 14 296 141 46 38 244 184 21 190 73 252 151 130 217 114 34 2 192 93 121 206 112 292 4 107 216 70 293 112 ^'}}, + {OUT=>'149176007FEE58A591E3F00F8DB658B605F8390C'}], + ['222', {IN=> {f=> '646 1 159 169 19 137 73 163 274 77 302 211 280 167 104 14 126 76 173 210 133 225 46 90 230 262 278 252 51 67 39 284 306 41 147 300 278 216 239 35 75 60 217 43 98 235 257 267 185 61 3 95 207 71 230 280 149 233 33 144 308 283 211 228 38 155 305 273 275 172 115 11 116 140 117 287 59 36 222 2 36 206 303 49 152 295 28 219 249 280 131 53 291 162 161 84 142 14 160 264 141 246 288 136 287 41 165 241 20 198 7 304 144 274 95 173 192 262 244 64 13 31 263 64 65 160 282 82 227 270 213 177 40 70 119 150 53 34 291 180 102 65 124 161 50 263 46 124 109 300 5 28 201 69 299 149 215 92 163 17 206 12 229 133 277 105 109 248 185 9 183 146 189 218 120 279 54 111 163 308 265 270 247 56 8 106 204 61 294 224 226 89 153 81 150 19 85 14 144 256 154 192 210 115 45 304 108 153 63 209 38 103 176 254 257 10 5 10 21 18 8 72 16 93 258 69 6 157 202 146 171 277 139 297 286 221 164 94 78 70 83 29 21 67 91 34 16 59 70 101 279 2 52 214 290 33 160 246 270 265 306 59 88 42 260 54 129 104 289 247 38 137 55 222 293 95 225 12 211 262 226 123 32 49 186 174 305 255 25 191 133 243 226 141 212 30 168 251 195 254 239 69 24 28 253 128 9 167 138 202 164 112 19 121 65 176 220 69 281 278 234 110 86 57 137 107 42 3 113 78 122 212 48 39 232 177 22 129 68 168 285 74 292 275 224 174 30 134 63 227 218 154 158 22 147 9 219 267 221 182 35 59 52 230 298 20 214 15 291 198 282 46 106 238 249 23 260 2 85 271 15 307 136 269 100 184 259 182 308 8 90 266 74 240 216 205 156 107 24 62 132 96 45 13 49 134 45 47 237 172 81 132 148 104 32 67 57 155 287 23 294 190 38 121 117 235 239 87 204 79 235 205 208 236 43 80 55 206 285 108 171 4 260 20 250 66 253 162 197 205 174 48 5 44 209 56 44 227 236 25 209 4 224 208 218 102 99 3 129 86 109 266 56 60 165 223 79 217 25 157 254 275 190 295 62 98 217 7 286 203 293 113 96 302 193 30 116 122 246 236 7 268 23 242 131 19 103 194 125 238 301 82 279 20 232 195 272 180 50 6 175 143 127 153 45 29 57 121 99 55 258 105 127 189 166 61 21 36 188 53 307 170 148 138 220 35 93 1 198 25 175 125 256 172 63 261 97 122 194 177 58 250 100 132 130 233 290 85 289 265 288 118 37 60 183 94 60 199 102 47 253 110 68 186 156 125 274 43 114 243 244 12 263 12 245 141 264 159 117 269 118 55 240 164 76 207 89 101 261 131 1 232 213 143 161 32 83 65 142 32 31 245 123 14 178 135 192 228 56 26 286 255 43 62 114 225 303 31 281 244 46 142 50 281 296 105 91 238 ^'}}, + {OUT=>'17C0D7B0256159F3626786FFDB20237AE154FA84'}], + ['223', {IN=> {f=> '647 0 200 27 104 252 186 240 79 199 84 174 268 128 298 294 153 218 17 218 259 214 187 283 122 40 292 238 95 136 131 156 36 18 299 197 31 107 179 179 1 252 13 255 73 5 82 259 145 247 211 191 286 49 97 293 250 29 192 56 298 225 149 146 86 89 16 73 74 86 20 76 1 143 21 88 246 199 257 230 124 266 104 119 182 239 309 14 20 7 61 71 26 23 3 58 80 33 22 302 124 24 44 191 113 57 241 155 133 140 99 35 6 54 141 42 276 301 112 154 52 266 35 179 110 308 180 82 190 141 175 280 62 43 219 231 96 148 1 212 272 160 177 264 189 60 237 152 206 147 162 23 72 62 152 275 87 234 265 201 241 293 77 284 25 229 181 25 120 125 169 293 8 33 264 298 52 93 290 12 283 191 44 53 169 224 4 272 22 233 120 16 113 126 181 227 64 269 31 176 183 251 243 70 256 85 186 138 184 223 61 31 38 175 107 6 187 81 114 207 119 44 295 165 152 73 143 90 92 7 130 11 98 265 132 301 221 146 219 93 88 4 139 18 161 189 198 245 296 68 30 273 305 51 81 45 267 47 49 166 233 11 271 257 299 64 27 35 248 114 69 111 211 58 282 288 166 164 7 199 15 170 196 197 169 51 12 41 195 116 295 234 92 145 74 155 24 148 243 208 200 229 48 21 48 194 40 50 178 167 67 196 88 177 195 185 299 306 23 274 6 296 137 34 34 236 180 13 186 69 244 151 130 213 106 34 305 184 85 117 198 112 292 307 99 208 62 285 279 159 165 19 133 71 159 274 75 300 209 276 163 104 10 126 72 171 208 131 225 40 90 230 262 274 248 45 65 39 280 304 39 147 300 278 216 235 35 75 58 213 37 94 233 253 267 185 57 310 95 205 71 228 278 147 231 27 144 304 281 207 228 36 151 303 269 273 172 111 9 114 138 115 283 53 36 220 307 30 204 301 43 150 291 24 217 247 280 131 47 291 162 161 80 142 14 158 262 141 244 284 134 285 37 163 237 14 198 3 300 140 272 91 173 192 258 242 58 11 29 261 60 59 156 278 78 227 266 213 175 38 66 115 150 49 28 289 178 98 63 124 157 48 263 44 122 109 296 310 26 201 63 297 149 215 90 161 11 202 6 227 133 273 103 107 248 183 9 183 142 187 214 118 279 50 109 163 306 265 270 245 54 8 102 204 59 294 222 222 89 149 77 146 17 85 8 142 256 154 190 210 115 41 304 108 151 61 209 34 103 176 252 255 4 1 10 17 16 4 70 14 89 258 69 2 155 202 144 171 277 135 297 282 219 162 92 76 70 83 29 19 67 87 32 10 57 68 99 277 2 46 210 288 33 160 246 268 261 302 55 84 36 260 48 125 100 289 247 38 135 55 222 291 93 221 8 211 260 226 121 28 47 182 170 305 253 25 189 129 241 224 137 212 30 164 249 195 254 239 86 ^'}}, + {OUT=>'741A58618ABEB1D983D67AFDCBC49AA397A3B8E0'}], + ['224', {IN=> {f=> '665 0 15 28 247 125 167 135 199 158 106 10 115 65 170 220 63 281 275 231 107 80 57 137 101 36 306 110 78 116 209 45 36 232 177 22 129 68 168 279 74 286 275 218 174 24 131 57 224 218 148 158 19 144 3 213 261 215 176 26 59 52 224 292 20 214 6 285 192 282 46 106 235 249 14 257 311 309 82 271 15 301 136 269 100 178 253 182 308 311 84 260 71 240 210 202 156 104 21 59 126 96 36 7 43 134 42 38 234 166 78 129 142 101 23 61 54 152 287 20 288 190 29 118 111 235 236 81 201 73 229 205 202 230 37 77 46 206 285 105 165 307 254 14 244 66 253 156 191 199 171 39 5 41 206 47 38 221 233 22 203 1 224 205 215 102 93 3 126 83 103 263 56 54 165 220 76 214 19 157 248 269 187 295 53 95 217 4 283 203 287 107 93 302 193 27 116 122 240 236 7 268 17 242 125 13 100 191 125 238 295 79 273 17 229 192 269 174 50 309 169 137 127 153 45 23 48 121 96 49 252 99 121 183 166 52 12 30 188 53 307 167 148 132 214 32 90 304 195 16 172 122 253 169 63 255 97 119 194 171 52 250 97 132 127 227 290 79 286 262 285 118 37 51 180 94 60 196 99 47 250 110 65 183 153 119 268 43 108 237 238 9 257 12 242 138 258 156 117 266 115 52 237 164 76 201 86 101 261 128 310 226 207 143 158 32 77 59 139 29 31 245 123 11 172 135 186 225 50 23 286 249 40 62 111 222 303 25 275 244 40 136 44 278 290 105 91 62 198 27 103 250 184 310 239 79 199 84 173 266 128 297 293 151 217 17 216 259 213 187 282 120 39 291 236 94 134 129 155 34 18 299 195 29 105 178 179 310 252 12 255 71 2 82 258 143 245 210 189 284 48 95 291 249 27 190 55 296 223 148 145 86 88 16 72 72 85 18 74 141 18 87 245 197 256 228 122 266 102 119 181 238 308 12 17 4 58 69 26 20 2 56 80 31 20 301 123 24 44 191 112 54 239 153 132 140 99 34 5 54 139 42 276 301 110 152 49 265 32 177 109 307 180 81 188 140 173 279 61 41 219 231 94 147 1 211 272 159 176 264 187 57 237 151 204 145 160 21 72 59 152 274 87 232 264 200 241 293 77 284 22 229 179 24 118 124 168 292 7 30 262 298 51 93 289 9 283 190 42 51 167 222 4 270 19 231 120 13 113 124 181 225 63 268 30 175 181 251 241 68 255 84 186 138 184 223 61 28 35 175 107 6 185 81 114 207 117 41 293 164 150 73 142 88 90 5 128 11 98 263 130 299 221 146 217 91 88 3 139 16 159 189 197 243 295 66 28 273 303 51 80 44 265 45 49 165 233 9 270 257 298 64 26 33 247 112 67 111 209 58 281 288 164 163 6 198 14 170 194 197 169 50 10 41 193 114 294 234 92 145 73 155 21 146 243 208 200 228 48 21 46 193 40 49 178 166 65 196 86 175 194 184 297 306 23 273 206 ^'}}, + {OUT=>'B738D6B3409EB9ED2F1719B84D13F7C36169CDEC'}], + ['225', {IN=> {f=> '641 0 296 134 25 31 230 177 7 183 66 238 151 130 210 100 34 302 178 79 114 192 112 292 304 93 202 56 279 273 159 159 19 127 68 153 274 72 297 206 270 157 104 4 126 66 168 205 128 225 31 90 230 262 268 242 36 62 39 274 301 36 147 300 278 216 229 35 75 55 207 28 88 230 247 267 185 51 307 95 202 71 225 275 144 228 18 144 298 278 201 228 33 145 300 263 270 172 105 6 111 135 112 277 44 36 217 301 21 201 298 34 147 285 18 214 244 280 131 38 291 162 161 74 142 14 155 259 141 241 278 131 282 31 160 231 5 198 311 294 134 269 85 173 192 252 239 49 8 26 258 54 50 150 272 72 227 260 213 172 35 60 109 150 43 19 286 175 92 60 124 151 45 263 41 119 109 290 304 23 201 54 294 149 215 87 158 2 196 311 224 133 267 100 104 248 180 9 183 136 184 208 115 279 44 106 163 303 265 270 242 51 8 96 204 56 294 219 216 89 143 71 140 14 85 313 139 256 154 187 210 115 35 304 108 148 58 209 28 103 176 249 252 309 309 10 11 13 312 67 11 83 258 69 310 152 202 141 171 277 129 297 276 216 159 89 73 70 83 29 16 67 81 29 1 54 65 96 274 2 37 204 285 33 160 246 265 255 296 49 78 27 260 39 119 94 289 247 38 132 55 222 288 90 215 2 211 257 226 118 22 44 176 164 305 250 25 186 123 238 221 131 212 30 158 246 195 254 239 64 9 28 243 123 308 167 133 197 154 102 4 111 65 166 220 59 281 273 229 105 76 57 137 97 32 302 108 78 112 207 43 34 232 177 22 129 68 168 275 74 282 275 214 174 20 129 53 222 218 144 158 17 142 313 209 257 211 172 20 59 52 220 288 20 214 281 188 282 46 106 233 249 8 255 311 309 80 271 15 297 136 269 100 174 249 182 308 307 80 256 69 240 206 200 156 102 19 57 122 96 30 3 39 134 40 32 232 162 76 127 138 99 17 57 52 150 287 18 284 190 23 116 107 235 234 77 199 69 225 205 198 226 33 75 40 206 285 103 161 303 250 10 240 66 253 152 187 195 169 33 5 39 204 41 34 217 231 20 199 313 224 203 213 102 89 3 124 81 99 261 56 50 165 218 74 212 15 157 244 265 185 295 47 93 217 2 281 203 283 103 91 302 193 25 116 122 236 236 7 268 13 242 121 9 98 189 125 238 291 77 269 15 227 190 267 170 50 305 165 133 127 153 45 19 42 121 94 45 248 95 117 179 166 46 6 26 188 53 307 165 148 128 210 30 88 300 193 10 170 120 251 167 63 251 97 117 194 167 48 250 95 132 125 223 290 75 284 260 283 118 37 45 178 94 60 194 97 47 248 110 63 181 151 115 264 43 104 233 234 7 253 12 240 136 254 154 117 264 113 50 235 164 76 197 84 101 261 126 310 222 203 143 276 ^'}}, + {OUT=>'3D33DE31F64055D3B128AC9A6AA3F92DFD4F5330'}], + ['226', {IN=> {f=> '656 0 32 69 51 135 25 31 245 123 7 164 135 178 221 42 19 286 241 36 62 107 218 303 17 267 244 32 128 36 274 282 105 91 54 190 27 99 242 176 306 235 79 199 84 169 258 128 293 289 143 213 17 208 259 209 187 278 112 35 287 228 90 126 121 151 26 18 299 187 21 97 174 179 302 252 8 255 63 306 82 254 135 237 206 181 276 44 87 283 245 19 182 51 288 215 144 141 86 84 16 68 64 81 10 66 312 133 6 83 241 189 252 220 114 266 94 119 177 234 304 4 5 308 46 61 26 8 314 48 80 23 12 297 119 24 44 191 108 42 231 145 128 140 99 30 1 54 131 42 276 301 102 144 37 261 20 169 105 303 180 77 180 136 165 275 57 33 219 231 86 143 1 207 272 155 172 264 179 45 237 147 196 137 152 13 72 47 152 270 87 224 260 196 241 293 77 284 10 229 171 20 110 120 164 288 3 18 254 298 47 93 285 313 283 186 34 43 159 214 4 262 7 223 120 1 113 116 181 217 59 264 26 171 173 251 233 60 251 80 186 138 184 223 61 16 23 175 107 6 177 81 114 207 109 29 285 160 142 73 138 80 82 313 120 11 98 255 122 291 221 146 209 83 88 315 139 8 151 189 193 235 291 58 20 273 295 51 76 40 257 37 49 161 233 1 266 257 294 64 22 25 243 104 59 111 201 58 277 288 156 159 2 194 10 170 186 197 169 46 2 41 185 106 290 234 92 145 69 155 9 138 243 208 200 224 48 21 38 189 40 45 178 162 57 196 78 167 190 180 289 306 23 269 312 296 132 19 29 226 175 3 181 64 234 151 130 208 96 34 300 174 75 112 188 112 292 302 89 198 52 275 269 159 155 19 123 66 149 274 70 295 204 266 153 104 126 62 166 203 126 225 25 90 230 262 264 238 30 60 39 270 299 34 147 300 278 216 225 35 75 53 203 22 84 228 243 267 185 47 305 95 200 71 223 273 142 226 12 144 294 276 197 228 31 141 298 259 268 172 101 4 109 133 110 273 38 36 215 297 15 199 296 28 145 281 14 212 242 280 131 32 291 162 161 70 142 14 153 257 141 239 274 129 280 27 158 227 315 198 309 290 130 267 81 173 192 248 237 43 6 24 256 50 44 146 268 68 227 256 213 170 33 56 105 150 39 13 284 173 88 58 124 147 43 263 39 117 109 286 300 21 201 48 292 149 215 85 156 312 192 307 222 133 263 98 102 248 178 9 183 132 182 204 113 279 40 104 163 301 265 270 240 49 8 92 204 54 294 217 212 89 139 67 136 12 85 309 137 256 154 185 210 115 31 304 108 146 56 209 24 103 176 247 250 305 307 10 7 11 310 65 9 79 258 69 308 150 202 139 171 277 125 297 272 214 157 87 71 70 83 29 14 67 77 27 311 52 63 94 272 2 31 200 283 33 160 246 263 251 292 45 74 21 260 33 115 90 289 247 38 130 55 222 286 88 211 227 ^'}}, + {OUT=>'B6925F4DF94949B8844C867428BA3DEDF4CF2B51'}], + ['227', {IN=> {f=> '668 0 211 254 226 115 16 41 170 158 305 247 25 183 117 235 218 125 212 30 152 243 195 254 239 61 28 237 120 302 167 130 194 148 96 312 105 65 160 220 53 281 270 226 102 70 57 137 91 26 296 105 78 106 204 40 31 232 177 22 129 68 168 269 74 276 275 208 174 14 126 47 219 218 138 158 14 139 310 203 251 205 166 11 59 52 214 282 20 214 308 275 182 282 46 106 230 249 316 252 311 309 77 271 15 291 136 269 100 168 243 182 308 301 74 250 66 240 200 197 156 99 16 54 116 96 21 314 33 134 37 23 229 156 73 124 132 96 8 51 49 147 287 15 278 190 14 113 101 235 231 71 196 63 219 205 192 220 27 72 31 206 285 100 155 297 244 4 234 66 253 146 181 189 166 24 5 36 201 32 28 211 228 17 193 313 224 200 210 102 83 3 121 78 93 258 56 44 165 215 71 209 9 157 238 259 182 295 38 90 217 316 278 203 277 97 88 302 193 22 116 122 230 236 7 268 7 242 115 3 95 186 125 238 285 74 263 12 224 187 264 164 50 299 159 127 127 153 45 13 33 121 91 39 242 89 111 173 166 37 314 20 188 53 307 162 148 122 204 27 85 294 190 1 167 117 248 164 63 245 97 114 194 161 42 250 92 132 122 217 290 69 281 257 280 118 37 36 175 94 60 191 94 47 245 110 60 178 148 109 258 43 98 227 228 4 247 12 237 133 248 151 117 261 110 47 232 164 76 191 81 101 261 123 310 216 197 143 153 32 67 49 134 24 31 245 123 6 162 135 176 220 40 18 286 239 35 62 106 217 303 15 265 244 30 126 34 273 280 105 91 52 188 27 98 240 174 305 234 79 199 84 168 256 128 292 288 141 212 17 206 259 208 187 277 110 34 286 226 89 124 119 150 24 18 299 185 19 95 173 179 300 252 7 255 61 304 82 253 133 235 205 179 274 43 85 281 244 17 180 50 286 213 143 140 86 83 16 67 62 80 8 64 312 131 3 82 240 187 251 218 112 266 92 119 176 233 303 2 2 306 43 59 26 5 314 46 80 21 10 296 118 24 44 191 107 39 229 143 127 140 99 29 54 129 42 276 301 100 142 34 260 17 167 104 302 180 76 178 135 163 274 56 31 219 231 84 142 1 206 272 154 171 264 177 42 237 146 194 135 150 11 72 44 152 269 87 222 259 195 241 293 77 284 7 229 169 19 108 119 163 287 2 15 252 298 46 93 284 311 283 185 32 41 157 212 4 260 4 221 120 315 113 114 181 215 58 263 25 170 171 251 231 58 250 79 186 138 184 223 61 13 20 175 107 6 175 81 114 207 107 26 283 159 140 73 137 78 80 312 118 11 98 253 120 289 221 146 207 81 88 315 139 6 149 189 192 233 290 56 18 273 293 51 75 39 255 35 49 160 233 316 265 257 293 64 21 23 242 102 57 111 199 58 276 288 154 158 1 193 9 170 184 197 169 45 41 183 104 289 234 92 145 68 155 6 136 243 208 203 ^'}}, + {OUT=>'CF5E7256292ABEC431D8E8B9CBEAF22AF072377E'}], + ['228', {IN=> {f=> '656 0 221 48 21 32 186 40 42 178 159 51 196 72 161 187 177 283 306 23 266 309 296 129 10 26 220 172 316 178 61 228 151 130 205 90 34 297 168 69 109 182 112 292 299 83 192 46 269 263 159 149 19 117 63 143 274 67 292 201 260 147 104 313 126 56 163 200 123 225 16 90 230 262 258 232 21 57 39 264 296 31 147 300 278 216 219 35 75 50 197 13 78 225 237 267 185 41 302 95 197 71 220 270 139 223 3 144 288 273 191 228 28 135 295 253 265 172 95 1 106 130 107 267 29 36 212 291 6 196 293 19 142 275 8 209 239 280 131 23 291 162 161 64 142 14 150 254 141 236 268 126 277 21 155 221 309 198 306 284 124 264 75 173 192 242 234 34 3 21 253 44 35 140 262 62 227 250 213 167 30 50 99 150 33 4 281 170 82 55 124 141 40 263 36 114 109 280 294 18 201 39 289 149 215 82 153 306 186 301 219 133 257 95 99 248 175 9 183 126 179 198 110 279 34 101 163 298 265 270 237 46 8 86 204 51 294 214 206 89 133 61 130 9 85 303 134 256 154 182 210 115 25 304 108 143 53 209 18 103 176 244 247 299 304 10 1 8 307 62 6 73 258 69 305 147 202 136 171 277 119 297 266 211 154 84 68 70 83 29 11 67 71 24 305 49 60 91 269 2 22 194 280 33 160 246 260 245 286 39 68 12 260 24 109 84 289 247 38 127 55 222 283 85 205 311 211 252 226 113 12 39 166 154 305 245 25 181 113 233 216 121 212 30 148 241 195 254 239 59 313 28 233 118 298 167 128 192 144 92 308 101 65 156 220 49 281 268 224 100 66 57 137 87 22 292 103 78 102 202 38 29 232 177 22 129 68 168 265 74 272 275 204 174 10 124 43 217 218 134 158 12 137 308 199 247 201 162 5 59 52 210 278 20 214 304 271 178 282 46 106 228 249 312 250 311 309 75 271 15 287 136 269 100 164 239 182 308 297 70 246 64 240 196 195 156 97 14 52 112 96 15 312 29 134 35 17 227 152 71 122 128 94 2 47 47 145 287 13 274 190 8 111 97 235 229 67 194 59 215 205 188 216 23 70 25 206 285 98 151 293 240 230 66 253 142 177 185 164 18 5 34 199 26 24 207 226 15 189 313 224 198 208 102 79 3 119 76 89 256 56 40 165 213 69 207 5 157 234 255 180 295 32 88 217 316 276 203 273 93 86 302 193 20 116 122 226 236 7 268 3 242 111 318 93 184 125 238 281 72 259 10 222 185 262 160 50 295 155 123 127 153 45 9 27 121 89 35 238 85 107 169 166 31 310 16 188 53 307 160 148 118 200 25 83 290 188 314 165 115 246 162 63 241 97 112 194 157 38 250 90 132 120 213 290 65 279 255 278 118 37 30 173 94 60 189 92 47 243 110 58 176 146 105 254 43 94 223 224 2 243 12 235 131 244 149 117 259 108 45 230 164 76 187 79 101 261 109 ^'}}, + {OUT=>'975DCE94902923977F129C0E4ACF40AD28DDB9AA'}], + ['229', {IN=> {f=> '656 0 310 208 189 143 149 32 59 41 130 20 31 245 123 2 154 135 168 216 32 14 286 231 31 62 102 213 303 7 257 244 22 118 26 269 272 105 91 44 180 27 94 232 166 301 230 79 199 84 164 248 128 288 284 133 208 17 198 259 204 187 273 102 30 282 218 85 116 111 146 16 18 299 177 11 87 169 179 292 252 3 255 53 296 82 249 125 227 201 171 266 39 77 273 240 9 172 46 278 205 139 136 86 79 16 63 54 76 56 312 123 312 78 236 179 247 210 104 266 84 119 172 229 299 315 311 298 31 51 26 314 314 38 80 13 2 292 114 24 44 191 103 27 221 135 123 140 99 25 317 54 121 42 276 301 92 134 22 256 5 159 100 298 180 72 170 131 155 270 52 23 219 231 76 138 1 202 272 150 167 264 169 30 237 142 186 127 142 3 72 32 152 265 87 214 255 191 241 293 77 284 316 229 161 15 100 115 159 283 319 3 244 298 42 93 280 303 283 181 24 33 149 204 4 252 313 213 120 307 113 106 181 207 54 259 21 166 163 251 223 50 246 75 186 138 184 223 61 1 8 175 107 6 167 81 114 207 99 14 275 155 132 73 133 70 72 308 110 11 98 245 112 281 221 146 199 73 88 315 139 319 141 189 188 225 286 48 10 273 285 51 71 35 247 27 49 156 233 312 261 257 289 64 17 15 238 94 49 111 191 58 272 288 146 154 318 189 5 170 176 197 169 41 313 41 175 96 285 234 92 145 64 155 315 128 243 208 200 219 48 21 28 184 40 40 178 157 47 196 68 157 185 175 279 306 23 264 307 296 127 4 24 216 170 314 176 59 224 151 130 203 86 34 295 164 65 107 178 112 292 297 79 188 42 265 259 159 145 19 113 61 139 274 65 290 199 256 143 104 311 126 52 161 198 121 225 10 90 230 262 254 228 15 55 39 260 294 29 147 300 278 216 215 35 75 48 193 7 74 223 233 267 185 37 300 95 195 71 218 268 137 221 318 144 284 271 187 228 26 131 293 249 263 172 91 320 104 128 105 263 23 36 210 287 194 291 13 140 271 4 207 237 280 131 17 291 162 161 60 142 14 148 252 141 234 264 124 275 17 153 217 305 198 304 280 120 262 71 173 192 238 232 28 1 19 251 40 29 136 258 58 227 246 213 165 28 46 95 150 29 319 279 168 78 53 124 137 38 263 34 112 109 276 290 16 201 33 287 149 215 80 151 302 182 297 217 133 253 93 97 248 173 9 183 122 177 194 108 279 30 99 163 296 265 270 235 44 8 82 204 49 294 212 202 89 129 57 126 7 85 299 132 256 154 180 210 115 21 304 108 141 51 209 14 103 176 242 245 295 302 10 318 6 305 60 4 69 258 69 303 145 202 134 171 277 115 297 262 209 152 82 66 70 83 29 9 67 67 22 301 47 58 89 267 2 16 190 278 33 160 246 258 241 282 35 64 6 260 18 105 80 289 247 38 125 55 292 ^'}}, + {OUT=>'333B0259B18CE64D6B52CF563DD3041E5F63A516'}], + ); + +sub binary_expand ($$) +{ + my ($test_name, $line) = @_; + my ($n, $b, $rest) = split ' ', $line, 3; + defined $n && defined $b or die "$test_name: too few args\n"; + my @a = split ' ', $rest, $n + 1; + my $caret = pop @a; + $caret eq '^' or die "test $test_name: @a missing '^'\n"; + $b eq '1' || $b eq '0' or die "test $test_name: bad 'b'=$b\n"; + my $n_bad = @a; + @a == $n or + die "test $test_name: wrong number of args (expected $n, found $n_bad)\n"; + my $bit_string = ''; + foreach my $a (@a) + { + $bit_string .= $b x $a; + $b = 1 - $b; + } + my $t = pack ("B*", $bit_string); + # print "$bit_string\n $t\n"; + return $t; +} + +my $t; +foreach $t (@Tests) + { + # Expand each input. + my $in = $t->[1]->{IN}; + $in->{f} = binary_expand $t->[0], $in->{f}; + + # Convert each expected output string to lower case, and append " f\n". + my $h = $t->[2]; + $h->{OUT} = lc $h->{OUT} . " f\n"; + + # Insert the '--text' argument for each test. + splice @$t, 1, 0, '--text'; + } + +my $save_temps = $ENV{DEBUG}; +my $verbose = $ENV{VERBOSE}; + +my $prog = 'sha1sum'; +my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); +exit $fail; diff --git a/tests/misc/sha1sum.pl b/tests/misc/sha1sum.pl new file mode 100755 index 00000000..327c4dd8 --- /dev/null +++ b/tests/misc/sha1sum.pl @@ -0,0 +1,90 @@ +#!/usr/bin/perl +# Test "sha1sum". + +# Copyright (C) 2000-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/>. + +use strict; + +my $prog = 'sha1sum'; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +my $sha_degenerate = "da39a3ee5e6b4b0d3255bfef95601890afd80709"; + +my @Tests = + ( + ['s1', {IN=> {f=> ''}}, + {OUT=>"$sha_degenerate f\n"}], + ['s2', {IN=> {f=> 'a'}}, + {OUT=>"86f7e437faa5a7fce15d1ddcb9eaeaea377667b8 f\n"}], + ['s3', {IN=> {f=> 'abc'}}, + {OUT=>"a9993e364706816aba3e25717850c26c9cd0d89d f\n"}], + ['s4', + {IN=> {f=> 'abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq'}}, + {OUT=>"84983e441c3bd26ebaae4aa1f95129e5e54670f1 f\n"}], + ['s5', {IN=> {f=> 'abcdefghijklmnopqrstuvwxyz'}}, + {OUT=>"32d10c7b8cf96570ca04ce37f2a19d84240d3a89 f\n"}], + ['s6', {IN=> {f=> join ('', 'A'..'Z', 'a'..'z', '0'..'9')}}, + {OUT=>"761c457bf73b14d27e9e9265c46f4b4dda11f940 f\n"}], + ['s7', {IN=> {f=> '1234567890' x 8}}, + {OUT=>"50abf5706a150990a08b2c5ea40fa0e585554732 f\n"}], + ['million-a', {IN=> {f=> 'a' x 1000000}}, + {OUT=>"34aa973cd4c4daa4f61eeb2bdbad27316534016f f\n"}], + ['bs-sha', {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 + # md5sum accept BSD format. + ['check-bsd', '--check', {IN=> {'f.md5' => "MD5 (f) = $sha_degenerate\n"}}, + {AUX=> {f=> ''}}, + {ERR=>"sha1sum: f.md5: no properly formatted " + . "SHA1 checksum lines found\n"}, + {EXIT=> 1}], + ['check-bsd2', '--check', + {IN=> {'f.sha1' => "SHA1 (f) = $sha_degenerate\n"}}, + {AUX=> {f=> ''}}, {OUT=>"f: OK\n"}], + ['check-bsd3', '--check', '--status', + {IN=> {'f.sha1' => "SHA1 (f) = $sha_degenerate\n"}}, + {AUX=> {f=> 'bar'}}, {EXIT=> 1}], + ['check-openssl', '--check', + {IN=> {'f.md5' => "MD5(f)= $sha_degenerate\n"}}, + {AUX=> {f=> ''}}, + {ERR=>"sha1sum: f.md5: no properly formatted " + . "SHA1 checksum lines found\n"}, + {EXIT=> 1}], + ['check-openssl2', '--check', + {IN=> {'f.sha1' => "SHA1(f)= $sha_degenerate\n"}}, + {AUX=> {f=> ''}}, {OUT=>"f: OK\n"}], + ['check-openssl3', '--check', '--status', + {IN=> {'f.sha1' => "SHA1(f)= $sha_degenerate\n"}}, + {AUX=> {f=> 'bar'}}, {EXIT=> 1}], + ['bsd-segv', '--check', {IN=> {'z' => "SHA1 ("}}, {EXIT=> 1}, + {ERR=> "$prog: z: no properly formatted SHA1 checksum lines found\n"}], + ); + +# Insert the '--text' argument for each test. +my $t; +foreach $t (@Tests) + { + splice @$t, 1, 0, '--text' unless @$t[1] =~ /--check/; + } + +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/sha224sum b/tests/misc/sha224sum deleted file mode 100755 index 1da67381..00000000 --- a/tests/misc/sha224sum +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/perl -# Test "sha224sum". - -# Copyright (C) 2005-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 -# 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; - -(my $program_name = $0) =~ s|.*/||; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -my @Tests = - ( - ['s3', {IN=> {f=> 'abc'}}, - {OUT=>"23097d223405d8228642a477bda255b32aadbce4bda0b3f7e36c9da7 f\n"}], - ['s4', - {IN=> {f=> 'abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq'}}, - {OUT=>"75388b16512776cc5dba5da1fd890150b0c6455cb4f58b1952522525 f\n"}], - ['s8', {IN=> {f=> 'a' x 1000000}}, - {OUT=>"20794655980c91d8bbb4c1ea97618a4bf03f42581948b2ee4ee7ad67 f\n"}], - ); - -# Insert the '--text' argument for each test. -my $t; -foreach $t (@Tests) - { - splice @$t, 1, 0, '--text' unless @$t[1] =~ /--check/; - } - -my $save_temps = $ENV{DEBUG}; -my $verbose = $ENV{VERBOSE}; - -my $prog = 'sha224sum'; -my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); -exit $fail; diff --git a/tests/misc/sha224sum.pl b/tests/misc/sha224sum.pl new file mode 100755 index 00000000..ef881280 --- /dev/null +++ b/tests/misc/sha224sum.pl @@ -0,0 +1,49 @@ +#!/usr/bin/perl +# Test "sha224sum". + +# Copyright (C) 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 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; + +(my $program_name = $0) =~ s|.*/||; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +my @Tests = + ( + ['s3', {IN=> {f=> 'abc'}}, + {OUT=>"23097d223405d8228642a477bda255b32aadbce4bda0b3f7e36c9da7 f\n"}], + ['s4', + {IN=> {f=> 'abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq'}}, + {OUT=>"75388b16512776cc5dba5da1fd890150b0c6455cb4f58b1952522525 f\n"}], + ['s8', {IN=> {f=> 'a' x 1000000}}, + {OUT=>"20794655980c91d8bbb4c1ea97618a4bf03f42581948b2ee4ee7ad67 f\n"}], + ); + +# Insert the '--text' argument for each test. +my $t; +foreach $t (@Tests) + { + splice @$t, 1, 0, '--text' unless @$t[1] =~ /--check/; + } + +my $save_temps = $ENV{DEBUG}; +my $verbose = $ENV{VERBOSE}; + +my $prog = 'sha224sum'; +my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); +exit $fail; diff --git a/tests/misc/sha256sum b/tests/misc/sha256sum deleted file mode 100755 index fa408a63..00000000 --- a/tests/misc/sha256sum +++ /dev/null @@ -1,55 +0,0 @@ -#!/usr/bin/perl -# Test "sha256sum". - -# Copyright (C) 2005-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 -# 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; - -(my $program_name = $0) =~ s|.*/||; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -my $sha_degenerate = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"; - -my @Tests = - ( - ['s1', {IN=> {f=> ''}}, - {OUT=>"$sha_degenerate f\n"}], - ['s2', {IN=> {f=> 'a'}}, - {OUT=>"ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb f\n"}], - ['s3', {IN=> {f=> 'abc'}}, - {OUT=>"ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad f\n"}], - ['s4', - {IN=> {f=> 'abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq'}}, - {OUT=>"248d6a61d20638b8e5c026930c3e6039a33ce45964ff2167f6ecedd419db06c1 f\n"}], - ['s8', {IN=> {f=> 'a' x 1000000}}, - {OUT=>"cdc76e5c9914fb9281a1c7e284d73e67f1809a48a497200e046d39ccc7112cd0 f\n"}], - ); - -# Insert the '--text' argument for each test. -my $t; -foreach $t (@Tests) - { - splice @$t, 1, 0, '--text' unless @$t[1] =~ /--check/; - } - -my $save_temps = $ENV{DEBUG}; -my $verbose = $ENV{VERBOSE}; - -my $prog = 'sha256sum'; -my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); -exit $fail; diff --git a/tests/misc/sha256sum.pl b/tests/misc/sha256sum.pl new file mode 100755 index 00000000..2ad38e6e --- /dev/null +++ b/tests/misc/sha256sum.pl @@ -0,0 +1,55 @@ +#!/usr/bin/perl +# Test "sha256sum". + +# Copyright (C) 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 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; + +(my $program_name = $0) =~ s|.*/||; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +my $sha_degenerate = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"; + +my @Tests = + ( + ['s1', {IN=> {f=> ''}}, + {OUT=>"$sha_degenerate f\n"}], + ['s2', {IN=> {f=> 'a'}}, + {OUT=>"ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb f\n"}], + ['s3', {IN=> {f=> 'abc'}}, + {OUT=>"ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad f\n"}], + ['s4', + {IN=> {f=> 'abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq'}}, + {OUT=>"248d6a61d20638b8e5c026930c3e6039a33ce45964ff2167f6ecedd419db06c1 f\n"}], + ['s8', {IN=> {f=> 'a' x 1000000}}, + {OUT=>"cdc76e5c9914fb9281a1c7e284d73e67f1809a48a497200e046d39ccc7112cd0 f\n"}], + ); + +# Insert the '--text' argument for each test. +my $t; +foreach $t (@Tests) + { + splice @$t, 1, 0, '--text' unless @$t[1] =~ /--check/; + } + +my $save_temps = $ENV{DEBUG}; +my $verbose = $ENV{VERBOSE}; + +my $prog = 'sha256sum'; +my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); +exit $fail; diff --git a/tests/misc/sha384sum b/tests/misc/sha384sum deleted file mode 100755 index 921268b7..00000000 --- a/tests/misc/sha384sum +++ /dev/null @@ -1,55 +0,0 @@ -#!/usr/bin/perl -# Test "sha384sum". - -# Copyright (C) 2005-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 -# 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; - -(my $program_name = $0) =~ s|.*/||; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -my $sha_degenerate = "38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b"; - -my @Tests = - ( - ['s1', {IN=> {f=> ''}}, - {OUT=>"$sha_degenerate f\n"}], - ['s2', {IN=> {f=> 'a'}}, - {OUT=>"54a59b9f22b0b80880d8427e548b7c23abd873486e1f035dce9cd697e85175033caa88e6d57bc35efae0b5afd3145f31 f\n"}], - ['s3', {IN=> {f=> 'abc'}}, - {OUT=>"cb00753f45a35e8bb5a03d699ac65007272c32ab0eded1631a8b605a43ff5bed8086072ba1e7cc2358baeca134c825a7 f\n"}], - ['s4', - {IN=> {f=> 'abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu'}}, - {OUT=>"09330c33f71147e83d192fc782cd1b4753111b173b3b05d22fa08086e3b0f712fcc7c71a557e2db966c3e9fa91746039 f\n"}], - ['s8', {IN=> {f=> 'a' x 1000000}}, - {OUT=>"9d0e1809716474cb086e834e310a4a1ced149e9c00f248527972cec5704c2a5b07b8b3dc38ecc4ebae97ddd87f3d8985 f\n"}], - ); - -# Insert the '--text' argument for each test. -my $t; -foreach $t (@Tests) - { - splice @$t, 1, 0, '--text' unless @$t[1] =~ /--check/; - } - -my $save_temps = $ENV{DEBUG}; -my $verbose = $ENV{VERBOSE}; - -my $prog = 'sha384sum'; -my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); -exit $fail; diff --git a/tests/misc/sha384sum.pl b/tests/misc/sha384sum.pl new file mode 100755 index 00000000..22e95e15 --- /dev/null +++ b/tests/misc/sha384sum.pl @@ -0,0 +1,55 @@ +#!/usr/bin/perl +# Test "sha384sum". + +# Copyright (C) 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 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; + +(my $program_name = $0) =~ s|.*/||; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +my $sha_degenerate = "38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b"; + +my @Tests = + ( + ['s1', {IN=> {f=> ''}}, + {OUT=>"$sha_degenerate f\n"}], + ['s2', {IN=> {f=> 'a'}}, + {OUT=>"54a59b9f22b0b80880d8427e548b7c23abd873486e1f035dce9cd697e85175033caa88e6d57bc35efae0b5afd3145f31 f\n"}], + ['s3', {IN=> {f=> 'abc'}}, + {OUT=>"cb00753f45a35e8bb5a03d699ac65007272c32ab0eded1631a8b605a43ff5bed8086072ba1e7cc2358baeca134c825a7 f\n"}], + ['s4', + {IN=> {f=> 'abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu'}}, + {OUT=>"09330c33f71147e83d192fc782cd1b4753111b173b3b05d22fa08086e3b0f712fcc7c71a557e2db966c3e9fa91746039 f\n"}], + ['s8', {IN=> {f=> 'a' x 1000000}}, + {OUT=>"9d0e1809716474cb086e834e310a4a1ced149e9c00f248527972cec5704c2a5b07b8b3dc38ecc4ebae97ddd87f3d8985 f\n"}], + ); + +# Insert the '--text' argument for each test. +my $t; +foreach $t (@Tests) + { + splice @$t, 1, 0, '--text' unless @$t[1] =~ /--check/; + } + +my $save_temps = $ENV{DEBUG}; +my $verbose = $ENV{VERBOSE}; + +my $prog = 'sha384sum'; +my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); +exit $fail; diff --git a/tests/misc/sha512sum b/tests/misc/sha512sum deleted file mode 100755 index 7fdb396a..00000000 --- a/tests/misc/sha512sum +++ /dev/null @@ -1,55 +0,0 @@ -#!/usr/bin/perl -# Test "sha512sum". - -# Copyright (C) 2005-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 -# 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; - -(my $program_name = $0) =~ s|.*/||; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -my $sha_degenerate = "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e"; - -my @Tests = - ( - ['s1', {IN=> {f=> ''}}, - {OUT=>"$sha_degenerate f\n"}], - ['s2', {IN=> {f=> 'a'}}, - {OUT=>"1f40fc92da241694750979ee6cf582f2d5d7d28e18335de05abc54d0560e0f5302860c652bf08d560252aa5e74210546f369fbbbce8c12cfc7957b2652fe9a75 f\n"}], - ['s3', {IN=> {f=> 'abc'}}, - {OUT=>"ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f f\n"}], - ['s4', - {IN=> {f=> 'abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu'}}, - {OUT=>"8e959b75dae313da8cf4f72814fc143f8f7779c6eb9f7fa17299aeadb6889018501d289e4900f7e4331b99dec4b5433ac7d329eeb6dd26545e96e55b874be909 f\n"}], - ['s8', {IN=> {f=> 'a' x 1000000}}, - {OUT=>"e718483d0ce769644e2e42c7bc15b4638e1f98b13b2044285632a803afa973ebde0ff244877ea60a4cb0432ce577c31beb009c5c2c49aa2e4eadb217ad8cc09b f\n"}], - ); - -# Insert the '--text' argument for each test. -my $t; -foreach $t (@Tests) - { - splice @$t, 1, 0, '--text' unless @$t[1] =~ /--check/; - } - -my $save_temps = $ENV{DEBUG}; -my $verbose = $ENV{VERBOSE}; - -my $prog = 'sha512sum'; -my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); -exit $fail; diff --git a/tests/misc/sha512sum.pl b/tests/misc/sha512sum.pl new file mode 100755 index 00000000..5e121339 --- /dev/null +++ b/tests/misc/sha512sum.pl @@ -0,0 +1,55 @@ +#!/usr/bin/perl +# Test "sha512sum". + +# Copyright (C) 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 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; + +(my $program_name = $0) =~ s|.*/||; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +my $sha_degenerate = "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e"; + +my @Tests = + ( + ['s1', {IN=> {f=> ''}}, + {OUT=>"$sha_degenerate f\n"}], + ['s2', {IN=> {f=> 'a'}}, + {OUT=>"1f40fc92da241694750979ee6cf582f2d5d7d28e18335de05abc54d0560e0f5302860c652bf08d560252aa5e74210546f369fbbbce8c12cfc7957b2652fe9a75 f\n"}], + ['s3', {IN=> {f=> 'abc'}}, + {OUT=>"ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f f\n"}], + ['s4', + {IN=> {f=> 'abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu'}}, + {OUT=>"8e959b75dae313da8cf4f72814fc143f8f7779c6eb9f7fa17299aeadb6889018501d289e4900f7e4331b99dec4b5433ac7d329eeb6dd26545e96e55b874be909 f\n"}], + ['s8', {IN=> {f=> 'a' x 1000000}}, + {OUT=>"e718483d0ce769644e2e42c7bc15b4638e1f98b13b2044285632a803afa973ebde0ff244877ea60a4cb0432ce577c31beb009c5c2c49aa2e4eadb217ad8cc09b f\n"}], + ); + +# Insert the '--text' argument for each test. +my $t; +foreach $t (@Tests) + { + splice @$t, 1, 0, '--text' unless @$t[1] =~ /--check/; + } + +my $save_temps = $ENV{DEBUG}; +my $verbose = $ENV{VERBOSE}; + +my $prog = 'sha512sum'; +my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); +exit $fail; diff --git a/tests/misc/shred-exact b/tests/misc/shred-exact deleted file mode 100755 index 22d14c30..00000000 --- a/tests/misc/shred-exact +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# make sure that neither --exact nor --zero gobbles a command line argument - -# Copyright (C) 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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ shred - - -for opt in --exact --zero; do - echo a > a || fail=1 - echo bb > b || fail=1 - echo ccc > c || fail=1 - - shred --remove $opt a b || fail=1 - test -f a && fail=1 - test -f b && fail=1 - - shred --remove $opt c || fail=1 - test -f c && fail=1 -done - -Exit $fail diff --git a/tests/misc/shred-exact.sh b/tests/misc/shred-exact.sh new file mode 100755 index 00000000..0cdc91fc --- /dev/null +++ b/tests/misc/shred-exact.sh @@ -0,0 +1,36 @@ +#!/bin/sh +# make sure that neither --exact nor --zero gobbles a command line argument + +# Copyright (C) 2000-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ shred + + +for opt in --exact --zero; do + echo a > a || fail=1 + echo bb > b || fail=1 + echo ccc > c || fail=1 + + shred --remove $opt a b || fail=1 + test -f a && fail=1 + test -f b && fail=1 + + shred --remove $opt c || fail=1 + test -f c && fail=1 +done + +Exit $fail diff --git a/tests/misc/shred-passes b/tests/misc/shred-passes deleted file mode 100755 index 4ff80d74..00000000 --- a/tests/misc/shred-passes +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -# Verify the operations done by shred - -# Copyright (C) 2009-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ shred - - -# shred a single letter, zero length file which should result in -# 3 random passes and a single rename. -touch f || framework_failure_ -echo "\ -shred: f: pass 1/3 (random)... -shred: f: pass 2/3 (random)... -shred: f: pass 3/3 (random)... -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-passes.sh b/tests/misc/shred-passes.sh new file mode 100755 index 00000000..cfdd68e9 --- /dev/null +++ b/tests/misc/shred-passes.sh @@ -0,0 +1,39 @@ +#!/bin/sh +# Verify the operations done by shred + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ shred + + +# shred a single letter, zero length file which should result in +# 3 random passes and a single rename. +touch f || framework_failure_ +echo "\ +shred: f: pass 1/3 (random)... +shred: f: pass 2/3 (random)... +shred: f: pass 3/3 (random)... +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 b/tests/misc/shred-remove deleted file mode 100755 index c060a21c..00000000 --- a/tests/misc/shred-remove +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# Exercise a bug that was fixed in shred-4.0l - -# Copyright (C) 1999-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 -# 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=.}/init.sh"; path_prepend_ ../src -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 -# 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 || : - -Exit $fail diff --git a/tests/misc/shred-remove.sh b/tests/misc/shred-remove.sh new file mode 100755 index 00000000..891dc2d2 --- /dev/null +++ b/tests/misc/shred-remove.sh @@ -0,0 +1,36 @@ +#!/bin/sh +# Exercise a bug that was fixed in shred-4.0l + +# Copyright (C) 1999-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +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 +# 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 || : + +Exit $fail diff --git a/tests/misc/shuf b/tests/misc/shuf deleted file mode 100755 index 243c0498..00000000 --- a/tests/misc/shuf +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/sh -# Ensure that shuf randomizes its input. - -# Copyright (C) 2006-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ shuf -getlimits_ - -seq 100 > in || framework_failure_ - -shuf in >out || fail=1 - -# Fail if the input is the same as the output. -# This is a probabilistic test :-) -# However, the odds of failure are very low: 1 in 100! (~ 1 in 10^158) -compare in out > /dev/null && { fail=1; echo "not random?" 1>&2; } - -# Fail if the sorted output is not the same as the input. -sort -n out > out1 -compare in out1 || { fail=1; echo "not a permutation" 1>&2; } - -# Exercise shuf's -i option. -shuf -i 1-100 > out || fail=1 -compare in out > /dev/null && { fail=1; echo "not random?" 1>&2; } -sort -n out > out1 -compare in out1 || { fail=1; echo "not a permutation" 1>&2; } - -# Exercise shuf's -e option. -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; } - -# Before coreutils-6.3, this would infloop. -# "seq 1860" produces 8193 (8K + 1) bytes of output. -seq 1860 | shuf > /dev/null || fail=1 - -# coreutils-6.12 and earlier would output a newline terminator, not \0. -shuf --zero-terminated -i 1-1 > out || fail=1 -printf '1\0' > exp || framework_failure_ -cmp out exp || { fail=1; echo "missing NUL terminator?" 1>&2; } - -# Ensure shuf -n operates efficiently for small n. Before coreutils-8.13 -# this would try to allocate $SIZE_MAX * sizeof(size_t) -timeout 10 shuf -i1-$SIZE_MAX -n2 >/dev/null || - { fail=1; echo "couldn't get a small subset" >&2; } - -Exit $fail diff --git a/tests/misc/shuf.sh b/tests/misc/shuf.sh new file mode 100755 index 00000000..9c9526d4 --- /dev/null +++ b/tests/misc/shuf.sh @@ -0,0 +1,60 @@ +#!/bin/sh +# Ensure that shuf randomizes its input. + +# Copyright (C) 2006-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ shuf +getlimits_ + +seq 100 > in || framework_failure_ + +shuf in >out || fail=1 + +# Fail if the input is the same as the output. +# This is a probabilistic test :-) +# However, the odds of failure are very low: 1 in 100! (~ 1 in 10^158) +compare in out > /dev/null && { fail=1; echo "not random?" 1>&2; } + +# Fail if the sorted output is not the same as the input. +sort -n out > out1 +compare in out1 || { fail=1; echo "not a permutation" 1>&2; } + +# Exercise shuf's -i option. +shuf -i 1-100 > out || fail=1 +compare in out > /dev/null && { fail=1; echo "not random?" 1>&2; } +sort -n out > out1 +compare in out1 || { fail=1; echo "not a permutation" 1>&2; } + +# Exercise shuf's -e option. +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; } + +# Before coreutils-6.3, this would infloop. +# "seq 1860" produces 8193 (8K + 1) bytes of output. +seq 1860 | shuf > /dev/null || fail=1 + +# coreutils-6.12 and earlier would output a newline terminator, not \0. +shuf --zero-terminated -i 1-1 > out || fail=1 +printf '1\0' > exp || framework_failure_ +cmp out exp || { fail=1; echo "missing NUL terminator?" 1>&2; } + +# Ensure shuf -n operates efficiently for small n. Before coreutils-8.13 +# this would try to allocate $SIZE_MAX * sizeof(size_t) +timeout 10 shuf -i1-$SIZE_MAX -n2 >/dev/null || + { fail=1; echo "couldn't get a small subset" >&2; } + +Exit $fail diff --git a/tests/misc/sort b/tests/misc/sort deleted file mode 100755 index 5be00a01..00000000 --- a/tests/misc/sort +++ /dev/null @@ -1,417 +0,0 @@ -#!/usr/bin/perl - -# Copyright (C) 2008-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 -# 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; - -my $limits = getlimits (); - -my $prog = 'sort'; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -my $mb_locale = $ENV{LOCALE_FR_UTF8}; -! defined $mb_locale || $mb_locale eq 'none' - and $mb_locale = 'C'; - -# Since each test is run with a file name and with redirected stdin, -# the name in the diagnostic is either the file name or "-". -# Normalize each diagnostic to use '-'. -my $normalize_filename = {ERR_SUBST => 's/^$prog: .*?:/$prog: -:/'}; - -my $no_file = "$prog: open failed: no-file: No such file or directory\n"; - -my @Tests = -( -["n1", '-n', {IN=>".01\n0\n"}, {OUT=>"0\n.01\n"}], -["n2", '-n', {IN=>".02\n.01\n"}, {OUT=>".01\n.02\n"}], -["n3", '-n', {IN=>".02\n.00\n"}, {OUT=>".00\n.02\n"}], -["n4", '-n', {IN=>".02\n.000\n"}, {OUT=>".000\n.02\n"}], -["n5", '-n', {IN=>".021\n.029\n"}, {OUT=>".021\n.029\n"}], - -["n6", '-n', {IN=>".02\n.0*\n"}, {OUT=>".0*\n.02\n"}], -["n7", '-n', {IN=>".02\n.*\n"}, {OUT=>".*\n.02\n"}], -["n8a", '-s -n -k1,1', {IN=>".0a\n.0b\n"}, {OUT=>".0a\n.0b\n"}], -["n8b", '-s -n -k1,1', {IN=>".0b\n.0a\n"}, {OUT=>".0b\n.0a\n"}], -["n9a", '-s -n -k1,1', {IN=>".000a\n.000b\n"}, {OUT=>".000a\n.000b\n"}], -["n9b", '-s -n -k1,1', {IN=>".000b\n.000a\n"}, {OUT=>".000b\n.000a\n"}], -["n10a", '-s -n -k1,1', {IN=>".00a\n.000b\n"}, {OUT=>".00a\n.000b\n"}], -["n10b", '-s -n -k1,1', {IN=>".00b\n.000a\n"}, {OUT=>".00b\n.000a\n"}], -["n11a", '-s -n -k1,1', {IN=>".01a\n.010\n"}, {OUT=>".01a\n.010\n"}], -["n11b", '-s -n -k1,1', {IN=>".010\n.01a\n"}, {OUT=>".010\n.01a\n"}], - -# human readable suffixes -["h1", '-h', - {IN=>"1Y\n1Z\n1E\n1P\n1T\n1G\n1M\n1K\n02\n1\nY\n-1k\n-1M\n-1G\n-1T\n" - . "-1P\n-1E\n-1Z\n-1Y\n"}, - {OUT=>"-1Y\n-1Z\n-1E\n-1P\n-1T\n-1G\n-1M\n-1k\nY\n1\n02\n1K\n1M\n1G\n1T\n" - . "1P\n1E\n1Z\n1Y\n"}], -["h2", '-h', {IN=>"1M\n-2G\n-3K"}, {OUT=>"-2G\n-3K\n1M\n"}], -# check that it works with powers of 1024 -["h3", '-k 2,2h -k 1,1', {IN=>"a 1G\nb 1023M\n"}, {OUT=>"b 1023M\na 1G\n"}], -# decimal at end => allowed -["h4", '-h', {IN=>"1.E\n2.M\n"}, {OUT=>"2.M\n1.E\n"}], -# double decimal => ignore suffix -["h5", '-h', {IN=>"1..2E\n2..2M\n"}, {OUT=>"1..2E\n2..2M\n"}], -# "M" sorts before "G" regardless of the positive number attached. -["h6", '-h', {IN=>"1GiB\n1030MiB\n"}, {OUT=>"1030MiB\n1GiB\n"}], -# check option incompatibility -["h7", '-hn', {IN=>""}, {OUT=>""}, {EXIT=>2}, - {ERR=>"$prog: options '-hn' are incompatible\n"}], -# check key processing -["h8", '-n -k2,2h', {IN=>"1 1E\n2 2M\n"}, {OUT=>"2 2M\n1 1E\n"}], -# SI and IEC prefixes on separate keys allowed -["h9", '-h -k1,1 -k2,2', {IN=>"1M 1Mi\n1M 1Mi\n"}, {OUT=>"1M 1Mi\n1M 1Mi\n"}], -# This invalid SI and IEC prefix mixture is not significant so not noticed -["h10", '-h -k1,1 -k2,2', {IN=>"1M 2M\n2M 1Mi\n"}, {OUT=>"1M 2M\n2M 1Mi\n"}], - -["01a", '', {IN=>"A\nB\nC\n"}, {OUT=>"A\nB\nC\n"}], -# -["02a", '-c', {IN=>"A\nB\nC\n"}, {OUT=>''}], -["02b", '-c', {IN=>"A\nC\nB\n"}, {OUT=>''}, {EXIT=>1}, - {ERR=>"$prog: -:3: disorder: B\n"}, $normalize_filename], -["02c", '-c -k1,1', {IN=>"a\na b\n"}, {OUT=>''}], -["02d", '-C', {IN=>"A\nB\nC\n"}, {OUT=>''}], -["02e", '-C', {IN=>"A\nC\nB\n"}, {OUT=>''}, {EXIT=>1}], -# This should fail because there are duplicate keys -["02m", '-cu', {IN=>"A\nA\n"}, {OUT=>''}, {EXIT=>1}, - {ERR=>"$prog: -:2: disorder: A\n"}, $normalize_filename], -["02n", '-cu', {IN=>"A\nB\n"}, {OUT=>''}], -["02o", '-cu', {IN=>"A\nB\nB\n"}, {OUT=>''}, {EXIT=>1}, - {ERR=>"$prog: -:3: disorder: B\n"}, $normalize_filename], -["02p", '-cu', {IN=>"B\nA\nB\n"}, {OUT=>''}, {EXIT=>1}, - {ERR=>"$prog: -:2: disorder: A\n"}, $normalize_filename], -["02q", '-c -k 1,1fR', {IN=>"ABC\nABc\nAbC\nAbc\naBC\naBc\nabC\nabc\n"}], -["02r", '-c -k 1,1fV', {IN=>"ABC\nABc\nAbC\nAbc\naBC\naBc\nabC\nabc\n"}], -["02s", '-c -k 1,1dfR', - {IN=>".ABC\n.ABc.\nA.bC\nA.bc.\naB.C\naB.c.\nabC.\nabc..\n"}], -# -["03a", '-k1', {IN=>"B\nA\n"}, {OUT=>"A\nB\n"}], -["03b", '-k1,1', {IN=>"B\nA\n"}, {OUT=>"A\nB\n"}], -["03c", '-k1 -k2', {IN=>"A b\nA a\n"}, {OUT=>"A a\nA b\n"}], -# Fail with a diagnostic when -k specifies field == 0. -["03d", '-k0', {EXIT=>2}, - {ERR=>"$prog: -: invalid field specification '0'\n"}, - $normalize_filename], -# Fail with a diagnostic when -k specifies character == 0. -["03e", '-k1.0', {EXIT=>2}, - {ERR=>"$prog: character offset is zero: invalid field specification '1.0'\n"}], -["03f", '-k1.1,-k0', {EXIT=>2}, - {ERR=>"$prog: invalid number after ',': invalid count at start of '-k0'\n"}], -# This is ok. -["03g", '-k1.1,1.0', {IN=>''}], -# This is equivalent to 3f. -["03h", '-k1.1,1', {IN=>''}], -# This too, is equivalent to 3f. -["03i", '-k1,1', {IN=>''}], -# -["04a", '-nc', {IN=>"2\n11\n"}], -["04b", '-n', {IN=>"11\n2\n"}, {OUT=>"2\n11\n"}], -["04c", '-k1n', {IN=>"11\n2\n"}, {OUT=>"2\n11\n"}], -["04d", '-k1', {IN=>"11\n2\n"}, {OUT=>"11\n2\n"}], -["04e", '-k2', {IN=>"ignored B\nz-ig A\n"}, {OUT=>"z-ig A\nignored B\n"}], -# -["05a", '-k1,2', {IN=>"A B\nA A\n"}, {OUT=>"A A\nA B\n"}], -["05b", '-k1,2', {IN=>"A B A\nA A Z\n"}, {OUT=>"A A Z\nA B A\n"}], -["05c", '-k1 -k2', {IN=>"A B A\nA A Z\n"}, {OUT=>"A A Z\nA B A\n"}], -["05d", '-k2,2', {IN=>"A B A\nA A Z\n"}, {OUT=>"A A Z\nA B A\n"}], -["05e", '-k2,2', {IN=>"A B Z\nA A A\n"}, {OUT=>"A A A\nA B Z\n"}], -["05f", '-k2,2', {IN=>"A B A\nA A Z\n"}, {OUT=>"A A Z\nA B A\n"}], -# -["06a", '-k 1,2', {IN=>"A B\nA A\n"}, {OUT=>"A A\nA B\n"}], -["06b", '-k 1,2', {IN=>"A B A\nA A Z\n"}, {OUT=>"A A Z\nA B A\n"}], -["06c", '-k 1 -k 2', {IN=>"A B A\nA A Z\n"}, {OUT=>"A A Z\nA B A\n"}], -["06d", '-k 2,2', {IN=>"A B A\nA A Z\n"}, {OUT=>"A A Z\nA B A\n"}], -["06e", '-k 2,2', {IN=>"A B Z\nA A A\n"}, {OUT=>"A A A\nA B Z\n"}], -["06f", '-k 2,2', {IN=>"A B A\nA A Z\n"}, {OUT=>"A A Z\nA B A\n"}], -# -["07a", '-k 2,3', {IN=>"9 a b\n7 a a\n"}, {OUT=>"7 a a\n9 a b\n"}], -["07b", '-k 2,3', {IN=>"a a b\nz a a\n"}, {OUT=>"z a a\na a b\n"}], -["07c", '-k 2,3', {IN=>"y k b\nz k a\n"}, {OUT=>"z k a\ny k b\n"}], -["07d", '+1 -3', {IN=>"y k b\nz k a\n"}, {OUT=>"z k a\ny k b\n"}], -# ensure a character position of 0 includes whole field -["07e", '-k 2,3.0', {IN=>"a a b\nz a a\n"}, {OUT=>"z a a\na a b\n"}], -# ensure fields with end position before start are ignored -["07f", '-n -k1.3,1.1', {IN=>"a 2\nb 1\n"}, {OUT=>"a 2\nb 1\n"}], -["07g", '-n -k2.2,1.2', {IN=>"aa 2\nbb 1\n"}, {OUT=>"aa 2\nbb 1\n"}], -["07h", '-k1.3nb,1.3', {IN=>" a 2\n b 1\n"}, {OUT=>" a 2\n b 1\n"}], -# ensure obsolescent key limits are handled correctly -["07i", '-s +0 -1', {IN=>"a c\na b\n"}, {OUT=>"a c\na b\n"}], -["07j", '-s +0 -1.0', {IN=>"a c\na b\n"}, {OUT=>"a c\na b\n"}], -["07k", '-s +0 -1.1', {IN=>"a c\na b\n"}, {OUT=>"a c\na b\n"}], -["07l", '-s +0 -1.2', {IN=>"a c\na b\n"}, {OUT=>"a b\na c\n"}], -["07m", '-s +0 -1.1b', {IN=>"a c\na b\n"}, {OUT=>"a b\na c\n"}], -# -# report an error for '.' without following char spec -["08a", '-k 2.,3', {EXIT=>2}, - {ERR=>"$prog: invalid number after '.': invalid count at start of ',3'\n"}], -# report an error for ',' without following POS2 -["08b", '-k 2,', {EXIT=>2}, - {ERR=>"$prog: invalid number after ',': invalid count at start of ''\n"}], -# -# Test new -g option. -["09a", '-g', {IN=>"1e2\n2e1\n"}, {OUT=>"2e1\n1e2\n"}], -# Make sure -n works how we expect. -["09b", '-n', {IN=>"1e2\n2e1\n"}, {OUT=>"1e2\n2e1\n"}], -["09c", '-n', {IN=>"2e1\n1e2\n"}, {OUT=>"1e2\n2e1\n"}], -["09d", '-k2g', {IN=>"a 1e2\nb 2e1\n"}, {OUT=>"b 2e1\na 1e2\n"}], -# -# Bug reported by Roger Peel <R.Peel@ee.surrey.ac.uk> -["10a", '-t : -k 2.2,2.2', {IN=>":ba\n:ab\n"}, {OUT=>":ba\n:ab\n"}], -# Equivalent to above, but using obsolescent '+pos -pos' option syntax. -["10b", '-t : +1.1 -1.2', {IN=>":ba\n:ab\n"}, {OUT=>":ba\n:ab\n"}], -# -# The same as the preceding two, but with input lines reversed. -["10c", '-t : -k 2.2,2.2', {IN=>":ab\n:ba\n"}, {OUT=>":ba\n:ab\n"}], -# Equivalent to above, but using obsolescent '+pos -pos' option syntax. -["10d", '-t : +1.1 -1.2', {IN=>":ab\n:ba\n"}, {OUT=>":ba\n:ab\n"}], -# Try without -t... -# But note that we have to count the delimiting space at the beginning -# of each field that has it. -["10a0", '-k 2.3,2.3', {IN=>"z ba\nz ab\n"}, {OUT=>"z ba\nz ab\n"}], -["10a1", '-k 1.2,1.2', {IN=>"ba\nab\n"}, {OUT=>"ba\nab\n"}], -["10a2", '-b -k 2.2,2.2', {IN=>"z ba\nz ab\n"}, {OUT=>"z ba\nz ab\n"}], -# -# An even simpler example demonstrating the bug. -["10e", '-k 1.2,1.2', {IN=>"ab\nba\n"}, {OUT=>"ba\nab\n"}], -# -# The way sort works on these inputs (10f and 10g) seems wrong to me. -# See http://git.sv.gnu.org/gitweb/?p=coreutils.git;a=commitdiff;h=3c467c0d223 -# POSIX doesn't seem to say one way or the other, but that's the way all -# other sort implementations work. -["10f", '-t : -k 1.3,1.3', {IN=>":ab\n:ba\n"}, {OUT=>":ba\n:ab\n"}], -["10g", '-k 1.4,1.4', {IN=>"a ab\nb ba\n"}, {OUT=>"b ba\na ab\n"}], -# -# Exercise bug re using -b to skip trailing blanks. -["11a", '-t: -k1,1b -k2,2', {IN=>"a\t:a\na :b\n"}, {OUT=>"a\t:a\na :b\n"}], -["11b", '-t: -k1,1b -k2,2', {IN=>"a :b\na\t:a\n"}, {OUT=>"a\t:a\na :b\n"}], -["11c", '-t: -k2,2b -k3,3', {IN=>"z:a\t:a\na :b\n"}, {OUT=>"z:a\t:a\na :b\n"}], -# Before 1.22m, the first key comparison reported equality. -# With 1.22m, they compare different: "a" sorts before "a\n", -# and the second key spec isn't even used. -["11d", '-t: -k2,2b -k3,3', {IN=>"z:a :b\na\t:a\n"}, {OUT=>"a\t:a\nz:a :b\n"}], -# -# Exercise bug re comparing '-' and integers. -["12a", '-n -t: +1', {IN=>"a:1\nb:-\n"}, {OUT=>"b:-\na:1\n"}], -["12b", '-n -t: +1', {IN=>"b:-\na:1\n"}, {OUT=>"b:-\na:1\n"}], -# Try some other (e.g. 'X') invalid character. -["12c", '-n -t: +1', {IN=>"a:1\nb:X\n"}, {OUT=>"b:X\na:1\n"}], -["12d", '-n -t: +1', {IN=>"b:X\na:1\n"}, {OUT=>"b:X\na:1\n"}], -# From Karl Heuer -["13a", '+0.1n', {IN=>"axx\nb-1\n"}, {OUT=>"b-1\naxx\n"}], -["13b", '+0.1n', {IN=>"b-1\naxx\n"}, {OUT=>"b-1\naxx\n"}], -# -# From Carl Johnson <carlj@cjlinux.home.org> -["14a", '-d -u', {IN=>"mal\nmal-\nmala\n"}, {OUT=>"mal\nmala\n"}], -# Be sure to fix the (translate && ignore) case in keycompare. -["14b", '-f -d -u', {IN=>"mal\nmal-\nmala\n"}, {OUT=>"mal\nmala\n"}], -# -# Experiment with -i. -["15a", '-i -u', {IN=>"a\na\1\n"}, {OUT=>"a\n"}], -["15b", '-i -u', {IN=>"a\n\1a\n"}, {OUT=>"a\n"}], -["15c", '-i -u', {IN=>"a\1\na\n"}, {OUT=>"a\1\n"}], -["15d", '-i -u', {IN=>"\1a\na\n"}, {OUT=>"\1a\n"}], -["15e", '-i -u', {IN=>"a\n\1\1\1\1\1a\1\1\1\1\n"}, {OUT=>"a\n"}], - -# From Erick Branderhorst -- fixed around 1.19e -["16a", '-f', - {IN=>"éminence\nüberhaupt\n's-Gravenhage\naëroclub\nAag\naagtappels\n"}, - {OUT=>"'s-Gravenhage\nAag\naagtappels\naëroclub\néminence\nüberhaupt\n"}], - -# This provokes a one-byte memory overrun of a malloc'd block for versions -# of sort from textutils-1.19p and before. -["17", '-c', {IN=>"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\n"}], - -# POSIX says -n no longer implies -b, so here we're comparing ' 9' and '10'. -["18a", '-k1.1,1.2n', {IN=>" 901\n100\n"}, {OUT=>" 901\n100\n"}], - -# Just like above, because the global '-b' has no effect on the -# key specifier when a key-specific option ('n' in this case) is used. -["18b", '-b -k1.1,1.2n', {IN=>" 901\n100\n"}, {OUT=>" 901\n100\n"}], - -# Here we're comparing ' 90' and '10', because the 'b' on the key-end specifier -# makes sort ignore leading blanks when determining that key's *end*. -["18c", '-k1.1,1.2nb', {IN=>" 901\n100\n"}, {OUT=>"100\n 901\n"}], - -# Here we're comparing '9' and '10', because the 'b' on the key-start specifier -# makes sort ignore leading blanks when determining that key's *start*. -["18d", '-k1.1b,1.2n', {IN=>" 901\n100\n"}, {OUT=>" 901\n100\n"}], - -# This compares '90' and '10', as it ignores leading blanks for both -# key start and key end. -["18e", '-nb -k1.1,1.2', {IN=>" 901\n100\n"}, {OUT=>"100\n 901\n"}], - -# When ignoring leading blanks for end position, ensure blanks from -# next field are not included in the sort. I.E. order should not change here. -["18f", '-k1,1b', {IN=>"a y\na z\n"}, {OUT=>"a y\na z\n"}], - -# When ignoring leading blanks for start position, ensure blanks from -# next field are not included in the sort. I.E. order should not change here. -# This was noticed as an issue on fedora 8 (only in multibyte locales). -["18g", '-k1b,1', {IN=>"a y\na z\n"}, {OUT=>"a y\na z\n"}, - {ENV => "LC_ALL=$mb_locale"}], - -# This looks odd, but works properly -- 2nd keyspec is never -# used because all lines are different. -["19a", '+0 +1nr', {IN=>"b 2\nb 1\nb 3\n"}, {OUT=>"b 1\nb 2\nb 3\n"}], - -# The test *intended* by the author of the above, but using the -# more-intuitive POSIX-style -k options. -["19b", '-k1,1 -k2nr', {IN=>"b 2\nb 1\nb 3\n"}, {OUT=>"b 3\nb 2\nb 1\n"}], - -# This test failed when sort-1.22 was compiled on a Next x86 system -# without optimization. Without optimization gcc uses the buggy version -# of memcmp in the Next C library. With optimization, gcc uses its -# (working) builtin version. Test case form William Lewis. -["20a", '', - {IN=>"_________U__free\n_________U__malloc\n_________U__abort\n" - . "_________U__memcpy\n_________U__memset\n" - . "_________U_dyld_stub_binding_helper\n_________U__malloc\n" - . "_________U___iob\n_________U__abort\n_________U__fprintf\n"}, - {OUT=>"_________U___iob\n_________U__abort\n_________U__abort\n" - . "_________U__fprintf\n_________U__free\n_________U__malloc\n" - . "_________U__malloc\n_________U__memcpy\n_________U__memset\n" - . "_________U_dyld_stub_binding_helper\n"}], - -# Demonstrate that folding changes the ordering of e.g. A, a, and _ -# because while they normally (in the C locale) collate like A, _, a, -# when using -f, 'a' is compared as if it were 'A'. -["21a", '', {IN=>"A\na\n_\n"}, {OUT=>"A\n_\na\n"}], -["21b", '-f', {IN=>"A\na\n_\n"}, {OUT=>"A\na\n_\n"}], -["21c", '-f', {IN=>"a\nA\n_\n"}, {OUT=>"A\na\n_\n"}], -["21d", '-f', {IN=>"_\na\nA\n"}, {OUT=>"A\na\n_\n"}], -["21e", '-f', {IN=>"a\n_\nA\n"}, {OUT=>"A\na\n_\n"}], -["21f", '-fs', {IN=>"A\na\n_\n"}, {OUT=>"A\na\n_\n"}], -["21g", '-fu', {IN=>"a\n_\n"}, {OUT=>"a\n_\n"}], - -# This test failed until 1.22f. From Zvi Har'El. -["22a", '-k 2,2fd -k 1,1r', {IN=>"3 b\n4 B\n"}, {OUT=>"4 B\n3 b\n"}], -["22b", '-k 2,2d -k 1,1r', {IN=>"3 b\n4 b\n"}, {OUT=>"4 b\n3 b\n"}], - -["no-file1", 'no-file', {EXIT=>2}, {ERR=>$no_file}], -# This test failed until 1.22f. Sort didn't give an error. -# From Will Edgington. -["o-no-file1", qw(-o no-file no-file), {EXIT=>2}, {ERR=>$no_file}], - -["create-empty", qw(-o no/such/file /dev/null), {EXIT=>2}, - {ERR=>"$prog: open failed: no/such/file: No such file or directory\n"}], - -# From Paul Eggert. This was fixed in textutils-1.22k. -["neg-nls", '-n', {IN=>"-1\n-9\n"}, {OUT=>"-9\n-1\n"}], - -# From Paul Eggert. This was fixed in textutils-1.22m. -# The bug was visible only when using the internationalized sorting code -# (i.e., not when configured with --disable-nls). -["nul-nls", '', {IN=>"\0b\n\0a\n"}, {OUT=>"\0a\n\0b\n"}], - -# Paul Eggert wrote: -# A previous version of POSIX incorrectly required that the newline -# at the end of the input line contributed to the sort, which would -# mean that an empty line should sort after a line starting with a tab -# (because \t precedes \n in the ASCII collating sequence). -# GNU 'sort' was altered to do this, but was changed back once it -# was discovered to be a POSIX bug (and the POSIX bug was fixed). -# Check that 'sort' conforms to the fixed POSIX, not to the buggy one. -["use-nl", '', {IN=>"\n\t\n"}, {OUT=>"\n\t\n"}], - -# Specifying two -o options should evoke a failure -["o2", qw(-o x -o y), {EXIT=>2}, - {ERR=>"foo\n"}, {ERR_SUBST => 's/^$prog: .*/foo/'}], - -# Specifying incompatible options should evoke a failure. -["incompat1", '-in', {EXIT=>2}, - {ERR=>"$prog: options '-in' are incompatible\n"}], -["incompat2", '-nR', {EXIT=>2}, - {ERR=>"$prog: options '-nR' are incompatible\n"}], -["incompat3", '-dfgiMnR', {EXIT=>2}, - {ERR=>"$prog: options '-dfgMnR' are incompatible\n"}], -["incompat4", qw(-c -o /dev/null), {EXIT=>2}, - {ERR=>"$prog: options '-co' are incompatible\n"}], -["incompat5", qw(-C -o /dev/null), {EXIT=>2}, - {ERR=>"$prog: options '-Co' are incompatible\n"}], -["incompat6", '-cC', {EXIT=>2}, - {ERR=>"$prog: options '-cC' are incompatible\n"}], -["incompat7", qw(--sort=random -n), {EXIT=>2}, - {ERR=>"$prog: options '-nR' are incompatible\n"}], - -# -t '\0' is accepted, as of coreutils-5.0.91 -['nul-tab', "-k2,2 -t '\\0'", - {IN=>"a\0z\01\nb\0y\02\n"}, {OUT=>"b\0y\02\na\0z\01\n"}], - -# fields > SIZE_MAX are silently interpreted as SIZE_MAX -["bigfield1", "-k $limits->{UINTMAX_OFLOW}", - {IN=>"2\n1\n"}, {OUT=>"1\n2\n"}], -["bigfield2", "-k $limits->{SIZE_OFLOW}", - {IN=>"2\n1\n"}, {OUT=>"1\n2\n"}], - -# Using an old-style key-specifying option like +1 with an invalid -# ordering-option character would cause sort to try to free an invalid -# (non-malloc'd) pointer. This bug affects coreutils-6.5 through 6.9. -['obs-inval', '+1x', {EXIT=>2}, - {ERR=>"foo\n"}, {ERR_SUBST => 's/^$prog: .*/foo/'}], - -# Exercise the code that enlarges the line buffer. See the thread here: -# http://thread.gmane.org/gmane.comp.gnu.coreutils.bugs/11006 -['realloc-buf', '-S1', {IN=>'a'x4000 ."\n"}, {OUT=>'a'x4000 ."\n"}], -['realloc-buf-2', '-S1', {IN=>'a'x5 ."\n"}, {OUT=>'a'x5 ."\n"}], - -["sort-numeric", '--sort=numeric', {IN=>".01\n0\n"}, {OUT=>"0\n.01\n"}], -["sort-gennum", '--sort=general-numeric', - {IN=>"1e2\n2e1\n"}, {OUT=>"2e1\n1e2\n"}], - -# -m with output file also used as an input file -# In coreutils-7.2, this caused a segfault. -# This test looks a little strange. Here's why: -# since we're using "-o f", standard output will be empty, hence OUT=>'' -# We still want to ensure that the output file, "f" has expected contents, -# hence the added CMP=> directive. -["output-is-input", '-m -o f', {IN=> {f=> "a\n"}}, {OUT=>''}, - {CMP=> ["a\n", {'f'=> undef}]} ], -["output-is-input-2", '-m -o f', {OUT=>''}, - {IN=> {f=> "a\n"}}, {IN=> {g=> "b\n"}}, {IN=> {h=> "c\n"}}, - {CMP=> ["a\nb\nc\n", {'f'=> undef}]} ], -["output-is-input-3", '-m -o f', {OUT=>''}, - {IN=> {g=> "a\n"}}, {IN=> {h=> "b\n"}}, {IN=> {f=> "c\n"}}, - {CMP=> ["a\nb\nc\n", {'f'=> undef}]} ], -); - -# Add _POSIX2_VERSION=199209 to the environment of each test -# that uses an old-style option like +1. -foreach my $t (@Tests) - { - foreach my $e (@$t) - { - !ref $e && $e =~ /\+\d/ - and push (@$t, {ENV=>'_POSIX2_VERSION=199209'}), last; - } - } - -@Tests = triple_test \@Tests; - -# Remember that triple_test creates from each test with exactly one "IN" -# file two more tests (.p and .r suffix on name) corresponding to reading -# input from a file and from a pipe. The pipe-reading test would fail -# due to a race condition about 1 in 20 times. -# Remove the IN_PIPE version of the "output-is-input" test above. -# The others aren't susceptible because they have three inputs each. -@Tests = grep {$_->[0] ne 'output-is-input.p'} @Tests; - -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/sort-NaN-infloop b/tests/misc/sort-NaN-infloop deleted file mode 100755 index e64d3859..00000000 --- a/tests/misc/sort-NaN-infloop +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# exercise the NaN-infloop bug in coreutils-8.13 - -# Copyright (C) 2011-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ sort - -echo nan > F || fail=1 -printf 'nan\nnan\n' > exp || fail=1 -timeout 10 sort -g -m F F > out || fail=1 - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/misc/sort-NaN-infloop.sh b/tests/misc/sort-NaN-infloop.sh new file mode 100755 index 00000000..2ec13ee0 --- /dev/null +++ b/tests/misc/sort-NaN-infloop.sh @@ -0,0 +1,28 @@ +#!/bin/sh +# exercise the NaN-infloop bug in coreutils-8.13 + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ sort + +echo nan > F || fail=1 +printf 'nan\nnan\n' > exp || fail=1 +timeout 10 sort -g -m F F > out || fail=1 + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/misc/sort-benchmark-random b/tests/misc/sort-benchmark-random deleted file mode 100755 index 9eb9a63f..00000000 --- a/tests/misc/sort-benchmark-random +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh -# Benchmark sort on randomly generated data. - -# Copyright (C) 2010-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 -# 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 Glen Lenker. - -. "${srcdir=.}/init.sh"; path_prepend_ ../src -print_ver_ sort - -very_expensive_ - -perl -e ' -my $num_lines = 500000; -my $length = 100; - -for (my $i=0; $i < $num_lines; $i++) -{ - for (my $j=0; $j < $length; $j++) - { - printf "%c", 32 + rand(94); - } - print "\n"; -}' > in || framework_failure_ - -# We need to generate a lot of data for sort to show a noticeable -# improvement in performance. Sorting it in PERL may take awhile. - -perl -e ' -open (FILE, "<in"); -my @list = <FILE>; -print sort(@list); -close (FILE); -' > exp || framework_failure_ - -time sort in > out || fail=1 - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/misc/sort-benchmark-random.sh b/tests/misc/sort-benchmark-random.sh new file mode 100755 index 00000000..04f2af99 --- /dev/null +++ b/tests/misc/sort-benchmark-random.sh @@ -0,0 +1,53 @@ +#!/bin/sh +# Benchmark sort on randomly generated data. + +# Copyright (C) 2010-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 Glen Lenker. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ sort + +very_expensive_ + +perl -e ' +my $num_lines = 500000; +my $length = 100; + +for (my $i=0; $i < $num_lines; $i++) +{ + for (my $j=0; $j < $length; $j++) + { + printf "%c", 32 + rand(94); + } + print "\n"; +}' > in || framework_failure_ + +# We need to generate a lot of data for sort to show a noticeable +# improvement in performance. Sorting it in PERL may take awhile. + +perl -e ' +open (FILE, "<in"); +my @list = <FILE>; +print sort(@list); +close (FILE); +' > exp || framework_failure_ + +time sort in > out || fail=1 + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/misc/sort-compress b/tests/misc/sort-compress deleted file mode 100755 index 00dcf06a..00000000 --- a/tests/misc/sort-compress +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/sh -# Test use of compression by sort - -# Copyright (C) 2007-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ sort - -seq -w 2000 > exp || framework_failure_ -tac exp > in || framework_failure_ - -# This should force the use of temp files -sort -S 1k in > out || fail=1 -compare exp out || fail=1 - -# Create our own gzip program that will be used as the default -cat <<\EOF > gzip || fail=1 -#!/bin/sh -tr 41 14 -touch ok -EOF - -chmod +x gzip - -# Ensure 'sort' is immune to parent's SIGCHLD handler -# 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 - - # This should force the use of child processes for "compression" - PATH=.:$PATH exec sort -S 1k --compress-program=gzip in > /dev/null -) || fail=1 - -# This will find our new gzip in PATH -PATH=.:$PATH sort -S 1k --compress-program=gzip in > out || fail=1 -compare exp out || fail=1 -test -f ok || fail=1 -rm -f ok - -# This is to make sure it works with no compression. -PATH=.:$PATH sort -S 1k in > out || fail=1 -compare exp out || fail=1 -test -f ok && fail=1 - -# This is to make sure we can use something other than gzip -mv gzip dzip || fail=1 -sort --compress-program=./dzip -S 1k in > out || fail=1 -compare exp out || fail=1 -test -f ok || fail=1 -rm -f ok - -# Make sure it can find other programs in PATH correctly -PATH=.:$PATH sort --compress-program=dzip -S 1k in > out || fail=1 -compare exp out || fail=1 -test -f ok || fail=1 -rm -f dzip ok - -Exit $fail diff --git a/tests/misc/sort-compress-hang b/tests/misc/sort-compress-hang deleted file mode 100755 index e1b8ff0f..00000000 --- a/tests/misc/sort-compress-hang +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh -# Test for sort --compress hang - -# Copyright (C) 2010-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ sort -very_expensive_ - -cat <<\EOF >compress || framework_failure_ -#!/bin/sh -tr 41 14 || exit -touch ok -EOF - -chmod +x compress - -seq -w 200000 > exp || fail=1 -tac exp > in || fail=1 - -# When the bug occurs, 'sort' hangs forever. When it doesn't occur, -# 'sort' could be running slowly on an overburdened machine. -# On a circa-2010 Linux server using NFS, a successful test completes -# in about 170 seconds, so specify 1700 seconds as a safety margin. -timeout 1700 sort --compress-program=./compress -S 1k in > out || fail=1 - -compare exp out || fail=1 -test -f ok || fail=1 -rm -f compress ok - -# If $TMPDIR is relative, give subprocesses time to react when 'sort' exits. -# Otherwise, under NFS, when 'sort' unlinks the temp files and they -# are renamed to .nfsXXXX instead of being removed, the parent cleanup -# of this directory will fail because the files are still open. -case $TMPDIR in -/*) ;; -*) sleep 1;; -esac - -Exit $fail diff --git a/tests/misc/sort-compress-hang.sh b/tests/misc/sort-compress-hang.sh new file mode 100755 index 00000000..1b1f3a9c --- /dev/null +++ b/tests/misc/sort-compress-hang.sh @@ -0,0 +1,53 @@ +#!/bin/sh +# Test for sort --compress hang + +# Copyright (C) 2010-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ sort +very_expensive_ + +cat <<\EOF >compress || framework_failure_ +#!/bin/sh +tr 41 14 || exit +touch ok +EOF + +chmod +x compress + +seq -w 200000 > exp || fail=1 +tac exp > in || fail=1 + +# When the bug occurs, 'sort' hangs forever. When it doesn't occur, +# 'sort' could be running slowly on an overburdened machine. +# On a circa-2010 Linux server using NFS, a successful test completes +# in about 170 seconds, so specify 1700 seconds as a safety margin. +timeout 1700 sort --compress-program=./compress -S 1k in > out || fail=1 + +compare exp out || fail=1 +test -f ok || fail=1 +rm -f compress ok + +# If $TMPDIR is relative, give subprocesses time to react when 'sort' exits. +# Otherwise, under NFS, when 'sort' unlinks the temp files and they +# are renamed to .nfsXXXX instead of being removed, the parent cleanup +# of this directory will fail because the files are still open. +case $TMPDIR in +/*) ;; +*) sleep 1;; +esac + +Exit $fail diff --git a/tests/misc/sort-compress-proc b/tests/misc/sort-compress-proc deleted file mode 100755 index 7ee0fd1f..00000000 --- a/tests/misc/sort-compress-proc +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/sh -# Test use of compression subprocesses by sort - -# Copyright (C) 2010-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ sort -expensive_ - -seq -w 2000 > exp || fail=1 -tac exp > in || fail=1 -insize=$(stat -c %s - <in) || fail=1 - -# This compressor's behavior is adjustable via environment variables. -export PRE_COMPRESS= -export POST_COMPRESS= -cat <<\EOF >compress || framework_failure_ -#!/bin/sh -eval "$PRE_COMPRESS" -tr 41 14 || exit -eval "$POST_COMPRESS" -EOF - -chmod +x compress - -# "Impatient exit" tests -# -# In these test cases, the biggest compressor (or decompressor) exits -# with nonzero status, after sleeping a bit. Until coreutils 8.7 -# 'sort' impatiently exited without waiting for its decompression -# subprocesses in these cases. Check compression too, while we're here. -# -for compress_arg in '' '-d' -do - POST_COMPRESS=' - test "X$1" != "X'$compress_arg'" || { - test "X$1" = "X" && exec <&1 - size=$(stat -c %s -) - exec >/dev/null 2>&1 <&1 || exit - expr $size "<" '"$insize"' / 2 || { sleep 1; exit 1; } - } - ' sort --compress-program=./compress -S 1k --batch-size=2 in > out && fail=1 -done - -# "Pre-exec child" test -# -# Ignore a random child process created before 'sort' was exec'ed. -# This bug was also present in coreutils 8.7. -# -( (sleep 1; exec false) & - PRE_COMPRESS='test -f ok || sleep 2' - POST_COMPRESS='touch ok' - exec sort --compress-program=./compress -S 1k in >out -) || fail=1 -compare exp out || fail=1 -test -f ok || fail=1 -rm -f ok - -rm -f compress - -# If $TMPDIR is relative, give subprocesses time to react when 'sort' exits. -# Otherwise, under NFS, when 'sort' unlinks the temp files and they -# are renamed to .nfsXXXX instead of being removed, the parent cleanup -# of this directory will fail because the files are still open. -case $TMPDIR in -/*) ;; -*) sleep 1;; -esac - -Exit $fail diff --git a/tests/misc/sort-compress-proc.sh b/tests/misc/sort-compress-proc.sh new file mode 100755 index 00000000..3888fdb6 --- /dev/null +++ b/tests/misc/sort-compress-proc.sh @@ -0,0 +1,83 @@ +#!/bin/sh +# Test use of compression subprocesses by sort + +# Copyright (C) 2010-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ sort +expensive_ + +seq -w 2000 > exp || fail=1 +tac exp > in || fail=1 +insize=$(stat -c %s - <in) || fail=1 + +# This compressor's behavior is adjustable via environment variables. +export PRE_COMPRESS= +export POST_COMPRESS= +cat <<\EOF >compress || framework_failure_ +#!/bin/sh +eval "$PRE_COMPRESS" +tr 41 14 || exit +eval "$POST_COMPRESS" +EOF + +chmod +x compress + +# "Impatient exit" tests +# +# In these test cases, the biggest compressor (or decompressor) exits +# with nonzero status, after sleeping a bit. Until coreutils 8.7 +# 'sort' impatiently exited without waiting for its decompression +# subprocesses in these cases. Check compression too, while we're here. +# +for compress_arg in '' '-d' +do + POST_COMPRESS=' + test "X$1" != "X'$compress_arg'" || { + test "X$1" = "X" && exec <&1 + size=$(stat -c %s -) + exec >/dev/null 2>&1 <&1 || exit + expr $size "<" '"$insize"' / 2 || { sleep 1; exit 1; } + } + ' sort --compress-program=./compress -S 1k --batch-size=2 in > out && fail=1 +done + +# "Pre-exec child" test +# +# Ignore a random child process created before 'sort' was exec'ed. +# This bug was also present in coreutils 8.7. +# +( (sleep 1; exec false) & + PRE_COMPRESS='test -f ok || sleep 2' + POST_COMPRESS='touch ok' + exec sort --compress-program=./compress -S 1k in >out +) || fail=1 +compare exp out || fail=1 +test -f ok || fail=1 +rm -f ok + +rm -f compress + +# If $TMPDIR is relative, give subprocesses time to react when 'sort' exits. +# Otherwise, under NFS, when 'sort' unlinks the temp files and they +# are renamed to .nfsXXXX instead of being removed, the parent cleanup +# of this directory will fail because the files are still open. +case $TMPDIR in +/*) ;; +*) sleep 1;; +esac + +Exit $fail diff --git a/tests/misc/sort-compress.sh b/tests/misc/sort-compress.sh new file mode 100755 index 00000000..c7587c43 --- /dev/null +++ b/tests/misc/sort-compress.sh @@ -0,0 +1,72 @@ +#!/bin/sh +# Test use of compression by sort + +# Copyright (C) 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ sort + +seq -w 2000 > exp || framework_failure_ +tac exp > in || framework_failure_ + +# This should force the use of temp files +sort -S 1k in > out || fail=1 +compare exp out || fail=1 + +# Create our own gzip program that will be used as the default +cat <<\EOF > gzip || fail=1 +#!/bin/sh +tr 41 14 +touch ok +EOF + +chmod +x gzip + +# Ensure 'sort' is immune to parent's SIGCHLD handler +# 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 + + # This should force the use of child processes for "compression" + PATH=.:$PATH exec sort -S 1k --compress-program=gzip in > /dev/null +) || fail=1 + +# This will find our new gzip in PATH +PATH=.:$PATH sort -S 1k --compress-program=gzip in > out || fail=1 +compare exp out || fail=1 +test -f ok || fail=1 +rm -f ok + +# This is to make sure it works with no compression. +PATH=.:$PATH sort -S 1k in > out || fail=1 +compare exp out || fail=1 +test -f ok && fail=1 + +# This is to make sure we can use something other than gzip +mv gzip dzip || fail=1 +sort --compress-program=./dzip -S 1k in > out || fail=1 +compare exp out || fail=1 +test -f ok || fail=1 +rm -f ok + +# Make sure it can find other programs in PATH correctly +PATH=.:$PATH sort --compress-program=dzip -S 1k in > out || fail=1 +compare exp out || fail=1 +test -f ok || fail=1 +rm -f dzip ok + +Exit $fail diff --git a/tests/misc/sort-continue b/tests/misc/sort-continue deleted file mode 100755 index 1491dbf6..00000000 --- a/tests/misc/sort-continue +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh -# Tests for file descriptor exhaustion. - -# Copyright (C) 2009-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ sort - -# Skip the test when running under valgrind. -( ulimit -n 6; sort 3<&- 4<&- 5<&- < /dev/null ) \ - || skip_ 'fd-limited sort failed; are you running under valgrind?' - -for i in $(seq 31); do - echo $i | tee -a in > __test.$i || framework_failure_ -done - -# glob before ulimit to avoid issues on bash 3.2 on OS X 10.6.8 at least -test_files=$(echo __test.*) - -( - ulimit -n 6 - sort -n -m $test_files 3<&- 4<&- 5<&- < /dev/null > out -) && -compare in out || - { fail=1; echo 'file descriptor exhaustion not handled' 1>&2; } - -echo 32 | tee -a in > in1 -( - ulimit -n 6 - sort -n -m $test_files - 3<&- 4<&- 5<&- < in1 > out -) && -compare in out || { fail=1; echo 'stdin not handled properly' 1>&2; } - -Exit $fail diff --git a/tests/misc/sort-continue.sh b/tests/misc/sort-continue.sh new file mode 100755 index 00000000..bd569d0d --- /dev/null +++ b/tests/misc/sort-continue.sh @@ -0,0 +1,47 @@ +#!/bin/sh +# Tests for file descriptor exhaustion. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ sort + +# Skip the test when running under valgrind. +( ulimit -n 6; sort 3<&- 4<&- 5<&- < /dev/null ) \ + || skip_ 'fd-limited sort failed; are you running under valgrind?' + +for i in $(seq 31); do + echo $i | tee -a in > __test.$i || framework_failure_ +done + +# glob before ulimit to avoid issues on bash 3.2 on OS X 10.6.8 at least +test_files=$(echo __test.*) + +( + ulimit -n 6 + sort -n -m $test_files 3<&- 4<&- 5<&- < /dev/null > out +) && +compare in out || + { fail=1; echo 'file descriptor exhaustion not handled' 1>&2; } + +echo 32 | tee -a in > in1 +( + ulimit -n 6 + sort -n -m $test_files - 3<&- 4<&- 5<&- < in1 > out +) && +compare in out || { fail=1; echo 'stdin not handled properly' 1>&2; } + +Exit $fail diff --git a/tests/misc/sort-debug-keys b/tests/misc/sort-debug-keys deleted file mode 100755 index a284e84c..00000000 --- a/tests/misc/sort-debug-keys +++ /dev/null @@ -1,330 +0,0 @@ -#!/bin/sh -# Test annotation of sort keys - -# Copyright (C) 2010-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ sort - -number() { cat -n | sed 's/^ *//'; } - -cat <<\EOF > exp -1 - ^ no match for key - -^ no match for key -44 - ^ no match for key -33 - ^ no match for key -2 - ^ no match for key -1 - ^ no match for key - -^ no match for key -44 - ^ no match for key -33 - ^ no match for key -2 - ^ no match for key - -^ no match for key -1 -_ -2 -_ -33 -__ -44 -__ -2> - ^ no match for key -3>1 - _ -1>2 - _ -1 - ^ no match for key - -^ no match for key -44 - ^ no match for key -33 - ^ no match for key -2 - ^ no match for key -1 - ^ no match for key - -^ no match for key -44 - ^ no match for key -33 - ^ no match for key -2 - ^ no match for key - -^ no match for key -1 -_ -2 -_ -33 -__ -44 -__ -2> - ^ no match for key -3>1 - _ -1>2 - _ -1 - ^ no match for key - -^ no match for key -44 - ^ no match for key -33 - ^ no match for key -2 - ^ no match for key -1 - ^ no match for key - -^ no match for key -44 - ^ no match for key -33 - ^ no match for key -2 - ^ no match for key - -^ no match for key -1 -_ -2 -_ -33 -__ -44 -__ -2> - ^ no match for key -3>1 - _ -1>2 - _ - -^ no match for key -JAN -___ -FEB -___ -FEB - ^ no match for key - -^ no match for key -JAN - ^ no match for key -JAZZ -^ no match for key - -^ no match for key -JAN -___ -FEB -___ -2>JAZZ - ^ no match for key -3> - ^ no match for key -4>JAN - ___ -1>FEB - ___ - -^ no match for key -JANZ -___ -JAN -___ -FEB -___ -3> - ^ no match for key -2>JANZ - ___ -4>JAN - ___ -1>FEB - ___ - 1.2ignore - ___ - 1.1e4ignore - _____ ->>a -___ ->b -__ -a - ^ no match for key - -^ no match for key -a -_ -b -_ --3 -__ --2 -__ --0 -__ ---Mi-1 -^ no match for key --0 -__ -1 -_ - 1 - _ -__ -1 -_ -_ - 1 - _ -1 -_ - 1 -__ -1 -_ -2,5 -_ -2.4 -___ -2.,,3 -__ -2.4 -___ -2,,3 -_ -2.4 -___ -1a -_ -2b -_ ->a - _ -A>chr10 - ^ no match for key -B>chr1 - ^ no match for key -EOF - -( -for type in n h g; do - printf '1\n\n44\n33\n2\n' | sort -s -k2$type --debug - printf '1\n\n44\n33\n2\n' | sort -s -k1.3$type --debug - printf '1\n\n44\n33\n2\n' | sort -s -k1$type --debug - printf '2\n\n1\n' | number | sort -s -k2g --debug -done - -printf 'FEB\n\nJAN\n' | sort -s -k1M --debug -printf 'FEB\n\nJAN\n' | sort -s -k2,2M --debug -printf 'FEB\nJAZZ\n\nJAN\n' | sort -s -k1M --debug -printf 'FEB\nJAZZ\n\nJAN\n' | number | sort -s -k2,2M --debug -printf 'FEB\nJANZ\n\nJAN\n' | sort -s -k1M --debug -printf 'FEB\nJANZ\n\nJAN\n' | number | sort -s -k2,2M --debug - -printf ' 1.2ignore\n 1.1e4ignore\n' | sort -s -g --debug - -printf '\tb\n\t\ta\n' | sort -s -d --debug # ignore = 1 - -printf 'a\n\n' | sort -s -k2,2 --debug #lena = 0 - -printf 'b\na\n' | sort -s -k1 --debug #otherwise key compare - -printf -- '-0\n1\n-2\n--Mi-1\n-3\n-0\n' | sort -s --debug -k1,1h - -printf ' 1\n1\n' | sort -b --debug -printf ' 1\n1\n' | sort -sb --debug -printf ' 1\n1\n' | sort --debug - -# strnumcmp is a bit weird, so we don't match exactly -printf '2,5\n2.4\n' | sort -s -k1n --debug -printf '2.,,3\n2.4\n' | sort -s -k1n --debug -printf '2,,3\n2.4\n' | sort -s -k1n --debug - -# -z means we convert \0 to \n -env printf '1a\x002b\x00' | sort -s -n -z --debug - -# Check that \0 and \t intermix. -printf '\0\ta\n' | sort -s -k2b,2 --debug | tr -d '\0' - -# Check that key end before key start is not underlined -printf 'A\tchr10\nB\tchr1\n' | sort -s -k2.4b,2.3n --debug -) > out - -compare exp out || fail=1 - -cat <<\EOF > exp - 1²---++3 1,234 Mi - _ - _________ -________________________ - 1²---++3 1,234 Mi - _____ - ________ -_______________________ -+1234 1234Gi 1,234M -^ no match for key -_____ -^ no match for key - ____ - ____ - _____ - _____ - _____ - ______ -___________________ -EOF - -unset LC_ALL -f=$LOCALE_FR_UTF8 - -: ${LOCALE_FR_UTF8=none} -if test "$LOCALE_FR_UTF8" != "none"; then - ( - echo ' 1²---++3 1,234 Mi' | - LC_ALL=C sort --debug -k2g -k1b,1 - echo ' 1²---++3 1,234 Mi' | - LC_COLLATE=$f LC_CTYPE=$f LC_NUMERIC=$f LC_MESSAGES=C \ - sort --debug -k2g -k1b,1 - echo '+1234 1234Gi 1,234M' | - LC_COLLATE=$f LC_CTYPE=$f LC_NUMERIC=$f LC_MESSAGES=C \ - sort --debug -k1,1n -k1,1g \ - -k1,1h -k2,2n -k2,2g -k2,2h -k3,3n -k3,3g -k3,3h - ) > out - compare exp out || fail=1 -fi - -Exit $fail diff --git a/tests/misc/sort-debug-keys.sh b/tests/misc/sort-debug-keys.sh new file mode 100755 index 00000000..9d4f8295 --- /dev/null +++ b/tests/misc/sort-debug-keys.sh @@ -0,0 +1,330 @@ +#!/bin/sh +# Test annotation of sort keys + +# Copyright (C) 2010-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ sort + +number() { cat -n | sed 's/^ *//'; } + +cat <<\EOF > exp +1 + ^ no match for key + +^ no match for key +44 + ^ no match for key +33 + ^ no match for key +2 + ^ no match for key +1 + ^ no match for key + +^ no match for key +44 + ^ no match for key +33 + ^ no match for key +2 + ^ no match for key + +^ no match for key +1 +_ +2 +_ +33 +__ +44 +__ +2> + ^ no match for key +3>1 + _ +1>2 + _ +1 + ^ no match for key + +^ no match for key +44 + ^ no match for key +33 + ^ no match for key +2 + ^ no match for key +1 + ^ no match for key + +^ no match for key +44 + ^ no match for key +33 + ^ no match for key +2 + ^ no match for key + +^ no match for key +1 +_ +2 +_ +33 +__ +44 +__ +2> + ^ no match for key +3>1 + _ +1>2 + _ +1 + ^ no match for key + +^ no match for key +44 + ^ no match for key +33 + ^ no match for key +2 + ^ no match for key +1 + ^ no match for key + +^ no match for key +44 + ^ no match for key +33 + ^ no match for key +2 + ^ no match for key + +^ no match for key +1 +_ +2 +_ +33 +__ +44 +__ +2> + ^ no match for key +3>1 + _ +1>2 + _ + +^ no match for key +JAN +___ +FEB +___ +FEB + ^ no match for key + +^ no match for key +JAN + ^ no match for key +JAZZ +^ no match for key + +^ no match for key +JAN +___ +FEB +___ +2>JAZZ + ^ no match for key +3> + ^ no match for key +4>JAN + ___ +1>FEB + ___ + +^ no match for key +JANZ +___ +JAN +___ +FEB +___ +3> + ^ no match for key +2>JANZ + ___ +4>JAN + ___ +1>FEB + ___ + 1.2ignore + ___ + 1.1e4ignore + _____ +>>a +___ +>b +__ +a + ^ no match for key + +^ no match for key +a +_ +b +_ +-3 +__ +-2 +__ +-0 +__ +--Mi-1 +^ no match for key +-0 +__ +1 +_ + 1 + _ +__ +1 +_ +_ + 1 + _ +1 +_ + 1 +__ +1 +_ +2,5 +_ +2.4 +___ +2.,,3 +__ +2.4 +___ +2,,3 +_ +2.4 +___ +1a +_ +2b +_ +>a + _ +A>chr10 + ^ no match for key +B>chr1 + ^ no match for key +EOF + +( +for type in n h g; do + printf '1\n\n44\n33\n2\n' | sort -s -k2$type --debug + printf '1\n\n44\n33\n2\n' | sort -s -k1.3$type --debug + printf '1\n\n44\n33\n2\n' | sort -s -k1$type --debug + printf '2\n\n1\n' | number | sort -s -k2g --debug +done + +printf 'FEB\n\nJAN\n' | sort -s -k1M --debug +printf 'FEB\n\nJAN\n' | sort -s -k2,2M --debug +printf 'FEB\nJAZZ\n\nJAN\n' | sort -s -k1M --debug +printf 'FEB\nJAZZ\n\nJAN\n' | number | sort -s -k2,2M --debug +printf 'FEB\nJANZ\n\nJAN\n' | sort -s -k1M --debug +printf 'FEB\nJANZ\n\nJAN\n' | number | sort -s -k2,2M --debug + +printf ' 1.2ignore\n 1.1e4ignore\n' | sort -s -g --debug + +printf '\tb\n\t\ta\n' | sort -s -d --debug # ignore = 1 + +printf 'a\n\n' | sort -s -k2,2 --debug #lena = 0 + +printf 'b\na\n' | sort -s -k1 --debug #otherwise key compare + +printf -- '-0\n1\n-2\n--Mi-1\n-3\n-0\n' | sort -s --debug -k1,1h + +printf ' 1\n1\n' | sort -b --debug +printf ' 1\n1\n' | sort -sb --debug +printf ' 1\n1\n' | sort --debug + +# strnumcmp is a bit weird, so we don't match exactly +printf '2,5\n2.4\n' | sort -s -k1n --debug +printf '2.,,3\n2.4\n' | sort -s -k1n --debug +printf '2,,3\n2.4\n' | sort -s -k1n --debug + +# -z means we convert \0 to \n +env printf '1a\x002b\x00' | sort -s -n -z --debug + +# Check that \0 and \t intermix. +printf '\0\ta\n' | sort -s -k2b,2 --debug | tr -d '\0' + +# Check that key end before key start is not underlined +printf 'A\tchr10\nB\tchr1\n' | sort -s -k2.4b,2.3n --debug +) > out + +compare exp out || fail=1 + +cat <<\EOF > exp + 1²---++3 1,234 Mi + _ + _________ +________________________ + 1²---++3 1,234 Mi + _____ + ________ +_______________________ ++1234 1234Gi 1,234M +^ no match for key +_____ +^ no match for key + ____ + ____ + _____ + _____ + _____ + ______ +___________________ +EOF + +unset LC_ALL +f=$LOCALE_FR_UTF8 + +: ${LOCALE_FR_UTF8=none} +if test "$LOCALE_FR_UTF8" != "none"; then + ( + echo ' 1²---++3 1,234 Mi' | + LC_ALL=C sort --debug -k2g -k1b,1 + echo ' 1²---++3 1,234 Mi' | + LC_COLLATE=$f LC_CTYPE=$f LC_NUMERIC=$f LC_MESSAGES=C \ + sort --debug -k2g -k1b,1 + echo '+1234 1234Gi 1,234M' | + LC_COLLATE=$f LC_CTYPE=$f LC_NUMERIC=$f LC_MESSAGES=C \ + sort --debug -k1,1n -k1,1g \ + -k1,1h -k2,2n -k2,2g -k2,2h -k3,3n -k3,3g -k3,3h + ) > out + compare exp out || fail=1 +fi + +Exit $fail diff --git a/tests/misc/sort-debug-warn b/tests/misc/sort-debug-warn deleted file mode 100755 index 504a2d2b..00000000 --- a/tests/misc/sort-debug-warn +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/sh -# Test warnings for sort options - -# Copyright (C) 2010-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ sort - -cat <<\EOF > exp -sort: using simple byte comparison -sort: key 1 has zero width and will be ignored -sort: using simple byte comparison -sort: key 1 has zero width and will be ignored -sort: using simple byte comparison -sort: key 1 is numeric and spans multiple fields -sort: using simple byte comparison -sort: options '-bghMRrV' are ignored -sort: using simple byte comparison -sort: options '-bghMRV' are ignored -sort: option '-r' only applies to last-resort comparison -sort: using simple byte comparison -sort: option '-r' only applies to last-resort comparison -sort: using simple byte comparison -sort: options '-bg' are ignored -sort: using simple byte comparison -sort: using simple byte comparison -sort: option '-b' is ignored -sort: using simple byte comparison -sort: using simple byte comparison -sort: using simple byte comparison -sort: leading blanks are significant in key 1; consider also specifying 'b' -sort: using simple byte comparison -sort: leading blanks are significant in key 1; consider also specifying 'b' -sort: option '-d' is ignored -sort: using simple byte comparison -sort: leading blanks are significant in key 1; consider also specifying 'b' -sort: option '-i' is ignored -sort: using simple byte comparison -sort: using simple byte comparison -sort: using simple byte comparison -EOF - -sort -s -k2,1 --debug /dev/null 2>>out -sort -s -k2,1n --debug /dev/null 2>>out -sort -s -k1,2n --debug /dev/null 2>>out -sort -s -rRVMhgb -k1,1n --debug /dev/null 2>>out -sort -rRVMhgb -k1,1n --debug /dev/null 2>>out -sort -r -k1,1n --debug /dev/null 2>>out -sort -gbr -k1,1n -k1,1r --debug /dev/null 2>>out -sort -b -k1b,1bn --debug /dev/null 2>>out # no warning -sort -b -k1,1bn --debug /dev/null 2>>out -sort -b -k1,1bn -k2b,2 --debug /dev/null 2>>out # no warning -sort -r -k1,1r --debug /dev/null 2>>out # no warning for redundant options -sort -i -k1,1i --debug /dev/null 2>>out # no warning -sort -d -k1,1b --debug /dev/null 2>>out -sort -i -k1,1d --debug /dev/null 2>>out -sort -r --debug /dev/null 2>>out #no warning -sort -rM --debug /dev/null 2>>out #no warning -sort -rM -k1,1 --debug /dev/null 2>>out #no warning - -compare exp out || fail=1 - -cat <<\EOF > exp -sort: using simple byte comparison -sort: key 1 is numeric and spans multiple fields -sort: obsolescent key '+2 -1' used; consider '-k 3,1' instead -sort: key 2 has zero width and will be ignored -sort: leading blanks are significant in key 2; consider also specifying 'b' -sort: option '-b' is ignored -sort: option '-r' only applies to last-resort comparison -EOF - -sort --debug -rb -k2n +2.2 -1b /dev/null 2>out - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/misc/sort-debug-warn.sh b/tests/misc/sort-debug-warn.sh new file mode 100755 index 00000000..c9f1b9f3 --- /dev/null +++ b/tests/misc/sort-debug-warn.sh @@ -0,0 +1,90 @@ +#!/bin/sh +# Test warnings for sort options + +# Copyright (C) 2010-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ sort + +cat <<\EOF > exp +sort: using simple byte comparison +sort: key 1 has zero width and will be ignored +sort: using simple byte comparison +sort: key 1 has zero width and will be ignored +sort: using simple byte comparison +sort: key 1 is numeric and spans multiple fields +sort: using simple byte comparison +sort: options '-bghMRrV' are ignored +sort: using simple byte comparison +sort: options '-bghMRV' are ignored +sort: option '-r' only applies to last-resort comparison +sort: using simple byte comparison +sort: option '-r' only applies to last-resort comparison +sort: using simple byte comparison +sort: options '-bg' are ignored +sort: using simple byte comparison +sort: using simple byte comparison +sort: option '-b' is ignored +sort: using simple byte comparison +sort: using simple byte comparison +sort: using simple byte comparison +sort: leading blanks are significant in key 1; consider also specifying 'b' +sort: using simple byte comparison +sort: leading blanks are significant in key 1; consider also specifying 'b' +sort: option '-d' is ignored +sort: using simple byte comparison +sort: leading blanks are significant in key 1; consider also specifying 'b' +sort: option '-i' is ignored +sort: using simple byte comparison +sort: using simple byte comparison +sort: using simple byte comparison +EOF + +sort -s -k2,1 --debug /dev/null 2>>out +sort -s -k2,1n --debug /dev/null 2>>out +sort -s -k1,2n --debug /dev/null 2>>out +sort -s -rRVMhgb -k1,1n --debug /dev/null 2>>out +sort -rRVMhgb -k1,1n --debug /dev/null 2>>out +sort -r -k1,1n --debug /dev/null 2>>out +sort -gbr -k1,1n -k1,1r --debug /dev/null 2>>out +sort -b -k1b,1bn --debug /dev/null 2>>out # no warning +sort -b -k1,1bn --debug /dev/null 2>>out +sort -b -k1,1bn -k2b,2 --debug /dev/null 2>>out # no warning +sort -r -k1,1r --debug /dev/null 2>>out # no warning for redundant options +sort -i -k1,1i --debug /dev/null 2>>out # no warning +sort -d -k1,1b --debug /dev/null 2>>out +sort -i -k1,1d --debug /dev/null 2>>out +sort -r --debug /dev/null 2>>out #no warning +sort -rM --debug /dev/null 2>>out #no warning +sort -rM -k1,1 --debug /dev/null 2>>out #no warning + +compare exp out || fail=1 + +cat <<\EOF > exp +sort: using simple byte comparison +sort: key 1 is numeric and spans multiple fields +sort: obsolescent key '+2 -1' used; consider '-k 3,1' instead +sort: key 2 has zero width and will be ignored +sort: leading blanks are significant in key 2; consider also specifying 'b' +sort: option '-b' is ignored +sort: option '-r' only applies to last-resort comparison +EOF + +sort --debug -rb -k2n +2.2 -1b /dev/null 2>out + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/misc/sort-discrim b/tests/misc/sort-discrim deleted file mode 100755 index fced2049..00000000 --- a/tests/misc/sort-discrim +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/sh -# Test discriminator-based sorting. - -# Copyright (C) 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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ sort - -# Set limit variables. -getlimits_ - -# These tests are designed for a 'sort' implementation that uses a -# discriminator, i.e., a brief summary of a key that may have lost info, -# but whose ordering is consistent with that of the original key. -# The tests are useful even if 'sort' does not use this representation. - -# Test lexicographic sorting. - -# A long-enough string so that it overruns a small discriminator buffer size. -long_prefix='aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' -seq -f "$long_prefix%5.0f" 10000 > exp || fail=1 -sort -R exp | LC_ALL=C sort > out || fail=1 -compare exp out || fail=1 - - -# Test numeric sorting. - -# These tests are designed for an internal representation that ordinarily -# looks at the number plus two decimal digits, but if -h is -# used it looks at one decimal place plus a 4-bit SI prefix value. -# In both cases, there's an extra factor of 2 for the sign. -# Note INTMAX_MAX is used below as that's that largest number -# expr can handle on all systems (without GMP). -max_int100=$(expr $INTMAX_MAX / 100) && -max_frac100=$(printf '%.2d' $(expr $INTMAX_MAX % 100)) && -max_int160=$(expr $INTMAX_MAX / 160) && -max_frac160=$(expr $INTMAX_MAX / 16 % 10) && -{ printf -- "\ - -$UINTMAX_OFLOW - -$UINTMAX_MAX - -${max_int100}0.1 - -${max_int100}0 - -${max_int100}0.0 - -${max_int160}0.1 - -${max_int160}0 - -${max_int160}0.0 - -$max_int100.${max_frac100}1 - -$max_int100.$max_frac100 - -$max_int160.${max_frac160}1 - -$max_int160.$max_frac160 -" && - seq -- -10 .001 10 && - printf "\ - $max_int160 - $max_int160.$max_frac160 - $max_int160.${max_frac160}1 - $max_int100 - $max_int100.$max_frac100 - $max_int100.${max_frac100}1 - ${max_int160}0 - ${max_int160}0.0 - ${max_int160}0.1 - ${max_int100}0 - ${max_int100}0.0 - ${max_int100}0.1 - $UINTMAX_MAX - $UINTMAX_OFLOW -" -} > exp || fail=1 - -for opts in -n -h; do - sort -R exp | LC_ALL=C sort $opts > out || fail=1 - compare exp out || fail=1 -done - -Exit $fail diff --git a/tests/misc/sort-discrim.sh b/tests/misc/sort-discrim.sh new file mode 100755 index 00000000..0dac3a9d --- /dev/null +++ b/tests/misc/sort-discrim.sh @@ -0,0 +1,89 @@ +#!/bin/sh +# Test discriminator-based sorting. + +# Copyright (C) 2012-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ sort + +# Set limit variables. +getlimits_ + +# These tests are designed for a 'sort' implementation that uses a +# discriminator, i.e., a brief summary of a key that may have lost info, +# but whose ordering is consistent with that of the original key. +# The tests are useful even if 'sort' does not use this representation. + +# Test lexicographic sorting. + +# A long-enough string so that it overruns a small discriminator buffer size. +long_prefix='aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +seq -f "$long_prefix%5.0f" 10000 > exp || fail=1 +sort -R exp | LC_ALL=C sort > out || fail=1 +compare exp out || fail=1 + + +# Test numeric sorting. + +# These tests are designed for an internal representation that ordinarily +# looks at the number plus two decimal digits, but if -h is +# used it looks at one decimal place plus a 4-bit SI prefix value. +# In both cases, there's an extra factor of 2 for the sign. +# Note INTMAX_MAX is used below as that's that largest number +# expr can handle on all systems (without GMP). +max_int100=$(expr $INTMAX_MAX / 100) && +max_frac100=$(printf '%.2d' $(expr $INTMAX_MAX % 100)) && +max_int160=$(expr $INTMAX_MAX / 160) && +max_frac160=$(expr $INTMAX_MAX / 16 % 10) && +{ printf -- "\ + -$UINTMAX_OFLOW + -$UINTMAX_MAX + -${max_int100}0.1 + -${max_int100}0 + -${max_int100}0.0 + -${max_int160}0.1 + -${max_int160}0 + -${max_int160}0.0 + -$max_int100.${max_frac100}1 + -$max_int100.$max_frac100 + -$max_int160.${max_frac160}1 + -$max_int160.$max_frac160 +" && + seq -- -10 .001 10 && + printf "\ + $max_int160 + $max_int160.$max_frac160 + $max_int160.${max_frac160}1 + $max_int100 + $max_int100.$max_frac100 + $max_int100.${max_frac100}1 + ${max_int160}0 + ${max_int160}0.0 + ${max_int160}0.1 + ${max_int100}0 + ${max_int100}0.0 + ${max_int100}0.1 + $UINTMAX_MAX + $UINTMAX_OFLOW +" +} > exp || fail=1 + +for opts in -n -h; do + sort -R exp | LC_ALL=C sort $opts > out || fail=1 + compare exp out || fail=1 +done + +Exit $fail diff --git a/tests/misc/sort-exit-early.sh b/tests/misc/sort-exit-early.sh new file mode 100755 index 00000000..83a55f51 --- /dev/null +++ b/tests/misc/sort-exit-early.sh @@ -0,0 +1,37 @@ +#!/bin/sh +# Test 'sort' exits early on inaccessible inputs or output + +# Copyright (C) 2012-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ sort +skip_if_root_ + +# Check output is writable before starting to sort +touch input +chmod a-w input +timeout 10 sort -o input && fail=1 +test $? = 124 && fail=1 + +# Check all inputs are readable before starting to sort +# Also ensure the output isn't created in this case +touch output +chmod a-r output +timeout 10 sort -o typo - output && fail=1 +test $? = 124 && fail=1 +test -e typo && fail=1 + +Exit $fail diff --git a/tests/misc/sort-files0-from b/tests/misc/sort-files0-from deleted file mode 100755 index 6aa10acc..00000000 --- a/tests/misc/sort-files0-from +++ /dev/null @@ -1,96 +0,0 @@ -#!/usr/bin/perl -# Exercise sort's --files0-from option. -# FIXME: keep this file in sync with tests/du/files0-from. - -# Copyright (C) 2006-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 -# 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; - -(my $program_name = $0) =~ s|.*/||; - -my $prog = 'sort'; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -my @Tests = - ( - # invalid extra command line argument - ['f-extra-arg', '--files0-from=- no-such', {IN=>"a"}, {EXIT=>2}, - {ERR => "$prog: extra operand 'no-such'\n" - . "file operands cannot be combined with --files0-from\n" - . "Try '$prog --help' for more information.\n"} - ], - - # missing input file - ['missing', '--files0-from=missing', {EXIT=>2}, - {ERR => "$prog: cannot open 'missing' for reading: " - . "No such file or directory\n"}], - - # input file name of '-' - ['minus-in-stdin', '--files0-from=-', '<', {IN=>{f=>'-'}}, {EXIT=>2}, - {ERR => "$prog: when reading file names from stdin, no file name of" - . " '-' allowed\n"}], - - # empty input, regular file - ['empty', '--files0-from=@AUX@', {AUX=>''}, {EXIT=>2}, - {ERR_SUBST => 's/no input from.+$//'}, {ERR => "$prog: \n"}], - - # empty input, from non-regular file - ['empty-nonreg', '--files0-from=/dev/null', {EXIT=>2}, - {ERR => "$prog: no input from '/dev/null'\n"}], - - # one NUL - ['nul-1', '--files0-from=-', '<', {IN=>"\0"}, {EXIT=>2}, - {ERR => "$prog: -:1: invalid zero-length file name\n"}], - - # two NULs - # Note that the behavior here differs from 'wc' in that the - # first zero-length file name is treated as fatal, so there - # is only one line of diagnostic output. - ['nul-2', '--files0-from=-', '<', {IN=>"\0\0"}, {EXIT=>2}, - {ERR => "$prog: -:1: invalid zero-length file name\n"}], - - # one file name, no NUL - ['1', '--files0-from=-', '<', - {IN=>{f=>"g"}}, {AUX=>{g=>'a'}}, {OUT=>"a\n"} ], - - # one file name, with NUL - ['1a', '--files0-from=-', '<', - {IN=>{f=>"g\0"}}, {AUX=>{g=>'a'}}, {OUT=>"a\n"} ], - - # two file names, no final NUL - ['2', '--files0-from=-', '<', - {IN=>{f=>"g\0g"}}, {AUX=>{g=>'a'}}, {OUT=>"a\na\n"} ], - - # two file names, with final NUL - ['2a', '--files0-from=-', '<', - {IN=>{f=>"g\0g\0"}}, {AUX=>{g=>'a'}}, {OUT=>"a\na\n"} ], - - # Ensure that $prog does nothing when there is a zero-length filename. - # Note that the behavior here differs from 'wc' in that the - # first zero-length file name is treated as fatal, so there - # should be no output on STDOUT. - ['zero-len', '--files0-from=-', '<', - {IN=>{f=>"\0g\0"}}, {AUX=>{g=>''}}, - {ERR => "$prog: -:1: invalid zero-length file name\n"}, {EXIT=>2} ], - ); - -my $save_temps = $ENV{DEBUG}; -my $verbose = $ENV{VERBOSE}; - -my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); -exit $fail; diff --git a/tests/misc/sort-files0-from.pl b/tests/misc/sort-files0-from.pl new file mode 100755 index 00000000..d843b646 --- /dev/null +++ b/tests/misc/sort-files0-from.pl @@ -0,0 +1,96 @@ +#!/usr/bin/perl +# 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. + +# This 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; + +(my $program_name = $0) =~ s|.*/||; + +my $prog = 'sort'; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +my @Tests = + ( + # invalid extra command line argument + ['f-extra-arg', '--files0-from=- no-such', {IN=>"a"}, {EXIT=>2}, + {ERR => "$prog: extra operand 'no-such'\n" + . "file operands cannot be combined with --files0-from\n" + . "Try '$prog --help' for more information.\n"} + ], + + # missing input file + ['missing', '--files0-from=missing', {EXIT=>2}, + {ERR => "$prog: cannot open 'missing' for reading: " + . "No such file or directory\n"}], + + # input file name of '-' + ['minus-in-stdin', '--files0-from=-', '<', {IN=>{f=>'-'}}, {EXIT=>2}, + {ERR => "$prog: when reading file names from stdin, no file name of" + . " '-' allowed\n"}], + + # empty input, regular file + ['empty', '--files0-from=@AUX@', {AUX=>''}, {EXIT=>2}, + {ERR_SUBST => 's/no input from.+$//'}, {ERR => "$prog: \n"}], + + # empty input, from non-regular file + ['empty-nonreg', '--files0-from=/dev/null', {EXIT=>2}, + {ERR => "$prog: no input from '/dev/null'\n"}], + + # one NUL + ['nul-1', '--files0-from=-', '<', {IN=>"\0"}, {EXIT=>2}, + {ERR => "$prog: -:1: invalid zero-length file name\n"}], + + # two NULs + # Note that the behavior here differs from 'wc' in that the + # first zero-length file name is treated as fatal, so there + # is only one line of diagnostic output. + ['nul-2', '--files0-from=-', '<', {IN=>"\0\0"}, {EXIT=>2}, + {ERR => "$prog: -:1: invalid zero-length file name\n"}], + + # one file name, no NUL + ['1', '--files0-from=-', '<', + {IN=>{f=>"g"}}, {AUX=>{g=>'a'}}, {OUT=>"a\n"} ], + + # one file name, with NUL + ['1a', '--files0-from=-', '<', + {IN=>{f=>"g\0"}}, {AUX=>{g=>'a'}}, {OUT=>"a\n"} ], + + # two file names, no final NUL + ['2', '--files0-from=-', '<', + {IN=>{f=>"g\0g"}}, {AUX=>{g=>'a'}}, {OUT=>"a\na\n"} ], + + # two file names, with final NUL + ['2a', '--files0-from=-', '<', + {IN=>{f=>"g\0g\0"}}, {AUX=>{g=>'a'}}, {OUT=>"a\na\n"} ], + + # Ensure that $prog does nothing when there is a zero-length filename. + # Note that the behavior here differs from 'wc' in that the + # first zero-length file name is treated as fatal, so there + # should be no output on STDOUT. + ['zero-len', '--files0-from=-', '<', + {IN=>{f=>"\0g\0"}}, {AUX=>{g=>''}}, + {ERR => "$prog: -:1: invalid zero-length file name\n"}, {EXIT=>2} ], + ); + +my $save_temps = $ENV{DEBUG}; +my $verbose = $ENV{VERBOSE}; + +my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); +exit $fail; diff --git a/tests/misc/sort-float b/tests/misc/sort-float deleted file mode 100755 index b585b9bf..00000000 --- a/tests/misc/sort-float +++ /dev/null @@ -1,94 +0,0 @@ -#!/bin/sh -# Ensure sort -g sorts floating point limits correctly - -# Copyright (C) 2010-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ sort - -# Return 0 if LDBL_MIN is smaller than DBL_MIN, else 1. -# Dissect numbers like these, comparing first exponent, then -# whole part of mantissa, then fraction, until finding enough -# of a difference to determine the relative order of the numbers. -# These are "reversed": -# $ ./getlimits |grep DBL_MIN -# DBL_MIN=2.225074e-308 -# LDBL_MIN=2.004168e-292 -# -# These are in the expected order: -# $ ./getlimits|grep DBL_MIN -# DBL_MIN=2.225074e-308 -# LDBL_MIN=3.362103e-4932 - -dbl_minima_order() -{ - LC_ALL=C getlimits_ - set -- $(echo $LDBL_MIN | tr .e- ' ') - local ldbl_whole=$1 ldbl_frac=$2 ldbl_exp=$3 - - set -- $(echo $DBL_MIN |tr .e- ' ') - local dbl_whole=$1 dbl_frac=$2 dbl_exp=$3 - - test "$dbl_exp" -lt "$ldbl_exp" && return 0 - test "$ldbl_exp" -lt "$dbl_exp" && return 1 - test "$ldbl_whole" -lt "$dbl_whole" && return 0 - test "$dbl_whole" -lt "$ldbl_whole" && return 1 - test "$ldbl_frac" -le "$dbl_frac" && return 0 - return 1 -} - -# On some systems, DBL_MIN < LDBL_MIN. Detect that. -dbl_minima_order; reversed=$? - -for LOC in C $LOCALE_FR; do - - LC_ALL=$LOC getlimits_ - - # See if sort should be using long doubles - grep '^#define HAVE_C99_STRTOLD 1' $CONFIG_HEADER > /dev/null || - { LDBL_MAX="$DBL_MAX"; LDBL_MIN="$DBL_MIN"; } - - # If DBL_MIN happens to be smaller than LDBL_MIN, swap them, - # so that out expected output is sorted. - if test $reversed = 1; then - t=$LDBL_MIN - LDBL_MIN=$DBL_MIN - DBL_MIN=$t - fi - - printf -- "\ --$LDBL_MAX --$DBL_MAX --$FLT_MAX --$FLT_MIN --$DBL_MIN --$LDBL_MIN -0 -$LDBL_MIN -$DBL_MIN -$FLT_MIN -$FLT_MAX -$DBL_MAX -$LDBL_MAX -" | - grep '^[0-9.,e+-]*$' > exp # restrict to numeric just in case - - tac exp | LC_ALL=$LOC sort -sg > out || fail=1 - - compare exp out || fail=1 -done - -Exit $fail diff --git a/tests/misc/sort-float.sh b/tests/misc/sort-float.sh new file mode 100755 index 00000000..dd3c079c --- /dev/null +++ b/tests/misc/sort-float.sh @@ -0,0 +1,94 @@ +#!/bin/sh +# Ensure sort -g sorts floating point limits correctly + +# Copyright (C) 2010-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ sort + +# Return 0 if LDBL_MIN is smaller than DBL_MIN, else 1. +# Dissect numbers like these, comparing first exponent, then +# whole part of mantissa, then fraction, until finding enough +# of a difference to determine the relative order of the numbers. +# These are "reversed": +# $ ./getlimits |grep DBL_MIN +# DBL_MIN=2.225074e-308 +# LDBL_MIN=2.004168e-292 +# +# These are in the expected order: +# $ ./getlimits|grep DBL_MIN +# DBL_MIN=2.225074e-308 +# LDBL_MIN=3.362103e-4932 + +dbl_minima_order() +{ + LC_ALL=C getlimits_ + set -- $(echo $LDBL_MIN | tr .e- ' ') + local ldbl_whole=$1 ldbl_frac=$2 ldbl_exp=$3 + + set -- $(echo $DBL_MIN |tr .e- ' ') + local dbl_whole=$1 dbl_frac=$2 dbl_exp=$3 + + test "$dbl_exp" -lt "$ldbl_exp" && return 0 + test "$ldbl_exp" -lt "$dbl_exp" && return 1 + test "$ldbl_whole" -lt "$dbl_whole" && return 0 + test "$dbl_whole" -lt "$ldbl_whole" && return 1 + test "$ldbl_frac" -le "$dbl_frac" && return 0 + return 1 +} + +# On some systems, DBL_MIN < LDBL_MIN. Detect that. +dbl_minima_order; reversed=$? + +for LOC in C $LOCALE_FR; do + + LC_ALL=$LOC getlimits_ + + # See if sort should be using long doubles + grep '^#define HAVE_C99_STRTOLD 1' $CONFIG_HEADER > /dev/null || + { LDBL_MAX="$DBL_MAX"; LDBL_MIN="$DBL_MIN"; } + + # If DBL_MIN happens to be smaller than LDBL_MIN, swap them, + # so that out expected output is sorted. + if test $reversed = 1; then + t=$LDBL_MIN + LDBL_MIN=$DBL_MIN + DBL_MIN=$t + fi + + printf -- "\ +-$LDBL_MAX +-$DBL_MAX +-$FLT_MAX +-$FLT_MIN +-$DBL_MIN +-$LDBL_MIN +0 +$LDBL_MIN +$DBL_MIN +$FLT_MIN +$FLT_MAX +$DBL_MAX +$LDBL_MAX +" | + grep '^[0-9.,e+-]*$' > exp # restrict to numeric just in case + + tac exp | LC_ALL=$LOC sort -sg > out || fail=1 + + compare exp out || fail=1 +done + +Exit $fail diff --git a/tests/misc/sort-merge b/tests/misc/sort-merge deleted file mode 100755 index 7a56dc12..00000000 --- a/tests/misc/sort-merge +++ /dev/null @@ -1,84 +0,0 @@ -#!/usr/bin/perl -# Test "sort -m". - -# Copyright (C) 2002-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 -# 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; - -my $limits = getlimits (); - -(my $program_name = $0) =~ s|.*/||; -my $prog = 'sort'; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -# three empty files and one that says 'foo' -my @inputs = (+(map{{IN=> {"empty$_"=> ''}}}1..3), {IN=> {foo=> "foo\n"}}); - -my $big_input = "aaa\n" x 1024; - -# don't need to check for existence, since we're running in a temp dir -my $badtmp = 'does/not/exist'; - -my $bigint = $limits->{UINTMAX_OFLOW}; - -my @Tests = - ( - ['m1', '-m', @inputs, {OUT=>"foo\n"}], - - # check validation of --batch-size option - ['nmerge-0', "-m --batch-size=0", @inputs, - {ERR=>"$prog: invalid --batch-size argument '0'\n". - "$prog: minimum --batch-size argument is '2'\n"}, {EXIT=>2}], - - ['nmerge-1', "-m --batch-size=1", @inputs, - {ERR=>"$prog: invalid --batch-size argument '1'\n". - "$prog: minimum --batch-size argument is '2'\n"}, {EXIT=>2}], - - ['nmerge-neg', "-m --batch-size=-1", @inputs, - {ERR=>"$prog: invalid --batch-size argument '-1'\n"}, {EXIT=>2}], - - ['nmerge-nan', "-m --batch-size=a", @inputs, - {ERR=>"$prog: invalid --batch-size argument 'a'\n"}, {EXIT=>2}], - - ['nmerge-big', "-m --batch-size=$bigint", @inputs, - {ERR_SUBST=>'s/(current rlimit is) \d+/$1/'}, - {ERR=>"$prog: --batch-size argument '$bigint' too large\n". - "$prog: maximum --batch-size argument with current rlimit is\n"}, - {EXIT=>2}], - - # This should work since nmerge >= the number of input files - ['nmerge-yes', "-m --batch-size=4 -T$badtmp", @inputs, {OUT=>"foo\n"}], - - # this should fail since nmerge < # of input files, so - # temp files are needed - ['nmerge-no', "-m --batch-size=2 -T$badtmp", @inputs, - {ERR_SUBST=>"s|': .*|':|"}, - {ERR=>"$prog: cannot create temporary file in '$badtmp':\n"}, - {EXIT=>2}], - - # This used to fail because setting batch-size without also setting - # buffer size would cause the buffer size to be set to the minimum. - ['batch-size', "--batch-size=16 -T$badtmp", {IN=> {big=> $big_input}}, - {OUT=>$big_input}], - ); - -my $save_temps = $ENV{DEBUG}; -my $verbose = $ENV{VERBOSE}; - -my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); -exit $fail; diff --git a/tests/misc/sort-merge-fdlimit b/tests/misc/sort-merge-fdlimit deleted file mode 100755 index 7ce109c1..00000000 --- a/tests/misc/sort-merge-fdlimit +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/sh -# Test whether sort avoids opening more file descriptors than it is -# allowed when merging files. - -# Copyright (C) 2009-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ sort -require_ulimit_ - -mkdir in err || framework_failure_ - - -for i in $(seq 17); do - echo $i >in/$i -done -seq 17 >some-data - -# When these tests are run inside the automated testing framework, they -# have one less available file descriptor than when run outside the -# automated testing framework. If a test with a batch size of b fails -# inside the ATF, then the same test with batch size b+1 may pass outside -# the ATF but fail inside it. - -# The default batch size (nmerge) is 16. -(ulimit -n 19 \ - && sort -m --batch-size=16 in/* 2>err/merge-default-err \ - || ! grep "open failed" err/merge-default-err) || fail=1 - -# If sort opens a file to sort by random hashes of keys, -# it needs to consider this file against its limit on open file -# descriptors. Test once with the default random source -# and once with an explicit source. -for randsource in '' --random-source=some-data; do - (ulimit -n 20 \ - && sort -mR $randsource --batch-size=16 in/* 2>err/merge-random-err \ - || ! grep "open failed" err/merge-random-err) || fail=1 -done - -# 'sort -m' should work in a limited file descriptor -# environment when the output is repeatedly one of its inputs. -# In coreutils 8.7 and earlier, 'sort' would dump core on this test. -# -# This test uses 'exec' to redirect file descriptors rather than -# ordinary redirection on the 'sort' command. This is intended to -# work around bugs in OpenBSD /bin/sh, and some other sh variants, -# that squirrel away file descriptors before closing them; see -# <http://lists.gnu.org/archive/html/bug-tar/2010-10/msg00075.html>. -# This test finds the bug only with shells that do not close FDs on -# exec, and will miss the bug (if present) on other shells, but it's -# not easy to fix this without running afoul of the OpenBSD-like sh bugs. -(seq 6 && echo 6) >exp || fail=1 -echo 6 >out || fail=1 -(exec 3<&- 4<&- 5<&- 6</dev/null 7<&6 8<&6 9<&6 && - ulimit -n 10 && - sort -n -m --batch-size=7 -o out out in/1 in/2 in/3 in/4 in/5 out -) && -compare exp out || fail=1 - -Exit $fail diff --git a/tests/misc/sort-merge-fdlimit.sh b/tests/misc/sort-merge-fdlimit.sh new file mode 100755 index 00000000..bcd023ae --- /dev/null +++ b/tests/misc/sort-merge-fdlimit.sh @@ -0,0 +1,73 @@ +#!/bin/sh +# Test whether sort avoids opening more file descriptors than it is +# allowed when merging files. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ sort +require_ulimit_ + +mkdir in err || framework_failure_ + + +for i in $(seq 17); do + echo $i >in/$i +done +seq 17 >some-data + +# When these tests are run inside the automated testing framework, they +# have one less available file descriptor than when run outside the +# automated testing framework. If a test with a batch size of b fails +# inside the ATF, then the same test with batch size b+1 may pass outside +# the ATF but fail inside it. + +# The default batch size (nmerge) is 16. +(ulimit -n 19 \ + && sort -m --batch-size=16 in/* 2>err/merge-default-err \ + || ! grep "open failed" err/merge-default-err) || fail=1 + +# If sort opens a file to sort by random hashes of keys, +# it needs to consider this file against its limit on open file +# descriptors. Test once with the default random source +# and once with an explicit source. +for randsource in '' --random-source=some-data; do + (ulimit -n 20 \ + && sort -mR $randsource --batch-size=16 in/* 2>err/merge-random-err \ + || ! grep "open failed" err/merge-random-err) || fail=1 +done + +# 'sort -m' should work in a limited file descriptor +# environment when the output is repeatedly one of its inputs. +# In coreutils 8.7 and earlier, 'sort' would dump core on this test. +# +# This test uses 'exec' to redirect file descriptors rather than +# ordinary redirection on the 'sort' command. This is intended to +# work around bugs in OpenBSD /bin/sh, and some other sh variants, +# that squirrel away file descriptors before closing them; see +# <http://lists.gnu.org/archive/html/bug-tar/2010-10/msg00075.html>. +# This test finds the bug only with shells that do not close FDs on +# exec, and will miss the bug (if present) on other shells, but it's +# not easy to fix this without running afoul of the OpenBSD-like sh bugs. +(seq 6 && echo 6) >exp || fail=1 +echo 6 >out || fail=1 +(exec 3<&- 4<&- 5<&- 6</dev/null 7<&6 8<&6 9<&6 && + ulimit -n 10 && + sort -n -m --batch-size=7 -o out out in/1 in/2 in/3 in/4 in/5 out +) && +compare exp out || fail=1 + +Exit $fail diff --git a/tests/misc/sort-merge.pl b/tests/misc/sort-merge.pl new file mode 100755 index 00000000..5b940f25 --- /dev/null +++ b/tests/misc/sort-merge.pl @@ -0,0 +1,84 @@ +#!/usr/bin/perl +# Test "sort -m". + +# Copyright (C) 2002-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/>. + +use strict; + +my $limits = getlimits (); + +(my $program_name = $0) =~ s|.*/||; +my $prog = 'sort'; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +# three empty files and one that says 'foo' +my @inputs = (+(map{{IN=> {"empty$_"=> ''}}}1..3), {IN=> {foo=> "foo\n"}}); + +my $big_input = "aaa\n" x 1024; + +# don't need to check for existence, since we're running in a temp dir +my $badtmp = 'does/not/exist'; + +my $bigint = $limits->{UINTMAX_OFLOW}; + +my @Tests = + ( + ['m1', '-m', @inputs, {OUT=>"foo\n"}], + + # check validation of --batch-size option + ['nmerge-0', "-m --batch-size=0", @inputs, + {ERR=>"$prog: invalid --batch-size argument '0'\n". + "$prog: minimum --batch-size argument is '2'\n"}, {EXIT=>2}], + + ['nmerge-1', "-m --batch-size=1", @inputs, + {ERR=>"$prog: invalid --batch-size argument '1'\n". + "$prog: minimum --batch-size argument is '2'\n"}, {EXIT=>2}], + + ['nmerge-neg', "-m --batch-size=-1", @inputs, + {ERR=>"$prog: invalid --batch-size argument '-1'\n"}, {EXIT=>2}], + + ['nmerge-nan', "-m --batch-size=a", @inputs, + {ERR=>"$prog: invalid --batch-size argument 'a'\n"}, {EXIT=>2}], + + ['nmerge-big', "-m --batch-size=$bigint", @inputs, + {ERR_SUBST=>'s/(current rlimit is) \d+/$1/'}, + {ERR=>"$prog: --batch-size argument '$bigint' too large\n". + "$prog: maximum --batch-size argument with current rlimit is\n"}, + {EXIT=>2}], + + # This should work since nmerge >= the number of input files + ['nmerge-yes', "-m --batch-size=4 -T$badtmp", @inputs, {OUT=>"foo\n"}], + + # this should fail since nmerge < # of input files, so + # temp files are needed + ['nmerge-no', "-m --batch-size=2 -T$badtmp", @inputs, + {ERR_SUBST=>"s|': .*|':|"}, + {ERR=>"$prog: cannot create temporary file in '$badtmp':\n"}, + {EXIT=>2}], + + # This used to fail because setting batch-size without also setting + # buffer size would cause the buffer size to be set to the minimum. + ['batch-size', "--batch-size=16 -T$badtmp", {IN=> {big=> $big_input}}, + {OUT=>$big_input}], + ); + +my $save_temps = $ENV{DEBUG}; +my $verbose = $ENV{VERBOSE}; + +my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); +exit $fail; diff --git a/tests/misc/sort-month b/tests/misc/sort-month deleted file mode 100755 index fa1e6957..00000000 --- a/tests/misc/sort-month +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# Test sorting of abbreviated months from the locale - -# Copyright (C) 2010-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ sort - -locale --version >/dev/null 2>&1 || - skip_ 'The locale utility is not present' - -# C will be used if the locale is not present -for LOC in "$LOCALE_FR" "$LOCALE_FR_UTF8" "ja_JP.utf8"; do - mon="$(LC_ALL=$LOC locale abmon 2>/dev/null);" - smon=$(LC_ALL=$LOC locale abmon 2>/dev/null | - tr ';' '\n' | shuf | nl | LC_ALL=$LOC sort -k2,2M | - cut -f2 | tr '\n' ';') - test "$mon" = "$smon" || { fail=1; break; } -done - -Exit $fail diff --git a/tests/misc/sort-month.sh b/tests/misc/sort-month.sh new file mode 100755 index 00000000..99008367 --- /dev/null +++ b/tests/misc/sort-month.sh @@ -0,0 +1,34 @@ +#!/bin/sh +# Test sorting of abbreviated months from the locale + +# Copyright (C) 2010-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ sort + +locale --version >/dev/null 2>&1 || + skip_ 'The locale utility is not present' + +# C will be used if the locale is not present +for LOC in "$LOCALE_FR" "$LOCALE_FR_UTF8" "ja_JP.utf8"; do + mon="$(LC_ALL=$LOC locale abmon 2>/dev/null);" + smon=$(LC_ALL=$LOC locale abmon 2>/dev/null | + tr ';' '\n' | shuf | nl | LC_ALL=$LOC sort -k2,2M | + cut -f2 | tr '\n' ';') + test "$mon" = "$smon" || { fail=1; break; } +done + +Exit $fail diff --git a/tests/misc/sort-rand b/tests/misc/sort-rand deleted file mode 100755 index 79730e95..00000000 --- a/tests/misc/sort-rand +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh -# Ensure that sort --sort-random doesn't sort. - -# Copyright (C) 2005-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ sort - -seq 100 > in || framework_failure_ - - -sort --random-sort in > out || fail=1 - -# Fail if the input is the same as the output. -# This is a probabilistic test :-) -# However, the odds of failure are very low: 1 in 100! (~ 1 in 10^158) -compare in out > /dev/null && { fail=1; echo "not random?" 1>&2; } - -# Fail if the sorted output is not the same as the input. -sort -n out > out1 -compare in out1 || { fail=1; echo "not a permutation" 1>&2; } - -# If locale is available then use it to find a random non-C locale. -if (locale --version) > /dev/null 2>&1; then - locale=$(locale -a | sort --random-sort | awk '/^.._/{print;exit}') - LC_ALL=$locale sort --random-sort in > out1 || fail=1 - LC_ALL=$locale sort --random-sort in > out2 || fail=1 - - # Fail if the output "randomly" is the same twice in a row. - compare out1 out2 > /dev/null && - { fail=1; echo "not random with LC_ALL=$locale" 1>&2; } - - # Fail if the sorted output is not the same as the input. - sort -n out > out1 - compare in out1 || - { fail=1; echo "not a permutation with LC_ALL=$locale" 1>&2; } -fi - -Exit $fail diff --git a/tests/misc/sort-rand.sh b/tests/misc/sort-rand.sh new file mode 100755 index 00000000..4313eb2f --- /dev/null +++ b/tests/misc/sort-rand.sh @@ -0,0 +1,52 @@ +#!/bin/sh +# Ensure that sort --sort-random doesn't sort. + +# Copyright (C) 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 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_ sort + +seq 100 > in || framework_failure_ + + +sort --random-sort in > out || fail=1 + +# Fail if the input is the same as the output. +# This is a probabilistic test :-) +# However, the odds of failure are very low: 1 in 100! (~ 1 in 10^158) +compare in out > /dev/null && { fail=1; echo "not random?" 1>&2; } + +# Fail if the sorted output is not the same as the input. +sort -n out > out1 +compare in out1 || { fail=1; echo "not a permutation" 1>&2; } + +# If locale is available then use it to find a random non-C locale. +if (locale --version) > /dev/null 2>&1; then + locale=$(locale -a | sort --random-sort | $AWK '/^.._/{print;exit}') + LC_ALL=$locale sort --random-sort in > out1 || fail=1 + LC_ALL=$locale sort --random-sort in > out2 || fail=1 + + # Fail if the output "randomly" is the same twice in a row. + compare out1 out2 > /dev/null && + { fail=1; echo "not random with LC_ALL=$locale" 1>&2; } + + # Fail if the sorted output is not the same as the input. + sort -n out > out1 + compare in out1 || + { fail=1; echo "not a permutation with LC_ALL=$locale" 1>&2; } +fi + +Exit $fail diff --git a/tests/misc/sort-spinlock-abuse b/tests/misc/sort-spinlock-abuse deleted file mode 100755 index 628326fd..00000000 --- a/tests/misc/sort-spinlock-abuse +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh -# trigger a bug that would make parallel sort use 100% of one or more -# CPU while blocked on output. - -# Copyright (C) 2010-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ sort - -# This isn't terribly expensive, but it must not be run under heavy load. -# Since the "very expensive" tests are already run only with -j1, 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. -very_expensive_ - -grep '^#define HAVE_PTHREAD_T 1' "$CONFIG_HEADER" > /dev/null || - skip_ 'requires pthreads' - -seq 100000 > in || framework_failure_ -mkfifo_or_skip_ fifo - -# Arrange for sort to require 8.0+ seconds of wall-clock time, -# while actually using far less than 1 second of CPU time. -(for i in $(seq 80); do read line; echo $i; sleep .1; done - cat > /dev/null) < fifo & - -# However, under heavy load, it can easily take more than -# one second of CPU time, so set a permissive limit: -ulimit -t 7 -sort --parallel=2 in > fifo || fail=1 - -Exit $fail diff --git a/tests/misc/sort-spinlock-abuse.sh b/tests/misc/sort-spinlock-abuse.sh new file mode 100755 index 00000000..768fc1f4 --- /dev/null +++ b/tests/misc/sort-spinlock-abuse.sh @@ -0,0 +1,45 @@ +#!/bin/sh +# 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. + +# This 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_ sort + +# This isn't terribly expensive, but it must not be run under heavy load. +# Since the "very expensive" tests are already run only with -j1, 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. +very_expensive_ + +grep '^#define HAVE_PTHREAD_T 1' "$CONFIG_HEADER" > /dev/null || + skip_ 'requires pthreads' + +seq 100000 > in || framework_failure_ +mkfifo_or_skip_ fifo + +# Arrange for sort to require 8.0+ seconds of wall-clock time, +# while actually using far less than 1 second of CPU time. +(for i in $(seq 80); do read line; echo $i; sleep .1; done + cat > /dev/null) < fifo & + +# However, under heavy load, it can easily take more than +# one second of CPU time, so set a permissive limit: +ulimit -t 7 +sort --parallel=2 in > fifo || fail=1 + +Exit $fail diff --git a/tests/misc/sort-stale-thread-mem b/tests/misc/sort-stale-thread-mem deleted file mode 100755 index c19f62ee..00000000 --- a/tests/misc/sort-stale-thread-mem +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh -# Trigger a bug that would cause 'sort' to reference stale thread stack memory. - -# Copyright (C) 2010-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 -# 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 and Paul Eggert - -. "${srcdir=.}/init.sh"; path_prepend_ ../src -print_ver_ sort - -very_expensive_ - -valgrind --help >/dev/null || skip_ "requires valgrind" -grep '^#define HAVE_PTHREAD_T 1' "$CONFIG_HEADER" > /dev/null || - skip_ 'requires pthreads' - -# gensort output seems to trigger the failure more often, -# so prefer gensort if it is available. -(gensort -a 10000 in) 2>/dev/null || - seq -f %-98f 10000 | shuf > in || - framework_failure_ - -# On Fedora-17-beta (valgrind-3.7.0-2.fc17.x86_64), this evokes two -# "Conditional jump or move depends on uninitialised value(s)" errors, -# each originating from _dl_start. -valgrind --quiet --error-exitcode=3 sort --version > /dev/null || - framework_failure_ 'valgrind fails for trivial sort invocation' - -# With the bug, 'sort' would fail under valgrind about half the time, -# on some circa-2010 multicore Linux platforms. Run the test 100 times -# so that the probability of missing the bug should be about 1 in -# 2**100 on these hosts. -for i in $(seq 100); do - valgrind --quiet --error-exitcode=3 \ - sort -S 100K --parallel=2 in > /dev/null || - { fail=$?; echo iteration $i failed; Exit $fail; } -done - -Exit $fail diff --git a/tests/misc/sort-stale-thread-mem.sh b/tests/misc/sort-stale-thread-mem.sh new file mode 100755 index 00000000..78fa2cda --- /dev/null +++ b/tests/misc/sort-stale-thread-mem.sh @@ -0,0 +1,52 @@ +#!/bin/sh +# Trigger a bug that would cause 'sort' to reference stale thread stack memory. + +# Copyright (C) 2010-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 and Paul Eggert + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ sort + +very_expensive_ +require_valgrind_ + +grep '^#define HAVE_PTHREAD_T 1' "$CONFIG_HEADER" > /dev/null || + skip_ 'requires pthreads' + +# gensort output seems to trigger the failure more often, +# so prefer gensort if it is available. +(gensort -a 10000 in) 2>/dev/null || + seq -f %-98f 10000 | shuf > in || + framework_failure_ + +# On Fedora-17-beta (valgrind-3.7.0-2.fc17.x86_64), this evokes two +# "Conditional jump or move depends on uninitialised value(s)" errors, +# each originating from _dl_start. +valgrind --quiet --error-exitcode=3 sort --version > /dev/null || + framework_failure_ 'valgrind fails for trivial sort invocation' + +# With the bug, 'sort' would fail under valgrind about half the time, +# on some circa-2010 multicore Linux platforms. Run the test 100 times +# so that the probability of missing the bug should be about 1 in +# 2**100 on these hosts. +for i in $(seq 100); do + valgrind --quiet --error-exitcode=3 \ + sort -S 100K --parallel=2 in > /dev/null || + { fail=$?; echo iteration $i failed; Exit $fail; } +done + +Exit $fail diff --git a/tests/misc/sort-u-FMR.sh b/tests/misc/sort-u-FMR.sh new file mode 100755 index 00000000..c13e9823 --- /dev/null +++ b/tests/misc/sort-u-FMR.sh @@ -0,0 +1,29 @@ +#!/bin/sh +# Before 8.19, this would trigger a free-memory read. + +# Copyright (C) 2012-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ sort +require_valgrind_ + +{ echo 0; printf '%0900d\n' 1; } > in || framework_failure_ + +valgrind --error-exitcode=1 sort --p=1 -S32b -u in > out || fail=1 + +compare in out || fail=1 + +Exit $fail diff --git a/tests/misc/sort-unique b/tests/misc/sort-unique deleted file mode 100755 index 275cbeb0..00000000 --- a/tests/misc/sort-unique +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh -# Test 'sort -u'. - -# Copyright (C) 2010-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ sort - -cat > in <<\EOF -1 -2 -1 -3 -EOF - -cat > exp <<\EOF -1 -2 -3 -EOF - -for LOC in C "$LOCALE_FR" "$LOCALE_FR_UTF8"; do - test -z "$LOC" && continue - - LC_ALL=$LOC sort -u in > out || { fail=1; break; } - compare exp out || { fail=1; break; } -done - -Exit $fail diff --git a/tests/misc/sort-unique-segv b/tests/misc/sort-unique-segv deleted file mode 100755 index b853cfe4..00000000 --- a/tests/misc/sort-unique-segv +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh -# parallel sort with --unique (-u) would segfault - -# Copyright (C) 2010-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ sort - -grep '^#define HAVE_PTHREAD_T 1' "$CONFIG_HEADER" > /dev/null || - skip_ 'requires pthreads' - -cat <<\EOF > in || framework_failure_ - - - - - - - -z -zzzzzz -zzzzzzz -zzzzzzz -zzzzzzz -zzzzzzzzz -zzzzzzzzzzz -zzzzzzzzzzzz -EOF - -sort --parallel=1 -u in > exp || fail=1 - -sort --parallel=2 -u -S 10b < in > out || fail=1 -compare exp out || fail=1 - -Exit $fail diff --git a/tests/misc/sort-unique-segv.sh b/tests/misc/sort-unique-segv.sh new file mode 100755 index 00000000..58893158 --- /dev/null +++ b/tests/misc/sort-unique-segv.sh @@ -0,0 +1,48 @@ +#!/bin/sh +# parallel sort with --unique (-u) would segfault + +# Copyright (C) 2010-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ sort + +grep '^#define HAVE_PTHREAD_T 1' "$CONFIG_HEADER" > /dev/null || + skip_ 'requires pthreads' + +cat <<\EOF > in || framework_failure_ + + + + + + + +z +zzzzzz +zzzzzzz +zzzzzzz +zzzzzzz +zzzzzzzzz +zzzzzzzzzzz +zzzzzzzzzzzz +EOF + +sort --parallel=1 -u in > exp || fail=1 + +sort --parallel=2 -u -S 10b < in > out || fail=1 +compare exp out || fail=1 + +Exit $fail diff --git a/tests/misc/sort-unique.sh b/tests/misc/sort-unique.sh new file mode 100755 index 00000000..f34df96e --- /dev/null +++ b/tests/misc/sort-unique.sh @@ -0,0 +1,42 @@ +#!/bin/sh +# Test 'sort -u'. + +# Copyright (C) 2010-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ sort + +cat > in <<\EOF +1 +2 +1 +3 +EOF + +cat > exp <<\EOF +1 +2 +3 +EOF + +for LOC in C "$LOCALE_FR" "$LOCALE_FR_UTF8"; do + test -z "$LOC" && continue + + LC_ALL=$LOC sort -u in > out || { fail=1; break; } + compare exp out || { fail=1; break; } +done + +Exit $fail diff --git a/tests/misc/sort-version b/tests/misc/sort-version deleted file mode 100755 index cb9acab7..00000000 --- a/tests/misc/sort-version +++ /dev/null @@ -1,106 +0,0 @@ -#!/bin/sh -# exercise sort's --sort=version option - -# Copyright (C) 2008-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ sort - -cat > in << _EOF_ -gcc-c++-10.fc9.tar.gz -gcc-c++-10.8.12-0.7rc2.fc9.tar.bz2 -glibc-2-0.1.beta1.fc10.rpm -glibc-common-5-0.2.beta2.fc9.ebuild -glibc-common-5-0.2b.deb -glibc-common-11b.ebuild -glibc-common-11-0.6rc2.ebuild -libstdc++-0.5.8.11-0.7rc2.fc10.tar.gz -libstdc++-4a.fc8.tar.gz -libstdc++-4.10.4.20040204svn.rpm -libstdc++-devel-3.fc8.ebuild -libstdc++-devel-3a.fc9.tar.gz -libstdc++-devel-8.fc8.deb -libstdc++-devel-8.6.2-0.4b.fc8 -nss_ldap-1-0.2b.fc9.tar.bz2 -nss_ldap-1-0.6rc2.fc8.tar.gz -nss_ldap-1.0-0.1a.tar.gz -nss_ldap-10beta1.fc8.tar.gz -nss_ldap-10.11.8.6.20040204cvs.fc10.ebuild -string start 5.0.0 end of str -string start 5.1.0 end of str -string start 5.10.0 end of str -string start 5.2.0 end of str -string start 5.20.0 end of str -string start 5.3.0 end of str -string start 5.30.0 end of str -string start 5.4.0 end of str -string start 5.40.0 end of str -string start 5.5.0 end of str -string start 5.50.0 end of str -string start 5.6.0 end of str -string start 5.60.0 end of str -string start 5.7.0 end of str -string start 5.70.0 end of str -string start 5.8.0 end of str -string start 5.80.0 end of str -string start 5.9.0 end of str -string start 5.90.0 end of str -_EOF_ - -cat > exp << _EOF_ -gcc-c++-10.fc9.tar.gz -gcc-c++-10.8.12-0.7rc2.fc9.tar.bz2 -glibc-2-0.1.beta1.fc10.rpm -glibc-common-5-0.2.beta2.fc9.ebuild -glibc-common-5-0.2b.deb -glibc-common-11b.ebuild -glibc-common-11-0.6rc2.ebuild -libstdc++-0.5.8.11-0.7rc2.fc10.tar.gz -libstdc++-4a.fc8.tar.gz -libstdc++-4.10.4.20040204svn.rpm -libstdc++-devel-3.fc8.ebuild -libstdc++-devel-3a.fc9.tar.gz -libstdc++-devel-8.fc8.deb -libstdc++-devel-8.6.2-0.4b.fc8 -nss_ldap-1-0.2b.fc9.tar.bz2 -nss_ldap-1-0.6rc2.fc8.tar.gz -nss_ldap-1.0-0.1a.tar.gz -nss_ldap-10beta1.fc8.tar.gz -nss_ldap-10.11.8.6.20040204cvs.fc10.ebuild -string start 5.0.0 end of str -string start 5.1.0 end of str -string start 5.2.0 end of str -string start 5.3.0 end of str -string start 5.4.0 end of str -string start 5.5.0 end of str -string start 5.6.0 end of str -string start 5.7.0 end of str -string start 5.8.0 end of str -string start 5.9.0 end of str -string start 5.10.0 end of str -string start 5.20.0 end of str -string start 5.30.0 end of str -string start 5.40.0 end of str -string start 5.50.0 end of str -string start 5.60.0 end of str -string start 5.70.0 end of str -string start 5.80.0 end of str -string start 5.90.0 end of str -_EOF_ - -sort --sort=version -o out in || fail=1 -compare exp out || fail=1 -Exit $fail diff --git a/tests/misc/sort-version.sh b/tests/misc/sort-version.sh new file mode 100755 index 00000000..d9686fbe --- /dev/null +++ b/tests/misc/sort-version.sh @@ -0,0 +1,106 @@ +#!/bin/sh +# exercise sort's --sort=version option + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ sort + +cat > in << _EOF_ +gcc-c++-10.fc9.tar.gz +gcc-c++-10.8.12-0.7rc2.fc9.tar.bz2 +glibc-2-0.1.beta1.fc10.rpm +glibc-common-5-0.2.beta2.fc9.ebuild +glibc-common-5-0.2b.deb +glibc-common-11b.ebuild +glibc-common-11-0.6rc2.ebuild +libstdc++-0.5.8.11-0.7rc2.fc10.tar.gz +libstdc++-4a.fc8.tar.gz +libstdc++-4.10.4.20040204svn.rpm +libstdc++-devel-3.fc8.ebuild +libstdc++-devel-3a.fc9.tar.gz +libstdc++-devel-8.fc8.deb +libstdc++-devel-8.6.2-0.4b.fc8 +nss_ldap-1-0.2b.fc9.tar.bz2 +nss_ldap-1-0.6rc2.fc8.tar.gz +nss_ldap-1.0-0.1a.tar.gz +nss_ldap-10beta1.fc8.tar.gz +nss_ldap-10.11.8.6.20040204cvs.fc10.ebuild +string start 5.0.0 end of str +string start 5.1.0 end of str +string start 5.10.0 end of str +string start 5.2.0 end of str +string start 5.20.0 end of str +string start 5.3.0 end of str +string start 5.30.0 end of str +string start 5.4.0 end of str +string start 5.40.0 end of str +string start 5.5.0 end of str +string start 5.50.0 end of str +string start 5.6.0 end of str +string start 5.60.0 end of str +string start 5.7.0 end of str +string start 5.70.0 end of str +string start 5.8.0 end of str +string start 5.80.0 end of str +string start 5.9.0 end of str +string start 5.90.0 end of str +_EOF_ + +cat > exp << _EOF_ +gcc-c++-10.fc9.tar.gz +gcc-c++-10.8.12-0.7rc2.fc9.tar.bz2 +glibc-2-0.1.beta1.fc10.rpm +glibc-common-5-0.2.beta2.fc9.ebuild +glibc-common-5-0.2b.deb +glibc-common-11b.ebuild +glibc-common-11-0.6rc2.ebuild +libstdc++-0.5.8.11-0.7rc2.fc10.tar.gz +libstdc++-4a.fc8.tar.gz +libstdc++-4.10.4.20040204svn.rpm +libstdc++-devel-3.fc8.ebuild +libstdc++-devel-3a.fc9.tar.gz +libstdc++-devel-8.fc8.deb +libstdc++-devel-8.6.2-0.4b.fc8 +nss_ldap-1-0.2b.fc9.tar.bz2 +nss_ldap-1-0.6rc2.fc8.tar.gz +nss_ldap-1.0-0.1a.tar.gz +nss_ldap-10beta1.fc8.tar.gz +nss_ldap-10.11.8.6.20040204cvs.fc10.ebuild +string start 5.0.0 end of str +string start 5.1.0 end of str +string start 5.2.0 end of str +string start 5.3.0 end of str +string start 5.4.0 end of str +string start 5.5.0 end of str +string start 5.6.0 end of str +string start 5.7.0 end of str +string start 5.8.0 end of str +string start 5.9.0 end of str +string start 5.10.0 end of str +string start 5.20.0 end of str +string start 5.30.0 end of str +string start 5.40.0 end of str +string start 5.50.0 end of str +string start 5.60.0 end of str +string start 5.70.0 end of str +string start 5.80.0 end of str +string start 5.90.0 end of str +_EOF_ + +sort --sort=version -o out in || fail=1 +compare exp out || fail=1 +Exit $fail diff --git a/tests/misc/sort.pl b/tests/misc/sort.pl new file mode 100755 index 00000000..59c30e56 --- /dev/null +++ b/tests/misc/sort.pl @@ -0,0 +1,432 @@ +#!/usr/bin/perl + +# 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/>. + +use strict; + +my $limits = getlimits (); + +my $prog = 'sort'; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +my $mb_locale = $ENV{LOCALE_FR_UTF8}; +! defined $mb_locale || $mb_locale eq 'none' + and $mb_locale = 'C'; + +# Since each test is run with a file name and with redirected stdin, +# the name in the diagnostic is either the file name or "-". +# Normalize each diagnostic to use '-'. +my $normalize_filename = {ERR_SUBST => 's/^$prog: .*?:/$prog: -:/'}; + +my $no_file = "$prog: cannot read: no-file: No such file or directory\n"; + +my @Tests = +( +["n1", '-n', {IN=>".01\n0\n"}, {OUT=>"0\n.01\n"}], +["n2", '-n', {IN=>".02\n.01\n"}, {OUT=>".01\n.02\n"}], +["n3", '-n', {IN=>".02\n.00\n"}, {OUT=>".00\n.02\n"}], +["n4", '-n', {IN=>".02\n.000\n"}, {OUT=>".000\n.02\n"}], +["n5", '-n', {IN=>".021\n.029\n"}, {OUT=>".021\n.029\n"}], + +["n6", '-n', {IN=>".02\n.0*\n"}, {OUT=>".0*\n.02\n"}], +["n7", '-n', {IN=>".02\n.*\n"}, {OUT=>".*\n.02\n"}], +["n8a", '-s -n -k1,1', {IN=>".0a\n.0b\n"}, {OUT=>".0a\n.0b\n"}], +["n8b", '-s -n -k1,1', {IN=>".0b\n.0a\n"}, {OUT=>".0b\n.0a\n"}], +["n9a", '-s -n -k1,1', {IN=>".000a\n.000b\n"}, {OUT=>".000a\n.000b\n"}], +["n9b", '-s -n -k1,1', {IN=>".000b\n.000a\n"}, {OUT=>".000b\n.000a\n"}], +["n10a", '-s -n -k1,1', {IN=>".00a\n.000b\n"}, {OUT=>".00a\n.000b\n"}], +["n10b", '-s -n -k1,1', {IN=>".00b\n.000a\n"}, {OUT=>".00b\n.000a\n"}], +["n11a", '-s -n -k1,1', {IN=>".01a\n.010\n"}, {OUT=>".01a\n.010\n"}], +["n11b", '-s -n -k1,1', {IN=>".010\n.01a\n"}, {OUT=>".010\n.01a\n"}], + +# human readable suffixes +["h1", '-h', + {IN=>"1Y\n1Z\n1E\n1P\n1T\n1G\n1M\n1K\n02\n1\nY\n-1k\n-1M\n-1G\n-1T\n" + . "-1P\n-1E\n-1Z\n-1Y\n"}, + {OUT=>"-1Y\n-1Z\n-1E\n-1P\n-1T\n-1G\n-1M\n-1k\nY\n1\n02\n1K\n1M\n1G\n1T\n" + . "1P\n1E\n1Z\n1Y\n"}], +["h2", '-h', {IN=>"1M\n-2G\n-3K"}, {OUT=>"-2G\n-3K\n1M\n"}], +# check that it works with powers of 1024 +["h3", '-k 2,2h -k 1,1', {IN=>"a 1G\nb 1023M\n"}, {OUT=>"b 1023M\na 1G\n"}], +# decimal at end => allowed +["h4", '-h', {IN=>"1.E\n2.M\n"}, {OUT=>"2.M\n1.E\n"}], +# double decimal => ignore suffix +["h5", '-h', {IN=>"1..2E\n2..2M\n"}, {OUT=>"1..2E\n2..2M\n"}], +# "M" sorts before "G" regardless of the positive number attached. +["h6", '-h', {IN=>"1GiB\n1030MiB\n"}, {OUT=>"1030MiB\n1GiB\n"}], +# check option incompatibility +["h7", '-hn', {IN=>""}, {OUT=>""}, {EXIT=>2}, + {ERR=>"$prog: options '-hn' are incompatible\n"}], +# check key processing +["h8", '-n -k2,2h', {IN=>"1 1E\n2 2M\n"}, {OUT=>"2 2M\n1 1E\n"}], +# SI and IEC prefixes on separate keys allowed +["h9", '-h -k1,1 -k2,2', {IN=>"1M 1Mi\n1M 1Mi\n"}, {OUT=>"1M 1Mi\n1M 1Mi\n"}], +# This invalid SI and IEC prefix mixture is not significant so not noticed +["h10", '-h -k1,1 -k2,2', {IN=>"1M 2M\n2M 1Mi\n"}, {OUT=>"1M 2M\n2M 1Mi\n"}], + +["01a", '', {IN=>"A\nB\nC\n"}, {OUT=>"A\nB\nC\n"}], +# +["02a", '-c', {IN=>"A\nB\nC\n"}, {OUT=>''}], +["02b", '-c', {IN=>"A\nC\nB\n"}, {OUT=>''}, {EXIT=>1}, + {ERR=>"$prog: -:3: disorder: B\n"}, $normalize_filename], +["02c", '-c -k1,1', {IN=>"a\na b\n"}, {OUT=>''}], +["02d", '-C', {IN=>"A\nB\nC\n"}, {OUT=>''}], +["02e", '-C', {IN=>"A\nC\nB\n"}, {OUT=>''}, {EXIT=>1}], +# This should fail because there are duplicate keys +["02m", '-cu', {IN=>"A\nA\n"}, {OUT=>''}, {EXIT=>1}, + {ERR=>"$prog: -:2: disorder: A\n"}, $normalize_filename], +["02n", '-cu', {IN=>"A\nB\n"}, {OUT=>''}], +["02o", '-cu', {IN=>"A\nB\nB\n"}, {OUT=>''}, {EXIT=>1}, + {ERR=>"$prog: -:3: disorder: B\n"}, $normalize_filename], +["02p", '-cu', {IN=>"B\nA\nB\n"}, {OUT=>''}, {EXIT=>1}, + {ERR=>"$prog: -:2: disorder: A\n"}, $normalize_filename], +["02q", '-c -k 1,1fR', {IN=>"ABC\nABc\nAbC\nAbc\naBC\naBc\nabC\nabc\n"}], +["02r", '-c -k 1,1fV', {IN=>"ABC\nABc\nAbC\nAbc\naBC\naBc\nabC\nabc\n"}], +["02s", '-c -k 1,1dfR', + {IN=>".ABC\n.ABc.\nA.bC\nA.bc.\naB.C\naB.c.\nabC.\nabc..\n"}], +# +["03a", '-k1', {IN=>"B\nA\n"}, {OUT=>"A\nB\n"}], +["03b", '-k1,1', {IN=>"B\nA\n"}, {OUT=>"A\nB\n"}], +["03c", '-k1 -k2', {IN=>"A b\nA a\n"}, {OUT=>"A a\nA b\n"}], +# Fail with a diagnostic when -k specifies field == 0. +["03d", '-k0', {EXIT=>2}, + {ERR=>"$prog: -: invalid field specification '0'\n"}, + $normalize_filename], +# Fail with a diagnostic when -k specifies character == 0. +["03e", '-k1.0', {EXIT=>2}, + {ERR=>"$prog: character offset is zero: invalid field specification '1.0'\n"}], +["03f", '-k1.1,-k0', {EXIT=>2}, + {ERR=>"$prog: invalid number after ',': invalid count at start of '-k0'\n"}], +# This is ok. +["03g", '-k1.1,1.0', {IN=>''}], +# This is equivalent to 3f. +["03h", '-k1.1,1', {IN=>''}], +# This too, is equivalent to 3f. +["03i", '-k1,1', {IN=>''}], +# +["04a", '-nc', {IN=>"2\n11\n"}], +["04b", '-n', {IN=>"11\n2\n"}, {OUT=>"2\n11\n"}], +["04c", '-k1n', {IN=>"11\n2\n"}, {OUT=>"2\n11\n"}], +["04d", '-k1', {IN=>"11\n2\n"}, {OUT=>"11\n2\n"}], +["04e", '-k2', {IN=>"ignored B\nz-ig A\n"}, {OUT=>"z-ig A\nignored B\n"}], +# +["05a", '-k1,2', {IN=>"A B\nA A\n"}, {OUT=>"A A\nA B\n"}], +["05b", '-k1,2', {IN=>"A B A\nA A Z\n"}, {OUT=>"A A Z\nA B A\n"}], +["05c", '-k1 -k2', {IN=>"A B A\nA A Z\n"}, {OUT=>"A A Z\nA B A\n"}], +["05d", '-k2,2', {IN=>"A B A\nA A Z\n"}, {OUT=>"A A Z\nA B A\n"}], +["05e", '-k2,2', {IN=>"A B Z\nA A A\n"}, {OUT=>"A A A\nA B Z\n"}], +["05f", '-k2,2', {IN=>"A B A\nA A Z\n"}, {OUT=>"A A Z\nA B A\n"}], +# +["06a", '-k 1,2', {IN=>"A B\nA A\n"}, {OUT=>"A A\nA B\n"}], +["06b", '-k 1,2', {IN=>"A B A\nA A Z\n"}, {OUT=>"A A Z\nA B A\n"}], +["06c", '-k 1 -k 2', {IN=>"A B A\nA A Z\n"}, {OUT=>"A A Z\nA B A\n"}], +["06d", '-k 2,2', {IN=>"A B A\nA A Z\n"}, {OUT=>"A A Z\nA B A\n"}], +["06e", '-k 2,2', {IN=>"A B Z\nA A A\n"}, {OUT=>"A A A\nA B Z\n"}], +["06f", '-k 2,2', {IN=>"A B A\nA A Z\n"}, {OUT=>"A A Z\nA B A\n"}], +# +["07a", '-k 2,3', {IN=>"9 a b\n7 a a\n"}, {OUT=>"7 a a\n9 a b\n"}], +["07b", '-k 2,3', {IN=>"a a b\nz a a\n"}, {OUT=>"z a a\na a b\n"}], +["07c", '-k 2,3', {IN=>"y k b\nz k a\n"}, {OUT=>"z k a\ny k b\n"}], +["07d", '+1 -3', {IN=>"y k b\nz k a\n"}, {OUT=>"z k a\ny k b\n"}], +# ensure a character position of 0 includes whole field +["07e", '-k 2,3.0', {IN=>"a a b\nz a a\n"}, {OUT=>"z a a\na a b\n"}], +# ensure fields with end position before start are ignored +["07f", '-n -k1.3,1.1', {IN=>"a 2\nb 1\n"}, {OUT=>"a 2\nb 1\n"}], +["07g", '-n -k2.2,1.2', {IN=>"aa 2\nbb 1\n"}, {OUT=>"aa 2\nbb 1\n"}], +["07h", '-k1.3nb,1.3', {IN=>" a 2\n b 1\n"}, {OUT=>" a 2\n b 1\n"}], +# ensure obsolescent key limits are handled correctly +["07i", '-s +0 -1', {IN=>"a c\na b\n"}, {OUT=>"a c\na b\n"}], +["07j", '-s +0 -1.0', {IN=>"a c\na b\n"}, {OUT=>"a c\na b\n"}], +["07k", '-s +0 -1.1', {IN=>"a c\na b\n"}, {OUT=>"a c\na b\n"}], +["07l", '-s +0 -1.2', {IN=>"a c\na b\n"}, {OUT=>"a b\na c\n"}], +["07m", '-s +0 -1.1b', {IN=>"a c\na b\n"}, {OUT=>"a b\na c\n"}], +# +# report an error for '.' without following char spec +["08a", '-k 2.,3', {EXIT=>2}, + {ERR=>"$prog: invalid number after '.': invalid count at start of ',3'\n"}], +# report an error for ',' without following POS2 +["08b", '-k 2,', {EXIT=>2}, + {ERR=>"$prog: invalid number after ',': invalid count at start of ''\n"}], +# +# Test new -g option. +["09a", '-g', {IN=>"1e2\n2e1\n"}, {OUT=>"2e1\n1e2\n"}], +# Make sure -n works how we expect. +["09b", '-n', {IN=>"1e2\n2e1\n"}, {OUT=>"1e2\n2e1\n"}], +["09c", '-n', {IN=>"2e1\n1e2\n"}, {OUT=>"1e2\n2e1\n"}], +["09d", '-k2g', {IN=>"a 1e2\nb 2e1\n"}, {OUT=>"b 2e1\na 1e2\n"}], +# +# Bug reported by Roger Peel <R.Peel@ee.surrey.ac.uk> +["10a", '-t : -k 2.2,2.2', {IN=>":ba\n:ab\n"}, {OUT=>":ba\n:ab\n"}], +# Equivalent to above, but using obsolescent '+pos -pos' option syntax. +["10b", '-t : +1.1 -1.2', {IN=>":ba\n:ab\n"}, {OUT=>":ba\n:ab\n"}], +# +# The same as the preceding two, but with input lines reversed. +["10c", '-t : -k 2.2,2.2', {IN=>":ab\n:ba\n"}, {OUT=>":ba\n:ab\n"}], +# Equivalent to above, but using obsolescent '+pos -pos' option syntax. +["10d", '-t : +1.1 -1.2', {IN=>":ab\n:ba\n"}, {OUT=>":ba\n:ab\n"}], +# Try without -t... +# But note that we have to count the delimiting space at the beginning +# of each field that has it. +["10a0", '-k 2.3,2.3', {IN=>"z ba\nz ab\n"}, {OUT=>"z ba\nz ab\n"}], +["10a1", '-k 1.2,1.2', {IN=>"ba\nab\n"}, {OUT=>"ba\nab\n"}], +["10a2", '-b -k 2.2,2.2', {IN=>"z ba\nz ab\n"}, {OUT=>"z ba\nz ab\n"}], +# +# An even simpler example demonstrating the bug. +["10e", '-k 1.2,1.2', {IN=>"ab\nba\n"}, {OUT=>"ba\nab\n"}], +# +# The way sort works on these inputs (10f and 10g) seems wrong to me. +# See http://git.sv.gnu.org/gitweb/?p=coreutils.git;a=commitdiff;h=3c467c0d223 +# POSIX doesn't seem to say one way or the other, but that's the way all +# other sort implementations work. +["10f", '-t : -k 1.3,1.3', {IN=>":ab\n:ba\n"}, {OUT=>":ba\n:ab\n"}], +["10g", '-k 1.4,1.4', {IN=>"a ab\nb ba\n"}, {OUT=>"b ba\na ab\n"}], +# +# Exercise bug re using -b to skip trailing blanks. +["11a", '-t: -k1,1b -k2,2', {IN=>"a\t:a\na :b\n"}, {OUT=>"a\t:a\na :b\n"}], +["11b", '-t: -k1,1b -k2,2', {IN=>"a :b\na\t:a\n"}, {OUT=>"a\t:a\na :b\n"}], +["11c", '-t: -k2,2b -k3,3', {IN=>"z:a\t:a\na :b\n"}, {OUT=>"z:a\t:a\na :b\n"}], +# Before 1.22m, the first key comparison reported equality. +# With 1.22m, they compare different: "a" sorts before "a\n", +# and the second key spec isn't even used. +["11d", '-t: -k2,2b -k3,3', {IN=>"z:a :b\na\t:a\n"}, {OUT=>"a\t:a\nz:a :b\n"}], +# +# Exercise bug re comparing '-' and integers. +["12a", '-n -t: +1', {IN=>"a:1\nb:-\n"}, {OUT=>"b:-\na:1\n"}], +["12b", '-n -t: +1', {IN=>"b:-\na:1\n"}, {OUT=>"b:-\na:1\n"}], +# Try some other (e.g. 'X') invalid character. +["12c", '-n -t: +1', {IN=>"a:1\nb:X\n"}, {OUT=>"b:X\na:1\n"}], +["12d", '-n -t: +1', {IN=>"b:X\na:1\n"}, {OUT=>"b:X\na:1\n"}], +# From Karl Heuer +["13a", '+0.1n', {IN=>"axx\nb-1\n"}, {OUT=>"b-1\naxx\n"}], +["13b", '+0.1n', {IN=>"b-1\naxx\n"}, {OUT=>"b-1\naxx\n"}], +# +# From Carl Johnson <carlj@cjlinux.home.org> +["14a", '-d -u', {IN=>"mal\nmal-\nmala\n"}, {OUT=>"mal\nmala\n"}], +# Be sure to fix the (translate && ignore) case in keycompare. +["14b", '-f -d -u', {IN=>"mal\nmal-\nmala\n"}, {OUT=>"mal\nmala\n"}], +# +# Experiment with -i. +["15a", '-i -u', {IN=>"a\na\1\n"}, {OUT=>"a\n"}], +["15b", '-i -u', {IN=>"a\n\1a\n"}, {OUT=>"a\n"}], +["15c", '-i -u', {IN=>"a\1\na\n"}, {OUT=>"a\1\n"}], +["15d", '-i -u', {IN=>"\1a\na\n"}, {OUT=>"\1a\n"}], +["15e", '-i -u', {IN=>"a\n\1\1\1\1\1a\1\1\1\1\n"}, {OUT=>"a\n"}], + +# This would fail (printing only the 7) for 8.6..8.18. +# Use --parallel=1 for reproducibility, and a small buffer size +# to let us trigger the problem with a smaller input. +["unique-1", '--p=1 -S32b -u', {IN=>"7\n"x11 . "1\n"}, {OUT=>"1\n7\n"}], +# Demonstrate that 8.19's key-spec-adjusting code is required. +# These are more finicky in that they are arch-dependent. +["unique-key-i686", '-u -k2,2 --p=1 -S32b', + {IN=>"a 7\n"x10 . "b 1\n"}, {OUT=>"b 1\na 7\n"}], +["unique-key-x86_64", '-u -k2,2 --p=1 -S32b', + {IN=>"a 7\n"x11 . "b 1\n"}, {OUT=>"b 1\na 7\n"}], +# Before 8.19, this would trigger a free-memory read. +["unique-free-mem-read", '-u --p=1 -S32b', + {IN=>"a\n"."b"x900 ."\n"}, + {OUT=>"a\n"."b"x900 ."\n"}], + +# From Erick Branderhorst -- fixed around 1.19e +["16a", '-f', + {IN=>"éminence\nüberhaupt\n's-Gravenhage\naëroclub\nAag\naagtappels\n"}, + {OUT=>"'s-Gravenhage\nAag\naagtappels\naëroclub\néminence\nüberhaupt\n"}], + +# This provokes a one-byte memory overrun of a malloc'd block for versions +# of sort from textutils-1.19p and before. +["17", '-c', {IN=>"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\n"}], + +# POSIX says -n no longer implies -b, so here we're comparing ' 9' and '10'. +["18a", '-k1.1,1.2n', {IN=>" 901\n100\n"}, {OUT=>" 901\n100\n"}], + +# Just like above, because the global '-b' has no effect on the +# key specifier when a key-specific option ('n' in this case) is used. +["18b", '-b -k1.1,1.2n', {IN=>" 901\n100\n"}, {OUT=>" 901\n100\n"}], + +# Here we're comparing ' 90' and '10', because the 'b' on the key-end specifier +# makes sort ignore leading blanks when determining that key's *end*. +["18c", '-k1.1,1.2nb', {IN=>" 901\n100\n"}, {OUT=>"100\n 901\n"}], + +# Here we're comparing '9' and '10', because the 'b' on the key-start specifier +# makes sort ignore leading blanks when determining that key's *start*. +["18d", '-k1.1b,1.2n', {IN=>" 901\n100\n"}, {OUT=>" 901\n100\n"}], + +# This compares '90' and '10', as it ignores leading blanks for both +# key start and key end. +["18e", '-nb -k1.1,1.2', {IN=>" 901\n100\n"}, {OUT=>"100\n 901\n"}], + +# When ignoring leading blanks for end position, ensure blanks from +# next field are not included in the sort. I.E. order should not change here. +["18f", '-k1,1b', {IN=>"a y\na z\n"}, {OUT=>"a y\na z\n"}], + +# When ignoring leading blanks for start position, ensure blanks from +# next field are not included in the sort. I.E. order should not change here. +# This was noticed as an issue on fedora 8 (only in multibyte locales). +["18g", '-k1b,1', {IN=>"a y\na z\n"}, {OUT=>"a y\na z\n"}, + {ENV => "LC_ALL=$mb_locale"}], + +# This looks odd, but works properly -- 2nd keyspec is never +# used because all lines are different. +["19a", '+0 +1nr', {IN=>"b 2\nb 1\nb 3\n"}, {OUT=>"b 1\nb 2\nb 3\n"}], + +# The test *intended* by the author of the above, but using the +# more-intuitive POSIX-style -k options. +["19b", '-k1,1 -k2nr', {IN=>"b 2\nb 1\nb 3\n"}, {OUT=>"b 3\nb 2\nb 1\n"}], + +# This test failed when sort-1.22 was compiled on a Next x86 system +# without optimization. Without optimization gcc uses the buggy version +# of memcmp in the Next C library. With optimization, gcc uses its +# (working) builtin version. Test case form William Lewis. +["20a", '', + {IN=>"_________U__free\n_________U__malloc\n_________U__abort\n" + . "_________U__memcpy\n_________U__memset\n" + . "_________U_dyld_stub_binding_helper\n_________U__malloc\n" + . "_________U___iob\n_________U__abort\n_________U__fprintf\n"}, + {OUT=>"_________U___iob\n_________U__abort\n_________U__abort\n" + . "_________U__fprintf\n_________U__free\n_________U__malloc\n" + . "_________U__malloc\n_________U__memcpy\n_________U__memset\n" + . "_________U_dyld_stub_binding_helper\n"}], + +# Demonstrate that folding changes the ordering of e.g. A, a, and _ +# because while they normally (in the C locale) collate like A, _, a, +# when using -f, 'a' is compared as if it were 'A'. +["21a", '', {IN=>"A\na\n_\n"}, {OUT=>"A\n_\na\n"}], +["21b", '-f', {IN=>"A\na\n_\n"}, {OUT=>"A\na\n_\n"}], +["21c", '-f', {IN=>"a\nA\n_\n"}, {OUT=>"A\na\n_\n"}], +["21d", '-f', {IN=>"_\na\nA\n"}, {OUT=>"A\na\n_\n"}], +["21e", '-f', {IN=>"a\n_\nA\n"}, {OUT=>"A\na\n_\n"}], +["21f", '-fs', {IN=>"A\na\n_\n"}, {OUT=>"A\na\n_\n"}], +["21g", '-fu', {IN=>"a\n_\n"}, {OUT=>"a\n_\n"}], + +# This test failed until 1.22f. From Zvi Har'El. +["22a", '-k 2,2fd -k 1,1r', {IN=>"3 b\n4 B\n"}, {OUT=>"4 B\n3 b\n"}], +["22b", '-k 2,2d -k 1,1r', {IN=>"3 b\n4 b\n"}, {OUT=>"4 b\n3 b\n"}], + +["no-file1", 'no-file', {EXIT=>2}, {ERR=>$no_file}], +# This test failed until 1.22f. Sort didn't give an error. +# From Will Edgington. +["o-no-file1", qw(-o no-file no-file), {EXIT=>2}, {ERR=>$no_file}], + +["create-empty", qw(-o no/such/file /dev/null), {EXIT=>2}, + {ERR=>"$prog: open failed: no/such/file: No such file or directory\n"}], + +# From Paul Eggert. This was fixed in textutils-1.22k. +["neg-nls", '-n', {IN=>"-1\n-9\n"}, {OUT=>"-9\n-1\n"}], + +# From Paul Eggert. This was fixed in textutils-1.22m. +# The bug was visible only when using the internationalized sorting code +# (i.e., not when configured with --disable-nls). +["nul-nls", '', {IN=>"\0b\n\0a\n"}, {OUT=>"\0a\n\0b\n"}], + +# Paul Eggert wrote: +# A previous version of POSIX incorrectly required that the newline +# at the end of the input line contributed to the sort, which would +# mean that an empty line should sort after a line starting with a tab +# (because \t precedes \n in the ASCII collating sequence). +# GNU 'sort' was altered to do this, but was changed back once it +# was discovered to be a POSIX bug (and the POSIX bug was fixed). +# Check that 'sort' conforms to the fixed POSIX, not to the buggy one. +["use-nl", '', {IN=>"\n\t\n"}, {OUT=>"\n\t\n"}], + +# Specifying two -o options should evoke a failure +["o2", qw(-o x -o y), {EXIT=>2}, + {ERR=>"foo\n"}, {ERR_SUBST => 's/^$prog: .*/foo/'}], + +# Specifying incompatible options should evoke a failure. +["incompat1", '-in', {EXIT=>2}, + {ERR=>"$prog: options '-in' are incompatible\n"}], +["incompat2", '-nR', {EXIT=>2}, + {ERR=>"$prog: options '-nR' are incompatible\n"}], +["incompat3", '-dfgiMnR', {EXIT=>2}, + {ERR=>"$prog: options '-dfgMnR' are incompatible\n"}], +["incompat4", qw(-c -o /dev/null), {EXIT=>2}, + {ERR=>"$prog: options '-co' are incompatible\n"}], +["incompat5", qw(-C -o /dev/null), {EXIT=>2}, + {ERR=>"$prog: options '-Co' are incompatible\n"}], +["incompat6", '-cC', {EXIT=>2}, + {ERR=>"$prog: options '-cC' are incompatible\n"}], +["incompat7", qw(--sort=random -n), {EXIT=>2}, + {ERR=>"$prog: options '-nR' are incompatible\n"}], + +# -t '\0' is accepted, as of coreutils-5.0.91 +['nul-tab', "-k2,2 -t '\\0'", + {IN=>"a\0z\01\nb\0y\02\n"}, {OUT=>"b\0y\02\na\0z\01\n"}], + +# fields > SIZE_MAX are silently interpreted as SIZE_MAX +["bigfield1", "-k $limits->{UINTMAX_OFLOW}", + {IN=>"2\n1\n"}, {OUT=>"1\n2\n"}], +["bigfield2", "-k $limits->{SIZE_OFLOW}", + {IN=>"2\n1\n"}, {OUT=>"1\n2\n"}], + +# Using an old-style key-specifying option like +1 with an invalid +# ordering-option character would cause sort to try to free an invalid +# (non-malloc'd) pointer. This bug affects coreutils-6.5 through 6.9. +['obs-inval', '+1x', {EXIT=>2}, + {ERR=>"foo\n"}, {ERR_SUBST => 's/^$prog: .*/foo/'}], + +# Exercise the code that enlarges the line buffer. See the thread here: +# http://thread.gmane.org/gmane.comp.gnu.coreutils.bugs/11006 +['realloc-buf', '-S1', {IN=>'a'x4000 ."\n"}, {OUT=>'a'x4000 ."\n"}], +['realloc-buf-2', '-S1', {IN=>'a'x5 ."\n"}, {OUT=>'a'x5 ."\n"}], + +["sort-numeric", '--sort=numeric', {IN=>".01\n0\n"}, {OUT=>"0\n.01\n"}], +["sort-gennum", '--sort=general-numeric', + {IN=>"1e2\n2e1\n"}, {OUT=>"2e1\n1e2\n"}], + +# -m with output file also used as an input file +# In coreutils-7.2, this caused a segfault. +# This test looks a little strange. Here's why: +# since we're using "-o f", standard output will be empty, hence OUT=>'' +# We still want to ensure that the output file, "f" has expected contents, +# hence the added CMP=> directive. +["output-is-input", '-m -o f', {IN=> {f=> "a\n"}}, {OUT=>''}, + {CMP=> ["a\n", {'f'=> undef}]} ], +["output-is-input-2", '-m -o f', {OUT=>''}, + {IN=> {f=> "a\n"}}, {IN=> {g=> "b\n"}}, {IN=> {h=> "c\n"}}, + {CMP=> ["a\nb\nc\n", {'f'=> undef}]} ], +["output-is-input-3", '-m -o f', {OUT=>''}, + {IN=> {g=> "a\n"}}, {IN=> {h=> "b\n"}}, {IN=> {f=> "c\n"}}, + {CMP=> ["a\nb\nc\n", {'f'=> undef}]} ], +); + +# Add _POSIX2_VERSION=199209 to the environment of each test +# that uses an old-style option like +1. +foreach my $t (@Tests) + { + foreach my $e (@$t) + { + !ref $e && $e =~ /\+\d/ + and push (@$t, {ENV=>'_POSIX2_VERSION=199209'}), last; + } + } + +@Tests = triple_test \@Tests; + +# Remember that triple_test creates from each test with exactly one "IN" +# file two more tests (.p and .r suffix on name) corresponding to reading +# input from a file and from a pipe. The pipe-reading test would fail +# due to a race condition about 1 in 20 times. +# Remove the IN_PIPE version of the "output-is-input" test above. +# The others aren't susceptible because they have three inputs each. +@Tests = grep {$_->[0] ne 'output-is-input.p'} @Tests; + +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/stat-birthtime b/tests/misc/stat-birthtime deleted file mode 100755 index dd68e675..00000000 --- a/tests/misc/stat-birthtime +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/sh -# ensure that stat attempts birthtime access - -# Copyright (C) 2010-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ stat - -# Whether birthtime is supported or not, it better not change even when -# [acm]time are modified. :) -touch a || fail=1 -btime=$(stat --format %W a) || fail=1 -atime=$(stat --format %X a) || fail=1 -mtime=$(stat --format %Y a) || fail=1 -ctime=$(stat --format %Z a) || fail=1 - -# Wait up to 2.17s for timestamps to change. -# ---------------------------------------- -# iterations file system resolution e.g. -# ---------------------------------------- -# 1 nano or micro second ext4 -# 4 1 second ext3 -# 5 2 second FAT -# ---------------------------------------- -check_timestamps_updated() -{ - local delay="$1" - sleep $delay - touch a || fail=1 - - test "x$btime" = x$(stat --format %W a) && - test "x$atime" != x$(stat --format %X a) && - test "x$mtime" != x$(stat --format %Y a) && - test "x$ctime" != x$(stat --format %Z a) -} -retry_delay_ check_timestamps_updated .07 5 || fail=1 - -Exit $fail diff --git a/tests/misc/stat-birthtime.sh b/tests/misc/stat-birthtime.sh new file mode 100755 index 00000000..b30c972b --- /dev/null +++ b/tests/misc/stat-birthtime.sh @@ -0,0 +1,51 @@ +#!/bin/sh +# ensure that stat attempts birthtime access + +# Copyright (C) 2010-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ stat + +# Whether birthtime is supported or not, it better not change even when +# [acm]time are modified. :) +touch a || fail=1 +btime=$(stat --format %W a) || fail=1 +atime=$(stat --format %X a) || fail=1 +mtime=$(stat --format %Y a) || fail=1 +ctime=$(stat --format %Z a) || fail=1 + +# Wait up to 2.17s for timestamps to change. +# ---------------------------------------- +# iterations file system resolution e.g. +# ---------------------------------------- +# 1 nano or micro second ext4 +# 4 1 second ext3 +# 5 2 second FAT +# ---------------------------------------- +check_timestamps_updated() +{ + local delay="$1" + sleep $delay + touch a || fail=1 + + test "x$btime" = x$(stat --format %W a) && + test "x$atime" != x$(stat --format %X a) && + test "x$mtime" != x$(stat --format %Y a) && + test "x$ctime" != x$(stat --format %Z a) +} +retry_delay_ check_timestamps_updated .07 5 || fail=1 + +Exit $fail diff --git a/tests/misc/stat-fmt b/tests/misc/stat-fmt deleted file mode 100755 index 8952a7ab..00000000 --- a/tests/misc/stat-fmt +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# ensure that stat properly handles a format string ending with % - -# Copyright (C) 2003-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ stat - - - -for i in $(seq 50); do - fmt=$(printf "%${i}s" %) - out=$(stat --form="$fmt" .) - test "$out" = "$fmt" || fail=1 -done - -Exit $fail diff --git a/tests/misc/stat-fmt.sh b/tests/misc/stat-fmt.sh new file mode 100755 index 00000000..547f5b8f --- /dev/null +++ b/tests/misc/stat-fmt.sh @@ -0,0 +1,30 @@ +#!/bin/sh +# ensure that stat properly handles a format string ending with % + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ stat + + + +for i in $(seq 50); do + fmt=$(printf "%${i}s" %) + out=$(stat --form="$fmt" .) + test "$out" = "$fmt" || fail=1 +done + +Exit $fail diff --git a/tests/misc/stat-hyphen b/tests/misc/stat-hyphen deleted file mode 100755 index a6b52436..00000000 --- a/tests/misc/stat-hyphen +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# demonstrate that stat - works and stat -f - does not. - -# Copyright (C) 2009-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ stat - -printf -- '-\n' > exp || framework_failure_ -touch f || framework_failure_ - -stat --format=%n - < f > out || fail=1 -stat -f - < f && fail=1 - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/misc/stat-hyphen.sh b/tests/misc/stat-hyphen.sh new file mode 100755 index 00000000..a817b285 --- /dev/null +++ b/tests/misc/stat-hyphen.sh @@ -0,0 +1,30 @@ +#!/bin/sh +# demonstrate that stat - works and stat -f - does not. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ stat + +printf -- '-\n' > exp || framework_failure_ +touch f || framework_failure_ + +stat --format=%n - < f > out || fail=1 +stat -f - < f && fail=1 + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/misc/stat-mount b/tests/misc/stat-mount deleted file mode 100755 index c93d8dcb..00000000 --- a/tests/misc/stat-mount +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# Test stat -c%m - -# Copyright (C) 2010-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 -# 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=.}/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 - -Exit $fail diff --git a/tests/misc/stat-mount.sh b/tests/misc/stat-mount.sh new file mode 100755 index 00000000..f94c77cb --- /dev/null +++ b/tests/misc/stat-mount.sh @@ -0,0 +1,26 @@ +#!/bin/sh +# Test stat -c%m + +# Copyright (C) 2010-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/>. + +. "${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 + +Exit $fail diff --git a/tests/misc/stat-nanoseconds b/tests/misc/stat-nanoseconds deleted file mode 100755 index 1afb610f..00000000 --- a/tests/misc/stat-nanoseconds +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh -# Exercise format strings involving %:X, %:Y, etc. - -# Copyright (C) 2010-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 -# 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/>. - -print_ver_ stat -. "${srcdir=.}/init.sh"; path_prepend_ ../src - -# Set this to avoid problems with weird time zones. -TZ=UTC0 -export TZ - -# Use a time stamp near the Epoch to avoid trouble with leap seconds. -touch -d '1970-01-01 18:43:33.023456789' k || framework_failure_ - -ls --full-time | grep 18:43:33.023456789 \ - || skip_ this file system does not support sub-second time stamps - -test "$(stat -c %X k)" = 67413 || fail=1 -test "$(stat -c %.X k)" = 67413.023456789 || fail=1 -test "$(stat -c %.1X k)" = 67413.0 || fail=1 -test "$(stat -c %.3X k)" = 67413.023 || fail=1 -test "$(stat -c %.6X k)" = 67413.023456 || fail=1 -test "$(stat -c %.9X k)" = 67413.023456789 || fail=1 -test "$(stat -c %13.6X k)" = ' 67413.023456' || fail=1 -test "$(stat -c %013.6X k)" = 067413.023456 || fail=1 -test "$(stat -c %-13.6X k)" = '67413.023456 ' || fail=1 -test "$(stat -c %18.10X k)" = ' 67413.0234567890' || fail=1 -test "$(stat -c %I18.10X k)" = ' 67413.0234567890' || fail=1 -test "$(stat -c %018.10X k)" = 0067413.0234567890 || fail=1 -test "$(stat -c %-18.10X k)" = '67413.0234567890 ' || fail=1 - -Exit $fail diff --git a/tests/misc/stat-nanoseconds.sh b/tests/misc/stat-nanoseconds.sh new file mode 100755 index 00000000..9c891b76 --- /dev/null +++ b/tests/misc/stat-nanoseconds.sh @@ -0,0 +1,46 @@ +#!/bin/sh +# Exercise format strings involving %:X, %:Y, etc. + +# Copyright (C) 2010-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/>. + +print_ver_ stat +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src + +# Set this to avoid problems with weird time zones. +TZ=UTC0 +export TZ + +# Use a time stamp near the Epoch to avoid trouble with leap seconds. +touch -d '1970-01-01 18:43:33.023456789' k || framework_failure_ + +ls --full-time | grep 18:43:33.023456789 \ + || skip_ this file system does not support sub-second time stamps + +test "$(stat -c %X k)" = 67413 || fail=1 +test "$(stat -c %.X k)" = 67413.023456789 || fail=1 +test "$(stat -c %.1X k)" = 67413.0 || fail=1 +test "$(stat -c %.3X k)" = 67413.023 || fail=1 +test "$(stat -c %.6X k)" = 67413.023456 || fail=1 +test "$(stat -c %.9X k)" = 67413.023456789 || fail=1 +test "$(stat -c %13.6X k)" = ' 67413.023456' || fail=1 +test "$(stat -c %013.6X k)" = 067413.023456 || fail=1 +test "$(stat -c %-13.6X k)" = '67413.023456 ' || fail=1 +test "$(stat -c %18.10X k)" = ' 67413.0234567890' || fail=1 +test "$(stat -c %I18.10X k)" = ' 67413.0234567890' || fail=1 +test "$(stat -c %018.10X k)" = 0067413.0234567890 || fail=1 +test "$(stat -c %-18.10X k)" = '67413.0234567890 ' || fail=1 + +Exit $fail diff --git a/tests/misc/stat-printf b/tests/misc/stat-printf deleted file mode 100755 index 929b255e..00000000 --- a/tests/misc/stat-printf +++ /dev/null @@ -1,64 +0,0 @@ -#!/usr/bin/perl -# Test "stat --printf". - -# Copyright (C) 2005-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 -# 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; - -(my $ME = $0) =~ s|.*/||; -my $prog = 'stat'; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -my @Tests = - ( - # test-name, [option, option, ...] {OUT=>"expected-output"} - # - ['nl', q!--printf='\n' .!, {OUT=>"\n"}], - ['no-nl', "--printf=%n .", {OUT=>"."}], - ['pct-and-esc', q!--printf='\0%n\0' .!, {OUT=>"\0.\0"}], - ['backslash', q!--printf='\\\\' .!, {OUT=>"\\"}], - ['nul', q!--printf='\0' .!, {OUT=>"\0"}], - # Don't bother testing \v, since Perl doesn't handle it. - ['bel-etc', q!--printf='\a\b\f\n\r\t' .!, {OUT=>"\a\b\f\n\r\t"}], - ['octal-1', q!--printf='\012\377' .!, {OUT=>"\012\377"}], - ['octal-2', q!--printf='.\012a\377b' .!, {OUT=>".\012a\377b"}], - ['hex-1', q!--printf='\x34\xf' .!, {OUT=>"\x34\xf"}], - ['hex-2', q!--printf='.\x18p\xfq' .!, {OUT=>".\x18p\x0fq"}], - ['hex-3', q!--printf='\x' .!, {OUT=>'x'}, - {ERR=>"$prog: warning: unrecognized escape '\\x'\n"}], - - # With --format, there *is* a trailing newline. - ['f-nl', "--format=%n .", {OUT=>".\n"}], - ['f-nl2', "--format=%n . .", {OUT=>".\n.\n"}], - - ['end-pct', "--printf=% .", {OUT=>"%"}], - ['pct-pct', "--printf=%% .", {OUT=>"%"}], - ['end-bs', "--printf='\\' .", {OUT=>'\\'}, - {ERR=>"$prog: warning: backslash at end of format\n"}], - - ['err-1', "--printf=%9% .", {EXIT => 1}, - {ERR=>"$prog: %9%: invalid directive\n"}], - ['err-2', "--printf=%9 .", {EXIT => 1}, - {ERR=>"$prog: %9: invalid directive\n"}], - ); - -my $save_temps = $ENV{DEBUG}; -my $verbose = $ENV{VERBOSE}; - -my $fail = run_tests ($ME, $prog, \@Tests, $save_temps, $verbose); -exit $fail; diff --git a/tests/misc/stat-printf.pl b/tests/misc/stat-printf.pl new file mode 100755 index 00000000..fb31043f --- /dev/null +++ b/tests/misc/stat-printf.pl @@ -0,0 +1,64 @@ +#!/usr/bin/perl +# Test "stat --printf". + +# Copyright (C) 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 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; + +(my $ME = $0) =~ s|.*/||; +my $prog = 'stat'; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +my @Tests = + ( + # test-name, [option, option, ...] {OUT=>"expected-output"} + # + ['nl', q!--printf='\n' .!, {OUT=>"\n"}], + ['no-nl', "--printf=%n .", {OUT=>"."}], + ['pct-and-esc', q!--printf='\0%n\0' .!, {OUT=>"\0.\0"}], + ['backslash', q!--printf='\\\\' .!, {OUT=>"\\"}], + ['nul', q!--printf='\0' .!, {OUT=>"\0"}], + # Don't bother testing \v, since Perl doesn't handle it. + ['bel-etc', q!--printf='\a\b\f\n\r\t' .!, {OUT=>"\a\b\f\n\r\t"}], + ['octal-1', q!--printf='\012\377' .!, {OUT=>"\012\377"}], + ['octal-2', q!--printf='.\012a\377b' .!, {OUT=>".\012a\377b"}], + ['hex-1', q!--printf='\x34\xf' .!, {OUT=>"\x34\xf"}], + ['hex-2', q!--printf='.\x18p\xfq' .!, {OUT=>".\x18p\x0fq"}], + ['hex-3', q!--printf='\x' .!, {OUT=>'x'}, + {ERR=>"$prog: warning: unrecognized escape '\\x'\n"}], + + # With --format, there *is* a trailing newline. + ['f-nl', "--format=%n .", {OUT=>".\n"}], + ['f-nl2', "--format=%n . .", {OUT=>".\n.\n"}], + + ['end-pct', "--printf=% .", {OUT=>"%"}], + ['pct-pct', "--printf=%% .", {OUT=>"%"}], + ['end-bs', "--printf='\\' .", {OUT=>'\\'}, + {ERR=>"$prog: warning: backslash at end of format\n"}], + + ['err-1', "--printf=%9% .", {EXIT => 1}, + {ERR=>"$prog: %9%: invalid directive\n"}], + ['err-2', "--printf=%9 .", {EXIT => 1}, + {ERR=>"$prog: %9: invalid directive\n"}], + ); + +my $save_temps = $ENV{DEBUG}; +my $verbose = $ENV{VERBOSE}; + +my $fail = run_tests ($ME, $prog, \@Tests, $save_temps, $verbose); +exit $fail; diff --git a/tests/misc/stat-slash b/tests/misc/stat-slash deleted file mode 100755 index ff122eb0..00000000 --- a/tests/misc/stat-slash +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -# demonstrate that stat handles trailing slashes correctly - -# Copyright (C) 2009-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ stat - -touch file || framework_failure_ -mkdir dir || framework_failure_ -ln -s file link1 || framework_failure_ -ln -s dir link2 || framework_failure_ - -cat <<EOF > exp || framework_failure_ -link1 -symbolic link -directory -directory -EOF - -# This failed on Solaris 9 for coreutils 8.0. -stat --format=%n link1 > out || fail=1 -stat --format=%n link1/ >> out && fail=1 - -stat --format=%F link2 >> out || fail=1 -stat -L --format=%F link2 >> out || fail=1 -stat --format=%F link2/ >> out || fail=1 - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/misc/stat-slash.sh b/tests/misc/stat-slash.sh new file mode 100755 index 00000000..47aa7907 --- /dev/null +++ b/tests/misc/stat-slash.sh @@ -0,0 +1,44 @@ +#!/bin/sh +# demonstrate that stat handles trailing slashes correctly + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ stat + +touch file || framework_failure_ +mkdir dir || framework_failure_ +ln -s file link1 || framework_failure_ +ln -s dir link2 || framework_failure_ + +cat <<EOF > exp || framework_failure_ +link1 +symbolic link +directory +directory +EOF + +# This failed on Solaris 9 for coreutils 8.0. +stat --format=%n link1 > out || fail=1 +stat --format=%n link1/ >> out && fail=1 + +stat --format=%F link2 >> out || fail=1 +stat -L --format=%F link2 >> out || fail=1 +stat --format=%F link2/ >> out || fail=1 + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/misc/stdbuf b/tests/misc/stdbuf deleted file mode 100755 index 3164df1b..00000000 --- a/tests/misc/stdbuf +++ /dev/null @@ -1,121 +0,0 @@ -#!/bin/sh -# Exercise stdbuf functionality - -# Copyright (C) 2009-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ stdbuf - -getlimits_ -require_built_ stdbuf - -# stdbuf fails when the absolute top build dir name contains e.g., -# space, TAB, NL -lf=' -' -case $abs_top_builddir in - *[\\\"\#\$\&\'\`$lf\ \ ]*) - skip_ "unsafe absolute build directory name: $abs_top_builddir";; -esac - -# Use a fifo rather than a pipe in the tests below -# so that the producer (uniq) will wait until the -# consumer (dd) opens the fifo therefore increasing -# the chance that dd will read the data from each -# write separately. -mkfifo_or_skip_ fifo - - -# Verify input parameter checking -stdbuf -o1 true || fail=1 # verify size syntax -stdbuf -oK true || fail=1 # verify size syntax -stdbuf -o0 true || fail=1 # verify unbuffered syntax -stdbuf -oL true || fail=1 # verify line buffered syntax -stdbuf -ol true # Capital 'L' required -test $? = 125 || fail=1 # Internal error is a particular status -stdbuf -o$SIZE_OFLOW true # size too large -test $? = 125 || fail=1 -stdbuf -iL true # line buffering stdin disallowed -test $? = 125 || fail=1 -stdbuf -i0 -o0 -e0 true || fail=1 #check all files -stdbuf -o1 . # invalid command -test $? = 126 || fail=1 -stdbuf -o1 no_such # no such command -test $? = 127 || fail=1 - -# Ensure line buffering stdout takes effect -stdbuf_linebuffer() -{ - local delay="$1" - - printf '1\n' > exp - dd count=1 if=fifo > out 2> err & - (printf '1\n'; sleep $delay; printf '2\n') | stdbuf -oL uniq > fifo - wait # for dd to complete - compare exp out -} - -retry_delay_ stdbuf_linebuffer .1 6 || fail=1 - -stdbuf_unbuffer() -{ - local delay="$1" - - # Ensure un buffering stdout takes effect - printf '1\n' > exp - dd count=1 if=fifo > out 2> err & - (printf '1\n'; sleep $delay; printf '2\n') | stdbuf -o0 uniq > fifo - wait # for dd to complete - compare exp out -} - -retry_delay_ stdbuf_unbuffer .1 6 || fail=1 - -# Ensure un buffering stdin takes effect -# The following works for me, but is racy. I.E. we're depending -# on dd to run and close the fifo before the second write by uniq. -# If we add a sleep, then we're just testing -oL - # printf '3\n' > exp - # dd count=1 if=fifo > /dev/null 2> err & - # printf '1\n\2\n3\n' | (stdbuf -i0 -oL uniq > fifo; cat) > out - # wait # for dd to complete - # compare exp out || fail=1 -# One could remove the need for dd (used to close the fifo to get uniq to quit -# early), if head -n1 read stdin char by char. Note uniq | head -c2 doesn't -# suffice due to the buffering implicit in the pipe. sed currently does read -# stdin char by char, so we can test with 'sed 1q'. However I'm wary about -# adding this dependency on a program outside of coreutils. - # printf '2\n' > exp - # printf '1\n2\n' | (stdbuf -i0 sed 1q >/dev/null; cat) > out - # compare exp out || fail=1 - -# Ensure block buffering stdout takes effect -# We don't currently test block buffering failures as -# this doesn't work on GLIBC-2.7 or GLIBC-2.9 at least. - # stdbuf_blockbuffer() - # { - # local delay="$1" - # - # printf '1\n2\n' > exp - # dd count=1 if=fifo > out 2> err & - # (printf '1\n'; sleep $delay; printf '2\n') | stdbuf -o4 uniq > fifo - # wait # for dd to complete - # compare exp out - # } - # - # retry_delay_ stdbuf_blockbuffer .1 6 || fail=1 - -Exit $fail diff --git a/tests/misc/stdbuf.sh b/tests/misc/stdbuf.sh new file mode 100755 index 00000000..12347ecc --- /dev/null +++ b/tests/misc/stdbuf.sh @@ -0,0 +1,121 @@ +#!/bin/sh +# Exercise stdbuf functionality + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ stdbuf + +getlimits_ +require_built_ stdbuf + +# stdbuf fails when the absolute top build dir name contains e.g., +# space, TAB, NL +lf=' +' +case $abs_top_builddir in + *[\\\"\#\$\&\'\`$lf\ \ ]*) + skip_ "unsafe absolute build directory name: $abs_top_builddir";; +esac + +# Use a fifo rather than a pipe in the tests below +# so that the producer (uniq) will wait until the +# consumer (dd) opens the fifo therefore increasing +# the chance that dd will read the data from each +# write separately. +mkfifo_or_skip_ fifo + + +# Verify input parameter checking +stdbuf -o1 true || fail=1 # verify size syntax +stdbuf -oK true || fail=1 # verify size syntax +stdbuf -o0 true || fail=1 # verify unbuffered syntax +stdbuf -oL true || fail=1 # verify line buffered syntax +stdbuf -ol true # Capital 'L' required +test $? = 125 || fail=1 # Internal error is a particular status +stdbuf -o$SIZE_OFLOW true # size too large +test $? = 125 || fail=1 +stdbuf -iL true # line buffering stdin disallowed +test $? = 125 || fail=1 +stdbuf -i0 -o0 -e0 true || fail=1 #check all files +stdbuf -o1 . # invalid command +test $? = 126 || fail=1 +stdbuf -o1 no_such # no such command +test $? = 127 || fail=1 + +# Ensure line buffering stdout takes effect +stdbuf_linebuffer() +{ + local delay="$1" + + printf '1\n' > exp + dd count=1 if=fifo > out 2> err & + (printf '1\n'; sleep $delay; printf '2\n') | stdbuf -oL uniq > fifo + wait # for dd to complete + compare exp out +} + +retry_delay_ stdbuf_linebuffer .1 6 || fail=1 + +stdbuf_unbuffer() +{ + local delay="$1" + + # Ensure un buffering stdout takes effect + printf '1\n' > exp + dd count=1 if=fifo > out 2> err & + (printf '1\n'; sleep $delay; printf '2\n') | stdbuf -o0 uniq > fifo + wait # for dd to complete + compare exp out +} + +retry_delay_ stdbuf_unbuffer .1 6 || fail=1 + +# Ensure un buffering stdin takes effect +# The following works for me, but is racy. I.E. we're depending +# on dd to run and close the fifo before the second write by uniq. +# If we add a sleep, then we're just testing -oL + # printf '3\n' > exp + # dd count=1 if=fifo > /dev/null 2> err & + # printf '1\n\2\n3\n' | (stdbuf -i0 -oL uniq > fifo; cat) > out + # wait # for dd to complete + # compare exp out || fail=1 +# One could remove the need for dd (used to close the fifo to get uniq to quit +# early), if head -n1 read stdin char by char. Note uniq | head -c2 doesn't +# suffice due to the buffering implicit in the pipe. sed currently does read +# stdin char by char, so we can test with 'sed 1q'. However I'm wary about +# adding this dependency on a program outside of coreutils. + # printf '2\n' > exp + # printf '1\n2\n' | (stdbuf -i0 sed 1q >/dev/null; cat) > out + # compare exp out || fail=1 + +# Ensure block buffering stdout takes effect +# We don't currently test block buffering failures as +# this doesn't work on GLIBC-2.7 or GLIBC-2.9 at least. + # stdbuf_blockbuffer() + # { + # local delay="$1" + # + # printf '1\n2\n' > exp + # dd count=1 if=fifo > out 2> err & + # (printf '1\n'; sleep $delay; printf '2\n') | stdbuf -o4 uniq > fifo + # wait # for dd to complete + # compare exp out + # } + # + # retry_delay_ stdbuf_blockbuffer .1 6 || fail=1 + +Exit $fail diff --git a/tests/misc/stty b/tests/misc/stty deleted file mode 100755 index ae656564..00000000 --- a/tests/misc/stty +++ /dev/null @@ -1,68 +0,0 @@ -#! /bin/sh -# Make sure stty can parse most of its options. - -# Copyright (C) 1998-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 -# 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/>. - -# Make sure there's a tty on stdin. -. "${srcdir=.}/init.sh"; path_prepend_ ../src -print_ver_ stty - -require_controlling_input_terminal_ -trap '' TTOU # Ignore SIGTTOU - -# Get the reversible settings from stty.c. -stty_reversible_init_ - -saved_state=.saved-state -stty --save > $saved_state || fail=1 -stty $(cat $saved_state) || fail=1 - -# This would segfault prior to sh-utils-2.0j. -stty erase - || fail=1 - -# These would improperly ignore invalid options through coreutils 5.2.1. -stty -F 2>/dev/null && fail=1 -stty -raw -F no/such/file 2>/dev/null && fail=1 -stty -raw -a 2>/dev/null && fail=1 - -# Build a list of all boolean options stty accepts on this system. -# Don't depend on terminal width. Put each option on its own line, -# remove all non-boolean ones, then remove any leading hyphens. -sed_del='/^speed/d;/^rows/d;/^columns/d;/ = /d' -options=$(stty -a | tr -s ';' '\n' | sed "s/^ //;$sed_del;s/-//g") - -# Take them one at a time, with and without the leading '-'. -for opt in $options; do - # 'stty parenb' and 'stty -parenb' fail with this message - # stty: standard input: unable to perform all requested operations - # on Linux 2.2.0-pre4 kernels. Also since around Linux 2.6.30 - # 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|icanon) continue;; esac - - stty $opt || fail=1 - - # Likewise, 'stty -cread' would fail, so skip that, too. - test $opt = cread && continue - if stty_reversible_query_ "$opt" ; then - stty -$opt || { fail=1; echo -$opt; } - fi -done - -stty $(cat $saved_state) - -Exit $fail diff --git a/tests/misc/stty-invalid b/tests/misc/stty-invalid deleted file mode 100755 index 3b035ece..00000000 --- a/tests/misc/stty-invalid +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -# Ensure that stty diagnoses invalid inputs, rather than silently misbehaving. - -# Copyright (C) 2007-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ stty -require_controlling_input_terminal_ -trap '' TTOU # Ignore SIGTTOU - - -saved_state=$(stty -g) || fail=1 -stty $saved_state || fail=1 - -# Before coreutils-6.9.90, if stty were given an argument with 35 colons -# separating 36 hexadecimal strings, stty would fail to diagnose as invalid -# any number that was out of range as long as sscanf happened to -# overflow/wrap it back into the range of the corresponding type (either -# tcflag_t or cc_t). - -# For each of the following, with coreutils-6.9 and earlier, -# stty would fail to diagnose the error on at least Solaris 10. -hex_2_64=10000000000000000 -stty $(echo $saved_state |sed 's/^[^:]*:/'$hex_2_64:/) 2>/dev/null && fail=1 -stty $(echo $saved_state |sed 's/:[0-9a-f]*$/:'$hex_2_64/) 2>/dev/null && fail=1 - -# Just in case either of the above mistakenly succeeds (and changes -# the state of our tty), try to restore the initial state. -stty $saved_state || fail=1 - -Exit $fail diff --git a/tests/misc/stty-invalid.sh b/tests/misc/stty-invalid.sh new file mode 100755 index 00000000..c6400fcf --- /dev/null +++ b/tests/misc/stty-invalid.sh @@ -0,0 +1,44 @@ +#!/bin/sh +# Ensure that stty diagnoses invalid inputs, rather than silently misbehaving. + +# Copyright (C) 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ stty +require_controlling_input_terminal_ +trap '' TTOU # Ignore SIGTTOU + + +saved_state=$(stty -g) || fail=1 +stty $saved_state || fail=1 + +# Before coreutils-6.9.90, if stty were given an argument with 35 colons +# separating 36 hexadecimal strings, stty would fail to diagnose as invalid +# any number that was out of range as long as sscanf happened to +# overflow/wrap it back into the range of the corresponding type (either +# tcflag_t or cc_t). + +# For each of the following, with coreutils-6.9 and earlier, +# stty would fail to diagnose the error on at least Solaris 10. +hex_2_64=10000000000000000 +stty $(echo $saved_state |sed 's/^[^:]*:/'$hex_2_64:/) 2>/dev/null && fail=1 +stty $(echo $saved_state |sed 's/:[0-9a-f]*$/:'$hex_2_64/) 2>/dev/null && fail=1 + +# Just in case either of the above mistakenly succeeds (and changes +# the state of our tty), try to restore the initial state. +stty $saved_state || fail=1 + +Exit $fail diff --git a/tests/misc/stty-pairs b/tests/misc/stty-pairs deleted file mode 100755 index e59da043..00000000 --- a/tests/misc/stty-pairs +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/sh -# Make sure stty can parse most of its options - in pairs [expensive]. - -# Copyright (C) 1998-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ stty - -expensive_ - -# Make sure there's a tty on stdin. -require_controlling_input_terminal_ -trap '' TTOU # Ignore SIGTTOU - -# Get the reversible settings from stty.c. -stty_reversible_init_ - -saved_state=.saved-state -stty --save > $saved_state || fail=1 -stty $(cat $saved_state) || fail=1 - -# Build a list of all boolean options stty accepts on this system. -# Don't depend on terminal width. Put each option on its own line, -# remove all non-boolean ones, remove 'parenb' and 'cread' explicitly, -# then remove any leading hyphens. -sed_del='/^speed/d;/^rows/d;/^columns/d;/ = /d;s/parenb//;s/cread//' -options=$(stty -a | tr -s ';' '\n' | sed "s/^ //;$sed_del;s/-//g") - -# Take them in pairs, with and without the leading '-'. -for opt1 in $options; do - for opt2 in $options; do - - stty $opt1 $opt2 || fail=1 - - if stty_reversible_query_ "$opt1" ; then - stty -$opt1 $opt2 || fail=1 - fi - if stty_reversible_query_ "$opt2" ; then - stty $opt1 -$opt2 || fail=1 - fi - if stty_reversible_query_ "$opt1" \ - && stty_reversible_query_ "$opt2" ; then - stty -$opt1 -$opt2 || fail=1 - fi - done -done - -stty $(cat $saved_state) - -Exit $fail diff --git a/tests/misc/stty-pairs.sh b/tests/misc/stty-pairs.sh new file mode 100755 index 00000000..be5b6f84 --- /dev/null +++ b/tests/misc/stty-pairs.sh @@ -0,0 +1,63 @@ +#!/bin/sh +# Make sure stty can parse most of its options - in pairs [expensive]. + +# Copyright (C) 1998-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ stty + +expensive_ + +# Make sure there's a tty on stdin. +require_controlling_input_terminal_ +trap '' TTOU # Ignore SIGTTOU + +# Get the reversible settings from stty.c. +stty_reversible_init_ + +saved_state=.saved-state +stty --save > $saved_state || fail=1 +stty $(cat $saved_state) || fail=1 + +# Build a list of all boolean options stty accepts on this system. +# Don't depend on terminal width. Put each option on its own line, +# remove all non-boolean ones, remove 'parenb' and 'cread' explicitly, +# then remove any leading hyphens. +sed_del='/^speed/d;/^rows/d;/^columns/d;/ = /d;s/parenb//;s/cread//' +options=$(stty -a | tr -s ';' '\n' | sed "s/^ //;$sed_del;s/-//g") + +# Take them in pairs, with and without the leading '-'. +for opt1 in $options; do + for opt2 in $options; do + + stty $opt1 $opt2 || fail=1 + + if stty_reversible_query_ "$opt1" ; then + stty -$opt1 $opt2 || fail=1 + fi + if stty_reversible_query_ "$opt2" ; then + stty $opt1 -$opt2 || fail=1 + fi + if stty_reversible_query_ "$opt1" \ + && stty_reversible_query_ "$opt2" ; then + stty -$opt1 -$opt2 || fail=1 + fi + done +done + +stty $(cat $saved_state) + +Exit $fail diff --git a/tests/misc/stty-row-col b/tests/misc/stty-row-col deleted file mode 100755 index d7151d5b..00000000 --- a/tests/misc/stty-row-col +++ /dev/null @@ -1,87 +0,0 @@ -#! /bin/sh -# Test "stty" with rows and columns. - -# Copyright (C) 1998-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 -# 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/>. - -# Setting this envvar to a very small value used to cause e.g., 'stty size' -# to generate slightly different output on certain systems. -COLUMNS=80 -export COLUMNS - -# Make sure we get English-language behavior. -# See the report about a possibly-related Solaris problem by Alexandre Peshansky -# <http://lists.gnu.org/archive/html/bug-coreutils/2004-10/msg00035.html>. -# Currently stty isn't localized, but it might be in the future. -LC_ALL=C -export LC_ALL - -. "${srcdir=.}/init.sh"; path_prepend_ ../src -print_ver_ stty - -require_controlling_input_terminal_ -trap '' TTOU # Ignore SIGTTOU - -# Versions of GNU stty from shellutils-1.9.2c and earlier failed -# tests #2 and #4 when run on SunOS 4.1.3. - -tests=' -1 rows_40_columns_80 40_80 -2 rows_1_columns_1 1_1 -3 rows_40_columns_80 40_80 -4 rows_1 1_80 -5 columns_1 1_1 -6 rows_40 40_1 -7 rows_1 1_1 -8 columns_80 1_80 -9 rows_30 30_80 -NA LAST NA -' -set $tests - -saved_size=$(stty size) && test -n "$saved_size" \ - || skip_ "can't get window size" - -# Linux virtual consoles issue an error if you -# try to increase their size. So skip in that case. -if test "x$saved_size" != "x0 0"; then - srow=$(echo $saved_size | cut -d ' ' -f1) - scol=$(echo $saved_size | cut -d ' ' -f2) - stty rows $(expr $srow + 1) cols $(expr $scol + 1) || - skip_ "can't increase window size" -fi - -while :; do - test_name=$1 - args=$2 - expected_result="$(echo $3|tr _ ' ')" - test "$args" = empty && args='' - test "x$args" = xLAST && break - args=$(echo x$args|tr _ ' '|sed 's/^x//') - if test "$VERBOSE" = yes; then - # echo "testing \$(stty $args; stty size\) = $expected_result ..." - echo "test $test_name... " | tr -d '\n' - fi - stty $args || exit 1 - test x"$(stty size 2> /dev/null)" = "x$expected_result" \ - && ok=ok || ok=FAIL fail=1 - test "$VERBOSE" = yes && echo $ok - shift; shift; shift -done - -set x $saved_size -stty rows $2 columns $3 || exit 1 - -Exit $fail diff --git a/tests/misc/stty-row-col.sh b/tests/misc/stty-row-col.sh new file mode 100755 index 00000000..586674ad --- /dev/null +++ b/tests/misc/stty-row-col.sh @@ -0,0 +1,87 @@ +#! /bin/sh +# Test "stty" with rows and columns. + +# Copyright (C) 1998-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/>. + +# Setting this envvar to a very small value used to cause e.g., 'stty size' +# to generate slightly different output on certain systems. +COLUMNS=80 +export COLUMNS + +# Make sure we get English-language behavior. +# See the report about a possibly-related Solaris problem by Alexandre Peshansky +# <http://lists.gnu.org/archive/html/bug-coreutils/2004-10/msg00035.html>. +# Currently stty isn't localized, but it might be in the future. +LC_ALL=C +export LC_ALL + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ stty + +require_controlling_input_terminal_ +trap '' TTOU # Ignore SIGTTOU + +# Versions of GNU stty from shellutils-1.9.2c and earlier failed +# tests #2 and #4 when run on SunOS 4.1.3. + +tests=' +1 rows_40_columns_80 40_80 +2 rows_1_columns_1 1_1 +3 rows_40_columns_80 40_80 +4 rows_1 1_80 +5 columns_1 1_1 +6 rows_40 40_1 +7 rows_1 1_1 +8 columns_80 1_80 +9 rows_30 30_80 +NA LAST NA +' +set $tests + +saved_size=$(stty size) && test -n "$saved_size" \ + || skip_ "can't get window size" + +# Linux virtual consoles issue an error if you +# try to increase their size. So skip in that case. +if test "x$saved_size" != "x0 0"; then + srow=$(echo $saved_size | cut -d ' ' -f1) + scol=$(echo $saved_size | cut -d ' ' -f2) + stty rows $(expr $srow + 1) cols $(expr $scol + 1) || + skip_ "can't increase window size" +fi + +while :; do + test_name=$1 + args=$2 + expected_result="$(echo $3|tr _ ' ')" + test "$args" = empty && args='' + test "x$args" = xLAST && break + args=$(echo x$args|tr _ ' '|sed 's/^x//') + if test "$VERBOSE" = yes; then + # echo "testing \$(stty $args; stty size\) = $expected_result ..." + echo "test $test_name... " | tr -d '\n' + fi + stty $args || exit 1 + test x"$(stty size 2> /dev/null)" = "x$expected_result" \ + && ok=ok || ok=FAIL fail=1 + test "$VERBOSE" = yes && echo $ok + shift; shift; shift +done + +set x $saved_size +stty rows $2 columns $3 || exit 1 + +Exit $fail diff --git a/tests/misc/stty.sh b/tests/misc/stty.sh new file mode 100755 index 00000000..2f9b9a3b --- /dev/null +++ b/tests/misc/stty.sh @@ -0,0 +1,68 @@ +#! /bin/sh +# Make sure stty can parse most of its options. + +# Copyright (C) 1998-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/>. + +# Make sure there's a tty on stdin. +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ stty + +require_controlling_input_terminal_ +trap '' TTOU # Ignore SIGTTOU + +# Get the reversible settings from stty.c. +stty_reversible_init_ + +saved_state=.saved-state +stty --save > $saved_state || fail=1 +stty $(cat $saved_state) || fail=1 + +# This would segfault prior to sh-utils-2.0j. +stty erase - || fail=1 + +# These would improperly ignore invalid options through coreutils 5.2.1. +stty -F 2>/dev/null && fail=1 +stty -raw -F no/such/file 2>/dev/null && fail=1 +stty -raw -a 2>/dev/null && fail=1 + +# Build a list of all boolean options stty accepts on this system. +# Don't depend on terminal width. Put each option on its own line, +# remove all non-boolean ones, then remove any leading hyphens. +sed_del='/^speed/d;/^rows/d;/^columns/d;/ = /d' +options=$(stty -a | tr -s ';' '\n' | sed "s/^ //;$sed_del;s/-//g") + +# Take them one at a time, with and without the leading '-'. +for opt in $options; do + # 'stty parenb' and 'stty -parenb' fail with this message + # stty: standard input: unable to perform all requested operations + # on Linux 2.2.0-pre4 kernels. Also since around Linux 2.6.30 + # 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 + + stty $opt || fail=1 + + # Likewise, 'stty -cread' would fail, so skip that, too. + test $opt = cread && continue + if stty_reversible_query_ "$opt" ; then + stty -$opt || { fail=1; echo -$opt; } + fi +done + +stty $(cat $saved_state) + +Exit $fail diff --git a/tests/misc/su-fail b/tests/misc/su-fail deleted file mode 100755 index c2e0475d..00000000 --- a/tests/misc/su-fail +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# Test su failure cases - -# Copyright (C) 2009-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ su - -require_built_ su - -# Very little that we can test without a root password -su --- / true # unknown option -test $? = 125 || fail=1 -su no_such_user -test $? = 125 || fail=1 - -Exit $fail diff --git a/tests/misc/sum b/tests/misc/sum deleted file mode 100755 index 8aaa6350..00000000 --- a/tests/misc/sum +++ /dev/null @@ -1,61 +0,0 @@ -#!/usr/bin/perl -# Test "sum". - -# Copyright (C) 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 -# 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; - -(my $program_name = $0) =~ s|.*/||; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -my $in_1k = 'a' x 1024; -my $in_2k = 'b' x 2048; - -my @Tests = - ( - ['1', {IN=> {f=> ''}}, {OUT=>"00000 0\n"}], - ['2', {IN=> {f=> 'a'}}, {OUT=>"00097 1\n"}], - ['3', {IN=> {f=> 'abc'}}, {OUT=>"16556 1\n"}], - ['4', {IN=> {f=> 'message digest'}}, {OUT=>"26423 1\n"}], - ['5', {IN=> {f=> 'abcdefghijklmnopqrstuvwxyz'}}, {OUT=>"53553 1\n"}], - ['6', {IN=> {f=> join ('', 'A'..'Z', 'a'..'z', '0'..'9')}}, - {OUT=>"25587 1\n"}], - ['7', {IN=> {f=> '1234567890' x 8}}, {OUT=>"21845 1\n"}], - - ['a-r-1k', '-r', {IN=> {f=> $in_1k}}, {OUT=>"65409 1\n"}], - ['a-s-1k', '-s', {IN=> {f=> $in_1k}}, {OUT=>"33793 2 f\n"}], - ['b-r-2k', '-r', {IN=> {f=> $in_2k}}, {OUT=>"65223 2\n"}], - ['b-s-2k', '-s', {IN=> {f=> $in_2k}}, {OUT=>"4099 4 f\n"}], - - ['1s', '-s', {IN=> {f=> ''}}, {OUT=>"0 0 f\n"}], - ['2s', '-s', {IN=> {f=> 'a'}}, {OUT=>"97 1 f\n"}], - ['3s', '-s', {IN=> {f=> 'abc'}}, {OUT=>"294 1 f\n"}], - ['4s', '-s', {IN=> {f=> 'message digest'}}, {OUT=>"1413 1 f\n"}], - ['5s', '-s', {IN=> {f=> 'abcdefghijklmnopqrstuvwxyz'}}, - {OUT=>"2847 1 f\n"}], - ['6s', '-s', {IN=> {f=> join ('', 'A'..'Z', 'a'..'z', '0'..'9')}}, - {OUT=>"5387 1 f\n"}], - ['7s', '-s', {IN=> {f=> '1234567890' x 8}}, {OUT=>"4200 1 f\n"}], - ); - -my $save_temps = $ENV{DEBUG}; -my $verbose = $ENV{VERBOSE}; - -my $prog = 'sum'; -my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); -exit $fail; diff --git a/tests/misc/sum-sysv b/tests/misc/sum-sysv deleted file mode 100755 index 9cdf07fc..00000000 --- a/tests/misc/sum-sysv +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh -# make sure 'sum -s' works for input whose sum of bytes is larger than 2^32 - -# Copyright (C) 2001-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 -# 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/>. - -# Avoid a problem when run in a UTF-8 locale. -# Otherwise, Perl would try to (and fail to) interpret -# each string below as a sequence of multi-byte characters. -LC_ALL=C -export LC_ALL - -. "${srcdir=.}/init.sh"; path_prepend_ ../src -print_ver_ sum - -require_perl_ - -# FYI, 16843009 is floor (2^32 / 255). - -# aka: perl -e 'print chr(255) x 16843009' -$PERL -e '$s = chr(255) x 65537; foreach (1..257) {print $s}' \ - | sum -s > out || fail=1 -cat > exp <<\EOF -65535 32897 -EOF -compare exp out || fail=1 - -rm -f out exp - -# aka: perl -e 'print chr(255) x 16843010' -$PERL -e '$s = chr(255) x 65537; foreach (1..257) {print $s}; print chr(255)' \ - | sum -s > out || fail=1 -cat > exp <<\EOF -254 32897 -EOF -compare exp out || fail=1 - -Exit $fail diff --git a/tests/misc/sum-sysv.sh b/tests/misc/sum-sysv.sh new file mode 100755 index 00000000..a1e8cee9 --- /dev/null +++ b/tests/misc/sum-sysv.sh @@ -0,0 +1,50 @@ +#!/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. + +# This 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/>. + +# Avoid a problem when run in a UTF-8 locale. +# Otherwise, Perl would try to (and fail to) interpret +# each string below as a sequence of multi-byte characters. +LC_ALL=C +export LC_ALL + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ sum + +require_perl_ + +# FYI, 16843009 is floor (2^32 / 255). + +# aka: perl -e 'print chr(255) x 16843009' +$PERL -e '$s = chr(255) x 65537; foreach (1..257) {print $s}' \ + | sum -s > out || fail=1 +cat > exp <<\EOF +65535 32897 +EOF +compare exp out || fail=1 + +rm -f out exp + +# aka: perl -e 'print chr(255) x 16843010' +$PERL -e '$s = chr(255) x 65537; foreach (1..257) {print $s}; print chr(255)' \ + | sum -s > out || fail=1 +cat > exp <<\EOF +254 32897 +EOF +compare exp out || fail=1 + +Exit $fail diff --git a/tests/misc/sum.pl b/tests/misc/sum.pl new file mode 100755 index 00000000..3cabcc53 --- /dev/null +++ b/tests/misc/sum.pl @@ -0,0 +1,61 @@ +#!/usr/bin/perl +# Test "sum". + +# Copyright (C) 2000-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/>. + +use strict; + +(my $program_name = $0) =~ s|.*/||; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +my $in_1k = 'a' x 1024; +my $in_2k = 'b' x 2048; + +my @Tests = + ( + ['1', {IN=> {f=> ''}}, {OUT=>"00000 0\n"}], + ['2', {IN=> {f=> 'a'}}, {OUT=>"00097 1\n"}], + ['3', {IN=> {f=> 'abc'}}, {OUT=>"16556 1\n"}], + ['4', {IN=> {f=> 'message digest'}}, {OUT=>"26423 1\n"}], + ['5', {IN=> {f=> 'abcdefghijklmnopqrstuvwxyz'}}, {OUT=>"53553 1\n"}], + ['6', {IN=> {f=> join ('', 'A'..'Z', 'a'..'z', '0'..'9')}}, + {OUT=>"25587 1\n"}], + ['7', {IN=> {f=> '1234567890' x 8}}, {OUT=>"21845 1\n"}], + + ['a-r-1k', '-r', {IN=> {f=> $in_1k}}, {OUT=>"65409 1\n"}], + ['a-s-1k', '-s', {IN=> {f=> $in_1k}}, {OUT=>"33793 2 f\n"}], + ['b-r-2k', '-r', {IN=> {f=> $in_2k}}, {OUT=>"65223 2\n"}], + ['b-s-2k', '-s', {IN=> {f=> $in_2k}}, {OUT=>"4099 4 f\n"}], + + ['1s', '-s', {IN=> {f=> ''}}, {OUT=>"0 0 f\n"}], + ['2s', '-s', {IN=> {f=> 'a'}}, {OUT=>"97 1 f\n"}], + ['3s', '-s', {IN=> {f=> 'abc'}}, {OUT=>"294 1 f\n"}], + ['4s', '-s', {IN=> {f=> 'message digest'}}, {OUT=>"1413 1 f\n"}], + ['5s', '-s', {IN=> {f=> 'abcdefghijklmnopqrstuvwxyz'}}, + {OUT=>"2847 1 f\n"}], + ['6s', '-s', {IN=> {f=> join ('', 'A'..'Z', 'a'..'z', '0'..'9')}}, + {OUT=>"5387 1 f\n"}], + ['7s', '-s', {IN=> {f=> '1234567890' x 8}}, {OUT=>"4200 1 f\n"}], + ); + +my $save_temps = $ENV{DEBUG}; +my $verbose = $ENV{VERBOSE}; + +my $prog = 'sum'; +my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); +exit $fail; diff --git a/tests/misc/tac b/tests/misc/tac deleted file mode 100755 index 077cc0c9..00000000 --- a/tests/misc/tac +++ /dev/null @@ -1,84 +0,0 @@ -#!/usr/bin/perl - -# Copyright (C) 2008-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 -# 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; - -my $prog = 'tac'; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -my $bad_dir = 'no/such/dir'; - -# This must be longer than 16KiB to trigger the double free in coreutils-8.5. -my $long_line = 'o' x (16 * 1024 + 1); - -my @Tests = -( - ['segfault', '-r', {IN=>"a\n"}, {IN=>"b\n"}, {OUT=>"a\nb\n"}], - ['segfault2','-r', {IN=>"a\nb\n"}, {IN=>"1\n2\n"}, {OUT=>"b\na\n2\n1\n"}], - - ['basic-0', '', {IN=>""}, {OUT=>""}], - ['basic-a', '', {IN=>"a"}, {OUT=>"a"}], - ['basic-b', '', {IN=>"\n"}, {OUT=>"\n"}], - ['basic-c', '', {IN=>"a\n"}, {OUT=>"a\n"}], - ['basic-d', '', {IN=>"a\nb"}, {OUT=>"ba\n"}], - ['basic-e', '', {IN=>"a\nb\n"}, {OUT=>"b\na\n"}], - ['basic-f', '', {IN=>"1234567\n8\n"}, {OUT=>"8\n1234567\n"}], - ['basic-g', '', {IN=>"12345678\n9\n"}, {OUT=>"9\n12345678\n"}], - ['basic-h', '', {IN=>"123456\n8\n"}, {OUT=>"8\n123456\n"}], - ['basic-i', '', {IN=>"12345\n8\n"}, {OUT=>"8\n12345\n"}], - ['basic-j', '', {IN=>"1234\n8\n"}, {OUT=>"8\n1234\n"}], - ['basic-k', '', {IN=>"123\n8\n"}, {OUT=>"8\n123\n"}], - - ['opt-b', '-b', {IN=>"\na\nb\nc"}, {OUT=>"\nc\nb\na"}], - ['opt-s', '-s:', {IN=>"a:b:c:"}, {OUT=>"c:b:a:"}], - ['opt-sb', qw(-s : -b), {IN=>":a:b:c"}, {OUT=>":c:b:a"}], - ['opt-r', qw(-r -s '\._+'), - {IN=>"1._2.__3.___4._"}, - {OUT=>"4._3.___2.__1._"}], - - ['opt-r2', qw(-r -s '\._+'), - {IN=>"a.___b.__1._2.__3.___4._"}, - {OUT=>"4._3.___2.__1._b.__a.___"}], - - # This gave incorrect output (.___4._2.__3._1) with tac-1.22. - ['opt-br', qw(-b -r -s '\._+'), - {IN=>"._1._2.__3.___4"}, {OUT=>".___4.__3._2._1"}], - - ['opt-br2', qw(-b -r -s '\._+'), - {IN=>".__x.___y.____z._1._2.__3.___4"}, - {OUT=>".___4.__3._2._1.____z.___y.__x"}], - - ['pipe-bad-tmpdir', - {ENV => "TMPDIR=$bad_dir"}, - {IN_PIPE => "a\n"}, - {ERR_SUBST => "s,'$bad_dir': .*,...,"}, - {ERR => "$prog: failed to create temporary file in ...\n"}, - {EXIT => 1}], - - # coreutils-8.5's tac would double-free its primary buffer. - ['double-free', {IN=>$long_line}, {OUT=>$long_line}], -); - -@Tests = triple_test \@Tests; - -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/tac-2-nonseekable b/tests/misc/tac-2-nonseekable deleted file mode 100755 index f980f3b8..00000000 --- a/tests/misc/tac-2-nonseekable +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -# ensure that tac works with two or more non-seekable inputs - -# Copyright (C) 2011-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ tac - -echo x | tac - - > out 2> err || fail=1 -echo x > exp || fail=1 -compare exp out || fail=1 -compare /dev/null err || fail=1 - -Exit $fail diff --git a/tests/misc/tac-2-nonseekable.sh b/tests/misc/tac-2-nonseekable.sh new file mode 100755 index 00000000..ef434807 --- /dev/null +++ b/tests/misc/tac-2-nonseekable.sh @@ -0,0 +1,27 @@ +#!/bin/sh +# ensure that tac works with two or more non-seekable inputs + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ tac + +echo x | tac - - > out 2> err || fail=1 +echo x > exp || fail=1 +compare exp out || fail=1 +compare /dev/null err || fail=1 + +Exit $fail diff --git a/tests/misc/tac-continue b/tests/misc/tac-continue deleted file mode 100755 index d9cc550a..00000000 --- a/tests/misc/tac-continue +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/sh -# Ensure that tac processes all command line arguments, even -# when it encounters an error with say the first one. -# With coreutils-5.2.1 and earlier, this test would fail. - -# Copyright (C) 2004-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ tac - -# See if the envvar is defined. -if test x = "x$FULL_PARTITION_TMPDIR"; then - skip_ "FULL_PARTITION_TMPDIR not defined" -fi - -if ! test -d "$FULL_PARTITION_TMPDIR"; then - echo "$0: $FULL_PARTITION_TMPDIR:" \ - "\$FULL_PARTITION_TMPDIR does not specify a directory" 1>&2 - Exit 1 -fi - -fp_tmp="$FULL_PARTITION_TMPDIR/tac-cont-$$" -cleanup_() { rm -f "$fp_tmp"; } - -# Make sure we can create an empty file there (i.e. no shortage of inodes). -if ! touch $fp_tmp; then - echo "$0: $fp_tmp: cannot create empty file" 1>&2 - Exit 1 -fi - -# Make sure that we fail when trying to create a file large enough -# to consume a non-inode block. -if seq 1000 > $fp_tmp 2>/dev/null; then - echo "$0: $FULL_PARTITION_TMPDIR: not a full partition" 1>&2 - Exit 1 -fi - -seq 5 > in - - -# Give tac a fifo command line argument. -# This makes it try to create a temporary file in $TMPDIR. -mkfifo_or_skip_ fifo -seq 1000 > fifo & -TMPDIR=$FULL_PARTITION_TMPDIR tac fifo in >out 2>err && fail=1 - -cat <<\EOF > exp || fail=1 -5 -4 -3 -2 -1 -EOF - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/misc/tac-continue.sh b/tests/misc/tac-continue.sh new file mode 100755 index 00000000..95f37d7b --- /dev/null +++ b/tests/misc/tac-continue.sh @@ -0,0 +1,70 @@ +#!/bin/sh +# Ensure that tac processes all command line arguments, even +# 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. + +# This 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_ tac + +# See if the envvar is defined. +if test x = "x$FULL_PARTITION_TMPDIR"; then + skip_ "FULL_PARTITION_TMPDIR not defined" +fi + +if ! test -d "$FULL_PARTITION_TMPDIR"; then + echo "$0: $FULL_PARTITION_TMPDIR:" \ + "\$FULL_PARTITION_TMPDIR does not specify a directory" 1>&2 + Exit 1 +fi + +fp_tmp="$FULL_PARTITION_TMPDIR/tac-cont-$$" +cleanup_() { rm -f "$fp_tmp"; } + +# Make sure we can create an empty file there (i.e. no shortage of inodes). +if ! touch $fp_tmp; then + echo "$0: $fp_tmp: cannot create empty file" 1>&2 + Exit 1 +fi + +# Make sure that we fail when trying to create a file large enough +# to consume a non-inode block. +if seq 1000 > $fp_tmp 2>/dev/null; then + echo "$0: $FULL_PARTITION_TMPDIR: not a full partition" 1>&2 + Exit 1 +fi + +seq 5 > in + + +# Give tac a fifo command line argument. +# This makes it try to create a temporary file in $TMPDIR. +mkfifo_or_skip_ fifo +seq 1000 > fifo & +TMPDIR=$FULL_PARTITION_TMPDIR tac fifo in >out 2>err && fail=1 + +cat <<\EOF > exp || fail=1 +5 +4 +3 +2 +1 +EOF + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/misc/tac.pl b/tests/misc/tac.pl new file mode 100755 index 00000000..b064b9d2 --- /dev/null +++ b/tests/misc/tac.pl @@ -0,0 +1,84 @@ +#!/usr/bin/perl + +# 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/>. + +use strict; + +my $prog = 'tac'; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +my $bad_dir = 'no/such/dir'; + +# This must be longer than 16KiB to trigger the double free in coreutils-8.5. +my $long_line = 'o' x (16 * 1024 + 1); + +my @Tests = +( + ['segfault', '-r', {IN=>"a\n"}, {IN=>"b\n"}, {OUT=>"a\nb\n"}], + ['segfault2','-r', {IN=>"a\nb\n"}, {IN=>"1\n2\n"}, {OUT=>"b\na\n2\n1\n"}], + + ['basic-0', '', {IN=>""}, {OUT=>""}], + ['basic-a', '', {IN=>"a"}, {OUT=>"a"}], + ['basic-b', '', {IN=>"\n"}, {OUT=>"\n"}], + ['basic-c', '', {IN=>"a\n"}, {OUT=>"a\n"}], + ['basic-d', '', {IN=>"a\nb"}, {OUT=>"ba\n"}], + ['basic-e', '', {IN=>"a\nb\n"}, {OUT=>"b\na\n"}], + ['basic-f', '', {IN=>"1234567\n8\n"}, {OUT=>"8\n1234567\n"}], + ['basic-g', '', {IN=>"12345678\n9\n"}, {OUT=>"9\n12345678\n"}], + ['basic-h', '', {IN=>"123456\n8\n"}, {OUT=>"8\n123456\n"}], + ['basic-i', '', {IN=>"12345\n8\n"}, {OUT=>"8\n12345\n"}], + ['basic-j', '', {IN=>"1234\n8\n"}, {OUT=>"8\n1234\n"}], + ['basic-k', '', {IN=>"123\n8\n"}, {OUT=>"8\n123\n"}], + + ['opt-b', '-b', {IN=>"\na\nb\nc"}, {OUT=>"\nc\nb\na"}], + ['opt-s', '-s:', {IN=>"a:b:c:"}, {OUT=>"c:b:a:"}], + ['opt-sb', qw(-s : -b), {IN=>":a:b:c"}, {OUT=>":c:b:a"}], + ['opt-r', qw(-r -s '\._+'), + {IN=>"1._2.__3.___4._"}, + {OUT=>"4._3.___2.__1._"}], + + ['opt-r2', qw(-r -s '\._+'), + {IN=>"a.___b.__1._2.__3.___4._"}, + {OUT=>"4._3.___2.__1._b.__a.___"}], + + # This gave incorrect output (.___4._2.__3._1) with tac-1.22. + ['opt-br', qw(-b -r -s '\._+'), + {IN=>"._1._2.__3.___4"}, {OUT=>".___4.__3._2._1"}], + + ['opt-br2', qw(-b -r -s '\._+'), + {IN=>".__x.___y.____z._1._2.__3.___4"}, + {OUT=>".___4.__3._2._1.____z.___y.__x"}], + + ['pipe-bad-tmpdir', + {ENV => "TMPDIR=$bad_dir"}, + {IN_PIPE => "a\n"}, + {ERR_SUBST => "s,'$bad_dir': .*,...,"}, + {ERR => "$prog: failed to create temporary file in ...\n"}, + {EXIT => 1}], + + # coreutils-8.5's tac would double-free its primary buffer. + ['double-free', {IN=>$long_line}, {OUT=>$long_line}], +); + +@Tests = triple_test \@Tests; + +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/tail b/tests/misc/tail deleted file mode 100755 index 41c2f9a9..00000000 --- a/tests/misc/tail +++ /dev/null @@ -1,140 +0,0 @@ -#!/usr/bin/perl -# Test tail. - -# Copyright (C) 2008-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 -# 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; - -my $prog = 'tail'; -my $normalize_filename = {ERR_SUBST => 's/^$prog: .*?:/$prog: -:/'}; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -my @tv = ( -# test name, options, input, expected output, expected return code -# -['obs-plus-c1', '+2c', 'abcd', 'bcd', 0], -['obs-plus-c2', '+8c', 'abcd', '', 0], -['obs-c3', '-1c', 'abcd', 'd', 0], -['obs-c4', '-9c', 'abcd', 'abcd', 0], -['obs-c5', '-12c', 'x' . ('y' x 12) . 'z', ('y' x 11) . 'z', 0], - -['obs-l1', '-1l', 'x', 'x', 0], -['obs-l2', '-1l', "x\ny\n", "y\n", 0], -['obs-l3', '-1l', "x\ny", "y", 0], -['obs-plus-l4', '+1l', "x\ny\n", "x\ny\n", 0], -['obs-plus-l5', '+2l', "x\ny\n", "y\n", 0], - -# Same as -l tests, but without the 'l'. -['obs-1', '-1', 'x', 'x', 0], -['obs-2', '-1', "x\ny\n", "y\n", 0], -['obs-3', '-1', "x\ny", "y", 0], -['obs-plus-4', '+1', "x\ny\n", "x\ny\n", 0], -['obs-plus-5', '+2', "x\ny\n", "y\n", 0], - -# This is equivalent to +10c -['obs-plus-x1', '+c', 'x' . ('y' x 10) . 'z', 'yyz', 0], -# This is equivalent to +10l -['obs-plus-x2', '+l', "x\n" . ("y\n" x 10) . 'z', "y\ny\nz", 0], -# With no number, this is like -10l -['obs-l', '-l', "x\n" . ("y\n" x 10) . 'z', ("y\n" x 9) . 'z', 0], - -['obs-b', '-b', "x\n" x (512 * 10 / 2 + 1), "x\n" x (512 * 10 / 2), 0], - -['err-1', '+cl', '', '', 1, - "$prog: cannot open '+cl' for reading: No such file or directory\n"], - -['err-2', '-cl', '', '', 1, - "$prog: l: invalid number of bytes\n"], - -['err-3', '+2cz', '', '', 1, - "$prog: cannot open '+2cz' for reading: No such file or directory\n"], - -# This should get 'tail: invalid option -- 2' -['err-4', '-2cX', '', '', 1, - "$prog: option used in invalid context -- 2\n"], - -# Since the number is larger than 2^64, this should provoke -# the diagnostic: 'tail: 99999999999999999999: invalid number of bytes' -# on all systems... probably, for now, maybe. -['err-5', '-c99999999999999999999', '', '', 1, - "$prog: 99999999999999999999: invalid number of bytes\n"], -['err-6', '-c --', '', '', 1, - "$prog: -: invalid number of bytes\n", $normalize_filename], - -# Same as -n 10 -['minus-1', '-', '', '', 0], -['minus-2', '-', "x\n" . ("y\n" x 10) . 'z', ("y\n" x 9) . 'z', 0], - -['c-2', '-c 2', "abcd\n", "d\n", 0], -['c-2-minus', '-c 2 --', "abcd\n", "d\n", 0], -['c2', '-c2', "abcd\n", "d\n", 0], -['c2-minus', '-c2 --', "abcd\n", "d\n", 0], - -['n-1', '-n 10', "x\n" . ("y\n" x 10) . 'z', ("y\n" x 9) . 'z', 0], -['n-2', '-n -10', "x\n" . ("y\n" x 10) . 'z', ("y\n" x 9) . 'z', 0], -['n-3', '-n +10', "x\n" . ("y\n" x 10) . 'z', "y\ny\nz", 0], - -# Accept +0 as synonym for +1. -['n-4', '-n +0', "y\n" x 5, "y\n" x 5, 0], -['n-4a', '-n +1', "y\n" x 5, "y\n" x 5, 0], - -# Note that -0 is *not* a synonym for -1. -['n-5', '-n -0', "y\n" x 5, '', 0], -['n-5a', '-n -1', "y\n" x 5, "y\n", 0], -['n-5b', '-n 0', "y\n" x 5, '', 0], - -# With textutils-1.22, this failed. -['f-pipe-1', '-f -n 1', "a\nb\n", "b\n", 0], -); - -my @Tests; - -foreach my $t (@tv) - { - my ($test_name, $flags, $in, $exp, $ret, $err_msg) = @$t; - my $e = [$test_name, $flags, {IN=>$in}, {OUT=>$exp}]; - $ret - and push @$e, {EXIT=>$ret}, {ERR=>$err_msg}; - - $test_name =~ /^(obs-plus-|minus-)/ - and push @$e, {ENV=>'_POSIX2_VERSION=199209'}; - - $test_name =~ /^(err-6|c-2)$/ - and push @$e, {ENV=>'_POSIX2_VERSION=200112'}; - - $test_name =~ /^f-pipe-/ - and push @$e, {ENV=>'POSIXLY_CORRECT=1'}; - - push @Tests, $e; - } - -@Tests = triple_test \@Tests; - -# If you run the minus* tests with a FILE arg they'd hang. -# If you run the err-1 or err-3 tests with a FILE, they'd misinterpret -# the arg unless we are using the obsolete form. -@Tests = grep { $_->[0] !~ /^(minus|err-[13])/ || $_->[0] =~ /\.[rp]$/ } @Tests; - -# Using redirection or a file would make this hang. -@Tests = grep { $_->[0] !~ /^f-/ || $_->[0] =~ /\.p$/ } @Tests; - -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/tail.pl b/tests/misc/tail.pl new file mode 100755 index 00000000..bc6e6d4a --- /dev/null +++ b/tests/misc/tail.pl @@ -0,0 +1,140 @@ +#!/usr/bin/perl +# Test tail. + +# 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/>. + +use strict; + +my $prog = 'tail'; +my $normalize_filename = {ERR_SUBST => 's/^$prog: .*?:/$prog: -:/'}; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +my @tv = ( +# test name, options, input, expected output, expected return code +# +['obs-plus-c1', '+2c', 'abcd', 'bcd', 0], +['obs-plus-c2', '+8c', 'abcd', '', 0], +['obs-c3', '-1c', 'abcd', 'd', 0], +['obs-c4', '-9c', 'abcd', 'abcd', 0], +['obs-c5', '-12c', 'x' . ('y' x 12) . 'z', ('y' x 11) . 'z', 0], + +['obs-l1', '-1l', 'x', 'x', 0], +['obs-l2', '-1l', "x\ny\n", "y\n", 0], +['obs-l3', '-1l', "x\ny", "y", 0], +['obs-plus-l4', '+1l', "x\ny\n", "x\ny\n", 0], +['obs-plus-l5', '+2l', "x\ny\n", "y\n", 0], + +# Same as -l tests, but without the 'l'. +['obs-1', '-1', 'x', 'x', 0], +['obs-2', '-1', "x\ny\n", "y\n", 0], +['obs-3', '-1', "x\ny", "y", 0], +['obs-plus-4', '+1', "x\ny\n", "x\ny\n", 0], +['obs-plus-5', '+2', "x\ny\n", "y\n", 0], + +# This is equivalent to +10c +['obs-plus-x1', '+c', 'x' . ('y' x 10) . 'z', 'yyz', 0], +# This is equivalent to +10l +['obs-plus-x2', '+l', "x\n" . ("y\n" x 10) . 'z', "y\ny\nz", 0], +# With no number, this is like -10l +['obs-l', '-l', "x\n" . ("y\n" x 10) . 'z', ("y\n" x 9) . 'z', 0], + +['obs-b', '-b', "x\n" x (512 * 10 / 2 + 1), "x\n" x (512 * 10 / 2), 0], + +['err-1', '+cl', '', '', 1, + "$prog: cannot open '+cl' for reading: No such file or directory\n"], + +['err-2', '-cl', '', '', 1, + "$prog: l: invalid number of bytes\n"], + +['err-3', '+2cz', '', '', 1, + "$prog: cannot open '+2cz' for reading: No such file or directory\n"], + +# This should get 'tail: invalid option -- 2' +['err-4', '-2cX', '', '', 1, + "$prog: option used in invalid context -- 2\n"], + +# Since the number is larger than 2^64, this should provoke +# the diagnostic: 'tail: 99999999999999999999: invalid number of bytes' +# on all systems... probably, for now, maybe. +['err-5', '-c99999999999999999999', '', '', 1, + "$prog: 99999999999999999999: invalid number of bytes\n"], +['err-6', '-c --', '', '', 1, + "$prog: -: invalid number of bytes\n", $normalize_filename], + +# Same as -n 10 +['minus-1', '-', '', '', 0], +['minus-2', '-', "x\n" . ("y\n" x 10) . 'z', ("y\n" x 9) . 'z', 0], + +['c-2', '-c 2', "abcd\n", "d\n", 0], +['c-2-minus', '-c 2 --', "abcd\n", "d\n", 0], +['c2', '-c2', "abcd\n", "d\n", 0], +['c2-minus', '-c2 --', "abcd\n", "d\n", 0], + +['n-1', '-n 10', "x\n" . ("y\n" x 10) . 'z', ("y\n" x 9) . 'z', 0], +['n-2', '-n -10', "x\n" . ("y\n" x 10) . 'z', ("y\n" x 9) . 'z', 0], +['n-3', '-n +10', "x\n" . ("y\n" x 10) . 'z', "y\ny\nz", 0], + +# Accept +0 as synonym for +1. +['n-4', '-n +0', "y\n" x 5, "y\n" x 5, 0], +['n-4a', '-n +1', "y\n" x 5, "y\n" x 5, 0], + +# Note that -0 is *not* a synonym for -1. +['n-5', '-n -0', "y\n" x 5, '', 0], +['n-5a', '-n -1', "y\n" x 5, "y\n", 0], +['n-5b', '-n 0', "y\n" x 5, '', 0], + +# With textutils-1.22, this failed. +['f-pipe-1', '-f -n 1', "a\nb\n", "b\n", 0], +); + +my @Tests; + +foreach my $t (@tv) + { + my ($test_name, $flags, $in, $exp, $ret, $err_msg) = @$t; + my $e = [$test_name, $flags, {IN=>$in}, {OUT=>$exp}]; + $ret + and push @$e, {EXIT=>$ret}, {ERR=>$err_msg}; + + $test_name =~ /^(obs-plus-|minus-)/ + and push @$e, {ENV=>'_POSIX2_VERSION=199209'}; + + $test_name =~ /^(err-6|c-2)$/ + and push @$e, {ENV=>'_POSIX2_VERSION=200112'}; + + $test_name =~ /^f-pipe-/ + and push @$e, {ENV=>'POSIXLY_CORRECT=1'}; + + push @Tests, $e; + } + +@Tests = triple_test \@Tests; + +# If you run the minus* tests with a FILE arg they'd hang. +# If you run the err-1 or err-3 tests with a FILE, they'd misinterpret +# the arg unless we are using the obsolete form. +@Tests = grep { $_->[0] !~ /^(minus|err-[13])/ || $_->[0] =~ /\.[rp]$/ } @Tests; + +# Using redirection or a file would make this hang. +@Tests = grep { $_->[0] !~ /^f-/ || $_->[0] =~ /\.p$/ } @Tests; + +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/tee b/tests/misc/tee deleted file mode 100755 index 4c17316d..00000000 --- a/tests/misc/tee +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# test for basic tee functionality. - -# Copyright (C) 2005-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ tee - -echo line >sample || framework_failure_ -nums=$(seq 9) || framework_failure_ - -for n in 0 $nums; do - files=$(seq $n) - rm -f $files - tee $files <sample >out || fail=1 - for f in out $files; do - compare sample $f || fail=1 - done -done - -Exit $fail diff --git a/tests/misc/tee-dash b/tests/misc/tee-dash deleted file mode 100755 index 8ee0820b..00000000 --- a/tests/misc/tee-dash +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# test for "tee -". - -# Copyright (C) 2005-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ tee - -tee - </dev/null || fail=1 - -Exit $fail diff --git a/tests/misc/tee-dash.sh b/tests/misc/tee-dash.sh new file mode 100755 index 00000000..9e511beb --- /dev/null +++ b/tests/misc/tee-dash.sh @@ -0,0 +1,24 @@ +#!/bin/sh +# test for "tee -". + +# Copyright (C) 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 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_ tee + +tee - </dev/null || fail=1 + +Exit $fail diff --git a/tests/misc/tee.sh b/tests/misc/tee.sh new file mode 100755 index 00000000..bbaf99b7 --- /dev/null +++ b/tests/misc/tee.sh @@ -0,0 +1,34 @@ +#!/bin/sh +# test for basic tee functionality. + +# Copyright (C) 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 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_ tee + +echo line >sample || framework_failure_ +nums=$(seq 9) || framework_failure_ + +for n in 0 $nums; do + files=$(seq $n) + rm -f $files + tee $files <sample >out || fail=1 + for f in out $files; do + compare sample $f || fail=1 + done +done + +Exit $fail diff --git a/tests/misc/test b/tests/misc/test deleted file mode 100755 index ac30c379..00000000 --- a/tests/misc/test +++ /dev/null @@ -1,197 +0,0 @@ -#!/usr/bin/perl - -# Copyright (C) 2008-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 -# 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; - -my $limits = getlimits (); - -my $prog = 'test'; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -sub digest_test ($) -{ - my ($t) = @_; - my @args; - my $ret = 0; - my @list_of_hashref; - foreach my $e (@$t) - { - !ref $e - and push (@args, $e), next; - ref $e eq 'HASH' - or (warn "$0: $t->[0]: unexpected entry type\n"), next; - - exists $e->{EXIT} - and $ret = $e->{EXIT}, next; - - push @list_of_hashref, $e; - } - shift @args; # discard test name - my $flags = join ' ', @args; - - return ($flags, $ret, \@list_of_hashref); -} - -sub add_inverse_op_tests($) -{ - my ($tests) = @_; - my @new; - - my %inverse_op = - ( - eq => 'ne', - lt => 'ge', - gt => 'le', - ); - - foreach my $t (@$tests) - { - push @new, $t; - - my $test_name = $t->[0]; - my ($flags, $ret, $LoH) = digest_test $t; - - # Generate corresponding tests of inverse ops. - # E.g. generate tests of '-ge' from those of '-lt'. - foreach my $op (qw(gt lt eq)) - { - if ($test_name =~ /$op-/ && $flags =~ / -$op /) - { - my $inv = $inverse_op{$op}; - $test_name =~ s/$op/$inv/; - $flags =~ s/-$op/-$inv/; - $ret = 1 - $ret; - push (@new, [$test_name, $flags, {EXIT=>$ret}, @$LoH]); - } - } - } - return @new; -} - -sub add_pn_tests($) -{ - my ($tests) = @_; - my @new; - - # Generate parenthesized and negated versions of each test. - # There are a few exceptions. - my %not_N = map {$_ => 1} qw (1a); - my %not_P = map {$_ => 1} qw (1a - streq-6 strne-6 - paren-1 paren-2 paren-3 paren-4 paren-5); - foreach my $t (@$tests) - { - push @new, $t; - - my $test_name = $t->[0]; - my ($flags, $ret, $LoH) = digest_test $t; - next if $ret == 2; - - push (@new, ["N-$test_name", "! $flags", {EXIT=>1-$ret}, @$LoH]) - unless $not_N{$test_name}; - push (@new, ["P-$test_name", "'(' $flags ')'", {EXIT=>$ret}, @$LoH]) - unless $not_P{$test_name}; - push (@new, ["NP-$test_name", "! '(' $flags ')'", {EXIT=>1-$ret}, @$LoH]) - unless $not_P{$test_name}; - push (@new, ["NNP-$test_name", "! ! '(' $flags ')'", {EXIT=>$ret, @$LoH}]) - unless $not_P{$test_name}; - } - - return @new; -} - -my @Tests = -( - ['1a', {EXIT=>1}], - ['1b', qw(-z '')], - ['1c', 'any-string'], - ['1d', qw(-n any-string)], - ['1e', "''", {EXIT=>1}], - ['1f', '-'], - ['1g', '--'], - ['1h', '-0'], - ['1i', '-f'], - ['1j', '--help'], - ['1k', '--version'], - - ['streq-1', qw(t = t)], - ['streq-2', qw(t = f), {EXIT=>1}], - ['streqeq-1', qw(t == t)], - ['streqeq-2', qw(t == f), {EXIT=>1}], - ['streq-3', qw(! = !)], - ['streq-4', qw(= = =)], - ['streq-5', "'(' = '('"], - ['streq-6', "'(' = ')'", {EXIT=>1}], - ['strne-1', qw(t != t), {EXIT=>1}], - ['strne-2', qw(t != f)], - ['strne-3', qw(! != !), {EXIT=>1}], - ['strne-4', qw(= != =), {EXIT=>1}], - ['strne-5', "'(' != '('", {EXIT=>1}], - ['strne-6', "'(' != ')'"], - - ['and-1', qw(t -a t)], - ['and-2', qw('' -a t), {EXIT=>1}], - ['and-3', qw(t -a ''), {EXIT=>1}], - ['and-4', qw('' -a ''), {EXIT=>1}], - - ['or-1', qw(t -o t)], - ['or-2', qw('' -o t)], - ['or-3', qw(t -o '')], - ['or-4', qw('' -o ''), {EXIT=>1}], - - ['eq-1', qw(9 -eq 9)], - ['eq-2', qw(0 -eq 0)], - ['eq-3', qw(0 -eq 00)], - ['eq-4', qw(8 -eq 9), {EXIT=>1}], - ['eq-5', qw(1 -eq 0), {EXIT=>1}], - ['eq-6', "$limits->{UINTMAX_OFLOW} -eq 0", {EXIT=>1}], - - ['gt-1', qw(5 -gt 5), {EXIT=>1}], - ['gt-2', qw(5 -gt 4)], - ['gt-3', qw(4 -gt 5), {EXIT=>1}], - ['gt-4', qw(-1 -gt -2)], - ['gt-5', "$limits->{UINTMAX_OFLOW} -gt $limits->{INTMAX_UFLOW}"], - - ['lt-1', qw(5 -lt 5), {EXIT=>1}], - ['lt-2', qw(5 -lt 4), {EXIT=>1}], - ['lt-3', qw(4 -lt 5)], - ['lt-4', qw(-1 -lt -2), {EXIT=>1}], - ['lt-5', "$limits->{INTMAX_UFLOW} -lt $limits->{UINTMAX_OFLOW}"], - - ['inv-1', qw(0x0 -eq 00), {EXIT=>2}, - {ERR=>"$prog: invalid integer '0x0'\n"}], - - ['t1', "-t"], - ['t2', qw(-t 1), {EXIT=>1}], - - ['paren-1', "'(' '' ')'", {EXIT=>1}], - ['paren-2', "'(' '(' ')'"], - ['paren-3', "'(' ')' ')'"], - ['paren-4', "'(' ! ')'"], - ['paren-5', "'(' -a ')'"], -); - -@Tests = add_inverse_op_tests \@Tests; -@Tests = add_pn_tests \@Tests; - -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/test-diag b/tests/misc/test-diag deleted file mode 100755 index 9c0ce227..00000000 --- a/tests/misc/test-diag +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/perl -# Test the diagnostics of "test". - -# Copyright (C) 2006-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 -# 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; - -(my $program_name = $0) =~ s|.*/||; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -my $prog = "$ENV{abs_top_builddir}/src/test"; -my @Tests = - ( - # In coreutils-5.93, this diagnostic lacked the newline. - ['o', '-o arg', {ERR => "test: extra argument '-o'\n"}, - {ERR_SUBST => 's!^.*:!test:!'}, - {EXIT => 2}], - ); - -my $save_temps = $ENV{DEBUG}; -my $verbose = $ENV{VERBOSE}; - -my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); -exit $fail; diff --git a/tests/misc/test-diag.pl b/tests/misc/test-diag.pl new file mode 100755 index 00000000..81ab60d8 --- /dev/null +++ b/tests/misc/test-diag.pl @@ -0,0 +1,39 @@ +#!/usr/bin/perl +# Test the diagnostics of "test". + +# Copyright (C) 2006-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/>. + +use strict; + +(my $program_name = $0) =~ s|.*/||; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +my $prog = "$ENV{abs_top_builddir}/src/test"; +my @Tests = + ( + # In coreutils-5.93, this diagnostic lacked the newline. + ['o', '-o arg', {ERR => "test: extra argument '-o'\n"}, + {ERR_SUBST => 's!^.*:!test:!'}, + {EXIT => 2}], + ); + +my $save_temps = $ENV{DEBUG}; +my $verbose = $ENV{VERBOSE}; + +my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); +exit $fail; diff --git a/tests/misc/test.pl b/tests/misc/test.pl new file mode 100755 index 00000000..ee9150d7 --- /dev/null +++ b/tests/misc/test.pl @@ -0,0 +1,197 @@ +#!/usr/bin/perl + +# 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/>. + +use strict; + +my $limits = getlimits (); + +my $prog = 'test'; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +sub digest_test ($) +{ + my ($t) = @_; + my @args; + my $ret = 0; + my @list_of_hashref; + foreach my $e (@$t) + { + !ref $e + and push (@args, $e), next; + ref $e eq 'HASH' + or (warn "$0: $t->[0]: unexpected entry type\n"), next; + + exists $e->{EXIT} + and $ret = $e->{EXIT}, next; + + push @list_of_hashref, $e; + } + shift @args; # discard test name + my $flags = join ' ', @args; + + return ($flags, $ret, \@list_of_hashref); +} + +sub add_inverse_op_tests($) +{ + my ($tests) = @_; + my @new; + + my %inverse_op = + ( + eq => 'ne', + lt => 'ge', + gt => 'le', + ); + + foreach my $t (@$tests) + { + push @new, $t; + + my $test_name = $t->[0]; + my ($flags, $ret, $LoH) = digest_test $t; + + # Generate corresponding tests of inverse ops. + # E.g. generate tests of '-ge' from those of '-lt'. + foreach my $op (qw(gt lt eq)) + { + if ($test_name =~ /$op-/ && $flags =~ / -$op /) + { + my $inv = $inverse_op{$op}; + $test_name =~ s/$op/$inv/; + $flags =~ s/-$op/-$inv/; + $ret = 1 - $ret; + push (@new, [$test_name, $flags, {EXIT=>$ret}, @$LoH]); + } + } + } + return @new; +} + +sub add_pn_tests($) +{ + my ($tests) = @_; + my @new; + + # Generate parenthesized and negated versions of each test. + # There are a few exceptions. + my %not_N = map {$_ => 1} qw (1a); + my %not_P = map {$_ => 1} qw (1a + streq-6 strne-6 + paren-1 paren-2 paren-3 paren-4 paren-5); + foreach my $t (@$tests) + { + push @new, $t; + + my $test_name = $t->[0]; + my ($flags, $ret, $LoH) = digest_test $t; + next if $ret == 2; + + push (@new, ["N-$test_name", "! $flags", {EXIT=>1-$ret}, @$LoH]) + unless $not_N{$test_name}; + push (@new, ["P-$test_name", "'(' $flags ')'", {EXIT=>$ret}, @$LoH]) + unless $not_P{$test_name}; + push (@new, ["NP-$test_name", "! '(' $flags ')'", {EXIT=>1-$ret}, @$LoH]) + unless $not_P{$test_name}; + push (@new, ["NNP-$test_name", "! ! '(' $flags ')'", {EXIT=>$ret, @$LoH}]) + unless $not_P{$test_name}; + } + + return @new; +} + +my @Tests = +( + ['1a', {EXIT=>1}], + ['1b', qw(-z '')], + ['1c', 'any-string'], + ['1d', qw(-n any-string)], + ['1e', "''", {EXIT=>1}], + ['1f', '-'], + ['1g', '--'], + ['1h', '-0'], + ['1i', '-f'], + ['1j', '--help'], + ['1k', '--version'], + + ['streq-1', qw(t = t)], + ['streq-2', qw(t = f), {EXIT=>1}], + ['streqeq-1', qw(t == t)], + ['streqeq-2', qw(t == f), {EXIT=>1}], + ['streq-3', qw(! = !)], + ['streq-4', qw(= = =)], + ['streq-5', "'(' = '('"], + ['streq-6', "'(' = ')'", {EXIT=>1}], + ['strne-1', qw(t != t), {EXIT=>1}], + ['strne-2', qw(t != f)], + ['strne-3', qw(! != !), {EXIT=>1}], + ['strne-4', qw(= != =), {EXIT=>1}], + ['strne-5', "'(' != '('", {EXIT=>1}], + ['strne-6', "'(' != ')'"], + + ['and-1', qw(t -a t)], + ['and-2', qw('' -a t), {EXIT=>1}], + ['and-3', qw(t -a ''), {EXIT=>1}], + ['and-4', qw('' -a ''), {EXIT=>1}], + + ['or-1', qw(t -o t)], + ['or-2', qw('' -o t)], + ['or-3', qw(t -o '')], + ['or-4', qw('' -o ''), {EXIT=>1}], + + ['eq-1', qw(9 -eq 9)], + ['eq-2', qw(0 -eq 0)], + ['eq-3', qw(0 -eq 00)], + ['eq-4', qw(8 -eq 9), {EXIT=>1}], + ['eq-5', qw(1 -eq 0), {EXIT=>1}], + ['eq-6', "$limits->{UINTMAX_OFLOW} -eq 0", {EXIT=>1}], + + ['gt-1', qw(5 -gt 5), {EXIT=>1}], + ['gt-2', qw(5 -gt 4)], + ['gt-3', qw(4 -gt 5), {EXIT=>1}], + ['gt-4', qw(-1 -gt -2)], + ['gt-5', "$limits->{UINTMAX_OFLOW} -gt $limits->{INTMAX_UFLOW}"], + + ['lt-1', qw(5 -lt 5), {EXIT=>1}], + ['lt-2', qw(5 -lt 4), {EXIT=>1}], + ['lt-3', qw(4 -lt 5)], + ['lt-4', qw(-1 -lt -2), {EXIT=>1}], + ['lt-5', "$limits->{INTMAX_UFLOW} -lt $limits->{UINTMAX_OFLOW}"], + + ['inv-1', qw(0x0 -eq 00), {EXIT=>2}, + {ERR=>"$prog: invalid integer '0x0'\n"}], + + ['t1', "-t"], + ['t2', qw(-t 1), {EXIT=>1}], + + ['paren-1', "'(' '' ')'", {EXIT=>1}], + ['paren-2', "'(' '(' ')'"], + ['paren-3', "'(' ')' ')'"], + ['paren-4', "'(' ! ')'"], + ['paren-5', "'(' -a ')'"], +); + +@Tests = add_inverse_op_tests \@Tests; +@Tests = add_pn_tests \@Tests; + +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/timeout b/tests/misc/timeout deleted file mode 100755 index 5f4e9ec2..00000000 --- a/tests/misc/timeout +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/sh -# Validate timeout basic operation - -# Copyright (C) 2008-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ timeout - -# no timeout -timeout 10 true || fail=1 - -# no timeout (suffix check) -timeout 1d true || fail=1 - -# disabled timeout -timeout 0 true || fail=1 - -# exit status propagation -timeout 10 sh -c 'exit 2' -test $? = 2 || fail=1 - -# timeout -timeout 1 sleep 10 -test $? = 124 || fail=1 - -# kill delay. Note once the initial timeout triggers, -# the exit status will be 124 even if the command -# exits on its own accord. -timeout -s0 -k1 1 sleep 10 -test $? = 124 && fail=1 - -# Ensure 'timeout' is immune to parent's SIGCHLD handler -# 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 - - exec timeout 10 true -) || fail=1 - -# Don't be confused when starting off with a child (Bug#9098). -out=$(sleep 1 & exec timeout 2 sh -c 'sleep 3; echo foo') -status=$? -test "$out" = "" && test $status = 124 || fail=1 - -Exit $fail diff --git a/tests/misc/timeout-blocked.pl b/tests/misc/timeout-blocked.pl new file mode 100755 index 00000000..6f16ba4c --- /dev/null +++ b/tests/misc/timeout-blocked.pl @@ -0,0 +1,48 @@ +#!/usr/bin/perl +# Test that timeout handles blocked SIGALRM from its parent. + +# Copyright (C) 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/>. + +use strict; + +(my $ME = $0) =~ s|.*/||; + +eval { require POSIX; }; +$@ + and CuSkip::skip "$ME: this script requires Perl's POSIX module\n"; + +use POSIX qw(:signal_h); +my $sigset = POSIX::SigSet->new(SIGALRM); # define the signals to block +my $old_sigset = POSIX::SigSet->new; # where the old sigmask will be kept +unless (defined sigprocmask(SIG_BLOCK, $sigset, $old_sigset)) { + CuSkip::skip "$ME: sigprocmask failed; skipped"; +} + +my @Tests = + ( + # test-name, [option, option, ...] {OUT=>"expected-output"} + # + + ['block-alrm', ".1 sleep 10", {EXIT => 124}], + ); + +my $save_temps = $ENV{DEBUG}; +my $verbose = $ENV{VERBOSE}; + +my $prog = 'timeout'; +my $fail = run_tests ($ME, $prog, \@Tests, $save_temps, $verbose); + +exit $fail; diff --git a/tests/misc/timeout-group b/tests/misc/timeout-group deleted file mode 100755 index 7a08bb3a..00000000 --- a/tests/misc/timeout-group +++ /dev/null @@ -1,97 +0,0 @@ -#!/bin/sh -# test program group handling - -# Copyright (C) 2011-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ timeout - -# construct a program group hierarchy as follows: -# timeout-group - foreground group -# group.sh - separate group -# timeout.cmd - same group as group.sh -# -# We then send a SIGINT to the "separate group" -# to simulate what happens when a Ctrl-C -# is sent to the foreground group. - -setsid true || skip_ "setsid required to control groups" - -cat > timeout.cmd <<\EOF -#!/bin/sh -trap 'touch int.received; exit' INT -touch timeout.running -sleep $1 -EOF -chmod a+x timeout.cmd - -cat > group.sh <<\EOF -#!/bin/sh -trap '' INT -timeout --foreground 25 ./timeout.cmd 20& -wait -EOF -chmod a+x group.sh - -check_timeout_cmd_running() -{ - local delay="$1" - test -e timeout.running || - { sleep $delay; return 1; } -} - - -# Start above script in its own group. -# We could use timeout for this, but that assumes an implementation. -setsid ./group.sh & -# Wait 6.3s for timeout.cmd to start -retry_delay_ check_timeout_cmd_running .1 6 || fail=1 -# Simulate a Ctrl-C to the group to test timely exit -# Note dash doesn't support signalling groups (a leading -) -env kill -INT -- -$! -wait -test -e int.received || fail=1 - -rm -f int.received timeout.running - - -# Ensure cascaded timeouts work -# or more generally, ensure we timeout -# commands that create their own group -# This didn't work before 8.13. - -start=$(date +%s) - -# Note the first timeout must send a signal that -# the second is handling for it to be propagated to the command. -# SIGINT, SIGTERM, SIGALRM etc. are implicit. -timeout -sALRM 30 timeout -sINT 25 ./timeout.cmd 20& -pid=$! -# Wait 6.3s for timeout.cmd to start -retry_delay_ check_timeout_cmd_running .1 6 || fail=1 -kill -ALRM $pid # trigger the alarm of the first timeout command -wait $pid -ret=$? -test $ret -eq 124 || - skip_ "timeout returned $ret. SIGALRM not handled?" -test -e int.received || fail=1 - -end=$(date +%s) - -test $(expr $end - $start) -lt 20 || - skip_ "timeout.cmd didn't receive a signal until after sleep?" - -Exit $fail diff --git a/tests/misc/timeout-group.sh b/tests/misc/timeout-group.sh new file mode 100755 index 00000000..35a6be0b --- /dev/null +++ b/tests/misc/timeout-group.sh @@ -0,0 +1,101 @@ +#!/bin/sh +# test program group handling + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ timeout + +# construct a program group hierarchy as follows: +# timeout-group - foreground group +# group.sh - separate group +# timeout.cmd - same group as group.sh +# +# We then send a SIGINT to the "separate group" +# to simulate what happens when a Ctrl-C +# is sent to the foreground group. + +setsid true || skip_ "setsid required to control groups" + +cat > timeout.cmd <<\EOF +#!/bin/sh +trap 'touch int.received; exit' INT +touch timeout.running +count=$1 +until test -e int.received || test $count = 0; do + sleep 1 + count=$(expr $count - 1) +done +EOF +chmod a+x timeout.cmd + +cat > group.sh <<\EOF +#!/bin/sh +trap '' INT +timeout --foreground 25 ./timeout.cmd 20& +wait +EOF +chmod a+x group.sh + +check_timeout_cmd_running() +{ + local delay="$1" + test -e timeout.running || + { sleep $delay; return 1; } +} + + +# Start above script in its own group. +# We could use timeout for this, but that assumes an implementation. +setsid ./group.sh & +# Wait 6.3s for timeout.cmd to start +retry_delay_ check_timeout_cmd_running .1 6 || fail=1 +# Simulate a Ctrl-C to the group to test timely exit +# Note dash doesn't support signalling groups (a leading -) +env kill -INT -- -$! +wait +test -e int.received || fail=1 + +rm -f int.received timeout.running + + +# Ensure cascaded timeouts work +# or more generally, ensure we timeout +# commands that create their own group +# This didn't work before 8.13. + +start=$(date +%s) + +# Note the first timeout must send a signal that +# the second is handling for it to be propagated to the command. +# SIGINT, SIGTERM, SIGALRM etc. are implicit. +timeout -sALRM 30 timeout -sINT 25 ./timeout.cmd 20& +pid=$! +# Wait 6.3s for timeout.cmd to start +retry_delay_ check_timeout_cmd_running .1 6 || fail=1 +kill -ALRM $pid # trigger the alarm of the first timeout command +wait $pid +ret=$? +test $ret -eq 124 || + skip_ "timeout returned $ret. SIGALRM not handled?" +test -e int.received || fail=1 + +end=$(date +%s) + +test $(expr $end - $start) -lt 20 || + skip_ "timeout.cmd didn't receive a signal until after sleep?" + +Exit $fail diff --git a/tests/misc/timeout-parameters b/tests/misc/timeout-parameters deleted file mode 100755 index c7d66309..00000000 --- a/tests/misc/timeout-parameters +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/sh -# Validate timeout parameter combinations - -# Copyright (C) 2008-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ timeout -getlimits_ - - -# internal errors are 125, distinct from execution failure - -# invalid timeout -timeout invalid sleep 0 -test $? = 125 || fail=1 - -# invalid kill delay -timeout --kill-after=invalid 1 sleep 0 -test $? = 125 || fail=1 - -# invalid timeout suffix -timeout 42D sleep 0 -test $? = 125 || fail=1 - -# It was seen on 32 bit Linux/HPPA that a kernel time_t overflowed, -# thus causing the timer to fire immediately. -# So verify that doesn't happen before checking large timeouts -KERNEL_OVERFLOW_LIMIT=$(expr $TIME_T_MAX - $(date +%s) + 100) -timeout $KERNEL_OVERFLOW_LIMIT sleep 0 -if test $? != 124; then - # timeout overflow - timeout $UINT_OFLOW sleep 0 - test $? = 0 || fail=1 - - # timeout overflow - timeout $(expr $UINT_MAX / 86400 + 1)d sleep 0 - test $? = 0 || fail=1 - - # timeout overflow - timeout 999999999999999999999999999999999999999999999999999999999999d sleep 0 - test $? = 0 || fail=1 - - # floating point notation - timeout 2.34e+5d sleep 0 - test $? = 0 || fail=1 -fi - -# floating point notation -timeout 2.34 sleep 0 -test $? = 0 || fail=1 - -# nanoseconds potentially supported -timeout .999999999 sleep 0 || fail=1 - -# invalid signal spec -timeout --signal=invalid 1 sleep 0 -test $? = 125 || fail=1 - -# invalid command -timeout 10 . -test $? = 126 || fail=1 - -# no such command -timeout 10 no_such -test $? = 127 || fail=1 - -Exit $fail diff --git a/tests/misc/timeout-parameters.sh b/tests/misc/timeout-parameters.sh new file mode 100755 index 00000000..06cdfb39 --- /dev/null +++ b/tests/misc/timeout-parameters.sh @@ -0,0 +1,80 @@ +#!/bin/sh +# Validate timeout parameter combinations + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ timeout +getlimits_ + + +# internal errors are 125, distinct from execution failure + +# invalid timeout +timeout invalid sleep 0 +test $? = 125 || fail=1 + +# invalid kill delay +timeout --kill-after=invalid 1 sleep 0 +test $? = 125 || fail=1 + +# invalid timeout suffix +timeout 42D sleep 0 +test $? = 125 || fail=1 + +# It was seen on 32 bit Linux/HPPA that a kernel time_t overflowed, +# thus causing the timer to fire immediately. +# So verify that doesn't happen before checking large timeouts +KERNEL_OVERFLOW_LIMIT=$(expr $TIME_T_MAX - $(date +%s) + 100) +timeout $KERNEL_OVERFLOW_LIMIT sleep 0 +if test $? != 124; then + # timeout overflow + timeout $UINT_OFLOW sleep 0 + test $? = 0 || fail=1 + + # timeout overflow + timeout $(expr $UINT_MAX / 86400 + 1)d sleep 0 + test $? = 0 || fail=1 + + # timeout overflow + timeout 999999999999999999999999999999999999999999999999999999999999d sleep 0 + test $? = 0 || fail=1 + + # floating point notation + timeout 2.34e+5d sleep 0 + test $? = 0 || fail=1 +fi + +# floating point notation +timeout 2.34 sleep 0 +test $? = 0 || fail=1 + +# nanoseconds potentially supported +timeout .999999999 sleep 0 || fail=1 + +# invalid signal spec +timeout --signal=invalid 1 sleep 0 +test $? = 125 || fail=1 + +# invalid command +timeout 10 . +test $? = 126 || fail=1 + +# no such command +timeout 10 no_such +test $? = 127 || fail=1 + +Exit $fail diff --git a/tests/misc/timeout.sh b/tests/misc/timeout.sh new file mode 100755 index 00000000..6b5a6f10 --- /dev/null +++ b/tests/misc/timeout.sh @@ -0,0 +1,64 @@ +#!/bin/sh +# Validate timeout basic operation + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ timeout + +# no timeout +timeout 10 true || fail=1 + +# no timeout (suffix check) +timeout 1d true || fail=1 + +# disabled timeout +timeout 0 true || fail=1 + +# exit status propagation +timeout 10 sh -c 'exit 2' +test $? = 2 || fail=1 + +# timeout +timeout .1 sleep 10 +test $? = 124 || fail=1 + +# exit status propagation even on timeout +timeout --preserve-status .1 sleep 10 +# exit status should be 128+TERM +test $? = 124 && fail=1 + +# kill delay. Note once the initial timeout triggers, +# the exit status will be 124 even if the command +# exits on its own accord. +timeout -s0 -k1 .1 sleep 10 +test $? = 124 && fail=1 + +# Ensure 'timeout' is immune to parent's SIGCHLD handler +# 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 + + exec timeout 10 true +) || fail=1 + +# Don't be confused when starting off with a child (Bug#9098). +out=$(sleep .1 & exec timeout .5 sh -c 'sleep 2; echo foo') +status=$? +test "$out" = "" && test $status = 124 || fail=1 + +Exit $fail diff --git a/tests/misc/tr b/tests/misc/tr deleted file mode 100755 index 89f77775..00000000 --- a/tests/misc/tr +++ /dev/null @@ -1,174 +0,0 @@ -#!/usr/bin/perl - -# Copyright (C) 2008-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 -# 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; - -my $prog = 'tr'; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -my $map_all_to_1 = - "$prog: when translating with complemented character classes,\n" - . "string2 must map all characters in the domain to one\n"; - -my @Tests = -( - ['1', qw(abcd '[]*]'), {IN=>'abcd'}, {OUT=>']]]]'}], - ['2', qw(abc '[%*]xyz'), {IN=>'abc'}, {OUT=>'xyz'}], - ['3', qw('' '[.*]'), {IN=>'abc'}, {OUT=>'abc'}], - - # Test --truncate-set1 behavior when string1 is longer than string2 - ['4', qw(-t abcd xy), {IN=>'abcde'}, {OUT=>'xycde'}], - # Test bsd behavior (the default) when string1 is longer than string2 - ['5', qw(abcd xy), {IN=>'abcde'}, {OUT=>'xyyye'}], - # Do it the posix way - ['6', qw(abcd 'x[y*]'), {IN=>'abcde'}, {OUT=>'xyyye'}], - ['7', qw(-s a-p '%[.*]$'), {IN=>'abcdefghijklmnop'}, {OUT=>'%.$'}], - ['8', qw(-s a-p '[.*]$'), {IN=>'abcdefghijklmnop'}, {OUT=>'.$'}], - ['9', qw(-s a-p '%[.*]'), {IN=>'abcdefghijklmnop'}, {OUT=>'%.'}], - ['a', qw(-s '[a-z]'), {IN=>'aabbcc'}, {OUT=>'abc'}], - ['b', qw(-s '[a-c]'), {IN=>'aabbcc'}, {OUT=>'abc'}], - ['c', qw(-s '[a-b]'), {IN=>'aabbcc'}, {OUT=>'abcc'}], - ['d', qw(-s '[b-c]'), {IN=>'aabbcc'}, {OUT=>'aabc'}], - ['e', qw(-s '[\0-\5]'), - {IN=>"\0\0a\1\1b\2\2\2c\3\3\3d\4\4\4\4e\5\5"}, {OUT=>"\0a\1b\2c\3d\4e\5"}], - # tests of delete - ['f', qw(-d '[=[=]'), {IN=>'[[[[[[[]]]]]]]]'}, {OUT=>']]]]]]]]'}], - ['g', qw(-d '[=]=]'), {IN=>'[[[[[[[]]]]]]]]'}, {OUT=>'[[[[[[['}], - ['h', qw(-d '[:xdigit:]'), {IN=>'0123456789acbdefABCDEF'}, {OUT=>''}], - ['i', qw(-d '[:xdigit:]'), {IN=>'w0x1y2z3456789acbdefABCDEFz'}, - {OUT=>'wxyzz'}], - ['j', qw(-d '[:digit:]'), {IN=>'0123456789'}, {OUT=>''}], - ['k', qw(-d '[:digit:]'), - {IN=>'a0b1c2d3e4f5g6h7i8j9k'}, {OUT=>'abcdefghijk'}], - ['l', qw(-d '[:lower:]'), {IN=>'abcdefghijklmnopqrstuvwxyz'}, {OUT=>''}], - ['m', qw(-d '[:upper:]'), {IN=>'ABCDEFGHIJKLMNOPQRSTUVWXYZ'}, {OUT=>''}], - ['n', qw(-d '[:lower:][:upper:]'), - {IN=>'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'}, {OUT=>''}], - ['o', qw(-d '[:alpha:]'), - {IN=>'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'}, {OUT=>''}], - ['p', qw(-d '[:alnum:]'), - {IN=>'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'}, - {OUT=>''}], - ['q', qw(-d '[:alnum:]'), - {IN=>'.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.'}, - {OUT=>'..'}], - ['r', qw(-ds '[:alnum:]' .), - {IN=>'.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.'}, - {OUT=>'.'}], - - # The classic example, with string2 BSD-style - ['s', qw(-cs '[:alnum:]' '\n'), - {IN=>'The big black fox jumped over the fence.'}, - {OUT=>"The\nbig\nblack\nfox\njumped\nover\nthe\nfence\n"}], - - # The classic example, POSIX-style - ['t', qw(-cs '[:alnum:]' '[\n*]'), - {IN=>'The big black fox jumped over the fence.'}, - {OUT=>"The\nbig\nblack\nfox\njumped\nover\nthe\nfence\n"}], - ['u', qw(-ds b a), {IN=>'aabbaa'}, {OUT=>'a'}], - ['v', qw(-ds '[:xdigit:]' Z), {IN=>'ZZ0123456789acbdefABCDEFZZ'}, {OUT=>'Z'}], - - # Try some data with 8th bit set in case something is mistakenly - # sign-extended. - ['w', qw(-ds '\350' '\345'), - {IN=>"\300\301\377\345\345\350\345"}, - {OUT=>"\300\301\377\345"}], - ['x', qw(-s abcdefghijklmn '[:*016]'), - {IN=>'abcdefghijklmnop'}, {OUT=>':op'}], - ['y', qw(-d a-z), {IN=>'abc $code'}, {OUT=>' $'}], - ['z', qw(-ds a-z '$.'), {IN=>'a.b.c $$$$code\\'}, {OUT=>'. $\\'}], - - # Make sure that a-a is accepted. - ['range-a-a', qw(a-a z), {IN=>'abc'}, {OUT=>'zbc'}], - # - ['null', qw(a ''), {IN=>''}, {OUT=>''}, {EXIT=>1}, - {ERR=>"$prog: when not truncating set1, string2 must be non-empty\n"}], - ['upcase', qw('[:lower:]' '[:upper:]'), - {IN=>'abcxyzABCXYZ'}, - {OUT=>'ABCXYZABCXYZ'}], - ['dncase', qw('[:upper:]' '[:lower:]'), - {IN=>'abcxyzABCXYZ'}, - {OUT=>'abcxyzabcxyz'}], - # - ['rep-cclass', qw('a[=*2][=c=]' xyyz), {IN=>'a=c'}, {OUT=>'xyz'}], - ['rep-1', qw('[:*3][:digit:]' a-m), {IN=>':1239'}, {OUT=>'cefgm'}], - ['rep-2', qw('a[b*512]c' '1[x*]2'), {IN=>'abc'}, {OUT=>'1x2'}], - ['rep-3', qw('a[b*513]c' '1[x*]2'), {IN=>'abc'}, {OUT=>'1x2'}], - # Another couple octal repeat count tests. - ['o-rep-1', qw('[b*08]' '[x*]'), {IN=>''}, {OUT=>''}, {EXIT=>1}, - {ERR=>"$prog: invalid repeat count '08' in [c*n] construct\n"}], - ['o-rep-2', qw('[b*010]cd' '[a*7]BC[x*]'), {IN=>'bcd'}, {OUT=>'BCx'}], - - ['esc', qw('a\-z' A-Z), {IN=>'abc-z'}, {OUT=>'AbcBC'}], - ['bs-055', qw('a\055b' def), {IN=>"a\055b"}, {OUT=>'def'}], - ['bs-at-end', qw('\\' x), {IN=>"\\"}, {OUT=>'x'}, - {ERR=>"$prog: warning: an unescaped backslash at end of " - . "string is not portable\n"}], - - # - # From Ross - ['ross-0a', qw(-cs '[:upper:]' 'X[Y*]'), {IN=>''}, {OUT=>''}, {EXIT=>1}, - {ERR=>$map_all_to_1}], - ['ross-0b', qw(-cs '[:cntrl:]' 'X[Y*]'), {IN=>''}, {OUT=>''}, {EXIT=>1}, - {ERR=>$map_all_to_1}], - ['ross-1a', qw(-cs '[:upper:]' '[X*]'), - {IN=>'AMZamz123.-+AMZ'}, {OUT=>'AMZXAMZ'}], - ['ross-1b', qw(-cs '[:upper:][:digit:]' '[Z*]'), {IN=>''}, {OUT=>''}], - ['ross-2', qw(-dcs '[:lower:]' n-rs-z), - {IN=>'amzAMZ123.-+amz'}, {OUT=>'amzamz'}], - ['ross-3', qw(-ds '[:xdigit:]' '[:alnum:]'), - {IN=>'.ZABCDEFGzabcdefg.0123456788899.GG'}, {OUT=>'.ZGzg..G'}], - ['ross-4', qw(-dcs '[:alnum:]' '[:digit:]'), {IN=>''}, {OUT=>''}], - ['ross-5', qw(-dc '[:lower:]'), {IN=>''}, {OUT=>''}], - ['ross-6', qw(-dc '[:upper:]'), {IN=>''}, {OUT=>''}], - - # Ensure that these fail. - # Prior to 2.0.20, each would evoke a failed assertion. - ['empty-eq', qw('[==]' x), {IN=>''}, {OUT=>''}, {EXIT=>1}, - {ERR=>"$prog: missing equivalence class character '[==]'\n"}], - ['empty-cc', qw('[::]' x), {IN=>''}, {OUT=>''}, {EXIT=>1}, - {ERR=>"$prog: missing character class name '[::]'\n"}], - - # Weird repeat counts. - ['repeat-bs-9', qw(abc '[b*\9]'), {IN=>'abcd'}, {OUT=>'[b*d'}], - ['repeat-0', qw(abc '[b*0]'), {IN=>'abcd'}, {OUT=>'bbbd'}], - ['repeat-zeros', qw(abc '[b*00000000000000000000]'), - {IN=>'abcd'}, {OUT=>'bbbd'}], - ['repeat-compl', qw(-c '[a*65536]\n' '[b*]'), {IN=>'abcd'}, {OUT=>'abbb'}], - ['repeat-xC', qw(-C '[a*65536]\n' '[b*]'), {IN=>'abcd'}, {OUT=>'abbb'}], - - # From Glenn Fowler. - ['fowler-1', qw(ah -H), {IN=>'aha'}, {OUT=>'-H-'}], - - # Up to coreutils-6.9, this would provoke a failed assertion. - ['no-abort-1', qw(-c a '[b*256]'), {IN=>'abc'}, {OUT=>'abb'}], -); - -@Tests = triple_test \@Tests; - -# tr takes its input only from stdin, not from a file argument, so -# remove the tests that provide file arguments and keep only the ones -# generated by triple_test (identifiable by their .r and .p suffixes). -@Tests = grep {$_->[0] =~ /\.[pr]$/} @Tests; - -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/tr-case-class b/tests/misc/tr-case-class deleted file mode 100755 index 2f70f4eb..00000000 --- a/tests/misc/tr-case-class +++ /dev/null @@ -1,113 +0,0 @@ -#!/bin/sh -# Test case conversion classes - -# Copyright (C) 2010-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ tr - -# Ensure we support translation of case classes with extension -echo '01234567899999999999999999' > exp -echo 'abcdefghijklmnopqrstuvwxyz' | -tr '[:lower:]' '0-9' > out || fail=1 -compare exp out || fail=1 -echo 'abcdefghijklmnopqrstuvwxyz' | -tr '[:lower:][:lower:]' '[:upper:]0-9' > out || fail=1 -compare exp out || fail=1 - -# Validate the alignment of case classes -tr 'A-Z[:lower:]' 'a-y[:upper:]' < /dev/null && fail=1 -tr '[:upper:][:lower:]' 'a-y[:upper:]' < /dev/null && fail=1 -tr 'A-Y[:lower:]' 'a-z[:upper:]' < /dev/null && fail=1 -tr 'A-Z[:lower:]' '[:lower:][:upper:]' < /dev/null && fail=1 -tr 'A-Z[:lower:]' '[:lower:]A-Z' < /dev/null && fail=1 -tr '[:upper:][:lower:]' 'a-z[:upper:]' < /dev/null || fail=1 -tr '[:upper:][:lower:]' '[:upper:]a-z' < /dev/null || fail=1 - -# Before coreutils 8.6 the trailing space in string1 -# caused the case class in string2 to be extended. -# However that was not portable, dependent on locale -# and in contravention of POSIX. -tr '[:upper:] ' '[:lower:]' < /dev/null 2>out && fail=1 -echo 'tr: when translating with string1 longer than string2, -the latter string must not end with a character class' > exp -compare exp out || fail=1 - -# Up to coreutils-6.9, tr rejected an unmatched [:lower:] or [:upper:] in SET1. -echo '#$%123abcABC' | tr '[:lower:]' '[.*]' > out || fail=1 -echo '#$%123...ABC' > exp -compare exp out || fail=1 -echo '#$%123abcABC' | tr '[:upper:]' '[.*]' > out || fail=1 -echo '#$%123abc...' > exp -compare exp out || fail=1 - -# When doing a case-converting translation with something after the -# [:upper:] and [:lower:] elements, ensure that tr honors the following byte. -echo 'abc.' | tr '[:lower:].' '[:upper:]x' > out || fail=1 -echo 'ABCx' > exp -compare exp out || fail=1 - -# Before coreutils 8.6 the disparate number of upper and lower -# characters in some locales, triggered abort()s and invalid behavior -export LC_ALL=en_US.ISO-8859-1 - -if test "$(locale charmap 2>/dev/null)" = ISO-8859-1; then - # Up to coreutils-6.9.91, this would fail with the diagnostic: - # tr: misaligned [:upper:] and/or [:lower:] construct - # with LC_CTYPE=en_US.ISO-8859-1. - tr '[:upper:]' '[:lower:]' < /dev/null || fail=1 - - tr '[:upper:] ' '[:lower:]' < /dev/null 2>out && fail=1 - echo 'tr: when translating with string1 longer than string2, -the latter string must not end with a character class' > exp - compare exp out || fail=1 - - # Ensure when there are a different number of elements - # in each string, we validate the case mapping correctly - echo 'abc.xyz' | - tr 'ab[:lower:]' '0-1[:upper:]' > out || fail=1 - echo 'ABC.XYZ' > exp - compare exp out || fail=1 - - # Ensure we extend string2 appropriately - echo 'ABC- XYZ' | - tr '[:upper:]- ' '[:lower:]_' > out || fail=1 - echo 'abc__xyz' > exp - compare exp out || fail=1 - - # Ensure the size of the case classes are accounted - # for as a unit. - echo 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' | - tr '[:upper:]A-B' '[:lower:]0' >out || fail=1 - echo '00cdefghijklmnopqrstuvwxyz' > exp - compare exp out || fail=1 - - # Ensure the size of the case classes are accounted - # for as a unit. - echo 'a' | - tr -t '[:lower:]a' '[:upper:]0' >out || fail=1 - echo '0' > exp - compare exp out || fail=1 - - # Ensure the size of the case classes are accounted - # for as a unit. - echo 'a' | - tr -t '[:lower:][:lower:]a' '[:lower:][:upper:]0' >out || fail=1 - echo '0' > exp - compare exp out || fail=1 -fi - -Exit $fail diff --git a/tests/misc/tr-case-class.sh b/tests/misc/tr-case-class.sh new file mode 100755 index 00000000..1294f965 --- /dev/null +++ b/tests/misc/tr-case-class.sh @@ -0,0 +1,113 @@ +#!/bin/sh +# Test case conversion classes + +# Copyright (C) 2010-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ tr + +# Ensure we support translation of case classes with extension +echo '01234567899999999999999999' > exp +echo 'abcdefghijklmnopqrstuvwxyz' | +tr '[:lower:]' '0-9' > out || fail=1 +compare exp out || fail=1 +echo 'abcdefghijklmnopqrstuvwxyz' | +tr '[:lower:][:lower:]' '[:upper:]0-9' > out || fail=1 +compare exp out || fail=1 + +# Validate the alignment of case classes +tr 'A-Z[:lower:]' 'a-y[:upper:]' < /dev/null && fail=1 +tr '[:upper:][:lower:]' 'a-y[:upper:]' < /dev/null && fail=1 +tr 'A-Y[:lower:]' 'a-z[:upper:]' < /dev/null && fail=1 +tr 'A-Z[:lower:]' '[:lower:][:upper:]' < /dev/null && fail=1 +tr 'A-Z[:lower:]' '[:lower:]A-Z' < /dev/null && fail=1 +tr '[:upper:][:lower:]' 'a-z[:upper:]' < /dev/null || fail=1 +tr '[:upper:][:lower:]' '[:upper:]a-z' < /dev/null || fail=1 + +# Before coreutils 8.6 the trailing space in string1 +# caused the case class in string2 to be extended. +# However that was not portable, dependent on locale +# and in contravention of POSIX. +tr '[:upper:] ' '[:lower:]' < /dev/null 2>out && fail=1 +echo 'tr: when translating with string1 longer than string2, +the latter string must not end with a character class' > exp +compare exp out || fail=1 + +# Up to coreutils-6.9, tr rejected an unmatched [:lower:] or [:upper:] in SET1. +echo '#$%123abcABC' | tr '[:lower:]' '[.*]' > out || fail=1 +echo '#$%123...ABC' > exp +compare exp out || fail=1 +echo '#$%123abcABC' | tr '[:upper:]' '[.*]' > out || fail=1 +echo '#$%123abc...' > exp +compare exp out || fail=1 + +# When doing a case-converting translation with something after the +# [:upper:] and [:lower:] elements, ensure that tr honors the following byte. +echo 'abc.' | tr '[:lower:].' '[:upper:]x' > out || fail=1 +echo 'ABCx' > exp +compare exp out || fail=1 + +# Before coreutils 8.6 the disparate number of upper and lower +# characters in some locales, triggered abort()s and invalid behavior +export LC_ALL=en_US.ISO-8859-1 + +if test "$(locale charmap 2>/dev/null)" = ISO-8859-1; then + # Up to coreutils-6.9.91, this would fail with the diagnostic: + # tr: misaligned [:upper:] and/or [:lower:] construct + # with LC_CTYPE=en_US.ISO-8859-1. + tr '[:upper:]' '[:lower:]' < /dev/null || fail=1 + + tr '[:upper:] ' '[:lower:]' < /dev/null 2>out && fail=1 + echo 'tr: when translating with string1 longer than string2, +the latter string must not end with a character class' > exp + compare exp out || fail=1 + + # Ensure when there are a different number of elements + # in each string, we validate the case mapping correctly + echo 'abc.xyz' | + tr 'ab[:lower:]' '0-1[:upper:]' > out || fail=1 + echo 'ABC.XYZ' > exp + compare exp out || fail=1 + + # Ensure we extend string2 appropriately + echo 'ABC- XYZ' | + tr '[:upper:]- ' '[:lower:]_' > out || fail=1 + echo 'abc__xyz' > exp + compare exp out || fail=1 + + # Ensure the size of the case classes are accounted + # for as a unit. + echo 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' | + tr '[:upper:]A-B' '[:lower:]0' >out || fail=1 + echo '00cdefghijklmnopqrstuvwxyz' > exp + compare exp out || fail=1 + + # Ensure the size of the case classes are accounted + # for as a unit. + echo 'a' | + tr -t '[:lower:]a' '[:upper:]0' >out || fail=1 + echo '0' > exp + compare exp out || fail=1 + + # Ensure the size of the case classes are accounted + # for as a unit. + echo 'a' | + tr -t '[:lower:][:lower:]a' '[:lower:][:upper:]0' >out || fail=1 + echo '0' > exp + compare exp out || fail=1 +fi + +Exit $fail diff --git a/tests/misc/tr.pl b/tests/misc/tr.pl new file mode 100755 index 00000000..89693f91 --- /dev/null +++ b/tests/misc/tr.pl @@ -0,0 +1,174 @@ +#!/usr/bin/perl + +# 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/>. + +use strict; + +my $prog = 'tr'; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +my $map_all_to_1 = + "$prog: when translating with complemented character classes,\n" + . "string2 must map all characters in the domain to one\n"; + +my @Tests = +( + ['1', qw(abcd '[]*]'), {IN=>'abcd'}, {OUT=>']]]]'}], + ['2', qw(abc '[%*]xyz'), {IN=>'abc'}, {OUT=>'xyz'}], + ['3', qw('' '[.*]'), {IN=>'abc'}, {OUT=>'abc'}], + + # Test --truncate-set1 behavior when string1 is longer than string2 + ['4', qw(-t abcd xy), {IN=>'abcde'}, {OUT=>'xycde'}], + # Test bsd behavior (the default) when string1 is longer than string2 + ['5', qw(abcd xy), {IN=>'abcde'}, {OUT=>'xyyye'}], + # Do it the posix way + ['6', qw(abcd 'x[y*]'), {IN=>'abcde'}, {OUT=>'xyyye'}], + ['7', qw(-s a-p '%[.*]$'), {IN=>'abcdefghijklmnop'}, {OUT=>'%.$'}], + ['8', qw(-s a-p '[.*]$'), {IN=>'abcdefghijklmnop'}, {OUT=>'.$'}], + ['9', qw(-s a-p '%[.*]'), {IN=>'abcdefghijklmnop'}, {OUT=>'%.'}], + ['a', qw(-s '[a-z]'), {IN=>'aabbcc'}, {OUT=>'abc'}], + ['b', qw(-s '[a-c]'), {IN=>'aabbcc'}, {OUT=>'abc'}], + ['c', qw(-s '[a-b]'), {IN=>'aabbcc'}, {OUT=>'abcc'}], + ['d', qw(-s '[b-c]'), {IN=>'aabbcc'}, {OUT=>'aabc'}], + ['e', qw(-s '[\0-\5]'), + {IN=>"\0\0a\1\1b\2\2\2c\3\3\3d\4\4\4\4e\5\5"}, {OUT=>"\0a\1b\2c\3d\4e\5"}], + # tests of delete + ['f', qw(-d '[=[=]'), {IN=>'[[[[[[[]]]]]]]]'}, {OUT=>']]]]]]]]'}], + ['g', qw(-d '[=]=]'), {IN=>'[[[[[[[]]]]]]]]'}, {OUT=>'[[[[[[['}], + ['h', qw(-d '[:xdigit:]'), {IN=>'0123456789acbdefABCDEF'}, {OUT=>''}], + ['i', qw(-d '[:xdigit:]'), {IN=>'w0x1y2z3456789acbdefABCDEFz'}, + {OUT=>'wxyzz'}], + ['j', qw(-d '[:digit:]'), {IN=>'0123456789'}, {OUT=>''}], + ['k', qw(-d '[:digit:]'), + {IN=>'a0b1c2d3e4f5g6h7i8j9k'}, {OUT=>'abcdefghijk'}], + ['l', qw(-d '[:lower:]'), {IN=>'abcdefghijklmnopqrstuvwxyz'}, {OUT=>''}], + ['m', qw(-d '[:upper:]'), {IN=>'ABCDEFGHIJKLMNOPQRSTUVWXYZ'}, {OUT=>''}], + ['n', qw(-d '[:lower:][:upper:]'), + {IN=>'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'}, {OUT=>''}], + ['o', qw(-d '[:alpha:]'), + {IN=>'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'}, {OUT=>''}], + ['p', qw(-d '[:alnum:]'), + {IN=>'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'}, + {OUT=>''}], + ['q', qw(-d '[:alnum:]'), + {IN=>'.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.'}, + {OUT=>'..'}], + ['r', qw(-ds '[:alnum:]' .), + {IN=>'.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.'}, + {OUT=>'.'}], + + # The classic example, with string2 BSD-style + ['s', qw(-cs '[:alnum:]' '\n'), + {IN=>'The big black fox jumped over the fence.'}, + {OUT=>"The\nbig\nblack\nfox\njumped\nover\nthe\nfence\n"}], + + # The classic example, POSIX-style + ['t', qw(-cs '[:alnum:]' '[\n*]'), + {IN=>'The big black fox jumped over the fence.'}, + {OUT=>"The\nbig\nblack\nfox\njumped\nover\nthe\nfence\n"}], + ['u', qw(-ds b a), {IN=>'aabbaa'}, {OUT=>'a'}], + ['v', qw(-ds '[:xdigit:]' Z), {IN=>'ZZ0123456789acbdefABCDEFZZ'}, {OUT=>'Z'}], + + # Try some data with 8th bit set in case something is mistakenly + # sign-extended. + ['w', qw(-ds '\350' '\345'), + {IN=>"\300\301\377\345\345\350\345"}, + {OUT=>"\300\301\377\345"}], + ['x', qw(-s abcdefghijklmn '[:*016]'), + {IN=>'abcdefghijklmnop'}, {OUT=>':op'}], + ['y', qw(-d a-z), {IN=>'abc $code'}, {OUT=>' $'}], + ['z', qw(-ds a-z '$.'), {IN=>'a.b.c $$$$code\\'}, {OUT=>'. $\\'}], + + # Make sure that a-a is accepted. + ['range-a-a', qw(a-a z), {IN=>'abc'}, {OUT=>'zbc'}], + # + ['null', qw(a ''), {IN=>''}, {OUT=>''}, {EXIT=>1}, + {ERR=>"$prog: when not truncating set1, string2 must be non-empty\n"}], + ['upcase', qw('[:lower:]' '[:upper:]'), + {IN=>'abcxyzABCXYZ'}, + {OUT=>'ABCXYZABCXYZ'}], + ['dncase', qw('[:upper:]' '[:lower:]'), + {IN=>'abcxyzABCXYZ'}, + {OUT=>'abcxyzabcxyz'}], + # + ['rep-cclass', qw('a[=*2][=c=]' xyyz), {IN=>'a=c'}, {OUT=>'xyz'}], + ['rep-1', qw('[:*3][:digit:]' a-m), {IN=>':1239'}, {OUT=>'cefgm'}], + ['rep-2', qw('a[b*512]c' '1[x*]2'), {IN=>'abc'}, {OUT=>'1x2'}], + ['rep-3', qw('a[b*513]c' '1[x*]2'), {IN=>'abc'}, {OUT=>'1x2'}], + # Another couple octal repeat count tests. + ['o-rep-1', qw('[b*08]' '[x*]'), {IN=>''}, {OUT=>''}, {EXIT=>1}, + {ERR=>"$prog: invalid repeat count '08' in [c*n] construct\n"}], + ['o-rep-2', qw('[b*010]cd' '[a*7]BC[x*]'), {IN=>'bcd'}, {OUT=>'BCx'}], + + ['esc', qw('a\-z' A-Z), {IN=>'abc-z'}, {OUT=>'AbcBC'}], + ['bs-055', qw('a\055b' def), {IN=>"a\055b"}, {OUT=>'def'}], + ['bs-at-end', qw('\\' x), {IN=>"\\"}, {OUT=>'x'}, + {ERR=>"$prog: warning: an unescaped backslash at end of " + . "string is not portable\n"}], + + # + # From Ross + ['ross-0a', qw(-cs '[:upper:]' 'X[Y*]'), {IN=>''}, {OUT=>''}, {EXIT=>1}, + {ERR=>$map_all_to_1}], + ['ross-0b', qw(-cs '[:cntrl:]' 'X[Y*]'), {IN=>''}, {OUT=>''}, {EXIT=>1}, + {ERR=>$map_all_to_1}], + ['ross-1a', qw(-cs '[:upper:]' '[X*]'), + {IN=>'AMZamz123.-+AMZ'}, {OUT=>'AMZXAMZ'}], + ['ross-1b', qw(-cs '[:upper:][:digit:]' '[Z*]'), {IN=>''}, {OUT=>''}], + ['ross-2', qw(-dcs '[:lower:]' n-rs-z), + {IN=>'amzAMZ123.-+amz'}, {OUT=>'amzamz'}], + ['ross-3', qw(-ds '[:xdigit:]' '[:alnum:]'), + {IN=>'.ZABCDEFGzabcdefg.0123456788899.GG'}, {OUT=>'.ZGzg..G'}], + ['ross-4', qw(-dcs '[:alnum:]' '[:digit:]'), {IN=>''}, {OUT=>''}], + ['ross-5', qw(-dc '[:lower:]'), {IN=>''}, {OUT=>''}], + ['ross-6', qw(-dc '[:upper:]'), {IN=>''}, {OUT=>''}], + + # Ensure that these fail. + # Prior to 2.0.20, each would evoke a failed assertion. + ['empty-eq', qw('[==]' x), {IN=>''}, {OUT=>''}, {EXIT=>1}, + {ERR=>"$prog: missing equivalence class character '[==]'\n"}], + ['empty-cc', qw('[::]' x), {IN=>''}, {OUT=>''}, {EXIT=>1}, + {ERR=>"$prog: missing character class name '[::]'\n"}], + + # Weird repeat counts. + ['repeat-bs-9', qw(abc '[b*\9]'), {IN=>'abcd'}, {OUT=>'[b*d'}], + ['repeat-0', qw(abc '[b*0]'), {IN=>'abcd'}, {OUT=>'bbbd'}], + ['repeat-zeros', qw(abc '[b*00000000000000000000]'), + {IN=>'abcd'}, {OUT=>'bbbd'}], + ['repeat-compl', qw(-c '[a*65536]\n' '[b*]'), {IN=>'abcd'}, {OUT=>'abbb'}], + ['repeat-xC', qw(-C '[a*65536]\n' '[b*]'), {IN=>'abcd'}, {OUT=>'abbb'}], + + # From Glenn Fowler. + ['fowler-1', qw(ah -H), {IN=>'aha'}, {OUT=>'-H-'}], + + # Up to coreutils-6.9, this would provoke a failed assertion. + ['no-abort-1', qw(-c a '[b*256]'), {IN=>'abc'}, {OUT=>'abb'}], +); + +@Tests = triple_test \@Tests; + +# tr takes its input only from stdin, not from a file argument, so +# remove the tests that provide file arguments and keep only the ones +# generated by triple_test (identifiable by their .r and .p suffixes). +@Tests = grep {$_->[0] =~ /\.[pr]$/} @Tests; + +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/truncate-dangling-symlink b/tests/misc/truncate-dangling-symlink deleted file mode 100755 index d9175d4e..00000000 --- a/tests/misc/truncate-dangling-symlink +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# Make sure truncate can create a file through a dangling symlink. - -# Copyright (C) 2008-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ truncate - -ln -s truncate-target t-symlink - -truncate -s0 t-symlink || fail=1 - -test -f truncate-target || fail=1 - -Exit $fail diff --git a/tests/misc/truncate-dangling-symlink.sh b/tests/misc/truncate-dangling-symlink.sh new file mode 100755 index 00000000..5386ce2d --- /dev/null +++ b/tests/misc/truncate-dangling-symlink.sh @@ -0,0 +1,28 @@ +#!/bin/sh +# Make sure truncate can create a file through a dangling symlink. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ truncate + +ln -s truncate-target t-symlink + +truncate -s0 t-symlink || fail=1 + +test -f truncate-target || fail=1 + +Exit $fail diff --git a/tests/misc/truncate-dir-fail b/tests/misc/truncate-dir-fail deleted file mode 100755 index 54a31479..00000000 --- a/tests/misc/truncate-dir-fail +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -# Make sure truncate fails for a directory. - -# Copyright (C) 2008-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ truncate - -# truncate on dir not allowed -truncate -s+0 . && fail=1 - -Exit $fail diff --git a/tests/misc/truncate-dir-fail.sh b/tests/misc/truncate-dir-fail.sh new file mode 100755 index 00000000..8bd67b6e --- /dev/null +++ b/tests/misc/truncate-dir-fail.sh @@ -0,0 +1,25 @@ +#!/bin/sh +# Make sure truncate fails for a directory. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ truncate + +# truncate on dir not allowed +truncate -s+0 . && fail=1 + +Exit $fail diff --git a/tests/misc/truncate-fail-diag b/tests/misc/truncate-fail-diag deleted file mode 100755 index f9cdabf3..00000000 --- a/tests/misc/truncate-fail-diag +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -# make sure truncate gives reasonable diagnostics -# Note open() checks for trailing '/' before checking for existance -# open (".", O_CREAT & (O_WRONLY | O_RDWR), ...) -> EISDIR -# open ("missing/", O_CREAT & (O_WRONLY | O_RDWR), ...) -> EISDIR -# open ("missing/file", O_CREAT & (O_WRONLY | O_RDWR), ...) -> ENOENT - -# Copyright (C) 2008-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ truncate -skip_if_root_ - - -d1=no - -dir=$d1/such-dir -truncate -s0 $dir > out 2>&1 && fail=1 -cat <<EOF > exp -truncate: cannot open '$dir' for writing: No such file or directory -EOF -compare exp out || fail=1 - -dir=$d1/ -truncate -s0 $dir > out 2>&1 && fail=1 -#The following can be returned at least -#truncate: cannot open '$dir' for writing: Not a directory -#truncate: cannot open '$dir' for writing: Is a directory - -Exit $fail diff --git a/tests/misc/truncate-fail-diag.sh b/tests/misc/truncate-fail-diag.sh new file mode 100755 index 00000000..8e5f07ba --- /dev/null +++ b/tests/misc/truncate-fail-diag.sh @@ -0,0 +1,43 @@ +#!/bin/sh +# make sure truncate gives reasonable diagnostics +# Note open() checks for trailing '/' before checking for existence +# open (".", O_CREAT & (O_WRONLY | O_RDWR), ...) -> EISDIR +# 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. + +# This 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_ truncate +skip_if_root_ + + +d1=no + +dir=$d1/such-dir +truncate -s0 $dir > out 2>&1 && fail=1 +cat <<EOF > exp +truncate: cannot open '$dir' for writing: No such file or directory +EOF +compare exp out || fail=1 + +dir=$d1/ +truncate -s0 $dir > out 2>&1 && fail=1 +#The following can be returned at least +#truncate: cannot open '$dir' for writing: Not a directory +#truncate: cannot open '$dir' for writing: Is a directory + +Exit $fail diff --git a/tests/misc/truncate-fifo b/tests/misc/truncate-fifo deleted file mode 100755 index 6588f0a2..00000000 --- a/tests/misc/truncate-fifo +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -# Make sure truncate works on fifos without hanging - -# Copyright (C) 2008-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ truncate - -mkfifo_or_skip_ fifo - -timeout 10 truncate -s0 fifo -test "$?" = 124 && fail=1 - -Exit $fail diff --git a/tests/misc/truncate-fifo.sh b/tests/misc/truncate-fifo.sh new file mode 100755 index 00000000..58e5c14e --- /dev/null +++ b/tests/misc/truncate-fifo.sh @@ -0,0 +1,27 @@ +#!/bin/sh +# Make sure truncate works on fifos without hanging + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ truncate + +mkfifo_or_skip_ fifo + +timeout 10 truncate -s0 fifo +test "$?" = 124 && fail=1 + +Exit $fail diff --git a/tests/misc/truncate-no-create-missing b/tests/misc/truncate-no-create-missing deleted file mode 100755 index 56b2ac18..00000000 --- a/tests/misc/truncate-no-create-missing +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# Ensure that truncate -c no-such-file doesn't fail. - -# Copyright (C) 2008-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ truncate - - -# truncate -c no-such-file should not fail. -truncate -s0 -c no-such-file || fail=1 - -Exit $fail diff --git a/tests/misc/truncate-no-create-missing.sh b/tests/misc/truncate-no-create-missing.sh new file mode 100755 index 00000000..6fa1f0c6 --- /dev/null +++ b/tests/misc/truncate-no-create-missing.sh @@ -0,0 +1,26 @@ +#!/bin/sh +# Ensure that truncate -c no-such-file doesn't fail. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ truncate + + +# truncate -c no-such-file should not fail. +truncate -s0 -c no-such-file || fail=1 + +Exit $fail diff --git a/tests/misc/truncate-overflow b/tests/misc/truncate-overflow deleted file mode 100755 index 9ec353fa..00000000 --- a/tests/misc/truncate-overflow +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -# Validate truncate integer overflow - -# Copyright (C) 2008-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ truncate -getlimits_ - - -# -= overflow -truncate -s-1 create-zero-len-file || fail=1 - -echo > non-empty-file - -# signed overflow -truncate -s$OFF_T_OFLOW file && fail=1 - -# += signed overflow -truncate -s+$OFF_T_MAX non-empty-file && fail=1 - -# *= signed overflow -IO_BLOCK_OFLOW=$(expr $OFF_T_MAX / $(stat -f -c%s .) + 1) -truncate --io-blocks --size=$IO_BLOCK_OFLOW file && fail=1 - -Exit $fail diff --git a/tests/misc/truncate-overflow.sh b/tests/misc/truncate-overflow.sh new file mode 100755 index 00000000..dd0fc730 --- /dev/null +++ b/tests/misc/truncate-overflow.sh @@ -0,0 +1,39 @@ +#!/bin/sh +# Validate truncate integer overflow + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ truncate +getlimits_ + + +# -= overflow +truncate -s-1 create-zero-len-file || fail=1 + +echo > non-empty-file + +# signed overflow +truncate -s$OFF_T_OFLOW file && fail=1 + +# += signed overflow +truncate -s+$OFF_T_MAX non-empty-file && fail=1 + +# *= signed overflow +IO_BLOCK_OFLOW=$(expr $OFF_T_MAX / $(stat -f -c%s .) + 1) +truncate --io-blocks --size=$IO_BLOCK_OFLOW file && fail=1 + +Exit $fail diff --git a/tests/misc/truncate-owned-by-other b/tests/misc/truncate-owned-by-other deleted file mode 100755 index 93160869..00000000 --- a/tests/misc/truncate-owned-by-other +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# Demonstrate that "truncate -s0 writable-but-owned-by-other" works. - -# Copyright (C) 2008-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 -# 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=.}/init.sh"; path_prepend_ ../src -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_ -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 - -Exit $fail diff --git a/tests/misc/truncate-owned-by-other.sh b/tests/misc/truncate-owned-by-other.sh new file mode 100755 index 00000000..e7f7157c --- /dev/null +++ b/tests/misc/truncate-owned-by-other.sh @@ -0,0 +1,36 @@ +#!/bin/sh +# Demonstrate that "truncate -s0 writable-but-owned-by-other" works. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +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_ +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 + +Exit $fail diff --git a/tests/misc/truncate-parameters b/tests/misc/truncate-parameters deleted file mode 100755 index 13a8475e..00000000 --- a/tests/misc/truncate-parameters +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh -# Validate truncate parameter combinations - -# Copyright (C) 2008-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ truncate - - -# must specify at least 1 file -truncate --size=0 && fail=1 - -# must specify size. don't default to 0 -truncate file && fail=1 - -# mixture of absolute size & reference not allowed -truncate --size=0 --reference=file file && fail=1 - -# blocks without size is not valid -truncate --io-blocks --reference=file file && fail=1 - -# must specify valid numbers -truncate --size="invalid" file && fail=1 - -# spaces not significant around size -truncate --size="> -1" file && fail=1 -truncate --size=" >1" file || fail=1 #file now 1 -truncate --size=" +1" file || fail=1 #file now 2 -test $(stat --format %s file) = 2 || fail=1 - -# reference allowed with relative size -truncate --size=" +1" -r file file || fail=1 #file now 3 -test $(stat --format %s file) = 3 || fail=1 - -# reference allowed alone also -truncate -r file file || fail=1 #file still 3 -test $(stat --format %s file) = 3 || fail=1 -truncate -r file file2 || fail=1 #file2 now 3 -test $(stat --format %s file2) = 3 || fail=1 - -Exit $fail diff --git a/tests/misc/truncate-parameters.sh b/tests/misc/truncate-parameters.sh new file mode 100755 index 00000000..21713d99 --- /dev/null +++ b/tests/misc/truncate-parameters.sh @@ -0,0 +1,54 @@ +#!/bin/sh +# Validate truncate parameter combinations + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ truncate + + +# must specify at least 1 file +truncate --size=0 && fail=1 + +# must specify size. don't default to 0 +truncate file && fail=1 + +# mixture of absolute size & reference not allowed +truncate --size=0 --reference=file file && fail=1 + +# blocks without size is not valid +truncate --io-blocks --reference=file file && fail=1 + +# must specify valid numbers +truncate --size="invalid" file && fail=1 + +# spaces not significant around size +truncate --size="> -1" file && fail=1 +truncate --size=" >1" file || fail=1 #file now 1 +truncate --size=" +1" file || fail=1 #file now 2 +test $(stat --format %s file) = 2 || fail=1 + +# reference allowed with relative size +truncate --size=" +1" -r file file || fail=1 #file now 3 +test $(stat --format %s file) = 3 || fail=1 + +# reference allowed alone also +truncate -r file file || fail=1 #file still 3 +test $(stat --format %s file) = 3 || fail=1 +truncate -r file file2 || fail=1 #file2 now 3 +test $(stat --format %s file2) = 3 || fail=1 + +Exit $fail diff --git a/tests/misc/truncate-relative b/tests/misc/truncate-relative deleted file mode 100755 index 19543db6..00000000 --- a/tests/misc/truncate-relative +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# Validate truncate relative sizes - -# Copyright (C) 2008-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ truncate - - -# mixture of relative modifiers not allowed -truncate --size="+>0" file && fail=1 - -# mixture of relative modifiers not allowed -truncate --size=">+0" file && fail=1 - -# division by zero -truncate --size="/0" file && fail=1 - -# division by zero -truncate --size="%0" file && fail=1 - -Exit $fail diff --git a/tests/misc/truncate-relative.sh b/tests/misc/truncate-relative.sh new file mode 100755 index 00000000..fbbd4f97 --- /dev/null +++ b/tests/misc/truncate-relative.sh @@ -0,0 +1,35 @@ +#!/bin/sh +# Validate truncate relative sizes + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ truncate + + +# mixture of relative modifiers not allowed +truncate --size="+>0" file && fail=1 + +# mixture of relative modifiers not allowed +truncate --size=">+0" file && fail=1 + +# division by zero +truncate --size="/0" file && fail=1 + +# division by zero +truncate --size="%0" file && fail=1 + +Exit $fail diff --git a/tests/misc/tsort b/tests/misc/tsort deleted file mode 100755 index cc8ac957..00000000 --- a/tests/misc/tsort +++ /dev/null @@ -1,66 +0,0 @@ -#!/usr/bin/perl -# Test "tsort". - -# Copyright (C) 1999-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 -# 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; - -(my $program_name = $0) =~ s|.*/||; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -my @Tests = - ( - ['cycle-1', {IN => {f => "t b\nt s\ns t\n"}}, {OUT => "s\nt\nb\n"}, - {EXIT => 1}, - {ERR => "tsort: f: input contains a loop:\ntsort: s\ntsort: t\n"} ], - ['cycle-2', {IN => {f => "t x\nt s\ns t\n"}}, {OUT => "s\nt\nx\n"}, - {EXIT => 1}, - {ERR => "tsort: f: input contains a loop:\ntsort: s\ntsort: t\n"} ], - - ['posix-1', {IN => "a b c c d e\ng g\nf g e f\nh h\n"}, - {OUT => "a\nc\nd\nh\nb\ne\nf\ng\n"}], - ['posix-2', {IN => "b a\nd c\nz h x h r h\n"}, - {OUT => "b\nd\nr\nx\nz\na\nc\nh\n"}], - - ['linear-1', {IN => "a b b c c d d e e f f g\n"}, - {OUT => "a\nb\nc\nd\ne\nf\ng\n"}], - - ['tree-1', {IN => "a b b c c d d e e f f g\nc x x y y z\n"}, - {OUT => "a\nb\nc\nx\nd\ny\ne\nz\nf\ng\n"}], - ['tree-2', {IN => "a b b c c d d e e f f g\nc x x y y z\nf r r s s t\n"}, - {OUT => "a\nb\nc\nx\nd\ny\ne\nz\nf\nr\ng\ns\nt\n"}], - - # Before coreutils-5.0.1, given an odd number of input tokens, - # tsort would accept that and treat the input as if an additional - # copy of the final token were appended. - ['odd', {IN => "a\n"}, - {EXIT => 1}, - {ERR => "tsort: odd.1: input contains an odd number of tokens\n"}], - - ['only-one', {IN => {f => ""}}, {IN => {g => ""}}, - {EXIT => 1}, - {ERR => "tsort: extra operand 'g'\n" - . "Try 'tsort --help' for more information.\n"}], - ); - -my $save_temps = $ENV{DEBUG}; -my $verbose = $ENV{VERBOSE}; - -my $prog = 'tsort'; -my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); -exit $fail; diff --git a/tests/misc/tsort.pl b/tests/misc/tsort.pl new file mode 100755 index 00000000..5e598c74 --- /dev/null +++ b/tests/misc/tsort.pl @@ -0,0 +1,66 @@ +#!/usr/bin/perl +# Test "tsort". + +# Copyright (C) 1999-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/>. + +use strict; + +(my $program_name = $0) =~ s|.*/||; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +my @Tests = + ( + ['cycle-1', {IN => {f => "t b\nt s\ns t\n"}}, {OUT => "s\nt\nb\n"}, + {EXIT => 1}, + {ERR => "tsort: f: input contains a loop:\ntsort: s\ntsort: t\n"} ], + ['cycle-2', {IN => {f => "t x\nt s\ns t\n"}}, {OUT => "s\nt\nx\n"}, + {EXIT => 1}, + {ERR => "tsort: f: input contains a loop:\ntsort: s\ntsort: t\n"} ], + + ['posix-1', {IN => "a b c c d e\ng g\nf g e f\nh h\n"}, + {OUT => "a\nc\nd\nh\nb\ne\nf\ng\n"}], + ['posix-2', {IN => "b a\nd c\nz h x h r h\n"}, + {OUT => "b\nd\nr\nx\nz\na\nc\nh\n"}], + + ['linear-1', {IN => "a b b c c d d e e f f g\n"}, + {OUT => "a\nb\nc\nd\ne\nf\ng\n"}], + + ['tree-1', {IN => "a b b c c d d e e f f g\nc x x y y z\n"}, + {OUT => "a\nb\nc\nx\nd\ny\ne\nz\nf\ng\n"}], + ['tree-2', {IN => "a b b c c d d e e f f g\nc x x y y z\nf r r s s t\n"}, + {OUT => "a\nb\nc\nx\nd\ny\ne\nz\nf\nr\ng\ns\nt\n"}], + + # Before coreutils-5.0.1, given an odd number of input tokens, + # tsort would accept that and treat the input as if an additional + # copy of the final token were appended. + ['odd', {IN => "a\n"}, + {EXIT => 1}, + {ERR => "tsort: odd.1: input contains an odd number of tokens\n"}], + + ['only-one', {IN => {f => ""}}, {IN => {g => ""}}, + {EXIT => 1}, + {ERR => "tsort: extra operand 'g'\n" + . "Try 'tsort --help' for more information.\n"}], + ); + +my $save_temps = $ENV{DEBUG}; +my $verbose = $ENV{VERBOSE}; + +my $prog = 'tsort'; +my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); +exit $fail; diff --git a/tests/misc/tty-eof b/tests/misc/tty-eof deleted file mode 100755 index e9eed2ea..00000000 --- a/tests/misc/tty-eof +++ /dev/null @@ -1,110 +0,0 @@ -#!/usr/bin/perl -# Test whether programs exit upon a single EOF from a tty. -# Ensure that e.g., cat exits upon a single EOF (^D) from a tty. -# Do the same for all programs that can read stdin, -# require no arguments and that write to standard output. - -# Copyright (C) 2003-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 -# 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; -(my $ME = $0) =~ s|.*/||; - -# Some older versions of Expect.pm (e.g. 1.07) lack the log_user method, -# so check for that, too. -eval { require Expect; Expect->require_version('1.11') }; -$@ - and CuSkip::skip "$ME: this script requires Perl's Expect package >=1.11\n"; - -{ - my $fail = 0; - my @stdin_reading_commands = qw( - base64 - cat - cksum - dd - expand - fmt - fold - head - md5sum - nl - od - paste - pr - ptx - sha1sum - sha224sum - sha256sum - sha384sum - sha512sum - shuf - sort - sum - tac - tail - tee - tsort - unexpand - uniq - wc - ); - my $stderr = 'tty-eof.err'; - foreach my $cmd ((@stdin_reading_commands), 'cut -f2') - { - my $exp = new Expect; - $exp->log_user(0); - $exp->spawn("$cmd 2> $stderr") - or (warn "$ME: cannot run '$cmd': $!\n"), $fail=1, next; - # No input for cut -f2. - $cmd =~ /^cut/ - or $exp->send("a b\n"); - $exp->send("\cD"); # This is Control-D. FIXME: what if that's not EOF? - $exp->expect (0, '-re', "^a b\\r?\$"); - my $found = $exp->expect (1, '-re', "^.+\$"); - $found and warn "F: $found: " . $exp->exp_match () . "\n"; - $exp->expect(10, 'eof'); - # Expect no output from cut, since we gave it no input. - defined $found || $cmd =~ /^cut/ - or (warn "$ME: $cmd didn't produce expected output\n"), - $fail=1, next; - defined $exp->exitstatus - or (warn "$ME: $cmd didn't exit after ^D from standard input\n"), - $fail=1, next; - my $s = $exp->exitstatus; - $s == 0 - or (warn "$ME: $cmd exited with status $s (expected 0)\n"), - $fail=1; - $exp->hard_close(); - - # dd normally writes to stderr. If it exits successfully, we're done. - $cmd eq 'dd' && $s == 0 - and next; - - if (-s $stderr) - { - warn "$ME: $cmd wrote to stderr:\n"; - system "cat $stderr"; - $fail = 1; - } - } - continue - { - unlink $stderr - or warn "$ME: failed to remove stderr file from $cmd, $stderr: $!\n"; - } - - exit $fail -} diff --git a/tests/misc/tty-eof.pl b/tests/misc/tty-eof.pl new file mode 100755 index 00000000..755ffac0 --- /dev/null +++ b/tests/misc/tty-eof.pl @@ -0,0 +1,110 @@ +#!/usr/bin/perl +# Test whether programs exit upon a single EOF from a tty. +# Ensure that e.g., cat exits upon a single EOF (^D) from a tty. +# 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. + +# This 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; +(my $ME = $0) =~ s|.*/||; + +# Some older versions of Expect.pm (e.g. 1.07) lack the log_user method, +# so check for that, too. +eval { require Expect; Expect->require_version('1.11') }; +$@ + and CuSkip::skip "$ME: this script requires Perl's Expect package >=1.11\n"; + +{ + my $fail = 0; + my @stdin_reading_commands = qw( + base64 + cat + cksum + dd + expand + fmt + fold + head + md5sum + nl + od + paste + pr + ptx + sha1sum + sha224sum + sha256sum + sha384sum + sha512sum + shuf + sort + sum + tac + tail + tee + tsort + unexpand + uniq + wc + ); + my $stderr = 'tty-eof.err'; + foreach my $cmd ((@stdin_reading_commands), 'cut -f2') + { + my $exp = new Expect; + $exp->log_user(0); + $exp->spawn("$cmd 2> $stderr") + or (warn "$ME: cannot run '$cmd': $!\n"), $fail=1, next; + # No input for cut -f2. + $cmd =~ /^cut/ + or $exp->send("a b\n"); + $exp->send("\cD"); # This is Control-D. FIXME: what if that's not EOF? + $exp->expect (0, '-re', "^a b\\r?\$"); + my $found = $exp->expect (1, '-re', "^.+\$"); + $found and warn "F: $found: " . $exp->exp_match () . "\n"; + $exp->expect(10, 'eof'); + # Expect no output from cut, since we gave it no input. + defined $found || $cmd =~ /^cut/ + or (warn "$ME: $cmd didn't produce expected output\n"), + $fail=1, next; + defined $exp->exitstatus + or (warn "$ME: $cmd didn't exit after ^D from standard input\n"), + $fail=1, next; + my $s = $exp->exitstatus; + $s == 0 + or (warn "$ME: $cmd exited with status $s (expected 0)\n"), + $fail=1; + $exp->hard_close(); + + # dd normally writes to stderr. If it exits successfully, we're done. + $cmd eq 'dd' && $s == 0 + and next; + + if (-s $stderr) + { + warn "$ME: $cmd wrote to stderr:\n"; + system "cat $stderr"; + $fail = 1; + } + } + continue + { + unlink $stderr + or warn "$ME: failed to remove stderr file from $cmd, $stderr: $!\n"; + } + + exit $fail +} diff --git a/tests/misc/unexpand b/tests/misc/unexpand deleted file mode 100755 index 633a1603..00000000 --- a/tests/misc/unexpand +++ /dev/null @@ -1,99 +0,0 @@ -#!/usr/bin/perl -# Test "unexpand". - -# Copyright (C) 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 -# 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; - -my $limits = getlimits (); - -(my $program_name = $0) =~ s|.*/||; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -my $prog = 'unexpand'; - -my @Tests = - ( - ['a1', {IN=> ' 'x 1 ."y\n"}, {OUT=> ' 'x 1 ."y\n"}], - ['a2', {IN=> ' 'x 2 ."y\n"}, {OUT=> ' 'x 2 ."y\n"}], - ['a3', {IN=> ' 'x 3 ."y\n"}, {OUT=> ' 'x 3 ."y\n"}], - ['a4', {IN=> ' 'x 4 ."y\n"}, {OUT=> ' 'x 4 ."y\n"}], - ['a5', {IN=> ' 'x 5 ."y\n"}, {OUT=> ' 'x 5 ."y\n"}], - ['a6', {IN=> ' 'x 6 ."y\n"}, {OUT=> ' 'x 6 ."y\n"}], - ['a7', {IN=> ' 'x 7 ."y\n"}, {OUT=> ' 'x 7 ."y\n"}], - ['a8', {IN=> ' 'x 8 ."y\n"}, {OUT=> "\ty\n"}], - - ['aa-1', '-a', {IN=> 'w'.' 'x 1 ."y\n"}, {OUT=> 'w'.' 'x 1 ."y\n"}], - ['aa-2', '-a', {IN=> 'w'.' 'x 2 ."y\n"}, {OUT=> 'w'.' 'x 2 ."y\n"}], - ['aa-3', '-a', {IN=> 'w'.' 'x 3 ."y\n"}, {OUT=> 'w'.' 'x 3 ."y\n"}], - ['aa-4', '-a', {IN=> 'w'.' 'x 4 ."y\n"}, {OUT=> 'w'.' 'x 4 ."y\n"}], - ['aa-5', '-a', {IN=> 'w'.' 'x 5 ."y\n"}, {OUT=> 'w'.' 'x 5 ."y\n"}], - ['aa-6', '-a', {IN=> 'w'.' 'x 6 ."y\n"}, {OUT=> 'w'.' 'x 6 ."y\n"}], - ['aa-7', '-a', {IN=> 'w'.' 'x 7 ."y\n"}, {OUT=> "w\ty\n"}], - ['aa-8', '-a', {IN=> 'w'.' 'x 8 ."y\n"}, {OUT=> "w\t y\n"}], - - ['b-1', '-t', '2,4', {IN=> " ."}, {OUT=>"\t\t ."}], - # These would infloop prior to textutils-2.0d. - - ['infloop-1', '-t', '1,2', {IN=> " \t\t .\n"}, {OUT=>"\t\t\t .\n"}], - ['infloop-2', '-t', '4,5', {IN=> ' 'x4 . "\t\t \n"}, {OUT=>"\t\t\t \n"}], - ['infloop-3', '-t', '2,3', {IN=> "x \t\t \n"}, {OUT=>"x\t\t\t \n"}], - ['infloop-4', '-t', '1,2', {IN=> " \t\t \n"}, {OUT=>"\t\t\t \n"}], - ['c-1', '-t', '1,2', {IN=> "x\t\t .\n"}, {OUT=>"x\t\t .\n"}], - - # -t implies -a - # Feature addition (--first-only) prompted by a report from Jie Xu. - ['tabs-1', qw(-t 3), {IN=> " a b\n"}, {OUT=>"\ta\tb\n"}], - ['tabs-2', qw(-t 3 --first-only), {IN=> " a b\n"}, {OUT=>"\ta b\n"}], - - # blanks - ['blanks-1', qw(-t 1), {IN=> " b c d\n"}, {OUT=> "\tb\t\tc\t\t\td\n"}], - ['blanks-2', qw(-t 1), {IN=> "a \n"}, {OUT=> "a \n"}], - ['blanks-3', qw(-t 1), {IN=> "a \n"}, {OUT=> "a\t\t\n"}], - ['blanks-4', qw(-t 1), {IN=> "a \n"}, {OUT=> "a\t\t\t\n"}], - ['blanks-5', qw(-t 1), {IN=> "a "}, {OUT=> "a "}], - ['blanks-6', qw(-t 1), {IN=> "a "}, {OUT=> "a\t\t"}], - ['blanks-7', qw(-t 1), {IN=> "a "}, {OUT=> "a\t\t\t"}], - ['blanks-8', qw(-t 1), {IN=> " a a a\n"}, {OUT=> "\ta a\t\ta\n"}], - ['blanks-9', qw(-t 2), {IN=> " a a a\n"}, {OUT=> "\t a\ta\t a\n"}], - ['blanks-10', '-t', '3,4', {IN=> "0 2 4 6\t8\n"}, {OUT=> "0 2 4 6\t8\n"}], - ['blanks-11', '-t', '3,4', {IN=> " 4\n"}, {OUT=> "\t\t4\n"}], - ['blanks-12', '-t', '3,4', {IN=> "01 4\n"}, {OUT=> "01\t\t4\n"}], - ['blanks-13', '-t', '3,4', {IN=> "0 4\n"}, {OUT=> "0\t\t4\n"}], - - # POSIX says spaces should only follow tabs. Also a single - # trailing space is not converted to a tab, when before - # a field starting with non blanks - ['posix-1', '-a', {IN=> "1234567 \t1\n"}, {OUT=>"1234567\t\t1\n"}], - ['posix-2', '-a', {IN=> "1234567 \t1\n"}, {OUT=>"1234567\t\t1\n"}], - ['posix-3', '-a', {IN=> "1234567 \t1\n"}, {OUT=>"1234567\t\t1\n"}], - ['posix-4', '-a', {IN=> "1234567\t1\n"}, {OUT=>"1234567\t1\n"}], - ['posix-5', '-a', {IN=> "1234567 1\n"}, {OUT=>"1234567\t 1\n"}], - ['posix-6', '-a', {IN=> "1234567 1\n"}, {OUT=>"1234567 1\n"}], - - # It is debatable whether this test should require an environment - # setting of e.g., _POSIX2_VERSION=1. - ['obs-ovflo', "-$limits->{UINTMAX_OFLOW}", {IN=>''}, {OUT=>''}, - {EXIT => 1}, {ERR => "$prog: tab stop value is too large\n"}], - ); - -my $save_temps = $ENV{DEBUG}; -my $verbose = $ENV{VERBOSE}; - -my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); -exit $fail; diff --git a/tests/misc/unexpand.pl b/tests/misc/unexpand.pl new file mode 100755 index 00000000..a1ce5c52 --- /dev/null +++ b/tests/misc/unexpand.pl @@ -0,0 +1,99 @@ +#!/usr/bin/perl +# Test "unexpand". + +# Copyright (C) 2000-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/>. + +use strict; + +my $limits = getlimits (); + +(my $program_name = $0) =~ s|.*/||; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +my $prog = 'unexpand'; + +my @Tests = + ( + ['a1', {IN=> ' 'x 1 ."y\n"}, {OUT=> ' 'x 1 ."y\n"}], + ['a2', {IN=> ' 'x 2 ."y\n"}, {OUT=> ' 'x 2 ."y\n"}], + ['a3', {IN=> ' 'x 3 ."y\n"}, {OUT=> ' 'x 3 ."y\n"}], + ['a4', {IN=> ' 'x 4 ."y\n"}, {OUT=> ' 'x 4 ."y\n"}], + ['a5', {IN=> ' 'x 5 ."y\n"}, {OUT=> ' 'x 5 ."y\n"}], + ['a6', {IN=> ' 'x 6 ."y\n"}, {OUT=> ' 'x 6 ."y\n"}], + ['a7', {IN=> ' 'x 7 ."y\n"}, {OUT=> ' 'x 7 ."y\n"}], + ['a8', {IN=> ' 'x 8 ."y\n"}, {OUT=> "\ty\n"}], + + ['aa-1', '-a', {IN=> 'w'.' 'x 1 ."y\n"}, {OUT=> 'w'.' 'x 1 ."y\n"}], + ['aa-2', '-a', {IN=> 'w'.' 'x 2 ."y\n"}, {OUT=> 'w'.' 'x 2 ."y\n"}], + ['aa-3', '-a', {IN=> 'w'.' 'x 3 ."y\n"}, {OUT=> 'w'.' 'x 3 ."y\n"}], + ['aa-4', '-a', {IN=> 'w'.' 'x 4 ."y\n"}, {OUT=> 'w'.' 'x 4 ."y\n"}], + ['aa-5', '-a', {IN=> 'w'.' 'x 5 ."y\n"}, {OUT=> 'w'.' 'x 5 ."y\n"}], + ['aa-6', '-a', {IN=> 'w'.' 'x 6 ."y\n"}, {OUT=> 'w'.' 'x 6 ."y\n"}], + ['aa-7', '-a', {IN=> 'w'.' 'x 7 ."y\n"}, {OUT=> "w\ty\n"}], + ['aa-8', '-a', {IN=> 'w'.' 'x 8 ."y\n"}, {OUT=> "w\t y\n"}], + + ['b-1', '-t', '2,4', {IN=> " ."}, {OUT=>"\t\t ."}], + # These would infloop prior to textutils-2.0d. + + ['infloop-1', '-t', '1,2', {IN=> " \t\t .\n"}, {OUT=>"\t\t\t .\n"}], + ['infloop-2', '-t', '4,5', {IN=> ' 'x4 . "\t\t \n"}, {OUT=>"\t\t\t \n"}], + ['infloop-3', '-t', '2,3', {IN=> "x \t\t \n"}, {OUT=>"x\t\t\t \n"}], + ['infloop-4', '-t', '1,2', {IN=> " \t\t \n"}, {OUT=>"\t\t\t \n"}], + ['c-1', '-t', '1,2', {IN=> "x\t\t .\n"}, {OUT=>"x\t\t .\n"}], + + # -t implies -a + # Feature addition (--first-only) prompted by a report from Jie Xu. + ['tabs-1', qw(-t 3), {IN=> " a b\n"}, {OUT=>"\ta\tb\n"}], + ['tabs-2', qw(-t 3 --first-only), {IN=> " a b\n"}, {OUT=>"\ta b\n"}], + + # blanks + ['blanks-1', qw(-t 1), {IN=> " b c d\n"}, {OUT=> "\tb\t\tc\t\t\td\n"}], + ['blanks-2', qw(-t 1), {IN=> "a \n"}, {OUT=> "a \n"}], + ['blanks-3', qw(-t 1), {IN=> "a \n"}, {OUT=> "a\t\t\n"}], + ['blanks-4', qw(-t 1), {IN=> "a \n"}, {OUT=> "a\t\t\t\n"}], + ['blanks-5', qw(-t 1), {IN=> "a "}, {OUT=> "a "}], + ['blanks-6', qw(-t 1), {IN=> "a "}, {OUT=> "a\t\t"}], + ['blanks-7', qw(-t 1), {IN=> "a "}, {OUT=> "a\t\t\t"}], + ['blanks-8', qw(-t 1), {IN=> " a a a\n"}, {OUT=> "\ta a\t\ta\n"}], + ['blanks-9', qw(-t 2), {IN=> " a a a\n"}, {OUT=> "\t a\ta\t a\n"}], + ['blanks-10', '-t', '3,4', {IN=> "0 2 4 6\t8\n"}, {OUT=> "0 2 4 6\t8\n"}], + ['blanks-11', '-t', '3,4', {IN=> " 4\n"}, {OUT=> "\t\t4\n"}], + ['blanks-12', '-t', '3,4', {IN=> "01 4\n"}, {OUT=> "01\t\t4\n"}], + ['blanks-13', '-t', '3,4', {IN=> "0 4\n"}, {OUT=> "0\t\t4\n"}], + + # POSIX says spaces should only follow tabs. Also a single + # trailing space is not converted to a tab, when before + # a field starting with non blanks + ['posix-1', '-a', {IN=> "1234567 \t1\n"}, {OUT=>"1234567\t\t1\n"}], + ['posix-2', '-a', {IN=> "1234567 \t1\n"}, {OUT=>"1234567\t\t1\n"}], + ['posix-3', '-a', {IN=> "1234567 \t1\n"}, {OUT=>"1234567\t\t1\n"}], + ['posix-4', '-a', {IN=> "1234567\t1\n"}, {OUT=>"1234567\t1\n"}], + ['posix-5', '-a', {IN=> "1234567 1\n"}, {OUT=>"1234567\t 1\n"}], + ['posix-6', '-a', {IN=> "1234567 1\n"}, {OUT=>"1234567 1\n"}], + + # It is debatable whether this test should require an environment + # setting of e.g., _POSIX2_VERSION=1. + ['obs-ovflo', "-$limits->{UINTMAX_OFLOW}", {IN=>''}, {OUT=>''}, + {EXIT => 1}, {ERR => "$prog: tab stop value is too large\n"}], + ); + +my $save_temps = $ENV{DEBUG}; +my $verbose = $ENV{VERBOSE}; + +my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); +exit $fail; diff --git a/tests/misc/uniq b/tests/misc/uniq deleted file mode 100755 index d0e6d151..00000000 --- a/tests/misc/uniq +++ /dev/null @@ -1,218 +0,0 @@ -#!/usr/bin/perl -# Test uniq. - -# Copyright (C) 2008-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 -# 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; - -my $limits = getlimits (); - -my $prog = 'uniq'; -my $try = "Try '$prog --help' for more information.\n"; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -# When possible, create a "-z"-testing variant of each test. -sub add_z_variants($) -{ - my ($tests) = @_; - my @new; - TEST: - foreach my $t (@$tests) - { - push @new, $t; - - # skip the obsolete-syntax tests - $t->[0] =~ /^obs-plus/ - and next; - - my @args; - my @list_of_hash; - - foreach my $e (@$t) - { - !ref $e - and push (@args, $e), next; - - ref $e && ref $e eq 'HASH' - or (warn "$0: $t->[0]: unexpected entry type\n"), next; - my $tmp = $e; - foreach my $k (qw(IN OUT)) - { - my $val = $e->{$k}; - # skip any test whose input or output already contains a NUL byte - if (defined $val) - { - $val =~ /\0/ - and next TEST; - - # Convert each NL in input or output to \0. - $val =~ s/\n/\0/g; - $tmp = {$k => $val}; - last; - } - } - push @list_of_hash, $tmp; - } - - shift @args; # discard test name - - # skip any test that uses the -z option - grep /z/, @args - and next; - - push @new, ["$t->[0]-z", '-z', @args, @list_of_hash]; - } - 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"}], - ['4', '', {IN=>"a\nb"}, {OUT=>"a\nb\n"}], - ['5', '', {IN=>"a\na\nb"}, {OUT=>"a\nb\n"}], - ['6', '', {IN=>"b\na\na\n"}, {OUT=>"b\na\n"}], - ['7', '', {IN=>"a\nb\nc\n"}, {OUT=>"a\nb\nc\n"}], - - # Ensure that newlines are not interpreted with -z. - ['2z', '-z', {IN=>"a\na\n"}, {OUT=>"a\na\n\0"}], - ['3z', '-z', {IN=>"a\na"}, {OUT=>"a\na\0"}], - ['4z', '-z', {IN=>"a\nb"}, {OUT=>"a\nb\0"}], - ['5z', '-z', {IN=>"a\na\nb"}, {OUT=>"a\na\nb\0"}], - ['20z', '-dz', {IN=>"a\na\n"}, {OUT=>""}], - - # Make sure that eight bit characters work - ['8', '', {IN=>"ö\nv\n"}, {OUT=>"ö\nv\n"}], - # Test output of -u option; only unique lines - ['9', '-u', {IN=>"a\na\n"}, {OUT=>""}], - ['10', '-u', {IN=>"a\nb\n"}, {OUT=>"a\nb\n"}], - ['11', '-u', {IN=>"a\nb\na\n"}, {OUT=>"a\nb\na\n"}], - ['12', '-u', {IN=>"a\na\n"}, {OUT=>""}], - ['13', '-u', {IN=>"a\na\n"}, {OUT=>""}], - #['5', '-u', "a\na\n", "", 0], - # Test output of -d option; only repeated lines - ['20', '-d', {IN=>"a\na\n"}, {OUT=>"a\n"}], - ['21', '-d', {IN=>"a\nb\n"}, {OUT=>""}], - ['22', '-d', {IN=>"a\nb\na\n"}, {OUT=>""}], - ['23', '-d', {IN=>"a\na\nb\n"}, {OUT=>"a\n"}], - # Check the key options - # If we skip over fields or characters, is the output deterministic? - ['obs30', '-1', {IN=>"a a\nb a\n"}, {OUT=>"a a\n"}], - ['31', qw(-f 1), {IN=>"a a\nb a\n"}, {OUT=>"a a\n"}], - ['32', qw(-f 1), {IN=>"a a\nb b\n"}, {OUT=>"a a\nb b\n"}], - ['33', qw(-f 1), {IN=>"a a a\nb a c\n"}, {OUT=>"a a a\nb a c\n"}], - ['34', qw(-f 1), {IN=>"b a\na a\n"}, {OUT=>"b a\n"}], - ['35', qw(-f 2), {IN=>"a a c\nb a c\n"}, {OUT=>"a a c\n"}], - # Skip over characters. - ['obs-plus40', '+1', {IN=>"aaa\naaa\n"}, {OUT=>"aaa\n"}], - ['obs-plus41', '+1', {IN=>"baa\naaa\n"}, {OUT=>"baa\n"}], - ['42', qw(-s 1), {IN=>"aaa\naaa\n"}, {OUT=>"aaa\n"}], - ['43', qw(-s 2), {IN=>"baa\naaa\n"}, {OUT=>"baa\n"}], - ['obs-plus44', qw(+1 --), {IN=>"aaa\naaa\n"}, {OUT=>"aaa\n"}], - ['obs-plus45', qw(+1 --), {IN=>"baa\naaa\n"}, {OUT=>"baa\n"}], - # Skip over fields and characters - ['50', qw(-f 1 -s 1), {IN=>"a aaa\nb ab\n"}, {OUT=>"a aaa\nb ab\n"}], - ['51', qw(-f 1 -s 1), {IN=>"a aaa\nb aaa\n"}, {OUT=>"a aaa\n"}], - ['52', qw(-s 1 -f 1), {IN=>"a aaa\nb ab\n"}, {OUT=>"a aaa\nb ab\n"}], - ['53', qw(-s 1 -f 1), {IN=>"a aaa\nb aaa\n"}, {OUT=>"a aaa\n"}], - # Fixed in 2.0.15 - ['54', qw(-s 4), {IN=>"abc\nabcd\n"}, {OUT=>"abc\n"}], - # Supported in 2.0.15 - ['55', qw(-s 0), {IN=>"abc\nabcd\n"}, {OUT=>"abc\nabcd\n"}], - ['56', qw(-s 0), {IN=>"abc\n"}, {OUT=>"abc\n"}], - ['57', qw(-w 0), {IN=>"abc\nabcd\n"}, {OUT=>"abc\n"}], - # Only account for a number of characters - ['60', qw(-w 1), {IN=>"a a\nb a\n"}, {OUT=>"a a\nb a\n"}], - ['61', qw(-w 3), {IN=>"a a\nb a\n"}, {OUT=>"a a\nb a\n"}], - ['62', qw(-w 1 -f 1), {IN=>"a a a\nb a c\n"}, {OUT=>"a a a\n"}], - ['63', qw(-f 1 -w 1), {IN=>"a a a\nb a c\n"}, {OUT=>"a a a\n"}], - # The blank after field one is checked too - ['64', qw(-f 1 -w 4), {IN=>"a a a\nb a c\n"}, {OUT=>"a a a\nb a c\n"}], - ['65', qw(-f 1 -w 3), {IN=>"a a a\nb a c\n"}, {OUT=>"a a a\n"}], - # Make sure we don't break if the file contains \0 - ['90', '', {IN=>"a\0a\na\n"}, {OUT=>"a\0a\na\n"}], - # Check fields separated by tabs and by spaces - ['91', '', {IN=>"a\ta\na a\n"}, {OUT=>"a\ta\na a\n"}], - ['92', qw(-f 1), {IN=>"a\ta\na a\n"}, {OUT=>"a\ta\na a\n"}], - ['93', qw(-f 2), {IN=>"a\ta a\na a a\n"}, {OUT=>"a\ta a\n"}], - ['94', qw(-f 1), {IN=>"a\ta\na\ta\n"}, {OUT=>"a\ta\n"}], - # Check the count option; add tests for other options too - ['101', '-c', {IN=>"a\nb\n"}, {OUT=>" 1 a\n 1 b\n"}], - ['102', '-c', {IN=>"a\na\n"}, {OUT=>" 2 a\n"}], - # Check the local -D (--all-repeated) option - ['110', '-D', {IN=>"a\na\n"}, {OUT=>"a\na\n"}], - ['111', qw(-D -w1), {IN=>"a a\na b\n"}, {OUT=>"a a\na b\n"}], - ['112', qw(-D -c), {IN=>"a a\na b\n"}, {OUT=>""}, {EXIT=>1}, {ERR=> - "$prog: printing all duplicated lines and repeat counts is meaningless\n$try"} - ], - ['113', '--all-repeated=separate', {IN=>"a\na\n"}, {OUT=>"a\na\n"}], - ['114', '--all-repeated=separate', - {IN=>"a\na\nb\nc\nc\n"}, {OUT=>"a\na\n\nc\nc\n"}], - ['115', '--all-repeated=separate', - {IN=>"a\na\nb\nb\nc\n"}, {OUT=>"a\na\n\nb\nb\n"}], - ['116', '--all-repeated=prepend', {IN=>"a\na\n"}, {OUT=>"\na\na\n"}], - ['117', '--all-repeated=prepend', - {IN=>"a\na\nb\nc\nc\n"}, {OUT=>"\na\na\n\nc\nc\n"}], - ['118', '--all-repeated=prepend', {IN=>"a\nb\n"}, {OUT=>""}], - ['119', '--all-repeated=badoption', {IN=>"a\n"}, {OUT=>""}, {EXIT=>1}, - {ERR=>"$prog: invalid argument 'badoption' for '--all-repeated'\n" - . "Valid arguments are:\n" - . " - 'none'\n" - . " - 'prepend'\n" - . " - 'separate'\n" - . $try}], - # Check that -d and -u suppress all output, as POSIX requires. - ['120', qw(-d -u), {IN=>"a\na\n\b"}, {OUT=>""}], - ['121', "-d -u -w$limits->{UINTMAX_OFLOW}", {IN=>"a\na\n\b"}, {OUT=>""}], - ['122', "-d -u -w$limits->{SIZE_OFLOW}", {IN=>"a\na\n\b"}, {OUT=>""}], - # 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"}], -); - -# Set _POSIX2_VERSION=199209 in the environment of each obs-plus* test. -foreach my $t (@Tests) - { - $t->[0] =~ /^obs-plus/ - and push @$t, {ENV=>'_POSIX2_VERSION=199209'}; - } - -@Tests = add_z_variants \@Tests; -@Tests = triple_test \@Tests; - -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/uniq-perf b/tests/misc/uniq-perf deleted file mode 100755 index 57794c3b..00000000 --- a/tests/misc/uniq-perf +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -# before coreutils-8.10, seq 100000|uniq -f 10000000000 would run for days - -# Copyright (C) 2011-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ uniq - -seq 100 > in || fail=1 -timeout 1 uniq -f 10000000000 in || fail=1 - -Exit $fail diff --git a/tests/misc/uniq-perf.sh b/tests/misc/uniq-perf.sh new file mode 100755 index 00000000..35dff8e5 --- /dev/null +++ b/tests/misc/uniq-perf.sh @@ -0,0 +1,25 @@ +#!/bin/sh +# before coreutils-8.10, seq 100000|uniq -f 10000000000 would run for days + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ uniq + +seq 100 > in || fail=1 +timeout 1 uniq -f 10000000000 in || fail=1 + +Exit $fail diff --git a/tests/misc/uniq.pl b/tests/misc/uniq.pl new file mode 100755 index 00000000..140a49b4 --- /dev/null +++ b/tests/misc/uniq.pl @@ -0,0 +1,218 @@ +#!/usr/bin/perl +# Test uniq. + +# 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/>. + +use strict; + +my $limits = getlimits (); + +my $prog = 'uniq'; +my $try = "Try '$prog --help' for more information.\n"; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +# When possible, create a "-z"-testing variant of each test. +sub add_z_variants($) +{ + my ($tests) = @_; + my @new; + TEST: + foreach my $t (@$tests) + { + push @new, $t; + + # skip the obsolete-syntax tests + $t->[0] =~ /^obs-plus/ + and next; + + my @args; + my @list_of_hash; + + foreach my $e (@$t) + { + !ref $e + and push (@args, $e), next; + + ref $e && ref $e eq 'HASH' + or (warn "$0: $t->[0]: unexpected entry type\n"), next; + my $tmp = $e; + foreach my $k (qw(IN OUT)) + { + my $val = $e->{$k}; + # skip any test whose input or output already contains a NUL byte + if (defined $val) + { + $val =~ /\0/ + and next TEST; + + # Convert each NL in input or output to \0. + $val =~ s/\n/\0/g; + $tmp = {$k => $val}; + last; + } + } + push @list_of_hash, $tmp; + } + + shift @args; # discard test name + + # skip any test that uses the -z option + grep /z/, @args + and next; + + push @new, ["$t->[0]-z", '-z', @args, @list_of_hash]; + } + 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"}], + ['4', '', {IN=>"a\nb"}, {OUT=>"a\nb\n"}], + ['5', '', {IN=>"a\na\nb"}, {OUT=>"a\nb\n"}], + ['6', '', {IN=>"b\na\na\n"}, {OUT=>"b\na\n"}], + ['7', '', {IN=>"a\nb\nc\n"}, {OUT=>"a\nb\nc\n"}], + + # Ensure that newlines are not interpreted with -z. + ['2z', '-z', {IN=>"a\na\n"}, {OUT=>"a\na\n\0"}], + ['3z', '-z', {IN=>"a\na"}, {OUT=>"a\na\0"}], + ['4z', '-z', {IN=>"a\nb"}, {OUT=>"a\nb\0"}], + ['5z', '-z', {IN=>"a\na\nb"}, {OUT=>"a\na\nb\0"}], + ['20z', '-dz', {IN=>"a\na\n"}, {OUT=>""}], + + # Make sure that eight bit characters work + ['8', '', {IN=>"ö\nv\n"}, {OUT=>"ö\nv\n"}], + # Test output of -u option; only unique lines + ['9', '-u', {IN=>"a\na\n"}, {OUT=>""}], + ['10', '-u', {IN=>"a\nb\n"}, {OUT=>"a\nb\n"}], + ['11', '-u', {IN=>"a\nb\na\n"}, {OUT=>"a\nb\na\n"}], + ['12', '-u', {IN=>"a\na\n"}, {OUT=>""}], + ['13', '-u', {IN=>"a\na\n"}, {OUT=>""}], + #['5', '-u', "a\na\n", "", 0], + # Test output of -d option; only repeated lines + ['20', '-d', {IN=>"a\na\n"}, {OUT=>"a\n"}], + ['21', '-d', {IN=>"a\nb\n"}, {OUT=>""}], + ['22', '-d', {IN=>"a\nb\na\n"}, {OUT=>""}], + ['23', '-d', {IN=>"a\na\nb\n"}, {OUT=>"a\n"}], + # Check the key options + # If we skip over fields or characters, is the output deterministic? + ['obs30', '-1', {IN=>"a a\nb a\n"}, {OUT=>"a a\n"}], + ['31', qw(-f 1), {IN=>"a a\nb a\n"}, {OUT=>"a a\n"}], + ['32', qw(-f 1), {IN=>"a a\nb b\n"}, {OUT=>"a a\nb b\n"}], + ['33', qw(-f 1), {IN=>"a a a\nb a c\n"}, {OUT=>"a a a\nb a c\n"}], + ['34', qw(-f 1), {IN=>"b a\na a\n"}, {OUT=>"b a\n"}], + ['35', qw(-f 2), {IN=>"a a c\nb a c\n"}, {OUT=>"a a c\n"}], + # Skip over characters. + ['obs-plus40', '+1', {IN=>"aaa\naaa\n"}, {OUT=>"aaa\n"}], + ['obs-plus41', '+1', {IN=>"baa\naaa\n"}, {OUT=>"baa\n"}], + ['42', qw(-s 1), {IN=>"aaa\naaa\n"}, {OUT=>"aaa\n"}], + ['43', qw(-s 2), {IN=>"baa\naaa\n"}, {OUT=>"baa\n"}], + ['obs-plus44', qw(+1 --), {IN=>"aaa\naaa\n"}, {OUT=>"aaa\n"}], + ['obs-plus45', qw(+1 --), {IN=>"baa\naaa\n"}, {OUT=>"baa\n"}], + # Skip over fields and characters + ['50', qw(-f 1 -s 1), {IN=>"a aaa\nb ab\n"}, {OUT=>"a aaa\nb ab\n"}], + ['51', qw(-f 1 -s 1), {IN=>"a aaa\nb aaa\n"}, {OUT=>"a aaa\n"}], + ['52', qw(-s 1 -f 1), {IN=>"a aaa\nb ab\n"}, {OUT=>"a aaa\nb ab\n"}], + ['53', qw(-s 1 -f 1), {IN=>"a aaa\nb aaa\n"}, {OUT=>"a aaa\n"}], + # Fixed in 2.0.15 + ['54', qw(-s 4), {IN=>"abc\nabcd\n"}, {OUT=>"abc\n"}], + # Supported in 2.0.15 + ['55', qw(-s 0), {IN=>"abc\nabcd\n"}, {OUT=>"abc\nabcd\n"}], + ['56', qw(-s 0), {IN=>"abc\n"}, {OUT=>"abc\n"}], + ['57', qw(-w 0), {IN=>"abc\nabcd\n"}, {OUT=>"abc\n"}], + # Only account for a number of characters + ['60', qw(-w 1), {IN=>"a a\nb a\n"}, {OUT=>"a a\nb a\n"}], + ['61', qw(-w 3), {IN=>"a a\nb a\n"}, {OUT=>"a a\nb a\n"}], + ['62', qw(-w 1 -f 1), {IN=>"a a a\nb a c\n"}, {OUT=>"a a a\n"}], + ['63', qw(-f 1 -w 1), {IN=>"a a a\nb a c\n"}, {OUT=>"a a a\n"}], + # The blank after field one is checked too + ['64', qw(-f 1 -w 4), {IN=>"a a a\nb a c\n"}, {OUT=>"a a a\nb a c\n"}], + ['65', qw(-f 1 -w 3), {IN=>"a a a\nb a c\n"}, {OUT=>"a a a\n"}], + # Make sure we don't break if the file contains \0 + ['90', '', {IN=>"a\0a\na\n"}, {OUT=>"a\0a\na\n"}], + # Check fields separated by tabs and by spaces + ['91', '', {IN=>"a\ta\na a\n"}, {OUT=>"a\ta\na a\n"}], + ['92', qw(-f 1), {IN=>"a\ta\na a\n"}, {OUT=>"a\ta\na a\n"}], + ['93', qw(-f 2), {IN=>"a\ta a\na a a\n"}, {OUT=>"a\ta a\n"}], + ['94', qw(-f 1), {IN=>"a\ta\na\ta\n"}, {OUT=>"a\ta\n"}], + # Check the count option; add tests for other options too + ['101', '-c', {IN=>"a\nb\n"}, {OUT=>" 1 a\n 1 b\n"}], + ['102', '-c', {IN=>"a\na\n"}, {OUT=>" 2 a\n"}], + # Check the local -D (--all-repeated) option + ['110', '-D', {IN=>"a\na\n"}, {OUT=>"a\na\n"}], + ['111', qw(-D -w1), {IN=>"a a\na b\n"}, {OUT=>"a a\na b\n"}], + ['112', qw(-D -c), {IN=>"a a\na b\n"}, {OUT=>""}, {EXIT=>1}, {ERR=> + "$prog: printing all duplicated lines and repeat counts is meaningless\n$try"} + ], + ['113', '--all-repeated=separate', {IN=>"a\na\n"}, {OUT=>"a\na\n"}], + ['114', '--all-repeated=separate', + {IN=>"a\na\nb\nc\nc\n"}, {OUT=>"a\na\n\nc\nc\n"}], + ['115', '--all-repeated=separate', + {IN=>"a\na\nb\nb\nc\n"}, {OUT=>"a\na\n\nb\nb\n"}], + ['116', '--all-repeated=prepend', {IN=>"a\na\n"}, {OUT=>"\na\na\n"}], + ['117', '--all-repeated=prepend', + {IN=>"a\na\nb\nc\nc\n"}, {OUT=>"\na\na\n\nc\nc\n"}], + ['118', '--all-repeated=prepend', {IN=>"a\nb\n"}, {OUT=>""}], + ['119', '--all-repeated=badoption', {IN=>"a\n"}, {OUT=>""}, {EXIT=>1}, + {ERR=>"$prog: invalid argument 'badoption' for '--all-repeated'\n" + . "Valid arguments are:\n" + . " - 'none'\n" + . " - 'prepend'\n" + . " - 'separate'\n" + . $try}], + # Check that -d and -u suppress all output, as POSIX requires. + ['120', qw(-d -u), {IN=>"a\na\n\b"}, {OUT=>""}], + ['121', "-d -u -w$limits->{UINTMAX_OFLOW}", {IN=>"a\na\n\b"}, {OUT=>""}], + ['122', "-d -u -w$limits->{SIZE_OFLOW}", {IN=>"a\na\n\b"}, {OUT=>""}], + # 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"}], +); + +# Set _POSIX2_VERSION=199209 in the environment of each obs-plus* test. +foreach my $t (@Tests) + { + $t->[0] =~ /^obs-plus/ + and push @$t, {ENV=>'_POSIX2_VERSION=199209'}; + } + +@Tests = add_z_variants \@Tests; +@Tests = triple_test \@Tests; + +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/wc b/tests/misc/wc deleted file mode 100755 index 713663f7..00000000 --- a/tests/misc/wc +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/perl -# Basic tests for "wc". - -# Copyright (C) 1997-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 -# 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; - -my $prog = 'wc'; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -my @Tests = - ( - ['a0', '-c', {IN_PIPE=>''}, {OUT=>"0\n"}], - ['a1', '-l', {IN_PIPE=>''}, {OUT=>"0\n"}], - ['a2', '-w', {IN_PIPE=>''}, {OUT=>"0\n"}], - ['a3', '-c', {IN_PIPE=>'x'}, {OUT=>"1\n"}], - ['a4', '-w', {IN_PIPE=>'x'}, {OUT=>"1\n"}], - ['a5', '-w', {IN_PIPE=>"x y\n"}, {OUT=>"2\n"}], - ['a6', '-w', {IN_PIPE=>"x y\nz"}, {OUT=>"3\n"}], - # Remember, -l counts *newline* bytes, not logical lines. - ['a7', '-l', {IN_PIPE=>"x y"}, {OUT=>"0\n"}], - ['a8', '-l', {IN_PIPE=>"x y\n"}, {OUT=>"1\n"}], - ['a9', '-l', {IN_PIPE=>"x\ny\n"}, {OUT=>"2\n"}], - ['b0', '', {IN_PIPE=>""}, {OUT=>" 0 0 0\n"}], - ['b1', '', {IN_PIPE=>"a b\nc\n"}, {OUT=>" 2 3 6\n"}], - ['c0', '-L', {IN_PIPE=>"1\n12\n"}, {OUT=>"2\n"}], - ['c1', '-L', {IN_PIPE=>"1\n123\n1\n"}, {OUT=>"3\n"}], - ['c2', '-L', {IN_PIPE=>"\n123456"}, {OUT=>"6\n"}], - ); - -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/wc-files0 b/tests/misc/wc-files0 deleted file mode 100755 index 9a0d0501..00000000 --- a/tests/misc/wc-files0 +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -# Show that wc's new --files0-from option works. - -# Copyright (C) 2006-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ wc - -echo 2 > 2b || framework_failure_ -echo 2 words > 2w || framework_failure_ -printf '2b\n2w\n' |tr '\n' '\0' > names || framework_failure_ - - -wc --files0-from=names > out || fail=1 -cat <<\EOF > exp || fail=1 - 1 1 2 2b - 1 2 8 2w - 2 3 10 total -EOF - -compare exp out || fail=1 - -if test "$fail" = ''; then - # Repeat the above test, but read the file name list from stdin. - rm -f out - wc --files0-from=- < names > out || fail=1 - compare exp out || fail=1 -fi - -Exit $fail diff --git a/tests/misc/wc-files0-from b/tests/misc/wc-files0-from deleted file mode 100755 index 0f99aeeb..00000000 --- a/tests/misc/wc-files0-from +++ /dev/null @@ -1,93 +0,0 @@ -#!/usr/bin/perl -# Exercise wc's --files0-from option. -# FIXME: keep this file in sync with tests/du/files0-from. - -# Copyright (C) 2006-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 -# 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; - -(my $program_name = $0) =~ s|.*/||; - -my $prog = 'wc'; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -my @Tests = - ( - # invalid extra command line argument - ['f-extra-arg', '--files0-from=- no-such', {IN=>"a"}, {EXIT=>1}, - {ERR => "$prog: extra operand 'no-such'\n" - . "file operands cannot be combined with --files0-from\n" - . "Try '$prog --help' for more information.\n"} - ], - - # missing input file - ['missing', '--files0-from=missing', {EXIT=>1}, - {ERR => "$prog: cannot open 'missing' for reading: " - . "No such file or directory\n"}], - - # input file name of '-' - ['minus-in-stdin', '--files0-from=-', '<', {IN=>{f=>'-'}}, {EXIT=>1}, - {ERR => "$prog: when reading file names from stdin, no file name of" - . " '-' allowed\n"}], - - # empty input, regular file - ['empty', '--files0-from=@AUX@', {AUX=>''}], - - # empty input, from non-regular file - ['empty-nonreg', '--files0-from=/dev/null'], - - # one NUL - ['nul-1', '--files0-from=-', '<', {IN=>"\0"}, {EXIT=>1}, - {ERR => "$prog: -:1: invalid zero-length file name\n"}], - - # two NULs - ['nul-2', '--files0-from=-', '<', {IN=>"\0\0"}, {EXIT=>1}, - {OUT=>"0 0 0 total\n"}, - {ERR => "$prog: -:1: invalid zero-length file name\n" - . "$prog: -:2: invalid zero-length file name\n"}], - - # one file name, no NUL - ['1', '--files0-from=-', '<', - {IN=>{f=>"g"}}, {AUX=>{g=>''}}, {OUT=>"0 0 0 g\n"} ], - - # one file name, with NUL - ['1a', '--files0-from=-', '<', - {IN=>{f=>"g\0"}}, {AUX=>{g=>''}}, {OUT=>"0 0 0 g\n"} ], - - # two file names, no final NUL - ['2', '--files0-from=-', '<', - {IN=>{f=>"g\0g"}}, {AUX=>{g=>''}}, - {OUT=>"0 0 0 g\n0 0 0 g\n0 0 0 total\n"} ], - - # two file names, with final NUL - ['2a', '--files0-from=-', '<', - {IN=>{f=>"g\0g\0"}}, {AUX=>{g=>''}}, - {OUT=>"0 0 0 g\n0 0 0 g\n0 0 0 total\n"} ], - - # Ensure that $prog processes FILEs following a zero-length name. - ['zero-len', '--files0-from=-', '<', - {IN=>{f=>"\0g\0"}}, {AUX=>{g=>''}}, - {OUT=>"0 0 0 g\n0 0 0 total\n"}, - {ERR => "$prog: -:1: invalid zero-length file name\n"}, {EXIT=>1} ], - ); - -my $save_temps = $ENV{DEBUG}; -my $verbose = $ENV{VERBOSE}; - -my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); -exit $fail; diff --git a/tests/misc/wc-files0-from.pl b/tests/misc/wc-files0-from.pl new file mode 100755 index 00000000..a14bf97f --- /dev/null +++ b/tests/misc/wc-files0-from.pl @@ -0,0 +1,93 @@ +#!/usr/bin/perl +# 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. + +# This 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; + +(my $program_name = $0) =~ s|.*/||; + +my $prog = 'wc'; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +my @Tests = + ( + # invalid extra command line argument + ['f-extra-arg', '--files0-from=- no-such', {IN=>"a"}, {EXIT=>1}, + {ERR => "$prog: extra operand 'no-such'\n" + . "file operands cannot be combined with --files0-from\n" + . "Try '$prog --help' for more information.\n"} + ], + + # missing input file + ['missing', '--files0-from=missing', {EXIT=>1}, + {ERR => "$prog: cannot open 'missing' for reading: " + . "No such file or directory\n"}], + + # input file name of '-' + ['minus-in-stdin', '--files0-from=-', '<', {IN=>{f=>'-'}}, {EXIT=>1}, + {ERR => "$prog: when reading file names from stdin, no file name of" + . " '-' allowed\n"}], + + # empty input, regular file + ['empty', '--files0-from=@AUX@', {AUX=>''}], + + # empty input, from non-regular file + ['empty-nonreg', '--files0-from=/dev/null'], + + # one NUL + ['nul-1', '--files0-from=-', '<', {IN=>"\0"}, {EXIT=>1}, + {ERR => "$prog: -:1: invalid zero-length file name\n"}], + + # two NULs + ['nul-2', '--files0-from=-', '<', {IN=>"\0\0"}, {EXIT=>1}, + {OUT=>"0 0 0 total\n"}, + {ERR => "$prog: -:1: invalid zero-length file name\n" + . "$prog: -:2: invalid zero-length file name\n"}], + + # one file name, no NUL + ['1', '--files0-from=-', '<', + {IN=>{f=>"g"}}, {AUX=>{g=>''}}, {OUT=>"0 0 0 g\n"} ], + + # one file name, with NUL + ['1a', '--files0-from=-', '<', + {IN=>{f=>"g\0"}}, {AUX=>{g=>''}}, {OUT=>"0 0 0 g\n"} ], + + # two file names, no final NUL + ['2', '--files0-from=-', '<', + {IN=>{f=>"g\0g"}}, {AUX=>{g=>''}}, + {OUT=>"0 0 0 g\n0 0 0 g\n0 0 0 total\n"} ], + + # two file names, with final NUL + ['2a', '--files0-from=-', '<', + {IN=>{f=>"g\0g\0"}}, {AUX=>{g=>''}}, + {OUT=>"0 0 0 g\n0 0 0 g\n0 0 0 total\n"} ], + + # Ensure that $prog processes FILEs following a zero-length name. + ['zero-len', '--files0-from=-', '<', + {IN=>{f=>"\0g\0"}}, {AUX=>{g=>''}}, + {OUT=>"0 0 0 g\n0 0 0 total\n"}, + {ERR => "$prog: -:1: invalid zero-length file name\n"}, {EXIT=>1} ], + ); + +my $save_temps = $ENV{DEBUG}; +my $verbose = $ENV{VERBOSE}; + +my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); +exit $fail; diff --git a/tests/misc/wc-files0.sh b/tests/misc/wc-files0.sh new file mode 100755 index 00000000..06be054d --- /dev/null +++ b/tests/misc/wc-files0.sh @@ -0,0 +1,43 @@ +#!/bin/sh +# Show that wc's new --files0-from option works. + +# Copyright (C) 2006-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ wc + +echo 2 > 2b || framework_failure_ +echo 2 words > 2w || framework_failure_ +printf '2b\n2w\n' |tr '\n' '\0' > names || framework_failure_ + + +wc --files0-from=names > out || fail=1 +cat <<\EOF > exp || fail=1 + 1 1 2 2b + 1 2 8 2w + 2 3 10 total +EOF + +compare exp out || fail=1 + +if test "$fail" = ''; then + # Repeat the above test, but read the file name list from stdin. + rm -f out + wc --files0-from=- < names > out || fail=1 + compare exp out || fail=1 +fi + +Exit $fail diff --git a/tests/misc/wc-parallel b/tests/misc/wc-parallel deleted file mode 100755 index 074160fd..00000000 --- a/tests/misc/wc-parallel +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# Ensure that wc prints counts atomically -# so that concurrent processes don't intersperse their output - -# Copyright (C) 2009-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ md5sum - -(mkdir tmp && cd tmp && seq 2000 | xargs touch) - -# This will output at least 16KiB per process -# and start 3 processes, with 2 running concurrently, -# which triggers often on Fedora 11 at least. -(find tmp tmp tmp -type f | xargs -n2000 -P2 wc) | -sed -n '/0 0 0 /!p' | -grep . > /dev/null && fail=1 - -Exit $fail diff --git a/tests/misc/wc-parallel.sh b/tests/misc/wc-parallel.sh new file mode 100755 index 00000000..bf6b7b29 --- /dev/null +++ b/tests/misc/wc-parallel.sh @@ -0,0 +1,32 @@ +#!/bin/sh +# Ensure that wc prints counts atomically +# so that concurrent processes don't intersperse their output + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ wc + +(mkdir tmp && cd tmp && seq 2000 | xargs touch) + +# This will output at least 16KiB per process +# and start 3 processes, with 2 running concurrently, +# which triggers often on Fedora 11 at least. +(find tmp tmp tmp -type f | xargs -n2000 -P2 wc) | +sed -n '/0 0 0 /!p' | +grep . > /dev/null && fail=1 + +Exit $fail diff --git a/tests/misc/wc.pl b/tests/misc/wc.pl new file mode 100755 index 00000000..ed2feafd --- /dev/null +++ b/tests/misc/wc.pl @@ -0,0 +1,50 @@ +#!/usr/bin/perl +# Basic tests for "wc". + +# Copyright (C) 1997-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/>. + +use strict; + +my $prog = 'wc'; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +my @Tests = + ( + ['a0', '-c', {IN_PIPE=>''}, {OUT=>"0\n"}], + ['a1', '-l', {IN_PIPE=>''}, {OUT=>"0\n"}], + ['a2', '-w', {IN_PIPE=>''}, {OUT=>"0\n"}], + ['a3', '-c', {IN_PIPE=>'x'}, {OUT=>"1\n"}], + ['a4', '-w', {IN_PIPE=>'x'}, {OUT=>"1\n"}], + ['a5', '-w', {IN_PIPE=>"x y\n"}, {OUT=>"2\n"}], + ['a6', '-w', {IN_PIPE=>"x y\nz"}, {OUT=>"3\n"}], + # Remember, -l counts *newline* bytes, not logical lines. + ['a7', '-l', {IN_PIPE=>"x y"}, {OUT=>"0\n"}], + ['a8', '-l', {IN_PIPE=>"x y\n"}, {OUT=>"1\n"}], + ['a9', '-l', {IN_PIPE=>"x\ny\n"}, {OUT=>"2\n"}], + ['b0', '', {IN_PIPE=>""}, {OUT=>" 0 0 0\n"}], + ['b1', '', {IN_PIPE=>"a b\nc\n"}, {OUT=>" 2 3 6\n"}], + ['c0', '-L', {IN_PIPE=>"1\n12\n"}, {OUT=>"2\n"}], + ['c1', '-L', {IN_PIPE=>"1\n123\n1\n"}, {OUT=>"3\n"}], + ['c2', '-L', {IN_PIPE=>"\n123456"}, {OUT=>"6\n"}], + ); + +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/xattr b/tests/misc/xattr deleted file mode 100755 index ff50e6c9..00000000 --- a/tests/misc/xattr +++ /dev/null @@ -1,130 +0,0 @@ -#!/bin/sh -# Ensure that cp --preserve=xattr, cp --preserve=all and mv preserve extended -# attributes and install does not preserve extended attributes. -# cp -a should preserve xattr, error diagnostics should not be displayed - -# Copyright (C) 2009-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp mv ginstall - -# Skip this test if cp was built without xattr support: -touch src dest || framework_failure_ -cp --preserve=xattr -n src dest \ - || skip_ "coreutils built without xattr support" - -# this code was taken from test mv/backup-is-src -cleanup_() { rm -rf "$other_partition_tmpdir"; } -. "$abs_srcdir/other-fs-tmpdir" -b_other="$other_partition_tmpdir/b" -rm -f "$b_other" || framework_failure_ - -# testing xattr name-value pair -xattr_name="user.foo" -xattr_value="bar" -xattr_pair="$xattr_name=\"$xattr_value\"" - -# create new file and check its xattrs -touch a || framework_failure_ -getfattr -d a >out_a || skip_ "failed to get xattr of file" -grep -F "$xattr_pair" out_a && framework_failure_ - -# try to set user xattr on file -setfattr -n "$xattr_name" -v "$xattr_value" a >out_a \ - || skip_ "failed to set xattr of file" -getfattr -d a >out_a || skip_ "failed to get xattr of file" -grep -F "$xattr_pair" out_a \ - || skip_ "failed to set xattr of file" - - -# cp should not preserve xattr by default -cp a b || fail=1 -getfattr -d b >out_b || skip_ "failed to get xattr of file" -grep -F "$xattr_pair" out_b && fail=1 - -# test if --preserve=xattr option works -cp --preserve=xattr a b || fail=1 -getfattr -d b >out_b || skip_ "failed to get xattr of file" -grep -F "$xattr_pair" out_b || fail=1 - -# test if --preserve=all option works -cp --preserve=all a c || fail=1 -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 -getfattr -d d >out_d || skip_ "failed to get xattr of file" -grep -F "$xattr_pair" out_d || fail=1 - -# test if --preserve=xattr works even for files without write access -chmod a-w a || framework_failure_ -rm -f e -cp --preserve=xattr a e || fail=1 -getfattr -d e >out_e || skip_ "failed to get xattr of file" -grep -F "$xattr_pair" out_e || fail=1 - -# Ensure that permission bits are preserved, too. -src_perm=$(stat --format=%a a) -dst_perm=$(stat --format=%a e) -test "$dst_perm" = "$src_perm" || fail=1 - -chmod u+w a || framework_failure_ - -rm b || framework_failure_ - -# install should never preserve xattr -ginstall a b || fail=1 -getfattr -d b >out_b || skip_ "failed to get xattr of file" -grep -F "$xattr_pair" out_b && fail=1 - -# mv should preserve xattr when renaming within a file system. -# This is implicitly done by rename () and doesn't need explicit -# xattr support in mv. -mv a b || fail=1 -getfattr -d b >out_b || skip_ "failed to get xattr of file" -grep -F "$xattr_pair" out_b || cat >&2 <<EOF -================================================================= -$0: WARNING!!! -rename () does not preserve extended attributes -================================================================= -EOF - -# try to set user xattr on file on other partition -test_mv=1 -touch "$b_other" || framework_failure_ -setfattr -n "$xattr_name" -v "$xattr_value" "$b_other" >out_a \ - || test_mv=0 -getfattr -d "$b_other" >out_b || test_mv=0 -grep -F "$xattr_pair" out_b || test_mv=0 -rm -f "$b_other" || framework_failure_ - -if test $test_mv -eq 1; then - # mv should preserve xattr when copying content from one partition to another - mv b "$b_other" || fail=1 - getfattr -d "$b_other" >out_b || - skip_ "failed to get xattr of file" - grep -F "$xattr_pair" out_b || fail=1 -else - cat >&2 <<EOF -================================================================= -$0: WARNING!!! -failed to set xattr of file $b_other -================================================================= -EOF -fi - -Exit $fail diff --git a/tests/misc/xattr.sh b/tests/misc/xattr.sh new file mode 100755 index 00000000..6eccc10d --- /dev/null +++ b/tests/misc/xattr.sh @@ -0,0 +1,130 @@ +#!/bin/sh +# Ensure that cp --preserve=xattr, cp --preserve=all and mv preserve extended +# 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. + +# This 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 mv ginstall + +# Skip this test if cp was built without xattr support: +touch src dest || framework_failure_ +cp --preserve=xattr -n src dest \ + || skip_ "coreutils built without xattr support" + +# this code was taken from test mv/backup-is-src +cleanup_() { rm -rf "$other_partition_tmpdir"; } +. "$abs_srcdir/tests/other-fs-tmpdir" +b_other="$other_partition_tmpdir/b" +rm -f "$b_other" || framework_failure_ + +# testing xattr name-value pair +xattr_name="user.foo" +xattr_value="bar" +xattr_pair="$xattr_name=\"$xattr_value\"" + +# create new file and check its xattrs +touch a || framework_failure_ +getfattr -d a >out_a || skip_ "failed to get xattr of file" +grep -F "$xattr_pair" out_a && framework_failure_ + +# try to set user xattr on file +setfattr -n "$xattr_name" -v "$xattr_value" a >out_a \ + || skip_ "failed to set xattr of file" +getfattr -d a >out_a || skip_ "failed to get xattr of file" +grep -F "$xattr_pair" out_a \ + || skip_ "failed to set xattr of file" + + +# cp should not preserve xattr by default +cp a b || fail=1 +getfattr -d b >out_b || skip_ "failed to get xattr of file" +grep -F "$xattr_pair" out_b && fail=1 + +# test if --preserve=xattr option works +cp --preserve=xattr a b || fail=1 +getfattr -d b >out_b || skip_ "failed to get xattr of file" +grep -F "$xattr_pair" out_b || fail=1 + +# test if --preserve=all option works +cp --preserve=all a c || fail=1 +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 +getfattr -d d >out_d || skip_ "failed to get xattr of file" +grep -F "$xattr_pair" out_d || fail=1 + +# test if --preserve=xattr works even for files without write access +chmod a-w a || framework_failure_ +rm -f e +cp --preserve=xattr a e || fail=1 +getfattr -d e >out_e || skip_ "failed to get xattr of file" +grep -F "$xattr_pair" out_e || fail=1 + +# Ensure that permission bits are preserved, too. +src_perm=$(stat --format=%a a) +dst_perm=$(stat --format=%a e) +test "$dst_perm" = "$src_perm" || fail=1 + +chmod u+w a || framework_failure_ + +rm b || framework_failure_ + +# install should never preserve xattr +ginstall a b || fail=1 +getfattr -d b >out_b || skip_ "failed to get xattr of file" +grep -F "$xattr_pair" out_b && fail=1 + +# mv should preserve xattr when renaming within a file system. +# This is implicitly done by rename () and doesn't need explicit +# xattr support in mv. +mv a b || fail=1 +getfattr -d b >out_b || skip_ "failed to get xattr of file" +grep -F "$xattr_pair" out_b || cat >&2 <<EOF +================================================================= +$0: WARNING!!! +rename () does not preserve extended attributes +================================================================= +EOF + +# try to set user xattr on file on other partition +test_mv=1 +touch "$b_other" || framework_failure_ +setfattr -n "$xattr_name" -v "$xattr_value" "$b_other" >out_a \ + || test_mv=0 +getfattr -d "$b_other" >out_b || test_mv=0 +grep -F "$xattr_pair" out_b || test_mv=0 +rm -f "$b_other" || framework_failure_ + +if test $test_mv -eq 1; then + # mv should preserve xattr when copying content from one partition to another + mv b "$b_other" || fail=1 + getfattr -d "$b_other" >out_b || + skip_ "failed to get xattr of file" + grep -F "$xattr_pair" out_b || fail=1 +else + cat >&2 <<EOF +================================================================= +$0: WARNING!!! +failed to set xattr of file $b_other +================================================================= +EOF +fi + +Exit $fail diff --git a/tests/misc/xstrtol b/tests/misc/xstrtol deleted file mode 100755 index fa0056fc..00000000 --- a/tests/misc/xstrtol +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/perl -# exercise xstrtol's diagnostics via pr - -# Copyright (C) 2007-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 -# 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; - -(my $ME = $0) =~ s|.*/||; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -my $prog = 'pr'; -my $too_big = '9' x 81; # Big enough to overflow a 256-bit integer. -my @Tests = - ( - # test-name, [option, option, ...] {OUT=>"expected-output"} - - ['inval-suffix', "--pages=${too_big}h", {EXIT => 1}, - {ERR=>"$prog: invalid suffix in --pages argument '${too_big}h'\n"}], - - ['too-big', "--pages=$too_big", {EXIT => 1}, - {ERR=>"$prog: --pages argument '$too_big' too large\n"}], - - ['simply-inval', "--pages=x", {EXIT => 1}, - {ERR=>"$prog: invalid --pages argument 'x'\n"}], - - ['inv-pg-range', "--pages=9x", {EXIT => 1}, - {ERR=>"$prog: invalid page range '9x'\n"}], - ); - -my $save_temps = $ENV{DEBUG}; -my $verbose = $ENV{VERBOSE}; - -my $fail = run_tests ($ME, $prog, \@Tests, $save_temps, $verbose); -exit $fail; diff --git a/tests/misc/xstrtol.pl b/tests/misc/xstrtol.pl new file mode 100755 index 00000000..b2f38b61 --- /dev/null +++ b/tests/misc/xstrtol.pl @@ -0,0 +1,49 @@ +#!/usr/bin/perl +# exercise xstrtol's diagnostics via pr + +# Copyright (C) 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/>. + +use strict; + +(my $ME = $0) =~ s|.*/||; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +my $prog = 'pr'; +my $too_big = '9' x 81; # Big enough to overflow a 256-bit integer. +my @Tests = + ( + # test-name, [option, option, ...] {OUT=>"expected-output"} + + ['inval-suffix', "--pages=${too_big}h", {EXIT => 1}, + {ERR=>"$prog: invalid suffix in --pages argument '${too_big}h'\n"}], + + ['too-big', "--pages=$too_big", {EXIT => 1}, + {ERR=>"$prog: --pages argument '$too_big' too large\n"}], + + ['simply-inval', "--pages=x", {EXIT => 1}, + {ERR=>"$prog: invalid --pages argument 'x'\n"}], + + ['inv-pg-range', "--pages=9x", {EXIT => 1}, + {ERR=>"$prog: invalid page range '9x'\n"}], + ); + +my $save_temps = $ENV{DEBUG}; +my $verbose = $ENV{VERBOSE}; + +my $fail = run_tests ($ME, $prog, \@Tests, $save_temps, $verbose); +exit $fail; diff --git a/tests/mkdir/p-1 b/tests/mkdir/p-1 deleted file mode 100755 index cd8e6760..00000000 --- a/tests/mkdir/p-1 +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -# Test "mkdir -p". - -# Copyright (C) 1997-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ mkdir - -mkdir --parents "$(pwd)/t" || fail=1 -test -d t || fail=1 - -Exit $fail diff --git a/tests/mkdir/p-1.sh b/tests/mkdir/p-1.sh new file mode 100755 index 00000000..76c4517f --- /dev/null +++ b/tests/mkdir/p-1.sh @@ -0,0 +1,25 @@ +#!/bin/sh +# Test "mkdir -p". + +# Copyright (C) 1997-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ mkdir + +mkdir --parents "$(pwd)/t" || fail=1 +test -d t || fail=1 + +Exit $fail diff --git a/tests/mkdir/p-2 b/tests/mkdir/p-2 deleted file mode 100755 index d0c487ec..00000000 --- a/tests/mkdir/p-2 +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -# Just like p-1, but with an absolute path. - -# Copyright (C) 1997-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ mkdir - -mkdir --parents "$(pwd)/t/u" || fail=1 -test -d t/u || fail=1 - -Exit $fail diff --git a/tests/mkdir/p-2.sh b/tests/mkdir/p-2.sh new file mode 100755 index 00000000..14a0a453 --- /dev/null +++ b/tests/mkdir/p-2.sh @@ -0,0 +1,25 @@ +#!/bin/sh +# Just like p-1, but with an absolute path. + +# Copyright (C) 1997-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ mkdir + +mkdir --parents "$(pwd)/t/u" || fail=1 +test -d t/u || fail=1 + +Exit $fail diff --git a/tests/mkdir/p-3 b/tests/mkdir/p-3 deleted file mode 100755 index 7031b2ed..00000000 --- a/tests/mkdir/p-3 +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/sh -# Ensure that mkdir-p.c's fail-to-return-to-initial-working-directory -# causes immediate failure. Also, ensure that we don't create -# subsequent, relative command-line arguments in the wrong place. - -# Copyright (C) 2005-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ mkdir -skip_if_root_ - -mkdir no-access || framework_failure_ -mkdir no-acce2s || framework_failure_ -mkdir -p no-acce3s/d || framework_failure_ - -p=$(pwd) -(cd no-access && chmod 0 . && mkdir -p "$p/a/b" u/v) 2> /dev/null && fail=1 -test -d "$p/a/b" || fail=1 - -# Same as above, but with a following *absolute* name, it should succeed -(cd no-acce2s && chmod 0 . && mkdir -p "$p/b/b" "$p/z") || fail=1 -test -d "$p/b/b" && test -d "$p/z" || fail=1 - -# Same as above, but a trailing relative name in an unreadable directory -# whose parent is inaccessible. coreutils 5.97 fails this test. -# Perform this test only if "." is on a local file system. -# Otherwise, it would fail e.g., on an NFS-mounted file system. -if is_local_dir_ .; then - (cd no-acce3s/d && chmod a-r . && chmod a-rx .. && - mkdir -p a/b "$p/b/c" d/e && test -d a/b && test -d d/e) || fail=1 - test -d "$p/b/c" || fail=1 -fi - -b=$(ls "$p/a" | tr -d '\n') -# With coreutils-5.3.0, this would fail with $b=bu. -test "x$b" = xb || fail=1 - -Exit $fail diff --git a/tests/mkdir/p-3.sh b/tests/mkdir/p-3.sh new file mode 100755 index 00000000..8cc7f3cf --- /dev/null +++ b/tests/mkdir/p-3.sh @@ -0,0 +1,51 @@ +#!/bin/sh +# Ensure that mkdir-p.c's fail-to-return-to-initial-working-directory +# 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. + +# This 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 +skip_if_root_ + +mkdir no-access || framework_failure_ +mkdir no-acce2s || framework_failure_ +mkdir -p no-acce3s/d || framework_failure_ + +p=$(pwd) +(cd no-access && chmod 0 . && mkdir -p "$p/a/b" u/v) 2> /dev/null && fail=1 +test -d "$p/a/b" || fail=1 + +# Same as above, but with a following *absolute* name, it should succeed +(cd no-acce2s && chmod 0 . && mkdir -p "$p/b/b" "$p/z") || fail=1 +test -d "$p/b/b" && test -d "$p/z" || fail=1 + +# Same as above, but a trailing relative name in an unreadable directory +# whose parent is inaccessible. coreutils 5.97 fails this test. +# Perform this test only if "." is on a local file system. +# Otherwise, it would fail e.g., on an NFS-mounted file system. +if is_local_dir_ .; then + (cd no-acce3s/d && chmod a-r . && chmod a-rx .. && + mkdir -p a/b "$p/b/c" d/e && test -d a/b && test -d d/e) || fail=1 + test -d "$p/b/c" || fail=1 +fi + +b=$(ls "$p/a" | tr -d '\n') +# With coreutils-5.3.0, this would fail with $b=bu. +test "x$b" = xb || fail=1 + +Exit $fail diff --git a/tests/mkdir/p-slashdot b/tests/mkdir/p-slashdot deleted file mode 100755 index 76d21d05..00000000 --- a/tests/mkdir/p-slashdot +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# Ensure that mkdir -p works with arguments specified with a trailing "/.". - -# Copyright (C) 2005-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ mkdir - - -mkdir -p d1/. || fail=1 -test -d d1 || fail=1 - -mkdir -p d2/.. || fail=1 -test -d d2 || fail=1 - -Exit $fail diff --git a/tests/mkdir/p-slashdot.sh b/tests/mkdir/p-slashdot.sh new file mode 100755 index 00000000..cfeead3a --- /dev/null +++ b/tests/mkdir/p-slashdot.sh @@ -0,0 +1,29 @@ +#!/bin/sh +# Ensure that mkdir -p works with arguments specified with a trailing "/.". + +# Copyright (C) 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 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 + + +mkdir -p d1/. || fail=1 +test -d d1 || fail=1 + +mkdir -p d2/.. || fail=1 +test -d d2 || fail=1 + +Exit $fail diff --git a/tests/mkdir/p-thru-slink b/tests/mkdir/p-thru-slink deleted file mode 100755 index 3f599324..00000000 --- a/tests/mkdir/p-thru-slink +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -# Ensure that mkdir -p foo/bar works when foo is a symbolic link to a directory - -# Copyright (C) 2005-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ mkdir - -ln -s . slink || framework_failure_ - -mkdir -p slink/x || fail=1 -test -d x || fail=1 - -Exit $fail diff --git a/tests/mkdir/p-thru-slink.sh b/tests/mkdir/p-thru-slink.sh new file mode 100755 index 00000000..510ba39b --- /dev/null +++ b/tests/mkdir/p-thru-slink.sh @@ -0,0 +1,27 @@ +#!/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. + +# This 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 + +ln -s . slink || framework_failure_ + +mkdir -p slink/x || fail=1 +test -d x || fail=1 + +Exit $fail diff --git a/tests/mkdir/p-v b/tests/mkdir/p-v deleted file mode 100755 index d6dcfdd8..00000000 --- a/tests/mkdir/p-v +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# Test mkdir -pv. - -# Copyright (C) 2006-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ mkdir - -mkdir -pv foo/a/b/c/d >out || fail=1 - -compare - out <<\EOF -mkdir: created directory 'foo' -mkdir: created directory 'foo/a' -mkdir: created directory 'foo/a/b' -mkdir: created directory 'foo/a/b/c' -mkdir: created directory 'foo/a/b/c/d' -EOF - -Exit $fail diff --git a/tests/mkdir/p-v.sh b/tests/mkdir/p-v.sh new file mode 100755 index 00000000..665b1a35 --- /dev/null +++ b/tests/mkdir/p-v.sh @@ -0,0 +1,32 @@ +#!/bin/sh +# Test mkdir -pv. + +# Copyright (C) 2006-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ mkdir + +mkdir -pv foo/a/b/c/d >out || fail=1 + +compare - out <<\EOF +mkdir: created directory 'foo' +mkdir: created directory 'foo/a' +mkdir: created directory 'foo/a/b' +mkdir: created directory 'foo/a/b/c' +mkdir: created directory 'foo/a/b/c/d' +EOF + +Exit $fail diff --git a/tests/mkdir/parents b/tests/mkdir/parents deleted file mode 100755 index 0543e675..00000000 --- a/tests/mkdir/parents +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/sh -# make sure mkdir's -p options works properly - -# Copyright (C) 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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ mkdir -skip_if_setgid_ - -mkdir -m 700 e-dir || framework_failure_ - - -# Make sure 'mkdir -p existing-dir' succeeds -# and that 'mkdir existing-dir' fails. -mkdir -p e-dir || fail=1 -mkdir e-dir > /dev/null 2>&1 && fail=1 - -# Create an existing directory. -umask 077 -mode_str=drwxr-x-wx -mode_arg=$(rwx_to_mode_ $mode_str) -mkdir -m $mode_arg a || fail=1 - -# this 'mkdir -p ...' shouldn't change perms of existing dir 'a'. -d_mode_str=drwx-w--wx -d_mode_arg=$(rwx_to_mode_ $d_mode_str) -mkdir -p -m $d_mode_arg a/b/c/d - -# Make sure the permissions of 'a' haven't been changed. -p=$(ls -ld a|cut -b-10); case $p in $mode_str);; *) fail=1;; esac -# 'b's and 'c's should reflect the umask -p=$(ls -ld a/b|cut -b-10); case $p in drwx------);; *) fail=1;; esac -p=$(ls -ld a/b/c|cut -b-10); case $p in drwx------);; *) fail=1;; esac - -# 'd's perms are determined by the -m argument. -p=$(ls -ld a/b/c/d|cut -b-10); case $p in $d_mode_str);; *) fail=1;; esac - -Exit $fail diff --git a/tests/mkdir/parents.sh b/tests/mkdir/parents.sh new file mode 100755 index 00000000..ef6830e7 --- /dev/null +++ b/tests/mkdir/parents.sh @@ -0,0 +1,51 @@ +#!/bin/sh +# make sure mkdir's -p options works properly + +# Copyright (C) 2000-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ mkdir +skip_if_setgid_ + +mkdir -m 700 e-dir || framework_failure_ + + +# Make sure 'mkdir -p existing-dir' succeeds +# and that 'mkdir existing-dir' fails. +mkdir -p e-dir || fail=1 +mkdir e-dir > /dev/null 2>&1 && fail=1 + +# Create an existing directory. +umask 077 +mode_str=drwxr-x-wx +mode_arg=$(rwx_to_mode_ $mode_str) +mkdir -m $mode_arg a || fail=1 + +# this 'mkdir -p ...' shouldn't change perms of existing dir 'a'. +d_mode_str=drwx-w--wx +d_mode_arg=$(rwx_to_mode_ $d_mode_str) +mkdir -p -m $d_mode_arg a/b/c/d + +# Make sure the permissions of 'a' haven't been changed. +p=$(ls -ld a|cut -b-10); case $p in $mode_str);; *) fail=1;; esac +# 'b's and 'c's should reflect the umask +p=$(ls -ld a/b|cut -b-10); case $p in drwx------);; *) fail=1;; esac +p=$(ls -ld a/b/c|cut -b-10); case $p in drwx------);; *) fail=1;; esac + +# 'd's perms are determined by the -m argument. +p=$(ls -ld a/b/c/d|cut -b-10); case $p in $d_mode_str);; *) fail=1;; esac + +Exit $fail diff --git a/tests/mkdir/perm b/tests/mkdir/perm deleted file mode 100755 index f9b207f8..00000000 --- a/tests/mkdir/perm +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/sh -# Verify that mkdir's '-m MODE' option works properly -# with various umask settings. - -# Copyright (C) 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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ mkdir -skip_if_setgid_ - -working_umask_or_skip_ - - -# parent parent/dir -# umask -m option resulting perm resulting perm -tests=' - 000 : empty : drwxrwxrwx : drwxrwxrwx : - 000 : -m 016 : drwxrwxrwx : d-----xrw- : - 077 : empty : drwx------ : drwx------ : - 050 : empty : drwx-w-rwx : drwx-w-rwx : - 050 : -m 312 : drwx-w-rwx : d-wx--x-w- : - 160 : empty : drwx--xrwx : drw---xrwx : - 160 : -m 743 : drwx--xrwx : drwxr---wx : - 027 : -m =+x : drwxr-x--- : d--x--x--- : - 027 : -m =+X : drwxr-x--- : d--x--x--- : - - : - : last : last : - ' -colon_tests=$(echo $tests | sed 's/^ *//; s/ *: */:/g') - -for p in empty -p; do - test _$p = _empty && p= - - old_IFS=$IFS - IFS=':' - set $colon_tests - IFS=$old_IFS - - while :; do - test "$VERBOSE" = yes && set -x - umask=$1 mode=$2 parent_perms=$3 sub_perms=$4 - test "_$mode" = _empty && mode= - test $sub_perms = last && break - # echo p=$p umask=$1 mode=$2 parent_perms=$3 sub_perms=$4 - shift; shift; shift; shift - umask $umask - - # If we're not using -p, then create the parent manually, - # and adjust expectations accordingly. - test x$p = x && \ - { - mkdir -m =,u=rwx parent || fail=1 - parent_perms=drwx------ - } - - mkdir $p $mode parent/sub || fail=1 - - perms=$(stat --printf %A parent) - test "$parent_perms" = "$perms" \ - || { fail=1; echo parent: expected $parent_perms, got $perms; } - - perms=$(stat --printf %A parent/sub) - test "$sub_perms" = "$perms" \ - || { fail=1; echo parent/sub: expected $sub_perms, got $perms; } - - chmod -R u+rwx parent - rm -rf parent || fail=1 - done -done - -Exit $fail diff --git a/tests/mkdir/perm.sh b/tests/mkdir/perm.sh new file mode 100755 index 00000000..671f0049 --- /dev/null +++ b/tests/mkdir/perm.sh @@ -0,0 +1,83 @@ +#!/bin/sh +# Verify that mkdir's '-m MODE' option works properly +# with various umask settings. + +# Copyright (C) 2000-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ mkdir +skip_if_setgid_ + +working_umask_or_skip_ + + +# parent parent/dir +# umask -m option resulting perm resulting perm +tests=' + 000 : empty : drwxrwxrwx : drwxrwxrwx : + 000 : -m 016 : drwxrwxrwx : d-----xrw- : + 077 : empty : drwx------ : drwx------ : + 050 : empty : drwx-w-rwx : drwx-w-rwx : + 050 : -m 312 : drwx-w-rwx : d-wx--x-w- : + 160 : empty : drwx--xrwx : drw---xrwx : + 160 : -m 743 : drwx--xrwx : drwxr---wx : + 027 : -m =+x : drwxr-x--- : d--x--x--- : + 027 : -m =+X : drwxr-x--- : d--x--x--- : + - : - : last : last : + ' +colon_tests=$(echo $tests | sed 's/^ *//; s/ *: */:/g') + +for p in empty -p; do + test _$p = _empty && p= + + old_IFS=$IFS + IFS=':' + set $colon_tests + IFS=$old_IFS + + while :; do + test "$VERBOSE" = yes && set -x + umask=$1 mode=$2 parent_perms=$3 sub_perms=$4 + test "_$mode" = _empty && mode= + test $sub_perms = last && break + # echo p=$p umask=$1 mode=$2 parent_perms=$3 sub_perms=$4 + shift; shift; shift; shift + umask $umask + + # If we're not using -p, then create the parent manually, + # and adjust expectations accordingly. + test x$p = x && \ + { + mkdir -m =,u=rwx parent || fail=1 + parent_perms=drwx------ + } + + mkdir $p $mode parent/sub || fail=1 + + perms=$(stat --printf %A parent) + test "$parent_perms" = "$perms" \ + || { fail=1; echo parent: expected $parent_perms, got $perms; } + + perms=$(stat --printf %A parent/sub) + test "$sub_perms" = "$perms" \ + || { fail=1; echo parent/sub: expected $sub_perms, got $perms; } + + chmod -R u+rwx parent + rm -rf parent || fail=1 + done +done + +Exit $fail diff --git a/tests/mkdir/selinux b/tests/mkdir/selinux deleted file mode 100755 index 76323625..00000000 --- a/tests/mkdir/selinux +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh -# ensure that an invalid context doesn't cause a segfault - -# Copyright (C) 2008-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ mkdir mkfifo mknod - -# Note: on an SELinux/enforcing system running mcstransd older than -# mcstrans-0.2.8-1.fc9, the following commands may mistakenly exit -# successfully, in spite of the invalid context string. -require_selinux_enforcing_ - -c=invalid-selinux-context -msg="failed to set default file creation context to '$c':" - -# Test each of mkdir, mknod, mkfifo with "-Z invalid-context". - -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 - set $cmd_w_arg; cmd=$1 - echo "$cmd: $msg" > exp || fail=1 - - # Some systems fail with ENOTSUP, EINVAL, ENOENT, or even - # "Unknown system error", or "Function not implemented". - # For AIX 5.3: "Unsupported attribute value" - # For HP-UX 11.23: Unknown error (252) - sed \ - -e 's/ Not supported$//' \ - -e 's/ Invalid argument$//' \ - -e 's/ Unknown system error$//' \ - -e 's/ Operation not supported$//' \ - -e 's/ Function not implemented$//' \ - -e 's/ Unsupported attribute value$//' \ - -e 's/ Unknown error .*$//' \ - -e 's/ No such file or directory$//' out > k || fail=1 - mv k out || fail=1 - compare exp out || fail=1 -done - -Exit $fail diff --git a/tests/mkdir/selinux.sh b/tests/mkdir/selinux.sh new file mode 100755 index 00000000..e68f77b8 --- /dev/null +++ b/tests/mkdir/selinux.sh @@ -0,0 +1,56 @@ +#!/bin/sh +# ensure that an invalid context doesn't cause a segfault + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ mkdir mkfifo mknod + +# Note: on an SELinux/enforcing system running mcstransd older than +# mcstrans-0.2.8-1.fc9, the following commands may mistakenly exit +# successfully, in spite of the invalid context string. +require_selinux_enforcing_ + +c=invalid-selinux-context +msg="failed to set default file creation context to '$c':" + +# Test each of mkdir, mknod, mkfifo with "-Z invalid-context". + +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 + set $cmd_w_arg; cmd=$1 + echo "$cmd: $msg" > exp || fail=1 + + # Some systems fail with ENOTSUP, EINVAL, ENOENT, or even + # "Unknown system error", or "Function not implemented". + # For AIX 5.3: "Unsupported attribute value" + # For HP-UX 11.23: Unknown error (252) + sed \ + -e 's/ Not supported$//' \ + -e 's/ Invalid argument$//' \ + -e 's/ Unknown system error$//' \ + -e 's/ Operation not supported$//' \ + -e 's/ Function not implemented$//' \ + -e 's/ Unsupported attribute value$//' \ + -e 's/ Unknown error .*$//' \ + -e 's/ No such file or directory$//' out > k || fail=1 + mv k out || fail=1 + compare exp out || fail=1 +done + +Exit $fail diff --git a/tests/mkdir/special-1 b/tests/mkdir/special-1 deleted file mode 100755 index d478930e..00000000 --- a/tests/mkdir/special-1 +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/sh -# verify that mkdir honors special bits in MODE - -# Copyright (C) 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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ mkdir - -set_mode_string=u=rwx,g=rx,o=w,-s,+t -output_mode_string=drwxr-x-wT - -tmp=t -mkdir -m$set_mode_string $tmp || fail=1 - -test -d $tmp || fail=1 -mode=$(ls -ld $tmp|cut -b-10) -case "$mode" in - $output_mode_string) ;; - *) fail=1 ;; -esac - -rmdir $tmp || fail=1 -tmp2=$tmp/sub - -# This should fail. -mkdir -m$set_mode_string $tmp2 2> /dev/null && fail=1 - -# Now test the --parents option. -mkdir --parents -m$set_mode_string $tmp2 || fail=1 - -test -d $tmp2 || fail=1 -mode=$(ls -ld $tmp2|cut -b-10) -case "$mode" in - $output_mode_string) ;; - *) fail=1 ;; -esac - -Exit $fail diff --git a/tests/mkdir/special-1.sh b/tests/mkdir/special-1.sh new file mode 100755 index 00000000..5557e39d --- /dev/null +++ b/tests/mkdir/special-1.sh @@ -0,0 +1,51 @@ +#!/bin/sh +# verify that mkdir honors special bits in MODE + +# Copyright (C) 2000-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ mkdir + +set_mode_string=u=rwx,g=rx,o=w,-s,+t +output_mode_string=drwxr-x-wT + +tmp=t +mkdir -m$set_mode_string $tmp || fail=1 + +test -d $tmp || fail=1 +mode=$(ls -ld $tmp|cut -b-10) +case "$mode" in + $output_mode_string) ;; + *) fail=1 ;; +esac + +rmdir $tmp || fail=1 +tmp2=$tmp/sub + +# This should fail. +mkdir -m$set_mode_string $tmp2 2> /dev/null && fail=1 + +# Now test the --parents option. +mkdir --parents -m$set_mode_string $tmp2 || fail=1 + +test -d $tmp2 || fail=1 +mode=$(ls -ld $tmp2|cut -b-10) +case "$mode" in + $output_mode_string) ;; + *) fail=1 ;; +esac + +Exit $fail diff --git a/tests/mkdir/t-slash b/tests/mkdir/t-slash deleted file mode 100755 index 7b3c1ba3..00000000 --- a/tests/mkdir/t-slash +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# Ensure that mkdir works with arguments specified with and without -# a trailing slash. - -# Copyright (C) 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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ mkdir - - -mkdir -p dir/ || fail=1 -test -d dir || fail=1 - -# This failed on NetBSD for fileutils-4.0.33. -mkdir d2/ || fail=1 -test -d d2 || fail=1 - -Exit $fail diff --git a/tests/mkdir/t-slash.sh b/tests/mkdir/t-slash.sh new file mode 100755 index 00000000..15c7d3cc --- /dev/null +++ b/tests/mkdir/t-slash.sh @@ -0,0 +1,31 @@ +#!/bin/sh +# Ensure that mkdir works with arguments specified with and without +# a trailing slash. + +# Copyright (C) 2000-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ mkdir + + +mkdir -p dir/ || fail=1 +test -d dir || fail=1 + +# This failed on NetBSD for fileutils-4.0.33. +mkdir d2/ || fail=1 +test -d d2 || fail=1 + +Exit $fail diff --git a/tests/mkdir/writable-under-readonly b/tests/mkdir/writable-under-readonly deleted file mode 100755 index 93e46d5b..00000000 --- a/tests/mkdir/writable-under-readonly +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh -# FIXME: convert this to a root-only test. - -# Copyright (C) 2005-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 -# 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/>. - -# Test for the 2005-10-13 patch to lib/mkdir-p.c that fixed this sort -# of bug in mkdir: -# -# "mkdir -p /a/b/c" no longer fails merely because a leading prefix -# directory (e.g., /a or /a/b) exists on a read-only file system. -# -# Demonstrate the problem, as root: - -. "${srcdir=.}/init.sh"; path_prepend_ ../src -print_ver_ mkdir -require_root_ - -# FIXME: for now, skip it unconditionally -skip_ temporarily disabled - -# FIXME: define cleanup_ to do the umount - -# FIXME: use mktemp -cd /tmp \ - && dd if=/dev/zero of=1 bs=8192 count=50 \ - && dd if=/dev/zero of=2 bs=8192 count=50 \ - && mkdir -p mnt-ro && mkfs -t ext2 1 && mkfs -t ext2 2 \ - && mount -o loop=/dev/loop3 1 mnt-ro \ - && mkdir -p mnt-ro/rw \ - && mount -o remount,ro mnt-ro \ - && mount -o loop=/dev/loop4 2 mnt-ro/rw - -mkdir -p mnt-ro/rw/sub || fail=1 - -# To clean up -umount /tmp/2 -umount /tmp/1 - -Exit $fail diff --git a/tests/mkdir/writable-under-readonly.sh b/tests/mkdir/writable-under-readonly.sh new file mode 100755 index 00000000..ab467238 --- /dev/null +++ b/tests/mkdir/writable-under-readonly.sh @@ -0,0 +1,52 @@ +#!/bin/sh +# FIXME: convert this to a root-only test. + +# Copyright (C) 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 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/>. + +# Test for the 2005-10-13 patch to lib/mkdir-p.c that fixed this sort +# of bug in mkdir: +# +# "mkdir -p /a/b/c" no longer fails merely because a leading prefix +# directory (e.g., /a or /a/b) exists on a read-only file system. +# +# Demonstrate the problem, as root: + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ mkdir +require_root_ + +# FIXME: for now, skip it unconditionally +skip_ temporarily disabled + +# FIXME: define cleanup_ to do the umount + +# FIXME: use mktemp +cd /tmp \ + && dd if=/dev/zero of=1 bs=8192 count=50 \ + && dd if=/dev/zero of=2 bs=8192 count=50 \ + && mkdir -p mnt-ro && mkfs -t ext2 1 && mkfs -t ext2 2 \ + && mount -o loop=/dev/loop3 1 mnt-ro \ + && mkdir -p mnt-ro/rw \ + && mount -o remount,ro mnt-ro \ + && mount -o loop=/dev/loop4 2 mnt-ro/rw + +mkdir -p mnt-ro/rw/sub || fail=1 + +# To clean up +umount /tmp/2 +umount /tmp/1 + +Exit $fail diff --git a/tests/mv/acl b/tests/mv/acl deleted file mode 100755 index 2354ed96..00000000 --- a/tests/mv/acl +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/sh -# move files/directories across file system boundaries -# and make sure acls are preserved - -# Copyright (C) 2005-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ mv getfacl setfacl - -require_acl_ - -# Skip this test if cp was built without ACL support: -grep '^#define USE_ACL 1' $CONFIG_HEADER > /dev/null || - skip_ "insufficient ACL support" - -cleanup_() { rm -rf "$other_partition_tmpdir"; } -. "$abs_srcdir/other-fs-tmpdir" - -touch file || framework_failure_ -t1=$other_partition_tmpdir/t1 -touch $t1 || framework_failure_ - -skip_partition=none -# Ensure that setfacl and getfacl work on this file system. -setfacl -m user:bin:rw- file 2> /dev/null || skip_partition=. -# And on the destination file system. -setfacl -m user:bin:rw- $t1 || skip_partition=$other_partition_tmpdir -acl1=$(getfacl file) || skip_partition=. - -test $skip_partition != none && - skip_ "'$skip_partition' is not on a suitable file system for this test" - -# move the access acl of a file -mv file "$other_partition_tmpdir" || fail=1 -acl2=$(cd "$other_partition_tmpdir" && getfacl file) || framework_failure_ -test "$acl1" = "$acl2" || fail=1 - -# move the access acl of a directory -mkdir dir || framework_failure_ -setfacl -m user:bin:rw- dir || framework_failure_ -acl1=$(getfacl dir) || framework_failure_ -mv dir "$other_partition_tmpdir" || fail=1 -acl2=$(cd "$other_partition_tmpdir" && getfacl dir) || framework_failure_ -test "$acl1" = "$acl2" || fail=1 - -# move the default acl of a directory -mkdir dir2 || framework_failure_ -setfacl -d -m user:bin:rw- dir2 || framework_failure_ -acl1=$(getfacl dir2) || framework_failure_ -mv dir2 "$other_partition_tmpdir" || fail=1 -acl2=$(cd "$other_partition_tmpdir" && getfacl dir2) || framework_failure_ -test "$acl1" = "$acl2" || fail=1 - -Exit $fail diff --git a/tests/mv/acl.sh b/tests/mv/acl.sh new file mode 100755 index 00000000..97f5b048 --- /dev/null +++ b/tests/mv/acl.sh @@ -0,0 +1,67 @@ +#!/bin/sh +# move files/directories across file system boundaries +# and make sure acls are preserved + +# Copyright (C) 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 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_ mv getfacl setfacl + +require_acl_ + +# Skip this test if cp was built without ACL support: +grep '^#define USE_ACL 1' $CONFIG_HEADER > /dev/null || + skip_ "insufficient ACL support" + +cleanup_() { rm -rf "$other_partition_tmpdir"; } +. "$abs_srcdir/tests/other-fs-tmpdir" + +touch file || framework_failure_ +t1=$other_partition_tmpdir/t1 +touch $t1 || framework_failure_ + +skip_partition=none +# Ensure that setfacl and getfacl work on this file system. +setfacl -m user:bin:rw- file 2> /dev/null || skip_partition=. +# And on the destination file system. +setfacl -m user:bin:rw- $t1 || skip_partition=$other_partition_tmpdir +acl1=$(getfacl file) || skip_partition=. + +test $skip_partition != none && + skip_ "'$skip_partition' is not on a suitable file system for this test" + +# move the access acl of a file +mv file "$other_partition_tmpdir" || fail=1 +acl2=$(cd "$other_partition_tmpdir" && getfacl file) || framework_failure_ +test "$acl1" = "$acl2" || fail=1 + +# move the access acl of a directory +mkdir dir || framework_failure_ +setfacl -m user:bin:rw- dir || framework_failure_ +acl1=$(getfacl dir) || framework_failure_ +mv dir "$other_partition_tmpdir" || fail=1 +acl2=$(cd "$other_partition_tmpdir" && getfacl dir) || framework_failure_ +test "$acl1" = "$acl2" || fail=1 + +# move the default acl of a directory +mkdir dir2 || framework_failure_ +setfacl -d -m user:bin:rw- dir2 || framework_failure_ +acl1=$(getfacl dir2) || framework_failure_ +mv dir2 "$other_partition_tmpdir" || fail=1 +acl2=$(cd "$other_partition_tmpdir" && getfacl dir2) || framework_failure_ +test "$acl1" = "$acl2" || fail=1 + +Exit $fail diff --git a/tests/mv/atomic b/tests/mv/atomic deleted file mode 100755 index e5391c33..00000000 --- a/tests/mv/atomic +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh -# ensure that mv doesn't first unlink its destination in one particular case - -# Copyright (C) 2006-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ mv -require_strace_ unlink - -# Before the fix, mv would unnecessarily unlink the destination symlink: -# $ rm -rf s[12]; ln -s / s1; ln -s /tmp s2 -# $ strace -qe unlink /bin/mv -T s1 s2 -# unlink("s2") = 0 -# -# With the fix, it doesn't call unlink: -# $ rm -rf s[12]; ln -s / s1; ln -s /tmp s2 -# $ strace -qe unlink ./mv -T s1 s2 -# $ - -ln -s t1 s1 || framework_failure_ -ln -s t2 s2 || framework_failure_ - - -strace -qe unlink mv -T s1 s2 > out 2>&1 || fail=1 -$EGREP 'unlink.*"s1"' out && fail=1 - -# Ensure that the source, s1, is gone. -ls -dl s1 > /dev/null 2>&1 && fail=1 - -# Ensure that the destination, s2, contains the link from s1. -test "$(readlink s2)" = t1 || fail=1 - -Exit $fail diff --git a/tests/mv/atomic.sh b/tests/mv/atomic.sh new file mode 100755 index 00000000..0c5393ec --- /dev/null +++ b/tests/mv/atomic.sh @@ -0,0 +1,46 @@ +#!/bin/sh +# ensure that mv doesn't first unlink its destination in one particular case + +# Copyright (C) 2006-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ mv +require_strace_ unlink + +# Before the fix, mv would unnecessarily unlink the destination symlink: +# $ rm -rf s[12]; ln -s / s1; ln -s /tmp s2 +# $ strace -qe unlink /bin/mv -T s1 s2 +# unlink("s2") = 0 +# +# With the fix, it doesn't call unlink: +# $ rm -rf s[12]; ln -s / s1; ln -s /tmp s2 +# $ strace -qe unlink ./mv -T s1 s2 +# $ + +ln -s t1 s1 || framework_failure_ +ln -s t2 s2 || framework_failure_ + + +strace -qe unlink mv -T s1 s2 > out 2>&1 || fail=1 +$EGREP 'unlink.*"s1"' out && fail=1 + +# Ensure that the source, s1, is gone. +ls -dl s1 > /dev/null 2>&1 && fail=1 + +# Ensure that the destination, s2, contains the link from s1. +test "$(readlink s2)" = t1 || fail=1 + +Exit $fail diff --git a/tests/mv/atomic2 b/tests/mv/atomic2 deleted file mode 100755 index d9c55e2c..00000000 --- a/tests/mv/atomic2 +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh -# ensure that mv doesn't first unlink a multi-hard-linked destination - -# Copyright (C) 2008-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ mv -require_strace_ unlink - -# Before the fix, mv would unnecessarily unlink the destination symlink: -# $ rm -f a b b2; touch a b; ln b b2; strace -e unlink /p/bin/mv a b -# unlink("b") = 0 -# -# With the fix, it doesn't call unlink: -# $ rm -f a b b2; touch a b; ln b b2; strace -e unlink ./mv a b -# $ - -touch a b || framework_failure_ -ln b b2 || framework_failure_ - - -strace -qe unlink mv a b > out 2>&1 || fail=1 -$EGREP 'unlink.*"b"' out && fail=1 - -# Ensure that the source, "a", is gone. -ls -dl a > /dev/null 2>&1 && fail=1 - -# Ensure that the destination, "b", has link count 1. -n_links=$(stat --printf=%h b) || fail=1 -test "$n_links" = 1 || fail=1 - -Exit $fail diff --git a/tests/mv/atomic2.sh b/tests/mv/atomic2.sh new file mode 100755 index 00000000..a98a6518 --- /dev/null +++ b/tests/mv/atomic2.sh @@ -0,0 +1,45 @@ +#!/bin/sh +# ensure that mv doesn't first unlink a multi-hard-linked destination + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ mv +require_strace_ unlink + +# Before the fix, mv would unnecessarily unlink the destination symlink: +# $ rm -f a b b2; touch a b; ln b b2; strace -e unlink /p/bin/mv a b +# unlink("b") = 0 +# +# With the fix, it doesn't call unlink: +# $ rm -f a b b2; touch a b; ln b b2; strace -e unlink ./mv a b +# $ + +touch a b || framework_failure_ +ln b b2 || framework_failure_ + + +strace -qe unlink mv a b > out 2>&1 || fail=1 +$EGREP 'unlink.*"b"' out && fail=1 + +# Ensure that the source, "a", is gone. +ls -dl a > /dev/null 2>&1 && fail=1 + +# Ensure that the destination, "b", has link count 1. +n_links=$(stat --printf=%h b) || fail=1 +test "$n_links" = 1 || fail=1 + +Exit $fail diff --git a/tests/mv/backup-dir b/tests/mv/backup-dir deleted file mode 100755 index 40f2c756..00000000 --- a/tests/mv/backup-dir +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# Ensure "mv --verbose --backup" works the same for dirs and non-dirs. - -# Copyright (C) 2006-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ mv - -mkdir A B || framework_failure_ -touch X Y || framework_failure_ - - -# Before coreutils-6.2, the " (backup: 'B.~1~')" suffix was not printed. -mv --verbose --backup=numbered -T A B > out || fail=1 -cat <<\EOF > exp || fail=1 -'A' -> 'B' (backup: 'B.~1~') -EOF - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/mv/backup-dir.sh b/tests/mv/backup-dir.sh new file mode 100755 index 00000000..f76f3386 --- /dev/null +++ b/tests/mv/backup-dir.sh @@ -0,0 +1,34 @@ +#!/bin/sh +# Ensure "mv --verbose --backup" works the same for dirs and non-dirs. + +# Copyright (C) 2006-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ mv + +mkdir A B || framework_failure_ +touch X Y || framework_failure_ + + +# Before coreutils-6.2, the " (backup: 'B.~1~')" suffix was not printed. +mv --verbose --backup=numbered -T A B > out || fail=1 +cat <<\EOF > exp || fail=1 +'A' -> 'B' (backup: 'B.~1~') +EOF + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/mv/backup-is-src b/tests/mv/backup-is-src deleted file mode 100755 index e1383a14..00000000 --- a/tests/mv/backup-is-src +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh -# Force mv to use the copying code. - -# Copyright (C) 1998-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ mv -cleanup_() { rm -rf "$other_partition_tmpdir"; } -. "$abs_srcdir/other-fs-tmpdir" - -a="$other_partition_tmpdir/a" -a2="$other_partition_tmpdir/a~" - -rm -f "$a" "$a2" || framework_failure_ -echo a > "$a" || framework_failure_ -echo a2 > "$a2" || framework_failure_ - -# This mv command should exit nonzero. -mv --b=simple "$a2" "$a" > out 2>&1 && fail=1 - -sed \ - -e "s,mv:,XXX:," \ - -e "s,$a,YYY," \ - -e "s,$a2,ZZZ," \ - out > out2 - -cat > exp <<\EOF -XXX: backing up 'YYY' would destroy source; 'ZZZ' not moved -EOF - -compare exp out2 || fail=1 - -Exit $fail diff --git a/tests/mv/backup-is-src.sh b/tests/mv/backup-is-src.sh new file mode 100755 index 00000000..a0d7a917 --- /dev/null +++ b/tests/mv/backup-is-src.sh @@ -0,0 +1,46 @@ +#!/bin/sh +# Force mv to use the copying code. + +# Copyright (C) 1998-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ mv +cleanup_() { rm -rf "$other_partition_tmpdir"; } +. "$abs_srcdir/tests/other-fs-tmpdir" + +a="$other_partition_tmpdir/a" +a2="$other_partition_tmpdir/a~" + +rm -f "$a" "$a2" || framework_failure_ +echo a > "$a" || framework_failure_ +echo a2 > "$a2" || framework_failure_ + +# This mv command should exit nonzero. +mv --b=simple "$a2" "$a" > out 2>&1 && fail=1 + +sed \ + -e "s,mv:,XXX:," \ + -e "s,$a,YYY," \ + -e "s,$a2,ZZZ," \ + out > out2 + +cat > exp <<\EOF +XXX: backing up 'YYY' would destroy source; 'ZZZ' not moved +EOF + +compare exp out2 || fail=1 + +Exit $fail diff --git a/tests/mv/childproof b/tests/mv/childproof deleted file mode 100755 index efe7225d..00000000 --- a/tests/mv/childproof +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/sh -# Ensure that cp/mv/ln don't clobber a just-copied/moved/linked file. -# 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-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp mv ln - -skip_if_root_ - -mkdir a b c || framework_failure_ -echo a > a/f || framework_failure_ -echo b > b/f || framework_failure_ - - -cp a/f b/f c 2> /dev/null && fail=1 -test -f a/f || fail=1 -test -f b/f || fail=1 -test -f c/f || fail=1 -test "$(cat c/f)" = a || fail=1 -rm -f c/f - -# With --backup=numbered, it should succeed -cp --backup=numbered a/f b/f c || fail=1 -test -f a/f || fail=1 -test -f b/f || fail=1 -test -f c/f || fail=1 -test -f c/f.~1~ || fail=1 -rm -f c/f* - -mv a/f b/f c 2> /dev/null && fail=1 -test -f a/f && fail=1 -test -f b/f || fail=1 -test -f c/f || fail=1 -test "$(cat c/f)" = a || fail=1 - -# Make sure mv still works when moving hard links. -# This is where the same_file test is necessary, and why -# we save file names in addition to dev/ino. -rm -f c/f* b/f -touch a/f -ln a/f b/g -mv a/f b/g c || fail=1 -test -f a/f && fail=1 -test -f b/g && fail=1 -test -f c/f || fail=1 -test -f c/g || fail=1 - -touch a/f b/f b/g -mv a/f b/f b/g c 2> /dev/null && fail=1 -test -f a/f && fail=1 # a/f should have been moved -test -f b/f || fail=1 # b/f should remain -test -f b/g && fail=1 # b/g should have been moved -test -f c/f || fail=1 -test -f c/g || fail=1 - -# Test ln -f. - -rm -f a/f b/f c/f -echo a > a/f || fail=1 -echo b > b/f || fail=1 -ln -f a/f b/f c 2> /dev/null && fail=1 -# a/f and c/f must be linked -test $(stat --format %i a/f) = $(stat --format %i c/f) || fail=1 -# b/f and c/f must not be linked -test $(stat --format %i b/f) = $(stat --format %i c/f) && fail=1 - -Exit $fail diff --git a/tests/mv/childproof.sh b/tests/mv/childproof.sh new file mode 100755 index 00000000..4f14aa2e --- /dev/null +++ b/tests/mv/childproof.sh @@ -0,0 +1,83 @@ +#!/bin/sh +# Ensure that cp/mv/ln don't clobber a just-copied/moved/linked file. +# 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. + +# This 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 mv ln + +skip_if_root_ + +mkdir a b c || framework_failure_ +echo a > a/f || framework_failure_ +echo b > b/f || framework_failure_ + + +cp a/f b/f c 2> /dev/null && fail=1 +test -f a/f || fail=1 +test -f b/f || fail=1 +test -f c/f || fail=1 +test "$(cat c/f)" = a || fail=1 +rm -f c/f + +# With --backup=numbered, it should succeed +cp --backup=numbered a/f b/f c || fail=1 +test -f a/f || fail=1 +test -f b/f || fail=1 +test -f c/f || fail=1 +test -f c/f.~1~ || fail=1 +rm -f c/f* + +mv a/f b/f c 2> /dev/null && fail=1 +test -f a/f && fail=1 +test -f b/f || fail=1 +test -f c/f || fail=1 +test "$(cat c/f)" = a || fail=1 + +# Make sure mv still works when moving hard links. +# This is where the same_file test is necessary, and why +# we save file names in addition to dev/ino. +rm -f c/f* b/f +touch a/f +ln a/f b/g +mv a/f b/g c || fail=1 +test -f a/f && fail=1 +test -f b/g && fail=1 +test -f c/f || fail=1 +test -f c/g || fail=1 + +touch a/f b/f b/g +mv a/f b/f b/g c 2> /dev/null && fail=1 +test -f a/f && fail=1 # a/f should have been moved +test -f b/f || fail=1 # b/f should remain +test -f b/g && fail=1 # b/g should have been moved +test -f c/f || fail=1 +test -f c/g || fail=1 + +# Test ln -f. + +rm -f a/f b/f c/f +echo a > a/f || fail=1 +echo b > b/f || fail=1 +ln -f a/f b/f c 2> /dev/null && fail=1 +# a/f and c/f must be linked +test $(stat --format %i a/f) = $(stat --format %i c/f) || fail=1 +# b/f and c/f must not be linked +test $(stat --format %i b/f) = $(stat --format %i c/f) && fail=1 + +Exit $fail diff --git a/tests/mv/diag b/tests/mv/diag deleted file mode 100755 index d7c28703..00000000 --- a/tests/mv/diag +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh -# make sure we get proper diagnostics: e.g., with --target-dir=d but no args - -# Copyright (C) 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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ mv - -touch f1 || framework_failure_ -touch f2 || framework_failure_ -touch d || framework_failure_ - -# These mv commands should all exit nonzero. - -# Too few args. This first one did fail, but with an incorrect diagnostic -# until fileutils-4.0u. -mv --target=. >> out 2>&1 && fail=1 -mv no-file >> out 2>&1 && fail=1 - -# Target is not a directory. -mv f1 f2 f1 >> out 2>&1 && fail=1 -mv --target=f2 f1 >> out 2>&1 && fail=1 - -cat > exp <<\EOF -mv: missing file operand -Try 'mv --help' for more information. -mv: missing destination file operand after 'no-file' -Try 'mv --help' for more information. -mv: target 'f1' is not a directory -mv: target 'f2' is not a directory -EOF - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/mv/diag.sh b/tests/mv/diag.sh new file mode 100755 index 00000000..ecac8529 --- /dev/null +++ b/tests/mv/diag.sh @@ -0,0 +1,48 @@ +#!/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. + +# This 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_ mv + +touch f1 || framework_failure_ +touch f2 || framework_failure_ +touch d || framework_failure_ + +# These mv commands should all exit nonzero. + +# Too few args. This first one did fail, but with an incorrect diagnostic +# until fileutils-4.0u. +mv --target=. >> out 2>&1 && fail=1 +mv no-file >> out 2>&1 && fail=1 + +# Target is not a directory. +mv f1 f2 f1 >> out 2>&1 && fail=1 +mv --target=f2 f1 >> out 2>&1 && fail=1 + +cat > exp <<\EOF +mv: missing file operand +Try 'mv --help' for more information. +mv: missing destination file operand after 'no-file' +Try 'mv --help' for more information. +mv: target 'f1' is not a directory +mv: target 'f2' is not a directory +EOF + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/mv/dir-file b/tests/mv/dir-file deleted file mode 100755 index fb1a5942..00000000 --- a/tests/mv/dir-file +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# mv must fail when src and dest are mismatched directory/non-directory. - -# Copyright (C) 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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ mv - -mkdir -p dir/file || framework_failure_ -> file || framework_failure_ - - -# These should both fail, but until fileutils-4.0q only the second one did. -mv dir file > /dev/null 2>&1 && fail=1 -mv file dir > /dev/null 2>&1 && fail=1 - -Exit $fail diff --git a/tests/mv/dir-file.sh b/tests/mv/dir-file.sh new file mode 100755 index 00000000..6f655752 --- /dev/null +++ b/tests/mv/dir-file.sh @@ -0,0 +1,30 @@ +#!/bin/sh +# mv must fail when src and dest are mismatched directory/non-directory. + +# Copyright (C) 2000-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ mv + +mkdir -p dir/file || framework_failure_ +> file || framework_failure_ + + +# These should both fail, but until fileutils-4.0q only the second one did. +mv dir file > /dev/null 2>&1 && fail=1 +mv file dir > /dev/null 2>&1 && fail=1 + +Exit $fail diff --git a/tests/mv/dir2dir b/tests/mv/dir2dir deleted file mode 100755 index 4322fd23..00000000 --- a/tests/mv/dir2dir +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh -# Ensure that mv prints the right diagnostic for a dir->dir move -# where the destination directory is not empty. - -# Copyright (C) 2006-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ mv - -mkdir -p a/t b/t || framework_failure_ -touch a/t/f || framework_failure_ - - -# Expect this to fail with the expected diagnostic. -# For an interim (pre-6.0) release, it would give an erroneous -# diagnostic about moving one directory to a subdirectory of itself. -mv b/t a 2> out && fail=1 - -# Accept any of these: EEXIST, ENOTEMPTY, EBUSY. -sed 's/: File exists/: Directory not empty/'<out>o1;mv o1 out -sed 's/: Device or resource busy/: Directory not empty/'<out>o1;mv o1 out - -cat <<\EOF > exp || fail=1 -mv: cannot move 'b/t' to 'a/t': Directory not empty -EOF - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/mv/dir2dir.sh b/tests/mv/dir2dir.sh new file mode 100755 index 00000000..17c5b33e --- /dev/null +++ b/tests/mv/dir2dir.sh @@ -0,0 +1,42 @@ +#!/bin/sh +# 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. + +# This 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_ mv + +mkdir -p a/t b/t || framework_failure_ +touch a/t/f || framework_failure_ + + +# Expect this to fail with the expected diagnostic. +# For an interim (pre-6.0) release, it would give an erroneous +# diagnostic about moving one directory to a subdirectory of itself. +mv b/t a 2> out && fail=1 + +# Accept any of these: EEXIST, ENOTEMPTY, EBUSY. +sed 's/: File exists/: Directory not empty/'<out>o1;mv o1 out +sed 's/: Device or resource busy/: Directory not empty/'<out>o1;mv o1 out + +cat <<\EOF > exp || fail=1 +mv: cannot move 'b/t' to 'a/t': Directory not empty +EOF + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/mv/dup-source b/tests/mv/dup-source deleted file mode 100755 index ea88a046..00000000 --- a/tests/mv/dup-source +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/sh -# Ensure that cp merely warns when a non-directory source file is -# listed on the command line more than once. fileutils-4.1.1 -# made this fail: cp a a d/ -# Ensure that mv fails with a similar command. - -# Copyright (C) 2001-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp mv - -skip_if_root_ - -for i in cp; do - - # cp may not fail in this case. - - rm -fr a d; touch a; mkdir d - $i a a d/ 2> out || fail=1 - rm -fr a d; touch a; mkdir d - $i ./a a d/ 2>> out || fail=1 - - # cp succeeds with --backup=numbered. - rm -fr a d; touch a; mkdir d - $i --backup=numbered a a d/ 2>> out || fail=1 - - # But not with plain '--backup' - rm -fr a d; touch a; mkdir d - $i --backup a a d/ 2>> out && fail=1 - cat <<EOF > exp -$i: warning: source file 'a' specified more than once -$i: warning: source file 'a' specified more than once -$i: will not overwrite just-created 'd/a' with 'a' -EOF - compare exp out || fail=1 -done - -for i in mv; do - # But mv *does* fail in this case (it has to). - - rm -fr a d; touch a; mkdir d - $i a a d/ 2> out && fail=1 - rm -fr a d; touch a; mkdir d - $i ./a a d/ 2>> out && fail=1 - cat <<EOF > exp -$i: cannot stat 'a': No such file or directory -$i: cannot stat 'a': No such file or directory -EOF - compare exp out || fail=1 -done - -Exit $fail diff --git a/tests/mv/dup-source.sh b/tests/mv/dup-source.sh new file mode 100755 index 00000000..76efbb98 --- /dev/null +++ b/tests/mv/dup-source.sh @@ -0,0 +1,65 @@ +#!/bin/sh +# Ensure that cp merely warns when a non-directory source file is +# listed on the command line more than once. fileutils-4.1.1 +# made this fail: cp a a d/ +# Ensure that mv fails with a similar command. + +# Copyright (C) 2001-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp mv + +skip_if_root_ + +for i in cp; do + + # cp may not fail in this case. + + rm -fr a d; touch a; mkdir d + $i a a d/ 2> out || fail=1 + rm -fr a d; touch a; mkdir d + $i ./a a d/ 2>> out || fail=1 + + # cp succeeds with --backup=numbered. + rm -fr a d; touch a; mkdir d + $i --backup=numbered a a d/ 2>> out || fail=1 + + # But not with plain '--backup' + rm -fr a d; touch a; mkdir d + $i --backup a a d/ 2>> out && fail=1 + cat <<EOF > exp +$i: warning: source file 'a' specified more than once +$i: warning: source file 'a' specified more than once +$i: will not overwrite just-created 'd/a' with 'a' +EOF + compare exp out || fail=1 +done + +for i in mv; do + # But mv *does* fail in this case (it has to). + + rm -fr a d; touch a; mkdir d + $i a a d/ 2> out && fail=1 + rm -fr a d; touch a; mkdir d + $i ./a a d/ 2>> out && fail=1 + cat <<EOF > exp +$i: cannot stat 'a': No such file or directory +$i: cannot stat 'a': No such file or directory +EOF + compare exp out || fail=1 +done + +Exit $fail diff --git a/tests/mv/force b/tests/mv/force deleted file mode 100755 index 6bed83bf..00000000 --- a/tests/mv/force +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh -# move a file onto itself - -# Copyright (C) 1999-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ mv - -ff=mvforce -ff2=mvforce2 - -echo force-contents > $ff || framework_failure_ -ln $ff $ff2 || framework_failure_ - -# This mv command should exit nonzero. -mv $ff $ff > out 2>&1 && fail=1 - -cat > exp <<EOF -mv: '$ff' and '$ff' are the same file -EOF - -compare exp out || fail=1 -test $(cat $ff) = force-contents || fail=1 - -# This should succeed, even though the source and destination -# device and inodes are the same. -mv $ff $ff2 || fail=1 - -Exit $fail diff --git a/tests/mv/force.sh b/tests/mv/force.sh new file mode 100755 index 00000000..4b435dd8 --- /dev/null +++ b/tests/mv/force.sh @@ -0,0 +1,42 @@ +#!/bin/sh +# move a file onto itself + +# Copyright (C) 1999-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ mv + +ff=mvforce +ff2=mvforce2 + +echo force-contents > $ff || framework_failure_ +ln $ff $ff2 || framework_failure_ + +# This mv command should exit nonzero. +mv $ff $ff > out 2>&1 && fail=1 + +cat > exp <<EOF +mv: '$ff' and '$ff' are the same file +EOF + +compare exp out || fail=1 +test $(cat $ff) = force-contents || fail=1 + +# This should succeed, even though the source and destination +# device and inodes are the same. +mv $ff $ff2 || fail=1 + +Exit $fail diff --git a/tests/mv/hard-2 b/tests/mv/hard-2 deleted file mode 100755 index e0fc174f..00000000 --- a/tests/mv/hard-2 +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/sh -# Ensure that moving hard-linked arguments onto existing destinations works. -# Likewise when using cp --preserve=link. - -# Copyright (C) 2003-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp mv - -skip_if_root_ - -mkdir dst || framework_failure_ -(cd dst && touch a b c) || framework_failure_ -touch a || framework_failure_ -ln a b || framework_failure_ -ln a c || framework_failure_ - - -# ====================================== -cp --preserve=link a b c dst || fail=1 -# The source files must remain. -test -f a || fail=1 -test -f b || fail=1 -test -f c || fail=1 -cd dst - -# Three destination files must exist. -test -f a || fail=1 -test -f b || fail=1 -test -f c || fail=1 - -# The three i-node numbers must be the same. -ia=$(ls -i a|sed 's/ a//') -ib=$(ls -i b|sed 's/ b//') -ic=$(ls -i c|sed 's/ c//') -test $ia = $ib || fail=1 -test $ia = $ic || fail=1 - -cd .. -rm -f dst/[abc] -(cd dst && touch a b c) - -# ====================================== -mv a b c dst || fail=1 - -# The source files must be gone. -test -f a && fail=1 -test -f b && fail=1 -test -f c && fail=1 -cd dst - -# Three destination files must exist. -test -f a || fail=1 -test -f b || fail=1 -test -f c || fail=1 - -# The three i-node numbers must be the same. -ia=$(ls -i a|sed 's/ a//') -ib=$(ls -i b|sed 's/ b//') -ic=$(ls -i c|sed 's/ c//') -test $ia = $ib || fail=1 -test $ia = $ic || fail=1 - -Exit $fail diff --git a/tests/mv/hard-2.sh b/tests/mv/hard-2.sh new file mode 100755 index 00000000..4fa1d78f --- /dev/null +++ b/tests/mv/hard-2.sh @@ -0,0 +1,77 @@ +#!/bin/sh +# Ensure that moving hard-linked arguments onto existing destinations works. +# Likewise when using cp --preserve=link. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp mv + +skip_if_root_ + +mkdir dst || framework_failure_ +(cd dst && touch a b c) || framework_failure_ +touch a || framework_failure_ +ln a b || framework_failure_ +ln a c || framework_failure_ + + +# ====================================== +cp --preserve=link a b c dst || fail=1 +# The source files must remain. +test -f a || fail=1 +test -f b || fail=1 +test -f c || fail=1 +cd dst + +# Three destination files must exist. +test -f a || fail=1 +test -f b || fail=1 +test -f c || fail=1 + +# The three i-node numbers must be the same. +ia=$(ls -i a|sed 's/ a//') +ib=$(ls -i b|sed 's/ b//') +ic=$(ls -i c|sed 's/ c//') +test $ia = $ib || fail=1 +test $ia = $ic || fail=1 + +cd .. +rm -f dst/[abc] +(cd dst && touch a b c) + +# ====================================== +mv a b c dst || fail=1 + +# The source files must be gone. +test -f a && fail=1 +test -f b && fail=1 +test -f c && fail=1 +cd dst + +# Three destination files must exist. +test -f a || fail=1 +test -f b || fail=1 +test -f c || fail=1 + +# The three i-node numbers must be the same. +ia=$(ls -i a|sed 's/ a//') +ib=$(ls -i b|sed 's/ b//') +ic=$(ls -i c|sed 's/ c//') +test $ia = $ib || fail=1 +test $ia = $ic || fail=1 + +Exit $fail diff --git a/tests/mv/hard-3 b/tests/mv/hard-3 deleted file mode 100755 index a62167a0..00000000 --- a/tests/mv/hard-3 +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/sh -# 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-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 -# 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 bug was fixed in coreutils-4.5.9. -# To exercise this bug is non-trivial: -# Set-up requires at least three hard-linked files. In copying them, -# while preserving links, the initial copy must succeed, the attempt -# to create the second file via 'link' must fail, and the final 'link' -# (to create the third) must succeed. Before the corresponding fix, -# the first and third destination files would not be linked. -# -# Note that this is nominally a test of 'cp', yet it is in the tests/mv -# directory, because it requires use of the --preserve=link option that -# mv enables by default. - -. "${srcdir=.}/init.sh"; path_prepend_ ../src -print_ver_ cp -skip_if_root_ - -mkdir -p x dst/x || framework_failure_ -touch dst/x/b || framework_failure_ -chmod a-w dst/x -touch a || framework_failure_ -ln a x/b || framework_failure_ -ln a c || framework_failure_ - - -# ====================================== -# This must fail -- because x/b cannot be unlinked. -cp --preserve=link --parents a x/b c dst 2> /dev/null && fail=1 - -# Source files must remain. -test -f a || fail=1 -test -f x/b || fail=1 -test -f c || fail=1 -cd dst - -# Three destination files must exist. -test -f a || fail=1 -test -f x/b || fail=1 -test -f c || fail=1 - -# The i-node numbers of a and c must be the same. -ia=$(ls -i a) || fail=1; set x $ia; ia=$2 -ic=$(ls -i c) || fail=1; set x $ic; ic=$2 -test "$ia" = "$ic" || fail=1 - -# The i-node number of x/b must be different. -ib=$(ls -i x/b) || fail=1; set x $ib; ib=$2 -test "$ia" = "$ib" && fail=1 - -Exit $fail diff --git a/tests/mv/hard-3.sh b/tests/mv/hard-3.sh new file mode 100755 index 00000000..c40a7081 --- /dev/null +++ b/tests/mv/hard-3.sh @@ -0,0 +1,69 @@ +#!/bin/sh +# 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. + +# This 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 bug was fixed in coreutils-4.5.9. +# To exercise this bug is non-trivial: +# Set-up requires at least three hard-linked files. In copying them, +# while preserving links, the initial copy must succeed, the attempt +# to create the second file via 'link' must fail, and the final 'link' +# (to create the third) must succeed. Before the corresponding fix, +# the first and third destination files would not be linked. +# +# Note that this is nominally a test of 'cp', yet it is in the tests/mv +# directory, because it requires use of the --preserve=link option that +# mv enables by default. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp +skip_if_root_ + +mkdir -p x dst/x || framework_failure_ +touch dst/x/b || framework_failure_ +chmod a-w dst/x +touch a || framework_failure_ +ln a x/b || framework_failure_ +ln a c || framework_failure_ + + +# ====================================== +# This must fail -- because x/b cannot be unlinked. +cp --preserve=link --parents a x/b c dst 2> /dev/null && fail=1 + +# Source files must remain. +test -f a || fail=1 +test -f x/b || fail=1 +test -f c || fail=1 +cd dst + +# Three destination files must exist. +test -f a || fail=1 +test -f x/b || fail=1 +test -f c || fail=1 + +# The i-node numbers of a and c must be the same. +ia=$(ls -i a) || fail=1; set x $ia; ia=$2 +ic=$(ls -i c) || fail=1; set x $ic; ic=$2 +test "$ia" = "$ic" || fail=1 + +# The i-node number of x/b must be different. +ib=$(ls -i x/b) || fail=1; set x $ib; ib=$2 +test "$ia" = "$ib" && fail=1 + +Exit $fail diff --git a/tests/mv/hard-4 b/tests/mv/hard-4 deleted file mode 100755 index 645ead3c..00000000 --- a/tests/mv/hard-4 +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh -# ensure that mv removes a in this case: touch a; ln a b; mv a b - -# Copyright (C) 2003-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ mv -touch a || framework_failure_ -ln a b || framework_failure_ - - -mv a b || fail=1 - -# In coreutils-5.0 and earlier, a would not be removed. -test -r a && fail=1 -test -r b || fail=1 - -# Make sure it works also with --backup. -ln b a -mv --backup=simple a b || fail=1 -test -r a && fail=1 -test -r b || fail=1 -test -r b~ || fail=1 - -Exit $fail diff --git a/tests/mv/hard-4.sh b/tests/mv/hard-4.sh new file mode 100755 index 00000000..f74b1ec7 --- /dev/null +++ b/tests/mv/hard-4.sh @@ -0,0 +1,38 @@ +#!/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. + +# This 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_ mv +touch a || framework_failure_ +ln a b || framework_failure_ + + +mv a b || fail=1 + +# In coreutils-5.0 and earlier, a would not be removed. +test -r a && fail=1 +test -r b || fail=1 + +# Make sure it works also with --backup. +ln b a +mv --backup=simple a b || fail=1 +test -r a && fail=1 +test -r b || fail=1 +test -r b~ || fail=1 + +Exit $fail diff --git a/tests/mv/hard-link-1 b/tests/mv/hard-link-1 deleted file mode 100755 index 78a555ac..00000000 --- a/tests/mv/hard-link-1 +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh -# move a directory containing hard-linked files and -# make sure the links are preserved - -# Copyright (C) 1998-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ mv -cleanup_() { rm -rf "$other_partition_tmpdir"; } -. "$abs_srcdir/other-fs-tmpdir" - -dir=hlink - -mkdir $dir || framework_failure_ -> $dir/a || framework_failure_ -ln $dir/a $dir/b || framework_failure_ - -mv $dir "$other_partition_tmpdir" || fail=1 - -# Display inode numbers, one per line. -ls -1i "$other_partition_tmpdir/$dir" > out || fail=1 - -# Make sure the inode numbers are the same. -a=$(sed -n 's/ a$//p' out) -b=$(sed -n 's/ b$//p' out) -test "$a" = "$b" || fail=1 - -Exit $fail diff --git a/tests/mv/hard-link-1.sh b/tests/mv/hard-link-1.sh new file mode 100755 index 00000000..9468e91f --- /dev/null +++ b/tests/mv/hard-link-1.sh @@ -0,0 +1,41 @@ +#!/bin/sh +# move a directory containing hard-linked files and +# make sure the links are preserved + +# Copyright (C) 1998-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ mv +cleanup_() { rm -rf "$other_partition_tmpdir"; } +. "$abs_srcdir/tests/other-fs-tmpdir" + +dir=hlink + +mkdir $dir || framework_failure_ +> $dir/a || framework_failure_ +ln $dir/a $dir/b || framework_failure_ + +mv $dir "$other_partition_tmpdir" || fail=1 + +# Display inode numbers, one per line. +ls -1i "$other_partition_tmpdir/$dir" > out || fail=1 + +# Make sure the inode numbers are the same. +a=$(sed -n 's/ a$//p' out) +b=$(sed -n 's/ b$//p' out) +test "$a" = "$b" || fail=1 + +Exit $fail diff --git a/tests/mv/hard-verbose b/tests/mv/hard-verbose deleted file mode 100755 index 41c4187e..00000000 --- a/tests/mv/hard-verbose +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -# ensure that mv's --verbose options works even in this unusual case - -# Copyright (C) 2006-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ mv - -touch x || framework_failure_ -ln x y || framework_failure_ - - -mv --verbose x y > out || fail=1 -cat <<\EOF > exp || fail=1 -removed 'x' -EOF - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/mv/hard-verbose.sh b/tests/mv/hard-verbose.sh new file mode 100755 index 00000000..6672ae7c --- /dev/null +++ b/tests/mv/hard-verbose.sh @@ -0,0 +1,33 @@ +#!/bin/sh +# ensure that mv's --verbose options works even in this unusual case + +# Copyright (C) 2006-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ mv + +touch x || framework_failure_ +ln x y || framework_failure_ + + +mv --verbose x y > out || fail=1 +cat <<\EOF > exp || fail=1 +removed 'x' +EOF + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/mv/i-1 b/tests/mv/i-1 deleted file mode 100755 index 5fa054ab..00000000 --- a/tests/mv/i-1 +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/perl -# Make sure a 'n' reply to 'mv -i...' aborts the move operation. - -# Copyright (C) 2001-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 -# 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; - -(my $program_name = $0) =~ s|.*/||; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -my $test_a = 'a'; - -my @Tests = - ( - # Make sure a 'n' reply to 'mv -i...' aborts the move operation. - [$test_a, '-i', - {IN => {src => "a\n"}}, {IN => {dst => "b\n"}}, '<', {IN => "n\n"}, - {ERR => "mv: overwrite 'dst'? "}, - {POST => sub { -r 'src' or die "test $test_a failed\n"}}, - {EXIT => 0}, - ], - ); - -my $save_temps = $ENV{DEBUG}; -my $verbose = $ENV{VERBOSE}; - -my $prog = 'mv'; -my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); -exit $fail; diff --git a/tests/mv/i-1.pl b/tests/mv/i-1.pl new file mode 100755 index 00000000..dfa6c515 --- /dev/null +++ b/tests/mv/i-1.pl @@ -0,0 +1,44 @@ +#!/usr/bin/perl +# Make sure a 'n' reply to 'mv -i...' aborts the move operation. + +# Copyright (C) 2001-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/>. + +use strict; + +(my $program_name = $0) =~ s|.*/||; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +my $test_a = 'a'; + +my @Tests = + ( + # Make sure a 'n' reply to 'mv -i...' aborts the move operation. + [$test_a, '-i', + {IN => {src => "a\n"}}, {IN => {dst => "b\n"}}, '<', {IN => "n\n"}, + {ERR => "mv: overwrite 'dst'? "}, + {POST => sub { -r 'src' or die "test $test_a failed\n"}}, + {EXIT => 0}, + ], + ); + +my $save_temps = $ENV{DEBUG}; +my $verbose = $ENV{VERBOSE}; + +my $prog = 'mv'; +my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); +exit $fail; diff --git a/tests/mv/i-2 b/tests/mv/i-2 deleted file mode 100755 index f2480195..00000000 --- a/tests/mv/i-2 +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh -# Test both cp and mv for their behavior with -if and -fi -# The standards (POSIX and SuS) dictate annoyingly inconsistent behavior. - -# Copyright (C) 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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp mv - -skip_if_root_ - -for i in a b c d e f g h; do - echo $i > $i || framework_failure_ -done -chmod 0 b d f h || framework_failure_ -echo y > y || framework_failure_ - -mv -if a b || fail=1 -mv -fi c d < y >/dev/null 2>&1 || fail=1 - -# Before 4.0s, this would not prompt. -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 (---------)?"*) ;; - *) fail=1 ;; -esac - -test -f e || fail=1 -test -f f || fail=1 -compare e f || fail=1 - -cp -fi g h < y > out 2>&1 || fail=1 -test -f g || fail=1 -test -f h || fail=1 -compare g h || fail=1 - -Exit $fail diff --git a/tests/mv/i-2.sh b/tests/mv/i-2.sh new file mode 100755 index 00000000..adf87263 --- /dev/null +++ b/tests/mv/i-2.sh @@ -0,0 +1,52 @@ +#!/bin/sh +# 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. + +# This 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 mv + +skip_if_root_ + +for i in a b c d e f g h; do + echo $i > $i || framework_failure_ +done +chmod 0 b d f h || framework_failure_ +echo y > y || framework_failure_ + +mv -if a b || fail=1 +mv -fi c d < y >/dev/null 2>&1 || fail=1 + +# Before 4.0s, this would not prompt. +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 (---------)?"*) ;; + *) fail=1 ;; +esac + +test -f e || fail=1 +test -f f || fail=1 +compare e f || fail=1 + +cp -fi g h < y > out 2>&1 || fail=1 +test -f g || fail=1 +test -f h || fail=1 +compare g h || fail=1 + +Exit $fail diff --git a/tests/mv/i-3 b/tests/mv/i-3 deleted file mode 100755 index 3912842a..00000000 --- a/tests/mv/i-3 +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/sh -# Make sure that 'mv file unwritable-file' prompts the user -# and that 'mv -f file unwritable-file' doesn't. - -# Copyright (C) 2001-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ mv -require_controlling_input_terminal_ -skip_if_root_ -trap '' TTIN # Ignore SIGTTIN - -test "$(uname -s)" = FreeBSD && skip_ "known spurious failure on FreeBSD" - -touch f g h i || framework_failure_ -chmod 0 g i || framework_failure_ - - -ls /dev/stdin >/dev/null 2>&1 \ - || skip_ 'there is no /dev/stdin file' - -# work around a dash bug when redirecting -# from symlinked ttys in the background -tty=$(readlink -f /dev/stdin) - -test -r "$tty" 2>&1 \ - || skip_ '/dev/stdin is not readable' - -mv f g < $tty > out 2>&1 & pid=$! - -# Test for the expected prompt; sleep upon non-match. -check_overwrite_prompt() -{ - local delay="$1" - case "$(cat out)" in - "mv: try to overwrite '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 - -kill $pid - -mv -f h i > out 2>&1 || fail=1 -test -f i || fail=1 -test -f h && fail=1 - -# Make sure there was no prompt. -case "$(cat out)" in - '') ;; - *) fail=1 ;; -esac - -Exit $fail diff --git a/tests/mv/i-3.sh b/tests/mv/i-3.sh new file mode 100755 index 00000000..9f66edc6 --- /dev/null +++ b/tests/mv/i-3.sh @@ -0,0 +1,69 @@ +#!/bin/sh +# 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. + +# This 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_ mv +require_controlling_input_terminal_ +skip_if_root_ +trap '' TTIN # Ignore SIGTTIN + +test "$(uname -s)" = FreeBSD && skip_ "known spurious failure on FreeBSD" + +touch f g h i || framework_failure_ +chmod 0 g i || framework_failure_ + + +ls /dev/stdin >/dev/null 2>&1 \ + || skip_ 'there is no /dev/stdin file' + +# work around a dash bug when redirecting +# from symlinked ttys in the background +tty=$(readlink -f /dev/stdin) + +test -r "$tty" 2>&1 \ + || skip_ '/dev/stdin is not readable' + +mv f g < $tty > out 2>&1 & pid=$! + +# Test for the expected prompt; sleep upon non-match. +check_overwrite_prompt() +{ + local delay="$1" + case "$(cat out)" in + "mv: try to overwrite '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 + +kill $pid + +mv -f h i > out 2>&1 || fail=1 +test -f i || fail=1 +test -f h && fail=1 + +# Make sure there was no prompt. +case "$(cat out)" in + '') ;; + *) fail=1 ;; +esac + +Exit $fail diff --git a/tests/mv/i-4 b/tests/mv/i-4 deleted file mode 100755 index 8ef6ca77..00000000 --- a/tests/mv/i-4 +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -# make sure 'mv -i a b' does its job with a positive response - -# Copyright (C) 2001-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ mv - -for i in a b; do - echo $i > $i || framework_failure_ -done -echo y > y || framework_failure_ - -mv -i a b < y >/dev/null 2>&1 || fail=1 - -# Make sure out contains the prompt. -case "$(cat b)" in - a) ;; - *) fail=1 ;; -esac - -# Ensure that mv -i a b works properly with 'n' and 'y' -# responses, even when a and b are hard links to the same file. -# This 'n' test would fail (no prompt) for coreutils-5.0.1 through 5.3.0. -echo n > n -rm -f a b -echo a > a -ln a b -mv -i a b < n >/dev/null 2>&1 || fail=1 -test -r a || fail=1 -test -r b || fail=1 -mv -i a b < y >/dev/null 2>&1 || fail=1 -test -r a && fail=1 -test -r b || fail=1 - -Exit $fail diff --git a/tests/mv/i-4.sh b/tests/mv/i-4.sh new file mode 100755 index 00000000..6d54ef7b --- /dev/null +++ b/tests/mv/i-4.sh @@ -0,0 +1,49 @@ +#!/bin/sh +# make sure 'mv -i a b' does its job with a positive response + +# Copyright (C) 2001-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ mv + +for i in a b; do + echo $i > $i || framework_failure_ +done +echo y > y || framework_failure_ + +mv -i a b < y >/dev/null 2>&1 || fail=1 + +# Make sure out contains the prompt. +case "$(cat b)" in + a) ;; + *) fail=1 ;; +esac + +# Ensure that mv -i a b works properly with 'n' and 'y' +# responses, even when a and b are hard links to the same file. +# This 'n' test would fail (no prompt) for coreutils-5.0.1 through 5.3.0. +echo n > n +rm -f a b +echo a > a +ln a b +mv -i a b < n >/dev/null 2>&1 || fail=1 +test -r a || fail=1 +test -r b || fail=1 +mv -i a b < y >/dev/null 2>&1 || fail=1 +test -r a && fail=1 +test -r b || fail=1 + +Exit $fail diff --git a/tests/mv/i-5 b/tests/mv/i-5 deleted file mode 100755 index 76cacabe..00000000 --- a/tests/mv/i-5 +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# Make sure 'mv -i dir file' prompts before failing. - -# Copyright (C) 2006-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ mv - -mkdir a || framework_failure_ -touch b || framework_failure_ - - -# coreutils 6.2 mv would neglect to prompt in this case. -echo n | mv -i a b 2>/dev/null || fail=1 - -Exit $fail diff --git a/tests/mv/i-5.sh b/tests/mv/i-5.sh new file mode 100755 index 00000000..cb57ca4b --- /dev/null +++ b/tests/mv/i-5.sh @@ -0,0 +1,29 @@ +#!/bin/sh +# Make sure 'mv -i dir file' prompts before failing. + +# Copyright (C) 2006-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ mv + +mkdir a || framework_failure_ +touch b || framework_failure_ + + +# coreutils 6.2 mv would neglect to prompt in this case. +echo n | mv -i a b 2>/dev/null || fail=1 + +Exit $fail diff --git a/tests/mv/i-link-no b/tests/mv/i-link-no deleted file mode 100755 index 4615eaab..00000000 --- a/tests/mv/i-link-no +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -# Show that mv doesn't preserve links to files the user has declined to move. - -# Copyright (C) 2002-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ mv - -mkdir a b || framework_failure_ -echo foo > a/foo || framework_failure_ -ln a/foo a/bar || framework_failure_ -echo FUBAR > b/FUBAR || framework_failure_ -ln b/FUBAR b/bar || framework_failure_ -chmod a-w b/bar || framework_failure_ -echo n > no || framework_failure_ - - -mv a/bar a/foo b < no > out 2> err || fail=1 -touch exp -touch exp_err - -compare exp out || fail=1 -compare exp_err err || fail=1 - -case "$(cat b/foo)" in - foo) ;; - *) fail=1;; -esac - -Exit $fail diff --git a/tests/mv/i-link-no.sh b/tests/mv/i-link-no.sh new file mode 100755 index 00000000..38305b74 --- /dev/null +++ b/tests/mv/i-link-no.sh @@ -0,0 +1,43 @@ +#!/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. + +# This 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_ mv + +mkdir a b || framework_failure_ +echo foo > a/foo || framework_failure_ +ln a/foo a/bar || framework_failure_ +echo FUBAR > b/FUBAR || framework_failure_ +ln b/FUBAR b/bar || framework_failure_ +chmod a-w b/bar || framework_failure_ +echo n > no || framework_failure_ + + +mv a/bar a/foo b < no > out 2> err || fail=1 +touch exp +touch exp_err + +compare exp out || fail=1 +compare exp_err err || fail=1 + +case "$(cat b/foo)" in + foo) ;; + *) fail=1;; +esac + +Exit $fail diff --git a/tests/mv/into-self b/tests/mv/into-self deleted file mode 100755 index 231d69c2..00000000 --- a/tests/mv/into-self +++ /dev/null @@ -1,53 +0,0 @@ -#! /bin/sh -# Demonstrate how mv fails when it tries to move a directory into itself. - -# Copyright (C) 1998-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ mv - -dir=toself-dir -file=toself-file - -rm -rf $dir $file || framework_failure_ -mkdir -p $dir/a/b || framework_failure_ -touch $file || framework_failure_ - - -# This mv command should fail. -mv $dir $file $dir > out 2>&1 && fail=1 - -sed \ - -e "s,mv:,XXX:," \ - -e "s,$dir,SRC," \ - -e "s,$dir/$dir,DEST," \ - out > out2 - -cat > exp <<\EOF -XXX: cannot move 'SRC' to a subdirectory of itself, 'DEST' -EOF - -compare exp out2 || fail=1 - -# Make sure the file is gone. -test -f $file && fail=1 -# Make sure the directory is *not* moved. -test -d $dir || fail=1 -test -d $dir/$dir && fail=1 -# Make sure the file has been moved to the right place. -test -f $dir/$file || fail=1 - -Exit $fail diff --git a/tests/mv/into-self-2 b/tests/mv/into-self-2 deleted file mode 100755 index 3e6ace71..00000000 --- a/tests/mv/into-self-2 +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh -# Force mv to use the copying code. -# Consider the case where SRC and DEST are on different -# partitions and DEST is a symlink to SRC. - -# Copyright (C) 1998-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ mv -cleanup_() { rm -rf "$other_partition_tmpdir"; } -. "$abs_srcdir/other-fs-tmpdir" - -file="$other_partition_tmpdir/file" -symlink=symlink - - -echo whatever > $file || framework_failure_ -ln -s $file $symlink || framework_failure_ - -# This mv command should exit nonzero. -mv $symlink $file > out 2>&1 && fail=1 - -# This should succeed. -mv $file $symlink || fail=1 - -sed \ - -e "s,mv:,XXX:," \ - -e "s,$file,YYY," \ - -e "s,$symlink,ZZZ," \ - out > out2 - -cat > exp <<\EOF -XXX: 'ZZZ' and 'YYY' are the same file -EOF -#' - -compare exp out2 || fail=1 - -Exit $fail diff --git a/tests/mv/into-self-2.sh b/tests/mv/into-self-2.sh new file mode 100755 index 00000000..4200bbb6 --- /dev/null +++ b/tests/mv/into-self-2.sh @@ -0,0 +1,52 @@ +#!/bin/sh +# Force mv to use the copying code. +# 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. + +# This 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_ mv +cleanup_() { rm -rf "$other_partition_tmpdir"; } +. "$abs_srcdir/tests/other-fs-tmpdir" + +file="$other_partition_tmpdir/file" +symlink=symlink + + +echo whatever > $file || framework_failure_ +ln -s $file $symlink || framework_failure_ + +# This mv command should exit nonzero. +mv $symlink $file > out 2>&1 && fail=1 + +# This should succeed. +mv $file $symlink || fail=1 + +sed \ + -e "s,mv:,XXX:," \ + -e "s,$file,YYY," \ + -e "s,$symlink,ZZZ," \ + out > out2 + +cat > exp <<\EOF +XXX: 'ZZZ' and 'YYY' are the same file +EOF +#' + +compare exp out2 || fail=1 + +Exit $fail diff --git a/tests/mv/into-self-3 b/tests/mv/into-self-3 deleted file mode 100755 index b2b8f835..00000000 --- a/tests/mv/into-self-3 +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh -# move a directory into itself, with a twist - -# Copyright (C) 1998-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ mv - -dir1=is3-dir1 -dir2=is3-dir2 - -mkdir $dir1 $dir2 || framework_failure_ - -# This mv command should exit nonzero. -mv $dir1 $dir2 $dir2 > out 2>&1 && fail=1 - -sed \ - -e "s,mv:,XXX:,g" \ - -e "s,$dir2,ZZZ,g" \ - out > out2 - -cat > exp <<\EOF -XXX: cannot move 'ZZZ' to a subdirectory of itself, 'ZZZ/ZZZ' -EOF - -compare exp out2 || fail=1 - -Exit $fail diff --git a/tests/mv/into-self-3.sh b/tests/mv/into-self-3.sh new file mode 100755 index 00000000..6f224831 --- /dev/null +++ b/tests/mv/into-self-3.sh @@ -0,0 +1,41 @@ +#!/bin/sh +# move a directory into itself, with a twist + +# Copyright (C) 1998-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ mv + +dir1=is3-dir1 +dir2=is3-dir2 + +mkdir $dir1 $dir2 || framework_failure_ + +# This mv command should exit nonzero. +mv $dir1 $dir2 $dir2 > out 2>&1 && fail=1 + +sed \ + -e "s,mv:,XXX:,g" \ + -e "s,$dir2,ZZZ,g" \ + out > out2 + +cat > exp <<\EOF +XXX: cannot move 'ZZZ' to a subdirectory of itself, 'ZZZ/ZZZ' +EOF + +compare exp out2 || fail=1 + +Exit $fail diff --git a/tests/mv/into-self-4 b/tests/mv/into-self-4 deleted file mode 100755 index 5119e8fa..00000000 --- a/tests/mv/into-self-4 +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# confirm that 'mv symlink symlink' doesn't remove symlink -# Based on an example from David Luyer. - -# Copyright (C) 2001-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ mv - -touch file || framework_failure_ -ln -s file s || framework_failure_ - - -# This must fail. -mv s s 2> /dev/null && fail=1 - -# But the symlink, s, must not be removed. -# Before 4.0.36, 's' would have been removed. -test -f s || fail=1 - -Exit $fail diff --git a/tests/mv/into-self-4.sh b/tests/mv/into-self-4.sh new file mode 100755 index 00000000..7aa5111f --- /dev/null +++ b/tests/mv/into-self-4.sh @@ -0,0 +1,34 @@ +#!/bin/sh +# confirm that 'mv symlink symlink' doesn't remove symlink +# Based on an example from David Luyer. + +# Copyright (C) 2001-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ mv + +touch file || framework_failure_ +ln -s file s || framework_failure_ + + +# This must fail. +mv s s 2> /dev/null && fail=1 + +# But the symlink, s, must not be removed. +# Before 4.0.36, 's' would have been removed. +test -f s || fail=1 + +Exit $fail diff --git a/tests/mv/into-self.sh b/tests/mv/into-self.sh new file mode 100755 index 00000000..38b0809f --- /dev/null +++ b/tests/mv/into-self.sh @@ -0,0 +1,53 @@ +#! /bin/sh +# Demonstrate how mv fails when it tries to move a directory into itself. + +# Copyright (C) 1998-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ mv + +dir=toself-dir +file=toself-file + +rm -rf $dir $file || framework_failure_ +mkdir -p $dir/a/b || framework_failure_ +touch $file || framework_failure_ + + +# This mv command should fail. +mv $dir $file $dir > out 2>&1 && fail=1 + +sed \ + -e "s,mv:,XXX:," \ + -e "s,$dir,SRC," \ + -e "s,$dir/$dir,DEST," \ + out > out2 + +cat > exp <<\EOF +XXX: cannot move 'SRC' to a subdirectory of itself, 'DEST' +EOF + +compare exp out2 || fail=1 + +# Make sure the file is gone. +test -f $file && fail=1 +# Make sure the directory is *not* moved. +test -d $dir || fail=1 +test -d $dir/$dir && fail=1 +# Make sure the file has been moved to the right place. +test -f $dir/$file || fail=1 + +Exit $fail diff --git a/tests/mv/leak-fd b/tests/mv/leak-fd deleted file mode 100755 index d349a3f1..00000000 --- a/tests/mv/leak-fd +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh -# Exercise mv's file-descriptor-leak bug, reported against coreutils-5.2.1 -# and fixed (properly) on 2004-10-21. - -# Copyright (C) 2004-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 -# 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/>. -# limit so don't run it by default. - -. "${srcdir=.}/init.sh"; path_prepend_ ../src -print_ver_ mv -skip_if_root_ -cleanup_() { rm -rf "$other_partition_tmpdir"; } -. "$abs_srcdir/other-fs-tmpdir" - -# This test is relatively expensive, and might well evoke a -# framework-failure on systems with a smaller command-line length -expensive_ - -b="0 1 2 3 4 5 6 7 8 9 -a b c d e f g h i j k l m n o p q r s t u v w x y z -_A _B _C _D _E _F _G _H _I _J _K _L _M _N _O _P _Q _R _S _T _U _V _W _X _Y _Z" - -for i in $(echo $b); do - echo $i - for j in $b; do - echo $i$j - done -done > .dirs -mkdir $(cat .dirs) || framework_failure_ -sed 's,$,/f,' .dirs | xargs touch - -last_file=$(tail -n1 .dirs)/f -test -f $last_file || framework_failure_ - - -mv * "$other_partition_tmpdir" || fail=1 -test -f $last_file/f && fail=1 -rm .dirs - -out=$(ls -A) || fail=1 -test -z "$out" || fail=1 - -Exit $fail diff --git a/tests/mv/leak-fd.sh b/tests/mv/leak-fd.sh new file mode 100755 index 00000000..8d83d6a0 --- /dev/null +++ b/tests/mv/leak-fd.sh @@ -0,0 +1,55 @@ +#!/bin/sh +# 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. + +# This 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/>. +# limit so don't run it by default. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ mv +skip_if_root_ +cleanup_() { rm -rf "$other_partition_tmpdir"; } +. "$abs_srcdir/tests/other-fs-tmpdir" + +# This test is relatively expensive, and might well evoke a +# framework-failure on systems with a smaller command-line length +expensive_ + +b="0 1 2 3 4 5 6 7 8 9 +a b c d e f g h i j k l m n o p q r s t u v w x y z +_A _B _C _D _E _F _G _H _I _J _K _L _M _N _O _P _Q _R _S _T _U _V _W _X _Y _Z" + +for i in $(echo $b); do + echo $i + for j in $b; do + echo $i$j + done +done > .dirs +mkdir $(cat .dirs) || framework_failure_ +sed 's,$,/f,' .dirs | xargs touch + +last_file=$(tail -n1 .dirs)/f +test -f $last_file || framework_failure_ + + +mv * "$other_partition_tmpdir" || fail=1 +test -f $last_file/f && fail=1 +rm .dirs + +out=$(ls -A) || fail=1 +test -z "$out" || fail=1 + +Exit $fail diff --git a/tests/mv/mv-n b/tests/mv/mv-n deleted file mode 100755 index 9a9b1156..00000000 --- a/tests/mv/mv-n +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh -# Test whether mv -n works as documented (not overwrite target). - -# Copyright (C) 2006-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ mv - - -# test miscellaneous combinations of -f -i -n parameters -touch a b || framework_failure_ -echo "'a' -> 'b'" > out_move -> out_empty - -# ask for overwrite, answer no -touch a b || framework_failure_ -echo n | mv -vi a b 2>/dev/null > out1 || fail=1 -compare out1 out_empty || fail=1 - -# ask for overwrite, answer yes -touch a b || framework_failure_ -echo y | mv -vi a b 2>/dev/null > out2 || fail=1 -compare out2 out_move || fail=1 - -# -n wins (as the last option) -touch a b || framework_failure_ -echo y | mv -vin a b 2>/dev/null > out3 || fail=1 -compare out3 out_empty || fail=1 - -# -n wins (as the last option) -touch a b || framework_failure_ -echo y | mv -vfn a b 2>/dev/null > out4 || fail=1 -compare out4 out_empty || fail=1 - -# -n wins (as the last option) -touch a b || framework_failure_ -echo y | mv -vifn a b 2>/dev/null > out5 || fail=1 -compare out5 out_empty || fail=1 - -# options --backup and --no-clobber are mutually exclusive -touch a || framework_failure_ -mv -bn a b 2>/dev/null && fail=1 - -Exit $fail diff --git a/tests/mv/mv-n.sh b/tests/mv/mv-n.sh new file mode 100755 index 00000000..d829c63b --- /dev/null +++ b/tests/mv/mv-n.sh @@ -0,0 +1,57 @@ +#!/bin/sh +# Test whether mv -n works as documented (not overwrite target). + +# Copyright (C) 2006-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ mv + + +# test miscellaneous combinations of -f -i -n parameters +touch a b || framework_failure_ +echo "'a' -> 'b'" > out_move +> out_empty + +# ask for overwrite, answer no +touch a b || framework_failure_ +echo n | mv -vi a b 2>/dev/null > out1 || fail=1 +compare out1 out_empty || fail=1 + +# ask for overwrite, answer yes +touch a b || framework_failure_ +echo y | mv -vi a b 2>/dev/null > out2 || fail=1 +compare out2 out_move || fail=1 + +# -n wins (as the last option) +touch a b || framework_failure_ +echo y | mv -vin a b 2>/dev/null > out3 || fail=1 +compare out3 out_empty || fail=1 + +# -n wins (as the last option) +touch a b || framework_failure_ +echo y | mv -vfn a b 2>/dev/null > out4 || fail=1 +compare out4 out_empty || fail=1 + +# -n wins (as the last option) +touch a b || framework_failure_ +echo y | mv -vifn a b 2>/dev/null > out5 || fail=1 +compare out5 out_empty || fail=1 + +# options --backup and --no-clobber are mutually exclusive +touch a || framework_failure_ +mv -bn a b 2>/dev/null && fail=1 + +Exit $fail diff --git a/tests/mv/mv-special-1 b/tests/mv/mv-special-1 deleted file mode 100755 index dac55d0c..00000000 --- a/tests/mv/mv-special-1 +++ /dev/null @@ -1,72 +0,0 @@ -#! /bin/sh -# Test "mv" with special files. - -# Copyright (C) 1998-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ mv -cleanup_() { rm -rf "$other_partition_tmpdir"; } -. "$abs_srcdir/other-fs-tmpdir" - -null=mv-null -dir=mv-dir - -rm -f $null || framework_failure_ -mknod $null p || framework_failure_ -test -p $null || framework_failure_ -mkdir -p $dir/a/b/c $dir/d/e/f || framework_failure_ -touch $dir/a/b/c/file1 $dir/d/e/f/file2 || framework_failure_ - -# We used to... -# exit 77 here to indicate that we couldn't run the test. -# At least running on SunOS 4.1.4, using a directory NFS mounted -# from an OpenBSD system, the above mknod fails. -# It's not worth making an exception any more. - -mv --verbose $null $dir "$other_partition_tmpdir" > out || fail=1 -# Make sure the files are gone. -test -p $null && fail=1 -test -d $dir && fail=1 -# Make sure they were moved. -test -p "$other_partition_tmpdir/$null" || fail=1 -test -d "$other_partition_tmpdir/$dir/a/b/c" || fail=1 - -# POSIX says rename (A, B) can succeed if A and B are on different file systems, -# so ignore chatter about when files are removed and copied rather than renamed. -sed " - /^removed /d - s,$other_partition_tmpdir,XXX, -" out | sort > out2 - -cat <<EOF | sort > exp -'$null' -> 'XXX/$null' -'$dir' -> 'XXX/$dir' -'$dir/a' -> 'XXX/$dir/a' -'$dir/a/b' -> 'XXX/$dir/a/b' -'$dir/a/b/c' -> 'XXX/$dir/a/b/c' -'$dir/a/b/c/file1' -> 'XXX/$dir/a/b/c/file1' -'$dir/d' -> 'XXX/$dir/d' -'$dir/d/e' -> 'XXX/$dir/d/e' -'$dir/d/e/f' -> 'XXX/$dir/d/e/f' -'$dir/d/e/f/file2' -> 'XXX/$dir/d/e/f/file2' -EOF - -compare exp out2 || fail=1 - -# cd "$other_partition_tmpdir" -# ls -l -A -R "$other_partition_tmpdir" - -Exit $fail diff --git a/tests/mv/mv-special-1.sh b/tests/mv/mv-special-1.sh new file mode 100755 index 00000000..b2a0a19c --- /dev/null +++ b/tests/mv/mv-special-1.sh @@ -0,0 +1,72 @@ +#! /bin/sh +# Test "mv" with special files. + +# Copyright (C) 1998-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ mv +cleanup_() { rm -rf "$other_partition_tmpdir"; } +. "$abs_srcdir/tests/other-fs-tmpdir" + +null=mv-null +dir=mv-dir + +rm -f $null || framework_failure_ +mknod $null p || framework_failure_ +test -p $null || framework_failure_ +mkdir -p $dir/a/b/c $dir/d/e/f || framework_failure_ +touch $dir/a/b/c/file1 $dir/d/e/f/file2 || framework_failure_ + +# We used to... +# exit 77 here to indicate that we couldn't run the test. +# At least running on SunOS 4.1.4, using a directory NFS mounted +# from an OpenBSD system, the above mknod fails. +# It's not worth making an exception any more. + +mv --verbose $null $dir "$other_partition_tmpdir" > out || fail=1 +# Make sure the files are gone. +test -p $null && fail=1 +test -d $dir && fail=1 +# Make sure they were moved. +test -p "$other_partition_tmpdir/$null" || fail=1 +test -d "$other_partition_tmpdir/$dir/a/b/c" || fail=1 + +# POSIX says rename (A, B) can succeed if A and B are on different file systems, +# so ignore chatter about when files are removed and copied rather than renamed. +sed " + /^removed /d + s,$other_partition_tmpdir,XXX, +" out | sort > out2 + +cat <<EOF | sort > exp +'$null' -> 'XXX/$null' +'$dir' -> 'XXX/$dir' +'$dir/a' -> 'XXX/$dir/a' +'$dir/a/b' -> 'XXX/$dir/a/b' +'$dir/a/b/c' -> 'XXX/$dir/a/b/c' +'$dir/a/b/c/file1' -> 'XXX/$dir/a/b/c/file1' +'$dir/d' -> 'XXX/$dir/d' +'$dir/d/e' -> 'XXX/$dir/d/e' +'$dir/d/e/f' -> 'XXX/$dir/d/e/f' +'$dir/d/e/f/file2' -> 'XXX/$dir/d/e/f/file2' +EOF + +compare exp out2 || fail=1 + +# cd "$other_partition_tmpdir" +# ls -l -A -R "$other_partition_tmpdir" + +Exit $fail diff --git a/tests/mv/no-target-dir b/tests/mv/no-target-dir deleted file mode 100755 index c1443cd3..00000000 --- a/tests/mv/no-target-dir +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -# ensure that --no-target-directory (-T) works when the destination is -# an empty directory. - -# Copyright (C) 2006-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ mv - -mkdir -p d/sub empty src d2/sub e2 || framework_failure_ -touch f || framework_failure_ - -# Skip this test if there's an underlying kernel bug. -mkdir a b b/a || framework_failure_ - -mv a b || - skip_ "your kernel's rename syscall is buggy" - - -# This should succeed, since both src and dest are directories, -# and the dest dir is empty. -mv -fT d empty || fail=1 - -# Ensure that the source, d, is gone. -ls -d d > /dev/null 2>&1 && fail=1 - -# Ensure that the dest dir now has a subdirectory. -test -d empty/sub || fail=1 - -# rename must fail, since the dest is non-empty. -mv -fT src d2 2> /dev/null && fail=1 - -# rename must fail, since the src is not a directory. -mv -fT f e2 2> /dev/null && fail=1 - -Exit $fail diff --git a/tests/mv/no-target-dir.sh b/tests/mv/no-target-dir.sh new file mode 100755 index 00000000..55a63109 --- /dev/null +++ b/tests/mv/no-target-dir.sh @@ -0,0 +1,49 @@ +#!/bin/sh +# ensure that --no-target-directory (-T) works when the destination is +# an empty directory. + +# Copyright (C) 2006-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ mv + +mkdir -p d/sub empty src d2/sub e2 || framework_failure_ +touch f || framework_failure_ + +# Skip this test if there's an underlying kernel bug. +mkdir a b b/a || framework_failure_ + +mv a b || + skip_ "your kernel's rename syscall is buggy" + + +# This should succeed, since both src and dest are directories, +# and the dest dir is empty. +mv -fT d empty || fail=1 + +# Ensure that the source, d, is gone. +ls -d d > /dev/null 2>&1 && fail=1 + +# Ensure that the dest dir now has a subdirectory. +test -d empty/sub || fail=1 + +# rename must fail, since the dest is non-empty. +mv -fT src d2 2> /dev/null && fail=1 + +# rename must fail, since the src is not a directory. +mv -fT f e2 2> /dev/null && fail=1 + +Exit $fail diff --git a/tests/mv/part-fail b/tests/mv/part-fail deleted file mode 100755 index 499a6b66..00000000 --- a/tests/mv/part-fail +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh -# Make sure we give a sensible diagnostic when a cross-device 'mv' -# fails, e.g., because the destination cannot be unlinked. -# This is a bit fragile since it relies on the string used -# for EPERM: 'permission denied'. - -# Copyright (C) 2002-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ mv -skip_if_root_ -cleanup_() { t=$other_partition_tmpdir; chmod -R 700 "$t"; rm -rf "$t"; } -. "$abs_srcdir/other-fs-tmpdir" - -touch k "$other_partition_tmpdir/k" || framework_failure_ -chmod u-w "$other_partition_tmpdir" || framework_failure_ - - -mv -f k "$other_partition_tmpdir" 2> out && fail=1 -printf \ -"mv: inter-device move failed: '%s' to '%s';"\ -' unable to remove target: Permission denied\n' \ - k "$other_partition_tmpdir/k" >exp - -# On some (less-compliant) systems, we get EPERM in this case. -# Accept either diagnostic. -cat <<EOF > exp2 -mv: cannot move 'k' to '$other_partition_tmpdir/k': Permission denied -EOF - -if cmp out exp >/dev/null 2>&1; then - : -else - if cmp out exp2; then - : - else - fail=1 - fi -fi -test $fail = 1 && compare exp out - -Exit $fail diff --git a/tests/mv/part-fail.sh b/tests/mv/part-fail.sh new file mode 100755 index 00000000..08ffadcd --- /dev/null +++ b/tests/mv/part-fail.sh @@ -0,0 +1,55 @@ +#!/bin/sh +# Make sure we give a sensible diagnostic when a cross-device 'mv' +# fails, e.g., because the destination cannot be unlinked. +# This is a bit fragile since it relies on the string used +# for EPERM: 'permission denied'. + +# Copyright (C) 2002-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ mv +skip_if_root_ +cleanup_() { t=$other_partition_tmpdir; chmod -R 700 "$t"; rm -rf "$t"; } +. "$abs_srcdir/tests/other-fs-tmpdir" + +touch k "$other_partition_tmpdir/k" || framework_failure_ +chmod u-w "$other_partition_tmpdir" || framework_failure_ + + +mv -f k "$other_partition_tmpdir" 2> out && fail=1 +printf \ +"mv: inter-device move failed: '%s' to '%s';"\ +' unable to remove target: Permission denied\n' \ + k "$other_partition_tmpdir/k" >exp + +# On some (less-compliant) systems, we get EPERM in this case. +# Accept either diagnostic. +cat <<EOF > exp2 +mv: cannot move 'k' to '$other_partition_tmpdir/k': Permission denied +EOF + +if cmp out exp >/dev/null 2>&1; then + : +else + if cmp out exp2; then + : + else + fail=1 + fi +fi +test $fail = 1 && compare exp out + +Exit $fail diff --git a/tests/mv/part-hardlink b/tests/mv/part-hardlink deleted file mode 100755 index af773a23..00000000 --- a/tests/mv/part-hardlink +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -# Ensure that hard links are preserved when moving between partitions -# and when the links are in separate command line arguments. -# For additional constraints, see the comment in copy.c. -# Before coreutils-5.2.1, this test would fail. - -# Copyright (C) 2004-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ mv -cleanup_() { rm -rf "$other_partition_tmpdir"; } -. "$abs_srcdir/other-fs-tmpdir" - -touch f || framework_failure_ -ln f g || framework_failure_ -mkdir a b || framework_failure_ -touch a/1 || framework_failure_ -ln a/1 b/1 || framework_failure_ - - -mv f g "$other_partition_tmpdir" || fail=1 -mv a b "$other_partition_tmpdir" || fail=1 - -cd "$other_partition_tmpdir" -set $(ls -Ci f g) -test $1 = $3 || fail=1 -set $(ls -Ci a/1 b/1) -test $1 = $3 || fail=1 - -Exit $fail diff --git a/tests/mv/part-hardlink.sh b/tests/mv/part-hardlink.sh new file mode 100755 index 00000000..cb8e8d22 --- /dev/null +++ b/tests/mv/part-hardlink.sh @@ -0,0 +1,43 @@ +#!/bin/sh +# Ensure that hard links are preserved when moving between partitions +# and when the links are in separate command line arguments. +# 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. + +# This 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_ mv +cleanup_() { rm -rf "$other_partition_tmpdir"; } +. "$abs_srcdir/tests/other-fs-tmpdir" + +touch f || framework_failure_ +ln f g || framework_failure_ +mkdir a b || framework_failure_ +touch a/1 || framework_failure_ +ln a/1 b/1 || framework_failure_ + + +mv f g "$other_partition_tmpdir" || fail=1 +mv a b "$other_partition_tmpdir" || fail=1 + +cd "$other_partition_tmpdir" +set $(ls -Ci f g) +test $1 = $3 || fail=1 +set $(ls -Ci a/1 b/1) +test $1 = $3 || fail=1 + +Exit $fail diff --git a/tests/mv/part-rename b/tests/mv/part-rename deleted file mode 100755 index 19d9ecb7..00000000 --- a/tests/mv/part-rename +++ /dev/null @@ -1,31 +0,0 @@ -#!/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. - -# Copyright (C) 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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ mv -cleanup_() { rm -rf "$other_partition_tmpdir"; } -. "$abs_srcdir/other-fs-tmpdir" - -mkdir foo || framework_failure_ - - -mv foo/ "$other_partition_tmpdir/bar" || fail=1 - -Exit $fail diff --git a/tests/mv/part-rename.sh b/tests/mv/part-rename.sh new file mode 100755 index 00000000..aa2265b1 --- /dev/null +++ b/tests/mv/part-rename.sh @@ -0,0 +1,31 @@ +#!/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. + +# Copyright (C) 2000-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ mv +cleanup_() { rm -rf "$other_partition_tmpdir"; } +. "$abs_srcdir/tests/other-fs-tmpdir" + +mkdir foo || framework_failure_ + + +mv foo/ "$other_partition_tmpdir/bar" || fail=1 + +Exit $fail diff --git a/tests/mv/part-symlink b/tests/mv/part-symlink deleted file mode 100755 index e57de3c9..00000000 --- a/tests/mv/part-symlink +++ /dev/null @@ -1,261 +0,0 @@ -#!/bin/sh -# make sure cp and mv can handle many combinations of local and -# other-partition regular/symlink'd files. - -# Copyright (C) 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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp mv - -cleanup_() { rm -rf "$other_partition_tmpdir"; } -. "$abs_srcdir/other-fs-tmpdir" - -# On NFS on Linux 2.6.9 at least we get: -# mv: preserving permissions for 'rem_sl': Operation not supported -require_local_dir_ - -pwd_tmp=$(pwd) - -# Unset CDPATH. Otherwise, output from the 'cd dir' command -# can make this test fail. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - - -# Four cases: -# local regular file w/symlink on another partition -# (loc_reg, rem_sl) -# (rem_sl, loc_reg) -# local symlink to regular file on another partition -# (loc_sl, rem_reg) -# (rem_reg, loc_sl) - -# Exercise those four cases for each of -# cp and mv, with lots of combinations of options. - -exec 1> actual - -# FIXME: This should be bigger: like more than 8k -contents=XYZ - -loc_reg=loc_reg -loc_sl=loc_sl -rem_reg=$other_partition_tmpdir/rem_reg -rem_sl=$other_partition_tmpdir/rem_sl - -for copy in cp mv; do - for args in \ - 'loc_reg rem_sl' \ - 'rem_sl loc_reg' \ - 'loc_sl rem_reg' \ - 'rem_reg loc_sl' \ - ; do - for options in '' --rem '--rem -d' '--rem -b' -b -bd -d; do - case "$options" in *d*|*--rem*) test $copy = mv && continue;; esac - rm -rf dir || fail=1 - rm -f "$other_partition_tmpdir"/* || fail=1 - mkdir dir || fail=1 - cd dir || fail=1 - case "$args" in *loc_reg*) reg_abs="$(pwd)/$loc_reg" ;; esac - case "$args" in *rem_reg*) reg_abs=$rem_reg ;; esac - case "$args" in *loc_sl*) slink=$loc_sl ;; esac - case "$args" in *rem_sl*) slink=$rem_sl ;; esac - - echo $contents > "$reg_abs" || fail=1 - ln -nsf "$reg_abs" $slink || fail=1 - actual_args=$(echo $args|sed 's,^,$,;s/ / $/') - actual_args=$(eval echo $actual_args) - - ( - ( - # echo 1>&2 cp $options $args - $copy $options $actual_args 2>.err - copy_status=$? - echo $copy_status $copy $options $args - - # 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 && { - echo ' [' | tr -d '\n' - sed 's/^[^:][^:]*\(..\):/\1:/;s,'"$other_partition_tmpdir/,," .err | - tr -d '\n' - echo ']' - } - # Strip off all but the file names. - # Remove any site-dependent part of each file name. - ls=$(ls -gG --ignore=.err . \ - | sed \ - -e '/^total /d' \ - -e "s,$other_partition_tmpdir/,," \ - -e "s,$pwd_tmp/,," \ - -e 's/^[^ ]* *[^ ]* *[^ ]* *[^ ]* *[^ ]* *[^ ]* *//') - ls2=$(cd "$other_partition_tmpdir" && ls -gG --ignore=.err . \ - | sed \ - -e '/^total /d' \ - -e "s,$other_partition_tmpdir/,," \ - -e "s,$pwd_tmp/,," \ - -e 's/^[^ ]* *[^ ]* *[^ ]* *[^ ]* *[^ ]* *[^ ]* *//') - echo " ("$ls") ("$ls2")" - - # If the command failed, then it must not have changed the files. - if test $copy_status != 0; then - for f in $actual_args; do - test -f $f || - { echo " $copy FAILED but removed $f"; continue; } - case "$(cat $f)" in - "$contents") ;; - *) echo " $copy FAILED but modified $f";; - esac - done - fi - - if test $copy = cp; then - # Make sure the original is unchanged and that - # the destination is a copy. - for f in $actual_args; do - if test -f $f; then - if test $copy_status != 0; then - test - fi - case "$(cat $f)" in - "$contents") ;; - *) echo " $copy FAILED";; - esac - else - echo " symlink-loop" - fi - done - fi - ) - ) | sed 's/ *$//' - cd .. - done - echo - done -done - -test $fail = 1 && - { (exit 1); exit; } - -cat <<\EOF > expected -1 cp loc_reg rem_sl - [cp: 'loc_reg' and 'rem_sl' are the same file] - (loc_reg) (rem_sl -> dir/loc_reg) -0 cp --rem loc_reg rem_sl - (loc_reg) (rem_sl) -0 cp --rem -d loc_reg rem_sl - (loc_reg) (rem_sl) -0 cp --rem -b loc_reg rem_sl - (loc_reg) (rem_sl rem_sl~ -> dir/loc_reg) -0 cp -b loc_reg rem_sl - (loc_reg) (rem_sl rem_sl~ -> dir/loc_reg) -0 cp -bd loc_reg rem_sl - (loc_reg) (rem_sl rem_sl~ -> dir/loc_reg) -1 cp -d loc_reg rem_sl - [cp: 'loc_reg' and 'rem_sl' are the same file] - (loc_reg) (rem_sl -> dir/loc_reg) - -1 cp rem_sl loc_reg - [cp: 'rem_sl' and 'loc_reg' are the same file] - (loc_reg) (rem_sl -> dir/loc_reg) -1 cp --rem rem_sl loc_reg - [cp: 'rem_sl' and 'loc_reg' are the same file] - (loc_reg) (rem_sl -> dir/loc_reg) -1 cp --rem -d rem_sl loc_reg - [cp: 'rem_sl' and 'loc_reg' are the same file] - (loc_reg) (rem_sl -> dir/loc_reg) -1 cp --rem -b rem_sl loc_reg - [cp: 'rem_sl' and 'loc_reg' are the same file] - (loc_reg) (rem_sl -> dir/loc_reg) -1 cp -b rem_sl loc_reg - [cp: 'rem_sl' and 'loc_reg' are the same file] - (loc_reg) (rem_sl -> dir/loc_reg) -0 cp -bd rem_sl loc_reg - (loc_reg -> dir/loc_reg loc_reg~) (rem_sl -> dir/loc_reg) - symlink-loop - symlink-loop -1 cp -d rem_sl loc_reg - [cp: 'rem_sl' and 'loc_reg' are the same file] - (loc_reg) (rem_sl -> dir/loc_reg) - -1 cp loc_sl rem_reg - [cp: 'loc_sl' and 'rem_reg' are the same file] - (loc_sl -> rem_reg) (rem_reg) -1 cp --rem loc_sl rem_reg - [cp: 'loc_sl' and 'rem_reg' are the same file] - (loc_sl -> rem_reg) (rem_reg) -1 cp --rem -d loc_sl rem_reg - [cp: 'loc_sl' and 'rem_reg' are the same file] - (loc_sl -> rem_reg) (rem_reg) -1 cp --rem -b loc_sl rem_reg - [cp: 'loc_sl' and 'rem_reg' are the same file] - (loc_sl -> rem_reg) (rem_reg) -1 cp -b loc_sl rem_reg - [cp: 'loc_sl' and 'rem_reg' are the same file] - (loc_sl -> rem_reg) (rem_reg) -0 cp -bd loc_sl rem_reg - (loc_sl -> rem_reg) (rem_reg -> rem_reg rem_reg~) - symlink-loop - symlink-loop -1 cp -d loc_sl rem_reg - [cp: 'loc_sl' and 'rem_reg' are the same file] - (loc_sl -> rem_reg) (rem_reg) - -1 cp rem_reg loc_sl - [cp: 'rem_reg' and 'loc_sl' are the same file] - (loc_sl -> rem_reg) (rem_reg) -0 cp --rem rem_reg loc_sl - (loc_sl) (rem_reg) -0 cp --rem -d rem_reg loc_sl - (loc_sl) (rem_reg) -0 cp --rem -b rem_reg loc_sl - (loc_sl loc_sl~ -> rem_reg) (rem_reg) -0 cp -b rem_reg loc_sl - (loc_sl loc_sl~ -> rem_reg) (rem_reg) -0 cp -bd rem_reg loc_sl - (loc_sl loc_sl~ -> rem_reg) (rem_reg) -1 cp -d rem_reg loc_sl - [cp: 'rem_reg' and 'loc_sl' are the same file] - (loc_sl -> rem_reg) (rem_reg) - -0 mv loc_reg rem_sl - () (rem_sl) -0 mv -b loc_reg rem_sl - () (rem_sl rem_sl~ -> dir/loc_reg) - -1 mv rem_sl loc_reg - [mv: 'rem_sl' and 'loc_reg' are the same file] - (loc_reg) (rem_sl -> dir/loc_reg) -0 mv -b rem_sl loc_reg - (loc_reg -> dir/loc_reg loc_reg~) () - -1 mv loc_sl rem_reg - [mv: 'loc_sl' and 'rem_reg' are the same file] - (loc_sl -> rem_reg) (rem_reg) -0 mv -b loc_sl rem_reg - () (rem_reg -> rem_reg rem_reg~) - -0 mv rem_reg loc_sl - (loc_sl) () -0 mv -b rem_reg loc_sl - (loc_sl loc_sl~ -> rem_reg) () - -EOF - -# Redirect to stderr, since stdout is already taken. -compare expected actual 1>&2 || fail=1 - -Exit $fail diff --git a/tests/mv/part-symlink.sh b/tests/mv/part-symlink.sh new file mode 100755 index 00000000..8eb73f2e --- /dev/null +++ b/tests/mv/part-symlink.sh @@ -0,0 +1,261 @@ +#!/bin/sh +# 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. + +# This 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 mv + +cleanup_() { rm -rf "$other_partition_tmpdir"; } +. "$abs_srcdir/tests/other-fs-tmpdir" + +# On NFS on Linux 2.6.9 at least we get: +# mv: preserving permissions for 'rem_sl': Operation not supported +require_local_dir_ + +pwd_tmp=$(pwd) + +# Unset CDPATH. Otherwise, output from the 'cd dir' command +# can make this test fail. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + +# Four cases: +# local regular file w/symlink on another partition +# (loc_reg, rem_sl) +# (rem_sl, loc_reg) +# local symlink to regular file on another partition +# (loc_sl, rem_reg) +# (rem_reg, loc_sl) + +# Exercise those four cases for each of +# cp and mv, with lots of combinations of options. + +exec 1> actual + +# FIXME: This should be bigger: like more than 8k +contents=XYZ + +loc_reg=loc_reg +loc_sl=loc_sl +rem_reg=$other_partition_tmpdir/rem_reg +rem_sl=$other_partition_tmpdir/rem_sl + +for copy in cp mv; do + for args in \ + 'loc_reg rem_sl' \ + 'rem_sl loc_reg' \ + 'loc_sl rem_reg' \ + 'rem_reg loc_sl' \ + ; do + for options in '' --rem '--rem -d' '--rem -b' -b -bd -d; do + case "$options" in *d*|*--rem*) test $copy = mv && continue;; esac + rm -rf dir || fail=1 + rm -f "$other_partition_tmpdir"/* || fail=1 + mkdir dir || fail=1 + cd dir || fail=1 + case "$args" in *loc_reg*) reg_abs="$(pwd)/$loc_reg" ;; esac + case "$args" in *rem_reg*) reg_abs=$rem_reg ;; esac + case "$args" in *loc_sl*) slink=$loc_sl ;; esac + case "$args" in *rem_sl*) slink=$rem_sl ;; esac + + echo $contents > "$reg_abs" || fail=1 + ln -nsf "$reg_abs" $slink || fail=1 + actual_args=$(echo $args|sed 's,^,$,;s/ / $/') + actual_args=$(eval echo $actual_args) + + ( + ( + # echo 1>&2 cp $options $args + $copy $options $actual_args 2>.err + copy_status=$? + echo $copy_status $copy $options $args + + # 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 && { + echo ' [' | tr -d '\n' + sed 's/^[^:][^:]*\(..\):/\1:/;s,'"$other_partition_tmpdir/,," .err | + tr -d '\n' + echo ']' + } + # Strip off all but the file names. + # Remove any site-dependent part of each file name. + ls=$(ls -gG --ignore=.err . \ + | sed \ + -e '/^total /d' \ + -e "s,$other_partition_tmpdir/,," \ + -e "s,$pwd_tmp/,," \ + -e 's/^[^ ]* *[^ ]* *[^ ]* *[^ ]* *[^ ]* *[^ ]* *//') + ls2=$(cd "$other_partition_tmpdir" && ls -gG --ignore=.err . \ + | sed \ + -e '/^total /d' \ + -e "s,$other_partition_tmpdir/,," \ + -e "s,$pwd_tmp/,," \ + -e 's/^[^ ]* *[^ ]* *[^ ]* *[^ ]* *[^ ]* *[^ ]* *//') + echo " ("$ls") ("$ls2")" + + # If the command failed, then it must not have changed the files. + if test $copy_status != 0; then + for f in $actual_args; do + test -f $f || + { echo " $copy FAILED but removed $f"; continue; } + case "$(cat $f)" in + "$contents") ;; + *) echo " $copy FAILED but modified $f";; + esac + done + fi + + if test $copy = cp; then + # Make sure the original is unchanged and that + # the destination is a copy. + for f in $actual_args; do + if test -f $f; then + if test $copy_status != 0; then + test + fi + case "$(cat $f)" in + "$contents") ;; + *) echo " $copy FAILED";; + esac + else + echo " symlink-loop" + fi + done + fi + ) + ) | sed 's/ *$//' + cd .. + done + echo + done +done + +test $fail = 1 && + { (exit 1); exit; } + +cat <<\EOF > expected +1 cp loc_reg rem_sl + [cp: 'loc_reg' and 'rem_sl' are the same file] + (loc_reg) (rem_sl -> dir/loc_reg) +0 cp --rem loc_reg rem_sl + (loc_reg) (rem_sl) +0 cp --rem -d loc_reg rem_sl + (loc_reg) (rem_sl) +0 cp --rem -b loc_reg rem_sl + (loc_reg) (rem_sl rem_sl~ -> dir/loc_reg) +0 cp -b loc_reg rem_sl + (loc_reg) (rem_sl rem_sl~ -> dir/loc_reg) +0 cp -bd loc_reg rem_sl + (loc_reg) (rem_sl rem_sl~ -> dir/loc_reg) +1 cp -d loc_reg rem_sl + [cp: 'loc_reg' and 'rem_sl' are the same file] + (loc_reg) (rem_sl -> dir/loc_reg) + +1 cp rem_sl loc_reg + [cp: 'rem_sl' and 'loc_reg' are the same file] + (loc_reg) (rem_sl -> dir/loc_reg) +1 cp --rem rem_sl loc_reg + [cp: 'rem_sl' and 'loc_reg' are the same file] + (loc_reg) (rem_sl -> dir/loc_reg) +1 cp --rem -d rem_sl loc_reg + [cp: 'rem_sl' and 'loc_reg' are the same file] + (loc_reg) (rem_sl -> dir/loc_reg) +1 cp --rem -b rem_sl loc_reg + [cp: 'rem_sl' and 'loc_reg' are the same file] + (loc_reg) (rem_sl -> dir/loc_reg) +1 cp -b rem_sl loc_reg + [cp: 'rem_sl' and 'loc_reg' are the same file] + (loc_reg) (rem_sl -> dir/loc_reg) +0 cp -bd rem_sl loc_reg + (loc_reg -> dir/loc_reg loc_reg~) (rem_sl -> dir/loc_reg) + symlink-loop + symlink-loop +1 cp -d rem_sl loc_reg + [cp: 'rem_sl' and 'loc_reg' are the same file] + (loc_reg) (rem_sl -> dir/loc_reg) + +1 cp loc_sl rem_reg + [cp: 'loc_sl' and 'rem_reg' are the same file] + (loc_sl -> rem_reg) (rem_reg) +1 cp --rem loc_sl rem_reg + [cp: 'loc_sl' and 'rem_reg' are the same file] + (loc_sl -> rem_reg) (rem_reg) +1 cp --rem -d loc_sl rem_reg + [cp: 'loc_sl' and 'rem_reg' are the same file] + (loc_sl -> rem_reg) (rem_reg) +1 cp --rem -b loc_sl rem_reg + [cp: 'loc_sl' and 'rem_reg' are the same file] + (loc_sl -> rem_reg) (rem_reg) +1 cp -b loc_sl rem_reg + [cp: 'loc_sl' and 'rem_reg' are the same file] + (loc_sl -> rem_reg) (rem_reg) +0 cp -bd loc_sl rem_reg + (loc_sl -> rem_reg) (rem_reg -> rem_reg rem_reg~) + symlink-loop + symlink-loop +1 cp -d loc_sl rem_reg + [cp: 'loc_sl' and 'rem_reg' are the same file] + (loc_sl -> rem_reg) (rem_reg) + +1 cp rem_reg loc_sl + [cp: 'rem_reg' and 'loc_sl' are the same file] + (loc_sl -> rem_reg) (rem_reg) +0 cp --rem rem_reg loc_sl + (loc_sl) (rem_reg) +0 cp --rem -d rem_reg loc_sl + (loc_sl) (rem_reg) +0 cp --rem -b rem_reg loc_sl + (loc_sl loc_sl~ -> rem_reg) (rem_reg) +0 cp -b rem_reg loc_sl + (loc_sl loc_sl~ -> rem_reg) (rem_reg) +0 cp -bd rem_reg loc_sl + (loc_sl loc_sl~ -> rem_reg) (rem_reg) +1 cp -d rem_reg loc_sl + [cp: 'rem_reg' and 'loc_sl' are the same file] + (loc_sl -> rem_reg) (rem_reg) + +0 mv loc_reg rem_sl + () (rem_sl) +0 mv -b loc_reg rem_sl + () (rem_sl rem_sl~ -> dir/loc_reg) + +1 mv rem_sl loc_reg + [mv: 'rem_sl' and 'loc_reg' are the same file] + (loc_reg) (rem_sl -> dir/loc_reg) +0 mv -b rem_sl loc_reg + (loc_reg -> dir/loc_reg loc_reg~) () + +1 mv loc_sl rem_reg + [mv: 'loc_sl' and 'rem_reg' are the same file] + (loc_sl -> rem_reg) (rem_reg) +0 mv -b loc_sl rem_reg + () (rem_reg -> rem_reg rem_reg~) + +0 mv rem_reg loc_sl + (loc_sl) () +0 mv -b rem_reg loc_sl + (loc_sl loc_sl~ -> rem_reg) () + +EOF + +# Redirect to stderr, since stdout is already taken. +compare expected actual 1>&2 || fail=1 + +Exit $fail diff --git a/tests/mv/partition-perm b/tests/mv/partition-perm deleted file mode 100755 index bbda9da7..00000000 --- a/tests/mv/partition-perm +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -# Make sure permissions are preserved when moving from one partition to another. - -# Copyright (C) 1999-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ mv -cleanup_() { rm -rf "$other_partition_tmpdir"; } -. "$abs_srcdir/other-fs-tmpdir" - -: > file -chmod a=rwx file - -umask 077 -mv file "$other_partition_tmpdir" - -test -f file && fail=1 -test -f "$other_partition_tmpdir/file" || fail=1 - -# This would have failed with the mv from fileutils-4.0i. -mode=$(ls -l "$other_partition_tmpdir/file" | cut -b-10) -test "$mode" = "-rwxrwxrwx" || fail=1 - -Exit $fail diff --git a/tests/mv/partition-perm.sh b/tests/mv/partition-perm.sh new file mode 100755 index 00000000..7fbd2b23 --- /dev/null +++ b/tests/mv/partition-perm.sh @@ -0,0 +1,37 @@ +#!/bin/sh +# Make sure permissions are preserved when moving from one partition to another. + +# Copyright (C) 1999-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ mv +cleanup_() { rm -rf "$other_partition_tmpdir"; } +. "$abs_srcdir/tests/other-fs-tmpdir" + +: > file +chmod a=rwx file + +umask 077 +mv file "$other_partition_tmpdir" + +test -f file && fail=1 +test -f "$other_partition_tmpdir/file" || fail=1 + +# This would have failed with the mv from fileutils-4.0i. +mode=$(ls -l "$other_partition_tmpdir/file" | cut -b-10) +test "$mode" = "-rwxrwxrwx" || fail=1 + +Exit $fail diff --git a/tests/mv/perm-1 b/tests/mv/perm-1 deleted file mode 100755 index 3a7944a6..00000000 --- a/tests/mv/perm-1 +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# ensure that mv gives one diagnostic, not two, when failing -# due to lack of permissions - -# Copyright (C) 2002-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ mv -skip_if_root_ - -mkdir -p no-write/dir || framework_failure_ -chmod u-w no-write || framework_failure_ - - -mv no-write/dir . > out 2>&1 && fail=1 -cat <<\EOF > exp -mv: cannot move 'no-write/dir' to './dir': Permission denied -EOF - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/mv/perm-1.sh b/tests/mv/perm-1.sh new file mode 100755 index 00000000..88fbbdd9 --- /dev/null +++ b/tests/mv/perm-1.sh @@ -0,0 +1,35 @@ +#!/bin/sh +# ensure that mv gives one diagnostic, not two, when failing +# due to lack of permissions + +# Copyright (C) 2002-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ mv +skip_if_root_ + +mkdir -p no-write/dir || framework_failure_ +chmod u-w no-write || framework_failure_ + + +mv no-write/dir . > out 2>&1 && fail=1 +cat <<\EOF > exp +mv: cannot move 'no-write/dir' to './dir': Permission denied +EOF + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/mv/sticky-to-xpart b/tests/mv/sticky-to-xpart deleted file mode 100755 index 6df65024..00000000 --- a/tests/mv/sticky-to-xpart +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/sh -# A cross-partition move of a file in a sticky tmpdir and owned by -# someone else would evoke an invalid diagnostic: -# mv: cannot remove 'x': Operation not permitted -# Affects coreutils-6.0-6.9. - -# Copyright (C) 2007-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ mv -require_root_ - -cleanup_() { rm -rf "$other_partition_tmpdir"; } -. "$abs_srcdir/other-fs-tmpdir" - -# Set up to run a test where non-root user tries to move a root-owned -# file from a sticky tmpdir to a directory owned by that user on -# a different partition. - -mkdir t || framework_failure_ -chmod a=rwx,o+t t || framework_failure_ -echo > t/root-owned || framework_failure_ -chmod a+r t/root-owned || framework_failure_ -chown "$NON_ROOT_USERNAME" "$other_partition_tmpdir" || framework_failure_ - -# We have to allow $NON_ROOT_USERNAME access to ".". -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 | - sed -n '1s/.* //p' -) -case $version in - $PACKAGE_VERSION) ;; - *) skip_ "cannot access just-built mv as user $NON_ROOT_USERNAME";; -esac - -setuidgid $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. -# On other systems (HPUX), we get 'Permission denied'. Convert it, too. -onp='Operation not permitted' -sed "s/Not owner/$onp/;s/Permission denied/$onp/" out-t > out - -cat <<\EOF > exp -mv: cannot remove 't/root-owned': Operation not permitted -EOF - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/mv/sticky-to-xpart.sh b/tests/mv/sticky-to-xpart.sh new file mode 100755 index 00000000..b9afc685 --- /dev/null +++ b/tests/mv/sticky-to-xpart.sh @@ -0,0 +1,67 @@ +#!/bin/sh +# A cross-partition move of a file in a sticky tmpdir and owned by +# someone else would evoke an invalid diagnostic: +# mv: cannot remove 'x': Operation not permitted +# Affects coreutils-6.0-6.9. + +# Copyright (C) 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ mv +require_root_ + +cleanup_() { rm -rf "$other_partition_tmpdir"; } +. "$abs_srcdir/tests/other-fs-tmpdir" + +# Set up to run a test where non-root user tries to move a root-owned +# file from a sticky tmpdir to a directory owned by that user on +# a different partition. + +mkdir t || framework_failure_ +chmod a=rwx,o+t t || framework_failure_ +echo > t/root-owned || framework_failure_ +chmod a+r t/root-owned || framework_failure_ +chown "$NON_ROOT_USERNAME" "$other_partition_tmpdir" || framework_failure_ + +# We have to allow $NON_ROOT_USERNAME access to ".". +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 | + sed -n '1s/.* //p' +) +case $version in + $PACKAGE_VERSION) ;; + *) skip_ "cannot access just-built mv as user $NON_ROOT_USERNAME";; +esac + +setuidgid $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. +# On other systems (HPUX), we get 'Permission denied'. Convert it, too. +onp='Operation not permitted' +sed "s/Not owner/$onp/;s/Permission denied/$onp/" out-t > out + +cat <<\EOF > exp +mv: cannot remove 't/root-owned': Operation not permitted +EOF + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/mv/symlink-onto-hardlink b/tests/mv/symlink-onto-hardlink deleted file mode 100755 index 2dac4840..00000000 --- a/tests/mv/symlink-onto-hardlink +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh -# Ensure that mv works with a few symlink-onto-hard-link cases. - -# Copyright (C) 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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ mv - -touch f || framework_failure_ -ln f h || framework_failure_ -ln -s f s || framework_failure_ - -# Given two links f and h to some important content, and a symlink s to f, -# "mv s f" must fail because it might then be hard to find the link, h. -# "mv s l" may succeed because then, s (now "l") still points to f. -# Of course, if the symlink were being moved into a different destination -# directory, things would be very different, and, I suspect, implausible. - -echo "mv: 's' and 'f' are the same file" > exp || framework_failure_ -mv s f > out 2> err && fail=1 -compare /dev/null out || fail=1 -compare exp err || fail=1 - -mv s l > out 2> err || fail=1 -compare /dev/null out || fail=1 -compare /dev/null err || fail=1 - -Exit $fail diff --git a/tests/mv/symlink-onto-hardlink-to-self b/tests/mv/symlink-onto-hardlink-to-self deleted file mode 100755 index f53f6ef4..00000000 --- a/tests/mv/symlink-onto-hardlink-to-self +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh -# Demonstrate that when moving a symlink onto a hardlink-to-that-symlink, the -# source symlink is removed. Depending on your kernel (e.g., Linux, Solaris, -# 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 Free Software Foundation, Inc. - -# This 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=.}/init.sh"; path_prepend_ ../src -print_ver_ mv - -# Create a file f, and a symlink s1 to that file. -touch f || framework_failure_ -ln -s f s2 || framework_failure_ - -for opt in '' --backup; do - - # Attempt to create a hard link to that symlink. - # On some systems, it's not possible: they create a hard link to the referent. - ln s2 s1 || framework_failure_ - - # If s1 is not a symlink, skip this test. - test -h s1 \ - || skip_ your kernel or file system cannot create a hard link to a symlink - - mv $opt s1 s2 > out 2>&1 || fail=1 - compare /dev/null out || fail=1 - - # Ensure that s1 is gone. - test -e s1 && fail=1 - - if test "$opt" = --backup; then - # With --backup, ensure that the backup file was created. - ref=$(readlink s2~) || fail=1 - test "$ref" = f || fail=1 - else - # Without --backup, ensure there is no backup file. - test -e s2~ && fail=1 - fi - -done - -Exit $fail diff --git a/tests/mv/symlink-onto-hardlink-to-self.sh b/tests/mv/symlink-onto-hardlink-to-self.sh new file mode 100755 index 00000000..1e2bf817 --- /dev/null +++ b/tests/mv/symlink-onto-hardlink-to-self.sh @@ -0,0 +1,56 @@ +#!/bin/sh +# Demonstrate that when moving a symlink onto a hardlink-to-that-symlink, the +# source symlink is removed. Depending on your kernel (e.g., Linux, Solaris, +# 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. + +# This 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_ mv + +# Create a file f, and a symlink s1 to that file. +touch f || framework_failure_ +ln -s f s2 || framework_failure_ + +for opt in '' --backup; do + + # Attempt to create a hard link to that symlink. + # On some systems, it's not possible: they create a hard link to the referent. + ln s2 s1 || framework_failure_ + + # If s1 is not a symlink, skip this test. + test -h s1 \ + || skip_ your kernel or file system cannot create a hard link to a symlink + + mv $opt s1 s2 > out 2>&1 || fail=1 + compare /dev/null out || fail=1 + + # Ensure that s1 is gone. + test -e s1 && fail=1 + + if test "$opt" = --backup; then + # With --backup, ensure that the backup file was created. + ref=$(readlink s2~) || fail=1 + test "$ref" = f || fail=1 + else + # Without --backup, ensure there is no backup file. + test -e s2~ && fail=1 + fi + +done + +Exit $fail diff --git a/tests/mv/symlink-onto-hardlink.sh b/tests/mv/symlink-onto-hardlink.sh new file mode 100755 index 00000000..0e62de7f --- /dev/null +++ b/tests/mv/symlink-onto-hardlink.sh @@ -0,0 +1,41 @@ +#!/bin/sh +# Ensure that mv works with a few symlink-onto-hard-link cases. + +# Copyright (C) 2012-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ mv + +touch f || framework_failure_ +ln f h || framework_failure_ +ln -s f s || framework_failure_ + +# Given two links f and h to some important content, and a symlink s to f, +# "mv s f" must fail because it might then be hard to find the link, h. +# "mv s l" may succeed because then, s (now "l") still points to f. +# Of course, if the symlink were being moved into a different destination +# directory, things would be very different, and, I suspect, implausible. + +echo "mv: 's' and 'f' are the same file" > exp || framework_failure_ +mv s f > out 2> err && fail=1 +compare /dev/null out || fail=1 +compare exp err || fail=1 + +mv s l > out 2> err || fail=1 +compare /dev/null out || fail=1 +compare /dev/null err || fail=1 + +Exit $fail diff --git a/tests/mv/to-symlink b/tests/mv/to-symlink deleted file mode 100755 index c203d7a4..00000000 --- a/tests/mv/to-symlink +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -# Make sure that the copying code used in an inter-partition -# move unlinks a destination symlink before opening it. - -# Copyright (C) 1999-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ mv -cleanup_() { rm -rf "$other_partition_tmpdir"; } -. "$abs_srcdir/other-fs-tmpdir" - -rem_file="$other_partition_tmpdir/file" -rem_symlink="$other_partition_tmpdir/symlink" -file=to-sym - -echo local > $file || framework_failure_ -echo remote > $rem_file || framework_failure_ -ln -s $rem_file $rem_symlink || framework_failure_ - -# This mv command should succeed, unlinking the symlink -# before copying. -mv $file $rem_symlink || fail=1 - -# Make sure $file is gone. -test -f $file && fail=1 - -# Make sure $rem_file is unmodified. -test $(cat $rem_file) = remote || fail=1 - -Exit $fail diff --git a/tests/mv/to-symlink.sh b/tests/mv/to-symlink.sh new file mode 100755 index 00000000..cce4b768 --- /dev/null +++ b/tests/mv/to-symlink.sh @@ -0,0 +1,43 @@ +#!/bin/sh +# 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. + +# This 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_ mv +cleanup_() { rm -rf "$other_partition_tmpdir"; } +. "$abs_srcdir/tests/other-fs-tmpdir" + +rem_file="$other_partition_tmpdir/file" +rem_symlink="$other_partition_tmpdir/symlink" +file=to-sym + +echo local > $file || framework_failure_ +echo remote > $rem_file || framework_failure_ +ln -s $rem_file $rem_symlink || framework_failure_ + +# This mv command should succeed, unlinking the symlink +# before copying. +mv $file $rem_symlink || fail=1 + +# Make sure $file is gone. +test -f $file && fail=1 + +# Make sure $rem_file is unmodified. +test $(cat $rem_file) = remote || fail=1 + +Exit $fail diff --git a/tests/mv/trailing-slash b/tests/mv/trailing-slash deleted file mode 100755 index 26f88025..00000000 --- a/tests/mv/trailing-slash +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/sh -# On some operating systems, e.g. SunOS-4.1.1_U1 on sun3x, -# rename() doesn't accept trailing slashes. -# Also, ensure that "mv dir non-exist-dir/" works. -# Also, ensure that "cp dir non-exist-dir/" works. - -# Copyright (C) 2004-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ mv - -mkdir foo || framework_failure_ - - -mv foo/ bar || fail=1 - -# mv and cp would misbehave for coreutils versions [5.3.0..5.97], 6.0 and 6.1 -for cmd in mv 'cp -r'; do - for opt in '' -T -u; do - rm -rf d e || framework_failure_ - mkdir d || framework_failure_ - - $cmd $opt d e/ || fail=1 - if test "$cmd" = mv; then - test -d d && fail=1 - else - test -d d || fail=1 - fi - test -d e || fail=1 - done -done - -# We would like the erroneous-looking "mv any non-dir/" to fail, -# but with the current implementation, it depends on how the -# underlying rename syscall handles the trailing slash. -# It does fail, as desired, on recent Linux and Solaris systems. -#touch a a2 -#mv a a2/ && fail=1 - -# Test for a cp-specific diagnostic introduced after coreutils-8.7: -printf '%s\n' \ - "cp: cannot create regular file 'no-such/': Not a directory" \ -> expected-err -touch b -cp b no-such/ 2> err && fail=1 - -# Map "No such file..." diagnostic to the expected "Not a directory" -sed 's/No such file or directory/Not a directory/' err > k && mv k err - -compare expected-err err || fail=1 - -Exit $fail diff --git a/tests/mv/trailing-slash.sh b/tests/mv/trailing-slash.sh new file mode 100755 index 00000000..98a99133 --- /dev/null +++ b/tests/mv/trailing-slash.sh @@ -0,0 +1,65 @@ +#!/bin/sh +# On some operating systems, e.g. SunOS-4.1.1_U1 on sun3x, +# rename() doesn't accept trailing slashes. +# 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. + +# This 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_ mv + +mkdir foo || framework_failure_ + + +mv foo/ bar || fail=1 + +# mv and cp would misbehave for coreutils versions [5.3.0..5.97], 6.0 and 6.1 +for cmd in mv 'cp -r'; do + for opt in '' -T -u; do + rm -rf d e || framework_failure_ + mkdir d || framework_failure_ + + $cmd $opt d e/ || fail=1 + if test "$cmd" = mv; then + test -d d && fail=1 + else + test -d d || fail=1 + fi + test -d e || fail=1 + done +done + +# We would like the erroneous-looking "mv any non-dir/" to fail, +# but with the current implementation, it depends on how the +# underlying rename syscall handles the trailing slash. +# It does fail, as desired, on recent Linux and Solaris systems. +#touch a a2 +#mv a a2/ && fail=1 + +# Test for a cp-specific diagnostic introduced after coreutils-8.7: +printf '%s\n' \ + "cp: cannot create regular file 'no-such/': Not a directory" \ +> expected-err +touch b +cp b no-such/ 2> err && fail=1 + +# Map "No such file..." diagnostic to the expected "Not a directory" +sed 's/No such file or directory/Not a directory/' err > k && mv k err + +compare expected-err err || fail=1 + +Exit $fail diff --git a/tests/mv/update b/tests/mv/update deleted file mode 100755 index f0beb407..00000000 --- a/tests/mv/update +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh -# make sure --update works as advertised - -# Copyright (C) 2001-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ cp mv - -echo old > old || framework_failure_ -touch -d yesterday old || framework_failure_ -echo new > new || framework_failure_ - - -for interactive in '' -i; do - for cp_or_mv in cp mv; do - # This is a no-op, with no prompt. - # 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 - case "$(cat new)" in new) ;; *) fail=1 ;; esac - case "$(cat old)" in old) ;; *) fail=1 ;; esac - done -done - -# This will actually perform the rename. -mv --update new old || fail=1 -test -f new && fail=1 -case "$(cat old)" in new) ;; *) fail=1 ;; esac - -# Restore initial conditions. -echo old > old || fail=1 -touch -d yesterday old || fail=1 -echo new > new || fail=1 - -# This will actually perform the copy. -cp --update new old || fail=1 -case "$(cat old)" in new) ;; *) fail=1 ;; esac -case "$(cat new)" in new) ;; *) fail=1 ;; esac - -Exit $fail diff --git a/tests/mv/update.sh b/tests/mv/update.sh new file mode 100755 index 00000000..0bc770d8 --- /dev/null +++ b/tests/mv/update.sh @@ -0,0 +1,54 @@ +#!/bin/sh +# make sure --update works as advertised + +# Copyright (C) 2001-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp mv + +echo old > old || framework_failure_ +touch -d yesterday old || framework_failure_ +echo new > new || framework_failure_ + + +for interactive in '' -i; do + for cp_or_mv in cp mv; do + # This is a no-op, with no prompt. + # 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 + case "$(cat new)" in new) ;; *) fail=1 ;; esac + case "$(cat old)" in old) ;; *) fail=1 ;; esac + done +done + +# This will actually perform the rename. +mv --update new old || fail=1 +test -f new && fail=1 +case "$(cat old)" in new) ;; *) fail=1 ;; esac + +# Restore initial conditions. +echo old > old || fail=1 +touch -d yesterday old || fail=1 +echo new > new || fail=1 + +# This will actually perform the copy. +cp --update new old || fail=1 +case "$(cat old)" in new) ;; *) fail=1 ;; esac +case "$(cat new)" in new) ;; *) fail=1 ;; esac + +Exit $fail diff --git a/tests/no-perl b/tests/no-perl new file mode 100644 index 00000000..956a8264 --- /dev/null +++ b/tests/no-perl @@ -0,0 +1,6 @@ +#! /bin/sh +# Perl is not available, the test should be considered skipped. +# FD 9 should have been opened by the test suite harness, pointing +# to the original stderr (usually, the user's terminal). +echo "test skipped: no usable version of Perl found" >&9 +exit 77 diff --git a/tests/other-fs-tmpdir b/tests/other-fs-tmpdir index 4bdfe6ff..c141b9e6 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-2012 Free Software Foundation, Inc. +# Copyright (C) 1998-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 diff --git a/tests/pr/pr-tests b/tests/pr/pr-tests deleted file mode 100755 index 259c9d6c..00000000 --- a/tests/pr/pr-tests +++ /dev/null @@ -1,460 +0,0 @@ -#!/usr/bin/perl -# Test pr. - -# Copyright (C) 2008-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 -# 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; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -my $prog = 'pr'; - -my @tv = ( - -# -b option is no longer an official option. But it's still working to -# get a downward compatibility. Now (version 1.19m or newer) -COLUMN -# only is equivalent to -b -COLUMN. -# -# test_name options input-file-name(s) expected-output-group-file-name -# expected-return-code -# ------------------------------------------------------------------------- -# Following tests with "FF set" don't contain a complete set of all -# combinations of options and FF-arrangements -# -# One FF at start of file (one empty page) -# ['1a', '', [\'0Ft'], [\'0F'], 0], -['1b', '', [\'0Fnt'], [\'0F'], 0], -['1c', '+3', [\'0Ft'], [\'3-0F'], 0], -['1d', '+3 -f', [\'0Ft'], [\'3f-0F'], 0], -['1e', '-a -3', [\'0Ft'], [\'a3-0F'], 0], -['1f', '-a -3 -f', [\'0Ft'], [\'a3f-0F'], 0], -['1g', '-a -3 -f', [\'0Fnt'], [\'a3f-0F'], 0], -['1h', '+3 -a -3 -f', [\'0Ft'], [\'3a3f-0F'], 0], -['1i', '-b -3', [\'0Ft'], [\'b3-0F'], 0], -['1j', '-b -3 -f', [\'0Ft'], [\'b3f-0F'], 0], -['1k', '-b -3 -f', [\'0Fnt'], [\'b3f-0F'], 0], -['1l', '+3 -b -3 -f', [\'0Ft'], [\'3b3f-0F'], 0], -# Two FF at start of file (two empty page) -['2a', '', [\'0FFt'], [\'0FF'], 0], -['2b', '', [\'0FnFnt'], [\'0FF'], 0], -['2c', '-a -3 -f', [\'0FFt'], [\'a3f-0FF'], 0], -['2d', '-a -3 -f', [\'0FFnt'], [\'a3f-0FF'], 0], -['2e', '-b -3 -f', [\'0FFt'], [\'b3f-0FF'], 0], -['2f', '-b -3 -f', [\'0FFnt'], [\'b3f-0FF'], 0], -['2g', '-b -3 -f', [\'0FnFt'], [\'b3f-0FF'], 0], -['2h', '-b -3 -f', [\'0FnFnt'], [\'b3f-0FF'], 0], -['2i', '+3 -b -3 -f', [\'0FFt'], [\'3b3f-0FF'], 0], -['2j', '+3 -b -3 -f', [\'0FFnt'], [\'3b3f-0FF'], 0], -# -# FFs in text (none / one / two empty page(s)) -['3a', '', [\'FFn'], [\'FF'], 0], -['3b', '', [\'FnFn'], [\'FF'], 0], -['3c', '+3', [\'FFn'], [\'3-FF'], 0], -['3d', '+3 -f', [\'FFn'], [\'3f-FF'], 0], -['3e', '-a -3 -f', [\'FFn'], [\'a3f-FF'], 0], -['3f', '-a -3 -f', [\'FFtn'], [\'a3f-FF'], 0], -['3g', '-b -3 -f', [\'FFn'], [\'b3f-FF'], 0], -['3h', '-b -3 -f', [\'FFtn'], [\'b3f-FF'], 0], -['3i', '-b -3 -f', [\'FnFn'], [\'b3f-FF'], 0], -['3j', '-b -3 -f', [\'tFFn'], [\'b3f-FF'], 0], -['3k', '-b -3 -f', [\'tFnFt'], [\'b3f-FF'], 0], -['3l', '+3 -b -3 -f', [\'FFn'], [\'3b3f-FF'], 0], -['3m', '+3 -b -3 -f', [\'FFtn'], [\'3b3f-FF'], 0], -# A full page printed (lines_left_on_page = 0) without a FF found. -# Avoid an extra empty page if a FF follows in the next input line. -['3la', '-l 24', [\'FFn'], [\'l24-FF'], 0], -['3lb', '-l 24', [\'FFtn'], [\'l24-FF'], 0], -['3lc', '-l 24', [\'FnFn'], [\'l24-FF'], 0], -['3ld', '-l 24', [\'tFFn'], [\'l24-FF'], 0], -['3le', '-l 24', [\'tFnFt'], [\'l24-FF'], 0], -['3lf', '-l 24', [\'tFFt'], [\'l24-FF'], 0], -['3aa', '-a -2 -l 17', [\'FFn'], [\'a2l17-FF'], 0], -['3ab', '-a -2 -l 17', [\'FFtn'], [\'a2l17-FF'], 0], -['3ac', '-a -2 -l 17', [\'FnFn'], [\'a2l17-FF'], 0], -['3ad', '-a -2 -l 17', [\'tFFn'], [\'a2l17-FF'], 0], -['3ae', '-a -2 -l 17', [\'tFnFt'], [\'a2l17-FF'], 0], -['3af', '-a -2 -l 17', [\'tFFt'], [\'a2l17-FF'], 0], -['3ag', '-a -2 -l 15', [\'FFn'], [\'a2l15-FF'], 0], -['3ah', '-a -2 -l 15', [\'FFtn'], [\'a2l15-FF'], 0], -['3ai', '-a -2 -l 15', [\'FnFn'], [\'a2l15-FF'], 0], -['3aj', '-a -2 -l 15', [\'tFFn'], [\'a2l15-FF'], 0], -['3ak', '-a -2 -l 15', [\'tFnFt'], [\'a2l15-FF'], 0], -['3ba', '-b -2 -l 17', [\'FFn'], [\'b2l17-FF'], 0], -['3bb', '-b -2 -l 17', [\'FFtn'], [\'b2l17-FF'], 0], -['3bc', '-b -2 -l 17', [\'FnFn'], [\'b2l17-FF'], 0], -['3bd', '-b -2 -l 17', [\'tFFn'], [\'b2l17-FF'], 0], -['3be', '-b -2 -l 17', [\'tFnFt'], [\'b2l17-FF'], 0], -['3bf', '-b -2 -l 17', [\'tFFt'], [\'b2l17-FF'], 0], -['3bg', '-b -2 -l 15', [\'FFn'], [\'b2l15-FF'], 0], -['3bh', '-b -2 -l 15', [\'FFtn'], [\'b2l15-FF'], 0], -['3bi', '-b -2 -l 15', [\'FnFn'], [\'b2l15-FF'], 0], -['3bj', '-b -2 -l 15', [\'tFFn'], [\'b2l15-FF'], 0], -['3bk', '-b -2 -l 15', [\'tFnFt'], [\'b2l15-FF'], 0], -['3Pa', '+4 -l 24', [\'FFn'], [\'4l24-FF'], 0], -['3Pb', '+4 -l 24', [\'FFtn'], [\'4l24-FF'], 0], -['3Pc', '+4 -l 24', [\'FnFn'], [\'4l24-FF'], 0], -['3Pd', '+4 -l 24', [\'tFFn'], [\'4l24-FF'], 0], -['3Pe', '+4 -l 24', [\'tFnFt'], [\'4l24-FF'], 0], -['3Pf', '+4 -l 24', [\'tFFt'], [\'4l24-FF'], 0], -['3Pg', '+4:7 -l 24', [\'tFFt'], [\'4-7l24-FF'], 0], -['3Paa', '+3 -a -2 -l 17', [\'FFn'], [\'3a2l17-FF'], 0], -['3Pab', '+3 -a -2 -l 17', [\'FFtn'], [\'3a2l17-FF'], 0], -['3Pac', '+3 -a -2 -l 17', [\'FnFn'], [\'3a2l17-FF'], 0], -['3Pad', '+3 -a -2 -l 17', [\'tFFn'], [\'3a2l17-FF'], 0], -['3Pae', '+3 -a -2 -l 17', [\'tFnFt'], [\'3a2l17-FF'], 0], -['3Paf', '+3 -a -2 -l 17', [\'tFFt'], [\'3a2l17-FF'], 0], -['3Pba', '+3 -b -2 -l 17', [\'FFn'], [\'3b2l17-FF'], 0], -['3Pbb', '+3 -b -2 -l 17', [\'FFtn'], [\'3b2l17-FF'], 0], -['3Pbc', '+3 -b -2 -l 17', [\'FnFn'], [\'3b2l17-FF'], 0], -['3Pbd', '+3 -b -2 -l 17', [\'tFFn'], [\'3b2l17-FF'], 0], -['3Pbe', '+3 -b -2 -l 17', [\'tFnFt'], [\'3b2l17-FF'], 0], -['3Pbf', '+3 -b -2 -l 17', [\'tFFt'], [\'3b2l17-FF'], 0], -# -# Without "FF set by hand" -['4a', '-l 24', [\'tn'], [\'l24-t'], 0], -['4b', '-l 24 -f', [\'tn'], [\'l24f-t'], 0], -['4c', '+3 -l 24', [\'tn'], [\'3l24-t'], 0], -['4d', '+3 -l 24 -f', [\'tn'], [\'3l24f-t'], 0], -['4e', '+3:5 -l 24 -f', [\'tn'], [\'3-5l24f-t'], 0], -['4f', '-a -3 -l 15', [\'tn'], [\'a3l15-t'], 0], -['4g', '-a -3 -l 15 -f', [\'tn'], [\'a3l15f-t'], 0], -['4h', '+3 -a -3 -l 15', [\'tn'], [\'3a3l15-t'], 0], -['4i', '+3 -a -3 -l 15 -f', [\'tn'], [\'3a3l15f-t'], 0], -['4j', '-b -3 -l 15', [\'tn'], [\'b3l15-t'], 0], -['4k', '-b -3 -l 15 -f', [\'tn'], [\'b3l15f-t'], 0], -['4l', '+3 -b -3 -l 15', [\'tn'], [\'3b3l15-t'], 0], -['4m', '+3 -b -3 -l 15 -f', [\'tn'], [\'3b3l15f-t'], 0], -# -# Merge input files (-m option) -['5a', '-m -l 24', [\'tn', \'tn'], [\'ml24-t'], 0], -['5b', '-m -l 24 -f', [\'tn', \'tn'], [\'ml24f-t'], 0], -['5c', '+3 -m -l 24', [\'tn', \'tn'], [\'3ml24-t'], 0], -['5d', '+3 -m -l 24 -f', [\'tn', \'tn'], [\'3ml24f-t'], 0], -['5e', '-m -l 24 -f', [\'0Ft', \'0Ft'], [\'ml24f-0F'], 0], -['5f', '-m -l 24 -f', [\'0Ft', \'0Fnt'], [\'ml24f-0F'], 0], -['5g', '-m -l 24 -f', [\'tn', \'0Ft'], [\'ml24f-t-0F'], 0], -# A full page printed (lines_left_on_page = 0) without a FF found. -# Avoid an extra empty page if a FF follows in the next input line. -['5ma', '-m -l 24', [\'tFFn', \'tFnFt'], [\'ml24-FF'], 0], -['5mb', '-m -l 24', [\'tFFn', \'FFn'], [\'ml24-FF'], 0], -['5mc', '-m -l 24', [\'tn', \'FFn'], [\'ml24-t-FF'], 0], -['5md', '-m -l 20', [\'FFn', \'tn'], [\'ml20-FF-t'], 0], -['5Pma', '+3 -m -l 24', [\'FFn', \'FnFn'], [\'3ml24-FF'], 0], -['5Pmb', '+3 -m -l 24', [\'tFFn', \'FFn'], [\'3ml24-FF'], 0], -['5Pmc', '+3 -m -l 24', [\'tn', \'FFn'], [\'3ml24-t-FF'], 0], -# -# Do not print header and footer but retain "FF set by Hand" -# (-t option) -['6a', '-t -l 24', [\'tn'], [\'t-t'], 0], -['6b', '-t -l 24 -f', [\'tn'], [\'t-t'], 0], -['6c', '-t -l 24 -f', [\'tFFt-bl'], [\'t-bl'], 0], -['6d', '-t -l 24', [\'0FnFnt'], [\'t-0FF'], 0], -['6e', '-t -l 24', [\'FFn'], [\'t-FF'], 0], -['6f', '-t -l 24', [\'FnFn'], [\'t-FF'], 0], -['6g', '-t -l 24 -f', [\'FFn'], [\'t-FF'], 0], -['6aa', '-t -a -3', [\'0FnFnt'], [\'ta3-0FF'], 0], -['6ab', '-t -a -3', [\'FFn'], [\'ta3-FF'], 0], -['6ac', '-t -a -3 -l 24', [\'FnFn'], [\'ta3-FF'], 0], -['6ba', '-t -b -3', [\'0FnFnt'], [\'tb3-0FF'], 0], -['6bb', '-t -b -3', [\'FFn'], [\'tb3-FF'], 0], -['6bc', '-t -b -3 -l 24', [\'FnFn'], [\'tb3-FF'], 0], -# -# Do not print header and footer nor "FF set by Hand" (-T option) -['7a', '-T -l 24', [\'tn'], [\'tt-t'], 0], -['7b', '-T -l 24 -f', [\'tn'], [\'tt-t'], 0], -['7c', '-T -l 24 -f', [\'tFFt-bl'], [\'tt-bl'], 0], -['7d', '-T -l 24', [\'0FnFnt'], [\'tt-0FF'], 0], -['7e', '-T -l 24', [\'FFn'], [\'tt-FF'], 0], -['7f', '-T -l 24', [\'FnFn'], [\'tt-FF'], 0], -['7g', '-T -l 24 -f', [\'FFn'], [\'tt-FF'], 0], -['7aa', '-T -a -3', [\'0FnFnt'], [\'tta3-0FF'], 0], -['7ab', '-T -a -3', [\'FFn'], [\'tta3-FF'], 0], -['7ac', '-T -a -3 -l 24', [\'FnFn'], [\'tta3-FF'], 0], -['7ba', '-T -b -3', [\'0FnFnt'], [\'ttb3-0FF'], 0], -['7bb', '-T -b -3', [\'FFn'], [\'ttb3-FF'], 0], -['7bc', '-T -b -3 -l 24', [\'FnFn'], [\'ttb3-FF'], 0], -# -# lhs-truncation of header -# pr-1.19m: Text line truncation only with column output -# -# numbering lines (-n -N option) -# skip pages (+FIRST_PAGE[:LAST_PAGE] option) -['9a', '-n.3 -l 24 -f', [\'tFFt-bl'], [\'nl24f-bl'], 0], -['9b', '-n.3 -N 15 -l 24 -f', [\'tFFt-bl'], [\'nN15l24f-bl'], 0], -['9Pa', '-n.3 +2 -l 24 -f', [\'tFFt-bl'], [\'n+2l24f-bl'], 0], -['9Pb', '-n.3 +3 -l 24 -f', [\'tFFt-bl'], [\'n+3l24f-bl'], 0], -['9Pc', '-n.3 -N 1 +3 -l 24 -f', [\'tFFt-bl'], [\'nN1+3l24f-bl'], 0], -['9Pe', '-n.3 +2 -l 24 -f', [\'0FFt'], [\'n+2l24f-0FF'], 0], -['9Pf', '-n.3 +2 -l 24 -f', [\'0FFnt'], [\'n+2l24f-0FF'], 0], -['9Pg', '-n.3 +2 -l 24 -f', [\'0FnFt'], [\'n+2l24f-0FF'], 0], -['9Ph', '-n.3 +2 -l 24 -f', [\'0FnFnt'], [\'n+2l24f-0FF'], 0], -['9Pi', '-n.3 +2:5 -l 24 -f', [\'0FFt'], [\'n+2-5l24f-0FF'], 0], -['9Pj', '-n.3 +3 -l 24 -f', [\'0FFt'], [\'n+3l24f-0FF'], 0], -['9Pk', '-n.3 +3 -l 24 -f', [\'0FFnt'], [\'n+3l24f-0FF'], 0], -['9Pl', '-n.3 +3 -l 24 -f', [\'0FnFt'], [\'n+3l24f-0FF'], 0], -['9Pm', '-n.3 +3 -l 24 -f', [\'0FnFnt'], [\'n+3l24f-0FF'], 0], -['9Pn', '-n.3 +7 -l 24', [\'FFn'], [\'n+7l24-FF'], 0], -['9Po', '-n.3 +7 -l 24', [\'FFtn'], [\'n+7l24-FF'], 0], -['9Pp', '-n.3 +7 -l 24', [\'FnFn'], [\'n+7l24-FF'], 0], -['9Pq', '-n.3 +3:7 -l 24', [\'FnFn'], [\'n+3-7l24-FF'], 0], -['9Pr', '-n.3 +8 -l 20', [\'tFFn'], [\'n+8l20-FF'], 0], -['9Ps', '-n.3 +8 -l 20', [\'tFnFt'], [\'n+8l20-FF'], 0], -['9Pt', '-n.3 +8 -l 20', [\'tFFt'], [\'n+8l20-FF'], 0], -['9Paa', '-n.3 +5 -a -3 -l 13 -f', [\'0FFt'], [\'n+5a3l13f-0FF'], 0], -['9Pab', '-n.3 +5 -a -3 -l 13 -f', [\'0FFnt'], [\'n+5a3l13f-0FF'], 0], -['9Pac', '-n.3 +5 -a -3 -l 13 -f', [\'0FnFt'], [\'n+5a3l13f-0FF'], 0], -['9Pad', '-n.3 +5 -a -3 -l 13 -f', [\'0FnFnt'], [\'n+5a3l13f-0FF'], 0], -['9Pae', '-n.3 +6 -a -2 -l 17', [\'FFn'], [\'n+6a2l17-FF'], 0], -['9Paf', '-n.3 +6 -a -2 -l 17', [\'FFtn'], [\'n+6a2l17-FF'], 0], -['9Pag', '-n.3 +6 -a -2 -l 17', [\'FnFn'], [\'n+6a2l17-FF'], 0], -['9Pah', '-n.3 +6 -a -2 -l 17', [\'tFFn'], [\'n+6a2l17-FF'], 0], -['9Pai', '-n.3 +6 -a -2 -l 17', [\'tFnFt'], [\'n+6a2l17-FF'], 0], -['9Paj', '-n.3 +6 -a -2 -l 17', [\'tFFt'], [\'n+6a2l17-FF'], 0], -['9Pak', '-n.3 +4:8 -a -2 -l 17', [\'tFFt'], [\'n+4-8a2l17-FF'], 0], -['9Pba', '-n.3 +4 -b -2 -l 17 -f', [\'0FFt'], [\'n+4b2l17f-0FF'], 0], -['9Pbb', '-n.3 +4 -b -2 -l 17 -f', [\'0FFnt'], [\'n+4b2l17f-0FF'], 0], -['9Pbc', '-n.3 +4 -b -2 -l 17 -f', [\'0FnFt'], [\'n+4b2l17f-0FF'], 0], -['9Pbd', '-n.3 +4 -b -2 -l 17 -f', [\'0FnFnt'], [\'n+4b2l17f-0FF'], 0], -['9Pbe', '-n.3 +6 -b -3 -l 13 -f', [\'FFn'], [\'n+6b3l13f-FF'], 0], -['9Pbf', '-n.3 +6 -b -3 -l 13 -f', [\'FFtn'], [\'n+6b3l13f-FF'], 0], -['9Pbg', '-n.3 +6 -b -3 -l 13 -f', [\'FnFn'], [\'n+6b3l13f-FF'], 0], -['9Pbh', '-n.3 +6 -b -3 -l 13 -f', [\'tFFn'], [\'n+6b3l13f-FF'], 0], -['9Pbi', '-n.3 +6 -b -3 -l 13 -f', [\'tFnFt'], [\'n+6b3l13f-FF'], 0], -['9Pbj', '-n.3 +6 -b -3 -l 13 -f', [\'tFFt'], [\'n+6b3l13f-FF'], 0], -['9Pbk', '-n.3 +5:8 -b -3 -l 17 -f', [\'FnFn'], [\'n+5-8b3l17f-FF'], 0], -['9Pma', '-n.3 +3 -m -l 20 -f', [\'tFFt-bl', \'FnFn'], [\'n+3ml20f-bl-FF'], 0], -['9Pmb', '-n.3 +3 -m -l 24 -f', [\'tFFt-bl', \'tn'], [\'n+3ml24f-bl-tn'], 0], -['9Pmc', '-n.3 +3 -m -l 24 -f', [\'tn', \'tFFt-bl'], [\'n+3ml24f-tn-bl'], 0], -# -# line truncation column alignment; header line truncation -# -w/W PAGE_WIDTH [-J] options -['10wa', '-W 72 -J -l24 -f', [\'tFFt-ll'], [\'W72Jl24f-ll'], 0], -['10wb', '-w 72 -J -l24 -f', [\'tFFt-ll'], [\'W72Jl24f-ll'], 0], -['10wc', '-W 72 -l24 -f', [\'tFFt-ll'], [\'W-72l24f-ll'], 0], -['10wd', '-w 72 -l24 -f', [\'tFFt-ll'], [\'w72l24f-ll'], 0], -['10we', '-W 28 -l24 -f', [\'tFFt-ll'], [\'W28l24f-ll'], 0], -['10wf', '-W 27 -l24 -f', [\'tFFt-ll'], [\'W27l24f-ll'], 0], -['10wg', '-W 26 -l24 -f', [\'tFFt-ll'], [\'W26l24f-ll'], 0], -['10wh', '-W 20 -l24 -f', [\'tFFt-ll'], [\'W20l24f-ll'], 0], -['10ma', '-m -l 24 -f', [\'tFFt-lm', \'loli'], [\'ml24f-lm-lo'], 0], -['10mb', '-W 35 -m -l 24 -f', [\'tFFt-lm', \'loli'], [\'W35ml24f-lm-lo'], 0], -['10mc', '-w 35 -m -l 24 -f', [\'tFFt-lm', \'loli'], [\'W35ml24f-lm-lo'], 0], -['10md', '-J -m -l 24 -f', [\'tFFt-lm', \'loli'], [\'Jml24f-lm-lo'], 0], -['10me', '-W 35 -J -m -l 24 -f', [\'tFFt-lm', \'loli'], [\'W35Jml24f-lmlo'], 0], -['10mf', '-w 35 -J -m -l 24 -f', [\'tFFt-lm', \'loli'], [\'W35Jml24f-lmlo'], 0], -['10mg', '-n.3 -J -m -l 24 -f', [\'tFFt-lm', \'tFFt-lm', \'loli'], - [\'nJml24f-lmlmlo'], 0], -['10mh', '-n.3 -J -m -l 24 -f', [\'tFFt-lm', \'loli', \'tFFt-lm'], - [\'nJml24f-lmlolm'], 0], -['10aa', '-a -3 -l 24 -f', [\'tFFt-lm'], [\'a3l24f-lm'], 0], -['10ab', '-W 35 -a -3 -l 24 -f', [\'tFFt-lm'], [\'W35a3l24f-lm'], 0], -['10ac', '-J -a -3 -l 24 -f', [\'tFFt-lm'], [\'Ja3l24f-lm'], 0], -['10ad', '-W 35 -J -a -3 -l 24 -f', [\'tFFt-lm'], [\'W35Ja3l24f-lm'], 0], -['10ba', '-b -3 -l 24 -f', [\'tFFt-lm'], [\'b3l24f-lm'], 0], -['10bb', '-W 35 -b -3 -l 24 -f', [\'tFFt-lm'], [\'W35b3l24f-lm'], 0], -['10bc', '-J -b -3 -l 24 -f', [\'tFFt-lm'], [\'Jb3l24f-lm'], 0], -['10bd', '-W 35 -J -b -3 -l 24 -f', [\'tFFt-lm'], [\'W35Jb3l24f-lm'], 0], -# -# merge files (-m option) use separator string (-S option) -['11sa', '-n.3 -S:--: -m -l 20 -f', [\'tFFt-bl', \'FnFn'], - [\'nSml20-bl-FF'], 0], -['11sb', '-n.3 -S:--: -m -l 24 -f', [\'tFFt-bl', \'FnFn'], - [\'nSml24-bl-FF'], 0], -['11se', '-n.3 -S:--: -m -l 20 -f', [\'tn', \'tn', \'FnFn'], - [\'nSml20-t-t-FF'], 0], -['11sf', '-n.3 -S:--: -m -l 24 -f', [\'tn', \'tn', \'FnFn'], - [\'nSml24-t-t-FF'], 0], -['11sg', '-n.3 -S:--: -m -l 20 -f', [\'tn', \'tn', \'FnFn', \'FnFn'], - [\'nSml20-t-tFFFF'], 0], -['11sh', '-n.3 -S:--: -m -l 24 -f', [\'tn', \'tn', \'FnFn', \'FnFn'], - [\'nSml24-t-tFFFF'], 0], -# -# left margin (-o option) and separator string (-S option) -['12aa', '-o3 -a -3 -l24 -f', [\'tn'], [\'o3a3l24f-tn'], 0], -['12ab', '-o3 -a -3 -S:--: -l24 -f', [\'tn'], [\'o3a3Sl24f-tn'], 0], -['12ac', '-o3 -a -3 -S:--: -n. -l24 -f', [\'tn'], [\'o3a3Snl24f-tn'], 0], -['12ba', '-o3 -b -3 -l24 -f', [\'tn'], [\'o3b3l24f-tn'], 0], -['12bb', '-o3 -b -3 -S:--: -l24 -f', [\'tn'], [\'o3b3Sl24f-tn'], 0], -['12bc', '-o3 -b -3 -S:--: -n. -l24 -f', [\'tn'], [\'o3b3Snl24f-tn'], 0], -['12ma', '-o3 -m -l24 -f', [\'tFFt-bl', \'tn'], [\'o3ml24f-bl-tn'], 0], -['12mb', '-o3 -m -S:--: -l24 -f', [\'tFFt-bl', \'tn'], [\'o3mSl24f-bl-tn'], 0], -['12mc', '-o3 -m -S:--: -n. -l24 -f', [\'tFFt-bl', \'tn'], - [\'o3mSnl24fbltn'], 0], -['12md', '-o3 -J -m -l24 -f', [\'tFFt-lm', \'loli'], [\'o3Jml24f-lm-lo'], 0], -# -# -# Single column output: POSIX compliant, adapt other UNIXes (SunOS.5.5.1 e.g.) -# number-separator TAB always an output TAB --> varying number/text-spacing -['13a', '-t -n -e8', [\'t_tab'], [\'tne8-t_tab'], 0], -['13b', '-t -n -e8 -o3', [\'t_tab'], [\'tne8o3-t_tab'], 0], -# -# POSIX compliant: multi-columns of equal width (unlike SunOS.5.5.1 e.g.) -# text-tab handling -['13ba', '-t -n -2 -e8', [\'t_tab'], [\'tn2e8-t_tab'], 0], -['13bb', '-t -n: -2 -e8', [\'t_tab'], [\'tn_2e8-t_tab'], 0], -['13bc', '-t -n: -2 -e8 -S----', [\'t_tab'], [\'tn_2e8S-t_tab'], 0], -['13bd', '-t -n -2 -e8 -o3', [\'t_tab'], [\'tn2e8o3-t_tab'], 0], -# number-separator TAB not treated as input text-tab, no '-e' expansion -['13be', '-t -n -2 -e5 -o3', [\'t_tab'], [\'tn2e5o3-t_tab'], 0], -# input-tab-char ':' not equal default (text) TABs -['13bf', '-t -n -2 -e:8', [\'t_tab_'], [\'tn2e8-t_tab'], 0], -# -# options -w/-s: POSIX-compliant, means adapting the interference of -w/-s -# with multi-column output from other UNIXes (SunOS e.g.); -# columns, truncated = 72 / separator = space : -['14a', '-2 -f', [\'t_notab'], [\'2f-t_notab'], 0], -# full lines, no truncation / separator = TAB : -['14b', '-2 -s -f', [\'t_notab'], [\'2sf-t_notab'], 0], -# full lines, no truncation / separator = ':' : -['14c', '-2 -s: -f', [\'t_notab'], [\'2s_f-t_notab'], 0], -# columns, truncated = 60 / separator = space : -['14d', '-2 -w60 -f', [\'t_notab'], [\'2w60f-t_notab'], 0], -# columns, truncated = 60 / no separator (SunOS-BUG: line width to small): -['14e', '-2 -s -w60 -f', [\'t_notab'], [\'2sw60f-t_notab'], 0], -# columns, truncated = 60 / separator = ':' (HP-UX.10.20-2-BUG: -# ':' missing with -m option): -['14f', '-2 -s: -w60 -f', [\'t_notab'], [\'2s_w60f-t_nota'], 0], -# -# new long-options -W/-S/-J disentangle those options (see also No.'10*') -# columns, truncated = 72 / no separator : -['14g', '-2 -S -f', [\'t_notab'], [\'2-Sf-t_notab'], 0], -# full lines, no truncation / separator = TAB : (Input: -S"<TAB>") -['14h', '-2 -S" " -J -f', [\'t_notab'], [\'2sf-t_notab'], 0], -# columns, truncated = 72 / separator ':' : -['14i', '-2 -S: -f', [\'t_notab'], [\'2-S_f-t_notab'], 0], -# full lines, no truncation / separator = ':' : -['14j', '-2 -S: -J -f', [\'t_notab'], [\'2s_f-t_notab'], 0], -# columns, truncated = 60 / separator = space: -['14k', '-2 -W60 -f', [\'t_notab'], [\'2w60f-t_notab'], 0], -# columns, truncated = 60 / no separator : -['14l', '-2 -S -W60 -f', [\'t_notab'], [\'2sw60f-t_notab'], 0], -# columns, truncated = 60 / separator = ':' : -['14m', '-2 -S: -W60 -f', [\'t_notab'], [\'2s_w60f-t_nota'], 0], -# -# Tabify multiple spaces, -i option -# number of input spaces between a and b must not change; be careful -# comparing with other UNIXes (some other SunOS examples are OK !?) -# SunOS.5.5.1-BUG: 8 input spaces --> 11 output spaces between a and b; -['i-opt-a', '-tn -i5 -h ""', "a b\n", " 1 a b\n", 0], -# SunOS.5.5.1-BUG: 8 input spaces --> 9 output spaces between a and b; -['i-opt-b', '-tn -i5 -o9 -h ""', "a b\n", - " 1 a b\n", 0], -# -# line number overflow not allowed: cut off leading digits; -# don't adapt other UNIXes, no real standard to follow, a consequent -# programming of column handling may change the GNU pr concept. -['ncut-a', '-tn2 -N98', "y\ny\ny\ny\ny\n", - "98 y\n99 y\n00 y\n01 y\n02 y\n", 0], -['ncut-b', '-tn:2 -N98', "y\ny\ny\ny\ny\n", - "98:y\n99:y\n00:y\n01:y\n02:y\n", 0], - -['margin-0', '-o 0', '', '', 0], - -# BUG fixed: that leading space on 3rd line of output should not be there -['dbl-sp-a', '-d -l 14 -h ""', "1\n2\n", - "\n\n-- Date/Time -- " - . "Page 1\n\n\n1\n\n2\n\n\n\n\n\n\n", 0], -# This test failed with 1.22e and earlier. -['dbl-sp-b', '-d -t', "1\n2\n", "1\n\n2\n\n", 0], - -# This test would segfault with 2.0f and earlier. -['narrow-1', '-W1 -t', "12345\n", "1\n", 0], - -# This test would fail with textutils-2.1 and earlier. -['col-last', '-W3 -t2', "a\nb\nc\n", "a c\nb\n", 0], - -# Make sure that -02 is treated just like -2. -['col-02', '-W3 -t -02', "a\nb\nc\n", "a c\nb\n", 0], -# The -2 must override preceding column-count-specifying options. -['col-2', '-W3 -t -4 --columns=1 -2', "a\nb\nc\n", "a c\nb\n", 0], -# The --columns=2 must override preceding column-count-specifying options. -['col-long', '-W3 -t -1 --columns=2', "a\nb\nc\n", "a c\nb\n", 0], -# Make sure these fail. -['col-0', '-0', '', '', 1, - "$prog: invalid number of columns: '0'\n"], -['col-inval', '-'.'9'x100, '', '', 1, - "$prog: invalid number of columns: '". ('9'x100) ."'\n"], - -# Before coreutils-5.3.1, --pages=1:-1 would be treated like -# --pages=1:18446744073709551615. -['neg-page', '--pages=1:-1', '', '', 1, - "$prog: invalid --pages argument '1:-1'\n"], - -# Up to coreutils-6.10, this would cause pr to decrement its -# internal "input_position" below zero and sometimes segfault. -['neg-inp-pos1', '-t -e', "\b\b\b\b\b\b\tx\n", " x\n", 0], -# NB: while there are 4 backspaces in the input, there are only 3 in the output -['neg-inp-pos2', '-t -e', "abc\b\b\b\b\tx", "abc\b\b\b x\n", 0], - -# This would clobber so much of the heap, it'd segfault or abort every time. -['smash-heap', '-t -e300', "a".("\b"x50)."\t", "a\b".(" "x300)."\n", 0], -['smash-heap8', '-t -e', "a".("\b"x50)."\t", "a\b".(" "x 8)."\n", 0], - -# Before coreutils-8.13 page numbers were not handled correctly when -# headers were not printed (when -l <= 10 or -t or -T specified) -['page-range', '+1:1 -2 -l1 -s" "', "a\nb\nc\n", "a b\n", 0], -); - -# Convert the above old-style test vectors to the newer -# format used by Coreutils.pm. - -my $pfx = "$ENV{abs_srcdir}/pr"; - -# Normalize otherwise-variable output page headers. -my $common_option_prefix = '--date-format="-- Date/Time --" -h x'; - -my @Tests; -foreach my $t (@tv) - { - my ($test_name, $flags, $in, $exp, $ret, $err_msg) = @$t; - my $new_ent = [$test_name, $common_option_prefix, $flags]; - if (!ref $in) - { - push @$new_ent, {IN=>$in}; - } - else - { - foreach my $e (@$in) - { - my $file_name = $$e; - push @$new_ent, {IN=>{"$pfx/$file_name"=>undef}}; - } - } - if (!ref $exp) - { - push @$new_ent, {OUT=>$exp}; - } - else - { - foreach my $e (@$exp) - { - my $file_name = $$e; - push @$new_ent, {OUT=>{"$pfx/$file_name"=>undef}}; - } - } - $ret - and push @$new_ent, {EXIT=>$ret}, {ERR=>$err_msg}; - push @Tests, $new_ent; - } - -@Tests = triple_test \@Tests; - -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/pr/pr-tests.pl b/tests/pr/pr-tests.pl new file mode 100755 index 00000000..9efd019e --- /dev/null +++ b/tests/pr/pr-tests.pl @@ -0,0 +1,475 @@ +#!/usr/bin/perl +# Test pr. + +# 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/>. + +use strict; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +my $prog = 'pr'; + +my @tv = ( + +# -b option is no longer an official option. But it's still working to +# get a downward compatibility. Now (version 1.19m or newer) -COLUMN +# only is equivalent to -b -COLUMN. +# +# test_name options input-file-name(s) expected-output-group-file-name +# expected-return-code +# ------------------------------------------------------------------------- +# Following tests with "FF set" don't contain a complete set of all +# combinations of options and FF-arrangements +# +# One FF at start of file (one empty page) +# ['1a', '', [\'0Ft'], [\'0F'], 0], +['1b', '', [\'0Fnt'], [\'0F'], 0], +['1c', '+3', [\'0Ft'], [\'3-0F'], 0], +['1d', '+3 -f', [\'0Ft'], [\'3f-0F'], 0], +['1e', '-a -3', [\'0Ft'], [\'a3-0F'], 0], +['1f', '-a -3 -f', [\'0Ft'], [\'a3f-0F'], 0], +['1g', '-a -3 -f', [\'0Fnt'], [\'a3f-0F'], 0], +['1h', '+3 -a -3 -f', [\'0Ft'], [\'3a3f-0F'], 0], +['1i', '-b -3', [\'0Ft'], [\'b3-0F'], 0], +['1j', '-b -3 -f', [\'0Ft'], [\'b3f-0F'], 0], +['1k', '-b -3 -f', [\'0Fnt'], [\'b3f-0F'], 0], +['1l', '+3 -b -3 -f', [\'0Ft'], [\'3b3f-0F'], 0], +# Two FF at start of file (two empty page) +['2a', '', [\'0FFt'], [\'0FF'], 0], +['2b', '', [\'0FnFnt'], [\'0FF'], 0], +['2c', '-a -3 -f', [\'0FFt'], [\'a3f-0FF'], 0], +['2d', '-a -3 -f', [\'0FFnt'], [\'a3f-0FF'], 0], +['2e', '-b -3 -f', [\'0FFt'], [\'b3f-0FF'], 0], +['2f', '-b -3 -f', [\'0FFnt'], [\'b3f-0FF'], 0], +['2g', '-b -3 -f', [\'0FnFt'], [\'b3f-0FF'], 0], +['2h', '-b -3 -f', [\'0FnFnt'], [\'b3f-0FF'], 0], +['2i', '+3 -b -3 -f', [\'0FFt'], [\'3b3f-0FF'], 0], +['2j', '+3 -b -3 -f', [\'0FFnt'], [\'3b3f-0FF'], 0], +# +# FFs in text (none / one / two empty page(s)) +['3a', '', [\'FFn'], [\'FF'], 0], +['3b', '', [\'FnFn'], [\'FF'], 0], +['3c', '+3', [\'FFn'], [\'3-FF'], 0], +['3d', '+3 -f', [\'FFn'], [\'3f-FF'], 0], +['3e', '-a -3 -f', [\'FFn'], [\'a3f-FF'], 0], +['3f', '-a -3 -f', [\'FFtn'], [\'a3f-FF'], 0], +['3g', '-b -3 -f', [\'FFn'], [\'b3f-FF'], 0], +['3h', '-b -3 -f', [\'FFtn'], [\'b3f-FF'], 0], +['3i', '-b -3 -f', [\'FnFn'], [\'b3f-FF'], 0], +['3j', '-b -3 -f', [\'tFFn'], [\'b3f-FF'], 0], +['3k', '-b -3 -f', [\'tFnFt'], [\'b3f-FF'], 0], +['3l', '+3 -b -3 -f', [\'FFn'], [\'3b3f-FF'], 0], +['3m', '+3 -b -3 -f', [\'FFtn'], [\'3b3f-FF'], 0], +# A full page printed (lines_left_on_page = 0) without a FF found. +# Avoid an extra empty page if a FF follows in the next input line. +['3la', '-l 24', [\'FFn'], [\'l24-FF'], 0], +['3lb', '-l 24', [\'FFtn'], [\'l24-FF'], 0], +['3lc', '-l 24', [\'FnFn'], [\'l24-FF'], 0], +['3ld', '-l 24', [\'tFFn'], [\'l24-FF'], 0], +['3le', '-l 24', [\'tFnFt'], [\'l24-FF'], 0], +['3lf', '-l 24', [\'tFFt'], [\'l24-FF'], 0], +['3aa', '-a -2 -l 17', [\'FFn'], [\'a2l17-FF'], 0], +['3ab', '-a -2 -l 17', [\'FFtn'], [\'a2l17-FF'], 0], +['3ac', '-a -2 -l 17', [\'FnFn'], [\'a2l17-FF'], 0], +['3ad', '-a -2 -l 17', [\'tFFn'], [\'a2l17-FF'], 0], +['3ae', '-a -2 -l 17', [\'tFnFt'], [\'a2l17-FF'], 0], +['3af', '-a -2 -l 17', [\'tFFt'], [\'a2l17-FF'], 0], +['3ag', '-a -2 -l 15', [\'FFn'], [\'a2l15-FF'], 0], +['3ah', '-a -2 -l 15', [\'FFtn'], [\'a2l15-FF'], 0], +['3ai', '-a -2 -l 15', [\'FnFn'], [\'a2l15-FF'], 0], +['3aj', '-a -2 -l 15', [\'tFFn'], [\'a2l15-FF'], 0], +['3ak', '-a -2 -l 15', [\'tFnFt'], [\'a2l15-FF'], 0], +['3ba', '-b -2 -l 17', [\'FFn'], [\'b2l17-FF'], 0], +['3bb', '-b -2 -l 17', [\'FFtn'], [\'b2l17-FF'], 0], +['3bc', '-b -2 -l 17', [\'FnFn'], [\'b2l17-FF'], 0], +['3bd', '-b -2 -l 17', [\'tFFn'], [\'b2l17-FF'], 0], +['3be', '-b -2 -l 17', [\'tFnFt'], [\'b2l17-FF'], 0], +['3bf', '-b -2 -l 17', [\'tFFt'], [\'b2l17-FF'], 0], +['3bg', '-b -2 -l 15', [\'FFn'], [\'b2l15-FF'], 0], +['3bh', '-b -2 -l 15', [\'FFtn'], [\'b2l15-FF'], 0], +['3bi', '-b -2 -l 15', [\'FnFn'], [\'b2l15-FF'], 0], +['3bj', '-b -2 -l 15', [\'tFFn'], [\'b2l15-FF'], 0], +['3bk', '-b -2 -l 15', [\'tFnFt'], [\'b2l15-FF'], 0], +['3Pa', '+4 -l 24', [\'FFn'], [\'4l24-FF'], 0], +['3Pb', '+4 -l 24', [\'FFtn'], [\'4l24-FF'], 0], +['3Pc', '+4 -l 24', [\'FnFn'], [\'4l24-FF'], 0], +['3Pd', '+4 -l 24', [\'tFFn'], [\'4l24-FF'], 0], +['3Pe', '+4 -l 24', [\'tFnFt'], [\'4l24-FF'], 0], +['3Pf', '+4 -l 24', [\'tFFt'], [\'4l24-FF'], 0], +['3Pg', '+4:7 -l 24', [\'tFFt'], [\'4-7l24-FF'], 0], +['3Paa', '+3 -a -2 -l 17', [\'FFn'], [\'3a2l17-FF'], 0], +['3Pab', '+3 -a -2 -l 17', [\'FFtn'], [\'3a2l17-FF'], 0], +['3Pac', '+3 -a -2 -l 17', [\'FnFn'], [\'3a2l17-FF'], 0], +['3Pad', '+3 -a -2 -l 17', [\'tFFn'], [\'3a2l17-FF'], 0], +['3Pae', '+3 -a -2 -l 17', [\'tFnFt'], [\'3a2l17-FF'], 0], +['3Paf', '+3 -a -2 -l 17', [\'tFFt'], [\'3a2l17-FF'], 0], +['3Pba', '+3 -b -2 -l 17', [\'FFn'], [\'3b2l17-FF'], 0], +['3Pbb', '+3 -b -2 -l 17', [\'FFtn'], [\'3b2l17-FF'], 0], +['3Pbc', '+3 -b -2 -l 17', [\'FnFn'], [\'3b2l17-FF'], 0], +['3Pbd', '+3 -b -2 -l 17', [\'tFFn'], [\'3b2l17-FF'], 0], +['3Pbe', '+3 -b -2 -l 17', [\'tFnFt'], [\'3b2l17-FF'], 0], +['3Pbf', '+3 -b -2 -l 17', [\'tFFt'], [\'3b2l17-FF'], 0], +# +# Without "FF set by hand" +['4a', '-l 24', [\'tn'], [\'l24-t'], 0], +['4b', '-l 24 -f', [\'tn'], [\'l24f-t'], 0], +['4c', '+3 -l 24', [\'tn'], [\'3l24-t'], 0], +['4d', '+3 -l 24 -f', [\'tn'], [\'3l24f-t'], 0], +['4e', '+3:5 -l 24 -f', [\'tn'], [\'3-5l24f-t'], 0], +['4f', '-a -3 -l 15', [\'tn'], [\'a3l15-t'], 0], +['4g', '-a -3 -l 15 -f', [\'tn'], [\'a3l15f-t'], 0], +['4h', '+3 -a -3 -l 15', [\'tn'], [\'3a3l15-t'], 0], +['4i', '+3 -a -3 -l 15 -f', [\'tn'], [\'3a3l15f-t'], 0], +['4j', '-b -3 -l 15', [\'tn'], [\'b3l15-t'], 0], +['4k', '-b -3 -l 15 -f', [\'tn'], [\'b3l15f-t'], 0], +['4l', '+3 -b -3 -l 15', [\'tn'], [\'3b3l15-t'], 0], +['4m', '+3 -b -3 -l 15 -f', [\'tn'], [\'3b3l15f-t'], 0], +# +# Merge input files (-m option) +['5a', '-m -l 24', [\'tn', \'tn'], [\'ml24-t'], 0], +['5b', '-m -l 24 -f', [\'tn', \'tn'], [\'ml24f-t'], 0], +['5c', '+3 -m -l 24', [\'tn', \'tn'], [\'3ml24-t'], 0], +['5d', '+3 -m -l 24 -f', [\'tn', \'tn'], [\'3ml24f-t'], 0], +['5e', '-m -l 24 -f', [\'0Ft', \'0Ft'], [\'ml24f-0F'], 0], +['5f', '-m -l 24 -f', [\'0Ft', \'0Fnt'], [\'ml24f-0F'], 0], +['5g', '-m -l 24 -f', [\'tn', \'0Ft'], [\'ml24f-t-0F'], 0], +# A full page printed (lines_left_on_page = 0) without a FF found. +# Avoid an extra empty page if a FF follows in the next input line. +['5ma', '-m -l 24', [\'tFFn', \'tFnFt'], [\'ml24-FF'], 0], +['5mb', '-m -l 24', [\'tFFn', \'FFn'], [\'ml24-FF'], 0], +['5mc', '-m -l 24', [\'tn', \'FFn'], [\'ml24-t-FF'], 0], +['5md', '-m -l 20', [\'FFn', \'tn'], [\'ml20-FF-t'], 0], +['5Pma', '+3 -m -l 24', [\'FFn', \'FnFn'], [\'3ml24-FF'], 0], +['5Pmb', '+3 -m -l 24', [\'tFFn', \'FFn'], [\'3ml24-FF'], 0], +['5Pmc', '+3 -m -l 24', [\'tn', \'FFn'], [\'3ml24-t-FF'], 0], +# +# Do not print header and footer but retain "FF set by Hand" +# (-t option) +['6a', '-t -l 24', [\'tn'], [\'t-t'], 0], +['6b', '-t -l 24 -f', [\'tn'], [\'t-t'], 0], +['6c', '-t -l 24 -f', [\'tFFt-bl'], [\'t-bl'], 0], +['6d', '-t -l 24', [\'0FnFnt'], [\'t-0FF'], 0], +['6e', '-t -l 24', [\'FFn'], [\'t-FF'], 0], +['6f', '-t -l 24', [\'FnFn'], [\'t-FF'], 0], +['6g', '-t -l 24 -f', [\'FFn'], [\'t-FF'], 0], +['6aa', '-t -a -3', [\'0FnFnt'], [\'ta3-0FF'], 0], +['6ab', '-t -a -3', [\'FFn'], [\'ta3-FF'], 0], +['6ac', '-t -a -3 -l 24', [\'FnFn'], [\'ta3-FF'], 0], +['6ba', '-t -b -3', [\'0FnFnt'], [\'tb3-0FF'], 0], +['6bb', '-t -b -3', [\'FFn'], [\'tb3-FF'], 0], +['6bc', '-t -b -3 -l 24', [\'FnFn'], [\'tb3-FF'], 0], +# +# Do not print header and footer nor "FF set by Hand" (-T option) +['7a', '-T -l 24', [\'tn'], [\'tt-t'], 0], +['7b', '-T -l 24 -f', [\'tn'], [\'tt-t'], 0], +['7c', '-T -l 24 -f', [\'tFFt-bl'], [\'tt-bl'], 0], +['7d', '-T -l 24', [\'0FnFnt'], [\'tt-0FF'], 0], +['7e', '-T -l 24', [\'FFn'], [\'tt-FF'], 0], +['7f', '-T -l 24', [\'FnFn'], [\'tt-FF'], 0], +['7g', '-T -l 24 -f', [\'FFn'], [\'tt-FF'], 0], +['7aa', '-T -a -3', [\'0FnFnt'], [\'tta3-0FF'], 0], +['7ab', '-T -a -3', [\'FFn'], [\'tta3-FF'], 0], +['7ac', '-T -a -3 -l 24', [\'FnFn'], [\'tta3-FF'], 0], +['7ba', '-T -b -3', [\'0FnFnt'], [\'ttb3-0FF'], 0], +['7bb', '-T -b -3', [\'FFn'], [\'ttb3-FF'], 0], +['7bc', '-T -b -3 -l 24', [\'FnFn'], [\'ttb3-FF'], 0], +# +# lhs-truncation of header +# pr-1.19m: Text line truncation only with column output +# +# numbering lines (-n -N option) +# skip pages (+FIRST_PAGE[:LAST_PAGE] option) +['9a', '-n.3 -l 24 -f', [\'tFFt-bl'], [\'nl24f-bl'], 0], +['9b', '-n.3 -N 15 -l 24 -f', [\'tFFt-bl'], [\'nN15l24f-bl'], 0], +['9Pa', '-n.3 +2 -l 24 -f', [\'tFFt-bl'], [\'n+2l24f-bl'], 0], +['9Pb', '-n.3 +3 -l 24 -f', [\'tFFt-bl'], [\'n+3l24f-bl'], 0], +['9Pc', '-n.3 -N 1 +3 -l 24 -f', [\'tFFt-bl'], [\'nN1+3l24f-bl'], 0], +['9Pe', '-n.3 +2 -l 24 -f', [\'0FFt'], [\'n+2l24f-0FF'], 0], +['9Pf', '-n.3 +2 -l 24 -f', [\'0FFnt'], [\'n+2l24f-0FF'], 0], +['9Pg', '-n.3 +2 -l 24 -f', [\'0FnFt'], [\'n+2l24f-0FF'], 0], +['9Ph', '-n.3 +2 -l 24 -f', [\'0FnFnt'], [\'n+2l24f-0FF'], 0], +['9Pi', '-n.3 +2:5 -l 24 -f', [\'0FFt'], [\'n+2-5l24f-0FF'], 0], +['9Pj', '-n.3 +3 -l 24 -f', [\'0FFt'], [\'n+3l24f-0FF'], 0], +['9Pk', '-n.3 +3 -l 24 -f', [\'0FFnt'], [\'n+3l24f-0FF'], 0], +['9Pl', '-n.3 +3 -l 24 -f', [\'0FnFt'], [\'n+3l24f-0FF'], 0], +['9Pm', '-n.3 +3 -l 24 -f', [\'0FnFnt'], [\'n+3l24f-0FF'], 0], +['9Pn', '-n.3 +7 -l 24', [\'FFn'], [\'n+7l24-FF'], 0], +['9Po', '-n.3 +7 -l 24', [\'FFtn'], [\'n+7l24-FF'], 0], +['9Pp', '-n.3 +7 -l 24', [\'FnFn'], [\'n+7l24-FF'], 0], +['9Pq', '-n.3 +3:7 -l 24', [\'FnFn'], [\'n+3-7l24-FF'], 0], +['9Pr', '-n.3 +8 -l 20', [\'tFFn'], [\'n+8l20-FF'], 0], +['9Ps', '-n.3 +8 -l 20', [\'tFnFt'], [\'n+8l20-FF'], 0], +['9Pt', '-n.3 +8 -l 20', [\'tFFt'], [\'n+8l20-FF'], 0], +['9Paa', '-n.3 +5 -a -3 -l 13 -f', [\'0FFt'], [\'n+5a3l13f-0FF'], 0], +['9Pab', '-n.3 +5 -a -3 -l 13 -f', [\'0FFnt'], [\'n+5a3l13f-0FF'], 0], +['9Pac', '-n.3 +5 -a -3 -l 13 -f', [\'0FnFt'], [\'n+5a3l13f-0FF'], 0], +['9Pad', '-n.3 +5 -a -3 -l 13 -f', [\'0FnFnt'], [\'n+5a3l13f-0FF'], 0], +['9Pae', '-n.3 +6 -a -2 -l 17', [\'FFn'], [\'n+6a2l17-FF'], 0], +['9Paf', '-n.3 +6 -a -2 -l 17', [\'FFtn'], [\'n+6a2l17-FF'], 0], +['9Pag', '-n.3 +6 -a -2 -l 17', [\'FnFn'], [\'n+6a2l17-FF'], 0], +['9Pah', '-n.3 +6 -a -2 -l 17', [\'tFFn'], [\'n+6a2l17-FF'], 0], +['9Pai', '-n.3 +6 -a -2 -l 17', [\'tFnFt'], [\'n+6a2l17-FF'], 0], +['9Paj', '-n.3 +6 -a -2 -l 17', [\'tFFt'], [\'n+6a2l17-FF'], 0], +['9Pak', '-n.3 +4:8 -a -2 -l 17', [\'tFFt'], [\'n+4-8a2l17-FF'], 0], +['9Pba', '-n.3 +4 -b -2 -l 17 -f', [\'0FFt'], [\'n+4b2l17f-0FF'], 0], +['9Pbb', '-n.3 +4 -b -2 -l 17 -f', [\'0FFnt'], [\'n+4b2l17f-0FF'], 0], +['9Pbc', '-n.3 +4 -b -2 -l 17 -f', [\'0FnFt'], [\'n+4b2l17f-0FF'], 0], +['9Pbd', '-n.3 +4 -b -2 -l 17 -f', [\'0FnFnt'], [\'n+4b2l17f-0FF'], 0], +['9Pbe', '-n.3 +6 -b -3 -l 13 -f', [\'FFn'], [\'n+6b3l13f-FF'], 0], +['9Pbf', '-n.3 +6 -b -3 -l 13 -f', [\'FFtn'], [\'n+6b3l13f-FF'], 0], +['9Pbg', '-n.3 +6 -b -3 -l 13 -f', [\'FnFn'], [\'n+6b3l13f-FF'], 0], +['9Pbh', '-n.3 +6 -b -3 -l 13 -f', [\'tFFn'], [\'n+6b3l13f-FF'], 0], +['9Pbi', '-n.3 +6 -b -3 -l 13 -f', [\'tFnFt'], [\'n+6b3l13f-FF'], 0], +['9Pbj', '-n.3 +6 -b -3 -l 13 -f', [\'tFFt'], [\'n+6b3l13f-FF'], 0], +['9Pbk', '-n.3 +5:8 -b -3 -l 17 -f', [\'FnFn'], [\'n+5-8b3l17f-FF'], 0], +['9Pma', '-n.3 +3 -m -l 20 -f', [\'tFFt-bl', \'FnFn'], [\'n+3ml20f-bl-FF'], 0], +['9Pmb', '-n.3 +3 -m -l 24 -f', [\'tFFt-bl', \'tn'], [\'n+3ml24f-bl-tn'], 0], +['9Pmc', '-n.3 +3 -m -l 24 -f', [\'tn', \'tFFt-bl'], [\'n+3ml24f-tn-bl'], 0], +# +# line truncation column alignment; header line truncation +# -w/W PAGE_WIDTH [-J] options +['10wa', '-W 72 -J -l24 -f', [\'tFFt-ll'], [\'W72Jl24f-ll'], 0], +['10wb', '-w 72 -J -l24 -f', [\'tFFt-ll'], [\'W72Jl24f-ll'], 0], +['10wc', '-W 72 -l24 -f', [\'tFFt-ll'], [\'W-72l24f-ll'], 0], +['10wd', '-w 72 -l24 -f', [\'tFFt-ll'], [\'w72l24f-ll'], 0], +['10we', '-W 28 -l24 -f', [\'tFFt-ll'], [\'W28l24f-ll'], 0], +['10wf', '-W 27 -l24 -f', [\'tFFt-ll'], [\'W27l24f-ll'], 0], +['10wg', '-W 26 -l24 -f', [\'tFFt-ll'], [\'W26l24f-ll'], 0], +['10wh', '-W 20 -l24 -f', [\'tFFt-ll'], [\'W20l24f-ll'], 0], +['10ma', '-m -l 24 -f', [\'tFFt-lm', \'loli'], [\'ml24f-lm-lo'], 0], +['10mb', '-W 35 -m -l 24 -f', [\'tFFt-lm', \'loli'], [\'W35ml24f-lm-lo'], 0], +['10mc', '-w 35 -m -l 24 -f', [\'tFFt-lm', \'loli'], [\'W35ml24f-lm-lo'], 0], +['10md', '-J -m -l 24 -f', [\'tFFt-lm', \'loli'], [\'Jml24f-lm-lo'], 0], +['10me', '-W 35 -J -m -l 24 -f', [\'tFFt-lm', \'loli'], [\'W35Jml24f-lmlo'], 0], +['10mf', '-w 35 -J -m -l 24 -f', [\'tFFt-lm', \'loli'], [\'W35Jml24f-lmlo'], 0], +['10mg', '-n.3 -J -m -l 24 -f', [\'tFFt-lm', \'tFFt-lm', \'loli'], + [\'nJml24f-lmlmlo'], 0], +['10mh', '-n.3 -J -m -l 24 -f', [\'tFFt-lm', \'loli', \'tFFt-lm'], + [\'nJml24f-lmlolm'], 0], +['10aa', '-a -3 -l 24 -f', [\'tFFt-lm'], [\'a3l24f-lm'], 0], +['10ab', '-W 35 -a -3 -l 24 -f', [\'tFFt-lm'], [\'W35a3l24f-lm'], 0], +['10ac', '-J -a -3 -l 24 -f', [\'tFFt-lm'], [\'Ja3l24f-lm'], 0], +['10ad', '-W 35 -J -a -3 -l 24 -f', [\'tFFt-lm'], [\'W35Ja3l24f-lm'], 0], +['10ba', '-b -3 -l 24 -f', [\'tFFt-lm'], [\'b3l24f-lm'], 0], +['10bb', '-W 35 -b -3 -l 24 -f', [\'tFFt-lm'], [\'W35b3l24f-lm'], 0], +['10bc', '-J -b -3 -l 24 -f', [\'tFFt-lm'], [\'Jb3l24f-lm'], 0], +['10bd', '-W 35 -J -b -3 -l 24 -f', [\'tFFt-lm'], [\'W35Jb3l24f-lm'], 0], +# +# merge files (-m option) use separator string (-S option) +['11sa', '-n.3 -S:--: -m -l 20 -f', [\'tFFt-bl', \'FnFn'], + [\'nSml20-bl-FF'], 0], +['11sb', '-n.3 -S:--: -m -l 24 -f', [\'tFFt-bl', \'FnFn'], + [\'nSml24-bl-FF'], 0], +['11se', '-n.3 -S:--: -m -l 20 -f', [\'tn', \'tn', \'FnFn'], + [\'nSml20-t-t-FF'], 0], +['11sf', '-n.3 -S:--: -m -l 24 -f', [\'tn', \'tn', \'FnFn'], + [\'nSml24-t-t-FF'], 0], +['11sg', '-n.3 -S:--: -m -l 20 -f', [\'tn', \'tn', \'FnFn', \'FnFn'], + [\'nSml20-t-tFFFF'], 0], +['11sh', '-n.3 -S:--: -m -l 24 -f', [\'tn', \'tn', \'FnFn', \'FnFn'], + [\'nSml24-t-tFFFF'], 0], +# +# left margin (-o option) and separator string (-S option) +['12aa', '-o3 -a -3 -l24 -f', [\'tn'], [\'o3a3l24f-tn'], 0], +['12ab', '-o3 -a -3 -S:--: -l24 -f', [\'tn'], [\'o3a3Sl24f-tn'], 0], +['12ac', '-o3 -a -3 -S:--: -n. -l24 -f', [\'tn'], [\'o3a3Snl24f-tn'], 0], +['12ba', '-o3 -b -3 -l24 -f', [\'tn'], [\'o3b3l24f-tn'], 0], +['12bb', '-o3 -b -3 -S:--: -l24 -f', [\'tn'], [\'o3b3Sl24f-tn'], 0], +['12bc', '-o3 -b -3 -S:--: -n. -l24 -f', [\'tn'], [\'o3b3Snl24f-tn'], 0], +['12ma', '-o3 -m -l24 -f', [\'tFFt-bl', \'tn'], [\'o3ml24f-bl-tn'], 0], +['12mb', '-o3 -m -S:--: -l24 -f', [\'tFFt-bl', \'tn'], [\'o3mSl24f-bl-tn'], 0], +['12mc', '-o3 -m -S:--: -n. -l24 -f', [\'tFFt-bl', \'tn'], + [\'o3mSnl24fbltn'], 0], +['12md', '-o3 -J -m -l24 -f', [\'tFFt-lm', \'loli'], [\'o3Jml24f-lm-lo'], 0], +# +# +# Single column output: POSIX compliant, adapt other UNIXes (SunOS.5.5.1 e.g.) +# number-separator TAB always an output TAB --> varying number/text-spacing +['13a', '-t -n -e8', [\'t_tab'], [\'tne8-t_tab'], 0], +['13b', '-t -n -e8 -o3', [\'t_tab'], [\'tne8o3-t_tab'], 0], +# +# POSIX compliant: multi-columns of equal width (unlike SunOS.5.5.1 e.g.) +# text-tab handling +['13ba', '-t -n -2 -e8', [\'t_tab'], [\'tn2e8-t_tab'], 0], +['13bb', '-t -n: -2 -e8', [\'t_tab'], [\'tn_2e8-t_tab'], 0], +['13bc', '-t -n: -2 -e8 -S----', [\'t_tab'], [\'tn_2e8S-t_tab'], 0], +['13bd', '-t -n -2 -e8 -o3', [\'t_tab'], [\'tn2e8o3-t_tab'], 0], +# number-separator TAB not treated as input text-tab, no '-e' expansion +['13be', '-t -n -2 -e5 -o3', [\'t_tab'], [\'tn2e5o3-t_tab'], 0], +# input-tab-char ':' not equal default (text) TABs +['13bf', '-t -n -2 -e:8', [\'t_tab_'], [\'tn2e8-t_tab'], 0], +# +# options -w/-s: POSIX-compliant, means adapting the interference of -w/-s +# with multi-column output from other UNIXes (SunOS e.g.); +# columns, truncated = 72 / separator = space : +['14a', '-2 -f', [\'t_notab'], [\'2f-t_notab'], 0], +# full lines, no truncation / separator = TAB : +['14b', '-2 -s -f', [\'t_notab'], [\'2sf-t_notab'], 0], +# full lines, no truncation / separator = ':' : +['14c', '-2 -s: -f', [\'t_notab'], [\'2s_f-t_notab'], 0], +# columns, truncated = 60 / separator = space : +['14d', '-2 -w60 -f', [\'t_notab'], [\'2w60f-t_notab'], 0], +# columns, truncated = 60 / no separator (SunOS-BUG: line width to small): +['14e', '-2 -s -w60 -f', [\'t_notab'], [\'2sw60f-t_notab'], 0], +# columns, truncated = 60 / separator = ':' (HP-UX.10.20-2-BUG: +# ':' missing with -m option): +['14f', '-2 -s: -w60 -f', [\'t_notab'], [\'2s_w60f-t_nota'], 0], +# +# new long-options -W/-S/-J disentangle those options (see also No.'10*') +# columns, truncated = 72 / no separator : +['14g', '-2 -S -f', [\'t_notab'], [\'2-Sf-t_notab'], 0], +# full lines, no truncation / separator = TAB : (Input: -S"<TAB>") +['14h', '-2 -S" " -J -f', [\'t_notab'], [\'2sf-t_notab'], 0], +# columns, truncated = 72 / separator ':' : +['14i', '-2 -S: -f', [\'t_notab'], [\'2-S_f-t_notab'], 0], +# full lines, no truncation / separator = ':' : +['14j', '-2 -S: -J -f', [\'t_notab'], [\'2s_f-t_notab'], 0], +# columns, truncated = 60 / separator = space: +['14k', '-2 -W60 -f', [\'t_notab'], [\'2w60f-t_notab'], 0], +# columns, truncated = 60 / no separator : +['14l', '-2 -S -W60 -f', [\'t_notab'], [\'2sw60f-t_notab'], 0], +# columns, truncated = 60 / separator = ':' : +['14m', '-2 -S: -W60 -f', [\'t_notab'], [\'2s_w60f-t_nota'], 0], +# +# Tabify multiple spaces, -i option +# number of input spaces between a and b must not change; be careful +# comparing with other UNIXes (some other SunOS examples are OK !?) +# SunOS.5.5.1-BUG: 8 input spaces --> 11 output spaces between a and b; +['i-opt-a', '-tn -i5 -h ""', "a b\n", " 1 a b\n", 0], +# SunOS.5.5.1-BUG: 8 input spaces --> 9 output spaces between a and b; +['i-opt-b', '-tn -i5 -o9 -h ""', "a b\n", + " 1 a b\n", 0], +# +# line number overflow not allowed: cut off leading digits; +# don't adapt other UNIXes, no real standard to follow, a consequent +# programming of column handling may change the GNU pr concept. +['ncut-a', '-tn2 -N98', "y\ny\ny\ny\ny\n", + "98 y\n99 y\n00 y\n01 y\n02 y\n", 0], +['ncut-b', '-tn:2 -N98', "y\ny\ny\ny\ny\n", + "98:y\n99:y\n00:y\n01:y\n02:y\n", 0], + +['margin-0', '-o 0', '', '', 0], + +# BUG fixed: that leading space on 3rd line of output should not be there +['dbl-sp-a', '-d -l 14 -h ""', "1\n2\n", + "\n\n-- Date/Time -- " + . "Page 1\n\n\n1\n\n2\n\n\n\n\n\n\n", 0], +# This test failed with 1.22e and earlier. +['dbl-sp-b', '-d -t', "1\n2\n", "1\n\n2\n\n", 0], + +# This test would segfault with 2.0f and earlier. +['narrow-1', '-W1 -t', "12345\n", "1\n", 0], + +# This test would fail with textutils-2.1 and earlier. +['col-last', '-W3 -t2', "a\nb\nc\n", "a c\nb\n", 0], + +# Make sure that -02 is treated just like -2. +['col-02', '-W3 -t -02', "a\nb\nc\n", "a c\nb\n", 0], +# The -2 must override preceding column-count-specifying options. +['col-2', '-W3 -t -4 --columns=1 -2', "a\nb\nc\n", "a c\nb\n", 0], +# The --columns=2 must override preceding column-count-specifying options. +['col-long', '-W3 -t -1 --columns=2', "a\nb\nc\n", "a c\nb\n", 0], +# Make sure these fail. +['col-0', '-0', '', '', 1, + "$prog: invalid number of columns: '0'\n"], +['col-inval', '-'.'9'x100, '', '', 1, + "$prog: invalid number of columns: '". ('9'x100) ."'\n"], + +# Before coreutils-5.3.1, --pages=1:-1 would be treated like +# --pages=1:18446744073709551615. +['neg-page', '--pages=1:-1', '', '', 1, + "$prog: invalid --pages argument '1:-1'\n"], + +# Up to coreutils-6.10, this would cause pr to decrement its +# internal "input_position" below zero and sometimes segfault. +['neg-inp-pos1', '-t -e', "\b\b\b\b\b\b\tx\n", " x\n", 0], +# NB: while there are 4 backspaces in the input, there are only 3 in the output +['neg-inp-pos2', '-t -e', "abc\b\b\b\b\tx", "abc\b\b\b x\n", 0], + +# This would clobber so much of the heap, it'd segfault or abort every time. +['smash-heap', '-t -e300', "a".("\b"x50)."\t", "a\b".(" "x300)."\n", 0], +['smash-heap8', '-t -e', "a".("\b"x50)."\t", "a\b".(" "x 8)."\n", 0], + +# Before coreutils-8.13 page numbers were not handled correctly when +# headers were not printed (when -l <= 10 or -t or -T specified) +['page-range', '+1:1 -2 -l1 -s" "', "a\nb\nc\n", "a b\n", 0], + +# This padded with zeros before coreutils-8.21 +['padding1', '-t -n,15', "1\n", (" "x 14)."1,1\n", 0], +# This crashed with divide by zero before coreutils-8.21 +['padding2', '-t -n,64', "1\n", (" "x 63)."1,1\n", 0], +# Ensure we handle buffer truncation correctly +['padding3', '-t -N1000000 -n,1', "1\n", "0,1\n", 0], +); + +# Convert the above old-style test vectors to the newer +# format used by Coreutils.pm. + +my $pfx = "$ENV{abs_srcdir}/tests/pr"; + +# Normalize otherwise-variable output page headers. +my $common_option_prefix = '--date-format="-- Date/Time --" -h x'; + +my @Tests; +foreach my $t (@tv) + { + my ($test_name, $flags, $in, $exp, $ret, $err_msg) = @$t; + my $new_ent = [$test_name, $common_option_prefix, $flags]; + if (!ref $in) + { + push @$new_ent, {IN=>$in}; + } + else + { + foreach my $e (@$in) + { + my $file_name = $$e; + push @$new_ent, {IN=>{"$pfx/$file_name"=>undef}}; + } + } + if (!ref $exp) + { + push @$new_ent, {OUT=>$exp}; + } + else + { + foreach my $e (@$exp) + { + my $file_name = $$e; + push @$new_ent, {OUT=>{"$pfx/$file_name"=>undef}}; + } + } + $ret + and push @$new_ent, {EXIT=>$ret}, {ERR=>$err_msg}; + push @Tests, $new_ent; + } + +# Exercise a bug with pr -m -s (commit 553d347) +push @Tests, + ['merge-w-tabs', '-m -s -t', + {IN=>{1=>"a\tb\tc\n"}}, + {IN=>{2=>"m\tn\to\n"}}, + {IN=>{3=>"x\ty\tz\n"}}, + {OUT=>join("\t", qw(a b c m n o x y z)) . "\n"} ]; + +@Tests = triple_test \@Tests; + +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/readlink/can-e b/tests/readlink/can-e deleted file mode 100755 index 32b75c59..00000000 --- a/tests/readlink/can-e +++ /dev/null @@ -1,104 +0,0 @@ -#!/bin/sh -# tests for canonicalize-existing mode (readlink -e). - -# Copyright (C) 2004-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ readlink - -pwd=$(pwd) -my_pwd=$("$abs_top_builddir/src/pwd") -tmp=d - -mkdir $tmp || framework_failure_ -cd $tmp || framework_failure_ - -mkdir subdir removed || framework_failure_ -touch regfile || framework_failure_ - -ln -s regfile link1 || framework_failure_ -ln -s subdir link2 || framework_failure_ -ln -s missing link3 || framework_failure_ -ln -s subdir/missing link4 || framework_failure_ - -cd "$pwd/$tmp/removed" || framework_failure_ - -# Skip this test if the system doesn't let you remove the working directory. -if rmdir ../removed 2>/dev/null; then - v=$(readlink -e .) && fail=1 - test -z "$v" || fail=1 -fi - -cd "$pwd/$tmp" || fail=1 - -for p in "" "$pwd/$tmp/"; do - - v=$(readlink -e "${p}regfile") || fail=1 - test "$v" = "$my_pwd/$tmp/regfile" || fail=1 - - v=$(readlink -e "${p}./regfile/") && fail=1 - test -z "$v" || fail=1 - - v=$(readlink -e "${p}subdir") || fail=1 - test "$v" = "$my_pwd/$tmp/subdir" || fail=1 - - v=$(readlink -e "${p}./subdir/") || fail=1 - test "$v" = "$my_pwd/$tmp/subdir" || fail=1 - - v=$(readlink -e "${p}missing") && fail=1 - test -z "$v" || fail=1 - - v=$(readlink -e "${p}./missing/") && fail=1 - test -z "$v" || fail=1 - - v=$(readlink -e "${p}link1") || fail=1 - test "$v" = "$my_pwd/$tmp/regfile" || fail=1 - - v=$(readlink -e "${p}./link1/") && fail=1 - test -z "$v" || fail=1 - - v=$(readlink -e "${p}link1/more") && fail=1 - test -z "$v" || fail=1 - - v=$(readlink -e "${p}link2") || fail=1 - test "$v" = "$my_pwd/$tmp/subdir" || fail=1 - - v=$(readlink -e "${p}./link2/") || fail=1 - test "$v" = "$my_pwd/$tmp/subdir" || fail=1 - - v=$(readlink -e "${p}link2/more") && fail=1 - test -z "$v" || fail=1 - - v=$(readlink -e "${p}link3") && fail=1 - test -z "$v" || fail=1 - - v=$(readlink -e "${p}./link3/") && fail=1 - test -z "$v" || fail=1 - - v=$(readlink -e "${p}link3/more") && fail=1 - test -z "$v" || fail=1 - - v=$(readlink -e "${p}link4") && fail=1 - test -z "$v" || fail=1 - - v=$(readlink -e "${p}./link4/") && fail=1 - test -z "$v" || fail=1 - - v=$(readlink -e "${p}link4/more") && fail=1 - test -z "$v" || fail=1 -done - -Exit $fail diff --git a/tests/readlink/can-e.sh b/tests/readlink/can-e.sh new file mode 100755 index 00000000..114e8640 --- /dev/null +++ b/tests/readlink/can-e.sh @@ -0,0 +1,104 @@ +#!/bin/sh +# tests for canonicalize-existing mode (readlink -e). + +# Copyright (C) 2004-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ readlink + +pwd=$(pwd) +my_pwd=$("$abs_top_builddir/src/pwd") +tmp=d + +mkdir $tmp || framework_failure_ +cd $tmp || framework_failure_ + +mkdir subdir removed || framework_failure_ +touch regfile || framework_failure_ + +ln -s regfile link1 || framework_failure_ +ln -s subdir link2 || framework_failure_ +ln -s missing link3 || framework_failure_ +ln -s subdir/missing link4 || framework_failure_ + +cd "$pwd/$tmp/removed" || framework_failure_ + +# Skip this test if the system doesn't let you remove the working directory. +if rmdir ../removed 2>/dev/null; then + v=$(readlink -e .) && fail=1 + test -z "$v" || fail=1 +fi + +cd "$pwd/$tmp" || fail=1 + +for p in "" "$pwd/$tmp/"; do + + v=$(readlink -e "${p}regfile") || fail=1 + test "$v" = "$my_pwd/$tmp/regfile" || fail=1 + + v=$(readlink -e "${p}./regfile/") && fail=1 + test -z "$v" || fail=1 + + v=$(readlink -e "${p}subdir") || fail=1 + test "$v" = "$my_pwd/$tmp/subdir" || fail=1 + + v=$(readlink -e "${p}./subdir/") || fail=1 + test "$v" = "$my_pwd/$tmp/subdir" || fail=1 + + v=$(readlink -e "${p}missing") && fail=1 + test -z "$v" || fail=1 + + v=$(readlink -e "${p}./missing/") && fail=1 + test -z "$v" || fail=1 + + v=$(readlink -e "${p}link1") || fail=1 + test "$v" = "$my_pwd/$tmp/regfile" || fail=1 + + v=$(readlink -e "${p}./link1/") && fail=1 + test -z "$v" || fail=1 + + v=$(readlink -e "${p}link1/more") && fail=1 + test -z "$v" || fail=1 + + v=$(readlink -e "${p}link2") || fail=1 + test "$v" = "$my_pwd/$tmp/subdir" || fail=1 + + v=$(readlink -e "${p}./link2/") || fail=1 + test "$v" = "$my_pwd/$tmp/subdir" || fail=1 + + v=$(readlink -e "${p}link2/more") && fail=1 + test -z "$v" || fail=1 + + v=$(readlink -e "${p}link3") && fail=1 + test -z "$v" || fail=1 + + v=$(readlink -e "${p}./link3/") && fail=1 + test -z "$v" || fail=1 + + v=$(readlink -e "${p}link3/more") && fail=1 + test -z "$v" || fail=1 + + v=$(readlink -e "${p}link4") && fail=1 + test -z "$v" || fail=1 + + v=$(readlink -e "${p}./link4/") && fail=1 + test -z "$v" || fail=1 + + v=$(readlink -e "${p}link4/more") && fail=1 + test -z "$v" || fail=1 +done + +Exit $fail diff --git a/tests/readlink/can-f b/tests/readlink/can-f deleted file mode 100755 index 3f296010..00000000 --- a/tests/readlink/can-f +++ /dev/null @@ -1,153 +0,0 @@ -#!/bin/sh -# tests for canonicalize mode (readlink -f). - -# Copyright (C) 2004-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ readlink - -pwd=$(pwd) -my_pwd=$("$abs_top_builddir/src/pwd") -tmp=d - -mkdir $tmp || framework_failure_ -cd $tmp || framework_failure_ - -mkdir subdir removed || framework_failure_ -touch regfile || framework_failure_ - -ln -s regfile link1 || framework_failure_ -ln -s subdir link2 || framework_failure_ -ln -s missing link3 || framework_failure_ -ln -s subdir/missing link4 || framework_failure_ -ln -s link5 link5 || framework_failure_ - -cd "$pwd/$tmp/removed" || framework_failure_ - -# Skip this test if the system doesn't let you remove the working directory. -if rmdir ../removed 2>/dev/null; then - v=$(readlink -e .) && fail=1 - test -z "$v" || fail=1 -fi - -cd "$pwd/$tmp" || fail=1 - -for p in "" "$pwd/$tmp/"; do - - v=$(readlink -f "${p}regfile") || fail=1 - test "$v" = "$my_pwd/$tmp/regfile" || fail=1 - - v=$(readlink -f "${p}./regfile/") && fail=1 - test -z "$v" || fail=1 - - v=$(readlink -f "${p}regfile/more") && fail=1 - test -z "$v" || fail=1 - - v=$(readlink -f "${p}./regfile/more/") && fail=1 - test -z "$v" || fail=1 - - v=$(readlink -f "${p}subdir") || fail=1 - test "$v" = "$my_pwd/$tmp/subdir" || fail=1 - - v=$(readlink -f "${p}./subdir/") || fail=1 - test "$v" = "$my_pwd/$tmp/subdir" || fail=1 - - v=$(readlink -f "${p}subdir/more") || fail=1 - test "$v" = "$my_pwd/$tmp/subdir/more" || fail=1 - - v=$(readlink -f "${p}./subdir/more/") || fail=1 - test "$v" = "$my_pwd/$tmp/subdir/more" || fail=1 - - v=$(readlink -f "${p}missing") || fail=1 - test "$v" = "$my_pwd/$tmp/missing" || fail=1 - - v=$(readlink -f "${p}./missing/") || fail=1 - test "$v" = "$my_pwd/$tmp/missing" || fail=1 - - v=$(readlink -f "${p}missing/more") && fail=1 - test -z "$v" || fail=1 - - v=$(readlink -f "${p}./missing/more/") && fail=1 - test -z "$v" || fail=1 - - v=$(readlink -f "${p}link1") || fail=1 - test "$v" = "$my_pwd/$tmp/regfile" || fail=1 - - v=$(readlink -f "${p}./link1/") && fail=1 - test -z "$v" || fail=1 - - v=$(readlink -f "${p}link1/more") && fail=1 - test -z "$v" || fail=1 - - v=$(readlink -f "${p}./link1/more/") && fail=1 - test -z "$v" || fail=1 - - v=$(readlink -f "${p}link2") || fail=1 - test "$v" = "$my_pwd/$tmp/subdir" || fail=1 - - v=$(readlink -f "${p}./link2/") || fail=1 - test "$v" = "$my_pwd/$tmp/subdir" || fail=1 - - v=$(readlink -f "${p}link2/more") || fail=1 - test "$v" = "$my_pwd/$tmp/subdir/more" || fail=1 - - v=$(readlink -f "${p}./link2/more/") || fail=1 - test "$v" = "$my_pwd/$tmp/subdir/more" || fail=1 - - v=$(readlink -f "${p}link2/more/more2") && fail=1 - test -z "$v" || fail=1 - - v=$(readlink -f "${p}./link2/more/more2/") && fail=1 - test -z "$v" || fail=1 - - v=$(readlink -f "${p}link3") || fail=1 - test "$v" = "$my_pwd/$tmp/missing" || fail=1 - - v=$(readlink -f "${p}./link3/") || fail=1 - test "$v" = "$my_pwd/$tmp/missing" || fail=1 - - v=$(readlink -f "${p}link3/more") && fail=1 - test -z "$v" || fail=1 - - v=$(readlink -f "${p}./link3/more/") && fail=1 - test -z "$v" || fail=1 - - v=$(readlink -f "${p}link4") || fail=1 - test "$v" = "$my_pwd/$tmp/subdir/missing" || fail=1 - - v=$(readlink -f "${p}./link4/") || fail=1 - test "$v" = "$my_pwd/$tmp/subdir/missing" || fail=1 - - v=$(readlink -f "${p}link4/more") && fail=1 - test -z "$v" || fail=1 - - v=$(readlink -f "${p}./link4/more") && fail=1 - test -z "$v" || fail=1 - - v=$(readlink -f "${p}link5") && fail=1 - test -z "$v" || fail=1 - - v=$(readlink -f "${p}./link5/") && fail=1 - test -z "$v" || fail=1 - - v=$(readlink -f "${p}link5/more") && fail=1 - test -z "$v" || fail=1 - - v=$(readlink -f "${p}./link5/more") && fail=1 - test -z "$v" || fail=1 -done - -Exit $fail diff --git a/tests/readlink/can-f.sh b/tests/readlink/can-f.sh new file mode 100755 index 00000000..2a1021a7 --- /dev/null +++ b/tests/readlink/can-f.sh @@ -0,0 +1,153 @@ +#!/bin/sh +# tests for canonicalize mode (readlink -f). + +# Copyright (C) 2004-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ readlink + +pwd=$(pwd) +my_pwd=$("$abs_top_builddir/src/pwd") +tmp=d + +mkdir $tmp || framework_failure_ +cd $tmp || framework_failure_ + +mkdir subdir removed || framework_failure_ +touch regfile || framework_failure_ + +ln -s regfile link1 || framework_failure_ +ln -s subdir link2 || framework_failure_ +ln -s missing link3 || framework_failure_ +ln -s subdir/missing link4 || framework_failure_ +ln -s link5 link5 || framework_failure_ + +cd "$pwd/$tmp/removed" || framework_failure_ + +# Skip this test if the system doesn't let you remove the working directory. +if rmdir ../removed 2>/dev/null; then + v=$(readlink -e .) && fail=1 + test -z "$v" || fail=1 +fi + +cd "$pwd/$tmp" || fail=1 + +for p in "" "$pwd/$tmp/"; do + + v=$(readlink -f "${p}regfile") || fail=1 + test "$v" = "$my_pwd/$tmp/regfile" || fail=1 + + v=$(readlink -f "${p}./regfile/") && fail=1 + test -z "$v" || fail=1 + + v=$(readlink -f "${p}regfile/more") && fail=1 + test -z "$v" || fail=1 + + v=$(readlink -f "${p}./regfile/more/") && fail=1 + test -z "$v" || fail=1 + + v=$(readlink -f "${p}subdir") || fail=1 + test "$v" = "$my_pwd/$tmp/subdir" || fail=1 + + v=$(readlink -f "${p}./subdir/") || fail=1 + test "$v" = "$my_pwd/$tmp/subdir" || fail=1 + + v=$(readlink -f "${p}subdir/more") || fail=1 + test "$v" = "$my_pwd/$tmp/subdir/more" || fail=1 + + v=$(readlink -f "${p}./subdir/more/") || fail=1 + test "$v" = "$my_pwd/$tmp/subdir/more" || fail=1 + + v=$(readlink -f "${p}missing") || fail=1 + test "$v" = "$my_pwd/$tmp/missing" || fail=1 + + v=$(readlink -f "${p}./missing/") || fail=1 + test "$v" = "$my_pwd/$tmp/missing" || fail=1 + + v=$(readlink -f "${p}missing/more") && fail=1 + test -z "$v" || fail=1 + + v=$(readlink -f "${p}./missing/more/") && fail=1 + test -z "$v" || fail=1 + + v=$(readlink -f "${p}link1") || fail=1 + test "$v" = "$my_pwd/$tmp/regfile" || fail=1 + + v=$(readlink -f "${p}./link1/") && fail=1 + test -z "$v" || fail=1 + + v=$(readlink -f "${p}link1/more") && fail=1 + test -z "$v" || fail=1 + + v=$(readlink -f "${p}./link1/more/") && fail=1 + test -z "$v" || fail=1 + + v=$(readlink -f "${p}link2") || fail=1 + test "$v" = "$my_pwd/$tmp/subdir" || fail=1 + + v=$(readlink -f "${p}./link2/") || fail=1 + test "$v" = "$my_pwd/$tmp/subdir" || fail=1 + + v=$(readlink -f "${p}link2/more") || fail=1 + test "$v" = "$my_pwd/$tmp/subdir/more" || fail=1 + + v=$(readlink -f "${p}./link2/more/") || fail=1 + test "$v" = "$my_pwd/$tmp/subdir/more" || fail=1 + + v=$(readlink -f "${p}link2/more/more2") && fail=1 + test -z "$v" || fail=1 + + v=$(readlink -f "${p}./link2/more/more2/") && fail=1 + test -z "$v" || fail=1 + + v=$(readlink -f "${p}link3") || fail=1 + test "$v" = "$my_pwd/$tmp/missing" || fail=1 + + v=$(readlink -f "${p}./link3/") || fail=1 + test "$v" = "$my_pwd/$tmp/missing" || fail=1 + + v=$(readlink -f "${p}link3/more") && fail=1 + test -z "$v" || fail=1 + + v=$(readlink -f "${p}./link3/more/") && fail=1 + test -z "$v" || fail=1 + + v=$(readlink -f "${p}link4") || fail=1 + test "$v" = "$my_pwd/$tmp/subdir/missing" || fail=1 + + v=$(readlink -f "${p}./link4/") || fail=1 + test "$v" = "$my_pwd/$tmp/subdir/missing" || fail=1 + + v=$(readlink -f "${p}link4/more") && fail=1 + test -z "$v" || fail=1 + + v=$(readlink -f "${p}./link4/more") && fail=1 + test -z "$v" || fail=1 + + v=$(readlink -f "${p}link5") && fail=1 + test -z "$v" || fail=1 + + v=$(readlink -f "${p}./link5/") && fail=1 + test -z "$v" || fail=1 + + v=$(readlink -f "${p}link5/more") && fail=1 + test -z "$v" || fail=1 + + v=$(readlink -f "${p}./link5/more") && fail=1 + test -z "$v" || fail=1 +done + +Exit $fail diff --git a/tests/readlink/can-m b/tests/readlink/can-m deleted file mode 100755 index 09a96f50..00000000 --- a/tests/readlink/can-m +++ /dev/null @@ -1,141 +0,0 @@ -#!/bin/sh -# tests for canonicalize-missing mode (readlink -m). - -# Copyright (C) 2004-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ readlink - -pwd=$(pwd) -my_pwd=$("$abs_top_builddir/src/pwd") -tmp=d - -mkdir $tmp || framework_failure_ -cd $tmp || framework_failure_ - -mkdir subdir removed || framework_failure_ -touch regfile || framework_failure_ - -ln -s regfile link1 || framework_failure_ -ln -s subdir link2 || framework_failure_ -ln -s missing link3 || framework_failure_ -ln -s subdir/missing link4 || framework_failure_ - -cd "$pwd/$tmp/removed" || framework_failure_ - -# Skip this test if the system doesn't let you remove the working directory. -if rmdir ../removed 2>/dev/null; then - v=$(readlink -e .) && fail=1 - test -z "$v" || fail=1 -fi - -cd "$pwd/$tmp" || fail=1 - -for p in "" "$pwd/$tmp/"; do - - v=$(readlink -m "${p}regfile") || fail=1 - test "$v" = "$my_pwd/$tmp/regfile" || fail=1 - - v=$(readlink -m "${p}./regfile/") || fail=1 - test "$v" = "$my_pwd/$tmp/regfile" || fail=1 - - v=$(readlink -m "${p}regfile/more") || fail=1 - test "$v" = "$my_pwd/$tmp/regfile/more" || fail=1 - - v=$(readlink -m "${p}./regfile/more/") || fail=1 - test "$v" = "$my_pwd/$tmp/regfile/more" || fail=1 - - v=$(readlink -m "${p}subdir") || fail=1 - test "$v" = "$my_pwd/$tmp/subdir" || fail=1 - - v=$(readlink -m "${p}./subdir/") || fail=1 - test "$v" = "$my_pwd/$tmp/subdir" || fail=1 - - v=$(readlink -m "${p}subdir/more") || fail=1 - test "$v" = "$my_pwd/$tmp/subdir/more" || fail=1 - - v=$(readlink -m "${p}./subdir/more/") || fail=1 - test "$v" = "$my_pwd/$tmp/subdir/more" || fail=1 - - v=$(readlink -m "${p}missing") || fail=1 - test "$v" = "$my_pwd/$tmp/missing" || fail=1 - - v=$(readlink -m "${p}./missing/") || fail=1 - test "$v" = "$my_pwd/$tmp/missing" || fail=1 - - v=$(readlink -m "${p}missing/more") || fail=1 - test "$v" = "$my_pwd/$tmp/missing/more" || fail=1 - - v=$(readlink -m "${p}./missing/more/") || fail=1 - test "$v" = "$my_pwd/$tmp/missing/more" || fail=1 - - v=$(readlink -m "${p}link1") || fail=1 - test "$v" = "$my_pwd/$tmp/regfile" || fail=1 - - v=$(readlink -m "${p}./link1/") || fail=1 - test "$v" = "$my_pwd/$tmp/regfile" || fail=1 - - v=$(readlink -m "${p}link1/more") || fail=1 - test "$v" = "$my_pwd/$tmp/regfile/more" || fail=1 - - v=$(readlink -m "${p}./link1/more/") || fail=1 - test "$v" = "$my_pwd/$tmp/regfile/more" || fail=1 - - v=$(readlink -m "${p}link2") || fail=1 - test "$v" = "$my_pwd/$tmp/subdir" || fail=1 - - v=$(readlink -m "${p}./link2/") || fail=1 - test "$v" = "$my_pwd/$tmp/subdir" || fail=1 - - v=$(readlink -m "${p}link2/more") || fail=1 - test "$v" = "$my_pwd/$tmp/subdir/more" || fail=1 - - v=$(readlink -m "${p}./link2/more/") || fail=1 - test "$v" = "$my_pwd/$tmp/subdir/more" || fail=1 - - v=$(readlink -m "${p}link2/more/more2") || fail=1 - test "$v" = "$my_pwd/$tmp/subdir/more/more2" || fail=1 - - v=$(readlink -m "${p}./link2/more/more2/") || fail=1 - test "$v" = "$my_pwd/$tmp/subdir/more/more2" || fail=1 - - v=$(readlink -m "${p}link3") || fail=1 - test "$v" = "$my_pwd/$tmp/missing" || fail=1 - - v=$(readlink -m "${p}./link3/") || fail=1 - test "$v" = "$my_pwd/$tmp/missing" || fail=1 - - v=$(readlink -m "${p}link3/more") || fail=1 - test "$v" = "$my_pwd/$tmp/missing/more" || fail=1 - - v=$(readlink -m "${p}./link3/more/") || fail=1 - test "$v" = "$my_pwd/$tmp/missing/more" || fail=1 - - v=$(readlink -m "${p}link4") || fail=1 - test "$v" = "$my_pwd/$tmp/subdir/missing" || fail=1 - - v=$(readlink -m "${p}./link4/") || fail=1 - test "$v" = "$my_pwd/$tmp/subdir/missing" || fail=1 - - v=$(readlink -m "${p}link4/more") || fail=1 - test "$v" = "$my_pwd/$tmp/subdir/missing/more" || fail=1 - - v=$(readlink -m "${p}./link4/more/") || fail=1 - test "$v" = "$my_pwd/$tmp/subdir/missing/more" || fail=1 - -done - -Exit $fail diff --git a/tests/readlink/can-m.sh b/tests/readlink/can-m.sh new file mode 100755 index 00000000..ae498bdd --- /dev/null +++ b/tests/readlink/can-m.sh @@ -0,0 +1,141 @@ +#!/bin/sh +# tests for canonicalize-missing mode (readlink -m). + +# Copyright (C) 2004-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ readlink + +pwd=$(pwd) +my_pwd=$("$abs_top_builddir/src/pwd") +tmp=d + +mkdir $tmp || framework_failure_ +cd $tmp || framework_failure_ + +mkdir subdir removed || framework_failure_ +touch regfile || framework_failure_ + +ln -s regfile link1 || framework_failure_ +ln -s subdir link2 || framework_failure_ +ln -s missing link3 || framework_failure_ +ln -s subdir/missing link4 || framework_failure_ + +cd "$pwd/$tmp/removed" || framework_failure_ + +# Skip this test if the system doesn't let you remove the working directory. +if rmdir ../removed 2>/dev/null; then + v=$(readlink -e .) && fail=1 + test -z "$v" || fail=1 +fi + +cd "$pwd/$tmp" || fail=1 + +for p in "" "$pwd/$tmp/"; do + + v=$(readlink -m "${p}regfile") || fail=1 + test "$v" = "$my_pwd/$tmp/regfile" || fail=1 + + v=$(readlink -m "${p}./regfile/") || fail=1 + test "$v" = "$my_pwd/$tmp/regfile" || fail=1 + + v=$(readlink -m "${p}regfile/more") || fail=1 + test "$v" = "$my_pwd/$tmp/regfile/more" || fail=1 + + v=$(readlink -m "${p}./regfile/more/") || fail=1 + test "$v" = "$my_pwd/$tmp/regfile/more" || fail=1 + + v=$(readlink -m "${p}subdir") || fail=1 + test "$v" = "$my_pwd/$tmp/subdir" || fail=1 + + v=$(readlink -m "${p}./subdir/") || fail=1 + test "$v" = "$my_pwd/$tmp/subdir" || fail=1 + + v=$(readlink -m "${p}subdir/more") || fail=1 + test "$v" = "$my_pwd/$tmp/subdir/more" || fail=1 + + v=$(readlink -m "${p}./subdir/more/") || fail=1 + test "$v" = "$my_pwd/$tmp/subdir/more" || fail=1 + + v=$(readlink -m "${p}missing") || fail=1 + test "$v" = "$my_pwd/$tmp/missing" || fail=1 + + v=$(readlink -m "${p}./missing/") || fail=1 + test "$v" = "$my_pwd/$tmp/missing" || fail=1 + + v=$(readlink -m "${p}missing/more") || fail=1 + test "$v" = "$my_pwd/$tmp/missing/more" || fail=1 + + v=$(readlink -m "${p}./missing/more/") || fail=1 + test "$v" = "$my_pwd/$tmp/missing/more" || fail=1 + + v=$(readlink -m "${p}link1") || fail=1 + test "$v" = "$my_pwd/$tmp/regfile" || fail=1 + + v=$(readlink -m "${p}./link1/") || fail=1 + test "$v" = "$my_pwd/$tmp/regfile" || fail=1 + + v=$(readlink -m "${p}link1/more") || fail=1 + test "$v" = "$my_pwd/$tmp/regfile/more" || fail=1 + + v=$(readlink -m "${p}./link1/more/") || fail=1 + test "$v" = "$my_pwd/$tmp/regfile/more" || fail=1 + + v=$(readlink -m "${p}link2") || fail=1 + test "$v" = "$my_pwd/$tmp/subdir" || fail=1 + + v=$(readlink -m "${p}./link2/") || fail=1 + test "$v" = "$my_pwd/$tmp/subdir" || fail=1 + + v=$(readlink -m "${p}link2/more") || fail=1 + test "$v" = "$my_pwd/$tmp/subdir/more" || fail=1 + + v=$(readlink -m "${p}./link2/more/") || fail=1 + test "$v" = "$my_pwd/$tmp/subdir/more" || fail=1 + + v=$(readlink -m "${p}link2/more/more2") || fail=1 + test "$v" = "$my_pwd/$tmp/subdir/more/more2" || fail=1 + + v=$(readlink -m "${p}./link2/more/more2/") || fail=1 + test "$v" = "$my_pwd/$tmp/subdir/more/more2" || fail=1 + + v=$(readlink -m "${p}link3") || fail=1 + test "$v" = "$my_pwd/$tmp/missing" || fail=1 + + v=$(readlink -m "${p}./link3/") || fail=1 + test "$v" = "$my_pwd/$tmp/missing" || fail=1 + + v=$(readlink -m "${p}link3/more") || fail=1 + test "$v" = "$my_pwd/$tmp/missing/more" || fail=1 + + v=$(readlink -m "${p}./link3/more/") || fail=1 + test "$v" = "$my_pwd/$tmp/missing/more" || fail=1 + + v=$(readlink -m "${p}link4") || fail=1 + test "$v" = "$my_pwd/$tmp/subdir/missing" || fail=1 + + v=$(readlink -m "${p}./link4/") || fail=1 + test "$v" = "$my_pwd/$tmp/subdir/missing" || fail=1 + + v=$(readlink -m "${p}link4/more") || fail=1 + test "$v" = "$my_pwd/$tmp/subdir/missing/more" || fail=1 + + v=$(readlink -m "${p}./link4/more/") || fail=1 + test "$v" = "$my_pwd/$tmp/subdir/missing/more" || fail=1 + +done + +Exit $fail diff --git a/tests/readlink/multi.sh b/tests/readlink/multi.sh new file mode 100755 index 00000000..3b915443 --- /dev/null +++ b/tests/readlink/multi.sh @@ -0,0 +1,46 @@ +#!/bin/sh +# test multiple argument handling. + +# Copyright (C) 2012-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ readlink + +touch regfile || framework_failure_ +ln -s regfile link1 || framework_failure_ + +readlink link1 link1 || fail=1 +readlink link1 link2 && fail=1 +readlink link1 link2 link1 && fail=1 +readlink -m link1 link2 || fail=1 + +printf '/1\0/1\0' > exp || framework_failure_ +readlink -m --zero /1 /1 > out || fail=1 +compare exp out || fail=1 + +# The largely redundant --no-newline option is ignored with multiple args. +# Note BSD's readlink suppresses all delimiters, even with multiple args, +# but that functionality was not thought useful. +readlink -n -m --zero /1 /1 > out || fail=1 +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 +compare exp out || fail=1 + +Exit $fail diff --git a/tests/readlink/rl-1 b/tests/readlink/rl-1 deleted file mode 100755 index 511a9890..00000000 --- a/tests/readlink/rl-1 +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -# test for readlink mode. - -# Copyright (C) 2004-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ readlink - -mkdir subdir || framework_failure_ -touch regfile || framework_failure_ -ln -s regfile link1 || framework_failure_ -ln -s missing link2 || framework_failure_ - - -v=$(readlink link1) || fail=1 -test "$v" = regfile || fail=1 - -v=$(readlink link2) || fail=1 -test "$v" = missing || fail=1 - -v=$(readlink subdir) && fail=1 -test -z "$v" || fail=1 - -v=$(readlink regfile) && fail=1 -test -z "$v" || fail=1 - -v=$(readlink missing) && fail=1 -test -z "$v" || fail=1 - -Exit $fail diff --git a/tests/readlink/rl-1.sh b/tests/readlink/rl-1.sh new file mode 100755 index 00000000..97d5ab3f --- /dev/null +++ b/tests/readlink/rl-1.sh @@ -0,0 +1,43 @@ +#!/bin/sh +# test for readlink mode. + +# Copyright (C) 2004-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ readlink + +mkdir subdir || framework_failure_ +touch regfile || framework_failure_ +ln -s regfile link1 || framework_failure_ +ln -s missing link2 || framework_failure_ + + +v=$(readlink link1) || fail=1 +test "$v" = regfile || fail=1 + +v=$(readlink link2) || fail=1 +test "$v" = missing || fail=1 + +v=$(readlink subdir) && fail=1 +test -z "$v" || fail=1 + +v=$(readlink regfile) && fail=1 +test -z "$v" || fail=1 + +v=$(readlink missing) && fail=1 +test -z "$v" || fail=1 + +Exit $fail diff --git a/tests/rm/cycle b/tests/rm/cycle deleted file mode 100755 index 33e1283b..00000000 --- a/tests/rm/cycle +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# rm (coreutils-4.5.4) could be tricked into mistakenly reporting a cycle. - -# Copyright (C) 2003-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ rm -skip_if_root_ - -mkdir -p a/b -touch a/b/file -chmod u-w a/b - - -rm -rf a a 2>&1 | sed 's/:[^:]*$//' > out || fail=1 -cat <<\EOF > exp -rm: cannot remove 'a/b/file' -rm: cannot remove 'a/b/file' -EOF - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/rm/cycle.sh b/tests/rm/cycle.sh new file mode 100755 index 00000000..881d84b2 --- /dev/null +++ b/tests/rm/cycle.sh @@ -0,0 +1,36 @@ +#!/bin/sh +# rm (coreutils-4.5.4) could be tricked into mistakenly reporting a cycle. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ rm +skip_if_root_ + +mkdir -p a/b +touch a/b/file +chmod u-w a/b + + +rm -rf a a 2>&1 | sed 's/:[^:]*$//' > out || fail=1 +cat <<\EOF > exp +rm: cannot remove 'a/b/file' +rm: cannot remove 'a/b/file' +EOF + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/rm/d-1.sh b/tests/rm/d-1.sh new file mode 100755 index 00000000..cfe38ad5 --- /dev/null +++ b/tests/rm/d-1.sh @@ -0,0 +1,38 @@ +#!/bin/sh +# Test "rm --dir --verbose". + +# Copyright (C) 2012-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ rm + +mkdir a || framework_failure_ +> b || framework_failure_ + +rm --verbose --dir a b > out || fail=1 + +cat <<\EOF > exp || framework_failure_ +removed directory: 'a' +removed 'b' +EOF + +test -e a && fail=1 +test -e b && fail=1 + +# Compare expected and actual output. +compare exp out || fail=1 + +Exit $fail diff --git a/tests/rm/d-2.sh b/tests/rm/d-2.sh new file mode 100755 index 00000000..3b8ca664 --- /dev/null +++ b/tests/rm/d-2.sh @@ -0,0 +1,37 @@ +#!/bin/sh +# Ensure that 'rm -d dir' (i.e., without --recursive) gives a reasonable +# diagnostic when failing. + +# Copyright (C) 2012-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ rm + +mkdir d || framework_failure_ +> d/a || framework_failure_ + +rm -d d 2> out && fail=1 + +# Accept any of these: EEXIST, ENOTEMPTY +sed 's/: File exists/: Directory not empty/' out > out2 + +printf "%s\n" \ + "rm: cannot remove 'd': Directory not empty" \ + > exp || framework_failure_ + +compare exp out2 || fail=1 + +Exit $fail diff --git a/tests/rm/d-3.sh b/tests/rm/d-3.sh new file mode 100755 index 00000000..b3bd0b10 --- /dev/null +++ b/tests/rm/d-3.sh @@ -0,0 +1,37 @@ +#!/bin/sh +# 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. + +# This 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 + +mkdir d || framework_failure_ + +echo "y" | rm -i -d --verbose d > out 2> out.err || fail=1 +printf "%s" \ + "rm: remove directory 'd'? " \ + > exp.err || framework_failure_ + +printf "%s\n" \ + "removed directory: 'd'" \ + > exp || framework_failure_ + +compare exp out || fail=1 +compare exp.err out.err || fail=1 + +Exit $fail diff --git a/tests/rm/dangling-symlink b/tests/rm/dangling-symlink deleted file mode 100755 index 92a59066..00000000 --- a/tests/rm/dangling-symlink +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh -# rm should not prompt before removing a dangling symlink. -# Likewise for a non-dangling symlink. -# But for fileutils-4.1.9, it would do the former and -# for fileutils-4.1.10 the latter. - -# Copyright (C) 2002-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ rm - -ln -s no-file dangle -ln -s / symlink - - -rm ---presume-input-tty dangle symlink & -pid=$! -# The buggy rm (fileutils-4.1.9) would hang here, waiting for input. - -# Wait up to 3.1s for rm to remove the files -check_files_removed() { - local delay="$1" - local present=0 - ls -l dangle > /dev/null 2>&1 && present=1 - ls -l symlink > /dev/null 2>&1 && present=1 - test $present = 1 && { sleep $delay; return 1; } || : -} -retry_delay_ check_files_removed .1 5 || fail=1 - -kill $pid > /dev/null 2>&1 - -Exit $fail diff --git a/tests/rm/dangling-symlink.sh b/tests/rm/dangling-symlink.sh new file mode 100755 index 00000000..62c66915 --- /dev/null +++ b/tests/rm/dangling-symlink.sh @@ -0,0 +1,45 @@ +#!/bin/sh +# rm should not prompt before removing a dangling symlink. +# Likewise for a non-dangling symlink. +# 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. + +# This 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 + +ln -s no-file dangle +ln -s / symlink + + +rm ---presume-input-tty dangle symlink & +pid=$! +# The buggy rm (fileutils-4.1.9) would hang here, waiting for input. + +# Wait up to 3.1s for rm to remove the files +check_files_removed() { + local delay="$1" + local present=0 + ls -l dangle > /dev/null 2>&1 && present=1 + ls -l symlink > /dev/null 2>&1 && present=1 + test $present = 1 && { sleep $delay; return 1; } || : +} +retry_delay_ check_files_removed .1 5 || fail=1 + +kill $pid > /dev/null 2>&1 + +Exit $fail diff --git a/tests/rm/deep-1 b/tests/rm/deep-1 deleted file mode 100755 index f739eb59..00000000 --- a/tests/rm/deep-1 +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh -# Test "rm" with a deep hierarchy. - -# Copyright (C) 1997-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 -# 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 is a bit of a torture test for mkdir -p, too. -# GNU rm performs *much* better on systems that have a d_type member -# in the directory structure because then it does only one stat per -# command line argument. - -# If this test takes too long on your system, blame the OS. - -. "${srcdir=.}/init.sh"; path_prepend_ ../src -print_ver_ rm - -umask 022 - - -k20=/k/k/k/k/k/k/k/k/k/k/k/k/k/k/k/k/k/k/k/k -k200=$k20$k20$k20$k20$k20$k20$k20$k20$k20$k20 - -# Be careful not to exceed max file name length (usu 512?). -# Doing so wouldn't affect GNU mkdir or GNU rm, but any tool that -# operates on the full pathname (like 'test') would choke. -k_deep=$k200$k200 - -t=t -# Create a directory in $t with lots of 'k' components. -deep=$t$k_deep -mkdir -p $deep || fail=1 - -# Make sure the deep dir was created. -test -d $deep || fail=1 - -rm -r $t || fail=1 - -# Make sure all of $t was deleted. -test -d $t && fail=1 - -Exit $fail diff --git a/tests/rm/deep-1.sh b/tests/rm/deep-1.sh new file mode 100755 index 00000000..5f4b63ef --- /dev/null +++ b/tests/rm/deep-1.sh @@ -0,0 +1,53 @@ +#!/bin/sh +# Test "rm" with a deep hierarchy. + +# Copyright (C) 1997-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/>. + +# This is a bit of a torture test for mkdir -p, too. +# GNU rm performs *much* better on systems that have a d_type member +# in the directory structure because then it does only one stat per +# command line argument. + +# If this test takes too long on your system, blame the OS. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ rm + +umask 022 + + +k20=/k/k/k/k/k/k/k/k/k/k/k/k/k/k/k/k/k/k/k/k +k200=$k20$k20$k20$k20$k20$k20$k20$k20$k20$k20 + +# Be careful not to exceed max file name length (usu 512?). +# Doing so wouldn't affect GNU mkdir or GNU rm, but any tool that +# operates on the full pathname (like 'test') would choke. +k_deep=$k200$k200 + +t=t +# Create a directory in $t with lots of 'k' components. +deep=$t$k_deep +mkdir -p $deep || fail=1 + +# Make sure the deep dir was created. +test -d $deep || fail=1 + +rm -r $t || fail=1 + +# Make sure all of $t was deleted. +test -d $t && fail=1 + +Exit $fail diff --git a/tests/rm/deep-2 b/tests/rm/deep-2 deleted file mode 100755 index 26609774..00000000 --- a/tests/rm/deep-2 +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -# Ensure rm -r DIR does not prompt for very long full relative names in DIR. - -# Copyright (C) 2008-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ rm -require_perl_ - -# Root can run this test, but it always succeeds, since for root, all -# files are writable, and write_protected_non_symlink never reaches -# the offending euidaccess_stat call. -skip_if_root_ - -mkdir x || framework_failure_ -cd x || framework_failure_ - -# Construct a hierarchy containing a relative file with a long name -: ${PERL=perl} -$PERL \ - -e 'my $d = "x" x 200; foreach my $i (1..52)' \ - -e ' { mkdir ($d, 0700) && chdir $d or die "$!" }' \ - || framework_failure_ - -cd .. || framework_failure_ -echo n > no || framework_failure_ - -rm ---presume-input-tty -r x < no > out || fail=1 - -# expect empty output -test -s out && fail=1 - -# the directory must have been removed -test -d x && fail=1 - -Exit $fail diff --git a/tests/rm/deep-2.sh b/tests/rm/deep-2.sh new file mode 100755 index 00000000..a03cd965 --- /dev/null +++ b/tests/rm/deep-2.sh @@ -0,0 +1,49 @@ +#!/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. + +# This 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 +require_perl_ + +# Root can run this test, but it always succeeds, since for root, all +# files are writable, and write_protected_non_symlink never reaches +# the offending euidaccess_stat call. +skip_if_root_ + +mkdir x || framework_failure_ +cd x || framework_failure_ + +# Construct a hierarchy containing a relative file with a long name +: ${PERL=perl} +$PERL \ + -e 'my $d = "x" x 200; foreach my $i (1..52)' \ + -e ' { mkdir ($d, 0700) && chdir $d or die "$!" }' \ + || framework_failure_ + +cd .. || framework_failure_ +echo n > no || framework_failure_ + +rm ---presume-input-tty -r x < no > out || fail=1 + +# expect empty output +test -s out && fail=1 + +# the directory must have been removed +test -d x && fail=1 + +Exit $fail diff --git a/tests/rm/dir-no-w b/tests/rm/dir-no-w deleted file mode 100755 index ce33b98e..00000000 --- a/tests/rm/dir-no-w +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh -# rm (without -r) must give a diagnostic for any directory. -# It must not prompt, even if that directory is unwritable. - -# Copyright (C) 2003-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ rm - -mkdir --mode=0500 unwritable-dir || framework_failure_ - - -# For rm from coreutils-5.0.1, this would prompt. -rm ---presume-input-tty unwritable-dir < /dev/null > out-t 2>&1 && fail=1 -cat <<\EOF > exp || fail=1 -rm: cannot remove 'unwritable-dir': Is a directory -EOF - -# When run by a non-privileged user we get this: -# rm: cannot remove directory 'unwritable-dir': Is a directory -# When run by root we get this: -# rm: cannot remove 'unwritable-dir': Is a directory -# Normalize the message. -sed 's/remove directory/remove/' out-t > out -rm -f out-t - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/rm/dir-no-w.sh b/tests/rm/dir-no-w.sh new file mode 100755 index 00000000..da52155c --- /dev/null +++ b/tests/rm/dir-no-w.sh @@ -0,0 +1,42 @@ +#!/bin/sh +# 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. + +# This 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 + +mkdir --mode=0500 unwritable-dir || framework_failure_ + + +# For rm from coreutils-5.0.1, this would prompt. +rm ---presume-input-tty unwritable-dir < /dev/null > out-t 2>&1 && fail=1 +cat <<\EOF > exp || fail=1 +rm: cannot remove 'unwritable-dir': Is a directory +EOF + +# When run by a non-privileged user we get this: +# rm: cannot remove directory 'unwritable-dir': Is a directory +# When run by root we get this: +# rm: cannot remove 'unwritable-dir': Is a directory +# Normalize the message. +sed 's/remove directory/remove/' out-t > out +rm -f out-t + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/rm/dir-nonrecur b/tests/rm/dir-nonrecur deleted file mode 100755 index 8876e945..00000000 --- a/tests/rm/dir-nonrecur +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# Ensure that 'rm dir' (i.e., without --recursive) gives a reasonable -# diagnostic when failing. - -# Copyright (C) 2005-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ rm - -mkdir d || framework_failure_ - - -rm d 2> out && fail=1 -cat <<\EOF > exp || fail=1 -rm: cannot remove 'd': Is a directory -EOF - -# Before coreutils-5.93 this test would fail on Solaris 9 and newer. -compare exp out || fail=1 - -Exit $fail diff --git a/tests/rm/dir-nonrecur.sh b/tests/rm/dir-nonrecur.sh new file mode 100755 index 00000000..fa3168e8 --- /dev/null +++ b/tests/rm/dir-nonrecur.sh @@ -0,0 +1,34 @@ +#!/bin/sh +# Ensure that 'rm dir' (i.e., without --recursive) gives a reasonable +# diagnostic when failing. + +# Copyright (C) 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 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 + +mkdir d || framework_failure_ + + +rm d 2> out && fail=1 +cat <<\EOF > exp || fail=1 +rm: cannot remove 'd': Is a directory +EOF + +# Before coreutils-5.93 this test would fail on Solaris 9 and newer. +compare exp out || fail=1 + +Exit $fail diff --git a/tests/rm/dot-rel b/tests/rm/dot-rel deleted file mode 100755 index fc693596..00000000 --- a/tests/rm/dot-rel +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# 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-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ rm - -mkdir a b || framework_failure_ -touch a/f b/f || framework_failure_ - - -rm -r a b || fail=1 - -Exit $fail diff --git a/tests/rm/dot-rel.sh b/tests/rm/dot-rel.sh new file mode 100755 index 00000000..69956c57 --- /dev/null +++ b/tests/rm/dot-rel.sh @@ -0,0 +1,29 @@ +#!/bin/sh +# 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. + +# This 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 + +mkdir a b || framework_failure_ +touch a/f b/f || framework_failure_ + + +rm -r a b || fail=1 + +Exit $fail diff --git a/tests/rm/empty-inacc b/tests/rm/empty-inacc deleted file mode 100755 index e23cb855..00000000 --- a/tests/rm/empty-inacc +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh -# Ensure that rm -rf removes an empty-and-inaccessible directory. - -# Copyright (C) 2006-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ rm -skip_if_root_ - -mkdir -m0 inacc || framework_failure_ - -# Also exercise the different code path that's taken for a directory -# that is empty (hence removable) and unreadable. -mkdir -m a-r -p a/unreadable - - -# This would fail for e.g., coreutils-5.93. -rm -rf inacc || fail=1 -test -d inacc && fail=1 - -# This would fail for e.g., coreutils-5.97. -rm -rf a || fail=1 -test -d a && fail=1 - -Exit $fail diff --git a/tests/rm/empty-inacc.sh b/tests/rm/empty-inacc.sh new file mode 100755 index 00000000..78d14155 --- /dev/null +++ b/tests/rm/empty-inacc.sh @@ -0,0 +1,38 @@ +#!/bin/sh +# Ensure that rm -rf removes an empty-and-inaccessible directory. + +# Copyright (C) 2006-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ rm +skip_if_root_ + +mkdir -m0 inacc || framework_failure_ + +# Also exercise the different code path that's taken for a directory +# that is empty (hence removable) and unreadable. +mkdir -m a-r -p a/unreadable + + +# This would fail for e.g., coreutils-5.93. +rm -rf inacc || fail=1 +test -d inacc && fail=1 + +# This would fail for e.g., coreutils-5.97. +rm -rf a || fail=1 +test -d a && fail=1 + +Exit $fail diff --git a/tests/rm/empty-name b/tests/rm/empty-name deleted file mode 100755 index b609170d..00000000 --- a/tests/rm/empty-name +++ /dev/null @@ -1,60 +0,0 @@ -#!/usr/bin/perl -# Make sure that rm -r '' fails. - -# Copyright (C) 1998-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 -# 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/>. - -# On SunOS 4.1.3, running rm -r '' in a nonempty directory may -# actually remove files with names of entries in the current directory -# but relative to '/' rather than relative to the current directory. - -use strict; - -(my $program_name = $0) =~ s|.*/||; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -my $prog = 'rm'; - -# FIXME: copied from misc/ls-misc; factor into Coreutils.pm? -sub mk_file(@) -{ - foreach my $f (@_) - { - open (F, '>', $f) && close F - or die "creating $f: $!\n"; - } -} - -my @Tests = - ( - # test-name options input expected-output - # - ['empty-name-1', "''", {EXIT => 1}, - {ERR => "$prog: cannot remove '': No such file or directory\n"}], - - ['empty-name-2', "a '' b", {EXIT => 1}, - {ERR => "$prog: cannot remove '': No such file or directory\n"}, - {PRE => sub { mk_file qw(a b) }}, - {POST => sub {-f 'a' || -f 'b' and die "a or b remain\n" }}, - ], - ); - -my $save_temps = $ENV{SAVE_TEMPS}; -my $verbose = $ENV{VERBOSE}; - -my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); -exit $fail; diff --git a/tests/rm/empty-name.pl b/tests/rm/empty-name.pl new file mode 100755 index 00000000..4c94ebc0 --- /dev/null +++ b/tests/rm/empty-name.pl @@ -0,0 +1,60 @@ +#!/usr/bin/perl +# Make sure that rm -r '' fails. + +# Copyright (C) 1998-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/>. + +# On SunOS 4.1.3, running rm -r '' in a nonempty directory may +# actually remove files with names of entries in the current directory +# but relative to '/' rather than relative to the current directory. + +use strict; + +(my $program_name = $0) =~ s|.*/||; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +my $prog = 'rm'; + +# FIXME: copied from misc/ls-misc; factor into Coreutils.pm? +sub mk_file(@) +{ + foreach my $f (@_) + { + open (F, '>', $f) && close F + or die "creating $f: $!\n"; + } +} + +my @Tests = + ( + # test-name options input expected-output + # + ['empty-name-1', "''", {EXIT => 1}, + {ERR => "$prog: cannot remove '': No such file or directory\n"}], + + ['empty-name-2', "a '' b", {EXIT => 1}, + {ERR => "$prog: cannot remove '': No such file or directory\n"}, + {PRE => sub { mk_file qw(a b) }}, + {POST => sub {-f 'a' || -f 'b' and die "a or b remain\n" }}, + ], + ); + +my $save_temps = $ENV{SAVE_TEMPS}; +my $verbose = $ENV{VERBOSE}; + +my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); +exit $fail; diff --git a/tests/rm/ext3-perf b/tests/rm/ext3-perf deleted file mode 100755 index 97b0a17b..00000000 --- a/tests/rm/ext3-perf +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/sh -# ensure that "rm -rf DIR-with-many-entries" is not O(N^2) - -# Copyright (C) 2008-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ rm - -very_expensive_ - -# Using rm -rf to remove a 400k-entry directory takes: -# - 9 seconds with the patch, on a 2-yr-old system -# - 350 seconds without the patch, on a high-end system (disk 20-30% faster) -threshold_seconds=60 - -# The number of entries in our test directory. -n=400000 - -# Choose a value that is large enough to ensure an accidentally -# regressed rm would require much longer than $threshold_seconds to remove -# the directory. With n=400k, pre-patch GNU rm would require about 350 -# seconds even on a fast disk. On a relatively modern system, the -# patched version of rm requires about 10 seconds, so even if you -# choose to enable very expensive tests with a disk that is much slower, -# the test should still succeed. - -# Skip unless "." is on an ext[34] file system. -# FIXME-maybe: try to find a suitable file system or allow -# the user to specify it via an envvar. -df -T -t ext3 -t ext4dev -t ext4 . \ - || skip_ 'this test runs only on an ext3 or ext4 file system' - -# Skip if there are too few inodes free. Require some slack. -free_inodes=$(stat -f --format=%d .) || framework_failure_ -min_free_inodes=$(expr 12 \* $n / 10) -test $min_free_inodes -lt $free_inodes \ - || skip_ "too few free inodes on '.': $free_inodes;" \ - "this test requires at least $min_free_inodes" - -ok=0 -start=$(date +%s) -mkdir d && - cd d && - seq $n | xargs touch && - test -f 1 && - test -f $n && - cd .. && - ok=1 -test $ok = 1 || framework_failure_ -setup_duration=$(expr $(date +%s) - $start) -echo creating a $n-entry directory took $setup_duration seconds - -# If set-up took longer than the default $threshold_seconds, -# use the longer set-up duration as the limit. -test $threshold_seconds -lt $setup_duration \ - && threshold_seconds=$setup_duration - -start=$(date +%s) -timeout ${threshold_seconds}s rm -rf d; err=$? -duration=$(expr $(date +%s) - $start) - -case $err in - 124) fail=1; echo rm took longer than $threshold_seconds seconds;; - 0) ;; - *) fail=1;; -esac - -echo removing a $n-entry directory took $duration seconds - -Exit $fail diff --git a/tests/rm/ext3-perf.sh b/tests/rm/ext3-perf.sh new file mode 100755 index 00000000..e24c8098 --- /dev/null +++ b/tests/rm/ext3-perf.sh @@ -0,0 +1,83 @@ +#!/bin/sh +# ensure that "rm -rf DIR-with-many-entries" is not O(N^2) + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ rm + +very_expensive_ + +# Using rm -rf to remove a 400k-entry directory takes: +# - 9 seconds with the patch, on a 2-yr-old system +# - 350 seconds without the patch, on a high-end system (disk 20-30% faster) +threshold_seconds=60 + +# The number of entries in our test directory. +n=400000 + +# Choose a value that is large enough to ensure an accidentally +# regressed rm would require much longer than $threshold_seconds to remove +# the directory. With n=400k, pre-patch GNU rm would require about 350 +# seconds even on a fast disk. On a relatively modern system, the +# patched version of rm requires about 10 seconds, so even if you +# choose to enable very expensive tests with a disk that is much slower, +# the test should still succeed. + +# Skip unless "." is on an ext[34] file system. +# FIXME-maybe: try to find a suitable file system or allow +# the user to specify it via an envvar. +df -T -t ext3 -t ext4dev -t ext4 . \ + || skip_ 'this test runs only on an ext3 or ext4 file system' + +# Skip if there are too few inodes free. Require some slack. +free_inodes=$(stat -f --format=%d .) || framework_failure_ +min_free_inodes=$(expr 12 \* $n / 10) +test $min_free_inodes -lt $free_inodes \ + || skip_ "too few free inodes on '.': $free_inodes;" \ + "this test requires at least $min_free_inodes" + +ok=0 +start=$(date +%s) +mkdir d && + cd d && + seq $n | xargs touch && + test -f 1 && + test -f $n && + cd .. && + ok=1 +test $ok = 1 || framework_failure_ +setup_duration=$(expr $(date +%s) - $start) +echo creating a $n-entry directory took $setup_duration seconds + +# If set-up took longer than the default $threshold_seconds, +# use the longer set-up duration as the limit. +test $threshold_seconds -lt $setup_duration \ + && threshold_seconds=$setup_duration + +start=$(date +%s) +timeout ${threshold_seconds}s rm -rf d; err=$? +duration=$(expr $(date +%s) - $start) + +case $err in + 124) fail=1; echo rm took longer than $threshold_seconds seconds;; + 0) ;; + *) fail=1;; +esac + +echo removing a $n-entry directory took $duration seconds + +Exit $fail diff --git a/tests/rm/f-1 b/tests/rm/f-1 deleted file mode 100755 index e1ed8d4f..00000000 --- a/tests/rm/f-1 +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# Test "rm -f" with a nonexistent file. - -# Copyright (C) 1997-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ rm - -mkdir -p d || framework_failure_ - -rm -f d/no-such-file || fail=1 - -Exit $fail diff --git a/tests/rm/f-1.sh b/tests/rm/f-1.sh new file mode 100755 index 00000000..7837580f --- /dev/null +++ b/tests/rm/f-1.sh @@ -0,0 +1,26 @@ +#!/bin/sh +# Test "rm -f" with a nonexistent file. + +# Copyright (C) 1997-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ rm + +mkdir -p d || framework_failure_ + +rm -f d/no-such-file || fail=1 + +Exit $fail diff --git a/tests/rm/fail-2eperm b/tests/rm/fail-2eperm deleted file mode 100755 index fa2f4322..00000000 --- a/tests/rm/fail-2eperm +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh -# 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-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ rm -require_root_ - -# The containing directory must be owned by the user who eventually runs rm. -chown $NON_ROOT_USERNAME . - -mkdir a || framework_failure_ -chmod 1777 a || framework_failure_ -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 | - 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 - -# On some systems, we get 'Not owner'. Convert it. -# On other systems (HPUX), we get 'Permission denied'. Convert it, too. -onp='Operation not permitted' -sed "s/Not owner/$onp/;s/Permission denied/$onp/" out-t > out - -cat <<\EOF > exp -rm: cannot remove 'a/b': Operation not permitted -EOF - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/rm/fail-2eperm.sh b/tests/rm/fail-2eperm.sh new file mode 100755 index 00000000..0f1a4fa5 --- /dev/null +++ b/tests/rm/fail-2eperm.sh @@ -0,0 +1,55 @@ +#!/bin/sh +# 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. + +# This 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 +require_root_ + +# The containing directory must be owned by the user who eventually runs rm. +chown $NON_ROOT_USERNAME . + +mkdir a || framework_failure_ +chmod 1777 a || framework_failure_ +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 | + 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 + +# On some systems, we get 'Not owner'. Convert it. +# On other systems (HPUX), we get 'Permission denied'. Convert it, too. +onp='Operation not permitted' +sed "s/Not owner/$onp/;s/Permission denied/$onp/" out-t > out + +cat <<\EOF > exp +rm: cannot remove 'a/b': Operation not permitted +EOF + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/rm/fail-eacces b/tests/rm/fail-eacces deleted file mode 100755 index 947dfac3..00000000 --- a/tests/rm/fail-eacces +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh -# Ensure that rm -rf unremovable-non-dir gives a diagnostic. -# Test both a regular file and a symlink -- it makes a difference to rm. -# With the symlink, rm from coreutils-6.9 would fail with a misleading -# ELOOP diagnostic. - -# Copyright (C) 2006-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ rm -skip_if_root_ - -ok=0 -mkdir d && - touch d/f && - ln -s f d/slink && - chmod a-w d && - ok=1 -test $ok = 1 || framework_failure_ - -mkdir e && - ln -s f e/slink && - chmod a-w e && - ok=1 -test $ok = 1 || framework_failure_ - - -rm -rf d/f 2> out && fail=1 -cat <<\EOF > exp -rm: cannot remove 'd/f': Permission denied -EOF -compare exp out || fail=1 - -# This used to fail with ELOOP. -rm -rf e 2> out && fail=1 -cat <<\EOF > exp -rm: cannot remove 'e/slink': Permission denied -EOF -compare exp out || fail=1 - -Exit $fail diff --git a/tests/rm/fail-eacces.sh b/tests/rm/fail-eacces.sh new file mode 100755 index 00000000..2167a047 --- /dev/null +++ b/tests/rm/fail-eacces.sh @@ -0,0 +1,54 @@ +#!/bin/sh +# Ensure that rm -rf unremovable-non-dir gives a diagnostic. +# Test both a regular file and a symlink -- it makes a difference to rm. +# With the symlink, rm from coreutils-6.9 would fail with a misleading +# ELOOP diagnostic. + +# Copyright (C) 2006-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ rm +skip_if_root_ + +ok=0 +mkdir d && + touch d/f && + ln -s f d/slink && + chmod a-w d && + ok=1 +test $ok = 1 || framework_failure_ + +mkdir e && + ln -s f e/slink && + chmod a-w e && + ok=1 +test $ok = 1 || framework_failure_ + + +rm -rf d/f 2> out && fail=1 +cat <<\EOF > exp +rm: cannot remove 'd/f': Permission denied +EOF +compare exp out || fail=1 + +# This used to fail with ELOOP. +rm -rf e 2> out && fail=1 +cat <<\EOF > exp +rm: cannot remove 'e/slink': Permission denied +EOF +compare exp out || fail=1 + +Exit $fail diff --git a/tests/rm/fail-eperm b/tests/rm/fail-eperm deleted file mode 100755 index 6e34d5d3..00000000 --- a/tests/rm/fail-eperm +++ /dev/null @@ -1,151 +0,0 @@ -#!/usr/bin/perl -Tw -# 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-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 -# 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; - -(my $ME = $0) =~ s|.*/||; - -my $uid = $<; -# skip if root -$uid == 0 - and CuSkip::skip "$ME: can't run this test as root: skipping this test"; - -my $verbose = $ENV{VERBOSE} && $ENV{VERBOSE} eq 'yes'; - -# Ensure that the diagnostics are in English. -$ENV{LC_ALL} = 'C'; - -# Set up a safe, well-known environment -delete @ENV{qw(BASH_ENV CDPATH ENV)}; -$ENV{IFS} = ''; - -# Taint checking requires a sanitized $PATH. This script performs no $PATH -# search, so on most Unix-based systems, it is fine simply to clear $ENV{PATH}. -# However, on Cygwin, it's used to find cygwin1.dll, so set it. -$ENV{PATH} = '/bin:/usr/bin'; - -my @dir_list = qw(/tmp /var/tmp /usr/tmp); -my $rm = "$ENV{abs_top_builddir}/src/rm"; - -# Untaint for upcoming popen. -$rm =~ m!^([-+\@\w./]+)$! - or CuSkip::skip "$ME: unusual absolute builddir name; skipping this test\n"; -$rm = $1; - -# Find a directory with the sticky bit set. -my $found_dir; -my $found_file; -foreach my $dir (@dir_list) - { - if (-d $dir && -k _ && -r _ && -w _ && -x _) - { - $found_dir = 1; - - # Find a non-directory there that is owned by some other user. - opendir DIR_HANDLE, $dir - or die "$ME: couldn't open $dir: $!\n"; - - foreach my $f (readdir DIR_HANDLE) - { - # Consider only names containing "safe" characters. - $f =~ /^([-\@\w.]+)$/ - or next; - $f = $1; # untaint $f - - my $target_file = "$dir/$f"; - $verbose - and warn "$ME: considering $target_file\n"; - - # Skip files owned by self, symlinks, and directories. - # It's not technically necessary to skip symlinks, but it's simpler. - # SVR4-like systems (e.g., Solaris 9) let you unlink files that - # you can write, so skip writable files too. - -l $target_file || -o _ || -d _ || -w _ - and next; - - $found_file = 1; - - # Invoke rm on this file and ensure that we get the - # expected exit code and diagnostic. - my $cmd = "$rm -f -- $target_file"; - open RM, "$cmd 2>&1 |" - or die "$ME: cannot execute '$cmd'\n"; - - my $line = <RM>; - - close RM; - my $rc = $?; - # This test opportunistically looks for files that can't - # be removed but those files may already have been removed - # by their owners by the time we get to them. It is a - # race condition. If so then the rm is successful and our - # test is thwarted. Detect this case and ignore. - if ($rc == 0) - { - next if ! -e $target_file; - die "$ME: unexpected exit status from '$cmd';\n" - . " got 0, expected 1\n"; - } - if (0x80 < $rc) - { - my $status = $rc >> 8; - $status == 1 - or die "$ME: unexpected exit status from '$cmd';\n" - . " got $status, expected 1\n"; - } - else - { - # Terminated by a signal. - my $sig_num = $rc & 0x7F; - die "$ME: command '$cmd' died with signal $sig_num\n"; - } - - my $exp = "rm: cannot remove '$target_file':"; - $line - or die "$ME: no output from '$cmd';\n" - . "expected something like '$exp ...'\n"; - - # Transform the actual diagnostic so that it starts with "rm:". - # Depending on your system, it might be "rm:" already, or - # "../../src/rm:". - $line =~ s,^\Q$rm\E:,rm:,; - - my $regex = quotemeta $exp; - $line =~ /^$regex/ - or die "$ME: unexpected diagnostic from '$cmd';\n" - . " got $line" - . " expected $exp ...\n"; - - last; - } - - closedir DIR_HANDLE; - $found_file - and last; - } - } - -$found_dir - or CuSkip::skip "$ME: couldn't find a directory with the sticky bit set;" - . " skipping this test\n"; - -$found_file - or CuSkip::skip "$ME: couldn't find a file not owned by you\n" - . " in any of the following directories:\n @dir_list\n" - . "...so, skipping this test\n"; diff --git a/tests/rm/fail-eperm.xpl b/tests/rm/fail-eperm.xpl new file mode 100755 index 00000000..fb46445e --- /dev/null +++ b/tests/rm/fail-eperm.xpl @@ -0,0 +1,151 @@ +#!/usr/bin/perl -Tw +# 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. + +# This 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; + +(my $ME = $0) =~ s|.*/||; + +my $uid = $<; +# skip if root +$uid == 0 + and CuSkip::skip "$ME: can't run this test as root: skipping this test"; + +my $verbose = $ENV{VERBOSE} && $ENV{VERBOSE} eq 'yes'; + +# Ensure that the diagnostics are in English. +$ENV{LC_ALL} = 'C'; + +# Set up a safe, well-known environment +delete @ENV{qw(BASH_ENV CDPATH ENV)}; +$ENV{IFS} = ''; + +# Taint checking requires a sanitized $PATH. This script performs no $PATH +# search, so on most Unix-based systems, it is fine simply to clear $ENV{PATH}. +# However, on Cygwin, it's used to find cygwin1.dll, so set it. +$ENV{PATH} = '/bin:/usr/bin'; + +my @dir_list = qw(/tmp /var/tmp /usr/tmp); +my $rm = "$ENV{abs_top_builddir}/src/rm"; + +# Untaint for upcoming popen. +$rm =~ m!^([-+\@\w./]+)$! + or CuSkip::skip "$ME: unusual absolute builddir name; skipping this test\n"; +$rm = $1; + +# Find a directory with the sticky bit set. +my $found_dir; +my $found_file; +foreach my $dir (@dir_list) + { + if (-d $dir && -k _ && -r _ && -w _ && -x _) + { + $found_dir = 1; + + # Find a non-directory there that is owned by some other user. + opendir DIR_HANDLE, $dir + or die "$ME: couldn't open $dir: $!\n"; + + foreach my $f (readdir DIR_HANDLE) + { + # Consider only names containing "safe" characters. + $f =~ /^([-\@\w.]+)$/ + or next; + $f = $1; # untaint $f + + my $target_file = "$dir/$f"; + $verbose + and warn "$ME: considering $target_file\n"; + + # Skip files owned by self, symlinks, and directories. + # It's not technically necessary to skip symlinks, but it's simpler. + # SVR4-like systems (e.g., Solaris 9) let you unlink files that + # you can write, so skip writable files too. + -l $target_file || -o _ || -d _ || -w _ + and next; + + $found_file = 1; + + # Invoke rm on this file and ensure that we get the + # expected exit code and diagnostic. + my $cmd = "$rm -f -- $target_file"; + open RM, "$cmd 2>&1 |" + or die "$ME: cannot execute '$cmd'\n"; + + my $line = <RM>; + + close RM; + my $rc = $?; + # This test opportunistically looks for files that can't + # be removed but those files may already have been removed + # by their owners by the time we get to them. It is a + # race condition. If so then the rm is successful and our + # test is thwarted. Detect this case and ignore. + if ($rc == 0) + { + next if ! -e $target_file; + die "$ME: unexpected exit status from '$cmd';\n" + . " got 0, expected 1\n"; + } + if (0x80 < $rc) + { + my $status = $rc >> 8; + $status == 1 + or die "$ME: unexpected exit status from '$cmd';\n" + . " got $status, expected 1\n"; + } + else + { + # Terminated by a signal. + my $sig_num = $rc & 0x7F; + die "$ME: command '$cmd' died with signal $sig_num\n"; + } + + my $exp = "rm: cannot remove '$target_file':"; + $line + or die "$ME: no output from '$cmd';\n" + . "expected something like '$exp ...'\n"; + + # Transform the actual diagnostic so that it starts with "rm:". + # Depending on your system, it might be "rm:" already, or + # "../../src/rm:". + $line =~ s,^\Q$rm\E:,rm:,; + + my $regex = quotemeta $exp; + $line =~ /^$regex/ + or die "$ME: unexpected diagnostic from '$cmd';\n" + . " got $line" + . " expected $exp ...\n"; + + last; + } + + closedir DIR_HANDLE; + $found_file + and last; + } + } + +$found_dir + or CuSkip::skip "$ME: couldn't find a directory with the sticky bit set;" + . " skipping this test\n"; + +$found_file + or CuSkip::skip "$ME: couldn't find a file not owned by you\n" + . " in any of the following directories:\n @dir_list\n" + . "...so, skipping this test\n"; diff --git a/tests/rm/hash b/tests/rm/hash deleted file mode 100755 index 344325e1..00000000 --- a/tests/rm/hash +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -# Exercise a bug that was fixed in 4.0s. -# Before then, rm would fail occasionally, sometimes via -# a failed assertion, others with a seg fault. - -# Copyright (C) 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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ rm -expensive_ - -# Create a hierarchy with 3*26 leaf directories, each at depth 153. -echo "$0: creating 78 trees, each of depth 153; this will take a while..." >&2 -y=$(seq 1 150|tr -sc '\n' y|tr '\n' /) -for i in 1 2 3; do - for j in a b c d e f g h i j k l m n o p q r s t u v w x y z; do - mkdir -p t/$i/$j/$y || framework_failure_ - done -done - - -rm -r t || fail=1 - -Exit $fail diff --git a/tests/rm/hash.sh b/tests/rm/hash.sh new file mode 100755 index 00000000..e10879b8 --- /dev/null +++ b/tests/rm/hash.sh @@ -0,0 +1,37 @@ +#!/bin/sh +# Exercise a bug that was fixed in 4.0s. +# Before then, rm would fail occasionally, sometimes via +# a failed assertion, others with a seg fault. + +# Copyright (C) 2000-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ rm +expensive_ + +# Create a hierarchy with 3*26 leaf directories, each at depth 153. +echo "$0: creating 78 trees, each of depth 153; this will take a while..." >&2 +y=$(seq 1 150|tr -sc '\n' y|tr '\n' /) +for i in 1 2 3; do + for j in a b c d e f g h i j k l m n o p q r s t u v w x y z; do + mkdir -p t/$i/$j/$y || framework_failure_ + done +done + + +rm -r t || fail=1 + +Exit $fail diff --git a/tests/rm/i-1 b/tests/rm/i-1 deleted file mode 100755 index 67df853f..00000000 --- a/tests/rm/i-1 +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -# Test "rm -i". - -# Copyright (C) 1997-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ rm - -t=t -mkdir -p $t || framework_failure_ -echo > $t/a || framework_failure_ -test -f $t/a || framework_failure_ - -echo y > $t/in-y -echo n > $t/in-n - -rm -i $t/a < $t/in-n > /dev/null 2>&1 || fail=1 -# The file should not have been removed. -test -f $t/a || fail=1 - -rm -i $t/a < $t/in-y > /dev/null 2>&1 || fail=1 -# The file should have been removed this time. -test -f $t/a && fail=1 - -rm -rf $t - -Exit $fail diff --git a/tests/rm/i-1.sh b/tests/rm/i-1.sh new file mode 100755 index 00000000..32aba21d --- /dev/null +++ b/tests/rm/i-1.sh @@ -0,0 +1,40 @@ +#!/bin/sh +# Test "rm -i". + +# Copyright (C) 1997-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ rm + +t=t +mkdir -p $t || framework_failure_ +echo > $t/a || framework_failure_ +test -f $t/a || framework_failure_ + +echo y > $t/in-y +echo n > $t/in-n + +rm -i $t/a < $t/in-n > /dev/null 2>&1 || fail=1 +# The file should not have been removed. +test -f $t/a || fail=1 + +rm -i $t/a < $t/in-y > /dev/null 2>&1 || fail=1 +# The file should have been removed this time. +test -f $t/a && fail=1 + +rm -rf $t + +Exit $fail diff --git a/tests/rm/i-never b/tests/rm/i-never deleted file mode 100755 index 80e1fcd9..00000000 --- a/tests/rm/i-never +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -# Ensure that rm --interactive=never works does not prompt, even for -# an unwritable file. - -# Copyright (C) 2007-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ rm -skip_if_root_ - -touch f || framework_failure_ -chmod 0 f || framework_failure_ -touch exp || framework_failure_ - - -rm --interactive=never f > out || fail=1 - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/rm/i-never.sh b/tests/rm/i-never.sh new file mode 100755 index 00000000..fc4e9412 --- /dev/null +++ b/tests/rm/i-never.sh @@ -0,0 +1,33 @@ +#!/bin/sh +# Ensure that rm --interactive=never works does not prompt, even for +# an unwritable file. + +# Copyright (C) 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ rm +skip_if_root_ + +touch f || framework_failure_ +chmod 0 f || framework_failure_ +touch exp || framework_failure_ + + +rm --interactive=never f > out || fail=1 + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/rm/i-no-r b/tests/rm/i-no-r deleted file mode 100755 index 6b22e1ca..00000000 --- a/tests/rm/i-no-r +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# Since the rewrite for fileutils-4.1.9, 'rm -i DIR' would mistakenly -# recurse into directory DIR. rm -i (without -r) must fail in that case. -# Fixed in coreutils-4.5.2. - -# Copyright (C) 2002-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ rm - -mkdir dir || framework_failure_ -echo y > y || framework_failure_ - - -# This must fail. -rm -i dir < y > /dev/null 2>&1 && fail=1 - -# The directory must remain. -test -d dir || fail=1 - -Exit $fail diff --git a/tests/rm/i-no-r.sh b/tests/rm/i-no-r.sh new file mode 100755 index 00000000..4304f051 --- /dev/null +++ b/tests/rm/i-no-r.sh @@ -0,0 +1,34 @@ +#!/bin/sh +# Since the rewrite for fileutils-4.1.9, 'rm -i DIR' would mistakenly +# 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. + +# This 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 + +mkdir dir || framework_failure_ +echo y > y || framework_failure_ + + +# This must fail. +rm -i dir < y > /dev/null 2>&1 && fail=1 + +# The directory must remain. +test -d dir || fail=1 + +Exit $fail diff --git a/tests/rm/ignorable b/tests/rm/ignorable deleted file mode 100755 index bcf3b7eb..00000000 --- a/tests/rm/ignorable +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# Ensure that rm -f existing-non-dir/anything exits successfully - -# Copyright (C) 2006-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ rm -skip_if_root_ - -touch existing-non-dir || framework_failure_ - - -# With coreutils-6.3, this would exit nonzero. It should not. -# Example from Andreas Schwab. -rm -f existing-non-dir/f > out 2>&1 || fail=1 - -Exit $fail diff --git a/tests/rm/ignorable.sh b/tests/rm/ignorable.sh new file mode 100755 index 00000000..645982c5 --- /dev/null +++ b/tests/rm/ignorable.sh @@ -0,0 +1,30 @@ +#!/bin/sh +# Ensure that rm -f existing-non-dir/anything exits successfully + +# Copyright (C) 2006-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ rm +skip_if_root_ + +touch existing-non-dir || framework_failure_ + + +# With coreutils-6.3, this would exit nonzero. It should not. +# Example from Andreas Schwab. +rm -f existing-non-dir/f > out 2>&1 || fail=1 + +Exit $fail diff --git a/tests/rm/inaccessible b/tests/rm/inaccessible deleted file mode 100755 index 2f045815..00000000 --- a/tests/rm/inaccessible +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -# Ensure that rm works even when run from a directory -# for which the user has no access at all. - -# Copyright (C) 2004-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ rm - -# Skip this test if your system has neither the openat-style functions -# nor /proc/self/fd support with which to emulate them. -require_openat_support_ -skip_if_root_ - -p=$(pwd) -mkdir abs1 abs2 no-access || framework_failure_ - - -set +x -(cd no-access; chmod 0 . && rm -r "$p/abs1" rel "$p/abs2") 2> out && fail=1 -test -d "$p/abs1" && fail=1 -test -d "$p/abs2" && fail=1 - -cat <<\EOF > exp || fail=1 -rm: cannot remove 'rel': Permission denied -EOF - -# AIX 4.3.3 fails with a different diagnostic. -# Transform their diagnostic -# ...: The file access permissions do not allow the specified action. -# to the expected one: -sed 's/: The file access permissions.*/: Permission denied/'<out>o1;mv o1 out - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/rm/inaccessible.sh b/tests/rm/inaccessible.sh new file mode 100755 index 00000000..9408a18b --- /dev/null +++ b/tests/rm/inaccessible.sh @@ -0,0 +1,49 @@ +#!/bin/sh +# 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. + +# This 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 + +# Skip this test if your system has neither the openat-style functions +# nor /proc/self/fd support with which to emulate them. +require_openat_support_ +skip_if_root_ + +p=$(pwd) +mkdir abs1 abs2 no-access || framework_failure_ + + +set +x +(cd no-access; chmod 0 . && rm -r "$p/abs1" rel "$p/abs2") 2> out && fail=1 +test -d "$p/abs1" && fail=1 +test -d "$p/abs2" && fail=1 + +cat <<\EOF > exp || fail=1 +rm: cannot remove 'rel': Permission denied +EOF + +# AIX 4.3.3 fails with a different diagnostic. +# Transform their diagnostic +# ...: The file access permissions do not allow the specified action. +# to the expected one: +sed 's/: The file access permissions.*/: Permission denied/'<out>o1;mv o1 out + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/rm/interactive-always b/tests/rm/interactive-always deleted file mode 100755 index 6312cba1..00000000 --- a/tests/rm/interactive-always +++ /dev/null @@ -1,87 +0,0 @@ -#!/bin/sh -# Test the --interactive[=WHEN] changes added to coreutils 6.0 - -# Copyright (C) 2006-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ rm - -touch file1-1 file1-2 file2-1 file2-2 file3-1 file3-2 file4-1 file4-2 \ - || framework_failure_ -# If asked, answer no to first question, then yes to second. -echo 'n -y' > in || framework_failure_ -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 'no WHEN' > err || fail=1 -rm -R --interactive file1-* < in >> out 2>> err || fail=1 -echo . >> err || fail=1 -test -f file1-1 || fail=1 -test -f file1-2 && fail=1 - -echo 'WHEN=never' >> err || fail=1 -rm -R --interactive=never file2-* < in >> out 2>> err || fail=1 -echo . >> err || fail=1 -test -f file2-1 && fail=1 -test -f file2-2 && fail=1 - -echo 'WHEN=once' >> err || fail=1 -rm -R --interactive=once file3-* < in >> out 2>> err || fail=1 -echo . >> err || fail=1 -test -f file3-1 || fail=1 -test -f file3-2 || fail=1 - -echo 'WHEN=always' >> err || fail=1 -rm -R --interactive=always file4-* < in >> out 2>> err || fail=1 -echo . >> err || fail=1 -test -f file4-1 || fail=1 -test -f file4-2 && fail=1 - -echo '-f overrides --interactive' >> err || fail=1 -rm -R --interactive=once -f file1-* < in >> out 2>> err || fail=1 -echo . >> err || fail=1 -test -f file1-1 && fail=1 - -echo '--interactive overrides -f' >> err || fail=1 -rm -R -f --interactive=once file4-* < in >> out 2>> err || fail=1 -echo . >> err || fail=1 -test -f file4-1 || fail=1 - -cat <<\EOF > expout || fail=1 -EOF -sed 's/@remove_empty/rm: remove regular empty file/g' <<\EOF > experr || fail=1 -no WHEN -@remove_empty 'file1-1'? @remove_empty 'file1-2'? . -WHEN=never -. -WHEN=once -rm: remove all arguments recursively? . -WHEN=always -@remove_empty 'file4-1'? @remove_empty 'file4-2'? . --f overrides --interactive -. ---interactive overrides -f -rm: remove all arguments recursively? . -EOF - -compare expout out || fail=1 -compare experr err || fail=1 - -Exit $fail diff --git a/tests/rm/interactive-always.sh b/tests/rm/interactive-always.sh new file mode 100755 index 00000000..1dfb5a69 --- /dev/null +++ b/tests/rm/interactive-always.sh @@ -0,0 +1,87 @@ +#!/bin/sh +# Test the --interactive[=WHEN] changes added to coreutils 6.0 + +# Copyright (C) 2006-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ rm + +touch file1-1 file1-2 file2-1 file2-2 file3-1 file3-2 file4-1 file4-2 \ + || framework_failure_ +# If asked, answer no to first question, then yes to second. +echo 'n +y' > in || framework_failure_ +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 'no WHEN' > err || fail=1 +rm -R --interactive file1-* < in >> out 2>> err || fail=1 +echo . >> err || fail=1 +test -f file1-1 || fail=1 +test -f file1-2 && fail=1 + +echo 'WHEN=never' >> err || fail=1 +rm -R --interactive=never file2-* < in >> out 2>> err || fail=1 +echo . >> err || fail=1 +test -f file2-1 && fail=1 +test -f file2-2 && fail=1 + +echo 'WHEN=once' >> err || fail=1 +rm -R --interactive=once file3-* < in >> out 2>> err || fail=1 +echo . >> err || fail=1 +test -f file3-1 || fail=1 +test -f file3-2 || fail=1 + +echo 'WHEN=always' >> err || fail=1 +rm -R --interactive=always file4-* < in >> out 2>> err || fail=1 +echo . >> err || fail=1 +test -f file4-1 || fail=1 +test -f file4-2 && fail=1 + +echo '-f overrides --interactive' >> err || fail=1 +rm -R --interactive=once -f file1-* < in >> out 2>> err || fail=1 +echo . >> err || fail=1 +test -f file1-1 && fail=1 + +echo '--interactive overrides -f' >> err || fail=1 +rm -R -f --interactive=once file4-* < in >> out 2>> err || fail=1 +echo . >> err || fail=1 +test -f file4-1 || fail=1 + +cat <<\EOF > expout || fail=1 +EOF +sed 's/@remove_empty/rm: remove regular empty file/g' <<\EOF > experr || fail=1 +no WHEN +@remove_empty 'file1-1'? @remove_empty 'file1-2'? . +WHEN=never +. +WHEN=once +rm: remove all arguments recursively? . +WHEN=always +@remove_empty 'file4-1'? @remove_empty 'file4-2'? . +-f overrides --interactive +. +--interactive overrides -f +rm: remove all arguments recursively? . +EOF + +compare expout out || fail=1 +compare experr err || fail=1 + +Exit $fail diff --git a/tests/rm/interactive-once b/tests/rm/interactive-once deleted file mode 100755 index 982d1a4d..00000000 --- a/tests/rm/interactive-once +++ /dev/null @@ -1,107 +0,0 @@ -#!/bin/sh -# Test the -I option added to coreutils 6.0 - -# Copyright (C) 2006-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ rm - -mkdir -p dir1-1 dir2-1 dir2-2 || framework_failure_ -touch file1-1 file2-1 file2-2 file2-3 file3-1 file3-2 file3-3 file3-4 \ - || framework_failure_ -echo y > in-y || framework_failure_ -echo n > in-n || framework_failure_ -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 -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 -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 -rm -I file3-* < in-n >> 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 -test -f file3-4 || fail=1 - -echo 'four files, no recursion, answer yes' >> err || fail=1 -rm -I file3-* < in-y >> 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 -test -f file3-4 && fail=1 - -echo 'one file, recursion, answer no' >> err || fail=1 -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 -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 -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 -rm -I -R dir2-* < in-y >> out 2>> err || fail=1 -echo . >> err || fail=1 -test -d dir2-1 && fail=1 -test -d dir2-2 && fail=1 - -cat <<\EOF > expout || fail=1 -EOF -cat <<\EOF > experr || fail=1 -one file, no recursion -. -three files, no recursion -. -four files, no recursion, answer no -rm: remove all arguments? . -four files, no recursion, answer yes -rm: remove all arguments? . -one file, recursion, answer no -rm: remove all arguments recursively? . -one file, recursion, answer yes -rm: remove all arguments recursively? . -multiple files, recursion, answer no -rm: remove all arguments recursively? . -multiple files, recursion, answer yes -rm: remove all arguments recursively? . -EOF - -compare expout out || fail=1 -compare experr err || fail=1 - -Exit $fail diff --git a/tests/rm/interactive-once.sh b/tests/rm/interactive-once.sh new file mode 100755 index 00000000..d138b752 --- /dev/null +++ b/tests/rm/interactive-once.sh @@ -0,0 +1,107 @@ +#!/bin/sh +# Test the -I option added to coreutils 6.0 + +# Copyright (C) 2006-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ rm + +mkdir -p dir1-1 dir2-1 dir2-2 || framework_failure_ +touch file1-1 file2-1 file2-2 file2-3 file3-1 file3-2 file3-3 file3-4 \ + || framework_failure_ +echo y > in-y || framework_failure_ +echo n > in-n || framework_failure_ +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 +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 +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 +rm -I file3-* < in-n >> 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 +test -f file3-4 || fail=1 + +echo 'four files, no recursion, answer yes' >> err || fail=1 +rm -I file3-* < in-y >> 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 +test -f file3-4 && fail=1 + +echo 'one file, recursion, answer no' >> err || fail=1 +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 +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 +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 +rm -I -R dir2-* < in-y >> out 2>> err || fail=1 +echo . >> err || fail=1 +test -d dir2-1 && fail=1 +test -d dir2-2 && fail=1 + +cat <<\EOF > expout || fail=1 +EOF +cat <<\EOF > experr || fail=1 +one file, no recursion +. +three files, no recursion +. +four files, no recursion, answer no +rm: remove all arguments? . +four files, no recursion, answer yes +rm: remove all arguments? . +one file, recursion, answer no +rm: remove all arguments recursively? . +one file, recursion, answer yes +rm: remove all arguments recursively? . +multiple files, recursion, answer no +rm: remove all arguments recursively? . +multiple files, recursion, answer yes +rm: remove all arguments recursively? . +EOF + +compare expout out || fail=1 +compare experr err || fail=1 + +Exit $fail diff --git a/tests/rm/ir-1 b/tests/rm/ir-1 deleted file mode 100755 index 01b33bc1..00000000 --- a/tests/rm/ir-1 +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh -# Test "rm -ir". - -# Copyright (C) 1997-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ rm - -t=t -mkdir -p $t $t/a $t/b $t/c || framework_failure_ -> $t/a/a || framework_failure_ -> $t/b/bb || framework_failure_ -> $t/c/cc || framework_failure_ - -cat <<EOF > in -y -y -y -y -y -y -y -y -n -n -n -EOF - -# Remove all but one of a, b, c -- I doubt that this test can portably -# determine which one was removed based on order of dir entries. -# This is a good argument for switching to a dejagnu-style test suite. -rm --verbose -i -r $t < in > /dev/null 2>&1 || fail=1 - -# $t should not have been removed. -test -d $t || fail=1 - -# There should be only one directory left. -case $(echo $t/*) in - $t/[abc]) ;; - *) fail=1 ;; -esac - -Exit $fail diff --git a/tests/rm/ir-1.sh b/tests/rm/ir-1.sh new file mode 100755 index 00000000..f2068fd6 --- /dev/null +++ b/tests/rm/ir-1.sh @@ -0,0 +1,56 @@ +#!/bin/sh +# Test "rm -ir". + +# Copyright (C) 1997-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ rm + +t=t +mkdir -p $t $t/a $t/b $t/c || framework_failure_ +> $t/a/a || framework_failure_ +> $t/b/bb || framework_failure_ +> $t/c/cc || framework_failure_ + +cat <<EOF > in +y +y +y +y +y +y +y +y +n +n +n +EOF + +# Remove all but one of a, b, c -- I doubt that this test can portably +# determine which one was removed based on order of dir entries. +# This is a good argument for switching to a dejagnu-style test suite. +rm --verbose -i -r $t < in > /dev/null 2>&1 || fail=1 + +# $t should not have been removed. +test -d $t || fail=1 + +# There should be only one directory left. +case $(echo $t/*) in + $t/[abc]) ;; + *) fail=1 ;; +esac + +Exit $fail diff --git a/tests/rm/isatty b/tests/rm/isatty deleted file mode 100755 index f28653cc..00000000 --- a/tests/rm/isatty +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh -# Make sure 'chown 0 f; rm f' prompts before removing f. - -# Copyright (C) 2001-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ rm -skip_if_root_ - - -# Skip this test if there is no /dev/stdin file. -ls /dev/stdin >/dev/null 2>&1 \ - || skip_ 'there is no /dev/stdin file' - -touch f -chmod 0 f -rm ---presume-input-tty f > out 2>&1 & -pid=$! - -# Wait a second, to give a buggy rm (as in fileutils-4.0.40) -# enough time to remove the file. -sleep 1 - -# The file must still exist. -test -f f || fail=1 - -kill $pid > /dev/null 2>&1 - -# Note the trailing 'x' -- so I don't have to have a trailing -# blank in this file :-) -cat > exp <<\EOF -rm: remove write-protected regular empty file 'f'? x -EOF - -# Append an 'x' and a newline. -echo x >> out - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/rm/isatty.sh b/tests/rm/isatty.sh new file mode 100755 index 00000000..b0d7a06a --- /dev/null +++ b/tests/rm/isatty.sh @@ -0,0 +1,53 @@ +#!/bin/sh +# Make sure 'chown 0 f; rm f' prompts before removing f. + +# Copyright (C) 2001-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ rm +skip_if_root_ + + +# Skip this test if there is no /dev/stdin file. +ls /dev/stdin >/dev/null 2>&1 \ + || skip_ 'there is no /dev/stdin file' + +touch f +chmod 0 f +rm ---presume-input-tty f > out 2>&1 & +pid=$! + +# Wait a second, to give a buggy rm (as in fileutils-4.0.40) +# enough time to remove the file. +sleep 1 + +# The file must still exist. +test -f f || fail=1 + +kill $pid > /dev/null 2>&1 + +# Note the trailing 'x' -- so I don't have to have a trailing +# blank in this file :-) +cat > exp <<\EOF +rm: remove write-protected regular empty file 'f'? x +EOF + +# Append an 'x' and a newline. +echo x >> out + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/rm/many-dir-entries-vs-OOM b/tests/rm/many-dir-entries-vs-OOM deleted file mode 100755 index b5f10dac..00000000 --- a/tests/rm/many-dir-entries-vs-OOM +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh -# 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-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ rm du chmod - -expensive_ - -# With many files in a single directory... -mkdir d && cd d || framework_failure_ -seq 200000|xargs touch || framework_failure_ - -cd .. - -# Restricted to 40MB, each of these coreutils-8.12 programs would fail -# with a diagnostic like "rm: fts_read failed: Cannot allocate memory". -ulimit -v 40000 -du -sh d || fail=1 -chmod -R 700 d || fail=1 -rm -rf d || fail=1 - -Exit $fail diff --git a/tests/rm/many-dir-entries-vs-OOM.sh b/tests/rm/many-dir-entries-vs-OOM.sh new file mode 100755 index 00000000..c867a46e --- /dev/null +++ b/tests/rm/many-dir-entries-vs-OOM.sh @@ -0,0 +1,38 @@ +#!/bin/sh +# 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. + +# This 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 du chmod + +expensive_ + +# With many files in a single directory... +mkdir d && cd d || framework_failure_ +seq 200000|xargs touch || framework_failure_ + +cd .. + +# Restricted to 40MB, each of these coreutils-8.12 programs would fail +# with a diagnostic like "rm: fts_read failed: Cannot allocate memory". +ulimit -v 40000 +du -sh d || fail=1 +chmod -R 700 d || fail=1 +rm -rf d || fail=1 + +Exit $fail diff --git a/tests/rm/no-give-up b/tests/rm/no-give-up deleted file mode 100755 index 0deb262a..00000000 --- a/tests/rm/no-give-up +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh -# With rm from coreutils-5.2.1 and earlier, 'rm -r' would mistakenly -# give up too early under some conditions. - -# Copyright (C) 2004-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ rm -require_root_ - -mkdir d || framework_failure_ -touch d/f || framework_failure_ -chown -R $NON_ROOT_USERNAME d || framework_failure_ - -# Ensure that non-root can access files in root-owned ".". -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 - -# d must remain. -test -d d || fail=1 - -# f must have been removed. -test -f d/f && fail=1 - -Exit $fail diff --git a/tests/rm/no-give-up.sh b/tests/rm/no-give-up.sh new file mode 100755 index 00000000..915970d1 --- /dev/null +++ b/tests/rm/no-give-up.sh @@ -0,0 +1,41 @@ +#!/bin/sh +# 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. + +# This 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 +require_root_ + +mkdir d || framework_failure_ +touch d/f || framework_failure_ +chown -R $NON_ROOT_USERNAME d || framework_failure_ + +# Ensure that non-root can access files in root-owned ".". +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 + +# d must remain. +test -d d || fail=1 + +# f must have been removed. +test -f d/f && fail=1 + +Exit $fail diff --git a/tests/rm/one-file-system b/tests/rm/one-file-system deleted file mode 100755 index 675c3fd0..00000000 --- a/tests/rm/one-file-system +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh -# Demonstrate rm's new --one-file-system option. - -# Copyright (C) 2006-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ rm -require_root_ - -cleanup_() -{ - # When you take the undesirable shortcut of making /etc/mtab a link - # to /proc/mounts, unmounting "$other_partition_tmpdir" would fail. - # So, here we unmount a/b instead. - umount a/b - rm -rf "$other_partition_tmpdir" -} -. "$abs_srcdir/other-fs-tmpdir" - -t=$other_partition_tmpdir -mkdir -p a/b $t/y -mount --bind $t a/b \ - || skip_ "This test requires mount with a working --bind option." - -cat <<\EOF > exp || framework_failure_ -rm: skipping 'a/b', since it's on a different device -EOF - - -rm --one-file-system -rf a 2> out && fail=1 -test -d $t/y || fail=1 - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/rm/one-file-system.sh b/tests/rm/one-file-system.sh new file mode 100755 index 00000000..54a81892 --- /dev/null +++ b/tests/rm/one-file-system.sh @@ -0,0 +1,48 @@ +#!/bin/sh +# Demonstrate rm's new --one-file-system option. + +# Copyright (C) 2006-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ rm +require_root_ + +cleanup_() +{ + # When you take the undesirable shortcut of making /etc/mtab a link + # to /proc/mounts, unmounting "$other_partition_tmpdir" would fail. + # So, here we unmount a/b instead. + umount a/b + rm -rf "$other_partition_tmpdir" +} +. "$abs_srcdir/tests/other-fs-tmpdir" + +t=$other_partition_tmpdir +mkdir -p a/b $t/y +mount --bind $t a/b \ + || skip_ "This test requires mount with a working --bind option." + +cat <<\EOF > exp || framework_failure_ +rm: skipping 'a/b', since it's on a different device +EOF + + +rm --one-file-system -rf a 2> out && fail=1 +test -d $t/y || fail=1 + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/rm/one-file-system2 b/tests/rm/one-file-system2 deleted file mode 100755 index 077df76e..00000000 --- a/tests/rm/one-file-system2 +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -# Verify --one-file-system does delete within a file system - -# Copyright (C) 2009-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ rm - -mkdir -p a/b - -rm --one-file-system -rf a || fail=1 -test -d a && fail=1 - -Exit $fail diff --git a/tests/rm/one-file-system2.sh b/tests/rm/one-file-system2.sh new file mode 100755 index 00000000..94bf442e --- /dev/null +++ b/tests/rm/one-file-system2.sh @@ -0,0 +1,27 @@ +#!/bin/sh +# Verify --one-file-system does delete within a file system + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ rm + +mkdir -p a/b + +rm --one-file-system -rf a || fail=1 +test -d a && fail=1 + +Exit $fail diff --git a/tests/rm/r-1 b/tests/rm/r-1 deleted file mode 100755 index 858269d7..00000000 --- a/tests/rm/r-1 +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -# Test "rm -r --verbose". - -# Copyright (C) 1997-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ rm - -mkdir a a/a || framework_failure_ -> b || framework_failure_ - -cat <<\EOF > exp || framework_failure_ -removed directory: 'a/a' -removed directory: 'a' -removed 'b' -EOF - -rm --verbose -r a b > out || fail=1 - -for d in $dirs; do - test -d $d && fail=1 -done - -# Compare expected and actual output. -compare exp out || fail=1 - -Exit $fail diff --git a/tests/rm/r-1.sh b/tests/rm/r-1.sh new file mode 100755 index 00000000..362e6adb --- /dev/null +++ b/tests/rm/r-1.sh @@ -0,0 +1,40 @@ +#!/bin/sh +# Test "rm -r --verbose". + +# Copyright (C) 1997-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ rm + +mkdir a a/a || framework_failure_ +> b || framework_failure_ + +cat <<\EOF > exp || framework_failure_ +removed directory: 'a/a' +removed directory: 'a' +removed 'b' +EOF + +rm --verbose -r a b > out || fail=1 + +for d in $dirs; do + test -d $d && fail=1 +done + +# Compare expected and actual output. +compare exp out || fail=1 + +Exit $fail diff --git a/tests/rm/r-2 b/tests/rm/r-2 deleted file mode 100755 index c946f63d..00000000 --- a/tests/rm/r-2 +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh -# Test "rm -r --verbose". - -# Copyright (C) 1997-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ rm - -mkdir t t/a t/a/b || framework_failure_ -> t/a/f || framework_failure_ -> t/a/b/g || framework_failure_ - -# FIXME: if this fails, it's a framework failure -cat <<\EOF | sort > t/E || framework_failure_ -removed directory: 't/a' -removed directory: 't/a/b' -removed 't/a/b/g' -removed 't/a/f' -EOF - -# Note that both the expected output (above) and the actual output lines -# are sorted, because directory entries may be processed in arbitrary order. -rm --verbose -r t/a | sort > t/O || fail=1 - -if test -d t/a; then - fail=1 -fi - -# Compare expected and actual output. -cmp t/E t/O || fail=1 - -Exit $fail diff --git a/tests/rm/r-2.sh b/tests/rm/r-2.sh new file mode 100755 index 00000000..34c9f282 --- /dev/null +++ b/tests/rm/r-2.sh @@ -0,0 +1,45 @@ +#!/bin/sh +# Test "rm -r --verbose". + +# Copyright (C) 1997-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ rm + +mkdir t t/a t/a/b || framework_failure_ +> t/a/f || framework_failure_ +> t/a/b/g || framework_failure_ + +# FIXME: if this fails, it's a framework failure +cat <<\EOF | sort > t/E || framework_failure_ +removed directory: 't/a' +removed directory: 't/a/b' +removed 't/a/b/g' +removed 't/a/f' +EOF + +# Note that both the expected output (above) and the actual output lines +# are sorted, because directory entries may be processed in arbitrary order. +rm --verbose -r t/a | sort > t/O || fail=1 + +if test -d t/a; then + fail=1 +fi + +# Compare expected and actual output. +cmp t/E t/O || fail=1 + +Exit $fail diff --git a/tests/rm/r-3 b/tests/rm/r-3 deleted file mode 100755 index 71c8a0f6..00000000 --- a/tests/rm/r-3 +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh -# Create and remove a directory with more than 254 files. - -# Copyright (C) 1997-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 -# 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/>. - - -# An early version of my rewritten rm failed to remove all of -# the files on SunOS4 when there were 254 or more in a directory. - -# And the rm from coreutils-5.0 exposes the same problem when there -# are 338 or more files in a directory on a Darwin-6.5 system - -. "${srcdir=.}/init.sh"; path_prepend_ ../src -print_ver_ rm - -mkdir t || framework_failure_ -cd t || framework_failure_ - -# Create 500 files (20 * 25). -for i in 0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j; do - files= - for j in a b c d e f g h i j k l m n o p q r s t u v w x y; do - files="$files $i$j" - done - touch $files || framework_failure_ -done - -test -f 0a || framework_failure_ -test -f by || framework_failure_ -cd .. || framework_failure_ - -rm -rf t || fail=1 -test -d t && fail=1 - -Exit $fail diff --git a/tests/rm/r-3.sh b/tests/rm/r-3.sh new file mode 100755 index 00000000..91e80516 --- /dev/null +++ b/tests/rm/r-3.sh @@ -0,0 +1,48 @@ +#!/bin/sh +# Create and remove a directory with more than 254 files. + +# Copyright (C) 1997-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/>. + + +# An early version of my rewritten rm failed to remove all of +# the files on SunOS4 when there were 254 or more in a directory. + +# And the rm from coreutils-5.0 exposes the same problem when there +# are 338 or more files in a directory on a Darwin-6.5 system + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ rm + +mkdir t || framework_failure_ +cd t || framework_failure_ + +# Create 500 files (20 * 25). +for i in 0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j; do + files= + for j in a b c d e f g h i j k l m n o p q r s t u v w x y; do + files="$files $i$j" + done + touch $files || framework_failure_ +done + +test -f 0a || framework_failure_ +test -f by || framework_failure_ +cd .. || framework_failure_ + +rm -rf t || fail=1 +test -d t && fail=1 + +Exit $fail diff --git a/tests/rm/r-4 b/tests/rm/r-4 deleted file mode 100755 index 0bfb7607..00000000 --- a/tests/rm/r-4 +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# Try to remove '.' and '..' recursively. - -# Copyright (C) 2006-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 -# 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=.}/init.sh"; path_prepend_ ../src -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 - -# This test is too dangerous -- if there's a bug you're wiped out! -# rm -fr / 2>/dev/null && fail=1 - -test -f d/a || fail=1 - -Exit $fail diff --git a/tests/rm/r-4.sh b/tests/rm/r-4.sh new file mode 100755 index 00000000..94702a6d --- /dev/null +++ b/tests/rm/r-4.sh @@ -0,0 +1,36 @@ +#!/bin/sh +# Try to remove '.' and '..' recursively. + +# Copyright (C) 2006-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +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 + +# This test is too dangerous -- if there's a bug you're wiped out! +# rm -fr / 2>/dev/null && fail=1 + +test -f d/a || fail=1 + +Exit $fail diff --git a/tests/rm/read-only b/tests/rm/read-only deleted file mode 100755 index 018648be..00000000 --- a/tests/rm/read-only +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh -# Ensure that rm -f nonexistent-file-on-read-only-fs succeeds. - -# Copyright (C) 2009-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ rm -require_root_ - -cwd=$(pwd) -cleanup_() { cd /; umount "$cwd/mnt"; } - -skip=0 -# Create a file system, then mount it. -dd if=/dev/zero of=blob bs=8192 count=200 > /dev/null 2>&1 \ - || skip=1 -mkdir mnt || skip=1 -mkfs -t ext2 -F blob \ - || skip_ "failed to create ext2 file system" - -mount -oloop blob mnt || skip=1 -echo test > mnt/f || skip=1 -test -s mnt/f || skip=1 -mount -o remount,loop,ro mnt || skip=1 - -test $skip = 1 \ - && skip_ "insufficient mount/ext2 support" - -# 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 - -# However, trying to remove an existing file must fail. -rm -f mnt/f > out 2>&1 && fail=1 -# with a diagnostic. -test -s out || fail=1 - -Exit $fail diff --git a/tests/rm/read-only.sh b/tests/rm/read-only.sh new file mode 100755 index 00000000..dbb3f540 --- /dev/null +++ b/tests/rm/read-only.sh @@ -0,0 +1,52 @@ +#!/bin/sh +# Ensure that rm -f nonexistent-file-on-read-only-fs succeeds. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ rm +require_root_ + +cwd=$(pwd) +cleanup_() { cd /; umount "$cwd/mnt"; } + +skip=0 +# Create a file system, then mount it. +dd if=/dev/zero of=blob bs=8192 count=200 > /dev/null 2>&1 \ + || skip=1 +mkdir mnt || skip=1 +mkfs -t ext2 -F blob \ + || skip_ "failed to create ext2 file system" + +mount -oloop blob mnt || skip=1 +echo test > mnt/f || skip=1 +test -s mnt/f || skip=1 +mount -o remount,loop,ro mnt || skip=1 + +test $skip = 1 \ + && skip_ "insufficient mount/ext2 support" + +# 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 + +# However, trying to remove an existing file must fail. +rm -f mnt/f > out 2>&1 && fail=1 +# with a diagnostic. +test -s out || fail=1 + +Exit $fail diff --git a/tests/rm/readdir-bug b/tests/rm/readdir-bug deleted file mode 100755 index 711e1bc0..00000000 --- a/tests/rm/readdir-bug +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh -# 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-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ rm - -# Create a directory containing many files. -# What counts is a combination of the number of files and -# the lengths of their names. For details, see -# http://lists.gnu.org/archive/html/bug-coreutils/2006-09/msg00326.html -mkdir b || framework_failure_ -cd b || framework_failure_ -for i in $(seq 1 250); do - touch $(printf %040d $i) || framework_failure_ -done -cd .. || framework_failure_ - - -# On a buggy system, this would fail with the diagnostic, -# "cannot remove directory 'b': Directory not empty" -rm -rf b || fail=1 - -test -d b && fail=1 - -Exit $fail diff --git a/tests/rm/readdir-bug.sh b/tests/rm/readdir-bug.sh new file mode 100755 index 00000000..58d864f9 --- /dev/null +++ b/tests/rm/readdir-bug.sh @@ -0,0 +1,41 @@ +#!/bin/sh +# 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. + +# This 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 + +# Create a directory containing many files. +# What counts is a combination of the number of files and +# the lengths of their names. For details, see +# http://lists.gnu.org/archive/html/bug-coreutils/2006-09/msg00326.html +mkdir b || framework_failure_ +cd b || framework_failure_ +for i in $(seq 1 250); do + touch $(printf %040d $i) || framework_failure_ +done +cd .. || framework_failure_ + + +# On a buggy system, this would fail with the diagnostic, +# "cannot remove directory 'b': Directory not empty" +rm -rf b || fail=1 + +test -d b && fail=1 + +Exit $fail diff --git a/tests/rm/rm1 b/tests/rm/rm1 deleted file mode 100755 index aa90c57c..00000000 --- a/tests/rm/rm1 +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh -# exercise another small part of remove.c - -# Copyright (C) 2002-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ rm -skip_if_root_ - -mkdir -p b/a/p b/c b/d || framework_failure_ -chmod u-w b/a || framework_failure_ - - -# This should fail. -rm -rf b > out 2>&1 && fail=1 -cat <<\EOF > exp -rm: cannot remove directory 'b/a/p': Permission denied -EOF - -# On some systems, rm doesn't have enough information to -# say it's a directory. -cat <<\EOF > exp2 -rm: cannot remove 'b/a/p': Permission denied -EOF - -cmp out exp > /dev/null 2>&1 || { - cmp out exp2 || fail=1 - } -test $fail = 1 && compare exp out - -test -d b/a/p || fail=1 -test -d b/c && fail=1 -test -d b/d && fail=1 - -Exit $fail diff --git a/tests/rm/rm1.sh b/tests/rm/rm1.sh new file mode 100755 index 00000000..6c6b865e --- /dev/null +++ b/tests/rm/rm1.sh @@ -0,0 +1,48 @@ +#!/bin/sh +# exercise another small part of remove.c + +# Copyright (C) 2002-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ rm +skip_if_root_ + +mkdir -p b/a/p b/c b/d || framework_failure_ +chmod u-w b/a || framework_failure_ + + +# This should fail. +rm -rf b > out 2>&1 && fail=1 +cat <<\EOF > exp +rm: cannot remove directory 'b/a/p': Permission denied +EOF + +# On some systems, rm doesn't have enough information to +# say it's a directory. +cat <<\EOF > exp2 +rm: cannot remove 'b/a/p': Permission denied +EOF + +cmp out exp > /dev/null 2>&1 || { + cmp out exp2 || fail=1 + } +test $fail = 1 && compare exp out + +test -d b/a/p || fail=1 +test -d b/c && fail=1 +test -d b/d && fail=1 + +Exit $fail diff --git a/tests/rm/rm2 b/tests/rm/rm2 deleted file mode 100755 index 7bbdfeab..00000000 --- a/tests/rm/rm2 +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh -# exercise another small part of remove.c - -# Copyright (C) 2002-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ rm -skip_if_root_ - -mkdir -p a/0 || framework_failure_ -mkdir -p a/1/2 b/3 || framework_failure_ -mkdir a/2 a/3 || framework_failure_ -chmod u-x a/1 b || framework_failure_ - - -# Exercise two separate code paths -- though both result -# in the same sort of diagnostic. -# Both of these should fail. -rm -rf a b > out 2>&1 && fail=1 -cat <<\EOF > exp -rm: cannot remove 'a/1': Permission denied -rm: cannot remove 'b': Permission denied -EOF - -cat <<\EOF > exp-solaris -rm: cannot remove 'a/1/2': Permission denied -rm: cannot remove 'b/3': Permission denied -EOF - -cmp out exp > /dev/null 2>&1 \ - || { cmp out exp-solaris > /dev/null 2>&1 || fail=1; } -test $fail = 1 && compare exp out - -test -d a/0 && fail=1 -test -d a/1 || fail=1 -test -d a/2 && fail=1 -test -d a/3 && fail=1 - -chmod u+x b -test -d b/3 || fail=1 - -Exit $fail diff --git a/tests/rm/rm2.sh b/tests/rm/rm2.sh new file mode 100755 index 00000000..df1990ff --- /dev/null +++ b/tests/rm/rm2.sh @@ -0,0 +1,55 @@ +#!/bin/sh +# exercise another small part of remove.c + +# Copyright (C) 2002-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ rm +skip_if_root_ + +mkdir -p a/0 || framework_failure_ +mkdir -p a/1/2 b/3 || framework_failure_ +mkdir a/2 a/3 || framework_failure_ +chmod u-x a/1 b || framework_failure_ + + +# Exercise two separate code paths -- though both result +# in the same sort of diagnostic. +# Both of these should fail. +rm -rf a b > out 2>&1 && fail=1 +cat <<\EOF > exp +rm: cannot remove 'a/1': Permission denied +rm: cannot remove 'b': Permission denied +EOF + +cat <<\EOF > exp-solaris +rm: cannot remove 'a/1/2': Permission denied +rm: cannot remove 'b/3': Permission denied +EOF + +cmp out exp > /dev/null 2>&1 \ + || { cmp out exp-solaris > /dev/null 2>&1 || fail=1; } +test $fail = 1 && compare exp out + +test -d a/0 && fail=1 +test -d a/1 || fail=1 +test -d a/2 && fail=1 +test -d a/3 && fail=1 + +chmod u+x b +test -d b/3 || fail=1 + +Exit $fail diff --git a/tests/rm/rm3 b/tests/rm/rm3 deleted file mode 100755 index 37ee87b2..00000000 --- a/tests/rm/rm3 +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/sh -# exercise another small part of remove.c - -# Copyright (C) 2002-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ rm -skip_if_root_ - -mkdir -p z || framework_failure_ -cd z || framework_failure_ -touch empty empty-u || framework_failure_ -echo not-empty > fu -ln -s empty-f slink -ln -s . slinkdot -mkdir d du || framework_failure_ -chmod u-w fu du empty-u || framework_failure_ -cd .. - - -cat <<EOF > in -y -y -y -y -y -y -y -y -y -EOF - -# Both of these should fail. -rm -ir z < in > out 2>&1 || fail=1 - -# Given input like 'rm: ...? rm: ...? ' (no trailing newline), -# the 'head...' part of the pipeline below removes the trailing space, so -# that sed doesn't have to deal with a line lacking a terminating newline. -# This avoids a bug whereby some vendor-provided (Tru64) versions of sed -# would mistakenly tack a newline onto the end of the output. -tr '?' '\n' < out | head --bytes=-1 | sed 's/^ //' |sort > o2 -mv o2 out - -sort <<EOF > exp || fail=1 -rm: descend into directory 'z' -rm: remove regular empty file 'z/empty' -rm: remove write-protected regular file 'z/fu' -rm: remove write-protected regular empty file 'z/empty-u' -rm: remove symbolic link 'z/slink' -rm: remove symbolic link 'z/slinkdot' -rm: remove directory 'z/d' -rm: remove write-protected directory 'z/du' -rm: remove directory 'z' -EOF - -compare exp out || fail=1 - -test -d z && fail=1 - -Exit $fail diff --git a/tests/rm/rm3.sh b/tests/rm/rm3.sh new file mode 100755 index 00000000..4b5e6b32 --- /dev/null +++ b/tests/rm/rm3.sh @@ -0,0 +1,73 @@ +#!/bin/sh +# exercise another small part of remove.c + +# Copyright (C) 2002-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ rm +skip_if_root_ + +mkdir -p z || framework_failure_ +cd z || framework_failure_ +touch empty empty-u || framework_failure_ +echo not-empty > fu +ln -s empty-f slink +ln -s . slinkdot +mkdir d du || framework_failure_ +chmod u-w fu du empty-u || framework_failure_ +cd .. + + +cat <<EOF > in +y +y +y +y +y +y +y +y +y +EOF + +# Both of these should fail. +rm -ir z < in > out 2>&1 || fail=1 + +# Given input like 'rm: ...? rm: ...? ' (no trailing newline), +# the 'head...' part of the pipeline below removes the trailing space, so +# that sed doesn't have to deal with a line lacking a terminating newline. +# This avoids a bug whereby some vendor-provided (Tru64) versions of sed +# would mistakenly tack a newline onto the end of the output. +tr '?' '\n' < out | head --bytes=-1 | sed 's/^ //' |sort > o2 +mv o2 out + +sort <<EOF > exp || fail=1 +rm: descend into directory 'z' +rm: remove regular empty file 'z/empty' +rm: remove write-protected regular file 'z/fu' +rm: remove write-protected regular empty file 'z/empty-u' +rm: remove symbolic link 'z/slink' +rm: remove symbolic link 'z/slinkdot' +rm: remove directory 'z/d' +rm: remove write-protected directory 'z/du' +rm: remove directory 'z' +EOF + +compare exp out || fail=1 + +test -d z && fail=1 + +Exit $fail diff --git a/tests/rm/rm4 b/tests/rm/rm4 deleted file mode 100755 index 3e22aad9..00000000 --- a/tests/rm/rm4 +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# ensure that 'rm dir' fails without --recursive - -# Copyright (C) 2002-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ rm -skip_if_root_ - -mkdir dir || framework_failure_ - - -# This should fail. -rm dir > /dev/null 2>&1 && fail=1 - -test -d dir || fail=1 - -Exit $fail diff --git a/tests/rm/rm4.sh b/tests/rm/rm4.sh new file mode 100755 index 00000000..eff2b583 --- /dev/null +++ b/tests/rm/rm4.sh @@ -0,0 +1,31 @@ +#!/bin/sh +# ensure that 'rm dir' fails without --recursive + +# Copyright (C) 2002-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ rm +skip_if_root_ + +mkdir dir || framework_failure_ + + +# This should fail. +rm dir > /dev/null 2>&1 && fail=1 + +test -d dir || fail=1 + +Exit $fail diff --git a/tests/rm/rm5 b/tests/rm/rm5 deleted file mode 100755 index 56c6bbc2..00000000 --- a/tests/rm/rm5 +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh -# a basic test of rm -ri - -# Copyright (C) 2002-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ rm -skip_if_root_ - -mkdir -p d/e || framework_failure_ -cat <<EOF > in || framework_failure_ -y -y -y -EOF - -cat <<\EOF > exp || framework_failure_ -rm: descend into directory 'd' -rm: remove directory 'd/e' -rm: remove directory 'd' -EOF - - -rm -ir d < in > out 2>&1 || fail=1 - -# Given input like 'rm: ...? rm: ...? ' (no trailing newline), -# the 'head...' part of the pipeline below removes the trailing space, so -# that sed doesn't have to deal with a line lacking a terminating newline. -# This avoids a bug whereby some vendor-provided (Tru64) versions of sed -# would mistakenly tack a newline onto the end of the output. -tr '?' '\n' < out | head --bytes=-1 | sed 's/^ //' > o2 -mv o2 out - -# Make sure it's been removed. -test -d d && fail=1 - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/rm/rm5.sh b/tests/rm/rm5.sh new file mode 100755 index 00000000..3112026f --- /dev/null +++ b/tests/rm/rm5.sh @@ -0,0 +1,52 @@ +#!/bin/sh +# a basic test of rm -ri + +# Copyright (C) 2002-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ rm +skip_if_root_ + +mkdir -p d/e || framework_failure_ +cat <<EOF > in || framework_failure_ +y +y +y +EOF + +cat <<\EOF > exp || framework_failure_ +rm: descend into directory 'd' +rm: remove directory 'd/e' +rm: remove directory 'd' +EOF + + +rm -ir d < in > out 2>&1 || fail=1 + +# Given input like 'rm: ...? rm: ...? ' (no trailing newline), +# the 'head...' part of the pipeline below removes the trailing space, so +# that sed doesn't have to deal with a line lacking a terminating newline. +# This avoids a bug whereby some vendor-provided (Tru64) versions of sed +# would mistakenly tack a newline onto the end of the output. +tr '?' '\n' < out | head --bytes=-1 | sed 's/^ //' > o2 +mv o2 out + +# Make sure it's been removed. +test -d d && fail=1 + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/rm/sunos-1 b/tests/rm/sunos-1 deleted file mode 100755 index 584236ab..00000000 --- a/tests/rm/sunos-1 +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# Make sure that rm -r '' fails. - -# Copyright (C) 1997-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 -# 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/>. - - -# On SunOS 4.1.3, running rm -r '' in a nonempty directory may -# actually remove files with names of entries in the current directory -# but relative to '/' rather than relative to the current directory. - -. "${srcdir=.}/init.sh"; path_prepend_ ../src -print_ver_ rm - -rm -r '' > /dev/null 2>&1 && fail=1 - -Exit $fail diff --git a/tests/rm/sunos-1.sh b/tests/rm/sunos-1.sh new file mode 100755 index 00000000..7336540f --- /dev/null +++ b/tests/rm/sunos-1.sh @@ -0,0 +1,29 @@ +#!/bin/sh +# Make sure that rm -r '' fails. + +# Copyright (C) 1997-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/>. + + +# On SunOS 4.1.3, running rm -r '' in a nonempty directory may +# actually remove files with names of entries in the current directory +# but relative to '/' rather than relative to the current directory. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ rm + +rm -r '' > /dev/null 2>&1 && fail=1 + +Exit $fail diff --git a/tests/rm/unread2 b/tests/rm/unread2 deleted file mode 100755 index 46fc98cd..00000000 --- a/tests/rm/unread2 +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# exercise one small part of remove.c - -# Copyright (C) 2002-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ rm -skip_if_root_ - -mkdir -p a/b || framework_failure_ -chmod u-r a - - -# This should fail. -rm -rf a > out 2>&1 && fail=1 -cat <<\EOF > exp -rm: cannot remove 'a': Permission denied -EOF - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/rm/unread2.sh b/tests/rm/unread2.sh new file mode 100755 index 00000000..139f9f00 --- /dev/null +++ b/tests/rm/unread2.sh @@ -0,0 +1,35 @@ +#!/bin/sh +# exercise one small part of remove.c + +# Copyright (C) 2002-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ rm +skip_if_root_ + +mkdir -p a/b || framework_failure_ +chmod u-r a + + +# This should fail. +rm -rf a > out 2>&1 && fail=1 +cat <<\EOF > exp +rm: cannot remove 'a': Permission denied +EOF + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/rm/unread3 b/tests/rm/unread3 deleted file mode 100755 index 4b8bbc2d..00000000 --- a/tests/rm/unread3 +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -# Ensure that rm works even from an unreadable working directory. - -# Copyright (C) 2004-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ rm -skip_if_root_ - -mkdir -p a/1 b c d/2 e/3 || framework_failure_ - - -t=$(pwd) -cd c -chmod u=x,go= . - -# With coreutils-5.2.1, this would get a failed assertion. -rm -r "$t/a" "$t/b" || fail=1 - -# With coreutils-5.2.1, this would get the following: -# rm: cannot get current directory: Permission denied -# rm: failed to return to initial working directory: Bad file descriptor -rm -r "$t/d" "$t/e" || fail=1 - -test -d "$t/a" && fail=1 -test -d "$t/b" && fail=1 -test -d "$t/d" && fail=1 -test -d "$t/e" && fail=1 - -Exit $fail diff --git a/tests/rm/unread3.sh b/tests/rm/unread3.sh new file mode 100755 index 00000000..b094ae76 --- /dev/null +++ b/tests/rm/unread3.sh @@ -0,0 +1,43 @@ +#!/bin/sh +# Ensure that rm works even from an unreadable working directory. + +# Copyright (C) 2004-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ rm +skip_if_root_ + +mkdir -p a/1 b c d/2 e/3 || framework_failure_ + + +t=$(pwd) +cd c +chmod u=x,go= . + +# With coreutils-5.2.1, this would get a failed assertion. +rm -r "$t/a" "$t/b" || fail=1 + +# With coreutils-5.2.1, this would get the following: +# rm: cannot get current directory: Permission denied +# rm: failed to return to initial working directory: Bad file descriptor +rm -r "$t/d" "$t/e" || fail=1 + +test -d "$t/a" && fail=1 +test -d "$t/b" && fail=1 +test -d "$t/d" && fail=1 +test -d "$t/e" && fail=1 + +Exit $fail diff --git a/tests/rm/unreadable b/tests/rm/unreadable deleted file mode 100755 index ebc8511c..00000000 --- a/tests/rm/unreadable +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/perl -# Test "rm" and unreadable directories. - -# Copyright (C) 1998-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 -# 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; - -(my $program_name = $0) =~ s|.*/||; - -# Turn off localization of executable's output. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -my $d = "dir-$$"; -my $mkdir = {PRE => sub {mkdir $d,0100 or die "$d: $!\n"}}; -my $prog = 'rm'; -my $uid = $<; - -my @Tests = - ( - # test-name options input expected-output - # - # Removing an empty, unwritable directory succeeds. - ['unreadable-1', '-rf', $d, {EXIT => 0}, $mkdir], - - ['unreadable-2', '-rf', $d, - {EXIT => $uid == 0 ? 0 : 1}, - {ERR => $uid == 0 ? '' - : "$prog: cannot remove '$d': Permission denied\n"}, - {PRE => sub { (mkdir $d,0700 and mkdir "$d/x",0700 and chmod 0100,$d) - or die "$d: $!\n"}} ], - ); - -my $save_temps = $ENV{SAVE_TEMPS}; -my $verbose = $ENV{VERBOSE}; - -my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); -exit $fail; diff --git a/tests/rm/unreadable.pl b/tests/rm/unreadable.pl new file mode 100755 index 00000000..614dcfe9 --- /dev/null +++ b/tests/rm/unreadable.pl @@ -0,0 +1,50 @@ +#!/usr/bin/perl +# Test "rm" and unreadable directories. + +# Copyright (C) 1998-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/>. + +use strict; + +(my $program_name = $0) =~ s|.*/||; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +my $d = "dir-$$"; +my $mkdir = {PRE => sub {mkdir $d,0100 or die "$d: $!\n"}}; +my $prog = 'rm'; +my $uid = $<; + +my @Tests = + ( + # test-name options input expected-output + # + # Removing an empty, unwritable directory succeeds. + ['unreadable-1', '-rf', $d, {EXIT => 0}, $mkdir], + + ['unreadable-2', '-rf', $d, + {EXIT => $uid == 0 ? 0 : 1}, + {ERR => $uid == 0 ? '' + : "$prog: cannot remove '$d': Permission denied\n"}, + {PRE => sub { (mkdir $d,0700 and mkdir "$d/x",0700 and chmod 0100,$d) + or die "$d: $!\n"}} ], + ); + +my $save_temps = $ENV{SAVE_TEMPS}; +my $verbose = $ENV{VERBOSE}; + +my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); +exit $fail; diff --git a/tests/rm/v-slash b/tests/rm/v-slash deleted file mode 100755 index 2fae859b..00000000 --- a/tests/rm/v-slash +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# avoid extra slashes in --verbose output - -# Copyright (C) 2007-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ rm - -mkdir a || framework_failure_ -touch a/x || framework_failure_ - - -rm --verbose -r a/// > out || fail=1 -cat <<\EOF > exp || fail=1 -removed 'a/x' -removed directory: 'a' -EOF - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/rm/v-slash.sh b/tests/rm/v-slash.sh new file mode 100755 index 00000000..b04e2187 --- /dev/null +++ b/tests/rm/v-slash.sh @@ -0,0 +1,34 @@ +#!/bin/sh +# avoid extra slashes in --verbose output + +# Copyright (C) 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ rm + +mkdir a || framework_failure_ +touch a/x || framework_failure_ + + +rm --verbose -r a/// > out || fail=1 +cat <<\EOF > exp || fail=1 +removed 'a/x' +removed directory: 'a/' +EOF + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/rmdir/fail-perm b/tests/rmdir/fail-perm deleted file mode 100755 index 49cfb00a..00000000 --- a/tests/rmdir/fail-perm +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# 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-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ rmdir - -mkdir d d/e d/e/f || framework_failure_ -chmod a-w d || framework_failure_ - - -# This rmdir command outputs two diagnostics. -# Before coreutils-5.1.2, it would mistakenly exit successfully. -# As of coreutils-5.1.2, it fails, as required. -rmdir -p d d/e/f 2> /dev/null && fail=1 - -Exit $fail diff --git a/tests/rmdir/fail-perm.sh b/tests/rmdir/fail-perm.sh new file mode 100755 index 00000000..dea42c7d --- /dev/null +++ b/tests/rmdir/fail-perm.sh @@ -0,0 +1,32 @@ +#!/bin/sh +# 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. + +# This 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_ rmdir + +mkdir d d/e d/e/f || framework_failure_ +chmod a-w d || framework_failure_ + + +# This rmdir command outputs two diagnostics. +# Before coreutils-5.1.2, it would mistakenly exit successfully. +# As of coreutils-5.1.2, it fails, as required. +rmdir -p d d/e/f 2> /dev/null && fail=1 + +Exit $fail diff --git a/tests/rmdir/ignore b/tests/rmdir/ignore deleted file mode 100755 index 92463b8d..00000000 --- a/tests/rmdir/ignore +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# make sure rmdir's --ignore-fail-on-non-empty option works - -# Copyright (C) 1999-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ rmdir - -cwd=$(pwd) -mkdir -p "$cwd/a/b/c" "$cwd/a/x" || framework_failure_ - -rmdir -p --ignore-fail-on-non-empty "$cwd/a/b/c" || fail=1 -# $cwd/a/x should remain -test -d "$cwd/a/x" || fail=1 -# $cwd/a/b and $cwd/a/b/c should be gone -test -d "$cwd/a/b" && fail=1 -test -d "$cwd/a/b/c" && fail=1 - -Exit $fail diff --git a/tests/rmdir/ignore.sh b/tests/rmdir/ignore.sh new file mode 100755 index 00000000..2eb14cc6 --- /dev/null +++ b/tests/rmdir/ignore.sh @@ -0,0 +1,32 @@ +#!/bin/sh +# make sure rmdir's --ignore-fail-on-non-empty option works + +# Copyright (C) 1999-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ rmdir + +cwd=$(pwd) +mkdir -p "$cwd/a/b/c" "$cwd/a/x" || framework_failure_ + +rmdir -p --ignore-fail-on-non-empty "$cwd/a/b/c" || fail=1 +# $cwd/a/x should remain +test -d "$cwd/a/x" || fail=1 +# $cwd/a/b and $cwd/a/b/c should be gone +test -d "$cwd/a/b" && fail=1 +test -d "$cwd/a/b/c" && fail=1 + +Exit $fail diff --git a/tests/rmdir/t-slash b/tests/rmdir/t-slash deleted file mode 100755 index 38e9f20d..00000000 --- a/tests/rmdir/t-slash +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# make sure rmdir -p works on a directory specified with a trailing slash - -# Copyright (C) 2002-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ rmdir - -mkdir dir || framework_failure_ - - -# Prior to coreutils-4.5.2, this would fail with the following: -# rmdir: 'dir': No such file or directory -rmdir -p dir/ || fail=1 - -Exit $fail diff --git a/tests/rmdir/t-slash.sh b/tests/rmdir/t-slash.sh new file mode 100755 index 00000000..01e1b518 --- /dev/null +++ b/tests/rmdir/t-slash.sh @@ -0,0 +1,29 @@ +#!/bin/sh +# make sure rmdir -p works on a directory specified with a trailing slash + +# Copyright (C) 2002-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ rmdir + +mkdir dir || framework_failure_ + + +# Prior to coreutils-4.5.2, this would fail with the following: +# rmdir: 'dir': No such file or directory +rmdir -p dir/ || fail=1 + +Exit $fail diff --git a/tests/sample-test b/tests/sample-test index 7d1f6e95..0bf49487 100644 --- a/tests/sample-test +++ b/tests/sample-test @@ -1,7 +1,7 @@ #!/bin/sh # FIXME -# Copyright (C) 2012 Free Software Foundation, Inc. +# Copyright (C) 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 @@ -16,7 +16,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/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ FIXME # FIXME: skip_if_root_ @@ -24,7 +24,7 @@ print_ver_ FIXME # If used, these must *follow* init.sh. # FIXME: cleanup_() { rm -rf "$other_partition_tmpdir"; } -# FIXME: . "$abs_srcdir/other-fs-tmpdir" +# FIXME: . "$abs_srcdir/tests/other-fs-tmpdir" FIXME > out || fail=1 cat <<\EOF > exp || fail=1 diff --git a/tests/shell-or-perl b/tests/shell-or-perl deleted file mode 100644 index 58c80e36..00000000 --- a/tests/shell-or-perl +++ /dev/null @@ -1,121 +0,0 @@ -#! /bin/sh -# Run a test script of the coreutils test scripts, picking up the right -# interpreter (i.e., perl or the shell) and the right flags for it (e.g., -# perl '-T' flag for perl scripts that must run in tainted mode). -# -# Copyright (C) 2011-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 -# 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/>. -# - -# ---------------------------------- # -# Readonly variables and functions # -# ---------------------------------- # - -# Help to avoid typo-related bugs. -set -u - -me=shell-or-perl - -fatal_ () -{ - echo "$me: $*" >&2 - # Exit with status '99' to inform the testsuite harness that an - # hard error occurred. - exit 99 -} - -print_help_ () -{ - cat <<EOH -Usage: $me [--help] [--srcdir DIR] [--shell SHELL-CMD] [--perl PERL-CMD] - [--test-name NAME-WITHOUT-VPATH] TEST-SCRIPT [ARGS..] -EOH -} - -# ---------------- # -# Option parsing # -# ---------------- # - -assign_optarg_to_var=' - test $# -gt 1 || fatal_ "option '\''$1'\'' requires an argument" - eval "$var=\$2" - shift' - -srcdir=${srcdir-.} -cu_PERL=${PERL-perl} -cu_SHELL=/bin/sh # Getting $SHELL from the environment is dangerous. -test_name= -while test $# -gt 0; do - var= - case $1 in - --help) print_help_; exit $?;; - --shell) var=cu_SHELL;; - --perl) var=cu_PERL;; - --srcdir) var=srcdir;; - --test-name) var=test_name;; - --) shift; break;; - -*) fatal_ "unknown option '$1'";; - *) break;; - esac - test -z "$var" || eval "$assign_optarg_to_var" - shift -done - -unset assign_optarg_to_var var - -case $# in - 0) fatal_ "missing argument";; - *) test_script=$1; shift;; -esac - -test -z "$test_name" && test_name=$test_script - -# --------------------- # -# Run the test script # -# --------------------- # - -test -f "$test_script" && test -r "$test_script" \ - || fatal_ "test script '$test_script' does not exist, or isn't readable" - -read shebang_line < "$test_script" \ - || fatal_ "cannot read from the test script '$test_script'" - -case $shebang_line in -'#!/usr/bin/perl'*) - # The test is a perl script. - if $cu_PERL -e 'use warnings' > /dev/null 2>&1; then - # Perl is available, see if we must run the test with taint - # mode on or not. - case $shebang_line in *\ -T*) T_=T;; *) T_=;; esac - # Now run it. - exec $cu_PERL -w$T_ -I"$srcdir" -MCoreutils -MCuSkip \ - -M"CuTmpdir qw($test_name)" \ - -- "$test_script" ${1+"$@"} - else - # Perl is not available, skip the test. - echo "$test_name: skip: no usable version of Perl found" - exit 77 - fi - ;; -*) - # Assume the test is a shell script. - exec $cu_SHELL "$test_script" ${1+"$@"} -esac - -# ------------- # -# Not reached # -# ------------- # - -fatal_ "dead code reached" diff --git a/tests/split/additional-suffix b/tests/split/additional-suffix deleted file mode 100755 index 8cfd3c1e..00000000 --- a/tests/split/additional-suffix +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -# show that 'split --additional-suffix=SUFFIX' works. - -# Copyright (C) 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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ split - -printf '1\n2\n3\n4\n5\n' > in || framework_failure_ - -split --lines=2 --additional-suffix=.txt in > out || fail=1 -cat <<\EOF > exp-1 -1 -2 -EOF -cat <<\EOF > exp-2 -3 -4 -EOF -cat <<\EOF > exp-3 -5 -EOF - -compare exp-1 xaa.txt || fail=1 -compare exp-2 xab.txt || fail=1 -compare exp-3 xac.txt || fail=1 - -# Additional suffix must not contain slash -split --lines=2 --additional-suffix=a/b in 2>/dev/null > out && fail=1 - -Exit $fail diff --git a/tests/split/additional-suffix.sh b/tests/split/additional-suffix.sh new file mode 100755 index 00000000..73fcdc49 --- /dev/null +++ b/tests/split/additional-suffix.sh @@ -0,0 +1,44 @@ +#!/bin/sh +# show that 'split --additional-suffix=SUFFIX' works. + +# Copyright (C) 2012-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ split + +printf '1\n2\n3\n4\n5\n' > in || framework_failure_ + +split --lines=2 --additional-suffix=.txt in > out || fail=1 +cat <<\EOF > exp-1 +1 +2 +EOF +cat <<\EOF > exp-2 +3 +4 +EOF +cat <<\EOF > exp-3 +5 +EOF + +compare exp-1 xaa.txt || fail=1 +compare exp-2 xab.txt || fail=1 +compare exp-3 xac.txt || fail=1 + +# Additional suffix must not contain slash +split --lines=2 --additional-suffix=a/b in 2>/dev/null > out && fail=1 + +Exit $fail diff --git a/tests/split/b-chunk b/tests/split/b-chunk deleted file mode 100755 index dd8b6cbd..00000000 --- a/tests/split/b-chunk +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh -# test splitting into 3 chunks - -# Copyright (C) 2010-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ split - -# N can be greater than the file size -# 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?? - -# Ensure --elide-empty-files is honored -split -e -n 10 /dev/null || fail=1 -stat x?? 2>/dev/null && fail=1 - -printf '1\n2\n3\n4\n5\n' > in || framework_failure_ - -split -n 3 in > out || fail=1 -split -n 1/3 in > b1 || fail=1 -split -n 2/3 in > b2 || fail=1 -split -n 3/3 in > b3 || fail=1 -printf '1\n2' > exp-1 -printf '\n3\n' > exp-2 -printf '4\n5\n' > exp-3 - -compare exp-1 xaa || fail=1 -compare exp-2 xab || fail=1 -compare exp-3 xac || fail=1 -compare exp-1 b1 || fail=1 -compare exp-2 b2 || fail=1 -compare exp-3 b3 || fail=1 -test -f xad && fail=1 - -Exit $fail diff --git a/tests/split/b-chunk.sh b/tests/split/b-chunk.sh new file mode 100755 index 00000000..e80699fd --- /dev/null +++ b/tests/split/b-chunk.sh @@ -0,0 +1,50 @@ +#!/bin/sh +# test splitting into 3 chunks + +# Copyright (C) 2010-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ split + +# N can be greater than the file size +# 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?? + +# Ensure --elide-empty-files is honored +split -e -n 10 /dev/null || fail=1 +stat x?? 2>/dev/null && fail=1 + +printf '1\n2\n3\n4\n5\n' > in || framework_failure_ + +split -n 3 in > out || fail=1 +split -n 1/3 in > b1 || fail=1 +split -n 2/3 in > b2 || fail=1 +split -n 3/3 in > b3 || fail=1 +printf '1\n2' > exp-1 +printf '\n3\n' > exp-2 +printf '4\n5\n' > exp-3 + +compare exp-1 xaa || fail=1 +compare exp-2 xab || fail=1 +compare exp-3 xac || fail=1 +compare exp-1 b1 || fail=1 +compare exp-2 b2 || fail=1 +compare exp-3 b3 || fail=1 +test -f xad && fail=1 + +Exit $fail diff --git a/tests/split/fail b/tests/split/fail deleted file mode 100755 index 83251e9e..00000000 --- a/tests/split/fail +++ /dev/null @@ -1,81 +0,0 @@ -#!/bin/sh -# split must fail when given length/count of zero. - -# Copyright (C) 2003-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ split -getlimits_ - -touch in || framework_failure_ - - -split -a 0 in 2> /dev/null || fail=1 -split -b 0 in 2> /dev/null && fail=1 -split -C 0 in 2> /dev/null && fail=1 -split -l 0 in 2> /dev/null && fail=1 -split -n 0 in 2> /dev/null && fail=1 -split -n 1/0 in 2> /dev/null && fail=1 -split -n 0/1 in 2> /dev/null && fail=1 -split -n 2/1 in 2> /dev/null && fail=1 - -# Make sure -C doesn't create empty files. -rm -f x?? || fail=1 -echo x | split -C 1 || fail=1 -test -f xaa && test -f xab || fail=1 -test -f xac && fail=1 - -# Make sure that the obsolete -N notation still works -split -1 in 2> /dev/null || fail=1 - -# Then make sure that -0 evokes a failure. -split -0 in 2> /dev/null && fail=1 - -split --lines=$UINTMAX_MAX in || fail=1 -split --bytes=$OFF_T_MAX in || fail=1 -split --line-bytes=$OFF_T_OFLOW 2> /dev/null in && fail=1 -split --line-bytes=$SIZE_OFLOW 2> /dev/null in && fail=1 -if truncate -s$SIZE_OFLOW large; then - # Ensure we can split chunks of a large file on 32 bit hosts - split --number=$SIZE_OFLOW/$SIZE_OFLOW large >/dev/null || fail=1 -fi -split --number=r/$UINTMAX_MAX/$UINTMAX_MAX </dev/null >/dev/null || fail=1 -split --number=r/$UINTMAX_OFLOW </dev/null 2>/dev/null && fail=1 - -# Make sure that a huge obsolete option evokes the right failure. -split -99999999999999999991 2> out && fail=1 - -# On losing systems (x86 Solaris 5.9 c89), we get a message like this: -# split: line count option -9999999999... is too large -# while on most, we get this: -# split: line count option -99999999999999999991... is too large -# so map them both to -99*. -sed 's/99[19]*/99*/' out > out-t -mv -f out-t out - -cat <<\EOF > exp -split: line count option -99*... is too large -EOF -compare exp out || fail=1 - -# Make sure split fails when it can't read input -# (the current directory in this case) -if ! cat . >/dev/null; then - # can't read() directories - split . && fail=1 -fi - -Exit $fail diff --git a/tests/split/fail.sh b/tests/split/fail.sh new file mode 100755 index 00000000..6272e9b5 --- /dev/null +++ b/tests/split/fail.sh @@ -0,0 +1,81 @@ +#!/bin/sh +# split must fail when given length/count of zero. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ split +getlimits_ + +touch in || framework_failure_ + + +split -a 0 in 2> /dev/null || fail=1 +split -b 0 in 2> /dev/null && fail=1 +split -C 0 in 2> /dev/null && fail=1 +split -l 0 in 2> /dev/null && fail=1 +split -n 0 in 2> /dev/null && fail=1 +split -n 1/0 in 2> /dev/null && fail=1 +split -n 0/1 in 2> /dev/null && fail=1 +split -n 2/1 in 2> /dev/null && fail=1 + +# Make sure -C doesn't create empty files. +rm -f x?? || fail=1 +echo x | split -C 1 || fail=1 +test -f xaa && test -f xab || fail=1 +test -f xac && fail=1 + +# Make sure that the obsolete -N notation still works +split -1 in 2> /dev/null || fail=1 + +# Then make sure that -0 evokes a failure. +split -0 in 2> /dev/null && fail=1 + +split --lines=$UINTMAX_MAX in || fail=1 +split --bytes=$OFF_T_MAX in || fail=1 +split --line-bytes=$OFF_T_OFLOW 2> /dev/null in && fail=1 +split --line-bytes=$SIZE_OFLOW 2> /dev/null in && fail=1 +if truncate -s$SIZE_OFLOW large; then + # Ensure we can split chunks of a large file on 32 bit hosts + split --number=$SIZE_OFLOW/$SIZE_OFLOW large >/dev/null || fail=1 +fi +split --number=r/$UINTMAX_MAX/$UINTMAX_MAX </dev/null >/dev/null || fail=1 +split --number=r/$UINTMAX_OFLOW </dev/null 2>/dev/null && fail=1 + +# Make sure that a huge obsolete option evokes the right failure. +split -99999999999999999991 2> out && fail=1 + +# On losing systems (x86 Solaris 5.9 c89), we get a message like this: +# split: line count option -9999999999... is too large +# while on most, we get this: +# split: line count option -99999999999999999991... is too large +# so map them both to -99*. +sed 's/99[19]*/99*/' out > out-t +mv -f out-t out + +cat <<\EOF > exp +split: line count option -99*... is too large +EOF +compare exp out || fail=1 + +# Make sure split fails when it can't read input +# (the current directory in this case) +if ! cat . >/dev/null; then + # can't read() directories + split . && fail=1 +fi + +Exit $fail diff --git a/tests/split/filter b/tests/split/filter deleted file mode 100755 index dbcac5f7..00000000 --- a/tests/split/filter +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh -# Exercise split's new --filter option. - -# Copyright (C) 2011-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ split -xz --version || skip_ "xz (better than gzip/bzip2) required" - -for total_n_lines in 5 3000 20000; do - seq $total_n_lines > in || framework_failure_ - for i in 2 51 598; do - - # Don't create too many files/processes. - # Starting 10k (or even "only" 1500) processes would take a long time, - # and would provide little added benefit. - case $i:$total_n_lines in 2:5);; *) continue;; esac - - split -l$i --filter='xz > $FILE.xz' in out- || fail=1 - xz -dc out-* > out || fail=1 - compare in out || fail=1 - rm -f out* - done - rm -f in -done - -# Show how --elide-empty-files works with --filter: -# split does not run the command (and effectively elides the file) -# only when the output to that command would have been empty. -split -e -n 10 --filter='xz > $FILE.xz' /dev/null || fail=1 -stat x?? 2>/dev/null && fail=1 - -# Ensure this invalid combination is flagged -split -n 1/2 --filter='true' /dev/null 2>/dev/null && fail=1 - -# Ensure SIGPIPEs sent by the children don't propagate back -# where they would result in a non zero exit from split. -yes | head -n200K | split -b1G --filter='head -c1 >/dev/null' || fail=1 - -# Ensure that endless input is ignored when all filters finish -timeout 10 yes | split --filter="head -c1 >/dev/null" -n r/1 || fail=1 -timeout 10 split --filter="head -c1 >/dev/null" -n 1 /dev/zero || fail=1 - -Exit $fail diff --git a/tests/split/filter.sh b/tests/split/filter.sh new file mode 100755 index 00000000..3520b7af --- /dev/null +++ b/tests/split/filter.sh @@ -0,0 +1,57 @@ +#!/bin/sh +# Exercise split's new --filter option. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ split +xz --version || skip_ "xz (better than gzip/bzip2) required" + +for total_n_lines in 5 3000 20000; do + seq $total_n_lines > in || framework_failure_ + for i in 2 51 598; do + + # Don't create too many files/processes. + # Starting 10k (or even "only" 1500) processes would take a long time, + # and would provide little added benefit. + case $i:$total_n_lines in 2:5);; *) continue;; esac + + split -l$i --filter='xz -1 > $FILE.xz' in out- || fail=1 + xz -dc out-* > out || fail=1 + compare in out || fail=1 + rm -f out* + done + rm -f in +done + +# Show how --elide-empty-files works with --filter: +# split does not run the command (and effectively elides the file) +# only when the output to that command would have been empty. +split -e -n 10 --filter='xz > $FILE.xz' /dev/null || fail=1 +stat x?? 2>/dev/null && fail=1 + +# Ensure this invalid combination is flagged +split -n 1/2 --filter='true' /dev/null 2>/dev/null && fail=1 + +# Ensure SIGPIPEs sent by the children don't propagate back +# where they would result in a non zero exit from split. +yes | head -n200K | split -b1G --filter='head -c1 >/dev/null' || fail=1 + +# Ensure that endless input is ignored when all filters finish +timeout 10 yes | split --filter="head -c1 >/dev/null" -n r/1 || fail=1 +timeout 10 split --filter="head -c1 >/dev/null" -n 1 /dev/zero || fail=1 + +Exit $fail diff --git a/tests/split/guard-input.sh b/tests/split/guard-input.sh new file mode 100755 index 00000000..357ed543 --- /dev/null +++ b/tests/split/guard-input.sh @@ -0,0 +1,33 @@ +#!/bin/sh +# ensure split doesn't overwrite input with output. + +# Copyright (C) 2012-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ split + +seq 10 | tee exp-1 > xaa +ln -s xaa in2 +ln xaa in3 + +split -C 6 xaa && fail=1 +split -C 6 in2 && fail=1 +split -C 6 in3 && fail=1 +split -C 6 - < xaa && fail=1 + +compare exp-1 xaa || fail=1 + +Exit $fail diff --git a/tests/split/l-chunk b/tests/split/l-chunk deleted file mode 100755 index 8199883a..00000000 --- a/tests/split/l-chunk +++ /dev/null @@ -1,141 +0,0 @@ -#!/bin/sh -# test splitting into newline delineated chunks (-n l/...) - -# Copyright (C) 2010-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ split - -# invalid number of chunks -echo 'split: 1o: invalid number of chunks' > exp -split -n l/1o 2>err && fail=1 -compare exp err || fail=1 - -echo "split: '-': cannot determine file size" > exp -echo | split -n l/1 2>err && fail=1 -compare exp err || fail=1 - -# N can be greater than the file size -# in which case no data is extracted, or empty files are written -split -n l/10 /dev/null || fail=1 -test "$(stat -c %s x* | uniq -c | sed 's/^ *//; s/ /x/')" = "10x0" || fail=1 -rm x?? - -# Ensure the correct number of files written -# even if there is more data than the reported file size -split -n l/2 /dev/zero -test "$(stat -c %s x* | wc -l)" = '2' || fail=1 -rm x?? - -# Repeat the above, but with 1/2, not l/2: -split -n 1/2 /dev/zero || fail=1 - -# Ensure --elide-empty-files is honored -split -e -n l/10 /dev/null || fail=1 -stat x?? 2>/dev/null && fail=1 - -# 80 bytes. ~ transformed to \n below -lines=\ -12345~1~12345~1~12345~1~12345~1~12345~~~12345~1~12345~1~12345~1~12345~1~12345~1~ - -printf "%s" "$lines" | tr '~' '\n' > in || framework_failure_ - -echo 'split: 16: invalid chunk number' > exp -split -n l/16/15 in 2>err && fail=1 -compare exp err || fail=1 - -printf '%s' "\ -14 16 09 15 16 10 -14 08 08 10 14 08 08 10 -06 08 08 02 06 08 08 02 06 08 08 10 -06 08 02 06 08 00 08 02 06 08 02 06 08 00 10 -06 00 08 00 02 06 00 02 06 00 08 00 01 07 00 02 06 00 08 00 02 16 -" > exp || framework_failure_ - -sed 's/00 *//g' exp > exp.elide_empty || framework_failure_ - -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 - test "$DEBUGGING" && printf "\n---io-blk-size=$IO_BLKSIZE $ELIDE_EMPTY\n" - for N in 6 8 12 15 22; do - rm -f x* - - if test -z "$ELIDE_EMPTY"; then - split ---io-blksize=$IO_BLKSIZE -n l/2/$N in > chunk.k - stat x* 2>/dev/null && fail=1 - fi - - split ---io-blksize=$IO_BLKSIZE $ELIDE_EMPTY -n l/$N in - echo $(stat -c "%02s" x*) >> out - - if test -z "$ELIDE_EMPTY"; then - compare chunk.k xab || fail=1 - fi - - if test "$DEBUGGING"; then - # Output partition pattern - size=$(printf "%s" "$lines" | wc -c) - chunk_size=$(($size/$N)) - end_size=$(($chunk_size + ($size % $N))) - { - yes "$(printf %${chunk_size}s ])" | head -n$(($N-1)) - printf %${end_size}s ] - } | tr -d '\n' | sed "s/\\(^.\\{1,$size\\}\\).*/\\1/" - echo - - # Output pattern generated for comparison - for s in $(stat -c "%s" x*); do - #s=0 transitions are not shown - test "$m" = "_" && m=- || m=_ - printf "%${s}s" '' | tr ' ' $m - done - echo - - # Output lines for reference - echo "$lines" - fi - done - test -z "$ELIDE_EMPTY" && EXP=exp || EXP=exp.elide_empty - compare out $EXP || fail=1 - done -done -test "$DEBUGGING" && test "$VERBOSE" && set -x - - -# Check extraction of particular chunks -: > out -printf '1\n12345\n' > exp -split -n l/13/15 in > out -compare exp out || fail=1 -: > out -printf '' > exp -split -n l/14/15 in > out -compare exp out || fail=1 -: > out -printf '1\n12345\n1\n' > exp -split -n l/15/15 in > out -compare exp out || fail=1 - -# test input with no \n at end -printf '12\n34\n5' > in -printf '5' > exp -split -n l/7/7 in > out -compare exp out || fail=1 - -Exit $fail diff --git a/tests/split/l-chunk.sh b/tests/split/l-chunk.sh new file mode 100755 index 00000000..63968d15 --- /dev/null +++ b/tests/split/l-chunk.sh @@ -0,0 +1,141 @@ +#!/bin/sh +# test splitting into newline delineated chunks (-n l/...) + +# Copyright (C) 2010-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ split + +# invalid number of chunks +echo 'split: 1o: invalid number of chunks' > exp +split -n l/1o 2>err && fail=1 +compare exp err || fail=1 + +echo "split: '-': cannot determine file size" > exp +echo | split -n l/1 2>err && fail=1 +compare exp err || fail=1 + +# N can be greater than the file size +# in which case no data is extracted, or empty files are written +split -n l/10 /dev/null || fail=1 +test "$(stat -c %s x* | uniq -c | sed 's/^ *//; s/ /x/')" = "10x0" || fail=1 +rm x?? + +# Ensure the correct number of files written +# even if there is more data than the reported file size +split -n l/2 /dev/zero +test "$(stat -c %s x* | wc -l)" = '2' || fail=1 +rm x?? + +# Repeat the above, but with 1/2, not l/2: +split -n 1/2 /dev/zero || fail=1 + +# Ensure --elide-empty-files is honored +split -e -n l/10 /dev/null || fail=1 +stat x?? 2>/dev/null && fail=1 + +# 80 bytes. ~ transformed to \n below +lines=\ +12345~1~12345~1~12345~1~12345~1~12345~~~12345~1~12345~1~12345~1~12345~1~12345~1~ + +printf "%s" "$lines" | tr '~' '\n' > in || framework_failure_ + +echo 'split: 16: invalid chunk number' > exp +split -n l/16/15 in 2>err && fail=1 +compare exp err || fail=1 + +printf '%s' "\ +14 16 09 15 16 10 +14 08 08 10 14 08 08 10 +06 08 08 02 06 08 08 02 06 08 08 10 +06 08 02 06 08 00 08 02 06 08 02 06 08 00 10 +06 00 08 00 02 06 00 02 06 00 08 00 01 07 00 02 06 00 08 00 02 16 +" > exp || framework_failure_ + +sed 's/00 *//g' exp > exp.elide_empty || framework_failure_ + +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 + test "$DEBUGGING" && printf "\n---io-blk-size=$IO_BLKSIZE $ELIDE_EMPTY\n" + for N in 6 8 12 15 22; do + rm -f x* + + if test -z "$ELIDE_EMPTY"; then + split ---io-blksize=$IO_BLKSIZE -n l/2/$N in > chunk.k + stat x* 2>/dev/null && fail=1 + fi + + split ---io-blksize=$IO_BLKSIZE $ELIDE_EMPTY -n l/$N in + echo $(stat -c "%02s" x*) >> out + + if test -z "$ELIDE_EMPTY"; then + compare chunk.k xab || fail=1 + fi + + if test "$DEBUGGING"; then + # Output partition pattern + size=$(printf "%s" "$lines" | wc -c) + chunk_size=$(($size/$N)) + end_size=$(($chunk_size + ($size % $N))) + { + yes "$(printf %${chunk_size}s ])" | head -n$(($N-1)) + printf %${end_size}s ] + } | tr -d '\n' | sed "s/\\(^.\\{1,$size\\}\\).*/\\1/" + echo + + # Output pattern generated for comparison + for s in $(stat -c "%s" x*); do + #s=0 transitions are not shown + test "$m" = "_" && m=- || m=_ + printf "%${s}s" '' | tr ' ' $m + done + echo + + # Output lines for reference + echo "$lines" + fi + done + test -z "$ELIDE_EMPTY" && EXP=exp || EXP=exp.elide_empty + compare out $EXP || fail=1 + done +done +test "$DEBUGGING" && test "$VERBOSE" && set -x + + +# Check extraction of particular chunks +: > out +printf '1\n12345\n' > exp +split -n l/13/15 in > out +compare exp out || fail=1 +: > out +printf '' > exp +split -n l/14/15 in > out +compare exp out || fail=1 +: > out +printf '1\n12345\n1\n' > exp +split -n l/15/15 in > out +compare exp out || fail=1 + +# test input with no \n at end +printf '12\n34\n5' > in +printf '5' > exp +split -n l/7/7 in > out +compare exp out || fail=1 + +Exit $fail diff --git a/tests/split/lines b/tests/split/lines deleted file mode 100755 index 35eb3eb2..00000000 --- a/tests/split/lines +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh -# show that 'split --lines=2' works. - -# Copyright (C) 2002-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ split - -printf '1\n2\n3\n4\n5\n' > in || framework_failure_ - -split --lines=2 in > out || fail=1 -cat <<\EOF > exp-1 -1 -2 -EOF -cat <<\EOF > exp-2 -3 -4 -EOF -cat <<\EOF > exp-3 -5 -EOF - -compare exp-1 xaa || fail=1 -compare exp-2 xab || fail=1 -compare exp-3 xac || fail=1 -test -f xad && fail=1 - -Exit $fail diff --git a/tests/split/lines.sh b/tests/split/lines.sh new file mode 100755 index 00000000..d78bc202 --- /dev/null +++ b/tests/split/lines.sh @@ -0,0 +1,42 @@ +#!/bin/sh +# show that 'split --lines=2' works. + +# Copyright (C) 2002-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ split + +printf '1\n2\n3\n4\n5\n' > in || framework_failure_ + +split --lines=2 in > out || fail=1 +cat <<\EOF > exp-1 +1 +2 +EOF +cat <<\EOF > exp-2 +3 +4 +EOF +cat <<\EOF > exp-3 +5 +EOF + +compare exp-1 xaa || fail=1 +compare exp-2 xab || fail=1 +compare exp-3 xac || fail=1 +test -f xad && fail=1 + +Exit $fail diff --git a/tests/split/numeric b/tests/split/numeric deleted file mode 100755 index ad22df62..00000000 --- a/tests/split/numeric +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/sh -# Show that split --numeric-suffixes[=from] works. - -# Copyright (C) 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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ split - -# Check default start from 0 -printf '1\n2\n3\n4\n5\n' > in || framework_failure_ -split --numeric-suffixes --lines=2 in || fail=1 -cat <<\EOF > exp-1 -1 -2 -EOF -cat <<\EOF > exp-2 -3 -4 -EOF -cat <<\EOF > exp-3 -5 -EOF -compare exp-1 x00 || fail=1 -compare exp-2 x01 || fail=1 -compare exp-3 x02 || fail=1 - -# Check --numeric-suffixes=X -split --numeric-suffixes=1 --lines=2 in || fail=1 -cat <<\EOF > exp-1 -1 -2 -EOF -cat <<\EOF > exp-2 -3 -4 -EOF -cat <<\EOF > exp-3 -5 -EOF -compare exp-1 x01 || fail=1 -compare exp-2 x02 || fail=1 -compare exp-3 x03 || fail=1 - -# Check that split failed when suffix length is not large enough for -# the numerical suffix start value -split -a 3 --numeric-suffixes=1000 in 2> /dev/null && fail=1 - -# check invalid --numeric-suffixes start values are flagged -split --numeric-suffixes=-1 in 2> /dev/null && fail=1 -split --numeric-suffixes=one in 2> /dev/null && fail=1 - -Exit $fail diff --git a/tests/split/numeric.sh b/tests/split/numeric.sh new file mode 100755 index 00000000..1fd9b6f5 --- /dev/null +++ b/tests/split/numeric.sh @@ -0,0 +1,65 @@ +#!/bin/sh +# Show that split --numeric-suffixes[=from] works. + +# Copyright (C) 2012-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ split + +# Check default start from 0 +printf '1\n2\n3\n4\n5\n' > in || framework_failure_ +split --numeric-suffixes --lines=2 in || fail=1 +cat <<\EOF > exp-1 +1 +2 +EOF +cat <<\EOF > exp-2 +3 +4 +EOF +cat <<\EOF > exp-3 +5 +EOF +compare exp-1 x00 || fail=1 +compare exp-2 x01 || fail=1 +compare exp-3 x02 || fail=1 + +# Check --numeric-suffixes=X +split --numeric-suffixes=1 --lines=2 in || fail=1 +cat <<\EOF > exp-1 +1 +2 +EOF +cat <<\EOF > exp-2 +3 +4 +EOF +cat <<\EOF > exp-3 +5 +EOF +compare exp-1 x01 || fail=1 +compare exp-2 x02 || fail=1 +compare exp-3 x03 || fail=1 + +# Check that split failed when suffix length is not large enough for +# the numerical suffix start value +split -a 3 --numeric-suffixes=1000 in 2> /dev/null && fail=1 + +# check invalid --numeric-suffixes start values are flagged +split --numeric-suffixes=-1 in 2> /dev/null && fail=1 +split --numeric-suffixes=one in 2> /dev/null && fail=1 + +Exit $fail diff --git a/tests/split/r-chunk b/tests/split/r-chunk deleted file mode 100755 index afd9bf4b..00000000 --- a/tests/split/r-chunk +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/sh -# test splitting into round-robin chunks - -# Copyright (C) 2010-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 -# 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=.}/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 -test "$(stat -c %s x* | uniq -c | sed 's/^ *//; s/ /x/')" = "10x0" || fail=1 -rm x?? - -# Ensure --elide-empty-files is honored -split -e -n r/10 /dev/null || fail=1 -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 - -split -n r/1/3 in > r1 || fail=1 -split -n r/2/3 in > r2 || fail=1 -split -n r/3/3 in > r3 || fail=1 - -printf '1\n4\n' > exp-1 -printf '2\n5\n' > exp-2 -printf '3\n' > exp-3 - -compare exp-1 xaa || fail=1 -compare exp-2 xab || fail=1 -compare exp-3 xac || fail=1 -compare exp-1 r1 || fail=1 -compare exp-2 r2 || fail=1 -compare exp-3 r3 || fail=1 -test -f xad && fail=1 - -# Test input without trailing \n -printf '1\n2\n3\n4\n5' | split -n r/2/3 > out -printf '2\n5' > exp -compare exp out || fail=1 - -# Ensure we fall back to appending to a file at a time -# if we hit the limit for the number of open files. -rm x* -(ulimit -n 20 && yes | head -n90 | split -n r/30 ) || fail=1 -test "$(stat -c %s x* | uniq -c | sed 's/^ *//; s/ /x/')" = "30x6" || fail=1 - -Exit $fail diff --git a/tests/split/r-chunk.sh b/tests/split/r-chunk.sh new file mode 100755 index 00000000..f4c4fd22 --- /dev/null +++ b/tests/split/r-chunk.sh @@ -0,0 +1,66 @@ +#!/bin/sh +# test splitting into round-robin chunks + +# Copyright (C) 2010-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/>. + +. "${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 +test "$(stat -c %s x* | uniq -c | sed 's/^ *//; s/ /x/')" = "10x0" || fail=1 +rm x?? + +# Ensure --elide-empty-files is honored +split -e -n r/10 /dev/null || fail=1 +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 + +split -n r/1/3 in > r1 || fail=1 +split -n r/2/3 in > r2 || fail=1 +split -n r/3/3 in > r3 || fail=1 + +printf '1\n4\n' > exp-1 +printf '2\n5\n' > exp-2 +printf '3\n' > exp-3 + +compare exp-1 xaa || fail=1 +compare exp-2 xab || fail=1 +compare exp-3 xac || fail=1 +compare exp-1 r1 || fail=1 +compare exp-2 r2 || fail=1 +compare exp-3 r3 || fail=1 +test -f xad && fail=1 + +# Test input without trailing \n +printf '1\n2\n3\n4\n5' | split -n r/2/3 > out +printf '2\n5' > exp +compare exp out || fail=1 + +# Ensure we fall back to appending to a file at a time +# if we hit the limit for the number of open files. +rm x* +(ulimit -n 20 && yes | head -n90 | split -n r/30 ) || fail=1 +test "$(stat -c %s x* | uniq -c | sed 's/^ *//; s/ /x/')" = "30x6" || fail=1 + +Exit $fail diff --git a/tests/split/suffix-auto-length b/tests/split/suffix-auto-length deleted file mode 100755 index dacc9515..00000000 --- a/tests/split/suffix-auto-length +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh -# Test the suffix auto widening functionality - -# Copyright (C) 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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ split - - -# ensure this feature is off when start number specified -truncate -s12 file.in -split file.in -b1 --numeric=89 && fail=1 -test "$(ls -1 x* | wc -l)" = 11 || fail=1 -rm -f x* - -# ensure this feature works when no start num specified -truncate -s91 file.in -for prefix in 'x' 'xx' ''; do - for add_suffix in '.txt' ''; do - split file.in "$prefix" -b1 --numeric --additional-suffix="$add_suffix" \ - || fail=1 - test "$(ls -1 $prefix*[0-9]*$add_suffix | wc -l)" = 91 || fail=1 - test -e "${prefix}89$add_suffix" || fail=1 - test -e "${prefix}9000$add_suffix" || fail=1 - rm -f $prefix*[0-9]*$add_suffix - done -done - -Exit $fail diff --git a/tests/split/suffix-auto-length.sh b/tests/split/suffix-auto-length.sh new file mode 100755 index 00000000..4beab031 --- /dev/null +++ b/tests/split/suffix-auto-length.sh @@ -0,0 +1,42 @@ +#!/bin/sh +# Test the suffix auto widening functionality + +# Copyright (C) 2012-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ split + + +# ensure this feature is off when start number specified +truncate -s12 file.in +split file.in -b1 --numeric=89 && fail=1 +test "$(ls -1 x* | wc -l)" = 11 || fail=1 +rm -f x* + +# ensure this feature works when no start num specified +truncate -s91 file.in +for prefix in 'x' 'xx' ''; do + for add_suffix in '.txt' ''; do + split file.in "$prefix" -b1 --numeric --additional-suffix="$add_suffix" \ + || fail=1 + test "$(ls -1 $prefix*[0-9]*$add_suffix | wc -l)" = 91 || fail=1 + test -e "${prefix}89$add_suffix" || fail=1 + test -e "${prefix}9000$add_suffix" || fail=1 + rm -f $prefix*[0-9]*$add_suffix + done +done + +Exit $fail diff --git a/tests/split/suffix-length b/tests/split/suffix-length deleted file mode 100755 index bc65e9f6..00000000 --- a/tests/split/suffix-length +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/sh -# Show that split -a works. - -# Copyright (C) 2002-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ split - -a_z='a b c d e f g h i j k l m n o p q r s t u v w x y z' - -# Generate a 27-byte file -printf %s $a_z 0 |tr -d ' ' > in || framework_failure_ - -files= -for i in $a_z; do - files="${files}xa$i " -done -files="${files}xba" - -for f in $files; do - printf "creating file '%s'"'\n' $f -done > exp || framework_failure_ - -echo split: output file suffixes exhausted \ - > exp-too-short || framework_failure_ - - -# This should fail. -split -b 1 -a 1 in 2> err && fail=1 -test -f xa || fail=1 -test -f xz || fail=1 -test -f xaa && fail=1 -test -f xaz && fail=1 -rm -f x* -compare exp-too-short err || fail=1 - -# With a longer suffix, it must succeed. -split --verbose -b 1 -a 2 in > err || fail=1 -compare exp err || fail=1 - -# Ensure that xbb is *not* created. -test -f xbb && fail=1 - -# Ensure that the 27 others files *were* created, and with expected contents. -n=1 -for f in $files; do - expected_byte=$(cut -b $n in) - b=$(cat $f) || fail=1 - test "$b" = "$expected_byte" || fail=1 - n=$(expr $n + 1) -done - -# Ensure that -a is independent of -[bCl] -split -a2 -b1000 < /dev/null || fail=1 -split -a2 -l1000 < /dev/null || fail=1 -split -a2 -C1000 < /dev/null || fail=1 - -# Ensure that -a fails early with a -n that is too large -rm -f x* -split -a2 -n1000 < /dev/null && fail=1 -test -f xaa && fail=1 - -Exit $fail diff --git a/tests/split/suffix-length.sh b/tests/split/suffix-length.sh new file mode 100755 index 00000000..466d8a7c --- /dev/null +++ b/tests/split/suffix-length.sh @@ -0,0 +1,76 @@ +#!/bin/sh +# Show that split -a works. + +# Copyright (C) 2002-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ split + +a_z='a b c d e f g h i j k l m n o p q r s t u v w x y z' + +# Generate a 27-byte file +printf %s $a_z 0 |tr -d ' ' > in || framework_failure_ + +files= +for i in $a_z; do + files="${files}xa$i " +done +files="${files}xba" + +for f in $files; do + printf "creating file '%s'"'\n' $f +done > exp || framework_failure_ + +echo split: output file suffixes exhausted \ + > exp-too-short || framework_failure_ + + +# This should fail. +split -b 1 -a 1 in 2> err && fail=1 +test -f xa || fail=1 +test -f xz || fail=1 +test -f xaa && fail=1 +test -f xaz && fail=1 +rm -f x* +compare exp-too-short err || fail=1 + +# With a longer suffix, it must succeed. +split --verbose -b 1 -a 2 in > err || fail=1 +compare exp err || fail=1 + +# Ensure that xbb is *not* created. +test -f xbb && fail=1 + +# Ensure that the 27 others files *were* created, and with expected contents. +n=1 +for f in $files; do + expected_byte=$(cut -b $n in) + b=$(cat $f) || fail=1 + test "$b" = "$expected_byte" || fail=1 + n=$(expr $n + 1) +done + +# Ensure that -a is independent of -[bCl] +split -a2 -b1000 < /dev/null || fail=1 +split -a2 -l1000 < /dev/null || fail=1 +split -a2 -C1000 < /dev/null || fail=1 + +# Ensure that -a fails early with a -n that is too large +rm -f x* +split -a2 -n1000 < /dev/null && fail=1 +test -f xaa && fail=1 + +Exit $fail diff --git a/tests/tail-2/F-vs-missing b/tests/tail-2/F-vs-missing deleted file mode 100755 index fbdb5331..00000000 --- a/tests/tail-2/F-vs-missing +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/sh -# demonstrate that tail -F works for currently missing dirs -# Before coreutils-8.6, tail -F missing/file would not -# notice any subsequent availability of the missing/file. - -# Copyright (C) 2010-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ tail - -debug='---disable-inotify' -debug= -tail $debug -F -s.1 missing/file > out 2>&1 & pid=$! - -check_tail_output() -{ - local delay="$1" - grep "$tail_re" out > /dev/null || - { sleep $delay; return 1; } -} - -# Wait up to 6.3s for tail to start with diagnostic: -# tail: cannot open 'missing/file' for reading: No such file or directory -tail_re='cannot open' retry_delay_ check_tail_output .1 7 || fail=1 - -mkdir missing || fail=1 -(cd missing && echo x > file) - -# Wait up to 6.3s for this to appear in the output: -# "tail: '...' has appeared; following end of new file" -tail_re='has appeared' retry_delay_ check_tail_output .1 7 || - { echo "$0: file: unexpected delay?"; cat out; fail=1; } - -kill -HUP $pid - -cleanup() -{ - local delay="$1" - rm -rf missing || - { sleep $delay; return 1; } -} - -# Try repeatedly to remove the temporary directory. -# This is normally unnecessary, because the containing directory will -# be removed by code from init.sh. However, when this particular test -# is run on an NFS-mounted volume, sometimes init.sh's cleanup code -# fails because the directory is not yet really empty, perhaps because -# the tail process (reading missing/file) is not yet killed. -retry_delay_ cleanup .1 6 - -Exit $fail diff --git a/tests/tail-2/F-vs-missing.sh b/tests/tail-2/F-vs-missing.sh new file mode 100755 index 00000000..0f744042 --- /dev/null +++ b/tests/tail-2/F-vs-missing.sh @@ -0,0 +1,64 @@ +#!/bin/sh +# demonstrate that tail -F works for currently missing dirs +# 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. + +# This 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 + +debug='---disable-inotify' +debug= +tail $debug -F -s.1 missing/file > out 2>&1 & pid=$! + +check_tail_output() +{ + local delay="$1" + grep "$tail_re" out > /dev/null || + { sleep $delay; return 1; } +} + +# Wait up to 6.3s for tail to start with diagnostic: +# tail: cannot open 'missing/file' for reading: No such file or directory +tail_re='cannot open' retry_delay_ check_tail_output .1 7 || fail=1 + +mkdir missing || fail=1 +(cd missing && echo x > file) + +# Wait up to 6.3s for this to appear in the output: +# "tail: '...' has appeared; following end of new file" +tail_re='has appeared' retry_delay_ check_tail_output .1 7 || + { echo "$0: file: unexpected delay?"; cat out; fail=1; } + +kill -HUP $pid + +cleanup() +{ + local delay="$1" + rm -rf missing || + { sleep $delay; return 1; } +} + +# Try repeatedly to remove the temporary directory. +# This is normally unnecessary, because the containing directory will +# be removed by code from init.sh. However, when this particular test +# is run on an NFS-mounted volume, sometimes init.sh's cleanup code +# fails because the directory is not yet really empty, perhaps because +# the tail process (reading missing/file) is not yet killed. +retry_delay_ cleanup .1 6 + +Exit $fail diff --git a/tests/tail-2/F-vs-rename b/tests/tail-2/F-vs-rename deleted file mode 100755 index 53bc00dd..00000000 --- a/tests/tail-2/F-vs-rename +++ /dev/null @@ -1,75 +0,0 @@ -#!/bin/sh -# demonstrate that tail -F works when renaming the tailed files -# Before coreutils-8.3, tail -F a b would stop tracking additions to b -# after "mv a b". - -# Copyright (C) 2009-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ tail - -touch a b || framework_failure_ - -debug='---disable-inotify' -debug= -tail $debug -F -s.1 a b > out 2>&1 & pid=$! - -check_tail_output() -{ - local delay="$1" - grep "$tail_re" out > /dev/null || - { sleep $delay; return 1; } -} - -# Wait up to 6.3s for tail to start -echo x > a -tail_re='^x$' retry_delay_ check_tail_output .1 7 || fail=1 - -mv a b || fail=1 - -# Wait 6.3s for this diagnostic: -# tail: 'a' has become inaccessible: No such file or directory -tail_re='inaccessible' retry_delay_ check_tail_output .1 7 || fail=1 - -echo x > a -# Wait up to 6.3s for this to appear in the output: -# "tail: '...' has appeared; following end of new file" -tail_re='has appeared' retry_delay_ check_tail_output .1 7 || - { echo "$0: a: unexpected delay?"; cat out; fail=1; } - -echo y >> b -# Wait up to 6.3s for "y" to appear in the output: -tail_f_vs_rename_2() { - local delay="$1" - tr '\n' @ < out | grep '@@==> b <==@y@$' > /dev/null || - { sleep $delay; return 1; } -} -retry_delay_ tail_f_vs_rename_2 .1 7 || - { echo "$0: b: unexpected delay?"; cat out; fail=1; } - -echo z >> a -# Wait up to 6.3s for "z" to appear in the output: -tail_f_vs_rename_3() { - local delay="$1" - tr '\n' @ < out | grep '@@==> a <==@z@$' > /dev/null || - { sleep $delay; return 1; } -} -retry_delay_ tail_f_vs_rename_3 .1 7 || - { echo "$0: a: unexpected delay?"; cat out; fail=1; } - -kill -HUP $pid - -Exit $fail diff --git a/tests/tail-2/F-vs-rename.sh b/tests/tail-2/F-vs-rename.sh new file mode 100755 index 00000000..4f3ad5eb --- /dev/null +++ b/tests/tail-2/F-vs-rename.sh @@ -0,0 +1,75 @@ +#!/bin/sh +# demonstrate that tail -F works when renaming the tailed files +# 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. + +# This 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 + +touch a b || framework_failure_ + +debug='---disable-inotify' +debug= +tail $debug -F -s.1 a b > out 2>&1 & pid=$! + +check_tail_output() +{ + local delay="$1" + grep "$tail_re" out > /dev/null || + { sleep $delay; return 1; } +} + +# Wait up to 6.3s for tail to start +echo x > a +tail_re='^x$' retry_delay_ check_tail_output .1 7 || fail=1 + +mv a b || fail=1 + +# Wait 6.3s for this diagnostic: +# tail: 'a' has become inaccessible: No such file or directory +tail_re='inaccessible' retry_delay_ check_tail_output .1 7 || fail=1 + +echo x > a +# Wait up to 6.3s for this to appear in the output: +# "tail: '...' has appeared; following end of new file" +tail_re='has appeared' retry_delay_ check_tail_output .1 7 || + { echo "$0: a: unexpected delay?"; cat out; fail=1; } + +echo y >> b +# Wait up to 6.3s for "y" to appear in the output: +tail_f_vs_rename_2() { + local delay="$1" + tr '\n' @ < out | grep '@@==> b <==@y@$' > /dev/null || + { sleep $delay; return 1; } +} +retry_delay_ tail_f_vs_rename_2 .1 7 || + { echo "$0: b: unexpected delay?"; cat out; fail=1; } + +echo z >> a +# Wait up to 6.3s for "z" to appear in the output: +tail_f_vs_rename_3() { + local delay="$1" + tr '\n' @ < out | grep '@@==> a <==@z@$' > /dev/null || + { sleep $delay; return 1; } +} +retry_delay_ tail_f_vs_rename_3 .1 7 || + { echo "$0: a: unexpected delay?"; cat out; fail=1; } + +kill -HUP $pid + +Exit $fail diff --git a/tests/tail-2/append-only b/tests/tail-2/append-only deleted file mode 100755 index c79bb7b2..00000000 --- a/tests/tail-2/append-only +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -# 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-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ tail -require_root_ - -chattr_a_works=1 -touch f -chattr +a f 2>/dev/null || chattr_a_works=0 -( echo x > f ) 2>/dev/null && chattr_a_works=0 -echo x >> f || chattr_a_works=0 - -if test $chattr_a_works = 0; then - skip_ "chattr +a doesn't work on this file system" -fi - - -for inotify in ---disable-inotify ''; do - sleep 1 & - pid=$! - tail --pid=$pid -f $inotify f || fail=1 -done - -chattr -a f 2>/dev/null - -Exit $fail diff --git a/tests/tail-2/append-only.sh b/tests/tail-2/append-only.sh new file mode 100755 index 00000000..93d0b323 --- /dev/null +++ b/tests/tail-2/append-only.sh @@ -0,0 +1,43 @@ +#!/bin/sh +# 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. + +# This 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 +require_root_ + +chattr_a_works=1 +touch f +chattr +a f 2>/dev/null || chattr_a_works=0 +( echo x > f ) 2>/dev/null && chattr_a_works=0 +echo x >> f || chattr_a_works=0 + +if test $chattr_a_works = 0; then + skip_ "chattr +a doesn't work on this file system" +fi + + +for inotify in ---disable-inotify ''; do + sleep 1 & + pid=$! + tail --pid=$pid -f $inotify f || fail=1 +done + +chattr -a f 2>/dev/null + +Exit $fail diff --git a/tests/tail-2/assert b/tests/tail-2/assert deleted file mode 100755 index 043e2593..00000000 --- a/tests/tail-2/assert +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -# Test for assertion failure in "test". - -# Copyright (C) 1999-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 -# 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 test fails with tail from textutils-2.0. -# It would get something like this: -# tail: tail.c:718: recheck: Assertion 'valid_file_spec (f)' failed. -# Aborted -# due to a race condition in which a dev/inode pair is reused. - -. "${srcdir=.}/init.sh"; path_prepend_ ../src -print_ver_ tail - -# Not "expensive" per se, but sleeping for so long is annoying. -very_expensive_ - -ok='ok ok ok' - -touch a foo -tail --follow=name a foo > err 2>&1 & -tail_pid=$! -# Arrange for the tail process to die after 12 seconds. -(sleep 12; kill $tail_pid) & - -echo sleeping for 7 seconds... - -# Give the backgrounded 'tail' a chance to start before removing foo. -# Otherwise, without --retry, tail wouldn't try to open 'foo' again. -sleep 1 - -rm -f foo -sleep 6 -echo $ok > f -mv f foo - -# echo waiting.... -wait - -case "$(cat err)" in - *$ok) ;; - *) fail=1;; -esac - -test $fail = 1 && cat err - -Exit $fail diff --git a/tests/tail-2/assert-2 b/tests/tail-2/assert-2 deleted file mode 100755 index d94d3d8e..00000000 --- a/tests/tail-2/assert-2 +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -# This variant of 'assert' would get a UMR reliably in 2.0.9. -# 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-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ tail - -# Not "expensive" per se, but sleeping for so long is annoying. -very_expensive_ - -ok='ok ok ok' - -touch a -tail --follow=name a foo > err 2>&1 & -tail_pid=$! -# Arrange for the tail process to die after 12 seconds. -(sleep 12; kill $tail_pid) & -echo $ok > f -echo sleeping for 7 seconds... -sleep 7 -mv f foo - -# echo waiting.... -wait - -case "$(cat err)" in - *$ok) ;; - *) fail=1;; -esac - -test $fail = 1 && cat err - -Exit $fail diff --git a/tests/tail-2/assert-2.sh b/tests/tail-2/assert-2.sh new file mode 100755 index 00000000..13cb3e02 --- /dev/null +++ b/tests/tail-2/assert-2.sh @@ -0,0 +1,49 @@ +#!/bin/sh +# This variant of 'assert' would get a UMR reliably in 2.0.9. +# 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. + +# This 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 + +# Not "expensive" per se, but sleeping for so long is annoying. +very_expensive_ + +ok='ok ok ok' + +touch a +tail --follow=name a foo > err 2>&1 & +tail_pid=$! +# Arrange for the tail process to die after 12 seconds. +(sleep 12; kill $tail_pid) & +echo $ok > f +echo sleeping for 7 seconds... +sleep 7 +mv f foo + +# echo waiting.... +wait + +case "$(cat err)" in + *$ok) ;; + *) fail=1;; +esac + +test $fail = 1 && cat err + +Exit $fail diff --git a/tests/tail-2/assert.sh b/tests/tail-2/assert.sh new file mode 100755 index 00000000..ee7cec8c --- /dev/null +++ b/tests/tail-2/assert.sh @@ -0,0 +1,61 @@ +#!/bin/sh +# Test for assertion failure in "test". + +# Copyright (C) 1999-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/>. + + +# This test fails with tail from textutils-2.0. +# It would get something like this: +# tail: tail.c:718: recheck: Assertion 'valid_file_spec (f)' failed. +# Aborted +# due to a race condition in which a dev/inode pair is reused. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ tail + +# Not "expensive" per se, but sleeping for so long is annoying. +very_expensive_ + +ok='ok ok ok' + +touch a foo +tail --follow=name a foo > err 2>&1 & +tail_pid=$! +# Arrange for the tail process to die after 12 seconds. +(sleep 12; kill $tail_pid) & + +echo sleeping for 7 seconds... + +# Give the backgrounded 'tail' a chance to start before removing foo. +# Otherwise, without --retry, tail wouldn't try to open 'foo' again. +sleep 1 + +rm -f foo +sleep 6 +echo $ok > f +mv f foo + +# echo waiting.... +wait + +case "$(cat err)" in + *$ok) ;; + *) fail=1;; +esac + +test $fail = 1 && cat err + +Exit $fail diff --git a/tests/tail-2/big-4gb b/tests/tail-2/big-4gb deleted file mode 100755 index 8ace3183..00000000 --- a/tests/tail-2/big-4gb +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh -# Demonstrate a bug in 'tail -cN' when operating on files of size 4G and larger -# Fixed in coreutils-4.5.2. - -# Copyright (C) 2002-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ tail -expensive_ - -# Create a file of size exactly 4GB (2^32) with 8 bytes -# at the beginning and another set of 8 bytes at the end. -# The rest will be NUL bytes. On most modern systems, the following -# creates a file that takes up only a few KB. Here, du -sh says 16K. -echo abcdefgh | tr -d '\n' > big || framework_failure_ -echo 87654321 | tr -d '\n' > tmp || framework_failure_ -# Seek 4GB - 8 -dd bs=1 seek=4294967288 if=tmp of=big 2> err || dd_failed=1 -if test "$dd_failed" = 1; then - cat err 1>&2 - skip_ \ -'cannot create a file large enough for this test, -possibly because this system does not support large files; -Consider rerunning this test on a different file system.' -fi - - -tail -c1 big > out || fail=1 -# Append a newline. -echo >> out -cat <<\EOF > exp -1 -EOF - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/tail-2/big-4gb.sh b/tests/tail-2/big-4gb.sh new file mode 100755 index 00000000..4e7463c6 --- /dev/null +++ b/tests/tail-2/big-4gb.sh @@ -0,0 +1,50 @@ +#!/bin/sh +# 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. + +# This 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 +expensive_ + +# Create a file of size exactly 4GB (2^32) with 8 bytes +# at the beginning and another set of 8 bytes at the end. +# The rest will be NUL bytes. On most modern systems, the following +# creates a file that takes up only a few KB. Here, du -sh says 16K. +echo abcdefgh | tr -d '\n' > big || framework_failure_ +echo 87654321 | tr -d '\n' > tmp || framework_failure_ +# Seek 4GB - 8 +dd bs=1 seek=4294967288 if=tmp of=big 2> err || dd_failed=1 +if test "$dd_failed" = 1; then + cat err 1>&2 + skip_ \ +'cannot create a file large enough for this test, +possibly because this system does not support large files; +Consider rerunning this test on a different file system.' +fi + + +tail -c1 big > out || fail=1 +# Append a newline. +echo >> out +cat <<\EOF > exp +1 +EOF + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/tail-2/flush-initial b/tests/tail-2/flush-initial deleted file mode 100755 index bf68ce76..00000000 --- a/tests/tail-2/flush-initial +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -# inotify-based tail -f didn't flush its initial output before blocking - -# Copyright (C) 2009-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ tail - -echo line > in || fail=1 -# Output should be buffered since we're writing to file -# so we're depending on the flush to write out -tail -f in > out & -tail_pid=$! - -# Wait for 1.5s for the file to be flushed. -tail_flush() -{ - local delay="$1" - - test -s out || - { sleep "$delay"; return 1; } -} -retry_delay_ tail_flush .1 5 || fail=1 - -kill $tail_pid - -Exit $fail diff --git a/tests/tail-2/flush-initial.sh b/tests/tail-2/flush-initial.sh new file mode 100755 index 00000000..c9f7f4e7 --- /dev/null +++ b/tests/tail-2/flush-initial.sh @@ -0,0 +1,40 @@ +#!/bin/sh +# inotify-based tail -f didn't flush its initial output before blocking + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ tail + +echo line > in || fail=1 +# Output should be buffered since we're writing to file +# so we're depending on the flush to write out +tail -f in > out & +tail_pid=$! + +# Wait for 1.5s for the file to be flushed. +tail_flush() +{ + local delay="$1" + + test -s out || + { sleep "$delay"; return 1; } +} +retry_delay_ tail_flush .1 5 || fail=1 + +kill $tail_pid + +Exit $fail diff --git a/tests/tail-2/follow-name b/tests/tail-2/follow-name deleted file mode 100755 index 2ab1c011..00000000 --- a/tests/tail-2/follow-name +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# ensure that --follow=name does not imply --retry - -# Copyright (C) 2011-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ tail - -cat <<\EOF > exp || framework_failure_ -tail: cannot open 'no-such' for reading: No such file or directory -tail: no files remaining -EOF - -timeout 10 tail --follow=name no-such > out 2> err -test $? = 1 || fail=1 - -# Remove an inconsequential inotify warning so -# we can compare against the above error -sed '/inotify cannot be used/d' err > k && mv k err - -compare exp err || fail=1 - -Exit $fail diff --git a/tests/tail-2/follow-name.sh b/tests/tail-2/follow-name.sh new file mode 100755 index 00000000..ba480fee --- /dev/null +++ b/tests/tail-2/follow-name.sh @@ -0,0 +1,36 @@ +#!/bin/sh +# ensure that --follow=name does not imply --retry + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ tail + +cat <<\EOF > exp || framework_failure_ +tail: cannot open 'no-such' for reading: No such file or directory +tail: no files remaining +EOF + +timeout 10 tail --follow=name no-such > out 2> err +test $? = 1 || fail=1 + +# Remove an inconsequential inotify warning so +# we can compare against the above error +sed '/inotify cannot be used/d' err > k && mv k err + +compare exp err || fail=1 + +Exit $fail diff --git a/tests/tail-2/follow-stdin b/tests/tail-2/follow-stdin deleted file mode 100755 index ee0d1ae8..00000000 --- a/tests/tail-2/follow-stdin +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# tail -f - would fail with the initial inotify implementation - -# Copyright (C) 2009-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ tail - -echo line > exp || framework_failure_ -echo line > in || framework_failure_ - -timeout 1 tail -f < in > out 2> err - -# tail from coreutils-7.5 would fail -test $? = 124 || fail=1 - -# Ensure there was no error output. -test -s err && fail=1 - -# Ensure there was -compare exp out || fail=1 - -Exit $fail diff --git a/tests/tail-2/follow-stdin.sh b/tests/tail-2/follow-stdin.sh new file mode 100755 index 00000000..b2ccba35 --- /dev/null +++ b/tests/tail-2/follow-stdin.sh @@ -0,0 +1,36 @@ +#!/bin/sh +# tail -f - would fail with the initial inotify implementation + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ tail + +echo line > exp || framework_failure_ +echo line > in || framework_failure_ + +timeout 1 tail -f < in > out 2> err + +# tail from coreutils-7.5 would fail +test $? = 124 || fail=1 + +# Ensure there was no error output. +test -s err && fail=1 + +# Ensure there was +compare exp out || fail=1 + +Exit $fail diff --git a/tests/tail-2/infloop-1 b/tests/tail-2/infloop-1 deleted file mode 100755 index 3f45f774..00000000 --- a/tests/tail-2/infloop-1 +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh -# This test would fail with tail from pre-1.22i textutils. - -# Copyright (C) 1999-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ tail - -yes > t & -yes_pid=$! -while :; do - test -s t && break - sleep .1 -done -tail -n 1 t & -tail_pid=$! -kill $yes_pid - -# This test is racy, and can fail under unusual circumstances. -# On a very busy system, tail will fail to notice that $yes_pid is gone. -# Then the following kill will succeed and cause this test to fail. - -# Wait for up to 3 seconds for tail to detect the death of $yes_pid. -for i in $(seq 30); do - kill -0 $tail_pid || break - echo sleep 0.1s - sleep .1 -done - -kill $tail_pid && fail=1 || : - -Exit $fail diff --git a/tests/tail-2/infloop-1.sh b/tests/tail-2/infloop-1.sh new file mode 100755 index 00000000..a4afb675 --- /dev/null +++ b/tests/tail-2/infloop-1.sh @@ -0,0 +1,45 @@ +#!/bin/sh +# This test would fail with tail from pre-1.22i textutils. + +# Copyright (C) 1999-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ tail + +yes > t & +yes_pid=$! +while :; do + test -s t && break + sleep .1 +done +tail -n 1 t & +tail_pid=$! +kill $yes_pid + +# This test is racy, and can fail under unusual circumstances. +# On a very busy system, tail will fail to notice that $yes_pid is gone. +# Then the following kill will succeed and cause this test to fail. + +# Wait for up to 3 seconds for tail to detect the death of $yes_pid. +for i in $(seq 30); do + kill -0 $tail_pid || break + echo sleep 0.1s + sleep .1 +done + +kill $tail_pid && fail=1 || : + +Exit $fail diff --git a/tests/tail-2/inotify-hash-abuse b/tests/tail-2/inotify-hash-abuse deleted file mode 100755 index deec76d1..00000000 --- a/tests/tail-2/inotify-hash-abuse +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/sh -# Exercise an abort-inducing flaw in inotify-enabled tail -F. - -# Copyright (C) 2009-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ tail - -# 9 is a magic number, related to internal details of tail.c and hash.c -n=9 -seq $n | xargs touch || framework_failure_ - -debug='---disable-inotify' -debug= -tail $debug -s.1 -qF $(seq $n) > out 2>&1 & pid=$! - -check_tail_output() -{ - local delay="$1" - grep "$tail_re" out > /dev/null || - { sleep $delay; return 1; } -} - -# Wait up to 6.3s for tail to start -echo x > $n -tail_re='^x$' retry_delay_ check_tail_output .1 7 || fail=1 - -mv 1 f || fail=1 - -# Wait 6.3s for this diagnostic: -# tail: '1' has become inaccessible: No such file or directory -tail_re='inaccessible' retry_delay_ check_tail_output .1 7 || fail=1 - -# Trigger the bug. Before the fix, this would provoke the abort. -echo a > 1 || fail=1 - -# Wait up to 2s for the buggy tail to die, -# or for the "tail: '1' has appeared; following end of new file" output -for i in $(seq 10); do - kill -0 $pid || break - grep 'has appeared;' out > /dev/null && break - sleep .2 -done - -# Kill the working tail, or fail if it has already aborted -kill $pid || fail=1 - -cat out - -Exit $fail diff --git a/tests/tail-2/inotify-hash-abuse.sh b/tests/tail-2/inotify-hash-abuse.sh new file mode 100755 index 00000000..b9c7f108 --- /dev/null +++ b/tests/tail-2/inotify-hash-abuse.sh @@ -0,0 +1,63 @@ +#!/bin/sh +# Exercise an abort-inducing flaw in inotify-enabled tail -F. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ tail + +# 9 is a magic number, related to internal details of tail.c and hash.c +n=9 +seq $n | xargs touch || framework_failure_ + +debug='---disable-inotify' +debug= +tail $debug -s.1 -qF $(seq $n) > out 2>&1 & pid=$! + +check_tail_output() +{ + local delay="$1" + grep "$tail_re" out > /dev/null || + { sleep $delay; return 1; } +} + +# Wait up to 6.3s for tail to start +echo x > $n +tail_re='^x$' retry_delay_ check_tail_output .1 7 || fail=1 + +mv 1 f || fail=1 + +# Wait 6.3s for this diagnostic: +# tail: '1' has become inaccessible: No such file or directory +tail_re='inaccessible' retry_delay_ check_tail_output .1 7 || fail=1 + +# Trigger the bug. Before the fix, this would provoke the abort. +echo a > 1 || fail=1 + +# Wait up to 2s for the buggy tail to die, +# or for the "tail: '1' has appeared; following end of new file" output +for i in $(seq 10); do + kill -0 $pid || break + grep 'has appeared;' out > /dev/null && break + sleep .2 +done + +# Kill the working tail, or fail if it has already aborted +kill $pid || fail=1 + +cat out + +Exit $fail diff --git a/tests/tail-2/inotify-hash-abuse2 b/tests/tail-2/inotify-hash-abuse2 deleted file mode 100755 index eb192a65..00000000 --- a/tests/tail-2/inotify-hash-abuse2 +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -# Exercise an abort-inducing flaw in inotify-enabled tail -F. -# Like inotify-hash-abuse, but without a hard-coded "9". - -# Copyright (C) 2009-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ tail - -touch f || framework_failure_ - -debug='---disable-inotify -s .001' -debug= -tail $debug -F f & pid=$! -cleanup_() { kill $pid; } - -for i in $(seq 200); do - kill -0 $pid || break; - mv f g - touch f -done - -# Kill the working tail, or fail if it has already aborted -kill $pid || fail=1 - -Exit $fail diff --git a/tests/tail-2/inotify-hash-abuse2.sh b/tests/tail-2/inotify-hash-abuse2.sh new file mode 100755 index 00000000..7dbefdd3 --- /dev/null +++ b/tests/tail-2/inotify-hash-abuse2.sh @@ -0,0 +1,39 @@ +#!/bin/sh +# 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. + +# This 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 + +touch f || framework_failure_ + +debug='---disable-inotify -s .001' +debug= +tail $debug -F f & pid=$! +cleanup_() { kill $pid; } + +for i in $(seq 200); do + kill -0 $pid || break; + mv f g + touch f +done + +# Kill the working tail, or fail if it has already aborted +kill $pid || fail=1 + +Exit $fail diff --git a/tests/tail-2/inotify-race b/tests/tail-2/inotify-race deleted file mode 100755 index ab25f67d..00000000 --- a/tests/tail-2/inotify-race +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/sh -# Ensure that tail does not ignore data that is appended to a tailed-forever -# file between tail's initial read-to-EOF, and when the inotify watches -# are established in tail_forever_inotify. That data could be ignored -# indefinitely if no *other* data is appended, but it would be printed as -# soon as any additional appended data is detected. - -# Copyright (C) 2009-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ tail - -# Don't run this test by default because sometimes it's skipped as noted below. -# Also gdb has a bug in Debian's gdb-6.8-3 at least that causes it to not -# cleanup and exit correctly when it receives a SIGTERM, thus hanging the test. -very_expensive_ - -touch file || framework_failure_ -touch tail.out || framework_failure_ - -( timeout 10s gdb --version ) > gdb.out 2>&1 -case $(cat gdb.out) in - *'GNU gdb'*) ;; - *) skip_ "can't run gdb";; -esac - -# See if gdb works and -# tail_forever_inotify is compiled and not inlined -timeout 10s gdb -nx --batch-silent \ - --eval-command='break tail_forever_inotify' \ - --eval-command='run -f file' \ - --eval-command='quit' \ - tail < /dev/null > gdb.out 2>&1 - -# 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"; } - -# 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='run -f file >> tail.out' \ - --eval-command="shell echo never-seen-with-tail-7.5 >> file" \ - --eval-command='continue' \ - --eval-command='quit' \ - tail < /dev/null > /dev/null 2>&1 & -pid=$! - -tail --pid=$pid -f tail.out | (read; kill $pid) - -test -s tail.out || fail=1 - -Exit $fail diff --git a/tests/tail-2/inotify-race.sh b/tests/tail-2/inotify-race.sh new file mode 100755 index 00000000..cc0f61b3 --- /dev/null +++ b/tests/tail-2/inotify-race.sh @@ -0,0 +1,69 @@ +#!/bin/sh +# Ensure that tail does not ignore data that is appended to a tailed-forever +# file between tail's initial read-to-EOF, and when the inotify watches +# are established in tail_forever_inotify. That data could be ignored +# 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. + +# This 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 + +# Don't run this test by default because sometimes it's skipped as noted below. +# Also gdb has a bug in Debian's gdb-6.8-3 at least that causes it to not +# cleanup and exit correctly when it receives a SIGTERM, thus hanging the test. +very_expensive_ + +touch file || framework_failure_ +touch tail.out || framework_failure_ + +( timeout 10s gdb --version ) > gdb.out 2>&1 +case $(cat gdb.out) in + *'GNU gdb'*) ;; + *) skip_ "can't run gdb";; +esac + +# See if gdb works and +# tail_forever_inotify is compiled and not inlined +timeout 10s gdb -nx --batch-silent \ + --eval-command='break tail_forever_inotify' \ + --eval-command='run -f file' \ + --eval-command='quit' \ + tail < /dev/null > gdb.out 2>&1 + +# 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"; } + +# 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='run -f file >> tail.out' \ + --eval-command="shell echo never-seen-with-tail-7.5 >> file" \ + --eval-command='continue' \ + --eval-command='quit' \ + tail < /dev/null > /dev/null 2>&1 & +pid=$! + +tail --pid=$pid -f tail.out | (read; kill $pid) + +test -s tail.out || fail=1 + +Exit $fail diff --git a/tests/tail-2/inotify-rotate b/tests/tail-2/inotify-rotate deleted file mode 100755 index 311633a8..00000000 --- a/tests/tail-2/inotify-rotate +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/sh -# ensure that tail -F handles rotation - -# Copyright (C) 2009-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 -# 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/>. - -if test "$VERBOSE" = yes; then - set -x - tail --version -fi - -. "${srcdir=.}/init.sh"; path_prepend_ ../src -expensive_ - -# Wait several seconds for grep REGEXP FILE to succeed. -# Usage: grep_timeout REGEXP FILE -grep_timeout() -{ - local j - for j in $(seq 150); do - grep $1 $2 > /dev/null && return 0 - sleep 0.1 - done - return 1 -} - -# For details, see -# http://lists.gnu.org/archive/html/bug-coreutils/2009-11/msg00213.html - -# Perform at least this many iterations, because on multi-core systems -# the offending sequence of events can be surprisingly uncommon. -for i in $(seq 50); do - echo $i - rm -rf k x out - # 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 && timeout 40 tail -F k > out 2>&1 & - pid=$! - sleep .1 - echo b > k; - # wait for b to appear in out - grep_timeout b out || fail_ failed to find b in out - while :; do grep b out > /dev/null && break; done - mv x k - # wait for tail to detect the rename - grep_timeout tail: out || { cat out; fail_ failed to detect rename; } - echo ok >> k - found=0 - # wait up to 10 seconds for "ok" to appear in out - grep_timeout ok out && found=1 - kill $pid - test $found = 0 && { cat out; fail_ failed to detect echoed '"ok"'; } -done - -Exit $fail diff --git a/tests/tail-2/inotify-rotate.sh b/tests/tail-2/inotify-rotate.sh new file mode 100755 index 00000000..4a16202d --- /dev/null +++ b/tests/tail-2/inotify-rotate.sh @@ -0,0 +1,70 @@ +#!/bin/sh +# ensure that tail -F handles rotation + +# 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/>. + +if test "$VERBOSE" = yes; then + set -x + tail --version +fi + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +expensive_ + +# Wait several seconds for grep REGEXP FILE to succeed. +# Usage: grep_timeout REGEXP FILE +grep_timeout() +{ + local j + for j in $(seq 150); do + grep $1 $2 > /dev/null && return 0 + sleep 0.1 + done + return 1 +} + +# For details, see +# http://lists.gnu.org/archive/html/bug-coreutils/2009-11/msg00213.html + +# Perform at least this many iterations, because on multi-core systems +# the offending sequence of events can be surprisingly uncommon. +for i in $(seq 50); do + echo $i + rm -rf k x out + # 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 + timeout 40 tail -F k > out 2>&1 & + pid=$! + sleep .1 + echo b > k; + # wait for b to appear in out + grep_timeout b out || fail_ failed to find b in out + while :; do grep b out > /dev/null && break; done + mv x k + # wait for tail to detect the rename + grep_timeout tail: out || { cat out; fail_ failed to detect rename; } + echo ok >> k + found=0 + # wait up to 10 seconds for "ok" to appear in out + grep_timeout ok out && found=1 + kill $pid + test $found = 0 && { cat out; fail_ failed to detect echoed '"ok"'; } +done + +wait +Exit $fail diff --git a/tests/tail-2/pid b/tests/tail-2/pid deleted file mode 100755 index 0a26f8d3..00000000 --- a/tests/tail-2/pid +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/sh -# Test the --pid option of tail. - -# Copyright (C) 2003-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ tail -getlimits_ - -touch empty here || framework_failure_ - - -for inotify in ---disable-inotify ''; do - # Use tail itself to create a background process to monitor, - # which will auto exit when "here" is removed. - tail -f $inotify here & - bg_pid=$! - - # Ensure that tail --pid=PID does not exit when PID is alive. - timeout 1 tail -f -s.1 --pid=$bg_pid $inotify here - test $? = 124 || fail=1 - - # Cleanup background process - kill $bg_pid - - # Ensure that tail --pid=PID exits with success status when PID is dead. - # Use an unlikely-to-be-live PID - timeout 10 tail -f -s.1 --pid=$PID_T_MAX $inotify empty - ret=$? - test $ret = 124 && skip_ "pid $PID_T_MAX present or tail too slow" - test $ret = 0 || fail=1 - - # Ensure tail doesn't wait for data when PID is dead - timeout 10 tail -f -s10 --pid=$PID_T_MAX $inotify empty - test $? = 124 && fail=1 -done - -Exit $fail diff --git a/tests/tail-2/pid.sh b/tests/tail-2/pid.sh new file mode 100755 index 00000000..19e6a18b --- /dev/null +++ b/tests/tail-2/pid.sh @@ -0,0 +1,51 @@ +#!/bin/sh +# Test the --pid option of tail. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ tail +getlimits_ + +touch empty here || framework_failure_ + + +for inotify in ---disable-inotify ''; do + # Use tail itself to create a background process to monitor, + # which will auto exit when "here" is removed. + tail -f $inotify here & + bg_pid=$! + + # Ensure that tail --pid=PID does not exit when PID is alive. + timeout 1 tail -f -s.1 --pid=$bg_pid $inotify here + test $? = 124 || fail=1 + + # Cleanup background process + kill $bg_pid + + # Ensure that tail --pid=PID exits with success status when PID is dead. + # Use an unlikely-to-be-live PID + timeout 10 tail -f -s.1 --pid=$PID_T_MAX $inotify empty + ret=$? + test $ret = 124 && skip_ "pid $PID_T_MAX present or tail too slow" + test $ret = 0 || fail=1 + + # Ensure tail doesn't wait for data when PID is dead + timeout 10 tail -f -s10 --pid=$PID_T_MAX $inotify empty + test $? = 124 && fail=1 +done + +Exit $fail diff --git a/tests/tail-2/pipe-f b/tests/tail-2/pipe-f deleted file mode 100755 index e3d8a70b..00000000 --- a/tests/tail-2/pipe-f +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -# ensure that :|tail -f doesn't hang, per POSIX - -# Copyright (C) 2009-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ tail - -echo foo | timeout 10 tail -f -c3 > out || fail=1 -echo oo > exp || fail=1 - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/tail-2/pipe-f.sh b/tests/tail-2/pipe-f.sh new file mode 100755 index 00000000..e0cf3c6d --- /dev/null +++ b/tests/tail-2/pipe-f.sh @@ -0,0 +1,27 @@ +#!/bin/sh +# ensure that :|tail -f doesn't hang, per POSIX + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ tail + +echo foo | timeout 10 tail -f -c3 > out || fail=1 +echo oo > exp || fail=1 + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/tail-2/pipe-f2 b/tests/tail-2/pipe-f2 deleted file mode 100755 index fffd43a1..00000000 --- a/tests/tail-2/pipe-f2 +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -# Ensure that "tail -f fifo" tails indefinitely. - -# Copyright (C) 2009-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ tail - -mkfifo_or_skip_ fifo - -echo 1 > fifo & -echo 1 > exp || framework_failure_ - -timeout 10 tail -f fifo > out & pid=$! - -check_tail_output() -{ - local n_sec="$1" - test -s out || { sleep $n_sec; return 1; } -} - -# Wait 6.3s for tail to write something. -retry_delay_ check_tail_output .1 7 || fail=1 - -compare exp out || fail=1 - -# Kill the still-running tail, or fail if it's gone. -kill $pid || fail=1 - -Exit $fail diff --git a/tests/tail-2/pipe-f2.sh b/tests/tail-2/pipe-f2.sh new file mode 100755 index 00000000..63091e39 --- /dev/null +++ b/tests/tail-2/pipe-f2.sh @@ -0,0 +1,43 @@ +#!/bin/sh +# Ensure that "tail -f fifo" tails indefinitely. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ tail + +mkfifo_or_skip_ fifo + +echo 1 > fifo & +echo 1 > exp || framework_failure_ + +timeout 10 tail -f fifo > out & pid=$! + +check_tail_output() +{ + local n_sec="$1" + test -s out || { sleep $n_sec; return 1; } +} + +# Wait 6.3s for tail to write something. +retry_delay_ check_tail_output .1 7 || fail=1 + +compare exp out || fail=1 + +# Kill the still-running tail, or fail if it's gone. +kill $pid || fail=1 + +Exit $fail diff --git a/tests/tail-2/proc-ksyms b/tests/tail-2/proc-ksyms deleted file mode 100755 index ad446d35..00000000 --- a/tests/tail-2/proc-ksyms +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# Prior to textutils-2.0.17, 'tail /proc/ksyms' would segfault on Linux. - -# Copyright (C) 2001-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ tail - - -ksyms=/proc/ksyms -if test -r $ksyms; then - tail $ksyms > /dev/null || fail=1 -fi - -Exit $fail diff --git a/tests/tail-2/proc-ksyms.sh b/tests/tail-2/proc-ksyms.sh new file mode 100755 index 00000000..243bb9b9 --- /dev/null +++ b/tests/tail-2/proc-ksyms.sh @@ -0,0 +1,28 @@ +#!/bin/sh +# Prior to textutils-2.0.17, 'tail /proc/ksyms' would segfault on Linux. + +# Copyright (C) 2001-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ tail + + +ksyms=/proc/ksyms +if test -r $ksyms; then + tail $ksyms > /dev/null || fail=1 +fi + +Exit $fail diff --git a/tests/tail-2/start-middle b/tests/tail-2/start-middle deleted file mode 100755 index 5b40de45..00000000 --- a/tests/tail-2/start-middle +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -# 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-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ tail - -(echo 1; echo 2) > k || framework_failure_ - - -sh -c 'read x; tail' < k > out || fail=1 -cat <<EOF > exp -2 -EOF - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/tail-2/start-middle.sh b/tests/tail-2/start-middle.sh new file mode 100755 index 00000000..67d5b1a9 --- /dev/null +++ b/tests/tail-2/start-middle.sh @@ -0,0 +1,33 @@ +#!/bin/sh +# 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. + +# This 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 + +(echo 1; echo 2) > k || framework_failure_ + + +sh -c 'read x; tail' < k > out || fail=1 +cat <<EOF > exp +2 +EOF + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/tail-2/tail-n0f b/tests/tail-2/tail-n0f deleted file mode 100755 index 2b2147a7..00000000 --- a/tests/tail-2/tail-n0f +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh -# Make sure that 'tail -n0 -f' and 'tail -c0 -f' sleep -# rather than doing what amounted to a busy-wait. - -# Copyright (C) 2003-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 -# 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 bug was fixed for 5.0.91 -# It skips the test if your system lacks a /proc/$pid/status -# file, or if its contents don't look right. - -. "${srcdir=.}/init.sh"; path_prepend_ ../src -print_ver_ tail - -require_proc_pid_status_ - -touch empty || framework_failure_ -echo anything > nonempty || framework_failure_ - - -for inotify in ---disable-inotify ''; do - for file in empty nonempty; do - for c_or_n in c n; do - tail --sleep=4 -${c_or_n} 0 -f $inotify $file & - pid=$! - tail_sleeping() - { - local delay="$1"; sleep $delay - state=$(get_process_status_ $pid) - case $state in - S*) ;; - *) return 1;; - esac - } - # Wait up to 1.5s for tail to sleep - retry_delay_ tail_sleeping .1 4 || - { echo $0: process in unexpected state: $state >&2; fail=1; } - kill $pid - done - done -done - -Exit $fail diff --git a/tests/tail-2/tail-n0f.sh b/tests/tail-2/tail-n0f.sh new file mode 100755 index 00000000..a8d37597 --- /dev/null +++ b/tests/tail-2/tail-n0f.sh @@ -0,0 +1,55 @@ +#!/bin/sh +# 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. + +# This 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 bug was fixed for 5.0.91 +# It skips the test if your system lacks a /proc/$pid/status +# file, or if its contents don't look right. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ tail + +require_proc_pid_status_ + +touch empty || framework_failure_ +echo anything > nonempty || framework_failure_ + + +for inotify in ---disable-inotify ''; do + for file in empty nonempty; do + for c_or_n in c n; do + tail --sleep=4 -${c_or_n} 0 -f $inotify $file & + pid=$! + tail_sleeping() + { + local delay="$1"; sleep $delay + state=$(get_process_status_ $pid) + case $state in + S*) ;; + *) return 1;; + esac + } + # Wait up to 1.5s for tail to sleep + retry_delay_ tail_sleeping .1 4 || + { echo $0: process in unexpected state: $state >&2; fail=1; } + kill $pid + done + done +done + +Exit $fail diff --git a/tests/tail-2/wait b/tests/tail-2/wait deleted file mode 100755 index 587b4495..00000000 --- a/tests/tail-2/wait +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/sh -# Make sure that 'tail -f' returns immediately if a file doesn't exist -# while 'tail -F' waits for it to appear. - -# Copyright (C) 2003-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ tail - -touch here || framework_failure_ -{ touch unreadable && chmod a-r unreadable; } || framework_failure_ - - -for inotify in ---disable-inotify ''; do - timeout 10 tail -s0.1 -f $inotify not_here - test $? = 124 && fail=1 - - if test ! -r unreadable; then # can't test this when root - timeout 10 tail -s0.1 -f $inotify unreadable - test $? = 124 && fail=1 - fi - - timeout 1 tail -s0.1 -f $inotify here 2>tail.err - test $? = 124 || fail=1 - - # 'tail -F' must wait in any case. - - timeout 1 tail -s0.1 -F $inotify here 2>>tail.err - test $? = 124 || fail=1 - - if test ! -r unreadable; then # can't test this when root - timeout 1 tail -s0.1 -F $inotify unreadable - test $? = 124 || fail=1 - fi - - timeout 1 tail -s0.1 -F $inotify not_here - test $? = 124 || fail=1 - - grep -Ev 'inotify (resources exhausted|cannot be used)' tail.err > x - mv x tail.err - test -s tail.err && fail=1 - :>tail.err - - tail_F() - { - local delay="$1" - - touch k || framework_failure_ - tail -s.1 --max-unchanged-stats=2 -F $inotify k > tail.out & - pid=$! - sleep $delay - mv k l - sleep $delay - touch k - mv k l - sleep $delay - echo NO >> l - sleep $delay - kill $pid - rm -f k l - - test ! -s tail.out - } - retry_delay_ tail_F .1 4 || fail=1 -done - -Exit $fail diff --git a/tests/tail-2/wait.sh b/tests/tail-2/wait.sh new file mode 100755 index 00000000..529b9459 --- /dev/null +++ b/tests/tail-2/wait.sh @@ -0,0 +1,80 @@ +#!/bin/sh +# 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. + +# This 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 + +touch here || framework_failure_ +{ touch unreadable && chmod a-r unreadable; } || framework_failure_ + + +for inotify in ---disable-inotify ''; do + timeout 10 tail -s0.1 -f $inotify not_here + test $? = 124 && fail=1 + + if test ! -r unreadable; then # can't test this when root + timeout 10 tail -s0.1 -f $inotify unreadable + test $? = 124 && fail=1 + fi + + timeout 1 tail -s0.1 -f $inotify here 2>tail.err + test $? = 124 || fail=1 + + # 'tail -F' must wait in any case. + + timeout 1 tail -s0.1 -F $inotify here 2>>tail.err + test $? = 124 || fail=1 + + if test ! -r unreadable; then # can't test this when root + timeout 1 tail -s0.1 -F $inotify unreadable + test $? = 124 || fail=1 + fi + + timeout 1 tail -s0.1 -F $inotify not_here + test $? = 124 || fail=1 + + grep -Ev 'inotify (resources exhausted|cannot be used)' tail.err > x + mv x tail.err + test -s tail.err && fail=1 + :>tail.err + + tail_F() + { + local delay="$1" + + touch k || framework_failure_ + tail -s.1 --max-unchanged-stats=2 -F $inotify k > tail.out & + pid=$! + sleep $delay + mv k l + sleep $delay + touch k + mv k l + sleep $delay + echo NO >> l + sleep $delay + kill $pid + rm -f k l + + test ! -s tail.out + } + retry_delay_ tail_F .1 4 || fail=1 +done + +Exit $fail diff --git a/tests/touch/60-seconds b/tests/touch/60-seconds deleted file mode 100755 index 915a1d05..00000000 --- a/tests/touch/60-seconds +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -# touch -t would mistakenly reject a time specifying "60" seconds - -# Copyright (C) 2009-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ touch - -echo 60.000000000 > exp || framework_failure_ - - -# Before coreutils-7.7, this would fail, complaining of -# an 'invalid date format'. Specifying 60 seconds *is* valid. -TZ=UTC0 touch -t 197001010000.60 f || fail=1 - -stat --p='%.9Y\n' f > out || fail=1 - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/touch/60-seconds.sh b/tests/touch/60-seconds.sh new file mode 100755 index 00000000..3f90fbb2 --- /dev/null +++ b/tests/touch/60-seconds.sh @@ -0,0 +1,33 @@ +#!/bin/sh +# touch -t would mistakenly reject a time specifying "60" seconds + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ touch + +echo 60.000000000 > exp || framework_failure_ + + +# Before coreutils-7.7, this would fail, complaining of +# an 'invalid date format'. Specifying 60 seconds *is* valid. +TZ=UTC0 touch -t 197001010000.60 f || fail=1 + +stat --p='%.9Y\n' f > out || fail=1 + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/touch/dangling-symlink b/tests/touch/dangling-symlink deleted file mode 100755 index 1eb2ed38..00000000 --- a/tests/touch/dangling-symlink +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -# 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-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ touch - -rm -f touch-target t-symlink -ln -s touch-target t-symlink - -# This used to infloop. -touch t-symlink || fail=1 - -test -f touch-target || fail=1 -rm -f touch-target t-symlink - -if test $fail = 1; then - case $host_triplet in - *linux-gnu*) - case "$(uname -r)" in - 2.3.9[0-9]*) - skip_ \ -'**************************************************** -WARNING!!! -This version of the Linux kernel causes touch to fail -when operating on dangling symlinks. -****************************************************' - ;; - esac - ;; - esac -fi - -Exit $fail diff --git a/tests/touch/dangling-symlink.sh b/tests/touch/dangling-symlink.sh new file mode 100755 index 00000000..0d63edba --- /dev/null +++ b/tests/touch/dangling-symlink.sh @@ -0,0 +1,49 @@ +#!/bin/sh +# 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. + +# This 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_ touch + +rm -f touch-target t-symlink +ln -s touch-target t-symlink + +# This used to infloop. +touch t-symlink || fail=1 + +test -f touch-target || fail=1 +rm -f touch-target t-symlink + +if test $fail = 1; then + case $host_triplet in + *linux-gnu*) + case "$(uname -r)" in + 2.3.9[0-9]*) + skip_ \ +'**************************************************** +WARNING!!! +This version of the Linux kernel causes touch to fail +when operating on dangling symlinks. +****************************************************' + ;; + esac + ;; + esac +fi + +Exit $fail diff --git a/tests/touch/dir-1 b/tests/touch/dir-1 deleted file mode 100755 index b4c04fe4..00000000 --- a/tests/touch/dir-1 +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -# Make sure touch can operate on a directory. -# This was broken in the 4.0[efg] test releases. - -. "${srcdir=.}/init.sh"; path_prepend_ ../src -print_ver_ touch - -touch . || fail=1 -Exit $fail diff --git a/tests/touch/dir-1.sh b/tests/touch/dir-1.sh new file mode 100755 index 00000000..cb0e1727 --- /dev/null +++ b/tests/touch/dir-1.sh @@ -0,0 +1,9 @@ +#!/bin/sh +# Make sure touch can operate on a directory. +# This was broken in the 4.0[efg] test releases. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ touch + +touch . || fail=1 +Exit $fail diff --git a/tests/touch/empty-file b/tests/touch/empty-file deleted file mode 100755 index a150bd58..00000000 --- a/tests/touch/empty-file +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/sh -# Make sure touch can set the mtime on an empty file. - -# Copyright (C) 1998-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 -# 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/>. - - -# Volker Borchert reported that touch 3.16r (and presumably all before that) -# fails to work on SunOS 4.1.3 with 'most of the recommended patches' when -# the empty file is on an NFS-mounted 4.2 volume. - -. "${srcdir=.}/init.sh"; path_prepend_ ../src -print_ver_ touch - -DEFAULT_SLEEP_SECONDS=2 -SLEEP_SECONDS=${SLEEP_SECONDS=$DEFAULT_SLEEP_SECONDS} - - -# FIXME: find writable directories on other partitions -# and run the test in those directories, too. - -: ${TOUCH_DIR_LIST=.} - - -for d in $TOUCH_DIR_LIST; do - rm -rf $d/a $d/b $d/c - > $d/a || framework_failure_ - test -f $d/a || framework_failure_ - > $d/b || framework_failure_ - test -f $d/b || framework_failure_ - > $d/c || framework_failure_ - test -f $d/c || framework_failure_ -done - -echo sleeping for $SLEEP_SECONDS seconds... -sleep $SLEEP_SECONDS -for d in $TOUCH_DIR_LIST; do - touch $d/a || fail=1 - set x $(ls -t $d/a $d/b) - test "$*" = "x $d/a $d/b" || fail=1 -done - -echo sleeping for $SLEEP_SECONDS seconds... -sleep $SLEEP_SECONDS -for d in $TOUCH_DIR_LIST; do - touch $d/b - set x $(ls -t $d/a $d/b) - test "$*" = "x $d/b $d/a" || fail=1 - - if touch - 1< $d/c 2> /dev/null; then - set x $(ls -t $d/a $d/c) - test "$*" = "x $d/c $d/a" || fail=1 - fi - - rm -rf $d/a $d/b $d/c -done - -if test $fail != 0; then - cat 1>&2 <<EOF -*** This test has just failed. That can happen when the test is run in an -*** NFS-mounted directory on a system whose clock is not well synchronized -*** with that of the NFS server. If you think that is the reason, set the -*** environment variable SLEEP_SECONDS to some number of seconds larger than -*** the default of $DEFAULT_SLEEP_SECONDS and rerun the test. -EOF -fi - -Exit $fail diff --git a/tests/touch/empty-file.sh b/tests/touch/empty-file.sh new file mode 100755 index 00000000..6a654839 --- /dev/null +++ b/tests/touch/empty-file.sh @@ -0,0 +1,80 @@ +#!/bin/sh +# Make sure touch can set the mtime on an empty file. + +# Copyright (C) 1998-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/>. + + +# Volker Borchert reported that touch 3.16r (and presumably all before that) +# fails to work on SunOS 4.1.3 with 'most of the recommended patches' when +# the empty file is on an NFS-mounted 4.2 volume. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ touch + +DEFAULT_SLEEP_SECONDS=2 +SLEEP_SECONDS=${SLEEP_SECONDS=$DEFAULT_SLEEP_SECONDS} + + +# FIXME: find writable directories on other partitions +# and run the test in those directories, too. + +: ${TOUCH_DIR_LIST=.} + + +for d in $TOUCH_DIR_LIST; do + rm -rf $d/a $d/b $d/c + > $d/a || framework_failure_ + test -f $d/a || framework_failure_ + > $d/b || framework_failure_ + test -f $d/b || framework_failure_ + > $d/c || framework_failure_ + test -f $d/c || framework_failure_ +done + +echo sleeping for $SLEEP_SECONDS seconds... +sleep $SLEEP_SECONDS +for d in $TOUCH_DIR_LIST; do + touch $d/a || fail=1 + set x $(ls -t $d/a $d/b) + test "$*" = "x $d/a $d/b" || fail=1 +done + +echo sleeping for $SLEEP_SECONDS seconds... +sleep $SLEEP_SECONDS +for d in $TOUCH_DIR_LIST; do + touch $d/b + set x $(ls -t $d/a $d/b) + test "$*" = "x $d/b $d/a" || fail=1 + + if touch - 1< $d/c 2> /dev/null; then + set x $(ls -t $d/a $d/c) + test "$*" = "x $d/c $d/a" || fail=1 + fi + + rm -rf $d/a $d/b $d/c +done + +if test $fail != 0; then + cat 1>&2 <<EOF +*** This test has just failed. That can happen when the test is run in an +*** NFS-mounted directory on a system whose clock is not well synchronized +*** with that of the NFS server. If you think that is the reason, set the +*** environment variable SLEEP_SECONDS to some number of seconds larger than +*** the default of $DEFAULT_SLEEP_SECONDS and rerun the test. +EOF +fi + +Exit $fail diff --git a/tests/touch/fail-diag b/tests/touch/fail-diag deleted file mode 100755 index b74d2a5b..00000000 --- a/tests/touch/fail-diag +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# make sure touch gives reasonable diagnostics - -# Copyright (C) 2001-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ touch -skip_if_root_ - -file=/no-such-dir/file - -touch $file > out 2>&1 && fail=1 -cat <<EOF > exp -touch: cannot touch '$file': No such file or directory -EOF - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/touch/fail-diag.sh b/tests/touch/fail-diag.sh new file mode 100755 index 00000000..0be1b6e5 --- /dev/null +++ b/tests/touch/fail-diag.sh @@ -0,0 +1,32 @@ +#!/bin/sh +# make sure touch gives reasonable diagnostics + +# Copyright (C) 2001-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ touch +skip_if_root_ + +file=/no-such-dir/file + +touch $file > out 2>&1 && fail=1 +cat <<EOF > exp +touch: cannot touch '$file': No such file or directory +EOF + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/touch/fifo b/tests/touch/fifo deleted file mode 100755 index 65f4328c..00000000 --- a/tests/touch/fifo +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -# Make sure touch works on fifos without hanging. - -# Copyright (C) 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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ touch - -mkfifo_or_skip_ fifo - - -touch fifo || fail=1 - -Exit $fail diff --git a/tests/touch/fifo.sh b/tests/touch/fifo.sh new file mode 100755 index 00000000..a67637f5 --- /dev/null +++ b/tests/touch/fifo.sh @@ -0,0 +1,27 @@ +#!/bin/sh +# Make sure touch works on fifos without hanging. + +# Copyright (C) 2000-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ touch + +mkfifo_or_skip_ fifo + + +touch fifo || fail=1 + +Exit $fail diff --git a/tests/touch/no-create-missing b/tests/touch/no-create-missing deleted file mode 100755 index 88a079a0..00000000 --- a/tests/touch/no-create-missing +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -# Ensure that touch -c no-such-file no longer fails (it did in 4.1.8). - -# Copyright (C) 2002-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ touch - - -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 - touch -c - >&- 2> /dev/null || fail=1 - touch -cm - >&- 2> /dev/null || fail=1 - touch -ca - >&- 2> /dev/null || fail=1 -fi - -Exit $fail diff --git a/tests/touch/no-create-missing.sh b/tests/touch/no-create-missing.sh new file mode 100755 index 00000000..fe60282c --- /dev/null +++ b/tests/touch/no-create-missing.sh @@ -0,0 +1,39 @@ +#!/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. + +# This 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_ touch + + +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 + touch -c - >&- 2> /dev/null || fail=1 + touch -cm - >&- 2> /dev/null || fail=1 + touch -ca - >&- 2> /dev/null || fail=1 +fi + +Exit $fail diff --git a/tests/touch/no-dereference b/tests/touch/no-dereference deleted file mode 100755 index aee9a5cf..00000000 --- a/tests/touch/no-dereference +++ /dev/null @@ -1,84 +0,0 @@ -#!/bin/sh -# Ensure that touch -h works. - -# Copyright (C) 2009-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ touch - -ln -s nowhere dangling || framework_failure_ -touch file || framework_failure_ -ln -s file link || framework_failure_ - - -# These first tests should work on every platform. -# -h does not create files, but it warns. Use -c to silence warning. -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 - -# -h works on regular files -touch -h file || fail=1 - -# -h coupled with -r uses timestamp of the symlink, not the referent. -touch -h -r dangling file || fail=1 -test -f nowhere && fail=1 - -# The remaining tests of -h require kernel support for changing symlink times. -grep '^#define HAVE_UTIMENSAT 1' "$CONFIG_HEADER" > /dev/null || -grep '^#define HAVE_LUTIMES 1' "$CONFIG_HEADER" > /dev/null || - skip_ 'this system lacks the utimensat function' - -# Changing time of dangling symlink is okay. -# Skip the test if this fails, but the error text corresponds to -# ENOSYS (possible with old kernel but new glibc). -touch -h dangling 2> err -case $? in - 0) test -f nowhere && fail=1 - test -s err && fail=1;; - 1) grep 'Function not implemented' err \ - && skip_ 'this system lacks the utimensat function' - fail=1;; - *) fail=1;; -esac - -# Change the mtime of a symlink. -touch -m -h -d 2009-10-10 link || fail=1 -case $(stat --format=%y link) in - 2009-10-10*) ;; - *) fail=1 ;; -esac -case $(stat --format=%y file) in - 2009-10-10*) fail=1;; -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 - touch -h - >&- && fail=1 - touch -h -c - >&- || fail=1 -fi - -Exit $fail diff --git a/tests/touch/no-dereference.sh b/tests/touch/no-dereference.sh new file mode 100755 index 00000000..c7697782 --- /dev/null +++ b/tests/touch/no-dereference.sh @@ -0,0 +1,84 @@ +#!/bin/sh +# Ensure that touch -h works. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ touch + +ln -s nowhere dangling || framework_failure_ +touch file || framework_failure_ +ln -s file link || framework_failure_ + + +# These first tests should work on every platform. +# -h does not create files, but it warns. Use -c to silence warning. +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 + +# -h works on regular files +touch -h file || fail=1 + +# -h coupled with -r uses timestamp of the symlink, not the referent. +touch -h -r dangling file || fail=1 +test -f nowhere && fail=1 + +# The remaining tests of -h require kernel support for changing symlink times. +grep '^#define HAVE_UTIMENSAT 1' "$CONFIG_HEADER" > /dev/null || +grep '^#define HAVE_LUTIMES 1' "$CONFIG_HEADER" > /dev/null || + skip_ 'this system lacks the utimensat function' + +# Changing time of dangling symlink is okay. +# Skip the test if this fails, but the error text corresponds to +# ENOSYS (possible with old kernel but new glibc). +touch -h dangling 2> err +case $? in + 0) test -f nowhere && fail=1 + test -s err && fail=1;; + 1) grep 'Function not implemented' err \ + && skip_ 'this system lacks the utimensat function' + fail=1;; + *) fail=1;; +esac + +# Change the mtime of a symlink. +touch -m -h -d 2009-10-10 link || fail=1 +case $(stat --format=%y link) in + 2009-10-10*) ;; + *) fail=1 ;; +esac +case $(stat --format=%y file) in + 2009-10-10*) fail=1;; +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 + touch -h - >&- && fail=1 + touch -h -c - >&- || fail=1 +fi + +Exit $fail diff --git a/tests/touch/no-rights b/tests/touch/no-rights deleted file mode 100755 index abebc526..00000000 --- a/tests/touch/no-rights +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -# Make sure touch can update the times on a file that is neither -# readable nor writable. - -# Copyright (C) 1999-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ touch - -# Make sure t2 is newer than t1. -touch -d '2000-01-01 00:00' t1 || framework_failure_ -touch -d '2000-01-02 00:00' t2 || framework_failure_ - -set x $(ls -t t1 t2) -test "$*" = "x t2 t1" || framework_failure_ - - -chmod 0 t1 -touch -d '2000-01-03 00:00' -c t1 || fail=1 - -set x $(ls -t t1 t2) -test "$*" = "x t1 t2" || fail=1 - -# Also test the combination of --no-create and -a. -touch -a --no-create t1 || fail=1 - -Exit $fail diff --git a/tests/touch/no-rights.sh b/tests/touch/no-rights.sh new file mode 100755 index 00000000..135810cb --- /dev/null +++ b/tests/touch/no-rights.sh @@ -0,0 +1,40 @@ +#!/bin/sh +# Make sure touch can update the times on a file that is neither +# readable nor writable. + +# Copyright (C) 1999-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ touch + +# Make sure t2 is newer than t1. +touch -d '2000-01-01 00:00' t1 || framework_failure_ +touch -d '2000-01-02 00:00' t2 || framework_failure_ + +set x $(ls -t t1 t2) +test "$*" = "x t2 t1" || framework_failure_ + + +chmod 0 t1 +touch -d '2000-01-03 00:00' -c t1 || fail=1 + +set x $(ls -t t1 t2) +test "$*" = "x t1 t2" || fail=1 + +# Also test the combination of --no-create and -a. +touch -a --no-create t1 || fail=1 + +Exit $fail diff --git a/tests/touch/not-owner b/tests/touch/not-owner deleted file mode 100755 index 63b8af24..00000000 --- a/tests/touch/not-owner +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh -# Make sure that touch gives reasonable diagnostics when applied -# to an unwritable directory owned by some other user. - -# Copyright (C) 2003-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ touch - -if env -- test -w /; then - skip_ you have write access to /. -fi - -if env -- test -O / || env -- test -G /; then - skip_ "you own /." -fi - -skip_if_root_ - - -# Before fileutils-4.1, we'd get the following misleading -# diagnostic instead of '...: Permission denied'. -# touch: creating '/': Is a directory -touch / > out 2>&1 && fail=1 - -# On SunOS4, EPERM is 'Not owner'. -# On some *BSD systems it's 'Operation not permitted'. -# On a system where root file system is mounted read-only -# it's 'Read-only file system'. -for msg in 'Not owner' 'Operation not permitted' 'Permission denied' \ - 'Read-only file system'; do - cat > exp <<EOF -touch: setting times of '/': $msg -EOF - - cmp out exp > /dev/null 2>&1 && { match=1; break; } -done -test "$match" = 1 || fail=1 - -test $fail = 1 && compare exp out - -Exit $fail diff --git a/tests/touch/not-owner.sh b/tests/touch/not-owner.sh new file mode 100755 index 00000000..a111ef3a --- /dev/null +++ b/tests/touch/not-owner.sh @@ -0,0 +1,55 @@ +#!/bin/sh +# 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. + +# This 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_ touch + +if env -- test -w /; then + skip_ you have write access to /. +fi + +if env -- test -O / || env -- test -G /; then + skip_ "you own /." +fi + +skip_if_root_ + + +# Before fileutils-4.1, we'd get the following misleading +# diagnostic instead of '...: Permission denied'. +# touch: creating '/': Is a directory +touch / > out 2>&1 && fail=1 + +# On SunOS4, EPERM is 'Not owner'. +# On some *BSD systems it's 'Operation not permitted'. +# On a system where root file system is mounted read-only +# it's 'Read-only file system'. +for msg in 'Not owner' 'Operation not permitted' 'Permission denied' \ + 'Read-only file system'; do + cat > exp <<EOF +touch: setting times of '/': $msg +EOF + + cmp out exp > /dev/null 2>&1 && { match=1; break; } +done +test "$match" = 1 || fail=1 + +test $fail = 1 && compare exp out + +Exit $fail diff --git a/tests/touch/now-owned-by-other b/tests/touch/now-owned-by-other deleted file mode 100755 index 3da8d35f..00000000 --- a/tests/touch/now-owned-by-other +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# Demonstrate that "touch -d now writable-but-owned-by-other" works. - -# Copyright (C) 2008-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 -# 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=.}/init.sh"; path_prepend_ ../src -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_ -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 - -Exit $fail diff --git a/tests/touch/now-owned-by-other.sh b/tests/touch/now-owned-by-other.sh new file mode 100755 index 00000000..4c88fc94 --- /dev/null +++ b/tests/touch/now-owned-by-other.sh @@ -0,0 +1,35 @@ +#!/bin/sh +# Demonstrate that "touch -d now writable-but-owned-by-other" works. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +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_ +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 + +Exit $fail diff --git a/tests/touch/obsolescent b/tests/touch/obsolescent deleted file mode 100755 index d403127b..00000000 --- a/tests/touch/obsolescent +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh -# Test touch with obsolescent 8- or 10-digit time stamps. - -# Copyright (C) 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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ touch - -_POSIX2_VERSION=199209; export _POSIX2_VERSION -POSIXLY_CORRECT=1; export POSIXLY_CORRECT - - -yearstart=01010000 - -for ones in 11111111 1111111111; do - for args in $ones "-- $ones" "$yearstart $ones" "-- $yearstart $ones"; do - touch $args || fail=1 - test -f $ones || fail=1 - test -f $yearstart && fail=1 - rm -f $ones || fail=1 - done -done - -y2000=0101000000 -rm -f $y2000 file || fail=1 -touch $y2000 file && test -f $y2000 && test -f file || fail=1 - -Exit $fail diff --git a/tests/touch/obsolescent.sh b/tests/touch/obsolescent.sh new file mode 100755 index 00000000..3f1d9b0f --- /dev/null +++ b/tests/touch/obsolescent.sh @@ -0,0 +1,41 @@ +#!/bin/sh +# Test touch with obsolescent 8- or 10-digit time stamps. + +# Copyright (C) 2000-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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ touch + +_POSIX2_VERSION=199209; export _POSIX2_VERSION +POSIXLY_CORRECT=1; export POSIXLY_CORRECT + + +yearstart=01010000 + +for ones in 11111111 1111111111; do + for args in $ones "-- $ones" "$yearstart $ones" "-- $yearstart $ones"; do + touch $args || fail=1 + test -f $ones || fail=1 + test -f $yearstart && fail=1 + rm -f $ones || fail=1 + done +done + +y2000=0101000000 +rm -f $y2000 file || fail=1 +touch $y2000 file && test -f $y2000 && test -f file || fail=1 + +Exit $fail diff --git a/tests/touch/read-only b/tests/touch/read-only deleted file mode 100755 index ee8c1d3b..00000000 --- a/tests/touch/read-only +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# ensure that touch can operate on read-only files - -# Copyright (C) 2005-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ touch -skip_if_root_ - -: > read-only || framework_failure_ -chmod 444 read-only || framework_failure_ - - -touch read-only || fail=1 - -touch - 1< read-only 2> /dev/null && { test ! -f - || fail=1; } - -Exit $fail diff --git a/tests/touch/read-only.sh b/tests/touch/read-only.sh new file mode 100755 index 00000000..e9f2bd9f --- /dev/null +++ b/tests/touch/read-only.sh @@ -0,0 +1,31 @@ +#!/bin/sh +# ensure that touch can operate on read-only files + +# Copyright (C) 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 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_ touch +skip_if_root_ + +: > read-only || framework_failure_ +chmod 444 read-only || framework_failure_ + + +touch read-only || fail=1 + +touch - 1< read-only 2> /dev/null && { test ! -f - || fail=1; } + +Exit $fail diff --git a/tests/touch/relative b/tests/touch/relative deleted file mode 100755 index ba199fce..00000000 --- a/tests/touch/relative +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh -# Demonstrate using a combination of --reference and --date to -# set the time of a file back by an arbitrary amount. - -# Copyright (C) 2004-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ touch - -TZ=UTC0 touch --date='2004-01-16 12:00 +0000' f || framework_failure_ - - -# Set times back by 5 days. -touch --ref f --date='-5 days' f || fail=1 - -TZ=UTC0 ls -og --time-style=+%Y-%m-%d f > out.1 || fail -sed 's/ f$//;s/.* //' out.1 > out - -cat <<\EOF > exp || fail=1 -2004-01-11 -EOF - -compare exp out || fail=1 - -Exit $fail diff --git a/tests/touch/relative.sh b/tests/touch/relative.sh new file mode 100755 index 00000000..eeb56853 --- /dev/null +++ b/tests/touch/relative.sh @@ -0,0 +1,38 @@ +#!/bin/sh +# 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. + +# This 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_ touch + +TZ=UTC0 touch --date='2004-01-16 12:00 +0000' f || framework_failure_ + + +# Set times back by 5 days. +touch --ref f --date='-5 days' f || fail=1 + +TZ=UTC0 ls -og --time-style=+%Y-%m-%d f > out.1 || fail +sed 's/ f$//;s/.* //' out.1 > out + +cat <<\EOF > exp || fail=1 +2004-01-11 +EOF + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/touch/trailing-slash b/tests/touch/trailing-slash deleted file mode 100755 index f09695c0..00000000 --- a/tests/touch/trailing-slash +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/sh -# Ensure that touch honors trailing slash. - -# Copyright (C) 2009-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 -# 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=.}/init.sh"; path_prepend_ ../src -print_ver_ touch - -ln -s nowhere dangling || framework_failure_ -ln -s loop loop || framework_failure_ -touch file || framework_failure_ -ln -s file link1 || framework_failure_ -mkdir dir || framework_failure_ -ln -s dir link2 || framework_failure_ - - -# Trailing slash can only appear on directory or symlink-to-directory. -# Up through coreutils 8.0, Solaris 9 failed these tests. -touch no-file/ && fail=1 -touch file/ && fail=1 -touch dangling/ && fail=1 -touch loop/ && fail=1 -touch link1/ && fail=1 -touch dir/ || fail=1 - -# -c silences ENOENT, but not ENOTDIR or ELOOP -touch -c no-file/ || fail=1 -touch -c file/ && fail=1 -touch -c dangling/ || fail=1 -touch -c loop/ && fail=1 -touch -c link1/ && fail=1 -touch -c dir/ || fail=1 -test -f no-file && fail=1 -test -f nowhere && fail=1 - -# Trailing slash dereferences a symlink, even with -h. -# mtime is sufficient to show pass (besides, lstat changes atime of -# symlinks and directories under Cygwin 1.5). -touch -d 2009-10-10 -h link2/ || fail=1 -touch -h -r link2/ file || fail=1 -case $(stat --format=%y dir) in - 2009-10-10*) ;; - *) fail=1 ;; -esac -case $(stat --format=%y link2) in - 2009-10-10*) fail=1 ;; -esac -case $(stat --format=%y file) in - 2009-10-10*) ;; - *) fail=1 ;; -esac - -Exit $fail diff --git a/tests/touch/trailing-slash.sh b/tests/touch/trailing-slash.sh new file mode 100755 index 00000000..4dbd2776 --- /dev/null +++ b/tests/touch/trailing-slash.sh @@ -0,0 +1,66 @@ +#!/bin/sh +# Ensure that touch honors trailing slash. + +# 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/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ touch + +ln -s nowhere dangling || framework_failure_ +ln -s loop loop || framework_failure_ +touch file || framework_failure_ +ln -s file link1 || framework_failure_ +mkdir dir || framework_failure_ +ln -s dir link2 || framework_failure_ + + +# Trailing slash can only appear on directory or symlink-to-directory. +# Up through coreutils 8.0, Solaris 9 failed these tests. +touch no-file/ && fail=1 +touch file/ && fail=1 +touch dangling/ && fail=1 +touch loop/ && fail=1 +touch link1/ && fail=1 +touch dir/ || fail=1 + +# -c silences ENOENT, but not ENOTDIR or ELOOP +touch -c no-file/ || fail=1 +touch -c file/ && fail=1 +touch -c dangling/ || fail=1 +touch -c loop/ && fail=1 +touch -c link1/ && fail=1 +touch -c dir/ || fail=1 +test -f no-file && fail=1 +test -f nowhere && fail=1 + +# Trailing slash dereferences a symlink, even with -h. +# mtime is sufficient to show pass (besides, lstat changes atime of +# symlinks and directories under Cygwin 1.5). +touch -d 2009-10-10 -h link2/ || fail=1 +touch -h -r link2/ file || fail=1 +case $(stat --format=%y dir) in + 2009-10-10*) ;; + *) fail=1 ;; +esac +case $(stat --format=%y link2) in + 2009-10-10*) fail=1 ;; +esac +case $(stat --format=%y file) in + 2009-10-10*) ;; + *) fail=1 ;; +esac + +Exit $fail -- cgit v1.2.3